diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index 728adc67dc8727..00000000000000
--- a/.eslintignore
+++ /dev/null
@@ -1,9 +0,0 @@
-**/dist/**/*
-**/vendor/**/*
-**/tests/**/fixtures/**/*
-!.github
-*.d.ts
-config/chartcuterie/config.js
-fixtures/profiles/embedded.js
-fixtures/artifact_bundle_debug_ids/**/*
-fixtures/artifact_bundle_duplicated_debug_ids/**/*
diff --git a/.eslintrc.js b/.eslintrc.js
deleted file mode 100644
index dfb3482ca6aa79..00000000000000
--- a/.eslintrc.js
+++ /dev/null
@@ -1,976 +0,0 @@
-/* eslint-env node */
-
-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: 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,
-    expect: false,
-    MockApiClient: true,
-    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',
-      {additionalHooks: '(useEffectAfterFirstRender|useMemoWithPrevious)'},
-    ],
-    'no-restricted-imports': [
-      'error',
-      {
-        patterns: [
-          {
-            group: ['sentry/components/devtoolbar/*'],
-            message: 'Do not depend on toolbar internals',
-          },
-        ],
-        paths: [
-          {
-            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: '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.",
-          },
-          {
-            name: 'qs',
-            message: 'Please use query-string instead of qs',
-          },
-          {
-            name: 'moment',
-            message: 'Please import moment-timezone instead of moment',
-          },
-        ],
-      },
-    ],
-
-    // TODO(@anonrig): Remove this from eslint-sentry-config
-    'space-infix-ops': 'off',
-    'object-shorthand': 'off',
-    'object-curly-spacing': 'off',
-    'import/no-amd': 'off',
-    'no-danger-with-children': 'off',
-    'no-fallthrough': 'off',
-    'no-obj-calls': 'off',
-    'array-bracket-spacing': 'off',
-    'computed-property-spacing': 'off',
-    'react/no-danger-with-children': 'off',
-    'jest/no-disabled-tests': 'off',
-  },
-  // JSON file formatting is handled by Biome. ESLint should not be linting
-  // and formatting these files.
-  ignorePatterns: ['*.json'],
-  overrides: [
-    {
-      files: ['static/app/components/devtoolbar/**/*.{ts,tsx}'],
-      rules: {
-        'no-restricted-imports': [
-          'error',
-          {
-            paths: [
-              {
-                name: 'sentry/utils/queryClient',
-                message:
-                  'Import from `@tanstack/react-query` and `./hooks/useFetchApiData` or `./hooks/useFetchInfiniteApiData` instead.',
-              },
-            ],
-          },
-        ],
-      },
-    },
-    {
-      files: ['static/**/*.spec.{ts,js}', 'tests/js/**/*.{ts,js}'],
-      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',
-        'object-curly-spacing': 'off',
-        'import/no-amd': 'off',
-        'no-danger-with-children': 'off',
-        'no-fallthrough': 'off',
-        'no-obj-calls': 'off',
-        'array-bracket-spacing': 'off',
-        'computed-property-spacing': 'off',
-        'react/no-danger-with-children': 'off',
-        'jest/no-disabled-tests': 'off',
-      },
-    },
-    {
-      // We specify rules explicitly for the sdk-loader here so we do not have
-      // eslint ignore comments included in the source file, which is consumed
-      // by users.
-      files: ['**/js-sdk-loader.ts'],
-      rules: {
-        'no-console': 'off',
-      },
-    },
-  ],
-};
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 9695c88749836f..098974ecd3aa4a 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -122,6 +122,7 @@ pyproject.toml                                           @getsentry/owners-pytho
 babel.config.*                                           @getsentry/owners-js-build
 biome.json                                               @getsentry/owners-js-build
 build-utils/                                             @getsentry/owners-js-build
+eslint.config.mjs                                        @getsentry/owners-js-build
 jest.config.ts                                           @getsentry/owners-js-build
 tsconfig.*                                               @getsentry/owners-js-build
 webpack.config.*                                         @getsentry/owners-js-build
@@ -348,12 +349,23 @@ tests/sentry/api/endpoints/test_organization_dashboard_widget_details.py     @ge
 
 
 ## DevToolbar
-/src/sentry/templates/sentry/toolbar/  @getsentry/replay
-/src/sentry/toolbar/                   @getsentry/replay
-/tests/sentry/toolbar/                 @getsentry/replay
+/src/sentry/templates/sentry/toolbar/        @getsentry/replay
+/src/sentry/toolbar/                         @getsentry/replay
+/tests/sentry/toolbar/                       @getsentry/replay
+/static/app/components/devtoolbar/           @getsentry/replay-frontend
+/src/sentry/middleware/devtoolbar.py         @getsentry/replay-backend
+/tests/sentry/middleware/test_devtoolbar.py  @getsentry/replay-backend
 ## End of DevToolbar
 
 
+## Frontend
+/static/app/components/analyticsArea.spec.tsx  @getsentry/app-frontend
+/static/app/components/analyticsArea.tsx       @getsentry/app-frontend
+/static/app/components/events/interfaces/      @getsentry/app-frontend
+/static/app/components/forms/                  @getsentry/app-frontend
+## End of Frontend
+
+
 ## Integrations
 /src/sentry/sentry_apps/                                             @getsentry/product-owners-settings-integrations @getsentry/ecosystem
 /tests/sentry/sentry_apps                                            @getsentry/product-owners-settings-integrations @getsentry/ecosystem
@@ -459,13 +471,10 @@ tests/sentry/api/endpoints/test_organization_dashboard_widget_details.py     @ge
 
 
 ## Telemetry Experience
-/src/sentry/api/endpoints/organization_ddm.py                                    @getsentry/telemetry-experience
-/tests/sentry/api/endpoints/test_organization_ddm_meta.py                        @getsentry/telemetry-experience
 /src/sentry/api/endpoints/organization_metric*                                   @getsentry/telemetry-experience
 /tests/sentry/api/endpoints/test_organization_metric*                            @getsentry/telemetry-experience
 /src/sentry/api/endpoints/organization_sessions.py                               @getsentry/telemetry-experience
 /tests/snuba/api/endpoints/test_organization_sessions.py                         @getsentry/telemetry-experience
-/src/sentry/api/endpoints/projects_metrics.py                                    @getsentry/telemetry-experience
 /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
@@ -481,11 +490,8 @@ tests/sentry/api/endpoints/test_organization_dashboard_widget_details.py     @ge
 /src/sentry/sentry_metrics/visibility/                                           @getsentry/telemetry-experience
 /tests/sentry/sentry_metrics/visibility/                                         @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
 /tests/sentry/snuba/metrics/                                                     @getsentry/telemetry-experience
-/src/sentry/relay/config/metric_extraction.py                                    @getsentry/telemetry-experience
-/tests/sentry/relay/config/test_metric_extraction.py                             @getsentry/telemetry-experience
 
 /static/app/actionCreators/metrics.spec.tsx                                      @getsentry/telemetry-experience
 /static/app/actionCreators/metrics.tsx                                           @getsentry/telemetry-experience
@@ -497,8 +503,6 @@ tests/sentry/api/endpoints/test_organization_dashboard_widget_details.py     @ge
 /static/app/types/project.tsx                                                    @getsentry/telemetry-experience
 /static/app/utils/metrics/                                                       @getsentry/telemetry-experience
 /static/app/views/metrics/                                                       @getsentry/telemetry-experience
-/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
@@ -631,3 +635,7 @@ tests/sentry/api/endpoints/test_organization_dashboard_widget_details.py     @ge
 # Taskworkers
 /src/sentry/taskworker/                                       @getsentry/taskworker
 /tests/sentry/taskworker/                                     @getsentry/taskworker
+
+# Tempest
+/src/sentry/tempest/                                       @getsentry/gdx
+/tests/sentry/tempest/                                     @getsentry/gdx
diff --git a/.github/workflows/frontend-lint-burndown.yml b/.github/workflows/frontend-lint-burndown.yml
index 21279bc7ed19cb..e9f99589e8db9b 100644
--- a/.github/workflows/frontend-lint-burndown.yml
+++ b/.github/workflows/frontend-lint-burndown.yml
@@ -17,9 +17,9 @@ jobs:
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
-      - name: Install dependencies & inject eslint-plugin-deprecation
+      - name: Install dependencies
         id: dependencies
-        run: yarn add --dev eslint-plugin-deprecation
+        run: yarn install
 
       # Setup custom tsc matcher, see https://github.com/actions/setup-node/issues/97
       - name: setup matchers
diff --git a/.github/workflows/shuffle-tests.yml b/.github/workflows/shuffle-tests.yml
index 43be8dbf5ff293..4b5013a7310045 100644
--- a/.github/workflows/shuffle-tests.yml
+++ b/.github/workflows/shuffle-tests.yml
@@ -28,18 +28,22 @@ jobs:
     name: run backend tests
     runs-on: ubuntu-24.04
     timeout-minutes: 90
+    permissions:
+      contents: read
+      id-token: write
     strategy:
       # This helps not having to run multiple jobs because one fails, thus, reducing resource usage
       # and reducing the risk that one of many runs would turn red again (read: intermittent tests)
       fail-fast: false
       matrix:
         # XXX: When updating this, make sure you also update MATRIX_INSTANCE_TOTAL.
-        instance: [0, 1, 2, 3, 4, 5, 6]
+        instance: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
         pg-version: ['14']
 
     env:
-      # XXX: MATRIX_INSTANCE_TOTAL must be hardcoded to the length of strategy.matrix.instance.
-      MATRIX_INSTANCE_TOTAL: 7
+      # XXX: `MATRIX_INSTANCE_TOTAL` must be hardcoded to the length of `strategy.matrix.instance`.
+      # If this increases, make sure to also increase `flags.backend.after_n_builds` in `codecov.yml`.
+      MATRIX_INSTANCE_TOTAL: 11
 
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
@@ -48,7 +52,10 @@ jobs:
         uses: ./.github/actions/setup-sentry
         id: setup
         with:
+          redis_cluster: true
+          kafka: true
           snuba: true
+          symbolicator: true
           # Right now, we run so few bigtable related tests that the
           # overhead of running bigtable in all backend tests
           # is way smaller than the time it would take to run in its own job.
diff --git a/.github/workflows/test_docker_compose_acceptance.yml b/.github/workflows/test_devservices_acceptance.yml
similarity index 87%
rename from .github/workflows/test_docker_compose_acceptance.yml
rename to .github/workflows/test_devservices_acceptance.yml
index aa81794eb085ba..279c41114d277c 100644
--- a/.github/workflows/test_docker_compose_acceptance.yml
+++ b/.github/workflows/test_devservices_acceptance.yml
@@ -1,10 +1,10 @@
 # Also note that this name *MUST* match the filename because GHA
 # only provides the workflow name (https://docs.github.com/en/free-pro-team@latest/actions/reference/environment-variables#default-environment-variables)
 # and GH APIs only support querying by workflow *FILENAME* (https://developer.github.com/v3/actions/workflows/#get-a-workflow)
-name: test-docker-compose-acceptance
+name: test-devservices-acceptance
 on:
   schedule:
-    - cron: '0 0 * * *'
+    - cron: '0 * * * *'
 
 # Cancel in progress workflows on pull_requests.
 # https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
@@ -16,10 +16,13 @@ concurrency:
 env:
   SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3
   NODE_OPTIONS: '--max-old-space-size=4096'
+  USE_NEW_DEVSERVICES: 1
+  IS_DEV: 1
+  CHARTCUTERIE_CONFIG_PATH: ${{ github.workspace }}/config/chartcuterie
 
 jobs:
-  docker-compose-acceptance:
-    name: docker-compose-acceptance
+  devservices-acceptance:
+    name: devservices-acceptance
     runs-on: ubuntu-24.04
     timeout-minutes: 30
     permissions:
@@ -89,15 +92,9 @@ jobs:
         uses: ./.github/actions/test-setup-sentry-devservices
         id: setup
 
-      - name: copy chartcuterie config to devservices chartcuterie directory
-        run: |
-          ls config/chartcuterie
-          cp -r config/chartcuterie devservices
-
       - name: Bring up devservices
         run: |
-          docker network create sentry
-          docker compose -f devservices/docker-compose-testing.yml up -d redis postgres snuba clickhouse chartcuterie
+          devservices up --mode acceptance-ci
 
       - name: Run acceptance tests (#${{ steps.setup.outputs.matrix-instance-number }} of ${{ steps.setup.outputs.matrix-instance-total }})
         run: make run-acceptance
@@ -127,14 +124,13 @@ jobs:
       - name: Inspect failure
         if: failure()
         run: |
-          docker compose -f devservices/docker-compose-testing.yml ps
-          docker compose -f devservices/docker-compose-testing.yml logs --tail 1000
+          devservices logs
 
-  docker-compose-acceptance-required-checks:
+  devservices-acceptance-required-checks:
     # this is a required check so we need this job to always run and report a status.
     if: always()
-    name: Docker Compose Acceptance
-    needs: [docker-compose-acceptance]
+    name: Devservices Acceptance
+    needs: [devservices-acceptance]
     runs-on: ubuntu-24.04
     timeout-minutes: 3
     steps:
diff --git a/.github/workflows/test_docker_compose_backend.yml b/.github/workflows/test_devservices_backend.yml
similarity index 75%
rename from .github/workflows/test_docker_compose_backend.yml
rename to .github/workflows/test_devservices_backend.yml
index 179b1efee17362..ec3f0ae5645eab 100644
--- a/.github/workflows/test_docker_compose_backend.yml
+++ b/.github/workflows/test_devservices_backend.yml
@@ -1,9 +1,8 @@
-name: test-docker-compose-backend
+name: test-devservices-backend
 
 on:
   schedule:
-    - cron: '0 0 * * *'
-
+    - cron: '0 * * * *'
 # Cancel in progress workflows on pull_requests.
 # https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
 concurrency:
@@ -13,9 +12,11 @@ concurrency:
 # hack for https://github.com/actions/cache/issues/810#issuecomment-1222550359
 env:
   SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3
+  USE_NEW_DEVSERVICES: 1
+  IS_DEV: 1
 
 jobs:
-  docker-compose-api-docs:
+  devservices-api-docs:
     name: api docs test
     runs-on: ubuntu-24.04
     steps:
@@ -31,9 +32,7 @@ jobs:
         id: setup
 
       - name: Bring up devservices
-        run: |
-          docker network create sentry
-          docker compose -f devservices/docker-compose-testing.yml up -d redis postgres snuba clickhouse
+        run: devservices up
 
       - name: Run API docs tests
         # install ts-node for ts build scripts to execute properly without potentially installing
@@ -44,11 +43,9 @@ jobs:
 
       - name: Inspect failure
         if: failure()
-        run: |
-          docker compose -f devservices/docker-compose-testing.yml ps
-          docker compose -f devservices/docker-compose-testing.yml logs --tail 1000
+        run: devservices logs
 
-  docker-compose-backend-test:
+  devservices-backend-test:
     name: backend test
     runs-on: ubuntu-24.04
     timeout-minutes: 60
@@ -73,13 +70,11 @@ jobs:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: Setup sentry env
+        id: setup
         uses: ./.github/actions/test-setup-sentry-devservices
 
       - name: Bring up devservices
-        run: |
-          docker network create sentry
-          echo "BIGTABLE_EMULATOR_HOST=127.0.0.1:8086" >> $GITHUB_ENV
-          docker compose -f devservices/docker-compose-testing.yml up -d
+        run: devservices up --mode backend-ci
 
       - name: Run backend test (${{ steps.setup.outputs.matrix-instance-number }} of ${{ steps.setup.outputs.matrix-instance-total }})
         run: |
@@ -107,11 +102,9 @@ jobs:
 
       - name: Inspect failure
         if: failure()
-        run: |
-          docker compose -f devservices/docker-compose-testing.yml ps
-          docker compose -f devservices/docker-compose-testing.yml logs --tail 1000
+        run: devservices logs
 
-  docker-compose-backend-migration-tests:
+  devservices-backend-migration-tests:
     name: backend migration tests
     runs-on: ubuntu-24.04
     timeout-minutes: 30
@@ -127,9 +120,7 @@ jobs:
         id: setup
 
       - name: Bring up devservices
-        run: |
-          docker network create sentry
-          docker compose -f devservices/docker-compose-testing.yml up -d redis postgres snuba clickhouse
+        run: devservices up
 
       - name: run tests
         run: |
@@ -146,11 +137,9 @@ jobs:
 
       - name: Inspect failure
         if: failure()
-        run: |
-          docker compose -f devservices/docker-compose-testing.yml ps
-          docker compose -f devservices/docker-compose-testing.yml logs --tail 1000
+        run: devservices logs
 
-  docker-compose-cli:
+  devservices-cli:
     name: cli test
     runs-on: ubuntu-24.04
     timeout-minutes: 10
@@ -165,9 +154,7 @@ jobs:
         id: setup
 
       - name: Bring up devservices
-        run: |
-          docker network create sentry
-          docker compose -f devservices/docker-compose-testing.yml up -d redis postgres
+        run: devservices up --mode migrations
 
       - name: Run test
         run: |
@@ -184,11 +171,9 @@ jobs:
 
       - name: Inspect failure
         if: failure()
-        run: |
-          docker compose -f devservices/docker-compose-testing.yml ps
-          docker compose -f devservices/docker-compose-testing.yml logs --tail 1000
+        run: devservices logs
 
-  docker-compose-migration:
+  devservices-migration:
     name: check migration
     runs-on: ubuntu-24.04
     strategy:
@@ -204,9 +189,7 @@ jobs:
         id: setup
 
       - name: Bring up devservices
-        run: |
-          docker network create sentry
-          docker compose -f devservices/docker-compose-testing.yml up -d redis postgres
+        run: devservices up --mode migrations
 
       - name: Migration & lockfile checks
         env:
@@ -217,11 +200,9 @@ jobs:
 
       - name: Inspect failure
         if: failure()
-        run: |
-          docker compose -f devservices/docker-compose-testing.yml ps
-          docker compose -f devservices/docker-compose-testing.yml logs --tail 1000
+        run: devservices logs
 
-  docker-compose-monolith-dbs:
+  devservices-monolith-dbs:
     name: monolith-dbs test
     runs-on: ubuntu-24.04
     timeout-minutes: 20
@@ -236,9 +217,7 @@ jobs:
         id: setup
 
       - name: Bring up devservices
-        run: |
-          docker network create sentry
-          docker compose -f devservices/docker-compose-testing.yml up -d redis postgres
+        run: devservices up --mode migrations
 
       - name: Run test
         run: |
@@ -265,24 +244,22 @@ jobs:
 
       - name: Inspect failure
         if: failure()
-        run: |
-          docker compose -f devservices/docker-compose-testing.yml ps
-          docker compose -f devservices/docker-compose-testing.yml logs --tail 1000
+        run: devservices logs
 
   # This check runs once all dependent jobs have passed
   # It symbolizes that all required Backend checks have succesfully passed (Or skipped)
   # This step is the only required backend check
-  docker-compose-backend-required-check:
+  devservices-backend-required-check:
     needs:
       [
-        docker-compose-api-docs,
-        docker-compose-backend-test,
-        docker-compose-backend-migration-tests,
-        docker-compose-cli,
-        docker-compose-migration,
-        docker-compose-monolith-dbs,
+        devservices-api-docs,
+        devservices-backend-test,
+        devservices-backend-migration-tests,
+        devservices-cli,
+        devservices-migration,
+        devservices-monolith-dbs,
       ]
-    name: Docker Compose Backend
+    name: Devservices Backend
     # This is necessary since a failed/skipped dependent job would cause this job to be skipped
     if: always()
     runs-on: ubuntu-24.04
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index bd07e25b9a6872..4a6418b9c0f0f1 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -117,7 +117,7 @@ repos:
       - id: eslint
         name: eslint
         language: system
-        files: \.[jt]sx?$
+        files: \.(ts|js|tsx|jsx|mjs)$
         entry: ./node_modules/.bin/eslint --quiet --fix
 
       - id: stylelint
diff --git a/CHANGES b/CHANGES
index 84afe672222eeb..0655a554ced755 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,99 @@
+24.12.1
+-------
+
+### Various fixes & improvements
+
+- fix: fixes KeyError when running with stale topic dlq (#82512) by @lynnagara
+- chore(issue-views): Add analytics back to tab actions (#82504) by @MichaelSun48
+- chore(sentry apps): Introduce new error types for sentry apps (#82507) by @Christinarlong
+- fix timezone normalization (#82496) by @kneeyo1
+- ref(tsc): convert teamAccessRequestModal to FC (#82470) by @michellewzhang
+- ref(tsc): convert dashboardWidgetQuerySelectorModal to FC (#82466) by @michellewzhang
+- ref(issue-views): Overhaul issue views state and logic to a new context  (#82429) by @MichaelSun48
+- ref: strptime -> fromisoformat in tests (#82488) by @asottile-sentry
+- chore(various): Fix linter warnings (#82494) by @lobsterkatie
+- ref(insights): Split out `getAxisMaxForPercentageSeries` (#82493) by @gggritso
+- fix(ecosystem): Track metrics for issue detail ticket creation (#82436) by @GabeVillalobos
+- ref(aci): pass WorkflowJob into process_workflows (#82489) by @cathteng
+- fix(group-events): Fix typo and error text (#82490) by @leeandher
+- fix(web): Add react_config context on auth pages take 2 (#82480) by @BYK
+- feat(alerts): ACI dual write alert rule helpers (#82400) by @ceorourke
+- feat(dashboards): Pass `LineChart` series meta alongside the data (#82047) by @gggritso
+- fix(eap): Numeric attribute filtering in snql eap (#82472) by @Zylphrex
+- chore(issues): Opt in a few more endpoint tests to stronger types (#82382) by @mrduncan
+- ref: remove calls to iso_format in testutils (#82461) by @asottile-sentry
+- feat(dashboards): enable sorting by column in table view (#82239) by @harshithadurai
+- ref(workflow_engine): remove remaining references to condition in validators (#82438) by @mifu67
+- fix(flags): separate permission class (#82463) by @oioki
+- feat(new-trace): Fixing scroll on trace drawer (#82475) by @Abdkhan14
+- support routing stale messages to lowpri topic (#82322) by @lynnagara
+
+_Plus 240 more_
+
+24.12.0
+-------
+
+### Various fixes & improvements
+
+- chore(utils): allow duplicate values in registry by making reverse lookup optional (#82114) by @cathteng
+- feat(workflow_engine): Add `process_data_packets` method (#82002) by @saponifi3d
+- ref(workflow_engine): Remove DetectorType (#82111) by @saponifi3d
+- chore(aci milestone 3): move aggregation value helpers to incidents directory (#82103) by @mifu67
+- ref(feedback): remove spam detection logs - replaced by redash (#82071) by @aliu39
+- fix(activity): Update activity message for linked issues (#82064) by @snigdhas
+- ref(replay): improve error messages for invalid searches that raise CouldNotParseValue (#82048) by @aliu39
+- fix(toolbar): Include credentials with fetch requests (#82108) by @ryan953
+- feat(autofix): Add support for streamed output (#82024) by @roaga
+- :sparkles: feat(discord): add button to redirect for user linking (#82104) by @iamrajjoshi
+- feat(workflow_engine): Adding support for `process_workflows` in the IssuePlatform (#81975) by @saponifi3d
+- ref: remove skip_for_relay_store (#82106) by @asottile-sentry
+- feat(metric-issues): Configure workflow notifications by group type (#81609) by @snigdhas
+- fix(iphone-codes): update frontend definitions (#82100) by @armcknight
+- ref: improve grouphash_metadata test (#82101) by @asottile-sentry
+- fix(iphone-codes): update BE mapping; remove unused method (#82094) by @armcknight
+- ref: remove xfail_if_not_postgres (#82097) by @asottile-sentry
+- ref: fix typing for endpoints.project_rule_preview (#82089) by @asottile-sentry
+- ref: fix types for test_event_attachment_details (#82091) by @asottile-sentry
+- ref: remove requires_not_arm64 (#82093) by @asottile-sentry
+- chore(aci): enforce config schema without subclassing (#81979) by @cathteng
+- ref: fix types for eventstore.test_base (#82092) by @asottile-sentry
+- chore(stacktrace): Make source map tooltip aligned (#82016) by @MichaelSun48
+- ref: delete unused GroupEnvironmentWithStatsSerializer (#82090) by @asottile-sentry
+
+_Plus 93 more_
+
+24.11.2
+-------
+
+### Various fixes & improvements
+
+- fix(dashboards): Abbreviate `LineChartWidget` Y axis integers (#81937) by @gggritso
+- Revert "chore(profiling): remove profiling.stack_trace_rules.allowed_project_ids option (#81903)" (d0bea1aa) by @getsentry-bot
+- feat(widget-builder): Add limit field to widget builder hook (#81944) by @nikkikapadia
+- fix(alerts): Fix EAP alert filter bar to behave more like explore (#81946) by @edwardgou-sentry
+- feat(alerts): Renames eap metrics in ui to spans (#81917) by @edwardgou-sentry
+- feat(alerts): Limits eap alert time windows and periods (#81916) by @edwardgou-sentry
+- chore(insights): Remove bundle analysis UI flag (#81932) by @gggritso
+- feat(widget-builder): Batch URL param changes (#81923) by @narsaynorath
+- fix(merged): Always show a link for latests event of a merged group (#81947) by @leeandher
+- fix(dashboards): Add missing propagated props in `LineChartWidget` (#81935) by @gggritso
+- chore(profiling): remove profiling.stack_trace_rules.allowed_project_ids option (#81903) by @viglia
+- feat(new-trace): remove prefix related (#81918) by @doralchan
+- :mag: nit(integration slo): cleanup tests (#81943) by @iamrajjoshi
+- ref(widget-builder): Split out tests (#81949) by @narsaynorath
+- fix(trace-view): Web Vitals scores (#81945) by @0Calories
+- ref(insights): Simplify `SpanTimeCharts` (#81931) by @gggritso
+- fix(oauth): only remove the related tokens (#81677) by @sentaur-athena
+- :wrench: chore(integration slo): cleaning up tests and use util method (#81936) by @iamrajjoshi
+- feat(issue summary): Change 3-dot menu to dropdown (#81928) by @roaga
+- feat(sdk): Upgrade @sentry SDKs to v8.43.0 (#81925) by @aliu39
+- Better logging for backpressure (#81648) by @kneeyo1
+- feat(dashboards): add success message when favoriting dashboards (#81887) by @harshithadurai
+- feat(ui): Add dark app loading theme (#81611) by @scttcper
+- ref(dashboards): Export Widget component props (#81924) by @gggritso
+
+_Plus 442 more_
+
 24.11.1
 -------
 
diff --git a/api-docs/openapi.json b/api-docs/openapi.json
index f7cba5f6d5345f..a40ec189185cb3 100644
--- a/api-docs/openapi.json
+++ b/api-docs/openapi.json
@@ -15,10 +15,14 @@
   },
   "servers": [
     {
-      "url": "https://us.sentry.io/"
-    },
-    {
-      "url": "https://de.sentry.io/"
+      "url": "https://{region}.sentry.io",
+      "variables": {
+        "region": {
+          "default": "us",
+          "description": "The data-storage-location for an organization",
+          "enum": ["us", "de"]
+        }
+      }
     }
   ],
   "tags": [
diff --git a/api-docs/paths/events/issue-details.json b/api-docs/paths/events/issue-details.json
index ac00d75f3c5fcb..15cdfb55ec7a70 100644
--- a/api-docs/paths/events/issue-details.json
+++ b/api-docs/paths/events/issue-details.json
@@ -216,7 +216,7 @@
               },
               "statusDetails": {
                 "type": "object",
-                "description": "Additional details about the status of the issue.",
+                "description": "Additional details about the resolution. Supported values are `\"inRelease\"`, `\"inNextRelease\"`, `\"inCommit\"`, `\"ignoreDuration\"`, `\"ignoreCount\"`, `\"ignoreWindow\"`, `\"ignoreUserCount\"`, and `\"ignoreUserWindow\"`.",
                 "properties": {
                   "inNextRelease": {
                     "type": "boolean",
diff --git a/api-docs/paths/projects/dsyms.json b/api-docs/paths/projects/dsyms.json
index 8221656d080a20..911b76e55585a4 100644
--- a/api-docs/paths/projects/dsyms.json
+++ b/api-docs/paths/projects/dsyms.json
@@ -45,7 +45,7 @@
   },
   "post": {
     "tags": ["Projects"],
-    "description": "Upload a new debug information file for the given release.\n\nUnlike other API requests, files must be uploaded using the\ntraditional multipart/form-data content-type.\n\nThe file uploaded is a zip archive of an Apple .dSYM folder which\ncontains the individual debug images.  Uploading through this endpoint\nwill create different files for the contained images.",
+    "description": "Upload a new debug information file for the given release.\n\nUnlike other API requests, files must be uploaded using the\ntraditional multipart/form-data content-type.\n\nRequests to this endpoint should use the region-specific domain eg. `us.sentry.io` or `de.sentry.io`.\n\nThe file uploaded is a zip archive of an Apple .dSYM folder which\ncontains the individual debug images.  Uploading through this endpoint\nwill create different files for the contained images.",
     "operationId": "Upload a New File",
     "parameters": [
       {
@@ -109,6 +109,9 @@
       {
         "auth_token": ["project:write"]
       }
+    ],
+    "servers": [
+      {"url": "https://{region}.sentry.io"}
     ]
   },
   "delete": {
diff --git a/api-docs/paths/releases/project-release-files.json b/api-docs/paths/releases/project-release-files.json
index cfacc62efd3777..695e414037c0bc 100644
--- a/api-docs/paths/releases/project-release-files.json
+++ b/api-docs/paths/releases/project-release-files.json
@@ -74,7 +74,7 @@
   },
   "post": {
     "tags": ["Releases"],
-    "description": "Upload a new project release file.",
+    "description": "Upload a new file for the given release.\n\nUnlike other API requests, files must be uploaded using the traditional multipart/form-data content-type.\n\nRequests to this endpoint should use the region-specific domain eg. `us.sentry.io` or `de.sentry.io`\n\nThe optional 'name' attribute should reflect the absolute path that this file will be referenced as. For example, in the case of JavaScript you might specify the full web URI.",
     "operationId": "Upload a New Project Release File",
     "parameters": [
       {
@@ -171,6 +171,9 @@
       {
         "auth_token": ["project:releases"]
       }
+    ],
+    "servers": [
+      {"url": "https://{region}.sentry.io"}
     ]
   }
 }
diff --git a/api-docs/paths/releases/release-files.json b/api-docs/paths/releases/release-files.json
index ab1adf49ce89e6..918e26c50e2365 100644
--- a/api-docs/paths/releases/release-files.json
+++ b/api-docs/paths/releases/release-files.json
@@ -65,7 +65,7 @@
   },
   "post": {
     "tags": ["Releases"],
-    "description": "Upload a new organization release file.",
+    "description": "Upload a new file for the given release.\n\nUnlike other API requests, files must be uploaded using the traditional multipart/form-data content-type.\n\nRequests to this endpoint should use the region-specific domain eg. `us.sentry.io` or `de.sentry.io`.\n\nThe optional 'name' attribute should reflect the absolute path that this file will be referenced as. For example, in the case of JavaScript you might specify the full web URI.",
     "operationId": "Upload a New Organization Release File",
     "parameters": [
       {
@@ -135,6 +135,9 @@
       {
         "auth_token": ["project:releases"]
       }
+    ],
+    "servers": [
+      {"url": "https://{region}.sentry.io"}
     ]
   }
 }
diff --git a/bin/benchmark_codeowners/benchmark b/bin/benchmark_codeowners/benchmark
index 4c71d12e583d0a..78d6b611f9498a 100755
--- a/bin/benchmark_codeowners/benchmark
+++ b/bin/benchmark_codeowners/benchmark
@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 # isort: skip_file
+# flake8: noqa: S002
+
 
 """
 This script benchmarks the performance of issue owner assignment in Sentry.
@@ -15,7 +17,13 @@ import time
 from sentry.models.organization import Organization
 from sentry.models.projectownership import ProjectOwnership
 from sentry.models.project import Project
+from sentry.models.team import Team
 from sentry.utils import json
+import sentry_sdk
+from sentry.models.projectteam import ProjectTeam
+
+# disable sentry as it creates lots of noise in the output
+sentry_sdk.init(None)
 
 
 def main(code_mapping_file, event_data_file):
@@ -42,6 +50,30 @@ def main(code_mapping_file, event_data_file):
         name=project_name, slug=project_slug, id=project_id, organization_id=org.id
     )
 
+    # create teams for all actors
+    teams_to_create = []
+    seen_teams = set()
+    for rule in code_mapping["rules"]:
+        for owner in rule["owners"]:
+            team_name = owner["identifier"]
+            if team_name not in seen_teams:
+                teams_to_create.append(
+                    Team(
+                        name=team_name,
+                        slug=team_name,
+                        organization_id=org.id,
+                        id=owner["id"],
+                    )
+                )
+                seen_teams.add(team_name)
+
+    # delete teams from previous runs
+    Team.objects.filter(id__in=[team.id for team in teams_to_create]).delete()
+
+    Team.objects.bulk_create(teams_to_create)
+    for team in Team.objects.filter(organization_id=org.id):
+        ProjectTeam.objects.create(project_id=project.id, team_id=team.id)
+
     # create a projectownership
     ProjectOwnership.objects.get_or_create(
         project_id=project.id,
@@ -51,9 +83,18 @@ def main(code_mapping_file, event_data_file):
     event_data = get_event_data()
 
     start = time.time()
-    ProjectOwnership.get_issue_owners(project.id, event_data)
+    issue_owners = ProjectOwnership.get_issue_owners(project.id, event_data)
     elapsed_time = time.time() - start
     print(f"Time taken: {elapsed_time:.6f} seconds")  # noqa
+    print("Ownership rules:")
+    for rule, teams, rule_type in issue_owners:
+        print(f"\nRule:")
+        print(f"  Type: {rule_type}")
+        print(f"  Pattern: {rule.matcher.pattern}")
+        print("  Teams:")
+        for team in teams:  # type: ignore[assignment]
+            if isinstance(team, Team):  # Only handle Team objects
+                print(f"    - {team.name} (id: {team.id})")
 
 
 if __name__ == "__main__":
diff --git a/biome.json b/biome.json
index e18ffc69671ea7..24fd4555ce47d2 100644
--- a/biome.json
+++ b/biome.json
@@ -65,7 +65,6 @@
         "noMisrefactoredShorthandAssign": "error",
         "useAwait": "error",
         "useNamespaceKeyword": "error",
-        "noSkippedTests": "error",
         "noFocusedTests": "error",
         "noDuplicateTestHooks": "error"
       },
diff --git a/build-utils/sentry-instrumentation.ts b/build-utils/sentry-instrumentation.ts
index c6797c1e22f490..ae502acd76f044 100644
--- a/build-utils/sentry-instrumentation.ts
+++ b/build-utils/sentry-instrumentation.ts
@@ -1,6 +1,6 @@
 /* eslint-env node */
+import type {Span} from '@sentry/core';
 import type * as Sentry from '@sentry/node';
-import type {Span} from '@sentry/types';
 import crypto from 'node:crypto';
 import https from 'node:https';
 import os from 'node:os';
@@ -71,7 +71,7 @@ class SentryInstrumentation {
     sentry.setTag('arch', os.arch());
     sentry.setTag(
       'cpu',
-      cpus?.length ? `${cpus[0].model} (cores: ${cpus.length})}` : 'N/A'
+      cpus?.length ? `${cpus[0]!.model} (cores: ${cpus.length})}` : 'N/A'
     );
 
     this.Sentry = sentry;
@@ -96,7 +96,7 @@ class SentryInstrumentation {
           .filter(assetName => !assetName.endsWith('.map'))
           .forEach(assetName => {
             const asset = compilation.assets[assetName];
-            const size = asset.size();
+            const size = asset!.size();
             const file = assetName;
             const body = JSON.stringify({
               file,
diff --git a/codecov.yml b/codecov.yml
index 1a981e84c7c040..4b8b260fe743f9 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -25,7 +25,6 @@ coverage:
     - static/app/routes.tsx
     - static/app/**/*.stories.tsx
     - static/app/**/__stories__/
-    - tests/
 
 component_management:
   individual_components:
@@ -54,7 +53,7 @@ flags:
     after_n_builds: 4
   backend:
     paths:
-      - 'src/sentry/**/*.py'
+      - '**/*.py'
     carryforward: true
     # Do not send any status checks until n coverage reports are uploaded.
     # NOTE: If you change this, make sure to change `comment.after_n_builds` below as well.
diff --git a/config/tsconfig.base.json b/config/tsconfig.base.json
index 326841c8574a4a..e837746b45bb24 100644
--- a/config/tsconfig.base.json
+++ b/config/tsconfig.base.json
@@ -40,6 +40,7 @@
     "noImplicitThis": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
+    "noUncheckedIndexedAccess": true,
     "strict": true,
     "strictBindCallApply": false,
     "useUnknownInCatchVariables": false,
diff --git a/devservices/clickhouse/config.xml b/devservices/clickhouse/config.xml
deleted file mode 100644
index 327d60661b29da..00000000000000
--- a/devservices/clickhouse/config.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<yandex>
-    <max_server_memory_usage_to_ram_ratio>0.3</max_server_memory_usage_to_ram_ratio>
-    <merge_tree>
-        <old_parts_lifetime>1</old_parts_lifetime>
-    </merge_tree>
-</yandex>
diff --git a/devservices/config.yml b/devservices/config.yml
index e8e6a5b0d1b2be..f4cf7a263b0160 100644
--- a/devservices/config.yml
+++ b/devservices/config.yml
@@ -25,9 +25,36 @@ x-sentry-service-config:
         repo_name: sentry-shared-redis
         branch: main
         repo_link: https://github.com/getsentry/sentry-shared-redis.git
+    symbolicator:
+      description: A symbolication service for native stacktraces and minidumps with symbol server support
+      remote:
+        repo_name: symbolicator
+        branch: master
+        repo_link: https://github.com/getsentry/symbolicator.git
+        mode: default
+    bigtable:
+      description: Bigtable emulator
+    redis-cluster:
+      description: Redis cluster used for testing
+    chartcuterie:
+      description: Chartcuterie is a service that generates charts
+      remote:
+        repo_name: chartcuterie
+        branch: master
+        repo_link: https://github.com/getsentry/chartcuterie.git
+    taskbroker:
+      description: Service used to process asynchronous tasks
+      remote:
+        repo_name: taskbroker
+        branch: main
+        repo_link: https://github.com/getsentry/taskbroker.git
+        mode: containerized
   modes:
     default: [snuba, postgres, relay]
     migrations: [postgres, redis]
+    acceptance-ci: [postgres, snuba, chartcuterie]
+    taskbroker: [snuba, postgres, relay, taskbroker]
+    backend-ci: [snuba, postgres, redis, bigtable, redis-cluster, symbolicator]
 
 services:
   postgres:
@@ -61,6 +88,29 @@ services:
     labels:
       - orchestrator=devservices
     restart: unless-stopped
+  bigtable:
+    image: 'ghcr.io/getsentry/cbtemulator:d28ad6b63e461e8c05084b8c83f1c06627068c04'
+    ports:
+      - '127.0.0.1:8086:8086'
+    networks:
+      - devservices
+    extra_hosts:
+      - host.docker.internal:host-gateway
+  redis-cluster:
+    image: ghcr.io/getsentry/docker-redis-cluster:7.0.10
+    ports:
+      - '127.0.0.1:7000:7000'
+      - '127.0.0.1:7001:7001'
+      - '127.0.0.1:7002:7002'
+      - '127.0.0.1:7003:7003'
+      - '127.0.0.1:7004:7004'
+      - '127.0.0.1:7005:7005'
+    networks:
+      - devservices
+    extra_hosts:
+      - host.docker.internal:host-gateway
+    environment:
+      - IP=0.0.0.0
 
 networks:
   devservices:
diff --git a/devservices/docker-compose-testing.yml b/devservices/docker-compose-testing.yml
deleted file mode 100644
index 86e6da6a05053e..00000000000000
--- a/devservices/docker-compose-testing.yml
+++ /dev/null
@@ -1,282 +0,0 @@
-x-restart-policy: &restart_policy
-  restart: unless-stopped
-x-depends_on-healthy: &depends_on-healthy
-  condition: service_healthy
-x-depends_on-default: &depends_on-default
-  condition: service_started
-x-healthcheck-defaults: &healthcheck_defaults
-  interval: 30s
-  timeout: 1m30s
-  retries: 10
-  start_period: 10s
-services:
-  redis:
-    <<: *restart_policy
-    container_name: sentry_redis
-    image: ghcr.io/getsentry/image-mirror-library-redis:5.0-alpine
-    healthcheck:
-      <<: *healthcheck_defaults
-      test: redis-cli ping
-    command:
-      [
-        'redis-server',
-        '--appendonly',
-        'yes',
-        '--save',
-        '60',
-        '20',
-        '--auto-aof-rewrite-percentage',
-        '100',
-        '--auto-aof-rewrite-min-size',
-        '64mb',
-      ]
-    volumes:
-      - 'sentry-redis:/data'
-    ports:
-      - '6379:6379'
-    networks:
-      - sentry
-    extra_hosts:
-      host.docker.internal: host-gateway
-  postgres:
-    <<: *restart_policy
-    container_name: sentry_postgres
-    # Using the same postgres version as Sentry dev for consistency purposes
-    image: 'ghcr.io/getsentry/image-mirror-library-postgres:14-alpine'
-    healthcheck:
-      <<: *healthcheck_defaults
-      # Using default user "postgres" from sentry/sentry.conf.example.py or value of POSTGRES_USER if provided
-      test: ['CMD-SHELL', 'pg_isready -U ${POSTGRES_USER:-postgres}']
-    'command':
-      [
-        'postgres',
-        '-c',
-        'wal_level=logical',
-        '-c',
-        'max_replication_slots=1',
-        '-c',
-        'max_wal_senders=1',
-      ]
-    environment:
-      POSTGRES_HOST_AUTH_METHOD: 'trust'
-      POSTGRES_DB: 'sentry'
-    volumes:
-      - 'sentry-postgres:/var/lib/postgresql/data'
-    ports:
-      - '5432:5432'
-    networks:
-      - sentry
-    extra_hosts:
-      host.docker.internal: host-gateway
-  kafka:
-    <<: *restart_policy
-    image: 'ghcr.io/getsentry/image-mirror-confluentinc-cp-kafka:7.5.0'
-    container_name: sentry_kafka
-    environment:
-      # https://docs.confluent.io/platform/current/installation/docker/config-reference.html#cp-kakfa-example
-      KAFKA_PROCESS_ROLES: 'broker,controller'
-      KAFKA_CONTROLLER_QUORUM_VOTERS: '1@127.0.0.1:29093'
-      KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
-      KAFKA_NODE_ID: '1'
-      CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'
-      KAFKA_LISTENERS: 'PLAINTEXT://0.0.0.0:29092,INTERNAL://0.0.0.0:9093,EXTERNAL://0.0.0.0:9092,CONTROLLER://0.0.0.0:29093'
-      KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://127.0.0.1:29092,INTERNAL://kafka:9093,EXTERNAL://127.0.0.1:9092'
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: 'PLAINTEXT:PLAINTEXT,INTERNAL:PLAINTEXT,EXTERNAL:PLAINTEXT,CONTROLLER:PLAINTEXT'
-      KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
-      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: '1'
-      KAFKA_OFFSETS_TOPIC_NUM_PARTITIONS: '1'
-      KAFKA_LOG_RETENTION_HOURS: '24'
-      KAFKA_MESSAGE_MAX_BYTES: '50000000' #50MB or bust
-      KAFKA_MAX_REQUEST_SIZE: '50000000' #50MB on requests apparently too
-    volumes:
-      - 'sentry-kafka:/var/lib/kafka/data'
-      - 'sentry-kafka-log:/var/lib/kafka/log'
-    healthcheck:
-      <<: *healthcheck_defaults
-      test: ['CMD-SHELL', 'nc -z localhost 9092']
-      interval: 10s
-      timeout: 10s
-      retries: 30
-    ports:
-      - '9092:9092'
-      - '9093:9093'
-    networks:
-      - sentry
-    extra_hosts:
-      host.docker.internal: host-gateway
-  clickhouse:
-    <<: *restart_policy
-    container_name: sentry_clickhouse
-    image: 'ghcr.io/getsentry/image-mirror-altinity-clickhouse-server:23.8.11.29.altinitystable'
-    ulimits:
-      nofile:
-        soft: 262144
-        hard: 262144
-    volumes:
-      - 'sentry-clickhouse:/var/lib/clickhouse'
-      - 'sentry-clickhouse-log:/var/log/clickhouse-server'
-      - type: bind
-        read_only: true
-        source: ./clickhouse/config.xml
-        target: /etc/clickhouse-server/config.d/sentry.xml
-    healthcheck:
-      test: [
-          'CMD-SHELL',
-          # Manually override any http_proxy envvar that might be set, because
-          # this wget does not support no_proxy. See:
-          # https://github.com/getsentry/self-hosted/issues/1537
-          "http_proxy='' wget -nv -t1 --spider 'http://localhost:8123/' || exit 1",
-        ]
-      interval: 10s
-      timeout: 10s
-      retries: 30
-    ports:
-      - '8123:8123'
-      - '9000:9000'
-      - '9009:9009'
-    networks:
-      - sentry
-    extra_hosts:
-      host.docker.internal: host-gateway
-  symbolicator:
-    <<: *restart_policy
-    container_name: sentry_symbolicator
-    image: 'us-central1-docker.pkg.dev/sentryio/symbolicator/image:nightly'
-    volumes:
-      - 'sentry-symbolicator:/data'
-      - type: bind
-        read_only: true
-        source: ./symbolicator
-        target: /etc/symbolicator
-    command: run -c /etc/symbolicator/config.yml
-    ports:
-      - '3021:3021'
-    networks:
-      - sentry
-    extra_hosts:
-      host.docker.internal: host-gateway
-  vroom:
-    <<: *restart_policy
-    container_name: sentry_vroom
-    image: 'us-central1-docker.pkg.dev/sentryio/vroom/vroom:latest'
-    environment:
-      SENTRY_KAFKA_BROKERS_PROFILING: 'sentry_kafka:9092'
-      SENTRY_KAFKA_BROKERS_OCCURRENCES: 'sentry_kafka:9092'
-      SENTRY_BUCKET_PROFILES: file://localhost//var/lib/sentry-profiles
-      SENTRY_SNUBA_HOST: 'http://snuba-api:1218'
-    volumes:
-      - sentry-vroom:/var/lib/sentry-profiles
-    depends_on:
-      kafka:
-        <<: *depends_on-healthy
-    ports:
-      - '8085:8085'
-    networks:
-      - sentry
-    extra_hosts:
-      host.docker.internal: host-gateway
-  snuba:
-    <<: *restart_policy
-    container_name: sentry_snuba
-    image: ghcr.io/getsentry/snuba:latest
-    ports:
-      - '1218:1218'
-      - '1219:1219'
-    networks:
-      - sentry
-    command: ['devserver']
-    environment:
-      PYTHONUNBUFFERED: '1'
-      SNUBA_SETTINGS: docker
-      DEBUG: '1'
-      CLICKHOUSE_HOST: 'clickhouse'
-      CLICKHOUSE_PORT: '9000'
-      CLICKHOUSE_HTTP_PORT: '8123'
-      DEFAULT_BROKERS: 'kafka:9093'
-      REDIS_HOST: 'redis'
-      REDIS_PORT: '6379'
-      REDIS_DB: '1'
-      ENABLE_SENTRY_METRICS_DEV: '${ENABLE_SENTRY_METRICS_DEV:-}'
-      ENABLE_PROFILES_CONSUMER: '${ENABLE_PROFILES_CONSUMER:-}'
-      ENABLE_SPANS_CONSUMER: '${ENABLE_SPANS_CONSUMER:-}'
-      ENABLE_ISSUE_OCCURRENCE_CONSUMER: '${ENABLE_ISSUE_OCCURRENCE_CONSUMER:-}'
-      ENABLE_AUTORUN_MIGRATION_SEARCH_ISSUES: '1'
-      ENABLE_GROUP_ATTRIBUTES_CONSUMER: '${ENABLE_GROUP_ATTRIBUTES_CONSUMER:-}'
-    platform: linux/amd64
-    depends_on:
-      - kafka
-      - redis
-      - clickhouse
-    extra_hosts:
-      host.docker.internal: host-gateway
-  bigtable:
-    <<: *restart_policy
-    container_name: sentry_bigtable
-    image: 'ghcr.io/getsentry/cbtemulator:d28ad6b63e461e8c05084b8c83f1c06627068c04'
-    ports:
-      - '8086:8086'
-    networks:
-      - sentry
-    extra_hosts:
-      host.docker.internal: host-gateway
-  redis-cluster:
-    <<: *restart_policy
-    container_name: sentry_redis-cluster
-    image: ghcr.io/getsentry/docker-redis-cluster:7.0.10
-    ports:
-      - '7000:7000'
-      - '7001:7001'
-      - '7002:7002'
-      - '7003:7003'
-      - '7004:7004'
-      - '7005:7005'
-    networks:
-      - sentry
-    volumes:
-      - sentry-redis-cluster:/redis-data
-    environment:
-      - IP=0.0.0.0
-  chartcuterie:
-    <<: *restart_policy
-    container_name: sentry_chartcuterie
-    image: 'us-central1-docker.pkg.dev/sentryio/chartcuterie/image:latest'
-    environment:
-      CHARTCUTERIE_CONFIG: /etc/chartcuterie/config.js
-      CHARTCUTERIE_CONFIG_POLLING: true
-    volumes:
-      - ./chartcuterie:/etc/chartcuterie
-    ports:
-      - '7901:9090'
-    networks:
-      - sentry
-    extra_hosts:
-      host.docker.internal: host-gateway
-    healthcheck:
-      <<: *healthcheck_defaults
-      # Using default user "postgres" from sentry/sentry.conf.example.py or value of POSTGRES_USER if provided
-      test:
-        [
-          'CMD-SHELL',
-          'docker exec sentry_chartcuterie python3 -c "import urllib.request; urllib.request.urlopen(\"http://127.0.0.1:9090/api/chartcuterie/healthcheck/live\", timeout=5)"',
-        ]
-
-volumes:
-  # These store application data that should persist across restarts.
-  sentry-data:
-  sentry-postgres:
-  sentry-redis:
-  sentry-redis-cluster:
-  sentry-kafka:
-  sentry-clickhouse:
-  sentry-symbolicator:
-  # This volume stores profiles and should be persisted.
-  # Not being external will still persist data across restarts.
-  # It won't persist if someone does a docker compose down -v.
-  sentry-vroom:
-  sentry-kafka-log:
-  sentry-clickhouse-log:
-
-networks:
-  sentry:
-    name: sentry
-    external: true
diff --git a/devservices/symbolicator/config.yml b/devservices/symbolicator/config.yml
deleted file mode 100644
index 290d752a6dd04c..00000000000000
--- a/devservices/symbolicator/config.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-bind: '0.0.0.0:3021'
-logging:
-  level: 'debug'
-  format: 'pretty'
-  enable_backtraces: true
-
-# explicitly disable caches as it's not something we want in tests. in
-# development it may be less ideal. perhaps we should do the same thing as we
-# do with relay one day (one container per test/session), although that will be
-# slow
-cache_dir: null
diff --git a/eslint.config.mjs b/eslint.config.mjs
new file mode 100644
index 00000000000000..10f0a1b91fbfae
--- /dev/null
+++ b/eslint.config.mjs
@@ -0,0 +1,838 @@
+// @ts-check
+/**
+ * Understanding & making changes to this file:
+ *
+ * This is your friend:
+ * `npx eslint --inspect-config`
+ */
+import * as emotion from '@emotion/eslint-plugin';
+import prettier from 'eslint-config-prettier';
+import importPlugin from 'eslint-plugin-import';
+import jest from 'eslint-plugin-jest';
+import jestDom from 'eslint-plugin-jest-dom';
+import react from 'eslint-plugin-react';
+import reactHooks from 'eslint-plugin-react-hooks';
+import sentry from 'eslint-plugin-sentry';
+import simpleImportSort from 'eslint-plugin-simple-import-sort';
+import testingLibrary from 'eslint-plugin-testing-library';
+import typescriptSortKeys from 'eslint-plugin-typescript-sort-keys';
+import globals from 'globals';
+import invariant from 'invariant';
+// biome-ignore lint/correctness/noNodejsModules: Need to get the list of things!
+import {builtinModules} from 'node:module';
+import typescript from 'typescript-eslint';
+
+invariant(react.configs.flat, 'For typescript');
+
+const restrictedImportPatterns = [
+  {
+    group: ['sentry/components/devtoolbar/*'],
+    message: 'Do not depend on toolbar internals',
+  },
+];
+
+const restrictedImportPaths = [
+  {
+    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: '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',
+    message:
+      "Use 'useLocation', 'useParams', 'useNavigate', 'useRoutes' from sentry/utils instead.",
+  },
+  {
+    name: 'qs',
+    message: 'Please use query-string instead of qs',
+  },
+  {
+    name: 'moment',
+    message: 'Please import moment-timezone instead of moment',
+  },
+];
+
+// Used by both: `languageOptions` & `parserOptions`
+const ecmaVersion = 6; // TODO(ryan953): change to 'latest'
+
+/**
+ * To get started with this ESLint Configuration list be sure to read at least
+ * these sections of the docs:
+ *  - https://eslint.org/docs/latest/use/configure/configuration-files#specifying-files-and-ignores
+ *  - https://eslint.org/docs/latest/use/configure/configuration-files#cascading-configuration-objects
+ */
+
+export default typescript.config([
+  {
+    // Main parser & linter options
+    // Rules are defined below and inherit these properties
+    // https://eslint.org/docs/latest/use/configure/configuration-files#configuration-objects
+    name: 'eslint/global/languageOptions',
+    languageOptions: {
+      ecmaVersion,
+      sourceType: 'module',
+      globals: {
+        // TODO(ryan953): globals.browser seems to have a bug with trailing whitespace
+        ...Object.fromEntries(
+          Object.keys(globals.browser).map(key => [key.trim(), false])
+        ),
+        ...globals.jest,
+        MockApiClient: true,
+        tick: true,
+      },
+      parser: typescript.parser,
+      parserOptions: {
+        ecmaFeatures: {
+          globalReturn: false,
+        },
+        ecmaVersion,
+
+        // https://typescript-eslint.io/packages/parser/#emitdecoratormetadata
+        emitDecoratorMetadata: undefined,
+
+        // https://typescript-eslint.io/packages/parser/#experimentaldecorators
+        experimentalDecorators: undefined,
+
+        // https://typescript-eslint.io/packages/parser/#jsdocparsingmode
+        jsDocParsingMode: process.env.SENTRY_DETECT_DEPRECATIONS ? 'all' : 'none',
+
+        // https://typescript-eslint.io/packages/parser/#project
+        project: process.env.SENTRY_DETECT_DEPRECATIONS ? './tsconfig.json' : false,
+
+        // https://typescript-eslint.io/packages/parser/#projectservice
+        // `projectService` is recommended, but slower, with our current tsconfig files.
+        // projectService: true,
+        // tsconfigRootDir: import.meta.dirname,
+      },
+    },
+    linterOptions: {
+      noInlineConfig: false,
+      reportUnusedDisableDirectives: 'error',
+    },
+    settings: {
+      react: {
+        version: '18.2.0',
+        defaultVersion: '18.2',
+      },
+      'import/parsers': {'@typescript-eslint/parser': ['.ts', '.tsx']},
+      'import/resolver': {typescript: {}},
+      'import/extensions': ['.js', '.jsx'],
+    },
+  },
+  {
+    name: 'eslint/global/files',
+    // Default file selection
+    // https://eslint.org/docs/latest/use/configure/configuration-files#specifying-files-and-ignores
+    files: ['**/*.js', '**/*.mjs', '**/*.ts', '**/*.jsx', '**/*.tsx'],
+  },
+  {
+    name: 'eslint/global/ignores',
+    // Global ignores
+    // https://eslint.org/docs/latest/use/configure/configuration-files#globally-ignoring-files-with-ignores
+    ignores: [
+      '.devenv/**/*',
+      '.github/**/*',
+      '.mypy_cache/**/*',
+      '.pytest_cache/**/*',
+      '.venv/**/*',
+      '**/*.benchmark.ts',
+      '**/*.d.ts',
+      '**/dist/**/*',
+      '**/tests/**/fixtures/**/*',
+      '**/vendor/**/*',
+      'build-utils/**/*',
+      'config/chartcuterie/config.js', // TODO: see if this file exists
+      'fixtures/artifact_bundle/**/*',
+      'fixtures/artifact_bundle_debug_ids/**/*',
+      'fixtures/artifact_bundle_duplicated_debug_ids/**/*',
+      'fixtures/profiles/embedded.js',
+      'jest.config.ts',
+      'api-docs/**/*',
+      'src/sentry/static/sentry/js/**/*',
+      'src/sentry/templates/sentry/**/*',
+      'stylelint.config.js',
+    ],
+  },
+  /**
+   * Global Rules
+   * Any ruleset that does not include `files` or `ignores` fields
+   *
+   * Plugins are configured within each configuration object.
+   * https://eslint.org/docs/latest/use/configure/configuration-files#configuration-objects
+   *
+   * Rules are grouped by plugin. If you want to override a specific rule inside
+   * the recommended set, then it's recommended to spread the new rule on top
+   * of the predefined ones.
+   *
+   * For example: if you want to enable a new plugin in the codebase and their
+   * recommended rules (or a new rule that's part of an existing plugin)
+   * First you'd setup a configuration object for that plugin:
+   * {
+   *   name: 'my-plugin/recommended',
+   *   ...myPlugin.configs.recommended,
+   * },
+   * Second you'd override the rule you want to deal with, maybe making it a
+   * warning to start:
+   * {
+   *   name: 'my-plugin/recommended',
+   *   ...myPlugin.configs.recommended,
+   *   rules: {
+   *     ...myPlugin.configs.recommended.rules,
+   *     ['the-rule']: 'warn',
+   *   }
+   * },
+   * Finally, once all warnings are fixed, update from 'warning' to 'error', or
+   * remove the override and rely on the recommended rules again.
+   */
+  {
+    name: 'eslint/rules',
+    rules: {
+      // 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/object-shorthand
+      'object-shorthand': ['error', 'properties'],
+
+      // 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},
+        },
+      ],
+
+      // Let formatter handle this
+      'arrow-body-style': 'off',
+
+      /**
+       * Restricted imports, e.g. deprecated libraries, etc
+       *
+       * See: https://eslint.org/docs/rules/no-restricted-imports
+       */
+      'no-restricted-imports': [
+        'error',
+        {
+          patterns: restrictedImportPatterns,
+          paths: restrictedImportPaths,
+        },
+      ],
+
+      // https://eslint.org/docs/rules/no-console
+      'no-console': 'error',
+    },
+  },
+  {
+    ...importPlugin.flatConfigs.recommended,
+    name: 'plugin/import',
+    rules: {
+      // We override all the rules that are in the recommended, react, and typescript rulesets
+
+      // From the recommended ruleset:
+      // https://github.com/import-js/eslint-plugin-import/blob/main/docs/rules/export.md
+      'import/export': 'error',
+
+      // 5 rules not recommended to be enabled with typescript-eslint
+      // https://typescript-eslint.io/troubleshooting/typed-linting/performance/#slow-eslint-rules
+      'import/named': 'off',
+      'import/namespace': 'off',
+      'import/default': 'off',
+      'import/no-named-as-default-member': 'off',
+      'import/no-unresolved': 'off',
+
+      // Require a newline after the last import/require in a group
+      // Why doesn't prettier handle this? https://prettier.io/docs/en/rationale.html#empty-lines
+      // https://github.com/benmosher/eslint-plugin-import/blob/main/docs/rules/newline-after-import.md
+      'import/newline-after-import': 'error',
+
+      // do not allow a default import name to match a named export (airbnb: error)
+      // https://github.com/benmosher/eslint-plugin-import/blob/main/docs/rules/no-named-as-default.md
+      'import/no-named-as-default': 'off',
+
+      // Prevent importing the default as if it were named
+      // https://github.com/benmosher/eslint-plugin-import/blob/main/docs/rules/no-named-default.md
+      'import/no-named-default': 'error',
+
+      // disallow AMD require/define
+      // https://github.com/benmosher/eslint-plugin-import/blob/main/docs/rules/no-amd.md
+      'import/no-amd': 'error',
+
+      // disallow duplicate imports
+      // https://github.com/benmosher/eslint-plugin-import/blob/main/docs/rules/no-duplicates.md
+      'import/no-duplicates': 'error',
+
+      // Forbid import of modules using absolute paths
+      // https://github.com/benmosher/eslint-plugin-import/blob/main/docs/rules/no-absolute-path.md
+      'import/no-absolute-path': 'error',
+
+      // Forbid Webpack loader syntax in imports
+      // https://github.com/benmosher/eslint-plugin-import/blob/main/docs/rules/no-webpack-loader-syntax.md
+      'import/no-webpack-loader-syntax': 'error',
+
+      // Reports if a module"s default export is unnamed
+      // https://github.com/benmosher/eslint-plugin-import/blob/main/docs/rules/no-anonymous-default-export.md
+      'import/no-anonymous-default-export': 'error',
+    },
+  },
+  {
+    name: 'plugin/react',
+    plugins: {
+      ...react.configs.flat.recommended.plugins,
+      // @ts-ignore noUncheckedIndexedAccess
+      ...react.configs.flat['jsx-runtime'].plugins,
+    },
+    rules: {
+      ...react.configs.flat.recommended.rules,
+      // @ts-ignore noUncheckedIndexedAccess
+      ...react.configs.flat['jsx-runtime'].rules,
+
+      // 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'},
+      ],
+
+      // 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/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']}],
+
+      // We do not need proptypes since we're using typescript
+      'react/prop-types': 'off',
+
+      // 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',
+
+      // 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'},
+      ],
+    },
+  },
+  {
+    name: 'plugin/react-hooks',
+    plugins: {'react-hooks': reactHooks},
+    rules: {
+      'react-hooks/rules-of-hooks': 'error',
+      'react-hooks/exhaustive-deps': [
+        'error',
+        {additionalHooks: '(useEffectAfterFirstRender|useMemoWithPrevious)'},
+      ],
+    },
+  },
+  {
+    name: 'plugin/@typescript-eslint',
+    plugins: {'@typescript-eslint': typescript.plugin},
+    rules: {
+      // 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',
+
+      /**
+       * 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',
+
+      // 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'],
+        },
+      ],
+    },
+  },
+  {
+    name: 'plugin/@typescript-eslint && process.env.SENTRY_DETECT_DEPRECATIONS',
+    rules: {
+      '@typescript-eslint/no-deprecated': process.env.SENTRY_DETECT_DEPRECATIONS
+        ? 'error'
+        : 'off',
+    },
+  },
+  {
+    name: 'plugin/typescript-sort-keys',
+    plugins: {'typescript-sort-keys': typescriptSortKeys},
+    rules: {
+      'typescript-sort-keys/interface': [
+        'error',
+        'asc',
+        {caseSensitive: true, natural: false, requiredFirst: true},
+      ],
+    },
+  },
+  {
+    name: 'plugin/simple-import-sort',
+    plugins: {'simple-import-sort': simpleImportSort},
+    rules: {
+      /**
+       * Better import sorting
+       */
+      'sort-imports': 'off',
+      'simple-import-sort/imports': [
+        'error',
+        {
+          groups: [
+            // Side effect imports.
+            ['^\\u0000'],
+
+            // Node.js builtins.
+            [`^(${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.
+            ['^\\./(?=.*/)(?!/?$)', '^\\.(?!/?$)', '^\\./?$'],
+          ],
+        },
+      ],
+    },
+  },
+  {
+    name: 'plugin/sentry',
+    plugins: {sentry},
+    rules: {
+      'sentry/no-digits-in-tn': 'error',
+      'sentry/no-dynamic-translations': 'error',
+      'sentry/no-styled-shortcut': 'error',
+    },
+  },
+  {
+    name: 'plugin/@emotion',
+    plugins: {'@emotion': emotion},
+    rules: {
+      '@emotion/import-from-emotion': 'off', // Not needed, in v11 we import from @emotion/react
+      '@emotion/jsx-import': 'off', // Not needed, handled by babel
+      '@emotion/no-vanilla': 'error',
+      '@emotion/pkg-renaming': 'off', // Not needed, we have migrated to v11 and the old package names cannot be used anymore
+      '@emotion/styled-import': 'error',
+      '@emotion/syntax-preference': ['off', 'string'], // TODO(ryan953): Enable this so `css={css``}` is required
+    },
+  },
+  {
+    name: 'plugin/jest',
+    files: ['**/*.spec.{ts,js,tsx,jsx}', 'tests/js/**/*.{ts,js,tsx,jsx}'],
+    plugins: jest.configs['flat/recommended'].plugins,
+    rules: {
+      ...jest.configs['flat/recommended'].rules,
+      ...jest.configs['flat/style'].rules,
+
+      // `recommended` set this to warn, we've upgraded to error
+      'jest/no-disabled-tests': 'error',
+
+      // `recommended` set this to warn, we've downgraded to 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', // TODO(ryan953): Fix violations then delete this line
+
+      // Disabled as we do sometimes have conditional expects
+      'jest/no-conditional-expect': 'off', // TODO(ryan953): Fix violations then delete this line
+
+      // We don't recommend snapshots, but if there are any keep it small
+      'jest/no-large-snapshots': ['error', {maxSize: 2000}],
+    },
+  },
+  {
+    name: 'plugin/jest-dom',
+    files: ['**/*.spec.{ts,js,tsx,jsx}', 'tests/js/**/*.{ts,js,tsx,jsx}'],
+    ...jestDom.configs['flat/recommended'],
+  },
+  {
+    name: 'plugin/testing-library',
+    files: ['**/*.spec.{ts,js,tsx,jsx}', 'tests/js/**/*.{ts,js,tsx,jsx}'],
+    ...testingLibrary.configs['flat/react'],
+    rules: {
+      ...testingLibrary.configs['flat/react'].rules,
+      'testing-library/render-result-naming-convention': 'off',
+      'testing-library/no-unnecessary-act': 'off',
+    },
+  },
+  {
+    name: 'plugin/prettier',
+    ...prettier,
+  },
+  {
+    name: 'files/devtoolbar',
+    files: ['static/app/components/devtoolbar/**/*.{ts,tsx}'],
+    rules: {
+      'no-restricted-imports': [
+        'error',
+        {
+          paths: [
+            ...restrictedImportPaths,
+            {
+              name: 'sentry/utils/queryClient',
+              message:
+                'Import from `@tanstack/react-query` and `./hooks/useFetchApiData` or `./hooks/useFetchInfiniteApiData` instead.',
+            },
+          ],
+        },
+      ],
+    },
+  },
+  {
+    name: 'files/sentry-test',
+    files: ['**/*.spec.{ts,js,tsx,jsx}', 'tests/js/**/*.{ts,js,tsx,jsx}'],
+    rules: {
+      'no-restricted-imports': [
+        'error',
+        {
+          patterns: restrictedImportPatterns,
+          paths: [
+            ...restrictedImportPaths,
+            {
+              name: 'sentry/locale',
+              message: 'Translations are not needed in tests.',
+            },
+          ],
+        },
+      ],
+    },
+  },
+  {
+    // We specify rules explicitly for the sdk-loader here so we do not have
+    // eslint ignore comments included in the source file, which is consumed
+    // by users.
+    name: 'files/js-sdk-loader.ts',
+    files: ['**/js-sdk-loader.ts'],
+    rules: {
+      'no-console': 'off',
+    },
+  },
+]);
diff --git a/fixtures/backup/model_dependencies/detailed.json b/fixtures/backup/model_dependencies/detailed.json
index 36a9e3dbd3f9f0..fa37af84c3316f 100644
--- a/fixtures/backup/model_dependencies/detailed.json
+++ b/fixtures/backup/model_dependencies/detailed.json
@@ -3223,22 +3223,6 @@
       ]
     ]
   },
-  "sentry.metricskeyindexer": {
-    "dangling": false,
-    "foreign_keys": {},
-    "model": "sentry.metricskeyindexer",
-    "relocation_dependencies": [],
-    "relocation_scope": "Excluded",
-    "silos": [
-      "Region"
-    ],
-    "table_name": "sentry_metricskeyindexer",
-    "uniques": [
-      [
-        "string"
-      ]
-    ]
-  },
   "sentry.monitor": {
     "dangling": false,
     "foreign_keys": {
@@ -6242,6 +6226,34 @@
       ]
     ]
   },
+  "tempest.tempestcredentials": {
+    "dangling": false,
+    "foreign_keys": {
+      "created_by_id": {
+        "kind": "HybridCloudForeignKey",
+        "model": "sentry.user",
+        "nullable": true
+      },
+      "project": {
+        "kind": "FlexibleForeignKey",
+        "model": "sentry.project",
+        "nullable": false
+      }
+    },
+    "model": "tempest.tempestcredentials",
+    "relocation_dependencies": [],
+    "relocation_scope": "Excluded",
+    "silos": [
+      "Region"
+    ],
+    "table_name": "tempest_tempestcredentials",
+    "uniques": [
+      [
+        "client_id",
+        "project"
+      ]
+    ]
+  },
   "uptime.projectuptimesubscription": {
     "dangling": false,
     "foreign_keys": {
@@ -6302,6 +6314,26 @@
       ]
     ]
   },
+  "uptime.uptimesubscriptionregion": {
+    "dangling": false,
+    "foreign_keys": {
+      "uptime_subscription": {
+        "kind": "FlexibleForeignKey",
+        "model": "uptime.uptimesubscription",
+        "nullable": false
+      }
+    },
+    "model": "uptime.uptimesubscriptionregion",
+    "relocation_dependencies": [],
+    "relocation_scope": "Excluded",
+    "silos": [
+      "Region"
+    ],
+    "table_name": "uptime_uptimesubscriptionregion",
+    "uniques": [
+      []
+    ]
+  },
   "workflow_engine.action": {
     "dangling": false,
     "foreign_keys": {
@@ -6691,4 +6723,4 @@
       ]
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/fixtures/backup/model_dependencies/flat.json b/fixtures/backup/model_dependencies/flat.json
index a0d8ea7b429b94..dbab6290805ea0 100644
--- a/fixtures/backup/model_dependencies/flat.json
+++ b/fixtures/backup/model_dependencies/flat.json
@@ -447,7 +447,6 @@
   "sentry.lostpasswordhash": [
     "sentry.user"
   ],
-  "sentry.metricskeyindexer": [],
   "sentry.monitor": [
     "sentry.organization",
     "sentry.project",
@@ -857,6 +856,10 @@
   "social_auth.usersocialauth": [
     "sentry.user"
   ],
+  "tempest.tempestcredentials": [
+    "sentry.project",
+    "sentry.user"
+  ],
   "uptime.projectuptimesubscription": [
     "sentry.environment",
     "sentry.project",
@@ -865,6 +868,9 @@
     "uptime.uptimesubscription"
   ],
   "uptime.uptimesubscription": [],
+  "uptime.uptimesubscriptionregion": [
+    "uptime.uptimesubscription"
+  ],
   "workflow_engine.action": [
     "sentry.integration"
   ],
@@ -924,4 +930,4 @@
     "workflow_engine.dataconditiongroup",
     "workflow_engine.workflow"
   ]
-}
\ No newline at end of file
+}
diff --git a/fixtures/backup/model_dependencies/sorted.json b/fixtures/backup/model_dependencies/sorted.json
index 35b2892abcf3a4..dd666a1a710ca4 100644
--- a/fixtures/backup/model_dependencies/sorted.json
+++ b/fixtures/backup/model_dependencies/sorted.json
@@ -18,7 +18,6 @@
   "sentry.identityprovider",
   "sentry.integration",
   "sentry.integrationfeature",
-  "sentry.metricskeyindexer",
   "sentry.monitorlocation",
   "sentry.option",
   "sentry.organization",
@@ -49,6 +48,7 @@
   "sentry.userroleuser",
   "social_auth.usersocialauth",
   "uptime.uptimesubscription",
+  "uptime.uptimesubscriptionregion",
   "workflow_engine.action",
   "workflow_engine.dataconditiongroup",
   "workflow_engine.dataconditiongroupaction",
@@ -117,6 +117,7 @@
   "workflow_engine.detector",
   "workflow_engine.datasourcedetector",
   "uptime.projectuptimesubscription",
+  "tempest.tempestcredentials",
   "sentry.userreport",
   "sentry.useroption",
   "sentry.useremail",
@@ -246,4 +247,4 @@
   "sentry.incidentsnapshot",
   "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 39ed0286c7e715..415a6f5e10ec8b 100644
--- a/fixtures/backup/model_dependencies/truncate.json
+++ b/fixtures/backup/model_dependencies/truncate.json
@@ -18,7 +18,6 @@
   "sentry_identityprovider",
   "sentry_integration",
   "sentry_integrationfeature",
-  "sentry_metricskeyindexer",
   "sentry_monitorlocation",
   "sentry_option",
   "sentry_organization",
@@ -49,6 +48,7 @@
   "sentry_userrole_users",
   "social_auth_usersocialauth",
   "uptime_uptimesubscription",
+  "uptime_uptimesubscriptionregion",
   "workflow_engine_action",
   "workflow_engine_dataconditiongroup",
   "workflow_engine_dataconditiongroupaction",
@@ -117,6 +117,7 @@
   "workflow_engine_detector",
   "workflow_engine_datasourcedetector",
   "uptime_projectuptimesubscription",
+  "tempest_tempestcredentials",
   "sentry_userreport",
   "sentry_useroption",
   "sentry_useremail",
@@ -246,4 +247,4 @@
   "sentry_incidentsnapshot",
   "sentry_incidentproject",
   "sentry_incidentactivity"
-]
\ No newline at end of file
+]
diff --git a/fixtures/sdk_crash_detection/crash_event_android.py b/fixtures/sdk_crash_detection/crash_event_android.py
index bf6634215561a9..d7990c3ecb4cfb 100644
--- a/fixtures/sdk_crash_detection/crash_event_android.py
+++ b/fixtures/sdk_crash_detection/crash_event_android.py
@@ -96,6 +96,22 @@ def get_apex_crash_event(
     )
 
 
+def get_exception(
+    frames: Sequence[Mapping[str, str]],
+    mechanism=None,
+) -> dict[str, object]:
+    if mechanism is None:
+        # linter complains about mutable arguments otherwise
+        mechanism = {"type": "onerror", "handled": False}
+    return {
+        "type": "IllegalArgumentException",
+        "value": "SDK Crash",
+        "module": "java.lang",
+        "stacktrace": {"frames": frames},
+        "mechanism": mechanism,
+    }
+
+
 def get_crash_event_with_frames(frames: Sequence[Mapping[str, str]], **kwargs) -> dict[str, object]:
     result = {
         "event_id": "0a52a8331d3b45089ebd74f8118d4fa1",
@@ -103,17 +119,7 @@ def get_crash_event_with_frames(frames: Sequence[Mapping[str, str]], **kwargs) -
         "dist": "2",
         "platform": "java",
         "environment": "debug",
-        "exception": {
-            "values": [
-                {
-                    "type": "IllegalArgumentException",
-                    "value": "SDK Crash",
-                    "module": "java.lang",
-                    "stacktrace": {"frames": frames},
-                    "mechanism": {"type": "onerror", "handled": False},
-                }
-            ]
-        },
+        "exception": {"values": [get_exception(frames)]},
         "key_id": "1336851",
         "level": "fatal",
         "contexts": {
diff --git a/fixtures/sdk_crash_detection/crash_event_react_native.py b/fixtures/sdk_crash_detection/crash_event_react_native.py
index a700e30f46c1c8..8884cb115a600c 100644
--- a/fixtures/sdk_crash_detection/crash_event_react_native.py
+++ b/fixtures/sdk_crash_detection/crash_event_react_native.py
@@ -46,6 +46,18 @@ def get_frames(filename: str) -> Sequence[MutableMapping[str, str]]:
     return frames
 
 
+def get_exception(
+    frames: Sequence[Mapping[str, str]],
+    mechanism_type: str = "onerror",
+) -> dict[str, object]:
+    return {
+        "type": "Error",
+        "value": "Uncaught Thrown Error",
+        "stacktrace": {"frames": frames},
+        "mechanism": {"type": mechanism_type, "handled": False},
+    }
+
+
 def get_crash_event(
     filename="/Users/sentry.user/git-repos/sentry-react-native/dist/js/client.js", **kwargs
 ) -> dict[str, object]:
@@ -60,16 +72,7 @@ def get_crash_event_with_frames(frames: Sequence[Mapping[str, str]], **kwargs) -
         "platform": "javascript",
         "message": "",
         "environment": "dev",
-        "exception": {
-            "values": [
-                {
-                    "type": "Error",
-                    "value": "Uncaught Thrown Error",
-                    "stacktrace": {"frames": frames},
-                    "mechanism": {"type": "onerror", "handled": False},
-                }
-            ]
-        },
+        "exception": {"values": [get_exception(frames)]},
         "key_id": "3554525",
         "level": "fatal",
         "contexts": {
diff --git a/fixtures/search-syntax/explicit_number_tag.json b/fixtures/search-syntax/explicit_number_tag.json
new file mode 100644
index 00000000000000..57337d8d6f7fda
--- /dev/null
+++ b/fixtures/search-syntax/explicit_number_tag.json
@@ -0,0 +1,43 @@
+[
+  {
+    "query": "tags[foo,number]:456 release:1.2.1 tags[project_id,number]:123",
+    "result": [
+      {"type": "spaces", "value": ""},
+      {
+        "type": "filter",
+        "filter": "text",
+        "negated": false,
+        "key": {
+          "type": "keyExplicitNumberTag",
+          "prefix": "tags",
+          "key": {"type": "keySimple", "value": "foo", "quoted": false}
+        },
+        "operator": "",
+        "value": {"type": "valueText", "value": "456", "quoted": false}
+      },
+      {"type": "spaces", "value": " "},
+      {
+        "type": "filter",
+        "filter": "text",
+        "negated": false,
+        "key": {"type": "keySimple", "value": "release", "quoted": false},
+        "operator": "",
+        "value": {"type": "valueText", "value": "1.2.1", "quoted": false}
+      },
+      {"type": "spaces", "value": " "},
+      {
+        "type": "filter",
+        "filter": "text",
+        "negated": false,
+        "key": {
+          "type": "keyExplicitNumberTag",
+          "prefix": "tags",
+          "key": {"type": "keySimple", "value": "project_id", "quoted": false}
+        },
+        "operator": "",
+        "value": {"type": "valueText", "value": "123", "quoted": false}
+      },
+      {"type": "spaces", "value": ""}
+    ]
+  }
+]
diff --git a/fixtures/search-syntax/explicit_number_tags_in_filter.json b/fixtures/search-syntax/explicit_number_tags_in_filter.json
new file mode 100644
index 00000000000000..2e7cd62cc6321d
--- /dev/null
+++ b/fixtures/search-syntax/explicit_number_tags_in_filter.json
@@ -0,0 +1,34 @@
+[
+  {
+    "query": "tags[foo,number]:[123, 456]",
+    "result": [
+      {"type": "spaces", "value": ""},
+      {
+        "type": "filter",
+        "filter": "textIn",
+        "negated": false,
+        "key": {
+          "type": "keyExplicitNumberTag",
+          "prefix": "tags",
+          "key": {"type": "keySimple", "value": "foo", "quoted": false}
+        },
+        "operator": "",
+        "value": {
+          "type": "valueTextList",
+          "items": [
+            {
+              "separator": "",
+              "value": {"type": "valueText", "value": "123", "quoted": false}
+            },
+            {
+              "separator": ", ",
+              "value": {"type": "valueText", "value": "456", "quoted": false}
+            }
+          ]
+        }
+      },
+      {"type": "spaces", "value": ""}
+    ]
+  }
+]
+
diff --git a/fixtures/search-syntax/explicit_string_tag.json b/fixtures/search-syntax/explicit_string_tag.json
new file mode 100644
index 00000000000000..8dd326ff2ed9fe
--- /dev/null
+++ b/fixtures/search-syntax/explicit_string_tag.json
@@ -0,0 +1,43 @@
+[
+  {
+    "query": "tags[fruit,string]:apple release:1.2.1 tags[project_id,string]:123",
+    "result": [
+      {"type": "spaces", "value": ""},
+      {
+        "type": "filter",
+        "filter": "text",
+        "negated": false,
+        "key": {
+          "type": "keyExplicitStringTag",
+          "prefix": "tags",
+          "key": {"type": "keySimple", "value": "fruit", "quoted": false}
+        },
+        "operator": "",
+        "value": {"type": "valueText", "value": "apple", "quoted": false}
+      },
+      {"type": "spaces", "value": " "},
+      {
+        "type": "filter",
+        "filter": "text",
+        "negated": false,
+        "key": {"type": "keySimple", "value": "release", "quoted": false},
+        "operator": "",
+        "value": {"type": "valueText", "value": "1.2.1", "quoted": false}
+      },
+      {"type": "spaces", "value": " "},
+      {
+        "type": "filter",
+        "filter": "text",
+        "negated": false,
+        "key": {
+          "type": "keyExplicitStringTag",
+          "prefix": "tags",
+          "key": {"type": "keySimple", "value": "project_id", "quoted": false}
+        },
+        "operator": "",
+        "value": {"type": "valueText", "value": "123", "quoted": false}
+      },
+      {"type": "spaces", "value": ""}
+    ]
+  }
+]
diff --git a/fixtures/search-syntax/explicit_string_tags_in_filter.json b/fixtures/search-syntax/explicit_string_tags_in_filter.json
new file mode 100644
index 00000000000000..ebf6b7038d9da8
--- /dev/null
+++ b/fixtures/search-syntax/explicit_string_tags_in_filter.json
@@ -0,0 +1,65 @@
+[
+  {
+    "query": "tags[fruit,string]:[apple, pear]",
+    "result": [
+      {"type": "spaces", "value": ""},
+      {
+        "type": "filter",
+        "filter": "textIn",
+        "negated": false,
+        "key": {
+          "type": "keyExplicitStringTag",
+          "prefix": "tags",
+          "key": {"type": "keySimple", "value": "fruit", "quoted": false}
+        },
+        "operator": "",
+        "value": {
+          "type": "valueTextList",
+          "items": [
+            {
+              "separator": "",
+              "value": {"type": "valueText", "value": "apple", "quoted": false}
+            },
+            {
+              "separator": ", ",
+              "value": {"type": "valueText", "value": "pear", "quoted": false}
+            }
+          ]
+        }
+      },
+      {"type": "spaces", "value": ""}
+    ]
+  },
+  {
+    "query": "tags[fruit,string]:[\"apple wow\", \"pear\"]",
+    "result": [
+      {"type": "spaces", "value": ""},
+      {
+        "type": "filter",
+        "filter": "textIn",
+        "negated": false,
+        "key": {
+          "type": "keyExplicitStringTag",
+          "prefix": "tags",
+          "key": {"type": "keySimple", "value": "fruit", "quoted": false}
+        },
+        "operator": "",
+        "value": {
+          "type": "valueTextList",
+          "items": [
+            {
+              "separator": "",
+              "value": {"type": "valueText", "value": "apple wow", "quoted": true}
+            },
+            {
+              "separator": ", ",
+              "value": {"type": "valueText", "value": "pear", "quoted": true}
+            }
+          ]
+        }
+      },
+      {"type": "spaces", "value": ""}
+    ]
+  }
+]
+
diff --git a/migrations_lockfile.txt b/migrations_lockfile.txt
index ef62e79b102a35..8110b79486af6a 100644
--- a/migrations_lockfile.txt
+++ b/migrations_lockfile.txt
@@ -15,10 +15,12 @@ remote_subscriptions: 0003_drop_remote_subscription
 
 replays: 0004_index_together
 
-sentry: 0802_remove_grouping_auto_update_option
+sentry: 0804_delete_metrics_key_indexer_pt2
 
 social_auth: 0002_default_auto_field
 
-uptime: 0018_add_trace_sampling_field_to_uptime
+tempest: 0001_create_tempest_credentials_model
 
-workflow_engine: 0015_create_rule_lookup_tables
+uptime: 0021_drop_region_table_col
+
+workflow_engine: 0019_drop_dataconditions_condition
diff --git a/package.json b/package.json
index 0a27d0d93efa85..d630a938fb33f8 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-beta.0",
-    "@sentry/node": "8.39.0-beta.0",
-    "@sentry/react": "8.39.0-beta.0",
+    "@sentry/core": "8.43.0",
+    "@sentry/node": "8.43.0",
+    "@sentry/react": "8.43.0",
     "@sentry/release-parser": "^1.3.1",
     "@sentry/status-page-list": "^0.3.0",
-    "@sentry/types": "8.39.0-beta.0",
-    "@sentry/utils": "8.39.0-beta.0",
+    "@sentry/types": "8.43.0",
+    "@sentry/utils": "8.43.0",
     "@sentry/webpack-plugin": "^2.22.4",
     "@spotlightjs/spotlight": "^2.0.0-alpha.1",
     "@tanstack/react-query": "^5.56.2",
@@ -177,32 +177,34 @@
     "@biomejs/biome": "^1.9.1",
     "@codecov/webpack-plugin": "^1.2.0",
     "@emotion/eslint-plugin": "^11.12.0",
+    "@eslint/compat": "^1.2.4",
+    "@eslint/eslintrc": "^3.2.0",
+    "@eslint/js": "^9.17.0",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.15",
     "@sentry/jest-environment": "6.0.0",
-    "@sentry/profiling-node": "8.39.0-beta.0",
+    "@sentry/profiling-node": "8.43.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": "^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-import-resolver-typescript": "^3.6.3",
+    "eslint": "^9.17.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-import-resolver-typescript": "^3.7.0",
     "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-jest": "^28.10.0",
+    "eslint-plugin-jest-dom": "^5.5.0",
+    "eslint-plugin-react": "^7.37.3",
+    "eslint-plugin-react-hooks": "5.0.0",
     "eslint-plugin-sentry": "^2.10.0",
     "eslint-plugin-simple-import-sort": "^12.1.1",
-    "eslint-plugin-testing-library": "^6.3.0",
+    "eslint-plugin-testing-library": "^7.1.1",
     "eslint-plugin-typescript-sort-keys": "^3.3.0",
+    "globals": "^15.14.0",
     "html-webpack-plugin": "^5.6.0",
     "jest": "29.7.0",
     "jest-canvas-mock": "^2.5.2",
@@ -215,6 +217,7 @@
     "stylelint-config-recommended": "^14.0.1",
     "terser": "5.31.6",
     "tsconfig-paths": "^4.2.0",
+    "typescript-eslint": "^8.18.2",
     "webpack-dev-server": "5.1.0"
   },
   "resolutions": {
@@ -232,12 +235,12 @@
     "test-precommit": "node scripts/test.js --bail --findRelatedTests -u",
     "test-staged": "node scripts/test.js --findRelatedTests $(git diff --name-only --cached)",
     "lint": "yarn lint:biome && yarn lint:prettier && yarn lint:js && yarn lint:css",
-    "lint:js": "eslint . --ext .js,.ts,.tsx",
+    "lint:js": "eslint",
     "lint:css": "stylelint '**/*.[jt]sx'",
     "lint:biome": "biome check .",
     "lint:prettier": "prettier \"**/*.md\" \"**/*.yaml\" \"**/*.[jt]s(x)?\" --check --log-level=error",
     "fix": "yarn fix:biome && yarn fix:prettier && yarn fix:eslint",
-    "fix:eslint": "eslint . --ext .js,.ts,.tsx --fix",
+    "fix:eslint": "eslint --fix",
     "fix:biome": "biome check . --write",
     "fix:prettier": "prettier \"**/*.md\" \"**/*.yaml\" \"**/*.[jt]s(x)?\" --write --log-level=error",
     "dev": "(yarn check --verify-tree || yarn install --check-files) && sentry devserver",
diff --git a/pyproject.toml b/pyproject.toml
index 83c9759ec9c211..0a21b614af9296 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -120,7 +120,6 @@ ignore_missing_imports = true
 module = [
     "sentry.api.base",
     "sentry.api.bases.organization_events",
-    "sentry.api.bases.organizationmember",
     "sentry.api.bases.team",
     "sentry.api.endpoints.accept_organization_invite",
     "sentry.api.endpoints.auth_config",
@@ -132,7 +131,6 @@ module = [
     "sentry.api.endpoints.index",
     "sentry.api.endpoints.internal.mail",
     "sentry.api.endpoints.organization_details",
-    "sentry.api.endpoints.organization_events",
     "sentry.api.endpoints.organization_events_facets_performance",
     "sentry.api.endpoints.organization_events_meta",
     "sentry.api.endpoints.organization_events_spans_performance",
@@ -146,18 +144,14 @@ module = [
     "sentry.api.endpoints.organization_releases",
     "sentry.api.endpoints.organization_request_project_creation",
     "sentry.api.endpoints.organization_search_details",
-    "sentry.api.endpoints.organization_sessions",
     "sentry.api.endpoints.organization_stats",
     "sentry.api.endpoints.project_index",
     "sentry.api.endpoints.project_ownership",
     "sentry.api.endpoints.project_release_files",
     "sentry.api.endpoints.project_repo_path_parsing",
-    "sentry.api.endpoints.project_rule_preview",
     "sentry.api.endpoints.project_rules_configuration",
-    "sentry.api.endpoints.project_servicehook_stats",
     "sentry.api.endpoints.project_transaction_names",
     "sentry.api.endpoints.team_details",
-    "sentry.api.endpoints.team_release_count",
     "sentry.api.endpoints.user_subscriptions",
     "sentry.api.event_search",
     "sentry.api.helpers.group_index.index",
@@ -167,7 +161,6 @@ module = [
     "sentry.api.permissions",
     "sentry.api.serializers.models.auth_provider",
     "sentry.api.serializers.models.dashboard",
-    "sentry.api.serializers.models.environment",
     "sentry.api.serializers.models.event",
     "sentry.api.serializers.models.group",
     "sentry.api.serializers.models.group_stream",
@@ -176,7 +169,6 @@ module = [
     "sentry.api.serializers.models.project",
     "sentry.api.serializers.models.role",
     "sentry.api.serializers.models.rule",
-    "sentry.api.serializers.models.team",
     "sentry.api.serializers.rest_framework.mentions",
     "sentry.auth.helper",
     "sentry.auth.provider",
@@ -214,7 +206,6 @@ module = [
     "sentry.integrations.gitlab.client",
     "sentry.integrations.gitlab.integration",
     "sentry.integrations.gitlab.issues",
-    "sentry.integrations.jira.actions.form",
     "sentry.integrations.jira.client",
     "sentry.integrations.jira.integration",
     "sentry.integrations.jira.views.base",
@@ -285,10 +276,7 @@ module = [
     "sentry.scim.endpoints.utils",
     "sentry.search.events.builder.errors",
     "sentry.search.events.builder.metrics",
-    "sentry.search.events.datasets.discover",
     "sentry.search.events.datasets.filter_aliases",
-    "sentry.search.events.datasets.function_aliases",
-    "sentry.search.events.datasets.metrics",
     "sentry.search.events.datasets.metrics_layer",
     "sentry.search.events.fields",
     "sentry.search.events.filter",
@@ -302,8 +290,6 @@ module = [
     "sentry.snuba.metrics.datasource",
     "sentry.snuba.metrics.fields.base",
     "sentry.snuba.metrics.query_builder",
-    "sentry.snuba.sessions_v2",
-    "sentry.snuba.spans_indexed",
     "sentry.snuba.spans_metrics",
     "sentry.tagstore.snuba.backend",
     "sentry.tagstore.types",
@@ -324,17 +310,11 @@ module = [
     "sentry_plugins.bitbucket.mixins",
     "sentry_plugins.github.plugin",
     "sentry_plugins.jira.plugin",
-    "tests.sentry.api.bases.test_organization",
-    "tests.sentry.api.bases.test_project",
-    "tests.sentry.api.bases.test_team",
     "tests.sentry.api.endpoints.notifications.test_notification_actions_details",
     "tests.sentry.api.endpoints.notifications.test_notification_actions_index",
-    "tests.sentry.api.endpoints.test_event_attachment_details",
     "tests.sentry.api.helpers.test_group_index",
-    "tests.sentry.api.test_authentication",
     "tests.sentry.api.test_base",
     "tests.sentry.api.test_event_search",
-    "tests.sentry.eventstore.test_base",
     "tests.sentry.issues.test_utils",
 ]
 disable_error_code = [
@@ -360,13 +340,22 @@ disable_error_code = [
 # begin: stronger typing
 [[tool.mypy.overrides]]
 module = [
+    "fixtures.safe_migrations_apps.*",
+    "sentry.analytics.*",
+    "sentry.api.endpoints.integrations.sentry_apps.installation.external_issue.*",
     "sentry.api.endpoints.project_backfill_similar_issues_embeddings_records",
+    "sentry.api.endpoints.release_thresholds.health_checks.*",
+    "sentry.api.endpoints.relocations.artifacts.*",
     "sentry.api.helpers.deprecation",
     "sentry.api.helpers.source_map_helper",
+    "sentry.api.serializers.models.organization_member.*",
+    "sentry.audit_log.services.*",
     "sentry.auth.services.*",
     "sentry.auth.view",
     "sentry.buffer.*",
     "sentry.build.*",
+    "sentry.data_secrecy.models.*",
+    "sentry.data_secrecy.service.*",
     "sentry.db.models.fields.citext",
     "sentry.db.models.fields.foreignkey",
     "sentry.db.models.fields.hybrid_cloud_foreign_key",
@@ -375,31 +364,82 @@ module = [
     "sentry.db.models.paranoia",
     "sentry.db.models.utils",
     "sentry.deletions.*",
+    "sentry.digests.*",
     "sentry.digests.notifications",
+    "sentry.dynamic_sampling.models.*",
+    "sentry.dynamic_sampling.rules.biases.*",
+    "sentry.dynamic_sampling.rules.combinators.*",
+    "sentry.dynamic_sampling.rules.helpers.*",
+    "sentry.dynamic_sampling.tasks.helpers.*",
+    "sentry.eventstore.reprocessing.*",
     "sentry.eventstore.reprocessing.redis",
+    "sentry.eventstream.*",
     "sentry.eventtypes.error",
+    "sentry.feedback.migrations.*",
+    "sentry.flags.migrations.*",
+    "sentry.grouping.api",
     "sentry.grouping.component",
     "sentry.grouping.fingerprinting",
+    "sentry.grouping.fingerprinting.*",
+    "sentry.grouping.grouping_info",
     "sentry.grouping.ingest.*",
     "sentry.grouping.parameterization",
+    "sentry.grouping.utils",
+    "sentry.grouping.variants",
     "sentry.hybridcloud.*",
+    "sentry.identity.discord.*",
     "sentry.identity.github_enterprise.*",
+    "sentry.identity.services.*",
+    "sentry.identity.vsts_extension.*",
+    "sentry.incidents.utils.*",
     "sentry.ingest.slicing",
+    "sentry.integrations.discord.actions.*",
+    "sentry.integrations.discord.message_builder.base.component.*",
+    "sentry.integrations.discord.message_builder.base.embed.*",
+    "sentry.integrations.discord.utils.*",
+    "sentry.integrations.discord.views.*",
+    "sentry.integrations.discord.webhooks.*",
+    "sentry.integrations.github.actions.*",
+    "sentry.integrations.github_enterprise.actions.*",
+    "sentry.integrations.jira.actions.*",
+    "sentry.integrations.jira.endpoints.*",
+    "sentry.integrations.jira.models.*",
+    "sentry.integrations.jira_server.actions.*",
+    "sentry.integrations.jira_server.utils.*",
     "sentry.integrations.models.integration_feature",
+    "sentry.integrations.project_management.*",
+    "sentry.integrations.repository.*",
+    "sentry.integrations.services.*",
+    "sentry.integrations.slack.threads.*",
+    "sentry.integrations.slack.views.*",
+    "sentry.integrations.vsts.actions.*",
+    "sentry.integrations.vsts.tasks.*",
+    "sentry.integrations.web.debug.*",
     "sentry.issues",
     "sentry.issues.analytics",
     "sentry.issues.apps",
     "sentry.issues.constants",
     "sentry.issues.endpoints",
+    "sentry.issues.endpoints.actionable_items",
     "sentry.issues.endpoints.group_activities",
     "sentry.issues.endpoints.group_event_details",
     "sentry.issues.endpoints.group_events",
-    "sentry.issues.endpoints.group_participants",
+    "sentry.issues.endpoints.group_notes",
+    "sentry.issues.endpoints.group_notes_details",
+    "sentry.issues.endpoints.group_similar_issues_embeddings",
+    "sentry.issues.endpoints.group_tombstone",
+    "sentry.issues.endpoints.group_tombstone_details",
+    "sentry.issues.endpoints.organization_eventid",
+    "sentry.issues.endpoints.organization_group_index",
     "sentry.issues.endpoints.organization_group_index_stats",
     "sentry.issues.endpoints.organization_group_search_views",
     "sentry.issues.endpoints.organization_release_previous_commits",
     "sentry.issues.endpoints.organization_searches",
+    "sentry.issues.endpoints.organization_shortid",
+    "sentry.issues.endpoints.project_event_details",
     "sentry.issues.endpoints.project_events",
+    "sentry.issues.endpoints.project_group_index",
+    "sentry.issues.endpoints.project_group_stats",
     "sentry.issues.endpoints.project_stacktrace_link",
     "sentry.issues.endpoints.related_issues",
     "sentry.issues.endpoints.shared_group_details",
@@ -420,6 +460,7 @@ module = [
     "sentry.issues.receivers",
     "sentry.issues.related.*",
     "sentry.issues.run",
+    "sentry.issues.services.*",
     "sentry.issues.status_change",
     "sentry.issues.status_change_consumer",
     "sentry.issues.status_change_message",
@@ -427,39 +468,78 @@ module = [
     "sentry.lang.java.processing",
     "sentry.llm.*",
     "sentry.migrations.*",
+    "sentry.models.activity",
     "sentry.models.event",
     "sentry.models.eventattachment",
+    "sentry.models.groupassignee",
+    "sentry.models.grouphistory",
     "sentry.models.groupsubscription",
-    "sentry.monkey",
+    "sentry.models.options.*",
+    "sentry.monkey.*",
+    "sentry.nodestore.*",
     "sentry.nodestore.base",
     "sentry.nodestore.bigtable.backend",
     "sentry.nodestore.django.backend",
     "sentry.nodestore.django.models",
     "sentry.nodestore.filesystem.backend",
     "sentry.nodestore.models",
+    "sentry.notifications.services.*",
     "sentry.organizations.*",
     "sentry.ownership.*",
     "sentry.plugins.base.response",
     "sentry.plugins.base.view",
+    "sentry.plugins.validators.*",
+    "sentry.post_process_forwarder.*",
     "sentry.profiles.*",
-    "sentry.projects.services.*",
+    "sentry.projects.*",
+    "sentry.queue.*",
     "sentry.ratelimits.leaky_bucket",
     "sentry.relay.config.metric_extraction",
+    "sentry.relay.types.*",
+    "sentry.release_health.release_monitor.*",
+    "sentry.relocation.services.relocation_export.*",
+    "sentry.remote_subscriptions.migrations.*",
+    "sentry.replays.consumers.*",
+    "sentry.replays.lib.new_query.*",
+    "sentry.replays.migrations.*",
     "sentry.reprocessing2",
+    "sentry.roles.*",
+    "sentry.rules.actions.sentry_apps.*",
+    "sentry.rules.conditions.*",
+    "sentry.rules.history.endpoints.*",
     "sentry.runner.*",
     "sentry.search.snuba.backend",
-    "sentry.sentry_metrics.consumers.indexer.slicing_router",
+    "sentry.security.*",
+    "sentry.seer.similarity.*",
+    "sentry.sentry_apps.external_issues.*",
+    "sentry.sentry_apps.services.*",
+    "sentry.sentry_apps.utils.*",
+    "sentry.sentry_apps.web.*",
+    "sentry.sentry_metrics.consumers.indexer.*",
+    "sentry.sentry_metrics.indexer.limiters.*",
+    "sentry.shared_integrations.exceptions.*",
+    "sentry.slug.*",
     "sentry.snuba.metrics.extraction",
+    "sentry.snuba.metrics.naming_layer.*",
+    "sentry.snuba.query_subscriptions.*",
+    "sentry.spans.grouping.*",
     "sentry.stacktraces.platform",
     "sentry.tasks.beacon",
     "sentry.tasks.commit_context",
+    "sentry.tasks.embeddings_grouping.backfill_seer_grouping_records_for_project",
     "sentry.tasks.on_demand_metrics",
     "sentry.tasks.reprocessing2",
     "sentry.tasks.store",
     "sentry.taskworker.*",
+    "sentry.tempest.endpoints.*",
+    "sentry.tempest.migrations.*",
     "sentry.testutils.helpers.task_runner",
-    "sentry.types.actor",
-    "sentry.types.region",
+    "sentry.testutils.skips",
+    "sentry.toolbar.utils.*",
+    "sentry.trash.*",
+    "sentry.types.*",
+    "sentry.uptime.migrations.*",
+    "sentry.usage_accountant.*",
     "sentry.users.*",
     "sentry.utils.arroyo",
     "sentry.utils.assets",
@@ -476,6 +556,7 @@ module = [
     "sentry.utils.imports",
     "sentry.utils.iterators",
     "sentry.utils.javascript",
+    "sentry.utils.kvstore.*",
     "sentry.utils.lazy_service_wrapper",
     "sentry.utils.locking.*",
     "sentry.utils.migrations",
@@ -486,6 +567,7 @@ module = [
     "sentry.utils.pubsub",
     "sentry.utils.redis",
     "sentry.utils.redis_metrics",
+    "sentry.utils.sdk_crashes.*",
     "sentry.utils.sentry_apps.*",
     "sentry.utils.services",
     "sentry.utils.sms",
@@ -496,20 +578,46 @@ module = [
     "sentry.web.frontend.auth_provider_login",
     "sentry.web.frontend.cli",
     "sentry.web.frontend.csv",
+    "sentry.web.frontend.mixins.*",
+    "sentry.workflow_engine.handlers.action.*",
+    "sentry.workflow_engine.handlers.condition.*",
+    "sentry.workflow_engine.migrations.*",
     "sentry_plugins.base",
+    "social_auth.migrations.*",
+    "sudo.*",
+    "tests.sentry.audit_log.services.*",
     "tests.sentry.deletions.test_group",
     "tests.sentry.event_manager.test_event_manager",
     "tests.sentry.grouping.ingest.test_seer",
     "tests.sentry.grouping.test_fingerprinting",
     "tests.sentry.hybridcloud.*",
+    "tests.sentry.incidents.serializers.*",
+    "tests.sentry.integrations.msteams.webhook.*",
+    "tests.sentry.integrations.repository.base.*",
+    "tests.sentry.integrations.repository.issue_alert.*",
+    "tests.sentry.integrations.slack.threads.*",
     "tests.sentry.issues",
     "tests.sentry.issues.endpoints",
     "tests.sentry.issues.endpoints.test_actionable_items",
+    "tests.sentry.issues.endpoints.test_group_activities",
+    "tests.sentry.issues.endpoints.test_group_details",
+    "tests.sentry.issues.endpoints.test_group_event_details",
+    "tests.sentry.issues.endpoints.test_group_events",
+    "tests.sentry.issues.endpoints.test_group_hashes",
+    "tests.sentry.issues.endpoints.test_group_notes",
+    "tests.sentry.issues.endpoints.test_group_notes_details",
+    "tests.sentry.issues.endpoints.test_group_similar_issues_embeddings",
+    "tests.sentry.issues.endpoints.test_group_tombstone",
+    "tests.sentry.issues.endpoints.test_group_tombstone_details",
     "tests.sentry.issues.endpoints.test_organization_group_search_views",
     "tests.sentry.issues.endpoints.test_organization_searches",
+    "tests.sentry.issues.endpoints.test_organization_shortid",
+    "tests.sentry.issues.endpoints.test_project_group_stats",
     "tests.sentry.issues.endpoints.test_project_stacktrace_link",
     "tests.sentry.issues.endpoints.test_related_issues",
+    "tests.sentry.issues.endpoints.test_shared_group_details",
     "tests.sentry.issues.endpoints.test_source_map_debug",
+    "tests.sentry.issues.endpoints.test_team_groups_old",
     "tests.sentry.issues.test_attributes",
     "tests.sentry.issues.test_escalating",
     "tests.sentry.issues.test_escalating_issues_alg",
@@ -530,12 +638,25 @@ module = [
     "tests.sentry.issues.test_status_change",
     "tests.sentry.issues.test_status_change_consumer",
     "tests.sentry.issues.test_update_inbox",
+    "tests.sentry.organizations.*",
     "tests.sentry.ownership.*",
+    "tests.sentry.post_process_forwarder.*",
+    "tests.sentry.profiling.*",
+    "tests.sentry.queue.*",
     "tests.sentry.ratelimits.test_leaky_bucket",
     "tests.sentry.relay.config.test_metric_extraction",
+    "tests.sentry.replays.unit.lib.*",
+    "tests.sentry.rules.actions.base.*",
+    "tests.sentry.security.*",
+    "tests.sentry.snuba.metrics.test_metrics_query_layer.*",
+    "tests.sentry.tasks.integrations.*",
     "tests.sentry.tasks.test_on_demand_metrics",
+    "tests.sentry.types.*",
     "tests.sentry.types.test_actor",
     "tests.sentry.types.test_region",
+    "tests.sentry.usage_accountant.*",
+    "tests.sentry.users.services.*",
+    "tests.sentry.utils.mockdata.*",
     "tests.sentry.web.frontend.test_cli",
     "tools.*",
 ]
diff --git a/requirements-base.txt b/requirements-base.txt
index 4c9b1123811dd5..7b4659d0bbf825 100644
--- a/requirements-base.txt
+++ b/requirements-base.txt
@@ -41,7 +41,7 @@ packaging>=24.1
 parsimonious>=0.10.0
 petname>=2.6
 phonenumberslite>=8.12.32
-Pillow>=10.4.0
+Pillow>=11.0.0
 progressbar2>=3.41.0
 protobuf>=5.27.3
 proto-plus>=1.25.0
@@ -65,12 +65,12 @@ requests>=2.32.3
 rfc3339-validator>=0.1.2
 rfc3986-validator>=0.1.1
 # [end] jsonschema format validators
-sentry-arroyo>=2.18.2
-sentry-kafka-schemas>=0.1.122
+sentry-arroyo>=2.19.9
+sentry-kafka-schemas>=0.1.125
 sentry-ophio==1.0.0
 sentry-protos>=0.1.37
 sentry-redis-tools>=0.1.7
-sentry-relay>=0.9.3
+sentry-relay>=0.9.4
 sentry-sdk[http2]>=2.19.2
 slack-sdk>=3.27.2
 snuba-sdk>=3.0.43
diff --git a/requirements-dev-frozen.txt b/requirements-dev-frozen.txt
index e56d30cc4a488d..b562c3cee84851 100644
--- a/requirements-dev-frozen.txt
+++ b/requirements-dev-frozen.txt
@@ -23,6 +23,7 @@ celery==5.3.5
 certifi==2024.7.4
 cffi==1.17.1
 cfgv==3.3.1
+chardet==5.2.0
 charset-normalizer==3.4.0
 click==8.1.7
 click-didyoumean==0.3.0
@@ -36,10 +37,10 @@ cryptography==43.0.1
 cssselect==1.0.3
 cssutils==2.9.0
 datadog==0.49.1
-devservices==1.0.5
+devservices==1.0.8
 distlib==0.3.8
 distro==1.8.0
-django==5.1.1
+django==5.1.4
 django-crispy-forms==1.14.0
 django-csp==3.8
 django-pg-zero-downtime-migrations==0.16
@@ -105,7 +106,7 @@ mmh3==4.0.0
 more-itertools==8.13.0
 msgpack==1.1.0
 msgpack-types==0.2.0
-mypy==1.13.0
+mypy==1.14.0
 mypy-extensions==1.0.0
 nodeenv==1.9.1
 oauthlib==3.1.0
@@ -125,7 +126,7 @@ pep517==0.12.0
 petname==2.6
 phabricator==0.7.0
 phonenumberslite==8.12.55
-pillow==10.4.0
+pillow==11.0.0
 pip-tools==7.1.0
 platformdirs==4.2.0
 pluggy==1.5.0
@@ -169,7 +170,7 @@ redis==3.4.1
 redis-py-cluster==2.1.0
 referencing==0.30.2
 regex==2022.9.13
-reportlab==4.0.7
+reportlab==4.2.5
 requests==2.32.3
 requests-file==2.1.0
 requests-oauthlib==1.2.0
@@ -180,17 +181,17 @@ rpds-py==0.20.0
 rsa==4.8
 s3transfer==0.10.0
 selenium==4.16.0
-sentry-arroyo==2.18.2
+sentry-arroyo==2.19.9
 sentry-cli==2.16.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.122
+sentry-forked-djangorestframework-stubs==3.15.2.post1
+sentry-kafka-schemas==0.1.125
 sentry-ophio==1.0.0
-sentry-protos==0.1.37
+sentry-protos==0.1.39
 sentry-redis-tools==0.1.7
-sentry-relay==0.9.3
+sentry-relay==0.9.4
 sentry-sdk==2.19.2
 sentry-usage-accountant==0.0.10
 simplejson==3.17.6
@@ -241,7 +242,7 @@ virtualenv==20.25.0
 wcwidth==0.2.10
 werkzeug==3.0.6
 wheel==0.38.4
-wrapt==1.17.0rc1
+wrapt==1.17.0
 wsproto==1.1.0
 xmlsec==1.3.14
 zstandard==0.18.0
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 9dd1a81506ba10..0748993df7b1a1 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,7 +1,7 @@
 --index-url https://pypi.devinfra.sentry.io/simple
 
 sentry-devenv>=1.14.2
-devservices>=1.0.5
+devservices>=1.0.8
 
 covdefaults>=2.3.0
 sentry-covdefaults-disable-branch-coverage>=1.0.2
@@ -38,10 +38,10 @@ packaging>=21.3
 
 # for type checking
 sentry-forked-django-stubs>=5.1.1.post1
-sentry-forked-djangorestframework-stubs>=3.15.1.post2
+sentry-forked-djangorestframework-stubs>=3.15.2.post1
 lxml-stubs
 msgpack-types>=0.2.0
-mypy>=1.13
+mypy>=1.14
 types-beautifulsoup4
 types-cachetools
 types-jsonschema
diff --git a/requirements-frozen.txt b/requirements-frozen.txt
index 40b270e613db9c..79ed8385b6c540 100644
--- a/requirements-frozen.txt
+++ b/requirements-frozen.txt
@@ -20,6 +20,7 @@ cachetools==5.3.0
 celery==5.3.5
 certifi==2024.7.4
 cffi==1.17.1
+chardet==5.2.0
 charset-normalizer==3.4.0
 click==8.1.7
 click-didyoumean==0.3.0
@@ -32,7 +33,7 @@ cssselect==1.0.3
 cssutils==2.9.0
 datadog==0.49.1
 distro==1.8.0
-django==5.1.1
+django==5.1.4
 django-crispy-forms==1.14.0
 django-csp==3.8
 django-pg-zero-downtime-migrations==0.16
@@ -88,7 +89,7 @@ parsimonious==0.10.0
 petname==2.6
 phabricator==0.7.0
 phonenumberslite==8.12.55
-pillow==10.4.0
+pillow==11.0.0
 progressbar2==3.41.0
 prompt-toolkit==3.0.41
 proto-plus==1.25.0
@@ -115,7 +116,7 @@ redis==3.4.1
 redis-py-cluster==2.1.0
 referencing==0.30.2
 regex==2022.9.13
-reportlab==4.0.7
+reportlab==4.2.5
 requests==2.32.3
 requests-file==2.1.0
 requests-oauthlib==1.2.0
@@ -124,12 +125,12 @@ rfc3986-validator==0.1.1
 rpds-py==0.20.0
 rsa==4.8
 s3transfer==0.10.0
-sentry-arroyo==2.18.2
-sentry-kafka-schemas==0.1.122
+sentry-arroyo==2.19.9
+sentry-kafka-schemas==0.1.125
 sentry-ophio==1.0.0
-sentry-protos==0.1.37
+sentry-protos==0.1.39
 sentry-redis-tools==0.1.7
-sentry-relay==0.9.3
+sentry-relay==0.9.4
 sentry-sdk==2.19.2
 sentry-usage-accountant==0.0.10
 simplejson==3.17.6
diff --git a/requirements-getsentry.txt b/requirements-getsentry.txt
index 2dbf4c23d860b8..21cff131171f2d 100644
--- a/requirements-getsentry.txt
+++ b/requirements-getsentry.txt
@@ -10,5 +10,5 @@ Avalara==20.9.0
 iso3166
 pycountry==17.5.14
 pyvat==1.3.15
-reportlab==4.0.7
+reportlab==4.2.5
 stripe==3.1.0
diff --git a/setup.cfg b/setup.cfg
index aae014f9aa7768..c7b83b9787a533 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = sentry
-version = 24.12.0.dev0
+version = 25.1.0.dev0
 description = A realtime logging and aggregation server.
 long_description = file: README.md
 long_description_content_type = text/markdown
diff --git a/src/sentry/analytics/events/groupowner_assignment.py b/src/sentry/analytics/events/groupowner_assignment.py
index 30d2913bed831e..81926fecc2bd98 100644
--- a/src/sentry/analytics/events/groupowner_assignment.py
+++ b/src/sentry/analytics/events/groupowner_assignment.py
@@ -9,6 +9,9 @@ class GroupOwnerAssignment(analytics.Event):
         analytics.Attribute("project_id"),
         analytics.Attribute("group_id"),
         analytics.Attribute("new_assignment", type=bool),
+        analytics.Attribute("user_id", required=False),
+        analytics.Attribute("group_owner_type"),
+        analytics.Attribute("method", required=False),
     )
 
 
diff --git a/src/sentry/api/api_owners.py b/src/sentry/api/api_owners.py
index 60e5d1884f26a3..efb352fe7185ce 100644
--- a/src/sentry/api/api_owners.py
+++ b/src/sentry/api/api_owners.py
@@ -28,3 +28,4 @@ class ApiOwner(Enum):
     TELEMETRY_EXPERIENCE = "telemetry-experience"
     UNOWNED = "unowned"
     WEB_FRONTEND_SDKS = "team-web-sdk-frontend"
+    GDX = "gdx"
diff --git a/src/sentry/api/authentication.py b/src/sentry/api/authentication.py
index eb0fd888294f29..01a76662f5393a 100644
--- a/src/sentry/api/authentication.py
+++ b/src/sentry/api/authentication.py
@@ -293,11 +293,11 @@ class ClientIdSecretAuthentication(QuietBasicAuthentication):
     """
 
     def authenticate(self, request: Request):
-        if not request.json_body:
+        if not request.data:
             raise AuthenticationFailed("Invalid request")
 
-        client_id = request.json_body.get("client_id")
-        client_secret = request.json_body.get("client_secret")
+        client_id = request.data.get("client_id")
+        client_secret = request.data.get("client_secret")
 
         invalid_pair_error = AuthenticationFailed("Invalid Client ID / Secret pair")
 
diff --git a/src/sentry/api/base.py b/src/sentry/api/base.py
index fddcd7dd555142..680da60495fa82 100644
--- a/src/sentry/api/base.py
+++ b/src/sentry/api/base.py
@@ -9,7 +9,6 @@
 from typing import Any
 from urllib.parse import quote as urlquote
 
-import orjson
 import sentry_sdk
 from django.conf import settings
 from django.http import HttpResponse
@@ -342,29 +341,6 @@ def handle_exception_with_details(
     def create_audit_entry(self, request: Request, transaction_id=None, **kwargs):
         return create_audit_entry(request, transaction_id, audit_logger, **kwargs)
 
-    def load_json_body(self, request: Request):
-        """
-        Attempts to load the request body when it's JSON.
-
-        The end result is ``request.json_body`` having a value. When it can't
-        load the body as JSON, for any reason, ``request.json_body`` is None.
-
-        The request flow is unaffected and no exceptions are ever raised.
-        """
-
-        request.json_body = None
-
-        if not request.META.get("CONTENT_TYPE", "").startswith("application/json"):
-            return
-
-        if not len(request.body):
-            return
-
-        try:
-            request.json_body = orjson.loads(request.body)
-        except orjson.JSONDecodeError:
-            return
-
     def initialize_request(self, request: HttpRequest, *args: Any, **kwargs: Any) -> Request:
         # XXX: Since DRF 3.x, when the request is passed into
         # `initialize_request` it's set as an internal variable on the returned
@@ -398,7 +374,10 @@ def dispatch(self, request: Request, *args, **kwargs) -> Response:
             self.args = args
             self.kwargs = kwargs
             request = self.initialize_request(request, *args, **kwargs)
-            self.load_json_body(request)
+            # XXX: without this seemingly useless access to `.body` we are
+            # unable to access `request.body` later on due to `rest_framework`
+            # loading the request body via `request.read()`
+            request.body
             self.request = request
             self.headers = self.default_response_headers  # deprecate?
 
diff --git a/src/sentry/api/bases/organization.py b/src/sentry/api/bases/organization.py
index 1866b60c6316f1..4e5d2e632d0abc 100644
--- a/src/sentry/api/bases/organization.py
+++ b/src/sentry/api/bases/organization.py
@@ -230,6 +230,14 @@ class OrganizationMetricsPermission(OrganizationPermission):
     }
 
 
+class OrganizationFlagWebHookSigningSecretPermission(OrganizationPermission):
+    scope_map = {
+        "GET": ["org:read", "org:write", "org:admin"],
+        "POST": ["org:read", "org:write", "org:admin"],
+        "DELETE": ["org:write", "org:admin"],
+    }
+
+
 class ControlSiloOrganizationEndpoint(Endpoint):
     """
     A base class for endpoints that use an organization scoping but lives in the control silo
diff --git a/src/sentry/api/bases/organizationmember.py b/src/sentry/api/bases/organizationmember.py
index 4f322056d3a701..c140bb06f73572 100644
--- a/src/sentry/api/bases/organizationmember.py
+++ b/src/sentry/api/bases/organizationmember.py
@@ -1,11 +1,11 @@
 from __future__ import annotations
 
-from typing import Any
+from typing import Any, NotRequired, TypedDict
 
 from rest_framework import serializers
+from rest_framework.fields import empty
 from rest_framework.request import Request
 
-from sentry import features
 from sentry.api.exceptions import ResourceDoesNotExist
 from sentry.api.permissions import StaffPermissionMixin
 from sentry.db.models.fields.bounded import BoundedAutoField
@@ -43,10 +43,7 @@ def has_object_permission(
         is_role_above_member = "member:admin" in scopes or "member:write" in scopes
         if isinstance(organization, RpcUserOrganizationContext):
             organization = organization.organization
-        return is_role_above_member or (
-            features.has("organizations:members-invite-teammates", organization)
-            and not organization.flags.disable_member_invite
-        )
+        return is_role_above_member or not organization.flags.disable_member_invite
 
 
 class MemberAndStaffPermission(StaffPermissionMixin, MemberPermission):
@@ -65,7 +62,7 @@ def to_internal_value(self, data):
             return data
         return super().to_internal_value(data)
 
-    def run_validation(self, data):
+    def run_validation(self, data=empty):
         if data == "me":
             return data
         return super().run_validation(data)
@@ -75,6 +72,15 @@ class MemberSerializer(serializers.Serializer):
     id = MemberIdField(min_value=0, max_value=BoundedAutoField.MAX_VALUE, required=True)
 
 
+class _FilterKwargs(TypedDict):
+    organization: Organization
+    user_id: NotRequired[int]
+    user_is_active: NotRequired[bool]
+    id: NotRequired[int | str]
+    organization_id: NotRequired[int]
+    invite_status: NotRequired[int]
+
+
 class OrganizationMemberEndpoint(OrganizationEndpoint):
     def convert_args(
         self,
@@ -105,16 +111,16 @@ def _get_member(
         member_id: int | str,
         invite_status: InviteStatus | None = None,
     ) -> OrganizationMember:
-        args = []
-        kwargs = dict(organization=organization)
+        kwargs: _FilterKwargs = {"organization": organization}
 
         if member_id == "me":
-            kwargs.update(user_id=request.user.id, user_is_active=True)
+            kwargs["user_id"] = request.user.id
+            kwargs["user_is_active"] = True
         else:
-            kwargs.update(id=member_id, organization_id=organization.id)
+            kwargs["id"] = member_id
+            kwargs["organization_id"] = organization.id
 
         if invite_status:
-            kwargs.update(invite_status=invite_status.value)
+            kwargs["invite_status"] = invite_status.value
 
-        om = OrganizationMember.objects.filter(*args, **kwargs).get()
-        return om
+        return OrganizationMember.objects.filter(**kwargs).get()
diff --git a/src/sentry/api/decorators.py b/src/sentry/api/decorators.py
index ef28203d678411..c6e265588890d0 100644
--- a/src/sentry/api/decorators.py
+++ b/src/sentry/api/decorators.py
@@ -4,7 +4,11 @@
 from rest_framework.request import Request
 from rest_framework.response import Response
 
-from sentry.api.exceptions import EmailVerificationRequired, SudoRequired
+from sentry.api.exceptions import (
+    EmailVerificationRequired,
+    PrimaryEmailVerificationRequired,
+    SudoRequired,
+)
 from sentry.models.apikey import is_api_key_auth
 from sentry.models.apitoken import is_api_token_auth
 from sentry.models.orgauthtoken import is_org_auth_token_auth
@@ -45,3 +49,13 @@ def wrapped(self, request: Request, *args, **kwargs) -> Response:
         return func(self, request, *args, **kwargs)
 
     return wrapped
+
+
+def primary_email_verification_required(func):
+    @wraps(func)
+    def wrapped(self, request: Request, *args, **kwargs) -> Response:
+        if isinstance(request.user, AnonymousUser) or not request.user.has_verified_primary_email():
+            raise PrimaryEmailVerificationRequired(request.user)
+        return func(self, request, *args, **kwargs)
+
+    return wrapped
diff --git a/src/sentry/api/endpoints/admin_project_configs.py b/src/sentry/api/endpoints/admin_project_configs.py
index 3b46ff73c17ac0..b8b1b5a8730b87 100644
--- a/src/sentry/api/endpoints/admin_project_configs.py
+++ b/src/sentry/api/endpoints/admin_project_configs.py
@@ -1,3 +1,6 @@
+from collections.abc import MutableMapping
+from typing import Any
+
 from django.http import Http404
 from rest_framework.request import Request
 from rest_framework.response import Response
@@ -7,11 +10,12 @@
 from sentry.api.base import Endpoint, region_silo_endpoint
 from sentry.api.permissions import SuperuserOrStaffFeatureFlaggedPermission
 from sentry.models.project import Project
+from sentry.models.projectkey import ProjectKey
 from sentry.relay import projectconfig_cache
+from sentry.relay.config import ProjectConfig, get_project_config
 from sentry.tasks.relay import schedule_invalidate_project_config
 
 
-# NOTE: This endpoint should be in getsentry
 @region_silo_endpoint
 class AdminRelayProjectConfigsEndpoint(Endpoint):
     owner = ApiOwner.OWNERS_INGEST
@@ -22,45 +26,109 @@ class AdminRelayProjectConfigsEndpoint(Endpoint):
     permission_classes = (SuperuserOrStaffFeatureFlaggedPermission,)
 
     def get(self, request: Request) -> Response:
+        """The GET endpoint retrieves the project configs for a specific project_id
+        or a set of project keys.
+        If a projectId is provided, the configs for all project keys are returned.
+        If a projectKey is provided, the config for that specific project key is returned.
+        Both a projectId and a projectKey may be provided in the same request.
+
+        If the project config is currently in cache, will return the cache entry.
+        If the project config is not in cache, the project config for that key will be null.
+        """
         project_id = request.GET.get("projectId")
+        project_key_param = request.GET.get("projectKey")
 
-        project_keys = []
-        if project_id is not None:
-            try:
+        if not project_id and not project_key_param:
+            return Response(
+                {"error": "Please supply either the projectId or projectKey parameter."}, status=400
+            )
+
+        try:
+            if project_id:
                 project = Project.objects.get_from_cache(id=project_id)
-                for project_key in project.key_set.all():
-                    project_keys.append(project_key.public_key)
+            else:
+                project = None
+            if project_key_param:
+                supplied_project_key = ProjectKey.objects.get(public_key=project_key_param)
+            else:
+                supplied_project_key = None
+        except Exception:
+            raise Http404
 
-            except Exception:
-                raise Http404
+        project_keys = self._get_project_keys(project, supplied_project_key)
 
-        project_key_param = request.GET.get("projectKey")
-        if project_key_param is not None:
-            project_keys.append(project_key_param)
-
-        configs = {}
-        for key in project_keys:
-            cached_config = projectconfig_cache.backend.get(key)
-            if cached_config is not None:
-                configs[key] = cached_config
+        configs: MutableMapping[str, MutableMapping[str, Any] | ProjectConfig | None] = {}
+        uncached_keys = []
+        for project_key in project_keys:
+            if isinstance(project_key, ProjectKey) and project_key.public_key is not None:
+                cached_config = projectconfig_cache.backend.get(project_key.public_key)
+                if cached_config is not None:
+                    configs[project_key.public_key] = cached_config
+                else:
+                    configs[project_key.public_key] = None
+                    uncached_keys.append(project_key)
+
+        if uncached_keys:
+            if supplied_project_key is not None:
+                generated_configs = self._get_project_config_sync(
+                    supplied_project_key.project, uncached_keys
+                )
+            elif project is not None:
+                generated_configs = self._get_project_config_sync(project, uncached_keys)
             else:
-                configs[key] = None
+                generated_configs = {}
+
+            for key, config in generated_configs.items():
+                configs[key] = config
 
-        # TODO: if we don't think we'll add anything to the endpoint
-        # we may as well return just the configs
         return Response({"configs": configs}, status=200)
 
     def post(self, request: Request) -> Response:
-        """Regenerate the project config"""
-        project_id = request.GET.get("projectId")
+        """The POST endpoint recalculates the project configs for a specific projectId.
+        The project config for all projectKeys of the provided projectId is recalculated
+        in a sync manner and stored in the cache subsequently.
+        """
+        project_id = request.data.get("projectId")
 
-        if project_id is not None:
-            try:
-                schedule_invalidate_project_config(
-                    project_id=project_id, trigger="_admin_trigger_invalidate_project_config"
-                )
+        if not project_id:
+            return Response({"error": "Missing projectId parameter"}, status=400)
+
+        try:
+            project = Project.objects.get_from_cache(id=project_id)
+            project_keys = self._get_project_keys(project)
+            schedule_invalidate_project_config(
+                project_id=project_id, trigger="_admin_trigger_invalidate_project_config"
+            )
+        except Exception:
+            raise Http404
+
+        configs = self._get_project_config_sync(project, project_keys)
+        projectconfig_cache.backend.set_many(configs)
+        return Response(status=201)
+
+    def _get_project_keys(
+        self, project: Project | None = None, project_key: ProjectKey | None = None
+    ) -> list[ProjectKey]:
+        project_keys = []
+
+        if project_key is not None:
+            project_keys.append(project_key)
+
+        if project is not None:
+            for project_key2 in project.key_set.all():
+                project_keys.append(project_key2)
+
+        return project_keys
+
+    def _get_project_config_sync(
+        self, project: Project, project_keys: list[ProjectKey]
+    ) -> MutableMapping[str, MutableMapping[str, Any]]:
+        configs: MutableMapping[str, MutableMapping[str, Any]] = {}
 
-            except Exception:
-                raise Http404
+        for project_key in project_keys:
+            if project_key.public_key is not None:
+                configs[project_key.public_key] = get_project_config(
+                    project, project_keys=[project_key]
+                ).to_dict()
 
-        return Response(status=204)
+        return configs
diff --git a/src/sentry/api/endpoints/api_application_details.py b/src/sentry/api/endpoints/api_application_details.py
index 73f6dadeeba959..09492f1e433d73 100644
--- a/src/sentry/api/endpoints/api_application_details.py
+++ b/src/sentry/api/endpoints/api_application_details.py
@@ -33,8 +33,26 @@ class ApiApplicationSerializer(serializers.Serializer):
     )
 
 
+class ApiApplicationEndpoint(Endpoint):
+    def convert_args(
+        self,
+        request: Request,
+        app_id: str,
+        *args,
+        **kwargs,
+    ):
+        try:
+            application = ApiApplication.objects.get(
+                owner_id=request.user.id, client_id=app_id, status=ApiApplicationStatus.active
+            )
+        except ApiApplication.DoesNotExist:
+            raise ResourceDoesNotExist
+        kwargs["application"] = application
+        return (args, kwargs)
+
+
 @control_silo_endpoint
-class ApiApplicationDetailsEndpoint(Endpoint):
+class ApiApplicationDetailsEndpoint(ApiApplicationEndpoint):
     publish_status = {
         "DELETE": ApiPublishStatus.PRIVATE,
         "GET": ApiPublishStatus.PRIVATE,
@@ -43,24 +61,10 @@ class ApiApplicationDetailsEndpoint(Endpoint):
     authentication_classes = (SessionAuthentication,)
     permission_classes = (IsAuthenticated,)
 
-    def get(self, request: Request, app_id) -> Response:
-        try:
-            instance = ApiApplication.objects.get(
-                owner_id=request.user.id, client_id=app_id, status=ApiApplicationStatus.active
-            )
-        except ApiApplication.DoesNotExist:
-            raise ResourceDoesNotExist
-
-        return Response(serialize(instance, request.user))
-
-    def put(self, request: Request, app_id) -> Response:
-        try:
-            instance = ApiApplication.objects.get(
-                owner_id=request.user.id, client_id=app_id, status=ApiApplicationStatus.active
-            )
-        except ApiApplication.DoesNotExist:
-            raise ResourceDoesNotExist
+    def get(self, request: Request, application: ApiApplication) -> Response:
+        return Response(serialize(application, request.user))
 
+    def put(self, request: Request, application: ApiApplication) -> Response:
         serializer = ApiApplicationSerializer(data=request.data, partial=True)
 
         if serializer.is_valid():
@@ -79,22 +83,15 @@ def put(self, request: Request, app_id) -> Response:
             if "termsUrl" in result:
                 kwargs["terms_url"] = result["termsUrl"]
             if kwargs:
-                instance.update(**kwargs)
-            return Response(serialize(instance, request.user), status=200)
+                application.update(**kwargs)
+            return Response(serialize(application, request.user), status=200)
         return Response(serializer.errors, status=400)
 
-    def delete(self, request: Request, app_id) -> Response:
-        try:
-            instance = ApiApplication.objects.get(
-                owner_id=request.user.id, client_id=app_id, status=ApiApplicationStatus.active
-            )
-        except ApiApplication.DoesNotExist:
-            raise ResourceDoesNotExist
-
+    def delete(self, request: Request, application: ApiApplication) -> Response:
         with transaction.atomic(using=router.db_for_write(ApiApplication)):
-            updated = ApiApplication.objects.filter(id=instance.id).update(
+            updated = ApiApplication.objects.filter(id=application.id).update(
                 status=ApiApplicationStatus.pending_deletion
             )
             if updated:
-                ScheduledDeletion.schedule(instance, days=0, actor=request.user)
+                ScheduledDeletion.schedule(application, days=0, actor=request.user)
         return Response(status=204)
diff --git a/src/sentry/api/endpoints/api_application_rotate_secret.py b/src/sentry/api/endpoints/api_application_rotate_secret.py
index 31e02a9729e8d7..a86a9fe663fc5a 100644
--- a/src/sentry/api/endpoints/api_application_rotate_secret.py
+++ b/src/sentry/api/endpoints/api_application_rotate_secret.py
@@ -5,14 +5,14 @@
 
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
-from sentry.api.base import Endpoint, control_silo_endpoint
-from sentry.api.exceptions import ResourceDoesNotExist
+from sentry.api.base import control_silo_endpoint
+from sentry.api.endpoints.api_application_details import ApiApplicationEndpoint
 from sentry.api.serializers import serialize
-from sentry.models.apiapplication import ApiApplication, ApiApplicationStatus, generate_token
+from sentry.models.apiapplication import ApiApplication, generate_token
 
 
 @control_silo_endpoint
-class ApiApplicationRotateSecretEndpoint(Endpoint):
+class ApiApplicationRotateSecretEndpoint(ApiApplicationEndpoint):
     publish_status = {
         "POST": ApiPublishStatus.PRIVATE,
     }
@@ -20,13 +20,7 @@ class ApiApplicationRotateSecretEndpoint(Endpoint):
     authentication_classes = (SessionAuthentication,)
     permission_classes = (IsAuthenticated,)
 
-    def post(self, request: Request, app_id) -> Response:
-        try:
-            api_application = ApiApplication.objects.get(
-                owner_id=request.user.id, client_id=app_id, status=ApiApplicationStatus.active
-            )
-        except ApiApplication.DoesNotExist:
-            raise ResourceDoesNotExist
+    def post(self, request: Request, application: ApiApplication) -> Response:
         new_token = generate_token()
-        api_application.update(client_secret=new_token)
+        application.update(client_secret=new_token)
         return Response(serialize({"clientSecret": new_token}))
diff --git a/src/sentry/api/endpoints/api_authorizations.py b/src/sentry/api/endpoints/api_authorizations.py
index c8daaad0b88755..3013e0dca904b1 100644
--- a/src/sentry/api/endpoints/api_authorizations.py
+++ b/src/sentry/api/endpoints/api_authorizations.py
@@ -50,7 +50,9 @@ def delete(self, request: Request) -> Response:
 
         with outbox_context(transaction.atomic(using=router.db_for_write(ApiToken)), flush=False):
             for token in ApiToken.objects.filter(
-                user_id=request.user.id, application=auth.application_id
+                user_id=request.user.id,
+                application=auth.application_id,
+                scoping_organization_id=auth.organization_id,
             ):
                 token.delete()
 
diff --git a/src/sentry/api/endpoints/chunk.py b/src/sentry/api/endpoints/chunk.py
index 9095cef5a7ab6e..f8e1c275f05037 100644
--- a/src/sentry/api/endpoints/chunk.py
+++ b/src/sentry/api/endpoints/chunk.py
@@ -36,6 +36,7 @@
     "portablepdbs",  # Portable PDB debug file
     "artifact_bundles",  # Artifact Bundles for JavaScript Source Maps
     "artifact_bundles_v2",  # The `assemble` endpoint will check for missing chunks
+    "proguard",  # Chunk-uploaded proguard mappings
 )
 
 
@@ -122,6 +123,10 @@ def post(self, request: Request, organization) -> Response:
         """
         Upload chunks and store them as FileBlobs
         `````````````````````````````````````````
+
+        Requests to this endpoint should use the region-specific domain
+        eg. `us.sentry.io` or `de.sentry.io`
+
         :pparam file file: The filename should be sha1 hash of the content.
                             Also not you can add up to MAX_CHUNKS_PER_REQUEST files
                             in this request.
diff --git a/src/sentry/api/endpoints/debug_files.py b/src/sentry/api/endpoints/debug_files.py
index f623e71a8e865c..a59efb4bb8c780 100644
--- a/src/sentry/api/endpoints/debug_files.py
+++ b/src/sentry/api/endpoints/debug_files.py
@@ -189,9 +189,9 @@ def get(self, request: Request, project: Project) -> Response:
 class DebugFilesEndpoint(ProjectEndpoint):
     owner = ApiOwner.OWNERS_INGEST
     publish_status = {
-        "DELETE": ApiPublishStatus.UNKNOWN,
-        "GET": ApiPublishStatus.UNKNOWN,
-        "POST": ApiPublishStatus.UNKNOWN,
+        "DELETE": ApiPublishStatus.PRIVATE,
+        "GET": ApiPublishStatus.PRIVATE,
+        "POST": ApiPublishStatus.PRIVATE,
     }
     permission_classes = (ProjectReleasePermission,)
 
@@ -351,6 +351,9 @@ def post(self, request: Request, project: Project) -> Response:
         Unlike other API requests, files must be uploaded using the
         traditional multipart/form-data content-type.
 
+        Requests to this endpoint should use the region-specific domain
+        eg. `us.sentry.io` or `de.sentry.io`
+
         The file uploaded is a zip archive of a Apple .dSYM folder which
         contains the individual debug images.  Uploading through this endpoint
         will create different files for the contained images.
diff --git a/src/sentry/api/endpoints/event_attachment_details.py b/src/sentry/api/endpoints/event_attachment_details.py
index a31d68a8778729..a2b71da478f977 100644
--- a/src/sentry/api/endpoints/event_attachment_details.py
+++ b/src/sentry/api/endpoints/event_attachment_details.py
@@ -51,8 +51,8 @@ def has_object_permission(self, request: Request, view, project):
 class EventAttachmentDetailsEndpoint(ProjectEndpoint):
     owner = ApiOwner.OWNERS_INGEST
     publish_status = {
-        "DELETE": ApiPublishStatus.UNKNOWN,
-        "GET": ApiPublishStatus.UNKNOWN,
+        "DELETE": ApiPublishStatus.PRIVATE,
+        "GET": ApiPublishStatus.PRIVATE,
     }
     permission_classes = (EventAttachmentDetailsPermission,)
 
diff --git a/src/sentry/api/endpoints/event_attachments.py b/src/sentry/api/endpoints/event_attachments.py
index aca3603758ca0b..5acbbbd832de8e 100644
--- a/src/sentry/api/endpoints/event_attachments.py
+++ b/src/sentry/api/endpoints/event_attachments.py
@@ -16,7 +16,7 @@
 class EventAttachmentsEndpoint(ProjectEndpoint):
     owner = ApiOwner.OWNERS_INGEST
     publish_status = {
-        "GET": ApiPublishStatus.UNKNOWN,
+        "GET": ApiPublishStatus.PRIVATE,
     }
 
     def get(self, request: Request, project, event_id) -> Response:
diff --git a/src/sentry/api/endpoints/group_integration_details.py b/src/sentry/api/endpoints/group_integration_details.py
index 7663f366a458c0..fdc22c9e9e9601 100644
--- a/src/sentry/api/endpoints/group_integration_details.py
+++ b/src/sentry/api/endpoints/group_integration_details.py
@@ -266,12 +266,26 @@ def post(self, request: Request, group, integration_id) -> Response:
             )
 
         installation = integration.get_installation(organization_id=organization_id)
-        try:
-            data = installation.create_issue(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)
+
+        with ProjectManagementEvent(
+            action_type=ProjectManagementActionType.CREATE_EXTERNAL_ISSUE_VIA_ISSUE_DETAIL,
+            integration=integration,
+        ).capture() as lifecycle:
+            lifecycle.add_extras(
+                {
+                    "provider": integration.provider,
+                    "integration_id": integration.id,
+                }
+            )
+
+            try:
+                data = installation.create_issue(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(
diff --git a/src/sentry/api/endpoints/group_tagkey_details.py b/src/sentry/api/endpoints/group_tagkey_details.py
index 1a43dce0f2290d..5bc94f32388487 100644
--- a/src/sentry/api/endpoints/group_tagkey_details.py
+++ b/src/sentry/api/endpoints/group_tagkey_details.py
@@ -1,5 +1,4 @@
-from drf_spectacular.types import OpenApiTypes
-from drf_spectacular.utils import OpenApiParameter, extend_schema
+from drf_spectacular.utils import extend_schema
 from rest_framework.request import Request
 from rest_framework.response import Response
 
@@ -38,13 +37,7 @@ class GroupTagKeyDetailsEndpoint(GroupEndpoint, EnvironmentMixin):
             IssueParams.ISSUE_ID,
             IssueParams.ISSUES_OR_GROUPS,
             GlobalParams.ORG_ID_OR_SLUG,
-            OpenApiParameter(
-                name="key",
-                location=OpenApiParameter.PATH,
-                type=OpenApiTypes.STR,
-                description="The tag key to look the values up for.",
-                required=True,
-            ),
+            IssueParams.KEY,
             GlobalParams.ENVIRONMENT,
         ],
         responses={
diff --git a/src/sentry/api/endpoints/group_tagkey_values.py b/src/sentry/api/endpoints/group_tagkey_values.py
index 42525aed6df77d..5b7f8d5e9c9260 100644
--- a/src/sentry/api/endpoints/group_tagkey_values.py
+++ b/src/sentry/api/endpoints/group_tagkey_values.py
@@ -1,7 +1,9 @@
+from drf_spectacular.utils import extend_schema
 from rest_framework.request import Request
 from rest_framework.response import Response
 
 from sentry import analytics, tagstore
+from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import EnvironmentMixin, region_silo_endpoint
 from sentry.api.bases.group import GroupEndpoint
@@ -9,25 +11,51 @@
 from sentry.api.helpers.environments import get_environments
 from sentry.api.serializers import serialize
 from sentry.api.serializers.models.tagvalue import UserTagValueSerializer
+from sentry.apidocs.constants import (
+    RESPONSE_BAD_REQUEST,
+    RESPONSE_FORBIDDEN,
+    RESPONSE_NOT_FOUND,
+    RESPONSE_UNAUTHORIZED,
+)
+from sentry.apidocs.examples.tags_examples import TagsExamples
+from sentry.apidocs.parameters import GlobalParams, IssueParams
+from sentry.apidocs.utils import inline_sentry_response_serializer
+from sentry.tagstore.types import TagValueSerializerResponse
 
 
+@extend_schema(tags=["Events"])
 @region_silo_endpoint
 class GroupTagKeyValuesEndpoint(GroupEndpoint, EnvironmentMixin):
     publish_status = {
-        "GET": ApiPublishStatus.UNKNOWN,
+        "GET": ApiPublishStatus.PUBLIC,
     }
+    owner = ApiOwner.ISSUES
 
+    @extend_schema(
+        operation_id="List a Tag's Values for an Issue",
+        description="Returns a list of values associated with this key for an issue.\nReturns at most 1000 values when paginated.",
+        parameters=[
+            IssueParams.ISSUE_ID,
+            IssueParams.ISSUES_OR_GROUPS,
+            GlobalParams.ORG_ID_OR_SLUG,
+            IssueParams.KEY,
+            IssueParams.SORT,
+            GlobalParams.ENVIRONMENT,
+        ],
+        responses={
+            200: inline_sentry_response_serializer(
+                "TagKeyValuesDict", list[TagValueSerializerResponse]
+            ),
+            400: RESPONSE_BAD_REQUEST,
+            401: RESPONSE_UNAUTHORIZED,
+            403: RESPONSE_FORBIDDEN,
+            404: RESPONSE_NOT_FOUND,
+        },
+        examples=[TagsExamples.GROUP_TAGKEY_VALUES],
+    )
     def get(self, request: Request, group, key) -> Response:
         """
         List a Tag's Values
-        ```````````````````
-
-        Return a list of values associated with this key for an issue.
-        When paginated can return at most 1000 values.
-
-        :pparam string issue_id: the ID of the issue to retrieve.
-        :pparam string key: the tag key to look the values up for.
-        :auth: required
         """
         analytics.record(
             "eventuser_endpoint.request",
diff --git a/src/sentry/api/endpoints/organization_dashboards.py b/src/sentry/api/endpoints/organization_dashboards.py
index 7599bd16839449..fd6b9096f8e8f0 100644
--- a/src/sentry/api/endpoints/organization_dashboards.py
+++ b/src/sentry/api/endpoints/organization_dashboards.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from django.db import IntegrityError, router, transaction
-from django.db.models import Case, IntegerField, When
+from django.db.models import Case, Exists, IntegerField, OuterRef, Value, When
 from drf_spectacular.utils import extend_schema
 from rest_framework.request import Request
 from rest_framework.response import Response
@@ -28,8 +28,10 @@
 from sentry.apidocs.examples.dashboard_examples import DashboardExamples
 from sentry.apidocs.parameters import CursorQueryParam, GlobalParams, VisibilityParams
 from sentry.apidocs.utils import inline_sentry_response_serializer
-from sentry.models.dashboard import Dashboard
+from sentry.db.models.fields.text import CharField
+from sentry.models.dashboard import Dashboard, DashboardFavoriteUser
 from sentry.models.organization import Organization
+from sentry.users.services.user.service import user_service
 
 MAX_RETRIES = 2
 DUPLICATE_TITLE_PATTERN = r"(.*) copy(?:$|\s(\d+))"
@@ -163,14 +165,43 @@ def get(self, request: Request, organization) -> Response:
             order_by = ["last_visited" if desc else "-last_visited"]
 
         elif sort_by == "mydashboards":
-            order_by = [
-                Case(
-                    When(created_by_id=request.user.id, then=-1),
-                    default="created_by_id",
-                    output_field=IntegerField(),
-                ),
-                "-date_added",
-            ]
+            if features.has(
+                "organizations:dashboards-table-view", organization, actor=request.user
+            ):
+                user_name_dict = {
+                    user.id: user.name
+                    for user in user_service.get_many_by_id(
+                        ids=list(dashboards.values_list("created_by_id", flat=True))
+                    )
+                }
+                dashboards = dashboards.annotate(
+                    user_name=Case(
+                        *[
+                            When(created_by_id=user_id, then=Value(user_name))
+                            for user_id, user_name in user_name_dict.items()
+                        ],
+                        default=Value(""),
+                        output_field=CharField(),
+                    )
+                )
+                order_by = [
+                    Case(
+                        When(created_by_id=request.user.id, then=-1),
+                        default=1,
+                        output_field=IntegerField(),
+                    ),
+                    "-user_name" if desc else "user_name",
+                    "-date_added",
+                ]
+            else:
+                order_by = [
+                    Case(
+                        When(created_by_id=request.user.id, then=-1),
+                        default="created_by_id",
+                        output_field=IntegerField(),
+                    ),
+                    "-date_added",
+                ]
 
         elif sort_by == "myDashboardsAndRecentlyViewed":
             order_by = [
@@ -184,9 +215,13 @@ def get(self, request: Request, organization) -> Response:
         if features.has("organizations:dashboards-favourite", organization, actor=request.user):
             pin_by = request.query_params.get("pin")
             if pin_by == "favorites":
+                favorited_by_subquery = DashboardFavoriteUser.objects.filter(
+                    dashboard=OuterRef("pk"), user_id=request.user.id
+                )
+
                 order_by_favorites = [
                     Case(
-                        When(dashboardfavoriteuser__user_id=request.user.id, then=-1),
+                        When(Exists(favorited_by_subquery), then=-1),
                         default=1,
                         output_field=IntegerField(),
                     )
diff --git a/src/sentry/api/endpoints/organization_events.py b/src/sentry/api/endpoints/organization_events.py
index 938f8609eb01e1..80577c317c5ed3 100644
--- a/src/sentry/api/endpoints/organization_events.py
+++ b/src/sentry/api/endpoints/organization_events.py
@@ -35,6 +35,7 @@
 )
 from sentry.snuba.metrics.extraction import MetricSpecType
 from sentry.snuba.referrer import Referrer
+from sentry.snuba.types import DatasetQuery
 from sentry.snuba.utils import dataset_split_decision_inferred_from_query, get_dataset
 from sentry.types.ratelimit import RateLimit, RateLimitCategory
 from sentry.utils.snuba import SnubaError
@@ -55,13 +56,14 @@ class DiscoverDatasetSplitException(Exception):
     pass
 
 
-ALLOWED_EVENTS_REFERRERS = {
+ALLOWED_EVENTS_REFERRERS: set[str] = {
     Referrer.API_ORGANIZATION_EVENTS.value,
     Referrer.API_ORGANIZATION_EVENTS_V2.value,
     Referrer.API_DASHBOARDS_TABLEWIDGET.value,
     Referrer.API_DASHBOARDS_BIGNUMBERWIDGET.value,
     Referrer.API_DISCOVER_TRANSACTIONS_LIST.value,
     Referrer.API_DISCOVER_QUERY_TABLE.value,
+    Referrer.API_INSIGHTS_USER_GEO_SUBREGION_SELECTOR.value,
     Referrer.API_PERFORMANCE_BROWSER_RESOURCE_MAIN_TABLE.value,
     Referrer.API_PERFORMANCE_BROWSER_RESOURCES_PAGE_SELECTOR.value,
     Referrer.API_PERFORMANCE_BROWSER_WEB_VITALS_PROJECT.value,
@@ -167,10 +169,11 @@ class DiscoverDatasetSplitException(Exception):
     Referrer.API_PERFORMANCE_MOBILE_UI_METRICS_RIBBON.value,
     Referrer.API_PERFORMANCE_SPAN_SUMMARY_HEADER_DATA.value,
     Referrer.API_PERFORMANCE_SPAN_SUMMARY_TABLE.value,
-    Referrer.API_EXPLORE_SPANS_SAMPLES_TABLE,
+    Referrer.API_EXPLORE_SPANS_SAMPLES_TABLE.value,
+    Referrer.ISSUE_DETAILS_STREAMLINE_GRAPH.value,
+    Referrer.ISSUE_DETAILS_STREAMLINE_LIST.value,
 }
 
-API_TOKEN_REFERRER = Referrer.API_AUTH_TOKEN_EVENTS.value
 
 LEGACY_RATE_LIMIT = dict(limit=30, window=1, concurrent_limit=15)
 # reduced limit will be the future default for all organizations not explicitly on increased limit
@@ -273,8 +276,7 @@ class OrganizationEventsEndpoint(OrganizationEventsV2EndpointBase):
 
     enforce_rate_limit = True
 
-    def rate_limits(*args, **kwargs) -> dict[str, dict[RateLimitCategory, RateLimit]]:
-        return rate_limit_events(*args, **kwargs)
+    rate_limits = rate_limit_events
 
     def get_features(self, organization: Organization, request: Request) -> Mapping[str, bool]:
         feature_names = [
@@ -295,11 +297,13 @@ def get_features(self, organization: Organization, request: Request) -> Mapping[
             actor=request.user,
         )
 
-        all_features = (
-            batch_features.get(f"organization:{organization.id}", {})
-            if batch_features is not None
-            else {}
-        )
+        all_features: dict[str, bool] = {}
+
+        if batch_features is not None:
+            for feature_name, result in batch_features.get(
+                f"organization:{organization.id}", {}
+            ).items():
+                all_features[feature_name] = bool(result)
 
         for feature_name in feature_names:
             if feature_name not in all_features:
@@ -379,7 +383,7 @@ def get(self, request: Request, organization) -> Response:
                 }
             )
         except InvalidParams as err:
-            raise ParseError(err)
+            raise ParseError(detail=str(err))
 
         batch_features = self.get_features(organization, request)
 
@@ -418,7 +422,9 @@ def get(self, request: Request, organization) -> Response:
 
         # Force the referrer to "api.auth-token.events" for events requests authorized through a bearer token
         if request.auth:
-            referrer = API_TOKEN_REFERRER
+            referrer = Referrer.API_AUTH_TOKEN_EVENTS.value
+        elif referrer is None:
+            referrer = Referrer.API_ORGANIZATION_EVENTS.value
         elif referrer not in ALLOWED_EVENTS_REFERRERS:
             if referrer:
                 with sentry_sdk.isolation_scope() as scope:
@@ -431,12 +437,18 @@ def get(self, request: Request, organization) -> Response:
         use_aggregate_conditions = request.GET.get("allowAggregateConditions", "1") == "1"
         # Only works when dataset == spans
         use_rpc = request.GET.get("useRpc", "0") == "1"
-
-        def _data_fn(scoped_dataset, offset, limit, query) -> dict[str, Any]:
+        sentry_sdk.set_tag("performance.use_rpc", use_rpc)
+
+        def _data_fn(
+            dataset_query: DatasetQuery,
+            offset: int,
+            limit: int,
+            query: str | None,
+        ):
             if use_rpc and dataset == spans_eap:
                 return spans_rpc.run_table_query(
                     params=snuba_params,
-                    query_string=query,
+                    query_string=query or "",
                     selected_columns=self.get_field_list(organization, request),
                     orderby=self.get_orderby(request),
                     offset=offset,
@@ -448,9 +460,9 @@ def _data_fn(scoped_dataset, offset, limit, query) -> dict[str, Any]:
                     ),
                 )
             query_source = self.get_request_source(request)
-            return scoped_dataset.query(
+            return dataset_query(
                 selected_columns=self.get_field_list(organization, request),
-                query=query,
+                query=query or "",
                 snuba_params=snuba_params,
                 equations=self.get_equation_list(organization, request),
                 orderby=self.get_orderby(request),
@@ -459,24 +471,30 @@ def _data_fn(scoped_dataset, offset, limit, query) -> dict[str, Any]:
                 referrer=referrer,
                 auto_fields=True,
                 auto_aggregations=True,
-                use_aggregate_conditions=use_aggregate_conditions,
                 allow_metric_aggregates=allow_metric_aggregates,
+                use_aggregate_conditions=use_aggregate_conditions,
                 transform_alias_to_input_format=True,
                 # Whether the flag is enabled or not, regardless of the referrer
                 has_metrics=use_metrics,
                 use_metrics_layer=batch_features.get("organizations:use-metrics-layer", False),
                 on_demand_metrics_enabled=on_demand_metrics_enabled,
                 on_demand_metrics_type=on_demand_metrics_type,
-                query_source=query_source,
                 fallback_to_transactions=features.has(
                     "organizations:performance-discover-dataset-selector",
                     organization,
                     actor=request.user,
                 ),
+                query_source=query_source,
             )
 
         @sentry_sdk.tracing.trace
-        def _dashboards_data_fn(scoped_dataset, offset, limit, scoped_query, dashboard_widget_id):
+        def _dashboards_data_fn(
+            scoped_dataset_query: DatasetQuery,
+            offset: int,
+            limit: int,
+            scoped_query: str | None,
+            dashboard_widget_id: str,
+        ):
             try:
                 widget = DashboardWidget.objects.get(id=dashboard_widget_id)
                 does_widget_have_split = widget.discover_widget_split is not None
@@ -487,27 +505,29 @@ def _dashboards_data_fn(scoped_dataset, offset, limit, scoped_query, dashboard_w
                 )
 
                 if does_widget_have_split and not has_override_feature:
+                    dataset_query: DatasetQuery
+
                     # This is essentially cached behaviour and we skip the check
                     if widget.discover_widget_split == DashboardWidgetTypes.ERROR_EVENTS:
-                        split_dataset = errors
+                        dataset_query = errors.query
                     elif widget.discover_widget_split == DashboardWidgetTypes.TRANSACTION_LIKE:
                         # We can't add event.type:transaction for now because of on-demand.
-                        split_dataset = scoped_dataset
+                        dataset_query = scoped_dataset_query
                     else:
-                        split_dataset = discover
+                        dataset_query = discover.query
 
-                    return _data_fn(split_dataset, offset, limit, scoped_query)
+                    return _data_fn(dataset_query, offset, limit, scoped_query)
 
                 with handle_query_errors():
                     try:
-                        error_results = _data_fn(errors, offset, limit, scoped_query)
+                        error_results = _data_fn(errors.query, offset, limit, scoped_query)
                         # Widget has not split the discover dataset yet, so we need to check if there are errors etc.
                         has_errors = len(error_results["data"]) > 0
                     except SnubaError:
                         has_errors = False
                         error_results = None
 
-                    original_results = _data_fn(scoped_dataset, offset, limit, scoped_query)
+                    original_results = _data_fn(scoped_dataset_query, offset, limit, scoped_query)
                     if original_results.get("data") is not None:
                         dataset_meta = original_results.get("meta", {})
                     else:
@@ -524,7 +544,9 @@ def _dashboards_data_fn(scoped_dataset, offset, limit, scoped_query, dashboard_w
                     if has_errors and has_other_data and not using_metrics:
                         # In the case that the original request was not using the metrics dataset, we cannot be certain that other data is solely transactions.
                         sentry_sdk.set_tag("third_split_query", True)
-                        transaction_results = _data_fn(transactions, offset, limit, scoped_query)
+                        transaction_results = _data_fn(
+                            transactions.query, offset, limit, scoped_query
+                        )
                         has_transactions = len(transaction_results["data"]) > 0
 
                     decision = self.save_split_decision(
@@ -532,7 +554,7 @@ def _dashboards_data_fn(scoped_dataset, offset, limit, scoped_query, dashboard_w
                     )
 
                     if decision == DashboardWidgetTypes.DISCOVER:
-                        return _data_fn(discover, offset, limit, scoped_query)
+                        return _data_fn(discover.query, offset, limit, scoped_query)
                     elif decision == DashboardWidgetTypes.TRANSACTION_LIKE:
                         original_results["meta"]["discoverSplitDecision"] = (
                             DashboardWidgetTypes.get_type_name(
@@ -550,13 +572,19 @@ def _dashboards_data_fn(scoped_dataset, offset, limit, scoped_query, dashboard_w
             except Exception as e:
                 # Swallow the exception if it was due to the discover split, and try again one more time.
                 if isinstance(e, ParseError):
-                    return _data_fn(scoped_dataset, offset, limit, scoped_query)
+                    return _data_fn(scoped_dataset_query, offset, limit, scoped_query)
 
                 sentry_sdk.capture_exception(e)
-                return _data_fn(scoped_dataset, offset, limit, scoped_query)
+                return _data_fn(scoped_dataset_query, offset, limit, scoped_query)
 
         @sentry_sdk.tracing.trace
-        def _discover_data_fn(scoped_dataset, offset, limit, scoped_query, discover_saved_query_id):
+        def _discover_data_fn(
+            scoped_dataset_query: DatasetQuery,
+            offset: int,
+            limit: int,
+            scoped_query: str | None,
+            discover_saved_query_id: str,
+        ):
             try:
                 discover_query = DiscoverSavedQuery.objects.get(
                     id=discover_saved_query_id, organization=organization
@@ -565,7 +593,7 @@ def _discover_data_fn(scoped_dataset, offset, limit, scoped_query, discover_save
                     discover_query.dataset is not DiscoverSavedQueryTypes.DISCOVER
                 )
                 if does_widget_have_split:
-                    return _data_fn(scoped_dataset, offset, limit, scoped_query)
+                    return _data_fn(scoped_dataset_query, offset, limit, scoped_query)
 
                 dataset_inferred_from_query = dataset_split_decision_inferred_from_query(
                     self.get_field_list(organization, request),
@@ -576,9 +604,11 @@ def _discover_data_fn(scoped_dataset, offset, limit, scoped_query, discover_save
 
                 # See if we can infer which dataset based on selected columns and query string.
                 with handle_query_errors():
-                    if dataset_inferred_from_query is not None:
+                    if (
+                        dataset := SAVED_QUERY_DATASET_MAP.get(dataset_inferred_from_query)
+                    ) is not None:
                         result = _data_fn(
-                            SAVED_QUERY_DATASET_MAP[dataset_inferred_from_query],
+                            dataset.query,
                             offset,
                             limit,
                             scoped_query,
@@ -602,11 +632,11 @@ def _discover_data_fn(scoped_dataset, offset, limit, scoped_query, discover_save
                         with ThreadPoolExecutor(max_workers=3) as exe:
                             futures = {
                                 exe.submit(
-                                    _data_fn, get_dataset(dataset_), offset, limit, scoped_query
-                                ): dataset_
-                                for dataset_ in [
-                                    "errors",
-                                    "transactions",
+                                    _data_fn, dataset_query, offset, limit, scoped_query
+                                ): dataset_name
+                                for dataset_name, dataset_query in [
+                                    ("errors", errors.query),
+                                    ("transactions", transactions.query),
                                 ]
                             }
 
@@ -660,10 +690,10 @@ def _discover_data_fn(scoped_dataset, offset, limit, scoped_query, discover_save
             except Exception as e:
                 # Swallow the exception if it was due to the discover split, and try again one more time.
                 if isinstance(e, ParseError):
-                    return _data_fn(scoped_dataset, offset, limit, scoped_query)
+                    return _data_fn(scoped_dataset_query, offset, limit, scoped_query)
 
                 sentry_sdk.capture_exception(e)
-                return _data_fn(scoped_dataset, offset, limit, scoped_query)
+                return _data_fn(scoped_dataset_query, offset, limit, scoped_query)
 
         def data_fn_factory(scoped_dataset):
             """
@@ -677,17 +707,17 @@ def data_fn_factory(scoped_dataset):
             dashboard_widget_id = request.GET.get("dashboardWidgetId", None)
             discover_saved_query_id = request.GET.get("discoverSavedQueryId", None)
 
-            def fn(offset, limit) -> dict[str, Any]:
+            def fn(offset, limit):
                 if save_discover_dataset_decision and discover_saved_query_id:
                     return _discover_data_fn(
-                        scoped_dataset, offset, limit, scoped_query, discover_saved_query_id
+                        scoped_dataset.query, offset, limit, scoped_query, discover_saved_query_id
                     )
 
                 if not (metrics_enhanced and dashboard_widget_id):
-                    return _data_fn(scoped_dataset, offset, limit, scoped_query)
+                    return _data_fn(scoped_dataset.query, offset, limit, scoped_query)
 
                 return _dashboards_data_fn(
-                    scoped_dataset, offset, limit, scoped_query, dashboard_widget_id
+                    scoped_dataset.query, offset, limit, scoped_query, dashboard_widget_id
                 )
 
             return fn
diff --git a/src/sentry/api/endpoints/organization_member/details.py b/src/sentry/api/endpoints/organization_member/details.py
index 1564634770ea69..28a78b458a3545 100644
--- a/src/sentry/api/endpoints/organization_member/details.py
+++ b/src/sentry/api/endpoints/organization_member/details.py
@@ -226,10 +226,7 @@ def put(
         is_member = not (
             request.access.has_scope("member:invite") and request.access.has_scope("member:admin")
         )
-        enable_member_invite = (
-            features.has("organizations:members-invite-teammates", organization)
-            and not organization.flags.disable_member_invite
-        )
+        enable_member_invite = not organization.flags.disable_member_invite
         # Members can only resend invites
         reinvite_request_only = set(result.keys()).issubset({"reinvite", "regenerate"})
         # Members can only resend invites that they sent
@@ -470,8 +467,7 @@ def delete(
                 if acting_member != member:
                     if not request.access.has_scope("member:admin"):
                         if (
-                            features.has("organizations:members-invite-teammates", organization)
-                            and not organization.flags.disable_member_invite
+                            not organization.flags.disable_member_invite
                             and request.access.has_scope("member:invite")
                         ):
                             return self._handle_deletion_by_member(
diff --git a/src/sentry/api/endpoints/organization_metrics_meta.py b/src/sentry/api/endpoints/organization_metrics_meta.py
index d31a96d9dc2a03..42f7ac530d692e 100644
--- a/src/sentry/api/endpoints/organization_metrics_meta.py
+++ b/src/sentry/api/endpoints/organization_metrics_meta.py
@@ -11,7 +11,6 @@
 from sentry.snuba import metrics_performance
 
 COUNT_UNPARAM = "count_unparameterized_transactions()"
-COUNT_HAS_TXN = "count_has_transaction_name()"
 COUNT_NULL = "count_null_transactions()"
 
 
diff --git a/src/sentry/api/endpoints/organization_release_files.py b/src/sentry/api/endpoints/organization_release_files.py
index 4e057726f2c47f..6acd32c6126b34 100644
--- a/src/sentry/api/endpoints/organization_release_files.py
+++ b/src/sentry/api/endpoints/organization_release_files.py
@@ -52,6 +52,9 @@ def post(self, request: Request, organization, version) -> Response:
         Unlike other API requests, files must be uploaded using the
         traditional multipart/form-data content-type.
 
+        Requests to this endpoint should use the region-specific domain
+        eg. `us.sentry.io` or `de.sentry.io`
+
         The optional 'name' attribute should reflect the absolute path
         that this file will be referenced as. For example, in the case of
         JavaScript you might specify the full web URI.
diff --git a/src/sentry/api/endpoints/organization_releases.py b/src/sentry/api/endpoints/organization_releases.py
index ac88f8c0442372..dc4810abe3e290 100644
--- a/src/sentry/api/endpoints/organization_releases.py
+++ b/src/sentry/api/endpoints/organization_releases.py
@@ -437,8 +437,11 @@ def post(self, request: Request, organization) -> Response:
 
         :pparam string organization_id_or_slug: the id or slug of the organization the
                                           release belongs to.
-        :param string version: a version identifier for this release.  Can
-                               be a version number, a commit hash etc.
+        :param string version: a version identifier for this release. Can
+                               be a version number, a commit hash etc. It cannot contain certain
+                               whitespace characters (`\\r`, `\\n`, `\\f`, `\\x0c`, `\\t`) or any
+                               slashes (`\\`, `/`). The version names `.`, `..` and `latest` are also
+                               reserved, and cannot be used.
         :param string ref: an optional commit reference.  This is useful if
                            a tagged version has been provided.
         :param url url: a URL that points to the release.  This can be the
diff --git a/src/sentry/api/endpoints/organization_sessions.py b/src/sentry/api/endpoints/organization_sessions.py
index 372c1e58b40128..5d418045c2239d 100644
--- a/src/sentry/api/endpoints/organization_sessions.py
+++ b/src/sentry/api/endpoints/organization_sessions.py
@@ -1,7 +1,6 @@
 from contextlib import contextmanager
 
 import sentry_sdk
-from django.utils.datastructures import MultiValueDict
 from drf_spectacular.utils import extend_schema
 from rest_framework.exceptions import ParseError
 from rest_framework.request import Request
@@ -117,15 +116,10 @@ def build_sessions_query(
         except NoProjects:
             raise NoProjects("No projects available")  # give it a description
 
-        # HACK to prevent front-end crash when release health is sessions-based:
-        query_params = MultiValueDict(request.GET)
-        if not release_health.backend.is_metrics_based() and request.GET.get("interval") == "10s":
-            query_params["interval"] = "1m"
-
         query_config = release_health.backend.sessions_query_config(organization)
 
         return QueryDefinition(
-            query=query_params,
+            query=request.GET,
             params=params,
             offset=offset,
             limit=limit,
diff --git a/src/sentry/api/endpoints/project_backfill_similar_issues_embeddings_records.py b/src/sentry/api/endpoints/project_backfill_similar_issues_embeddings_records.py
index a3b4598fbab85c..c2b5bea900ef93 100644
--- a/src/sentry/api/endpoints/project_backfill_similar_issues_embeddings_records.py
+++ b/src/sentry/api/endpoints/project_backfill_similar_issues_embeddings_records.py
@@ -2,7 +2,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
@@ -22,10 +21,6 @@ class ProjectBackfillSimilarIssuesEmbeddingsRecords(ProjectEndpoint):
     }
 
     def post(self, request: Request, project: Project) -> Response:
-        # needs to have the flag to run
-        if not features.has("projects:similarity-embeddings-backfill", project):
-            return Response(status=404)
-
         # needs to either be a superuser or be in single org mode
         if not (is_active_superuser(request) or settings.SENTRY_SINGLE_ORGANIZATION):
             return Response(status=404)
diff --git a/src/sentry/api/endpoints/project_release_files.py b/src/sentry/api/endpoints/project_release_files.py
index 5674787662a85d..cedb8e32f5ae6b 100644
--- a/src/sentry/api/endpoints/project_release_files.py
+++ b/src/sentry/api/endpoints/project_release_files.py
@@ -272,6 +272,9 @@ def post(self, request: Request, project, version) -> Response:
         Unlike other API requests, files must be uploaded using the
         traditional multipart/form-data content-type.
 
+        Requests to this endpoint should use the region-specific domain
+        eg. `us.sentry.io` or `de.sentry.io`
+
         The optional 'name' attribute should reflect the absolute path
         that this file will be referenced as. For example, in the case of
         JavaScript you might specify the full web URI.
diff --git a/src/sentry/api/endpoints/project_rule_preview.py b/src/sentry/api/endpoints/project_rule_preview.py
index 713fb931d31912..0ee40b273db646 100644
--- a/src/sentry/api/endpoints/project_rule_preview.py
+++ b/src/sentry/api/endpoints/project_rule_preview.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from collections.abc import Mapping
 from typing import Any
 
@@ -10,10 +12,11 @@
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
 from sentry.api.bases.project import ProjectAlertRulePermission, ProjectEndpoint
-from sentry.api.serializers import GroupSerializer, serialize
+from sentry.api.serializers import serialize
+from sentry.api.serializers.models.group import BaseGroupSerializerResponse, GroupSerializer
 from sentry.api.serializers.rest_framework.rule import RulePreviewSerializer
 from sentry.models.group import Group
-from sentry.models.groupinbox import get_inbox_details
+from sentry.models.groupinbox import InboxDetails, get_inbox_details
 from sentry.rules.history.preview import preview
 
 
@@ -86,12 +89,19 @@ def post(self, request: Request, project) -> Response:
         return response
 
 
+class _PreviewResponse(BaseGroupSerializerResponse):
+    inbox: InboxDetails
+    lastTriggered: int
+
+
 class PreviewSerializer(GroupSerializer):
     def serialize(
-        self, obj: dict[str, Any], attrs: Mapping[Any, Any], user: Any, **kwargs: Any
-    ) -> dict[str, Any]:
+        self, obj: Group, attrs: Mapping[Any, Any], user: Any, **kwargs: Any
+    ) -> _PreviewResponse:
         result = super().serialize(obj, attrs, user, **kwargs)
         group_id = int(result["id"])
-        result["inbox"] = kwargs["inbox_details"].get(group_id)
-        result["lastTriggered"] = kwargs["group_fires"][group_id]
-        return result
+        return {
+            **result,
+            "inbox": kwargs["inbox_details"].get(group_id),
+            "lastTriggered": kwargs["group_fires"][group_id],
+        }
diff --git a/src/sentry/api/endpoints/project_servicehook_stats.py b/src/sentry/api/endpoints/project_servicehook_stats.py
index dffeb8c606ae61..c6d6c1e35a758e 100644
--- a/src/sentry/api/endpoints/project_servicehook_stats.py
+++ b/src/sentry/api/endpoints/project_servicehook_stats.py
@@ -26,9 +26,9 @@ def get(self, request: Request, project, hook_id) -> Response:
 
         stat_args = self._parse_args(request)
 
-        stats = {}
+        stats: dict[int, dict[str, int]] = {}
         for model, name in ((TSDBModel.servicehook_fired, "total"),):
-            result = tsdb.get_range(
+            result = tsdb.backend.get_range(
                 model=model,
                 keys=[hook.id],
                 **stat_args,
diff --git a/src/sentry/api/endpoints/project_team_details.py b/src/sentry/api/endpoints/project_team_details.py
index d28572ab6d09b1..de546e775ecf06 100644
--- a/src/sentry/api/endpoints/project_team_details.py
+++ b/src/sentry/api/endpoints/project_team_details.py
@@ -90,7 +90,12 @@ def post(self, request: Request, project, team: Team) -> Response:
             event=audit_log.get_event_id("PROJECT_TEAM_ADD"),
             data={"team_slug": team.slug, "project_slug": project.slug},
         )
-        return Response(serialize(project, request.user, ProjectWithTeamSerializer()), status=201)
+        return Response(
+            serialize(
+                project, request.user, ProjectWithTeamSerializer(collapse=["unusedFeatures"])
+            ),
+            status=201,
+        )
 
     @extend_schema(
         operation_id="Delete a Team from a Project",
diff --git a/src/sentry/api/endpoints/team_release_count.py b/src/sentry/api/endpoints/team_release_count.py
index 7d7806b836b4f3..a0f7b34ca329fd 100644
--- a/src/sentry/api/endpoints/team_release_count.py
+++ b/src/sentry/api/endpoints/team_release_count.py
@@ -47,8 +47,8 @@ def get(self, request: Request, team) -> Response:
         )
 
         agg_project_counts = {}
-        project_avgs = defaultdict(int)
-        this_week_totals = defaultdict(int)
+        project_avgs: dict[int, float] = defaultdict(int)
+        this_week_totals: dict[int, int] = defaultdict(int)
         this_week_start = now() - timedelta(days=7)
         for row in per_project_daily_release_counts:
             project_avgs[row["projects"]] += row["count"]
@@ -56,8 +56,8 @@ def get(self, request: Request, team) -> Response:
             if row["bucket"] >= this_week_start:
                 this_week_totals[row["projects"]] += row["count"]
 
-        for row in project_avgs:
-            project_avgs[row] = (project_avgs[row] / (end - start).days) * 7
+        for project_id in project_avgs:
+            project_avgs[project_id] = (project_avgs[project_id] / (end - start).days) * 7
 
         current_day = start.date()
         end_date = end.date()
diff --git a/src/sentry/api/endpoints/user_organizationintegrations.py b/src/sentry/api/endpoints/user_organizationintegrations.py
index fb772593004615..ced6ea411bd85d 100644
--- a/src/sentry/api/endpoints/user_organizationintegrations.py
+++ b/src/sentry/api/endpoints/user_organizationintegrations.py
@@ -8,6 +8,7 @@
 from sentry.api.serializers import serialize
 from sentry.constants import ObjectStatus
 from sentry.integrations.models.organization_integration import OrganizationIntegration
+from sentry.organizations.services.organization import organization_service
 from sentry.users.api.bases.user import UserEndpoint
 from sentry.users.services.user.service import user_service
 
@@ -33,8 +34,15 @@ def get(self, request: Request, user) -> Response:
             if request.user.id is not None
             else ()
         )
+        organization_ids = []
+        for o in organizations:
+            org_context = organization_service.get_organization_by_id(
+                id=o.id, user_id=request.user.id
+            )
+            if org_context and org_context.member and "org:read" in org_context.member.scopes:
+                organization_ids.append(o.id)
         queryset = OrganizationIntegration.objects.filter(
-            organization_id__in=[o.id for o in organizations],
+            organization_id__in=organization_ids,
             status=ObjectStatus.ACTIVE,
             integration__status=ObjectStatus.ACTIVE,
         )
diff --git a/src/sentry/api/event_search.py b/src/sentry/api/event_search.py
index dfaec71ec874c0..cc76cff4940dca 100644
--- a/src/sentry/api/event_search.py
+++ b/src/sentry/api/event_search.py
@@ -145,7 +145,6 @@
 raw_aggregate_param    = ~r"[^()\t\n, \"]+"
 quoted_aggregate_param = '"' ('\\"' / ~r'[^\t\n\"]')* '"'
 search_key             = explicit_number_tag_key / key / quoted_key
-search_type            = "number" / "string"
 text_key               = explicit_tag_key / explicit_string_tag_key / search_key
 value                  = ~r"[^()\t\n ]*"
 quoted_value           = '"' ('\\"' / ~r'[^"]')* '"'
@@ -1071,9 +1070,6 @@ def visit_explicit_string_tag_key(self, node, children):
     def visit_explicit_number_tag_key(self, node, children):
         return SearchKey(f"tags[{children[2].name},number]")
 
-    def visit_search_type(self, node, children):
-        return node.text
-
     def visit_aggregate_key(self, node, children):
         children = remove_optional_nodes(children)
         children = remove_space(children)
diff --git a/src/sentry/api/exceptions.py b/src/sentry/api/exceptions.py
index 2e5689a148aacd..babd399f8d9655 100644
--- a/src/sentry/api/exceptions.py
+++ b/src/sentry/api/exceptions.py
@@ -118,6 +118,15 @@ def __init__(self, user):
         super().__init__(username=user.username)
 
 
+class PrimaryEmailVerificationRequired(SentryAPIException):
+    status_code = status.HTTP_401_UNAUTHORIZED
+    code = "primary-email-verification-required"
+    message = "Primary email verification required."
+
+    def __init__(self, user):
+        super().__init__(username=user.username)
+
+
 class TwoFactorRequired(SentryAPIException):
     status_code = status.HTTP_401_UNAUTHORIZED
     code = "2fa-required"
diff --git a/src/sentry/api/helpers/group_index/delete.py b/src/sentry/api/helpers/group_index/delete.py
index 0aa10caf082221..bdfd3ae683d361 100644
--- a/src/sentry/api/helpers/group_index/delete.py
+++ b/src/sentry/api/helpers/group_index/delete.py
@@ -124,7 +124,7 @@ def delete_groups(
     request: Request,
     projects: Sequence[Project],
     organization_id: int,
-    search_fn: SearchFunction,
+    search_fn: SearchFunction | None = None,
 ) -> Response:
     """
     `search_fn` refers to the `search.query` method with the appropriate
@@ -139,7 +139,7 @@ def delete_groups(
                 id__in=set(group_ids),
             ).exclude(status__in=[GroupStatus.PENDING_DELETION, GroupStatus.DELETION_IN_PROGRESS])
         )
-    else:
+    elif search_fn:
         try:
             cursor_result, _ = search_fn(
                 {
diff --git a/src/sentry/api/helpers/group_index/update.py b/src/sentry/api/helpers/group_index/update.py
index a95ebdfdbf8149..180c8ff71ebfbc 100644
--- a/src/sentry/api/helpers/group_index/update.py
+++ b/src/sentry/api/helpers/group_index/update.py
@@ -165,10 +165,7 @@ def get_current_release_version_of_group(group: Group, follows_semver: bool = Fa
 
 def update_groups(
     request: Request,
-    group_ids: Sequence[int | str] | None,
-    projects: Sequence[Project],
-    organization_id: int,
-    search_fn: SearchFunction | None = None,
+    groups: Sequence[Group],
     user: RpcUser | User | AnonymousUser | None = None,
     data: Mapping[str, Any] | None = None,
 ) -> Response:
@@ -178,17 +175,15 @@ def update_groups(
     acting_user = user if user and user.is_authenticated else None
     data = data or request.data
 
-    try:
-        group_ids, group_list = get_group_ids_and_group_list(
-            organization_id, projects, group_ids, search_fn
-        )
-    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
-        )
+    # so we won't have to requery for each group
+    project_lookup = {g.project_id: g.project for g in groups}
+    projects = list(project_lookup.values())
+
+    # Assert all projects belong to the same organization
+    if len({p.organization_id for p in projects}) > 1:
+        return Response({"detail": "All groups must belong to same organization."}, status=400)
 
-    if not group_ids or not group_list:
+    if not groups:
         return Response({"detail": "No groups found"}, status=204)
 
     serializer = validate_request(request, projects, data)
@@ -201,17 +196,9 @@ def update_groups(
 
     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)
+        return handle_discard(request, groups, projects, acting_user)
 
     status_details = result.pop("statusDetails", result)
     status = result.get("status")
@@ -219,7 +206,7 @@ def update_groups(
     if "priority" in result:
         handle_priority(
             priority=result["priority"],
-            group_list=group_list,
+            group_list=groups,
             acting_user=acting_user,
             project_lookup=project_lookup,
         )
@@ -228,7 +215,7 @@ def update_groups(
             result, res_type = handle_resolve_in_release(
                 status,
                 status_details,
-                group_list,
+                groups,
                 projects,
                 project_lookup,
                 acting_user,
@@ -240,7 +227,7 @@ def update_groups(
     elif status:
         result = handle_other_status_updates(
             result,
-            group_list,
+            groups,
             projects,
             project_lookup,
             status_details,
@@ -250,7 +237,7 @@ def update_groups(
 
     return prepare_response(
         result,
-        group_list,
+        groups,
         project_lookup,
         projects,
         acting_user,
@@ -260,6 +247,40 @@ def update_groups(
     )
 
 
+def update_groups_with_search_fn(
+    request: Request,
+    group_ids: Sequence[int | str] | None,
+    projects: Sequence[Project],
+    organization_id: int,
+    search_fn: SearchFunction,
+) -> Response:
+    group_list = []
+    if group_ids:
+        group_list = get_group_list(organization_id, projects, group_ids)
+
+    if not group_list:
+        try:
+            # It can raise ValidationError
+            cursor_result, _ = search_fn(
+                {
+                    "limit": BULK_MUTATION_LIMIT,
+                    "paginator_options": {"max_limit": BULK_MUTATION_LIMIT},
+                }
+            )
+        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
+            )
+
+        group_list = list(cursor_result)
+
+    if not group_list:
+        return Response({"detail": "No groups found"}, status=204)
+
+    return update_groups(request, group_list)
+
+
 def validate_request(
     request: Request,
     projects: Sequence[Project],
@@ -284,56 +305,36 @@ def validate_request(
     return serializer
 
 
-def get_group_ids_and_group_list(
+def get_group_list(
     organization_id: int,
     projects: Sequence[Project],
-    group_ids: Sequence[int | str] | None,
-    search_fn: SearchFunction | None,
-) -> tuple[list[int | str], list[Group]]:
+    group_ids: Sequence[int | str],
+) -> list[Group]:
     """
-    Gets group IDs and group list based on provided filters.
+    Gets group list based on provided filters.
 
     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
+        group_ids: Sequence of specific group IDs to fetch
 
-    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
+    Returns: List of Group objects filtered to only valid groups in the org/projects
     """
-    _group_ids: list[int | str] = []
-    _group_list: list[Group] = []
-
-    if group_ids:
-        _group_list = list(
+    groups = []
+    # Convert all group IDs to integers and filter out any non-integer values
+    group_ids_int = [int(gid) for gid in group_ids if str(gid).isdigit()]
+    if group_ids_int:
+        return list(
             Group.objects.filter(
-                project__organization_id=organization_id, project__in=projects, id__in=group_ids
+                project__organization_id=organization_id, project__in=projects, id__in=group_ids_int
             )
         )
-        # 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]
+    else:
+        for group_id in group_ids:
+            if isinstance(group_id, str):
+                groups.append(Group.objects.by_qualified_short_id(organization_id, group_id))
 
-    return _group_ids, _group_list
+    return groups
 
 
 def handle_resolve_in_release(
@@ -459,6 +460,10 @@ def handle_resolve_in_release(
         except IndexError:
             release = None
     for group in group_list:
+        # If the group is already resolved, we don't need to do anything
+        if group.status == GroupStatus.RESOLVED:
+            continue
+
         with transaction.atomic(router.db_for_write(Group)):
             process_group_resolution(
                 group,
@@ -706,9 +711,6 @@ def handle_other_status_updates(
     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
         )
diff --git a/src/sentry/api/helpers/ios_models.py b/src/sentry/api/helpers/ios_models.py
new file mode 100644
index 00000000000000..ab296dbbc0bd1b
--- /dev/null
+++ b/src/sentry/api/helpers/ios_models.py
@@ -0,0 +1,290 @@
+IPHONE4 = "iPhone 4"
+IPHONE5 = "iPhone 5"
+IPHONE5C = "iPhone 5c"
+IPHONE5S = "iPhone 5s"
+IPHONE7 = "iPhone 7"
+IPHONE7PLUS = "iPhone 7 Plus"
+IPHONE8 = "iPhone 8"
+IPHONE8PLUS = "iPhone 8 Plus"
+IPHONEX = "iPhone X"
+IPHONEXSMAX = "iPhone XS Max"
+
+IPAD2 = "iPad 2"
+IPADGEN3 = "iPad (3rd gen)"
+IPADGEN4 = "iPad (4th gen)"
+IPADGEN5 = "iPad (5th gen)"
+IPADGEN6 = "iPad (6th gen)"
+IPADGEN7 = "iPad (7th gen)"
+IPADGEN8 = "iPad (8th gen)"
+IPADGEN9 = "iPad (9th gen)"
+IPADGEN10 = "iPad (10th gen)"
+
+IPADAIRGEN1 = "iPad Air (1st gen)"
+IPADAIR2 = "iPad Air 2"
+IPADAIRGEN3 = "iPad Air (3rd gen)"
+IPADAIRGEN4 = "iPad Air (4th gen)"
+IPADAIRGEN5 = "iPad Air (5th gen)"
+IPADAIRGEN6 = "iPad Air (6th gen)"
+IPADAIRGEN7 = "iPad Air (7th gen)"
+
+IPADPRO9GEN1 = "iPad Pro (9.7-inch)"
+IPADPRO10 = "iPad Pro (10.5-inch)"
+IPADPRO11GEN1 = "iPad Pro (11-inch, 1st gen)"
+IPADPRO11GEN2 = "iPad Pro (11-inch, 2nd gen)"
+IPADPRO11GEN3 = "iPad Pro (11-inch, 3rd gen)"
+IPADPRO11GEN4 = "iPad Pro (11-inch, 4th gen)"
+IPADPRO11GEN5 = "iPad Pro (11 inch, 5th gen)"
+IPADPRO12GEN1 = "iPad Pro (12.9-inch, 1st gen)"
+IPADPRO12GEN2 = "iPad Pro (12.9-inch, 2nd gen)"
+IPADPRO12GEN3 = "iPad Pro (12.9-inch, 3rd gen)"
+IPADPRO12GEN4 = "iPad Pro (12.9-inch, 4th gen)"
+IPADPRO12GEN5 = "iPad Pro (12.9-inch, 5th gen)"
+IPADPRO12GEN6 = "iPad Pro (12.9-inch, 6th gen)"
+IPADPRO12GEN7 = "iPad Pro (12.9-inch, 7th gen)"
+
+IPADMINIGEN1 = "iPad mini (1st gen)"
+IPADMINI2 = "iPad mini 2"
+IPADMINI3 = "iPad mini 3"
+IPADMINI4 = "iPad mini 4"
+IPADMINIGEN5 = "iPad mini (5th gen)"
+IPADMINIGEN6 = "iPad mini (6th gen)"
+
+APPLEWATCHGEN1 = "Apple Watch (1st gen)"
+APPLEWATCHSERIES1 = "Apple Watch Series 1"
+APPLEWATCHSERIES2 = "Apple Watch Series 2"
+APPLEWATCHSERIES3 = "Apple Watch Series 3"
+APPLEWATCHSERIES4 = "Apple Watch Series 4"
+APPLEWATCHSERIES5 = "Apple Watch Series 5"
+APPLEWATCHSERIES6 = "Apple Watch Series 6"
+APPLEWATCHSERIES7 = "Apple Watch Series 7"
+APPLEWATCHSERIES8 = "Apple Watch Series 8"
+APPLEWATCHSERIES9 = "Apple Watch Series 9"
+APPLEWATCHSERIES10 = "Apple Watch Series 10"
+APPLEWATCHSE1 = "Apple Watch SE (1st gen)"
+APPLEWATCHSE2 = "Apple Watch SE (2nd gen)"
+
+APPLETVGEN1 = "Apple TV (1st gen)"
+APPLETVGEN2 = "Apple TV (2nd gen)"
+APPLETVGEN3 = "Apple TV (3rd gen)"
+
+# see https://theapplewiki.com/wiki/models
+IOS_MODELS: dict[str, str] = {
+    # iPhone
+    "iPhone1,1": "iPhone (1st gen)",
+    "iPhone1,2": "iPhone 3G",
+    "iPhone2,1": "iPhone 3GS",
+    "iPhone3,1": IPHONE4,
+    "iPhone3,2": IPHONE4,
+    "iPhone3,3": IPHONE4,
+    "iPhone4,1": "iPhone 4S",
+    "iPhone5,1": IPHONE5,
+    "iPhone5,2": IPHONE5,
+    "iPhone5,3": IPHONE5C,
+    "iPhone5,4": IPHONE5C,
+    "iPhone6,1": IPHONE5S,
+    "iPhone6,2": IPHONE5S,
+    "iPhone7,2": "iPhone 6",
+    "iPhone7,1": "iPhone 6 Plus",
+    "iPhone8,1": "iPhone 6s",
+    "iPhone8,2": "iPhone 6s Plus",
+    "iPhone8,4": "iPhone SE (1st gen)",
+    "iPhone9,1": IPHONE7,
+    "iPhone9,3": IPHONE7,
+    "iPhone9,2": IPHONE7PLUS,
+    "iPhone9,4": IPHONE7PLUS,
+    "iPhone10,1": IPHONE8,
+    "iPhone10,4": IPHONE8,
+    "iPhone10,2": IPHONE8PLUS,
+    "iPhone10,5": IPHONE8PLUS,
+    "iPhone10,3": IPHONEX,
+    "iPhone10,6": IPHONEX,
+    "iPhone11,8": "iPhone XR",
+    "iPhone11,2": "iPhone XS",
+    "iPhone11,4": IPHONEXSMAX,
+    "iPhone11,6": IPHONEXSMAX,
+    "iPhone12,1": "iPhone 11",
+    "iPhone12,3": "iPhone 11 Pro",
+    "iPhone12,5": "iPhone 11 Pro Max",
+    "iPhone12,8": "iPhone SE (2nd gen)",
+    "iPhone13,1": "iPhone 12 mini",
+    "iPhone13,2": "iPhone 12",
+    "iPhone13,3": "iPhone 12 Pro",
+    "iPhone13,4": "iPhone 12 Pro Max",
+    "iPhone14,4": "iPhone 13 mini",
+    "iPhone14,5": "iPhone 13",
+    "iPhone14,2": "iPhone 13 Pro",
+    "iPhone14,3": "iPhone 13 Pro Max",
+    "iPhone14,6": "iPhone SE (3rd gen)",
+    "iPhone14,7": "iPhone 14",
+    "iPhone14,8": "iPhone 14 Plus",
+    "iPhone15,2": "iPhone 14 Pro",
+    "iPhone15,3": "iPhone 14 Pro Max",
+    "iPhone15,4": "iPhone 15",
+    "iPhone15,5": "iPhone 15 Plus",
+    "iPhone16,1": "iPhone 15 Pro",
+    "iPhone16,2": "iPhone 15 Pro Max",
+    "iPhone17,1": "iPhone 16 Pro",
+    "iPhone17,2": "iPhone 16 Pro Max",
+    "iPhone17,3": "iPhone 16",
+    "iPhone17,4": "iPhone 16 Plus",
+    # iPod Touch
+    "iPod1,1": "iPod touch (1st gen)",
+    "iPod2,1": "iPod touch (2nd gen)",
+    "iPod3,1": "iPod touch (3rd gen)",
+    "iPod4,1": "iPod touch (4th gen)",
+    "iPod5,1": "iPod touch (5th gen)",
+    "iPod7,1": "iPod touch (6th gen)",
+    "iPod9,1": "iPod touch (7th gen)",
+    # iPad
+    "iPad1,1": "iPad (1st gen)",
+    "iPad2,1": IPAD2,
+    "iPad2,2": IPAD2,
+    "iPad2,3": IPAD2,
+    "iPad2,4": IPAD2,
+    "iPad3,1": IPADGEN3,
+    "iPad3,2": IPADGEN3,
+    "iPad3,3": IPADGEN3,
+    "iPad3,4": IPADGEN4,
+    "iPad3,5": IPADGEN4,
+    "iPad3,6": IPADGEN4,
+    "iPad6,11": IPADGEN5,
+    "iPad6,12": IPADGEN5,
+    "iPad7,5": IPADGEN6,
+    "iPad7,6": IPADGEN6,
+    "iPad7,11": IPADGEN7,
+    "iPad7,12": IPADGEN7,
+    "iPad11,6": IPADGEN8,
+    "iPad11,7": IPADGEN8,
+    "iPad12,1": IPADGEN9,
+    "iPad12,2": IPADGEN9,
+    # iPad Air
+    "iPad4,1": IPADAIRGEN1,
+    "iPad4,2": IPADAIRGEN1,
+    "iPad4,3": IPADAIRGEN1,
+    "iPad5,3": IPADAIR2,
+    "iPad5,4": IPADAIR2,
+    "iPad11,3": IPADAIRGEN3,
+    "iPad11,4": IPADAIRGEN3,
+    "iPad13,1": IPADAIRGEN4,
+    "iPad13,2": IPADAIRGEN4,
+    "iPad13,16": IPADAIRGEN5,
+    "iPad13,17": IPADAIRGEN5,
+    "iPad14,8": IPADAIRGEN6,
+    "iPad14,9": IPADAIRGEN6,
+    "iPad14,10": IPADAIRGEN7,
+    "iPad14,11": IPADAIRGEN7,
+    # iPad Pro
+    "iPad6,7": IPADPRO12GEN1,
+    "iPad6,3": IPADPRO9GEN1,
+    "iPad6,4": IPADPRO9GEN1,
+    "iPad6,8": IPADPRO12GEN1,
+    "iPad7,1": IPADPRO12GEN2,
+    "iPad7,2": IPADPRO12GEN2,
+    "iPad7,3": IPADPRO10,
+    "iPad7,4": IPADPRO10,
+    "iPad8,1": IPADPRO11GEN1,
+    "iPad8,2": IPADPRO11GEN1,
+    "iPad8,3": IPADPRO11GEN1,
+    "iPad8,4": IPADPRO11GEN1,
+    "iPad8,5": IPADPRO12GEN3,
+    "iPad8,6": IPADPRO12GEN3,
+    "iPad8,7": IPADPRO12GEN3,
+    "iPad8,8": IPADPRO12GEN3,
+    "iPad8,9": IPADPRO11GEN2,
+    "iPad8,10": IPADPRO11GEN2,
+    "iPad8,11": IPADPRO12GEN4,
+    "iPad8,12": IPADPRO12GEN4,
+    "iPad13,4": IPADPRO11GEN3,
+    "iPad13,5": IPADPRO11GEN3,
+    "iPad13,6": IPADPRO11GEN3,
+    "iPad13,7": IPADPRO11GEN3,
+    "iPad13,8": IPADPRO12GEN5,
+    "iPad13,9": IPADPRO12GEN5,
+    "iPad13,10": IPADPRO12GEN5,
+    "iPad13,11": IPADPRO12GEN5,
+    "iPad14,3": IPADPRO11GEN4,
+    "iPad14,4": IPADPRO11GEN4,
+    "iPad14,5": IPADPRO12GEN6,
+    "iPad14,6": IPADPRO12GEN6,
+    "iPad16,3": IPADPRO11GEN5,
+    "iPad16,4": IPADPRO11GEN5,
+    "iPad16,5": IPADPRO12GEN7,
+    "iPad16,6": IPADPRO12GEN7,
+    # iPad Mini
+    "iPad2,5": IPADMINIGEN1,
+    "iPad2,6": IPADMINIGEN1,
+    "iPad2,7": IPADMINIGEN1,
+    "iPad4,4": IPADMINI2,
+    "iPad4,5": IPADMINI2,
+    "iPad4,6": IPADMINI2,
+    "iPad4,7": IPADMINI3,
+    "iPad4,8": IPADMINI3,
+    "iPad4,9": IPADMINI3,
+    "iPad5,1": IPADMINI4,
+    "iPad5,2": IPADMINI4,
+    "iPad11,1": IPADMINIGEN5,
+    "iPad11,2": IPADMINIGEN5,
+    "iPad13,18": IPADGEN10,
+    "iPad13,19": IPADGEN10,
+    "iPad14,1": IPADMINIGEN6,
+    "iPad14,2": IPADMINIGEN6,
+    # Apple Watch
+    "Watch1,1": APPLEWATCHGEN1,
+    "Watch1,2": APPLEWATCHGEN1,
+    "Watch2,6": APPLEWATCHSERIES1,
+    "Watch2,7": APPLEWATCHSERIES1,
+    "Watch2,3": APPLEWATCHSERIES2,
+    "Watch2,4": APPLEWATCHSERIES2,
+    "Watch3,1": APPLEWATCHSERIES3,
+    "Watch3,2": APPLEWATCHSERIES3,
+    "Watch3,3": APPLEWATCHSERIES3,
+    "Watch3,4": APPLEWATCHSERIES3,
+    "Watch4,1": APPLEWATCHSERIES4,
+    "Watch4,2": APPLEWATCHSERIES4,
+    "Watch4,3": APPLEWATCHSERIES4,
+    "Watch4,4": APPLEWATCHSERIES4,
+    "Watch5,1": APPLEWATCHSERIES5,
+    "Watch5,2": APPLEWATCHSERIES5,
+    "Watch5,3": APPLEWATCHSERIES5,
+    "Watch5,4": APPLEWATCHSERIES5,
+    "Watch6,3": APPLEWATCHSERIES6,
+    "Watch6,4": APPLEWATCHSERIES6,
+    "Watch6,6": APPLEWATCHSERIES7,
+    "Watch6,7": APPLEWATCHSERIES7,
+    "Watch6,8": APPLEWATCHSERIES7,
+    "Watch6,9": APPLEWATCHSERIES7,
+    "Watch6,14": APPLEWATCHSERIES8,
+    "Watch6,15": APPLEWATCHSERIES8,
+    "Watch6,16": APPLEWATCHSERIES8,
+    "Watch6,17": APPLEWATCHSERIES8,
+    "Watch7,1": APPLEWATCHSERIES9,
+    "Watch7,2": APPLEWATCHSERIES9,
+    "Watch7,3": APPLEWATCHSERIES9,
+    "Watch7,4": APPLEWATCHSERIES9,
+    "Watch7,8": APPLEWATCHSERIES10,
+    "Watch7,9": APPLEWATCHSERIES10,
+    "Watch7,10": APPLEWATCHSERIES10,
+    "Watch7,11": APPLEWATCHSERIES10,
+    # Apple Watch SE
+    "Watch5,9": APPLEWATCHSE1,
+    "Watch5,10": APPLEWATCHSE1,
+    "Watch5,11": APPLEWATCHSE1,
+    "Watch5,12": APPLEWATCHSE1,
+    "Watch6,10": APPLEWATCHSE2,
+    "Watch6,11": APPLEWATCHSE2,
+    "Watch6,12": APPLEWATCHSE2,
+    "Watch6,13": APPLEWATCHSE2,
+    # Apple Watch Ultra
+    "Watch6,18": "Apple Watch Ultra (1st gen)",
+    "Watch7,5": "Apple Watch Ultra (2nd gen)",
+    # Apple TV
+    "AppleTV1,1": "Apple TV (1st gen)",
+    "AppleTV2,1": "Apple TV (2nd gen)",
+    "AppleTV3,1": APPLETVGEN3,
+    "AppleTV3,2": APPLETVGEN3,
+    "AppleTV5,3": "Apple TV (4th gen)",
+    "AppleTV6,2": "Apple TV 4K",
+    "AppleTV11,1": "Apple TV 4K (2nd gen)",
+    "i386": "iOS Simulator (i386)",
+    "x86_64": "iOS Simulator (x86_64)",
+}
diff --git a/src/sentry/api/helpers/mobile.py b/src/sentry/api/helpers/mobile.py
index b00a5a5f3b3c52..c991c3d2526670 100644
--- a/src/sentry/api/helpers/mobile.py
+++ b/src/sentry/api/helpers/mobile.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from sentry.api.helpers.android_models import ANDROID_MODELS
-from sentry.profiles.device import IOS_MODELS
+from sentry.api.helpers.ios_models import IOS_MODELS
 
 
 def get_readable_device_name(device: str) -> str | None:
diff --git a/src/sentry/api/serializers/models/environment.py b/src/sentry/api/serializers/models/environment.py
index 5f4413f45b9013..4f69d7468d4d08 100644
--- a/src/sentry/api/serializers/models/environment.py
+++ b/src/sentry/api/serializers/models/environment.py
@@ -1,15 +1,7 @@
-from collections import namedtuple
-from datetime import timedelta
 from typing import TypedDict
 
-from django.utils import timezone
-
-from sentry import tsdb
 from sentry.api.serializers import Serializer, register
 from sentry.models.environment import Environment, EnvironmentProject
-from sentry.tsdb.base import TSDBModel
-
-StatsPeriod = namedtuple("StatsPeriod", ("segments", "interval"))
 
 
 class EnvironmentSerializerResponse(TypedDict):
@@ -39,49 +31,3 @@ def serialize(
             "name": obj.environment.name,
             "isHidden": obj.is_hidden is True,
         }
-
-
-class GroupEnvironmentWithStatsSerializer(EnvironmentSerializer):
-    STATS_PERIODS = {
-        "24h": StatsPeriod(24, timedelta(hours=1)),
-        "30d": StatsPeriod(30, timedelta(hours=24)),
-    }
-
-    def __init__(self, group, since=None, until=None):
-        self.group = group
-        self.since = since
-        self.until = until
-
-    def get_attrs(self, item_list, user, **kwargs):
-        attrs = {item: {"stats": {}} for item in item_list}
-        items = {self.group.id: []}
-        for item in item_list:
-            items[self.group.id].append(item.id)
-
-        for key, (segments, interval) in self.STATS_PERIODS.items():
-            until = self.until or timezone.now()
-            since = self.since or until - (segments * interval)
-
-            try:
-                stats = tsdb.get_frequency_series(
-                    model=TSDBModel.frequent_environments_by_group,
-                    items=items,
-                    start=since,
-                    end=until,
-                    rollup=int(interval.total_seconds()),
-                )
-            except NotImplementedError:
-                # TODO(dcramer): probably should log this, but not worth
-                # erring out
-                stats = {}
-
-            for item in item_list:
-                attrs[item]["stats"][key] = [
-                    (k, v[item.id]) for k, v in stats.get(self.group.id, {})
-                ]
-        return attrs
-
-    def serialize(self, obj, attrs, user, **kwargs):
-        result = super().serialize(obj, attrs, user)
-        result["stats"] = attrs["stats"]
-        return result
diff --git a/src/sentry/api/serializers/models/event.py b/src/sentry/api/serializers/models/event.py
index 1d2255fa2e3941..2cbc423f51dc8e 100644
--- a/src/sentry/api/serializers/models/event.py
+++ b/src/sentry/api/serializers/models/event.py
@@ -172,7 +172,6 @@ class TransactionEventFields(TypedDict, total=False):
     endTimestamp: datetime
     measurements: Any
     breakdowns: Any
-    _metrics_summary: Any
 
 
 class EventSerializerResponse(
@@ -377,10 +376,6 @@ def __serialize_transaction_attrs(self, attrs, obj) -> TransactionEventFields:
             "breakdowns": obj.data.get("breakdowns"),
         }
 
-        # The _ reflects the temporary nature of this field.
-        if (transaction_metrics_summary := obj.data.get("_metrics_summary")) is not None:
-            transaction_attrs["_metrics_summary"] = transaction_metrics_summary
-
         return transaction_attrs
 
     def __serialize_error_attrs(self, attrs, obj) -> ErrorEventFields:
diff --git a/src/sentry/api/serializers/models/group.py b/src/sentry/api/serializers/models/group.py
index b229c161ccc933..4a78c94cb8f270 100644
--- a/src/sentry/api/serializers/models/group.py
+++ b/src/sentry/api/serializers/models/group.py
@@ -317,7 +317,7 @@ def get_attrs(
         return result
 
     def serialize(
-        self, obj: Group, attrs: MutableMapping[str, Any], user: Any, **kwargs: Any
+        self, obj: Group, attrs: Mapping[str, Any], user: Any, **kwargs: Any
     ) -> BaseGroupSerializerResponse:
         status_details, status_label = self._get_status(attrs, obj)
         permalink = self._get_permalink(attrs, obj)
@@ -390,7 +390,7 @@ def _collapse(self, key) -> bool:
             return False
         return key in self.collapse
 
-    def _get_status(self, attrs: MutableMapping[str, Any], obj: Group):
+    def _get_status(self, attrs: Mapping[str, Any], obj: Group):
         status = obj.status
         status_details = {}
         if attrs["ignore_until"]:
@@ -850,7 +850,7 @@ def __seen_stats_impl(
 
 class SharedGroupSerializer(GroupSerializer):
     def serialize(
-        self, obj: Group, attrs: MutableMapping[str, Any], user: Any, **kwargs: Any
+        self, obj: Group, attrs: Mapping[str, Any], user: Any, **kwargs: Any
     ) -> BaseGroupSerializerResponse:
         result = super().serialize(obj, attrs, user)
 
diff --git a/src/sentry/api/serializers/models/organization_access_request.py b/src/sentry/api/serializers/models/organization_access_request.py
index 0e5587d295465c..f96ad98652a2a5 100644
--- a/src/sentry/api/serializers/models/organization_access_request.py
+++ b/src/sentry/api/serializers/models/organization_access_request.py
@@ -5,17 +5,41 @@
 
 @register(OrganizationAccessRequest)
 class OrganizationAccessRequestSerializer(Serializer):
-    def serialize(self, obj, attrs, user, **kwargs):
-        serialized_user = None
-        if obj.requester_id:
-            serialized_users = user_service.serialize_many(filter=dict(user_ids=[obj.requester_id]))
-            if serialized_users:
-                serialized_user = serialized_users[0]
+    def get_attrs(self, item_list, user, **kwargs):
+
+        serialized_requesters = user_service.serialize_many(
+            filter=dict(user_ids=[item.requester_id for item in item_list if item.requester_id])
+        )
+
+        serialized_requesters_by_id = {
+            int(requester["id"]): requester for requester in serialized_requesters
+        }
+
+        serialized_members = serialize(
+            [item.member for item in item_list],
+            user,
+        )
+
+        serialized_members_by_id = {int(member["id"]): member for member in serialized_members}
 
-        d = {
+        serialized_teams = serialize([item.team for item in item_list], user)
+
+        serialized_teams_by_id = {int(team["id"]): team for team in serialized_teams}
+
+        return {
+            item: {
+                "requester": serialized_requesters_by_id.get(item.requester_id),
+                "member": serialized_members_by_id.get(item.member_id),
+                "team": serialized_teams_by_id.get(item.team_id),
+            }
+            for item in item_list
+        }
+
+    def serialize(self, obj, attrs, user, **kwargs):
+        serialized_access_request = {
             "id": str(obj.id),
-            "member": serialize(obj.member),
-            "team": serialize(obj.team),
-            "requester": serialized_user,
+            "member": attrs["member"],
+            "team": attrs["team"],
+            "requester": attrs["requester"],
         }
-        return d
+        return serialized_access_request
diff --git a/src/sentry/api/serializers/models/project.py b/src/sentry/api/serializers/models/project.py
index 840d4af67c0dce..3b98730448b3af 100644
--- a/src/sentry/api/serializers/models/project.py
+++ b/src/sentry/api/serializers/models/project.py
@@ -80,7 +80,6 @@
     "servicehooks",
     "similarity-embeddings",
     "similarity-embeddings-delete-by-hash",
-    "similarity-embeddings-backfill",
 }
 
 
diff --git a/src/sentry/api/serializers/models/team.py b/src/sentry/api/serializers/models/team.py
index f64f993e5c72cd..0aa1845775702e 100644
--- a/src/sentry/api/serializers/models/team.py
+++ b/src/sentry/api/serializers/models/team.py
@@ -2,10 +2,11 @@
 
 import dataclasses
 from collections import defaultdict
-from collections.abc import Mapping, MutableMapping, MutableSequence, Sequence
+from collections.abc import Mapping, Sequence
 from datetime import datetime
-from typing import TYPE_CHECKING, AbstractSet, Any, TypedDict
+from typing import TYPE_CHECKING, Any, TypedDict
 
+from django.contrib.auth.models import AnonymousUser
 from django.db.models import Count
 
 from sentry import roles
@@ -39,9 +40,9 @@
 
 def _get_team_memberships(
     team_list: Sequence[Team],
-    user: User,
+    user: User | AnonymousUser,
     optimization: SingularRpcAccessOrgOptimization | None = None,
-) -> Mapping[int, str | None]:
+) -> dict[int, str | None]:
     """Get memberships the user has in the provided team list"""
     if not user.is_authenticated:
         return {}
@@ -62,7 +63,7 @@ def _get_team_memberships(
     }
 
 
-def get_member_totals(team_list: Sequence[Team], user: User) -> Mapping[str, int]:
+def get_member_totals(team_list: Sequence[Team], user: User | AnonymousUser) -> dict[int, int]:
     """Get the total number of members in each team"""
     if not user.is_authenticated:
         return {}
@@ -79,8 +80,10 @@ def get_member_totals(team_list: Sequence[Team], user: User) -> Mapping[str, int
 
 
 def get_org_roles(
-    org_ids: set[int], user: User, optimization: SingularRpcAccessOrgOptimization | None = None
-) -> Mapping[int, str]:
+    org_ids: set[int],
+    user: User | AnonymousUser,
+    optimization: SingularRpcAccessOrgOptimization | None = None,
+) -> dict[int, str]:
     """
     Get the roles the user has in each org
     """
@@ -103,7 +106,7 @@ def get_org_roles(
     }
 
 
-def get_access_requests(item_list: Sequence[Team], user: User) -> AbstractSet[Team]:
+def get_access_requests(item_list: Sequence[Team], user: User | AnonymousUser) -> frozenset[int]:
     if user.is_authenticated:
         return frozenset(
             OrganizationAccessRequest.objects.filter(
@@ -123,7 +126,7 @@ class BaseTeamSerializerResponse(TypedDict):
     id: str
     slug: str
     name: str
-    dateCreated: datetime
+    dateCreated: datetime | None
     isMember: bool
     teamRole: str | None
     flags: dict[str, Any]
@@ -179,9 +182,11 @@ def _collapse(self, key: str) -> bool:
 
     def get_attrs(
         self, item_list: Sequence[Team], user: User, **kwargs: Any
-    ) -> MutableMapping[Team, MutableMapping[str, Any]]:
+    ) -> dict[Team, dict[str, Any]]:
+        from sentry.api.serializers.models.project import ProjectSerializer
+
         request = env.request
-        org_ids: set[int] = {t.organization_id for t in item_list}
+        org_ids = {t.organization_id for t in item_list}
 
         assert len(org_ids) == 1, "Cross organization query for teams"
 
@@ -195,13 +200,14 @@ def get_attrs(
         access_requests = get_access_requests(item_list, user)
 
         is_superuser = request and is_active_superuser(request) and request.user == user
-        result: MutableMapping[Team, MutableMapping[str, Any]] = {}
+        result: dict[Team, dict[str, Any]] = {}
         organization = Organization.objects.get_from_cache(id=list(org_ids)[0])
 
         for team in item_list:
             is_member = team.id in team_memberships
             org_role = roles_by_org.get(team.organization_id)
-            team_role_id, team_role_scopes = team_memberships.get(team.id), set()
+            team_role_id = team_memberships.get(team.id)
+            team_role_scopes: frozenset[str] = frozenset()
 
             has_access = bool(
                 is_member
@@ -240,7 +246,11 @@ def get_attrs(
             projects = [pt.project for pt in project_teams]
 
             projects_by_id = {
-                project.id: data for project, data in zip(projects, serialize(projects, user))
+                project.id: data
+                for project, data in zip(
+                    projects,
+                    serialize(projects, user, ProjectSerializer(collapse=["unusedFeatures"])),
+                )
             }
 
             project_map = defaultdict(list)
@@ -268,7 +278,7 @@ def get_attrs(
     def serialize(
         self, obj: Team, attrs: Mapping[str, Any], user: Any, **kwargs: Any
     ) -> BaseTeamSerializerResponse:
-        result: BaseTeamSerializerResponse = {
+        return {
             "id": str(obj.id),
             "slug": obj.slug,
             "name": obj.name,
@@ -284,8 +294,6 @@ def serialize(
             "avatar": {"avatarType": "letter_avatar", "avatarUuid": None},
         }
 
-        return result
-
 
 # See TeamSerializerResponse for explanation as to why this is needed
 class TeamSerializer(BaseTeamSerializer):
@@ -294,17 +302,19 @@ def serialize(
     ) -> TeamSerializerResponse:
         result = super().serialize(obj, attrs, user, **kwargs)
 
+        opt: _TeamSerializerResponseOptional = {}
+
         # Expandable attributes.
         if self._expand("externalTeams"):
-            result["externalTeams"] = attrs["externalTeams"]
+            opt["externalTeams"] = attrs["externalTeams"]
 
         if self._expand("organization"):
-            result["organization"] = serialize(obj.organization, user)
+            opt["organization"] = serialize(obj.organization, user)
 
         if self._expand("projects"):
-            result["projects"] = attrs["projects"]
+            opt["projects"] = attrs["projects"]
 
-        return result
+        return {**result, **opt}
 
 
 class TeamWithProjectsSerializer(TeamSerializer):
@@ -316,14 +326,14 @@ def __init__(self) -> None:
 
 def get_scim_teams_members(
     team_list: Sequence[Team],
-) -> MutableMapping[Team, MutableSequence[MutableMapping[str, Any]]]:
+) -> dict[Team, list[dict[str, Any]]]:
     members = RangeQuerySetWrapper(
         OrganizationMember.objects.filter(teams__in=team_list)
         .prefetch_related("teams")
         .distinct("id"),
         limit=10000,
     )
-    member_map: MutableMapping[Team, MutableSequence[MutableMapping[str, Any]]] = defaultdict(list)
+    member_map: dict[Team, list[dict[str, Any]]] = defaultdict(list)
     for member in members:
         for team in member.teams.all():
             member_map[team].append({"value": str(member.id), "display": member.get_email()})
@@ -382,16 +392,16 @@ def __init__(
 
     def get_attrs(
         self, item_list: Sequence[Team], user: Any, **kwargs: Any
-    ) -> Mapping[Team, MutableMapping[str, Any]]:
+    ) -> dict[Team, dict[str, Any]]:
 
-        result: MutableMapping[int, MutableMapping[str, Any]] = {
+        result: dict[int, dict[str, Any]] = {
             team.id: ({"members": []} if "members" in self.expand else {}) for team in item_list
         }
-        teams_by_id: Mapping[int, Team] = {t.id: t for t in item_list}
+        teams_by_id = {t.id: t for t in item_list}
 
         if teams_by_id and "members" in self.expand:
-            team_ids: list[int] = [t.id for t in item_list]
-            team_memberships: list[TeamMembership] = get_team_memberships(team_ids=team_ids)
+            team_ids = [t.id for t in item_list]
+            team_memberships = get_team_memberships(team_ids=team_ids)
 
             for team_member in team_memberships:
                 for team_id in team_member.team_ids:
diff --git a/src/sentry/api/urls.py b/src/sentry/api/urls.py
index ab5ea0cba6d58a..ab1953a40c79e0 100644
--- a/src/sentry/api/urls.py
+++ b/src/sentry/api/urls.py
@@ -178,7 +178,6 @@
     GroupHashesEndpoint,
     GroupNotesDetailsEndpoint,
     GroupNotesEndpoint,
-    GroupParticipantsEndpoint,
     GroupSimilarIssuesEmbeddingsEndpoint,
     GroupSimilarIssuesEndpoint,
     GroupTombstoneDetailsEndpoint,
@@ -313,6 +312,11 @@
 from sentry.sentry_apps.api.endpoints.sentry_internal_app_tokens import (
     SentryInternalAppTokensEndpoint,
 )
+from sentry.tempest.endpoints.tempest_credentials import TempestCredentialsEndpoint
+from sentry.tempest.endpoints.tempest_credentials_details import TempestCredentialsDetailsEndpoint
+from sentry.uptime.endpoints.organiation_uptime_alert_index import (
+    OrganizationUptimeAlertIndexEndpoint,
+)
 from sentry.uptime.endpoints.project_uptime_alert_details import ProjectUptimeAlertDetailsEndpoint
 from sentry.uptime.endpoints.project_uptime_alert_index import ProjectUptimeAlertIndexEndpoint
 from sentry.users.api.endpoints.authenticator_index import AuthenticatorIndexEndpoint
@@ -792,11 +796,6 @@ def create_group_urls(name_prefix: str) -> list[URLPattern | URLResolver]:
             GroupFirstLastReleaseEndpoint.as_view(),
             name=f"{name_prefix}-group-first-last-release",
         ),
-        re_path(
-            r"^(?P<issue_id>[^\/]+)/participants/$",
-            GroupParticipantsEndpoint.as_view(),
-            name=f"{name_prefix}-group-participants",
-        ),
         re_path(
             r"^(?P<issue_id>[^\/]+)/autofix/$",
             GroupAutofixEndpoint.as_view(),
@@ -2197,6 +2196,12 @@ def create_group_urls(name_prefix: str) -> list[URLPattern | URLResolver]:
         OrganizationForkEndpoint.as_view(),
         name="sentry-api-0-organization-fork",
     ),
+    # Uptime
+    re_path(
+        r"^(?P<organization_id_or_slug>[^\/]+)/uptime/$",
+        OrganizationUptimeAlertIndexEndpoint.as_view(),
+        name="sentry-api-0-organization-uptime-alert-index",
+    ),
 ]
 
 PROJECT_URLS: list[URLPattern | URLResolver] = [
@@ -2787,6 +2792,17 @@ def create_group_urls(name_prefix: str) -> list[URLPattern | URLResolver]:
         ProjectUptimeAlertIndexEndpoint.as_view(),
         name="sentry-api-0-project-uptime-alert-index",
     ),
+    # Tempest
+    re_path(
+        r"^(?P<organization_id_or_slug>[^\/]+)/(?P<project_id_or_slug>[^\/]+)/tempest-credentials/$",
+        TempestCredentialsEndpoint.as_view(),
+        name="sentry-api-0-project-tempest-credentials",
+    ),
+    re_path(
+        r"^(?P<organization_id_or_slug>[^\/]+)/(?P<project_id_or_slug>[^\/]+)/tempest-credentials/(?P<tempest_credentials_id>\d+)/$",
+        TempestCredentialsDetailsEndpoint.as_view(),
+        name="sentry-api-0-project-tempest-credentials-details",
+    ),
     *workflow_urls.urlpatterns,
 ]
 
diff --git a/src/sentry/apidocs/examples/tags_examples.py b/src/sentry/apidocs/examples/tags_examples.py
index 08325a83443976..de4cf843ea0dc5 100644
--- a/src/sentry/apidocs/examples/tags_examples.py
+++ b/src/sentry/apidocs/examples/tags_examples.py
@@ -7,17 +7,17 @@
     "totalValues": 3,
     "topValues": [
         {
-            "key": "chunkymonkey",
-            "name": "Chunky Monkey",
-            "value": "chunkymonkey",
+            "key": "strawberry",
+            "name": "Strawberry",
+            "value": "strawberry",
             "count": 2,
             "lastSeen": "2024-01-01T00:00:00Z",
             "firstSeen": "2024-01-01T00:00:00Z",
         },
         {
-            "key": "halfbaked",
-            "name": "Half Baked",
-            "value": "halfbaked",
+            "key": "vanilla",
+            "name": "Vanilla",
+            "value": "vanilla",
             "count": 1,
             "lastSeen": "2024-01-01T00:00:00Z",
             "firstSeen": "2024-01-01T00:00:00Z",
@@ -25,6 +25,41 @@
     ],
 }
 
+SIMPLE_TAG_VALUES = [
+    {
+        "key": "strawberry",
+        "name": "Strawberry",
+        "value": "strawberry",
+        "count": 2,
+        "lastSeen": "2024-01-01T00:00:00Z",
+        "firstSeen": "2024-01-01T00:00:00Z",
+    },
+    {
+        "key": "vanilla",
+        "name": "Vanilla",
+        "value": "vanilla",
+        "count": 1,
+        "lastSeen": "2024-01-01T00:00:00Z",
+        "firstSeen": "2024-01-01T00:00:00Z",
+    },
+    {
+        "key": "chocolate",
+        "name": "Chocolate",
+        "value": "chocolate",
+        "count": 1,
+        "lastSeen": "2024-01-01T00:00:00Z",
+        "firstSeen": "2024-01-01T00:00:00Z",
+    },
+    {
+        "key": "Neopolitan",
+        "name": "Neopolitan",
+        "value": "neopolitan",
+        "count": 1,
+        "lastSeen": "2024-01-01T00:00:00Z",
+        "firstSeen": "2024-01-01T00:00:00Z",
+    },
+]
+
 
 class TagsExamples:
     GROUP_TAGKEY_DETAILS = OpenApiExample(
@@ -33,3 +68,10 @@ class TagsExamples:
         response_only=True,
         status_codes=["200"],
     )
+
+    GROUP_TAGKEY_VALUES = OpenApiExample(
+        "Return all tag values for a specific tag",
+        value=SIMPLE_TAG_VALUES,
+        response_only=True,
+        status_codes=["200"],
+    )
diff --git a/src/sentry/apidocs/parameters.py b/src/sentry/apidocs/parameters.py
index 863f74aa30d05e..2e77189235a0d9 100644
--- a/src/sentry/apidocs/parameters.py
+++ b/src/sentry/apidocs/parameters.py
@@ -284,6 +284,14 @@ class SCIMParams:
 
 
 class IssueParams:
+    KEY = OpenApiParameter(
+        name="key",
+        location=OpenApiParameter.PATH,
+        type=OpenApiTypes.STR,
+        description="The tag key to look the values up for.",
+        required=True,
+    )
+
     ISSUES_OR_GROUPS = OpenApiParameter(
         name="var",
         location="path",
@@ -299,6 +307,15 @@ class IssueParams:
         description="The ID of the issue you'd like to query.",
     )
 
+    SORT = OpenApiParameter(
+        name="sort",
+        location="query",
+        required=False,
+        type=str,
+        description="Sort order of the resulting tag values. Prefix with '-' for descending order. Default is '-id'.",
+        enum=["id", "date", "age", "count"],
+    )
+
 
 class IssueAlertParams:
     ISSUE_RULE_ID = OpenApiParameter(
@@ -418,6 +435,13 @@ class UptimeParams:
         type=int,
         description="The ID of the uptime alert rule you'd like to query.",
     )
+    OWNER = OpenApiParameter(
+        name="owner",
+        location="query",
+        required=False,
+        type=str,
+        description="The owner of the uptime alert, in the format `user:id` or `team:id`. May be specified multiple times.",
+    )
 
 
 class EventParams:
@@ -445,6 +469,41 @@ class EventParams:
         description="Index of the exception that should be used for source map resolution.",
     )
 
+    EVENT_ID_EXTENDED = OpenApiParameter(
+        name="event_id",
+        type=OpenApiTypes.STR,
+        location=OpenApiParameter.PATH,
+        description="The ID of the event to retrieve, or 'latest', 'oldest', or 'recommended'.",
+        required=True,
+        enum=["latest", "oldest", "recommended"],
+    )
+
+    FULL_PAYLOAD = OpenApiParameter(
+        name="full",
+        type=OpenApiTypes.BOOL,
+        location=OpenApiParameter.QUERY,
+        description="Specify true to include the full event body, including the stacktrace, in the event payload.",
+        required=False,
+        default=False,
+    )
+
+    SAMPLE = OpenApiParameter(
+        name="sample",
+        type=OpenApiTypes.BOOL,
+        location=OpenApiParameter.QUERY,
+        description="Return events in pseudo-random order. This is deterministic so an identical query will always return the same events in the same order.",
+        required=False,
+        default=False,
+    )
+
+    QUERY = OpenApiParameter(
+        name="query",
+        location=OpenApiParameter.QUERY,
+        type=OpenApiTypes.STR,
+        description="An optional search query for filtering events.",
+        required=False,
+    )
+
 
 class ProjectParams:
     FILTER_ID = OpenApiParameter(
diff --git a/src/sentry/auth/services/auth/model.py b/src/sentry/auth/services/auth/model.py
index d0bbd928b60133..82254cc4bad5ad 100644
--- a/src/sentry/auth/services/auth/model.py
+++ b/src/sentry/auth/services/auth/model.py
@@ -22,7 +22,7 @@
 class RpcApiKey(RpcModel):
     id: int = -1
     organization_id: int = -1
-    key: str = ""
+    key: str = Field(repr=False, default="")
     status: int = 0
     allowed_origins: list[str] = Field(default_factory=list)
     label: str = ""
@@ -35,8 +35,8 @@ class RpcApiToken(RpcModel):
     organization_id: int | None = None
     application_id: int | None = None
     application_is_active: bool = False
-    token: str = ""
-    hashed_token: str | None = None
+    token: str = Field(repr=False, default="")
+    hashed_token: str | None = Field(repr=False, default=None)
     expires_at: datetime.datetime | None = None
     allowed_origins: list[str] = Field(default_factory=list)
     scope_list: list[str] = Field(default_factory=list)
diff --git a/src/sentry/auth/superuser.py b/src/sentry/auth/superuser.py
index bdf0921bdcd823..fa48351cad52e6 100644
--- a/src/sentry/auth/superuser.py
+++ b/src/sentry/auth/superuser.py
@@ -155,12 +155,6 @@ class SuperuserAccessFormInvalidJson(SentryAPIException):
     message = "The request contains invalid json"
 
 
-class EmptySuperuserAccessForm(SentryAPIException):
-    status_code = status.HTTP_400_BAD_REQUEST
-    code = "empty-superuser-access-form"
-    message = "The request contains an empty superuser access form data"
-
-
 class Superuser(ElevatedMode):
     allowed_ips = frozenset(ipaddress.ip_network(str(v), strict=False) for v in ALLOWED_IPS)
     org_id = SUPERUSER_ORG_ID
@@ -456,13 +450,6 @@ def enable_and_log_superuser_access():
                     tags={"reason": SuperuserAccessFormInvalidJson.code},
                 )
                 raise SuperuserAccessFormInvalidJson()
-            except AttributeError:
-                metrics.incr(
-                    "superuser.failure",
-                    sample_rate=1.0,
-                    tags={"reason": EmptySuperuserAccessForm.code},
-                )
-                raise EmptySuperuserAccessForm()
 
         su_access_info = SuperuserAccessSerializer(data=su_access_json)
 
diff --git a/src/sentry/backup/comparators.py b/src/sentry/backup/comparators.py
index 840c3d85a73e53..3d4cfc0eca942a 100644
--- a/src/sentry/backup/comparators.py
+++ b/src/sentry/backup/comparators.py
@@ -903,6 +903,9 @@ def get_default_comparators() -> dict[str, list[JSONScrubbingComparator]]:
             "workflow_engine.alertruletriggerdatacondition": [
                 DateUpdatedComparator("date_updated", "date_added")
             ],
+            "tempest.tempestcredentials": [
+                DateUpdatedComparator("date_updated", "date_added"),
+            ],
         },
     )
 
diff --git a/src/sentry/backup/dependencies.py b/src/sentry/backup/dependencies.py
index 4a7184e1187993..e0cf4a543dd356 100644
--- a/src/sentry/backup/dependencies.py
+++ b/src/sentry/backup/dependencies.py
@@ -95,28 +95,23 @@ def __repr__(self) -> str:
 #
 # TODO(getsentry/team-ospo#190): We should find a better way to store this information than a magic
 # list in this file. We should probably make a field (or method?) on `BaseModel` instead.
-@unique
-class RelocationRootModels(Enum):
-    """
-    Record the "root" models for a given `RelocationScope`.
-    """
-
-    Excluded: list[NormalizedModelName] = []
-    User = [NormalizedModelName("sentry.user")]
-    Organization = [NormalizedModelName("sentry.organization")]
-    Config = [
-        NormalizedModelName("sentry.controloption"),
-        NormalizedModelName("sentry.option"),
-        NormalizedModelName("sentry.relay"),
-        NormalizedModelName("sentry.relayusage"),
-        NormalizedModelName("sentry.userrole"),
-    ]
+_ROOT_MODELS: tuple[NormalizedModelName, ...] = (
+    # RelocationScope.User
+    NormalizedModelName("sentry.user"),
+    # RelocationScope.Organization
+    NormalizedModelName("sentry.organization"),
+    # RelocationScope.Config
+    NormalizedModelName("sentry.controloption"),
+    NormalizedModelName("sentry.option"),
+    NormalizedModelName("sentry.relay"),
+    NormalizedModelName("sentry.relayusage"),
+    NormalizedModelName("sentry.userrole"),
+    # RelocationScope.Global
     # TODO(getsentry/team-ospo#188): Split out extension scope root models from this list.
-    Global = [
-        NormalizedModelName("sentry.apiapplication"),
-        NormalizedModelName("sentry.integration"),
-        NormalizedModelName("sentry.sentryapp"),
-    ]
+    NormalizedModelName("sentry.apiapplication"),
+    NormalizedModelName("sentry.integration"),
+    NormalizedModelName("sentry.sentryapp"),
+)
 
 
 @unique
@@ -433,6 +428,10 @@ def dependencies() -> dict[NormalizedModelName, ModelRelations]:
             if model._meta.app_label in {"sessions", "sites", "test", "getsentry"}:
                 continue
 
+            # exclude proxy models since the backup test is already done on a parent if needed
+            if model._meta.proxy:
+                continue
+
             foreign_keys: dict[str, ForeignField] = dict()
             uniques: set[frozenset[str]] = {
                 frozenset(combo) for combo in model._meta.unique_together
@@ -538,10 +537,7 @@ def dependencies() -> dict[NormalizedModelName, ModelRelations]:
             )
 
     # Get a flat list of "root" models, then mark all of them as non-dangling.
-    relocation_root_models: list[NormalizedModelName] = []
-    for root_models in RelocationRootModels:
-        relocation_root_models.extend(root_models.value)
-    for model_name in relocation_root_models:
+    for model_name in _ROOT_MODELS:
         model_dependencies_dict[model_name].dangling = False
 
     # TODO(getsentry/team-ospo#190): In practice, we can treat `AlertRule`'s dependency on
diff --git a/src/sentry/conf/api_pagination_allowlist_do_not_modify.py b/src/sentry/conf/api_pagination_allowlist_do_not_modify.py
index d3ad9bce77bc6a..ab3353d9b670b1 100644
--- a/src/sentry/conf/api_pagination_allowlist_do_not_modify.py
+++ b/src/sentry/conf/api_pagination_allowlist_do_not_modify.py
@@ -16,7 +16,6 @@
     "GitlabIssueSearchEndpoint",
     "GroupEventsEndpoint",
     "GroupIntegrationsEndpoint",
-    "GroupParticipantsEndpoint",
     "GroupSimilarIssuesEmbeddingsEndpoint",
     "GroupStatsEndpoint",
     "GroupTagsEndpoint",
diff --git a/src/sentry/conf/server.py b/src/sentry/conf/server.py
index a0ea57ef0ad929..0d0ed2a0d40e50 100644
--- a/src/sentry/conf/server.py
+++ b/src/sentry/conf/server.py
@@ -21,12 +21,13 @@
     SENTRY_API_PAGINATION_ALLOWLIST_DO_NOT_MODIFY,
 )
 from sentry.conf.types.celery import SplitQueueSize, SplitQueueTaskRoute
-from sentry.conf.types.kafka_definition import ConsumerDefinition
+from sentry.conf.types.kafka_definition import ConsumerDefinition, Topic
 from sentry.conf.types.logging_config import LoggingConfig
 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.conf.types.uptime import UptimeRegionConfig
 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
@@ -405,6 +406,7 @@ def env(
     "sentry.flags",
     "sentry.monitors",
     "sentry.uptime",
+    "sentry.tempest",
     "sentry.replays",
     "sentry.release_health",
     "sentry.search",
@@ -835,9 +837,6 @@ def SOCIAL_AUTH_DEFAULT_USERNAME() -> str:
     "sentry.integrations.tasks",
 )
 
-# tmp(michal): Default configuration for post_process* queues split
-SENTRY_POST_PROCESS_QUEUE_SPLIT_ROUTER: dict[str, Callable[[], str]] = {}
-
 # Enable split queue routing
 CELERY_ROUTES = ("sentry.queue.routers.SplitQueueTaskRouter",)
 
@@ -854,7 +853,14 @@ def SOCIAL_AUTH_DEFAULT_USERNAME() -> str:
             "total": 3,
             "in_use": 3,
         },
-    }
+    },
+    "sentry.profiles.task.process_profile": {
+        "default_queue": "profiles.process",
+        "queues_config": {
+            "total": 3,
+            "in_use": 3,
+        },
+    },
 }
 CELERY_SPLIT_TASK_QUEUES_REGION = make_split_task_queues(CELERY_SPLIT_QUEUE_TASK_ROUTES_REGION)
 
@@ -945,6 +951,7 @@ def SOCIAL_AUTH_DEFAULT_USERNAME() -> str:
         "dynamicsampling",
         routing_key="dynamicsampling",
     ),
+    Queue("tempest", routing_key="tempest"),
     Queue("incidents", routing_key="incidents"),
     Queue("incident_snapshots", routing_key="incident_snapshots"),
     Queue("incidents", routing_key="incidents"),
@@ -1225,8 +1232,8 @@ def SOCIAL_AUTH_DEFAULT_USERNAME() -> str:
     },
     "weekly-escalating-forecast": {
         "task": "sentry.tasks.weekly_escalating_forecast.run_escalating_forecast",
-        # Run every 6 hours
-        "schedule": crontab(minute="0", hour="*/6"),
+        # Run once a day at 00:00
+        "schedule": crontab(minute="0", hour="0"),
         "options": {"expires": 60 * 60 * 3},
     },
     "schedule_auto_transition_to_ongoing": {
@@ -1332,7 +1339,10 @@ def SOCIAL_AUTH_DEFAULT_USERNAME() -> str:
 # The list of modules that workers will import after starting up
 # Like celery, taskworkers need to import task modules to make tasks
 # accessible to the worker.
-TASKWORKER_IMPORTS: tuple[str, ...] = ()
+TASKWORKER_IMPORTS: tuple[str, ...] = (
+    # Used for tests
+    "sentry.taskworker.tasks.examples",
+)
 TASKWORKER_ROUTER: str = "sentry.taskworker.router.DefaultRouter"
 TASKWORKER_ROUTES: dict[str, str] = {}
 
@@ -1461,7 +1471,18 @@ def custom_parameter_sort(parameter: dict) -> tuple[str, int]:
         "PARSER_WHITELIST": ["rest_framework.parsers.JSONParser"],
         "POSTPROCESSING_HOOKS": ["sentry.apidocs.hooks.custom_postprocessing_hook"],
         "PREPROCESSING_HOOKS": ["sentry.apidocs.hooks.custom_preprocessing_hook"],
-        "SERVERS": [{"url": "https://us.sentry.io"}, {"url": "https://de.sentry.io"}],
+        "SERVERS": [
+            {
+                "url": "https://{region}.sentry.io",
+                "variables": {
+                    "region": {
+                        "default": "us",
+                        "description": "The data-storage-location for an organization",
+                        "enum": ["us", "de"],
+                    },
+                },
+            },
+        ],
         "SORT_OPERATION_PARAMETERS": custom_parameter_sort,
         "TAGS": OPENAPI_TAGS,
         "TITLE": "API Reference",
@@ -2232,6 +2253,9 @@ def custom_parameter_sort(parameter: dict) -> tuple[str, int]:
 # This flag activates uptime checks in the developemnt environment
 SENTRY_USE_UPTIME = False
 
+# This flag activates the taskbroker in devservices
+SENTRY_USE_TASKBROKER = False
+
 # SENTRY_DEVSERVICES = {
 #     "service-name": lambda settings, options: (
 #         {
@@ -2412,6 +2436,21 @@ def custom_parameter_sort(parameter: dict) -> tuple[str, int]:
             "platform": "linux/amd64",
         }
     ),
+    "taskbroker": lambda settings, options: (
+        {
+            "image": "ghcr.io/getsentry/taskbroker:latest",
+            "ports": {"50051/tcp": 50051},
+            "environment": {
+                "TASKBROKER_KAFKA_CLUSTER": (
+                    "kafka-kafka-1"
+                    if os.environ.get("USE_NEW_DEVSERVICES") == "1"
+                    else "sentry_kafka"
+                ),
+            },
+            "only_if": settings.SENTRY_USE_TASKBROKER,
+            "platform": "linux/amd64",
+        }
+    ),
     "bigtable": lambda settings, options: (
         {
             "image": "ghcr.io/getsentry/cbtemulator:d28ad6b63e461e8c05084b8c83f1c06627068c04",
@@ -2493,7 +2532,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.11.1"
+SELF_HOSTED_STABLE_VERSION = "24.12.1"
 
 # Whether we should look at X-Forwarded-For header or not
 # when checking REMOTE_ADDR ip addresses
@@ -2940,6 +2979,7 @@ def custom_parameter_sort(parameter: dict) -> tuple[str, int]:
     "remote_subscriptions",
     "uptime",
     "workflow_engine",
+    "tempest",
 )
 # Where to write the lockfile to.
 MIGRATIONS_LOCKFILE_PATH = os.path.join(PROJECT_ROOT, os.path.pardir, os.path.pardir)
@@ -3354,7 +3394,6 @@ def custom_parameter_sort(parameter: dict) -> tuple[str, int]:
     "sentry-api-0-group-integrations",
     "sentry-api-0-group-integration-details",
     "sentry-api-0-group-current-release",
-    "sentry-api-0-group-participants",
     "sentry-api-0-shared-group-details",
     # Unscoped profiling URLs
     "sentry-api-0-profiling-project-profile",
@@ -3408,6 +3447,16 @@ def custom_parameter_sort(parameter: dict) -> tuple[str, int]:
 
 SIMILARITY_BACKFILL_COHORT_MAP: dict[str, list[int]] = {}
 
+UPTIME_REGIONS = [
+    UptimeRegionConfig(
+        slug="default",
+        name="Default Region",
+        config_topic=Topic.UPTIME_CONFIGS,
+        enabled=True,
+    ),
+]
+
+
 # Devserver configuration overrides.
 ngrok_host = os.environ.get("SENTRY_DEVSERVER_NGROK")
 if ngrok_host:
diff --git a/src/sentry/conf/types/kafka_definition.py b/src/sentry/conf/types/kafka_definition.py
index 59ae1228343494..f0013025c3de45 100644
--- a/src/sentry/conf/types/kafka_definition.py
+++ b/src/sentry/conf/types/kafka_definition.py
@@ -86,6 +86,8 @@ class ConsumerDefinition(TypedDict, total=False):
     dlq_max_invalid_ratio: float | None
     dlq_max_consecutive_count: int | None
 
+    stale_topic: Topic
+
 
 def validate_consumer_definition(consumer_definition: ConsumerDefinition) -> None:
     if "dlq_topic" not in consumer_definition and (
diff --git a/src/sentry/conf/types/uptime.py b/src/sentry/conf/types/uptime.py
new file mode 100644
index 00000000000000..2e645848a70ae4
--- /dev/null
+++ b/src/sentry/conf/types/uptime.py
@@ -0,0 +1,15 @@
+import dataclasses
+
+from sentry.conf.types.kafka_definition import Topic
+
+
+@dataclasses.dataclass
+class UptimeRegionConfig:
+    """
+    Defines a region which uptime checks can be run in.
+    """
+
+    slug: str
+    name: str
+    config_topic: Topic
+    enabled: bool
diff --git a/src/sentry/consumers/__init__.py b/src/sentry/consumers/__init__.py
index bb21f85fadb759..cbd369fcc298fc 100644
--- a/src/sentry/consumers/__init__.py
+++ b/src/sentry/consumers/__init__.py
@@ -6,11 +6,10 @@
 
 import click
 from arroyo.backends.abstract import Consumer
-from arroyo.backends.kafka import KafkaProducer
 from arroyo.backends.kafka.configuration import build_kafka_consumer_configuration
 from arroyo.backends.kafka.consumer import KafkaConsumer
 from arroyo.commit import ONCE_PER_SECOND
-from arroyo.dlq import DlqLimit, DlqPolicy, KafkaDlqProducer
+from arroyo.dlq import DlqPolicy
 from arroyo.processing.processor import StreamProcessor
 from arroyo.processing.strategies import Healthcheck
 from arroyo.processing.strategies.abstract import ProcessingStrategy, ProcessingStrategyFactory
@@ -22,11 +21,12 @@
     Topic,
     validate_consumer_definition,
 )
+from sentry.consumers.dlq import DlqStaleMessagesStrategyFactoryWrapper, maybe_build_dlq_producer
 from sentry.consumers.validate_schema import ValidateSchema
 from sentry.eventstream.types import EventStreamEventType
 from sentry.ingest.types import ConsumerType
 from sentry.utils.imports import import_string
-from sentry.utils.kafka_config import get_kafka_producer_cluster_options, get_topic_definition
+from sentry.utils.kafka_config import get_topic_definition
 
 logger = logging.getLogger(__name__)
 
@@ -135,6 +135,37 @@ def ingest_monitors_options() -> list[click.Option]:
     return options
 
 
+def uptime_options() -> list[click.Option]:
+    """Return a list of uptime-results options."""
+    options = [
+        click.Option(
+            ["--mode", "mode"],
+            type=click.Choice(["serial", "parallel"]),
+            default="serial",
+            help="The mode to process results in. Parallel uses multithreading.",
+        ),
+        click.Option(
+            ["--max-batch-size", "max_batch_size"],
+            type=int,
+            default=500,
+            help="Maximum number of results to batch before processing in parallel.",
+        ),
+        click.Option(
+            ["--max-batch-time", "max_batch_time"],
+            type=int,
+            default=1,
+            help="Maximum time spent batching results to batch before processing in parallel.",
+        ),
+        click.Option(
+            ["--max-workers", "max_workers"],
+            type=int,
+            default=None,
+            help="The maximum number of threads to spawn in parallel mode.",
+        ),
+    ]
+    return options
+
+
 def ingest_events_options() -> list[click.Option]:
     """
     Options for the "events"-like consumers: `events`, `attachments`, `transactions`.
@@ -263,6 +294,7 @@ def ingest_transactions_options() -> list[click.Option]:
     "uptime-results": {
         "topic": Topic.UPTIME_RESULTS,
         "strategy_factory": "sentry.uptime.consumers.results_consumer.UptimeResultsStrategyFactory",
+        "click_options": uptime_options(),
     },
     "billing-metrics-consumer": {
         "topic": Topic.SNUBA_GENERIC_METRICS,
@@ -315,6 +347,7 @@ def ingest_transactions_options() -> list[click.Option]:
             "consumer_type": ConsumerType.Events,
         },
         "dlq_topic": Topic.INGEST_EVENTS_DLQ,
+        "stale_topic": Topic.INGEST_EVENTS_DLQ,
     },
     "ingest-feedback-events": {
         "topic": Topic.INGEST_FEEDBACK_EVENTS,
@@ -339,6 +372,7 @@ def ingest_transactions_options() -> list[click.Option]:
         "strategy_factory": "sentry.ingest.consumer.factory.IngestTransactionsStrategyFactory",
         "click_options": ingest_transactions_options(),
         "dlq_topic": Topic.INGEST_TRANSACTIONS_DLQ,
+        "stale_topic": Topic.INGEST_TRANSACTIONS_DLQ,
     },
     "ingest-metrics": {
         "topic": Topic.INGEST_METRICS,
@@ -348,8 +382,6 @@ def ingest_transactions_options() -> list[click.Option]:
             "ingest_profile": "release-health",
         },
         "dlq_topic": Topic.INGEST_METRICS_DLQ,
-        "dlq_max_invalid_ratio": 0.01,
-        "dlq_max_consecutive_count": 1000,
     },
     "ingest-generic-metrics": {
         "topic": Topic.INGEST_PERFORMANCE_METRICS,
@@ -359,8 +391,6 @@ def ingest_transactions_options() -> list[click.Option]:
             "ingest_profile": "performance",
         },
         "dlq_topic": Topic.INGEST_GENERIC_METRICS_DLQ,
-        "dlq_max_invalid_ratio": None,
-        "dlq_max_consecutive_count": None,
     },
     "generic-metrics-last-seen-updater": {
         "topic": Topic.SNUBA_GENERIC_METRICS,
@@ -423,15 +453,6 @@ def ingest_transactions_options() -> list[click.Option]:
 }
 
 
-def print_deprecation_warning(name, group_id):
-    import click
-
-    click.echo(
-        f"WARNING: Deprecated command, use sentry run consumer {name} "
-        f"--consumer-group {group_id} ..."
-    )
-
-
 def get_stream_processor(
     consumer_name: str,
     consumer_args: Sequence[str],
@@ -446,6 +467,8 @@ def get_stream_processor(
     synchronize_commit_group: str | None = None,
     healthcheck_file_path: str | None = None,
     enable_dlq: bool = True,
+    # If set, messages above this age will be rerouted to the stale topic if one is configured
+    stale_threshold_sec: int | None = None,
     enforce_schema: bool = False,
     group_instance_id: str | None = None,
 ) -> StreamProcessor:
@@ -555,37 +578,35 @@ def build_consumer_config(group_id: str):
             consumer_topic.value, enforce_schema, strategy_factory
         )
 
+    if stale_threshold_sec:
+        strategy_factory = DlqStaleMessagesStrategyFactoryWrapper(
+            stale_threshold_sec, strategy_factory
+        )
+
     if healthcheck_file_path is not None:
         strategy_factory = HealthcheckStrategyFactoryWrapper(
             healthcheck_file_path, strategy_factory
         )
 
     if enable_dlq and consumer_definition.get("dlq_topic"):
-        try:
-            dlq_topic = consumer_definition["dlq_topic"]
-        except KeyError as e:
-            raise click.BadParameter(
-                f"Cannot enable DLQ for consumer: {consumer_name}, no DLQ topic has been defined for it"
-            ) from e
-        try:
-            dlq_topic_defn = get_topic_definition(dlq_topic)
-            cluster_setting = dlq_topic_defn["cluster"]
-        except ValueError as e:
-            raise click.BadParameter(
-                f"Cannot enable DLQ for consumer: {consumer_name}, DLQ topic {dlq_topic} is not configured in this environment"
-            ) from e
+        dlq_topic = consumer_definition["dlq_topic"]
+    else:
+        dlq_topic = None
 
-        producer_config = get_kafka_producer_cluster_options(cluster_setting)
-        dlq_producer = KafkaProducer(producer_config)
+    if stale_threshold_sec and consumer_definition.get("stale_topic"):
+        stale_topic = consumer_definition["stale_topic"]
+    else:
+        stale_topic = None
 
+    dlq_producer = maybe_build_dlq_producer(dlq_topic=dlq_topic, stale_topic=stale_topic)
+
+    if dlq_producer:
         dlq_policy = DlqPolicy(
-            KafkaDlqProducer(dlq_producer, ArroyoTopic(dlq_topic_defn["real_topic_name"])),
-            DlqLimit(
-                max_invalid_ratio=consumer_definition.get("dlq_max_invalid_ratio"),
-                max_consecutive_count=consumer_definition.get("dlq_max_consecutive_count"),
-            ),
+            dlq_producer,
+            None,
             None,
         )
+
     else:
         dlq_policy = None
 
diff --git a/src/sentry/consumers/dlq.py b/src/sentry/consumers/dlq.py
new file mode 100644
index 00000000000000..4e8ea5f7939d25
--- /dev/null
+++ b/src/sentry/consumers/dlq.py
@@ -0,0 +1,163 @@
+import logging
+import time
+from collections.abc import Mapping, MutableMapping
+from concurrent.futures import Future
+from datetime import datetime, timedelta, timezone
+from enum import Enum
+
+from arroyo.backends.kafka import KafkaPayload, KafkaProducer
+from arroyo.dlq import InvalidMessage, KafkaDlqProducer
+from arroyo.processing.strategies.abstract import ProcessingStrategy, ProcessingStrategyFactory
+from arroyo.types import FILTERED_PAYLOAD, BrokerValue, Commit, FilteredPayload, Message, Partition
+from arroyo.types import Topic as ArroyoTopic
+from arroyo.types import Value
+
+from sentry.conf.types.kafka_definition import Topic
+from sentry.utils.kafka_config import get_kafka_producer_cluster_options, get_topic_definition
+
+logger = logging.getLogger(__name__)
+
+
+class RejectReason(Enum):
+    STALE = "stale"
+    INVALID = "invalid"
+
+
+class MultipleDestinationDlqProducer(KafkaDlqProducer):
+    """
+    Produces to either the DLQ or stale message topic depending on the reason.
+    """
+
+    def __init__(
+        self,
+        producers: Mapping[RejectReason, KafkaDlqProducer | None],
+    ) -> None:
+        self.producers = producers
+
+    def produce(
+        self,
+        value: BrokerValue[KafkaPayload],
+        reason: str | None = None,
+    ) -> Future[BrokerValue[KafkaPayload]]:
+
+        reject_reason = RejectReason(reason) if reason else RejectReason.INVALID
+        producer = self.producers.get(reject_reason)
+
+        if producer:
+            return producer.produce(value)
+        else:
+            # No DLQ producer configured for the reason.
+            logger.error("No DLQ producer configured for reason %s", reason)
+            future: Future[BrokerValue[KafkaPayload]] = Future()
+            future.set_running_or_notify_cancel()
+            future.set_result(value)
+            return future
+
+
+def _get_dlq_producer(topic: Topic | None) -> KafkaDlqProducer | None:
+    if topic is None:
+        return None
+
+    topic_defn = get_topic_definition(topic)
+    config = get_kafka_producer_cluster_options(topic_defn["cluster"])
+    real_topic = topic_defn["real_topic_name"]
+    return KafkaDlqProducer(KafkaProducer(config), ArroyoTopic(real_topic))
+
+
+def maybe_build_dlq_producer(
+    dlq_topic: Topic | None,
+    stale_topic: Topic | None,
+) -> MultipleDestinationDlqProducer | None:
+    if dlq_topic is None and stale_topic is None:
+        return None
+
+    producers = {
+        RejectReason.INVALID: _get_dlq_producer(dlq_topic),
+        RejectReason.STALE: _get_dlq_producer(stale_topic),
+    }
+
+    return MultipleDestinationDlqProducer(producers)
+
+
+class DlqStaleMessages(ProcessingStrategy[KafkaPayload]):
+    def __init__(
+        self,
+        stale_threshold_sec: int,
+        next_step: ProcessingStrategy[KafkaPayload | FilteredPayload],
+    ) -> None:
+        self.stale_threshold_sec = stale_threshold_sec
+        self.next_step = next_step
+
+        # A filtered message is created so we commit periodically if all are stale.
+        self.last_forwarded_offsets = time.time()
+        self.offsets_to_forward: MutableMapping[Partition, int] = {}
+
+    def submit(self, message: Message[KafkaPayload]) -> None:
+        min_accepted_timestamp = datetime.now(timezone.utc) - timedelta(
+            seconds=self.stale_threshold_sec
+        )
+
+        if isinstance(message.value, BrokerValue):
+            # Normalize the message timezone to be UTC
+            if message.value.timestamp.tzinfo is None:
+                message_timestamp = message.value.timestamp.replace(tzinfo=timezone.utc)
+            else:
+                message_timestamp = message.value.timestamp
+
+            if message_timestamp < min_accepted_timestamp:
+                self.offsets_to_forward[message.value.partition] = message.value.next_offset
+                raise InvalidMessage(
+                    message.value.partition,
+                    message.value.offset,
+                    reason=RejectReason.STALE.value,
+                    log_exception=False,
+                )
+
+        # If we get a valid message for a partition later, don't emit a filtered message for it
+        if self.offsets_to_forward:
+            for partition in message.committable:
+                self.offsets_to_forward.pop(partition, None)
+
+        self.next_step.submit(message)
+
+    def poll(self) -> None:
+        self.next_step.poll()
+
+        # Ensure we commit frequently even if all messages are invalid
+        if self.offsets_to_forward:
+            if time.time() > self.last_forwarded_offsets + 1:
+                filtered_message = Message(Value(FILTERED_PAYLOAD, self.offsets_to_forward))
+                self.next_step.submit(filtered_message)
+                self.offsets_to_forward = {}
+                self.last_forwarded_offsets = time.time()
+
+    def join(self, timeout: float | None = None) -> None:
+        self.next_step.join(timeout)
+
+    def close(self) -> None:
+        self.next_step.close()
+
+    def terminate(self) -> None:
+        self.next_step.terminate()
+
+
+class DlqStaleMessagesStrategyFactoryWrapper(ProcessingStrategyFactory[KafkaPayload]):
+    """
+    Wrapper used to dlq a message with a stale timestamp before it is passed to
+    the rest of the pipeline. The InvalidMessage is raised with a
+    "stale" reason so it can be routed to a separate stale topic.
+    """
+
+    def __init__(
+        self,
+        stale_threshold_sec: int,
+        inner: ProcessingStrategyFactory[KafkaPayload | FilteredPayload],
+    ) -> None:
+        self.stale_threshold_sec = stale_threshold_sec
+        self.inner = inner
+
+    def create_with_partitions(
+        self, commit: Commit, partitions: Mapping[Partition, int]
+    ) -> ProcessingStrategy[KafkaPayload]:
+        rv = self.inner.create_with_partitions(commit, partitions)
+        return DlqStaleMessages(self.stale_threshold_sec, rv)
diff --git a/src/sentry/data_secrecy/api/waive_data_secrecy.py b/src/sentry/data_secrecy/api/waive_data_secrecy.py
index 5f59ba863423cf..995f3337fa5934 100644
--- a/src/sentry/data_secrecy/api/waive_data_secrecy.py
+++ b/src/sentry/data_secrecy/api/waive_data_secrecy.py
@@ -150,6 +150,5 @@ def delete(self, request: Request, organization: Organization):
             event=audit_log.get_event_id("DATA_SECRECY_REINSTATED"),
         )
         return Response(
-            {"detail": "Data secrecy has been reinstated."},
             status=status.HTTP_204_NO_CONTENT,
         )
diff --git a/src/sentry/debug/utils/function_wrapper.py b/src/sentry/debug/utils/function_wrapper.py
deleted file mode 100644
index 433373faf9cfbf..00000000000000
--- a/src/sentry/debug/utils/function_wrapper.py
+++ /dev/null
@@ -1,32 +0,0 @@
-from time import time
-
-
-class FunctionWrapper:
-    def __init__(self, collector):
-        self.collector = collector
-
-    def __call__(self, func, *args, **kwargs):
-        __traceback_hide__ = True  # NOQA
-
-        start = time()
-        try:
-            return func(*args, **kwargs)
-        finally:
-            end = time()
-
-            if getattr(func, "im_class", None):
-                arg_str = repr(args[1:])
-            else:
-                arg_str = repr(args)
-
-            data = {
-                "name": func.__name__,
-                "args": arg_str,
-                "kwargs": repr(kwargs),
-                "start": start,
-                "end": end,
-            }
-            self.record(data)
-
-    def record(self, data):
-        self.collector.append(data)
diff --git a/src/sentry/dynamic_sampling/tasks/custom_rule_notifications.py b/src/sentry/dynamic_sampling/tasks/custom_rule_notifications.py
index b4e7c79c37608c..c7de2adb66c0f0 100644
--- a/src/sentry/dynamic_sampling/tasks/custom_rule_notifications.py
+++ b/src/sentry/dynamic_sampling/tasks/custom_rule_notifications.py
@@ -167,6 +167,8 @@ def create_discover_link(rule: CustomDynamicSamplingRule, projects: list[int]) -
     q["utc"] = "true"
     q["yAxis"] = "count()"
     q["sort"] = "-timestamp"
+    q["queryDataset"] = "transaction-like"
+    q["dataset"] = "transactions"
 
     query_string = q.urlencode()
     discover_url = rule.organization.absolute_url(
diff --git a/src/sentry/event_manager.py b/src/sentry/event_manager.py
index bbb6d1dd9b3a07..790433a11f895a 100644
--- a/src/sentry/event_manager.py
+++ b/src/sentry/event_manager.py
@@ -185,10 +185,6 @@ def get_tag(data: dict[str, Any], key: str) -> Any | None:
     return None
 
 
-def is_sample_event(job):
-    return get_tag(job["data"], "sample_event") == "yes"
-
-
 def sdk_metadata_from_event(event: Event) -> Mapping[str, Any]:
     """
     Returns a metadata dictionary with "sdk" field populated, including a normalized name
@@ -350,7 +346,7 @@ def __init__(
             grouping_config = config.get("grouping_config")
         # if we still don't have a grouping also try the project
         if grouping_config is None and project is not None:
-            grouping_config = get_grouping_config_dict_for_project(self._project)
+            grouping_config = get_grouping_config_dict_for_project(project)
         self._grouping_config = grouping_config
         self._client_ip = client_ip
         self._user_agent = user_agent
@@ -2380,7 +2376,7 @@ def save_attachment(
         return
     from sentry import ratelimits as ratelimiter
 
-    is_limited, num_requests, reset_time = ratelimiter.backend.is_limited_with_value(
+    is_limited, _, _ = ratelimiter.backend.is_limited_with_value(
         key="event_attachment.save_per_sec",
         limit=options.get("sentry.save-event-attachments.project-per-sec-limit"),
         project=project,
@@ -2388,7 +2384,7 @@ def save_attachment(
     )
     rate_limit_tag = "per_sec"
     if not is_limited:
-        is_limited, num_requests, reset_time = ratelimiter.backend.is_limited_with_value(
+        is_limited, _, _ = ratelimiter.backend.is_limited_with_value(
             key="event_attachment.save_5_min",
             limit=options.get("sentry.save-event-attachments.project-per-5-minute-limit"),
             project=project,
diff --git a/src/sentry/eventstore/base.py b/src/sentry/eventstore/base.py
index e645cade39e658..f1a375f1cc80cb 100644
--- a/src/sentry/eventstore/base.py
+++ b/src/sentry/eventstore/base.py
@@ -292,7 +292,7 @@ def get_adjacent_event_ids(self, event, filter):
         """
         raise NotImplementedError
 
-    def create_event(self, project_id=None, event_id=None, group_id=None, data=None):
+    def create_event(self, *, project_id: int, event_id=None, group_id=None, data=None):
         """
         Returns an Event from processed data
         """
diff --git a/src/sentry/eventstore/models.py b/src/sentry/eventstore/models.py
index 67a49708ce2a03..67c912449ef825 100644
--- a/src/sentry/eventstore/models.py
+++ b/src/sentry/eventstore/models.py
@@ -294,10 +294,7 @@ def project(self) -> Project:
 
     @project.setter
     def project(self, project: Project) -> None:
-        if project is None:
-            self.project_id = None
-        else:
-            self.project_id = project.id
+        self.project_id = project.id
         self._project_cache = project
 
     @cached_property
@@ -339,14 +336,23 @@ def get_hashes_and_variants(
         """
 
         variants = self.get_grouping_variants(config)
+        hashes_by_variant = {
+            variant_name: variant.get_hash() for variant_name, variant in variants.items()
+        }
+
         # Sort the variants so that the system variant (if any) is always last, in order to resolve
         # ambiguities when choosing primary_hash for Snuba
-        sorted_variants = sorted(
-            variants.items(),
-            key=lambda name_and_variant: 1 if name_and_variant[0] == "system" else 0,
+        sorted_variant_names = sorted(
+            variants,
+            key=lambda variant_name: 1 if variant_name == "system" else 0,
         )
+
         # Get each variant's hash value, filtering out Nones
-        hashes = list({variant.get_hash() for _, variant in sorted_variants} - {None})
+        hashes = [
+            hashes_by_variant[variant_name]
+            for variant_name in sorted_variant_names
+            if hashes_by_variant[variant_name] is not None
+        ]
 
         # Write to event before returning
         self.data["hashes"] = hashes
diff --git a/src/sentry/eventstream/kafka/backend.py b/src/sentry/eventstream/kafka/backend.py
index 02954e35ce7588..e9b6e8bda5b1e5 100644
--- a/src/sentry/eventstream/kafka/backend.py
+++ b/src/sentry/eventstream/kafka/backend.py
@@ -128,17 +128,6 @@ def insert(
     ) -> None:
 
         event_type = self._get_event_type(event)
-        if event.get_tag("sample_event"):
-            logger.info(
-                "insert: inserting event in KafkaEventStream",
-                extra={
-                    "event.id": event.event_id,
-                    "project_id": event.project_id,
-                    "sample_event": True,
-                    "event_type": event_type.value,
-                },
-            )
-
         assign_partitions_randomly = (
             (event_type == EventStreamEventType.Generic)
             or (event_type == EventStreamEventType.Transaction)
@@ -152,14 +141,6 @@ def insert(
             kwargs[KW_SKIP_SEMANTIC_PARTITIONING] = True
 
         if event.get_tag("sample_event"):
-            logger.info(
-                "insert: inserting event in SnubaProtocolEventStream",
-                extra={
-                    "event.id": event.event_id,
-                    "project_id": event.project_id,
-                    "sample_event": True,
-                },
-            )
             kwargs["asynchronous"] = False
 
         super().insert(
diff --git a/src/sentry/eventstream/snuba.py b/src/sentry/eventstream/snuba.py
index bdc1835724c751..c3aa891cbf868b 100644
--- a/src/sentry/eventstream/snuba.py
+++ b/src/sentry/eventstream/snuba.py
@@ -112,15 +112,6 @@ def insert(
         eventstream_type: str | None = None,
         **kwargs: Any,
     ) -> None:
-        if event.get_tag("sample_event") == "true":
-            logger.info(
-                "insert: attempting to insert event in SnubaProtocolEventStream",
-                extra={
-                    "event.id": event.event_id,
-                    "project_id": event.project_id,
-                    "sample_event": True,
-                },
-            )
         if isinstance(event, GroupEvent) and not event.occurrence:
             logger.error(
                 "`GroupEvent` passed to `EventStream.insert`. `GroupEvent` may only be passed when "
diff --git a/src/sentry/features/temporary.py b/src/sentry/features/temporary.py
index 8f688d52cd6f68..8e3241aa02668e 100644
--- a/src/sentry/features/temporary.py
+++ b/src/sentry/features/temporary.py
@@ -61,8 +61,6 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("organizations:anomaly-detection-alerts-charts", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Enable anr frame analysis
     manager.add("organizations:anr-analyze-frames", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
-    # Enable auth provider configuration through api
-    manager.add("organizations:api-auth-provider", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     manager.add("organizations:api-keys", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, default=False, api_expose=True)
     # Rollout of the new API rate limits for organization events
     manager.add("organizations:api-organization_events-rate-limit-reduced-rollout", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, api_expose=False)
@@ -111,8 +109,6 @@ def register_temporary_features(manager: FeatureManager):
     # Enable the dev toolbar PoC code for employees
     # Data Secrecy
     manager.add("organizations:data-secrecy", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
-    # Enable default metric alerts for new projects
-    manager.add("organizations:default-metric-alerts-new-projects", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     manager.add("organizations:devtoolbar", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, default=False, api_expose=True)
     manager.add("organizations:email-performance-regression-image", OrganizationFeature, FeatureHandlerStrategy.OPTIONS, api_expose=False)
     # Enables automatically deriving of code mappings
@@ -147,8 +143,6 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("organizations:increased-issue-owners-rate-limit", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, api_expose=False)
     # Starfish: extract metrics from the spans
     manager.add("organizations:indexed-spans-extraction", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, api_expose=False)
-    # Enable custom alert priorities for Pagerduty and Opsgenie
-    manager.add("organizations:integrations-custom-alert-priorities", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable integration functionality to work deployment integrations like Vercel
     manager.add("organizations:integrations-deployment", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, default=True, api_expose=True)
     manager.add("organizations:integrations-feature-flag-integration", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, api_expose=False)
@@ -193,14 +187,12 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("organizations:issue-stream-search-query-builder", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable issue stream table layout changes
     manager.add("organizations:issue-stream-table-layout", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
+    # When enabled, uses the functional issue stream component
+    manager.add("organizations:issue-stream-functional-refactor", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     manager.add("organizations:large-debug-files", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, api_expose=False)
     manager.add("organizations:metric-issue-poc", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
-    # Enable members to invite teammates to organizations
-    manager.add("organizations:members-invite-teammates", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     manager.add("organizations:mep-rollout-flag", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     manager.add("organizations:mep-use-default-tags", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
-    # Enable messaging-integration onboarding when creating a new project
-    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)
     # Migrate Orgs to new Azure DevOps Integration
@@ -327,6 +319,8 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("organizations:performance-use-metrics", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, api_expose=True)
     # Enable showing INP web vital in default views
     manager.add("organizations:performance-vitals-inp", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
+    # Enable handling missing webvitals in performance score
+    manager.add("organizations:performance-vitals-handle-missing-webvitals", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable profiling
     manager.add("organizations:profiling", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, api_expose=True)
     # Enabled for those orgs who participated in the profiling Beta program
@@ -360,10 +354,6 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("organizations:release-comparison-performance", 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
-    manager.add("organizations:releases-v2", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
-    manager.add("organizations:releases-v2-internal", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
-    manager.add("organizations:releases-v2-st", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, api_expose=False)
     # Enable playing replays from the replay tab
     manager.add("organizations:replay-play-from-replay-tab", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable version 2 of reprocessing (completely distinct from v1)
@@ -424,6 +414,8 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("organizations:session-replay-ui", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, default=True, api_expose=True)
     # Enable replay web vital breadcrumbs
     manager.add("organizations:session-replay-web-vitals", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, default=False, api_expose=True)
+    # Enable GA banner for mobile replay beta orgs about the grace period that will last 2 months. Flag can be removed after March 7th 2024.
+    manager.add("organizations:mobile-replay-beta-orgs", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, default=False, api_expose=False)
     # Enable Dev Toolbar frontend features (ex project settings page)
     manager.add("organizations:dev-toolbar-ui", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, default=False, api_expose=True)
     # Lets organizations manage grouping configs
@@ -433,8 +425,6 @@ def register_temporary_features(manager: FeatureManager):
     # Add regression chart as image to slack message
     manager.add("organizations:slack-endpoint-regression-image", OrganizationFeature, FeatureHandlerStrategy.OPTIONS, api_expose=False)
     manager.add("organizations:slack-function-regression-image", OrganizationFeature, FeatureHandlerStrategy.OPTIONS, api_expose=False)
-    # Enable linking to Slack alerts from multiple teams to a single channel
-    manager.add("organizations:slack-multiple-team-single-channel-linking", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     manager.add("organizations:stacktrace-processing-caching", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, api_expose=False)
     # Enable SAML2 Single-logout
     manager.add("organizations:sso-saml2-slo", OrganizationFeature, FeatureHandlerStrategy.OPTIONS, api_expose=False)
@@ -456,12 +446,14 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("organizations:insights-related-issues-table", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable access to Mobile Screens insights module
     manager.add("organizations:insights-mobile-screens-module", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
+    # Enable access to insights crons view (moved from crons sidebar)
+    manager.add("organizations:insights-crons", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
+    # Enable access to insights uptime view
+    manager.add("organizations:insights-uptime", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable standalone span ingestion
     manager.add("organizations:standalone-span-ingestion", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, api_expose=False)
     # Enable the aggregate span waterfall view
     manager.add("organizations:starfish-aggregate-span-waterfall", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
-    # Enable bundle analysis ui and endpoint
-    manager.add("organizations:starfish-browser-resource-module-bundle-analysis", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enables the resource module ui
     manager.add("organizations:starfish-browser-resource-module-image-view", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Enables the resource module ui
@@ -535,14 +527,16 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("organizations:visibility-explore-view", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable the dataset toggle on the new explore page
     manager.add("organizations:visibility-explore-dataset", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
-    # Enable minimap in the widget viewer modal in dashboards
-    manager.add("organizations:widget-viewer-modal-minimap", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
+    # Enable RPC on the new explore page
+    manager.add("organizations:visibility-explore-rpc", 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)
+    manager.add("organizations:workflow-engine-metric-alert-dual-write", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
+    # Enable Processing for Metric Alerts in the workflow_engine
+    manager.add("organizations:workflow-engine-metric-alert-processing", 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)
+    manager.add("organizations:workflow-engine-metric-alert-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
@@ -570,16 +564,12 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("projects:first-event-severity-calculation", ProjectFeature, FeatureHandlerStrategy.INTERNAL, api_expose=False)
     # Enable escalation detection for new issues
     manager.add("projects:first-event-severity-new-escalation", ProjectFeature, FeatureHandlerStrategy.INTERNAL, default=True, api_expose=False)
-    # Enable functionality for attaching  minidumps to events and displaying
-    # them in the group UI.
-    manager.add("projects:minidump", ProjectFeature, FeatureHandlerStrategy.INTERNAL, default=True, api_expose=True)
     # 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)
     manager.add("projects:similarity-indexing", ProjectFeature, FeatureHandlerStrategy.INTERNAL, api_expose=False)
     manager.add("projects:similarity-view", ProjectFeature, FeatureHandlerStrategy.INTERNAL, api_expose=True)
@@ -623,3 +613,11 @@ def register_temporary_features(manager: FeatureManager):
         FeatureHandlerStrategy.FLAGPOLE,
         api_expose=False,
     )
+
+    # Controls access to tempest features
+    manager.add(
+        "organizations:tempest-access",
+        OrganizationFeature,
+        FeatureHandlerStrategy.FLAGPOLE,
+        api_expose=True,
+    )
diff --git a/src/sentry/feedback/usecases/create_feedback.py b/src/sentry/feedback/usecases/create_feedback.py
index 3a9fb3b267c475..b1cfc6ffb34ba7 100644
--- a/src/sentry/feedback/usecases/create_feedback.py
+++ b/src/sentry/feedback/usecases/create_feedback.py
@@ -230,7 +230,6 @@ def create_feedback_issue(event, project_id: int, source: FeedbackCreationSource
         "feedback.create_feedback_issue.entered",
         tags={
             "referrer": source.value,
-            "client_source": get_path(event, "contexts", "feedback", "source"),
         },
     )
 
@@ -257,7 +256,6 @@ def create_feedback_issue(event, project_id: int, source: FeedbackCreationSource
                 tags={
                     "is_spam": is_message_spam,
                     "referrer": source.value,
-                    "client_source": event["contexts"]["feedback"].get("source"),
                 },
                 sample_rate=1.0,
             )
@@ -345,7 +343,6 @@ def create_feedback_issue(event, project_id: int, source: FeedbackCreationSource
         "feedback.create_feedback_issue.produced_occurrence",
         tags={
             "referrer": source.value,
-            "client_source": event["contexts"]["feedback"].get("source"),
         },
         sample_rate=1.0,
     )
diff --git a/src/sentry/feedback/usecases/spam_detection.py b/src/sentry/feedback/usecases/spam_detection.py
index e567d130fdece1..40f88332a015fc 100644
--- a/src/sentry/feedback/usecases/spam_detection.py
+++ b/src/sentry/feedback/usecases/spam_detection.py
@@ -34,8 +34,8 @@ def make_input_prompt(message: str):
 
 @metrics.wraps("feedback.spam_detection", sample_rate=1.0)
 def is_spam(message: str):
-    is_spam = False
-    trimmed_response = ""
+    labeled_spam = False
+    _trimmed_response = ""
     response = complete_prompt(
         usecase=LLMUseCase.SPAM_DETECTION,
         message=make_input_prompt(message),
@@ -43,18 +43,9 @@ def is_spam(message: str):
         max_output_tokens=20,
     )
     if response:
-        is_spam, trimmed_response = trim_response(response)
-
-    logger.info(
-        "Spam detection",
-        extra={
-            "feedback_message": message,
-            "is_spam": is_spam,
-            "response": response,
-            "trimmed_response": trimmed_response,
-        },
-    )
-    return is_spam
+        labeled_spam, _trimmed_response = trim_response(response)
+
+    return labeled_spam
 
 
 def trim_response(text):
diff --git a/src/sentry/flags/docs/api.md b/src/sentry/flags/docs/api.md
index 5e63588b40142c..11a8313b8328ca 100644
--- a/src/sentry/flags/docs/api.md
+++ b/src/sentry/flags/docs/api.md
@@ -147,7 +147,54 @@ Delete a signing secret.
 
 ## Webhooks [/organizations/<organization_id_or_slug>/flags/hooks/provider/<provider>/]
 
-### Create Flag Log [POST]
+### Create Generic Flag Log [POST]
+
+A flag log event must be emitted after every flag definition change which influences a flag's evaluation. Updates to a flag that do not change a flag's evaluation logic do not need to be emitted to this endpoint. We are only concerned with changes which could have influenced behavior.
+
+Sentry does not currently have a concept of disambiguating flag changes by project or environment. Everything is done at the organization level. Flag changes that are duplicated across projects, environments, or other groupings within the provider, must be de-duplicated. To support this, the posted payload sets a "change_id" field for idempotency. In the presence of duplicate ids, only one audit-log record is written in Sentry.
+
+**Data Attributes**
+
+| Column          | Type   | Description                                                    |
+| --------------- | ------ | -------------------------------------------------------------- |
+| action          | string | Enum of `created`, `updated`, or `deleted`.                    |
+| change_id       | number | A 64-bit idempotency token representing a unique change group. |
+| created_at      | string | String formatted UTC date time: YYYY-MM-DDTHH:MM:SS.           |
+| created_by      | object | Created-by object.                                             |
+| created_by.id   | string | User identifier which made the change.                         |
+| created_by.type | string | Enum of `email`, `id`, or `name`.                              |
+| flag            | string | The name of the flag changed.                                  |
+
+**Meta Attributes**
+
+| Column  | Type | Description           |
+| ------- | ---- | --------------------- |
+| version | int  | The protocol version. |
+
+- Request (application/json)
+
+  ```json
+  {
+    "data": [
+      {
+        "action": "created",
+        "created_at": "2024-12-12T00:02:00+00:00",
+        "created_by": {
+          "id": "first.last@company.com",
+          "type": "email"
+        },
+        "flag": "hello.world"
+      }
+    ],
+    "meta": {
+      "version": 1
+    }
+  }
+  ```
+
+- Response 201
+
+### Create Provider-Specific 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.
 
diff --git a/src/sentry/flags/endpoints/__init__.py b/src/sentry/flags/endpoints/__init__.py
index be4cef59b09284..e69de29bb2d1d6 100644
--- a/src/sentry/flags/endpoints/__init__.py
+++ b/src/sentry/flags/endpoints/__init__.py
@@ -1,12 +0,0 @@
-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 e223f602df2363..b948a88ec7ec5b 100644
--- a/src/sentry/flags/endpoints/hooks.py
+++ b/src/sentry/flags/endpoints/hooks.py
@@ -6,20 +6,14 @@
 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
 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.flags.providers import DeserializationError, get_provider, write
 from sentry.models.organization import Organization
 
 
 @region_silo_endpoint
-class OrganizationFlagsHooksEndpoint(OrganizationFlagsEndpoint):
+class OrganizationFlagsHooksEndpoint(OrganizationEndpoint):
     authentication_classes = ()
     owner = ApiOwner.REPLAY
     permission_classes = ()
@@ -32,18 +26,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,
-            ):
+            provider_cls = get_provider(organization.id, provider, request.headers)
+            if provider_cls is None:
+                raise ResourceDoesNotExist
+            elif not provider_cls.validate(request.body):
                 return Response("Not authorized.", status=401)
-
-            write(handle_provider_event(provider, request.data, organization.id))
-            return Response(status=200)
-        except InvalidProvider:
-            raise ResourceDoesNotExist
+            else:
+                write(provider_cls.handle(request.data))
+                return Response(status=200)
         except DeserializationError as exc:
             sentry_sdk.capture_exception()
             return Response(exc.errors, status=200)
diff --git a/src/sentry/flags/endpoints/secrets.py b/src/sentry/flags/endpoints/secrets.py
index 17a03d98b3a045..d572c9d5efb805 100644
--- a/src/sentry/flags/endpoints/secrets.py
+++ b/src/sentry/flags/endpoints/secrets.py
@@ -11,7 +11,10 @@
 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.bases.organization import (
+    OrganizationEndpoint,
+    OrganizationFlagWebHookSigningSecretPermission,
+)
 from sentry.api.paginator import OffsetPaginator
 from sentry.api.serializers import Serializer, register, serialize
 from sentry.flags.models import FlagWebHookSigningSecretModel
@@ -39,14 +42,16 @@ def serialize(self, obj, attrs, user, **kwargs) -> FlagWebhookSigningSecretRespo
 
 
 class FlagWebhookSigningSecretValidator(serializers.Serializer):
-    provider = serializers.ChoiceField(choices=[("launchdarkly", "launchdarkly")], required=True)
+    provider = serializers.ChoiceField(
+        choices=["launchdarkly", "generic", "unleash"], 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,)
+    permission_classes = (OrganizationFlagWebHookSigningSecretPermission,)
     publish_status = {
         "GET": ApiPublishStatus.PRIVATE,
         "POST": ApiPublishStatus.PRIVATE,
@@ -95,7 +100,7 @@ def post(self, request: Request, organization: Organization) -> Response:
 @region_silo_endpoint
 class OrganizationFlagsWebHookSigningSecretEndpoint(OrganizationEndpoint):
     owner = ApiOwner.REPLAY
-    permission_classes = (OrgAuthTokenPermission,)
+    permission_classes = (OrganizationFlagWebHookSigningSecretPermission,)
     publish_status = {"DELETE": ApiPublishStatus.PRIVATE}
 
     def delete(
diff --git a/src/sentry/flags/providers.py b/src/sentry/flags/providers.py
index 8232a6cf00be58..6b7e8077df4c36 100644
--- a/src/sentry/flags/providers.py
+++ b/src/sentry/flags/providers.py
@@ -1,10 +1,12 @@
 import datetime
 import hashlib
 import hmac
-from typing import Any, TypedDict
+from collections.abc import Callable, Iterator
+from typing import Any, Protocol, TypedDict, TypeVar
 
 from django.http.request import HttpHeaders
 from rest_framework import serializers
+from rest_framework.exceptions import ValidationError
 
 from sentry.flags.models import (
     ACTION_MAP,
@@ -32,6 +34,8 @@ def write(rows: list["FlagAuditLogRow"]) -> None:
 the underlying systems.
 """
 
+T = TypeVar("T", contravariant=True)
+
 
 class FlagAuditLogRow(TypedDict):
     """A complete flag audit log row instance."""
@@ -45,6 +49,16 @@ class FlagAuditLogRow(TypedDict):
     tags: dict[str, Any]
 
 
+class ProviderProtocol(Protocol[T]):
+    organization_id: int
+    provider_name: str
+    signature: str | None
+
+    def __init__(self, organization_id: int, signature: str | None) -> None: ...
+    def handle(self, message: T) -> list[FlagAuditLogRow]: ...
+    def validate(self, message_bytes: bytes) -> bool: ...
+
+
 class DeserializationError(Exception):
     """The request body could not be deserialized."""
 
@@ -58,29 +72,18 @@ class InvalidProvider(Exception):
     ...
 
 
-def handle_provider_event(
-    provider: str,
-    request_data: dict[str, Any],
-    organization_id: int,
-) -> list[FlagAuditLogRow]:
-    match provider:
+def get_provider(
+    organization_id: int, provider_name: str, headers: HttpHeaders
+) -> ProviderProtocol[dict[str, Any]] | None:
+    match provider_name:
         case "launchdarkly":
-            return handle_launchdarkly_event(request_data, organization_id)
+            return LaunchDarklyProvider(organization_id, signature=headers.get("X-LD-Signature"))
+        case "generic":
+            return GenericProvider(organization_id, signature=headers.get("X-Sentry-Signature"))
+        case "unleash":
+            return UnleashProvider(organization_id, signature=headers.get("Authorization"))
         case _:
-            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)
+            return None
 
 
 """LaunchDarkly provider."""
@@ -115,7 +118,49 @@ class LaunchDarklyItemSerializer(serializers.Serializer):
 }
 
 
-def handle_launchdarkly_actions(action: str) -> int:
+class LaunchDarklyProvider:
+    provider_name = "launchdarkly"
+
+    def __init__(self, organization_id: int, signature: str | None) -> None:
+        self.organization_id = organization_id
+        self.signature = signature
+
+    def handle(self, message: dict[str, Any]) -> list[FlagAuditLogRow]:
+        serializer = LaunchDarklyItemSerializer(data=message)
+        if not serializer.is_valid():
+            raise DeserializationError(serializer.errors)
+
+        result = serializer.validated_data
+
+        access = result["accesses"][0]
+        if access["action"] not in SUPPORTED_LAUNCHDARKLY_ACTIONS:
+            return []
+
+        return [
+            {
+                "action": _handle_launchdarkly_actions(access["action"]),
+                "created_at": datetime.datetime.fromtimestamp(
+                    result["date"] / 1000.0, datetime.UTC
+                ),
+                "created_by": result["member"]["email"],
+                "created_by_type": CREATED_BY_TYPE_MAP["email"],
+                "flag": result["name"],
+                "organization_id": self.organization_id,
+                "tags": {"description": result["description"]},
+            }
+        ]
+
+    def validate(self, message_bytes: bytes) -> bool:
+        validator = PayloadSignatureValidator(
+            self.organization_id,
+            self.provider_name,
+            message_bytes,
+            self.signature,
+        )
+        return validator.validate()
+
+
+def _handle_launchdarkly_actions(action: str) -> int:
     if action == "createFlag" or action == "cloneFlag":
         return ACTION_MAP["created"]
     if action == "deleteFlag":
@@ -124,60 +169,188 @@ def handle_launchdarkly_actions(action: str) -> int:
         return ACTION_MAP["updated"]
 
 
-def handle_launchdarkly_event(
-    request_data: dict[str, Any], organization_id: int
-) -> list[FlagAuditLogRow]:
-    serializer = LaunchDarklyItemSerializer(data=request_data)
-    if not serializer.is_valid():
-        raise DeserializationError(serializer.errors)
-
-    result = serializer.validated_data
-
-    access = result["accesses"][0]
-    if access["action"] not in SUPPORTED_LAUNCHDARKLY_ACTIONS:
-        return []
-
-    return [
-        {
-            "action": handle_launchdarkly_actions(access["action"]),
-            "created_at": datetime.datetime.fromtimestamp(result["date"] / 1000.0, datetime.UTC),
-            "created_by": result["member"]["email"],
-            "created_by_type": CREATED_BY_TYPE_MAP["email"],
-            "flag": result["name"],
-            "organization_id": organization_id,
-            "tags": {"description": result["description"]},
-        }
-    ]
-
-
-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
+"""Generic provider.
 
-    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
+The generic provider represents a Sentry-defined generic web hook
+interface that anyone can integrate with.
+"""
 
 
-def hmac_sha256_hex_digest(key: str, message: bytes):
-    return hmac.new(key.encode(), message, hashlib.sha256).hexdigest()
+class GenericItemCreatedBySerializer(serializers.Serializer):
+    id = serializers.CharField(required=True, max_length=100)
+    type = serializers.ChoiceField(choices=(("email", 0), ("id", 1), ("name", 2)), required=True)
 
 
-"""Internal flag-pole provider.
+class GenericItemSerializer(serializers.Serializer):
+    action = serializers.ChoiceField(
+        choices=(("created", 0), ("updated", 1), ("deleted", 2)), required=True
+    )
+    change_id = serializers.IntegerField(required=True)
+    created_at = serializers.DateTimeField(required=True)
+    created_by = GenericItemCreatedBySerializer(required=True)
+    flag = serializers.CharField(required=True, max_length=100)
+
+
+class GenericMetaSerializer(serializers.Serializer):
+    version = serializers.IntegerField(required=True)
+
+
+class GenericRequestSerializer(serializers.Serializer):
+    data = GenericItemSerializer(many=True, required=True)  # type: ignore[assignment]
+    meta = GenericMetaSerializer(required=True)
+
+
+class GenericProvider:
+    provider_name = "generic"
+
+    def __init__(self, organization_id: int, signature: str | None) -> None:
+        self.organization_id = organization_id
+        self.signature = signature
+
+    def handle(self, message: dict[str, Any]) -> list[FlagAuditLogRow]:
+        serializer = GenericRequestSerializer(data=message)
+        if not serializer.is_valid():
+            raise DeserializationError(serializer.errors)
+
+        seen = set()
+        result: list[FlagAuditLogRow] = []
+        for item in serializer.validated_data["data"]:
+            if item["change_id"] not in seen:
+                seen.add(item["change_id"])
+                result.append(
+                    {
+                        "action": ACTION_MAP[item["action"]],
+                        "created_at": item["created_at"],
+                        "created_by": item["created_by"]["id"],
+                        "created_by_type": CREATED_BY_TYPE_MAP[item["created_by"]["type"]],
+                        "flag": item["flag"],
+                        "organization_id": self.organization_id,
+                        "tags": {},
+                    }
+                )
+
+        return result
+
+    def validate(self, message_bytes: bytes) -> bool:
+        validator = PayloadSignatureValidator(
+            self.organization_id,
+            self.provider_name,
+            message_bytes,
+            self.signature,
+        )
+        return validator.validate()
+
+
+"""Unleash provider."""
+
+SUPPORTED_UNLEASH_ACTIONS = {
+    "feature-created",
+    "feature-archived",
+    "feature-revived",
+    "feature-updated",
+    "feature-strategy-update",
+    "feature-strategy-add",
+    "feature-strategy-remove",
+    "feature-stale-on",
+    "feature-stale-off",
+    "feature-completed",
+    "feature-environment-enabled",
+    "feature-environment-disabled",
+}
 
-Allows us to skip the HTTP endpoint.
-"""
+
+class UnleashItemSerializer(serializers.Serializer):
+    # Technically featureName is not required by Unleash, but for all the actions we care about, it should exist.
+    featureName = serializers.CharField(max_length=100, required=True)
+    createdAt = serializers.DateTimeField(
+        required=True,
+        input_formats=["iso-8601"],
+        format=None,
+        default_timezone=datetime.UTC,
+    )
+    createdBy = serializers.CharField(required=True)
+    createdByUserId = serializers.IntegerField(required=False, allow_null=True)
+    type = serializers.CharField(allow_blank=True, required=True)
+    tags = serializers.ListField(
+        child=serializers.DictField(child=serializers.CharField()), required=False, allow_null=True
+    )
+    project = serializers.CharField(required=False, allow_null=True)
+    environment = serializers.CharField(required=False, allow_null=True)
+
+
+def _get_user(validated_event: dict[str, Any]) -> tuple[str, int]:
+    """If the email is not valid, default to the user ID sent by Unleash."""
+    created_by = validated_event["createdBy"]
+    try:
+        serializers.EmailField().run_validation(created_by)
+        return created_by, CREATED_BY_TYPE_MAP["email"]
+    except ValidationError:
+        pass
+
+    if "createdByUserId" in validated_event:
+        return validated_event["createdByUserId"], CREATED_BY_TYPE_MAP["id"]
+    return created_by, CREATED_BY_TYPE_MAP["name"]
+
+
+class UnleashProvider:
+    provider_name = "unleash"
+
+    def __init__(self, organization_id: int, signature: str | None) -> None:
+        self.organization_id = organization_id
+        self.signature = signature
+
+    def handle(self, message: dict[str, Any]) -> list[FlagAuditLogRow]:
+        serializer = UnleashItemSerializer(data=message)
+        if not serializer.is_valid():
+            raise DeserializationError(serializer.errors)
+
+        result = serializer.validated_data
+        action = result["type"]
+
+        if action not in SUPPORTED_UNLEASH_ACTIONS:
+            return []
+
+        created_by, created_by_type = _get_user(result)
+        unleash_tags = result.get("tags") or []
+        tags = {tag["type"]: tag["value"] for tag in unleash_tags}
+
+        if result.get("project"):
+            tags["project"] = result.get("project")
+
+        if result.get("environment"):
+            tags["environment"] = result.get("environment")
+
+        return [
+            {
+                "action": _handle_unleash_actions(action),
+                "created_at": result["createdAt"],
+                "created_by": created_by,
+                "created_by_type": created_by_type,
+                "flag": result["featureName"],
+                "organization_id": self.organization_id,
+                "tags": tags,
+            }
+        ]
+
+    def validate(self, message_bytes: bytes) -> bool:
+        validator = AuthTokenValidator(
+            self.organization_id,
+            self.provider_name,
+            self.signature,
+        )
+        return validator.validate()
+
+
+def _handle_unleash_actions(action: str) -> int:
+    if action == "feature-created":
+        return ACTION_MAP["created"]
+    if action == "feature-archived":
+        return ACTION_MAP["deleted"]
+    else:
+        return ACTION_MAP["updated"]
+
+
+"""Flagpole provider."""
 
 
 class FlagAuditLogItem(TypedDict):
@@ -205,3 +378,81 @@ def handle_flag_pole_event_internal(items: list[FlagAuditLogItem], organization_
             for item in items
         ]
     )
+
+
+"""Helpers."""
+
+
+class AuthTokenValidator:
+    """Abstract payload validator.
+
+    Similar to the SecretValidator class below, except we do not need
+    to validate the authorization string.
+    """
+
+    def __init__(
+        self,
+        organization_id: int,
+        provider: str,
+        signature: str | None,
+        secret_finder: Callable[[int, str], Iterator[str]] | None = None,
+    ) -> None:
+        self.organization_id = organization_id
+        self.provider = provider
+        self.signature = signature
+        self.secret_finder = secret_finder or _query_signing_secrets
+
+    def validate(self) -> bool:
+        if self.signature is None:
+            return False
+
+        for secret in self.secret_finder(self.organization_id, self.provider):
+            if secret == self.signature:
+                return True
+
+        return False
+
+
+class PayloadSignatureValidator:
+    """Abstract payload validator.
+
+    Allows us to inject dependencies for differing use cases. Specifically
+    the test suite.
+    """
+
+    def __init__(
+        self,
+        organization_id: int,
+        provider: str,
+        request_body: bytes,
+        signature: str | None,
+        secret_finder: Callable[[int, str], Iterator[str]] | None = None,
+        secret_validator: Callable[[str, bytes], str] | None = None,
+    ) -> None:
+        self.organization_id = organization_id
+        self.provider = provider
+        self.request_body = request_body
+        self.signature = signature
+        self.secret_finder = secret_finder or _query_signing_secrets
+        self.secret_validator = secret_validator or hmac_sha256_hex_digest
+
+    def validate(self) -> bool:
+        if self.signature is None:
+            return False
+
+        for secret in self.secret_finder(self.organization_id, self.provider):
+            if self.secret_validator(secret, self.request_body) == self.signature:
+                return True
+        return False
+
+
+def _query_signing_secrets(organization_id: int, provider: str) -> Iterator[str]:
+    for model in FlagWebHookSigningSecretModel.objects.filter(
+        organization_id=organization_id,
+        provider=provider,
+    ).all():
+        yield model.secret
+
+
+def hmac_sha256_hex_digest(key: str, message: bytes):
+    return hmac.new(key.encode(), message, hashlib.sha256).hexdigest()
diff --git a/src/sentry/grouping/api.py b/src/sentry/grouping/api.py
index afebb8edb6fc62..9bd0488908593c 100644
--- a/src/sentry/grouping/api.py
+++ b/src/sentry/grouping/api.py
@@ -8,9 +8,11 @@
 import sentry_sdk
 
 from sentry import options
+from sentry.db.models.fields.node import NodeData
 from sentry.grouping.component import (
     AppGroupingComponent,
     BaseGroupingComponent,
+    ContributingComponent,
     DefaultGroupingComponent,
     SystemGroupingComponent,
 )
@@ -20,6 +22,7 @@
 from sentry.grouping.strategies.configurations import CONFIGURATIONS
 from sentry.grouping.utils import (
     expand_title_template,
+    get_fingerprint_type,
     hash_from_values,
     is_default_fingerprint_var,
     resolve_fingerprint_values,
@@ -83,7 +86,7 @@ def get_config_dict(self, project: Project) -> GroupingConfig:
             "enhancements": self._get_enhancements(project),
         }
 
-    def _get_enhancements(self, project) -> str:
+    def _get_enhancements(self, project: Project) -> str:
         project_enhancements = project.get_option("sentry:grouping_enhancements")
 
         config_id = self._get_config_id(project)
@@ -112,14 +115,14 @@ def _get_enhancements(self, project) -> str:
         cache.set(cache_key, enhancements)
         return enhancements
 
-    def _get_config_id(self, project):
+    def _get_config_id(self, project: Project) -> str:
         raise NotImplementedError
 
 
 class ProjectGroupingConfigLoader(GroupingConfigLoader):
     option_name: str  # Set in subclasses
 
-    def _get_config_id(self, project):
+    def _get_config_id(self, project: Project) -> str:
         return project.get_option(
             self.option_name,
             validate=lambda x: x in CONFIGURATIONS,
@@ -145,29 +148,29 @@ class BackgroundGroupingConfigLoader(GroupingConfigLoader):
 
     cache_prefix = "background-grouping-enhancements:"
 
-    def _get_config_id(self, project):
+    def _get_config_id(self, _project: Project) -> str:
         return options.get("store.background-grouping-config-id")
 
 
 @sentry_sdk.tracing.trace
-def get_grouping_config_dict_for_project(project) -> GroupingConfig:
+def get_grouping_config_dict_for_project(project: Project) -> GroupingConfig:
     """Fetches all the information necessary for grouping from the project
     settings.  The return value of this is persisted with the event on
     ingestion so that the grouping algorithm can be re-run later.
 
     This is called early on in normalization so that everything that is needed
-    to group the project is pulled into the event.
+    to group the event is pulled into the event data.
     """
     loader = PrimaryGroupingConfigLoader()
     return loader.get_config_dict(project)
 
 
-def get_grouping_config_dict_for_event_data(data, project) -> GroupingConfig:
+def get_grouping_config_dict_for_event_data(data: NodeData, project: Project) -> GroupingConfig:
     """Returns the grouping config for an event dictionary."""
     return data.get("grouping_config") or get_grouping_config_dict_for_project(project)
 
 
-def get_default_enhancements(config_id=None) -> str:
+def get_default_enhancements(config_id: str | None = None) -> str:
     base: str | None = DEFAULT_GROUPING_ENHANCEMENTS_BASE
     if config_id is not None:
         base = CONFIGURATIONS[config_id].enhancements_base
@@ -191,7 +194,7 @@ def get_projects_default_fingerprinting_bases(
     return bases
 
 
-def get_default_grouping_config_dict(config_id=None) -> GroupingConfig:
+def get_default_grouping_config_dict(config_id: str | None = None) -> GroupingConfig:
     """Returns the default grouping config."""
     if config_id is None:
         from sentry.projectoptions.defaults import DEFAULT_GROUPING_CONFIG
@@ -200,17 +203,16 @@ def get_default_grouping_config_dict(config_id=None) -> GroupingConfig:
     return {"id": config_id, "enhancements": get_default_enhancements(config_id)}
 
 
-def load_grouping_config(config_dict=None) -> StrategyConfiguration:
+def load_grouping_config(config_dict: GroupingConfig | None = None) -> StrategyConfiguration:
     """Loads the given grouping config."""
     if config_dict is None:
         config_dict = get_default_grouping_config_dict()
     elif "id" not in config_dict:
         raise ValueError("Malformed configuration dictionary")
-    config_dict = dict(config_dict)
-    config_id = config_dict.pop("id")
+    config_id = config_dict["id"]
     if config_id not in CONFIGURATIONS:
         raise GroupingConfigNotFound(config_id)
-    return CONFIGURATIONS[config_id](**config_dict)
+    return CONFIGURATIONS[config_id](enhancements=config_dict["enhancements"])
 
 
 def load_default_grouping_config() -> StrategyConfiguration:
@@ -249,9 +251,7 @@ def get_fingerprinting_config_for_project(
 
 
 def apply_server_fingerprinting(
-    event: MutableMapping[str, Any],
-    fingerprinting_config: FingerprintingRules,
-    allow_custom_title: bool = True,
+    event: MutableMapping[str, Any], fingerprinting_config: FingerprintingRules
 ) -> None:
     fingerprint_info = {}
 
@@ -268,7 +268,7 @@ def apply_server_fingerprinting(
 
         # A custom title attribute is stored in the event to override the
         # default title.
-        if "title" in attributes and allow_custom_title:
+        if "title" in attributes:
             event["title"] = expand_title_template(attributes["title"], event)
         event["fingerprint"] = new_fingerprint
 
@@ -280,23 +280,35 @@ def apply_server_fingerprinting(
         event["_fingerprint_info"] = fingerprint_info
 
 
-def _get_component_trees_for_variants(
+def _get_variants_from_strategies(
     event: Event, context: GroupingContext
-) -> dict[str, AppGroupingComponent | SystemGroupingComponent | DefaultGroupingComponent]:
+) -> dict[str, ComponentVariant]:
     winning_strategy: str | None = None
     precedence_hint: str | None = None
-    all_strategies_components_by_variant: dict[str, list[BaseGroupingComponent]] = {}
+    all_strategies_components_by_variant: dict[str, list[BaseGroupingComponent[Any]]] = {}
+    winning_strategy_components_by_variant = {}
 
+    # `iter_strategies` presents strategies in priority order, which allows us to go with the first
+    # one which produces a result. (See `src/sentry/grouping/strategies/configurations.py` for the
+    # strategies used by each config.)
     for strategy in context.config.iter_strategies():
-        # Defined in src/sentry/grouping/strategies/base.py
         current_strategy_components_by_variant = strategy.get_grouping_components(
             event, context=context
         )
         for variant_name, component in current_strategy_components_by_variant.items():
             all_strategies_components_by_variant.setdefault(variant_name, []).append(component)
 
-            if winning_strategy is None:
-                if component.contributes:
+            if component.contributes:
+                if winning_strategy is None:
+                    # If we haven't yet found a winner.. now we have!
+                    #
+                    # The value of `current_strategy_components_by_variant` will change with each
+                    # strategy, so grab a separate reference to the winning ones so we don't lose
+                    # track of them
+                    #
+                    # Also, create a hint we can add to components from other strategies indicating
+                    # that this one took precedence
+                    winning_strategy_components_by_variant = current_strategy_components_by_variant
                     winning_strategy = strategy.name
                     variant_descriptor = "/".join(
                         sorted(
@@ -313,10 +325,13 @@ def _get_component_trees_for_variants(
                         ),
                         "" if strategy.name.endswith("s") else "s",
                     )
-            elif component.contributes and winning_strategy != strategy.name:
-                component.update(contributes=False, hint=precedence_hint)
+                # On the other hand, if another strategy before this one was already the winner, we
+                # don't want any of this strategy's components to contribute to grouping
+                elif strategy.name != winning_strategy:
+                    component.update(contributes=False, hint=precedence_hint)
+
+    variants = {}
 
-    component_trees_by_variant = {}
     for variant_name, components in all_strategies_components_by_variant.items():
         component_class_by_variant = {
             "app": AppGroupingComponent,
@@ -324,11 +339,28 @@ def _get_component_trees_for_variants(
             "system": SystemGroupingComponent,
         }
         root_component = component_class_by_variant[variant_name](values=components)
+
+        # The root component will pull its `contributes` value from the components it wraps - if
+        # none of them contributes, it will also be marked as non-contributing. But those components
+        # might not have the same reasons for not contributing (`hint` values), so it can't pull
+        # that them - it's gotta be set here.
         if not root_component.contributes and precedence_hint:
             root_component.update(hint=precedence_hint)
-        component_trees_by_variant[variant_name] = root_component
 
-    return component_trees_by_variant
+        winning_strategy_component = winning_strategy_components_by_variant.get(variant_name)
+        contributing_component = (
+            winning_strategy_component
+            if winning_strategy_component and winning_strategy_component.contributes
+            else None
+        )
+
+        variants[variant_name] = ComponentVariant(
+            component=root_component,
+            contributing_component=contributing_component,
+            strategy_config=context.config,
+        )
+
+    return variants
 
 
 # This is called by the Event model in get_grouping_variants()
@@ -336,84 +368,97 @@ def get_grouping_variants_for_event(
     event: Event, config: StrategyConfiguration | None = None
 ) -> dict[str, BaseVariant]:
     """Returns a dict of all grouping variants for this event."""
-    # If a checksum is set the only variant that comes back from this
-    # event is the checksum variant.
+    # If a checksum is set the only variant that comes back from this event is the checksum variant.
     #
     # TODO: Is there a reason we don't treat a checksum like a custom fingerprint, and run the other
     # strategies but mark them as non-contributing, with explanations why?
-    #
-    # TODO: In the case where we have to hash the checksum to get a value in the right format, we
-    # store the raw value as well (provided it's not so long that it will overflow the DB field).
-    # Even when we do this, though, we don't set the raw value as non-cotributing, and we don't add
-    # an "ignored because xyz" hint on the variant, which we should.
     checksum = event.data.get("checksum")
     if checksum:
         if HASH_RE.match(checksum):
             return {"checksum": ChecksumVariant(checksum)}
+        else:
+            return {
+                "hashed_checksum": HashedChecksumVariant(hash_from_values(checksum), checksum),
+            }
 
-        variants: dict[str, BaseVariant] = {
-            "hashed_checksum": HashedChecksumVariant(hash_from_values(checksum), checksum),
-        }
+    # Otherwise we go to the various forms of grouping based on fingerprints and/or event data
+    # (stacktrace, message, etc.)
+    raw_fingerprint = event.data.get("fingerprint") or ["{{ default }}"]
+    fingerprint_info = event.data.get("_fingerprint_info", {})
+    fingerprint_type = get_fingerprint_type(raw_fingerprint)
+    resolved_fingerprint = (
+        raw_fingerprint
+        if fingerprint_type == "default"
+        else resolve_fingerprint_values(raw_fingerprint, event.data)
+    )
 
-        # The legacy code path also supported arbitrary values here but
-        # it will blow up if it results in more than 32 bytes of data
-        # as this cannot be inserted into the database.  (See GroupHash.hash)
-        if len(checksum) <= 32:
-            variants["checksum"] = ChecksumVariant(checksum)
+    # Run all of the event-data-based grouping strategies. Any which apply will create grouping
+    # components, which will then be grouped into variants by variant type (system, app, default).
+    context = GroupingContext(config or load_default_grouping_config())
+    strategy_component_variants: dict[str, ComponentVariant] = _get_variants_from_strategies(
+        event, context
+    )
 
-        return variants
+    # Create a separate container for these for now to preserve the typing of
+    # `strategy_component_variants`
+    additional_variants: dict[str, BaseVariant] = {}
 
-    # Otherwise we go to the various forms of fingerprint handling.  If the event carries
-    # 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", {})
-    defaults_referenced = sum(1 if is_default_fingerprint_var(d) else 0 for d in fingerprint)
-
-    if config is None:
-        config = load_default_grouping_config()
-    context = GroupingContext(config)
-
-    # At this point we need to calculate the default event values.  If the
-    # fingerprint is salted we will wrap it.
-    component_trees_by_variant = _get_component_trees_for_variants(event, context)
-
-    # If no defaults are referenced we produce a single completely custom
-    # fingerprint and mark all other variants as non-contributing
-    if defaults_referenced == 0:
-        variants = {}
-        for variant_name, root_component in component_trees_by_variant.items():
-            root_component.update(
-                contributes=False,
-                hint="custom fingerprint takes precedence",
-            )
-            variants[variant_name] = ComponentVariant(root_component, context.config)
+    # If the fingerprint is the default fingerprint, we can use the variants as is. If it's custom,
+    # we need to create an addiional fingerprint variant and mark the existing variants as
+    # non-contributing. And if it's hybrid, we'll replace the existing variants with "salted"
+    # versions which include the fingerprint.
+    if fingerprint_type == "custom":
+        for variant in strategy_component_variants.values():
+            variant.component.update(contributes=False, hint="custom fingerprint takes precedence")
 
-        fingerprint = resolve_fingerprint_values(fingerprint, event.data)
         if fingerprint_info.get("matched_rule", {}).get("is_builtin") is True:
-            variants["built_in_fingerprint"] = BuiltInFingerprintVariant(
-                fingerprint, fingerprint_info
+            additional_variants["built_in_fingerprint"] = BuiltInFingerprintVariant(
+                resolved_fingerprint, fingerprint_info
             )
         else:
-            variants["custom_fingerprint"] = CustomFingerprintVariant(fingerprint, fingerprint_info)
-
-    # If only the default is referenced, we can use the variants as is
-    elif defaults_referenced == 1 and len(fingerprint) == 1:
-        variants = {}
-        for variant_name, root_component in component_trees_by_variant.items():
-            variants[variant_name] = ComponentVariant(root_component, context.config)
-
-    # Otherwise we need to "salt" our variants with the custom fingerprint value(s)
-    else:
-        variants = {}
-        fingerprint = resolve_fingerprint_values(fingerprint, event.data)
-        for variant_name, root_component in component_trees_by_variant.items():
-            variants[variant_name] = SaltedComponentVariant(
-                fingerprint, root_component, context.config, fingerprint_info
+            additional_variants["custom_fingerprint"] = CustomFingerprintVariant(
+                resolved_fingerprint, fingerprint_info
             )
+    elif fingerprint_type == "hybrid":
+        for variant_name, variant in strategy_component_variants.items():
+            # Since we're reusing the variant names, when all of the variants are combined, these
+            # salted versions will replace the unsalted versions
+            additional_variants[variant_name] = SaltedComponentVariant.from_component_variant(
+                variant, resolved_fingerprint, fingerprint_info
+            )
+
+    final_variants = {
+        **strategy_component_variants,
+        # Add these in second, so the salted versions of any variants replace the unsalted versions
+        **additional_variants,
+    }
 
     # Ensure we have a fallback hash if nothing else works out
-    if not any(x.contributes for x in variants.values()):
-        variants["fallback"] = FallbackVariant()
+    if not any(x.contributes for x in final_variants.values()):
+        final_variants["fallback"] = FallbackVariant()
 
-    return variants
+    return final_variants
+
+
+def get_contributing_variant_and_component(
+    variants: dict[str, BaseVariant]
+) -> tuple[BaseVariant, ContributingComponent | None]:
+    if len(variants) == 1:
+        contributing_variant = list(variants.values())[0]
+    else:
+        contributing_variant = (
+            variants["app"]
+            # TODO: We won't need this 'if' once we stop returning both app and system contributing
+            # variants
+            if "app" in variants and variants["app"].contributes
+            # Other than in the broken app/system case, there should only ever be a single
+            # contributing variant
+            else [variant for variant in variants.values() if variant.contributes][0]
+        )
+    contributing_component = (
+        contributing_variant.contributing_component
+        if hasattr(contributing_variant, "contributing_component")
+        else None
+    )
+
+    return (contributing_variant, contributing_component)
diff --git a/src/sentry/grouping/component.py b/src/sentry/grouping/component.py
index 6a5fe7b28e8092..cfca678fe3a0e3 100644
--- a/src/sentry/grouping/component.py
+++ b/src/sentry/grouping/component.py
@@ -31,8 +31,13 @@ def _calculate_contributes[ValuesType](values: Sequence[ValuesType]) -> bool:
 
 
 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.
+    """
+    A grouping component is a node in a tree describing the event data (exceptions, stacktraces,
+    messages, etc.) which can contribute to grouping. Each node's children, stored in the `values`
+    attribute, are either other grouping components or primitives representing the actual data.
+
+    For example, an exception component might have type, value, and stacktrace components as
+    children, and the type component might have the string "KeyError" as its child.
     """
 
     hint: str | None = None
@@ -44,10 +49,9 @@ def __init__(
         hint: str | None = None,
         contributes: bool | None = None,
         values: Sequence[ValuesType] | None = None,
-        variant_provider: bool = False,
     ):
-        self.variant_provider = variant_provider
-
+        # Use `upate` to set attribute values because it ensures `contributes` is set (if
+        # `contributes` is not provided, `update` will derive it from the `values` value)
         self.update(
             hint=hint,
             contributes=contributes,
@@ -146,8 +150,9 @@ def shallow_copy(self) -> Self:
         return copy
 
     def iter_values(self) -> Generator[str | int]:
-        """Recursively walks the component and flattens it into a list of
-        values.
+        """
+        Recursively walks the component tree, gathering literal values from contributing
+        branches into a flat list.
         """
         if self.contributes:
             for value in self.values:
@@ -336,6 +341,17 @@ def __init__(
 
 class ThreadsGroupingComponent(BaseGroupingComponent[StacktraceGroupingComponent]):
     id: str = "threads"
+    frame_counts: Counter[str]
+
+    def __init__(
+        self,
+        values: Sequence[StacktraceGroupingComponent] | 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 CSPGroupingComponent(
@@ -404,3 +420,17 @@ class SystemGroupingComponent(
     ]
 ):
     id: str = "system"
+
+
+ContributingComponent = (
+    ChainedExceptionGroupingComponent
+    | ExceptionGroupingComponent
+    | StacktraceGroupingComponent
+    | ThreadsGroupingComponent
+    | CSPGroupingComponent
+    | ExpectCTGroupingComponent
+    | ExpectStapleGroupingComponent
+    | HPKPGroupingComponent
+    | MessageGroupingComponent
+    | TemplateGroupingComponent
+)
diff --git a/src/sentry/grouping/enhancer/__init__.py b/src/sentry/grouping/enhancer/__init__.py
index 89853ac57c0253..1966ab111f6f66 100644
--- a/src/sentry/grouping/enhancer/__init__.py
+++ b/src/sentry/grouping/enhancer/__init__.py
@@ -173,7 +173,7 @@ def assemble_stacktrace_component(
         frames: list[dict[str, Any]],
         platform: str | None,
         exception_data: dict[str, Any] | None = None,
-    ) -> tuple[StacktraceGroupingComponent, bool]:
+    ) -> StacktraceGroupingComponent:
         """
         This assembles a `stacktrace` grouping component out of the given
         `frame` components and source frames.
@@ -205,7 +205,7 @@ def assemble_stacktrace_component(
             frame_counts=frame_counts,
         )
 
-        return stacktrace_component, rust_results.invert_stacktrace
+        return stacktrace_component
 
     def as_dict(self, with_rules=False):
         rv = {
@@ -265,7 +265,7 @@ def loads(cls, data) -> Enhancements:
 
     @classmethod
     @sentry_sdk.tracing.trace
-    def from_config_string(self, s, bases=None, id=None) -> Enhancements:
+    def from_config_string(cls, s, bases=None, id=None) -> Enhancements:
         rust_enhancements = parse_rust_enhancements("config_string", s)
 
         rules = parse_enhancements(s)
diff --git a/src/sentry/grouping/enhancer/actions.py b/src/sentry/grouping/enhancer/actions.py
index 10911971a0b23f..988a514b2fd576 100644
--- a/src/sentry/grouping/enhancer/actions.py
+++ b/src/sentry/grouping/enhancer/actions.py
@@ -56,8 +56,8 @@ def is_updater(self) -> bool:
     def _from_config_structure(cls, val, version: int):
         if isinstance(val, list):
             return VarAction(val[0], val[1])
-        flag, range = REVERSE_ACTION_FLAGS[val >> ACTION_BITSIZE]
-        return FlagAction(ACTIONS[val & 0xF], flag, range)
+        flag, range_direction = REVERSE_ACTION_FLAGS[val >> ACTION_BITSIZE]
+        return FlagAction(ACTIONS[val & 0xF], flag, range_direction)
 
 
 class FlagAction(EnhancementAction):
diff --git a/src/sentry/grouping/enhancer/matchers.py b/src/sentry/grouping/enhancer/matchers.py
index a86b9afa2f09a0..8a411da381fe96 100644
--- a/src/sentry/grouping/enhancer/matchers.py
+++ b/src/sentry/grouping/enhancer/matchers.py
@@ -202,7 +202,8 @@ def _to_config_structure(self, version):
         if self.key == "family":
             arg = "".join(_f for _f in [FAMILIES.get(x) for x in self.pattern.split(",")] if _f)
         elif self.key == "app":
-            arg = {True: "1", False: "0"}.get(bool_from_string(self.pattern), "")
+            boolified_pattern = bool_from_string(self.pattern)
+            arg = "1" if boolified_pattern is True else "0" if boolified_pattern is False else ""
         else:
             arg = self.pattern
         return ("!" if self.negated else "") + MATCH_KEYS[self.key] + arg
diff --git a/src/sentry/grouping/fingerprinting/__init__.py b/src/sentry/grouping/fingerprinting/__init__.py
index 5bf069ee7da605..003083263266b8 100644
--- a/src/sentry/grouping/fingerprinting/__init__.py
+++ b/src/sentry/grouping/fingerprinting/__init__.py
@@ -240,6 +240,9 @@ def _get_release(self) -> list[_ReleaseInfo]:
         return self._release
 
     def get_values(self, match_type: str) -> list[dict[str, Any]]:
+        """
+        Pull values from all the spots in the event appropriate to the given match type.
+        """
         return getattr(self, "_get_" + match_type)()
 
 
@@ -375,7 +378,12 @@ def _from_config_structure(
 
 
 class FingerprintMatcher:
-    def __init__(self, key: str, pattern: str, negated: bool = False) -> None:
+    def __init__(
+        self,
+        key: str,  # The event attribute on which to match
+        pattern: str,  # The value to match (or to not match, depending on `negated`)
+        negated: bool = False,  # If True, match when `event[key]` does NOT equal `pattern`
+    ) -> None:
         if key.startswith("tags."):
             self.key = key
         else:
@@ -422,7 +430,7 @@ def _positive_path_match(self, value: str | None) -> bool:
         return False
 
     def _positive_match(self, values: dict[str, Any]) -> bool:
-        # path is special in that it tests against two values (abs_path and path)
+        # `path` is special in that it tests against two values (`abs_path` and `filename`)
         if self.key == "path":
             value = values.get("abs_path")
             if self._positive_path_match(value):
@@ -433,7 +441,7 @@ def _positive_match(self, values: dict[str, Any]) -> bool:
                     return True
             return False
 
-        # message tests against value as well as this is what users expect
+        # message tests against exception value also, as this is what users expect
         if self.key == "message":
             for key in ("message", "value"):
                 value = values.get(key)
@@ -444,20 +452,13 @@ def _positive_match(self, values: dict[str, Any]) -> bool:
         value = values.get(self.key)
         if value is None:
             return False
-        elif self.key == "package":
+        elif self.key in ["package", "release"]:
             if self._positive_path_match(value):
                 return True
-        elif self.key == "family":
-            flags = self.pattern.split(",")
-            if "all" in flags or value in flags:
-                return True
-        elif self.key == "sdk":
+        elif self.key in ["family", "sdk"]:
             flags = self.pattern.split(",")
             if "all" in flags or value in flags:
                 return True
-        elif self.key == "release":
-            if self._positive_path_match(value):
-                return True
         elif self.key == "app":
             ref_val = bool_from_string(self.pattern)
             if ref_val is not None and ref_val == value:
@@ -583,7 +584,7 @@ def visit_fingerprinting_rules(
         in_header = True
         for child in children:
             if isinstance(child, str):
-                if in_header and child[:2] == "##":
+                if in_header and child.startswith("##"):
                     changelog.append(child[2:].rstrip())
                 else:
                     in_header = False
diff --git a/src/sentry/grouping/grouping_info.py b/src/sentry/grouping/grouping_info.py
index 5e7ff6e9f695da..92e4d60e6bc8ac 100644
--- a/src/sentry/grouping/grouping_info.py
+++ b/src/sentry/grouping/grouping_info.py
@@ -1,5 +1,4 @@
 import logging
-from collections.abc import Mapping
 from typing import Any
 
 from sentry.api.exceptions import ResourceDoesNotExist
@@ -89,7 +88,7 @@ def _check_for_mismatched_hashes(
 
 
 def get_grouping_info_from_variants(
-    variants: Mapping[str, BaseVariant],
+    variants: dict[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/grouphash_metadata.py b/src/sentry/grouping/ingest/grouphash_metadata.py
index 0ecbbf0aec307f..94dc3251c99766 100644
--- a/src/sentry/grouping/ingest/grouphash_metadata.py
+++ b/src/sentry/grouping/ingest/grouphash_metadata.py
@@ -6,6 +6,7 @@
 from typing_extensions import TypeIs
 
 from sentry.eventstore.models import Event
+from sentry.grouping.api import get_contributing_variant_and_component
 from sentry.grouping.component import (
     ChainedExceptionGroupingComponent,
     CSPGroupingComponent,
@@ -135,32 +136,13 @@ def get_hash_basis_and_metadata(
     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
-        if "app" in variants and variants["app"].contributes
-        else (
-            variants["hashed_checksum"]
-            # TODO: We won't need this 'if' once we stop returning both hashed and non-hashed
-            # checksum contributing variants
-            if "hashed_checksum" in variants
-            # Other than in the broken app/system and hashed/raw checksum cases, there should only
-            # ever be a single contributing variant
-            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
-    )
+    # TODO: These 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?
+    contributors = get_contributing_variant_and_component(variants)
+    contributing_variant: Any = contributors[0]
+    contributing_component: Any = contributors[1]
 
     # 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
@@ -278,7 +260,7 @@ def _get_stacktrace_hashing_metadata(
     ),
 ) -> StacktraceHashingMetadata:
     return {
-        "stacktrace_type": "in_app" if "in-app" in contributing_variant.description else "system",
+        "stacktrace_type": "in_app" if contributing_variant.variant_name == "app" else "system",
         "stacktrace_location": (
             "exception"
             if "exception" in contributing_variant.description
diff --git a/src/sentry/grouping/ingest/hashing.py b/src/sentry/grouping/ingest/hashing.py
index 93b0c6e4865f61..0aa5d76f90b2f1 100644
--- a/src/sentry/grouping/ingest/hashing.py
+++ b/src/sentry/grouping/ingest/hashing.py
@@ -67,9 +67,7 @@ def _calculate_event_grouping(
             # look at `grouping_config` to pick the right parameters.
             event.data["fingerprint"] = event.data.data.get("fingerprint") or ["{{ default }}"]
             apply_server_fingerprinting(
-                event.data.data,
-                get_fingerprinting_config_for_project(project),
-                allow_custom_title=True,
+                event.data.data, get_fingerprinting_config_for_project(project)
             )
 
         with metrics.timer("event_manager.event.get_hashes", tags=metric_tags):
diff --git a/src/sentry/grouping/ingest/seer.py b/src/sentry/grouping/ingest/seer.py
index 234759e73ddd8a..2335348ef26e22 100644
--- a/src/sentry/grouping/ingest/seer.py
+++ b/src/sentry/grouping/ingest/seer.py
@@ -1,5 +1,4 @@
 import logging
-from collections.abc import Mapping
 from dataclasses import asdict
 from typing import Any
 
@@ -17,11 +16,14 @@
 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 (
+    SEER_INELIGIBLE_EVENT_PLATFORMS,
     ReferrerOptions,
-    event_content_is_seer_eligible,
+    event_content_has_stacktrace,
     filter_null_from_string,
     get_stacktrace_string_with_metrics,
+    has_too_many_contributing_frames,
     killswitch_enabled,
+    record_did_call_seer_metric,
 )
 from sentry.utils import metrics
 from sentry.utils.circuit_breaker2 import CircuitBreaker
@@ -30,7 +32,7 @@
 logger = logging.getLogger("sentry.events.grouping")
 
 
-def should_call_seer_for_grouping(event: Event, variants: Mapping[str, BaseVariant]) -> bool:
+def should_call_seer_for_grouping(event: Event, variants: dict[str, BaseVariant]) -> bool:
     """
     Use event content, feature flags, rate limits, killswitches, seer health, etc. to determine
     whether a call to Seer should be made.
@@ -39,14 +41,15 @@ def should_call_seer_for_grouping(event: Event, variants: Mapping[str, BaseVaria
     project = event.project
 
     # Check both of these before returning based on either so we can gather metrics on their results
-    content_is_eligible = event_content_is_seer_eligible(event)
+    content_is_eligible = _event_content_is_seer_eligible(event)
     seer_enabled_for_project = _project_has_similarity_grouping_enabled(project)
     if not (content_is_eligible and seer_enabled_for_project):
         return False
 
     if (
         _has_customized_fingerprint(event, variants)
-        or killswitch_enabled(project.id, event)
+        or _has_too_many_contributing_frames(event, variants)
+        or killswitch_enabled(project.id, ReferrerOptions.INGEST, 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
@@ -66,6 +69,42 @@ def should_call_seer_for_grouping(event: Event, variants: Mapping[str, BaseVaria
     return True
 
 
+def _event_content_is_seer_eligible(event: Event) -> bool:
+    """
+    Determine if an event's contents makes it fit for using with Seer's similar issues model.
+    """
+    if not event_content_has_stacktrace(event):
+        metrics.incr(
+            "grouping.similarity.event_content_seer_eligible",
+            sample_rate=options.get("seer.similarity.metrics_sample_rate"),
+            tags={"eligible": False, "blocker": "no-stacktrace"},
+        )
+        return False
+
+    if event.platform in SEER_INELIGIBLE_EVENT_PLATFORMS:
+        metrics.incr(
+            "grouping.similarity.event_content_seer_eligible",
+            sample_rate=options.get("seer.similarity.metrics_sample_rate"),
+            tags={"eligible": False, "blocker": "unsupported-platform"},
+        )
+        return False
+
+    metrics.incr(
+        "grouping.similarity.event_content_seer_eligible",
+        sample_rate=options.get("seer.similarity.metrics_sample_rate"),
+        tags={"eligible": True, "blocker": "none"},
+    )
+    return True
+
+
+def _has_too_many_contributing_frames(event: Event, variants: dict[str, BaseVariant]) -> bool:
+    if has_too_many_contributing_frames(event, variants, ReferrerOptions.INGEST):
+        record_did_call_seer_metric(call_made=False, blocker="excess-frames")
+        return True
+
+    return False
+
+
 def _project_has_similarity_grouping_enabled(project: Project) -> bool:
     # TODO: This is a hack to get ingest to turn on for projects as soon as they're backfilled. When
     # the backfill script completes, we turn on this option, enabling ingest immediately rather than
@@ -86,7 +125,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: Mapping[str, BaseVariant]) -> bool:
+def _has_customized_fingerprint(event: Event, variants: dict[str, BaseVariant]) -> bool:
     fingerprint = event.data.get("fingerprint", [])
 
     if "{{ default }}" in fingerprint:
@@ -96,22 +135,14 @@ def _has_customized_fingerprint(event: Event, variants: Mapping[str, BaseVariant
 
         # Hybrid fingerprinting ({{ default }} + some other value(s))
         else:
-            metrics.incr(
-                "grouping.similarity.did_call_seer",
-                sample_rate=options.get("seer.similarity.metrics_sample_rate"),
-                tags={"call_made": False, "blocker": "hybrid-fingerprint"},
-            )
+            record_did_call_seer_metric(call_made=False, blocker="hybrid-fingerprint")
             return True
 
     # Fully customized fingerprint (from either us or the user)
     fingerprint_variant = variants.get("custom_fingerprint") or variants.get("built_in_fingerprint")
 
     if fingerprint_variant:
-        metrics.incr(
-            "grouping.similarity.did_call_seer",
-            sample_rate=options.get("seer.similarity.metrics_sample_rate"),
-            tags={"call_made": False, "blocker": fingerprint_variant.type},
-        )
+        record_did_call_seer_metric(call_made=False, blocker=fingerprint_variant.type)
         return True
 
     return False
@@ -133,12 +164,7 @@ def _ratelimiting_enabled(event: Event, project: Project) -> bool:
     if ratelimiter.backend.is_limited("seer:similarity:global-limit", **global_ratelimit):
         logger_extra["limit_per_sec"] = global_limit_per_sec
         logger.warning("should_call_seer_for_grouping.global_ratelimit_hit", extra=logger_extra)
-
-        metrics.incr(
-            "grouping.similarity.did_call_seer",
-            sample_rate=options.get("seer.similarity.metrics_sample_rate"),
-            tags={"call_made": False, "blocker": "global-rate-limit"},
-        )
+        record_did_call_seer_metric(call_made=False, blocker="global-rate-limit")
 
         return True
 
@@ -147,12 +173,7 @@ def _ratelimiting_enabled(event: Event, project: Project) -> bool:
     ):
         logger_extra["limit_per_sec"] = project_limit_per_sec
         logger.warning("should_call_seer_for_grouping.project_ratelimit_hit", extra=logger_extra)
-
-        metrics.incr(
-            "grouping.similarity.did_call_seer",
-            sample_rate=options.get("seer.similarity.metrics_sample_rate"),
-            tags={"call_made": False, "blocker": "project-rate-limit"},
-        )
+        record_did_call_seer_metric(call_made=False, blocker="project-rate-limit")
 
         return True
 
@@ -173,29 +194,18 @@ def _circuit_breaker_broken(event: Event, project: Project) -> bool:
                 **breaker_config,
             },
         )
-        metrics.incr(
-            "grouping.similarity.did_call_seer",
-            sample_rate=options.get("seer.similarity.metrics_sample_rate"),
-            tags={"call_made": False, "blocker": "circuit-breaker"},
-        )
+        record_did_call_seer_metric(call_made=False, blocker="circuit-breaker")
 
     return circuit_broken
 
 
-def _has_empty_stacktrace_string(event: Event, variants: Mapping[str, BaseVariant]) -> bool:
+def _has_empty_stacktrace_string(event: Event, variants: dict[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",
-                },
-            )
+            record_did_call_seer_metric(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.
@@ -205,7 +215,7 @@ def _has_empty_stacktrace_string(event: Event, variants: Mapping[str, BaseVarian
 
 def get_seer_similar_issues(
     event: Event,
-    variants: Mapping[str, BaseVariant],
+    variants: dict[str, BaseVariant],
     num_neighbors: int = 1,
 ) -> tuple[dict[str, Any], GroupHash | None]:
     """
@@ -281,16 +291,12 @@ def get_seer_similar_issues(
 
 
 def maybe_check_seer_for_matching_grouphash(
-    event: Event, variants: Mapping[str, BaseVariant], all_grouphashes: list[GroupHash]
+    event: Event, variants: dict[str, BaseVariant], all_grouphashes: list[GroupHash]
 ) -> GroupHash | None:
     seer_matched_grouphash = None
 
     if should_call_seer_for_grouping(event, variants):
-        metrics.incr(
-            "grouping.similarity.did_call_seer",
-            sample_rate=options.get("seer.similarity.metrics_sample_rate"),
-            tags={"call_made": True, "blocker": "none"},
-        )
+        record_did_call_seer_metric(call_made=True, blocker="none")
 
         try:
             # If no matching group is found in Seer, we'll still get back result
diff --git a/src/sentry/grouping/parameterization.py b/src/sentry/grouping/parameterization.py
index 49309f7d4ca91c..412b254ccc6ac2 100644
--- a/src/sentry/grouping/parameterization.py
+++ b/src/sentry/grouping/parameterization.py
@@ -20,19 +20,19 @@
 @dataclasses.dataclass
 class ParameterizationRegex:
 
-    name: str  # name of the pattern also used as group name in combined regex
+    name: str  # name of the pattern (also used as group name in combined regex)
     raw_pattern: str  # regex pattern w/o matching group name
     lookbehind: str | None = None  # positive lookbehind prefix if needed
     lookahead: str | None = None  # positive lookahead postfix if needed
     counter: int = 0
 
-    # These need to be used with `(?x)` tells the regex compiler to ignore comments
+    # These need to be used with `(?x)`, to tell the regex compiler to ignore comments
     # and unescaped whitespace, so we can use newlines and indentation for better legibility.
 
     @property
     def pattern(self) -> str:
         """
-        Returns the regex pattern for with as a named matching group and lookbehind/lookahead if needed.
+        Returns the regex pattern with a named matching group and lookbehind/lookahead if needed.
         """
         prefix = rf"(?<={self.lookbehind})" if self.lookbehind else ""
         postfix = rf"(?={self.lookahead})" if self.lookahead else ""
@@ -41,7 +41,7 @@ def pattern(self) -> str:
     @property
     def compiled_pattern(self) -> re.Pattern[str]:
         """
-        Returns the compiled regex pattern for with as a named matching group and lookbehind/lookahead if needed.
+        Returns the compiled regex pattern with a named matching group and lookbehind/lookahead if needed.
         """
         if not hasattr(self, "_compiled_pattern"):
             self._compiled_pattern = re.compile(rf"(?x){self.pattern}")
@@ -189,8 +189,8 @@ class ParameterizationCallable:
     us more flexibility than just using regex.
     """
 
-    name: str  # name of the pattern also used as group name in combined regex
-    apply: Callable[[str], tuple[str, int]]  # function to modifying the input string
+    name: str  # name of the pattern (also used as group name in combined regex)
+    apply: Callable[[str], tuple[str, int]]  # function for modifying the input string
     counter: int = 0
 
 
diff --git a/src/sentry/grouping/strategies/base.py b/src/sentry/grouping/strategies/base.py
index 8157f6232d364a..a974391cdc60ba 100644
--- a/src/sentry/grouping/strategies/base.py
+++ b/src/sentry/grouping/strategies/base.py
@@ -1,6 +1,6 @@
 import inspect
 from collections.abc import Callable, Iterator, Sequence
-from typing import Any, Generic, Protocol, TypeVar, overload
+from typing import Any, Generic, Protocol, Self, TypeVar, overload
 
 from sentry import projectoptions
 from sentry.eventstore.models import Event
@@ -62,7 +62,7 @@ def strategy(
     """
     Registers a strategy
 
-    :param ids: The strategy/delegate IDs with which to register
+    :param ids: The strategy/delegate IDs to register
     :param interface: Which interface type should be dispatched to this strategy
     :param score: Determines precedence of strategies. For example exception
         strategy scores higher than message strategy, so if both interfaces are
@@ -90,6 +90,7 @@ def decorator(f: StrategyFunc[ConcreteInterface]) -> Strategy[ConcreteInterface]
 
 class GroupingContext:
     def __init__(self, strategy_config: "StrategyConfiguration"):
+        # The initial context is essentially the grouping config options
         self._stack = [strategy_config.initial_context]
         self.config = strategy_config
         self.push()
@@ -99,12 +100,13 @@ def __setitem__(self, key: str, value: ContextValue) -> None:
         self._stack[-1][key] = value
 
     def __getitem__(self, key: str) -> ContextValue:
+        # Walk down the stack from the top and return the first instance of `key` found
         for d in reversed(self._stack):
             if key in d:
                 return d[key]
         raise KeyError(key)
 
-    def __enter__(self) -> "GroupingContext":
+    def __enter__(self) -> Self:
         self.push()
         return self
 
@@ -142,7 +144,7 @@ def get_single_grouping_component(
 
     def get_single_grouping_component(
         self, interface: Interface, *, event: Event, **kwargs: Any
-    ) -> BaseGroupingComponent:
+    ) -> FrameGroupingComponent | ExceptionGroupingComponent | StacktraceGroupingComponent:
         """Invokes a delegate grouping strategy.  If no such delegate is
         configured a fallback grouping component is returned.
         """
@@ -200,9 +202,9 @@ def __repr__(self) -> str:
     def _invoke(
         self, func: Callable[..., ReturnedVariants], *args: Any, **kwargs: Any
     ) -> ReturnedVariants:
-        # We forcefully override strategy here.  This lets a strategy
+        # We forcefully override strategy here. This lets a strategy
         # function always access its metadata and directly forward it to
-        # subcomponents without having to filter out strategy.
+        # subcomponents.
         kwargs["strategy"] = self
         return func(*args, **kwargs)
 
@@ -218,7 +220,7 @@ def variant_processor(self, func: VariantProcessor) -> VariantProcessor:
 
     def get_grouping_component(
         self, event: Event, context: GroupingContext, variant: str | None = None
-    ) -> None | BaseGroupingComponent | ReturnedVariants:
+    ) -> None | BaseGroupingComponent[Any] | ReturnedVariants:
         """Given a specific variant this calculates the grouping component."""
         args = []
         iface = event.interfaces.get(self.interface_name)
@@ -244,54 +246,33 @@ def get_grouping_components(self, event: Event, context: GroupingContext) -> Ret
         assert isinstance(components_by_variant, dict)
 
         final_components_by_variant = {}
-        has_mandatory_hashes = False
-        mandatory_contributing_variants_by_hash = {}
-        optional_contributing_variants = []
-        prevent_contribution = None
+        priority_contributing_variants_by_hash = {}
+        non_priority_contributing_variants = []
 
         for variant_name, component in components_by_variant.items():
-            is_mandatory = variant_name.startswith("!")
+            is_priority = variant_name.startswith("!")
             variant_name = variant_name.lstrip("!")
 
-            if is_mandatory:
-                has_mandatory_hashes = True
-
             if component.contributes:
-                if is_mandatory:
-                    mandatory_contributing_variants_by_hash[component.get_hash()] = variant_name
+                # Track priority and non-priority contributing hashes separately, so the latter can
+                # be deduped against the former
+                if is_priority:
+                    priority_contributing_variants_by_hash[component.get_hash()] = variant_name
                 else:
-                    optional_contributing_variants.append(variant_name)
+                    non_priority_contributing_variants.append(variant_name)
 
             final_components_by_variant[variant_name] = component
 
-        prevent_contribution = has_mandatory_hashes and not mandatory_contributing_variants_by_hash
-
-        for variant_name in optional_contributing_variants:
+        # Mark any non-priority duplicates of priority hashes as non-contributing
+        for variant_name in non_priority_contributing_variants:
             component = final_components_by_variant[variant_name]
-
-            # In case this variant contributes we need to check two things
-            # here: if we did not have a system match we need to prevent
-            # it from contributing.  Additionally if it matches the system
-            # component we also do not want the variant to contribute but
-            # with a different message.
-            if prevent_contribution:
+            hash_value = component.get_hash()
+            duplicate_of = priority_contributing_variants_by_hash.get(hash_value)
+            if duplicate_of is not None:
                 component.update(
                     contributes=False,
-                    hint="ignored because %s variant is not used"
-                    % (
-                        list(mandatory_contributing_variants_by_hash.values())[0]
-                        if len(mandatory_contributing_variants_by_hash) == 1
-                        else "other mandatory"
-                    ),
+                    hint="ignored because hash matches %s variant" % duplicate_of,
                 )
-            else:
-                hash_value = component.get_hash()
-                duplicate_of = mandatory_contributing_variants_by_hash.get(hash_value)
-                if duplicate_of is not None:
-                    component.update(
-                        contributes=False,
-                        hint="ignored because hash matches %s variant" % duplicate_of,
-                    )
 
         if self.variant_processor_func is not None:
             final_components_by_variant = self._invoke(
diff --git a/src/sentry/grouping/strategies/legacy.py b/src/sentry/grouping/strategies/legacy.py
index d1c302f5f3a375..d1cd5232fef73c 100644
--- a/src/sentry/grouping/strategies/legacy.py
+++ b/src/sentry/grouping/strategies/legacy.py
@@ -111,9 +111,9 @@ def is_recursion_legacy(frame1: Frame, frame2: Frame) -> bool:
 def remove_module_outliers_legacy(module: str, platform: str) -> tuple[str, str | None]:
     """Remove things that augment the module but really should not."""
     if platform == "java":
-        if module[:35] == "sun.reflect.GeneratedMethodAccessor":
+        if module.startswith("sun.reflect.GeneratedMethodAccessor"):
             return "sun.reflect.GeneratedMethodAccessor", "removed reflection marker"
-        if module[:44] == "jdk.internal.reflect.GeneratedMethodAccessor":
+        if module.startswith("jdk.internal.reflect.GeneratedMethodAccessor"):
             return "jdk.internal.reflect.GeneratedMethodAccessor", "removed reflection marker"
         old_module = module
         module = _java_reflect_enhancer_re.sub(r"\1<auto>", module)
@@ -447,7 +447,7 @@ def stacktrace_legacy(
         frames_for_filtering.append(frame.get_raw_data())
         prev_frame = frame
 
-    stacktrace_component, _ = context.config.enhancements.assemble_stacktrace_component(
+    stacktrace_component = context.config.enhancements.assemble_stacktrace_component(
         frame_components, frames_for_filtering, event.platform
     )
     stacktrace_component.update(contributes=contributes, hint=hint)
diff --git a/src/sentry/grouping/strategies/newstyle.py b/src/sentry/grouping/strategies/newstyle.py
index bd2dc77655d8ae..d32174de0bf638 100644
--- a/src/sentry/grouping/strategies/newstyle.py
+++ b/src/sentry/grouping/strategies/newstyle.py
@@ -152,7 +152,6 @@ def get_filename_component(
         new_filename = _java_assist_enhancer_re.sub(r"\1<auto>", filename)
         if new_filename != filename:
             filename_component.update(values=[new_filename], hint="cleaned javassist parts")
-            filename = new_filename
 
     return filename_component
 
@@ -176,11 +175,11 @@ def get_module_component(
     elif platform == "java":
         if "$$Lambda$" in module:
             module_component.update(contributes=False, hint="ignored java lambda")
-        if module[:35] == "sun.reflect.GeneratedMethodAccessor":
+        if module.startswith("sun.reflect.GeneratedMethodAccessor"):
             module_component.update(
                 values=["sun.reflect.GeneratedMethodAccessor"], hint="removed reflection marker"
             )
-        elif module[:44] == "jdk.internal.reflect.GeneratedMethodAccessor":
+        elif module.startswith("jdk.internal.reflect.GeneratedMethodAccessor"):
             module_component.update(
                 values=["jdk.internal.reflect.GeneratedMethodAccessor"],
                 hint="removed reflection marker",
@@ -351,8 +350,9 @@ def frame(
     if context["javascript_fuzzing"] and get_behavior_family_for_platform(platform) == "javascript":
         func = frame.raw_function or frame.function
         if func:
+            # Strip leading namespacing, i.e., turn `some.module.path.someFunction` into
+            # `someFunction` and `someObject.someMethod` into `someMethod`
             func = func.rsplit(".", 1)[-1]
-        # special case empty functions not to have a hint
         if not func:
             function_component.update(contributes=False)
         elif func in (
@@ -412,7 +412,7 @@ def stacktrace(
 
     return call_with_variants(
         _single_stacktrace_variant,
-        ["!system", "app"],
+        ["!app", "system"],
         interface,
         event=event,
         context=context,
@@ -463,7 +463,7 @@ def _single_stacktrace_variant(
             contributes=False, hint="ignored single non-URL JavaScript frame"
         )
 
-    stacktrace_component, _ = context.config.enhancements.assemble_stacktrace_component(
+    stacktrace_component = context.config.enhancements.assemble_stacktrace_component(
         frame_components,
         frames_for_filtering,
         event.platform,
@@ -518,15 +518,9 @@ def single_exception(
 
     if exception.mechanism:
         if exception.mechanism.synthetic:
-            # Ignore synthetic exceptions as they are produced from platform
-            # specific error codes.
-            #
-            # For example there can be crashes with EXC_ACCESS_VIOLATION_* on Windows with
-            # the same exact stacktrace as a crash with EXC_BAD_ACCESS on macOS.
-            #
-            # Do not update type component of system variant, such that regex
-            # can be continuously modified without unnecessarily creating new
-            # groups.
+            # Ignore the error type for synthetic exceptions as it can vary by platform and doesn't
+            # actually carry any meaning with respect to what went wrong. (Synthetic exceptions
+            # are dummy excepttions created by the SDK in order to harvest a stacktrace.)
             type_component.update(contributes=False, hint="ignored because exception is synthetic")
             system_type_component.update(
                 contributes=False, hint="ignored because exception is synthetic"
@@ -549,7 +543,7 @@ def single_exception(
             )
     else:
         stacktrace_components_by_variant = {
-            "app": StacktraceGroupingComponent(),
+            "!app": StacktraceGroupingComponent(),
         }
 
     exception_components_by_variant = {}
@@ -615,7 +609,7 @@ def chained_exception(
     # Get all the exceptions to consider.
     all_exceptions = interface.exceptions()
 
-    # Get the grouping components for all exceptions up front, as we'll need them in a few places and only want to compute them once.
+    # For each exception, create a dictionary of grouping components by variant name
     exception_components_by_exception = {
         id(exception): context.get_grouping_components_by_variant(exception, event=event, **meta)
         for exception in all_exceptions
@@ -638,12 +632,16 @@ def chained_exception(
     if main_exception_id:
         event.data["main_exception_id"] = main_exception_id
 
-    # Case 1: we have a single exception, use the single exception
-    # component directly to avoid a level of nesting
+    # Cases 1 and 2: Either this never was a chained exception (this is our entry point for single
+    # exceptions, too), or this is a chained exception consisting solely of an exception group and a
+    # single inner exception. In the former case, all we have is the single exception component, so
+    # return it. In the latter case, the there's no value-add to the wrapper, so discard it and just
+    # return the component for the inner exception.
     if len(exceptions) == 1:
         return exception_components_by_exception[id(exceptions[0])]
 
-    # Case 2: produce a component for each chained exception
+    # Case 3: This is either a chained exception or an exception group containing at least two inner
+    # exceptions. Either way, we need to wrap our exception components in a chained exception component.
     exception_components_by_variant: dict[str, list[ExceptionGroupingComponent]] = {}
 
     for exception in exceptions:
@@ -670,7 +668,7 @@ def chained_exception(
 # See https://github.com/getsentry/rfcs/blob/main/text/0079-exception-groups.md#sentry-issue-grouping
 def filter_exceptions_for_exception_groups(
     exceptions: list[SingleException],
-    exception_components: dict[int, ReturnedVariants],
+    exception_components: dict[int, dict[str, ExceptionGroupingComponent]],
     event: Event,
 ) -> list[SingleException]:
     # This function only filters exceptions if there are at least two exceptions.
@@ -710,8 +708,8 @@ def get_child_exceptions(exception: SingleException) -> list[SingleException]:
         node = exception_tree.get(exception_id)
         return node.children if node else []
 
-    # This recursive generator gets the "top-level exceptions", and is used below.
-    # "Top-level exceptions are those that are the first descendants of the root that are not exception groups.
+    # This recursive generator gets the "top-level exceptions," and is used below.
+    # Top-level exceptions are those that are the first descendants of the root that are not exception groups.
     # For examples, see https://github.com/getsentry/rfcs/blob/main/text/0079-exception-groups.md#sentry-issue-grouping
     def get_top_level_exceptions(
         exception: SingleException,
@@ -753,8 +751,8 @@ def get_first_path(exception: SingleException) -> Generator[SingleException]:
     # If there's only one distinct top-level exception in the group,
     # use it and its first-path children, but throw out the exception group and any copies.
     # For example, Group<['Da', 'Da', 'Da']> should just be treated as a single 'Da'.
-    # We'll also set the main_exception_id, which is used in the extract_metadata function
-    # in src/sentry/eventtypes/error.py - which will ensure the issue is titled by this
+    # We'll also set `main_exception_id`, which is used in the `extract_metadata` function
+    # in `src/sentry/eventtypes/error.py`, in order to ensure the issue is titled by this
     # item rather than the exception group.
     if len(distinct_top_level_exceptions) == 1:
         main_exception = distinct_top_level_exceptions[0]
@@ -826,7 +824,7 @@ def _filtered_threads(
         stacktrace, event=event, **meta
     ).items():
         thread_components_by_variant[variant_name] = ThreadsGroupingComponent(
-            values=[stacktrace_component]
+            values=[stacktrace_component], frame_counts=stacktrace_component.frame_counts
         )
 
     return thread_components_by_variant
diff --git a/src/sentry/grouping/strategies/utils.py b/src/sentry/grouping/strategies/utils.py
index 68d12d6a4101cc..0aace20dbdf108 100644
--- a/src/sentry/grouping/strategies/utils.py
+++ b/src/sentry/grouping/strategies/utils.py
@@ -12,8 +12,8 @@ def remove_non_stacktrace_variants(variants: ReturnedVariants) -> ReturnedVarian
     non_contributing_components = []
     stacktrace_variants = set()
 
-    # In case any of the variants has a contributing stacktrace, we want
-    # to make all other variants non contributing.
+    # If at least one variant has a contributing stacktrace, we want to mark all variants without a
+    # stacktrace as non-contributing.
     for variant_name, component in variants.items():
         stacktrace_iter = component.iter_subcomponents(
             id="stacktrace", recursive=True, only_contributing=True
diff --git a/src/sentry/grouping/utils.py b/src/sentry/grouping/utils.py
index f94a6fe16399a4..b5952f68a828c0 100644
--- a/src/sentry/grouping/utils.py
+++ b/src/sentry/grouping/utils.py
@@ -1,32 +1,65 @@
+from __future__ import annotations
+
 import re
+from collections.abc import Iterable, Mapping
 from hashlib import md5
+from re import Match
+from typing import TYPE_CHECKING, Any, Literal
+from uuid import UUID
 
 from django.utils.encoding import force_bytes
 
+from sentry.db.models.fields.node import NodeData
 from sentry.stacktraces.processing import get_crash_frame_from_event_data
 from sentry.utils.safe import get_path
 
+if TYPE_CHECKING:
+    from sentry.grouping.component import ExceptionGroupingComponent
+
+
 _fingerprint_var_re = re.compile(r"\{\{\s*(\S+)\s*\}\}")
 
 
-def parse_fingerprint_var(value):
+def parse_fingerprint_var(value: str) -> str | None:
     match = _fingerprint_var_re.match(value)
     if match is not None and match.end() == len(value):
         return match.group(1)
+    return None
 
 
-def is_default_fingerprint_var(value):
+def is_default_fingerprint_var(value: str) -> bool:
     return parse_fingerprint_var(value) == "default"
 
 
-def hash_from_values(values):
+def hash_from_values(values: Iterable[str | int | UUID | ExceptionGroupingComponent]) -> str:
+    """
+    Primarily used at the end of the grouping process, to get a final hash value once the all of the
+    variants have been constructed, but also used as a hack to compare exception components (by
+    stringifying their reprs) when calculating variants for chained exceptions.
+    """
     result = md5()
     for value in values:
         result.update(force_bytes(value, errors="replace"))
     return result.hexdigest()
 
 
-def bool_from_string(value):
+def get_fingerprint_type(fingerprint: list[str]) -> Literal["default", "hybrid", "custom"]:
+    return (
+        "default"
+        if len(fingerprint) == 1 and is_default_fingerprint_var(fingerprint[0])
+        else (
+            "hybrid"
+            if any(is_default_fingerprint_var(entry) for entry in fingerprint)
+            else "custom"
+        )
+    )
+
+
+def bool_from_string(value: str) -> bool | None:
+    """
+    Convert various string representations of boolean values ("1", "yes", "true", "0", "no",
+    "false") into actual booleans. Return `None` for all other inputs.
+    """
     if value:
         value = value.lower()
         if value in ("1", "yes", "true"):
@@ -34,8 +67,10 @@ def bool_from_string(value):
         elif value in ("0", "no", "false"):
             return False
 
+    return None
+
 
-def get_fingerprint_value(var, data):
+def get_fingerprint_value(var: str, data: NodeData | Mapping[str, Any]) -> str | None:
     if var == "transaction":
         return data.get("transaction") or "<no-transaction>"
     elif var == "message":
@@ -78,15 +113,18 @@ def get_fingerprint_value(var, data):
     elif var == "logger":
         return data.get("logger") or "<no-logger>"
     elif var.startswith("tags."):
+        # Turn "tags.some_tag" into just "some_tag"
         tag = var[5:]
         for t, value in data.get("tags") or ():
             if t == tag:
                 return value
         return "<no-value-for-tag-%s>" % tag
+    else:
+        return None
 
 
-def resolve_fingerprint_values(values, event_data):
-    def _get_fingerprint_value(value):
+def resolve_fingerprint_values(values: list[str], event_data: NodeData) -> list[str]:
+    def _get_fingerprint_value(value: str) -> str:
         var = parse_fingerprint_var(value)
         if var is None:
             return value
@@ -98,8 +136,8 @@ def _get_fingerprint_value(value):
     return [_get_fingerprint_value(x) for x in values]
 
 
-def expand_title_template(template, event_data):
-    def _handle_match(match):
+def expand_title_template(template: str, event_data: Mapping[str, Any]) -> str:
+    def _handle_match(match: Match[str]) -> str:
         var = match.group(1)
         rv = get_fingerprint_value(var, event_data)
         if rv is not None:
diff --git a/src/sentry/grouping/variants.py b/src/sentry/grouping/variants.py
index 9be16481967921..f25322e66ade9b 100644
--- a/src/sentry/grouping/variants.py
+++ b/src/sentry/grouping/variants.py
@@ -1,10 +1,12 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
-from typing import TYPE_CHECKING, NotRequired, TypedDict
+from collections.abc import Mapping
+from typing import TYPE_CHECKING, Any, NotRequired, Self, TypedDict
 
 from sentry.grouping.component import (
     AppGroupingComponent,
+    ContributingComponent,
     DefaultGroupingComponent,
     SystemGroupingComponent,
 )
@@ -24,8 +26,11 @@ class FingerprintVariantMetadata(TypedDict):
 
 
 class BaseVariant(ABC):
-    # This is true if `get_hash` does not return `None`.
-    contributes = True
+    variant_name: str | None = None
+
+    @property
+    def contributes(self) -> bool:
+        return True
 
     @property
     @abstractmethod
@@ -35,18 +40,20 @@ def get_hash(self) -> str | None:
         return None
 
     @property
-    def description(self):
+    def description(self) -> str:
         return self.type
 
-    def _get_metadata_as_dict(self):
+    # This has to return `Mapping` rather than `dict` so that subtypes can override the return value
+    # with a TypedDict if they choose. See https://github.com/python/mypy/issues/4976.
+    def _get_metadata_as_dict(self) -> Mapping[str, Any]:
         return {}
 
-    def as_dict(self):
+    def as_dict(self) -> dict[str, Any]:
         rv = {"type": self.type, "description": self.description, "hash": self.get_hash()}
         rv.update(self._get_metadata_as_dict())
         return rv
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return f"<{self.__class__.__name__} {self.get_hash()!r} ({self.type})>"
 
     def __eq__(self, other: object) -> bool:
@@ -70,7 +77,7 @@ def __init__(self, checksum: str):
     def get_hash(self) -> str | None:
         return self.checksum
 
-    def _get_metadata_as_dict(self):
+    def _get_metadata_as_dict(self) -> Mapping[str, str]:
         return {"checksum": self.checksum}
 
 
@@ -82,7 +89,7 @@ def __init__(self, checksum: str, raw_checksum: str):
         self.checksum = checksum
         self.raw_checksum = raw_checksum
 
-    def _get_metadata_as_dict(self):
+    def _get_metadata_as_dict(self) -> Mapping[str, str]:
         return {"checksum": self.checksum, "raw_checksum": self.raw_checksum}
 
 
@@ -109,14 +116,14 @@ class PerformanceProblemVariant(BaseVariant):
     description = "performance problem"
     contributes = True
 
-    def __init__(self, event_performance_problem):
+    def __init__(self, event_performance_problem: Any):
         self.event_performance_problem = event_performance_problem
         self.problem = event_performance_problem.problem
 
     def get_hash(self) -> str | None:
         return self.problem.fingerprint
 
-    def _get_metadata_as_dict(self):
+    def _get_metadata_as_dict(self) -> Mapping[str, Any]:
         problem_data = self.problem.to_dict()
         evidence_hashes = self.event_performance_problem.evidence_hashes
 
@@ -124,35 +131,40 @@ def _get_metadata_as_dict(self):
 
 
 class ComponentVariant(BaseVariant):
-    """A component variant is a variant that produces a hash from the
-    `BaseGroupingComponent` it encloses.
-    """
+    """A variant that produces a hash from the `BaseGroupingComponent` it encloses."""
 
     type = "component"
 
     def __init__(
         self,
+        # The root of the component tree
         component: AppGroupingComponent | SystemGroupingComponent | DefaultGroupingComponent,
+        # The highest non-root contributing component in the tree, representing the overall grouping
+        # method (exception, threads, message, etc.). For non-contributing variants, this will be
+        # None.
+        contributing_component: ContributingComponent | None,
         strategy_config: StrategyConfiguration,
     ):
         self.component = component
         self.config = strategy_config
+        self.contributing_component = contributing_component
+        self.variant_name = self.component.id  # "app", "system", or "default"
 
     @property
-    def description(self):
+    def description(self) -> str:
         return self.component.description
 
     @property
-    def contributes(self):
+    def contributes(self) -> bool:
         return self.component.contributes
 
     def get_hash(self) -> str | None:
         return self.component.get_hash()
 
-    def _get_metadata_as_dict(self):
+    def _get_metadata_as_dict(self) -> Mapping[str, Any]:
         return {"component": self.component.as_dict(), "config": self.config.as_dict()}
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return super().__repr__() + f" contributes={self.contributes} ({self.description})"
 
 
@@ -190,7 +202,7 @@ def __init__(self, fingerprint: list[str], fingerprint_info: FingerprintInfo):
         self.info = fingerprint_info
 
     @property
-    def description(self):
+    def description(self) -> str:
         return "custom fingerprint"
 
     def get_hash(self) -> str | None:
@@ -201,12 +213,12 @@ def _get_metadata_as_dict(self) -> FingerprintVariantMetadata:
 
 
 class BuiltInFingerprintVariant(CustomFingerprintVariant):
-    """A built-in, Sentry defined fingerprint."""
+    """A built-in, Sentry-defined fingerprint."""
 
     type = "built_in_fingerprint"
 
     @property
-    def description(self):
+    def description(self) -> str:
         return "Sentry defined fingerprint"
 
 
@@ -215,19 +227,39 @@ class SaltedComponentVariant(ComponentVariant):
 
     type = "salted_component"
 
+    @classmethod
+    def from_component_variant(
+        cls,
+        component_variant: ComponentVariant,
+        fingerprint: list[str],
+        fingerprint_info: FingerprintInfo,
+    ) -> Self:
+        return cls(
+            fingerprint=fingerprint,
+            component=component_variant.component,
+            contributing_component=component_variant.contributing_component,
+            strategy_config=component_variant.config,
+            fingerprint_info=fingerprint_info,
+        )
+
     def __init__(
         self,
         fingerprint: list[str],
+        # The root of the component tree
         component: AppGroupingComponent | SystemGroupingComponent | DefaultGroupingComponent,
+        # The highest non-root contributing component in the tree, representing the overall grouping
+        # method (exception, threads, message, etc.). For non-contributing variants, this will be
+        # None.
+        contributing_component: ContributingComponent | None,
         strategy_config: StrategyConfiguration,
         fingerprint_info: FingerprintInfo,
     ):
-        ComponentVariant.__init__(self, component, strategy_config)
+        ComponentVariant.__init__(self, component, contributing_component, strategy_config)
         self.values = fingerprint
         self.info = fingerprint_info
 
     @property
-    def description(self):
+    def description(self) -> str:
         return "modified " + self.component.description
 
     def get_hash(self) -> str | None:
@@ -235,16 +267,19 @@ def get_hash(self) -> str | None:
             return None
         final_values: list[str | int] = []
         for value in self.values:
+            # If we've hit the `{{ default }}` part of the fingerprint, pull in values from the
+            # original grouping method (message, stacktrace, etc.)
             if is_default_fingerprint_var(value):
                 final_values.extend(self.component.iter_values())
             else:
                 final_values.append(value)
         return hash_from_values(final_values)
 
-    def _get_metadata_as_dict(self):
-        rv = ComponentVariant._get_metadata_as_dict(self)
-        rv.update(expose_fingerprint_dict(self.values, self.info))
-        return rv
+    def _get_metadata_as_dict(self) -> Mapping[str, Any]:
+        return {
+            **ComponentVariant._get_metadata_as_dict(self),
+            **expose_fingerprint_dict(self.values, self.info),
+        }
 
 
 class VariantsByDescriptor(TypedDict, total=False):
diff --git a/src/sentry/hybridcloud/models/apikeyreplica.py b/src/sentry/hybridcloud/models/apikeyreplica.py
index a13a967f492918..7538aae8ad5a54 100644
--- a/src/sentry/hybridcloud/models/apikeyreplica.py
+++ b/src/sentry/hybridcloud/models/apikeyreplica.py
@@ -35,6 +35,9 @@ class Meta:
 
     __repr__ = sane_repr("organization_id", "key")
 
+    def __str__(self) -> str:
+        return f"replica_id={self.id}, status={self.status}"
+
     @property
     def entity_id(self) -> int:
         return self.apikey_id
diff --git a/src/sentry/hybridcloud/models/apitokenreplica.py b/src/sentry/hybridcloud/models/apitokenreplica.py
index d9ee2be13040dc..c9f4402379f536 100644
--- a/src/sentry/hybridcloud/models/apitokenreplica.py
+++ b/src/sentry/hybridcloud/models/apitokenreplica.py
@@ -39,7 +39,7 @@ class Meta:
     __repr__ = sane_repr("user_id", "token", "application_id")
 
     def __str__(self) -> str:
-        return force_str(self.token)
+        return f"replica_token_id={self.id}, token_id={force_str(self.apitoken_id)}"
 
     @property
     def entity_id(self) -> int:
diff --git a/src/sentry/incidents/endpoints/validators.py b/src/sentry/incidents/endpoints/validators.py
index 382484a21e361c..de938853f8b568 100644
--- a/src/sentry/incidents/endpoints/validators.py
+++ b/src/sentry/incidents/endpoints/validators.py
@@ -89,7 +89,6 @@ class MetricAlertComparisonConditionValidator(NumericComparisonConditionValidato
 
     supported_conditions = frozenset((Condition.GREATER, Condition.LESS))
     supported_results = frozenset((DetectorPriorityLevel.HIGH, DetectorPriorityLevel.MEDIUM))
-    type = "metric_alert"
 
 
 class MetricAlertsDetectorValidator(BaseGroupTypeDetectorValidator):
diff --git a/src/sentry/incidents/grouptype.py b/src/sentry/incidents/grouptype.py
index b7078c7c2f7a40..1d0873ddb8588c 100644
--- a/src/sentry/incidents/grouptype.py
+++ b/src/sentry/incidents/grouptype.py
@@ -1,15 +1,68 @@
+from __future__ import annotations
+
 from dataclasses import dataclass
+from datetime import UTC, datetime
+from typing import Any
+from uuid import uuid4
 
+from sentry import features
 from sentry.incidents.endpoints.validators import MetricAlertsDetectorValidator
 from sentry.incidents.utils.types import QuerySubscriptionUpdate
 from sentry.issues.grouptype import GroupCategory, GroupType
+from sentry.issues.issue_occurrence import IssueOccurrence
+from sentry.models.organization import Organization
 from sentry.ratelimits.sliding_windows import Quota
 from sentry.types.group import PriorityLevel
 from sentry.workflow_engine.handlers.detector import StatefulDetectorHandler
+from sentry.workflow_engine.models.data_source import DataPacket
+from sentry.workflow_engine.types import DetectorGroupKey
 
 
 class MetricAlertDetectorHandler(StatefulDetectorHandler[QuerySubscriptionUpdate]):
-    pass
+    def build_occurrence_and_event_data(
+        self, group_key: DetectorGroupKey, value: int, new_status: PriorityLevel
+    ) -> tuple[IssueOccurrence, dict[str, Any]]:
+        # Returning a placeholder for now, this may require us passing more info
+
+        occurrence = IssueOccurrence(
+            id=str(uuid4()),
+            project_id=self.detector.project_id,
+            event_id=str(uuid4()),
+            fingerprint=self.build_fingerprint(group_key),
+            issue_title="Some Issue",
+            subtitle="Some subtitle",
+            resource_id=None,
+            evidence_data={"detector_id": self.detector.id, "value": value},
+            evidence_display=[],
+            type=MetricAlertFire,
+            detection_time=datetime.now(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
+
+    @property
+    def counter_names(self) -> list[str]:
+        # Placeholder for now, this should be a list of counters that we want to update as we go above warning / critical
+        return []
+
+    def get_dedupe_value(self, data_packet: DataPacket[QuerySubscriptionUpdate]) -> int:
+        return int(data_packet.packet.get("timestamp", datetime.now(UTC)).timestamp())
+
+    def get_group_key_values(
+        self, data_packet: DataPacket[QuerySubscriptionUpdate]
+    ) -> dict[DetectorGroupKey, int]:
+        # This is for testing purposes, we'll need to update the values inspected.
+        return {None: data_packet.packet["values"]["foo"]}
 
 
 # Example GroupType and detector handler for metric alerts. We don't create these issues yet, but we'll use something
@@ -26,3 +79,8 @@ class MetricAlertFire(GroupType):
     enable_escalation_detection = False
     detector_handler = MetricAlertDetectorHandler
     detector_validator = MetricAlertsDetectorValidator
+    detector_config_schema = {}  # TODO(colleen): update this
+
+    @classmethod
+    def allow_post_process_group(cls, organization: Organization) -> bool:
+        return features.has("organizations:workflow-engine-metric-alert-processing", organization)
diff --git a/src/sentry/incidents/subscription_processor.py b/src/sentry/incidents/subscription_processor.py
index 4654948204437a..88953fd133def5 100644
--- a/src/sentry/incidents/subscription_processor.py
+++ b/src/sentry/incidents/subscription_processor.py
@@ -43,8 +43,16 @@
 )
 from sentry.incidents.tasks import handle_trigger_action
 from sentry.incidents.utils.metric_issue_poc import create_or_update_metric_issue
-from sentry.incidents.utils.types import QuerySubscriptionUpdate
+from sentry.incidents.utils.process_update_helpers import (
+    get_aggregation_value_helper,
+    get_crash_rate_alert_metrics_aggregation_value_helper,
+)
+from sentry.incidents.utils.types import (
+    DATA_SOURCE_SNUBA_QUERY_SUBSCRIPTION,
+    QuerySubscriptionUpdate,
+)
 from sentry.models.project import Project
+from sentry.search.eap.utils import add_start_end_conditions
 from sentry.seer.anomaly_detection.get_anomaly_data import get_anomaly_data_from_seer
 from sentry.seer.anomaly_detection.utils import anomaly_has_confidence, has_anomaly
 from sentry.snuba.dataset import Dataset
@@ -53,10 +61,12 @@
     get_entity_key_from_query_builder,
     get_entity_subscription_from_snuba_query,
 )
-from sentry.snuba.models import QuerySubscription
+from sentry.snuba.models import QuerySubscription, SnubaQuery
 from sentry.snuba.subscriptions import delete_snuba_subscription
-from sentry.utils import metrics, redis
+from sentry.utils import metrics, redis, snuba_rpc
 from sentry.utils.dates import to_datetime
+from sentry.workflow_engine.models import DataPacket
+from sentry.workflow_engine.processors.data_packet import process_data_packets
 
 logger = logging.getLogger(__name__)
 REDIS_TTL = int(timedelta(days=7).total_seconds())
@@ -221,41 +231,80 @@ def get_comparison_aggregation_value(
             snuba_query,
             self.subscription.project.organization_id,
         )
-        try:
-            project_ids = [self.subscription.project_id]
-            # TODO: determine whether we need to include the subscription query_extra here
-            query_builder = entity_subscription.build_query_builder(
-                query=snuba_query.query,
-                project_ids=project_ids,
-                environment=snuba_query.environment,
-                params={
-                    "organization_id": self.subscription.project.organization.id,
-                    "project_id": project_ids,
-                    "start": start,
-                    "end": end,
-                },
-            )
-            time_col = ENTITY_TIME_COLUMNS[get_entity_key_from_query_builder(query_builder)]
-            query_builder.add_conditions(
-                [
-                    Condition(Column(time_col), Op.GTE, start),
-                    Condition(Column(time_col), Op.LT, end),
-                ]
-            )
-            query_builder.limit = Limit(1)
-            results = query_builder.run_query(referrer="subscription_processor.comparison_query")
-            comparison_aggregate = list(results["data"][0].values())[0]
+        dataset = Dataset(snuba_query.dataset)
+        query_type = SnubaQuery.Type(snuba_query.type)
+        project_ids = [self.subscription.project_id]
+
+        comparison_aggregate: None | float = None
+        if query_type == SnubaQuery.Type.PERFORMANCE and dataset == Dataset.EventsAnalyticsPlatform:
+            try:
+                rpc_time_series_request = entity_subscription.build_rpc_request(
+                    query=snuba_query.query,
+                    project_ids=project_ids,
+                    environment=snuba_query.environment,
+                    params={
+                        "organization_id": self.subscription.project.organization.id,
+                        "project_id": project_ids,
+                    },
+                    referrer="subscription_processor.comparison_query",
+                )
 
-        except Exception:
-            logger.exception(
-                "Failed to run comparison query",
-                extra={
-                    "alert_rule_id": self.alert_rule.id,
-                    "subscription_id": subscription_update.get("subscription_id"),
-                    "organization_id": self.alert_rule.organization_id,
-                },
-            )
-            return None
+                rpc_time_series_request = add_start_end_conditions(
+                    rpc_time_series_request, start, end
+                )
+
+                rpc_response = snuba_rpc.timeseries_rpc(rpc_time_series_request)
+                if len(rpc_response.result_timeseries):
+                    comparison_aggregate = rpc_response.result_timeseries[0].data_points[0].data
+
+            except Exception:
+                logger.exception(
+                    "Failed to run RPC comparison query",
+                    extra={
+                        "alert_rule_id": self.alert_rule.id,
+                        "subscription_id": subscription_update.get("subscription_id"),
+                        "organization_id": self.alert_rule.organization_id,
+                    },
+                )
+                return None
+
+        else:
+            try:
+                # TODO: determine whether we need to include the subscription query_extra here
+                query_builder = entity_subscription.build_query_builder(
+                    query=snuba_query.query,
+                    project_ids=project_ids,
+                    environment=snuba_query.environment,
+                    params={
+                        "organization_id": self.subscription.project.organization.id,
+                        "project_id": project_ids,
+                        "start": start,
+                        "end": end,
+                    },
+                )
+                time_col = ENTITY_TIME_COLUMNS[get_entity_key_from_query_builder(query_builder)]
+                query_builder.add_conditions(
+                    [
+                        Condition(Column(time_col), Op.GTE, start),
+                        Condition(Column(time_col), Op.LT, end),
+                    ]
+                )
+                query_builder.limit = Limit(1)
+                results = query_builder.run_query(
+                    referrer="subscription_processor.comparison_query"
+                )
+                comparison_aggregate = list(results["data"][0].values())[0]
+
+            except Exception:
+                logger.exception(
+                    "Failed to run comparison query",
+                    extra={
+                        "alert_rule_id": self.alert_rule.id,
+                        "subscription_id": subscription_update.get("subscription_id"),
+                        "organization_id": self.alert_rule.organization_id,
+                    },
+                )
+                return None
 
         if not comparison_aggregate:
             metrics.incr("incidents.alert_rules.skipping_update_comparison_value_invalid")
@@ -282,24 +331,12 @@ def get_crash_rate_alert_metrics_aggregation_value(
         count is just ignored
         - `crashed` represents the total sessions or user counts that crashed.
         """
-        row = subscription_update["values"]["data"][0]
-        total_session_count = row.get("count", 0)
-        crash_count = row.get("crashed", 0)
-
-        if total_session_count == 0:
+        # NOTE (mifu67): we create this helper because we also use it in the new detector processing flow
+        aggregation_value = get_crash_rate_alert_metrics_aggregation_value_helper(
+            subscription_update
+        )
+        if aggregation_value is None:
             self.reset_trigger_counts()
-            metrics.incr("incidents.alert_rules.ignore_update_no_session_data")
-            return None
-
-        if CRASH_RATE_ALERT_MINIMUM_THRESHOLD is not None:
-            min_threshold = int(CRASH_RATE_ALERT_MINIMUM_THRESHOLD)
-            if total_session_count < min_threshold:
-                self.reset_trigger_counts()
-                metrics.incr("incidents.alert_rules.ignore_update_count_lower_than_min_threshold")
-                return None
-
-        aggregation_value: int = round((1 - crash_count / total_session_count) * 100, 3)
-
         return aggregation_value
 
     def get_aggregation_value(self, subscription_update: QuerySubscriptionUpdate) -> float | None:
@@ -308,14 +345,8 @@ def get_aggregation_value(self, subscription_update: QuerySubscriptionUpdate) ->
                 subscription_update
             )
         else:
-            aggregation_value = list(subscription_update["values"]["data"][0].values())[0]
-            # In some cases Snuba can return a None value for an aggregation. This means
-            # there were no rows present when we made the query for certain types of aggregations
-            # like avg. Defaulting this to 0 for now. It might turn out that we'd prefer to skip
-            # the update in the future.
-            if aggregation_value is None:
-                aggregation_value = 0
-
+            # NOTE (mifu67): we create this helper because we also use it in the new detector processing flow
+            aggregation_value = get_aggregation_value_helper(subscription_update)
             if self.alert_rule.comparison_delta:
                 aggregation_value = self.get_comparison_aggregation_value(
                     subscription_update, aggregation_value
@@ -358,6 +389,15 @@ def process_update(self, subscription_update: QuerySubscriptionUpdate) -> None:
             metrics.incr("incidents.alert_rules.skipping_already_processed_update")
             return
 
+        if features.has(
+            "organizations:workflow-engine-metric-alert-processing",
+            self.subscription.project.organization,
+        ):
+            data_packet = DataPacket[QuerySubscriptionUpdate](
+                query_id=self.subscription.id, packet=subscription_update
+            )
+            process_data_packets([data_packet], DATA_SOURCE_SNUBA_QUERY_SUBSCRIPTION)
+
         self.last_update = subscription_update["timestamp"]
 
         if (
diff --git a/src/sentry/incidents/utils/process_update_helpers.py b/src/sentry/incidents/utils/process_update_helpers.py
new file mode 100644
index 00000000000000..74b6526eb5218e
--- /dev/null
+++ b/src/sentry/incidents/utils/process_update_helpers.py
@@ -0,0 +1,60 @@
+from sentry.incidents.utils.types import QuerySubscriptionUpdate
+from sentry.utils import metrics
+
+"""
+We pull these methods out of the subscription processor to be used by the
+workflow engine data condition handlers.
+"""
+
+# NOTE (mifu67): this is set to None in the subscription processor code and doesn't
+# seem to be used. Maybe we don't need the logic gated by it?
+CRASH_RATE_ALERT_MINIMUM_THRESHOLD: int | None = None
+
+
+def get_crash_rate_alert_metrics_aggregation_value_helper(
+    subscription_update: QuerySubscriptionUpdate,
+) -> float | None:
+    """
+    Handles validation and extraction of Crash Rate Alerts subscription updates values over
+    metrics dataset.
+    The subscription update looks like
+    [
+        {'project_id': 8, 'tags[5]': 6, 'count': 2.0, 'crashed': 1.0}
+    ]
+    - `count` represents sessions or users sessions that were started, hence to get the crash
+    free percentage, we would need to divide number of crashed sessions by that number,
+    and subtract that value from 1. This is also used when CRASH_RATE_ALERT_MINIMUM_THRESHOLD is
+    set in the sense that if the minimum threshold is greater than the session count,
+    then the update is dropped. If the minimum threshold is not set then the total sessions
+    count is just ignored
+    - `crashed` represents the total sessions or user counts that crashed.
+    """
+    row = subscription_update["values"]["data"][0]
+    total_session_count = row.get("count", 0)
+    crash_count = row.get("crashed", 0)
+
+    if total_session_count == 0:
+        metrics.incr("incidents.alert_rules.ignore_update_no_session_data")
+        return None
+
+    if CRASH_RATE_ALERT_MINIMUM_THRESHOLD is not None:
+        min_threshold = int(CRASH_RATE_ALERT_MINIMUM_THRESHOLD)
+        if total_session_count < min_threshold:
+            metrics.incr("incidents.alert_rules.ignore_update_count_lower_than_min_threshold")
+            return None
+
+    aggregation_value: int = round((1 - crash_count / total_session_count) * 100, 3)
+
+    return aggregation_value
+
+
+def get_aggregation_value_helper(subscription_update: QuerySubscriptionUpdate) -> float:
+    aggregation_value = list(subscription_update["values"]["data"][0].values())[0]
+    # In some cases Snuba can return a None value for an aggregation. This means
+    # there were no rows present when we made the query for certain types of aggregations
+    # like avg. Defaulting this to 0 for now. It might turn out that we'd prefer to skip
+    # the update in the future.
+    if aggregation_value is None:
+        aggregation_value = 0
+
+    return aggregation_value
diff --git a/src/sentry/incidents/utils/types.py b/src/sentry/incidents/utils/types.py
index 4be43160dc8a73..572598108b39e5 100644
--- a/src/sentry/incidents/utils/types.py
+++ b/src/sentry/incidents/utils/types.py
@@ -13,3 +13,6 @@ class QuerySubscriptionUpdate(TypedDict):
 class AlertRuleActivationConditionType(Enum):
     RELEASE_CREATION = 0
     DEPLOY_CREATION = 1
+
+
+DATA_SOURCE_SNUBA_QUERY_SUBSCRIPTION = "snuba_query_subscription"
diff --git a/src/sentry/ingest/billing_metrics_consumer.py b/src/sentry/ingest/billing_metrics_consumer.py
index 471855aa356f6d..8009d57a6cdf9e 100644
--- a/src/sentry/ingest/billing_metrics_consumer.py
+++ b/src/sentry/ingest/billing_metrics_consumer.py
@@ -16,13 +16,7 @@
 
 from sentry.constants import DataCategory
 from sentry.models.project import Project
-from sentry.sentry_metrics.indexer.strings import (
-    SHARED_TAG_STRINGS,
-    SPAN_METRICS_NAMES,
-    TRANSACTION_METRICS_NAMES,
-)
-from sentry.sentry_metrics.use_case_id_registry import UseCaseID
-from sentry.sentry_metrics.utils import reverse_resolve_tag_value
+from sentry.sentry_metrics.indexer.strings import SPAN_METRICS_NAMES, TRANSACTION_METRICS_NAMES
 from sentry.signals import first_custom_metric_received
 from sentry.snuba.metrics import parse_mri
 from sentry.snuba.metrics.naming_layer.mri import is_custom_metric
@@ -48,9 +42,11 @@ def create_with_partitions(
 
 
 class BillingTxCountMetricConsumerStrategy(ProcessingStrategy[KafkaPayload]):
-    """A metrics consumer that generates a billing outcome for each processed
-    transaction, processing a bucket at a time. The transaction count is
-    directly taken from the `c:transactions/usage@none` counter metric.
+    """A metrics consumer that generates an accepted outcome for each processed (as opposed to indexed)
+    transaction or span, processing a bucket at a time. The transaction / span count is
+    directly taken from the `c:transactions/usage@none` or `c:spans/usage@none` counter metric.
+
+    See https://develop.sentry.dev/application-architecture/dynamic-sampling/outcomes/.
     """
 
     #: The IDs of the metrics used to count transactions or spans
@@ -58,7 +54,6 @@ class BillingTxCountMetricConsumerStrategy(ProcessingStrategy[KafkaPayload]):
         TRANSACTION_METRICS_NAMES["c:transactions/usage@none"]: DataCategory.TRANSACTION,
         SPAN_METRICS_NAMES["c:spans/usage@none"]: DataCategory.SPAN,
     }
-    profile_tag_key = str(SHARED_TAG_STRINGS["has_profile"])
 
     def __init__(self, next_step: ProcessingStrategy[Any]) -> None:
         self.__next_step = next_step
@@ -79,7 +74,7 @@ def submit(self, message: Message[KafkaPayload]) -> None:
 
         payload = self._get_payload(message)
 
-        self._produce_billing_outcomes(payload)
+        self._produce_outcomes(payload)
         self._flag_metric_received_for_project(payload)
 
         self.__next_step.submit(message)
@@ -106,25 +101,16 @@ def _count_processed_items(self, generic_metric: GenericMetric) -> Mapping[DataC
 
         return items
 
-    def _has_profile(self, generic_metric: GenericMetric) -> bool:
-        return bool(
-            (tag_value := generic_metric["tags"].get(self.profile_tag_key))
-            and "true"
-            == reverse_resolve_tag_value(
-                UseCaseID.TRANSACTIONS, generic_metric["org_id"], tag_value
-            )
-        )
-
-    def _produce_billing_outcomes(self, generic_metric: GenericMetric) -> None:
+    def _produce_outcomes(self, generic_metric: GenericMetric) -> None:
         for category, quantity in self._count_processed_items(generic_metric).items():
-            self._produce_billing_outcome(
+            self._produce_accepted_outcome(
                 org_id=generic_metric["org_id"],
                 project_id=generic_metric["project_id"],
                 category=category,
                 quantity=quantity,
             )
 
-    def _produce_billing_outcome(
+    def _produce_accepted_outcome(
         self, *, org_id: int, project_id: int, category: DataCategory, quantity: int
     ) -> None:
         if quantity < 1:
diff --git a/src/sentry/integrations/api/bases/doc_integrations.py b/src/sentry/integrations/api/bases/doc_integrations.py
index a6141fbe3f1285..c7349143d9ce6e 100644
--- a/src/sentry/integrations/api/bases/doc_integrations.py
+++ b/src/sentry/integrations/api/bases/doc_integrations.py
@@ -68,7 +68,7 @@ class DocIntegrationsBaseEndpoint(Endpoint):
     permission_classes = (DocIntegrationsAndStaffPermission,)
 
     def generate_incoming_metadata(self, request: Request) -> Any:
-        return {k: v for k, v in request.json_body.items() if k in METADATA_PROPERTIES}
+        return {k: v for k, v in request.data.items() if k in METADATA_PROPERTIES}
 
 
 class DocIntegrationBaseEndpoint(DocIntegrationsBaseEndpoint):
diff --git a/src/sentry/integrations/api/endpoints/doc_integration_details.py b/src/sentry/integrations/api/endpoints/doc_integration_details.py
index e6974c13876c38..6d93dbde58634f 100644
--- a/src/sentry/integrations/api/endpoints/doc_integration_details.py
+++ b/src/sentry/integrations/api/endpoints/doc_integration_details.py
@@ -31,7 +31,7 @@ def get(self, request: Request, doc_integration: DocIntegration) -> Response:
         return self.respond(serialize(doc_integration, request.user), status=status.HTTP_200_OK)
 
     def put(self, request: Request, doc_integration: DocIntegration) -> Response:
-        data = request.json_body
+        data = request.data
         data["metadata"] = self.generate_incoming_metadata(request)
 
         serializer = DocIntegrationSerializer(doc_integration, data=data)
diff --git a/src/sentry/integrations/api/endpoints/doc_integrations_index.py b/src/sentry/integrations/api/endpoints/doc_integrations_index.py
index 869079209a13c1..e392a8eba0f7c8 100644
--- a/src/sentry/integrations/api/endpoints/doc_integrations_index.py
+++ b/src/sentry/integrations/api/endpoints/doc_integrations_index.py
@@ -42,7 +42,7 @@ def get(self, request: Request):
 
     def post(self, request: Request):
         # Override any incoming JSON for these fields
-        data = request.json_body
+        data = request.data
         data["is_draft"] = True
         data["metadata"] = self.generate_incoming_metadata(request)
         serializer = DocIntegrationSerializer(data=data)
diff --git a/src/sentry/integrations/bitbucket/client.py b/src/sentry/integrations/bitbucket/client.py
index 897e309ab7b308..09fee5b8305870 100644
--- a/src/sentry/integrations/bitbucket/client.py
+++ b/src/sentry/integrations/bitbucket/client.py
@@ -89,9 +89,6 @@ def finalize_request(self, prepared_request: PreparedRequest) -> PreparedRequest
     def get_issue(self, repo, issue_id):
         return self.get(BitbucketAPIPath.issue.format(repo=repo, issue_id=issue_id))
 
-    def get_issues(self, repo):
-        return self.get(BitbucketAPIPath.issues.format(repo=repo))
-
     def create_issue(self, repo, data):
         return self.post(path=BitbucketAPIPath.issues.format(repo=repo), data=data)
 
diff --git a/src/sentry/integrations/bitbucket/webhook.py b/src/sentry/integrations/bitbucket/webhook.py
index 2460e7aca6c8c5..e03d4b632d38c9 100644
--- a/src/sentry/integrations/bitbucket/webhook.py
+++ b/src/sentry/integrations/bitbucket/webhook.py
@@ -1,6 +1,6 @@
 import ipaddress
 import logging
-from abc import ABC, abstractmethod
+from abc import ABC
 from collections.abc import Mapping
 from datetime import timezone
 from typing import Any
@@ -17,6 +17,7 @@
 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.source_code_management.webhook import SCMWebhook
 from sentry.integrations.utils.metrics import IntegrationWebhookEvent, IntegrationWebhookEventType
 from sentry.models.commit import Commit
 from sentry.models.commitauthor import CommitAuthor
@@ -30,17 +31,12 @@
 PROVIDER_NAME = "integrations:bitbucket"
 
 
-class Webhook(ABC):
+class BitbucketWebhook(SCMWebhook, ABC):
     @property
-    @abstractmethod
-    def event_type(self) -> IntegrationWebhookEventType:
-        raise NotImplementedError
-
-    @abstractmethod
-    def __call__(self, organization: Organization, event: Mapping[str, Any]):
-        raise NotImplementedError
+    def provider(self) -> str:
+        return "bitbucket"
 
-    def update_repo_data(self, repo, event):
+    def update_repo_data(self, repo: Repository, event: Mapping[str, Any]) -> None:
         """
         Given a webhook payload, update stored repo data if needed.
 
@@ -68,16 +64,19 @@ def update_repo_data(self, repo, event):
             )
 
 
-class PushEventWebhook(Webhook):
+class PushEventWebhook(BitbucketWebhook):
     # 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]):
+    def __call__(self, event: Mapping[str, Any], **kwargs) -> None:
         authors = {}
 
+        if not (organization := kwargs.get("organization")):
+            raise ValueError("Missing organization")
+
         try:
             repo = Repository.objects.get(
                 organization_id=organization.id,
@@ -131,9 +130,9 @@ class BitbucketWebhookEndpoint(Endpoint):
         "POST": ApiPublishStatus.PRIVATE,
     }
     permission_classes = ()
-    _handlers: dict[str, type[Webhook]] = {"repo:push": PushEventWebhook}
+    _handlers: dict[str, type[BitbucketWebhook]] = {"repo:push": PushEventWebhook}
 
-    def get_handler(self, event_type) -> type[Webhook] | None:
+    def get_handler(self, event_type) -> type[BitbucketWebhook] | None:
         return self._handlers.get(event_type)
 
     @method_decorator(csrf_exempt)
@@ -205,8 +204,8 @@ def post(self, request: HttpRequest, organization_id: int) -> HttpResponse:
         with IntegrationWebhookEvent(
             interaction_type=event_handler.event_type,
             domain=IntegrationDomain.SOURCE_CODE_MANAGEMENT,
-            provider_key="bitbucket",
+            provider_key=event_handler.provider,
         ).capture():
-            event_handler(organization, event)
+            event_handler(event, organization=organization)
 
         return HttpResponse(status=204)
diff --git a/src/sentry/integrations/bitbucket_server/webhook.py b/src/sentry/integrations/bitbucket_server/webhook.py
index f18c226c43a36d..0fdca807dd97a3 100644
--- a/src/sentry/integrations/bitbucket_server/webhook.py
+++ b/src/sentry/integrations/bitbucket_server/webhook.py
@@ -1,5 +1,5 @@
 import logging
-from abc import ABC, abstractmethod
+from abc import ABC
 from collections.abc import Mapping
 from datetime import datetime, timezone
 from typing import Any
@@ -7,14 +7,18 @@
 import orjson
 import sentry_sdk
 from django.db import IntegrityError, router, transaction
-from django.http import HttpRequest, HttpResponse
+from django.http import Http404, HttpRequest, HttpResponse
 from django.http.response import HttpResponseBase
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
-from django.views.generic.base import View
 
+from sentry.api.api_owners import ApiOwner
+from sentry.api.api_publish_status import ApiPublishStatus
+from sentry.api.base import Endpoint
+from sentry.api.exceptions import BadRequest
 from sentry.integrations.base import IntegrationDomain
 from sentry.integrations.models.integration import Integration
+from sentry.integrations.source_code_management.webhook import SCMWebhook
 from sentry.integrations.utils.metrics import IntegrationWebhookEvent, IntegrationWebhookEventType
 from sentry.models.commit import Commit
 from sentry.models.commitauthor import CommitAuthor
@@ -29,15 +33,10 @@
 PROVIDER_NAME = "integrations:bitbucket_server"
 
 
-class Webhook(ABC):
+class BitbucketServerWebhook(SCMWebhook, 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
+    def provider(self):
+        return "bitbucket_server"
 
     def update_repo_data(self, repo, event):
         """
@@ -49,16 +48,20 @@ def update_repo_data(self, repo, event):
             repo.update(name=name_from_event, config=dict(repo.config, name=name_from_event))
 
 
-class PushEventWebhook(Webhook):
+class PushEventWebhook(BitbucketServerWebhook):
     @property
     def event_type(self) -> IntegrationWebhookEventType:
         return IntegrationWebhookEventType.PUSH
 
-    def __call__(
-        self, organization: Organization, integration_id: int, event: Mapping[str, Any]
-    ) -> HttpResponse:
+    def __call__(self, event: Mapping[str, Any], **kwargs) -> None:
         authors = {}
 
+        if not (
+            (organization := kwargs.get("organization"))
+            and (integration_id := kwargs.get("integration_id"))
+        ):
+            raise ValueError("Organization and integration_id must be provided")
+
         try:
             repo = Repository.objects.get(
                 organization_id=organization.id,
@@ -66,18 +69,18 @@ def __call__(
                 external_id=str(event["repository"]["id"]),
             )
         except Repository.DoesNotExist:
-            return HttpResponse(status=404)
+            raise Http404()
 
         provider = repo.get_provider()
         try:
             installation = provider.get_installation(integration_id, organization.id)
         except Integration.DoesNotExist:
-            return HttpResponse(status=404)
+            raise Http404()
 
         try:
             client = installation.get_client()
         except IntegrationError:
-            return HttpResponse(status=400)
+            raise BadRequest()
 
         # while we're here, make sure repo data is up to date
         self.update_repo_data(repo, event)
@@ -91,12 +94,12 @@ def __call__(
                     project_name, repo_name, from_hash, change.get("toHash")
                 )
             except ApiHostError:
-                return HttpResponse(status=409)
+                raise BadRequest(detail="Unable to reach host")
             except ApiUnauthorized:
-                return HttpResponse(status=400)
+                raise BadRequest()
             except Exception as e:
                 sentry_sdk.capture_exception(e)
-                return HttpResponse(status=400)
+                raise
 
             for commit in commits:
                 if IntegrationRepositoryProvider.should_ignore_commit(commit["message"]):
@@ -131,14 +134,19 @@ def __call__(
                 except IntegrityError:
                     pass
 
-        return HttpResponse(status=204)
-
 
 @region_silo_view
-class BitbucketServerWebhookEndpoint(View):
-    _handlers: dict[str, type[Webhook]] = {"repo:refs_changed": PushEventWebhook}
+class BitbucketServerWebhookEndpoint(Endpoint):
+    authentication_classes = ()
+    permission_classes = ()
+    owner = ApiOwner.ECOSYSTEM
+    publish_status = {
+        "POST": ApiPublishStatus.PRIVATE,
+    }
+
+    _handlers: dict[str, type[BitbucketServerWebhook]] = {"repo:refs_changed": PushEventWebhook}
 
-    def get_handler(self, event_type) -> type[Webhook] | None:
+    def get_handler(self, event_type) -> type[BitbucketServerWebhook] | None:
         return self._handlers.get(event_type)
 
     @method_decorator(csrf_exempt)
@@ -150,7 +158,7 @@ def dispatch(self, request: HttpRequest, *args, **kwargs) -> HttpResponseBase:
 
     def post(self, request: HttpRequest, organization_id, integration_id) -> HttpResponseBase:
         try:
-            organization = Organization.objects.get_from_cache(id=organization_id)
+            organization: Organization = Organization.objects.get_from_cache(id=organization_id)
         except Organization.DoesNotExist:
             logger.exception(
                 "%s.webhook.invalid-organization",
@@ -194,6 +202,8 @@ def post(self, request: HttpRequest, organization_id, integration_id) -> HttpRes
         with IntegrationWebhookEvent(
             interaction_type=event_handler.event_type,
             domain=IntegrationDomain.SOURCE_CODE_MANAGEMENT,
-            provider_key="bitbucket-server",
+            provider_key=event_handler.provider,
         ).capture():
-            return event_handler(organization, integration_id, event)
+            event_handler(event, organization=organization, integration_id=integration_id)
+
+        return HttpResponse(status=204)
diff --git a/src/sentry/integrations/discord/actions/issue_alert/notification.py b/src/sentry/integrations/discord/actions/issue_alert/notification.py
index 27e3ac45a8f2be..66122003d18b73 100644
--- a/src/sentry/integrations/discord/actions/issue_alert/notification.py
+++ b/src/sentry/integrations/discord/actions/issue_alert/notification.py
@@ -5,6 +5,11 @@
 from sentry.integrations.discord.actions.issue_alert.form import DiscordNotifyServiceForm
 from sentry.integrations.discord.client import DiscordClient
 from sentry.integrations.discord.message_builder.issues import DiscordIssuesMessageBuilder
+from sentry.integrations.discord.spec import DiscordMessagingSpec
+from sentry.integrations.messaging.metrics import (
+    MessagingInteractionEvent,
+    MessagingInteractionType,
+)
 from sentry.rules.actions import IntegrationEventAction
 from sentry.rules.base import CallbackFuture
 from sentry.types.rules import RuleFuture
@@ -46,19 +51,27 @@ def send_notification(event: GroupEvent, futures: Sequence[RuleFuture]) -> None:
             message = DiscordIssuesMessageBuilder(event.group, event=event, tags=tags, rules=rules)
 
             client = DiscordClient()
-            try:
-                client.send_message(channel_id, message, notification_uuid=notification_uuid)
-            except Exception as e:
-                self.logger.error(
-                    "discord.notification.message_send_failure",
-                    extra={
-                        "error": str(e),
-                        "project_id": event.project_id,
-                        "event_id": event.event_id,
-                        "guild_id": integration.external_id,
-                        "channel_id": channel_id,
-                    },
-                )
+            with MessagingInteractionEvent(
+                interaction_type=MessagingInteractionType.SEND_ISSUE_ALERT_NOTIFICATION,
+                spec=DiscordMessagingSpec(),
+            ).capture() as lifecycle:
+                try:
+                    lifecycle.add_extras({"integration_id": integration.id, "channel": channel_id})
+                    client.send_message(channel_id, message, notification_uuid=notification_uuid)
+                except Exception as e:
+                    # TODO(iamrajjoshi): Update some of these failures to halts
+                    lifecycle.record_failure(e)
+                    # TODO(iamrajjoshi): Remove the logger after we audit lifecycle
+                    self.logger.error(
+                        "discord.notification.message_send_failure",
+                        extra={
+                            "error": str(e),
+                            "project_id": event.project_id,
+                            "event_id": event.event_id,
+                            "guild_id": integration.external_id,
+                            "channel_id": channel_id,
+                        },
+                    )
 
             rule = rules[0] if rules else None
             self.record_notification_sent(event, channel_id, rule, notification_uuid)
diff --git a/src/sentry/integrations/discord/actions/metric_alert.py b/src/sentry/integrations/discord/actions/metric_alert.py
index beff2896743e6f..e2e6f757389b52 100644
--- a/src/sentry/integrations/discord/actions/metric_alert.py
+++ b/src/sentry/integrations/discord/actions/metric_alert.py
@@ -10,6 +10,11 @@
 from sentry.integrations.discord.message_builder.metric_alerts import (
     DiscordMetricAlertMessageBuilder,
 )
+from sentry.integrations.discord.spec import DiscordMessagingSpec
+from sentry.integrations.messaging.metrics import (
+    MessagingInteractionEvent,
+    MessagingInteractionType,
+)
 
 from ..utils import logger
 
@@ -51,13 +56,19 @@ def send_incident_alert_notification(
     )
 
     client = DiscordClient()
-    try:
-        client.send_message(channel, message)
-    except Exception as error:
-        logger.warning(
-            "discord.metric_alert.message_send_failure",
-            extra={"error": error, "incident_id": incident.id, "channel_id": channel},
-        )
-        return False
-    else:
+    with MessagingInteractionEvent(
+        interaction_type=MessagingInteractionType.SEND_INCIDENT_ALERT_NOTIFICATION,
+        spec=DiscordMessagingSpec(),
+    ).capture() as lifecycle:
+        try:
+            client.send_message(channel, message)
+        except Exception as error:
+            # TODO(iamrajjoshi): Update some of these failures to halts
+            lifecycle.record_failure(error)
+            # TODO(iamrajjoshi): Remove the logger after we audit lifecycle
+            logger.warning(
+                "discord.metric_alert.message_send_failure",
+                extra={"error": error, "incident_id": incident.id, "channel_id": channel},
+            )
+            return False
         return True
diff --git a/src/sentry/integrations/discord/views/link_identity.py b/src/sentry/integrations/discord/views/link_identity.py
index 2ceb879317c181..968fcdc96aec35 100644
--- a/src/sentry/integrations/discord/views/link_identity.py
+++ b/src/sentry/integrations/discord/views/link_identity.py
@@ -26,7 +26,13 @@ class DiscordLinkIdentityView(DiscordIdentityLinkageView, LinkIdentityView):
     def get_success_template_and_context(
         self, params: Mapping[str, Any], integration: Integration | None
     ) -> tuple[str, dict[str, Any]]:
-        return "sentry/integrations/discord/linked.html", {}
+        if integration is None:
+            raise ValueError(
+                'integration is required for linking (params must include "integration_id")'
+            )
+        return "sentry/integrations/discord/linked.html", {
+            "guild_id": integration.external_id,
+        }
 
     @property
     def analytics_operation_key(self) -> str | None:
diff --git a/src/sentry/integrations/discord/webhooks/message_component.py b/src/sentry/integrations/discord/webhooks/message_component.py
index 39d58be7d61ae2..04f4691617166c 100644
--- a/src/sentry/integrations/discord/webhooks/message_component.py
+++ b/src/sentry/integrations/discord/webhooks/message_component.py
@@ -247,13 +247,7 @@ def update_group(self, data: Mapping[str, object]) -> None:
                 status=data,
             )
             update_groups(
-                request=self.request.request,
-                group_ids=[self.group.id],
-                projects=[self.group.project],
-                organization_id=self.group.organization.id,
-                search_fn=None,
-                user=self.user,
-                data=data,
+                request=self.request.request, groups=[self.group], user=self.user, data=data
             )
 
 
diff --git a/src/sentry/integrations/github/client.py b/src/sentry/integrations/github/client.py
index 98c189d50bbbfd..b1f831e9b42c8b 100644
--- a/src/sentry/integrations/github/client.py
+++ b/src/sentry/integrations/github/client.py
@@ -141,7 +141,7 @@ def _get_token(self, prepared_request: PreparedRequest) -> str | None:
         access_token: str | None = self.integration.metadata.get("access_token")
         expires_at: str | None = self.integration.metadata.get("expires_at")
         is_expired = (
-            bool(expires_at) and datetime.strptime(cast(str, expires_at), "%Y-%m-%dT%H:%M:%S") < now
+            bool(expires_at) and datetime.fromisoformat(expires_at).replace(tzinfo=None) < now
         )
         should_refresh = not access_token or not expires_at or is_expired
 
@@ -587,10 +587,6 @@ def get_with_pagination(
                 page_number += 1
             return output
 
-    def get_issues(self, repo: str) -> Sequence[Any]:
-        issues: Sequence[Any] = self.get(f"/repos/{repo}/issues")
-        return issues
-
     def search_issues(self, query: str) -> Mapping[str, Sequence[Mapping[str, Any]]]:
         """
         https://docs.github.com/en/rest/search?#search-issues-and-pull-requests
diff --git a/src/sentry/integrations/github/issues.py b/src/sentry/integrations/github/issues.py
index cdd510da75cdaf..cc803cb9b40984 100644
--- a/src/sentry/integrations/github/issues.py
+++ b/src/sentry/integrations/github/issues.py
@@ -287,17 +287,6 @@ def get_allowed_assignees(self, repo: str) -> Sequence[tuple[str, str]]:
 
         return (("", "Unassigned"),) + users
 
-    def get_repo_issues(self, repo: str) -> Sequence[tuple[str, str]]:
-        client = self.get_client()
-        try:
-            response = client.get_issues(repo)
-        except Exception as e:
-            self.raise_error(e)
-
-        issues = tuple((i["number"], "#{} {}".format(i["number"], i["title"])) for i in response)
-
-        return issues
-
     def get_repo_labels(self, repo: str) -> Sequence[tuple[str, str]]:
         client = self.get_client()
         try:
diff --git a/src/sentry/integrations/github/webhook.py b/src/sentry/integrations/github/webhook.py
index d5066d0e908673..24cd6fdfe02f9d 100644
--- a/src/sentry/integrations/github/webhook.py
+++ b/src/sentry/integrations/github/webhook.py
@@ -26,12 +26,10 @@
 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 (
-    RpcIntegration,
-    RpcOrganizationIntegration,
-)
+from sentry.integrations.services.integration.model import RpcIntegration
 from sentry.integrations.services.integration.service import integration_service
 from sentry.integrations.services.repository.service import repository_service
+from sentry.integrations.source_code_management.webhook import SCMWebhook
 from sentry.integrations.utils.metrics import IntegrationWebhookEvent, IntegrationWebhookEventType
 from sentry.integrations.utils.scope import clear_tags_and_context
 from sentry.models.commit import Commit
@@ -73,31 +71,21 @@ def get_file_language(filename: str) -> str | None:
     return language
 
 
-class Webhook(ABC):
+class GitHubWebhook(SCMWebhook, ABC):
     """
     Base class for GitHub webhooks handled in region silos.
     """
 
-    provider = "github"
-
     @property
-    @abstractmethod
-    def event_type(self) -> IntegrationWebhookEventType:
-        raise NotImplementedError
+    def provider(self) -> str:
+        return "github"
 
     @abstractmethod
-    def _handle(
-        self,
-        integration: RpcIntegration,
-        event: Mapping[str, Any],
-        organization: Organization,
-        repo: Repository,
-        host: str | None = None,
-    ) -> None:
-        raise NotImplementedError
+    def _handle(self, integration: RpcIntegration, event: Mapping[str, Any], **kwargs) -> None:
+        pass
 
-    def __call__(self, event: Mapping[str, Any], host: str | None = None) -> None:
-        external_id = get_github_external_id(event=event, host=host)
+    def __call__(self, event: Mapping[str, Any], **kwargs) -> None:
+        external_id = get_github_external_id(event=event, host=kwargs.get("host"))
 
         result = integration_service.organization_contexts(
             external_id=external_id, provider=self.provider
@@ -166,7 +154,12 @@ def __call__(self, event: Mapping[str, Any], host: str | None = None) -> None:
 
             for repo in repos.exclude(status=ObjectStatus.HIDDEN):
                 self.update_repo_data(repo, event)
-                self._handle(integration, event, orgs[repo.organization_id], repo)
+                self._handle(
+                    integration=integration,
+                    event=event,
+                    organization=orgs[repo.organization_id],
+                    repo=repo,
+                )
 
     def update_repo_data(self, repo: Repository, event: Mapping[str, Any]) -> None:
         """
@@ -208,21 +201,28 @@ def update_repo_data(self, repo: Repository, event: Mapping[str, Any]) -> None:
                 )
                 pass
 
+    def is_anonymous_email(self, email: str) -> bool:
+        return email[-25:] == "@users.noreply.github.com"
+
+    def get_external_id(self, username: str) -> str:
+        return f"github:{username}"
 
-class InstallationEventWebhook:
+    def get_idp_external_id(self, integration: RpcIntegration, host: str | None = None) -> str:
+        return options.get("github-app.id")
+
+
+class InstallationEventWebhook(GitHubWebhook):
     """
     Unlike other GitHub webhooks, installation webhooks are handled in control silo.
 
     https://developer.github.com/v3/activity/events/types/#installationevent
     """
 
-    provider = "github"
-
     @property
     def event_type(self) -> IntegrationWebhookEventType:
         return IntegrationWebhookEventType.INSTALLATION
 
-    def __call__(self, event: Mapping[str, Any], host: str | None = None) -> None:
+    def __call__(self, event: Mapping[str, Any], **kwargs) -> None:
         installation = event["installation"]
 
         if not installation:
@@ -241,7 +241,7 @@ def __call__(self, event: Mapping[str, Any], host: str | None = None) -> None:
 
         if event["action"] == "deleted":
             external_id = event["installation"]["id"]
-            if host:
+            if host := kwargs.get("host"):
                 external_id = "{}:{}".format(host, event["installation"]["id"])
             result = integration_service.organization_contexts(
                 provider=self.provider,
@@ -251,7 +251,7 @@ def __call__(self, event: Mapping[str, Any], host: str | None = None) -> None:
             org_integrations = result.organization_integrations
 
             if integration is not None:
-                self._handle_delete(event, integration, org_integrations)
+                self._handle(integration, event, org_integrations=org_integrations)
             else:
                 # It seems possible for the GH or GHE app to be installed on their
                 # end, but the integration to not exist. Possibly from deleting in
@@ -267,13 +267,13 @@ def __call__(self, event: Mapping[str, Any], host: str | None = None) -> None:
                 )
                 logger.error("Installation is missing.")
 
-    def _handle_delete(
+    def _handle(
         self,
-        event: Mapping[str, Any],
         integration: RpcIntegration,
-        org_integrations: list[RpcOrganizationIntegration],
+        event: Mapping[str, Any],
+        **kwargs,
     ) -> None:
-        org_ids = {oi.organization_id for oi in org_integrations}
+        org_ids = {oi.organization_id for oi in kwargs.get("org_integrations", [])}
 
         logger.info(
             "InstallationEventWebhook._handle_delete",
@@ -294,22 +294,13 @@ def _handle_delete(
             )
 
 
-class PushEventWebhook(Webhook):
+class PushEventWebhook(GitHubWebhook):
     """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"
-
-    def get_external_id(self, username: str) -> str:
-        return f"github:{username}"
-
-    def get_idp_external_id(self, integration: RpcIntegration, host: str | None = None) -> str:
-        return options.get("github-app.id")
-
     def should_ignore_commit(self, commit: Mapping[str, Any]) -> bool:
         return GitHubRepositoryProvider.should_ignore_commit(commit["message"])
 
@@ -317,11 +308,12 @@ def _handle(
         self,
         integration: RpcIntegration,
         event: Mapping[str, Any],
-        organization: Organization,
-        repo: Repository,
-        host: str | None = None,
+        **kwargs,
     ) -> None:
         authors = {}
+        if not ((organization := kwargs.get("organization")) and (repo := kwargs.get("repo"))):
+            raise ValueError("Missing organization and repo")
+
         client = integration.get_installation(organization_id=organization.id).get_client()
         gh_username_cache: MutableMapping[str, str | None] = {}
 
@@ -373,7 +365,7 @@ def _handle(
                                         "identity_ext_id": gh_user["id"],
                                         "provider_type": self.provider,
                                         "provider_ext_id": self.get_idp_external_id(
-                                            integration, host
+                                            integration, kwargs.get("host")
                                         ),
                                     }
                                 )
@@ -474,29 +466,18 @@ def _handle(
         repo.save()
 
 
-class PullRequestEventWebhook(Webhook):
+class PullRequestEventWebhook(GitHubWebhook):
     """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"
-
-    def get_external_id(self, username: str) -> str:
-        return f"github:{username}"
-
-    def get_idp_external_id(self, integration: RpcIntegration, host: str | None = None) -> str:
-        return options.get("github-app.id")
-
     def _handle(
         self,
         integration: RpcIntegration,
         event: Mapping[str, Any],
-        organization: Organization,
-        repo: Repository,
-        host: str | None = None,
+        **kwargs,
     ) -> None:
         pull_request = event["pull_request"]
         number = pull_request["number"]
@@ -522,6 +503,10 @@ def _handle(
         merge_commit_sha = pull_request["merge_commit_sha"] if pull_request["merged"] else None
 
         author_email = "{}@localhost".format(user["login"][:65])
+
+        if not ((organization := kwargs.get("organization")) and (repo := kwargs.get("repo"))):
+            raise ValueError("Missing organization and repo")
+
         try:
             commit_author = CommitAuthor.objects.get(
                 external_id=self.get_external_id(user["login"]), organization_id=organization.id
@@ -533,7 +518,7 @@ def _handle(
                 filter={
                     "identity_ext_id": user["id"],
                     "provider_type": self.provider,
-                    "provider_ext_id": self.get_idp_external_id(integration, host),
+                    "provider_ext_id": self.get_idp_external_id(integration, kwargs.get("host")),
                 }
             )
             if identity is not None:
@@ -612,13 +597,13 @@ class GitHubIntegrationsWebhookEndpoint(Endpoint):
         "POST": ApiPublishStatus.PRIVATE,
     }
 
-    _handlers: dict[str, type[Webhook] | type[InstallationEventWebhook]] = {
+    _handlers: dict[str, type[GitHubWebhook]] = {
         "push": PushEventWebhook,
         "pull_request": PullRequestEventWebhook,
         "installation": InstallationEventWebhook,
     }
 
-    def get_handler(self, event_type: str) -> type[Webhook] | type[InstallationEventWebhook] | None:
+    def get_handler(self, event_type: str) -> type[GitHubWebhook] | None:
         return self._handlers.get(event_type)
 
     def is_valid_signature(self, method: str, body: bytes, secret: str, signature: str) -> bool:
@@ -699,7 +684,7 @@ def handle(self, request: HttpRequest) -> HttpResponse:
         with IntegrationWebhookEvent(
             interaction_type=event_handler.event_type,
             domain=IntegrationDomain.SOURCE_CODE_MANAGEMENT,
-            provider_key="github",
+            provider_key=event_handler.provider,
         ).capture():
             event_handler(event)
         return HttpResponse(status=204)
diff --git a/src/sentry/integrations/github_enterprise/webhook.py b/src/sentry/integrations/github_enterprise/webhook.py
index 230ab9e069434f..8550214d531ff7 100644
--- a/src/sentry/integrations/github_enterprise/webhook.py
+++ b/src/sentry/integrations/github_enterprise/webhook.py
@@ -18,10 +18,10 @@
 from sentry.constants import ObjectStatus
 from sentry.integrations.base import IntegrationDomain
 from sentry.integrations.github.webhook import (
+    GitHubWebhook,
     InstallationEventWebhook,
     PullRequestEventWebhook,
     PushEventWebhook,
-    Webhook,
     get_github_external_id,
 )
 from sentry.integrations.utils.metrics import IntegrationWebhookEvent
@@ -29,8 +29,6 @@
 from sentry.utils import metrics
 from sentry.utils.sdk import Scope
 
-from .repository import GitHubEnterpriseRepositoryProvider
-
 logger = logging.getLogger("sentry.webhooks")
 from sentry.api.base import Endpoint, region_silo_endpoint
 from sentry.integrations.services.integration import integration_service
@@ -89,16 +87,10 @@ def get_installation_metadata(event, host):
     return integration.metadata["installation"]
 
 
-class GitHubEnterpriseInstallationEventWebhook(InstallationEventWebhook):
-    provider = "github_enterprise"
-
-
-class GitHubEnterprisePushEventWebhook(PushEventWebhook):
-    provider = "github_enterprise"
-
-    # https://developer.github.com/v3/activity/events/types/#pushevent
-    def is_anonymous_email(self, email: str) -> bool:
-        return email[-25:] == "@users.noreply.github.com"
+class GitHubEnterpriseWebhook:
+    @property
+    def provider(self) -> str:
+        return "github_enterprise"
 
     def get_external_id(self, username: str) -> str:
         return f"github_enterprise:{username}"
@@ -106,29 +98,24 @@ def get_external_id(self, username: str) -> str:
     def get_idp_external_id(self, integration: RpcIntegration, host: str | None = None) -> str:
         return "{}:{}".format(host, integration.metadata["installation"]["id"])
 
-    def should_ignore_commit(self, commit):
-        return GitHubEnterpriseRepositoryProvider.should_ignore_commit(commit["message"])
 
+class GitHubEnterpriseInstallationEventWebhook(GitHubEnterpriseWebhook, InstallationEventWebhook):
+    pass
 
-class GitHubEnterprisePullRequestEventWebhook(PullRequestEventWebhook):
-    provider = "github_enterprise"
 
-    # https://developer.github.com/v3/activity/events/types/#pullrequestevent
-    def is_anonymous_email(self, email: str) -> bool:
-        return email[-25:] == "@users.noreply.github.com"
+class GitHubEnterprisePushEventWebhook(GitHubEnterpriseWebhook, PushEventWebhook):
+    pass
 
-    def get_external_id(self, username: str) -> str:
-        return f"github_enterprise:{username}"
 
-    def get_idp_external_id(self, integration: RpcIntegration, host: str | None = None) -> str:
-        return "{}:{}".format(host, integration.metadata["installation"]["id"])
+class GitHubEnterprisePullRequestEventWebhook(GitHubEnterpriseWebhook, PullRequestEventWebhook):
+    pass
 
 
 class GitHubEnterpriseWebhookBase(Endpoint):
     authentication_classes = ()
     permission_classes = ()
 
-    _handlers: dict[str, type[InstallationEventWebhook] | type[Webhook]] = {}
+    _handlers: dict[str, type[GitHubWebhook]] = {}
 
     # https://developer.github.com/webhooks/
     def get_handler(self, event_type):
@@ -163,7 +150,7 @@ def get_secret(self, event, host):
         else:
             return None
 
-    def handle(self, request: HttpRequest) -> HttpResponse:
+    def _handle(self, request: HttpRequest) -> HttpResponse:
         clear_tags_and_context()
         scope = Scope.get_isolation_scope()
 
@@ -301,9 +288,9 @@ def handle(self, request: HttpRequest) -> HttpResponse:
         with IntegrationWebhookEvent(
             interaction_type=event_handler.event_type,
             domain=IntegrationDomain.SOURCE_CODE_MANAGEMENT,
-            provider_key="github-enterprise",
+            provider_key=event_handler.provider,
         ).capture():
-            event_handler(event, host)
+            event_handler(event, host=host)
 
         return HttpResponse(status=204)
 
@@ -329,4 +316,4 @@ def dispatch(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
 
     @method_decorator(csrf_exempt)
     def post(self, request: HttpRequest) -> HttpResponse:
-        return self.handle(request)
+        return self._handle(request)
diff --git a/src/sentry/integrations/gitlab/webhooks.py b/src/sentry/integrations/gitlab/webhooks.py
index 6d2f3cfd0f5c5f..0a0123c842f5f0 100644
--- a/src/sentry/integrations/gitlab/webhooks.py
+++ b/src/sentry/integrations/gitlab/webhooks.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import logging
-from abc import ABC, abstractmethod
+from abc import ABC
 from collections.abc import Mapping
 from datetime import timezone
 from typing import Any
@@ -20,6 +20,7 @@
 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.source_code_management.webhook import SCMWebhook
 from sentry.integrations.utils.metrics import IntegrationWebhookEvent, IntegrationWebhookEventType
 from sentry.integrations.utils.scope import clear_tags_and_context
 from sentry.models.commit import Commit
@@ -36,17 +37,38 @@
 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(ABC):
+def get_gitlab_external_id(request, extra) -> tuple[str, str] | HttpResponse:
+    token = "<unknown>"
+    try:
+        # Munge the token to extract the integration external_id.
+        # gitlab hook payloads don't give us enough unique context
+        # to find data on our side so we embed one in the token.
+        token = request.META["HTTP_X_GITLAB_TOKEN"]
+        # e.g. "example.gitlab.com:group-x:webhook_secret_from_sentry_integration_table"
+        instance, group_path, secret = token.split(":")
+        external_id = f"{instance}:{group_path}"
+        return (external_id, secret)
+    except KeyError:
+        logger.info("gitlab.webhook.missing-gitlab-token")
+        extra["reason"] = "The customer needs to set a Secret Token in their webhook."
+        logger.exception(extra["reason"])
+        return HttpResponse(status=400, reason=extra["reason"])
+    except ValueError:
+        logger.info("gitlab.webhook.malformed-gitlab-token", extra=extra)
+        extra["reason"] = "The customer's Secret Token is malformed."
+        logger.exception(extra["reason"])
+        return HttpResponse(status=400, reason=extra["reason"])
+    except Exception:
+        logger.info("gitlab.webhook.invalid-token", extra=extra)
+        extra["reason"] = "Generic catch-all error."
+        logger.exception(extra["reason"])
+        return HttpResponse(status=400, reason=extra["reason"])
+
+
+class GitlabWebhook(SCMWebhook, ABC):
     @property
-    @abstractmethod
-    def event_type(self) -> IntegrationWebhookEventType:
-        raise NotImplementedError
-
-    @abstractmethod
-    def __call__(
-        self, integration: RpcIntegration, organization: RpcOrganization, event: Mapping[str, Any]
-    ):
-        raise NotImplementedError
+    def provider(self) -> str:
+        return "gitlab"
 
     def get_repo(
         self, integration: RpcIntegration, organization: RpcOrganization, event: Mapping[str, Any]
@@ -94,7 +116,7 @@ def update_repo_data(self, repo: Repository, event: Mapping[str, Any]):
             )
 
 
-class MergeEventWebhook(Webhook):
+class MergeEventWebhook(GitlabWebhook):
     """
     Handle Merge Request Hook
 
@@ -105,9 +127,13 @@ class MergeEventWebhook(Webhook):
     def event_type(self) -> IntegrationWebhookEventType:
         return IntegrationWebhookEventType.PULL_REQUEST
 
-    def __call__(
-        self, integration: RpcIntegration, organization: RpcOrganization, event: Mapping[str, Any]
-    ):
+    def __call__(self, event: Mapping[str, Any], **kwargs):
+        if not (
+            (organization := kwargs.get("organization"))
+            and (integration := kwargs.get("integration"))
+        ):
+            raise ValueError("Organization and integration must be provided")
+
         repo = self.get_repo(integration, organization, event)
         if repo is None:
             return
@@ -162,7 +188,7 @@ def __call__(
             pass
 
 
-class PushEventWebhook(Webhook):
+class PushEventWebhook(GitlabWebhook):
     """
     Handle push hook
 
@@ -173,9 +199,13 @@ class PushEventWebhook(Webhook):
     def event_type(self) -> IntegrationWebhookEventType:
         return IntegrationWebhookEventType.PUSH
 
-    def __call__(
-        self, integration: RpcIntegration, organization: RpcOrganization, event: Mapping[str, Any]
-    ):
+    def __call__(self, event: Mapping[str, Any], **kwargs):
+        if not (
+            (organization := kwargs.get("organization"))
+            and (integration := kwargs.get("integration"))
+        ):
+            raise ValueError("Organization and integration must be provided")
+
         repo = self.get_repo(integration, organization, event)
         if repo is None:
             return
@@ -222,37 +252,8 @@ def __call__(
                 pass
 
 
-class GitlabWebhookMixin:
-    def _get_external_id(self, request, extra) -> tuple[str, str] | HttpResponse:
-        token = "<unknown>"
-        try:
-            # Munge the token to extract the integration external_id.
-            # gitlab hook payloads don't give us enough unique context
-            # to find data on our side so we embed one in the token.
-            token = request.META["HTTP_X_GITLAB_TOKEN"]
-            # e.g. "example.gitlab.com:group-x:webhook_secret_from_sentry_integration_table"
-            instance, group_path, secret = token.split(":")
-            external_id = f"{instance}:{group_path}"
-            return (external_id, secret)
-        except KeyError:
-            logger.info("gitlab.webhook.missing-gitlab-token")
-            extra["reason"] = "The customer needs to set a Secret Token in their webhook."
-            logger.exception(extra["reason"])
-            return HttpResponse(status=400, reason=extra["reason"])
-        except ValueError:
-            logger.info("gitlab.webhook.malformed-gitlab-token", extra=extra)
-            extra["reason"] = "The customer's Secret Token is malformed."
-            logger.exception(extra["reason"])
-            return HttpResponse(status=400, reason=extra["reason"])
-        except Exception:
-            logger.info("gitlab.webhook.invalid-token", extra=extra)
-            extra["reason"] = "Generic catch-all error."
-            logger.exception(extra["reason"])
-            return HttpResponse(status=400, reason=extra["reason"])
-
-
 @region_silo_endpoint
-class GitlabWebhookEndpoint(Endpoint, GitlabWebhookMixin):
+class GitlabWebhookEndpoint(Endpoint):
     owner = ApiOwner.INTEGRATIONS
     publish_status = {
         "POST": ApiPublishStatus.PRIVATE,
@@ -261,7 +262,7 @@ class GitlabWebhookEndpoint(Endpoint, GitlabWebhookMixin):
     permission_classes = ()
     provider = "gitlab"
 
-    _handlers: dict[str, type[Webhook]] = {
+    _handlers: dict[str, type[GitlabWebhook]] = {
         "Push Hook": PushEventWebhook,
         "Merge Request Hook": MergeEventWebhook,
     }
@@ -282,7 +283,7 @@ def post(self, request: HttpRequest) -> HttpResponse:
             # AppPlatformEvents also hit this API
             "event-type": request.META.get("HTTP_X_GITLAB_EVENT"),
         }
-        result = self._get_external_id(request=request, extra=extra)
+        result = get_gitlab_external_id(request=request, extra=extra)
         if isinstance(result, HttpResponse):
             return result
         (external_id, secret) = result
@@ -351,8 +352,8 @@ def post(self, request: HttpRequest) -> HttpResponse:
                 with IntegrationWebhookEvent(
                     interaction_type=event_handler.event_type,
                     domain=IntegrationDomain.SOURCE_CODE_MANAGEMENT,
-                    provider_key="gitlab",
+                    provider_key=event_handler.provider,
                 ).capture():
-                    event_handler(integration, organization, event)
+                    event_handler(event, integration=integration, organization=organization)
 
         return HttpResponse(status=204)
diff --git a/src/sentry/integrations/jira/actions/form.py b/src/sentry/integrations/jira/actions/form.py
index 7c5d1f7acfe2b9..22013a1f9872d0 100644
--- a/src/sentry/integrations/jira/actions/form.py
+++ b/src/sentry/integrations/jira/actions/form.py
@@ -14,6 +14,8 @@ class JiraNotifyServiceForm(IntegrationNotifyServiceForm):
 
     def clean(self) -> dict[str, Any] | None:
         cleaned_data = super().clean()
+        if cleaned_data is None:
+            return None
 
         integration_id = cleaned_data.get("integration")
         integration = integration_service.get_integration(
diff --git a/src/sentry/integrations/messaging/metrics.py b/src/sentry/integrations/messaging/metrics.py
index d2e1da56bb72b0..82baec8eec3653 100644
--- a/src/sentry/integrations/messaging/metrics.py
+++ b/src/sentry/integrations/messaging/metrics.py
@@ -46,6 +46,9 @@ class MessagingInteractionType(StrEnum):
     SEND_INCIDENT_ALERT_NOTIFICATION = "SEND_INCIDENT_ALERT_NOTIFICATION"
     SEND_ISSUE_ALERT_NOTIFICATION = "SEND_ISSUE_ALERT_NOTIFICATION"
 
+    SEND_ACTIVITY_NOTIFICATION = "SEND_ACTIVITY_NOTIFICATION"
+    SEND_GENERIC_NOTIFICATION = "SEND_GENERIC_NOTIFICATION"
+
 
 @dataclass
 class MessagingInteractionEvent(IntegrationEventLifecycleMetric):
@@ -84,7 +87,6 @@ class MessageCommandHaltReason(StrEnum):
     # 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"
 
diff --git a/src/sentry/integrations/middleware/hybrid_cloud/parser.py b/src/sentry/integrations/middleware/hybrid_cloud/parser.py
index b1740f1e250b87..e1226f7c55e020 100644
--- a/src/sentry/integrations/middleware/hybrid_cloud/parser.py
+++ b/src/sentry/integrations/middleware/hybrid_cloud/parser.py
@@ -12,6 +12,7 @@
 from rest_framework import status
 
 from sentry.api.base import ONE_DAY
+from sentry.constants import ObjectStatus
 from sentry.hybridcloud.models.webhookpayload import WebhookPayload
 from sentry.hybridcloud.outbox.category import WebhookProviderIdentifier
 from sentry.hybridcloud.services.organization_mapping import organization_mapping_service
@@ -366,7 +367,8 @@ def get_organizations_from_integration(
             logger.info("%s.no_integration", self.provider, extra={"path": self.request.path})
             raise Integration.DoesNotExist()
         organization_integrations = OrganizationIntegration.objects.filter(
-            integration_id=integration.id
+            integration_id=integration.id,
+            status=ObjectStatus.ACTIVE,
         )
 
         if organization_integrations.count() == 0:
diff --git a/src/sentry/integrations/msteams/actions/notification.py b/src/sentry/integrations/msteams/actions/notification.py
index 7c3624401ae0df..982c3e7cde7801 100644
--- a/src/sentry/integrations/msteams/actions/notification.py
+++ b/src/sentry/integrations/msteams/actions/notification.py
@@ -2,12 +2,18 @@
 
 from sentry import features
 from sentry.eventstore.models import GroupEvent
+from sentry.integrations.messaging.metrics import (
+    MessagingInteractionEvent,
+    MessagingInteractionType,
+)
 from sentry.integrations.msteams.actions.form import MsTeamsNotifyServiceForm
 from sentry.integrations.msteams.card_builder.issues import MSTeamsIssueMessageBuilder
 from sentry.integrations.msteams.client import MsTeamsClient
+from sentry.integrations.msteams.spec import MsTeamsMessagingSpec
 from sentry.integrations.msteams.utils import get_channel_id
 from sentry.integrations.services.integration import RpcIntegration
 from sentry.rules.actions import IntegrationEventAction
+from sentry.shared_integrations.exceptions import ApiError
 from sentry.utils import metrics
 
 
@@ -54,7 +60,15 @@ def send_notification(event, futures):
             ).build_group_card(notification_uuid=notification_uuid)
 
             client = MsTeamsClient(integration)
-            client.send_card(channel, card)
+            with MessagingInteractionEvent(
+                interaction_type=MessagingInteractionType.SEND_ISSUE_ALERT_NOTIFICATION,
+                spec=MsTeamsMessagingSpec(),
+            ).capture() as lifecycle:
+                lifecycle.add_extras({"integration_id": integration.id, "channel": channel})
+                try:
+                    client.send_card(channel, card)
+                except ApiError as e:
+                    lifecycle.record_failure(e)
             rule = rules[0] if rules else None
             self.record_notification_sent(event, channel, rule, notification_uuid)
 
diff --git a/src/sentry/integrations/pagerduty/actions/notification.py b/src/sentry/integrations/pagerduty/actions/notification.py
index 3cff720b0e41dd..54e48290894ae2 100644
--- a/src/sentry/integrations/pagerduty/actions/notification.py
+++ b/src/sentry/integrations/pagerduty/actions/notification.py
@@ -6,7 +6,6 @@
 
 import sentry_sdk
 
-from sentry import features
 from sentry.integrations.pagerduty.actions import PagerDutyNotifyServiceForm
 from sentry.integrations.pagerduty.client import PAGERDUTY_DEFAULT_SEVERITY, PagerdutySeverity
 from sentry.rules.actions import IntegrationEventAction
@@ -18,17 +17,13 @@
 class PagerDutyNotifyServiceAction(IntegrationEventAction):
     id = "sentry.integrations.pagerduty.notify_action.PagerDutyNotifyServiceAction"
     form_cls = PagerDutyNotifyServiceForm
-    old_label = "Send a notification to PagerDuty account {account} and service {service}"
-    new_label = "Send a notification to PagerDuty account {account} and service {service} with {severity} severity"
+    label = "Send a notification to PagerDuty account {account} and service {service} with {severity} severity"
     prompt = "Send a PagerDuty notification"
     provider = "pagerduty"
     integration_key = "account"
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.has_feature_flag = features.has(
-            "organizations:integrations-custom-alert-priorities", self.project.organization
-        )
         self.form_fields = {
             "account": {
                 "type": "choice",
@@ -46,7 +41,6 @@ def __init__(self, *args, **kwargs):
                 ],
             },
         }
-        self.__class__.label = self.new_label if self.has_feature_flag else self.old_label
 
     def _get_service(self):
         oi = self.get_organization_integration()
diff --git a/src/sentry/integrations/pipeline.py b/src/sentry/integrations/pipeline.py
index 38d15d5864bb52..734210c82606de 100644
--- a/src/sentry/integrations/pipeline.py
+++ b/src/sentry/integrations/pipeline.py
@@ -15,6 +15,7 @@
 from sentry.integrations.models.organization_integration import OrganizationIntegration
 from sentry.models.organizationmapping import OrganizationMapping
 from sentry.organizations.absolute_url import generate_organization_url
+from sentry.organizations.services.organization import organization_service
 from sentry.pipeline import Pipeline, PipelineAnalyticsEntry
 from sentry.shared_integrations.exceptions import IntegrationError, IntegrationProviderError
 from sentry.silo.base import SiloMode
@@ -94,6 +95,29 @@ def initialize(self) -> None:
         )
 
     def finish_pipeline(self):
+        org_context = organization_service.get_organization_by_id(
+            id=self.organization.id, user_id=self.request.user.id
+        )
+
+        if (
+            org_context
+            and org_context.member
+            and "org:integrations" not in org_context.member.scopes
+        ):
+            error_message = (
+                "You must be an organization owner, manager or admin to install this integration."
+            )
+            logger.info(
+                "build-integration.permission_error",
+                extra={
+                    "error_message": error_message,
+                    "organization_id": self.organization.id,
+                    "user_id": self.request.user.id,
+                    "provider_key": self.provider.key,
+                },
+            )
+            return self.error(error_message)
+
         try:
             data = self.provider.build_integration(self.state.data)
         except IntegrationError as e:
diff --git a/src/sentry/integrations/project_management/metrics.py b/src/sentry/integrations/project_management/metrics.py
index 782bb9c2f4021d..09c113140409c4 100644
--- a/src/sentry/integrations/project_management/metrics.py
+++ b/src/sentry/integrations/project_management/metrics.py
@@ -15,9 +15,7 @@ class ProjectManagementActionType(StrEnum):
     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()
+    CREATE_EXTERNAL_ISSUE_VIA_ISSUE_DETAIL = "create_external_issue_via_issue_detail"
 
 
 class ProjectManagementHaltReason(StrEnum):
diff --git a/src/sentry/integrations/services/integration/impl.py b/src/sentry/integrations/services/integration/impl.py
index cbf01a3c334649..e4a75ee868cbd3 100644
--- a/src/sentry/integrations/services/integration/impl.py
+++ b/src/sentry/integrations/services/integration/impl.py
@@ -12,11 +12,16 @@
 from sentry.constants import SentryAppInstallationStatus
 from sentry.hybridcloud.rpc.pagination import RpcPaginationArgs, RpcPaginationResult
 from sentry.incidents.models.incident import INCIDENT_STATUS, IncidentStatus
+from sentry.integrations.messaging.metrics import (
+    MessagingInteractionEvent,
+    MessagingInteractionType,
+)
 from sentry.integrations.mixins import NotifyBasicMixin
 from sentry.integrations.models.integration import Integration
 from sentry.integrations.models.integration_external_project import IntegrationExternalProject
 from sentry.integrations.models.organization_integration import OrganizationIntegration
 from sentry.integrations.msteams import MsTeamsClient
+from sentry.integrations.msteams.spec import MsTeamsMessagingSpec
 from sentry.integrations.services.integration import (
     IntegrationService,
     RpcIntegration,
@@ -37,7 +42,6 @@
 from sentry.sentry_apps.api.serializers.app_platform_event import AppPlatformEvent
 from sentry.sentry_apps.models.sentry_app import SentryApp
 from sentry.sentry_apps.models.sentry_app_installation import SentryAppInstallation
-from sentry.shared_integrations.exceptions import ApiError
 from sentry.utils import json, metrics
 from sentry.utils.sentry_apps import send_and_save_webhook_request
 
@@ -447,12 +451,20 @@ def send_msteams_incident_alert_notification(
     ) -> bool:
         integration = Integration.objects.get(id=integration_id)
         client = MsTeamsClient(integration)
-        try:
-            client.send_card(channel, attachment)
-            return True
-        except ApiError:
-            logger.info("rule.fail.msteams_post", exc_info=True)
-        return False
+
+        with MessagingInteractionEvent(
+            interaction_type=MessagingInteractionType.SEND_INCIDENT_ALERT_NOTIFICATION,
+            spec=MsTeamsMessagingSpec(),
+        ).capture() as lifecycle:
+            try:
+                client.send_card(channel, attachment)
+                return True
+            except Exception as e:
+                # TODO(iamrajjoshi): Remove the logger after we audit lifecycle
+                logger.info("rule.fail.msteams_post", exc_info=True)
+                lifecycle.add_extras({"integration_id": integration_id, "channel": channel})
+                lifecycle.record_failure(e)
+            return False
 
     def delete_integration(self, *, integration_id: int) -> None:
         try:
diff --git a/src/sentry/integrations/slack/actions/notification.py b/src/sentry/integrations/slack/actions/notification.py
index da4ba68e335e39..9854b42a8f56d1 100644
--- a/src/sentry/integrations/slack/actions/notification.py
+++ b/src/sentry/integrations/slack/actions/notification.py
@@ -68,10 +68,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
             "channel": {"type": "string", "placeholder": "e.g., #critical, Jane Schmidt"},
             "channel_id": {"type": "string", "placeholder": "e.g., CA2FRA079 or UA1J9RTE1"},
             "tags": {"type": "string", "placeholder": "e.g., environment,user,my_tag"},
-        }
-        self.form_fields["notes"] = {
-            "type": "string",
-            "placeholder": "e.g. @jane, @on-call-team",
+            "notes": {"type": "string", "placeholder": "e.g., @jane, @on-call-team"},
         }
 
         self._repository: IssueAlertNotificationMessageRepository = (
diff --git a/src/sentry/integrations/slack/message_builder/base/base.py b/src/sentry/integrations/slack/message_builder/base/base.py
index a91f1c473c8495..bc3f756bf2399c 100644
--- a/src/sentry/integrations/slack/message_builder/base/base.py
+++ b/src/sentry/integrations/slack/message_builder/base/base.py
@@ -40,10 +40,3 @@ def build_fallback_text(self, obj: Group | Event | GroupEvent, project_slug: str
             title = obj.occurrence.issue_title
 
         return f"[{project_slug}] {title}"
-
-    @property
-    def escape_text(self) -> bool:
-        """
-        Returns True if we need to escape the text in the message.
-        """
-        return False
diff --git a/src/sentry/integrations/slack/message_builder/issues.py b/src/sentry/integrations/slack/message_builder/issues.py
index 95eaee8aa32224..c64a37013de558 100644
--- a/src/sentry/integrations/slack/message_builder/issues.py
+++ b/src/sentry/integrations/slack/message_builder/issues.py
@@ -36,12 +36,7 @@
 from sentry.integrations.time_utils import get_approx_start_time, time_since
 from sentry.integrations.types import ExternalProviders
 from sentry.issues.endpoints.group_details import get_group_global_count
-from sentry.issues.grouptype import (
-    GroupCategory,
-    NotificationContextField,
-    PerformanceP95EndpointRegressionGroupType,
-    ProfileFunctionRegressionType,
-)
+from sentry.issues.grouptype import GroupCategory, NotificationContextField
 from sentry.models.commit import Commit
 from sentry.models.group import Group, GroupStatus
 from sentry.models.project import Project
@@ -107,11 +102,6 @@ def get_group_users_count(group: Group, rules: list[Rule] | None = None) -> int:
 }
 
 
-REGRESSION_PERFORMANCE_ISSUE_TYPES = [
-    PerformanceP95EndpointRegressionGroupType,
-    ProfileFunctionRegressionType,
-]
-
 logger = logging.getLogger(__name__)
 
 
@@ -456,13 +446,6 @@ def __init__(
         self.skip_fallback = skip_fallback
         self.notes = notes
 
-    @property
-    def escape_text(self) -> bool:
-        """
-        Returns True if we need to escape the text in the message.
-        """
-        return True
-
     def get_title_block(
         self,
         event_or_group: Event | GroupEvent | Group,
diff --git a/src/sentry/integrations/slack/metrics.py b/src/sentry/integrations/slack/metrics.py
index 18a6364c7877c3..fe5c52da59e973 100644
--- a/src/sentry/integrations/slack/metrics.py
+++ b/src/sentry/integrations/slack/metrics.py
@@ -1,5 +1,13 @@
 # metrics constants
 
+from slack_sdk.errors import SlackApiError
+
+from sentry.integrations.slack.utils.errors import (
+    SLACK_SDK_HALT_ERROR_CATEGORIES,
+    unpack_slack_api_error,
+)
+from sentry.integrations.utils.metrics import EventLifecycle
+
 SLACK_ISSUE_ALERT_SUCCESS_DATADOG_METRIC = "sentry.integrations.slack.issue_alert.success"
 SLACK_ISSUE_ALERT_FAILURE_DATADOG_METRIC = "sentry.integrations.slack.issue_alert.failure"
 SLACK_ACTIVITY_THREAD_SUCCESS_DATADOG_METRIC = "sentry.integrations.slack.activity_thread.success"
@@ -9,28 +17,6 @@
 SLACK_NOTIFY_RECIPIENT_SUCCESS_DATADOG_METRIC = "sentry.integrations.slack.notify_recipient.success"
 SLACK_NOTIFY_RECIPIENT_FAILURE_DATADOG_METRIC = "sentry.integrations.slack.notify_recipient.failure"
 
-# Bot commands
-SLACK_BOT_COMMAND_LINK_IDENTITY_SUCCESS_DATADOG_METRIC = (
-    "sentry.integrations.slack.link_identity_view.success"
-)
-SLACK_BOT_COMMAND_LINK_IDENTITY_FAILURE_DATADOG_METRIC = (
-    "sentry.integrations.slack.link_identity_view.failure"
-)
-SLACK_BOT_COMMAND_UNLINK_IDENTITY_SUCCESS_DATADOG_METRIC = (
-    "sentry.integrations.slack.unlink_identity_view.success"
-)
-SLACK_BOT_COMMAND_UNLINK_IDENTITY_FAILURE_DATADOG_METRIC = (
-    "sentry.integrations.slack.unlink_identity_view.failure"
-)
-SLACK_BOT_COMMAND_UNLINK_TEAM_SUCCESS_DATADOG_METRIC = (
-    "sentry.integrations.slack.unlink_team.success"
-)
-SLACK_BOT_COMMAND_UNLINK_TEAM_FAILURE_DATADOG_METRIC = (
-    "sentry.integrations.slack.unlink_team.failure"
-)
-SLACK_BOT_COMMAND_LINK_TEAM_SUCCESS_DATADOG_METRIC = "sentry.integrations.slack.link_team.success"
-SLACK_BOT_COMMAND_LINK_TEAM_FAILURE_DATADOG_METRIC = "sentry.integrations.slack.link_team.failure"
-
 # Webhooks
 SLACK_WEBHOOK_DM_ENDPOINT_SUCCESS_DATADOG_METRIC = "sentry.integrations.slack.dm_endpoint.success"
 SLACK_WEBHOOK_DM_ENDPOINT_FAILURE_DATADOG_METRIC = "sentry.integrations.slack.dm_endpoint.failure"
@@ -79,3 +65,14 @@
 # Middleware Parsers
 SLACK_MIDDLE_PARSERS_SUCCESS_DATADOG_METRIC = "sentry.middleware.integrations.slack.parsers.success"
 SLACK_MIDDLE_PARSERS_FAILURE_DATADOG_METRIC = "sentry.middleware.integrations.slack.parsers.failure"
+
+
+def record_lifecycle_termination_level(lifecycle: EventLifecycle, error: SlackApiError) -> None:
+    if (
+        (reason := unpack_slack_api_error(error))
+        and reason is not None
+        and reason in SLACK_SDK_HALT_ERROR_CATEGORIES
+    ):
+        lifecycle.record_halt(reason.message)
+    else:
+        lifecycle.record_failure(error)
diff --git a/src/sentry/integrations/slack/requests/base.py b/src/sentry/integrations/slack/requests/base.py
index f546bd9ff2f253..2b7bf34ea9f2b8 100644
--- a/src/sentry/integrations/slack/requests/base.py
+++ b/src/sentry/integrations/slack/requests/base.py
@@ -73,7 +73,6 @@ def validate(self) -> None:
         """
         Ensure everything is present to properly process this request
         """
-        self.request.body
         self._log_request()
         self._get_context()
         self.authorize()
diff --git a/src/sentry/integrations/slack/service.py b/src/sentry/integrations/slack/service.py
index 9b2dd314ca53f2..df0511ab1510ab 100644
--- a/src/sentry/integrations/slack/service.py
+++ b/src/sentry/integrations/slack/service.py
@@ -10,6 +10,10 @@
 from slack_sdk.errors import SlackApiError
 
 from sentry.constants import ISSUE_ALERTS_THREAD_DEFAULT
+from sentry.integrations.messaging.metrics import (
+    MessagingInteractionEvent,
+    MessagingInteractionType,
+)
 from sentry.integrations.models.integration import Integration
 from sentry.integrations.notifications import get_context
 from sentry.integrations.repository import get_default_issue_alert_repository
@@ -25,8 +29,10 @@
     SLACK_ACTIVITY_THREAD_SUCCESS_DATADOG_METRIC,
     SLACK_NOTIFY_RECIPIENT_FAILURE_DATADOG_METRIC,
     SLACK_NOTIFY_RECIPIENT_SUCCESS_DATADOG_METRIC,
+    record_lifecycle_termination_level,
 )
 from sentry.integrations.slack.sdk_client import SlackSdkClient
+from sentry.integrations.slack.spec import SlackMessagingSpec
 from sentry.integrations.slack.threads.activity_notifications import (
     AssignedActivityNotification,
     ExternalIssueCreatedActivityNotification,
@@ -182,12 +188,23 @@ def notify_all_threads_for_activity(self, activity: Activity) -> None:
         slack_client = SlackSdkClient(integration_id=integration.id)
 
         # Get all parent notifications, which will have the message identifier to use to reply in a thread
-        parent_notifications = (
-            self._notification_message_repository.get_all_parent_notification_messages_by_filters(
+        with MessagingInteractionEvent(
+            interaction_type=MessagingInteractionType.GET_PARENT_NOTIFICATION,
+            spec=SlackMessagingSpec(),
+        ).capture() as lifecycle:
+            lifecycle.add_extras(
+                {
+                    "activity_id": activity.id,
+                    "group_id": activity.group.id,
+                    "project_id": activity.project.id,
+                }
+            )
+            parent_notifications = self._notification_message_repository.get_all_parent_notification_messages_by_filters(
                 group_ids=[activity.group.id],
                 project_ids=[activity.project.id],
             )
-        )
+
+        # We don't wrap this in a lifecycle because _handle_parent_notification is already wrapped in a lifecycle
         for parent_notification in parent_notifications:
             try:
                 self._handle_parent_notification(
@@ -196,6 +213,7 @@ def notify_all_threads_for_activity(self, activity: Activity) -> None:
                     client=slack_client,
                 )
             except Exception as err:
+                # TODO(iamrajjoshi): We can probably swallow this error once we audit the lifecycle
                 self._logger.info(
                     "failed to send notification",
                     exc_info=err,
@@ -254,25 +272,33 @@ def _handle_parent_notification(
             "rule_action_uuid": parent_notification.rule_action_uuid,
         }
 
-        try:
-            client.chat_postMessage(
-                channel=channel_id,
-                thread_ts=parent_notification.message_identifier,
-                text=notification_to_send,
-                blocks=json_blocks,
-            )
-            metrics.incr(SLACK_ACTIVITY_THREAD_SUCCESS_DATADOG_METRIC, sample_rate=1.0)
-        except SlackApiError as e:
-            self._logger.info(
-                "failed to post message to slack",
-                extra={"error": str(e), "blocks": json_blocks, **extra},
-            )
-            metrics.incr(
-                SLACK_ACTIVITY_THREAD_FAILURE_DATADOG_METRIC,
-                sample_rate=1.0,
-                tags={"ok": e.response.get("ok", False), "status": e.response.status_code},
-            )
-            raise
+        with MessagingInteractionEvent(
+            interaction_type=MessagingInteractionType.SEND_ACTIVITY_NOTIFICATION,
+            spec=SlackMessagingSpec(),
+        ).capture() as lifecycle:
+            try:
+                client.chat_postMessage(
+                    channel=channel_id,
+                    thread_ts=parent_notification.message_identifier,
+                    text=notification_to_send,
+                    blocks=json_blocks,
+                )
+                # TODO(iamrajjoshi): Remove this after we validate lifecycle
+                metrics.incr(SLACK_ACTIVITY_THREAD_SUCCESS_DATADOG_METRIC, sample_rate=1.0)
+            except SlackApiError as e:
+                # TODO(iamrajjoshi): Remove this after we validate lifecycle
+                self._logger.info(
+                    "failed to post message to slack",
+                    extra={"error": str(e), "blocks": json_blocks, **extra},
+                )
+                metrics.incr(
+                    SLACK_ACTIVITY_THREAD_FAILURE_DATADOG_METRIC,
+                    sample_rate=1.0,
+                    tags={"ok": e.response.get("ok", False), "status": e.response.status_code},
+                )
+                lifecycle.add_extras({"rule_action_uuid": parent_notification.rule_action_uuid})
+                record_lifecycle_termination_level(lifecycle, e)
+                raise
 
     def _get_notification_message_to_send(self, activity: Activity) -> str | None:
         """
@@ -427,21 +453,32 @@ def send_message_to_slack_channel(
         """Execution of send_notification_as_slack."""
 
         client = SlackSdkClient(integration_id=integration_id)
-        try:
-            client.chat_postMessage(
-                blocks=str(payload.get("blocks", "")),
-                text=str(payload.get("text", "")),
-                channel=str(payload.get("channel", "")),
-                unfurl_links=False,
-                unfurl_media=False,
-                callback_id=str(payload.get("callback_id", "")),
-            )
-            metrics.incr(SLACK_NOTIFY_RECIPIENT_SUCCESS_DATADOG_METRIC, sample_rate=1.0)
-        except SlackApiError as e:
-            extra = {"error": str(e), **log_params}
-            self._logger.info(log_error_message, extra=extra)
-            metrics.incr(
-                SLACK_NOTIFY_RECIPIENT_FAILURE_DATADOG_METRIC,
-                sample_rate=1.0,
-                tags={"ok": e.response.get("ok", False), "status": e.response.status_code},
-            )
+        with MessagingInteractionEvent(
+            interaction_type=MessagingInteractionType.SEND_GENERIC_NOTIFICATION,
+            spec=SlackMessagingSpec(),
+        ).capture() as lifecycle:
+            try:
+                lifecycle.add_extras({"integration_id": integration_id})
+                client.chat_postMessage(
+                    blocks=str(payload.get("blocks", "")),
+                    text=str(payload.get("text", "")),
+                    channel=str(payload.get("channel", "")),
+                    unfurl_links=False,
+                    unfurl_media=False,
+                    callback_id=str(payload.get("callback_id", "")),
+                )
+                # TODO(iamrajjoshi): Remove this after we validate lifecycle
+                metrics.incr(SLACK_NOTIFY_RECIPIENT_SUCCESS_DATADOG_METRIC, sample_rate=1.0)
+            except SlackApiError as e:
+                # TODO(iamrajjoshi): Remove this after we validate lifecycle
+                extra = {"error": str(e), **log_params}
+                self._logger.info(log_error_message, extra=extra)
+                metrics.incr(
+                    SLACK_NOTIFY_RECIPIENT_FAILURE_DATADOG_METRIC,
+                    sample_rate=1.0,
+                    tags={"ok": e.response.get("ok", False), "status": e.response.status_code},
+                )
+                lifecycle.add_extras(
+                    {k: str(v) for k, v in log_params.items() if isinstance(v, (int, str))}
+                )
+                record_lifecycle_termination_level(lifecycle, e)
diff --git a/src/sentry/integrations/slack/utils/notifications.py b/src/sentry/integrations/slack/utils/notifications.py
index 32a2edebc34058..3923bd21c19632 100644
--- a/src/sentry/integrations/slack/utils/notifications.py
+++ b/src/sentry/integrations/slack/utils/notifications.py
@@ -31,13 +31,10 @@
     SLACK_LINK_IDENTITY_MSG_SUCCESS_DATADOG_METRIC,
     SLACK_METRIC_ALERT_FAILURE_DATADOG_METRIC,
     SLACK_METRIC_ALERT_SUCCESS_DATADOG_METRIC,
+    record_lifecycle_termination_level,
 )
 from sentry.integrations.slack.sdk_client import SlackSdkClient
 from sentry.integrations.slack.spec import SlackMessagingSpec
-from sentry.integrations.slack.utils.errors import (
-    SLACK_SDK_HALT_ERROR_CATEGORIES,
-    unpack_slack_api_error,
-)
 from sentry.models.options.organization_option import OrganizationOption
 from sentry.utils import metrics
 
@@ -176,14 +173,7 @@ def send_incident_alert_notification(
             lifecycle.add_extras(log_params)
             # If the error is a channel not found or archived, we can halt the flow
             # This means that the channel was deleted or archived after the alert rule was created
-            if (
-                (reason := unpack_slack_api_error(e))
-                and reason is not None
-                and reason in SLACK_SDK_HALT_ERROR_CATEGORIES
-            ):
-                lifecycle.record_halt(reason.message)
-            else:
-                lifecycle.record_failure(e)
+            record_lifecycle_termination_level(lifecycle, e)
 
         else:
             success = True
diff --git a/src/sentry/integrations/slack/views/__init__.py b/src/sentry/integrations/slack/views/__init__.py
index 9e0747e9003b25..bd7c1aa6ea9c5c 100644
--- a/src/sentry/integrations/slack/views/__init__.py
+++ b/src/sentry/integrations/slack/views/__init__.py
@@ -2,23 +2,15 @@
 
 from django.http import HttpRequest, HttpResponse
 from django.urls import reverse
-from django.views.decorators.cache import never_cache as django_never_cache
 from rest_framework.request import Request
 
 from sentry.utils.http import absolute_uri
 from sentry.utils.signing import sign
-from sentry.web.decorators import EndpointFunc
 from sentry.web.helpers import render_to_response
 
 SALT = "sentry-slack-integration"
 
 
-def never_cache(view_func: EndpointFunc) -> EndpointFunc:
-    """TODO(mgaeta): Remove cast once Django has a typed version."""
-    result: EndpointFunc = django_never_cache(view_func)
-    return result
-
-
 def build_linking_url(endpoint: str, **kwargs: Any) -> str:
     """TODO(mgaeta): Remove cast once sentry/utils/http.py is typed."""
     url: str = absolute_uri(reverse(endpoint, kwargs={"signed_params": sign(salt=SALT, **kwargs)}), options.get("slack.url-prefix"))
diff --git a/src/sentry/integrations/slack/webhooks/action.py b/src/sentry/integrations/slack/webhooks/action.py
index a4f74148431940..2e595016bee4c7 100644
--- a/src/sentry/integrations/slack/webhooks/action.py
+++ b/src/sentry/integrations/slack/webhooks/action.py
@@ -118,15 +118,7 @@ def update_group(
             status_code=403, body="The user does not have access to the organization."
         )
 
-    return update_groups(
-        request=request,
-        group_ids=[group.id],
-        projects=[group.project],
-        organization_id=group.organization.id,
-        search_fn=None,
-        user=user,
-        data=data,
-    )
+    return update_groups(request=request, groups=[group], user=user, data=data)
 
 
 def get_rule(slack_request: SlackActionRequest) -> Rule | None:
@@ -414,6 +406,7 @@ def _handle_group_actions(
                     )
 
                 view = View(**slack_request.data["view"])
+                assert view.private_metadata is not None
                 private_metadata = orjson.loads(view.private_metadata)
                 original_tags_from_request = set(private_metadata.get("tags", {}))
 
diff --git a/src/sentry/integrations/slack/webhooks/base.py b/src/sentry/integrations/slack/webhooks/base.py
index fba29ed49d3b62..0699aa9e3aab93 100644
--- a/src/sentry/integrations/slack/webhooks/base.py
+++ b/src/sentry/integrations/slack/webhooks/base.py
@@ -136,7 +136,6 @@ class SlackCommandDispatcher(MessagingIntegrationCommandDispatcher[Response]):
     @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,
@@ -147,7 +146,6 @@ def TEAM_HALT_MAPPINGS(self) -> dict[str, MessageCommandHaltReason]:
             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,
         }
 
@@ -200,7 +198,7 @@ def link_team_handler(self, input: CommandInput) -> IntegrationResponse[Response
         for message, reason in self.TEAM_HALT_MAPPINGS.items():
             if message in str(response.data):
                 return IntegrationResponse(
-                    interaction_result=EventLifecycleOutcome.SUCCESS,
+                    interaction_result=EventLifecycleOutcome.HALTED,
                     response=response,
                     outcome_reason=str(reason),
                 )
@@ -215,7 +213,7 @@ def unlink_team_handler(self, input: CommandInput) -> IntegrationResponse[Respon
         for message, reason in self.TEAM_HALT_MAPPINGS.items():
             if message in str(response.data):
                 return IntegrationResponse(
-                    interaction_result=EventLifecycleOutcome.SUCCESS,
+                    interaction_result=EventLifecycleOutcome.HALTED,
                     response=response,
                     outcome_reason=str(reason),
                 )
diff --git a/src/sentry/integrations/slack/webhooks/command.py b/src/sentry/integrations/slack/webhooks/command.py
index ea0f111566da4d..575d983f72dd7e 100644
--- a/src/sentry/integrations/slack/webhooks/command.py
+++ b/src/sentry/integrations/slack/webhooks/command.py
@@ -6,7 +6,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
@@ -27,7 +26,7 @@
 from sentry.models.organizationmember import OrganizationMember
 from sentry.utils import metrics
 
-_logger = logging.getLogger(__name__)
+_logger = logging.getLogger("sentry.integration.slack.bot-commands")
 
 from .base import SlackDMEndpoint
 
@@ -35,7 +34,6 @@
     "Link your Sentry team to this Slack channel! <{associate_url}|Link your team now> to receive "
     "notifications of issues in Sentry in Slack."
 )
-CHANNEL_ALREADY_LINKED_MESSAGE = "This channel already has a team linked to it."
 LINK_USER_FIRST_MESSAGE = (
     "You must first link your identity to Sentry by typing /sentry link. Be aware that you "
     "must be an admin or higher in your Sentry organization or a team admin to link your team."
@@ -86,9 +84,7 @@ def link_team(self, slack_request: SlackDMRequest) -> Response:
         if slack_request.channel_name == DIRECT_MESSAGE_CHANNEL_NAME:
             return self.reply(slack_request, LINK_FROM_CHANNEL_MESSAGE)
 
-        logger_params = {
-            "slack_request": slack_request,
-        }
+        logger_params = {}
 
         identity_user = slack_request.get_identity_user()
         if not identity_user:
@@ -103,17 +99,11 @@ def link_team(self, slack_request: SlackDMRequest) -> Response:
 
         has_valid_role = False
         for organization_membership in organization_memberships:
-            if not features.has(
-                "organizations:slack-multiple-team-single-channel-linking",
-                organization_membership.organization,
-            ) and is_team_linked_to_channel(organization_membership.organization, slack_request):
-                return self.reply(slack_request, CHANNEL_ALREADY_LINKED_MESSAGE)
-
             if is_valid_role(organization_membership) or is_team_admin(organization_membership):
                 has_valid_role = True
 
         if not has_valid_role:
-            _logger.info("insufficient-role", extra=logger_params)
+            _logger.error("insufficient-role", extra=logger_params)
             metrics.incr(
                 self._METRICS_FAILURE_KEY + ".link_team.insufficient_role", sample_rate=1.0
             )
diff --git a/src/sentry/integrations/source_code_management/repository.py b/src/sentry/integrations/source_code_management/repository.py
index bf737cdfda0062..3fbb2f746342d9 100644
--- a/src/sentry/integrations/source_code_management/repository.py
+++ b/src/sentry/integrations/source_code_management/repository.py
@@ -153,7 +153,17 @@ 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(SCMIntegrationInteractionType.GET_STACKTRACE_LINK).capture():
+        with self.record_event(
+            SCMIntegrationInteractionType.GET_STACKTRACE_LINK
+        ).capture() as lifecycle:
+            lifecycle.add_extras(
+                {
+                    "filepath": filepath,
+                    "default": default,
+                    "version": version,
+                    "organization_id": repo.organization_id,
+                }
+            )
             scope = sentry_sdk.Scope.get_isolation_scope()
             scope.set_tag("stacktrace_link.tried_version", False)
             if version:
@@ -182,7 +192,15 @@ 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(SCMIntegrationInteractionType.GET_CODEOWNER_FILE).capture():
+        with self.record_event(
+            SCMIntegrationInteractionType.GET_CODEOWNER_FILE
+        ).capture() as lifecycle:
+            lifecycle.add_extras(
+                {
+                    "ref": ref,
+                    "organization_id": repo.organization_id,
+                }
+            )
             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/webhook.py b/src/sentry/integrations/source_code_management/webhook.py
new file mode 100644
index 00000000000000..bc0eef1ae39cf9
--- /dev/null
+++ b/src/sentry/integrations/source_code_management/webhook.py
@@ -0,0 +1,26 @@
+from abc import ABC, abstractmethod
+from collections.abc import Mapping
+from typing import Any
+
+from sentry.integrations.utils.metrics import IntegrationWebhookEventType
+from sentry.models.repository import Repository
+
+
+class SCMWebhook(ABC):
+    @property
+    @abstractmethod
+    def provider(self) -> str:
+        raise NotImplementedError
+
+    @property
+    @abstractmethod
+    def event_type(self) -> IntegrationWebhookEventType:
+        raise NotImplementedError
+
+    @abstractmethod
+    def __call__(self, event: Mapping[str, Any], **kwargs) -> None:
+        raise NotImplementedError
+
+    @abstractmethod
+    def update_repo_data(self, repo: Repository, event: Mapping[str, Any]) -> None:
+        raise NotImplementedError
diff --git a/src/sentry/integrations/tasks/sync_status_inbound.py b/src/sentry/integrations/tasks/sync_status_inbound.py
index 7337a657ced6b1..d60829e5e4234e 100644
--- a/src/sentry/integrations/tasks/sync_status_inbound.py
+++ b/src/sentry/integrations/tasks/sync_status_inbound.py
@@ -1,5 +1,6 @@
 import logging
 from collections.abc import Iterable, Mapping
+from datetime import timedelta
 from typing import Any
 
 from django.db.models import Q
@@ -168,6 +169,20 @@ def get_resolutions_and_activity_data_for_groups(
     return resolutions_by_group_id, activity_type, activity_data
 
 
+def group_was_recently_resolved(group: Group) -> bool:
+    """
+    Check if the group was resolved in the last 3 minutes
+    """
+    if group.status != GroupStatus.RESOLVED:
+        return False
+
+    try:
+        group_resolution = GroupResolution.objects.get(group=group)
+        return group_resolution.datetime > django_timezone.now() - timedelta(minutes=3)
+    except GroupResolution.DoesNotExist:
+        return False
+
+
 @instrumented_task(
     name="sentry.integrations.tasks.sync_status_inbound",
     queue="integrations",
@@ -189,8 +204,8 @@ def sync_status_inbound(
         raise Integration.DoesNotExist
 
     organizations = Organization.objects.filter(id=organization_id)
-    affected_groups = Group.objects.get_groups_by_external_issue(
-        integration, organizations, issue_key
+    affected_groups = list(
+        Group.objects.get_groups_by_external_issue(integration, organizations, issue_key)
     )
     if not affected_groups:
         return
@@ -213,6 +228,17 @@ def sync_status_inbound(
         "integration_id": integration_id,
     }
     if action == ResolveSyncAction.RESOLVE:
+        # Check if the group was recently resolved and we should skip the request
+        # Avoid resolving the group in-app and then re-resolving via the integration webhook
+        # which would override the in-app resolution
+        resolvable_groups = []
+        for group in affected_groups:
+            if not group_was_recently_resolved(group):
+                resolvable_groups.append(group)
+
+        if not resolvable_groups:
+            return
+
         (
             resolutions_by_group_id,
             activity_type,
@@ -221,14 +247,14 @@ def sync_status_inbound(
             affected_groups, config.get("resolution_strategy"), activity_data, organization_id
         )
         Group.objects.update_group_status(
-            groups=affected_groups,
+            groups=resolvable_groups,
             status=GroupStatus.RESOLVED,
             substatus=None,
             activity_type=activity_type,
             activity_data=activity_data,
         )
         # after we update the group, pdate the resolutions
-        for group in affected_groups:
+        for group in resolvable_groups:
             resolution_params = resolutions_by_group_id.get(group.id)
             if resolution_params:
                 resolution, created = GroupResolution.objects.get_or_create(
diff --git a/src/sentry/integrations/utils/sync.py b/src/sentry/integrations/utils/sync.py
index 86bb58330748ae..4c15633a978081 100644
--- a/src/sentry/integrations/utils/sync.py
+++ b/src/sentry/integrations/utils/sync.py
@@ -102,6 +102,7 @@ def sync_group_assignee_inbound(
 
         if not assign:
             for group in affected_groups:
+                # XXX: Pass an acting user and make the acting_user mandatory
                 GroupAssignee.objects.deassign(
                     group,
                     assignment_source=AssignmentSource.from_integration(integration),
diff --git a/src/sentry/interfaces/security.py b/src/sentry/interfaces/security.py
index 2ca01d005cdc80..59ba1d6c4f5aba 100644
--- a/src/sentry/interfaces/security.py
+++ b/src/sentry/interfaces/security.py
@@ -150,7 +150,7 @@ class Csp(SecurityReport):
     """
     A CSP violation report.
 
-    See also: http://www.w3.org/TR/CSP/#violation-reports
+    See also: https://www.w3.org/TR/CSP/#violation-events
 
     >>> {
     >>>     "document_uri": "http://example.com/",
diff --git a/src/sentry/issues/attributes.py b/src/sentry/issues/attributes.py
index 26d730a418ecb9..2c8f1e842c8201 100644
--- a/src/sentry/issues/attributes.py
+++ b/src/sentry/issues/attributes.py
@@ -1,8 +1,8 @@
 import dataclasses
 import logging
+from collections.abc import Iterable
 from datetime import datetime
 from enum import Enum
-from typing import cast
 
 import urllib3
 from arroyo import Topic as ArroyoTopic
@@ -93,7 +93,7 @@ def bulk_send_snapshot_values(
     if group_ids is None and groups is None:
         raise ValueError("cannot send snapshot values when group_ids and groups are None")
 
-    group_list: list[Group | GroupValues] = cast(list[Group | GroupValues], groups) or []
+    group_list: list[Group | GroupValues] = [*(groups or [])]
     if group_ids:
         group_list.extend(_bulk_retrieve_group_values(group_ids))
 
@@ -128,10 +128,6 @@ def produce_snapshot_to_kafka(snapshot: GroupAttributesSnapshot) -> None:
         )
 
 
-def _retrieve_group_values(group_id: int) -> GroupValues:
-    return _bulk_retrieve_group_values([group_id])[0]
-
-
 def _bulk_retrieve_group_values(group_ids: list[int]) -> list[GroupValues]:
     group_values_map = {
         group["id"]: group
@@ -167,7 +163,7 @@ def _bulk_retrieve_group_values(group_ids: list[int]) -> list[GroupValues]:
 
 
 def _bulk_retrieve_snapshot_values(
-    group_values_list: list[Group | GroupValues], group_deleted: bool = False
+    group_values_list: Iterable[Group | GroupValues], group_deleted: bool = False
 ) -> list[GroupAttributesSnapshot]:
     group_assignee_map = {
         ga["group_id"]: ga
diff --git a/src/sentry/issues/endpoints/__init__.py b/src/sentry/issues/endpoints/__init__.py
index 36c255daf1830a..a1f812f708f8f0 100644
--- a/src/sentry/issues/endpoints/__init__.py
+++ b/src/sentry/issues/endpoints/__init__.py
@@ -6,7 +6,6 @@
 from .group_hashes import GroupHashesEndpoint
 from .group_notes import GroupNotesEndpoint
 from .group_notes_details import GroupNotesDetailsEndpoint
-from .group_participants import GroupParticipantsEndpoint
 from .group_similar_issues import GroupSimilarIssuesEndpoint
 from .group_similar_issues_embeddings import GroupSimilarIssuesEmbeddingsEndpoint
 from .group_tombstone import GroupTombstoneEndpoint
@@ -39,7 +38,6 @@
     "GroupHashesEndpoint",
     "GroupNotesDetailsEndpoint",
     "GroupNotesEndpoint",
-    "GroupParticipantsEndpoint",
     "GroupSimilarIssuesEmbeddingsEndpoint",
     "GroupSimilarIssuesEndpoint",
     "GroupTombstoneDetailsEndpoint",
diff --git a/src/sentry/issues/endpoints/actionable_items.py b/src/sentry/issues/endpoints/actionable_items.py
index 7e860fc7575b86..30087fb93faef8 100644
--- a/src/sentry/issues/endpoints/actionable_items.py
+++ b/src/sentry/issues/endpoints/actionable_items.py
@@ -1,5 +1,3 @@
-from typing import TypedDict
-
 from rest_framework.exceptions import NotFound
 from rest_framework.request import Request
 from rest_framework.response import Response
@@ -19,16 +17,6 @@
 from sentry.models.project import Project
 
 
-class ActionableItemResponse(TypedDict):
-    type: str
-    message: str
-    data: dict | None
-
-
-class SourceMapProcessingResponse(TypedDict):
-    errors: list[ActionableItemResponse]
-
-
 @region_silo_endpoint
 class ActionableItemsEndpoint(ProjectEndpoint):
     """
diff --git a/src/sentry/issues/endpoints/group_details.py b/src/sentry/issues/endpoints/group_details.py
index 40117285948b6c..a7675aa9323e23 100644
--- a/src/sentry/issues/endpoints/group_details.py
+++ b/src/sentry/issues/endpoints/group_details.py
@@ -18,7 +18,7 @@
     delete_group_list,
     get_first_last_release,
     prep_search,
-    update_groups,
+    update_groups_with_search_fn,
 )
 from sentry.api.serializers import GroupSerializer, GroupSerializerSnuba, serialize
 from sentry.api.serializers.models.group_stream import get_actions, get_available_issue_plugins
@@ -83,14 +83,11 @@ class GroupDetailsEndpoint(GroupEndpoint, EnvironmentMixin):
         },
     }
 
-    def _get_activity(self, request: Request, group, num):
-        return Activity.objects.get_activities_for_group(group, num)
-
-    def _get_seen_by(self, request: Request, group):
+    def _get_seen_by(self, request: Request, group: Group):
         seen_by = list(GroupSeen.objects.filter(group=group).order_by("-last_seen"))
         return [seen for seen in serialize(seen_by, request.user) if seen is not None]
 
-    def _get_context_plugins(self, request: Request, group):
+    def _get_context_plugins(self, request: Request, group: Group):
         project = group.project
         return serialize(
             [
@@ -105,7 +102,9 @@ def _get_context_plugins(self, request: Request, group):
         )
 
     @staticmethod
-    def __group_hourly_daily_stats(group: Group, environment_ids: Sequence[int]):
+    def __group_hourly_daily_stats(
+        group: Group, environment_ids: Sequence[int]
+    ) -> tuple[list[list[float]], list[list[float]]]:
         model = get_issue_tsdb_group_model(group.issue_category)
         now = timezone.now()
         hourly_stats = tsdb.backend.rollup(
@@ -133,7 +132,7 @@ def __group_hourly_daily_stats(group: Group, environment_ids: Sequence[int]):
 
         return hourly_stats, daily_stats
 
-    def get(self, request: Request, group) -> Response:
+    def get(self, request: Request, group: Group) -> Response:
         """
         Retrieve an Issue
         `````````````````
@@ -164,7 +163,7 @@ def get(self, request: Request, group) -> Response:
             )
 
             # TODO: these probably should be another endpoint
-            activity = self._get_activity(request, group, num=100)
+            activity = Activity.objects.get_activities_for_group(group, 100)
             seen_by = self._get_seen_by(request, group)
 
             if "release" not in collapse:
@@ -317,7 +316,7 @@ def get(self, request: Request, group) -> Response:
             )
             raise
 
-    def put(self, request: Request, group) -> Response:
+    def put(self, request: Request, group: Group) -> Response:
         """
         Update an Issue
         ```````````````
@@ -329,6 +328,11 @@ def put(self, request: Request, group) -> Response:
         :param string status: the new status for the issue.  Valid values
                               are ``"resolved"``, ``resolvedInNextRelease``,
                               ``"unresolved"``, and ``"ignored"``.
+        :param map statusDetails: additional details about the resolution.
+                                  Valid values are ``"inRelease"``, ``"inNextRelease"``,
+                                  ``"inCommit"``,  ``"ignoreDuration"``, ``"ignoreCount"``,
+                                  ``"ignoreWindow"``, ``"ignoreUserCount"``, and
+                                  ``"ignoreUserWindow"``.
         :param string assignedTo: the user or team that should be assigned to
                                   this issue. Can be of the form ``"<user_id>"``,
                                   ``"user:<user_id>"``, ``"<username>"``,
@@ -351,7 +355,7 @@ def put(self, request: Request, group) -> Response:
             discard = request.data.get("discard")
             project = group.project
             search_fn = functools.partial(prep_search, self, request, project)
-            response = update_groups(
+            response = update_groups_with_search_fn(
                 request, [group.id], [project], project.organization_id, search_fn
             )
             # if action was discard, there isn't a group to serialize anymore
diff --git a/src/sentry/issues/endpoints/group_event_details.py b/src/sentry/issues/endpoints/group_event_details.py
index fffb47f40ea3b9..686b7b20b69c6a 100644
--- a/src/sentry/issues/endpoints/group_event_details.py
+++ b/src/sentry/issues/endpoints/group_event_details.py
@@ -4,11 +4,11 @@
 from collections.abc import Sequence
 
 from django.contrib.auth.models import AnonymousUser
-from drf_spectacular.types import OpenApiTypes
-from drf_spectacular.utils import OpenApiParameter, extend_schema
+from drf_spectacular.utils import extend_schema
+from rest_framework.exceptions import ParseError
 from rest_framework.request import Request
 from rest_framework.response import Response
-from snuba_sdk import Condition, Or
+from snuba_sdk import Column, Condition, Op, Or
 from snuba_sdk.legacy import is_condition, parse_condition
 
 from sentry import eventstore
@@ -19,6 +19,7 @@
 from sentry.api.helpers.group_index import parse_and_convert_issue_search_query
 from sentry.api.helpers.group_index.validators import ValidationError
 from sentry.api.serializers import EventSerializer, serialize
+from sentry.api.utils import get_date_range_from_params
 from sentry.apidocs.constants import (
     RESPONSE_BAD_REQUEST,
     RESPONSE_FORBIDDEN,
@@ -26,9 +27,10 @@
     RESPONSE_UNAUTHORIZED,
 )
 from sentry.apidocs.examples.event_examples import EventExamples
-from sentry.apidocs.parameters import GlobalParams, IssueParams
+from sentry.apidocs.parameters import EventParams, GlobalParams, IssueParams
 from sentry.apidocs.utils import inline_sentry_response_serializer
 from sentry.eventstore.models import Event, GroupEvent
+from sentry.exceptions import InvalidParams
 from sentry.issues.endpoints.project_event_details import (
     GroupEventDetailsResponse,
     wrap_event_response,
@@ -49,7 +51,7 @@
 
 def issue_search_query_to_conditions(
     query: str, group: Group, user: User | AnonymousUser, environments: Sequence[Environment]
-) -> Sequence[Condition]:
+) -> list[Condition]:
     from sentry.utils.snuba import resolve_column, resolve_conditions
 
     dataset = (
@@ -135,14 +137,7 @@ class GroupEventDetailsEndpoint(GroupEndpoint):
             IssueParams.ISSUES_OR_GROUPS,
             IssueParams.ISSUE_ID,
             GlobalParams.ENVIRONMENT,
-            OpenApiParameter(
-                name="event_id",
-                type=OpenApiTypes.STR,
-                location=OpenApiParameter.PATH,
-                description="The ID of the event to retrieve, or 'latest', 'oldest', or 'recommended'.",
-                required=True,
-                enum=["latest", "oldest", "recommended"],
-            ),
+            EventParams.EVENT_ID_EXTENDED,
         ],
         responses={
             200: inline_sentry_response_serializer(
@@ -159,56 +154,75 @@ def get(self, request: Request, group: Group, event_id: str) -> Response:
         """
         Retrieves the details of an issue event.
         """
-        environments = [e for e in get_environments(request, group.project.organization)]
+        organization = group.project.organization
+        environments = [e for e in get_environments(request, organization)]
         environment_names = [e.name for e in environments]
 
+        try:
+            start, end = get_date_range_from_params(request.GET, optional=True)
+        except InvalidParams:
+            raise ParseError(detail="Invalid date range")
+
+        query = request.GET.get("query")
+        try:
+            conditions: list[Condition] = (
+                issue_search_query_to_conditions(query, group, request.user, environments)
+                if query
+                else []
+            )
+        except ValidationError:
+            raise ParseError(detail="Invalid event query")
+        except Exception:
+            logging.exception(
+                "group_event_details.parse_query",
+                extra={"query": query, "group": group.id, "organization": organization.id},
+            )
+            raise ParseError(detail="Unable to parse query")
+
+        if environments:
+            conditions.append(Condition(Column("environment"), Op.IN, environment_names))
+
+        metric = "api.endpoints.group_event_details.get"
+        error_response = {"detail": "Unable to apply query. Change or remove it and try again."}
+
+        event: Event | GroupEvent | None = None
+
         if event_id == "latest":
-            with metrics.timer("api.endpoints.group_event_details.get", tags={"type": "latest"}):
-                event: Event | GroupEvent | None = group.get_latest_event_for_environments(
-                    environment_names
-                )
+            with metrics.timer(metric, tags={"type": "latest", "query": bool(query)}):
+                try:
+                    event = group.get_latest_event(conditions=conditions, start=start, end=end)
+                except ValueError:
+                    return Response(error_response, status=400)
+
         elif event_id == "oldest":
-            with metrics.timer("api.endpoints.group_event_details.get", tags={"type": "oldest"}):
-                event = group.get_oldest_event_for_environments(environment_names)
+            with metrics.timer(metric, tags={"type": "oldest", "query": bool(query)}):
+                try:
+                    event = group.get_oldest_event(conditions=conditions, start=start, end=end)
+                except ValueError:
+                    return Response(error_response, status=400)
+
         elif event_id == "recommended":
-            query = request.GET.get("query")
-            if query:
-                with metrics.timer(
-                    "api.endpoints.group_event_details.get",
-                    tags={"type": "helpful", "query": True},
-                ):
-                    try:
-                        conditions = issue_search_query_to_conditions(
-                            query, group, request.user, environments
-                        )
-                        event = group.get_recommended_event_for_environments(
-                            environments, conditions
-                        )
-                    except ValidationError:
-                        return Response(status=400)
-                    except Exception:
-                        logging.exception(
-                            "group_event_details:get_helpful",
-                        )
-                        return Response(status=500)
-            else:
-                with metrics.timer(
-                    "api.endpoints.group_event_details.get",
-                    tags={"type": "helpful", "query": False},
-                ):
-                    event = group.get_recommended_event_for_environments(environments)
+            with metrics.timer(metric, tags={"type": "helpful", "query": bool(query)}):
+                try:
+                    event = group.get_recommended_event(conditions=conditions, start=start, end=end)
+                except ValueError:
+                    return Response(error_response, status=400)
+
         else:
-            with metrics.timer("api.endpoints.group_event_details.get", tags={"type": "event"}):
+            with metrics.timer(metric, tags={"type": "event"}):
                 event = eventstore.backend.get_event_by_id(
-                    group.project.id, event_id, group_id=group.id
+                    project_id=group.project.id, event_id=event_id, group_id=group.id
                 )
-            # TODO: Remove `for_group` check once performance issues are moved to the issue platform
-
-            if event is not None and hasattr(event, "for_group") and event.group:
+            if isinstance(event, Event) and event.group:
                 event = event.for_group(event.group)
 
         if event is None:
-            return Response({"detail": "Event not found"}, status=404)
+            error_text = (
+                "Event not found. The event ID may be incorrect, or its age exceeded the retention period."
+                if event_id not in {"recommended", "latest", "oldest"}
+                else "No matching event found. Try changing the environments, date range, or query."
+            )
+            return Response({"detail": error_text}, status=404)
 
         collapse = request.GET.getlist("collapse", [])
         if "stacktraceOnly" in collapse:
diff --git a/src/sentry/issues/endpoints/group_events.py b/src/sentry/issues/endpoints/group_events.py
index dc3e23c1fe8c3d..aed34a05bab13f 100644
--- a/src/sentry/issues/endpoints/group_events.py
+++ b/src/sentry/issues/endpoints/group_events.py
@@ -5,8 +5,7 @@
 from typing import TYPE_CHECKING, Any
 
 from django.utils import timezone
-from drf_spectacular.types import OpenApiTypes
-from drf_spectacular.utils import OpenApiParameter, extend_schema
+from drf_spectacular.utils import extend_schema
 from rest_framework.exceptions import ParseError
 from rest_framework.request import Request
 from rest_framework.response import Response
@@ -30,7 +29,7 @@
     RESPONSE_UNAUTHORIZED,
 )
 from sentry.apidocs.examples.event_examples import EventExamples
-from sentry.apidocs.parameters import GlobalParams, IssueParams
+from sentry.apidocs.parameters import EventParams, GlobalParams, IssueParams
 from sentry.apidocs.utils import inline_sentry_response_serializer
 from sentry.eventstore.models import Event
 from sentry.exceptions import InvalidParams, InvalidSearchQuery
@@ -68,27 +67,9 @@ class GroupEventsEndpoint(GroupEndpoint, EnvironmentMixin):
             GlobalParams.END,
             GlobalParams.STATS_PERIOD,
             GlobalParams.ENVIRONMENT,
-            OpenApiParameter(
-                name="full",
-                type=OpenApiTypes.BOOL,
-                location=OpenApiParameter.QUERY,
-                description="Specify true to include the full event body, including the stacktrace, in the event payload.",
-                required=False,
-            ),
-            OpenApiParameter(
-                name="sample",
-                type=OpenApiTypes.BOOL,
-                location=OpenApiParameter.QUERY,
-                description="Return events in pseudo-random order. This is deterministic so an identical query will always return the same events in the same order.",
-                required=False,
-            ),
-            OpenApiParameter(
-                name="query",
-                location=OpenApiParameter.QUERY,
-                type=OpenApiTypes.STR,
-                description="An optional search query for filtering events.",
-                required=False,
-            ),
+            EventParams.FULL_PAYLOAD,
+            EventParams.SAMPLE,
+            EventParams.QUERY,
         ],
         responses={
             200: inline_sentry_response_serializer(
diff --git a/src/sentry/issues/endpoints/group_hashes.py b/src/sentry/issues/endpoints/group_hashes.py
index 73c5104ec47d8d..69a095e4824e90 100644
--- a/src/sentry/issues/endpoints/group_hashes.py
+++ b/src/sentry/issues/endpoints/group_hashes.py
@@ -9,6 +9,7 @@
 from sentry.api.bases import GroupEndpoint
 from sentry.api.paginator import GenericOffsetPaginator
 from sentry.api.serializers import EventSerializer, SimpleEventSerializer, serialize
+from sentry.models.group import Group
 from sentry.models.grouphash import GroupHash
 from sentry.tasks.unmerge import unmerge
 from sentry.utils import metrics
@@ -22,7 +23,7 @@ class GroupHashesEndpoint(GroupEndpoint):
         "GET": ApiPublishStatus.PRIVATE,
     }
 
-    def get(self, request: Request, group) -> Response:
+    def get(self, request: Request, group: Group) -> Response:
         """
         List an Issue's Hashes
         ``````````````````````
@@ -59,7 +60,7 @@ def get(self, request: Request, group) -> Response:
             paginator=GenericOffsetPaginator(data_fn=data_fn),
         )
 
-    def put(self, request: Request, group) -> Response:
+    def put(self, request: Request, group: Group) -> Response:
         """
         Perform an unmerge by reassigning events with hash values corresponding to the given
         grouphash ids from being part of the given group to being part of a new group.
diff --git a/src/sentry/issues/endpoints/group_notes.py b/src/sentry/issues/endpoints/group_notes.py
index 4a76e5b45fe107..8f0b65ecf5edce 100644
--- a/src/sentry/issues/endpoints/group_notes.py
+++ b/src/sentry/issues/endpoints/group_notes.py
@@ -11,6 +11,7 @@
 from sentry.api.serializers import serialize
 from sentry.api.serializers.rest_framework.group_notes import NoteSerializer
 from sentry.models.activity import Activity
+from sentry.models.group import Group
 from sentry.models.groupsubscription import GroupSubscription
 from sentry.notifications.types import GroupSubscriptionReason
 from sentry.signals import comment_created
@@ -25,7 +26,7 @@ class GroupNotesEndpoint(GroupEndpoint):
         "POST": ApiPublishStatus.UNKNOWN,
     }
 
-    def get(self, request: AuthenticatedHttpRequest, group) -> Response:
+    def get(self, request: AuthenticatedHttpRequest, group: Group) -> Response:
         notes = Activity.objects.filter(group=group, type=ActivityType.NOTE.value)
 
         return self.paginate(
@@ -36,7 +37,7 @@ def get(self, request: AuthenticatedHttpRequest, group) -> Response:
             on_results=lambda x: serialize(x, request.user),
         )
 
-    def post(self, request: AuthenticatedHttpRequest, group) -> Response:
+    def post(self, request: AuthenticatedHttpRequest, group: Group) -> Response:
         serializer = NoteSerializer(
             data=request.data,
             context={
diff --git a/src/sentry/issues/endpoints/group_notes_details.py b/src/sentry/issues/endpoints/group_notes_details.py
index 7097802a0f0f05..74192125336738 100644
--- a/src/sentry/issues/endpoints/group_notes_details.py
+++ b/src/sentry/issues/endpoints/group_notes_details.py
@@ -10,6 +10,7 @@
 from sentry.api.serializers import serialize
 from sentry.api.serializers.rest_framework.group_notes import NoteSerializer
 from sentry.models.activity import Activity
+from sentry.models.group import Group
 from sentry.models.groupsubscription import GroupSubscription
 from sentry.notifications.types import GroupSubscriptionReason
 from sentry.signals import comment_deleted, comment_updated
@@ -27,7 +28,7 @@ class GroupNotesDetailsEndpoint(GroupEndpoint):
     # 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
-    def delete(self, request: Request, group, note_id) -> Response:
+    def delete(self, request: Request, group: Group, note_id: str) -> Response:
         if not request.user.is_authenticated:
             raise PermissionDenied(detail="Key doesn't have permission to delete Note")
 
@@ -69,7 +70,7 @@ def delete(self, request: Request, group, note_id) -> Response:
 
         return Response(status=204)
 
-    def put(self, request: Request, group, note_id) -> Response:
+    def put(self, request: Request, group: Group, note_id: str) -> Response:
         if not request.user.is_authenticated:
             raise PermissionDenied(detail="Key doesn't have permission to edit Note")
 
diff --git a/src/sentry/issues/endpoints/group_participants.py b/src/sentry/issues/endpoints/group_participants.py
deleted file mode 100644
index 1662be566b0b9b..00000000000000
--- a/src/sentry/issues/endpoints/group_participants.py
+++ /dev/null
@@ -1,25 +0,0 @@
-from __future__ import annotations
-
-from rest_framework.request import Request
-from rest_framework.response import Response
-
-from sentry.api.api_publish_status import ApiPublishStatus
-from sentry.api.base import region_silo_endpoint
-from sentry.api.bases import GroupEndpoint
-from sentry.models.group import Group
-from sentry.models.groupsubscription import GroupSubscriptionManager
-from sentry.users.services.user.service import user_service
-
-
-@region_silo_endpoint
-class GroupParticipantsEndpoint(GroupEndpoint):
-    publish_status = {
-        "GET": ApiPublishStatus.UNKNOWN,
-    }
-
-    def get(self, request: Request, group: Group) -> Response:
-        participants = GroupSubscriptionManager.get_participating_user_ids(group)
-
-        return Response(
-            user_service.serialize_many(filter={"user_ids": participants}, as_user=request.user)
-        )
diff --git a/src/sentry/issues/endpoints/group_similar_issues.py b/src/sentry/issues/endpoints/group_similar_issues.py
index cc7d8cedf49367..a5fb4f59a40171 100644
--- a/src/sentry/issues/endpoints/group_similar_issues.py
+++ b/src/sentry/issues/endpoints/group_similar_issues.py
@@ -13,7 +13,7 @@
 logger = logging.getLogger(__name__)
 
 
-def _fix_label(label):
+def _fix_label(label) -> str:
     if isinstance(label, tuple):
         return ":".join(label)
     return label
@@ -25,7 +25,7 @@ class GroupSimilarIssuesEndpoint(GroupEndpoint):
         "GET": ApiPublishStatus.PRIVATE,
     }
 
-    def get(self, request: Request, group) -> Response:
+    def get(self, request: Request, group: Group) -> Response:
         features = similarity.features
 
         limit_s = request.GET.get("limit", None)
@@ -54,13 +54,13 @@ def get(self, request: Request, group) -> Response:
         # We need to preserve the ordering of the Redis results, as that
         # ordering is directly shown in the UI
         for group_id, scores in zip(group_ids, group_scores):
-            group = serialized_groups.get(group_id)
-            if group is None:
+            serialized_group = serialized_groups.get(group_id)
+            if serialized_group is None:
                 # TODO(tkaemming): This should log when we filter out a group that is
                 # unable to be retrieved from the database. (This will soon be
                 # unexpected behavior, but still possible.)
                 continue
 
-            results.append((group, {_fix_label(k): v for k, v in scores.items()}))
+            results.append((serialized_group, {_fix_label(k): v for k, v in scores.items()}))
 
         return Response(results)
diff --git a/src/sentry/issues/endpoints/group_similar_issues_embeddings.py b/src/sentry/issues/endpoints/group_similar_issues_embeddings.py
index b51e57e3f8b760..fb46b54b8381da 100644
--- a/src/sentry/issues/endpoints/group_similar_issues_embeddings.py
+++ b/src/sentry/issues/endpoints/group_similar_issues_embeddings.py
@@ -12,22 +12,23 @@
 from sentry.api.base import region_silo_endpoint
 from sentry.api.bases.group import GroupEndpoint
 from sentry.api.serializers import serialize
-from sentry.grouping.grouping_info import get_grouping_info
+from sentry.grouping.grouping_info import get_grouping_info_from_variants
 from sentry.models.group import Group
 from sentry.models.grouphash import GroupHash
 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 (
+    ReferrerOptions,
     TooManyOnlySystemFramesException,
     event_content_has_stacktrace,
     get_stacktrace_string,
+    has_too_many_contributing_frames,
     killswitch_enabled,
 )
 from sentry.users.models.user import User
 from sentry.utils.safe import get_path
 
 logger = logging.getLogger(__name__)
-MAX_FRAME_COUNT = 50
 
 
 class FormattedSimilarIssuesEmbeddingsData(TypedDict):
@@ -42,24 +43,26 @@ class GroupSimilarIssuesEmbeddingsEndpoint(GroupEndpoint):
         "GET": ApiPublishStatus.PRIVATE,
     }
 
-    def get_group_hashes_for_group_id(self, group_id: int) -> set[str]:
-        hashes = GroupHash.objects.filter(group_id=group_id)
-        return {hash.hash for hash in hashes}
-
     def get_formatted_results(
         self,
         similar_issues_data: Sequence[SeerSimilarIssueData],
         user: User | AnonymousUser,
-        group_id: int,
+        group: Group,
     ) -> Sequence[tuple[Mapping[str, Any], Mapping[str, Any]] | None]:
         """
         Format the responses using to be used by the frontend by changing the  field names and
         changing the cosine distances into cosine similarities.
         """
-        hashes = self.get_group_hashes_for_group_id(group_id)
         group_data = {}
+        parent_hashes = [
+            similar_issue_data.parent_hash for similar_issue_data in similar_issues_data
+        ]
+        group_hashes = GroupHash.objects.filter(project_id=group.project_id, hash__in=parent_hashes)
+        parent_hashes_group_ids = {
+            group_hash.hash: group_hash.group_id for group_hash in group_hashes
+        }
         for similar_issue_data in similar_issues_data:
-            if similar_issue_data.parent_hash not in hashes:
+            if parent_hashes_group_ids[similar_issue_data.parent_hash] != group.id:
                 formatted_response: FormattedSimilarIssuesEmbeddingsData = {
                     "exception": round(1 - similar_issue_data.stacktrace_distance, 4),
                     "shouldBeGrouped": "Yes" if similar_issue_data.should_group else "No",
@@ -76,21 +79,27 @@ 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: Group) -> Response:
-        if killswitch_enabled(group.project.id):
+        if killswitch_enabled(group.project.id, ReferrerOptions.SIMILAR_ISSUES_TAB):
             return Response([])
 
         latest_event = group.get_latest_event()
         stacktrace_string = ""
+
         if latest_event and event_content_has_stacktrace(latest_event):
-            grouping_info = get_grouping_info(None, project=group.project, event=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")
+            variants = latest_event.get_grouping_variants(normalize_stacktraces=True)
+
+            if not has_too_many_contributing_frames(
+                latest_event, variants, ReferrerOptions.SIMILAR_ISSUES_TAB
+            ):
+                grouping_info = get_grouping_info_from_variants(variants)
+                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
@@ -138,6 +147,6 @@ def get(self, request: Request, group: Group) -> Response:
 
         if not results:
             return Response([])
-        formatted_results = self.get_formatted_results(results, request.user, group.id)
+        formatted_results = self.get_formatted_results(results, request.user, group)
 
         return Response(formatted_results)
diff --git a/src/sentry/issues/endpoints/group_tombstone.py b/src/sentry/issues/endpoints/group_tombstone.py
index ac5c2faee71b1d..cf9ad9e38148d3 100644
--- a/src/sentry/issues/endpoints/group_tombstone.py
+++ b/src/sentry/issues/endpoints/group_tombstone.py
@@ -8,6 +8,7 @@
 from sentry.api.paginator import OffsetPaginator
 from sentry.api.serializers import serialize
 from sentry.models.grouptombstone import GroupTombstone
+from sentry.models.project import Project
 
 
 @region_silo_endpoint
@@ -17,7 +18,7 @@ class GroupTombstoneEndpoint(ProjectEndpoint):
         "GET": ApiPublishStatus.PRIVATE,
     }
 
-    def get(self, request: Request, project) -> Response:
+    def get(self, request: Request, project: Project) -> Response:
         """
         Retrieve a Project's GroupTombstones
         ````````````````````````````````````
diff --git a/src/sentry/issues/endpoints/group_tombstone_details.py b/src/sentry/issues/endpoints/group_tombstone_details.py
index addd62e9489545..f2aa03517e6698 100644
--- a/src/sentry/issues/endpoints/group_tombstone_details.py
+++ b/src/sentry/issues/endpoints/group_tombstone_details.py
@@ -8,6 +8,7 @@
 from sentry.api.exceptions import ResourceDoesNotExist
 from sentry.models.grouphash import GroupHash
 from sentry.models.grouptombstone import GroupTombstone
+from sentry.models.project import Project
 
 
 @region_silo_endpoint
@@ -17,7 +18,7 @@ class GroupTombstoneDetailsEndpoint(ProjectEndpoint):
         "DELETE": ApiPublishStatus.PRIVATE,
     }
 
-    def delete(self, request: Request, project, tombstone_id) -> Response:
+    def delete(self, request: Request, project: Project, tombstone_id: str) -> Response:
         """
         Remove a GroupTombstone
         ```````````````````````
diff --git a/src/sentry/issues/endpoints/organization_eventid.py b/src/sentry/issues/endpoints/organization_eventid.py
index 3fddf7346d45c5..929cbd156b90ba 100644
--- a/src/sentry/issues/endpoints/organization_eventid.py
+++ b/src/sentry/issues/endpoints/organization_eventid.py
@@ -8,6 +8,7 @@
 from sentry.api.bases.organization import OrganizationEndpoint
 from sentry.api.exceptions import ResourceDoesNotExist
 from sentry.api.serializers import serialize
+from sentry.models.organization import Organization
 from sentry.models.project import Project
 from sentry.types.ratelimit import RateLimit, RateLimitCategory
 from sentry.utils.validators import INVALID_ID_DETAILS, is_event_id
@@ -28,7 +29,7 @@ class EventIdLookupEndpoint(OrganizationEndpoint):
         }
     }
 
-    def get(self, request: Request, organization, event_id) -> Response:
+    def get(self, request: Request, organization: Organization, event_id: str) -> Response:
         """
         Resolve an Event ID
         ``````````````````
diff --git a/src/sentry/issues/endpoints/organization_group_index.py b/src/sentry/issues/endpoints/organization_group_index.py
index 3d53a2bc19f4dd..08040c40b1c9ec 100644
--- a/src/sentry/issues/endpoints/organization_group_index.py
+++ b/src/sentry/issues/endpoints/organization_group_index.py
@@ -23,7 +23,7 @@
     delete_groups,
     get_by_short_id,
     track_slo_response,
-    update_groups,
+    update_groups_with_search_fn,
 )
 from sentry.api.helpers.group_index.validators import ValidationError
 from sentry.api.paginator import DateTimePaginator, Paginator
@@ -36,6 +36,7 @@
 from sentry.models.group import QUERY_STATUS_LOOKUP, Group, GroupStatus
 from sentry.models.groupenvironment import GroupEnvironment
 from sentry.models.groupinbox import GroupInbox
+from sentry.models.organization import Organization
 from sentry.models.project import Project
 from sentry.search.events.constants import EQUALITY_OPERATORS
 from sentry.search.snuba.backend import assigned_or_suggested_filter
@@ -59,7 +60,7 @@ def inbox_search(
     date_to: datetime | None = None,
     max_hits: int | None = None,
     actor: Any | None = None,
-) -> CursorResult:
+) -> CursorResult[Group]:
     now: datetime = timezone.now()
     end: datetime | None = None
     end_params: list[datetime] = [
@@ -151,8 +152,13 @@ class OrganizationGroupIndexEndpoint(OrganizationEndpoint):
     enforce_rate_limit = True
 
     def _search(
-        self, request: Request, organization, projects, environments, extra_query_kwargs=None
-    ):
+        self,
+        request: Request,
+        organization: Organization,
+        projects: Sequence[Project],
+        environments: Sequence[Environment],
+        extra_query_kwargs: None | Mapping[str, Any] = None,
+    ) -> tuple[CursorResult[Group], Mapping[str, Any]]:
         with start_span(op="_search"):
             query_kwargs = build_query_params_from_request(
                 request, organization, projects, environments
@@ -201,7 +207,7 @@ def use_group_snuba_dataset() -> bool:
             return result, query_kwargs
 
     @track_slo_response("workflow")
-    def get(self, request: Request, organization) -> Response:
+    def get(self, request: Request, organization: Organization) -> Response:
         """
         List an Organization's Issues
         `````````````````````````````
@@ -406,7 +412,7 @@ def get(self, request: Request, organization) -> Response:
         return response
 
     @track_slo_response("workflow")
-    def put(self, request: Request, organization) -> Response:
+    def put(self, request: Request, organization: Organization) -> Response:
         """
         Bulk Mutate a List of Issues
         ````````````````````````````
@@ -490,10 +496,10 @@ def put(self, request: Request, organization) -> Response:
         )
 
         ids = [int(id) for id in request.GET.getlist("id")]
-        return update_groups(request, ids, projects, organization.id, search_fn)
+        return update_groups_with_search_fn(request, ids, projects, organization.id, search_fn)
 
     @track_slo_response("workflow")
-    def delete(self, request: Request, organization) -> Response:
+    def delete(self, request: Request, organization: Organization) -> Response:
         """
         Bulk Remove a List of Issues
         ````````````````````````````
diff --git a/src/sentry/issues/endpoints/organization_shortid.py b/src/sentry/issues/endpoints/organization_shortid.py
index c7c50db957f054..0f08a7e6d867f8 100644
--- a/src/sentry/issues/endpoints/organization_shortid.py
+++ b/src/sentry/issues/endpoints/organization_shortid.py
@@ -8,6 +8,7 @@
 from sentry.api.exceptions import ResourceDoesNotExist
 from sentry.api.serializers import serialize
 from sentry.models.group import Group
+from sentry.models.organization import Organization
 
 
 @region_silo_endpoint
@@ -17,7 +18,7 @@ class ShortIdLookupEndpoint(OrganizationEndpoint):
         "GET": ApiPublishStatus.UNKNOWN,
     }
 
-    def get(self, request: Request, organization, short_id) -> Response:
+    def get(self, request: Request, organization: Organization, short_id: str) -> Response:
         """
         Resolve a Short ID
         ``````````````````
diff --git a/src/sentry/issues/endpoints/project_event_details.py b/src/sentry/issues/endpoints/project_event_details.py
index b3c1650db7f8f9..e477e4701b41f6 100644
--- a/src/sentry/issues/endpoints/project_event_details.py
+++ b/src/sentry/issues/endpoints/project_event_details.py
@@ -1,6 +1,7 @@
 from datetime import datetime
 from typing import Any
 
+import sentry_sdk
 from rest_framework.request import Request
 from rest_framework.response import Response
 
@@ -12,6 +13,7 @@
 from sentry.api.serializers import IssueEventSerializer, serialize
 from sentry.api.serializers.models.event import IssueEventSerializerResponse
 from sentry.eventstore.models import Event, GroupEvent
+from sentry.models.project import Project
 
 
 class GroupEventDetailsResponse(IssueEventSerializerResponse):
@@ -72,7 +74,7 @@ class ProjectEventDetailsEndpoint(ProjectEndpoint):
         "GET": ApiPublishStatus.EXPERIMENTAL,
     }
 
-    def get(self, request: Request, project, event_id) -> Response:
+    def get(self, request: Request, project: Project, event_id: str) -> Response:
         """
         Retrieve an Event for a Project
         ```````````````````````````````
@@ -120,7 +122,7 @@ class EventJsonEndpoint(ProjectEndpoint):
         "GET": ApiPublishStatus.EXPERIMENTAL,
     }
 
-    def get(self, request: Request, project, event_id) -> Response:
+    def get(self, request: Request, project: Project, event_id: str) -> Response:
         event = eventstore.backend.get_event_by_id(project.id, event_id)
 
         if not event:
@@ -130,4 +132,23 @@ def get(self, request: Request, project, event_id) -> Response:
         if isinstance(event_dict["datetime"], datetime):
             event_dict["datetime"] = event_dict["datetime"].isoformat()
 
+        try:
+            scrub_ip_addresses = project.organization.get_option(
+                "sentry:require_scrub_ip_address", False
+            ) or project.get_option("sentry:scrub_ip_address", False)
+
+            if scrub_ip_addresses:
+                if "spans" in event_dict:
+                    for span in event_dict["spans"]:
+                        if "sentry_tags" not in span:
+                            continue
+                        if "user.ip" in span["sentry_tags"]:
+                            del span["sentry_tags"]["user.ip"]
+                        if "user" in span["sentry_tags"] and span["sentry_tags"]["user"].startswith(
+                            "ip:"
+                        ):
+                            span["sentry_tags"]["user"] = "ip:[ip]"
+        except Exception as e:
+            sentry_sdk.capture_exception(e)
+
         return Response(event_dict, status=200)
diff --git a/src/sentry/issues/endpoints/project_events.py b/src/sentry/issues/endpoints/project_events.py
index 63e830ee08fde4..66d35d105d0cef 100644
--- a/src/sentry/issues/endpoints/project_events.py
+++ b/src/sentry/issues/endpoints/project_events.py
@@ -2,7 +2,7 @@
 from functools import partial
 
 from django.utils import timezone
-from drf_spectacular.utils import OpenApiParameter, extend_schema
+from drf_spectacular.utils import extend_schema
 from rest_framework.request import Request
 from rest_framework.response import Response
 
@@ -15,7 +15,7 @@
 from sentry.api.serializers.models.event import SimpleEventSerializerResponse
 from sentry.apidocs.constants import RESPONSE_FORBIDDEN, RESPONSE_NOT_FOUND, RESPONSE_UNAUTHORIZED
 from sentry.apidocs.examples.event_examples import EventExamples
-from sentry.apidocs.parameters import CursorQueryParam, GlobalParams
+from sentry.apidocs.parameters import CursorQueryParam, EventParams, GlobalParams
 from sentry.apidocs.utils import inline_sentry_response_serializer
 from sentry.models.project import Project
 from sentry.snuba.events import Columns
@@ -44,22 +44,8 @@ class ProjectEventsEndpoint(ProjectEndpoint):
             GlobalParams.ORG_ID_OR_SLUG,
             GlobalParams.PROJECT_ID_OR_SLUG,
             CursorQueryParam,
-            OpenApiParameter(
-                name="full",
-                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,
-                type=bool,
-                location="query",
-                default=False,
-            ),
-            OpenApiParameter(
-                name="sample",
-                description="Return events in pseudo-random order. This is deterministic so an identical query will always return the same events in the same order.",
-                required=False,
-                type=bool,
-                location="query",
-                default=False,
-            ),
+            EventParams.FULL_PAYLOAD,
+            EventParams.SAMPLE,
         ],
         responses={
             200: inline_sentry_response_serializer(
diff --git a/src/sentry/issues/endpoints/project_group_index.py b/src/sentry/issues/endpoints/project_group_index.py
index 06a5eb2b3c5b78..8f5c9d956da839 100644
--- a/src/sentry/issues/endpoints/project_group_index.py
+++ b/src/sentry/issues/endpoints/project_group_index.py
@@ -13,7 +13,7 @@
     get_by_short_id,
     prep_search,
     track_slo_response,
-    update_groups,
+    update_groups_with_search_fn,
 )
 from sentry.api.helpers.group_index.validators import ValidationError
 from sentry.api.serializers import serialize
@@ -21,6 +21,7 @@
 from sentry.models.environment import Environment
 from sentry.models.group import QUERY_STATUS_LOOKUP, Group, GroupStatus
 from sentry.models.grouphash import GroupHash
+from sentry.models.project import Project
 from sentry.search.events.constants import EQUALITY_OPERATORS
 from sentry.signals import advanced_search
 from sentry.types.ratelimit import RateLimit, RateLimitCategory
@@ -50,7 +51,7 @@ class ProjectGroupIndexEndpoint(ProjectEndpoint, EnvironmentMixin):
     }
 
     @track_slo_response("workflow")
-    def get(self, request: Request, project) -> Response:
+    def get(self, request: Request, project: Project) -> Response:
         """
         List a Project's Issues
         ```````````````````````
@@ -208,7 +209,7 @@ def get(self, request: Request, project) -> Response:
         return response
 
     @track_slo_response("workflow")
-    def put(self, request: Request, project) -> Response:
+    def put(self, request: Request, project: Project) -> Response:
         """
         Bulk Mutate a List of Issues
         ````````````````````````````
@@ -269,7 +270,7 @@ def put(self, request: Request, project) -> Response:
         """
 
         search_fn = functools.partial(prep_search, self, request, project)
-        return update_groups(
+        return update_groups_with_search_fn(
             request,
             request.GET.getlist("id"),
             [project],
@@ -278,7 +279,7 @@ def put(self, request: Request, project) -> Response:
         )
 
     @track_slo_response("workflow")
-    def delete(self, request: Request, project) -> Response:
+    def delete(self, request: Request, project: Project) -> Response:
         """
         Bulk Remove a List of Issues
         ````````````````````````````
diff --git a/src/sentry/issues/endpoints/project_group_stats.py b/src/sentry/issues/endpoints/project_group_stats.py
index 4a1227daf0f93c..3781a999f4a718 100644
--- a/src/sentry/issues/endpoints/project_group_stats.py
+++ b/src/sentry/issues/endpoints/project_group_stats.py
@@ -9,6 +9,7 @@
 from sentry.api.exceptions import ResourceDoesNotExist
 from sentry.models.environment import Environment
 from sentry.models.group import Group
+from sentry.models.project import Project
 from sentry.tsdb.base import TSDBModel
 from sentry.types.ratelimit import RateLimit, RateLimitCategory
 
@@ -28,7 +29,7 @@ class ProjectGroupStatsEndpoint(ProjectEndpoint, EnvironmentMixin, StatsMixin):
         }
     }
 
-    def get(self, request: Request, project) -> Response:
+    def get(self, request: Request, project: Project) -> Response:
         try:
             environment_id = self._get_environment_id_from_request(request, project.organization_id)
         except Environment.DoesNotExist:
diff --git a/src/sentry/issues/endpoints/source_map_debug.py b/src/sentry/issues/endpoints/source_map_debug.py
index fa07de1c795f40..a20d6008c55c02 100644
--- a/src/sentry/issues/endpoints/source_map_debug.py
+++ b/src/sentry/issues/endpoints/source_map_debug.py
@@ -78,9 +78,6 @@ def get(self, request: Request, project: Project, event_id: str) -> Response:
         debug_response = source_map_debug(project, event_id, exception_idx, frame_idx)
         issue, data = debug_response.issue, debug_response.data
 
-        return self._create_response(issue, data)
-
-    def _create_response(self, issue=None, data=None) -> Response:
         errors_list = []
         if issue:
             response = SourceMapProcessingIssue(issue, data=data).get_api_context()
diff --git a/src/sentry/issues/grouptype.py b/src/sentry/issues/grouptype.py
index 7810e9f66ba712..3819bc06de9ad7 100644
--- a/src/sentry/issues/grouptype.py
+++ b/src/sentry/issues/grouptype.py
@@ -1,11 +1,12 @@
 from __future__ import annotations
 
 import importlib
+import logging
 from collections import defaultdict
 from dataclasses import dataclass, field
 from datetime import timedelta
 from enum import Enum, StrEnum
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, ClassVar
 
 import sentry_sdk
 from django.apps import apps
@@ -21,11 +22,8 @@
 if TYPE_CHECKING:
     from sentry.models.organization import Organization
     from sentry.models.project import Project
-    from sentry.users.models.user import User
-    from sentry.workflow_engine.handlers.detector import DetectorHandler
     from sentry.workflow_engine.endpoints.validators import BaseGroupTypeDetectorValidator
-
-import logging
+    from sentry.workflow_engine.handlers.detector import DetectorHandler
 
 logger = logging.getLogger(__name__)
 
@@ -174,6 +172,10 @@ class GroupType:
     notification_config: NotificationConfig = NotificationConfig()
     detector_handler: type[DetectorHandler] | None = None
     detector_validator: type[BaseGroupTypeDetectorValidator] | None = None
+    # Controls whether status change (i.e. resolved, regressed) workflow notifications are enabled.
+    # Defaults to true to maintain the default workflow notification behavior as it exists for error group types.
+    enable_status_change_workflow_notifications: bool = True
+    detector_config_schema: ClassVar[dict[str, Any]] = {}
 
     def __init_subclass__(cls: type[GroupType], **kwargs: Any) -> None:
         super().__init_subclass__(**kwargs)
@@ -189,13 +191,6 @@ def __post_init__(self) -> None:
         if self.category not in valid_categories:
             raise ValueError(f"Category must be one of {valid_categories} from GroupCategory.")
 
-    @classmethod
-    def is_visible(cls, organization: Organization, user: User | None = None) -> bool:
-        if cls.released:
-            return True
-
-        return features.has(cls.build_visible_feature_name(), organization, actor=user)
-
     @classmethod
     def allow_ingest(cls, organization: Organization) -> bool:
         if cls.released:
@@ -635,6 +630,7 @@ class MetricIssuePOC(GroupType):
     default_priority = PriorityLevel.HIGH
     enable_auto_resolve = False
     enable_escalation_detection = False
+    enable_status_change_workflow_notifications = False
 
 
 def should_create_group(
@@ -669,7 +665,7 @@ def should_create_group(
         return False
 
 
-def import_grouptype():
+def import_grouptype() -> None:
     """
     Ensures that grouptype.py is imported in any apps that implement it. We do this to make sure that all implemented
     grouptypes are loaded and registered.
diff --git a/src/sentry/issues/highlights.py b/src/sentry/issues/highlights.py
index 2e05a5aabddee1..a572832919d4d6 100644
--- a/src/sentry/issues/highlights.py
+++ b/src/sentry/issues/highlights.py
@@ -7,7 +7,7 @@
 from rest_framework import serializers
 
 from sentry.models.project import Project
-from sentry.utils.platform_categories import BACKEND, FRONTEND, MOBILE
+from sentry.utils.platform_categories import MOBILE
 
 
 @extend_schema_field(field=OpenApiTypes.OBJECT)
@@ -35,33 +35,22 @@ class HighlightPreset(TypedDict):
     context: Mapping[str, list[str]]
 
 
-SENTRY_TAGS = ["handled", "level", "release", "environment"]
+DEFAULT_HIGHLIGHT_TAGS = ["handled", "level"]
+DEFAULT_HIGHLIGHT_CTX = {"trace": ["trace_id"]}
 
-BACKEND_HIGHLIGHTS: HighlightPreset = {
-    "tags": SENTRY_TAGS + ["url", "transaction", "status_code"],
-    "context": {"trace": ["trace_id"], "runtime": ["name", "version"]},
-}
-FRONTEND_HIGHLIGHTS: HighlightPreset = {
-    "tags": SENTRY_TAGS + ["url", "transaction", "browser", "user"],
-    "context": {"user": ["email"]},
-}
 MOBILE_HIGHLIGHTS: HighlightPreset = {
-    "tags": SENTRY_TAGS + ["mobile", "main_thread"],
-    "context": {"profile": ["profile_id"], "app": ["name"], "device": ["family"]},
+    "tags": DEFAULT_HIGHLIGHT_TAGS + ["mobile", "main_thread"],
+    "context": {**DEFAULT_HIGHLIGHT_CTX, "profile": ["profile_id"], "app": ["name"]},
 }
 FALLBACK_HIGHLIGHTS: HighlightPreset = {
-    "tags": SENTRY_TAGS,
-    "context": {"user": ["email"], "trace": ["trace_id"]},
+    "tags": DEFAULT_HIGHLIGHT_TAGS + ["url"],
+    "context": {**DEFAULT_HIGHLIGHT_CTX},
 }
 
 
 def get_highlight_preset_for_project(project: Project) -> HighlightPreset:
     if not project.platform or project.platform == "other":
         return FALLBACK_HIGHLIGHTS
-    elif project.platform in FRONTEND:
-        return FRONTEND_HIGHLIGHTS
-    elif project.platform in BACKEND:
-        return BACKEND_HIGHLIGHTS
     elif project.platform in MOBILE:
         return MOBILE_HIGHLIGHTS
     return FALLBACK_HIGHLIGHTS
diff --git a/src/sentry/issues/priority.py b/src/sentry/issues/priority.py
index c42aef02b43656..99195a307406da 100644
--- a/src/sentry/issues/priority.py
+++ b/src/sentry/issues/priority.py
@@ -30,10 +30,6 @@ class PriorityChangeReason(Enum):
     PriorityLevel.LOW: GroupHistoryStatus.PRIORITY_LOW,
 }
 
-GROUP_HISTORY_STATUS_TO_PRIORITY = {
-    value: key for key, value in PRIORITY_TO_GROUP_HISTORY_STATUS.items()
-}
-
 
 def update_priority(
     group: Group,
diff --git a/src/sentry/lang/java/utils.py b/src/sentry/lang/java/utils.py
index 8fb98d52d6ff08..2d8dd6a0de0aa4 100644
--- a/src/sentry/lang/java/utils.py
+++ b/src/sentry/lang/java/utils.py
@@ -12,7 +12,6 @@
 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
 
@@ -133,8 +132,8 @@ def is_jvm_event(data: Any, stacktraces: list[StacktraceInfo]) -> bool:
             return True
 
     # check if there are any JVM or Proguard images
-    # TODO: Can this actually happen if the event platform
-    # is not "java"?
+    # we *do* hit this code path, likely for events that don't have platform
+    # `"java"` but contain Java view hierarchies.
     images = get_path(
         data,
         "debug_meta",
@@ -144,8 +143,6 @@ def is_jvm_event(data: Any, stacktraces: list[StacktraceInfo]) -> bool:
     )
 
     if images:
-        metrics.incr("process.java.symbolicate.missing_platform", tags={platform: platform})
-
         return True
 
     return False
diff --git a/src/sentry/lang/native/processing.py b/src/sentry/lang/native/processing.py
index 022b30d4198780..b1cef31a389698 100644
--- a/src/sentry/lang/native/processing.py
+++ b/src/sentry/lang/native/processing.py
@@ -489,6 +489,8 @@ def emit_apple_symbol_stats(apple_symbol_stats, data):
         data, "contexts", "os", "raw_description"
     )
     os_version = get_path(data, "contexts", "os", "version")
+    # See https://develop.sentry.dev/sdk/data-model/event-payloads/contexts/
+    is_simulator = get_path(data, "contexts", "device", "simulator", default=False)
 
     if os_version:
         os_version = os_version.split(".", 1)[0]
@@ -497,19 +499,25 @@ def emit_apple_symbol_stats(apple_symbol_stats, data):
         metrics.incr(
             "apple_symbol_availability_v2",
             amount=neither,
-            tags={"availability": "neither", "os_name": os_name, "os_version": os_version},
+            tags={
+                "availability": "neither",
+                "os_name": os_name,
+                "os_version": os_version,
+                "is_simulator": is_simulator,
+            },
             sample_rate=1.0,
         )
 
-    # TODO: This seems to just be wrong
-    # We want mutual exclusion here, since we don't want to double count. E.g., an event has both symbols, so we
-    # count it both in `both` and `old` or `symx` which makes it impossible for us to know the percentage of events
-    # that matched both.
     if both := apple_symbol_stats.get("both"):
         metrics.incr(
             "apple_symbol_availability_v2",
             amount=both,
-            tags={"availability": "both", "os_name": os_name, "os_version": os_version},
+            tags={
+                "availability": "both",
+                "os_name": os_name,
+                "os_version": os_version,
+                "is_simulator": is_simulator,
+            },
             sample_rate=1.0,
         )
 
@@ -517,7 +525,12 @@ def emit_apple_symbol_stats(apple_symbol_stats, data):
         metrics.incr(
             "apple_symbol_availability_v2",
             amount=old,
-            tags={"availability": "old", "os_name": os_name, "os_version": os_version},
+            tags={
+                "availability": "old",
+                "os_name": os_name,
+                "os_version": os_version,
+                "is_simulator": is_simulator,
+            },
             sample_rate=1.0,
         )
 
@@ -525,7 +538,12 @@ def emit_apple_symbol_stats(apple_symbol_stats, data):
         metrics.incr(
             "apple_symbol_availability_v2",
             amount=symx,
-            tags={"availability": "symx", "os_name": os_name, "os_version": os_version},
+            tags={
+                "availability": "symx",
+                "os_name": os_name,
+                "os_version": os_version,
+                "is_simulator": is_simulator,
+            },
             sample_rate=1.0,
         )
 
diff --git a/src/sentry/logging/handlers.py b/src/sentry/logging/handlers.py
index 2a05424f00b331..4113bbeb59be15 100644
--- a/src/sentry/logging/handlers.py
+++ b/src/sentry/logging/handlers.py
@@ -1,5 +1,8 @@
+from __future__ import annotations
+
 import logging
 import re
+from typing import Any
 
 from django.utils.timezone import now
 from structlog import get_logger
@@ -79,7 +82,7 @@ def __call__(self, logger, name, event_dict):
 
 
 class StructLogHandler(logging.StreamHandler):
-    def get_log_kwargs(self, record, logger):
+    def get_log_kwargs(self, record: logging.LogRecord) -> dict[str, Any]:
         kwargs = {k: v for k, v in vars(record).items() if k not in throwaways and v is not None}
         kwargs.update({"level": record.levelno, "event": record.msg})
 
@@ -96,7 +99,7 @@ def get_log_kwargs(self, record, logger):
 
         return kwargs
 
-    def emit(self, record, logger=None):
+    def emit(self, record: logging.LogRecord, logger: logging.Logger | None = None) -> None:
         # If anyone wants to use the 'extra' kwarg to provide context within
         # structlog, we have to strip all of the default attributes from
         # a record because the RootLogger will take the 'extra' dictionary
@@ -104,12 +107,24 @@ def emit(self, record, logger=None):
         try:
             if logger is None:
                 logger = get_logger()
-            logger.log(**self.get_log_kwargs(record=record, logger=logger))
+            logger.log(**self.get_log_kwargs(record=record))
         except Exception:
             if logging.raiseExceptions:
                 raise
 
 
+class GKEStructLogHandler(StructLogHandler):
+    def get_log_kwargs(self, record: logging.LogRecord) -> dict[str, Any]:
+        kwargs = super().get_log_kwargs(record)
+        kwargs.update(
+            {
+                "logging.googleapis.com/labels": {"name": kwargs.get("name", "root")},
+                "severity": record.levelname,
+            }
+        )
+        return kwargs
+
+
 class MessageContainsFilter(logging.Filter):
     """
     A logging filter that allows log records where the message
diff --git a/src/sentry/middleware/integrations/parsers/gitlab.py b/src/sentry/middleware/integrations/parsers/gitlab.py
index 9f48aba2f27ef8..aad4e9a4c48b71 100644
--- a/src/sentry/middleware/integrations/parsers/gitlab.py
+++ b/src/sentry/middleware/integrations/parsers/gitlab.py
@@ -8,7 +8,7 @@
 from django.http.response import HttpResponseBase
 
 from sentry.hybridcloud.outbox.category import WebhookProviderIdentifier
-from sentry.integrations.gitlab.webhooks import GitlabWebhookEndpoint, GitlabWebhookMixin
+from sentry.integrations.gitlab.webhooks import GitlabWebhookEndpoint, get_gitlab_external_id
 from sentry.integrations.middleware.hybrid_cloud.parser import BaseRequestParser
 from sentry.integrations.models.integration import Integration
 from sentry.integrations.models.organization_integration import OrganizationIntegration
@@ -20,7 +20,7 @@
 logger = logging.getLogger(__name__)
 
 
-class GitlabRequestParser(BaseRequestParser, GitlabWebhookMixin):
+class GitlabRequestParser(BaseRequestParser):
     provider = EXTERNAL_PROVIDERS[ExternalProviders.GITLAB]
     webhook_identifier = WebhookProviderIdentifier.GITLAB
     _integration: Integration | None = None
@@ -35,7 +35,7 @@ def _resolve_external_id(self) -> tuple[str, str] | HttpResponseBase:
             # AppPlatformEvents also hit this API
             "event-type": self.request.META.get("HTTP_X_GITLAB_EVENT"),
         }
-        return super()._get_external_id(request=self.request, extra=extra)
+        return get_gitlab_external_id(request=self.request, extra=extra)
 
     @control_silo_function
     def get_integration_from_request(self) -> Integration | None:
diff --git a/src/sentry/migrations/0803_delete_unused_metricskeyindexer_pt1.py b/src/sentry/migrations/0803_delete_unused_metricskeyindexer_pt1.py
new file mode 100644
index 00000000000000..e468f091384ec2
--- /dev/null
+++ b/src/sentry/migrations/0803_delete_unused_metricskeyindexer_pt1.py
@@ -0,0 +1,29 @@
+# Generated by Django 5.1.4 on 2024-12-19 20:24
+
+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", "0802_remove_grouping_auto_update_option"),
+    ]
+
+    operations = [
+        SafeDeleteModel(name="MetricsKeyIndexer", deletion_action=DeletionAction.MOVE_TO_PENDING),
+    ]
diff --git a/src/sentry/migrations/0804_delete_metrics_key_indexer_pt2.py b/src/sentry/migrations/0804_delete_metrics_key_indexer_pt2.py
new file mode 100644
index 00000000000000..c863a8ca7f503e
--- /dev/null
+++ b/src/sentry/migrations/0804_delete_metrics_key_indexer_pt2.py
@@ -0,0 +1,27 @@
+# Generated by Django 5.1.4 on 2024-12-26 14:38
+
+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", "0803_delete_unused_metricskeyindexer_pt1"),
+    ]
+
+    operations = [SafeDeleteModel(name="MetricsKeyIndexer", deletion_action=DeletionAction.DELETE)]
diff --git a/src/sentry/models/activity.py b/src/sentry/models/activity.py
index 827d244880cf3c..363c6cd7dd7f1a 100644
--- a/src/sentry/models/activity.py
+++ b/src/sentry/models/activity.py
@@ -23,8 +23,9 @@
 )
 from sentry.db.models.fields.hybrid_cloud_foreign_key import HybridCloudForeignKey
 from sentry.db.models.manager.base import BaseManager
+from sentry.issues.grouptype import get_group_type_by_type_id
 from sentry.tasks import activity
-from sentry.types.activity import CHOICES, ActivityType
+from sentry.types.activity import CHOICES, STATUS_CHANGE_ACTIVITY_TYPES, ActivityType
 from sentry.types.group import PriorityLevel
 
 if TYPE_CHECKING:
@@ -127,10 +128,10 @@ class Meta:
     __repr__ = sane_repr("project_id", "group_id", "event_id", "user_id", "type", "ident")
 
     @staticmethod
-    def get_version_ident(version):
+    def get_version_ident(version: str | None) -> str:
         return (version or "")[:64]
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
         super().__init__(*args, **kwargs)
         from sentry.models.release import Release
 
@@ -142,7 +143,7 @@ def __init__(self, *args, **kwargs):
         if self.type == ActivityType.ASSIGNED.value:
             self.data["assignee"] = str(self.data["assignee"])
 
-    def save(self, *args, **kwargs):
+    def save(self, *args: Any, **kwargs: Any) -> None:
         created = bool(not self.id)
 
         super().save(*args, **kwargs)
@@ -177,8 +178,8 @@ def save(self, *args, **kwargs):
                     sender=Group, instance=self.group, created=True, update_fields=["num_comments"]
                 )
 
-    def delete(self, *args, **kwargs):
-        super().delete(*args, **kwargs)
+    def delete(self, *args: Any, **kwargs: Any) -> tuple[int, dict[str, int]]:
+        result = super().delete(*args, **kwargs)
 
         # HACK: support Group.num_comments
         if self.type == ActivityType.NOTE.value and self.group is not None:
@@ -190,7 +191,21 @@ def delete(self, *args, **kwargs):
                     sender=Group, instance=self.group, created=True, update_fields=["num_comments"]
                 )
 
-    def send_notification(self):
+        return result
+
+    def send_notification(self) -> None:
+        if self.group:
+            group_type = get_group_type_by_type_id(self.group.type)
+            has_status_change_notifications = group_type.enable_status_change_workflow_notifications
+            is_status_change = self.type in {
+                activity.value for activity in STATUS_CHANGE_ACTIVITY_TYPES
+            }
+
+            # Skip sending the activity notification if the group type does not
+            # support status change workflow notifications
+            if is_status_change and not has_status_change_notifications:
+                return
+
         activity.send_activity_notifications.delay(self.id)
 
 
diff --git a/src/sentry/models/apiapplication.py b/src/sentry/models/apiapplication.py
index bd44f5d8bf019c..a1912fffbc75e8 100644
--- a/src/sentry/models/apiapplication.py
+++ b/src/sentry/models/apiapplication.py
@@ -111,16 +111,20 @@ def is_active(self):
     def is_allowed_response_type(self, value):
         return value in ("code", "token")
 
-    def is_valid_redirect_uri(self, value):
+    def normalize_url(self, value):
         parts = urlparse(value)
         normalized_path = os.path.normpath(parts.path)
-        if value.endswith("/"):
+        if normalized_path == ".":
+            normalized_path = "/"
+        elif value.endswith("/") and not normalized_path.endswith("/"):
             normalized_path += "/"
-        value = urlunparse(parts._replace(path=normalized_path))
+        return urlunparse(parts._replace(path=normalized_path))
+
+    def is_valid_redirect_uri(self, value):
+        value = self.normalize_url(value)
 
-        for ruri in self.redirect_uris.split("\n"):
-            if parts.netloc != urlparse(ruri).netloc:
-                continue
+        for redirect_uri in self.redirect_uris.split("\n"):
+            ruri = self.normalize_url(redirect_uri)
             if value == ruri:
                 return True
             if value.startswith(ruri):
diff --git a/src/sentry/models/apigrant.py b/src/sentry/models/apigrant.py
index f949712c2080f0..d511a611aee4fb 100644
--- a/src/sentry/models/apigrant.py
+++ b/src/sentry/models/apigrant.py
@@ -78,6 +78,11 @@ class Meta:
         app_label = "sentry"
         db_table = "sentry_apigrant"
 
+    def __str__(self):
+        return (
+            f"api_grant_id={self.id}, user_id={self.user.id}, application_id={self.application.id}"
+        )
+
     def get_scopes(self):
         if self.scope_list:
             return self.scope_list
diff --git a/src/sentry/models/apikey.py b/src/sentry/models/apikey.py
index 612d0ca606822c..a93d6190f28818 100644
--- a/src/sentry/models/apikey.py
+++ b/src/sentry/models/apikey.py
@@ -56,7 +56,7 @@ def handle_async_replication(self, region_name: str, shard_identifier: int) -> N
         )
 
     def __str__(self):
-        return str(self.key)
+        return f"api_key_id={self.id}, status={self.status}"
 
     @classmethod
     def generate_api_key(cls):
diff --git a/src/sentry/models/apitoken.py b/src/sentry/models/apitoken.py
index e7c80482ac0335..92522b78368a85 100644
--- a/src/sentry/models/apitoken.py
+++ b/src/sentry/models/apitoken.py
@@ -137,7 +137,7 @@ class Meta:
     __repr__ = sane_repr("user_id", "token", "application_id")
 
     def __str__(self):
-        return force_str(self.token)
+        return f"token_id={force_str(self.id)}"
 
     def _set_plaintext_token(self, token: str) -> None:
         """Set the plaintext token for one-time reading
diff --git a/src/sentry/models/group.py b/src/sentry/models/group.py
index c5243200ec00ab..ac8348e2f827a3 100644
--- a/src/sentry/models/group.py
+++ b/src/sentry/models/group.py
@@ -229,24 +229,33 @@ class EventOrdering(Enum):
     ]
 
 
-def get_oldest_or_latest_event_for_environments(
-    ordering: EventOrdering, environments: Sequence[str], group: Group
+def get_oldest_or_latest_event(
+    group: Group,
+    ordering: EventOrdering,
+    conditions: Sequence[Condition] | None = None,
+    start: datetime | None = None,
+    end: datetime | None = None,
 ) -> GroupEvent | None:
-    conditions = []
-
-    if len(environments) > 0:
-        conditions.append(["environment", "IN", environments])
 
     if group.issue_category == GroupCategory.ERROR:
         dataset = Dataset.Events
     else:
         dataset = Dataset.IssuePlatform
 
-    _filter = eventstore.Filter(
-        conditions=conditions, project_ids=[group.project_id], group_ids=[group.id]
-    )
-    events = eventstore.backend.get_events(
-        filter=_filter,
+    all_conditions = [
+        Condition(Column("project_id"), Op.IN, [group.project.id]),
+        Condition(Column("group_id"), Op.IN, [group.id]),
+    ]
+
+    if conditions:
+        all_conditions.extend(conditions)
+
+    events = eventstore.backend.get_events_snql(
+        organization_id=group.project.organization_id,
+        group_id=group.id,
+        start=start,
+        end=end,
+        conditions=all_conditions,
         limit=1,
         orderby=ordering.value,
         referrer="Group.get_latest",
@@ -260,32 +269,32 @@ def get_oldest_or_latest_event_for_environments(
     return None
 
 
-def get_recommended_event_for_environments(
-    environments: Sequence[Environment],
+def get_recommended_event(
     group: Group,
     conditions: Sequence[Condition] | None = None,
+    start: datetime | None = None,
+    end: datetime | None = None,
 ) -> GroupEvent | None:
     if group.issue_category == GroupCategory.ERROR:
         dataset = Dataset.Events
     else:
         dataset = Dataset.IssuePlatform
 
-    all_conditions = []
-    if len(environments) > 0:
-        all_conditions.append(
-            Condition(Column("environment"), Op.IN, [e.name for e in environments])
-        )
-    all_conditions.append(Condition(Column("project_id"), Op.IN, [group.project.id]))
-    all_conditions.append(Condition(Column("group_id"), Op.IN, [group.id]))
+    all_conditions = [
+        Condition(Column("project_id"), Op.IN, [group.project.id]),
+        Condition(Column("group_id"), Op.IN, [group.id]),
+    ]
 
     if conditions:
         all_conditions.extend(conditions)
 
-    end = group.last_seen + timedelta(minutes=1)
-    start = end - timedelta(days=7)
+    default_end = group.last_seen + timedelta(minutes=1)
+    default_start = default_end - timedelta(days=7)
 
     expired, _ = outside_retention_with_modified_start(
-        start, end, Organization(group.project.organization_id)
+        start=start if start else default_start,
+        end=end if end else default_end,
+        organization=Organization(group.project.organization_id),
     )
 
     if expired:
@@ -294,8 +303,8 @@ def get_recommended_event_for_environments(
     events = eventstore.backend.get_events_snql(
         organization_id=group.project.organization_id,
         group_id=group.id,
-        start=start,
-        end=end,
+        start=start if start else default_start,
+        end=end if end else default_end,
         conditions=all_conditions,
         limit=1,
         orderby=EventOrdering.RECOMMENDED.value,
@@ -764,46 +773,105 @@ def get_share_id(self):
             # Otherwise it has not been shared yet.
             return None
 
-    def get_latest_event(self) -> GroupEvent | None:
-        if not hasattr(self, "_latest_event"):
-            self._latest_event = self.get_latest_event_for_environments()
-
-        return self._latest_event
+    def get_latest_event(
+        self,
+        conditions: Sequence[Condition] | None = None,
+        start: datetime | None = None,
+        end: datetime | None = None,
+    ) -> GroupEvent | None:
+        """
+        Returns the latest/newest event given the conditions and time range.
+        If no event is found, returns None.
+        """
+        return get_oldest_or_latest_event(
+            group=self,
+            ordering=EventOrdering.LATEST,
+            conditions=conditions,
+            start=start,
+            end=end,
+        )
 
     def get_latest_event_for_environments(
         self, environments: Sequence[str] = ()
     ) -> GroupEvent | None:
-        return get_oldest_or_latest_event_for_environments(
-            EventOrdering.LATEST,
-            environments,
-            self,
+        """
+        Legacy special case of `self.get_latest_event` for environments and no date range.
+        Kept for compatability, but it's advised to use `self.get_latest_event` directly.
+        """
+        conditions = (
+            [Condition(Column("environment"), Op.IN, environments)] if len(environments) > 0 else []
+        )
+        return self.get_latest_event(conditions=conditions)
+
+    def get_oldest_event(
+        self,
+        conditions: Sequence[Condition] | None = None,
+        start: datetime | None = None,
+        end: datetime | None = None,
+    ) -> GroupEvent | None:
+        """
+        Returns the oldest event given the conditions and time range.
+        If no event is found, returns None.
+        """
+        return get_oldest_or_latest_event(
+            group=self,
+            ordering=EventOrdering.OLDEST,
+            conditions=conditions,
+            start=start,
+            end=end,
         )
 
     def get_oldest_event_for_environments(
         self, environments: Sequence[str] = ()
     ) -> GroupEvent | None:
-        return get_oldest_or_latest_event_for_environments(
-            EventOrdering.OLDEST,
-            environments,
-            self,
+        """
+        Legacy special case of `self.get_oldest_event` for environments and no date range.
+        Kept for compatability, but it's advised to use `self.get_oldest_event` directly.
+        """
+        conditions = (
+            [Condition(Column("environment"), Op.IN, environments)] if len(environments) > 0 else []
         )
+        return self.get_oldest_event(conditions=conditions)
 
-    def get_recommended_event_for_environments(
+    def get_recommended_event(
         self,
-        environments: Sequence[Environment] = (),
         conditions: Sequence[Condition] | None = None,
+        start: datetime | None = None,
+        end: datetime | None = None,
     ) -> GroupEvent | None:
-        maybe_event = get_recommended_event_for_environments(
-            environments,
-            self,
-            conditions,
+        """
+        Returns a recommended event given the conditions and time range.
+        If a helpful recommendation is not found, it will fallback to the latest event.
+        If neither are found, returns None.
+        """
+        maybe_event = get_recommended_event(
+            group=self,
+            conditions=conditions,
+            start=start,
+            end=end,
         )
         return (
             maybe_event
             if maybe_event
-            else self.get_latest_event_for_environments([env.name for env in environments])
+            else self.get_latest_event(conditions=conditions, start=start, end=end)
         )
 
+    def get_recommended_event_for_environments(
+        self,
+        environments: Sequence[Environment] = (),
+        conditions: Sequence[Condition] | None = None,
+    ) -> GroupEvent | None:
+        """
+        Legacy special case of `self.get_recommended_event` for environments and no date range.
+        Kept for compatability, but it's advised to use `self.get_recommended_event` directly.
+        """
+        all_conditions: list[Condition] = list(conditions) if conditions else []
+        if len(environments) > 0:
+            all_conditions.append(
+                Condition(Column("environment"), Op.IN, [e.name for e in environments])
+            )
+        return self.get_recommended_event(conditions=all_conditions)
+
     def get_suspect_commit(self) -> Commit | None:
         from sentry.models.groupowner import GroupOwner, GroupOwnerType
 
diff --git a/src/sentry/models/groupassignee.py b/src/sentry/models/groupassignee.py
index b4479012ecb2a9..ce6dd33739d4df 100644
--- a/src/sentry/models/groupassignee.py
+++ b/src/sentry/models/groupassignee.py
@@ -134,12 +134,12 @@ def assign(
         self,
         group: Group,
         assigned_to: Team | RpcUser | User,
-        acting_user: User | None = None,
+        acting_user: RpcUser | User | None = None,
         create_only: bool = False,
         extra: dict[str, str] | None = None,
         force_autoassign: bool = False,
         assignment_source: AssignmentSource | None = None,
-    ):
+    ) -> dict[str, bool]:
         from sentry.integrations.utils.sync import sync_group_assignee_outbound
         from sentry.models.activity import Activity
         from sentry.models.groupsubscription import GroupSubscription
@@ -204,9 +204,8 @@ def assign(
     def deassign(
         self,
         group: Group,
+        # XXX: Some callers do not pass an acting user but we should make it mandatory
         acting_user: User | RpcUser | None = None,
-        assigned_to: Team | RpcUser | None = None,
-        extra: dict[str, str] | None = None,
         assignment_source: AssignmentSource | None = None,
     ) -> None:
         from sentry.integrations.utils.sync import sync_group_assignee_outbound
@@ -272,7 +271,7 @@ class Meta:
 
     __repr__ = sane_repr("group_id", "user_id", "team_id")
 
-    def save(self, *args, **kwargs):
+    def save(self, *args: Any, **kwargs: Any) -> None:
         assert not (self.user_id is not None and self.team_id is not None) and not (
             self.user_id is None and self.team_id is None
         ), "Must have Team or User, not both"
diff --git a/src/sentry/models/grouphistory.py b/src/sentry/models/grouphistory.py
index 96e04922a032ac..06ddb9b3e972da 100644
--- a/src/sentry/models/grouphistory.py
+++ b/src/sentry/models/grouphistory.py
@@ -1,8 +1,12 @@
-from typing import TYPE_CHECKING, ClassVar, Optional, Union
+from __future__ import annotations
+
+import datetime
+from collections.abc import Sequence
+from typing import TYPE_CHECKING, ClassVar
 
 from django.conf import settings
 from django.db import models
-from django.db.models import Q
+from django.db.models import Q, QuerySet
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 
@@ -149,7 +153,7 @@ class GroupHistoryStatus:
 
 
 class GroupHistoryManager(BaseManager["GroupHistory"]):
-    def filter_to_team(self, team: "Team"):
+    def filter_to_team(self, team: Team) -> QuerySet[GroupHistory]:
         from sentry.models.groupassignee import GroupAssignee
         from sentry.models.project import Project
 
@@ -241,13 +245,13 @@ def owner(self, actor: Actor | None) -> None:
             self.team_id = actor.id
 
 
-def get_prev_history(group, status):
+def get_prev_history(group: Group, status: int) -> GroupHistory | None:
     """
     Finds the most recent row that is the inverse of this history row, if one exists.
     """
     previous_statuses = PREVIOUS_STATUSES.get(status)
     if not previous_statuses:
-        return
+        return None
 
     prev_histories = GroupHistory.objects.filter(
         group=group, status__in=previous_statuses
@@ -256,11 +260,11 @@ def get_prev_history(group, status):
 
 
 def record_group_history_from_activity_type(
-    group: "Group",
+    group: Group,
     activity_type: int,
-    actor: Union["User", "Team"] | None = None,
-    release: Optional["Release"] = None,
-):
+    actor: RpcUser | User | Team | None = None,
+    release: Release | None = None,
+) -> GroupHistory | None:
     """
     Writes a `GroupHistory` row for an activity type if there's a relevant `GroupHistoryStatus` that
     maps to it
@@ -275,14 +279,15 @@ def record_group_history_from_activity_type(
 
     if status is not None:
         return record_group_history(group, status, actor, release)
+    return None
 
 
 def record_group_history(
-    group: "Group",
+    group: Group,
     status: int,
-    actor: Union["User", "RpcUser", "Team"] | None = None,
-    release: Optional["Release"] = None,
-):
+    actor: User | RpcUser | Team | None = None,
+    release: Release | None = None,
+) -> GroupHistory:
     from sentry.models.team import Team
     from sentry.users.models.user import User
     from sentry.users.services.user import RpcUser
@@ -312,16 +317,16 @@ def record_group_history(
 
 
 def bulk_record_group_history(
-    groups: list["Group"],
+    groups: Sequence[Group],
     status: int,
-    actor: Union["User", "RpcUser", "Team"] | None = None,
-    release: Optional["Release"] = None,
-):
+    actor: User | RpcUser | Team | None = None,
+    release: Release | None = None,
+) -> list[GroupHistory]:
     from sentry.models.team import Team
     from sentry.users.models.user import User
     from sentry.users.services.user import RpcUser
 
-    def get_prev_history_date(group, status):
+    def get_prev_history_date(group: Group, status: int) -> datetime.datetime | None:
         prev_history = get_prev_history(group, status)
         return prev_history.date_added if prev_history else None
 
diff --git a/src/sentry/models/groupinbox.py b/src/sentry/models/groupinbox.py
index a4272cb1ad2cdf..efd5332df2e8bf 100644
--- a/src/sentry/models/groupinbox.py
+++ b/src/sentry/models/groupinbox.py
@@ -1,5 +1,10 @@
+from __future__ import annotations
+
 import logging
+from collections.abc import Iterable
+from datetime import datetime
 from enum import Enum
+from typing import TypedDict
 
 import jsonschema
 import sentry_sdk
@@ -135,10 +140,24 @@ def bulk_remove_groups_from_inbox(groups, action=None, user=None, referrer=None)
             pass
 
 
-def get_inbox_details(group_list):
+class InboxReasonDetails(TypedDict):
+    until: str | None
+    count: int | None
+    window: int | None
+    user_count: int | None
+    user_window: int | None
+
+
+class InboxDetails(TypedDict):
+    reason: int
+    reason_details: InboxReasonDetails | None
+    date_added: datetime
+
+
+def get_inbox_details(group_list: Iterable[Group]) -> dict[int, InboxDetails]:
     group_ids = [g.id for g in group_list]
     group_inboxes = GroupInbox.objects.filter(group__in=group_ids)
-    inbox_stats = {
+    return {
         gi.group_id: {
             "reason": gi.reason,
             "reason_details": gi.reason_details,
@@ -146,5 +165,3 @@ def get_inbox_details(group_list):
         }
         for gi in group_inboxes
     }
-
-    return inbox_stats
diff --git a/src/sentry/models/organizationonboardingtask.py b/src/sentry/models/organizationonboardingtask.py
index d21977ffb5eb2b..5d1cefecd94f87 100644
--- a/src/sentry/models/organizationonboardingtask.py
+++ b/src/sentry/models/organizationonboardingtask.py
@@ -179,11 +179,6 @@ class OrganizationOnboardingTask(AbstractOnboardingTask):
             OnboardingTask.INVITE_MEMBER,
             OnboardingTask.SECOND_PLATFORM,
             OnboardingTask.RELEASE_TRACKING,
-            # TODO(Telemetry Experience): This task is shown conditionally
-            # according to the platform.
-            # Check if we can do the same here and mark onboarding as
-            # complete if platform does not support sourcemaps
-            OnboardingTask.SOURCEMAPS,
             OnboardingTask.ALERT_RULE,
             OnboardingTask.FIRST_TRANSACTION,
             OnboardingTask.SESSION_REPLAY,
@@ -192,6 +187,13 @@ class OrganizationOnboardingTask(AbstractOnboardingTask):
         ]
     )
 
+    NEW_REQUIRED_ONBOARDING_TASKS_WITH_SOURCE_MAPS = frozenset(
+        [
+            *NEW_REQUIRED_ONBOARDING_TASKS,
+            OnboardingTask.SOURCEMAPS,
+        ]
+    )
+
     SKIPPABLE_TASKS = frozenset(
         [
             OnboardingTask.INVITE_MEMBER,
diff --git a/src/sentry/models/projectteam.py b/src/sentry/models/projectteam.py
index 183ab0c573b145..ad493b2d189ee7 100644
--- a/src/sentry/models/projectteam.py
+++ b/src/sentry/models/projectteam.py
@@ -16,23 +16,12 @@
 
 class ProjectTeamManager(BaseManager["ProjectTeam"]):
     def get_for_teams_with_org_cache(self, teams: Sequence["Team"]) -> QuerySet["ProjectTeam"]:
-        project_teams = (
+        return (
             self.filter(team__in=teams, project__status=ObjectStatus.ACTIVE)
             .order_by("project__name", "project__slug")
-            .select_related("project")
+            .select_related("project", "project__organization")
         )
 
-        # TODO(dcramer): we should query in bulk for ones we're missing here
-        orgs = {i.organization_id: i.organization for i in teams}
-
-        for project_team in project_teams:
-            if project_team.project.organization_id in orgs:
-                project_team.project.set_cached_field_value(
-                    "organization", orgs[project_team.project.organization_id]
-                )
-
-        return project_teams
-
 
 @region_silo_model
 class ProjectTeam(Model):
diff --git a/src/sentry/monitors/endpoints/organization_monitor_index.py b/src/sentry/monitors/endpoints/organization_monitor_index.py
index 585a37cf26d5c1..62aebb05d17611 100644
--- a/src/sentry/monitors/endpoints/organization_monitor_index.py
+++ b/src/sentry/monitors/endpoints/organization_monitor_index.py
@@ -11,6 +11,8 @@
     When,
 )
 from drf_spectacular.utils import extend_schema
+from rest_framework.request import Request
+from rest_framework.response import Response
 
 from sentry import audit_log, quotas
 from sentry.api.api_owners import ApiOwner
@@ -65,10 +67,6 @@ def map_value_to_constant(constant, value):
     return getattr(constant, value)
 
 
-from rest_framework.request import Request
-from rest_framework.response import Response
-
-
 def flip_sort_direction(sort_field: str) -> str:
     if sort_field[0] == "-":
         sort_field = sort_field[1:]
@@ -365,8 +363,11 @@ def put(self, request: Request, organization) -> Response:
 
         result = dict(validator.validated_data)
 
+        projects = self.get_projects(request, organization, include_all_accessible=True)
+        project_ids = [project.id for project in projects]
+
         monitor_guids = result.pop("ids", [])
-        monitors = Monitor.objects.filter(guid__in=monitor_guids)
+        monitors = Monitor.objects.filter(guid__in=monitor_guids, project_id__in=project_ids)
 
         status = result.get("status")
         # If enabling monitors, ensure we can assign all before moving forward
diff --git a/src/sentry/monitors/endpoints/organization_monitor_index_stats.py b/src/sentry/monitors/endpoints/organization_monitor_index_stats.py
index ba08695ccca103..55e9171049cff5 100644
--- a/src/sentry/monitors/endpoints/organization_monitor_index_stats.py
+++ b/src/sentry/monitors/endpoints/organization_monitor_index_stats.py
@@ -57,6 +57,9 @@ def get(self, request: Request, organization) -> Response:
 
         monitor_guids: list[str] = request.GET.getlist("monitor")
 
+        projects = self.get_projects(request, organization, include_all_accessible=True)
+        project_ids = [project.id for project in projects]
+
         # Pre-fetch the monitor-ids and their guid. This is an
         # optimization to eliminate a join against the monitor table which
         # significantly inflates the size of the aggregation states.
@@ -68,9 +71,11 @@ def get(self, request: Request, organization) -> Response:
         monitor_map = {
             id: str(guid)
             for id, guid in Monitor.objects.filter(
-                organization_id=organization.id, guid__in=monitor_guids
+                organization_id=organization.id, project_id__in=project_ids, guid__in=monitor_guids
             ).values_list("id", "guid")
         }
+        # Filter monitors, keeping only ones that the user has access to.
+        monitor_guids = [guid for guid in monitor_guids if guid in monitor_map.values()]
 
         # We only care about the name but we don't want to join to get it. So we're maintaining
         # this map until the very end where we'll map from monitor_environment to environment to
diff --git a/src/sentry/notifications/utils/__init__.py b/src/sentry/notifications/utils/__init__.py
index 370a6d5259305c..c4de152a58b219 100644
--- a/src/sentry/notifications/utils/__init__.py
+++ b/src/sentry/notifications/utils/__init__.py
@@ -28,7 +28,6 @@
 from sentry.models.commit import Commit
 from sentry.models.deploy import Deploy
 from sentry.models.environment import Environment
-from sentry.models.eventerror import EventError
 from sentry.models.group import Group
 from sentry.models.grouplink import GroupLink
 from sentry.models.organization import Organization
@@ -119,24 +118,6 @@ def get_environment_for_deploy(deploy: Deploy | None) -> str:
     return "Default Environment"
 
 
-def summarize_issues(
-    issues: Iterable[Mapping[str, Mapping[str, Any]]]
-) -> Iterable[Mapping[str, str]]:
-    rv = []
-    for issue in issues:
-        extra_info = None
-        msg_d = dict(issue["data"])
-        msg_d["type"] = issue["type"]
-
-        if "image_path" in issue["data"]:
-            extra_info = issue["data"]["image_path"].rsplit("/", 1)[-1]
-            if "image_arch" in issue["data"]:
-                extra_info = "{} ({})".format(extra_info, issue["data"]["image_arch"])
-
-        rv.append({"message": EventError(msg_d).message, "extra_info": extra_info})
-    return rv
-
-
 def get_email_link_extra_params(
     referrer: str = "alert_email",
     environment: str | None = None,
@@ -275,10 +256,7 @@ def has_integrations(organization: Organization, project: Project) -> bool:
 
 
 def is_alert_rule_integration(provider: IntegrationProvider) -> bool:
-    return any(
-        feature == (IntegrationFeatures.ALERT_RULE or IntegrationFeatures.ENTERPRISE_ALERT_RULE)
-        for feature in provider.features
-    )
+    return IntegrationFeatures.ALERT_RULE in provider.features
 
 
 def has_alert_integration(project: Project) -> bool:
diff --git a/src/sentry/onboarding_tasks/backends/organization_onboarding_task.py b/src/sentry/onboarding_tasks/backends/organization_onboarding_task.py
index c7510abb4c66c1..5ceac260f92b26 100644
--- a/src/sentry/onboarding_tasks/backends/organization_onboarding_task.py
+++ b/src/sentry/onboarding_tasks/backends/organization_onboarding_task.py
@@ -10,10 +10,12 @@
     OnboardingTaskStatus,
     OrganizationOnboardingTask,
 )
+from sentry.models.project import Project
 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
+from sentry.utils.platform_categories import SOURCE_MAPS
 
 
 class OrganizationOnboardingTaskBackend(OnboardingTaskBackend[OrganizationOnboardingTask]):
@@ -47,7 +49,21 @@ def try_mark_onboarding_complete(
 
         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
+
+            projects = Project.objects.filter(organization=organization)
+            project_with_source_maps = next(
+                (p for p in projects if p.platform in SOURCE_MAPS), None
+            )
+
+            # If a project supports source maps, we require them to complete the quick start.
+            # It's possible that the first project doesn't have source maps,
+            # but the second project (which users are guided to create in the "Add Sentry to other parts of the app" step) may have source maps.
+            required_tasks = (
+                OrganizationOnboardingTask.NEW_REQUIRED_ONBOARDING_TASKS_WITH_SOURCE_MAPS
+                if project_with_source_maps
+                else OrganizationOnboardingTask.NEW_REQUIRED_ONBOARDING_TASKS
+            )
+
         else:
             required_tasks = OrganizationOnboardingTask.REQUIRED_ONBOARDING_TASKS
 
diff --git a/src/sentry/options/defaults.py b/src/sentry/options/defaults.py
index c8cc62186a41ab..e8eeb9bfd10c81 100644
--- a/src/sentry/options/defaults.py
+++ b/src/sentry/options/defaults.py
@@ -907,13 +907,13 @@
 register(
     "seer.similarity.global-rate-limit",
     type=Dict,
-    default={"limit": 20, "window": 1},
+    default={"limit": 20, "window": 1},  # window is in seconds
     flags=FLAG_ALLOW_EMPTY | FLAG_AUTOMATOR_MODIFIABLE,
 )
 register(
     "seer.similarity.per-project-rate-limit",
     type=Dict,
-    default={"limit": 5, "window": 1},
+    default={"limit": 5, "window": 1},  # window is in seconds
     flags=FLAG_ALLOW_EMPTY | FLAG_AUTOMATOR_MODIFIABLE,
 )
 
@@ -1122,11 +1122,6 @@
 # Controls the rollout rate in percent (`0.0` to `1.0`) for metric stats.
 register("relay.metric-stats.rollout-rate", default=0.0, flags=FLAG_AUTOMATOR_MODIFIABLE)
 
-# Controls the sample rate of metrics summaries computation in Relay.
-register(
-    "relay.compute-metrics-summaries.sample-rate", default=0.0, flags=FLAG_AUTOMATOR_MODIFIABLE
-)
-
 # Controls whether generic inbound filters are sent to Relay.
 register("relay.emit-generic-inbound-filters", default=False, flags=FLAG_AUTOMATOR_MODIFIABLE)
 
@@ -1227,6 +1222,12 @@
     default=0,
     flags=FLAG_PRIORITIZE_DISK | FLAG_AUTOMATOR_MODIFIABLE,
 )
+register(
+    "project-abuse-quota.attachment-item-limit",
+    type=Int,
+    default=0,
+    flags=FLAG_PRIORITIZE_DISK | FLAG_AUTOMATOR_MODIFIABLE,
+)
 register(
     "project-abuse-quota.session-limit",
     type=Int,
@@ -2115,6 +2116,20 @@
     flags=FLAG_PRIORITIZE_DISK | FLAG_AUTOMATOR_MODIFIABLE,
 )
 
+register(
+    "statistical_detectors.throughput.threshold.transactions",
+    default=50,
+    type=Int,
+    flags=FLAG_AUTOMATOR_MODIFIABLE,
+)
+
+register(
+    "statistical_detectors.throughput.threshold.functions",
+    default=25,
+    type=Int,
+    flags=FLAG_AUTOMATOR_MODIFIABLE,
+)
+
 register(
     "options_automator_slack_webhook_enabled",
     default=True,
@@ -2293,12 +2308,6 @@
     flags=FLAG_AUTOMATOR_MODIFIABLE,
 )
 
-register(
-    "releases_v2.single-tenant",
-    default=False,
-    flags=FLAG_AUTOMATOR_MODIFIABLE,
-)
-
 # The flag disables the file io on main thread detector
 register(
     "performance_issues.file_io_main_thread.disabled",
@@ -2504,43 +2513,6 @@
     flags=FLAG_AUTOMATOR_MODIFIABLE,
 )
 
-# killswitch for profiling ddm functions metrics.
-# Enable/Disable the ingestion of function metrics
-# in the generic metrics platform
-register(
-    "profiling.generic_metrics.functions_ingestion.enabled",
-    default=False,
-    type=Bool,
-    flags=FLAG_AUTOMATOR_MODIFIABLE,
-)
-
-# list of org IDs for which we'll write the function
-# metrics to the generic metrics platform
-register(
-    "profiling.generic_metrics.functions_ingestion.allowed_org_ids",
-    type=Sequence,
-    default=[],
-    flags=FLAG_ALLOW_EMPTY | FLAG_AUTOMATOR_MODIFIABLE,
-)
-
-# list of project IDs we want to deny ingesting profiles
-# function metrics into the generic metrics platform
-register(
-    "profiling.generic_metrics.functions_ingestion.denied_proj_ids",
-    type=Sequence,
-    default=[],
-    flags=FLAG_ALLOW_EMPTY | FLAG_AUTOMATOR_MODIFIABLE,
-)
-
-# rollout rate: % of profiles for which we ingest the extracted profile
-# functions metrics into the generic metrics platform
-register(
-    "profiling.generic_metrics.functions_ingestion.rollout_rate",
-    type=Float,
-    default=0.0,
-    flags=FLAG_AUTOMATOR_MODIFIABLE,
-)
-
 # temporary option for logging canonical key fallback stacktraces
 register(
     "canonical-fallback.send-error-to-sentry",
@@ -2833,12 +2805,6 @@
     flags=FLAG_AUTOMATOR_MODIFIABLE,
 )
 
-register(
-    "celery_split_queue_legacy_mode",
-    default=["post_process_transactions"],
-    flags=FLAG_AUTOMATOR_MODIFIABLE,
-)
-
 register(
     "celery_split_queue_rollout",
     default={"post_process_transactions": 1.0},
@@ -2917,15 +2883,6 @@
     flags=FLAG_AUTOMATOR_MODIFIABLE,
 )
 
-# list of project IDs for which we'll apply
-# stack trace rules to the profiles in case
-# there are any rules defined
-register(
-    "profiling.stack_trace_rules.allowed_project_ids",
-    type=Sequence,
-    default=[],
-    flags=FLAG_ALLOW_EMPTY | FLAG_AUTOMATOR_MODIFIABLE,
-)
 register(
     "performance.event-tracker.sample-rate.transactions",
     default=0.0,
diff --git a/src/sentry/plugins/base/configuration.py b/src/sentry/plugins/base/configuration.py
deleted file mode 100644
index d41eacbd4777c4..00000000000000
--- a/src/sentry/plugins/base/configuration.py
+++ /dev/null
@@ -1,136 +0,0 @@
-from django.contrib import messages
-from django.http import Http404, HttpResponseRedirect
-from django.urls import reverse
-from django.utils.safestring import mark_safe
-from django.utils.translation import gettext as _
-
-from sentry import options
-from sentry.api import client
-from sentry.api.serializers import serialize
-from sentry.models.options.project_option import ProjectOption
-from sentry.utils import json
-from sentry.web.helpers import render_to_string
-
-
-def react_plugin_config(plugin, project, request):
-    response = client.get(
-        f"/projects/{project.organization.slug}/{project.slug}/plugins/{plugin.slug}/",
-        request=request,
-    )
-    nonce = ""
-    if hasattr(request, "csp_nonce"):
-        nonce = f' nonce="{request.csp_nonce}"'
-
-    # Pretty sure this is not in use, and if it is, it has been broken since
-    # https://github.com/getsentry/sentry/pull/13578/files#diff-d17d91cc629f5f2e4582adb6e52d426f654452b751da97bafa25160b78566438L206
-    return mark_safe(
-        """
-    <div id="ref-plugin-config"></div>
-    <script%s>
-      window.__onSentryInit = window.__onSentryInit || [];
-      window.__onSentryInit.push({
-        name: 'renderReact',
-        component: 'PluginConfig',
-        container: '#ref-plugin-config',
-        props: {
-            project: %s,
-            organization: %s,
-            data: %s
-        },
-      });
-    </script>
-    """
-        % (
-            nonce,
-            json.dumps_htmlsafe(serialize(project, request.user)),
-            json.dumps_htmlsafe(serialize(project.organization, request.user)),
-            json.dumps_htmlsafe(response.data),
-        )
-    )
-
-
-def default_plugin_config(plugin, project, request):
-    if plugin.can_enable_for_projects() and not plugin.can_configure_for_project(project):
-        raise Http404()
-
-    plugin_key = plugin.get_conf_key()
-    form_class = plugin.get_conf_form(project)
-    template = plugin.get_conf_template(project)
-
-    if form_class is None:
-        return HttpResponseRedirect(
-            reverse("sentry-manage-project", args=[project.organization.slug, project.slug])
-        )
-
-    test_results = None
-
-    form = form_class(
-        request.POST if request.POST.get("plugin") == plugin.slug else None,
-        initial=plugin.get_conf_options(project),
-        prefix=plugin_key,
-    )
-    if form.is_valid():
-        if "action_test" in request.POST and plugin.is_testable():
-            test_results = plugin.test_configuration_and_get_test_results(project)
-        else:
-            for field, value in form.cleaned_data.items():
-                key = f"{plugin_key}:{field}"
-                if project:
-                    ProjectOption.objects.set_value(project, key, value)
-                else:
-                    options.set(key, value, channel=options.UpdateChannel.APPLICATION)
-
-            messages.add_message(
-                request, messages.SUCCESS, _("Your settings were saved successfully.")
-            )
-            return HttpResponseRedirect(request.path)
-
-    # TODO(mattrobenolt): Reliably determine if a plugin is configured
-    # if hasattr(plugin, 'is_configured'):
-    #     is_configured = plugin.is_configured(project)
-    # else:
-    #     is_configured = True
-    is_configured = True
-
-    return mark_safe(
-        render_to_string(
-            template=template,
-            context={
-                "form": form,
-                "plugin": plugin,
-                "plugin_description": plugin.get_description() or "",
-                "plugin_test_results": test_results,
-                "plugin_is_configured": is_configured,
-            },
-            request=request,
-        )
-    )
-
-
-def default_issue_plugin_config(plugin, project, form_data):
-    plugin_key = plugin.get_conf_key()
-    for field, value in form_data.items():
-        key = f"{plugin_key}:{field}"
-        if project:
-            ProjectOption.objects.set_value(project, key, value)
-        else:
-            options.set(key, value, channel=options.UpdateChannel.APPLICATION)
-
-
-def default_plugin_options(plugin, project):
-    form_class = plugin.get_conf_form(project)
-    if form_class is None:
-        return {}
-
-    NOTSET = object()
-    plugin_key = plugin.get_conf_key()
-    initials = plugin.get_form_initial(project)
-    for field in form_class.base_fields:
-        key = f"{plugin_key}:{field}"
-        if project is not None:
-            value = ProjectOption.objects.get_value(project, key, NOTSET)
-        else:
-            value = options.get(key)
-        if value is not NOTSET:
-            initials[field] = value
-    return initials
diff --git a/src/sentry/plugins/base/v1.py b/src/sentry/plugins/base/v1.py
index 8b186f2b5a7bc3..86f0167c17d27e 100644
--- a/src/sentry/plugins/base/v1.py
+++ b/src/sentry/plugins/base/v1.py
@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-__all__ = ("Plugin",)
-
 import logging
 from collections.abc import Sequence
 from threading import local
@@ -13,17 +11,17 @@
 from sentry.auth import access
 from sentry.models.project import Project
 from sentry.plugins import HIDDEN_PLUGINS
-from sentry.plugins.base.configuration import default_plugin_config, default_plugin_options
 from sentry.plugins.base.response import DeferredResponse
 from sentry.plugins.base.view import PluggableViewMixin
 from sentry.plugins.config import PluginConfigMixin
 from sentry.plugins.status import PluginStatusMixin
 from sentry.projects.services.project import RpcProject
-from sentry.utils.hashlib import md5_text
 
 if TYPE_CHECKING:
     from django.utils.functional import _StrPromise
 
+__all__ = ("Plugin",)
+
 
 class PluginMount(type):
     def __new__(cls, name, bases, attrs):
@@ -206,25 +204,6 @@ def get_conf_template(self, project=None):
             return self.project_conf_template
         return self.site_conf_template
 
-    def get_conf_options(self, project=None):
-        """
-        Returns a dict of all of the configured options for a project.
-
-        >>> plugin.get_conf_options(project)
-        """
-        return default_plugin_options(self, project)
-
-    def get_conf_version(self, project):
-        """
-        Returns a version string that represents the current configuration state.
-
-        If any option changes or new options added, the version will change.
-
-        >>> plugin.get_conf_version(project)
-        """
-        options = self.get_conf_options(project)
-        return md5_text("&".join(sorted("%s=%s" % o for o in options.items()))).hexdigest()[:3]
-
     def get_conf_title(self):
         """
         Returns a string representing the title to be shown on the configuration page.
@@ -498,10 +477,6 @@ def is_hidden(self):
         """
         return self.slug in HIDDEN_PLUGINS
 
-    def configure(self, request, project=None):
-        """Configures the plugin."""
-        return default_plugin_config(self, project, request)
-
     def get_url_module(self):
         """Allows a plugin to return the import path to a URL module."""
 
diff --git a/src/sentry/plugins/base/v2.py b/src/sentry/plugins/base/v2.py
index f1c0d9fdf3e16b..75909115896414 100644
--- a/src/sentry/plugins/base/v2.py
+++ b/src/sentry/plugins/base/v2.py
@@ -8,12 +8,10 @@
 from django.http import HttpResponseRedirect
 
 from sentry.plugins import HIDDEN_PLUGINS
-from sentry.plugins.base.configuration import default_plugin_config, default_plugin_options
 from sentry.plugins.base.response import DeferredResponse
 from sentry.plugins.config import PluginConfigMixin
 from sentry.plugins.interfaces.releasehook import ReleaseHook
 from sentry.plugins.status import PluginStatusMixin
-from sentry.utils.hashlib import md5_text
 
 if TYPE_CHECKING:
     from django.utils.functional import _StrPromise
@@ -197,25 +195,6 @@ def get_conf_template(self, project=None):
             return self.project_conf_template
         return self.site_conf_template
 
-    def get_conf_options(self, project=None):
-        """
-        Returns a dict of all of the configured options for a project.
-
-        >>> plugin.get_conf_options(project)
-        """
-        return default_plugin_options(self, project)
-
-    def get_conf_version(self, project):
-        """
-        Returns a version string that represents the current configuration state.
-
-        If any option changes or new options added, the version will change.
-
-        >>> plugin.get_conf_version(project)
-        """
-        options = self.get_conf_options(project)
-        return md5_text("&".join(sorted("%s=%s" % o for o in options.items()))).hexdigest()[:3]
-
     def get_conf_title(self):
         """
         Returns a string representing the title to be shown on the configuration page.
@@ -438,10 +417,6 @@ def get_custom_contexts(self):
             return [MyContextType]
         """
 
-    def configure(self, project, request):
-        """Configures the plugin."""
-        return default_plugin_config(self, project, request)
-
     def get_url_module(self):
         """Allows a plugin to return the import path to a URL module."""
 
diff --git a/src/sentry/plugins/bases/data_forwarding.py b/src/sentry/plugins/bases/data_forwarding.py
index 44e0e1cf53606a..1a970044a417e0 100644
--- a/src/sentry/plugins/bases/data_forwarding.py
+++ b/src/sentry/plugins/bases/data_forwarding.py
@@ -6,16 +6,12 @@
 from sentry.api.serializers import serialize
 from sentry.eventstore.models import Event
 from sentry.plugins.base import Plugin
-from sentry.plugins.base.configuration import react_plugin_config
 from sentry.tsdb.base import TSDBModel
 
 logger = logging.getLogger(__name__)
 
 
 class DataForwardingPlugin(Plugin):
-    def configure(self, project, request):
-        return react_plugin_config(self, project, request)
-
     def has_project_conf(self):
         return True
 
diff --git a/src/sentry/plugins/bases/issue2.py b/src/sentry/plugins/bases/issue2.py
index 689808affdee65..d52e3b7b6613ea 100644
--- a/src/sentry/plugins/bases/issue2.py
+++ b/src/sentry/plugins/bases/issue2.py
@@ -13,7 +13,6 @@
 from sentry.exceptions import PluginError  # NOQA
 from sentry.models.activity import Activity
 from sentry.models.groupmeta import GroupMeta
-from sentry.plugins.base.configuration import react_plugin_config
 from sentry.plugins.base.v1 import Plugin
 from sentry.plugins.endpoints import PluginGroupEndpoint
 from sentry.signals import issue_tracker_used
@@ -51,9 +50,6 @@ class IssueTrackingPlugin2(Plugin):
     issue_fields: frozenset[str] | None = None
     # issue_fields = frozenset(['id', 'title', 'url'])
 
-    def configure(self, project, request):
-        return react_plugin_config(self, project, request)
-
     def get_plugin_type(self):
         return "issue-tracking"
 
diff --git a/src/sentry/plugins/bases/notify.py b/src/sentry/plugins/bases/notify.py
index 420aa39e15922b..7016bb830a93e0 100644
--- a/src/sentry/plugins/bases/notify.py
+++ b/src/sentry/plugins/bases/notify.py
@@ -11,7 +11,6 @@
 from sentry.notifications.services.service import notifications_service
 from sentry.notifications.types import NotificationSettingEnum
 from sentry.plugins.base import Plugin
-from sentry.plugins.base.configuration import react_plugin_config
 from sentry.plugins.base.structs import Notification
 from sentry.shared_integrations.exceptions import ApiError
 from sentry.types.actor import Actor, ActorType
@@ -46,9 +45,6 @@ class NotificationPlugin(Plugin):
     # site_conf_form = NotificationConfigurationForm
     project_conf_form: type[forms.Form] = NotificationConfigurationForm
 
-    def configure(self, project, request):
-        return react_plugin_config(self, project, request)
-
     def get_plugin_type(self):
         return "notification"
 
diff --git a/src/sentry/processing/backpressure/memory.py b/src/sentry/processing/backpressure/memory.py
index 3a336377043ce2..7b2af742fe0597 100644
--- a/src/sentry/processing/backpressure/memory.py
+++ b/src/sentry/processing/backpressure/memory.py
@@ -13,6 +13,8 @@ class ServiceMemory:
     used: int
     available: int
     percentage: float
+    host: str | None = None
+    port: int | None = None
 
     def __init__(self, name: str, used: int, available: int):
         self.name = name
@@ -21,6 +23,12 @@ def __init__(self, name: str, used: int, available: int):
         self.percentage = used / available
 
 
+@dataclass
+class NodeInfo:
+    host: str | None
+    port: int | None
+
+
 def query_rabbitmq_memory_usage(host: str) -> ServiceMemory:
     """Returns the currently used memory and the memory limit of a
     RabbitMQ host.
@@ -51,6 +59,23 @@ def get_memory_usage(node_id: str, info: Mapping[str, Any]) -> ServiceMemory:
     return ServiceMemory(node_id, memory_used, memory_available)
 
 
+def get_host_port_info(node_id: str, cluster: Cluster) -> NodeInfo:
+    """
+    Extract the host and port of the redis node in the cluster.
+    """
+    try:
+        if isinstance(cluster, RedisCluster):
+            # RedisCluster node mapping
+            node = cluster.connection_pool.nodes.nodes.get(node_id)
+            return NodeInfo(node["host"], node["port"])
+        else:
+            # rb.Cluster node mapping
+            node = cluster.hosts[node_id]
+            return NodeInfo(node.host, node.port)
+    except Exception:
+        return NodeInfo(None, None)
+
+
 def iter_cluster_memory_usage(cluster: Cluster) -> Generator[ServiceMemory, None, None]:
     """
     A generator that yields redis `INFO` results for each of the nodes in the `cluster`.
@@ -65,4 +90,8 @@ def iter_cluster_memory_usage(cluster: Cluster) -> Generator[ServiceMemory, None
         cluster_info = promise.value
 
     for node_id, info in cluster_info.items():
-        yield get_memory_usage(node_id, info)
+        node_info = get_host_port_info(node_id, cluster)
+        memory_usage = get_memory_usage(node_id, info)
+        memory_usage.host = node_info.host
+        memory_usage.port = node_info.port
+        yield memory_usage
diff --git a/src/sentry/processing/backpressure/monitor.py b/src/sentry/processing/backpressure/monitor.py
index f9c233d6dd409a..bcd856c6b00d0d 100644
--- a/src/sentry/processing/backpressure/monitor.py
+++ b/src/sentry/processing/backpressure/monitor.py
@@ -85,10 +85,12 @@ def check_service_health(services: Mapping[str, Service]) -> MutableMapping[str,
         reasons = []
 
         logger.info("Checking service `%s` (configured high watermark: %s):", name, high_watermark)
+        memory = None
         try:
             for memory in check_service_memory(service):
                 if memory.percentage >= high_watermark:
                     reasons.append(memory)
+                logger.info("Checking node: %s:%s", memory.host, memory.port)
                 logger.info(
                     "  name: %s, used: %s, available: %s, percentage: %s",
                     memory.name,
@@ -101,6 +103,14 @@ def check_service_health(services: Mapping[str, Service]) -> MutableMapping[str,
                 scope.set_tag("service", name)
                 sentry_sdk.capture_exception(e)
             unhealthy_services[name] = e
+            host = memory.host if memory else "unknown"
+            port = memory.port if memory else "unknown"
+            logger.exception(
+                "Error while processing node %s:%s for service %s",
+                host,
+                port,
+                service,
+            )
         else:
             unhealthy_services[name] = reasons
 
diff --git a/src/sentry/profiles/device.py b/src/sentry/profiles/device.py
deleted file mode 100644
index b7f4defa94500d..00000000000000
--- a/src/sentry/profiles/device.py
+++ /dev/null
@@ -1,538 +0,0 @@
-from enum import Enum
-
-GIB = 1024 * 1024 * 1024
-UNKNOWN_DEVICE = "Unknown Device"
-
-
-class DeviceClass(Enum):
-    UNCLASSIFIED = 0
-    LOW_END = 1
-    MID_END = 2
-    HIGH_END = 3
-
-    def __str__(self) -> str:
-        return {0: "unclassified", 1: "low", 2: "mid", 3: "high"}[self.value]
-
-
-class Platform(Enum):
-    UNKNOWN = 0
-    IOS_DEVICE = 1
-    IOS_SIMULATOR = 2
-    ANDROID_DEVICE = 3
-    ANDROID_EMULATOR = 4
-
-
-# classify_device classifies a device as being low, mid, or high end
-def classify_device(
-    model: str,
-    os_name: str,
-    is_emulator: bool,
-    cpu_frequencies: tuple[int] | None = None,
-    physical_memory_bytes: int | None = None,
-) -> DeviceClass:
-    platform = get_platform(os_name, is_emulator)
-    if platform in (Platform.IOS_SIMULATOR, Platform.ANDROID_EMULATOR):
-        """
-        We exclude simulators/emulators from performance statistics for
-        low/mid/high end because these run on arbitrary PC hardware and
-        will make our data noisy.
-        """
-        return DeviceClass.UNCLASSIFIED
-
-    if platform == Platform.IOS_DEVICE:
-        frequencies = ios_cpu_core_max_frequencies_mhz(model)
-        if core_frequency(frequencies) < 2000:
-            return DeviceClass.LOW_END  # less than 2GHz clock speed
-        if core_frequency(frequencies) < 3000:
-            return DeviceClass.MID_END  # less than 3Ghz clock speed
-        return DeviceClass.HIGH_END
-
-    if platform == Platform.ANDROID_DEVICE and cpu_frequencies and physical_memory_bytes:
-        if number_of_cores(cpu_frequencies) < 8 or physical_memory_bytes < (4 * GIB):
-            return DeviceClass.LOW_END  # less than 8 cores or less than 4GiB of RAM
-        if core_frequency(cpu_frequencies) < 2500:
-            return DeviceClass.MID_END  # less than 2.5GHz clock speed
-        return DeviceClass.HIGH_END
-
-    return DeviceClass.UNCLASSIFIED
-
-
-def number_of_cores(frequencies: tuple[int, ...] | None) -> int:
-    return len(frequencies) if frequencies is not None else 0
-
-
-def core_frequency(frequencies: tuple[int, ...] | None) -> int:
-    return max(frequencies) if frequencies is not None else 0
-
-
-def get_platform(device_os_name: str, is_emulator: bool) -> Platform:
-    if device_os_name == "android":
-        if is_emulator:
-            return Platform.ANDROID_EMULATOR
-        return Platform.ANDROID_DEVICE
-    if device_os_name in ("iPhone OS", "iOS", "iPadOS", "watchOS", "tvOS"):
-        if is_emulator:
-            return Platform.IOS_SIMULATOR
-        return Platform.IOS_DEVICE
-    return Platform.UNKNOWN
-
-
-IPHONE4 = "iPhone 4"
-IPHONE5 = "iPhone 5"
-IPHONE5C = "iPhone 5c"
-IPHONE5S = "iPhone 5s"
-IPHONE7 = "iPhone 7"
-IPHONE7PLUS = "iPhone 7 Plus"
-IPHONE8 = "iPhone 8"
-IPHONE8PLUS = "iPhone 8 Plus"
-IPHONEX = "iPhone X"
-IPHONEXSMAX = "iPhone XS Max"
-
-IPAD2 = "iPad 2"
-IPADGEN3 = "iPad (3rd gen)"
-IPADGEN4 = "iPad (4th gen)"
-IPADGEN5 = "iPad (5th gen)"
-IPADGEN6 = "iPad (6th gen)"
-IPADGEN7 = "iPad (7th gen)"
-IPADGEN8 = "iPad (8th gen)"
-IPADGEN9 = "iPad (9th gen)"
-IPADGEN10 = "iPad (10th gen)"
-
-IPADAIRGEN1 = "iPad Air (1st gen)"
-IPADAIR2 = "iPad Air 2"
-IPADAIRGEN3 = "iPad Air (3rd gen)"
-IPADAIRGEN4 = "iPad Air (4th gen)"
-IPADAIRGEN5 = "iPad Air (5th gen)"
-
-IPADPRO12GEN1 = "iPad Pro (12.9-inch, 1st gen)"
-IPADPRO9GEN1 = "iPad Pro (9.7-inch, 1st gen)"
-IPADPRO12GEN2 = "iPad Pro (12.9-inch, 2nd gen)"
-IPADPRO10 = "iPad Pro (10.5-inch)"
-IPADPRO11GEN1 = "iPad Pro (11-inch, 1st gen)"
-IPADPRO12GEN3 = "iPad Pro (12.9-inch, 3rd gen)"
-IPADPRO11GEN2 = "iPad Pro (11-inch, 2nd gen)"
-IPADPRO12GEN4 = "iPad Pro (12.9-inch, 4th gen)"
-IPADPRO11GEN3 = "iPad Pro (11-inch, 3rd gen)"
-IPADPRO11GEN4 = "iPad Pro (11-inch, 4th gen)"
-IPADPRO12GEN5 = "iPad Pro (12.9-inch, 5th gen)"
-IPADPRO12GEN6 = "iPad Pro (12.9-inch 6th gen)"
-
-IPADMINIGEN1 = "iPad mini (1st gen)"
-IPADMINI2 = "iPad mini 2"
-IPADMINI3 = "iPad mini 3"
-IPADMINI4 = "iPad mini 4"
-IPADMINIGEN5 = "iPad mini (5th gen)"
-IPADMINIGEN6 = "iPad mini (6th gen)"
-
-APPLEWATCHGEN1 = "Apple Watch (1st gen)"
-APPLEWATCHSERIES1 = "Apple Watch Series 1"
-APPLEWATCHSERIES2 = "Apple Watch Series 2"
-APPLEWATCHSERIES3 = "Apple Watch Series 3"
-APPLEWATCHSERIES4 = "Apple Watch Series 4"
-APPLEWATCHSERIES5 = "Apple Watch Series 5"
-APPLEWATCHSE = "Apple Watch SE"
-APPLEWATCHSERIES6 = "Apple Watch Series 6"
-
-APPLETVGEN1 = "Apple TV (1st gen)"
-APPLETVGEN2 = "Apple TV (2nd gen)"
-APPLETVGEN3 = "Apple TV (3rd gen)"
-
-# https:#www.theiphonewiki.com/wiki/Models
-IOS_MODELS: dict[str, str] = {
-    "iPhone1,1": "iPhone (1st gen)",
-    "iPhone1,2": "iPhone 3G",
-    "iPhone2,1": "iPhone 3GS",
-    "iPhone3,1": IPHONE4,
-    "iPhone3,2": IPHONE4,
-    "iPhone3,3": IPHONE4,
-    "iPhone4,1": "iPhone 4S",
-    "iPhone5,1": IPHONE5,
-    "iPhone5,2": IPHONE5,
-    "iPhone5,3": IPHONE5C,
-    "iPhone5,4": IPHONE5C,
-    "iPhone6,1": IPHONE5S,
-    "iPhone6,2": IPHONE5S,
-    "iPhone7,2": "iPhone 6",
-    "iPhone7,1": "iPhone 6 Plus",
-    "iPhone8,1": "iPhone 6s",
-    "iPhone8,2": "iPhone 6s Plus",
-    "iPhone8,4": "iPhone SE (1st gen)",
-    "iPhone9,1": IPHONE7,
-    "iPhone9,3": IPHONE7,
-    "iPhone9,2": IPHONE7PLUS,
-    "iPhone9,4": IPHONE7PLUS,
-    "iPhone10,1": IPHONE8,
-    "iPhone10,4": IPHONE8,
-    "iPhone10,2": IPHONE8PLUS,
-    "iPhone10,5": IPHONE8PLUS,
-    "iPhone10,3": IPHONEX,
-    "iPhone10,6": IPHONEX,
-    "iPhone11,8": "iPhone XR",
-    "iPhone11,2": "iPhone XS",
-    "iPhone11,4": IPHONEXSMAX,
-    "iPhone11,6": IPHONEXSMAX,
-    "iPhone12,1": "iPhone 11",
-    "iPhone12,3": "iPhone 11 Pro",
-    "iPhone12,5": "iPhone 11 Pro Max",
-    "iPhone12,8": "iPhone SE (2nd gen)",
-    "iPhone13,1": "iPhone 12 mini",
-    "iPhone13,2": "iPhone 12",
-    "iPhone13,3": "iPhone 12 Pro",
-    "iPhone13,4": "iPhone 12 Pro Max",
-    "iPhone14,4": "iPhone 13 mini",
-    "iPhone14,5": "iPhone 13",
-    "iPhone14,2": "iPhone 13 Pro",
-    "iPhone14,3": "iPhone 13 Pro Max",
-    "iPhone14,6": "iPhone SE (3rd gen)",
-    "iPhone14,7": "iPhone 14",
-    "iPhone14,8": "iPhone 14 Plus",
-    "iPhone15,2": "iPhone 14 Pro",
-    "iPhone15,3": "iPhone 14 Pro Max",
-    "iPhone15,4": "iPhone 15",
-    "iPhone15,5": "iPhone 15 Plus",
-    "iPhone16,1": "iPhone 15 Pro",
-    "iPhone16,2": "iPhone 15 Pro Max",
-    "iPod1,1": "iPod touch (1st gen)",
-    "iPod2,1": "iPod touch (2nd gen)",
-    "iPod3,1": "iPod touch (3rd gen)",
-    "iPod4,1": "iPod touch (4th gen)",
-    "iPod5,1": "iPod touch (5th gen)",
-    "iPod7,1": "iPod touch (6th gen)",
-    "iPod9,1": "iPod touch (7th gen)",
-    "iPad1,1": "iPad (1st gen)",
-    "iPad2,1": IPAD2,
-    "iPad2,2": IPAD2,
-    "iPad2,3": IPAD2,
-    "iPad2,4": IPAD2,
-    "iPad3,1": IPADGEN3,
-    "iPad3,2": IPADGEN3,
-    "iPad3,3": IPADGEN3,
-    "iPad3,4": IPADGEN4,
-    "iPad3,5": IPADGEN4,
-    "iPad3,6": IPADGEN4,
-    "iPad6,11": IPADGEN5,
-    "iPad6,12": IPADGEN5,
-    "iPad7,5": IPADGEN6,
-    "iPad7,6": IPADGEN6,
-    "iPad7,11": IPADGEN7,
-    "iPad7,12": IPADGEN7,
-    "iPad11,6": IPADGEN8,
-    "iPad11,7": IPADGEN8,
-    "iPad12,1": IPADGEN9,
-    "iPad12,2": IPADGEN9,
-    "iPad4,1": IPADAIRGEN1,
-    "iPad4,2": IPADAIRGEN1,
-    "iPad4,3": IPADAIRGEN1,
-    "iPad5,3": IPADAIR2,
-    "iPad5,4": IPADAIR2,
-    "iPad11,3": IPADAIRGEN3,
-    "iPad11,4": IPADAIRGEN3,
-    "iPad13,1": IPADAIRGEN4,
-    "iPad13,2": IPADAIRGEN4,
-    "iPad13,16": IPADAIRGEN5,
-    "iPad13,17": IPADAIRGEN5,
-    "iPad6,7": IPADPRO12GEN1,
-    "iPad6,8": IPADPRO12GEN1,
-    "iPad6,3": IPADPRO9GEN1,
-    "iPad6,4": IPADPRO9GEN1,
-    "iPad7,1": IPADPRO12GEN2,
-    "iPad7,2": IPADPRO12GEN2,
-    "iPad7,3": IPADPRO10,
-    "iPad7,4": IPADPRO10,
-    "iPad8,1": IPADPRO11GEN1,
-    "iPad8,2": IPADPRO11GEN1,
-    "iPad8,3": IPADPRO11GEN1,
-    "iPad8,4": IPADPRO11GEN1,
-    "iPad8,5": IPADPRO12GEN3,
-    "iPad8,6": IPADPRO12GEN3,
-    "iPad8,7": IPADPRO12GEN3,
-    "iPad8,8": IPADPRO12GEN3,
-    "iPad8,9": IPADPRO11GEN2,
-    "iPad8,10": IPADPRO11GEN2,
-    "iPad8,11": IPADPRO12GEN4,
-    "iPad8,12": IPADPRO12GEN4,
-    "iPad13,4": IPADPRO11GEN3,
-    "iPad13,5": IPADPRO11GEN3,
-    "iPad13,6": IPADPRO11GEN3,
-    "iPad13,7": IPADPRO11GEN3,
-    "iPad13,8": IPADPRO12GEN5,
-    "iPad13,9": IPADPRO12GEN5,
-    "iPad13,10": IPADPRO12GEN5,
-    "iPad13,11": IPADPRO12GEN5,
-    "iPad2,5": IPADMINIGEN1,
-    "iPad2,6": IPADMINIGEN1,
-    "iPad2,7": IPADMINIGEN1,
-    "iPad4,4": IPADMINI2,
-    "iPad4,5": IPADMINI2,
-    "iPad4,6": IPADMINI2,
-    "iPad4,7": IPADMINI3,
-    "iPad4,8": IPADMINI3,
-    "iPad4,9": IPADMINI3,
-    "iPad5,1": IPADMINI4,
-    "iPad5,2": IPADMINI4,
-    "iPad11,1": IPADMINIGEN5,
-    "iPad11,2": IPADMINIGEN5,
-    "iPad13,18": IPADGEN10,
-    "iPad13,19": IPADGEN10,
-    "iPad14,1": IPADMINIGEN6,
-    "iPad14,2": IPADMINIGEN6,
-    "iPad14,3": IPADPRO11GEN4,
-    "iPad14,4": IPADPRO11GEN4,
-    "iPad14,5": IPADPRO12GEN6,
-    "iPad14,6": IPADPRO12GEN6,
-    "Watch1,1": APPLEWATCHGEN1,
-    "Watch1,2": APPLEWATCHGEN1,
-    "Watch2,6": APPLEWATCHSERIES1,
-    "Watch2,7": APPLEWATCHSERIES1,
-    "Watch2,3": APPLEWATCHSERIES2,
-    "Watch2,4": APPLEWATCHSERIES2,
-    "Watch3,1": APPLEWATCHSERIES3,
-    "Watch3,2": APPLEWATCHSERIES3,
-    "Watch3,3": APPLEWATCHSERIES3,
-    "Watch3,4": APPLEWATCHSERIES3,
-    "Watch4,1": APPLEWATCHSERIES4,
-    "Watch4,2": APPLEWATCHSERIES4,
-    "Watch4,3": APPLEWATCHSERIES4,
-    "Watch4,4": APPLEWATCHSERIES4,
-    "Watch5,1": APPLEWATCHSERIES5,
-    "Watch5,2": APPLEWATCHSERIES5,
-    "Watch5,3": APPLEWATCHSERIES5,
-    "Watch5,4": APPLEWATCHSERIES5,
-    "Watch5,9": APPLEWATCHSE,
-    "Watch5,10": APPLEWATCHSE,
-    "Watch5,11": APPLEWATCHSE,
-    "Watch5,12": APPLEWATCHSE,
-    "Watch6,3": APPLEWATCHSERIES6,
-    "Watch6,4": APPLEWATCHSERIES6,
-    "AppleTV1,1": "Apple TV (1st gen)",
-    "AppleTV2,1": "Apple TV (2nd gen)",
-    "AppleTV3,1": APPLETVGEN3,
-    "AppleTV3,2": APPLETVGEN3,
-    "AppleTV5,3": "Apple TV (4th gen)",
-    "AppleTV6,2": "Apple TV 4K",
-    "AppleTV11,1": "Apple TV 4K (2nd gen)",
-    "i386": "iOS Simulator (i386)",
-    "x86_64": "iOS Simulator (x86_64)",
-}
-
-
-def ios_human_readable_model_name(model: str) -> str:
-    if model in IOS_MODELS:
-        return IOS_MODELS[model]
-    if model.startswith("iPhone"):
-        return "Unknown iPhone"
-    if model.startswith("iPad"):
-        return "Unknown iPad"
-    if model.startswith("AppleTV"):
-        return "Unknown Apple TV"
-    if model.startswith("Watch"):
-        return "Unknown Apple Watch"
-    return "Unknown iOS Device"
-
-
-CPU1 = (520, 520)
-CPU2 = (1000, 1000)
-CPU3 = (1300, 1300)
-CPU4 = (1400, 1400)
-CPU5 = (1500, 1500)
-CPU6 = (1800, 1800)
-CPU7 = (1850, 1850)
-CPU8 = (2160, 2160)
-CPU9 = (2260, 2260)
-CPU10 = (2320, 2320)
-CPU11 = (2340, 2340)
-CPU12 = (1500, 1500, 1500)
-CPU13 = (2380, 2380, 2380, 1300, 1300, 1300)
-CPU14 = (2390, 2390, 1420, 1420, 1420, 1420)
-CPU15 = (2490, 2490, 1587, 1587, 1587, 1587)
-CPU16 = (2650, 2650, 1600, 1600, 1600, 1600)
-CPU17 = (2490, 2490, 2490, 2490, 1587, 1587, 1587, 1587)
-CPU18 = (3100, 3100, 1800, 1800, 1800, 1800)
-CPU19 = (3230, 3230, 1800, 1800, 1800, 1800)
-CPU20 = (2900, 2900, 1800, 1800, 1800, 1800)
-CPU21 = (3200, 3200, 3200, 3200, 2060, 2060, 2060, 2060)
-CPU22 = (3230, 3230, 2020, 2020, 2020, 2020)
-CPU23 = (3460, 3460, 2020, 2020, 2020, 2020)
-
-
-IOS_CPU_FREQUENCIES: dict[str, tuple[int, ...]] = {
-    "iPhone1,1": (412,),
-    "iPhone1,2": (412,),
-    "iPod1,1": (412,),
-    "Watch1,1": (520,),
-    "Watch1,2": (520,),
-    "iPod1,2": (533,),
-    "iPhone2,1": (600,),
-    "iPod3,1": (600,),
-    "iPhone3,1": (800,),
-    "iPhone3,2": (800,),
-    "iPhone3,3": (800,),
-    "iPod4,1": (800,),
-    "iPhone4,1": (800,),
-    "iPad1,1": (1000,),
-    "AppleTV1,1": (1000,),
-    "AppleTV2,1": (1000,),
-    "AppleTV3,1": (1000,),
-    "AppleTV3,2": (1000,),
-    "Watch2,6": CPU1,
-    "Watch2,7": CPU1,
-    "Watch2,3": CPU1,
-    "Watch2,4": CPU1,
-    # The clock speeds for the Watch3,4,5 have not been published, we only
-    # know that they are dual core 64-bit chips. Here we will assume that
-    # they use the confirmed clock frequency from the Watch2, but in reality
-    # they are likely higher.
-    "Watch3,1": CPU1,
-    "Watch3,2": CPU1,
-    "Watch3,3": CPU1,
-    "Watch3,4": CPU1,
-    "Watch4,1": CPU1,
-    "Watch4,2": CPU1,
-    "Watch4,3": CPU1,
-    "Watch4,4": CPU1,
-    "Watch5,1": CPU1,
-    "Watch5,2": CPU1,
-    "Watch5,3": CPU1,
-    "Watch5,4": CPU1,
-    "Watch5,9": CPU2,
-    "Watch5,10": CPU2,
-    "Watch5,11": CPU2,
-    "Watch5,12": CPU2,
-    "Watch6,3": CPU2,
-    "Watch6,4": CPU2,
-    "iPod5,1": (800, 800),
-    "iPad2,1": CPU2,
-    "iPad2,2": CPU2,
-    "iPad2,3": CPU2,
-    "iPad2,4": CPU2,
-    "iPad2,5": CPU2,
-    "iPad2,6": CPU2,
-    "iPad2,7": CPU2,
-    "iPad3,1": CPU2,
-    "iPad3,2": CPU2,
-    "iPad3,3": CPU2,
-    "iPod7,1": (1100, 1100),
-    "iPhone5,1": CPU3,
-    "iPhone5,2": CPU3,
-    "iPhone5,3": CPU3,
-    "iPhone5,4": CPU3,
-    "iPhone6,1": CPU3,
-    "iPhone6,2": CPU3,
-    "iPad4,4": CPU3,
-    "iPad4,5": CPU3,
-    "iPad4,6": CPU3,
-    "iPad4,7": CPU3,
-    "iPad4,8": CPU3,
-    "iPad4,9": CPU3,
-    "iPhone7,1": CPU4,
-    "iPhone7,2": CPU4,
-    "iPad3,4": CPU4,
-    "iPad3,5": CPU4,
-    "iPad3,6": CPU4,
-    "iPad4,1": CPU4,
-    "iPad4,2": CPU4,
-    "iPad4,3": CPU4,
-    "iPad5,1": CPU5,
-    "iPad5,2": CPU5,
-    "AppleTV5,3": CPU5,
-    "iPod9,1": (1630, 1630),
-    "iPad6,11": CPU6,
-    "iPad6,12": CPU6,
-    "iPhone8,1": CPU7,
-    "iPhone8,2": CPU7,
-    "iPhone8,4": CPU7,
-    "iPad6,3": CPU8,
-    "iPad6,4": CPU8,
-    "iPad6,7": CPU9,
-    "iPad6,8": CPU9,
-    "iPad7,11": CPU10,
-    "iPad7,12": CPU10,
-    "iPad7,5": CPU11,
-    "iPad7,6": CPU11,
-    "iPhone9,1": CPU11,
-    "iPhone9,2": CPU11,
-    "iPhone9,3": CPU11,
-    "iPhone9,4": CPU11,
-    "iPad5,3": CPU12,
-    "iPad5,4": CPU12,
-    "AppleTV6,2": (2380, 2380, 2380),
-    "iPad7,1": CPU13,
-    "iPad7,2": CPU13,
-    "iPad7,3": CPU13,
-    "iPad7,4": CPU13,
-    "iPhone10,1": CPU14,
-    "iPhone10,2": CPU14,
-    "iPhone10,3": CPU14,
-    "iPhone10,4": CPU14,
-    "iPhone10,5": CPU14,
-    "iPhone10,6": CPU14,
-    "iPad11,1": CPU15,
-    "iPad11,2": CPU15,
-    "iPad11,3": CPU15,
-    "iPad11,4": CPU15,
-    "iPad11,6": CPU15,
-    "iPad11,7": CPU15,
-    "iPhone11,2": CPU15,
-    "iPhone11,4": CPU15,
-    "iPhone11,6": CPU15,
-    "iPhone11,8": CPU15,
-    "AppleTV11,1": CPU15,
-    "iPhone12,1": CPU16,
-    "iPhone12,3": CPU16,
-    "iPhone12,5": CPU16,
-    "iPhone12,8": CPU16,
-    "iPad12,1": CPU16,
-    "iPad12,2": CPU16,
-    "iPad8,1": CPU17,
-    "iPad8,2": CPU17,
-    "iPad8,3": CPU17,
-    "iPad8,4": CPU17,
-    "iPad8,5": CPU17,
-    "iPad8,6": CPU17,
-    "iPad8,7": CPU17,
-    "iPad8,8": CPU17,
-    "iPad8,9": CPU17,
-    "iPad8,10": CPU17,
-    "iPad8,11": CPU17,
-    "iPad8,12": CPU17,
-    "iPhone13,1": CPU18,
-    "iPhone13,2": CPU18,
-    "iPhone13,3": CPU18,
-    "iPhone13,4": CPU18,
-    "iPad13,1": CPU18,
-    "iPad13,2": CPU18,
-    "iPhone14,2": CPU19,
-    "iPhone14,3": CPU19,
-    "iPhone14,4": CPU19,
-    "iPhone14,5": CPU19,
-    "iPad14,1": CPU20,
-    "iPad14,2": CPU20,
-    "iPad13,4": CPU21,
-    "iPad13,5": CPU21,
-    "iPad13,6": CPU21,
-    "iPad13,7": CPU21,
-    "iPad13,8": CPU21,
-    "iPad13,9": CPU21,
-    "iPad13,10": CPU21,
-    "iPad13,11": CPU21,
-    "iPhone14,6": CPU19,
-    "iPhone14,7": CPU22,
-    "iPhone14,8": CPU22,
-    "iPhone15,2": CPU23,
-    "iPhone15,3": CPU23,
-}
-
-
-def ios_cpu_core_max_frequencies_mhz(model: str) -> tuple[int, ...] | None:
-    if model in IOS_CPU_FREQUENCIES:
-        return IOS_CPU_FREQUENCIES[model]
-    # New unreleased device, assume device is best of class */
-    if model.startswith("iPhone"):
-        return CPU19
-    if model.startswith("iPad"):
-        return CPU21
-    if model.startswith("AppleTV"):
-        return CPU15
-    if model.startswith("Watch"):
-        return CPU6
-    return None  # unknown device
diff --git a/src/sentry/profiles/task.py b/src/sentry/profiles/task.py
index 71cc3c98db3bf2..60debead1d3095 100644
--- a/src/sentry/profiles/task.py
+++ b/src/sentry/profiles/task.py
@@ -1,9 +1,7 @@
 from __future__ import annotations
 
-import random
 from copy import deepcopy
 from datetime import datetime, timezone
-from functools import lru_cache
 from time import time
 from typing import Any, TypedDict
 from uuid import UUID
@@ -21,8 +19,6 @@
 from sentry.models.eventerror import EventError
 from sentry.models.organization import Organization
 from sentry.models.project import Project
-from sentry.models.projectkey import ProjectKey, UseCase
-from sentry.profiles.device import classify_device
 from sentry.profiles.java import (
     convert_android_methods_to_jvm_frames,
     deobfuscate_signature,
@@ -34,6 +30,7 @@
     apply_stack_trace_rules_to_profile,
     get_from_profiling_service,
 )
+from sentry.search.utils import DEVICE_CLASS
 from sentry.signals import first_profile_received
 from sentry.silo.base import SiloMode
 from sentry.tasks.base import instrumented_task
@@ -41,20 +38,16 @@
 from sentry.utils.outcomes import Outcome, track_outcome
 from sentry.utils.sdk import set_measurement
 
-
-class VroomTimeout(Exception):
-    pass
+REVERSE_DEVICE_CLASS = {next(iter(tags)): label for label, tags in DEVICE_CLASS.items()}
 
 
 @instrumented_task(
     name="sentry.profiles.task.process_profile",
-    queue="profiles.process",
-    autoretry_for=(VroomTimeout,),  # Retry when vroom returns a GCS timeout
     retry_backoff=True,
-    retry_backoff_max=60,  # up to 1 min
+    retry_backoff_max=20,
     retry_jitter=True,
     default_retry_delay=5,  # retries after 5s
-    max_retries=5,
+    max_retries=2,
     acks_late=True,
     task_time_limit=60,
     task_acks_on_failure_or_timeout=False,
@@ -158,27 +151,6 @@ def process_profile_task(
         set_measurement("profile.stacks.processed", len(profile["profile"]["stacks"]))
         set_measurement("profile.frames.processed", len(profile["profile"]["frames"]))
 
-    if (
-        profile.get("version") in ["1", "2"]
-        and options.get("profiling.generic_metrics.functions_ingestion.enabled")
-        and (
-            organization.id
-            in options.get("profiling.generic_metrics.functions_ingestion.allowed_org_ids")
-            or random.random()
-            < options.get("profiling.generic_metrics.functions_ingestion.rollout_rate")
-        )
-        and project.id
-        not in options.get("profiling.generic_metrics.functions_ingestion.denied_proj_ids")
-    ):
-        try:
-            with metrics.timer("process_profile.get_metrics_dsn"):
-                dsn = get_metrics_dsn(project.id)
-            profile["options"] = {
-                "dsn": dsn,
-            }
-        except Exception as e:
-            sentry_sdk.capture_exception(e)
-
     if options.get("profiling.stack_trace_rules.enabled"):
         try:
             with metrics.timer("process_profile.apply_stack_trace_rules"):
@@ -373,34 +345,12 @@ def _normalize(profile: Profile, organization: Organization) -> None:
     if platform not in {"cocoa", "android"} or version == "2":
         return
 
-    classification_options = dict()
-
-    if platform == "android":
-        classification_options.update(
-            {
-                "cpu_frequencies": profile["device_cpu_frequencies"],
-                "physical_memory_bytes": profile["device_physical_memory_bytes"],
-            }
-        )
+    classification = profile.get("transaction_tags", {}).get("device.class", None)
 
-    if version == "1":
-        classification_options.update(
-            {
-                "model": profile["device"]["model"],
-                "os_name": profile["os"]["name"],
-                "is_emulator": profile["device"]["is_emulator"],
-            }
-        )
-    elif version is None:
-        classification_options.update(
-            {
-                "model": profile["device_model"],
-                "os_name": profile["device_os_name"],
-                "is_emulator": profile["device_is_emulator"],
-            }
-        )
+    if not classification:
+        return
 
-    classification = str(classify_device(**classification_options))
+    classification = REVERSE_DEVICE_CLASS.get(classification, "unknown")
 
     if version == "1":
         profile["device"]["classification"] = classification
@@ -515,7 +465,10 @@ def symbolicate(
             classes=[],
         )
     return symbolicator.process_payload(
-        platform=platform, stacktraces=stacktraces, modules=modules, apply_source_context=False
+        platform=platform,
+        stacktraces=stacktraces,
+        modules=modules,
+        apply_source_context=False,
     )
 
 
@@ -956,29 +909,27 @@ def _insert_vroom_profile(profile: Profile) -> bool:
             path = "/chunk" if "profiler_id" in profile else "/profile"
             response = get_from_profiling_service(method="POST", path=path, json_data=profile)
 
+            sentry_sdk.set_tag("vroom.response.status_code", str(response.status))
+
+            reason = "bad status"
+
             if response.status == 204:
                 return True
             elif response.status == 429:
-                raise VroomTimeout
+                reason = "gcs timeout"
             elif response.status == 412:
-                metrics.incr(
-                    "process_profile.insert_vroom_profile.error",
-                    tags={
-                        "platform": profile["platform"],
-                        "reason": "duplicate profile",
-                    },
-                    sample_rate=1.0,
-                )
-                return False
-            else:
-                metrics.incr(
-                    "process_profile.insert_vroom_profile.error",
-                    tags={"platform": profile["platform"], "reason": "bad status"},
-                    sample_rate=1.0,
-                )
-                return False
-        except VroomTimeout:
-            raise
+                reason = "duplicate profile"
+
+            metrics.incr(
+                "process_profile.insert_vroom_profile.error",
+                tags={
+                    "platform": profile["platform"],
+                    "reason": reason,
+                    "status_code": response.status,
+                },
+                sample_rate=1.0,
+            )
+            return False
         except Exception as e:
             sentry_sdk.capture_exception(e)
             metrics.incr(
@@ -1022,22 +973,6 @@ class _ProjectKeyKwargs(TypedDict):
     use_case: str
 
 
-@lru_cache(maxsize=100)
-def get_metrics_dsn(project_id: int) -> str:
-    kwargs: _ProjectKeyKwargs = {
-        "project_id": project_id,
-        "use_case": UseCase.PROFILING.value,
-    }
-    try:
-        project_key, _ = ProjectKey.objects.get_or_create(**kwargs)
-    except ProjectKey.MultipleObjectsReturned:
-        # See https://docs.djangoproject.com/en/5.0/ref/models/querysets/#get-or-create
-        project_key_first = ProjectKey.objects.filter(**kwargs).order_by("pk").first()
-        assert project_key_first is not None
-        project_key = project_key_first
-    return project_key.get_dsn(public=True)
-
-
 @metrics.wraps("process_profile.track_outcome")
 def _track_duration_outcome(
     profile: Profile,
diff --git a/src/sentry/queue/routers.py b/src/sentry/queue/routers.py
index b1ad6081ec9f5a..00b091b8586dc5 100644
--- a/src/sentry/queue/routers.py
+++ b/src/sentry/queue/routers.py
@@ -127,14 +127,8 @@ def route_for_queue(self, queue: str) -> str:
         if random.random() >= rollout_rate:
             return queue
 
-        if queue in set(options.get("celery_split_queue_legacy_mode")):
-            # Use legacy route
-            # This router required to define the routing logic inside the
-            # settings file.
-            return settings.SENTRY_POST_PROCESS_QUEUE_SPLIT_ROUTER.get(queue, lambda: queue)()
+        router = self.__queue_routers.get(queue)
+        if router is not None:
+            return next(router)
         else:
-            router = self.__queue_routers.get(queue)
-            if router is not None:
-                return next(router)
-            else:
-                return queue
+            return queue
diff --git a/src/sentry/quotas/base.py b/src/sentry/quotas/base.py
index 7e1f7a4d15ea9a..e236126a719c36 100644
--- a/src/sentry/quotas/base.py
+++ b/src/sentry/quotas/base.py
@@ -457,6 +457,12 @@ def get_abuse_quotas(self, org):
                 categories=[DataCategory.ATTACHMENT],
                 scope=QuotaScope.PROJECT,
             ),
+            AbuseQuota(
+                id="paai",
+                option="project-abuse-quota.attachment-item-limit",
+                categories=[DataCategory.ATTACHMENT_ITEM],
+                scope=QuotaScope.PROJECT,
+            ),
             AbuseQuota(
                 id="pas",
                 option="project-abuse-quota.session-limit",
diff --git a/src/sentry/ratelimits/base.py b/src/sentry/ratelimits/base.py
index fb5fe63893a64b..b43b296d7a3625 100644
--- a/src/sentry/ratelimits/base.py
+++ b/src/sentry/ratelimits/base.py
@@ -31,3 +31,6 @@ def is_limited_with_value(
 
     def validate(self) -> None:
         raise NotImplementedError
+
+    def reset(self, key: str, project: Project | None = None, window: int | None = None) -> None:
+        return
diff --git a/src/sentry/ratelimits/redis.py b/src/sentry/ratelimits/redis.py
index d96c02c8fe0efd..2d43855ae93be3 100644
--- a/src/sentry/ratelimits/redis.py
+++ b/src/sentry/ratelimits/redis.py
@@ -120,3 +120,7 @@ def is_limited_with_value(
             return False, 0, reset_time
 
         return result > limit, result, reset_time
+
+    def reset(self, key: str, project: Project | None = None, window: int | None = None) -> None:
+        redis_key = self._construct_redis_key(key, project=project, window=window)
+        self.client.delete(redis_key)
diff --git a/src/sentry/receivers/onboarding.py b/src/sentry/receivers/onboarding.py
index 97d8976ebcba98..c363a085be319a 100644
--- a/src/sentry/receivers/onboarding.py
+++ b/src/sentry/receivers/onboarding.py
@@ -69,9 +69,8 @@ def record_new_project(project, user=None, user_id=None, **kwargs):
     else:
         user_id = None
         try:
-            default_user_id = (
-                Organization.objects.get(id=project.organization_id).get_default_owner().id
-            )
+            default_user = Organization.objects.get(id=project.organization_id).get_default_owner()
+            default_user_id = default_user.id
         except IndexError:
             logger.warning(
                 "Cannot initiate onboarding for organization (%s) due to missing owners",
@@ -113,6 +112,13 @@ def record_new_project(project, user=None, user_id=None, **kwargs):
             ),
             project_id=project.id,
         )
+        analytics.record(
+            "second_platform.added",
+            user_id=default_user_id,
+            organization_id=project.organization_id,
+            project_id=project.id,
+        )
+        try_mark_onboarding_complete(project.organization_id, user)
 
 
 @first_event_received.connect(weak=False)
@@ -641,8 +647,6 @@ def record_plugin_enabled(plugin, project, user, **kwargs):
 
 @alert_rule_created.connect(weak=False)
 def record_alert_rule_created(user, project: Project, rule_type: str, **kwargs):
-    # NOTE: This intentionally does not fire for the default issue alert rule
-    # that gets created on new project creation.
     task = OnboardingTask.METRIC_ALERT if rule_type == "metric" else OnboardingTask.ALERT_RULE
     rows_affected, created = OrganizationOnboardingTask.objects.create_or_update(
         organization_id=project.organization_id,
@@ -735,6 +739,7 @@ def record_integration_added(
                     task=task_mapping[integration_type],
                     status=OnboardingTaskStatus.COMPLETE,
                 )
+                try_mark_onboarding_complete(organization_id, user)
     else:
         task = OrganizationOnboardingTask.objects.filter(
             organization_id=organization_id,
diff --git a/src/sentry/receivers/rules.py b/src/sentry/receivers/rules.py
index e024ff4fab2410..c07b27c62fe0e1 100644
--- a/src/sentry/receivers/rules.py
+++ b/src/sentry/receivers/rules.py
@@ -1,7 +1,13 @@
+import logging
+
+from sentry import features
 from sentry.models.project import Project
 from sentry.models.rule import Rule
 from sentry.notifications.types import FallthroughChoiceType
-from sentry.signals import project_created
+from sentry.signals import alert_rule_created, project_created
+from sentry.users.services.user.model import RpcUser
+
+logger = logging.getLogger("sentry")
 
 DEFAULT_RULE_LABEL = "Send a notification for high priority issues"
 DEFAULT_RULE_ACTIONS = [
@@ -31,7 +37,29 @@ def create_default_rules(project: Project, default_rules=True, RuleModel=Rule, *
         return
 
     rule_data = DEFAULT_RULE_DATA
-    RuleModel.objects.create(project=project, label=DEFAULT_RULE_LABEL, data=rule_data)
+    rule = RuleModel.objects.create(project=project, label=DEFAULT_RULE_LABEL, data=rule_data)
+
+    try:
+        user: RpcUser = project.organization.get_default_owner()
+    except IndexError:
+        logger.warning(
+            "Cannot record default rule created for organization (%s) due to missing owners",
+            project.organization_id,
+        )
+        return
+
+    if features.has("organizations:quick-start-updates", project.organization, actor=user):
+        # When a user creates a new project and opts to set up an issue alert within it,
+        # the corresponding task in the quick start sidebar is automatically marked as complete.
+        alert_rule_created.send(
+            user=user,
+            project=project,
+            rule_id=rule.id,
+            # The default rule created within a new project is always of type 'issue'
+            rule_type="issue",
+            sender=type(project),
+            is_api_token=False,
+        )
 
 
 project_created.connect(create_default_rules, dispatch_uid="create_default_rules", weak=False)
diff --git a/src/sentry/relay/globalconfig.py b/src/sentry/relay/globalconfig.py
index 6e58750ec3bdfa..b992fb8fb6802b 100644
--- a/src/sentry/relay/globalconfig.py
+++ b/src/sentry/relay/globalconfig.py
@@ -15,7 +15,6 @@
     "profiling.profile_metrics.unsampled_profiles.platforms",
     "profiling.profile_metrics.unsampled_profiles.sample_rate",
     "profiling.profile_metrics.unsampled_profiles.enabled",
-    "profiling.generic_metrics.functions_ingestion.enabled",
     "relay.span-usage-metric",
     "relay.cardinality-limiter.mode",
     "relay.cardinality-limiter.error-sample-rate",
@@ -23,7 +22,6 @@
     "relay.metric-bucket-distribution-encodings",
     "relay.metric-stats.rollout-rate",
     "relay.span-extraction.sample-rate",
-    "relay.compute-metrics-summaries.sample-rate",
     "relay.span-normalization.allowed_hosts",
 ]
 
diff --git a/src/sentry/release_health/base.py b/src/sentry/release_health/base.py
index d9fd7530fb122b..9e747ce4ea608e 100644
--- a/src/sentry/release_health/base.py
+++ b/src/sentry/release_health/base.py
@@ -243,14 +243,10 @@ class ReleaseHealthBackend(Service):
         "get_project_releases_count",
         "get_project_release_stats",
         "get_project_sessions_count",
-        "is_metrics_based",
         "get_num_sessions_per_project",
         "get_project_releases_by_stability",
     )
 
-    def is_metrics_based(self) -> bool:
-        return False
-
     def get_current_and_previous_crash_free_rates(
         self,
         project_ids: Sequence[ProjectId],
diff --git a/src/sentry/release_health/metrics.py b/src/sentry/release_health/metrics.py
index 9be08a6101b290..2b0229516e4963 100644
--- a/src/sentry/release_health/metrics.py
+++ b/src/sentry/release_health/metrics.py
@@ -173,9 +173,6 @@ def _get_crash_free_rate_data(
             result_groups=result_groups
         )
 
-    def is_metrics_based(self) -> bool:
-        return True
-
     def get_current_and_previous_crash_free_rates(
         self,
         project_ids: Sequence[int],
diff --git a/src/sentry/remote_subscriptions/consumers/result_consumer.py b/src/sentry/remote_subscriptions/consumers/result_consumer.py
index 6e7ddcdf99b6c7..51958ee6f4a969 100644
--- a/src/sentry/remote_subscriptions/consumers/result_consumer.py
+++ b/src/sentry/remote_subscriptions/consumers/result_consumer.py
@@ -2,17 +2,23 @@
 
 import abc
 import logging
+from collections import defaultdict
 from collections.abc import Mapping
-from typing import Generic, TypeVar
+from concurrent.futures import ThreadPoolExecutor, wait
+from typing import Generic, Literal, TypeVar
 
+import sentry_sdk
 from arroyo.backends.kafka.consumer import KafkaPayload
+from arroyo.processing.strategies import BatchStep
 from arroyo.processing.strategies.abstract import ProcessingStrategy, ProcessingStrategyFactory
+from arroyo.processing.strategies.batching import ValuesBatch
 from arroyo.processing.strategies.commit import CommitOffsets
 from arroyo.processing.strategies.run_task import RunTask
-from arroyo.types import Commit, FilteredPayload, Message, Partition
+from arroyo.types import BrokerValue, Commit, FilteredPayload, Message, Partition
 
 from sentry.conf.types.kafka_definition import Topic, get_topic_codec
 from sentry.remote_subscriptions.models import BaseRemoteSubscription
+from sentry.utils import metrics
 
 logger = logging.getLogger(__name__)
 
@@ -54,7 +60,40 @@ def handle_result(self, subscription: U | None, result: T):
 
 
 class ResultsStrategyFactory(ProcessingStrategyFactory[KafkaPayload], Generic[T, U]):
-    def __init__(self) -> None:
+    parallel_executor: ThreadPoolExecutor | None = None
+
+    parallel = False
+    """
+    Does the consumer process unrelated messages in parallel?
+    """
+
+    max_batch_size = 500
+    """
+    How many messages will be batched at once when in parallel mode.
+    """
+
+    max_batch_time = 10
+    """
+    The maximum time in seconds to accumulate a bach of check-ins.
+    """
+
+    def __init__(
+        self,
+        mode: Literal["parallel", "serial"] = "serial",
+        max_batch_size: int | None = None,
+        max_batch_time: int | None = None,
+        max_workers: int | None = None,
+    ) -> None:
+        self.mode = mode
+        if mode == "parallel":
+            self.parallel = True
+            self.parallel_executor = ThreadPoolExecutor(max_workers=max_workers)
+
+        if max_batch_size is not None:
+            self.max_batch_size = max_batch_size
+        if max_batch_time is not None:
+            self.max_batch_time = max_batch_time
+
         self.result_processor = self.result_processor_cls()
         self.codec = get_topic_codec(self.topic_for_codec)
 
@@ -68,6 +107,26 @@ def topic_for_codec(self) -> Topic:
     def result_processor_cls(self) -> type[ResultProcessor[T, U]]:
         pass
 
+    @abc.abstractmethod
+    def build_payload_grouping_key(self, result: T) -> str:
+        """
+        Used in parallel processing mode. This method should return a string used to
+        group related results together for serial processing.
+        """
+        pass
+
+    @property
+    @abc.abstractmethod
+    def identifier(self) -> str:
+        """
+        A unique identifier for this consumer - used to differentiate it in stats
+        """
+        pass
+
+    def shutdown(self) -> None:
+        if self.parallel_executor:
+            self.parallel_executor.shutdown()
+
     def decode_payload(self, payload: KafkaPayload | FilteredPayload) -> T | None:
         assert not isinstance(payload, FilteredPayload)
         try:
@@ -79,20 +138,95 @@ def decode_payload(self, payload: KafkaPayload | FilteredPayload) -> T | None:
             )
         return None
 
+    def create_with_partitions(
+        self,
+        commit: Commit,
+        partitions: Mapping[Partition, int],
+    ) -> ProcessingStrategy[KafkaPayload]:
+        if self.parallel:
+            return self.create_thread_parallel_worker(commit)
+        else:
+            return self.create_serial_worker(commit)
+
+    def create_serial_worker(self, commit: Commit) -> ProcessingStrategy[KafkaPayload]:
+        return RunTask(
+            function=self.process_single,
+            next_step=CommitOffsets(commit),
+        )
+
     def process_single(self, message: Message[KafkaPayload | FilteredPayload]):
         result = self.decode_payload(message.payload)
         if result is not None:
             self.result_processor(result)
 
-    def create_serial_worker(self, commit: Commit) -> ProcessingStrategy[KafkaPayload]:
-        return RunTask(
-            function=self.process_single,
+    def create_thread_parallel_worker(self, commit: Commit) -> ProcessingStrategy[KafkaPayload]:
+        assert self.parallel_executor is not None
+        batch_processor = RunTask(
+            function=self.process_batch,
             next_step=CommitOffsets(commit),
         )
+        return BatchStep(
+            max_batch_size=self.max_batch_size,
+            max_batch_time=self.max_batch_time,
+            next_step=batch_processor,
+        )
 
-    def create_with_partitions(
-        self,
-        commit: Commit,
-        partitions: Mapping[Partition, int],
-    ) -> ProcessingStrategy[KafkaPayload]:
-        return self.create_serial_worker(commit)
+    def partition_message_batch(self, message: Message[ValuesBatch[KafkaPayload]]) -> list[list[T]]:
+        """
+        Takes a batch of messages and partitions them based on the `build_payload_grouping_key` method.
+        Returns a generator that yields each partitioned list of messages.
+        """
+        batch = message.payload
+
+        batch_mapping: Mapping[str, list[T]] = defaultdict(list)
+        for item in batch:
+            assert isinstance(item, BrokerValue)
+
+            result = self.decode_payload(item.payload)
+            if result is None:
+                continue
+
+            key = self.build_payload_grouping_key(result)
+            batch_mapping[key].append(result)
+
+        # Number of messages that are being processed in this batch
+        metrics.gauge(
+            "remote_subscriptions.result_consumer.parallel_batch_count",
+            len(batch),
+            tags={"identifier": self.identifier, "mode": self.mode},
+        )
+        # Number of groups we've collected to be processed in parallel
+        metrics.gauge(
+            "remote_subscriptions.result_consumer.parallel_batch_groups",
+            len(batch_mapping),
+            tags={"identifier": self.identifier, "mode": self.mode},
+        )
+
+        return list(batch_mapping.values())
+
+    def process_batch(self, message: Message[ValuesBatch[KafkaPayload]]):
+        """
+        Receives batches of messages. This function will take the batch and group them together
+        using `build_payload_grouping_key`, which ensures order is preserved. Each group is then
+        executed using a ThreadPoolWorker.
+
+        By batching we're able to process messages in parallel while guaranteeing that no messages
+        are processed out of order.
+        """
+        assert self.parallel_executor is not None
+        partitioned_values = self.partition_message_batch(message)
+
+        # Submit groups for processing
+        with sentry_sdk.start_transaction(op="process_batch", name="monitors.monitor_consumer"):
+            futures = [
+                self.parallel_executor.submit(self.process_group, group)
+                for group in partitioned_values
+            ]
+            wait(futures)
+
+    def process_group(self, items: list[T]):
+        """
+        Process a group of related messages serially.
+        """
+        for item in items:
+            self.result_processor(item)
diff --git a/src/sentry/replays/lib/new_query/parsers.py b/src/sentry/replays/lib/new_query/parsers.py
index 4229fa491f1b79..092f37862b6479 100644
--- a/src/sentry/replays/lib/new_query/parsers.py
+++ b/src/sentry/replays/lib/new_query/parsers.py
@@ -19,7 +19,10 @@ def parse_float(value: str) -> float:
 
 def parse_int(value: str) -> int:
     """Coerce to int or fail."""
-    return int(parse_float(value))
+    try:
+        return int(parse_float(value))
+    except (ValueError, CouldNotParseValue):
+        raise CouldNotParseValue("Failed to parse int.")
 
 
 def parse_duration(value: str) -> int:
@@ -30,7 +33,6 @@ def parse_duration(value: str) -> int:
     milliseconds = parse_int(value)
     if milliseconds % 1000:
         # TODO: remove once we support milliseconds.
-        # TODO: this error isn't actually returned to the frontend, it's caught and then we raise a ParseError
         raise CouldNotParseValue(
             f"Replays only supports second-resolution timestamps at this time. Try '{milliseconds // 1000}s' instead."
         )
diff --git a/src/sentry/replays/usecases/query/__init__.py b/src/sentry/replays/usecases/query/__init__.py
index 986c594d59a742..96ccd3ec4d0958 100644
--- a/src/sentry/replays/usecases/query/__init__.py
+++ b/src/sentry/replays/usecases/query/__init__.py
@@ -103,14 +103,19 @@ def handle_search_filters(
         # are top level filters they are implicitly AND'ed in the WHERE/HAVING clause.  Otherwise
         # explicit operators are used.
         if isinstance(search_filter, SearchFilter):
+
             try:
                 condition = search_filter_to_condition(search_config, search_filter)
                 if condition is None:
                     raise ParseError(f"Unsupported search field: {search_filter.key.name}")
             except OperatorNotSupported:
                 raise ParseError(f"Invalid operator specified for `{search_filter.key.name}`")
-            except CouldNotParseValue:
-                raise ParseError(f"Could not parse value for `{search_filter.key.name}`")
+            except CouldNotParseValue as e:
+                err_msg = f"Could not parse value for `{search_filter.key.name}`."
+                if e.args and e.args[0]:
+                    # avoid using str(e) as it may expose stack trace info
+                    err_msg += f" Detail: {e.args[0]}"
+                raise ParseError(err_msg)
 
             if look_back == "AND":
                 look_back = None
diff --git a/src/sentry/rules/match.py b/src/sentry/rules/match.py
index a21a249228cf44..9fca4e945c50ca 100644
--- a/src/sentry/rules/match.py
+++ b/src/sentry/rules/match.py
@@ -1,8 +1,9 @@
 from collections.abc import Iterable
+from enum import StrEnum
 from typing import Any
 
 
-class MatchType:
+class MatchType(StrEnum):
     CONTAINS = "co"
     ENDS_WITH = "ew"
     EQUAL = "eq"
diff --git a/src/sentry/runner/commands/devserver.py b/src/sentry/runner/commands/devserver.py
index 5a2b9a947a8f4a..219a9f7dc8be8d 100644
--- a/src/sentry/runner/commands/devserver.py
+++ b/src/sentry/runner/commands/devserver.py
@@ -30,6 +30,7 @@
     "worker": ["sentry", "run", "worker", "-c", "1", "--autoreload"],
     "celery-beat": ["sentry", "run", "cron", "--autoreload"],
     "server": ["sentry", "run", "web"],
+    "taskworker": ["sentry", "run", "taskworker"],
 }
 
 _SUBSCRIPTION_RESULTS_CONSUMERS = [
@@ -138,6 +139,11 @@ def _get_daemon(name: str) -> tuple[str, list[str]]:
     type=click.Choice(["control", "region"]),
     help="The silo mode to run this devserver instance in. Choices are control, region, none",
 )
+@click.option(
+    "--taskworker/--no-taskworker",
+    default=False,
+    help="Run kafka-based task workers",
+)
 @click.argument(
     "bind",
     default=None,
@@ -164,6 +170,7 @@ def devserver(
     client_hostname: str,
     ngrok: str | None,
     silo: str | None,
+    taskworker: bool,
 ) -> NoReturn:
     "Starts a lightweight web server for development."
     if bind is None:
@@ -286,6 +293,9 @@ def devserver(
         click.echo("--ingest was provided, implicitly enabling --workers")
         workers = True
 
+    if taskworker:
+        daemons.append(_get_daemon("taskworker"))
+
     if workers and not celery_beat:
         click.secho(
             "If you want to run periodic tasks from celery (celerybeat), you need to also pass --celery-beat.",
@@ -354,10 +364,19 @@ def devserver(
 
     # Create all topics if the Kafka eventstream is selected
     if kafka_consumers:
-        kafka_container_name = (
-            "kafka-kafka-1" if os.environ.get("USE_NEW_DEVSERVICES") == "1" else "sentry_kafka"
+        use_new_devservices = os.environ.get("USE_NEW_DEVSERVICES") == "1"
+        valid_kafka_container_names = ["kafka-kafka-1", "sentry_kafka"]
+        kafka_container_name = "kafka-kafka-1" if use_new_devservices else "sentry_kafka"
+        kafka_container_warning_message = (
+            f"""
+Devserver is configured to work with the revamped devservices. Looks like the `{kafka_container_name}` container is not running.
+Please run `devservices up` to start it. If you would like to use devserver with `sentry devservices`, set `USE_NEW_DEVSERVICES=0` in your environment."""
+            if use_new_devservices
+            else f"""
+Devserver is configured to work with `sentry devservices`. Looks like the `{kafka_container_name}` container is not running.
+Please run `sentry devservices up kafka` to start it. If you would like to use devserver with the revamped devservices, set `USE_NEW_DEVSERVICES=1` in your environment."""
         )
-        if kafka_container_name not in containers:
+        if not any(name in containers for name in valid_kafka_container_names):
             raise click.ClickException(
                 f"""
 Devserver is configured to start some kafka consumers, but Kafka
@@ -373,7 +392,7 @@ def devserver(
 
     SENTRY_EVENTSTREAM = "sentry.eventstream.kafka.KafkaEventStream"
 
-and run `sentry devservices up kafka`.
+{kafka_container_warning_message}
 
 Alternatively, run without --workers.
         """
diff --git a/src/sentry/runner/commands/devservices.py b/src/sentry/runner/commands/devservices.py
index 5b0b91f5a7782c..d4d2d7dfca3f62 100644
--- a/src/sentry/runner/commands/devservices.py
+++ b/src/sentry/runner/commands/devservices.py
@@ -303,6 +303,21 @@ def up(
     """
     from sentry.runner import configure
 
+    if os.environ.get("USE_NEW_DEVSERVICES", "0") != "1":
+        click.secho(
+            """
+WARNING: We're transitioning from `sentry devservices` to the new and improved `devservices` in January 2025.
+To give the new devservices a try, set the `USE_NEW_DEVSERVICES` environment variable to `1`. For a full list of commands, see
+https://github.com/getsentry/devservices?tab=readme-ov-file#commands
+
+Instead of running `sentry devservices up`, consider using `devservices up`.
+For Sentry employees - if you hit any bumps or have feedback, we'd love to hear from you in #discuss-dev-infra.
+Thanks for helping the Dev Infra team improve this experience!
+
+    """,
+            fg="yellow",
+        )
+
     configure()
 
     containers = _prepare_containers(
@@ -520,6 +535,21 @@ def down(project: str, service: list[str]) -> None:
     an explicit list of services to bring down.
     """
 
+    if os.environ.get("USE_NEW_DEVSERVICES", "0") != "1":
+        click.secho(
+            """
+WARNING: We're transitioning from `sentry devservices` to the new and improved `devservices` in January 2025.
+To give the new devservices a try, set the `USE_NEW_DEVSERVICES` environment variable to `1`. For a full list of commands, see
+https://github.com/getsentry/devservices?tab=readme-ov-file#commands
+
+Instead of running `sentry devservices down`, consider using `devservices down`.
+For Sentry employees - if you hit any bumps or have feedback, we'd love to hear from you in #discuss-dev-infra.
+Thanks for helping the Dev Infra team improve this experience!
+
+        """,
+            fg="yellow",
+        )
+
     def _down(container: docker.models.containers.Container) -> None:
         click.secho(f"> Stopping '{container.name}' container", fg="red")
         container.stop()
diff --git a/src/sentry/runner/commands/run.py b/src/sentry/runner/commands/run.py
index 73814b5e4e77d6..75679d41fc50d2 100644
--- a/src/sentry/runner/commands/run.py
+++ b/src/sentry/runner/commands/run.py
@@ -7,6 +7,7 @@
 from typing import Any
 
 import click
+from django.utils import autoreload
 
 from sentry.bgtasks.api import managed_bgtasks
 from sentry.runner.decorators import configuration, log_options
@@ -230,8 +231,6 @@ def worker(ignore_unknown_queues: bool, **options: Any) -> None:
                 raise click.ClickException(message)
 
     if options["autoreload"]:
-        from django.utils import autoreload
-
         autoreload.run_with_reloader(run_worker, **options)
     else:
         run_worker(**options)
@@ -243,13 +242,33 @@ def worker(ignore_unknown_queues: bool, **options: Any) -> None:
 @click.option(
     "--max-task-count", help="Number of tasks this worker should run before exiting", default=10000
 )
+@click.option(
+    "--namespace", help="The dedicated task namespace that taskworker operates on", default=None
+)
 @log_options()
 @configuration
-def taskworker(rpc_host: str, max_task_count: int, **options: Any) -> None:
+def taskworker(**options: Any) -> None:
+    """
+    Run a taskworker worker
+    """
+    if options["autoreload"]:
+        autoreload.run_with_reloader(run_taskworker, **options)
+    else:
+        run_taskworker(**options)
+
+
+def run_taskworker(
+    rpc_host: str, max_task_count: int, namespace: str | None, **options: Any
+) -> None:
+    """
+    taskworker factory that can be reloaded
+    """
     from sentry.taskworker.worker import TaskWorker
 
     with managed_bgtasks(role="taskworker"):
-        worker = TaskWorker(rpc_host=rpc_host, max_task_count=max_task_count, **options)
+        worker = TaskWorker(
+            rpc_host=rpc_host, max_task_count=max_task_count, namespace=namespace, **options
+        )
         exitcode = worker.start()
         raise SystemExit(exitcode)
 
@@ -397,6 +416,11 @@ def cron(**options: Any) -> None:
     is_flag=True,
     default=True,
 )
+@click.option(
+    "--stale-threshold-sec",
+    type=click.IntRange(min=300),
+    help="Routes stale messages to stale topic if provided. This feature is currently being tested, do not pass in production yet.",
+)
 @click.option(
     "--log-level",
     type=click.Choice(["debug", "info", "warning", "error", "critical"], case_sensitive=False),
@@ -481,6 +505,7 @@ def dev_consumer(consumer_names: tuple[str, ...]) -> None:
             synchronize_commit_group=None,
             synchronize_commit_log_topic=None,
             enable_dlq=False,
+            stale_threshold_sec=None,
             healthcheck_file_path=None,
             enforce_schema=True,
         )
diff --git a/src/sentry/search/eap/columns.py b/src/sentry/search/eap/columns.py
index 58245dc36b872e..13b3f7467a8095 100644
--- a/src/sentry/search/eap/columns.py
+++ b/src/sentry/search/eap/columns.py
@@ -14,6 +14,7 @@
 
 from sentry.exceptions import InvalidSearchQuery
 from sentry.search.eap import constants
+from sentry.search.events.constants import SPAN_MODULE_CATEGORY_VALUES
 from sentry.search.events.types import SnubaParams
 from sentry.search.utils import DEVICE_CLASS
 from sentry.utils.validators import is_event_id, is_span_id
@@ -246,6 +247,11 @@ def datetime_processor(datetime_string: str) -> str:
             internal_name="sentry.status",
             search_type="string",
         ),
+        ResolvedColumn(
+            public_alias="span.status_code",
+            internal_name="sentry.status_code",
+            search_type="string",
+        ),
         ResolvedColumn(
             public_alias="trace",
             internal_name="sentry.trace_id",
@@ -321,7 +327,6 @@ def datetime_processor(datetime_string: str) -> str:
         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"),
@@ -430,11 +435,21 @@ def device_class_context_constructor(params: SnubaParams) -> VirtualColumnContex
     )
 
 
+def module_context_constructor(params: SnubaParams) -> VirtualColumnContext:
+    value_map = {key: key for key in SPAN_MODULE_CATEGORY_VALUES}
+    return VirtualColumnContext(
+        from_column_name="sentry.category",
+        to_column_name="span.module",
+        value_map=value_map,
+    )
+
+
 VIRTUAL_CONTEXTS = {
     "project": project_context_constructor("project"),
     "project.slug": project_context_constructor("project.slug"),
     "project.name": project_context_constructor("project.name"),
     "device.class": device_class_context_constructor,
+    "span.module": module_context_constructor,
 }
 
 
diff --git a/src/sentry/search/eap/constants.py b/src/sentry/search/eap/constants.py
index de195272b869ff..a802707fec2401 100644
--- a/src/sentry/search/eap/constants.py
+++ b/src/sentry/search/eap/constants.py
@@ -44,8 +44,8 @@
 }
 
 # https://github.com/getsentry/snuba/blob/master/snuba/web/rpc/v1/endpoint_time_series.py
-# The RPC limits us to 1000 points per timeseries
-MAX_ROLLUP_POINTS = 1000
+# The RPC limits us to 2016 points per timeseries
+MAX_ROLLUP_POINTS = 2016
 # Copied from snuba, a number of total seconds
 VALID_GRANULARITIES = frozenset(
     {
@@ -55,6 +55,7 @@
         2 * 60,
         5 * 60,
         10 * 60,
+        15 * 60,
         30 * 60,  # minutes
         1 * 3600,
         3 * 3600,
diff --git a/src/sentry/search/eap/spans.py b/src/sentry/search/eap/spans.py
index e1b477bfc528fb..601cf4b465b843 100644
--- a/src/sentry/search/eap/spans.py
+++ b/src/sentry/search/eap/spans.py
@@ -4,6 +4,7 @@
 from re import Match
 from typing import cast
 
+import sentry_sdk
 from parsimonious.exceptions import ParseError
 from sentry_protos.snuba.v1.request_common_pb2 import RequestMeta
 from sentry_protos.snuba.v1.trace_item_attribute_pb2 import (
@@ -54,9 +55,13 @@ class SearchResolver:
         field(default_factory=dict)
     )
 
+    @sentry_sdk.trace
     def resolve_meta(self, referrer: str) -> RequestMeta:
         if self.params.organization_id is None:
             raise Exception("An organization is required to resolve queries")
+        span = sentry_sdk.get_current_span()
+        if span:
+            span.set_tag("SearchResolver.params", self.params)
         return RequestMeta(
             organization_id=self.params.organization_id,
             referrer=referrer,
@@ -65,10 +70,18 @@ def resolve_meta(self, referrer: str) -> RequestMeta:
             end_timestamp=self.params.rpc_end_date,
         )
 
-    def resolve_query(self, querystring: str | None) -> TraceItemFilter | None:
+    @sentry_sdk.trace
+    def resolve_query(
+        self, querystring: str | None
+    ) -> tuple[TraceItemFilter | None, list[VirtualColumnContext | 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)
+        query, contexts = self.__resolve_query(querystring)
+        span = sentry_sdk.get_current_span()
+        if span:
+            span.set_tag("SearchResolver.query_string", querystring)
+            span.set_tag("SearchResolver.resolved_query", query)
+            span.set_tag("SearchResolver.environment_query", environment_query)
 
         # The RPC request meta does not contain the environment.
         # So we have to inject it as a query condition.
@@ -78,18 +91,21 @@ def resolve_query(self, querystring: str | None) -> TraceItemFilter | None:
         # But if both are defined, we AND them together.
 
         if not environment_query:
-            return query
+            return query, contexts
 
         if not query:
-            return environment_query
-
-        return TraceItemFilter(
-            and_filter=AndFilter(
-                filters=[
-                    environment_query,
-                    query,
-                ]
-            )
+            return environment_query, []
+
+        return (
+            TraceItemFilter(
+                and_filter=AndFilter(
+                    filters=[
+                        environment_query,
+                        query,
+                    ]
+                )
+            ),
+            contexts,
         )
 
     def __resolve_environment_query(self) -> TraceItemFilter | None:
@@ -115,9 +131,11 @@ def __resolve_environment_query(self) -> TraceItemFilter | None:
 
         return TraceItemFilter(and_filter=AndFilter(filters=filters))
 
-    def __resolve_query(self, querystring: str | None) -> TraceItemFilter | None:
+    def __resolve_query(
+        self, querystring: str | None
+    ) -> tuple[TraceItemFilter | None, list[VirtualColumnContext | None]]:
         if querystring is None:
-            return None
+            return None, []
         try:
             parsed_terms = event_search.parse_search_query(
                 querystring,
@@ -142,8 +160,10 @@ def __resolve_query(self, querystring: str | None) -> TraceItemFilter | None:
 
     def _resolve_boolean_conditions(
         self, terms: event_filter.ParsedTerms
-    ) -> TraceItemFilter | None:
-        if len(terms) == 1:
+    ) -> tuple[TraceItemFilter | None, list[VirtualColumnContext | None]]:
+        if len(terms) == 0:
+            return None, []
+        elif len(terms) == 1:
             if isinstance(terms[0], event_search.ParenExpression):
                 return self._resolve_boolean_conditions(terms[0].children)
             elif isinstance(terms[0], event_search.SearchFilter):
@@ -196,38 +216,54 @@ def _resolve_boolean_conditions(
             lhs, rhs = terms[:1], terms[1:]
             operator = AndFilter
 
-        resolved_lhs = self._resolve_boolean_conditions(lhs) if lhs else None
-        resolved_rhs = self._resolve_boolean_conditions(rhs) if rhs else None
+        resolved_lhs, contexts_lhs = self._resolve_boolean_conditions(lhs)
+        resolved_rhs, contexts_rhs = self._resolve_boolean_conditions(rhs)
+        contexts = contexts_lhs + contexts_rhs
 
         if resolved_lhs is not None and resolved_rhs is not None:
             if operator == AndFilter:
-                return TraceItemFilter(and_filter=AndFilter(filters=[resolved_lhs, resolved_rhs]))
+                return (
+                    TraceItemFilter(and_filter=AndFilter(filters=[resolved_lhs, resolved_rhs])),
+                    contexts,
+                )
             else:
-                return TraceItemFilter(or_filter=OrFilter(filters=[resolved_lhs, resolved_rhs]))
+                return (
+                    TraceItemFilter(or_filter=OrFilter(filters=[resolved_lhs, resolved_rhs])),
+                    contexts,
+                )
         elif resolved_lhs is None and resolved_rhs is not None:
-            return resolved_rhs
+            return resolved_rhs, contexts
         elif resolved_lhs is not None and resolved_rhs is None:
-            return resolved_lhs
+            return resolved_lhs, contexts
         else:
-            return None
+            return None, contexts
 
-    def _resolve_terms(self, terms: event_filter.ParsedTerms) -> TraceItemFilter | None:
+    def _resolve_terms(
+        self, terms: event_filter.ParsedTerms
+    ) -> tuple[TraceItemFilter | None, list[VirtualColumnContext | None]]:
         parsed_terms = []
+        resolved_contexts = []
         for item in terms:
             if isinstance(item, event_search.SearchFilter):
-                parsed_terms.append(self.resolve_term(cast(event_search.SearchFilter, item)))
+                resolved_term, resolved_context = self.resolve_term(
+                    cast(event_search.SearchFilter, item)
+                )
+                parsed_terms.append(resolved_term)
+                resolved_contexts.append(resolved_context)
             else:
                 if self.config.use_aggregate_conditions:
                     raise NotImplementedError("Can't filter on aggregates yet")
 
         if len(parsed_terms) > 1:
-            return TraceItemFilter(and_filter=AndFilter(filters=parsed_terms))
+            return TraceItemFilter(and_filter=AndFilter(filters=parsed_terms)), resolved_contexts
         elif len(parsed_terms) == 1:
-            return parsed_terms[0]
+            return parsed_terms[0], resolved_contexts
         else:
-            return None
+            return None, []
 
-    def resolve_term(self, term: event_search.SearchFilter) -> TraceItemFilter:
+    def resolve_term(
+        self, term: event_search.SearchFilter
+    ) -> tuple[TraceItemFilter, VirtualColumnContext | None]:
         resolved_column, context = self.resolve_column(term.key.name)
         raw_value = term.value.raw_value
         if term.value.is_wildcard():
@@ -251,12 +287,15 @@ def resolve_term(self, term: event_search.SearchFilter) -> TraceItemFilter:
         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),
-                )
+            return (
+                TraceItemFilter(
+                    comparison_filter=ComparisonFilter(
+                        key=resolved_column.proto_definition,
+                        op=operator,
+                        value=self._resolve_search_value(resolved_column, term.operator, raw_value),
+                    )
+                ),
+                context,
             )
         else:
             raise NotImplementedError("Can't filter on aggregates yet")
@@ -325,16 +364,20 @@ def clean_contexts(
                 final_contexts.append(context)
         return final_contexts
 
+    @sentry_sdk.trace
     def resolve_columns(
         self, selected_columns: list[str]
-    ) -> tuple[list[ResolvedColumn | ResolvedFunction], list[VirtualColumnContext]]:
+    ) -> tuple[list[ResolvedColumn | ResolvedFunction], list[VirtualColumnContext | None]]:
         """Given a list of columns resolve them and get their context if applicable
 
         This function will also dedupe the virtual column contexts if necessary
         """
+        span = sentry_sdk.get_current_span()
         resolved_columns = []
         resolved_contexts = []
         stripped_columns = [column.strip() for column in selected_columns]
+        if span:
+            span.set_tag("SearchResolver.selected_columns", stripped_columns)
         has_aggregates = False
         for column in stripped_columns:
             match = fields.is_function(column)
@@ -355,7 +398,7 @@ def resolve_columns(
                 resolved_columns.append(project_column)
                 resolved_contexts.append(project_context)
 
-        return resolved_columns, self.clean_contexts(resolved_contexts)
+        return resolved_columns, resolved_contexts
 
     def resolve_column(
         self, column: str, match: Match | None = None
@@ -372,6 +415,7 @@ def get_field_type(self, column: str) -> str:
         resolved_column, _ = self.resolve_column(column)
         return resolved_column.search_type
 
+    @sentry_sdk.trace
     def resolve_attributes(
         self, columns: list[str]
     ) -> tuple[list[ResolvedColumn], list[VirtualColumnContext | None]]:
@@ -420,6 +464,9 @@ 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}")
 
+            if column.startswith("sentry_tags"):
+                field = f"sentry.{field}"
+
             search_type = cast(constants.SearchType, field_type)
             column_definition = ResolvedColumn(
                 public_alias=column, internal_name=field, search_type=search_type
@@ -432,6 +479,7 @@ def resolve_attribute(self, column: str) -> tuple[ResolvedColumn, VirtualColumnC
         else:
             raise InvalidSearchQuery(f"Could not parse {column}")
 
+    @sentry_sdk.trace
     def resolve_aggregates(
         self, columns: list[str]
     ) -> tuple[list[ResolvedFunction], list[VirtualColumnContext | None]]:
diff --git a/src/sentry/search/eap/utils.py b/src/sentry/search/eap/utils.py
new file mode 100644
index 00000000000000..28619c2929f47c
--- /dev/null
+++ b/src/sentry/search/eap/utils.py
@@ -0,0 +1,17 @@
+from datetime import datetime
+
+from google.protobuf.timestamp_pb2 import Timestamp
+from sentry_protos.snuba.v1.endpoint_time_series_pb2 import TimeSeriesRequest
+
+
+def add_start_end_conditions(
+    in_msg: TimeSeriesRequest, start: datetime, end: datetime
+) -> TimeSeriesRequest:
+    start_time_proto = Timestamp()
+    start_time_proto.FromDatetime(start)
+    end_time_proto = Timestamp()
+    end_time_proto.FromDatetime(end)
+    in_msg.meta.start_timestamp.CopyFrom(start_time_proto)
+    in_msg.meta.end_timestamp.CopyFrom(end_time_proto)
+
+    return in_msg
diff --git a/src/sentry/search/events/builder/metrics.py b/src/sentry/search/events/builder/metrics.py
index d57893ae33b027..46c84384d8bcb8 100644
--- a/src/sentry/search/events/builder/metrics.py
+++ b/src/sentry/search/events/builder/metrics.py
@@ -1953,10 +1953,6 @@ def __init__(
                 [column for column in self.columns if column not in self.aggregates]
             )
 
-    @cached_property
-    def non_aggregate_columns(self) -> list[str]:
-        return list(set(self.original_selected_columns) - set(self.timeseries_columns))
-
     @property
     def translated_groupby(self) -> list[str]:
         """Get the names of the groupby columns to create the series names"""
diff --git a/src/sentry/search/events/builder/spans_indexed.py b/src/sentry/search/events/builder/spans_indexed.py
index 79a82d81f46a1e..3e603f55cf5802 100644
--- a/src/sentry/search/events/builder/spans_indexed.py
+++ b/src/sentry/search/events/builder/spans_indexed.py
@@ -71,6 +71,13 @@ class SpansEAPQueryBuilder(BaseQueryBuilder):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
+    def get_field_type(self, field: str) -> str | None:
+        tag_match = constants.TYPED_TAG_KEY_RE.search(field)
+        field_type = tag_match.group("type") if tag_match else None
+        if field_type == "number":
+            return "number"
+        return super().get_field_type(field)
+
     def resolve_field(self, raw_field: str, alias: bool = False) -> Column:
         # try the typed regex first
         if len(raw_field) > constants.MAX_TAG_KEY_LENGTH:
diff --git a/src/sentry/search/events/builder/spans_metrics.py b/src/sentry/search/events/builder/spans_metrics.py
index fd9688c4528089..5ab6ea363afb26 100644
--- a/src/sentry/search/events/builder/spans_metrics.py
+++ b/src/sentry/search/events/builder/spans_metrics.py
@@ -8,6 +8,13 @@
 )
 from sentry.search.events.datasets.spans_metrics import SpansMetricsDatasetConfig
 from sentry.search.events.types import SelectType
+from sentry.snuba.metrics.naming_layer.mri import parse_mri
+
+SIZE_FIELDS = {
+    "http.decoded_response_content_length": "byte",
+    "http.response_content_length": "byte",
+    "http.response_transfer_size": "byte",
+}
 
 
 class SpansMetricsQueryBuilder(MetricsQueryBuilder):
@@ -15,6 +22,7 @@ class SpansMetricsQueryBuilder(MetricsQueryBuilder):
     spans_metrics_builder = True
     has_transaction = False
     config_class = SpansMetricsDatasetConfig
+    size_fields = SIZE_FIELDS
 
     column_remapping = {
         # We want to remap `message` to `span.description` for the free
@@ -33,6 +41,15 @@ def get_field_type(self, field: str) -> str | None:
         if field in ["span.duration", "span.self_time"]:
             return "duration"
 
+        if unit := self.size_fields.get(field):
+            return unit
+
+        mri = constants.SPAN_METRICS_MAP.get(field)
+        if mri is not None:
+            parsed_mri = parse_mri(mri)
+            if parsed_mri is not None and parsed_mri.unit in constants.RESULT_TYPES:
+                return parsed_mri.unit
+
         return None
 
     def resolve_select(
diff --git a/src/sentry/search/events/datasets/discover.py b/src/sentry/search/events/datasets/discover.py
index 9178ae61de05cd..d909e4ca6723d3 100644
--- a/src/sentry/search/events/datasets/discover.py
+++ b/src/sentry/search/events/datasets/discover.py
@@ -993,14 +993,6 @@ def function_converter(self) -> Mapping[str, SnQLFunction]:
                     snql_aggregate=self._resolve_web_vital_score_function,
                     default_result_type="number",
                 ),
-                SnQLFunction(
-                    "weighted_performance_score",
-                    required_args=[
-                        NumericColumn("column"),
-                    ],
-                    snql_aggregate=self._resolve_weighted_web_vital_score_function,
-                    default_result_type="number",
-                ),
                 SnQLFunction(
                     "opportunity_score",
                     required_args=[
@@ -1121,98 +1113,97 @@ def _resolve_http_status_code(self, _: str) -> SelectType:
 
     @cached_property
     def _resolve_project_threshold_config(self) -> SelectType:
-        org_id = (
-            self.builder.params.organization.id
-            if self.builder.params.organization is not None
-            else None
-        )
+        project_thresholds = {}
+        project_threshold_config_keys = []
+        project_threshold_config_values = []
+
+        project_threshold_override_config_keys = []
+        project_threshold_override_config_values = []
+
+        org_id = self.builder.params.organization_id
         project_ids = self.builder.params.project_ids
 
-        project_threshold_configs = (
-            ProjectTransactionThreshold.objects.filter(
-                organization_id=org_id,
-                project_id__in=project_ids,
+        if org_id is not None:
+            project_threshold_configs = (
+                ProjectTransactionThreshold.objects.filter(
+                    organization_id=org_id,
+                    project_id__in=project_ids,
+                )
+                .order_by("project_id")
+                .values_list("project_id", "threshold", "metric")
             )
-            .order_by("project_id")
-            .values_list("project_id", "threshold", "metric")
-        )
 
-        transaction_threshold_configs = (
-            ProjectTransactionThresholdOverride.objects.filter(
-                organization_id=org_id,
-                project_id__in=project_ids,
+            transaction_threshold_configs = (
+                ProjectTransactionThresholdOverride.objects.filter(
+                    organization_id=org_id,
+                    project_id__in=project_ids,
+                )
+                .order_by("project_id")
+                .values_list("transaction", "project_id", "threshold", "metric")
             )
-            .order_by("project_id")
-            .values_list("transaction", "project_id", "threshold", "metric")
-        )
 
-        num_project_thresholds = project_threshold_configs.count()
-        sentry_sdk.set_tag("project_threshold.count", num_project_thresholds)
-        sentry_sdk.set_tag(
-            "project_threshold.count.grouped",
-            format_grouped_length(num_project_thresholds, [10, 100, 250, 500]),
-        )
-
-        num_transaction_thresholds = transaction_threshold_configs.count()
-        sentry_sdk.set_tag("txn_threshold.count", num_transaction_thresholds)
-        sentry_sdk.set_tag(
-            "txn_threshold.count.grouped",
-            format_grouped_length(num_transaction_thresholds, [10, 100, 250, 500]),
-        )
-
-        if (
-            num_project_thresholds + num_transaction_thresholds
-            > MAX_QUERYABLE_TRANSACTION_THRESHOLDS
-        ):
-            raise InvalidSearchQuery(
-                f"Exceeded {MAX_QUERYABLE_TRANSACTION_THRESHOLDS} configured transaction thresholds limit, try with fewer Projects."
+            num_project_thresholds = project_threshold_configs.count()
+            sentry_sdk.set_tag("project_threshold.count", num_project_thresholds)
+            sentry_sdk.set_tag(
+                "project_threshold.count.grouped",
+                format_grouped_length(num_project_thresholds, [10, 100, 250, 500]),
             )
 
-        # Arrays need to have toUint64 casting because clickhouse will define the type as the narrowest possible type
-        # that can store listed argument types, which means the comparison will fail because of mismatched types
-        project_thresholds = {}
-        project_threshold_config_keys = []
-        project_threshold_config_values = []
-        for project_id, threshold, metric in project_threshold_configs:
-            metric = TRANSACTION_METRICS[metric]
-            if (
-                threshold == DEFAULT_PROJECT_THRESHOLD
-                and metric == DEFAULT_PROJECT_THRESHOLD_METRIC
-            ):
-                # small optimization, if the configuration is equal to the default,
-                # we can skip it in the final query
-                continue
-
-            project_thresholds[project_id] = (metric, threshold)
-            project_threshold_config_keys.append(Function("toUInt64", [project_id]))
-            project_threshold_config_values.append((metric, threshold))
+            num_transaction_thresholds = transaction_threshold_configs.count()
+            sentry_sdk.set_tag("txn_threshold.count", num_transaction_thresholds)
+            sentry_sdk.set_tag(
+                "txn_threshold.count.grouped",
+                format_grouped_length(num_transaction_thresholds, [10, 100, 250, 500]),
+            )
 
-        project_threshold_override_config_keys = []
-        project_threshold_override_config_values = []
-        for transaction, project_id, threshold, metric in transaction_threshold_configs:
-            metric = TRANSACTION_METRICS[metric]
             if (
-                project_id in project_thresholds
-                and threshold == project_thresholds[project_id][1]
-                and metric == project_thresholds[project_id][0]
+                num_project_thresholds + num_transaction_thresholds
+                > MAX_QUERYABLE_TRANSACTION_THRESHOLDS
             ):
-                # small optimization, if the configuration is equal to the project
-                # configs, we can skip it in the final query
-                continue
-
-            elif (
-                project_id not in project_thresholds
-                and threshold == DEFAULT_PROJECT_THRESHOLD
-                and metric == DEFAULT_PROJECT_THRESHOLD_METRIC
-            ):
-                # small optimization, if the configuration is equal to the default
-                # and no project configs were set, we can skip it in the final query
-                continue
+                raise InvalidSearchQuery(
+                    f"Exceeded {MAX_QUERYABLE_TRANSACTION_THRESHOLDS} configured transaction thresholds limit, try with fewer Projects."
+                )
 
-            project_threshold_override_config_keys.append(
-                (Function("toUInt64", [project_id]), transaction)
-            )
-            project_threshold_override_config_values.append((metric, threshold))
+            # Arrays need to have toUint64 casting because clickhouse will define the type as the narrowest possible type
+            # that can store listed argument types, which means the comparison will fail because of mismatched types
+            for project_id, threshold, metric in project_threshold_configs:
+                metric_name = TRANSACTION_METRICS[metric]
+                if (
+                    threshold == DEFAULT_PROJECT_THRESHOLD
+                    and metric_name == DEFAULT_PROJECT_THRESHOLD_METRIC
+                ):
+                    # small optimization, if the configuration is equal to the default,
+                    # we can skip it in the final query
+                    continue
+
+                project_thresholds[project_id] = (metric_name, threshold)
+                project_threshold_config_keys.append(Function("toUInt64", [project_id]))
+                project_threshold_config_values.append((metric_name, threshold))
+
+            for transaction, project_id, threshold, metric in transaction_threshold_configs:
+                metric_name = TRANSACTION_METRICS[metric]
+                if (
+                    project_id in project_thresholds
+                    and threshold == project_thresholds[project_id][1]
+                    and metric_name == project_thresholds[project_id][0]
+                ):
+                    # small optimization, if the configuration is equal to the project
+                    # configs, we can skip it in the final query
+                    continue
+
+                elif (
+                    project_id not in project_thresholds
+                    and threshold == DEFAULT_PROJECT_THRESHOLD
+                    and metric_name == DEFAULT_PROJECT_THRESHOLD_METRIC
+                ):
+                    # small optimization, if the configuration is equal to the default
+                    # and no project configs were set, we can skip it in the final query
+                    continue
+
+                project_threshold_override_config_keys.append(
+                    (Function("toUInt64", [project_id]), transaction)
+                )
+                project_threshold_override_config_values.append((metric_name, threshold))
 
         project_threshold_config_index: SelectType = Function(
             "indexOf",
@@ -1710,58 +1701,6 @@ def _resolve_web_vital_score_function(
             alias,
         )
 
-    def _resolve_weighted_web_vital_score_function(
-        self,
-        args: Mapping[str, Column],
-        alias: str,
-    ) -> SelectType:
-        column = args["column"]
-        if column.key not in [
-            "score.lcp",
-            "score.fcp",
-            "score.fid",
-            "score.cls",
-            "score.ttfb",
-        ]:
-            raise InvalidSearchQuery(
-                "weighted_performance_score only supports performance score measurements"
-            )
-        total_score_column = self.builder.column("measurements.score.total")
-        return Function(
-            "greatest",
-            [
-                Function(
-                    "least",
-                    [
-                        Function(
-                            "divide",
-                            [
-                                Function(
-                                    "sum",
-                                    [column],
-                                ),
-                                Function(
-                                    "countIf",
-                                    [
-                                        Function(
-                                            "greaterOrEquals",
-                                            [
-                                                total_score_column,
-                                                0,
-                                            ],
-                                        )
-                                    ],
-                                ),
-                            ],
-                        ),
-                        1.0,
-                    ],
-                ),
-                0.0,
-            ],
-            alias,
-        )
-
     def _resolve_web_vital_opportunity_score_function(
         self,
         args: Mapping[str, Column],
@@ -1777,7 +1716,7 @@ def _resolve_web_vital_opportunity_score_function(
             "score.total",
         ]:
             raise InvalidSearchQuery(
-                "weighted_performance_score only supports performance score measurements"
+                "opportunity_score only supports performance score measurements"
             )
 
         weight_column = (
@@ -1867,7 +1806,7 @@ def _issue_filter_converter(self, search_filter: SearchFilter) -> WhereType | No
         value = to_list(search_filter.value.value)
         # `unknown` is a special value for when there is no issue associated with the event
         group_short_ids = [v for v in value if v and v != "unknown"]
-        general_group_filter_values = ["" for v in value if not v or v == "unknown"]
+        general_group_filter_values = [0 for v in value if not v or v == "unknown"]
 
         if group_short_ids and self.builder.params.organization is not None:
             try:
diff --git a/src/sentry/search/events/datasets/function_aliases.py b/src/sentry/search/events/datasets/function_aliases.py
index 071cccd476b759..70480101f3b9f6 100644
--- a/src/sentry/search/events/datasets/function_aliases.py
+++ b/src/sentry/search/events/datasets/function_aliases.py
@@ -12,19 +12,16 @@
 from sentry.search.events import constants
 from sentry.search.events.builder.base import BaseQueryBuilder
 from sentry.search.events.types import SelectType
-from sentry.sentry_metrics.configuration import UseCaseKey
-from sentry.sentry_metrics.use_case_id_registry import UseCaseID
 from sentry.utils.hashlib import fnv1a_32
 
 
 def resolve_project_threshold_config(
     # See resolve_tag_value signature
-    tag_value_resolver: Callable[[UseCaseID | UseCaseKey, int, str], int | str | None],
+    tag_value_resolver: Callable[[int, str], int | str | None],
     # See resolve_tag_key signature
-    column_name_resolver: Callable[[UseCaseID | UseCaseKey, int, str], str],
+    column_name_resolver: Callable[[int, str], str],
     project_ids: Sequence[int],
     org_id: int,
-    use_case_id: UseCaseID | None = None,
 ) -> SelectType:
     """
     Shared function that resolves the project threshold configuration used by both snuba/metrics
@@ -89,7 +86,7 @@ def resolve_project_threshold_config(
             # and no project configs were set, we can skip it in the final query
             continue
 
-        transaction_id = tag_value_resolver(use_case_id, org_id, transaction)
+        transaction_id = tag_value_resolver(org_id, transaction)
         # Don't add to the config if we can't resolve it
         if transaction_id is None:
             continue
@@ -116,7 +113,7 @@ def resolve_project_threshold_config(
             project_threshold_override_config_keys,
             (
                 Column(name="project_id"),
-                Column(name=column_name_resolver(use_case_id, org_id, "transaction")),
+                Column(name=column_name_resolver(org_id, "transaction")),
             ),
         ],
         constants.PROJECT_THRESHOLD_OVERRIDE_CONFIG_INDEX_ALIAS,
@@ -183,7 +180,7 @@ def resolve_metrics_percentile(
     fixed_percentile: float | None = None,
     extra_conditions: list[Function] | None = None,
 ) -> SelectType:
-    if fixed_percentile is None:
+    if fixed_percentile is None and isinstance(args["percentile"], float):
         fixed_percentile = args["percentile"]
     if fixed_percentile not in constants.METRIC_PERCENTILES:
         raise IncompatibleMetricsQuery("Custom quantile incompatible with metrics")
@@ -242,6 +239,10 @@ def resolve_avg_compare_if(
     alias: str | None,
 ) -> SelectType:
     """Helper function for avg compare"""
+    if not isinstance(args["comparison_column"], str):
+        raise InvalidSearchQuery(
+            f"Invalid column type: expected <str> got {args['comparison_column']}"
+        )
     return Function(
         "avgIf",
         [
@@ -280,10 +281,12 @@ def resolve_metrics_layer_percentile(
     fixed_percentile: float | None = None,
 ) -> SelectType:
     # TODO: rename to just resolve_metrics_percentile once the non layer code can be retired
-    if fixed_percentile is None:
+    if fixed_percentile is None and isinstance(args["percentile"], float):
         fixed_percentile = args["percentile"]
     if fixed_percentile not in constants.METRIC_PERCENTILES:
         raise IncompatibleMetricsQuery("Custom quantile incompatible with metrics")
+    if not isinstance(args["column"], str):
+        raise InvalidSearchQuery(f"Invalid column type: expected <str> got {args['column']}")
     column = resolve_mri(args["column"])
     return (
         Function(
@@ -305,7 +308,7 @@ def resolve_metrics_layer_percentile(
 
 
 def resolve_division(
-    dividend: SelectType, divisor: SelectType, alias: str, fallback: Any | None = None
+    dividend: SelectType, divisor: SelectType, alias: str | None, fallback: Any | None = None
 ) -> SelectType:
     return Function(
         "if",
diff --git a/src/sentry/search/events/datasets/metrics.py b/src/sentry/search/events/datasets/metrics.py
index 54e02d63f41e86..faf147d5a023a9 100644
--- a/src/sentry/search/events/datasets/metrics.py
+++ b/src/sentry/search/events/datasets/metrics.py
@@ -1,10 +1,11 @@
 from __future__ import annotations
 
-from collections.abc import Callable, Mapping
+from collections.abc import Callable, Mapping, MutableMapping
 
 from django.utils.functional import cached_property
 from snuba_sdk import Column, Condition, Function, Op, OrderBy
 
+from sentry import features
 from sentry.api.event_search import SearchFilter
 from sentry.exceptions import IncompatibleMetricsQuery, InvalidSearchQuery
 from sentry.search.events import constants, fields
@@ -80,11 +81,6 @@ def resolve_metric(self, value: str) -> int:
         self.builder.metric_ids.add(metric_id)
         return metric_id
 
-    def resolve_value(self, value: str) -> int:
-        value_id = self.builder.resolve_tag_value(value)
-
-        return value_id
-
     @property
     def should_skip_interval_calculation(self):
         return self.builder.builder_config.skip_time_conditions and (
@@ -648,26 +644,6 @@ def function_converter(self) -> Mapping[str, fields.MetricsFunction]:
                     snql_distribution=self._resolve_web_vital_score_function,
                     default_result_type="number",
                 ),
-                fields.MetricsFunction(
-                    "weighted_performance_score",
-                    required_args=[
-                        fields.MetricArg(
-                            "column",
-                            allowed_columns=[
-                                "measurements.score.fcp",
-                                "measurements.score.lcp",
-                                "measurements.score.fid",
-                                "measurements.score.inp",
-                                "measurements.score.cls",
-                                "measurements.score.ttfb",
-                            ],
-                            allow_custom_measurements=False,
-                        )
-                    ],
-                    calculated_args=[resolve_metric_id],
-                    snql_distribution=self._resolve_weighted_web_vital_score_function,
-                    default_result_type="number",
-                ),
                 fields.MetricsFunction(
                     "opportunity_score",
                     required_args=[
@@ -1005,16 +981,13 @@ def _resolve_transaction_alias_on_demand(self, _: str) -> SelectType:
 
     @cached_property
     def _resolve_project_threshold_config(self) -> SelectType:
+        org_id = self.builder.params.organization_id
+        if org_id is None:
+            raise InvalidSearchQuery("Missing organization")
         return function_aliases.resolve_project_threshold_config(
-            tag_value_resolver=lambda _use_case_id, _org_id, value: self.builder.resolve_tag_value(
-                value
-            ),
-            column_name_resolver=lambda _use_case_id, _org_id, value: self.builder.resolve_column_name(
-                value
-            ),
-            org_id=(
-                self.builder.params.organization.id if self.builder.params.organization else None
-            ),
+            tag_value_resolver=lambda _org_id, value: self.builder.resolve_tag_value(value),
+            column_name_resolver=lambda _org_id, value: self.builder.resolve_column_name(value),
+            org_id=org_id,
             project_ids=self.builder.params.project_ids,
         )
 
@@ -1073,17 +1046,18 @@ def _transaction_filter_converter(self, search_filter: SearchFilter) -> WhereTyp
                 return None
 
         if isinstance(value, list):
-            resolved_value = []
+            resolved_values = []
             for item in value:
                 resolved_item = self.builder.resolve_tag_value(item)
                 if resolved_item is None:
                     raise IncompatibleMetricsQuery(f"Transaction value {item} in filter not found")
-                resolved_value.append(resolved_item)
+                resolved_values.append(resolved_item)
+            value = resolved_values
         else:
             resolved_value = self.builder.resolve_tag_value(value)
             if resolved_value is None:
                 raise IncompatibleMetricsQuery(f"Transaction value {value} in filter not found")
-        value = resolved_value
+            value = resolved_value
 
         if search_filter.value.is_wildcard():
             return Condition(
@@ -1260,8 +1234,9 @@ def _resolve_histogram_function(
         buckets"""
         zoom_params = getattr(self.builder, "zoom_params", None)
         num_buckets = getattr(self.builder, "num_buckets", 250)
+        histogram_aliases = getattr(self.builder, "histogram_aliases", [])
+        histogram_aliases.append(alias)
         metric_condition = Function("equals", [Column("metric_id"), args["metric_id"]])
-        self.builder.histogram_aliases.append(alias)
         return Function(
             f"histogramIf({num_buckets})",
             [
@@ -1326,6 +1301,8 @@ def _resolve_user_misery_function(
         args: Mapping[str, str | Column | SelectType | int | float],
         alias: str | None = None,
     ) -> SelectType:
+        if not isinstance(args["alpha"], float) or not isinstance(args["beta"], float):
+            raise InvalidSearchQuery("Cannot query user_misery with non floating point alpha/beta")
         if args["satisfaction"] is not None:
             raise IncompatibleMetricsQuery(
                 "Cannot query user_misery with a threshold parameter on the metrics dataset"
@@ -1493,9 +1470,13 @@ def _resolve_web_vital_function(
     ) -> SelectType:
         column = args["column"]
         metric_id = args["metric_id"]
-        quality = args["quality"].lower()
+        quality = args["quality"]
 
-        if column not in [
+        if not isinstance(quality, str):
+            raise InvalidSearchQuery(f"Invalid argument quanlity: {quality}")
+        quality = quality.lower()
+
+        if not isinstance(column, str) or column not in [
             "measurements.lcp",
             "measurements.fcp",
             "measurements.fp",
@@ -1549,12 +1530,18 @@ def _resolve_web_vital_function(
     def _resolve_web_vital_score_function(
         self,
         args: Mapping[str, str | Column | SelectType | int | float],
-        alias: str,
+        alias: str | None,
     ) -> SelectType:
+        """Returns the normalized score (0.0-1.0) for a given web vital.
+        This function exists because we don't store a metric for the normalized score.
+        The normalized score is calculated by dividing the sum of measurements.score.* by the sum of measurements.score.weight.*
+
+        To calculate the total performance score, see _resolve_total_performance_score_function.
+        """
         column = args["column"]
         metric_id = args["metric_id"]
 
-        if column not in [
+        if not isinstance(column, str) or column not in [
             "measurements.score.lcp",
             "measurements.score.fcp",
             "measurements.score.fid",
@@ -1630,115 +1617,6 @@ def _resolve_web_vital_score_function(
             alias,
         )
 
-    def _resolve_weighted_web_vital_score_function(
-        self,
-        args: Mapping[str, str | Column | SelectType | int | float],
-        alias: str,
-    ) -> SelectType:
-        column = args["column"]
-        metric_id = args["metric_id"]
-
-        if column not in [
-            "measurements.score.lcp",
-            "measurements.score.fcp",
-            "measurements.score.fid",
-            "measurements.score.inp",
-            "measurements.score.cls",
-            "measurements.score.ttfb",
-        ]:
-            raise InvalidSearchQuery("performance_score only supports measurements")
-
-        return Function(
-            "greatest",
-            [
-                Function(
-                    "least",
-                    [
-                        Function(
-                            "if",
-                            [
-                                Function(
-                                    "and",
-                                    [
-                                        Function(
-                                            "greater",
-                                            [
-                                                Function(
-                                                    "sumIf",
-                                                    [
-                                                        Column("value"),
-                                                        Function(
-                                                            "equals",
-                                                            [Column("metric_id"), metric_id],
-                                                        ),
-                                                    ],
-                                                ),
-                                                0,
-                                            ],
-                                        ),
-                                        Function(
-                                            "greater",
-                                            [
-                                                Function(
-                                                    "countIf",
-                                                    [
-                                                        Column("value"),
-                                                        Function(
-                                                            "equals",
-                                                            [
-                                                                Column("metric_id"),
-                                                                self.resolve_metric(
-                                                                    "measurements.score.total"
-                                                                ),
-                                                            ],
-                                                        ),
-                                                    ],
-                                                ),
-                                                0,
-                                            ],
-                                        ),
-                                    ],
-                                ),
-                                Function(
-                                    "divide",
-                                    [
-                                        Function(
-                                            "sumIf",
-                                            [
-                                                Column("value"),
-                                                Function(
-                                                    "equals", [Column("metric_id"), metric_id]
-                                                ),
-                                            ],
-                                        ),
-                                        Function(
-                                            "countIf",
-                                            [
-                                                Column("value"),
-                                                Function(
-                                                    "equals",
-                                                    [
-                                                        Column("metric_id"),
-                                                        self.resolve_metric(
-                                                            "measurements.score.total"
-                                                        ),
-                                                    ],
-                                                ),
-                                            ],
-                                        ),
-                                    ],
-                                ),
-                                0.0,
-                            ],
-                        ),
-                        1.0,
-                    ],
-                ),
-                0.0,
-            ],
-            alias,
-        )
-
     def _resolve_web_vital_opportunity_score_function(
         self,
         args: Mapping[str, str | Column | SelectType | int | float],
@@ -1747,7 +1625,7 @@ def _resolve_web_vital_opportunity_score_function(
         column = args["column"]
         metric_id = args["metric_id"]
 
-        if column not in [
+        if not isinstance(column, str) or column not in [
             "measurements.score.lcp",
             "measurements.score.fcp",
             "measurements.score.fid",
@@ -1903,7 +1781,7 @@ def _resolve_total_web_vital_opportunity_score_with_fixed_weights_function(
             alias,
         )
 
-    def _resolve_total_score_weights_function(self, column: str, alias: str) -> SelectType:
+    def _resolve_total_score_weights_function(self, column: str, alias: str | None) -> SelectType:
         """Calculates the total sum score weights for a given web vital.
         This must be cached since it runs another query."""
 
@@ -1962,8 +1840,16 @@ def _resolve_count_scores_function(
     def _resolve_total_performance_score_function(
         self,
         _: Mapping[str, str | Column | SelectType | int | float],
-        alias: str,
+        alias: str | None,
     ) -> SelectType:
+        """Returns the total performance score based on a page/site's web vitals.
+        This function is calculated by:
+        the summation of (normalized_vital_score * weight) for each vital, divided by the sum of all weights
+        - normalized_vital_score is the 0.0-1.0 score for each individual vital
+        - weight is the 0.0-1.0 weight for each individual vital (this is a constant value stored in constants.WEB_VITALS_PERFORMANCE_SCORE_WEIGHTS)
+        - if all webvitals have data, then the sum of all weights is 1
+        - normalized_vital_score is obtained through _resolve_web_vital_score_function (see docstring on that function for more details)
+        """
         vitals = ["lcp", "fcp", "cls", "ttfb", "inp"]
         scores = {
             vital: Function(
@@ -1982,9 +1868,38 @@ def _resolve_total_performance_score_function(
             for vital in vitals
         }
 
+        weights = {
+            vital: Function(
+                "if",
+                [
+                    Function(
+                        "isZeroOrNull",
+                        [
+                            Function(
+                                "countIf",
+                                [
+                                    Column("value"),
+                                    Function(
+                                        "equals",
+                                        [
+                                            Column("metric_id"),
+                                            self.resolve_metric(f"measurements.score.{vital}"),
+                                        ],
+                                    ),
+                                ],
+                            ),
+                        ],
+                    ),
+                    0,
+                    constants.WEB_VITALS_PERFORMANCE_SCORE_WEIGHTS[vital],
+                ],
+            )
+            for vital in vitals
+        }
+
         # TODO: Is there a way to sum more than 2 values at once?
         return Function(
-            "plus",
+            "divide",
             [
                 Function(
                     "plus",
@@ -1995,17 +1910,54 @@ def _resolve_total_performance_score_function(
                                 Function(
                                     "plus",
                                     [
-                                        scores["lcp"],
-                                        scores["fcp"],
+                                        Function(
+                                            "plus",
+                                            [
+                                                scores["lcp"],
+                                                scores["fcp"],
+                                            ],
+                                        ),
+                                        scores["cls"],
                                     ],
                                 ),
-                                scores["cls"],
+                                scores["ttfb"],
                             ],
                         ),
-                        scores["ttfb"],
+                        scores["inp"],
                     ],
                 ),
-                scores["inp"],
+                (
+                    Function(
+                        "plus",
+                        [
+                            Function(
+                                "plus",
+                                [
+                                    Function(
+                                        "plus",
+                                        [
+                                            Function(
+                                                "plus",
+                                                [
+                                                    weights["lcp"],
+                                                    weights["fcp"],
+                                                ],
+                                            ),
+                                            weights["cls"],
+                                        ],
+                                    ),
+                                    weights["ttfb"],
+                                ],
+                            ),
+                            weights["inp"],
+                        ],
+                    )
+                    if features.has(
+                        "organizations:performance-vitals-handle-missing-webvitals",
+                        self.builder.params.organization,
+                    )
+                    else 1
+                ),
             ],
             alias,
         )
@@ -2044,6 +1996,8 @@ def _resolve_total_transaction_duration(self, alias: str, scope: str) -> SelectT
     def _resolve_time_spent_percentage(
         self, args: Mapping[str, str | Column | SelectType | int | float], alias: str
     ) -> SelectType:
+        if not isinstance(args["scope"], str):
+            raise InvalidSearchQuery(f"Invalid scope: {args['scope']}")
         total_time = self._resolve_total_transaction_duration(
             constants.TOTAL_TRANSACTION_DURATION_ALIAS, args["scope"]
         )
@@ -2066,7 +2020,7 @@ def _resolve_time_spent_percentage(
 
     def _resolve_epm(
         self,
-        args: Mapping[str, str | Column | SelectType | int | float],
+        args: MutableMapping[str, str | Column | SelectType | int | float],
         alias: str | None = None,
         extra_condition: Function | None = None,
     ) -> SelectType:
@@ -2076,7 +2030,7 @@ def _resolve_epm(
 
     def _resolve_spm(
         self,
-        args: Mapping[str, str | Column | SelectType | int | float],
+        args: MutableMapping[str, str | Column | SelectType | int | float],
         alias: str | None = None,
         extra_condition: Function | None = None,
     ) -> SelectType:
@@ -2086,7 +2040,7 @@ def _resolve_spm(
 
     def _resolve_eps(
         self,
-        args: Mapping[str, str | Column | SelectType | int | float],
+        args: MutableMapping[str, str | Column | SelectType | int | float],
         alias: str | None = None,
         extra_condition: Function | None = None,
     ) -> SelectType:
@@ -2100,7 +2054,7 @@ def _resolve_rate(
         args: Mapping[str, str | Column | SelectType | int | float],
         alias: str | None = None,
         extra_condition: Function | None = None,
-        metric: str | None = "transaction.duration",
+        metric: str = "transaction.duration",
     ) -> SelectType:
         base_condition = Function(
             "equals",
diff --git a/src/sentry/search/events/datasets/metrics_summaries.py b/src/sentry/search/events/datasets/metrics_summaries.py
deleted file mode 100644
index dd1076fa8ff8e4..00000000000000
--- a/src/sentry/search/events/datasets/metrics_summaries.py
+++ /dev/null
@@ -1,120 +0,0 @@
-from __future__ import annotations
-
-from collections.abc import Callable, Mapping
-
-from snuba_sdk import And, Column, Condition, Direction, Function, Op, OrderBy
-
-from sentry.api.event_search import SearchFilter
-from sentry.search.events import constants
-from sentry.search.events.builder.base import BaseQueryBuilder
-from sentry.search.events.datasets import field_aliases, filter_aliases, function_aliases
-from sentry.search.events.datasets.base import DatasetConfig
-from sentry.search.events.fields import IntervalDefault, NumberRange, SnQLFunction, with_default
-from sentry.search.events.types import SelectType, WhereType
-
-
-class MetricsSummariesDatasetConfig(DatasetConfig):
-    def __init__(self, builder: BaseQueryBuilder):
-        self.builder = builder
-
-    @property
-    def search_filter_converter(
-        self,
-    ) -> Mapping[str, Callable[[SearchFilter], WhereType | None]]:
-        return {
-            constants.PROJECT_ALIAS: self._project_slug_filter_converter,
-            constants.PROJECT_NAME_ALIAS: self._project_slug_filter_converter,
-            "metric": self._metric_filter_converter,
-        }
-
-    @property
-    def field_alias_converter(self) -> Mapping[str, Callable[[str], SelectType]]:
-        return {
-            constants.PROJECT_ALIAS: self._resolve_project_slug_alias,
-            constants.PROJECT_NAME_ALIAS: self._resolve_project_slug_alias,
-            "avg_metric": self._resolve_avg_alias,
-        }
-
-    @property
-    def function_converter(self) -> Mapping[str, SnQLFunction]:
-        return {
-            function.name: function
-            for function in [
-                SnQLFunction(
-                    "examples",
-                    snql_aggregate=self._resolve_random_samples,
-                    optional_args=[with_default(1, NumberRange("count", 1, None))],
-                    private=True,
-                ),
-                SnQLFunction(
-                    "rounded_timestamp",
-                    required_args=[IntervalDefault("interval", 1, None)],
-                    snql_column=lambda args, alias: function_aliases.resolve_rounded_timestamp(
-                        args["interval"], alias, timestamp_column="end_timestamp"
-                    ),
-                    private=True,
-                ),
-            ]
-        }
-
-    @property
-    def orderby_converter(self) -> Mapping[str, Callable[[Direction], OrderBy]]:
-        return {}
-
-    def _project_slug_filter_converter(self, search_filter: SearchFilter) -> WhereType | None:
-        return filter_aliases.project_slug_converter(self.builder, search_filter)
-
-    def _metric_filter_converter(self, search_filter: SearchFilter) -> WhereType | None:
-        column = search_filter.key.name
-        value = search_filter.value.value
-        return And(
-            [
-                Condition(self.builder.column(column), Op.EQ, value),
-                # The metrics summaries table orders by the cityHash64 of the metric name.
-                # In order to take full advantage of the order by of the table, add an
-                # additional condition on the cityHash64 of the metric name.
-                Condition(
-                    Function("cityHash64", [self.builder.column(column)]),
-                    Op.EQ,
-                    Function("cityHash64", [value]),
-                ),
-            ]
-        )
-
-    def _resolve_project_slug_alias(self, alias: str) -> SelectType:
-        return field_aliases.resolve_project_slug_alias(self.builder, alias)
-
-    def _resolve_avg_alias(self, alias: str) -> SelectType:
-        return Function(
-            "divide",
-            [self.builder.column("sum_metric"), self.builder.column("count_metric")],
-            alias,
-        )
-
-    def _resolve_random_samples(
-        self,
-        args: Mapping[str, str | Column | SelectType | int | float],
-        alias: str,
-    ) -> SelectType:
-        offset = 0 if self.builder.offset is None else self.builder.offset.offset
-        limit = 0 if self.builder.limit is None else self.builder.limit.limit
-        return function_aliases.resolve_random_samples(
-            [
-                # DO NOT change the order of these columns as it
-                # changes the order of the tuple in the response
-                # which WILL cause errors where it assumes this
-                # order
-                self.builder.resolve_column("span.group"),
-                self.builder.resolve_column("timestamp"),
-                self.builder.resolve_column("id"),
-                self.builder.resolve_column("min_metric"),
-                self.builder.resolve_column("max_metric"),
-                self.builder.resolve_column("sum_metric"),
-                self.builder.resolve_column("count_metric"),
-                self.builder.resolve_column("avg_metric"),
-            ],
-            alias,
-            offset,
-            limit,
-            size=int(args["count"]),
-        )
diff --git a/src/sentry/search/events/datasets/spans_metrics.py b/src/sentry/search/events/datasets/spans_metrics.py
index 358dab0107a887..5713605e3b93d0 100644
--- a/src/sentry/search/events/datasets/spans_metrics.py
+++ b/src/sentry/search/events/datasets/spans_metrics.py
@@ -5,7 +5,7 @@
 from typing import TypedDict
 
 import sentry_sdk
-from snuba_sdk import AliasedExpression, Column, Condition, Function, Identifier, Op, OrderBy
+from snuba_sdk import Column, Condition, Function, Identifier, Op, OrderBy
 
 from sentry.api.event_search import SearchFilter
 from sentry.exceptions import IncompatibleMetricsQuery, InvalidSearchQuery
@@ -16,7 +16,6 @@
 from sentry.search.events.fields import SnQLStringArg, get_function_alias
 from sentry.search.events.types import SelectType, WhereType
 from sentry.search.utils import DEVICE_CLASS
-from sentry.snuba.metrics.naming_layer.mri import SpanMRI
 from sentry.snuba.referrer import Referrer
 
 
@@ -1362,278 +1361,3 @@ def _resolve_trace_error_count(
     @property
     def orderby_converter(self) -> Mapping[str, OrderBy]:
         return {}
-
-
-class SpansMetricsLayerDatasetConfig(DatasetConfig):
-    missing_function_error = IncompatibleMetricsQuery
-
-    def __init__(self, builder: spans_metrics.SpansMetricsQueryBuilder):
-        self.builder = builder
-        self.total_span_duration: float | None = None
-
-    def resolve_mri(self, value: str) -> Column:
-        """Given the public facing column name resolve it to the MRI and return a Column"""
-        # If the query builder has not detected a transaction use the light self time metric to get a performance boost
-        if value == "span.self_time" and not self.builder.has_transaction:
-            return Column(constants.SELF_TIME_LIGHT)
-        else:
-            return Column(constants.SPAN_METRICS_MAP[value])
-
-    @property
-    def search_filter_converter(
-        self,
-    ) -> Mapping[str, Callable[[SearchFilter], WhereType | None]]:
-        return {}
-
-    @property
-    def field_alias_converter(self) -> Mapping[str, Callable[[str], SelectType]]:
-        return {
-            constants.SPAN_MODULE_ALIAS: lambda alias: field_aliases.resolve_span_module(
-                self.builder, alias
-            )
-        }
-
-    @property
-    def function_converter(self) -> Mapping[str, fields.MetricsFunction]:
-        """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
-        """
-
-        function_converter = {
-            function.name: function
-            for function in [
-                fields.MetricsFunction(
-                    "count_unique",
-                    required_args=[
-                        fields.MetricArg(
-                            "column",
-                            allowed_columns=["user"],
-                            allow_custom_measurements=False,
-                        )
-                    ],
-                    snql_metric_layer=lambda args, alias: Function(
-                        "count_unique",
-                        [self.resolve_mri("user")],
-                        alias,
-                    ),
-                    default_result_type="integer",
-                ),
-                fields.MetricsFunction(
-                    "epm",
-                    snql_metric_layer=lambda args, alias: Function(
-                        "rate",
-                        [
-                            self.resolve_mri("span.self_time"),
-                            args["interval"],
-                            60,
-                        ],
-                        alias,
-                    ),
-                    optional_args=[fields.IntervalDefault("interval", 1, None)],
-                    default_result_type="rate",
-                ),
-                fields.MetricsFunction(
-                    "eps",
-                    snql_metric_layer=lambda args, alias: Function(
-                        "rate",
-                        [
-                            self.resolve_mri("span.self_time"),
-                            args["interval"],
-                            1,
-                        ],
-                        alias,
-                    ),
-                    optional_args=[fields.IntervalDefault("interval", 1, None)],
-                    default_result_type="rate",
-                ),
-                fields.MetricsFunction(
-                    "count",
-                    snql_metric_layer=lambda args, alias: Function(
-                        "count",
-                        [
-                            self.resolve_mri("span.self_time"),
-                        ],
-                        alias,
-                    ),
-                    default_result_type="integer",
-                ),
-                fields.MetricsFunction(
-                    "sum",
-                    optional_args=[
-                        fields.with_default(
-                            "span.self_time",
-                            fields.MetricArg(
-                                "column",
-                                allowed_columns=constants.SPAN_METRIC_SUMMABLE_COLUMNS,
-                                allow_custom_measurements=False,
-                            ),
-                        ),
-                    ],
-                    snql_metric_layer=lambda args, alias: Function(
-                        "sum",
-                        [self.resolve_mri(args["column"])],
-                        alias,
-                    ),
-                    default_result_type="duration",
-                ),
-                fields.MetricsFunction(
-                    "avg",
-                    optional_args=[
-                        fields.with_default(
-                            "span.self_time",
-                            fields.MetricArg(
-                                "column",
-                                allowed_columns=constants.SPAN_METRIC_DURATION_COLUMNS.union(
-                                    constants.SPAN_METRIC_BYTES_COLUMNS
-                                ),
-                            ),
-                        ),
-                    ],
-                    snql_metric_layer=lambda args, alias: Function(
-                        "avg",
-                        [self.resolve_mri(args["column"])],
-                        alias,
-                    ),
-                    result_type_fn=self.reflective_result_type(),
-                    default_result_type="duration",
-                ),
-                fields.MetricsFunction(
-                    "percentile",
-                    required_args=[
-                        fields.with_default(
-                            "span.self_time",
-                            fields.MetricArg(
-                                "column", allowed_columns=constants.SPAN_METRIC_DURATION_COLUMNS
-                            ),
-                        ),
-                        fields.NumberRange("percentile", 0, 1),
-                    ],
-                    snql_metric_layer=lambda args, alias: function_aliases.resolve_metrics_layer_percentile(
-                        args,
-                        alias,
-                        self.resolve_mri,
-                    ),
-                    result_type_fn=self.reflective_result_type(),
-                    default_result_type="duration",
-                ),
-                fields.MetricsFunction(
-                    "p50",
-                    optional_args=[
-                        fields.with_default(
-                            "span.self_time",
-                            fields.MetricArg(
-                                "column",
-                                allowed_columns=constants.SPAN_METRIC_DURATION_COLUMNS,
-                                allow_custom_measurements=False,
-                            ),
-                        ),
-                    ],
-                    snql_metric_layer=lambda args, alias: function_aliases.resolve_metrics_layer_percentile(
-                        args=args, alias=alias, resolve_mri=self.resolve_mri, fixed_percentile=0.50
-                    ),
-                    default_result_type="duration",
-                ),
-                fields.MetricsFunction(
-                    "p75",
-                    optional_args=[
-                        fields.with_default(
-                            "span.self_time",
-                            fields.MetricArg(
-                                "column",
-                                allowed_columns=constants.SPAN_METRIC_DURATION_COLUMNS,
-                                allow_custom_measurements=False,
-                            ),
-                        ),
-                    ],
-                    snql_metric_layer=lambda args, alias: function_aliases.resolve_metrics_layer_percentile(
-                        args=args, alias=alias, resolve_mri=self.resolve_mri, fixed_percentile=0.75
-                    ),
-                    default_result_type="duration",
-                ),
-                fields.MetricsFunction(
-                    "p95",
-                    optional_args=[
-                        fields.with_default(
-                            "span.self_time",
-                            fields.MetricArg(
-                                "column",
-                                allowed_columns=constants.SPAN_METRIC_DURATION_COLUMNS,
-                                allow_custom_measurements=False,
-                            ),
-                        ),
-                    ],
-                    snql_metric_layer=lambda args, alias: function_aliases.resolve_metrics_layer_percentile(
-                        args=args, alias=alias, resolve_mri=self.resolve_mri, fixed_percentile=0.95
-                    ),
-                    default_result_type="duration",
-                ),
-                fields.MetricsFunction(
-                    "p99",
-                    optional_args=[
-                        fields.with_default(
-                            "span.self_time",
-                            fields.MetricArg(
-                                "column",
-                                allowed_columns=constants.SPAN_METRIC_DURATION_COLUMNS,
-                                allow_custom_measurements=False,
-                            ),
-                        ),
-                    ],
-                    snql_metric_layer=lambda args, alias: function_aliases.resolve_metrics_layer_percentile(
-                        args=args, alias=alias, resolve_mri=self.resolve_mri, fixed_percentile=0.99
-                    ),
-                    default_result_type="duration",
-                ),
-                fields.MetricsFunction(
-                    "p100",
-                    optional_args=[
-                        fields.with_default(
-                            "span.self_time",
-                            fields.MetricArg(
-                                "column",
-                                allowed_columns=constants.SPAN_METRIC_DURATION_COLUMNS,
-                                allow_custom_measurements=False,
-                            ),
-                        ),
-                    ],
-                    snql_metric_layer=lambda args, alias: function_aliases.resolve_metrics_layer_percentile(
-                        args=args, alias=alias, resolve_mri=self.resolve_mri, fixed_percentile=1.0
-                    ),
-                    default_result_type="duration",
-                ),
-                fields.MetricsFunction(
-                    "http_error_count",
-                    snql_metric_layer=lambda args, alias: AliasedExpression(
-                        Column(
-                            SpanMRI.HTTP_ERROR_COUNT_LIGHT.value
-                            if not self.builder.has_transaction
-                            else SpanMRI.HTTP_ERROR_COUNT.value
-                        ),
-                        alias,
-                    ),
-                    default_result_type="integer",
-                ),
-                fields.MetricsFunction(
-                    "http_error_rate",
-                    snql_metric_layer=lambda args, alias: AliasedExpression(
-                        Column(
-                            SpanMRI.HTTP_ERROR_RATE_LIGHT.value
-                            if not self.builder.has_transaction
-                            else SpanMRI.HTTP_ERROR_RATE.value
-                        ),
-                        alias,
-                    ),
-                    default_result_type="percentage",
-                ),
-            ]
-        }
-
-        for alias, name in constants.SPAN_FUNCTION_ALIASES.items():
-            if name in function_converter:
-                function_converter[alias] = function_converter[name].alias_as(alias)
-
-        return function_converter
-
-    @property
-    def orderby_converter(self) -> Mapping[str, OrderBy]:
-        return {}
diff --git a/src/sentry/search/events/filter.py b/src/sentry/search/events/filter.py
index d0c8d4fc2bc73a..9f5b3b1289430d 100644
--- a/src/sentry/search/events/filter.py
+++ b/src/sentry/search/events/filter.py
@@ -73,7 +73,7 @@ def translate_transaction_status(val: str) -> str:
     return SPAN_STATUS_NAME_TO_CODE[val]
 
 
-def to_list(value: list[str] | str) -> list[str]:
+def to_list[T](value: list[T] | T) -> list[T]:
     if isinstance(value, list):
         return value
     return [value]
diff --git a/src/sentry/search/events/types.py b/src/sentry/search/events/types.py
index f4b8e4e4672311..abba86f4a621a5 100644
--- a/src/sentry/search/events/types.py
+++ b/src/sentry/search/events/types.py
@@ -65,9 +65,12 @@ class QueryFramework:
 
 
 class EventsMeta(TypedDict):
+    datasetReason: NotRequired[str]
     fields: dict[str, str]
     tips: NotRequired[dict[str, str | None]]
     isMetricsData: NotRequired[bool]
+    isMetricsExtractedData: NotRequired[bool]
+    discoverSplitDecision: NotRequired[str]
 
 
 class EventsResponse(TypedDict):
@@ -100,6 +103,9 @@ def __post_init__(self) -> None:
         # Only used in the trend query builder
         self.aliases: dict[str, Alias] | None = {}
 
+    def __repr__(self) -> str:
+        return f"<SnubaParams: start={self.start},end={self.end},environments={self.environment_ids},projects={self.project_ids}>"
+
     def parse_stats_period(self) -> None:
         if self.stats_period is not None:
             self.end = django_timezone.now()
diff --git a/src/sentry/seer/similarity/utils.py b/src/sentry/seer/similarity/utils.py
index a7b8f088029581..49c5b0c417d610 100644
--- a/src/sentry/seer/similarity/utils.py
+++ b/src/sentry/seer/similarity/utils.py
@@ -5,6 +5,8 @@
 
 from sentry import options
 from sentry.eventstore.models import Event, GroupEvent
+from sentry.grouping.api import get_contributing_variant_and_component
+from sentry.grouping.variants import BaseVariant, ComponentVariant
 from sentry.killswitches import killswitch_matches_context
 from sentry.models.project import Project
 from sentry.utils import metrics
@@ -15,11 +17,18 @@
 MAX_FRAME_COUNT = 30
 MAX_EXCEPTION_COUNT = 30
 FULLY_MINIFIED_STACKTRACE_MAX_FRAME_COUNT = 20
-SEER_ELIGIBLE_PLATFORMS_EVENTS = frozenset(
+# Events' `platform` values are tested against this list before events are sent to Seer. Checking
+# this separately from backfill status allows us to backfill projects which have events from
+# multiple platforms, some supported and some not, and not worry about events from the unsupported
+# platforms getting sent to Seer during ingest.
+SEER_INELIGIBLE_EVENT_PLATFORMS = frozenset(["other"])  # We don't know what's in the event
+# Event platforms corresponding to project platforms which were backfilled before we started
+# blocking events with more than `MAX_FRAME_COUNT` frames from being sent to Seer (which we do to
+# prevent possible over-grouping). Ultimately we want a more unified solution, but for now, we're
+# just not going to apply the filter to events from these platforms.
+EVENT_PLATFORMS_BYPASSING_FRAME_COUNT_CHECK = frozenset(
     [
-        "csharp",
         "go",
-        "java",
         "javascript",
         "node",
         "php",
@@ -27,136 +36,14 @@
         "ruby",
     ]
 )
-# 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(
+# Existing projects with these platforms shouldn't be backfilled and new projects with these
+# platforms shouldn't have Seer enabled.
+SEER_INELIGIBLE_PROJECT_PLATFORMS = frozenset(
     [
-        "bun",
-        "cordova",
-        "deno",
-        "django",
-        "go",
-        "go-echo",
-        "go-fasthttp",
-        "go-fiber",
-        "go-gin",
-        "go-http",
-        "go-iris",
-        "go-martini",
-        "go-negroni",
-        "ionic",
-        "javascript",
-        "javascript-angular",
-        "javascript-angularjs",
-        "javascript-astro",
-        "javascript-backbone",
-        "javascript-browser",
-        "javascript-electron",
-        "javascript-ember",
-        "javascript-gatsby",
-        "javascript-nextjs",
-        "javascript-performance-onboarding-1-install",
-        "javascript-performance-onboarding-2-configure",
-        "javascript-performance-onboarding-3-verify",
-        "javascript-react",
-        "javascript-react-performance-onboarding-1-install",
-        "javascript-react-performance-onboarding-2-configure",
-        "javascript-react-performance-onboarding-3-verify",
-        "javascript-react-with-error-monitoring",
-        "javascript-react-with-error-monitoring-performance-and-replay",
-        "javascript-remix",
-        "javascript-replay-onboarding-1-install",
-        "javascript-replay-onboarding-2-configure",
-        "javascript-solid",
-        "javascript-svelte",
-        "javascript-sveltekit",
-        "javascript-vue",
-        "javascript-vue-with-error-monitoring",
-        "node",
-        "node-awslambda",
-        "node-azurefunctions",
-        "node-connect",
-        "node-express",
-        "node-fastify",
-        "node-gcpfunctions",
-        "node-hapi",
-        "node-koa",
-        "node-nestjs",
-        "node-nodeawslambda",
-        "node-nodegcpfunctions",
-        "node-profiling-onboarding-0-alert",
-        "node-profiling-onboarding-1-install",
-        "node-profiling-onboarding-2-configure-performance",
-        "node-profiling-onboarding-3-configure-profiling",
-        "node-serverlesscloud",
-        "PHP",
-        "php",
-        "php-laravel",
-        "php-monolog",
-        "php-symfony",
-        "php-symfony2",
-        "python",
-        "python-aiohttp",
-        "python-asgi",
-        "python-awslambda",
-        "python-azurefunctions",
-        "python-bottle",
-        "python-celery",
-        "python-chalice",
-        "python-django",
-        "python-falcon",
-        "python-fastapi",
-        "python-flask",
-        "python-gcpfunctions",
-        "python-profiling-onboarding-0-alert",
-        "python-profiling-onboarding-1-install",
-        "python-profiling-onboarding-3-configure-profiling",
-        "python-pylons",
-        "python-pymongo",
-        "python-pyramid",
-        "python-pythonawslambda",
-        "python-pythonazurefunctions",
-        "python-pythongcpfunctions",
-        "python-pythonserverless",
-        "python-quart",
-        "python-rq",
-        "python-sanic",
-        "python-serverless",
-        "python-starlette",
-        "python-tornado",
-        "python-tryton",
-        "python-wsgi",
-        "react",
-        "react-native",
-        "react-native-tracing",
-        "ruby",
-        "ruby-rack",
-        "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",
-        "perl",
+        # We have no clue what's in these projects
+        "other",
+        "",
+        None,
     ]
 )
 BASE64_ENCODED_PREFIXES = [
@@ -170,6 +57,8 @@
 class ReferrerOptions(StrEnum):
     INGEST = "ingest"
     BACKFILL = "backfill"
+    DELETION = "deletion"
+    SIMILAR_ISSUES_TAB = "similar_issues_tab"
 
 
 class TooManyOnlySystemFramesException(Exception):
@@ -236,9 +125,8 @@ def get_stacktrace_string(data: dict[str, Any], platform: str | None = None) ->
             exception, frame_metrics
         )
         if (
-            platform not in SYSTEM_FRAME_CHECK_BLACKLIST_PLATFORMS
+            platform not in EVENT_PLATFORMS_BYPASSING_FRAME_COUNT_CHECK
             and frame_metrics["is_frames_truncated"]
-            and not app_hash
         ):
             raise TooManyOnlySystemFramesException
 
@@ -282,15 +170,12 @@ def generate_stacktrace_string(
         },
     )
 
-    # Metric for errors with no header, only one frame and no filename
-    # TODO: Determine how often this occurs and if we should send to seer, then remove metric
+    # Return empty stacktrace for events with no header, only one frame and no filename
+    # since this is too little info to group on
     if frame_metrics["has_no_filename"] and len(result_parts) == 1:
         header, frames = result_parts[0][0], result_parts[0][1]
         if header == "" and len(frames) == 1:
-            metrics.incr(
-                "seer.grouping.no_header_one_frame_no_filename",
-                sample_rate=options.get("seer.similarity.metrics_sample_rate"),
-            )
+            stacktrace_str = ""
 
     return stacktrace_str.strip()
 
@@ -397,7 +282,6 @@ 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)
@@ -409,11 +293,7 @@ def get_stacktrace_string_with_metrics(
             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"},
-            )
+            record_did_call_seer_metric(call_made=False, blocker="over-threshold-frames")
     except Exception:
         logger.exception("Unexpected exception in stacktrace string formatting")
 
@@ -430,78 +310,114 @@ def event_content_has_stacktrace(event: GroupEvent | Event) -> bool:
     return exception_stacktrace or threads_stacktrace or only_stacktrace
 
 
-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.
-    """
-    # TODO: Determine if we want to filter out non-sourcemapped events
-    if not event_content_has_stacktrace(event):
+def record_did_call_seer_metric(*, call_made: bool, blocker: str) -> None:
+    metrics.incr(
+        "grouping.similarity.did_call_seer",
+        sample_rate=options.get("seer.similarity.metrics_sample_rate"),
+        tags={"call_made": call_made, "blocker": blocker},
+    )
+
+
+def has_too_many_contributing_frames(
+    event: Event | GroupEvent,
+    variants: dict[str, BaseVariant],
+    referrer: ReferrerOptions,
+) -> bool:
+    platform = event.platform
+    shared_tags = {"referrer": referrer.value, "platform": platform}
+
+    contributing_variant, contributing_component = get_contributing_variant_and_component(variants)
+
+    # Ideally we're calling this function after we already know the event both has a stacktrace and
+    # is using it for grouping (in which case none of the below conditions should apply), but still
+    # worth checking that we have enough information to answer the question just in case
+    if (
+        # Fingerprint, checksum, fallback variants
+        not isinstance(contributing_variant, ComponentVariant)
+        # Security violations, log-message-based grouping
+        or contributing_variant.variant_name == "default"
+        # Any ComponentVariant will have this, but this reassures mypy
+        or not contributing_component
+        # Exception-message-based grouping
+        or not hasattr(contributing_component, "frame_counts")
+    ):
+        # We don't bother to collect a metric on this outcome, because we shouldn't have called the
+        # function in the first place
+        return False
+
+    # Certain platforms were backfilled before we added this filter, so to keep new events matching
+    # with the existing data, we turn off the filter for them (instead their stacktraces will be
+    # truncated)
+    if platform in EVENT_PLATFORMS_BYPASSING_FRAME_COUNT_CHECK:
         metrics.incr(
-            "grouping.similarity.event_content_seer_eligible",
+            "grouping.similarity.frame_count_filter",
             sample_rate=options.get("seer.similarity.metrics_sample_rate"),
-            tags={"eligible": False, "blocker": "no-stacktrace"},
+            tags={**shared_tags, "outcome": "bypass"},
         )
         return False
 
-    if event.platform not in SEER_ELIGIBLE_PLATFORMS_EVENTS:
+    stacktrace_type = "in_app" if contributing_variant.variant_name == "app" else "system"
+    key = f"{stacktrace_type}_contributing_frames"
+    shared_tags["stacktrace_type"] = stacktrace_type
+
+    if contributing_component.frame_counts[key] > MAX_FRAME_COUNT:
         metrics.incr(
-            "grouping.similarity.event_content_seer_eligible",
+            "grouping.similarity.frame_count_filter",
             sample_rate=options.get("seer.similarity.metrics_sample_rate"),
-            tags={"eligible": False, "blocker": "unsupported-platform"},
+            tags={**shared_tags, "outcome": "block"},
         )
-        return False
+        return True
 
     metrics.incr(
-        "grouping.similarity.event_content_seer_eligible",
+        "grouping.similarity.frame_count_filter",
         sample_rate=options.get("seer.similarity.metrics_sample_rate"),
-        tags={"eligible": True, "blocker": "none"},
+        tags={**shared_tags, "outcome": "pass"},
     )
-    return True
+    return False
 
 
-def killswitch_enabled(project_id: int, event: GroupEvent | Event | None = None) -> bool:
+def killswitch_enabled(
+    project_id: int | None,
+    referrer: ReferrerOptions,
+    event: GroupEvent | Event | None = None,
+) -> bool:
     """
     Check both the global and similarity-specific Seer killswitches.
     """
-
+    is_ingest = referrer == ReferrerOptions.INGEST
+    logger_prefix = f"grouping.similarity.{referrer.value}"
     logger_extra = {"event_id": event.event_id if event else None, "project_id": project_id}
 
     if options.get("seer.global-killswitch.enabled"):
         logger.warning(
-            "should_call_seer_for_grouping.seer_global_killswitch_enabled",
+            f"{logger_prefix}.seer_global_killswitch_enabled",  # noqa
             extra=logger_extra,
         )
-        metrics.incr(
-            "grouping.similarity.did_call_seer",
-            sample_rate=options.get("seer.similarity.metrics_sample_rate"),
-            tags={"call_made": False, "blocker": "global-killswitch"},
-        )
+        if is_ingest:
+            record_did_call_seer_metric(call_made=False, blocker="global-killswitch")
+
         return True
 
     if options.get("seer.similarity-killswitch.enabled"):
         logger.warning(
-            "should_call_seer_for_grouping.seer_similarity_killswitch_enabled",
+            f"{logger_prefix}.seer_similarity_killswitch_enabled",  # noqa
             extra=logger_extra,
         )
-        metrics.incr(
-            "grouping.similarity.did_call_seer",
-            sample_rate=options.get("seer.similarity.metrics_sample_rate"),
-            tags={"call_made": False, "blocker": "similarity-killswitch"},
-        )
+        if is_ingest:
+            record_did_call_seer_metric(call_made=False, blocker="similarity-killswitch")
+
         return True
 
     if killswitch_matches_context(
         "seer.similarity.grouping_killswitch_projects", {"project_id": project_id}
     ):
         logger.warning(
-            "should_call_seer_for_grouping.seer_similarity_project_killswitch_enabled",
+            f"{logger_prefix}.seer_similarity_project_killswitch_enabled",  # noqa
             extra=logger_extra,
         )
-        metrics.incr(
-            "grouping.similarity.did_call_seer",
-            sample_rate=options.get("seer.similarity.metrics_sample_rate"),
-            tags={"call_made": False, "blocker": "project-killswitch"},
-        )
+        if is_ingest:
+            record_did_call_seer_metric(call_made=False, blocker="project-killswitch")
+
         return True
 
     return False
@@ -543,7 +459,7 @@ def project_is_seer_eligible(project: Project) -> bool:
     the feature is enabled in the region.
     """
     is_backfill_completed = project.get_option("sentry:similarity_backfill_completed")
-    is_seer_eligible_platform = project.platform in SEER_ELIGIBLE_PLATFORMS
+    is_seer_eligible_platform = project.platform not in SEER_INELIGIBLE_PROJECT_PLATFORMS
     is_region_enabled = options.get("similarity.new_project_seer_grouping.enabled")
 
     return not is_backfill_completed and is_seer_eligible_platform and is_region_enabled
diff --git a/src/sentry/sentry_apps/api/bases/sentryapps.py b/src/sentry/sentry_apps/api/bases/sentryapps.py
index 1ce641f943707d..f2046c61081b9f 100644
--- a/src/sentry/sentry_apps/api/bases/sentryapps.py
+++ b/src/sentry/sentry_apps/api/bases/sentryapps.py
@@ -120,7 +120,7 @@ class SentryAppsBaseEndpoint(IntegrationPlatformEndpoint):
     permission_classes: tuple[type[BasePermission], ...] = (SentryAppsAndStaffPermission,)
 
     def _get_organization_slug(self, request: Request):
-        organization_slug = request.json_body.get("organization")
+        organization_slug = request.data.get("organization")
         if not organization_slug or not isinstance(organization_slug, str):
             error_message = "Please provide a valid value for the 'organization' field."
             raise ValidationError({"organization": to_single_line_str(error_message)})
@@ -179,7 +179,7 @@ def convert_args(self, request: Request, *args, **kwargs):
         objects from URI params, we're applying the same logic for a param in
         the request body.
         """
-        if not request.json_body:
+        if not request.data:
             return (args, kwargs)
 
         context = self._get_org_context(request)
diff --git a/src/sentry/sentry_apps/api/endpoints/sentry_app_authorizations.py b/src/sentry/sentry_apps/api/endpoints/sentry_app_authorizations.py
index 8f999d7eb1fc95..05b1aad13758d1 100644
--- a/src/sentry/sentry_apps/api/endpoints/sentry_app_authorizations.py
+++ b/src/sentry/sentry_apps/api/endpoints/sentry_app_authorizations.py
@@ -46,7 +46,7 @@ def post(self, request: Request, installation) -> Response:
         scope.set_tag("sentry_app_slug", installation.sentry_app.slug)
 
         try:
-            if request.json_body.get("grant_type") == GrantTypes.AUTHORIZATION:
+            if request.data.get("grant_type") == GrantTypes.AUTHORIZATION:
                 auth_serializer: SentryAppAuthorizationSerializer = (
                     SentryAppAuthorizationSerializer(data=request.data)
                 )
@@ -60,7 +60,7 @@ def post(self, request: Request, installation) -> Response:
                     client_id=auth_serializer.validated_data.get("client_id"),
                     user=promote_request_api_user(request),
                 ).run()
-            elif request.json_body.get("grant_type") == GrantTypes.REFRESH:
+            elif request.data.get("grant_type") == GrantTypes.REFRESH:
                 refresh_serializer = SentryAppRefreshAuthorizationSerializer(data=request.data)
 
                 if not refresh_serializer.is_valid():
@@ -87,7 +87,7 @@ def post(self, request: Request, installation) -> Response:
             )
             return Response({"error": e.msg or "Unauthorized"}, status=403)
 
-        attrs = {"state": request.json_body.get("state"), "application": None}
+        attrs = {"state": request.data.get("state"), "application": None}
 
         body = ApiTokenSerializer().serialize(token, attrs, promote_request_api_user(request))
 
diff --git a/src/sentry/sentry_apps/api/endpoints/sentry_app_details.py b/src/sentry/sentry_apps/api/endpoints/sentry_app_details.py
index 09aae78ab8fbb1..f972ee75d74283 100644
--- a/src/sentry/sentry_apps/api/endpoints/sentry_app_details.py
+++ b/src/sentry/sentry_apps/api/endpoints/sentry_app_details.py
@@ -192,7 +192,7 @@ def delete(self, request: Request, sentry_app) -> Response:
         return Response({"detail": ["Published apps cannot be removed."]}, status=403)
 
     def _has_hook_events(self, request: Request):
-        if not request.json_body.get("events"):
+        if not request.data.get("events"):
             return False
 
-        return "error" in request.json_body["events"]
+        return "error" in request.data["events"]
diff --git a/src/sentry/sentry_apps/api/endpoints/sentry_apps.py b/src/sentry/sentry_apps/api/endpoints/sentry_apps.py
index 1ebe56f95d6374..eecbb92c7f8c80 100644
--- a/src/sentry/sentry_apps/api/endpoints/sentry_apps.py
+++ b/src/sentry/sentry_apps/api/endpoints/sentry_apps.py
@@ -71,22 +71,22 @@ def get(self, request: Request) -> Response:
 
     def post(self, request: Request, organization) -> Response:
         data = {
-            "name": request.json_body.get("name"),
+            "name": request.data.get("name"),
             "user": request.user,
-            "author": request.json_body.get("author"),
+            "author": request.data.get("author"),
             "organization": organization,
-            "webhookUrl": request.json_body.get("webhookUrl"),
-            "redirectUrl": request.json_body.get("redirectUrl"),
-            "isAlertable": request.json_body.get("isAlertable"),
-            "isInternal": request.json_body.get("isInternal"),
-            "verifyInstall": request.json_body.get("verifyInstall"),
-            "scopes": request.json_body.get("scopes", []),
-            "events": request.json_body.get("events", []),
-            "schema": request.json_body.get("schema", {}),
-            "overview": request.json_body.get("overview"),
-            "allowedOrigins": request.json_body.get("allowedOrigins", []),
+            "webhookUrl": request.data.get("webhookUrl"),
+            "redirectUrl": request.data.get("redirectUrl"),
+            "isAlertable": request.data.get("isAlertable"),
+            "isInternal": request.data.get("isInternal"),
+            "verifyInstall": request.data.get("verifyInstall"),
+            "scopes": request.data.get("scopes", []),
+            "events": request.data.get("events", []),
+            "schema": request.data.get("schema", {}),
+            "overview": request.data.get("overview"),
+            "allowedOrigins": request.data.get("allowedOrigins", []),
             "popularity": (
-                request.json_body.get("popularity") if is_active_superuser(request) else None
+                request.data.get("popularity") if is_active_superuser(request) else None
             ),
         }
 
@@ -166,7 +166,7 @@ def _filter_queryset_for_user(self, queryset: BaseQuerySet[SentryApp, SentryApp]
         return queryset.filter(owner_id__in=owner_ids)
 
     def _has_hook_events(self, request: Request):
-        if not request.json_body.get("events"):
+        if not request.data.get("events"):
             return False
 
-        return "error" in request.json_body["events"]
+        return "error" in request.data["events"]
diff --git a/src/sentry/sentry_apps/services/app/model.py b/src/sentry/sentry_apps/services/app/model.py
index 20609618b50841..b9ac92bccc638b 100644
--- a/src/sentry/sentry_apps/services/app/model.py
+++ b/src/sentry/sentry_apps/services/app/model.py
@@ -18,8 +18,8 @@
 
 class RpcApiApplication(RpcModel):
     id: int = -1
-    client_id: str = ""
-    client_secret: str = ""
+    client_id: str = Field(repr=False, default="")
+    client_secret: str = Field(repr=False, default="")
 
 
 class RpcSentryAppService(RpcModel):
diff --git a/src/sentry/sentry_apps/utils/errors.py b/src/sentry/sentry_apps/utils/errors.py
new file mode 100644
index 00000000000000..af43d04c00b01d
--- /dev/null
+++ b/src/sentry/sentry_apps/utils/errors.py
@@ -0,0 +1,35 @@
+from enum import Enum
+
+
+class SentryAppErrorType(Enum):
+    CLIENT = "client"
+    INTEGRATOR = "integrator"
+    SENTRY = "sentry"
+
+
+# Represents a user/client error that occured during a Sentry App process
+class SentryAppError(Exception):
+    error_type = SentryAppErrorType.CLIENT
+    status_code = 400
+
+    def __init__(
+        self,
+        error: Exception | None = None,
+        status_code: int | None = None,
+    ) -> None:
+        if status_code:
+            self.status_code = status_code
+
+
+# Represents an error caused by a 3p integrator during a Sentry App process
+class SentryAppIntegratorError(Exception):
+    error_type = SentryAppErrorType.INTEGRATOR
+    status_code = 400
+
+    def __init__(
+        self,
+        error: Exception | None = None,
+        status_code: int | None = None,
+    ) -> None:
+        if status_code:
+            self.status_code = status_code
diff --git a/src/sentry/sentry_metrics/configuration.py b/src/sentry/sentry_metrics/configuration.py
index 0f812f29362341..8c8b63752f26f5 100644
--- a/src/sentry/sentry_metrics/configuration.py
+++ b/src/sentry/sentry_metrics/configuration.py
@@ -27,8 +27,6 @@ class UseCaseKey(Enum):
 # backwards compatibility
 RELEASE_HEALTH_PG_NAMESPACE = "releasehealth"
 PERFORMANCE_PG_NAMESPACE = "performance"
-RELEASE_HEALTH_CS_NAMESPACE = "releasehealth.cs"
-PERFORMANCE_CS_NAMESPACE = "performance.cs"
 
 RELEASE_HEALTH_SCHEMA_VALIDATION_RULES_OPTION_NAME = (
     "sentry-metrics.indexer.release-health.schema-validation-rules"
@@ -172,23 +170,3 @@ def initialize_main_process_state(config: MetricsIngestConfiguration) -> None:
     global_tag_map = {"pipeline": config.internal_metrics_tag or ""}
 
     add_global_tags(_all_threads=True, **global_tag_map)
-
-
-HARD_CODED_UNITS = {"span.duration": "millisecond"}
-ALLOWED_TYPES = {"c", "d", "s", "g"}
-
-# METRICS_AGGREGATES specifies the aggregates that are available for a metric type - AGGREGATES_TO_METRICS reverses this,
-# and provides a map from the aggregate to the metric type in the form {'count': 'c', 'avg':'g', ...}. This is needed
-# when the UI lets the user select the aggregate, and the backend infers the metric_type from it. It is programmatic
-# and not hard-coded, so that in case of a change, the two mappings are aligned.
-METRIC_TYPE_TO_AGGREGATE = {
-    "c": ["count"],
-    "g": ["avg", "min", "max", "sum"],
-    "d": ["p50", "p75", "p90", "p95", "p99"],
-    "s": ["count_unique"],
-}
-AGGREGATE_TO_METRIC_TYPE = {
-    aggregate: metric_type
-    for metric_type, aggregate_list in METRIC_TYPE_TO_AGGREGATE.items()
-    for aggregate in aggregate_list
-}
diff --git a/src/sentry/sentry_metrics/consumers/indexer/batch.py b/src/sentry/sentry_metrics/consumers/indexer/batch.py
index ef52a8ffe1b44b..707a0a643ab291 100644
--- a/src/sentry/sentry_metrics/consumers/indexer/batch.py
+++ b/src/sentry/sentry_metrics/consumers/indexer/batch.py
@@ -1,7 +1,7 @@
 import logging
 import random
 from collections import defaultdict
-from collections.abc import Callable, Iterable, Mapping, MutableMapping, MutableSequence, Sequence
+from collections.abc import Callable, Iterable, Mapping, MutableMapping, MutableSequence
 from dataclasses import dataclass
 from typing import Any, cast
 
@@ -248,27 +248,6 @@ def _validate_message(self, parsed_payload: ParsedMessage) -> None:
             )
             raise ValueError(f"Invalid metric tags: {tags}")
 
-    @metrics.wraps("process_messages.filter_messages")
-    def filter_messages(self, keys_to_remove: Sequence[BrokerMeta]) -> None:
-        # XXX: it is useful to be able to get a sample of organization ids that are affected by rate limits, but this is really slow.
-        for broker_meta in keys_to_remove:
-            if _should_sample_debug_log():
-                sentry_sdk.set_tag(
-                    "sentry_metrics.organization_id",
-                    self.parsed_payloads_by_meta[broker_meta]["org_id"],
-                )
-                sentry_sdk.set_tag(
-                    "sentry_metrics.metric_name", self.parsed_payloads_by_meta[broker_meta]["name"]
-                )
-                logger.error(
-                    "process_messages.dropped_message",
-                    extra={
-                        "reason": "cardinality_limit",
-                    },
-                )
-
-        self.filtered_msg_meta.update(keys_to_remove)
-
     @metrics.wraps("process_messages.extract_strings")
     def extract_strings(self) -> Mapping[UseCaseID, Mapping[OrgId, set[str]]]:
         strings: Mapping[UseCaseID, Mapping[OrgId, set[str]]] = defaultdict(
diff --git a/src/sentry/sentry_metrics/consumers/indexer/common.py b/src/sentry/sentry_metrics/consumers/indexer/common.py
index 9b0a18c8281fb9..54fbfdf066520d 100644
--- a/src/sentry/sentry_metrics/consumers/indexer/common.py
+++ b/src/sentry/sentry_metrics/consumers/indexer/common.py
@@ -26,9 +26,6 @@ class BrokerMeta(NamedTuple):
 
 logger = logging.getLogger(__name__)
 
-DEFAULT_QUEUED_MAX_MESSAGE_KBYTES = 50000
-DEFAULT_QUEUED_MIN_MESSAGES = 100000
-
 
 @dataclass(frozen=True)
 class IndexerOutputMessageBatch:
diff --git a/src/sentry/sentry_metrics/extraction_rules.py b/src/sentry/sentry_metrics/extraction_rules.py
deleted file mode 100644
index 38246de5e50dc4..00000000000000
--- a/src/sentry/sentry_metrics/extraction_rules.py
+++ /dev/null
@@ -1,80 +0,0 @@
-from __future__ import annotations
-
-from collections.abc import Mapping
-from dataclasses import dataclass
-from typing import Any
-
-from sentry.sentry_metrics.configuration import (
-    AGGREGATE_TO_METRIC_TYPE,
-    ALLOWED_TYPES,
-    HARD_CODED_UNITS,
-)
-from sentry.sentry_metrics.use_case_utils import string_to_use_case_id
-
-METRICS_EXTRACTION_RULES_OPTION_KEY = "sentry:metrics_extraction_rules"
-SPAN_ATTRIBUTE_PREFIX = "span_attribute_"
-
-
-class MetricsExtractionRuleValidationError(ValueError):
-    pass
-
-
-@dataclass
-class MetricsExtractionRule:
-    def __init__(
-        self,
-        span_attribute: str,
-        type: str,
-        unit: str,
-        tags: set[str],
-        condition: str,
-        id: int,
-    ):
-        self.span_attribute = self.validate_span_attribute(span_attribute)
-        self.type = self.validate_type(type)
-        self.unit = HARD_CODED_UNITS.get(span_attribute, unit)
-        self.tags = set(tags)
-        self.condition = condition
-        self.id = id
-
-    def validate_span_attribute(self, span_attribute: str) -> str:
-        if not isinstance(span_attribute, str):
-            raise ValueError("The span attribute must be of type string.")
-        return span_attribute
-
-    def validate_type(self, type_value: str) -> str:
-        if not isinstance(type_value, str):
-            raise ValueError("The type must be of type string.")
-
-        if type_value not in ALLOWED_TYPES:
-            raise ValueError(
-                "Type can only have the following values: 'c' for counter, 'd' for distribution, 'g' for gauge, or 's' for set."
-            )
-        return type_value
-
-    @classmethod
-    def infer_types(self, aggregates: set[str]) -> set[str]:
-        types: set[str] = set()
-        for aggregate in aggregates:
-            if new_type := AGGREGATE_TO_METRIC_TYPE.get(aggregate):
-                types.add(new_type)
-
-        return types
-
-    def to_dict(self) -> Mapping[str, Any]:
-        return {
-            "spanAttribute": self.span_attribute,
-            "type": self.type,
-            "unit": self.unit,
-            "tags": self.tags,
-            "condition": self.condition,
-            "id": self.id,
-        }
-
-    def generate_mri(self, use_case: str = "custom"):
-        """Generate the Metric Resource Identifier (MRI) associated with the extraction rule."""
-        use_case_id = string_to_use_case_id(use_case)
-        return f"{self.type}:{use_case_id.value}/{SPAN_ATTRIBUTE_PREFIX}{self.id}@none"
-
-    def __hash__(self):
-        return hash(self.generate_mri())
diff --git a/src/sentry/sentry_metrics/indexer/id_generator.py b/src/sentry/sentry_metrics/indexer/id_generator.py
deleted file mode 100644
index db0514468d14d9..00000000000000
--- a/src/sentry/sentry_metrics/indexer/id_generator.py
+++ /dev/null
@@ -1,54 +0,0 @@
-import random
-import time
-
-_VERSION_BITS = 4
-_TS_BITS = 32
-_RANDOM_BITS = 28
-_TOTAL_BITS = _VERSION_BITS + _TS_BITS + _RANDOM_BITS
-assert _TOTAL_BITS == 64
-
-_VERSION = 2
-
-# Warning! The version must be an even number as this is already
-# written to a BigInt field in Postgres
-assert _VERSION % 2 == 0
-
-# 1st January 2022
-_INDEXER_EPOCH_START = 1641024000
-
-
-def reverse_bits(number: int, bit_size: int) -> int:
-    return int(bin(number)[2:].zfill(bit_size)[::-1], 2)
-
-
-# we will have room b/n version and time since for a while
-# so let's reverse the version bits to grow to the right
-# instead of left should we need more than 3 bits for version
-
-_VERSION_PREFIX = reverse_bits(_VERSION, _VERSION_BITS)
-
-
-def get_id() -> int:
-    """
-    Generates IDs for use by indexer storages that do not have autoincrement sequences.
-
-    This function does not provide any guarantee of uniqueness, just a low probability of collisions.
-    It relies on the database to be strongly consistent and reject writes with duplicate IDs. These should
-    be retried with a newly generated ID.
-
-    The ID generated is in roughly incrementing order.
-
-    Metric IDs are 64 bit but this function only generates IDs that fit in 63 bits. The leading bit is always zero.
-    This is because they were stored in Postgres as BigInt (signed 64 bit) and we do not want to change that now.
-    In ClickHouse it is an unsigned 64 bit integer.
-    """
-
-    now = int(time.time())
-    time_since_epoch = now - _INDEXER_EPOCH_START
-    rand = random.getrandbits(_RANDOM_BITS)
-
-    id = _VERSION_PREFIX << (_TOTAL_BITS - _VERSION_BITS)
-    id |= time_since_epoch << (_TOTAL_BITS - _VERSION_BITS - _TS_BITS)
-    id |= rand
-
-    return id
diff --git a/src/sentry/sentry_metrics/indexer/postgres/models.py b/src/sentry/sentry_metrics/indexer/postgres/models.py
index 7575951f74c3a5..142af00288e919 100644
--- a/src/sentry/sentry_metrics/indexer/postgres/models.py
+++ b/src/sentry/sentry_metrics/indexer/postgres/models.py
@@ -1,8 +1,8 @@
 import logging
-from typing import Any, ClassVar, Self
+from typing import ClassVar, Self
 
 from django.conf import settings
-from django.db import connections, models, router
+from django.db import models
 from django.utils import timezone
 
 from sentry.backup.scopes import RelocationScope
@@ -16,35 +16,6 @@
 from collections.abc import Mapping
 
 
-@region_silo_model
-class MetricsKeyIndexer(Model):
-    __relocation_scope__ = RelocationScope.Excluded
-
-    string = models.CharField(max_length=200)
-    date_added = models.DateTimeField(default=timezone.now)
-
-    objects: ClassVar[BaseManager[Self]] = BaseManager(
-        cache_fields=("pk", "string"), cache_ttl=settings.SENTRY_METRICS_INDEXER_CACHE_TTL
-    )
-
-    class Meta:
-        db_table = "sentry_metricskeyindexer"
-        app_label = "sentry"
-        constraints = [
-            models.UniqueConstraint(fields=["string"], name="unique_string"),
-        ]
-
-    @classmethod
-    def get_next_values(cls, num: int) -> Any:
-        using = router.db_for_write(cls)
-        connection = connections[using].cursor()
-
-        connection.execute(
-            "SELECT nextval('sentry_metricskeyindexer_id_seq') from generate_series(1,%s)", [num]
-        )
-        return connection.fetchall()
-
-
 class BaseIndexer(Model):
     string = models.CharField(max_length=MAX_INDEXED_COLUMN_LENGTH)
     organization_id = BoundedBigIntegerField()
diff --git a/src/sentry/sentry_metrics/indexer/postgres/postgres_v2.py b/src/sentry/sentry_metrics/indexer/postgres/postgres_v2.py
index 2eaac04915ff6c..8155a49ef506b0 100644
--- a/src/sentry/sentry_metrics/indexer/postgres/postgres_v2.py
+++ b/src/sentry/sentry_metrics/indexer/postgres/postgres_v2.py
@@ -31,7 +31,6 @@
 __all__ = ["PostgresIndexer"]
 
 
-_INDEXER_CACHE_METRIC = "sentry_metrics.indexer.memcache"
 _INDEXER_DB_METRIC = "sentry_metrics.indexer.postgres"
 
 _PARTITION_KEY = "pg"
diff --git a/src/sentry/sentry_metrics/querying/constants.py b/src/sentry/sentry_metrics/querying/constants.py
index 64ed5b42be3f9a..508202c3262d84 100644
--- a/src/sentry/sentry_metrics/querying/constants.py
+++ b/src/sentry/sentry_metrics/querying/constants.py
@@ -2,17 +2,6 @@
 
 # Snuba can return at most 10.000 rows.
 SNUBA_QUERY_LIMIT = 10000
-# Intervals in seconds which are used by the product to query data.
-DEFAULT_QUERY_INTERVALS = [
-    60 * 60 * 24,  # 1 day
-    60 * 60 * 12,  # 12 hours
-    60 * 60 * 4,  # 4 hours
-    60 * 60 * 2,  # 2 hours
-    60 * 60,  # 1 hour
-    60 * 30,  # 30 min
-    60 * 5,  # 5 min
-    60,  # 1 min
-]
 # Operators in formulas that use coefficients.
 COEFFICIENT_OPERATORS = {
     ArithmeticOperator.DIVIDE.value,
diff --git a/src/sentry/sentry_metrics/querying/data/mapping/base.py b/src/sentry/sentry_metrics/querying/data/mapping/base.py
index e241dd0229a571..b67384654bf093 100644
--- a/src/sentry/sentry_metrics/querying/data/mapping/base.py
+++ b/src/sentry/sentry_metrics/querying/data/mapping/base.py
@@ -1,6 +1,6 @@
 import abc
 from collections.abc import Sequence
-from typing import Any, TypeVar
+from typing import Any
 
 from sentry.models.project import Project
 
@@ -26,9 +26,6 @@ def backward(self, projects: Sequence[Project], value: Any) -> Any:
         return value
 
 
-TMapper = TypeVar("TMapper", bound=Mapper)
-
-
 class MapperConfig:
     def __init__(self):
         self.mappers: set[type[Mapper]] = set()
diff --git a/src/sentry/sentry_metrics/querying/data/transformation/stats.py b/src/sentry/sentry_metrics/querying/data/transformation/stats.py
deleted file mode 100644
index 45cc44c37f4147..00000000000000
--- a/src/sentry/sentry_metrics/querying/data/transformation/stats.py
+++ /dev/null
@@ -1,48 +0,0 @@
-from collections.abc import Mapping, Sequence
-from dataclasses import dataclass
-from typing import Any
-
-from sentry.sentry_metrics.querying.data.execution import QueryResult
-from sentry.sentry_metrics.querying.data.transformation.base import QueryResultsTransformer
-from sentry.utils.outcomes import Outcome
-
-
-@dataclass(frozen=True)
-class MetricsOutcomesResult:
-    series: Sequence[Mapping[str, Any]]
-    totals: Sequence[Mapping[str, Any]]
-
-
-class MetricsOutcomesTransformer(QueryResultsTransformer[Mapping[str, Any]]):
-    def transform_result(self, result: Sequence[Mapping[str, Any]]) -> Sequence[Mapping[str, Any]]:
-        ret_val = []
-
-        for item in result:
-            ret_val_item = {}
-            for key in item:
-                if key == "outcome.id":
-                    outcome = int(item[key])
-                    ret_val_item["outcome"] = Outcome(outcome).api_name()
-                elif key in "aggregate_value":
-                    ret_val_item["quantity"] = item[key]
-                else:
-                    ret_val_item[key] = item[key]
-
-            ret_val.append(ret_val_item)
-
-        return ret_val
-
-    def transform(self, query_results: Sequence[QueryResult]) -> Mapping[str, Any]:
-        """
-        Transforms the query results into the format returned by outcomes queries.
-        Performs necessary mappings to match that format such as outcome.id -> outcome
-
-        """
-
-        if not query_results or len(query_results) == 0:
-            return {"series": [], "totals": []}
-
-        series = self.transform_result(query_results[0].series)
-        totals = self.transform_result(query_results[0].totals)
-
-        return {"series": series, "totals": totals}
diff --git a/src/sentry/sentry_metrics/querying/errors.py b/src/sentry/sentry_metrics/querying/errors.py
index 56ef0a2d916afd..365e2f628e7e84 100644
--- a/src/sentry/sentry_metrics/querying/errors.py
+++ b/src/sentry/sentry_metrics/querying/errors.py
@@ -8,7 +8,3 @@ class MetricsQueryExecutionError(Exception):
 
 class LatestReleaseNotFoundError(Exception):
     pass
-
-
-class CorrelationsQueryExecutionError(Exception):
-    pass
diff --git a/src/sentry/sentry_metrics/querying/metadata/metrics.py b/src/sentry/sentry_metrics/querying/metadata/metrics.py
index e09e828ca2572a..09ba8d840968ca 100644
--- a/src/sentry/sentry_metrics/querying/metadata/metrics.py
+++ b/src/sentry/sentry_metrics/querying/metadata/metrics.py
@@ -18,13 +18,7 @@
 from sentry.snuba.metrics import parse_mri
 from sentry.snuba.metrics.datasource import get_metrics_blocking_state_of_projects
 from sentry.snuba.metrics.naming_layer.mri import ParsedMRI, get_available_operations
-from sentry.snuba.metrics.utils import (
-    BlockedMetric,
-    MetricMeta,
-    MetricOperationType,
-    MetricType,
-    MetricUnit,
-)
+from sentry.snuba.metrics.utils import BlockedMetric, MetricMeta, MetricType, MetricUnit
 from sentry.snuba.metrics_layer.query import fetch_metric_mris
 
 
@@ -152,7 +146,7 @@ def _build_metric_meta(
         name=parsed_mri.name,
         unit=cast(MetricUnit, parsed_mri.unit),
         mri=parsed_mri.mri_string,
-        operations=cast(Sequence[MetricOperationType], available_operations),
+        operations=available_operations,
         projectIds=project_ids,
         blockingStatus=blocking_status,
     )
diff --git a/src/sentry/sentry_metrics/querying/metadata/utils.py b/src/sentry/sentry_metrics/querying/metadata/utils.py
index 88d00b58c5623e..2a3e5520a374e4 100644
--- a/src/sentry/sentry_metrics/querying/metadata/utils.py
+++ b/src/sentry/sentry_metrics/querying/metadata/utils.py
@@ -1,7 +1,10 @@
+from __future__ import annotations
+
 from sentry.snuba.metrics import get_mri
 from sentry.snuba.metrics.naming_layer.mri import is_mri
+from sentry.snuba.metrics.utils import MetricOperationType
 
-METRICS_API_HIDDEN_OPERATIONS = {
+METRICS_API_HIDDEN_OPERATIONS: dict[str, list[MetricOperationType]] = {
     "sentry:metrics_activate_percentiles": [
         "p50",
         "p75",
@@ -12,20 +15,21 @@
     "sentry:metrics_activate_last_for_gauges": ["last"],
 }
 
-NON_QUERYABLE_METRIC_OPERATIONS = ["histogram", "min_timestamp", "max_timestamp"]
+NON_QUERYABLE_METRIC_OPERATIONS: list[MetricOperationType] = [
+    "histogram",
+    "min_timestamp",
+    "max_timestamp",
+]
 
 
 class OperationsConfiguration:
     def __init__(self):
         self.hidden_operations = set()
 
-    def hide_operation(self, operation: str) -> None:
-        self.hidden_operations.add(operation)
-
-    def hide_operations(self, operations: list[str]) -> None:
+    def hide_operations(self, operations: list[MetricOperationType]) -> None:
         self.hidden_operations.update(operations)
 
-    def get_hidden_operations(self):
+    def get_hidden_operations(self) -> list[MetricOperationType]:
         return list(self.hidden_operations)
 
 
diff --git a/src/sentry/sentry_metrics/querying/utils.py b/src/sentry/sentry_metrics/querying/utils.py
index 527cf26721bef8..e5304d44513634 100644
--- a/src/sentry/sentry_metrics/querying/utils.py
+++ b/src/sentry/sentry_metrics/querying/utils.py
@@ -1,5 +1,3 @@
-import re
-
 from django.conf import settings
 from rediscluster import RedisCluster
 
@@ -12,11 +10,3 @@ def get_redis_client_for_metrics_meta() -> RedisCluster:
     """
     cluster_key = settings.SENTRY_METRIC_META_REDIS_CLUSTER
     return redis.redis_clusters.get(cluster_key)  # type: ignore[return-value]
-
-
-def remove_if_match(pattern, string: str) -> str:
-    """
-    Removes a pattern from a string.
-    """
-    # Use the re.sub function to replace the matched characters with an empty string
-    return re.sub(pattern, "", string)
diff --git a/src/sentry/snuba/entity_subscription.py b/src/sentry/snuba/entity_subscription.py
index 08c7319179d86f..96bb7b5fcb1b46 100644
--- a/src/sentry/snuba/entity_subscription.py
+++ b/src/sentry/snuba/entity_subscription.py
@@ -161,6 +161,7 @@ def build_rpc_request(
         environment: Environment | None,
         params: ParamsType | None = None,
         skip_field_validation_for_entity_subscription_deletion: bool = False,
+        referrer: str = Referrer.API_ALERTS_ALERT_RULE_CHART.value,
     ) -> TimeSeriesRequest:
         raise NotImplementedError
 
@@ -293,6 +294,7 @@ def build_rpc_request(
         environment: Environment | None,
         params: ParamsType | None = None,
         skip_field_validation_for_entity_subscription_deletion: bool = False,
+        referrer: str = Referrer.API_ALERTS_ALERT_RULE_CHART.value,
     ) -> TimeSeriesRequest:
         if params is None:
             params = {}
@@ -317,7 +319,7 @@ def build_rpc_request(
             query_string=query,
             y_axes=[self.aggregate],
             groupby=[],
-            referrer=Referrer.API_ALERTS_ALERT_RULE_CHART.value,
+            referrer=referrer,
             config=SearchResolverConfig(),
             granularity_secs=self.time_window,
         )
diff --git a/src/sentry/snuba/errors.py b/src/sentry/snuba/errors.py
index 8466a1f40c2c78..96563bd52e6883 100644
--- a/src/sentry/snuba/errors.py
+++ b/src/sentry/snuba/errors.py
@@ -4,6 +4,7 @@
 from typing import cast
 
 import sentry_sdk
+from snuba_sdk import Column, Condition
 
 from sentry.discover.arithmetic import categorize_columns
 from sentry.exceptions import InvalidSearchQuery
@@ -30,29 +31,31 @@
 
 
 def query(
-    selected_columns,
-    query,
-    snuba_params,
-    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,
-    on_demand_metrics_enabled=False,
+    selected_columns: list[str],
+    query: str,
+    snuba_params: SnubaParams,
+    equations: list[str] | None = None,
+    orderby: list[str] | None = None,
+    offset: int | None = None,
+    limit: int = 50,
+    referrer: str | None = None,
+    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=False,
+    dataset: Dataset = Dataset.Events,
+    fallback_to_transactions: bool = False,
     query_source: QuerySource | None = None,
 ) -> EventsResponse:
     if not selected_columns:
diff --git a/src/sentry/snuba/metrics/datasource.py b/src/sentry/snuba/metrics/datasource.py
index ea290073a10fb2..78729018fe3b8b 100644
--- a/src/sentry/snuba/metrics/datasource.py
+++ b/src/sentry/snuba/metrics/datasource.py
@@ -1,10 +1,3 @@
-from __future__ import annotations
-
-from functools import lru_cache
-
-import sentry_sdk
-from rest_framework.exceptions import NotFound
-
 """
 Module that gets both metadata and time series from Snuba.
 For metadata, it fetch metrics metadata (metric names, tag names, tag values, ...) from snuba.
@@ -13,12 +6,7 @@
 efficient, we only look at the past 24 hours.
 """
 
-__all__ = (
-    "get_all_tags",
-    "get_tag_values",
-    "get_series",
-    "get_single_metric_info",
-)
+from __future__ import annotations
 
 import logging
 from collections import defaultdict, deque
@@ -29,14 +17,14 @@
 from operator import itemgetter
 from typing import Any
 
-from snuba_sdk import And, Column, Condition, Function, Op, Or, Query, Request
+import sentry_sdk
+from rest_framework.exceptions import NotFound
+from snuba_sdk import Column, Condition, Function, Op, Query, Request
 from snuba_sdk.conditions import ConditionGroup
 
 from sentry.exceptions import InvalidParams
 from sentry.models.project import Project
 from sentry.sentry_metrics import indexer
-from sentry.sentry_metrics.indexer.strings import PREFIX as SHARED_STRINGS_PREFIX
-from sentry.sentry_metrics.indexer.strings import SHARED_STRINGS
 from sentry.sentry_metrics.use_case_id_registry import UseCaseID
 from sentry.sentry_metrics.utils import (
     MetricIndexNotFound,
@@ -49,7 +37,6 @@
 from sentry.snuba.metrics.fields import run_metrics_query
 from sentry.snuba.metrics.fields.base import (
     SnubaDataType,
-    build_metrics_query,
     get_derived_metrics,
     org_id_from_projects,
 )
@@ -80,7 +67,15 @@
     get_intervals,
     to_intervals,
 )
-from sentry.utils.snuba import bulk_snuba_queries, raw_snql_query
+from sentry.utils.snuba import raw_snql_query
+
+__all__ = (
+    "get_all_tags",
+    "get_tag_values",
+    "get_series",
+    "get_single_metric_info",
+)
+
 
 logger = logging.getLogger(__name__)
 
@@ -107,133 +102,6 @@ def _get_metrics_for_entity(
     )
 
 
-def _get_metrics_by_project_for_entity_query(
-    entity_key: EntityKey,
-    project_ids: Sequence[int],
-    org_id: int,
-    use_case_id: UseCaseID,
-    start: datetime | None = None,
-    end: datetime | None = None,
-) -> Request:
-    where = [Condition(Column("use_case_id"), Op.EQ, use_case_id.value)]
-    where.extend(_get_mri_constraints_for_use_case(entity_key, use_case_id))
-
-    return build_metrics_query(
-        entity_key=entity_key,
-        select=[Column("project_id"), Column("metric_id")],
-        groupby=[Column("project_id"), Column("metric_id")],
-        where=where,
-        project_ids=project_ids,
-        org_id=org_id,
-        use_case_id=use_case_id,
-        start=start,
-        end=end,
-    )
-
-
-@lru_cache(maxsize=len(EntityKey) * len(UseCaseID))
-def _get_mri_constraints_for_use_case(entity_key: EntityKey, use_case_id: UseCaseID):
-    # Sessions exist on a different infrastructure that works differently,
-    # thus this optimization does not apply.
-    if use_case_id == UseCaseID.SESSIONS:
-        return []
-
-    conditions = []
-
-    # Look for the min/max of the metric id range for the given use case id to
-    # constrain the search ClickHouse must do otherwise, it'll attempt a full scan.
-    #
-    # This assumes that metric ids are divided into non-overlapping ranges by the
-    # use case id, so we can focus on a particular range for better performance.
-    min_metric_id = SHARED_STRINGS_PREFIX << 1  # larger than possible metric ids
-    max_metric_id = 0
-
-    for mri, id in SHARED_STRINGS.items():
-        parsed_mri = parse_mri(mri)
-        if parsed_mri is not None and parsed_mri.namespace == use_case_id.value:
-            min_metric_id = min(id, min_metric_id)
-            max_metric_id = max(id, max_metric_id)
-
-    # It's possible that there's a metric id within the use case that is not
-    # hard coded so we should always check the range of custom metric ids.
-    condition = Condition(Column("metric_id"), Op.LT, SHARED_STRINGS_PREFIX)
-
-    # If we find a valid range, we extend the condition to check it as well.
-    if min_metric_id <= max_metric_id:
-        condition = Or(
-            [
-                condition,
-                # Expand the search to include the range of the hard coded
-                # metric ids if a valid range was found.
-                And(
-                    [
-                        Condition(Column("metric_id"), Op.GTE, min_metric_id),
-                        Condition(Column("metric_id"), Op.LTE, max_metric_id),
-                    ]
-                ),
-            ]
-        )
-
-    conditions.append(condition)
-
-    # This is added to every use case id because the MRI is the primary ORDER BY
-    # on the table, and without it, these granules will be scanned no matter what
-    # the use case id is.
-    excluded_mris = []
-
-    if use_case_id == UseCaseID.TRANSACTIONS:
-        # This on_demand MRI takes up the majority of dataset and makes the query slow
-        # because ClickHouse ends up scanning the whole table.
-        #
-        # These are used for on demand metrics extraction and end users should not
-        # need to know about these metrics.
-        #
-        # As an optimization, we explicitly exclude these MRIs in the query to allow
-        # Clickhouse to skip the granules containing strictly these MRIs.
-        if entity_key == EntityKey.GenericMetricsCounters:
-            excluded_mris.append("c:transactions/on_demand@none")
-        elif entity_key == EntityKey.GenericMetricsDistributions:
-            excluded_mris.append("d:transactions/on_demand@none")
-        elif entity_key == EntityKey.GenericMetricsSets:
-            excluded_mris.append("s:transactions/on_demand@none")
-        elif entity_key == EntityKey.GenericMetricsGauges:
-            excluded_mris.append("g:transactions/on_demand@none")
-
-    if excluded_mris:
-        conditions.append(
-            Condition(
-                Column("metric_id"),
-                Op.NOT_IN,
-                # these are shared strings, so just using org id 0 as a placeholder
-                [indexer.resolve(use_case_id, 0, mri) for mri in excluded_mris],
-            )
-        )
-
-    return conditions
-
-
-def _get_metrics_by_project_for_entity(
-    entity_key: EntityKey,
-    project_ids: Sequence[int],
-    org_id: int,
-    use_case_id: UseCaseID,
-    start: datetime | None = None,
-    end: datetime | None = None,
-) -> list[SnubaDataType]:
-    return run_metrics_query(
-        entity_key=entity_key,
-        select=[Column("project_id"), Column("metric_id")],
-        groupby=[Column("project_id"), Column("metric_id")],
-        where=[Condition(Column("use_case_id"), Op.EQ, use_case_id.value)],
-        referrer="snuba.metrics.get_metrics_names_for_entity",
-        project_ids=project_ids,
-        org_id=org_id,
-        use_case_id=use_case_id,
-        start=start,
-        end=end,
-    )
-
-
 def get_available_derived_metrics(
     projects: Sequence[Project],
     supported_metric_ids_in_entities: dict[MetricType, Sequence[int]],
@@ -300,68 +168,6 @@ def get_metrics_blocking_state_of_projects(
     return metrics_blocking_state_by_mri
 
 
-def get_stored_metrics_of_projects(
-    projects: Sequence[Project],
-    use_case_ids: Sequence[UseCaseID],
-    start: datetime | None = None,
-    end: datetime | None = None,
-) -> Mapping[str, Sequence[int]]:
-    org_id = projects[0].organization_id
-    project_ids = [project.id for project in projects]
-
-    # We compute a list of all the queries that we want to run in parallel across entities and use cases.
-    requests = []
-    use_case_id_to_index = defaultdict(list)
-    for use_case_id in use_case_ids:
-        entity_keys = get_entity_keys_of_use_case_id(use_case_id=use_case_id)
-        for entity_key in entity_keys or ():
-            requests.append(
-                _get_metrics_by_project_for_entity_query(
-                    entity_key=entity_key,
-                    project_ids=project_ids,
-                    org_id=org_id,
-                    use_case_id=use_case_id,
-                    start=start,
-                    end=end,
-                )
-            )
-            use_case_id_to_index[use_case_id].append(len(requests) - 1)
-
-    # We run the queries all in parallel.
-    results = bulk_snuba_queries(
-        requests=requests,
-        referrer="snuba.metrics.datasource.get_stored_metrics_of_projects",
-        use_cache=True,
-    )
-
-    # We reverse resolve all the metric ids by bulking together all the resolutions of the same use case id to maximize
-    # the parallelism.
-    resolved_metric_ids = defaultdict(dict)
-    for use_case_id, results_indexes in use_case_id_to_index.items():
-        metrics_ids = []
-        for result_index in results_indexes:
-            data = results[result_index]["data"]
-            for row in data or ():
-                metrics_ids.append(row["metric_id"])
-
-        # We have to partition the resolved metric ids per use case id, since the indexer values might clash across
-        # use cases.
-        resolved_metric_ids[use_case_id].update(
-            bulk_reverse_resolve(use_case_id, org_id, [metric_id for metric_id in metrics_ids])
-        )
-
-    # We iterate over each result and compute a map of `metric_id -> project_id`.
-    grouped_stored_metrics = defaultdict(list)
-    for use_case_id, results_indexes in use_case_id_to_index.items():
-        for result_index in results_indexes:
-            data = results[result_index]["data"]
-            for row in data or ():
-                resolved_metric_id = resolved_metric_ids[use_case_id][row["metric_id"]]
-                grouped_stored_metrics[resolved_metric_id].append(row["project_id"])
-
-    return grouped_stored_metrics
-
-
 def get_custom_measurements(
     project_ids: Sequence[int],
     organization_id: int,
diff --git a/src/sentry/snuba/metrics/extraction.py b/src/sentry/snuba/metrics/extraction.py
index 99b0fc625cf705..a838ca7cc8a6a9 100644
--- a/src/sentry/snuba/metrics/extraction.py
+++ b/src/sentry/snuba/metrics/extraction.py
@@ -313,8 +313,6 @@ def get_default_spec_version(cls: Any) -> SpecVersion:
     "event.type=transaction",
 ]
 
-Variables = dict[str, Any]
-
 query_builder = UnresolvedQuery(
     dataset=Dataset.Transactions, params={}
 )  # Workaround to get all updated discover functions instead of using the deprecated events fields.
@@ -1326,11 +1324,6 @@ def condition(self) -> RuleCondition | None:
         is extracted."""
         return self._process_query()
 
-    def is_project_dependent(self) -> bool:
-        """Returns whether the spec is unique to a project, which is required for some forms of caching"""
-        tags_specs_generator = _ONDEMAND_OP_TO_PROJECT_SPEC_GENERATOR.get(self.op)
-        return tags_specs_generator is not None
-
     def tags_conditions(self, project: Project) -> list[TagSpec]:
         """Returns a list of tag conditions that will specify how tags are injected into metrics by Relay, and a bool if those specs may be project specific."""
         tags_specs_generator = _ONDEMAND_OP_TO_SPEC_GENERATOR.get(self.op)
diff --git a/src/sentry/snuba/metrics/fields/snql.py b/src/sentry/snuba/metrics/fields/snql.py
index c73af996b7a1ac..85925024144292 100644
--- a/src/sentry/snuba/metrics/fields/snql.py
+++ b/src/sentry/snuba/metrics/fields/snql.py
@@ -225,14 +225,6 @@ def _snql_on_tx_satisfaction_factory(
     return _snql_on_tx_satisfaction_factory
 
 
-def _dist_count_aggregation_on_tx_satisfaction_factory(
-    org_id: int, satisfaction: str, metric_ids: Sequence[int], alias: str | None = None
-) -> Function:
-    return _aggregation_on_tx_satisfaction_func_factory("countIf")(
-        org_id, satisfaction, metric_ids, alias
-    )
-
-
 def _set_count_aggregation_on_tx_satisfaction_factory(
     org_id: int, satisfaction: str, metric_ids: Sequence[int], alias: str | None = None
 ) -> Function:
@@ -783,16 +775,12 @@ def team_key_transaction_snql(
 
 
 def _resolve_project_threshold_config(project_ids: Sequence[int], org_id: int) -> SelectType:
+    use_case_id = UseCaseID.TRANSACTIONS
     return resolve_project_threshold_config(
-        tag_value_resolver=lambda use_case_id, org_id, value: resolve_tag_value(
-            use_case_id, org_id, value
-        ),
-        column_name_resolver=lambda use_case_id, org_id, value: resolve_tag_key(
-            use_case_id, org_id, value
-        ),
+        tag_value_resolver=lambda org_id, value: resolve_tag_value(use_case_id, org_id, value),
+        column_name_resolver=lambda org_id, value: resolve_tag_key(use_case_id, org_id, value),
         project_ids=project_ids,
         org_id=org_id,
-        use_case_id=UseCaseID.TRANSACTIONS,
     )
 
 
diff --git a/src/sentry/snuba/metrics/naming_layer/mapping.py b/src/sentry/snuba/metrics/naming_layer/mapping.py
index ae3cb23455d651..5e3cbf86cd0155 100644
--- a/src/sentry/snuba/metrics/naming_layer/mapping.py
+++ b/src/sentry/snuba/metrics/naming_layer/mapping.py
@@ -92,12 +92,6 @@ def get_public_name_from_mri(internal_name: TransactionMRI | SessionMRI | str) -
         return internal_name
 
 
-def is_private_mri(internal_name: TransactionMRI | SessionMRI | str) -> bool:
-    public_name = get_public_name_from_mri(internal_name)
-    # If the public name is the same as internal name it means that the internal is "private".
-    return public_name == internal_name
-
-
 def _extract_name_from_custom_metric_mri(mri: str) -> str | None:
     parsed_mri = parse_mri(mri)
     if parsed_mri is None:
diff --git a/src/sentry/snuba/metrics/naming_layer/mri.py b/src/sentry/snuba/metrics/naming_layer/mri.py
index 49d7070d882361..284a1e34d3daa3 100644
--- a/src/sentry/snuba/metrics/naming_layer/mri.py
+++ b/src/sentry/snuba/metrics/naming_layer/mri.py
@@ -33,7 +33,6 @@
 )
 
 import re
-from collections.abc import Sequence
 from dataclasses import dataclass
 from enum import Enum
 from typing import cast
@@ -42,12 +41,12 @@
 
 from sentry.exceptions import InvalidParams
 from sentry.sentry_metrics.use_case_id_registry import UseCaseID
-from sentry.snuba.dataset import EntityKey
 from sentry.snuba.metrics.units import format_value_using_unit_and_op
 from sentry.snuba.metrics.utils import (
     AVAILABLE_GENERIC_OPERATIONS,
     AVAILABLE_OPERATIONS,
     OP_REGEX,
+    MetricEntity,
     MetricOperationType,
     MetricUnit,
 )
@@ -335,28 +334,27 @@ def is_custom_measurement(parsed_mri: ParsedMRI) -> bool:
     )
 
 
-def get_entity_key_from_entity_type(entity_type: str, generic_metrics: bool) -> EntityKey:
-    entity_name_suffixes = {
-        "c": "counters",
-        "s": "sets",
-        "d": "distributions",
-        "g": "gauges",
-    }
-
-    if generic_metrics:
-        return EntityKey(f"generic_metrics_{entity_name_suffixes[entity_type]}")
-    else:
-        return EntityKey(f"metrics_{entity_name_suffixes[entity_type]}")
+_ENTITY_KEY_MAPPING_GENERIC: dict[str, MetricEntity] = {
+    "c": "generic_metrics_counters",
+    "s": "generic_metrics_sets",
+    "d": "generic_metrics_distributions",
+    "g": "generic_metrics_gauges",
+}
+_ENTITY_KEY_MAPPING_NON_GENERIC: dict[str, MetricEntity] = {
+    "c": "metrics_counters",
+    "s": "metrics_sets",
+    "d": "metrics_distributions",
+}
 
 
-def get_available_operations(parsed_mri: ParsedMRI) -> Sequence[str]:
+def get_available_operations(parsed_mri: ParsedMRI) -> list[MetricOperationType]:
     if parsed_mri.entity == "e":
         return []
     elif parsed_mri.namespace == "sessions":
-        entity_key = get_entity_key_from_entity_type(parsed_mri.entity, False).value
+        entity_key = _ENTITY_KEY_MAPPING_NON_GENERIC[parsed_mri.entity]
         return AVAILABLE_OPERATIONS[entity_key]
     else:
-        entity_key = get_entity_key_from_entity_type(parsed_mri.entity, True).value
+        entity_key = _ENTITY_KEY_MAPPING_GENERIC[parsed_mri.entity]
         return AVAILABLE_GENERIC_OPERATIONS[entity_key]
 
 
diff --git a/src/sentry/snuba/metrics/query_builder.py b/src/sentry/snuba/metrics/query_builder.py
index eac1874aa33497..b36ab5e349e5e4 100644
--- a/src/sentry/snuba/metrics/query_builder.py
+++ b/src/sentry/snuba/metrics/query_builder.py
@@ -45,7 +45,6 @@
     resolve_tag_key,
     resolve_tag_value,
     resolve_weak,
-    reverse_resolve,
     reverse_resolve_tag_value,
 )
 from sentry.snuba.dataset import Dataset
@@ -615,11 +614,6 @@ def get_date_range(params: Mapping) -> tuple[datetime, datetime, int]:
     return start, end, interval
 
 
-def parse_tag(use_case_id: UseCaseID, org_id: int, tag_string: str) -> str:
-    tag_key = int(tag_string.replace("tags_raw[", "").replace("tags[", "").replace("]", ""))
-    return reverse_resolve(use_case_id, org_id, tag_key)
-
-
 def get_metric_object_from_metric_field(
     metric_field: MetricField,
 ) -> MetricExpressionBase:
diff --git a/src/sentry/snuba/metrics/utils.py b/src/sentry/snuba/metrics/utils.py
index cef92af6e666c6..df12ad96eaf7cb 100644
--- a/src/sentry/snuba/metrics/utils.py
+++ b/src/sentry/snuba/metrics/utils.py
@@ -4,7 +4,7 @@
 from abc import ABC
 from collections.abc import Collection, Generator, Mapping, Sequence
 from datetime import datetime, timedelta, timezone
-from typing import Literal, TypedDict, overload
+from typing import Literal, NotRequired, TypedDict, overload
 
 from sentry.sentry_metrics.use_case_id_registry import UseCaseID
 from sentry.snuba.dataset import EntityKey
@@ -141,7 +141,7 @@
     "generic_metrics_gauges",
 ]
 
-OP_TO_SNUBA_FUNCTION = {
+OP_TO_SNUBA_FUNCTION: dict[MetricEntity, dict[MetricOperationType, str]] = {
     "metrics_counters": {
         "sum": "sumIf",
         "min_timestamp": "minIf",
@@ -169,7 +169,7 @@
         "max_timestamp": "maxIf",
     },
 }
-GENERIC_OP_TO_SNUBA_FUNCTION = {
+GENERIC_OP_TO_SNUBA_FUNCTION: dict[MetricEntity, dict[MetricOperationType, str]] = {
     "generic_metrics_counters": OP_TO_SNUBA_FUNCTION["metrics_counters"],
     "generic_metrics_distributions": OP_TO_SNUBA_FUNCTION["metrics_distributions"],
     "generic_metrics_sets": OP_TO_SNUBA_FUNCTION["metrics_sets"],
@@ -275,9 +275,6 @@ def generate_operation_regex():
 OPERATIONS_TO_ENTITY = {
     op: entity for entity, operations in AVAILABLE_OPERATIONS.items() for op in operations
 }
-GENERIC_OPERATIONS_TO_ENTITY = {
-    op: entity for entity, operations in AVAILABLE_GENERIC_OPERATIONS.items() for op in operations
-}
 
 METRIC_TYPE_TO_ENTITY: Mapping[MetricType, EntityKey] = {
     "counter": EntityKey.MetricsCounters,
@@ -342,6 +339,7 @@ class MetricMeta(TypedDict):
     type: MetricType
     operations: Collection[MetricOperationType]
     unit: MetricUnit | None
+    metric_id: NotRequired[int]
     mri: str
     projectIds: Sequence[int]
     blockingStatus: Sequence[BlockedMetric] | None
diff --git a/src/sentry/snuba/metrics_enhanced_performance.py b/src/sentry/snuba/metrics_enhanced_performance.py
index 2273781467e894..0fcdd654a2f19c 100644
--- a/src/sentry/snuba/metrics_enhanced_performance.py
+++ b/src/sentry/snuba/metrics_enhanced_performance.py
@@ -19,6 +19,7 @@
 from sentry.snuba.metrics_performance import timeseries_query as metrics_timeseries_query
 from sentry.snuba.metrics_performance import top_events_timeseries as metrics_top_events_timeseries
 from sentry.snuba.query_sources import QuerySource
+from sentry.snuba.types import DatasetQuery
 from sentry.utils.snuba import SnubaTSResult
 
 
@@ -48,7 +49,7 @@ def query(
     on_demand_metrics_type: MetricSpecType | None = None,
     fallback_to_transactions: bool = False,
     query_source: QuerySource | None = None,
-):
+) -> EventsResponse:
     metrics_compatible = not equations
     dataset_reason = discover.DEFAULT_DATASET_REASON
 
@@ -57,22 +58,22 @@ def query(
             result = metrics_query(
                 selected_columns,
                 query,
-                snuba_params,
-                equations,
-                orderby,
-                offset,
-                limit,
-                referrer,
-                auto_fields,
-                auto_aggregations,
-                use_aggregate_conditions,
-                allow_metric_aggregates,
-                conditions,
-                functions_acl,
-                transform_alias_to_input_format,
-                has_metrics,
-                use_metrics_layer,
-                on_demand_metrics_enabled,
+                snuba_params=snuba_params,
+                equations=equations,
+                orderby=orderby,
+                offset=offset,
+                limit=limit,
+                referrer=referrer,
+                auto_fields=auto_fields,
+                auto_aggregations=auto_aggregations,
+                use_aggregate_conditions=use_aggregate_conditions,
+                allow_metric_aggregates=allow_metric_aggregates,
+                conditions=conditions,
+                functions_acl=functions_acl,
+                transform_alias_to_input_format=transform_alias_to_input_format,
+                has_metrics=has_metrics,
+                use_metrics_layer=use_metrics_layer,
+                on_demand_metrics_enabled=on_demand_metrics_enabled,
                 on_demand_metrics_type=on_demand_metrics_type,
                 query_source=query_source,
             )
@@ -90,13 +91,13 @@ def query(
 
     # Either metrics failed, or this isn't a query we can enhance with metrics
     if not metrics_compatible:
-        dataset: types.ModuleType = discover
+        dataset_query: DatasetQuery = discover.query
         if fallback_to_transactions:
-            dataset = transactions
+            dataset_query = transactions.query
             sentry_sdk.set_tag("performance.dataset", "transactions")
         else:
             sentry_sdk.set_tag("performance.dataset", "discover")
-        results = dataset.query(
+        results = dataset_query(
             selected_columns,
             query,
             snuba_params=snuba_params,
@@ -120,7 +121,10 @@ def query(
 
         return results
 
-    return {}
+    return {
+        "data": [],
+        "meta": {"fields": {}},
+    }
 
 
 def timeseries_query(
diff --git a/src/sentry/snuba/metrics_performance.py b/src/sentry/snuba/metrics_performance.py
index 68e00c52bfccf8..2acd67232bc7bd 100644
--- a/src/sentry/snuba/metrics_performance.py
+++ b/src/sentry/snuba/metrics_performance.py
@@ -6,7 +6,7 @@
 from typing import Any, Literal, overload
 
 import sentry_sdk
-from snuba_sdk import Column
+from snuba_sdk import Column, Condition
 
 from sentry.discover.arithmetic import categorize_columns
 from sentry.exceptions import IncompatibleMetricsQuery
@@ -30,29 +30,32 @@
 
 
 def query(
-    selected_columns,
-    query,
-    snuba_params=None,
-    equations=None,
-    orderby=None,
-    offset=None,
-    limit=50,
-    referrer=None,
-    auto_fields=False,
-    auto_aggregations=False,
-    use_aggregate_conditions=False,
-    allow_metric_aggregates=True,
-    conditions=None,
-    functions_acl=None,
-    transform_alias_to_input_format=False,
+    selected_columns: list[str],
+    query: str,
+    snuba_params: SnubaParams,
+    equations: list[str] | None = None,
+    orderby: list[str] | None = None,
+    offset: int | None = None,
+    limit: int = 50,
+    referrer: str | None = None,
+    auto_fields: bool = False,
+    auto_aggregations: bool = False,
+    include_equation_fields: bool = False,
+    allow_metric_aggregates: bool = True,
+    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 = True,
     use_metrics_layer: bool = False,
+    skip_tag_resolution: bool = False,
     on_demand_metrics_enabled: bool = False,
     on_demand_metrics_type: MetricSpecType | None = None,
     granularity: int | None = None,
     fallback_to_transactions=False,
     query_source: QuerySource | None = None,
-):
+) -> EventsResponse:
     with sentry_sdk.start_span(op="mep", name="MetricQueryBuilder"):
         metrics_query = MetricsQueryBuilder(
             dataset=Dataset.PerformanceMetrics,
@@ -78,6 +81,8 @@ def query(
                 on_demand_metrics_type=on_demand_metrics_type,
             ),
         )
+        if referrer is None:
+            referrer = ""
         metrics_referrer = referrer + ".metrics-enhanced"
         results = metrics_query.run_query(referrer=metrics_referrer, query_source=query_source)
     with sentry_sdk.start_span(op="mep", name="query.transform_results"):
diff --git a/src/sentry/snuba/models.py b/src/sentry/snuba/models.py
index 75c84f93c39375..6fb83b3478d771 100644
--- a/src/sentry/snuba/models.py
+++ b/src/sentry/snuba/models.py
@@ -12,6 +12,7 @@
 from sentry.backup.scopes import ImportScope, RelocationScope
 from sentry.db.models import FlexibleForeignKey, Model, region_silo_model
 from sentry.db.models.manager.base import BaseManager
+from sentry.incidents.utils.types import DATA_SOURCE_SNUBA_QUERY_SUBSCRIPTION
 from sentry.models.team import Team
 from sentry.users.models.user import User
 from sentry.workflow_engine.registry import data_source_type_registry
@@ -153,7 +154,7 @@ def write_relocation_import(
         return (subscription.pk, ImportKind.Inserted)
 
 
-@data_source_type_registry.register("snuba_query_subscription")
+@data_source_type_registry.register(DATA_SOURCE_SNUBA_QUERY_SUBSCRIPTION)
 class QuerySubscriptionDataSourceHandler(DataSourceTypeHandler[QuerySubscription]):
     @staticmethod
     def bulk_get_query_object(
diff --git a/src/sentry/snuba/referrer.py b/src/sentry/snuba/referrer.py
index 667d39232b72dc..3a740223d27aae 100644
--- a/src/sentry/snuba/referrer.py
+++ b/src/sentry/snuba/referrer.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import logging
-from enum import Enum, unique
+from enum import StrEnum, unique
 
 from sentry.utils import metrics
 
@@ -9,7 +9,7 @@
 
 
 @unique
-class Referrer(Enum):
+class Referrer(StrEnum):
     ALERTRULESERIALIZER_TEST_QUERY_PRIMARY = "alertruleserializer.test_query.primary"
     ALERTRULESERIALIZER_TEST_QUERY = "alertruleserializer.test_query"
     ANOMALY_DETECTION_HISTORICAL_DATA_QUERY = "anomaly_detection_historical_data_query"
@@ -107,6 +107,7 @@ class Referrer(Enum):
     )
     API_GROUP_HASHES_LEVELS_GET_LEVELS_OVERVIEW = "api.group_hashes_levels.get_levels_overview"
     API_GROUP_HASHES = "api.group-hashes"
+    API_INSIGHTS_USER_GEO_SUBREGION_SELECTOR = "api.insights.user-geo-subregion-selector"
     API_ISSUES_ISSUE_EVENTS = "api.issues.issue_events"
     API_ISSUES_RELATED_ISSUES = "api.issues.related_issues"
     API_METRICS_TOTALS = "api.metrics.totals"
@@ -529,32 +530,32 @@ class Referrer(Enum):
 
     # Performance Cache Module
     API_PERFORMANCE_CACHE_LANDING_CACHE_THROUGHPUT_CHART = (
-        "api.performance.cache.landing-cache-throughput-chart",
+        "api.performance.cache.landing-cache-throughput-chart"
     )
     API_PERFORMANCE_CACHE_LANDING_CACHE_TRANSACTION_LIST = (
-        "api.performance.cache.landing-cache-transaction-list",
+        "api.performance.cache.landing-cache-transaction-list"
     )
     API_PERFORMANCE_CACHE_LANDING_CACHE_TRANSACTION_DURATION = (
-        "api.performance.cache.landing-cache-transaction-duration",
+        "api.performance.cache.landing-cache-transaction-duration"
     )
 
     API_PERFORMANCE_CACHE_SAMPLES_CACHE_METRICS_RIBBON = (
-        "api.performance.cache.samples-cache-metrics-ribbon",
+        "api.performance.cache.samples-cache-metrics-ribbon"
     )
     API_PERFORMANCE_CACHE_SAMPLES_CACHE_TRANSACTION_DURATION_CHART = (
-        "api.performance.cache.samples-cache-transaction-duration-chart",
+        "api.performance.cache.samples-cache-transaction-duration-chart"
     )
     API_PERFORMANCE_CACHE_SAMPLES_CACHE_TRANSACTION_DURATION = (
-        "api.performance.cache.samples-cache-transaction-duration",
+        "api.performance.cache.samples-cache-transaction-duration"
     )
     API_PERFORMANCE_CACHE_SAMPLES_CACHE_SPAN_SAMPLES = (
-        "api.performance.cache.samples-cache-span-samples",
+        "api.performance.cache.samples-cache-span-samples"
     )
     API_PERFORMANCE_CACHE_SAMPLES_CACHE_SPAN_SAMPLES_TRANSACTION_DURATION = (
-        "api.performance.cache.samples-cache-span-samples-transaction-duration",
+        "api.performance.cache.samples-cache-span-samples-transaction-duration"
     )
     API_PERFORMANCE_CACHE_SAMPLES_CACHE_HIT_MISS_CHART = (
-        "api.performance.cache.samples-cache-hit-miss-chart",
+        "api.performance.cache.samples-cache-hit-miss-chart"
     )
 
     # Performance Queues Module
@@ -716,6 +717,8 @@ class Referrer(Enum):
     INCIDENTS_GET_INCIDENT_AGGREGATES_PRIMARY = "incidents.get_incident_aggregates.primary"
     INCIDENTS_GET_INCIDENT_AGGREGATES = "incidents.get_incident_aggregates"
     IS_ESCALATING_GROUP = "sentry.issues.escalating.is_escalating"
+    ISSUE_DETAILS_STREAMLINE_GRAPH = "issue_details.streamline_graph"
+    ISSUE_DETAILS_STREAMLINE_LIST = "issue_details.streamline_list"
     METRIC_EXTRACTION_CARDINALITY_CHECK = "metric_extraction.cardinality_check"
     OUTCOMES_TIMESERIES = "outcomes.timeseries"
     OUTCOMES_TOTALS = "outcomes.totals"
diff --git a/src/sentry/snuba/sessions_v2.py b/src/sentry/snuba/sessions_v2.py
index 184b3a479e96de..3d83dfa2a615f8 100644
--- a/src/sentry/snuba/sessions_v2.py
+++ b/src/sentry/snuba/sessions_v2.py
@@ -4,7 +4,7 @@
 import logging
 import math
 from datetime import datetime, timedelta, timezone
-from typing import Any
+from typing import Any, NotRequired, Protocol, TypedDict
 
 from snuba_sdk import BooleanCondition, Column, Condition, Function, Limit, Op
 
@@ -101,6 +101,11 @@
 """
 
 
+class _Field(Protocol):
+    def extract_from_row(self, row, group) -> float | None: ...
+    def get_snuba_columns(self, raw_groupby) -> list[str]: ...
+
+
 class SessionsField:
     def get_snuba_columns(self, raw_groupby):
         if "session.status" in raw_groupby:
@@ -188,7 +193,7 @@ def extract_from_row(self, row, group):
         return None
 
 
-COLUMN_MAP = {
+COLUMN_MAP: dict[str, _Field] = {
     "sum(session)": SessionsField(),
     "count_unique(user)": UsersField(),
     "avg(session.duration)": DurationAverageField(),
@@ -201,6 +206,12 @@ def extract_from_row(self, row, group):
 }
 
 
+class _GroupBy(Protocol):
+    def get_snuba_columns(self) -> list[str]: ...
+    def get_snuba_groupby(self) -> list[str]: ...
+    def get_keys_for_row(self, row) -> list[tuple[str, str]]: ...
+
+
 class SimpleGroupBy:
     def __init__(self, row_name: str, name: str | None = None):
         self.row_name = row_name
@@ -229,7 +240,7 @@ def get_keys_for_row(self, row):
 
 # NOTE: in the future we might add new `user_agent` and `os` fields
 
-GROUPBY_MAP = {
+GROUPBY_MAP: dict[str, _GroupBy] = {
     "project": SimpleGroupBy("project_id", "project"),
     "environment": SimpleGroupBy("environment"),
     "release": SimpleGroupBy("release"),
@@ -423,8 +434,8 @@ def get_constrained_date_range(
     max_points=MAX_POINTS,
     restrict_date_range=True,
 ) -> tuple[datetime, datetime, int]:
-    interval = parse_stats_period(params.get("interval", "1h"))
-    interval = int(3600 if interval is None else interval.total_seconds())
+    interval_td = parse_stats_period(params.get("interval", "1h"))
+    interval = int(3600 if interval_td is None else interval_td.total_seconds())
 
     smallest_interval, interval_str = allowed_resolution.value
     if interval % smallest_interval != 0 or interval < smallest_interval:
@@ -569,7 +580,8 @@ def make_timeseries(rows, group):
             row[ts_col] = row[ts_col][:19] + "Z"
 
         rows.sort(key=lambda row: row[ts_col])
-        fields = [(name, field, list()) for name, field in query.fields.items()]
+        fields: list[tuple[str, _Field, list[float | None]]]
+        fields = [(name, field, []) for name, field in query.fields.items()]
         group_index = 0
 
         while group_index < len(rows):
@@ -618,9 +630,16 @@ def make_totals(totals, group):
     }
 
 
+class _CategoryStats(TypedDict):
+    category: str
+    outcomes: dict[str, int]
+    totals: dict[str, int]
+    reason: NotRequired[str]
+
+
 def massage_sessions_result_summary(
     query, result_totals, outcome_query=None
-) -> dict[str, list[Any]]:
+) -> tuple[dict[int, dict[str, dict[str, _CategoryStats]]], dict[str, list[Any]]]:
     """
     Post-processes the query result.
 
@@ -667,8 +686,8 @@ def make_totals(totals, group):
         }
 
     def get_category_stats(
-        reason, totals, outcome, category, category_stats: dict[str, int] | None = None
-    ):
+        reason, totals, outcome, category, category_stats: _CategoryStats | None = None
+    ) -> _CategoryStats:
         if not category_stats:
             category_stats = {
                 "category": category,
@@ -697,7 +716,7 @@ def get_category_stats(
         return category_stats
 
     keys = set(total_groups.keys())
-    projects = {}
+    projects: dict[int, dict[str, dict[str, _CategoryStats]]] = {}
 
     for key in keys:
         by = dict(key)
@@ -708,8 +727,7 @@ def get_category_stats(
 
         totals = make_totals(total_groups.get(key, [None]), by)
 
-        if project_id not in projects:
-            projects[project_id] = {"categories": {}}
+        projects.setdefault(project_id, {"categories": {}})
 
         if category in projects[project_id]["categories"]:
             # update stats dict for category
@@ -763,18 +781,16 @@ def get_timestamps(query):
 
 
 def _split_rows_groupby(rows, groupby):
-    groups = {}
+    groups: dict[frozenset[str], list[object]] = {}
     if rows is None:
         return groups
     for row in rows:
         key_parts = (group.get_keys_for_row(row) for group in groupby)
         keys = itertools.product(*key_parts)
 
-        for key in keys:
-            key = frozenset(key)
+        for key_tup in keys:
+            key = frozenset(key_tup)
 
-            if key not in groups:
-                groups[key] = []
-            groups[key].append(row)
+            groups.setdefault(key, []).append(row)
 
     return groups
diff --git a/src/sentry/snuba/spans_eap.py b/src/sentry/snuba/spans_eap.py
index 5356f2fd29f64e..35ebede9dc6d7e 100644
--- a/src/sentry/snuba/spans_eap.py
+++ b/src/sentry/snuba/spans_eap.py
@@ -1,6 +1,7 @@
 import logging
 from collections.abc import Mapping, Sequence
 from datetime import timedelta
+from typing import Any, TypedDict
 
 import sentry_sdk
 from snuba_sdk import Column, Condition
@@ -49,8 +50,7 @@ def query(
     dataset: Dataset = Dataset.Discover,
     fallback_to_transactions: bool = False,
     query_source: QuerySource | None = None,
-    enable_rpc: bool | None = False,
-):
+) -> EventsResponse:
     builder = SpansEAPQueryBuilder(
         Dataset.EventsAnalyticsPlatform,
         {},
@@ -244,14 +244,16 @@ def top_events_timeseries(
             snuba_params.end_date,
             rollup,
         )
+
     with sentry_sdk.start_span(op="spans_indexed", name="top_events.transform_results") as span:
         span.set_data("result_count", len(result.get("data", [])))
         result = top_events_builder.process_results(result)
+        other_result = top_events_builder.process_results(other_result)
 
         issues: Mapping[int, str | None] = {}
         translated_groupby = top_events_builder.translated_groupby
 
-        results = (
+        results: dict[str, TimeseriesResult] = (
             {discover.OTHER_KEY: {"order": limit, "data": other_result["data"]}}
             if len(other_result.get("data", []))
             else {}
@@ -292,3 +294,8 @@ def top_events_timeseries(
             )
 
     return top_events_results
+
+
+class TimeseriesResult(TypedDict):
+    order: int
+    data: list[dict[str, Any]]
diff --git a/src/sentry/snuba/spans_indexed.py b/src/sentry/snuba/spans_indexed.py
index 602e0e5c256b83..2ef001caecbd67 100644
--- a/src/sentry/snuba/spans_indexed.py
+++ b/src/sentry/snuba/spans_indexed.py
@@ -101,7 +101,7 @@ def timeseries_query(
     equations, columns = categorize_columns(selected_columns)
 
     with sentry_sdk.start_span(op="spans_indexed", name="TimeseriesSpanIndexedQueryBuilder"):
-        query = TimeseriesSpanIndexedQueryBuilder(
+        query_obj = TimeseriesSpanIndexedQueryBuilder(
             Dataset.SpansIndexed,
             {},
             rollup,
@@ -113,16 +113,16 @@ def timeseries_query(
                 transform_alias_to_input_format=transform_alias_to_input_format,
             ),
         )
-        result = query.run_query(referrer, query_source=query_source)
+        result = query_obj.run_query(referrer, query_source=query_source)
     with sentry_sdk.start_span(op="spans_indexed", name="query.transform_results"):
-        result = query.process_results(result)
+        result = query_obj.process_results(result)
         result["data"] = (
             discover.zerofill(
                 result["data"],
                 snuba_params.start_date,
                 snuba_params.end_date,
                 rollup,
-                "time",
+                ["time"],
             )
             if zerofill_results
             else result["data"]
@@ -229,7 +229,7 @@ def top_events_timeseries(
             {
                 "data": (
                     discover.zerofill(
-                        [], snuba_params.start_date, snuba_params.end_date, rollup, "time"
+                        [], snuba_params.start_date, snuba_params.end_date, rollup, ["time"]
                     )
                     if zerofill_results
                     else []
@@ -243,7 +243,7 @@ def top_events_timeseries(
         span.set_data("result_count", len(result.get("data", [])))
         result = top_events_builder.process_results(result)
 
-        issues = {}
+        issues: dict[int, str | None] = {}
         translated_groupby = top_events_builder.translated_groupby
 
         results = (
@@ -264,8 +264,9 @@ def top_events_timeseries(
                     "spans_indexed.top-events.timeseries.key-mismatch",
                     extra={"result_key": result_key, "top_event_keys": list(results.keys())},
                 )
-        for key, item in results.items():
-            results[key] = SnubaTSResult(
+
+        return {
+            key: SnubaTSResult(
                 {
                     "data": (
                         discover.zerofill(
@@ -273,7 +274,7 @@ def top_events_timeseries(
                             snuba_params.start_date,
                             snuba_params.end_date,
                             rollup,
-                            "time",
+                            ["time"],
                         )
                         if zerofill_results
                         else item["data"]
@@ -284,5 +285,5 @@ def top_events_timeseries(
                 snuba_params.end_date,
                 rollup,
             )
-
-    return results
+            for key, item in results.items()
+        }
diff --git a/src/sentry/snuba/spans_rpc.py b/src/sentry/snuba/spans_rpc.py
index 930aee26eda83c..9b56b742b8c78e 100644
--- a/src/sentry/snuba/spans_rpc.py
+++ b/src/sentry/snuba/spans_rpc.py
@@ -1,7 +1,9 @@
 import logging
+from collections import defaultdict
 from datetime import timedelta
 from typing import Any
 
+import sentry_sdk
 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
@@ -29,6 +31,7 @@ def categorize_column(column: ResolvedColumn | ResolvedFunction) -> Column:
         return Column(key=column.proto_definition, label=column.public_alias)
 
 
+@sentry_sdk.trace
 def run_table_query(
     params: SnubaParams,
     query_string: str,
@@ -45,8 +48,9 @@ def run_table_query(
         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)
+    query, query_contexts = resolver.resolve_query(query_string)
+    columns, column_contexts = resolver.resolve_columns(selected_columns)
+    contexts = resolver.clean_contexts(query_contexts + column_contexts)
     # 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 = {
@@ -153,7 +157,7 @@ def get_timeseries_query(
 ) -> TimeSeriesRequest:
     resolver = SearchResolver(params=params, config=config)
     meta = resolver.resolve_meta(referrer=referrer)
-    query = resolver.resolve_query(query_string)
+    query, query_contexts = resolver.resolve_query(query_string)
     (aggregations, _) = resolver.resolve_aggregates(y_axes)
     (groupbys, _) = resolver.resolve_columns(groupby)
     if extra_conditions is not None:
@@ -176,6 +180,8 @@ def get_timeseries_query(
             if isinstance(groupby.proto_definition, AttributeKey)
         ],
         granularity_secs=granularity_secs,
+        # TODO: need to add this once the RPC supports it
+        # virtual_column_contexts=[context for context in resolver.clean_contexts(query_contexts) if context is not None],
     )
 
 
@@ -195,6 +201,7 @@ def validate_granularity(
         )
 
 
+@sentry_sdk.trace
 def run_timeseries_query(
     params: SnubaParams,
     query_string: str,
@@ -217,7 +224,7 @@ def run_timeseries_query(
     result: SnubaData = []
     confidences: SnubaData = []
     for timeseries in rpc_response.result_timeseries:
-        processed, confidence = _process_timeseries(timeseries, params, granularity_secs)
+        processed, confidence = _process_all_timeseries([timeseries], params, granularity_secs)
         if len(result) == 0:
             result = processed
             confidences = confidence
@@ -253,7 +260,7 @@ def run_timeseries_query(
 
         if comp_rpc_response.result_timeseries:
             timeseries = comp_rpc_response.result_timeseries[0]
-            processed, _ = _process_timeseries(timeseries, params, granularity_secs)
+            processed, _ = _process_all_timeseries([timeseries], params, granularity_secs)
             label = get_function_alias(timeseries.label)
             for existing, new in zip(result, processed):
                 existing["comparisonCount"] = new[label]
@@ -266,6 +273,7 @@ def run_timeseries_query(
     )
 
 
+@sentry_sdk.trace
 def build_top_event_conditions(
     resolver: SearchResolver, top_events: EAPResponse, groupby_columns: list[str]
 ) -> Any:
@@ -281,7 +289,7 @@ def build_top_event_conditions(
                 ]
             else:
                 value = event[key]
-            resolved_term = resolver.resolve_term(
+            resolved_term, context = resolver.resolve_term(
                 SearchFilter(
                     key=SearchKey(name=key),
                     operator="=",
@@ -290,7 +298,7 @@ def build_top_event_conditions(
             )
             if resolved_term is not None:
                 row_conditions.append(resolved_term)
-            other_term = resolver.resolve_term(
+            other_term, context = resolver.resolve_term(
                 SearchFilter(
                     key=SearchKey(name=key),
                     operator="!=",
@@ -373,7 +381,7 @@ def run_top_events_timeseries_query(
     other_response = snuba_rpc.timeseries_rpc(other_request)
 
     """Process the results"""
-    map_result_key_to_timeseries = {}
+    map_result_key_to_timeseries = defaultdict(list)
     for timeseries in rpc_response.result_timeseries:
         groupby_attributes = timeseries.group_by_attributes
         remapped_groupby = {}
@@ -388,12 +396,12 @@ def run_top_events_timeseries_query(
                 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
+        map_result_key_to_timeseries[result_key].append(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(
+        result_data, result_confidence = _process_all_timeseries(
             map_result_key_to_timeseries[result_key],
             params,
             granularity_secs,
@@ -409,8 +417,8 @@ def run_top_events_timeseries_query(
             granularity_secs,
         )
     if other_response.result_timeseries:
-        result_data, result_confidence = _process_timeseries(
-            other_response.result_timeseries[0],
+        result_data, result_confidence = _process_all_timeseries(
+            [timeseries for timeseries in other_response.result_timeseries],
             params,
             granularity_secs,
         )
@@ -427,19 +435,29 @@ def run_top_events_timeseries_query(
     return final_result
 
 
-def _process_timeseries(
-    timeseries: TimeSeries, params: SnubaParams, granularity_secs: int, order: int | None = None
+def _process_all_timeseries(
+    all_timeseries: list[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)
+
+    for timeseries in all_timeseries:
+        # Timeseries serialization expects the function alias (eg. `count` not `count()`)
+        label = get_function_alias(timeseries.label)
+        if result:
+            for index, bucket in enumerate(timeseries.buckets):
+                assert result[index]["time"] == bucket.seconds
+                assert confidence[index]["time"] == bucket.seconds
+        else:
+            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)
 
     return result, confidence
diff --git a/src/sentry/snuba/types.py b/src/sentry/snuba/types.py
new file mode 100644
index 00000000000000..ae6c599819ad0c
--- /dev/null
+++ b/src/sentry/snuba/types.py
@@ -0,0 +1,40 @@
+from typing import Protocol
+
+from snuba_sdk import Column, Condition
+
+from sentry.search.events.types import EventsResponse, SnubaParams
+from sentry.snuba.dataset import Dataset
+from sentry.snuba.metrics.extraction import MetricSpecType
+from sentry.snuba.query_sources import QuerySource
+
+
+class DatasetQuery(Protocol):
+    def __call__(
+        self,
+        selected_columns: list[str],
+        query: str,
+        snuba_params: SnubaParams,
+        equations: list[str] | None = None,
+        orderby: list[str] | None = None,
+        offset: int | None = None,
+        limit: int = 50,
+        referrer: str | None = None,
+        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,
+        dataset: Dataset = Dataset.Discover,
+        fallback_to_transactions: bool = False,
+        query_source: QuerySource | None = None,
+    ) -> EventsResponse: ...
diff --git a/src/sentry/statistical_detectors/detector.py b/src/sentry/statistical_detectors/detector.py
index 0b9540ddc5a293..c633d46c7beca0 100644
--- a/src/sentry/statistical_detectors/detector.py
+++ b/src/sentry/statistical_detectors/detector.py
@@ -62,6 +62,10 @@ class RegressionDetector(ABC):
     resolution_rel_threshold: float
     escalation_rel_threshold: float
 
+    @classmethod
+    @abstractmethod
+    def min_throughput_threshold(cls) -> int: ...
+
     @classmethod
     def configure_tags(cls):
         sentry_sdk.set_tag("regression.source", cls.source)
@@ -105,20 +109,28 @@ def detect_trends(
         unique_project_ids: set[int] = set()
 
         total_count = 0
+        skipped_count = 0
         regressed_count = 0
         improved_count = 0
 
         algorithm = cls.detector_algorithm_factory()
         store = cls.detector_store_factory()
 
-        for payloads in chunked(cls.all_payloads(projects, start), batch_size):
-            total_count += len(payloads)
+        for raw_payloads in chunked(cls.all_payloads(projects, start), batch_size):
+            total_count += len(raw_payloads)
 
-            raw_states = store.bulk_read_states(payloads)
+            raw_states = store.bulk_read_states(raw_payloads)
 
+            payloads = []
             states = []
 
-            for raw_state, payload in zip(raw_states, payloads):
+            for raw_state, payload in zip(raw_states, raw_payloads):
+                # If the number of events is too low, then we skip updating
+                # to minimize false positives
+                if payload.count <= cls.min_throughput_threshold():
+                    skipped_count += 1
+                    continue
+
                 metrics.distribution(
                     "statistical_detectors.objects.throughput",
                     value=payload.count,
@@ -133,6 +145,7 @@ def detect_trends(
                 elif trend_type == TrendType.Improved:
                     improved_count += 1
 
+                payloads.append(payload)
                 states.append(None if new_state is None else new_state.to_redis_dict())
 
                 yield TrendBundle(
@@ -142,7 +155,8 @@ def detect_trends(
                     state=new_state,
                 )
 
-            store.bulk_write_states(payloads, states)
+            if payloads and states:
+                store.bulk_write_states(payloads, states)
 
         metrics.incr(
             "statistical_detectors.projects.active",
@@ -158,6 +172,13 @@ def detect_trends(
             sample_rate=1.0,
         )
 
+        metrics.incr(
+            "statistical_detectors.objects.skipped",
+            amount=skipped_count,
+            tags={"source": cls.source, "kind": cls.kind},
+            sample_rate=1.0,
+        )
+
         metrics.incr(
             "statistical_detectors.objects.regressed",
             amount=regressed_count,
diff --git a/src/sentry/tagstore/types.py b/src/sentry/tagstore/types.py
index 2ca77f628792ef..4c31ca71f5f0f0 100644
--- a/src/sentry/tagstore/types.py
+++ b/src/sentry/tagstore/types.py
@@ -137,7 +137,7 @@ class TagValueSerializerResponse(TagValueSerializerResponseOptional):
 @register(GroupTagValue)
 @register(TagValue)
 class TagValueSerializer(Serializer):
-    def serialize(self, obj, attrs, user, **kwargs):
+    def serialize(self, obj, attrs, user, **kwargs) -> TagValueSerializerResponse:
         from sentry import tagstore
 
         key = tagstore.get_standardized_key(obj.key)
diff --git a/src/sentry/tasks/base.py b/src/sentry/tasks/base.py
index 3b703d27fd9fb5..3a2c404b4a7150 100644
--- a/src/sentry/tasks/base.py
+++ b/src/sentry/tasks/base.py
@@ -1,9 +1,7 @@
 from __future__ import annotations
 
 import logging
-import resource
 from collections.abc import Callable, Iterable
-from contextlib import contextmanager
 from datetime import datetime
 from functools import wraps
 from typing import Any, TypeVar
@@ -15,6 +13,7 @@
 from sentry.celery import app
 from sentry.silo.base import SiloLimit, SiloMode
 from sentry.utils import metrics
+from sentry.utils.memory import track_memory_usage
 from sentry.utils.sdk import Scope, capture_exception
 
 ModelT = TypeVar("ModelT", bound=Model)
@@ -59,19 +58,6 @@ def __call__(self, decorated_task: Any) -> Any:
         return limited_func
 
 
-def get_rss_usage():
-    return resource.getrusage(resource.RUSAGE_SELF).ru_maxrss
-
-
-@contextmanager
-def track_memory_usage(metric, **kwargs):
-    before = get_rss_usage()
-    try:
-        yield
-    finally:
-        metrics.distribution(metric, get_rss_usage() - before, unit="byte", **kwargs)
-
-
 def load_model_from_db(
     tp: type[ModelT], instance_or_id: ModelT | int, allow_cache: bool = True
 ) -> ModelT:
diff --git a/src/sentry/tasks/commit_context.py b/src/sentry/tasks/commit_context.py
index f017618e8199f5..75a8dc0de2084b 100644
--- a/src/sentry/tasks/commit_context.py
+++ b/src/sentry/tasks/commit_context.py
@@ -231,6 +231,9 @@ def process_commit_context(
                 project_id=project.id,
                 group_id=group_id,
                 new_assignment=created,
+                user_id=group_owner.user_id,
+                group_owner_type=group_owner.type,
+                method="scm_integration",
             )
     except UnableToAcquireLock:
         pass
diff --git a/src/sentry/tasks/delete_seer_grouping_records.py b/src/sentry/tasks/delete_seer_grouping_records.py
index 4deaec4d3525a5..acbe9a4dd4e068 100644
--- a/src/sentry/tasks/delete_seer_grouping_records.py
+++ b/src/sentry/tasks/delete_seer_grouping_records.py
@@ -8,7 +8,7 @@
     delete_grouping_records_by_hash,
     delete_project_grouping_records,
 )
-from sentry.seer.similarity.utils import killswitch_enabled
+from sentry.seer.similarity.utils import ReferrerOptions, killswitch_enabled
 from sentry.silo.base import SiloMode
 from sentry.tasks.base import instrumented_task
 
@@ -34,7 +34,7 @@ def delete_seer_grouping_records_by_hash(
     Task to delete seer grouping records by hash list.
     Calls the seer delete by hash endpoint with batches of hashes of size `BATCH_SIZE`.
     """
-    if killswitch_enabled(project_id) or options.get(
+    if killswitch_enabled(project_id, ReferrerOptions.DELETION) or options.get(
         "seer.similarity-embeddings-delete-by-hash-killswitch.enabled"
     ):
         return
@@ -57,7 +57,7 @@ def call_delete_seer_grouping_records_by_hash(
     if (
         project
         and project.get_option("sentry:similarity_backfill_completed")
-        and not killswitch_enabled(project.id)
+        and not killswitch_enabled(project.id, ReferrerOptions.DELETION)
         and not options.get("seer.similarity-embeddings-delete-by-hash-killswitch.enabled")
     ):
         # TODO (jangjodi): once we store seer grouping info in GroupHash, we should filter by that here
@@ -86,7 +86,7 @@ def call_seer_delete_project_grouping_records(
     *args: Any,
     **kwargs: Any,
 ) -> None:
-    if killswitch_enabled(project_id) or options.get(
+    if killswitch_enabled(project_id, ReferrerOptions.DELETION) or options.get(
         "seer.similarity-embeddings-delete-by-hash-killswitch.enabled"
     ):
         return
diff --git a/src/sentry/tasks/embeddings_grouping/backfill_seer_grouping_records_for_project.py b/src/sentry/tasks/embeddings_grouping/backfill_seer_grouping_records_for_project.py
index f22311cb035081..ea090ab018d507 100644
--- a/src/sentry/tasks/embeddings_grouping/backfill_seer_grouping_records_for_project.py
+++ b/src/sentry/tasks/embeddings_grouping/backfill_seer_grouping_records_for_project.py
@@ -9,11 +9,15 @@
 from sentry.grouping.api import GroupingConfigNotFound
 from sentry.grouping.enhancer.exceptions import InvalidEnhancerConfig
 from sentry.models.project import Project
-from sentry.seer.similarity.utils import killswitch_enabled, project_is_seer_eligible
+from sentry.seer.similarity.utils import (
+    ReferrerOptions,
+    killswitch_enabled,
+    project_is_seer_eligible,
+)
 from sentry.silo.base import SiloMode
 from sentry.tasks.base import instrumented_task
 from sentry.tasks.embeddings_grouping.utils import (
-    FeatureError,
+    NODESTORE_RETRY_EXCEPTIONS,
     GroupStacktraceData,
     create_project_cohort,
     delete_seer_grouping_records,
@@ -80,7 +84,7 @@ def backfill_seer_grouping_records_for_project(
     assert current_project_id is not None
 
     if options.get("seer.similarity-backfill-killswitch.enabled") or killswitch_enabled(
-        current_project_id
+        current_project_id, ReferrerOptions.BACKFILL
     ):
         logger.info("backfill_seer_grouping_records.killswitch_enabled")
         return
@@ -109,13 +113,6 @@ def backfill_seer_grouping_records_for_project(
             last_processed_group_id_input,
             last_processed_project_index_input,
         )
-    except FeatureError:
-        logger.info(
-            "backfill_seer_grouping_records.no_feature",
-            extra={"current_project_id": current_project_id},
-        )
-        # TODO: let's just delete this branch since feature is on
-        return
     except Project.DoesNotExist:
         logger.info(
             "backfill_seer_grouping_records.project_does_not_exist",
@@ -226,6 +223,16 @@ def backfill_seer_grouping_records_for_project(
     except EVENT_INFO_EXCEPTIONS:
         metrics.incr("sentry.tasks.backfill_seer_grouping_records.grouping_config_error")
         nodestore_results, group_hashes_dict = GroupStacktraceData(data=[], stacktrace_list=[]), {}
+    except NODESTORE_RETRY_EXCEPTIONS as e:
+        extra = {
+            "organization_id": project.organization.id,
+            "project_id": project.id,
+            "error": e.message,
+        }
+        logger.exception(
+            "tasks.backfill_seer_grouping_records.bulk_event_lookup_exception", extra=extra
+        )
+        group_hashes_dict = {}
 
     if not group_hashes_dict:
         call_next_backfill(
@@ -305,7 +312,7 @@ def call_next_backfill(
     only_delete: bool = False,
     last_processed_group_id: int | None = None,
     last_processed_project_id: int | None = None,
-):
+) -> None:
     if last_processed_group_id is not None:
         backfill_seer_grouping_records_for_project.apply_async(
             args=[
diff --git a/src/sentry/tasks/embeddings_grouping/utils.py b/src/sentry/tasks/embeddings_grouping/utils.py
index b457ce50322c7e..84f121ff440ec2 100644
--- a/src/sentry/tasks/embeddings_grouping/utils.py
+++ b/src/sentry/tasks/embeddings_grouping/utils.py
@@ -10,12 +10,11 @@
 from google.api_core.exceptions import DeadlineExceeded, ServiceUnavailable
 from snuba_sdk import Column, Condition, Entity, Limit, Op, Query, Request
 
-from sentry import features, nodestore, options
+from sentry import nodestore, options
 from sentry.conf.server import SEER_SIMILARITY_MODEL_VERSION
 from sentry.eventstore.models import Event
-from sentry.grouping.grouping_info import get_grouping_info
+from sentry.grouping.grouping_info import get_grouping_info_from_variants
 from sentry.issues.grouptype import ErrorGroupType
-from sentry.issues.occurrence_consumer import EventLookupError
 from sentry.models.group import Group, GroupStatus
 from sentry.models.project import Project
 from sentry.seer.similarity.grouping_records import (
@@ -36,6 +35,7 @@
     event_content_has_stacktrace,
     filter_null_from_string,
     get_stacktrace_string_with_metrics,
+    has_too_many_contributing_frames,
 )
 from sentry.snuba.dataset import Dataset
 from sentry.snuba.referrer import Referrer
@@ -57,10 +57,6 @@
 logger = logging.getLogger(__name__)
 
 
-class FeatureError(Exception):
-    pass
-
-
 class GroupEventRow(TypedDict):
     event_id: str
     group_id: int
@@ -142,8 +138,6 @@ def initialize_backfill(
         },
     )
     project = Project.objects.get_from_cache(id=project_id)
-    if not features.has("projects:similarity-embeddings-backfill", project):
-        raise FeatureError("Project does not have feature")
 
     last_processed_project_index_ret = (
         last_processed_project_index if last_processed_project_index else 0
@@ -363,11 +357,17 @@ def get_events_from_nodestore(
     bulk_event_ids = set()
     for group_id, event in nodestore_events.items():
         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_with_metrics(
-                grouping_info, event.platform, ReferrerOptions.BACKFILL
-            )
+        stacktrace_string = None
+
+        if event and event_content_has_stacktrace(event):
+            variants = event.get_grouping_variants(normalize_stacktraces=True)
+
+            if not has_too_many_contributing_frames(event, variants, ReferrerOptions.BACKFILL):
+                grouping_info = get_grouping_info_from_variants(variants)
+                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
@@ -571,26 +571,13 @@ def update_groups(project, seer_response, group_id_batch_filtered, group_hashes_
 
 
 def _make_nodestore_call(project, node_keys):
-    try:
-        bulk_data = _retry_operation(
-            nodestore.backend.get_multi,
-            node_keys,
-            retries=3,
-            delay=2,
-            exceptions=NODESTORE_RETRY_EXCEPTIONS,
-        )
-    except NODESTORE_RETRY_EXCEPTIONS as e:
-        extra = {
-            "organization_id": project.organization.id,
-            "project_id": project.id,
-            "node_keys": json.dumps(node_keys),
-            "error": e.message,
-        }
-        logger.exception(
-            "tasks.backfill_seer_grouping_records.bulk_event_lookup_exception",
-            extra=extra,
-        )
-        raise
+    bulk_data = _retry_operation(
+        nodestore.backend.get_multi,
+        node_keys,
+        retries=3,
+        delay=2,
+        exceptions=NODESTORE_RETRY_EXCEPTIONS,
+    )
 
     return bulk_data
 
@@ -701,16 +688,6 @@ def _retry_operation(operation, *args, retries, delay, exceptions, **kwargs):
                 raise
 
 
-# TODO: delete this and its tests
-def lookup_event(project_id: int, event_id: str, group_id: int) -> Event:
-    data = nodestore.backend.get(Event.generate_node_id(project_id, event_id))
-    if data is None:
-        raise EventLookupError(f"Failed to lookup event({event_id}) for project_id({project_id})")
-    event = Event(event_id=event_id, project_id=project_id, group_id=group_id)
-    event.data = data
-    return event
-
-
 def delete_seer_grouping_records(
     project_id: int,
 ):
diff --git a/src/sentry/tasks/groupowner.py b/src/sentry/tasks/groupowner.py
index e5371142994479..81c7a1b0816f99 100644
--- a/src/sentry/tasks/groupowner.py
+++ b/src/sentry/tasks/groupowner.py
@@ -4,6 +4,7 @@
 
 from django.utils import timezone
 
+from sentry import analytics
 from sentry.locks import locks
 from sentry.models.commit import Commit
 from sentry.models.groupowner import GroupOwner, GroupOwnerType
@@ -103,6 +104,17 @@ def _process_suspect_commits(
                                             "project": project_id,
                                         },
                                     )
+                            analytics.record(
+                                "groupowner.assignment",
+                                organization_id=project.organization_id,
+                                project_id=project.id,
+                                group_id=group_id,
+                                new_assignment=created,
+                                user_id=go.user_id,
+                                group_owner_type=go.type,
+                                method="release_commit",
+                            )
+
                     except GroupOwner.MultipleObjectsReturned:
                         GroupOwner.objects.filter(
                             group_id=group_id,
diff --git a/src/sentry/tasks/on_demand_metrics.py b/src/sentry/tasks/on_demand_metrics.py
index 2b38c0956ff1cb..25e095405880c1 100644
--- a/src/sentry/tasks/on_demand_metrics.py
+++ b/src/sentry/tasks/on_demand_metrics.py
@@ -61,10 +61,6 @@ def _set_currently_processing_batch(current_batch: int) -> None:
     cache.set(_get_widget_processing_batch_key(), current_batch, timeout=3600)
 
 
-def _set_cardinality_cache(cache_key: str, is_low_cardinality: bool) -> None:
-    cache.set(cache_key, is_low_cardinality, timeout=_WIDGET_QUERY_CARDINALITY_TTL)
-
-
 def _get_previous_processing_batch() -> int:
     return cache.get(_get_widget_processing_batch_key(), 0)
 
diff --git a/src/sentry/tasks/post_process.py b/src/sentry/tasks/post_process.py
index 35bbc5e8a21fb8..9cda6d27f367a1 100644
--- a/src/sentry/tasks/post_process.py
+++ b/src/sentry/tasks/post_process.py
@@ -40,6 +40,7 @@
 from sentry.utils.sdk import bind_organization_context, set_current_event_project
 from sentry.utils.sdk_crashes.sdk_crash_detection_config import build_sdk_crash_detection_configs
 from sentry.utils.services import build_instance_from_options_of_type
+from sentry.workflow_engine.types import WorkflowJob
 
 if TYPE_CHECKING:
     from sentry.eventstore.models import Event, GroupEvent
@@ -679,35 +680,30 @@ def get_event_raise_exception() -> Event:
             )
             metric_tags["occurrence_type"] = group_event.group.issue_type.slug
 
-        if not is_reprocessed and event.data.get("received"):
-            duration = time() - event.data["received"]
-            metrics.timing(
-                "events.time-to-post-process",
-                duration,
-                instance=event.data["platform"],
-                tags=metric_tags,
-            )
-
-            # We see occasional metrics being recorded with very old data,
-            # temporarily log some information about these groups to help
-            # investigate.
-            if duration and duration > 432_000:  # 5 days (5*24*60*60)
-                logger.warning(
-                    "tasks.post_process.old_time_to_post_process",
-                    extra={
-                        "group_id": group_id,
-                        "project_id": project_id,
-                        "duration": duration,
-                        "received": event.data["received"],
-                        "platform": event.data["platform"],
-                        "reprocessing": json.dumps(
-                            get_path(event.data, "contexts", "reprocessing")
-                        ),
-                        "original_issue_id": json.dumps(
-                            get_path(event.data, "contexts", "reprocessing", "original_issue_id")
-                        ),
-                    },
+        if not is_reprocessed:
+            received_at = event.data.get("received")
+            saved_at = event.data.get("nodestore_insert")
+            post_processed_at = time()
+
+            if saved_at:
+                metrics.timing(
+                    "events.saved_to_post_processed",
+                    post_processed_at - saved_at,
+                    instance=event.data["platform"],
+                    tags=metric_tags,
                 )
+            else:
+                metrics.incr("events.missing_nodestore_insert", tags=metric_tags)
+
+            if received_at:
+                metrics.timing(
+                    "events.time-to-post-process",
+                    post_processed_at - received_at,
+                    instance=event.data["platform"],
+                    tags=metric_tags,
+                )
+            else:
+                metrics.incr("events.missing_received", tags=metric_tags)
 
 
 def run_post_process_job(job: PostProcessJob) -> None:
@@ -720,12 +716,12 @@ def run_post_process_job(job: PostProcessJob) -> None:
     ):
         return
 
-    if issue_category not in GROUP_CATEGORY_POST_PROCESS_PIPELINE:
-        # pipeline for generic issues
-        pipeline = GENERIC_POST_PROCESS_PIPELINE
-    else:
+    if issue_category in GROUP_CATEGORY_POST_PROCESS_PIPELINE:
         # specific pipelines for issue types
         pipeline = GROUP_CATEGORY_POST_PROCESS_PIPELINE[issue_category]
+    else:
+        # pipeline for generic issues
+        pipeline = GENERIC_POST_PROCESS_PIPELINE
 
     for pipeline_step in pipeline:
         try:
@@ -994,6 +990,29 @@ def _get_replay_id(event):
         )
 
 
+def process_workflow_engine(job: PostProcessJob) -> None:
+    if job["is_reprocessed"]:
+        return
+
+    # TODO - Add a rollout flag check here, if it's not enabled, call process_rules
+    # If the flag is enabled, use the code below
+    from sentry.workflow_engine.processors.workflow import process_workflows
+
+    # PostProcessJob event is optional, WorkflowJob event is required
+    if "event" not in job:
+        logger.error("Missing event to create WorkflowJob", extra={"job": job})
+        return
+
+    try:
+        workflow_job = WorkflowJob({**job})  # type: ignore[typeddict-item]
+    except Exception:
+        logger.exception("Could not create WorkflowJob", extra={"job": job})
+        return
+
+    with sentry_sdk.start_span(op="tasks.post_process_group.workflow_engine.process_workflow"):
+        process_workflows(workflow_job)
+
+
 def process_rules(job: PostProcessJob) -> None:
     if job["is_reprocessed"]:
         return
@@ -1558,6 +1577,9 @@ def detect_base_urls_for_uptime(job: PostProcessJob):
         feedback_filter_decorator(process_inbox_adds),
         feedback_filter_decorator(process_rules),
     ],
+    GroupCategory.METRIC_ALERT: [
+        process_workflow_engine,
+    ],
 }
 
 GENERIC_POST_PROCESS_PIPELINE = [
diff --git a/src/sentry/tasks/statistical_detectors.py b/src/sentry/tasks/statistical_detectors.py
index acc63ab4a7a6d6..8a1f1259ab94e4 100644
--- a/src/sentry/tasks/statistical_detectors.py
+++ b/src/sentry/tasks/statistical_detectors.py
@@ -236,6 +236,10 @@ class EndpointRegressionDetector(RegressionDetector):
     resolution_rel_threshold = 0.1
     escalation_rel_threshold = 0.75
 
+    @classmethod
+    def min_throughput_threshold(cls) -> int:
+        return options.get("statistical_detectors.throughput.threshold.transactions")
+
     @classmethod
     def detector_algorithm_factory(cls) -> DetectorAlgorithm:
         return MovingAverageRelativeChangeDetector(
@@ -278,6 +282,10 @@ class FunctionRegressionDetector(RegressionDetector):
     resolution_rel_threshold = 0.1
     escalation_rel_threshold = 0.75
 
+    @classmethod
+    def min_throughput_threshold(cls) -> int:
+        return options.get("statistical_detectors.throughput.threshold.functions")
+
     @classmethod
     def detector_algorithm_factory(cls) -> DetectorAlgorithm:
         return MovingAverageRelativeChangeDetector(
diff --git a/src/sentry/taskworker/client.py b/src/sentry/taskworker/client.py
index bb1549d4d3aa4a..6beb6886b30e51 100644
--- a/src/sentry/taskworker/client.py
+++ b/src/sentry/taskworker/client.py
@@ -2,6 +2,7 @@
 
 import grpc
 from sentry_protos.sentry.v1.taskworker_pb2 import (
+    FetchNextTask,
     GetTaskRequest,
     SetTaskStatusRequest,
     TaskActivation,
@@ -24,13 +25,14 @@ def __init__(self, host: str) -> None:
         self._channel = grpc.insecure_channel(self._host)
         self._stub = ConsumerServiceStub(self._channel)
 
-    def get_task(self) -> TaskActivation | None:
+    def get_task(self, namespace: str | None = None) -> TaskActivation | None:
         """
-        Fetch a pending task
+        Fetch a pending task.
 
-        Will return None when there are no tasks to fetch
+        If a namespace is provided, only tasks for that namespace will be fetched.
+        This will return None if there are no tasks to fetch.
         """
-        request = GetTaskRequest()
+        request = GetTaskRequest(namespace=namespace)
         try:
             response = self._stub.GetTask(request)
         except grpc.RpcError as err:
@@ -42,7 +44,7 @@ def get_task(self) -> TaskActivation | None:
         return None
 
     def update_task(
-        self, task_id: str, status: TaskActivationStatus.ValueType, fetch_next: bool = True
+        self, task_id: str, status: TaskActivationStatus.ValueType, fetch_next_task: FetchNextTask
     ) -> TaskActivation | None:
         """
         Update the status for a given task activation.
@@ -52,7 +54,7 @@ def update_task(
         request = SetTaskStatusRequest(
             id=task_id,
             status=status,
-            fetch_next=fetch_next,
+            fetch_next_task=fetch_next_task,
         )
         try:
             response = self._stub.SetTaskStatus(request)
diff --git a/src/sentry/taskworker/registry.py b/src/sentry/taskworker/registry.py
index 33423dbf2f3150..90ab9d4e8b55e4 100644
--- a/src/sentry/taskworker/registry.py
+++ b/src/sentry/taskworker/registry.py
@@ -57,11 +57,19 @@ def producer(self) -> KafkaProducer:
         return self._producer
 
     def get(self, name: str) -> Task[Any, Any]:
+        """
+        Get a registered task by name
+
+        Raises KeyError when an unknown task is provided.
+        """
         if name not in self._registered_tasks:
             raise KeyError(f"No task registered with the name {name}. Check your imports")
         return self._registered_tasks[name]
 
     def contains(self, name: str) -> bool:
+        """
+        Check if a task name has been registered
+        """
         return name in self._registered_tasks
 
     def register(
@@ -80,6 +88,7 @@ def register(
         asynchronously via taskworkers.
 
         Parameters
+        ----------
 
         name: str
             The name of the task. This is serialized and must be stable across deploys.
diff --git a/src/sentry/taskworker/task.py b/src/sentry/taskworker/task.py
index 9b7525b0205046..920bcd727fc148 100644
--- a/src/sentry/taskworker/task.py
+++ b/src/sentry/taskworker/task.py
@@ -7,6 +7,7 @@
 from uuid import uuid4
 
 import orjson
+import sentry_sdk
 from django.conf import settings
 from django.utils import timezone
 from google.protobuf.timestamp_pb2 import Timestamp
@@ -58,15 +59,31 @@ def retry(self) -> Retry | None:
         return self._retry
 
     def __call__(self, *args: P.args, **kwargs: P.kwargs) -> R:
+        """
+        Call the task function immediately.
+        """
         return self._func(*args, **kwargs)
 
     def delay(self, *args: P.args, **kwargs: P.kwargs) -> None:
+        """
+        Schedule a task to run later with a set of arguments.
+
+        The provided parameters will be JSON encoded and stored within
+        a `TaskActivation` protobuf that is appended to kafka
+        """
         self.apply_async(*args, **kwargs)
 
     def apply_async(self, *args: P.args, **kwargs: P.kwargs) -> None:
+        """
+        Schedule a task to run later with a set of arguments.
+
+        The provided parameters will be JSON encoded and stored within
+        a `TaskActivation` protobuf that is appended to kafka
+        """
         if settings.TASK_WORKER_ALWAYS_EAGER:
             self._func(*args, **kwargs)
         else:
+            # TODO(taskworker) promote parameters to headers
             self._namespace.send_task(self.create_activation(*args, **kwargs))
 
     def create_activation(self, *args: P.args, **kwargs: P.kwargs) -> TaskActivation:
@@ -81,10 +98,16 @@ def create_activation(self, *args: P.args, **kwargs: P.kwargs) -> TaskActivation
         if isinstance(expires, datetime.timedelta):
             expires = int(expires.total_seconds())
 
+        headers = {
+            "sentry-trace": sentry_sdk.get_traceparent() or "",
+            "baggage": sentry_sdk.get_baggage() or "",
+        }
+
         return TaskActivation(
             id=uuid4().hex,
             namespace=self._namespace.name,
             taskname=self.name,
+            headers=headers,
             parameters=orjson.dumps({"args": args, "kwargs": kwargs}).decode("utf8"),
             retry_state=self._create_retry_state(),
             received_at=received_at,
diff --git a/src/sentry/taskworker/tasks/examples.py b/src/sentry/taskworker/tasks/examples.py
index 2e077d70e9b88b..ad623fbe1b706a 100644
--- a/src/sentry/taskworker/tasks/examples.py
+++ b/src/sentry/taskworker/tasks/examples.py
@@ -3,11 +3,54 @@
 import logging
 
 from sentry.taskworker.registry import taskregistry
+from sentry.taskworker.retry import LastAction, Retry, RetryError
 
 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
+    logger.info("Hello %s", name)
+
+
+@exampletasks.register(
+    name="examples.retry_deadletter", retry=Retry(times=2, times_exceeded=LastAction.Deadletter)
+)
+def retry_deadletter() -> None:
+    raise RetryError
+
+
+@exampletasks.register(
+    name="examples.will_retry",
+    retry=Retry(times=3, on=(RuntimeError,), times_exceeded=LastAction.Discard),
+)
+def will_retry(failure: str) -> None:
+    if failure == "retry":
+        logger.info("going to retry with explicit retry error")
+        raise RetryError
+    if failure == "raise":
+        logger.info("raising runtimeerror")
+        raise RuntimeError("oh no")
+    logger.info("got %s", failure)
+
+
+@exampletasks.register(name="examples.simple_task")
+def simple_task() -> None:
+    logger.info("simple_task complete")
+
+
+@exampletasks.register(name="examples.retry_task", retry=Retry(times=2))
+def retry_task() -> None:
+    raise RetryError
+
+
+@exampletasks.register(name="examples.fail_task")
+def fail_task() -> None:
+    raise ValueError("nope")
+
+
+@exampletasks.register(name="examples.at_most_once", at_most_once=True)
+def at_most_once_task() -> None:
+    pass
diff --git a/src/sentry/taskworker/worker.py b/src/sentry/taskworker/worker.py
index bef131a61298de..5153dafe6de5b2 100644
--- a/src/sentry/taskworker/worker.py
+++ b/src/sentry/taskworker/worker.py
@@ -10,12 +10,14 @@
 
 import grpc
 import orjson
+import sentry_sdk
 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,
     TASK_ACTIVATION_STATUS_RETRY,
+    FetchNextTask,
     TaskActivation,
 )
 
@@ -23,18 +25,36 @@
 from sentry.taskworker.registry import taskregistry
 from sentry.taskworker.task import Task
 from sentry.utils import metrics
+from sentry.utils.memory import track_memory_usage
 
 logger = logging.getLogger("sentry.taskworker.worker")
 
-# Use forking processes so that django is initialized
-mp_context = multiprocessing.get_context("fork")
+mp_context = multiprocessing.get_context("spawn")
 
 
-def _process_activation(
-    namespace: str, task_name: str, args: list[Any], kwargs: dict[str, Any]
-) -> None:
+def _init_pool_process() -> None:
+    """initialize pool workers by loading all task modules"""
+    for module in settings.TASKWORKER_IMPORTS:
+        __import__(module)
+
+
+def _process_activation(activation: TaskActivation) -> None:
     """multiprocess worker method"""
-    taskregistry.get(namespace).get(task_name)(*args, **kwargs)
+    parameters = orjson.loads(activation.parameters)
+    args = parameters.get("args", [])
+    kwargs = parameters.get("kwargs", {})
+    headers = {k: v for k, v in activation.headers.items()}
+
+    transaction = sentry_sdk.continue_trace(
+        environ_or_headers=headers,
+        op="task.taskworker",
+        name=f"{activation.namespace}:{activation.taskname}",
+    )
+    with (
+        track_memory_usage("taskworker.worker.memory_change"),
+        sentry_sdk.start_transaction(transaction),
+    ):
+        taskregistry.get(activation.namespace).get(activation.taskname)(*args, **kwargs)
 
 
 AT_MOST_ONCE_TIMEOUT = 60 * 60 * 24  # 1 day
@@ -57,12 +77,17 @@ class TaskWorker:
     """
 
     def __init__(
-        self, rpc_host: str, max_task_count: int | None = None, **options: dict[str, Any]
+        self,
+        rpc_host: str,
+        max_task_count: int | None = None,
+        namespace: str | None = None,
+        **options: dict[str, Any],
     ) -> None:
         self.options = options
         self._execution_count = 0
         self._worker_id = uuid4().hex
         self._max_task_count = max_task_count
+        self._namespace = namespace
         self.client = TaskworkerClient(rpc_host)
         self._pool: Pool | None = None
         self._build_pool()
@@ -74,7 +99,7 @@ def __del__(self) -> None:
     def _build_pool(self) -> None:
         if self._pool:
             self._pool.terminate()
-        self._pool = mp_context.Pool(processes=1)
+        self._pool = mp_context.Pool(processes=1, initializer=_init_pool_process)
 
     def do_imports(self) -> None:
         for module in settings.TASKWORKER_IMPORTS:
@@ -124,7 +149,7 @@ def start(self) -> int:
 
     def fetch_task(self) -> TaskActivation | None:
         try:
-            activation = self.client.get_task()
+            activation = self.client.get_task(self._namespace)
         except grpc.RpcError:
             metrics.incr("taskworker.worker.get_task.failed")
             logger.info("get_task failed. Retrying in 1 second")
@@ -132,7 +157,7 @@ def fetch_task(self) -> TaskActivation | None:
 
         if not activation:
             metrics.incr("taskworker.worker.get_task.not_found")
-            logger.info("No task fetched")
+            logger.debug("No task fetched")
             return None
 
         metrics.incr("taskworker.worker.get_task.success")
@@ -167,6 +192,7 @@ def process_task(self, activation: TaskActivation) -> TaskActivation | None:
             return self.client.update_task(
                 task_id=activation.id,
                 status=TASK_ACTIVATION_STATUS_FAILURE,
+                fetch_next_task=FetchNextTask(namespace=self._namespace),
             )
 
         if task.at_most_once:
@@ -187,17 +213,11 @@ def process_task(self, activation: TaskActivation) -> TaskActivation | None:
         result = None
         execution_start_time = 0.0
         try:
-            task_data_parameters = orjson.loads(activation.parameters)
             execution_start_time = time.time()
 
             result = self._pool.apply_async(
                 func=_process_activation,
-                args=(
-                    activation.namespace,
-                    activation.taskname,
-                    task_data_parameters["args"],
-                    task_data_parameters["kwargs"],
-                ),
+                args=(activation,),
             )
             # Will trigger a TimeoutError if the task execution runs long
             result.get(timeout=processing_timeout)
@@ -260,4 +280,5 @@ def process_task(self, activation: TaskActivation) -> TaskActivation | None:
         return self.client.update_task(
             task_id=activation.id,
             status=next_state,
+            fetch_next_task=FetchNextTask(namespace=self._namespace),
         )
diff --git a/static/app/views/performance/settings.ts b/src/sentry/tempest/__init__.py
similarity index 100%
rename from static/app/views/performance/settings.ts
rename to src/sentry/tempest/__init__.py
diff --git a/src/sentry/tempest/apps.py b/src/sentry/tempest/apps.py
new file mode 100644
index 00000000000000..9dbe005be9753f
--- /dev/null
+++ b/src/sentry/tempest/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class TempestConfig(AppConfig):
+    name = "sentry.tempest"
diff --git a/src/sentry/tempest/endpoints/tempest_credentials.py b/src/sentry/tempest/endpoints/tempest_credentials.py
new file mode 100644
index 00000000000000..34c05de20e5665
--- /dev/null
+++ b/src/sentry/tempest/endpoints/tempest_credentials.py
@@ -0,0 +1,58 @@
+from django.db import IntegrityError
+from rest_framework.exceptions import NotFound
+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 import ProjectEndpoint
+from sentry.api.paginator import OffsetPaginator
+from sentry.api.serializers.base import serialize
+from sentry.models.project import Project
+from sentry.tempest.models import TempestCredentials
+from sentry.tempest.permissions import TempestCredentialsPermission
+from sentry.tempest.serializers import DRFTempestCredentialsSerializer, TempestCredentialsSerializer
+
+
+@region_silo_endpoint
+class TempestCredentialsEndpoint(ProjectEndpoint):
+    publish_status = {
+        "GET": ApiPublishStatus.PRIVATE,
+        "POST": ApiPublishStatus.PRIVATE,
+    }
+    owner = ApiOwner.GDX
+
+    permission_classes = (TempestCredentialsPermission,)
+
+    def has_feature(self, request: Request, project: Project) -> bool:
+        return features.has(
+            "organizations:tempest-access", project.organization, actor=request.user
+        )
+
+    def get(self, request: Request, project: Project) -> Response:
+        if not self.has_feature(request, project):
+            raise NotFound
+
+        tempest_credentials_qs = TempestCredentials.objects.filter(project=project)
+        return self.paginate(
+            request=request,
+            queryset=tempest_credentials_qs,
+            on_results=lambda x: serialize(x, request.user, TempestCredentialsSerializer()),
+            paginator_cls=OffsetPaginator,
+        )
+
+    def post(self, request: Request, project: Project) -> Response:
+        if not self.has_feature(request, project):
+            raise NotFound
+
+        serializer = DRFTempestCredentialsSerializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+        try:
+            serializer.save(created_by_id=request.user.id, project=project)
+        except IntegrityError:
+            return Response(
+                {"detail": "A credential with this client ID already exists."}, status=400
+            )
+        return Response(serializer.data, status=201)
diff --git a/src/sentry/tempest/endpoints/tempest_credentials_details.py b/src/sentry/tempest/endpoints/tempest_credentials_details.py
new file mode 100644
index 00000000000000..abebd916ae8071
--- /dev/null
+++ b/src/sentry/tempest/endpoints/tempest_credentials_details.py
@@ -0,0 +1,34 @@
+from rest_framework.exceptions import NotFound
+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 import ProjectEndpoint
+from sentry.models.project import Project
+from sentry.tempest.models import TempestCredentials
+from sentry.tempest.permissions import TempestCredentialsPermission
+
+
+@region_silo_endpoint
+class TempestCredentialsDetailsEndpoint(ProjectEndpoint):
+    publish_status = {
+        "DELETE": ApiPublishStatus.PRIVATE,
+    }
+    owner = ApiOwner.GDX
+
+    permission_classes = (TempestCredentialsPermission,)
+
+    def has_feature(self, request: Request, project: Project) -> bool:
+        return features.has(
+            "organizations:tempest-access", project.organization, actor=request.user
+        )
+
+    def delete(self, request: Request, project: Project, tempest_credentials_id: int) -> Response:
+        if not self.has_feature(request, project):
+            raise NotFound
+
+        TempestCredentials.objects.filter(project=project, id=tempest_credentials_id).delete()
+        return Response(status=204)
diff --git a/src/sentry/tempest/migrations/0001_create_tempest_credentials_model.py b/src/sentry/tempest/migrations/0001_create_tempest_credentials_model.py
new file mode 100644
index 00000000000000..e528576fa44d1c
--- /dev/null
+++ b/src/sentry/tempest/migrations/0001_create_tempest_credentials_model.py
@@ -0,0 +1,72 @@
+# Generated by Django 5.1.4 on 2024-12-17 00:21
+
+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
+
+    initial = True
+
+    dependencies = [
+        ("sentry", "0802_remove_grouping_auto_update_option"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="TempestCredentials",
+            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)),
+                (
+                    "created_by_id",
+                    sentry.db.models.fields.hybrid_cloud_foreign_key.HybridCloudForeignKey(
+                        "sentry.User", db_index=True, null=True, on_delete="SET_NULL"
+                    ),
+                ),
+                ("message", models.TextField()),
+                ("message_type", models.CharField(default="error", max_length=20)),
+                ("client_id", models.CharField()),
+                ("client_secret", models.CharField()),
+                ("latest_fetched_item_id", models.CharField(null=True)),
+                (
+                    "project",
+                    sentry.db.models.fields.foreignkey.FlexibleForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to="sentry.project"
+                    ),
+                ),
+            ],
+            options={
+                "constraints": [
+                    models.UniqueConstraint(
+                        fields=("client_id", "project"),
+                        name="sentry_tempestcredentials_client_project_uniq",
+                    )
+                ],
+            },
+        ),
+    ]
diff --git a/tests/sentry/hybridcloud/test_organization_provisioning.py b/src/sentry/tempest/migrations/__init__.py
similarity index 100%
rename from tests/sentry/hybridcloud/test_organization_provisioning.py
rename to src/sentry/tempest/migrations/__init__.py
diff --git a/src/sentry/tempest/models.py b/src/sentry/tempest/models.py
new file mode 100644
index 00000000000000..63e019ea5a59e7
--- /dev/null
+++ b/src/sentry/tempest/models.py
@@ -0,0 +1,44 @@
+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
+
+
+class MessageType(models.TextChoices):
+    ERROR = "error"
+    WARNING = "warning"
+    SUCCESS = "success"
+    INFO = "info"
+
+
+@region_silo_model
+class TempestCredentials(DefaultFieldsModel):
+    # Contains sensitive information which we don't want to export/import - it should be configured again manually
+    __relocation_scope__ = RelocationScope.Excluded
+
+    created_by_id = HybridCloudForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete="SET_NULL")
+    project = FlexibleForeignKey("sentry.Project", on_delete=models.CASCADE)
+
+    # message that is shown next to the client id/secret pair
+    # used to communicate the status of the latest actions with credentials
+    message = models.TextField()
+    message_type = models.CharField(
+        max_length=20, choices=MessageType.choices, default=MessageType.ERROR
+    )
+
+    client_id = models.CharField()
+    client_secret = models.CharField()
+
+    # id of the latest item fetched via tempest
+    latest_fetched_item_id = models.CharField(null=True)
+
+    class Meta:
+        constraints = [
+            UniqueConstraint(
+                fields=["client_id", "project"],
+                name="sentry_tempestcredentials_client_project_uniq",
+            )
+        ]
diff --git a/src/sentry/tempest/permissions.py b/src/sentry/tempest/permissions.py
new file mode 100644
index 00000000000000..9e64eee7f0628e
--- /dev/null
+++ b/src/sentry/tempest/permissions.py
@@ -0,0 +1,16 @@
+from sentry.api.bases.project import ProjectPermission
+
+
+class TempestCredentialsPermission(ProjectPermission):
+    scope_map = {
+        "GET": [
+            "project:read",
+            "project:write",
+            "project:admin",
+            "org:read",
+            "org:write",
+            "org:admin",
+        ],
+        "POST": ["org:admin"],
+        "DELETE": ["org:admin"],
+    }
diff --git a/src/sentry/tempest/serializers.py b/src/sentry/tempest/serializers.py
new file mode 100644
index 00000000000000..625e636be2de86
--- /dev/null
+++ b/src/sentry/tempest/serializers.py
@@ -0,0 +1,69 @@
+from rest_framework import serializers
+
+from sentry.api.serializers.base import Serializer, register
+from sentry.tempest.models import TempestCredentials
+from sentry.users.services.user.service import user_service
+
+
+@register(TempestCredentials)
+class TempestCredentialsSerializer(Serializer):
+    def _obfuscate_client_secret(self, client_secret: str) -> str:
+        return "*" * len(client_secret)
+
+    def get_attrs(
+        self,
+        item_list,
+        user,
+        **kwargs,
+    ):
+        users_mapping = {}
+        user_ids = [item.created_by_id for item in item_list if item.created_by_id is not None]
+        users = user_service.get_many_by_id(ids=user_ids)
+        for rpc_user in users:
+            users_mapping[rpc_user.id] = rpc_user
+
+        attrs = {}
+        for item in item_list:
+            attrs[item] = users_mapping.get(item.created_by_id)
+
+        return attrs
+
+    def serialize(self, obj, attrs, user, **kwargs):
+        rpc_user = attrs
+        return {
+            "id": obj.id,
+            "clientId": obj.client_id,
+            "clientSecret": self._obfuscate_client_secret(obj.client_secret),
+            "message": obj.message,
+            "messageType": obj.message_type,
+            "latestFetchedItemId": obj.latest_fetched_item_id,
+            "createdById": obj.created_by_id,
+            "createdByEmail": rpc_user.email if rpc_user else None,
+            "dateAdded": obj.date_added,
+            "dateUpdated": obj.date_updated,
+        }
+
+
+class DRFTempestCredentialsSerializer(serializers.ModelSerializer):
+    clientId = serializers.CharField(source="client_id")
+    clientSecret = serializers.CharField(source="client_secret")
+    message = serializers.CharField(read_only=True)
+    messageType = serializers.CharField(source="message_type", read_only=True)
+    latestFetchedItemId = serializers.CharField(source="latest_fetched_item_id", read_only=True)
+    createdById = serializers.CharField(source="created_by_id", read_only=True)
+    dateAdded = serializers.DateTimeField(source="date_added", read_only=True)
+    dateUpdated = serializers.DateTimeField(source="date_updated", read_only=True)
+
+    class Meta:
+        model = TempestCredentials
+        fields = [
+            "id",
+            "clientId",
+            "clientSecret",
+            "message",
+            "messageType",
+            "latestFetchedItemId",
+            "createdById",
+            "dateAdded",
+            "dateUpdated",
+        ]
diff --git a/src/sentry/templates/sentry/base-react.html b/src/sentry/templates/sentry/base-react.html
index d8c0ffd686f3b1..ab3e218318e48a 100644
--- a/src/sentry/templates/sentry/base-react.html
+++ b/src/sentry/templates/sentry/base-react.html
@@ -18,3 +18,5 @@
     </div>
   </div>
 {% endblock %}
+
+{% block wrapperclass %}{{ user_theme }}{% endblock %}
diff --git a/src/sentry/templates/sentry/bases/forceauth_modal.html b/src/sentry/templates/sentry/bases/forceauth_modal.html
deleted file mode 100644
index a9adbebfe622a8..00000000000000
--- a/src/sentry/templates/sentry/bases/forceauth_modal.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends "sentry/layout.html" %}
-
-{% load i18n %}
-
-{% block wrapperclass %}{{ block.super }} narrow hide-sidebar{% endblock %}
-
-{% block content %}
-  <p><strong>Account</strong>: {{ request.user.get_display_name }}</p>
-  <hr>
-  {% block main %}{% endblock %}
-{% endblock %}
diff --git a/src/sentry/templates/sentry/emails/mfa-too-many-attempts.html b/src/sentry/templates/sentry/emails/mfa-too-many-attempts.html
index a1b36df88d2900..8a17b70a2e02ea 100644
--- a/src/sentry/templates/sentry/emails/mfa-too-many-attempts.html
+++ b/src/sentry/templates/sentry/emails/mfa-too-many-attempts.html
@@ -13,4 +13,5 @@ <h3>Suspicious Activity Detected</h3>
 Date: {{ datetime|date:"N j, Y, P e" }}</pre></p>
     <p>If you have lost your 2FA credentials, you can follow our <a href="https://sentry.zendesk.com/hc/en-us/articles/23703310917659-How-do-I-recover-my-account-if-I-lost-my-2FA-credentials">account recovery steps here</a>.</p>
     <p>If these logins are not from you, we recommend you log in to your Sentry account and reset your password under <a href="{{ url }}">your account security settings</a>. On the same account security page, we also recommend you click the “Sign out of all devices” button to remove all currently logged-in sessions of your account.</p>
+    <p>If you are unable to log in to your Sentry account for the password reset, you can use <a href="{{ recover_url }}">Password Recovery</a>.</p>
 {% endblock %}
diff --git a/src/sentry/templates/sentry/emails/mfa-too-many-attempts.txt b/src/sentry/templates/sentry/emails/mfa-too-many-attempts.txt
index 7ec831bc6473f2..192300b5ef7543 100644
--- a/src/sentry/templates/sentry/emails/mfa-too-many-attempts.txt
+++ b/src/sentry/templates/sentry/emails/mfa-too-many-attempts.txt
@@ -13,3 +13,6 @@ If these logins are not from you, we recommend you log in to your Sentry account
 {{ url }}
 
 On the same account security page, we also recommend you click the “Sign out of all devices” button to remove all currently logged-in sessions of your account.
+
+If you are unable to log in to your Sentry account for the password reset, you can use Password Recovery:
+{{ recover_url }}
diff --git a/src/sentry/templates/sentry/integrations/discord/linked.html b/src/sentry/templates/sentry/integrations/discord/linked.html
index 4ec0bd00bcd2d5..5a834df64dff19 100644
--- a/src/sentry/templates/sentry/integrations/discord/linked.html
+++ b/src/sentry/templates/sentry/integrations/discord/linked.html
@@ -1,14 +1,16 @@
 {% extends "sentry/bases/modal.html" %}
-
 {% load i18n %}
-
 {% block title %}{% trans "Discord Linked" %} | {{ block.super }}{% endblock %}
 {% block wrapperclass %}narrow auth{% endblock %}
-
 {% block main %}
   <div class="align-center">
     <p>
       {% trans "Your Discord account has been associated with your Sentry account. You may now take Sentry actions through Discord." %}
     </p>
+    <p>
+      <a href="discord://discord.com/channels/{{ guild_id }}" class="btn btn-default btn-login-discord">
+        <span class="provider-logo discord"></span> Go back to Discord
+      </a>
+    </p>
   </div>
 {% endblock %}
diff --git a/src/sentry/templates/sentry/partial/alerts.html b/src/sentry/templates/sentry/partial/alerts.html
index 2cf4bf1be3ecee..7a41552430bb52 100644
--- a/src/sentry/templates/sentry/partial/alerts.html
+++ b/src/sentry/templates/sentry/partial/alerts.html
@@ -77,7 +77,7 @@
 {% elif show_login_banner %}
   <div class="alert-banner">
     <div class="alert-message">
-      Join our workshop to for a live demo of Sentry's new AI tools on Dec. 10. &nbsp<a target="_blank" href="https://sentry.io/resources/debug-faster-sentry-ai-live-demo/">RSVP</a>
+      Join our live workshop: Smarter Tools and Best Practices for Mobile Debugging on Jan 14. &nbsp<a target="_blank" href="https://sentry.io/resources/smarter-tools-and-best-practices-for-mobile-debugging-workshop/">RSVP</a>
     </div>
   </div>
 {% endif %}
diff --git a/src/sentry/templates/sentry/toolbar/iframe.html b/src/sentry/templates/sentry/toolbar/iframe.html
index f35185ab3311a1..a488d33d093668 100644
--- a/src/sentry/templates/sentry/toolbar/iframe.html
+++ b/src/sentry/templates/sentry/toolbar/iframe.html
@@ -1,11 +1,13 @@
 {% comment %}
 Template returned for requests to /iframe. The iframe serves as a proxy for Sentry API requests.
 Required context variables:
-- referrer:           string.       HTTP header from the request object.
-- state:              string.       One of: `logged-out`, `missing-project`, `invalid-domain` or `success`.
+- referrer:           string.       HTTP header from the request object. May have trailing `/`.
+- state:              string.       One of: `logged-out`, `missing-project`, `invalid-domain` or `logged-in`.
 - logging:            any.          If the value is truthy in JavaScript then debug logging will be enabled.
 - organization_slug:  string.       The org named in the url params
 - project_id_or_slug: string | int. The project named in the url params
+- organizationUrl:    string.       Result of generate_organization_url()
+- regionUrl:          string.       Result of generate_region_url()
 {% endcomment %}
 {% load sentry_helpers %}
 {% load sentry_assets %}
@@ -24,6 +26,11 @@
         const logging = '{{ logging|escapejs }}';
         const organizationSlug = '{{ organization_slug|escapejs }}';
         const projectIdOrSlug = '{{ project_id_or_slug|escapejs }}';
+        const organizationUrl = '{{ organization_url|escapejs }}';
+        const regionUrl = '{{ region_url|escapejs }}';
+
+        // Strip the trailing `/` from the url
+        const referrerOrigin = new URL(referrer).origin;
 
         function log(...args) {
           if (logging) {
@@ -31,145 +38,161 @@
           }
         }
 
-        function requestAuthn(delay_ms) {
-          const origin = window.location.origin.endsWith('.sentry.io')
-            ? 'https://sentry.io'
-            : window.location.origin;
-
-          window.open(
-            `${origin}/toolbar/${organizationSlug}/${projectIdOrSlug}/login-success/?delay=${delay_ms ?? '0'}`,
-            'sentry-toolbar-auth-popup',
-            'popup=true,innerWidth=800,innerHeight=550,noopener=false'
-          );
-        }
-
         /**
-         * 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.
+         * This is called on pageload, and whenever login tokens are cleared.
+         * Pageload when the server has checked for auth, project validity, and
+         * domain config first, so we can trust a state that is elevated above logged-out
          */
-        function sendStateMessage(state) {
-          log('sendStateMessage(state)', { state });
-          window.parent.postMessage({
-            source: 'sentry-toolbar',
-            message: state
-          }, referrer);
+        function postStateMessage(state) {
+          log('parent.postMessage()', { state, referrerOrigin });
+          window.parent.postMessage({ source: 'sentry-toolbar', message: state }, referrerOrigin);
         }
 
-        function listenForLoginSuccess() {
-          window.addEventListener('message', messageEvent => {
-            if (messageEvent.origin !== document.location.origin || messageEvent.data.source !== 'sentry-toolbar') {
-              return;
-            }
-
-            log('window.onMessage', messageEvent.data, messageEvent);
-            if (messageEvent.data.message === 'did-login') {
-              saveAccessToken(messageEvent.data);
-              window.location.reload();
-            }
-          });
+        function handleLoginWindowMessage(messageEvent) {
+          handleWindowMessage(messageEvent, document.location.origin, loginWindowMessageDispatch);
         }
 
-        function getCookieValue(cookie) {
-          return `${cookie}; domain=${window.location.hostname}; path=/; max-age=31536000; SameSite=none; partitioned; secure`;
+        function handleParentWindowMessage(messageEvent) {
+          handleWindowMessage(messageEvent, referrerOrigin, parentWindowMessageDispatch);
         }
 
-        function saveAccessToken(data) {
-          log('saveAccessToken', data)
-          if (data.cookie) {
-            document.cookie = getCookieValue(data.cookie);
-            log('Saved a cookie', document.cookie.indexOf(data.cookie) >= 0);
-          }
-          if (data.token) {
-            localStorage.setItem('accessToken', data.token);
-            log('Saved an accessToken to localStorage');
+        function handleWindowMessage(messageEvent, requiredOrigin, dispatch) {
+          const isValidOrigin = messageEvent.origin === requiredOrigin;
+          if (!isValidOrigin) {
+            return;
           }
-          if (!data.cookie && !data.token) {
-            log('Unexpected: No access token found!');
+          log('window.onMessage', messageEvent);
+          const { message, source } = messageEvent.data;
+          if (source !== 'sentry-toolbar' || !message || !(Object.hasOwn(dispatch, message))) {
+            return;
           }
+          dispatch[message].call(undefined, messageEvent.data);
         }
 
-        function clearAuthn() {
-          document.cookie = getCookieValue(document.cookie.split('=').at(0) + '=');
-          log('Cleared the current cookie');
-          const accessToken = localStorage.removeItem('accessToken')
-          log('Removed accessToken from localStorage');
-
-          sendStateMessage('logged-out');
-        }
-
-        async function fetchProxy(url, init) {
-          // If we have an accessToken lets use it. Otherwise we presume a cookie will be set.
-          const accessToken = localStorage.getItem('accessToken');
-          const bearer = accessToken ? { 'Authorization': `Bearer ${accessToken}` } : {};
-
-          // If either of these is invalid, or both are missing, we will
-          // forward the resulting 401 to the application, which will request
-          // tokens be destroyed and reload the iframe in an unauth state.
-          log('Has access info', { cookie: Boolean(document.cookie), accessToken: Boolean(accessToken) });
-
-          const initWithCreds = {
-            ...init,
-            headers: { ...init.headers, ...bearer },
-            credentials: 'same-origin',
-          };
-          log({ initWithCreds });
-
-          const response = await fetch(url, initWithCreds);
-          return {
-            ok: response.ok,
-            status: response.status,
-            statusText: response.statusText,
-            url: response.url,
-            headers: Object.fromEntries(response.headers.entries()),
-            text: await response.text(),
-          };
-        }
-
-        function setupMessageChannel() {
+        function getMessagePort() {
           log('setupMessageChannel()');
           const { port1, port2 } = new MessageChannel();
 
-          const messageDispatch = {
-            'log': log,
-            'request-authn': requestAuthn,
-            'clear-authn': clearAuthn,
-            'fetch': fetchProxy,
-          };
-
-          port1.addEventListener('message', messageEvent => {
+          const handlePortMessage = (messageEvent) => {
             log('port.onMessage', messageEvent.data);
 
             const { $id, message } = messageEvent.data;
-            if (!$id) {
-              return; // MessageEvent is malformed, missing $id
-            }
-
-            if (!message.$function || !(Object.hasOwn(messageDispatch, message.$function))) {
-              return; // No-op without a $function to call
+            if (!$id || !message.$function || !(Object.hasOwn(postMessageDispatch, message.$function))) {
+              return;
             }
 
-            Promise.resolve(messageDispatch[message.$function]
+            Promise.resolve(postMessageDispatch[message.$function]
               .apply(undefined, message.$args || []))
               .then($result => port1.postMessage({ $id, $result }))
               .catch(error => port1.postMessage({ $id, $error: error }));
-          });
+          };
+
+          port1.addEventListener('message', handlePortMessage);
           port1.start();
 
-          window.parent.postMessage({
-            source: 'sentry-toolbar',
-            message: 'port-connect',
-          }, referrer, [port2]);
+          return port2;
+        }
 
-          log('Sent', { message: 'port-connect', referrer });
+        function getCookieValue(cookie, domain) {
+          return `${cookie}; domain=${domain}; path=/; max-age=31536000; SameSite=none; partitioned; secure`;
         }
 
-        log('Init', { referrer, state });
+        const loginWindowMessageDispatch = {
+          'did-login': ({ cookie, token }) => {
+            if (cookie) {
+              document.cookie = getCookieValue(cookie, window.location.hostname);
+              log('Saved a cookie', document.cookie.indexOf(cookie) >= 0);
+            }
+            if (token) {
+              localStorage.setItem('accessToken', token);
+              log('Saved an accessToken to localStorage');
+            }
+            if (!cookie && !token) {
+              log('Unexpected: No access token found!');
+            }
+
+            postStateMessage('stale');
+          },
+        };
+
+        const parentWindowMessageDispatch = {
+          'request-login': ({ delay_ms }) => {
+            const origin = window.location.origin.endsWith('.sentry.io')
+              ? 'https://sentry.io'
+              : window.location.origin;
+
+            window.open(
+              `${origin}/toolbar/${organizationSlug}/${projectIdOrSlug}/login-success/?delay=${delay_ms ?? '0'}`,
+              'sentry-toolbar-auth-popup',
+              'popup=true,innerWidth=800,innerHeight=550,noopener=false'
+            );
+            log('Opened /login-success/', { delay_ms });
+          },
+
+          'request-logout': () => {
+            const cookie = document.cookie.split('=').at(0) + '=';
+            document.cookie = getCookieValue(cookie, window.location.hostname);
+            document.cookie = getCookieValue(cookie, regionUrl);
+            log('Cleared the current cookie');
+
+            const accessToken = localStorage.removeItem('accessToken')
+            log('Removed accessToken from localStorage');
+
+            postStateMessage('stale');
+          },
+        };
+
+        const postMessageDispatch = {
+          'log': log,
+
+          'fetch': async (path, init) => {
+            // If we have an accessToken lets use it. Otherwise we presume a cookie will be set.
+            const accessToken = localStorage.getItem('accessToken');
+            const bearer = accessToken ? { 'Authorization': `Bearer ${accessToken}` } : {};
+
+            // If either of these is invalid, or both are missing, we will
+            // forward the resulting 401 to the application, which will request
+            // tokens be destroyed and reload the iframe in an unauth state.
+            log('Has access info', { cookie: Boolean(document.cookie), accessToken: Boolean(accessToken) });
+
+            const url = new URL('/api/0' + path, organizationUrl);
+            const initWithCreds = {
+              ...init,
+              headers: { ...init.headers, ...bearer },
+              credentials: 'include',
+            };
+            const response = await fetch(url, initWithCreds);
+            return {
+              ok: response.ok,
+              status: response.status,
+              statusText: response.statusText,
+              url: response.url,
+              headers: Object.fromEntries(response.headers.entries()),
+              text: await response.text(),
+            };
+          },
+        };
+
+        log('Init', { referrerOrigin, state });
+
+        if (state === 'logged-out') {
+          const cookie = document.cookie.split('=').at(0) + '=';
+          document.cookie = getCookieValue(cookie, window.location.hostname);
+          document.cookie = getCookieValue(cookie, regionUrl);
+        }
 
-        setupMessageChannel();
-        listenForLoginSuccess();
-        sendStateMessage(state);
+        window.addEventListener('message', handleLoginWindowMessage);
+        window.addEventListener('message', handleParentWindowMessage);
+        postStateMessage(state);
+
+        if (state === 'logged-in') {
+          const port = getMessagePort();
+          window.parent.postMessage({
+            source: 'sentry-toolbar',
+            message: 'port-connect',
+          }, referrerOrigin, [port]);
+          log('parent.postMessage()', { message: 'port-connect', referrerOrigin });
+        }
       })();
     </script>
     {% endscript %}
diff --git a/src/sentry/testutils/asserts.py b/src/sentry/testutils/asserts.py
index 062fd52e90a127..59b8c64e243235 100644
--- a/src/sentry/testutils/asserts.py
+++ b/src/sentry/testutils/asserts.py
@@ -55,14 +55,6 @@ def assert_org_audit_log_exists(**kwargs):
     assert org_audit_log_exists(**kwargs)
 
 
-def assert_org_audit_log_does_not_exist(**kwargs):
-    assert not org_audit_log_exists(**kwargs)
-
-
-def delete_all_org_audit_logs():
-    return AuditLogEntry.objects.all().delete()
-
-
 """
 Helper functions to assert integration SLO metrics
 """
@@ -93,3 +85,12 @@ def assert_success_metric(mock_record):
         call for call in mock_record.mock_calls if call.args[0] == EventLifecycleOutcome.SUCCESS
     )
     assert event_success
+
+
+def assert_slo_metric(
+    mock_record, event_outcome: EventLifecycleOutcome = EventLifecycleOutcome.SUCCESS
+):
+    assert len(mock_record.mock_calls) == 2
+    start, end = mock_record.mock_calls
+    assert start.args[0] == EventLifecycleOutcome.STARTED
+    assert end.args[0] == event_outcome
diff --git a/src/sentry/testutils/cases.py b/src/sentry/testutils/cases.py
index a5404c1e9d82a7..dee1be41de057b 100644
--- a/src/sentry/testutils/cases.py
+++ b/src/sentry/testutils/cases.py
@@ -27,14 +27,13 @@
 from django.contrib.auth.models import AnonymousUser
 from django.core import signing
 from django.core.cache import cache
-from django.db import DEFAULT_DB_ALIAS, connection, connections
+from django.db import connection, connections
 from django.db.migrations.executor import MigrationExecutor
 from django.http import HttpRequest
 from django.test import RequestFactory
 from django.test import TestCase as DjangoTestCase
 from django.test import TransactionTestCase as DjangoTransactionTestCase
 from django.test import override_settings
-from django.test.utils import CaptureQueriesContext
 from django.urls import resolve, reverse
 from django.utils import timezone
 from django.utils.functional import cached_property
@@ -90,11 +89,7 @@
 from sentry.models.commit import Commit
 from sentry.models.commitauthor import CommitAuthor
 from sentry.models.dashboard import Dashboard
-from sentry.models.dashboard_widget import (
-    DashboardWidget,
-    DashboardWidgetDisplayTypes,
-    DashboardWidgetQuery,
-)
+from sentry.models.dashboard_widget import DashboardWidget, DashboardWidgetDisplayTypes
 from sentry.models.deletedorganization import DeletedOrganization
 from sentry.models.deploy import Deploy
 from sentry.models.environment import Environment
@@ -118,7 +113,6 @@
 from sentry.projects.project_rules.creator import ProjectRuleCreator
 from sentry.replays.lib.event_linking import transform_event_for_linking_payload
 from sentry.replays.models import ReplayRecordingSegment
-from sentry.rules.base import RuleBase
 from sentry.search.events.constants import (
     METRIC_FRUSTRATED_TAG_VALUE,
     METRIC_SATISFACTION_TAG_KEY,
@@ -138,11 +132,10 @@
 from sentry.snuba.metrics.naming_layer.public import TransactionMetricKey
 from sentry.tagstore.snuba.backend import SnubaTagStorage
 from sentry.testutils.factories import get_fixture_path
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.helpers.notifications import TEST_ISSUE_OCCURRENCE
 from sentry.testutils.helpers.slack import install_slack
 from sentry.testutils.pytest.selenium import Browser
-from sentry.types.condition_activity import ConditionActivity, ConditionActivityType
 from sentry.users.models.identity import Identity, IdentityProvider, IdentityStatus
 from sentry.users.models.user import User
 from sentry.users.models.user_option import UserOption
@@ -168,7 +161,7 @@
 from .asserts import assert_status_code
 from .factories import Factories
 from .fixtures import Fixtures
-from .helpers import AuthProvider, Feature, TaskRunner, override_options, parse_queries
+from .helpers import AuthProvider, Feature, TaskRunner, override_options
 from .silo import assume_test_silo_mode
 from .skips import requires_snuba
 
@@ -215,11 +208,6 @@
 
 
 class BaseTestCase(Fixtures):
-    def assertRequiresAuthentication(self, path, method="GET"):
-        resp = getattr(self.client, method.lower())(path)
-        assert resp.status_code == 302
-        assert resp["Location"].startswith("http://testserver" + reverse("sentry-login"))
-
     @pytest.fixture(autouse=True)
     def setup_dummy_auth_provider(self):
         auth.register("dummy", DummyProvider)
@@ -431,18 +419,6 @@ def assert_valid_deleted_log(self, deleted_log, original_object):
         assert deleted_log.date_created == original_object.date_added
         assert deleted_log.date_deleted >= deleted_log.date_created
 
-    def assertWriteQueries(self, queries, debug=False, *args, **kwargs):
-        func = kwargs.pop("func", None)
-        using = kwargs.pop("using", DEFAULT_DB_ALIAS)
-        conn = connections[using]
-
-        context = _AssertQueriesContext(self, queries, debug, conn)
-        if func is None:
-            return context
-
-        with context:
-            func(*args, **kwargs)
-
     def get_mock_uuid(self):
         class uuid:
             hex = "abc123"
@@ -451,52 +427,6 @@ class uuid:
         return uuid
 
 
-class _AssertQueriesContext(CaptureQueriesContext):
-    def __init__(self, test_case, queries, debug, connection):
-        self.test_case = test_case
-        self.queries = queries
-        self.debug = debug
-        super().__init__(connection)
-
-    def __exit__(self, exc_type, exc_value, traceback):
-        super().__exit__(exc_type, exc_value, traceback)
-        if exc_type is not None:
-            return
-
-        parsed_queries = parse_queries(self.captured_queries)
-
-        if self.debug:
-            import pprint
-
-            pprint.pprint("====================== Raw Queries ======================")
-            pprint.pprint(self.captured_queries)
-            pprint.pprint("====================== Table writes ======================")
-            pprint.pprint(parsed_queries)
-
-        for table, num in parsed_queries.items():
-            expected = self.queries.get(table, 0)
-            if expected == 0:
-                import pprint
-
-                pprint.pprint(
-                    "WARNING: no query against %s emitted, add debug=True to see all the queries"
-                    % (table)
-                )
-            else:
-                self.test_case.assertTrue(
-                    num == expected,
-                    "%d write queries expected on `%s`, got %d, add debug=True to see all the queries"
-                    % (expected, table, num),
-                )
-
-        for table, num in self.queries.items():
-            executed = parsed_queries.get(table, None)
-            self.test_case.assertFalse(
-                executed is None,
-                "no query against %s emitted, add debug=True to see all the queries" % (table),
-            )
-
-
 @override_settings(ROOT_URLCONF="sentry.web.urls")
 class TestCase(BaseTestCase, DjangoTestCase):
     # We need Django to flush all databases.
@@ -952,24 +882,6 @@ def get_state(self, **kwargs):
         kwargs.setdefault("has_escalated", False)
         return EventState(**kwargs)
 
-    def get_condition_activity(self, **kwargs) -> ConditionActivity:
-        kwargs.setdefault("group_id", self.event.group.id)
-        kwargs.setdefault("type", ConditionActivityType.CREATE_ISSUE)
-        kwargs.setdefault("timestamp", self.event.datetime)
-        return ConditionActivity(**kwargs)
-
-    def passes_activity(
-        self,
-        rule: RuleBase,
-        condition_activity: ConditionActivity | None = None,
-        event_map: dict[str, Any] | None = None,
-    ):
-        if condition_activity is None:
-            condition_activity = self.get_condition_activity()
-        if event_map is None:
-            event_map = {}
-        return rule.passes_activity(condition_activity, event_map)
-
     def assertPasses(self, rule, event=None, **kwargs):
         if event is None:
             event = self.event
@@ -1026,33 +938,9 @@ def assert_member_can_access(self, path, **kwargs):
     def assert_manager_can_access(self, path, **kwargs):
         return self.assert_role_can_access(path, "manager", **kwargs)
 
-    def assert_teamless_member_can_access(self, path, **kwargs):
-        user = self.create_user(is_superuser=False)
-        self.create_member(user=user, organization=self.organization, role="member", teams=[])
-
-        self.assert_can_access(user, path, **kwargs)
-
     def assert_member_cannot_access(self, path, **kwargs):
         return self.assert_role_cannot_access(path, "member", **kwargs)
 
-    def assert_manager_cannot_access(self, path, **kwargs):
-        return self.assert_role_cannot_access(path, "manager", **kwargs)
-
-    def assert_teamless_member_cannot_access(self, path, **kwargs):
-        user = self.create_user(is_superuser=False)
-        self.create_member(user=user, organization=self.organization, role="member", teams=[])
-
-        self.assert_cannot_access(user, path, **kwargs)
-
-    def assert_team_admin_can_access(self, path, **kwargs):
-        return self.assert_role_can_access(path, "admin", **kwargs)
-
-    def assert_teamless_admin_can_access(self, path, **kwargs):
-        user = self.create_user(is_superuser=False)
-        self.create_member(user=user, organization=self.organization, role="admin", teams=[])
-
-        self.assert_can_access(user, path, **kwargs)
-
     def assert_team_admin_cannot_access(self, path, **kwargs):
         return self.assert_role_cannot_access(path, "admin", **kwargs)
 
@@ -1062,19 +950,9 @@ def assert_teamless_admin_cannot_access(self, path, **kwargs):
 
         self.assert_cannot_access(user, path, **kwargs)
 
-    def assert_team_owner_can_access(self, path, **kwargs):
-        return self.assert_role_can_access(path, "owner", **kwargs)
-
     def assert_owner_can_access(self, path, **kwargs):
         return self.assert_role_can_access(path, "owner", **kwargs)
 
-    def assert_owner_cannot_access(self, path, **kwargs):
-        return self.assert_role_cannot_access(path, "owner", **kwargs)
-
-    def assert_non_member_cannot_access(self, path, **kwargs):
-        user = self.create_user(is_superuser=False)
-        self.assert_cannot_access(user, path, **kwargs)
-
     def assert_role_can_access(self, path, role, **kwargs):
         user = self.create_user(is_superuser=False)
         self.create_member(user=user, organization=self.organization, role=role, teams=[self.team])
@@ -1253,20 +1131,6 @@ def setUp(self):
     def initialize(self, reset_snuba, call_snuba):
         self.call_snuba = call_snuba
 
-    @contextmanager
-    def disable_snuba_query_cache(self):
-        self.snuba_update_config({"use_readthrough_query_cache": 0, "use_cache": 0})
-        yield
-        self.snuba_update_config({"use_readthrough_query_cache": None, "use_cache": None})
-
-    @classmethod
-    def snuba_get_config(cls):
-        return _snuba_pool.request("GET", "/config.json").data
-
-    @classmethod
-    def snuba_update_config(cls, config_vals):
-        return _snuba_pool.request("POST", "/config.json", body=json.dumps(config_vals))
-
     def create_project(self, **kwargs) -> Project:
         if "flags" not in kwargs:
             # We insert events directly into snuba in tests, so we need to set has_transactions to True so the
@@ -1368,16 +1232,6 @@ def store_group(self, group):
             == 200
         )
 
-    def store_outcome(self, group):
-        data = [self.__wrap_group(group)]
-        assert (
-            requests.post(
-                settings.SENTRY_SNUBA + "/tests/entities/outcomes/insert",
-                data=json.dumps(data),
-            ).status_code
-            == 200
-        )
-
     def store_span(self, span, is_eap=False):
         span["ingest_in_eap"] = is_eap
         assert (
@@ -2272,7 +2126,7 @@ def create_event(self, timestamp, fingerprint=None, user=None):
         data = {
             "event_id": event_id,
             "fingerprint": [fingerprint],
-            "timestamp": iso_format(timestamp),
+            "timestamp": timestamp.isoformat(),
             "type": "error",
             # This is necessary because event type error should not exist without
             # an exception being in the payload
@@ -2677,32 +2531,6 @@ def do_request(self, method, url, data=None):
         func = getattr(self.client, method)
         return func(url, data=data)
 
-    def assert_widget_queries(self, widget_id, data):
-        result_queries = DashboardWidgetQuery.objects.filter(widget_id=widget_id).order_by("order")
-        for ds, expected_ds in zip(result_queries, data):
-            assert ds.name == expected_ds["name"]
-            assert ds.fields == expected_ds["fields"]
-            assert ds.conditions == expected_ds["conditions"]
-
-    def assert_widget(self, widget, order, title, display_type, queries=None):
-        assert widget.order == order
-        assert widget.display_type == display_type
-        assert widget.title == title
-
-        if not queries:
-            return
-
-        self.assert_widget_queries(widget.id, queries)
-
-    def assert_widget_data(self, data, title, display_type, queries=None):
-        assert data["displayType"] == display_type
-        assert data["title"] == title
-
-        if not queries:
-            return
-
-        self.assert_widget_queries(data["id"], queries)
-
     def assert_serialized_widget_query(self, data, widget_data_source):
         if "id" in data:
             assert data["id"] == str(widget_data_source.id)
@@ -2968,50 +2796,6 @@ def mock_chat_postMessage(self):
         ) as self.mock_post:
             yield
 
-    def assert_performance_issue_attachments(
-        self, attachment, project_slug, referrer, alert_type="workflow"
-    ):
-        assert "N+1 Query" in attachment["text"]
-        assert (
-            "db - SELECT `books_author`.`id`, `books_author`.`name` FROM `books_author` WHERE `books_author`.`id` = %s LIMIT 21"
-            in attachment["blocks"][1]["text"]["text"]
-        )
-        title_link = attachment["blocks"][0]["text"]["text"][13:][1:-1]
-        notification_uuid = self.get_notification_uuid(title_link)
-        assert (
-            attachment["blocks"][-2]["elements"][0]["text"]
-            == f"{project_slug} | production | <http://testserver/settings/account/notifications/{alert_type}/?referrer={referrer}&notification_uuid={notification_uuid}|Notification Settings>"
-        )
-
-    def assert_performance_issue_blocks(
-        self,
-        blocks,
-        org: Organization,
-        project_slug: str,
-        group,
-        referrer,
-        alert_type: FineTuningAPIKey = FineTuningAPIKey.WORKFLOW,
-        issue_link_extra_params=None,
-    ):
-        notification_uuid = self.get_notification_uuid(blocks[1]["text"]["text"])
-        issue_link = f"http://testserver/organizations/{org.slug}/issues/{group.id}/?referrer={referrer}&notification_uuid={notification_uuid}"
-        if issue_link_extra_params is not None:
-            issue_link += issue_link_extra_params
-        assert (
-            blocks[1]["text"]["text"]
-            == f":large_blue_circle: :chart_with_upwards_trend: <{issue_link}|*N+1 Query*>"
-        )
-        assert (
-            blocks[2]["text"]["text"]
-            == "```db - SELECT `books_author`.`id`, `books_author`.`name` FROM `books_author` WHERE `books_author`.`id` = %s LIMIT 21```"
-        )
-        assert blocks[3]["elements"][0]["text"] == "State: *New*   First Seen: *10\xa0minutes ago*"
-        optional_org_id = f"&organizationId={org.id}" if alert_page_needs_org_id(alert_type) else ""
-        assert (
-            blocks[4]["elements"][0]["text"]
-            == f"{project_slug} | production | <http://testserver/settings/account/notifications/{alert_type}/?referrer={referrer}-user&notification_uuid={notification_uuid}{optional_org_id}|Notification Settings>"
-        )
-
     def assert_performance_issue_blocks_with_culprit_blocks(
         self,
         blocks,
@@ -3042,17 +2826,6 @@ def assert_performance_issue_blocks_with_culprit_blocks(
             == f"{project_slug} | production | <http://testserver/settings/account/notifications/{alert_type}/?referrer={referrer}-user&notification_uuid={notification_uuid}{optional_org_id}|Notification Settings>"
         )
 
-    def assert_generic_issue_attachments(
-        self, attachment, project_slug, referrer, alert_type="workflow"
-    ):
-        assert attachment["title"] == TEST_ISSUE_OCCURRENCE.issue_title
-        assert attachment["text"] == TEST_ISSUE_OCCURRENCE.evidence_display[0].value
-        notification_uuid = self.get_notification_uuid(attachment["title_link"])
-        assert (
-            attachment["footer"]
-            == f"{project_slug} | <http://testserver/settings/account/notifications/{alert_type}/?referrer={referrer}&notification_uuid={notification_uuid}|Notification Settings>"
-        )
-
     def assert_generic_issue_blocks(
         self,
         blocks,
@@ -3615,7 +3388,7 @@ def load_default(self) -> Event:
         start, _ = self.get_start_end_from_day_ago(1000)
         return self.store_event(
             {
-                "timestamp": iso_format(start),
+                "timestamp": start.isoformat(),
                 "contexts": {
                     "trace": {
                         "type": "trace",
diff --git a/src/sentry/testutils/factories.py b/src/sentry/testutils/factories.py
index 96f402a651f2cc..96f198c52f59fa 100644
--- a/src/sentry/testutils/factories.py
+++ b/src/sentry/testutils/factories.py
@@ -146,6 +146,8 @@
 from sentry.silo.base import SiloMode
 from sentry.snuba.dataset import Dataset
 from sentry.snuba.models import QuerySubscription, QuerySubscriptionDataSourceHandler
+from sentry.tempest.models import MessageType as TempestMessageType
+from sentry.tempest.models import TempestCredentials
 from sentry.testutils.outbox import outbox_runner
 from sentry.testutils.silo import assume_test_silo_mode
 from sentry.types.activity import ActivityType
@@ -158,6 +160,7 @@
     ProjectUptimeSubscriptionMode,
     UptimeStatus,
     UptimeSubscription,
+    UptimeSubscriptionRegion,
 )
 from sentry.users.models.identity import Identity, IdentityProvider, IdentityStatus
 from sentry.users.models.user import User
@@ -604,6 +607,34 @@ def create_slack_project_rule(project, integration_id, channel_id=None, channel_
     def create_project_key(project):
         return project.key_set.get_or_create()[0]
 
+    @staticmethod
+    @assume_test_silo_mode(SiloMode.REGION)
+    def create_tempest_credentials(
+        project: Project,
+        created_by: User | None = None,
+        client_id: str | None = None,
+        client_secret: str | None = None,
+        message: str = "",
+        message_type: str | None = None,
+        latest_fetched_item_id: str | None = None,
+    ):
+        if client_id is None:
+            client_id = str(uuid4())
+        if client_secret is None:
+            client_secret = str(uuid4())
+        if message_type is None:
+            message_type = TempestMessageType.ERROR
+
+        return TempestCredentials.objects.create(
+            project=project,
+            created_by_id=created_by.id if created_by else None,
+            client_id=client_id,
+            client_secret=client_secret,
+            message=message,
+            message_type=message_type,
+            latest_fetched_item_id=latest_fetched_item_id,
+        )
+
     @staticmethod
     @assume_test_silo_mode(SiloMode.REGION)
     def create_release(
@@ -1003,6 +1034,9 @@ def store_event(
     @staticmethod
     @assume_test_silo_mode(SiloMode.REGION)
     def create_group(project, **kwargs):
+        from sentry.models.group import GroupStatus
+        from sentry.types.group import GroupSubStatus
+
         kwargs.setdefault("message", "Hello world")
         kwargs.setdefault("data", {})
         if "type" not in kwargs["data"]:
@@ -1012,6 +1046,10 @@ def create_group(project, **kwargs):
         if "metadata" in kwargs:
             metadata = kwargs.pop("metadata")
             kwargs["data"].setdefault("metadata", {}).update(metadata)
+        if "status" not in kwargs:
+            kwargs["status"] = GroupStatus.UNRESOLVED
+            kwargs["substatus"] = GroupSubStatus.NEW
+
         return Group.objects.create(project=project, **kwargs)
 
     @staticmethod
@@ -1945,7 +1983,7 @@ def create_uptime_subscription(
         type: str,
         subscription_id: str | None,
         status: UptimeSubscription.Status,
-        url: str,
+        url: str | None,
         url_domain: str,
         url_domain_suffix: str,
         host_provider_id: str,
@@ -1957,6 +1995,10 @@ def create_uptime_subscription(
         date_updated: datetime,
         trace_sampling: bool = False,
     ):
+        if url is None:
+            url = petname.generate().title()
+            url = f"http://{url}.com"
+
         return UptimeSubscription.objects.create(
             type=type,
             subscription_id=subscription_id,
@@ -1980,10 +2022,12 @@ def create_project_uptime_subscription(
         env: Environment | None,
         uptime_subscription: UptimeSubscription,
         mode: ProjectUptimeSubscriptionMode,
-        name: str,
+        name: str | None,
         owner: Actor | None,
         uptime_status: UptimeStatus,
     ):
+        if name is None:
+            name = petname.generate().title()
         owner_team_id = None
         owner_user_id = None
         if owner:
@@ -2003,6 +2047,14 @@ def create_project_uptime_subscription(
             uptime_status=uptime_status,
         )
 
+    @staticmethod
+    def create_uptime_subscription_region(
+        subscription: UptimeSubscription, region_slug: str
+    ) -> UptimeSubscriptionRegion:
+        return UptimeSubscriptionRegion.objects.create(
+            uptime_subscription=subscription, region_slug=region_slug
+        )
+
     @staticmethod
     @assume_test_silo_mode(SiloMode.REGION)
     def create_dashboard(
@@ -2061,13 +2113,18 @@ def create_dashboard_widget_query(
     def create_workflow(
         name: str | None = None,
         organization: Organization | None = None,
+        config: dict[str, Any] | None = None,
         **kwargs,
     ) -> Workflow:
         if organization is None:
             organization = Factories.create_organization()
         if name is None:
             name = petname.generate(2, " ", letters=10).title()
-        return Workflow.objects.create(organization=organization, name=name, **kwargs)
+        if config is None:
+            config = {}
+        return Workflow.objects.create(
+            organization=organization, name=name, config=config, **kwargs
+        )
 
     @staticmethod
     @assume_test_silo_mode(SiloMode.REGION)
diff --git a/src/sentry/testutils/fixtures.py b/src/sentry/testutils/fixtures.py
index bff1a03aa1ec3b..6c6b2c535c750a 100644
--- a/src/sentry/testutils/fixtures.py
+++ b/src/sentry/testutils/fixtures.py
@@ -12,6 +12,7 @@
 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.issues.grouptype import ErrorGroupType
 from sentry.models.activity import Activity
 from sentry.models.environment import Environment
 from sentry.models.grouprelease import GroupRelease
@@ -26,8 +27,9 @@
 from sentry.organizations.services.organization import RpcOrganization
 from sentry.silo.base import SiloMode
 from sentry.snuba.models import QuerySubscription
+from sentry.tempest.models import TempestCredentials
 from sentry.testutils.factories import Factories
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.silo import assume_test_silo_mode
 
 # XXX(dcramer): this is a compatibility layer to transition to pytest-based fixtures
@@ -45,6 +47,7 @@
 from sentry.users.models.user import User
 from sentry.users.services.user import RpcUser
 from sentry.workflow_engine.models import DataSource, Detector, DetectorState, Workflow
+from sentry.workflow_engine.models.data_condition import Condition
 from sentry.workflow_engine.types import DetectorPriorityLevel
 
 
@@ -101,7 +104,7 @@ def event(self):
             data={
                 "event_id": "a" * 32,
                 "message": "\u3053\u3093\u306b\u3061\u306f",
-                "timestamp": iso_format(before_now(seconds=1)),
+                "timestamp": before_now(seconds=1).isoformat(),
             },
             project_id=self.project.id,
         )
@@ -126,7 +129,7 @@ def integration(self):
             external_id="github:1",
             metadata={
                 "access_token": "xxxxx-xxxxxxxxx-xxxxxxxxxx-xxxxxxxxxxxx",
-                "expires_at": iso_format(timezone.now() + timedelta(days=14)),
+                "expires_at": (timezone.now() + timedelta(days=14)).isoformat(),
             },
         )
         integration.add_organization(self.organization, self.user)
@@ -279,6 +282,9 @@ def create_usersocialauth(
     def store_event(self, *args, **kwargs) -> Event:
         return Factories.store_event(*args, **kwargs)
 
+    def create_tempest_credentials(self, project: Project, *args, **kwargs) -> TempestCredentials:
+        return Factories.create_tempest_credentials(project, *args, **kwargs)
+
     def create_group(self, project=None, *args, **kwargs):
         if project is None:
             project = self.project
@@ -610,9 +616,8 @@ def create_data_source(self, *args, **kwargs) -> DataSource:
 
     def create_data_condition(
         self,
-        condition="eq",
         comparison="10",
-        type="",
+        type=Condition.EQUAL,
         condition_result=None,
         condition_group=None,
         **kwargs,
@@ -623,7 +628,6 @@ def create_data_condition(
             condition_group = self.create_data_condition_group()
 
         return Factories.create_data_condition(
-            condition=condition,
             comparison=comparison,
             type=type,
             condition_result=condition_result,
@@ -635,12 +639,13 @@ def create_detector(
         self,
         *args,
         project=None,
+        type=ErrorGroupType.slug,
         **kwargs,
     ) -> Detector:
         if project is None:
             project = self.create_project(organization=self.organization)
 
-        return Factories.create_detector(*args, project=project, **kwargs)
+        return Factories.create_detector(*args, project=project, type=type, **kwargs)
 
     def create_detector_state(self, *args, **kwargs) -> DetectorState:
         return Factories.create_detector_state(*args, **kwargs)
@@ -672,7 +677,7 @@ def create_uptime_subscription(
         type: str = "test",
         subscription_id: str | None = None,
         status: UptimeSubscription.Status = UptimeSubscription.Status.ACTIVE,
-        url="http://sentry.io/",
+        url: str | None = None,
         host_provider_id="TEST",
         url_domain="sentry",
         url_domain_suffix="io",
@@ -683,13 +688,16 @@ def create_uptime_subscription(
         body=None,
         date_updated: None | datetime = None,
         trace_sampling: bool = False,
+        region_slugs: list[str] | None = None,
     ) -> UptimeSubscription:
         if date_updated is None:
             date_updated = timezone.now()
         if headers is None:
             headers = []
+        if region_slugs is None:
+            region_slugs = []
 
-        return Factories.create_uptime_subscription(
+        subscription = Factories.create_uptime_subscription(
             type=type,
             subscription_id=subscription_id,
             status=status,
@@ -705,6 +713,10 @@ def create_uptime_subscription(
             body=body,
             trace_sampling=trace_sampling,
         )
+        for region_slug in region_slugs:
+            Factories.create_uptime_subscription_region(subscription, region_slug)
+
+        return subscription
 
     def create_project_uptime_subscription(
         self,
@@ -712,7 +724,7 @@ def create_project_uptime_subscription(
         env: Environment | None = None,
         uptime_subscription: UptimeSubscription | None = None,
         mode=ProjectUptimeSubscriptionMode.AUTO_DETECTED_ACTIVE,
-        name="Test Name",
+        name: str | None = None,
         owner: User | Team | None = None,
         uptime_status=UptimeStatus.OK,
     ) -> ProjectUptimeSubscription:
diff --git a/src/sentry/testutils/helpers/__init__.py b/src/sentry/testutils/helpers/__init__.py
index 215689798ba602..1e69c4a8f87230 100644
--- a/src/sentry/testutils/helpers/__init__.py
+++ b/src/sentry/testutils/helpers/__init__.py
@@ -3,7 +3,6 @@
 from .features import *  # NOQA
 from .link_header import *  # NOQA
 from .options import *  # NOQA
-from .query import *  # NOQA
 from .slack import *  # NOQA
 from .socket import *  # NOQA
 from .task_runner import *  # NOQA
diff --git a/src/sentry/testutils/helpers/backups.py b/src/sentry/testutils/helpers/backups.py
index 76c8c2f48a1585..504ea3bf0a1634 100644
--- a/src/sentry/testutils/helpers/backups.py
+++ b/src/sentry/testutils/helpers/backups.py
@@ -101,6 +101,7 @@
 from sentry.sentry_apps.models.sentry_app import SentryApp
 from sentry.silo.base import SiloMode
 from sentry.silo.safety import unguarded_write
+from sentry.tempest.models import TempestCredentials
 from sentry.testutils.cases import TestCase, TransactionTestCase
 from sentry.testutils.factories import get_fixture_path
 from sentry.testutils.fixtures import Fixtures
@@ -667,18 +668,15 @@ 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.SLACK, data="")
         self.create_data_condition_group_action(
             action=send_notification_action,
             condition_group=notification_condition_group,
         )
 
-        # TODO @saponifi3d: Update comparison to be DetectorState.Critical
         data_condition = self.create_data_condition(
-            condition="eq",
-            comparison="critical",
-            type="WorkflowCondition",
-            condition_result="True",
+            comparison=75,
+            condition_result=True,
             condition_group=notification_condition_group,
         )
 
@@ -694,16 +692,13 @@ def create_exhaustive_organization(
             organization=org,
         )
 
-        # TODO @saponifi3d: Create or define trigger workflow action type
         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
         )
         self.create_data_condition(
-            condition="eq",
-            comparison="critical",
-            type="DetectorCondition",
-            condition_result="True",
+            comparison=75,
+            condition_result=True,
             condition_group=detector_conditions,
         )
         detector.workflow_condition_group = detector_conditions
@@ -714,6 +709,15 @@ def create_exhaustive_organization(
             alert_rule_trigger=trigger, data_condition=data_condition
         )
 
+        TempestCredentials.objects.create(
+            project=project,
+            created_by_id=owner_id,
+            client_id="test_client_id",
+            client_secret="test_client_secret",
+            message="test_message",
+            latest_fetched_item_id="test_latest_fetched_item_id",
+        )
+
         return org
 
     @assume_test_silo_mode(SiloMode.CONTROL)
diff --git a/src/sentry/testutils/helpers/datetime.py b/src/sentry/testutils/helpers/datetime.py
index da1af95d8c5c51..206634b893e024 100644
--- a/src/sentry/testutils/helpers/datetime.py
+++ b/src/sentry/testutils/helpers/datetime.py
@@ -1,15 +1,10 @@
 from __future__ import annotations
 
-import time
 from datetime import UTC, datetime, timedelta
 
 import time_machine
 
-__all__ = ["iso_format", "before_now", "timestamp_format"]
-
-
-def iso_format(date: datetime) -> str:
-    return date.isoformat()[:19]
+__all__ = ["before_now"]
 
 
 def before_now(**kwargs: float) -> datetime:
@@ -17,10 +12,6 @@ def before_now(**kwargs: float) -> datetime:
     return date - timedelta(microseconds=date.microsecond % 1000)
 
 
-def timestamp_format(datetime):
-    return time.mktime(datetime.utctimetuple()) + datetime.microsecond / 1e6
-
-
 class MockClock:
     """Returns a distinct, increasing timestamp each time it is called."""
 
diff --git a/src/sentry/testutils/helpers/query.py b/src/sentry/testutils/helpers/query.py
deleted file mode 100644
index d9e8e9759e3ebb..00000000000000
--- a/src/sentry/testutils/helpers/query.py
+++ /dev/null
@@ -1,30 +0,0 @@
-from __future__ import annotations
-
-from typing import Any
-
-import sqlparse
-from sqlparse.tokens import DML
-
-__all__ = ("parse_queries",)
-
-
-def parse_queries(captured_queries: list[dict[str, Any]]) -> dict[str, int]:
-    write_ops = ["INSERT", "UPDATE", "DELETE"]
-
-    real_queries: dict[str, int] = {}
-
-    for query in captured_queries:
-        raw_sql = query["sql"]
-        parsed = sqlparse.parse(raw_sql)
-        for token_index, token in enumerate(parsed[0].tokens):
-            if token.ttype is DML:
-                if token.value.upper() in write_ops:
-                    for t in parsed[0].tokens[token_index + 1 :]:
-                        if isinstance(t, sqlparse.sql.Identifier):
-                            table_name = t.get_real_name()
-                            if real_queries.get(table_name) is None:
-                                real_queries[table_name] = 0
-                            real_queries[table_name] += 1
-                            break
-
-    return real_queries
diff --git a/src/sentry/testutils/helpers/redis.py b/src/sentry/testutils/helpers/redis.py
index dd41b06dfd4e67..9e4bdc0303c5be 100644
--- a/src/sentry/testutils/helpers/redis.py
+++ b/src/sentry/testutils/helpers/redis.py
@@ -9,11 +9,8 @@
 from sentry.testutils.helpers import override_options
 
 
-@contextmanager
 def mock_redis_buffer():
-    buffer = RedisBuffer()
-    with patch("sentry.buffer.backend", new=buffer):
-        yield buffer
+    return patch("sentry.buffer.backend", new=RedisBuffer())
 
 
 @contextmanager
diff --git a/src/sentry/testutils/helpers/slack.py b/src/sentry/testutils/helpers/slack.py
index 000a0155d50827..bb5d3458c242c0 100644
--- a/src/sentry/testutils/helpers/slack.py
+++ b/src/sentry/testutils/helpers/slack.py
@@ -57,17 +57,6 @@ def add_identity(
     return idp
 
 
-def find_identity(idp: IdentityProvider, user: User) -> Identity | None:
-    identities = Identity.objects.filter(
-        idp=idp,
-        user=user,
-        status=IdentityStatus.VALID,
-    )
-    if not identities:
-        return None
-    return identities[0]
-
-
 @assume_test_silo_mode(SiloMode.CONTROL)
 def link_user(user: User, idp: IdentityProvider, slack_id: str) -> None:
     Identity.objects.create(
diff --git a/src/sentry/testutils/pytest/relay.py b/src/sentry/testutils/pytest/relay.py
index 76dff65c2da813..5bff85dcf2cd53 100644
--- a/src/sentry/testutils/pytest/relay.py
+++ b/src/sentry/testutils/pytest/relay.py
@@ -69,6 +69,7 @@ def relay_server_setup(live_server, tmpdir_factory):
     relay_port = 33331
 
     redis_db = TEST_REDIS_DB
+    use_new_dev_services = environ.get("USE_NEW_DEVSERVICES", "0") == "1"
     from sentry.relay import projectconfig_cache
     from sentry.relay.projectconfig_cache.redis import RedisProjectConfigCache
 
@@ -80,8 +81,8 @@ def relay_server_setup(live_server, tmpdir_factory):
     template_vars = {
         "SENTRY_HOST": f"http://host.docker.internal:{port}/",
         "RELAY_PORT": relay_port,
-        "KAFKA_HOST": "sentry_kafka",
-        "REDIS_HOST": "sentry_redis",
+        "KAFKA_HOST": "kafka-kafka-1" if use_new_dev_services else "sentry_kafka",
+        "REDIS_HOST": "redis-redis-1" if use_new_dev_services else "sentry_redis",
         "REDIS_DB": redis_db,
     }
 
@@ -106,7 +107,7 @@ def relay_server_setup(live_server, tmpdir_factory):
     options = {
         "image": RELAY_TEST_IMAGE,
         "ports": {"%s/tcp" % relay_port: relay_port},
-        "network": "sentry",
+        "network": "devservices" if use_new_dev_services else "sentry",
         "detach": True,
         "name": container_name,
         "volumes": {config_path: {"bind": "/etc/relay"}},
diff --git a/src/sentry/testutils/relay.py b/src/sentry/testutils/relay.py
index 793e69a9207d80..25232a63af448e 100644
--- a/src/sentry/testutils/relay.py
+++ b/src/sentry/testutils/relay.py
@@ -35,9 +35,6 @@ class RelayStoreHelper(RequiredBaseclass):
     get_relay_minidump_url: Any
     get_relay_unreal_url: Any
 
-    def use_relay(self):
-        return True
-
     def post_and_retrieve_event(self, data):
         url = self.get_relay_store_url(self.project.id)
         responses.add_passthru(url)
diff --git a/src/sentry/testutils/requests.py b/src/sentry/testutils/requests.py
index a7adf1f9ce4b0e..4ce41b0355d860 100644
--- a/src/sentry/testutils/requests.py
+++ b/src/sentry/testutils/requests.py
@@ -7,6 +7,8 @@
 from django.contrib.auth.models import AnonymousUser
 from django.core.cache import cache
 from django.http import HttpRequest
+from rest_framework.request import Request
+from rest_framework.views import APIView
 
 from sentry.app import env
 from sentry.middleware.auth import AuthenticationMiddleware
@@ -67,3 +69,13 @@ def make_user_request_from_org(org=None):
     request, user = make_user_request(org)
     request.session["activeorg"] = org.slug
     return request, user
+
+
+def drf_request_from_request(request: HttpRequest) -> Request:
+    ret = APIView().initialize_request(request)
+    # reattach these if missing
+    # XXX: technically `HttpRequest` shouldn't have auth but our tests do!)
+    for attr in ("auth", "user"):
+        if hasattr(request, attr):
+            setattr(ret, attr, getattr(request, attr))
+    return ret
diff --git a/src/sentry/testutils/skips.py b/src/sentry/testutils/skips.py
index 6937880a079417..d77514e19231e9 100644
--- a/src/sentry/testutils/skips.py
+++ b/src/sentry/testutils/skips.py
@@ -1,50 +1,11 @@
 from __future__ import annotations
 
-import os
 import socket
-from collections.abc import Callable
-from typing import Any, TypeVar
 from urllib.parse import urlparse
 
 import pytest
 from django.conf import settings
 
-T = TypeVar("T", bound=Callable[..., Any])
-
-
-def is_arm64() -> bool:
-    return os.uname().machine == "arm64"
-
-
-requires_not_arm64 = pytest.mark.skipif(
-    is_arm64(), reason="this test fails in our arm64 testing env"
-)
-
-
-def xfail_if_not_postgres(reason: str) -> Callable[[T], T]:
-    def decorator(function: T) -> T:
-        return pytest.mark.xfail(os.environ.get("TEST_SUITE") != "postgres", reason=reason)(
-            function
-        )
-
-    return decorator
-
-
-def skip_for_relay_store(reason: str) -> Callable[[T], T]:
-    """
-    Decorator factory will skip marked tests if Relay is enabled.
-    A test decorated with @skip_for_relay_store("this test has been moved in relay")
-    Will not be executed when the settings SENTRY_USE_RELAY = True
-    :param reason: the reason the test should be skipped
-
-    Note: Eventually, when Relay becomes compulsory, tests marked with this decorator will be deleted.
-    """
-
-    def decorator(function: T) -> T:
-        return pytest.mark.skipif(settings.SENTRY_USE_RELAY, reason=reason)(function)
-
-    return decorator
-
 
 def _service_available(host: str, port: int) -> bool:
     try:
diff --git a/src/sentry/toolbar/views/iframe_view.py b/src/sentry/toolbar/views/iframe_view.py
index 58abcb5439cff1..a73af6dfb9a90d 100644
--- a/src/sentry/toolbar/views/iframe_view.py
+++ b/src/sentry/toolbar/views/iframe_view.py
@@ -3,8 +3,10 @@
 from django.http import HttpRequest, HttpResponse
 from django.http.response import HttpResponseBase
 
+from sentry.api.utils import generate_region_url
 from sentry.models.organization import Organization
 from sentry.models.project import Project
+from sentry.organizations.absolute_url import generate_organization_url
 from sentry.toolbar.utils.url import is_origin_allowed
 from sentry.web.frontend.base import ProjectView, region_silo_view
 
@@ -61,6 +63,8 @@ def _respond_with_state(self, state: str):
                 "logging": self.request.GET.get("logging", ""),
                 "organization_slug": self.organization_slug,
                 "project_id_or_slug": self.project_id_or_slug,
+                "organization_url": generate_organization_url(self.organization_slug),
+                "region_url": generate_region_url(),
             },
         )
 
diff --git a/src/sentry/types/activity.py b/src/sentry/types/activity.py
index e850e61e854b47..1dd4a3c2373ad7 100644
--- a/src/sentry/types/activity.py
+++ b/src/sentry/types/activity.py
@@ -67,3 +67,16 @@ class ActivityType(Enum):
         ActivityType.DELETED_ATTACHMENT,  # 27
     ]
 )
+
+
+STATUS_CHANGE_ACTIVITY_TYPES = (
+    ActivityType.SET_RESOLVED,
+    ActivityType.SET_UNRESOLVED,
+    ActivityType.SET_IGNORED,
+    ActivityType.SET_REGRESSION,
+    ActivityType.SET_RESOLVED_IN_RELEASE,
+    ActivityType.SET_RESOLVED_BY_AGE,
+    ActivityType.SET_RESOLVED_IN_COMMIT,
+    ActivityType.SET_RESOLVED_IN_PULL_REQUEST,
+    ActivityType.SET_ESCALATING,
+)
diff --git a/src/sentry/uptime/config_producer.py b/src/sentry/uptime/config_producer.py
index 90ea85cc65e486..dbf486fa188cf1 100644
--- a/src/sentry/uptime/config_producer.py
+++ b/src/sentry/uptime/config_producer.py
@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import logging
 from uuid import UUID
 
 from arroyo import Topic as ArroyoTopic
@@ -8,9 +9,12 @@
 from sentry_kafka_schemas.schema_types.uptime_configs_v1 import CheckConfig
 
 from sentry.conf.types.kafka_definition import Topic, get_topic_codec
+from sentry.uptime.subscriptions.regions import get_region_config
 from sentry.utils.arroyo_producer import SingletonProducer
 from sentry.utils.kafka_config import get_kafka_producer_cluster_options, get_topic_definition
 
+logger = logging.getLogger(__name__)
+
 UPTIME_CONFIGS_CODEC: Codec[CheckConfig] = get_topic_codec(Topic.UPTIME_CONFIGS)
 
 
@@ -25,16 +29,30 @@ def _get_producer() -> KafkaProducer:
 _configs_producer = SingletonProducer(_get_producer)
 
 
-def produce_config(config: CheckConfig):
-    _produce_to_kafka(UUID(config["subscription_id"]), UPTIME_CONFIGS_CODEC.encode(config))
+def produce_config(destination_region_slug: str, config: CheckConfig):
+    _produce_to_kafka(
+        destination_region_slug,
+        UUID(config["subscription_id"]),
+        UPTIME_CONFIGS_CODEC.encode(config),
+    )
+
 
+def produce_config_removal(destination_region_slug: str, subscription_id: str):
+    _produce_to_kafka(destination_region_slug, UUID(subscription_id), None)
 
-def produce_config_removal(subscription_id: str):
-    _produce_to_kafka(UUID(subscription_id), None)
 
+def _produce_to_kafka(
+    destination_region_slug: str, subscription_id: UUID, value: bytes | None
+) -> None:
+    region_config = get_region_config(destination_region_slug)
+    if region_config is None:
+        logger.error(
+            "Attempted to create uptime subscription with invalid region slug",
+            extra={"region_slug": destination_region_slug, "subscription_id": subscription_id},
+        )
+        return
 
-def _produce_to_kafka(subscription_id: UUID, value: bytes | None) -> None:
-    topic = get_topic_definition(Topic.UPTIME_CONFIGS)["real_topic_name"]
+    topic = get_topic_definition(region_config.config_topic)["real_topic_name"]
     payload = KafkaPayload(
         subscription_id.bytes,
         # Typically None is not allowed for the arroyo payload, but in this
diff --git a/src/sentry/uptime/consumers/results_consumer.py b/src/sentry/uptime/consumers/results_consumer.py
index 7af6259ddacd85..87be1361ae67cb 100644
--- a/src/sentry/uptime/consumers/results_consumer.py
+++ b/src/sentry/uptime/consumers/results_consumer.py
@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import logging
+import random
 from datetime import datetime, timedelta, timezone
 
 from sentry_kafka_schemas.schema_types.uptime_results_v1 import (
@@ -24,13 +25,18 @@
     ProjectUptimeSubscriptionMode,
     UptimeStatus,
     UptimeSubscription,
+    UptimeSubscriptionRegion,
 )
+from sentry.uptime.subscriptions.regions import get_active_region_configs
 from sentry.uptime.subscriptions.subscriptions import (
     delete_uptime_subscriptions_for_project,
     get_or_create_uptime_subscription,
     remove_uptime_subscription_if_unused,
 )
-from sentry.uptime.subscriptions.tasks import send_uptime_config_deletion
+from sentry.uptime.subscriptions.tasks import (
+    send_uptime_config_deletion,
+    update_remote_uptime_subscription,
+)
 from sentry.utils import metrics
 
 logger = logging.getLogger(__name__)
@@ -73,16 +79,64 @@ class UptimeResultProcessor(ResultProcessor[CheckResult, UptimeSubscription]):
     def get_subscription_id(self, result: CheckResult) -> str:
         return result["subscription_id"]
 
+    def check_and_update_regions(self, subscription: UptimeSubscription):
+        """
+        This method will check if regions have been added or removed from our region configuration,
+        and updates regions associated with this uptime monitor to reflect the new state. This is
+        done probabilistically, so that the check is performed roughly once an hour for each uptime
+        monitor.
+        """
+        # Run region checks and updates roughly once an hour
+        chance_to_run = subscription.interval_seconds / timedelta(hours=1).total_seconds()
+        if random.random() >= chance_to_run:
+            return
+
+        subscription_region_slugs = {r.region_slug for r in subscription.regions.all()}
+        active_region_slugs = {c.slug for c in get_active_region_configs()}
+        if subscription_region_slugs == active_region_slugs:
+            # Regions haven't changed, exit early.
+            return
+
+        new_region_slugs = active_region_slugs - subscription_region_slugs
+        removed_region_slugs = subscription_region_slugs - active_region_slugs
+        if new_region_slugs:
+            new_regions = [
+                UptimeSubscriptionRegion(uptime_subscription=subscription, region_slug=slug)
+                for slug in new_region_slugs
+            ]
+            UptimeSubscriptionRegion.objects.bulk_create(new_regions, ignore_conflicts=True)
+
+        if removed_region_slugs:
+            for deleted_region in UptimeSubscriptionRegion.objects.filter(
+                uptime_subscription=subscription, region_slug__in=removed_region_slugs
+            ):
+                if subscription.subscription_id:
+                    # We need to explicitly send deletes here before we remove the region
+                    send_uptime_config_deletion(
+                        deleted_region.region_slug, subscription.subscription_id
+                    )
+                deleted_region.delete()
+
+        # Regardless of whether we added or removed regions, we need to send an updated config to all active
+        # regions for this subscription so that they all get an update set of currently active regions.
+        subscription.update(status=UptimeSubscription.Status.UPDATING.value)
+        update_remote_uptime_subscription.delay(subscription.id)
+
     def handle_result(self, subscription: UptimeSubscription | None, result: CheckResult):
         logger.info("process_result", extra=result)
 
         if subscription is None:
             # If no subscription in the Postgres, this subscription has been orphaned. Remove
             # from the checker
-            send_uptime_config_deletion(result["subscription_id"])
+            # TODO: Send to region specifically from this check result once we update the schema
+            send_uptime_config_deletion(
+                get_active_region_configs()[0].slug, result["subscription_id"]
+            )
             metrics.incr("uptime.result_processor.subscription_not_found", sample_rate=1.0)
             return
 
+        self.check_and_update_regions(subscription)
+
         project_subscriptions = list(subscription.projectuptimesubscription_set.all())
 
         cluster = _get_cluster()
@@ -333,3 +387,7 @@ def has_reached_status_threshold(
 class UptimeResultsStrategyFactory(ResultsStrategyFactory[CheckResult, UptimeSubscription]):
     result_processor_cls = UptimeResultProcessor
     topic_for_codec = Topic.UPTIME_RESULTS
+    identifier = "uptime"
+
+    def build_payload_grouping_key(self, result: CheckResult) -> str:
+        return self.result_processor.get_subscription_id(result)
diff --git a/src/sentry/uptime/detectors/tasks.py b/src/sentry/uptime/detectors/tasks.py
index 1e37a61d457997..836cae9b82e8a4 100644
--- a/src/sentry/uptime/detectors/tasks.py
+++ b/src/sentry/uptime/detectors/tasks.py
@@ -6,7 +6,7 @@
 
 from django.utils import timezone
 
-from sentry import features
+from sentry import audit_log, features
 from sentry.locks import locks
 from sentry.models.organization import Organization
 from sentry.models.project import Project
@@ -22,7 +22,7 @@
     should_detect_for_organization,
     should_detect_for_project,
 )
-from sentry.uptime.models import ProjectUptimeSubscriptionMode
+from sentry.uptime.models import ProjectUptimeSubscription, ProjectUptimeSubscriptionMode
 from sentry.uptime.subscriptions.subscriptions import (
     delete_uptime_subscriptions_for_project,
     get_auto_monitored_subscriptions_for_project,
@@ -30,6 +30,7 @@
     is_url_auto_monitored_for_project,
 )
 from sentry.utils import metrics
+from sentry.utils.audit import create_system_audit_entry
 from sentry.utils.hashlib import md5_text
 from sentry.utils.locking import UnableToAcquireLock
 
@@ -221,16 +222,22 @@ def process_candidate_url(
     )
     if features.has("organizations:uptime-automatic-subscription-creation", project.organization):
         # If we hit this point, then the url looks worth monitoring. Create an uptime subscription in monitor mode.
-        monitor_url_for_project(project, url)
+        uptime_monitor = monitor_url_for_project(project, url)
         # Disable auto-detection on this project and organization now that we've successfully found a hostname
         project.update_option("sentry:uptime_autodetection", False)
         project.organization.update_option("sentry:uptime_autodetection", False)
+        create_system_audit_entry(
+            organization=project.organization,
+            target_object=uptime_monitor.id,
+            event=audit_log.get_event_id("UPTIME_MONITOR_ADD"),
+            data=uptime_monitor.get_audit_log_data(),
+        )
 
     metrics.incr("uptime.detectors.candidate_url.succeeded", sample_rate=1.0)
     return True
 
 
-def monitor_url_for_project(project: Project, url: str):
+def monitor_url_for_project(project: Project, url: str) -> ProjectUptimeSubscription:
     """
     Start monitoring a url for a project. Creates a subscription using our onboarding interval and links the project to
     it. Also deletes any other auto-detected monitors since this one should replace them.
@@ -244,7 +251,8 @@ def monitor_url_for_project(project: Project, url: str):
                 ProjectUptimeSubscriptionMode.AUTO_DETECTED_ACTIVE,
             ],
         )
-    get_or_create_project_uptime_subscription(
+    metrics.incr("uptime.detectors.candidate_url.monitor_created", sample_rate=1.0)
+    return get_or_create_project_uptime_subscription(
         project,
         # TODO(epurkhiser): This is where we would put the environment object
         # from autodetection if we decide to do that.
@@ -253,8 +261,7 @@ def monitor_url_for_project(project: Project, url: str):
         interval_seconds=ONBOARDING_SUBSCRIPTION_INTERVAL_SECONDS,
         timeout_ms=ONBOARDING_SUBSCRIPTION_TIMEOUT_MS,
         mode=ProjectUptimeSubscriptionMode.AUTO_DETECTED_ONBOARDING,
-    )
-    metrics.incr("uptime.detectors.candidate_url.monitor_created", sample_rate=1.0)
+    )[0]
 
 
 def is_failed_url(url: str) -> bool:
diff --git a/src/sentry/uptime/endpoints/organiation_uptime_alert_index.py b/src/sentry/uptime/endpoints/organiation_uptime_alert_index.py
new file mode 100644
index 00000000000000..3961bb0f93656a
--- /dev/null
+++ b/src/sentry/uptime/endpoints/organiation_uptime_alert_index.py
@@ -0,0 +1,120 @@
+from django.db.models import Q
+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 import NoProjects
+from sentry.api.bases.organization import OrganizationEndpoint, OrganizationPermission
+from sentry.api.helpers.teams import get_teams
+from sentry.api.paginator import OffsetPaginator
+from sentry.api.serializers import serialize
+from sentry.apidocs.constants import RESPONSE_FORBIDDEN, RESPONSE_NOT_FOUND, RESPONSE_UNAUTHORIZED
+from sentry.apidocs.parameters import GlobalParams, OrganizationParams, UptimeParams
+from sentry.apidocs.utils import inline_sentry_response_serializer
+from sentry.db.models.query import in_iexact
+from sentry.models.organization import Organization
+from sentry.search.utils import tokenize_query
+from sentry.types.actor import Actor
+from sentry.uptime.endpoints.serializers import (
+    ProjectUptimeSubscriptionSerializer,
+    ProjectUptimeSubscriptionSerializerResponse,
+)
+from sentry.uptime.models import ProjectUptimeSubscription
+
+
+@region_silo_endpoint
+@extend_schema(tags=["Crons"])
+class OrganizationUptimeAlertIndexEndpoint(OrganizationEndpoint):
+    publish_status = {
+        "GET": ApiPublishStatus.EXPERIMENTAL,
+    }
+    owner = ApiOwner.CRONS
+    permission_classes = (OrganizationPermission,)
+
+    @extend_schema(
+        operation_id="Retrieve Uptime Alets for an Organization",
+        parameters=[
+            GlobalParams.ORG_ID_OR_SLUG,
+            OrganizationParams.PROJECT,
+            GlobalParams.ENVIRONMENT,
+            UptimeParams.OWNER,
+        ],
+        responses={
+            200: inline_sentry_response_serializer(
+                "UptimeAlertList", list[ProjectUptimeSubscriptionSerializerResponse]
+            ),
+            401: RESPONSE_UNAUTHORIZED,
+            403: RESPONSE_FORBIDDEN,
+            404: RESPONSE_NOT_FOUND,
+        },
+    )
+    def get(self, request: Request, organization: Organization) -> Response:
+        """
+        Lists uptime alerts. May be filtered to a project or environment.
+        """
+        try:
+            filter_params = self.get_filter_params(request, organization, date_filter_optional=True)
+        except NoProjects:
+            return self.respond([])
+
+        queryset = ProjectUptimeSubscription.objects.filter(
+            project__organization_id=organization.id, project_id__in=filter_params["project_id"]
+        )
+        query = request.GET.get("query")
+        owners = request.GET.getlist("owner")
+
+        if "environment" in filter_params:
+            queryset = queryset.filter(environment__in=filter_params["environment_objects"])
+
+        if owners:
+            owners_set = set(owners)
+
+            # Remove special values from owners, this can't be parsed as an Actor
+            include_myteams = "myteams" in owners_set
+            owners_set.discard("myteams")
+            include_unassigned = "unassigned" in owners_set
+            owners_set.discard("unassigned")
+
+            actors = [Actor.from_identifier(identifier) for identifier in owners_set]
+
+            user_ids = [actor.id for actor in actors if actor.is_user]
+            team_ids = [actor.id for actor in actors if actor.is_team]
+
+            teams = get_teams(
+                request,
+                organization,
+                teams=[*team_ids, *(["myteams"] if include_myteams else [])],
+            )
+            team_ids = [team.id for team in teams]
+
+            owner_filter = Q(owner_user_id__in=user_ids) | Q(owner_team_id__in=team_ids)
+
+            if include_unassigned:
+                unassigned_filter = Q(owner_user_id=None) & Q(owner_team_id=None)
+                queryset = queryset.filter(unassigned_filter | owner_filter)
+            else:
+                queryset = queryset.filter(owner_filter)
+
+        if query:
+            tokens = tokenize_query(query)
+            for key, value in tokens.items():
+                if key == "query":
+                    query_value = " ".join(value)
+                    queryset = queryset.filter(
+                        Q(name__icontains=query_value)
+                        | Q(uptime_subscription__url__icontains=query_value)
+                    )
+                elif key == "name":
+                    queryset = queryset.filter(in_iexact("name", value))
+                else:
+                    queryset = queryset.none()
+
+        return self.paginate(
+            request=request,
+            queryset=queryset,
+            on_results=lambda x: serialize(x, request.user, ProjectUptimeSubscriptionSerializer()),
+            paginator_cls=OffsetPaginator,
+        )
diff --git a/src/sentry/uptime/issue_platform.py b/src/sentry/uptime/issue_platform.py
index 9b72df0aa80dab..ef812b8330741e 100644
--- a/src/sentry/uptime/issue_platform.py
+++ b/src/sentry/uptime/issue_platform.py
@@ -45,7 +45,7 @@ def build_occurrence_from_result(
         ),
         IssueEvidence(
             name="Duration",
-            value=str(result["duration_ms"]),
+            value=f"{result["duration_ms"]}ms",
             important=False,
         ),
     ]
diff --git a/src/sentry/uptime/migrations/0019_uptime_region.py b/src/sentry/uptime/migrations/0019_uptime_region.py
new file mode 100644
index 00000000000000..5d0e9b64971321
--- /dev/null
+++ b/src/sentry/uptime/migrations/0019_uptime_region.py
@@ -0,0 +1,92 @@
+# Generated by Django 5.1.4 on 2024-12-17 23:47
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+import sentry.db.models.fields.bounded
+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 = [
+        ("uptime", "0018_add_trace_sampling_field_to_uptime"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Region",
+            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)),
+                ("slug", models.CharField(max_length=255, unique=True)),
+                ("name", models.CharField(max_length=255)),
+            ],
+            options={
+                "db_table": "uptime_region",
+            },
+        ),
+        migrations.CreateModel(
+            name="UptimeSubscriptionRegion",
+            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)),
+                (
+                    "region",
+                    sentry.db.models.fields.foreignkey.FlexibleForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to="uptime.region"
+                    ),
+                ),
+                (
+                    "uptime_subscription",
+                    sentry.db.models.fields.foreignkey.FlexibleForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to="uptime.uptimesubscription"
+                    ),
+                ),
+            ],
+            options={
+                "db_table": "uptime_uptimesubscriptionregion",
+            },
+        ),
+        migrations.AddField(
+            model_name="uptimesubscription",
+            name="regions",
+            field=models.ManyToManyField(
+                through="uptime.UptimeSubscriptionRegion", to="uptime.region"
+            ),
+        ),
+        migrations.AddConstraint(
+            model_name="uptimesubscriptionregion",
+            constraint=models.UniqueConstraint(
+                models.F("uptime_subscription"),
+                models.F("region"),
+                name="uptime_uptimesubscription_region_unique",
+            ),
+        ),
+    ]
diff --git a/src/sentry/uptime/migrations/0020_drop_region.py b/src/sentry/uptime/migrations/0020_drop_region.py
new file mode 100644
index 00000000000000..ead4c8e9c26479
--- /dev/null
+++ b/src/sentry/uptime/migrations/0020_drop_region.py
@@ -0,0 +1,84 @@
+# Generated by Django 5.1.4 on 2024-12-18 22:26
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+import sentry.db.models.fields.foreignkey
+from sentry.new_migrations.migrations import CheckedMigration
+from sentry.new_migrations.monkey.fields import SafeRemoveField
+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 = [
+        ("uptime", "0019_uptime_region"),
+    ]
+
+    operations = [
+        migrations.SeparateDatabaseAndState(
+            state_operations=[
+                migrations.RemoveField(
+                    model_name="uptimesubscription",
+                    name="regions",
+                ),
+            ]
+        ),
+        migrations.AlterField(
+            model_name="uptimesubscriptionregion",
+            name="uptime_subscription",
+            field=sentry.db.models.fields.foreignkey.FlexibleForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="regions",
+                to="uptime.uptimesubscription",
+            ),
+        ),
+        migrations.RemoveConstraint(
+            model_name="uptimesubscriptionregion",
+            name="uptime_uptimesubscription_region_unique",
+        ),
+        migrations.AddField(
+            model_name="uptimesubscriptionregion",
+            name="region_slug",
+            field=models.CharField(db_index=True, default="", db_default="", max_length=255),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name="uptimesubscriptionregion",
+            name="region",
+            field=sentry.db.models.fields.foreignkey.FlexibleForeignKey(
+                null=True,
+                db_constraint=False,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="uptime.region",
+            ),
+        ),
+        migrations.AddConstraint(
+            model_name="uptimesubscriptionregion",
+            constraint=models.UniqueConstraint(
+                models.F("uptime_subscription"),
+                models.F("region_slug"),
+                name="uptime_uptimesubscription_region_slug_unique",
+            ),
+        ),
+        SafeRemoveField(
+            model_name="uptimesubscriptionregion",
+            name="region",
+            deletion_action=DeletionAction.MOVE_TO_PENDING,
+        ),
+        SafeDeleteModel(name="Region", deletion_action=DeletionAction.MOVE_TO_PENDING),
+    ]
diff --git a/src/sentry/uptime/migrations/0021_drop_region_table_col.py b/src/sentry/uptime/migrations/0021_drop_region_table_col.py
new file mode 100644
index 00000000000000..b12fd5f85aa529
--- /dev/null
+++ b/src/sentry/uptime/migrations/0021_drop_region_table_col.py
@@ -0,0 +1,35 @@
+# Generated by Django 5.1.4 on 2024-12-18 23:29
+
+from sentry.new_migrations.migrations import CheckedMigration
+from sentry.new_migrations.monkey.fields import SafeRemoveField
+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 = [
+        ("uptime", "0020_drop_region"),
+    ]
+
+    operations = [
+        SafeRemoveField(
+            model_name="uptimesubscriptionregion",
+            name="region",
+            deletion_action=DeletionAction.DELETE,
+        ),
+        SafeDeleteModel(name="Region", deletion_action=DeletionAction.DELETE),
+    ]
diff --git a/src/sentry/uptime/models.py b/src/sentry/uptime/models.py
index 9f53ee68766cd1..77e4ca0cb745e8 100644
--- a/src/sentry/uptime/models.py
+++ b/src/sentry/uptime/models.py
@@ -7,9 +7,11 @@
 from django.db.models import Q
 from django.db.models.expressions import Value
 from django.db.models.functions import MD5, Coalesce
+from sentry_kafka_schemas.schema_types.uptime_configs_v1 import REGIONSCHEDULEMODE_ROUND_ROBIN
 
 from sentry.backup.scopes import RelocationScope
 from sentry.db.models import (
+    DefaultFieldsModel,
     DefaultFieldsModelExisting,
     FlexibleForeignKey,
     JSONField,
@@ -107,6 +109,26 @@ class Meta:
         ]
 
 
+@region_silo_model
+class UptimeSubscriptionRegion(DefaultFieldsModel):
+    __relocation_scope__ = RelocationScope.Excluded
+
+    uptime_subscription = FlexibleForeignKey("uptime.UptimeSubscription", related_name="regions")
+    region_slug = models.CharField(max_length=255, db_index=True, db_default="")
+
+    class Meta:
+        app_label = "uptime"
+        db_table = "uptime_uptimesubscriptionregion"
+
+        constraints = [
+            models.UniqueConstraint(
+                "uptime_subscription",
+                "region_slug",
+                name="uptime_uptimesubscription_region_slug_unique",
+            ),
+        ]
+
+
 class ProjectUptimeSubscriptionMode(enum.IntEnum):
     # Manually created by a user
     MANUAL = 1
@@ -205,3 +227,7 @@ def get_active_auto_monitor_count_for_org(organization: Organization) -> int:
             ProjectUptimeSubscriptionMode.AUTO_DETECTED_ACTIVE,
         ],
     ).count()
+
+
+class UptimeRegionScheduleMode(enum.StrEnum):
+    ROUND_ROBIN = REGIONSCHEDULEMODE_ROUND_ROBIN
diff --git a/src/sentry/uptime/subscriptions/regions.py b/src/sentry/uptime/subscriptions/regions.py
new file mode 100644
index 00000000000000..be954095a48d26
--- /dev/null
+++ b/src/sentry/uptime/subscriptions/regions.py
@@ -0,0 +1,15 @@
+from django.conf import settings
+
+from sentry.conf.types.uptime import UptimeRegionConfig
+
+
+def get_active_region_configs() -> list[UptimeRegionConfig]:
+    return [v for v in settings.UPTIME_REGIONS if v.enabled]
+
+
+def get_region_config(region_slug: str) -> UptimeRegionConfig | None:
+    region = next((r for r in settings.UPTIME_REGIONS if r.slug == region_slug), None)
+    if region is None:
+        # XXX: Temporary hack to guarantee we get a config
+        region = get_active_region_configs()[0]
+    return region
diff --git a/src/sentry/uptime/subscriptions/subscriptions.py b/src/sentry/uptime/subscriptions/subscriptions.py
index 2a0e78b7794819..0c3b58ee869648 100644
--- a/src/sentry/uptime/subscriptions/subscriptions.py
+++ b/src/sentry/uptime/subscriptions/subscriptions.py
@@ -15,9 +15,11 @@
     ProjectUptimeSubscription,
     ProjectUptimeSubscriptionMode,
     UptimeSubscription,
+    UptimeSubscriptionRegion,
     headers_json_encoder,
 )
 from sentry.uptime.rdap.tasks import fetch_subscription_rdap_info
+from sentry.uptime.subscriptions.regions import get_active_region_configs
 from sentry.uptime.subscriptions.tasks import (
     create_remote_uptime_subscription,
     delete_remote_uptime_subscription,
@@ -132,6 +134,13 @@ def get_or_create_uptime_subscription(
         subscription.update(status=UptimeSubscription.Status.CREATING.value)
         created = True
 
+    # Associate active regions with this subscription
+    for region_config in get_active_region_configs():
+        # If we add a region here we need to resend the subscriptions
+        created |= UptimeSubscriptionRegion.objects.get_or_create(
+            uptime_subscription=subscription, region_slug=region_config.slug
+        )[1]
+
     if created:
         create_remote_uptime_subscription.delay(subscription.id)
         fetch_subscription_rdap_info.delay(subscription.id)
diff --git a/src/sentry/uptime/subscriptions/tasks.py b/src/sentry/uptime/subscriptions/tasks.py
index c0936b840ddce4..d28948577f27b9 100644
--- a/src/sentry/uptime/subscriptions/tasks.py
+++ b/src/sentry/uptime/subscriptions/tasks.py
@@ -10,7 +10,8 @@
 from sentry.snuba.models import QuerySubscription
 from sentry.tasks.base import instrumented_task
 from sentry.uptime.config_producer import produce_config, produce_config_removal
-from sentry.uptime.models import UptimeSubscription
+from sentry.uptime.models import UptimeRegionScheduleMode, UptimeSubscription
+from sentry.uptime.subscriptions.regions import get_active_region_configs
 from sentry.utils import metrics
 
 logger = logging.getLogger(__name__)
@@ -35,10 +36,50 @@ def create_remote_uptime_subscription(uptime_subscription_id, **kwargs):
         metrics.incr("uptime.subscriptions.create.incorrect_status", sample_rate=1.0)
         return
 
-    subscription_id = send_uptime_subscription_config(subscription)
-    # TODO: Ideally this should actually be `PENDING_FIRST_UPDATE` so we can validate it's really working as expected
+    region_slugs = [s.region_slug for s in subscription.regions.all()]
+    if not region_slugs:
+        # XXX: Hack to make sure that region configs are sent even if we don't have region rows present.
+        # Remove once everything is in place
+        region_slugs = [get_active_region_configs()[0].slug]
+
+    for region_slug in region_slugs:
+        send_uptime_subscription_config(region_slug, subscription)
     subscription.update(
-        status=QuerySubscription.Status.ACTIVE.value, subscription_id=subscription_id
+        status=QuerySubscription.Status.ACTIVE.value,
+        subscription_id=subscription.subscription_id,
+    )
+
+
+@instrumented_task(
+    name="sentry.uptime.subscriptions.tasks.update_remote_uptime_subscription",
+    queue="uptime",
+    default_retry_delay=5,
+    max_retries=5,
+)
+def update_remote_uptime_subscription(uptime_subscription_id, **kwargs):
+    """
+    Pushes details of an uptime subscription to uptime subscription regions.
+    """
+    try:
+        subscription = UptimeSubscription.objects.get(id=uptime_subscription_id)
+    except UptimeSubscription.DoesNotExist:
+        metrics.incr("uptime.subscriptions.update.subscription_does_not_exist", sample_rate=1.0)
+        return
+    if subscription.status != UptimeSubscription.Status.UPDATING.value:
+        metrics.incr("uptime.subscriptions.update.incorrect_status", sample_rate=1.0)
+        return
+
+    region_slugs = [s.region_slug for s in subscription.regions.all()]
+    if not region_slugs:
+        # XXX: Hack to make sure that region configs are sent even if we don't have region rows present.
+        # Remove once everything is in place
+        region_slugs = [get_active_region_configs()[0].slug]
+
+    for region_slug in region_slugs:
+        send_uptime_subscription_config(region_slug, subscription)
+    subscription.update(
+        status=QuerySubscription.Status.ACTIVE.value,
+        subscription_id=subscription.subscription_id,
     )
 
 
@@ -62,6 +103,12 @@ def delete_remote_uptime_subscription(uptime_subscription_id, **kwargs):
         metrics.incr("uptime.subscriptions.delete.incorrect_status", sample_rate=1.0)
         return
 
+    region_slugs = [s.region_slug for s in subscription.regions.all()]
+    if not region_slugs:
+        # XXX: Hack to make sure that region configs are sent even if we don't have regions present.
+        # Remove once everything is in place
+        region_slugs = [get_active_region_configs()[0].slug]
+
     subscription_id = subscription.subscription_id
     if subscription.status == QuerySubscription.Status.DELETING.value:
         subscription.delete()
@@ -69,15 +116,16 @@ def delete_remote_uptime_subscription(uptime_subscription_id, **kwargs):
         subscription.update(subscription_id=None)
 
     if subscription_id is not None:
-        send_uptime_config_deletion(subscription_id)
+        for region_slug in region_slugs:
+            send_uptime_config_deletion(region_slug, subscription_id)
 
 
-def send_uptime_subscription_config(subscription: UptimeSubscription) -> str:
-    # Whenever we create/update a config we always want to generate a new subscription id. This allows us to validate
-    # that the config took effect
-    subscription_id = uuid4().hex
-    produce_config(uptime_subscription_to_check_config(subscription, subscription_id))
-    return subscription_id
+def send_uptime_subscription_config(region_slug: str, subscription: UptimeSubscription):
+    if subscription.subscription_id is None:
+        subscription.subscription_id = uuid4().hex
+    produce_config(
+        region_slug, uptime_subscription_to_check_config(subscription, subscription.subscription_id)
+    )
 
 
 def uptime_subscription_to_check_config(
@@ -96,14 +144,16 @@ def uptime_subscription_to_check_config(
         "request_method": subscription.method,
         "request_headers": headers,
         "trace_sampling": subscription.trace_sampling,
+        "active_regions": [r.region_slug for r in subscription.regions.all()],
+        "region_schedule_mode": UptimeRegionScheduleMode.ROUND_ROBIN.value,
     }
     if subscription.body is not None:
         config["request_body"] = subscription.body
     return config
 
 
-def send_uptime_config_deletion(subscription_id: str) -> None:
-    produce_config_removal(subscription_id)
+def send_uptime_config_deletion(destination_region_slug: str, subscription_id: str) -> None:
+    produce_config_removal(destination_region_slug, subscription_id)
 
 
 @instrumented_task(
@@ -120,6 +170,7 @@ def subscription_checker(**kwargs):
     for subscription in UptimeSubscription.objects.filter(
         status__in=(
             UptimeSubscription.Status.CREATING.value,
+            UptimeSubscription.Status.UPDATING.value,
             UptimeSubscription.Status.DELETING.value,
         ),
         date_updated__lt=timezone.now() - SUBSCRIPTION_STATUS_MAX_AGE,
diff --git a/src/sentry/users/api/endpoints/user_authenticator_enroll.py b/src/sentry/users/api/endpoints/user_authenticator_enroll.py
index e1fdfea5d73fd9..0fe89df27321f6 100644
--- a/src/sentry/users/api/endpoints/user_authenticator_enroll.py
+++ b/src/sentry/users/api/endpoints/user_authenticator_enroll.py
@@ -13,7 +13,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.api.decorators import email_verification_required, sudo_required
+from sentry.api.decorators import primary_email_verification_required, sudo_required
 from sentry.api.invite_helper import ApiInviteHelper, remove_invite_details_from_session
 from sentry.api.serializers import serialize
 from sentry.auth.authenticators.base import EnrollmentStatus, NewEnrollmentDisallowed
@@ -175,7 +175,7 @@ def get(self, request: Request, user: User, interface_id: str) -> HttpResponse:
         return Response(response)
 
     @sudo_required
-    @email_verification_required
+    @primary_email_verification_required
     def post(self, request: Request, user: User, interface_id: str) -> HttpResponse:
         """
         Enroll in authenticator interface
diff --git a/src/sentry/users/api/endpoints/user_password.py b/src/sentry/users/api/endpoints/user_password.py
index a3a67682131c36..fbf5a9d29cd54b 100644
--- a/src/sentry/users/api/endpoints/user_password.py
+++ b/src/sentry/users/api/endpoints/user_password.py
@@ -13,6 +13,7 @@
 from sentry.types.ratelimit import RateLimit, RateLimitCategory
 from sentry.users.api.bases.user import UserEndpoint
 from sentry.users.models.user import User
+from sentry.web.frontend.twofactor import reset_2fa_rate_limits
 
 
 class UserPasswordSerializer(serializers.Serializer[User]):
@@ -89,4 +90,7 @@ def put(self, request: Request, user: User) -> Response:
             ip_address=request.META["REMOTE_ADDR"],
             send_email=True,
         )
+
+        reset_2fa_rate_limits(user.id)
+
         return Response(status=status.HTTP_204_NO_CONTENT)
diff --git a/src/sentry/users/models/user.py b/src/sentry/users/models/user.py
index a84b99c4cd93a0..736f96d0fa50a8 100644
--- a/src/sentry/users/models/user.py
+++ b/src/sentry/users/models/user.py
@@ -244,6 +244,9 @@ def has_verified_emails(self) -> bool:
     def has_unverified_emails(self) -> bool:
         return self.get_unverified_emails().exists()
 
+    def has_verified_primary_email(self) -> bool:
+        return self.emails.filter(is_verified=True, email=self.email).exists()
+
     def has_usable_password(self) -> bool:
         if self.password == "" or self.password is None:
             # This is the behavior we've been relying on from Django 1.6 - 2.0.
diff --git a/src/sentry/users/services/user/model.py b/src/sentry/users/services/user/model.py
index b2c4a23d403264..f4d5082c63d6ed 100644
--- a/src/sentry/users/services/user/model.py
+++ b/src/sentry/users/services/user/model.py
@@ -87,6 +87,9 @@ def has_unverified_emails(self) -> bool:
     def has_verified_emails(self) -> bool:
         return len(self.get_verified_emails()) > 0
 
+    def has_verified_primary_email(self) -> bool:
+        return bool([e for e in self.useremails if e.is_verified and e.email == self.email])
+
     def get_unverified_emails(self) -> list[RpcUserEmail]:
         return [e for e in self.useremails if not e.is_verified]
 
diff --git a/src/sentry/users/web/accounts.py b/src/sentry/users/web/accounts.py
index 24619470f4f708..0b669ee44f869f 100644
--- a/src/sentry/users/web/accounts.py
+++ b/src/sentry/users/web/accounts.py
@@ -28,6 +28,7 @@
 )
 from sentry.utils import auth
 from sentry.web.decorators import login_required, set_referrer_policy
+from sentry.web.frontend.twofactor import reset_2fa_rate_limits
 from sentry.web.helpers import render_to_response
 
 logger = logging.getLogger("sentry.accounts")
@@ -273,6 +274,8 @@ def recover_confirm(
                     send_email=True,
                 )
 
+                reset_2fa_rate_limits(user.id)
+
             return login_redirect(request)
     else:
         form = form_cls(user=user)
diff --git a/src/sentry/utils/batching_kafka_consumer.py b/src/sentry/utils/batching_kafka_consumer.py
index eb4e4b7c154c5f..47f0530e32b42c 100644
--- a/src/sentry/utils/batching_kafka_consumer.py
+++ b/src/sentry/utils/batching_kafka_consumer.py
@@ -8,9 +8,6 @@
 
 logger = logging.getLogger("sentry.batching-kafka-consumer")
 
-DEFAULT_QUEUED_MAX_MESSAGE_KBYTES = 50000
-DEFAULT_QUEUED_MIN_MESSAGES = 10000
-
 
 def wait_for_topics(admin_client: AdminClient, topics: list[str], timeout: int = 10) -> None:
     """
diff --git a/src/sentry/utils/memory.py b/src/sentry/utils/memory.py
new file mode 100644
index 00000000000000..a1fb5809b1432a
--- /dev/null
+++ b/src/sentry/utils/memory.py
@@ -0,0 +1,17 @@
+import resource
+from contextlib import contextmanager
+
+from sentry.utils import metrics
+
+
+def get_rss_usage():
+    return resource.getrusage(resource.RUSAGE_SELF).ru_maxrss
+
+
+@contextmanager
+def track_memory_usage(metric, **kwargs):
+    before = get_rss_usage()
+    try:
+        yield
+    finally:
+        metrics.distribution(metric, get_rss_usage() - before, unit="byte", **kwargs)
diff --git a/src/sentry/utils/performance_issues/base.py b/src/sentry/utils/performance_issues/base.py
index fb4e7812ee4328..e9063c98408628 100644
--- a/src/sentry/utils/performance_issues/base.py
+++ b/src/sentry/utils/performance_issues/base.py
@@ -240,8 +240,6 @@ def total_span_time(span_list: list[dict[str, Any]]) -> float:
     return total_duration * 1000
 
 
-PARAMETERIZED_SQL_QUERY_REGEX = re.compile(r"\?|\$1|%s")
-
 PARAMETERIZED_URL_REGEX = re.compile(
     r"""(?x)
     (?P<uuid>
diff --git a/src/sentry/utils/platform_categories.py b/src/sentry/utils/platform_categories.py
index 25c3e65b992809..3baeb173bbb51f 100644
--- a/src/sentry/utils/platform_categories.py
+++ b/src/sentry/utils/platform_categories.py
@@ -25,6 +25,7 @@
 
 # Mirrors `const mobile` in sentry/static/app/data/platformCategories.tsx
 # When changing this file, make sure to keep sentry/static/app/data/platformCategories.tsx in sync.
+
 MOBILE = {
     "android",
     "apple-ios",
@@ -165,3 +166,12 @@
     {id: "serverless", "name": _("Serverless"), "platforms": SERVERLESS},
     {id: "temporary", "name": _("Temporary"), "platforms": TEMPORARY},
 ]
+
+# Mirrors `const sourceMaps` in sentry/static/app/data/platformCategories.tsx
+# When changing this file, make sure to keep sentry/static/app/data/platformCategories.tsx in sync.
+SOURCE_MAPS = {
+    *FRONTEND,
+    "react-native",
+    "cordova",
+    "electron",
+}
diff --git a/src/sentry/utils/registry.py b/src/sentry/utils/registry.py
index 0ff110e268e054..3eff6865e82051 100644
--- a/src/sentry/utils/registry.py
+++ b/src/sentry/utils/registry.py
@@ -15,9 +15,15 @@ class NoRegistrationExistsError(ValueError):
 
 
 class Registry(Generic[T]):
-    def __init__(self):
+    """
+    A simple generic registry that allows for registering and retrieving items by key. Reverse lookup by value is enabled by default.
+    If you have duplicate values, you may want to disable reverse lookup.
+    """
+
+    def __init__(self, enable_reverse_lookup=True):
         self.registrations: dict[str, T] = {}
         self.reverse_lookup: dict[T, str] = {}
+        self.enable_reverse_lookup = enable_reverse_lookup
 
     def register(self, key: str):
         def inner(item: T) -> T:
@@ -26,13 +32,14 @@ def inner(item: T) -> T:
                     f"A registration already exists for {key}: {self.registrations[key]}"
                 )
 
-            if item in self.reverse_lookup:
-                raise AlreadyRegisteredError(
-                    f"A registration already exists for {item}: {self.reverse_lookup[item]}"
-                )
+            if self.enable_reverse_lookup:
+                if item in self.reverse_lookup:
+                    raise AlreadyRegisteredError(
+                        f"A registration already exists for {item}: {self.reverse_lookup[item]}"
+                    )
+                self.reverse_lookup[item] = key
 
             self.registrations[key] = item
-            self.reverse_lookup[item] = key
 
             return item
 
@@ -44,6 +51,8 @@ def get(self, key: str) -> T:
         return self.registrations[key]
 
     def get_key(self, item: T) -> str:
+        if not self.enable_reverse_lookup:
+            raise NotImplementedError("Reverse lookup is not enabled")
         if item not in self.reverse_lookup:
             raise NoRegistrationExistsError(f"No registration exists for {item}")
         return self.reverse_lookup[item]
diff --git a/src/sentry/utils/samples.py b/src/sentry/utils/samples.py
index 00ce2b9158651f..f3ccda8e798758 100644
--- a/src/sentry/utils/samples.py
+++ b/src/sentry/utils/samples.py
@@ -114,7 +114,6 @@ def load_data(
     trace_context=None,
     fingerprint=None,
     event_id=None,
-    metrics_summary=None,
 ):
     # NOTE: Before editing this data, make sure you understand the context
     # in which its being used. It is NOT only used for local development and
@@ -193,9 +192,6 @@ def load_data(
             start_timestamp = start_timestamp.replace(tzinfo=timezone.utc)
         data["start_timestamp"] = start_timestamp.timestamp()
 
-        if metrics_summary is not None:
-            data["_metrics_summary"] = metrics_summary
-
         if trace is None:
             trace = uuid4().hex
         if span_id is None:
@@ -411,15 +407,6 @@ def create_sample_event(
         spans,
     )
 
-    if not data:
-        logger.info(
-            "create_sample_event: no data loaded",
-            extra={
-                "project_id": project.id,
-                "sample_event": True,
-            },
-        )
-        return
     for key in ["parent_span_id", "hash", "exclusive_time"]:
         if key in kwargs:
             data["contexts"]["trace"][key] = kwargs.pop(key)
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 0053f191a524c8..22c592ce31e73a 100644
--- a/src/sentry/utils/sdk_crashes/sdk_crash_detection_config.py
+++ b/src/sentry/utils/sdk_crashes/sdk_crash_detection_config.py
@@ -57,6 +57,10 @@ class SDKCrashDetectionConfig:
     """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 mechanism types to ignore. For example, {"console", "unhandledrejection"}. If empty, all mechanism types are captured."""
+    ignore_mechanism_type: set[str]
+    """The mechanism types to capture. For example, {"ANR", "AppExitInfo"}. Useful when you want to detect events that are neither unhandled nor fatal."""
+    allow_mechanism_type: set[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."""
@@ -100,6 +104,8 @@ def build_sdk_crash_detection_configs() -> Sequence[SDKCrashDetectionConfig]:
                 "sentry.cocoa.unreal": cocoa_min_sdk_version,
             },
             report_fatal_errors=False,
+            ignore_mechanism_type=set(),
+            allow_mechanism_type=set(),
             system_library_path_patterns={r"/System/Library/**", r"/usr/lib/**"},
             sdk_frame_config=SDKFrameConfig(
                 function_patterns={
@@ -132,6 +138,10 @@ def build_sdk_crash_detection_configs() -> Sequence[SDKCrashDetectionConfig]:
                 "sentry.javascript.react-native": "4.0.0",
             },
             report_fatal_errors=False,
+            # used by the JS/RN SDKs
+            # https://github.com/getsentry/sentry-javascript/blob/dafd51054d8b2ab2030fa0b16ad0fd70493b6e08/packages/core/src/integrations/captureconsole.ts#L60
+            ignore_mechanism_type={"console"},
+            allow_mechanism_type=set(),
             system_library_path_patterns={
                 r"**/react-native/Libraries/**",
                 r"**/react-native-community/**",
@@ -204,6 +214,8 @@ def build_sdk_crash_detection_configs() -> Sequence[SDKCrashDetectionConfig]:
                 "sentry.native.android": native_min_sdk_version,
             },
             report_fatal_errors=False,
+            ignore_mechanism_type=set(),
+            allow_mechanism_type={"ANR", "AppExitInfo"},
             system_library_path_patterns={
                 r"java.**",
                 r"javax.**",
@@ -227,7 +239,7 @@ def build_sdk_crash_detection_configs() -> Sequence[SDKCrashDetectionConfig]:
                 function_and_path_patterns=[
                     FunctionAndPathPattern(
                         function_pattern=r"*pthread_getcpuclockid*",
-                        path_pattern=r"/apex/com.android.art/lib64/bionic/libc.so",
+                        path_pattern=r"/apex/com.android.runtime/lib64/bionic/libc.so",
                     ),
                     FunctionAndPathPattern(
                         function_pattern=r"*art::Trace::StopTracing*",
@@ -265,6 +277,8 @@ def build_sdk_crash_detection_configs() -> Sequence[SDKCrashDetectionConfig]:
                 "sentry.native.unreal": native_min_sdk_version,
             },
             report_fatal_errors=False,
+            ignore_mechanism_type=set(),
+            allow_mechanism_type=set(),
             system_library_path_patterns={
                 # well known locations for unix paths
                 r"/lib/**",
@@ -315,6 +329,8 @@ def build_sdk_crash_detection_configs() -> Sequence[SDKCrashDetectionConfig]:
                 "sentry.dart.flutter": dart_min_sdk_version,
             },
             report_fatal_errors=True,
+            ignore_mechanism_type=set(),
+            allow_mechanism_type=set(),
             system_library_path_patterns={
                 # Dart
                 r"org-dartlang-sdk:///**",
diff --git a/src/sentry/utils/sdk_crashes/sdk_crash_detector.py b/src/sentry/utils/sdk_crashes/sdk_crash_detector.py
index 83f9d9834c7636..d5130d8140b4a7 100644
--- a/src/sentry/utils/sdk_crashes/sdk_crash_detector.py
+++ b/src/sentry/utils/sdk_crashes/sdk_crash_detector.py
@@ -49,6 +49,13 @@ def should_detect_sdk_crash(
         if not self.is_sdk_supported(sdk_name, sdk_version):
             return False
 
+        mechanism_type = get_path(event_data, "exception", "values", -1, "mechanism", "type")
+        if mechanism_type and mechanism_type in self.config.ignore_mechanism_type:
+            return False
+
+        if mechanism_type and mechanism_type in self.config.allow_mechanism_type:
+            return True
+
         is_unhandled = (
             get_path(event_data, "exception", "values", -1, "mechanism", "handled") is False
         )
diff --git a/src/sentry/utils/snuba_rpc.py b/src/sentry/utils/snuba_rpc.py
index afdb03b9b2e031..5a75c188150715 100644
--- a/src/sentry/utils/snuba_rpc.py
+++ b/src/sentry/utils/snuba_rpc.py
@@ -146,6 +146,7 @@ def _make_rpc_request(
     with sentry_sdk.start_span(op="snuba_rpc.run", name=req.__class__.__name__) as span:
         if referrer:
             span.set_tag("snuba.referrer", referrer)
+            span.set_data("snuba.query", req)
         http_resp = _snuba_pool.urlopen(
             "POST",
             f"/rpc/{endpoint_name}/{class_version}",
diff --git a/src/sentry/utils/strings.py b/src/sentry/utils/strings.py
index 79a797e9a87c6a..b9da4f573b7b8d 100644
--- a/src/sentry/utils/strings.py
+++ b/src/sentry/utils/strings.py
@@ -9,8 +9,6 @@
 from collections.abc import Callable
 from typing import overload
 
-from django.utils.encoding import smart_str
-
 _sprintf_placeholder_re = re.compile(
     r"%(?:\d+\$)?[+-]?(?:[ 0]|\'.{1})?-?\d*(?:\.\d+)?[bcdeEufFgGosxX]"
 )
@@ -83,7 +81,7 @@ def decompress(value: str) -> bytes:
 def strip(value: str | None) -> str:
     if not value:
         return ""
-    return smart_str(value).strip()
+    return value.strip()
 
 
 def soft_hyphenate(value: str, length: int, hyphen: str = "\u00ad") -> str:
diff --git a/src/sentry/utils/tag_normalization.py b/src/sentry/utils/tag_normalization.py
index b68776c1ff5f3e..bce6efa1b9047d 100644
--- a/src/sentry/utils/tag_normalization.py
+++ b/src/sentry/utils/tag_normalization.py
@@ -92,7 +92,7 @@ def normalize_sdk_tag(tag: str) -> str:
 
     # collapse tags other than JavaScript / Native to their top-level SDK
 
-    if not tag.split(".")[1] in {"javascript", "native"}:
+    if tag.split(".")[1] not in {"javascript", "native"}:
         tag = ".".join(tag.split(".", 2)[0:2])
 
     if tag.split(".")[1] == "native":
@@ -115,7 +115,7 @@ def normalized_sdk_tag_from_event(data: Mapping[str, Any]) -> str:
     Note: Some platforms may keep their framework-specific values, as needed for analytics.
 
     This is done to reduce the cardinality of the `sdk.name` tag, while keeping
-    the ones interesinting to us as granual as possible.
+    the ones interesting to us as granular as possible.
     """
     try:
         return normalize_sdk_tag((data.get("sdk") or {}).get("name") or "other")
diff --git a/src/sentry/utils/types.py b/src/sentry/utils/types.py
index c0fdd43bf663b4..b4ed4aa90fa0bf 100644
--- a/src/sentry/utils/types.py
+++ b/src/sentry/utils/types.py
@@ -215,9 +215,3 @@ def type_from_value(value):
 
 
 AnyCallable = typing.Callable[..., AnyType]
-
-
-def NonNone(value: T | None) -> T:
-    """A hacked version of TS's non-null assertion operator"""
-    assert value is not None
-    return value
diff --git a/src/sentry/web/frontend/auth_login.py b/src/sentry/web/frontend/auth_login.py
index 4fb8f4eb2fdbde..cf19698091d73c 100644
--- a/src/sentry/web/frontend/auth_login.py
+++ b/src/sentry/web/frontend/auth_login.py
@@ -40,6 +40,7 @@
 from sentry.utils.http import absolute_uri
 from sentry.utils.sdk import capture_exception
 from sentry.utils.urls import add_params_to_url
+from sentry.web.client_config import get_client_config
 from sentry.web.forms.accounts import AuthenticationForm, RegistrationForm
 from sentry.web.frontend.base import BaseView, control_silo_view
 
@@ -431,7 +432,7 @@ def get_ratelimited_login_form(
         ]
         metrics.incr("login.attempt", instance="rate_limited", skip_internal=True, sample_rate=1.0)
 
-        context = {
+        context = self.get_default_context(request=request) | {
             "op": "login",
             "login_form": login_form,
             "referrer": request.GET.get("referrer"),
@@ -526,11 +527,10 @@ def get_default_context(self, request: Request, **kwargs) -> dict:
         default_context = {
             "server_hostname": get_server_hostname(),
             "login_form": None,
-            "organization": kwargs.pop(
-                "organization", None
-            ),  # NOTE: not utilized in basic login page (only org login)
+            "organization": organization,  # NOTE: not utilized in basic login page (only org login)
             "register_form": None,
             "CAN_REGISTER": False,
+            "react_config": get_client_config(request, self.active_organization),
             "join_request_link": self.get_join_request_link(
                 organization=organization, request=request
             ),  # NOTE: not utilized in basic login page (only org login)
@@ -702,18 +702,11 @@ def handle_basic_auth(self, request: Request, **kwargs) -> HttpResponseBase:
                     "login.attempt", instance="failure", skip_internal=True, sample_rate=1.0
                 )
 
-        context = {
+        context = self.get_default_context(request=request, organization=organization) | {
             "op": op or "login",
-            "server_hostname": get_server_hostname(),
             "login_form": login_form,
-            "organization": organization,
             "register_form": register_form,
             "CAN_REGISTER": can_register,
-            "join_request_link": self.get_join_request_link(
-                organization=organization, request=request
-            ),
-            "show_login_banner": settings.SHOW_LOGIN_BANNER,
-            "referrer": request.GET.get("referrer"),
         }
 
         context.update(additional_context.run_callbacks(request))
diff --git a/src/sentry/web/frontend/auth_organization_login.py b/src/sentry/web/frontend/auth_organization_login.py
index 3e2de690770ea6..18af32980bcdc5 100644
--- a/src/sentry/web/frontend/auth_organization_login.py
+++ b/src/sentry/web/frontend/auth_organization_login.py
@@ -23,14 +23,15 @@ def respond_login(self, request: Request, context, *args, **kwargs) -> HttpRespo
         return self.respond("sentry/organization-login.html", context)
 
     def handle_sso(self, request: Request, organization: RpcOrganization, auth_provider):
-        referrer = request.GET.get("referrer")
         if request.method == "POST":
             helper = AuthHelper(
                 request=request,
                 organization=organization,
                 auth_provider=auth_provider,
                 flow=AuthHelper.FLOW_LOGIN,
-                referrer=referrer,  # TODO: get referrer from the form submit - not the query parms
+                referrer=request.GET.get(
+                    "referrer"
+                ),  # TODO: get referrer from the form submit - not the query parms
             )
 
             if request.POST.get("init"):
@@ -47,13 +48,10 @@ def handle_sso(self, request: Request, organization: RpcOrganization, auth_provi
 
         provider = auth_provider.get_provider()
 
-        context = {
-            "CAN_REGISTER": False,
-            "organization": organization,
+        context = self.get_default_context(request, organization=organization) | {
             "provider_key": provider.key,
             "provider_name": provider.name,
             "authenticated": request.user.is_authenticated,
-            "referrer": referrer,
         }
 
         return self.respond("sentry/organization-login.html", context)
diff --git a/src/sentry/web/frontend/oauth_authorize.py b/src/sentry/web/frontend/oauth_authorize.py
index e9ed3e3543fc99..163b2f973440c6 100644
--- a/src/sentry/web/frontend/oauth_authorize.py
+++ b/src/sentry/web/frontend/oauth_authorize.py
@@ -233,13 +233,14 @@ def get(self, request: HttpRequest, **kwargs) -> HttpResponseBase:
             # If application is not org level we should not show organizations to choose from at all
             organization_options = []
 
-        context = {
+        context = self.get_default_context(request) | {
             "user": request.user,
             "application": application,
             "scopes": scopes,
             "permissions": permissions,
             "organization_options": organization_options,
         }
+
         return self.respond("sentry/oauth-authorize.html", context)
 
     def post(self, request: HttpRequest, **kwargs) -> HttpResponseBase:
diff --git a/src/sentry/web/frontend/react_page.py b/src/sentry/web/frontend/react_page.py
index 81e5c4d26b8051..68e65ed8d01463 100644
--- a/src/sentry/web/frontend/react_page.py
+++ b/src/sentry/web/frontend/react_page.py
@@ -88,6 +88,14 @@ def dns_prefetch(self) -> list[str]:
 
     def handle_react(self, request: Request, **kwargs) -> HttpResponse:
         org_context = getattr(self, "active_organization", None)
+        react_config = get_client_config(request, org_context)
+
+        user_theme = ""
+        if react_config.get("user", None) and react_config["user"].get("options", {}).get(
+            "theme", None
+        ):
+            user_theme = f"theme-{react_config['user']['options']['theme']}"
+
         context = {
             "CSRF_COOKIE_NAME": settings.CSRF_COOKIE_NAME,
             "meta_tags": [
@@ -100,7 +108,8 @@ def handle_react(self, request: Request, **kwargs) -> HttpResponse:
             # Since we already have it here from the OrganizationMixin, we can
             # save some work and render it faster.
             "org_context": org_context,
-            "react_config": get_client_config(request, org_context),
+            "react_config": react_config,
+            "user_theme": user_theme,
         }
 
         # Force a new CSRF token to be generated and set in user's
diff --git a/src/sentry/web/frontend/twofactor.py b/src/sentry/web/frontend/twofactor.py
index 5018e624860b80..a07c041b988ca8 100644
--- a/src/sentry/web/frontend/twofactor.py
+++ b/src/sentry/web/frontend/twofactor.py
@@ -1,6 +1,7 @@
 import logging
 import time
 from base64 import b64encode
+from urllib.parse import urlencode
 
 from django.http import HttpRequest, HttpResponse, HttpResponseRedirect
 from django.urls import reverse
@@ -17,6 +18,7 @@
 from sentry.utils.email import MessageBuilder
 from sentry.utils.geo import geo_by_addr
 from sentry.utils.http import absolute_uri
+from sentry.web.client_config import get_client_config
 from sentry.web.forms.accounts import TwoFactorForm
 from sentry.web.frontend.base import BaseView, control_silo_view
 from sentry.web.helpers import render_to_response
@@ -26,6 +28,36 @@
 
 logger = logging.getLogger(__name__)
 
+MFA_RATE_LIMITS = {
+    "auth-2fa:user:{user_id}": {
+        "limit": 5,
+        "window": 20,
+    },
+    "auth-2fa-long:user:{user_id}": {
+        "limit": 20,
+        "window": 60 * 60,
+    },
+}
+
+
+def is_rate_limited(user_id: int) -> bool:
+    result = False
+    for key_template, rl in MFA_RATE_LIMITS.items():
+        result = result or ratelimiter.backend.is_limited(
+            key_template.format(user_id=user_id),
+            limit=rl["limit"],
+            window=rl["window"],
+        )
+    return result
+
+
+def reset_2fa_rate_limits(user_id: int):
+    for key_template, rl in MFA_RATE_LIMITS.items():
+        ratelimiter.backend.reset(
+            key_template.format(user_id=user_id),
+            window=rl["window"],
+        )
+
 
 @control_silo_view
 class TwoFactorAuthView(BaseView):
@@ -112,12 +144,16 @@ def validate_otp(self, otp, selected_interface, all_interfaces=None):
                 return interface
 
     def send_notification_email(self, email, ip_address):
+        recover_uri = "{path}?{query}".format(
+            path=reverse("sentry-account-recover"), query=urlencode({"email": email})
+        )
         context = {
             "datetime": timezone.now(),
             "email": email,
             "geo": geo_by_addr(ip_address),
             "ip_address": ip_address,
             "url": absolute_uri(reverse("sentry-account-settings-security")),
+            "recover_url": absolute_uri(recover_uri),
         }
 
         subject = "Suspicious Activity Detected"
@@ -146,13 +182,7 @@ def handle(self, request: HttpRequest) -> HttpResponse:
         challenge = activation = None
         interface = self.negotiate_interface(request, interfaces)
 
-        is_rate_limited = ratelimiter.backend.is_limited(
-            f"auth-2fa:user:{user.id}", limit=5, window=20
-        ) or ratelimiter.backend.is_limited(
-            f"auth-2fa-long:user:{user.id}", limit=20, window=60 * 60
-        )
-
-        if request.method == "POST" and is_rate_limited:
+        if request.method == "POST" and is_rate_limited(user.id):
             # prevent spamming due to failed 2FA attempts
             if not ratelimiter.backend.is_limited(
                 f"auth-2fa-failed-notification:user:{user.id}", limit=1, window=30 * 60
@@ -220,6 +250,7 @@ def handle(self, request: HttpRequest) -> HttpResponse:
                 "interface": interface,
                 "other_interfaces": self.get_other_interfaces(interface, interfaces),
                 "activation": activation,
+                "react_config": get_client_config(request, self.active_organization),
             },
             request,
             status=200,
diff --git a/src/sentry/web/urls.py b/src/sentry/web/urls.py
index dd5361143698c0..69cbedc6987a02 100644
--- a/src/sentry/web/urls.py
+++ b/src/sentry/web/urls.py
@@ -623,6 +623,11 @@
                     react_page_view,
                     name="sentry-customer-domain-audit-log-settings",
                 ),
+                re_path(
+                    r"^rate-limits/",
+                    react_page_view,
+                    name="sentry-customer-domain-rate-limits-settings",
+                ),
                 re_path(
                     r"^relay/",
                     react_page_view,
@@ -638,6 +643,16 @@
                     react_page_view,
                     name="sentry-customer-domain-integrations-settings",
                 ),
+                re_path(
+                    r"^dynamic-sampling/",
+                    react_page_view,
+                    name="sentry-customer-domain-dynamic-sampling-settings",
+                ),
+                re_path(
+                    r"^feature-flags/",
+                    react_page_view,
+                    name="sentry-customer-domain-feature-flags-settings",
+                ),
                 re_path(
                     r"^developer-settings/",
                     react_page_view,
@@ -678,11 +693,6 @@
                     react_page_view,
                     name="sentry-customer-domain-legal-settings",
                 ),
-                re_path(
-                    r"^dynamic-sampling/",
-                    react_page_view,
-                    name="sentry-customer-domain-dynamic-sampling-settings",
-                ),
                 re_path(
                     r"^(?P<organization_slug>[\w_-]+)/$",
                     react_page_view,
diff --git a/src/sentry/workflow_engine/endpoints/serializers.py b/src/sentry/workflow_engine/endpoints/serializers.py
index af736bb054be54..e3975982f4e8fa 100644
--- a/src/sentry/workflow_engine/endpoints/serializers.py
+++ b/src/sentry/workflow_engine/endpoints/serializers.py
@@ -58,7 +58,7 @@ class DataConditionSerializer(Serializer):
     def serialize(self, obj: DataCondition, *args, **kwargs) -> dict[str, Any]:
         return {
             "id": str(obj.id),
-            "condition": obj.condition,
+            "condition": obj.type,
             "comparison": obj.comparison,
             "result": obj.condition_result,
         }
diff --git a/src/sentry/workflow_engine/endpoints/validators.py b/src/sentry/workflow_engine/endpoints/validators.py
index 79312091bb79be..4a1829a7f971c6 100644
--- a/src/sentry/workflow_engine/endpoints/validators.py
+++ b/src/sentry/workflow_engine/endpoints/validators.py
@@ -37,7 +37,7 @@ def create(self) -> T:
 
 class BaseDataConditionValidator(CamelSnakeSerializer):
 
-    condition = serializers.CharField(
+    type = serializers.CharField(
         required=True,
         max_length=200,
         help_text="Condition used to compare data value to the stored comparison value",
@@ -51,14 +51,8 @@ def comparison(self) -> Field:
     def result(self) -> Field:
         raise NotImplementedError
 
-    @property
-    def type(self) -> str:
-        # TODO: This should probably at least be an enum
-        raise NotImplementedError
-
     def validate(self, attrs):
         attrs = super().validate(attrs)
-        attrs["type"] = self.type
         return attrs
 
 
@@ -84,15 +78,15 @@ def supported_conditions(self) -> frozenset[Condition]:
     def supported_results(self) -> frozenset[DetectorPriorityLevel]:
         raise NotImplementedError
 
-    def validate_condition(self, value: str) -> Condition:
+    def validate_type(self, value: str) -> Condition:
         try:
-            condition = Condition(value)
+            type = Condition(value)
         except ValueError:
-            condition = None
+            type = None
 
-        if condition not in self.supported_conditions:
-            raise serializers.ValidationError(f"Unsupported condition {value}")
-        return condition
+        if type not in self.supported_conditions:
+            raise serializers.ValidationError(f"Unsupported type {value}")
+        return type
 
     def validate_result(self, value: str) -> DetectorPriorityLevel:
         try:
@@ -160,7 +154,6 @@ def create(self, validated_data):
             )
             for condition in validated_data["data_conditions"]:
                 DataCondition.objects.create(
-                    condition=condition["condition"],
                     comparison=condition["comparison"],
                     condition_result=condition["result"],
                     type=condition["type"],
diff --git a/src/sentry/workflow_engine/handlers/__init__.py b/src/sentry/workflow_engine/handlers/__init__.py
index 4fc3428a0ce1e4..50363cc9ce97a4 100644
--- a/src/sentry/workflow_engine/handlers/__init__.py
+++ b/src/sentry/workflow_engine/handlers/__init__.py
@@ -1,5 +1,9 @@
 # Export any handlers we want to include into the registry
-__all__ = ["NotificationActionHandler", "GroupEventConditionHandler"]
+__all__ = [
+    "NotificationActionHandler",
+    "EventCreatedByDetectorConditionHandler",
+    "EventSeenCountConditionHandler",
+]
 
 from .action import NotificationActionHandler
-from .condition import GroupEventConditionHandler
+from .condition import EventCreatedByDetectorConditionHandler, EventSeenCountConditionHandler
diff --git a/src/sentry/workflow_engine/handlers/action/notification.py b/src/sentry/workflow_engine/handlers/action/notification.py
index 97e8cf84f39818..91b8bfcc96e718 100644
--- a/src/sentry/workflow_engine/handlers/action/notification.py
+++ b/src/sentry/workflow_engine/handlers/action/notification.py
@@ -1,14 +1,15 @@
-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
+from sentry.workflow_engine.types import ActionHandler, WorkflowJob
 
 
-@action_handler_registry.register(Action.Type.NOTIFICATION)
+# TODO - Enable once the PR to allow for multiple of the same funcs is merged
+# @action_handler_registry.register(Action.Type.PAGERDUTY)
+@action_handler_registry.register(Action.Type.SLACK)
 class NotificationActionHandler(ActionHandler):
     @staticmethod
     def execute(
-        evt: GroupEvent,
+        job: WorkflowJob,
         action: Action,
         detector: Detector,
     ) -> None:
diff --git a/src/sentry/workflow_engine/handlers/condition/__init__.py b/src/sentry/workflow_engine/handlers/condition/__init__.py
index 85a4596d38b75e..cc0ca9879d61bb 100644
--- a/src/sentry/workflow_engine/handlers/condition/__init__.py
+++ b/src/sentry/workflow_engine/handlers/condition/__init__.py
@@ -1,5 +1,25 @@
 __all__ = [
-    "GroupEventConditionHandler",
+    "EventCreatedByDetectorConditionHandler",
+    "EventSeenCountConditionHandler",
+    "EveryEventConditionHandler",
+    "ReappearedEventConditionHandler",
+    "RegressionEventConditionHandler",
+    "ExistingHighPriorityIssueConditionHandler",
+    "EventAttributeConditionHandler",
+    "FirstSeenEventConditionHandler",
+    "NewHighPriorityIssueConditionHandler",
 ]
 
-from .group_event import GroupEventConditionHandler
+from .group_event_handlers import (
+    EventAttributeConditionHandler,
+    EventCreatedByDetectorConditionHandler,
+    EventSeenCountConditionHandler,
+    EveryEventConditionHandler,
+)
+from .group_state_handlers import (
+    ExistingHighPriorityIssueConditionHandler,
+    FirstSeenEventConditionHandler,
+    NewHighPriorityIssueConditionHandler,
+    ReappearedEventConditionHandler,
+    RegressionEventConditionHandler,
+)
diff --git a/src/sentry/workflow_engine/handlers/condition/group_event.py b/src/sentry/workflow_engine/handlers/condition/group_event.py
deleted file mode 100644
index e392db084cfdd9..00000000000000
--- a/src/sentry/workflow_engine/handlers/condition/group_event.py
+++ /dev/null
@@ -1,29 +0,0 @@
-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/condition/group_event_handlers.py b/src/sentry/workflow_engine/handlers/condition/group_event_handlers.py
new file mode 100644
index 00000000000000..f825f7eb900154
--- /dev/null
+++ b/src/sentry/workflow_engine/handlers/condition/group_event_handlers.py
@@ -0,0 +1,85 @@
+from typing import Any
+
+import sentry_sdk
+
+from sentry.eventstore.models import GroupEvent
+from sentry.rules import MatchType, match_values
+from sentry.rules.conditions.event_attribute import attribute_registry
+from sentry.utils.registry import NoRegistrationExistsError
+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, WorkflowJob
+
+
+@condition_handler_registry.register(Condition.EVENT_CREATED_BY_DETECTOR)
+class EventCreatedByDetectorConditionHandler(DataConditionHandler[WorkflowJob]):
+    @staticmethod
+    def evaluate_value(job: WorkflowJob, comparison: Any) -> bool:
+        event = job["event"]
+        if event.occurrence is None or event.occurrence.evidence_data is None:
+            return False
+
+        return event.occurrence.evidence_data.get("detector_id", None) == comparison
+
+
+@condition_handler_registry.register(Condition.EVERY_EVENT)
+class EveryEventConditionHandler(DataConditionHandler[WorkflowJob]):
+    @staticmethod
+    def evaluate_value(job: WorkflowJob, comparison: Any) -> bool:
+        return True
+
+
+@condition_handler_registry.register(Condition.EVENT_SEEN_COUNT)
+class EventSeenCountConditionHandler(DataConditionHandler[WorkflowJob]):
+    @staticmethod
+    def evaluate_value(job: WorkflowJob, comparison: Any) -> bool:
+        event = job["event"]
+        return event.group.times_seen == comparison
+
+
+@condition_handler_registry.register(Condition.EVENT_ATTRIBUTE)
+class EventAttributeConditionHandler(DataConditionHandler[WorkflowJob]):
+    @staticmethod
+    def get_attribute_values(event: GroupEvent, attribute: str) -> list[str]:
+        path = attribute.split(".")
+        first_attribute = path[0]
+        try:
+            attribute_handler = attribute_registry.get(first_attribute)
+        except NoRegistrationExistsError:
+            attribute_handler = None
+
+        if not attribute_handler:
+            attribute_values = []
+        else:
+            try:
+                attribute_values = attribute_handler.handle(path, event)
+            except KeyError as e:
+                attribute_values = []
+                sentry_sdk.capture_exception(e)
+
+        attribute_values = [str(value).lower() for value in attribute_values if value is not None]
+
+        return attribute_values
+
+    @staticmethod
+    def evaluate_value(job: WorkflowJob, comparison: Any) -> bool:
+        event = job["event"]
+        attribute = comparison.get("attribute", "")
+        attribute_values = EventAttributeConditionHandler.get_attribute_values(event, attribute)
+
+        match = comparison.get("match")
+        desired_value = comparison.get("value")
+        if not (match and desired_value) and not (match in (MatchType.IS_SET, MatchType.NOT_SET)):
+            return False
+
+        desired_value = str(desired_value).lower()
+
+        # NOTE: IS_SET condition differs btw tagged_event and event_attribute so not handled by match_values
+        if match == MatchType.IS_SET:
+            return bool(attribute_values)
+        elif match == MatchType.NOT_SET:
+            return not attribute_values
+
+        return match_values(
+            group_values=attribute_values, match_value=desired_value, match_type=match
+        )
diff --git a/src/sentry/workflow_engine/handlers/condition/group_state_handlers.py b/src/sentry/workflow_engine/handlers/condition/group_state_handlers.py
new file mode 100644
index 00000000000000..481de774e49243
--- /dev/null
+++ b/src/sentry/workflow_engine/handlers/condition/group_state_handlers.py
@@ -0,0 +1,73 @@
+from typing import Any
+
+from sentry.types.group import PriorityLevel
+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, WorkflowJob
+
+
+def is_new_event(job: WorkflowJob) -> bool:
+    state = job.get("group_state")
+    if state is None:
+        return False
+
+    workflow = job.get("workflow")
+    if workflow is None or workflow.environment_id is None:
+        return state["is_new"]
+
+    return state["is_new_group_environment"]
+
+
+@condition_handler_registry.register(Condition.REGRESSION_EVENT)
+class RegressionEventConditionHandler(DataConditionHandler[WorkflowJob]):
+    @staticmethod
+    def evaluate_value(job: WorkflowJob, comparison: Any) -> bool:
+        state = job.get("group_state")
+        if state is None:
+            return False
+
+        return state["is_regression"] == comparison
+
+
+@condition_handler_registry.register(Condition.REAPPEARED_EVENT)
+class ReappearedEventConditionHandler(DataConditionHandler[WorkflowJob]):
+    @staticmethod
+    def evaluate_value(job: WorkflowJob, comparison: Any) -> bool:
+        has_reappeared = job.get("has_reappeared")
+        if has_reappeared is None:
+            return False
+
+        return has_reappeared == comparison
+
+
+@condition_handler_registry.register(Condition.EXISTING_HIGH_PRIORITY_ISSUE)
+class ExistingHighPriorityIssueConditionHandler(DataConditionHandler[WorkflowJob]):
+    @staticmethod
+    def evaluate_value(job: WorkflowJob, comparison: Any) -> bool:
+        state = job.get("group_state")
+        if state is None or state["is_new"]:
+            return False
+
+        has_reappeared = job.get("has_reappeared", False)
+        has_escalated = job.get("has_escalated", False)
+        is_escalating = has_reappeared or has_escalated
+        return is_escalating and job["event"].group.priority == PriorityLevel.HIGH
+
+
+@condition_handler_registry.register(Condition.FIRST_SEEN_EVENT)
+class FirstSeenEventConditionHandler(DataConditionHandler[WorkflowJob]):
+    @staticmethod
+    def evaluate_value(job: WorkflowJob, comparison: Any) -> bool:
+        return is_new_event(job)
+
+
+@condition_handler_registry.register(Condition.NEW_HIGH_PRIORITY_ISSUE)
+class NewHighPriorityIssueConditionHandler(DataConditionHandler[WorkflowJob]):
+    @staticmethod
+    def evaluate_value(job: WorkflowJob, comparison: Any) -> bool:
+        is_new = is_new_event(job)
+        event = job["event"]
+        if not event.project.flags.has_high_priority_alerts:
+            return is_new
+
+        return is_new and event.group.priority == PriorityLevel.HIGH
diff --git a/src/sentry/workflow_engine/handlers/detector/stateful.py b/src/sentry/workflow_engine/handlers/detector/stateful.py
index 8171787ad38d46..67781e8795ad41 100644
--- a/src/sentry/workflow_engine/handlers/detector/stateful.py
+++ b/src/sentry/workflow_engine/handlers/detector/stateful.py
@@ -54,7 +54,7 @@ def get_dedupe_value(self, data_packet: DataPacket[T]) -> int:
         pass
 
     @abc.abstractmethod
-    def get_group_key_values(self, data_packet: DataPacket[T]) -> dict[str, int]:
+    def get_group_key_values(self, data_packet: DataPacket[T]) -> dict[DetectorGroupKey, 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.
@@ -70,6 +70,9 @@ def build_occurrence_and_event_data(
     def build_fingerprint(self, group_key) -> list[str]:
         """
         Builds a fingerprint to uniquely identify a detected issue
+
+        TODO - Take into account the data source / query that triggered the detector,
+        we'll want to create a new issue if the query changes.
         """
         return [f"{self.detector.id}{':' + group_key if group_key is not None else ''}"]
 
@@ -84,13 +87,17 @@ def get_state_data(
         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)
@@ -117,7 +124,7 @@ def get_state_data(
                     else DetectorPriorityLevel.OK
                 ),
                 dedupe_value=group_key_dedupe_values[gk],
-                counter_updates=counter_updates[gk],
+                counter_updates=counter_updates.get(gk, {}),
             )
         return results
 
diff --git a/src/sentry/workflow_engine/migration_helpers/alert_rule.py b/src/sentry/workflow_engine/migration_helpers/alert_rule.py
new file mode 100644
index 00000000000000..79f2fdb43452bd
--- /dev/null
+++ b/src/sentry/workflow_engine/migration_helpers/alert_rule.py
@@ -0,0 +1,157 @@
+from sentry.incidents.grouptype import MetricAlertFire
+from sentry.incidents.models.alert_rule import AlertRule
+from sentry.snuba.models import QuerySubscription, SnubaQuery
+from sentry.users.services.user import RpcUser
+from sentry.workflow_engine.models import (
+    AlertRuleDetector,
+    AlertRuleWorkflow,
+    DataConditionGroup,
+    DataSource,
+    Detector,
+    DetectorState,
+    DetectorWorkflow,
+    Workflow,
+    WorkflowDataConditionGroup,
+)
+from sentry.workflow_engine.types import DetectorPriorityLevel
+
+
+def create_metric_alert_lookup_tables(
+    alert_rule: AlertRule,
+    detector: Detector,
+    workflow: Workflow,
+    data_source: DataSource,
+    data_condition_group: DataConditionGroup,
+) -> tuple[AlertRuleDetector, AlertRuleWorkflow, DetectorWorkflow, WorkflowDataConditionGroup]:
+    alert_rule_detector = AlertRuleDetector.objects.create(alert_rule=alert_rule, detector=detector)
+    alert_rule_workflow = AlertRuleWorkflow.objects.create(alert_rule=alert_rule, workflow=workflow)
+    detector_workflow = DetectorWorkflow.objects.create(detector=detector, workflow=workflow)
+    workflow_data_condition_group = WorkflowDataConditionGroup.objects.create(
+        condition_group=data_condition_group, workflow=workflow
+    )
+    return (
+        alert_rule_detector,
+        alert_rule_workflow,
+        detector_workflow,
+        workflow_data_condition_group,
+    )
+
+
+def create_data_source(
+    organization_id: int, snuba_query: SnubaQuery | None = None
+) -> DataSource | None:
+    if not snuba_query:
+        return None
+
+    try:
+        query_subscription = QuerySubscription.objects.get(snuba_query=snuba_query.id)
+    except QuerySubscription.DoesNotExist:
+        return None
+
+    return DataSource.objects.create(
+        organization_id=organization_id,
+        query_id=query_subscription.id,
+        type="snuba_query_subscription",
+    )
+
+
+def create_data_condition_group(organization_id: int) -> DataConditionGroup:
+    return DataConditionGroup.objects.create(
+        logic_type=DataConditionGroup.Type.ANY,
+        organization_id=organization_id,
+    )
+
+
+def create_workflow(
+    name: str,
+    organization_id: int,
+    data_condition_group: DataConditionGroup,
+    user: RpcUser | None = None,
+) -> Workflow:
+    return Workflow.objects.create(
+        name=name,
+        organization_id=organization_id,
+        when_condition_group=data_condition_group,
+        enabled=True,
+        created_by_id=user.id if user else None,
+        config={},
+    )
+
+
+def create_detector(
+    alert_rule: AlertRule,
+    project_id: int,
+    data_condition_group: DataConditionGroup,
+    user: RpcUser | None = None,
+) -> Detector:
+    return Detector.objects.create(
+        project_id=project_id,
+        enabled=True,
+        created_by_id=user.id if user else None,
+        name=alert_rule.name,
+        workflow_condition_group=data_condition_group,
+        type=MetricAlertFire.slug,
+        description=alert_rule.description,
+        owner_user_id=alert_rule.user_id,
+        owner_team=alert_rule.team,
+        config={  # TODO create a schema
+            "threshold_period": alert_rule.threshold_period,
+            "sensitivity": alert_rule.sensitivity,
+            "seasonality": alert_rule.seasonality,
+            "comparison_delta": alert_rule.comparison_delta,
+        },
+    )
+
+
+def migrate_alert_rule(
+    alert_rule: AlertRule,
+    user: RpcUser | None = None,
+) -> (
+    tuple[
+        DataSource,
+        DataConditionGroup,
+        Workflow,
+        Detector,
+        DetectorState,
+        AlertRuleDetector,
+        AlertRuleWorkflow,
+        DetectorWorkflow,
+        WorkflowDataConditionGroup,
+    ]
+    | None
+):
+    organization_id = alert_rule.organization_id
+    project = alert_rule.projects.first()
+    if not project:
+        return None
+
+    data_source = create_data_source(organization_id, alert_rule.snuba_query)
+    if not data_source:
+        return None
+
+    data_condition_group = create_data_condition_group(organization_id)
+    workflow = create_workflow(alert_rule.name, organization_id, data_condition_group, user)
+    detector = create_detector(alert_rule, project.id, data_condition_group, user)
+
+    data_source.detectors.set([detector])
+    detector_state = DetectorState.objects.create(
+        detector=detector,
+        active=False,
+        state=DetectorPriorityLevel.OK,
+    )
+    alert_rule_detector, alert_rule_workflow, detector_workflow, workflow_data_condition_group = (
+        create_metric_alert_lookup_tables(
+            alert_rule, detector, workflow, data_source, data_condition_group
+        )
+    )
+    return (
+        data_source,
+        data_condition_group,
+        workflow,
+        detector,
+        detector_state,
+        alert_rule_detector,
+        alert_rule_workflow,
+        detector_workflow,
+        workflow_data_condition_group,
+    )
diff --git a/src/sentry/workflow_engine/migration_helpers/issue_alert_conditions.py b/src/sentry/workflow_engine/migration_helpers/issue_alert_conditions.py
new file mode 100644
index 00000000000000..bd6c7bfd1e1484
--- /dev/null
+++ b/src/sentry/workflow_engine/migration_helpers/issue_alert_conditions.py
@@ -0,0 +1,107 @@
+from collections.abc import Callable
+from typing import Any
+
+from sentry.rules.conditions.event_attribute import EventAttributeCondition
+from sentry.rules.conditions.every_event import EveryEventCondition
+from sentry.rules.conditions.existing_high_priority_issue import ExistingHighPriorityIssueCondition
+from sentry.rules.conditions.first_seen_event import FirstSeenEventCondition
+from sentry.rules.conditions.new_high_priority_issue import NewHighPriorityIssueCondition
+from sentry.rules.conditions.reappeared_event import ReappearedEventCondition
+from sentry.rules.conditions.regression_event import RegressionEventCondition
+from sentry.utils.registry import Registry
+from sentry.workflow_engine.models.data_condition import Condition, DataCondition
+from sentry.workflow_engine.models.data_condition_group import DataConditionGroup
+
+data_condition_translator_registry = Registry[
+    Callable[[dict[str, Any], DataConditionGroup], DataCondition]
+]()
+
+
+def translate_to_data_condition(data: dict[str, Any], dcg: DataConditionGroup):
+    translator = data_condition_translator_registry.get(data["id"])
+    return translator(data, dcg)
+
+
+@data_condition_translator_registry.register(ReappearedEventCondition.id)
+def create_reappeared_event_data_condition(
+    data: dict[str, Any], dcg: DataConditionGroup
+) -> DataCondition:
+    return DataCondition.objects.create(
+        type=Condition.REAPPEARED_EVENT,
+        comparison=True,
+        condition_result=True,
+        condition_group=dcg,
+    )
+
+
+@data_condition_translator_registry.register(RegressionEventCondition.id)
+def create_regressed_event_data_condition(
+    data: dict[str, Any], dcg: DataConditionGroup
+) -> DataCondition:
+    return DataCondition.objects.create(
+        type=Condition.REGRESSION_EVENT,
+        comparison=True,
+        condition_result=True,
+        condition_group=dcg,
+    )
+
+
+@data_condition_translator_registry.register(EveryEventCondition.id)
+def create_every_event_data_condition(
+    data: dict[str, Any], dcg: DataConditionGroup
+) -> DataCondition:
+    return DataCondition.objects.create(
+        type=Condition.EVERY_EVENT,
+        comparison=True,
+        condition_result=True,
+        condition_group=dcg,
+    )
+
+
+@data_condition_translator_registry.register(ExistingHighPriorityIssueCondition.id)
+def create_existing_high_priority_issue_data_condition(
+    data: dict[str, Any], dcg: DataConditionGroup
+) -> DataCondition:
+    return DataCondition.objects.create(
+        type=Condition.EXISTING_HIGH_PRIORITY_ISSUE,
+        comparison=True,
+        condition_result=True,
+        condition_group=dcg,
+    )
+
+
+@data_condition_translator_registry.register(EventAttributeCondition.id)
+def create_event_attribute_data_condition(
+    data: dict[str, Any], dcg: DataConditionGroup
+) -> DataCondition:
+    comparison = {"match": data["match"], "value": data["value"], "attribute": data["attribute"]}
+    return DataCondition.objects.create(
+        type=Condition.EVENT_ATTRIBUTE,
+        comparison=comparison,
+        condition_result=True,
+        condition_group=dcg,
+    )
+
+
+@data_condition_translator_registry.register(FirstSeenEventCondition.id)
+def create_first_seen_event_data_condition(
+    data: dict[str, Any], dcg: DataConditionGroup
+) -> DataCondition:
+    return DataCondition.objects.create(
+        type=Condition.FIRST_SEEN_EVENT,
+        comparison=True,
+        condition_result=True,
+        condition_group=dcg,
+    )
+
+
+@data_condition_translator_registry.register(NewHighPriorityIssueCondition.id)
+def create_new_high_priority_issue_condition(
+    data: dict[str, Any], dcg: DataConditionGroup
+) -> DataCondition:
+    return DataCondition.objects.create(
+        type=Condition.NEW_HIGH_PRIORITY_ISSUE,
+        comparison=True,
+        condition_result=True,
+        condition_group=dcg,
+    )
diff --git a/src/sentry/workflow_engine/migrations/0016_refactor_action_model.py b/src/sentry/workflow_engine/migrations/0016_refactor_action_model.py
new file mode 100644
index 00000000000000..15511e36ffd139
--- /dev/null
+++ b/src/sentry/workflow_engine/migrations/0016_refactor_action_model.py
@@ -0,0 +1,33 @@
+# Generated by Django 5.1.4 on 2024-12-17 03:31
+
+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", "0015_create_rule_lookup_tables"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="action",
+            name="legacy_notification_type",
+            field=models.TextField(null=True),
+        ),
+    ]
diff --git a/src/sentry/workflow_engine/migrations/0017_ref_data_condition.py b/src/sentry/workflow_engine/migrations/0017_ref_data_condition.py
new file mode 100644
index 00000000000000..45cc499ced28fb
--- /dev/null
+++ b/src/sentry/workflow_engine/migrations/0017_ref_data_condition.py
@@ -0,0 +1,38 @@
+# Generated by Django 5.1.4 on 2024-12-18 05:36
+
+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", "0016_refactor_action_model"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="datacondition",
+            name="condition",
+            field=models.CharField(max_length=200, null=True),
+        ),
+        migrations.AlterField(
+            model_name="datacondition",
+            name="type",
+            field=models.CharField(default="eq", max_length=200),
+        ),
+    ]
diff --git a/src/sentry/workflow_engine/migrations/0018_rm_data_condition_condition.py b/src/sentry/workflow_engine/migrations/0018_rm_data_condition_condition.py
new file mode 100644
index 00000000000000..bc82885d5bdaaf
--- /dev/null
+++ b/src/sentry/workflow_engine/migrations/0018_rm_data_condition_condition.py
@@ -0,0 +1,33 @@
+# Generated by Django 5.1.4 on 2024-12-18 22:21
+
+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 = [
+        ("workflow_engine", "0017_ref_data_condition"),
+    ]
+
+    operations = [
+        SafeRemoveField(
+            model_name="datacondition",
+            name="condition",
+            deletion_action=DeletionAction.MOVE_TO_PENDING,
+        ),
+    ]
diff --git a/src/sentry/workflow_engine/migrations/0019_drop_dataconditions_condition.py b/src/sentry/workflow_engine/migrations/0019_drop_dataconditions_condition.py
new file mode 100644
index 00000000000000..9c96936d1ec154
--- /dev/null
+++ b/src/sentry/workflow_engine/migrations/0019_drop_dataconditions_condition.py
@@ -0,0 +1,33 @@
+# Generated by Django 5.1.4 on 2024-12-19 19:56
+
+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 = [
+        ("workflow_engine", "0018_rm_data_condition_condition"),
+    ]
+
+    operations = [
+        SafeRemoveField(
+            model_name="datacondition",
+            name="condition",
+            deletion_action=DeletionAction.DELETE,
+        ),
+    ]
diff --git a/src/sentry/workflow_engine/models/action.py b/src/sentry/workflow_engine/models/action.py
index 027ef5cf11c933..efc7a1e3dabd9f 100644
--- a/src/sentry/workflow_engine/models/action.py
+++ b/src/sentry/workflow_engine/models/action.py
@@ -7,10 +7,9 @@
 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.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
+from sentry.workflow_engine.types import ActionHandler, WorkflowJob
 
 if TYPE_CHECKING:
     from sentry.workflow_engine.models import Detector
@@ -30,9 +29,15 @@ class Action(DefaultFieldsModel):
     __repr__ = sane_repr("id", "type")
 
     class Type(models.TextChoices):
-        NOTIFICATION = "notification"
+        EMAIL = "email"
+        SLACK = "slack"
+        PAGERDUTY = "pagerduty"
         WEBHOOK = "webhook"
 
+    class LegacyNotificationType(models.TextChoices):
+        ISSUE_ALERT = "issue"
+        METRIC_ALERT = "metric"
+
     # 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)
@@ -46,6 +51,13 @@ class Type(models.TextChoices):
         "sentry.Integration", blank=True, null=True, on_delete="CASCADE"
     )
 
+    # LEGACY: The legacy_notification_type is used to denote if this notification was for an issue alert, metric alert, etc.
+    # We need this because of how tightly coupled the notification system is with the legacy alert models
+    legacy_notification_type = models.TextField(
+        null=True,
+        choices=LegacyNotificationType.choices,
+    )
+
     # LEGACY: The target_display is used to display the target's name in notifications
     target_display = models.TextField(null=True)
 
@@ -59,7 +71,7 @@ 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:
+    def trigger(self, job: WorkflowJob, detector: Detector) -> None:
         # get the handler for the action type
         handler = self.get_handler()
-        handler.execute(evt, self, detector)
+        handler.execute(job, self, detector)
diff --git a/src/sentry/workflow_engine/models/data_condition.py b/src/sentry/workflow_engine/models/data_condition.py
index 9ed3efc66c5c55..22aecf98180a67 100644
--- a/src/sentry/workflow_engine/models/data_condition.py
+++ b/src/sentry/workflow_engine/models/data_condition.py
@@ -1,7 +1,5 @@
 import logging
 import operator
-from collections.abc import Callable
-from enum import StrEnum
 from typing import Any, TypeVar, cast
 
 from django.db import models
@@ -10,23 +8,27 @@
 from sentry.db.models import DefaultFieldsModel, region_silo_model, sane_repr
 from sentry.utils.registry import NoRegistrationExistsError
 from sentry.workflow_engine.registry import condition_handler_registry
-from sentry.workflow_engine.types import (
-    DataConditionHandler,
-    DataConditionResult,
-    DetectorPriorityLevel,
-)
+from sentry.workflow_engine.types import DataConditionResult, DetectorPriorityLevel
 
 logger = logging.getLogger(__name__)
 
 
-class Condition(StrEnum):
+class Condition(models.TextChoices):
     EQUAL = "eq"
     GREATER_OR_EQUAL = "gte"
     GREATER = "gt"
     LESS_OR_EQUAL = "lte"
     LESS = "lt"
     NOT_EQUAL = "ne"
-    GROUP_EVENT_ATTR_COMPARISON = "group_event_attr_comparison"
+    EVENT_ATTRIBUTE = "event_attribute"
+    EVENT_CREATED_BY_DETECTOR = "event_created_by_detector"
+    EVENT_SEEN_COUNT = "event_seen_count"
+    EVERY_EVENT = "every_event"
+    EXISTING_HIGH_PRIORITY_ISSUE = "existing_high_priority_issue"
+    FIRST_SEEN_EVENT = "first_seen_event"
+    NEW_HIGH_PRIORITY_ISSUE = "new_high_priority_issue"
+    REGRESSION_EVENT = "regression_event"
+    REAPPEARED_EVENT = "reappeared_event"
 
 
 condition_ops = {
@@ -50,9 +52,6 @@ class DataCondition(DefaultFieldsModel):
     __relocation_scope__ = RelocationScope.Organization
     __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)
-
     # The comparison is the value that the condition is compared to for the evaluation, this must be a primitive value
     comparison = models.JSONField()
 
@@ -60,7 +59,7 @@ class DataCondition(DefaultFieldsModel):
     condition_result = models.JSONField()
 
     # The type of condition, this is used to initialize the condition classes
-    type = models.CharField(max_length=200)
+    type = models.CharField(max_length=200, choices=Condition.choices, default=Condition.EQUAL)
 
     condition_group = models.ForeignKey(
         "workflow_engine.DataConditionGroup",
@@ -85,44 +84,31 @@ def get_condition_result(self) -> DataConditionResult:
 
         return None
 
-    def get_condition_handler(self) -> DataConditionHandler[T] | None:
+    def evaluate_value(self, value: T) -> DataConditionResult:
         try:
             condition_type = Condition(self.type)
         except ValueError:
-            # 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}")
-
-        return condition_handler_registry.get(condition_type)
+            logger.exception(
+                "Invalid condition type",
+                extra={"type": self.type, "id": self.id},
+            )
+            return None
 
-    def evaluate_value(self, value: T) -> DataConditionResult:
-        condition_handler: DataConditionHandler[T] | None = None
-        op: Callable | None = None
+        if condition_type in condition_ops:
+            # If the condition is a base type, handle it directly
+            op = condition_ops[Condition(self.type)]
+            result = op(cast(Any, value), self.comparison)
+            return self.get_condition_result() if result else None
 
+        # Otherwise, we need to get the handler and evaluate the value
         try:
-            # Use a custom hanler
-            condition_handler = self.get_condition_handler()
+            handler = condition_handler_registry.get(condition_type)
         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,
-                },
+            logger.exception(
+                "No registration exists for condition",
+                extra={"type": self.type, "id": self.id},
             )
-
             return None
 
-        if result:
-            return self.get_condition_result()
-
-        return None
+        result = handler.evaluate_value(value, self.comparison)
+        return self.get_condition_result() if result else None
diff --git a/src/sentry/workflow_engine/models/data_source.py b/src/sentry/workflow_engine/models/data_source.py
index ebfbc63fd18f14..0ebf62f600ddd4 100644
--- a/src/sentry/workflow_engine/models/data_source.py
+++ b/src/sentry/workflow_engine/models/data_source.py
@@ -3,6 +3,8 @@
 from typing import Generic, TypeVar
 
 from django.db import models
+from django.db.models.signals import pre_save
+from django.dispatch import receiver
 
 from sentry.backup.scopes import RelocationScope
 from sentry.db.models import (
@@ -11,6 +13,7 @@
     FlexibleForeignKey,
     region_silo_model,
 )
+from sentry.utils.registry import NoRegistrationExistsError
 from sentry.workflow_engine.models.data_source_detector import DataSourceDetector
 from sentry.workflow_engine.registry import data_source_type_registry
 from sentry.workflow_engine.types import DataSourceTypeHandler
@@ -29,7 +32,11 @@ class DataSource(DefaultFieldsModel):
     __relocation_scope__ = RelocationScope.Organization
 
     organization = FlexibleForeignKey("sentry.Organization")
+
+    # Should this be a string so we can support UUID / ints?
     query_id = BoundedBigIntegerField()
+
+    # This is a dynamic field, depending on the type in the data_source_type_registry
     type = models.TextField()
 
     detectors = models.ManyToManyField("workflow_engine.Detector", through=DataSourceDetector)
@@ -45,3 +52,19 @@ def type_handler(self) -> builtins.type[DataSourceTypeHandler]:
         if not handler:
             raise ValueError(f"Unknown data source type: {self.type}")
         return handler
+
+
+@receiver(pre_save, sender=DataSource)
+def ensure_type_handler_registered(sender, instance: DataSource, **kwargs):
+    """
+    Ensure that the type of the data source is valid and registered in the data_source_type_registry
+    """
+    data_source_type = instance.type
+
+    if not data_source_type:
+        raise ValueError(f"No group type found with type {instance.type}")
+
+    try:
+        data_source_type_registry.get(data_source_type)
+    except NoRegistrationExistsError:
+        raise ValueError(f"No data source type found with type {data_source_type}")
diff --git a/src/sentry/workflow_engine/models/detector.py b/src/sentry/workflow_engine/models/detector.py
index c11a3851b608ce..0cc2145a06a1c5 100644
--- a/src/sentry/workflow_engine/models/detector.py
+++ b/src/sentry/workflow_engine/models/detector.py
@@ -7,6 +7,8 @@
 from django.conf import settings
 from django.db import models
 from django.db.models import UniqueConstraint
+from django.db.models.signals import pre_save
+from django.dispatch import receiver
 
 from sentry.backup.scopes import RelocationScope
 from sentry.db.models import DefaultFieldsModel, FlexibleForeignKey, region_silo_model
@@ -53,17 +55,12 @@ class Detector(DefaultFieldsModel, OwnerModel, JSONConfigBase):
         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
+    # maps to registry (sentry.issues.grouptype.registry) entries for GroupType.slug in sentry.issues.grouptype.GroupType
     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(
@@ -83,7 +80,6 @@ def detector_handler(self) -> DetectorHandler | None:
             logger.error(
                 "No registered grouptype for detector",
                 extra={
-                    "group_type": str(group_type),
                     "detector_id": self.id,
                     "detector_type": self.type,
                 },
@@ -105,3 +101,18 @@ def detector_handler(self) -> DetectorHandler | None:
     def get_audit_log_data(self) -> dict[str, Any]:
         # TODO: Create proper audit log data for the detector, group and conditions
         return {}
+
+
+@receiver(pre_save, sender=Detector)
+def enforce_config_schema(sender, instance: Detector, **kwargs):
+    """
+    Ensures the detector type is valid in the grouptype registry.
+    This needs to be a signal because the grouptype registry's entries are not available at import time.
+    """
+    group_type = instance.group_type
+
+    if not group_type:
+        raise ValueError(f"No group type found with type {instance.type}")
+
+    config_schema = group_type.detector_config_schema
+    instance.validate_config(config_schema)
diff --git a/src/sentry/workflow_engine/models/json_config.py b/src/sentry/workflow_engine/models/json_config.py
index 1b353ccf18cbcb..b62b936d9c4007 100644
--- a/src/sentry/workflow_engine/models/json_config.py
+++ b/src/sentry/workflow_engine/models/json_config.py
@@ -1,4 +1,3 @@
-from abc import abstractproperty
 from typing import Any
 
 from django.db import models
@@ -8,13 +7,9 @@
 class JSONConfigBase(models.Model):
     config = models.JSONField(db_default={})
 
-    @abstractproperty
-    def CONFIG_SCHEMA(self) -> dict[str, Any]:
-        pass
-
-    def validate_config(self) -> None:
+    def validate_config(self, schema: dict[str, Any]) -> None:
         try:
-            validate(self.config, self.CONFIG_SCHEMA)
+            validate(self.config, schema)
         except ValidationError as e:
             raise ValidationError(f"Invalid config: {e.message}")
 
diff --git a/src/sentry/workflow_engine/models/workflow.py b/src/sentry/workflow_engine/models/workflow.py
index 13483e258f1532..b37dece9419179 100644
--- a/src/sentry/workflow_engine/models/workflow.py
+++ b/src/sentry/workflow_engine/models/workflow.py
@@ -2,13 +2,15 @@
 
 from django.conf import settings
 from django.db import models
+from django.db.models.signals import pre_save
+from django.dispatch import receiver
 
 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 sentry.workflow_engine.types import WorkflowJob
 
 from .json_config import JSONConfigBase
 
@@ -35,8 +37,20 @@ class Workflow(DefaultFieldsModel, OwnerModel, JSONConfigBase):
     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')
+    def config_schema(self) -> dict[str, Any]:
+        return {
+            "$schema": "https://json-schema.org/draft/2020-12/schema",
+            "title": "Workflow Schema",
+            "type": "object",
+            "properties": {
+                "frequency": {
+                    "description": "How often the workflow should fire for a Group (minutes)",
+                    "type": "integer",
+                    "minimum": 0,
+                },
+            },
+            "additionalProperties": False,
+        }
 
     __repr__ = sane_repr("name", "organization_id")
 
@@ -50,7 +64,7 @@ class Meta:
             )
         ]
 
-    def evaluate_trigger_conditions(self, evt: GroupEvent) -> bool:
+    def evaluate_trigger_conditions(self, job: WorkflowJob) -> 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.
@@ -58,5 +72,11 @@ def evaluate_trigger_conditions(self, evt: GroupEvent) -> bool:
         if self.when_condition_group is None:
             return True
 
-        evaluation, _ = evaluate_condition_group(self.when_condition_group, evt)
+        job["workflow"] = self
+        evaluation, _ = evaluate_condition_group(self.when_condition_group, job)
         return evaluation
+
+
+@receiver(pre_save, sender=Workflow)
+def enforce_config_schema(sender, instance: Workflow, **kwargs):
+    instance.validate_config(instance.config_schema)
diff --git a/src/sentry/workflow_engine/processors/__init__.py b/src/sentry/workflow_engine/processors/__init__.py
index 700cd48361de44..0dca1394898aeb 100644
--- a/src/sentry/workflow_engine/processors/__init__.py
+++ b/src/sentry/workflow_engine/processors/__init__.py
@@ -1,6 +1,8 @@
 __all__ = [
     "process_data_sources",
     "process_detectors",
+    "process_workflows",
+    "process_data_packet",
 ]
 
 from .data_source import process_data_sources
diff --git a/src/sentry/workflow_engine/processors/action.py b/src/sentry/workflow_engine/processors/action.py
index 0e57ee44441aea..bf03015bf37444 100644
--- a/src/sentry/workflow_engine/processors/action.py
+++ b/src/sentry/workflow_engine/processors/action.py
@@ -1,11 +1,11 @@
 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
+from sentry.workflow_engine.types import WorkflowJob
 
 
 def evaluate_workflow_action_filters(
-    workflows: set[Workflow], evt: GroupEvent
+    workflows: set[Workflow], job: WorkflowJob
 ) -> BaseQuerySet[Action]:
     filtered_action_groups: set[DataConditionGroup] = set()
 
@@ -17,7 +17,7 @@ def evaluate_workflow_action_filters(
     ).distinct()
 
     for action_condition in action_conditions:
-        evaluation, result = evaluate_condition_group(action_condition, evt)
+        evaluation, result = evaluate_condition_group(action_condition, job)
 
         if evaluation:
             filtered_action_groups.add(action_condition)
diff --git a/src/sentry/workflow_engine/processors/data_packet.py b/src/sentry/workflow_engine/processors/data_packet.py
new file mode 100644
index 00000000000000..35997e02f627e3
--- /dev/null
+++ b/src/sentry/workflow_engine/processors/data_packet.py
@@ -0,0 +1,24 @@
+from sentry.workflow_engine.handlers.detector import DetectorEvaluationResult
+from sentry.workflow_engine.models import DataPacket, Detector
+from sentry.workflow_engine.processors.data_source import process_data_sources
+from sentry.workflow_engine.processors.detector import process_detectors
+from sentry.workflow_engine.types import DetectorGroupKey
+
+
+def process_data_packets(
+    data_packets: list[DataPacket], query_type: str
+) -> list[tuple[Detector, dict[DetectorGroupKey, DetectorEvaluationResult]]]:
+    """
+    This method ties the two main pre-processing methods together to process
+    the incoming data and create issue occurrences.
+    """
+    processed_sources = process_data_sources(data_packets, query_type)
+
+    results: list[tuple[Detector, dict[DetectorGroupKey, DetectorEvaluationResult]]] = []
+    for data_packet, detectors in processed_sources:
+        detector_results = process_detectors(data_packet, detectors)
+
+        for detector, detector_state in detector_results:
+            results.append((detector, detector_state))
+
+    return results
diff --git a/src/sentry/workflow_engine/processors/data_source.py b/src/sentry/workflow_engine/processors/data_source.py
index f7f375ccf59892..5df9711f4b7775 100644
--- a/src/sentry/workflow_engine/processors/data_source.py
+++ b/src/sentry/workflow_engine/processors/data_source.py
@@ -14,7 +14,8 @@ def process_data_sources(
 ) -> list[tuple[DataPacket, list[Detector]]]:
     metrics.incr("sentry.workflow_engine.process_data_sources", tags={"query_type": query_type})
 
-    data_packet_ids = {packet.query_id for packet in data_packets}
+    # TODO - change data_source.query_id to be a string to support UUIDs
+    data_packet_ids = {int(packet.query_id) for packet in data_packets}
 
     # Fetch all data sources and associated detectors for the given data packets
     with sentry_sdk.start_span(op="sentry.workflow_engine.process_data_sources.fetch_data_sources"):
@@ -23,12 +24,12 @@ def process_data_sources(
         ).prefetch_related(Prefetch("detectors"))
 
     # Build a lookup dict for query_id to detectors
-    query_id_to_detectors = {ds.query_id: list(ds.detectors.all()) for ds in data_sources}
+    query_id_to_detectors = {int(ds.query_id): list(ds.detectors.all()) for ds in data_sources}
 
     # Create the result tuples
     result = []
     for packet in data_packets:
-        detectors = query_id_to_detectors.get(packet.query_id)
+        detectors = query_id_to_detectors.get(int(packet.query_id))
 
         if detectors:
             data_packet_tuple = (packet, detectors)
diff --git a/src/sentry/workflow_engine/processors/detector.py b/src/sentry/workflow_engine/processors/detector.py
index 60bb85e0988190..b0a038fdbcb5c6 100644
--- a/src/sentry/workflow_engine/processors/detector.py
+++ b/src/sentry/workflow_engine/processors/detector.py
@@ -2,22 +2,23 @@
 
 import logging
 
-from sentry.eventstore.models import GroupEvent
+from sentry.issues.grouptype import ErrorGroupType
 from sentry.issues.issue_occurrence import IssueOccurrence
 from sentry.issues.producer import PayloadType, produce_occurrence_to_kafka
 from sentry.workflow_engine.handlers.detector import DetectorEvaluationResult
 from sentry.workflow_engine.models import DataPacket, Detector
-from sentry.workflow_engine.types import DetectorGroupKey, DetectorType
+from sentry.workflow_engine.types import DetectorGroupKey, WorkflowJob
 
 logger = logging.getLogger(__name__)
 
 
 # TODO - cache these by evt.group_id? :thinking:
-def get_detector_by_event(evt: GroupEvent) -> Detector:
+def get_detector_by_event(job: WorkflowJob) -> Detector:
+    evt = job["event"]
     issue_occurrence = evt.occurrence
 
     if issue_occurrence is None:
-        detector = Detector.objects.get(project_id=evt.project_id, type=DetectorType.ERROR)
+        detector = Detector.objects.get(project_id=evt.project_id, type=ErrorGroupType.slug)
     else:
         detector = Detector.objects.get(id=issue_occurrence.evidence_data.get("detector_id", None))
 
diff --git a/src/sentry/workflow_engine/processors/workflow.py b/src/sentry/workflow_engine/processors/workflow.py
index effc18173780a6..be2fe0f88e4e92 100644
--- a/src/sentry/workflow_engine/processors/workflow.py
+++ b/src/sentry/workflow_engine/processors/workflow.py
@@ -2,26 +2,26 @@
 
 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
+from sentry.workflow_engine.types import WorkflowJob
 
 logger = logging.getLogger(__name__)
 
 
-def evaluate_workflow_triggers(workflows: set[Workflow], evt: GroupEvent) -> set[Workflow]:
+def evaluate_workflow_triggers(workflows: set[Workflow], job: WorkflowJob) -> set[Workflow]:
     triggered_workflows: set[Workflow] = set()
 
     for workflow in workflows:
-        if workflow.evaluate_trigger_conditions(evt):
+        if workflow.evaluate_trigger_conditions(job):
             triggered_workflows.add(workflow)
 
     return triggered_workflows
 
 
-def process_workflows(evt: GroupEvent) -> set[Workflow]:
+def process_workflows(job: WorkflowJob) -> 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,
@@ -31,19 +31,19 @@ def process_workflows(evt: GroupEvent) -> set[Workflow]:
     """
     # Check to see if the GroupEvent has an issue occurrence
     try:
-        detector = get_detector_by_event(evt)
+        detector = get_detector_by_event(job)
     except Detector.DoesNotExist:
         metrics.incr("workflow_engine.process_workflows.error")
-        logger.exception("Detector not found for event", extra={"event_id": evt.event_id})
+        logger.exception("Detector not found for event", extra={"event_id": job["event"].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)
+    triggered_workflows = evaluate_workflow_triggers(workflows, job)
+    actions = evaluate_workflow_action_filters(triggered_workflows, job)
 
     with sentry_sdk.start_span(op="workflow_engine.process_workflows.trigger_actions"):
         for action in actions:
-            action.trigger(evt, detector)
+            action.trigger(job, detector)
 
     return triggered_workflows
diff --git a/src/sentry/workflow_engine/registry.py b/src/sentry/workflow_engine/registry.py
index 2af6b070a1bcf8..ece9577feadd00 100644
--- a/src/sentry/workflow_engine/registry.py
+++ b/src/sentry/workflow_engine/registry.py
@@ -1,8 +1,6 @@
-from typing import Any
-
 from sentry.utils.registry import Registry
 from sentry.workflow_engine.types import ActionHandler, DataConditionHandler, DataSourceTypeHandler
 
 data_source_type_registry = Registry[type[DataSourceTypeHandler]]()
-condition_handler_registry = Registry[DataConditionHandler[Any]]()
+condition_handler_registry = Registry[DataConditionHandler]()
 action_handler_registry = Registry[ActionHandler]()
diff --git a/src/sentry/workflow_engine/types.py b/src/sentry/workflow_engine/types.py
index 50dc15a7010f22..b40f54c2a97448 100644
--- a/src/sentry/workflow_engine/types.py
+++ b/src/sentry/workflow_engine/types.py
@@ -1,13 +1,14 @@
 from __future__ import annotations
 
-from enum import IntEnum, StrEnum
-from typing import TYPE_CHECKING, Any, Generic, TypeVar
+from enum import IntEnum
+from typing import TYPE_CHECKING, Any, Generic, TypedDict, TypeVar
 
 from sentry.types.group import PriorityLevel
 
 if TYPE_CHECKING:
     from sentry.eventstore.models import GroupEvent
-    from sentry.workflow_engine.models import Action, Detector
+    from sentry.eventstream.base import GroupState
+    from sentry.workflow_engine.models import Action, Detector, Workflow
 
 T = TypeVar("T")
 
@@ -28,9 +29,22 @@ class DetectorPriorityLevel(IntEnum):
 ProcessedDataConditionResult = tuple[bool, list[DataConditionResult]]
 
 
+class EventJob(TypedDict):
+    event: GroupEvent
+
+
+class WorkflowJob(EventJob, total=False):
+    group_state: GroupState
+    is_reprocessed: bool
+    has_reappeared: bool
+    has_alert: bool
+    has_escalated: bool
+    workflow: Workflow
+
+
 class ActionHandler:
     @staticmethod
-    def execute(group_event: GroupEvent, action: Action, detector: Detector) -> None:
+    def execute(job: WorkflowJob, action: Action, detector: Detector) -> None:
         raise NotImplementedError
 
 
@@ -42,9 +56,5 @@ def bulk_get_query_object(data_sources) -> dict[int, T | None]:
 
 class DataConditionHandler(Generic[T]):
     @staticmethod
-    def evaluate_value(value: T, comparison: Any, condition: str) -> DataConditionResult:
+    def evaluate_value(value: T, comparison: Any) -> DataConditionResult:
         raise NotImplementedError
-
-
-class DetectorType(StrEnum):
-    ERROR = "ErrorDetector"
diff --git a/src/sentry_plugins/heroku/plugin.py b/src/sentry_plugins/heroku/plugin.py
index 12d587dd348ee4..6c535bb6a9dfff 100644
--- a/src/sentry_plugins/heroku/plugin.py
+++ b/src/sentry_plugins/heroku/plugin.py
@@ -11,7 +11,6 @@
 from sentry.models.apikey import ApiKey
 from sentry.models.options.project_option import ProjectOption
 from sentry.models.repository import Repository
-from sentry.plugins.base.configuration import react_plugin_config
 from sentry.plugins.bases.releasetracking import ReleaseTrackingPlugin
 from sentry.plugins.interfaces.releasehook import ReleaseHook
 from sentry.users.services.user.service import user_service
@@ -152,9 +151,6 @@ class HerokuPlugin(CorePluginMixin, ReleaseTrackingPlugin):
         )
     ]
 
-    def configure(self, project, request):
-        return react_plugin_config(self, project, request)
-
     def can_enable_for_projects(self):
         return True
 
diff --git a/src/sentry_plugins/sessionstack/plugin.py b/src/sentry_plugins/sessionstack/plugin.py
index d38b36f6e6f36b..54603def4efc8b 100644
--- a/src/sentry_plugins/sessionstack/plugin.py
+++ b/src/sentry_plugins/sessionstack/plugin.py
@@ -7,7 +7,6 @@
 from sentry.integrations.base import FeatureDescription, IntegrationFeatures
 from sentry.interfaces.contexts import ContextType
 from sentry.models.project import Project
-from sentry.plugins.base.configuration import react_plugin_config
 from sentry.plugins.base.v2 import EventPreprocessor, Plugin2
 from sentry.utils.settings import is_self_hosted
 from sentry_plugins.base import CorePluginMixin
@@ -50,9 +49,6 @@ class SessionStackPlugin(CorePluginMixin, Plugin2):
     def get_resource_links(self):
         return self.resource_links + self.sessionstack_resource_links
 
-    def configure(self, project, request):
-        return react_plugin_config(self, project, request)
-
     def has_project_conf(self):
         return True
 
diff --git a/static/app/__mocks__/react-lazyload.tsx b/static/app/__mocks__/react-lazyload.tsx
index f4d66de2bb7605..a5be44b10d53e9 100644
--- a/static/app/__mocks__/react-lazyload.tsx
+++ b/static/app/__mocks__/react-lazyload.tsx
@@ -4,7 +4,7 @@
  * These mocks are simple no-ops to make testing lazy-loaded components simpler.
  */
 
-const LazyLoad = ({children}) => children;
+const LazyLoad = ({children}: {children: React.ReactNode}) => children;
 
 export const forceCheck = jest.fn();
 
diff --git a/static/app/actionCreators/dashboards.tsx b/static/app/actionCreators/dashboards.tsx
index 845fe1c8227db6..3c7a6c902bde9b 100644
--- a/static/app/actionCreators/dashboards.tsx
+++ b/static/app/actionCreators/dashboards.tsx
@@ -1,6 +1,6 @@
 import omit from 'lodash/omit';
 
-import {addErrorMessage} from 'sentry/actionCreators/indicator';
+import {addErrorMessage, addSuccessMessage} from 'sentry/actionCreators/indicator';
 import type {Client} from 'sentry/api';
 import {ALL_ACCESS_PROJECTS} from 'sentry/constants/pageFilters';
 import {t} from 'sentry/locale';
@@ -27,7 +27,7 @@ export function fetchDashboards(api: Client, orgSlug: string) {
 
     if (errorResponse) {
       const errors = flattenErrors(errorResponse, {});
-      addErrorMessage(errors[Object.keys(errors)[0]] as string);
+      addErrorMessage(errors[Object.keys(errors)[0]!] as string);
     } else {
       addErrorMessage(t('Unable to fetch dashboards'));
     }
@@ -73,7 +73,7 @@ export function createDashboard(
 
     if (errorResponse) {
       const errors = flattenErrors(errorResponse, {});
-      addErrorMessage(errors[Object.keys(errors)[0]] as string);
+      addErrorMessage(errors[Object.keys(errors)[0]!] as string);
     } else {
       addErrorMessage(t('Unable to create dashboard'));
     }
@@ -113,11 +113,12 @@ export async function updateDashboardFavorite(
         },
       }
     );
+    addSuccessMessage(isFavorited ? t('Added as favorite') : t('Removed as favorite'));
   } catch (response) {
     const errorResponse = response?.responseJSON ?? null;
     if (errorResponse) {
       const errors = flattenErrors(errorResponse, {});
-      addErrorMessage(errors[Object.keys(errors)[0]] as string);
+      addErrorMessage(errors[Object.keys(errors)[0]!]! as string);
     } else if (isFavorited) {
       addErrorMessage(t('Unable to favorite dashboard'));
     } else {
@@ -144,7 +145,7 @@ export function fetchDashboard(
 
     if (errorResponse) {
       const errors = flattenErrors(errorResponse, {});
-      addErrorMessage(errors[Object.keys(errors)[0]] as string);
+      addErrorMessage(errors[Object.keys(errors)[0]!] as string);
     } else {
       addErrorMessage(t('Unable to load dashboard'));
     }
@@ -191,7 +192,7 @@ export function updateDashboard(
 
     if (errorResponse) {
       const errors = flattenErrors(errorResponse, {});
-      addErrorMessage(errors[Object.keys(errors)[0]] as string);
+      addErrorMessage(errors[Object.keys(errors)[0]!] as string);
     } else {
       addErrorMessage(t('Unable to update dashboard'));
     }
@@ -217,7 +218,7 @@ export function deleteDashboard(
 
     if (errorResponse) {
       const errors = flattenErrors(errorResponse, {});
-      addErrorMessage(errors[Object.keys(errors)[0]] as string);
+      addErrorMessage(errors[Object.keys(errors)[0]!] as string);
     } else {
       addErrorMessage(t('Unable to delete dashboard'));
     }
@@ -269,7 +270,7 @@ export function updateDashboardPermissions(
 
     if (errorResponse) {
       const errors = flattenErrors(errorResponse, {});
-      addErrorMessage(errors[Object.keys(errors)[0]] as string);
+      addErrorMessage(errors[Object.keys(errors)[0]!]! as string);
     } else {
       addErrorMessage(t('Unable to update dashboard permissions'));
     }
diff --git a/static/app/actionCreators/integrations.tsx b/static/app/actionCreators/integrations.tsx
index 3cc29123dcd076..ca6da8c9c2b959 100644
--- a/static/app/actionCreators/integrations.tsx
+++ b/static/app/actionCreators/integrations.tsx
@@ -4,84 +4,10 @@ import {
   addSuccessMessage,
   clearIndicators,
 } from 'sentry/actionCreators/indicator';
-import {Client} from 'sentry/api';
+import type {Client} from 'sentry/api';
 import {t, tct} from 'sentry/locale';
 import type {Integration, Repository} from 'sentry/types/integrations';
 
-const api = new Client();
-
-/**
- * Removes an integration from a project.
- *
- * @param orgSlug Organization Slug
- * @param projectId Project Slug
- * @param integration The organization integration to remove
- */
-export function removeIntegrationFromProject(
-  orgSlug: string,
-  projectId: string,
-  integration: Integration
-) {
-  const endpoint = `/projects/${orgSlug}/${projectId}/integrations/${integration.id}/`;
-  addLoadingMessage();
-
-  return api.requestPromise(endpoint, {method: 'DELETE'}).then(
-    () => {
-      addSuccessMessage(t('Disabled %s for %s', integration.name, projectId));
-    },
-    () => {
-      addErrorMessage(t('Failed to disable %s for %s', integration.name, projectId));
-    }
-  );
-}
-
-/**
- * Add an integration to a project
- *
- * @param orgSlug Organization Slug
- * @param projectId Project Slug
- * @param integration The organization integration to add
- */
-export function addIntegrationToProject(
-  orgSlug: string,
-  projectId: string,
-  integration: Integration
-) {
-  const endpoint = `/projects/${orgSlug}/${projectId}/integrations/${integration.id}/`;
-  addLoadingMessage();
-
-  return api.requestPromise(endpoint, {method: 'PUT'}).then(
-    () => {
-      addSuccessMessage(t('Enabled %s for %s', integration.name, projectId));
-    },
-    () => {
-      addErrorMessage(t('Failed to enabled %s for %s', integration.name, projectId));
-    }
-  );
-}
-
-/**
- * Delete a respository
- *
- * @param client ApiClient
- * @param orgSlug Organization Slug
- * @param repositoryId Repository ID
- */
-export function deleteRepository(client: Client, orgSlug: string, repositoryId: string) {
-  addLoadingMessage();
-  const promise = client.requestPromise(
-    `/organizations/${orgSlug}/repos/${repositoryId}/`,
-    {
-      method: 'DELETE',
-    }
-  );
-  promise.then(
-    () => clearIndicators(),
-    () => addErrorMessage(t('Unable to delete repository.'))
-  );
-  return promise;
-}
-
 /**
  * Cancel the deletion of a respository
  *
diff --git a/static/app/actionCreators/members.tsx b/static/app/actionCreators/members.tsx
index 61bf7ef0ff92ed..27b48e37389a9e 100644
--- a/static/app/actionCreators/members.tsx
+++ b/static/app/actionCreators/members.tsx
@@ -67,7 +67,7 @@ export function indexMembersByProject(members: Member[]): IndexedMembersByProjec
         acc[project] = [];
       }
       if (member.user) {
-        acc[project].push(member.user);
+        acc[project]!.push(member.user);
       }
     }
     return acc;
diff --git a/static/app/actionCreators/modal.tsx b/static/app/actionCreators/modal.tsx
index f94ad494a63351..255d41d9330cbf 100644
--- a/static/app/actionCreators/modal.tsx
+++ b/static/app/actionCreators/modal.tsx
@@ -1,12 +1,15 @@
 import type {Location} from 'history';
 
 import type {ModalTypes} from 'sentry/components/globalModal';
+import type {AddToDashboardModalProps as CreateDashboardFromMetricsModalProps} from 'sentry/components/modals/createDashboardFromMetricsModal';
 import type {CreateNewIntegrationModalOptions} from 'sentry/components/modals/createNewIntegrationModal';
 import type {CreateReleaseIntegrationModalOptions} from 'sentry/components/modals/createReleaseIntegrationModal';
 import type {DashboardWidgetQuerySelectorModalOptions} from 'sentry/components/modals/dashboardWidgetQuerySelectorModal';
+import type {ImportDashboardFromFileModalProps} from 'sentry/components/modals/importDashboardFromFileModal';
 import type {InsightChartModalOptions} from 'sentry/components/modals/insightChartModal';
 import type {InviteRow} from 'sentry/components/modals/inviteMembersModal/types';
 import type {ReprocessEventModalOptions} from 'sentry/components/modals/reprocessEventModal';
+import type {AddToDashboardModalProps} from 'sentry/components/modals/widgetBuilder/addToDashboardModal';
 import type {OverwriteWidgetModalProps} from 'sentry/components/modals/widgetBuilder/overwriteWidgetModal';
 import type {WidgetViewerModalOptions} from 'sentry/components/modals/widgetViewerModal';
 import type {Category} from 'sentry/components/platformPicker';
@@ -245,7 +248,7 @@ export async function openWidgetBuilderOverwriteModal(
   });
 }
 
-export async function openAddToDashboardModal(options) {
+export async function openAddToDashboardModal(options: AddToDashboardModalProps) {
   const mod = await import('sentry/components/modals/widgetBuilder/addToDashboardModal');
   const {default: Modal, modalCss} = mod;
 
@@ -255,7 +258,9 @@ export async function openAddToDashboardModal(options) {
   });
 }
 
-export async function openImportDashboardFromFileModal(options) {
+export async function openImportDashboardFromFileModal(
+  options: ImportDashboardFromFileModalProps
+) {
   const mod = await import('sentry/components/modals/importDashboardFromFileModal');
   const {default: Modal, modalCss} = mod;
 
@@ -265,7 +270,9 @@ export async function openImportDashboardFromFileModal(options) {
   });
 }
 
-export async function openCreateDashboardFromMetrics(options) {
+export async function openCreateDashboardFromMetrics(
+  options: CreateDashboardFromMetricsModalProps
+) {
   const mod = await import('sentry/components/modals/createDashboardFromMetricsModal');
   const {default: Modal, modalCss} = mod;
 
@@ -388,3 +395,13 @@ export async function openInsightChartModal(options: InsightChartModalOptions) {
 
   openModal(deps => <Modal {...deps} {...options} />, {modalCss});
 }
+
+export async function openAddTempestCredentialsModal(options: {
+  organization: Organization;
+  project: Project;
+}) {
+  const mod = await import('sentry/components/modals/addTempestCredentialsModal');
+  const {default: Modal} = mod;
+
+  openModal(deps => <Modal {...deps} {...options} />);
+}
diff --git a/static/app/actionCreators/monitors.tsx b/static/app/actionCreators/monitors.tsx
index 400dcaa98654c7..0a98c36450abad 100644
--- a/static/app/actionCreators/monitors.tsx
+++ b/static/app/actionCreators/monitors.tsx
@@ -70,7 +70,7 @@ export async function updateMonitor(
     // If we are updating a single value in the monitor we can read the
     // validation error for that key, otherwise fallback to the default error
     const validationError =
-      updateKeys.length === 1 ? respError.responseJSON?.[updateKeys[0]]?.[0] : undefined;
+      updateKeys.length === 1 ? respError.responseJSON?.[updateKeys[0]!]?.[0] : undefined;
 
     logException(err);
     addErrorMessage(validationError ?? t('Unable to update monitor.'));
diff --git a/static/app/actionCreators/organization.tsx b/static/app/actionCreators/organization.tsx
index e76f2c6e13a3a4..7d6845c1eaf6b1 100644
--- a/static/app/actionCreators/organization.tsx
+++ b/static/app/actionCreators/organization.tsx
@@ -15,9 +15,13 @@ import TeamStore from 'sentry/stores/teamStore';
 import type {Organization, Team} from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
 import FeatureFlagOverrides from 'sentry/utils/featureFlagOverrides';
-import FeatureObserver from 'sentry/utils/featureObserver';
+import {
+  addOrganizationFeaturesHandler,
+  buildSentryFeaturesHandler,
+} from 'sentry/utils/featureFlags';
 import {getPreloadedDataPromise} from 'sentry/utils/getPreloadedData';
 import parseLinkHeader from 'sentry/utils/parseLinkHeader';
+import type RequestError from 'sentry/utils/requestError/requestError';
 
 async function fetchOrg(
   api: Client,
@@ -42,8 +46,9 @@ async function fetchOrg(
   }
 
   FeatureFlagOverrides.singleton().loadOrg(org);
-  FeatureObserver.singleton({}).observeOrganizationFlags({
+  addOrganizationFeaturesHandler({
     organization: org,
+    handler: buildSentryFeaturesHandler('feature.organizations:'),
   });
 
   OrganizationStore.onUpdate(org, {replace: true});
@@ -139,7 +144,7 @@ export function fetchOrganizationDetails(
     PageFiltersStore.onReset();
   }
 
-  const getErrorMessage = err => {
+  const getErrorMessage = (err: RequestError) => {
     if (typeof err.responseJSON?.detail === 'string') {
       return err.responseJSON?.detail;
     }
diff --git a/static/app/actionCreators/organizations.spec.tsx b/static/app/actionCreators/organizations.spec.tsx
index deceb5f403dd28..822f1bdbaae26d 100644
--- a/static/app/actionCreators/organizations.spec.tsx
+++ b/static/app/actionCreators/organizations.spec.tsx
@@ -2,7 +2,6 @@ import {OrganizationFixture} from 'sentry-fixture/organization';
 
 import {fetchOrganizations} from 'sentry/actionCreators/organizations';
 import ConfigStore from 'sentry/stores/configStore';
-import {browserHistory} from 'sentry/utils/browserHistory';
 
 describe('fetchOrganizations', function () {
   const api = new MockApiClient();
@@ -76,6 +75,5 @@ describe('fetchOrganizations', function () {
     expect(usMock).toHaveBeenCalledTimes(1);
     expect(deMock).toHaveBeenCalledTimes(1);
     expect(window.location.reload).not.toHaveBeenCalled();
-    expect(browserHistory.replace).not.toHaveBeenCalled();
   });
 });
diff --git a/static/app/actionCreators/organizations.tsx b/static/app/actionCreators/organizations.tsx
index b26bec04438edf..5be559be701a4e 100644
--- a/static/app/actionCreators/organizations.tsx
+++ b/static/app/actionCreators/organizations.tsx
@@ -1,3 +1,5 @@
+import type {NavigateFunction} from 'react-router-dom';
+
 import {addErrorMessage, addSuccessMessage} from 'sentry/actionCreators/indicator';
 import {resetPageFilters} from 'sentry/actionCreators/pageFilters';
 import type {Client} from 'sentry/api';
@@ -18,7 +20,10 @@ type RedirectRemainingOrganizationParams = {
    * The organization slug
    */
   orgId: string;
-
+  /**
+   * navigate function from useNavigate
+   */
+  navigate?: NavigateFunction;
   /**
    * Should remove org?
    */
@@ -32,6 +37,7 @@ type RedirectRemainingOrganizationParams = {
  * Can optionally remove organization from organizations store.
  */
 export function redirectToRemainingOrganization({
+  navigate,
   orgId,
   removeOrg,
 }: RedirectRemainingOrganizationParams) {
@@ -40,12 +46,17 @@ export function redirectToRemainingOrganization({
     org => org.status.id === 'active' && org.slug !== orgId
   );
   if (!allOrgs.length) {
-    browserHistory.push('/organizations/new/');
+    if (navigate) {
+      navigate('/organizations/new/');
+    } else {
+      browserHistory.push('/organizations/new/');
+    }
+
     return;
   }
 
   // Let's be smart and select the best org to redirect to
-  const firstRemainingOrg = allOrgs[0];
+  const firstRemainingOrg = allOrgs[0]!;
 
   const route = `/organizations/${firstRemainingOrg.slug}/issues/`;
   if (USING_CUSTOMER_DOMAIN) {
@@ -54,7 +65,11 @@ export function redirectToRemainingOrganization({
     return;
   }
 
-  browserHistory.push(route);
+  if (navigate) {
+    navigate(route);
+  } else {
+    browserHistory.push(route);
+  }
 
   // Remove org from SidebarDropdown
   if (removeOrg) {
diff --git a/static/app/actionCreators/pageFilters.spec.tsx b/static/app/actionCreators/pageFilters.spec.tsx
index 5fb56853b7a600..1c587d4c71e3dc 100644
--- a/static/app/actionCreators/pageFilters.spec.tsx
+++ b/static/app/actionCreators/pageFilters.spec.tsx
@@ -32,7 +32,7 @@ describe('PageFilters ActionCreators', function () {
   });
 
   describe('initializeUrlState', function () {
-    let router;
+    let router: ReturnType<typeof RouterFixture>;
     const key = `global-selection:${organization.slug}`;
 
     beforeEach(() => {
diff --git a/static/app/actionCreators/pageFilters.tsx b/static/app/actionCreators/pageFilters.tsx
index 54783e899fcbb2..ecd873d685661f 100644
--- a/static/app/actionCreators/pageFilters.tsx
+++ b/static/app/actionCreators/pageFilters.tsx
@@ -319,7 +319,7 @@ export function initializeUrlState({
     if (projects && projects.length > 0) {
       // If there is a list of projects from URL params, select first project
       // from that list
-      newProject = typeof projects === 'string' ? [Number(projects)] : [projects[0]];
+      newProject = typeof projects === 'string' ? [Number(projects)] : [projects[0]!];
     } else {
       // When we have finished loading the organization into the props,  i.e.
       // the organization slug is consistent with the URL param--Sentry will
diff --git a/static/app/actionCreators/projects.spec.tsx b/static/app/actionCreators/projects.spec.tsx
index 6b3f3e3cb79b1f..c7eef90e1537de 100644
--- a/static/app/actionCreators/projects.spec.tsx
+++ b/static/app/actionCreators/projects.spec.tsx
@@ -14,7 +14,7 @@ describe('Projects ActionCreators', function () {
     expect(mock).not.toHaveBeenCalled();
 
     _debouncedLoadStats(api, new Set([...Array(50)].map((_, i) => String(i))), {
-      projectId: project.id,
+      projectId: project!.id,
       orgId: organization.slug,
     });
 
@@ -38,7 +38,7 @@ describe('Projects ActionCreators', function () {
     expect(mock).not.toHaveBeenCalled();
 
     _debouncedLoadStats(api, new Set(['1', '2', '3']), {
-      projectId: project.id,
+      projectId: project!.id,
       orgId: organization.slug,
       query: {transactionStats: '1'},
     });
diff --git a/static/app/actionCreators/repositories.spec.tsx b/static/app/actionCreators/repositories.spec.tsx
index 79531d204b8568..00d72c56a2c909 100644
--- a/static/app/actionCreators/repositories.spec.tsx
+++ b/static/app/actionCreators/repositories.spec.tsx
@@ -7,7 +7,7 @@ describe('RepositoryActionCreator', function () {
 
   const api = new MockApiClient();
   const mockData = [{id: '1'}];
-  let mockResponse;
+  let mockResponse: jest.Mock;
 
   beforeEach(() => {
     MockApiClient.clearMockResponses();
@@ -50,15 +50,15 @@ describe('RepositoryActionCreator', function () {
 
     expect(RepositoryStore.state.orgSlug).toEqual(orgSlug);
     expect(RepositoryStore.state.repositories).toEqual(mockData);
-    expect(RepositoryStore.state.repositoriesLoading).toEqual(false);
+    expect(RepositoryStore.state.repositoriesLoading).toBe(false);
   });
 
   it('short-circuits the JS event loop', () => {
-    expect(RepositoryStore.state.repositoriesLoading).toEqual(undefined);
+    expect(RepositoryStore.state.repositoriesLoading).toBeUndefined();
 
     getRepositories(api, {orgSlug}); // Fire Action.loadRepositories
     expect(RepositoryStore.loadRepositories).toHaveBeenCalled();
     // expect(RepositoryStore.loadRepositories).not.toHaveBeenCalled();
-    expect(RepositoryStore.state.repositoriesLoading).toEqual(true); // Short-circuit
+    expect(RepositoryStore.state.repositoriesLoading).toBe(true); // Short-circuit
   });
 });
diff --git a/static/app/actionCreators/tags.tsx b/static/app/actionCreators/tags.tsx
index 7a4224ef8560f9..58ad9a03ac3690 100644
--- a/static/app/actionCreators/tags.tsx
+++ b/static/app/actionCreators/tags.tsx
@@ -248,7 +248,7 @@ export const makeFetchOrganizationTags = ({
   if (end) {
     query.end = end;
   }
-  return [`/organizations/${orgSlug}/tags/`, {query: query}];
+  return [`/organizations/${orgSlug}/tags/`, {query}];
 };
 
 export const useFetchOrganizationTags = (
diff --git a/static/app/api.spec.tsx b/static/app/api.spec.tsx
index 000801ab10375a..5886128d50cdd6 100644
--- a/static/app/api.spec.tsx
+++ b/static/app/api.spec.tsx
@@ -1,5 +1,6 @@
 import {OrganizationFixture} from 'sentry-fixture/organization';
 
+import type {Client, ResponseMeta} from 'sentry/api';
 import {isSimilarOrigin, Request, resolveHostname} from 'sentry/api';
 import {PROJECT_MOVED} from 'sentry/constants/apiErrorCodes';
 
@@ -9,7 +10,7 @@ import OrganizationStore from './stores/organizationStore';
 jest.unmock('sentry/api');
 
 describe('api', function () {
-  let api;
+  let api: Client;
 
   beforeEach(function () {
     api = new MockApiClient();
@@ -41,7 +42,9 @@ describe('api', function () {
 
   it('does not call success callback if 302 was returned because of a project slug change', function () {
     const successCb = jest.fn();
-    api.activeRequests = {id: {alive: true}};
+    api.activeRequests = {
+      id: {alive: true, requestPromise: new Promise(() => null), cancel: jest.fn()},
+    };
     api.wrapCallback(
       'id',
       successCb
@@ -60,9 +63,9 @@ describe('api', function () {
   });
 
   it('handles error callback', function () {
-    jest.spyOn(api, 'wrapCallback').mockImplementation((_id, func) => func);
+    jest.spyOn(api, 'wrapCallback').mockImplementation((_id: string, func: any) => func);
     const errorCb = jest.fn();
-    const args = ['test', true, 1];
+    const args = ['test', true, 1] as unknown as [ResponseMeta, string, string];
     api.handleRequestError(
       {
         id: 'test',
@@ -83,15 +86,18 @@ describe('api', function () {
           path: 'test',
           requestOptions: {},
         },
-        {},
-        {}
+        {} as ResponseMeta,
+        '',
+        'test'
       )
     ).not.toThrow();
   });
 });
 
 describe('resolveHostname', function () {
-  let devUi, location, configstate;
+  let devUi: boolean | undefined;
+  let location: Location;
+  let configstate: ReturnType<typeof ConfigStore.getState>;
 
   const controlPath = '/api/0/broadcasts/';
   const regionPath = '/api/0/organizations/slug/issues/';
@@ -103,7 +109,7 @@ describe('resolveHostname', function () {
 
     ConfigStore.loadInitialData({
       ...configstate,
-      features: ['system:multi-region'],
+      features: new Set(['system:multi-region']),
       links: {
         organizationUrl: 'https://acme.sentry.io',
         sentryUrl: 'https://sentry.io',
@@ -122,7 +128,7 @@ describe('resolveHostname', function () {
     ConfigStore.loadInitialData({
       ...configstate,
       // Remove the feature flag
-      features: [],
+      features: new Set(),
     });
 
     let result = resolveHostname(controlPath);
diff --git a/static/app/bootstrap/exportGlobals.tsx b/static/app/bootstrap/exportGlobals.tsx
index 7b62c39158c546..69b9a121d592d9 100644
--- a/static/app/bootstrap/exportGlobals.tsx
+++ b/static/app/bootstrap/exportGlobals.tsx
@@ -1,18 +1,17 @@
 import * as React from 'react';
-import {findDOMNode} from 'react-dom';
 import {createRoot} from 'react-dom/client';
 import * as Sentry from '@sentry/react';
 import moment from 'moment-timezone';
 
 import plugins from 'sentry/plugins';
 
-const globals = {
+const globals: Record<string, any> = {
   // The following globals are used in sentry-plugins webpack externals
   // configuration.
   React,
   Sentry,
   moment,
-  ReactDOM: {findDOMNode, createRoot},
+  ReactDOM: {createRoot},
 
   // django templates make use of these globals
   SentryApp: {},
@@ -44,6 +43,11 @@ const SentryApp = {
 };
 
 globals.SentryApp = SentryApp;
-Object.keys(globals).forEach(name => (window[name] = globals[name]));
+Object.keys(globals).forEach(name => {
+  Object.defineProperty(window, name, {
+    value: globals[name],
+    writable: true,
+  });
+});
 
 export {globals as exportedGlobals};
diff --git a/static/app/bootstrap/initializeSdk.spec.tsx b/static/app/bootstrap/initializeSdk.spec.tsx
index ee8e6497143b46..886da24167208e 100644
--- a/static/app/bootstrap/initializeSdk.spec.tsx
+++ b/static/app/bootstrap/initializeSdk.spec.tsx
@@ -9,7 +9,7 @@ import {
   isFilteredRequestErrorEvent,
 } from './initializeSdk';
 
-const ERROR_MAP = {
+const ERROR_MAP: Record<number, string | undefined> = {
   ...origErrorMap,
   // remove `UndefinedResponseBodyError` since we don't filter those
   200: undefined,
diff --git a/static/app/bootstrap/initializeSdk.tsx b/static/app/bootstrap/initializeSdk.tsx
index 80ecff878cc382..222fda527d0715 100644
--- a/static/app/bootstrap/initializeSdk.tsx
+++ b/static/app/bootstrap/initializeSdk.tsx
@@ -1,7 +1,6 @@
 // eslint-disable-next-line simple-import-sort/imports
 import * as Sentry from '@sentry/react';
-import {_browserPerformanceTimeOriginMode} from '@sentry/utils';
-import type {Event} from '@sentry/types';
+import {type Event, _browserPerformanceTimeOriginMode} from '@sentry/core';
 
 import {SENTRY_RELEASE_VERSION, SPA_DSN} from 'sentry/constants';
 import type {Config} from 'sentry/types/system';
@@ -15,7 +14,6 @@ import {
   useNavigationType,
 } from 'react-router-dom';
 import {useEffect} from 'react';
-import FeatureObserver from 'sentry/utils/featureObserver';
 
 const SPA_MODE_ALLOW_URLS = [
   'localhost',
@@ -62,17 +60,18 @@ function getSentryIntegrations() {
       depth: 6,
     }),
     Sentry.reactRouterV6BrowserTracingIntegration({
-      useEffect: useEffect,
-      useLocation: useLocation,
-      useNavigationType: useNavigationType,
-      createRoutesFromChildren: createRoutesFromChildren,
-      matchRoutes: matchRoutes,
+      useEffect,
+      useLocation,
+      useNavigationType,
+      createRoutesFromChildren,
+      matchRoutes,
     }),
     Sentry.browserProfilingIntegration(),
     Sentry.thirdPartyErrorFilterIntegration({
       filterKeys: ['sentry-spa'],
       behaviour: 'apply-tag-if-contains-third-party-frames',
     }),
+    Sentry.featureFlagsIntegration(),
   ];
 
   return integrations;
@@ -180,15 +179,8 @@ export function initializeSdk(config: Config) {
 
       handlePossibleUndefinedResponseBodyErrors(event);
       addEndpointTagToRequestError(event);
-
       lastEventId = event.event_id || hint.event_id;
 
-      // attach feature flags to the event context
-      if (event.contexts) {
-        const flags = FeatureObserver.singleton({}).getFeatureFlags();
-        event.contexts.flags = flags;
-      }
-
       return event;
     },
   });
@@ -225,7 +217,7 @@ export function initializeSdk(config: Config) {
         images.push({
           type: 'sourcemap',
           code_file: filename,
-          debug_id: debugIdMap[filename],
+          debug_id: debugIdMap[filename]!,
         });
       });
     } catch (e) {
@@ -318,7 +310,7 @@ function handlePossibleUndefinedResponseBodyErrors(event: Event): void {
   const causeErrorIsURBE = causeError?.type === 'UndefinedResponseBodyError';
 
   if (mainErrorIsURBE || causeErrorIsURBE) {
-    mainError.type = 'UndefinedResponseBodyError';
+    mainError!.type = 'UndefinedResponseBodyError';
     event.tags = {...event.tags, undefinedResponseBody: true};
     event.fingerprint = mainErrorIsURBE
       ? ['UndefinedResponseBodyError as main error']
@@ -327,7 +319,7 @@ function handlePossibleUndefinedResponseBodyErrors(event: Event): void {
 }
 
 export function addEndpointTagToRequestError(event: Event): void {
-  const errorMessage = event.exception?.values?.[0].value || '';
+  const errorMessage = event.exception?.values?.[0]!.value || '';
 
   // The capturing group here turns `GET /dogs/are/great 500` into just `GET /dogs/are/great`
   const requestErrorRegex = new RegExp('^([A-Za-z]+ (/[^/]+)+/) \\d+$');
diff --git a/static/app/chartcuterie/config.tsx b/static/app/chartcuterie/config.tsx
index 7a659d73952ecf..af2a13061dd446 100644
--- a/static/app/chartcuterie/config.tsx
+++ b/static/app/chartcuterie/config.tsx
@@ -8,7 +8,6 @@
  * into the configuration file loaded by the service.
  */
 
-// eslint-disable-next-line import/no-named-default
 import {discoverCharts} from './discover';
 import {metricAlertCharts} from './metricAlert';
 import {performanceCharts} from './performance';
diff --git a/static/app/chartcuterie/discover.tsx b/static/app/chartcuterie/discover.tsx
index 50959c108139fa..ade3f7bd7c8f6f 100644
--- a/static/app/chartcuterie/discover.tsx
+++ b/static/app/chartcuterie/discover.tsx
@@ -60,10 +60,12 @@ discoverCharts.push({
         AreaSeries({
           name: s.key,
           stack: 'area',
-          data: s.data.map(([timestamp, countsForTimestamp]) => [
-            timestamp * 1000,
-            countsForTimestamp.reduce((acc, {count}) => acc + count, 0),
-          ]),
+          data: s.data.map(
+            ([timestamp, countsForTimestamp]: [number, {count: number}[]]) => [
+              timestamp * 1000,
+              countsForTimestamp.reduce((acc, {count}) => acc + count, 0),
+            ]
+          ),
           lineStyle: {color: color?.[i], opacity: 1, width: 0.4},
           areaStyle: {color: color?.[i], opacity: 1},
         })
@@ -121,12 +123,14 @@ discoverCharts.push({
         BarSeries({
           name: s.key,
           stack: 'area',
-          data: s.data.map(([timestamp, countsForTimestamp]) => ({
-            value: [
-              timestamp * 1000,
-              countsForTimestamp.reduce((acc, {count}) => acc + count, 0),
-            ],
-          })),
+          data: s.data.map(
+            ([timestamp, countsForTimestamp]: [number, {count: number}[]]) => ({
+              value: [
+                timestamp * 1000,
+                countsForTimestamp.reduce((acc, {count}) => acc + count, 0),
+              ],
+            })
+          ),
           itemStyle: {color: color?.[i], opacity: 1},
         })
       );
@@ -179,10 +183,12 @@ discoverCharts.push({
       .map((topSeries, i) =>
         AreaSeries({
           stack: 'area',
-          data: topSeries.data.map(([timestamp, countsForTimestamp]) => [
-            timestamp * 1000,
-            countsForTimestamp.reduce((acc, {count}) => acc + count, 0),
-          ]),
+          data: topSeries.data.map(
+            ([timestamp, countsForTimestamp]: [number, {count: number}[]]) => [
+              timestamp * 1000,
+              countsForTimestamp.reduce((acc, {count}) => acc + count, 0),
+            ]
+          ),
           lineStyle: {color: color?.[i], opacity: 1, width: 0.4},
           areaStyle: {color: color?.[i], opacity: 1},
         })
@@ -235,10 +241,12 @@ discoverCharts.push({
       .sort((a, b) => (a.order ?? 0) - (b.order ?? 0))
       .map((topSeries, i) =>
         LineSeries({
-          data: topSeries.data.map(([timestamp, countsForTimestamp]) => [
-            timestamp * 1000,
-            countsForTimestamp.reduce((acc, {count}) => acc + count, 0),
-          ]),
+          data: topSeries.data.map(
+            ([timestamp, countsForTimestamp]: [number, {count: number}[]]) => [
+              timestamp * 1000,
+              countsForTimestamp.reduce((acc, {count}) => acc + count, 0),
+            ]
+          ),
           lineStyle: {color: color?.[i], opacity: 1},
           itemStyle: {color: color?.[i]},
         })
@@ -292,10 +300,12 @@ discoverCharts.push({
       .map((topSeries, i) =>
         BarSeries({
           stack: 'area',
-          data: topSeries.data.map(([timestamp, countsForTimestamp]) => [
-            timestamp * 1000,
-            countsForTimestamp.reduce((acc, {count}) => acc + count, 0),
-          ]),
+          data: topSeries.data.map(
+            ([timestamp, countsForTimestamp]: [number, {count: number}[]]) => [
+              timestamp * 1000,
+              countsForTimestamp.reduce((acc, {count}) => acc + count, 0),
+            ]
+          ),
           itemStyle: {color: color?.[i], opacity: 1},
         })
       );
@@ -336,7 +346,7 @@ discoverCharts.push({
       const previousPeriod = LineSeries({
         name: t('previous %s', data.seriesName),
         data: previous.map(([_, countsForTimestamp], i) => [
-          current[i][0] * 1000,
+          current[i]![0] * 1000,
           countsForTimestamp.reduce((acc, {count}) => acc + count, 0),
         ]),
         lineStyle: {color: theme.gray200, type: 'dotted'},
@@ -372,7 +382,7 @@ discoverCharts.push({
             stack: 'area',
             data: s.data
               .slice(dataMiddleIndex)
-              .map(([timestamp, countsForTimestamp]) => [
+              .map(([timestamp, countsForTimestamp]: [number, {count: number}[]]) => [
                 timestamp * 1000,
                 countsForTimestamp.reduce((acc, {count}) => acc + count, 0),
               ]),
@@ -384,10 +394,12 @@ discoverCharts.push({
           LineSeries({
             name: t('previous %s', s.key),
             stack: 'previous',
-            data: previous.map(([_, countsForTimestamp], index) => [
-              current[index][0] * 1000,
-              countsForTimestamp.reduce((acc, {count}) => acc + count, 0),
-            ]),
+            data: previous.map(
+              ([_, countsForTimestamp]: [number, {count: number}[]], index: number) => [
+                current[index][0] * 1000,
+                countsForTimestamp.reduce((acc, {count}) => acc + count, 0),
+              ]
+            ),
             lineStyle: {color: previousPeriodColor?.[i], type: 'dotted'},
             itemStyle: {color: previousPeriodColor?.[i]},
           })
diff --git a/static/app/components/acl/feature.spec.tsx b/static/app/components/acl/feature.spec.tsx
index e86b80fb1269a7..35fe469956882f 100644
--- a/static/app/components/acl/feature.spec.tsx
+++ b/static/app/components/acl/feature.spec.tsx
@@ -285,7 +285,7 @@ describe('Feature', function () {
   });
 
   describe('using HookStore for renderDisabled', function () {
-    let hookFn;
+    let hookFn: jest.Mock;
 
     beforeEach(function () {
       hookFn = jest.fn(() => null);
diff --git a/static/app/components/acl/feature.tsx b/static/app/components/acl/feature.tsx
index 83547b2d78acbe..77a3f5b91061a0 100644
--- a/static/app/components/acl/feature.tsx
+++ b/static/app/components/acl/feature.tsx
@@ -141,12 +141,12 @@ class Feature extends Component<Props> {
 
     const shouldMatchOnlyProject = feature.match(/^projects:(.+)/);
     if (shouldMatchOnlyProject) {
-      return project.includes(shouldMatchOnlyProject[1]);
+      return project.includes(shouldMatchOnlyProject[1]!);
     }
 
     const shouldMatchOnlyOrg = feature.match(/^organizations:(.+)/);
     if (shouldMatchOnlyOrg) {
-      return organization.includes(shouldMatchOnlyOrg[1]);
+      return organization.includes(shouldMatchOnlyOrg[1]!);
     }
 
     // default, check all feature arrays
@@ -186,7 +186,7 @@ class Feature extends Component<Props> {
       const hooks = HookStore.get(hookName);
 
       if (hooks.length > 0) {
-        customDisabledRender = hooks[0];
+        customDisabledRender = hooks[0]!;
       }
     }
     const renderProps = {
diff --git a/static/app/components/acl/featureDisabledModal.spec.tsx b/static/app/components/acl/featureDisabledModal.spec.tsx
index 18e40d393f9f00..d283812ee36e5a 100644
--- a/static/app/components/acl/featureDisabledModal.spec.tsx
+++ b/static/app/components/acl/featureDisabledModal.spec.tsx
@@ -1,4 +1,4 @@
-import type {ComponentProps} from 'react';
+import type {ComponentProps, PropsWithChildren} from 'react';
 import styled from '@emotion/styled';
 
 import {render, screen} from 'sentry-test/reactTestingLibrary';
@@ -8,7 +8,7 @@ import ModalStore from 'sentry/stores/modalStore';
 
 describe('FeatureTourModal', function () {
   const onCloseModal = jest.fn();
-  const styledWrapper = styled(c => c.children);
+  const styledWrapper = styled((c: PropsWithChildren) => c.children);
   const renderComponent = (
     props: Partial<ComponentProps<typeof FeatureDisabledModal>> = {}
   ) =>
diff --git a/static/app/components/actions/archive.spec.tsx b/static/app/components/actions/archive.spec.tsx
index 742681dfb0ea90..9e03ae6198d901 100644
--- a/static/app/components/actions/archive.spec.tsx
+++ b/static/app/components/actions/archive.spec.tsx
@@ -82,10 +82,10 @@ describe('ArchiveActions', () => {
     render(<ArchiveActions onUpdate={onUpdate} disableArchiveUntilOccurrence={false} />);
     await userEvent.click(screen.getByRole('button', {name: 'Archive options'}));
     expect(
-      screen.queryByRole('menuitemradio', {name: 'Until this occurs again\u2026'})
+      screen.getByRole('menuitemradio', {name: 'Until this occurs again\u2026'})
     ).toBeInTheDocument();
     expect(
-      screen.queryByRole('menuitemradio', {
+      screen.getByRole('menuitemradio', {
         name: 'Until this affects an additional\u2026',
       })
     ).toBeInTheDocument();
diff --git a/static/app/components/activity/note/input.tsx b/static/app/components/activity/note/input.tsx
index 5e64720754d9ce..a1ac2f35ffcc8f 100644
--- a/static/app/components/activity/note/input.tsx
+++ b/static/app/components/activity/note/input.tsx
@@ -132,7 +132,7 @@ function NoteInput({
   );
 
   const handleChange: MentionsInputProps['onChange'] = useCallback(
-    e => {
+    (e: MentionChangeEvent) => {
       setValue(e.target.value);
       onChange?.(e, {updating: existingItem});
     },
@@ -140,7 +140,7 @@ function NoteInput({
   );
 
   const handleKeyDown: MentionsInputProps['onKeyDown'] = useCallback(
-    e => {
+    (e: React.KeyboardEvent<HTMLInputElement | HTMLTextAreaElement>) => {
       // Auto submit the form on [meta,ctrl] + Enter
       if (e.key === 'Enter' && (e.metaKey || e.ctrlKey) && canSubmit) {
         submitForm();
diff --git a/static/app/components/activity/note/inputWithStorage.tsx b/static/app/components/activity/note/inputWithStorage.tsx
index cef5b960a8eb1c..284b8b2493dab5 100644
--- a/static/app/components/activity/note/inputWithStorage.tsx
+++ b/static/app/components/activity/note/inputWithStorage.tsx
@@ -129,7 +129,7 @@ function NoteInputWithStorage({
       }
 
       // Remove `itemKey` from stored object and save to storage
-      // eslint-disable-next-line no-unused-vars
+
       const {[itemKey]: _oldItem, ...newStorageObj} = storageObj;
       saveToStorage(storageKey, newStorageObj);
     },
diff --git a/static/app/components/alerts/notificationBar.tsx b/static/app/components/alerts/notificationBar.tsx
deleted file mode 100644
index ab7dc6666cd47b..00000000000000
--- a/static/app/components/alerts/notificationBar.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import styled from '@emotion/styled';
-
-import {IconInfo} from 'sentry/icons';
-import {space} from 'sentry/styles/space';
-
-const StyledNotificationBarIconInfo = styled(IconInfo)`
-  margin-right: ${space(1)};
-  color: ${p => p.theme.alert.info.color};
-`;
-
-export const NotificationBar = styled('div')`
-  display: flex;
-  align-items: center;
-  color: ${p => p.theme.textColor};
-  background-color: ${p => p.theme.alert.info.backgroundLight};
-  border-bottom: 1px solid ${p => p.theme.alert.info.border};
-  padding: ${space(1.5)};
-  font-size: 14px;
-  line-height: normal;
-  ${StyledNotificationBarIconInfo} {
-    color: ${p => p.theme.alert.info.color};
-  }
-`;
diff --git a/static/app/components/alerts/snoozeAlert.tsx b/static/app/components/alerts/snoozeAlert.tsx
index 890b48bfab5515..046fb3e43529b1 100644
--- a/static/app/components/alerts/snoozeAlert.tsx
+++ b/static/app/components/alerts/snoozeAlert.tsx
@@ -9,9 +9,9 @@ import {DropdownMenu} from 'sentry/components/dropdownMenu';
 import {IconChevron, IconMute, IconSound} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {RuleActionsCategories} from 'sentry/types/alerts';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import useApi from 'sentry/utils/useApi';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 
 type Props = {
@@ -42,6 +42,7 @@ function SnoozeAlert({
   const organization = useOrganization();
   const api = useApi();
   const location = useLocation();
+  const navigate = useNavigate();
 
   const [disabled, setDisabled] = useState(false);
 
@@ -62,10 +63,13 @@ function SnoozeAlert({
         );
 
         if (autoMute) {
-          browserHistory.replace({
-            pathname: location.pathname,
-            query: {...location.query, mute: undefined},
-          });
+          navigate(
+            {
+              pathname: location.pathname,
+              query: {...location.query, mute: undefined},
+            },
+            {replace: true}
+          );
         }
 
         setDisabled(false);
@@ -87,6 +91,7 @@ function SnoozeAlert({
     },
     [
       api,
+      navigate,
       isSnoozed,
       location.pathname,
       location.query,
diff --git a/static/app/components/analyticsArea.spec.tsx b/static/app/components/analyticsArea.spec.tsx
index f44d5163a4c73a..061861bde7f180 100644
--- a/static/app/components/analyticsArea.spec.tsx
+++ b/static/app/components/analyticsArea.spec.tsx
@@ -15,7 +15,7 @@ function TestButton({org}: {org: Organization}) {
       onClick={() => {
         analytics.trackAnalytics('button-clicked', {
           organization: org,
-          area: area,
+          area,
         });
       }}
     />
@@ -41,7 +41,7 @@ describe('AnalyticsAreaProvider', function () {
     await userEvent.click(button);
 
     expect(analyticsSpy).toHaveBeenCalledWith('button-clicked', {
-      organization: organization,
+      organization,
       area: 'feedback.details.activity',
     });
   });
@@ -61,7 +61,7 @@ describe('AnalyticsAreaProvider', function () {
     await userEvent.click(button);
 
     expect(analyticsSpy).toHaveBeenCalledWith('button-clicked', {
-      organization: organization,
+      organization,
       area: 'my-modal',
     });
   });
diff --git a/static/app/components/arithmeticInput/parser.spec.tsx b/static/app/components/arithmeticInput/parser.spec.tsx
index d20321ae27ac3b..e58d1ae75350c7 100644
--- a/static/app/components/arithmeticInput/parser.spec.tsx
+++ b/static/app/components/arithmeticInput/parser.spec.tsx
@@ -2,17 +2,17 @@ import {Operation, parseArithmetic} from 'sentry/components/arithmeticInput/pars
 
 describe('arithmeticInput/parser', function () {
   it('errors on too many operators', () => {
-    expect(parseArithmetic('1+1+1+1+1+1+1+1+1+1+1+1').error).toEqual(
+    expect(parseArithmetic('1+1+1+1+1+1+1+1+1+1+1+1').error).toBe(
       'Maximum operators exceeded'
     );
   });
 
   it('errors on divide by 0', () => {
-    expect(parseArithmetic('1/0').error).toEqual('Division by 0 is not allowed');
+    expect(parseArithmetic('1/0').error).toBe('Division by 0 is not allowed');
   });
 
   it('handles one term', () => {
-    expect(parseArithmetic('1').result).toStrictEqual('1');
+    expect(parseArithmetic('1').result).toBe('1');
   });
 
   it('handles some addition', () => {
diff --git a/static/app/components/arithmeticInput/parser.tsx b/static/app/components/arithmeticInput/parser.tsx
index 1c22966f4837ba..c73635d051f99f 100644
--- a/static/app/components/arithmeticInput/parser.tsx
+++ b/static/app/components/arithmeticInput/parser.tsx
@@ -54,7 +54,7 @@ export class TokenConverter {
 
   tokenTerm = (maybeFactor: Expression, remainingAdds: Array<Operation>): Expression => {
     if (remainingAdds.length > 0) {
-      remainingAdds[0].lhs = maybeFactor;
+      remainingAdds[0]!.lhs = maybeFactor;
       return flatten(remainingAdds);
     }
     return maybeFactor;
@@ -75,7 +75,7 @@ export class TokenConverter {
   };
 
   tokenFactor = (primary: Expression, remaining: Array<Operation>): Operation => {
-    remaining[0].lhs = primary;
+    remaining[0]!.lhs = primary;
     return flatten(remaining);
   };
 
diff --git a/static/app/components/assigneeBadge.stories.tsx b/static/app/components/assigneeBadge.stories.tsx
index 3786ba961aaf48..d087d6e37455f4 100644
--- a/static/app/components/assigneeBadge.stories.tsx
+++ b/static/app/components/assigneeBadge.stories.tsx
@@ -42,7 +42,7 @@ export default storyBook('AssigneeBadge', story => {
     const [chevron2Toggle, setChevron2Toggle] = useState<'up' | 'down'>('down');
 
     const team: Team = teams.length
-      ? teams[0]
+      ? teams[0]!
       : {
           id: '1',
           slug: 'team-slug',
diff --git a/static/app/components/assigneeSelectorDropdown.spec.tsx b/static/app/components/assigneeSelectorDropdown.spec.tsx
index 675aef098928c5..8c28fb3c99255b 100644
--- a/static/app/components/assigneeSelectorDropdown.spec.tsx
+++ b/static/app/components/assigneeSelectorDropdown.spec.tsx
@@ -572,7 +572,7 @@ describe('AssigneeSelectorDropdown', () => {
 
     // Suggested assignee initials
     expect(options[0]).toHaveTextContent('AB');
-    await userEvent.click(options[0]);
+    await userEvent.click(options[0]!);
 
     await waitFor(() =>
       expect(assignGroup2Mock).toHaveBeenCalledWith(
diff --git a/static/app/components/assigneeSelectorDropdown.tsx b/static/app/components/assigneeSelectorDropdown.tsx
index 62ccdd19f9a339..0615ae973d26e7 100644
--- a/static/app/components/assigneeSelectorDropdown.tsx
+++ b/static/app/components/assigneeSelectorDropdown.tsx
@@ -155,6 +155,7 @@ export function AssigneeAvatar({
   }
 
   if (suggestedActors.length > 0) {
+    const actor = suggestedActors[0]!;
     return (
       <SuggestedAvatarStack
         size={26}
@@ -164,17 +165,12 @@ export function AssigneeAvatar({
           <TooltipWrapper>
             <div>
               {tct('Suggestion: [name]', {
-                name:
-                  suggestedActors[0].type === 'team'
-                    ? `#${suggestedActors[0].name}`
-                    : suggestedActors[0].name,
+                name: actor.type === 'team' ? `#${actor.name}` : actor.name,
               })}
               {suggestedActors.length > 1 &&
                 tn(' + %s other', ' + %s others', suggestedActors.length - 1)}
             </div>
-            <TooltipSubtext>
-              {suggestedReasons[suggestedActors[0].suggestedReason]}
-            </TooltipSubtext>
+            <TooltipSubtext>{suggestedReasons[actor.suggestedReason]}</TooltipSubtext>
           </TooltipWrapper>
         }
       />
@@ -265,7 +261,10 @@ export default function AssigneeSelectorDropdown({
     const uniqueSuggestions = uniqBy(suggestedOwners, owner => owner.owner);
     return uniqueSuggestions
       .map<SuggestedAssignee | null>(suggestion => {
-        const [suggestionType, suggestionId] = suggestion.owner.split(':');
+        const [suggestionType, suggestionId] = suggestion.owner.split(':') as [
+          string,
+          string,
+        ];
         const suggestedReasonText = suggestedReasonTable[suggestion.type];
         if (suggestionType === 'user') {
           const member = currentMemberList.find(user => user.id === suggestionId);
@@ -322,7 +321,7 @@ export default function AssigneeSelectorDropdown({
     }
     // See makeMemberOption and makeTeamOption for how the value is formatted
     const type = selectedOption.value.startsWith('user:') ? 'user' : 'team';
-    const assigneeId = selectedOption.value.split(':')[1];
+    const assigneeId = selectedOption.value.split(':')[1]!;
     let assignee: User | Actor;
 
     if (type === 'user') {
@@ -344,10 +343,10 @@ export default function AssigneeSelectorDropdown({
         actor => actor.type === type && actor.id === assignee.id
       );
       onAssign({
-        assignee: assignee,
+        assignee,
         id: assigneeId,
-        type: type,
-        suggestedAssignee: suggestedAssignee,
+        type,
+        suggestedAssignee,
       });
     }
   };
diff --git a/static/app/components/assistant/guideAnchor.tsx b/static/app/components/assistant/guideAnchor.tsx
index 81ac2c234cfc8c..efbd244f529460 100644
--- a/static/app/components/assistant/guideAnchor.tsx
+++ b/static/app/components/assistant/guideAnchor.tsx
@@ -1,4 +1,4 @@
-import {Component, createRef, Fragment, useEffect} from 'react';
+import {Component, Fragment, useEffect, useRef} from 'react';
 import styled from '@emotion/styled';
 import * as Sentry from '@sentry/react';
 import type {Query} from 'history';
@@ -44,7 +44,7 @@ type Props = {
 };
 
 function ScrollToGuide({children}: {children: React.ReactNode}) {
-  const containerElement = createRef<HTMLSpanElement>();
+  const containerElement = useRef<HTMLSpanElement>(null);
 
   useEffect(() => {
     if (containerElement.current) {
@@ -155,7 +155,7 @@ class BaseGuideAnchor extends Component<Props, State> {
 
     const totalStepCount = currentGuide.steps.length;
     const currentStepCount = step + 1;
-    const currentStep = currentGuide.steps[step];
+    const currentStep = currentGuide.steps[step]!;
     const lastStep = currentStepCount === totalStepCount;
     const hasManySteps = totalStepCount > 1;
 
diff --git a/static/app/components/autoComplete.spec.tsx b/static/app/components/autoComplete.spec.tsx
index e85f910f870f6a..fb87a2fe581697 100644
--- a/static/app/components/autoComplete.spec.tsx
+++ b/static/app/components/autoComplete.spec.tsx
@@ -23,7 +23,7 @@ const items = [
  * "controlled" props where <AutoComplete> does not handle state
  */
 describe('AutoComplete', function () {
-  let input;
+  let input: HTMLInputElement;
   let autoCompleteState: any[] = [];
   const mocks = {
     onSelect: jest.fn(),
@@ -36,12 +36,30 @@ describe('AutoComplete', function () {
     autoCompleteState = [];
   });
 
-  function List({registerItemCount, itemCount, ...props}) {
+  function List({
+    registerItemCount,
+    itemCount,
+    ...props
+  }: {
+    children: React.ReactNode;
+    itemCount: number;
+    registerItemCount: (count?: number) => void;
+  }) {
     useEffect(() => void registerItemCount(itemCount), [itemCount, registerItemCount]);
     return <ul {...props} />;
   }
 
-  function Item({registerVisibleItem, item, index, ...props}) {
+  function Item({
+    registerVisibleItem,
+    item,
+    index,
+    ...props
+  }: {
+    children: React.ReactNode;
+    index: number;
+    item: {name?: string};
+    registerVisibleItem: (index: number, item: any) => () => void;
+  }) {
     useEffect(() => registerVisibleItem(index, item), [registerVisibleItem, index, item]);
     return <li {...props} />;
   }
@@ -198,7 +216,7 @@ describe('AutoComplete', function () {
       expect(screen.getByTestId('test-autocomplete')).toBeInTheDocument();
       expect(screen.getAllByRole('option')).toHaveLength(3);
 
-      fireEvent.click(screen.getByText(items[1].name));
+      fireEvent.click(screen.getByText(items[1]!.name));
       expect(mocks.onSelect).toHaveBeenCalledWith(
         items[1],
         expect.objectContaining({inputValue: '', highlightedIndex: 0}),
@@ -401,7 +419,7 @@ describe('AutoComplete', function () {
       createWrapper({isOpen: true});
       expect(screen.getAllByRole('option')).toHaveLength(3);
 
-      fireEvent.click(screen.getByText(items[1].name));
+      fireEvent.click(screen.getByText(items[1]!.name));
       expect(mocks.onSelect).toHaveBeenCalledWith(
         items[1],
         expect.objectContaining({inputValue: '', highlightedIndex: 0}),
diff --git a/static/app/components/autoplayVideo.spec.tsx b/static/app/components/autoplayVideo.spec.tsx
index 04c3411c074b64..38a9702457ffec 100644
--- a/static/app/components/autoplayVideo.spec.tsx
+++ b/static/app/components/autoplayVideo.spec.tsx
@@ -1,4 +1,3 @@
-// eslint-disable-next-line no-restricted-imports
 import * as React from 'react';
 
 import {render, screen} from 'sentry-test/reactTestingLibrary';
diff --git a/static/app/components/avatar/avatarList.spec.tsx b/static/app/components/avatar/avatarList.spec.tsx
index 9d8046e23da216..3e6adb97006c43 100644
--- a/static/app/components/avatar/avatarList.spec.tsx
+++ b/static/app/components/avatar/avatarList.spec.tsx
@@ -42,12 +42,12 @@ describe('AvatarList', () => {
     ];
 
     renderComponent({users});
-    expect(screen.getByText(users[0].name.charAt(0))).toBeInTheDocument();
-    expect(screen.getByText(users[1].name.charAt(0))).toBeInTheDocument();
-    expect(screen.getByText(users[2].name.charAt(0))).toBeInTheDocument();
-    expect(screen.getByText(users[3].name.charAt(0))).toBeInTheDocument();
-    expect(screen.getByText(users[4].name.charAt(0))).toBeInTheDocument();
-    expect(screen.getByText(users[5].name.charAt(0))).toBeInTheDocument();
+    expect(screen.getByText(users[0]!.name.charAt(0))).toBeInTheDocument();
+    expect(screen.getByText(users[1]!.name.charAt(0))).toBeInTheDocument();
+    expect(screen.getByText(users[2]!.name.charAt(0))).toBeInTheDocument();
+    expect(screen.getByText(users[3]!.name.charAt(0))).toBeInTheDocument();
+    expect(screen.getByText(users[4]!.name.charAt(0))).toBeInTheDocument();
+    expect(screen.getByText(users[5]!.name.charAt(0))).toBeInTheDocument();
     expect(screen.queryByTestId('avatarList-collapsedavatars')).not.toBeInTheDocument();
   });
 
@@ -63,12 +63,12 @@ describe('AvatarList', () => {
     ];
 
     renderComponent({users});
-    expect(screen.getByText(users[0].name.charAt(0))).toBeInTheDocument();
-    expect(screen.getByText(users[1].name.charAt(0))).toBeInTheDocument();
-    expect(screen.getByText(users[2].name.charAt(0))).toBeInTheDocument();
-    expect(screen.getByText(users[3].name.charAt(0))).toBeInTheDocument();
-    expect(screen.getByText(users[4].name.charAt(0))).toBeInTheDocument();
-    expect(screen.queryByText(users[5].name.charAt(0))).not.toBeInTheDocument();
+    expect(screen.getByText(users[0]!.name.charAt(0))).toBeInTheDocument();
+    expect(screen.getByText(users[1]!.name.charAt(0))).toBeInTheDocument();
+    expect(screen.getByText(users[2]!.name.charAt(0))).toBeInTheDocument();
+    expect(screen.getByText(users[3]!.name.charAt(0))).toBeInTheDocument();
+    expect(screen.getByText(users[4]!.name.charAt(0))).toBeInTheDocument();
+    expect(screen.queryByText(users[5]!.name.charAt(0))).not.toBeInTheDocument();
     expect(screen.getByTestId('avatarList-collapsedavatars')).toBeInTheDocument();
   });
 
diff --git a/static/app/components/avatar/avatarList.tsx b/static/app/components/avatar/avatarList.tsx
index df9932016668b3..e6234e62fd611f 100644
--- a/static/app/components/avatar/avatarList.tsx
+++ b/static/app/components/avatar/avatarList.tsx
@@ -69,9 +69,9 @@ function AvatarList({
 
   if (numCollapsedAvatars === 1) {
     if (visibleTeamAvatars.length < teams.length) {
-      visibleTeamAvatars.unshift(teams[teams.length - 1]);
+      visibleTeamAvatars.unshift(teams[teams.length - 1]!);
     } else if (visibleUserAvatars.length < users.length) {
-      visibleUserAvatars.unshift(users[users.length - 1]);
+      visibleUserAvatars.unshift(users[users.length - 1]!);
     }
     numCollapsedAvatars = 0;
   }
diff --git a/static/app/components/avatar/index.spec.tsx b/static/app/components/avatar/index.spec.tsx
index 4959b79988bfad..e26f04fe0ccb10 100644
--- a/static/app/components/avatar/index.spec.tsx
+++ b/static/app/components/avatar/index.spec.tsx
@@ -293,7 +293,7 @@ describe('Avatar', function () {
       avatar2.unmount();
 
       // avatarType of `default`
-      sentryApp.avatars![0].avatarType = 'default';
+      sentryApp.avatars![0]!.avatarType = 'default';
       render(<AvatarComponent sentryApp={sentryApp} isColor />);
       expect(screen.getByTestId('default-sentry-app-avatar')).toBeInTheDocument();
     });
diff --git a/static/app/components/avatar/suggestedAvatarStack.tsx b/static/app/components/avatar/suggestedAvatarStack.tsx
index ee03cdb641d307..cd869de11fd4ff 100644
--- a/static/app/components/avatar/suggestedAvatarStack.tsx
+++ b/static/app/components/avatar/suggestedAvatarStack.tsx
@@ -29,7 +29,7 @@ function SuggestedAvatarStack({
     <AvatarStack reverse={reverse} data-test-id="suggested-avatar-stack">
       {suggestedOwners.slice(0, numAvatars - 1).map((owner, i) => (
         <Avatar
-          round={firstSuggestion.type === 'user'}
+          round={firstSuggestion!.type === 'user'}
           actor={owner}
           hasTooltip={false}
           {...props}
@@ -40,7 +40,7 @@ function SuggestedAvatarStack({
         />
       ))}
       <Avatar
-        actor={firstSuggestion}
+        actor={firstSuggestion!}
         tooltip={tooltip}
         tooltipOptions={{...tooltipOptions, skipWrapper: true}}
         {...props}
diff --git a/static/app/components/avatarUploader.spec.tsx b/static/app/components/avatarUploader.spec.tsx
index f2ef2c3e65ac26..66fc989eb2324c 100644
--- a/static/app/components/avatarUploader.spec.tsx
+++ b/static/app/components/avatarUploader.spec.tsx
@@ -11,7 +11,7 @@ describe('AvatarUploader', function () {
       'should return a negative diff when yDiff and xDiff ' +
         'are positive (cropper is getting smaller)',
       function () {
-        expect(getDiffNW(4, 5)).toEqual(-4.5);
+        expect(getDiffNW(4, 5)).toBe(-4.5);
       }
     );
 
@@ -19,7 +19,7 @@ describe('AvatarUploader', function () {
       'should return a positive diff when yDiff and xDiff ' +
         'are negative (cropper is getting bigger)',
       function () {
-        expect(getDiffNW(-4, -5)).toEqual(4.5);
+        expect(getDiffNW(-4, -5)).toBe(4.5);
       }
     );
   });
@@ -29,7 +29,7 @@ describe('AvatarUploader', function () {
       'should return a positive diff when yDiff is negative and ' +
         'xDiff is positive (cropper is getting bigger)',
       function () {
-        expect(getDiffNE(-4, 5)).toEqual(4.5);
+        expect(getDiffNE(-4, 5)).toBe(4.5);
       }
     );
 
@@ -37,7 +37,7 @@ describe('AvatarUploader', function () {
       'should return a negative diff when yDiff is positive and ' +
         'xDiff is negative (cropper is getting smaller)',
       function () {
-        expect(getDiffNE(4, -5)).toEqual(-4.5);
+        expect(getDiffNE(4, -5)).toBe(-4.5);
       }
     );
   });
@@ -47,7 +47,7 @@ describe('AvatarUploader', function () {
       'should return a positive diff when yDiff and ' +
         'xDiff are positive (cropper is getting bigger)',
       function () {
-        expect(getDiffSE(4, 5)).toEqual(4.5);
+        expect(getDiffSE(4, 5)).toBe(4.5);
       }
     );
 
@@ -55,7 +55,7 @@ describe('AvatarUploader', function () {
       'should return a negative diff when yDiff and ' +
         'xDiff are negative (cropper is getting smaller)',
       function () {
-        expect(getDiffSE(-4, -5)).toEqual(-4.5);
+        expect(getDiffSE(-4, -5)).toBe(-4.5);
       }
     );
   });
@@ -65,7 +65,7 @@ describe('AvatarUploader', function () {
       'should return a positive diff when yDiff is positive and ' +
         'xDiff is negative (cropper is getting bigger)',
       function () {
-        expect(getDiffSW(4, -5)).toEqual(4.5);
+        expect(getDiffSW(4, -5)).toBe(4.5);
       }
     );
 
@@ -73,7 +73,7 @@ describe('AvatarUploader', function () {
       'should return a negative diff when yDiff is negative and' +
         'xDiff is positive (cropper is getting smaller)',
       function () {
-        expect(getDiffSW(-4, 5)).toEqual(-4.5);
+        expect(getDiffSW(-4, 5)).toBe(-4.5);
       }
     );
   });
diff --git a/static/app/components/avatarUploader.tsx b/static/app/components/avatarUploader.tsx
index e0fd2c9b1ffb77..da52b2c89ff02d 100644
--- a/static/app/components/avatarUploader.tsx
+++ b/static/app/components/avatarUploader.tsx
@@ -219,14 +219,14 @@ class AvatarUploader extends Component<Props, State> {
 
     // Normalize diff across dimensions so that negative diffs are always making
     // the cropper smaller and positive ones are making the cropper larger
-    const helpers = {
+    const helpers: Record<string, (yDiff: number, xDiff: number) => number> = {
       getDiffNE,
       getDiffNW,
       getDiffSE,
       getDiffSW,
     } as const;
 
-    const diff = helpers['getDiff' + resizeDirection!.toUpperCase()](yDiff, xDiff);
+    const diff = helpers['getDiff' + resizeDirection!.toUpperCase()]!(yDiff, xDiff);
 
     let height = container.clientHeight - oldDimensions.top;
     let width = container.clientWidth - oldDimensions.left;
diff --git a/static/app/components/badge/featureBadge.tsx b/static/app/components/badge/featureBadge.tsx
index 1d400ef746e844..f88860a620c577 100644
--- a/static/app/components/badge/featureBadge.tsx
+++ b/static/app/components/badge/featureBadge.tsx
@@ -1,8 +1,8 @@
 import {Fragment, type ReactNode} from 'react';
 import {useTheme} from '@emotion/react';
 import styled from '@emotion/styled';
+import type {SeverityLevel} from '@sentry/core';
 import {captureException, withScope} from '@sentry/react';
-import type {SeverityLevel} from '@sentry/types';
 
 import Badge from 'sentry/components/badge/badge';
 import CircleIndicator from 'sentry/components/circleIndicator';
diff --git a/static/app/components/breadcrumbs.tsx b/static/app/components/breadcrumbs.tsx
index 86b691c607520f..a8c62cc13f4428 100644
--- a/static/app/components/breadcrumbs.tsx
+++ b/static/app/components/breadcrumbs.tsx
@@ -87,7 +87,7 @@ export function Breadcrumbs({crumbs, linkLastItem = false, ...props}: Props) {
   }
 
   if (!linkLastItem) {
-    const lastCrumb = crumbs[crumbs.length - 1];
+    const lastCrumb = crumbs[crumbs.length - 1]!;
     if (!isCrumbDropdown(lastCrumb)) {
       lastCrumb.to = null;
     }
diff --git a/static/app/components/calendar/calendarStylesWrapper.tsx b/static/app/components/calendar/calendarStylesWrapper.tsx
index a6a4d117171fbf..2be8a9b7f7b583 100644
--- a/static/app/components/calendar/calendarStylesWrapper.tsx
+++ b/static/app/components/calendar/calendarStylesWrapper.tsx
@@ -244,6 +244,10 @@ const CalendarStylesWrapper = styled('div')`
     border-left-color: ${p => p.theme.textColor};
     margin: 0;
   }
+
+  .rdrDayPassive {
+    visibility: hidden;
+  }
 `;
 
 export default CalendarStylesWrapper;
diff --git a/static/app/components/carousel.spec.tsx b/static/app/components/carousel.spec.tsx
index b50f3848d3a8b2..3d93ffcb9e7d6b 100644
--- a/static/app/components/carousel.spec.tsx
+++ b/static/app/components/carousel.spec.tsx
@@ -67,9 +67,9 @@ describe('Carousel', function () {
     expect(screen.queryByRole('button', {name: 'Scroll left'})).not.toBeInTheDocument();
 
     // Test scroll into view, the 2nd element should have its 'scrollIntoView' called
-    elements[1].scrollIntoView = jest.fn();
+    elements[1]!.scrollIntoView = jest.fn();
     await userEvent.click(rightButton);
-    expect(elements[1].scrollIntoView).toHaveBeenCalled();
+    expect(elements[1]!.scrollIntoView).toHaveBeenCalled();
   });
 
   it('shows left arrow when elements exist to the left', async function () {
@@ -100,9 +100,9 @@ describe('Carousel', function () {
     expect(screen.queryByRole('button', {name: 'Scroll right'})).not.toBeInTheDocument();
 
     // Test scroll into view, the 1st element should have its 'scrollIntoView' called
-    elements[0].scrollIntoView = jest.fn();
+    elements[0]!.scrollIntoView = jest.fn();
     await userEvent.click(leftButton);
-    expect(elements[0].scrollIntoView).toHaveBeenCalled();
+    expect(elements[0]!.scrollIntoView).toHaveBeenCalled();
   });
 
   it('skips an element when it is past the visibleRatio', async function () {
@@ -133,8 +133,8 @@ describe('Carousel', function () {
     expect(screen.queryByRole('button', {name: 'Scroll left'})).not.toBeInTheDocument();
 
     // Test scroll into view, the 2nd element should have its 'scrollIntoView' called
-    elements[2].scrollIntoView = jest.fn();
+    elements[2]!.scrollIntoView = jest.fn();
     await userEvent.click(rightButton);
-    expect(elements[2].scrollIntoView).toHaveBeenCalled();
+    expect(elements[2]!.scrollIntoView).toHaveBeenCalled();
   });
 });
diff --git a/static/app/components/carousel.tsx b/static/app/components/carousel.tsx
index bf699cc842a8ca..25accfb344c045 100644
--- a/static/app/components/carousel.tsx
+++ b/static/app/components/carousel.tsx
@@ -36,7 +36,7 @@ function Carousel({children, visibleRatio = 0.8}: CarouselProps) {
 
   const scrollLeft = useCallback(
     () =>
-      childrenEls[visibility.findIndex(Boolean) - 1].scrollIntoView({
+      childrenEls[visibility.findIndex(Boolean) - 1]!.scrollIntoView({
         behavior: 'smooth',
         block: 'nearest',
         inline: 'start',
@@ -46,7 +46,7 @@ function Carousel({children, visibleRatio = 0.8}: CarouselProps) {
 
   const scrollRight = useCallback(
     () =>
-      childrenEls[visibility.findLastIndex(Boolean) + 1].scrollIntoView({
+      childrenEls[visibility.findLastIndex(Boolean) + 1]!.scrollIntoView({
         behavior: 'smooth',
         block: 'nearest',
         inline: 'end',
diff --git a/static/app/components/charts/barChartZoom.tsx b/static/app/components/charts/barChartZoom.tsx
index a02995129bbd13..c374de959a5d94 100644
--- a/static/app/components/charts/barChartZoom.tsx
+++ b/static/app/components/charts/barChartZoom.tsx
@@ -3,7 +3,11 @@ import type {Location} from 'history';
 
 import DataZoomInside from 'sentry/components/charts/components/dataZoomInside';
 import ToolBox from 'sentry/components/charts/components/toolBox';
-import type {EChartChartReadyHandler, EChartDataZoomHandler} from 'sentry/types/echarts';
+import type {
+  EChartChartReadyHandler,
+  EChartDataZoomHandler,
+  ECharts,
+} from 'sentry/types/echarts';
 import {browserHistory} from 'sentry/utils/browserHistory';
 
 type RenderProps = {
@@ -69,7 +73,7 @@ class BarChartZoom extends Component<Props> {
   /**
    * Enable zoom immediately instead of having to toggle to zoom
    */
-  handleChartReady = chart => {
+  handleChartReady = (chart: ECharts) => {
     this.props.onChartReady?.(chart);
   };
 
@@ -108,8 +112,8 @@ class BarChartZoom extends Component<Props> {
     if (startValue !== null && endValue !== null) {
       const {buckets, location, paramStart, paramEnd, minZoomWidth, onHistoryPush} =
         this.props;
-      const {start} = buckets[startValue];
-      const {end} = buckets[endValue];
+      const {start} = buckets[startValue]!;
+      const {end} = buckets[endValue]!;
 
       if (minZoomWidth === undefined || end - start > minZoomWidth) {
         const target = {
diff --git a/static/app/components/charts/baseChart.spec.tsx b/static/app/components/charts/baseChart.spec.tsx
index c4010f998e590c..930bcbe0ba1df5 100644
--- a/static/app/components/charts/baseChart.spec.tsx
+++ b/static/app/components/charts/baseChart.spec.tsx
@@ -21,9 +21,9 @@ describe('BaseChart', function () {
     );
     // @ts-expect-error
     const series = ReactEchartsCore.mock.calls[0][0].option.series;
-    expect(series.length).toEqual(1);
+    expect(series).toHaveLength(1);
     expect(series[0].lineStyle.color).toEqual(theme.gray200);
-    expect(series[0].lineStyle.type).toEqual('dotted');
+    expect(series[0].lineStyle.type).toBe('dotted');
   });
 
   it('renders with lightened colored dotted previous period when using multiple series', function () {
@@ -47,12 +47,12 @@ describe('BaseChart', function () {
       // @ts-expect-error
       ReactEchartsCore.mock.calls[ReactEchartsCore.mock.calls.length - 1][0].option
         .series;
-    expect(series.length).toEqual(3);
-    expect(series[0].lineStyle.color).toEqual('rgb(98, 100, 146)');
-    expect(series[0].lineStyle.type).toEqual('dotted');
-    expect(series[1].lineStyle.color).toEqual('rgb(244, 116, 157)');
-    expect(series[1].lineStyle.type).toEqual('dotted');
-    expect(series[2].lineStyle.color).toEqual('rgb(255, 213, 48)');
-    expect(series[2].lineStyle.type).toEqual('dotted');
+    expect(series).toHaveLength(3);
+    expect(series[0].lineStyle.color).toBe('rgb(98, 100, 146)');
+    expect(series[0].lineStyle.type).toBe('dotted');
+    expect(series[1].lineStyle.color).toBe('rgb(244, 116, 157)');
+    expect(series[1].lineStyle.type).toBe('dotted');
+    expect(series[2].lineStyle.color).toBe('rgb(255, 213, 48)');
+    expect(series[2].lineStyle.type).toBe('dotted');
   });
 });
diff --git a/static/app/components/charts/baseChart.tsx b/static/app/components/charts/baseChart.tsx
index a98c80419dcafd..ebd1281bb3988e 100644
--- a/static/app/components/charts/baseChart.tsx
+++ b/static/app/components/charts/baseChart.tsx
@@ -323,8 +323,8 @@ export interface BaseChartProps {
 
 const DEFAULT_CHART_READY = () => {};
 const DEFAULT_OPTIONS = {};
-const DEFAULT_SERIES = [];
-const DEFAULT_ADDITIONAL_SERIES = [];
+const DEFAULT_SERIES: SeriesOption[] = [];
+const DEFAULT_ADDITIONAL_SERIES: LineSeriesOption[] = [];
 const DEFAULT_Y_AXIS = {};
 const DEFAULT_X_AXIS = {};
 
@@ -398,7 +398,7 @@ function BaseChartUnwrapped({
 
   const resolvedSeries = useMemo(() => {
     const previousPeriodColors =
-      (previousPeriod?.length ?? 0) > 1 ? lightenHexToRgb(color) : undefined;
+      (previousPeriod?.length ?? 0) > 1 ? lightenHexToRgb(color as string[]) : undefined;
 
     const hasSinglePoints = (series as LineSeriesOption[] | undefined)?.every(
       s => Array.isArray(s.data) && s.data.length <= 1
@@ -606,22 +606,22 @@ function BaseChartUnwrapped({
   const eventsMap = useMemo(
     () =>
       ({
-        click: (props, instance) => {
+        click: (props, instance: ECharts) => {
           handleClick(props, instance);
           onClick?.(props, instance);
         },
-        highlight: (props, instance) => onHighlight?.(props, instance),
-        mouseout: (props, instance) => onMouseOut?.(props, instance),
-        mouseover: (props, instance) => onMouseOver?.(props, instance),
-        datazoom: (props, instance) => onDataZoom?.(props, instance),
-        restore: (props, instance) => onRestore?.(props, instance),
-        finished: (props, instance) => onFinished?.(props, instance),
-        rendered: (props, instance) => onRendered?.(props, instance),
-        legendselectchanged: (props, instance) =>
+        highlight: (props, instance: ECharts) => onHighlight?.(props, instance),
+        mouseout: (props, instance: ECharts) => onMouseOut?.(props, instance),
+        mouseover: (props, instance: ECharts) => onMouseOver?.(props, instance),
+        datazoom: (props, instance: ECharts) => onDataZoom?.(props, instance),
+        restore: (props, instance: ECharts) => onRestore?.(props, instance),
+        finished: (props, instance: ECharts) => onFinished?.(props, instance),
+        rendered: (props, instance: ECharts) => onRendered?.(props, instance),
+        legendselectchanged: (props, instance: ECharts) =>
           onLegendSelectChanged?.(props, instance),
-        brush: (props, instance) => onBrushStart?.(props, instance),
-        brushend: (props, instance) => onBrushEnd?.(props, instance),
-        brushselected: (props, instance) => onBrushSelected?.(props, instance),
+        brush: (props, instance: ECharts) => onBrushStart?.(props, instance),
+        brushend: (props, instance: ECharts) => onBrushEnd?.(props, instance),
+        brushselected: (props, instance: ECharts) => onBrushSelected?.(props, instance),
       }) as ReactEchartProps['onEvents'],
     [
       onClick,
diff --git a/static/app/components/charts/baseChartHeightResize.spec.tsx b/static/app/components/charts/baseChartHeightResize.spec.tsx
index babd9bc5ed995b..84f4aec2e1d8ce 100644
--- a/static/app/components/charts/baseChartHeightResize.spec.tsx
+++ b/static/app/components/charts/baseChartHeightResize.spec.tsx
@@ -17,7 +17,7 @@ jest.mock('echarts-for-react/lib/core', () => {
   };
 });
 
-function TestContainer({children}) {
+function TestContainer({children}: {children: React.ReactNode}) {
   return (
     <div style={{height: '500px', background: 'yellow', padding: '20px'}}>{children}</div>
   );
diff --git a/static/app/components/charts/chartZoom.tsx b/static/app/components/charts/chartZoom.tsx
index 41a3442289d397..262d856debe041 100644
--- a/static/app/components/charts/chartZoom.tsx
+++ b/static/app/components/charts/chartZoom.tsx
@@ -2,16 +2,14 @@ import {Component} from 'react';
 import type {
   DataZoomComponentOption,
   ECharts,
-  InsideDataZoomComponentOption,
   ToolboxComponentOption,
   XAXisComponentOption,
 } from 'echarts';
-import moment from 'moment-timezone';
+import moment, {type MomentInput} from 'moment-timezone';
 import * as qs from 'query-string';
 
 import {updateDateTime} from 'sentry/actionCreators/pageFilters';
 import DataZoomInside from 'sentry/components/charts/components/dataZoomInside';
-import DataZoomSlider from 'sentry/components/charts/components/dataZoomSlider';
 import ToolBox from 'sentry/components/charts/components/toolBox';
 import type {DateString} from 'sentry/types/core';
 import type {
@@ -22,9 +20,10 @@ import type {
 } from 'sentry/types/echarts';
 import type {InjectedRouter} from 'sentry/types/legacyReactRouter';
 import {getUtcDateString, getUtcToLocalDateObject} from 'sentry/utils/dates';
+// eslint-disable-next-line no-restricted-imports
 import withSentryRouter from 'sentry/utils/withSentryRouter';
 
-const getDate = date =>
+const getDate = (date: MomentInput) =>
   date ? moment.utc(date).format(moment.HTML5_FMT.DATETIME_LOCAL_SECONDS) : null;
 
 type Period = {
@@ -53,7 +52,6 @@ export interface ZoomRenderProps extends Pick<Props, ZoomPropKeys> {
 
 type Props = {
   children: (props: ZoomRenderProps) => React.ReactNode;
-  chartZoomOptions?: DataZoomComponentOption;
   disabled?: boolean;
   end?: DateString;
   onChartReady?: EChartChartReadyHandler;
@@ -64,7 +62,6 @@ type Props = {
   period?: string | null;
   router?: InjectedRouter;
   saveOnZoom?: boolean;
-  showSlider?: boolean;
   start?: DateString;
   usePageDate?: boolean;
   utc?: boolean | null;
@@ -242,7 +239,7 @@ class ChartZoom extends Component<Props> {
       return;
     }
 
-    this.setPeriod(this.history[0]);
+    this.setPeriod(this.history[0]!);
 
     // reset history
     this.history = [];
@@ -335,8 +332,6 @@ class ChartZoom extends Component<Props> {
       onChartReady: _onChartReady,
       onDataZoom: _onDataZoom,
       onFinished: _onFinished,
-      showSlider,
-      chartZoomOptions,
       ...props
     } = this.props;
 
@@ -359,18 +354,9 @@ class ChartZoom extends Component<Props> {
       utc,
       start,
       end,
-      dataZoom: showSlider
-        ? [
-            ...DataZoomSlider({xAxisIndex, ...chartZoomOptions}),
-            ...DataZoomInside({
-              xAxisIndex,
-              ...(chartZoomOptions as InsideDataZoomComponentOption),
-            }),
-          ]
-        : DataZoomInside({
-            xAxisIndex,
-            ...(chartZoomOptions as InsideDataZoomComponentOption),
-          }),
+      dataZoom: DataZoomInside({
+        xAxisIndex,
+      }),
       showTimeInTooltip: true,
       toolBox: ToolBox(
         {},
diff --git a/static/app/components/charts/components/dataZoomSlider.tsx b/static/app/components/charts/components/dataZoomSlider.tsx
deleted file mode 100644
index 2c48aa0e50c495..00000000000000
--- a/static/app/components/charts/components/dataZoomSlider.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import 'echarts/lib/component/dataZoomSlider';
-
-import type {SliderDataZoomComponentOption} from 'echarts';
-
-const DEFAULT: SliderDataZoomComponentOption = {
-  realtime: false,
-  showDetail: false,
-  left: 0,
-  right: 6,
-  bottom: 8,
-};
-
-export default function DataZoomSlider(
-  props: SliderDataZoomComponentOption | SliderDataZoomComponentOption[]
-): SliderDataZoomComponentOption[] {
-  // `props` can be boolean, if so return default
-  if (!props || !Array.isArray(props)) {
-    const dataZoom = {
-      ...DEFAULT,
-      ...props,
-    };
-    return [dataZoom];
-  }
-
-  return props;
-}
diff --git a/static/app/components/charts/components/xAxis.spec.tsx b/static/app/components/charts/components/xAxis.spec.tsx
index 750772771428e9..5ac47460309657 100644
--- a/static/app/components/charts/components/xAxis.spec.tsx
+++ b/static/app/components/charts/components/xAxis.spec.tsx
@@ -9,8 +9,8 @@ jest.mock('moment-timezone', () => {
 });
 
 describe('Chart XAxis', function () {
-  let axisLabelFormatter;
-  let xAxisObj;
+  let axisLabelFormatter: (value: string | number, index: number) => string;
+  let xAxisObj!: ReturnType<typeof XAxis>;
   const props: XAxisProps = {
     isGroupedByDate: true,
     theme: lightTheme,
@@ -27,15 +27,16 @@ describe('Chart XAxis', function () {
             utc: false,
           });
 
-          axisLabelFormatter = xAxisObj.axisLabel.formatter;
+          // @ts-expect-error formatter type is missing
+          axisLabelFormatter = xAxisObj.axisLabel!.formatter;
         });
 
         it('formats axis label for first data point', function () {
-          expect(axisLabelFormatter(timestamp, 0)).toEqual('Jul 8 5:00 PM');
+          expect(axisLabelFormatter(timestamp, 0)).toBe('Jul 8 5:00 PM');
         });
 
         it('formats axis label for second data point', function () {
-          expect(axisLabelFormatter(timestamp, 1)).toEqual('Jul 8 5:00 PM');
+          expect(axisLabelFormatter(timestamp, 1)).toBe('Jul 8 5:00 PM');
         });
       });
 
@@ -47,15 +48,16 @@ describe('Chart XAxis', function () {
             utc: true,
           });
 
-          axisLabelFormatter = xAxisObj.axisLabel.formatter;
+          // @ts-expect-error formatter type is missing
+          axisLabelFormatter = xAxisObj.axisLabel!.formatter;
         });
 
         it('formats axis label for first data point', function () {
-          expect(axisLabelFormatter(timestamp, 0)).toEqual('Jul 9 12:00 AM');
+          expect(axisLabelFormatter(timestamp, 0)).toBe('Jul 9 12:00 AM');
         });
 
         it('formats axis label for second data point', function () {
-          expect(axisLabelFormatter(timestamp, 1)).toEqual('Jul 9 12:00 AM');
+          expect(axisLabelFormatter(timestamp, 1)).toBe('Jul 9 12:00 AM');
         });
       });
 
@@ -67,15 +69,16 @@ describe('Chart XAxis', function () {
             period: '7d',
           });
 
-          axisLabelFormatter = xAxisObj.axisLabel.formatter;
+          // @ts-expect-error formatter type is missing
+          axisLabelFormatter = xAxisObj.axisLabel!.formatter;
         });
 
         it('formats axis label for first data point', function () {
-          expect(axisLabelFormatter(timestamp, 0)).toEqual('Jul 8\n5:00 PM');
+          expect(axisLabelFormatter(timestamp, 0)).toBe('Jul 8\n5:00 PM');
         });
 
         it('formats axis label for second data point', function () {
-          expect(axisLabelFormatter(timestamp, 1)).toEqual('Jul 8\n5:00 PM');
+          expect(axisLabelFormatter(timestamp, 1)).toBe('Jul 8\n5:00 PM');
         });
       });
     });
@@ -89,15 +92,16 @@ describe('Chart XAxis', function () {
             utc: false,
           });
 
-          axisLabelFormatter = xAxisObj.axisLabel.formatter;
+          // @ts-expect-error formatter type is missing
+          axisLabelFormatter = xAxisObj.axisLabel!.formatter;
         });
 
         it('formats axis label for first data point', function () {
-          expect(axisLabelFormatter(timestamp, 0)).toEqual('Jul 8 5:00 PM');
+          expect(axisLabelFormatter(timestamp, 0)).toBe('Jul 8 5:00 PM');
         });
 
         it('formats axis label for second data point', function () {
-          expect(axisLabelFormatter(timestamp, 1)).toEqual('5:00 PM');
+          expect(axisLabelFormatter(timestamp, 1)).toBe('5:00 PM');
         });
       });
 
@@ -109,15 +113,16 @@ describe('Chart XAxis', function () {
             utc: true,
           });
 
-          axisLabelFormatter = xAxisObj.axisLabel.formatter;
+          // @ts-expect-error formatter type is missing
+          axisLabelFormatter = xAxisObj.axisLabel!.formatter;
         });
 
         it('formats axis label for first data point', function () {
-          expect(axisLabelFormatter(timestamp, 0)).toEqual('Jul 9 12:00 AM');
+          expect(axisLabelFormatter(timestamp, 0)).toBe('Jul 9 12:00 AM');
         });
 
         it('formats axis label for second data point', function () {
-          expect(axisLabelFormatter(timestamp, 1)).toEqual('12:00 AM');
+          expect(axisLabelFormatter(timestamp, 1)).toBe('12:00 AM');
         });
       });
 
@@ -130,15 +135,16 @@ describe('Chart XAxis', function () {
             utc: true,
           });
 
-          axisLabelFormatter = xAxisObj.axisLabel.formatter;
+          // @ts-expect-error formatter type is missing
+          axisLabelFormatter = xAxisObj.axisLabel!.formatter;
         });
 
         it('formats axis label for first data point', function () {
-          expect(axisLabelFormatter(timestamp, 0)).toEqual('Jul 9\n12:00 AM');
+          expect(axisLabelFormatter(timestamp, 0)).toBe('Jul 9\n12:00 AM');
         });
 
         it('formats axis label for second data point', function () {
-          expect(axisLabelFormatter(timestamp, 1)).toEqual('12:00 AM');
+          expect(axisLabelFormatter(timestamp, 1)).toBe('12:00 AM');
         });
       });
     });
diff --git a/static/app/components/charts/components/xAxis.tsx b/static/app/components/charts/components/xAxis.tsx
index e9d95a072b6a1a..528e85a9d54f7e 100644
--- a/static/app/components/charts/components/xAxis.tsx
+++ b/static/app/components/charts/components/xAxis.tsx
@@ -33,7 +33,7 @@ function XAxis({
   addSecondsToTimeFormat = false,
   ...props
 }: XAxisProps): XAXisComponentOption {
-  const AxisLabelFormatter = (value: string, index: number) => {
+  const AxisLabelFormatter = (value: string | number, index: number) => {
     const firstItem = index === 0;
     // Always show the date of the first item. Otherwise check the interval duration
     const showDate = firstItem ? true : !computeShortInterval({start, end, period});
@@ -51,7 +51,7 @@ function XAxis({
     }
 
     if (props.truncate) {
-      return truncationFormatter(value, props.truncate);
+      return truncationFormatter(value as string, props.truncate);
     }
 
     return undefined;
diff --git a/static/app/components/charts/eventsAreaChart.spec.tsx b/static/app/components/charts/eventsAreaChart.spec.tsx
index 38d4b6069775e8..d0113ed85c4141 100644
--- a/static/app/components/charts/eventsAreaChart.spec.tsx
+++ b/static/app/components/charts/eventsAreaChart.spec.tsx
@@ -52,6 +52,6 @@ describe('EventsChart with legend', function () {
       />
     );
     expect(await screen.findByTestId('area-chart')).toBeInTheDocument();
-    expect(jest.mocked(BaseChart).mock.calls[0][0].legend).toHaveProperty('data');
+    expect(jest.mocked(BaseChart).mock.calls[0]![0].legend).toHaveProperty('data');
   });
 });
diff --git a/static/app/components/charts/eventsChart.tsx b/static/app/components/charts/eventsChart.tsx
index 07fd7b641dfb9c..2fd37ac0b1b9f2 100644
--- a/static/app/components/charts/eventsChart.tsx
+++ b/static/app/components/charts/eventsChart.tsx
@@ -314,7 +314,7 @@ class Chart extends Component<ChartProps, State> {
               // Check to see if all series output types are the same. If not, then default to number.
               const outputType =
                 new Set(Object.values(timeseriesResultsTypes)).size === 1
-                  ? timeseriesResultsTypes[yAxis]
+                  ? timeseriesResultsTypes[yAxis]!
                   : 'number';
               return axisLabelFormatterUsingAggregateOutputType(value, outputType);
             }
@@ -607,7 +607,7 @@ class EventsChart extends Component<EventsChartProps> {
             additionalSeries={additionalSeries}
             previousSeriesTransformer={previousSeriesTransformer}
             stacked={this.isStacked()}
-            yAxis={yAxisArray[0]}
+            yAxis={yAxisArray[0]!}
             showDaily={showDaily}
             colors={colors}
             legendOptions={legendOptions}
diff --git a/static/app/components/charts/eventsRequest.tsx b/static/app/components/charts/eventsRequest.tsx
index 2462b5251c5793..f5f119ed5340ab 100644
--- a/static/app/components/charts/eventsRequest.tsx
+++ b/static/app/components/charts/eventsRequest.tsx
@@ -425,7 +425,7 @@ class EventsRequest extends PureComponent<EventsRequestProps, EventsRequestState
       seriesName: seriesName ?? 'Previous',
       data: this.calculateTotalsPerTimestamp(
         previous,
-        (_timestamp, _countArray, i) => current[i][0] * 1000
+        (_timestamp, _countArray, i) => current[i]![0] * 1000
       ),
       stack: 'previous',
     };
@@ -573,7 +573,7 @@ class EventsRequest extends PureComponent<EventsRequestProps, EventsRequestState
             seriesName: string,
             index: number
           ): [number, Series, Series | null, AdditionalSeriesInfo] => {
-            const seriesData: EventsStats = timeseriesData[seriesName];
+            const seriesData: EventsStats = timeseriesData[seriesName]!;
             const processedData = this.processData(
               seriesData,
               index,
@@ -589,7 +589,7 @@ class EventsRequest extends PureComponent<EventsRequestProps, EventsRequestState
             }
             return [
               seriesData.order || 0,
-              processedData.data[0],
+              processedData.data[0]!,
               processedData.previousData,
               {isMetricsData: processedData.isMetricsData},
             ];
@@ -598,7 +598,7 @@ class EventsRequest extends PureComponent<EventsRequestProps, EventsRequestState
         .sort((a, b) => a[0] - b[0]);
       const timeseriesResultsTypes: Record<string, AggregationOutputType> = {};
       Object.keys(timeseriesData).forEach(key => {
-        const fieldsMeta = timeseriesData[key].meta?.fields[getAggregateAlias(key)];
+        const fieldsMeta = timeseriesData[key]!.meta?.fields[getAggregateAlias(key)];
         if (fieldsMeta) {
           timeseriesResultsTypes[key] = fieldsMeta;
         }
diff --git a/static/app/components/charts/intervalSelector.spec.tsx b/static/app/components/charts/intervalSelector.spec.tsx
index 33924644e0a9bf..8e1a0674f3338c 100644
--- a/static/app/components/charts/intervalSelector.spec.tsx
+++ b/static/app/components/charts/intervalSelector.spec.tsx
@@ -29,7 +29,7 @@ describe('IntervalSelector', function () {
       />
     );
     render(intervalSelector);
-    expect(interval).toEqual('4h');
+    expect(interval).toBe('4h');
   });
   it('resets large interval', function () {
     eventView.interval = '1h';
@@ -42,7 +42,7 @@ describe('IntervalSelector', function () {
       />
     );
     render(intervalSelector);
-    expect(eventView.interval).toEqual('1m');
+    expect(eventView.interval).toBe('1m');
   });
   it('leaves default interval alone', function () {
     eventView.interval = undefined;
@@ -56,6 +56,6 @@ describe('IntervalSelector', function () {
       />
     );
     render(intervalSelector);
-    expect(interval).toEqual('not called');
+    expect(interval).toBe('not called');
   });
 });
diff --git a/static/app/components/charts/intervalSelector.tsx b/static/app/components/charts/intervalSelector.tsx
index 7a39386164b68e..34c35c8e2a0b71 100644
--- a/static/app/components/charts/intervalSelector.tsx
+++ b/static/app/components/charts/intervalSelector.tsx
@@ -123,12 +123,12 @@ function formatHoursToInterval(hours: number): [number, IntervalUnits] {
 
 function getIntervalOption(rangeHours: number): IntervalOption {
   for (const index in INTERVAL_OPTIONS) {
-    const currentOption = INTERVAL_OPTIONS[index];
+    const currentOption = INTERVAL_OPTIONS[index]!;
     if (currentOption.rangeStart <= rangeHours) {
       return currentOption;
     }
   }
-  return INTERVAL_OPTIONS[0];
+  return INTERVAL_OPTIONS[0]!;
 }
 
 function bindInterval(
@@ -196,7 +196,7 @@ export default function IntervalSelector({
         makeItem(
           amount,
           unit,
-          SUPPORTED_RELATIVE_PERIOD_UNITS[unit].label,
+          SUPPORTED_RELATIVE_PERIOD_UNITS[unit]!.label,
           results.length + 1
         )
       );
diff --git a/static/app/components/charts/miniBarChart.tsx b/static/app/components/charts/miniBarChart.tsx
index 86549632b8a681..5125390e7724da 100644
--- a/static/app/components/charts/miniBarChart.tsx
+++ b/static/app/components/charts/miniBarChart.tsx
@@ -256,7 +256,7 @@ function MiniBarChart({
       : [theme.gray200, theme.purple300, theme.purple300];
 
     for (let i = 0; i < series.length; i++) {
-      const original = series[i];
+      const original = series[i]!;
       const updated: BarChartSeries = {
         ...original,
         cursor: 'normal',
diff --git a/static/app/components/charts/optionSelector.spec.tsx b/static/app/components/charts/optionSelector.spec.tsx
index c71fd82d17fba2..7b85e09c90ba4f 100644
--- a/static/app/components/charts/optionSelector.spec.tsx
+++ b/static/app/components/charts/optionSelector.spec.tsx
@@ -5,7 +5,6 @@ import {initializeOrg} from 'sentry-test/initializeOrg';
 import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 
 import OptionSelector from 'sentry/components/charts/optionSelector';
-import {t} from 'sentry/locale';
 
 describe('Charts > OptionSelector (Multiple)', function () {
   const features = ['discover-basic'];
@@ -32,7 +31,7 @@ describe('Charts > OptionSelector (Multiple)', function () {
       <OptionSelector
         multiple
         isOpen
-        title={t('Y-Axis')}
+        title={'Y-Axis'}
         selected={currentSelected}
         options={yAxisOptions}
         onChange={newSelected => {
diff --git a/static/app/components/charts/percentageAreaChart.tsx b/static/app/components/charts/percentageAreaChart.tsx
index ac9916724a8eab..3697f14be07cfd 100644
--- a/static/app/components/charts/percentageAreaChart.tsx
+++ b/static/app/components/charts/percentageAreaChart.tsx
@@ -43,9 +43,9 @@ export default class PercentageAreaChart extends Component<Props> {
     const {series, getDataItemName, getValue} = this.props;
 
     const totalsArray: [string | number, number][] = series.length
-      ? series[0].data.map(({name}, i) => [
+      ? series[0]!.data.map(({name}, i) => [
           name,
-          series.reduce((sum, {data}) => sum + data[i].value, 0),
+          series.reduce((sum, {data}) => sum + data[i]!.value, 0),
         ])
       : [];
     const totals = new Map<string | number, number>(totalsArray);
diff --git a/static/app/components/charts/pieChart.tsx b/static/app/components/charts/pieChart.tsx
index 94dd202b984b56..0d80739112e579 100644
--- a/static/app/components/charts/pieChart.tsx
+++ b/static/app/components/charts/pieChart.tsx
@@ -77,7 +77,7 @@ class PieChart extends Component<Props> {
       .reduce(
         (acc, [name, value]) => ({
           ...acc,
-          [name]: value,
+          [name!]: value,
         }),
         {}
       );
@@ -95,7 +95,7 @@ class PieChart extends Component<Props> {
 
     // Note, we only take the first series unit!
     const [firstSeries] = series;
-    const seriesPercentages = this.getSeriesPercentages(firstSeries);
+    const seriesPercentages = this.getSeriesPercentages(firstSeries!);
 
     return (
       <BaseChart
@@ -108,7 +108,7 @@ class PieChart extends Component<Props> {
           if (
             !this.isInitialSelected ||
             !name ||
-            firstSeries.data[this.selected].name === name
+            firstSeries!.data[this.selected]!.name === name
           ) {
             return;
           }
@@ -159,8 +159,8 @@ class PieChart extends Component<Props> {
         }}
         series={[
           PieSeries({
-            name: firstSeries.seriesName,
-            data: firstSeries.data,
+            name: firstSeries!.seriesName,
+            data: firstSeries!.data,
             avoidLabelOverlap: false,
             label: {
               formatter: ({name, percent}) => `${name}\n${percent}%`,
diff --git a/static/app/components/charts/releaseSeries.spec.tsx b/static/app/components/charts/releaseSeries.spec.tsx
index 22151a9547547c..5e8cb52cc02143 100644
--- a/static/app/components/charts/releaseSeries.spec.tsx
+++ b/static/app/components/charts/releaseSeries.spec.tsx
@@ -237,8 +237,8 @@ describe('ReleaseSeries', function () {
       </Fragment>
     );
 
-    await waitFor(() => expect(screen.getByText('Series 1')).toBeInTheDocument());
-    await waitFor(() => expect(screen.getByText('Series 2')).toBeInTheDocument());
+    await screen.findByText('Series 1');
+    await screen.findByText('Series 2');
 
     await waitFor(() => expect(releasesMock).toHaveBeenCalledTimes(1));
   });
diff --git a/static/app/components/charts/releaseSeries.tsx b/static/app/components/charts/releaseSeries.tsx
index b126c57ee68cc4..9fc3285d9acaf5 100644
--- a/static/app/components/charts/releaseSeries.tsx
+++ b/static/app/components/charts/releaseSeries.tsx
@@ -175,7 +175,7 @@ class ReleaseSeries extends Component<ReleaseSeriesProps, State> {
         if (pageLinks) {
           const paginationObject = parseLinkHeader(pageLinks);
           hasMore = paginationObject?.next?.results ?? false;
-          conditions.cursor = paginationObject.next.cursor;
+          conditions.cursor = paginationObject.next!.cursor;
         } else {
           hasMore = false;
         }
diff --git a/static/app/components/charts/useChartZoom.tsx b/static/app/components/charts/useChartZoom.tsx
index 99a3d5deeb5e91..104cb5996af197 100644
--- a/static/app/components/charts/useChartZoom.tsx
+++ b/static/app/components/charts/useChartZoom.tsx
@@ -1,15 +1,9 @@
 import {useCallback, useEffect, useMemo, useRef} from 'react';
-import type {
-  DataZoomComponentOption,
-  ECharts,
-  InsideDataZoomComponentOption,
-  ToolboxComponentOption,
-} from 'echarts';
+import type {DataZoomComponentOption, ECharts, ToolboxComponentOption} from 'echarts';
 import * as qs from 'query-string';
 
 import {updateDateTime} from 'sentry/actionCreators/pageFilters';
 import DataZoomInside from 'sentry/components/charts/components/dataZoomInside';
-import DataZoomSlider from 'sentry/components/charts/components/dataZoomSlider';
 import ToolBox from 'sentry/components/charts/components/toolBox';
 import type {DateString} from 'sentry/types/core';
 import type {
@@ -43,7 +37,6 @@ interface ZoomRenderProps {
 
 interface Props {
   children: (props: ZoomRenderProps) => React.ReactNode;
-  chartZoomOptions?: DataZoomComponentOption;
   /**
    * Disables saving changes to the current period
    */
@@ -54,7 +47,6 @@ interface Props {
    * Will persist zoom state to page filters
    */
   saveOnZoom?: boolean;
-  showSlider?: boolean;
   /**
    * Use either `saveOnZoom` or `usePageDate` not both
    * Persists zoom state to query params without updating page filters.
@@ -135,8 +127,6 @@ export function useChartZoom({
   usePageDate,
   saveOnZoom,
   xAxisIndex,
-  showSlider,
-  chartZoomOptions,
 }: Omit<Props, 'children'>): ZoomRenderProps {
   const {handleChartReady} = useChartZoomCancel();
   const location = useLocation();
@@ -256,12 +246,9 @@ export function useChartZoom({
   const dataZoomProp = useMemo<DataZoomComponentOption[]>(() => {
     const zoomInside = DataZoomInside({
       xAxisIndex,
-      ...(chartZoomOptions as InsideDataZoomComponentOption),
     });
-    return showSlider
-      ? [...DataZoomSlider({xAxisIndex, ...chartZoomOptions}), ...zoomInside]
-      : zoomInside;
-  }, [chartZoomOptions, showSlider, xAxisIndex]);
+    return zoomInside;
+  }, [xAxisIndex]);
 
   const toolBox = useMemo<ToolboxComponentOption>(
     () =>
diff --git a/static/app/components/charts/utils.spec.tsx b/static/app/components/charts/utils.spec.tsx
index 9ed4973e9656bc..80e775c90b4e6e 100644
--- a/static/app/components/charts/utils.spec.tsx
+++ b/static/app/components/charts/utils.spec.tsx
@@ -111,19 +111,19 @@ describe('Chart Utils', function () {
     ]);
 
     it('handles negative intervals', function () {
-      expect(ladder.getInterval(-1)).toEqual('15m');
+      expect(ladder.getInterval(-1)).toBe('15m');
     });
 
     it('finds granularity at lower bound', function () {
-      expect(ladder.getInterval(getDiffInMinutes({period: '2m'}))).toEqual('15m');
+      expect(ladder.getInterval(getDiffInMinutes({period: '2m'}))).toBe('15m');
     });
 
     it('finds granularity between bounds', function () {
-      expect(ladder.getInterval(getDiffInMinutes({period: '3d'}))).toEqual('30m');
+      expect(ladder.getInterval(getDiffInMinutes({period: '3d'}))).toBe('30m');
     });
 
     it('finds granularity at upper bound', function () {
-      expect(ladder.getInterval(getDiffInMinutes({period: '60d'}))).toEqual('1d');
+      expect(ladder.getInterval(getDiffInMinutes({period: '60d'}))).toBe('1d');
     });
   });
 
diff --git a/static/app/components/charts/utils.tsx b/static/app/components/charts/utils.tsx
index ac03e159a78a1c..66c3c3b5461718 100644
--- a/static/app/components/charts/utils.tsx
+++ b/static/app/components/charts/utils.tsx
@@ -273,7 +273,7 @@ export const getDimensionValue = (dimension?: number | string | null) => {
 };
 
 const RGB_LIGHTEN_VALUE = 30;
-export const lightenHexToRgb = (colors: string[]) =>
+export const lightenHexToRgb = (colors: ReadonlyArray<string>) =>
   colors.map(hex => {
     const rgb = [
       Math.min(parseInt(hex.slice(1, 3), 16) + RGB_LIGHTEN_VALUE, 255),
@@ -292,7 +292,7 @@ export const processTableResults = (tableResults?: TableDataWithTitle[]) => {
     return DEFAULT_GEO_DATA;
   }
 
-  const tableResult = tableResults[0];
+  const tableResult = tableResults[0]!;
 
   const {data} = tableResult;
 
@@ -300,7 +300,7 @@ export const processTableResults = (tableResults?: TableDataWithTitle[]) => {
     return DEFAULT_GEO_DATA;
   }
 
-  const preAggregate = Object.keys(data[0]).find(column => {
+  const preAggregate = Object.keys(data[0]!).find(column => {
     return column !== 'geo.country_code';
   });
 
@@ -309,7 +309,7 @@ export const processTableResults = (tableResults?: TableDataWithTitle[]) => {
   }
 
   return {
-    title: tableResult.title ?? '',
+    title: tableResult!.title ?? '',
     data: data.map(row => {
       return {
         name: row['geo.country_code'] as string,
diff --git a/static/app/components/chevron.tsx b/static/app/components/chevron.tsx
index d80b62050d3e22..dfa9f19cfae203 100644
--- a/static/app/components/chevron.tsx
+++ b/static/app/components/chevron.tsx
@@ -34,7 +34,7 @@ function getPath(direction: NonNullable<ChevronProps['direction']>) {
     [3.5, 5.5],
     [7, 9],
     [10.5, 5.5],
-  ];
+  ] as const;
 
   switch (direction) {
     case 'right':
diff --git a/static/app/components/collapsible.spec.tsx b/static/app/components/collapsible.spec.tsx
index 5abc539696c81a..80ab6db5a0864f 100644
--- a/static/app/components/collapsible.spec.tsx
+++ b/static/app/components/collapsible.spec.tsx
@@ -10,7 +10,7 @@ describe('Collapsible', function () {
     render(<Collapsible>{items}</Collapsible>);
 
     expect(screen.getAllByText(/Item/)).toHaveLength(5);
-    expect(screen.getAllByText(/Item/)[2].innerHTML).toBe('Item 3');
+    expect(screen.getAllByText(/Item/)[2]!.innerHTML).toBe('Item 3');
 
     expect(screen.getByLabelText('Show 2 hidden items')).toBeInTheDocument();
     expect(screen.queryByLabelText('Collapse')).not.toBeInTheDocument();
diff --git a/static/app/components/compactSelect/control.tsx b/static/app/components/compactSelect/control.tsx
index 141d148d7a4f77..77423cf6ee32d8 100644
--- a/static/app/components/compactSelect/control.tsx
+++ b/static/app/components/compactSelect/control.tsx
@@ -524,9 +524,9 @@ export function Control({
         >
           <StyledOverlay
             width={menuWidth ?? menuFullWidth}
-            minWidth={overlayProps.style.minWidth}
+            minWidth={overlayProps.style!.minWidth}
             maxWidth={maxMenuWidth}
-            maxHeight={overlayProps.style.maxHeight}
+            maxHeight={overlayProps.style!.maxHeight}
             maxHeightProp={maxMenuHeight}
             data-menu-has-header={!!menuTitle || clearable}
             data-menu-has-search={searchable}
diff --git a/static/app/components/compactSelect/list.tsx b/static/app/components/compactSelect/list.tsx
index 20047160ff2fce..95f6a3b4ab44a0 100644
--- a/static/app/components/compactSelect/list.tsx
+++ b/static/app/components/compactSelect/list.tsx
@@ -201,7 +201,7 @@ function List<Value extends SelectKey>({
       disallowEmptySelection: disallowEmptySelection ?? true,
       allowDuplicateSelectionEvents: true,
       onSelectionChange: selection => {
-        const selectedOption = getSelectedOptions(items, selection)[0] ?? null;
+        const selectedOption = getSelectedOptions(items, selection)[0]! ?? null;
         // Save selected options in SelectContext, to update the trigger label
         saveSelectedOptions(compositeIndex, selectedOption);
         onChange?.(selectedOption);
diff --git a/static/app/components/compactSelect/utils.tsx b/static/app/components/compactSelect/utils.tsx
index 768080ccf0f88a..b5f80ae9c6ec67 100644
--- a/static/app/components/compactSelect/utils.tsx
+++ b/static/app/components/compactSelect/utils.tsx
@@ -152,7 +152,7 @@ export function getHiddenOptions<Value extends SelectKey>(
   let currentIndex = 0;
 
   while (currentIndex < remainingItems.length) {
-    const item = remainingItems[currentIndex];
+    const item = remainingItems[currentIndex]!;
     const delta = 'options' in item ? item.options.length : 1;
 
     if (accumulator + delta > limit) {
@@ -164,12 +164,12 @@ export function getHiddenOptions<Value extends SelectKey>(
     currentIndex += 1;
   }
 
-  for (let i = threshold[0]; i < remainingItems.length; i++) {
-    const item = remainingItems[i];
+  for (let i = threshold[0]!; i < remainingItems.length; i++) {
+    const item = remainingItems[i]!;
     if ('options' in item) {
-      const startingIndex = i === threshold[0] ? threshold[1] : 0;
+      const startingIndex = i === threshold[0] ? threshold[1]! : 0;
       for (let j = startingIndex; j < item.options.length; j++) {
-        hiddenOptionsSet.add(item.options[j].key);
+        hiddenOptionsSet.add(item.options[j]!.key);
       }
     } else {
       hiddenOptionsSet.add(item.key);
diff --git a/static/app/components/confirm.stories.tsx b/static/app/components/confirm.stories.tsx
index a079c3788d2d1a..6d51656f92bfe2 100644
--- a/static/app/components/confirm.stories.tsx
+++ b/static/app/components/confirm.stories.tsx
@@ -1,5 +1,3 @@
-/* eslint-disable no-console */
-
 import {Fragment, useState} from 'react';
 import styled from '@emotion/styled';
 
diff --git a/static/app/components/contextPickerModal.spec.tsx b/static/app/components/contextPickerModal.spec.tsx
index 06bc498defb7b0..3fc5eddd801c7f 100644
--- a/static/app/components/contextPickerModal.spec.tsx
+++ b/static/app/components/contextPickerModal.spec.tsx
@@ -65,6 +65,7 @@ describe('ContextPickerModal', function () {
     render(getComponent());
 
     expect(screen.getByText('Select an Organization')).toBeInTheDocument();
+    expect(screen.getByRole('textbox')).toHaveFocus();
     expect(screen.queryByText('Select a Project to continue')).not.toBeInTheDocument();
   });
 
@@ -102,8 +103,8 @@ describe('ContextPickerModal', function () {
 
     await waitFor(() => {
       expect(fetchProjectsForOrg).toHaveBeenCalled();
-      expect(onFinish).toHaveBeenLastCalledWith('/test/org2/path/project2/');
     });
+    expect(onFinish).toHaveBeenLastCalledWith('/test/org2/path/project2/');
   });
 
   it('selects an org and calls `onFinish` with URL with organization slug', async function () {
@@ -144,6 +145,7 @@ describe('ContextPickerModal', function () {
     // Should see 1 selected, and 1 as an option
     expect(screen.getAllByText('org-slug')).toHaveLength(2);
 
+    expect(screen.getByRole('textbox')).toHaveFocus();
     expect(await screen.findByText('My Projects')).toBeInTheDocument();
     expect(screen.getByText(project.slug)).toBeInTheDocument();
     expect(screen.getByText(project2.slug)).toBeInTheDocument();
@@ -164,7 +166,7 @@ describe('ContextPickerModal', function () {
     ];
     const fetchProjectsForOrg = MockApiClient.addMockResponse({
       url: `/organizations/${org2.slug}/projects/`,
-      body: organizations[1].projects,
+      body: organizations[1]!.projects,
     });
 
     OrganizationsStore.load(organizations);
@@ -180,6 +182,7 @@ describe('ContextPickerModal', function () {
 
     // Should not have anything selected
     expect(screen.getByText('Select an Organization')).toBeInTheDocument();
+    expect(screen.getByRole('textbox')).toHaveFocus();
 
     // Select org2
     await selectEvent.select(screen.getByText('Select an Organization'), org2.slug);
diff --git a/static/app/components/contextPickerModal.tsx b/static/app/components/contextPickerModal.tsx
index 4e5cf53c3f6b53..bb52bad7ba9363 100644
--- a/static/app/components/contextPickerModal.tsx
+++ b/static/app/components/contextPickerModal.tsx
@@ -1,5 +1,4 @@
 import {Component, Fragment} from 'react';
-import {findDOMNode} from 'react-dom';
 import {components} from 'react-select';
 import styled from '@emotion/styled';
 import type {Query} from 'history';
@@ -69,6 +68,10 @@ type Props = ModalRenderProps & {
   allowAllProjectsSelection?: boolean;
 };
 
+function autoFocusReactSelect(reactSelectRef: any) {
+  reactSelectRef?.select?.focus?.();
+}
+
 const selectStyles: StylesConfig = {
   menu: provided => ({
     ...provided,
@@ -116,12 +119,6 @@ class ContextPickerModal extends Component<Props> {
 
   onFinishTimeout: number | undefined = undefined;
 
-  // TODO(ts) The various generics in react-select types make getting this
-  // right hard.
-  orgSelect: any | null = null;
-  projectSelect: any | null = null;
-  configSelect: any | null = null;
-
   // Performs checks to see if we need to prompt user
   // i.e. When there is only 1 org and no project is needed or
   // there is only 1 org and only 1 project (which should be rare)
@@ -150,7 +147,7 @@ class ContextPickerModal extends Component<Props> {
     // If there is only one org and we don't need a project slug, then call finish callback
     if (!needProject) {
       const newPathname = replaceRouterParams(pathname, {
-        orgId: organizations[0].slug,
+        orgId: organizations[0]!.slug,
       });
       this.onFinishTimeout =
         onFinish(
@@ -164,13 +161,13 @@ class ContextPickerModal extends Component<Props> {
     // Use latest org or if only 1 org, use that
     let org = latestOrg;
     if (!org && organizations.length === 1) {
-      org = organizations[0].slug;
+      org = organizations[0]!.slug;
     }
 
     const newPathname = replaceRouterParams(pathname, {
       orgId: org,
-      projectId: projects[0].slug,
-      project: this.props.projects.find(p => p.slug === projects[0].slug)?.id,
+      projectId: projects[0]!.slug,
+      project: this.props.projects.find(p => p.slug === projects[0]!.slug)?.id,
     });
     this.onFinishTimeout =
       onFinish(
@@ -178,21 +175,6 @@ class ContextPickerModal extends Component<Props> {
       ) ?? undefined;
   };
 
-  doFocus = (ref: any | null) => {
-    if (!ref || this.props.loading) {
-      return;
-    }
-
-    // eslint-disable-next-line react/no-find-dom-node
-    const el = findDOMNode(ref) as HTMLElement;
-
-    if (el !== null) {
-      const input = el.querySelector('input');
-
-      input?.focus();
-    }
-  };
-
   handleSelectOrganization = ({value}: {value: string}) => {
     // If we do not need to select a project, we can early return after selecting an org
     // No need to fetch org details
@@ -286,7 +268,7 @@ class ContextPickerModal extends Component<Props> {
     const projectOptions = [
       {
         label: t('My Projects'),
-        options: memberProjects.map(p => ({
+        options: memberProjects!.map(p => ({
           value: p.slug,
           label: p.slug,
           disabled: false,
@@ -294,7 +276,7 @@ class ContextPickerModal extends Component<Props> {
       },
       {
         label: t('All Projects'),
-        options: nonMemberProjects.map(p => ({
+        options: nonMemberProjects!.map(p => ({
           value: p.slug,
           label: p.slug,
           disabled: allowAllProjectsSelection ? false : !isSuperuser,
@@ -316,10 +298,7 @@ class ContextPickerModal extends Component<Props> {
 
     return (
       <StyledSelectControl
-        ref={(ref: any) => {
-          this.projectSelect = ref;
-          this.doFocus(this.projectSelect);
-        }}
+        ref={autoFocusReactSelect}
         placeholder={t('Select a Project to continue')}
         name="project"
         options={projectOptions}
@@ -338,7 +317,7 @@ class ContextPickerModal extends Component<Props> {
     const options = [
       {
         label: tct('[providerName] Configurations', {
-          providerName: integrationConfigs[0].provider.name,
+          providerName: integrationConfigs[0]!.provider.name,
         }),
         options: integrationConfigs.map(config => ({
           value: config.id,
@@ -354,10 +333,7 @@ class ContextPickerModal extends Component<Props> {
     ];
     return (
       <StyledSelectControl
-        ref={(ref: any) => {
-          this.configSelect = ref;
-          this.doFocus(this.configSelect);
-        }}
+        ref={autoFocusReactSelect}
         placeholder={t('Select a configuration to continue')}
         name="configurations"
         options={options}
@@ -398,18 +374,14 @@ class ContextPickerModal extends Component<Props> {
 
     return (
       <Fragment>
-        <Header closeButton>{this.headerText}</Header>
+        <Header closeButton>
+          <h5>{this.headerText}</h5>
+        </Header>
         <Body>
           {loading && <StyledLoadingIndicator overlay />}
           {needOrg && (
             <StyledSelectControl
-              ref={(ref: any) => {
-                this.orgSelect = ref;
-                if (shouldShowProjectSelector) {
-                  return;
-                }
-                this.doFocus(this.orgSelect);
-              }}
+              ref={shouldShowProjectSelector ? undefined : autoFocusReactSelect}
               placeholder={t('Select an Organization')}
               name="organization"
               options={orgChoices}
diff --git a/static/app/components/customIgnoreCountModal.tsx b/static/app/components/customIgnoreCountModal.tsx
index 5950284083794f..3369481c666645 100644
--- a/static/app/components/customIgnoreCountModal.tsx
+++ b/static/app/components/customIgnoreCountModal.tsx
@@ -1,4 +1,4 @@
-import {Component, Fragment} from 'react';
+import {Fragment, useState} from 'react';
 
 import type {ModalRenderProps} from 'sentry/actionCreators/modal';
 import {Button} from 'sentry/components/button';
@@ -21,80 +21,70 @@ type Props = ModalRenderProps & {
   windowOptions: SelectValue<number>[];
 };
 
-type State = {
-  count: number;
-  window: number | null;
-};
-
-class CustomIgnoreCountModal extends Component<Props, State> {
-  state: State = {
-    count: 100,
-    window: null,
-  };
-
-  handleSubmit = () => {
-    const {count, window} = this.state;
-    const {countName, windowName} = this.props;
+export default function CustomIgnoreCountModal(props: Props) {
+  const [count, setCount] = useState<number>(100);
+  const [window, setWindow] = useState<number | null>(null);
+  const {
+    Header,
+    Footer,
+    Body,
+    countLabel,
+    label,
+    windowOptions,
+    countName,
+    windowName,
+    onSelected,
+    closeModal,
+  } = props;
 
+  const handleSubmit = () => {
     const statusDetails: IgnoredStatusDetails = {[countName]: count};
     if (window) {
       statusDetails[windowName] = window;
     }
-    this.props.onSelected(statusDetails);
-    this.props.closeModal();
+    onSelected(statusDetails);
+    closeModal();
   };
 
-  handleChange = (name: keyof State, value: number) => {
-    this.setState({[name]: value} as State);
-  };
-
-  render() {
-    const {Header, Footer, Body, countLabel, label, closeModal, windowOptions} =
-      this.props;
-    const {count, window} = this.state;
-
-    return (
-      <Fragment>
-        <Header>
-          <h4>{label}</h4>
-        </Header>
-        <Body>
-          <NumberField
-            inline={false}
-            flexibleControlStateSize
-            stacked
-            label={countLabel}
-            name="count"
-            value={count}
-            onChange={val => this.handleChange('count' as const, Number(val))}
-            required
-            placeholder={t('e.g. 100')}
-          />
-          <SelectField
-            inline={false}
-            flexibleControlStateSize
-            stacked
-            label={t('Time window')}
-            value={window}
-            name="window"
-            onChange={val => this.handleChange('window' as const, val)}
-            options={windowOptions}
-            placeholder={t('e.g. per hour')}
-            allowClear
-            help={t('(Optional) If supplied, this rule will apply as a rate of change.')}
-          />
-        </Body>
-        <Footer>
-          <ButtonBar gap={1}>
-            <Button onClick={closeModal}>{t('Cancel')}</Button>
-            <Button priority="primary" onClick={this.handleSubmit}>
-              {t('Ignore')}
-            </Button>
-          </ButtonBar>
-        </Footer>
-      </Fragment>
-    );
-  }
+  return (
+    <Fragment>
+      <Header>
+        <h4>{label}</h4>
+      </Header>
+      <Body>
+        <NumberField
+          inline={false}
+          flexibleControlStateSize
+          stacked
+          label={countLabel}
+          name="count"
+          value={count}
+          onChange={setCount}
+          required
+          placeholder={t('e.g. 100')}
+        />
+        <SelectField
+          inline={false}
+          flexibleControlStateSize
+          stacked
+          label={t('Time window')}
+          value={window}
+          name="window"
+          onChange={setWindow}
+          options={windowOptions}
+          placeholder={t('e.g. per hour')}
+          allowClear
+          help={t('(Optional) If supplied, this rule will apply as a rate of change.')}
+        />
+      </Body>
+      <Footer>
+        <ButtonBar gap={1}>
+          <Button onClick={closeModal}>{t('Cancel')}</Button>
+          <Button priority="primary" onClick={handleSubmit}>
+            {t('Ignore')}
+          </Button>
+        </ButtonBar>
+      </Footer>
+    </Fragment>
+  );
 }
-
-export default CustomIgnoreCountModal;
diff --git a/static/app/components/customIgnoreDurationModal.tsx b/static/app/components/customIgnoreDurationModal.tsx
index e7ba5952034c0a..6fafa5feb1b559 100644
--- a/static/app/components/customIgnoreDurationModal.tsx
+++ b/static/app/components/customIgnoreDurationModal.tsx
@@ -1,4 +1,4 @@
-import {Component, createRef, Fragment} from 'react';
+import {Fragment, useRef, useState} from 'react';
 import moment from 'moment-timezone';
 import {sprintf} from 'sprintf-js';
 
@@ -9,32 +9,22 @@ import ButtonBar from 'sentry/components/buttonBar';
 import {t} from 'sentry/locale';
 import type {IgnoredStatusDetails} from 'sentry/types/group';
 
-const defaultProps = {
-  label: t('Ignore this issue until \u2026'),
-};
-
 type Props = ModalRenderProps & {
   onSelected: (details: IgnoredStatusDetails) => void;
-} & typeof defaultProps;
-
-type State = {
-  dateWarning: boolean;
 };
 
-export default class CustomIgnoreDurationModal extends Component<Props, State> {
-  static defaultProps = defaultProps;
-
-  state: State = {
-    dateWarning: false,
-  };
+export default function CustomIgnoreDurationModal(props: Props) {
+  const [dateWarning, setDateWarning] = useState<boolean>(false);
+  const {Header, Body, Footer, onSelected, closeModal} = props;
+  const label = t('Ignore this issue until \u2026');
 
-  snoozeDateInputRef = createRef<HTMLInputElement>();
+  const snoozeDateInputRef = useRef<HTMLInputElement>(null);
 
-  snoozeTimeInputRef = createRef<HTMLInputElement>();
+  const snoozeTimeInputRef = useRef<HTMLInputElement | null>(null);
 
-  selectedIgnoreMinutes = () => {
-    const dateStr = this.snoozeDateInputRef.current?.value; // YYYY-MM-DD
-    const timeStr = this.snoozeTimeInputRef.current?.value; // HH:MM
+  const selectedIgnoreMinutes = () => {
+    const dateStr = snoozeDateInputRef.current?.value; // YYYY-MM-DD
+    const timeStr = snoozeTimeInputRef.current?.value; // HH:MM
     if (dateStr && timeStr) {
       const selectedDate = moment.utc(dateStr + ' ' + timeStr);
       if (selectedDate.isValid()) {
@@ -45,86 +35,80 @@ export default class CustomIgnoreDurationModal extends Component<Props, State> {
     return 0;
   };
 
-  snoozeClicked = () => {
-    const minutes = this.selectedIgnoreMinutes();
+  const snoozeClicked = () => {
+    const minutes = selectedIgnoreMinutes();
 
     if (minutes <= 0) {
-      this.setState({
-        dateWarning: minutes <= 0,
-      });
-
+      setDateWarning(minutes <= 0);
       return;
     }
 
-    this.props.onSelected({ignoreDuration: minutes});
-    this.props.closeModal();
+    onSelected({ignoreDuration: minutes});
+    closeModal();
   };
 
-  render() {
-    // Give the user a sane starting point to select a date
-    // (prettier than the empty date/time inputs):
-    const defaultDate = new Date();
-    defaultDate.setDate(defaultDate.getDate() + 14);
-    defaultDate.setSeconds(0);
-    defaultDate.setMilliseconds(0);
-
-    const defaultDateVal = sprintf(
-      '%d-%02d-%02d',
-      defaultDate.getUTCFullYear(),
-      defaultDate.getUTCMonth() + 1,
-      defaultDate.getUTCDate()
-    );
-
-    const defaultTimeVal = sprintf('%02d:00', defaultDate.getUTCHours());
-    const {Header, Body, Footer, label} = this.props;
-
-    return (
-      <Fragment>
-        <Header>{label}</Header>
-        <Body>
-          <form className="form-horizontal">
-            <div className="control-group">
-              <h6 className="nav-header">{t('Date')}</h6>
-              <input
-                className="form-control"
-                type="date"
-                id="snooze-until-date"
-                defaultValue={defaultDateVal}
-                ref={this.snoozeDateInputRef}
-                required
-                style={{padding: '0 10px'}}
-              />
-            </div>
-            <div className="control-group m-b-1">
-              <h6 className="nav-header">{t('Time (UTC)')}</h6>
-              <input
-                className="form-control"
-                type="time"
-                id="snooze-until-time"
-                defaultValue={defaultTimeVal}
-                ref={this.snoozeTimeInputRef}
-                style={{padding: '0 10px'}}
-                required
-              />
-            </div>
-          </form>
-        </Body>
-        {this.state.dateWarning && (
-          <Alert type="error" showIcon>
-            {t('Please enter a valid date in the future')}
-          </Alert>
-        )}
-        <Footer>
-          <ButtonBar gap={1}>
-            <Button priority="default" onClick={this.props.closeModal}>
-              {t('Cancel')}
-            </Button>
-            <Button priority="primary" onClick={this.snoozeClicked}>
-              {t('Ignore')}
-            </Button>
-          </ButtonBar>
-        </Footer>
-      </Fragment>
-    );
-  }
+  // Give the user a sane starting point to select a date
+  // (prettier than the empty date/time inputs):
+  const defaultDate = new Date();
+  defaultDate.setDate(defaultDate.getDate() + 14);
+  defaultDate.setSeconds(0);
+  defaultDate.setMilliseconds(0);
+
+  const defaultDateVal = sprintf(
+    '%d-%02d-%02d',
+    defaultDate.getUTCFullYear(),
+    defaultDate.getUTCMonth() + 1,
+    defaultDate.getUTCDate()
+  );
+
+  const defaultTimeVal = sprintf('%02d:00', defaultDate.getUTCHours());
+
+  return (
+    <Fragment>
+      <Header>{label}</Header>
+      <Body>
+        <form className="form-horizontal">
+          <div className="control-group">
+            <h6 className="nav-header">{t('Date')}</h6>
+            <input
+              className="form-control"
+              type="date"
+              id="snooze-until-date"
+              defaultValue={defaultDateVal}
+              ref={snoozeDateInputRef}
+              required
+              style={{padding: '0 10px'}}
+            />
+          </div>
+          <div className="control-group m-b-1">
+            <h6 className="nav-header">{t('Time (UTC)')}</h6>
+            <input
+              className="form-control"
+              type="time"
+              id="snooze-until-time"
+              defaultValue={defaultTimeVal}
+              ref={snoozeTimeInputRef}
+              style={{padding: '0 10px'}}
+              required
+            />
+          </div>
+        </form>
+      </Body>
+      {dateWarning && (
+        <Alert type="error" showIcon>
+          {t('Please enter a valid date in the future')}
+        </Alert>
+      )}
+      <Footer>
+        <ButtonBar gap={1}>
+          <Button priority="default" onClick={closeModal}>
+            {t('Cancel')}
+          </Button>
+          <Button priority="primary" onClick={snoozeClicked}>
+            {t('Ignore')}
+          </Button>
+        </ButtonBar>
+      </Footer>
+    </Fragment>
+  );
 }
diff --git a/static/app/components/deprecatedAssigneeSelector.spec.tsx b/static/app/components/deprecatedAssigneeSelector.spec.tsx
index c11f5d77679d8b..ad359ce728da1d 100644
--- a/static/app/components/deprecatedAssigneeSelector.spec.tsx
+++ b/static/app/components/deprecatedAssigneeSelector.spec.tsx
@@ -349,7 +349,7 @@ describe('DeprecatedAssigneeSelector', () => {
 
     const options = screen.getAllByTestId('assignee-option');
     expect(options[5]).toHaveTextContent('JD');
-    await userEvent.click(options[4]);
+    await userEvent.click(options[4]!);
 
     await waitFor(() => {
       expect(addMessageSpy).toHaveBeenCalledWith(
@@ -379,7 +379,7 @@ describe('DeprecatedAssigneeSelector', () => {
     const options = screen.getAllByTestId('assignee-option');
     // Suggested assignee initials
     expect(options[0]).toHaveTextContent('JB');
-    await userEvent.click(options[0]);
+    await userEvent.click(options[0]!);
 
     await waitFor(() =>
       expect(assignGroup2Mock).toHaveBeenCalledWith(
diff --git a/static/app/components/deprecatedAssigneeSelector.tsx b/static/app/components/deprecatedAssigneeSelector.tsx
index 4a9f9427693b60..029ec7ae6ce8e6 100644
--- a/static/app/components/deprecatedAssigneeSelector.tsx
+++ b/static/app/components/deprecatedAssigneeSelector.tsx
@@ -72,6 +72,7 @@ export function AssigneeAvatar({
   }
 
   if (suggestedActors.length > 0) {
+    const firstActor = suggestedActors[0]!;
     return (
       <SuggestedAvatarStack
         size={26}
@@ -82,15 +83,13 @@ export function AssigneeAvatar({
             <div>
               {tct('Suggestion: [name]', {
                 name:
-                  suggestedActors[0].type === 'team'
-                    ? `#${suggestedActors[0].name}`
-                    : suggestedActors[0].name,
+                  firstActor.type === 'team' ? `#${firstActor.name}` : firstActor.name,
               })}
               {suggestedActors.length > 1 &&
                 tn(' + %s other', ' + %s others', suggestedActors.length - 1)}
             </div>
             <TooltipSubtext>
-              {suggestedReasons[suggestedActors[0].suggestedReason]}
+              {suggestedReasons[firstActor.suggestedReason]}
             </TooltipSubtext>
           </TooltipWrapper>
         }
diff --git a/static/app/components/deprecatedAssigneeSelectorDropdown.tsx b/static/app/components/deprecatedAssigneeSelectorDropdown.tsx
index 0e2b351b38343e..66f34f86fe65d8 100644
--- a/static/app/components/deprecatedAssigneeSelectorDropdown.tsx
+++ b/static/app/components/deprecatedAssigneeSelectorDropdown.tsx
@@ -370,7 +370,7 @@ export class DeprecatedAssigneeSelectorDropdown extends Component<
     )[] = [];
 
     for (let i = 0; i < suggestedAssignees.length; i++) {
-      const assignee = suggestedAssignees[i];
+      const assignee = suggestedAssignees[i]!;
       if (assignee.type !== 'user' && assignee.type !== 'team') {
         continue;
       }
@@ -514,7 +514,7 @@ export class DeprecatedAssigneeSelectorDropdown extends Component<
           const member = memberList.find(user => user.id === id);
           if (member) {
             return {
-              id,
+              id: id!,
               type: 'user',
               name: member.name,
               suggestedReason: owner.type,
@@ -528,7 +528,7 @@ export class DeprecatedAssigneeSelectorDropdown extends Component<
           );
           if (matchingTeam) {
             return {
-              id,
+              id: id!,
               type: 'team',
               name: matchingTeam.team.name,
               suggestedReason: owner.type,
@@ -606,7 +606,7 @@ export function putSessionUserFirst(members: User[] | undefined): User[] {
     return members;
   }
 
-  const arrangedMembers = [members[sessionUserIndex]].concat(
+  const arrangedMembers = [members[sessionUserIndex]!].concat(
     members.slice(0, sessionUserIndex),
     members.slice(sessionUserIndex + 1)
   );
diff --git a/static/app/components/deprecatedDropdownMenu.spec.tsx b/static/app/components/deprecatedDropdownMenu.spec.tsx
index e2eee008a9b667..75d19e0c10fd26 100644
--- a/static/app/components/deprecatedDropdownMenu.spec.tsx
+++ b/static/app/components/deprecatedDropdownMenu.spec.tsx
@@ -113,7 +113,7 @@ describe('dropdownMenuDeprecated', function () {
     await userEvent.click(screen.getByTestId('menu'));
     expect(menuClick).toHaveBeenCalled();
 
-    expect(screen.queryByRole('listbox')).toBeInTheDocument();
+    expect(screen.getByRole('listbox')).toBeInTheDocument();
   });
 
   it('always rendered menus should attach document event listeners only when opened', async function () {
diff --git a/static/app/components/smartSearchBar/actionButton.tsx b/static/app/components/deprecatedSmartSearchBar/actionButton.tsx
similarity index 90%
rename from static/app/components/smartSearchBar/actionButton.tsx
rename to static/app/components/deprecatedSmartSearchBar/actionButton.tsx
index 8acd2c4f9f768d..41778b8d831272 100644
--- a/static/app/components/smartSearchBar/actionButton.tsx
+++ b/static/app/components/deprecatedSmartSearchBar/actionButton.tsx
@@ -1,4 +1,3 @@
-// eslint-disable-next-line no-restricted-imports
 import styled from '@emotion/styled';
 
 import {Button} from 'sentry/components/button';
diff --git a/static/app/components/smartSearchBar/index.spec.tsx b/static/app/components/deprecatedSmartSearchBar/index.spec.tsx
similarity index 89%
rename from static/app/components/smartSearchBar/index.spec.tsx
rename to static/app/components/deprecatedSmartSearchBar/index.spec.tsx
index fa0862cd53552c..b9a924d8796865 100644
--- a/static/app/components/smartSearchBar/index.spec.tsx
+++ b/static/app/components/deprecatedSmartSearchBar/index.spec.tsx
@@ -11,7 +11,7 @@ import {
   waitFor,
 } from 'sentry-test/reactTestingLibrary';
 
-import {SmartSearchBar} from 'sentry/components/smartSearchBar';
+import {DeprecatedSmartSearchBar} from 'sentry/components/deprecatedSmartSearchBar';
 import TagStore from 'sentry/stores/tagStore';
 import {FieldKey} from 'sentry/utils/fields';
 
@@ -68,7 +68,9 @@ describe('SmartSearchBar', function () {
       .fn()
       .mockResolvedValue(['this is filled with spaces']);
 
-    render(<SmartSearchBar {...defaultProps} onGetTagValues={onGetTagValuesMock} />);
+    render(
+      <DeprecatedSmartSearchBar {...defaultProps} onGetTagValues={onGetTagValuesMock} />
+    );
 
     const textbox = screen.getByRole('textbox');
     await userEvent.click(textbox);
@@ -86,7 +88,9 @@ describe('SmartSearchBar', function () {
       .fn()
       .mockResolvedValue(['this " is " filled " with " quotes']);
 
-    render(<SmartSearchBar {...defaultProps} onGetTagValues={onGetTagValuesMock} />);
+    render(
+      <DeprecatedSmartSearchBar {...defaultProps} onGetTagValues={onGetTagValuesMock} />
+    );
 
     const textbox = screen.getByRole('textbox');
     await userEvent.click(textbox);
@@ -102,7 +106,7 @@ describe('SmartSearchBar', function () {
   it('does not search when pressing enter on a tag without a value', async function () {
     const onSearchMock = jest.fn();
 
-    render(<SmartSearchBar {...defaultProps} onSearch={onSearchMock} />);
+    render(<DeprecatedSmartSearchBar {...defaultProps} onSearch={onSearchMock} />);
 
     const textbox = screen.getByRole('textbox');
     await userEvent.type(textbox, 'browser:{enter}');
@@ -113,7 +117,7 @@ describe('SmartSearchBar', function () {
   it('autocompletes value with tab', async function () {
     const onSearchMock = jest.fn();
 
-    render(<SmartSearchBar {...defaultProps} onSearch={onSearchMock} />);
+    render(<DeprecatedSmartSearchBar {...defaultProps} onSearch={onSearchMock} />);
 
     const textbox = screen.getByRole('textbox');
     await userEvent.type(textbox, 'bro');
@@ -138,7 +142,7 @@ describe('SmartSearchBar', function () {
   it('autocompletes value with enter', async function () {
     const onSearchMock = jest.fn();
 
-    render(<SmartSearchBar {...defaultProps} onSearch={onSearchMock} />);
+    render(<DeprecatedSmartSearchBar {...defaultProps} onSearch={onSearchMock} />);
 
     const textbox = screen.getByRole('textbox');
     await userEvent.type(textbox, 'bro');
@@ -161,7 +165,7 @@ describe('SmartSearchBar', function () {
   });
 
   it('searches and completes tags with negation operator', async function () {
-    render(<SmartSearchBar {...defaultProps} />);
+    render(<DeprecatedSmartSearchBar {...defaultProps} />);
 
     const textbox = screen.getByRole('textbox');
     await userEvent.type(textbox, '!bro');
@@ -175,43 +179,51 @@ describe('SmartSearchBar', function () {
 
   describe('componentWillReceiveProps()', function () {
     it('should add a space when setting query', function () {
-      render(<SmartSearchBar {...defaultProps} query="one" />);
+      render(<DeprecatedSmartSearchBar {...defaultProps} query="one" />);
 
       expect(screen.getByRole('textbox')).toHaveValue('one ');
     });
 
     it('updates query when prop changes', function () {
-      const {rerender} = render(<SmartSearchBar {...defaultProps} query="one" />);
+      const {rerender} = render(
+        <DeprecatedSmartSearchBar {...defaultProps} query="one" />
+      );
 
-      rerender(<SmartSearchBar {...defaultProps} query="two" />);
+      rerender(<DeprecatedSmartSearchBar {...defaultProps} query="two" />);
 
       expect(screen.getByRole('textbox')).toHaveValue('two ');
     });
 
     it('updates query when prop set to falsey value', function () {
-      const {rerender} = render(<SmartSearchBar {...defaultProps} query="one" />);
+      const {rerender} = render(
+        <DeprecatedSmartSearchBar {...defaultProps} query="one" />
+      );
 
-      rerender(<SmartSearchBar {...defaultProps} query={null} />);
+      rerender(<DeprecatedSmartSearchBar {...defaultProps} query={null} />);
 
       expect(screen.getByRole('textbox')).toHaveValue('');
     });
 
     it('should not reset user textarea if a noop props change happens', async function () {
-      const {rerender} = render(<SmartSearchBar {...defaultProps} query="one" />);
+      const {rerender} = render(
+        <DeprecatedSmartSearchBar {...defaultProps} query="one" />
+      );
 
       await userEvent.type(screen.getByRole('textbox'), 'two');
 
-      rerender(<SmartSearchBar {...defaultProps} query="one" />);
+      rerender(<DeprecatedSmartSearchBar {...defaultProps} query="one" />);
 
       expect(screen.getByRole('textbox')).toHaveValue('one two');
     });
 
     it('should reset user textarea if a meaningful props change happens', async function () {
-      const {rerender} = render(<SmartSearchBar {...defaultProps} query="one" />);
+      const {rerender} = render(
+        <DeprecatedSmartSearchBar {...defaultProps} query="one" />
+      );
 
       await userEvent.type(screen.getByRole('textbox'), 'two');
 
-      rerender(<SmartSearchBar {...defaultProps} query="blah" />);
+      rerender(<DeprecatedSmartSearchBar {...defaultProps} query="blah" />);
 
       expect(screen.getByRole('textbox')).toHaveValue('blah ');
     });
@@ -222,7 +234,11 @@ describe('SmartSearchBar', function () {
       const mockOnSearch = jest.fn();
 
       render(
-        <SmartSearchBar {...defaultProps} onSearch={mockOnSearch} query="is:unresolved" />
+        <DeprecatedSmartSearchBar
+          {...defaultProps}
+          onSearch={mockOnSearch}
+          query="is:unresolved"
+        />
       );
 
       expect(screen.getByRole('textbox')).toHaveValue('is:unresolved ');
@@ -238,7 +254,7 @@ describe('SmartSearchBar', function () {
 
   describe('dropdown open state', function () {
     it('opens the dropdown when the search box is clicked', async function () {
-      render(<SmartSearchBar {...defaultProps} />);
+      render(<DeprecatedSmartSearchBar {...defaultProps} />);
 
       const textbox = screen.getByRole('textbox');
 
@@ -248,7 +264,7 @@ describe('SmartSearchBar', function () {
     });
 
     it('opens the dropdown when the search box gains focus', function () {
-      render(<SmartSearchBar {...defaultProps} />);
+      render(<DeprecatedSmartSearchBar {...defaultProps} />);
 
       const textbox = screen.getByRole('textbox');
 
@@ -260,7 +276,7 @@ describe('SmartSearchBar', function () {
     it('hides the drop down when clicking outside', async function () {
       render(
         <div data-test-id="test-container">
-          <SmartSearchBar {...defaultProps} />
+          <DeprecatedSmartSearchBar {...defaultProps} />
         </div>
       );
 
@@ -275,7 +291,7 @@ describe('SmartSearchBar', function () {
     });
 
     it('hides the drop down when pressing escape', async function () {
-      render(<SmartSearchBar {...defaultProps} />);
+      render(<DeprecatedSmartSearchBar {...defaultProps} />);
 
       const textbox = screen.getByRole('textbox');
 
@@ -291,7 +307,7 @@ describe('SmartSearchBar', function () {
   describe('pasting', function () {
     it('trims pasted content', async function () {
       const mockOnChange = jest.fn();
-      render(<SmartSearchBar {...defaultProps} onChange={mockOnChange} />);
+      render(<DeprecatedSmartSearchBar {...defaultProps} onChange={mockOnChange} />);
 
       const textbox = screen.getByRole('textbox');
 
@@ -306,7 +322,9 @@ describe('SmartSearchBar', function () {
 
   it('invokes onSearch() on enter', async function () {
     const mockOnSearch = jest.fn();
-    render(<SmartSearchBar {...defaultProps} query="test" onSearch={mockOnSearch} />);
+    render(
+      <DeprecatedSmartSearchBar {...defaultProps} query="test" onSearch={mockOnSearch} />
+    );
 
     await userEvent.type(screen.getByRole('textbox'), '{Enter}');
 
@@ -314,7 +332,7 @@ describe('SmartSearchBar', function () {
   });
 
   it('handles an empty query', function () {
-    render(<SmartSearchBar {...defaultProps} query="" />);
+    render(<DeprecatedSmartSearchBar {...defaultProps} query="" />);
 
     expect(screen.getByRole('textbox')).toHaveValue('');
   });
@@ -323,7 +341,7 @@ describe('SmartSearchBar', function () {
     const getTagValuesMock = jest.fn().mockResolvedValue([]);
 
     render(
-      <SmartSearchBar
+      <DeprecatedSmartSearchBar
         {...defaultProps}
         onGetTagValues={getTagValuesMock}
         excludedTags={['environment']}
@@ -340,7 +358,7 @@ describe('SmartSearchBar', function () {
     const getTagValuesMock = jest.fn().mockResolvedValue([]);
 
     render(
-      <SmartSearchBar
+      <DeprecatedSmartSearchBar
         {...defaultProps}
         onGetTagValues={getTagValuesMock}
         excludedTags={['environment']}
@@ -357,7 +375,7 @@ describe('SmartSearchBar', function () {
     const getTagValuesMock = jest.fn().mockResolvedValue([]);
 
     render(
-      <SmartSearchBar
+      <DeprecatedSmartSearchBar
         {...defaultProps}
         onGetTagValues={getTagValuesMock}
         excludedTags={['environment']}
@@ -374,7 +392,7 @@ describe('SmartSearchBar', function () {
     const getTagValuesMock = jest.fn().mockResolvedValue([]);
 
     render(
-      <SmartSearchBar
+      <DeprecatedSmartSearchBar
         {...defaultProps}
         query="is:unresolved"
         onGetTagValues={getTagValuesMock}
@@ -402,7 +420,7 @@ describe('SmartSearchBar', function () {
     await userEvent.keyboard('{ArrowRight}');
     // Should show "Tags" and "Operator Helpers" but NOT "Values"
     expect(await screen.findByText('Keys')).toBeInTheDocument();
-    expect(screen.queryByText('Operator Helpers')).toBeInTheDocument();
+    expect(screen.getByText('Operator Helpers')).toBeInTheDocument();
     expect(screen.queryByText('Values')).not.toBeInTheDocument();
 
     // Set cursor after the ":"
@@ -421,7 +439,7 @@ describe('SmartSearchBar', function () {
   });
 
   it('shows syntax error for incorrect tokens', function () {
-    render(<SmartSearchBar {...defaultProps} query="tag: is: has:" />);
+    render(<DeprecatedSmartSearchBar {...defaultProps} query="tag: is: has:" />);
 
     // Should have three invalid tokens (tag:, is:, and has:)
     expect(screen.getAllByTestId('filter-token-invalid')).toHaveLength(3);
@@ -429,7 +447,7 @@ describe('SmartSearchBar', function () {
 
   it('renders nested keys correctly', async function () {
     render(
-      <SmartSearchBar
+      <DeprecatedSmartSearchBar
         {...defaultProps}
         query=""
         supportedTags={{
@@ -457,7 +475,7 @@ describe('SmartSearchBar', function () {
 
   it('filters keys on name and description', async function () {
     render(
-      <SmartSearchBar
+      <DeprecatedSmartSearchBar
         {...defaultProps}
         query=""
         supportedTags={{
@@ -501,7 +519,11 @@ describe('SmartSearchBar', function () {
     );
 
     render(
-      <SmartSearchBar {...defaultProps} onGetTagValues={mockOnGetTagValues} query="" />
+      <DeprecatedSmartSearchBar
+        {...defaultProps}
+        onGetTagValues={mockOnGetTagValues}
+        query=""
+      />
     );
 
     const textbox = screen.getByRole('textbox');
@@ -528,7 +550,7 @@ describe('SmartSearchBar', function () {
     const getTagValuesMock = jest.fn().mockResolvedValue(['Chrome', 'Firefox']);
 
     render(
-      <SmartSearchBar
+      <DeprecatedSmartSearchBar
         {...defaultProps}
         onGetTagValues={getTagValuesMock}
         query=""
@@ -557,7 +579,7 @@ describe('SmartSearchBar', function () {
     const getTagValuesMock = jest.fn().mockResolvedValue(['Chrome', 'Firefox']);
 
     render(
-      <SmartSearchBar
+      <DeprecatedSmartSearchBar
         {...defaultProps}
         onGetTagValues={getTagValuesMock}
         excludedTags={['environment']}
@@ -591,7 +613,7 @@ describe('SmartSearchBar', function () {
     const getTagValuesMock = jest.fn().mockResolvedValue(['id:1']);
 
     render(
-      <SmartSearchBar
+      <DeprecatedSmartSearchBar
         {...defaultProps}
         onGetTagValues={getTagValuesMock}
         query=""
@@ -618,7 +640,7 @@ describe('SmartSearchBar', function () {
     const mockOnChange = jest.fn();
 
     render(
-      <SmartSearchBar
+      <DeprecatedSmartSearchBar
         {...defaultProps}
         query=""
         onChange={mockOnChange}
@@ -652,7 +674,7 @@ describe('SmartSearchBar', function () {
     const mockOnChange = jest.fn();
 
     render(
-      <SmartSearchBar
+      <DeprecatedSmartSearchBar
         {...defaultProps}
         query=""
         onChange={mockOnChange}
@@ -718,7 +740,7 @@ describe('SmartSearchBar', function () {
     const mockOnChange = jest.fn();
 
     render(
-      <SmartSearchBar
+      <DeprecatedSmartSearchBar
         {...defaultProps}
         query=""
         onChange={mockOnChange}
@@ -759,7 +781,7 @@ describe('SmartSearchBar', function () {
     const mockOnChange = jest.fn();
 
     render(
-      <SmartSearchBar
+      <DeprecatedSmartSearchBar
         {...defaultProps}
         query=""
         onChange={mockOnChange}
@@ -798,7 +820,7 @@ describe('SmartSearchBar', function () {
   describe('quick actions', function () {
     it('can delete tokens', async function () {
       render(
-        <SmartSearchBar
+        <DeprecatedSmartSearchBar
           {...defaultProps}
           query="is:unresolved sdk.name:sentry-cocoa has:key"
         />
@@ -819,7 +841,7 @@ describe('SmartSearchBar', function () {
 
     it('can delete a middle token', async function () {
       render(
-        <SmartSearchBar
+        <DeprecatedSmartSearchBar
           {...defaultProps}
           query="is:unresolved sdk.name:sentry-cocoa has:key"
         />
@@ -840,7 +862,7 @@ describe('SmartSearchBar', function () {
 
     it('can exclude a token', async function () {
       render(
-        <SmartSearchBar
+        <DeprecatedSmartSearchBar
           {...defaultProps}
           query="is:unresolved sdk.name:sentry-cocoa has:key"
         />
@@ -861,7 +883,7 @@ describe('SmartSearchBar', function () {
 
     it('can include a token', async function () {
       render(
-        <SmartSearchBar
+        <DeprecatedSmartSearchBar
           {...defaultProps}
           query="is:unresolved !sdk.name:sentry-cocoa has:key"
         />
@@ -885,7 +907,7 @@ describe('SmartSearchBar', function () {
   });
 
   it('displays invalid field message', async function () {
-    render(<SmartSearchBar {...defaultProps} query="" />);
+    render(<DeprecatedSmartSearchBar {...defaultProps} query="" />);
 
     const textbox = screen.getByRole('textbox');
 
@@ -897,7 +919,7 @@ describe('SmartSearchBar', function () {
   });
 
   it('displays invalid field messages for when wildcard is disallowed', async function () {
-    render(<SmartSearchBar {...defaultProps} query="" disallowWildcard />);
+    render(<DeprecatedSmartSearchBar {...defaultProps} query="" disallowWildcard />);
 
     const textbox = screen.getByRole('textbox');
 
@@ -922,7 +944,7 @@ describe('SmartSearchBar', function () {
     });
 
     it('displays date picker dropdown when appropriate', async () => {
-      render(<SmartSearchBar {...defaultProps} query="" />);
+      render(<DeprecatedSmartSearchBar {...defaultProps} query="" />);
 
       const textbox = screen.getByRole<HTMLTextAreaElement>('textbox');
       await userEvent.click(textbox);
@@ -957,7 +979,7 @@ describe('SmartSearchBar', function () {
     });
 
     it('can select a suggested relative time value', async () => {
-      render(<SmartSearchBar {...defaultProps} query="" />);
+      render(<DeprecatedSmartSearchBar {...defaultProps} query="" />);
 
       await userEvent.type(screen.getByRole('textbox'), 'lastSeen:');
 
@@ -967,7 +989,7 @@ describe('SmartSearchBar', function () {
     });
 
     it('can select a specific date/time', async () => {
-      render(<SmartSearchBar {...defaultProps} query="" />);
+      render(<DeprecatedSmartSearchBar {...defaultProps} query="" />);
 
       await userEvent.type(screen.getByRole('textbox'), 'lastSeen:');
 
@@ -1007,7 +1029,7 @@ describe('SmartSearchBar', function () {
     });
 
     it('can change an existing datetime', async () => {
-      render(<SmartSearchBar {...defaultProps} query="" />);
+      render(<DeprecatedSmartSearchBar {...defaultProps} query="" />);
 
       const textbox = screen.getByRole<HTMLTextAreaElement>('textbox');
       fireEvent.change(textbox, {
@@ -1035,7 +1057,7 @@ describe('SmartSearchBar', function () {
     });
 
     it('populates the date picker correctly for date without time', async () => {
-      render(<SmartSearchBar {...defaultProps} query="lastSeen:2022-01-01" />);
+      render(<DeprecatedSmartSearchBar {...defaultProps} query="lastSeen:2022-01-01" />);
 
       const textbox = screen.getByRole('textbox');
 
@@ -1055,7 +1077,12 @@ describe('SmartSearchBar', function () {
     });
 
     it('populates the date picker correctly for date with time and no timezone', async () => {
-      render(<SmartSearchBar {...defaultProps} query="lastSeen:2022-01-01T09:45:12" />);
+      render(
+        <DeprecatedSmartSearchBar
+          {...defaultProps}
+          query="lastSeen:2022-01-01T09:45:12"
+        />
+      );
 
       const textbox = screen.getByRole('textbox');
 
@@ -1074,7 +1101,10 @@ describe('SmartSearchBar', function () {
 
     it('populates the date picker correctly for date with time and timezone', async () => {
       render(
-        <SmartSearchBar {...defaultProps} query="lastSeen:2022-01-01T09:45:12-05:00" />
+        <DeprecatedSmartSearchBar
+          {...defaultProps}
+          query="lastSeen:2022-01-01T09:45:12-05:00"
+        />
       );
 
       const textbox = screen.getByRole('textbox');
@@ -1113,7 +1143,7 @@ describe('SmartSearchBar', function () {
     it('displays a default group with custom wrapper', async function () {
       const mockOnChange = jest.fn();
       render(
-        <SmartSearchBar
+        <DeprecatedSmartSearchBar
           {...defaultProps}
           defaultSearchGroup={defaultSearchGroup}
           query=""
@@ -1137,7 +1167,10 @@ describe('SmartSearchBar', function () {
     });
     it('hides the default group after typing', async function () {
       render(
-        <SmartSearchBar {...defaultProps} defaultSearchGroup={defaultSearchGroup} />
+        <DeprecatedSmartSearchBar
+          {...defaultProps}
+          defaultSearchGroup={defaultSearchGroup}
+        />
       );
 
       const textbox = screen.getByRole('textbox');
@@ -1154,7 +1187,7 @@ describe('SmartSearchBar', function () {
 
     it('hides the default group after picking item with applyFilter', async function () {
       render(
-        <SmartSearchBar
+        <DeprecatedSmartSearchBar
           {...defaultProps}
           defaultSearchGroup={{
             ...defaultSearchGroup,
diff --git a/static/app/components/smartSearchBar/index.tsx b/static/app/components/deprecatedSmartSearchBar/index.tsx
similarity index 99%
rename from static/app/components/smartSearchBar/index.tsx
rename to static/app/components/deprecatedSmartSearchBar/index.tsx
index d5ce77a3ccc96f..4f3d3c024cc958 100644
--- a/static/app/components/smartSearchBar/index.tsx
+++ b/static/app/components/deprecatedSmartSearchBar/index.tsx
@@ -443,7 +443,10 @@ type State = {
   previousQuery?: string;
 };
 
-class SmartSearchBar extends Component<DefaultProps & Props, State> {
+/**
+ * @deprecated use SearchQueryBuilder instead
+ */
+class DeprecatedSmartSearchBar extends Component<DefaultProps & Props, State> {
   static defaultProps = {
     id: 'smart-search-input',
     includeLabel: true,
@@ -557,7 +560,7 @@ class SmartSearchBar extends Component<DefaultProps & Props, State> {
       return;
     }
 
-    const entry = entries[0];
+    const entry = entries[0]!;
     const {width} = entry.contentRect;
     const actionCount = this.props.actionBarItems?.length ?? 0;
 
@@ -646,11 +649,11 @@ class SmartSearchBar extends Component<DefaultProps & Props, State> {
     if (this.searchInput.current && filterTokens.length > 0) {
       maybeFocusInput(this.searchInput.current);
 
-      let offset = filterTokens[0].location.end.offset;
+      let offset = filterTokens[0]!.location.end.offset;
       if (token) {
         const tokenIndex = filterTokens.findIndex(tok => tok === token);
         if (tokenIndex !== -1 && tokenIndex + 1 < filterTokens.length) {
-          offset = filterTokens[tokenIndex + 1].location.end.offset;
+          offset = filterTokens[tokenIndex + 1]!.location.end.offset;
         }
       }
 
@@ -955,12 +958,12 @@ class SmartSearchBar extends Component<DefaultProps & Props, State> {
             : 0;
 
       // Clear previous selection
-      const prevItem = flatSearchItems[currIndex];
+      const prevItem = flatSearchItems[currIndex]!;
       searchGroups = getSearchGroupWithItemMarkedActive(searchGroups, prevItem, false);
 
       // Set new selection
       const activeItem = flatSearchItems[nextActiveSearchItem];
-      searchGroups = getSearchGroupWithItemMarkedActive(searchGroups, activeItem, true);
+      searchGroups = getSearchGroupWithItemMarkedActive(searchGroups, activeItem!, true);
 
       this.setState({searchGroups, activeSearchItem: nextActiveSearchItem});
     }
@@ -1052,7 +1055,7 @@ class SmartSearchBar extends Component<DefaultProps & Props, State> {
     if (isSelectingDropdownItems) {
       searchGroups = getSearchGroupWithItemMarkedActive(
         searchGroups,
-        flatSearchItems[activeSearchItem],
+        flatSearchItems[activeSearchItem]!,
         false
       );
     }
@@ -1200,13 +1203,13 @@ class SmartSearchBar extends Component<DefaultProps & Props, State> {
     const innerStart = cursorPosition - cursorToken.location.start.offset;
 
     let tokenStart = innerStart;
-    while (tokenStart > 0 && !LIMITER_CHARS.includes(cursorToken.text[tokenStart - 1])) {
+    while (tokenStart > 0 && !LIMITER_CHARS.includes(cursorToken.text[tokenStart - 1]!)) {
       tokenStart--;
     }
     let tokenEnd = innerStart;
     while (
       tokenEnd < cursorToken.text.length &&
-      !LIMITER_CHARS.includes(cursorToken.text[tokenEnd])
+      !LIMITER_CHARS.includes(cursorToken.text[tokenEnd]!)
     ) {
       tokenEnd++;
     }
@@ -2199,14 +2202,14 @@ class SmartSearchBarContainer extends Component<Props, ContainerState> {
 
   render() {
     // SmartSearchBar doesn't use members, but we forward it to cause a re-render.
-    return <SmartSearchBar {...this.props} members={this.state.members} />;
+    return <DeprecatedSmartSearchBar {...this.props} members={this.state.members} />;
   }
 }
 
 export default withApi(withSentryRouter(withOrganization(SmartSearchBarContainer)));
 
 export type {Props as SmartSearchBarProps};
-export {SmartSearchBar};
+export {DeprecatedSmartSearchBar};
 
 const Container = styled('div')<{inputHasFocus: boolean}>`
   min-height: ${p => p.theme.form.md.height}px;
diff --git a/static/app/components/smartSearchBar/searchBarDatePicker.tsx b/static/app/components/deprecatedSmartSearchBar/searchBarDatePicker.tsx
similarity index 100%
rename from static/app/components/smartSearchBar/searchBarDatePicker.tsx
rename to static/app/components/deprecatedSmartSearchBar/searchBarDatePicker.tsx
diff --git a/static/app/components/smartSearchBar/searchDropdown.tsx b/static/app/components/deprecatedSmartSearchBar/searchDropdown.tsx
similarity index 98%
rename from static/app/components/smartSearchBar/searchDropdown.tsx
rename to static/app/components/deprecatedSmartSearchBar/searchDropdown.tsx
index 12c04d9ce380e9..7361ad146242a0 100644
--- a/static/app/components/smartSearchBar/searchDropdown.tsx
+++ b/static/app/components/deprecatedSmartSearchBar/searchDropdown.tsx
@@ -22,7 +22,7 @@ import {invalidTypes, ItemType} from './types';
 
 const getDropdownItemKey = (item: SearchItem) =>
   `${item.value || item.desc || item.title}-${
-    item.children && item.children.length > 0 ? getDropdownItemKey(item.children[0]) : ''
+    item.children && item.children.length > 0 ? getDropdownItemKey(item.children[0]!) : ''
   }`;
 
 type Props = {
@@ -244,7 +244,7 @@ function ItemTitle({item, searchSubstring, isChild}: ItemTitleProps) {
   if (searchSubstring) {
     const idx =
       restWords.length === 0
-        ? fullWord.toLowerCase().indexOf(searchSubstring.split('.')[0])
+        ? fullWord.toLowerCase().indexOf(searchSubstring.split('.')[0]!)
         : fullWord.toLowerCase().indexOf(searchSubstring);
 
     // Below is the logic to make the current query bold inside the result.
@@ -253,14 +253,14 @@ function ItemTitle({item, searchSubstring, isChild}: ItemTitleProps) {
         <SearchItemTitleWrapper hasSingleField={hasSingleField}>
           {!isFirstWordHidden && (
             <FirstWordWrapper>
-              {firstWord.slice(0, idx)}
-              <strong>{firstWord.slice(idx, idx + searchSubstring.length)}</strong>
-              {firstWord.slice(idx + searchSubstring.length)}
+              {firstWord!.slice(0, idx)}
+              <strong>{firstWord!.slice(idx, idx + searchSubstring.length)}</strong>
+              {firstWord!.slice(idx + searchSubstring.length)}
             </FirstWordWrapper>
           )}
           {combinedRestWords && (
             <HighlightedRestOfWords
-              firstWord={firstWord}
+              firstWord={firstWord!}
               isFirstWordHidden={isFirstWordHidden}
               searchSubstring={searchSubstring}
               combinedRestWords={combinedRestWords}
diff --git a/static/app/components/smartSearchBar/searchHotkeysListener.tsx b/static/app/components/deprecatedSmartSearchBar/searchHotkeysListener.tsx
similarity index 100%
rename from static/app/components/smartSearchBar/searchHotkeysListener.tsx
rename to static/app/components/deprecatedSmartSearchBar/searchHotkeysListener.tsx
diff --git a/static/app/components/smartSearchBar/searchInvalidTag.tsx b/static/app/components/deprecatedSmartSearchBar/searchInvalidTag.tsx
similarity index 100%
rename from static/app/components/smartSearchBar/searchInvalidTag.tsx
rename to static/app/components/deprecatedSmartSearchBar/searchInvalidTag.tsx
diff --git a/static/app/components/smartSearchBar/types.tsx b/static/app/components/deprecatedSmartSearchBar/types.tsx
similarity index 100%
rename from static/app/components/smartSearchBar/types.tsx
rename to static/app/components/deprecatedSmartSearchBar/types.tsx
diff --git a/static/app/components/smartSearchBar/utils.spec.tsx b/static/app/components/deprecatedSmartSearchBar/utils.spec.tsx
similarity index 95%
rename from static/app/components/smartSearchBar/utils.spec.tsx
rename to static/app/components/deprecatedSmartSearchBar/utils.spec.tsx
index 27f8c5a79b6a0e..e5b7c276c48bb4 100644
--- a/static/app/components/smartSearchBar/utils.spec.tsx
+++ b/static/app/components/deprecatedSmartSearchBar/utils.spec.tsx
@@ -4,34 +4,34 @@ import {
   filterKeysFromQuery,
   getTagItemsFromKeys,
   removeSpace,
-} from 'sentry/components/smartSearchBar/utils';
+} from 'sentry/components/deprecatedSmartSearchBar/utils';
 import {FieldKey, FieldKind, getFieldDefinition} from 'sentry/utils/fields';
 
 describe('addSpace()', function () {
   it('should add a space when there is no trailing space', function () {
-    expect(addSpace('one')).toEqual('one ');
+    expect(addSpace('one')).toBe('one ');
   });
 
   it('should not add another space when there is already one', function () {
-    expect(addSpace('one ')).toEqual('one ');
+    expect(addSpace('one ')).toBe('one ');
   });
 
   it('should leave the empty string alone', function () {
-    expect(addSpace('')).toEqual('');
+    expect(addSpace('')).toBe('');
   });
 });
 
 describe('removeSpace()', function () {
   it('should remove a trailing space', function () {
-    expect(removeSpace('one ')).toEqual('one');
+    expect(removeSpace('one ')).toBe('one');
   });
 
   it('should not remove the last character if it is not a space', function () {
-    expect(removeSpace('one')).toEqual('one');
+    expect(removeSpace('one')).toBe('one');
   });
 
   it('should leave the empty string alone', function () {
-    expect(removeSpace('')).toEqual('');
+    expect(removeSpace('')).toBe('');
   });
 });
 
diff --git a/static/app/components/smartSearchBar/utils.tsx b/static/app/components/deprecatedSmartSearchBar/utils.tsx
similarity index 99%
rename from static/app/components/smartSearchBar/utils.tsx
rename to static/app/components/deprecatedSmartSearchBar/utils.tsx
index ea3d900aa6e1b2..2475714698b74a 100644
--- a/static/app/components/smartSearchBar/utils.tsx
+++ b/static/app/components/deprecatedSmartSearchBar/utils.tsx
@@ -428,7 +428,7 @@ export const getTagItemsFromKeys = (
 
     const definition =
       supportedTags[key]?.kind === FieldKind.FUNCTION
-        ? fieldDefinitionGetter(key.split('(')[0])
+        ? fieldDefinitionGetter(key.split('(')[0]!)
         : fieldDefinitionGetter(key);
     const kind = supportedTags[key]?.kind ?? definition?.kind ?? FieldKind.FIELD;
 
diff --git a/static/app/components/deviceName.tsx b/static/app/components/deviceName.tsx
index 69c9efae8cf540..d352e695c2ba5e 100644
--- a/static/app/components/deviceName.tsx
+++ b/static/app/components/deviceName.tsx
@@ -15,7 +15,7 @@ export function deviceNameMapper(model: string | undefined): string | null {
 
   const [identifier, ...rest] = model.split(' ');
 
-  const modelName = iOSDeviceMapping[identifier];
+  const modelName = iOSDeviceMapping[identifier!];
   return modelName === undefined ? model : `${modelName} ${rest.join(' ')}`;
 }
 
diff --git a/static/app/components/devtoolbar/components/featureFlags/featureFlagsPanel.tsx b/static/app/components/devtoolbar/components/featureFlags/featureFlagsPanel.tsx
index 205425bcfb35ab..ff98c59a6f3ee2 100644
--- a/static/app/components/devtoolbar/components/featureFlags/featureFlagsPanel.tsx
+++ b/static/app/components/devtoolbar/components/featureFlags/featureFlagsPanel.tsx
@@ -178,7 +178,7 @@ function FlagTable({prefilter, searchTerm}: {prefilter: Prefilter; searchTerm: s
       >
         {names?.map(name => (
           <AnalyticsProvider key={name} keyVal="flag-item" nameVal="Flag Item">
-            <FeatureFlagItem flag={{name, ...filtered[name]}} />
+            <FeatureFlagItem flag={{name, ...filtered[name]!}} />
           </AnalyticsProvider>
         ))}
       </PanelTable>
diff --git a/static/app/components/devtoolbar/components/infiniteListItems.tsx b/static/app/components/devtoolbar/components/infiniteListItems.tsx
index 772c1372c2a9d4..c025eb230ec3ca 100644
--- a/static/app/components/devtoolbar/components/infiniteListItems.tsx
+++ b/static/app/components/devtoolbar/components/infiniteListItems.tsx
@@ -79,7 +79,7 @@ export default function InfiniteListItems<Data>({
                   ? hasNextPage
                     ? loadingMoreMessage()
                     : loadingCompleteMessage()
-                  : itemRenderer({item})}
+                  : itemRenderer({item: item!})}
               </li>
             );
           })}
diff --git a/static/app/components/devtoolbar/components/releases/releasesPanel.tsx b/static/app/components/devtoolbar/components/releases/releasesPanel.tsx
index 5215f1b341846e..6bc3ad5067c1a6 100644
--- a/static/app/components/devtoolbar/components/releases/releasesPanel.tsx
+++ b/static/app/components/devtoolbar/components/releases/releasesPanel.tsx
@@ -53,7 +53,7 @@ function getCrashFreeRate(data: ApiResult<SessionApiResponse>): number {
   // assume it is 100%.
   // round to 2 decimal points
   return parseFloat(
-    ((data?.json.groups[0].totals['crash_free_rate(session)'] ?? 1) * 100).toFixed(2)
+    ((data?.json.groups[0]!.totals['crash_free_rate(session)'] ?? 1) * 100).toFixed(2)
   );
 }
 
@@ -101,7 +101,7 @@ function ReleaseSummary({orgSlug, release}: {orgSlug: string; release: Release})
           <SentryAppLink
             to={{
               url: `/organizations/${orgSlug}/releases/${encodeURIComponent(release.version)}/`,
-              query: {project: release.projects[0].id},
+              query: {project: release.projects[0]!.id},
             }}
           >
             <VersionWrapper>{formatVersion(release.version)}</VersionWrapper>
@@ -244,14 +244,14 @@ export default function ReleasesPanel() {
       ) : (
         <Fragment>
           <div style={{alignItems: 'start'}}>
-            <ReleaseSummary release={releaseData.json[0]} orgSlug={organizationSlug} />
+            <ReleaseSummary release={releaseData.json[0]!} orgSlug={organizationSlug} />
             <CrashFreeRate
-              currReleaseVersion={releaseData.json[0].version}
+              currReleaseVersion={releaseData.json[0]!.version}
               prevReleaseVersion={
-                releaseData.json.length > 1 ? releaseData.json[1].version : undefined
+                releaseData.json.length > 1 ? releaseData.json[1]!.version : undefined
               }
             />
-            <ReleaseIsssues releaseVersion={releaseData.json[0].version} />
+            <ReleaseIsssues releaseVersion={releaseData.json[0]!.version} />
           </div>
         </Fragment>
       )}
diff --git a/static/app/components/devtoolbar/hooks/useReplayRecorder.tsx b/static/app/components/devtoolbar/hooks/useReplayRecorder.tsx
index 70d1be99034da1..d88b66437c3631 100644
--- a/static/app/components/devtoolbar/hooks/useReplayRecorder.tsx
+++ b/static/app/components/devtoolbar/hooks/useReplayRecorder.tsx
@@ -1,6 +1,6 @@
 import {useCallback, useEffect, useState} from 'react';
+import type {ReplayRecordingMode} from '@sentry/core';
 import type {replayIntegration} from '@sentry/react';
-import type {ReplayRecordingMode} from '@sentry/types';
 
 import useConfiguration from 'sentry/components/devtoolbar/hooks/useConfiguration';
 import {useSessionStorage} from 'sentry/utils/useSessionStorage';
diff --git a/static/app/components/devtoolbar/hooks/useSentryClientAndScope.tsx b/static/app/components/devtoolbar/hooks/useSentryClientAndScope.tsx
index b95f283e1c4dd7..3c492995693b36 100644
--- a/static/app/components/devtoolbar/hooks/useSentryClientAndScope.tsx
+++ b/static/app/components/devtoolbar/hooks/useSentryClientAndScope.tsx
@@ -1,4 +1,4 @@
-import type {Client, Scope} from '@sentry/types';
+import type {Client, Scope} from '@sentry/core';
 
 type V8Carrier = {
   stack: {
diff --git a/static/app/components/discover/quickContextCommitRow.spec.tsx b/static/app/components/discover/quickContextCommitRow.spec.tsx
index e92d0f46927cc1..54a1615eba6bdd 100644
--- a/static/app/components/discover/quickContextCommitRow.spec.tsx
+++ b/static/app/components/discover/quickContextCommitRow.spec.tsx
@@ -76,7 +76,7 @@ describe('Quick Context Commit Row', () => {
     const pullRequestLink = screen.getByText(
       /feat\(quick-context-commit-row\): Added new component/
     );
-    expect(screen.queryByTestId('quick-context-commit-row-pr-link')).toBeInTheDocument();
+    expect(screen.getByTestId('quick-context-commit-row-pr-link')).toBeInTheDocument();
     expect(pullRequestLink).toBeInTheDocument();
     expect(pullRequestLink).toHaveAttribute(
       'href',
diff --git a/static/app/components/discover/transactionsTable.tsx b/static/app/components/discover/transactionsTable.tsx
index 756d46557ef509..7fbd410dde4174 100644
--- a/static/app/components/discover/transactionsTable.tsx
+++ b/static/app/components/discover/transactionsTable.tsx
@@ -1,4 +1,4 @@
-import {Fragment, PureComponent} from 'react';
+import {Fragment} from 'react';
 import styled from '@emotion/styled';
 import type {Location, LocationDescriptor} from 'history';
 
@@ -51,21 +51,32 @@ type Props = {
   titles?: string[];
 };
 
-class TransactionsTable extends PureComponent<Props> {
-  getTitles() {
-    const {eventView, titles} = this.props;
-    return titles ?? eventView.getFields();
-  }
+function TransactionsTable(props: Props) {
+  const {
+    eventView,
+    titles,
+    tableData,
+    columnOrder,
+    organization,
+    location,
+    generateLink,
+    handleCellAction,
+    useAggregateAlias,
+    isLoading,
+    referrer,
+  } = props;
 
-  renderHeader() {
-    const {tableData, columnOrder} = this.props;
+  const getTitles = () => {
+    return titles ?? eventView.getFields();
+  };
 
+  const renderHeader = () => {
     const tableMeta = tableData?.meta;
     const generateSortLink = () => undefined;
-    const tableTitles = this.getTitles();
+    const tableTitles = getTitles();
 
     const headers = tableTitles.map((title, index) => {
-      const column = columnOrder[index];
+      const column = columnOrder[index]!;
       const align: Alignments = fieldAlignment(column.name, column.type, tableMeta);
 
       if (column.key === 'span_ops_breakdown.relative') {
@@ -111,32 +122,22 @@ class TransactionsTable extends PureComponent<Props> {
     });
 
     return headers;
-  }
+  };
 
-  renderRow(
+  const renderRow = (
     row: TableDataRow,
     rowIndex: number,
-    columnOrder: TableColumn<React.ReactText>[],
+    colOrder: TableColumn<React.ReactText>[],
     tableMeta: MetaType
-  ): React.ReactNode[] {
-    const {
-      eventView,
-      organization,
-      location,
-      generateLink,
-      handleCellAction,
-      titles,
-      useAggregateAlias,
-      referrer,
-    } = this.props;
+  ): React.ReactNode[] => {
     const fields = eventView.getFields();
 
     if (titles?.length) {
       // Slice to match length of given titles
-      columnOrder = columnOrder.slice(0, titles.length);
+      colOrder = colOrder.slice(0, titles.length);
     }
 
-    const resultsRow = columnOrder.map((column, index) => {
+    const resultsRow = colOrder.map((column, index) => {
       const field = String(column.key);
       // TODO add a better abstraction for this in fieldRenderers.
       const fieldName = useAggregateAlias ? getAggregateAlias(field) : field;
@@ -162,7 +163,7 @@ class TransactionsTable extends PureComponent<Props> {
       } else if (target && !isEmptyObject(target)) {
         if (fields[index] === 'replayId') {
           rendered = (
-            <ViewReplayLink replayId={row.replayId} to={target}>
+            <ViewReplayLink replayId={row.replayId!} to={target}>
               {rendered}
             </ViewReplayLink>
           );
@@ -199,10 +200,9 @@ class TransactionsTable extends PureComponent<Props> {
     });
 
     return resultsRow;
-  }
+  };
 
-  renderResults() {
-    const {isLoading, tableData, columnOrder} = this.props;
+  const renderResults = () => {
     let cells: React.ReactNode[] = [];
 
     if (isLoading) {
@@ -217,39 +217,35 @@ class TransactionsTable extends PureComponent<Props> {
       if (!tableData.meta) {
         return;
       }
-      cells = cells.concat(this.renderRow(row, i, columnOrder, tableData.meta));
+      cells = cells.concat(renderRow(row, i, columnOrder, tableData.meta));
     });
     return cells;
-  }
-
-  render() {
-    const {isLoading, tableData} = this.props;
+  };
 
-    const hasResults = tableData?.meta && tableData.data?.length > 0;
+  const hasResults = tableData?.meta && tableData.data?.length > 0;
 
-    // Custom set the height so we don't have layout shift when results are loaded.
-    const loader = <LoadingIndicator style={{margin: '70px auto'}} />;
+  // Custom set the height so we don't have layout shift when results are loaded.
+  const loader = <LoadingIndicator style={{margin: '70px auto'}} />;
 
-    return (
-      <VisuallyCompleteWithData
-        id="TransactionsTable"
-        hasData={hasResults}
+  return (
+    <VisuallyCompleteWithData
+      id="TransactionsTable"
+      hasData={hasResults}
+      isLoading={isLoading}
+    >
+      <PanelTable
+        data-test-id="transactions-table"
+        isEmpty={!hasResults}
+        emptyMessage={t('No transactions found')}
+        headers={renderHeader()}
         isLoading={isLoading}
+        disablePadding
+        loader={loader}
       >
-        <PanelTable
-          data-test-id="transactions-table"
-          isEmpty={!hasResults}
-          emptyMessage={t('No transactions found')}
-          headers={this.renderHeader()}
-          isLoading={isLoading}
-          disablePadding
-          loader={loader}
-        >
-          {this.renderResults()}
-        </PanelTable>
-      </VisuallyCompleteWithData>
-    );
-  }
+        {renderResults()}
+      </PanelTable>
+    </VisuallyCompleteWithData>
+  );
 }
 
 function getProfileAnalyticsHandler(organization: Organization, referrer?: string) {
diff --git a/static/app/components/draggableTabs/draggableTabList.tsx b/static/app/components/draggableTabs/draggableTabList.tsx
index b672cedb645fec..c921768f2d4d5e 100644
--- a/static/app/components/draggableTabs/draggableTabList.tsx
+++ b/static/app/components/draggableTabs/draggableTabList.tsx
@@ -23,7 +23,6 @@ import {motion, Reorder} from 'framer-motion';
 import {Button} from 'sentry/components/button';
 import {CompactSelect} from 'sentry/components/compactSelect';
 import DropdownButton from 'sentry/components/dropdownButton';
-import {TabsContext} from 'sentry/components/tabs';
 import {type BaseTabProps, Tab} from 'sentry/components/tabs/tab';
 import {IconAdd, IconEllipsis} from 'sentry/icons';
 import {t} from 'sentry/locale';
@@ -34,6 +33,7 @@ import {useDimensions} from 'sentry/utils/useDimensions';
 import {useDimensionsMultiple} from 'sentry/utils/useDimensionsMultiple';
 import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
+import {IssueViewsContext} from 'sentry/views/issueList/groupSearchViewTabs/issueViews';
 
 import type {DraggableTabListItemProps} from './item';
 import {Item} from './item';
@@ -62,9 +62,9 @@ function useOverflowingTabs({state}: {state: TabListState<DraggableTabListItemPr
     const overflowing: Node<DraggableTabListItemProps>[] = [];
 
     for (let i = 0; i < tabsDimensions.length; i++) {
-      totalWidth += tabsDimensions[i].width + 1; // 1 extra pixel for the divider
+      totalWidth += tabsDimensions[i]!.width + 1; // 1 extra pixel for the divider
       if (totalWidth > availableWidth + 1) {
-        overflowing.push(persistentTabs[i]);
+        overflowing.push(persistentTabs[i]!);
       }
     }
 
@@ -273,7 +273,7 @@ function BaseDraggableTabList({
 }: BaseDraggableTabListProps) {
   const navigate = useNavigate();
   const [hoveringKey, setHoveringKey] = useState<Key | null>(null);
-  const {rootProps, setTabListState} = useContext(TabsContext);
+  const {rootProps, setTabListState} = useContext(IssueViewsContext);
   const organization = useOrganization();
   const {
     value,
diff --git a/static/app/components/dropdownAutoComplete/list.tsx b/static/app/components/dropdownAutoComplete/list.tsx
index 275762171ec8b8..37e43b5342fdb3 100644
--- a/static/app/components/dropdownAutoComplete/list.tsx
+++ b/static/app/components/dropdownAutoComplete/list.tsx
@@ -82,7 +82,7 @@ function List({
             onScroll={onScroll}
             rowCount={items.length}
             rowHeight={({index}) =>
-              items[index].groupLabel && virtualizedLabelHeight
+              items[index]!.groupLabel && virtualizedLabelHeight
                 ? virtualizedLabelHeight
                 : virtualizedHeight
             }
@@ -90,8 +90,8 @@ function List({
               <Row
                 key={key}
                 style={style}
-                item={items[index]}
-                isHighlighted={items[index].index === highlightedIndex}
+                item={items[index]!}
+                isHighlighted={items[index]!.index === highlightedIndex}
                 {...rowProps}
               />
             )}
diff --git a/static/app/components/dropdownMenu/index.spec.tsx b/static/app/components/dropdownMenu/index.spec.tsx
index 853e38b0d2a8ec..ad7d20d1a6e30c 100644
--- a/static/app/components/dropdownMenu/index.spec.tsx
+++ b/static/app/components/dropdownMenu/index.spec.tsx
@@ -319,7 +319,6 @@ describe('DropdownMenu', function () {
     // JSDOM throws an error on navigation to random urls
     expect(errorSpy).toHaveBeenCalledTimes(1);
 
-    // eslint-disable-next-line no-console
     errorSpy.mockRestore();
   });
 });
diff --git a/static/app/components/emptyStateWarning.stories.tsx b/static/app/components/emptyStateWarning.stories.tsx
new file mode 100644
index 00000000000000..ee5373727667be
--- /dev/null
+++ b/static/app/components/emptyStateWarning.stories.tsx
@@ -0,0 +1,54 @@
+import {Fragment} from 'react';
+import styled from '@emotion/styled';
+
+import EmptyStateWarning from 'sentry/components/emptyStateWarning';
+import JSXProperty from 'sentry/components/stories/jsxProperty';
+import storyBook from 'sentry/stories/storyBook';
+import {space} from 'sentry/styles/space';
+
+export default storyBook(EmptyStateWarning, story => {
+  story('Default', () => (
+    <Fragment>
+      <p>
+        The default <code>EmptyStateWarning</code> looks like this, with a large icon.
+      </p>
+      <EmptyStateWarning />
+    </Fragment>
+  ));
+
+  story('Props', () => (
+    <Fragment>
+      <p>
+        You can also pass in several props:{' '}
+        <ul>
+          <li>
+            <code>small</code> determines the icon size.
+          </li>
+          <li>
+            <code>withIcon</code> hides the icon if set to <code>false</code>.
+          </li>
+          <li>You can also pass in children in combination with icon or no icon.</li>
+        </ul>
+      </p>
+      <h3>
+        <JSXProperty name="small" value={`true`} />
+      </h3>
+      <EmptyStateWarning small />
+      <h3>
+        <JSXProperty name="small" value={`true`} /> with children
+      </h3>
+      <EmptyStateWarning small>No results found.</EmptyStateWarning>
+      <h3>
+        <JSXProperty name="small" value={`false`} /> with children (with styling)
+      </h3>
+      <StyledEmptyStateWarning>No results found.</StyledEmptyStateWarning>
+    </Fragment>
+  ));
+});
+
+const StyledEmptyStateWarning = styled(EmptyStateWarning)`
+  display: flex;
+  flex-direction: column;
+  gap: ${space(2)};
+  align-items: center;
+`;
diff --git a/static/app/components/events/autofix/autofixActionSelector.tsx b/static/app/components/events/autofix/autofixActionSelector.tsx
new file mode 100644
index 00000000000000..0cf7822f8e2d38
--- /dev/null
+++ b/static/app/components/events/autofix/autofixActionSelector.tsx
@@ -0,0 +1,103 @@
+import styled from '@emotion/styled';
+import {AnimatePresence, motion} from 'framer-motion';
+
+import {Button} from 'sentry/components/button';
+import ButtonBar from 'sentry/components/buttonBar';
+import {IconArrow} from 'sentry/icons';
+import {t} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
+import testableTransition from 'sentry/utils/testableTransition';
+
+interface Option<T extends string> {
+  key: T;
+  label: string;
+  active?: boolean;
+}
+
+interface Props<T extends string> {
+  children: (selectedOption: Option<T>) => React.ReactNode;
+  onBack: () => void;
+  onSelect: (value: T) => void;
+  options: Option<T>[];
+  selected: T | null;
+}
+
+function AutofixActionSelector<T extends string>({
+  options,
+  selected,
+  onSelect,
+  onBack,
+  children,
+}: Props<T>) {
+  const selectedOption = options.find(opt => opt.key === selected);
+
+  return (
+    <Container>
+      <AnimatePresence mode="wait">
+        {!selected ? (
+          <motion.div
+            key="options"
+            initial="initial"
+            animate="visible"
+            variants={{
+              initial: {opacity: 0, scale: 1.05},
+              visible: {opacity: 1, scale: 1},
+            }}
+            transition={testableTransition({duration: 0.1})}
+          >
+            <ButtonBar gap={1}>
+              {options.map(option => (
+                <Button
+                  key={option.key}
+                  priority={option.active ? 'primary' : 'default'}
+                  onClick={() => onSelect(option.key)}
+                >
+                  {option.label}
+                </Button>
+              ))}
+            </ButtonBar>
+          </motion.div>
+        ) : (
+          <motion.div
+            key="content"
+            initial={{opacity: 0, scale: 0.95}}
+            animate={{opacity: 1, scale: 1}}
+            transition={testableTransition({duration: 0.1})}
+          >
+            <ContentWrapper>
+              <BackButton
+                size="xs"
+                icon={<IconArrow direction="left" size="xs" />}
+                onClick={onBack}
+                title={t('Back to options')}
+                aria-label={t('Back to options')}
+              />
+              <ContentArea>{selectedOption && children(selectedOption)}</ContentArea>
+            </ContentWrapper>
+          </motion.div>
+        )}
+      </AnimatePresence>
+    </Container>
+  );
+}
+
+const Container = styled('div')`
+  min-height: 40px;
+`;
+
+const ContentWrapper = styled('div')`
+  display: flex;
+  align-items: center;
+  gap: ${space(1)};
+`;
+
+const BackButton = styled(Button)`
+  flex-shrink: 0;
+  height: 40px;
+`;
+
+const ContentArea = styled('div')`
+  flex-grow: 1;
+`;
+
+export default AutofixActionSelector;
diff --git a/static/app/components/events/autofix/autofixChanges.tsx b/static/app/components/events/autofix/autofixChanges.tsx
index 223b0a9790d8a8..014e76a2a5c8cf 100644
--- a/static/app/components/events/autofix/autofixChanges.tsx
+++ b/static/app/components/events/autofix/autofixChanges.tsx
@@ -49,10 +49,24 @@ function AutofixRepoChange({
 }
 
 const cardAnimationProps: AnimationProps = {
-  exit: {opacity: 0},
-  initial: {opacity: 0, y: 20},
-  animate: {opacity: 1, y: 0},
-  transition: testableTransition({duration: 0.3}),
+  exit: {opacity: 0, height: 0, scale: 0.8, y: -20},
+  initial: {opacity: 0, height: 0, scale: 0.8},
+  animate: {opacity: 1, height: 'auto', scale: 1},
+  transition: testableTransition({
+    duration: 1.0,
+    height: {
+      type: 'spring',
+      bounce: 0.2,
+    },
+    scale: {
+      type: 'spring',
+      bounce: 0.2,
+    },
+    y: {
+      type: 'tween',
+      ease: 'easeOut',
+    },
+  }),
 };
 
 export function AutofixChanges({step, groupId, runId}: AutofixChangesProps) {
@@ -116,7 +130,9 @@ const PreviewContent = styled('div')`
   margin-top: ${space(2)};
 `;
 
-const AnimationWrapper = styled(motion.div)``;
+const AnimationWrapper = styled(motion.div)`
+  transform-origin: top center;
+`;
 
 const PrefixText = styled('span')``;
 
diff --git a/static/app/components/events/autofix/autofixDiff.spec.tsx b/static/app/components/events/autofix/autofixDiff.spec.tsx
index 89b603613c2089..b381b71f368d92 100644
--- a/static/app/components/events/autofix/autofixDiff.spec.tsx
+++ b/static/app/components/events/autofix/autofixDiff.spec.tsx
@@ -125,8 +125,8 @@ describe('AutofixDiff', function () {
 
     await waitFor(() => {
       expect(screen.queryByTestId('line-added')).not.toBeInTheDocument();
-      expect(screen.queryByTestId('line-removed')).not.toBeInTheDocument();
     });
+    expect(screen.queryByTestId('line-removed')).not.toBeInTheDocument();
   });
 
   it('shows error message on failed edit', async function () {
diff --git a/static/app/components/events/autofix/autofixDiff.tsx b/static/app/components/events/autofix/autofixDiff.tsx
index c076e645adeed3..d69b92e88c56e8 100644
--- a/static/app/components/events/autofix/autofixDiff.tsx
+++ b/static/app/components/events/autofix/autofixDiff.tsx
@@ -43,7 +43,7 @@ function makeTestIdFromLineType(lineType: DiffLineType) {
 
 function addChangesToDiffLines(lines: DiffLineWithChanges[]): DiffLineWithChanges[] {
   for (let i = 0; i < lines.length; i++) {
-    const line = lines[i];
+    const line = lines[i]!;
     if (line.line_type === DiffLineType.CONTEXT) {
       continue;
     }
@@ -293,7 +293,7 @@ function DiffHunkContent({
 
     // Update diff_line_no for all lines after the insertion
     for (let i = insertionIndex + newAddedLines.length; i < updatedLines.length; i++) {
-      updatedLines[i].diff_line_no = ++lastDiffLineNo;
+      updatedLines[i]!.diff_line_no = ++lastDiffLineNo;
     }
 
     updateHunk.mutate({hunkIndex, lines: updatedLines, repoId, fileName});
@@ -332,15 +332,15 @@ function DiffHunkContent({
   };
 
   const getStartLineNumber = (index: number, lineType: DiffLineType) => {
-    const line = linesWithChanges[index];
+    const line = linesWithChanges[index]!;
     if (lineType === DiffLineType.REMOVED) {
       return line.source_line_no;
     }
     if (lineType === DiffLineType.ADDED) {
       // Find the first non-null target_line_no
       for (let i = index; i < linesWithChanges.length; i++) {
-        if (linesWithChanges[i].target_line_no !== null) {
-          return linesWithChanges[i].target_line_no;
+        if (linesWithChanges[i]!.target_line_no !== null) {
+          return linesWithChanges[i]!.target_line_no;
         }
       }
     }
diff --git a/static/app/components/events/autofix/autofixFeedback.tsx b/static/app/components/events/autofix/autofixFeedback.tsx
index 1d6010fed3b065..32e9bdc2445ea8 100644
--- a/static/app/components/events/autofix/autofixFeedback.tsx
+++ b/static/app/components/events/autofix/autofixFeedback.tsx
@@ -1,4 +1,5 @@
 import {useRef} from 'react';
+import styled from '@emotion/styled';
 
 import {Button} from 'sentry/components/button';
 import {IconMegaphone} from 'sentry/icons/iconMegaphone';
@@ -14,9 +15,10 @@ function AutofixFeedback() {
   }
 
   return (
-    <Button
+    <StyledButton
       ref={buttonRef}
-      size="xs"
+      size="zero"
+      borderless
       icon={<IconMegaphone />}
       onClick={() =>
         openForm({
@@ -29,8 +31,16 @@ function AutofixFeedback() {
       }
     >
       {t('Give Feedback')}
-    </Button>
+    </StyledButton>
   );
 }
 
+const StyledButton = styled(Button)`
+  padding: 0;
+  margin: 0;
+  font-size: ${p => p.theme.fontSizeSmall};
+  font-weight: ${p => p.theme.fontWeightNormal};
+  color: ${p => p.theme.subText};
+`;
+
 export default AutofixFeedback;
diff --git a/static/app/components/events/autofix/autofixInsightCards.spec.tsx b/static/app/components/events/autofix/autofixInsightCards.spec.tsx
index 864c4f89462e14..8ee14f7e5cee1e 100644
--- a/static/app/components/events/autofix/autofixInsightCards.spec.tsx
+++ b/static/app/components/events/autofix/autofixInsightCards.spec.tsx
@@ -122,13 +122,6 @@ describe('AutofixInsightCards', () => {
     expect(userMessage.closest('div')).toHaveStyle('color: inherit');
   });
 
-  it('renders "No insights yet" message when there are no insights', () => {
-    renderComponent({insights: []});
-    expect(
-      screen.getByText(/Autofix will share its discoveries here./)
-    ).toBeInTheDocument();
-  });
-
   it('toggles context expansion correctly', async () => {
     renderComponent();
     const contextButton = screen.getByText('Sample insight 1');
diff --git a/static/app/components/events/autofix/autofixInsightCards.tsx b/static/app/components/events/autofix/autofixInsightCards.tsx
index 52a896e384f74a..f8f0db2d09557a 100644
--- a/static/app/components/events/autofix/autofixInsightCards.tsx
+++ b/static/app/components/events/autofix/autofixInsightCards.tsx
@@ -53,8 +53,8 @@ function AutofixBreadcrumbSnippet({breadcrumb}: AutofixBreadcrumbSnippetProps) {
   const rawCrumb = {
     message: breadcrumb.body,
     category: breadcrumb.category,
-    type: type,
-    level: level,
+    type,
+    level,
   };
 
   return (
@@ -123,10 +123,24 @@ export function ExpandableInsightContext({
 }
 
 const animationProps: AnimationProps = {
-  exit: {opacity: 0},
-  initial: {opacity: 0, y: 20},
-  animate: {opacity: 1, y: 0},
-  transition: testableTransition({duration: 0.3}),
+  exit: {opacity: 0, height: 0, scale: 0.8, y: -20},
+  initial: {opacity: 0, height: 0, scale: 0.8},
+  animate: {opacity: 1, height: 'auto', scale: 1},
+  transition: testableTransition({
+    duration: 1.0,
+    height: {
+      type: 'spring',
+      bounce: 0.2,
+    },
+    scale: {
+      type: 'spring',
+      bounce: 0.2,
+    },
+    y: {
+      type: 'tween',
+      ease: 'easeOut',
+    },
+  }),
 };
 
 interface AutofixInsightCardProps {
@@ -348,15 +362,7 @@ function AutofixInsightCards({
           )
         )
       ) : stepIndex === 0 && !hasStepBelow ? (
-        <NoInsightsYet>
-          <p>Autofix will share its discoveries here.</p>
-          <p>
-            Autofix is like an AI rubber ducky to help you debug your code.
-            <br />
-            Collaborate with it and share your own knowledge and opinions for the best
-            results.
-          </p>
-        </NoInsightsYet>
+        <NoInsightsYet />
       ) : hasStepBelow ? (
         <EmptyResultsContainer>
           <ChainLink
@@ -590,11 +596,7 @@ const NoInsightsYet = styled('div')`
   display: flex;
   justify-content: center;
   flex-direction: column;
-  padding-left: ${space(4)};
-  padding-right: ${space(4)};
-  text-align: center;
   color: ${p => p.theme.subText};
-  padding-top: ${space(4)};
 `;
 
 const EmptyResultsContainer = styled('div')`
@@ -611,6 +613,18 @@ const InsightContainer = styled(motion.div)`
   box-shadow: ${p => p.theme.dropShadowMedium};
   margin-left: ${space(2)};
   margin-right: ${space(2)};
+  animation: fadeFromActive 1.2s ease-out;
+
+  @keyframes fadeFromActive {
+    from {
+      background-color: ${p => p.theme.active};
+      border-color: ${p => p.theme.active};
+    }
+    to {
+      background-color: ${p => p.theme.background};
+      border-color: ${p => p.theme.innerBorder};
+    }
+  }
 `;
 
 const ArrowContainer = styled('div')`
@@ -789,7 +803,22 @@ const StyledStructuredEventData = styled(StructuredEventData)`
   border-top-right-radius: 0;
 `;
 
-const AnimationWrapper = styled(motion.div)``;
+const AnimationWrapper = styled(motion.div)`
+  transform-origin: top center;
+
+  &.new-insight {
+    animation: textFadeFromActive 1.2s ease-out;
+  }
+
+  @keyframes textFadeFromActive {
+    from {
+      color: ${p => p.theme.white};
+    }
+    to {
+      color: inherit;
+    }
+  }
+`;
 
 const StyledIconChevron = styled(IconChevron)`
   width: 5%;
diff --git a/static/app/components/events/autofix/autofixMessageBox.analytics.spec.tsx b/static/app/components/events/autofix/autofixMessageBox.analytics.spec.tsx
index 54d1ed27006d71..90c0902494c002 100644
--- a/static/app/components/events/autofix/autofixMessageBox.analytics.spec.tsx
+++ b/static/app/components/events/autofix/autofixMessageBox.analytics.spec.tsx
@@ -45,12 +45,14 @@ describe('AutofixMessageBox Analytics', () => {
     mockButton.mockClear();
   });
 
-  it('passes correct analytics props for suggested root cause without instructions', () => {
+  it('passes correct analytics props for suggested root cause without instructions', async () => {
     const onSendMock = jest.fn();
     render(
       <AutofixMessageBox {...defaultProps} onSend={onSendMock} isRootCauseSelectionStep />
     );
 
+    await userEvent.click(screen.getByRole('button', {name: 'Use suggested root cause'}));
+
     expect(mockButton).toHaveBeenLastCalledWith(
       expect.objectContaining({
         analyticsEventKey: 'autofix.create_fix_clicked',
@@ -70,6 +72,8 @@ describe('AutofixMessageBox Analytics', () => {
       <AutofixMessageBox {...defaultProps} onSend={onSendMock} isRootCauseSelectionStep />
     );
 
+    await userEvent.click(screen.getByRole('button', {name: 'Use suggested root cause'}));
+
     const input = screen.getByPlaceholderText(
       '(Optional) Provide any instructions for the fix...'
     );
@@ -94,7 +98,7 @@ describe('AutofixMessageBox Analytics', () => {
       <AutofixMessageBox {...defaultProps} onSend={onSendMock} isRootCauseSelectionStep />
     );
 
-    await userEvent.click(screen.getAllByText('Propose your own root cause')[0]);
+    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');
 
@@ -126,7 +130,7 @@ describe('AutofixMessageBox Analytics', () => {
 
     render(<AutofixMessageBox {...changesStepProps} />);
 
-    await userEvent.click(screen.getByRole('radio', {name: 'Approve changes'}));
+    await userEvent.click(screen.getByRole('button', {name: 'Approve'}));
 
     // Find the last call to Button that matches our Create PR button
     const createPRButtonCall = mockButton.mock.calls.find(
@@ -156,7 +160,7 @@ describe('AutofixMessageBox Analytics', () => {
 
     render(<AutofixMessageBox {...changesStepProps} />);
 
-    await userEvent.click(screen.getByRole('radio', {name: 'Approve changes'}));
+    await userEvent.click(screen.getByRole('button', {name: 'Approve'}));
 
     // Find the last call to Button that matches our Setup button
     const setupButtonCall = mockButton.mock.calls.find(
diff --git a/static/app/components/events/autofix/autofixMessageBox.spec.tsx b/static/app/components/events/autofix/autofixMessageBox.spec.tsx
index 1954cd41683551..e0a249c45316af 100644
--- a/static/app/components/events/autofix/autofixMessageBox.spec.tsx
+++ b/static/app/components/events/autofix/autofixMessageBox.spec.tsx
@@ -74,6 +74,15 @@ describe('AutofixMessageBox', () => {
     (addSuccessMessage as jest.Mock).mockClear();
     (addErrorMessage as jest.Mock).mockClear();
     MockApiClient.clearMockResponses();
+
+    MockApiClient.addMockResponse({
+      url: '/issues/123/autofix/setup/?check_write_access=true',
+      method: 'GET',
+      body: {
+        genAIConsent: {ok: true},
+        integration: {ok: true},
+      },
+    });
   });
 
   it('renders correctly with default props', () => {
@@ -81,7 +90,7 @@ describe('AutofixMessageBox', () => {
 
     expect(screen.getByText('Test display text')).toBeInTheDocument();
     expect(
-      screen.getByPlaceholderText('Share helpful context or feedback...')
+      screen.getByPlaceholderText('Share helpful context or directions...')
     ).toBeInTheDocument();
     expect(screen.getByRole('button', {name: 'Send'})).toBeInTheDocument();
   });
@@ -90,7 +99,7 @@ describe('AutofixMessageBox', () => {
     const onSendMock = jest.fn();
     render(<AutofixMessageBox {...defaultProps} onSend={onSendMock} />);
 
-    const input = screen.getByPlaceholderText('Share helpful context or feedback...');
+    const input = screen.getByPlaceholderText('Share helpful context or directions...');
     await userEvent.type(input, 'Test message');
     await userEvent.click(screen.getByRole('button', {name: 'Send'}));
 
@@ -106,7 +115,7 @@ describe('AutofixMessageBox', () => {
 
     render(<AutofixMessageBox {...defaultProps} />);
 
-    const input = screen.getByPlaceholderText('Share helpful context or feedback...');
+    const input = screen.getByPlaceholderText('Share helpful context or directions...');
     await userEvent.type(input, 'Test message');
     await userEvent.click(screen.getByRole('button', {name: 'Send'}));
 
@@ -127,7 +136,7 @@ describe('AutofixMessageBox', () => {
 
     render(<AutofixMessageBox {...defaultProps} />);
 
-    const input = screen.getByPlaceholderText('Share helpful context or feedback...');
+    const input = screen.getByPlaceholderText('Share helpful context or directions...');
     await userEvent.type(input, 'Test message');
     await userEvent.click(screen.getByRole('button', {name: 'Send'}));
 
@@ -164,6 +173,7 @@ describe('AutofixMessageBox', () => {
     );
 
     // Test suggested root cause
+    await userEvent.click(screen.getByRole('button', {name: 'Use suggested root cause'}));
     const input = screen.getByPlaceholderText(
       '(Optional) Provide any instructions for the fix...'
     );
@@ -180,7 +190,9 @@ describe('AutofixMessageBox', () => {
     );
 
     // Test custom root cause
-    await userEvent.click(screen.getAllByText('Propose your own root cause')[0]);
+    await userEvent.click(
+      screen.getByRole('button', {name: 'Propose your own root cause'})
+    );
     const customInput = screen.getByPlaceholderText('Propose your own root cause...');
     await userEvent.type(customInput, 'Custom root cause');
     await userEvent.click(screen.getByRole('button', {name: 'Send'}));
@@ -191,20 +203,23 @@ describe('AutofixMessageBox', () => {
   it('renders segmented control for changes step', () => {
     render(<AutofixMessageBox {...changesStepProps} />);
 
-    expect(screen.getByRole('radio', {name: 'Give feedback'})).toBeInTheDocument();
-    expect(screen.getByRole('radio', {name: 'Approve changes'})).toBeInTheDocument();
+    expect(screen.getByRole('button', {name: 'Iterate'})).toBeInTheDocument();
+    expect(screen.getByRole('button', {name: 'Approve'})).toBeInTheDocument();
+    expect(screen.getByRole('button', {name: 'Add tests'})).toBeInTheDocument();
   });
 
-  it('shows feedback input when "Give feedback" is selected', () => {
+  it('shows feedback input when "Iterate" is selected', async () => {
     render(<AutofixMessageBox {...changesStepProps} />);
 
+    await userEvent.click(screen.getByRole('button', {name: 'Iterate'}));
+
     expect(
-      screen.getByPlaceholderText('Share helpful context or feedback...')
+      screen.getByPlaceholderText('Share helpful context or directions...')
     ).toBeInTheDocument();
     expect(screen.getByRole('button', {name: 'Send'})).toBeInTheDocument();
   });
 
-  it('shows "Create PR" button when "Approve changes" is selected', async () => {
+  it('shows "Create PR" button when "Approve" is selected', async () => {
     MockApiClient.addMockResponse({
       url: '/issues/123/autofix/setup/?check_write_access=true',
       method: 'GET',
@@ -219,7 +234,7 @@ describe('AutofixMessageBox', () => {
 
     render(<AutofixMessageBox {...changesStepProps} />);
 
-    await userEvent.click(screen.getByRole('radio', {name: 'Approve changes'}));
+    await userEvent.click(screen.getByRole('button', {name: 'Approve'}));
 
     expect(
       screen.getByText('Draft 1 pull request for the above changes?')
@@ -250,7 +265,7 @@ describe('AutofixMessageBox', () => {
 
     render(<AutofixMessageBox {...multipleChangesProps} />);
 
-    await userEvent.click(screen.getByRole('radio', {name: 'Approve changes'}));
+    await userEvent.click(screen.getByRole('button', {name: 'Approve'}));
 
     expect(
       screen.getByText('Draft 2 pull requests for the above changes?')
@@ -308,7 +323,7 @@ describe('AutofixMessageBox', () => {
 
     render(<AutofixMessageBox {...changesStepProps} />);
 
-    await userEvent.click(screen.getByRole('radio', {name: 'Approve changes'}));
+    await userEvent.click(screen.getByRole('button', {name: 'Approve'}));
 
     expect(
       screen.getByText('Draft 1 pull request for the above changes?')
@@ -326,18 +341,18 @@ describe('AutofixMessageBox', () => {
     ).toBeInTheDocument();
   });
 
-  it('shows segmented control with "Add tests" option for changes step', () => {
+  it('shows segmented control options for changes step', () => {
     render(<AutofixMessageBox {...changesStepProps} />);
 
-    expect(screen.getByRole('radio', {name: 'Give feedback'})).toBeInTheDocument();
-    expect(screen.getByRole('radio', {name: 'Add tests'})).toBeInTheDocument();
-    expect(screen.getByRole('radio', {name: 'Approve changes'})).toBeInTheDocument();
+    expect(screen.getByRole('button', {name: 'Approve'})).toBeInTheDocument();
+    expect(screen.getByRole('button', {name: 'Iterate'})).toBeInTheDocument();
+    expect(screen.getByRole('button', {name: 'Add tests'})).toBeInTheDocument();
   });
 
-  it('shows "Add Tests" button and static message when "Add tests" is selected', async () => {
+  it('shows "Test" button and static message when "Test" is selected', async () => {
     render(<AutofixMessageBox {...changesStepProps} />);
 
-    await userEvent.click(screen.getByRole('radio', {name: 'Add tests'}));
+    await userEvent.click(screen.getByRole('button', {name: 'Add tests'}));
 
     expect(
       screen.getByText('Write unit tests to make sure the issue is fixed?')
@@ -345,7 +360,7 @@ describe('AutofixMessageBox', () => {
     expect(screen.getByRole('button', {name: 'Add Tests'})).toBeInTheDocument();
   });
 
-  it('sends correct message when "Add Tests" is clicked without onSend prop', async () => {
+  it('sends correct message when "Test" is clicked without onSend prop', async () => {
     MockApiClient.addMockResponse({
       method: 'POST',
       url: '/issues/123/autofix/update/',
@@ -354,7 +369,7 @@ describe('AutofixMessageBox', () => {
 
     render(<AutofixMessageBox {...changesStepProps} />);
 
-    await userEvent.click(screen.getByRole('radio', {name: 'Add tests'}));
+    await userEvent.click(screen.getByRole('button', {name: 'Add tests'}));
     await userEvent.click(screen.getByRole('button', {name: 'Add Tests'}));
 
     await waitFor(() => {
diff --git a/static/app/components/events/autofix/autofixMessageBox.tsx b/static/app/components/events/autofix/autofixMessageBox.tsx
index 62ac0ca81ad643..fe8106687d5ba8 100644
--- a/static/app/components/events/autofix/autofixMessageBox.tsx
+++ b/static/app/components/events/autofix/autofixMessageBox.tsx
@@ -5,6 +5,8 @@ import {AnimatePresence, type AnimationProps, motion} from 'framer-motion';
 import {addErrorMessage, addSuccessMessage} from 'sentry/actionCreators/indicator';
 import {openModal} from 'sentry/actionCreators/modal';
 import {Button, LinkButton} from 'sentry/components/button';
+import AutofixActionSelector from 'sentry/components/events/autofix/autofixActionSelector';
+import AutofixFeedback from 'sentry/components/events/autofix/autofixFeedback';
 import {AutofixSetupWriteAccessModal} from 'sentry/components/events/autofix/autofixSetupWriteAccessModal';
 import {
   type AutofixCodebaseChange,
@@ -20,13 +22,12 @@ import {useAutofixSetup} from 'sentry/components/events/autofix/useAutofixSetup'
 import Input from 'sentry/components/input';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
 import {ScrollCarousel} from 'sentry/components/scrollCarousel';
-import {SegmentedControl} from 'sentry/components/segmentedControl';
 import {
+  IconChat,
   IconCheckmark,
   IconChevron,
   IconClose,
   IconFatal,
-  IconFocus,
   IconOpen,
   IconSad,
 } from 'sentry/icons';
@@ -178,14 +179,14 @@ function SetupAndCreatePRsButton({
 
 interface RootCauseAndFeedbackInputAreaProps {
   actionText: string;
-  changesMode: 'give_feedback' | 'add_tests' | 'create_prs';
+  changesMode: 'give_feedback' | 'add_tests' | 'create_prs' | null;
   groupId: string;
   handleSend: (e: FormEvent<HTMLFormElement>) => void;
   isRootCauseSelectionStep: boolean;
   message: string;
   primaryAction: boolean;
   responseRequired: boolean;
-  rootCauseMode: 'suggested_root_cause' | 'custom_root_cause';
+  rootCauseMode: 'suggested_root_cause' | 'custom_root_cause' | null;
   setMessage: (message: string) => void;
 }
 
@@ -212,7 +213,7 @@ function RootCauseAndFeedbackInputArea({
               onChange={e => setMessage(e.target.value)}
               placeholder={
                 !isRootCauseSelectionStep
-                  ? 'Share helpful context or feedback...'
+                  ? 'Share helpful context or directions...'
                   : rootCauseMode === 'suggested_root_cause'
                     ? '(Optional) Provide any instructions for the fix...'
                     : 'Propose your own root cause...'
@@ -280,23 +281,19 @@ function StepIcon({step}: {step: AutofixStep}) {
     if (step.changes.every(change => change.pull_request)) {
       return <IconCheckmark size="sm" color="green300" isCircled />;
     }
-    return <IconFocus size="sm" color="gray300" />;
+    return null;
   }
 
   if (step.type === AutofixStepType.ROOT_CAUSE_ANALYSIS) {
     if (step.causes?.length === 0) {
       return <IconSad size="sm" color="gray300" />;
     }
-    return step.selection ? (
-      <IconCheckmark size="sm" color="green300" isCircled />
-    ) : (
-      <IconFocus size="sm" color="gray300" />
-    );
+    return step.selection ? <IconCheckmark size="sm" color="green300" isCircled /> : null;
   }
 
   switch (step.status) {
     case AutofixStatus.WAITING_FOR_USER_RESPONSE:
-      return <IconFocus size="sm" color="gray300" />;
+      return <IconChat size="sm" color="gray300" />;
     case AutofixStatus.PROCESSING:
       return <ProcessingStatusIndicator size={14} mini hideMessage />;
     case AutofixStatus.CANCELLED:
@@ -338,12 +335,12 @@ function AutofixMessageBox({
   const contentRef = useRef<HTMLDivElement>(null);
 
   const [rootCauseMode, setRootCauseMode] = useState<
-    'suggested_root_cause' | 'custom_root_cause'
-  >('suggested_root_cause');
+    'suggested_root_cause' | 'custom_root_cause' | null
+  >(null);
 
   const [changesMode, setChangesMode] = useState<
-    'give_feedback' | 'add_tests' | 'create_prs'
-  >('give_feedback');
+    'give_feedback' | 'add_tests' | 'create_prs' | null
+  >(null);
 
   const changes =
     isChangesStep && step?.type === AutofixStepType.CHANGES ? step.changes : [];
@@ -407,6 +404,9 @@ function AutofixMessageBox({
                     __html: singleLineRenderer(step.title),
                   }}
                 />
+                <StepIconContainer>
+                  <StepIcon step={step} />
+                </StepIconContainer>
                 <StepHeaderRightSection>
                   {scrollIntoView !== null && (
                     <ScrollIntoViewButtonWrapper>
@@ -425,9 +425,7 @@ function AutofixMessageBox({
                       </AnimatePresence>
                     </ScrollIntoViewButtonWrapper>
                   )}
-                  <StepIconContainer>
-                    <StepIcon step={step} />
-                  </StepIconContainer>
+                  <AutofixFeedback />
                 </StepHeaderRightSection>
               </StepHeader>
             )}
@@ -438,114 +436,132 @@ function AutofixMessageBox({
             />
           </ContentArea>
           {!isDisabled && (
-            <ActionBar>
-              {isRootCauseSelectionStep && (
-                <Fragment>
-                  <SegmentedControl
-                    size="xs"
-                    value={rootCauseMode}
-                    onChange={setRootCauseMode}
-                    aria-label={t('Root cause selection')}
-                  >
-                    <SegmentedControl.Item key="suggested_root_cause">
-                      {t('Use suggested root cause')}
-                    </SegmentedControl.Item>
-                    <SegmentedControl.Item key="custom_root_cause">
-                      {t('Propose your own root cause')}
-                    </SegmentedControl.Item>
-                  </SegmentedControl>
-                </Fragment>
-              )}
-              {isChangesStep && !prsMade && (
-                <Fragment>
-                  <SegmentedControl
-                    size="xs"
-                    value={changesMode}
-                    onChange={setChangesMode}
-                    aria-label={t('Changes selection')}
-                  >
-                    <SegmentedControl.Item key="give_feedback">
-                      {t('Give feedback')}
-                    </SegmentedControl.Item>
-                    <SegmentedControl.Item key="add_tests">
-                      {t('Add tests')}
-                    </SegmentedControl.Item>
-                    <SegmentedControl.Item key="create_prs">
-                      {t('Approve changes')}
-                    </SegmentedControl.Item>
-                  </SegmentedControl>
-                </Fragment>
+            <InputSection>
+              {isRootCauseSelectionStep ? (
+                <AutofixActionSelector
+                  options={[
+                    {key: 'custom_root_cause', label: t('Propose your own root cause')},
+                    {
+                      key: 'suggested_root_cause',
+                      label: t('Use suggested root cause'),
+                      active: true,
+                    },
+                  ]}
+                  selected={rootCauseMode}
+                  onSelect={value => setRootCauseMode(value)}
+                  onBack={() => setRootCauseMode(null)}
+                >
+                  {option => (
+                    <RootCauseAndFeedbackInputArea
+                      handleSend={handleSend}
+                      isRootCauseSelectionStep={isRootCauseSelectionStep}
+                      message={message}
+                      rootCauseMode={option.key}
+                      responseRequired={responseRequired}
+                      setMessage={setMessage}
+                      actionText={actionText}
+                      primaryAction={primaryAction}
+                      changesMode={changesMode}
+                      groupId={groupId}
+                    />
+                  )}
+                </AutofixActionSelector>
+              ) : isChangesStep && !prsMade ? (
+                <AutofixActionSelector
+                  options={[
+                    {key: 'add_tests', label: t('Add tests')},
+                    {key: 'give_feedback', label: t('Iterate')},
+                    {key: 'create_prs', label: t('Approve'), active: true},
+                  ]}
+                  selected={changesMode}
+                  onSelect={value => setChangesMode(value)}
+                  onBack={() => setChangesMode(null)}
+                >
+                  {option => (
+                    <Fragment>
+                      {option.key === 'give_feedback' && (
+                        <RootCauseAndFeedbackInputArea
+                          handleSend={handleSend}
+                          isRootCauseSelectionStep={isRootCauseSelectionStep}
+                          message={message}
+                          rootCauseMode={rootCauseMode}
+                          responseRequired={responseRequired}
+                          setMessage={setMessage}
+                          actionText={actionText}
+                          primaryAction
+                          changesMode={option.key}
+                          groupId={groupId}
+                        />
+                      )}
+                      {option.key === 'add_tests' && (
+                        <form onSubmit={handleSend}>
+                          <InputArea>
+                            <StaticMessage>
+                              Write unit tests to make sure the issue is fixed?
+                            </StaticMessage>
+                            <Button type="submit" priority="primary">
+                              Add Tests
+                            </Button>
+                          </InputArea>
+                        </form>
+                      )}
+                      {option.key === 'create_prs' && (
+                        <InputArea>
+                          <StaticMessage>
+                            Draft {changes.length} pull request
+                            {changes.length > 1 ? 's' : ''} for the above changes?
+                          </StaticMessage>
+                          <SetupAndCreatePRsButton changes={changes} groupId={groupId} />
+                        </InputArea>
+                      )}
+                    </Fragment>
+                  )}
+                </AutofixActionSelector>
+              ) : isChangesStep && prsMade ? (
+                <ViewPRButtons aria-label={t('View pull requests')}>
+                  {changes.map(
+                    change =>
+                      change.pull_request?.pr_url && (
+                        <LinkButton
+                          key={`${change.repo_external_id}-${Math.random()}`}
+                          size="xs"
+                          priority="primary"
+                          icon={<IconOpen size="xs" />}
+                          href={change.pull_request.pr_url}
+                          external
+                        >
+                          View PR in {change.repo_name}
+                        </LinkButton>
+                      )
+                  )}
+                </ViewPRButtons>
+              ) : (
+                <RootCauseAndFeedbackInputArea
+                  handleSend={handleSend}
+                  isRootCauseSelectionStep={isRootCauseSelectionStep}
+                  message={message}
+                  rootCauseMode={rootCauseMode}
+                  responseRequired={responseRequired}
+                  setMessage={setMessage}
+                  actionText={actionText}
+                  primaryAction={primaryAction}
+                  changesMode={changesMode}
+                  groupId={groupId}
+                />
               )}
-            </ActionBar>
+            </InputSection>
           )}
+          {isDisabled && <Placeholder />}
         </ContentWrapper>
       </AnimatedContent>
-      <InputSection>
-        {(!isChangesStep || changesMode === 'give_feedback') &&
-          !prsMade &&
-          !isDisabled && (
-            <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}>
-            <InputArea>
-              <Fragment>
-                <StaticMessage>
-                  Write unit tests to make sure the issue is fixed?
-                </StaticMessage>
-                <Button type="submit" priority="primary">
-                  Add Tests
-                </Button>
-              </Fragment>
-            </InputArea>
-          </form>
-        )}
-        {isChangesStep && changesMode === 'create_prs' && !prsMade && (
-          <InputArea>
-            <Fragment>
-              <StaticMessage>
-                Draft {changes.length} pull request{changes.length > 1 ? 's' : ''} for the
-                above changes?
-              </StaticMessage>
-              <SetupAndCreatePRsButton changes={changes} groupId={groupId} />
-            </Fragment>
-          </InputArea>
-        )}
-        {isChangesStep && prsMade && (
-          <ViewPRButtons aria-label={t('View pull requests')}>
-            {changes.map(
-              change =>
-                change.pull_request?.pr_url && (
-                  <LinkButton
-                    key={`${change.repo_external_id}-${Math.random()}`}
-                    size="xs"
-                    priority="primary"
-                    icon={<IconOpen size="xs" />}
-                    href={change.pull_request.pr_url}
-                    external
-                  >
-                    View PR in {change.repo_name}
-                  </LinkButton>
-                )
-            )}
-          </ViewPRButtons>
-        )}
-      </InputSection>
     </Container>
   );
 }
 
+const Placeholder = styled('div')`
+  padding: ${space(1)};
+`;
+
 const ViewPRButtons = styled(ScrollCarousel)`
   width: 100%;
   padding: 0 ${space(1)};
@@ -593,7 +609,6 @@ const StepTitle = styled('div')`
   white-space: nowrap;
   display: flex;
   align-items: center;
-  flex-grow: 1;
 
   span {
     margin-right: ${space(1)};
@@ -609,6 +624,7 @@ const StepHeaderRightSection = styled('div')`
 const StepIconContainer = styled('div')`
   display: flex;
   align-items: center;
+  margin-right: auto;
 `;
 
 const StepHeader = styled('div')`
@@ -618,6 +634,7 @@ const StepHeader = styled('div')`
   padding: 0 ${space(1)} ${space(1)} ${space(1)};
   font-size: ${p => p.theme.fontSizeMedium};
   font-family: ${p => p.theme.text.family};
+  gap: ${space(1)};
 `;
 
 const InputArea = styled('div')`
@@ -630,7 +647,6 @@ const StaticMessage = styled('p')`
   padding-top: ${space(1)};
   padding-left: ${space(1)};
   margin-bottom: 0;
-  color: ${p => p.theme.subText};
   border-top: 1px solid ${p => p.theme.border};
 `;
 
@@ -654,13 +670,8 @@ const ProcessingStatusIndicator = styled(LoadingIndicator)`
   }
 `;
 
-const ActionBar = styled('div')`
-  padding-bottom: ${space(1)};
-  padding-left: ${space(2)};
-`;
-
 const InputSection = styled('div')`
-  padding: 0 ${space(2)} ${space(2)} ${space(2)};
+  padding: ${space(0.5)} ${space(2)} ${space(2)};
 `;
 
 export default AutofixMessageBox;
diff --git a/static/app/components/events/autofix/autofixOutputStream.tsx b/static/app/components/events/autofix/autofixOutputStream.tsx
new file mode 100644
index 00000000000000..4dff30816dd6bb
--- /dev/null
+++ b/static/app/components/events/autofix/autofixOutputStream.tsx
@@ -0,0 +1,137 @@
+import {useEffect, useRef, useState} from 'react';
+import {keyframes} from '@emotion/react';
+import styled from '@emotion/styled';
+import {AnimatePresence, motion} from 'framer-motion';
+
+import {IconArrow} from 'sentry/icons';
+import {space} from 'sentry/styles/space';
+import testableTransition from 'sentry/utils/testableTransition';
+
+interface Props {
+  stream: string;
+}
+
+const shimmer = keyframes`
+  0% {
+    background-position: -1000px 0;
+  }
+  100% {
+    background-position: 1000px 0;
+  }
+`;
+
+export function AutofixOutputStream({stream}: Props) {
+  const [displayedText, setDisplayedText] = useState('');
+  const previousText = useRef('');
+  const currentIndexRef = useRef(0);
+
+  useEffect(() => {
+    const newText = stream;
+
+    // Reset animation if the new text is completely different
+    if (!newText.startsWith(displayedText)) {
+      previousText.current = newText;
+      currentIndexRef.current = 0;
+      setDisplayedText('');
+    }
+
+    const interval = window.setInterval(() => {
+      if (currentIndexRef.current < newText.length) {
+        setDisplayedText(newText.slice(0, currentIndexRef.current + 1));
+        currentIndexRef.current++;
+      } else {
+        window.clearInterval(interval);
+      }
+    }, 15);
+
+    return () => {
+      window.clearInterval(interval);
+    };
+  }, [displayedText, stream]);
+
+  return (
+    <AnimatePresence mode="wait">
+      <Wrapper
+        key="output-stream"
+        initial={{opacity: 0, height: 0, scale: 0.8}}
+        animate={{opacity: 1, height: 'auto', scale: 1}}
+        exit={{opacity: 0, height: 0, scale: 0.8, y: -20}}
+        transition={testableTransition({
+          duration: 1.0,
+          height: {
+            type: 'spring',
+            bounce: 0.2,
+          },
+          scale: {
+            type: 'spring',
+            bounce: 0.2,
+          },
+          y: {
+            type: 'tween',
+            ease: 'easeOut',
+          },
+        })}
+        style={{
+          transformOrigin: 'top center',
+        }}
+      >
+        <StyledArrow direction="down" size="sm" />
+        <StreamContainer layout>
+          <StreamContent>{displayedText}</StreamContent>
+        </StreamContainer>
+      </Wrapper>
+    </AnimatePresence>
+  );
+}
+
+const Wrapper = styled(motion.div)`
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  margin: ${space(1)} ${space(4)};
+  gap: ${space(1)};
+  overflow: hidden;
+`;
+
+const StreamContainer = styled(motion.div)`
+  position: relative;
+  width: 100%;
+  border-radius: ${p => p.theme.borderRadius};
+  background: ${p => p.theme.background};
+  border: 1px dashed ${p => p.theme.border};
+  height: 5rem;
+  overflow: hidden;
+
+  &:before {
+    content: '';
+    position: absolute;
+    inset: 0;
+    background: linear-gradient(
+      90deg,
+      transparent,
+      ${p => p.theme.active}20,
+      transparent
+    );
+    background-size: 2000px 100%;
+    animation: ${shimmer} 2s infinite linear;
+    pointer-events: none;
+  }
+`;
+
+const StreamContent = styled('div')`
+  margin: 0;
+  padding: ${space(2)};
+  white-space: pre-wrap;
+  word-break: break-word;
+  font-size: ${p => p.theme.fontSizeSmall};
+  color: ${p => p.theme.subText};
+  height: 5rem;
+  overflow-y: auto;
+  display: flex;
+  flex-direction: column-reverse;
+`;
+
+const StyledArrow = styled(IconArrow)`
+  color: ${p => p.theme.subText};
+  opacity: 0.5;
+`;
diff --git a/static/app/components/events/autofix/autofixRootCause.spec.tsx b/static/app/components/events/autofix/autofixRootCause.spec.tsx
index 96c376b83d814f..651a63d5df5d0f 100644
--- a/static/app/components/events/autofix/autofixRootCause.spec.tsx
+++ b/static/app/components/events/autofix/autofixRootCause.spec.tsx
@@ -66,7 +66,7 @@ describe('AutofixRootCause', function () {
       />
     );
 
-    expect(screen.queryByRole('link', {name: 'GitHub'})).toBeInTheDocument();
+    expect(screen.getByRole('link', {name: 'GitHub'})).toBeInTheDocument();
     expect(screen.queryByRole('link', {name: 'GitHub'})).toHaveAttribute(
       'href',
       'https://github.com/test_owner/test_repo/blob/main/src/file.py'
diff --git a/static/app/components/events/autofix/autofixRootCause.tsx b/static/app/components/events/autofix/autofixRootCause.tsx
index 2a301cef677d0f..53ff3ca1b014a1 100644
--- a/static/app/components/events/autofix/autofixRootCause.tsx
+++ b/static/app/components/events/autofix/autofixRootCause.tsx
@@ -383,7 +383,7 @@ function AutofixRootCauseDisplay({
   rootCauseSelection,
   repos,
 }: AutofixRootCauseProps) {
-  const [selectedId, setSelectedId] = useState(() => causes[0].id);
+  const [selectedId, setSelectedId] = useState(() => causes[0]!.id);
   const {isPending, mutate: handleSelectFix} = useSelectCause({groupId, runId});
 
   if (rootCauseSelection) {
@@ -468,10 +468,24 @@ function AutofixRootCauseDisplay({
 }
 
 const cardAnimationProps: AnimationProps = {
-  exit: {opacity: 0},
-  initial: {opacity: 0, y: 20},
-  animate: {opacity: 1, y: 0},
-  transition: testableTransition({duration: 0.3}),
+  exit: {opacity: 0, height: 0, scale: 0.8, y: -20},
+  initial: {opacity: 0, height: 0, scale: 0.8},
+  animate: {opacity: 1, height: 'auto', scale: 1},
+  transition: testableTransition({
+    duration: 1.0,
+    height: {
+      type: 'spring',
+      bounce: 0.2,
+    },
+    scale: {
+      type: 'spring',
+      bounce: 0.2,
+    },
+    y: {
+      type: 'tween',
+      ease: 'easeOut',
+    },
+  }),
 };
 
 export function AutofixRootCause(props: AutofixRootCauseProps) {
@@ -627,7 +641,9 @@ const ContentWrapper = styled(motion.div)<{selected: boolean}>`
   }
 `;
 
-const AnimationWrapper = styled(motion.div)``;
+const AnimationWrapper = styled(motion.div)`
+  transform-origin: top center;
+`;
 
 const CustomRootCausePadding = styled('div')`
   padding: ${space(2)} ${space(2)} ${space(2)} ${space(2)};
diff --git a/static/app/components/events/autofix/autofixSteps.spec.tsx b/static/app/components/events/autofix/autofixSteps.spec.tsx
index 18b0067e8007a5..df4453de4195ec 100644
--- a/static/app/components/events/autofix/autofixSteps.spec.tsx
+++ b/static/app/components/events/autofix/autofixSteps.spec.tsx
@@ -62,9 +62,7 @@ describe('AutofixSteps', () => {
     render(<AutofixSteps {...defaultProps} />);
 
     expect(screen.getByText('Root cause 1')).toBeInTheDocument();
-    expect(
-      screen.getByPlaceholderText('(Optional) Provide any instructions for the fix...')
-    ).toBeInTheDocument();
+    expect(screen.getByText('Use suggested root cause')).toBeInTheDocument();
   });
 
   it('handles root cause selection', async () => {
@@ -76,6 +74,8 @@ describe('AutofixSteps', () => {
 
     render(<AutofixSteps {...defaultProps} />);
 
+    await userEvent.click(screen.getByRole('button', {name: 'Use suggested root cause'}));
+
     const input = screen.getByPlaceholderText(
       '(Optional) Provide any instructions for the fix...'
     );
@@ -98,6 +98,7 @@ describe('AutofixSteps', () => {
 
     render(<AutofixSteps {...defaultProps} />);
 
+    await userEvent.click(screen.getByRole('button', {name: 'Use suggested root cause'}));
     await userEvent.click(screen.getByRole('button', {name: 'Find a Fix'}));
 
     await waitFor(() => {
@@ -107,9 +108,11 @@ describe('AutofixSteps', () => {
     });
   });
 
-  it('renders AutofixMessageBox with correct props', () => {
+  it('renders AutofixMessageBox with correct props', async () => {
     render(<AutofixSteps {...defaultProps} />);
 
+    await userEvent.click(screen.getByRole('button', {name: 'Use suggested root cause'}));
+
     const messageBox = screen.getByPlaceholderText(
       '(Optional) Provide any instructions for the fix...'
     );
@@ -150,7 +153,8 @@ describe('AutofixSteps', () => {
 
   it('handles iterating on changes step', async () => {
     MockApiClient.addMockResponse({
-      url: '/issues/group1/autofix/setup/',
+      url: '/issues/group1/autofix/setup/?check_write_access=true',
+      method: 'GET',
       body: {
         genAIConsent: {ok: true},
         integration: {ok: true},
@@ -194,7 +198,9 @@ describe('AutofixSteps', () => {
 
     render(<AutofixSteps {...propsWithChanges} />);
 
-    const input = screen.getByPlaceholderText('Share helpful context or feedback...');
+    await userEvent.click(screen.getByRole('button', {name: 'Iterate'}));
+
+    const input = screen.getByPlaceholderText('Share helpful context or directions...');
     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 37a5879485a631..490b02474edab4 100644
--- a/static/app/components/events/autofix/autofixSteps.tsx
+++ b/static/app/components/events/autofix/autofixSteps.tsx
@@ -7,6 +7,7 @@ import AutofixInsightCards, {
   useUpdateInsightCard,
 } from 'sentry/components/events/autofix/autofixInsightCards';
 import AutofixMessageBox from 'sentry/components/events/autofix/autofixMessageBox';
+import {AutofixOutputStream} from 'sentry/components/events/autofix/autofixOutputStream';
 import {
   AutofixRootCause,
   useSelectCause,
@@ -135,11 +136,11 @@ export function AutofixSteps({data, groupId, runId}: AutofixStepsProps) {
       if (!steps) {
         return;
       }
-      const step = steps[steps.length - 1];
+      const step = steps[steps.length - 1]!;
       if (step.type !== AutofixStepType.ROOT_CAUSE_ANALYSIS) {
         return;
       }
-      const cause = step.causes[0];
+      const cause = step.causes[0]!;
       const id = cause.id;
       handleSelectFix({causeId: id, instruction: text});
     }
@@ -163,8 +164,8 @@ export function AutofixSteps({data, groupId, runId}: AutofixStepsProps) {
   useEffect(() => {
     const observer = new IntersectionObserver(
       ([entry]) => {
-        setIsBottomVisible(entry.isIntersecting);
-        if (entry.isIntersecting) {
+        setIsBottomVisible(entry!.isIntersecting);
+        if (entry!.isIntersecting) {
           setHasSeenBottom(true);
         }
       },
@@ -193,7 +194,7 @@ export function AutofixSteps({data, groupId, runId}: AutofixStepsProps) {
 
     const hasNewSteps =
       currentStepsLength > prevStepsLengthRef.current &&
-      steps[currentStepsLength - 1].type !== AutofixStepType.DEFAULT;
+      steps[currentStepsLength - 1]!.type !== AutofixStepType.DEFAULT;
     const hasNewInsights = currentInsightsCount > prevInsightsCountRef.current;
 
     if (hasNewSteps || hasNewInsights) {
@@ -216,16 +217,18 @@ export function AutofixSteps({data, groupId, runId}: AutofixStepsProps) {
   }
 
   const lastStep = steps[steps.length - 1];
-  const logs: AutofixProgressItem[] = lastStep.progress?.filter(isProgressLog) ?? [];
+  const logs: AutofixProgressItem[] = lastStep!.progress?.filter(isProgressLog) ?? [];
   const activeLog =
-    lastStep.completedMessage ?? replaceHeadersWithBold(logs.at(-1)?.message ?? '') ?? '';
+    lastStep!.completedMessage ??
+    replaceHeadersWithBold(logs.at(-1)?.message ?? '') ??
+    '';
 
   const isRootCauseSelectionStep =
-    lastStep.type === AutofixStepType.ROOT_CAUSE_ANALYSIS &&
-    lastStep.status === 'COMPLETED';
+    lastStep!.type === AutofixStepType.ROOT_CAUSE_ANALYSIS &&
+    lastStep!.status === 'COMPLETED';
 
   const isChangesStep =
-    lastStep.type === AutofixStepType.CHANGES && lastStep.status === 'COMPLETED';
+    lastStep!.type === AutofixStepType.CHANGES && lastStep!.status === 'COMPLETED';
 
   return (
     <div>
@@ -280,12 +283,15 @@ export function AutofixSteps({data, groupId, runId}: AutofixStepsProps) {
             </div>
           );
         })}
+        {lastStep!.output_stream && (
+          <AutofixOutputStream stream={lastStep!.output_stream} />
+        )}
       </StepsContainer>
 
       <AutofixMessageBox
         displayText={activeLog ?? ''}
-        step={lastStep}
-        responseRequired={lastStep.status === 'WAITING_FOR_USER_RESPONSE'}
+        step={lastStep!}
+        responseRequired={lastStep!.status === 'WAITING_FOR_USER_RESPONSE'}
         onSend={
           !isRootCauseSelectionStep
             ? !isChangesStep
@@ -302,9 +308,9 @@ export function AutofixSteps({data, groupId, runId}: AutofixStepsProps) {
         isChangesStep={isChangesStep}
         scrollIntoView={!hasSeenBottom ? scrollToBottom : null}
         scrollText={
-          lastStep.type === AutofixStepType.ROOT_CAUSE_ANALYSIS
+          lastStep!.type === AutofixStepType.ROOT_CAUSE_ANALYSIS
             ? 'View Root Cause'
-            : lastStep.type === AutofixStepType.CHANGES
+            : lastStep!.type === AutofixStepType.CHANGES
               ? 'View Fix'
               : 'New Insight'
         }
diff --git a/static/app/components/events/autofix/types.ts b/static/app/components/events/autofix/types.ts
index 1e291accf68f01..3426b284e04dec 100644
--- a/static/app/components/events/autofix/types.ts
+++ b/static/app/components/events/autofix/types.ts
@@ -87,6 +87,7 @@ interface BaseStep {
   title: string;
   type: AutofixStepType;
   completedMessage?: string;
+  output_stream?: string | null;
 }
 
 export type CodeSnippetContext = {
diff --git a/static/app/components/events/autofix/useAutofix.tsx b/static/app/components/events/autofix/useAutofix.tsx
index 92a5cb14ff6493..9271f2508d1c3e 100644
--- a/static/app/components/events/autofix/useAutofix.tsx
+++ b/static/app/components/events/autofix/useAutofix.tsx
@@ -19,7 +19,7 @@ export type AutofixResponse = {
   autofix: AutofixData | null;
 };
 
-const POLL_INTERVAL = 1000;
+const POLL_INTERVAL = 500;
 
 export const makeAutofixQueryKey = (groupId: string): ApiQueryKey => [
   `/issues/${groupId}/autofix/`,
diff --git a/static/app/components/events/breadcrumbs/breadcrumbsDataSection.spec.tsx b/static/app/components/events/breadcrumbs/breadcrumbsDataSection.spec.tsx
index 13a3db275b0791..8f42fe8f0908f9 100644
--- a/static/app/components/events/breadcrumbs/breadcrumbsDataSection.spec.tsx
+++ b/static/app/components/events/breadcrumbs/breadcrumbsDataSection.spec.tsx
@@ -36,17 +36,17 @@ describe('BreadcrumbsDataSection', function () {
     // Only summary crumbs should be visible by default
     const summaryCrumbTitles = [
       'Exception',
-      MOCK_BREADCRUMBS[5].category,
-      MOCK_BREADCRUMBS[4].category,
-      MOCK_BREADCRUMBS[3].category,
-      MOCK_BREADCRUMBS[2].category,
+      MOCK_BREADCRUMBS[5]!.category,
+      MOCK_BREADCRUMBS[4]!.category,
+      MOCK_BREADCRUMBS[3]!.category,
+      MOCK_BREADCRUMBS[2]!.category,
     ];
     for (const crumbTitle of summaryCrumbTitles) {
       expect(screen.getByText(crumbTitle)).toBeInTheDocument();
     }
     const hiddenCrumbTitles = [
-      MOCK_BREADCRUMBS[1].category,
-      MOCK_BREADCRUMBS[0].category,
+      MOCK_BREADCRUMBS[1]!.category,
+      MOCK_BREADCRUMBS[0]!.category,
     ];
     for (const crumbTitle of hiddenCrumbTitles) {
       expect(screen.queryByText(crumbTitle)).not.toBeInTheDocument();
diff --git a/static/app/components/events/breadcrumbs/breadcrumbsDrawer.spec.tsx b/static/app/components/events/breadcrumbs/breadcrumbsDrawer.spec.tsx
index c152ff6c839fd8..25eb4c9d4eb50c 100644
--- a/static/app/components/events/breadcrumbs/breadcrumbsDrawer.spec.tsx
+++ b/static/app/components/events/breadcrumbs/breadcrumbsDrawer.spec.tsx
@@ -23,42 +23,50 @@ async function renderBreadcrumbDrawer() {
     }));
   render(<BreadcrumbsDataSection {...MOCK_DATA_SECTION_PROPS} />);
   await userEvent.click(screen.getByRole('button', {name: 'View All Breadcrumbs'}));
-  return within(screen.getByRole('complementary', {name: 'breadcrumb drawer'}));
+  return screen.getByRole('complementary', {name: 'breadcrumb drawer'});
 }
 
 describe('BreadcrumbsDrawer', function () {
   it('renders the drawer as expected', async function () {
     const drawerScreen = await renderBreadcrumbDrawer();
-    expect(drawerScreen.getByRole('button', {name: 'Close Drawer'})).toBeInTheDocument();
+    expect(
+      within(drawerScreen).getByRole('button', {name: 'Close Drawer'})
+    ).toBeInTheDocument();
 
     // Inner drawer breadcrumbs
     const {event, group} = MOCK_DATA_SECTION_PROPS;
-    expect(drawerScreen.getByText(group.shortId)).toBeInTheDocument();
-    expect(drawerScreen.getByText(event.id.slice(0, 8))).toBeInTheDocument();
-    expect(drawerScreen.getByText('Breadcrumbs', {selector: 'span'})).toBeInTheDocument();
+    expect(within(drawerScreen).getByText(group.shortId)).toBeInTheDocument();
+    expect(within(drawerScreen).getByText(event.id.slice(0, 8))).toBeInTheDocument();
+    expect(
+      within(drawerScreen).getByText('Breadcrumbs', {selector: 'span'})
+    ).toBeInTheDocument();
 
     // Header & Controls
-    expect(drawerScreen.getByText('Breadcrumbs', {selector: 'h3'})).toBeInTheDocument();
     expect(
-      drawerScreen.getByRole('textbox', {name: 'Search All Breadcrumbs'})
+      within(drawerScreen).getByText('Breadcrumbs', {selector: 'h3'})
     ).toBeInTheDocument();
     expect(
-      drawerScreen.getByRole('button', {name: 'Sort All Breadcrumbs'})
+      within(drawerScreen).getByRole('textbox', {name: 'Search All Breadcrumbs'})
     ).toBeInTheDocument();
     expect(
-      drawerScreen.getByRole('button', {name: 'Filter All Breadcrumbs'})
+      within(drawerScreen).getByRole('button', {name: 'Sort All Breadcrumbs'})
     ).toBeInTheDocument();
     expect(
-      drawerScreen.getByRole('button', {name: 'Change Time Format for All Breadcrumbs'})
+      within(drawerScreen).getByRole('button', {name: 'Filter All Breadcrumbs'})
+    ).toBeInTheDocument();
+    expect(
+      within(drawerScreen).getByRole('button', {
+        name: 'Change Time Format for All Breadcrumbs',
+      })
     ).toBeInTheDocument();
 
     // Contents
     for (const {category, level, message} of MOCK_BREADCRUMBS) {
-      expect(drawerScreen.getByText(category)).toBeInTheDocument();
-      expect(drawerScreen.getByText(level)).toBeInTheDocument();
-      expect(drawerScreen.getByText(message)).toBeInTheDocument();
+      expect(within(drawerScreen).getByText(category)).toBeInTheDocument();
+      expect(within(drawerScreen).getByText(level)).toBeInTheDocument();
+      expect(within(drawerScreen).getByText(message)).toBeInTheDocument();
     }
-    expect(drawerScreen.getAllByText('06:00:48.760 PM')).toHaveLength(
+    expect(within(drawerScreen).getAllByText('06:00:48.760 PM')).toHaveLength(
       MOCK_BREADCRUMBS.length
     );
   });
@@ -67,16 +75,16 @@ describe('BreadcrumbsDrawer', function () {
     const drawerScreen = await renderBreadcrumbDrawer();
 
     const [warningCrumb, logCrumb] = MOCK_BREADCRUMBS;
-    expect(drawerScreen.getByText(warningCrumb.category)).toBeInTheDocument();
-    expect(drawerScreen.getByText(logCrumb.category)).toBeInTheDocument();
+    expect(within(drawerScreen).getByText(warningCrumb.category)).toBeInTheDocument();
+    expect(within(drawerScreen).getByText(logCrumb.category)).toBeInTheDocument();
 
-    const searchInput = drawerScreen.getByRole('textbox', {
+    const searchInput = within(drawerScreen).getByRole('textbox', {
       name: 'Search All Breadcrumbs',
     });
     await userEvent.type(searchInput, warningCrumb.message);
 
-    expect(drawerScreen.getByText(warningCrumb.category)).toBeInTheDocument();
-    expect(drawerScreen.queryByText(logCrumb.category)).not.toBeInTheDocument();
+    expect(within(drawerScreen).getByText(warningCrumb.category)).toBeInTheDocument();
+    expect(within(drawerScreen).queryByText(logCrumb.category)).not.toBeInTheDocument();
   });
 
   it('allows type filter to affect displayed crumbs', async function () {
@@ -84,16 +92,18 @@ describe('BreadcrumbsDrawer', function () {
 
     const queryCrumb = MOCK_BREADCRUMBS[3];
     const requestCrumb = MOCK_BREADCRUMBS[2];
-    expect(drawerScreen.getByText(queryCrumb.category)).toBeInTheDocument();
-    expect(drawerScreen.getByText(requestCrumb.category)).toBeInTheDocument();
+    expect(within(drawerScreen).getByText(queryCrumb.category)).toBeInTheDocument();
+    expect(within(drawerScreen).getByText(requestCrumb.category)).toBeInTheDocument();
 
     await userEvent.click(
-      drawerScreen.getByRole('button', {name: 'Filter All Breadcrumbs'})
+      within(drawerScreen).getByRole('button', {name: 'Filter All Breadcrumbs'})
     );
-    await userEvent.click(drawerScreen.getByRole('option', {name: 'Query'}));
+    await userEvent.click(within(drawerScreen).getByRole('option', {name: 'Query'}));
 
-    expect(drawerScreen.getByText(queryCrumb.category)).toBeInTheDocument();
-    expect(drawerScreen.queryByText(requestCrumb.category)).not.toBeInTheDocument();
+    expect(within(drawerScreen).getByText(queryCrumb.category)).toBeInTheDocument();
+    expect(
+      within(drawerScreen).queryByText(requestCrumb.category)
+    ).not.toBeInTheDocument();
   });
 
   it('allows level spofilter to affect displayed crumbs', async function () {
@@ -101,16 +111,16 @@ describe('BreadcrumbsDrawer', function () {
 
     const [warningCrumb, logCrumb] = MOCK_BREADCRUMBS;
 
-    expect(drawerScreen.getByText(warningCrumb.category)).toBeInTheDocument();
-    expect(drawerScreen.getByText(logCrumb.category)).toBeInTheDocument();
+    expect(within(drawerScreen).getByText(warningCrumb.category)).toBeInTheDocument();
+    expect(within(drawerScreen).getByText(logCrumb.category)).toBeInTheDocument();
 
     await userEvent.click(
-      drawerScreen.getByRole('button', {name: 'Filter All Breadcrumbs'})
+      within(drawerScreen).getByRole('button', {name: 'Filter All Breadcrumbs'})
     );
-    await userEvent.click(drawerScreen.getByRole('option', {name: 'warning'}));
+    await userEvent.click(within(drawerScreen).getByRole('option', {name: 'warning'}));
 
-    expect(drawerScreen.getByText(warningCrumb.category)).toBeInTheDocument();
-    expect(drawerScreen.queryByText(logCrumb.category)).not.toBeInTheDocument();
+    expect(within(drawerScreen).getByText(warningCrumb.category)).toBeInTheDocument();
+    expect(within(drawerScreen).queryByText(logCrumb.category)).not.toBeInTheDocument();
   });
 
   it('allows sort dropdown to affect displayed crumbs', async function () {
@@ -119,54 +129,56 @@ describe('BreadcrumbsDrawer', function () {
     const [warningCrumb, logCrumb] = MOCK_BREADCRUMBS;
 
     expect(
-      drawerScreen
+      within(drawerScreen)
         .getByText(warningCrumb.category)
-        .compareDocumentPosition(drawerScreen.getByText(logCrumb.category))
+        .compareDocumentPosition(within(drawerScreen).getByText(logCrumb.category))
     ).toBe(document.DOCUMENT_POSITION_PRECEDING);
 
-    const sortControl = drawerScreen.getByRole('button', {
+    const sortControl = within(drawerScreen).getByRole('button', {
       name: 'Sort All Breadcrumbs',
     });
     await userEvent.click(sortControl);
-    await userEvent.click(drawerScreen.getByRole('option', {name: 'Oldest'}));
+    await userEvent.click(within(drawerScreen).getByRole('option', {name: 'Oldest'}));
 
     expect(
-      drawerScreen
+      within(drawerScreen)
         .getByText(warningCrumb.category)
-        .compareDocumentPosition(drawerScreen.getByText(logCrumb.category))
+        .compareDocumentPosition(within(drawerScreen).getByText(logCrumb.category))
     ).toBe(document.DOCUMENT_POSITION_FOLLOWING);
 
     await userEvent.click(sortControl);
-    await userEvent.click(drawerScreen.getByRole('option', {name: 'Newest'}));
+    await userEvent.click(within(drawerScreen).getByRole('option', {name: 'Newest'}));
 
     expect(
-      drawerScreen
+      within(drawerScreen)
         .getByText(warningCrumb.category)
-        .compareDocumentPosition(drawerScreen.getByText(logCrumb.category))
+        .compareDocumentPosition(within(drawerScreen).getByText(logCrumb.category))
     ).toBe(document.DOCUMENT_POSITION_PRECEDING);
   });
 
   it('allows time display dropdown to change all displayed crumbs', async function () {
     const drawerScreen = await renderBreadcrumbDrawer();
-    expect(drawerScreen.getAllByText('06:00:48.760 PM')).toHaveLength(
+    expect(within(drawerScreen).getAllByText('06:00:48.760 PM')).toHaveLength(
       MOCK_BREADCRUMBS.length
     );
-    expect(drawerScreen.queryByText('-1min 2ms')).not.toBeInTheDocument();
-    const timeControl = drawerScreen.getByRole('button', {
+    expect(within(drawerScreen).queryByText('-1min 2ms')).not.toBeInTheDocument();
+    const timeControl = within(drawerScreen).getByRole('button', {
       name: 'Change Time Format for All Breadcrumbs',
     });
     await userEvent.click(timeControl);
-    await userEvent.click(drawerScreen.getByRole('option', {name: 'Relative'}));
+    await userEvent.click(within(drawerScreen).getByRole('option', {name: 'Relative'}));
 
-    expect(drawerScreen.queryByText('06:00:48.760 PM')).not.toBeInTheDocument();
-    expect(drawerScreen.getAllByText('-1min 2ms')).toHaveLength(MOCK_BREADCRUMBS.length);
+    expect(within(drawerScreen).queryByText('06:00:48.760 PM')).not.toBeInTheDocument();
+    expect(within(drawerScreen).getAllByText('-1min 2ms')).toHaveLength(
+      MOCK_BREADCRUMBS.length
+    );
 
     await userEvent.click(timeControl);
-    await userEvent.click(drawerScreen.getByRole('option', {name: 'Absolute'}));
+    await userEvent.click(within(drawerScreen).getByRole('option', {name: 'Absolute'}));
 
-    expect(drawerScreen.getAllByText('06:00:48.760 PM')).toHaveLength(
+    expect(within(drawerScreen).getAllByText('06:00:48.760 PM')).toHaveLength(
       MOCK_BREADCRUMBS.length
     );
-    expect(drawerScreen.queryByText('-1min 2ms')).not.toBeInTheDocument();
+    expect(within(drawerScreen).queryByText('-1min 2ms')).not.toBeInTheDocument();
   });
 });
diff --git a/static/app/components/events/breadcrumbs/breadcrumbsTimeline.tsx b/static/app/components/events/breadcrumbs/breadcrumbsTimeline.tsx
index 54e046ade6d4ee..eace7b853cae3d 100644
--- a/static/app/components/events/breadcrumbs/breadcrumbsTimeline.tsx
+++ b/static/app/components/events/breadcrumbs/breadcrumbsTimeline.tsx
@@ -70,7 +70,7 @@ export default function BreadcrumbsTimeline({
   const virtualItems = virtualizer.getVirtualItems();
   const items = virtualItems.map(virtualizedRow => {
     const {breadcrumb, raw, title, meta, iconComponent, colorConfig, levelComponent} =
-      breadcrumbs[virtualizedRow.index];
+      breadcrumbs[virtualizedRow.index]!;
     const isVirtualCrumb = !defined(raw);
 
     const timeDate = new Date(breadcrumb.timestamp ?? '');
diff --git a/static/app/components/events/breadcrumbs/testUtils.tsx b/static/app/components/events/breadcrumbs/testUtils.tsx
index 677cebb470a448..6a5ea4a70fc3ed 100644
--- a/static/app/components/events/breadcrumbs/testUtils.tsx
+++ b/static/app/components/events/breadcrumbs/testUtils.tsx
@@ -49,7 +49,7 @@ export const MOCK_BREADCRUMBS = [
     type: BreadcrumbType.DEFAULT,
     timestamp: oneMinuteBeforeEventFixture,
   },
-];
+] as const;
 const MOCK_BREADCRUMB_ENTRY = {
   type: EntryType.BREADCRUMBS,
   data: {
diff --git a/static/app/components/events/breadcrumbs/utils.tsx b/static/app/components/events/breadcrumbs/utils.tsx
index d14345302ef1e6..641b82e68d9ea5 100644
--- a/static/app/components/events/breadcrumbs/utils.tsx
+++ b/static/app/components/events/breadcrumbs/utils.tsx
@@ -143,9 +143,9 @@ export function useBreadcrumbFilters(crumbs: EnhancedCrumb[]) {
       options.forEach(optionValue => {
         const [indicator, value] = optionValue.split('-');
         if (indicator === 'type') {
-          typeFilterSet.add(value);
+          typeFilterSet.add(value!);
         } else if (indicator === 'level') {
-          levelFilterSet.add(value);
+          levelFilterSet.add(value!);
         }
       });
 
diff --git a/static/app/components/events/contexts/contextCard.spec.tsx b/static/app/components/events/contexts/contextCard.spec.tsx
index fa6e0fd93280c6..c716b4652f0e19 100644
--- a/static/app/components/events/contexts/contextCard.spec.tsx
+++ b/static/app/components/events/contexts/contextCard.spec.tsx
@@ -76,7 +76,7 @@ describe('ContextCard', function () {
         project={project}
       />
     );
-    expect(iconSpy.mock.calls[0][0]).toBe(browserContext.name);
+    expect(iconSpy.mock.calls[0]![0]).toBe(browserContext.name);
     expect(screen.getByRole('img')).toBeInTheDocument();
 
     iconSpy.mockReset();
diff --git a/static/app/components/events/contexts/index.tsx b/static/app/components/events/contexts/index.tsx
index 0f3cafedcfe7e7..1e4e2c5e3a40bd 100644
--- a/static/app/components/events/contexts/index.tsx
+++ b/static/app/components/events/contexts/index.tsx
@@ -62,7 +62,7 @@ export function getOrderedContextItems(event: Event): ContextItem[] {
       return !isInvalid;
     })
     .map<ContextItem>(([alias, ctx]) => ({
-      alias: alias,
+      alias,
       type: overrideTypesWithAliases.has(alias) ? alias : ctx?.type,
       value: ctx,
     }));
diff --git a/static/app/components/events/contexts/knownContext/browser.spec.tsx b/static/app/components/events/contexts/knownContext/browser.spec.tsx
index d42e6c3b02a949..7018b6581b0ba7 100644
--- a/static/app/components/events/contexts/knownContext/browser.spec.tsx
+++ b/static/app/components/events/contexts/knownContext/browser.spec.tsx
@@ -8,7 +8,7 @@ import {
   getBrowserContextData,
 } from 'sentry/components/events/contexts/knownContext/browser';
 
-export const MOCK_BROWSER_CONTEXT: BrowserContext = {
+const MOCK_BROWSER_CONTEXT: BrowserContext = {
   version: '83.0.4103',
   type: 'browser',
   name: '',
@@ -17,7 +17,7 @@ export const MOCK_BROWSER_CONTEXT: BrowserContext = {
   unknown_key: 123,
 };
 
-export const MOCK_REDACTION = {
+const MOCK_REDACTION = {
   name: {
     '': {
       chunks: [
diff --git a/static/app/components/events/contexts/platformContext/unity.spec.tsx b/static/app/components/events/contexts/platformContext/unity.spec.tsx
index 5ef900a88519ee..8d920d535ba252 100644
--- a/static/app/components/events/contexts/platformContext/unity.spec.tsx
+++ b/static/app/components/events/contexts/platformContext/unity.spec.tsx
@@ -5,7 +5,7 @@ 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 = {
+const MOCK_UNITY_CONTEXT = {
   type: 'unity' as const,
   copy_texture_support: 'Basic, Copy3D, DifferentTypes, TextureToRT, RTToTexture',
   editor_version: '2022.1.23f1',
@@ -17,7 +17,7 @@ export const MOCK_UNITY_CONTEXT = {
   unknown_key: 123,
 };
 
-export const MOCK_REDACTION = {
+const MOCK_REDACTION = {
   install_mode: {
     '': {
       rem: [['organization:0', 'x']],
diff --git a/static/app/components/events/contexts/utils.spec.tsx b/static/app/components/events/contexts/utils.spec.tsx
index 968d5ae8eb6a74..a5a93cb9222225 100644
--- a/static/app/components/events/contexts/utils.spec.tsx
+++ b/static/app/components/events/contexts/utils.spec.tsx
@@ -154,10 +154,10 @@ describe('contexts utils', function () {
       };
 
       const knownStructuredData = getKnownStructuredData(knownData, errMeta);
-      expect(knownData[0].key).toEqual(knownStructuredData[0].key);
-      expect(knownData[0].subject).toEqual(knownStructuredData[0].subject);
-      render(<Fragment>{knownStructuredData[0].value as React.ReactNode}</Fragment>);
-      expect(screen.getByText(`${knownData[0].value}`)).toBeInTheDocument();
+      expect(knownData[0]!.key).toEqual(knownStructuredData[0]!.key);
+      expect(knownData[0]!.subject).toEqual(knownStructuredData[0]!.subject);
+      render(<Fragment>{knownStructuredData[0]!.value as React.ReactNode}</Fragment>);
+      expect(screen.getByText(`${knownData[0]!.value}`)).toBeInTheDocument();
       expect(screen.getByTestId('annotated-text-error-icon')).toBeInTheDocument();
     });
   });
diff --git a/static/app/components/events/contexts/utils.tsx b/static/app/components/events/contexts/utils.tsx
index 8ad210103a7935..8d79c598b8f066 100644
--- a/static/app/components/events/contexts/utils.tsx
+++ b/static/app/components/events/contexts/utils.tsx
@@ -80,21 +80,21 @@ export function generateIconName(
   }
 
   const formattedName = name
-    .split(/\d/)[0]
+    .split(/\d/)[0]!
     .toLowerCase()
     .replace(/[^a-z0-9\-]+/g, '-')
     .replace(/\-+$/, '')
     .replace(/^\-+/, '');
 
   if (formattedName === 'edge' && version) {
-    const majorVersion = version.split('.')[0];
+    const majorVersion = version.split('.')[0]!;
     const isLegacyEdge = majorVersion >= '12' && majorVersion <= '18';
 
     return isLegacyEdge ? 'legacy-edge' : 'edge';
   }
 
   if (formattedName.endsWith('-mobile')) {
-    return formattedName.split('-')[0];
+    return formattedName.split('-')[0]!;
   }
 
   return formattedName;
diff --git a/static/app/components/events/errorItem.spec.tsx b/static/app/components/events/errorItem.spec.tsx
index c3d2b89bf85bcf..d4a39b7a205bce 100644
--- a/static/app/components/events/errorItem.spec.tsx
+++ b/static/app/components/events/errorItem.spec.tsx
@@ -50,7 +50,7 @@ describe('Issue error item', function () {
     expect(screen.getByText('File Path')).toBeInTheDocument();
     expect(screen.getAllByText(/redacted/)).toHaveLength(2);
 
-    await userEvent.hover(screen.getAllByText(/redacted/)[0]);
+    await userEvent.hover(screen.getAllByText(/redacted/)[0]!);
 
     expect(
       await screen.findByText(
diff --git a/static/app/components/events/eventAttachments.spec.tsx b/static/app/components/events/eventAttachments.spec.tsx
index 1788979fc11c8c..113d9d8d350ced 100644
--- a/static/app/components/events/eventAttachments.spec.tsx
+++ b/static/app/components/events/eventAttachments.spec.tsx
@@ -27,11 +27,11 @@ describe('EventAttachments', function () {
 
   const props = {
     group: undefined,
-    project: project,
+    project: project!,
     event,
   };
 
-  const attachmentsUrl = `/projects/${organization.slug}/${project.slug}/events/${event.id}/attachments/`;
+  const attachmentsUrl = `/projects/${organization.slug}/${project!.slug}/events/${event.id}/attachments/`;
 
   beforeEach(() => {
     ConfigStore.loadInitialData(ConfigFixture());
@@ -60,7 +60,7 @@ describe('EventAttachments', function () {
 
     expect(screen.getByRole('link', {name: 'configure limit'})).toHaveAttribute(
       'href',
-      `/settings/org-slug/projects/${project.slug}/security-and-privacy/`
+      `/settings/org-slug/projects/${project!.slug}/security-and-privacy/`
     );
 
     expect(
@@ -144,7 +144,7 @@ describe('EventAttachments', function () {
     });
 
     MockApiClient.addMockResponse({
-      url: `/projects/${organization.slug}/${project.slug}/events/${event.id}/attachments/1/?download`,
+      url: `/projects/${organization.slug}/${project!.slug}/events/${event.id}/attachments/1/?download`,
       body: 'file contents',
     });
 
@@ -180,7 +180,7 @@ describe('EventAttachments', function () {
 
     expect(await screen.findByText('Attachments (2)')).toBeInTheDocument();
 
-    await userEvent.click(screen.getAllByRole('button', {name: 'Delete'})[0]);
+    await userEvent.click(screen.getAllByRole('button', {name: 'Delete'})[0]!);
     await userEvent.click(
       within(screen.getByRole('dialog')).getByRole('button', {name: /delete/i})
     );
@@ -188,7 +188,7 @@ describe('EventAttachments', function () {
     // Should make the delete request and remove the attachment optimistically
     await waitFor(() => {
       expect(deleteMock).toHaveBeenCalled();
-      expect(screen.queryByTestId('pic_1.png')).not.toBeInTheDocument();
     });
+    expect(screen.queryByTestId('pic_1.png')).not.toBeInTheDocument();
   });
 });
diff --git a/static/app/components/events/eventCustomPerformanceMetrics.spec.tsx b/static/app/components/events/eventCustomPerformanceMetrics.spec.tsx
index c80372b9bfdc62..236be349d998ec 100644
--- a/static/app/components/events/eventCustomPerformanceMetrics.spec.tsx
+++ b/static/app/components/events/eventCustomPerformanceMetrics.spec.tsx
@@ -5,12 +5,8 @@ import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 
 import EventCustomPerformanceMetrics from 'sentry/components/events/eventCustomPerformanceMetrics';
 import type {Event} from 'sentry/types/event';
-import {browserHistory} from 'sentry/utils/browserHistory';
 
 describe('EventCustomPerformanceMetrics', function () {
-  beforeEach(function () {
-    browserHistory.push = jest.fn();
-  });
   it('should not render anything', function () {
     const {router, organization} = initializeOrg();
     render(
diff --git a/static/app/components/events/eventDrawer.tsx b/static/app/components/events/eventDrawer.tsx
index 59dd58926a59ec..fb26d789b2c55f 100644
--- a/static/app/components/events/eventDrawer.tsx
+++ b/static/app/components/events/eventDrawer.tsx
@@ -47,6 +47,9 @@ export const EventDrawerHeader = styled(DrawerHeader)`
   max-height: ${MIN_NAV_HEIGHT}px;
   box-shadow: none;
   border-bottom: 1px solid ${p => p.theme.border};
+  overflow: hidden;
+  text-overflow: ellipsis;
+  max-width: 100%;
 `;
 
 export const EventNavigator = styled('div')`
diff --git a/static/app/components/events/eventEntries.tsx b/static/app/components/events/eventEntries.tsx
index 609738ce596d10..bdc4d64addcafa 100644
--- a/static/app/components/events/eventEntries.tsx
+++ b/static/app/components/events/eventEntries.tsx
@@ -8,11 +8,10 @@ import EventReplay from 'sentry/components/events/eventReplay';
 import {EventGroupingInfoSection} from 'sentry/components/events/groupingInfo/groupingInfoSection';
 import {ActionableItems} from 'sentry/components/events/interfaces/crashContent/exception/actionableItems';
 import {actionableItemsEnabled} from 'sentry/components/events/interfaces/crashContent/exception/useActionableItems';
-import {CustomMetricsEventData} from 'sentry/components/metrics/customMetricsEventData';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {Entry, Event} from 'sentry/types/event';
-import {EntryType, EventOrGroupType} from 'sentry/types/event';
+import {EntryType} from 'sentry/types/event';
 import type {Group} from 'sentry/types/group';
 import type {Organization, SharedViewOrganization} from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
@@ -119,13 +118,6 @@ function EventEntries({
       {!isShare && <EventViewHierarchy event={event} project={project} />}
       {!isShare && <EventAttachments event={event} project={project} group={group} />}
       <EventSdk sdk={event.sdk} meta={event._meta?.sdk} />
-      {event.type === EventOrGroupType.TRANSACTION && event._metrics_summary && (
-        <CustomMetricsEventData
-          projectId={event.projectID}
-          metricsSummary={event._metrics_summary}
-          startTimestamp={event.startTimestamp}
-        />
-      )}
       {!isShare && event.groupID && (
         <EventGroupingInfoSection
           projectSlug={projectSlug}
@@ -203,12 +195,12 @@ export function Entries({
   return (
     <Fragment>
       {!hideBeforeReplayEntries &&
-        beforeReplayEntries.map((entry, entryIdx) => (
+        beforeReplayEntries!.map((entry, entryIdx) => (
           <EventEntry key={entryIdx} entry={entry} {...eventEntryProps} />
         ))}
       {!isShare && <EventHydrationDiff {...eventEntryProps} />}
       {!isShare && <EventReplay {...eventEntryProps} />}
-      {afterReplayEntries.map((entry, entryIdx) => {
+      {afterReplayEntries!.map((entry, entryIdx) => {
         if (hideBreadCrumbs && entry.type === EntryType.BREADCRUMBS) {
           return null;
         }
diff --git a/static/app/components/events/eventExtraData/index.spec.tsx b/static/app/components/events/eventExtraData/index.spec.tsx
index 0038ce1445fa49..1dd2c9d9bc429e 100644
--- a/static/app/components/events/eventExtraData/index.spec.tsx
+++ b/static/app/components/events/eventExtraData/index.spec.tsx
@@ -181,7 +181,7 @@ describe('EventExtraData', function () {
     await userEvent.click(screen.getByRole('button', {name: 'Expand'}));
     expect(await screen.findAllByText(/redacted/)).toHaveLength(10);
 
-    await userEvent.hover(screen.getAllByText(/redacted/)[0]);
+    await userEvent.hover(screen.getAllByText(/redacted/)[0]!);
 
     expect(
       await screen.findByText(
diff --git a/static/app/components/events/eventHydrationDiff/replayDiffContent.tsx b/static/app/components/events/eventHydrationDiff/replayDiffContent.tsx
index 3e7e89261d8309..04eebfc1885f00 100644
--- a/static/app/components/events/eventHydrationDiff/replayDiffContent.tsx
+++ b/static/app/components/events/eventHydrationDiff/replayDiffContent.tsx
@@ -7,7 +7,7 @@ import {t} from 'sentry/locale';
 import type {Event} from 'sentry/types/event';
 import type {Group} from 'sentry/types/group';
 import {getReplayDiffOffsetsFromEvent} from 'sentry/utils/replays/getDiffTimestamps';
-import useReplayReader from 'sentry/utils/replays/hooks/useReplayReader';
+import useLoadReplayReader from 'sentry/utils/replays/hooks/useLoadReplayReader';
 import {SectionKey} from 'sentry/views/issueDetails/streamline/context';
 import {InterimSection} from 'sentry/views/issueDetails/streamline/interimSection';
 
@@ -19,7 +19,7 @@ interface Props {
 }
 
 export default function ReplayDiffContent({event, group, orgSlug, replaySlug}: Props) {
-  const replayContext = useReplayReader({
+  const replayContext = useLoadReplayReader({
     orgSlug,
     replaySlug,
   });
diff --git a/static/app/components/events/eventProcessingErrors.tsx b/static/app/components/events/eventProcessingErrors.tsx
index 76aa7b59af88e8..5992862ebbeb92 100644
--- a/static/app/components/events/eventProcessingErrors.tsx
+++ b/static/app/components/events/eventProcessingErrors.tsx
@@ -45,47 +45,43 @@ export default function EventErrorCard({
 function EventErrorDescription({error}: {error: ErrorMessage}) {
   const {title, data: errorData} = error;
 
-  const cleanedData = useMemo(
-    () => {
-      const data = errorData || {};
-      if (data.message === 'None') {
-        // Python ensures a message string, but "None" doesn't make sense here
-        delete data.message;
-      }
-
-      if (typeof data.image_path === 'string') {
-        // Separate the image name for readability
-        const separator = /^([a-z]:\\|\\\\)/i.test(data.image_path) ? '\\' : '/';
-        const path = data.image_path.split(separator);
-        data.image_name = path.splice(-1, 1)[0];
-        data.image_path = path.length ? path.join(separator) + separator : '';
-      }
-
-      if (typeof data.server_time === 'string' && typeof data.sdk_time === 'string') {
-        data.message = t(
-          'Adjusted timestamps by %s',
-          moment
-            .duration(moment.utc(data.server_time).diff(moment.utc(data.sdk_time)))
-            .humanize()
-        );
-      }
-
-      return Object.entries(data)
-        .map(([key, value]) => ({
-          key,
-          value,
-          subject: keyMapping[key] || startCase(key),
-        }))
-        .filter(d => {
-          if (!d.value) {
-            return true;
-          }
-          return !!d.value;
-        });
-    },
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [errorData]
-  );
+  const cleanedData = useMemo(() => {
+    const data = errorData || {};
+    if (data.message === 'None') {
+      // Python ensures a message string, but "None" doesn't make sense here
+      delete data.message;
+    }
+
+    if (typeof data.image_path === 'string') {
+      // Separate the image name for readability
+      const separator = /^([a-z]:\\|\\\\)/i.test(data.image_path) ? '\\' : '/';
+      const path = data.image_path.split(separator);
+      data.image_name = path.splice(-1, 1)[0];
+      data.image_path = path.length ? path.join(separator) + separator : '';
+    }
+
+    if (typeof data.server_time === 'string' && typeof data.sdk_time === 'string') {
+      data.message = t(
+        'Adjusted timestamps by %s',
+        moment
+          .duration(moment.utc(data.server_time).diff(moment.utc(data.sdk_time)))
+          .humanize()
+      );
+    }
+
+    return Object.entries(data)
+      .map(([key, value]) => ({
+        key,
+        value,
+        subject: keyMapping[key] || startCase(key),
+      }))
+      .filter(d => {
+        if (!d.value) {
+          return true;
+        }
+        return !!d.value;
+      });
+  }, [errorData]);
 
   return <EventErrorCard title={title} data={cleanedData} />;
 }
diff --git a/static/app/components/events/eventReplay/index.spec.tsx b/static/app/components/events/eventReplay/index.spec.tsx
index f6d4b358ddc1d5..e989653ae5cd5a 100644
--- a/static/app/components/events/eventReplay/index.spec.tsx
+++ b/static/app/components/events/eventReplay/index.spec.tsx
@@ -8,17 +8,17 @@ import {ReplayRecordFixture} from 'sentry-fixture/replayRecord';
 import {render, screen} from 'sentry-test/reactTestingLibrary';
 
 import EventReplay from 'sentry/components/events/eventReplay';
+import useLoadReplayReader from 'sentry/utils/replays/hooks/useLoadReplayReader';
 import {
   useHaveSelectedProjectsSentAnyReplayEvents,
   useReplayOnboardingSidebarPanel,
 } from 'sentry/utils/replays/hooks/useReplayOnboarding';
-import useReplayReader from 'sentry/utils/replays/hooks/useReplayReader';
 import ReplayReader from 'sentry/utils/replays/replayReader';
 import useProjects from 'sentry/utils/useProjects';
 import type {ReplayError} from 'sentry/views/replays/types';
 
 jest.mock('sentry/utils/replays/hooks/useReplayOnboarding');
-jest.mock('sentry/utils/replays/hooks/useReplayReader');
+jest.mock('sentry/utils/replays/hooks/useLoadReplayReader');
 jest.mock('sentry/utils/useProjects');
 jest.mock('sentry/utils/replays/hooks/useReplayOnboarding');
 // Replay clip preview is very heavy, mock it out
@@ -70,7 +70,7 @@ const mockReplay = ReplayReader.factory({
   }),
 });
 
-jest.mocked(useReplayReader).mockImplementation(() => {
+jest.mocked(useLoadReplayReader).mockImplementation(() => {
   return {
     attachments: [],
     errors: mockErrors,
diff --git a/static/app/components/events/eventReplay/index.tsx b/static/app/components/events/eventReplay/index.tsx
index 383f6622815d7a..7910b45169568e 100644
--- a/static/app/components/events/eventReplay/index.tsx
+++ b/static/app/components/events/eventReplay/index.tsx
@@ -1,4 +1,4 @@
-import {lazy, useEffect} from 'react';
+import {lazy} from 'react';
 
 import ErrorBoundary from 'sentry/components/errorBoundary';
 import {ReplayClipSection} from 'sentry/components/events/eventReplay/replayClipSection';
@@ -8,7 +8,6 @@ import type {Group} from 'sentry/types/group';
 import useEventCanShowReplayUpsell from 'sentry/utils/event/useEventCanShowReplayUpsell';
 import {getReplayIdFromEvent} from 'sentry/utils/replays/getReplayIdFromEvent';
 import {useHaveSelectedProjectsSentAnyReplayEvents} from 'sentry/utils/replays/hooks/useReplayOnboarding';
-import useUrlParams from 'sentry/utils/useUrlParams';
 import {useIsSampleEvent} from 'sentry/views/issueDetails/utils';
 
 interface Props {
@@ -29,14 +28,6 @@ export default function EventReplay({event, group, projectSlug}: Props) {
   });
   const isSampleError = useIsSampleEvent();
 
-  const {setParamValue: setProjectId} = useUrlParams('project');
-
-  useEffect(() => {
-    if (canShowUpsell) {
-      setProjectId(upsellProjectId);
-    }
-  }, [upsellProjectId, setProjectId, canShowUpsell]);
-
   if (replayId) {
     return <ReplayClipSection event={event} replayId={replayId} group={group} />;
   }
diff --git a/static/app/components/events/eventReplay/replayClipPreview.spec.tsx b/static/app/components/events/eventReplay/replayClipPreview.spec.tsx
index defb415050dbf1..769c060962e726 100644
--- a/static/app/components/events/eventReplay/replayClipPreview.spec.tsx
+++ b/static/app/components/events/eventReplay/replayClipPreview.spec.tsx
@@ -7,15 +7,15 @@ import {initializeOrg} from 'sentry-test/initializeOrg';
 import {render as baseRender, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 
 import type {Organization} from 'sentry/types/organization';
-import useReplayReader from 'sentry/utils/replays/hooks/useReplayReader';
+import useLoadReplayReader from 'sentry/utils/replays/hooks/useLoadReplayReader';
 import ReplayReader from 'sentry/utils/replays/replayReader';
 import type RequestError from 'sentry/utils/requestError/requestError';
 
 import ReplayClipPreview from './replayClipPreview';
 
-jest.mock('sentry/utils/replays/hooks/useReplayReader');
+jest.mock('sentry/utils/replays/hooks/useLoadReplayReader');
 
-const mockUseReplayReader = jest.mocked(useReplayReader);
+const mockUseLoadReplayReader = jest.mocked(useLoadReplayReader);
 
 const mockOrgSlug = 'sentry-emerging-tech';
 const mockReplaySlug = 'replays:761104e184c64d439ee1014b72b4d83b';
@@ -48,7 +48,7 @@ const mockReplay = ReplayReader.factory({
   },
 });
 
-mockUseReplayReader.mockImplementation(() => {
+mockUseLoadReplayReader.mockImplementation(() => {
   return {
     attachments: [],
     errors: [],
@@ -120,7 +120,7 @@ describe('ReplayClipPreview', () => {
 
   it('Should render a placeholder when is fetching the replay data', () => {
     // Change the mocked hook to return a loading state
-    mockUseReplayReader.mockImplementationOnce(() => {
+    mockUseLoadReplayReader.mockImplementationOnce(() => {
       return {
         attachments: [],
         errors: [],
@@ -141,7 +141,7 @@ describe('ReplayClipPreview', () => {
 
   it('Should throw error when there is a fetch error', () => {
     // Change the mocked hook to return a fetch error
-    mockUseReplayReader.mockImplementationOnce(() => {
+    mockUseLoadReplayReader.mockImplementationOnce(() => {
       return {
         attachments: [],
         errors: [],
diff --git a/static/app/components/events/eventReplay/replayClipPreview.tsx b/static/app/components/events/eventReplay/replayClipPreview.tsx
index 54d2c3299800f6..8d4c011fafaffa 100644
--- a/static/app/components/events/eventReplay/replayClipPreview.tsx
+++ b/static/app/components/events/eventReplay/replayClipPreview.tsx
@@ -2,7 +2,7 @@ import {useMemo} from 'react';
 
 import ReplayClipPreviewPlayer from 'sentry/components/events/eventReplay/replayClipPreviewPlayer';
 import {Provider as ReplayContextProvider} from 'sentry/components/replays/replayContext';
-import useReplayReader from 'sentry/utils/replays/hooks/useReplayReader';
+import useLoadReplayReader from 'sentry/utils/replays/hooks/useLoadReplayReader';
 
 interface ReplayClipPreviewProps
   extends Omit<
@@ -33,7 +33,7 @@ function ReplayClipPreview({
     [clipOffsets.durationBeforeMs, clipOffsets.durationAfterMs, eventTimestampMs]
   );
 
-  const replayReaderResult = useReplayReader({
+  const replayReaderResult = useLoadReplayReader({
     orgSlug,
     replaySlug,
     clipWindow,
diff --git a/static/app/components/events/eventReplay/replayClipPreviewPlayer.tsx b/static/app/components/events/eventReplay/replayClipPreviewPlayer.tsx
index 6094ae9c35957d..fe4cccb6050f13 100644
--- a/static/app/components/events/eventReplay/replayClipPreviewPlayer.tsx
+++ b/static/app/components/events/eventReplay/replayClipPreviewPlayer.tsx
@@ -18,7 +18,7 @@ import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import {trackAnalytics} from 'sentry/utils/analytics';
 import type {TabKey} from 'sentry/utils/replays/hooks/useActiveReplayTab';
-import type useReplayReader from 'sentry/utils/replays/hooks/useReplayReader';
+import type useLoadReplayReader from 'sentry/utils/replays/hooks/useLoadReplayReader';
 import type RequestError from 'sentry/utils/requestError/requestError';
 import useRouteAnalyticsParams from 'sentry/utils/routeAnalytics/useRouteAnalyticsParams';
 import useOrganization from 'sentry/utils/useOrganization';
@@ -28,7 +28,7 @@ import type {ReplayRecord} from 'sentry/views/replays/types';
 interface ReplayClipPreviewPlayerProps {
   analyticsContext: string;
   orgSlug: string;
-  replayReaderResult: ReturnType<typeof useReplayReader>;
+  replayReaderResult: ReturnType<typeof useLoadReplayReader>;
   focusTab?: TabKey;
   fullReplayButtonProps?: Partial<Omit<LinkButtonProps, 'external'>>;
   handleBackClick?: () => void;
diff --git a/static/app/components/events/eventReplay/replayInlineOnboardingPanel.tsx b/static/app/components/events/eventReplay/replayInlineOnboardingPanel.tsx
index f8f1277bab45e3..93d6ff2714dc9b 100644
--- a/static/app/components/events/eventReplay/replayInlineOnboardingPanel.tsx
+++ b/static/app/components/events/eventReplay/replayInlineOnboardingPanel.tsx
@@ -60,10 +60,11 @@ export default function ReplayInlineOnboardingPanel({
           </BannerDescription>
           <ActionButton>
             <Button
+              type="button"
               analyticsEventName="Clicked Replay Onboarding CTA Set Up Button in Issue Details"
               analyticsEventKey="issue_details.replay-onboarding-cta-set-up-button-clicked"
               analyticsParams={{platform}}
-              onClick={activateSidebar}
+              onClick={() => activateSidebar(projectId)}
             >
               {t('Set Up Now')}
             </Button>
diff --git a/static/app/components/events/eventReplay/replayPreview.spec.tsx b/static/app/components/events/eventReplay/replayPreview.spec.tsx
index 3197984e1413dc..fc57d720f8286a 100644
--- a/static/app/components/events/eventReplay/replayPreview.spec.tsx
+++ b/static/app/components/events/eventReplay/replayPreview.spec.tsx
@@ -6,15 +6,15 @@ import {ReplayRecordFixture} from 'sentry-fixture/replayRecord';
 import {initializeOrg} from 'sentry-test/initializeOrg';
 import {render as baseRender, screen} from 'sentry-test/reactTestingLibrary';
 
-import useReplayReader from 'sentry/utils/replays/hooks/useReplayReader';
+import useLoadReplayReader from 'sentry/utils/replays/hooks/useLoadReplayReader';
 import ReplayReader from 'sentry/utils/replays/replayReader';
 import type RequestError from 'sentry/utils/requestError/requestError';
 
 import ReplayPreview from './replayPreview';
 
-jest.mock('sentry/utils/replays/hooks/useReplayReader');
+jest.mock('sentry/utils/replays/hooks/useLoadReplayReader');
 
-const mockUseReplayReader = jest.mocked(useReplayReader);
+const mockUseLoadReplayReader = jest.mocked(useLoadReplayReader);
 
 const mockOrgSlug = 'sentry-emerging-tech';
 const mockReplaySlug = 'replays:761104e184c64d439ee1014b72b4d83b';
@@ -39,7 +39,7 @@ const mockReplay = ReplayReader.factory({
   }),
 });
 
-mockUseReplayReader.mockImplementation(() => {
+mockUseLoadReplayReader.mockImplementation(() => {
   return {
     attachments: [],
     errors: [],
@@ -84,7 +84,7 @@ const defaultProps = {
 describe('ReplayPreview', () => {
   it('Should render a placeholder when is fetching the replay data', () => {
     // Change the mocked hook to return a loading state
-    mockUseReplayReader.mockImplementationOnce(() => {
+    mockUseLoadReplayReader.mockImplementationOnce(() => {
       return {
         attachments: [],
         errors: [],
@@ -105,7 +105,7 @@ describe('ReplayPreview', () => {
 
   it('Should throw error when there is a fetch error', () => {
     // Change the mocked hook to return a fetch error
-    mockUseReplayReader.mockImplementationOnce(() => {
+    mockUseLoadReplayReader.mockImplementationOnce(() => {
       return {
         attachments: [],
         errors: [],
diff --git a/static/app/components/events/eventReplay/replayPreview.tsx b/static/app/components/events/eventReplay/replayPreview.tsx
index e531a79e32e631..8a5575a62871c0 100644
--- a/static/app/components/events/eventReplay/replayPreview.tsx
+++ b/static/app/components/events/eventReplay/replayPreview.tsx
@@ -15,7 +15,7 @@ import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import {trackAnalytics} from 'sentry/utils/analytics';
 import type {TabKey} from 'sentry/utils/replays/hooks/useActiveReplayTab';
-import useReplayReader from 'sentry/utils/replays/hooks/useReplayReader';
+import useLoadReplayReader from 'sentry/utils/replays/hooks/useLoadReplayReader';
 import type RequestError from 'sentry/utils/requestError/requestError';
 import useRouteAnalyticsParams from 'sentry/utils/routeAnalytics/useRouteAnalyticsParams';
 import useOrganization from 'sentry/utils/useOrganization';
@@ -60,7 +60,7 @@ function ReplayPreview({
   orgSlug,
   replaySlug,
 }: Props) {
-  const {fetching, replay, replayRecord, fetchError, replayId} = useReplayReader({
+  const {fetching, replay, replayRecord, fetchError, replayId} = useLoadReplayReader({
     orgSlug,
     replaySlug,
   });
diff --git a/static/app/components/events/eventStatisticalDetector/aggregateSpanDiff.tsx b/static/app/components/events/eventStatisticalDetector/aggregateSpanDiff.tsx
index 90d06bf3cc21d9..e1013e44ebdc8b 100644
--- a/static/app/components/events/eventStatisticalDetector/aggregateSpanDiff.tsx
+++ b/static/app/components/events/eventStatisticalDetector/aggregateSpanDiff.tsx
@@ -149,8 +149,8 @@ function AggregateSpanDiff({event, project}: AggregateSpanDiffProps) {
         };
 
         if (causeType === 'throughput') {
-          const throughputBefore = row[`epm_by_timestamp(less,${breakpoint})`];
-          const throughputAfter = row[`epm_by_timestamp(greater,${breakpoint})`];
+          const throughputBefore = row[`epm_by_timestamp(less,${breakpoint})`]!;
+          const throughputAfter = row[`epm_by_timestamp(greater,${breakpoint})`]!;
           return {
             ...commonProps,
             throughputBefore,
@@ -160,9 +160,9 @@ function AggregateSpanDiff({event, project}: AggregateSpanDiffProps) {
         }
 
         const durationBefore =
-          row[`avg_by_timestamp(span.self_time,less,${breakpoint})`] / 1e3;
+          row[`avg_by_timestamp(span.self_time,less,${breakpoint})`]! / 1e3;
         const durationAfter =
-          row[`avg_by_timestamp(span.self_time,greater,${breakpoint})`] / 1e3;
+          row[`avg_by_timestamp(span.self_time,greater,${breakpoint})`]! / 1e3;
         return {
           ...commonProps,
           durationBefore,
diff --git a/static/app/components/events/eventStatisticalDetector/eventComparison/eventDisplay.tsx b/static/app/components/events/eventStatisticalDetector/eventComparison/eventDisplay.tsx
index 37a80abb359873..a4af44ae8ccc73 100644
--- a/static/app/components/events/eventStatisticalDetector/eventComparison/eventDisplay.tsx
+++ b/static/app/components/events/eventStatisticalDetector/eventComparison/eventDisplay.tsx
@@ -163,7 +163,7 @@ function EventDisplay({
 
   useEffect(() => {
     if (defined(eventIds) && eventIds.length > 0 && !selectedEventId) {
-      setSelectedEventId(eventIds[0]);
+      setSelectedEventId(eventIds[0]!);
     }
   }, [eventIds, selectedEventId]);
 
@@ -242,7 +242,7 @@ function EventDisplay({
                 icon={<IconChevron direction="left" size={BUTTON_ICON_SIZE} />}
                 onPaginate={() => {
                   if (hasPrev) {
-                    setSelectedEventId(eventIds[eventIdIndex - 1]);
+                    setSelectedEventId(eventIds[eventIdIndex - 1]!);
                   }
                 }}
               />
@@ -252,7 +252,7 @@ function EventDisplay({
                 icon={<IconChevron direction="right" size={BUTTON_ICON_SIZE} />}
                 onPaginate={() => {
                   if (hasNext) {
-                    setSelectedEventId(eventIds[eventIdIndex + 1]);
+                    setSelectedEventId(eventIds[eventIdIndex + 1]!);
                   }
                 }}
               />
diff --git a/static/app/components/events/eventStatisticalDetector/eventThroughput.tsx b/static/app/components/events/eventStatisticalDetector/eventThroughput.tsx
index 40c86132577dc4..438b82d19ab8d0 100644
--- a/static/app/components/events/eventStatisticalDetector/eventThroughput.tsx
+++ b/static/app/components/events/eventStatisticalDetector/eventThroughput.tsx
@@ -100,7 +100,7 @@ function EventThroughputInner({event, group}: EventThroughputProps) {
     const result = transformEventStats(
       stats.series.map(item => [item.timestamp, [{count: item.value / item.interval}]]),
       'throughput()'
-    )[0];
+    )[0]!;
 
     result.markLine = {
       data: [
@@ -293,7 +293,7 @@ function useThroughputStats({datetime, event, group}: UseThroughputStatsOptions)
     if (data.length < 2) {
       return null;
     }
-    return data[1][0] - data[0][0];
+    return data[1]![0] - data[0]![0];
   }, [transactionStats?.data]);
 
   const transactionData = useMemo(() => {
@@ -305,7 +305,7 @@ function useThroughputStats({datetime, event, group}: UseThroughputStatsOptions)
       const timestamp = curr[0];
       const bucket = Math.floor(timestamp / BUCKET_SIZE) * BUCKET_SIZE;
       const prev = acc[acc.length - 1];
-      const value = curr[1][0].count;
+      const value = curr[1]![0]!.count;
 
       if (prev?.timestamp === bucket) {
         prev.value += value;
diff --git a/static/app/components/events/eventStatisticalDetector/spanOpBreakdown.tsx b/static/app/components/events/eventStatisticalDetector/spanOpBreakdown.tsx
index 2b84d78ec6405b..d61515d196f450 100644
--- a/static/app/components/events/eventStatisticalDetector/spanOpBreakdown.tsx
+++ b/static/app/components/events/eventStatisticalDetector/spanOpBreakdown.tsx
@@ -121,13 +121,13 @@ function EventSpanOpBreakdown({event}: {event: Event}) {
 
   const spanOpDiffs: SpanOpDiff[] = SPAN_OPS.map(op => {
     const preBreakpointValue =
-      (preBreakpointData?.data[0][`p95(spans.${op})`] as string) || undefined;
+      (preBreakpointData?.data[0]![`p95(spans.${op})`] as string) || undefined;
     const preBreakpointValueAsNumber = preBreakpointValue
       ? parseInt(preBreakpointValue, 10)
       : 0;
 
     const postBreakpointValue =
-      (postBreakpointData?.data[0][`p95(spans.${op})`] as string) || undefined;
+      (postBreakpointData?.data[0]![`p95(spans.${op})`] as string) || undefined;
     const postBreakpointValueAsNumber = postBreakpointValue
       ? parseInt(postBreakpointValue, 10)
       : 0;
diff --git a/static/app/components/events/eventTags/eventTagsTree.spec.tsx b/static/app/components/events/eventTags/eventTagsTree.spec.tsx
index 0f417a8c25aa47..90e9c6a3396dc8 100644
--- a/static/app/components/events/eventTags/eventTagsTree.spec.tsx
+++ b/static/app/components/events/eventTags/eventTagsTree.spec.tsx
@@ -255,7 +255,7 @@ describe('EventTagsTree', function () {
     expect(dropdown).toBeInTheDocument();
 
     const errorRows = screen.queryAllByTestId('tag-tree-row-errors');
-    expect(errorRows.length).toBe(2);
+    expect(errorRows).toHaveLength(2);
   });
 
   it('avoids rendering nullish tags', async function () {
diff --git a/static/app/components/events/eventTags/eventTagsTree.tsx b/static/app/components/events/eventTags/eventTagsTree.tsx
index f112a5d40eac2a..d607b2c0fd1679 100644
--- a/static/app/components/events/eventTags/eventTagsTree.tsx
+++ b/static/app/components/events/eventTags/eventTagsTree.tsx
@@ -100,7 +100,7 @@ function getTagTreeRows({
     const branchRows = getTagTreeRows({
       ...props,
       tagKey: tag,
-      content: content.subtree[tag],
+      content: content.subtree[tag]!,
       spacerCount: spacerCount + 1,
       isLast: i === subtreeTags.length - 1,
       // Encoding the trunk index with the branch index ensures uniqueness for the key
@@ -154,7 +154,7 @@ function TagTreeColumns({
     // root parent so that we do not split up roots/branches when forming columns
     const tagTreeRowGroups: React.ReactNode[][] = Object.entries(tagTree).map(
       ([tagKey, content], i) =>
-        getTagTreeRows({tagKey, content, uniqueKey: `${i}`, project: project, ...props})
+        getTagTreeRows({tagKey, content, uniqueKey: `${i}`, project, ...props})
     );
     // Get the total number of TagTreeRow components to be rendered, and a goal size for each column
     const tagTreeRowTotal = tagTreeRowGroups.reduce(
diff --git a/static/app/components/events/eventTagsAndScreenshot/index.spec.tsx b/static/app/components/events/eventTagsAndScreenshot/index.spec.tsx
index 1b15b8a38b8af8..e33c346f48b647 100644
--- a/static/app/components/events/eventTagsAndScreenshot/index.spec.tsx
+++ b/static/app/components/events/eventTagsAndScreenshot/index.spec.tsx
@@ -221,7 +221,7 @@ describe('EventTagsAndScreenshot', function () {
       const allTags = applicationTags.concat(customTags);
       const testEvent = EventFixture({tags: allTags});
       render(<EventTagsAndScreenshot projectSlug={project.slug} event={testEvent} />, {
-        organization: organization,
+        organization,
       });
       expect(mockDetailedProject).toHaveBeenCalled();
       expect(await screen.findByTestId('loading-indicator')).not.toBeInTheDocument();
@@ -260,7 +260,7 @@ describe('EventTagsAndScreenshot', function () {
       ];
       const testEvent = EventFixture({tags: applicationTags});
       render(<EventTagsAndScreenshot projectSlug={project.slug} event={testEvent} />, {
-        organization: organization,
+        organization,
       });
       expect(mockDetailedProject).toHaveBeenCalled();
       expect(await screen.findByTestId('loading-indicator')).not.toBeInTheDocument();
@@ -311,7 +311,7 @@ describe('EventTagsAndScreenshot', function () {
       expect(screen.getByText('View screenshot')).toBeInTheDocument();
       expect(screen.getByTestId('image-viewer')).toHaveAttribute(
         'src',
-        `/api/0/projects/${organization.slug}/${project.slug}/events/${event.id}/attachments/${attachments[1].id}/?download`
+        `/api/0/projects/${organization.slug}/${project.slug}/events/${event.id}/attachments/${attachments[1]!.id}/?download`
       );
 
       // Display help text when hovering question element
@@ -354,7 +354,7 @@ describe('EventTagsAndScreenshot', function () {
       expect(await screen.findByText('View screenshot')).toBeInTheDocument();
       expect(screen.getByTestId('image-viewer')).toHaveAttribute(
         'src',
-        `/api/0/projects/${organization.slug}/${project.slug}/events/${event.id}/attachments/${attachments[1].id}/?download`
+        `/api/0/projects/${organization.slug}/${project.slug}/events/${event.id}/attachments/${attachments[1]!.id}/?download`
       );
 
       expect(screen.getByTestId('screenshot-data-section')?.textContent).toContain(
@@ -403,7 +403,7 @@ describe('EventTagsAndScreenshot', function () {
       expect(screen.getByText('View screenshot')).toBeInTheDocument();
       expect(screen.getByTestId('image-viewer')).toHaveAttribute(
         'src',
-        `/api/0/projects/${organization.slug}/${project.slug}/events/${event.id}/attachments/${moreAttachments[1].id}/?download`
+        `/api/0/projects/${organization.slug}/${project.slug}/events/${event.id}/attachments/${moreAttachments[1]!.id}/?download`
       );
 
       await userEvent.click(screen.getByRole('button', {name: 'Next Screenshot'}));
@@ -415,7 +415,7 @@ describe('EventTagsAndScreenshot', function () {
       expect(screen.getByText('View screenshot')).toBeInTheDocument();
       expect(screen.getByTestId('image-viewer')).toHaveAttribute(
         'src',
-        `/api/0/projects/${organization.slug}/${project.slug}/events/${event.id}/attachments/${moreAttachments[2].id}/?download`
+        `/api/0/projects/${organization.slug}/${project.slug}/events/${event.id}/attachments/${moreAttachments[2]!.id}/?download`
       );
     });
 
@@ -473,7 +473,7 @@ describe('EventTagsAndScreenshot', function () {
       expect(screen.getByText('View screenshot')).toBeInTheDocument();
       expect(screen.getByTestId('image-viewer')).toHaveAttribute(
         'src',
-        `/api/0/projects/${organization.slug}/${project.slug}/events/${event.id}/attachments/${attachments[1].id}/?download`
+        `/api/0/projects/${organization.slug}/${project.slug}/events/${event.id}/attachments/${attachments[1]!.id}/?download`
       );
     });
   });
diff --git a/static/app/components/events/eventTagsAndScreenshot/screenshot/modal.tsx b/static/app/components/events/eventTagsAndScreenshot/screenshot/modal.tsx
index 7fd8a8e250f2e9..a301859b702c01 100644
--- a/static/app/components/events/eventTagsAndScreenshot/screenshot/modal.tsx
+++ b/static/app/components/events/eventTagsAndScreenshot/screenshot/modal.tsx
@@ -65,7 +65,7 @@ export default function ScreenshotModal({
       if (attachments.length) {
         const newIndex = currentAttachmentIndex + delta;
         if (newIndex >= 0 && newIndex < attachments.length) {
-          setCurrentAttachment(attachments[newIndex]);
+          setCurrentAttachment(attachments[newIndex]!);
         }
       }
     },
diff --git a/static/app/components/events/eventTagsAndScreenshot/screenshot/screenshotDataSection.tsx b/static/app/components/events/eventTagsAndScreenshot/screenshot/screenshotDataSection.tsx
index d19b2301cdfc56..6527ad69a9ff0f 100644
--- a/static/app/components/events/eventTagsAndScreenshot/screenshot/screenshotDataSection.tsx
+++ b/static/app/components/events/eventTagsAndScreenshot/screenshot/screenshotDataSection.tsx
@@ -63,7 +63,7 @@ export function ScreenshotDataSection({
   const [screenshotInFocus, setScreenshotInFocus] = useState<number>(0);
 
   const showScreenshot = !isShare && !!screenshots.length;
-  const screenshot = screenshots[screenshotInFocus];
+  const screenshot = screenshots[screenshotInFocus]!;
 
   const handleDeleteScreenshot = (attachmentId: string) => {
     deleteAttachment({
diff --git a/static/app/components/events/eventTagsAndScreenshot/screenshot/screenshotPagination.tsx b/static/app/components/events/eventTagsAndScreenshot/screenshot/screenshotPagination.tsx
index d5c1d2f43f40b5..07de19714552f4 100644
--- a/static/app/components/events/eventTagsAndScreenshot/screenshot/screenshotPagination.tsx
+++ b/static/app/components/events/eventTagsAndScreenshot/screenshot/screenshotPagination.tsx
@@ -1,4 +1,3 @@
-// eslint-disable-next-line no-restricted-imports
 import type {ReactEventHandler} from 'react';
 import styled from '@emotion/styled';
 
diff --git a/static/app/components/events/eventTagsAndScreenshot/tags.tsx b/static/app/components/events/eventTagsAndScreenshot/tags.tsx
index f419307fe51416..12fb8ba10c380c 100644
--- a/static/app/components/events/eventTagsAndScreenshot/tags.tsx
+++ b/static/app/components/events/eventTagsAndScreenshot/tags.tsx
@@ -56,9 +56,12 @@ export const EventTagsDataSection = forwardRef<HTMLElement, Props>(
       });
     }, [event.tags]);
 
+    // Prevent drawer button from appearing on performance pages
+    const isOnIssueDetails = location.pathname.includes('/issues/');
+
     const actions = (
       <ButtonBar gap={1}>
-        {hasStreamlinedUI && event.groupID && (
+        {hasStreamlinedUI && event.groupID && isOnIssueDetails && (
           <LinkButton
             to={{
               pathname: `${location.pathname}${TabPaths[Tab.TAGS]}`,
diff --git a/static/app/components/events/eventViewHierarchy.spec.tsx b/static/app/components/events/eventViewHierarchy.spec.tsx
index 2455dc4f2922fe..06e38cbc521f98 100644
--- a/static/app/components/events/eventViewHierarchy.spec.tsx
+++ b/static/app/components/events/eventViewHierarchy.spec.tsx
@@ -53,8 +53,8 @@ const organization = OrganizationFixture({
 const event = EventFixture();
 
 describe('Event View Hierarchy', function () {
-  let mockAttachment;
-  let mockProject;
+  let mockAttachment!: ReturnType<typeof EventAttachmentFixture>;
+  let mockProject!: ReturnType<typeof ProjectFixture>;
   beforeEach(function () {
     mockAttachment = EventAttachmentFixture({type: 'event.view_hierarchy'});
     mockProject = ProjectFixture();
diff --git a/static/app/components/events/eventVitals.tsx b/static/app/components/events/eventVitals.tsx
index 05c335b22a1961..91b7501fec1849 100644
--- a/static/app/components/events/eventVitals.tsx
+++ b/static/app/components/events/eventVitals.tsx
@@ -119,7 +119,7 @@ interface EventVitalProps extends Props {
 }
 
 function EventVital({event, name, vital}: EventVitalProps) {
-  const value = event.measurements?.[name].value ?? null;
+  const value = event.measurements?.[name]!.value ?? null;
   if (value === null || !vital) {
     return null;
   }
diff --git a/static/app/components/events/featureFlags/eventFeatureFlagList.spec.tsx b/static/app/components/events/featureFlags/eventFeatureFlagList.spec.tsx
index 817f37e932878f..0e8c82b5ccd04f 100644
--- a/static/app/components/events/featureFlags/eventFeatureFlagList.spec.tsx
+++ b/static/app/components/events/featureFlags/eventFeatureFlagList.spec.tsx
@@ -176,8 +176,8 @@ describe('EventFeatureFlagList', function () {
     // expect enableReplay to be preceding webVitalsFlag
     expect(
       screen
-        .getByText(webVitalsFlag.flag)
-        .compareDocumentPosition(screen.getByText(enableReplay.flag))
+        .getByText(webVitalsFlag!.flag)
+        .compareDocumentPosition(screen.getByText(enableReplay!.flag))
     ).toBe(document.DOCUMENT_POSITION_PRECEDING);
 
     const sortControl = screen.getByRole('button', {
@@ -189,8 +189,8 @@ describe('EventFeatureFlagList', function () {
     // expect enableReplay to be following webVitalsFlag
     expect(
       screen
-        .getByText(webVitalsFlag.flag)
-        .compareDocumentPosition(screen.getByText(enableReplay.flag))
+        .getByText(webVitalsFlag!.flag)
+        .compareDocumentPosition(screen.getByText(enableReplay!.flag))
     ).toBe(document.DOCUMENT_POSITION_FOLLOWING);
 
     await userEvent.click(sortControl);
@@ -199,8 +199,8 @@ describe('EventFeatureFlagList', function () {
     // expect enableReplay to be preceding webVitalsFlag, A-Z sort by default
     expect(
       screen
-        .getByText(webVitalsFlag.flag)
-        .compareDocumentPosition(screen.getByText(enableReplay.flag))
+        .getByText(webVitalsFlag!.flag)
+        .compareDocumentPosition(screen.getByText(enableReplay!.flag))
     ).toBe(document.DOCUMENT_POSITION_PRECEDING);
 
     await userEvent.click(sortControl);
@@ -209,8 +209,8 @@ describe('EventFeatureFlagList', function () {
     // expect enableReplay to be following webVitalsFlag
     expect(
       screen
-        .getByText(webVitalsFlag.flag)
-        .compareDocumentPosition(screen.getByText(enableReplay.flag))
+        .getByText(webVitalsFlag!.flag)
+        .compareDocumentPosition(screen.getByText(enableReplay!.flag))
     ).toBe(document.DOCUMENT_POSITION_FOLLOWING);
   });
 
@@ -223,7 +223,7 @@ describe('EventFeatureFlagList', function () {
     expect(search).not.toBeInTheDocument();
     expect(screen.getByRole('button', {name: 'Set Up Integration'})).toBeInTheDocument();
     expect(
-      screen.queryByText('No feature flags were found for this event')
+      screen.getByText('No feature flags were found for this event')
     ).toBeInTheDocument();
   });
 
diff --git a/static/app/components/events/featureFlags/eventFeatureFlagList.tsx b/static/app/components/events/featureFlags/eventFeatureFlagList.tsx
index 550a4d2b3e8ca7..1e9380f6131a91 100644
--- a/static/app/components/events/featureFlags/eventFeatureFlagList.tsx
+++ b/static/app/components/events/featureFlags/eventFeatureFlagList.tsx
@@ -24,7 +24,7 @@ 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';
-import type {Group} from 'sentry/types/group';
+import {type Group, IssueCategory} from 'sentry/types/group';
 import type {Project} from 'sentry/types/project';
 import {trackAnalytics} from 'sentry/utils/analytics';
 import {useFeedbackForm} from 'sentry/utils/useFeedbackForm';
@@ -197,6 +197,10 @@ export function EventFeatureFlagList({
     }
   }, [hasFlags, hydratedFlags.length, organization]);
 
+  if (group.issueCategory !== IssueCategory.ERROR) {
+    return null;
+  }
+
   if (showCTA) {
     return <FeatureFlagInlineCTA projectId={event.projectID} />;
   }
diff --git a/static/app/components/events/featureFlags/featureFlagDrawer.spec.tsx b/static/app/components/events/featureFlags/featureFlagDrawer.spec.tsx
index d7f38d6317839c..cff3ed55b90c33 100644
--- a/static/app/components/events/featureFlags/featureFlagDrawer.spec.tsx
+++ b/static/app/components/events/featureFlags/featureFlagDrawer.spec.tsx
@@ -25,7 +25,7 @@ async function renderFlagDrawer() {
     }));
   render(<EventFeatureFlagList {...MOCK_DATA_SECTION_PROPS} />);
   await userEvent.click(screen.getByRole('button', {name: 'View All'}));
-  return within(screen.getByRole('complementary', {name: 'Feature flags drawer'}));
+  return screen.getByRole('complementary', {name: 'Feature flags drawer'});
 }
 
 describe('FeatureFlagDrawer', function () {
@@ -45,25 +45,33 @@ describe('FeatureFlagDrawer', function () {
   });
   it('renders the drawer as expected', async function () {
     const drawerScreen = await renderFlagDrawer();
-    expect(drawerScreen.getByRole('button', {name: 'Close Drawer'})).toBeInTheDocument();
+    expect(
+      within(drawerScreen).getByRole('button', {name: 'Close Drawer'})
+    ).toBeInTheDocument();
 
     // Inner drawer flags
     const {event, group} = MOCK_DATA_SECTION_PROPS;
-    expect(drawerScreen.getByText(group.shortId)).toBeInTheDocument();
-    expect(drawerScreen.getByText(event.id.slice(0, 8))).toBeInTheDocument();
+    expect(within(drawerScreen).getByText(group.shortId)).toBeInTheDocument();
+    expect(within(drawerScreen).getByText(event.id.slice(0, 8))).toBeInTheDocument();
     expect(
-      drawerScreen.getByText('Feature Flags', {selector: 'span'})
+      within(drawerScreen).getByText('Feature Flags', {selector: 'span'})
     ).toBeInTheDocument();
 
     // Header & Controls
-    expect(drawerScreen.getByText('Feature Flags', {selector: 'h3'})).toBeInTheDocument();
-    expect(drawerScreen.getByRole('textbox', {name: 'Search Flags'})).toBeInTheDocument();
-    expect(drawerScreen.getByRole('button', {name: 'Sort Flags'})).toBeInTheDocument();
+    expect(
+      within(drawerScreen).getByText('Feature Flags', {selector: 'h3'})
+    ).toBeInTheDocument();
+    expect(
+      within(drawerScreen).getByRole('textbox', {name: 'Search Flags'})
+    ).toBeInTheDocument();
+    expect(
+      within(drawerScreen).getByRole('button', {name: 'Sort Flags'})
+    ).toBeInTheDocument();
 
     // Contents
     for (const {flag, result} of MOCK_FLAGS) {
-      expect(drawerScreen.getByText(flag)).toBeInTheDocument();
-      expect(drawerScreen.getAllByText(result.toString())[0]).toBeInTheDocument();
+      expect(within(drawerScreen).getByText(flag)).toBeInTheDocument();
+      expect(within(drawerScreen).getAllByText(result.toString())[0]).toBeInTheDocument();
     }
   });
 
@@ -71,16 +79,16 @@ describe('FeatureFlagDrawer', function () {
     const drawerScreen = await renderFlagDrawer();
 
     const [webVitalsFlag, enableReplay] = MOCK_FLAGS.filter(f => f.result === true);
-    expect(drawerScreen.getByText(webVitalsFlag.flag)).toBeInTheDocument();
-    expect(drawerScreen.getByText(enableReplay.flag)).toBeInTheDocument();
+    expect(within(drawerScreen).getByText(webVitalsFlag!.flag)).toBeInTheDocument();
+    expect(within(drawerScreen).getByText(enableReplay!.flag)).toBeInTheDocument();
 
-    const searchInput = drawerScreen.getByRole('textbox', {
+    const searchInput = within(drawerScreen).getByRole('textbox', {
       name: 'Search Flags',
     });
-    await userEvent.type(searchInput, webVitalsFlag.flag);
+    await userEvent.type(searchInput, webVitalsFlag!.flag);
 
-    expect(drawerScreen.getByText(webVitalsFlag.flag)).toBeInTheDocument();
-    expect(drawerScreen.queryByText(enableReplay.flag)).not.toBeInTheDocument();
+    expect(within(drawerScreen).getByText(webVitalsFlag!.flag)).toBeInTheDocument();
+    expect(within(drawerScreen).queryByText(enableReplay!.flag)).not.toBeInTheDocument();
   });
 
   it('allows sort dropdown to affect displayed flags', async function () {
@@ -90,62 +98,69 @@ describe('FeatureFlagDrawer', function () {
 
     // the flags are reversed by default, so webVitalsFlag should be following enableReplay
     expect(
-      drawerScreen
-        .getByText(enableReplay.flag)
-        .compareDocumentPosition(drawerScreen.getByText(webVitalsFlag.flag))
+      within(drawerScreen)
+        .getByText(enableReplay!.flag)
+        .compareDocumentPosition(within(drawerScreen).getByText(webVitalsFlag!.flag))
     ).toBe(document.DOCUMENT_POSITION_FOLLOWING);
 
-    const sortControl = drawerScreen.getByRole('button', {
+    const sortControl = within(drawerScreen).getByRole('button', {
       name: 'Sort Flags',
     });
     await userEvent.click(sortControl);
-    await userEvent.click(drawerScreen.getByRole('option', {name: 'Oldest First'}));
+    await userEvent.click(
+      within(drawerScreen).getByRole('option', {name: 'Oldest First'})
+    );
 
     // expect webVitalsFlag to be preceding enableReplay
     expect(
-      drawerScreen
-        .getByText(enableReplay.flag)
-        .compareDocumentPosition(drawerScreen.getByText(webVitalsFlag.flag))
+      within(drawerScreen)
+        .getByText(enableReplay!.flag)
+        .compareDocumentPosition(within(drawerScreen).getByText(webVitalsFlag!.flag))
     ).toBe(document.DOCUMENT_POSITION_PRECEDING);
 
     await userEvent.click(sortControl);
-    await userEvent.click(drawerScreen.getByRole('option', {name: 'Alphabetical'}));
+    await userEvent.click(
+      within(drawerScreen).getByRole('option', {name: 'Alphabetical'})
+    );
     await userEvent.click(sortControl);
-    await userEvent.click(drawerScreen.getByRole('option', {name: 'Z-A'}));
+    await userEvent.click(within(drawerScreen).getByRole('option', {name: 'Z-A'}));
 
     // enableReplay follows webVitalsFlag in Z-A sort
     expect(
-      drawerScreen
-        .getByText(webVitalsFlag.flag)
-        .compareDocumentPosition(drawerScreen.getByText(enableReplay.flag))
+      within(drawerScreen)
+        .getByText(webVitalsFlag!.flag)
+        .compareDocumentPosition(within(drawerScreen).getByText(enableReplay!.flag))
     ).toBe(document.DOCUMENT_POSITION_FOLLOWING);
   });
 
   it('renders a sort dropdown with Evaluation Order as the default', async function () {
     const drawerScreen = await renderFlagDrawer();
 
-    const control = drawerScreen.getByRole('button', {name: 'Sort Flags'});
+    const control = within(drawerScreen).getByRole('button', {name: 'Sort Flags'});
     expect(control).toBeInTheDocument();
     await userEvent.click(control);
     expect(
-      drawerScreen.getByRole('option', {name: 'Evaluation Order'})
+      within(drawerScreen).getByRole('option', {name: 'Evaluation Order'})
+    ).toBeInTheDocument();
+    expect(
+      within(drawerScreen).getByRole('option', {name: 'Alphabetical'})
     ).toBeInTheDocument();
-    expect(drawerScreen.getByRole('option', {name: 'Alphabetical'})).toBeInTheDocument();
   });
 
   it('renders a sort dropdown which affects the granular sort dropdown', async function () {
     const drawerScreen = await renderFlagDrawer();
 
-    const control = drawerScreen.getByRole('button', {name: 'Sort Flags'});
+    const control = within(drawerScreen).getByRole('button', {name: 'Sort Flags'});
     expect(control).toBeInTheDocument();
     await userEvent.click(control);
-    await userEvent.click(drawerScreen.getByRole('option', {name: 'Alphabetical'}));
-    await userEvent.click(control);
-    expect(drawerScreen.getByRole('option', {name: 'Alphabetical'})).toHaveAttribute(
-      'aria-selected',
-      'true'
+    await userEvent.click(
+      within(drawerScreen).getByRole('option', {name: 'Alphabetical'})
     );
-    expect(drawerScreen.getByRole('option', {name: 'A-Z'})).toHaveAttribute(
+    await userEvent.click(control);
+    expect(
+      within(drawerScreen).getByRole('option', {name: 'Alphabetical'})
+    ).toHaveAttribute('aria-selected', 'true');
+    expect(within(drawerScreen).getByRole('option', {name: 'A-Z'})).toHaveAttribute(
       'aria-selected',
       'true'
     );
@@ -154,35 +169,35 @@ describe('FeatureFlagDrawer', function () {
   it('renders a sort dropdown which disables the appropriate options', async function () {
     const drawerScreen = await renderFlagDrawer();
 
-    const control = drawerScreen.getByRole('button', {name: 'Sort Flags'});
+    const control = within(drawerScreen).getByRole('button', {name: 'Sort Flags'});
     expect(control).toBeInTheDocument();
     await userEvent.click(control);
-    await userEvent.click(drawerScreen.getByRole('option', {name: 'Alphabetical'}));
-    await userEvent.click(control);
-    expect(drawerScreen.getByRole('option', {name: 'Alphabetical'})).toHaveAttribute(
-      'aria-selected',
-      'true'
-    );
-    expect(drawerScreen.getByRole('option', {name: 'Newest First'})).toHaveAttribute(
-      'aria-disabled',
-      'true'
+    await userEvent.click(
+      within(drawerScreen).getByRole('option', {name: 'Alphabetical'})
     );
-    expect(drawerScreen.getByRole('option', {name: 'Oldest First'})).toHaveAttribute(
-      'aria-disabled',
-      'true'
-    );
-
-    await userEvent.click(drawerScreen.getByRole('option', {name: 'Evaluation Order'}));
     await userEvent.click(control);
-    expect(drawerScreen.getByRole('option', {name: 'Evaluation Order'})).toHaveAttribute(
-      'aria-selected',
-      'true'
+    expect(
+      within(drawerScreen).getByRole('option', {name: 'Alphabetical'})
+    ).toHaveAttribute('aria-selected', 'true');
+    expect(
+      within(drawerScreen).getByRole('option', {name: 'Newest First'})
+    ).toHaveAttribute('aria-disabled', 'true');
+    expect(
+      within(drawerScreen).getByRole('option', {name: 'Oldest First'})
+    ).toHaveAttribute('aria-disabled', 'true');
+
+    await userEvent.click(
+      within(drawerScreen).getByRole('option', {name: 'Evaluation Order'})
     );
-    expect(drawerScreen.getByRole('option', {name: 'Z-A'})).toHaveAttribute(
+    await userEvent.click(control);
+    expect(
+      within(drawerScreen).getByRole('option', {name: 'Evaluation Order'})
+    ).toHaveAttribute('aria-selected', 'true');
+    expect(within(drawerScreen).getByRole('option', {name: 'Z-A'})).toHaveAttribute(
       'aria-disabled',
       'true'
     );
-    expect(drawerScreen.getByRole('option', {name: 'A-Z'})).toHaveAttribute(
+    expect(within(drawerScreen).getByRole('option', {name: 'A-Z'})).toHaveAttribute(
       'aria-disabled',
       'true'
     );
diff --git a/static/app/components/events/featureFlags/featureFlagOnboardingSidebar.tsx b/static/app/components/events/featureFlags/featureFlagOnboardingSidebar.tsx
index ea3a6dbd5551ad..8f1eca42a7dbc7 100644
--- a/static/app/components/events/featureFlags/featureFlagOnboardingSidebar.tsx
+++ b/static/app/components/events/featureFlags/featureFlagOnboardingSidebar.tsx
@@ -173,7 +173,7 @@ function OnboardingContent({
     value: string;
     label?: ReactNode;
     textValue?: string;
-  }>(openFeatureProviderOptions[0]);
+  }>(openFeatureProviderOptions[0]!);
 
   // Second dropdown: other SDK providers
   const sdkProviderOptions = sdkProviders.map(provider => {
@@ -188,7 +188,7 @@ function OnboardingContent({
     value: string;
     label?: ReactNode;
     textValue?: string;
-  }>(sdkProviderOptions[0]);
+  }>(sdkProviderOptions[0]!);
 
   const defaultTab: string = 'openFeature';
   const {getParamValue: setupMode, setParamValue: setSetupMode} = useUrlParams(
diff --git a/static/app/components/events/featureFlags/useIssueEvents.tsx b/static/app/components/events/featureFlags/useIssueEvents.tsx
index 11c7fd95a66f3a..b4196feaedb113 100644
--- a/static/app/components/events/featureFlags/useIssueEvents.tsx
+++ b/static/app/components/events/featureFlags/useIssueEvents.tsx
@@ -1,4 +1,4 @@
-import type {Event} from '@sentry/types';
+import type {Event} from '@sentry/core';
 
 import {useApiQuery} from 'sentry/utils/queryClient';
 import useOrganization from 'sentry/utils/useOrganization';
diff --git a/static/app/components/events/groupingInfo/groupingComponentStacktrace.tsx b/static/app/components/events/groupingInfo/groupingComponentStacktrace.tsx
index 427d5adb7bd275..3ff9cdeb0d61ca 100644
--- a/static/app/components/events/groupingInfo/groupingComponentStacktrace.tsx
+++ b/static/app/components/events/groupingInfo/groupingComponentStacktrace.tsx
@@ -1,5 +1,6 @@
 import {Fragment} from 'react';
 
+import {isStacktraceNewestFirst} from 'sentry/components/events/interfaces/utils';
 import type {EventGroupComponent} from 'sentry/types/event';
 
 import GroupingComponent from './groupingComponent';
@@ -20,7 +21,10 @@ function GroupingComponentStacktrace({component, showNonContributing}: Props) {
   const getFrameGroups = () => {
     const frameGroups: FrameGroup[] = [];
 
-    (component.values as EventGroupComponent[])
+    const frames = isStacktraceNewestFirst()
+      ? component.values.reverse()
+      : component.values;
+    (frames as EventGroupComponent[])
       .filter(value => groupingComponentFilter(value, showNonContributing))
       .forEach(value => {
         const key = (value.values as EventGroupComponent[])
diff --git a/static/app/components/events/groupingInfo/groupingInfoSection.spec.tsx b/static/app/components/events/groupingInfo/groupingInfoSection.spec.tsx
index 7b29d7e8e30b77..3e9094272447cd 100644
--- a/static/app/components/events/groupingInfo/groupingInfoSection.spec.tsx
+++ b/static/app/components/events/groupingInfo/groupingInfoSection.spec.tsx
@@ -106,7 +106,7 @@ describe('EventGroupingInfo', function () {
       },
     });
 
-    await userEvent.click(screen.getAllByRole('button', {name: 'default:XXXX'})[0]);
+    await userEvent.click(screen.getAllByRole('button', {name: 'default:XXXX'})[0]!);
     await userEvent.click(screen.getByRole('option', {name: 'new:XXXX'}));
 
     // Should show new hash
diff --git a/static/app/components/events/highlights/editHighlightsModal.spec.tsx b/static/app/components/events/highlights/editHighlightsModal.spec.tsx
index c1b6cbefe1a73c..4b6c7b874fadbe 100644
--- a/static/app/components/events/highlights/editHighlightsModal.spec.tsx
+++ b/static/app/components/events/highlights/editHighlightsModal.spec.tsx
@@ -14,14 +14,12 @@ import {openModal} from 'sentry/actionCreators/modal';
 import EditHighlightsModal, {
   type EditHighlightsModalProps,
 } from 'sentry/components/events/highlights/editHighlightsModal';
-import {
-  TEST_EVENT_CONTEXTS,
-  TEST_EVENT_TAGS,
-} from 'sentry/components/events/highlights/util.spec';
 import ModalStore from 'sentry/stores/modalStore';
 import type {Project} from 'sentry/types/project';
 import * as analytics from 'sentry/utils/analytics';
 
+import {TEST_EVENT_CONTEXTS, TEST_EVENT_TAGS} from './testUtils';
+
 describe('EditHighlightsModal', function () {
   const organization = OrganizationFixture();
   const project = ProjectFixture();
@@ -154,7 +152,7 @@ describe('EditHighlightsModal', function () {
     const previewCtxButtons = screen.queryAllByTestId('highlights-remove-ctx');
     expect(previewCtxButtons).toHaveLength(highlightContextTitles.length);
 
-    await userEvent.click(previewTagButtons[0]);
+    await userEvent.click(previewTagButtons[0]!);
     expect(analyticsSpy).toHaveBeenCalledWith(
       'highlights.edit_modal.remove_tag',
       expect.anything()
@@ -163,7 +161,7 @@ describe('EditHighlightsModal', function () {
       previewTagButtons.length - 1
     );
 
-    await userEvent.click(previewCtxButtons[0]);
+    await userEvent.click(previewCtxButtons[0]!);
     expect(analyticsSpy).toHaveBeenCalledWith(
       'highlights.edit_modal.remove_context_key',
       expect.anything()
diff --git a/static/app/components/events/highlights/highlightsDataSection.spec.tsx b/static/app/components/events/highlights/highlightsDataSection.spec.tsx
index 54bfef402d4749..7240b8e0368e0a 100644
--- a/static/app/components/events/highlights/highlightsDataSection.spec.tsx
+++ b/static/app/components/events/highlights/highlightsDataSection.spec.tsx
@@ -7,13 +7,11 @@ import {render, screen, userEvent, within} from 'sentry-test/reactTestingLibrary
 import * as modal from 'sentry/actionCreators/modal';
 import HighlightsDataSection from 'sentry/components/events/highlights/highlightsDataSection';
 import {EMPTY_HIGHLIGHT_DEFAULT} from 'sentry/components/events/highlights/util';
-import {
-  TEST_EVENT_CONTEXTS,
-  TEST_EVENT_TAGS,
-} from 'sentry/components/events/highlights/util.spec';
 import ProjectsStore from 'sentry/stores/projectsStore';
 import * as analytics from 'sentry/utils/analytics';
 
+import {TEST_EVENT_CONTEXTS, TEST_EVENT_TAGS} from './testUtils';
+
 describe('HighlightsDataSection', function () {
   const organization = OrganizationFixture();
   const project = ProjectFixture();
@@ -21,7 +19,7 @@ describe('HighlightsDataSection', function () {
     contexts: TEST_EVENT_CONTEXTS,
     tags: TEST_EVENT_TAGS,
   });
-  const eventTagMap = TEST_EVENT_TAGS.reduce(
+  const eventTagMap = TEST_EVENT_TAGS.reduce<Record<string, string>>(
     (tagMap, tag) => ({...tagMap, [tag.key]: tag.value}),
     {}
   );
@@ -100,7 +98,7 @@ describe('HighlightsDataSection', function () {
         .closest('div[data-test-id=highlight-tag-row]') as HTMLElement;
       // If highlight is present on the event...
       if (eventTagMap.hasOwnProperty(tagKey)) {
-        expect(within(row).getByText(eventTagMap[tagKey])).toBeInTheDocument();
+        expect(within(row).getByText(eventTagMap[tagKey]!)).toBeInTheDocument();
         const highlightTagDropdown = within(row).getByLabelText('Tag Actions Menu');
         expect(highlightTagDropdown).toBeInTheDocument();
         await userEvent.click(highlightTagDropdown);
@@ -117,7 +115,7 @@ describe('HighlightsDataSection', function () {
     }
 
     const ctxRows = screen.queryAllByTestId('highlight-context-row');
-    expect(ctxRows.length).toBe(Object.values(highlightContext).flat().length);
+    expect(ctxRows).toHaveLength(Object.values(highlightContext).flat().length);
     highlightContextTitles.forEach(title => {
       expect(screen.getByText(title)).toBeInTheDocument();
     });
diff --git a/static/app/components/events/highlights/highlightsDataSection.tsx b/static/app/components/events/highlights/highlightsDataSection.tsx
index fd5439f38c0c11..524e96fd436faa 100644
--- a/static/app/components/events/highlights/highlightsDataSection.tsx
+++ b/static/app/components/events/highlights/highlightsDataSection.tsx
@@ -54,7 +54,7 @@ function useOpenEditHighlightsModal({
 }) {
   const organization = useOrganization();
   const isProjectAdmin = hasEveryAccess(['project:admin'], {
-    organization: organization,
+    organization,
     project: detailedProject,
   });
 
@@ -151,7 +151,7 @@ function HighlightsData({
 
   // find the replayId from either context or tags, if it exists
   const contextReplayItem = highlightContextDataItems.find(
-    e => e.data.length && e.data[0].key === 'replay_id'
+    e => e.data.length && e.data[0]!.key === 'replay_id'
   );
   const contextReplayId = contextReplayItem?.value ?? EMPTY_HIGHLIGHT_DEFAULT;
 
diff --git a/static/app/components/events/highlights/highlightsIconSummary.spec.tsx b/static/app/components/events/highlights/highlightsIconSummary.spec.tsx
index c710d35ca96a06..cd285ffe66c8be 100644
--- a/static/app/components/events/highlights/highlightsIconSummary.spec.tsx
+++ b/static/app/components/events/highlights/highlightsIconSummary.spec.tsx
@@ -5,10 +5,8 @@ import {OrganizationFixture} from 'sentry-fixture/organization';
 import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 
 import {HighlightsIconSummary} from 'sentry/components/events/highlights/highlightsIconSummary';
-import {
-  TEST_EVENT_CONTEXTS,
-  TEST_EVENT_TAGS,
-} from 'sentry/components/events/highlights/util.spec';
+
+import {TEST_EVENT_CONTEXTS, TEST_EVENT_TAGS} from './testUtils';
 
 jest.mock('sentry/components/events/contexts/contextIcon', () => ({
   ...jest.requireActual('sentry/components/events/contexts/contextIcon'),
diff --git a/static/app/components/events/highlights/testUtils.tsx b/static/app/components/events/highlights/testUtils.tsx
new file mode 100644
index 00000000000000..d08dc448e9b411
--- /dev/null
+++ b/static/app/components/events/highlights/testUtils.tsx
@@ -0,0 +1,64 @@
+export const TEST_EVENT_CONTEXTS = {
+  keyboard: {
+    type: 'default',
+    brand: 'keychron',
+    percent: 75,
+    switches: {
+      form: 'tactile',
+      brand: 'wuque studios',
+    },
+  },
+  client_os: {
+    type: 'os',
+    name: 'Mac OS X',
+    version: '10.15',
+  },
+  runtime: {
+    type: 'runtime',
+    name: 'CPython',
+    version: '3.8.13',
+  },
+};
+
+export const TEST_EVENT_TAGS = [
+  {
+    key: 'browser',
+    value: 'Chrome 1.2.3',
+  },
+  {
+    key: 'browser.name',
+    value: 'Chrome',
+  },
+  {
+    key: 'device.family',
+    value: 'Mac',
+  },
+  {
+    key: 'environment',
+    value: 'production',
+  },
+  {
+    key: 'handled',
+    value: 'no',
+  },
+  {
+    key: 'level',
+    value: 'error',
+  },
+  {
+    key: 'release',
+    value: '1.8',
+  },
+  {
+    key: 'runtime',
+    value: 'CPython 3.8.13',
+  },
+  {
+    key: 'runtime.name',
+    value: 'CPython',
+  },
+  {
+    key: 'url',
+    value: 'https://example.com',
+  },
+];
diff --git a/static/app/components/events/highlights/util.spec.tsx b/static/app/components/events/highlights/util.spec.tsx
index e802cbb80ade5d..0ce2af90019dd6 100644
--- a/static/app/components/events/highlights/util.spec.tsx
+++ b/static/app/components/events/highlights/util.spec.tsx
@@ -9,70 +9,7 @@ import {
   getHighlightTagData,
 } from 'sentry/components/events/highlights/util';
 
-export const TEST_EVENT_CONTEXTS = {
-  keyboard: {
-    type: 'default',
-    brand: 'keychron',
-    percent: 75,
-    switches: {
-      form: 'tactile',
-      brand: 'wuque studios',
-    },
-  },
-  client_os: {
-    type: 'os',
-    name: 'Mac OS X',
-    version: '10.15',
-  },
-  runtime: {
-    type: 'runtime',
-    name: 'CPython',
-    version: '3.8.13',
-  },
-};
-
-export const TEST_EVENT_TAGS = [
-  {
-    key: 'browser',
-    value: 'Chrome 1.2.3',
-  },
-  {
-    key: 'browser.name',
-    value: 'Chrome',
-  },
-  {
-    key: 'device.family',
-    value: 'Mac',
-  },
-  {
-    key: 'environment',
-    value: 'production',
-  },
-  {
-    key: 'handled',
-    value: 'no',
-  },
-  {
-    key: 'level',
-    value: 'error',
-  },
-  {
-    key: 'release',
-    value: '1.8',
-  },
-  {
-    key: 'runtime',
-    value: 'CPython 3.8.13',
-  },
-  {
-    key: 'runtime.name',
-    value: 'CPython',
-  },
-  {
-    key: 'url',
-    value: 'https://example.com',
-  },
-];
+import {TEST_EVENT_CONTEXTS, TEST_EVENT_TAGS} from './testUtils';
 
 describe('getHighlightContextData', function () {
   it('returns only highlight context data', function () {
@@ -92,14 +29,14 @@ describe('getHighlightContextData', function () {
       location: {query: {}} as Location,
     });
     expect(highlightCtxData).toHaveLength(1);
-    expect(highlightCtxData[0].alias).toBe('keyboard');
-    expect(highlightCtxData[0].type).toBe('default');
-    expect(highlightCtxData[0].data).toHaveLength(highlightContext.keyboard.length);
-    const highlightCtxDataKeys = new Set(highlightCtxData[0].data.map(({key}) => key));
+    expect(highlightCtxData[0]!.alias).toBe('keyboard');
+    expect(highlightCtxData[0]!.type).toBe('default');
+    expect(highlightCtxData[0]!.data).toHaveLength(highlightContext.keyboard.length);
+    const highlightCtxDataKeys = new Set(highlightCtxData[0]!.data.map(({key}) => key));
     for (const ctxKey of highlightContext.keyboard) {
       expect(highlightCtxDataKeys.has(ctxKey)).toBe(true);
     }
-    const missingCtxHighlightFromEvent = highlightCtxData[0].data?.find(
+    const missingCtxHighlightFromEvent = highlightCtxData[0]!.data?.find(
       d => d.key === missingContextKey
     );
     expect(missingCtxHighlightFromEvent?.value).toBe(EMPTY_HIGHLIGHT_DEFAULT);
@@ -122,7 +59,7 @@ describe('getHighlightContextData', function () {
       location: {query: {}} as Location,
     });
     expect(highlightCtxData).toHaveLength(1);
-    expect(highlightCtxData[0].type).toBe('os');
+    expect(highlightCtxData[0]!.type).toBe('os');
   });
 });
 
diff --git a/static/app/components/events/highlights/util.tsx b/static/app/components/events/highlights/util.tsx
index 233ba463aeb5bc..f952127f7869d5 100644
--- a/static/app/components/events/highlights/util.tsx
+++ b/static/app/components/events/highlights/util.tsx
@@ -61,7 +61,7 @@ function getFuzzyHighlightContext(
     };
   }
 
-  const highlightContextKeys = highlightContextSets[highlightKey];
+  const highlightContextKeys = highlightContextSets[highlightKey]!;
   const highlightItems: KeyValueListData = data.filter(
     ({key, subject}) =>
       // We match on key (e.g. 'trace_id') and subject (e.g. 'Trace ID')
diff --git a/static/app/components/events/interfaces/analyzeFrames.spec.tsx b/static/app/components/events/interfaces/analyzeFrames.spec.tsx
index f8395008fcd16e..6cecd73259016f 100644
--- a/static/app/components/events/interfaces/analyzeFrames.spec.tsx
+++ b/static/app/components/events/interfaces/analyzeFrames.spec.tsx
@@ -139,10 +139,10 @@ describe('analyzeAnrFrames', function () {
       },
     ]);
     const rootCause = analyzeFramesForRootCause(event);
-    expect(rootCause?.resources).toEqual(
+    expect(rootCause?.resources).toBe(
       'SharedPreferences.apply will save data on background thread only if it happens before the activity/service finishes. Switch to SharedPreferences.commit and move commit to a background thread.'
     );
-    expect(rootCause?.culprit).toEqual(
+    expect(rootCause?.culprit).toBe(
       '/^android\\.app\\.SharedPreferencesImpl\\$EditorImpl\\$[0-9]/'
     );
   });
@@ -169,10 +169,10 @@ describe('analyzeAnrFrames', function () {
       },
     ]);
     const rootCause = analyzeFramesForRootCause(event);
-    expect(rootCause?.resources).toEqual(
+    expect(rootCause?.resources).toBe(
       'Database operations, such as querying, inserting, updating, or deleting data, can involve disk I/O, processing, and potentially long-running operations. Move database operations off the main thread to avoid this ANR.'
     );
-    expect(rootCause?.culprit).toEqual('android.database.sqlite.SQLiteConnection');
+    expect(rootCause?.culprit).toBe('android.database.sqlite.SQLiteConnection');
   });
 
   it('picks anr root cause of the topmost frame', function () {
@@ -215,10 +215,10 @@ describe('analyzeAnrFrames', function () {
       },
     ]);
     const rootCause = analyzeFramesForRootCause(event);
-    expect(rootCause?.resources).toEqual(
+    expect(rootCause?.resources).toBe(
       'SharedPreferences.apply will save data on background thread only if it happens before the activity/service finishes. Switch to SharedPreferences.commit and move commit to a background thread.'
     );
-    expect(rootCause?.culprit).toEqual(
+    expect(rootCause?.culprit).toBe(
       '/^android\\.app\\.SharedPreferencesImpl\\$EditorImpl\\$[0-9]/'
     );
   });
diff --git a/static/app/components/events/interfaces/analyzeFrames.tsx b/static/app/components/events/interfaces/analyzeFrames.tsx
index 60d6a2eb90e337..bc784f0b76b79e 100644
--- a/static/app/components/events/interfaces/analyzeFrames.tsx
+++ b/static/app/components/events/interfaces/analyzeFrames.tsx
@@ -171,7 +171,7 @@ function satisfiesFunctionCondition(frame: Frame, suspect: SuspectFrame) {
     return false;
   }
   for (let index = 0; index < suspect.functions.length; index++) {
-    const matchFuction = suspect.functions[index];
+    const matchFuction = suspect.functions[index]!;
     const match =
       typeof matchFuction === 'string'
         ? frame.function === matchFuction
@@ -219,7 +219,7 @@ export function analyzeFramesForRootCause(event: Event): {
 
   // iterating the frames in reverse order, because the topmost frames most like the root cause
   for (let index = exceptionFrames.length - 1; index >= 0; index--) {
-    const frame = exceptionFrames[index];
+    const frame = exceptionFrames[index]!;
     const rootCause = analyzeFrameForRootCause(frame, currentThread);
     if (defined(rootCause)) {
       return rootCause;
diff --git a/static/app/components/events/interfaces/breadcrumbs/breadcrumbs.spec.tsx b/static/app/components/events/interfaces/breadcrumbs/breadcrumbs.spec.tsx
index 27a6ac62ea07e7..17046a88659e67 100644
--- a/static/app/components/events/interfaces/breadcrumbs/breadcrumbs.spec.tsx
+++ b/static/app/components/events/interfaces/breadcrumbs/breadcrumbs.spec.tsx
@@ -10,7 +10,7 @@ import {BreadcrumbLevelType, BreadcrumbType} from 'sentry/types/breadcrumbs';
 import useProjects from 'sentry/utils/useProjects';
 
 jest.mock('sentry/utils/replays/hooks/useReplayOnboarding');
-jest.mock('sentry/utils/replays/hooks/useReplayReader');
+jest.mock('sentry/utils/replays/hooks/useLoadReplayReader');
 jest.mock('sentry/utils/useProjects');
 
 describe('Breadcrumbs', () => {
diff --git a/static/app/components/events/interfaces/breadcrumbs/breadcrumbs.tsx b/static/app/components/events/interfaces/breadcrumbs/breadcrumbs.tsx
index 516b532fdf0e17..4945d94132178c 100644
--- a/static/app/components/events/interfaces/breadcrumbs/breadcrumbs.tsx
+++ b/static/app/components/events/interfaces/breadcrumbs/breadcrumbs.tsx
@@ -67,15 +67,15 @@ function renderBreadCrumbRow({index, key, parent, style}: RenderBreadCrumbRowPro
     >
       <BreadcrumbRow
         style={style}
-        error={parent.props.breadcrumbs[index].breadcrumb.type === BreadcrumbType.ERROR}
+        error={parent.props.breadcrumbs[index]!.breadcrumb.type === BreadcrumbType.ERROR}
       >
         <Breadcrumb
           index={index}
           cache={cache}
           style={style}
           parent={parent}
-          meta={parent.props.breadcrumbs[index].meta}
-          breadcrumb={parent.props.breadcrumbs[index].breadcrumb}
+          meta={parent.props.breadcrumbs[index]!.meta}
+          breadcrumb={parent.props.breadcrumbs[index]!.breadcrumb}
           organization={parent.props.organization}
           searchTerm={parent.props.searchTerm}
           event={parent.props.event}
diff --git a/static/app/components/events/interfaces/breadcrumbs/index.tsx b/static/app/components/events/interfaces/breadcrumbs/index.tsx
index b50eb5bcc00221..007af1dc78c6ff 100644
--- a/static/app/components/events/interfaces/breadcrumbs/index.tsx
+++ b/static/app/components/events/interfaces/breadcrumbs/index.tsx
@@ -148,24 +148,24 @@ function BreadcrumbsContainer({data, event, organization, hideTitle = false}: Pr
     for (const index in crumbs) {
       const breadcrumb = crumbs[index];
       const foundFilterType = filterTypes.findIndex(
-        f => f.value === `type-${breadcrumb.type}`
+        f => f.value === `type-${breadcrumb!.type}`
       );
 
       if (foundFilterType === -1) {
         filterTypes.push({
-          value: `type-${breadcrumb.type}`,
-          leadingItems: <Type type={breadcrumb.type} color={breadcrumb.color} />,
-          label: breadcrumb.description,
-          levels: breadcrumb?.level ? [breadcrumb.level] : [],
+          value: `type-${breadcrumb!.type}`,
+          leadingItems: <Type type={breadcrumb!.type} color={breadcrumb!.color} />,
+          label: breadcrumb!.description,
+          levels: breadcrumb!.level ? [breadcrumb!.level] : [],
         });
         continue;
       }
 
       if (
         breadcrumb?.level &&
-        !filterTypes[foundFilterType].levels?.includes(breadcrumb.level)
+        !filterTypes[foundFilterType]!.levels?.includes(breadcrumb.level)
       ) {
-        filterTypes[foundFilterType].levels?.push(breadcrumb.level);
+        filterTypes[foundFilterType]!.levels?.push(breadcrumb!.level);
       }
     }
 
@@ -176,8 +176,8 @@ function BreadcrumbsContainer({data, event, organization, hideTitle = false}: Pr
     const filterLevels: SelectOption<string>[] = [];
 
     for (const indexType in types) {
-      for (const indexLevel in types[indexType].levels) {
-        const level = types[indexType].levels?.[indexLevel];
+      for (const indexLevel in types[indexType]!.levels) {
+        const level = types[indexType]!.levels?.[indexLevel];
 
         if (filterLevels.some(f => f.value === `level-${level}`)) {
           continue;
diff --git a/static/app/components/events/interfaces/crashContent/exception/actionableItems.tsx b/static/app/components/events/interfaces/crashContent/exception/actionableItems.tsx
index 0b27a0292ced12..586eee6fd10fa1 100644
--- a/static/app/components/events/interfaces/crashContent/exception/actionableItems.tsx
+++ b/static/app/components/events/interfaces/crashContent/exception/actionableItems.tsx
@@ -246,7 +246,7 @@ interface ExpandableErrorListProps {
 
 function ExpandableErrorList({handleExpandClick, errorList}: ExpandableErrorListProps) {
   const [expanded, setExpanded] = useState(false);
-  const firstError = errorList[0];
+  const firstError = errorList[0]!;
   const {title, desc, type} = firstError;
   const numErrors = errorList.length;
   const errorDataList = errorList.map(error => error.data ?? {});
@@ -291,7 +291,6 @@ function ExpandableErrorList({handleExpandClick, errorList}: ExpandableErrorList
         });
     });
     return cleaned;
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [errorDataList]);
 
   return (
diff --git a/static/app/components/events/interfaces/crashContent/exception/content.spec.tsx b/static/app/components/events/interfaces/crashContent/exception/content.spec.tsx
index f4fc56d43c2b0e..3819a48b72a534 100644
--- a/static/app/components/events/interfaces/crashContent/exception/content.spec.tsx
+++ b/static/app/components/events/interfaces/crashContent/exception/content.spec.tsx
@@ -136,7 +136,7 @@ describe('Exception Content', function () {
         newestFirst
         stackView={StackView.APP}
         event={event}
-        values={event.entries[0].data.values}
+        values={event.entries[0]!.data.values}
         meta={event._meta!.entries[0].data.values}
         projectSlug={project.slug}
       />,
@@ -145,7 +145,7 @@ describe('Exception Content', function () {
 
     expect(screen.getAllByText(/redacted/)).toHaveLength(2);
 
-    await userEvent.hover(screen.getAllByText(/redacted/)[0]);
+    await userEvent.hover(screen.getAllByText(/redacted/)[0]!);
 
     expect(
       await screen.findByText(
@@ -200,7 +200,7 @@ describe('Exception Content', function () {
         type={StackType.ORIGINAL}
         stackView={StackView.APP}
         event={event}
-        values={event.entries[0].data.values}
+        values={event.entries[0]!.data.values}
         projectSlug={project.slug}
       />
     );
@@ -242,7 +242,7 @@ describe('Exception Content', function () {
       platform: 'python' as const,
       stackView: StackView.APP,
       event,
-      values: event.entries[0].data.values,
+      values: event.entries[0]!.data.values,
       projectSlug: project.slug,
     };
 
@@ -252,9 +252,9 @@ describe('Exception Content', function () {
       const exceptions = screen.getAllByTestId('exception-value');
 
       // First exception should be the parent ExceptionGroup
-      expect(within(exceptions[0]).getByText('ExceptionGroup 1')).toBeInTheDocument();
+      expect(within(exceptions[0]!).getByText('ExceptionGroup 1')).toBeInTheDocument();
       expect(
-        within(exceptions[0]).getByRole('heading', {name: 'ExceptionGroup 1'})
+        within(exceptions[0]!).getByRole('heading', {name: 'ExceptionGroup 1'})
       ).toBeInTheDocument();
     });
 
@@ -263,7 +263,7 @@ describe('Exception Content', function () {
 
       const exceptions = screen.getAllByTestId('exception-value');
 
-      const exceptionGroupWithNoContext = exceptions[2];
+      const exceptionGroupWithNoContext = exceptions[2]!;
       expect(
         within(exceptionGroupWithNoContext).getByText('Related Exceptions')
       ).toBeInTheDocument();
@@ -273,7 +273,7 @@ describe('Exception Content', function () {
       render(<Content {...defaultProps} />);
 
       // There are 4 values, but 1 should be hidden
-      expect(screen.getAllByTestId('exception-value').length).toBe(3);
+      expect(screen.getAllByTestId('exception-value')).toHaveLength(3);
       expect(screen.queryByRole('heading', {name: 'ValueError'})).not.toBeInTheDocument();
 
       await userEvent.click(
@@ -281,7 +281,7 @@ describe('Exception Content', function () {
       );
 
       // After expanding, ValueError should be visible
-      expect(screen.getAllByTestId('exception-value').length).toBe(4);
+      expect(screen.getAllByTestId('exception-value')).toHaveLength(4);
       expect(screen.getByRole('heading', {name: 'ValueError'})).toBeInTheDocument();
 
       await userEvent.click(
@@ -289,7 +289,7 @@ describe('Exception Content', function () {
       );
 
       // After collapsing, ValueError should be gone again
-      expect(screen.getAllByTestId('exception-value').length).toBe(3);
+      expect(screen.getAllByTestId('exception-value')).toHaveLength(3);
       expect(screen.queryByRole('heading', {name: 'ValueError'})).not.toBeInTheDocument();
     });
 
diff --git a/static/app/components/events/interfaces/crashContent/exception/content.tsx b/static/app/components/events/interfaces/crashContent/exception/content.tsx
index 7ba4654d88c7bf..b98f29252e5517 100644
--- a/static/app/components/events/interfaces/crashContent/exception/content.tsx
+++ b/static/app/components/events/interfaces/crashContent/exception/content.tsx
@@ -151,7 +151,7 @@ export function Content({
 
     const frameSourceMapDebuggerData = sourceMapDebuggerData?.exceptions[
       excIdx
-    ].frames.map(debuggerFrame =>
+    ]!.frames.map(debuggerFrame =>
       prepareSourceMapDebuggerFrameInformation(
         sourceMapDebuggerData,
         debuggerFrame,
diff --git a/static/app/components/events/interfaces/crashContent/exception/relatedExceptions.spec.tsx b/static/app/components/events/interfaces/crashContent/exception/relatedExceptions.spec.tsx
index 1f261acefc8570..986fb9fc2a042e 100644
--- a/static/app/components/events/interfaces/crashContent/exception/relatedExceptions.spec.tsx
+++ b/static/app/components/events/interfaces/crashContent/exception/relatedExceptions.spec.tsx
@@ -31,14 +31,14 @@ describe('ExceptionGroupContext', function () {
     expect(items).toHaveLength(3);
 
     // ExceptionGroup should not link to itself
-    expect(within(items[0]).getByText('ExceptionGroup 1: parent')).toBeInTheDocument();
+    expect(within(items[0]!).getByText('ExceptionGroup 1: parent')).toBeInTheDocument();
     // Should have a link to TypeError exception
     expect(
-      within(items[1]).getByRole('button', {name: 'TypeError: nested'})
+      within(items[1]!).getByRole('button', {name: 'TypeError: nested'})
     ).toBeInTheDocument();
     // Should have a link to child exception group
     expect(
-      within(items[2]).getByRole('button', {name: 'ExceptionGroup 2: child'})
+      within(items[2]!).getByRole('button', {name: 'ExceptionGroup 2: child'})
     ).toBeInTheDocument();
   });
 
@@ -54,8 +54,8 @@ describe('ExceptionGroupContext', function () {
     const children = screen.getAllByRole('button');
 
     // Order should be oldest to newest, opposite fo the previous test
-    expect(within(children[0]).getByText(/ExceptionGroup 2/i)).toBeInTheDocument();
-    expect(within(children[1]).getByText(/TypeError/i)).toBeInTheDocument();
+    expect(within(children[0]!).getByText(/ExceptionGroup 2/i)).toBeInTheDocument();
+    expect(within(children[1]!).getByText(/TypeError/i)).toBeInTheDocument();
   });
 
   it('renders tree with child exception group', function () {
@@ -66,13 +66,13 @@ describe('ExceptionGroupContext', function () {
 
     // Should show and link to parent exception group
     expect(
-      within(items[0]).getByRole('button', {name: 'ExceptionGroup 1: parent'})
+      within(items[0]!).getByRole('button', {name: 'ExceptionGroup 1: parent'})
     ).toBeInTheDocument();
     // Should have a link to child exception group
-    expect(within(items[1]).getByText('ExceptionGroup 2: child')).toBeInTheDocument();
+    expect(within(items[1]!).getByText('ExceptionGroup 2: child')).toBeInTheDocument();
     // Show show and link to child exception
     expect(
-      within(items[2]).getByRole('button', {name: 'ValueError: test'})
+      within(items[2]!).getByRole('button', {name: 'ValueError: test'})
     ).toBeInTheDocument();
   });
 
diff --git a/static/app/components/events/interfaces/crashContent/exception/sourceMapDebug.spec.tsx b/static/app/components/events/interfaces/crashContent/exception/sourceMapDebug.spec.tsx
index 7b2e52c3e70652..b9c6c3a3cd5bad 100644
--- a/static/app/components/events/interfaces/crashContent/exception/sourceMapDebug.spec.tsx
+++ b/static/app/components/events/interfaces/crashContent/exception/sourceMapDebug.spec.tsx
@@ -76,7 +76,7 @@ describe('SourceMapDebug', () => {
 
   it('should use unqiue in app frames', () => {
     expect(debugFrames).toHaveLength(1);
-    expect(debugFrames[0].filename).toBe(
+    expect(debugFrames[0]!.filename).toBe(
       './app/views/organizationStats/teamInsights/controls.tsx'
     );
   });
diff --git a/static/app/components/events/interfaces/crashContent/exception/stackTrace.spec.tsx b/static/app/components/events/interfaces/crashContent/exception/stackTrace.spec.tsx
index 089dc288dc3362..124ff840ccc95a 100644
--- a/static/app/components/events/interfaces/crashContent/exception/stackTrace.spec.tsx
+++ b/static/app/components/events/interfaces/crashContent/exception/stackTrace.spec.tsx
@@ -121,7 +121,7 @@ describe('ExceptionStacktraceContent', function () {
     render(
       <ExceptionStacktraceContent
         {...props}
-        stacktrace={{...stacktrace, frames: [{...frames[0], inApp: true}, frames[1]]}}
+        stacktrace={{...stacktrace, frames: [{...frames[0]!, inApp: true}, frames[1]!]}}
       />
     );
     expect(
@@ -143,7 +143,7 @@ describe('ExceptionStacktraceContent', function () {
     render(
       <ExceptionStacktraceContent
         {...props}
-        stacktrace={{...stacktrace, frames: [{...frames[0], inApp: true}, frames[1]]}}
+        stacktrace={{...stacktrace, frames: [{...frames[0]!, inApp: true}, frames[1]!]}}
         chainedException
       />
     );
@@ -153,9 +153,9 @@ describe('ExceptionStacktraceContent', function () {
     expect(screen.getAllByRole('listitem')).toHaveLength(2);
 
     // inApp === true
-    expect(screen.getAllByRole('listitem')[1]).toHaveTextContent(frames[0].filename);
+    expect(screen.getAllByRole('listitem')[1]).toHaveTextContent(frames[0]!.filename);
 
     // inApp === false
-    expect(screen.getAllByRole('listitem')[0]).toHaveTextContent(frames[1].filename);
+    expect(screen.getAllByRole('listitem')[0]).toHaveTextContent(frames[1]!.filename);
   });
 });
diff --git a/static/app/components/events/interfaces/crashContent/exception/useSourceMapDebug.spec.tsx b/static/app/components/events/interfaces/crashContent/exception/useSourceMapDebug.spec.tsx
index c8177decf18622..952fcd60e859a6 100644
--- a/static/app/components/events/interfaces/crashContent/exception/useSourceMapDebug.spec.tsx
+++ b/static/app/components/events/interfaces/crashContent/exception/useSourceMapDebug.spec.tsx
@@ -7,8 +7,8 @@ import {getUniqueFilesFromException} from './useSourceMapDebug';
 
 function modifyEventFrames(event: Event, modify: any): Event {
   const modifiedEvent = cloneDeep(event);
-  modifiedEvent.entries[0].data.values[0].stacktrace.frames =
-    event.entries[0].data.values[0].stacktrace.frames.map(frame => ({
+  modifiedEvent.entries[0]!.data.values[0].stacktrace.frames =
+    event.entries[0]!.data.values[0].stacktrace.frames.map(frame => ({
       ...frame,
       ...modify,
     }));
@@ -23,7 +23,7 @@ describe('getUniqueFilesFromException', () => {
       platform: 'javascript',
     });
     const result = getUniqueFilesFromException(
-      (event.entries as EntryException[])[0].data.values!,
+      (event.entries as EntryException[])[0]!.data.values!,
       props
     );
 
@@ -48,7 +48,7 @@ describe('getUniqueFilesFromException', () => {
       {filename: '<anonymous>'}
     );
     const result = getUniqueFilesFromException(
-      (event.entries as EntryException[])[0].data.values!,
+      (event.entries as EntryException[])[0]!.data.values!,
       props
     );
 
@@ -63,7 +63,7 @@ describe('getUniqueFilesFromException', () => {
       {absPath: '~/myfile.js', filename: '~/myfile.js'}
     );
     const result = getUniqueFilesFromException(
-      (event.entries as EntryException[])[0].data.values!,
+      (event.entries as EntryException[])[0]!.data.values!,
       props
     );
 
diff --git a/static/app/components/events/interfaces/crashContent/exception/utils.tsx b/static/app/components/events/interfaces/crashContent/exception/utils.tsx
index 7ed48748022b8b..c661baa6d43e32 100644
--- a/static/app/components/events/interfaces/crashContent/exception/utils.tsx
+++ b/static/app/components/events/interfaces/crashContent/exception/utils.tsx
@@ -16,7 +16,7 @@ export function isFrameFilenamePathlike(frame: Frame): boolean {
 
   const parsedURL = safeURL(filename);
   if (parsedURL) {
-    filename = parsedURL.pathname.split('/').reverse()[0];
+    filename = parsedURL.pathname.split('/').reverse()[0]!;
   }
 
   return (
@@ -58,7 +58,7 @@ export const renderLinksInText = ({
   const urls = exceptionText.match(urlRegex) || [];
 
   const elements = parts.flatMap((part, index) => {
-    const url = urls[index];
+    const url = urls[index]!;
     const isUrlValid = isUrl(url);
 
     let link: ReactElement | undefined;
diff --git a/static/app/components/events/interfaces/crashContent/stackTrace/content.spec.tsx b/static/app/components/events/interfaces/crashContent/stackTrace/content.spec.tsx
index b93c928f79b8a2..082149b0f3f85b 100644
--- a/static/app/components/events/interfaces/crashContent/stackTrace/content.spec.tsx
+++ b/static/app/components/events/interfaces/crashContent/stackTrace/content.spec.tsx
@@ -116,15 +116,15 @@ describe('StackTrace', function () {
     const frameTitles = screen.getAllByTestId('title');
 
     // collapse the expanded frame (by default)
-    await userEvent.click(frameTitles[0]);
+    await userEvent.click(frameTitles[0]!);
 
     // all frames are now collapsed
     expect(screen.queryByTestId('toggle-button-expanded')).not.toBeInTheDocument();
     expect(screen.getAllByTestId('toggle-button-collapsed')).toHaveLength(5);
 
     // expand penultimate and last frame
-    await userEvent.click(frameTitles[frameTitles.length - 2]);
-    await userEvent.click(frameTitles[frameTitles.length - 1]);
+    await userEvent.click(frameTitles[frameTitles.length - 2]!);
+    await userEvent.click(frameTitles[frameTitles.length - 1]!);
 
     // two frames are now collapsed
     expect(screen.getAllByTestId('toggle-button-expanded')).toHaveLength(2);
@@ -154,8 +154,8 @@ describe('StackTrace', function () {
     const collapsedToggleButtons = screen.getAllByTestId('toggle-button-collapsed');
 
     // expand penultimate and last frame
-    await userEvent.click(collapsedToggleButtons[collapsedToggleButtons.length - 2]);
-    await userEvent.click(collapsedToggleButtons[collapsedToggleButtons.length - 1]);
+    await userEvent.click(collapsedToggleButtons[collapsedToggleButtons.length - 2]!);
+    await userEvent.click(collapsedToggleButtons[collapsedToggleButtons.length - 1]!);
 
     // two frames are now collapsed
     expect(screen.getAllByTestId('toggle-button-expanded')).toHaveLength(2);
@@ -188,7 +188,7 @@ describe('StackTrace', function () {
 
   it('does not render non in app tags', function () {
     const dataFrames = [...data.frames];
-    dataFrames[0] = {...dataFrames[0], inApp: false};
+    dataFrames[0] = {...dataFrames[0]!, inApp: false};
 
     const newData = {
       ...data,
@@ -204,7 +204,7 @@ describe('StackTrace', function () {
 
   it('displays a toggle button when there is more than one non-inapp frame', function () {
     const dataFrames = [...data.frames];
-    dataFrames[0] = {...dataFrames[0], inApp: true};
+    dataFrames[0] = {...dataFrames[0]!, inApp: true};
 
     const newData = {
       ...data,
@@ -221,11 +221,11 @@ describe('StackTrace', function () {
 
   it('shows/hides frames when toggle button clicked', async function () {
     const dataFrames = [...data.frames];
-    dataFrames[0] = {...dataFrames[0], inApp: true};
-    dataFrames[1] = {...dataFrames[1], function: 'non-in-app-frame'};
-    dataFrames[2] = {...dataFrames[2], function: 'non-in-app-frame'};
-    dataFrames[3] = {...dataFrames[3], function: 'non-in-app-frame'};
-    dataFrames[4] = {...dataFrames[4], function: 'non-in-app-frame'};
+    dataFrames[0] = {...dataFrames[0]!, inApp: true};
+    dataFrames[1] = {...dataFrames[1]!, function: 'non-in-app-frame'};
+    dataFrames[2] = {...dataFrames[2]!, function: 'non-in-app-frame'};
+    dataFrames[3] = {...dataFrames[3]!, function: 'non-in-app-frame'};
+    dataFrames[4] = {...dataFrames[4]!, function: 'non-in-app-frame'};
 
     const newData = {
       ...data,
@@ -244,9 +244,9 @@ describe('StackTrace', function () {
 
   it('does not display a toggle button when there is only one non-inapp frame', function () {
     const dataFrames = [...data.frames];
-    dataFrames[0] = {...dataFrames[0], inApp: true};
-    dataFrames[2] = {...dataFrames[2], inApp: true};
-    dataFrames[4] = {...dataFrames[4], inApp: true};
+    dataFrames[0] = {...dataFrames[0]!, inApp: true};
+    dataFrames[2] = {...dataFrames[2]!, inApp: true};
+    dataFrames[4] = {...dataFrames[4]!, inApp: true};
 
     const newData = {
       ...data,
@@ -269,7 +269,7 @@ describe('StackTrace', function () {
         ...data,
         hasSystemFrames: true,
         frames: [
-          {...dataFrames[0], inApp: true},
+          {...dataFrames[0]!, inApp: true},
           ...dataFrames.splice(1, dataFrames.length),
         ],
       };
@@ -304,7 +304,7 @@ describe('StackTrace', function () {
         registers: {},
         frames: [
           ...dataFrames.splice(0, dataFrames.length - 1),
-          {...dataFrames[dataFrames.length - 1], inApp: true},
+          {...dataFrames[dataFrames.length - 1]!, inApp: true},
         ],
       };
 
@@ -339,7 +339,7 @@ describe('StackTrace', function () {
         hasSystemFrames: true,
         frames: [
           ...dataFrames.slice(0, 1),
-          {...dataFrames[1], inApp: true},
+          {...dataFrames[1]!, inApp: true},
           ...dataFrames.slice(2, dataFrames.length),
         ],
       };
@@ -375,7 +375,7 @@ describe('StackTrace', function () {
         ...data,
         hasSystemFrames: true,
         frames: [
-          {...dataFrames[0], inApp: true},
+          {...dataFrames[0]!, inApp: true},
           ...dataFrames.splice(1, dataFrames.length),
         ],
       };
@@ -409,7 +409,7 @@ describe('StackTrace', function () {
         ...data,
         hasSystemFrames: true,
         frames: [
-          {...dataFrames[0], inApp: true},
+          {...dataFrames[0]!, inApp: true},
           ...dataFrames.splice(1, dataFrames.length),
         ],
       };
diff --git a/static/app/components/events/interfaces/crashContent/stackTrace/content.tsx b/static/app/components/events/interfaces/crashContent/stackTrace/content.tsx
index f3cc30ca29ba0e..620e727d8635b0 100644
--- a/static/app/components/events/interfaces/crashContent/stackTrace/content.tsx
+++ b/static/app/components/events/interfaces/crashContent/stackTrace/content.tsx
@@ -86,7 +86,7 @@ function Content({
   function setInitialFrameMap(): {[frameIndex: number]: boolean} {
     const indexMap: Record<string, boolean> = {};
     (data.frames ?? []).forEach((frame, frameIdx) => {
-      const nextFrame = (data.frames ?? [])[frameIdx + 1];
+      const nextFrame = (data.frames ?? [])[frameIdx + 1]!;
       const repeatedFrame = isRepeatedFrame(frame, nextFrame);
       if (frameIsVisible(frame, nextFrame) && !repeatedFrame && !frame.inApp) {
         indexMap[frameIdx] = false;
@@ -99,7 +99,7 @@ function Content({
     let count = 0;
     const countMap: Record<string, number> = {};
     (data.frames ?? []).forEach((frame, frameIdx) => {
-      const nextFrame = (data.frames ?? [])[frameIdx + 1];
+      const nextFrame = (data.frames ?? [])[frameIdx + 1]!;
       const repeatedFrame = isRepeatedFrame(frame, nextFrame);
       if (frameIsVisible(frame, nextFrame) && !repeatedFrame && !frame.inApp) {
         countMap[frameIdx] = count;
@@ -118,8 +118,8 @@ function Content({
       return false;
     }
 
-    const lastFrame = frames[frames.length - 1];
-    const penultimateFrame = frames[frames.length - 2];
+    const lastFrame = frames[frames.length - 1]!;
+    const penultimateFrame = frames[frames.length - 2]!;
 
     return penultimateFrame.inApp && !lastFrame.inApp;
   }
@@ -205,7 +205,7 @@ function Content({
   let convertedFrames = frames
     .map((frame, frameIndex) => {
       const prevFrame = frames[frameIndex - 1];
-      const nextFrame = frames[frameIndex + 1];
+      const nextFrame = frames[frameIndex + 1]!;
       const repeatedFrame = isRepeatedFrame(frame, nextFrame);
 
       if (repeatedFrame) {
@@ -284,7 +284,7 @@ function Content({
 
   if (convertedFrames.length > 0 && registers) {
     const lastFrame = convertedFrames.length - 1;
-    convertedFrames[lastFrame] = cloneElement(convertedFrames[lastFrame], {
+    convertedFrames[lastFrame] = cloneElement(convertedFrames[lastFrame]!, {
       registers,
     });
   }
diff --git a/static/app/components/events/interfaces/crashContent/stackTrace/nativeContent.spec.tsx b/static/app/components/events/interfaces/crashContent/stackTrace/nativeContent.spec.tsx
index 8b35b2cca3a923..ee730e66b6d972 100644
--- a/static/app/components/events/interfaces/crashContent/stackTrace/nativeContent.spec.tsx
+++ b/static/app/components/events/interfaces/crashContent/stackTrace/nativeContent.spec.tsx
@@ -67,7 +67,7 @@ describe('Native StackTrace', function () {
   });
   it('does not render non in app tags', function () {
     const dataFrames = [...data.frames];
-    dataFrames[0] = {...dataFrames[0], inApp: false};
+    dataFrames[0] = {...dataFrames[0]!, inApp: false};
 
     const newData = {
       ...data,
@@ -83,7 +83,7 @@ describe('Native StackTrace', function () {
 
   it('displays a toggle button when there is more than one non-inapp frame', function () {
     const dataFrames = [...data.frames];
-    dataFrames[0] = {...dataFrames[0], inApp: true};
+    dataFrames[0] = {...dataFrames[0]!, inApp: true};
 
     const newData = {
       ...data,
@@ -100,11 +100,11 @@ describe('Native StackTrace', function () {
 
   it('shows/hides frames when toggle button clicked', async function () {
     const dataFrames = [...data.frames];
-    dataFrames[0] = {...dataFrames[0], inApp: true};
-    dataFrames[1] = {...dataFrames[1], function: 'non-in-app-frame'};
-    dataFrames[2] = {...dataFrames[2], function: 'non-in-app-frame'};
-    dataFrames[3] = {...dataFrames[3], function: 'non-in-app-frame'};
-    dataFrames[4] = {...dataFrames[4], function: 'non-in-app-frame'};
+    dataFrames[0] = {...dataFrames[0]!, inApp: true};
+    dataFrames[1] = {...dataFrames[1]!, function: 'non-in-app-frame'};
+    dataFrames[2] = {...dataFrames[2]!, function: 'non-in-app-frame'};
+    dataFrames[3] = {...dataFrames[3]!, function: 'non-in-app-frame'};
+    dataFrames[4] = {...dataFrames[4]!, function: 'non-in-app-frame'};
 
     const newData = {
       ...data,
@@ -123,9 +123,9 @@ describe('Native StackTrace', function () {
 
   it('does not display a toggle button when there is only one non-inapp frame', function () {
     const dataFrames = [...data.frames];
-    dataFrames[0] = {...dataFrames[0], inApp: true};
-    dataFrames[2] = {...dataFrames[2], inApp: true};
-    dataFrames[4] = {...dataFrames[4], inApp: true};
+    dataFrames[0] = {...dataFrames[0]!, inApp: true};
+    dataFrames[2] = {...dataFrames[2]!, inApp: true};
+    dataFrames[4] = {...dataFrames[4]!, inApp: true};
 
     const newData = {
       ...data,
@@ -165,10 +165,12 @@ describe('Native StackTrace', function () {
 
     const frames = screen.getAllByTestId('stack-trace-frame');
 
-    expect(within(frames[0]).getByTestId('symbolication-error-icon')).toBeInTheDocument();
     expect(
-      within(frames[1]).getByTestId('symbolication-warning-icon')
+      within(frames[0]!).getByTestId('symbolication-error-icon')
     ).toBeInTheDocument();
-    expect(within(frames[2]).queryByTestId(/symbolication/)).not.toBeInTheDocument();
+    expect(
+      within(frames[1]!).getByTestId('symbolication-warning-icon')
+    ).toBeInTheDocument();
+    expect(within(frames[2]!).queryByTestId(/symbolication/)).not.toBeInTheDocument();
   });
 });
diff --git a/static/app/components/events/interfaces/crashContent/stackTrace/nativeContent.tsx b/static/app/components/events/interfaces/crashContent/stackTrace/nativeContent.tsx
index 53becef22c7c10..b6032c1ff7bdb4 100644
--- a/static/app/components/events/interfaces/crashContent/stackTrace/nativeContent.tsx
+++ b/static/app/components/events/interfaces/crashContent/stackTrace/nativeContent.tsx
@@ -74,7 +74,7 @@ export function NativeContent({
   function setInitialFrameMap(): {[frameIndex: number]: boolean} {
     const indexMap = {};
     (data.frames ?? []).forEach((frame, frameIdx) => {
-      const nextFrame = (data.frames ?? [])[frameIdx + 1];
+      const nextFrame = (data.frames ?? [])[frameIdx + 1]!;
       const repeatedFrame = isRepeatedFrame(frame, nextFrame);
       if (frameIsVisible(frame, nextFrame) && !repeatedFrame && !frame.inApp) {
         indexMap[frameIdx] = false;
@@ -87,7 +87,7 @@ export function NativeContent({
     let count = 0;
     const countMap = {};
     (data.frames ?? []).forEach((frame, frameIdx) => {
-      const nextFrame = (data.frames ?? [])[frameIdx + 1];
+      const nextFrame = (data.frames ?? [])[frameIdx + 1]!;
       const repeatedFrame = isRepeatedFrame(frame, nextFrame);
       if (frameIsVisible(frame, nextFrame) && !repeatedFrame && !frame.inApp) {
         countMap[frameIdx] = count;
@@ -180,7 +180,7 @@ export function NativeContent({
   let convertedFrames = frames
     .map((frame, frameIndex) => {
       const prevFrame = frames[frameIndex - 1];
-      const nextFrame = frames[frameIndex + 1];
+      const nextFrame = frames[frameIndex + 1]!;
       const repeatedFrame = isRepeatedFrame(frame, nextFrame);
 
       if (repeatedFrame) {
@@ -260,7 +260,7 @@ export function NativeContent({
 
   if (convertedFrames.length > 0 && registers) {
     const lastFrame = convertedFrames.length - 1;
-    convertedFrames[lastFrame] = cloneElement(convertedFrames[lastFrame], {
+    convertedFrames[lastFrame] = cloneElement(convertedFrames[lastFrame]!, {
       registers,
     });
   }
diff --git a/static/app/components/events/interfaces/crashContent/stackTrace/rawContent.spec.tsx b/static/app/components/events/interfaces/crashContent/stackTrace/rawContent.spec.tsx
index b53c5a6a694736..57ea9b323495d3 100644
--- a/static/app/components/events/interfaces/crashContent/stackTrace/rawContent.spec.tsx
+++ b/static/app/components/events/interfaces/crashContent/stackTrace/rawContent.spec.tsx
@@ -19,7 +19,7 @@ describe('RawStacktraceContent', () => {
             lineNo: 582,
           })
         )
-      ).toEqual(
+      ).toBe(
         '    at org.mortbay.thread.QueuedThreadPool$PoolThread.run(QueuedThreadPool.java:582)'
       );
 
@@ -32,7 +32,7 @@ describe('RawStacktraceContent', () => {
             filename: 'QueuedThreadPool.java',
           })
         )
-      ).toEqual(
+      ).toBe(
         '    at org.mortbay.thread.QueuedThreadPool$PoolThread.run(QueuedThreadPool.java)'
       );
 
@@ -45,7 +45,7 @@ describe('RawStacktraceContent', () => {
             filename: 'QueuedThreadPool.java',
           })
         )
-      ).toEqual(
+      ).toBe(
         '    at org.mortbay.thread.QueuedThreadPool$PoolThread.run(QueuedThreadPool.java)'
       );
     });
@@ -61,7 +61,7 @@ describe('RawStacktraceContent', () => {
             module: undefined,
           })
         )
-      ).toEqual('Baz: message');
+      ).toBe('Baz: message');
     });
 
     it('takes a module name', () => {
@@ -73,7 +73,7 @@ describe('RawStacktraceContent', () => {
             value: 'message',
           })
         )
-      ).toEqual('foo.bar.Baz: message');
+      ).toBe('foo.bar.Baz: message');
     });
   });
 
@@ -107,7 +107,7 @@ describe('RawStacktraceContent', () => {
     };
 
     it('renders java example', () => {
-      expect(displayRawContent(data, 'java', exception)).toEqual(
+      expect(displayRawContent(data, 'java', exception)).toBe(
         `example.application.Error: an error occurred
     at example.application.doThing(application:2)
     at example.application.main(application:1)`
@@ -115,7 +115,7 @@ describe('RawStacktraceContent', () => {
     });
 
     it('renders python example', () => {
-      expect(displayRawContent(data, 'python', exception)).toEqual(
+      expect(displayRawContent(data, 'python', exception)).toBe(
         `Error: an error occurred
   File "application", line 1, in main
   File "application", line 2, in doThing`
@@ -153,7 +153,7 @@ describe('RawStacktraceContent', () => {
           }),
         ],
       };
-      expect(displayRawContent(dartData, 'dart', exception)).toEqual(
+      expect(displayRawContent(dartData, 'dart', exception)).toBe(
         `Error: an error occurred
   #0      main (package:sentry_flutter/main.dart:778:5)
   #1      <asynchronous suspension>
@@ -161,7 +161,7 @@ describe('RawStacktraceContent', () => {
       );
     });
 
-    const inAppFrame = (fnName, line) =>
+    const inAppFrame = (fnName: string, line: number) =>
       FrameFixture({
         function: fnName,
         module: 'example.application',
@@ -169,7 +169,7 @@ describe('RawStacktraceContent', () => {
         filename: 'application',
         platform: undefined,
       });
-    const systemFrame = (fnName, line) =>
+    const systemFrame = (fnName: string, line: number) =>
       FrameFixture({
         function: fnName,
         module: 'example.application',
@@ -203,7 +203,7 @@ describe('RawStacktraceContent', () => {
     it.each([onlyInAppFrames, onlySystemFrames, mixedFrames])(
       'renders all frames when similarity flag is off, in-app or not',
       stacktrace => {
-        expect(displayRawContent(stacktrace, 'python', exception)).toEqual(
+        expect(displayRawContent(stacktrace, 'python', exception)).toBe(
           `Error: an error occurred
   File "application", line 1, in main
   File "application", line 2, in doThing`
@@ -221,7 +221,7 @@ describe('RawStacktraceContent', () => {
             exception,
             similarityFeatureEnabled
           )
-        ).toEqual(
+        ).toBe(
           `Error: an error occurred
   File "application", line 1, in main
   File "application", line 2, in doThing`
@@ -230,7 +230,7 @@ describe('RawStacktraceContent', () => {
     );
 
     it('renders only in-app frames when they exist and hasSimilarityEmbeddingsFeature is on', () => {
-      expect(displayRawContent(mixedFrames, 'python', exception, true)).toEqual(
+      expect(displayRawContent(mixedFrames, 'python', exception, true)).toBe(
         `Error: an error occurred
   File "application", line 1, in main`
       );
diff --git a/static/app/components/events/interfaces/crons/cronTimelineSection.tsx b/static/app/components/events/interfaces/crons/cronTimelineSection.tsx
index 53bd9bc1d4eab7..de2d12be6c5446 100644
--- a/static/app/components/events/interfaces/crons/cronTimelineSection.tsx
+++ b/static/app/components/events/interfaces/crons/cronTimelineSection.tsx
@@ -120,7 +120,7 @@ export function CronTimelineSection({event, organization, project}: Props) {
             </EventLineLabel>
             <FadeInContainer>
               <CheckInTimeline
-                bucketedData={monitorStats[monitorId]}
+                bucketedData={monitorStats[monitorId]!}
                 timeWindowConfig={timeWindowConfig}
                 environment={environment ?? DEFAULT_ENVIRONMENT}
               />
diff --git a/static/app/components/events/interfaces/csp/index.spec.tsx b/static/app/components/events/interfaces/csp/index.spec.tsx
index 4d7b1efc0d91df..048f83cd478626 100644
--- a/static/app/components/events/interfaces/csp/index.spec.tsx
+++ b/static/app/components/events/interfaces/csp/index.spec.tsx
@@ -21,7 +21,7 @@ describe('Csp report entry', function () {
         },
       },
     });
-    render(<Csp data={event.entries[0].data} event={event} />, {
+    render(<Csp data={event.entries[0]!.data} event={event} />, {
       organization: {
         relayPiiConfig: JSON.stringify(DataScrubbingRelayPiiConfigFixture()),
       },
diff --git a/static/app/components/events/interfaces/debugMeta/index.tsx b/static/app/components/events/interfaces/debugMeta/index.tsx
index 9ee105aa9b2231..d48bec86431180 100644
--- a/static/app/components/events/interfaces/debugMeta/index.tsx
+++ b/static/app/components/events/interfaces/debugMeta/index.tsx
@@ -82,8 +82,8 @@ function applyImageFilters(
       if (term.indexOf('0x') === 0) {
         const needle = parseAddress(term);
         if (needle > 0 && image.image_addr !== '0x0') {
-          const [startAddress, endAddress] = getImageRange(image as any); // TODO(PRISCILA): remove any
-          return needle >= startAddress && needle < endAddress;
+          const [startAddress, endAddress] = getImageRange(image);
+          return needle >= startAddress! && needle < endAddress!;
         }
       }
 
@@ -184,7 +184,7 @@ export function DebugMeta({data, projectSlug, groupId, event}: DebugMetaProps) {
     ];
 
     const defaultFilterSelections = (
-      'options' in filterOptions[0] ? filterOptions[0].options : []
+      'options' in filterOptions[0]! ? filterOptions[0].options : []
     ).filter(opt => opt.value !== ImageStatus.UNUSED);
 
     setFilterState({
@@ -320,7 +320,7 @@ export function DebugMeta({data, projectSlug, groupId, event}: DebugMetaProps) {
       >
         <DebugImage
           style={style}
-          image={images[index]}
+          image={images[index]!}
           onOpenImageDetailsModal={handleOpenImageDetailsModal}
         />
       </CellMeasurer>
diff --git a/static/app/components/events/interfaces/frame/context.tsx b/static/app/components/events/interfaces/frame/context.tsx
index 41c1d465915525..b536195bb65d65 100644
--- a/static/app/components/events/interfaces/frame/context.tsx
+++ b/static/app/components/events/interfaces/frame/context.tsx
@@ -141,7 +141,7 @@ function Context({
     ) : null;
   }
 
-  const startLineNo = hasContextSource ? frame.context[0][0] : 0;
+  const startLineNo = hasContextSource ? frame.context[0]![0] : 0;
 
   const prismClassName = fileExtension ? `language-${fileExtension}` : '';
 
@@ -157,14 +157,14 @@ function Context({
           <pre className={prismClassName}>
             <code className={prismClassName}>
               {lines.map((line, i) => {
-                const contextLine = contextLines[i];
-                const isActive = activeLineNumber === contextLine[0];
+                const contextLine = contextLines[i]!;
+                const isActive = activeLineNumber === contextLine[0]!;
 
                 return (
                   <Fragment key={i}>
                     <ContextLineWrapper isActive={isActive} data-test-id="context-line">
                       <ContextLineNumber
-                        lineNumber={contextLine[0]}
+                        lineNumber={contextLine[0]!}
                         isActive={isActive}
                         coverage={lineCoverage[i]}
                       />
diff --git a/static/app/components/events/interfaces/frame/contextLine.tsx b/static/app/components/events/interfaces/frame/contextLine.tsx
index 728f36bca89365..0173962dfd3ef4 100644
--- a/static/app/components/events/interfaces/frame/contextLine.tsx
+++ b/static/app/components/events/interfaces/frame/contextLine.tsx
@@ -30,7 +30,7 @@ function ContextLine({line, isActive, children, coverage = ''}: Props) {
   let lineWs = '';
   let lineCode = '';
   if (typeof line[1] === 'string') {
-    [, lineWs, lineCode] = line[1].match(/^(\s*)(.*?)$/m)!;
+    [, lineWs, lineCode] = line[1].match(/^(\s*)(.*?)$/m)! as [string, string, string];
   }
 
   return (
diff --git a/static/app/components/events/interfaces/frame/deprecatedLine.tsx b/static/app/components/events/interfaces/frame/deprecatedLine.tsx
index df32df23de9a06..a516723d0ee7e4 100644
--- a/static/app/components/events/interfaces/frame/deprecatedLine.tsx
+++ b/static/app/components/events/interfaces/frame/deprecatedLine.tsx
@@ -8,7 +8,7 @@ import {Button} from 'sentry/components/button';
 import {Chevron} from 'sentry/components/chevron';
 import ErrorBoundary from 'sentry/components/errorBoundary';
 import {analyzeFrameForRootCause} from 'sentry/components/events/interfaces/analyzeFrames';
-import LeadHint from 'sentry/components/events/interfaces/frame/line/leadHint';
+import LeadHint from 'sentry/components/events/interfaces/frame/leadHint';
 import {StacktraceLink} from 'sentry/components/events/interfaces/frame/stacktraceLink';
 import type {FrameSourceMapDebuggerData} from 'sentry/components/events/interfaces/sourceMapsDebuggerModal';
 import {SourceMapsDebuggerModal} from 'sentry/components/events/interfaces/sourceMapsDebuggerModal';
diff --git a/static/app/components/events/interfaces/frame/frameVariables.spec.tsx b/static/app/components/events/interfaces/frame/frameVariables.spec.tsx
index e173bf7c25e1df..4bfd5660fffce9 100644
--- a/static/app/components/events/interfaces/frame/frameVariables.spec.tsx
+++ b/static/app/components/events/interfaces/frame/frameVariables.spec.tsx
@@ -75,7 +75,7 @@ describe('Frame Variables', function () {
 
     expect(screen.getAllByText(/redacted/)).toHaveLength(2);
 
-    await userEvent.hover(screen.getAllByText(/redacted/)[0]);
+    await userEvent.hover(screen.getAllByText(/redacted/)[0]!);
 
     expect(
       await screen.findByText(
@@ -147,8 +147,8 @@ describe('Frame Variables', function () {
 
     const nullValues = screen.getAllByTestId('value-null');
 
-    expect(within(nullValues[0]).getByText('null')).toBeInTheDocument();
-    expect(within(nullValues[1]).getByText('undefined')).toBeInTheDocument();
+    expect(within(nullValues[0]!).getByText('null')).toBeInTheDocument();
+    expect(within(nullValues[1]!).getByText('undefined')).toBeInTheDocument();
     expect(
       within(screen.getByTestId('value-boolean')).getByText('true')
     ).toBeInTheDocument();
diff --git a/static/app/components/events/interfaces/frame/line/leadHint.tsx b/static/app/components/events/interfaces/frame/leadHint.tsx
similarity index 100%
rename from static/app/components/events/interfaces/frame/line/leadHint.tsx
rename to static/app/components/events/interfaces/frame/leadHint.tsx
diff --git a/static/app/components/events/interfaces/frame/line/default.tsx b/static/app/components/events/interfaces/frame/line/default.tsx
deleted file mode 100644
index 1bd1b0246a273d..00000000000000
--- a/static/app/components/events/interfaces/frame/line/default.tsx
+++ /dev/null
@@ -1,121 +0,0 @@
-import styled from '@emotion/styled';
-
-import {IconRefresh} from 'sentry/icons/iconRefresh';
-import {tn} from 'sentry/locale';
-import {space} from 'sentry/styles/space';
-import type {Frame} from 'sentry/types/event';
-import {defined} from 'sentry/utils';
-
-import DefaultTitle from '../defaultTitle';
-
-import Expander from './expander';
-import LeadHint from './leadHint';
-import Wrapper from './wrapper';
-
-type Props = React.ComponentProps<typeof Expander> &
-  React.ComponentProps<typeof LeadHint> & {
-    frame: Frame;
-    isUsedForGrouping: boolean;
-    frameMeta?: Record<any, any>;
-    onClick?: () => void;
-    onMouseDown?: React.MouseEventHandler<HTMLDivElement>;
-    timesRepeated?: number;
-  };
-
-function Default({
-  frame,
-  nextFrame,
-  isHoverPreviewed,
-  isExpanded,
-  platform,
-  timesRepeated,
-  isUsedForGrouping,
-  leadsToApp,
-  onMouseDown,
-  onClick,
-  frameMeta,
-  event,
-  ...props
-}: Props) {
-  function renderRepeats() {
-    if (defined(timesRepeated) && timesRepeated > 0) {
-      return (
-        <RepeatedFrames
-          title={tn('Frame repeated %s time', 'Frame repeated %s times', timesRepeated)}
-        >
-          <RepeatedContent>
-            <StyledIconRefresh />
-            <span>{timesRepeated}</span>
-          </RepeatedContent>
-        </RepeatedFrames>
-      );
-    }
-
-    return null;
-  }
-
-  return (
-    <Wrapper className="title" onMouseDown={onMouseDown} onClick={onClick}>
-      <VertCenterWrapper>
-        <Title>
-          <LeadHint
-            event={event}
-            isExpanded={isExpanded}
-            nextFrame={nextFrame}
-            leadsToApp={leadsToApp}
-          />
-          <DefaultTitle
-            frame={frame}
-            platform={platform}
-            isHoverPreviewed={isHoverPreviewed}
-            isUsedForGrouping={isUsedForGrouping}
-            meta={frameMeta}
-          />
-        </Title>
-        {renderRepeats()}
-      </VertCenterWrapper>
-      <Expander
-        isExpanded={isExpanded}
-        isHoverPreviewed={isHoverPreviewed}
-        platform={platform}
-        {...props}
-      />
-    </Wrapper>
-  );
-}
-
-export default Default;
-
-const VertCenterWrapper = styled('div')`
-  display: flex;
-  align-items: center;
-`;
-
-const Title = styled('div')`
-  > * {
-    vertical-align: middle;
-    line-height: 1;
-  }
-`;
-
-const RepeatedContent = styled(VertCenterWrapper)`
-  justify-content: center;
-  margin-right: ${space(1)};
-`;
-
-const RepeatedFrames = styled('div')`
-  display: inline-block;
-  border-radius: 50px;
-  padding: 1px 3px;
-  margin-left: ${space(1)};
-  border-width: thin;
-  border-style: solid;
-  border-color: ${p => p.theme.pink200};
-  color: ${p => p.theme.pink400};
-  background-color: ${p => p.theme.backgroundSecondary};
-  white-space: nowrap;
-`;
-
-const StyledIconRefresh = styled(IconRefresh)`
-  margin-right: ${space(0.25)};
-`;
diff --git a/static/app/components/events/interfaces/frame/line/expander.tsx b/static/app/components/events/interfaces/frame/line/expander.tsx
deleted file mode 100644
index affec201d79349..00000000000000
--- a/static/app/components/events/interfaces/frame/line/expander.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import styled from '@emotion/styled';
-
-import {Button} from 'sentry/components/button';
-import {SLOW_TOOLTIP_DELAY} from 'sentry/constants';
-import {IconChevron} from 'sentry/icons/iconChevron';
-import {t} from 'sentry/locale';
-import {space} from 'sentry/styles/space';
-import type {PlatformKey} from 'sentry/types/project';
-
-type Props = {
-  isExpandable: boolean;
-  onToggleContext: (evt: React.MouseEvent) => void;
-  platform: PlatformKey;
-  isExpanded?: boolean;
-  isHoverPreviewed?: boolean;
-};
-
-function Expander({isExpandable, isHoverPreviewed, isExpanded, onToggleContext}: Props) {
-  if (!isExpandable) {
-    return null;
-  }
-
-  return (
-    <StyledButton
-      className="btn-toggle"
-      size="zero"
-      aria-label={t('Toggle Context')}
-      tooltipProps={isHoverPreviewed ? {delay: SLOW_TOOLTIP_DELAY} : undefined}
-      onClick={onToggleContext}
-    >
-      <IconChevron direction={isExpanded ? 'up' : 'down'} legacySize="8px" />
-    </StyledButton>
-  );
-}
-
-export default Expander;
-
-// the Button's label has the padding of 3px because the button size has to be 16x16 px.
-const StyledButton = styled(Button)`
-  margin-left: ${space(1)};
-  span:first-child {
-    padding: 3px;
-  }
-`;
diff --git a/static/app/components/events/interfaces/frame/line/index.tsx b/static/app/components/events/interfaces/frame/line/index.tsx
deleted file mode 100644
index ee051d3a10e4c1..00000000000000
--- a/static/app/components/events/interfaces/frame/line/index.tsx
+++ /dev/null
@@ -1,197 +0,0 @@
-import {useState} from 'react';
-import styled from '@emotion/styled';
-import classNames from 'classnames';
-
-import ListItem from 'sentry/components/list/listItem';
-import StrictClick from 'sentry/components/strictClick';
-import type {Event} from 'sentry/types/event';
-import type {
-  SentryAppComponent,
-  SentryAppSchemaStacktraceLink,
-} from 'sentry/types/integrations';
-import type {PlatformKey} from 'sentry/types/project';
-import withSentryAppComponents from 'sentry/utils/withSentryAppComponents';
-
-import Context from '../context';
-import {PackageStatusIcon} from '../packageStatus';
-import {FunctionNameToggleIcon} from '../symbol';
-import {AddressToggleIcon} from '../togglableAddress';
-import {
-  getPlatform,
-  hasAssembly,
-  hasContextRegisters,
-  hasContextSource,
-  hasContextVars,
-  isExpandable,
-} from '../utils';
-
-import Default from './default';
-import {Native} from './native';
-
-type Props = Omit<
-  React.ComponentProps<typeof Native>,
-  'onToggleContext' | 'isExpandable' | 'leadsToApp' | 'hasGroupingBadge'
-> &
-  Omit<
-    React.ComponentProps<typeof Default>,
-    'onToggleContext' | 'isExpandable' | 'leadsToApp' | 'hasGroupingBadge'
-  > & {
-    components: SentryAppComponent<SentryAppSchemaStacktraceLink>[];
-    event: Event;
-    registers: Record<string, string>;
-    emptySourceNotation?: boolean;
-    frameMeta?: Record<string, any>;
-    isOnlyFrame?: boolean;
-    registersMeta?: Record<string, any>;
-  };
-
-function Line({
-  frame,
-  nextFrame,
-  prevFrame,
-  timesRepeated,
-  includeSystemFrames,
-  isFrameAfterLastNonApp,
-  isUsedForGrouping,
-  maxLengthOfRelativeAddress,
-  image,
-  registers,
-  isOnlyFrame,
-  event,
-  components,
-  frameMeta,
-  registersMeta,
-  emptySourceNotation = false,
-  /**
-   * Is the stack trace being previewed in a hovercard?
-   */
-  isHoverPreviewed = false,
-  ...props
-}: Props) {
-  // Prioritize the frame platform but fall back to the platform
-  // of the stack trace / exception
-  const platform = getPlatform(frame.platform, props.platform ?? 'other') as PlatformKey;
-  const leadsToApp = !frame.inApp && (nextFrame?.inApp || !nextFrame);
-
-  const expandable =
-    !leadsToApp || includeSystemFrames
-      ? isExpandable({
-          frame,
-          registers,
-          platform,
-          emptySourceNotation,
-          isOnlyFrame,
-        })
-      : false;
-
-  const [isExpanded, setIsExpanded] = useState(
-    expandable ? props.isExpanded ?? false : false
-  );
-
-  function toggleContext(evt: React.MouseEvent) {
-    evt.preventDefault();
-    setIsExpanded(!isExpanded);
-  }
-
-  function renderLine() {
-    switch (platform) {
-      case 'objc':
-      case 'cocoa':
-      case 'native':
-      case 'nintendo-switch':
-        return (
-          <Native
-            event={event}
-            leadsToApp={leadsToApp}
-            frame={frame}
-            prevFrame={prevFrame}
-            nextFrame={nextFrame}
-            isHoverPreviewed={isHoverPreviewed}
-            platform={platform}
-            isExpanded={isExpanded}
-            isExpandable={expandable}
-            includeSystemFrames={includeSystemFrames}
-            isFrameAfterLastNonApp={isFrameAfterLastNonApp}
-            onToggleContext={toggleContext}
-            image={image}
-            maxLengthOfRelativeAddress={maxLengthOfRelativeAddress}
-            isUsedForGrouping={isUsedForGrouping}
-          />
-        );
-      default:
-        return (
-          <Default
-            event={event}
-            leadsToApp={leadsToApp}
-            frame={frame}
-            nextFrame={nextFrame}
-            timesRepeated={timesRepeated}
-            isHoverPreviewed={isHoverPreviewed}
-            platform={platform}
-            isExpanded={isExpanded}
-            isExpandable={expandable}
-            onToggleContext={toggleContext}
-            isUsedForGrouping={isUsedForGrouping}
-            frameMeta={frameMeta}
-          />
-        );
-    }
-  }
-
-  const className = classNames({
-    frame: true,
-    'is-expandable': expandable,
-    expanded: isExpanded,
-    collapsed: !isExpanded,
-    'system-frame': !frame.inApp,
-    'leads-to-app': leadsToApp,
-  });
-
-  return (
-    <StyleListItem className={className} data-test-id="stack-trace-frame">
-      <StrictClick onClick={expandable ? toggleContext : undefined}>
-        {renderLine()}
-      </StrictClick>
-      <Context
-        frame={frame}
-        event={event}
-        registers={registers}
-        components={components}
-        hasContextSource={hasContextSource(frame)}
-        hasContextVars={hasContextVars(frame)}
-        hasContextRegisters={hasContextRegisters(registers)}
-        emptySourceNotation={emptySourceNotation}
-        hasAssembly={hasAssembly(frame, platform)}
-        isExpanded={isExpanded}
-        registersMeta={registersMeta}
-        frameMeta={frameMeta}
-        platform={platform}
-      />
-    </StyleListItem>
-  );
-}
-
-export default withSentryAppComponents(Line, {componentType: 'stacktrace-link'});
-
-const StyleListItem = styled(ListItem)`
-  overflow: hidden;
-
-  :first-child {
-    border-top: none;
-  }
-
-  ${PackageStatusIcon} {
-    flex-shrink: 0;
-  }
-  :hover {
-    ${PackageStatusIcon} {
-      visibility: visible;
-    }
-    ${AddressToggleIcon} {
-      visibility: visible;
-    }
-    ${FunctionNameToggleIcon} {
-      visibility: visible;
-    }
-  }
-`;
diff --git a/static/app/components/events/interfaces/frame/line/native.tsx b/static/app/components/events/interfaces/frame/line/native.tsx
deleted file mode 100644
index 6443bf4be74ab4..00000000000000
--- a/static/app/components/events/interfaces/frame/line/native.tsx
+++ /dev/null
@@ -1,205 +0,0 @@
-import {useContext} from 'react';
-import styled from '@emotion/styled';
-
-import {TraceEventDataSectionContext} from 'sentry/components/events/traceEventDataSection';
-import {t} from 'sentry/locale';
-import DebugMetaStore from 'sentry/stores/debugMetaStore';
-import {space} from 'sentry/styles/space';
-import type {Frame} from 'sentry/types/event';
-import {SectionKey} from 'sentry/views/issueDetails/streamline/context';
-
-import type DebugImage from '../../debugMeta/debugImage';
-import {combineStatus} from '../../debugMeta/utils';
-import {SymbolicatorStatus} from '../../types';
-import PackageLink from '../packageLink';
-import PackageStatus from '../packageStatus';
-import Symbol from '../symbol';
-import TogglableAddress from '../togglableAddress';
-import {getPlatform} from '../utils';
-
-import Expander from './expander';
-import LeadHint from './leadHint';
-import Wrapper from './wrapper';
-
-type Props = React.ComponentProps<typeof Expander> &
-  React.ComponentProps<typeof LeadHint> & {
-    frame: Frame;
-    isUsedForGrouping: boolean;
-    image?: React.ComponentProps<typeof DebugImage>['image'];
-    includeSystemFrames?: boolean;
-    isFrameAfterLastNonApp?: boolean;
-    maxLengthOfRelativeAddress?: number;
-    onClick?: () => void;
-    onMouseDown?: React.MouseEventHandler<HTMLDivElement>;
-    prevFrame?: Frame;
-  };
-
-export function Native({
-  frame,
-  isFrameAfterLastNonApp,
-  isExpanded,
-  isHoverPreviewed,
-  image,
-  includeSystemFrames,
-  maxLengthOfRelativeAddress,
-  platform,
-  prevFrame,
-  isUsedForGrouping,
-  nextFrame,
-  leadsToApp,
-  onMouseDown,
-  onClick,
-  event,
-  ...props
-}: Props) {
-  const traceEventDataSectionContext = useContext(TraceEventDataSectionContext);
-
-  if (!traceEventDataSectionContext) {
-    return null;
-  }
-
-  const {instructionAddr, trust, addrMode, symbolicatorStatus} = frame ?? {};
-
-  function packageStatus() {
-    // this is the status of image that belongs to this frame
-    if (!image) {
-      return 'empty';
-    }
-
-    const combinedStatus = combineStatus(image.debug_status, image.unwind_status);
-
-    switch (combinedStatus) {
-      case 'unused':
-        return 'empty';
-      case 'found':
-        return 'success';
-      default:
-        return 'error';
-    }
-  }
-
-  function makeFilter(addr: string): string {
-    if (!(!addrMode || addrMode === 'abs') && image) {
-      return `${image.debug_id}!${addr}`;
-    }
-
-    return addr;
-  }
-
-  function scrollToImage(e: React.MouseEvent<HTMLAnchorElement>) {
-    e.stopPropagation(); // to prevent collapsing if collapsible
-
-    if (instructionAddr) {
-      DebugMetaStore.updateFilter(makeFilter(instructionAddr));
-    }
-
-    document
-      .getElementById(SectionKey.DEBUGMETA)
-      ?.scrollIntoView({block: 'start', behavior: 'smooth'});
-  }
-
-  const shouldShowLinkToImage =
-    !!symbolicatorStatus &&
-    symbolicatorStatus !== SymbolicatorStatus.UNKNOWN_IMAGE &&
-    !isHoverPreviewed;
-
-  const isInlineFrame =
-    prevFrame &&
-    getPlatform(frame.platform, platform ?? 'other') ===
-      (prevFrame.platform || platform) &&
-    instructionAddr === prevFrame.instructionAddr;
-
-  const isFoundByStackScanning = trust === 'scan' || trust === 'cfi-scan';
-
-  return (
-    <Wrapper className="title as-table" onMouseDown={onMouseDown} onClick={onClick}>
-      <NativeLineContent isFrameAfterLastNonApp={!!isFrameAfterLastNonApp}>
-        <PackageInfo>
-          <LeadHint
-            event={event}
-            isExpanded={isExpanded}
-            nextFrame={nextFrame}
-            leadsToApp={leadsToApp}
-          />
-          <PackageLink
-            includeSystemFrames={!!includeSystemFrames}
-            withLeadHint={!(isExpanded || !leadsToApp)}
-            packagePath={frame.package}
-            onClick={scrollToImage}
-            isClickable={shouldShowLinkToImage}
-            isHoverPreviewed={isHoverPreviewed}
-          >
-            {!isHoverPreviewed && (
-              <PackageStatus
-                status={packageStatus()}
-                tooltip={t('Go to Images Loaded')}
-              />
-            )}
-          </PackageLink>
-        </PackageInfo>
-        {instructionAddr && (
-          <TogglableAddress
-            address={instructionAddr}
-            startingAddress={image ? image.image_addr ?? null : null}
-            isAbsolute={traceEventDataSectionContext.display.includes(
-              'absolute-addresses'
-            )}
-            isFoundByStackScanning={isFoundByStackScanning}
-            isInlineFrame={!!isInlineFrame}
-            relativeAddressMaxlength={maxLengthOfRelativeAddress}
-            isHoverPreviewed={isHoverPreviewed}
-          />
-        )}
-        <Symbol
-          frame={frame}
-          showCompleteFunctionName={traceEventDataSectionContext.display.includes(
-            'verbose-function-names'
-          )}
-          absoluteFilePaths={traceEventDataSectionContext.display.includes(
-            'absolute-file-paths'
-          )}
-          isHoverPreviewed={isHoverPreviewed}
-          isUsedForGrouping={isUsedForGrouping}
-        />
-      </NativeLineContent>
-      <Expander
-        isExpanded={isExpanded}
-        isHoverPreviewed={isHoverPreviewed}
-        platform={platform}
-        {...props}
-      />
-    </Wrapper>
-  );
-}
-
-const PackageInfo = styled('span')`
-  display: grid;
-  grid-template-columns: auto 1fr;
-  order: 2;
-  align-items: flex-start;
-  @media (min-width: ${props => props.theme.breakpoints.small}) {
-    order: 0;
-  }
-`;
-
-const NativeLineContent = styled('div')<{isFrameAfterLastNonApp: boolean}>`
-  display: grid;
-  flex: 1;
-  gap: ${space(0.5)};
-  grid-template-columns: auto 1fr;
-  align-items: center;
-  justify-content: flex-start;
-
-  @media (min-width: ${props => props.theme.breakpoints.small}) {
-    grid-template-columns:
-      ${p => (p.isFrameAfterLastNonApp ? '200px' : '150px')} minmax(117px, auto)
-      1fr;
-  }
-
-  @media (min-width: ${props => props.theme.breakpoints.large}) and (max-width: ${props =>
-      props.theme.breakpoints.xlarge}) {
-    grid-template-columns:
-      ${p => (p.isFrameAfterLastNonApp ? '180px' : '140px')} minmax(117px, auto)
-      1fr;
-  }
-`;
diff --git a/static/app/components/events/interfaces/frame/line/wrapper.tsx b/static/app/components/events/interfaces/frame/line/wrapper.tsx
deleted file mode 100644
index 1e9dd06fd4242d..00000000000000
--- a/static/app/components/events/interfaces/frame/line/wrapper.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import styled from '@emotion/styled';
-
-const Wrapper = styled('div')`
-  display: grid;
-  grid-template-columns: 1fr auto;
-`;
-
-export default Wrapper;
diff --git a/static/app/components/events/interfaces/frame/stacktraceLink.tsx b/static/app/components/events/interfaces/frame/stacktraceLink.tsx
index de9c0abf74cfc3..89ec41f2e1795a 100644
--- a/static/app/components/events/interfaces/frame/stacktraceLink.tsx
+++ b/static/app/components/events/interfaces/frame/stacktraceLink.tsx
@@ -200,7 +200,7 @@ export function StacktraceLink({frame, event, line}: StacktraceLinkProps) {
       const url = new URL(sourceLink);
       const hostname = url.hostname;
       const parts = hostname.split('.');
-      const domain = parts.length > 1 ? parts[1] : '';
+      const domain = parts.length > 1 ? parts[1]! : '';
       trackAnalytics(
         'integrations.non_inapp_stacktrace_link_clicked',
         {
@@ -340,7 +340,7 @@ export function StacktraceLink({frame, event, line}: StacktraceLinkProps) {
           priority="link"
           icon={
             sourceCodeProviders.length === 1
-              ? getIntegrationIcon(sourceCodeProviders[0].provider.key, 'sm')
+              ? getIntegrationIcon(sourceCodeProviders[0]!.provider.key, 'sm')
               : undefined
           }
           onClick={() => {
@@ -349,7 +349,7 @@ export function StacktraceLink({frame, event, line}: StacktraceLinkProps) {
               {
                 view: 'stacktrace_issue_details',
                 platform: event.platform,
-                provider: sourceCodeProviders[0]?.provider.key,
+                provider: sourceCodeProviders[0]?.provider.key!,
                 setup_type: 'automatic',
                 organization,
                 ...getAnalyticsDataForEvent(event),
diff --git a/static/app/components/events/interfaces/frame/stacktraceLinkModal.tsx b/static/app/components/events/interfaces/frame/stacktraceLinkModal.tsx
index c4ef2bc695c8ba..b1cf126d46a630 100644
--- a/static/app/components/events/interfaces/frame/stacktraceLinkModal.tsx
+++ b/static/app/components/events/interfaces/frame/stacktraceLinkModal.tsx
@@ -87,10 +87,10 @@ function StacktraceLinkModal({
   // If they have more than one, they'll have to navigate themselves
   const hasOneSourceCodeIntegration = sourceCodeProviders.length === 1;
   const sourceUrl = hasOneSourceCodeIntegration
-    ? `https://${sourceCodeProviders[0].domainName}`
+    ? `https://${sourceCodeProviders[0]!.domainName}`
     : undefined;
   const providerName = hasOneSourceCodeIntegration
-    ? sourceCodeProviders[0].name
+    ? sourceCodeProviders[0]!.name
     : t('source code');
 
   const onManualSetup = () => {
@@ -99,7 +99,7 @@ function StacktraceLinkModal({
       setup_type: 'manual',
       provider:
         sourceCodeProviders.length === 1
-          ? sourceCodeProviders[0].provider.name
+          ? sourceCodeProviders[0]!.provider.name
           : 'unknown',
       organization,
     });
@@ -171,7 +171,7 @@ function StacktraceLinkModal({
                           onClick={onManualSetup}
                           to={
                             hasOneSourceCodeIntegration
-                              ? `/settings/${organization.slug}/integrations/${sourceCodeProviders[0].provider.key}/${sourceCodeProviders[0].id}/`
+                              ? `/settings/${organization.slug}/integrations/${sourceCodeProviders[0]!.provider.key}/${sourceCodeProviders[0]!.id}/`
                               : `/settings/${organization.slug}/integrations/`
                           }
                         />
@@ -200,7 +200,7 @@ function StacktraceLinkModal({
                     ? tct('Go to [link]', {
                         link: (
                           <ExternalLink href={sourceUrl}>
-                            {sourceCodeProviders[0].provider.name}
+                            {sourceCodeProviders[0]!.provider.name}
                           </ExternalLink>
                         ),
                       })
diff --git a/static/app/components/events/interfaces/frame/usePrismTokensSourceContext.tsx b/static/app/components/events/interfaces/frame/usePrismTokensSourceContext.tsx
index 7fc3e56077d458..f82ece58927308 100644
--- a/static/app/components/events/interfaces/frame/usePrismTokensSourceContext.tsx
+++ b/static/app/components/events/interfaces/frame/usePrismTokensSourceContext.tsx
@@ -253,7 +253,7 @@ export const usePrismTokensSourceContext = ({
 }) => {
   const organization = useOrganization({allowNull: true});
 
-  const fullLanguage = getPrismLanguage(fileExtension);
+  const fullLanguage = getPrismLanguage(fileExtension)!;
   const {preCode, executedCode, postCode} = convertContextLines(contextLines, lineNo);
   const code = preCode + executedCode + postCode;
 
diff --git a/static/app/components/events/interfaces/keyValueList/index.spec.tsx b/static/app/components/events/interfaces/keyValueList/index.spec.tsx
index 22f4670cac552e..f0e24cbc5b440d 100644
--- a/static/app/components/events/interfaces/keyValueList/index.spec.tsx
+++ b/static/app/components/events/interfaces/keyValueList/index.spec.tsx
@@ -14,11 +14,11 @@ describe('KeyValueList', function () {
     const rows = screen.getAllByRole('row');
     expect(rows).toHaveLength(2);
 
-    const firstColumn = within(rows[0]).getAllByRole('cell');
+    const firstColumn = within(rows[0]!).getAllByRole('cell');
     expect(firstColumn[0]).toHaveTextContent('a');
     expect(firstColumn[1]).toHaveTextContent('x');
 
-    const secondColumn = within(rows[1]).getAllByRole('cell');
+    const secondColumn = within(rows[1]!).getAllByRole('cell');
     expect(secondColumn[0]).toHaveTextContent('b');
     expect(secondColumn[1]).toHaveTextContent('y');
   });
@@ -33,11 +33,11 @@ describe('KeyValueList', function () {
 
     const rows = screen.getAllByRole('row');
 
-    const firstColumn = within(rows[0]).getAllByRole('cell');
+    const firstColumn = within(rows[0]!).getAllByRole('cell');
     expect(firstColumn[0]).toHaveTextContent('a');
     expect(firstColumn[1]).toHaveTextContent('x');
 
-    const secondColumn = within(rows[1]).getAllByRole('cell');
+    const secondColumn = within(rows[1]!).getAllByRole('cell');
     expect(secondColumn[0]).toHaveTextContent('b');
     expect(secondColumn[1]).toHaveTextContent('y');
   });
@@ -52,11 +52,11 @@ describe('KeyValueList', function () {
 
     const rows = screen.getAllByRole('row');
 
-    const firstColumn = within(rows[0]).getAllByRole('cell');
+    const firstColumn = within(rows[0]!).getAllByRole('cell');
     expect(firstColumn[0]).toHaveTextContent('a');
     expect(firstColumn[1]).toHaveTextContent(''); // empty string
 
-    const secondColumn = within(rows[1]).getAllByRole('cell');
+    const secondColumn = within(rows[1]!).getAllByRole('cell');
     expect(secondColumn[0]).toHaveTextContent('b');
     expect(secondColumn[1]).toHaveTextContent('y');
   });
@@ -72,10 +72,10 @@ describe('KeyValueList', function () {
     const rows = screen.getAllByRole('row');
 
     // Ignore values, more interested in if keys rendered + are sorted
-    const firstColumn = within(rows[0]).getAllByRole('cell');
+    const firstColumn = within(rows[0]!).getAllByRole('cell');
     expect(firstColumn[0]).toHaveTextContent('a');
 
-    const secondColumn = within(rows[1]).getAllByRole('cell');
+    const secondColumn = within(rows[1]!).getAllByRole('cell');
     expect(secondColumn[0]).toHaveTextContent('b');
   });
 
diff --git a/static/app/components/events/interfaces/nativeFrame.tsx b/static/app/components/events/interfaces/nativeFrame.tsx
index 0f598426f97037..5ad6899a7b5044 100644
--- a/static/app/components/events/interfaces/nativeFrame.tsx
+++ b/static/app/components/events/interfaces/nativeFrame.tsx
@@ -39,7 +39,7 @@ import type {PlatformKey} from 'sentry/types/project';
 import {defined} from 'sentry/utils';
 import {useSyncedLocalStorageState} from 'sentry/utils/useSyncedLocalStorageState';
 import withSentryAppComponents from 'sentry/utils/withSentryAppComponents';
-import {SectionKey, useEventDetails} from 'sentry/views/issueDetails/streamline/context';
+import {SectionKey, useIssueDetails} from 'sentry/views/issueDetails/streamline/context';
 import {getFoldSectionKey} from 'sentry/views/issueDetails/streamline/foldSection';
 import {useHasStreamlinedUI} from 'sentry/views/issueDetails/utils';
 
@@ -80,7 +80,6 @@ function NativeFrame({
   frame,
   nextFrame,
   prevFrame,
-  includeSystemFrames,
   isUsedForGrouping,
   maxLengthOfRelativeAddress,
   image,
@@ -104,7 +103,7 @@ function NativeFrame({
 }: Props) {
   const traceEventDataSectionContext = useContext(TraceEventDataSectionContext);
 
-  const {sectionData} = useEventDetails();
+  const {sectionData} = useIssueDetails();
   const debugSectionConfig = sectionData[SectionKey.DEBUGMETA];
   const [_isCollapsed, setIsCollapsed] = useSyncedLocalStorageState(
     getFoldSectionKey(SectionKey.DEBUGMETA),
@@ -134,16 +133,13 @@ function NativeFrame({
     (hasStreamlinedUI ? !!debugSectionConfig : true);
 
   const leadsToApp = !frame.inApp && (nextFrame?.inApp || !nextFrame);
-  const expandable =
-    !leadsToApp || includeSystemFrames
-      ? isExpandable({
-          frame,
-          registers,
-          platform,
-          emptySourceNotation,
-          isOnlyFrame,
-        })
-      : false;
+  const expandable = isExpandable({
+    frame,
+    registers,
+    platform,
+    emptySourceNotation,
+    isOnlyFrame,
+  });
 
   const inlineFrame =
     prevFrame &&
diff --git a/static/app/components/events/interfaces/performance/durationChart.tsx b/static/app/components/events/interfaces/performance/durationChart.tsx
deleted file mode 100644
index 265025c54cc293..00000000000000
--- a/static/app/components/events/interfaces/performance/durationChart.tsx
+++ /dev/null
@@ -1,174 +0,0 @@
-import {useRef} from 'react';
-import {useTheme} from '@emotion/react';
-import type {YAXisComponentOption} from 'echarts';
-import type {Location} from 'history';
-import moment from 'moment-timezone';
-
-import EventsRequest from 'sentry/components/charts/eventsRequest';
-import type {LineChartSeries} from 'sentry/components/charts/lineChart';
-import {LineChart} from 'sentry/components/charts/lineChart';
-import LoadingPanel from 'sentry/components/charts/loadingPanel';
-import {getInterval} from 'sentry/components/charts/utils';
-import {IconWarning} from 'sentry/icons';
-import {t} from 'sentry/locale';
-import type {Series} from 'sentry/types/echarts';
-import type {EventError} from 'sentry/types/event';
-import type {Group} from 'sentry/types/group';
-import type {Organization} from 'sentry/types/organization';
-import {
-  findRangeOfMultiSeries,
-  getDurationUnit,
-  tooltipFormatter,
-} from 'sentry/utils/discover/charts';
-import {aggregateOutputType} from 'sentry/utils/discover/fields';
-import useApi from 'sentry/utils/useApi';
-import {ErrorPanel} from 'sentry/views/performance/styles';
-
-interface Props {
-  event: EventError;
-  issue: Group;
-  location: Location;
-  organization: Organization;
-}
-
-export function DurationChart({issue, event, organization}: Props) {
-  const transactionNameTag = event.tags.find(tag => tag.key === 'transaction');
-  const transactionName = transactionNameTag ? transactionNameTag.value : '';
-
-  const spanHashTag = event.tags.find(
-    tag => tag.key === 'performance_issue.extra_spans'
-  ) || {key: '', value: ''};
-
-  const allEventsQuery = `event.type:transaction transaction:${transactionName}`;
-  const affectedEventsQuery = `${allEventsQuery} ${spanHashTag.key}:${spanHashTag.value}`;
-
-  const allEventsApi = useApi();
-  const affectedEventsApi = useApi();
-
-  const nowRef = useRef(new Date());
-
-  // TODO (udameli): Project ID is hardcoded to sentry for the experiment
-  // because performance issues from sentry project are sent to a different project
-  const PROJECT_ID = 1;
-
-  const issueStart = issue.firstSeen;
-  const timeFromFirstSeen = moment(nowRef.current).diff(issueStart);
-  const start = moment(issueStart).subtract(timeFromFirstSeen).format();
-  const interval = getInterval({start, end: nowRef.current, utc: true}, 'low');
-
-  return (
-    <EventsRequest
-      api={allEventsApi}
-      project={[PROJECT_ID]}
-      environment={[]}
-      start={start}
-      end={nowRef.current}
-      query={allEventsQuery}
-      organization={organization}
-      yAxis={['p75(transaction.duration)']}
-      partial
-      interval={interval}
-      referrer="api.performance.performance-issue-poc.all-events"
-      currentSeriesNames={[t('p75(transaction.duration)')]}
-    >
-      {({
-        timeseriesData: allEvents,
-        loading: allEventsLoading,
-        errored: allEventsErrored,
-      }) => (
-        <EventsRequest
-          api={affectedEventsApi}
-          project={[PROJECT_ID]}
-          environment={[]}
-          start={issueStart}
-          end={nowRef.current}
-          query={affectedEventsQuery}
-          organization={organization}
-          yAxis={['p75(transaction.duration)']}
-          partial
-          interval={interval}
-          referrer="api.performance.performance-issue-poc.affected-events"
-          currentSeriesNames={[t('p75(transaction.duration)')]}
-        >
-          {({
-            timeseriesData: data,
-            loading: affectedEventsLoading,
-            errored: affectedEventsErrored,
-          }) => (
-            <Content
-              allEvents={allEvents ?? []}
-              affectedEvents={data}
-              loading={allEventsLoading || affectedEventsLoading}
-              errored={allEventsErrored || affectedEventsErrored}
-            />
-          )}
-        </EventsRequest>
-      )}
-    </EventsRequest>
-  );
-}
-
-interface ContentProps {
-  affectedEvents: LineChartSeries[] | undefined;
-  allEvents: Series[] | undefined;
-  errored: boolean;
-  loading: boolean;
-}
-
-function Content({affectedEvents, allEvents, errored, loading}: ContentProps) {
-  const theme = useTheme();
-
-  if (!affectedEvents || affectedEvents.length === 0) {
-    return null;
-  }
-
-  if (loading) {
-    return <LoadingPanel />;
-  }
-
-  const durationUnit = getDurationUnit(affectedEvents);
-  const range = findRangeOfMultiSeries([...affectedEvents, ...(allEvents || [])]);
-  let min = 0;
-  if (range) {
-    min = range.min - (range.max - range.min) * 0.2;
-  }
-
-  const yAxis: YAXisComponentOption = {
-    show: false,
-    minInterval: durationUnit,
-    min,
-    axisLabel: {
-      color: theme.chartLabel,
-      formatter() {
-        return '';
-      },
-    },
-  };
-
-  return errored ? (
-    <ErrorPanel>
-      <IconWarning color="gray300" size="lg" />
-    </ErrorPanel>
-  ) : (
-    <LineChart
-      grid={{left: '0', right: '0', top: '0', bottom: '0'}}
-      height={200}
-      series={affectedEvents}
-      seriesOptions={{smooth: true}}
-      previousPeriod={allEvents}
-      xAxis={{type: 'time' as const, axisLine: {onZero: false}}}
-      yAxis={yAxis}
-      isGroupedByDate
-      showTimeInTooltip
-      useShortDate
-      tooltip={{
-        valueFormatter: (value, seriesName) => {
-          return tooltipFormatter(
-            value,
-            aggregateOutputType(affectedEvents.at(0)?.seriesName ?? seriesName)
-          );
-        },
-      }}
-    />
-  );
-}
diff --git a/static/app/components/events/interfaces/performance/eventTraceView.spec.tsx b/static/app/components/events/interfaces/performance/eventTraceView.spec.tsx
index a01c8f1e53f503..33fb521eb0b941 100644
--- a/static/app/components/events/interfaces/performance/eventTraceView.spec.tsx
+++ b/static/app/components/events/interfaces/performance/eventTraceView.spec.tsx
@@ -22,7 +22,7 @@ window.ResizeObserver = ResizeObserver;
 describe('EventTraceView', () => {
   const traceId = 'this-is-a-good-trace-id';
   const {organization, project} = initializeData({
-    features: ['profiling', 'issue-details-always-show-trace'],
+    features: ['profiling'],
   });
   const group = GroupFixture();
   const event = EventFixture({
@@ -46,6 +46,11 @@ describe('EventTraceView', () => {
   });
 
   it('renders a trace', async () => {
+    MockApiClient.addMockResponse({
+      url: '/subscriptions/org-slug/',
+      method: 'GET',
+      body: {},
+    });
     MockApiClient.addMockResponse({
       method: 'GET',
       url: `/organizations/${organization.slug}/events-trace-meta/${traceId}/`,
@@ -103,6 +108,32 @@ describe('EventTraceView', () => {
   });
 
   it('still renders trace link for performance issues', async () => {
+    const oneOtherIssueEvent: TraceEventResponse = {
+      data: [
+        {
+          // In issuePlatform, the message contains the title and the transaction
+          message: '/api/slow/ Slow DB Query SELECT "sentry_monitorcheckin"."monitor_id"',
+          timestamp: '2024-01-24T09:09:03+00:00',
+          'issue.id': 1000,
+          project: project.slug,
+          'project.name': project.name,
+          title: 'Slow DB Query',
+          id: 'abc',
+          transaction: 'n/a',
+          culprit: '/api/slow/',
+          'event.type': '',
+        },
+      ],
+      meta: {fields: {}, units: {}},
+    };
+    MockApiClient.addMockResponse({
+      url: `/organizations/${organization.slug}/events/`,
+      body: oneOtherIssueEvent,
+    });
+    MockApiClient.addMockResponse({
+      url: `/organizations/${organization.slug}/projects/`,
+      body: [],
+    });
     const perfGroup = GroupFixture({issueCategory: IssueCategory.PERFORMANCE});
     const perfEvent = EventFixture({
       occurrence: {
@@ -129,9 +160,17 @@ describe('EventTraceView', () => {
     expect(
       await screen.findByRole('link', {name: 'View Full Trace'})
     ).toBeInTheDocument();
+    expect(
+      screen.getByText('One other issue appears in the same trace.')
+    ).toBeInTheDocument();
   });
 
   it('does not render the trace preview if it has no transactions', async () => {
+    MockApiClient.addMockResponse({
+      url: '/subscriptions/org-slug/',
+      method: 'GET',
+      body: {},
+    });
     MockApiClient.addMockResponse({
       method: 'GET',
       url: `/organizations/${organization.slug}/events-trace-meta/${traceId}/`,
@@ -154,8 +193,5 @@ describe('EventTraceView', () => {
     render(<EventTraceView group={group} event={event} organization={organization} />);
 
     expect(await screen.findByText('Trace')).toBeInTheDocument();
-    expect(
-      await screen.findByRole('link', {name: 'View Full Trace'})
-    ).toBeInTheDocument();
   });
 });
diff --git a/static/app/components/events/interfaces/performance/eventTraceView.tsx b/static/app/components/events/interfaces/performance/eventTraceView.tsx
index f47817c661bb32..ce2e3e7700d94a 100644
--- a/static/app/components/events/interfaces/performance/eventTraceView.tsx
+++ b/static/app/components/events/interfaces/performance/eventTraceView.tsx
@@ -1,19 +1,23 @@
-import {useMemo} from 'react';
+import {Fragment, useMemo} from 'react';
 import styled from '@emotion/styled';
+import type {LocationDescriptor} from 'history';
 
 import {LinkButton} from 'sentry/components/button';
+import Link from 'sentry/components/links/link';
 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 {defined} from 'sentry/utils';
+import useRouteAnalyticsParams from 'sentry/utils/routeAnalytics/useRouteAnalyticsParams';
 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 {TraceIssueEvent} from 'sentry/views/issueDetails/traceTimeline/traceIssue';
+import {useTraceTimelineEvents} from 'sentry/views/issueDetails/traceTimeline/useTraceTimelineEvents';
 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';
@@ -35,6 +39,7 @@ const DEFAULT_ISSUE_DETAILS_TRACE_VIEW_PREFERENCES: TracePreferencesState = {
       'drawer left': 0.33,
       'drawer right': 0.33,
       'drawer bottom': 0.4,
+      'trace context height': 150,
     },
     layoutOptions: [],
   },
@@ -109,6 +114,21 @@ function EventTraceViewInner({event, organization, traceId}: EventTraceViewInner
   );
 }
 
+function getHrefFromTraceTarget(traceTarget: LocationDescriptor) {
+  if (typeof traceTarget === 'string') {
+    return traceTarget;
+  }
+
+  const searchParams = new URLSearchParams();
+  for (const key in traceTarget.query) {
+    if (defined(traceTarget.query[key])) {
+      searchParams.append(key, traceTarget.query[key]);
+    }
+  }
+
+  return `${traceTarget.pathname}?${searchParams.toString()}`;
+}
+
 function IssuesTraceOverlay({event}: {event: Event}) {
   const location = useLocation();
   const organization = useOrganization();
@@ -131,13 +151,51 @@ function IssuesTraceOverlay({event}: {event: Event}) {
       <LinkButton
         size="sm"
         icon={<IconOpen />}
-        aria-label={t('Open Trace')}
-        to={traceTarget}
-      />
+        href={getHrefFromTraceTarget(traceTarget)}
+        external
+        analyticsEventName="Issue Details: View Full Trace"
+        analyticsEventKey="issue_details.view_full_trace"
+      >
+        {t('View Full Trace')}
+      </LinkButton>
     </IssuesTraceOverlayContainer>
   );
 }
 
+function OneOtherIssueEvent({event}: {event: Event}) {
+  const location = useLocation();
+  const organization = useOrganization();
+  const {isLoading, oneOtherIssueEvent} = useTraceTimelineEvents({event});
+  useRouteAnalyticsParams(oneOtherIssueEvent ? {has_related_trace_issue: true} : {});
+
+  if (isLoading || !oneOtherIssueEvent) {
+    return null;
+  }
+
+  const traceTarget = generateTraceTarget(
+    event,
+    organization,
+    {
+      ...location,
+      query: {
+        ...location.query,
+        groupId: event.groupID,
+      },
+    },
+    TraceViewSources.ISSUE_DETAILS
+  );
+
+  return (
+    <Fragment>
+      <span>
+        {t('One other issue appears in the same trace. ')}
+        <Link to={traceTarget}>{t('View Full Trace')}</Link>
+      </span>
+      <TraceIssueEvent event={oneOtherIssueEvent} />
+    </Fragment>
+  );
+}
+
 const IssuesTraceContainer = styled('div')`
   position: relative;
 `;
@@ -148,9 +206,19 @@ const IssuesTraceOverlayContainer = styled('div')`
   z-index: 10;
 
   a {
+    display: none;
     position: absolute;
-    top: ${space(1)};
-    right: ${space(1)};
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+  }
+
+  &:hover {
+    background-color: rgba(128, 128, 128, 0.4);
+
+    a {
+      display: block;
+    }
   }
 `;
 
@@ -165,18 +233,14 @@ export function EventTraceView({group, event, organization}: EventTraceViewProps
   }
 
   const hasProfilingFeature = organization.features.includes('profiling');
-  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
     group.issueCategory !== IssueCategory.PERFORMANCE;
 
   return (
     <InterimSection type={SectionKey.TRACE} title={t('Trace')}>
-      <TraceDataSection event={event} />
+      <OneOtherIssueEvent event={event} />
       {hasTracePreviewFeature && (
         <EventTraceViewInner
           event={event}
diff --git a/static/app/components/events/interfaces/performance/resources.tsx b/static/app/components/events/interfaces/performance/resources.tsx
deleted file mode 100644
index 1e12143b195dfc..00000000000000
--- a/static/app/components/events/interfaces/performance/resources.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-import styled from '@emotion/styled';
-
-import ExternalLink from 'sentry/components/links/externalLink';
-import {IconDocs} from 'sentry/icons';
-import {space} from 'sentry/styles/space';
-import type {Event} from 'sentry/types/event';
-import {trackAnalytics} from 'sentry/utils/analytics';
-import type {IssueTypeConfig} from 'sentry/utils/issueTypeConfig/types';
-import useOrganization from 'sentry/utils/useOrganization';
-
-export type ResourceLink = {
-  link: string;
-  text: string;
-};
-
-type Props = {
-  configResources: NonNullable<IssueTypeConfig['resources']>;
-  eventPlatform: Event['platform'];
-  groupId: string;
-};
-
-// This section provides users with resources on how to resolve an issue
-export function Resources({configResources, eventPlatform, groupId}: Props) {
-  const organization = useOrganization();
-  const links = [
-    ...configResources.links,
-    ...(configResources.linksByPlatform[eventPlatform ?? ''] ?? []),
-  ];
-
-  return (
-    <div>
-      {configResources.description}
-      <LinkSection>
-        {links.map(({link, text}) => (
-          // Please note that the UI will not fit a very long text and if we need to support that we will need to update the UI
-          <ExternalLink
-            onClick={() =>
-              trackAnalytics('issue_details.resources_link_clicked', {
-                organization,
-                resource: text,
-                group_id: groupId,
-              })
-            }
-            key={link}
-            href={link}
-            openInNewTab
-          >
-            <IconDocs /> {text}
-          </ExternalLink>
-        ))}
-      </LinkSection>
-    </div>
-  );
-}
-
-const LinkSection = styled('div')`
-  display: flex;
-  flex-direction: column;
-  gap: ${space(1)};
-
-  margin-top: ${space(2)};
-
-  a {
-    display: flex;
-    align-items: center;
-    width: max-content;
-  }
-
-  svg {
-    margin-right: ${space(1)};
-  }
-`;
diff --git a/static/app/components/events/interfaces/performance/spanCountChart.tsx b/static/app/components/events/interfaces/performance/spanCountChart.tsx
deleted file mode 100644
index 123a62a8991ac3..00000000000000
--- a/static/app/components/events/interfaces/performance/spanCountChart.tsx
+++ /dev/null
@@ -1,168 +0,0 @@
-import {useRef} from 'react';
-import type {Location} from 'history';
-
-import {BarChart} from 'sentry/components/charts/barChart';
-import ErrorPanel from 'sentry/components/charts/errorPanel';
-import LoadingPanel from 'sentry/components/charts/loadingPanel';
-import {IconWarning} from 'sentry/icons';
-import {t} from 'sentry/locale';
-import type {EventError, EventTag} from 'sentry/types/event';
-import type {Group} from 'sentry/types/group';
-import type {Organization} from 'sentry/types/organization';
-import toArray from 'sentry/utils/array/toArray';
-import EventView from 'sentry/utils/discover/eventView';
-import SpanCountHistogramQuery from 'sentry/utils/performance/histogram/spanCountHistogramQuery';
-import type {HistogramData} from 'sentry/utils/performance/histogram/types';
-import {formatHistogramData} from 'sentry/utils/performance/histogram/utils';
-import theme from 'sentry/utils/theme';
-
-interface Props {
-  event: EventError;
-  issue: Group;
-  location: Location;
-  organization: Organization;
-}
-
-export function SpanCountChart({issue, event, location, organization}: Props) {
-  const transactionNameTag = event.tags.find(tag => tag.key === 'transaction');
-  const transactionName = transactionNameTag ? transactionNameTag.value : '';
-
-  const spanHashTag = event.tags.find(
-    (tag: EventTag) => tag.key === 'performance_issue.extra_spans'
-  ) || {key: '', value: ''};
-
-  const allEventsQuery = `event.type:transaction transaction:${transactionName}`;
-  const affectedEventsQuery = `${allEventsQuery} ${spanHashTag.key}:${spanHashTag.value}`;
-
-  const nowRef = useRef(new Date());
-
-  const start = issue.firstSeen;
-  const end = nowRef.current?.toString();
-  const environment = [];
-  const project = [1];
-  const spanOp = event.contexts.performance_issue.op;
-
-  function renderChart(data: HistogramData, _data: HistogramData) {
-    const xAxis = {
-      type: 'category' as const,
-      truncate: true,
-      axisTick: {
-        interval: 5,
-        alignWithLabel: true,
-      },
-    };
-
-    const colors = [theme.charts.previousPeriod, ...theme.charts.getColorPalette(4)];
-    const tooltip = {
-      formatter(series) {
-        const seriesData = toArray(series);
-        let contents: string[] = [];
-
-        contents = seriesData.map(item => {
-          const label = item.seriesName;
-          const value = item.value[1].toLocaleString();
-          return [
-            '<div class="tooltip-series">',
-            `<div><span class="tooltip-label">${item.marker} <strong>${label}</strong></span> ${value}</div>`,
-            '</div>',
-          ].join('');
-        });
-        const seriesLabel = seriesData[0].value[0];
-        contents.push(`<div class="tooltip-footer">${seriesLabel}</div>`);
-
-        contents.push('<div class="tooltip-arrow"></div>');
-        return contents.join('');
-      },
-    };
-
-    const series = {
-      seriesName: t('Affected Transaction Count'),
-      data: formatHistogramData(data, {type: 'number'}),
-    };
-
-    const _series = {
-      seriesName: t('All Transaction Count'),
-      data: formatHistogramData(_data, {type: 'number'}),
-    };
-
-    return (
-      <BarChart
-        grid={{left: '0', right: '0', top: '0', bottom: '0'}}
-        xAxis={xAxis}
-        yAxis={{type: 'value', show: false, axisLabel: {formatter: _ => ''}}}
-        series={[_series, series]}
-        tooltip={tooltip}
-        colors={colors}
-        height={200}
-      />
-    );
-  }
-
-  const allEvents = EventView.fromNewQueryWithLocation(
-    {
-      id: undefined,
-      version: 2,
-      name: '',
-      fields: ['transaction.duration'],
-      projects: project,
-      query: allEventsQuery,
-      environment,
-      start,
-      end,
-    },
-    location
-  );
-
-  const affectedEventsEventView = EventView.fromNewQueryWithLocation(
-    {
-      id: undefined,
-      version: 2,
-      name: '',
-      fields: ['transaction.duration'],
-      projects: project,
-      query: affectedEventsQuery,
-      environment,
-      start,
-      end,
-    },
-    location
-  );
-
-  return (
-    <SpanCountHistogramQuery
-      location={location}
-      orgSlug={organization.slug}
-      eventView={allEvents}
-      numBuckets={50}
-      spanOp={spanOp}
-      dataFilter="exclude_outliers"
-    >
-      {({histogram: _histogram, isLoading: _isLoading, error: _error}) => (
-        <SpanCountHistogramQuery
-          location={location}
-          orgSlug={organization.slug}
-          eventView={affectedEventsEventView}
-          numBuckets={50}
-          spanOp={spanOp}
-          dataFilter="exclude_outliers"
-        >
-          {({histogram, isLoading, error}) => {
-            if (isLoading || _isLoading) {
-              return <LoadingPanel data-test-id="histogram-loading" />;
-            }
-
-            if (error || _error) {
-              return (
-                <ErrorPanel>
-                  <IconWarning color="gray300" size="lg" />
-                </ErrorPanel>
-              );
-            }
-
-            return renderChart(histogram || [], _histogram || []);
-          }}
-        </SpanCountHistogramQuery>
-      )}
-    </SpanCountHistogramQuery>
-  );
-}
diff --git a/static/app/components/events/interfaces/performance/spanEvidenceKeyValueList.spec.tsx b/static/app/components/events/interfaces/performance/spanEvidenceKeyValueList.spec.tsx
index 1ce55100e3d1f4..d17fb50539edbe 100644
--- a/static/app/components/events/interfaces/performance/spanEvidenceKeyValueList.spec.tsx
+++ b/static/app/components/events/interfaces/performance/spanEvidenceKeyValueList.spec.tsx
@@ -313,7 +313,7 @@ describe('SpanEvidenceKeyValueList', () => {
         screen.getByTestId('span-evidence-key-value-list.starting-span')
       ).toHaveTextContent('SELECT * FROM USERS LIMIT 100');
 
-      expect(screen.queryAllByRole('cell', {name: 'Parallelizable Spans'}).length).toBe(
+      expect(screen.queryAllByRole('cell', {name: 'Parallelizable Spans'})).toHaveLength(
         1
       );
       const parallelizableSpanKeyValue = screen.getByTestId(
@@ -457,7 +457,7 @@ describe('SpanEvidenceKeyValueList', () => {
         screen.getByTestId(/span-evidence-key-value-list.repeating-spans/)
       ).toHaveTextContent('/book/[Parameters]');
 
-      expect(screen.queryByRole('cell', {name: 'Parameters'})).toBeInTheDocument();
+      expect(screen.getByRole('cell', {name: 'Parameters'})).toBeInTheDocument();
 
       const parametersKeyValue = screen.getByTestId(
         'span-evidence-key-value-list.parameters'
@@ -476,7 +476,7 @@ describe('SpanEvidenceKeyValueList', () => {
               url: 'http://service.io?id=2543',
             },
           })?.toString()
-        ).toEqual('http://service.io/?id=2543');
+        ).toBe('http://service.io/?id=2543');
       });
 
       it('Pulls out a relative URL if a base is provided', () => {
@@ -490,7 +490,7 @@ describe('SpanEvidenceKeyValueList', () => {
             },
             'http://service.io'
           )?.toString()
-        ).toEqual('http://service.io/item');
+        ).toBe('http://service.io/item');
       });
 
       it('Fetches the query string from the span data if available', () => {
@@ -503,7 +503,7 @@ describe('SpanEvidenceKeyValueList', () => {
               'http.query': 'id=153',
             },
           })?.toString()
-        ).toEqual('http://service.io/item?id=153');
+        ).toBe('http://service.io/item?id=153');
       });
 
       it('Falls back to span description if URL is faulty', () => {
@@ -515,7 +515,7 @@ describe('SpanEvidenceKeyValueList', () => {
               url: '/item',
             },
           })?.toString()
-        ).toEqual('http://service.io/item');
+        ).toBe('http://service.io/item');
       });
     });
 
diff --git a/static/app/components/events/interfaces/performance/spanEvidenceKeyValueList.tsx b/static/app/components/events/interfaces/performance/spanEvidenceKeyValueList.tsx
index 59502e75f3b180..edde63cbac628b 100644
--- a/static/app/components/events/interfaces/performance/spanEvidenceKeyValueList.tsx
+++ b/static/app/components/events/interfaces/performance/spanEvidenceKeyValueList.tsx
@@ -74,7 +74,7 @@ function ConsecutiveDBQueriesSpanEvidence({
         [
           makeTransactionNameRow(event, organization, location, projectSlug),
           causeSpans
-            ? makeRow(t('Starting Span'), getSpanEvidenceValue(causeSpans[0]))
+            ? makeRow(t('Starting Span'), getSpanEvidenceValue(causeSpans[0]!))
             : null,
           makeRow('Parallelizable Spans', offendingSpans.map(getSpanEvidenceValue)),
           makeRow(
@@ -124,11 +124,11 @@ function LargeHTTPPayloadSpanEvidence({
       data={
         [
           makeTransactionNameRow(event, organization, location, projectSlug),
-          makeRow(t('Large HTTP Payload Span'), getSpanEvidenceValue(offendingSpans[0])),
+          makeRow(t('Large HTTP Payload Span'), getSpanEvidenceValue(offendingSpans[0]!)),
           makeRow(
             t('Payload Size'),
-            getSpanFieldBytes(offendingSpans[0], 'http.response_content_length') ??
-              getSpanFieldBytes(offendingSpans[0], 'Encoded Body Size')
+            getSpanFieldBytes(offendingSpans[0]!, 'http.response_content_length') ??
+              getSpanFieldBytes(offendingSpans[0]!, 'Encoded Body Size')
           ),
         ].filter(Boolean) as KeyValueListData
       }
@@ -182,7 +182,7 @@ function NPlusOneDBQueriesSpanEvidence({
           makeTransactionNameRow(event, organization, location, projectSlug),
           parentSpan ? makeRow(t('Parent Span'), getSpanEvidenceValue(parentSpan)) : null,
           causeSpans.length > 0
-            ? makeRow(t('Preceding Span'), getSpanEvidenceValue(causeSpans[0]))
+            ? makeRow(t('Preceding Span'), getSpanEvidenceValue(causeSpans[0]!))
             : null,
           ...repeatingSpanRows,
         ].filter(Boolean) as KeyValueListData
@@ -202,7 +202,7 @@ function NPlusOneAPICallsSpanEvidence({
   const baseURL = requestEntry?.data?.url;
 
   const problemParameters = formatChangingQueryParameters(offendingSpans, baseURL);
-  const commonPathPrefix = formatBasePath(offendingSpans[0], baseURL);
+  const commonPathPrefix = formatBasePath(offendingSpans[0]!, baseURL);
 
   return (
     <PresortedKeyValueList
@@ -371,10 +371,10 @@ function SlowDBQueryEvidence({
     <PresortedKeyValueList
       data={[
         makeTransactionNameRow(event, organization, location, projectSlug),
-        makeRow(t('Slow DB Query'), getSpanEvidenceValue(offendingSpans[0])),
+        makeRow(t('Slow DB Query'), getSpanEvidenceValue(offendingSpans[0]!)),
         makeRow(
           t('Duration Impact'),
-          getSingleSpanDurationImpact(event, offendingSpans[0])
+          getSingleSpanDurationImpact(event, offendingSpans[0]!)
         ),
       ]}
     />
@@ -394,12 +394,15 @@ function RenderBlockingAssetSpanEvidence({
     <PresortedKeyValueList
       data={[
         makeTransactionNameRow(event, organization, location, projectSlug),
-        makeRow(t('Slow Resource Span'), getSpanEvidenceValue(offendingSpan)),
+        makeRow(t('Slow Resource Span'), getSpanEvidenceValue(offendingSpan!)),
         makeRow(
           t('FCP Delay'),
-          formatDelay(getSpanDuration(offendingSpan), event.measurements?.fcp?.value ?? 0)
+          formatDelay(
+            getSpanDuration(offendingSpan!),
+            event.measurements?.fcp?.value ?? 0
+          )
         ),
-        makeRow(t('Duration Impact'), getSingleSpanDurationImpact(event, offendingSpan)),
+        makeRow(t('Duration Impact'), getSingleSpanDurationImpact(event, offendingSpan!)),
       ]}
     />
   );
@@ -416,15 +419,15 @@ function UncompressedAssetSpanEvidence({
     <PresortedKeyValueList
       data={[
         makeTransactionNameRow(event, organization, location, projectSlug),
-        makeRow(t('Slow Resource Span'), getSpanEvidenceValue(offendingSpans[0])),
+        makeRow(t('Slow Resource Span'), getSpanEvidenceValue(offendingSpans[0]!)),
         makeRow(
           t('Asset Size'),
-          getSpanFieldBytes(offendingSpans[0], 'http.response_content_length') ??
-            getSpanFieldBytes(offendingSpans[0], 'Encoded Body Size')
+          getSpanFieldBytes(offendingSpans[0]!, 'http.response_content_length') ??
+            getSpanFieldBytes(offendingSpans[0]!, 'Encoded Body Size')
         ),
         makeRow(
           t('Duration Impact'),
-          getSingleSpanDurationImpact(event, offendingSpans[0])
+          getSingleSpanDurationImpact(event, offendingSpans[0]!)
         ),
       ]}
     />
@@ -444,7 +447,7 @@ function DefaultSpanEvidence({
         [
           makeTransactionNameRow(event, organization, location, projectSlug),
           offendingSpans.length > 0
-            ? makeRow(t('Offending Span'), getSpanEvidenceValue(offendingSpans[0]))
+            ? makeRow(t('Offending Span'), getSpanEvidenceValue(offendingSpans[0]!))
             : null,
         ].filter(Boolean) as KeyValueListData
       }
@@ -658,7 +661,7 @@ function formatChangingQueryParameters(spans: Span[], baseURL?: string): string[
 
   const pairs: string[] = [];
   for (const key in allQueryParameters) {
-    const values = allQueryParameters[key];
+    const values = allQueryParameters[key]!;
 
     // By definition, if the parameter only has one value that means it's not
     // changing between calls, so omit it!
@@ -690,7 +693,7 @@ export const extractSpanURLString = (span: Span, baseURL?: string): URL | null =
     }
   }
 
-  const [_method, _url] = (span?.description ?? '').split(' ', 2);
+  const [_method, _url] = (span?.description ?? '').split(' ', 2) as [string, string];
 
   return safeURL(_url, baseURL) ?? null;
 };
diff --git a/static/app/components/events/interfaces/request/index.spec.tsx b/static/app/components/events/interfaces/request/index.spec.tsx
index 2ee61131f256e3..51b623c53695c3 100644
--- a/static/app/components/events/interfaces/request/index.spec.tsx
+++ b/static/app/components/events/interfaces/request/index.spec.tsx
@@ -172,7 +172,7 @@ describe('Request entry', function () {
       },
     });
 
-    render(<Request event={event} data={event.entries[0].data} />, {
+    render(<Request event={event} data={event.entries[0]!.data} />, {
       organization: {
         relayPiiConfig: JSON.stringify(DataScrubbingRelayPiiConfigFixture()),
       },
@@ -186,7 +186,7 @@ describe('Request entry', function () {
 
     expect(screen.getAllByText(/redacted/)).toHaveLength(7);
 
-    await userEvent.hover(screen.getAllByText(/redacted/)[0]);
+    await userEvent.hover(screen.getAllByText(/redacted/)[0]!);
 
     expect(
       await screen.findByText(
@@ -221,7 +221,7 @@ describe('Request entry', function () {
         ],
       });
 
-      render(<Request event={event} data={event.entries[0].data} />, {
+      render(<Request event={event} data={event.entries[0]!.data} />, {
         organization: {
           relayPiiConfig: JSON.stringify(DataScrubbingRelayPiiConfigFixture()),
         },
@@ -255,7 +255,7 @@ describe('Request entry', function () {
         ],
       });
 
-      render(<Request event={event} data={event.entries[0].data} />, {
+      render(<Request event={event} data={event.entries[0]!.data} />, {
         organization: {
           relayPiiConfig: JSON.stringify(DataScrubbingRelayPiiConfigFixture()),
         },
@@ -289,7 +289,7 @@ describe('Request entry', function () {
         ],
       });
 
-      render(<Request event={event} data={event.entries[0].data} />, {
+      render(<Request event={event} data={event.entries[0]!.data} />, {
         organization: {
           relayPiiConfig: JSON.stringify(DataScrubbingRelayPiiConfigFixture()),
         },
@@ -325,7 +325,7 @@ describe('Request entry', function () {
       });
 
       expect(() =>
-        render(<Request event={event} data={event.entries[0].data} />, {
+        render(<Request event={event} data={event.entries[0]!.data} />, {
           organization: {
             relayPiiConfig: JSON.stringify(DataScrubbingRelayPiiConfigFixture()),
           },
@@ -357,7 +357,7 @@ describe('Request entry', function () {
         ],
       });
       expect(() =>
-        render(<Request event={event} data={event.entries[0].data} />, {
+        render(<Request event={event} data={event.entries[0]!.data} />, {
           organization: {
             relayPiiConfig: JSON.stringify(DataScrubbingRelayPiiConfigFixture()),
           },
@@ -388,7 +388,7 @@ describe('Request entry', function () {
       });
 
       expect(() =>
-        render(<Request event={event} data={event.entries[0].data} />, {
+        render(<Request event={event} data={event.entries[0]!.data} />, {
           organization: {
             relayPiiConfig: JSON.stringify(DataScrubbingRelayPiiConfigFixture()),
           },
@@ -418,7 +418,7 @@ describe('Request entry', function () {
           ],
         });
 
-        render(<Request event={event} data={event.entries[0].data} />);
+        render(<Request event={event} data={event.entries[0]!.data} />);
 
         expect(screen.getByText('query Test { test }')).toBeInTheDocument();
         expect(screen.getByRole('row', {name: 'operationName Test'})).toBeInTheDocument();
@@ -456,11 +456,13 @@ describe('Request entry', function () {
         });
 
         const {container} = render(
-          <Request event={event} data={event.entries[0].data} />
+          <Request event={event} data={event.entries[0]!.data} />
         );
 
+        // eslint-disable-next-line testing-library/no-container
         expect(container.querySelector('.line-highlight')).toBeInTheDocument();
         expect(
+          // eslint-disable-next-line testing-library/no-container
           container.querySelector('.line-highlight')?.getAttribute('data-start')
         ).toBe('1');
         expect(
diff --git a/static/app/components/events/interfaces/searchBarAction.spec.tsx b/static/app/components/events/interfaces/searchBarAction.spec.tsx
index 744f6721adb507..dbf5f58e269a99 100644
--- a/static/app/components/events/interfaces/searchBarAction.spec.tsx
+++ b/static/app/components/events/interfaces/searchBarAction.spec.tsx
@@ -63,7 +63,7 @@ const options: NonNullable<
 ];
 
 describe('SearchBarAction', () => {
-  let handleFilter;
+  let handleFilter!: jest.Mock;
 
   beforeEach(() => {
     handleFilter = jest.fn();
@@ -115,7 +115,7 @@ describe('SearchBarAction', () => {
   });
 
   it('With Option Type only', async () => {
-    const typeOptions = options[0];
+    const typeOptions = options[0]!;
     render(
       <SearchBarAction
         filterOptions={[typeOptions]}
@@ -151,7 +151,7 @@ describe('SearchBarAction', () => {
   });
 
   it('With Option Level only', async () => {
-    const levelOptions = options[1];
+    const levelOptions = options[1]!;
     render(
       <SearchBarAction
         filterOptions={[levelOptions]}
diff --git a/static/app/components/events/interfaces/sourceMapsDebuggerModal.tsx b/static/app/components/events/interfaces/sourceMapsDebuggerModal.tsx
index d00161eb61f36f..9025d5a22f7015 100644
--- a/static/app/components/events/interfaces/sourceMapsDebuggerModal.tsx
+++ b/static/app/components/events/interfaces/sourceMapsDebuggerModal.tsx
@@ -988,7 +988,7 @@ function ReleaseSourceMapMatchingChecklistItem({
           <p>
             {tct(
               'The source file for this stack frame is missing a source map reference. A source map reference is usually represented by a [sourceMappingUrl] comment at the bottom of your source file.',
-              {sourceMappingUrl: <MonoBlock>//# sourceMappingURL=...</MonoBlock>}
+              {sourceMappingUrl: <MonoBlock>{'//# sourceMappingURL=...'}</MonoBlock>}
             )}
           </p>
           <p>
diff --git a/static/app/components/events/interfaces/spans/gapSpanDetails.tsx b/static/app/components/events/interfaces/spans/gapSpanDetails.tsx
index 0993e5dd67aec3..bb98a2e6706333 100644
--- a/static/app/components/events/interfaces/spans/gapSpanDetails.tsx
+++ b/static/app/components/events/interfaces/spans/gapSpanDetails.tsx
@@ -193,7 +193,7 @@ function ProfilePreviewHeader({canvasView, event, organization}: ProfilePreviewP
   return (
     <HeaderContainer>
       <HeaderContainer>
-        <SectionHeading>{t('Related Profile')}</SectionHeading>
+        <SectionHeading>{t('Profile')}</SectionHeading>
         <QuestionTooltip
           position="top"
           size="sm"
diff --git a/static/app/components/events/interfaces/spans/header.tsx b/static/app/components/events/interfaces/spans/header.tsx
index b83d1fb1f7cf51..0f67f512f60327 100644
--- a/static/app/components/events/interfaces/spans/header.tsx
+++ b/static/app/components/events/interfaces/spans/header.tsx
@@ -83,7 +83,6 @@ class TraceViewHeader extends Component<PropType, State> {
     if (minimapInteractiveRef.current) {
       const minimapWidth = minimapInteractiveRef.current.getBoundingClientRect().width;
       if (minimapWidth !== this.state.minimapWidth) {
-        // eslint-disable-next-line react/no-did-update-set-state
         this.setState({
           minimapWidth,
         });
diff --git a/static/app/components/events/interfaces/spans/index.tsx b/static/app/components/events/interfaces/spans/index.tsx
index ae26ebce5350cf..f3ba8a2191d708 100644
--- a/static/app/components/events/interfaces/spans/index.tsx
+++ b/static/app/components/events/interfaces/spans/index.tsx
@@ -1,5 +1,4 @@
 import {Fragment, useMemo} from 'react';
-// eslint-disable-next-line no-restricted-imports
 import styled from '@emotion/styled';
 import {Observer} from 'mobx-react';
 
diff --git a/static/app/components/events/interfaces/spans/measurementsPanel.tsx b/static/app/components/events/interfaces/spans/measurementsPanel.tsx
index b7ed38908bf219..565b3fb453fc79 100644
--- a/static/app/components/events/interfaces/spans/measurementsPanel.tsx
+++ b/static/app/components/events/interfaces/spans/measurementsPanel.tsx
@@ -33,7 +33,7 @@ function MeasurementsPanel(props: Props) {
       }}
     >
       {Array.from(measurements.values()).map(verticalMark => {
-        const mark = Object.values(verticalMark.marks)[0];
+        const mark = Object.values(verticalMark.marks)[0]!;
         const {timestamp} = mark;
         const bounds = getMeasurementBounds(timestamp, generateBounds);
 
@@ -45,7 +45,7 @@ function MeasurementsPanel(props: Props) {
 
         const vitalLabels: VitalLabel[] = Object.keys(verticalMark.marks).map(name => ({
           vital: VITAL_DETAILS[`measurements.${name}`],
-          isPoorValue: verticalMark.marks[name].failedThreshold,
+          isPoorValue: verticalMark.marks[name]!.failedThreshold,
         }));
 
         if (vitalLabels.length > 1) {
@@ -62,7 +62,7 @@ function MeasurementsPanel(props: Props) {
           <LabelContainer
             key={String(timestamp)}
             left={toPercent(bounds.left || 0)}
-            vitalLabel={vitalLabels[0]}
+            vitalLabel={vitalLabels[0]!}
           />
         );
       })}
@@ -133,7 +133,6 @@ class LabelContainer extends Component<LabelContainerProps> {
   componentDidMount() {
     const {current} = this.elementDOMRef;
     if (current) {
-      // eslint-disable-next-line react/no-did-mount-set-state
       this.setState({
         width: current.clientWidth,
       });
@@ -179,7 +178,6 @@ class MultiLabelContainer extends Component<MultiLabelContainerProps> {
   componentDidMount() {
     const {current} = this.elementDOMRef;
     if (current) {
-      // eslint-disable-next-line react/no-did-mount-set-state
       this.setState({
         width: current.clientWidth,
       });
diff --git a/static/app/components/events/interfaces/spans/newTraceDetailsSpanBar.tsx b/static/app/components/events/interfaces/spans/newTraceDetailsSpanBar.tsx
index a65f7e4bb83f18..97c38dccfdd1c3 100644
--- a/static/app/components/events/interfaces/spans/newTraceDetailsSpanBar.tsx
+++ b/static/app/components/events/interfaces/spans/newTraceDetailsSpanBar.tsx
@@ -23,7 +23,6 @@ import {
   DividerLine,
   DividerLineGhostContainer,
   ErrorBadge,
-  MetricsBadge,
   ProfileBadge,
 } from 'sentry/components/performance/waterfall/rowDivider';
 import {
@@ -54,7 +53,6 @@ import {defined} from 'sentry/utils';
 import {trackAnalytics} from 'sentry/utils/analytics';
 import {browserHistory} from 'sentry/utils/browserHistory';
 import {generateEventSlug} from 'sentry/utils/discover/urls';
-import {hasMetricsExperimentalFeature} from 'sentry/utils/metrics/features';
 import toPercent from 'sentry/utils/number/toPercent';
 import type {QuickTraceContextChildrenProps} from 'sentry/utils/performance/quickTrace/quickTraceContext';
 import type {
@@ -331,7 +329,7 @@ export class NewTraceDetailsSpanBar extends Component<
     return (
       <Fragment>
         {Array.from(spanMeasurements.values()).map(verticalMark => {
-          const mark = Object.values(verticalMark.marks)[0];
+          const mark = Object.values(verticalMark.marks)[0]!;
           const {timestamp} = mark;
           const bounds = getMeasurementBounds(timestamp, generateBounds);
 
@@ -575,7 +573,7 @@ export class NewTraceDetailsSpanBar extends Component<
 
   connectObservers() {
     const observer = new IntersectionObserver(([entry]) =>
-      this.setState({isIntersecting: entry.isIntersecting}, () => {
+      this.setState({isIntersecting: entry!.isIntersecting}, () => {
         // Scrolls the next(invisible) bar from the virtualized list,
         // by its height. Allows us to look for anchored span bars occuring
         // at the bottom of the span tree.
@@ -694,15 +692,6 @@ export class NewTraceDetailsSpanBar extends Component<
     return errors?.length ? <ErrorBadge /> : null;
   }
 
-  renderMetricsBadge(span: NewTraceDetailsSpanBarProps['span']): React.ReactNode {
-    const hasMetrics =
-      '_metrics_summary' in span && Object.keys(span._metrics_summary ?? {}).length > 0;
-
-    return hasMetrics && hasMetricsExperimentalFeature(this.props.organization) ? (
-      <MetricsBadge />
-    ) : null;
-  }
-
   renderEmbeddedTransactionsBadge(
     transactions: QuickTraceEvent[] | null
   ): React.ReactNode {
@@ -868,7 +857,6 @@ export class NewTraceDetailsSpanBar extends Component<
         </RowCell>
         <DividerContainer>
           {this.renderDivider(dividerHandlerChildrenProps)}
-          {this.renderMetricsBadge(this.props.span)}
           {this.renderErrorBadge(errors)}
           {this.renderEmbeddedTransactionsBadge(transactions)}
           {this.renderMissingInstrumentationProfileBadge()}
diff --git a/static/app/components/events/interfaces/spans/newTraceDetailsSpanDetails.tsx b/static/app/components/events/interfaces/spans/newTraceDetailsSpanDetails.tsx
index 6886769c2e1013..3d870014281e6e 100644
--- a/static/app/components/events/interfaces/spans/newTraceDetailsSpanDetails.tsx
+++ b/static/app/components/events/interfaces/spans/newTraceDetailsSpanDetails.tsx
@@ -12,7 +12,6 @@ import SpanSummaryButton from 'sentry/components/events/interfaces/spans/spanSum
 import FileSize from 'sentry/components/fileSize';
 import ExternalLink from 'sentry/components/links/externalLink';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
-import {CustomMetricsEventData} from 'sentry/components/metrics/customMetricsEventData';
 import Pill from 'sentry/components/pill';
 import Pills from 'sentry/components/pills';
 import {TransactionToProfileButton} from 'sentry/components/profiling/transactionToProfileButton';
@@ -275,7 +274,7 @@ function NewTraceDetailsSpanDetail(props: SpanDetailProps) {
             projectID: event.projectID,
           })}
         >
-          {hasNewSpansUIFlag ? t('View Span Summary') : t('View Similar Spans')}
+          {hasNewSpansUIFlag ? t('More Samples') : t('View Similar Spans')}
         </LinkButton>
       </ButtonGroup>
     );
@@ -580,13 +579,6 @@ function NewTraceDetailsSpanDetail(props: SpanDetailProps) {
               })}
             </tbody>
           </table>
-          {span._metrics_summary ? (
-            <CustomMetricsEventData
-              projectId={event.projectID}
-              metricsSummary={span._metrics_summary}
-              startTimestamp={span.start_timestamp}
-            />
-          ) : null}
         </SpanDetails>
       </Fragment>
     );
@@ -607,7 +599,7 @@ function NewTraceDetailsSpanDetail(props: SpanDetailProps) {
 
 function SpanHTTPInfo({span}: {span: RawSpanType}) {
   if (span.op === 'http.client' && span.description) {
-    const [method, url] = span.description.split(' ');
+    const [method, url] = span.description.split(' ') as [string, string];
 
     const parsedURL = safeURL(url);
     const queryString = qs.parse(parsedURL?.search ?? '');
diff --git a/static/app/components/events/interfaces/spans/newTraceDetailsSpanTree.tsx b/static/app/components/events/interfaces/spans/newTraceDetailsSpanTree.tsx
index 0a626eb2ee50cf..3ae9bc742a86f6 100644
--- a/static/app/components/events/interfaces/spans/newTraceDetailsSpanTree.tsx
+++ b/static/app/components/events/interfaces/spans/newTraceDetailsSpanTree.tsx
@@ -309,7 +309,7 @@ class NewTraceDetailsSpanTree extends Component<PropType> {
     const showHiddenSpansMessage = !isCurrentSpanHidden && numOfSpansOutOfViewAbove > 0;
 
     if (showHiddenSpansMessage) {
-      firstHiddenSpanId = getSpanID(outOfViewSpansAbove[0].span);
+      firstHiddenSpanId = getSpanID(outOfViewSpansAbove[0]!.span);
       messages.push(
         <span key={`spans-out-of-view-${firstHiddenSpanId}`}>
           <strong>{numOfSpansOutOfViewAbove}</strong> {t('spans out of view')}
@@ -322,7 +322,7 @@ class NewTraceDetailsSpanTree extends Component<PropType> {
       !isCurrentSpanFilteredOut && numOfFilteredSpansAbove > 0;
 
     if (showFilteredSpansMessage) {
-      firstHiddenSpanId = getSpanID(filteredSpansAbove[0].span);
+      firstHiddenSpanId = getSpanID(filteredSpansAbove[0]!.span);
       if (!isCurrentSpanHidden) {
         if (numOfFilteredSpansAbove === 1) {
           messages.push(
@@ -499,7 +499,7 @@ class NewTraceDetailsSpanTree extends Component<PropType> {
           // and it's a last child.
           const generationOffset =
             parentContinuingDepths.length === 1 &&
-            parentContinuingDepths[0].depth === 0 &&
+            parentContinuingDepths[0]!.depth === 0 &&
             parentGeneration > 2
               ? 2
               : 1;
@@ -864,7 +864,7 @@ function SpanRow(props: SpanRowProps) {
   } = props;
 
   const rowRef = useRef<HTMLDivElement>(null);
-  const spanNode = spanTree[index];
+  const spanNode = spanTree[index]!;
 
   useEffect(() => {
     // Gap spans do not have IDs, so we can't really store them. This should not be a big deal, since
diff --git a/static/app/components/events/interfaces/spans/spanBar.tsx b/static/app/components/events/interfaces/spans/spanBar.tsx
index 7754f40a2a64f1..535c0c8834a60e 100644
--- a/static/app/components/events/interfaces/spans/spanBar.tsx
+++ b/static/app/components/events/interfaces/spans/spanBar.tsx
@@ -425,7 +425,7 @@ export class SpanBar extends Component<SpanBarProps, SpanBarState> {
     return (
       <Fragment>
         {Array.from(measurements.values()).map(verticalMark => {
-          const mark = Object.values(verticalMark.marks)[0];
+          const mark = Object.values(verticalMark.marks)[0]!;
           const {timestamp} = mark;
           const bounds = getMeasurementBounds(timestamp, generateBounds);
 
diff --git a/static/app/components/events/interfaces/spans/spanDetail.spec.tsx b/static/app/components/events/interfaces/spans/spanDetail.spec.tsx
index be5a4df59b5b89..9bf9fa577e16ca 100644
--- a/static/app/components/events/interfaces/spans/spanDetail.spec.tsx
+++ b/static/app/components/events/interfaces/spans/spanDetail.spec.tsx
@@ -118,7 +118,7 @@ describe('SpanDetail', function () {
       ).toBeInTheDocument();
 
       expect(
-        screen.queryByRole('button', {name: 'View Query Summary'})
+        screen.queryByRole('button', {name: 'View Summary'})
       ).not.toBeInTheDocument();
     });
 
@@ -145,10 +145,8 @@ describe('SpanDetail', function () {
       expect(
         screen.getByRole('button', {name: 'View Similar Spans'})
       ).toBeInTheDocument();
-      expect(
-        screen.getByRole('button', {name: 'View Query Summary'})
-      ).toBeInTheDocument();
-      expect(screen.getByRole('button', {name: 'View Query Summary'})).toHaveAttribute(
+      expect(screen.getByRole('button', {name: 'View Summary'})).toBeInTheDocument();
+      expect(screen.getByRole('button', {name: 'View Summary'})).toHaveAttribute(
         'href',
         '/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 7630e53cb5b904..f0a1b3d99912a8 100644
--- a/static/app/components/events/interfaces/spans/spanDetail.tsx
+++ b/static/app/components/events/interfaces/spans/spanDetail.tsx
@@ -12,7 +12,6 @@ import FileSize from 'sentry/components/fileSize';
 import ExternalLink from 'sentry/components/links/externalLink';
 import Link from 'sentry/components/links/link';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
-import {CustomMetricsEventData} from 'sentry/components/metrics/customMetricsEventData';
 import {
   ErrorDot,
   ErrorLevel,
@@ -197,7 +196,7 @@ function SpanDetail(props: Props) {
       return null;
     }
 
-    const childTransaction = childTransactions[0];
+    const childTransaction = childTransactions[0]!;
 
     const transactionResult: TransactionResult = {
       'project.name': childTransaction.project_slug,
@@ -578,13 +577,6 @@ function SpanDetail(props: Props) {
               ))}
             </tbody>
           </table>
-          {span._metrics_summary && (
-            <CustomMetricsEventData
-              projectId={event.projectID}
-              metricsSummary={span._metrics_summary}
-              startTimestamp={span.start_timestamp}
-            />
-          )}
         </SpanDetails>
       </Fragment>
     );
diff --git a/static/app/components/events/interfaces/spans/spanProfileDetails.tsx b/static/app/components/events/interfaces/spans/spanProfileDetails.tsx
index 22f63b9582b4ca..197d5df1220176 100644
--- a/static/app/components/events/interfaces/spans/spanProfileDetails.tsx
+++ b/static/app/components/events/interfaces/spans/spanProfileDetails.tsx
@@ -107,7 +107,7 @@ export function useSpanProfileDetails(event, span) {
     // find the number of nodes with the minimum number of samples
     let hasMinCount = 0;
     for (let i = 0; i < nodes.length; i++) {
-      if (nodes[i].count >= TOP_NODE_MIN_COUNT) {
+      if (nodes[i]!.count >= TOP_NODE_MIN_COUNT) {
         hasMinCount += 1;
       } else {
         break;
@@ -125,7 +125,7 @@ export function useSpanProfileDetails(event, span) {
     }
 
     return {
-      frames: extractFrames(nodes[index], event.platform || 'other'),
+      frames: extractFrames(nodes[index]!, event.platform || 'other'),
       hasPrevious: index > 0,
       hasNext: index + 1 < maxNodes,
     };
@@ -195,7 +195,7 @@ export function SpanProfileDetails({
     return null;
   }
 
-  const percentage = formatPercentage(nodes[index].count / totalWeight);
+  const percentage = formatPercentage(nodes[index]!.count / totalWeight);
 
   return (
     <SpanContainer>
@@ -217,7 +217,7 @@ export function SpanProfileDetails({
           size="xs"
           title={t(
             '%s out of %s (%s) of the call stacks collected during this span',
-            nodes[index].count,
+            nodes[index]!.count,
             totalWeight,
             percentage
           )}
@@ -274,11 +274,11 @@ function getTopNodes(profile: Profile, startTimestamp, stopTimestamp): CallTreeN
   const callTree: CallTreeNode = new CallTreeNode(ProfilingFrame.Root, null);
 
   for (let i = 0; i < profile.samples.length; i++) {
-    const sample = profile.samples[i];
+    const sample = profile.samples[i]!;
     // TODO: should this take self times into consideration?
     const inRange = startTimestamp <= duration && duration < stopTimestamp;
 
-    duration += profile.weights[i];
+    duration += profile.weights[i]!;
 
     if (sample.isRoot || !inRange) {
       continue;
diff --git a/static/app/components/events/interfaces/spans/spanSiblingGroupBar.tsx b/static/app/components/events/interfaces/spans/spanSiblingGroupBar.tsx
index c65f4b88d04776..75fb10f64bf148 100644
--- a/static/app/components/events/interfaces/spans/spanSiblingGroupBar.tsx
+++ b/static/app/components/events/interfaces/spans/spanSiblingGroupBar.tsx
@@ -72,8 +72,8 @@ export default function SpanSiblingGroupBar(props: SpanSiblingGroupBarProps) {
       return '';
     }
 
-    const operation = spanGrouping[0].span.op;
-    const description = spanGrouping[0].span.description;
+    const operation = spanGrouping[0]!.span.op;
+    const description = spanGrouping[0]!.span.description;
 
     if (!description || !operation) {
       if (description) {
@@ -132,7 +132,7 @@ export default function SpanSiblingGroupBar(props: SpanSiblingGroupBarProps) {
           <SpanRectangle
             key={index}
             spanGrouping={spanGrouping}
-            bounds={getSpanGroupBounds([spanGrouping[index]], generateBounds)}
+            bounds={getSpanGroupBounds([spanGrouping[index]!], generateBounds)}
             spanBarType={spanBarType}
           />
         ))}
@@ -155,7 +155,7 @@ export default function SpanSiblingGroupBar(props: SpanSiblingGroupBarProps) {
       spanNumber={spanNumber}
       generateBounds={generateBounds}
       toggleSpanGroup={() => {
-        toggleSiblingSpanGroup?.(spanGrouping[0].span, occurrence);
+        toggleSiblingSpanGroup?.(spanGrouping[0]!.span, occurrence);
         isEmbeddedSpanTree &&
           trackAnalytics('issue_details.performance.autogrouped_siblings_toggle', {
             organization,
diff --git a/static/app/components/events/interfaces/spans/spanSummaryButton.tsx b/static/app/components/events/interfaces/spans/spanSummaryButton.tsx
index 12750e292fc7bf..5aab475016cb91 100644
--- a/static/app/components/events/interfaces/spans/spanSummaryButton.tsx
+++ b/static/app/components/events/interfaces/spans/spanSummaryButton.tsx
@@ -54,7 +54,7 @@ function SpanSummaryButton(props: Props) {
           });
         }}
       >
-        {t('View Query Summary')}
+        {t('View Summary')}
       </LinkButton>
     );
   }
diff --git a/static/app/components/events/interfaces/spans/spanTree.tsx b/static/app/components/events/interfaces/spans/spanTree.tsx
index 41f653483eae9b..03960067aeba25 100644
--- a/static/app/components/events/interfaces/spans/spanTree.tsx
+++ b/static/app/components/events/interfaces/spans/spanTree.tsx
@@ -305,7 +305,7 @@ class SpanTree extends Component<PropType> {
     const showHiddenSpansMessage = !isCurrentSpanHidden && numOfSpansOutOfViewAbove > 0;
 
     if (showHiddenSpansMessage) {
-      firstHiddenSpanId = getSpanID(outOfViewSpansAbove[0].span);
+      firstHiddenSpanId = getSpanID(outOfViewSpansAbove[0]!.span);
       messages.push(
         <span key={`spans-out-of-view-${firstHiddenSpanId}`}>
           <strong>{numOfSpansOutOfViewAbove}</strong> {t('spans out of view')}
@@ -318,7 +318,7 @@ class SpanTree extends Component<PropType> {
       !isCurrentSpanFilteredOut && numOfFilteredSpansAbove > 0;
 
     if (showFilteredSpansMessage) {
-      firstHiddenSpanId = getSpanID(filteredSpansAbove[0].span);
+      firstHiddenSpanId = getSpanID(filteredSpansAbove[0]!.span);
       if (!isCurrentSpanHidden) {
         if (numOfFilteredSpansAbove === 1) {
           messages.push(
@@ -816,7 +816,7 @@ function SpanRow(props: SpanRowProps) {
   } = props;
 
   const rowRef = useRef<HTMLDivElement>(null);
-  const spanNode = spanTree[index];
+  const spanNode = spanTree[index]!;
 
   useEffect(() => {
     // Gap spans do not have IDs, so we can't really store them. This should not be a big deal, since
diff --git a/static/app/components/events/interfaces/spans/spanTreeModel.spec.tsx b/static/app/components/events/interfaces/spans/spanTreeModel.spec.tsx
index e536a47efb7b76..cf7688e9870f33 100644
--- a/static/app/components/events/interfaces/spans/spanTreeModel.spec.tsx
+++ b/static/app/components/events/interfaces/spans/spanTreeModel.spec.tsx
@@ -455,11 +455,11 @@ describe('SpanTreeModel', () => {
     );
 
     fullWaterfallExpected[0] = {
-      ...fullWaterfallExpected[0],
+      ...fullWaterfallExpected[0]!,
     };
-    assert(fullWaterfallExpected[0].type === 'span');
-    fullWaterfallExpected[0].numOfSpanChildren += 1;
-    fullWaterfallExpected[0].showEmbeddedChildren = true;
+    assert(fullWaterfallExpected[0]!.type === 'span');
+    fullWaterfallExpected[0]!.numOfSpanChildren += 1;
+    fullWaterfallExpected[0]!.showEmbeddedChildren = true;
 
     expect(spans).toEqual(fullWaterfallExpected);
 
@@ -559,11 +559,11 @@ describe('SpanTreeModel', () => {
       },
     };
 
-    if (!Array.isArray(event2.entries[0].data)) {
+    if (!Array.isArray(event2.entries[0]!.data)) {
       throw new Error('event2.entries[0].data is not an array');
     }
 
-    const data = event2.entries[0].data as RawSpanType[];
+    const data = event2.entries[0]!.data as RawSpanType[];
     for (let i = 0; i < 5; i++) {
       data.push(spanTemplate);
     }
@@ -602,12 +602,12 @@ describe('SpanTreeModel', () => {
       directParent: null,
     });
 
-    expect(spans.length).toEqual(2);
-    expect(spans[1].type).toEqual('span_group_siblings');
+    expect(spans).toHaveLength(2);
+    expect(spans[1]!.type).toBe('span_group_siblings');
 
     // If statement here is required to avoid TS linting issues
-    if (spans[1].type === 'span_group_siblings') {
-      expect(spans[1].spanSiblingGrouping!.length).toEqual(5);
+    if (spans[1]!.type === 'span_group_siblings') {
+      expect(spans[1]!.spanSiblingGrouping!).toHaveLength(5);
     }
   });
 
@@ -641,11 +641,11 @@ describe('SpanTreeModel', () => {
       },
     };
 
-    if (!Array.isArray(event2.entries[0].data)) {
+    if (!Array.isArray(event2.entries[0]!.data)) {
       throw new Error('event2.entries[0].data is not an array');
     }
 
-    const data = event2.entries[0].data as RawSpanType[];
+    const data = event2.entries[0]!.data as RawSpanType[];
     for (let i = 0; i < 4; i++) {
       data.push(spanTemplate);
     }
@@ -684,8 +684,8 @@ describe('SpanTreeModel', () => {
       directParent: null,
     });
 
-    expect(spans.length).toEqual(5);
-    spans.forEach(span => expect(span.type).toEqual('span'));
+    expect(spans).toHaveLength(5);
+    spans.forEach(span => expect(span.type).toBe('span'));
   });
 
   it('properly autogroups similar siblings and leaves other siblings ungrouped', () => {
@@ -737,11 +737,11 @@ describe('SpanTreeModel', () => {
       },
     };
 
-    if (!Array.isArray(event2.entries[0].data)) {
+    if (!Array.isArray(event2.entries[0]!.data)) {
       throw new Error('event2.entries[0].data is not an array');
     }
 
-    const data = event2.entries[0].data as RawSpanType[];
+    const data = event2.entries[0]!.data as RawSpanType[];
     for (let i = 0; i < 7; i++) {
       data.push(groupableSpanTemplate);
     }
@@ -787,9 +787,9 @@ describe('SpanTreeModel', () => {
       directParent: null,
     });
 
-    expect(spans.length).toEqual(4);
-    expect(spans[1].type).toEqual('span_group_siblings');
-    expect(spans[2].type).toEqual('span');
-    expect(spans[3].type).toEqual('span_group_siblings');
+    expect(spans).toHaveLength(4);
+    expect(spans[1]!.type).toBe('span_group_siblings');
+    expect(spans[2]!.type).toBe('span');
+    expect(spans[3]!.type).toBe('span_group_siblings');
   });
 });
diff --git a/static/app/components/events/interfaces/spans/spanTreeModel.tsx b/static/app/components/events/interfaces/spans/spanTreeModel.tsx
index 7de0a6c3ceaf99..41fd73af6d5898 100644
--- a/static/app/components/events/interfaces/spans/spanTreeModel.tsx
+++ b/static/app/components/events/interfaces/spans/spanTreeModel.tsx
@@ -262,11 +262,11 @@ class SpanTreeModel {
       // we will need to reconstruct the tree depth information. This is only neccessary
       // when the span group chain is hidden/collapsed.
       if (spanNestedGrouping.length === 1) {
-        const treeDepthEntry = isOrphanSpan(spanNestedGrouping[0].span)
-          ? ({type: 'orphan', depth: spanNestedGrouping[0].treeDepth} as OrphanTreeDepth)
-          : spanNestedGrouping[0].treeDepth;
+        const treeDepthEntry = isOrphanSpan(spanNestedGrouping[0]!.span)
+          ? ({type: 'orphan', depth: spanNestedGrouping[0]!.treeDepth} as OrphanTreeDepth)
+          : spanNestedGrouping[0]!.treeDepth;
 
-        if (!spanNestedGrouping[0].isLastSibling) {
+        if (!spanNestedGrouping[0]!.isLastSibling) {
           continuingTreeDepths = [...continuingTreeDepths, treeDepthEntry];
         }
       }
@@ -352,11 +352,11 @@ class SpanTreeModel {
     };
 
     if (descendantsSource?.length >= MIN_SIBLING_GROUP_SIZE) {
-      let prevSpanModel = descendantsSource[0];
+      let prevSpanModel = descendantsSource[0]!;
       let currentGroup = [prevSpanModel];
 
       for (let i = 1; i < descendantsSource.length; i++) {
-        const currSpanModel = descendantsSource[i];
+        const currSpanModel = descendantsSource[i]!;
 
         // We want to group siblings only if they share the same op and description, and if they have no children
         if (
@@ -438,7 +438,7 @@ class SpanTreeModel {
           return acc;
         }
 
-        const key = getSiblingGroupKey(group[0].span, occurrence);
+        const key = getSiblingGroupKey(group[0]!.span, occurrence);
         if (this.expandedSiblingGroups.has(key)) {
           // This check is needed here, since it is possible that a user could be filtering for a specific span ID.
           // In this case, we must add only the specified span into the accumulator's descendants
@@ -482,7 +482,7 @@ class SpanTreeModel {
               });
 
               const gapSpan = this.generateSpanGap(
-                group[0].span,
+                group[0]!.span,
                 event,
                 acc.previousSiblingEndTimestamp,
                 treeDepth + 1,
@@ -512,7 +512,7 @@ class SpanTreeModel {
         // if the spans are filtered or out of bounds here
 
         if (
-          this.isSpanFilteredOut(props, group[0]) ||
+          this.isSpanFilteredOut(props, group[0]!) ||
           groupShouldBeHidden(group, focusedSpanIds)
         ) {
           group.forEach(spanModel => {
@@ -525,8 +525,8 @@ class SpanTreeModel {
         }
 
         const bounds = generateBounds({
-          startTimestamp: group[0].span.start_timestamp,
-          endTimestamp: group[group.length - 1].span.timestamp,
+          startTimestamp: group[0]!.span.start_timestamp,
+          endTimestamp: group[group.length - 1]!.span.timestamp,
         });
 
         if (!bounds.isSpanVisibleInView) {
@@ -540,7 +540,7 @@ class SpanTreeModel {
         }
 
         const gapSpan = this.generateSpanGap(
-          group[0].span,
+          group[0]!.span,
           event,
           acc.previousSiblingEndTimestamp,
           treeDepth + 1,
@@ -590,7 +590,7 @@ class SpanTreeModel {
         };
 
         acc.previousSiblingEndTimestamp =
-          wrappedSiblings[wrappedSiblings.length - 1].span.timestamp;
+          wrappedSiblings[wrappedSiblings.length - 1]!.span.timestamp;
 
         acc.descendants.push(groupedSiblingsSpan);
         return acc;
@@ -678,14 +678,14 @@ class SpanTreeModel {
       spanNestedGrouping.length === 1
     ) {
       if (!isNestedSpanGroupExpanded) {
-        const parentSpan = spanNestedGrouping[0].span;
+        const parentSpan = spanNestedGrouping[0]!.span;
         const parentSpanBounds = generateBounds({
           startTimestamp: parentSpan.start_timestamp,
           endTimestamp: parentSpan.timestamp,
         });
         const isParentSpanOutOfView = !parentSpanBounds.isSpanVisibleInView;
         if (!isParentSpanOutOfView) {
-          return [spanNestedGrouping[0], wrappedSpan, ...descendants];
+          return [spanNestedGrouping[0]!, wrappedSpan, ...descendants];
         }
       }
 
diff --git a/static/app/components/events/interfaces/spans/traceView.spec.tsx b/static/app/components/events/interfaces/spans/traceView.spec.tsx
index 8a916e488f39b3..5285505fa72cce 100644
--- a/static/app/components/events/interfaces/spans/traceView.spec.tsx
+++ b/static/app/components/events/interfaces/spans/traceView.spec.tsx
@@ -20,14 +20,14 @@ import ProjectsStore from 'sentry/stores/projectsStore';
 import {QuickTraceContext} from 'sentry/utils/performance/quickTrace/quickTraceContext';
 import QuickTraceQuery from 'sentry/utils/performance/quickTrace/quickTraceQuery';
 
-function initializeData(settings) {
+function initializeData(settings: Parameters<typeof _initializeData>[0]) {
   const data = _initializeData(settings);
   ProjectsStore.loadInitialData(data.projects);
   return data;
 }
 
 describe('TraceView', () => {
-  let data;
+  let data!: ReturnType<typeof initializeData>;
 
   beforeEach(() => {
     data = initializeData({});
@@ -202,7 +202,7 @@ describe('TraceView', () => {
 
       expect(screen.queryAllByText('group me')).toHaveLength(2);
 
-      const firstGroup = screen.queryAllByText('Autogrouped — http —')[0];
+      const firstGroup = screen.queryAllByText('Autogrouped — http —')[0]!;
       await userEvent.click(firstGroup);
       expect(await screen.findAllByText('group me')).toHaveLength(6);
 
@@ -210,7 +210,7 @@ describe('TraceView', () => {
       await userEvent.click(secondGroup);
       expect(await screen.findAllByText('group me')).toHaveLength(10);
 
-      const firstRegroup = screen.queryAllByText('Regroup')[0];
+      const firstRegroup = screen.queryAllByText('Regroup')[0]!;
       await userEvent.click(firstRegroup);
       expect(await screen.findAllByText('group me')).toHaveLength(6);
 
diff --git a/static/app/components/events/interfaces/spans/traceView.tsx b/static/app/components/events/interfaces/spans/traceView.tsx
index 317f76f18ba9d2..f294cfa84b540e 100644
--- a/static/app/components/events/interfaces/spans/traceView.tsx
+++ b/static/app/components/events/interfaces/spans/traceView.tsx
@@ -1,4 +1,4 @@
-import {createRef, memo, useEffect, useState} from 'react';
+import {memo, useEffect, useRef, useState} from 'react';
 import {Observer} from 'mobx-react';
 
 import EmptyStateWarning from 'sentry/components/emptyStateWarning';
@@ -26,10 +26,10 @@ type Props = {
 };
 
 function TraceView(props: Props) {
-  const traceViewRef = createRef<HTMLDivElement>();
-  const traceViewHeaderRef = createRef<HTMLDivElement>();
-  const virtualScrollBarContainerRef = createRef<HTMLDivElement>();
-  const minimapInteractiveRef = createRef<HTMLDivElement>();
+  const traceViewRef = useRef<HTMLDivElement>(null);
+  const traceViewHeaderRef = useRef<HTMLDivElement>(null);
+  const virtualScrollBarContainerRef = useRef<HTMLDivElement>(null);
+  const minimapInteractiveRef = useRef<HTMLDivElement>(null);
 
   const [isMounted, setIsMounted] = useState(false);
 
diff --git a/static/app/components/events/interfaces/spans/types.tsx b/static/app/components/events/interfaces/spans/types.tsx
index ccd8afd617f095..8581dfc8dc2927 100644
--- a/static/app/components/events/interfaces/spans/types.tsx
+++ b/static/app/components/events/interfaces/spans/types.tsx
@@ -48,7 +48,6 @@ export type RawSpanType = {
   // this is essentially end_timestamp
   timestamp: number;
   trace_id: string;
-  _metrics_summary?: MetricsSummary;
   data?: SpanSourceCodeAttributes & SpanDatabaseAttributes & Record<string, any>;
   description?: string;
   exclusive_time?: number;
@@ -102,7 +101,6 @@ export const rawSpanKeys: Set<keyof RawSpanType> = new Set([
   'tags',
   'hash',
   'exclusive_time',
-  '_metrics_summary',
 ]);
 
 export type OrphanSpanType = RawSpanType & {
diff --git a/static/app/components/events/interfaces/spans/utils.spec.tsx b/static/app/components/events/interfaces/spans/utils.spec.tsx
index 9ea31d0518903b..9a81bbbba3c10d 100644
--- a/static/app/components/events/interfaces/spans/utils.spec.tsx
+++ b/static/app/components/events/interfaces/spans/utils.spec.tsx
@@ -12,29 +12,29 @@ describe('test utility functions', function () {
       1658925888.60193
     );
 
-    expect(result.start).toEqual('1658925888.601534');
-    expect(result.end).toEqual('1658925888.601930');
+    expect(result.start).toBe('1658925888.601534');
+    expect(result.end).toBe('1658925888.601930');
 
     result = getFormattedTimeRangeWithLeadingAndTrailingZero(
       1658925888.601534,
       165892588.060193
     );
-    expect(result.start).toEqual('1658925888.601534');
-    expect(result.end).toEqual('0165892588.060193');
+    expect(result.start).toBe('1658925888.601534');
+    expect(result.end).toBe('0165892588.060193');
 
     result = getFormattedTimeRangeWithLeadingAndTrailingZero(
       16589258.6015,
       1658925888.060193
     );
-    expect(result.start).toEqual('0016589258.601500');
-    expect(result.end).toEqual('1658925888.060193');
+    expect(result.start).toBe('0016589258.601500');
+    expect(result.end).toBe('1658925888.060193');
 
     result = getFormattedTimeRangeWithLeadingAndTrailingZero(
       1658925888.601534,
       1658925888.601935
     );
-    expect(result.start).toEqual('1658925888.601534');
-    expect(result.end).toEqual('1658925888.601935');
+    expect(result.start).toBe('1658925888.601534');
+    expect(result.end).toBe('1658925888.601935');
   });
 });
 
diff --git a/static/app/components/events/interfaces/spans/utils.tsx b/static/app/components/events/interfaces/spans/utils.tsx
index b3d25167f9212d..e5cade8519816b 100644
--- a/static/app/components/events/interfaces/spans/utils.tsx
+++ b/static/app/components/events/interfaces/spans/utils.tsx
@@ -700,7 +700,7 @@ function hasFailedThreshold(marks: Measurements): boolean {
   );
 
   return records.some(record => {
-    const {value} = marks[record.slug];
+    const {value} = marks[record.slug]!;
     if (typeof value === 'number' && typeof record.poorThreshold === 'number') {
       return value >= record.poorThreshold;
     }
@@ -733,7 +733,7 @@ export function getMeasurements(
   const measurements = Object.keys(event.measurements)
     .filter(name => allowedVitals.has(`measurements.${name}`))
     .map(name => {
-      const associatedMeasurement = event.measurements![name];
+      const associatedMeasurement = event.measurements![name]!;
       return {
         name,
         // Time timestamp is in seconds, but the measurement value is given in ms so convert it here
@@ -947,8 +947,8 @@ export function getSpanGroupTimestamps(spanGroup: EnhancedSpan[]) {
       };
     },
     {
-      startTimestamp: spanGroup[0].span.start_timestamp,
-      endTimestamp: spanGroup[0].span.timestamp,
+      startTimestamp: spanGroup[0]!.span.start_timestamp,
+      endTimestamp: spanGroup[0]!.span.timestamp,
     }
   );
 }
@@ -1065,22 +1065,22 @@ export function getFormattedTimeRangeWithLeadingAndTrailingZero(
     start: string[];
   }>(
     (acc, startString, index) => {
-      if (startString.length > endStrings[index].length) {
+      if (startString.length > endStrings[index]!.length) {
         acc.start.push(startString);
         acc.end.push(
           index === 0
-            ? endStrings[index].padStart(startString.length, '0')
-            : endStrings[index].padEnd(startString.length, '0')
+            ? endStrings[index]!.padStart(startString.length, '0')
+            : endStrings[index]!.padEnd(startString.length, '0')
         );
         return acc;
       }
 
       acc.start.push(
         index === 0
-          ? startString.padStart(endStrings[index].length, '0')
-          : startString.padEnd(endStrings[index].length, '0')
+          ? startString.padStart(endStrings[index]!.length, '0')
+          : startString.padEnd(endStrings[index]!.length, '0')
       );
-      acc.end.push(endStrings[index]);
+      acc.end.push(endStrings[index]!);
       return acc;
     },
     {start: [], end: []}
diff --git a/static/app/components/events/interfaces/spans/waterfallModel.spec.tsx b/static/app/components/events/interfaces/spans/waterfallModel.spec.tsx
index 6b2f210ab39afd..4bdef959fb8453 100644
--- a/static/app/components/events/interfaces/spans/waterfallModel.spec.tsx
+++ b/static/app/components/events/interfaces/spans/waterfallModel.spec.tsx
@@ -626,16 +626,16 @@ describe('WaterfallModel', () => {
 
   it('querySpanSearch', async () => {
     const waterfallModel = new WaterfallModel(event);
-    expect(waterfallModel.fuse).toBe(undefined);
+    expect(waterfallModel.fuse).toBeUndefined();
 
     // Fuzzy search needs to be loaded asynchronously
     await tick();
 
     // expect fuse index to be created
-    expect(waterfallModel.fuse).not.toBe(undefined);
+    expect(waterfallModel.fuse).toBeDefined();
 
-    expect(waterfallModel.filterSpans).toBe(undefined);
-    expect(waterfallModel.searchQuery).toBe(undefined);
+    expect(waterfallModel.filterSpans).toBeUndefined();
+    expect(waterfallModel.searchQuery).toBeUndefined();
 
     waterfallModel.querySpanSearch('GET /api/0/organizations/?member=1');
 
@@ -668,12 +668,12 @@ describe('WaterfallModel', () => {
 
     expected[1] = {
       type: 'out_of_view',
-      span: fullWaterfall[1].span,
+      span: fullWaterfall[1]!!.span,
     } as EnhancedProcessedSpanType;
 
     expected[4] = {
       type: 'out_of_view',
-      span: fullWaterfall[4].span,
+      span: fullWaterfall[4]!.span,
     } as EnhancedProcessedSpanType;
 
     expect(spans).toEqual(expected);
@@ -686,51 +686,51 @@ describe('WaterfallModel', () => {
     });
 
     assert(
-      fullWaterfall[10].type === 'span_group_chain' &&
-        fullWaterfall[10].spanNestedGrouping
+      fullWaterfall[10]!.type === 'span_group_chain' &&
+        fullWaterfall[10]!.spanNestedGrouping
     );
     expected = [
       {
         type: 'filtered_out',
-        span: fullWaterfall[0].span,
+        span: fullWaterfall[0]!.span,
       },
       {
         type: 'out_of_view',
-        span: fullWaterfall[1].span,
+        span: fullWaterfall[1]!!.span,
       },
       fullWaterfall[2],
       fullWaterfall[3],
       {
         type: 'filtered_out',
-        span: fullWaterfall[4].span,
+        span: fullWaterfall[4]!.span,
       },
       {
         type: 'filtered_out',
-        span: fullWaterfall[5].span,
+        span: fullWaterfall[5]!.span,
       },
       {
         type: 'filtered_out',
-        span: fullWaterfall[6].span,
+        span: fullWaterfall[6]!.span,
       },
       {
         type: 'filtered_out',
-        span: fullWaterfall[7].span,
+        span: fullWaterfall[7]!.span,
       },
       {
         type: 'filtered_out',
-        span: fullWaterfall[9].span,
+        span: fullWaterfall[9]!.span,
       },
       {
         type: 'filtered_out',
-        span: fullWaterfall[10].spanNestedGrouping[0].span,
+        span: fullWaterfall[10]!.spanNestedGrouping![0]!.span,
       },
       {
         type: 'filtered_out',
-        span: fullWaterfall[10].spanNestedGrouping[1].span,
+        span: fullWaterfall[10]!.spanNestedGrouping![1]!.span,
       },
       {
         type: 'filtered_out',
-        span: fullWaterfall[11].span,
+        span: fullWaterfall[11]!.span,
       },
     ] as EnhancedProcessedSpanType[];
 
@@ -746,7 +746,7 @@ describe('WaterfallModel', () => {
       viewEnd: 0.65,
     });
 
-    expected[1].type = 'filtered_out';
+    expected[1]!.type = 'filtered_out';
 
     expect(spans).toEqual(expected);
   });
@@ -814,7 +814,7 @@ describe('WaterfallModel', () => {
       ...event,
       entries: [
         {
-          data: [event.entries[0].data[0]],
+          data: [event.entries[0]!.data[0]],
           type: EntryType.SPANS,
         },
       ],
@@ -834,7 +834,7 @@ describe('WaterfallModel', () => {
         toggleNestedSpanGroup: undefined,
       },
       {
-        ...fullWaterfall[1],
+        ...fullWaterfall[1]!,
         isLastSibling: true,
         numOfSpanChildren: 0,
         toggleNestedSpanGroup: undefined,
@@ -848,10 +848,10 @@ describe('WaterfallModel', () => {
       entries: [
         {
           data: [
-            event.entries[0].data[0],
+            event.entries[0]!.data[0],
             {
-              ...event.entries[0].data[0],
-              parent_span_id: event.entries[0].data[0].span_id,
+              ...event.entries[0]!.data[0],
+              parent_span_id: event.entries[0]!.data[0].span_id,
               span_id: 'foo',
             },
           ],
@@ -875,17 +875,17 @@ describe('WaterfallModel', () => {
         toggleNestedSpanGroup: undefined,
       },
       {
-        ...fullWaterfall[1],
+        ...fullWaterfall[1]!,
         treeDepth: 1,
         isLastSibling: true,
         numOfSpanChildren: 1,
         toggleNestedSpanGroup: undefined,
       },
       {
-        ...fullWaterfall[1],
+        ...fullWaterfall[1]!,
         span: {
-          ...fullWaterfall[1].span,
-          parent_span_id: event.entries[0].data[0].span_id,
+          ...fullWaterfall[1]!!.span,
+          parent_span_id: event.entries[0]!.data[0]!.span_id,
           span_id: 'foo',
         },
         treeDepth: 2,
@@ -902,14 +902,14 @@ describe('WaterfallModel', () => {
       entries: [
         {
           data: [
-            event.entries[0].data[0],
+            event.entries[0]!.data[0],
             {
-              ...event.entries[0].data[0],
-              parent_span_id: event.entries[0].data[0].span_id,
+              ...event.entries[0]!.data[0],
+              parent_span_id: event.entries[0]!.data[0]!.span_id,
               span_id: 'foo',
             },
             {
-              ...event.entries[0].data[0],
+              ...event.entries[0]!.data[0],
               parent_span_id: 'foo',
               span_id: 'bar',
             },
@@ -928,7 +928,7 @@ describe('WaterfallModel', () => {
     // expect 1 or more spans are grouped
     expect(spans).toHaveLength(3);
 
-    assert(fullWaterfall[1].type === 'span');
+    assert(fullWaterfall[1]!.type === 'span');
     const collapsedWaterfallExpected = [
       {
         ...fullWaterfall[0],
@@ -938,24 +938,24 @@ describe('WaterfallModel', () => {
       {
         type: 'span_group_chain',
         treeDepth: 1,
-        continuingTreeDepths: fullWaterfall[1].continuingTreeDepths,
+        continuingTreeDepths: fullWaterfall[1]!.continuingTreeDepths,
         span: {
-          ...fullWaterfall[1].span,
+          ...fullWaterfall[1]!.span,
           parent_span_id: 'foo',
           span_id: 'bar',
         },
         spanNestedGrouping: [
           {
-            ...fullWaterfall[1],
+            ...fullWaterfall[1]!,
             isLastSibling: true,
             numOfSpanChildren: 1,
             toggleNestedSpanGroup: undefined,
           },
           {
-            ...fullWaterfall[1],
+            ...fullWaterfall[1]!,
             span: {
-              ...fullWaterfall[1].span,
-              parent_span_id: event.entries[0].data[0].span_id,
+              ...fullWaterfall[1]!.span,
+              parent_span_id: event.entries[0]!.data[0].span_id,
               span_id: 'foo',
             },
             isLastSibling: true,
@@ -967,9 +967,9 @@ describe('WaterfallModel', () => {
         toggleNestedSpanGroup: expect.anything(),
       },
       {
-        ...fullWaterfall[1],
+        ...fullWaterfall[1]!,
         span: {
-          ...fullWaterfall[1].span,
+          ...fullWaterfall[1]!.span,
           parent_span_id: 'foo',
           span_id: 'bar',
         },
@@ -983,8 +983,8 @@ describe('WaterfallModel', () => {
     expect(spans).toEqual(collapsedWaterfallExpected);
 
     // Expand span group
-    assert(spans[1].type === 'span' && spans[1].toggleNestedSpanGroup);
-    spans[1].toggleNestedSpanGroup();
+    assert(spans[1]!.type === 'span' && spans[1]!.toggleNestedSpanGroup);
+    spans[1]!.toggleNestedSpanGroup();
 
     spans = waterfallModel.getWaterfall({
       viewStart: 0,
@@ -1002,17 +1002,17 @@ describe('WaterfallModel', () => {
         toggleNestedSpanGroup: undefined,
       },
       {
-        ...fullWaterfall[1],
+        ...fullWaterfall[1]!,
         isLastSibling: true,
         numOfSpanChildren: 1,
         treeDepth: 1,
         toggleNestedSpanGroup: expect.anything(),
       },
       {
-        ...fullWaterfall[1],
+        ...fullWaterfall[1]!,
         span: {
-          ...fullWaterfall[1].span,
-          parent_span_id: event.entries[0].data[0].span_id,
+          ...fullWaterfall[1]!.span,
+          parent_span_id: event.entries[0]!.data[0].span_id,
           span_id: 'foo',
         },
         isLastSibling: true,
@@ -1021,9 +1021,9 @@ describe('WaterfallModel', () => {
         toggleNestedSpanGroup: undefined,
       },
       {
-        ...fullWaterfall[1],
+        ...fullWaterfall[1]!,
         span: {
-          ...fullWaterfall[1].span,
+          ...fullWaterfall[1]!.span,
           parent_span_id: 'foo',
           span_id: 'bar',
         },
@@ -1035,8 +1035,8 @@ describe('WaterfallModel', () => {
     ]);
 
     // Collapse span group
-    assert(spans[1].type === 'span' && spans[1].toggleNestedSpanGroup);
-    spans[1].toggleNestedSpanGroup();
+    assert(spans[1]!.type === 'span' && spans[1]!.toggleNestedSpanGroup);
+    spans[1]!.toggleNestedSpanGroup();
 
     spans = waterfallModel.getWaterfall({
       viewStart: 0,
diff --git a/static/app/components/events/interfaces/spans/waterfallModel.tsx b/static/app/components/events/interfaces/spans/waterfallModel.tsx
index a77d4c2d0d719c..2b0b446cbbb03a 100644
--- a/static/app/components/events/interfaces/spans/waterfallModel.tsx
+++ b/static/app/components/events/interfaces/spans/waterfallModel.tsx
@@ -283,8 +283,8 @@ class WaterfallModel {
         };
       },
       {
-        traceStartTimestamp: this.traceBounds[0].traceStartTimestamp,
-        traceEndTimestamp: this.traceBounds[0].traceEndTimestamp,
+        traceStartTimestamp: this.traceBounds[0]!.traceStartTimestamp,
+        traceEndTimestamp: this.traceBounds[0]!.traceEndTimestamp,
       }
     );
   };
diff --git a/static/app/components/events/interfaces/threads.spec.tsx b/static/app/components/events/interfaces/threads.spec.tsx
index 3ff3b1fce7e1a0..f96be912bf81cd 100644
--- a/static/app/components/events/interfaces/threads.spec.tsx
+++ b/static/app/components/events/interfaces/threads.spec.tsx
@@ -218,7 +218,7 @@ describe('Threads', function () {
       };
 
       const props: React.ComponentProps<typeof Threads> = {
-        data: event.entries[1].data as React.ComponentProps<typeof Threads>['data'],
+        data: event.entries[1]!.data as React.ComponentProps<typeof Threads>['data'],
         event,
         groupingCurrentLevel: 0,
         projectSlug: project.slug,
@@ -268,7 +268,7 @@ describe('Threads', function () {
         render(<Threads {...props} />, {organization});
 
         expect(
-          within(screen.getAllByTestId('line')[0]).getByText(
+          within(screen.getAllByTestId('line')[0]!).getByText(
             'sentry/controllers/welcome_controller.rb'
           )
         ).toBeInTheDocument();
@@ -287,7 +287,7 @@ describe('Threads', function () {
 
         // Last frame is the first on the list
         expect(
-          within(screen.getAllByTestId('line')[0]).getByText(
+          within(screen.getAllByTestId('line')[0]!).getByText(
             'puma (3.12.6) lib/puma/server.rb'
           )
         ).toBeInTheDocument();
@@ -298,7 +298,7 @@ describe('Threads', function () {
 
         // First frame is the first on the list
         expect(
-          within(screen.getAllByTestId('line')[0]).getByText(
+          within(screen.getAllByTestId('line')[0]!).getByText(
             'sentry/controllers/welcome_controller.rb'
           )
         ).toBeInTheDocument();
@@ -896,7 +896,7 @@ describe('Threads', function () {
       };
 
       const props: React.ComponentProps<typeof Threads> = {
-        data: event.entries[1].data as React.ComponentProps<typeof Threads>['data'],
+        data: event.entries[1]!.data as React.ComponentProps<typeof Threads>['data'],
         event,
         groupingCurrentLevel: 0,
         projectSlug: project.slug,
@@ -915,9 +915,9 @@ describe('Threads', function () {
         expect(screen.getByRole('radio', {name: 'Full Stack Trace'})).not.toBeChecked();
         expect(screen.getByRole('button', {name: 'Options'})).toBeInTheDocument();
 
-        expect(screen.queryByText('Threads')).toBeInTheDocument();
-        expect(screen.queryByText('Thread State')).toBeInTheDocument();
-        expect(screen.queryByText('Thread Tags')).toBeInTheDocument();
+        expect(screen.getByText('Threads')).toBeInTheDocument();
+        expect(screen.getByText('Thread State')).toBeInTheDocument();
+        expect(screen.getByText('Thread Tags')).toBeInTheDocument();
 
         // Stack Trace
         expect(screen.getByRole('heading', {name: 'EXC_BAD_ACCESS'})).toBeInTheDocument();
@@ -1013,7 +1013,7 @@ describe('Threads', function () {
 
       it('maps android vm states to java vm states', async function () {
         const newEvent = {...event};
-        const threadsEntry = newEvent.entries[1].data as React.ComponentProps<
+        const threadsEntry = newEvent.entries[1]!.data as React.ComponentProps<
           typeof Threads
         >['data'];
         const thread = {
@@ -1089,7 +1089,7 @@ describe('Threads', function () {
         render(<Threads {...props} />, {organization});
 
         expect(
-          within(screen.getAllByTestId('stack-trace-frame')[0]).getByText(
+          within(screen.getAllByTestId('stack-trace-frame')[0]!).getByText(
             '-[SentryClient crash]'
           )
         ).toBeInTheDocument();
@@ -1115,7 +1115,7 @@ describe('Threads', function () {
 
         // Last frame is the first on the list
         expect(
-          within(screen.getAllByTestId('stack-trace-frame')[0]).getByText('UIKit')
+          within(screen.getAllByTestId('stack-trace-frame')[0]!).getByText('UIKit')
         ).toBeInTheDocument();
 
         // Switch back to recent first
@@ -1124,7 +1124,7 @@ describe('Threads', function () {
 
         // First frame is the first on the list
         expect(
-          within(screen.getAllByTestId('stack-trace-frame')[0]).getByText(
+          within(screen.getAllByTestId('stack-trace-frame')[0]!).getByText(
             '-[SentryClient crash]'
           )
         ).toBeInTheDocument();
@@ -1159,7 +1159,7 @@ describe('Threads', function () {
 
         // Function name is not verbose
         expect(
-          within(screen.getAllByTestId('stack-trace-frame')[1]).getByText(
+          within(screen.getAllByTestId('stack-trace-frame')[1]!).getByText(
             'ViewController.causeCrash'
           )
         ).toBeInTheDocument();
@@ -1169,14 +1169,14 @@ describe('Threads', function () {
 
         // Function name is now verbose
         expect(
-          within(screen.getAllByTestId('stack-trace-frame')[1]).getByText(
+          within(screen.getAllByTestId('stack-trace-frame')[1]!).getByText(
             'ViewController.causeCrash(Any) -> ()'
           )
         ).toBeInTheDocument();
 
         // Address is not absolute
         expect(
-          within(screen.getAllByTestId('stack-trace-frame')[1]).getByText('+0x085ac')
+          within(screen.getAllByTestId('stack-trace-frame')[1]!).getByText('+0x085ac')
         ).toBeInTheDocument();
 
         // Click on absolute file paths option
@@ -1184,7 +1184,7 @@ describe('Threads', function () {
 
         // Address is now absolute
         expect(
-          within(screen.getAllByTestId('stack-trace-frame')[1]).getByText('0x10008c5ac')
+          within(screen.getAllByTestId('stack-trace-frame')[1]!).getByText('0x10008c5ac')
         ).toBeInTheDocument();
 
         MockApiClient.addMockResponse({
@@ -1215,7 +1215,7 @@ describe('Threads', function () {
 
       it('uses thread label in selector if name not available', async function () {
         const newEvent = {...event};
-        const threadsEntry = newEvent.entries[1].data as React.ComponentProps<
+        const threadsEntry = newEvent.entries[1]!.data as React.ComponentProps<
           typeof Threads
         >['data'];
         const thread = {
diff --git a/static/app/components/events/interfaces/threads/threadSelector/getThreadException.tsx b/static/app/components/events/interfaces/threads/threadSelector/getThreadException.tsx
index 23e490792c9033..c113527cda8533 100644
--- a/static/app/components/events/interfaces/threads/threadSelector/getThreadException.tsx
+++ b/static/app/components/events/interfaces/threads/threadSelector/getThreadException.tsx
@@ -6,12 +6,12 @@ function getException(
   exceptionDataValues: ExceptionValue[],
   thread: Thread
 ) {
-  if (exceptionDataValues.length === 1 && !exceptionDataValues[0].stacktrace) {
+  if (exceptionDataValues.length === 1 && !exceptionDataValues[0]!.stacktrace) {
     return {
       ...exceptionData,
       values: [
         {
-          ...exceptionDataValues[0],
+          ...exceptionDataValues[0]!,
           stacktrace: thread.stacktrace,
           rawStacktrace: thread.rawStacktrace,
         },
diff --git a/static/app/components/events/interfaces/utils.spec.tsx b/static/app/components/events/interfaces/utils.spec.tsx
index d778f599737766..e9d0d73e81c349 100644
--- a/static/app/components/events/interfaces/utils.spec.tsx
+++ b/static/app/components/events/interfaces/utils.spec.tsx
@@ -89,7 +89,7 @@ describe('components/interfaces/utils', function () {
           query: [['foo', 'bar']],
           method: 'GET',
         })
-      ).toEqual('curl \\\n "http://example.com/foo?foo=bar"');
+      ).toBe('curl \\\n "http://example.com/foo?foo=bar"');
 
       // Do not add `data` if `data` is empty object
       expect(
@@ -105,7 +105,7 @@ describe('components/interfaces/utils', function () {
           data: {},
           method: 'GET',
         })
-      ).toEqual('curl \\\n "http://example.com/foo"');
+      ).toBe('curl \\\n "http://example.com/foo"');
 
       // Filter out undefined headers
       expect(
@@ -284,16 +284,16 @@ describe('components/interfaces/utils', function () {
     it('should preserve unfiltered values', function () {
       const result = userContextToActor(rawData);
       expect(result).toHaveProperty('id');
-      expect(result.id).toEqual('26');
+      expect(result.id).toBe('26');
       expect(result).toHaveProperty('username');
-      expect(result.username).toEqual('maiseythedog');
+      expect(result.username).toBe('maiseythedog');
     });
   });
 
   describe('stringifyQueryList()', function () {
     it('should return query if it is a string', function () {
       const query = stringifyQueryList('query');
-      expect(query).toEqual('query');
+      expect(query).toBe('query');
     });
     it('should parse query tuples', function () {
       const query = stringifyQueryList([
@@ -302,9 +302,7 @@ describe('components/interfaces/utils', function () {
         ['field', 'total.time'],
         ['numBuckets', '100'],
       ]);
-      expect(query).toEqual(
-        'field=ops.http&field=ops.db&field=total.time&numBuckets=100'
-      );
+      expect(query).toBe('field=ops.http&field=ops.db&field=total.time&numBuckets=100');
     });
   });
 
@@ -332,7 +330,7 @@ describe('components/interfaces/utils', function () {
           ],
         })
       );
-      expect(thread?.name).toEqual('puma 002');
+      expect(thread?.name).toBe('puma 002');
     });
   });
 
@@ -361,7 +359,7 @@ describe('components/interfaces/utils', function () {
         }),
         13920
       );
-      expect(thread?.name).toEqual('puma 002');
+      expect(thread?.name).toBe('puma 002');
     });
   });
 });
diff --git a/static/app/components/events/interfaces/utils.tsx b/static/app/components/events/interfaces/utils.tsx
index 5020068be07e2b..62b175a4c10aa3 100644
--- a/static/app/components/events/interfaces/utils.tsx
+++ b/static/app/components/events/interfaces/utils.tsx
@@ -89,7 +89,7 @@ export function getHiddenFrameIndices({
       const index = parseInt(indexString, 10);
       const indicesToBeAdded: number[] = [];
       let i = 1;
-      let numHidden = frameCountMap[index];
+      let numHidden = frameCountMap[index]!;
       while (numHidden > 0) {
         if (!repeatedIndeces.includes(index - i)) {
           indicesToBeAdded.push(index - i);
@@ -305,7 +305,7 @@ export function parseAssembly(assembly: string | null) {
   }
 
   for (let i = 1; i < pieces.length; i++) {
-    const [key, value] = pieces[i].trim().split('=');
+    const [key, value] = pieces[i]!.trim().split('=');
 
     // eslint-disable-next-line default-case
     switch (key) {
diff --git a/static/app/components/events/opsBreakdown.tsx b/static/app/components/events/opsBreakdown.tsx
index d4fd56bc1e9cd8..e489c0edfa9ba1 100644
--- a/static/app/components/events/opsBreakdown.tsx
+++ b/static/app/components/events/opsBreakdown.tsx
@@ -373,7 +373,7 @@ function mergeInterval(intervals: TimeWindowSpan[]): TimeWindowSpan[] {
       continue;
     }
 
-    const lastInterval = merged[merged.length - 1];
+    const lastInterval = merged[merged.length - 1]!;
     const lastIntervalEnd = lastInterval[1];
 
     const [currentIntervalStart, currentIntervalEnd] = currentInterval;
diff --git a/static/app/components/events/searchBar.tsx b/static/app/components/events/searchBar.tsx
index 7c5113644f29db..dbfac9253a5b46 100644
--- a/static/app/components/events/searchBar.tsx
+++ b/static/app/components/events/searchBar.tsx
@@ -3,9 +3,9 @@ import memoize from 'lodash/memoize';
 import omit from 'lodash/omit';
 
 import {fetchSpanFieldValues, fetchTagValues} from 'sentry/actionCreators/tags';
+import SmartSearchBar from 'sentry/components/deprecatedSmartSearchBar';
 import type {SearchConfig} from 'sentry/components/searchSyntax/parser';
 import {defaultConfig} from 'sentry/components/searchSyntax/parser';
-import SmartSearchBar from 'sentry/components/smartSearchBar';
 import type {TagCollection} from 'sentry/types/group';
 import {SavedSearchType} from 'sentry/types/group';
 import type {Organization} from 'sentry/types/organization';
@@ -98,19 +98,19 @@ const getSearchConfigFromCustomPerformanceMetrics = (
     numericKeys: [...defaultConfig.numericKeys],
   };
   Object.keys(customPerformanceMetrics).forEach(metricName => {
-    const {fieldType} = customPerformanceMetrics[metricName];
+    const {fieldType} = customPerformanceMetrics[metricName]!;
     switch (fieldType) {
       case 'size':
-        searchConfigMap.sizeKeys.push(metricName);
+        searchConfigMap.sizeKeys!.push(metricName);
         break;
       case 'duration':
-        searchConfigMap.durationKeys.push(metricName);
+        searchConfigMap.durationKeys!.push(metricName);
         break;
       case 'percentage':
-        searchConfigMap.percentageKeys.push(metricName);
+        searchConfigMap.percentageKeys!.push(metricName);
         break;
       default:
-        searchConfigMap.numericKeys.push(metricName);
+        searchConfigMap.numericKeys!.push(metricName);
     }
   });
   const searchConfig = {
@@ -222,7 +222,7 @@ function SearchBar(props: SearchBarProps) {
               projectIds: projectIdStrings,
               endpointParams,
               // allows searching for tags on transactions as well
-              includeTransactions: includeTransactions,
+              includeTransactions,
               // allows searching for tags on sessions as well
               includeSessions: includeSessionTagsValues,
               dataset: dataset ? DiscoverDatasetsToDatasetMap[dataset] : undefined,
diff --git a/static/app/components/events/viewHierarchy/index.spec.tsx b/static/app/components/events/viewHierarchy/index.spec.tsx
index ae97f3986a3c05..a34df368f49bea 100644
--- a/static/app/components/events/viewHierarchy/index.spec.tsx
+++ b/static/app/components/events/viewHierarchy/index.spec.tsx
@@ -2,7 +2,7 @@ import {ProjectFixture} from 'sentry-fixture/project';
 
 import {render, screen, userEvent, within} from 'sentry-test/reactTestingLibrary';
 
-import {ViewHierarchy} from '.';
+import {ViewHierarchy, type ViewHierarchyData} from './index';
 
 // Mocks for useVirtualizedTree hook
 class ResizeObserver {
@@ -47,8 +47,8 @@ const DEFAULT_MOCK_DATA = {
 };
 
 describe('View Hierarchy', function () {
-  let MOCK_DATA;
-  let project;
+  let MOCK_DATA!: ViewHierarchyData;
+  let project!: ReturnType<typeof ProjectFixture>;
   beforeEach(() => {
     MOCK_DATA = DEFAULT_MOCK_DATA;
     project = ProjectFixture();
@@ -78,7 +78,7 @@ describe('View Hierarchy', function () {
   it('can expand and collapse by clicking the icon', async function () {
     render(<ViewHierarchy viewHierarchy={MOCK_DATA} project={project} />);
 
-    expect(screen.queryByText('Text')).toBeInTheDocument();
+    expect(screen.getByText('Text')).toBeInTheDocument();
 
     await userEvent.click(
       within(screen.getByLabelText('Nested Container - nested')).getByRole('button', {
@@ -90,13 +90,13 @@ describe('View Hierarchy', function () {
 
     await userEvent.click(screen.getByRole('button', {name: 'Expand'}));
 
-    expect(screen.queryByText('Text')).toBeInTheDocument();
+    expect(screen.getByText('Text')).toBeInTheDocument();
   });
 
   it('can navigate with keyboard shortcuts after a selection', async function () {
     render(<ViewHierarchy viewHierarchy={MOCK_DATA} project={project} />);
 
-    await userEvent.click(screen.getAllByText('Container - test_identifier')[0]);
+    await userEvent.click(screen.getAllByText('Container - test_identifier')[0]!);
 
     await userEvent.keyboard('{ArrowDown}');
 
@@ -107,7 +107,7 @@ describe('View Hierarchy', function () {
   it('can expand/collapse with the keyboard', async function () {
     render(<ViewHierarchy viewHierarchy={MOCK_DATA} project={project} />);
 
-    await userEvent.click(screen.getAllByText('Nested Container - nested')[0]);
+    await userEvent.click(screen.getAllByText('Nested Container - nested')[0]!);
 
     await userEvent.keyboard('{Enter}');
 
diff --git a/static/app/components/events/viewHierarchy/utils.spec.tsx b/static/app/components/events/viewHierarchy/utils.spec.tsx
index 36dd4e8c483e3f..72d07e1e5374ee 100644
--- a/static/app/components/events/viewHierarchy/utils.spec.tsx
+++ b/static/app/components/events/viewHierarchy/utils.spec.tsx
@@ -91,32 +91,32 @@ describe('View Hierarchy Utils', function () {
     it('zooms in on small content', function () {
       maxCoordinateDimensions = {height: 2, width: 2};
       actual = calculateScale(bounds, maxCoordinateDimensions, border);
-      expect(actual).toEqual(5);
+      expect(actual).toBe(5);
     });
 
     it('shrinks larger content', function () {
       maxCoordinateDimensions = {height: 20, width: 20};
       actual = calculateScale(bounds, maxCoordinateDimensions, border);
-      expect(actual).toEqual(0.5);
+      expect(actual).toBe(0.5);
     });
 
     it('works with an irregular size where height is the dominant factor', function () {
       maxCoordinateDimensions = {height: 20, width: 2};
       actual = calculateScale(bounds, maxCoordinateDimensions, border);
-      expect(actual).toEqual(0.5);
+      expect(actual).toBe(0.5);
     });
 
     it('works with an irregular size where width is the dominant factor', function () {
       maxCoordinateDimensions = {height: 10, width: 32};
       actual = calculateScale(bounds, maxCoordinateDimensions, border);
-      expect(actual).toEqual(0.3125);
+      expect(actual).toBe(0.3125);
     });
 
     it('factors in the border', function () {
       maxCoordinateDimensions = {height: 20, width: 20};
       border = {x: 2, y: 2};
       actual = calculateScale(bounds, maxCoordinateDimensions, border);
-      expect(actual).toEqual(0.4);
+      expect(actual).toBe(0.4);
     });
   });
 
diff --git a/static/app/components/events/viewHierarchy/utils.tsx b/static/app/components/events/viewHierarchy/utils.tsx
index 6de7bd4aecdf3a..92a1017aafec52 100644
--- a/static/app/components/events/viewHierarchy/utils.tsx
+++ b/static/app/components/events/viewHierarchy/utils.tsx
@@ -21,7 +21,7 @@ export function useResizeCanvasObserver(canvases: (HTMLCanvasElement | null)[]):
 
     const observer = watchForResize(canvases as HTMLCanvasElement[], entries => {
       const contentRect =
-        entries[0].contentRect ?? entries[0].target.getBoundingClientRect();
+        entries[0]!.contentRect ?? entries[0]!.target.getBoundingClientRect();
 
       setCanvasBounds(
         new Rect(
@@ -52,7 +52,7 @@ export function getHierarchyDimensions(
   const nodes: ViewNode[] = [];
   const queue: [Rect | null, ViewHierarchyWindow][] = [];
   for (let i = hierarchies.length - 1; i >= 0; i--) {
-    queue.push([null, hierarchies[i]]);
+    queue.push([null, hierarchies[i]!]);
   }
 
   let maxWidth = Number.MIN_SAFE_INTEGER;
@@ -77,7 +77,7 @@ export function getHierarchyDimensions(
       // output nodes should have early children before later children
       // i.e. we need to pop() off early children before ones that come after
       for (let i = child.children.length - 1; i >= 0; i--) {
-        queue.push([node.rect, child.children[i]]);
+        queue.push([node.rect, child.children[i]!]);
       }
     }
 
@@ -114,8 +114,8 @@ export function getDeepestNodeAtPoint(
   vec2.scale(point, point, scale);
   const transformedPoint = vec2.transformMat3(vec2.create(), point, inverseMatrix);
   for (let i = 0; i < nodes.length; i++) {
-    const node = nodes[i];
-    if (node.rect.contains(transformedPoint)) {
+    const node = nodes[i]!;
+    if (node!.rect.contains(transformedPoint)) {
       clickedNode = node;
     }
   }
diff --git a/static/app/components/events/viewHierarchy/wireframe.tsx b/static/app/components/events/viewHierarchy/wireframe.tsx
index 9877dad5a743b5..26d32e686837df 100644
--- a/static/app/components/events/viewHierarchy/wireframe.tsx
+++ b/static/app/components/events/viewHierarchy/wireframe.tsx
@@ -144,16 +144,16 @@ function Wireframe({hierarchy, selectedNode, onNodeSelect, project}: WireframePr
 
         for (let i = 0; i < hierarchyData.nodes.length; i++) {
           canvas.strokeRect(
-            hierarchyData.nodes[i].rect.x,
-            hierarchyData.nodes[i].rect.y,
-            hierarchyData.nodes[i].rect.width,
-            hierarchyData.nodes[i].rect.height
+            hierarchyData.nodes[i]!.rect.x,
+            hierarchyData.nodes[i]!.rect.y,
+            hierarchyData.nodes[i]!.rect.width,
+            hierarchyData.nodes[i]!.rect.height
           );
           canvas.fillRect(
-            hierarchyData.nodes[i].rect.x,
-            hierarchyData.nodes[i].rect.y,
-            hierarchyData.nodes[i].rect.width,
-            hierarchyData.nodes[i].rect.height
+            hierarchyData.nodes[i]!.rect.x,
+            hierarchyData.nodes[i]!.rect.y,
+            hierarchyData.nodes[i]!.rect.width,
+            hierarchyData.nodes[i]!.rect.height
           );
         }
       }
diff --git a/static/app/components/featureFeedback/feedbackModal.tsx b/static/app/components/featureFeedback/feedbackModal.tsx
index 6e42a489b38c03..79767ae2bb9cd7 100644
--- a/static/app/components/featureFeedback/feedbackModal.tsx
+++ b/static/app/components/featureFeedback/feedbackModal.tsx
@@ -1,6 +1,7 @@
 import {Fragment, useCallback, useMemo, useState} from 'react';
 import {css, useTheme} from '@emotion/react';
 import styled from '@emotion/styled';
+import type {Event} from '@sentry/core';
 import {
   BrowserClient,
   captureFeedback,
@@ -8,7 +9,6 @@ import {
   getDefaultIntegrations,
   makeFetchTransport,
 } from '@sentry/react';
-import type {Event} from '@sentry/types';
 import cloneDeep from 'lodash/cloneDeep';
 
 import {addSuccessMessage} from 'sentry/actionCreators/indicator';
diff --git a/static/app/components/feedback/feedbackItem/feedbackActions.tsx b/static/app/components/feedback/feedbackItem/feedbackActions.tsx
index ccd15fddf45972..e3dae0e97fbc6f 100644
--- a/static/app/components/feedback/feedbackItem/feedbackActions.tsx
+++ b/static/app/components/feedback/feedbackItem/feedbackActions.tsx
@@ -30,13 +30,16 @@ export default function FeedbackActions({
   size,
   style,
 }: Props) {
+  if (!eventData) {
+    return null;
+  }
+
   return (
-    <Flex gap={space(1)} align="center" className={className} style={style}>
+    <Flex gap={space(1)} align="flex-end" className={className} style={style}>
       <ErrorBoundary mini>
         <FeedbackAssignedTo
           feedbackIssue={feedbackItem as any as Group}
           feedbackEvent={eventData}
-          showActorName={['medium', 'large'].includes(size)}
         />
       </ErrorBoundary>
 
diff --git a/static/app/components/feedback/feedbackItem/feedbackAssignedTo.tsx b/static/app/components/feedback/feedbackItem/feedbackAssignedTo.tsx
index d896c90b390333..e9b6c7f546557f 100644
--- a/static/app/components/feedback/feedbackItem/feedbackAssignedTo.tsx
+++ b/static/app/components/feedback/feedbackItem/feedbackAssignedTo.tsx
@@ -1,16 +1,14 @@
 import {useEffect} from 'react';
-import styled from '@emotion/styled';
 
 import {fetchOrgMembers} from 'sentry/actionCreators/members';
-import ActorAvatar from 'sentry/components/avatar/actorAvatar';
-import {Button} from 'sentry/components/button';
-import {DeprecatedAssigneeSelectorDropdown} from 'sentry/components/deprecatedAssigneeSelectorDropdown';
 import useMutateFeedback from 'sentry/components/feedback/useMutateFeedback';
 import type {EventOwners} from 'sentry/components/group/assignedTo';
-import {getAssignedToDisplayName, getOwnerList} from 'sentry/components/group/assignedTo';
-import {IconChevron, IconUser} from 'sentry/icons';
-import {t} from 'sentry/locale';
-import {space} from 'sentry/styles/space';
+import {getOwnerList} from 'sentry/components/group/assignedTo';
+import {
+  AssigneeSelector,
+  useHandleAssigneeChange,
+} from 'sentry/components/group/assigneeSelector';
+import type {Actor} from 'sentry/types/core';
 import type {Group} from 'sentry/types/group';
 import type {FeedbackEvent} from 'sentry/utils/feedback/types';
 import {useApiQuery} from 'sentry/utils/queryClient';
@@ -18,16 +16,11 @@ import useApi from 'sentry/utils/useApi';
 import useOrganization from 'sentry/utils/useOrganization';
 
 interface Props {
-  feedbackEvent: FeedbackEvent | undefined;
+  feedbackEvent: FeedbackEvent;
   feedbackIssue: Group;
-  showActorName: boolean;
 }
 
-export default function FeedbackAssignedTo({
-  feedbackIssue,
-  feedbackEvent,
-  showActorName,
-}: Props) {
+export default function FeedbackAssignedTo({feedbackIssue, feedbackEvent}: Props) {
   const organization = useOrganization();
   const api = useApi();
   const project = feedbackIssue.project;
@@ -45,6 +38,10 @@ export default function FeedbackAssignedTo({
       enabled: Boolean(feedbackEvent),
     }
   );
+  const {handleAssigneeChange, assigneeLoading} = useHandleAssigneeChange({
+    organization,
+    group: feedbackIssue,
+  });
 
   const {assign} = useMutateFeedback({
     feedbackIds: [feedbackIssue.id],
@@ -54,61 +51,15 @@ export default function FeedbackAssignedTo({
 
   const owners = getOwnerList([], eventOwners, feedbackIssue.assignedTo);
 
-  // A new `key` will make the component re-render when showActorName changes
-  const key = showActorName ? 'showActor' : 'hideActor';
-
   return (
-    <DeprecatedAssigneeSelectorDropdown
-      key={key}
-      organization={organization}
-      disabled={false}
-      id={feedbackIssue.id}
-      assignedTo={feedbackIssue.assignedTo}
-      onAssign={() => {
-        assign(feedbackIssue.assignedTo);
-      }}
-      onClear={() => {
-        assign(null);
-      }}
-      owners={owners}
+    <AssigneeSelector
       group={feedbackIssue}
-      alignMenu="right"
-    >
-      {({isOpen, getActorProps}) => (
-        <Button size="xs" aria-label={t('Assigned dropdown')} {...getActorProps({})}>
-          <ActorWrapper>
-            {!feedbackIssue.assignedTo ? (
-              <IconUser size="sm" />
-            ) : (
-              <ActorAvatar
-                actor={feedbackIssue.assignedTo}
-                hasTooltip={false}
-                size={16}
-              />
-            )}
-            {showActorName ? (
-              <ActorName>
-                {getAssignedToDisplayName(feedbackIssue) ?? t('Unassigned')}
-              </ActorName>
-            ) : null}
-            <IconChevron direction={isOpen ? 'up' : 'down'} size="sm" />
-          </ActorWrapper>
-        </Button>
-      )}
-    </DeprecatedAssigneeSelectorDropdown>
+      owners={owners}
+      assigneeLoading={assigneeLoading}
+      handleAssigneeChange={e => {
+        assign(e?.assignee as Actor);
+        handleAssigneeChange(e);
+      }}
+    />
   );
 }
-
-const ActorWrapper = styled('div')`
-  display: flex;
-  align-items: center;
-  gap: ${space(0.5)};
-  max-width: 150px;
-  line-height: 1;
-`;
-
-const ActorName = styled('div')`
-  line-height: 1.2;
-  ${p => p.theme.overflowEllipsis}
-  font-size: ${p => p.theme.fontSizeSmall};
-`;
diff --git a/static/app/components/feedback/feedbackItem/feedbackItemHeader.tsx b/static/app/components/feedback/feedbackItem/feedbackItemHeader.tsx
index 179418b9707e88..10a60cfbc44aa2 100644
--- a/static/app/components/feedback/feedbackItem/feedbackItemHeader.tsx
+++ b/static/app/components/feedback/feedbackItem/feedbackItemHeader.tsx
@@ -49,6 +49,7 @@ export default function FeedbackItemHeader({eventData, feedbackItem}: Props) {
           eventData={eventData}
           feedbackItem={feedbackItem}
           size={dimensionsToSize(dimensions)}
+          style={{lineHeight: 1}}
         />
       </Flex>
 
diff --git a/static/app/components/feedback/feedbackItem/feedbackItemUsername.spec.tsx b/static/app/components/feedback/feedbackItem/feedbackItemUsername.spec.tsx
index 48bd65fecddca3..4fa250b847f717 100644
--- a/static/app/components/feedback/feedbackItem/feedbackItemUsername.spec.tsx
+++ b/static/app/components/feedback/feedbackItem/feedbackItemUsername.spec.tsx
@@ -1,10 +1,18 @@
 import {FeedbackIssueFixture} from 'sentry-fixture/feedbackIssue';
 
-import {render, screen} from 'sentry-test/reactTestingLibrary';
+import {render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrary';
 
 import FeedbackItemUsername from 'sentry/components/feedback/feedbackItem/feedbackItemUsername';
 
 describe('FeedbackItemUsername', () => {
+  beforeEach(() => {
+    Object.assign(navigator, {
+      clipboard: {
+        writeText: jest.fn().mockResolvedValue(''),
+      },
+    });
+  });
+
   it('should fallback to "Anonymous User" when no name/contact_email exist', () => {
     const issue = FeedbackIssueFixture({
       metadata: {
@@ -88,4 +96,24 @@ describe('FeedbackItemUsername', () => {
       expect.stringContaining('mailto:foo@bar.com')
     );
   });
+
+  it('should copy text and select it on click', async () => {
+    const issue = FeedbackIssueFixture({
+      metadata: {
+        name: 'Foo Bar',
+        contact_email: 'foo@bar.com',
+      },
+    });
+    render(<FeedbackItemUsername feedbackIssue={issue} />);
+
+    const username = screen.getByText('Foo Bar');
+
+    await userEvent.click(username);
+
+    await waitFor(() => {
+      expect(window.getSelection()?.toString()).toBe('Foo Bar•foo@bar.com');
+    });
+
+    expect(navigator.clipboard.writeText).toHaveBeenCalledWith('Foo Bar <foo@bar.com>');
+  });
 });
diff --git a/static/app/components/feedback/feedbackItem/feedbackItemUsername.tsx b/static/app/components/feedback/feedbackItem/feedbackItemUsername.tsx
index 6f4abca146d595..c65bbf02bcf47c 100644
--- a/static/app/components/feedback/feedbackItem/feedbackItemUsername.tsx
+++ b/static/app/components/feedback/feedbackItem/feedbackItemUsername.tsx
@@ -1,5 +1,4 @@
-import {type CSSProperties, Fragment, useCallback, useRef} from 'react';
-import {findDOMNode} from 'react-dom';
+import {type CSSProperties, Fragment, useCallback, useId} from 'react';
 import styled from '@emotion/styled';
 
 import {LinkButton} from 'sentry/components/button';
@@ -29,22 +28,16 @@ export default function FeedbackItemUsername({className, feedbackIssue, style}:
 
   const user = name && email && !isSameNameAndEmail ? `${name} <${email}>` : nameOrEmail;
 
-  const userNodeRef = useRef<HTMLInputElement>(null);
+  const userNodeId = useId();
 
   const handleSelectText = useCallback(() => {
-    if (!userNodeRef.current) {
-      return;
-    }
-
-    // We use findDOMNode here because `this.userNodeRef` is not a dom node,
-    // it's a ref to AutoSelectText
-    const node = findDOMNode(userNodeRef.current); // eslint-disable-line react/no-find-dom-node
-    if (!node || !(node instanceof HTMLElement)) {
+    const node = document.getElementById(userNodeId);
+    if (!node) {
       return;
     }
 
     selectText(node);
-  }, []);
+  }, [userNodeId]);
 
   const {onClick: handleCopyToClipboard} = useCopyToClipboard({
     text: user ?? '',
@@ -65,6 +58,7 @@ export default function FeedbackItemUsername({className, feedbackIssue, style}:
     <Flex align="center" gap={space(1)} className={className} style={style}>
       <Tooltip title={t('Click to copy')} containerDisplayMode="flex">
         <Flex
+          id={userNodeId}
           align="center"
           wrap="wrap"
           gap={space(0.5)}
@@ -72,7 +66,6 @@ export default function FeedbackItemUsername({className, feedbackIssue, style}:
             handleSelectText();
             handleCopyToClipboard();
           }}
-          ref={userNodeRef}
         >
           {isSameNameAndEmail ? (
             <strong>{name ?? email}</strong>
diff --git a/static/app/components/feedback/feedbackItem/replayInlineCTAPanel.tsx b/static/app/components/feedback/feedbackItem/replayInlineCTAPanel.tsx
index 1119bde378f097..02af6109d5efa3 100644
--- a/static/app/components/feedback/feedbackItem/replayInlineCTAPanel.tsx
+++ b/static/app/components/feedback/feedbackItem/replayInlineCTAPanel.tsx
@@ -17,10 +17,11 @@ export default function ReplayInlineCTAPanel() {
       button={
         <ButtonBar gap={1}>
           <Button
+            type="button"
             priority="primary"
             analyticsEventName="Clicked Replay Onboarding CTA Button in User Feedback"
             analyticsEventKey="feedback.replay-onboarding-cta-button-clicked"
-            onClick={activateSidebar}
+            onClick={() => activateSidebar()}
           >
             {t('Set Up Now')}
           </Button>
diff --git a/static/app/components/feedback/feedbackOnboarding/sidebar.tsx b/static/app/components/feedback/feedbackOnboarding/sidebar.tsx
index 921adbf3424630..caf622399b91d3 100644
--- a/static/app/components/feedback/feedbackOnboarding/sidebar.tsx
+++ b/static/app/components/feedback/feedbackOnboarding/sidebar.tsx
@@ -163,7 +163,7 @@ function OnboardingContent({currentProject}: {currentProject: Project}) {
     value: PlatformKey;
     label?: ReactNode;
     textValue?: string;
-  }>(jsFrameworkSelectOptions[0]);
+  }>(jsFrameworkSelectOptions[0]!);
 
   const defaultTab = 'npm';
   const location = useLocation();
@@ -195,7 +195,7 @@ function OnboardingContent({currentProject}: {currentProject: Project}) {
 
   const jsFrameworkPlatform =
     replayJsFrameworkOptions().find(p => p.id === jsFramework.value) ??
-    replayJsFrameworkOptions()[0];
+    replayJsFrameworkOptions()[0]!;
 
   const {
     isLoading,
@@ -261,7 +261,6 @@ function OnboardingContent({currentProject}: {currentProject: Project}) {
           ]}
           value={setupMode()}
           onChange={setSetupMode}
-          disabledChoices={[['jsLoader', t('Coming soon!')]]}
           tooltipPosition={'top-start'}
         />
       ) : (
@@ -333,8 +332,7 @@ function OnboardingContent({currentProject}: {currentProject: Project}) {
     ) {
       return 'feedbackOnboardingNpm';
     }
-    // TODO: update this when we add feedback to the loader
-    return 'replayOnboardingJsLoader';
+    return 'feedbackOnboardingJsLoader';
   }
 
   return (
diff --git a/static/app/components/feedback/feedbackSearch.tsx b/static/app/components/feedback/feedbackSearch.tsx
index 1e1fcc63a95783..5a39973f83e02d 100644
--- a/static/app/components/feedback/feedbackSearch.tsx
+++ b/static/app/components/feedback/feedbackSearch.tsx
@@ -66,7 +66,7 @@ function getFeedbackFilterKeys(supportedTags: TagCollection) {
         .map(key => [
           key,
           {
-            ...supportedTags[key],
+            ...supportedTags[key]!,
             kind: getFeedbackFieldDefinition(key)?.kind ?? FieldKind.TAG,
           },
         ])
@@ -79,7 +79,7 @@ function getFeedbackFilterKeys(supportedTags: TagCollection) {
   // To guarantee ordering, we need to implement filterKeySections.
   const keys = Object.keys(allTags);
   keys.sort();
-  return Object.fromEntries(keys.map(key => [key, allTags[key]]));
+  return Object.fromEntries(keys.map(key => [key, allTags[key]!]));
 }
 
 const getFilterKeySections = (tags: TagCollection): FilterKeySection[] => {
@@ -132,9 +132,9 @@ export default function FeedbackSearch() {
       useCache: true,
       enabled: true,
       keepPreviousData: false,
-      start: start,
-      end: end,
-      statsPeriod: statsPeriod,
+      start,
+      end,
+      statsPeriod,
     },
     {}
   );
@@ -164,9 +164,9 @@ export default function FeedbackSearch() {
       }
 
       const endpointParams = {
-        start: start,
-        end: end,
-        statsPeriod: statsPeriod,
+        start,
+        end,
+        statsPeriod,
       };
 
       return fetchTagValues({
diff --git a/static/app/components/feedback/list/issueTrackingSignals.tsx b/static/app/components/feedback/list/issueTrackingSignals.tsx
index 00ca8a6e8bc7bf..a733eddc484271 100644
--- a/static/app/components/feedback/list/issueTrackingSignals.tsx
+++ b/static/app/components/feedback/list/issueTrackingSignals.tsx
@@ -69,7 +69,7 @@ export default function IssueTrackingSignals({group}: Props) {
     );
   }
 
-  const issue = linkedIssues[0];
+  const issue = linkedIssues[0]!;
   const {name, icon} = {
     'plugin-issue': getPluginNames,
     'plugin-actions': getPluginNames,
diff --git a/static/app/components/feedback/useDeleteFeedback.tsx b/static/app/components/feedback/useDeleteFeedback.tsx
index 585a43809d002c..27ab5aa44b18d3 100644
--- a/static/app/components/feedback/useDeleteFeedback.tsx
+++ b/static/app/components/feedback/useDeleteFeedback.tsx
@@ -26,7 +26,7 @@ export const useDeleteFeedback = (feedbackIds, projectId) => {
           api,
           {
             orgId: organization.slug,
-            projectId: projectId,
+            projectId,
             itemIds: feedbackIds,
           },
           {
diff --git a/static/app/components/feedback/useMutateFeedback.tsx b/static/app/components/feedback/useMutateFeedback.tsx
index bc41d26bd1a44b..bf4821a670b3d7 100644
--- a/static/app/components/feedback/useMutateFeedback.tsx
+++ b/static/app/components/feedback/useMutateFeedback.tsx
@@ -10,7 +10,10 @@ import {fetchMutation, useMutation} from 'sentry/utils/queryClient';
 import useApi from 'sentry/utils/useApi';
 
 type TFeedbackIds = 'all' | string[];
-type TPayload = {hasSeen: boolean} | {status: GroupStatus} | {assignedTo: Actor | null};
+type TPayload =
+  | {hasSeen: boolean}
+  | {status: GroupStatus}
+  | {assignedTo: Actor | undefined};
 type TData = unknown;
 type TError = unknown;
 type TVariables = [TFeedbackIds, TPayload];
@@ -78,7 +81,7 @@ export default function useMutateFeedback({
 
   const assign = useCallback(
     (
-      assignedTo: Actor | null,
+      assignedTo: Actor | undefined,
       options?: MutateOptions<TData, TError, TVariables, TContext>
     ) => {
       mutation.mutate([feedbackIds, {assignedTo}], options);
diff --git a/static/app/components/feedback/widget/types.ts b/static/app/components/feedback/widget/types.ts
index 8c3ef9b01c8292..a53a611c3a877e 100644
--- a/static/app/components/feedback/widget/types.ts
+++ b/static/app/components/feedback/widget/types.ts
@@ -1,4 +1,4 @@
-import type {Event} from '@sentry/types';
+import type {Event} from '@sentry/core';
 
 /**
  * NOTE: These types are still considered Beta and subject to change.
diff --git a/static/app/components/forms/controls/selectControl.tsx b/static/app/components/forms/controls/selectControl.tsx
index b5242fdd6e90e9..081032fa8d9be1 100644
--- a/static/app/components/forms/controls/selectControl.tsx
+++ b/static/app/components/forms/controls/selectControl.tsx
@@ -41,7 +41,7 @@ function isGroupedOptions<OptionType extends OptionTypeBase>(
   if (!maybe || maybe.length === 0) {
     return false;
   }
-  return (maybe as GroupedOptionsType<OptionType>)[0].options !== undefined;
+  return (maybe as GroupedOptionsType<OptionType>)[0]!.options !== undefined;
 }
 
 function ClearIndicator(
diff --git a/static/app/components/forms/fields/choiceMapperField.tsx b/static/app/components/forms/fields/choiceMapperField.tsx
index bc217c728d0753..97af15f23c04c2 100644
--- a/static/app/components/forms/fields/choiceMapperField.tsx
+++ b/static/app/components/forms/fields/choiceMapperField.tsx
@@ -148,7 +148,6 @@ export default class ChoiceMapperField extends Component<ChoiceMapperFieldProps>
     };
 
     const removeRow = (itemKey: string) => {
-      // eslint-disable-next-line no-unused-vars
       saveChanges(
         Object.fromEntries(Object.entries(value).filter(([key, _]) => key !== itemKey))
       );
@@ -220,7 +219,7 @@ export default class ChoiceMapperField extends Component<ChoiceMapperFieldProps>
                 <Control>
                   <SelectControl
                     {...(perItemMapping
-                      ? mappedSelectors[itemKey][fieldKey]
+                      ? mappedSelectors[itemKey]![fieldKey]
                       : mappedSelectors[fieldKey])}
                     height={30}
                     disabled={disabled}
diff --git a/static/app/components/forms/fields/projectMapperField.spec.tsx b/static/app/components/forms/fields/projectMapperField.spec.tsx
index 8ad7136b8b4857..68c10a179fcd2e 100644
--- a/static/app/components/forms/fields/projectMapperField.spec.tsx
+++ b/static/app/components/forms/fields/projectMapperField.spec.tsx
@@ -73,7 +73,7 @@ describe('ProjectMapperField', () => {
         ]}
       />
     );
-    await userEvent.click(screen.getAllByLabelText('Delete')[0]);
+    await userEvent.click(screen.getAllByLabelText('Delete')[0]!);
 
     expect(defaultProps.onBlur).toHaveBeenCalledWith([[24, 1]], []);
     expect(defaultProps.onChange).toHaveBeenCalledWith([[24, 1]], []);
diff --git a/static/app/components/forms/fields/projectMapperField.tsx b/static/app/components/forms/fields/projectMapperField.tsx
index 92f79bebb25c17..33096362a79ca2 100644
--- a/static/app/components/forms/fields/projectMapperField.tsx
+++ b/static/app/components/forms/fields/projectMapperField.tsx
@@ -67,7 +67,7 @@ export class RenderField extends Component<RenderProps, State> {
 
     if (newProjects.length === 1) {
       this.setState({
-        selectedSentryProjectId: newProjects[0],
+        selectedSentryProjectId: newProjects[0]!,
       });
     }
   }
diff --git a/static/app/components/forms/fields/selectField.tsx b/static/app/components/forms/fields/selectField.tsx
index 23510bfef01414..bf2d1d461659c8 100644
--- a/static/app/components/forms/fields/selectField.tsx
+++ b/static/app/components/forms/fields/selectField.tsx
@@ -120,7 +120,8 @@ export default class SelectField<OptionType extends SelectValue<any>> extends Co
           placeholder,
           ...props
         }) => {
-          const showTempNoneOption = !multiple && !props.value;
+          const showTempNoneOption =
+            !multiple && (props.value === undefined || props.value === null);
 
           return (
             <Tooltip title={disabledReason} disabled={!disabled}>
diff --git a/static/app/components/forms/fields/sentryMemberTeamSelectorField.spec.tsx b/static/app/components/forms/fields/sentryMemberTeamSelectorField.spec.tsx
index 75cd94a07ee326..a68cda0ca8d1c7 100644
--- a/static/app/components/forms/fields/sentryMemberTeamSelectorField.spec.tsx
+++ b/static/app/components/forms/fields/sentryMemberTeamSelectorField.spec.tsx
@@ -50,7 +50,7 @@ describe('SentryMemberTeamSelectorField', () => {
 
     await selectEvent.select(
       screen.getByRole('textbox', {name: 'Select Owner'}),
-      `#${mockTeams[0].slug}`
+      `#${mockTeams[0]!.slug}`
     );
 
     expect(mock).toHaveBeenCalledWith('team:1', expect.anything());
@@ -92,7 +92,7 @@ describe('SentryMemberTeamSelectorField', () => {
 
     await selectEvent.select(
       screen.getByRole('textbox', {name: 'Select Owner'}),
-      mockUsers[0].name
+      mockUsers[0]!.name
     );
 
     expect(mock).toHaveBeenCalledWith('user:1', expect.anything());
@@ -114,11 +114,11 @@ describe('SentryMemberTeamSelectorField', () => {
 
     await selectEvent.select(
       screen.getByRole('textbox', {name: 'Select Owner'}),
-      mockUsers[0].name
+      mockUsers[0]!.name
     );
     await selectEvent.select(
       screen.getByRole('textbox', {name: 'Select Owner'}),
-      `#${mockTeams[0].slug}`
+      `#${mockTeams[0]!.slug}`
     );
 
     expect(mock).toHaveBeenCalledWith(['user:1', 'team:1'], expect.anything());
diff --git a/static/app/components/forms/formField/index.spec.tsx b/static/app/components/forms/formField/index.spec.tsx
index 5935a53f1787d5..6c1e75f5e9cf96 100644
--- a/static/app/components/forms/formField/index.spec.tsx
+++ b/static/app/components/forms/formField/index.spec.tsx
@@ -5,7 +5,7 @@ import Form from 'sentry/components/forms/form';
 import FormModel from 'sentry/components/forms/model';
 
 describe('FormField + model', function () {
-  let model;
+  let model!: FormModel;
 
   beforeEach(function () {
     model = new FormModel();
diff --git a/static/app/components/forms/jsonForm.spec.tsx b/static/app/components/forms/jsonForm.spec.tsx
index 65cf14be51582c..7dc25a8d75fd6c 100644
--- a/static/app/components/forms/jsonForm.spec.tsx
+++ b/static/app/components/forms/jsonForm.spec.tsx
@@ -6,7 +6,7 @@ import JsonForm from 'sentry/components/forms/jsonForm';
 import accountDetailsFields from 'sentry/data/forms/accountDetails';
 import {fields} from 'sentry/data/forms/projectGeneralSettings';
 
-import type {JsonFormObject} from './types';
+import type {FieldObject, JsonFormObject} from './types';
 
 const user = UserFixture();
 
@@ -104,7 +104,6 @@ describe('JsonForm', function () {
     });
 
     it('missing additionalFieldProps required in "valid" prop', function () {
-      // eslint-disable-next-line no-console
       jest.spyOn(console, 'error').mockImplementation(jest.fn());
       try {
         render(<JsonForm forms={accountDetailsFields} />);
@@ -168,19 +167,18 @@ describe('JsonForm', function () {
   });
 
   describe('fields prop', function () {
-    const jsonFormFields = [fields.name, fields.platform];
+    const jsonFormFields = [fields.name, fields.platform] as FieldObject[];
 
     it('default', function () {
       render(<JsonForm fields={jsonFormFields} />);
     });
 
     it('missing additionalFieldProps required in "valid" prop', function () {
-      // eslint-disable-next-line no-console
       jest.spyOn(console, 'error').mockImplementation(jest.fn());
       try {
         render(
           <JsonForm
-            fields={[{...jsonFormFields[0], visible: ({test}) => !!test.email}]}
+            fields={[{...jsonFormFields[0]!, visible: ({test}) => !!test.email}]}
           />
         );
       } catch (error) {
@@ -192,7 +190,7 @@ describe('JsonForm', function () {
 
     it('should NOT hide panel, if at least one field has visible set to true - no visible prop', function () {
       // slug and platform have no visible prop, that means they will be always visible
-      render(<JsonForm title={accountDetailsFields[0].title} fields={jsonFormFields} />);
+      render(<JsonForm title={accountDetailsFields[0]!.title} fields={jsonFormFields} />);
 
       expect(screen.getByText('Account Details')).toBeInTheDocument();
       expect(screen.getAllByRole('textbox')).toHaveLength(2);
@@ -202,8 +200,8 @@ describe('JsonForm', function () {
       // slug and platform have no visible prop, that means they will be always visible
       render(
         <JsonForm
-          title={accountDetailsFields[0].title}
-          fields={jsonFormFields.map(field => ({...field, visible: true}))}
+          title={accountDetailsFields[0]!.title}
+          fields={jsonFormFields.map(field => ({...field!, visible: true}))}
         />
       );
 
@@ -215,8 +213,8 @@ describe('JsonForm', function () {
       // slug and platform have no visible prop, that means they will be always visible
       render(
         <JsonForm
-          title={accountDetailsFields[0].title}
-          fields={jsonFormFields.map(field => ({...field, visible: () => true}))}
+          title={accountDetailsFields[0]!.title}
+          fields={jsonFormFields.map(field => ({...field!, visible: () => true}))}
         />
       );
 
@@ -228,8 +226,8 @@ describe('JsonForm', function () {
       // slug and platform have no visible prop, that means they will be always visible
       render(
         <JsonForm
-          title={accountDetailsFields[0].title}
-          fields={jsonFormFields.map(field => ({...field, visible: false}))}
+          title={accountDetailsFields[0]!.title}
+          fields={jsonFormFields.map(field => ({...field!, visible: false}))}
         />
       );
 
@@ -240,8 +238,8 @@ describe('JsonForm', function () {
       // slug and platform have no visible prop, that means they will be always visible
       render(
         <JsonForm
-          title={accountDetailsFields[0].title}
-          fields={jsonFormFields.map(field => ({...field, visible: () => false}))}
+          title={accountDetailsFields[0]!.title}
+          fields={jsonFormFields.map(field => ({...field!, visible: () => false}))}
         />
       );
 
diff --git a/static/app/components/forms/model.tsx b/static/app/components/forms/model.tsx
index 7b4d98a2e54689..bc506b1267e37b 100644
--- a/static/app/components/forms/model.tsx
+++ b/static/app/components/forms/model.tsx
@@ -484,7 +484,7 @@ class FormModel {
     }
 
     this.snapshots.shift();
-    this.fields.replace(this.snapshots[0]);
+    this.fields.replace(this.snapshots[0]!);
 
     return true;
   }
diff --git a/static/app/components/globalDrawer/components.tsx b/static/app/components/globalDrawer/components.tsx
index 97787f8aebfb9d..75068f4501558c 100644
--- a/static/app/components/globalDrawer/components.tsx
+++ b/static/app/components/globalDrawer/components.tsx
@@ -70,7 +70,7 @@ interface DrawerHeaderProps {
   hideCloseButton?: boolean;
 }
 
-export const DrawerHeader = forwardRef(function _DrawerHeader(
+export const DrawerHeader = forwardRef(function DrawerHeaderInner(
   {
     className,
     children = null,
diff --git a/static/app/components/gridEditable/index.tsx b/static/app/components/gridEditable/index.tsx
index e28ef18e1e8f55..66411bdac8168e 100644
--- a/static/app/components/gridEditable/index.tsx
+++ b/static/app/components/gridEditable/index.tsx
@@ -178,7 +178,7 @@ class GridEditable<
 
   clearWindowLifecycleEvents() {
     Object.keys(this.resizeWindowLifecycleEvents).forEach(e => {
-      this.resizeWindowLifecycleEvents[e].forEach(c => window.removeEventListener(e, c));
+      this.resizeWindowLifecycleEvents[e]!.forEach(c => window.removeEventListener(e, c));
       this.resizeWindowLifecycleEvents[e] = [];
     });
   }
@@ -188,7 +188,7 @@ class GridEditable<
 
     const nextColumnOrder = [...this.props.columnOrder];
     nextColumnOrder[i] = {
-      ...nextColumnOrder[i],
+      ...nextColumnOrder[i]!,
       width: COL_WIDTH_UNDEFINED,
     };
     this.setGridTemplateColumns(nextColumnOrder);
@@ -196,7 +196,7 @@ class GridEditable<
     const onResizeColumn = this.props.grid.onResizeColumn;
     if (onResizeColumn) {
       onResizeColumn(i, {
-        ...nextColumnOrder[i],
+        ...nextColumnOrder[i]!,
         width: COL_WIDTH_UNDEFINED,
       });
     }
@@ -224,10 +224,10 @@ class GridEditable<
     };
 
     window.addEventListener('mousemove', this.onResizeMouseMove);
-    this.resizeWindowLifecycleEvents.mousemove.push(this.onResizeMouseMove);
+    this.resizeWindowLifecycleEvents.mousemove!.push(this.onResizeMouseMove);
 
     window.addEventListener('mouseup', this.onResizeMouseUp);
-    this.resizeWindowLifecycleEvents.mouseup.push(this.onResizeMouseUp);
+    this.resizeWindowLifecycleEvents.mouseup!.push(this.onResizeMouseUp);
   };
 
   onResizeMouseUp = (e: MouseEvent) => {
@@ -239,7 +239,7 @@ class GridEditable<
       const widthChange = e.clientX - metadata.cursorX;
 
       onResizeColumn(metadata.columnIndex, {
-        ...columnOrder[metadata.columnIndex],
+        ...columnOrder[metadata.columnIndex]!,
         width: metadata.columnWidth + widthChange,
       });
     }
@@ -267,7 +267,7 @@ class GridEditable<
 
     const nextColumnOrder = [...this.props.columnOrder];
     nextColumnOrder[metadata.columnIndex] = {
-      ...nextColumnOrder[metadata.columnIndex],
+      ...nextColumnOrder[metadata.columnIndex]!,
       width: Math.max(metadata.columnWidth + widthChange, 0),
     };
 
diff --git a/static/app/components/gridEditable/sortLink.tsx b/static/app/components/gridEditable/sortLink.tsx
index 702036cf35511d..ac836929e17732 100644
--- a/static/app/components/gridEditable/sortLink.tsx
+++ b/static/app/components/gridEditable/sortLink.tsx
@@ -3,7 +3,7 @@ import type {LocationDescriptorObject} from 'history';
 
 import Link from 'sentry/components/links/link';
 import {IconArrow} from 'sentry/icons';
-import {browserHistory} from 'sentry/utils/browserHistory';
+import {useNavigate} from 'sentry/utils/useNavigate';
 
 export type Alignments = 'left' | 'right' | undefined;
 export type Directions = 'desc' | 'asc' | undefined;
@@ -28,6 +28,7 @@ function SortLink({
   replace,
 }: Props) {
   const target = generateSortLink();
+  const navigate = useNavigate();
 
   if (!target || !canSort) {
     return <StyledNonLink align={align}>{title}</StyledNonLink>;
@@ -40,7 +41,7 @@ function SortLink({
   const handleOnClick: React.MouseEventHandler<HTMLAnchorElement> = e => {
     if (replace) {
       e.preventDefault();
-      browserHistory.replace(target);
+      navigate(target, {replace: true});
     }
     onClick?.(e);
   };
diff --git a/static/app/components/group/assignedTo.tsx b/static/app/components/group/assignedTo.tsx
index 5bb43bfa54c18f..a7b576a583342c 100644
--- a/static/app/components/group/assignedTo.tsx
+++ b/static/app/components/group/assignedTo.tsx
@@ -92,7 +92,7 @@ function getSuggestedReason(owner: IssueOwner) {
   }
 
   if (owner.rules?.length) {
-    const firstRule = owner.rules[0];
+    const firstRule = owner.rules[0]!;
     return `${toTitleCase(firstRule[0])}:${firstRule[1]}`;
   }
 
diff --git a/static/app/components/group/externalIssueForm.spec.tsx b/static/app/components/group/externalIssueForm.spec.tsx
index 1ac255859ba244..98559091df17c2 100644
--- a/static/app/components/group/externalIssueForm.spec.tsx
+++ b/static/app/components/group/externalIssueForm.spec.tsx
@@ -11,8 +11,8 @@ import ExternalIssueForm from 'sentry/components/group/externalIssueForm';
 jest.mock('lodash/debounce', () => {
   const debounceMap = new Map();
   const mockDebounce =
-    (fn, timeout) =>
-    (...args) => {
+    (fn: (...args: any[]) => void, timeout: number) =>
+    (...args: any[]) => {
       if (debounceMap.has(fn)) {
         clearTimeout(debounceMap.get(fn));
       }
@@ -28,7 +28,9 @@ jest.mock('lodash/debounce', () => {
 });
 
 describe('ExternalIssueForm', () => {
-  let group, integration, formConfig;
+  let group!: ReturnType<typeof GroupFixture>;
+  let integration!: ReturnType<typeof GitHubIntegrationFixture>;
+  let formConfig!: any;
   const onChange = jest.fn();
   beforeEach(() => {
     MockApiClient.clearMockResponses();
@@ -48,7 +50,7 @@ describe('ExternalIssueForm', () => {
       match: [MockApiClient.matchQuery({action: 'create'})],
     });
 
-    const styledWrapper = styled(c => c.children);
+    const styledWrapper = styled<any>((c: {children: React.ReactNode}) => c.children);
     const wrapper = render(
       <ExternalIssueForm
         Body={styledWrapper()}
@@ -100,7 +102,8 @@ describe('ExternalIssueForm', () => {
     });
   });
   describe('link', () => {
-    let externalIssueField, getFormConfigRequest;
+    let externalIssueField!: any;
+    let getFormConfigRequest!: jest.Mock;
     beforeEach(() => {
       externalIssueField = {
         name: 'externalIssue',
diff --git a/static/app/components/group/externalIssueForm.tsx b/static/app/components/group/externalIssueForm.tsx
index df53acb18a931c..44d41805f05e5c 100644
--- a/static/app/components/group/externalIssueForm.tsx
+++ b/static/app/components/group/externalIssueForm.tsx
@@ -1,5 +1,5 @@
+import type {Span} from '@sentry/core';
 import * as Sentry from '@sentry/react';
-import type {Span} from '@sentry/types';
 
 import {addSuccessMessage} from 'sentry/actionCreators/indicator';
 import type DeprecatedAsyncComponent from 'sentry/components/deprecatedAsyncComponent';
diff --git a/static/app/components/group/externalIssuesList/externalIssueActions.tsx b/static/app/components/group/externalIssuesList/externalIssueActions.tsx
index 115a8799da0420..cb4c8182250b34 100644
--- a/static/app/components/group/externalIssuesList/externalIssueActions.tsx
+++ b/static/app/components/group/externalIssuesList/externalIssueActions.tsx
@@ -75,7 +75,7 @@ function ExternalIssueActions({configurations, group, onChange}: Props) {
     const {externalIssues} = integration;
     // Currently we do not support a case where there is multiple external issues.
     // For example, we shouldn't have more than 1 jira ticket created for an issue for each jira configuration.
-    const issue = externalIssues[0];
+    const issue = externalIssues[0]!;
     const {id} = issue;
     const endpoint = `/organizations/${organization.slug}/issues/${group.id}/integrations/${integration.id}/?externalIssue=${id}`;
 
@@ -97,7 +97,7 @@ function ExternalIssueActions({configurations, group, onChange}: Props) {
     <Fragment>
       {linked.map(config => {
         const {provider, externalIssues} = config;
-        const issue = externalIssues[0];
+        const issue = externalIssues[0]!;
         return (
           <IssueSyncListElement
             key={issue.id}
@@ -122,8 +122,8 @@ function ExternalIssueActions({configurations, group, onChange}: Props) {
 
       {unlinked.length > 0 && (
         <IssueSyncListElement
-          integrationType={unlinked[0].provider.key}
-          hoverCardHeader={t('%s Integration', unlinked[0].provider.name)}
+          integrationType={unlinked[0]!.provider.key}
+          hoverCardHeader={t('%s Integration', unlinked[0]!.provider.name)}
           hoverCardBody={
             <Container>
               {unlinked.map(config => (
@@ -148,7 +148,7 @@ function ExternalIssueActions({configurations, group, onChange}: Props) {
               ? () =>
                   doOpenExternalIssueModal({
                     group,
-                    integration: unlinked[0],
+                    integration: unlinked[0]!,
                     onChange,
                     organization,
                   })
diff --git a/static/app/components/group/externalIssuesList/hooks/useIntegrationExternalIssues.tsx b/static/app/components/group/externalIssuesList/hooks/useIntegrationExternalIssues.tsx
index aa10ecaec532a7..74b860ed629809 100644
--- a/static/app/components/group/externalIssuesList/hooks/useIntegrationExternalIssues.tsx
+++ b/static/app/components/group/externalIssuesList/hooks/useIntegrationExternalIssues.tsx
@@ -84,11 +84,11 @@ export function useIntegrationExternalIssues({
       ...configurations
         .filter(config => config.externalIssues.length > 0)
         .map<GroupIntegrationIssueResult['linkedIssues'][number]>(config => ({
-          key: config.externalIssues[0].id,
-          displayName: config.externalIssues[0].key,
+          key: config.externalIssues[0]!.id,
+          displayName: config.externalIssues[0]!.key,
           displayIcon,
-          url: config.externalIssues[0].url,
-          title: config.externalIssues[0].title,
+          url: config.externalIssues[0]!.url,
+          title: config.externalIssues[0]!.title,
           onUnlink: () => {
             // Currently we do not support a case where there is multiple external issues.
             // For example, we shouldn't have more than 1 jira ticket created for an issue for each jira configuration.
@@ -98,7 +98,7 @@ export function useIntegrationExternalIssues({
               `/organizations/${organization.slug}/issues/${group.id}/integrations/${config.id}/`,
               {
                 method: 'DELETE',
-                query: {externalIssue: issue.id},
+                query: {externalIssue: issue!.id},
                 success: () => {
                   addSuccessMessage(t('Successfully unlinked issue.'));
                   refetchIntegrations();
diff --git a/static/app/components/group/groupSummary.spec.tsx b/static/app/components/group/groupSummary.spec.tsx
index cfb553be95b652..ce57ddae2bd181 100644
--- a/static/app/components/group/groupSummary.spec.tsx
+++ b/static/app/components/group/groupSummary.spec.tsx
@@ -54,12 +54,12 @@ describe('GroupSummary', function () {
 
     await waitFor(() => {
       expect(screen.getByText("What's wrong")).toBeInTheDocument();
-      expect(screen.getByText('Test whats wrong')).toBeInTheDocument();
-      expect(screen.getByText('In the trace')).toBeInTheDocument();
-      expect(screen.getByText('Test trace')).toBeInTheDocument();
-      expect(screen.getByText('Possible cause')).toBeInTheDocument();
-      expect(screen.getByText('Test possible cause')).toBeInTheDocument();
     });
+    expect(screen.getByText('Test whats wrong')).toBeInTheDocument();
+    expect(screen.getByText('In the trace')).toBeInTheDocument();
+    expect(screen.getByText('Test trace')).toBeInTheDocument();
+    expect(screen.getByText('Possible cause')).toBeInTheDocument();
+    expect(screen.getByText('Test possible cause')).toBeInTheDocument();
   });
 
   it('shows loading state', function () {
@@ -110,11 +110,11 @@ describe('GroupSummary', function () {
 
     await waitFor(() => {
       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();
     });
+    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();
   });
 
   it('renders in preview mode', async function () {
@@ -131,7 +131,7 @@ describe('GroupSummary', function () {
 
     await waitFor(() => {
       expect(screen.getByText("What's wrong")).toBeInTheDocument();
-      expect(screen.getByText('Test whats 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 67b204f318e1f1..195123825f03a3 100644
--- a/static/app/components/group/groupSummary.tsx
+++ b/static/app/components/group/groupSummary.tsx
@@ -1,10 +1,9 @@
-import {useEffect, useRef, useState} from 'react';
+import {useEffect, useState} from 'react';
 import styled from '@emotion/styled';
 
-import {Button} from 'sentry/components/button';
-import Link from 'sentry/components/links/link';
+import {DropdownMenu} from 'sentry/components/dropdownMenu';
 import Placeholder from 'sentry/components/placeholder';
-import {IconEllipsis, IconFatal, IconFocus, IconRefresh, IconSpan} from 'sentry/icons';
+import {IconEllipsis, IconFatal, IconFocus, IconSpan} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {Event} from 'sentry/types/event';
@@ -13,6 +12,7 @@ import type {Project} from 'sentry/types/project';
 import marked from 'sentry/utils/marked';
 import {type ApiQueryKey, useApiQuery, useQueryClient} from 'sentry/utils/queryClient';
 import normalizeUrl from 'sentry/utils/url/normalizeUrl';
+import {useFeedbackForm} from 'sentry/utils/useFeedbackForm';
 import useOrganization from 'sentry/utils/useOrganization';
 import {useAiConfig} from 'sentry/views/issueDetails/streamline/hooks/useAiConfig';
 
@@ -90,7 +90,7 @@ export function GroupSummary({
 }) {
   const organization = useOrganization();
   const [forceEvent, setForceEvent] = useState(false);
-  const [showEventDetails, setShowEventDetails] = useState(false);
+  const openFeedbackForm = useFeedbackForm();
   const {data, isPending, isError, refresh} = useGroupSummary(
     group,
     event,
@@ -98,9 +98,6 @@ export function GroupSummary({
     forceEvent
   );
 
-  const popupRef = useRef<HTMLDivElement>(null);
-  const buttonRef = useRef<HTMLButtonElement>(null);
-
   useEffect(() => {
     if (forceEvent && !isPending) {
       refresh();
@@ -108,58 +105,51 @@ export function GroupSummary({
     }
   }, [forceEvent, isPending, refresh]);
 
-  useEffect(() => {
-    function handleClickOutside(e: MouseEvent) {
-      if (
-        showEventDetails &&
-        popupRef.current &&
-        buttonRef.current &&
-        !popupRef.current.contains(e.target as Node) &&
-        !buttonRef.current.contains(e.target as Node)
-      ) {
-        setShowEventDetails(false);
-      }
-    }
-
-    document.addEventListener('click', handleClickOutside);
-    return () => {
-      document.removeEventListener('click', handleClickOutside);
-    };
-  }, [showEventDetails]);
-
-  const tooltipContent = data?.eventId ? (
-    event?.id === data.eventId ? (
-      t('Based on this event')
-    ) : (
-      <TooltipContentWrapper>
-        <span>
-          {t('Based on event ')}
-          <EventLink
-            to={
-              window.location.origin +
-              normalizeUrl(
-                `/organizations/${organization.slug}/issues/${data.groupId}/events/${data.eventId}/`
-              )
-            }
-          >
-            {data.eventId.substring(0, 8)}
-          </EventLink>
-        </span>
-        <Button
-          size="xs"
-          icon={<IconRefresh size="xs" />}
-          busy={isPending}
-          aria-label={t('Summarize this event instead')}
-          title={t('Summarize this event instead')}
-          onClick={() => {
-            setForceEvent(true);
-          }}
-        />
-      </TooltipContentWrapper>
-    )
-  ) : (
-    ''
-  );
+  const eventDetailsItems = [
+    {
+      key: 'event-info',
+      label:
+        event?.id === data?.eventId ? (
+          t('Based on this event')
+        ) : (
+          <span>{t('See original event (%s)', data?.eventId?.substring(0, 8))}</span>
+        ),
+      to:
+        event?.id === data?.eventId
+          ? undefined
+          : window.location.origin +
+            normalizeUrl(
+              `/organizations/${organization.slug}/issues/${data?.groupId}/events/${data?.eventId}/`
+            ),
+    },
+    ...(event?.id !== data?.eventId
+      ? [
+          {
+            key: 'refresh',
+            label: t('Summarize this event instead'),
+            onAction: () => setForceEvent(true),
+            disabled: isPending,
+          },
+        ]
+      : []),
+    ...(openFeedbackForm
+      ? [
+          {
+            key: 'feedback',
+            label: t('Give feedback'),
+            onAction: () => {
+              openFeedbackForm({
+                messagePlaceholder: t('How can we make Issue Summary better for you?'),
+                tags: {
+                  ['feedback.source']: 'issue_details_ai_autofix',
+                  ['feedback.owner']: 'ml-ai',
+                },
+              });
+            },
+          },
+        ]
+      : []),
+  ];
 
   const insightCards = [
     {
@@ -190,18 +180,20 @@ export function GroupSummary({
       {isError ? <div>{t('Error loading summary')}</div> : null}
       <Content>
         {data?.eventId && !isPending && (
-          <TooltipWrapper id="group-summary-tooltip-wrapper">
-            <Button
-              ref={buttonRef}
-              size="xs"
-              icon={<StyledIconEllipsis size="xs" />}
-              aria-label={t('Event details')}
-              borderless
-              onClick={() => setShowEventDetails(!showEventDetails)}
+          <TooltipWrapper id="group-summary-tooltip-wrapper" preview={preview}>
+            <DropdownMenu
+              items={eventDetailsItems}
+              triggerProps={{
+                icon: <StyledIconEllipsis size="xs" />,
+                'aria-label': t('Event details'),
+                size: 'xs',
+                borderless: true,
+                showChevron: false,
+              }}
+              isDisabled={isPending}
+              position="bottom-end"
+              offset={4}
             />
-            {showEventDetails && (
-              <EventDetailsPopup ref={popupRef}>{tooltipContent}</EventDetailsPopup>
-            )}
           </TooltipWrapper>
         )}
         <InsightGrid>
@@ -264,7 +256,6 @@ const InsightCard = styled('div')`
   display: flex;
   flex-direction: column;
   border-radius: ${p => p.theme.borderRadius};
-  background: ${p => p.theme.background};
   width: 100%;
   min-height: 0;
 `;
@@ -323,40 +314,12 @@ const CardContent = styled('div')`
   flex: 1;
 `;
 
-const TooltipWrapper = styled('div')`
+const TooltipWrapper = styled('div')<{preview?: boolean}>`
   position: absolute;
-  top: 0;
+  top: ${p => (p.preview ? `-32px` : `-${space(0.5)}`)};
   right: 0;
 `;
 
-const EventLink = styled(Link)`
-  color: ${p => p.theme.linkColor};
-  :hover {
-    color: ${p => p.theme.linkHoverColor};
-  }
-`;
-
-const TooltipContentWrapper = styled('div')`
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  gap: ${space(1)};
-`;
-
-const EventDetailsPopup = styled('div')`
-  position: absolute;
-  right: calc(100% + ${space(0.5)});
-  top: 50%;
-  transform: translateY(-50%);
-  padding: ${space(1.5)};
-  background: ${p => p.theme.background};
-  border: 1px solid ${p => p.theme.border};
-  border-radius: ${p => p.theme.borderRadius};
-  box-shadow: ${p => p.theme.dropShadowHeavy};
-  z-index: 0;
-  white-space: nowrap;
-`;
-
 const StyledIconEllipsis = styled(IconEllipsis)`
   color: ${p => p.theme.subText};
 `;
diff --git a/static/app/components/group/releaseChart.spec.tsx b/static/app/components/group/releaseChart.spec.tsx
index 2b07253fe25551..4dd8ae1d4d1ad3 100644
--- a/static/app/components/group/releaseChart.spec.tsx
+++ b/static/app/components/group/releaseChart.spec.tsx
@@ -20,6 +20,6 @@ it('should set marker before first bucket', () => {
   const markers = getGroupReleaseChartMarkers(theme as any, data, firstSeen, lastSeen)!.data!;
 
   expect((markers[0] as any).displayValue).toBe(new Date(firstSeen).getTime());
-  expect(markers[0].coord![0]).toBe(1659533400000);
-  expect(markers[1].coord![0]).toBe(new Date(lastSeen).getTime());
+  expect(markers[0]!.coord![0]).toBe(1659533400000);
+  expect(markers[1]!.coord![0]).toBe(new Date(lastSeen).getTime());
 });
diff --git a/static/app/components/group/releaseChart.tsx b/static/app/components/group/releaseChart.tsx
index aefd6becd43798..38d08d207e29e0 100644
--- a/static/app/components/group/releaseChart.tsx
+++ b/static/app/components/group/releaseChart.tsx
@@ -47,7 +47,7 @@ export function getGroupReleaseChartMarkers(
 ): BarChartSeries['markPoint'] {
   const markers: Marker[] = [];
   // Get the timestamp of the first point.
-  const firstGraphTime = stats[0][0] * 1000;
+  const firstGraphTime = stats[0]![0] * 1000;
 
   const firstSeenX = new Date(firstSeen ?? 0).getTime();
   const lastSeenX = new Date(lastSeen ?? 0).getTime();
@@ -67,9 +67,9 @@ export function getGroupReleaseChartMarkers(
     let bucketStart: number | undefined;
     if (firstBucket > 0) {
       // The size of the data interval in ms
-      const halfBucketSize = ((stats[1][0] - stats[0][0]) * 1000) / 2;
+      const halfBucketSize = ((stats[1]![0] - stats[0]![0]) * 1000) / 2;
       // Display the marker in front of the first bucket
-      bucketStart = stats[firstBucket - 1][0] * 1000 - halfBucketSize;
+      bucketStart = stats[firstBucket - 1]![0] * 1000 - halfBucketSize;
     }
 
     markers.push({
@@ -156,26 +156,26 @@ function GroupReleaseChart(props: Props) {
 
   series.push({
     seriesName: t('Events in %s', environmentLabel),
-    data: environmentStats[statsPeriod].map(point => ({
-      name: point[0] * 1000,
-      value: point[1],
+    data: environmentStats[statsPeriod]!.map(point => ({
+      name: point![0] * 1000,
+      value: point![1],
     })),
   });
 
   if (release && releaseStats) {
     series.push({
       seriesName: t('Events in release %s', formatVersion(release.version)),
-      data: releaseStats[statsPeriod].map(point => ({
-        name: point[0] * 1000,
-        value: point[1],
+      data: releaseStats[statsPeriod]!.map(point => ({
+        name: point![0] * 1000,
+        value: point![1],
       })),
     });
   }
 
   const totalSeries =
     environment && environmentStats ? environmentStats[statsPeriod] : stats;
-  const totalEvents = totalSeries.reduce((acc, current) => acc + current[1], 0);
-  series[0].markPoint = getGroupReleaseChartMarkers(theme, stats, firstSeen, lastSeen);
+  const totalEvents = totalSeries!.reduce((acc, current) => acc + current[1], 0);
+  series[0]!.markPoint = getGroupReleaseChartMarkers(theme, stats, firstSeen, lastSeen);
 
   return (
     <SidebarSection.Wrap>
diff --git a/static/app/components/group/sentryAppExternalIssueModal.tsx b/static/app/components/group/sentryAppExternalIssueModal.tsx
index d0bdf650b5458d..c0d273a808cbef 100644
--- a/static/app/components/group/sentryAppExternalIssueModal.tsx
+++ b/static/app/components/group/sentryAppExternalIssueModal.tsx
@@ -1,4 +1,4 @@
-import {Component, Fragment} from 'react';
+import {Fragment, useState} from 'react';
 
 import type {ModalRenderProps} from 'sentry/actionCreators/modal';
 import SentryAppExternalIssueForm from 'sentry/components/group/sentryAppExternalIssueForm';
@@ -15,58 +15,57 @@ type Props = ModalRenderProps & {
   sentryAppInstallation: SentryAppInstallation;
 };
 
-type State = {
-  action: 'create' | 'link';
-};
-
-class SentryAppExternalIssueModal extends Component<Props, State> {
-  state: State = {
-    action: 'create',
-  };
+function SentryAppExternalIssueModal(props: Props) {
+  const [action, setAction] = useState<'create' | 'link'>('create');
+  const {
+    Header,
+    Body,
+    sentryAppComponent,
+    sentryAppInstallation,
+    group,
+    closeModal,
+    event,
+  } = props;
 
-  showLink = () => {
-    this.setState({action: 'link'});
+  const showLink = () => {
+    setAction('link');
   };
 
-  showCreate = () => {
-    this.setState({action: 'create'});
+  const showCreate = () => {
+    setAction('create');
   };
 
-  onSubmitSuccess = () => {
-    this.props.closeModal();
+  const onSubmitSuccess = () => {
+    closeModal();
   };
 
-  render() {
-    const {Header, Body, sentryAppComponent, sentryAppInstallation, group} = this.props;
-    const {action} = this.state;
-    const name = sentryAppComponent.sentryApp.name;
-    const config = sentryAppComponent.schema[action];
+  const name = sentryAppComponent.sentryApp.name;
+  const config = sentryAppComponent.schema[action];
 
-    return (
-      <Fragment>
-        <Header closeButton>{tct('[name] Issue', {name})}</Header>
-        <NavTabs underlined>
-          <li className={action === 'create' ? 'active create' : 'create'}>
-            <a onClick={this.showCreate}>{t('Create')}</a>
-          </li>
-          <li className={action === 'link' ? 'active link' : 'link'}>
-            <a onClick={this.showLink}>{t('Link')}</a>
-          </li>
-        </NavTabs>
-        <Body>
-          <SentryAppExternalIssueForm
-            group={group}
-            sentryAppInstallation={sentryAppInstallation}
-            appName={name}
-            config={config}
-            action={action}
-            onSubmitSuccess={this.onSubmitSuccess}
-            event={this.props.event}
-          />
-        </Body>
-      </Fragment>
-    );
-  }
+  return (
+    <Fragment>
+      <Header closeButton>{tct('[name] Issue', {name})}</Header>
+      <NavTabs underlined>
+        <li className={action === 'create' ? 'active create' : 'create'}>
+          <a onClick={showCreate}>{t('Create')}</a>
+        </li>
+        <li className={action === 'link' ? 'active link' : 'link'}>
+          <a onClick={showLink}>{t('Link')}</a>
+        </li>
+      </NavTabs>
+      <Body>
+        <SentryAppExternalIssueForm
+          group={group}
+          sentryAppInstallation={sentryAppInstallation}
+          appName={name}
+          config={config}
+          action={action}
+          onSubmitSuccess={onSubmitSuccess}
+          event={event}
+        />
+      </Body>
+    </Fragment>
+  );
 }
 
 export default SentryAppExternalIssueModal;
diff --git a/static/app/components/group/suggestedOwnerHovercard.tsx b/static/app/components/group/suggestedOwnerHovercard.tsx
index 1bb0108c0684c8..040ccd18990772 100644
--- a/static/app/components/group/suggestedOwnerHovercard.tsx
+++ b/static/app/components/group/suggestedOwnerHovercard.tsx
@@ -1,4 +1,4 @@
-import {Component, Fragment} from 'react';
+import {Fragment, useState} from 'react';
 import styled from '@emotion/styled';
 import moment from 'moment-timezone';
 
@@ -48,160 +48,144 @@ type Props = {
   rules?: any[] | null;
 };
 
-type State = {
-  commitsExpanded: boolean;
-  rulesExpanded: boolean;
-};
+function SuggestedOwnerHovercard(props: Props) {
+  const [commitsExpanded, setCommitsExpanded] = useState<boolean>(false);
+  const [rulesExpanded, setRulesExpanded] = useState<boolean>(false);
 
-class SuggestedOwnerHovercard extends Component<Props, State> {
-  state: State = {
-    commitsExpanded: false,
-    rulesExpanded: false,
+  const {organization, actor, commits, rules, release, projectId} = props;
+  const modalData = {
+    initialData: [
+      {
+        emails: actor.email ? new Set([actor.email]) : new Set([]),
+      },
+    ],
+    source: 'suggested_assignees',
   };
 
-  render() {
-    const {organization, actor, commits, rules, release, projectId, ...props} =
-      this.props;
-    const {commitsExpanded, rulesExpanded} = this.state;
-    const modalData = {
-      initialData: [
-        {
-          emails: actor.email ? new Set([actor.email]) : new Set([]),
-        },
-      ],
-      source: 'suggested_assignees',
-    };
-
-    return (
-      <StyledHovercard
-        skipWrapper
-        header={
-          <Fragment>
-            <HovercardHeader>
-              <ActorAvatar size={20} hasTooltip={false} actor={actor} />
-              {actor.name || actor.email}
-            </HovercardHeader>
-            {actor.id === undefined && (
-              <EmailAlert type="warning" showIcon>
-                {tct(
-                  'The email [actorEmail] is not a member of your organization. [inviteUser:Invite] them or link additional emails in [accountSettings:account settings].',
-                  {
-                    actorEmail: <strong>{actor.email}</strong>,
-                    accountSettings: <Link to="/settings/account/emails/" />,
-                    inviteUser: <a onClick={() => openInviteMembersModal(modalData)} />,
-                  }
-                )}
-              </EmailAlert>
-            )}
-          </Fragment>
-        }
-        body={
-          <HovercardBody>
-            {commits !== undefined && !release && (
-              <Fragment>
-                <Divider>
-                  <h6>{t('Commits')}</h6>
-                </Divider>
-                <div>
-                  {commits
-                    .slice(0, commitsExpanded ? commits.length : 3)
-                    .map(({message, dateCreated}, i) => (
-                      <CommitReasonItem key={i}>
-                        <CommitIcon />
-                        <CommitMessage
-                          message={message ?? undefined}
-                          date={dateCreated}
-                        />
-                      </CommitReasonItem>
-                    ))}
-                </div>
-                {commits.length > 3 && !commitsExpanded ? (
-                  <ViewMoreButton
-                    priority="link"
-                    size="zero"
-                    onClick={() => this.setState({commitsExpanded: true})}
-                  >
-                    {t('View more')}
-                  </ViewMoreButton>
-                ) : null}
-              </Fragment>
-            )}
-            {commits !== undefined && release && (
-              <Fragment>
-                <Divider>
-                  <h6>{t('Suspect Release')}</h6>
-                </Divider>
-                <div>
-                  <CommitReasonItem>
-                    <OwnershipTag tagType="release" />
-                    <ReleaseValue>
-                      {tct('[actor] [verb] [commits] in [release]', {
-                        actor: actor.name,
-                        verb: commits.length > 1 ? t('made') : t('last committed'),
-                        commits:
-                          commits.length > 1 ? (
-                            // Link to release commits
-                            <Link
-                              to={{
-                                pathname: `/organizations/${
-                                  organization?.slug
-                                }/releases/${encodeURIComponent(
-                                  release.version
-                                )}/commits/`,
-                                query: {project: projectId},
-                              }}
-                            >
-                              {t('%s commits', commits.length)}
-                            </Link>
-                          ) : (
-                            <CommitLink
-                              inline
-                              showIcon={false}
-                              commitId={commits[0].id}
-                              repository={commits[0].repository}
-                            />
-                          ),
-                        release: (
-                          <Version version={release.version} projectId={projectId} />
+  return (
+    <StyledHovercard
+      skipWrapper
+      header={
+        <Fragment>
+          <HovercardHeader>
+            <ActorAvatar size={20} hasTooltip={false} actor={actor} />
+            {actor.name || actor.email}
+          </HovercardHeader>
+          {actor.id === undefined && (
+            <EmailAlert type="warning" showIcon>
+              {tct(
+                'The email [actorEmail] is not a member of your organization. [inviteUser:Invite] them or link additional emails in [accountSettings:account settings].',
+                {
+                  actorEmail: <strong>{actor.email}</strong>,
+                  accountSettings: <Link to="/settings/account/emails/" />,
+                  inviteUser: <a onClick={() => openInviteMembersModal(modalData)} />,
+                }
+              )}
+            </EmailAlert>
+          )}
+        </Fragment>
+      }
+      body={
+        <HovercardBody>
+          {commits !== undefined && !release && (
+            <Fragment>
+              <Divider>
+                <h6>{t('Commits')}</h6>
+              </Divider>
+              <div>
+                {commits
+                  .slice(0, commitsExpanded ? commits.length : 3)
+                  .map(({message, dateCreated}, i) => (
+                    <CommitReasonItem key={i}>
+                      <CommitIcon />
+                      <CommitMessage message={message ?? undefined} date={dateCreated} />
+                    </CommitReasonItem>
+                  ))}
+              </div>
+              {commits.length > 3 && !commitsExpanded ? (
+                <ViewMoreButton
+                  priority="link"
+                  size="zero"
+                  onClick={() => setCommitsExpanded(true)}
+                >
+                  {t('View more')}
+                </ViewMoreButton>
+              ) : null}
+            </Fragment>
+          )}
+          {commits !== undefined && release && (
+            <Fragment>
+              <Divider>
+                <h6>{t('Suspect Release')}</h6>
+              </Divider>
+              <div>
+                <CommitReasonItem>
+                  <OwnershipTag tagType="release" />
+                  <ReleaseValue>
+                    {tct('[actor] [verb] [commits] in [release]', {
+                      actor: actor.name,
+                      verb: commits.length > 1 ? t('made') : t('last committed'),
+                      commits:
+                        commits.length > 1 ? (
+                          // Link to release commits
+                          <Link
+                            to={{
+                              pathname: `/organizations/${
+                                organization?.slug
+                              }/releases/${encodeURIComponent(release.version)}/commits/`,
+                              query: {project: projectId},
+                            }}
+                          >
+                            {t('%s commits', commits.length)}
+                          </Link>
+                        ) : (
+                          <CommitLink
+                            inline
+                            showIcon={false}
+                            commitId={commits[0]!.id}
+                            repository={commits[0]!.repository}
+                          />
                         ),
-                      })}
-                    </ReleaseValue>
-                  </CommitReasonItem>
-                </div>
-              </Fragment>
-            )}
-            {defined(rules) && (
-              <Fragment>
-                <Divider>
-                  <h6>{t('Matching Ownership Rules')}</h6>
-                </Divider>
-                <div>
-                  {rules
-                    .slice(0, rulesExpanded ? rules.length : 3)
-                    .map(([type, matched], i) => (
-                      <RuleReasonItem key={i}>
-                        <OwnershipTag tagType={type} />
-                        <OwnershipValue>{matched}</OwnershipValue>
-                      </RuleReasonItem>
-                    ))}
-                </div>
-                {rules.length > 3 && !rulesExpanded ? (
-                  <ViewMoreButton
-                    priority="link"
-                    size="zero"
-                    onClick={() => this.setState({rulesExpanded: true})}
-                  >
-                    {t('View more')}
-                  </ViewMoreButton>
-                ) : null}
-              </Fragment>
-            )}
-          </HovercardBody>
-        }
-        {...props}
-      />
-    );
-  }
+                      release: (
+                        <Version version={release.version} projectId={projectId} />
+                      ),
+                    })}
+                  </ReleaseValue>
+                </CommitReasonItem>
+              </div>
+            </Fragment>
+          )}
+          {defined(rules) && (
+            <Fragment>
+              <Divider>
+                <h6>{t('Matching Ownership Rules')}</h6>
+              </Divider>
+              <div>
+                {rules
+                  .slice(0, rulesExpanded ? rules.length : 3)
+                  .map(([type, matched], i) => (
+                    <RuleReasonItem key={i}>
+                      <OwnershipTag tagType={type} />
+                      <OwnershipValue>{matched}</OwnershipValue>
+                    </RuleReasonItem>
+                  ))}
+              </div>
+              {rules.length > 3 && !rulesExpanded ? (
+                <ViewMoreButton
+                  priority="link"
+                  size="zero"
+                  onClick={() => setRulesExpanded(true)}
+                >
+                  {t('View more')}
+                </ViewMoreButton>
+              ) : null}
+            </Fragment>
+          )}
+        </HovercardBody>
+      }
+      {...props}
+    />
+  );
 }
 
 const tagColors = {
diff --git a/static/app/components/group/tagDistributionMeter.spec.tsx b/static/app/components/group/tagDistributionMeter.spec.tsx
index 049b55037310d7..62ddf09d5991b3 100644
--- a/static/app/components/group/tagDistributionMeter.spec.tsx
+++ b/static/app/components/group/tagDistributionMeter.spec.tsx
@@ -35,8 +35,8 @@ describe('TagDistributionMeter', function () {
         group={GroupFixture({id: '1337'})}
         organization={organization}
         projectId="456"
-        totalValues={tags[0].totalValues}
-        topValues={tags[0].topValues}
+        totalValues={tags[0]!.totalValues}
+        topValues={tags[0]!.topValues}
       />
     );
     expect(
diff --git a/static/app/components/group/tagFacets/index.spec.tsx b/static/app/components/group/tagFacets/index.spec.tsx
index beb95474fad588..11fb2307431538 100644
--- a/static/app/components/group/tagFacets/index.spec.tsx
+++ b/static/app/components/group/tagFacets/index.spec.tsx
@@ -139,9 +139,9 @@ describe('Tag Facets', function () {
       );
       await waitFor(() => {
         expect(screen.getByRole('listitem', {name: 'os'})).toBeInTheDocument();
-        expect(screen.getByRole('listitem', {name: 'device'})).toBeInTheDocument();
-        expect(screen.getByRole('listitem', {name: 'release'})).toBeInTheDocument();
       });
+      expect(screen.getByRole('listitem', {name: 'device'})).toBeInTheDocument();
+      expect(screen.getByRole('listitem', {name: 'release'})).toBeInTheDocument();
     });
 
     it('expands first tag distribution by default', async function () {
diff --git a/static/app/components/group/tagFacets/index.tsx b/static/app/components/group/tagFacets/index.tsx
index bc00bffee094ab..56549f9545ee86 100644
--- a/static/app/components/group/tagFacets/index.tsx
+++ b/static/app/components/group/tagFacets/index.tsx
@@ -51,8 +51,8 @@ export function TAGS_FORMATTER(tagsData: Record<string, GroupTag>) {
   Object.keys(tagsData).forEach(tagKey => {
     if (tagKey === 'release') {
       transformedTagsData[tagKey] = {
-        ...tagsData[tagKey],
-        topValues: tagsData[tagKey].topValues.map(topValue => {
+        ...tagsData[tagKey]!,
+        topValues: tagsData[tagKey]!.topValues.map(topValue => {
           return {
             ...topValue,
             name: formatVersion(topValue.name),
@@ -61,8 +61,8 @@ export function TAGS_FORMATTER(tagsData: Record<string, GroupTag>) {
       };
     } else if (tagKey === 'device') {
       transformedTagsData[tagKey] = {
-        ...tagsData[tagKey],
-        topValues: tagsData[tagKey].topValues.map(topValue => {
+        ...tagsData[tagKey]!,
+        topValues: tagsData[tagKey]!.topValues.map(topValue => {
           return {
             ...topValue,
             name: topValue.readable ?? topValue.name,
@@ -70,7 +70,7 @@ export function TAGS_FORMATTER(tagsData: Record<string, GroupTag>) {
         }),
       };
     } else {
-      transformedTagsData[tagKey] = tagsData[tagKey];
+      transformedTagsData[tagKey] = tagsData[tagKey]!;
     }
   });
 
diff --git a/static/app/components/group/tagFacets/tagFacetsDistributionMeter.tsx b/static/app/components/group/tagFacets/tagFacetsDistributionMeter.tsx
index 0f4ddddcefd2e2..6e1e79ed39ddfe 100644
--- a/static/app/components/group/tagFacets/tagFacetsDistributionMeter.tsx
+++ b/static/app/components/group/tagFacets/tagFacetsDistributionMeter.tsx
@@ -67,9 +67,9 @@ function TagFacetsDistributionMeter({
         <Tooltip
           skipWrapper
           delay={TOOLTIP_DELAY}
-          title={topSegments[0].name || t('n/a')}
+          title={topSegments[0]!.name || t('n/a')}
         >
-          <TitleDescription>{topSegments[0].name || t('n/a')}</TitleDescription>
+          <TitleDescription>{topSegments[0]!.name || t('n/a')}</TitleDescription>
         </Tooltip>
         <ExpandToggleButton
           borderless
@@ -124,12 +124,12 @@ function TagFacetsDistributionMeter({
               {value.isOther ? (
                 <OtherSegment
                   aria-label={t('Other segment')}
-                  color={colors[colors.length - 1]}
+                  color={colors[colors.length - 1]!}
                 />
               ) : (
                 <Segment
                   aria-label={`${value.value} ${t('segment')}`}
-                  color={colors[index]}
+                  color={colors[index]!}
                   {...segmentProps}
                 >
                   {/* if the first segment is 6% or less, the label won't fit cleanly into the segment, so don't show the label */}
@@ -180,7 +180,7 @@ function TagFacetsDistributionMeter({
                     onMouseLeave={() => setHoveredValue(null)}
                   >
                     <LegendDot
-                      color={colors[segment.isOther ? colors.length - 1 : index]}
+                      color={colors[segment.isOther ? colors.length - 1 : index]!}
                       focus={focus}
                     />
                     <Tooltip skipWrapper delay={TOOLTIP_DELAY} title={segment.name}>
diff --git a/static/app/components/group/tagFacets/tagFacetsTypes.tsx b/static/app/components/group/tagFacets/tagFacetsTypes.tsx
deleted file mode 100644
index 467e59da472042..00000000000000
--- a/static/app/components/group/tagFacets/tagFacetsTypes.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import type {ReactNode} from 'react';
-
-import type {Event} from 'sentry/types/event';
-import type {TagWithTopValues} from 'sentry/types/group';
-import type {Environment, Project} from 'sentry/types/project';
-
-export type TagFacetsProps = {
-  environments: Environment[];
-  groupId: string;
-  project: Project;
-  tagKeys: string[];
-  event?: Event;
-  tagFormatter?: (
-    tagsData: Record<string, TagWithTopValues>
-  ) => Record<string, TagWithTopValues>;
-  title?: ReactNode;
-};
diff --git a/static/app/components/guidedSteps/guidedSteps.tsx b/static/app/components/guidedSteps/guidedSteps.tsx
index e5c5c1395d1bb4..491b00777e54e7 100644
--- a/static/app/components/guidedSteps/guidedSteps.tsx
+++ b/static/app/components/guidedSteps/guidedSteps.tsx
@@ -67,7 +67,7 @@ function useGuidedStepsContentValue({
   // render and that step order does not change.
   const registerStep = useCallback((props: RegisterStepInfo) => {
     if (registeredStepsRef.current[props.stepKey]) {
-      registeredStepsRef.current[props.stepKey].isCompleted = props.isCompleted;
+      registeredStepsRef.current[props.stepKey]!.isCompleted = props.isCompleted;
       return;
     }
     const numRegisteredSteps = Object.keys(registeredStepsRef.current).length + 1;
diff --git a/static/app/components/idBadge/index.stories.tsx b/static/app/components/idBadge/index.stories.tsx
index d2c5e0eab4c2ca..abcf2d8d3430d0 100644
--- a/static/app/components/idBadge/index.stories.tsx
+++ b/static/app/components/idBadge/index.stories.tsx
@@ -42,7 +42,7 @@ export default storyBook(IdBadge, story => {
       return <LoadingIndicator />;
     }
 
-    return <IdBadge team={teams[0]} />;
+    return <IdBadge team={teams[0]!} />;
   });
 
   story('Project', () => {
@@ -53,7 +53,7 @@ export default storyBook(IdBadge, story => {
       return <LoadingIndicator />;
     }
 
-    return <IdBadge project={myProject[0]} />;
+    return <IdBadge project={myProject[0]!} />;
   });
 
   story('User', () => {
@@ -89,7 +89,7 @@ export default storyBook(IdBadge, story => {
       teamRoleList: [],
       teamRoles: [],
       teams: [],
-      user: user,
+      user,
       flags: {
         'idp:provisioned': false,
         'idp:role-restricted': false,
@@ -116,8 +116,8 @@ export default storyBook(IdBadge, story => {
 
     const teamActor: Actor = {
       type: 'team',
-      id: teams[0].id,
-      name: teams[0].name,
+      id: teams[0]!.id,
+      name: teams[0]!.name,
     };
 
     return (
diff --git a/static/app/components/idBadge/memberBadge.spec.tsx b/static/app/components/idBadge/memberBadge.spec.tsx
index e4c959a25fb60f..737c06c4ea36c8 100644
--- a/static/app/components/idBadge/memberBadge.spec.tsx
+++ b/static/app/components/idBadge/memberBadge.spec.tsx
@@ -6,7 +6,7 @@ import {render, screen} from 'sentry-test/reactTestingLibrary';
 import MemberBadge from 'sentry/components/idBadge/memberBadge';
 
 describe('MemberBadge', function () {
-  let member;
+  let member!: ReturnType<typeof MemberFixture>;
   beforeEach(() => {
     member = MemberFixture();
   });
diff --git a/static/app/components/inactivePlugins.spec.tsx b/static/app/components/inactivePlugins.spec.tsx
index 89067a6d7c52be..32f4b76699a8cf 100644
--- a/static/app/components/inactivePlugins.spec.tsx
+++ b/static/app/components/inactivePlugins.spec.tsx
@@ -20,7 +20,7 @@ describe('InactivePlugins', function () {
     const enableFn = jest.fn();
     const plugins = PluginsFixture();
     render(<InactivePlugins onEnablePlugin={enableFn} plugins={plugins} />);
-    await userEvent.click(screen.getByRole('button', {name: plugins[0].name}));
+    await userEvent.click(screen.getByRole('button', {name: plugins[0]!.name}));
     expect(enableFn).toHaveBeenCalledWith(expect.objectContaining(plugins[0]));
   });
 });
diff --git a/static/app/components/indicators.spec.tsx b/static/app/components/indicators.spec.tsx
index 5883ecbd211a99..dc8a4708c0998c 100644
--- a/static/app/components/indicators.spec.tsx
+++ b/static/app/components/indicators.spec.tsx
@@ -5,6 +5,7 @@ import {
   addMessage,
   addSuccessMessage,
   clearIndicators,
+  type Indicator,
 } from 'sentry/actionCreators/indicator';
 import Indicators from 'sentry/components/indicators';
 import IndicatorStore from 'sentry/stores/indicatorStore';
@@ -39,7 +40,7 @@ describe('Indicators', function () {
     const {container} = render(<Indicators />);
 
     // when "type" is empty, we should treat it as loading state
-    let indicator;
+    let indicator!: Indicator;
     act(() => {
       indicator = IndicatorStore.add('Loading');
     });
diff --git a/static/app/components/issueDiff/index.tsx b/static/app/components/issueDiff/index.tsx
index 859368cbbe45bd..1f90a1c2db80ee 100644
--- a/static/app/components/issueDiff/index.tsx
+++ b/static/app/components/issueDiff/index.tsx
@@ -118,7 +118,7 @@ class IssueDiff extends Component<Props, State> {
             parent_transaction: this.getTransaction(
               targetEventData?.tags ? targetEventData.tags : []
             ),
-            shouldBeGrouped: shouldBeGrouped,
+            shouldBeGrouped,
           });
         }
       } catch {
diff --git a/static/app/components/issues/groupList.tsx b/static/app/components/issues/groupList.tsx
index 7992c02d8b856e..c5f873838b77fe 100644
--- a/static/app/components/issues/groupList.tsx
+++ b/static/app/components/issues/groupList.tsx
@@ -22,7 +22,6 @@ import GroupStore from 'sentry/stores/groupStore';
 import {space} from 'sentry/styles/space';
 import type {Group} from 'sentry/types/group';
 import type {WithRouterProps} from 'sentry/types/legacyReactRouter';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import withApi from 'sentry/utils/withApi';
 // eslint-disable-next-line no-restricted-imports
 import withSentryRouter from 'sentry/utils/withSentryRouter';
@@ -216,12 +215,12 @@ class GroupList extends Component<Props, State> {
     return queryParams;
   }
 
-  handleCursorChange(
+  handleCursorChange = (
     cursor: string | undefined,
     path: string,
     query: Record<string, any>,
     pageDiff: number
-  ) {
+  ) => {
     const queryPageInt = parseInt(query.page, 10);
     let nextPage: number | undefined = isNaN(queryPageInt)
       ? pageDiff
@@ -235,11 +234,11 @@ class GroupList extends Component<Props, State> {
       nextPage = undefined;
     }
 
-    browserHistory.push({
+    this.props.router.push({
       pathname: path,
       query: {...query, cursor, page: nextPage},
     });
-  }
+  };
 
   onGroupChange() {
     const groups = GroupStore.getAllItems() as Group[];
diff --git a/static/app/components/lastCommit.spec.tsx b/static/app/components/lastCommit.spec.tsx
index f45b8b070f7bd5..7884c1f0b52398 100644
--- a/static/app/components/lastCommit.spec.tsx
+++ b/static/app/components/lastCommit.spec.tsx
@@ -5,7 +5,7 @@ import {render, screen} from 'sentry-test/reactTestingLibrary';
 import LastCommit from 'sentry/components/lastCommit';
 
 describe('LastCommit', function () {
-  let mockedCommit;
+  let mockedCommit!: ReturnType<typeof CommitFixture>;
   const mockedCommitTitle = '(improve) Add Links to Spike-Protection Email (#2408)';
 
   beforeEach(() => {
@@ -17,7 +17,7 @@ describe('LastCommit', function () {
   });
 
   it('links to the commit in GitHub', function () {
-    mockedCommit.repository.provider = {id: 'github'};
+    mockedCommit.repository!.provider = {id: 'github', name: 'GitHub'};
     const mockedCommitURL = `${mockedCommit.repository?.url}/commit/${mockedCommit.id}`;
 
     render(<LastCommit commit={mockedCommit} />);
diff --git a/static/app/components/lastCommit.tsx b/static/app/components/lastCommit.tsx
index e6cd82bd56b0e9..aef8965844fa39 100644
--- a/static/app/components/lastCommit.tsx
+++ b/static/app/components/lastCommit.tsx
@@ -38,7 +38,7 @@ function LastCommit({commit}: Props) {
       );
     }
 
-    let finalMessage = message.split(/\n/)[0];
+    let finalMessage = message.split(/\n/)[0]!;
     if (finalMessage.length > 100) {
       let truncated = finalMessage.substring(0, 90);
       const words = truncated.split(/ /);
diff --git a/static/app/components/lazyLoad.spec.tsx b/static/app/components/lazyLoad.spec.tsx
index d7eca30ff2908f..03c8fb9d4fb3f0 100644
--- a/static/app/components/lazyLoad.spec.tsx
+++ b/static/app/components/lazyLoad.spec.tsx
@@ -49,7 +49,6 @@ describe('LazyLoad', function () {
   });
 
   it('renders with error message when promise is rejected', async function () {
-    // eslint-disable-next-line no-console
     jest.spyOn(console, 'error').mockImplementation(jest.fn());
     const getComponent = () => Promise.reject(new Error('Could not load component'));
 
diff --git a/static/app/components/letterAvatar.tsx b/static/app/components/letterAvatar.tsx
index 93a25bdc0768c3..e98bfb8433c84b 100644
--- a/static/app/components/letterAvatar.tsx
+++ b/static/app/components/letterAvatar.tsx
@@ -37,7 +37,7 @@ function getColor(identifier: string | undefined): Color {
   }
 
   const id = hashIdentifier(identifier);
-  return COLORS[id % COLORS.length];
+  return COLORS[id % COLORS.length]!;
 }
 
 function getInitials(displayName: string | undefined) {
@@ -46,9 +46,9 @@ function getInitials(displayName: string | undefined) {
   );
   // Use Array.from as slicing and substring() work on ucs2 segments which
   // results in only getting half of any 4+ byte character.
-  let initials = Array.from(names[0])[0];
+  let initials = Array.from(names[0]!)[0]!;
   if (names.length > 1) {
-    initials += Array.from(names[names.length - 1])[0];
+    initials += Array.from(names[names.length - 1]!)[0]!;
   }
   return initials.toUpperCase();
 }
diff --git a/static/app/components/metrics/chart/chart.tsx b/static/app/components/metrics/chart/chart.tsx
index e2052fd3f626a9..c238100b511fbe 100644
--- a/static/app/components/metrics/chart/chart.tsx
+++ b/static/app/components/metrics/chart/chart.tsx
@@ -86,7 +86,7 @@ function isNonZeroValue(value: number | null) {
 function addSeriesPadding(data: Series['data']) {
   const hasNonZeroSibling = (index: number) => {
     return (
-      isNonZeroValue(data[index - 1]?.value) || isNonZeroValue(data[index + 1]?.value)
+      isNonZeroValue(data[index - 1]!?.value) || isNonZeroValue(data[index + 1]!?.value)
     );
   };
   const paddingIndices = new Set<number>();
@@ -142,9 +142,9 @@ export const MetricChart = memo(
         }
       });
 
-      const bucketSize = series[0]?.data[1]?.name - series[0]?.data[0]?.name;
+      const bucketSize = series[0]!?.data[1]!?.name - series[0]!?.data[0]!?.name;
       const isSubMinuteBucket = bucketSize < 60_000;
-      const lastBucketTimestamp = series[0]?.data?.[series[0]?.data?.length - 1]?.name;
+      const lastBucketTimestamp = series[0]!?.data?.[series[0]!?.data?.length - 1]!?.name;
       const ingestionBuckets = useMemo(
         () => getIngestionDelayBucketCount(bucketSize, lastBucketTimestamp),
         [bucketSize, lastBucketTimestamp]
@@ -245,7 +245,7 @@ export const MetricChart = memo(
 
                   // Filter padding datapoints from tooltip
                   if (param.value[1] === 0) {
-                    const currentSeries = seriesToShow[param.seriesIndex];
+                    const currentSeries = seriesToShow[param.seriesIndex]!;
                     const paddingIndices =
                       'paddingIndices' in currentSeries
                         ? currentSeries.paddingIndices
diff --git a/static/app/components/metrics/chart/useFocusArea.tsx b/static/app/components/metrics/chart/useFocusArea.tsx
index f381fc3f3b8674..8fbbe03d4682e0 100644
--- a/static/app/components/metrics/chart/useFocusArea.tsx
+++ b/static/app/components/metrics/chart/useFocusArea.tsx
@@ -278,16 +278,16 @@ function FocusAreaOverlay({
       return;
     }
 
-    const widthPx = bottomRight[0] - topLeft[0];
-    const heightPx = bottomRight[1] - topLeft[1];
+    const widthPx = bottomRight[0]! - topLeft[0]!;
+    const heightPx = bottomRight[1]! - topLeft[1]!;
 
-    const resultTop = useFullYAxis ? '0px' : `${topLeft[1].toPrecision(5)}px`;
+    const resultTop = useFullYAxis ? '0px' : `${topLeft[1]!.toPrecision(5)}px`;
     const resultHeight = useFullYAxis
       ? `${CHART_HEIGHT}px`
       : `${heightPx.toPrecision(5)}px`;
 
     // Ensure the focus area rect is always within the chart bounds
-    const left = Math.max(topLeft[0], 0);
+    const left = Math.max(topLeft[0]!, 0);
     const width = Math.min(widthPx, chartInstance.getWidth() - left);
 
     const newPosition = {
@@ -347,14 +347,14 @@ const getSelectionRange = (
   useFullYAxis: boolean,
   boundingRect: ValueRect
 ): SelectionRange => {
-  const startTimestamp = Math.min(...rect.coordRange[0]);
-  const endTimestamp = Math.max(...rect.coordRange[0]);
+  const startTimestamp = Math.min(...rect.coordRange![0]!);
+  const endTimestamp = Math.max(...rect.coordRange![0]!);
 
   const startDate = getDateString(Math.max(startTimestamp, boundingRect.xMin));
   const endDate = getDateString(Math.min(endTimestamp, boundingRect.xMax));
 
-  const min = useFullYAxis ? NaN : Math.min(...rect.coordRange[1]);
-  const max = useFullYAxis ? NaN : Math.max(...rect.coordRange[1]);
+  const min = useFullYAxis ? NaN : Math.min(...rect.coordRange[1]!);
+  const max = useFullYAxis ? NaN : Math.max(...rect.coordRange[1]!);
 
   return {
     start: startDate,
diff --git a/static/app/components/metrics/chart/useMetricChartSamples.tsx b/static/app/components/metrics/chart/useMetricChartSamples.tsx
index 83cf415ba77f96..e7a25ab26796d1 100644
--- a/static/app/components/metrics/chart/useMetricChartSamples.tsx
+++ b/static/app/components/metrics/chart/useMetricChartSamples.tsx
@@ -164,7 +164,10 @@ export function useMetricChartSamples({
           const value = getSummaryValueForAggregation(sample.summary, aggregation);
           const yValue = value;
 
-          const [xPosition, yPosition] = fitToValueRect(xValue, yValue, valueRect);
+          const [xPosition, yPosition] = fitToValueRect(xValue, yValue, valueRect) as [
+            number,
+            number,
+          ];
 
           return {
             seriesName: sample.id,
diff --git a/static/app/components/metrics/chart/useMetricReleases.tsx b/static/app/components/metrics/chart/useMetricReleases.tsx
index 932e9a5c5ab193..2b2b9b03f7f41c 100644
--- a/static/app/components/metrics/chart/useMetricReleases.tsx
+++ b/static/app/components/metrics/chart/useMetricReleases.tsx
@@ -86,7 +86,7 @@ export function useReleases() {
         if (pageLinks) {
           const paginationObject = parseLinkHeader(pageLinks);
           hasMore = paginationObject?.next?.results ?? false;
-          queryObj.cursor = paginationObject.next.cursor;
+          queryObj.cursor = paginationObject.next!.cursor;
         } else {
           hasMore = false;
         }
diff --git a/static/app/components/metrics/chart/utils.tsx b/static/app/components/metrics/chart/utils.tsx
index af86decedbdfed..42da326d82ab18 100644
--- a/static/app/components/metrics/chart/utils.tsx
+++ b/static/app/components/metrics/chart/utils.tsx
@@ -53,8 +53,8 @@ export function getValueRect(chartRef?: RefObject<ReactEchartsRef>): ValueRect {
 
   const xMin = moment(topLeft[0]).valueOf();
   const xMax = moment(bottomRight[0]).valueOf();
-  const yMin = Math.max(0, bottomRight[1]);
-  const yMax = topLeft[1];
+  const yMin = Math.max(0, bottomRight[1]!);
+  const yMax = topLeft[1]!;
 
   return {
     xMin,
diff --git a/static/app/components/metrics/customMetricsEventData.spec.tsx b/static/app/components/metrics/customMetricsEventData.spec.tsx
deleted file mode 100644
index 16069063b11d48..00000000000000
--- a/static/app/components/metrics/customMetricsEventData.spec.tsx
+++ /dev/null
@@ -1,317 +0,0 @@
-import {OrganizationFixture} from 'sentry-fixture/organization';
-
-import {render, screen} from 'sentry-test/reactTestingLibrary';
-import {textWithMarkupMatcher} from 'sentry-test/utils';
-
-import type {MetricsSummary} from 'sentry/components/events/interfaces/spans/types';
-import {CustomMetricsEventData} from 'sentry/components/metrics/customMetricsEventData';
-import type {
-  MetricsQueryApiResponse,
-  MetricsQueryApiResponseLastMeta,
-} from 'sentry/types/metrics';
-
-const organization = OrganizationFixture({features: ['custom-metrics']});
-
-describe('CustomMetricsEventData', () => {
-  beforeEach(() => {
-    MockApiClient.addMockResponse({
-      url: `/organizations/${organization.slug}/metrics/query/`,
-      method: 'POST',
-      body: {
-        data: [[{by: {}, series: [], totals: 2}]],
-        meta: [
-          [
-            {
-              unit: 'nanoseconds',
-              scaling_factor: 1000000,
-              group_bys: {},
-              limit: null,
-              order: 'asc',
-            } as MetricsQueryApiResponseLastMeta,
-          ],
-        ],
-        end: '2023-09-01T01:00:00Z',
-        intervals: [],
-        start: '2023-09-01T00:00:00Z',
-      } satisfies MetricsQueryApiResponse,
-    });
-  });
-
-  it('renders empty (no feature flag)', () => {
-    const metricsSummary: MetricsSummary = {
-      'd:custom/my.metric@second': [
-        {
-          count: 2,
-          min: 1,
-          max: 2,
-          sum: 3,
-          tags: {
-            foo: 'bar',
-          },
-        },
-      ],
-    };
-
-    const {container} = render(
-      <CustomMetricsEventData
-        metricsSummary={metricsSummary}
-        startTimestamp={1706189398.176}
-        projectId="1"
-      />
-    );
-    expect(container).toBeEmptyDOMElement();
-  });
-
-  it('renders empty (no data)', () => {
-    const {container} = render(
-      <CustomMetricsEventData
-        metricsSummary={{}}
-        startTimestamp={1706189398.176}
-        projectId="1"
-      />,
-      {
-        organization,
-      }
-    );
-    expect(container).toBeEmptyDOMElement();
-  });
-
-  it('renders (all information)', () => {
-    // This test fails without the mock below, because a nested component uses @container query
-    // that is not supported by the version of jsdom currently used by jest.
-    jest.spyOn(console, 'error').mockImplementation();
-
-    const metricsSummary: MetricsSummary = {
-      'd:custom/my.metric@second': [
-        {
-          count: 2,
-          min: 1,
-          max: 2,
-          sum: 3,
-          tags: {
-            foo: 'bar',
-          },
-        },
-      ],
-    };
-
-    render(
-      <CustomMetricsEventData
-        metricsSummary={metricsSummary}
-        startTimestamp={1706189398.176}
-        projectId="1"
-      />,
-      {
-        organization,
-      }
-    );
-
-    expect(screen.getByText('Custom Metrics')).toBeInTheDocument();
-
-    expect(screen.getByText('my.metric')).toBeInTheDocument();
-    expect(screen.getByRole('link', {name: 'View Metric'})).toBeInTheDocument();
-
-    expect(screen.getByText(textWithMarkupMatcher(/Value: 1\.5s/))).toBeInTheDocument();
-
-    expect(screen.getByText(/Tags: foo:bar/)).toBeInTheDocument();
-  });
-
-  it('renders (counter metric)', () => {
-    const metricsSummary: MetricsSummary = {
-      'c:custom/my.metric@second': [
-        {
-          count: 1,
-          min: 1,
-          max: 1,
-          sum: 1,
-          tags: {
-            foo: 'bar',
-          },
-        },
-      ],
-    };
-
-    render(
-      <CustomMetricsEventData
-        metricsSummary={metricsSummary}
-        startTimestamp={1706189398.176}
-        projectId="1"
-      />,
-      {organization}
-    );
-
-    expect(screen.getByText('Custom Metrics')).toBeInTheDocument();
-
-    expect(screen.getByText('my.metric')).toBeInTheDocument();
-    expect(screen.getByRole('link', {name: 'View Metric'})).toBeInTheDocument();
-
-    expect(screen.getByText(textWithMarkupMatcher(/Count: 1/))).toBeInTheDocument();
-
-    expect(screen.getByText(/Tags: foo:bar/)).toBeInTheDocument();
-  });
-
-  it('renders (no tags)', async () => {
-    const metricsSummary: MetricsSummary = {
-      'c:custom/my.metric@second': [
-        {
-          count: 1,
-          min: 1,
-          max: 1,
-          sum: 1,
-          tags: null,
-        },
-      ],
-    };
-
-    render(
-      <CustomMetricsEventData
-        metricsSummary={metricsSummary}
-        startTimestamp={1706189398.176}
-        projectId="1"
-      />,
-      {
-        organization,
-      }
-    );
-
-    expect(screen.getByText('Custom Metrics')).toBeInTheDocument();
-
-    expect(screen.getByText('my.metric')).toBeInTheDocument();
-    expect(screen.getByRole('link', {name: 'View Metric'})).toBeInTheDocument();
-    expect(screen.getByText(textWithMarkupMatcher(/Count: 1/))).toBeInTheDocument();
-
-    expect(
-      await screen.findByText(textWithMarkupMatcher(/Tags: \(none\)/))
-    ).toBeInTheDocument();
-  });
-
-  it('renders (empty tags)', async () => {
-    const metricsSummary: MetricsSummary = {
-      'c:custom/my.metric@second': [
-        {
-          count: 1,
-          min: 1,
-          max: 1,
-          sum: 1,
-          tags: {},
-        },
-      ],
-    };
-
-    render(
-      <CustomMetricsEventData
-        metricsSummary={metricsSummary}
-        startTimestamp={1706189398.176}
-        projectId="1"
-      />,
-      {
-        organization,
-      }
-    );
-
-    expect(screen.getByText('Custom Metrics')).toBeInTheDocument();
-
-    expect(screen.getByText('my.metric')).toBeInTheDocument();
-    expect(screen.getByRole('link', {name: 'View Metric'})).toBeInTheDocument();
-    expect(screen.getByText(textWithMarkupMatcher(/Count: 1/))).toBeInTheDocument();
-
-    expect(
-      await screen.findByText(textWithMarkupMatcher(/Tags: \(none\)/))
-    ).toBeInTheDocument();
-  });
-
-  it('renders (multiple)', () => {
-    MockApiClient.addMockResponse({
-      url: `/organizations/${organization.slug}/metrics/query/`,
-      method: 'POST',
-      body: {
-        data: [
-          [{by: {}, series: [], totals: 2}],
-          [{by: {}, series: [], totals: 2}],
-          [{by: {}, series: [], totals: 2}],
-        ],
-        meta: [
-          [
-            {
-              unit: 'nanoseconds',
-              scaling_factor: 1000000,
-              group_bys: {},
-              limit: null,
-              order: 'asc',
-            } as MetricsQueryApiResponseLastMeta,
-          ],
-          [
-            {
-              unit: 'nanoseconds',
-              scaling_factor: null,
-              group_bys: {},
-              limit: null,
-              order: 'asc',
-            } as MetricsQueryApiResponseLastMeta,
-          ],
-          [
-            {
-              unit: 'nanoseconds',
-              scaling_factor: 1000000,
-              group_bys: {},
-              limit: null,
-              order: 'asc',
-            } as MetricsQueryApiResponseLastMeta,
-          ],
-        ],
-        end: '2023-09-01T01:00:00Z',
-        intervals: [],
-        start: '2023-09-01T00:00:00Z',
-      } satisfies MetricsQueryApiResponse,
-    });
-
-    const metricsSummary: MetricsSummary = {
-      'd:custom/my.distribution@second': [
-        {
-          count: 2,
-          min: 1,
-          max: 2,
-          sum: 3,
-          tags: {
-            foo: 'bar',
-          },
-        },
-        {
-          count: 1,
-          min: 1,
-          max: 1,
-          sum: 1,
-          tags: null,
-        },
-      ],
-      'c:custom/my.counter@second': [
-        {
-          count: 2,
-          min: 1,
-          max: 2,
-          sum: 3,
-          tags: {
-            foo: 'bar',
-          },
-        },
-      ],
-    };
-
-    render(
-      <CustomMetricsEventData
-        metricsSummary={metricsSummary}
-        startTimestamp={1706189398.176}
-        projectId="1"
-      />,
-      {
-        organization,
-      }
-    );
-
-    expect(screen.getByText('Custom Metrics')).toBeInTheDocument();
-
-    expect(screen.getByText('my.counter')).toBeInTheDocument();
-    expect(screen.getAllByText('my.distribution')).toHaveLength(2);
-    expect(screen.getAllByRole('link', {name: 'View Metric'})).toHaveLength(3);
-  });
-});
diff --git a/static/app/components/metrics/customMetricsEventData.tsx b/static/app/components/metrics/customMetricsEventData.tsx
deleted file mode 100644
index 56f044ae768104..00000000000000
--- a/static/app/components/metrics/customMetricsEventData.tsx
+++ /dev/null
@@ -1,482 +0,0 @@
-import {Fragment, useMemo} from 'react';
-import {useTheme} from '@emotion/react';
-import styled from '@emotion/styled';
-
-import MarkLine from 'sentry/components/charts/components/markLine';
-import ScatterSeries from 'sentry/components/charts/series/scatterSeries';
-import type {
-  MetricsSummary,
-  MetricsSummaryItem,
-} from 'sentry/components/events/interfaces/spans/types';
-import {Hovercard} from 'sentry/components/hovercard';
-import {KeyValueTable, KeyValueTableRow} from 'sentry/components/keyValueTable';
-import {MetricChart} from 'sentry/components/metrics/chart/chart';
-import type {Series} from 'sentry/components/metrics/chart/types';
-import {normalizeDateTimeString} from 'sentry/components/organizations/pageFilters/parse';
-import {IconInfo} from 'sentry/icons';
-import {t} from 'sentry/locale';
-import {space} from 'sentry/styles/space';
-import type {
-  MetricsQueryApiResponseLastMeta,
-  MetricType,
-  MRI,
-} from 'sentry/types/metrics';
-import type {Organization} from 'sentry/types/organization';
-import {defined} from 'sentry/utils';
-import {getDefaultAggregation, getMetricsUrl} from 'sentry/utils/metrics';
-import {hasCustomMetrics} from 'sentry/utils/metrics/features';
-import {formatMetricUsingUnit} from 'sentry/utils/metrics/formatters';
-import {formatMRI, isExtractedCustomMetric, parseMRI} from 'sentry/utils/metrics/mri';
-import {MetricDisplayType} from 'sentry/utils/metrics/types';
-import {useMetricsQuery} from 'sentry/utils/metrics/useMetricsQuery';
-import {middleEllipsis} from 'sentry/utils/string/middleEllipsis';
-import type {Color} from 'sentry/utils/theme';
-import useOrganization from 'sentry/utils/useOrganization';
-import {getSampleChartSymbol} from 'sentry/views/insights/common/views/spanSummaryPage/sampleList/durationChart/getSampleChartSymbol';
-import {getChartTimeseries} from 'sentry/views/metrics/widget';
-import {
-  type SectionCardKeyValueList,
-  TraceDrawerComponents,
-} from 'sentry/views/performance/newTraceDetails/traceDrawer/details/styles';
-
-function flattenMetricsSummary(
-  metricsSummary: MetricsSummary
-): {item: MetricsSummaryItem; mri: MRI}[] {
-  return (
-    Object.entries(metricsSummary) as [
-      keyof MetricsSummary,
-      MetricsSummary[keyof MetricsSummary],
-    ][]
-  )
-    .flatMap(([mri, items]) => (items || []).map(item => ({item, mri})))
-    .filter(entry => !isExtractedCustomMetric(entry));
-}
-
-function tagToQuery(tagKey: string, tagValue: string) {
-  return `${tagKey}:"${tagValue}"`;
-}
-
-export function eventHasCustomMetrics(
-  organization: Organization,
-  metricsSummary: MetricsSummary | undefined
-) {
-  return (
-    hasCustomMetrics(organization) &&
-    metricsSummary &&
-    flattenMetricsSummary(metricsSummary).length > 0
-  );
-}
-
-const HALF_HOUR_IN_MS = 30 * 60 * 1000;
-
-interface DataRow {
-  chartUnit: string;
-  metricType: MetricType;
-  metricUnit: string;
-  mri: MRI;
-  scalingFactor: number;
-  summaryItem: MetricsSummaryItem;
-  chartSeries?: Series;
-  deviation?: number;
-  deviationPercent?: number;
-  itemAvg?: number;
-  totalAvg?: number;
-}
-
-export function CustomMetricsEventData({
-  metricsSummary,
-  startTimestamp,
-  projectId,
-}: {
-  projectId: string;
-  startTimestamp: number;
-  metricsSummary?: MetricsSummary;
-}) {
-  const organization = useOrganization();
-
-  const start = new Date(startTimestamp * 1000 - HALF_HOUR_IN_MS).toISOString();
-  const end = new Date(startTimestamp * 1000 + HALF_HOUR_IN_MS).toISOString();
-
-  const metricsSummaryEntries = useMemo(
-    () => (metricsSummary ? flattenMetricsSummary(metricsSummary) : []),
-    [metricsSummary]
-  );
-
-  const queries = useMemo(
-    () =>
-      metricsSummaryEntries.map((entry, index) => ({
-        mri: entry.mri,
-        name: index.toString(),
-        aggregation: getDefaultAggregation(entry.mri),
-        query: Object.entries(entry.item.tags ?? {})
-          .map(([tagKey, tagValue]) => tagToQuery(tagKey, tagValue))
-          .join(' '),
-      })),
-    [metricsSummaryEntries]
-  );
-
-  const {data} = useMetricsQuery(queries, {
-    projects: [parseInt(projectId, 10)],
-    datetime: {start, end, period: null, utc: true},
-    environments: [],
-  });
-
-  const chartSeries = useMemo(
-    () =>
-      data
-        ? data.data.flatMap((entry, index) => {
-            // Splitting the response to treat it like individual requests
-            // TODO: improve utils for metric series generation
-            return getChartTimeseries(
-              {...data, data: [entry], meta: [data.meta[index]]},
-              [queries[index]],
-              {
-                showQuerySymbol: false,
-              }
-            );
-          })
-        : [],
-    [data, queries]
-  );
-
-  const dataRows = useMemo(
-    () =>
-      metricsSummaryEntries
-        .map<DataRow>((entry, index) => {
-          const entryData = data?.data?.[index][0];
-          const dataMeta = data?.meta?.[index];
-          const lastMeta = dataMeta?.[
-            dataMeta?.length - 1
-          ] as MetricsQueryApiResponseLastMeta;
-          const parsedMRI = parseMRI(entry.mri);
-          const type = parsedMRI?.type || 'c';
-          const unit = parsedMRI?.unit || 'none';
-          const summaryItem = entry.item;
-          const scalingFactor = lastMeta?.scaling_factor || 1;
-          const totalAvg = entryData?.totals;
-          const itemAvg =
-            summaryItem.sum && summaryItem.count
-              ? summaryItem.sum / summaryItem.count
-              : undefined;
-          const deviation =
-            itemAvg && totalAvg ? itemAvg - totalAvg / scalingFactor : undefined;
-          const deviationPercent =
-            deviation && totalAvg ? deviation / (totalAvg / scalingFactor) : undefined;
-
-          return {
-            mri: entry.mri,
-            itemAvg,
-            totalAvg,
-            scalingFactor,
-            chartSeries: chartSeries[index],
-            chartUnit: lastMeta?.unit ?? 'none',
-            metricType: type,
-            metricUnit: unit,
-            summaryItem: summaryItem,
-            deviation,
-            deviationPercent,
-          };
-        })
-        .sort((a, b) => {
-          // Counters should be on bottom
-          if (a.metricType === 'c' && b.metricType !== 'c') {
-            return 1;
-          }
-
-          if (a.metricType !== 'c' && b.metricType === 'c') {
-            return -1;
-          }
-
-          // Sort by highest absolute deviation
-          return Math.abs(b.deviationPercent || 0) - Math.abs(a.deviationPercent || 0);
-        }),
-    [chartSeries, data?.data, data?.meta, metricsSummaryEntries]
-  );
-
-  if (!hasCustomMetrics(organization) || metricsSummaryEntries.length === 0) {
-    return null;
-  }
-
-  const items: SectionCardKeyValueList = [];
-
-  dataRows.forEach(dataRow => {
-    const {mri, summaryItem} = dataRow;
-    const name = formatMRI(mri);
-    items.push({
-      key: `metric-${name}`,
-      subject: name,
-      value: (
-        <TraceDrawerComponents.CopyableCardValueWithLink
-          value={
-            <Fragment>
-              <ValueRenderer dataRow={dataRow} />{' '}
-              <DeviationRenderer dataRow={dataRow} startTimestamp={startTimestamp} />
-              <br />
-              <TagsRenderer tags={dataRow.summaryItem.tags} />
-            </Fragment>
-          }
-          linkText={t('View Metric')}
-          linkTarget={getMetricsUrl(organization.slug, {
-            start: normalizeDateTimeString(start),
-            end: normalizeDateTimeString(end),
-            interval: '10s',
-            widgets: [
-              {
-                mri: mri,
-                displayType: MetricDisplayType.LINE,
-                aggregation: getDefaultAggregation(mri),
-                query: Object.entries(summaryItem.tags ?? {})
-                  .map(([tagKey, tagValue]) => tagToQuery(tagKey, tagValue))
-                  .join(' '),
-              },
-            ],
-          })}
-        />
-      ),
-    });
-  });
-
-  return (
-    <TraceDrawerComponents.SectionCard
-      title={t('Custom Metrics')}
-      items={items}
-      sortAlphabetically
-    />
-  );
-}
-
-function ValueRenderer({dataRow}: {dataRow: DataRow}) {
-  const {mri, summaryItem} = dataRow;
-  const parsedMRI = parseMRI(mri);
-  const unit = parsedMRI?.unit ?? 'none';
-  const type = parsedMRI?.type ?? 'c';
-
-  // For counters the other stats offer little value, so we only show the count
-  if (type === 'c' || !summaryItem.count) {
-    return t('Count: %s', formatMetricUsingUnit(summaryItem.count, 'none'));
-  }
-
-  const avg = summaryItem.sum && summaryItem.count && summaryItem.sum / summaryItem.count;
-
-  return (
-    <ValueWrapper>
-      {t('Value:')} {formatMetricUsingUnit(avg, unit) ?? t('(none)')}
-      {summaryItem.count > 1 && (
-        <ValuesHovercard
-          bodyClassName="hovercard-body"
-          skipWrapper
-          body={
-            <Fragment>
-              <StyledKeyValueTable>
-                <KeyValueTableRow keyName="count" value={summaryItem.count} />
-                <KeyValueTableRow
-                  keyName="min"
-                  value={formatMetricUsingUnit(summaryItem.min, unit)}
-                />
-                <KeyValueTableRow
-                  keyName="max"
-                  value={formatMetricUsingUnit(summaryItem.max, unit)}
-                />
-                <KeyValueTableRow
-                  keyName="avg"
-                  value={formatMetricUsingUnit(avg, unit)}
-                />
-              </StyledKeyValueTable>
-            </Fragment>
-          }
-        >
-          <IconInfo size="sm" color="gray300" />
-        </ValuesHovercard>
-      )}
-    </ValueWrapper>
-  );
-}
-
-function DeviationRenderer({
-  dataRow,
-  startTimestamp,
-}: {
-  dataRow: DataRow;
-  startTimestamp: number;
-}) {
-  const {
-    mri,
-    totalAvg,
-    itemAvg,
-    deviation,
-    deviationPercent,
-    chartUnit,
-    chartSeries,
-    scalingFactor,
-  } = dataRow;
-  const theme = useTheme();
-  const parsedMRI = parseMRI(mri);
-  const type = parsedMRI?.type ?? 'c';
-
-  if (
-    !defined(totalAvg) ||
-    !defined(itemAvg) ||
-    !defined(deviation) ||
-    !defined(deviationPercent) ||
-    type === 'c'
-  ) {
-    return null;
-  }
-  const totals = totalAvg / scalingFactor;
-  const isPositive = deviation > 0;
-  const isNeutral = Math.abs(deviationPercent) < 0.03;
-
-  const valueColor: Color = isNeutral ? 'gray300' : isPositive ? 'red300' : 'green300';
-
-  const sign = deviation === 0 ? '±' : isPositive ? '+' : '';
-  const symbol = isNeutral ? '' : isPositive ? '▲' : '▼';
-
-  return (
-    <ChartHovercard
-      bodyClassName="hovercard-body"
-      showUnderline
-      underlineColor={valueColor}
-      header={
-        <Fragment>
-          <HoverCardHeading>{`avg(${middleEllipsis(formatMRI(mri), 40, /\.|-|_/)})`}</HoverCardHeading>
-          <HoverCardSubheading>{t("Span's start time -/+ 30 min")}</HoverCardSubheading>
-        </Fragment>
-      }
-      body={
-        chartSeries && (
-          <MetricChart
-            displayType={MetricDisplayType.LINE}
-            series={[
-              {
-                ...chartSeries,
-                markLine: MarkLine({
-                  data: [
-                    {
-                      valueDim: 'y',
-                      type: 'average',
-                      yAxis: totalAvg,
-                    },
-                  ],
-                  lineStyle: {
-                    color: theme.gray400,
-                  },
-                  emphasis: {disabled: true},
-                }),
-              },
-            ]}
-            additionalSeries={[
-              ScatterSeries({
-                xAxisIndex: 0,
-                yAxisIndex: 0,
-                z: 10,
-                data: [
-                  {
-                    value: [startTimestamp * 1000, itemAvg * (scalingFactor || 1)],
-                    label: {
-                      show: true,
-                      position: 'right',
-                      borderColor: 'transparent',
-                      backgroundColor: theme.background,
-                      borderRadius: 6,
-                      padding: 4,
-                      color: theme[valueColor],
-                      formatter: params => {
-                        return `${formatMetricUsingUnit(
-                          (params.data as any).value[1],
-                          chartUnit || 'none'
-                        )}`;
-                      },
-                    },
-                  },
-                ],
-                ...getSampleChartSymbol(itemAvg, totals, theme),
-                symbolSize: 14,
-                animation: false,
-                silent: true,
-              }),
-            ]}
-            height={160}
-          />
-        )
-      }
-    >
-      <DeviationValue textColor={valueColor}>
-        {symbol} {sign}
-        {formatMetricUsingUnit(deviationPercent * 100, 'percent')}
-      </DeviationValue>
-    </ChartHovercard>
-  );
-}
-
-const STANDARD_TAGS = ['environment', 'release', 'transaction'];
-
-function TagsRenderer({tags}: {tags: Record<string, string> | null}) {
-  const tagString = Object.entries(tags || {})
-    .filter(([tagKey]) => !STANDARD_TAGS.includes(tagKey))
-    .reduce((acc, [tagKey, tagValue], index) => {
-      if (index > 0) {
-        acc += ', ';
-      }
-      acc += `${tagKey}:${tagValue}`;
-      return acc;
-    }, '');
-
-  if (tagString === '') {
-    return (
-      <Fragment>
-        {t('Tags:')} <NoValue>{t('(none)')}</NoValue>
-      </Fragment>
-    );
-  }
-
-  return t('Tags: %s', tagString);
-}
-
-const ChartHovercard = styled(Hovercard)`
-  width: 450px;
-`;
-
-const ValueCell = styled('div')`
-  display: flex;
-  align-items: center;
-  font-family: ${p => p.theme.text.familyMono};
-`;
-
-const NoValue = styled('span')`
-  color: ${p => p.theme.gray300};
-`;
-
-const ValueWrapper = styled(ValueCell)`
-  display: inline-grid;
-  grid-template-columns: max-content max-content;
-  gap: ${space(1)};
-  align-items: center;
-`;
-
-const DeviationValue = styled('span')<{
-  textColor: Color;
-}>`
-  color: ${p => p.theme[p.textColor]};
-  cursor: default;
-`;
-
-const HoverCardHeading = styled('div')`
-  font-size: ${p => p.theme.fontSizeLarge};
-  padding-bottom: ${space(0.5)};
-`;
-
-const HoverCardSubheading = styled('div')`
-  font-size: ${p => p.theme.fontSizeSmall};
-  color: ${p => p.theme.subText};
-`;
-
-const ValuesHovercard = styled(Hovercard)`
-  width: 200px;
-  & .hovercard-body {
-    padding: ${space(0.5)};
-  }
-`;
-
-const StyledKeyValueTable = styled(KeyValueTable)`
-  margin-bottom: 0;
-`;
diff --git a/static/app/components/metrics/metricSamplesTable.tsx b/static/app/components/metrics/metricSamplesTable.tsx
index 0394dbb1a07c28..2e4c24fb4784f6 100644
--- a/static/app/components/metrics/metricSamplesTable.tsx
+++ b/static/app/components/metrics/metricSamplesTable.tsx
@@ -6,6 +6,7 @@ import debounce from 'lodash/debounce';
 import {Button, LinkButton} from 'sentry/components/button';
 import {Flex} from 'sentry/components/container/flex';
 import {CopyToClipboardButton} from 'sentry/components/copyToClipboardButton';
+import SmartSearchBar from 'sentry/components/deprecatedSmartSearchBar';
 import EmptyStateWarning from 'sentry/components/emptyStateWarning';
 import GridEditable, {
   COL_WIDTH_UNDEFINED,
@@ -17,7 +18,6 @@ import ProjectBadge from 'sentry/components/idBadge/projectBadge';
 import Link from 'sentry/components/links/link';
 import type {SelectionRange} from 'sentry/components/metrics/chart/types';
 import PerformanceDuration from 'sentry/components/performanceDuration';
-import SmartSearchBar from 'sentry/components/smartSearchBar';
 import {Tooltip} from 'sentry/components/tooltip';
 import {IconProfiling} from 'sentry/icons';
 import {t} from 'sentry/locale';
diff --git a/static/app/components/metrics/metricSearchBar.tsx b/static/app/components/metrics/metricSearchBar.tsx
index b73d67a407aa78..f336cc2cf5f4f4 100644
--- a/static/app/components/metrics/metricSearchBar.tsx
+++ b/static/app/components/metrics/metricSearchBar.tsx
@@ -1,12 +1,12 @@
 import {useCallback, useMemo} from 'react';
 import {css, type SerializedStyles} from '@emotion/react';
 
+import type {SmartSearchBarProps} from 'sentry/components/deprecatedSmartSearchBar';
 import {QueryFieldGroup} from 'sentry/components/metrics/queryFieldGroup';
 import {
   SearchQueryBuilder,
   type SearchQueryBuilderProps,
 } from 'sentry/components/searchQueryBuilder';
-import type {SmartSearchBarProps} from 'sentry/components/smartSearchBar';
 import {t} from 'sentry/locale';
 import {SavedSearchType, type TagCollection} from 'sentry/types/group';
 import type {MRI} from 'sentry/types/metrics';
diff --git a/static/app/components/metrics/mriSelect/index.spec.tsx b/static/app/components/metrics/mriSelect/index.spec.tsx
index 09b5e850de5b51..ec6500f2cecb84 100644
--- a/static/app/components/metrics/mriSelect/index.spec.tsx
+++ b/static/app/components/metrics/mriSelect/index.spec.tsx
@@ -13,7 +13,7 @@ function createMetricMeta(
     operations: [],
     projectIds: [],
     type: 'd',
-    unit: unit,
+    unit,
   };
 }
 
diff --git a/static/app/components/metrics/mriSelect/index.tsx b/static/app/components/metrics/mriSelect/index.tsx
index e6123829410d70..7f8346be3141ca 100644
--- a/static/app/components/metrics/mriSelect/index.tsx
+++ b/static/app/components/metrics/mriSelect/index.tsx
@@ -59,7 +59,6 @@ function useMriMode() {
     if (mriModeKeyPressed) {
       setMriMode(value => !value);
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [mriModeKeyPressed]);
 
   return mriMode;
diff --git a/static/app/components/metrics/queryFieldGroup.tsx b/static/app/components/metrics/queryFieldGroup.tsx
index 2f2cc87d58d740..e7b398753353f4 100644
--- a/static/app/components/metrics/queryFieldGroup.tsx
+++ b/static/app/components/metrics/queryFieldGroup.tsx
@@ -10,9 +10,9 @@ import {
   type SelectKey,
   type SingleSelectProps,
 } from 'sentry/components/compactSelect';
+import _SmartSearchBar from 'sentry/components/deprecatedSmartSearchBar';
 import {DebouncedInput as _DebouncedInput} from 'sentry/components/modals/metricWidgetViewerModal/queries';
 import {SearchQueryBuilder as _SearchQueryBuilder} from 'sentry/components/searchQueryBuilder';
-import _SmartSearchBar from 'sentry/components/smartSearchBar';
 import {Tooltip} from 'sentry/components/tooltip';
 import {SLOW_TOOLTIP_DELAY} from 'sentry/constants';
 import {IconDelete} from 'sentry/icons';
diff --git a/static/app/components/modals/addTempestCredentialsModal.tsx b/static/app/components/modals/addTempestCredentialsModal.tsx
new file mode 100644
index 00000000000000..e805c692d50701
--- /dev/null
+++ b/static/app/components/modals/addTempestCredentialsModal.tsx
@@ -0,0 +1,37 @@
+import {Fragment} from 'react';
+
+import type {ModalRenderProps} from 'sentry/actionCreators/modal';
+import {t} from 'sentry/locale';
+import type {Organization} from 'sentry/types/organization';
+import type {Project} from 'sentry/types/project';
+import AddTempestCredentialsForm from 'sentry/views/settings/project/tempest/addTempestCredentialsForm';
+import {useFetchTempestCredentials} from 'sentry/views/settings/project/tempest/hooks/useFetchTempestCredentials';
+
+interface Props extends ModalRenderProps {
+  organization: Organization;
+  project: Project;
+}
+
+export default function AddCredentialsModal({Body, Header, ...props}: Props) {
+  const {closeModal, organization, project} = props;
+  const {invalidateCredentialsCache} = useFetchTempestCredentials(organization, project);
+
+  const onSuccess = () => {
+    invalidateCredentialsCache();
+    closeModal();
+  };
+
+  return (
+    <Fragment>
+      <Header closeButton>{t('Add New Credentials')}</Header>
+      <Body>
+        <AddTempestCredentialsForm
+          {...props}
+          organization={organization}
+          project={project}
+          onSuccess={onSuccess}
+        />
+      </Body>
+    </Fragment>
+  );
+}
diff --git a/static/app/components/modals/commandPalette.spec.tsx b/static/app/components/modals/commandPalette.spec.tsx
index fb752b1d3cecc3..2c7e087e16bd62 100644
--- a/static/app/components/modals/commandPalette.spec.tsx
+++ b/static/app/components/modals/commandPalette.spec.tsx
@@ -113,7 +113,7 @@ describe('Command Palette Modal', function () {
     expect(badges[0]).toHaveTextContent('billy-org Dashboard');
     expect(badges[1]).toHaveTextContent('billy-org Settings');
 
-    await userEvent.click(badges[0]);
+    await userEvent.click(badges[0]!);
 
     expect(navigateTo).toHaveBeenCalledWith('/billy-org/', expect.anything(), undefined);
   });
diff --git a/static/app/components/modals/createDashboardFromMetricsModal.tsx b/static/app/components/modals/createDashboardFromMetricsModal.tsx
index 24afb35194711d..4bb37ad3ab516f 100644
--- a/static/app/components/modals/createDashboardFromMetricsModal.tsx
+++ b/static/app/components/modals/createDashboardFromMetricsModal.tsx
@@ -1,7 +1,6 @@
 import {useEffect, useState} from 'react';
 import {css} from '@emotion/react';
 import styled from '@emotion/styled';
-import type {Location} from 'history';
 
 import {createDashboard, updateDashboard} from 'sentry/actionCreators/dashboards';
 import {addErrorMessage, addSuccessMessage} from 'sentry/actionCreators/indicator';
@@ -25,7 +24,6 @@ import {NEW_DASHBOARD_ID} from 'sentry/views/dashboards/widgetBuilder/utils';
 import {OrganizationContext} from 'sentry/views/organizationContext';
 
 export type AddToDashboardModalProps = {
-  location: Location;
   newDashboard: DashboardDetails;
   organization: Organization;
   router: InjectedRouter;
diff --git a/static/app/components/modals/createTeamModal.spec.tsx b/static/app/components/modals/createTeamModal.spec.tsx
index b986e7aa5759d7..ec45ac444744b9 100644
--- a/static/app/components/modals/createTeamModal.spec.tsx
+++ b/static/app/components/modals/createTeamModal.spec.tsx
@@ -21,7 +21,7 @@ describe('CreateTeamModal', function () {
   });
 
   it('calls createTeam action creator on submit', async function () {
-    const styledWrapper = styled(c => c.children);
+    const styledWrapper = styled<any>((c: {children: React.ReactNode}) => c.children);
     render(
       <CreateTeamModal
         Body={styledWrapper()}
diff --git a/static/app/components/modals/dashboardWidgetQuerySelectorModal.spec.tsx b/static/app/components/modals/dashboardWidgetQuerySelectorModal.spec.tsx
index eeebc4faec7714..a4473a37bb6276 100644
--- a/static/app/components/modals/dashboardWidgetQuerySelectorModal.spec.tsx
+++ b/static/app/components/modals/dashboardWidgetQuerySelectorModal.spec.tsx
@@ -2,13 +2,20 @@ import {initializeOrg} from 'sentry-test/initializeOrg';
 import {render, screen} from 'sentry-test/reactTestingLibrary';
 
 import DashboardWidgetQuerySelectorModal from 'sentry/components/modals/dashboardWidgetQuerySelectorModal';
+import type {Widget} from 'sentry/views/dashboards/types';
 import {DisplayType} from 'sentry/views/dashboards/types';
 
 const stubEl: any = (props: any) => <div>{props.children}</div>;
 
 const api = new MockApiClient();
 
-function renderModal({initialData, widget}) {
+function renderModal({
+  initialData,
+  widget,
+}: {
+  initialData: ReturnType<typeof initializeOrg>;
+  widget: Widget;
+}) {
   return render(
     <DashboardWidgetQuerySelectorModal
       Header={stubEl}
@@ -32,8 +39,8 @@ describe('Modals -> AddDashboardWidgetModal', function () {
     router: {},
     projects: [],
   });
-  let mockQuery;
-  let mockWidget;
+  let mockQuery!: Widget['queries'][number];
+  let mockWidget!: Widget;
 
   beforeEach(function () {
     mockQuery = {
@@ -41,7 +48,6 @@ describe('Modals -> AddDashboardWidgetModal', function () {
       fields: ['count()', 'failure_count()'],
       aggregates: ['count()', 'failure_count()'],
       columns: [],
-      id: '1',
       name: 'Query Name',
       orderby: '',
     };
@@ -93,12 +99,10 @@ describe('Modals -> AddDashboardWidgetModal', function () {
     mockWidget.queries.push({
       ...mockQuery,
       conditions: 'title:/organizations/:orgId/performance/',
-      id: '2',
     });
     mockWidget.queries.push({
       ...mockQuery,
       conditions: 'title:/organizations/:orgId/',
-      id: '3',
     });
     renderModal({initialData, widget: mockWidget});
     const queryFields = screen.getAllByRole('textbox');
diff --git a/static/app/components/modals/dashboardWidgetQuerySelectorModal.tsx b/static/app/components/modals/dashboardWidgetQuerySelectorModal.tsx
index 5b725103ca7671..d1ece1c1f00853 100644
--- a/static/app/components/modals/dashboardWidgetQuerySelectorModal.tsx
+++ b/static/app/components/modals/dashboardWidgetQuerySelectorModal.tsx
@@ -1,4 +1,4 @@
-import {Component, Fragment} from 'react';
+import {Fragment} from 'react';
 import {css} from '@emotion/react';
 import styled from '@emotion/styled';
 
@@ -31,9 +31,10 @@ type Props = ModalRenderProps &
     selection: PageFilters;
   };
 
-class DashboardWidgetQuerySelectorModal extends Component<Props> {
-  renderQueries() {
-    const {organization, widget, selection, isMetricsData} = this.props;
+function DashboardWidgetQuerySelectorModal(props: Props) {
+  const {organization, widget, selection, isMetricsData, Body, Header} = props;
+
+  const renderQueries = () => {
     const querySearchBars = widget.queries.map((query, index) => {
       const discoverLocation = getWidgetDiscoverUrl(
         {
@@ -72,26 +73,23 @@ class DashboardWidgetQuerySelectorModal extends Component<Props> {
       );
     });
     return querySearchBars;
-  }
+  };
 
-  render() {
-    const {Body, Header, widget} = this.props;
-    return (
-      <Fragment>
-        <Header closeButton>
-          <h4>{widget.title}</h4>
-        </Header>
-        <Body>
-          <p>
-            {t(
-              'Multiple queries were used to create this widget visualization. Which query would you like to view in Discover?'
-            )}
-          </p>
-          {this.renderQueries()}
-        </Body>
-      </Fragment>
-    );
-  }
+  return (
+    <Fragment>
+      <Header closeButton>
+        <h4>{widget.title}</h4>
+      </Header>
+      <Body>
+        <p>
+          {t(
+            'Multiple queries were used to create this widget visualization. Which query would you like to view in Discover?'
+          )}
+        </p>
+        {renderQueries()}
+      </Body>
+    </Fragment>
+  );
 }
 
 const StyledInput = styled(Input)`
diff --git a/static/app/components/modals/featureTourModal.spec.tsx b/static/app/components/modals/featureTourModal.spec.tsx
index 35a9ffd7c34951..7c2764c4fbb0c7 100644
--- a/static/app/components/modals/featureTourModal.spec.tsx
+++ b/static/app/components/modals/featureTourModal.spec.tsx
@@ -21,7 +21,8 @@ const steps = [
 ];
 
 describe('FeatureTourModal', function () {
-  let onAdvance, onCloseModal;
+  let onAdvance!: jest.Mock;
+  let onCloseModal!: jest.Mock;
 
   const createWrapper = (props = {}) =>
     render(
@@ -70,13 +71,13 @@ describe('FeatureTourModal', function () {
     await clickModal();
 
     // Should start on the first step.
-    expect(screen.getByRole('heading')).toHaveTextContent(steps[0].title);
+    expect(screen.getByRole('heading')).toHaveTextContent(steps[0]!.title);
 
     // Advance to the next step.
     await userEvent.click(screen.getByRole('button', {name: 'Next'}));
 
     // Should move to next step.
-    expect(screen.getByRole('heading')).toHaveTextContent(steps[1].title);
+    expect(screen.getByRole('heading')).toHaveTextContent(steps[1]!.title);
     expect(onAdvance).toHaveBeenCalled();
   });
 
@@ -86,7 +87,7 @@ describe('FeatureTourModal', function () {
     await clickModal();
 
     // Should show title, image and actions
-    expect(screen.getByRole('heading')).toHaveTextContent(steps[0].title);
+    expect(screen.getByRole('heading')).toHaveTextContent(steps[0]!.title);
     expect(screen.getByTestId('step-image')).toBeInTheDocument();
     expect(screen.getByTestId('step-action')).toBeInTheDocument();
     expect(screen.getByText('1 of 2')).toBeInTheDocument();
diff --git a/static/app/components/modals/featureTourModal.tsx b/static/app/components/modals/featureTourModal.tsx
index e0d07789f4356b..960f64fcc6329b 100644
--- a/static/app/components/modals/featureTourModal.tsx
+++ b/static/app/components/modals/featureTourModal.tsx
@@ -156,7 +156,8 @@ class ModalContents extends Component<ContentsProps, ContentsState> {
     const {Body, steps, doneText, doneUrl, closeModal} = this.props;
     const {current} = this.state;
 
-    const step = steps[current] !== undefined ? steps[current] : steps[steps.length - 1];
+    const step =
+      steps[current] !== undefined ? steps[current]! : steps[steps.length - 1]!;
     const hasNext = steps[current + 1] !== undefined;
 
     return (
diff --git a/static/app/components/modals/importDashboardFromFileModal.tsx b/static/app/components/modals/importDashboardFromFileModal.tsx
index 2d28cc02a579a7..adb8fc4d9f5417 100644
--- a/static/app/components/modals/importDashboardFromFileModal.tsx
+++ b/static/app/components/modals/importDashboardFromFileModal.tsx
@@ -1,12 +1,16 @@
 import {Fragment, useState} from 'react';
 import {css} from '@emotion/react';
+import type {Location} from 'history';
 
 import {createDashboard} from 'sentry/actionCreators/dashboards';
 import {addErrorMessage, addSuccessMessage} from 'sentry/actionCreators/indicator';
+import type {ModalRenderProps} from 'sentry/actionCreators/modal';
+import type {Client} from 'sentry/api';
 import {Button} from 'sentry/components/button';
 import {CodeSnippet} from 'sentry/components/codeSnippet';
 import {IconUpload} from 'sentry/icons';
 import {t} from 'sentry/locale';
+import type {Organization} from 'sentry/types/organization';
 import {browserHistory} from 'sentry/utils/browserHistory';
 import normalizeUrl from 'sentry/utils/url/normalizeUrl';
 import {
@@ -15,6 +19,12 @@ import {
 } from 'sentry/views/dashboards/layoutUtils';
 import {Wrapper} from 'sentry/views/discover/table/quickContext/styles';
 
+export interface ImportDashboardFromFileModalProps {
+  api: Client;
+  location: Location;
+  organization: Organization;
+}
+
 // Internal feature - no specs written.
 function ImportDashboardFromFileModal({
   Header,
@@ -23,11 +33,11 @@ function ImportDashboardFromFileModal({
   organization,
   api,
   location,
-}) {
+}: ModalRenderProps & ImportDashboardFromFileModalProps) {
   const [dashboardData, setDashboardData] = useState('');
   const [validated, setValidated] = useState(false);
 
-  function validateFile(fileToUpload) {
+  function validateFile(fileToUpload: File) {
     if (!fileToUpload || !(fileToUpload.type === 'application/json')) {
       addErrorMessage('You must upload a JSON file');
       setValidated(false);
diff --git a/static/app/components/modals/inviteMembersModal/index.spec.tsx b/static/app/components/modals/inviteMembersModal/index.spec.tsx
index 49a3e7f58aec2c..1953f0949d0837 100644
--- a/static/app/components/modals/inviteMembersModal/index.spec.tsx
+++ b/static/app/components/modals/inviteMembersModal/index.spec.tsx
@@ -15,7 +15,7 @@ import type {Scope} from 'sentry/types/core';
 import type {DetailedTeam} from 'sentry/types/organization';
 
 describe('InviteMembersModal', function () {
-  const styledWrapper = styled(c => c.children);
+  const styledWrapper = styled<any>((c: {children: React.ReactNode}) => c.children);
 
   type MockApiResponseFn = (
     client: typeof MockApiClient,
@@ -39,7 +39,7 @@ describe('InviteMembersModal', function () {
 
   const defaultMockModalProps = {
     Body: styledWrapper(),
-    Header: p => <span>{p.children}</span>,
+    Header: (p: {children?: React.ReactNode}) => <span>{p.children}</span>,
     Footer: styledWrapper(),
     closeModal: () => {},
     CloseButton: makeCloseButton(() => {}),
@@ -96,12 +96,12 @@ describe('InviteMembersModal', function () {
     const emailInputs = screen.getAllByRole('textbox', {name: 'Email Addresses'});
     const roleInputs = screen.getAllByRole('textbox', {name: 'Role'});
 
-    await userEvent.type(emailInputs[0], 'test1@test.com');
+    await userEvent.type(emailInputs[0]!, 'test1@test.com');
     await userEvent.tab();
 
-    await selectEvent.select(roleInputs[0], 'Admin');
+    await selectEvent.select(roleInputs[0]!, 'Admin');
 
-    await userEvent.type(emailInputs[1], 'test2@test.com');
+    await userEvent.type(emailInputs[1]!, 'test2@test.com');
     await userEvent.tab();
   };
 
@@ -162,10 +162,10 @@ describe('InviteMembersModal', function () {
     await userEvent.click(screen.getByRole('button', {name: 'Add another'}));
 
     const emailInputs = screen.getAllByRole('textbox', {name: 'Email Addresses'});
-    await userEvent.type(emailInputs[0], 'test@test.com');
+    await userEvent.type(emailInputs[0]!, 'test@test.com');
     await userEvent.tab();
 
-    await userEvent.type(emailInputs[1], 'test@test.com');
+    await userEvent.type(emailInputs[1]!, 'test@test.com');
     await userEvent.tab();
 
     expect(screen.getByText('Duplicate emails between invite rows.')).toBeInTheDocument();
@@ -211,8 +211,8 @@ describe('InviteMembersModal', function () {
     await setupMemberInviteState();
 
     const teamInputs = screen.getAllByRole('textbox', {name: 'Add to Team'});
-    await selectEvent.select(teamInputs[0], '#team-slug');
-    await selectEvent.select(teamInputs[1], '#team-slug');
+    await selectEvent.select(teamInputs[0]!, '#team-slug');
+    await selectEvent.select(teamInputs[1]!, '#team-slug');
 
     await userEvent.click(screen.getByRole('button', {name: 'Send invites (2)'}));
 
@@ -297,7 +297,11 @@ describe('InviteMembersModal', function () {
   });
 
   it('marks failed invites', async function () {
-    const failedCreateMemberMock = (client, orgSlug, _) => {
+    const failedCreateMemberMock = (
+      client: typeof MockApiClient,
+      orgSlug: string,
+      _: any
+    ) => {
       return client.addMockResponse({
         url: `/organizations/${orgSlug}/members/`,
         method: 'POST',
@@ -402,7 +406,11 @@ describe('InviteMembersModal', function () {
     });
 
     it('POSTS to the invite-request endpoint', async function () {
-      const createInviteRequestMock = (client, orgSlug, _) => {
+      const createInviteRequestMock = (
+        client: typeof MockApiClient,
+        orgSlug: string,
+        _: any
+      ) => {
         return client.addMockResponse({
           url: `/organizations/${orgSlug}/invite-requests/`,
           method: 'POST',
diff --git a/static/app/components/modals/inviteMembersModal/index.tsx b/static/app/components/modals/inviteMembersModal/index.tsx
index d32a3f20e192c5..e50f4c5246a6fb 100644
--- a/static/app/components/modals/inviteMembersModal/index.tsx
+++ b/static/app/components/modals/inviteMembersModal/index.tsx
@@ -100,7 +100,7 @@ function InviteMembersModal({
                 sendInvites: inviteModalSendInvites,
                 reset,
                 inviteStatus,
-                pendingInvites: pendingInvites[0],
+                pendingInvites: pendingInvites[0]!,
                 sendingInvites,
                 complete,
                 error,
diff --git a/static/app/components/modals/inviteMembersModal/inviteRowControl.tsx b/static/app/components/modals/inviteMembersModal/inviteRowControl.tsx
index cd73db279ef038..dc524d6bfbfdef 100644
--- a/static/app/components/modals/inviteMembersModal/inviteRowControl.tsx
+++ b/static/app/components/modals/inviteMembersModal/inviteRowControl.tsx
@@ -96,7 +96,7 @@ function InviteRowControl({
         value={emails}
         components={{
           MultiValue: (props: MultiValueProps<SelectOption>) => (
-            <EmailValue status={inviteStatus[props.data.value]} valueProps={props} />
+            <EmailValue status={inviteStatus[props.data.value]!} valueProps={props} />
           ),
           DropdownIndicator: () => null,
         }}
diff --git a/static/app/components/modals/inviteMembersModal/inviteRowControlNew.tsx b/static/app/components/modals/inviteMembersModal/inviteRowControlNew.tsx
index 4326a144ba9a8f..61aebc3da2ca18 100644
--- a/static/app/components/modals/inviteMembersModal/inviteRowControlNew.tsx
+++ b/static/app/components/modals/inviteMembersModal/inviteRowControlNew.tsx
@@ -94,7 +94,7 @@ function InviteRowControl({roleDisabledUnallowed, roleOptions}: Props) {
           value={emails}
           components={{
             MultiValue: (props: MultiValueProps<SelectOption>) => (
-              <EmailValue status={inviteStatus[props.data.value]} valueProps={props} />
+              <EmailValue status={inviteStatus[props.data.value]!} valueProps={props} />
             ),
             DropdownIndicator: () => null,
           }}
diff --git a/static/app/components/modals/inviteMembersModal/useInviteModal.tsx b/static/app/components/modals/inviteMembersModal/useInviteModal.tsx
index 3c5338b4534d90..98bd2faceee03b 100644
--- a/static/app/components/modals/inviteMembersModal/useInviteModal.tsx
+++ b/static/app/components/modals/inviteMembersModal/useInviteModal.tsx
@@ -29,9 +29,7 @@ function defaultInvite(): InviteRow {
 function canInvite(organization: Organization) {
   return (
     organization.access?.includes('member:write') ||
-    (organization.features.includes('members-invite-teammates') &&
-      organization.allowMemberInvite &&
-      organization.access?.includes('member:invite'))
+    (organization.allowMemberInvite && organization.access?.includes('member:invite'))
   );
 }
 
@@ -165,7 +163,7 @@ export default function useInviteModal({organization, initialData, source}: Prop
 
   const removeSentInvites = useCallback(() => {
     setState(prev => {
-      const emails = prev.pendingInvites[0].emails;
+      const emails = prev.pendingInvites[0]!.emails;
       const filteredEmails = Array.from(emails).filter(
         email => !prev.inviteStatus[email]?.sent
       );
@@ -173,7 +171,7 @@ export default function useInviteModal({organization, initialData, source}: Prop
         ...prev,
         pendingInvites: [
           {
-            ...prev.pendingInvites[0],
+            ...prev.pendingInvites[0]!,
             emails: new Set(filteredEmails),
           },
         ],
@@ -220,7 +218,7 @@ export default function useInviteModal({organization, initialData, source}: Prop
   const setEmails = useCallback((emails: string[], index: number) => {
     setState(prev => {
       const pendingInvites = [...prev.pendingInvites];
-      pendingInvites[index] = {...pendingInvites[index], emails: new Set(emails)};
+      pendingInvites[index] = {...pendingInvites[index]!, emails: new Set(emails)};
 
       return {...prev, pendingInvites};
     });
@@ -229,7 +227,7 @@ export default function useInviteModal({organization, initialData, source}: Prop
   const setTeams = useCallback((teams: string[], index: number) => {
     setState(prev => {
       const pendingInvites = [...prev.pendingInvites];
-      pendingInvites[index] = {...pendingInvites[index], teams: new Set(teams)};
+      pendingInvites[index] = {...pendingInvites[index]!, teams: new Set(teams)};
 
       return {...prev, pendingInvites};
     });
@@ -238,7 +236,7 @@ export default function useInviteModal({organization, initialData, source}: Prop
   const setRole = useCallback((role: string, index: number) => {
     setState(prev => {
       const pendingInvites = [...prev.pendingInvites];
-      pendingInvites[index] = {...pendingInvites[index], role};
+      pendingInvites[index] = {...pendingInvites[index]!, role};
 
       return {...prev, pendingInvites};
     });
diff --git a/static/app/components/modals/inviteMissingMembersModal/index.spec.tsx b/static/app/components/modals/inviteMissingMembersModal/index.spec.tsx
index 8a462fcfbe2316..620f8a7b72d3bf 100644
--- a/static/app/components/modals/inviteMissingMembersModal/index.spec.tsx
+++ b/static/app/components/modals/inviteMissingMembersModal/index.spec.tsx
@@ -188,12 +188,12 @@ describe('InviteMissingMembersModal', function () {
     const teamInputs = screen.getAllByRole('textbox', {name: 'Add to Team'});
 
     await userEvent.click(screen.getByLabelText('Select hello@sentry.io'));
-    await selectEvent.select(roleInputs[0], 'Admin', {
+    await selectEvent.select(roleInputs[0]!, 'Admin', {
       container: document.body,
     });
 
     await userEvent.click(screen.getByLabelText('Select abcd@sentry.io'));
-    await selectEvent.select(teamInputs[1], '#team-slug', {
+    await selectEvent.select(teamInputs[1]!, '#team-slug', {
       container: document.body,
     });
 
diff --git a/static/app/components/modals/inviteMissingMembersModal/index.tsx b/static/app/components/modals/inviteMissingMembersModal/index.tsx
index 9c89de5ec73a09..4ba3e48f86a8b7 100644
--- a/static/app/components/modals/inviteMissingMembersModal/index.tsx
+++ b/static/app/components/modals/inviteMissingMembersModal/index.tsx
@@ -67,9 +67,9 @@ export function InviteMissingMembersModal({
     (role: string, index: number) => {
       setMemberInvites(prevInvites => {
         const invites = prevInvites.map(i => ({...i}));
-        invites[index].role = role;
-        if (!allowedRolesMap[role].isTeamRolesAllowed) {
-          invites[index].teamSlugs = new Set([]);
+        invites[index]!.role = role;
+        if (!allowedRolesMap[role]!.isTeamRolesAllowed) {
+          invites[index]!.teamSlugs = new Set([]);
         }
         return invites;
       });
@@ -80,7 +80,7 @@ export function InviteMissingMembersModal({
   const setTeams = useCallback((teamSlugs: string[], index: number) => {
     setMemberInvites(prevInvites => {
       const invites = prevInvites.map(i => ({...i}));
-      invites[index].teamSlugs = new Set(teamSlugs);
+      invites[index]!.teamSlugs = new Set(teamSlugs);
       return invites;
     });
   }, []);
@@ -96,7 +96,7 @@ export function InviteMissingMembersModal({
   const toggleCheckbox = useCallback(
     (checked: boolean, index: number) => {
       const selectedMembers = [...memberInvites];
-      selectedMembers[index].selected = checked;
+      selectedMembers[index]!.selected = checked;
       setMemberInvites(selectedMembers);
     },
     [memberInvites]
@@ -234,7 +234,7 @@ export function InviteMissingMembersModal({
         stickyHeaders
       >
         {memberInvites?.map((member, i) => {
-          const checked = memberInvites[i].selected;
+          const checked = memberInvites[i]!.selected;
           const username = member.externalId.split(':').pop();
           const isTeamRolesAllowed =
             allowedRolesMap[member.role]?.isTeamRolesAllowed ?? true;
diff --git a/static/app/components/modals/metricWidgetViewerModal.tsx b/static/app/components/modals/metricWidgetViewerModal.tsx
index c3bb40feeedba8..960085fb4c27ce 100644
--- a/static/app/components/modals/metricWidgetViewerModal.tsx
+++ b/static/app/components/modals/metricWidgetViewerModal.tsx
@@ -120,7 +120,7 @@ function MetricWidgetViewerModal({
           if (!updatedQuery.alias) {
             updatedQuery.alias = updatedAlias;
           }
-          if (isVirtualAlias(currentQuery.alias) && isVirtualAlias(updatedQuery.alias)) {
+          if (isVirtualAlias(currentQuery!.alias) && isVirtualAlias(updatedQuery.alias)) {
             updatedQuery.alias = updatedAlias;
           }
         }
@@ -182,7 +182,7 @@ function MetricWidgetViewerModal({
             ? curr.map(q => ({...q, isHidden: true}))
             : curr),
           {
-            ...query,
+            ...query!,
             id: generateQueryId(),
           },
         ];
@@ -241,7 +241,7 @@ function MetricWidgetViewerModal({
         updated.splice(index, 1);
         // Make sure the last query is visible for big number widgets
         if (displayType === DisplayType.BIG_NUMBER && filteredEquations.length === 0) {
-          updated[updated.length - 1].isHidden = false;
+          updated[updated.length - 1]!.isHidden = false;
         }
         return updated;
       });
@@ -308,7 +308,7 @@ function MetricWidgetViewerModal({
     closeModal();
   }, [userHasModified, closeModal, organization]);
 
-  const {mri, aggregation, query, condition} = metricQueries[0];
+  const {mri, aggregation, query, condition} = metricQueries[0]!;
 
   if (isLoading) {
     return <LoadingIndicator />;
diff --git a/static/app/components/modals/metricWidgetViewerModal/queries.tsx b/static/app/components/modals/metricWidgetViewerModal/queries.tsx
index f17bc9d99b367c..08a88d7135d61d 100644
--- a/static/app/components/modals/metricWidgetViewerModal/queries.tsx
+++ b/static/app/components/modals/metricWidgetViewerModal/queries.tsx
@@ -86,7 +86,7 @@ export const Queries = memo(function Queries({
 
   const handleEditQueryAlias = useCallback(
     (index: number) => {
-      const query = metricQueries[index];
+      const query = metricQueries[index]!;
       const alias = getMetricQueryName(query);
 
       onQueryChange({alias}, index);
@@ -96,7 +96,7 @@ export const Queries = memo(function Queries({
 
   const handleEditEquationAlias = useCallback(
     (index: number) => {
-      const equation = metricEquations[index];
+      const equation = metricEquations[index]!;
       const alias = getMetricQueryName(equation);
 
       onEquationChange({alias: alias ?? ''}, index);
diff --git a/static/app/components/modals/metricWidgetViewerModal/visualization.tsx b/static/app/components/modals/metricWidgetViewerModal/visualization.tsx
index c8501a6cb5b123..c5b7fab35b396d 100644
--- a/static/app/components/modals/metricWidgetViewerModal/visualization.tsx
+++ b/static/app/components/modals/metricWidgetViewerModal/visualization.tsx
@@ -97,7 +97,7 @@ function useFocusedSeries({
   const setSeriesVisibility = useCallback(
     (series: FocusedMetricsSeries) => {
       onChange?.();
-      if (focusedSeries?.length === 1 && focusedSeries[0].id === series.id) {
+      if (focusedSeries?.length === 1 && focusedSeries[0]!.id === series.id) {
         setFocusedSeries([]);
         return;
       }
diff --git a/static/app/components/modals/sentryAppPublishRequestModal.tsx b/static/app/components/modals/sentryAppPublishRequestModal.tsx
index 786ab5c2f00acd..c549bb05e48a1c 100644
--- a/static/app/components/modals/sentryAppPublishRequestModal.tsx
+++ b/static/app/components/modals/sentryAppPublishRequestModal.tsx
@@ -1,4 +1,4 @@
-import {Component, Fragment} from 'react';
+import {Fragment, useState} from 'react';
 import styled from '@emotion/styled';
 import intersection from 'lodash/intersection';
 
@@ -59,11 +59,11 @@ type Props = ModalRenderProps & {
   app: SentryApp;
 };
 
-export default class SentryAppPublishRequestModal extends Component<Props> {
-  form = new FormModel({transformData});
+export default function SentryAppPublishRequestModal(props: Props) {
+  const [form] = useState<FormModel>(() => new FormModel({transformData}));
+  const {app, closeModal, Header, Body} = props;
 
-  get formFields() {
-    const {app} = this.props;
+  const formFields = () => {
     const permissions = getPermissionSelectionsFromScopes(app.scopes);
 
     const permissionQuestionBaseText =
@@ -132,57 +132,54 @@ export default class SentryAppPublishRequestModal extends Component<Props> {
     }
 
     return baseFields;
-  }
+  };
 
-  handleSubmitSuccess = () => {
-    addSuccessMessage(t('Request to publish %s successful.', this.props.app.slug));
-    this.props.closeModal();
+  const handleSubmitSuccess = () => {
+    addSuccessMessage(t('Request to publish %s successful.', app.slug));
+    closeModal();
   };
 
-  handleSubmitError = err => {
+  const handleSubmitError = err => {
     addErrorMessage(
       tct('Request to publish [app] fails. [detail]', {
-        app: this.props.app.slug,
+        app: app.slug,
         detail: err?.responseJSON?.detail,
       })
     );
   };
 
-  render() {
-    const {app, Header, Body} = this.props;
-    const endpoint = `/sentry-apps/${app.slug}/publish-request/`;
-    const forms = [
-      {
-        title: t('Questions to answer'),
-        fields: this.formFields,
-      },
-    ];
-    return (
-      <Fragment>
-        <Header>{t('Publish Request Questionnaire')}</Header>
-        <Body>
-          <Explanation>
-            {t(
-              `Please fill out this questionnaire in order to get your integration evaluated for publication.
+  const endpoint = `/sentry-apps/${app.slug}/publish-request/`;
+  const forms = [
+    {
+      title: t('Questions to answer'),
+      fields: formFields(),
+    },
+  ];
+  return (
+    <Fragment>
+      <Header>{t('Publish Request Questionnaire')}</Header>
+      <Body>
+        <Explanation>
+          {t(
+            `Please fill out this questionnaire in order to get your integration evaluated for publication.
               Once your integration has been approved, users outside of your organization will be able to install it.`
-            )}
-          </Explanation>
-          <Form
-            allowUndo
-            apiMethod="POST"
-            apiEndpoint={endpoint}
-            onSubmitSuccess={this.handleSubmitSuccess}
-            onSubmitError={this.handleSubmitError}
-            model={this.form}
-            submitLabel={t('Request Publication')}
-            onCancel={() => this.props.closeModal()}
-          >
-            <JsonForm forms={forms} />
-          </Form>
-        </Body>
-      </Fragment>
-    );
-  }
+          )}
+        </Explanation>
+        <Form
+          allowUndo
+          apiMethod="POST"
+          apiEndpoint={endpoint}
+          onSubmitSuccess={handleSubmitSuccess}
+          onSubmitError={handleSubmitError}
+          model={form}
+          submitLabel={t('Request Publication')}
+          onCancel={closeModal}
+        >
+          <JsonForm forms={forms} />
+        </Form>
+      </Body>
+    </Fragment>
+  );
 }
 
 const Explanation = styled('div')`
diff --git a/static/app/components/modals/suggestProjectModal.tsx b/static/app/components/modals/suggestProjectModal.tsx
index 5afee43327c48a..1afbde062081a9 100644
--- a/static/app/components/modals/suggestProjectModal.tsx
+++ b/static/app/components/modals/suggestProjectModal.tsx
@@ -1,4 +1,4 @@
-import {Component, Fragment} from 'react';
+import {Fragment, useState} from 'react';
 import styled from '@emotion/styled';
 import * as qs from 'query-string';
 
@@ -30,38 +30,30 @@ type Props = ModalRenderProps & {
   organization: Organization;
 };
 
-type State = {
-  askTeammate: boolean;
-};
-
-class SuggestProjectModal extends Component<Props, State> {
-  state: State = {
-    askTeammate: false,
-  };
+function SuggestProjectModal(props: Props) {
+  const [askTeammate, setAskTeammate] = useState<boolean>(false);
+  const {matchedUserAgentString, organization, closeModal, Body, Header, Footer} = props;
 
-  handleGetStartedClick = () => {
-    const {matchedUserAgentString, organization} = this.props;
+  const handleGetStartedClick = () => {
     trackAnalytics('growth.clicked_mobile_prompt_setup_project', {
       matchedUserAgentString,
       organization,
     });
   };
 
-  handleAskTeammate = () => {
-    const {matchedUserAgentString, organization} = this.props;
-    this.setState({askTeammate: true});
+  const handleAskTeammate = () => {
+    setAskTeammate(true);
     trackAnalytics('growth.clicked_mobile_prompt_ask_teammate', {
       matchedUserAgentString,
       organization,
     });
   };
 
-  goBack = () => {
-    this.setState({askTeammate: false});
+  const goBack = () => {
+    setAskTeammate(false);
   };
 
-  handleSubmitSuccess = () => {
-    const {matchedUserAgentString, organization, closeModal} = this.props;
+  const handleSubmitSuccess = () => {
     addSuccessMessage('Notified teammate successfully');
     trackAnalytics('growth.submitted_mobile_prompt_ask_teammate', {
       matchedUserAgentString,
@@ -70,28 +62,27 @@ class SuggestProjectModal extends Component<Props, State> {
     closeModal();
   };
 
-  handlePreSubmit = () => {
+  const handlePreSubmit = () => {
     addLoadingMessage(t('Submitting\u2026'));
   };
 
-  handleSubmitError = () => {
+  const handleSubmitError = () => {
     addErrorMessage(t('Error notifying teammate'));
   };
 
-  renderAskTeammate() {
-    const {Body, organization} = this.props;
+  const renderAskTeammate = () => {
     return (
       <Body>
         <Form
           apiEndpoint={`/organizations/${organization.slug}/request-project-creation/`}
           apiMethod="POST"
           submitLabel={t('Send')}
-          onSubmitSuccess={this.handleSubmitSuccess}
-          onSubmitError={this.handleSubmitError}
-          onPreSubmit={this.handlePreSubmit}
+          onSubmitSuccess={handleSubmitSuccess}
+          onSubmitError={handleSubmitError}
+          onPreSubmit={handlePreSubmit}
           extraButton={
             <BackWrapper>
-              <StyledBackButton onClick={this.goBack}>{t('Back')}</StyledBackButton>
+              <StyledBackButton onClick={goBack}>{t('Back')}</StyledBackButton>
             </BackWrapper>
           }
         >
@@ -109,11 +100,9 @@ class SuggestProjectModal extends Component<Props, State> {
         </Form>
       </Body>
     );
-  }
-
-  renderMain() {
-    const {Body, Footer, organization} = this.props;
+  };
 
+  const renderMain = () => {
     const paramString = qs.stringify({
       referrer: 'suggest_project',
       category: 'mobile',
@@ -167,14 +156,14 @@ class SuggestProjectModal extends Component<Props, State> {
               <ButtonBar gap={1}>
                 <Button
                   priority={hasAccess ? 'default' : 'primary'}
-                  onClick={this.handleAskTeammate}
+                  onClick={handleAskTeammate}
                 >
                   {t('Tell a Teammate')}
                 </Button>
                 {hasAccess && (
                   <LinkButton
                     href={newProjectLink}
-                    onClick={this.handleGetStartedClick}
+                    onClick={handleGetStartedClick}
                     priority="primary"
                   >
                     {t('Get Started')}
@@ -186,22 +175,18 @@ class SuggestProjectModal extends Component<Props, State> {
         </Footer>
       </Fragment>
     );
-  }
+  };
 
-  render() {
-    const {Header} = this.props;
-    const {askTeammate} = this.state;
-    const header = askTeammate ? t('Tell a Teammate') : t('Try Sentry for Mobile');
-    return (
-      <Fragment>
-        <Header>
-          <PatternHeader />
-          <Title>{header}</Title>
-        </Header>
-        {this.state.askTeammate ? this.renderAskTeammate() : this.renderMain()}
-      </Fragment>
-    );
-  }
+  const header = askTeammate ? t('Tell a Teammate') : t('Try Sentry for Mobile');
+  return (
+    <Fragment>
+      <Header>
+        <PatternHeader />
+        <Title>{header}</Title>
+      </Header>
+      {askTeammate ? renderAskTeammate() : renderMain()}
+    </Fragment>
+  );
 }
 
 const ModalContainer = styled('div')`
diff --git a/static/app/components/modals/teamAccessRequestModal.tsx b/static/app/components/modals/teamAccessRequestModal.tsx
index 0c78b751a3481e..5baa228a9eb590 100644
--- a/static/app/components/modals/teamAccessRequestModal.tsx
+++ b/static/app/components/modals/teamAccessRequestModal.tsx
@@ -1,4 +1,4 @@
-import {Component, Fragment} from 'react';
+import {Fragment, useState} from 'react';
 import styled from '@emotion/styled';
 
 import {addErrorMessage, addSuccessMessage} from 'sentry/actionCreators/indicator';
@@ -21,22 +21,12 @@ export interface CreateTeamAccessRequestModalProps
   teamId: string;
 }
 
-type State = {
-  createBusy: boolean;
-};
+function CreateTeamAccessRequestModal(props: CreateTeamAccessRequestModalProps) {
+  const [createBusy, setCreateBusy] = useState<boolean>(false);
+  const {api, memberId, orgId, teamId, closeModal, Body, Footer} = props;
 
-class CreateTeamAccessRequestModal extends Component<
-  CreateTeamAccessRequestModalProps,
-  State
-> {
-  state: State = {
-    createBusy: false,
-  };
-
-  handleClick = async () => {
-    const {api, memberId, orgId, teamId, closeModal} = this.props;
-
-    this.setState({createBusy: true});
+  const handleClick = async () => {
+    setCreateBusy(true);
 
     try {
       await api.requestPromise(
@@ -49,37 +39,28 @@ class CreateTeamAccessRequestModal extends Component<
     } catch (err) {
       addErrorMessage(t('Unable to send team request'));
     }
-    this.setState({createBusy: false});
+    setCreateBusy(false);
     closeModal();
   };
 
-  render() {
-    const {Body, Footer, closeModal, teamId} = this.props;
-
-    return (
-      <Fragment>
-        <Body>
-          {tct(
-            'You do not have permission to add members to the #[team] team, but we will send a request to your organization admins for approval.',
-            {team: teamId}
-          )}
-        </Body>
-        <Footer>
-          <ButtonGroup>
-            <Button onClick={closeModal}>{t('Cancel')}</Button>
-            <Button
-              priority="primary"
-              onClick={this.handleClick}
-              busy={this.state.createBusy}
-              autoFocus
-            >
-              {t('Continue')}
-            </Button>
-          </ButtonGroup>
-        </Footer>
-      </Fragment>
-    );
-  }
+  return (
+    <Fragment>
+      <Body>
+        {tct(
+          'You do not have permission to add members to the #[team] team, but we will send a request to your organization admins for approval.',
+          {team: teamId}
+        )}
+      </Body>
+      <Footer>
+        <ButtonGroup>
+          <Button onClick={closeModal}>{t('Cancel')}</Button>
+          <Button priority="primary" onClick={handleClick} busy={createBusy} autoFocus>
+            {t('Continue')}
+          </Button>
+        </ButtonGroup>
+      </Footer>
+    </Fragment>
+  );
 }
 
 const ButtonGroup = styled('div')`
diff --git a/static/app/components/modals/widgetBuilder/addToDashboardModal.spec.tsx b/static/app/components/modals/widgetBuilder/addToDashboardModal.spec.tsx
index 94543d87695743..e784b084790a7a 100644
--- a/static/app/components/modals/widgetBuilder/addToDashboardModal.spec.tsx
+++ b/static/app/components/modals/widgetBuilder/addToDashboardModal.spec.tsx
@@ -34,8 +34,8 @@ const mockWidgetAsQueryParams = {
 };
 
 describe('add to dashboard modal', () => {
-  let eventsStatsMock;
-  let initialData;
+  let eventsStatsMock!: jest.Mock;
+  let initialData!: ReturnType<typeof initializeOrg>;
 
   const testDashboardListItem: DashboardListItem = {
     id: '1',
diff --git a/static/app/components/modals/widgetBuilder/addToDashboardModal.tsx b/static/app/components/modals/widgetBuilder/addToDashboardModal.tsx
index 7da42feb17ae34..0de52ea3a08f65 100644
--- a/static/app/components/modals/widgetBuilder/addToDashboardModal.tsx
+++ b/static/app/components/modals/widgetBuilder/addToDashboardModal.tsx
@@ -171,11 +171,11 @@ function AddToDashboardModal({
       return;
     }
 
-    let orderby = widget.queries[0].orderby;
-    if (!(DisplayType.AREA && widget.queries[0].columns.length)) {
+    let orderby = widget.queries[0]!.orderby;
+    if (!(DisplayType.AREA && widget.queries[0]!.columns.length)) {
       orderby = ''; // Clear orderby if its not a top n visualization.
     }
-    const query = widget.queries[0];
+    const query = widget.queries[0]!;
 
     const title =
       // Metric widgets have their default title derived from the query
@@ -278,7 +278,7 @@ function AddToDashboardModal({
         <MetricsCardinalityProvider organization={organization} location={location}>
           <MetricsDataSwitcher
             organization={organization}
-            eventView={eventViewFromWidget(widget.title, widget.queries[0], selection)}
+            eventView={eventViewFromWidget(widget.title, widget.queries[0]!, selection)}
             location={location}
             hideLoadingIndicator
           >
diff --git a/static/app/components/modals/widgetViewerModal.spec.tsx b/static/app/components/modals/widgetViewerModal.spec.tsx
index 8edf9f12b1edd4..cfd269086ed56f 100644
--- a/static/app/components/modals/widgetViewerModal.spec.tsx
+++ b/static/app/components/modals/widgetViewerModal.spec.tsx
@@ -96,8 +96,9 @@ async function renderModal({
 }
 
 describe('Modals -> WidgetViewerModal', function () {
-  let initialData, initialDataWithFlag;
-  let widgetLegendState: WidgetLegendSelectionState;
+  let initialData!: ReturnType<typeof initializeOrg>;
+  let initialDataWithFlag!: ReturnType<typeof initializeOrg>;
+  let widgetLegendState!: WidgetLegendSelectionState;
   beforeEach(() => {
     initialData = initializeOrg({
       organization: {
@@ -442,71 +443,6 @@ describe('Modals -> WidgetViewerModal', function () {
         );
       });
 
-      it('renders widget chart minimap', async function () {
-        initialData.organization.features.push('widget-viewer-modal-minimap');
-        mockEvents();
-        await renderModal({
-          initialData,
-          widget: {
-            ...mockWidget,
-            queries: [{...mockQuery, name: ''}, additionalMockQuery],
-          },
-        });
-
-        expect(ReactEchartsCore).toHaveBeenLastCalledWith(
-          expect.objectContaining({
-            option: expect.objectContaining({
-              dataZoom: expect.arrayContaining([
-                expect.objectContaining({
-                  realtime: false,
-                  showDetail: false,
-                  end: 100,
-                  start: 0,
-                }),
-              ]),
-            }),
-          }),
-          {}
-        );
-      });
-
-      it('zooming on minimap updates location query and updates echart start and end values', async function () {
-        initialData.organization.features.push('widget-viewer-modal-minimap');
-        mockEvents();
-        await renderModal({
-          initialData,
-          widget: {
-            ...mockWidget,
-            queries: [{...mockQuery, name: ''}, additionalMockQuery],
-          },
-        });
-        const calls = (ReactEchartsCore as jest.Mock).mock.calls;
-        act(() => {
-          // Simulate dataZoom event on chart
-          calls[calls.length - 1][0].onEvents.datazoom(
-            {seriesStart: 1646100000000, seriesEnd: 1646120000000},
-            {
-              getModel: () => {
-                return {
-                  _payload: {start: 30, end: 70},
-                };
-              },
-            }
-          );
-        });
-
-        await waitFor(() =>
-          expect(initialData.router.push).toHaveBeenCalledWith(
-            expect.objectContaining({
-              query: {
-                viewerEnd: '2022-03-01T05:53:20',
-                viewerStart: '2022-03-01T03:40:00',
-              },
-            })
-          )
-        );
-      });
-
       it('includes group by in widget viewer table', async function () {
         mockEvents();
         mockWidget.queries = [
@@ -566,7 +502,7 @@ describe('Modals -> WidgetViewerModal', function () {
         const calls = (ReactEchartsCore as jest.Mock).mock.calls;
         const yAxisFormatter =
           calls[calls.length - 1][0].option.yAxis.axisLabel.formatter;
-        expect(yAxisFormatter(123)).toEqual('123ms');
+        expect(yAxisFormatter(123)).toBe('123ms');
       });
 
       it('renders widget chart with default number y axis formatter when seriesResultType has multiple different types', async function () {
@@ -580,7 +516,7 @@ describe('Modals -> WidgetViewerModal', function () {
         const calls = (ReactEchartsCore as jest.Mock).mock.calls;
         const yAxisFormatter =
           calls[calls.length - 1][0].option.yAxis.axisLabel.formatter;
-        expect(yAxisFormatter(123)).toEqual('123');
+        expect(yAxisFormatter(123)).toBe('123');
       });
 
       it('does not allow sorting by transaction name when widget is using metrics', async function () {
@@ -675,7 +611,8 @@ describe('Modals -> WidgetViewerModal', function () {
     });
 
     describe('TopN Chart Widget', function () {
-      let mockQuery, mockWidget;
+      let mockQuery!: Widget['queries'][number];
+      let mockWidget!: Widget;
 
       function mockEventsStats() {
         return MockApiClient.addMockResponse({
@@ -746,7 +683,6 @@ describe('Modals -> WidgetViewerModal', function () {
           fields: ['error.type', 'count()'],
           aggregates: ['count()'],
           columns: ['error.type'],
-          id: '1',
           name: 'Query Name',
           orderby: '',
         };
@@ -911,77 +847,6 @@ describe('Modals -> WidgetViewerModal', function () {
         await waitForMetaToHaveBeenCalled();
         expect(eventsStatsMock).toHaveBeenCalledTimes(1);
       });
-
-      it('renders widget chart minimap', async function () {
-        mockEventsStats();
-        mockEvents();
-        initialData.organization.features.push('widget-viewer-modal-minimap');
-        await renderModal({initialData, widget: mockWidget});
-
-        expect(ReactEchartsCore).toHaveBeenLastCalledWith(
-          expect.objectContaining({
-            option: expect.objectContaining({
-              dataZoom: expect.arrayContaining([
-                expect.objectContaining({
-                  realtime: false,
-                  showDetail: false,
-                  end: 100,
-                  start: 0,
-                }),
-              ]),
-            }),
-          }),
-          {}
-        );
-      });
-
-      it('zooming on minimap updates location query and updates echart start and end values', async function () {
-        mockEventsStats();
-        mockEvents();
-        initialData.organization.features.push('widget-viewer-modal-minimap');
-        await renderModal({initialData, widget: mockWidget});
-        const calls = (ReactEchartsCore as jest.Mock).mock.calls;
-        act(() => {
-          // Simulate dataZoom event on chart
-          calls[calls.length - 1][0].onEvents.datazoom(
-            {seriesStart: 1646100000000, seriesEnd: 1646120000000},
-            {
-              getModel: () => {
-                return {
-                  _payload: {start: 30, end: 70},
-                };
-              },
-            }
-          );
-        });
-
-        expect(initialData.router.push).toHaveBeenCalledWith(
-          expect.objectContaining({
-            query: {
-              viewerEnd: '2022-03-01T05:53:20',
-              viewerStart: '2022-03-01T03:40:00',
-            },
-          })
-        );
-
-        await waitFor(() => {
-          expect(ReactEchartsCore).toHaveBeenLastCalledWith(
-            expect.objectContaining({
-              option: expect.objectContaining({
-                dataZoom: expect.arrayContaining([
-                  expect.objectContaining({
-                    realtime: false,
-                    showDetail: false,
-                    endValue: 1646114000000,
-                    startValue: 1646106000000,
-                  }),
-                ]),
-              }),
-            }),
-            {}
-          );
-        });
-      });
     });
 
     describe('Table Widget', function () {
@@ -1137,7 +1002,7 @@ describe('Modals -> WidgetViewerModal', function () {
   });
 
   describe('Issue Table Widget', function () {
-    let issuesMock;
+    let issuesMock!: jest.Mock;
     const mockQuery = {
       conditions: 'is:unresolved',
       fields: ['events', 'status', 'title'],
@@ -1353,7 +1218,7 @@ describe('Modals -> WidgetViewerModal', function () {
   });
 
   describe('Release Health Widgets', function () {
-    let metricsMock;
+    let metricsMock!: jest.Mock;
     const mockQuery = {
       conditions: '',
       fields: [`sum(session)`],
diff --git a/static/app/components/modals/widgetViewerModal.tsx b/static/app/components/modals/widgetViewerModal.tsx
index f343822c3a8797..1eab9c09e70e7f 100644
--- a/static/app/components/modals/widgetViewerModal.tsx
+++ b/static/app/components/modals/widgetViewerModal.tsx
@@ -1,10 +1,9 @@
-import {Fragment, memo, useEffect, useMemo, useRef, useState} from 'react';
+import {Fragment, memo, useEffect, useMemo, useState} from 'react';
 import {components} from 'react-select';
 import {css} from '@emotion/react';
 import styled from '@emotion/styled';
 import * as Sentry from '@sentry/react';
 import {truncate} from '@sentry/utils';
-import type {DataZoomComponentOption} from 'echarts';
 import type {Location} from 'history';
 import cloneDeep from 'lodash/cloneDeep';
 import isEqual from 'lodash/isEqual';
@@ -84,8 +83,7 @@ import {
   SESSION_DURATION_ALERT,
   WidgetDescription,
 } from 'sentry/views/dashboards/widgetCard';
-import type {AugmentedEChartDataZoomHandler} from 'sentry/views/dashboards/widgetCard/chart';
-import WidgetCardChart, {SLIDER_HEIGHT} from 'sentry/views/dashboards/widgetCard/chart';
+import WidgetCardChart from 'sentry/views/dashboards/widgetCard/chart';
 import {
   DashboardsMEPProvider,
   useDashboardsMEPContext,
@@ -140,19 +138,10 @@ const shouldWidgetCardChartMemo = (prevProps, props) => {
   const sortMatches =
     props.location.query[WidgetViewerQueryField.SORT] ===
     prevProps.location.query[WidgetViewerQueryField.SORT];
-  const chartZoomOptionsMatches = isEqual(
-    props.chartZoomOptions,
-    prevProps.chartZoomOptions
-  );
   const isNotTopNWidget =
     props.widget.displayType !== DisplayType.TOP_N && !defined(props.widget.limit);
   const legendMatches = isEqual(props.legendOptions, prevProps.legendOptions);
-  return (
-    selectionMatches &&
-    chartZoomOptionsMatches &&
-    (sortMatches || isNotTopNWidget) &&
-    legendMatches
-  );
+  return selectionMatches && (sortMatches || isNotTopNWidget) && legendMatches;
 };
 
 // WidgetCardChartContainer and WidgetCardChart rerenders if selection was changed.
@@ -210,7 +199,6 @@ function WidgetViewerModal(props: Props) {
   const location = useLocation();
   const {projects} = useProjects();
   const navigate = useNavigate();
-  const shouldShowSlider = organization.features.includes('widget-viewer-modal-minimap');
   // TODO(Tele-Team): Re-enable this when we have a better way to determine if the data is transaction only
   // let widgetContentLoadingStatus: boolean | undefined = undefined;
   // Get widget zoom from location
@@ -234,33 +222,15 @@ function WidgetViewerModal(props: Props) {
 
   const [chartUnmodified, setChartUnmodified] = useState<boolean>(true);
 
-  const [chartZoomOptions, setChartZoomOptions] = useState<DataZoomComponentOption>({
-    start: 0,
-    end: 100,
-  });
-
-  // We wrap the modalChartSelection in a useRef because we do not want to recalculate this value
-  // (which would cause an unnecessary rerender on calculation) except for the initial load.
-  // We use this for when a user visit a widget viewer url directly.
-  const [modalTableSelection, setModalTableSelection] =
-    useState<PageFilters>(locationPageFilter);
-  const modalChartSelection = useRef(modalTableSelection);
+  const [modalSelection, setModalSelection] = useState<PageFilters>(locationPageFilter);
 
   // Detect when a user clicks back and set the PageFilter state to match the location
-  // We need to use useEffect to prevent infinite looping rerenders due to the setModalTableSelection call
+  // We need to use useEffect to prevent infinite looping rerenders due to the setModalSelection call
   useEffect(() => {
     if (location.action === 'POP') {
-      setModalTableSelection(locationPageFilter);
-      if (start && end) {
-        setChartZoomOptions({
-          startValue: moment.utc(start).unix() * 1000,
-          endValue: moment.utc(end).unix() * 1000,
-        });
-      } else {
-        setChartZoomOptions({start: 0, end: 100});
-      }
+      setModalSelection(locationPageFilter);
     }
-  }, [end, location, locationPageFilter, start]);
+  }, [location, locationPageFilter]);
 
   const [totalResults, setTotalResults] = useState<string | undefined>();
 
@@ -297,16 +267,16 @@ function WidgetViewerModal(props: Props) {
 
   // Create Table widget
   const tableWidget = {
-    ...cloneDeep({...widget, queries: [sortedQueries[selectedQueryIndex]]}),
+    ...cloneDeep({...widget, queries: [sortedQueries[selectedQueryIndex]!]}),
     displayType: DisplayType.TABLE,
   };
-  const {aggregates, columns} = tableWidget.queries[0];
-  const {orderby} = widget.queries[0];
+  const {aggregates, columns} = tableWidget.queries[0]!;
+  const {orderby} = widget.queries[0]!;
   const order = orderby.startsWith('-');
   const rawOrderby = trimStart(orderby, '-');
 
-  const fields = defined(tableWidget.queries[0].fields)
-    ? tableWidget.queries[0].fields
+  const fields = defined(tableWidget.queries[0]!.fields)
+    ? tableWidget.queries[0]!.fields
     : [...columns, ...aggregates];
 
   // Some Discover Widgets (Line, Area, Bar) allow the user to specify an orderby
@@ -339,8 +309,8 @@ function WidgetViewerModal(props: Props) {
 
   // Need to set the orderby of the eventsv2 query to equation[index] format
   // since eventsv2 does not accept the raw equation as a valid sort payload
-  if (isEquation(rawOrderby) && tableWidget.queries[0].orderby === orderby) {
-    tableWidget.queries[0].orderby = `${order ? '-' : ''}equation[${
+  if (isEquation(rawOrderby) && tableWidget.queries[0]!.orderby === orderby) {
+    tableWidget.queries[0]!.orderby = `${order ? '-' : ''}equation[${
       getNumEquations(fields) - 1
     }]`;
   }
@@ -381,8 +351,8 @@ function WidgetViewerModal(props: Props) {
     switch (widget.widgetType) {
       case WidgetType.DISCOVER:
         if (fields.length === 1) {
-          tableWidget.queries[0].orderby =
-            tableWidget.queries[0].orderby || `-${fields[0]}`;
+          tableWidget.queries[0]!.orderby =
+            tableWidget.queries[0]!.orderby || `-${fields[0]}`;
         }
         fields.unshift('title');
         columns.unshift('title');
@@ -398,8 +368,8 @@ function WidgetViewerModal(props: Props) {
 
   const eventView = eventViewFromWidget(
     tableWidget.title,
-    tableWidget.queries[0],
-    modalTableSelection
+    tableWidget.queries[0]!,
+    modalSelection
   );
 
   let columnOrder = decodeColumnOrder(
@@ -410,7 +380,7 @@ function WidgetViewerModal(props: Props) {
   const columnSortBy = eventView.getSorts();
   columnOrder = columnOrder.map((column, index) => ({
     ...column,
-    width: parseInt(widths[index], 10) || -1,
+    width: parseInt(widths[index]!, 10) || -1,
   }));
 
   const getOnDemandFilterWarning = createOnDemandFilterWarning(
@@ -685,7 +655,7 @@ function WidgetViewerModal(props: Props) {
             onResizeColumn,
           }}
         />
-        {!tableWidget.queries[0].orderby.match(/^-?release$/) &&
+        {!tableWidget.queries[0]!.orderby.match(/^-?release$/) &&
           (links?.previous?.results || links?.next?.results) && (
             <Pagination
               pageLinks={pageLinks}
@@ -712,33 +682,15 @@ function WidgetViewerModal(props: Props) {
     );
   };
 
-  const onZoom: AugmentedEChartDataZoomHandler = (evt, chart) => {
-    // @ts-expect-error getModel() is private but we need this to retrieve datetime values of zoomed in region
+  const onZoom = (_evt, chart) => {
     const model = chart.getModel();
-    const {seriesStart, seriesEnd} = evt;
-    let startValue, endValue;
-    startValue = model._payload.batch?.[0].startValue;
-    endValue = model._payload.batch?.[0].endValue;
-    const seriesStartTime = seriesStart ? new Date(seriesStart).getTime() : undefined;
-    const seriesEndTime = seriesEnd ? new Date(seriesEnd).getTime() : undefined;
-    // Slider zoom events don't contain the raw date time value, only the percentage
-    // We use the percentage with the start and end of the series to calculate the adjusted zoom
-    if (startValue === undefined || endValue === undefined) {
-      if (seriesStartTime && seriesEndTime) {
-        const diff = seriesEndTime - seriesStartTime;
-        startValue = diff * model._payload.start * 0.01 + seriesStartTime;
-        endValue = diff * model._payload.end * 0.01 + seriesStartTime;
-      } else {
-        return;
-      }
-    }
-    setChartZoomOptions({startValue, endValue});
+    const {startValue, endValue} = model._payload.batch[0];
     const newStart = getUtcDateString(moment.utc(startValue));
     const newEnd = getUtcDateString(moment.utc(endValue));
-    setModalTableSelection({
-      ...modalTableSelection,
+    setModalSelection({
+      ...modalSelection,
       datetime: {
-        ...modalTableSelection.datetime,
+        ...modalSelection.datetime,
         start: newStart,
         end: newEnd,
         period: null,
@@ -776,7 +728,7 @@ function WidgetViewerModal(props: Props) {
             api={api}
             organization={organization}
             widget={tableWidget}
-            selection={modalTableSelection}
+            selection={modalSelection}
             limit={
               widget.displayType === DisplayType.TABLE
                 ? FULL_TABLE_ITEM_LIMIT
@@ -801,7 +753,7 @@ function WidgetViewerModal(props: Props) {
             api={api}
             organization={organization}
             widget={tableWidget}
-            selection={modalTableSelection}
+            selection={modalSelection}
             limit={
               widget.displayType === DisplayType.TABLE
                 ? FULL_TABLE_ITEM_LIMIT
@@ -829,7 +781,7 @@ function WidgetViewerModal(props: Props) {
             api={api}
             organization={organization}
             widget={tableWidget}
-            selection={modalTableSelection}
+            selection={modalSelection}
             limit={
               widget.displayType === DisplayType.TABLE
                 ? FULL_TABLE_ITEM_LIMIT
@@ -875,16 +827,7 @@ function WidgetViewerModal(props: Props) {
           <Container
             height={
               widget.displayType !== DisplayType.BIG_NUMBER
-                ? HALF_CONTAINER_HEIGHT +
-                  (shouldShowSlider &&
-                  [
-                    DisplayType.AREA,
-                    DisplayType.LINE,
-                    DisplayType.BAR,
-                    DisplayType.TOP_N,
-                  ].includes(widget.displayType)
-                    ? SLIDER_HEIGHT
-                    : 0)
+                ? HALF_CONTAINER_HEIGHT
                 : BIG_NUMBER_HEIGHT
             }
           >
@@ -899,15 +842,16 @@ function WidgetViewerModal(props: Props) {
                 widget={widget}
                 selection={selection}
                 organization={organization}
-                onZoom={onZoom}
+                onZoom={(_evt, chart) => {
+                  onZoom(_evt, chart);
+                  setChartUnmodified(false);
+                }}
                 onLegendSelectChanged={onLegendSelectChanged}
                 legendOptions={{
                   selected: widgetLegendState.getWidgetSelectionState(widget),
                 }}
                 expandNumbers
-                showSlider={shouldShowSlider}
                 noPadding
-                chartZoomOptions={chartZoomOptions}
                 widgetLegendState={widgetLegendState}
               />
             ) : (
@@ -915,7 +859,7 @@ function WidgetViewerModal(props: Props) {
                 location={location}
                 api={api}
                 organization={organization}
-                selection={modalChartSelection.current}
+                selection={modalSelection}
                 dashboardFilters={dashboardFilters}
                 // Top N charts rely on the orderby of the table
                 widget={primaryWidget}
@@ -925,9 +869,7 @@ function WidgetViewerModal(props: Props) {
                   selected: widgetLegendState.getWidgetSelectionState(widget),
                 }}
                 expandNumbers
-                showSlider={shouldShowSlider}
                 noPadding
-                chartZoomOptions={chartZoomOptions}
                 widgetLegendState={widgetLegendState}
               />
             )}
@@ -940,7 +882,7 @@ function WidgetViewerModal(props: Props) {
             )}
           </Alert>
         )}
-        {(widget.queries.length > 1 || widget.queries[0].conditions) && (
+        {(widget.queries.length > 1 || widget.queries[0]!.conditions) && (
           <QueryContainer>
             <SelectControl
               value={selectedQueryIndex}
@@ -979,10 +921,10 @@ function WidgetViewerModal(props: Props) {
                         padding: `0 ${space(0.5)}`,
                       })}
                     >
-                      {queryOptions[selectedQueryIndex].getHighlightedQuery({
+                      {queryOptions[selectedQueryIndex]!.getHighlightedQuery({
                         display: 'block',
                       }) ??
-                        (queryOptions[selectedQueryIndex].label || (
+                        (queryOptions[selectedQueryIndex]!.label || (
                           <EmptyQueryContainer>{EMPTY_QUERY_NAME}</EmptyQueryContainer>
                         ))}
                     </components.SingleValue>
@@ -1096,7 +1038,7 @@ function WidgetViewerModal(props: Props) {
                           <OpenButton
                             widget={primaryWidget}
                             organization={organization}
-                            selection={modalTableSelection}
+                            selection={modalSelection}
                             selectedQueryIndex={selectedQueryIndex}
                             disabled={isUsingPerformanceScore(widget)}
                             disabledTooltip={
@@ -1161,7 +1103,7 @@ function OpenButton({
     default:
       openLabel = t('Open in Discover');
       path = getWidgetDiscoverUrl(
-        {...widget, queries: [widget.queries[selectedQueryIndex]]},
+        {...widget, queries: [widget.queries[selectedQueryIndex]!]},
         selection,
         organization,
         0,
diff --git a/static/app/components/modals/widgetViewerModal/widgetViewerTableCell.tsx b/static/app/components/modals/widgetViewerModal/widgetViewerTableCell.tsx
index f9899302ae5767..f0f7dfa3d3bd3c 100644
--- a/static/app/components/modals/widgetViewerModal/widgetViewerTableCell.tsx
+++ b/static/app/components/modals/widgetViewerModal/widgetViewerTableCell.tsx
@@ -80,7 +80,7 @@ export const renderIssueGridHeaderCell = ({
       <SortLink
         align={align}
         title={<StyledTooltip title={column.name}>{column.name}</StyledTooltip>}
-        direction={widget.queries[0].orderby === sortField ? 'desc' : undefined}
+        direction={widget.queries[0]!.orderby === sortField ? 'desc' : undefined}
         canSort={!!sortField}
         generateSortLink={() => ({
           ...location,
@@ -118,14 +118,14 @@ export const renderDiscoverGridHeaderCell = ({
     column: TableColumn<keyof TableDataRow>,
     _columnIndex: number
   ): React.ReactNode {
-    const {orderby} = widget.queries[0];
+    const {orderby} = widget.queries[0]!;
     // Need to convert orderby to aggregate alias because eventView still uses aggregate alias format
     const aggregateAliasOrderBy = `${
       orderby.startsWith('-') ? '-' : ''
     }${getAggregateAlias(trimStart(orderby, '-'))}`;
     const eventView = eventViewFromWidget(
       widget.title,
-      {...widget.queries[0], orderby: aggregateAliasOrderBy},
+      {...widget.queries[0]!, orderby: aggregateAliasOrderBy},
       selection
     );
     const tableMeta = tableData?.meta;
@@ -318,7 +318,7 @@ export const renderReleaseGridHeaderCell = ({
   ): React.ReactNode {
     const tableMeta = tableData?.meta;
     const align = fieldAlignment(column.name, column.type, tableMeta);
-    const widgetOrderBy = widget.queries[0].orderby;
+    const widgetOrderBy = widget.queries[0]!.orderby;
     const sort: Sort = {
       kind: widgetOrderBy.startsWith('-') ? 'desc' : 'asc',
       field: widgetOrderBy.startsWith('-') ? widgetOrderBy.slice(1) : widgetOrderBy,
diff --git a/static/app/components/nav/index.spec.tsx b/static/app/components/nav/index.spec.tsx
index 2572f9e5d50cbb..3ad846511a10e5 100644
--- a/static/app/components/nav/index.spec.tsx
+++ b/static/app/components/nav/index.spec.tsx
@@ -8,7 +8,7 @@ jest.mock('sentry/utils/analytics', () => ({
   trackAnalytics: jest.fn(),
 }));
 
-import {getAllByRole, render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
+import {render, screen, userEvent, within} from 'sentry-test/reactTestingLibrary';
 
 import Nav from 'sentry/components/nav';
 
@@ -30,30 +30,33 @@ const ALL_AVAILABLE_FEATURES = [
 
 describe('Nav', function () {
   describe('default', function () {
-    beforeEach(() => {
+    function renderNav() {
       render(<Nav />, {
         router: RouterFixture({
           location: LocationFixture({pathname: '/organizations/org-slug/issues/'}),
         }),
         organization: OrganizationFixture({features: ALL_AVAILABLE_FEATURES}),
       });
-    });
+    }
+
     it('renders primary navigation', async function () {
+      renderNav();
       expect(
         await screen.findByRole('navigation', {name: 'Primary Navigation'})
       ).toBeInTheDocument();
     });
     it('renders secondary navigation', async function () {
+      renderNav();
       expect(
         await screen.findByRole('navigation', {name: 'Secondary Navigation'})
       ).toBeInTheDocument();
     });
 
     it('renders expected primary nav items', function () {
-      const links = getAllByRole(
-        screen.getByRole('navigation', {name: 'Primary Navigation'}),
-        'link'
-      );
+      renderNav();
+      const links = within(
+        screen.getByRole('navigation', {name: 'Primary Navigation'})
+      ).getAllByRole('link');
       expect(links).toHaveLength(8);
 
       [
@@ -72,7 +75,7 @@ describe('Nav', function () {
   });
 
   describe('issues', function () {
-    beforeEach(() => {
+    function renderNav() {
       render(<Nav />, {
         router: RouterFixture({
           location: LocationFixture({
@@ -82,17 +85,19 @@ describe('Nav', function () {
         }),
         organization: OrganizationFixture({features: ALL_AVAILABLE_FEATURES}),
       });
-    });
+    }
 
     it('renders secondary navigation', async function () {
+      renderNav();
       expect(
         await screen.findByRole('navigation', {name: 'Secondary Navigation'})
       ).toBeInTheDocument();
     });
 
     it('includes expected submenu items', function () {
+      renderNav();
       const container = screen.getByRole('navigation', {name: 'Secondary Navigation'});
-      const links = getAllByRole(container, 'link');
+      const links = within(container).getAllByRole('link');
       expect(links).toHaveLength(6);
 
       ['All', 'Error & Outage', 'Trend', 'Craftsmanship', 'Security', 'Feedback'].forEach(
@@ -104,7 +109,7 @@ describe('Nav', function () {
   });
 
   describe('insights', function () {
-    beforeEach(() => {
+    function renderNav() {
       render(<Nav />, {
         router: RouterFixture({
           location: LocationFixture({
@@ -113,17 +118,19 @@ describe('Nav', function () {
         }),
         organization: OrganizationFixture({features: ALL_AVAILABLE_FEATURES}),
       });
-    });
+    }
 
     it('renders secondary navigation', async function () {
+      renderNav();
       expect(
         await screen.findByRole('navigation', {name: 'Secondary Navigation'})
       ).toBeInTheDocument();
     });
 
     it('includes expected submenu items', function () {
+      renderNav();
       const container = screen.getByRole('navigation', {name: 'Secondary Navigation'});
-      const links = getAllByRole(container, 'link');
+      const links = within(container).getAllByRole('link');
       expect(links).toHaveLength(4);
       ['Frontend', 'Backend', 'Mobile', 'AI'].forEach((title, index) => {
         expect(links[index]).toHaveAccessibleName(title);
@@ -132,24 +139,26 @@ describe('Nav', function () {
   });
 
   describe('explore', function () {
-    beforeEach(() => {
+    function renderNav() {
       render(<Nav />, {
         router: RouterFixture({
           location: LocationFixture({pathname: '/organizations/org-slug/traces/'}),
         }),
         organization: OrganizationFixture({features: ALL_AVAILABLE_FEATURES}),
       });
-    });
+    }
 
     it('renders secondary navigation', async function () {
+      renderNav();
       expect(
         await screen.findByRole('navigation', {name: 'Secondary Navigation'})
       ).toBeInTheDocument();
     });
 
     it('includes expected submenu items', function () {
+      renderNav();
       const container = screen.getByRole('navigation', {name: 'Secondary Navigation'});
-      const links = getAllByRole(container, 'link');
+      const links = within(container).getAllByRole('link');
       expect(links).toHaveLength(7);
       [
         'Traces',
@@ -166,16 +175,17 @@ describe('Nav', function () {
   });
 
   describe('analytics', function () {
-    beforeEach(() => {
+    function renderNav() {
       render(<Nav />, {
         router: RouterFixture({
           location: LocationFixture({pathname: '/organizations/org-slug/traces/'}),
         }),
         organization: OrganizationFixture({features: ALL_AVAILABLE_FEATURES}),
       });
-    });
+    }
 
     it('tracks primary sidebar item', async function () {
+      renderNav();
       const issues = screen.getByRole('link', {name: 'Issues'});
       await userEvent.click(issues);
       expect(trackAnalytics).toHaveBeenCalledWith(
diff --git a/static/app/components/nav/utils.tsx b/static/app/components/nav/utils.tsx
index 498162e743828d..5b509e01e8bb90 100644
--- a/static/app/components/nav/utils.tsx
+++ b/static/app/components/nav/utils.tsx
@@ -165,7 +165,7 @@ export function resolveNavItemTo(
     return undefined;
   }
   if (isSidebarItem(item) && isNonEmptyArray(item.submenu)) {
-    return item.submenu[0].to;
+    return item.submenu[0]!.to;
   }
   return undefined;
 }
diff --git a/static/app/components/notificationActions/forms/onCallServiceForm.tsx b/static/app/components/notificationActions/forms/onCallServiceForm.tsx
index 21aa0696c994ce..5dc690069abc34 100644
--- a/static/app/components/notificationActions/forms/onCallServiceForm.tsx
+++ b/static/app/components/notificationActions/forms/onCallServiceForm.tsx
@@ -41,7 +41,7 @@ function OnCallServiceForm({
 }: OnCallServiceFormProps) {
   const [selectedAccount, setSelectedAccount] = useState(
     action.integrationId
-      ? Integrations[action.integrationId][0].action.integrationName
+      ? Integrations[action.integrationId]![0]!.action.integrationName
       : ''
   );
   const [selectedDisplay, setSelectedDisplay] = useState(action.targetDisplay ?? '');
@@ -67,7 +67,7 @@ function OnCallServiceForm({
     if (!action.integrationId) {
       return [];
     }
-    const services = Integrations[action.integrationId];
+    const services = Integrations[action.integrationId]!;
     return services.map<MenuItemProps>(service => ({
       key: service.action.targetDisplay ?? '',
       label: service.action.targetDisplay,
diff --git a/static/app/components/notificationActions/notificationActionManager.spec.tsx b/static/app/components/notificationActions/notificationActionManager.spec.tsx
index 0e91aaea1b81b7..1f09cda2e977cb 100644
--- a/static/app/components/notificationActions/notificationActionManager.spec.tsx
+++ b/static/app/components/notificationActions/notificationActionManager.spec.tsx
@@ -86,7 +86,7 @@ describe('Adds, deletes, and updates notification actions', function () {
       />
     );
     const projectNotificationActions = screen.queryAllByTestId('notification-action');
-    expect(projectNotificationActions.length).toBe(4);
+    expect(projectNotificationActions).toHaveLength(4);
   });
 
   it('disables buttons and dropdowns when disabled is True', function () {
@@ -97,7 +97,7 @@ describe('Adds, deletes, and updates notification actions', function () {
     render(
       <NotificationActionManager
         updateAlertCount={jest.fn()}
-        actions={[notificationActions[0]]}
+        actions={[notificationActions[0]!]}
         availableActions={availableActions}
         recipientRoles={['owner', 'manager']}
         project={project}
@@ -140,7 +140,7 @@ describe('Adds, deletes, and updates notification actions', function () {
     expect(screen.getByText('Send a Pagerduty notification')).toBeInTheDocument();
     expect(screen.getByText('Send an Opsgenie notification')).toBeInTheDocument();
 
-    expect(screen.queryByTestId('sentry_notification-form')).toBeInTheDocument();
+    expect(screen.getByTestId('sentry_notification-form')).toBeInTheDocument();
 
     await userEvent.click(screen.getByText('Save'));
     expect(mockPOST).toHaveBeenCalledWith(
@@ -157,20 +157,20 @@ describe('Adds, deletes, and updates notification actions', function () {
       })
     );
     await waitFor(() => {
-      expect(screen.queryByTestId('sentry_notification-action')).toBeInTheDocument();
+      expect(screen.getByTestId('sentry_notification-action')).toBeInTheDocument();
     });
   });
 
   it('Removes a Sentry notification action', async function () {
     const mockDELETE = MockApiClient.addMockResponse({
-      url: `/organizations/${organization.slug}/notifications/actions/${notificationActions[0].id}/`,
+      url: `/organizations/${organization.slug}/notifications/actions/${notificationActions[0]!.id}/`,
       method: 'DELETE',
       body: [],
     });
     render(
       <NotificationActionManager
         updateAlertCount={jest.fn()}
-        actions={[notificationActions[0]]}
+        actions={[notificationActions[0]!]}
         availableActions={availableActions}
         recipientRoles={['owner', 'manager']}
         project={project}
@@ -205,7 +205,7 @@ describe('Adds, deletes, and updates notification actions', function () {
     await userEvent.click(screen.getByText('Add Action'));
     await userEvent.click(screen.getByText('Send a Slack notification'));
 
-    expect(screen.queryByTestId('slack-form')).toBeInTheDocument();
+    expect(screen.getByTestId('slack-form')).toBeInTheDocument();
     expect(screen.getByText('sentry-ecosystem')).toBeInTheDocument();
 
     // Select workspace
@@ -231,20 +231,20 @@ describe('Adds, deletes, and updates notification actions', function () {
       })
     );
     await waitFor(() => {
-      expect(screen.queryByTestId('slack-action')).toBeInTheDocument();
+      expect(screen.getByTestId('slack-action')).toBeInTheDocument();
     });
   });
 
   it('Removes a Slack action', async function () {
     const mockDELETE = MockApiClient.addMockResponse({
-      url: `/organizations/${organization.slug}/notifications/actions/${notificationActions[1].id}/`,
+      url: `/organizations/${organization.slug}/notifications/actions/${notificationActions[1]!.id}/`,
       method: 'DELETE',
       body: [],
     });
     render(
       <NotificationActionManager
         updateAlertCount={jest.fn()}
-        actions={[notificationActions[1]]}
+        actions={[notificationActions[1]!]}
         availableActions={availableActions}
         recipientRoles={['owner', 'manager']}
         project={project}
@@ -262,7 +262,7 @@ describe('Adds, deletes, and updates notification actions', function () {
 
   it('Edits a Slack action', async function () {
     const mockPUT = MockApiClient.addMockResponse({
-      url: `/organizations/${organization.slug}/notifications/actions/${notificationActions[1].id}/`,
+      url: `/organizations/${organization.slug}/notifications/actions/${notificationActions[1]!.id}/`,
       method: 'PUT',
       body: [
         {
@@ -282,7 +282,7 @@ describe('Adds, deletes, and updates notification actions', function () {
     render(
       <NotificationActionManager
         updateAlertCount={jest.fn()}
-        actions={[notificationActions[1]]}
+        actions={[notificationActions[1]!]}
         availableActions={availableActions}
         recipientRoles={['owner', 'manager']}
         project={project}
@@ -306,7 +306,7 @@ describe('Adds, deletes, and updates notification actions', function () {
     await userEvent.click(screen.getByText('Save'));
 
     expect(mockPUT).toHaveBeenCalledWith(
-      `/organizations/${organization.slug}/notifications/actions/${notificationActions[1].id}/`,
+      `/organizations/${organization.slug}/notifications/actions/${notificationActions[1]!.id}/`,
       expect.objectContaining({
         data: expect.objectContaining({
           id: 3,
@@ -340,7 +340,7 @@ describe('Adds, deletes, and updates notification actions', function () {
     await userEvent.click(screen.getByText('Add Action'));
     await userEvent.click(screen.getByText('Send a Pagerduty notification'));
 
-    expect(screen.queryByTestId('pagerduty-form')).toBeInTheDocument();
+    expect(screen.getByTestId('pagerduty-form')).toBeInTheDocument();
 
     // Use default account
     expect(screen.getByText('sentry-enterprise')).toBeInTheDocument();
@@ -367,13 +367,13 @@ describe('Adds, deletes, and updates notification actions', function () {
       })
     );
     await waitFor(() => {
-      expect(screen.queryByTestId('pagerduty-action')).toBeInTheDocument();
+      expect(screen.getByTestId('pagerduty-action')).toBeInTheDocument();
     });
   });
 
   it('Edits a Pagerduty action', async function () {
     const mockPUT = MockApiClient.addMockResponse({
-      url: `/organizations/${organization.slug}/notifications/actions/${notificationActions[2].id}/`,
+      url: `/organizations/${organization.slug}/notifications/actions/${notificationActions[2]!.id}/`,
       method: 'PUT',
       body: [
         {
@@ -393,7 +393,7 @@ describe('Adds, deletes, and updates notification actions', function () {
     render(
       <NotificationActionManager
         updateAlertCount={jest.fn()}
-        actions={[notificationActions[2]]}
+        actions={[notificationActions[2]!]}
         availableActions={availableActions}
         recipientRoles={['owner', 'manager']}
         project={project}
@@ -410,7 +410,7 @@ describe('Adds, deletes, and updates notification actions', function () {
     await userEvent.click(screen.getByText('Save'));
 
     expect(mockPUT).toHaveBeenCalledWith(
-      `/organizations/${organization.slug}/notifications/actions/${notificationActions[2].id}/`,
+      `/organizations/${organization.slug}/notifications/actions/${notificationActions[2]!.id}/`,
       expect.objectContaining({
         data: expect.objectContaining({
           id: 4,
@@ -445,7 +445,7 @@ describe('Adds, deletes, and updates notification actions', function () {
     await userEvent.click(screen.getByText('Add Action'));
     await userEvent.click(screen.getByText('Send an Opsgenie notification'));
 
-    expect(screen.queryByTestId('opsgenie-form')).toBeInTheDocument();
+    expect(screen.getByTestId('opsgenie-form')).toBeInTheDocument();
 
     // Use default account
     expect(screen.getByText('sentry-enterprise')).toBeInTheDocument();
@@ -472,13 +472,13 @@ describe('Adds, deletes, and updates notification actions', function () {
       })
     );
     await waitFor(() => {
-      expect(screen.queryByTestId('opsgenie-action')).toBeInTheDocument();
+      expect(screen.getByTestId('opsgenie-action')).toBeInTheDocument();
     });
   });
 
   it('Edits an Opsgenie Action', async function () {
     const mockPUT = MockApiClient.addMockResponse({
-      url: `/organizations/${organization.slug}/notifications/actions/${notificationActions[3].id}/`,
+      url: `/organizations/${organization.slug}/notifications/actions/${notificationActions[3]!.id}/`,
       method: 'PUT',
       body: [
         {
@@ -498,7 +498,7 @@ describe('Adds, deletes, and updates notification actions', function () {
     render(
       <NotificationActionManager
         updateAlertCount={jest.fn()}
-        actions={[notificationActions[3]]}
+        actions={[notificationActions[3]!]}
         availableActions={availableActions}
         recipientRoles={['owner', 'manager']}
         project={project}
@@ -515,7 +515,7 @@ describe('Adds, deletes, and updates notification actions', function () {
     await userEvent.click(screen.getByText('Save'));
 
     expect(mockPUT).toHaveBeenCalledWith(
-      `/organizations/${organization.slug}/notifications/actions/${notificationActions[3].id}/`,
+      `/organizations/${organization.slug}/notifications/actions/${notificationActions[3]!.id}/`,
       expect.objectContaining({
         data: expect.objectContaining({
           id: 5,
diff --git a/static/app/components/notificationActions/notificationActionManager.tsx b/static/app/components/notificationActions/notificationActionManager.tsx
index 64bdd9ed79229e..670ae126152be2 100644
--- a/static/app/components/notificationActions/notificationActionManager.tsx
+++ b/static/app/components/notificationActions/notificationActionManager.tsx
@@ -127,7 +127,7 @@ function NotificationActionManager({
         const integrationId = service.action.integrationId;
         if (integrationId) {
           if (integrationId in integrations) {
-            integrations[integrationId].push(service);
+            integrations[integrationId]!.push(service);
           } else {
             integrations[integrationId] = [service];
           }
@@ -143,7 +143,7 @@ function NotificationActionManager({
         const integrationId = team.action.integrationId;
         if (integrationId) {
           if (integrationId in integrations) {
-            integrations[integrationId].push(team);
+            integrations[integrationId]!.push(team);
           } else {
             integrations[integrationId] = [team];
           }
@@ -207,7 +207,7 @@ function NotificationActionManager({
         label,
         onAction: () => {
           // Add notification action
-          const updatedActions = [...notificationActions, validActions[0].action];
+          const updatedActions = [...notificationActions, validActions[0]!.action];
           setNotificationActions(updatedActions);
         },
       });
diff --git a/static/app/components/onboarding/documentationWrapper.tsx b/static/app/components/onboarding/documentationWrapper.tsx
deleted file mode 100644
index 978acc8b22e903..00000000000000
--- a/static/app/components/onboarding/documentationWrapper.tsx
+++ /dev/null
@@ -1,88 +0,0 @@
-import styled from '@emotion/styled';
-
-import type {AlertProps} from 'sentry/components/alert';
-import {alertStyles} from 'sentry/components/alert';
-import {space} from 'sentry/styles/space';
-
-type AlertType = AlertProps['type'];
-
-const getAlertSelector = (type: AlertType) =>
-  type === 'muted' ? null : `.alert[level="${type}"], .alert-${type}`;
-
-export const DocumentationWrapper = styled('div')`
-  /* Size of the new footer + 16px */
-  padding-bottom: calc(72px + ${space(2)});
-
-  h2 {
-    font-size: 1.375rem;
-  }
-
-  h3 {
-    font-size: 1.25rem;
-  }
-
-  h1,
-  h2,
-  h3,
-  h4,
-  h5,
-  h6,
-  p,
-  ul,
-  ol,
-  li {
-    margin-top: 0.5em;
-    margin-bottom: 0.5em;
-  }
-
-  blockquote,
-  hr,
-  pre,
-  pre[class*='language-'],
-  div[data-language] {
-    margin-top: 1em;
-    margin-bottom: 1em;
-  }
-
-  blockquote {
-    padding: ${space(1.5)} ${space(2)};
-    ${p => alertStyles({theme: p.theme, type: 'info'})}
-  }
-
-  blockquote > * {
-    margin: 0;
-  }
-
-  .gatsby-highlight:last-child {
-    margin-bottom: 0;
-  }
-
-  hr {
-    border-color: ${p => p.theme.border};
-  }
-
-  code {
-    color: ${p => p.theme.pink400};
-  }
-
-  .alert {
-    border-radius: ${p => p.theme.borderRadius};
-  }
-
-  /**
-   * XXX(epurkhiser): This comes from the doc styles and avoids bottom margin issues in alerts
-  */
-  .content-flush-bottom *:last-child {
-    margin-bottom: 0;
-  }
-
-  ${p =>
-    Object.keys(p.theme.alert).map(
-      type => `
-        ${getAlertSelector(type as AlertType)} {
-          ${alertStyles({theme: p.theme, type: type as AlertType})};
-          display: block;
-        }
-      `
-    )}
-`;
diff --git a/static/app/components/onboarding/frameworkSuggestionModal.tsx b/static/app/components/onboarding/frameworkSuggestionModal.tsx
index a35999e131881e..187ff72a4cfc13 100644
--- a/static/app/components/onboarding/frameworkSuggestionModal.tsx
+++ b/static/app/components/onboarding/frameworkSuggestionModal.tsx
@@ -313,7 +313,7 @@ function TopFrameworksImage({frameworks}: {frameworks: PlatformIntegration[]}) {
     <TopFrameworksImageWrapper>
       <TopFrameworkIcon
         size={84}
-        platform={top3[1].id}
+        platform={top3[1]!.id}
         angle={-34}
         radius={8}
         offset={-74}
@@ -321,7 +321,7 @@ function TopFrameworksImage({frameworks}: {frameworks: PlatformIntegration[]}) {
       />
       <TopFrameworkIcon
         size={84}
-        platform={top3[2].id}
+        platform={top3[2]!.id}
         angle={34}
         radius={8}
         offset={+74}
@@ -329,7 +329,7 @@ function TopFrameworksImage({frameworks}: {frameworks: PlatformIntegration[]}) {
       />
       <TopFrameworkIcon
         size={84}
-        platform={top3[0].id}
+        platform={top3[0]!.id}
         angle={0}
         radius={8}
         offset={0}
diff --git a/static/app/components/onboarding/gettingStartedDoc/onboardingCodeSnippet.spec.tsx b/static/app/components/onboarding/gettingStartedDoc/onboardingCodeSnippet.spec.tsx
index a30b50b9715472..bc9db662c00fcd 100644
--- a/static/app/components/onboarding/gettingStartedDoc/onboardingCodeSnippet.spec.tsx
+++ b/static/app/components/onboarding/gettingStartedDoc/onboardingCodeSnippet.spec.tsx
@@ -7,11 +7,11 @@ describe('replaceTokenWithSpan', function () {
       '<span class="token assign-left variable">SENTRY_AUTH_TOKEN</span><span class="token operator">=</span>___ORG_AUTH_TOKEN___';
     const tokenNodes = replaceTokensWithSpan(element);
 
-    expect(element.innerHTML).toEqual(
+    expect(element.innerHTML).toBe(
       '<span class="token assign-left variable">SENTRY_AUTH_TOKEN</span><span class="token operator">=</span><span data-token="___ORG_AUTH_TOKEN___"></span>'
     );
     expect(tokenNodes).toHaveLength(1);
-    expect(element.contains(tokenNodes[0])).toBe(true);
+    expect(element.contains(tokenNodes[0]!)).toBe(true);
   });
 
   it('replaces multiple ___ORG_AUTH_TOKEN___ tokens', function () {
@@ -22,14 +22,14 @@ const assetUrl = '___ORG_AUTH_TOKEN___';
 `;
     const tokenNodes = replaceTokensWithSpan(element);
 
-    expect(element.innerHTML).toEqual(
+    expect(element.innerHTML).toBe(
       `
 const cdn = '<span data-token="___ORG_AUTH_TOKEN___"></span>';
 const assetUrl = '<span data-token="___ORG_AUTH_TOKEN___"></span>';
 `
     );
     expect(tokenNodes).toHaveLength(2);
-    expect(element.contains(tokenNodes[0])).toBe(true);
-    expect(element.contains(tokenNodes[1])).toBe(true);
+    expect(element.contains(tokenNodes[0]!)).toBe(true);
+    expect(element.contains(tokenNodes[1]!)).toBe(true);
   });
 });
diff --git a/static/app/components/onboarding/gettingStartedDoc/step.tsx b/static/app/components/onboarding/gettingStartedDoc/step.tsx
index 862d864e8afdad..2233c1a4e45490 100644
--- a/static/app/components/onboarding/gettingStartedDoc/step.tsx
+++ b/static/app/components/onboarding/gettingStartedDoc/step.tsx
@@ -53,8 +53,8 @@ export function TabbedCodeSnippet({
   onSelectAndCopy,
   partialLoading,
 }: TabbedCodeSnippetProps) {
-  const [selectedTabValue, setSelectedTabValue] = useState(tabs[0].value);
-  const selectedTab = tabs.find(tab => tab.value === selectedTabValue) ?? tabs[0];
+  const [selectedTabValue, setSelectedTabValue] = useState(tabs[0]!.value);
+  const selectedTab = tabs.find(tab => tab.value === selectedTabValue) ?? tabs[0]!;
   const {code, language, filename} = selectedTab;
 
   return (
diff --git a/static/app/components/onboarding/gettingStartedDoc/types.ts b/static/app/components/onboarding/gettingStartedDoc/types.ts
index 54e05444dd473f..852b6c0f21f222 100644
--- a/static/app/components/onboarding/gettingStartedDoc/types.ts
+++ b/static/app/components/onboarding/gettingStartedDoc/types.ts
@@ -111,6 +111,7 @@ export interface Docs<PlatformOptions extends BasePlatformOptions = BasePlatform
   customMetricsOnboarding?: OnboardingConfig<PlatformOptions>;
   featureFlagOnboarding?: OnboardingConfig<PlatformOptions>;
   feedbackOnboardingCrashApi?: OnboardingConfig<PlatformOptions>;
+  feedbackOnboardingJsLoader?: OnboardingConfig<PlatformOptions>;
   feedbackOnboardingNpm?: OnboardingConfig<PlatformOptions>;
   performanceOnboarding?: OnboardingConfig<PlatformOptions>;
   platformOptions?: PlatformOptions;
@@ -123,6 +124,7 @@ export type ConfigType =
   | 'onboarding'
   | 'feedbackOnboardingNpm'
   | 'feedbackOnboardingCrashApi'
+  | 'feedbackOnboardingJsLoader'
   | 'crashReportOnboarding'
   | 'replayOnboarding'
   | 'replayOnboardingJsLoader'
diff --git a/static/app/components/onboarding/gettingStartedDoc/utils/feedbackOnboarding.tsx b/static/app/components/onboarding/gettingStartedDoc/utils/feedbackOnboarding.tsx
index 72e15c3a8dba34..abc989a265a5d5 100644
--- a/static/app/components/onboarding/gettingStartedDoc/utils/feedbackOnboarding.tsx
+++ b/static/app/components/onboarding/gettingStartedDoc/utils/feedbackOnboarding.tsx
@@ -155,13 +155,13 @@ export function getCrashReportSDKInstallFirstStep(params: DocsParams) {
     params.sourcePackageRegistries && !params.sourcePackageRegistries.isLoading;
   const version =
     (dataLoaded &&
-      params.sourcePackageRegistries.data?.['sentry.javascript.browser'].version) ??
+      params.sourcePackageRegistries.data?.['sentry.javascript.browser']!.version) ??
     '';
   const hash =
     (dataLoaded &&
-      params.sourcePackageRegistries.data?.['sentry.javascript.browser'].files[
+      params.sourcePackageRegistries.data?.['sentry.javascript.browser']!.files[
         'bundle.min.js'
-      ].checksums['sha384-base64']) ??
+      ]!.checksums['sha384-base64']) ??
     '';
 
   return {
@@ -242,13 +242,13 @@ export function getCrashReportSDKInstallFirstStepRails(params: DocsParams) {
     params.sourcePackageRegistries && !params.sourcePackageRegistries.isLoading;
   const version =
     (dataLoaded &&
-      params.sourcePackageRegistries.data?.['sentry.javascript.browser'].version) ??
+      params.sourcePackageRegistries.data?.['sentry.javascript.browser']!.version) ??
     '';
   const hash =
     (dataLoaded &&
-      params.sourcePackageRegistries.data?.['sentry.javascript.browser'].files[
+      params.sourcePackageRegistries.data?.['sentry.javascript.browser']!.files[
         'bundle.min.js'
-      ].checksums['sha384-base64']) ??
+      ]!.checksums['sha384-base64']) ??
     '';
 
   return {
diff --git a/static/app/components/onboarding/gettingStartedDoc/utils/useCurrentProjectState.spec.tsx b/static/app/components/onboarding/gettingStartedDoc/utils/useCurrentProjectState.spec.tsx
index d0dac3f24ad4a5..540ce2b51bac9f 100644
--- a/static/app/components/onboarding/gettingStartedDoc/utils/useCurrentProjectState.spec.tsx
+++ b/static/app/components/onboarding/gettingStartedDoc/utils/useCurrentProjectState.spec.tsx
@@ -80,7 +80,7 @@ describe('useCurrentProjectState', () => {
       },
       wrapper: createWrapper(),
     });
-    expect(result.current.currentProject).toBe(undefined);
+    expect(result.current.currentProject).toBeUndefined();
   });
 
   it('should return currentProject=undefined when project url param is present and currentPanel != targetPanel', () => {
@@ -95,7 +95,7 @@ describe('useCurrentProjectState', () => {
       },
       wrapper: createWrapper(angular.id),
     });
-    expect(result.current.currentProject).toBe(undefined);
+    expect(result.current.currentProject).toBeUndefined();
   });
 
   it('should return the currentProject when currentPanel = targetPanel', () => {
@@ -185,7 +185,7 @@ describe('useCurrentProjectState', () => {
       },
       wrapper: createWrapper(),
     });
-    expect(result.current.currentProject).toBe(undefined);
+    expect(result.current.currentProject).toBeUndefined();
   });
 
   it('should override current project if setCurrentProjects is called', () => {
diff --git a/static/app/components/onboarding/platformOptionsControl.tsx b/static/app/components/onboarding/platformOptionsControl.tsx
index 7d7588781a6fde..1253ec46ad5822 100644
--- a/static/app/components/onboarding/platformOptionsControl.tsx
+++ b/static/app/components/onboarding/platformOptionsControl.tsx
@@ -26,8 +26,8 @@ export function useUrlPlatformOptions<PlatformOptions extends BasePlatformOption
     }
 
     return Object.keys(platformOptions).reduce((acc, key) => {
-      const defaultValue = platformOptions[key].defaultValue;
-      const values = platformOptions[key].items.map(({value}) => value);
+      const defaultValue = platformOptions[key]!.defaultValue;
+      const values = platformOptions[key]!.items.map(({value}) => value);
       acc[key as keyof PlatformOptions] = values.includes(query[key])
         ? query[key]
         : defaultValue ?? values[0];
@@ -100,7 +100,7 @@ export function PlatformOptionsControl({
         <OptionControl
           key={key}
           option={platformOption}
-          value={urlOptionValues[key] ?? platformOption.items[0]?.value}
+          value={urlOptionValues[key]! ?? platformOption.items[0]?.value}
           onChange={value => handleChange(key, value)}
         />
       ))}
diff --git a/static/app/components/onboardingWizard/deprecatedNewSidebar.tsx b/static/app/components/onboardingWizard/deprecatedNewSidebar.tsx
new file mode 100644
index 00000000000000..d4833f619a4aa0
--- /dev/null
+++ b/static/app/components/onboardingWizard/deprecatedNewSidebar.tsx
@@ -0,0 +1,525 @@
+import {Fragment, useCallback, useEffect, useMemo, useState} from 'react';
+import {css} from '@emotion/react';
+import styled from '@emotion/styled';
+import {motion} from 'framer-motion';
+import partition from 'lodash/partition';
+
+import HighlightTopRight from 'sentry-images/pattern/highlight-top-right.svg';
+
+import {navigateTo} from 'sentry/actionCreators/navigation';
+import {updateOnboardingTask} from 'sentry/actionCreators/onboardingTasks';
+import {Button} from 'sentry/components/button';
+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 {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';
+import {Tooltip} from 'sentry/components/tooltip';
+import {IconCheckmark, IconClose, IconNot, IconSync} from 'sentry/icons';
+import {t, tct} from 'sentry/locale';
+import DemoWalkthroughStore from 'sentry/stores/demoWalkthroughStore';
+import {space} from 'sentry/styles/space';
+import {
+  type OnboardingTask,
+  OnboardingTaskKey,
+  type OnboardingTaskStatus,
+} from 'sentry/types/onboarding';
+import {trackAnalytics} from 'sentry/utils/analytics';
+import {isDemoModeEnabled} from 'sentry/utils/demoMode';
+import useApi from 'sentry/utils/useApi';
+import {useLocalStorageState} from 'sentry/utils/useLocalStorageState';
+import useOrganization from 'sentry/utils/useOrganization';
+import useRouter from 'sentry/utils/useRouter';
+
+const orderedGettingStartedTasks = [
+  OnboardingTaskKey.FIRST_PROJECT,
+  OnboardingTaskKey.FIRST_EVENT,
+  OnboardingTaskKey.INVITE_MEMBER,
+  OnboardingTaskKey.ALERT_RULE,
+  OnboardingTaskKey.SOURCEMAPS,
+  OnboardingTaskKey.RELEASE_TRACKING,
+  OnboardingTaskKey.LINK_SENTRY_TO_SOURCE_CODE,
+];
+
+const orderedBeyondBasicsTasks = [
+  OnboardingTaskKey.REAL_TIME_NOTIFICATIONS,
+  OnboardingTaskKey.SESSION_REPLAY,
+  OnboardingTaskKey.FIRST_TRANSACTION,
+  OnboardingTaskKey.SECOND_PLATFORM,
+];
+
+function groupTasksByCompletion(tasks: OnboardingTask[]) {
+  const [completedTasks, incompletedTasks] = partition(tasks, task => taskIsDone(task));
+  return {
+    completedTasks,
+    incompletedTasks,
+  };
+}
+
+interface TaskProps extends Pick<OnboardingTaskStatus, 'status'> {
+  hidePanel: () => void;
+  task: OnboardingTask;
+  completed?: boolean;
+  showWaitingIndicator?: boolean;
+}
+
+function Task({task, status, hidePanel, showWaitingIndicator}: TaskProps) {
+  const api = useApi();
+  const organization = useOrganization();
+  const router = useRouter();
+
+  const handleClick = useCallback(
+    (e: React.MouseEvent) => {
+      trackAnalytics('quick_start.task_card_clicked', {
+        organization,
+        todo_id: task.task,
+        todo_title: task.title,
+        action: 'clickthrough',
+        new_experience: true,
+      });
+
+      e.stopPropagation();
+
+      if (isDemoModeEnabled()) {
+        DemoWalkthroughStore.activateGuideAnchor(task.task);
+      }
+
+      if (task.actionType === 'external') {
+        window.open(task.location, '_blank');
+      }
+
+      if (task.actionType === 'action') {
+        task.action(router);
+      }
+
+      if (task.actionType === 'app') {
+        // Convert all paths to a location object
+        let to =
+          typeof task.location === 'string' ? {pathname: task.location} : task.location;
+        // Add referrer to all links
+        to = {...to, query: {...to.query, referrer: 'onboarding_task'}};
+
+        navigateTo(to, router);
+      }
+      hidePanel();
+    },
+    [task, organization, router, hidePanel]
+  );
+
+  const handleMarkSkipped = useCallback(
+    (taskKey: OnboardingTaskKey) => {
+      trackAnalytics('quick_start.task_card_clicked', {
+        organization,
+        todo_id: task.task,
+        todo_title: task.title,
+        action: 'skipped',
+        new_experience: true,
+      });
+      updateOnboardingTask(api, organization, {
+        task: taskKey,
+        status: 'skipped',
+        completionSeen: true,
+      });
+    },
+    [task, organization, api]
+  );
+
+  if (status === 'complete') {
+    return (
+      <TaskWrapper css={taskCompletedCss}>
+        <strong>{task.title}</strong>
+        <Tooltip title={t('Task completed')} containerDisplayMode="flex">
+          <IconCheckmark color="green300" isCircled />
+        </Tooltip>
+      </TaskWrapper>
+    );
+  }
+
+  if (status === 'skipped') {
+    return (
+      <TaskWrapper css={taskCompletedCss}>
+        <strong>{task.title}</strong>
+        <Tooltip title={t('Task skipped')} containerDisplayMode="flex">
+          <IconNot color="gray300" />
+        </Tooltip>
+      </TaskWrapper>
+    );
+  }
+
+  return (
+    <TaskWrapper onClick={handleClick} css={taskIncompleteCss}>
+      <InteractionStateLayer />
+      <div>
+        <strong>{task.title}</strong>
+        <p>{task.description}</p>
+      </div>
+      {task.requisiteTasks.length === 0 && (
+        <TaskActions>
+          {task.skippable && (
+            <SkipConfirm onSkip={() => handleMarkSkipped(task.task)}>
+              {({skip}) => (
+                <Button
+                  borderless
+                  size="zero"
+                  aria-label={t('Close')}
+                  icon={<IconClose size="xs" color="gray300" />}
+                  onClick={skip}
+                  css={css`
+                    /* If the pulsing indicator is active, the close button
+                     * should be above it so it's clickable.
+                     */
+                    z-index: 1;
+                  `}
+                />
+              )}
+            </SkipConfirm>
+          )}
+          {task.SupplementComponent && showWaitingIndicator && (
+            <task.SupplementComponent task={task} />
+          )}
+          {status === 'pending' && (
+            <Tooltip
+              title={task.pendingTitle ?? t('Task in progress\u2026')}
+              containerDisplayMode="flex"
+              css={css`
+                justify-content: center;
+                cursor: default;
+              `}
+            >
+              <IconSync color="pink400" />
+            </Tooltip>
+          )}
+        </TaskActions>
+      )}
+    </TaskWrapper>
+  );
+}
+
+interface TaskGroupProps {
+  description: string;
+  /**
+   * Used for analytics
+   */
+  group: 'getting_started' | 'beyond_basics';
+  hidePanel: () => void;
+  taskKeyForWaitingIndicator: OnboardingTaskKey | undefined;
+  tasks: OnboardingTask[];
+  title: string;
+  expanded?: boolean;
+  toggleable?: boolean;
+}
+
+function TaskGroup({
+  title,
+  description,
+  tasks,
+  expanded,
+  hidePanel,
+  taskKeyForWaitingIndicator,
+  toggleable = true,
+  group,
+}: TaskGroupProps) {
+  const organization = useOrganization();
+  const [isExpanded, setIsExpanded] = useState(expanded);
+  const {completedTasks, incompletedTasks} = groupTasksByCompletion(tasks);
+  const [taskGroupComplete, setTaskGroupComplete] = useLocalStorageState(
+    `quick-start:${organization.slug}:${group}-completed`,
+    false
+  );
+
+  useEffect(() => {
+    setIsExpanded(expanded);
+  }, [expanded]);
+
+  useEffect(() => {
+    if (completedTasks.length !== tasks.length || taskGroupComplete) {
+      return;
+    }
+
+    trackAnalytics('quick_start.task_group_completed', {
+      organization,
+      group,
+    });
+
+    setTaskGroupComplete(true);
+  }, [
+    group,
+    organization,
+    completedTasks,
+    tasks,
+    setTaskGroupComplete,
+    taskGroupComplete,
+  ]);
+
+  return (
+    <TaskGroupWrapper>
+      <TaskGroupHeader
+        role="button"
+        onClick={toggleable ? () => setIsExpanded(!isExpanded) : undefined}
+      >
+        {toggleable && <InteractionStateLayer />}
+        <div>
+          <TaskGroupTitle>
+            <strong>{title}</strong>
+            {incompletedTasks.length === 0 && (
+              <Tooltip title={t('All tasks completed')} containerDisplayMode="flex">
+                <IconCheckmark color="green300" isCircled />
+              </Tooltip>
+            )}
+          </TaskGroupTitle>
+          <p>{description}</p>
+        </div>
+        {toggleable && (
+          <Chevron
+            direction={isExpanded ? 'up' : 'down'}
+            role="presentation"
+            size="large"
+          />
+        )}
+      </TaskGroupHeader>
+      {isExpanded && (
+        <Fragment>
+          <hr />
+          <TaskGroupBody>
+            <TaskGroupProgress>
+              {tct('[totalCompletedTasks] out of [totalTasks] tasks completed', {
+                totalCompletedTasks: completedTasks.length,
+                totalTasks: tasks.length,
+              })}
+              <ProgressRing
+                value={(completedTasks.length / tasks.length) * 100}
+                progressEndcaps="round"
+                size={16}
+                barWidth={2}
+              />
+            </TaskGroupProgress>
+            {incompletedTasks.map(task => (
+              <Task
+                key={task.task}
+                task={task}
+                hidePanel={hidePanel}
+                showWaitingIndicator={taskKeyForWaitingIndicator === task.task}
+                status={task.status}
+              />
+            ))}
+            {completedTasks.length > 0 && (
+              <Fragment>
+                <TaskGroupProgress completed>{t('Completed')}</TaskGroupProgress>
+                {completedTasks.map(task => (
+                  <Task
+                    key={task.task}
+                    task={task}
+                    hidePanel={hidePanel}
+                    status={task.status}
+                  />
+                ))}
+              </Fragment>
+            )}
+          </TaskGroupBody>
+        </Fragment>
+      )}
+    </TaskGroupWrapper>
+  );
+}
+
+interface NewSidebarProps
+  extends Pick<CommonSidebarProps, 'orientation' | 'collapsed'>,
+    Pick<
+      ReturnType<typeof useOnboardingTasks>,
+      'gettingStartedTasks' | 'beyondBasicsTasks'
+    > {
+  onClose: () => void;
+}
+
+export function DeprecatedNewOnboardingSidebar({
+  onClose,
+  orientation,
+  collapsed,
+  gettingStartedTasks,
+  beyondBasicsTasks,
+}: NewSidebarProps) {
+  const walkthrough = isDemoModeEnabled();
+
+  const sortedGettingStartedTasks = gettingStartedTasks.sort(
+    (a, b) =>
+      orderedGettingStartedTasks.indexOf(a.task) -
+      orderedGettingStartedTasks.indexOf(b.task)
+  );
+
+  const sortedBeyondBasicsTasks = beyondBasicsTasks.sort(
+    (a, b) =>
+      orderedBeyondBasicsTasks.indexOf(a.task) - orderedBeyondBasicsTasks.indexOf(b.task)
+  );
+
+  const taskKeyForWaitingIndicator = useMemo(() => {
+    return [...sortedGettingStartedTasks, ...sortedBeyondBasicsTasks].find(
+      task => !taskIsDone(task) && !!task.SupplementComponent
+    )?.task;
+  }, [sortedGettingStartedTasks, sortedBeyondBasicsTasks]);
+
+  return (
+    <Wrapper
+      collapsed={collapsed}
+      hidePanel={onClose}
+      orientation={orientation}
+      title={walkthrough ? t('Guided Tour') : t('Quick Setup')}
+    >
+      <Content>
+        <TaskGroup
+          title={t('Getting Started')}
+          description={t(
+            'Complete these essential setups to capture your first errors, add commit and release information and get alerted when something’s wrong.'
+          )}
+          tasks={sortedGettingStartedTasks}
+          hidePanel={onClose}
+          expanded={
+            groupTasksByCompletion(sortedGettingStartedTasks).incompletedTasks.length > 0
+          }
+          toggleable={sortedBeyondBasicsTasks.length > 0}
+          taskKeyForWaitingIndicator={taskKeyForWaitingIndicator}
+          group="getting_started"
+        />
+        {sortedBeyondBasicsTasks.length > 0 && (
+          <TaskGroup
+            title={t('Beyond the Basics')}
+            description={t(
+              'Ready to level-up? Get even more value out of Sentry by enabling advanced features and fine-tuning your workflow.'
+            )}
+            tasks={sortedBeyondBasicsTasks}
+            hidePanel={onClose}
+            expanded={
+              groupTasksByCompletion(sortedGettingStartedTasks).incompletedTasks
+                .length === 0 &&
+              groupTasksByCompletion(sortedBeyondBasicsTasks).incompletedTasks.length > 0
+            }
+            taskKeyForWaitingIndicator={taskKeyForWaitingIndicator}
+            group="beyond_basics"
+          />
+        )}
+      </Content>
+      <BottomLeft src={HighlightTopRight} />
+    </Wrapper>
+  );
+}
+
+const Wrapper = styled(SidebarPanel)`
+  width: 100%;
+  @media (min-width: ${p => p.theme.breakpoints.xsmall}) {
+    width: 450px;
+  }
+`;
+
+const Content = styled('div')`
+  padding: ${space(3)};
+  display: flex;
+  flex-direction: column;
+  gap: ${space(1)};
+  flex: 1;
+
+  p {
+    margin-bottom: ${space(1)};
+  }
+`;
+
+const TaskGroupWrapper = styled('div')`
+  border: 1px solid ${p => p.theme.border};
+  border-radius: ${p => p.theme.borderRadius};
+  padding: ${space(1)};
+
+  hr {
+    border-color: ${p => p.theme.translucentBorder};
+    margin: ${space(1)} -${space(1)};
+  }
+`;
+
+const TaskGroupHeader = styled('div')<{toggleable?: boolean}>`
+  cursor: ${p => (p.onClick ? 'pointer' : 'default')};
+  display: grid;
+  grid-template-columns: 1fr max-content;
+  padding: ${space(1)} ${space(1.5)};
+  gap: ${space(1.5)};
+  position: relative;
+  border-radius: ${p => p.theme.borderRadius};
+  align-items: center;
+
+  p {
+    margin: 0;
+    font-size: ${p => p.theme.fontSizeSmall};
+    color: ${p => p.theme.subText};
+  }
+`;
+
+const TaskGroupTitle = styled('div')`
+  display: grid;
+  grid-template-columns: repeat(2, max-content);
+  align-items: center;
+  gap: ${space(1)};
+`;
+
+const TaskGroupBody = styled('div')`
+  border-radius: ${p => p.theme.borderRadius};
+`;
+
+const TaskGroupProgress = styled('div')<{completed?: boolean}>`
+  font-size: ${p => p.theme.fontSizeSmall};
+  font-weight: ${p => p.theme.fontWeightBold};
+  padding: ${space(0.75)} ${space(1.5)};
+  ${p =>
+    p.completed
+      ? css`
+          color: ${p.theme.green300};
+        `
+      : css`
+          color: ${p.theme.subText};
+          display: grid;
+          grid-template-columns: 1fr max-content;
+          align-items: center;
+          gap: ${space(1)};
+        `}
+`;
+
+const taskIncompleteCss = css`
+  position: relative;
+  cursor: pointer;
+  align-items: flex-start;
+`;
+
+const taskCompletedCss = css`
+  strong {
+    opacity: 0.5;
+  }
+  align-items: center;
+`;
+
+const TaskWrapper = styled(motion.li)`
+  padding: ${space(1)} ${space(1.5)};
+  border-radius: ${p => p.theme.borderRadius};
+  display: grid;
+  grid-template-columns: 1fr max-content;
+  gap: ${space(1)};
+
+  p {
+    margin: 0;
+    font-size: ${p => p.theme.fontSizeSmall};
+    color: ${p => p.theme.subText};
+  }
+`;
+
+TaskWrapper.defaultProps = {
+  layout: true,
+};
+
+const TaskActions = styled('div')`
+  display: flex;
+  flex-direction: column;
+  gap: ${space(1)};
+`;
+
+const BottomLeft = styled('img')`
+  width: 60%;
+  transform: rotate(180deg);
+  margin-top: ${space(3)};
+`;
diff --git a/static/app/components/onboardingWizard/filterSupportedTasks.spec.tsx b/static/app/components/onboardingWizard/filterSupportedTasks.spec.tsx
index 43d9130c000cd0..911f054ca5dedb 100644
--- a/static/app/components/onboardingWizard/filterSupportedTasks.spec.tsx
+++ b/static/app/components/onboardingWizard/filterSupportedTasks.spec.tsx
@@ -67,7 +67,7 @@ describe('filterSupportedTasks', function () {
       [supportedProject, unsupportedProject],
       onboardingTasks
     );
-    expect(supportedTasks.length).toBe(4);
+    expect(supportedTasks).toHaveLength(4);
   });
 
   it('filters out for unsupported platform', function () {
@@ -76,7 +76,7 @@ describe('filterSupportedTasks', function () {
       firstTransactionEvent: false,
     }) as Project & {platform: PlatformKey};
     const supportedTasks = filterSupportedTasks([project], onboardingTasks);
-    expect(supportedTasks.length).toBe(1);
+    expect(supportedTasks).toHaveLength(1);
   });
 
   it('filters out performance only if all projects are without support', function () {
@@ -97,7 +97,7 @@ describe('filterSupportedTasks', function () {
           OnboardingTaskKey.SESSION_REPLAY,
           OnboardingTaskKey.USER_REPORTS,
         ].includes(task.task)
-      ).length
-    ).toBe(3);
+      )
+    ).toHaveLength(3);
   });
 });
diff --git a/static/app/components/onboardingWizard/newSidebar.spec.tsx b/static/app/components/onboardingWizard/newSidebar.spec.tsx
new file mode 100644
index 00000000000000..937f13dfefdac0
--- /dev/null
+++ b/static/app/components/onboardingWizard/newSidebar.spec.tsx
@@ -0,0 +1,167 @@
+import {initializeOrg} from 'sentry-test/initializeOrg';
+import {render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrary';
+
+import {NewOnboardingSidebar} from 'sentry/components/onboardingWizard/newSidebar';
+import {type OnboardingTask, OnboardingTaskKey} from 'sentry/types/onboarding';
+
+const gettingStartedTasks: OnboardingTask[] = [
+  {
+    task: OnboardingTaskKey.FIRST_PROJECT,
+    title: 'Create your first project',
+    description: 'Select your platform and install the Sentry SDK',
+    skippable: false,
+    actionType: 'app',
+    location: '',
+    display: true,
+    requisites: [],
+    requisiteTasks: [],
+    status: 'pending',
+  },
+  {
+    task: OnboardingTaskKey.FIRST_EVENT,
+    title: 'Send your first error',
+    description: 'Throw an error in your app',
+    skippable: false,
+    actionType: 'app',
+    location: '',
+    display: true,
+    requisites: [],
+    requisiteTasks: [],
+    status: 'pending',
+  },
+];
+
+const beyondBasicsTasks: OnboardingTask[] = [
+  {
+    task: OnboardingTaskKey.FIRST_TRANSACTION,
+    title: 'Setup Tracing',
+    description: 'Capture your first transaction',
+    skippable: true,
+    requisites: [],
+    actionType: 'app',
+    location: '',
+    display: true,
+    requisiteTasks: [],
+    status: 'pending',
+  },
+];
+
+describe('NewSidebar', function () {
+  it('should render the sidebar with the correct groups and tasks', async function () {
+    render(
+      <NewOnboardingSidebar
+        onClose={jest.fn()}
+        orientation="left"
+        collapsed={false}
+        gettingStartedTasks={gettingStartedTasks}
+        beyondBasicsTasks={beyondBasicsTasks}
+      />
+    );
+
+    // Group 1
+    expect(screen.getByText('Getting Started')).toBeInTheDocument();
+    expect(screen.getByText('0 out of 2 tasks completed')).toBeInTheDocument();
+    // This means that the group is expanded
+    expect(screen.getByRole('button', {name: 'Collapse'})).toBeInTheDocument();
+    expect(screen.getByText(gettingStartedTasks[0]!.title)).toBeInTheDocument();
+    expect(screen.getByText(gettingStartedTasks[0]!.description)).toBeInTheDocument();
+    expect(screen.queryByRole('button', {name: 'Skip Task'})).not.toBeInTheDocument();
+
+    // Group 2
+    expect(screen.getByText('Beyond the Basics')).toBeInTheDocument();
+    expect(screen.getByText('0 out of 1 task completed')).toBeInTheDocument();
+    // This means that the group is not expanded
+    expect(screen.queryByText(beyondBasicsTasks[0]!.title)).not.toBeInTheDocument();
+
+    // Manually expand second group
+    await userEvent.click(screen.getByRole('button', {name: 'Expand'}));
+    // Tasks from the second group should be visible
+    expect(await screen.findByText(beyondBasicsTasks[0]!.title)).toBeInTheDocument();
+    // task from second group are skippable
+    expect(screen.getByRole('button', {name: 'Skip Task'})).toBeInTheDocument();
+  });
+
+  it('if first group completed, second group should be expanded by default', function () {
+    render(
+      <NewOnboardingSidebar
+        onClose={jest.fn()}
+        orientation="left"
+        collapsed={false}
+        gettingStartedTasks={gettingStartedTasks.map(task => ({
+          ...task,
+          status: 'complete',
+        }))}
+        beyondBasicsTasks={beyondBasicsTasks}
+      />
+    );
+
+    // Group 1
+    expect(screen.getByText('Getting Started')).toBeInTheDocument();
+    expect(screen.getByText('2 out of 2 tasks completed')).toBeInTheDocument();
+
+    // Group 2
+    // This means that the group is expanded
+    expect(screen.getByText(beyondBasicsTasks[0]!.title)).toBeInTheDocument();
+  });
+
+  it('show skipable confirmation when skipping a task', async function () {
+    const {organization} = initializeOrg();
+
+    const mockUpdate = MockApiClient.addMockResponse({
+      url: `/organizations/${organization.slug}/onboarding-tasks/`,
+      method: 'POST',
+    });
+
+    render(
+      <NewOnboardingSidebar
+        onClose={jest.fn()}
+        orientation="left"
+        collapsed={false}
+        gettingStartedTasks={gettingStartedTasks}
+        beyondBasicsTasks={beyondBasicsTasks}
+      />,
+      {
+        organization,
+      }
+    );
+
+    // Manually expand second group
+    await userEvent.click(screen.getByRole('button', {name: 'Expand'}));
+    // Tasks from the second group should be visible
+    expect(await screen.findByText(beyondBasicsTasks[0]!.title)).toBeInTheDocument();
+
+    await userEvent.click(screen.getByRole('button', {name: 'Skip Task'}));
+
+    // Confirmation to skip should be visible
+    expect(await screen.findByText(/Not sure what to do/)).toBeInTheDocument();
+    expect(screen.getByRole('button', {name: 'Just Skip'})).toBeInTheDocument();
+    expect(screen.getByRole('button', {name: 'Help'})).toBeInTheDocument();
+
+    // Click help
+    await userEvent.click(screen.getByRole('button', {name: 'Help'}));
+
+    // Show help menu
+    expect(await screen.findByText('Search Support, Docs and More')).toBeInTheDocument();
+    expect(screen.getByRole('link', {name: 'Contact Support'})).toBeInTheDocument();
+    expect(screen.getByRole('link', {name: 'Join our Discord'})).toBeInTheDocument();
+    expect(screen.getByRole('link', {name: 'Visit Help Center'})).toBeInTheDocument();
+
+    // Click 'Just Skip'
+    await userEvent.click(screen.getByRole('button', {name: 'Just Skip'}));
+    await waitFor(() => {
+      expect(mockUpdate).toHaveBeenCalledWith(
+        `/organizations/${organization.slug}/onboarding-tasks/`,
+        expect.objectContaining({
+          data: expect.objectContaining({
+            status: 'skipped',
+            task: OnboardingTaskKey.FIRST_TRANSACTION,
+          }),
+        })
+      );
+    });
+
+    // Dismiss skip confirmation
+    await userEvent.click(screen.getByRole('button', {name: 'Dismiss Skip'}));
+    expect(screen.queryByText(/Not sure what to do/)).not.toBeInTheDocument();
+  });
+});
diff --git a/static/app/components/onboardingWizard/newSidebar.tsx b/static/app/components/onboardingWizard/newSidebar.tsx
index 72fa11a44e48d9..719d245a30ed65 100644
--- a/static/app/components/onboardingWizard/newSidebar.tsx
+++ b/static/app/components/onboardingWizard/newSidebar.tsx
@@ -1,32 +1,37 @@
 import {Fragment, useCallback, useEffect, useMemo, useState} from 'react';
-import {css} from '@emotion/react';
+import {css, useTheme} from '@emotion/react';
 import styled from '@emotion/styled';
 import {motion} from 'framer-motion';
 import partition from 'lodash/partition';
 
 import HighlightTopRight from 'sentry-images/pattern/highlight-top-right.svg';
 
+import {openHelpSearchModal} from 'sentry/actionCreators/modal';
 import {navigateTo} from 'sentry/actionCreators/navigation';
 import {updateOnboardingTask} from 'sentry/actionCreators/onboardingTasks';
 import {Button} from 'sentry/components/button';
 import {Chevron} from 'sentry/components/chevron';
+import {DropdownMenu} from 'sentry/components/dropdownMenu';
 import InteractionStateLayer from 'sentry/components/interactionStateLayer';
-import SkipConfirm from 'sentry/components/onboardingWizard/skipConfirm';
 import type {useOnboardingTasks} from 'sentry/components/onboardingWizard/useOnboardingTasks';
 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';
 import {Tooltip} from 'sentry/components/tooltip';
-import {IconCheckmark, IconClose, IconNot, IconSync} from 'sentry/icons';
+import {
+  IconCheckmark,
+  IconChevron,
+  IconClose,
+  IconNot,
+  IconSupport,
+  IconSync,
+} from 'sentry/icons';
 import {t, tct} from 'sentry/locale';
+import ConfigStore from 'sentry/stores/configStore';
 import DemoWalkthroughStore from 'sentry/stores/demoWalkthroughStore';
 import {space} from 'sentry/styles/space';
-import {
-  type OnboardingTask,
-  OnboardingTaskKey,
-  type OnboardingTaskStatus,
-} from 'sentry/types/onboarding';
+import {type OnboardingTask, OnboardingTaskKey} from 'sentry/types/onboarding';
 import {trackAnalytics} from 'sentry/utils/analytics';
 import {isDemoModeEnabled} from 'sentry/utils/demoMode';
 import useApi from 'sentry/utils/useApi';
@@ -40,8 +45,8 @@ const orderedGettingStartedTasks = [
   OnboardingTaskKey.INVITE_MEMBER,
   OnboardingTaskKey.ALERT_RULE,
   OnboardingTaskKey.SOURCEMAPS,
-  OnboardingTaskKey.RELEASE_TRACKING,
   OnboardingTaskKey.LINK_SENTRY_TO_SOURCE_CODE,
+  OnboardingTaskKey.RELEASE_TRACKING,
 ];
 
 const orderedBeyondBasicsTasks = [
@@ -59,17 +64,193 @@ function groupTasksByCompletion(tasks: OnboardingTask[]) {
   };
 }
 
-interface TaskProps extends Pick<OnboardingTaskStatus, 'status'> {
+interface TaskCardProps {
+  icon: React.ReactNode;
+  title: React.ReactNode;
+  actions?: React.ReactNode;
+  className?: string;
+  description?: React.ReactNode;
+  onClick?: (e: React.MouseEvent) => void;
+}
+
+function TaskCard({
+  description,
+  icon,
+  title,
+  actions,
+  onClick,
+  className,
+}: TaskCardProps) {
+  return (
+    <TaskCardWrapper
+      role={onClick ? 'button' : undefined}
+      onClick={onClick}
+      className={className}
+    >
+      {onClick && <InteractionStateLayer />}
+      <TaskCardIcon>{icon}</TaskCardIcon>
+      <TaskCardDescription>
+        {title}
+        {description && <p>{description}</p>}
+      </TaskCardDescription>
+      <TaskCardActions>{actions}</TaskCardActions>
+    </TaskCardWrapper>
+  );
+}
+
+interface TaskStatusIconProps {
+  status: 'complete' | 'inProgress' | 'skipped' | 'pending';
+  progress?: number;
+  tooltipText?: string;
+}
+
+function TaskStatusIcon({status, tooltipText, progress}: TaskStatusIconProps) {
+  const theme = useTheme();
+
+  const progressValue = progress ?? 0;
+
+  return (
+    <Tooltip title={tooltipText} disabled={!tooltipText} containerDisplayMode="flex">
+      {status === 'complete' ? (
+        <IconCheckmark
+          css={css`
+            color: ${theme.success};
+            height: ${theme.fontSizeLarge};
+            width: ${theme.fontSizeLarge};
+          `}
+          isCircled
+        />
+      ) : status === 'skipped' ? (
+        <IconNot
+          css={css`
+            color: ${theme.disabled};
+            height: ${theme.fontSizeLarge};
+            width: ${theme.fontSizeLarge};
+          `}
+        />
+      ) : status === 'pending' ? (
+        <IconSync // TODO(Telemetry): Remove pending status
+          css={css`
+            color: ${theme.pink400};
+            height: ${theme.fontSizeLarge};
+            width: ${theme.fontSizeLarge};
+          `}
+        />
+      ) : (
+        <ProgressRing
+          value={progressValue * 100}
+          progressEndcaps="round"
+          size={16}
+          barWidth={2}
+        />
+      )}
+    </Tooltip>
+  );
+}
+
+interface SkipConfirmationProps {
+  onConfirm: () => void;
+  onDismiss: () => void;
+}
+
+function SkipConfirmation({onConfirm, onDismiss}: SkipConfirmationProps) {
+  const organization = useOrganization();
+  const theme = useTheme();
+
+  return (
+    <SkipConfirmationWrapper>
+      <TaskCard
+        title={t('Not sure what to do? We’re here for you!')}
+        icon={
+          <IconChevron
+            direction="up"
+            css={css`
+              color: ${theme.disabled};
+              height: ${theme.fontSizeLarge};
+              width: ${theme.fontSizeLarge};
+            `}
+            isCircled
+          />
+        }
+        actions={
+          <Fragment>
+            <Button
+              borderless
+              size="zero"
+              aria-label={t('Just Skip')}
+              title={t('Just Skip')}
+              icon={<IconClose color="gray300" isCircled />}
+              onClick={event => {
+                event.stopPropagation();
+                onConfirm();
+              }}
+            />
+            <DropdownMenu
+              position="top-start"
+              triggerProps={{
+                'aria-label': t('Help'),
+                title: t('Help'),
+                icon: <IconSupport color="gray300" />,
+                showChevron: false,
+                size: 'zero',
+                borderless: true,
+              }}
+              items={[
+                {
+                  key: 'search',
+                  label: t('Search Support, Docs and More'),
+                  onAction() {
+                    openHelpSearchModal({organization});
+                  },
+                },
+                {
+                  key: 'help',
+                  label: t('Visit Help Center'),
+                  // TODO(Telemetry): Make it open in a new tab
+                  to: 'https://sentry.zendesk.com/hc/en-us',
+                },
+                {
+                  key: 'discord',
+                  label: t('Join our Discord'),
+                  to: 'https://discord.com/invite/sentry',
+                },
+                {
+                  key: 'support',
+                  label: t('Contact Support'),
+                  to: `mailto:${ConfigStore.get('supportEmail')}`,
+                },
+              ]}
+            />
+            <Button
+              borderless
+              size="zero"
+              aria-label={t('Dismiss Skip')}
+              title={t('Dismiss Skip')}
+              icon={<IconClose color="gray300" />}
+              onClick={event => {
+                event.stopPropagation();
+                onDismiss();
+              }}
+            />
+          </Fragment>
+        }
+      />
+    </SkipConfirmationWrapper>
+  );
+}
+
+interface TaskProps {
   hidePanel: () => void;
   task: OnboardingTask;
   completed?: boolean;
   showWaitingIndicator?: boolean;
 }
 
-function Task({task, status, hidePanel, showWaitingIndicator}: TaskProps) {
+function Task({task, hidePanel, showWaitingIndicator}: TaskProps) {
   const api = useApi();
   const organization = useOrganization();
   const router = useRouter();
+  const [showSkipConfirmation, setShowSkipConfirmation] = useState(false);
 
   const handleClick = useCallback(
     (e: React.MouseEvent) => {
@@ -127,79 +308,72 @@ function Task({task, status, hidePanel, showWaitingIndicator}: TaskProps) {
     [task, organization, api]
   );
 
-  if (status === 'complete') {
-    return (
-      <TaskWrapper css={taskCompletedCss}>
-        <strong>{task.title}</strong>
-        <Tooltip title={t('Task completed')} containerDisplayMode="flex">
-          <IconCheckmark color="green300" isCircled />
-        </Tooltip>
-      </TaskWrapper>
-    );
-  }
-
-  if (status === 'skipped') {
-    return (
-      <TaskWrapper css={taskCompletedCss}>
-        <strong>{task.title}</strong>
-        <Tooltip title={t('Task skipped')} containerDisplayMode="flex">
-          <IconNot color="gray300" />
-        </Tooltip>
-      </TaskWrapper>
-    );
-  }
+  const iconTooltipText = useMemo(() => {
+    switch (task.status) {
+      case 'complete':
+        return t('Task completed');
+      case 'pending':
+        return task.pendingTitle ?? t('Task in progress\u2026');
+      case 'skipped':
+        return t('Task skipped');
+      default:
+        return undefined;
+    }
+  }, [task.status, task.pendingTitle]);
 
   return (
-    <TaskWrapper onClick={handleClick} css={taskIncompleteCss}>
-      <InteractionStateLayer />
-      <div>
-        <strong>{task.title}</strong>
-        <p>{task.description}</p>
-      </div>
-      {task.requisiteTasks.length === 0 && (
-        <TaskActions>
-          {task.skippable && (
-            <SkipConfirm onSkip={() => handleMarkSkipped(task.task)}>
-              {({skip}) => (
-                <Button
-                  borderless
-                  size="zero"
-                  aria-label={t('Close')}
-                  icon={<IconClose size="xs" color="gray300" />}
-                  onClick={skip}
-                  css={css`
-                    /* If the pulsing indicator is active, the close button
-                     * should be above it so it's clickable.
-                     */
-                    z-index: 1;
-                  `}
-                />
-              )}
-            </SkipConfirm>
-          )}
-          {task.SupplementComponent && showWaitingIndicator && (
-            <task.SupplementComponent task={task} />
-          )}
-          {status === 'pending' && (
-            <Tooltip
-              title={task.pendingTitle ?? t('Task in progress\u2026')}
-              containerDisplayMode="flex"
-              css={css`
-                justify-content: center;
-                cursor: default;
-              `}
-            >
-              <IconSync color="pink400" />
-            </Tooltip>
-          )}
-        </TaskActions>
+    <TaskWrapper>
+      <TaskCard
+        onClick={
+          task.status === 'complete' || task.status === 'skipped'
+            ? undefined
+            : handleClick
+        }
+        icon={<TaskStatusIcon status={task.status} tooltipText={iconTooltipText} />}
+        description={task.description}
+        title={<strong>{task.title}</strong>}
+        actions={
+          task.status === 'complete' || task.status === 'skipped'
+            ? undefined
+            : task.requisiteTasks.length === 0 && (
+                <TaskActions>
+                  {task.skippable && (
+                    <Button
+                      borderless
+                      size="zero"
+                      aria-label={t('Skip Task')}
+                      title={t('Skip Task')}
+                      icon={<IconClose color="gray300" isCircled />}
+                      onClick={event => {
+                        event.stopPropagation();
+                        setShowSkipConfirmation(!showSkipConfirmation);
+                      }}
+                      css={css`
+                        /* If the pulsing indicator is active, the close button
+                        * should be above it so it's clickable.
+                        */
+                        z-index: 1;
+                      `}
+                    />
+                  )}
+                  {task.SupplementComponent && showWaitingIndicator && (
+                    <task.SupplementComponent task={task} />
+                  )}
+                </TaskActions>
+              )
+        }
+      />
+      {showSkipConfirmation && (
+        <SkipConfirmation
+          onConfirm={() => handleMarkSkipped(task.task)}
+          onDismiss={() => setShowSkipConfirmation(false)}
+        />
       )}
     </TaskWrapper>
   );
 }
 
 interface TaskGroupProps {
-  description: string;
   /**
    * Used for analytics
    */
@@ -214,7 +388,6 @@ interface TaskGroupProps {
 
 function TaskGroup({
   title,
-  description,
   tasks,
   expanded,
   hidePanel,
@@ -257,67 +430,51 @@ function TaskGroup({
   return (
     <TaskGroupWrapper>
       <TaskGroupHeader
-        role="button"
+        title={<strong>{title}</strong>}
+        description={
+          tasks.length > 1
+            ? tct('[totalCompletedTasks] out of [totalTasks] tasks completed', {
+                totalCompletedTasks: completedTasks.length,
+                totalTasks: tasks.length,
+              })
+            : tct('[totalCompletedTasks] out of [totalTasks] task completed', {
+                totalCompletedTasks: completedTasks.length,
+                totalTasks: tasks.length,
+              })
+        }
+        hasProgress={completedTasks.length > 0}
         onClick={toggleable ? () => setIsExpanded(!isExpanded) : undefined}
-      >
-        {toggleable && <InteractionStateLayer />}
-        <div>
-          <TaskGroupTitle>
-            <strong>{title}</strong>
-            {incompletedTasks.length === 0 && (
-              <Tooltip title={t('All tasks completed')} containerDisplayMode="flex">
-                <IconCheckmark color="green300" isCircled />
-              </Tooltip>
-            )}
-          </TaskGroupTitle>
-          <p>{description}</p>
-        </div>
-        {toggleable && (
-          <Chevron
-            direction={isExpanded ? 'up' : 'down'}
-            role="presentation"
-            size="large"
+        icon={
+          <TaskStatusIcon
+            status={completedTasks.length === tasks.length ? 'complete' : 'inProgress'}
+            progress={completedTasks.length / tasks.length}
           />
-        )}
-      </TaskGroupHeader>
+        }
+        actions={
+          <Button
+            icon={<Chevron direction={isExpanded ? 'up' : 'down'} />}
+            aria-label={isExpanded ? t('Collapse') : t('Expand')}
+            aria-expanded={isExpanded}
+            size="zero"
+            borderless
+          />
+        }
+      />
       {isExpanded && (
         <Fragment>
           <hr />
           <TaskGroupBody>
-            <TaskGroupProgress>
-              {tct('[totalCompletedTasks] out of [totalTasks] tasks completed', {
-                totalCompletedTasks: completedTasks.length,
-                totalTasks: tasks.length,
-              })}
-              <ProgressRing
-                value={(completedTasks.length / tasks.length) * 100}
-                progressEndcaps="round"
-                size={16}
-                barWidth={2}
-              />
-            </TaskGroupProgress>
             {incompletedTasks.map(task => (
               <Task
                 key={task.task}
                 task={task}
                 hidePanel={hidePanel}
                 showWaitingIndicator={taskKeyForWaitingIndicator === task.task}
-                status={task.status}
               />
             ))}
-            {completedTasks.length > 0 && (
-              <Fragment>
-                <TaskGroupProgress completed>{t('Completed')}</TaskGroupProgress>
-                {completedTasks.map(task => (
-                  <Task
-                    key={task.task}
-                    task={task}
-                    hidePanel={hidePanel}
-                    status={task.status}
-                  />
-                ))}
-              </Fragment>
-            )}
+            {completedTasks.map(task => (
+              <Task key={task.task} task={task} hidePanel={hidePanel} />
+            ))}
           </TaskGroupBody>
         </Fragment>
       )}
@@ -370,9 +527,6 @@ export function NewOnboardingSidebar({
       <Content>
         <TaskGroup
           title={t('Getting Started')}
-          description={t(
-            'Complete these essential setups to capture your first errors, add commit and release information and get alerted when something’s wrong.'
-          )}
           tasks={sortedGettingStartedTasks}
           hidePanel={onClose}
           expanded={
@@ -385,9 +539,6 @@ export function NewOnboardingSidebar({
         {sortedBeyondBasicsTasks.length > 0 && (
           <TaskGroup
             title={t('Beyond the Basics')}
-            description={t(
-              'Ready to level-up? Get even more value out of Sentry by enabling advanced features and fine-tuning your workflow.'
-            )}
             tasks={sortedBeyondBasicsTasks}
             hidePanel={onClose}
             expanded={
@@ -408,7 +559,7 @@ export function NewOnboardingSidebar({
 const Wrapper = styled(SidebarPanel)`
   width: 100%;
   @media (min-width: ${p => p.theme.breakpoints.xsmall}) {
-    width: 450px;
+    width: 460px;
   }
 `;
 
@@ -435,91 +586,70 @@ const TaskGroupWrapper = styled('div')`
   }
 `;
 
-const TaskGroupHeader = styled('div')<{toggleable?: boolean}>`
-  cursor: ${p => (p.onClick ? 'pointer' : 'default')};
-  display: grid;
-  grid-template-columns: 1fr max-content;
-  padding: ${space(1)} ${space(1.5)};
-  gap: ${space(1.5)};
-  position: relative;
-  border-radius: ${p => p.theme.borderRadius};
-  align-items: center;
-
+const TaskGroupHeader = styled(TaskCard)<{hasProgress: boolean}>`
   p {
-    margin: 0;
-    font-size: ${p => p.theme.fontSizeSmall};
-    color: ${p => p.theme.subText};
+    color: ${p => (p.hasProgress ? p.theme.successText : p.theme.subText)};
   }
 `;
 
-const TaskGroupTitle = styled('div')`
-  display: grid;
-  grid-template-columns: repeat(2, max-content);
-  align-items: center;
-  gap: ${space(1)};
-`;
-
-const TaskGroupBody = styled('div')`
+const TaskGroupBody = styled(motion.ul)`
   border-radius: ${p => p.theme.borderRadius};
+  list-style-type: none;
+  padding: 0;
+  margin: 0;
 `;
 
-const TaskGroupProgress = styled('div')<{completed?: boolean}>`
-  font-size: ${p => p.theme.fontSizeSmall};
-  font-weight: ${p => p.theme.fontWeightBold};
-  padding: ${space(0.75)} ${space(1.5)};
-  ${p =>
-    p.completed
-      ? css`
-          color: ${p.theme.green300};
-        `
-      : css`
-          color: ${p.theme.subText};
-          display: grid;
-          grid-template-columns: 1fr max-content;
-          align-items: center;
-          gap: ${space(1)};
-        `}
+const TaskWrapper = styled(motion.li)`
+  gap: ${space(1)};
 `;
 
-const taskIncompleteCss = css`
-  position: relative;
-  cursor: pointer;
-  align-items: flex-start;
+const TaskActions = styled('div')`
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: ${space(1)};
 `;
 
-const taskCompletedCss = css`
-  strong {
-    opacity: 0.5;
-  }
-  align-items: center;
+const BottomLeft = styled('img')`
+  width: 60%;
+  transform: rotate(180deg);
+  margin-top: ${space(3)};
 `;
 
-const TaskWrapper = styled(motion.li)`
-  padding: ${space(1)} ${space(1.5)};
-  border-radius: ${p => p.theme.borderRadius};
+const TaskCardWrapper = styled('div')`
+  position: relative;
   display: grid;
-  grid-template-columns: 1fr max-content;
-  gap: ${space(1)};
-
+  grid-template-columns: max-content 1fr max-content;
+  gap: ${space(1.5)};
+  cursor: ${p => (p.onClick ? 'pointer' : 'default')};
+  border-radius: ${p => p.theme.borderRadius};
+  padding: ${space(1)} ${space(1.5)};
   p {
     margin: 0;
     font-size: ${p => p.theme.fontSizeSmall};
-    color: ${p => p.theme.subText};
   }
 `;
 
-TaskWrapper.defaultProps = {
-  layout: true,
-};
+const TaskCardDescription = styled('div')`
+  line-height: 20px;
+`;
 
-const TaskActions = styled('div')`
+const TaskCardIcon = styled('div')`
   display: flex;
-  flex-direction: column;
+  align-items: center;
+  height: 20px;
+`;
+
+const TaskCardActions = styled('div')`
+  display: grid;
+  grid-auto-flow: column;
+  grid-auto-columns: 20px;
   gap: ${space(1)};
+  align-items: flex-start;
 `;
 
-const BottomLeft = styled('img')`
-  width: 60%;
-  transform: rotate(180deg);
-  margin-top: ${space(3)};
+const SkipConfirmationWrapper = styled('div')`
+  margin: ${space(1)} 0;
+  border: 1px solid ${p => p.theme.border};
+  border-radius: ${p => p.theme.borderRadius};
 `;
diff --git a/static/app/components/onboardingWizard/skipConfirm.tsx b/static/app/components/onboardingWizard/skipConfirm.tsx
index 4820c9fe8c4b5a..bda36f8973d3df 100644
--- a/static/app/components/onboardingWizard/skipConfirm.tsx
+++ b/static/app/components/onboardingWizard/skipConfirm.tsx
@@ -1,4 +1,4 @@
-import {Component, Fragment} from 'react';
+import {Fragment, useState} from 'react';
 import styled from '@emotion/styled';
 
 import {Button, LinkButton} from 'sentry/components/button';
@@ -13,39 +13,30 @@ type Props = {
   onSkip: () => void;
 };
 
-type State = {
-  showConfirmation: boolean;
-};
-
-class SkipConfirm extends Component<Props, State> {
-  state: State = {
-    showConfirmation: false,
-  };
+function SkipConfirm(props: Props) {
+  const [showConfirmation, setShowConfirmation] = useState<boolean>(false);
+  const {onSkip, children} = props;
 
-  toggleConfirm = (e: React.MouseEvent) => {
+  const toggleConfirm = (e: React.MouseEvent) => {
     e.stopPropagation();
-    this.setState(state => ({showConfirmation: !state.showConfirmation}));
+    setShowConfirmation(!showConfirmation);
   };
 
-  handleSkip = (e: React.MouseEvent) => {
+  const handleSkip = (e: React.MouseEvent) => {
     e.stopPropagation();
-    this.props.onSkip();
+    onSkip();
   };
 
-  render() {
-    const {children} = this.props;
-
-    return (
-      <Fragment>
-        {children({skip: this.toggleConfirm})}
-        <Confirmation
-          visible={this.state.showConfirmation}
-          onSkip={this.handleSkip}
-          onDismiss={this.toggleConfirm}
-        />
-      </Fragment>
-    );
-  }
+  return (
+    <Fragment>
+      {children({skip: toggleConfirm})}
+      <Confirmation
+        visible={showConfirmation}
+        onSkip={handleSkip}
+        onDismiss={toggleConfirm}
+      />
+    </Fragment>
+  );
 }
 
 export default SkipConfirm;
diff --git a/static/app/components/onboardingWizard/task.tsx b/static/app/components/onboardingWizard/task.tsx
index 76bb18b5ce06fa..21e3495b2e0b21 100644
--- a/static/app/components/onboardingWizard/task.tsx
+++ b/static/app/components/onboardingWizard/task.tsx
@@ -128,7 +128,7 @@ function Task(props: Props) {
     <Tooltip
       containerDisplayMode="block"
       title={tct('[requisite] before completing this task', {
-        requisite: task.requisiteTasks[0].title,
+        requisite: task.requisiteTasks[0]!.title,
       })}
     >
       <IconLock color="pink400" locked />
diff --git a/static/app/components/onboardingWizard/taskConfig.tsx b/static/app/components/onboardingWizard/taskConfig.tsx
index 74e69ba9329289..1e62e7db20d483 100644
--- a/static/app/components/onboardingWizard/taskConfig.tsx
+++ b/static/app/components/onboardingWizard/taskConfig.tsx
@@ -7,6 +7,7 @@ import type {OnboardingContextProps} from 'sentry/components/onboarding/onboardi
 import {filterSupportedTasks} from 'sentry/components/onboardingWizard/filterSupportedTasks';
 import {
   hasQuickStartUpdatesFeature,
+  hasQuickStartUpdatesFeatureGA,
   taskIsDone,
 } from 'sentry/components/onboardingWizard/utils';
 import {filterProjects} from 'sentry/components/performanceOnboarding/utils';
@@ -57,7 +58,7 @@ function getIssueAlertUrl({projects, organization}: Options) {
   }
   // pick the first project with events if we have that, otherwise just pick the first project
   const firstProjectWithEvents = projects.find(project => !!project.firstEvent);
-  const project = firstProjectWithEvents ?? projects[0];
+  const project = firstProjectWithEvents ?? projects[0]!;
   return `/organizations/${organization.slug}/alerts/${project.slug}/wizard/`;
 }
 
@@ -80,7 +81,7 @@ function getOnboardingInstructionsUrl({projects, organization}: Options) {
   const firstProjectWithoutError = projects.find(project => !project.firstEvent);
   // If all projects contain errors, this step will not be visible to the user,
   // but if the user falls into this case for some reason, we pick the first project
-  const project = firstProjectWithoutError ?? projects[0];
+  const project = firstProjectWithoutError ?? projects[0]!;
 
   let url = `/${organization.slug}/${project.slug}/getting-started/`;
 
@@ -99,7 +100,7 @@ function getMetricAlertUrl({projects, organization}: Options) {
   const firstProjectWithEvents = projects.find(
     project => !!project.firstTransactionEvent
   );
-  const project = firstProjectWithEvents ?? projects[0];
+  const project = firstProjectWithEvents ?? projects[0]!;
   return {
     pathname: `/organizations/${organization.slug}/alerts/${project.slug}/wizard/`,
     query: {
@@ -218,6 +219,7 @@ export function getOnboardingTasks({
             <EventWaitingIndicator
               text={t('Waiting for error')}
               hasQuickStartUpdatesFeature
+              hasQuickStartUpdatesFeatureGA={hasQuickStartUpdatesFeatureGA(organization)}
             />
           );
         }
@@ -228,7 +230,7 @@ export function getOnboardingTasks({
           <EventWaiter
             api={api}
             organization={organization}
-            project={projects[0]}
+            project={projects[0]!}
             eventType="error"
             onIssueReceived={() => !taskIsDone(task) && onCompleteTask?.()}
           >
@@ -323,6 +325,7 @@ export function getOnboardingTasks({
           <EventWaitingIndicator
             text={t('Waiting for error')}
             hasQuickStartUpdatesFeature
+            hasQuickStartUpdatesFeatureGA={hasQuickStartUpdatesFeatureGA(organization)}
           />
         );
       },
@@ -369,14 +372,14 @@ export function getOnboardingTasks({
 
         if (projectsForOnboarding.length) {
           navigateTo(
-            `${performanceUrl}?project=${projectsForOnboarding[0].id}#performance-sidequest`,
+            `${performanceUrl}?project=${projectsForOnboarding[0]!.id}#performance-sidequest`,
             router
           );
           return;
         }
 
         navigateTo(
-          `${performanceUrl}?project=${projectsWithoutFirstTransactionEvent[0].id}#performance-sidequest`,
+          `${performanceUrl}?project=${projectsWithoutFirstTransactionEvent[0]!.id}#performance-sidequest`,
           router
         );
       },
@@ -391,7 +394,12 @@ export function getOnboardingTasks({
           if (!projects?.length || task.requisiteTasks.length > 0 || taskIsDone(task)) {
             return null;
           }
-          return <EventWaitingIndicator hasQuickStartUpdatesFeature />;
+          return (
+            <EventWaitingIndicator
+              hasQuickStartUpdatesFeature
+              hasQuickStartUpdatesFeatureGA={hasQuickStartUpdatesFeatureGA(organization)}
+            />
+          );
         }
 
         return !!projects?.length &&
@@ -400,7 +408,7 @@ export function getOnboardingTasks({
           <EventWaiter
             api={api}
             organization={organization}
-            project={projects[0]}
+            project={projects[0]!}
             eventType="transaction"
             onIssueReceived={() => !taskIsDone(task) && onCompleteTask?.()}
           >
@@ -466,6 +474,7 @@ export function getOnboardingTasks({
             <EventWaitingIndicator
               text={t('Waiting for user session')}
               hasQuickStartUpdatesFeature
+              hasQuickStartUpdatesFeatureGA={hasQuickStartUpdatesFeatureGA(organization)}
             />
           );
         }
@@ -476,7 +485,7 @@ export function getOnboardingTasks({
           <EventWaiter
             api={api}
             organization={organization}
-            project={projects[0]}
+            project={projects[0]!}
             eventType="replay"
             onIssueReceived={() => !taskIsDone(task) && onCompleteTask?.()}
           >
@@ -578,32 +587,44 @@ export function getMergedTasks({organization, projects, onboardingContext}: Opti
   }));
 }
 
-const PulsingIndicator = styled('div')<{hasQuickStartUpdatesFeature?: boolean}>`
+const PulsingIndicator = styled('div')<{
+  hasQuickStartUpdatesFeature?: boolean;
+  hasQuickStartUpdatesFeatureGA?: boolean;
+}>`
   ${pulsingIndicatorStyles};
   ${p =>
-    p.hasQuickStartUpdatesFeature
+    p.hasQuickStartUpdatesFeatureGA
       ? css`
-          margin: 0 ${space(0.5)};
+          margin: 0;
         `
-      : css`
-          margin-right: ${space(1)};
-        `}
+      : p.hasQuickStartUpdatesFeature
+        ? css`
+            margin: 0 ${space(0.5)};
+          `
+        : css`
+            margin-right: ${space(1)};
+          `}
 `;
 
 const EventWaitingIndicator = styled(
   ({
     hasQuickStartUpdatesFeature: quickStartUpdatesFeature,
+    hasQuickStartUpdatesFeatureGA: quickStartUpdatesFeatureGA,
     text,
     ...p
   }: React.HTMLAttributes<HTMLDivElement> & {
     hasQuickStartUpdatesFeature?: boolean;
+    hasQuickStartUpdatesFeatureGA?: boolean;
     text?: string;
   }) => {
     if (quickStartUpdatesFeature) {
       return (
         <div {...p}>
           <Tooltip title={text || t('Waiting for event')}>
-            <PulsingIndicator hasQuickStartUpdatesFeature />
+            <PulsingIndicator
+              hasQuickStartUpdatesFeature
+              hasQuickStartUpdatesFeatureGA={quickStartUpdatesFeatureGA}
+            />
           </Tooltip>
         </div>
       );
diff --git a/static/app/components/onboardingWizard/utils.tsx b/static/app/components/onboardingWizard/utils.tsx
index 1374b3fc828b03..7cae388afafbb3 100644
--- a/static/app/components/onboardingWizard/utils.tsx
+++ b/static/app/components/onboardingWizard/utils.tsx
@@ -16,3 +16,7 @@ export const findUpcomingTasks = (task: OnboardingTask) =>
 export function hasQuickStartUpdatesFeature(organization: Organization) {
   return organization.features?.includes('quick-start-updates');
 }
+
+export function hasQuickStartUpdatesFeatureGA(organization: Organization) {
+  return organization.features?.includes('quick-start-updates-ga');
+}
diff --git a/static/app/components/organizations/environmentPageFilter/index.spec.tsx b/static/app/components/organizations/environmentPageFilter/index.spec.tsx
index 4d2d98fd6bf0b9..8d6c6363c55516 100644
--- a/static/app/components/organizations/environmentPageFilter/index.spec.tsx
+++ b/static/app/components/organizations/environmentPageFilter/index.spec.tsx
@@ -76,8 +76,8 @@ describe('EnvironmentPageFilter', function () {
     await userEvent.click(screen.getByRole('button', {name: 'All Envs'}));
 
     // Select prod & stage by clicking on their checkboxes
-    await fireEvent.click(screen.getByRole('checkbox', {name: 'Select prod'}));
-    await fireEvent.click(screen.getByRole('checkbox', {name: 'Select stage'}));
+    fireEvent.click(screen.getByRole('checkbox', {name: 'Select prod'}));
+    fireEvent.click(screen.getByRole('checkbox', {name: 'Select stage'}));
 
     // Click "Apply"
     await userEvent.click(screen.getByRole('button', {name: 'Apply'}));
diff --git a/static/app/components/organizations/environmentPageFilter/trigger.tsx b/static/app/components/organizations/environmentPageFilter/trigger.tsx
index 7146b4b5e9a937..b37703f0156056 100644
--- a/static/app/components/organizations/environmentPageFilter/trigger.tsx
+++ b/static/app/components/organizations/environmentPageFilter/trigger.tsx
@@ -27,7 +27,7 @@ function BaseEnvironmentPageFilterTrigger(
   // Show 2 environments only if the combined string's length does not exceed 25.
   // Otherwise show only 1 environment.
   const envsToShow =
-    value[0]?.length + value[1]?.length <= 23 ? value.slice(0, 2) : value.slice(0, 1);
+    value[0]!?.length + value[1]!?.length <= 23 ? value.slice(0, 2) : value.slice(0, 1);
 
   // e.g. "production, staging"
   const enumeratedLabel = envsToShow.map(env => trimSlug(env, 25)).join(', ');
diff --git a/static/app/components/organizations/headerItem.tsx b/static/app/components/organizations/headerItem.tsx
deleted file mode 100644
index dd048a13d0f332..00000000000000
--- a/static/app/components/organizations/headerItem.tsx
+++ /dev/null
@@ -1,201 +0,0 @@
-import {forwardRef} from 'react';
-import isPropValid from '@emotion/is-prop-valid';
-import type {Theme} from '@emotion/react';
-import styled from '@emotion/styled';
-import omit from 'lodash/omit';
-
-import Link from 'sentry/components/links/link';
-import {Tooltip} from 'sentry/components/tooltip';
-import {IconChevron, IconClose, IconInfo, IconLock, IconSettings} from 'sentry/icons';
-import {t} from 'sentry/locale';
-import {space} from 'sentry/styles/space';
-
-type DefaultProps = {
-  allowClear: boolean;
-};
-
-type Props = {
-  icon: React.ReactNode;
-  forwardedRef?: React.Ref<HTMLDivElement>;
-  hasChanges?: boolean;
-  hasSelected?: boolean;
-  hint?: string;
-  isOpen?: boolean;
-  loading?: boolean;
-  locked?: boolean;
-  lockedMessage?: React.ReactNode;
-  onClear?: () => void;
-  settingsLink?: string;
-} & Partial<DefaultProps> &
-  React.HTMLAttributes<HTMLDivElement>;
-
-function HeaderItem({
-  children,
-  isOpen,
-  hasSelected,
-  icon,
-  locked,
-  lockedMessage,
-  settingsLink,
-  hint,
-  loading,
-  forwardedRef,
-  onClear,
-  allowClear = true,
-  ...props
-}: Props) {
-  const handleClear = (e: React.MouseEvent) => {
-    e.stopPropagation();
-    onClear?.();
-  };
-
-  const textColorProps = {
-    locked,
-    isOpen,
-    hasSelected,
-  };
-
-  return (
-    <StyledHeaderItem
-      ref={forwardedRef}
-      loading={!!loading}
-      {...omit(props, 'onClear')}
-      {...textColorProps}
-    >
-      <IconContainer {...textColorProps}>{icon}</IconContainer>
-      <Content>
-        <StyledContent>{children}</StyledContent>
-
-        {settingsLink && (
-          <SettingsIconLink to={settingsLink}>
-            <IconSettings />
-          </SettingsIconLink>
-        )}
-      </Content>
-      {hint && (
-        <Hint>
-          <Tooltip title={hint} position="bottom">
-            <IconInfo size="sm" />
-          </Tooltip>
-        </Hint>
-      )}
-      {hasSelected && !locked && allowClear && (
-        <StyledClose {...textColorProps} onClick={handleClear} />
-      )}
-      {!locked && !loading && (
-        <ChevronWrapper>
-          <StyledChevron isOpen={!!isOpen} direction={isOpen ? 'up' : 'down'} size="sm" />
-        </ChevronWrapper>
-      )}
-      {locked && (
-        <Tooltip title={lockedMessage || t('This selection is locked')} position="bottom">
-          <StyledLock color="gray300" locked />
-        </Tooltip>
-      )}
-    </StyledHeaderItem>
-  );
-}
-
-// Infer props here because of styled/theme
-const getColor = (p: ColorProps & {theme: Theme}) => {
-  if (p.locked) {
-    return p.theme.gray300;
-  }
-  return p.isOpen || p.hasSelected ? p.theme.textColor : p.theme.gray300;
-};
-
-type ColorProps = {
-  hasSelected?: boolean;
-  isOpen?: boolean;
-  locked?: boolean;
-};
-
-const StyledHeaderItem = styled('div', {
-  shouldForwardProp: p => typeof p === 'string' && isPropValid(p) && p !== 'loading',
-})<
-  ColorProps & {
-    loading: boolean;
-  }
->`
-  display: flex;
-  padding: 0 ${space(4)};
-  align-items: center;
-  cursor: ${p => (p.loading ? 'progress' : p.locked ? 'text' : 'pointer')};
-  color: ${getColor};
-  transition: 0.1s color;
-  user-select: none;
-`;
-
-const Content = styled('div')`
-  display: flex;
-  flex: 1;
-  width: 0;
-  white-space: nowrap;
-  overflow: hidden;
-  margin-right: ${space(1.5)};
-`;
-
-const StyledContent = styled('div')`
-  overflow: hidden;
-  text-overflow: ellipsis;
-`;
-
-const IconContainer = styled('span', {shouldForwardProp: isPropValid})<ColorProps>`
-  color: ${getColor};
-  margin-right: ${space(1.5)};
-  display: flex;
-  font-size: ${p => p.theme.fontSizeMedium};
-`;
-
-const Hint = styled('div')`
-  position: relative;
-  top: ${space(0.25)};
-  margin-right: ${space(1)};
-`;
-
-const StyledClose = styled(IconClose, {shouldForwardProp: isPropValid})<ColorProps>`
-  color: ${getColor};
-  height: ${space(1.5)};
-  width: ${space(1.5)};
-  stroke-width: 1.5;
-  padding: ${space(1)};
-  box-sizing: content-box;
-  margin: -${space(1)} 0px -${space(1)} -${space(1)};
-`;
-
-const ChevronWrapper = styled('div')`
-  width: ${space(2)};
-  height: ${space(2)};
-  display: flex;
-  align-items: center;
-  justify-content: center;
-`;
-
-const StyledChevron = styled(IconChevron, {shouldForwardProp: isPropValid})<{
-  isOpen: boolean;
-}>`
-  color: ${getColor};
-`;
-
-const SettingsIconLink = styled(Link)`
-  color: ${p => p.theme.gray300};
-  align-items: center;
-  display: inline-flex;
-  justify-content: space-between;
-  margin-right: ${space(1.5)};
-  margin-left: ${space(1.0)};
-  transition: 0.5s opacity ease-out;
-
-  &:hover {
-    color: ${p => p.theme.textColor};
-  }
-`;
-
-const StyledLock = styled(IconLock)`
-  margin-top: ${space(0.75)};
-  stroke-width: 1.5;
-`;
-
-export default forwardRef<HTMLDivElement, Props>((props, ref) => (
-  <HeaderItem forwardedRef={ref} {...props} />
-));
diff --git a/static/app/components/organizations/hybridFilter.spec.tsx b/static/app/components/organizations/hybridFilter.spec.tsx
index 68661ecab69f9a..4bc239c5b28e24 100644
--- a/static/app/components/organizations/hybridFilter.spec.tsx
+++ b/static/app/components/organizations/hybridFilter.spec.tsx
@@ -63,8 +63,8 @@ describe('ProjectPageFilter', function () {
     // Clicking on the checkboxes in Option One & Option Two _adds_ the options to the
     // current selection state (multiple selection mode)
     await userEvent.click(screen.getByRole('button', {expanded: false}));
-    await fireEvent.click(screen.getByRole('checkbox', {name: 'Select Option One'}));
-    await fireEvent.click(screen.getByRole('checkbox', {name: 'Select Option Two'}));
+    fireEvent.click(screen.getByRole('checkbox', {name: 'Select Option One'}));
+    fireEvent.click(screen.getByRole('checkbox', {name: 'Select Option Two'}));
     expect(screen.getByRole('checkbox', {name: 'Select Option One'})).toBeChecked();
     expect(screen.getByRole('checkbox', {name: 'Select Option Two'})).toBeChecked();
 
@@ -92,10 +92,10 @@ describe('ProjectPageFilter', function () {
       which: 17,
       ctrlKey: true,
     };
-    await fireEvent.keyDown(screen.getByRole('grid'), ctrlKeyOpts); // Press & hold Ctrl
+    fireEvent.keyDown(screen.getByRole('grid'), ctrlKeyOpts); // Press & hold Ctrl
     await userEvent.click(screen.getByRole('row', {name: 'Option One'}));
-    await fireEvent.click(screen.getByRole('row', {name: 'Option Two'}));
-    await fireEvent.keyUp(screen.getByRole('grid'), ctrlKeyOpts); // Release Ctrl
+    fireEvent.click(screen.getByRole('row', {name: 'Option Two'}));
+    fireEvent.keyUp(screen.getByRole('grid'), ctrlKeyOpts); // Release Ctrl
     expect(screen.getByRole('checkbox', {name: 'Select Option One'})).not.toBeChecked();
     expect(screen.getByRole('checkbox', {name: 'Select Option Two'})).not.toBeChecked();
 
@@ -110,7 +110,7 @@ describe('ProjectPageFilter', function () {
 
     // Open the menu, select Option One
     await userEvent.click(screen.getByRole('button', {expanded: false}));
-    await fireEvent.click(screen.getByRole('checkbox', {name: 'Select Option One'}));
+    fireEvent.click(screen.getByRole('checkbox', {name: 'Select Option One'}));
 
     // Press Cancel
     await userEvent.click(screen.getByRole('button', {name: 'Cancel'}));
@@ -140,7 +140,7 @@ describe('ProjectPageFilter', function () {
     expect(screen.queryByRole('button', {name: 'Reset'})).not.toBeInTheDocument();
 
     // Select Option Two, Reset button shows up
-    await fireEvent.click(screen.getByRole('checkbox', {name: 'Select Option Two'}));
+    fireEvent.click(screen.getByRole('checkbox', {name: 'Select Option Two'}));
     expect(screen.getByRole('checkbox', {name: 'Select Option Two'})).toBeChecked();
     expect(screen.getByRole('button', {name: 'Reset'})).toBeInTheDocument();
 
@@ -181,7 +181,7 @@ describe('ProjectPageFilter', function () {
     // focused to activate it. With RTL, however, onChange events aren't fired on Space
     // key press (https://github.com/testing-library/react-testing-library/issues/122),
     // so we'll have to simulate a click event instead.
-    await fireEvent.click(screen.getByRole('checkbox', {name: 'Select Option One'}));
+    fireEvent.click(screen.getByRole('checkbox', {name: 'Select Option One'}));
     expect(screen.getByRole('checkbox', {name: 'Select Option One'})).toBeChecked();
 
     // Click "Apply" button, onChange is called
diff --git a/static/app/components/organizations/hybridFilter.tsx b/static/app/components/organizations/hybridFilter.tsx
index 82ac8be78b7aee..eb9f17e961dc58 100644
--- a/static/app/components/organizations/hybridFilter.tsx
+++ b/static/app/components/organizations/hybridFilter.tsx
@@ -324,12 +324,12 @@ export function HybridFilter<Value extends SelectKey>({
       // A modifier key is being pressed --> enter multiple selection mode
       if (multiple && modifierKeyPressed) {
         !modifierTipSeen && setModifierTipSeen(true);
-        toggleOption(diff[0]);
+        toggleOption(diff[0]!);
         return;
       }
 
       // Only one option was clicked on --> use single, direct selection mode
-      onReplace?.(diff[0]);
+      onReplace?.(diff[0]!);
       commit(diff);
     },
     [
diff --git a/static/app/components/organizations/pageFilters/container.spec.tsx b/static/app/components/organizations/pageFilters/container.spec.tsx
index 67b89b59c739d1..76a5e97525280d 100644
--- a/static/app/components/organizations/pageFilters/container.spec.tsx
+++ b/static/app/components/organizations/pageFilters/container.spec.tsx
@@ -225,9 +225,9 @@ describe('PageFiltersContainer', function () {
 
     await waitFor(() => {
       expect(globalActions.updateDateTime).not.toHaveBeenCalled();
-      expect(globalActions.updateProjects).not.toHaveBeenCalled();
-      expect(globalActions.updateEnvironments).not.toHaveBeenCalled();
     });
+    expect(globalActions.updateProjects).not.toHaveBeenCalled();
+    expect(globalActions.updateEnvironments).not.toHaveBeenCalled();
 
     expect(PageFiltersStore.getState()).toEqual({
       isReady: true,
diff --git a/static/app/components/organizations/pageFilters/pageFilterDropdownButton.tsx b/static/app/components/organizations/pageFilters/pageFilterDropdownButton.tsx
deleted file mode 100644
index 305fd4887ce8b7..00000000000000
--- a/static/app/components/organizations/pageFilters/pageFilterDropdownButton.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import styled from '@emotion/styled';
-
-import DropdownButton from 'sentry/components/dropdownButton';
-
-type Props = {
-  /**
-   * Highlights the button blue. For page filters this indicates the filter
-   * has been desynced from the URL.
-   */
-  highlighted?: boolean;
-};
-
-const PageFilterDropdownButton = styled(DropdownButton)<Props>`
-  width: 100%;
-  text-overflow: ellipsis;
-  ${p =>
-    p.highlighted &&
-    `
-    &,
-    &:active,
-    &:hover,
-    &:focus {
-      background-color: ${p.theme.purple100};
-      border-color: ${p.theme.purple200};
-    }
-  `}
-`;
-
-export default PageFilterDropdownButton;
diff --git a/static/app/components/organizations/pageFilters/pageFilterPinButton.tsx b/static/app/components/organizations/pageFilters/pageFilterPinButton.tsx
deleted file mode 100644
index f9212df92bdc77..00000000000000
--- a/static/app/components/organizations/pageFilters/pageFilterPinButton.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-import styled from '@emotion/styled';
-
-import {pinFilter} from 'sentry/actionCreators/pageFilters';
-import type {ButtonProps} from 'sentry/components/button';
-import {Button} from 'sentry/components/button';
-import {IconLock} from 'sentry/icons';
-import {t} from 'sentry/locale';
-import type {PinnedPageFilter} from 'sentry/types/core';
-import type {Organization} from 'sentry/types/organization';
-import {trackAnalytics} from 'sentry/utils/analytics';
-import usePageFilters from 'sentry/utils/usePageFilters';
-
-type Props = {
-  filter: PinnedPageFilter;
-  organization: Organization;
-  size: Extract<ButtonProps['size'], 'xs' | 'zero'>;
-  className?: string;
-};
-
-function PageFilterPinButton({organization, filter, size, className}: Props) {
-  const {pinnedFilters} = usePageFilters();
-  const pinned = pinnedFilters.has(filter);
-
-  const onPin = () => {
-    trackAnalytics('page_filters.pin_click', {
-      organization,
-      filter,
-      pin: !pinned,
-    });
-    pinFilter(filter, !pinned);
-  };
-
-  return (
-    <PinButton
-      className={className}
-      aria-pressed={pinned}
-      aria-label={t('Lock filter')}
-      onClick={onPin}
-      size={size}
-      pinned={pinned}
-      borderless={size === 'zero'}
-      icon={<IconLock locked={pinned} size="xs" />}
-      title={t("Once locked, Sentry will remember this filter's value across pages.")}
-      tooltipProps={{delay: 500}}
-    >
-      {pinned ? t('Locked') : t('Lock')}
-    </PinButton>
-  );
-}
-
-const PinButton = styled(Button)<{pinned: boolean; size: 'xs' | 'zero'}>`
-  display: block;
-  color: ${p => p.theme.textColor};
-
-  :hover {
-    color: ${p => p.theme.headingColor};
-  }
-  ${p => p.size === 'zero' && 'background: transparent'};
-`;
-
-export default PageFilterPinButton;
diff --git a/static/app/components/organizations/pageFilters/pageFilterPinIndicator.tsx b/static/app/components/organizations/pageFilters/pageFilterPinIndicator.tsx
deleted file mode 100644
index 87337e61998a61..00000000000000
--- a/static/app/components/organizations/pageFilters/pageFilterPinIndicator.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import styled from '@emotion/styled';
-
-import {IconLock} from 'sentry/icons';
-import {t} from 'sentry/locale';
-import {space} from 'sentry/styles/space';
-import type {PinnedPageFilter} from 'sentry/types/core';
-import usePageFilters from 'sentry/utils/usePageFilters';
-
-type Props = {
-  children: React.ReactNode;
-  filter: PinnedPageFilter;
-};
-
-function PageFilterPinIndicator({children, filter}: Props) {
-  const {pinnedFilters} = usePageFilters();
-  const pinned = pinnedFilters.has(filter);
-
-  return (
-    <Wrap>
-      {children}
-      {pinned && (
-        <IndicatorWrap aria-label={t('Filter applied across pages')}>
-          <StyledIconLock size="xs" locked />
-        </IndicatorWrap>
-      )}
-    </Wrap>
-  );
-}
-
-export default PageFilterPinIndicator;
-
-const Wrap = styled('div')`
-  position: relative;
-  display: flex;
-  align-items: center;
-  transform: translateX(-${space(0.25)});
-`;
-
-const IndicatorWrap = styled('div')`
-  position: absolute;
-  bottom: 0;
-  right: 0;
-  transform: translate(50%, 35%);
-  border-radius: 50%;
-  background-color: ${p => p.theme.background};
-
-  padding: ${space(0.25)};
-
-  display: flex;
-  align-items: center;
-  justify-content: center;
-`;
-
-const StyledIconLock = styled(IconLock)`
-  width: 0.5rem;
-  height: 0.5rem;
-  color: ${p => p.theme.textColor};
-`;
diff --git a/static/app/components/organizations/pageFilters/parse.spec.tsx b/static/app/components/organizations/pageFilters/parse.spec.tsx
index b0574e813f49f4..051b0c26e2a5a3 100644
--- a/static/app/components/organizations/pageFilters/parse.spec.tsx
+++ b/static/app/components/organizations/pageFilters/parse.spec.tsx
@@ -207,9 +207,9 @@ describe('parseStatsPeriod', function () {
   });
 
   it('should return default statsPeriod if it is not provided or is invalid', function () {
-    expect(parseStatsPeriod('invalid')).toEqual(undefined);
-    expect(parseStatsPeriod('24f')).toEqual(undefined);
-    expect(parseStatsPeriod('')).toEqual(undefined);
+    expect(parseStatsPeriod('invalid')).toBeUndefined();
+    expect(parseStatsPeriod('24f')).toBeUndefined();
+    expect(parseStatsPeriod('')).toBeUndefined();
     expect(parseStatsPeriod('24')).toEqual({period: '24', periodLength: 's'});
   });
 
diff --git a/static/app/components/organizations/pageFilters/utils.tsx b/static/app/components/organizations/pageFilters/utils.tsx
index d4abbf37a0f1c5..98f17cd9138eec 100644
--- a/static/app/components/organizations/pageFilters/utils.tsx
+++ b/static/app/components/organizations/pageFilters/utils.tsx
@@ -5,7 +5,7 @@ import pick from 'lodash/pick';
 import pickBy from 'lodash/pickBy';
 
 import {DEFAULT_STATS_PERIOD} from 'sentry/constants';
-import {DATE_TIME_KEYS, URL_PARAM} from 'sentry/constants/pageFilters';
+import {URL_PARAM} from 'sentry/constants/pageFilters';
 import type {PageFilters} from 'sentry/types/core';
 
 /**
@@ -35,13 +35,6 @@ export function extractSelectionParameters(query: Location['query']) {
   return pickBy(pick(query, Object.values(URL_PARAM)), identity);
 }
 
-/**
- * Extract the page filter datetime parameters from an object.
- */
-export function extractDatetimeSelectionParameters(query: Location['query']) {
-  return pickBy(pick(query, Object.values(DATE_TIME_KEYS)), identity);
-}
-
 /**
  * Compare the non-utc values of two selections.
  * Useful when re-fetching data based on page filters changing.
diff --git a/static/app/components/organizations/projectPageFilter/index.spec.tsx b/static/app/components/organizations/projectPageFilter/index.spec.tsx
index 4a116187aae2d6..2a2f37c3da2fd1 100644
--- a/static/app/components/organizations/projectPageFilter/index.spec.tsx
+++ b/static/app/components/organizations/projectPageFilter/index.spec.tsx
@@ -83,11 +83,11 @@ describe('ProjectPageFilter', function () {
     await userEvent.click(screen.getByRole('button', {name: 'My Projects'}));
 
     // Deselect project-1 & project-2 by clicking on their checkboxes
-    await fireEvent.click(screen.getByRole('checkbox', {name: 'Select project-1'}));
-    await fireEvent.click(screen.getByRole('checkbox', {name: 'Select project-2'}));
+    fireEvent.click(screen.getByRole('checkbox', {name: 'Select project-1'}));
+    fireEvent.click(screen.getByRole('checkbox', {name: 'Select project-2'}));
 
     // Select project-3 by clicking on its checkbox
-    await fireEvent.click(screen.getByRole('checkbox', {name: 'Select project-3'}));
+    fireEvent.click(screen.getByRole('checkbox', {name: 'Select project-3'}));
 
     // Click "Apply"
     await userEvent.click(screen.getByRole('button', {name: 'Apply'}));
diff --git a/static/app/components/organizations/projectPageFilter/index.tsx b/static/app/components/organizations/projectPageFilter/index.tsx
index 6917dd03b8dec6..393d75d57e1ec8 100644
--- a/static/app/components/organizations/projectPageFilter/index.tsx
+++ b/static/app/components/organizations/projectPageFilter/index.tsx
@@ -171,10 +171,10 @@ export function ProjectPageFilter({
       if (!val.length) {
         return allowMultiple
           ? memberProjects.map(p => parseInt(p.id, 10))
-          : [parseInt(memberProjects[0]?.id, 10)];
+          : [parseInt(memberProjects[0]!?.id, 10)];
       }
 
-      return allowMultiple ? val : [val[0]];
+      return allowMultiple ? val : [val[0]!];
     },
     [memberProjects, allowMultiple]
   );
diff --git a/static/app/components/organizations/projectPageFilter/trigger.tsx b/static/app/components/organizations/projectPageFilter/trigger.tsx
index 93b09ff1281862..64fdf90744d256 100644
--- a/static/app/components/organizations/projectPageFilter/trigger.tsx
+++ b/static/app/components/organizations/projectPageFilter/trigger.tsx
@@ -54,7 +54,7 @@ function BaseProjectPageFilterTrigger(
   // Show 2 projects only if the combined string does not exceed maxTitleLength.
   // Otherwise show only 1 project.
   const projectsToShow =
-    selectedProjects[0]?.slug?.length + selectedProjects[1]?.slug?.length <= 23
+    selectedProjects[0]!?.slug?.length + selectedProjects[1]!?.slug?.length <= 23
       ? selectedProjects.slice(0, 2)
       : selectedProjects.slice(0, 1);
 
diff --git a/static/app/components/performance/searchBar.spec.tsx b/static/app/components/performance/searchBar.spec.tsx
index 61b618cf1f32c1..b3f772c23bd4b6 100644
--- a/static/app/components/performance/searchBar.spec.tsx
+++ b/static/app/components/performance/searchBar.spec.tsx
@@ -157,10 +157,11 @@ describe('SearchBar', () => {
 
     render(<SearchBar {...testProps} onSearch={onSearch} />);
 
-    await userEvent.type(
-      screen.getByRole('textbox'),
-      'GET /my-endpoint{ArrowDown}{Enter}'
-    );
+    await userEvent.type(screen.getByRole('textbox'), 'GET /my-endpoint');
+
+    await screen.findByText('GET /my-endpoint');
+
+    await userEvent.keyboard('{ArrowDown}{Enter}');
 
     expect(onSearch).toHaveBeenCalledTimes(1);
     expect(onSearch).toHaveBeenCalledWith('transaction:"GET /my-endpoint"');
diff --git a/static/app/components/performance/searchBar.tsx b/static/app/components/performance/searchBar.tsx
index 70bec1c1122e12..79e16eedb018e1 100644
--- a/static/app/components/performance/searchBar.tsx
+++ b/static/app/components/performance/searchBar.tsx
@@ -2,25 +2,24 @@ import {useCallback, useRef, useState} from 'react';
 import styled from '@emotion/styled';
 import debounce from 'lodash/debounce';
 
+import {getSearchGroupWithItemMarkedActive} from 'sentry/components/deprecatedSmartSearchBar/utils';
 import BaseSearchBar from 'sentry/components/searchBar';
-import {getSearchGroupWithItemMarkedActive} from 'sentry/components/smartSearchBar/utils';
 import {DEFAULT_DEBOUNCE_DURATION} from 'sentry/constants';
 import {t} from 'sentry/locale';
 import type {Organization} from 'sentry/types/organization';
 import {trackAnalytics} from 'sentry/utils/analytics';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import type EventView from 'sentry/utils/discover/eventView';
 import {doDiscoverQuery} from 'sentry/utils/discover/genericDiscoverQuery';
 import {parsePeriodToHours} from 'sentry/utils/duration/parsePeriodToHours';
 import {MutableSearch} from 'sentry/utils/tokenizeSearch';
-import normalizeUrl from 'sentry/utils/url/normalizeUrl';
 import useApi from 'sentry/utils/useApi';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOnClickOutside from 'sentry/utils/useOnClickOutside';
 import {transactionSummaryRouteWithQuery} from 'sentry/views/performance/transactionSummary/utils';
 
-import SearchDropdown from '../smartSearchBar/searchDropdown';
-import type {SearchGroup} from '../smartSearchBar/types';
-import {ItemType} from '../smartSearchBar/types';
+import SearchDropdown from '../deprecatedSmartSearchBar/searchDropdown';
+import type {SearchGroup} from '../deprecatedSmartSearchBar/types';
+import {ItemType} from '../deprecatedSmartSearchBar/types';
 
 const TRANSACTION_SEARCH_PERIOD = '14d';
 
@@ -45,6 +44,7 @@ function SearchBar(props: SearchBarProps) {
     additionalConditions,
   } = props;
 
+  const navigate = useNavigate();
   const [searchResults, setSearchResults] = useState<SearchGroup[]>([]);
   const transactionCount = searchResults[0]?.children?.length || 0;
   const [highlightedItemIndex, setHighlightedItemIndex] = useState(-1);
@@ -97,12 +97,12 @@ function SearchBar(props: SearchBarProps) {
       isDropdownOpen &&
       transactionCount > 0
     ) {
-      const currentHighlightedItem = searchResults[0].children[highlightedItemIndex];
+      const currentHighlightedItem = searchResults[0]!.children[highlightedItemIndex];
       const nextHighlightedItemIndex =
         (highlightedItemIndex + transactionCount + (key === 'ArrowUp' ? -1 : 1)) %
         transactionCount;
       setHighlightedItemIndex(nextHighlightedItemIndex);
-      const nextHighlightedItem = searchResults[0].children[nextHighlightedItemIndex];
+      const nextHighlightedItem = searchResults[0]!.children[nextHighlightedItemIndex];
 
       let newSearchResults = searchResults;
       if (currentHighlightedItem) {
@@ -238,7 +238,7 @@ function SearchBar(props: SearchBarProps) {
       query,
     });
 
-    browserHistory.push(normalizeUrl(next));
+    navigate(next);
   };
   const logDocsOpenedEvent = () => {
     trackAnalytics('search.docs_opened', {
diff --git a/static/app/components/performance/spanSearchQueryBuilder.tsx b/static/app/components/performance/spanSearchQueryBuilder.tsx
index 8bef5f125bbad9..6eb88ce16ee0d4 100644
--- a/static/app/components/performance/spanSearchQueryBuilder.tsx
+++ b/static/app/components/performance/spanSearchQueryBuilder.tsx
@@ -167,6 +167,7 @@ export function EAPSpanSearchQueryBuilder({
   stringTags,
   getFilterTokenWarning,
   supportedAggregates = [],
+  projects,
 }: EAPSpanSearchQueryBuilderProps) {
   const api = useApi();
   const organization = useOrganization();
@@ -215,7 +216,7 @@ export function EAPSpanSearchQueryBuilder({
           orgSlug: organization.slug,
           fieldKey: tag.key,
           search: queryString,
-          projectIds: selection.projects.map(String),
+          projectIds: (projects ?? selection.projects).map(String),
           endpointParams: normalizeDateTimeParams(selection.datetime),
           dataset: 'spans',
         });
@@ -224,7 +225,7 @@ export function EAPSpanSearchQueryBuilder({
         throw new Error(`Unable to fetch event field values: ${e}`);
       }
     },
-    [api, organization.slug, selection.projects, selection.datetime, numberTags]
+    [api, organization.slug, selection.projects, projects, selection.datetime, numberTags]
   );
 
   return (
diff --git a/static/app/components/performance/transactionSearchQueryBuilder.tsx b/static/app/components/performance/transactionSearchQueryBuilder.tsx
index 7de519a8021e72..47a795f7e30e46 100644
--- a/static/app/components/performance/transactionSearchQueryBuilder.tsx
+++ b/static/app/components/performance/transactionSearchQueryBuilder.tsx
@@ -34,7 +34,7 @@ interface TransactionSearchQueryBuilderProps {
   filterKeyMenuWidth?: number;
   onSearch?: (query: string, state: CallbackSearchState) => void;
   placeholder?: string;
-  projects?: PageFilters['projects'];
+  projects?: PageFilters['projects'] | Readonly<number[]>;
   trailingItems?: React.ReactNode;
 }
 
diff --git a/static/app/components/performance/waterfall/rowDivider.tsx b/static/app/components/performance/waterfall/rowDivider.tsx
index 9e807274f43f74..7b94abd1d0f200 100644
--- a/static/app/components/performance/waterfall/rowDivider.tsx
+++ b/static/app/components/performance/waterfall/rowDivider.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled';
 
-import {IconAdd, IconFire, IconGraph, IconProfiling, IconSubtract} from 'sentry/icons';
+import {IconAdd, IconFire, IconProfiling, IconSubtract} from 'sentry/icons';
 import {space} from 'sentry/styles/space';
 import type {Aliases, Color} from 'sentry/utils/theme';
 
@@ -75,14 +75,6 @@ export function ErrorBadge() {
   );
 }
 
-export function MetricsBadge() {
-  return (
-    <BadgeBorder color="pink400">
-      <IconGraph color="pink400" size="xs" />
-    </BadgeBorder>
-  );
-}
-
 export function EmbeddedTransactionBadge({
   inTraceView = false,
   expanded,
diff --git a/static/app/components/performance/waterfall/utils.spec.tsx b/static/app/components/performance/waterfall/utils.spec.tsx
index c284110f42a07c..e4664d79369cfd 100644
--- a/static/app/components/performance/waterfall/utils.spec.tsx
+++ b/static/app/components/performance/waterfall/utils.spec.tsx
@@ -16,7 +16,7 @@ describe('pickBarColor()', function () {
   });
 
   it('returns a random color when no predefined option is available', function () {
-    const colorsAsArray = Object.keys(CHART_PALETTE).map(key => CHART_PALETTE[17][key]);
+    const colorsAsArray = Object.keys(CHART_PALETTE).map(key => CHART_PALETTE[17]![key]);
 
     let randomColor = pickBarColor('a normal string');
     expect(colorsAsArray).toContain(randomColor);
diff --git a/static/app/components/performance/waterfall/utils.tsx b/static/app/components/performance/waterfall/utils.tsx
index 63b7fed34ff53c..3589403bf789e5 100644
--- a/static/app/components/performance/waterfall/utils.tsx
+++ b/static/app/components/performance/waterfall/utils.tsx
@@ -238,13 +238,13 @@ const getLetterIndex = (letter: string): number => {
   return index === -1 ? 0 : index;
 };
 
-const colorsAsArray = Object.keys(CHART_PALETTE).map(key => CHART_PALETTE[17][key]);
+const colorsAsArray = Object.keys(CHART_PALETTE).map(key => CHART_PALETTE[17]![key]);
 
 export const barColors = {
-  default: CHART_PALETTE[17][4],
-  transaction: CHART_PALETTE[17][8],
-  http: CHART_PALETTE[17][10],
-  db: CHART_PALETTE[17][17],
+  default: CHART_PALETTE[17]![4],
+  transaction: CHART_PALETTE[17]![8],
+  http: CHART_PALETTE[17]![10],
+  db: CHART_PALETTE[17]![17],
 };
 
 export const pickBarColor = (input: string | undefined): string => {
@@ -252,17 +252,17 @@ export const pickBarColor = (input: string | undefined): string => {
   // That way colors stay consistent between transactions.
 
   if (!input || input.length < 3) {
-    return CHART_PALETTE[17][4];
+    return CHART_PALETTE[17]![4]!;
   }
 
   if (barColors[input]) {
     return barColors[input];
   }
 
-  const letterIndex1 = getLetterIndex(input[0]);
-  const letterIndex2 = getLetterIndex(input[1]);
-  const letterIndex3 = getLetterIndex(input[2]);
-  const letterIndex4 = getLetterIndex(input[3]);
+  const letterIndex1 = getLetterIndex(input[0]!);
+  const letterIndex2 = getLetterIndex(input[1]!);
+  const letterIndex3 = getLetterIndex(input[2]!);
+  const letterIndex4 = getLetterIndex(input[3]!);
 
   return colorsAsArray[
     (letterIndex1 + letterIndex2 + letterIndex3 + letterIndex4) % colorsAsArray.length
diff --git a/static/app/components/performanceOnboarding/sidebar.tsx b/static/app/components/performanceOnboarding/sidebar.tsx
index d5e5996aa394f4..23a88d7fe47b63 100644
--- a/static/app/components/performanceOnboarding/sidebar.tsx
+++ b/static/app/components/performanceOnboarding/sidebar.tsx
@@ -85,7 +85,7 @@ function PerformanceOnboardingSidebar(props: CommonSidebarProps) {
 
       const priorityProjects: Project[] = [];
       priorityProjectIds.forEach(projectId => {
-        priorityProjects.push(projectMap[String(projectId)]);
+        priorityProjects.push(projectMap[String(projectId)]!);
       });
 
       // Among the project selection, find a project that has performance onboarding docs support, and has not sent
@@ -269,7 +269,7 @@ function OnboardingContent({currentProject}: {currentProject: Project}) {
     api,
     projectKeyId,
     dsn,
-    organization: organization,
+    organization,
     platformKey: currentProject.platform || 'other',
     projectId: currentProject.id,
     projectSlug: currentProject.slug,
diff --git a/static/app/components/pickProjectToContinue.tsx b/static/app/components/pickProjectToContinue.tsx
index b15d0fb082a4f1..b04309d63a6871 100644
--- a/static/app/components/pickProjectToContinue.tsx
+++ b/static/app/components/pickProjectToContinue.tsx
@@ -49,7 +49,7 @@ function PickProjectToContinue({
 
   // if the project in URL is missing, but this release belongs to only one project, redirect there
   if (projects.length === 1) {
-    router.replace(path + projects[0].id);
+    router.replace(path + projects[0]!.id);
     return null;
   }
 
diff --git a/static/app/components/platformPicker.spec.tsx b/static/app/components/platformPicker.spec.tsx
index a0a31b356c4904..6e127f16ce96c8 100644
--- a/static/app/components/platformPicker.spec.tsx
+++ b/static/app/components/platformPicker.spec.tsx
@@ -104,7 +104,7 @@ describe('PlatformPicker', function () {
     const platformNames = screen.getAllByRole('heading', {level: 3});
 
     platformNames.forEach((platform, index) => {
-      expect(platform).toHaveTextContent(alphabeticallyOrderedPlatformNames[index]);
+      expect(platform).toHaveTextContent(alphabeticallyOrderedPlatformNames[index]!);
     });
   });
 
diff --git a/static/app/components/platformPicker.tsx b/static/app/components/platformPicker.tsx
index edee2eda9fe73c..c1bba265ab8e1d 100644
--- a/static/app/components/platformPicker.tsx
+++ b/static/app/components/platformPicker.tsx
@@ -72,8 +72,8 @@ class PlatformPicker extends Component<PlatformPickerProps, State> {
   };
 
   state: State = {
-    category: this.props.defaultCategory ?? categoryList[0].id,
-    filter: this.props.noAutoFilter ? '' : (this.props.platform || '').split('-')[0],
+    category: this.props.defaultCategory ?? categoryList[0]!.id,
+    filter: this.props.noAutoFilter ? '' : (this.props.platform || '').split('-')[0]!,
   };
 
   get platformList() {
diff --git a/static/app/components/profiling/flamegraph/aggregateFlamegraph.tsx b/static/app/components/profiling/flamegraph/aggregateFlamegraph.tsx
index c7ab857c9ac7ea..95b293a55984cd 100644
--- a/static/app/components/profiling/flamegraph/aggregateFlamegraph.tsx
+++ b/static/app/components/profiling/flamegraph/aggregateFlamegraph.tsx
@@ -85,7 +85,7 @@ export function AggregateFlamegraph(props: AggregateFlamegraphProps): ReactEleme
     },
 
     // We skip position.view dependency because it will go into an infinite loop
-    // eslint-disable-next-line react-hooks/exhaustive-deps
+
     [flamegraph, flamegraphCanvas, flamegraphTheme]
   );
 
diff --git a/static/app/components/profiling/flamegraph/continuousFlamegraph.tsx b/static/app/components/profiling/flamegraph/continuousFlamegraph.tsx
index cbe1d3931fe460..a55ddbacc11dcf 100644
--- a/static/app/components/profiling/flamegraph/continuousFlamegraph.tsx
+++ b/static/app/components/profiling/flamegraph/continuousFlamegraph.tsx
@@ -165,11 +165,11 @@ function convertContinuousProfileMeasurementsToUIFrames(
   };
 
   for (let i = 0; i < measurement.values.length; i++) {
-    const value = measurement.values[i];
+    const value = measurement.values[i]!;
     const next = measurement.values[i + 1] ?? value;
 
     measurements.values.push({
-      elapsed: next.timestamp - value.timestamp,
+      elapsed: next!.timestamp - value.timestamp,
       value: value.value,
     });
   }
@@ -207,7 +207,7 @@ function findLongestMatchingFrame(
     }
 
     for (let i = 0; i < frame.children.length; i++) {
-      frames.push(frame.children[i]);
+      frames.push(frame.children[i]!);
     }
   }
 
@@ -425,8 +425,8 @@ export function ContinuousFlamegraph(): ReactElement {
 
         let offset = 0;
         for (let i = 0; i < measurements.values.length; i++) {
-          const value = measurements.values[i];
-          const next = measurements.values[i + 1] ?? value;
+          const value = measurements.values[i]!;
+          const next = measurements.values[i + 1]! ?? value;
           offset += (next.timestamp - value.timestamp) * 1e3;
 
           values.push({
@@ -467,8 +467,8 @@ export function ContinuousFlamegraph(): ReactElement {
 
         let offset = 0;
         for (let i = 0; i < measurements.values.length; i++) {
-          const value = measurements.values[i];
-          const next = measurements.values[i + 1] ?? value;
+          const value = measurements.values[i]!;
+          const next = measurements.values[i + 1]! ?? value;
           offset += (next.timestamp - value.timestamp) * 1e3;
 
           values.push({
@@ -502,8 +502,8 @@ export function ContinuousFlamegraph(): ReactElement {
 
       let offset = 0;
       for (let i = 0; i < memory_footprint.values.length; i++) {
-        const value = memory_footprint.values[i];
-        const next = memory_footprint.values[i + 1] ?? value;
+        const value = memory_footprint.values[i]!;
+        const next = memory_footprint.values[i + 1]! ?? value;
         offset += (next.timestamp - value.timestamp) * 1e3;
 
         values.push({
@@ -525,8 +525,8 @@ export function ContinuousFlamegraph(): ReactElement {
 
       let offset = 0;
       for (let i = 0; i < native_memory_footprint.values.length; i++) {
-        const value = native_memory_footprint.values[i];
-        const next = native_memory_footprint.values[i + 1] ?? value;
+        const value = native_memory_footprint.values[i]!;
+        const next = native_memory_footprint.values[i + 1]! ?? value;
         offset += (next.timestamp - value.timestamp) * 1e3;
 
         values.push({
diff --git a/static/app/components/profiling/flamegraph/deprecatedAggregateFlamegraph.tsx b/static/app/components/profiling/flamegraph/deprecatedAggregateFlamegraph.tsx
index f90210f1760126..2cde654bab7769 100644
--- a/static/app/components/profiling/flamegraph/deprecatedAggregateFlamegraph.tsx
+++ b/static/app/components/profiling/flamegraph/deprecatedAggregateFlamegraph.tsx
@@ -148,7 +148,7 @@ export function DeprecatedAggregateFlamegraph(
     },
 
     // We skip position.view dependency because it will go into an infinite loop
-    // eslint-disable-next-line react-hooks/exhaustive-deps
+
     [flamegraph, flamegraphCanvas, flamegraphTheme]
   );
 
@@ -172,7 +172,6 @@ export function DeprecatedAggregateFlamegraph(
     });
 
     // We skip `flamegraphCanvas` as it causes an infinite loop
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [flamegraph, setFlamegraphThemeMutation, flamegraphCanvas?.logicalSpace.height]);
 
   // Uses a useLayoutEffect to ensure that these top level/global listeners are added before
diff --git a/static/app/components/profiling/flamegraph/differentialFlamegraph.tsx b/static/app/components/profiling/flamegraph/differentialFlamegraph.tsx
index d506850fdfb949..a60297eb7f1ad0 100644
--- a/static/app/components/profiling/flamegraph/differentialFlamegraph.tsx
+++ b/static/app/components/profiling/flamegraph/differentialFlamegraph.tsx
@@ -72,7 +72,7 @@ export function DifferentialFlamegraph(props: DifferentialFlamegraphProps): Reac
     },
 
     // We skip position.view dependency because it will go into an infinite loop
-    // eslint-disable-next-line react-hooks/exhaustive-deps
+
     [props.differentialFlamegraph, flamegraphCanvas, flamegraphTheme]
   );
 
diff --git a/static/app/components/profiling/flamegraph/flamegraph.spec.tsx b/static/app/components/profiling/flamegraph/flamegraph.spec.tsx
index e47d2700716ef6..0425bfb85616d7 100644
--- a/static/app/components/profiling/flamegraph/flamegraph.spec.tsx
+++ b/static/app/components/profiling/flamegraph/flamegraph.spec.tsx
@@ -1,13 +1,7 @@
 import {ProjectFixture} from 'sentry-fixture/project';
 
 import {initializeOrg} from 'sentry-test/initializeOrg';
-import {
-  act,
-  findAllByTestId,
-  render,
-  screen,
-  userEvent,
-} from 'sentry-test/reactTestingLibrary';
+import {act, render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 
 import ProjectsStore from 'sentry/stores/projectsStore';
 import {useParams} from 'sentry/utils/useParams';
@@ -165,12 +159,12 @@ describe('Flamegraph', function () {
       {organization: initializeOrg().organization}
     );
 
-    const frames = await findAllByTestId(document.body, 'flamegraph-frame', undefined, {
+    const frames = await screen.findAllByTestId('flamegraph-frame', undefined, {
       timeout: 5000,
     });
 
     // 1 for main view and 1 for minimap
-    expect(frames.length).toBe(2);
+    expect(frames).toHaveLength(2);
   });
 
   it('reads preferences from qs', async function () {
diff --git a/static/app/components/profiling/flamegraph/flamegraph.tsx b/static/app/components/profiling/flamegraph/flamegraph.tsx
index a02ce26d2a4fd4..3e35201a064573 100644
--- a/static/app/components/profiling/flamegraph/flamegraph.tsx
+++ b/static/app/components/profiling/flamegraph/flamegraph.tsx
@@ -132,7 +132,7 @@ function convertProfileMeasurementsToUIFrames(
   };
 
   for (let i = 0; i < measurement.values.length; i++) {
-    const value = measurement.values[i];
+    const value = measurement.values[i]!;
 
     measurements.values.push({
       elapsed: value.elapsed_since_start_ns,
@@ -173,7 +173,7 @@ function findLongestMatchingFrame(
     }
 
     for (let i = 0; i < frame.children.length; i++) {
-      frames.push(frame.children[i]);
+      frames.push(frame.children[i]!);
     }
   }
 
@@ -449,7 +449,7 @@ function Flamegraph(): ReactElement {
         const values: ProfileSeriesMeasurement['values'] = [];
 
         for (let i = 0; i < measurements.values.length; i++) {
-          const value = measurements.values[i];
+          const value = measurements.values[i]!;
           values.push({
             value: value.value,
             elapsed: value.elapsed_since_start_ns,
@@ -478,7 +478,7 @@ function Flamegraph(): ReactElement {
       const values: ProfileSeriesMeasurement['values'] = [];
 
       for (let i = 0; i < memory_footprint.values.length; i++) {
-        const value = memory_footprint.values[i];
+        const value = memory_footprint.values[i]!;
         values.push({
           value: value.value,
           elapsed: value.elapsed_since_start_ns,
@@ -497,7 +497,7 @@ function Flamegraph(): ReactElement {
       const values: ProfileSeriesMeasurement['values'] = [];
 
       for (let i = 0; i < native_memory_footprint.values.length; i++) {
-        const value = native_memory_footprint.values[i];
+        const value = native_memory_footprint.values[i]!;
         values.push({
           value: value.value,
           elapsed: value.elapsed_since_start_ns,
diff --git a/static/app/components/profiling/flamegraph/flamegraphChartTooltip.tsx b/static/app/components/profiling/flamegraph/flamegraphChartTooltip.tsx
index 02ac3aadbec950..328d1202c37539 100644
--- a/static/app/components/profiling/flamegraph/flamegraphChartTooltip.tsx
+++ b/static/app/components/profiling/flamegraph/flamegraphChartTooltip.tsx
@@ -59,7 +59,7 @@ export function FlamegraphChartTooltip({
               />
               {p.name}:&nbsp;
               <FlamegraphTooltipTimelineInfo>
-                {chart.tooltipFormatter(p.points[0].y)}
+                {chart.tooltipFormatter(p.points[0]!.y)}
               </FlamegraphTooltipTimelineInfo>
             </FlamegraphTooltipFrameMainInfo>
           </React.Fragment>
diff --git a/static/app/components/profiling/flamegraph/flamegraphDrawer/flamegraphDrawer.tsx b/static/app/components/profiling/flamegraph/flamegraphDrawer/flamegraphDrawer.tsx
index 75aad0f8a04977..00e15b320e4034 100644
--- a/static/app/components/profiling/flamegraph/flamegraphDrawer/flamegraphDrawer.tsx
+++ b/static/app/components/profiling/flamegraph/flamegraphDrawer/flamegraphDrawer.tsx
@@ -264,7 +264,7 @@ const FlamegraphDrawer = memo(function FlamegraphDrawer(props: FlamegraphDrawerP
               ? props.profileTransaction.data
               : null
           }
-          projectId={params.projectId}
+          projectId={params.projectId!}
           profileGroup={props.profileGroup}
         />
       ) : null}
diff --git a/static/app/components/profiling/flamegraph/flamegraphOverlays/profileDragDropImport.tsx b/static/app/components/profiling/flamegraph/flamegraphOverlays/profileDragDropImport.tsx
index e7495f1be38133..fd7fe5745e52d9 100644
--- a/static/app/components/profiling/flamegraph/flamegraphOverlays/profileDragDropImport.tsx
+++ b/static/app/components/profiling/flamegraph/flamegraphOverlays/profileDragDropImport.tsx
@@ -25,7 +25,7 @@ function ProfileDragDropImport({
       evt.preventDefault();
       evt.stopPropagation();
 
-      const file = evt.dataTransfer.items[0].getAsFile();
+      const file = evt.dataTransfer.items[0]!.getAsFile();
 
       if (file) {
         setDropState('processing');
diff --git a/static/app/components/profiling/flamegraph/flamegraphPreview.spec.tsx b/static/app/components/profiling/flamegraph/flamegraphPreview.spec.tsx
index 78daa1ca754081..83869f36d06a68 100644
--- a/static/app/components/profiling/flamegraph/flamegraphPreview.spec.tsx
+++ b/static/app/components/profiling/flamegraph/flamegraphPreview.spec.tsx
@@ -41,7 +41,7 @@ describe('computePreviewConfigView', function () {
 
     // y is 0 here because the config view is taller than the flamegraph
     expect(previewConfigView).toEqual(new Rect(0, 0, 2, 3));
-    expect(mode).toEqual('anchorTop');
+    expect(mode).toBe('anchorTop');
   });
 
   it('uses max depth', function () {
@@ -81,7 +81,7 @@ describe('computePreviewConfigView', function () {
     // y is 1 here because the config view has height 2 so it can only
     // show 2 frames and we show the inner most frames
     expect(previewConfigView).toEqual(new Rect(0, 1, 2, 2));
-    expect(mode).toEqual('anchorBottom');
+    expect(mode).toBe('anchorBottom');
   });
 
   it('uses max depth in window', function () {
@@ -122,7 +122,7 @@ describe('computePreviewConfigView', function () {
     // y is 1 here because the config view has height 2 so it can only
     // show 2 frames and we show the inner most frames
     expect(previewConfigView).toEqual(new Rect(1, 1, 2, 2));
-    expect(mode).toEqual('anchorBottom');
+    expect(mode).toBe('anchorBottom');
   });
 
   it('uses 0 when view is taller than profile', function () {
@@ -161,7 +161,7 @@ describe('computePreviewConfigView', function () {
     // y is 0 here because the config view has height 3
     // so the whole flamechart fits
     expect(previewConfigView).toEqual(new Rect(0, 0, 2, 3));
-    expect(mode).toEqual('anchorTop');
+    expect(mode).toBe('anchorTop');
   });
 
   it('uses parent frame depth', function () {
@@ -199,7 +199,7 @@ describe('computePreviewConfigView', function () {
     // y is 1 here because we found a frame `f1` that is wraps
     // around the window at depth 1
     expect(previewConfigView).toEqual(new Rect(1, 1, 2, 2));
-    expect(mode).toEqual('anchorTop');
+    expect(mode).toBe('anchorTop');
   });
 
   it('uses max depth because there is room above parent to show more', function () {
@@ -238,6 +238,6 @@ describe('computePreviewConfigView', function () {
     // so the whole flamechart fits even though the parent
     // is at depth 1
     expect(previewConfigView).toEqual(new Rect(1, 0, 2, 3));
-    expect(mode).toEqual('anchorTop');
+    expect(mode).toBe('anchorTop');
   });
 });
diff --git a/static/app/components/profiling/flamegraph/flamegraphPreview.tsx b/static/app/components/profiling/flamegraph/flamegraphPreview.tsx
index e38af70780bf2d..5bcb5c362ef468 100644
--- a/static/app/components/profiling/flamegraph/flamegraphPreview.tsx
+++ b/static/app/components/profiling/flamegraph/flamegraphPreview.tsx
@@ -332,7 +332,7 @@ export function computePreviewConfigView(
     }
 
     for (let i = 0; i < frame.children.length; i++) {
-      frames.push(frame.children[i]);
+      frames.push(frame.children[i]!);
     }
   }
 
diff --git a/static/app/components/profiling/flamegraph/flamegraphToolbar/flamegraphSearch.tsx b/static/app/components/profiling/flamegraph/flamegraphToolbar/flamegraphSearch.tsx
index f9571c828f8f06..b6322a43ac6e2a 100644
--- a/static/app/components/profiling/flamegraph/flamegraphToolbar/flamegraphSearch.tsx
+++ b/static/app/components/profiling/flamegraph/flamegraphToolbar/flamegraphSearch.tsx
@@ -171,7 +171,7 @@ function yieldingRafFrameSearch(
 
   const searchFramesFunction = isRegExpSearch ? searchFrameRegExp : searchFrameFzf;
   const searchSpansFunction = isRegExpSearch ? searchSpanRegExp : searchSpanFzf;
-  const searchQuery = isRegExpSearch ? lookup : lowercaseQuery;
+  const searchQuery = isRegExpSearch ? lookup! : lowercaseQuery;
 
   function searchFramesAndSpans() {
     const start = performance.now();
diff --git a/static/app/components/profiling/profileHeader.tsx b/static/app/components/profiling/profileHeader.tsx
index 3783436280c725..f72dfe65126385 100644
--- a/static/app/components/profiling/profileHeader.tsx
+++ b/static/app/components/profiling/profileHeader.tsx
@@ -51,7 +51,7 @@ function ProfileHeader({transaction, projectId, eventId}: ProfileHeaderProps) {
         traceSlug: transaction.contexts?.trace?.trace_id ?? '',
         location,
         organization,
-        transactionName: transactionName,
+        transactionName,
       })
     : null;
 
diff --git a/static/app/components/profiling/suspectFunctions/suspectFunctionsTable.tsx b/static/app/components/profiling/suspectFunctions/suspectFunctionsTable.tsx
index c12594b5584e7f..55e6c60b73ded5 100644
--- a/static/app/components/profiling/suspectFunctions/suspectFunctionsTable.tsx
+++ b/static/app/components/profiling/suspectFunctions/suspectFunctionsTable.tsx
@@ -1,4 +1,4 @@
-import {Fragment, useCallback, useMemo, useState} from 'react';
+import {Fragment, useCallback, useMemo, useRef, useState} from 'react';
 import styled from '@emotion/styled';
 import clamp from 'lodash/clamp';
 
@@ -110,9 +110,9 @@ export function SuspectFunctionsTable({
     return sortedMetrics.slice(pagination.start, pagination.end);
   }, [sortedMetrics, pagination]);
 
-  const {tableStyles} = useTableStyles({
-    items: COLUMNS,
-  });
+  const fields = COLUMNS.map(column => column.value);
+  const tableRef = useRef<HTMLTableElement>(null);
+  const {initialTableStyles} = useTableStyles(fields, tableRef);
 
   const baggage: RenderFunctionBaggage = {
     location,
@@ -139,7 +139,7 @@ export function SuspectFunctionsTable({
           />
         </ButtonBar>
       </TableHeader>
-      <Table style={tableStyles}>
+      <Table ref={tableRef} styles={initialTableStyles}>
         <TableHead>
           <TableRow>
             {COLUMNS.map((column, i) => {
diff --git a/static/app/components/projects/bookmarkStar.spec.tsx b/static/app/components/projects/bookmarkStar.spec.tsx
index b7249a15684e37..7b36debaa50247 100644
--- a/static/app/components/projects/bookmarkStar.spec.tsx
+++ b/static/app/components/projects/bookmarkStar.spec.tsx
@@ -7,22 +7,14 @@ import BookmarkStar from 'sentry/components/projects/bookmarkStar';
 import ProjectsStore from 'sentry/stores/projectsStore';
 
 describe('BookmarkStar', function () {
-  const project = ProjectFixture();
-
-  beforeEach(function () {
-    ProjectsStore.loadInitialData([project]);
-  });
-
   afterEach(function () {
     ProjectsStore.reset();
     MockApiClient.clearMockResponses();
   });
 
-  it('renders', function () {
-    render(<BookmarkStar organization={OrganizationFixture()} project={project} />);
-  });
-
   it('can star', async function () {
+    const project = ProjectFixture();
+    ProjectsStore.loadInitialData([project]);
     render(<BookmarkStar organization={OrganizationFixture()} project={project} />);
 
     const projectMock = MockApiClient.addMockResponse({
@@ -46,12 +38,9 @@ describe('BookmarkStar', function () {
   });
 
   it('can unstar', async function () {
-    render(
-      <BookmarkStar
-        organization={OrganizationFixture()}
-        project={ProjectFixture({isBookmarked: true})}
-      />
-    );
+    const project = ProjectFixture({isBookmarked: true});
+    ProjectsStore.loadInitialData([project]);
+    render(<BookmarkStar organization={OrganizationFixture()} project={project} />);
 
     const projectMock = MockApiClient.addMockResponse({
       url: '/projects/org-slug/project-slug/',
diff --git a/static/app/components/projects/bookmarkStar.tsx b/static/app/components/projects/bookmarkStar.tsx
index 9c606e569b4873..0d1c8bdd83f0ff 100644
--- a/static/app/components/projects/bookmarkStar.tsx
+++ b/static/app/components/projects/bookmarkStar.tsx
@@ -24,20 +24,20 @@ function BookmarkStar({className, organization, project, onToggle}: Props) {
   const [isBookmarked, setIsBookmarked] = useState(project.isBookmarked);
 
   const {mutate: handleBookmarkToggle, isPending: isBookmarking} = useMutation({
-    mutationFn: () => {
+    mutationFn: (variables: {isBookmarked: boolean}) => {
       return update(api, {
         orgId: organization.slug,
         projectId: project.slug,
-        data: {isBookmarked: !isBookmarked},
+        data: {isBookmarked: variables.isBookmarked},
       });
     },
-    onMutate: () => {
-      onToggle?.(isBookmarked);
-      setIsBookmarked(current => !current);
+    onMutate: variables => {
+      onToggle?.(variables.isBookmarked);
+      setIsBookmarked(variables.isBookmarked);
     },
-    onError: () => {
+    onError: (_data, variables) => {
       addErrorMessage(t('Unable to toggle bookmark for %s', project.slug));
-      setIsBookmarked(current => !current);
+      setIsBookmarked(!variables.isBookmarked);
     },
   });
 
@@ -49,7 +49,7 @@ function BookmarkStar({className, organization, project, onToggle}: Props) {
       aria-label={label}
       aria-pressed={isBookmarked}
       busy={isBookmarking}
-      onClick={() => handleBookmarkToggle()}
+      onClick={() => handleBookmarkToggle({isBookmarked: !isBookmarked})}
       size="zero"
       borderless
       className={className}
diff --git a/static/app/components/projects/missingProjectMembership.tsx b/static/app/components/projects/missingProjectMembership.tsx
index 94912788222c8b..8110ca41bac49b 100644
--- a/static/app/components/projects/missingProjectMembership.tsx
+++ b/static/app/components/projects/missingProjectMembership.tsx
@@ -126,14 +126,14 @@ class MissingProjectMembership extends Component<Props, State> {
     const teamAccess = [
       {
         label: t('Request Access'),
-        options: this.getTeamsForAccess()[0].map(request => ({
+        options: this.getTeamsForAccess()[0]!.map(request => ({
           value: request,
           label: `#${request}`,
         })),
       },
       {
         label: t('Pending Requests'),
-        options: this.getTeamsForAccess()[1].map(pending =>
+        options: this.getTeamsForAccess()[1]!.map(pending =>
           this.getPendingTeamOption(pending)
         ),
       },
diff --git a/static/app/components/quickTrace/index.spec.tsx b/static/app/components/quickTrace/index.spec.tsx
index 254aa2acefc80b..c1d94ef972cee7 100644
--- a/static/app/components/quickTrace/index.spec.tsx
+++ b/static/app/components/quickTrace/index.spec.tsx
@@ -142,7 +142,7 @@ describe('Quick Trace', function () {
         />
       );
       const nodes = await screen.findAllByTestId('event-node');
-      expect(nodes.length).toEqual(1);
+      expect(nodes).toHaveLength(1);
       expect(nodes[0]).toHaveTextContent('This Event');
     });
 
@@ -162,7 +162,7 @@ describe('Quick Trace', function () {
         />
       );
       const nodes = await screen.findAllByTestId('event-node');
-      expect(nodes.length).toEqual(2);
+      expect(nodes).toHaveLength(2);
       ['This Event', '1 Child'].forEach((text, i) =>
         expect(nodes[i]).toHaveTextContent(text)
       );
@@ -189,7 +189,7 @@ describe('Quick Trace', function () {
         />
       );
       const nodes = await screen.findAllByTestId('event-node');
-      expect(nodes.length).toEqual(2);
+      expect(nodes).toHaveLength(2);
       ['This Event', '3 Children'].forEach((text, i) =>
         expect(nodes[i]).toHaveTextContent(text)
       );
@@ -211,7 +211,7 @@ describe('Quick Trace', function () {
         />
       );
       const nodes = await screen.findAllByTestId('event-node');
-      expect(nodes.length).toEqual(2);
+      expect(nodes).toHaveLength(2);
       ['Parent', 'This Event'].forEach((text, i) =>
         expect(nodes[i]).toHaveTextContent(text)
       );
@@ -240,7 +240,7 @@ describe('Quick Trace', function () {
         />
       );
       const nodes = await screen.findAllByTestId('event-node');
-      expect(nodes.length).toEqual(4);
+      expect(nodes).toHaveLength(4);
       ['Root', '1 Ancestor', 'Parent', 'This Event'].forEach((text, i) =>
         expect(nodes[i]).toHaveTextContent(text)
       );
@@ -274,7 +274,7 @@ describe('Quick Trace', function () {
         />
       );
       const nodes = await screen.findAllByTestId('event-node');
-      expect(nodes.length).toEqual(4);
+      expect(nodes).toHaveLength(4);
       ['Root', '3 Ancestors', 'Parent', 'This Event'].forEach((text, i) =>
         expect(nodes[i]).toHaveTextContent(text)
       );
@@ -300,7 +300,7 @@ describe('Quick Trace', function () {
         />
       );
       const nodes = await screen.findAllByTestId('event-node');
-      expect(nodes.length).toEqual(3);
+      expect(nodes).toHaveLength(3);
       ['This Event', '1 Child', '1 Descendant'].forEach((text, i) =>
         expect(nodes[i]).toHaveTextContent(text)
       );
@@ -333,7 +333,7 @@ describe('Quick Trace', function () {
         />
       );
       const nodes = await screen.findAllByTestId('event-node');
-      expect(nodes.length).toEqual(3);
+      expect(nodes).toHaveLength(3);
       ['This Event', '1 Child', '3 Descendants'].forEach((text, i) =>
         expect(nodes[i]).toHaveTextContent(text)
       );
@@ -371,7 +371,7 @@ describe('Quick Trace', function () {
         />
       );
       const nodes = await screen.findAllByTestId('event-node');
-      expect(nodes.length).toEqual(6);
+      expect(nodes).toHaveLength(6);
       ['Root', '3 Ancestors', 'Parent', 'This Event', '1 Child', '3 Descendants'].forEach(
         (text, i) => expect(nodes[i]).toHaveTextContent(text)
       );
@@ -402,7 +402,7 @@ describe('Quick Trace', function () {
         />
       );
       const nodes = await screen.findAllByTestId('event-node');
-      expect(nodes.length).toEqual(6);
+      expect(nodes).toHaveLength(6);
       [
         makeTransactionHref('p0', 'e0', 't0'),
         makeTransactionHref('p1', 'e1', 't1'),
@@ -411,7 +411,7 @@ describe('Quick Trace', function () {
         makeTransactionHref('p4', 'e4', 't4'),
         makeTransactionHref('p5', 'e5', 't5'),
       ].forEach((target, i) => {
-        const linkNode = nodes[i].children[0];
+        const linkNode = nodes[i]!.children[0];
         if (target) {
           expect(linkNode).toHaveAttribute('href', target);
         } else {
@@ -441,7 +441,7 @@ describe('Quick Trace', function () {
         />
       );
       const items = await screen.findAllByTestId('dropdown-item');
-      expect(items.length).toEqual(3);
+      expect(items).toHaveLength(3);
       // can't easily assert the target is correct since it uses an onClick handler
     });
   });
diff --git a/static/app/components/quickTrace/index.tsx b/static/app/components/quickTrace/index.tsx
index 78a914d8796ebd..03cd05ef3fd4ff 100644
--- a/static/app/components/quickTrace/index.tsx
+++ b/static/app/components/quickTrace/index.tsx
@@ -394,20 +394,20 @@ function EventNodeSelector({
     const hoverText = totalErrors ? (
       t('View the error for this Transaction')
     ) : (
-      <SingleEventHoverText event={events[0]} />
+      <SingleEventHoverText event={events[0]!} />
     );
     const target = errors.length
-      ? generateSingleErrorTarget(errors[0], organization, location, errorDest)
+      ? generateSingleErrorTarget(errors[0]!, organization, location, errorDest)
       : perfIssues.length
-        ? generateSingleErrorTarget(perfIssues[0], organization, location, errorDest)
+        ? generateSingleErrorTarget(perfIssues[0]!, organization, location, errorDest)
         : generateLinkToEventInTraceView({
             traceSlug,
-            eventId: events[0].event_id,
-            projectSlug: events[0].project_slug,
-            timestamp: events[0].timestamp,
+            eventId: events[0]!.event_id,
+            projectSlug: events[0]!.project_slug,
+            timestamp: events[0]!.timestamp,
             location,
             organization,
-            transactionName: events[0].transaction,
+            transactionName: events[0]!.transaction,
             type: transactionDest,
           });
     return (
diff --git a/static/app/components/replays/breadcrumbs/breadcrumbItem.spec.tsx b/static/app/components/replays/breadcrumbs/breadcrumbItem.spec.tsx
index d2ab3d84f476a6..57ca7b981ebae2 100644
--- a/static/app/components/replays/breadcrumbs/breadcrumbItem.spec.tsx
+++ b/static/app/components/replays/breadcrumbs/breadcrumbItem.spec.tsx
@@ -22,12 +22,12 @@ describe('BreadcrumbItem', function () {
     const mockMouseLeave = jest.fn();
     render(
       <BreadcrumbItem
-        frame={MOCK_FRAME}
+        frame={MOCK_FRAME!}
         onMouseEnter={mockMouseEnter}
         onMouseLeave={mockMouseLeave}
         onClick={mockClick}
         onInspectorExpanded={() => {}}
-        startTimestampMs={MOCK_FRAME.timestampMs}
+        startTimestampMs={MOCK_FRAME!.timestampMs}
       />,
       {organization}
     );
diff --git a/static/app/components/replays/breadcrumbs/replayComparisonModal.tsx b/static/app/components/replays/breadcrumbs/replayComparisonModal.tsx
index 0bc960362be92e..25181bb2a8a0aa 100644
--- a/static/app/components/replays/breadcrumbs/replayComparisonModal.tsx
+++ b/static/app/components/replays/breadcrumbs/replayComparisonModal.tsx
@@ -60,19 +60,24 @@ export default function ReplayComparisonModal({
                 <IconInfo />
               </Tooltip>
             </Title>
-            <LearnMoreButton />
-            {focusTrap ? (
-              <FeedbackWidgetButton
-                optionOverrides={{
-                  onFormOpen: () => {
-                    focusTrap.pause();
-                  },
-                  onFormClose: () => {
-                    focusTrap.unpause();
-                  },
-                }}
+            <div>
+              <LearnMoreButton
+                onHover={() => focusTrap?.pause()}
+                onBlur={() => focusTrap?.unpause()}
               />
-            ) : null}
+              {focusTrap ? (
+                <FeedbackWidgetButton
+                  optionOverrides={{
+                    onFormOpen: () => {
+                      focusTrap.pause();
+                    },
+                    onFormClose: () => {
+                      focusTrap.unpause();
+                    },
+                  }}
+                />
+              ) : null}
+            </div>
           </ModalHeader>
         </Header>
         <Body>
diff --git a/static/app/components/replays/breadcrumbs/replayTimelineEvents.tsx b/static/app/components/replays/breadcrumbs/replayTimelineEvents.tsx
index 0a701c42a5e0f1..eed579105eafe8 100644
--- a/static/app/components/replays/breadcrumbs/replayTimelineEvents.tsx
+++ b/static/app/components/replays/breadcrumbs/replayTimelineEvents.tsx
@@ -163,9 +163,9 @@ const getBackgroundGradient = ({
   frameCount: number;
   theme: Theme;
 }) => {
-  const c0 = theme[colors[0]] ?? colors[0];
-  const c1 = theme[colors[1]] ?? colors[1] ?? c0;
-  const c2 = theme[colors[2]] ?? colors[2] ?? c1;
+  const c0 = theme[colors[0]!] ?? colors[0]!;
+  const c1 = theme[colors[1]!] ?? colors[1]! ?? c0;
+  const c2 = theme[colors[2]!] ?? colors[2]! ?? c1;
 
   if (frameCount === 1) {
     return `background: ${c0};`;
diff --git a/static/app/components/replays/breadcrumbs/timelineGaps.tsx b/static/app/components/replays/breadcrumbs/timelineGaps.tsx
index 4118c3168fd753..37864ee118bd6a 100644
--- a/static/app/components/replays/breadcrumbs/timelineGaps.tsx
+++ b/static/app/components/replays/breadcrumbs/timelineGaps.tsx
@@ -48,7 +48,7 @@ export default function TimelineGaps({durationMs, startTimestampMs, videoEvents}
       gaps: gaps.length,
       max_gap: Math.max(...gaps.map(obj => parseFloat(obj.width))),
       replay_duration: durationMs,
-      organization: organization,
+      organization,
     });
   }, [durationMs, organization, gaps]);
 
diff --git a/static/app/components/replays/canvasReplayerPlugin.tsx b/static/app/components/replays/canvasReplayerPlugin.tsx
index 55fec93e00cdaa..a026dcdf0b1367 100644
--- a/static/app/components/replays/canvasReplayerPlugin.tsx
+++ b/static/app/components/replays/canvasReplayerPlugin.tsx
@@ -51,7 +51,7 @@ function findIndex(
   const mid = Math.floor((start + end) / 2);
 
   // Search lower half
-  if (event.timestamp <= arr[mid].timestamp) {
+  if (event.timestamp <= arr[mid]!.timestamp) {
     return findIndex(arr, event, start, mid - 1);
   }
 
@@ -106,7 +106,7 @@ export function CanvasReplayerPlugin(events: eventWithTime[]): ReplayPlugin {
     while (eventsToPrune.length) {
       // Peek top of queue and see if event should be pruned, otherwise we can break out of the loop
       if (
-        Math.abs(event.timestamp - eventsToPrune[0].timestamp) <= BUFFER_TIME &&
+        Math.abs(event.timestamp - eventsToPrune[0]!.timestamp) <= BUFFER_TIME &&
         eventsToPrune.length <= PRELOAD_SIZE
       ) {
         break;
diff --git a/static/app/components/replays/configureMobileReplayCard.tsx b/static/app/components/replays/configureMobileReplayCard.tsx
new file mode 100644
index 00000000000000..052d68e1df7301
--- /dev/null
+++ b/static/app/components/replays/configureMobileReplayCard.tsx
@@ -0,0 +1,54 @@
+import {ClassNames} from '@emotion/react';
+
+import {Button} from 'sentry/components/button';
+import {Hovercard} from 'sentry/components/hovercard';
+import {ButtonContainer, Resource} from 'sentry/components/replays/configureReplayCard';
+import {IconQuestion} from 'sentry/icons';
+import {t} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
+
+function ResourceButtons() {
+  return (
+    <ButtonContainer>
+      <Resource
+        title={t('General')}
+        subtitle={t('Configure sampling rates and recording thresholds')}
+        link="https://docs.sentry.io/platforms/react-native/session-replay/#sampling"
+      />
+      <Resource
+        title={t('Element Masking/Blocking')}
+        subtitle={t('Unmask text (****) and unblock media (img, svg, video, etc.)')}
+        link="https://docs.sentry.io/platforms/react-native/session-replay/#privacy"
+      />
+      <Resource
+        title={t('Identify Users')}
+        subtitle={t('Identify your users through a specific attribute, such as email.')}
+        link="https://docs.sentry.io/platforms/react-native/enriching-events/identify-user/"
+      />
+    </ButtonContainer>
+  );
+}
+
+export default function ConfigureMobileReplayCard() {
+  return (
+    <ClassNames>
+      {({css}) => (
+        <Hovercard
+          body={<ResourceButtons />}
+          bodyClassName={css`
+            padding: ${space(1)};
+          `}
+          position="top-end"
+        >
+          <Button
+            size="sm"
+            icon={<IconQuestion />}
+            aria-label={t('replay configure resources')}
+          >
+            {t('Configure Replay')}
+          </Button>
+        </Hovercard>
+      )}
+    </ClassNames>
+  );
+}
diff --git a/static/app/components/replays/configureReplayCard.tsx b/static/app/components/replays/configureReplayCard.tsx
index 31fbf258a40536..818125850e5dc3 100644
--- a/static/app/components/replays/configureReplayCard.tsx
+++ b/static/app/components/replays/configureReplayCard.tsx
@@ -10,7 +10,7 @@ import {space} from 'sentry/styles/space';
 import {trackAnalytics} from 'sentry/utils/analytics';
 import useOrganization from 'sentry/utils/useOrganization';
 
-function Resource({
+export function Resource({
   title,
   subtitle,
   link,
@@ -54,6 +54,11 @@ function ResourceButtons() {
         subtitle={t('Unmask text (****) and unblock media (img, svg, video, etc.)')}
         link="https://docs.sentry.io/platforms/javascript/session-replay/privacy/#privacy-configuration"
       />
+      <Resource
+        title={t('Identify Users')}
+        subtitle={t('Identify your users through a specific attribute, such as email.')}
+        link="https://docs.sentry.io/platforms/javascript/session-replay/configuration/#identifying-users"
+      />
       <Resource
         title={t('Network Details')}
         subtitle={t('Capture request and response headers or bodies')}
@@ -95,7 +100,7 @@ export default function ConfigureReplayCard() {
   );
 }
 
-const ButtonContainer = styled('div')`
+export const ButtonContainer = styled('div')`
   display: flex;
   flex-direction: column;
   gap: ${space(1)};
diff --git a/static/app/components/replays/deserializeCanvasArgs.ts b/static/app/components/replays/deserializeCanvasArgs.ts
index 4fc4172df6e5c2..800cd563830775 100644
--- a/static/app/components/replays/deserializeCanvasArgs.ts
+++ b/static/app/components/replays/deserializeCanvasArgs.ts
@@ -23,7 +23,7 @@ function variableListFor(ctx: CanvasContexts, ctor: string) {
   if (!contextMap.has(ctor)) {
     contextMap.set(ctor, []);
   }
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+
   return contextMap.get(ctor) as any[];
 }
 
diff --git a/static/app/components/replays/diff/learnMoreButton.tsx b/static/app/components/replays/diff/learnMoreButton.tsx
index 1de593ac9314ec..82aeaf0060b6bd 100644
--- a/static/app/components/replays/diff/learnMoreButton.tsx
+++ b/static/app/components/replays/diff/learnMoreButton.tsx
@@ -1,4 +1,4 @@
-import type {ReactNode} from 'react';
+import type {ComponentProps, ReactNode} from 'react';
 import {ClassNames} from '@emotion/react';
 import styled from '@emotion/styled';
 
@@ -58,12 +58,15 @@ function Buttons() {
   );
 }
 
-export default function LearnMoreButton() {
+export default function LearnMoreButton(
+  hoverCardProps: Partial<ComponentProps<typeof Hovercard>>
+) {
   return (
     <ClassNames>
       {({css}) => (
         <AnalyticsArea name="learn-more">
           <Hovercard
+            {...hoverCardProps}
             body={<Buttons />}
             bodyClassName={css`
               padding: ${space(1)};
diff --git a/static/app/components/replays/diff/replaySideBySideImageDiff.tsx b/static/app/components/replays/diff/replaySideBySideImageDiff.tsx
index 0606a645545032..15c0f1d0b88258 100644
--- a/static/app/components/replays/diff/replaySideBySideImageDiff.tsx
+++ b/static/app/components/replays/diff/replaySideBySideImageDiff.tsx
@@ -5,9 +5,9 @@ import {After, Before, DiffHeader} from 'sentry/components/replays/diff/utils';
 import ReplayPlayer from 'sentry/components/replays/player/replayPlayer';
 import ReplayPlayerMeasurer from 'sentry/components/replays/player/replayPlayerMeasurer';
 import {space} from 'sentry/styles/space';
-import {ReplayPlayerEventsContextProvider} from 'sentry/utils/replays/playback/providers/replayPlayerEventsContext';
 import {ReplayPlayerPluginsContextProvider} from 'sentry/utils/replays/playback/providers/replayPlayerPluginsContext';
 import {ReplayPlayerStateContextProvider} from 'sentry/utils/replays/playback/providers/replayPlayerStateContext';
+import {ReplayReaderProvider} from 'sentry/utils/replays/playback/providers/replayReaderProvider';
 import type ReplayReader from 'sentry/utils/replays/replayReader';
 
 interface Props {
@@ -26,7 +26,7 @@ export function ReplaySideBySideImageDiff({leftOffsetMs, replay, rightOffsetMs}:
 
       <ReplayGrid>
         <ReplayPlayerPluginsContextProvider>
-          <ReplayPlayerEventsContextProvider replay={replay}>
+          <ReplayReaderProvider replay={replay}>
             <Border>
               <ReplayPlayerStateContextProvider>
                 <ReplayPlayerMeasurer measure="width">
@@ -41,7 +41,7 @@ export function ReplaySideBySideImageDiff({leftOffsetMs, replay, rightOffsetMs}:
                 </ReplayPlayerMeasurer>
               </ReplayPlayerStateContextProvider>
             </Border>
-          </ReplayPlayerEventsContextProvider>
+          </ReplayReaderProvider>
         </ReplayPlayerPluginsContextProvider>
       </ReplayGrid>
     </Flex>
diff --git a/static/app/components/replays/diff/replaySliderDiff.tsx b/static/app/components/replays/diff/replaySliderDiff.tsx
index 0e608410db5212..6ff0c82388de58 100644
--- a/static/app/components/replays/diff/replaySliderDiff.tsx
+++ b/static/app/components/replays/diff/replaySliderDiff.tsx
@@ -8,9 +8,9 @@ import ReplayPlayerMeasurer from 'sentry/components/replays/player/replayPlayerM
 import {space} from 'sentry/styles/space';
 import {trackAnalytics} from 'sentry/utils/analytics';
 import toPixels from 'sentry/utils/number/toPixels';
-import {ReplayPlayerEventsContextProvider} from 'sentry/utils/replays/playback/providers/replayPlayerEventsContext';
 import {ReplayPlayerPluginsContextProvider} from 'sentry/utils/replays/playback/providers/replayPlayerPluginsContext';
 import {ReplayPlayerStateContextProvider} from 'sentry/utils/replays/playback/providers/replayPlayerStateContext';
+import {ReplayReaderProvider} from 'sentry/utils/replays/playback/providers/replayReaderProvider';
 import type ReplayReader from 'sentry/utils/replays/replayReader';
 import {useDimensions} from 'sentry/utils/useDimensions';
 import useOrganization from 'sentry/utils/useOrganization';
@@ -114,7 +114,7 @@ function DiffSides({
   return (
     <Fragment>
       <ReplayPlayerPluginsContextProvider>
-        <ReplayPlayerEventsContextProvider replay={replay}>
+        <ReplayReaderProvider replay={replay}>
           <Cover style={{width}}>
             <Placement style={{width}}>
               <ReplayPlayerStateContextProvider>
@@ -137,7 +137,7 @@ function DiffSides({
               </ReplayPlayerStateContextProvider>
             </Placement>
           </Cover>
-        </ReplayPlayerEventsContextProvider>
+        </ReplayReaderProvider>
       </ReplayPlayerPluginsContextProvider>
       <Divider ref={dividerElem} onMouseDown={onDividerMouseDownWithAnalytics} />
     </Fragment>
diff --git a/static/app/components/replays/header/errorCounts.spec.tsx b/static/app/components/replays/header/errorCounts.spec.tsx
index afe8f7060dcb51..00a97e2765eb0d 100644
--- a/static/app/components/replays/header/errorCounts.spec.tsx
+++ b/static/app/components/replays/header/errorCounts.spec.tsx
@@ -45,13 +45,13 @@ describe('ErrorCounts', () => {
     });
   });
 
-  it('should render 0 when there are no errors in the array', async () => {
+  it('should render 0 when there are no errors in the array', () => {
     const errors = [];
 
     render(<ErrorCounts replayErrors={errors} replayRecord={replayRecord} />, {
       organization,
     });
-    const countNode = await screen.getByLabelText('number of errors');
+    const countNode = screen.getByLabelText('number of errors');
     expect(countNode).toHaveTextContent('0');
   });
 
@@ -62,7 +62,7 @@ describe('ErrorCounts', () => {
       organization,
     });
 
-    const countNode = await screen.getByLabelText('number of errors');
+    const countNode = screen.getByLabelText('number of errors');
     expect(countNode).toHaveTextContent('1');
 
     const icon = await screen.findByTestId('platform-icon-javascript');
@@ -85,7 +85,7 @@ describe('ErrorCounts', () => {
       organization,
     });
 
-    const countNodes = await screen.getAllByLabelText('number of errors');
+    const countNodes = screen.getAllByLabelText('number of errors');
     expect(countNodes[0]).toHaveTextContent('1');
     expect(countNodes[1]).toHaveTextContent('2');
 
@@ -94,11 +94,11 @@ describe('ErrorCounts', () => {
     const pyIcon = await screen.findByTestId('platform-icon-python');
     expect(pyIcon).toBeInTheDocument();
 
-    expect(countNodes[0].parentElement).toHaveAttribute(
+    expect(countNodes[0]!.parentElement).toHaveAttribute(
       'href',
       '/mock-pathname/?f_e_project=my-js-app&t_main=errors'
     );
-    expect(countNodes[1].parentElement).toHaveAttribute(
+    expect(countNodes[1]!.parentElement).toHaveAttribute(
       'href',
       '/mock-pathname/?f_e_project=my-py-backend&t_main=errors'
     );
@@ -118,7 +118,7 @@ describe('ErrorCounts', () => {
       organization,
     });
 
-    const countNode = await screen.getByLabelText('total errors');
+    const countNode = screen.getByLabelText('total errors');
     expect(countNode).toHaveTextContent('6');
 
     const jsIcon = await screen.findByTestId('platform-icon-javascript');
@@ -127,7 +127,7 @@ describe('ErrorCounts', () => {
     const pyIcon = await screen.findByTestId('platform-icon-python');
     expect(pyIcon).toBeInTheDocument();
 
-    const plusOne = await screen.getByLabelText('hidden projects');
+    const plusOne = screen.getByLabelText('hidden projects');
     expect(plusOne).toHaveTextContent('+1');
 
     expect(countNode.parentElement).toHaveAttribute(
diff --git a/static/app/components/replays/player/__stories__/providers.tsx b/static/app/components/replays/player/__stories__/providers.tsx
index 6df77654d230d4..acedf2efc98fbc 100644
--- a/static/app/components/replays/player/__stories__/providers.tsx
+++ b/static/app/components/replays/player/__stories__/providers.tsx
@@ -1,10 +1,10 @@
 import type {ReactNode} from 'react';
 
 import {StaticNoSkipReplayPreferences} from 'sentry/components/replays/preferences/replayPreferences';
-import {ReplayPlayerEventsContextProvider} from 'sentry/utils/replays/playback/providers/replayPlayerEventsContext';
 import {ReplayPlayerPluginsContextProvider} from 'sentry/utils/replays/playback/providers/replayPlayerPluginsContext';
 import {ReplayPlayerStateContextProvider} from 'sentry/utils/replays/playback/providers/replayPlayerStateContext';
 import {ReplayPreferencesContextProvider} from 'sentry/utils/replays/playback/providers/replayPreferencesContext';
+import {ReplayReaderProvider} from 'sentry/utils/replays/playback/providers/replayReaderProvider';
 import type ReplayReader from 'sentry/utils/replays/replayReader';
 
 export default function Providers({
@@ -17,9 +17,9 @@ export default function Providers({
   return (
     <ReplayPreferencesContextProvider prefsStrategy={StaticNoSkipReplayPreferences}>
       <ReplayPlayerPluginsContextProvider>
-        <ReplayPlayerEventsContextProvider replay={replay}>
+        <ReplayReaderProvider replay={replay}>
           <ReplayPlayerStateContextProvider>{children}</ReplayPlayerStateContextProvider>
-        </ReplayPlayerEventsContextProvider>
+        </ReplayReaderProvider>
       </ReplayPlayerPluginsContextProvider>
     </ReplayPreferencesContextProvider>
   );
diff --git a/static/app/components/replays/player/__stories__/replaySlugChooser.tsx b/static/app/components/replays/player/__stories__/replaySlugChooser.tsx
index 4cdb1db67ce1f8..c6b7c1709d76f7 100644
--- a/static/app/components/replays/player/__stories__/replaySlugChooser.tsx
+++ b/static/app/components/replays/player/__stories__/replaySlugChooser.tsx
@@ -2,7 +2,7 @@ import {Fragment, type ReactNode} from 'react';
 import {css} from '@emotion/react';
 
 import Providers from 'sentry/components/replays/player/__stories__/providers';
-import useReplayReader from 'sentry/utils/replays/hooks/useReplayReader';
+import useLoadReplayReader from 'sentry/utils/replays/hooks/useLoadReplayReader';
 import useOrganization from 'sentry/utils/useOrganization';
 import {useSessionStorage} from 'sentry/utils/useSessionStorage';
 
@@ -29,7 +29,7 @@ export default function ReplaySlugChooser({children}: {children: ReactNode}) {
 
 function LoadReplay({children, replaySlug}: {children: ReactNode; replaySlug: string}) {
   const organization = useOrganization();
-  const {fetchError, fetching, replay} = useReplayReader({
+  const {fetchError, fetching, replay} = useLoadReplayReader({
     orgSlug: organization.slug,
     replaySlug,
   });
diff --git a/static/app/components/replays/player/replayPlayer.tsx b/static/app/components/replays/player/replayPlayer.tsx
index a31ea43c52f763..ea63980418475d 100644
--- a/static/app/components/replays/player/replayPlayer.tsx
+++ b/static/app/components/replays/player/replayPlayer.tsx
@@ -6,13 +6,13 @@ import {
   baseReplayerCss,
   sentryReplayerCss,
 } from 'sentry/components/replays/player/styles';
-import {useReplayPlayerEvents} from 'sentry/utils/replays/playback/providers/replayPlayerEventsContext';
 import {useReplayPlayerPlugins} from 'sentry/utils/replays/playback/providers/replayPlayerPluginsContext';
 import {
   useReplayPlayerStateDispatch,
   useReplayUserAction,
 } from 'sentry/utils/replays/playback/providers/replayPlayerStateContext';
 import {useReplayPrefs} from 'sentry/utils/replays/playback/providers/replayPreferencesContext';
+import {useReplayReader} from 'sentry/utils/replays/playback/providers/replayReaderProvider';
 
 function useReplayerInstance() {
   // The div that is emitted from react, where we will attach the replayer to
@@ -26,7 +26,7 @@ function useReplayerInstance() {
   const [prefs] = useReplayPrefs();
   const initialPrefsRef = useRef(prefs); // don't re-mount the player when prefs change, instead there's a useEffect
   const getPlugins = useReplayPlayerPlugins();
-  const events = useReplayPlayerEvents();
+  const replay = useReplayReader();
 
   // Hooks to sync this Replayer state up and out of this component
   const dispatch = useReplayPlayerStateDispatch();
@@ -39,7 +39,9 @@ function useReplayerInstance() {
       return () => {};
     }
 
-    const replayer = new Replayer(events, {
+    const webFrames = replay.getRRWebFrames();
+
+    const replayer = new Replayer(webFrames, {
       root,
       blockClass: 'sentry-block',
       mouseTail: {
@@ -48,7 +50,7 @@ function useReplayerInstance() {
         lineWidth: 2,
         strokeStyle: theme.purple200,
       },
-      plugins: getPlugins(events),
+      plugins: getPlugins(webFrames),
       skipInactive: initialPrefsRef.current.isSkippingInactive,
       speed: initialPrefsRef.current.playbackSpeed,
     });
@@ -56,7 +58,7 @@ function useReplayerInstance() {
     replayerRef.current = replayer;
     dispatch({type: 'didMountPlayer', replayer, dispatch});
     return () => dispatch({type: 'didUnmountPlayer', replayer});
-  }, [dispatch, events, getPlugins, theme]);
+  }, [dispatch, getPlugins, replay, theme]);
 
   useEffect(() => {
     if (!replayerRef.current) {
diff --git a/static/app/components/replays/player/styles.tsx b/static/app/components/replays/player/styles.tsx
index 02a32c09c7ffa0..29c64ccf695428 100644
--- a/static/app/components/replays/player/styles.tsx
+++ b/static/app/components/replays/player/styles.tsx
@@ -19,6 +19,9 @@ export const baseReplayerCss = css`
     border: none;
     background: white;
   }
+  .video-replayer-wrapper + .replayer-wrapper > iframe {
+    opacity: 0;
+  }
 
   &[data-inspectable='true'] .replayer-wrapper > iframe {
     /* Set pointer-events to make it easier to right-click & inspect */
@@ -111,18 +114,4 @@ export const sentryReplayerCss = (theme: Theme) => css`
       height: 10px;
     }
   }
-
-  /* Correctly positions the canvas for video replays and shows the purple "mousetails" */
-  &.video-replayer {
-    .replayer-wrapper {
-      position: absolute;
-      top: 0;
-      left: 0;
-      width: 100%;
-      height: 100%;
-    }
-    .replayer-wrapper > iframe {
-      opacity: 0;
-    }
-  }
 `;
diff --git a/static/app/components/replays/replayContext.tsx b/static/app/components/replays/replayContext.tsx
index 25b64b29411833..e86b232fc55a4d 100644
--- a/static/app/components/replays/replayContext.tsx
+++ b/static/app/components/replays/replayContext.tsx
@@ -7,6 +7,7 @@ import {VideoReplayerWithInteractions} from 'sentry/components/replays/videoRepl
 import {trackAnalytics} from 'sentry/utils/analytics';
 import clamp from 'sentry/utils/number/clamp';
 import type useInitialOffsetMs from 'sentry/utils/replays/hooks/useInitialTimeOffsetMs';
+import useTouchEventsCheck from 'sentry/utils/replays/playback/hooks/useTouchEventsCheck';
 import {useReplayPrefs} from 'sentry/utils/replays/playback/providers/replayPreferencesContext';
 import {ReplayCurrentTimeContextProvider} from 'sentry/utils/replays/playback/providers/useCurrentHoverTime';
 import type ReplayReader from 'sentry/utils/replays/replayReader';
@@ -340,7 +341,6 @@ export function Provider({
         }
       }
 
-      // eslint-disable-next-line no-new
       const inst = new Replayer(events, {
         root,
         blockClass: 'sentry-block',
@@ -389,6 +389,8 @@ export function Provider({
     ]
   );
 
+  useTouchEventsCheck({replay: isFetching ? null : replay});
+
   const initVideoRoot = useCallback(
     (root: RootElem) => {
       if (root === null || isFetching) {
@@ -429,13 +431,8 @@ export function Provider({
         // rrweb specific
         theme,
         eventsWithSnapshots: replay?.getRRWebFramesWithSnapshots() ?? [],
-        touchEvents: replay?.getRRwebTouchEvents() ?? [],
         // common to both
         root,
-        context: {
-          sdkName: replay?.getReplay().sdk.name,
-          sdkVersion: replay?.getReplay().sdk.version,
-        },
       });
       // `.current` is marked as readonly, but it's safe to set the value from
       // inside a `useEffect` hook.
diff --git a/static/app/components/replays/replayPlayer.tsx b/static/app/components/replays/replayPlayer.tsx
index 9b3160f52b3f58..408b93060583e9 100644
--- a/static/app/components/replays/replayPlayer.tsx
+++ b/static/app/components/replays/replayPlayer.tsx
@@ -217,6 +217,14 @@ const SentryPlayerRoot = styled(BasePlayerRoot)`
   ${baseReplayerCss}
   /* Sentry-specific styles for the player */
   ${p => sentryReplayerCss(p.theme)}
+
+  .video-replayer-wrapper + .replayer-wrapper {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+  }
 `;
 
 const Overlay = styled('div')`
diff --git a/static/app/components/replays/replayTagsTableRow.tsx b/static/app/components/replays/replayTagsTableRow.tsx
index 70f22a29057a16..0d05ad66674a5a 100644
--- a/static/app/components/replays/replayTagsTableRow.tsx
+++ b/static/app/components/replays/replayTagsTableRow.tsx
@@ -6,8 +6,10 @@ import type {LocationDescriptor} from 'history';
 import {AnnotatedText} from 'sentry/components/events/meta/annotatedText';
 import {KeyValueTableRow} from 'sentry/components/keyValueTable';
 import Link from 'sentry/components/links/link';
+import {CollapsibleValue} from 'sentry/components/structuredEventData/collapsibleValue';
 import {Tooltip} from 'sentry/components/tooltip';
 import Version from 'sentry/components/version';
+import {space} from 'sentry/styles/space';
 
 interface Props {
   name: string;
@@ -15,6 +17,29 @@ interface Props {
   generateUrl?: (name: string, value: ReactNode) => LocationDescriptor;
 }
 
+const expandedViewKeys = [
+  'sdk.replay.maskedViewClasses',
+  'sdk.replay.unmaskedViewClasses',
+];
+
+function renderValueList(values: ReactNode[]) {
+  if (typeof values[0] === 'string') {
+    return values[0];
+  }
+  const valueItems = values[0] as Array<string>;
+
+  if (!valueItems.length) {
+    return undefined;
+  }
+
+  return valueItems.map((value, index) => (
+    <Fragment key={`${index}-${value}`}>
+      {value}
+      <br />
+    </Fragment>
+  ));
+}
+
 function ReplayTagsTableRow({name, values, generateUrl}: Props) {
   const renderTagValue = useMemo(() => {
     if (name === 'release') {
@@ -25,6 +50,17 @@ function ReplayTagsTableRow({name, values, generateUrl}: Props) {
         </Fragment>
       ));
     }
+    if (
+      expandedViewKeys.includes(name) &&
+      renderValueList(values) &&
+      typeof renderValueList(values) !== 'string'
+    ) {
+      return (
+        <CollapsibleValue openTag="[" closeTag="]" path="$" noBasePadding>
+          {renderValueList(values)}
+        </CollapsibleValue>
+      );
+    }
 
     return values.map((value, index) => {
       const target = generateUrl?.(name, value);
@@ -46,9 +82,20 @@ function ReplayTagsTableRow({name, values, generateUrl}: Props) {
         </StyledTooltip>
       }
       value={
-        <StyledTooltip title={renderTagValue} isHoverable showOnlyOnOverflow>
-          {renderTagValue}
-        </StyledTooltip>
+        <ValueContainer>
+          <StyledTooltip
+            overlayStyle={
+              expandedViewKeys.includes(name) ? {textAlign: 'left'} : undefined
+            }
+            title={
+              expandedViewKeys.includes(name) ? renderValueList(values) : renderTagValue
+            }
+            isHoverable
+            showOnlyOnOverflow
+          >
+            {renderTagValue}
+          </StyledTooltip>
+        </ValueContainer>
       }
     />
   );
@@ -56,6 +103,15 @@ function ReplayTagsTableRow({name, values, generateUrl}: Props) {
 
 export default ReplayTagsTableRow;
 
+const ValueContainer = styled('div')`
+  span {
+    font-size: ${p => p.theme.fontSizeMedium};
+  }
+  display: flex;
+  padding: ${space(0.25)};
+  justify-content: flex-end;
+`;
+
 const StyledTooltip = styled(Tooltip)`
   ${p => p.theme.overflowEllipsis};
 `;
diff --git a/static/app/components/replays/useQueryBasedColumnResize.tsx b/static/app/components/replays/useQueryBasedColumnResize.tsx
index f3a56e445fa340..a23c613a2d57b7 100644
--- a/static/app/components/replays/useQueryBasedColumnResize.tsx
+++ b/static/app/components/replays/useQueryBasedColumnResize.tsx
@@ -4,8 +4,8 @@ import dropRightWhile from 'lodash/dropRightWhile';
 
 import type {GridColumnOrder} from 'sentry/components/gridEditable';
 import {COL_WIDTH_UNDEFINED} from 'sentry/components/gridEditable';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {decodeInteger, decodeList} from 'sentry/utils/queryString';
+import {useNavigate} from 'sentry/utils/useNavigate';
 
 interface Props<K extends string> {
   columns: GridColumnOrder<K>[];
@@ -19,6 +19,7 @@ export default function useQueryBasedColumnResize<K extends string>({
   paramName = 'width',
 }: Props<K>) {
   const queryParam = location.query[paramName];
+  const navigate = useNavigate();
   const columnsWidthWidths = useMemo(() => {
     const widths = decodeList(queryParam);
 
@@ -34,15 +35,18 @@ export default function useQueryBasedColumnResize<K extends string>({
         (column, i) =>
           (i === columnIndex ? resizedColumn.width : column.width) ?? COL_WIDTH_UNDEFINED
       );
-      browserHistory.replace({
-        pathname: location.pathname,
-        query: {
-          ...location.query,
-          [paramName]: dropRightWhile(widths, width => width === COL_WIDTH_UNDEFINED),
+      navigate(
+        {
+          pathname: location.pathname,
+          query: {
+            ...location.query,
+            [paramName]: dropRightWhile(widths, width => width === COL_WIDTH_UNDEFINED),
+          },
         },
-      });
+        {replace: true}
+      );
     },
-    [columns, location.pathname, location.query, paramName]
+    [columns, location.pathname, location.query, paramName, navigate]
   );
 
   return {
diff --git a/static/app/components/replays/utils.spec.tsx b/static/app/components/replays/utils.spec.tsx
index 7e9928dfb91948..0ce003ea1cddcb 100644
--- a/static/app/components/replays/utils.spec.tsx
+++ b/static/app/components/replays/utils.spec.tsx
@@ -110,11 +110,11 @@ describe('getFramesByColumn', () => {
 
   it('should put a crumbs in the first and last buckets', () => {
     const columnCount = 3;
-    const columns = getFramesByColumn(durationMs, [CRUMB_1, CRUMB_5], columnCount);
+    const columns = getFramesByColumn(durationMs, [CRUMB_1!, CRUMB_5!], columnCount);
     expect(columns).toEqual(
       new Map([
-        [1, [CRUMB_1]],
-        [3, [CRUMB_5]],
+        [1, [CRUMB_1!]],
+        [3, [CRUMB_5!]],
       ])
     );
   });
@@ -124,7 +124,7 @@ describe('getFramesByColumn', () => {
     const columnCount = 6;
     const columns = getFramesByColumn(
       durationMs,
-      [CRUMB_1, CRUMB_2, CRUMB_3, CRUMB_4, CRUMB_5],
+      [CRUMB_1!, CRUMB_2!, CRUMB_3!, CRUMB_4!, CRUMB_5!],
       columnCount
     );
     expect(columns).toEqual(
@@ -322,7 +322,7 @@ describe('findVideoSegmentIndex', () => {
     const trackList2 = segments2.map(
       ({timestamp}, index) => [timestamp, index] as [ts: number, index: number]
     );
-    expect(findVideoSegmentIndex(trackList2, segments2, 1000)).toEqual(-1);
+    expect(findVideoSegmentIndex(trackList2, segments2, 1000)).toBe(-1);
   });
 
   it('returns first segment if target timestamp is before the first segment', () => {
@@ -351,6 +351,6 @@ describe('findVideoSegmentIndex', () => {
     const trackList2 = segments2.map(
       ({timestamp}, index) => [timestamp, index] as [ts: number, index: number]
     );
-    expect(findVideoSegmentIndex(trackList2, segments2, 1000)).toEqual(-1);
+    expect(findVideoSegmentIndex(trackList2, segments2, 1000)).toBe(-1);
   });
 });
diff --git a/static/app/components/replays/utils.tsx b/static/app/components/replays/utils.tsx
index a750ed5b279590..5c1ee7851f79d9 100644
--- a/static/app/components/replays/utils.tsx
+++ b/static/app/components/replays/utils.tsx
@@ -134,17 +134,17 @@ export function flattenFrames(frames: SpanFrame[]): FlattenedSpanRange[] {
     };
   });
 
-  const flattened = [first];
+  const flattened = [first!];
 
   for (const span of rest) {
     let overlap = false;
     for (const range of flattened) {
-      if (doesOverlap(range, span)) {
+      if (doesOverlap(range!, span)) {
         overlap = true;
-        range.frameCount += 1;
-        range.startTimestamp = Math.min(range.startTimestamp, span.startTimestamp);
-        range.endTimestamp = Math.max(range.endTimestamp, span.endTimestamp);
-        range.duration = range.endTimestamp - range.startTimestamp;
+        range!.frameCount += 1;
+        range!.startTimestamp = Math.min(range!.startTimestamp, span.startTimestamp);
+        range!.endTimestamp = Math.max(range!.endTimestamp, span.endTimestamp);
+        range!.duration = range!.endTimestamp - range!.startTimestamp;
         break;
       }
     }
@@ -178,11 +178,11 @@ export function findVideoSegmentIndex(
 
   const mid = Math.floor((start + end) / 2);
 
-  const [ts, index] = trackList[mid];
+  const [ts, index] = trackList[mid]!;
   const segment = segments[index];
 
   // Segment match found
-  if (targetTimestamp >= ts && targetTimestamp <= ts + segment.duration) {
+  if (targetTimestamp >= ts && targetTimestamp <= ts + segment!.duration) {
     return index;
   }
 
diff --git a/static/app/components/replays/videoReplayer.spec.tsx b/static/app/components/replays/videoReplayer.spec.tsx
index 88c56381b14f19..23904e59284982 100644
--- a/static/app/components/replays/videoReplayer.spec.tsx
+++ b/static/app/components/replays/videoReplayer.spec.tsx
@@ -91,7 +91,7 @@ describe('VideoReplayer - no starting gap', () => {
       config: {skipInactive: false, speed: 1.0},
     });
     // @ts-expect-error private
-    expect(inst._currentIndex).toEqual(0);
+    expect(inst._currentIndex).toBe(0);
 
     const playPromise = inst.play(6500);
     jest.advanceTimersByTime(10000);
@@ -99,10 +99,10 @@ describe('VideoReplayer - no starting gap', () => {
     await playPromise;
 
     // @ts-expect-error private
-    expect(inst._currentIndex).toEqual(1);
+    expect(inst._currentIndex).toBe(1);
     // `currentTime` is in seconds
     // @ts-expect-error private
-    expect(inst.getVideo(inst._currentIndex)?.currentTime).toEqual(1.5);
+    expect(inst.getVideo(inst._currentIndex)?.currentTime).toBe(1.5);
   });
 
   it('seeks to a gap in a video', async () => {
@@ -127,10 +127,10 @@ describe('VideoReplayer - no starting gap', () => {
     jest.advanceTimersByTime(2500);
     await playPromise;
     // @ts-expect-error private
-    expect(inst._currentIndex).toEqual(3);
+    expect(inst._currentIndex).toBe(3);
     // `currentTime` is in seconds
     // @ts-expect-error private
-    expect(inst.getVideo(inst._currentIndex)?.currentTime).toEqual(0);
+    expect(inst.getVideo(inst._currentIndex)?.currentTime).toBe(0);
   });
 
   it('seeks past end of the replay', async () => {
@@ -153,10 +153,10 @@ describe('VideoReplayer - no starting gap', () => {
     jest.advanceTimersByTime(5000);
     await playPromise;
     // @ts-expect-error private
-    expect(inst._currentIndex).toEqual(5);
+    expect(inst._currentIndex).toBe(5);
     // `currentTime` is in seconds
     // @ts-expect-error private
-    expect(inst.getVideo(inst._currentIndex)?.currentTime).toEqual(5);
+    expect(inst.getVideo(inst._currentIndex)?.currentTime).toBe(5);
   });
 
   it('initially only loads videos from 0 to BUFFER', async () => {
@@ -175,9 +175,9 @@ describe('VideoReplayer - no starting gap', () => {
     jest.advanceTimersByTime(2500);
     await playPromise;
     // @ts-expect-error private
-    expect(inst._currentIndex).toEqual(0);
+    expect(inst._currentIndex).toBe(0);
     // @ts-expect-error private
-    expect(inst._videos.size).toEqual(3);
+    expect(inst._videos.size).toBe(3);
   });
 
   it('should load the correct videos after playing at a timestamp', async () => {
@@ -197,7 +197,7 @@ describe('VideoReplayer - no starting gap', () => {
     jest.advanceTimersByTime(2500);
     await playPromise;
     // @ts-expect-error private
-    expect(inst._currentIndex).toEqual(7);
+    expect(inst._currentIndex).toBe(7);
 
     // videos loaded should be [0, 1, 2, 4, 5, 6, 7]
     // since we have [0, 1, 2] preloaded initially
@@ -208,10 +208,10 @@ describe('VideoReplayer - no starting gap', () => {
     // @ts-expect-error private
     const getVideo = index => inst.getVideo(index);
 
-    expect(videos.size).toEqual(7);
+    expect(videos.size).toBe(7);
     expect(videos.get(0)).toEqual(getVideo(0));
     expect(videos.get(2)).toEqual(getVideo(2));
-    expect(videos.get(3)).toEqual(undefined);
+    expect(videos.get(3)).toBeUndefined();
     expect(videos.get(4)).toEqual(getVideo(4));
     expect(videos.get(7)).toEqual(getVideo(7));
   });
@@ -233,7 +233,7 @@ describe('VideoReplayer - no starting gap', () => {
     jest.advanceTimersByTime(2500);
     await playPromise;
     // @ts-expect-error private
-    expect(inst._currentIndex).toEqual(6);
+    expect(inst._currentIndex).toBe(6);
 
     // @ts-expect-error private
     const videos = inst._videos;
@@ -241,7 +241,7 @@ describe('VideoReplayer - no starting gap', () => {
     const getVideo = index => inst.getVideo(index);
 
     // videos loaded should be [0, 1, 2, 3, 4, 5, 7, 8]
-    expect(videos.size).toEqual(8);
+    expect(videos.size).toBe(8);
     expect(videos.get(0)).toEqual(getVideo(0));
     expect(videos.get(2)).toEqual(getVideo(2));
     expect(videos.get(5)).toEqual(getVideo(5));
@@ -304,16 +304,16 @@ describe('VideoReplayer - with starting gap', () => {
       config: {skipInactive: false, speed: 1.0},
     });
     // @ts-expect-error private
-    expect(inst._currentIndex).toEqual(0);
+    expect(inst._currentIndex).toBe(0);
     const playPromise = inst.play(1500);
     jest.advanceTimersByTime(2000);
     await playPromise;
 
     // @ts-expect-error private
-    expect(inst._currentIndex).toEqual(0);
+    expect(inst._currentIndex).toBe(0);
     // `currentTime` is in seconds
     // @ts-expect-error private
-    expect(inst.getVideo(inst._currentIndex)?.currentTime).toEqual(0);
+    expect(inst.getVideo(inst._currentIndex)?.currentTime).toBe(0);
   });
 
   it('seeks to a gap in a video', async () => {
@@ -338,10 +338,10 @@ describe('VideoReplayer - with starting gap', () => {
     jest.advanceTimersByTime(2500);
     await playPromise;
     // @ts-expect-error private
-    expect(inst._currentIndex).toEqual(3);
+    expect(inst._currentIndex).toBe(3);
     // `currentTime` is in seconds
     // @ts-expect-error private
-    expect(inst.getVideo(inst._currentIndex)?.currentTime).toEqual(0);
+    expect(inst.getVideo(inst._currentIndex)?.currentTime).toBe(0);
   });
 
   it('seeks past end of the replay', async () => {
@@ -364,10 +364,10 @@ describe('VideoReplayer - with starting gap', () => {
     jest.advanceTimersByTime(5000);
     await playPromise;
     // @ts-expect-error private
-    expect(inst._currentIndex).toEqual(5);
+    expect(inst._currentIndex).toBe(5);
     // `currentTime` is in seconds
     // @ts-expect-error private
-    expect(inst.getVideo(inst._currentIndex)?.currentTime).toEqual(5);
+    expect(inst.getVideo(inst._currentIndex)?.currentTime).toBe(5);
   });
 });
 
@@ -434,21 +434,21 @@ describe('VideoReplayer - with ending gap', () => {
 
     // we're still within the last segment (5)
     // @ts-expect-error private
-    expect(inst._currentIndex).toEqual(5);
-    expect(inst.getCurrentTime()).toEqual(40000);
+    expect(inst._currentIndex).toBe(5);
+    expect(inst.getCurrentTime()).toBe(40000);
 
     // now we are in the gap
     // timer should still be going since the duration is 50s
     jest.advanceTimersByTime(5000);
     // @ts-expect-error private
-    expect(inst._isPlaying).toEqual(true);
+    expect(inst._isPlaying).toBe(true);
 
     // a long time passes
     // ensure the timer stops at the end duration (50s)
     jest.advanceTimersByTime(60000);
-    expect(inst.getCurrentTime()).toEqual(50000);
+    expect(inst.getCurrentTime()).toBe(50000);
     // @ts-expect-error private
-    expect(inst._isPlaying).toEqual(false);
+    expect(inst._isPlaying).toBe(false);
   });
 
   it('ends at the proper time if seeking into a gap at the end', async () => {
@@ -472,15 +472,15 @@ describe('VideoReplayer - with ending gap', () => {
     jest.advanceTimersByTime(4000);
 
     // we should be still playing in the gap
-    expect(inst.getCurrentTime()).toEqual(44002);
+    expect(inst.getCurrentTime()).toBe(44002);
     // @ts-expect-error private
-    expect(inst._isPlaying).toEqual(true);
+    expect(inst._isPlaying).toBe(true);
 
     // a long time passes
     // ensure the timer stops at the end duration (50s)
     jest.advanceTimersByTime(60000);
     expect(inst.getCurrentTime()).toBeLessThan(50100);
     // @ts-expect-error private
-    expect(inst._isPlaying).toEqual(false);
+    expect(inst._isPlaying).toBe(false);
   });
 });
diff --git a/static/app/components/replays/videoReplayer.tsx b/static/app/components/replays/videoReplayer.tsx
index b2894d200d7258..b16ceb6444ef40 100644
--- a/static/app/components/replays/videoReplayer.tsx
+++ b/static/app/components/replays/videoReplayer.tsx
@@ -3,8 +3,6 @@ import type {ClipWindow, VideoEvent} from 'sentry/utils/replays/types';
 
 import {findVideoSegmentIndex} from './utils';
 
-type RootElem = HTMLDivElement | null;
-
 // The number of segments to load on either side of the requested segment (around 15 seconds)
 // Also the number of segments we load initially
 const PRELOAD_BUFFER = 3;
@@ -19,7 +17,7 @@ interface VideoReplayerOptions {
   onBuffer: (isBuffering: boolean) => void;
   onFinished: () => void;
   onLoaded: (event: any) => void;
-  root: RootElem;
+  root: HTMLDivElement;
   start: number;
   videoApiPrefix: string;
   clipWindow?: ClipWindow;
@@ -92,9 +90,8 @@ export class VideoReplayer {
     this.config = config;
 
     this.wrapper = document.createElement('div');
-    if (root) {
-      root.appendChild(this.wrapper);
-    }
+    this.wrapper.className = 'video-replayer-wrapper';
+    root.appendChild(this.wrapper);
 
     this._trackList = this._attachments.map(({timestamp}, i) => [timestamp, i]);
 
@@ -144,7 +141,7 @@ export class VideoReplayer {
     const handleLoadedData = event => {
       // Used to correctly set the dimensions of the first frame
       if (index === 0) {
-        this._callbacks.onLoaded(event);
+        this._callbacks.onLoaded!(event);
       }
 
       // Only call this for current segment as we preload multiple
@@ -162,7 +159,7 @@ export class VideoReplayer {
 
     const handlePlay = event => {
       if (index === this._currentIndex) {
-        this._callbacks.onLoaded(event);
+        this._callbacks.onLoaded!(event);
       }
     };
 
@@ -171,13 +168,13 @@ export class VideoReplayer {
       if (index === this._currentIndex) {
         // Theoretically we could have different orientations and they should
         // only happen in different segments
-        this._callbacks.onLoaded(event);
+        this._callbacks.onLoaded!(event);
       }
     };
 
     const handleSeeking = event => {
       // Centers the video when seeking (and video is not playing)
-      this._callbacks.onLoaded(event);
+      this._callbacks.onLoaded!(event);
     };
 
     el.addEventListener('ended', handleEnded);
@@ -287,12 +284,12 @@ export class VideoReplayer {
       this.resumeTimer();
     }
 
-    this._callbacks.onBuffer(isBuffering);
+    this._callbacks.onBuffer!(isBuffering);
   }
 
   private stopReplay() {
     this._timer.stop();
-    this._callbacks.onFinished();
+    this._callbacks.onFinished!();
     this._isPlaying = false;
   }
 
diff --git a/static/app/components/replays/videoReplayerWithInteractions.tsx b/static/app/components/replays/videoReplayerWithInteractions.tsx
index ebccbacb409ff7..58bb814a63701c 100644
--- a/static/app/components/replays/videoReplayerWithInteractions.tsx
+++ b/static/app/components/replays/videoReplayerWithInteractions.tsx
@@ -1,25 +1,20 @@
 import type {Theme} from '@emotion/react';
-import * as Sentry from '@sentry/react';
 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';
 
-type RootElem = HTMLDivElement | null;
-
 interface VideoReplayerWithInteractionsOptions {
-  context: {sdkName: string | undefined | null; sdkVersion: string | undefined | null};
   durationMs: number;
   eventsWithSnapshots: RecordingFrame[];
   onBuffer: (isBuffering: boolean) => void;
   onFinished: () => void;
   onLoaded: (event: any) => void;
-  root: RootElem;
+  root: HTMLDivElement;
   speed: number;
   start: number;
   theme: Theme;
-  touchEvents: RecordingFrame[];
   videoApiPrefix: string;
   videoEvents: VideoEvent[];
   clipWindow?: ClipWindow;
@@ -37,7 +32,6 @@ export class VideoReplayerWithInteractions {
   constructor({
     videoEvents,
     eventsWithSnapshots,
-    touchEvents,
     root,
     start,
     videoApiPrefix,
@@ -48,7 +42,6 @@ export class VideoReplayerWithInteractions {
     durationMs,
     theme,
     speed,
-    context,
   }: VideoReplayerWithInteractionsOptions) {
     this.config = {
       skipInactive: false,
@@ -67,26 +60,8 @@ export class VideoReplayerWithInteractions {
       config: this.config,
     });
 
-    root?.classList.add('video-replayer');
-
-    const grouped = Object.groupBy(touchEvents, (t: any) => t.data.pointerId);
-    Object.values(grouped).forEach(t => {
-      if (t?.length !== 2) {
-        Sentry.captureMessage(
-          'Mobile replay has mismatching touch start and end events',
-          {
-            tags: {
-              sdk_name: context.sdkName,
-              sdk_version: context.sdkVersion,
-              touch_event_type: typeof t,
-            },
-          }
-        );
-      }
-    });
-
     this.replayer = new Replayer(eventsWithSnapshots, {
-      root: root as Element,
+      root,
       blockClass: 'sentry-block',
       mouseTail: {
         duration: 0.75 * 1000,
diff --git a/static/app/components/replaysOnboarding/platformOptionDropdown.tsx b/static/app/components/replaysOnboarding/platformOptionDropdown.tsx
index 780a9fc75f8924..e735456aa1acdb 100644
--- a/static/app/components/replaysOnboarding/platformOptionDropdown.tsx
+++ b/static/app/components/replaysOnboarding/platformOptionDropdown.tsx
@@ -41,7 +41,7 @@ function OptionControl({option, value, onChange, disabled}: OptionControlProps)
   return (
     <CompactSelect
       triggerLabel={
-        option.items.find(v => v.value === value)?.label ?? option.items[0].label
+        option.items.find(v => v.value === value)?.label ?? option.items[0]!.label
       }
       value={value}
       onChange={onChange}
@@ -81,7 +81,7 @@ export function PlatformOptionDropdown({
       <OptionControl
         key="platformOption"
         option={platforms}
-        value={urlOptionValues.siblingOption ?? platforms.items[0]?.label}
+        value={urlOptionValues.siblingOption ?? platforms.items[0]!?.label}
         onChange={v => handleChange('siblingOption', v.value)}
         disabled={disabled}
       />
diff --git a/static/app/components/replaysOnboarding/sidebar.tsx b/static/app/components/replaysOnboarding/sidebar.tsx
index f2c6054f997d19..e40f0a2e5b30af 100644
--- a/static/app/components/replaysOnboarding/sidebar.tsx
+++ b/static/app/components/replaysOnboarding/sidebar.tsx
@@ -181,7 +181,7 @@ function OnboardingContent({
     value: PlatformKey;
     label?: ReactNode;
     textValue?: string;
-  }>(jsFrameworkSelectOptions[0]);
+  }>(jsFrameworkSelectOptions[0]!);
 
   const backendPlatform =
     currentProject.platform && replayBackendPlatforms.includes(currentProject.platform);
@@ -215,7 +215,7 @@ function OnboardingContent({
     platform:
       showJsFrameworkInstructions && setupMode() === 'npm'
         ? replayJsFrameworkOptions().find(p => p.id === jsFramework.value) ??
-          replayJsFrameworkOptions()[0]
+          replayJsFrameworkOptions()[0]!
         : currentPlatform,
     projSlug: currentProject.slug,
     orgSlug: organization.slug,
@@ -226,7 +226,7 @@ function OnboardingContent({
   const {docs: jsFrameworkDocs} = useLoadGettingStarted({
     platform:
       replayJsFrameworkOptions().find(p => p.id === jsFramework.value) ??
-      replayJsFrameworkOptions()[0],
+      replayJsFrameworkOptions()[0]!,
     projSlug: currentProject.slug,
     orgSlug: organization.slug,
     productType: 'replay',
diff --git a/static/app/components/replaysOnboarding/utils.tsx b/static/app/components/replaysOnboarding/utils.tsx
index 96273c99b035ec..1f057421d3b950 100644
--- a/static/app/components/replaysOnboarding/utils.tsx
+++ b/static/app/components/replaysOnboarding/utils.tsx
@@ -7,7 +7,7 @@ export function replayJsFrameworkOptions(): PlatformIntegration[] {
   // at the front so that it shows up by default in the onboarding.
   const frameworks = platforms.filter(p => replayFrontendPlatforms.includes(p.id));
   const jsPlatformIdx = frameworks.findIndex(p => p.id === 'javascript');
-  const jsPlatform = frameworks[jsPlatformIdx];
+  const jsPlatform = frameworks[jsPlatformIdx]!;
 
   // move javascript to the front
   frameworks.splice(jsPlatformIdx, 1);
diff --git a/static/app/components/repositoryEditForm.tsx b/static/app/components/repositoryEditForm.tsx
deleted file mode 100644
index a7b869e704c820..00000000000000
--- a/static/app/components/repositoryEditForm.tsx
+++ /dev/null
@@ -1,80 +0,0 @@
-import {Alert} from 'sentry/components/alert';
-import FieldFromConfig from 'sentry/components/forms/fieldFromConfig';
-import type {FormProps} from 'sentry/components/forms/form';
-import Form from 'sentry/components/forms/form';
-import type {Field} from 'sentry/components/forms/types';
-import ExternalLink from 'sentry/components/links/externalLink';
-import {t, tct} from 'sentry/locale';
-import type {Repository} from 'sentry/types/integrations';
-
-type Props = Pick<FormProps, 'onSubmitSuccess' | 'onCancel'> & {
-  closeModal: () => void;
-  onSubmitSuccess: (data: any) => void;
-  orgSlug: string;
-  repository: Repository;
-};
-
-const formFields: Field[] = [
-  {
-    name: 'name',
-    type: 'string',
-    required: true,
-    label: t('Name of your repository.'),
-  },
-  {
-    name: 'url',
-    type: 'string',
-    required: false,
-    label: t('Full URL to your repository.'),
-    placeholder: t('https://github.com/my-org/my-repo/'),
-  },
-];
-
-function RepositoryEditForm({
-  repository,
-  onCancel,
-  orgSlug,
-  onSubmitSuccess,
-  closeModal,
-}: Props) {
-  const initialData = {
-    name: repository.name,
-    url: repository.url || '',
-  };
-
-  return (
-    <Form
-      initialData={initialData}
-      onSubmitSuccess={data => {
-        onSubmitSuccess(data);
-        closeModal();
-      }}
-      apiEndpoint={`/organizations/${orgSlug}/repos/${repository.id}/`}
-      apiMethod="PUT"
-      onCancel={onCancel}
-    >
-      <Alert type="warning" showIcon>
-        {tct(
-          '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/cli/releases/#sentry-cli-commit-integration" />
-            ),
-            name: <strong>repo name</strong>,
-          }
-        )}
-      </Alert>
-      {formFields.map(field => (
-        <FieldFromConfig
-          key={field.name}
-          field={field}
-          inline={false}
-          stacked
-          flexibleControlStateSize
-        />
-      ))}
-    </Form>
-  );
-}
-
-export default RepositoryEditForm;
diff --git a/static/app/components/reprocessedBox.tsx b/static/app/components/reprocessedBox.tsx
index e6ae46d7fe992e..e96090f01b43a8 100644
--- a/static/app/components/reprocessedBox.tsx
+++ b/static/app/components/reprocessedBox.tsx
@@ -1,4 +1,4 @@
-import {Component} from 'react';
+import {useState} from 'react';
 import styled from '@emotion/styled';
 
 import {BannerContainer, BannerSummary} from 'sentry/components/events/styles';
@@ -18,29 +18,29 @@ type Props = {
   className?: string;
 };
 
-type State = {
-  isBannerHidden: boolean;
-};
-
-class ReprocessedBox extends Component<Props, State> {
-  state: State = {
-    isBannerHidden: localStorage.getItem(this.getBannerUniqueId()) === 'true',
-  };
-
-  getBannerUniqueId() {
-    const {reprocessActivity} = this.props;
+function ReprocessedBox({
+  orgSlug,
+  reprocessActivity,
+  groupCount,
+  className,
+  groupId,
+}: Props) {
+  const getBannerUniqueId = () => {
     const {id} = reprocessActivity;
 
     return `reprocessed-activity-${id}-banner-dismissed`;
-  }
+  };
+
+  const [isBannerHidden, setIsBannerHidden] = useState<boolean>(
+    localStorage.getItem(getBannerUniqueId()) === 'true'
+  );
 
-  handleBannerDismiss = () => {
-    localStorage.setItem(this.getBannerUniqueId(), 'true');
-    this.setState({isBannerHidden: true});
+  const handleBannerDismiss = () => {
+    localStorage.setItem(getBannerUniqueId(), 'true');
+    setIsBannerHidden(true);
   };
 
-  renderMessage() {
-    const {orgSlug, reprocessActivity, groupCount, groupId} = this.props;
+  const renderMessage = () => {
     const {data} = reprocessActivity;
     const {eventCount, oldGroupId, newGroupId} = data;
 
@@ -65,32 +65,26 @@ class ReprocessedBox extends Component<Props, State> {
         </Link>
       ),
     });
-  }
-
-  render() {
-    const {isBannerHidden} = this.state;
-
-    if (isBannerHidden) {
-      return null;
-    }
-
-    const {className} = this.props;
+  };
 
-    return (
-      <BannerContainer priority="success" className={className}>
-        <StyledBannerSummary>
-          <IconCheckmark color="successText" isCircled />
-          <span>{this.renderMessage()}</span>
-          <StyledIconClose
-            color="successText"
-            aria-label={t('Dismiss')}
-            isCircled
-            onClick={this.handleBannerDismiss}
-          />
-        </StyledBannerSummary>
-      </BannerContainer>
-    );
+  if (isBannerHidden) {
+    return null;
   }
+
+  return (
+    <BannerContainer priority="success" className={className}>
+      <StyledBannerSummary>
+        <IconCheckmark color="successText" isCircled />
+        <span>{renderMessage()}</span>
+        <StyledIconClose
+          color="successText"
+          aria-label={t('Dismiss')}
+          isCircled
+          onClick={handleBannerDismiss}
+        />
+      </StyledBannerSummary>
+    </BannerContainer>
+  );
 }
 
 export default ReprocessedBox;
diff --git a/static/app/components/resultGrid.tsx b/static/app/components/resultGrid.tsx
index e14af9c402250d..d4376e5e5ac85c 100644
--- a/static/app/components/resultGrid.tsx
+++ b/static/app/components/resultGrid.tsx
@@ -204,7 +204,7 @@ class ResultGrid extends Component<Props, State> {
     this.setState(
       {
         query: queryParams.query ?? '',
-        sortBy: queryParams.sortBy ?? this.props.defaultSort,
+        sortBy: queryParams.sortBy ?? this.props.defaultSort!,
         filters: {...queryParams},
         pageLinks: null,
         loading: true,
@@ -358,7 +358,7 @@ class ResultGrid extends Component<Props, State> {
             <Filter
               key={filterKey}
               queryKey={filterKey}
-              value={this.state.filters[filterKey]}
+              value={this.state.filters[filterKey]!}
               path={path ?? ''}
               location={location}
               {...(filters?.[filterKey] as FilterConfig)}
diff --git a/static/app/components/roleSelectControl.tsx b/static/app/components/roleSelectControl.tsx
index 6f6222545701d8..d3b21790d7f707 100644
--- a/static/app/components/roleSelectControl.tsx
+++ b/static/app/components/roleSelectControl.tsx
@@ -25,9 +25,7 @@ type Props = Omit<ControlProps<OptionType>, 'onChange' | 'value'> & {
 function RoleSelectControl({roles, disableUnallowed, ...props}: Props) {
   const organization = useOrganization();
   const isMemberInvite =
-    organization.features.includes('members-invite-teammates') &&
-    organization.allowMemberInvite &&
-    organization.access?.includes('member:invite');
+    organization.allowMemberInvite && organization.access?.includes('member:invite');
 
   return (
     <SelectControl
diff --git a/static/app/components/scrollCarousel.tsx b/static/app/components/scrollCarousel.tsx
index 106ddc41f158bf..c46f6191ac9568 100644
--- a/static/app/components/scrollCarousel.tsx
+++ b/static/app/components/scrollCarousel.tsx
@@ -80,7 +80,7 @@ export function ScrollCarousel({
     scrollContainerRef.current?.scrollTo({
       behavior: 'smooth',
       // We don't need to do any fancy math for the left edge
-      left: getOffsetRect(childrenEls[clampedIndex], childrenEls[0]).left,
+      left: getOffsetRect(childrenEls[clampedIndex]!, childrenEls[0]!).left,
     });
   }, [visibility, childrenEls, jumpItemCount]);
 
@@ -89,8 +89,8 @@ export function ScrollCarousel({
     // Clamp the scroll index to the last visible item
     const clampedIndex = Math.min(scrollIndex + jumpItemCount, visibility.length - 1);
 
-    const targetElement = childrenEls[clampedIndex];
-    const targetElementRight = getOffsetRect(targetElement, childrenEls[0]).right;
+    const targetElement = childrenEls[clampedIndex]!;
+    const targetElementRight = getOffsetRect(targetElement, childrenEls[0]!).right;
     const containerRight = scrollContainerRef.current?.clientWidth ?? 0;
     // scrollIntoView scrolls the entire page on some browsers
     scrollContainerRef.current?.scrollTo({
diff --git a/static/app/components/search/sources/apiSource.spec.tsx b/static/app/components/search/sources/apiSource.spec.tsx
index 8c718c77b2878d..340619805edecd 100644
--- a/static/app/components/search/sources/apiSource.spec.tsx
+++ b/static/app/components/search/sources/apiSource.spec.tsx
@@ -398,8 +398,8 @@ describe('ApiSource', function () {
       // The return values here are because of fuzzy search matching.
       // There are no members that match
       expect(mock.mock.calls[1][0].results).toHaveLength(6);
-      expect(mock.mock.calls[1][0].results[0].item.model.slug).toBe('foo-org');
     });
+    expect(mock.mock.calls[1][0].results[0].item.model.slug).toBe('foo-org');
 
     mock.mockClear();
 
@@ -412,8 +412,8 @@ describe('ApiSource', function () {
     await waitFor(() => {
       // Still have 4 results, but is re-ordered
       expect(mock.mock.calls[0][0].results).toHaveLength(6);
-      expect(mock.mock.calls[0][0].results[0].item.model.slug).toBe('foo-team');
     });
+    expect(mock.mock.calls[0][0].results[0].item.model.slug).toBe('foo-team');
   });
 
   describe('API queries', function () {
diff --git a/static/app/components/search/sources/apiSource.tsx b/static/app/components/search/sources/apiSource.tsx
index 516a55dc30209e..7940280bc9c5e0 100644
--- a/static/app/components/search/sources/apiSource.tsx
+++ b/static/app/components/search/sources/apiSource.tsx
@@ -425,16 +425,16 @@ class ApiSource extends Component<Props, State> {
 
     const [searchResults, directResults] = await Promise.all([
       this.getSearchableResults([
-        organizations,
-        projects,
-        teams,
-        members,
-        plugins,
-        integrations,
-        sentryApps,
-        docIntegrations,
+        organizations!,
+        projects!,
+        teams!,
+        members!,
+        plugins!,
+        integrations!,
+        sentryApps!,
+        docIntegrations!,
       ]),
-      this.getDirectResults([shortIdLookup, eventIdLookup]),
+      this.getDirectResults([shortIdLookup!, eventIdLookup!]),
     ]);
 
     // TODO(XXX): Might consider adding logic to maintain consistent ordering
@@ -468,14 +468,14 @@ class ApiSource extends Component<Props, State> {
       docIntegrations,
     ] = requests;
     const searchResults = await Promise.all([
-      createOrganizationResults(organizations),
-      createProjectResults(projects, orgId),
-      createTeamResults(teams, orgId),
-      createMemberResults(members, orgId),
-      createIntegrationResults(integrations, orgId),
-      createPluginResults(plugins, orgId),
-      createSentryAppResults(sentryApps, orgId),
-      createDocIntegrationResults(docIntegrations, orgId),
+      createOrganizationResults(organizations!),
+      createProjectResults(projects!, orgId),
+      createTeamResults(teams!, orgId),
+      createMemberResults(members!, orgId),
+      createIntegrationResults(integrations!, orgId),
+      createPluginResults(plugins!, orgId),
+      createSentryAppResults(sentryApps!, orgId),
+      createDocIntegrationResults(docIntegrations!, orgId),
     ]);
 
     return searchResults.flat();
@@ -488,8 +488,8 @@ class ApiSource extends Component<Props, State> {
 
     const directResults = (
       await Promise.all([
-        createShortIdLookupResult(shortIdLookup),
-        createEventIdLookupResult(eventIdLookup),
+        createShortIdLookupResult(shortIdLookup!),
+        createEventIdLookupResult(eventIdLookup!),
       ])
     ).filter(defined);
 
diff --git a/static/app/components/search/sources/commandSource.tsx b/static/app/components/search/sources/commandSource.tsx
index 682d5641e2a558..8c8f36a72e34b8 100644
--- a/static/app/components/search/sources/commandSource.tsx
+++ b/static/app/components/search/sources/commandSource.tsx
@@ -9,6 +9,7 @@ import ConfigStore from 'sentry/stores/configStore';
 import type {PlainRoute} from 'sentry/types/legacyReactRouter';
 import type {Fuse} from 'sentry/utils/fuzzySearch';
 import {createFuzzySearch} from 'sentry/utils/fuzzySearch';
+import {removeBodyTheme} from 'sentry/utils/removeBodyTheme';
 
 import type {ChildProps, ResultItem} from './types';
 
@@ -44,8 +45,10 @@ const ACTIONS: Action[] = [
     title: t('Toggle dark mode'),
     description: t('Toggle dark mode (superuser only atm)'),
     requiresSuperuser: true,
-    action: () =>
-      ConfigStore.set('theme', ConfigStore.get('theme') === 'dark' ? 'light' : 'dark'),
+    action: () => {
+      removeBodyTheme();
+      ConfigStore.set('theme', ConfigStore.get('theme') === 'dark' ? 'light' : 'dark');
+    },
   },
 
   {
diff --git a/static/app/components/search/sources/helpSource.tsx b/static/app/components/search/sources/helpSource.tsx
index 95f6623df24f16..4f72b1a7c234dc 100644
--- a/static/app/components/search/sources/helpSource.tsx
+++ b/static/app/components/search/sources/helpSource.tsx
@@ -121,8 +121,8 @@ function mapSearchResults(results: SearchResult[]) {
 
     // The first element should indicate the section.
     if (sectionItems.length > 0) {
-      sectionItems[0].item.sectionHeading = section.name;
-      sectionItems[0].item.sectionCount = sectionItems.length;
+      sectionItems[0]!.item.sectionHeading = section.name;
+      sectionItems[0]!.item.sectionCount = sectionItems.length;
 
       items.push(...sectionItems);
       return;
diff --git a/static/app/components/search/sources/index.tsx b/static/app/components/search/sources/index.tsx
index e4d06f11a6b6e5..523c99cd7f9190 100644
--- a/static/app/components/search/sources/index.tsx
+++ b/static/app/components/search/sources/index.tsx
@@ -1,4 +1,4 @@
-import {Component} from 'react';
+import {useCallback} from 'react';
 
 import type {Fuse} from 'sentry/utils/fuzzySearch';
 
@@ -23,53 +23,53 @@ type SourceResult = {
   results: Result[];
 };
 
-class SearchSources extends Component<Props> {
-  // `allSources` will be an array of all result objects from each source
-  renderResults(allSources: SourceResult[]) {
-    const {children} = this.props;
+function SearchSources(props: Props) {
+  const {children, sources} = props;
 
-    // loading means if any result has `isLoading` OR any result is null
-    const isLoading = !!allSources.find(arg => arg.isLoading || arg.results === null);
+  // `allSources` will be an array of all result objects from each source
+  const renderResults = useCallback(
+    (allSources: SourceResult[]) => {
+      // loading means if any result has `isLoading` OR any result is null
+      const isLoading = !!allSources.find(arg => arg.isLoading || arg.results === null);
 
-    const foundResults = isLoading
-      ? []
-      : allSources
-          .flatMap(({results}) => results ?? [])
-          .sort((a, b) => (a.score ?? 0) - (b.score ?? 0));
-    const hasAnyResults = !!foundResults.length;
+      const foundResults = isLoading
+        ? []
+        : allSources
+            .flatMap(({results}) => results ?? [])
+            .sort((a, b) => (a.score ?? 0) - (b.score ?? 0));
+      const hasAnyResults = !!foundResults.length;
 
-    return children({
-      isLoading,
-      results: foundResults,
-      hasAnyResults,
-    });
-  }
+      return children({
+        isLoading,
+        results: foundResults,
+        hasAnyResults,
+      });
+    },
+    [children]
+  );
 
-  renderSources(sources: Props['sources'], results: SourceResult[], idx: number) {
-    if (idx >= sources.length) {
-      return this.renderResults(results);
-    }
-    const Source = sources[idx];
-    return (
-      <Source {...this.props}>
-        {(args: SourceResult) => {
-          // Mutate the array instead of pushing because we don't know how often
-          // this child function will be called and pushing will cause duplicate
-          // results to be pushed for all calls down the chain.
-          results[idx] = args;
-          return this.renderSources(sources, results, idx + 1);
-        }}
-      </Source>
-    );
-  }
+  const renderSources = useCallback(
+    (results: SourceResult[], idx: number) => {
+      if (idx >= sources.length) {
+        return renderResults(results);
+      }
+      const Source = sources[idx]!;
+      return (
+        <Source {...props}>
+          {(args: SourceResult) => {
+            // Mutate the array instead of pushing because we don't know how often
+            // this child function will be called and pushing will cause duplicate
+            // results to be pushed for all calls down the chain.
+            results[idx] = args;
+            return renderSources(results, idx + 1);
+          }}
+        </Source>
+      );
+    },
+    [props, renderResults, sources]
+  );
 
-  render() {
-    return this.renderSources(
-      this.props.sources,
-      new Array(this.props.sources.length),
-      0
-    );
-  }
+  return renderSources(new Array(sources.length), 0);
 }
 
 export default SearchSources;
diff --git a/static/app/components/searchQueryBuilder/hooks/useQueryBuilderState.tsx b/static/app/components/searchQueryBuilder/hooks/useQueryBuilderState.tsx
index 3296faf061fe89..8f9157cb041935 100644
--- a/static/app/components/searchQueryBuilder/hooks/useQueryBuilderState.tsx
+++ b/static/app/components/searchQueryBuilder/hooks/useQueryBuilderState.tsx
@@ -131,7 +131,7 @@ function removeQueryTokensFromQuery(
   }
 
   return removeExcessWhitespaceFromParts(
-    query.substring(0, tokens[0].location.start.offset),
+    query.substring(0, tokens[0]!.location.start.offset),
     query.substring(tokens.at(-1)!.location.end.offset)
   );
 }
@@ -243,7 +243,7 @@ function replaceQueryTokens(
     return query;
   }
 
-  const start = query.substring(0, tokens[0].location.start.offset);
+  const start = query.substring(0, tokens[0]!.location.start.offset);
   const end = query.substring(tokens.at(-1)!.location.end.offset);
 
   return start + value + end;
@@ -296,7 +296,7 @@ export function replaceTokensWithPadding(
     return query;
   }
 
-  const start = query.substring(0, tokens[0].location.start.offset);
+  const start = query.substring(0, tokens[0]!.location.start.offset);
   const end = query.substring(tokens.at(-1)!.location.end.offset);
 
   return removeExcessWhitespaceFromParts(start, value, end);
@@ -367,7 +367,7 @@ function updateFilterMultipleValues(
   const newValue =
     uniqNonEmptyValues.length > 1
       ? `[${uniqNonEmptyValues.join(',')}]`
-      : uniqNonEmptyValues[0];
+      : uniqNonEmptyValues[0]!;
 
   return {...state, query: replaceQueryToken(state.query, token.value, newValue)};
 }
diff --git a/static/app/components/searchQueryBuilder/hooks/useSelectOnDrag.tsx b/static/app/components/searchQueryBuilder/hooks/useSelectOnDrag.tsx
index 83c37de6c73d45..1cc93d905ef84d 100644
--- a/static/app/components/searchQueryBuilder/hooks/useSelectOnDrag.tsx
+++ b/static/app/components/searchQueryBuilder/hooks/useSelectOnDrag.tsx
@@ -87,8 +87,8 @@ function getItemIndexAtPosition(
   y: number
 ) {
   for (let i = 0; i < keys.length; i++) {
-    const key = keys[i];
-    const coords = coordinates[key];
+    const key = keys[i]!;
+    const coords = coordinates[key]!;
 
     // If we are above this item, we must be in between this and the
     // previous item on the row above it.
diff --git a/static/app/components/searchQueryBuilder/index.spec.tsx b/static/app/components/searchQueryBuilder/index.spec.tsx
index e83205cc8a53ca..a36e631d1b5110 100644
--- a/static/app/components/searchQueryBuilder/index.spec.tsx
+++ b/static/app/components/searchQueryBuilder/index.spec.tsx
@@ -163,18 +163,18 @@ describe('SearchQueryBuilder', function () {
       // Should call onChange and onSearch after enter
       await waitFor(() => {
         expect(mockOnChange).toHaveBeenCalledTimes(1);
-        expect(mockOnChange).toHaveBeenCalledWith('ab', expectedQueryState);
-        expect(mockOnSearch).toHaveBeenCalledTimes(1);
-        expect(mockOnSearch).toHaveBeenCalledWith('ab', expectedQueryState);
       });
+      expect(mockOnChange).toHaveBeenCalledWith('ab', expectedQueryState);
+      expect(mockOnSearch).toHaveBeenCalledTimes(1);
+      expect(mockOnSearch).toHaveBeenCalledWith('ab', expectedQueryState);
 
       await userEvent.click(document.body);
 
       // Clicking outside activates onBlur
       await waitFor(() => {
         expect(mockOnBlur).toHaveBeenCalledTimes(1);
-        expect(mockOnBlur).toHaveBeenCalledWith('ab', expectedQueryState);
       });
+      expect(mockOnBlur).toHaveBeenCalledWith('ab', expectedQueryState);
     });
   });
 
@@ -194,8 +194,8 @@ describe('SearchQueryBuilder', function () {
 
       await waitFor(() => {
         expect(mockOnChange).toHaveBeenCalledWith('', expect.anything());
-        expect(mockOnSearch).toHaveBeenCalledWith('', expect.anything());
       });
+      expect(mockOnSearch).toHaveBeenCalledWith('', expect.anything());
 
       expect(
         screen.queryByRole('row', {name: 'browser.name:firefox'})
@@ -321,7 +321,7 @@ describe('SearchQueryBuilder', function () {
       expect(groups).toHaveLength(3);
 
       // First group (Field) should have age, assigned, browser.name
-      const group1 = groups[0];
+      const group1 = groups[0]!;
       expect(within(group1).getByRole('option', {name: 'age'})).toBeInTheDocument();
       expect(within(group1).getByRole('option', {name: 'assigned'})).toBeInTheDocument();
       expect(
@@ -329,13 +329,13 @@ describe('SearchQueryBuilder', function () {
       ).toBeInTheDocument();
 
       // Second group (Tag) should have custom_tag_name
-      const group2 = groups[1];
+      const group2 = groups[1]!;
       expect(
         within(group2).getByRole('option', {name: 'custom_tag_name'})
       ).toBeInTheDocument();
 
       // There should be a third group for uncategorized keys
-      const group3 = groups[2];
+      const group3 = groups[2]!;
       expect(
         within(group3).getByRole('option', {name: 'uncategorized_tag'})
       ).toBeInTheDocument();
@@ -398,7 +398,7 @@ describe('SearchQueryBuilder', function () {
         expect(recentFilterKeys[1]).toHaveTextContent('browser');
         expect(recentFilterKeys[2]).toHaveTextContent('is');
 
-        await userEvent.click(recentFilterKeys[0]);
+        await userEvent.click(recentFilterKeys[0]!);
 
         expect(await screen.findByRole('row', {name: 'assigned:""'})).toBeInTheDocument();
       });
@@ -460,7 +460,7 @@ describe('SearchQueryBuilder', function () {
         await waitFor(() => {
           expect(getLastInput()).toHaveAttribute(
             'aria-activedescendant',
-            recentFilterKeys[0].id
+            recentFilterKeys[0]!.id
           );
         });
 
@@ -469,7 +469,7 @@ describe('SearchQueryBuilder', function () {
         await waitFor(() => {
           expect(getLastInput()).toHaveAttribute(
             'aria-activedescendant',
-            recentFilterKeys[1].id
+            recentFilterKeys[1]!.id
           );
         });
 
@@ -487,7 +487,7 @@ describe('SearchQueryBuilder', function () {
         await waitFor(() => {
           expect(getLastInput()).toHaveAttribute(
             'aria-activedescendant',
-            recentFilterKeys[0].id
+            recentFilterKeys[0]!.id
           );
         });
       });
@@ -520,6 +520,35 @@ describe('SearchQueryBuilder', function () {
         ).toBeInTheDocument();
       });
 
+      it('switches to keys menu when recent searches no longer exist', async function () {
+        const {rerender} = render(
+          <SearchQueryBuilder
+            {...defaultProps}
+            recentSearches={SavedSearchType.ISSUE}
+            initialQuery=""
+          />
+        );
+
+        await userEvent.click(getLastInput());
+
+        // Recent should be selected
+        expect(screen.getByRole('button', {name: 'Recent'})).toHaveAttribute(
+          'aria-selected',
+          'true'
+        );
+
+        // Rerender without recent searches
+        rerender(<SearchQueryBuilder {...defaultProps} />);
+
+        // Recent should not exist anymore
+        expect(screen.queryByRole('button', {name: 'Recent'})).not.toBeInTheDocument();
+        // All should be selected
+        expect(screen.getByRole('button', {name: 'All'})).toHaveAttribute(
+          'aria-selected',
+          'true'
+        );
+      });
+
       it('when selecting a recent search, should reset query and call onSearch', async function () {
         const mockOnSearch = jest.fn();
         const mockCreateRecentSearch = MockApiClient.addMockResponse({
@@ -666,7 +695,7 @@ describe('SearchQueryBuilder', function () {
       // jsdom does not support getBoundingClientRect, so we need to mock it for each item
 
       // First freeText area is 5px wide
-      freeText1.getBoundingClientRect = () => {
+      freeText1!.getBoundingClientRect = () => {
         return {
           top: 0,
           left: 10,
@@ -677,7 +706,7 @@ describe('SearchQueryBuilder', function () {
         } as DOMRect;
       };
       // "is:unresolved" filter is 100px wide
-      filter.getBoundingClientRect = () => {
+      filter!.getBoundingClientRect = () => {
         return {
           top: 0,
           left: 15,
@@ -688,7 +717,7 @@ describe('SearchQueryBuilder', function () {
         } as DOMRect;
       };
       // Last freeText area is 200px wide
-      freeText2.getBoundingClientRect = () => {
+      freeText2!.getBoundingClientRect = () => {
         return {
           top: 0,
           left: 115,
@@ -856,6 +885,29 @@ describe('SearchQueryBuilder', function () {
 
       expect(getLastInput()).toHaveFocus();
     });
+
+    it('focuses the correct text input after typing boolean operators', async function () {
+      render(<SearchQueryBuilder {...defaultProps} />);
+
+      await userEvent.click(getLastInput());
+
+      // XXX(malwilley): SearchQueryBuilderInput updates state in the render
+      // function which causes an act warning despite using userEvent.click.
+      // Cannot find a way to avoid this warning.
+      jest.spyOn(console, 'error').mockImplementation(jest.fn());
+      await userEvent.keyboard('a or b{enter}');
+      jest.restoreAllMocks();
+
+      const lastInput = (await screen.findAllByTestId('query-builder-input')).at(-1);
+      expect(lastInput).toHaveFocus();
+
+      await userEvent.click(getLastInput());
+
+      // Should have three tokens: a, or, b
+      await screen.findByRole('row', {name: /a/});
+      await screen.findByRole('row', {name: /or/});
+      await screen.findByRole('row', {name: /b/});
+    });
   });
 
   describe('filter key suggestions', function () {
@@ -938,7 +990,7 @@ describe('SearchQueryBuilder', function () {
 
       // Put focus into the first input (before the token)
       await userEvent.click(
-        screen.getAllByRole('combobox', {name: 'Add a search term'})[0]
+        screen.getAllByRole('combobox', {name: 'Add a search term'})[0]!
       );
 
       // Pressing delete once should focus the previous token
@@ -1409,17 +1461,17 @@ describe('SearchQueryBuilder', function () {
       expect(within(screen.getByRole('listbox')).getByText('All')).toBeInTheDocument();
 
       // First group is the selected "me"
-      expect(within(groups[0]).getByRole('option', {name: 'me'})).toBeInTheDocument();
+      expect(within(groups[0]!).getByRole('option', {name: 'me'})).toBeInTheDocument();
       // Second group is the remaining option in the "Suggested" section
       expect(
-        within(groups[1]).getByRole('option', {name: 'unassigned'})
+        within(groups[1]!).getByRole('option', {name: 'unassigned'})
       ).toBeInTheDocument();
       // Third group are the options under the "All" section
       expect(
-        within(groups[2]).getByRole('option', {name: 'person1@sentry.io'})
+        within(groups[2]!).getByRole('option', {name: 'person1@sentry.io'})
       ).toBeInTheDocument();
       expect(
-        within(groups[2]).getByRole('option', {name: 'person2@sentry.io'})
+        within(groups[2]!).getByRole('option', {name: 'person2@sentry.io'})
       ).toBeInTheDocument();
     });
 
diff --git a/static/app/components/searchQueryBuilder/index.stories.tsx b/static/app/components/searchQueryBuilder/index.stories.tsx
index 3a0b68dcc6454f..2a9b69235ea6f5 100644
--- a/static/app/components/searchQueryBuilder/index.stories.tsx
+++ b/static/app/components/searchQueryBuilder/index.stories.tsx
@@ -1,5 +1,6 @@
 import {Fragment, useState} from 'react';
 
+import {ItemType} from 'sentry/components/deprecatedSmartSearchBar/types';
 import MultipleCheckbox from 'sentry/components/forms/controls/multipleCheckbox';
 import {SearchQueryBuilder} from 'sentry/components/searchQueryBuilder';
 import {FormattedQuery} from 'sentry/components/searchQueryBuilder/formattedQuery';
@@ -8,7 +9,6 @@ import type {
   FilterKeySection,
 } from 'sentry/components/searchQueryBuilder/types';
 import {InvalidReason} from 'sentry/components/searchSyntax/parser';
-import {ItemType} from 'sentry/components/smartSearchBar/types';
 import JSXNode from 'sentry/components/stories/jsxNode';
 import JSXProperty from 'sentry/components/stories/jsxProperty';
 import storyBook from 'sentry/stories/storyBook';
diff --git a/static/app/components/searchQueryBuilder/index.tsx b/static/app/components/searchQueryBuilder/index.tsx
index ff0a27b3adf4cf..27566122befad9 100644
--- a/static/app/components/searchQueryBuilder/index.tsx
+++ b/static/app/components/searchQueryBuilder/index.tsx
@@ -303,6 +303,7 @@ export function SearchQueryBuilder({
         }
         ref={wrapperRef}
         aria-disabled={disabled}
+        data-test-id="search-query-builder"
       >
         <PanelProvider>
           <SearchIndicator
diff --git a/static/app/components/searchQueryBuilder/tokens/combobox.tsx b/static/app/components/searchQueryBuilder/tokens/combobox.tsx
index af2ba91f1aef9a..e40627dfa92922 100644
--- a/static/app/components/searchQueryBuilder/tokens/combobox.tsx
+++ b/static/app/components/searchQueryBuilder/tokens/combobox.tsx
@@ -238,7 +238,6 @@ function useUpdateOverlayPositionOnContentChange({
       resizeObserverRef.current?.disconnect();
       resizeObserverRef.current = null;
     };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   useLayoutEffect(() => {
diff --git a/static/app/components/searchQueryBuilder/tokens/filter/filter.tsx b/static/app/components/searchQueryBuilder/tokens/filter/filter.tsx
index af001328692cca..15665bb382cbdd 100644
--- a/static/app/components/searchQueryBuilder/tokens/filter/filter.tsx
+++ b/static/app/components/searchQueryBuilder/tokens/filter/filter.tsx
@@ -51,10 +51,10 @@ export function FilterValueText({token}: {token: TokenResult<Token.FILTER>}) {
     case Token.VALUE_NUMBER_LIST:
       const items = token.value.items;
 
-      if (items.length === 1 && items[0].value) {
+      if (items.length === 1 && items[0]!.value) {
         return (
           <FilterValueSingleTruncatedValue>
-            {formatFilterValue(items[0].value)}
+            {formatFilterValue(items[0]!.value)}
           </FilterValueSingleTruncatedValue>
         );
       }
diff --git a/static/app/components/searchQueryBuilder/tokens/filter/parametersCombobox.tsx b/static/app/components/searchQueryBuilder/tokens/filter/parametersCombobox.tsx
index 642ded7066b69c..bcbdd2935b45a1 100644
--- a/static/app/components/searchQueryBuilder/tokens/filter/parametersCombobox.tsx
+++ b/static/app/components/searchQueryBuilder/tokens/filter/parametersCombobox.tsx
@@ -44,9 +44,9 @@ function getParameterAtCursorPosition(
 
   let characterCount = 0;
   for (let i = 0; i < items.length; i++) {
-    characterCount += items[i].length + 1;
+    characterCount += items[i]!.length + 1;
     if (characterCount > cursorPosition) {
-      return {parameterIndex: i, textValue: items[i].trim()};
+      return {parameterIndex: i, textValue: items[i]!.trim()};
     }
   }
 
@@ -58,7 +58,7 @@ function getCursorPositionAtEndOfParameter(text: string, parameterIndex: number)
   const charactersBefore =
     items.slice(0, parameterIndex).join('').length + parameterIndex;
 
-  return charactersBefore + items[parameterIndex].length;
+  return charactersBefore + items[parameterIndex]!.length;
 }
 
 function useSelectionIndex({
diff --git a/static/app/components/searchQueryBuilder/tokens/filter/parsers/string/parser.spec.tsx b/static/app/components/searchQueryBuilder/tokens/filter/parsers/string/parser.spec.tsx
index aa1333237fb8d8..43ff654f9b8a05 100644
--- a/static/app/components/searchQueryBuilder/tokens/filter/parsers/string/parser.spec.tsx
+++ b/static/app/components/searchQueryBuilder/tokens/filter/parsers/string/parser.spec.tsx
@@ -7,7 +7,7 @@ describe('parseMultiSelectValue', function () {
     expect(result).not.toBeNull();
 
     expect(result!.items).toHaveLength(1);
-    expect(result?.items[0].value?.value).toEqual('a');
+    expect(result!.items[0]!.value?.value).toBe('a');
   });
 
   it('multiple value', function () {
@@ -16,9 +16,9 @@ describe('parseMultiSelectValue', function () {
     expect(result).not.toBeNull();
 
     expect(result!.items).toHaveLength(3);
-    expect(result?.items[0].value?.value).toEqual('a');
-    expect(result?.items[1].value?.value).toEqual('b');
-    expect(result?.items[2].value?.value).toEqual('c');
+    expect(result!?.items[0]!.value?.value).toBe('a');
+    expect(result!?.items[1]!.value?.value).toBe('b');
+    expect(result!?.items[2]!.value?.value).toBe('c');
   });
 
   it('quoted value', function () {
@@ -27,13 +27,13 @@ describe('parseMultiSelectValue', function () {
     expect(result).not.toBeNull();
 
     expect(result!.items).toHaveLength(3);
-    expect(result?.items[0].value?.value).toEqual('a');
+    expect(result!?.items[0]!.value?.value).toBe('a');
 
-    expect(result?.items[1].value?.value).toEqual('b');
-    expect(result?.items[1].value?.text).toEqual('"b"');
-    expect(result?.items[1].value?.quoted).toBe(true);
+    expect(result!?.items[1]!.value?.value).toBe('b');
+    expect(result!?.items[1]!.value?.text).toBe('"b"');
+    expect(result!?.items[1]!.value?.quoted).toBe(true);
 
-    expect(result?.items[2].value?.value).toEqual('c');
+    expect(result!.items[2]!.value?.value).toBe('c');
   });
 
   it('just quotes', function () {
@@ -44,9 +44,9 @@ describe('parseMultiSelectValue', function () {
     expect(result!.items).toHaveLength(1);
     const item = result!.items[0];
 
-    expect(item.value?.value).toEqual('');
-    expect(item.value?.text).toEqual('""');
-    expect(item.value?.quoted).toBe(true);
+    expect(item!.value!?.value).toBe('');
+    expect(item!.value!?.text).toBe('""');
+    expect(item!.value!?.quoted).toBe(true);
   });
 
   it('single empty value', function () {
@@ -57,7 +57,7 @@ describe('parseMultiSelectValue', function () {
     expect(result!.items).toHaveLength(1);
     const item = result!.items[0];
 
-    expect(item.value!.value).toBe('');
+    expect(item!.value!.value).toBe('');
   });
 
   it('multiple empty value', function () {
@@ -67,9 +67,9 @@ describe('parseMultiSelectValue', function () {
 
     expect(result!.items).toHaveLength(3);
 
-    expect(result?.items[0].value?.value).toEqual('a');
-    expect(result?.items[1].value?.value).toBe('');
-    expect(result?.items[2].value?.value).toEqual('b');
+    expect(result!?.items[0]!.value!?.value).toBe('a');
+    expect(result!?.items[1]!.value!?.value).toBe('');
+    expect(result!?.items[2]!.value!?.value).toBe('b');
   });
 
   it('trailing comma', function () {
@@ -79,8 +79,8 @@ describe('parseMultiSelectValue', function () {
 
     expect(result!.items).toHaveLength(2);
 
-    expect(result?.items[0].value?.value).toEqual('a');
-    expect(result?.items[1].value?.value).toBe('');
+    expect(result!?.items[0]!.value!?.value).toBe('a');
+    expect(result!?.items[1]!.value!?.value).toBe('');
   });
 
   it('spaces', function () {
@@ -90,8 +90,8 @@ describe('parseMultiSelectValue', function () {
 
     expect(result!.items).toHaveLength(3);
 
-    expect(result?.items[0].value?.value).toEqual('a');
-    expect(result?.items[1].value?.value).toEqual('b c');
-    expect(result?.items[2].value?.value).toEqual('d');
+    expect(result!?.items[0]!.value!?.value).toBe('a');
+    expect(result!?.items[1]!.value!?.value).toBe('b c');
+    expect(result!?.items[2]!.value!?.value).toBe('d');
   });
 });
diff --git a/static/app/components/searchQueryBuilder/tokens/filter/valueCombobox.tsx b/static/app/components/searchQueryBuilder/tokens/filter/valueCombobox.tsx
index a225d06c60e761..6d0f941f59fccf 100644
--- a/static/app/components/searchQueryBuilder/tokens/filter/valueCombobox.tsx
+++ b/static/app/components/searchQueryBuilder/tokens/filter/valueCombobox.tsx
@@ -7,6 +7,11 @@ import type {KeyboardEvent} from '@react-types/shared';
 import Checkbox from 'sentry/components/checkbox';
 import type {SelectOptionWithKey} from 'sentry/components/compactSelect/types';
 import {getItemsWithKeys} from 'sentry/components/compactSelect/utils';
+import {
+  ItemType,
+  type SearchGroup,
+  type SearchItem,
+} from 'sentry/components/deprecatedSmartSearchBar/types';
 import {useSearchQueryBuilder} from 'sentry/components/searchQueryBuilder/context';
 import {
   type CustomComboboxMenu,
@@ -44,11 +49,6 @@ import {
   type TokenResult,
 } from 'sentry/components/searchSyntax/parser';
 import {getKeyName} from 'sentry/components/searchSyntax/utils';
-import {
-  ItemType,
-  type SearchGroup,
-  type SearchItem,
-} from 'sentry/components/smartSearchBar/types';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {Tag, TagCollection} from 'sentry/types/group';
@@ -447,7 +447,7 @@ function ItemCheckbox({
           onChange={() => {
             dispatch({
               type: 'TOGGLE_FILTER_VALUE',
-              token: token,
+              token,
               value: escapeTagValue(value),
             });
           }}
@@ -596,7 +596,7 @@ export function SearchQueryBuilderValueCombobox({
 
           dispatch({
             type: 'UPDATE_TOKEN_VALUE',
-            token: token,
+            token,
             value: newValue,
           });
 
@@ -609,7 +609,7 @@ export function SearchQueryBuilderValueCombobox({
 
         dispatch({
           type: 'UPDATE_TOKEN_VALUE',
-          token: token,
+          token,
           value: prepareInputValueForSaving(
             getFilterValueType(token, fieldDefinition),
             replaceCommaSeparatedValue(inputValue, selectionIndex, escapeTagValue(value))
@@ -622,7 +622,7 @@ export function SearchQueryBuilderValueCombobox({
       } else {
         dispatch({
           type: 'UPDATE_TOKEN_VALUE',
-          token: token,
+          token,
           value: cleanedValue,
         });
         onCommit();
@@ -681,7 +681,7 @@ export function SearchQueryBuilderValueCombobox({
       if (!value && !token.value.text) {
         dispatch({
           type: 'UPDATE_TOKEN_VALUE',
-          token: token,
+          token,
           value: getDefaultFilterValue({fieldDefinition}),
         });
         onCommit();
@@ -797,7 +797,7 @@ export function SearchQueryBuilderValueCombobox({
             handleSave={newDateTimeValue => {
               dispatch({
                 type: 'UPDATE_TOKEN_VALUE',
-                token: token,
+                token,
                 value: newDateTimeValue,
               });
               onCommit();
diff --git a/static/app/components/searchQueryBuilder/tokens/filter/valueListBox.tsx b/static/app/components/searchQueryBuilder/tokens/filter/valueListBox.tsx
index 6da3c0416ffff8..7cd8c2c9b53ed4 100644
--- a/static/app/components/searchQueryBuilder/tokens/filter/valueListBox.tsx
+++ b/static/app/components/searchQueryBuilder/tokens/filter/valueListBox.tsx
@@ -82,7 +82,7 @@ export function ValueListBox<T extends SelectOptionOrSectionWithKey<string>>({
               overlayIsOpen={isOpen}
               showSectionHeaders={!filterValue}
               size="sm"
-              style={{maxWidth: overlayProps.style.maxWidth}}
+              style={{maxWidth: overlayProps.style!.maxWidth}}
             />
             <Footer isMultiSelect={isMultiSelect} canUseWildcard={canUseWildcard} />
           </Fragment>
diff --git a/static/app/components/searchQueryBuilder/tokens/filter/valueSuggestions/date.tsx b/static/app/components/searchQueryBuilder/tokens/filter/valueSuggestions/date.tsx
index ecfda0ae3bac4e..53be18461d8033 100644
--- a/static/app/components/searchQueryBuilder/tokens/filter/valueSuggestions/date.tsx
+++ b/static/app/components/searchQueryBuilder/tokens/filter/valueSuggestions/date.tsx
@@ -95,7 +95,7 @@ export function getRelativeDateSuggestions(
   }
 
   const [, value] = match;
-  const intValue = parseInt(value, 10);
+  const intValue = parseInt(value!, 10);
 
   if (isNaN(intValue)) {
     return makeDefaultDateSuggestions(token);
diff --git a/static/app/components/searchQueryBuilder/tokens/filterKeyListBox/index.tsx b/static/app/components/searchQueryBuilder/tokens/filterKeyListBox/index.tsx
index 866218f5a064f7..084ac3d58f73f4 100644
--- a/static/app/components/searchQueryBuilder/tokens/filterKeyListBox/index.tsx
+++ b/static/app/components/searchQueryBuilder/tokens/filterKeyListBox/index.tsx
@@ -151,7 +151,7 @@ function useHighlightFirstOptionOnSectionChange({
     if (selectedSection === RECENT_SEARCH_CATEGORY_VALUE) {
       return [...state.collection].filter(item => !hiddenOptions.has(item.key));
     }
-    const options = state.collection.getChildren?.(selectedSection ?? sections[0].value);
+    const options = state.collection.getChildren?.(selectedSection ?? sections[0]!.value);
     return [...(options ?? [])].filter(option => !hiddenOptions.has(option.key));
   }, [state.collection, selectedSection, sections, hiddenOptions]);
 
@@ -178,6 +178,28 @@ function useHighlightFirstOptionOnSectionChange({
   ]);
 }
 
+// If the selected section no longer exists, switch to the first valid section
+function useSwitchToValidSection({
+  sections,
+  selectedSection,
+  setSelectedSection,
+}: {
+  sections: Section[];
+  selectedSection: Key | null;
+  setSelectedSection: (section: string) => void;
+}) {
+  useEffect(() => {
+    if (!selectedSection || !sections.length) {
+      return;
+    }
+
+    const section = sections.find(s => s.value === selectedSection);
+    if (!section) {
+      setSelectedSection(sections[0]!.value);
+    }
+  }, [sections, selectedSection, setSelectedSection]);
+}
+
 function FilterKeyMenuContent<T extends SelectOptionOrSectionWithKey<string>>({
   recentFilters,
   selectedSection,
@@ -287,6 +309,8 @@ export function FilterKeyListBox<T extends SelectOptionOrSectionWithKey<string>>
     isOpen,
   });
 
+  useSwitchToValidSection({sections, selectedSection, setSelectedSection});
+
   const fullWidth = !query;
   const showDetailsPane = fullWidth && selectedSection !== RECENT_SEARCH_CATEGORY_VALUE;
 
diff --git a/static/app/components/searchQueryBuilder/tokens/filterKeyListBox/useFilterKeyListBox.tsx b/static/app/components/searchQueryBuilder/tokens/filterKeyListBox/useFilterKeyListBox.tsx
index 51cfbc01d7a3e4..970170e9146026 100644
--- a/static/app/components/searchQueryBuilder/tokens/filterKeyListBox/useFilterKeyListBox.tsx
+++ b/static/app/components/searchQueryBuilder/tokens/filterKeyListBox/useFilterKeyListBox.tsx
@@ -150,7 +150,7 @@ function useFilterKeySections({
   const previousNumSections = usePrevious(numSections);
   useEffect(() => {
     if (previousNumSections !== numSections) {
-      setSelectedSection(sections[0].value);
+      setSelectedSection(sections[0]!.value);
     }
   }, [numSections, previousNumSections, sections]);
 
@@ -162,7 +162,7 @@ export function useFilterKeyListBox({filterValue}: {filterValue: string}) {
   const recentFilters = useRecentSearchFilters();
   const {data: recentSearches} = useRecentSearches();
   const {sections, selectedSection, setSelectedSection} = useFilterKeySections({
-    recentSearches: recentSearches,
+    recentSearches,
   });
 
   const filterKeyMenuItems = useMemo(() => {
@@ -263,7 +263,9 @@ export function useFilterKeyListBox({filterValue}: {filterValue: string}) {
       // If we are at a non-recent filter key and going up, skip to the first recent filter key
       e.preventDefault();
       e.stopPropagation();
-      state.selectionManager.setFocusedKey(createRecentFilterOptionKey(recentFilters[0]));
+      state.selectionManager.setFocusedKey(
+        createRecentFilterOptionKey(recentFilters[0]!)
+      );
 
       return;
     },
@@ -304,7 +306,7 @@ export function useFilterKeyListBox({filterValue}: {filterValue: string}) {
         0,
         sectionKeyOrder.length - 1
       );
-      const newSectionKey = sectionKeyOrder[newIndex];
+      const newSectionKey = sectionKeyOrder[newIndex]!;
       setSelectedSection(newSectionKey);
     },
     [sections, selectedSection, setSelectedSection]
diff --git a/static/app/components/searchQueryBuilder/tokens/filterKeyListBox/utils.tsx b/static/app/components/searchQueryBuilder/tokens/filterKeyListBox/utils.tsx
index 6e65f2d675cad2..6545cb84fe462a 100644
--- a/static/app/components/searchQueryBuilder/tokens/filterKeyListBox/utils.tsx
+++ b/static/app/components/searchQueryBuilder/tokens/filterKeyListBox/utils.tsx
@@ -16,6 +16,7 @@ import type {
 } from 'sentry/components/searchQueryBuilder/types';
 import {t} from 'sentry/locale';
 import type {RecentSearch, Tag, TagCollection} from 'sentry/types/group';
+import {defined} from 'sentry/utils';
 import {type FieldDefinition, FieldKind} from 'sentry/utils/fields';
 import {escapeFilterValue} from 'sentry/utils/tokenizeSearch';
 
@@ -70,9 +71,14 @@ export function createSection(
     key: section.value,
     value: section.value,
     label: section.label,
-    options: section.children.map(key =>
-      createItem(keys[key], getFieldDefinition(key), section)
-    ),
+    options: section.children
+      .map(key => {
+        if (!keys[key]) {
+          return null;
+        }
+        return createItem(keys[key], getFieldDefinition(key), section);
+      })
+      .filter(defined),
     type: 'section',
   };
 }
diff --git a/static/app/components/searchQueryBuilder/tokens/freeText.tsx b/static/app/components/searchQueryBuilder/tokens/freeText.tsx
index 62c7cda67c292a..91731ee7abc698 100644
--- a/static/app/components/searchQueryBuilder/tokens/freeText.tsx
+++ b/static/app/components/searchQueryBuilder/tokens/freeText.tsx
@@ -21,7 +21,11 @@ import type {
   FieldDefinitionGetter,
   FocusOverride,
 } from 'sentry/components/searchQueryBuilder/types';
-import {recentSearchTypeToLabel} from 'sentry/components/searchQueryBuilder/utils';
+import {
+  collapseTextTokens,
+  parseTokenKey,
+  recentSearchTypeToLabel,
+} from 'sentry/components/searchQueryBuilder/utils';
 import {
   InvalidReason,
   type ParseResultToken,
@@ -131,12 +135,37 @@ function calculateNextFocusForFilter(state: ListState<ParseResultToken>): FocusO
 }
 
 function calculateNextFocusForInsertedToken(item: Node<ParseResultToken>): FocusOverride {
-  const [, tokenTypeIndexStr] = item.key.toString().split(':');
+  const {index} = parseTokenKey(item.key.toString());
+
+  return {
+    itemKey: `${Token.FREE_TEXT}:${index + 1}`,
+  };
+}
 
-  const tokenTypeIndex = parseInt(tokenTypeIndexStr, 10);
+function calculateNextFocusForCommittedCustomValue({
+  value,
+  currentFocusedKey,
+}: {
+  currentFocusedKey: string;
+  value: string;
+}): FocusOverride | undefined {
+  const {tokenType, index} = parseTokenKey(currentFocusedKey.toString());
+
+  const parsedText = collapseTextTokens(parseSearch(value));
+  const numFreeTextTokens = Math.max(
+    parsedText?.filter(token => token.type === Token.FREE_TEXT).length ?? 0
+  );
+
+  // We always expect there to be at least one free text token, so we subtract one
+  // to get the index of the next token to focus.
+  const diff = Math.max(0, numFreeTextTokens - 1);
+
+  if (diff <= 0) {
+    return undefined;
+  }
 
   return {
-    itemKey: `${Token.FREE_TEXT}:${tokenTypeIndex + 1}`,
+    itemKey: `${tokenType}:${index + diff}`,
   };
 }
 
@@ -409,11 +438,27 @@ function SearchQueryBuilderInputInternal({
           });
         }}
         onCustomValueBlurred={value => {
-          dispatch({type: 'UPDATE_FREE_TEXT', tokens: [token], text: value});
+          dispatch({
+            type: 'UPDATE_FREE_TEXT',
+            tokens: [token],
+            text: value,
+            focusOverride: calculateNextFocusForCommittedCustomValue({
+              currentFocusedKey: item.key.toString(),
+              value,
+            }),
+          });
           resetInputValue();
         }}
         onCustomValueCommitted={value => {
-          dispatch({type: 'UPDATE_FREE_TEXT', tokens: [token], text: value});
+          dispatch({
+            type: 'UPDATE_FREE_TEXT',
+            tokens: [token],
+            text: value,
+            focusOverride: calculateNextFocusForCommittedCustomValue({
+              currentFocusedKey: item.key.toString(),
+              value,
+            }),
+          });
           resetInputValue();
 
           // Because the query does not change until a subsequent render,
diff --git a/static/app/components/searchQueryBuilder/tokens/useSortedFilterKeyItems.tsx b/static/app/components/searchQueryBuilder/tokens/useSortedFilterKeyItems.tsx
index 6854775a7545a4..bedf15f74e275a 100644
--- a/static/app/components/searchQueryBuilder/tokens/useSortedFilterKeyItems.tsx
+++ b/static/app/components/searchQueryBuilder/tokens/useSortedFilterKeyItems.tsx
@@ -180,7 +180,7 @@ export function useSortedFilterKeyItems({
       .map(({item}) => item)
       .filter(item => item.type === 'key' && filterKeys[item.item.key])
       .map(({item}) => {
-        return createItem(filterKeys[item.key], getFieldDefinition(item.key));
+        return createItem(filterKeys[item.key]!, getFieldDefinition(item.key));
       });
 
     if (includeSuggestions) {
diff --git a/static/app/components/searchQueryBuilder/utils.tsx b/static/app/components/searchQueryBuilder/utils.tsx
index 740705c5cc9021..2591f15000ef7f 100644
--- a/static/app/components/searchQueryBuilder/utils.tsx
+++ b/static/app/components/searchQueryBuilder/utils.tsx
@@ -111,6 +111,12 @@ export function makeTokenKey(token: ParseResultToken, allTokens: ParseResult | n
   return `${token.type}:${tokenTypeIndex}`;
 }
 
+export function parseTokenKey(key: string) {
+  const [tokenType, indexStr] = key.split(':');
+  const index = parseInt(indexStr!, 10);
+  return {tokenType, index};
+}
+
 const isSimpleTextToken = (
   token: ParseResultToken
 ): token is TokenResult<Token.FREE_TEXT> | TokenResult<Token.SPACES> => {
@@ -121,7 +127,7 @@ const isSimpleTextToken = (
  * Collapse adjacent FREE_TEXT and SPACES tokens into a single token.
  * This is useful for rendering the minimum number of inputs in the UI.
  */
-function collapseTextTokens(tokens: ParseResult | null) {
+export function collapseTextTokens(tokens: ParseResult | null) {
   if (!tokens) {
     return null;
   }
@@ -138,7 +144,7 @@ function collapseTextTokens(tokens: ParseResult | null) {
       return [token];
     }
 
-    const lastToken = acc[acc.length - 1];
+    const lastToken = acc[acc.length - 1]!;
 
     if (isSimpleTextToken(token) && isSimpleTextToken(lastToken)) {
       const freeTextToken = lastToken as TokenResult<Token.FREE_TEXT>;
diff --git a/static/app/components/searchSyntax/evaluator.tsx b/static/app/components/searchSyntax/evaluator.tsx
index 5fea88fa7d4403..ca47bb067307f5 100644
--- a/static/app/components/searchSyntax/evaluator.tsx
+++ b/static/app/components/searchSyntax/evaluator.tsx
@@ -51,7 +51,7 @@ export function toFlattened(tokens: TokenResult<Token>[]): ProcessedTokenResult[
   }
 
   for (let i = 0; i < tokens.length; i++) {
-    flatten(tokens[i]);
+    flatten(tokens[i]!);
   }
 
   return flattened_result;
@@ -74,14 +74,14 @@ export function insertImplicitAND(
 
   for (let i = 0; i < tokens.length; i++) {
     const next = tokens[i + 1];
-    with_implicit_and.push(tokens[i]);
+    with_implicit_and.push(tokens[i]!);
 
     // If current is not a logic boolean and next is not a logic boolean, insert an implicit AND.
     if (
       next &&
       next.type !== Token.LOGIC_BOOLEAN &&
-      tokens[i].type !== Token.LOGIC_BOOLEAN &&
-      tokens[i].type !== 'L_PAREN' &&
+      tokens[i]!.type !== Token.LOGIC_BOOLEAN &&
+      tokens[i]!.type !== 'L_PAREN' &&
       next.type !== 'R_PAREN'
     ) {
       with_implicit_and.push(AND);
@@ -118,9 +118,9 @@ export function toPostFix(tokens: TokenResult<Token>[]): ProcessedTokenResult[]
           // we need to pop the AND operator from the stack and push it to the output.
           stack.length > 0 &&
           token.value === BooleanOperator.OR &&
-          stack[stack.length - 1].type === Token.LOGIC_BOOLEAN &&
-          stack[stack.length - 1].type !== 'L_PAREN' &&
-          isBooleanAND(stack[stack.length - 1])
+          stack[stack.length - 1]!.type === Token.LOGIC_BOOLEAN &&
+          stack[stack.length - 1]!.type !== 'L_PAREN' &&
+          isBooleanAND(stack[stack.length - 1]!)
         ) {
           result.push(stack.pop()!);
         }
@@ -132,7 +132,7 @@ export function toPostFix(tokens: TokenResult<Token>[]): ProcessedTokenResult[]
         break;
       case 'R_PAREN': {
         while (stack.length > 0) {
-          const top = stack[stack.length - 1];
+          const top = stack[stack.length - 1]!;
           if (top.type === 'L_PAREN') {
             stack.pop();
             break;
diff --git a/static/app/components/searchSyntax/grammar.pegjs b/static/app/components/searchSyntax/grammar.pegjs
index 9a8bfb2685c575..55eedb460fe05b 100644
--- a/static/app/components/searchSyntax/grammar.pegjs
+++ b/static/app/components/searchSyntax/grammar.pegjs
@@ -234,6 +234,16 @@ explicit_tag_key
       return tc.tokenKeyExplicitTag(prefix, key);
     }
 
+explicit_string_tag_key
+  = prefix:"tags" open_bracket key:search_key spaces comma spaces 'string' closed_bracket {
+      return tc.tokenKeyExplicitStringTag(prefix, key)
+    }
+
+explicit_number_tag_key
+  = prefix:"tags" open_bracket key:search_key spaces comma spaces 'number' closed_bracket {
+      return tc.tokenKeyExplicitNumberTag(prefix, key)
+    }
+
 aggregate_key
   = name:key open_paren s1:spaces args:function_args? s2:spaces closed_paren {
       return tc.tokenKeyAggregate(name, args, s1, s2);
@@ -259,10 +269,10 @@ quoted_aggregate_param
     }
 
 search_key
-  = key / quoted_key
+  = explicit_number_tag_key / key / quoted_key
 
 text_key
-  = explicit_tag_key / search_key
+  = explicit_tag_key / explicit_string_tag_key / search_key
 
 // Filter values
 
diff --git a/static/app/components/searchSyntax/parser.spec.tsx b/static/app/components/searchSyntax/parser.spec.tsx
index fb59ab8d2fb25a..4ae87649b9482c 100644
--- a/static/app/components/searchSyntax/parser.spec.tsx
+++ b/static/app/components/searchSyntax/parser.spec.tsx
@@ -127,9 +127,9 @@ describe('searchSyntax/parser', function () {
     const barTag = result[7] as TokenResult<Token.FILTER>;
 
     expect(foo.warning).toBe('foo warning');
-    expect(bar.warning).toBe(null);
+    expect(bar.warning).toBeNull();
     expect(fooTag.warning).toBe('foo warning');
-    expect(barTag.warning).toBe(null);
+    expect(barTag.warning).toBeNull();
   });
 
   it('applies disallowFreeText', () => {
@@ -149,7 +149,7 @@ describe('searchSyntax/parser', function () {
     const foo = result[1] as TokenResult<Token.FILTER>;
     const test = result[3] as TokenResult<Token.FREE_TEXT>;
 
-    expect(foo.invalid).toBe(null);
+    expect(foo.invalid).toBeNull();
     expect(test.invalid).toEqual({
       type: InvalidReason.FREE_TEXT_NOT_ALLOWED,
       reason: 'Custom message',
@@ -174,12 +174,12 @@ describe('searchSyntax/parser', function () {
     const or = result[3] as TokenResult<Token.LOGIC_BOOLEAN>;
     const and = result[5] as TokenResult<Token.LOGIC_BOOLEAN>;
 
-    expect(foo.invalid).toBe(null);
+    expect(foo.invalid).toBeNull();
     expect(or.invalid).toEqual({
       type: InvalidReason.LOGICAL_OR_NOT_ALLOWED,
       reason: 'Custom message',
     });
-    expect(and.invalid).toBe(null);
+    expect(and.invalid).toBeNull();
   });
 
   it('applies disallowLogicalOperators (AND)', () => {
@@ -200,8 +200,8 @@ describe('searchSyntax/parser', function () {
     const or = result[3] as TokenResult<Token.LOGIC_BOOLEAN>;
     const and = result[5] as TokenResult<Token.LOGIC_BOOLEAN>;
 
-    expect(foo.invalid).toBe(null);
-    expect(or.invalid).toBe(null);
+    expect(foo.invalid).toBeNull();
+    expect(or.invalid).toBeNull();
     expect(and.invalid).toEqual({
       type: InvalidReason.LOGICAL_AND_NOT_ALLOWED,
       reason: 'Custom message',
@@ -224,7 +224,7 @@ describe('searchSyntax/parser', function () {
 
     const foo = result[1] as TokenResult<Token.FILTER>;
 
-    expect(foo.negated).toEqual(true);
+    expect(foo.negated).toBe(true);
     expect(foo.invalid).toEqual({
       type: InvalidReason.NEGATION_NOT_ALLOWED,
       reason: 'Custom message',
diff --git a/static/app/components/searchSyntax/parser.tsx b/static/app/components/searchSyntax/parser.tsx
index 92c2970364247f..dd60737bea9a9f 100644
--- a/static/app/components/searchSyntax/parser.tsx
+++ b/static/app/components/searchSyntax/parser.tsx
@@ -43,6 +43,8 @@ export enum Token {
   LOGIC_BOOLEAN = 'logicBoolean',
   KEY_SIMPLE = 'keySimple',
   KEY_EXPLICIT_TAG = 'keyExplicitTag',
+  KEY_EXPLICIT_NUMBER_TAG = 'keyExplicitNumberTag',
+  KEY_EXPLICIT_STRING_TAG = 'keyExplicitStringTag',
   KEY_AGGREGATE = 'keyAggregate',
   KEY_AGGREGATE_ARGS = 'keyAggregateArgs',
   KEY_AGGREGATE_PARAMS = 'keyAggregateParam',
@@ -127,7 +129,11 @@ export const interchangeableFilterOperators = {
   [FilterType.DATE]: [FilterType.SPECIFIC_DATE],
 };
 
-const textKeys = [Token.KEY_SIMPLE, Token.KEY_EXPLICIT_TAG] as const;
+const textKeys = [
+  Token.KEY_SIMPLE,
+  Token.KEY_EXPLICIT_TAG,
+  Token.KEY_EXPLICIT_STRING_TAG,
+] as const;
 
 /**
  * This constant-type configuration object declares how each filter type
@@ -486,6 +492,26 @@ export class TokenConverter {
     key,
   });
 
+  tokenKeyExplicitStringTag = (
+    prefix: string,
+    key: ReturnType<TokenConverter['tokenKeySimple']>
+  ) => ({
+    ...this.defaultTokenFields,
+    type: Token.KEY_EXPLICIT_STRING_TAG as const,
+    prefix,
+    key,
+  });
+
+  tokenKeyExplicitNumberTag = (
+    prefix: string,
+    key: ReturnType<TokenConverter['tokenKeySimple']>
+  ) => ({
+    ...this.defaultTokenFields,
+    type: Token.KEY_EXPLICIT_NUMBER_TAG as const,
+    prefix,
+    key,
+  });
+
   tokenKeyAggregateParam = (value: string, quoted: boolean) => ({
     ...this.defaultTokenFields,
     type: Token.KEY_AGGREGATE_PARAMS as const,
@@ -526,7 +552,7 @@ export class TokenConverter {
   ) => ({
     ...this.defaultTokenFields,
     type: Token.VALUE_ISO_8601_DATE as const,
-    value: value,
+    value,
     parsed: this.config.parse ? parseDate(value) : undefined,
     date: date.flat().join(''),
     time: Array.isArray(time) ? time.flat().flat().join('').replace('T', '') : time,
@@ -540,7 +566,7 @@ export class TokenConverter {
   ) => ({
     ...this.defaultTokenFields,
     type: Token.VALUE_RELATIVE_DATE as const,
-    value: value,
+    value,
     parsed: this.config.parse ? parseRelativeDate(value, {unit, sign}) : undefined,
     sign,
     unit,
@@ -553,7 +579,7 @@ export class TokenConverter {
     ...this.defaultTokenFields,
 
     type: Token.VALUE_DURATION as const,
-    value: value,
+    value,
     parsed: this.config.parse ? parseDuration(value, unit) : undefined,
     unit,
   });
@@ -584,7 +610,7 @@ export class TokenConverter {
   ) => ({
     ...this.defaultTokenFields,
     type: Token.VALUE_SIZE as const,
-    value: value,
+    value,
     // units are case insensitive, normalize them in their parsed representation
     // so that we dont have to compare all possible permutations.
     parsed: this.config.parse ? parseSize(value, unit) : undefined,
@@ -594,14 +620,14 @@ export class TokenConverter {
   tokenValuePercentage = (value: string) => ({
     ...this.defaultTokenFields,
     type: Token.VALUE_PERCENTAGE as const,
-    value: value,
+    value,
     parsed: this.config.parse ? parsePercentage(value) : undefined,
   });
 
   tokenValueBoolean = (value: string) => ({
     ...this.defaultTokenFields,
     type: Token.VALUE_BOOLEAN as const,
-    value: value,
+    value,
     parsed: this.config.parse ? parseBoolean(value) : undefined,
   });
 
@@ -771,13 +797,25 @@ export class TokenConverter {
    */
   checkFilterWarning = <T extends FilterType>(key: FilterMap[T]['key']) => {
     if (
-      ![Token.KEY_SIMPLE, Token.KEY_EXPLICIT_TAG, Token.KEY_AGGREGATE].includes(key.type)
+      ![
+        Token.KEY_SIMPLE,
+        Token.KEY_EXPLICIT_TAG,
+        Token.KEY_AGGREGATE,
+        Token.KEY_EXPLICIT_NUMBER_TAG,
+        Token.KEY_EXPLICIT_STRING_TAG,
+      ].includes(key.type)
     ) {
       return null;
     }
 
     const keyName = getKeyName(
-      key as TokenResult<Token.KEY_SIMPLE | Token.KEY_EXPLICIT_TAG>
+      key as TokenResult<
+        | Token.KEY_SIMPLE
+        | Token.KEY_EXPLICIT_TAG
+        | Token.KEY_AGGREGATE
+        | Token.KEY_EXPLICIT_NUMBER_TAG
+        | Token.KEY_EXPLICIT_STRING_TAG
+      >
     );
     return this.config.getFilterTokenWarning?.(keyName) ?? null;
   };
@@ -838,7 +876,10 @@ export class TokenConverter {
    */
   checkInvalidTextFilter = (key: TextFilter['key'], value: TextFilter['value']) => {
     // Explicit tag keys will always be treated as text filters
-    if (key.type === Token.KEY_EXPLICIT_TAG) {
+    if (
+      key.type === Token.KEY_EXPLICIT_TAG ||
+      key.type === Token.KEY_EXPLICIT_STRING_TAG
+    ) {
       return this.checkInvalidTextValue(value);
     }
 
@@ -1425,7 +1466,7 @@ export function joinQuery(
   return (
     (leadingSpace ? ' ' : '') +
     (parsedTerms.length === 1
-      ? parsedTerms[0].text
+      ? parsedTerms[0]!.text
       : parsedTerms.map(p => p.text).join(additionalSpaceBetween ? ' ' : ''))
   );
 }
diff --git a/static/app/components/searchSyntax/renderer.tsx b/static/app/components/searchSyntax/renderer.tsx
index f8784c5025d4ce..e1854d464f7965 100644
--- a/static/app/components/searchSyntax/renderer.tsx
+++ b/static/app/components/searchSyntax/renderer.tsx
@@ -224,7 +224,13 @@ function KeyToken({
   token,
   negated,
 }: {
-  token: TokenResult<Token.KEY_SIMPLE | Token.KEY_AGGREGATE | Token.KEY_EXPLICIT_TAG>;
+  token: TokenResult<
+    | Token.KEY_SIMPLE
+    | Token.KEY_AGGREGATE
+    | Token.KEY_EXPLICIT_TAG
+    | Token.KEY_EXPLICIT_NUMBER_TAG
+    | Token.KEY_EXPLICIT_STRING_TAG
+  >;
   negated?: boolean;
 }) {
   let value: React.ReactNode = token.text;
diff --git a/static/app/components/searchSyntax/utils.tsx b/static/app/components/searchSyntax/utils.tsx
index e9d8c669d08f17..7c7a35137f6b65 100644
--- a/static/app/components/searchSyntax/utils.tsx
+++ b/static/app/components/searchSyntax/utils.tsx
@@ -104,6 +104,12 @@ export function treeResultLocator<T>({
         nodeVisitor(token.argsSpaceBefore);
         nodeVisitor(token.argsSpaceAfter);
         break;
+      case Token.KEY_EXPLICIT_NUMBER_TAG:
+        nodeVisitor(token.key);
+        break;
+      case Token.KEY_EXPLICIT_STRING_TAG:
+        nodeVisitor(token.key);
+        break;
       case Token.LOGIC_GROUP:
         token.inner.forEach(nodeVisitor);
         break;
@@ -172,6 +178,16 @@ export function treeTransformer({tree, transform}: TreeTransformerOpts) {
           argsSpaceBefore: nodeVisitor(token.argsSpaceBefore),
           argsSpaceAfter: nodeVisitor(token.argsSpaceAfter),
         });
+      case Token.KEY_EXPLICIT_NUMBER_TAG:
+        return transform({
+          ...token,
+          key: nodeVisitor(token.key),
+        });
+      case Token.KEY_EXPLICIT_STRING_TAG:
+        return transform({
+          ...token,
+          key: nodeVisitor(token.key),
+        });
       case Token.LOGIC_GROUP:
         return transform({
           ...token,
@@ -213,7 +229,13 @@ type GetKeyNameOpts = {
  * Utility to get the string name of any type of key.
  */
 export const getKeyName = (
-  key: TokenResult<Token.KEY_SIMPLE | Token.KEY_EXPLICIT_TAG | Token.KEY_AGGREGATE>,
+  key: TokenResult<
+    | Token.KEY_SIMPLE
+    | Token.KEY_EXPLICIT_TAG
+    | Token.KEY_AGGREGATE
+    | Token.KEY_EXPLICIT_NUMBER_TAG
+    | Token.KEY_EXPLICIT_STRING_TAG
+  >,
   options: GetKeyNameOpts = {}
 ) => {
   const {aggregateWithArgs, showExplicitTagPrefix = false} = options;
@@ -229,6 +251,15 @@ export const getKeyName = (
       return aggregateWithArgs
         ? `${key.name.value}(${key.args ? key.args.text : ''})`
         : key.name.value;
+    case Token.KEY_EXPLICIT_NUMBER_TAG:
+      // number tags always need to be expressed with the
+      // explicit tag prefix + type
+      return key.text;
+    case Token.KEY_EXPLICIT_STRING_TAG:
+      if (showExplicitTagPrefix) {
+        return key.text;
+      }
+      return key.key.value;
     default:
       return '';
   }
@@ -295,6 +326,10 @@ export function stringifyToken(token: TokenResult<Token>) {
       return token.text;
     case Token.KEY_EXPLICIT_TAG:
       return `${token.prefix}[${token.key.value}]`;
+    case Token.KEY_EXPLICIT_NUMBER_TAG:
+      return `${token.prefix}[${token.key.value},number]`;
+    case Token.KEY_EXPLICIT_STRING_TAG:
+      return `${token.prefix}[${token.key.value},string]`;
     case Token.VALUE_TEXT:
       return token.quoted ? `"${token.value}"` : token.value;
     case Token.VALUE_RELATIVE_DATE:
diff --git a/static/app/components/sidebar/index.tsx b/static/app/components/sidebar/index.tsx
index bae6b5408a7e31..b777c55631f2b8 100644
--- a/static/app/components/sidebar/index.tsx
+++ b/static/app/components/sidebar/index.tsx
@@ -34,6 +34,7 @@ import {
   IconSiren,
   IconStats,
   IconSupport,
+  IconTelescope,
   IconTimer,
 } from 'sentry/icons';
 import {t} from 'sentry/locale';
@@ -252,7 +253,7 @@ function Sidebar() {
     />
   );
 
-  const discover2 = hasOrganization && (
+  const discover = hasOrganization && (
     <Feature
       hookName="feature-disabled:discover2-sidebar-item"
       features="discover-basic"
@@ -260,7 +261,8 @@ function Sidebar() {
     >
       <SidebarItem
         {...sidebarItemProps}
-        icon={<SubitemDot collapsed />}
+        // In errors-only deploys, Discover isn't a nested link, so it needs a proper icon
+        icon={isSelfHostedErrorsOnly ? <IconTelescope /> : <SubitemDot collapsed />}
         label={<GuideAnchor target="discover">{t('Discover')}</GuideAnchor>}
         to={getDiscoverLandingUrl(organization)}
         id="discover-v2"
@@ -502,7 +504,7 @@ function Sidebar() {
       {metrics}
       {profiling}
       {replays}
-      {discover2}
+      {discover}
     </SidebarAccordion>
   );
 
@@ -565,7 +567,7 @@ function Sidebar() {
                   <Fragment>
                     <SidebarSection hasNewNav={hasNewNav}>
                       {alerts}
-                      {discover2}
+                      {discover}
                       {dashboards}
                       {releases}
                       {userFeedback}
@@ -640,9 +642,9 @@ function Sidebar() {
               )}
             </SidebarSection>
 
-            <SidebarSection hasNewNav={hasNewNav}>
+            <SidebarSection hasNewNav={hasNewNav} centeredItems={horizontal}>
               {HookStore.get('sidebar:bottom-items').length > 0 &&
-                HookStore.get('sidebar:bottom-items')[0]({
+                HookStore.get('sidebar:bottom-items')[0]!({
                   orientation,
                   collapsed,
                   hasPanel,
@@ -803,6 +805,7 @@ const SubitemDot = styled('div')<{collapsed: boolean}>`
 `;
 
 const SidebarSection = styled(SidebarSectionGroup)<{
+  centeredItems?: boolean;
   hasNewNav?: boolean;
   noMargin?: boolean;
   noPadding?: boolean;
@@ -823,6 +826,12 @@ const SidebarSection = styled(SidebarSectionGroup)<{
       }
     `}
 
+  ${p =>
+    p.centeredItems &&
+    css`
+      align-items: center;
+    `}
+
   &:empty {
     display: none;
   }
diff --git a/static/app/components/sidebar/newOnboardingStatus.spec.tsx b/static/app/components/sidebar/newOnboardingStatus.spec.tsx
new file mode 100644
index 00000000000000..466f0dd7bff180
--- /dev/null
+++ b/static/app/components/sidebar/newOnboardingStatus.spec.tsx
@@ -0,0 +1,122 @@
+import {OrganizationFixture} from 'sentry-fixture/organization';
+import {UserFixture} from 'sentry-fixture/user';
+
+import {render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrary';
+
+import {NewOnboardingStatus} from 'sentry/components/sidebar/newOnboardingStatus';
+import {SidebarPanelKey} from 'sentry/components/sidebar/types';
+import {OnboardingTaskKey} from 'sentry/types/onboarding';
+import type {Organization} from 'sentry/types/organization';
+
+function renderMockRequests(organization: Organization) {
+  const getOnboardingTasksMock = MockApiClient.addMockResponse({
+    url: `/organizations/${organization.slug}/onboarding-tasks/`,
+    method: 'GET',
+    body: {
+      onboardingTasks: organization.onboardingTasks,
+    },
+  });
+
+  const postOnboardingTasksMock = MockApiClient.addMockResponse({
+    url: `/organizations/${organization.slug}/onboarding-tasks/`,
+    method: 'POST',
+    body: {task: OnboardingTaskKey.FIRST_PROJECT, completionSeen: true},
+  });
+
+  return {getOnboardingTasksMock, postOnboardingTasksMock};
+}
+
+describe('Onboarding Status', function () {
+  it('panel is collapsed and has pending tasks to be seen', async function () {
+    const organization = OrganizationFixture({
+      features: ['onboarding'],
+      onboardingTasks: [
+        {
+          task: OnboardingTaskKey.FIRST_PROJECT,
+          status: 'complete',
+          user: UserFixture(),
+          completionSeen: undefined,
+          dateCompleted: undefined,
+        },
+      ],
+    });
+
+    const {getOnboardingTasksMock, postOnboardingTasksMock} =
+      renderMockRequests(organization);
+
+    const handleShowPanel = jest.fn();
+
+    render(
+      <NewOnboardingStatus
+        currentPanel=""
+        onShowPanel={handleShowPanel}
+        hidePanel={jest.fn()}
+        collapsed
+        orientation="left"
+      />,
+      {
+        organization,
+      }
+    );
+
+    expect(screen.getByText('1 completed task')).toBeInTheDocument();
+    expect(screen.getByTestId('pending-seen-indicator')).toBeInTheDocument();
+
+    // By hovering over the button, we should refetch the data
+    await userEvent.hover(screen.getByRole('button', {name: 'Onboarding'}));
+    await waitFor(() => expect(getOnboardingTasksMock).toHaveBeenCalled());
+
+    // Open the panel
+    await userEvent.click(screen.getByRole('button', {name: 'Onboarding'}));
+    await waitFor(() => expect(getOnboardingTasksMock).toHaveBeenCalled());
+    await waitFor(() => expect(postOnboardingTasksMock).toHaveBeenCalled());
+    expect(handleShowPanel).toHaveBeenCalled();
+  });
+
+  it('panel is expanded and has no pending tasks to be seen', async function () {
+    const organization = OrganizationFixture({
+      features: ['onboarding'],
+      onboardingTasks: [
+        {
+          task: OnboardingTaskKey.FIRST_PROJECT,
+          status: 'complete',
+          user: UserFixture(),
+          completionSeen: '2024-12-16T14:52:01.385227Z',
+          dateCompleted: '2024-12-13T09:35:05.010028Z',
+        },
+      ],
+    });
+
+    const {getOnboardingTasksMock} = renderMockRequests(organization);
+
+    const handleHidePanel = jest.fn();
+
+    render(
+      <NewOnboardingStatus
+        currentPanel={SidebarPanelKey.ONBOARDING_WIZARD}
+        onShowPanel={jest.fn()}
+        hidePanel={handleHidePanel}
+        collapsed={false}
+        orientation="left"
+      />,
+      {
+        organization,
+      }
+    );
+
+    expect(screen.getByText('1 completed task')).toBeInTheDocument();
+
+    // Do not show the pending indicator
+    expect(screen.queryByTestId('pending-seen-indicator')).not.toBeInTheDocument();
+
+    // Shows the panel
+    expect(screen.getByText('Quick Setup')).toBeInTheDocument();
+
+    // Triggers a fetch request
+    expect(getOnboardingTasksMock).toHaveBeenCalled();
+
+    // Hide Panel
+    await userEvent.click(screen.getByLabelText('Close Panel'));
+    await waitFor(() => expect(handleHidePanel).toHaveBeenCalled());
+  });
+});
diff --git a/static/app/components/sidebar/newOnboardingStatus.tsx b/static/app/components/sidebar/newOnboardingStatus.tsx
index 2cb24e6e1a6880..6241c333812957 100644
--- a/static/app/components/sidebar/newOnboardingStatus.tsx
+++ b/static/app/components/sidebar/newOnboardingStatus.tsx
@@ -5,17 +5,22 @@ import styled from '@emotion/styled';
 
 import {updateOnboardingTask} from 'sentry/actionCreators/onboardingTasks';
 import {OnboardingContext} from 'sentry/components/onboarding/onboardingContext';
+import {DeprecatedNewOnboardingSidebar} from 'sentry/components/onboardingWizard/deprecatedNewSidebar';
 import {NewOnboardingSidebar} from 'sentry/components/onboardingWizard/newSidebar';
 import {getMergedTasks} from 'sentry/components/onboardingWizard/taskConfig';
 import {useOnboardingTasks} from 'sentry/components/onboardingWizard/useOnboardingTasks';
-import {findCompleteTasks, taskIsDone} from 'sentry/components/onboardingWizard/utils';
+import {
+  findCompleteTasks,
+  hasQuickStartUpdatesFeatureGA,
+  taskIsDone,
+} from 'sentry/components/onboardingWizard/utils';
 import ProgressRing, {
   RingBackground,
   RingBar,
   RingText,
 } from 'sentry/components/progressRing';
 import {ExpandedContext} from 'sentry/components/sidebar/expandedContextProvider';
-import {t, tct} from 'sentry/locale';
+import {t, tn} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import {trackAnalytics} from 'sentry/utils/analytics';
 import {isDemoModeEnabled} from 'sentry/utils/demoMode';
@@ -115,7 +120,7 @@ export function NewOnboardingStatus({
     }
 
     trackAnalytics('quick_start.completed', {
-      organization: organization,
+      organization,
       referrer: 'onboarding_sidebar',
       new_experience: true,
     });
@@ -151,6 +156,7 @@ export function NewOnboardingStatus({
         aria-label={label}
         onClick={handleShowPanel}
         isActive={isActive}
+        showText={!shouldAccordionFloat}
         onMouseEnter={() => {
           refetch();
         }}
@@ -171,28 +177,35 @@ export function NewOnboardingStatus({
         {!shouldAccordionFloat && (
           <div>
             <Heading>{label}</Heading>
-            <Remaining>
+            <Remaining role="status">
               {walkthrough
-                ? tct('[totalCompletedTasks] completed tours', {
-                    totalCompletedTasks: doneTasks.length,
-                  })
-                : tct('[totalCompletedTasks] completed tasks', {
-                    totalCompletedTasks: doneTasks.length,
-                  })}
-              {pendingCompletionSeen && <PendingSeenIndicator />}
+                ? tn('%s completed tour', '%s completed tours', doneTasks.length)
+                : tn('%s completed task', '%s completed tasks', doneTasks.length)}
+              {pendingCompletionSeen && (
+                <PendingSeenIndicator data-test-id="pending-seen-indicator" />
+              )}
             </Remaining>
           </div>
         )}
       </Container>
-      {isActive && (
-        <NewOnboardingSidebar
-          orientation={orientation}
-          collapsed={collapsed}
-          onClose={hidePanel}
-          gettingStartedTasks={gettingStartedTasks}
-          beyondBasicsTasks={beyondBasicsTasks}
-        />
-      )}
+      {isActive &&
+        (hasQuickStartUpdatesFeatureGA(organization) ? (
+          <NewOnboardingSidebar
+            orientation={orientation}
+            collapsed={collapsed}
+            onClose={hidePanel}
+            gettingStartedTasks={gettingStartedTasks}
+            beyondBasicsTasks={beyondBasicsTasks}
+          />
+        ) : (
+          <DeprecatedNewOnboardingSidebar
+            orientation={orientation}
+            collapsed={collapsed}
+            onClose={hidePanel}
+            gettingStartedTasks={gettingStartedTasks}
+            beyondBasicsTasks={beyondBasicsTasks}
+          />
+        ))}
     </Fragment>
   );
 }
@@ -242,11 +255,11 @@ const hoverCss = (p: {theme: Theme}) => css`
   }
 `;
 
-const Container = styled('div')<{isActive: boolean}>`
-  padding: 9px 19px 9px 16px;
+const Container = styled('div')<{isActive: boolean; showText: boolean}>`
+  padding: 9px 16px;
   cursor: pointer;
   display: grid;
-  grid-template-columns: max-content 1fr;
+  grid-template-columns: ${p => (p.showText ? 'max-content 1fr' : 'max-content')};
   gap: ${space(1.5)};
   align-items: center;
   transition: background 100ms;
diff --git a/static/app/components/sidebar/sidebarItem.tsx b/static/app/components/sidebar/sidebarItem.tsx
index b03d510f79ba92..87e99b0f1f8abc 100644
--- a/static/app/components/sidebar/sidebarItem.tsx
+++ b/static/app/components/sidebar/sidebarItem.tsx
@@ -335,7 +335,7 @@ export function isItemActive(
       !location.pathname.startsWith('/settings/')) ||
     (item?.label === 'Releases' && location.pathname.includes('/release-thresholds/')) ||
     (item?.label === 'Performance' &&
-      location.pathname.includes('/performance/') &&
+      location.pathname.startsWith('/performance/') &&
       !location.pathname.startsWith('/settings/'))
   );
 }
diff --git a/static/app/components/sidebar/sidebarPanel.tsx b/static/app/components/sidebar/sidebarPanel.tsx
index a4fb5e3a0ff2b6..ce29b50ce283db 100644
--- a/static/app/components/sidebar/sidebarPanel.tsx
+++ b/static/app/components/sidebar/sidebarPanel.tsx
@@ -4,6 +4,7 @@ import {css} from '@emotion/react';
 import styled from '@emotion/styled';
 
 import {IconClose} from 'sentry/icons';
+import {t} from 'sentry/locale';
 import HookStore from 'sentry/stores/hookStore';
 import {slideInLeft} from 'sentry/styles/animations';
 import {space} from 'sentry/styles/space';
@@ -110,7 +111,7 @@ function SidebarPanel({
       {title ? (
         <SidebarPanelHeader>
           <Title>{title}</Title>
-          <PanelClose onClick={hidePanel} />
+          <PanelClose onClick={hidePanel} aria-label={t('Close Panel')} />
         </SidebarPanelHeader>
       ) : null}
       <SidebarPanelBody hasHeader={!!title}>{children}</SidebarPanelBody>
diff --git a/static/app/components/slideOverPanel.tsx b/static/app/components/slideOverPanel.tsx
index e0e83419acd882..567a5dca02fd4b 100644
--- a/static/app/components/slideOverPanel.tsx
+++ b/static/app/components/slideOverPanel.tsx
@@ -93,10 +93,10 @@ const _SlideOverPanel = styled(motion.div, {
 }>`
   position: fixed;
 
-  top: ${space(2)};
-  right: 0;
+  top: ${p => (p.slidePosition === 'left' ? '54px' : space(2))};
+  right: ${p => (p.slidePosition === 'left' ? space(2) : 0)};
   bottom: ${space(2)};
-  left: ${space(2)};
+  left: ${p => (p.slidePosition === 'left' ? 0 : space(2))};
 
   overflow: auto;
   pointer-events: auto;
@@ -139,6 +139,7 @@ const _SlideOverPanel = styled(motion.div, {
               position: relative;
 
               width: ${PANEL_WIDTH};
+              min-width: 500px;
               height: 100%;
 
               top: 0;
diff --git a/static/app/components/slider/index.tsx b/static/app/components/slider/index.tsx
index e695816effedde..93d880251bcefb 100644
--- a/static/app/components/slider/index.tsx
+++ b/static/app/components/slider/index.tsx
@@ -125,14 +125,14 @@ function BaseSlider(
       onChange: indexValue =>
         onChange?.(
           Array.isArray(indexValue)
-            ? indexValue.map(i => allowedValues[i])
-            : allowedValues[indexValue]
+            ? indexValue.map(i => allowedValues[i]!)
+            : allowedValues[indexValue]!
         ),
       onChangeEnd: indexValue =>
         onChangeEnd?.(
           Array.isArray(indexValue)
-            ? indexValue.map(i => allowedValues[i])
-            : allowedValues[indexValue]
+            ? indexValue.map(i => allowedValues[i]!)
+            : allowedValues[indexValue]!
         ),
     }),
   };
@@ -176,7 +176,7 @@ function BaseSlider(
     if (nThumbs > 1) {
       return refs.current;
     }
-    return refs.current[0];
+    return refs.current[0]!;
   }, [nThumbs]);
 
   const getFormattedValue = useCallback(
@@ -185,8 +185,8 @@ function BaseSlider(
       // like an index for `allowedValues`.
       if (allowedValues) {
         return formatLabel
-          ? formatLabel(allowedValues[val])
-          : state.getFormattedValue(allowedValues[val]);
+          ? formatLabel(allowedValues[val]!)
+          : state.getFormattedValue(allowedValues[val]!);
       }
 
       return formatLabel ? formatLabel(val) : state.getFormattedValue(val);
@@ -214,10 +214,10 @@ function BaseSlider(
             <SliderLabel {...labelProps}>{label}</SliderLabel>
             <SliderLabelOutput {...outputProps}>
               {nThumbs > 1
-                ? `${getFormattedValue(selectedRange[0])}–${getFormattedValue(
-                    selectedRange[1]
+                ? `${getFormattedValue(selectedRange[0]!)}–${getFormattedValue(
+                    selectedRange[1]!
                   )}`
-                : getFormattedValue(selectedRange[1])}
+                : getFormattedValue(selectedRange[1]!)}
             </SliderLabelOutput>
           </SliderLabelWrapper>
         )}
@@ -234,8 +234,8 @@ function BaseSlider(
             disabled={disabled}
             error={error}
             style={{
-              left: `${state.getValuePercent(selectedRange[0]) * 100}%`,
-              right: `${100 - state.getValuePercent(selectedRange[1]) * 100}%`,
+              left: `${state.getValuePercent(selectedRange[0]!) * 100}%`,
+              right: `${100 - state.getValuePercent(selectedRange[1]!) * 100}%`,
             }}
           />
 
@@ -245,7 +245,9 @@ function BaseSlider(
               aria-hidden
               error={error}
               disabled={disabled}
-              inSelection={tickValue >= selectedRange[0] && tickValue <= selectedRange[1]}
+              inSelection={
+                tickValue >= selectedRange[0]! && tickValue <= selectedRange[1]!
+              }
               style={{left: `${(state.getValuePercent(tickValue) * 100).toFixed(2)}%`}}
               justifyContent={
                 index === 0
diff --git a/static/app/components/slider/thumb.tsx b/static/app/components/slider/thumb.tsx
index 10965b10101676..1b26148b3723e2 100644
--- a/static/app/components/slider/thumb.tsx
+++ b/static/app/components/slider/thumb.tsx
@@ -51,7 +51,7 @@ function BaseSliderThumb(
             transform: `translateX(${-state.getThumbPercent(index ?? 0) * 100}%)`,
           }}
         >
-          {getFormattedValue(state.values[index ?? 0])}
+          {getFormattedValue(state.values[index ?? 0]!)}
         </SliderThumbLabel>
       )}
       <VisuallyHidden>
diff --git a/static/app/components/stream/group.tsx b/static/app/components/stream/group.tsx
index 7d897d25ea75a9..1268f8cb11862c 100644
--- a/static/app/components/stream/group.tsx
+++ b/static/app/components/stream/group.tsx
@@ -184,7 +184,7 @@ function BaseGroupRow({
   const {period, start, end} = selection.datetime || {};
 
   const summary =
-    customStatsPeriod?.label.toLowerCase() ??
+    customStatsPeriod?.label?.toLowerCase() ??
     (!!start && !!end
       ? 'time range'
       : getRelativeSummary(period || DEFAULT_STATS_PERIOD).toLowerCase());
@@ -270,8 +270,8 @@ function BaseGroupRow({
     }
 
     return group.filtered
-      ? group.filtered.stats?.[statsPeriod]
-      : group.stats?.[statsPeriod];
+      ? group.filtered.stats?.[statsPeriod]!
+      : group.stats?.[statsPeriod]!;
   }, [group, statsPeriod]);
 
   const groupSecondaryStats = useMemo<ReadonlyArray<TimeseriesValue>>(() => {
@@ -279,7 +279,7 @@ function BaseGroupRow({
       return [];
     }
 
-    return group.filtered ? group.stats?.[statsPeriod] : [];
+    return group.filtered ? group.stats?.[statsPeriod]! : [];
   }, [group, statsPeriod]);
 
   if (!group) {
diff --git a/static/app/components/structuredEventData/collapsibleValue.tsx b/static/app/components/structuredEventData/collapsibleValue.tsx
index 3542369ba7fc72..8f9b0cef3b8adf 100644
--- a/static/app/components/structuredEventData/collapsibleValue.tsx
+++ b/static/app/components/structuredEventData/collapsibleValue.tsx
@@ -12,6 +12,7 @@ interface Props {
   closeTag: string;
   openTag: string;
   path: string;
+  noBasePadding?: boolean;
   prefix?: ReactNode;
 }
 
@@ -21,6 +22,7 @@ export function CollapsibleValue({
   openTag,
   path,
   prefix = null,
+  noBasePadding,
 }: Props) {
   const {collapse, expand, isExpanded: isInitiallyExpanded} = useExpandedState({path});
   const [isExpanded, setIsExpanded] = useState(isInitiallyExpanded);
@@ -32,7 +34,7 @@ export function CollapsibleValue({
 
   // Toggle buttons get placed to the left of the open tag, but if this is the
   // base level there is no room for it. So we add padding in this case.
-  const baseLevelPadding = isBaseLevel && shouldShowToggleButton;
+  const baseLevelPadding = isBaseLevel && shouldShowToggleButton && !noBasePadding;
 
   return (
     <CollapsibleDataContainer data-base-with-toggle={baseLevelPadding}>
diff --git a/static/app/components/structuredEventData/recursiveStructuredData.tsx b/static/app/components/structuredEventData/recursiveStructuredData.tsx
index 9f93f5578f8c72..2089720299eb71 100644
--- a/static/app/components/structuredEventData/recursiveStructuredData.tsx
+++ b/static/app/components/structuredEventData/recursiveStructuredData.tsx
@@ -42,15 +42,15 @@ export function RecursiveStructuredData({
   withOnlyFormattedText = false,
 }: Props) {
   let i = 0;
-
-  const formattedObjectKey = objectKey ? (
-    <Fragment>
-      <ValueObjectKey>
-        {config?.renderObjectKeys?.(objectKey) ?? objectKey}
-      </ValueObjectKey>
-      <span>{': '}</span>
-    </Fragment>
-  ) : null;
+  const formattedObjectKey =
+    objectKey !== undefined ? (
+      <Fragment>
+        <ValueObjectKey>
+          {config?.renderObjectKeys?.(objectKey) ?? objectKey}
+        </ValueObjectKey>
+        <span>{': '}</span>
+      </Fragment>
+    ) : null;
 
   function Wrapper({children}: {children: React.ReactNode}) {
     return (
@@ -207,16 +207,16 @@ export function RecursiveStructuredData({
   const keys = Object.keys(value);
   keys.sort(naturalCaseInsensitiveSort);
   for (i = 0; i < keys.length; i++) {
-    const key = keys[i];
+    const key = keys[i]!;
 
     children.push(
       <div key={key}>
         <RecursiveStructuredData
           config={config}
-          meta={meta?.[key]}
+          meta={meta?.[key]!}
           objectKey={key}
           path={path + '.' + key}
-          value={value[key]}
+          value={value[key]!}
           withAnnotatedText={withAnnotatedText}
         />
         {i < keys.length - 1 ? <span>{','}</span> : null}
diff --git a/static/app/components/superuserStaffAccessForm.tsx b/static/app/components/superuserStaffAccessForm.tsx
index 8af0670facd4fd..8e852a72157f60 100644
--- a/static/app/components/superuserStaffAccessForm.tsx
+++ b/static/app/components/superuserStaffAccessForm.tsx
@@ -59,7 +59,7 @@ class SuperuserStaffAccessForm extends Component<Props, State> {
     }
 
     const authenticators = await this.getAuthenticators();
-    this.setState({authenticators: authenticators});
+    this.setState({authenticators});
 
     // Set the error state if there are no authenticators and U2F is on
     if (!authenticators.length && !disableU2FForSUForm) {
diff --git a/static/app/components/tabs/index.spec.tsx b/static/app/components/tabs/index.spec.tsx
index 162e96bc24914d..aa20811f34af49 100644
--- a/static/app/components/tabs/index.spec.tsx
+++ b/static/app/components/tabs/index.spec.tsx
@@ -47,11 +47,11 @@ describe('Tabs', () => {
     });
 
     // The first tab item is selected and its content visible
-    expect(screen.getByRole('tab', {name: TABS[0].label})).toHaveAttribute(
+    expect(screen.getByRole('tab', {name: TABS[0]!.label})).toHaveAttribute(
       'aria-selected',
       'true'
     );
-    expect(screen.getByText(TABS[0].content)).toBeInTheDocument();
+    expect(screen.getByText(TABS[0]!.content)).toBeInTheDocument();
   });
 
   it('renders tabs list when disabled', () => {
@@ -71,11 +71,11 @@ describe('Tabs', () => {
     );
 
     // The first tab item is selected and its content visible
-    expect(screen.getByRole('tab', {name: TABS[0].label})).toHaveAttribute(
+    expect(screen.getByRole('tab', {name: TABS[0]!.label})).toHaveAttribute(
       'aria-selected',
       'true'
     );
-    expect(screen.getByText(TABS[0].content)).toBeInTheDocument();
+    expect(screen.getByText(TABS[0]!.content)).toBeInTheDocument();
 
     // All tabs are marked as disabled
     TABS.forEach(tab => {
@@ -110,7 +110,7 @@ describe('Tabs', () => {
       'aria-selected',
       'true'
     );
-    expect(screen.getByText(TABS[1].content)).toBeInTheDocument();
+    expect(screen.getByText(TABS[1]!.content)).toBeInTheDocument();
   });
 
   it('changes tabs using keyboard navigation', async () => {
@@ -141,7 +141,7 @@ describe('Tabs', () => {
       'aria-selected',
       'true'
     );
-    expect(screen.getByText(TABS[1].content)).toBeInTheDocument();
+    expect(screen.getByText(TABS[1]!.content)).toBeInTheDocument();
   });
 
   it('changes tabs on key press in vertical orientation', async () => {
@@ -172,7 +172,7 @@ describe('Tabs', () => {
       'aria-selected',
       'true'
     );
-    expect(screen.getByText(TABS[1].content)).toBeInTheDocument();
+    expect(screen.getByText(TABS[1]!.content)).toBeInTheDocument();
   });
 
   it('renders disabled tabs', () => {
@@ -230,7 +230,7 @@ describe('Tabs', () => {
     // Command/ctrl/shift-clicking on a tab link doesn't change the tab selection.
     // The expected behavior is that clicking on a tab link will open a new browser
     // tab/window. The current view shouldn't update.
-    const secondTabEl = screen.getByRole('tab', {name: TABS[1].label});
+    const secondTabEl = screen.getByRole('tab', {name: TABS[1]!.label});
     const secondTabLink = within(secondTabEl).getByRole('link', {hidden: true});
 
     const user = userEvent.setup();
@@ -247,7 +247,7 @@ describe('Tabs', () => {
     await user.click(secondTabLink);
     await user.keyboard('[/ShiftLeft]');
 
-    expect(screen.getByRole('tab', {name: TABS[0].label})).toHaveAttribute(
+    expect(screen.getByRole('tab', {name: TABS[0]!.label})).toHaveAttribute(
       'aria-selected',
       'true'
     );
diff --git a/static/app/components/tabs/index.tsx b/static/app/components/tabs/index.tsx
index cbe934be1b99af..d196786b5c5277 100644
--- a/static/app/components/tabs/index.tsx
+++ b/static/app/components/tabs/index.tsx
@@ -47,7 +47,7 @@ export interface TabsProps<T>
   value?: T;
 }
 
-interface TabContext {
+export interface TabContext {
   rootProps: Omit<TabsProps<any>, 'children' | 'className'>;
   setTabListState: (state: TabListState<any>) => void;
   tabListState?: TabListState<any>;
diff --git a/static/app/components/tagDistributionMeter.tsx b/static/app/components/tagDistributionMeter.tsx
index 5aa84d0715ccec..91b892f0f4aa18 100644
--- a/static/app/components/tagDistributionMeter.tsx
+++ b/static/app/components/tagDistributionMeter.tsx
@@ -55,7 +55,7 @@ function TagDistributionMeter({
       );
     }
 
-    const largestSegment = segments[0];
+    const largestSegment = segments[0]!;
     const pct = percent(largestSegment.count, totalValues);
     const pctLabel = Math.floor(pct);
     const renderLabel = () => {
@@ -140,7 +140,7 @@ function TagDistributionMeter({
                 {value.isOther ? (
                   <OtherSegment
                     aria-label={t('Other')}
-                    color={colors[colors.length - 1]}
+                    color={colors[colors.length - 1]!}
                   />
                 ) : (
                   <Segment
@@ -149,7 +149,7 @@ function TagDistributionMeter({
                       title,
                       value.value
                     )}
-                    color={colors[index]}
+                    color={colors[index]!}
                     {...segmentProps}
                   />
                 )}
diff --git a/static/app/components/teamRoleSelect.tsx b/static/app/components/teamRoleSelect.tsx
index b7bb3732455e8c..1b58824181c4ef 100644
--- a/static/app/components/teamRoleSelect.tsx
+++ b/static/app/components/teamRoleSelect.tsx
@@ -56,7 +56,7 @@ function TeamRoleSelect({
     member.teamRole || // From TeamMemberEndpoint
     member.teamRoles?.find(tr => tr.teamSlug === team.slug)?.role || // From OrgMemberDetailEndpoint
     null;
-  const teamRole = teamRoleList.find(r => r.id === teamRoleId) || teamRoleList[0];
+  const teamRole = teamRoleList.find(r => r.id === teamRoleId) || teamRoleList[0]!;
 
   return (
     <RoleSelectControl
diff --git a/static/app/components/teamSelector.spec.tsx b/static/app/components/teamSelector.spec.tsx
index 8766f714e989c7..e4e3f149f8eaec 100644
--- a/static/app/components/teamSelector.spec.tsx
+++ b/static/app/components/teamSelector.spec.tsx
@@ -36,7 +36,7 @@ const teamData = [
   },
 ];
 const teams = teamData.map(data => TeamFixture(data));
-const project = ProjectFixture({teams: [teams[0]]});
+const project = ProjectFixture({teams: [teams[0]!]});
 const organization = OrganizationFixture({access: ['project:write']});
 act(() => OrganizationStore.onUpdate(organization, {replace: true}));
 
@@ -96,7 +96,7 @@ describe('Team Selector', function () {
     expect(screen.getByText('#team1')).toBeInTheDocument();
 
     // team2 and team3 should have add to project buttons
-    expect(screen.getAllByRole('button').length).toBe(2);
+    expect(screen.getAllByRole('button')).toHaveLength(2);
   });
 
   it('respects the team and project filter', async function () {
@@ -110,7 +110,7 @@ describe('Team Selector', function () {
     expect(screen.queryByText('#team3')).not.toBeInTheDocument();
 
     // team2 should have add to project buttons
-    expect(screen.getAllByRole('button').length).toBe(1);
+    expect(screen.getAllByRole('button')).toHaveLength(1);
   });
 
   it('allows you to add teams outside of project', async function () {
@@ -122,7 +122,7 @@ describe('Team Selector', function () {
     // team2 and team3 should have add to project buttons
     const addToProjectButtons = screen.getAllByRole('button');
 
-    await userEvent.click(addToProjectButtons[0]);
+    await userEvent.click(addToProjectButtons[0]!);
 
     expect(addTeamToProject).toHaveBeenCalled();
   });
diff --git a/static/app/components/textCopyInput.spec.tsx b/static/app/components/textCopyInput.spec.tsx
index 01dc466730c96c..2648deff824b70 100644
--- a/static/app/components/textCopyInput.spec.tsx
+++ b/static/app/components/textCopyInput.spec.tsx
@@ -1,10 +1,43 @@
-import {render, screen} from 'sentry-test/reactTestingLibrary';
+import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 
 import TextCopyInput from 'sentry/components/textCopyInput';
 
 describe('TextCopyInput', function () {
-  it('renders', function () {
+  beforeEach(() => {
+    Object.assign(navigator, {
+      clipboard: {
+        writeText: jest.fn().mockResolvedValue(''),
+      },
+    });
+  });
+
+  it('copies text to clipboard on click', async function () {
+    render(<TextCopyInput>Text to Copy</TextCopyInput>);
+    const button = screen.getByRole('button', {name: 'Copy'});
+    expect(button).toBeInTheDocument();
+
+    await userEvent.click(button);
+
+    expect(navigator.clipboard.writeText).toHaveBeenCalledWith('Text to Copy');
+  });
+
+  it('selects text in input on click', async function () {
     render(<TextCopyInput>Text to Copy</TextCopyInput>);
-    expect(screen.getByDisplayValue('Text to Copy')).toBeInTheDocument();
+    const input = screen.getByRole<HTMLInputElement>('textbox');
+    expect(input).toHaveValue('Text to Copy');
+    const selectSpy = jest.spyOn(input, 'select');
+
+    await userEvent.click(input);
+
+    expect(selectSpy).toHaveBeenCalled();
+  });
+
+  it('handles RTL text selection', async function () {
+    render(<TextCopyInput rtl>Text to Copy</TextCopyInput>);
+    const input = screen.getByRole<HTMLInputElement>('textbox');
+    const setSelectionRangeSpy = jest.spyOn(input, 'setSelectionRange');
+
+    await userEvent.click(input);
+    expect(setSelectionRangeSpy).toHaveBeenCalledWith(1, input.value.length - 1);
   });
 });
diff --git a/static/app/components/textCopyInput.tsx b/static/app/components/textCopyInput.tsx
index 5b32a3fb84981b..c21915c274b4c7 100644
--- a/static/app/components/textCopyInput.tsx
+++ b/static/app/components/textCopyInput.tsx
@@ -1,5 +1,4 @@
-import {useCallback, useRef} from 'react';
-import {findDOMNode} from 'react-dom';
+import {useCallback, useId} from 'react';
 import styled from '@emotion/styled';
 
 import {CopyToClipboardButton} from 'sentry/components/copyToClipboardButton';
@@ -33,27 +32,21 @@ function TextCopyInput({
   children,
   ...inputProps
 }: Props) {
-  const textRef = useRef<HTMLInputElement>(null);
+  const textNodeId = useId();
 
   const handleSelectText = useCallback(() => {
-    if (!textRef.current) {
+    const node = document.getElementById(textNodeId) as HTMLInputElement | null;
+    if (!node) {
       return;
     }
 
-    // We use findDOMNode here because `this.textRef` is not a dom node,
-    // it's a ref to AutoSelectText
-    const node = findDOMNode(textRef.current); // eslint-disable-line react/no-find-dom-node
-    if (!node || !(node instanceof HTMLElement)) {
-      return;
-    }
-
-    if (rtl && node instanceof HTMLInputElement) {
+    if (rtl) {
       // we don't want to select the first character - \u202A, nor the last - \u202C
       node.setSelectionRange(1, node.value.length - 1);
     } else {
       selectText(node);
     }
-  }, [rtl]);
+  }, [rtl, textNodeId]);
 
   /**
    * We are using direction: rtl; to always show the ending of a long overflowing text in input.
@@ -68,9 +61,9 @@ function TextCopyInput({
   return (
     <InputGroup className={className}>
       <StyledInput
+        id={textNodeId}
         readOnly
         disabled={disabled}
-        ref={textRef}
         style={style}
         value={inputValue}
         onClick={handleSelectText}
diff --git a/static/app/components/timeRangeSelector/utils.tsx b/static/app/components/timeRangeSelector/utils.tsx
index 9ef9cea8727266..5b90f9fda28c90 100644
--- a/static/app/components/timeRangeSelector/utils.tsx
+++ b/static/app/components/timeRangeSelector/utils.tsx
@@ -69,7 +69,7 @@ const parseStatsPeriodString = (statsPeriodString: string) => {
     throw new Error('Invalid stats period');
   }
 
-  const value = parseInt(result[1], 10);
+  const value = parseInt(result[1]!, 10);
   const unit = result[2] as RelativePeriodUnit;
 
   return {
@@ -94,7 +94,7 @@ export function parseStatsPeriod(
 ): {end: string; start: string} {
   const {value, unit} = parseStatsPeriodString(statsPeriod);
 
-  const momentUnit = SUPPORTED_RELATIVE_PERIOD_UNITS[unit].momentUnit;
+  const momentUnit = SUPPORTED_RELATIVE_PERIOD_UNITS[unit]!.momentUnit;
 
   const format = outputFormat === null ? undefined : outputFormat;
 
@@ -126,7 +126,7 @@ export function getRelativeSummary(
 
     const {value, unit} = parseStatsPeriodString(relative);
 
-    return SUPPORTED_RELATIVE_PERIOD_UNITS[unit].label(value);
+    return SUPPORTED_RELATIVE_PERIOD_UNITS[unit]!.label(value);
   } catch {
     return 'Invalid period';
   }
@@ -189,7 +189,7 @@ function timePeriodIsWithinLimit<T extends RelativeUnitsMapping>({
     return true;
   }
 
-  const daysMultiplier = supportedPeriods[unit].convertToDaysMultiplier;
+  const daysMultiplier = supportedPeriods[unit]!.convertToDaysMultiplier;
   const numberOfDays = amount * daysMultiplier;
 
   return numberOfDays <= maxDays;
@@ -246,7 +246,7 @@ export const _timeRangeAutoCompleteFilter = function <T extends RelativeUnitsMap
         })
       )
       .map((unit, index) =>
-        makeItem(userSuppliedAmount, unit, supportedPeriods[unit].label, index)
+        makeItem(userSuppliedAmount, unit, supportedPeriods[unit]!.label, index)
       );
   }
 
@@ -257,7 +257,7 @@ export const _timeRangeAutoCompleteFilter = function <T extends RelativeUnitsMap
         return unit === userSuppliedUnits;
       }
 
-      return supportedPeriods[unit].searchKey.startsWith(userSuppliedUnits);
+      return supportedPeriods[unit]!.searchKey.startsWith(userSuppliedUnits);
     });
 
     if (
@@ -273,7 +273,7 @@ export const _timeRangeAutoCompleteFilter = function <T extends RelativeUnitsMap
         makeItem(
           userSuppliedAmount,
           matchingUnit,
-          supportedPeriods[matchingUnit].label,
+          supportedPeriods[matchingUnit]!.label,
           0
         ),
       ];
@@ -313,7 +313,7 @@ export function getArbitraryRelativePeriod(arbitraryPeriod?: string | null) {
 
   // Get the custom period label ("8D" --> "8 Days")
   const {value, unit} = parseStatsPeriodString(arbitraryPeriod);
-  return {[arbitraryPeriod]: SUPPORTED_RELATIVE_PERIOD_UNITS[unit].label(value)};
+  return {[arbitraryPeriod]: SUPPORTED_RELATIVE_PERIOD_UNITS[unit]!.label(value)};
 }
 
 /**
diff --git a/static/app/components/timeline/index.tsx b/static/app/components/timeline/index.tsx
index 44b57780b2d25d..fb7b8b33980a5d 100644
--- a/static/app/components/timeline/index.tsx
+++ b/static/app/components/timeline/index.tsx
@@ -27,7 +27,7 @@ export interface TimelineItemProps {
   timestamp?: React.ReactNode;
 }
 
-export const Item = forwardRef(function _Item(
+export const Item = forwardRef(function ItemInner(
   {
     title,
     children,
diff --git a/static/app/components/tooltip.spec.tsx b/static/app/components/tooltip.spec.tsx
index 08544dd20aa2d8..6889317a0968cc 100644
--- a/static/app/components/tooltip.spec.tsx
+++ b/static/app/components/tooltip.spec.tsx
@@ -25,12 +25,23 @@ describe('Tooltip', function () {
     jest.clearAllMocks();
   });
 
-  it('renders', function () {
+  it('renders', async function () {
     render(
       <Tooltip delay={0} title="test">
         <span>My Button</span>
       </Tooltip>
     );
+
+    await userEvent.hover(screen.getByText('My Button'));
+    expect(screen.getByText('test')).toBeInTheDocument();
+
+    // Check that the arrow svg is rendered
+    expect(document.querySelector('svg')).toBeInTheDocument();
+
+    await userEvent.unhover(screen.getByText('My Button'));
+    await waitFor(() => {
+      expect(screen.queryByText('test')).not.toBeInTheDocument();
+    });
   });
 
   it('updates title', async function () {
diff --git a/static/app/components/tooltip.tsx b/static/app/components/tooltip.tsx
index 9c0903fb5b07d4..ff54ec98321ffa 100644
--- a/static/app/components/tooltip.tsx
+++ b/static/app/components/tooltip.tsx
@@ -1,6 +1,5 @@
 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';
@@ -92,9 +91,9 @@ function Tooltip({
   );
 }
 
-const TooltipContent = styled(Overlay, {shouldForwardProp: isPropValid})<{
-  maxWidth?: number;
-}>`
+const TooltipContent = styled(Overlay, {
+  shouldForwardProp: prop => prop !== 'maxWidth',
+})<{maxWidth?: number}>`
   padding: ${space(1)} ${space(1.5)};
   overflow-wrap: break-word;
   max-width: ${p => p.maxWidth ?? 225}px;
diff --git a/static/app/components/truncate.tsx b/static/app/components/truncate.tsx
index f43e9dc0feeb79..de21e0f900e78a 100644
--- a/static/app/components/truncate.tsx
+++ b/static/app/components/truncate.tsx
@@ -55,7 +55,7 @@ function Truncate({
     } else if (trimRegex && !leftTrim) {
       const matches = slicedValue.match(trimRegex);
       let lastIndex = matches
-        ? slicedValue.lastIndexOf(matches[matches.length - 1]) + 1
+        ? slicedValue.lastIndexOf(matches[matches.length - 1]!) + 1
         : slicedValue.length;
       if (lastIndex <= minLength) {
         lastIndex = slicedValue.length;
diff --git a/static/app/components/u2f/u2finterface.tsx b/static/app/components/u2f/u2finterface.tsx
index 459ef8a0b9f020..3c82705ad19052 100644
--- a/static/app/components/u2f/u2finterface.tsx
+++ b/static/app/components/u2f/u2finterface.tsx
@@ -56,14 +56,12 @@ class U2fInterface extends Component<Props, State> {
   componentDidMount() {
     const supported = !!window.PublicKeyCredential;
 
-    // eslint-disable-next-line react/no-did-mount-set-state
     this.setState({isSupported: supported});
 
     const isSafari =
       navigator.userAgent.includes('Safari') && !navigator.userAgent.includes('Chrome');
 
     if (isSafari) {
-      // eslint-disable-next-line react/no-did-mount-set-state
       this.setState({
         deviceFailure: 'safari: requires interaction',
         isSafari,
diff --git a/static/app/components/updatedEmptyState.tsx b/static/app/components/updatedEmptyState.tsx
index 201cd70007fb71..d827226f914ae6 100644
--- a/static/app/components/updatedEmptyState.tsx
+++ b/static/app/components/updatedEmptyState.tsx
@@ -91,7 +91,7 @@ export default function UpdatedEmptyState({project}: {project?: Project}) {
     };
   }
 
-  const install = loadGettingStarted.docs.onboarding.install(docParams)[0];
+  const install = loadGettingStarted.docs.onboarding.install(docParams)[0]!;
   const configure = loadGettingStarted.docs.onboarding.configure(docParams);
   const verify = loadGettingStarted.docs.onboarding.verify(docParams);
 
@@ -200,9 +200,9 @@ export default function UpdatedEmptyState({project}: {project?: Project}) {
                           <CodeSnippetWrapper>
                             {configuration.configurations &&
                             configuration.configurations.length > 0 ? (
-                              Array.isArray(configuration.configurations[0].code) ? (
+                              Array.isArray(configuration.configurations[0]!.code) ? (
                                 <TabbedCodeSnippet
-                                  tabs={configuration.configurations[0].code}
+                                  tabs={configuration.configurations[0]!.code}
                                 />
                               ) : null
                             ) : null}
diff --git a/static/app/components/userMisery.tsx b/static/app/components/userMisery.tsx
index eca100d6ac9255..fafdd065cdff4c 100644
--- a/static/app/components/userMisery.tsx
+++ b/static/app/components/userMisery.tsx
@@ -21,7 +21,7 @@ function UserMisery(props: Props) {
   // 0 User Misery while still preserving the actual value for sorting purposes.
   const adjustedMisery = userMisery > 0.05 ? userMisery : 0;
 
-  const palette = new Array(bars).fill([CHART_PALETTE[0][0]]);
+  const palette = new Array(bars).fill([CHART_PALETTE[0]![0]]);
   const score = Math.round(adjustedMisery * palette.length);
 
   let title: React.ReactNode;
diff --git a/static/app/constants/chartPalette.tsx b/static/app/constants/chartPalette.tsx
index be738abb6bc395..4df1b1f597d4dc 100644
--- a/static/app/constants/chartPalette.tsx
+++ b/static/app/constants/chartPalette.tsx
@@ -176,4 +176,4 @@ export const CHART_PALETTE = [
     '#f4aa27',
     '#f2b712',
   ],
-] as string[][];
+];
diff --git a/static/app/constants/index.tsx b/static/app/constants/index.tsx
index 0d6200f2773da9..3939fe5bcae96a 100644
--- a/static/app/constants/index.tsx
+++ b/static/app/constants/index.tsx
@@ -121,8 +121,8 @@ export type PermissionChoice = {
 
 type PermissionObj = {
   choices: {
-    admin: PermissionChoice;
     'no-access': PermissionChoice;
+    admin?: PermissionChoice;
     read?: PermissionChoice;
     write?: PermissionChoice;
   };
@@ -199,6 +199,15 @@ export const SENTRY_APP_PERMISSIONS: PermissionObj[] = [
       admin: {label: 'Admin', scopes: ['member:read', 'member:write', 'member:admin']},
     },
   },
+  {
+    resource: 'Alerts',
+    help: 'Manage Alerts',
+    choices: {
+      'no-access': {label: 'No Access', scopes: []},
+      read: {label: 'Read', scopes: ['alerts:read']},
+      write: {label: 'Read & Write', scopes: ['alerts:read', 'alerts:write']},
+    },
+  },
 ];
 
 export const DEFAULT_TOAST_DURATION = 6000;
diff --git a/static/app/constants/ios-device-list.tsx b/static/app/constants/ios-device-list.tsx
index ca53d7e104523f..d6cfb100677872 100644
--- a/static/app/constants/ios-device-list.tsx
+++ b/static/app/constants/ios-device-list.tsx
@@ -3,7 +3,9 @@
 // the purpose of the script is to extract only the iOS information that Sentry cares about
 // and discard the rest of the JSON so we do not end up bloating bundle size.
 
+// see https://theapplewiki.com/wiki/models
 const iOSDeviceMapping: Record<string, string> = {
+  // iPod touch
   'iPod1,1': 'iPod touch',
   'iPod2,1': 'iPod touch (2nd generation)',
   'iPod3,1': 'iPod touch (3rd generation)',
@@ -11,6 +13,7 @@ const iOSDeviceMapping: Record<string, string> = {
   'iPod5,1': 'iPod touch (5th generation)',
   'iPod7,1': 'iPod touch (6th generation)',
   'iPod9,1': 'iPod touch (7th generation)',
+  // iPhone
   'iPhone1,1': 'iPhone',
   'iPhone1,2': 'iPhone 3G',
   'iPhone2,1': 'iPhone 3GS',
@@ -64,6 +67,11 @@ const iOSDeviceMapping: Record<string, string> = {
   'iPhone15,5': 'iPhone 15 Plus',
   'iPhone16,1': 'iPhone 15 Pro',
   'iPhone16,2': 'iPhone 15 Pro Max',
+  'iPhone17,1': 'iPhone 16 Pro',
+  'iPhone17,2': 'iPhone 16 Pro Max',
+  'iPhone17,3': 'iPhone 16',
+  'iPhone17,4': 'iPhone 16 Plus',
+  // iPad Pro
   'iPad6,7': 'iPad Pro (12.9-inch)',
   'iPad6,8': 'iPad Pro (12.9-inch)',
   'iPad6,3': 'iPad Pro (9.7-inch)',
@@ -96,6 +104,11 @@ const iOSDeviceMapping: Record<string, string> = {
   'iPad13,11': 'iPad Pro (12.9-inch) (5th generation)',
   'iPad14,5': 'iPad Pro (12.9-inch) (6th generation)',
   'iPad14,6': 'iPad Pro (12.9-inch) (6th generation)',
+  'iPad16,3': 'iPad Pro (11-inch) (5th generation)',
+  'iPad16,4': 'iPad Pro (11-inch) (5th generation)',
+  'iPad16,5': 'iPad Pro (12.9-inch) (7th generation)',
+  'iPad16,6': 'iPad Pro (12.9-inch) (7th generation)',
+  // iPad mini
   'iPad2,5': 'iPad mini',
   'iPad2,6': 'iPad mini',
   'iPad2,7': 'iPad mini',
@@ -111,6 +124,7 @@ const iOSDeviceMapping: Record<string, string> = {
   'iPad11,2': 'iPad mini (5th generation)',
   'iPad14,1': 'iPad mini (6th generation)',
   'iPad14,2': 'iPad mini (6th generation)',
+  // iPad Air
   'iPad4,1': 'iPad Air',
   'iPad4,2': 'iPad Air',
   'iPad4,3': 'iPad Air',
@@ -122,6 +136,11 @@ const iOSDeviceMapping: Record<string, string> = {
   'iPad13,2': 'iPad Air (4th generation)',
   'iPad13,16': 'iPad Air (5th generation)',
   'iPad13,17': 'iPad Air (5th generation)',
+  'iPad14,8': 'iPad Air (6th generation)',
+  'iPad14,9': 'iPad Air (6th generation)',
+  'iPad14,10': 'iPad Air (7th generation)',
+  'iPad14,11': 'iPad Air (7th generation)',
+  // iPad
   'iPad1,1': 'iPad',
   'iPad2,1': 'iPad 2',
   'iPad2,2': 'iPad 2',
@@ -145,9 +164,7 @@ const iOSDeviceMapping: Record<string, string> = {
   'iPad12,2': 'iPad (9th generation)',
   'iPad13,18': 'iPad (10th generation)',
   'iPad13,19': 'iPad (10th generation)',
-  'AudioAccessory1,1': 'HomePod',
-  'AudioAccessory1,2': 'HomePod',
-  'AudioAccessory5,1': 'HomePod mini',
+  // Apple Watch
   'Watch1,1': 'Apple Watch (1st generation)',
   'Watch1,2': 'Apple Watch (1st generation)',
   'Watch2,6': 'Apple Watch Series 1',
@@ -192,7 +209,11 @@ const iOSDeviceMapping: Record<string, string> = {
   'Watch7,4': 'Apple Watch Series 9',
   'Watch7,3': 'Apple Watch Series 9',
   'Watch7,5': 'Apple Watch Ultra 2',
-
+  'Watch7,8': 'Apple Watch Series 10',
+  'Watch7,9': 'Apple Watch Series 10',
+  'Watch7,10': 'Apple Watch Series 10',
+  'Watch7,11': 'Apple Watch Series 10',
+  // Apple TV
   'AppleTV1,1': 'Apple TV (1st generation)',
   'AppleTV2,1': 'Apple TV (2nd generation)',
   'AppleTV3,1': 'Apple TV (3rd generation)',
@@ -201,13 +222,6 @@ const iOSDeviceMapping: Record<string, string> = {
   'AppleTV6,2': 'Apple TV 4K',
   'AppleTV11,1': 'Apple TV 4K (2nd generation)',
   'AppleTV14,1': 'Apple TV 4K (3rd generation)',
-  'AirTag1,1': 'AirTag',
-  'AirPods1,1': 'AirPods (1st generation)',
-  'AirPods2,1,AirPods2,1': 'AirPods (2nd generation)',
-  'AirPods1,3,Audio2,1': 'AirPods (3rd generation)',
-  'AirPods2,2,AirPodsPro1,1,iProd8,1': 'AirPods Pro',
-  'AirPodsPro1,2': 'AirPods Pro (2nd generation)',
-  'AirPodsMax1,1,iProd8,6': 'AirPods Max',
 };
 
 export {iOSDeviceMapping};
diff --git a/static/app/data/forms/accountPreferences.tsx b/static/app/data/forms/accountPreferences.tsx
index 7a073f4557f5b1..39e7d27de54f44 100644
--- a/static/app/data/forms/accountPreferences.tsx
+++ b/static/app/data/forms/accountPreferences.tsx
@@ -2,6 +2,7 @@ import type {JsonFormObject} from 'sentry/components/forms/types';
 import languages from 'sentry/data/languages';
 import {timezoneOptions} from 'sentry/data/timezones';
 import {t} from 'sentry/locale';
+import {removeBodyTheme} from 'sentry/utils/removeBodyTheme';
 
 // Export route to make these forms searchable by label/help
 export const route = '/settings/account/details/';
@@ -28,6 +29,9 @@ const formGroups: JsonFormObject[] = [
           {value: 'system', label: t('Default to system')},
         ],
         getData: transformOptions,
+        onChange: () => {
+          removeBodyTheme();
+        },
       },
       {
         name: 'language',
diff --git a/static/app/data/forms/inboundFilters.tsx b/static/app/data/forms/inboundFilters.tsx
index c82ad9aa5d709a..2ee1c4d994b64d 100644
--- a/static/app/data/forms/inboundFilters.tsx
+++ b/static/app/data/forms/inboundFilters.tsx
@@ -77,7 +77,8 @@ export const customFilterFields: Field[] = [
     help: (
       <Fragment>
         {t('Filter events by error messages. ')}
-        {newLineHelpText} {globHelpText}
+        {newLineHelpText} {globHelpText}{' '}
+        {t('Exceptions are matched on "<type>: <message>", for example "TypeError: *".')}
       </Fragment>
     ),
     getData: getOptionsData,
diff --git a/static/app/data/forms/organizationMembershipSettings.tsx b/static/app/data/forms/organizationMembershipSettings.tsx
index 7cb6e01b93e31f..ec03cf7d5aaecb 100644
--- a/static/app/data/forms/organizationMembershipSettings.tsx
+++ b/static/app/data/forms/organizationMembershipSettings.tsx
@@ -32,7 +32,6 @@ const formGroups: JsonFormObject[] = [
         help: t(
           'Allow organization members to invite other members via email without needing org owner or manager approval.'
         ),
-        visible: ({features}) => features.has('members-invite-teammates'),
       },
       {
         name: 'allowMemberProjectCreation',
diff --git a/static/app/data/forms/projectGeneralSettings.tsx b/static/app/data/forms/projectGeneralSettings.tsx
index 68d4a760653e89..236a972aeabfac 100644
--- a/static/app/data/forms/projectGeneralSettings.tsx
+++ b/static/app/data/forms/projectGeneralSettings.tsx
@@ -2,6 +2,7 @@ import {createFilter} from 'react-select';
 import styled from '@emotion/styled';
 import {PlatformIcon} from 'platformicons';
 
+import {hasEveryAccess} from 'sentry/components/acl/access';
 import type {Field} from 'sentry/components/forms/types';
 import platforms from 'sentry/data/platforms';
 import {t, tct, tn} from 'sentry/locale';
@@ -149,7 +150,8 @@ export const fields: Record<string, Field> = {
     name: 'scrapeJavaScript',
     type: 'boolean',
     // if this is off for the organization, it cannot be enabled for the project
-    disabled: ({organization, name}) => !organization[name],
+    disabled: ({organization, project, name}) =>
+      !organization[name] || !hasEveryAccess(['project:write'], {organization, project}),
     disabledReason: ORG_DISABLED_REASON,
     // `props` are the props given to FormField
     setValue: (val, props) => props.organization?.[props.name] && val,
diff --git a/static/app/gettingStartedDocs/android/android.tsx b/static/app/gettingStartedDocs/android/android.tsx
index a59faeddb9bab9..653f52e5ddb29a 100644
--- a/static/app/gettingStartedDocs/android/android.tsx
+++ b/static/app/gettingStartedDocs/android/android.tsx
@@ -11,7 +11,6 @@ import type {
   OnboardingConfig,
 } from 'sentry/components/onboarding/gettingStartedDoc/types';
 import {MobileBetaBanner} from 'sentry/components/onboarding/gettingStartedDoc/utils';
-import {getAndroidMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
 import {
   getReplayMobileConfigureDescription,
   getReplayVerifyStep,
@@ -445,7 +444,6 @@ const docs: Docs<PlatformOptions> = {
   onboarding,
   feedbackOnboardingCrashApi: feedbackOnboardingCrashApiJava,
   crashReportOnboarding: feedbackOnboardingCrashApiJava,
-  customMetricsOnboarding: getAndroidMetricsOnboarding(),
   platformOptions,
   replayOnboarding,
 };
diff --git a/static/app/gettingStartedDocs/bun/bun.tsx b/static/app/gettingStartedDocs/bun/bun.tsx
index 57e8a22dc10e1c..11987a8a0bdde4 100644
--- a/static/app/gettingStartedDocs/bun/bun.tsx
+++ b/static/app/gettingStartedDocs/bun/bun.tsx
@@ -13,7 +13,10 @@ import {
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/feedbackOnboarding';
 import exampleSnippets from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsExampleSnippets';
 import {metricTagsExplanation} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
-import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
+import {
+  feedbackOnboardingJsLoader,
+  replayOnboardingJsLoader,
+} from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {t, tct} from 'sentry/locale';
 
 type Params = DocsParams;
@@ -207,6 +210,7 @@ const docs: Docs = {
   replayOnboardingJsLoader,
   customMetricsOnboarding,
   crashReportOnboarding,
+  feedbackOnboardingJsLoader,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/deno/deno.tsx b/static/app/gettingStartedDocs/deno/deno.tsx
index 2303cf885e5a75..640f952f9d9c0f 100644
--- a/static/app/gettingStartedDocs/deno/deno.tsx
+++ b/static/app/gettingStartedDocs/deno/deno.tsx
@@ -5,7 +5,10 @@ import type {
   DocsParams,
   OnboardingConfig,
 } from 'sentry/components/onboarding/gettingStartedDoc/types';
-import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
+import {
+  feedbackOnboardingJsLoader,
+  replayOnboardingJsLoader,
+} from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {t, tct} from 'sentry/locale';
 
 type Params = DocsParams;
@@ -175,6 +178,7 @@ const docs: Docs = {
   onboarding,
   replayOnboardingJsLoader,
   customMetricsOnboarding,
+  feedbackOnboardingJsLoader,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/dotnet/aspnet.tsx b/static/app/gettingStartedDocs/dotnet/aspnet.tsx
index 394a6781c2be19..6f2f40ef588a7c 100644
--- a/static/app/gettingStartedDocs/dotnet/aspnet.tsx
+++ b/static/app/gettingStartedDocs/dotnet/aspnet.tsx
@@ -15,7 +15,10 @@ import {
   getCrashReportSDKInstallFirstStep,
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/feedbackOnboarding';
 import {getDotnetMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
-import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
+import {
+  feedbackOnboardingJsLoader,
+  replayOnboardingJsLoader,
+} from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {t, tct} from 'sentry/locale';
 import {getPackageVersion} from 'sentry/utils/gettingStartedDocs/getPackageVersion';
 
@@ -228,6 +231,7 @@ const docs: Docs = {
   replayOnboardingJsLoader,
   customMetricsOnboarding: getDotnetMetricsOnboarding({packageName: 'Sentry.AspNet'}),
   crashReportOnboarding,
+  feedbackOnboardingJsLoader,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/dotnet/aspnetcore.tsx b/static/app/gettingStartedDocs/dotnet/aspnetcore.tsx
index 963e25db4e37c6..b8ce77f4697d40 100644
--- a/static/app/gettingStartedDocs/dotnet/aspnetcore.tsx
+++ b/static/app/gettingStartedDocs/dotnet/aspnetcore.tsx
@@ -15,7 +15,10 @@ import {
   getCrashReportSDKInstallFirstStep,
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/feedbackOnboarding';
 import {getDotnetMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
-import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
+import {
+  feedbackOnboardingJsLoader,
+  replayOnboardingJsLoader,
+} from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {t, tct} from 'sentry/locale';
 import {getPackageVersion} from 'sentry/utils/gettingStartedDocs/getPackageVersion';
 
@@ -313,6 +316,7 @@ const docs: Docs = {
   replayOnboardingJsLoader,
   customMetricsOnboarding: getDotnetMetricsOnboarding({packageName: 'Sentry.AspNetCore'}),
   crashReportOnboarding,
+  feedbackOnboardingJsLoader,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/elixir/elixir.tsx b/static/app/gettingStartedDocs/elixir/elixir.tsx
index 689819e8801ca3..edea378891329e 100644
--- a/static/app/gettingStartedDocs/elixir/elixir.tsx
+++ b/static/app/gettingStartedDocs/elixir/elixir.tsx
@@ -11,7 +11,10 @@ import {
   getCrashReportModalConfigDescription,
   getCrashReportModalIntroduction,
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/feedbackOnboarding';
-import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
+import {
+  feedbackOnboardingJsLoader,
+  replayOnboardingJsLoader,
+} from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {t, tct} from 'sentry/locale';
 
 type Params = DocsParams;
@@ -179,6 +182,7 @@ const docs: Docs = {
   onboarding,
   replayOnboardingJsLoader,
   crashReportOnboarding,
+  feedbackOnboardingJsLoader,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/go/echo.tsx b/static/app/gettingStartedDocs/go/echo.tsx
index 173b604def9756..6a975ce40400b5 100644
--- a/static/app/gettingStartedDocs/go/echo.tsx
+++ b/static/app/gettingStartedDocs/go/echo.tsx
@@ -14,7 +14,10 @@ import {
   getCrashReportModalConfigDescription,
   getCrashReportModalIntroduction,
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/feedbackOnboarding';
-import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
+import {
+  feedbackOnboardingJsLoader,
+  replayOnboardingJsLoader,
+} from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {t, tct} from 'sentry/locale';
 
 type Params = DocsParams;
@@ -232,6 +235,7 @@ const docs: Docs = {
   onboarding,
   replayOnboardingJsLoader,
   crashReportOnboarding,
+  feedbackOnboardingJsLoader,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/go/fasthttp.tsx b/static/app/gettingStartedDocs/go/fasthttp.tsx
index 1c66d8fa9e4cb8..0d70c509a8ea99 100644
--- a/static/app/gettingStartedDocs/go/fasthttp.tsx
+++ b/static/app/gettingStartedDocs/go/fasthttp.tsx
@@ -14,7 +14,10 @@ import {
   getCrashReportModalConfigDescription,
   getCrashReportModalIntroduction,
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/feedbackOnboarding';
-import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
+import {
+  feedbackOnboardingJsLoader,
+  replayOnboardingJsLoader,
+} from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {t, tct} from 'sentry/locale';
 
 type Params = DocsParams;
@@ -237,6 +240,7 @@ const docs: Docs = {
   onboarding,
   replayOnboardingJsLoader,
   crashReportOnboarding,
+  feedbackOnboardingJsLoader,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/go/fiber.tsx b/static/app/gettingStartedDocs/go/fiber.tsx
index e2a48887e3700e..8e2a5ba4571483 100644
--- a/static/app/gettingStartedDocs/go/fiber.tsx
+++ b/static/app/gettingStartedDocs/go/fiber.tsx
@@ -14,7 +14,10 @@ import {
   getCrashReportModalConfigDescription,
   getCrashReportModalIntroduction,
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/feedbackOnboarding';
-import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
+import {
+  feedbackOnboardingJsLoader,
+  replayOnboardingJsLoader,
+} from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {t, tct} from 'sentry/locale';
 
 type Params = DocsParams;
@@ -242,6 +245,7 @@ const docs: Docs = {
   onboarding,
   replayOnboardingJsLoader,
   crashReportOnboarding,
+  feedbackOnboardingJsLoader,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/go/gin.tsx b/static/app/gettingStartedDocs/go/gin.tsx
index 3fc2d7edbfc015..7fde4071eb71d4 100644
--- a/static/app/gettingStartedDocs/go/gin.tsx
+++ b/static/app/gettingStartedDocs/go/gin.tsx
@@ -14,7 +14,10 @@ import {
   getCrashReportModalConfigDescription,
   getCrashReportModalIntroduction,
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/feedbackOnboarding';
-import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
+import {
+  feedbackOnboardingJsLoader,
+  replayOnboardingJsLoader,
+} from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {t, tct} from 'sentry/locale';
 
 type Params = DocsParams;
@@ -224,6 +227,7 @@ const docs: Docs = {
   onboarding,
   replayOnboardingJsLoader,
   crashReportOnboarding,
+  feedbackOnboardingJsLoader,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/go/go.tsx b/static/app/gettingStartedDocs/go/go.tsx
index ccc25a4e4ccdaf..7c879a69e43f31 100644
--- a/static/app/gettingStartedDocs/go/go.tsx
+++ b/static/app/gettingStartedDocs/go/go.tsx
@@ -9,7 +9,10 @@ import {
   getCrashReportModalConfigDescription,
   getCrashReportModalIntroduction,
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/feedbackOnboarding';
-import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
+import {
+  feedbackOnboardingJsLoader,
+  replayOnboardingJsLoader,
+} from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {t, tct} from 'sentry/locale';
 
 type Params = DocsParams;
@@ -135,6 +138,7 @@ const docs: Docs = {
   onboarding,
   replayOnboardingJsLoader,
   crashReportOnboarding,
+  feedbackOnboardingJsLoader,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/go/http.tsx b/static/app/gettingStartedDocs/go/http.tsx
index dba8624e4517ea..1b13d957898a89 100644
--- a/static/app/gettingStartedDocs/go/http.tsx
+++ b/static/app/gettingStartedDocs/go/http.tsx
@@ -14,7 +14,10 @@ import {
   getCrashReportModalConfigDescription,
   getCrashReportModalIntroduction,
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/feedbackOnboarding';
-import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
+import {
+  feedbackOnboardingJsLoader,
+  replayOnboardingJsLoader,
+} from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {t, tct} from 'sentry/locale';
 
 type Params = DocsParams;
@@ -232,6 +235,7 @@ const docs: Docs = {
   onboarding,
   replayOnboardingJsLoader,
   crashReportOnboarding,
+  feedbackOnboardingJsLoader,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/go/iris.tsx b/static/app/gettingStartedDocs/go/iris.tsx
index 0e6a34e74b9fe1..255fb375812e91 100644
--- a/static/app/gettingStartedDocs/go/iris.tsx
+++ b/static/app/gettingStartedDocs/go/iris.tsx
@@ -14,7 +14,10 @@ import {
   getCrashReportModalConfigDescription,
   getCrashReportModalIntroduction,
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/feedbackOnboarding';
-import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
+import {
+  feedbackOnboardingJsLoader,
+  replayOnboardingJsLoader,
+} from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {t, tct} from 'sentry/locale';
 
 type Params = DocsParams;
@@ -221,6 +224,7 @@ const docs: Docs = {
   onboarding,
   replayOnboardingJsLoader,
   crashReportOnboarding,
+  feedbackOnboardingJsLoader,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/go/martini.tsx b/static/app/gettingStartedDocs/go/martini.tsx
index 63b00ea361dd74..845137d78a5ce6 100644
--- a/static/app/gettingStartedDocs/go/martini.tsx
+++ b/static/app/gettingStartedDocs/go/martini.tsx
@@ -14,7 +14,10 @@ import {
   getCrashReportModalConfigDescription,
   getCrashReportModalIntroduction,
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/feedbackOnboarding';
-import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
+import {
+  feedbackOnboardingJsLoader,
+  replayOnboardingJsLoader,
+} from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {t, tct} from 'sentry/locale';
 
 type Params = DocsParams;
@@ -219,6 +222,7 @@ const docs: Docs = {
   onboarding,
   replayOnboardingJsLoader,
   crashReportOnboarding,
+  feedbackOnboardingJsLoader,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/go/negroni.tsx b/static/app/gettingStartedDocs/go/negroni.tsx
index ac3c384214311f..163f8c9b11625f 100644
--- a/static/app/gettingStartedDocs/go/negroni.tsx
+++ b/static/app/gettingStartedDocs/go/negroni.tsx
@@ -14,7 +14,10 @@ import {
   getCrashReportModalConfigDescription,
   getCrashReportModalIntroduction,
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/feedbackOnboarding';
-import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
+import {
+  feedbackOnboardingJsLoader,
+  replayOnboardingJsLoader,
+} from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {t, tct} from 'sentry/locale';
 
 type Params = DocsParams;
@@ -283,6 +286,7 @@ const docs: Docs = {
   onboarding,
   replayOnboardingJsLoader,
   crashReportOnboarding,
+  feedbackOnboardingJsLoader,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/java/java.tsx b/static/app/gettingStartedDocs/java/java.tsx
index f236144f27b656..060ee5b67d0cb5 100644
--- a/static/app/gettingStartedDocs/java/java.tsx
+++ b/static/app/gettingStartedDocs/java/java.tsx
@@ -13,7 +13,6 @@ import {
   getCrashReportApiIntroduction,
   getCrashReportInstallDescription,
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/feedbackOnboarding';
-import {getJavaMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
 import {t, tct} from 'sentry/locale';
 import {getPackageVersion} from 'sentry/utils/gettingStartedDocs/getPackageVersion';
 
@@ -343,7 +342,6 @@ const docs: Docs<PlatformOptions> = {
   platformOptions,
   feedbackOnboardingCrashApi: feedbackOnboardingCrashApiJava,
   crashReportOnboarding: feedbackOnboardingCrashApiJava,
-  customMetricsOnboarding: getJavaMetricsOnboarding(),
   onboarding,
 };
 
diff --git a/static/app/gettingStartedDocs/java/log4j2.tsx b/static/app/gettingStartedDocs/java/log4j2.tsx
index 74535e7bff903b..b81d4034a124c0 100644
--- a/static/app/gettingStartedDocs/java/log4j2.tsx
+++ b/static/app/gettingStartedDocs/java/log4j2.tsx
@@ -9,7 +9,6 @@ import type {
   DocsParams,
   OnboardingConfig,
 } from 'sentry/components/onboarding/gettingStartedDoc/types';
-import {getJavaMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
 import {feedbackOnboardingCrashApiJava} from 'sentry/gettingStartedDocs/java/java';
 import {t, tct} from 'sentry/locale';
 import {getPackageVersion} from 'sentry/utils/gettingStartedDocs/getPackageVersion';
@@ -333,7 +332,6 @@ const docs: Docs<PlatformOptions> = {
   platformOptions,
   feedbackOnboardingCrashApi: feedbackOnboardingCrashApiJava,
   crashReportOnboarding: feedbackOnboardingCrashApiJava,
-  customMetricsOnboarding: getJavaMetricsOnboarding(),
   onboarding,
 };
 
diff --git a/static/app/gettingStartedDocs/java/logback.tsx b/static/app/gettingStartedDocs/java/logback.tsx
index 909724e27d39cb..f32b0ee76a26e4 100644
--- a/static/app/gettingStartedDocs/java/logback.tsx
+++ b/static/app/gettingStartedDocs/java/logback.tsx
@@ -9,7 +9,6 @@ import type {
   DocsParams,
   OnboardingConfig,
 } from 'sentry/components/onboarding/gettingStartedDoc/types';
-import {getJavaMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
 import {feedbackOnboardingCrashApiJava} from 'sentry/gettingStartedDocs/java/java';
 import {t, tct} from 'sentry/locale';
 import {getPackageVersion} from 'sentry/utils/gettingStartedDocs/getPackageVersion';
@@ -342,7 +341,6 @@ const docs: Docs<PlatformOptions> = {
   onboarding,
   feedbackOnboardingCrashApi: feedbackOnboardingCrashApiJava,
   crashReportOnboarding: feedbackOnboardingCrashApiJava,
-  customMetricsOnboarding: getJavaMetricsOnboarding(),
   platformOptions,
 };
 
diff --git a/static/app/gettingStartedDocs/java/spring-boot.tsx b/static/app/gettingStartedDocs/java/spring-boot.tsx
index 7acd0784ea000b..6a09f67afd806a 100644
--- a/static/app/gettingStartedDocs/java/spring-boot.tsx
+++ b/static/app/gettingStartedDocs/java/spring-boot.tsx
@@ -9,9 +9,11 @@ import type {
   DocsParams,
   OnboardingConfig,
 } from 'sentry/components/onboarding/gettingStartedDoc/types';
-import {getJavaMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
 import {feedbackOnboardingCrashApiJava} from 'sentry/gettingStartedDocs/java/java';
-import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
+import {
+  feedbackOnboardingJsLoader,
+  replayOnboardingJsLoader,
+} from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {t, tct} from 'sentry/locale';
 import {getPackageVersion} from 'sentry/utils/gettingStartedDocs/getPackageVersion';
 
@@ -296,7 +298,7 @@ const docs: Docs<PlatformOptions> = {
   platformOptions,
   replayOnboardingJsLoader,
   crashReportOnboarding: feedbackOnboardingCrashApiJava,
-  customMetricsOnboarding: getJavaMetricsOnboarding(),
+  feedbackOnboardingJsLoader,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/java/spring.tsx b/static/app/gettingStartedDocs/java/spring.tsx
index 024aab936db9d8..babb60c7acfc14 100644
--- a/static/app/gettingStartedDocs/java/spring.tsx
+++ b/static/app/gettingStartedDocs/java/spring.tsx
@@ -9,9 +9,11 @@ import type {
   DocsParams,
   OnboardingConfig,
 } from 'sentry/components/onboarding/gettingStartedDoc/types';
-import {getJavaMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
 import {feedbackOnboardingCrashApiJava} from 'sentry/gettingStartedDocs/java/java';
-import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
+import {
+  feedbackOnboardingJsLoader,
+  replayOnboardingJsLoader,
+} from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {t, tct} from 'sentry/locale';
 import {getPackageVersion} from 'sentry/utils/gettingStartedDocs/getPackageVersion';
 
@@ -369,7 +371,7 @@ const docs: Docs<PlatformOptions> = {
   platformOptions,
   crashReportOnboarding: feedbackOnboardingCrashApiJava,
   replayOnboardingJsLoader,
-  customMetricsOnboarding: getJavaMetricsOnboarding(),
+  feedbackOnboardingJsLoader,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/javascript/angular.spec.tsx b/static/app/gettingStartedDocs/javascript/angular.spec.tsx
index 8ae6ab47ca97b6..f611735ece3c37 100644
--- a/static/app/gettingStartedDocs/javascript/angular.spec.tsx
+++ b/static/app/gettingStartedDocs/javascript/angular.spec.tsx
@@ -37,13 +37,13 @@ describe('javascript-angular onboarding docs', function () {
     });
 
     expect(
-      screen.queryByText(textWithMarkupMatcher(/tracesSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/tracesSampleRate/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/replaysSessionSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/replaysSessionSampleRate/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/replaysOnErrorSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/replaysOnErrorSampleRate/))
     ).toBeInTheDocument();
   });
 
diff --git a/static/app/gettingStartedDocs/javascript/angular.tsx b/static/app/gettingStartedDocs/javascript/angular.tsx
index 69ce7090e61b91..bc81bf044ca74b 100644
--- a/static/app/gettingStartedDocs/javascript/angular.tsx
+++ b/static/app/gettingStartedDocs/javascript/angular.tsx
@@ -474,7 +474,7 @@ const docs: Docs<PlatformOptions> = {
   crashReportOnboarding,
   platformOptions,
   profilingOnboarding,
-  featureFlagOnboarding: featureFlagOnboarding,
+  featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/javascript/astro.tsx b/static/app/gettingStartedDocs/javascript/astro.tsx
index cdb2b2ae12948f..ee3b67b9c8fc93 100644
--- a/static/app/gettingStartedDocs/javascript/astro.tsx
+++ b/static/app/gettingStartedDocs/javascript/astro.tsx
@@ -212,7 +212,7 @@ const onboarding: OnboardingConfig = {
 const replayOnboarding: OnboardingConfig = {
   install: () => [
     {
-      ...getInstallConfig()[0],
+      ...getInstallConfig()[0]!,
       additionalInfo:
         'Session Replay is enabled by default when you install the Astro SDK!',
     },
@@ -379,7 +379,7 @@ const docs: Docs = {
   replayOnboarding,
   customMetricsOnboarding: getJSMetricsOnboarding({getInstallConfig}),
   crashReportOnboarding,
-  featureFlagOnboarding: featureFlagOnboarding,
+  featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/javascript/ember.spec.tsx b/static/app/gettingStartedDocs/javascript/ember.spec.tsx
index 8f431f9e8e7d8e..a3370015d3e053 100644
--- a/static/app/gettingStartedDocs/javascript/ember.spec.tsx
+++ b/static/app/gettingStartedDocs/javascript/ember.spec.tsx
@@ -32,13 +32,13 @@ describe('javascript-ember onboarding docs', function () {
     });
 
     expect(
-      screen.queryByText(textWithMarkupMatcher(/tracesSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/tracesSampleRate/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/replaysSessionSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/replaysSessionSampleRate/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/replaysOnErrorSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/replaysOnErrorSampleRate/))
     ).toBeInTheDocument();
   });
 
diff --git a/static/app/gettingStartedDocs/javascript/ember.tsx b/static/app/gettingStartedDocs/javascript/ember.tsx
index 2f015dcf5a0fdb..b145037dfe2ff4 100644
--- a/static/app/gettingStartedDocs/javascript/ember.tsx
+++ b/static/app/gettingStartedDocs/javascript/ember.tsx
@@ -293,7 +293,7 @@ const docs: Docs = {
   customMetricsOnboarding: getJSMetricsOnboarding({getInstallConfig}),
   crashReportOnboarding,
   profilingOnboarding,
-  featureFlagOnboarding: featureFlagOnboarding,
+  featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/javascript/gatsby.spec.tsx b/static/app/gettingStartedDocs/javascript/gatsby.spec.tsx
index bdb147ed4a0d1b..7a910b7ad7f826 100644
--- a/static/app/gettingStartedDocs/javascript/gatsby.spec.tsx
+++ b/static/app/gettingStartedDocs/javascript/gatsby.spec.tsx
@@ -34,13 +34,13 @@ describe('javascript-gatsby onboarding docs', function () {
     });
 
     expect(
-      screen.queryByText(textWithMarkupMatcher(/tracesSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/tracesSampleRate/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/replaysSessionSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/replaysSessionSampleRate/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/replaysOnErrorSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/replaysOnErrorSampleRate/))
     ).toBeInTheDocument();
   });
 
diff --git a/static/app/gettingStartedDocs/javascript/gatsby.tsx b/static/app/gettingStartedDocs/javascript/gatsby.tsx
index f09be5ea3a51c8..10550df8ca30f4 100644
--- a/static/app/gettingStartedDocs/javascript/gatsby.tsx
+++ b/static/app/gettingStartedDocs/javascript/gatsby.tsx
@@ -322,7 +322,7 @@ const docs: Docs = {
   customMetricsOnboarding: getJSMetricsOnboarding({getInstallConfig}),
   crashReportOnboarding,
   profilingOnboarding,
-  featureFlagOnboarding: featureFlagOnboarding,
+  featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/javascript/javascript.spec.tsx b/static/app/gettingStartedDocs/javascript/javascript.spec.tsx
index 5e2a593bdd454f..80f378217cfa83 100644
--- a/static/app/gettingStartedDocs/javascript/javascript.spec.tsx
+++ b/static/app/gettingStartedDocs/javascript/javascript.spec.tsx
@@ -41,13 +41,13 @@ describe('javascript onboarding docs', function () {
     });
 
     expect(
-      screen.queryByText(textWithMarkupMatcher(/tracesSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/tracesSampleRate/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/replaysSessionSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/replaysSessionSampleRate/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/replaysOnErrorSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/replaysOnErrorSampleRate/))
     ).toBeInTheDocument();
   });
 
diff --git a/static/app/gettingStartedDocs/javascript/javascript.tsx b/static/app/gettingStartedDocs/javascript/javascript.tsx
index 12894d782401e0..2391e9228fe8eb 100644
--- a/static/app/gettingStartedDocs/javascript/javascript.tsx
+++ b/static/app/gettingStartedDocs/javascript/javascript.tsx
@@ -30,7 +30,10 @@ import {
   getReplayConfigureDescription,
   getReplayVerifyStep,
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/replayOnboarding';
-import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
+import {
+  feedbackOnboardingJsLoader,
+  replayOnboardingJsLoader,
+} from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {t, tct} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import {trackAnalytics} from 'sentry/utils/analytics';
@@ -683,6 +686,7 @@ ${FLAG_OPTIONS[featureFlagOptions.integration].sdkInit}
 const docs: Docs<PlatformOptions> = {
   onboarding,
   feedbackOnboardingNpm: feedbackOnboarding,
+  feedbackOnboardingJsLoader,
   replayOnboarding,
   replayOnboardingJsLoader,
   performanceOnboarding,
diff --git a/static/app/gettingStartedDocs/javascript/jsLoader/jsLoader.tsx b/static/app/gettingStartedDocs/javascript/jsLoader/jsLoader.tsx
index 02259ed121e7bf..7b42028576fa01 100644
--- a/static/app/gettingStartedDocs/javascript/jsLoader/jsLoader.tsx
+++ b/static/app/gettingStartedDocs/javascript/jsLoader/jsLoader.tsx
@@ -60,6 +60,71 @@ const getVerifySnippet = () => `
   });
 </script>`;
 
+const feedbackOnboardingJsLoader: OnboardingConfig = {
+  install: (params: Params) => [
+    {
+      type: StepType.INSTALL,
+      configurations: [
+        {
+          description: t('Add this script tag to the top of the page:'),
+          language: 'html',
+          code: beautify.html(
+            `<script src="${params.dsn.cdn}" crossorigin="anonymous"></script>`,
+            {indent_size: 2, wrap_attributes: 'force-expand-multiline'}
+          ),
+        },
+      ],
+    },
+  ],
+  configure: () => [
+    {
+      type: StepType.CONFIGURE,
+      description: t(
+        'When using the Loader Script, you can lazy load the User Feedback integration like this:'
+      ),
+      configurations: [
+        {
+          code: [
+            {
+              label: 'JavaScript',
+              value: 'javascript',
+              language: 'javascript',
+              code: `
+window.sentryOnLoad = function () {
+  Sentry.init({
+    // add other configuration here
+  });
+
+  Sentry.lazyLoadIntegration("feedbackIntegration")
+    .then((feedbackIntegration) => {
+      Sentry.addIntegration(feedbackIntegration({
+      	// User Feedback configuration options
+      }));
+    })
+    .catch(() => {
+      // this can happen if e.g. a network error occurs,
+      // in this case User Feedback will not be enabled
+    });
+};
+              `,
+            },
+          ],
+        },
+      ],
+      additionalInfo: tct(
+        `For a full list of User Feedback configuration options, [link:read the docs].`,
+        {
+          link: (
+            <ExternalLink href="https://docs.sentry.io/platforms/javascript/user-feedback/configuration/" />
+          ),
+        }
+      ),
+    },
+  ],
+  verify: () => [],
+  nextSteps: () => [],
+};
+
 const replayOnboardingJsLoader: OnboardingConfig = {
   install: (params: Params) => getInstallConfig(params),
   configure: (params: Params) => [
@@ -103,4 +168,4 @@ const StyledAlert = styled(Alert)`
   margin: 0;
 `;
 
-export default replayOnboardingJsLoader;
+export {feedbackOnboardingJsLoader, replayOnboardingJsLoader};
diff --git a/static/app/gettingStartedDocs/javascript/nextjs.spec.tsx b/static/app/gettingStartedDocs/javascript/nextjs.spec.tsx
index 9f24cae07b7500..bd09ca8433f325 100644
--- a/static/app/gettingStartedDocs/javascript/nextjs.spec.tsx
+++ b/static/app/gettingStartedDocs/javascript/nextjs.spec.tsx
@@ -31,7 +31,7 @@ describe('javascript-nextjs onboarding docs', function () {
     });
 
     expect(
-      screen.queryByText(textWithMarkupMatcher(/sentry-example-page/))
+      screen.getByText(textWithMarkupMatcher(/sentry-example-page/))
     ).toBeInTheDocument();
   });
 });
diff --git a/static/app/gettingStartedDocs/javascript/nextjs.tsx b/static/app/gettingStartedDocs/javascript/nextjs.tsx
index f66cf459579809..d941af83f6f7b4 100644
--- a/static/app/gettingStartedDocs/javascript/nextjs.tsx
+++ b/static/app/gettingStartedDocs/javascript/nextjs.tsx
@@ -425,7 +425,7 @@ const docs: Docs = {
   }),
   performanceOnboarding,
   crashReportOnboarding,
-  featureFlagOnboarding: featureFlagOnboarding,
+  featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/javascript/nuxt.spec.tsx b/static/app/gettingStartedDocs/javascript/nuxt.spec.tsx
index c3796f6848e834..883bb5c9354bb6 100644
--- a/static/app/gettingStartedDocs/javascript/nuxt.spec.tsx
+++ b/static/app/gettingStartedDocs/javascript/nuxt.spec.tsx
@@ -37,7 +37,7 @@ describe('javascript-nuxt onboarding docs', function () {
     });
 
     expect(
-      screen.queryByText(textWithMarkupMatcher(/sentry-example-page/))
+      screen.getByText(textWithMarkupMatcher(/sentry-example-page/))
     ).toBeInTheDocument();
   });
 });
diff --git a/static/app/gettingStartedDocs/javascript/nuxt.tsx b/static/app/gettingStartedDocs/javascript/nuxt.tsx
index 09d11fe6157697..a1ce40665ad5e8 100644
--- a/static/app/gettingStartedDocs/javascript/nuxt.tsx
+++ b/static/app/gettingStartedDocs/javascript/nuxt.tsx
@@ -264,7 +264,7 @@ const docs: Docs = {
   customMetricsOnboarding: getJSMetricsOnboarding({getInstallConfig}),
   crashReportOnboarding,
   profilingOnboarding,
-  featureFlagOnboarding: featureFlagOnboarding,
+  featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/javascript/react.spec.tsx b/static/app/gettingStartedDocs/javascript/react.spec.tsx
index 89688044b8e7e4..14044a20e69c69 100644
--- a/static/app/gettingStartedDocs/javascript/react.spec.tsx
+++ b/static/app/gettingStartedDocs/javascript/react.spec.tsx
@@ -32,13 +32,13 @@ describe('javascript-react onboarding docs', function () {
     });
 
     expect(
-      screen.queryByText(textWithMarkupMatcher(/tracesSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/tracesSampleRate/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/replaysSessionSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/replaysSessionSampleRate/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/replaysOnErrorSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/replaysOnErrorSampleRate/))
     ).toBeInTheDocument();
   });
 
diff --git a/static/app/gettingStartedDocs/javascript/react.tsx b/static/app/gettingStartedDocs/javascript/react.tsx
index 6768b95d467ea3..ebf49acf362cd5 100644
--- a/static/app/gettingStartedDocs/javascript/react.tsx
+++ b/static/app/gettingStartedDocs/javascript/react.tsx
@@ -431,7 +431,7 @@ const docs: Docs = {
   performanceOnboarding,
   crashReportOnboarding,
   profilingOnboarding,
-  featureFlagOnboarding: featureFlagOnboarding,
+  featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/javascript/remix.tsx b/static/app/gettingStartedDocs/javascript/remix.tsx
index 10005884f88ea9..958cbce997375e 100644
--- a/static/app/gettingStartedDocs/javascript/remix.tsx
+++ b/static/app/gettingStartedDocs/javascript/remix.tsx
@@ -289,7 +289,7 @@ const docs: Docs = {
   replayOnboarding,
   customMetricsOnboarding: getJSMetricsOnboarding({getInstallConfig}),
   crashReportOnboarding,
-  featureFlagOnboarding: featureFlagOnboarding,
+  featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/javascript/solid.spec.tsx b/static/app/gettingStartedDocs/javascript/solid.spec.tsx
index ebe81275c36ee9..15b72aeb728bab 100644
--- a/static/app/gettingStartedDocs/javascript/solid.spec.tsx
+++ b/static/app/gettingStartedDocs/javascript/solid.spec.tsx
@@ -32,13 +32,13 @@ describe('javascript-solid onboarding docs', function () {
     });
 
     expect(
-      screen.queryByText(textWithMarkupMatcher(/tracesSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/tracesSampleRate/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/replaysSessionSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/replaysSessionSampleRate/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/replaysOnErrorSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/replaysOnErrorSampleRate/))
     ).toBeInTheDocument();
   });
 
diff --git a/static/app/gettingStartedDocs/javascript/solid.tsx b/static/app/gettingStartedDocs/javascript/solid.tsx
index 08f96fa3bde531..8b702507d61251 100644
--- a/static/app/gettingStartedDocs/javascript/solid.tsx
+++ b/static/app/gettingStartedDocs/javascript/solid.tsx
@@ -324,7 +324,7 @@ const docs: Docs = {
   customMetricsOnboarding: getJSMetricsOnboarding({getInstallConfig}),
   crashReportOnboarding,
   profilingOnboarding,
-  featureFlagOnboarding: featureFlagOnboarding,
+  featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/javascript/solidstart.tsx b/static/app/gettingStartedDocs/javascript/solidstart.tsx
index 610cd710478cf9..6513af9ba414d5 100644
--- a/static/app/gettingStartedDocs/javascript/solidstart.tsx
+++ b/static/app/gettingStartedDocs/javascript/solidstart.tsx
@@ -503,7 +503,7 @@ const docs: Docs = {
   customMetricsOnboarding: getJSMetricsOnboarding({getInstallConfig}),
   crashReportOnboarding,
   profilingOnboarding,
-  featureFlagOnboarding: featureFlagOnboarding,
+  featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/javascript/svelte.spec.tsx b/static/app/gettingStartedDocs/javascript/svelte.spec.tsx
index 5f60c6747b2fbe..238d714eb3251d 100644
--- a/static/app/gettingStartedDocs/javascript/svelte.spec.tsx
+++ b/static/app/gettingStartedDocs/javascript/svelte.spec.tsx
@@ -34,13 +34,13 @@ describe('javascript-svelte onboarding docs', function () {
     });
 
     expect(
-      screen.queryByText(textWithMarkupMatcher(/tracesSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/tracesSampleRate/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/replaysSessionSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/replaysSessionSampleRate/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/replaysOnErrorSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/replaysOnErrorSampleRate/))
     ).toBeInTheDocument();
   });
 
diff --git a/static/app/gettingStartedDocs/javascript/svelte.tsx b/static/app/gettingStartedDocs/javascript/svelte.tsx
index 37f72b7c8be392..5caf892736cf22 100644
--- a/static/app/gettingStartedDocs/javascript/svelte.tsx
+++ b/static/app/gettingStartedDocs/javascript/svelte.tsx
@@ -319,7 +319,7 @@ const docs: Docs = {
   customMetricsOnboarding: getJSMetricsOnboarding({getInstallConfig}),
   crashReportOnboarding,
   profilingOnboarding,
-  featureFlagOnboarding: featureFlagOnboarding,
+  featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/javascript/sveltekit.spec.tsx b/static/app/gettingStartedDocs/javascript/sveltekit.spec.tsx
index 8157e2dead41ca..beac102e904b39 100644
--- a/static/app/gettingStartedDocs/javascript/sveltekit.spec.tsx
+++ b/static/app/gettingStartedDocs/javascript/sveltekit.spec.tsx
@@ -31,7 +31,7 @@ describe('javascript-sveltekit onboarding docs', function () {
     });
 
     expect(
-      screen.queryByText(textWithMarkupMatcher(/sentry-example-page/))
+      screen.getByText(textWithMarkupMatcher(/sentry-example-page/))
     ).toBeInTheDocument();
   });
 });
diff --git a/static/app/gettingStartedDocs/javascript/sveltekit.tsx b/static/app/gettingStartedDocs/javascript/sveltekit.tsx
index 29e364a3baf97c..2a3afb29e869bc 100644
--- a/static/app/gettingStartedDocs/javascript/sveltekit.tsx
+++ b/static/app/gettingStartedDocs/javascript/sveltekit.tsx
@@ -256,7 +256,7 @@ const docs: Docs = {
   replayOnboarding,
   customMetricsOnboarding: getJSMetricsOnboarding({getInstallConfig}),
   crashReportOnboarding,
-  featureFlagOnboarding: featureFlagOnboarding,
+  featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/javascript/vue.spec.tsx b/static/app/gettingStartedDocs/javascript/vue.spec.tsx
index 7c9d64c3f33300..7f2dbe3fd74f39 100644
--- a/static/app/gettingStartedDocs/javascript/vue.spec.tsx
+++ b/static/app/gettingStartedDocs/javascript/vue.spec.tsx
@@ -32,13 +32,13 @@ describe('javascript-vue onboarding docs', function () {
     });
 
     expect(
-      screen.queryByText(textWithMarkupMatcher(/tracesSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/tracesSampleRate/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/replaysSessionSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/replaysSessionSampleRate/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/replaysOnErrorSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/replaysOnErrorSampleRate/))
     ).toBeInTheDocument();
   });
 
diff --git a/static/app/gettingStartedDocs/javascript/vue.tsx b/static/app/gettingStartedDocs/javascript/vue.tsx
index 691b1b5b8788a1..b74669bc886999 100644
--- a/static/app/gettingStartedDocs/javascript/vue.tsx
+++ b/static/app/gettingStartedDocs/javascript/vue.tsx
@@ -362,7 +362,7 @@ const docs: Docs<PlatformOptions> = {
   customMetricsOnboarding: getJSMetricsOnboarding({getInstallConfig}),
   crashReportOnboarding,
   profilingOnboarding,
-  featureFlagOnboarding: featureFlagOnboarding,
+  featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/node/awslambda.spec.tsx b/static/app/gettingStartedDocs/node/awslambda.spec.tsx
index cd3213c07825de..18646055bf6cff 100644
--- a/static/app/gettingStartedDocs/node/awslambda.spec.tsx
+++ b/static/app/gettingStartedDocs/node/awslambda.spec.tsx
@@ -37,10 +37,10 @@ describe('awslambda onboarding docs', function () {
     });
 
     expect(
-      screen.queryByText(textWithMarkupMatcher(/tracesSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/tracesSampleRate/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/profilesSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/profilesSampleRate/))
     ).toBeInTheDocument();
   });
 
@@ -102,10 +102,10 @@ describe('awslambda onboarding docs', function () {
 
     // Should have start and stop profiling calls
     expect(
-      screen.queryByText(textWithMarkupMatcher(/Sentry.profiler.startProfiler/))
+      screen.getByText(textWithMarkupMatcher(/Sentry.profiler.startProfiler/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/Sentry.profiler.stopProfiler/))
+      screen.getByText(textWithMarkupMatcher(/Sentry.profiler.stopProfiler/))
     ).toBeInTheDocument();
   });
 });
diff --git a/static/app/gettingStartedDocs/node/azurefunctions.spec.tsx b/static/app/gettingStartedDocs/node/azurefunctions.spec.tsx
index 070ce8cdacf8b1..0be8c2479b1342 100644
--- a/static/app/gettingStartedDocs/node/azurefunctions.spec.tsx
+++ b/static/app/gettingStartedDocs/node/azurefunctions.spec.tsx
@@ -36,10 +36,10 @@ describe('express onboarding docs', function () {
     });
 
     expect(
-      screen.queryByText(textWithMarkupMatcher(/tracesSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/tracesSampleRate/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/profilesSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/profilesSampleRate/))
     ).toBeInTheDocument();
   });
 
@@ -101,10 +101,10 @@ describe('express onboarding docs', function () {
 
     // Should have start and stop profiling calls
     expect(
-      screen.queryByText(textWithMarkupMatcher(/Sentry.profiler.startProfiler/))
+      screen.getByText(textWithMarkupMatcher(/Sentry.profiler.startProfiler/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/Sentry.profiler.stopProfiler/))
+      screen.getByText(textWithMarkupMatcher(/Sentry.profiler.stopProfiler/))
     ).toBeInTheDocument();
   });
 });
diff --git a/static/app/gettingStartedDocs/node/connect.spec.tsx b/static/app/gettingStartedDocs/node/connect.spec.tsx
index 76148142544a28..bceffca3f90f27 100644
--- a/static/app/gettingStartedDocs/node/connect.spec.tsx
+++ b/static/app/gettingStartedDocs/node/connect.spec.tsx
@@ -44,10 +44,10 @@ describe('connect onboarding docs', function () {
     });
 
     expect(
-      screen.queryByText(textWithMarkupMatcher(/tracesSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/tracesSampleRate/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/profilesSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/profilesSampleRate/))
     ).toBeInTheDocument();
   });
 
@@ -109,10 +109,10 @@ describe('connect onboarding docs', function () {
 
     // Should have start and stop profiling calls
     expect(
-      screen.queryByText(textWithMarkupMatcher(/Sentry.profiler.startProfiler/))
+      screen.getByText(textWithMarkupMatcher(/Sentry.profiler.startProfiler/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/Sentry.profiler.stopProfiler/))
+      screen.getByText(textWithMarkupMatcher(/Sentry.profiler.stopProfiler/))
     ).toBeInTheDocument();
   });
 });
diff --git a/static/app/gettingStartedDocs/node/express.spec.tsx b/static/app/gettingStartedDocs/node/express.spec.tsx
index 5eefc56c1a2d3d..416d6a0fbf7ce9 100644
--- a/static/app/gettingStartedDocs/node/express.spec.tsx
+++ b/static/app/gettingStartedDocs/node/express.spec.tsx
@@ -45,10 +45,10 @@ describe('express onboarding docs', function () {
     });
 
     expect(
-      screen.queryByText(textWithMarkupMatcher(/tracesSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/tracesSampleRate/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/profilesSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/profilesSampleRate/))
     ).toBeInTheDocument();
   });
 
@@ -109,10 +109,10 @@ describe('express onboarding docs', function () {
 
     // Should have start and stop profiling calls
     expect(
-      screen.queryByText(textWithMarkupMatcher(/Sentry.profiler.startProfiler/))
+      screen.getByText(textWithMarkupMatcher(/Sentry.profiler.startProfiler/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/Sentry.profiler.stopProfiler/))
+      screen.getByText(textWithMarkupMatcher(/Sentry.profiler.stopProfiler/))
     ).toBeInTheDocument();
   });
 });
diff --git a/static/app/gettingStartedDocs/node/express.tsx b/static/app/gettingStartedDocs/node/express.tsx
index e3a9c10cf926d3..1b6e474ccb868a 100644
--- a/static/app/gettingStartedDocs/node/express.tsx
+++ b/static/app/gettingStartedDocs/node/express.tsx
@@ -12,7 +12,10 @@ import {
   getCrashReportModalIntroduction,
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/feedbackOnboarding';
 import {getJSServerMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
-import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
+import {
+  feedbackOnboardingJsLoader,
+  replayOnboardingJsLoader,
+} from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {t, tct} from 'sentry/locale';
 import {
   getImportInstrumentSnippet,
@@ -156,6 +159,7 @@ const docs: Docs = {
   replayOnboardingJsLoader,
   customMetricsOnboarding: getJSServerMetricsOnboarding(),
   crashReportOnboarding,
+  feedbackOnboardingJsLoader,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/node/fastify.spec.tsx b/static/app/gettingStartedDocs/node/fastify.spec.tsx
index ed1e4fac370c44..79e6cfb25ddd75 100644
--- a/static/app/gettingStartedDocs/node/fastify.spec.tsx
+++ b/static/app/gettingStartedDocs/node/fastify.spec.tsx
@@ -45,10 +45,10 @@ describe('fastify onboarding docs', function () {
     });
 
     expect(
-      screen.queryByText(textWithMarkupMatcher(/tracesSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/tracesSampleRate/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/profilesSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/profilesSampleRate/))
     ).toBeInTheDocument();
   });
 
@@ -110,10 +110,10 @@ describe('fastify onboarding docs', function () {
 
     // Should have start and stop profiling calls
     expect(
-      screen.queryByText(textWithMarkupMatcher(/Sentry.profiler.startProfiler/))
+      screen.getByText(textWithMarkupMatcher(/Sentry.profiler.startProfiler/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/Sentry.profiler.stopProfiler/))
+      screen.getByText(textWithMarkupMatcher(/Sentry.profiler.stopProfiler/))
     ).toBeInTheDocument();
   });
 });
diff --git a/static/app/gettingStartedDocs/node/fastify.tsx b/static/app/gettingStartedDocs/node/fastify.tsx
index 088042b1e0ebb9..5bc407a89aa40a 100644
--- a/static/app/gettingStartedDocs/node/fastify.tsx
+++ b/static/app/gettingStartedDocs/node/fastify.tsx
@@ -12,7 +12,10 @@ import {
   getCrashReportModalIntroduction,
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/feedbackOnboarding';
 import {getJSServerMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
-import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
+import {
+  feedbackOnboardingJsLoader,
+  replayOnboardingJsLoader,
+} from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {t, tct} from 'sentry/locale';
 import {
   getImportInstrumentSnippet,
@@ -142,6 +145,7 @@ const docs: Docs = {
   replayOnboardingJsLoader,
   customMetricsOnboarding: getJSServerMetricsOnboarding(),
   crashReportOnboarding,
+  feedbackOnboardingJsLoader,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/node/gcpfunctions.spec.tsx b/static/app/gettingStartedDocs/node/gcpfunctions.spec.tsx
index 4febd7e1acd019..29d76c707185f5 100644
--- a/static/app/gettingStartedDocs/node/gcpfunctions.spec.tsx
+++ b/static/app/gettingStartedDocs/node/gcpfunctions.spec.tsx
@@ -39,10 +39,10 @@ describe('gcpfunctions onboarding docs', function () {
     });
 
     expect(
-      screen.queryByText(textWithMarkupMatcher(/tracesSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/tracesSampleRate/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/profilesSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/profilesSampleRate/))
     ).toBeInTheDocument();
   });
 
@@ -104,10 +104,10 @@ describe('gcpfunctions onboarding docs', function () {
 
     // Should have start and stop profiling calls
     expect(
-      screen.queryByText(textWithMarkupMatcher(/Sentry.profiler.startProfiler/))
+      screen.getByText(textWithMarkupMatcher(/Sentry.profiler.startProfiler/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/Sentry.profiler.stopProfiler/))
+      screen.getByText(textWithMarkupMatcher(/Sentry.profiler.stopProfiler/))
     ).toBeInTheDocument();
   });
 });
diff --git a/static/app/gettingStartedDocs/node/hapi.spec.tsx b/static/app/gettingStartedDocs/node/hapi.spec.tsx
index a5cfae4a703f1c..e85b6c1456cf12 100644
--- a/static/app/gettingStartedDocs/node/hapi.spec.tsx
+++ b/static/app/gettingStartedDocs/node/hapi.spec.tsx
@@ -45,10 +45,10 @@ describe('hapi onboarding docs', function () {
     });
 
     expect(
-      screen.queryByText(textWithMarkupMatcher(/tracesSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/tracesSampleRate/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/profilesSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/profilesSampleRate/))
     ).toBeInTheDocument();
   });
 
@@ -110,10 +110,10 @@ describe('hapi onboarding docs', function () {
 
     // Should have start and stop profiling calls
     expect(
-      screen.queryByText(textWithMarkupMatcher(/Sentry.profiler.startProfiler/))
+      screen.getByText(textWithMarkupMatcher(/Sentry.profiler.startProfiler/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/Sentry.profiler.stopProfiler/))
+      screen.getByText(textWithMarkupMatcher(/Sentry.profiler.stopProfiler/))
     ).toBeInTheDocument();
   });
 });
diff --git a/static/app/gettingStartedDocs/node/koa.spec.tsx b/static/app/gettingStartedDocs/node/koa.spec.tsx
index 1c85e31199882d..500bc40dfb973e 100644
--- a/static/app/gettingStartedDocs/node/koa.spec.tsx
+++ b/static/app/gettingStartedDocs/node/koa.spec.tsx
@@ -45,10 +45,10 @@ describe('koa onboarding docs', function () {
     });
 
     expect(
-      screen.queryByText(textWithMarkupMatcher(/tracesSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/tracesSampleRate/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/profilesSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/profilesSampleRate/))
     ).toBeInTheDocument();
   });
 
@@ -110,10 +110,10 @@ describe('koa onboarding docs', function () {
 
     // Should have start and stop profiling calls
     expect(
-      screen.queryByText(textWithMarkupMatcher(/Sentry.profiler.startProfiler/))
+      screen.getByText(textWithMarkupMatcher(/Sentry.profiler.startProfiler/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/Sentry.profiler.stopProfiler/))
+      screen.getByText(textWithMarkupMatcher(/Sentry.profiler.stopProfiler/))
     ).toBeInTheDocument();
   });
 });
diff --git a/static/app/gettingStartedDocs/node/nestjs.spec.tsx b/static/app/gettingStartedDocs/node/nestjs.spec.tsx
index 3dc29fce435acb..a703a91462068b 100644
--- a/static/app/gettingStartedDocs/node/nestjs.spec.tsx
+++ b/static/app/gettingStartedDocs/node/nestjs.spec.tsx
@@ -45,10 +45,10 @@ describe('Nest.js onboarding docs', function () {
     });
 
     expect(
-      screen.queryByText(textWithMarkupMatcher(/tracesSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/tracesSampleRate/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/profilesSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/profilesSampleRate/))
     ).toBeInTheDocument();
   });
 
@@ -110,10 +110,10 @@ describe('Nest.js onboarding docs', function () {
 
     // Should have start and stop profiling calls
     expect(
-      screen.queryByText(textWithMarkupMatcher(/Sentry.profiler.startProfiler/))
+      screen.getByText(textWithMarkupMatcher(/Sentry.profiler.startProfiler/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/Sentry.profiler.stopProfiler/))
+      screen.getByText(textWithMarkupMatcher(/Sentry.profiler.stopProfiler/))
     ).toBeInTheDocument();
   });
 });
diff --git a/static/app/gettingStartedDocs/node/node.spec.tsx b/static/app/gettingStartedDocs/node/node.spec.tsx
index 74b553a342365b..0193ae6224a1c3 100644
--- a/static/app/gettingStartedDocs/node/node.spec.tsx
+++ b/static/app/gettingStartedDocs/node/node.spec.tsx
@@ -37,10 +37,10 @@ describe('node onboarding docs', function () {
     });
 
     expect(
-      screen.queryByText(textWithMarkupMatcher(/tracesSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/tracesSampleRate/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/profilesSampleRate/))
+      screen.getByText(textWithMarkupMatcher(/profilesSampleRate/))
     ).toBeInTheDocument();
   });
 
@@ -102,10 +102,10 @@ describe('node onboarding docs', function () {
 
     // Should have start and stop profiling calls
     expect(
-      screen.queryByText(textWithMarkupMatcher(/Sentry.profiler.startProfiler/))
+      screen.getByText(textWithMarkupMatcher(/Sentry.profiler.startProfiler/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/Sentry.profiler.stopProfiler/))
+      screen.getByText(textWithMarkupMatcher(/Sentry.profiler.stopProfiler/))
     ).toBeInTheDocument();
   });
 });
diff --git a/static/app/gettingStartedDocs/node/node.tsx b/static/app/gettingStartedDocs/node/node.tsx
index 63f6538f2f35e8..3a0d77609d97a2 100644
--- a/static/app/gettingStartedDocs/node/node.tsx
+++ b/static/app/gettingStartedDocs/node/node.tsx
@@ -12,7 +12,10 @@ import {
   getCrashReportModalIntroduction,
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/feedbackOnboarding';
 import {getJSServerMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
-import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
+import {
+  feedbackOnboardingJsLoader,
+  replayOnboardingJsLoader,
+} from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {t, tct} from 'sentry/locale';
 import {
   getImportInstrumentSnippet,
@@ -252,6 +255,7 @@ const docs: Docs = {
   performanceOnboarding,
   crashReportOnboarding,
   profilingOnboarding,
+  feedbackOnboardingJsLoader,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/php/laravel.tsx b/static/app/gettingStartedDocs/php/laravel.tsx
index 2896cbf29538c7..609eb5303e3ee9 100644
--- a/static/app/gettingStartedDocs/php/laravel.tsx
+++ b/static/app/gettingStartedDocs/php/laravel.tsx
@@ -13,7 +13,10 @@ import {
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/feedbackOnboarding';
 import exampleSnippets from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsExampleSnippets';
 import {metricTagsExplanation} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
-import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
+import {
+  feedbackOnboardingJsLoader,
+  replayOnboardingJsLoader,
+} from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {t, tct} from 'sentry/locale';
 
 type Params = DocsParams;
@@ -368,6 +371,7 @@ const docs: Docs = {
   replayOnboardingJsLoader,
   customMetricsOnboarding,
   crashReportOnboarding,
+  feedbackOnboardingJsLoader,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/php/php.tsx b/static/app/gettingStartedDocs/php/php.tsx
index a4ebd8dd35cf46..7e8195dffe1b4c 100644
--- a/static/app/gettingStartedDocs/php/php.tsx
+++ b/static/app/gettingStartedDocs/php/php.tsx
@@ -13,7 +13,10 @@ import {
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/feedbackOnboarding';
 import exampleSnippets from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsExampleSnippets';
 import {metricTagsExplanation} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
-import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
+import {
+  feedbackOnboardingJsLoader,
+  replayOnboardingJsLoader,
+} from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {t, tct} from 'sentry/locale';
 
 type Params = DocsParams;
@@ -332,6 +335,7 @@ const docs: Docs = {
   customMetricsOnboarding,
   performanceOnboarding,
   crashReportOnboarding,
+  feedbackOnboardingJsLoader,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/php/symfony.tsx b/static/app/gettingStartedDocs/php/symfony.tsx
index 084e7703a3c774..f9f4c7632894b2 100644
--- a/static/app/gettingStartedDocs/php/symfony.tsx
+++ b/static/app/gettingStartedDocs/php/symfony.tsx
@@ -11,7 +11,10 @@ import {
   getCrashReportModalIntroduction,
   getCrashReportPHPInstallStep,
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/feedbackOnboarding';
-import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
+import {
+  feedbackOnboardingJsLoader,
+  replayOnboardingJsLoader,
+} from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {t, tct} from 'sentry/locale';
 
 type Params = DocsParams;
@@ -186,6 +189,7 @@ const docs: Docs = {
   onboarding,
   replayOnboardingJsLoader,
   crashReportOnboarding,
+  feedbackOnboardingJsLoader,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/python/aiohttp.tsx b/static/app/gettingStartedDocs/python/aiohttp.tsx
index a64fcd7874bef4..f43ed88f14f9f4 100644
--- a/static/app/gettingStartedDocs/python/aiohttp.tsx
+++ b/static/app/gettingStartedDocs/python/aiohttp.tsx
@@ -7,7 +7,10 @@ import {
   type OnboardingConfig,
 } from 'sentry/components/onboarding/gettingStartedDoc/types';
 import {getPythonMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
-import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
+import {
+  feedbackOnboardingJsLoader,
+  replayOnboardingJsLoader,
+} from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {
   AlternativeConfiguration,
   crashReportOnboardingPython,
@@ -168,7 +171,8 @@ const docs: Docs = {
     installSnippet: getInstallSnippet(),
   }),
   crashReportOnboarding: crashReportOnboardingPython,
-  featureFlagOnboarding: featureFlagOnboarding,
+  featureFlagOnboarding,
+  feedbackOnboardingJsLoader,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/python/asgi.spec.tsx b/static/app/gettingStartedDocs/python/asgi.spec.tsx
index b9f973ecf6c115..a400cc54150f63 100644
--- a/static/app/gettingStartedDocs/python/asgi.spec.tsx
+++ b/static/app/gettingStartedDocs/python/asgi.spec.tsx
@@ -49,7 +49,7 @@ describe('asgi onboarding docs', function () {
 
     // Does render transaction profiling config
     expect(
-      screen.queryByText(textWithMarkupMatcher(/profiles_sample_rate=1\.0,/))
+      screen.getByText(textWithMarkupMatcher(/profiles_sample_rate=1\.0,/))
     ).toBeInTheDocument();
   });
 
@@ -73,9 +73,7 @@ describe('asgi onboarding docs', function () {
 
     // Does render continuous profiling config
     expect(
-      screen.queryByText(
-        textWithMarkupMatcher(/"continuous_profiling_auto_start": True,/)
-      )
+      screen.getByText(textWithMarkupMatcher(/"continuous_profiling_auto_start": True,/))
     ).toBeInTheDocument();
   });
 });
diff --git a/static/app/gettingStartedDocs/python/awslambda.spec.tsx b/static/app/gettingStartedDocs/python/awslambda.spec.tsx
index e381a95c32da44..f1469a835fe0fa 100644
--- a/static/app/gettingStartedDocs/python/awslambda.spec.tsx
+++ b/static/app/gettingStartedDocs/python/awslambda.spec.tsx
@@ -49,7 +49,7 @@ describe('awslambda onboarding docs', function () {
 
     // Does render transaction profiling config
     expect(
-      screen.queryByText(textWithMarkupMatcher(/profiles_sample_rate=1\.0,/))
+      screen.getByText(textWithMarkupMatcher(/profiles_sample_rate=1\.0,/))
     ).toBeInTheDocument();
   });
 
@@ -73,9 +73,7 @@ describe('awslambda onboarding docs', function () {
 
     // Does render continuous profiling config
     expect(
-      screen.queryByText(
-        textWithMarkupMatcher(/"continuous_profiling_auto_start": True,/)
-      )
+      screen.getByText(textWithMarkupMatcher(/"continuous_profiling_auto_start": True,/))
     ).toBeInTheDocument();
   });
 });
diff --git a/static/app/gettingStartedDocs/python/bottle.tsx b/static/app/gettingStartedDocs/python/bottle.tsx
index 3d9e0eefd04a27..a12dadd52a9375 100644
--- a/static/app/gettingStartedDocs/python/bottle.tsx
+++ b/static/app/gettingStartedDocs/python/bottle.tsx
@@ -7,7 +7,10 @@ import {
   type OnboardingConfig,
 } from 'sentry/components/onboarding/gettingStartedDoc/types';
 import {getPythonMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
-import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
+import {
+  feedbackOnboardingJsLoader,
+  replayOnboardingJsLoader,
+} from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {
   AlternativeConfiguration,
   crashReportOnboardingPython,
@@ -160,7 +163,8 @@ const docs: Docs = {
     installSnippet: getInstallSnippet(),
   }),
   crashReportOnboarding: crashReportOnboardingPython,
-  featureFlagOnboarding: featureFlagOnboarding,
+  featureFlagOnboarding,
+  feedbackOnboardingJsLoader,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/python/celery.spec.tsx b/static/app/gettingStartedDocs/python/celery.spec.tsx
index 506167760bd529..5299482fc68893 100644
--- a/static/app/gettingStartedDocs/python/celery.spec.tsx
+++ b/static/app/gettingStartedDocs/python/celery.spec.tsx
@@ -54,7 +54,7 @@ describe('celery onboarding docs', function () {
 
     // Does render transaction profiling config
     expect(
-      screen.queryByText(textWithMarkupMatcher(/profiles_sample_rate=1\.0,/))
+      screen.getByText(textWithMarkupMatcher(/profiles_sample_rate=1\.0,/))
     ).toBeInTheDocument();
   });
 
@@ -78,10 +78,10 @@ describe('celery onboarding docs', function () {
 
     // Does render continuous profiling config
     expect(
-      screen.queryByText(textWithMarkupMatcher(/sentry_sdk.profiler.start_profiler\(\)/))
+      screen.getByText(textWithMarkupMatcher(/sentry_sdk.profiler.start_profiler\(\)/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/sentry_sdk.profiler.stop_profiler\(\)/))
+      screen.getByText(textWithMarkupMatcher(/sentry_sdk.profiler.stop_profiler\(\)/))
     ).toBeInTheDocument();
   });
 });
diff --git a/static/app/gettingStartedDocs/python/chalice.spec.tsx b/static/app/gettingStartedDocs/python/chalice.spec.tsx
index 75595805d4f1be..0d76a5b7eebf0f 100644
--- a/static/app/gettingStartedDocs/python/chalice.spec.tsx
+++ b/static/app/gettingStartedDocs/python/chalice.spec.tsx
@@ -51,7 +51,7 @@ describe('chalice onboarding docs', function () {
 
     // Does render transaction profiling config
     expect(
-      screen.queryByText(textWithMarkupMatcher(/profiles_sample_rate=1\.0,/))
+      screen.getByText(textWithMarkupMatcher(/profiles_sample_rate=1\.0,/))
     ).toBeInTheDocument();
   });
 
@@ -75,9 +75,7 @@ describe('chalice onboarding docs', function () {
 
     // Does render continuous profiling config
     expect(
-      screen.queryByText(
-        textWithMarkupMatcher(/"continuous_profiling_auto_start": True,/)
-      )
+      screen.getByText(textWithMarkupMatcher(/"continuous_profiling_auto_start": True,/))
     ).toBeInTheDocument();
   });
 });
diff --git a/static/app/gettingStartedDocs/python/django.spec.tsx b/static/app/gettingStartedDocs/python/django.spec.tsx
index 52358361c64fa6..f752e23a64bf8c 100644
--- a/static/app/gettingStartedDocs/python/django.spec.tsx
+++ b/static/app/gettingStartedDocs/python/django.spec.tsx
@@ -51,7 +51,7 @@ describe('django onboarding docs', function () {
 
     // Does render transaction profiling config
     expect(
-      screen.queryByText(textWithMarkupMatcher(/profiles_sample_rate=1\.0,/))
+      screen.getByText(textWithMarkupMatcher(/profiles_sample_rate=1\.0,/))
     ).toBeInTheDocument();
   });
 
@@ -75,9 +75,7 @@ describe('django onboarding docs', function () {
 
     // Does render continuous profiling config
     expect(
-      screen.queryByText(
-        textWithMarkupMatcher(/"continuous_profiling_auto_start": True,/)
-      )
+      screen.getByText(textWithMarkupMatcher(/"continuous_profiling_auto_start": True,/))
     ).toBeInTheDocument();
   });
 });
diff --git a/static/app/gettingStartedDocs/python/django.tsx b/static/app/gettingStartedDocs/python/django.tsx
index fd17c37fd4bcf2..89f1bd4e03deb5 100644
--- a/static/app/gettingStartedDocs/python/django.tsx
+++ b/static/app/gettingStartedDocs/python/django.tsx
@@ -7,7 +7,10 @@ import {
   type OnboardingConfig,
 } from 'sentry/components/onboarding/gettingStartedDoc/types';
 import {getPythonMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
-import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
+import {
+  feedbackOnboardingJsLoader,
+  replayOnboardingJsLoader,
+} from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {
   AlternativeConfiguration,
   crashReportOnboardingPython,
@@ -230,7 +233,8 @@ const docs: Docs = {
   }),
   performanceOnboarding,
   crashReportOnboarding: crashReportOnboardingPython,
-  featureFlagOnboarding: featureFlagOnboarding,
+  featureFlagOnboarding,
+  feedbackOnboardingJsLoader,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/python/falcon.tsx b/static/app/gettingStartedDocs/python/falcon.tsx
index 8e83c85db10bf5..05efcbb651307b 100644
--- a/static/app/gettingStartedDocs/python/falcon.tsx
+++ b/static/app/gettingStartedDocs/python/falcon.tsx
@@ -7,7 +7,10 @@ import {
   type OnboardingConfig,
 } from 'sentry/components/onboarding/gettingStartedDoc/types';
 import {getPythonMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
-import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
+import {
+  feedbackOnboardingJsLoader,
+  replayOnboardingJsLoader,
+} from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {
   AlternativeConfiguration,
   crashReportOnboardingPython,
@@ -160,7 +163,8 @@ const docs: Docs = {
     installSnippet: getInstallSnippet(),
   }),
   crashReportOnboarding: crashReportOnboardingPython,
-  featureFlagOnboarding: featureFlagOnboarding,
+  featureFlagOnboarding,
+  feedbackOnboardingJsLoader,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/python/fastapi.spec.tsx b/static/app/gettingStartedDocs/python/fastapi.spec.tsx
index 558c9e87fc9e9a..fc31c125e87495 100644
--- a/static/app/gettingStartedDocs/python/fastapi.spec.tsx
+++ b/static/app/gettingStartedDocs/python/fastapi.spec.tsx
@@ -51,7 +51,7 @@ describe('flask onboarding docs', function () {
 
     // Does render transaction profiling config
     expect(
-      screen.queryByText(textWithMarkupMatcher(/profiles_sample_rate=1\.0,/))
+      screen.getByText(textWithMarkupMatcher(/profiles_sample_rate=1\.0,/))
     ).toBeInTheDocument();
   });
 
@@ -75,9 +75,7 @@ describe('flask onboarding docs', function () {
 
     // Does render continuous profiling config
     expect(
-      screen.queryByText(
-        textWithMarkupMatcher(/"continuous_profiling_auto_start": True,/)
-      )
+      screen.getByText(textWithMarkupMatcher(/"continuous_profiling_auto_start": True,/))
     ).toBeInTheDocument();
   });
 });
diff --git a/static/app/gettingStartedDocs/python/fastapi.tsx b/static/app/gettingStartedDocs/python/fastapi.tsx
index 6097b8ab64781e..6fe895e6b88a02 100644
--- a/static/app/gettingStartedDocs/python/fastapi.tsx
+++ b/static/app/gettingStartedDocs/python/fastapi.tsx
@@ -9,7 +9,10 @@ import {
   type OnboardingConfig,
 } from 'sentry/components/onboarding/gettingStartedDoc/types';
 import {getPythonMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
-import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
+import {
+  feedbackOnboardingJsLoader,
+  replayOnboardingJsLoader,
+} from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {
   AlternativeConfiguration,
   crashReportOnboardingPython,
@@ -170,7 +173,8 @@ const docs: Docs = {
     installSnippet: getInstallSnippet(),
   }),
   crashReportOnboarding: crashReportOnboardingPython,
-  featureFlagOnboarding: featureFlagOnboarding,
+  featureFlagOnboarding,
+  feedbackOnboardingJsLoader,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/python/flask.tsx b/static/app/gettingStartedDocs/python/flask.tsx
index 45165f5adf5b8f..85424ad7db2263 100644
--- a/static/app/gettingStartedDocs/python/flask.tsx
+++ b/static/app/gettingStartedDocs/python/flask.tsx
@@ -9,7 +9,10 @@ import {
   type OnboardingConfig,
 } from 'sentry/components/onboarding/gettingStartedDoc/types';
 import {getPythonMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
-import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
+import {
+  feedbackOnboardingJsLoader,
+  replayOnboardingJsLoader,
+} from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {
   AlternativeConfiguration,
   crashReportOnboardingPython,
@@ -241,7 +244,8 @@ const docs: Docs = {
   }),
   performanceOnboarding,
   crashReportOnboarding: crashReportOnboardingPython,
-  featureFlagOnboarding: featureFlagOnboarding,
+  featureFlagOnboarding,
+  feedbackOnboardingJsLoader,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/python/gcpfunctions.spec.tsx b/static/app/gettingStartedDocs/python/gcpfunctions.spec.tsx
index 92b06adaf87408..807da1c0146101 100644
--- a/static/app/gettingStartedDocs/python/gcpfunctions.spec.tsx
+++ b/static/app/gettingStartedDocs/python/gcpfunctions.spec.tsx
@@ -49,7 +49,7 @@ describe('gcpfunctions onboarding docs', function () {
 
     // Does render transaction profiling config
     expect(
-      screen.queryByText(textWithMarkupMatcher(/profiles_sample_rate=1\.0,/))
+      screen.getByText(textWithMarkupMatcher(/profiles_sample_rate=1\.0,/))
     ).toBeInTheDocument();
   });
 
@@ -73,9 +73,7 @@ describe('gcpfunctions onboarding docs', function () {
 
     // Does render continuous profiling config
     expect(
-      screen.queryByText(
-        textWithMarkupMatcher(/"continuous_profiling_auto_start": True,/)
-      )
+      screen.getByText(textWithMarkupMatcher(/"continuous_profiling_auto_start": True,/))
     ).toBeInTheDocument();
   });
 });
diff --git a/static/app/gettingStartedDocs/python/pyramid.tsx b/static/app/gettingStartedDocs/python/pyramid.tsx
index 12a7503f3d0bd4..7e76da11a97790 100644
--- a/static/app/gettingStartedDocs/python/pyramid.tsx
+++ b/static/app/gettingStartedDocs/python/pyramid.tsx
@@ -6,7 +6,10 @@ import type {
   OnboardingConfig,
 } from 'sentry/components/onboarding/gettingStartedDoc/types';
 import {getPythonMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
-import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
+import {
+  feedbackOnboardingJsLoader,
+  replayOnboardingJsLoader,
+} from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {
   crashReportOnboardingPython,
   featureFlagOnboarding,
@@ -109,7 +112,8 @@ const docs: Docs = {
     installSnippet: getInstallSnippet(),
   }),
   crashReportOnboarding: crashReportOnboardingPython,
-  featureFlagOnboarding: featureFlagOnboarding,
+  featureFlagOnboarding,
+  feedbackOnboardingJsLoader,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/python/python.spec.tsx b/static/app/gettingStartedDocs/python/python.spec.tsx
index dad0242457604d..0306d5ae975343 100644
--- a/static/app/gettingStartedDocs/python/python.spec.tsx
+++ b/static/app/gettingStartedDocs/python/python.spec.tsx
@@ -50,7 +50,7 @@ describe('python onboarding docs', function () {
 
     // Does render transaction profiling config
     expect(
-      screen.queryByText(textWithMarkupMatcher(/profiles_sample_rate=1\.0,/))
+      screen.getByText(textWithMarkupMatcher(/profiles_sample_rate=1\.0,/))
     ).toBeInTheDocument();
   });
 
@@ -74,10 +74,10 @@ describe('python onboarding docs', function () {
 
     // Does render continuous profiling config
     expect(
-      screen.queryByText(textWithMarkupMatcher(/sentry_sdk.profiler.start_profiler\(\)/))
+      screen.getByText(textWithMarkupMatcher(/sentry_sdk.profiler.start_profiler\(\)/))
     ).toBeInTheDocument();
     expect(
-      screen.queryByText(textWithMarkupMatcher(/sentry_sdk.profiler.stop_profiler\(\)/))
+      screen.getByText(textWithMarkupMatcher(/sentry_sdk.profiler.stop_profiler\(\)/))
     ).toBeInTheDocument();
   });
 });
diff --git a/static/app/gettingStartedDocs/python/quart.tsx b/static/app/gettingStartedDocs/python/quart.tsx
index 8dd51d2648eff1..d6ed372a36b80b 100644
--- a/static/app/gettingStartedDocs/python/quart.tsx
+++ b/static/app/gettingStartedDocs/python/quart.tsx
@@ -7,7 +7,10 @@ import {
   type OnboardingConfig,
 } from 'sentry/components/onboarding/gettingStartedDoc/types';
 import {getPythonMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
-import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
+import {
+  feedbackOnboardingJsLoader,
+  replayOnboardingJsLoader,
+} from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {
   AlternativeConfiguration,
   crashReportOnboardingPython,
@@ -157,7 +160,8 @@ const docs: Docs = {
     installSnippet: getInstallSnippet(),
   }),
   crashReportOnboarding: crashReportOnboardingPython,
-  featureFlagOnboarding: featureFlagOnboarding,
+  featureFlagOnboarding,
+  feedbackOnboardingJsLoader,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/python/sanic.tsx b/static/app/gettingStartedDocs/python/sanic.tsx
index 349c78cc984e8c..3c5c982c9e419c 100644
--- a/static/app/gettingStartedDocs/python/sanic.tsx
+++ b/static/app/gettingStartedDocs/python/sanic.tsx
@@ -6,7 +6,10 @@ import type {
   OnboardingConfig,
 } from 'sentry/components/onboarding/gettingStartedDoc/types';
 import {getPythonMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
-import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
+import {
+  feedbackOnboardingJsLoader,
+  replayOnboardingJsLoader,
+} from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {
   crashReportOnboardingPython,
   featureFlagOnboarding,
@@ -119,7 +122,8 @@ const docs: Docs = {
     installSnippet: getInstallSnippet(),
   }),
   crashReportOnboarding: crashReportOnboardingPython,
-  featureFlagOnboarding: featureFlagOnboarding,
+  featureFlagOnboarding,
+  feedbackOnboardingJsLoader,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/python/serverless.spec.tsx b/static/app/gettingStartedDocs/python/serverless.spec.tsx
index 6d61c5e95c54f1..d7e2f417970f11 100644
--- a/static/app/gettingStartedDocs/python/serverless.spec.tsx
+++ b/static/app/gettingStartedDocs/python/serverless.spec.tsx
@@ -49,7 +49,7 @@ describe('serverless onboarding docs', function () {
 
     // Does render transaction profiling config
     expect(
-      screen.queryByText(textWithMarkupMatcher(/profiles_sample_rate=1\.0,/))
+      screen.getByText(textWithMarkupMatcher(/profiles_sample_rate=1\.0,/))
     ).toBeInTheDocument();
   });
 
@@ -73,9 +73,7 @@ describe('serverless onboarding docs', function () {
 
     // Does render continuous profiling config
     expect(
-      screen.queryByText(
-        textWithMarkupMatcher(/"continuous_profiling_auto_start": True,/)
-      )
+      screen.getByText(textWithMarkupMatcher(/"continuous_profiling_auto_start": True,/))
     ).toBeInTheDocument();
   });
 });
diff --git a/static/app/gettingStartedDocs/python/starlette.tsx b/static/app/gettingStartedDocs/python/starlette.tsx
index 6d274e8851e602..0c2984225462a1 100644
--- a/static/app/gettingStartedDocs/python/starlette.tsx
+++ b/static/app/gettingStartedDocs/python/starlette.tsx
@@ -7,7 +7,10 @@ import {
   type OnboardingConfig,
 } from 'sentry/components/onboarding/gettingStartedDoc/types';
 import {getPythonMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
-import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
+import {
+  feedbackOnboardingJsLoader,
+  replayOnboardingJsLoader,
+} from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {
   AlternativeConfiguration,
   crashReportOnboardingPython,
@@ -157,7 +160,8 @@ const docs: Docs = {
     installSnippet: getInstallSnippet(),
   }),
   crashReportOnboarding: crashReportOnboardingPython,
-  featureFlagOnboarding: featureFlagOnboarding,
+  featureFlagOnboarding,
+  feedbackOnboardingJsLoader,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/python/tornado.tsx b/static/app/gettingStartedDocs/python/tornado.tsx
index 77caab3e6b849f..7839aa2f4bd992 100644
--- a/static/app/gettingStartedDocs/python/tornado.tsx
+++ b/static/app/gettingStartedDocs/python/tornado.tsx
@@ -7,7 +7,10 @@ import {
   type OnboardingConfig,
 } from 'sentry/components/onboarding/gettingStartedDoc/types';
 import {getPythonMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
-import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
+import {
+  feedbackOnboardingJsLoader,
+  replayOnboardingJsLoader,
+} from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {
   AlternativeConfiguration,
   crashReportOnboardingPython,
@@ -178,7 +181,8 @@ const docs: Docs = {
     installSnippet: getInstallSnippet(),
   }),
   crashReportOnboarding: crashReportOnboardingPython,
-  featureFlagOnboarding: featureFlagOnboarding,
+  featureFlagOnboarding,
+  feedbackOnboardingJsLoader,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/python/tryton.spec.tsx b/static/app/gettingStartedDocs/python/tryton.spec.tsx
index 7718e1ed085990..69f928b2d40604 100644
--- a/static/app/gettingStartedDocs/python/tryton.spec.tsx
+++ b/static/app/gettingStartedDocs/python/tryton.spec.tsx
@@ -42,7 +42,7 @@ describe('tryton onboarding docs', function () {
 
     // Does render transaction profiling config
     expect(
-      screen.queryByText(textWithMarkupMatcher(/profiles_sample_rate=1\.0,/))
+      screen.getByText(textWithMarkupMatcher(/profiles_sample_rate=1\.0,/))
     ).toBeInTheDocument();
   });
 
@@ -66,9 +66,7 @@ describe('tryton onboarding docs', function () {
 
     // Does render continuous profiling config
     expect(
-      screen.queryByText(
-        textWithMarkupMatcher(/"continuous_profiling_auto_start": True,/)
-      )
+      screen.getByText(textWithMarkupMatcher(/"continuous_profiling_auto_start": True,/))
     ).toBeInTheDocument();
   });
 });
diff --git a/static/app/gettingStartedDocs/python/wsgi.spec.tsx b/static/app/gettingStartedDocs/python/wsgi.spec.tsx
index 4dcaf19826bd87..b7aac850132c6c 100644
--- a/static/app/gettingStartedDocs/python/wsgi.spec.tsx
+++ b/static/app/gettingStartedDocs/python/wsgi.spec.tsx
@@ -49,7 +49,7 @@ describe('wsgi onboarding docs', function () {
 
     // Does render transaction profiling config
     expect(
-      screen.queryByText(textWithMarkupMatcher(/profiles_sample_rate=1\.0,/))
+      screen.getByText(textWithMarkupMatcher(/profiles_sample_rate=1\.0,/))
     ).toBeInTheDocument();
   });
 
@@ -73,9 +73,7 @@ describe('wsgi onboarding docs', function () {
 
     // Does render continuous profiling config
     expect(
-      screen.queryByText(
-        textWithMarkupMatcher(/"continuous_profiling_auto_start": True,/)
-      )
+      screen.getByText(textWithMarkupMatcher(/"continuous_profiling_auto_start": True,/))
     ).toBeInTheDocument();
   });
 });
diff --git a/static/app/gettingStartedDocs/ruby/rails.tsx b/static/app/gettingStartedDocs/ruby/rails.tsx
index f88b218e408469..0de89fa880e56e 100644
--- a/static/app/gettingStartedDocs/ruby/rails.tsx
+++ b/static/app/gettingStartedDocs/ruby/rails.tsx
@@ -11,7 +11,10 @@ import {
   getCrashReportSDKInstallFirstStepRails,
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/feedbackOnboarding';
 import {getRubyMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
-import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
+import {
+  feedbackOnboardingJsLoader,
+  replayOnboardingJsLoader,
+} from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {t, tct} from 'sentry/locale';
 
 type Params = DocsParams;
@@ -199,6 +202,7 @@ const docs: Docs = {
   customMetricsOnboarding: getRubyMetricsOnboarding(),
   replayOnboardingJsLoader,
   crashReportOnboarding,
+  feedbackOnboardingJsLoader,
 };
 
 export default docs;
diff --git a/static/app/locale.spec.tsx b/static/app/locale.spec.tsx
index 24ed1da55610ad..d8b2ca2bc6a6fd 100644
--- a/static/app/locale.spec.tsx
+++ b/static/app/locale.spec.tsx
@@ -1,6 +1,7 @@
 import {render, screen} from 'sentry-test/reactTestingLibrary';
 import {textWithMarkupMatcher} from 'sentry-test/utils';
 
+// eslint-disable-next-line no-restricted-imports
 import {tct} from 'sentry/locale';
 
 describe('locale.gettextComponentTemplate', () => {
@@ -73,7 +74,7 @@ describe('locale.gettextComponentTemplate', () => {
     );
 
     expect(screen.getByText(textWithMarkupMatcher('one two three'))).toBeInTheDocument();
-    expect(container.innerHTML).toEqual('<div><b>one</b> <b>two</b> <b>three</b></div>');
+    expect(container.innerHTML).toBe('<div><b>one</b> <b>two</b> <b>three</b></div>');
   });
 
   it('should render nested goups', () => {
@@ -89,7 +90,7 @@ describe('locale.gettextComponentTemplate', () => {
     expect(
       screen.getByText(textWithMarkupMatcher('text with another group'))
     ).toBeInTheDocument();
-    expect(container.innerHTML).toEqual(
+    expect(container.innerHTML).toBe(
       '<div><b>text with <a href="/link">another</a> group</b></div>'
     );
   });
diff --git a/static/app/locale.tsx b/static/app/locale.tsx
index 566e7cfc82b34f..d41577dd297665 100644
--- a/static/app/locale.tsx
+++ b/static/app/locale.tsx
@@ -214,7 +214,7 @@ export function parseComponentTemplate(template: string): ParsedTemplate {
       } else {
         pos = regex.lastIndex = process(regex.lastIndex, currentGroupId, true);
       }
-      buf.push({group: groupName, id: currentGroupId});
+      buf.push({group: groupName!, id: currentGroupId});
     }
 
     let endPos = regex.lastIndex;
diff --git a/static/app/plugins/registry.tsx b/static/app/plugins/registry.tsx
index 52635e140063b1..554737db5aa101 100644
--- a/static/app/plugins/registry.tsx
+++ b/static/app/plugins/registry.tsx
@@ -31,7 +31,7 @@ export default class Registry {
       }
     }
     console.info(
-      '[plugins] Loaded ' + data.id + ' as {' + this.plugins[data.id].name + '}'
+      '[plugins] Loaded ' + data.id + ' as {' + this.plugins[data.id]!.name + '}'
     );
     callback(this.get(data));
   }
diff --git a/static/app/plugins/sessionstack/contexts/sessionstack.tsx b/static/app/plugins/sessionstack/contexts/sessionstack.tsx
index 77bff3a80f6b7b..430e2ed1057662 100644
--- a/static/app/plugins/sessionstack/contexts/sessionstack.tsx
+++ b/static/app/plugins/sessionstack/contexts/sessionstack.tsx
@@ -1,5 +1,6 @@
 import {Component} from 'react';
-import {findDOMNode} from 'react-dom';
+
+import {uniqueId} from 'sentry/utils/guid';
 
 const ASPECT_RATIO = 16 / 9;
 
@@ -21,9 +22,6 @@ class SessionStackContextType extends Component<Props, State> {
   };
 
   componentDidMount() {
-    // eslint-disable-next-line react/no-find-dom-node
-    const domNode = findDOMNode(this) as HTMLElement;
-    this.parentNode = domNode.parentNode as HTMLElement;
     window.addEventListener('resize', () => this.setIframeSize(), false);
     this.setIframeSize();
   }
@@ -31,16 +29,17 @@ class SessionStackContextType extends Component<Props, State> {
   componentWillUnmount() {
     window.removeEventListener('resize', () => this.setIframeSize(), false);
   }
-  parentNode?: HTMLElement;
+  iframeContainerId = uniqueId();
 
   getTitle = () => 'SessionStack';
 
   setIframeSize() {
-    if (this.state.showIframe || !this.parentNode) {
+    const parentNode = document.getElementById(this.iframeContainerId)?.parentElement;
+    if (!this.state.showIframe || !parentNode) {
       return;
     }
 
-    const parentWidth = this.parentNode.clientWidth;
+    const parentWidth = parentNode.clientWidth;
 
     this.setState({
       width: parentWidth,
@@ -64,7 +63,7 @@ class SessionStackContextType extends Component<Props, State> {
     }
 
     return (
-      <div className="panel-group">
+      <div className="panel-group" id={this.iframeContainerId}>
         {this.state.showIframe ? (
           <iframe
             src={session_url}
diff --git a/static/app/routes.spec.tsx b/static/app/routes.spec.tsx
index 4f8e583b4451df..c2043e7a774404 100644
--- a/static/app/routes.spec.tsx
+++ b/static/app/routes.spec.tsx
@@ -28,7 +28,7 @@ function extractRoutes(rootRoute: RouteObject[]): Set<string> {
   const routes = new Set<string>();
 
   // A queue of routes we need to visit
-  const visitQueue: RouteMetadata[] = [{leadingPath: '', route: rootRoute[0]}];
+  const visitQueue: RouteMetadata[] = [{leadingPath: '', route: rootRoute[0]!}];
   while (visitQueue.length > 0) {
     const current = visitQueue.pop();
     if (!current) {
diff --git a/static/app/routes.tsx b/static/app/routes.tsx
index 1a4fb363043170..097319c8c91fee 100644
--- a/static/app/routes.tsx
+++ b/static/app/routes.tsx
@@ -562,6 +562,11 @@ function buildRoutes() {
           )}
         />
       </Route>
+      <Route
+        path="playstation/"
+        name={t('PlayStation')}
+        component={make(() => import('sentry/views/settings/project/tempest'))}
+      />
       <Route
         path="replays/"
         name={t('Replays')}
@@ -1499,21 +1504,9 @@ 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 moduleUrlToModule: Record<string, ModuleName> = Object.fromEntries(
+    Object.values(ModuleName).map(name => [MODULE_BASE_URLS[name], name])
+  );
 
   const insightsRedirects = Object.values(MODULE_BASE_URLS)
     .map(
@@ -1522,7 +1515,7 @@ function buildRoutes() {
           <Redirect
             key={moduleBaseURL}
             from={`${moduleBaseURL}/*`}
-            to={`/${DOMAIN_VIEW_BASE_URL}/${getModuleView(moduleUrlToModule[moduleBaseURL])}${moduleBaseURL}/:splat`}
+            to={`/${DOMAIN_VIEW_BASE_URL}/${getModuleView(moduleUrlToModule[moduleBaseURL]!)}${moduleBaseURL}/:splat`}
           />
         )
     )
@@ -1591,179 +1584,181 @@ 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 moduleRoutes = (
+    <Fragment>
+      <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>
+      <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.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>
+      <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>
+      <Route path={`${MODULE_BASE_URLS[ModuleName.UPTIME]}/`}>
+        <IndexRoute
+          component={make(() => import('sentry/views/insights/uptime/views/overview'))}
+        />
+      </Route>
+      <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>
+    </Fragment>
+  );
 
   const domainViewRoutes = (
     <Route path={`/${DOMAIN_VIEW_BASE_URL}/`} withOrgPath>
diff --git a/static/app/stores/alertStore.spec.tsx b/static/app/stores/alertStore.spec.tsx
index 3f748b5a7cecf0..3e1fbd8ee50f06 100644
--- a/static/app/stores/alertStore.spec.tsx
+++ b/static/app/stores/alertStore.spec.tsx
@@ -20,8 +20,8 @@ describe('AlertStore', function () {
       });
 
       expect(AlertStore.getState()).toHaveLength(2);
-      expect(AlertStore.getState()[0].key).toEqual(0);
-      expect(AlertStore.getState()[1].key).toEqual(1);
+      expect(AlertStore.getState()[0]!.key).toBe(0);
+      expect(AlertStore.getState()[1]!.key).toBe(1);
     });
 
     it('should not add duplicates when noDuplicates is set', function () {
@@ -54,7 +54,7 @@ describe('AlertStore', function () {
       }
 
       expect(AlertStore.getState()).toHaveLength(3);
-      AlertStore.closeAlert(AlertStore.getState()[1]);
+      AlertStore.closeAlert(AlertStore.getState()[1]!);
 
       const newState = AlertStore.getState();
       expect(newState).toHaveLength(2);
diff --git a/static/app/stores/alertStore.tsx b/static/app/stores/alertStore.tsx
index 4ebd1f58f5a7d8..0388c5ae5f27b5 100644
--- a/static/app/stores/alertStore.tsx
+++ b/static/app/stores/alertStore.tsx
@@ -55,7 +55,7 @@ const storeConfig: AlertStoreDefinition = {
         // Remove any objects that have passed their mute duration.
         const now = Math.floor(new Date().valueOf() / 1000);
         for (const key in expirations) {
-          if (expirations.hasOwnProperty(key) && expirations[key] < now) {
+          if (expirations.hasOwnProperty(key) && expirations[key]! < now) {
             delete expirations[key];
           }
         }
diff --git a/static/app/stores/configStore.spec.tsx b/static/app/stores/configStore.spec.tsx
index c0873f88a17d74..152b3aabeae06d 100644
--- a/static/app/stores/configStore.spec.tsx
+++ b/static/app/stores/configStore.spec.tsx
@@ -22,14 +22,14 @@ describe('ConfigStore', () => {
 
   it('should have cookie names', () => {
     const csrfCookieName = ConfigStore.get('csrfCookieName');
-    expect(csrfCookieName).toEqual('csrf-test-cookie');
+    expect(csrfCookieName).toBe('csrf-test-cookie');
 
     const superUserCookieName = ConfigStore.get('superUserCookieName');
-    expect(superUserCookieName).toEqual('su-test-cookie');
+    expect(superUserCookieName).toBe('su-test-cookie');
   });
 
   it('should have customerDomain', () => {
-    expect(ConfigStore.get('customerDomain')).toEqual(null);
+    expect(ConfigStore.get('customerDomain')).toBeNull();
   });
 
   it('returns a stable reference from getState()', () => {
diff --git a/static/app/stores/groupStore.spec.tsx b/static/app/stores/groupStore.spec.tsx
index e616c7d9e84777..adada2d59f5b24 100644
--- a/static/app/stores/groupStore.spec.tsx
+++ b/static/app/stores/groupStore.spec.tsx
@@ -258,7 +258,7 @@ describe('GroupStore', function () {
           }),
         ];
         GroupStore.updateActivity('1', '1', {text: 'Updated Text'});
-        expect(GroupStore.items[0].activity[0].data).toEqual({text: 'Updated Text'});
+        expect(GroupStore.items[0]!.activity[0]!.data).toEqual({text: 'Updated Text'});
       });
     });
   });
diff --git a/static/app/stores/groupStore.tsx b/static/app/stores/groupStore.tsx
index 94bd47f7a14c82..630d0637a499f4 100644
--- a/static/app/stores/groupStore.tsx
+++ b/static/app/stores/groupStore.tsx
@@ -108,7 +108,7 @@ function mergePendingChanges(
       ? item
       : {
           ...item,
-          ...pendingById[item.id].reduce((a, change) => ({...a, ...change.data}), {}),
+          ...pendingById[item.id]!.reduce((a, change) => ({...a, ...change.data}), {}),
         }
   );
 }
@@ -230,7 +230,7 @@ const storeConfig: GroupStoreDefinition = {
     }
 
     for (let i = 0; i < group.activity.length; i++) {
-      if (group.activity[i].id === id) {
+      if (group.activity[i]!.id === id) {
         return i;
       }
     }
@@ -270,7 +270,7 @@ const storeConfig: GroupStoreDefinition = {
     // Here, we want to merge the new `data` being passed in
     // into the existing `data` object. This effectively
     // allows passing in an object of only changes.
-    group.activity[index].data = Object.assign(group.activity[index].data, data);
+    group.activity[index]!.data = Object.assign(group.activity[index]!.data, data);
     this.updateItems([group.id]);
   },
 
@@ -287,7 +287,7 @@ const storeConfig: GroupStoreDefinition = {
 
     const activity = group.activity.splice(index, 1);
 
-    if (activity[0].type === 'note') {
+    if (activity[0]!.type === 'note') {
       group.numComments--;
     }
 
@@ -332,7 +332,7 @@ const storeConfig: GroupStoreDefinition = {
       return;
     }
 
-    this.items[idx] = {...this.items[idx], assignedTo: response.assignedTo};
+    this.items[idx] = {...this.items[idx]!, assignedTo: response.assignedTo};
     this.clearStatus(itemId, 'assignTo');
     this.updateItems([itemId]);
   },
diff --git a/static/app/stores/groupingStore.tsx b/static/app/stores/groupingStore.tsx
index 8f50beb5e2068d..5ce9edf5f3aec2 100644
--- a/static/app/stores/groupingStore.tsx
+++ b/static/app/stores/groupingStore.tsx
@@ -312,7 +312,7 @@ const storeConfig: GroupingStoreDefinition = {
             newItems.push(newItem);
           }
 
-          const newItem = newItemsMap[item.id];
+          const newItem = newItemsMap[item.id]!;
           const {childId, childLabel, eventCount, lastSeen, latestEvent} = item;
 
           if (eventCount) {
@@ -350,7 +350,7 @@ const storeConfig: GroupingStoreDefinition = {
           .map(scoreKey => [scoreKey, scoreMap[scoreKey]])
           .reduce((acc, [scoreKey, score]) => {
             // v1 layout: '<interface>:...'
-            const [interfaceName] = String(scoreKey).split(':');
+            const [interfaceName] = String(scoreKey).split(':') as [string];
 
             if (!acc[interfaceName]) {
               acc[interfaceName] = [];
@@ -458,7 +458,7 @@ const storeConfig: GroupingStoreDefinition = {
     this.state = {...this.state, unmergeList: newUnmergeList};
 
     // Update "checked" state for row
-    this.setStateForId('unmergeState', fingerprint, {checked});
+    this.setStateForId('unmergeState', fingerprint!, {checked});
 
     // Unmerge should be disabled if 0 or all items are selected, or if there's
     // only one item to select
diff --git a/static/app/stores/guideStore.spec.tsx b/static/app/stores/guideStore.spec.tsx
index fa52f4e2f609e0..979d90e31fba94 100644
--- a/static/app/stores/guideStore.spec.tsx
+++ b/static/app/stores/guideStore.spec.tsx
@@ -43,17 +43,17 @@ describe('GuideStore', function () {
   it('should move through the steps in the guide', function () {
     GuideStore.fetchSucceeded(data);
     // Should pick the first non-seen guide in alphabetic order.
-    expect(GuideStore.getState().currentStep).toEqual(0);
-    expect(GuideStore.getState().currentGuide?.guide).toEqual('issue');
+    expect(GuideStore.getState().currentStep).toBe(0);
+    expect(GuideStore.getState().currentGuide?.guide).toBe('issue');
     // Should prune steps that don't have anchors.
     expect(GuideStore.getState().currentGuide?.steps).toHaveLength(3);
 
     GuideStore.nextStep();
-    expect(GuideStore.getState().currentStep).toEqual(1);
+    expect(GuideStore.getState().currentStep).toBe(1);
     GuideStore.nextStep();
-    expect(GuideStore.getState().currentStep).toEqual(2);
+    expect(GuideStore.getState().currentStep).toBe(2);
     GuideStore.closeGuide();
-    expect(GuideStore.getState().currentGuide).toEqual(null);
+    expect(GuideStore.getState().currentGuide).toBeNull();
   });
 
   it('should force show a guide with #assistant', function () {
@@ -68,18 +68,18 @@ describe('GuideStore', function () {
     GuideStore.fetchSucceeded(data);
     window.location.hash = '#assistant';
     window.dispatchEvent(new Event('load'));
-    expect(GuideStore.getState().currentGuide?.guide).toEqual('issue');
+    expect(GuideStore.getState().currentGuide?.guide).toBe('issue');
     GuideStore.closeGuide();
-    expect(GuideStore.getState().currentGuide?.guide).toEqual('issue_stream');
+    expect(GuideStore.getState().currentGuide?.guide).toBe('issue_stream');
     window.location.hash = '';
   });
 
   it('should force hide', function () {
-    expect(GuideStore.state.forceHide).toEqual(false);
+    expect(GuideStore.state.forceHide).toBe(false);
     GuideStore.setForceHide(true);
-    expect(GuideStore.state.forceHide).toEqual(true);
+    expect(GuideStore.state.forceHide).toBe(true);
     GuideStore.setForceHide(false);
-    expect(GuideStore.state.forceHide).toEqual(false);
+    expect(GuideStore.state.forceHide).toBe(false);
   });
 
   it('should record analytics events when guide is cued', function () {
@@ -115,8 +115,8 @@ describe('GuideStore', function () {
     ];
 
     GuideStore.fetchSucceeded(data);
-    expect(GuideStore.state.guides.length).toBe(1);
-    expect(GuideStore.state.guides[0].guide).toBe(data[0].guide);
+    expect(GuideStore.state.guides).toHaveLength(1);
+    expect(GuideStore.state.guides[0]!.guide).toBe(data[0]!.guide);
   });
 
   it('hides when a modal is open', function () {
diff --git a/static/app/stores/guideStore.tsx b/static/app/stores/guideStore.tsx
index 9aadab7abc7463..7bf1d56f2e837f 100644
--- a/static/app/stores/guideStore.tsx
+++ b/static/app/stores/guideStore.tsx
@@ -290,8 +290,8 @@ const storeConfig: GuideStoreDefinition = {
     const nextGuide =
       guideOptions.length > 0
         ? {
-            ...guideOptions[0],
-            steps: guideOptions[0].steps.filter(
+            ...guideOptions[0]!,
+            steps: guideOptions[0]!.steps.filter(
               step =>
                 anchors.has(step.target) ||
                 guideOptions[0]?.expectedTargets?.includes(step.target)
diff --git a/static/app/stores/pageFiltersStore.spec.tsx b/static/app/stores/pageFiltersStore.spec.tsx
index 840a716639e472..63826e2b70b441 100644
--- a/static/app/stores/pageFiltersStore.spec.tsx
+++ b/static/app/stores/pageFiltersStore.spec.tsx
@@ -145,10 +145,10 @@ describe('PageFiltersStore', function () {
   });
 
   it('updatePersistence()', async function () {
-    expect(PageFiltersStore.getState().shouldPersist).toEqual(true);
+    expect(PageFiltersStore.getState().shouldPersist).toBe(true);
     updatePersistence(false);
     await tick();
-    expect(PageFiltersStore.getState().shouldPersist).toEqual(false);
+    expect(PageFiltersStore.getState().shouldPersist).toBe(false);
   });
 
   it('can mark filters as pinned', async function () {
diff --git a/static/app/stores/pluginsStore.spec.tsx b/static/app/stores/pluginsStore.spec.tsx
index c1168ad3ae2e7c..7aa029e28beb13 100644
--- a/static/app/stores/pluginsStore.spec.tsx
+++ b/static/app/stores/pluginsStore.spec.tsx
@@ -154,7 +154,7 @@ describe('PluginsStore', function () {
         name: 'Amazon Sqs',
       });
 
-      expect(PluginsStore.updating.get('amazon-sqs')).toEqual(undefined);
+      expect(PluginsStore.updating.get('amazon-sqs')).toBeUndefined();
     });
 
     it('restores old plugin state when update has an error', function () {
@@ -171,7 +171,7 @@ describe('PluginsStore', function () {
         id: 'amazon-sqs',
         name: 'Amazon SQS',
       });
-      expect(PluginsStore.updating.get('amazon-sqs')).toEqual(undefined);
+      expect(PluginsStore.updating.get('amazon-sqs')).toBeUndefined();
     });
   });
 });
diff --git a/static/app/stores/projectsStatsStore.tsx b/static/app/stores/projectsStatsStore.tsx
index 9073777ecbe8a9..3a84eec5f8de97 100644
--- a/static/app/stores/projectsStatsStore.tsx
+++ b/static/app/stores/projectsStatsStore.tsx
@@ -100,7 +100,7 @@ const storeConfig: ProjectsStatsStoreDefinition = {
   },
 
   getBySlug(slug) {
-    return this.itemsBySlug[slug];
+    return this.itemsBySlug[slug]!;
   },
 };
 
diff --git a/static/app/stores/selectedGroupStore.spec.tsx b/static/app/stores/selectedGroupStore.spec.tsx
index ec89cd25d9065d..870b06262084a8 100644
--- a/static/app/stores/selectedGroupStore.spec.tsx
+++ b/static/app/stores/selectedGroupStore.spec.tsx
@@ -147,7 +147,7 @@ describe('SelectedGroupStore', function () {
 
       expect(ids.has('1')).toBe(true);
       expect(ids.has('3')).toBe(true);
-      expect(ids.size).toEqual(2);
+      expect(ids.size).toBe(2);
     });
 
     it('returns empty set with no selected ids', function () {
@@ -155,7 +155,7 @@ describe('SelectedGroupStore', function () {
       const ids = SelectedGroupStore.getSelectedIds();
 
       expect(ids.has('1')).toBe(false);
-      expect(ids.size).toEqual(0);
+      expect(ids.size).toBe(0);
     });
   });
 
diff --git a/static/app/stores/tagStore.tsx b/static/app/stores/tagStore.tsx
index 3ab9d15c084e39..7eb0653e508499 100644
--- a/static/app/stores/tagStore.tsx
+++ b/static/app/stores/tagStore.tsx
@@ -35,7 +35,7 @@ const storeConfig: TagStoreDefinition = {
     const newState: TagCollection = {};
 
     for (let i = 0; i < data.length; i++) {
-      const tag = data[i];
+      const tag = data[i]!;
       newState[tag.key] = {
         values: [],
         ...tag,
@@ -64,7 +64,7 @@ const storeConfig: TagStoreDefinition = {
         continue;
       }
       // Else override the tag with the previous tag
-      newState[tagKey] = this.state[tagKey];
+      newState[tagKey] = this.state[tagKey]!;
       carriedOver++;
     }
 
diff --git a/static/app/types/echarts.tsx b/static/app/types/echarts.tsx
index 16c957d6972d23..ec6ba6a48f398f 100644
--- a/static/app/types/echarts.tsx
+++ b/static/app/types/echarts.tsx
@@ -1,6 +1,6 @@
 import type {
   AxisPointerComponentOption,
-  ECharts,
+  ECharts as EChartsType,
   LineSeriesOption,
   PatternObject,
 } from 'echarts';
@@ -143,3 +143,5 @@ export type EChartBrushSelectedHandler = EChartEventHandler<{
   brushId: string;
   type: 'brushselected';
 }>;
+
+export type ECharts = EChartsType;
diff --git a/static/app/types/event.tsx b/static/app/types/event.tsx
index 070a1369c83750..9411791e5b4530 100644
--- a/static/app/types/event.tsx
+++ b/static/app/types/event.tsx
@@ -1,10 +1,9 @@
-import type {CloudResourceContext} from '@sentry/types';
+import type {CloudResourceContext} from '@sentry/core';
 
 import type {CultureContext} from 'sentry/components/events/contexts/knownContext/culture';
 import type {MissingInstrumentationContext} from 'sentry/components/events/contexts/knownContext/missingInstrumentation';
 import type {
   AggregateSpanType,
-  MetricsSummary,
   RawSpanType,
   TraceContextType,
 } from 'sentry/components/events/interfaces/spans/types';
@@ -815,7 +814,6 @@ export interface EventTransaction
   )[];
   startTimestamp: number;
   type: EventOrGroupType.TRANSACTION;
-  _metrics_summary?: MetricsSummary;
   perfProblem?: PerformanceDetectorData;
 }
 
diff --git a/static/app/types/group.tsx b/static/app/types/group.tsx
index a76a20789035fd..9f48379828e1cd 100644
--- a/static/app/types/group.tsx
+++ b/static/app/types/group.tsx
@@ -1,7 +1,7 @@
 import type {LocationDescriptor} from 'history';
 
+import type {SearchGroup} from 'sentry/components/deprecatedSmartSearchBar/types';
 import type {TitledPlugin} from 'sentry/components/group/pluginActions';
-import type {SearchGroup} from 'sentry/components/smartSearchBar/types';
 import type {FieldKind} from 'sentry/utils/fields';
 
 import type {Actor, TimeseriesValue} from './core';
@@ -642,6 +642,7 @@ export interface GroupActivityCreateIssue extends GroupActivityBase {
     location: string;
     provider: string;
     title: string;
+    new?: boolean;
   };
   type: GroupActivityType.CREATE_ISSUE;
 }
diff --git a/static/app/types/integrations.tsx b/static/app/types/integrations.tsx
index 7966525949b72e..93f8744e180f25 100644
--- a/static/app/types/integrations.tsx
+++ b/static/app/types/integrations.tsx
@@ -23,6 +23,7 @@ export type Permissions = {
   Project: PermissionValue;
   Release: PermissionValue;
   Team: PermissionValue;
+  Alerts?: PermissionValue;
 };
 
 export type PermissionResource = keyof Permissions;
diff --git a/static/app/utils/analytics.tsx b/static/app/utils/analytics.tsx
index 35bd66487781cf..cdd067fbd01108 100644
--- a/static/app/utils/analytics.tsx
+++ b/static/app/utils/analytics.tsx
@@ -1,5 +1,5 @@
+import type {Span} from '@sentry/core';
 import * as Sentry from '@sentry/react';
-import type {Span} from '@sentry/types';
 
 import HookStore from 'sentry/stores/hookStore';
 import type {Hooks} from 'sentry/types/hooks';
diff --git a/static/app/utils/analytics/insightAnalyticEvents.tsx b/static/app/utils/analytics/insightAnalyticEvents.tsx
index 983728444af24b..cde8c129b58018 100644
--- a/static/app/utils/analytics/insightAnalyticEvents.tsx
+++ b/static/app/utils/analytics/insightAnalyticEvents.tsx
@@ -19,6 +19,7 @@ export type InsightEventParameters = {
   'insight.general.select_action_value': {source: string; value: string};
   // Don't specify domain because domains are arbitrary values
   'insight.general.select_domain_value': {source: string};
+  'insight.general.select_region_value': {regions: string[]};
   'insight.general.table_paginate': {direction: string; source: string};
   'insight.general.table_sort': {
     direction: string;
@@ -86,5 +87,6 @@ export const insightEventMap: Record<InsightEventKey, string | null> = {
   'insight.vital.overview.toggle_data_type':
     'Insights: Web Vitals Overview - toggle data type',
   'insight.vital.select_browser_value': 'Insights: Web Vitals - filter by browser type',
+  'insight.general.select_region_value': 'Insights: Select value in region selector',
   'insight.general.create_alert': 'Insights: Create Alert clicked',
 };
diff --git a/static/app/utils/analytics/integrations/index.ts b/static/app/utils/analytics/integrations/index.ts
index 94ea73b19a68b7..93fc701edd1218 100644
--- a/static/app/utils/analytics/integrations/index.ts
+++ b/static/app/utils/analytics/integrations/index.ts
@@ -1,10 +1,12 @@
 import type {IntegrationType, SentryAppStatus} from 'sentry/types/integrations';
+import type {MessagingIntegrationAnalyticsView} from 'sentry/views/alerts/rules/issue/setupMessagingIntegrationButton';
 
 import type {PlatformEventParameters} from './platformAnalyticsEvents';
 import {platformEventMap} from './platformAnalyticsEvents';
 
 export type IntegrationView = {
   view?:
+    | MessagingIntegrationAnalyticsView
     | 'external_install'
     | 'legacy_integrations'
     | 'plugin_details'
@@ -13,7 +15,6 @@ export type IntegrationView = {
     | 'stacktrace_link'
     | 'stacktrace_issue_details'
     | 'integration_configuration_detail'
-    | 'messaging_integration_onboarding'
     | 'onboarding'
     | 'project_creation'
     | 'developer_settings'
diff --git a/static/app/utils/analytics/issueAnalyticsEvents.tsx b/static/app/utils/analytics/issueAnalyticsEvents.tsx
index 2dc29354e9d35b..f58b933225b4c9 100644
--- a/static/app/utils/analytics/issueAnalyticsEvents.tsx
+++ b/static/app/utils/analytics/issueAnalyticsEvents.tsx
@@ -29,6 +29,10 @@ type SourceMapWizardParam = {
 
 interface GroupEventParams extends CommonGroupAnalyticsData, BaseEventAnalyticsParams {}
 
+interface StreamlineGroupEventParams extends GroupEventParams {
+  streamline: boolean;
+}
+
 interface EventDropdownParams {
   event_id: string;
   from_event_type: string;
@@ -95,7 +99,8 @@ export type IssueEventParameters = {
   '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.copy_event_id_clicked': StreamlineGroupEventParams;
+  'issue_details.copy_event_link_clicked': StreamlineGroupEventParams;
   'issue_details.escalating_feedback_received': {
     group_id: string;
     is_high_priority: boolean;
@@ -458,6 +463,7 @@ export const issueEventMap: Record<IssueEventKey, string | null> = {
   'source_map_debug.expand_clicked': 'Source Map Debug: Expand Clicked',
   'actionable_items.expand_clicked': 'Actionable Item: Expand Clicked',
   'issue_details.copy_event_link_clicked': 'Issue Details: Copy Event Link Clicked',
+  'issue_details.copy_event_id_clicked': 'Issue Details: Copy Event ID Clicked',
   'issue_details.event_details_clicked': 'Issue Details: Full Event Details Clicked',
   'issue_details.event_dropdown_option_selected':
     'Issue Details: Event Dropdown Option Selected',
diff --git a/static/app/utils/analytics/onboardingAnalyticsEvents.tsx b/static/app/utils/analytics/onboardingAnalyticsEvents.tsx
index c7d4067fb60987..8b4f2156edea1c 100644
--- a/static/app/utils/analytics/onboardingAnalyticsEvents.tsx
+++ b/static/app/utils/analytics/onboardingAnalyticsEvents.tsx
@@ -28,10 +28,6 @@ export type OnboardingEventParameters = {
     platform: string;
     project_id: string;
   };
-  'onboarding.messaging_integration_external_install_clicked': {
-    provider_key: string;
-  };
-  'onboarding.messaging_integration_modal_rendered': {};
   'onboarding.next_step_clicked': {
     newOrg: boolean;
     platform: string;
@@ -99,10 +95,6 @@ export const onboardingEventMap: Record<keyof OnboardingEventParameters, string>
   'onboarding.source_maps_wizard_selected_and_copied':
     'Onboarding: Source Maps Wizard Selected and Copied',
   'onboarding.nextjs-dsn-copied': 'Onboarding: NextJS DSN Copied',
-  'onboarding.messaging_integration_modal_rendered':
-    'Onboarding: Messaging Integration Modal Rendered',
-  'onboarding.messaging_integration_external_install_clicked':
-    'Onboarding: Messaging Integration External Install Clicked',
   'onboarding.take_me_to_issues_clicked': 'Onboarding: Take Me to Issues Clicked',
   'onboarding.slack_setup_clicked': 'Onboarding: Slack Setup Clicked',
   'onboarding.next_step_clicked': 'Onboarding: Next Step Clicked',
diff --git a/static/app/utils/analytics/performanceAnalyticsEvents.tsx b/static/app/utils/analytics/performanceAnalyticsEvents.tsx
index 05b4a2b81bb74a..f498a9e55ea186 100644
--- a/static/app/utils/analytics/performanceAnalyticsEvents.tsx
+++ b/static/app/utils/analytics/performanceAnalyticsEvents.tsx
@@ -38,11 +38,6 @@ export type PerformanceEventParameters = {
     single_project: boolean;
     stats_period: string;
   };
-  'performance_views.landingv2.display.filter_change': {
-    field: string;
-    max_value: number;
-    min_value: number;
-  };
   'performance_views.landingv2.transactions.sort': {
     direction?: string;
     field?: string;
@@ -249,8 +244,6 @@ export const performanceEventMap: Record<PerformanceEventKey, string | null> = {
   'performance_views.change_view': 'Performance Views: Change View',
   'performance_views.landingv2.transactions.sort':
     'Performance Views: Landing Transactions Sorted',
-  'performance_views.landingv2.display.filter_change':
-    'Performance Views: Landing v2 Display Filter Change',
   'performance_views.overview.navigate.summary':
     'Performance Views: Overview view summary',
   'performance_views.overview.cellaction': 'Performance Views: Cell Action Clicked',
diff --git a/static/app/utils/analytics/searchAnalyticsEvents.tsx b/static/app/utils/analytics/searchAnalyticsEvents.tsx
index 7dec41302ff6ef..309e8b0147ccaa 100644
--- a/static/app/utils/analytics/searchAnalyticsEvents.tsx
+++ b/static/app/utils/analytics/searchAnalyticsEvents.tsx
@@ -1,4 +1,4 @@
-import type {ShortcutType} from 'sentry/components/smartSearchBar/types';
+import type {ShortcutType} from 'sentry/components/deprecatedSmartSearchBar/types';
 
 type SearchEventBase = {
   query: string;
diff --git a/static/app/utils/analytics/tracingEventMap.tsx b/static/app/utils/analytics/tracingEventMap.tsx
index d6fc7a76436f4c..c54f2c12058605 100644
--- a/static/app/utils/analytics/tracingEventMap.tsx
+++ b/static/app/utils/analytics/tracingEventMap.tsx
@@ -1,4 +1,4 @@
-import type {Visualize} from 'sentry/views/explore/hooks/useVisualizes';
+import type {Visualize} from 'sentry/views/explore/contexts/pageParamsContext/visualizes';
 
 export type TracingEventParameters = {
   'trace.configurations_docs_link_clicked': {
@@ -17,9 +17,11 @@ export type TracingEventParameters = {
     visualizes_count: number;
   };
   'trace.metadata': {
+    has_exceeded_performance_usage_limit: boolean | null;
     num_nodes: number;
     num_root_children: number;
     project_platforms: string[];
+    referrer: string | null;
     shape: string;
     trace_duration_seconds: number;
   };
@@ -145,7 +147,7 @@ export const tracingEventMap: Record<TracingEventKey, string | null> = {
   'trace.trace_layout.view_in_insight_module': 'View Trace Span in Insight Module',
   'trace.trace_layout.search_match_navigate': 'Navigate Trace Search Matches',
   'trace.trace_layout.view_similar_spans': 'View Similar Spans in Trace',
-  'trace.trace_layout.view_span_summary': 'View Span Summary in Trace',
+  'trace.trace_layout.view_span_summary': 'More Samples in Trace',
   'trace.trace_layout.span_row_click': 'Clicked Span Row in Trace',
   'trace_explorer.add_span_condition': 'Trace Explorer: Add Another Span',
   'trace_explorer.open_in_issues': 'Trace Explorer: Open Trace in Issues',
diff --git a/static/app/utils/analytics/workflowAnalyticsEvents.tsx b/static/app/utils/analytics/workflowAnalyticsEvents.tsx
index 99f416202fc7b9..babbede2808b9a 100644
--- a/static/app/utils/analytics/workflowAnalyticsEvents.tsx
+++ b/static/app/utils/analytics/workflowAnalyticsEvents.tsx
@@ -19,6 +19,8 @@ interface IssueDetailsWithAlert extends CommonGroupAnalyticsData {
 
 export type BaseEventAnalyticsParams = {
   event_id: string;
+  exception_group_height: number;
+  exception_group_width: number;
   has_commit: boolean;
   has_exception_group: boolean;
   has_local_variables: boolean;
@@ -104,7 +106,7 @@ export type TeamInsightsEventParameters = {
   'issue_details.attachment_tab.screenshot_modal_download': {};
   'issue_details.attachment_tab.screenshot_modal_opened': {};
   'issue_details.attachment_tab.screenshot_title_clicked': {};
-  'issue_details.event_json_clicked': {group_id: number};
+  'issue_details.event_json_clicked': {group_id: number; streamline: boolean};
   'issue_details.event_navigation_clicked': {button: string; project_id: number};
   'issue_details.issue_tab.screenshot_dropdown_deleted': {};
   'issue_details.issue_tab.screenshot_dropdown_download': {};
@@ -145,8 +147,6 @@ export type TeamInsightsEventParameters = {
   };
   'issue_stream.updated_empty_state_viewed': {platform: string};
   'project_creation_page.created': {
-    created_integration_notification: boolean;
-    has_onboarding_feature_flag: boolean;
     issue_alert: 'Default' | 'Custom' | 'No Rule';
     platform: string;
     project_id: string;
diff --git a/static/app/utils/api/useAggregatedQueryKeys.spec.tsx b/static/app/utils/api/useAggregatedQueryKeys.spec.tsx
index 73cd0a64b816d7..1dc0e3de704114 100644
--- a/static/app/utils/api/useAggregatedQueryKeys.spec.tsx
+++ b/static/app/utils/api/useAggregatedQueryKeys.spec.tsx
@@ -103,13 +103,13 @@ describe('useAggregatedQueryKeys', () => {
     });
 
     // Nothing has been asked for yet:
-    expect(result1.current.data).toEqual(undefined);
+    expect(result1.current.data).toBeUndefined();
 
     result1.current.buffer(['1111']);
     result1.current.buffer(['2222', '3333']);
 
     // We asked for 3 things, but the cache is empty:
-    expect(result1.current.data).toEqual(undefined);
+    expect(result1.current.data).toBeUndefined();
 
     // Wait to full up the cache:
     await waitFor(() => {
diff --git a/static/app/utils/api/useFetchSequentialPages.spec.tsx b/static/app/utils/api/useFetchSequentialPages.spec.tsx
index c9cc53cfb93dad..4dfff84900f135 100644
--- a/static/app/utils/api/useFetchSequentialPages.spec.tsx
+++ b/static/app/utils/api/useFetchSequentialPages.spec.tsx
@@ -166,7 +166,7 @@ describe('useFetchSequentialPages', () => {
       'results starting at 0',
       'results starting at 10',
     ]);
-    expect(result.current.error).toEqual(undefined);
+    expect(result.current.error).toBeUndefined();
   });
 
   it('should stop fetching if there is an error', async () => {
diff --git a/static/app/utils/api/useFetchSequentialPages.tsx b/static/app/utils/api/useFetchSequentialPages.tsx
index a19a0f4e20354f..1ebbb46127e43c 100644
--- a/static/app/utils/api/useFetchSequentialPages.tsx
+++ b/static/app/utils/api/useFetchSequentialPages.tsx
@@ -138,7 +138,7 @@ export default function useFetchSequentialPages<Data>({
           parsedHeader = parseLinkHeader(pageLinks)?.next;
         }
       } catch (error) {
-        responsePages.current.set(parsedHeader?.cursor, {
+        responsePages.current.set(parsedHeader?.cursor!, {
           data: undefined,
           error,
           getResponseHeader: undefined,
diff --git a/static/app/utils/array/hasDuplicates.ts b/static/app/utils/array/hasDuplicates.ts
deleted file mode 100644
index 33a40a2f82d7fe..00000000000000
--- a/static/app/utils/array/hasDuplicates.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Determines whether the provided array contains any duplicate elements.
- * Returns `true` if there are duplicates, and `false` if all elements are unique.
- *
- * @param array - The array to be checked for duplicates.
- * @returns `boolean` - `true` if duplicates are found; otherwise `false`.
- */
-export function hasDuplicates<T = unknown>(array: T[]): boolean {
-  const seen = new Set();
-  for (const item of array) {
-    if (seen.has(item)) {
-      return true; // Duplicate found
-    }
-    seen.add(item);
-  }
-  return false; // No duplicates
-}
diff --git a/static/app/utils/array/removeAtArrayIndex.tsx b/static/app/utils/array/removeAtArrayIndex.tsx
index d5c9537fd5da37..b5270c2c6aa82b 100644
--- a/static/app/utils/array/removeAtArrayIndex.tsx
+++ b/static/app/utils/array/removeAtArrayIndex.tsx
@@ -1,8 +1,6 @@
 /**
  * Remove item at `index` in `array` without mutating `array`
  */
-export default function removeAtArrayIndex<T>(array: T[], index: number): T[] {
-  const newArray = [...array];
-  newArray.splice(index, 1);
-  return newArray;
+export default function removeAtArrayIndex<T>(array: Readonly<T[]>, index: number): T[] {
+  return array.toSpliced(index, 1);
 }
diff --git a/static/app/utils/array/replaceAtArrayIndex.tsx b/static/app/utils/array/replaceAtArrayIndex.tsx
index a52a5fb04419ef..4e6cf4018a2536 100644
--- a/static/app/utils/array/replaceAtArrayIndex.tsx
+++ b/static/app/utils/array/replaceAtArrayIndex.tsx
@@ -1,8 +1,10 @@
 /**
- * Replace item at `index` in `array` with `obj`
+ * Replace item at `index` in `array` with `obj` without mutating `array`
  */
-export default function replaceAtArrayIndex<T>(array: T[], index: number, obj: T): T[] {
-  const newArray = [...array];
-  newArray.splice(index, 1, obj);
-  return newArray;
+export default function replaceAtArrayIndex<T>(
+  array: Readonly<T[]>,
+  index: number,
+  obj: T
+): T[] {
+  return array.toSpliced(index, 1, obj);
 }
diff --git a/static/app/utils/consolidatedScopes.tsx b/static/app/utils/consolidatedScopes.tsx
index ef4e6fe0c915ed..146d3283651b23 100644
--- a/static/app/utils/consolidatedScopes.tsx
+++ b/static/app/utils/consolidatedScopes.tsx
@@ -42,7 +42,7 @@ type PermissionLevelResources = {
  * which is higher than Read. Used to sort scopes by access.
  */
 const permissionLevel = (scope: string): number => {
-  const permission = scope.split(':')[1];
+  const permission = scope.split(':')[1]!;
   return PERMISSION_LEVELS[permission];
 };
 
@@ -102,7 +102,7 @@ function toResourcePermissions(scopes: string[]): Permissions {
 
   topScopes(filteredScopes).forEach((scope: string | undefined) => {
     if (scope) {
-      const [resource, permission] = scope.split(':');
+      const [resource, permission] = scope.split(':') as [string, string];
       permissions[HUMAN_RESOURCE_NAMES[resource]] = permission;
     }
   });
diff --git a/static/app/utils/cursor.tsx b/static/app/utils/cursor.tsx
index 99c0c08776b7b3..31f4d02e5a8701 100644
--- a/static/app/utils/cursor.tsx
+++ b/static/app/utils/cursor.tsx
@@ -13,7 +13,7 @@ export function parseCursor(
   }
   if (Array.isArray(cursor)) {
     if (cursor.length > 0) {
-      cursor = cursor[0];
+      cursor = cursor[0]!;
     } else {
       return undefined;
     }
@@ -25,8 +25,8 @@ export function parseCursor(
   }
 
   try {
-    const value = parseInt(bits[0], 10);
-    const offset = parseInt(bits[1], 10);
+    const value = parseInt(bits[0]!, 10);
+    const offset = parseInt(bits[1]!, 10);
     const isPrev = bits[2] === '1';
     return {isPrev, offset, value};
   } catch (e) {
diff --git a/static/app/utils/cursorPoller.tsx b/static/app/utils/cursorPoller.tsx
index 1d2e782fc5b88e..ed83bef6e4f2b9 100644
--- a/static/app/utils/cursorPoller.tsx
+++ b/static/app/utils/cursorPoller.tsx
@@ -94,7 +94,7 @@ class CursorPoller {
         const hitsHeader = resp?.getResponseHeader('X-Hits') ?? null;
         const queryCount = defined(hitsHeader) ? parseInt(hitsHeader, 10) || 0 : 0;
         const links = parseLinkHeader(linksHeader);
-        this.setEndpoint(links.previous.href);
+        this.setEndpoint(links.previous!.href);
 
         this.options.success(data, {queryCount});
       },
diff --git a/static/app/utils/customMeasurements/customMeasurementsProvider.tsx b/static/app/utils/customMeasurements/customMeasurementsProvider.tsx
index cd4688360995a2..2164706cfdaeee 100644
--- a/static/app/utils/customMeasurements/customMeasurementsProvider.tsx
+++ b/static/app/utils/customMeasurements/customMeasurementsProvider.tsx
@@ -69,9 +69,9 @@ export function CustomMeasurementsProvider({
           acc[customMeasurement] = {
             key: customMeasurement,
             name: customMeasurement,
-            functions: response[customMeasurement].functions,
-            unit: response[customMeasurement].unit,
-            fieldType: getFieldTypeFromUnit(response[customMeasurement].unit),
+            functions: response[customMeasurement]!.functions,
+            unit: response[customMeasurement]!.unit,
+            fieldType: getFieldTypeFromUnit(response[customMeasurement]!.unit),
           };
           return acc;
         }, {});
diff --git a/static/app/utils/dates.tsx b/static/app/utils/dates.tsx
index 1f61da2780af1f..705c8bb5b3a480 100644
--- a/static/app/utils/dates.tsx
+++ b/static/app/utils/dates.tsx
@@ -91,7 +91,11 @@ export function setDateToTime(
   timeStr: string,
   {local}: {local?: boolean} = {}
 ): Date {
-  const [hours, minutes, seconds] = timeStr.split(':').map(t => parseInt(t, 10));
+  const [hours, minutes, seconds] = timeStr.split(':').map(t => parseInt(t, 10)) as [
+    number,
+    number,
+    number,
+  ];
 
   const date = new Date(+dateObj);
 
diff --git a/static/app/utils/discover/arrayValue.tsx b/static/app/utils/discover/arrayValue.tsx
index 6095d92159c06c..73fa1ba505422c 100644
--- a/static/app/utils/discover/arrayValue.tsx
+++ b/static/app/utils/discover/arrayValue.tsx
@@ -1,4 +1,4 @@
-import {Component} from 'react';
+import {useState} from 'react';
 import styled from '@emotion/styled';
 
 import {t} from 'sentry/locale';
@@ -9,42 +9,33 @@ import {nullableValue} from './fieldRenderers';
 type Props = {
   value: Array<string | null>;
 };
-type State = {
-  expanded: boolean;
-};
 
-class ArrayValue extends Component<Props, State> {
-  state: State = {
-    expanded: false,
-  };
-  handleToggle = () => {
-    this.setState(prevState => ({
-      expanded: !prevState.expanded,
-    }));
+function ArrayValue(props: Props) {
+  const [expanded, setExpanded] = useState<boolean>(false);
+  const {value} = props;
+
+  const handleToggle = () => {
+    setExpanded(!expanded);
   };
 
-  render() {
-    const {expanded} = this.state;
-    const {value} = this.props;
-    return (
-      <ArrayContainer expanded={expanded}>
-        {expanded &&
-          value
-            .slice(0, value.length - 1)
-            .map((item, i) => (
-              <ArrayItem key={`${i}:${item}`}>{nullableValue(item)}</ArrayItem>
-            ))}
-        <ArrayItem>{nullableValue(value.slice(-1)[0])}</ArrayItem>
-        {value.length > 1 ? (
-          <ButtonContainer>
-            <button onClick={this.handleToggle}>
-              {expanded ? t('[collapse]') : t('[+%s more]', value.length - 1)}
-            </button>
-          </ButtonContainer>
-        ) : null}
-      </ArrayContainer>
-    );
-  }
+  return (
+    <ArrayContainer expanded={expanded}>
+      {expanded &&
+        value
+          .slice(0, value.length - 1)
+          .map((item, i) => (
+            <ArrayItem key={`${i}:${item}`}>{nullableValue(item)}</ArrayItem>
+          ))}
+      <ArrayItem>{nullableValue(value.slice(-1)[0]!)}</ArrayItem>
+      {value.length > 1 ? (
+        <ButtonContainer>
+          <button onClick={handleToggle}>
+            {expanded ? t('[collapse]') : t('[+%s more]', value.length - 1)}
+          </button>
+        </ButtonContainer>
+      ) : null}
+    </ArrayContainer>
+  );
 }
 
 const ArrayContainer = styled('div')<{expanded: boolean}>`
diff --git a/static/app/utils/discover/charts.spec.tsx b/static/app/utils/discover/charts.spec.tsx
index d25da9fec86d5e..b54f7a31ac9324 100644
--- a/static/app/utils/discover/charts.spec.tsx
+++ b/static/app/utils/discover/charts.spec.tsx
@@ -91,14 +91,14 @@ describe('axisLabelFormatter()', () => {
       const axisValues = [40 * SECOND, 50 * SECOND, 60 * SECOND, 70 * SECOND];
       const durationUnit = generateDurationUnit(axisValues);
       const labels = getAxisLabels(axisValues, durationUnit);
-      expect(labels.length).toBe(new Set(labels).size);
+      expect(labels).toHaveLength(new Set(labels).size);
     });
 
     it('should use the same duration unit', () => {
       const axisValues = [50 * MINUTE, 150 * MINUTE, 250 * MINUTE, 350 * MINUTE];
       const durationUnit = generateDurationUnit(axisValues);
       const labels = getAxisLabels(axisValues, durationUnit);
-      expect(labels.length).toBe(labels.filter(label => label.endsWith('hr')).length);
+      expect(labels).toHaveLength(labels.filter(label => label.endsWith('hr')).length);
     });
   });
 });
@@ -155,7 +155,7 @@ describe('findRangeOfMultiSeries()', () => {
   });
 
   it('should find min and max when series is unordered', () => {
-    const mixedSeries = [series[1], series[0], series[2]];
+    const mixedSeries = [series[1]!, series[0]!, series[2]!];
     expect(findRangeOfMultiSeries(mixedSeries)).toStrictEqual({max: 2300, min: 50});
   });
 
@@ -169,9 +169,9 @@ describe('findRangeOfMultiSeries()', () => {
           {name: 3, value: 0},
         ],
       },
-      series[1],
-      series[0],
-      series[2],
+      series[1]!,
+      series[0]!,
+      series[2]!,
     ];
     expect(findRangeOfMultiSeries(mixedSeries)).toStrictEqual({max: 2300, min: 0});
   });
@@ -186,9 +186,9 @@ describe('findRangeOfMultiSeries()', () => {
           {name: 3, value: 10},
         ],
       },
-      series[1],
-      series[0],
-      series[2],
+      series[1]!,
+      series[0]!,
+      series[2]!,
     ];
     expect(findRangeOfMultiSeries(mixedSeries)).toStrictEqual({max: 2300, min: -10});
   });
@@ -219,7 +219,7 @@ describe('findRangeOfMultiSeries()', () => {
     const legend: LegendComponentOption = {
       selected: {'p100()': false, 'p95()': false, 'p50()': false},
     };
-    expect(findRangeOfMultiSeries(series, legend)).toStrictEqual(undefined);
+    expect(findRangeOfMultiSeries(series, legend)).toBeUndefined();
   });
 
   it('should ignore p100 series if not selected', () => {
diff --git a/static/app/utils/discover/discoverQuery.spec.tsx b/static/app/utils/discover/discoverQuery.spec.tsx
index 287b5d5e10ca38..d7ecd880f2a83e 100644
--- a/static/app/utils/discover/discoverQuery.spec.tsx
+++ b/static/app/utils/discover/discoverQuery.spec.tsx
@@ -34,7 +34,7 @@ describe('DiscoverQuery', function () {
           if (isLoading) {
             return 'loading';
           }
-          return <p>{tableData?.data[0].transaction}</p>;
+          return <p>{tableData?.data[0]!.transaction}</p>;
         }}
       </DiscoverQuery>
     );
@@ -64,7 +64,7 @@ describe('DiscoverQuery', function () {
           if (isLoading) {
             return 'loading';
           }
-          return <p>{tableData?.data[0].transaction}</p>;
+          return <p>{tableData?.data[0]!.transaction}</p>;
         }}
       </DiscoverQuery>
     );
diff --git a/static/app/utils/discover/eventView.spec.tsx b/static/app/utils/discover/eventView.spec.tsx
index 8ba7bdbd4ba88c..e8f2232fffea4a 100644
--- a/static/app/utils/discover/eventView.spec.tsx
+++ b/static/app/utils/discover/eventView.spec.tsx
@@ -329,9 +329,9 @@ describe('EventView.fromSavedQuery()', function () {
       {field: 'title', width: COL_WIDTH_UNDEFINED},
     ]);
     expect(eventView.name).toEqual(saved.name);
-    expect(eventView.statsPeriod).toEqual('14d');
-    expect(eventView.start).toEqual(undefined);
-    expect(eventView.end).toEqual(undefined);
+    expect(eventView.statsPeriod).toBe('14d');
+    expect(eventView.start).toBeUndefined();
+    expect(eventView.end).toBeUndefined();
   });
 
   it('saved queries are equal when start and end datetime differ in format', function () {
@@ -1285,7 +1285,7 @@ describe('EventView.getEventsAPIPayload()', function () {
         query: 'TypeError',
       },
     });
-    expect(eventView.getEventsAPIPayload(location).query).toEqual('event.type:csp');
+    expect(eventView.getEventsAPIPayload(location).query).toBe('event.type:csp');
   });
 
   it('only includes at most one sort key', function () {
@@ -1300,7 +1300,7 @@ describe('EventView.getEventsAPIPayload()', function () {
       query: {},
     });
 
-    expect(eventView.getEventsAPIPayload(location).sort).toEqual('-title');
+    expect(eventView.getEventsAPIPayload(location).sort).toBe('-title');
   });
 
   it('only includes sort keys that are defined in fields', function () {
@@ -1315,7 +1315,7 @@ describe('EventView.getEventsAPIPayload()', function () {
       query: {},
     });
 
-    expect(eventView.getEventsAPIPayload(location).sort).toEqual('-count');
+    expect(eventView.getEventsAPIPayload(location).sort).toBe('-count');
   });
 
   it('only includes relevant query strings', function () {
@@ -2027,8 +2027,8 @@ describe('EventView.withColumns()', function () {
       {field: 'project.id', width: 99},
     ]);
 
-    expect(eventView.yAxis).toEqual('failure_count()');
-    expect(newView.yAxis).toEqual('count()');
+    expect(eventView.yAxis).toBe('failure_count()');
+    expect(newView.yAxis).toBe('count()');
   });
 });
 
@@ -2134,8 +2134,8 @@ describe('EventView.withResizedColumn()', function () {
 
   it('updates a column that exists', function () {
     const newView = view.withResizedColumn(0, 99);
-    expect(view.fields[0].width).toBeUndefined();
-    expect(newView.fields[0].width).toEqual(99);
+    expect(view.fields[0]!.width).toBeUndefined();
+    expect(newView.fields[0]!.width).toBe(99);
   });
 
   it('ignores columns that do not exist', function () {
@@ -2490,7 +2490,7 @@ describe('EventView.withDeletedColumn()', function () {
     it('sorted column occurs at least twice', function () {
       const modifiedState: ConstructorParameters<typeof EventView>[0] = {
         ...state,
-        fields: [...state.fields, state.fields[0]],
+        fields: [...state.fields, state.fields[0]!],
       };
 
       const eventView = new EventView(modifiedState);
@@ -2566,10 +2566,10 @@ describe('EventView.getQuery()', function () {
       query: 'event.type:error',
     });
 
-    expect(eventView.getQuery()).toEqual('event.type:error');
-    expect(eventView.getQuery(null)).toEqual('event.type:error');
-    expect(eventView.getQuery('hello')).toEqual('event.type:error hello');
-    expect(eventView.getQuery(['event.type:error', 'hello'])).toEqual(
+    expect(eventView.getQuery()).toBe('event.type:error');
+    expect(eventView.getQuery(null)).toBe('event.type:error');
+    expect(eventView.getQuery('hello')).toBe('event.type:error hello');
+    expect(eventView.getQuery(['event.type:error', 'hello'])).toBe(
       'event.type:error hello'
     );
   });
@@ -2582,10 +2582,10 @@ describe('EventView.getQuery()', function () {
       project: [],
     });
 
-    expect(eventView.getQuery()).toEqual('');
-    expect(eventView.getQuery(null)).toEqual('');
-    expect(eventView.getQuery('hello')).toEqual('hello');
-    expect(eventView.getQuery(['event.type:error', 'hello'])).toEqual(
+    expect(eventView.getQuery()).toBe('');
+    expect(eventView.getQuery(null)).toBe('');
+    expect(eventView.getQuery('hello')).toBe('hello');
+    expect(eventView.getQuery(['event.type:error', 'hello'])).toBe(
       'event.type:error hello'
     );
   });
@@ -2603,7 +2603,7 @@ describe('EventView.getQueryWithAdditionalConditions', function () {
 
     eventView.additionalConditions.setFilterValues('event.type', ['transaction']);
 
-    expect(eventView.getQueryWithAdditionalConditions()).toEqual(
+    expect(eventView.getQueryWithAdditionalConditions()).toBe(
       'event.type:transaction foo:bar'
     );
   });
@@ -2677,7 +2677,7 @@ describe('EventView.sortOnField()', function () {
     const eventView = new EventView(state);
     expect(eventView).toMatchObject(state);
 
-    const field = state.fields[1];
+    const field = state.fields[1]!;
 
     const eventView2 = eventView.sortOnField(field, meta);
     expect(eventView2 === eventView).toBe(true);
@@ -2687,7 +2687,7 @@ describe('EventView.sortOnField()', function () {
     const eventView = new EventView(state);
     expect(eventView).toMatchObject(state);
 
-    const field = state.fields[0];
+    const field = state.fields[0]!;
 
     const eventView2 = eventView.sortOnField(field, meta);
 
@@ -2705,7 +2705,7 @@ describe('EventView.sortOnField()', function () {
     const eventView = new EventView(state);
     expect(eventView).toMatchObject(state);
 
-    const field = state.fields[0];
+    const field = state.fields[0]!;
 
     const eventView2 = eventView.sortOnField(field, meta, 'asc');
     expect(eventView2).toMatchObject({
@@ -2751,7 +2751,7 @@ describe('EventView.sortOnField()', function () {
     const eventView = new EventView(modifiedState);
     expect(eventView).toMatchObject(modifiedState);
 
-    const field = modifiedState.fields[2];
+    const field = modifiedState.fields[2]!;
 
     const eventView2 = eventView.sortOnField(field, meta);
 
@@ -2792,7 +2792,7 @@ describe('EventView.sortOnField()', function () {
     const eventView = new EventView(modifiedState);
     expect(eventView).toMatchObject(modifiedState);
 
-    const field = modifiedState.fields[2];
+    const field = modifiedState.fields[2]!;
 
     let sortedEventView = eventView.sortOnField(field, meta, undefined, true);
     expect(sortedEventView.sorts).toEqual([{field: 'count()', kind: 'asc'}]);
@@ -2994,18 +2994,18 @@ describe('EventView.getResultsViewUrlTarget()', function () {
     ConfigStore.set('customerDomain', null);
     const view = new EventView(state);
     const result = view.getResultsViewUrlTarget(organization.slug);
-    expect(result.pathname).toEqual('/organizations/org-slug/discover/results/');
+    expect(result.pathname).toBe('/organizations/org-slug/discover/results/');
     expect(result.query.query).toEqual(state.query);
-    expect(result.query.project).toEqual('42');
+    expect(result.query.project).toBe('42');
     expect(result.query.display).toEqual(state.display);
   });
 
   it('generates a URL with customer domain context', function () {
     const view = new EventView(state);
     const result = view.getResultsViewUrlTarget(organization.slug);
-    expect(result.pathname).toEqual('/discover/results/');
+    expect(result.pathname).toBe('/discover/results/');
     expect(result.query.query).toEqual(state.query);
-    expect(result.query.project).toEqual('42');
+    expect(result.query.project).toBe('42');
     expect(result.query.display).toEqual(state.display);
   });
 });
@@ -3051,27 +3051,27 @@ describe('EventView.getResultsViewShortUrlTarget()', function () {
 
     const view = new EventView(state);
     const result = view.getResultsViewShortUrlTarget(organization.slug);
-    expect(result.pathname).toEqual('/organizations/org-slug/discover/results/');
+    expect(result.pathname).toBe('/organizations/org-slug/discover/results/');
     expect(result.query).not.toHaveProperty('name');
     expect(result.query).not.toHaveProperty('fields');
     expect(result.query).not.toHaveProperty('query');
     expect(result.query.id).toEqual(state.id);
     expect(result.query.statsPeriod).toEqual(state.statsPeriod);
-    expect(result.query.project).toEqual('42');
-    expect(result.query.environment).toEqual('staging');
+    expect(result.query.project).toBe('42');
+    expect(result.query.environment).toBe('staging');
   });
 
   it('generates a URL with customer domain context', function () {
     const view = new EventView(state);
     const result = view.getResultsViewShortUrlTarget(organization.slug);
-    expect(result.pathname).toEqual('/discover/results/');
+    expect(result.pathname).toBe('/discover/results/');
     expect(result.query).not.toHaveProperty('name');
     expect(result.query).not.toHaveProperty('fields');
     expect(result.query).not.toHaveProperty('query');
     expect(result.query.id).toEqual(state.id);
     expect(result.query.statsPeriod).toEqual(state.statsPeriod);
-    expect(result.query.project).toEqual('42');
-    expect(result.query.environment).toEqual('staging');
+    expect(result.query.project).toBe('42');
+    expect(result.query.environment).toBe('staging');
   });
 });
 
@@ -3122,12 +3122,10 @@ describe('EventView.getPerformanceTransactionEventsViewUrlTarget()', function ()
       breakdown,
       webVital,
     });
-    expect(result.pathname).toEqual(
-      '/organizations/org-slug/performance/summary/events/'
-    );
+    expect(result.pathname).toBe('/organizations/org-slug/performance/summary/events/');
     expect(result.query.query).toEqual(state.query);
-    expect(result.query.project).toEqual('42');
-    expect(result.query.sort).toEqual('-count');
+    expect(result.query.project).toBe('42');
+    expect(result.query.sort).toBe('-count');
     expect(result.query.transaction).toEqual(state.name);
     expect(result.query.showTransactions).toEqual(showTransactions);
     expect(result.query.breakdown).toEqual(breakdown);
@@ -3141,10 +3139,10 @@ describe('EventView.getPerformanceTransactionEventsViewUrlTarget()', function ()
       breakdown,
       webVital,
     });
-    expect(result.pathname).toEqual('/performance/summary/events/');
+    expect(result.pathname).toBe('/performance/summary/events/');
     expect(result.query.query).toEqual(state.query);
-    expect(result.query.project).toEqual('42');
-    expect(result.query.sort).toEqual('-count');
+    expect(result.query.project).toBe('42');
+    expect(result.query.sort).toBe('-count');
     expect(result.query.transaction).toEqual(state.name);
     expect(result.query.showTransactions).toEqual(showTransactions);
     expect(result.query.breakdown).toEqual(breakdown);
@@ -3342,7 +3340,7 @@ describe('EventView.getYAxis()', function () {
   it('should return first default yAxis', function () {
     const thisEventView = new EventView(state);
 
-    expect(thisEventView.getYAxis()).toEqual('count()');
+    expect(thisEventView.getYAxis()).toBe('count()');
   });
 
   it('should return valid yAxis', function () {
@@ -3352,7 +3350,7 @@ describe('EventView.getYAxis()', function () {
       yAxis: 'count_unique(user)',
     });
 
-    expect(thisEventView.getYAxis()).toEqual('count_unique(user)');
+    expect(thisEventView.getYAxis()).toBe('count_unique(user)');
   });
 
   it('should ignore invalid yAxis', function () {
@@ -3370,7 +3368,7 @@ describe('EventView.getYAxis()', function () {
       });
 
       // yAxis defaults to the first entry of the default yAxis options
-      expect(thisEventView.getYAxis()).toEqual('count()');
+      expect(thisEventView.getYAxis()).toBe('count()');
     }
   });
 });
@@ -3404,8 +3402,8 @@ describe('EventView.getDisplayOptions()', function () {
     });
 
     const options = eventView.getDisplayOptions();
-    expect(options[1].value).toEqual('previous');
-    expect(options[1].disabled).toBeTruthy();
+    expect(options[1]!.value).toBe('previous');
+    expect(options[1]!.disabled).toBeTruthy();
   });
 
   it('should disable top 5 period/daily if no aggregates present', function () {
@@ -3414,10 +3412,10 @@ describe('EventView.getDisplayOptions()', function () {
     });
 
     const options = eventView.getDisplayOptions();
-    expect(options[2].value).toEqual('top5');
-    expect(options[2].disabled).toBeTruthy();
-    expect(options[4].value).toEqual('dailytop5');
-    expect(options[4].disabled).toBeTruthy();
+    expect(options[2]!.value).toBe('top5');
+    expect(options[2]!.disabled).toBeTruthy();
+    expect(options[4]!.value).toBe('dailytop5');
+    expect(options[4]!.disabled).toBeTruthy();
   });
 });
 
diff --git a/static/app/utils/discover/eventView.tsx b/static/app/utils/discover/eventView.tsx
index e0dadd3768fe57..7f86b41caddaeb 100644
--- a/static/app/utils/discover/eventView.tsx
+++ b/static/app/utils/discover/eventView.tsx
@@ -195,7 +195,7 @@ function stringifyQueryParams(
       if (query[field].length === 1) {
         query[field] = query[field][0];
       }
-      if (query[field].length === 0) {
+      if (query[field]!.length === 0) {
         query[field] = undefined;
       }
     } else {
@@ -907,7 +907,7 @@ class EventView {
     updatedColumn: Column,
     tableMeta: MetaType | undefined
   ): EventView {
-    const columnToBeUpdated = this.fields[columnIndex];
+    const columnToBeUpdated = this.fields[columnIndex]!;
     const fieldAsString = generateFieldAsString(updatedColumn);
 
     const updateField = columnToBeUpdated.field !== fieldAsString;
@@ -937,7 +937,7 @@ class EventView {
     );
 
     if (needleSortIndex >= 0) {
-      const needleSort = this.sorts[needleSortIndex];
+      const needleSort = this.sorts[needleSortIndex]!;
 
       const numOfColumns = this.fields.reduce((sum, currentField) => {
         if (isSortEqualToField(needleSort, currentField, tableMeta)) {
@@ -984,7 +984,7 @@ class EventView {
           );
           if (sortableFieldIndex >= 0) {
             const fieldToBeSorted = newEventView.fields[sortableFieldIndex];
-            const sort = fieldToSort(fieldToBeSorted, tableMeta)!;
+            const sort = fieldToSort(fieldToBeSorted!, tableMeta)!;
             newEventView.sorts = [sort];
           }
         }
@@ -1015,21 +1015,21 @@ class EventView {
     // To ensure a well formed table results.
     const hasAutoIndex = fields.find(field => field.width === COL_WIDTH_UNDEFINED);
     if (!hasAutoIndex) {
-      newEventView.fields[0].width = COL_WIDTH_UNDEFINED;
+      newEventView.fields[0]!.width = COL_WIDTH_UNDEFINED;
     }
 
     // if the deleted column is one of the sorted columns, we need to remove
     // it from the list of sorts
     const columnToBeDeleted = this.fields[columnIndex];
     const needleSortIndex = this.sorts.findIndex(sort =>
-      isSortEqualToField(sort, columnToBeDeleted, tableMeta)
+      isSortEqualToField(sort, columnToBeDeleted!, tableMeta)
     );
 
     if (needleSortIndex >= 0) {
       const needleSort = this.sorts[needleSortIndex];
 
       const numOfColumns = this.fields.reduce((sum, field) => {
-        if (isSortEqualToField(needleSort, field, tableMeta)) {
+        if (isSortEqualToField(needleSort!, field, tableMeta)) {
           return sum + 1;
         }
 
@@ -1050,7 +1050,7 @@ class EventView {
           );
 
           if (sortableFieldIndex >= 0) {
-            const fieldToBeSorted = newEventView.fields[sortableFieldIndex];
+            const fieldToBeSorted = newEventView.fields[sortableFieldIndex]!;
             const sort = fieldToSort(fieldToBeSorted, tableMeta)!;
             newEventView.sorts = [sort];
           }
@@ -1177,7 +1177,7 @@ class EventView {
         ? undefined
         : this.sorts.length > 1
           ? encodeSorts(this.sorts)
-          : encodeSort(this.sorts[0]);
+          : encodeSort(this.sorts[0]!);
     const fields = this.getFields();
     const team = this.team.map(proj => String(proj));
     const project = this.project.map(proj => String(proj));
@@ -1235,7 +1235,7 @@ class EventView {
     }
     return {
       pathname: normalizeUrl(`/organizations/${slug}/discover/${target}/`),
-      query: query,
+      query,
     };
   }
 
@@ -1317,7 +1317,7 @@ class EventView {
     if (needleIndex >= 0) {
       const newEventView = this.clone();
 
-      const currentSort = this.sorts[needleIndex];
+      const currentSort = this.sorts[needleIndex]!;
 
       const sorts = [...newEventView.sorts];
       sorts[needleIndex] = kind
@@ -1369,7 +1369,7 @@ class EventView {
     const yAxisOptions = this.getYAxisOptions();
 
     const yAxis = this.yAxis;
-    const defaultOption = yAxisOptions[0].value;
+    const defaultOption = yAxisOptions[0]!.value;
 
     if (!yAxis) {
       return defaultOption;
@@ -1381,7 +1381,7 @@ class EventView {
     );
 
     if (result >= 0) {
-      return typeof yAxis === 'string' ? yAxis : yAxis[0];
+      return typeof yAxis === 'string' ? yAxis : yAxis[0]!;
     }
 
     return defaultOption;
diff --git a/static/app/utils/discover/fieldRenderers.spec.tsx b/static/app/utils/discover/fieldRenderers.spec.tsx
index 59f1d506624af8..308fe444c4ea84 100644
--- a/static/app/utils/discover/fieldRenderers.spec.tsx
+++ b/static/app/utils/discover/fieldRenderers.spec.tsx
@@ -150,9 +150,7 @@ describe('getFieldRenderer', function () {
       const renderer = getFieldRenderer('createdAt', {createdAt: 'date'});
       render(renderer(data, {location, organization}) as React.ReactElement<any, any>);
 
-      await waitFor(() =>
-        expect(screen.getByText('Oct 3, 2019 9:13:14 AM PDT')).toBeInTheDocument()
-      );
+      await screen.findByText('Oct 3, 2019 9:13:14 AM PDT');
     });
 
     it('can render date fields using utc when query string has utc set to true', async function () {
@@ -164,9 +162,7 @@ describe('getFieldRenderer', function () {
         }) as React.ReactElement<any, any>
       );
 
-      await waitFor(() =>
-        expect(screen.getByText('Oct 3, 2019 4:13:14 PM UTC')).toBeInTheDocument()
-      );
+      await screen.findByText('Oct 3, 2019 4:13:14 PM UTC');
     });
   });
 
diff --git a/static/app/utils/discover/fields.spec.tsx b/static/app/utils/discover/fields.spec.tsx
index 86d76b1c1e1424..f14250bc0c3e57 100644
--- a/static/app/utils/discover/fields.spec.tsx
+++ b/static/app/utils/discover/fields.spec.tsx
@@ -17,9 +17,9 @@ import {
 
 describe('parseFunction', function () {
   it('returns null on non aggregate fields', function () {
-    expect(parseFunction('field')).toEqual(null);
-    expect(parseFunction('under_field')).toEqual(null);
-    expect(parseFunction('foo.bar.is-Enterprise_42')).toEqual(null);
+    expect(parseFunction('field')).toBeNull();
+    expect(parseFunction('under_field')).toBeNull();
+    expect(parseFunction('foo.bar.is-Enterprise_42')).toBeNull();
   });
 
   it('handles 0 arg functions', function () {
@@ -95,32 +95,32 @@ describe('parseFunction', function () {
 
 describe('getAggregateAlias', function () {
   it('no-ops simple fields', function () {
-    expect(getAggregateAlias('field')).toEqual('field');
-    expect(getAggregateAlias('under_field')).toEqual('under_field');
-    expect(getAggregateAlias('foo.bar.is-Enterprise_42')).toEqual(
+    expect(getAggregateAlias('field')).toBe('field');
+    expect(getAggregateAlias('under_field')).toBe('under_field');
+    expect(getAggregateAlias('foo.bar.is-Enterprise_42')).toBe(
       'foo.bar.is-Enterprise_42'
     );
   });
 
   it('handles 0 arg functions', function () {
-    expect(getAggregateAlias('count()')).toEqual('count');
-    expect(getAggregateAlias('count_unique()')).toEqual('count_unique');
+    expect(getAggregateAlias('count()')).toBe('count');
+    expect(getAggregateAlias('count_unique()')).toBe('count_unique');
   });
 
   it('handles 1 arg functions', function () {
-    expect(getAggregateAlias('count(id)')).toEqual('count_id');
-    expect(getAggregateAlias('count_unique(user)')).toEqual('count_unique_user');
-    expect(getAggregateAlias('count_unique(issue.id)')).toEqual('count_unique_issue_id');
-    expect(getAggregateAlias('count(foo.bar.is-Enterprise_42)')).toEqual(
+    expect(getAggregateAlias('count(id)')).toBe('count_id');
+    expect(getAggregateAlias('count_unique(user)')).toBe('count_unique_user');
+    expect(getAggregateAlias('count_unique(issue.id)')).toBe('count_unique_issue_id');
+    expect(getAggregateAlias('count(foo.bar.is-Enterprise_42)')).toBe(
       'count_foo_bar_is_Enterprise_42'
     );
   });
 
   it('handles 2 arg functions', function () {
-    expect(getAggregateAlias('percentile(transaction.duration,0.81)')).toEqual(
+    expect(getAggregateAlias('percentile(transaction.duration,0.81)')).toBe(
       'percentile_transaction_duration_0_81'
     );
-    expect(getAggregateAlias('percentile(transaction.duration,  0.11)')).toEqual(
+    expect(getAggregateAlias('percentile(transaction.duration,  0.11)')).toBe(
       'percentile_transaction_duration_0_11'
     );
   });
@@ -128,7 +128,7 @@ describe('getAggregateAlias', function () {
   it('handles to_other with symbols', function () {
     expect(
       getAggregateAlias('to_other(release,"release:beta@1.1.1 (2)",others,current)')
-    ).toEqual('to_other_release__release_beta_1_1_1__2___others_current');
+    ).toBe('to_other_release__release_beta_1_1_1__2___others_current');
   });
 });
 
@@ -227,69 +227,67 @@ describe('explodeField', function () {
 
 describe('aggregateOutputType', function () {
   it('handles unknown fields', function () {
-    expect(aggregateOutputType('')).toEqual('number');
-    expect(aggregateOutputType('blerg')).toEqual('number');
+    expect(aggregateOutputType('')).toBe('number');
+    expect(aggregateOutputType('blerg')).toBe('number');
   });
 
   it('handles duration functions', function () {
-    expect(aggregateOutputType('p50()')).toEqual('duration');
-    expect(aggregateOutputType('p75()')).toEqual('duration');
-    expect(aggregateOutputType('p95()')).toEqual('duration');
-    expect(aggregateOutputType('p99()')).toEqual('duration');
-    expect(aggregateOutputType('p100()')).toEqual('duration');
-    expect(aggregateOutputType('p50(transaction.duration)')).toEqual('duration');
-    expect(aggregateOutputType('p75(transaction.duration)')).toEqual('duration');
-    expect(aggregateOutputType('p95(transaction.duration)')).toEqual('duration');
-    expect(aggregateOutputType('p99(transaction.duration)')).toEqual('duration');
-    expect(aggregateOutputType('p100(transaction.duration)')).toEqual('duration');
-    expect(aggregateOutputType('percentile(transaction.duration, 0.51)')).toEqual(
-      'duration'
-    );
-    expect(aggregateOutputType('percentile(transaction.duration,0.99)')).toEqual(
+    expect(aggregateOutputType('p50()')).toBe('duration');
+    expect(aggregateOutputType('p75()')).toBe('duration');
+    expect(aggregateOutputType('p95()')).toBe('duration');
+    expect(aggregateOutputType('p99()')).toBe('duration');
+    expect(aggregateOutputType('p100()')).toBe('duration');
+    expect(aggregateOutputType('p50(transaction.duration)')).toBe('duration');
+    expect(aggregateOutputType('p75(transaction.duration)')).toBe('duration');
+    expect(aggregateOutputType('p95(transaction.duration)')).toBe('duration');
+    expect(aggregateOutputType('p99(transaction.duration)')).toBe('duration');
+    expect(aggregateOutputType('p100(transaction.duration)')).toBe('duration');
+    expect(aggregateOutputType('percentile(transaction.duration, 0.51)')).toBe(
       'duration'
     );
+    expect(aggregateOutputType('percentile(transaction.duration,0.99)')).toBe('duration');
   });
 
   it('handles percentage functions', function () {
-    expect(aggregateOutputType('failure_rate()')).toEqual('percentage');
+    expect(aggregateOutputType('failure_rate()')).toBe('percentage');
   });
 
   it('handles number functions', function () {
-    expect(aggregateOutputType('apdex()')).toEqual('number');
-    expect(aggregateOutputType('apdex(500)')).toEqual('number');
-    expect(aggregateOutputType('count_miserable(user, 500)')).toEqual('number');
-    expect(aggregateOutputType('user_misery(500)')).toEqual('number');
-    expect(aggregateOutputType('eps()')).toEqual('number');
-    expect(aggregateOutputType('epm()')).toEqual('number');
+    expect(aggregateOutputType('apdex()')).toBe('number');
+    expect(aggregateOutputType('apdex(500)')).toBe('number');
+    expect(aggregateOutputType('count_miserable(user, 500)')).toBe('number');
+    expect(aggregateOutputType('user_misery(500)')).toBe('number');
+    expect(aggregateOutputType('eps()')).toBe('number');
+    expect(aggregateOutputType('epm()')).toBe('number');
   });
 
   it('handles inherit functions', function () {
-    expect(aggregateOutputType('sum(transaction.duration)')).toEqual('duration');
-    expect(aggregateOutputType('sum(stack.colno)')).toEqual('number');
+    expect(aggregateOutputType('sum(transaction.duration)')).toBe('duration');
+    expect(aggregateOutputType('sum(stack.colno)')).toBe('number');
 
-    expect(aggregateOutputType('min(stack.colno)')).toEqual('number');
-    expect(aggregateOutputType('min(timestamp)')).toEqual('date');
+    expect(aggregateOutputType('min(stack.colno)')).toBe('number');
+    expect(aggregateOutputType('min(timestamp)')).toBe('date');
 
-    expect(aggregateOutputType('max(stack.colno)')).toEqual('number');
-    expect(aggregateOutputType('max(timestamp)')).toEqual('date');
+    expect(aggregateOutputType('max(stack.colno)')).toBe('number');
+    expect(aggregateOutputType('max(timestamp)')).toBe('date');
   });
 
   it('handles measurements', function () {
-    expect(aggregateOutputType('sum(measurements.fcp)')).toEqual('duration');
-    expect(aggregateOutputType('min(measurements.fcp)')).toEqual('duration');
-    expect(aggregateOutputType('max(measurements.fcp)')).toEqual('duration');
-    expect(aggregateOutputType('avg(measurements.fcp)')).toEqual('duration');
-    expect(aggregateOutputType('percentile(measurements.fcp, 0.5)')).toEqual('duration');
-    expect(aggregateOutputType('sum(measurements.bar)')).toEqual('number');
-    expect(aggregateOutputType('min(measurements.bar)')).toEqual('number');
-    expect(aggregateOutputType('max(measurements.bar)')).toEqual('number');
-    expect(aggregateOutputType('avg(measurements.bar)')).toEqual('number');
-    expect(aggregateOutputType('percentile(measurements.bar, 0.5)')).toEqual('number');
-    expect(aggregateOutputType('p50(measurements.bar)')).toEqual('number');
-    expect(aggregateOutputType('p75(measurements.bar)')).toEqual('number');
-    expect(aggregateOutputType('p95(measurements.bar)')).toEqual('number');
-    expect(aggregateOutputType('p99(measurements.bar)')).toEqual('number');
-    expect(aggregateOutputType('p100(measurements.bar)')).toEqual('number');
+    expect(aggregateOutputType('sum(measurements.fcp)')).toBe('duration');
+    expect(aggregateOutputType('min(measurements.fcp)')).toBe('duration');
+    expect(aggregateOutputType('max(measurements.fcp)')).toBe('duration');
+    expect(aggregateOutputType('avg(measurements.fcp)')).toBe('duration');
+    expect(aggregateOutputType('percentile(measurements.fcp, 0.5)')).toBe('duration');
+    expect(aggregateOutputType('sum(measurements.bar)')).toBe('number');
+    expect(aggregateOutputType('min(measurements.bar)')).toBe('number');
+    expect(aggregateOutputType('max(measurements.bar)')).toBe('number');
+    expect(aggregateOutputType('avg(measurements.bar)')).toBe('number');
+    expect(aggregateOutputType('percentile(measurements.bar, 0.5)')).toBe('number');
+    expect(aggregateOutputType('p50(measurements.bar)')).toBe('number');
+    expect(aggregateOutputType('p75(measurements.bar)')).toBe('number');
+    expect(aggregateOutputType('p95(measurements.bar)')).toBe('number');
+    expect(aggregateOutputType('p99(measurements.bar)')).toBe('number');
+    expect(aggregateOutputType('p100(measurements.bar)')).toBe('number');
   });
 });
 
@@ -326,25 +324,25 @@ describe('generateAggregateFields', function () {
 
 describe('fieldAlignment()', function () {
   it('works with only field name', function () {
-    expect(fieldAlignment('event.type')).toEqual('left');
+    expect(fieldAlignment('event.type')).toBe('left');
 
     // Should be right, but we don't have any type data.
-    expect(fieldAlignment('transaction.duration')).toEqual('left');
+    expect(fieldAlignment('transaction.duration')).toBe('left');
   });
 
   it('works with type parameter', function () {
-    expect(fieldAlignment('transaction.duration', 'duration')).toEqual('right');
-    expect(fieldAlignment('device.battery_level', 'number')).toEqual('right');
-    expect(fieldAlignment('min(timestamp)', 'date')).toEqual('left');
+    expect(fieldAlignment('transaction.duration', 'duration')).toBe('right');
+    expect(fieldAlignment('device.battery_level', 'number')).toBe('right');
+    expect(fieldAlignment('min(timestamp)', 'date')).toBe('left');
   });
 
   it('can use table metadata', function () {
     const meta: Record<string, ColumnValueType> = {
       'transaction.duration': 'duration',
     };
-    expect(fieldAlignment('transaction.duration', 'never', meta)).toEqual('right');
-    expect(fieldAlignment('transaction.duration', undefined, meta)).toEqual('right');
+    expect(fieldAlignment('transaction.duration', 'never', meta)).toBe('right');
+    expect(fieldAlignment('transaction.duration', undefined, meta)).toBe('right');
 
-    expect(fieldAlignment('title', undefined, meta)).toEqual('left');
+    expect(fieldAlignment('title', undefined, meta)).toBe('left');
   });
 });
diff --git a/static/app/utils/discover/fields.tsx b/static/app/utils/discover/fields.tsx
index ed83e3d96f6954..5b322ac1a5c3b1 100644
--- a/static/app/utils/discover/fields.tsx
+++ b/static/app/utils/discover/fields.tsx
@@ -265,7 +265,7 @@ export const AGGREGATIONS = {
         kind: 'dropdown',
         options: CONDITIONS_ARGUMENTS,
         dataType: 'string',
-        defaultValue: CONDITIONS_ARGUMENTS[0].value,
+        defaultValue: CONDITIONS_ARGUMENTS[0]!.value,
         required: true,
       },
       {
@@ -297,7 +297,7 @@ export const AGGREGATIONS = {
         kind: 'dropdown',
         options: WEB_VITALS_QUALITY,
         dataType: 'string',
-        defaultValue: WEB_VITALS_QUALITY[0].value,
+        defaultValue: WEB_VITALS_QUALITY[0]!.value,
         required: true,
       },
     ],
@@ -684,7 +684,7 @@ export function getAggregations(dataset: DiscoverDatasets) {
           kind: 'dropdown',
           options: CONDITIONS_ARGUMENTS,
           dataType: 'string',
-          defaultValue: CONDITIONS_ARGUMENTS[0].value,
+          defaultValue: CONDITIONS_ARGUMENTS[0]!.value,
           required: true,
         },
         {
@@ -805,7 +805,7 @@ export function measurementType(field: string): MeasurementType {
 export function getMeasurementSlug(field: string): string | null {
   const results = field.match(MEASUREMENT_PATTERN);
   if (results && results.length >= 2) {
-    return results[1];
+    return results[1]!;
   }
   return null;
 }
@@ -819,7 +819,7 @@ export function getAggregateArg(field: string): string | null {
   const result = parseFunction(field);
 
   if (result && result.arguments.length > 0) {
-    return result.arguments[0];
+    return result.arguments[0]!;
   }
 
   return null;
@@ -829,8 +829,8 @@ export function parseFunction(field: string): ParsedFunction | null {
   const results = field.match(AGGREGATE_PATTERN);
   if (results && results.length === 3) {
     return {
-      name: results[1],
-      arguments: parseArguments(results[2]),
+      name: results[1]!,
+      arguments: parseArguments(results[2]!),
     };
   }
 
@@ -929,7 +929,7 @@ export function getEquationAliasIndex(field: string): number {
   const results = field.match(EQUATION_ALIAS_PATTERN);
 
   if (results && results.length === 2) {
-    return parseInt(results[1], 10);
+    return parseInt(results[1]!, 10);
   }
   return -1;
 }
@@ -1186,7 +1186,7 @@ export function aggregateFunctionOutputType(
   }
 
   if (firstArg && STARFISH_FIELDS[firstArg]) {
-    return STARFISH_FIELDS[firstArg].outputType;
+    return STARFISH_FIELDS[firstArg]!.outputType;
   }
 
   if (STARFISH_AGGREGATION_FIELDS[funcName]) {
@@ -1372,7 +1372,7 @@ export function isLegalYAxisType(match: ColumnType | MetricType) {
 export function getSpanOperationName(field: string): string | null {
   const results = field.match(SPAN_OP_BREAKDOWN_PATTERN);
   if (results && results.length >= 2) {
-    return results[1];
+    return results[1]!;
   }
   return null;
 }
diff --git a/static/app/utils/discover/teamKeyTransactionField.spec.tsx b/static/app/utils/discover/teamKeyTransactionField.spec.tsx
index 58f9d3e31dae5e..c9a66c43ed6d87 100644
--- a/static/app/utils/discover/teamKeyTransactionField.spec.tsx
+++ b/static/app/utils/discover/teamKeyTransactionField.spec.tsx
@@ -68,9 +68,9 @@ describe('TeamKeyTransactionField', function () {
       url: `/organizations/${organization.slug}/key-transactions-list/`,
       body: teams.map(({id}) => ({
         team: id,
-        count: id === teams[0].id ? 1 : 0,
+        count: id === teams[0]!.id ? 1 : 0,
         keyed:
-          id === teams[0].id
+          id === teams[0]!.id
             ? [{project_id: String(project.id), transaction: 'transaction'}]
             : [],
       })),
@@ -160,7 +160,7 @@ describe('TeamKeyTransactionField', function () {
       body: [],
       match: [
         MockApiClient.matchQuery({project: [project.id]}),
-        MockApiClient.matchData({team: [teams[0].id], transaction: 'transaction'}),
+        MockApiClient.matchData({team: [teams[0]!.id], transaction: 'transaction'}),
       ],
     });
 
@@ -185,7 +185,7 @@ describe('TeamKeyTransactionField', function () {
 
     await userEvent.click(screen.getByRole('button', {name: 'Toggle star for team'}));
 
-    const teamOneOption = screen.getAllByRole('option')[0];
+    const teamOneOption = screen.getAllByRole('option')[0]!;
     expect(teamOneOption).toHaveAttribute('aria-selected', 'false');
 
     await userEvent.click(teamOneOption);
@@ -214,7 +214,7 @@ describe('TeamKeyTransactionField', function () {
       body: [],
       match: [
         MockApiClient.matchQuery({project: [project.id]}),
-        MockApiClient.matchData({team: [teams[0].id], transaction: 'transaction'}),
+        MockApiClient.matchData({team: [teams[0]!.id], transaction: 'transaction'}),
       ],
     });
 
@@ -239,7 +239,7 @@ describe('TeamKeyTransactionField', function () {
 
     await userEvent.click(screen.getByRole('button', {name: 'Toggle star for team'}));
 
-    const teamOneOption = screen.getAllByRole('option')[0];
+    const teamOneOption = screen.getAllByRole('option')[0]!;
     expect(teamOneOption).toHaveAttribute('aria-selected', 'true');
 
     await userEvent.click(teamOneOption);
@@ -269,7 +269,7 @@ describe('TeamKeyTransactionField', function () {
       match: [
         MockApiClient.matchQuery({project: [project.id]}),
         MockApiClient.matchData({
-          team: [teams[0].id, teams[1].id],
+          team: [teams[0]!.id, teams[1]!.id],
           transaction: 'transaction',
         }),
       ],
@@ -326,7 +326,7 @@ describe('TeamKeyTransactionField', function () {
       match: [
         MockApiClient.matchQuery({project: [project.id]}),
         MockApiClient.matchData({
-          team: [teams[0].id, teams[1].id],
+          team: [teams[0]!.id, teams[1]!.id],
           transaction: 'transaction',
         }),
       ],
diff --git a/static/app/utils/displayReprocessEventAction.spec.tsx b/static/app/utils/displayReprocessEventAction.spec.tsx
index c719ab7f9832cf..9fc25ed33424e2 100644
--- a/static/app/utils/displayReprocessEventAction.spec.tsx
+++ b/static/app/utils/displayReprocessEventAction.spec.tsx
@@ -46,7 +46,7 @@ describe('DisplayReprocessEventAction', function () {
             platform: undefined,
           });
 
-          event.entries[0].data.values[0].stacktrace.frames[0].platform = 'native';
+          event.entries[0]!.data.values[0].stacktrace.frames[0].platform = 'native';
 
           expect(displayReprocessEventAction(event)).toBe(true);
         });
@@ -56,7 +56,7 @@ describe('DisplayReprocessEventAction', function () {
             platform: undefined,
           });
 
-          event.entries[0].data.values[0].stacktrace.frames[0].platform = 'cocoa';
+          event.entries[0]!.data.values[0].stacktrace.frames[0].platform = 'cocoa';
 
           expect(displayReprocessEventAction(event)).toBe(true);
         });
@@ -68,8 +68,8 @@ describe('DisplayReprocessEventAction', function () {
         platform: undefined,
       });
 
-      event.entries[0].data.values[0] = {
-        ...event.entries[0].data.values[0],
+      event.entries[0]!.data.values[0] = {
+        ...event.entries[0]!.data.values[0],
         mechanism: {
           type: 'minidump',
         },
@@ -83,8 +83,8 @@ describe('DisplayReprocessEventAction', function () {
         platform: undefined,
       });
 
-      event.entries[0].data.values[0] = {
-        ...event.entries[0].data.values[0],
+      event.entries[0]!.data.values[0] = {
+        ...event.entries[0]!.data.values[0],
         mechanism: {
           type: 'applecrashreport',
         },
diff --git a/static/app/utils/duration/getExactDuration.spec.tsx b/static/app/utils/duration/getExactDuration.spec.tsx
index f022fd592ffa46..966bff71381d05 100644
--- a/static/app/utils/duration/getExactDuration.spec.tsx
+++ b/static/app/utils/duration/getExactDuration.spec.tsx
@@ -2,43 +2,43 @@ import {getExactDuration} from 'sentry/utils/duration/getExactDuration';
 
 describe('getExactDuration', () => {
   it('should provide default value', () => {
-    expect(getExactDuration(0)).toEqual('0 milliseconds');
+    expect(getExactDuration(0)).toBe('0 milliseconds');
   });
 
   it('should format durations without extra suffixes', () => {
-    expect(getExactDuration(2.030043848568126)).toEqual('2 seconds 30 milliseconds');
-    expect(getExactDuration(0.2)).toEqual('200 milliseconds');
-    expect(getExactDuration(13)).toEqual('13 seconds');
-    expect(getExactDuration(60)).toEqual('1 minute');
-    expect(getExactDuration(121)).toEqual('2 minutes 1 second');
-    expect(getExactDuration(234235435)).toEqual(
+    expect(getExactDuration(2.030043848568126)).toBe('2 seconds 30 milliseconds');
+    expect(getExactDuration(0.2)).toBe('200 milliseconds');
+    expect(getExactDuration(13)).toBe('13 seconds');
+    expect(getExactDuration(60)).toBe('1 minute');
+    expect(getExactDuration(121)).toBe('2 minutes 1 second');
+    expect(getExactDuration(234235435)).toBe(
       '387 weeks 2 days 1 hour 23 minutes 55 seconds'
     );
   });
 
   it('should format negative durations', () => {
-    expect(getExactDuration(-2.030043848568126)).toEqual('-2 seconds 30 milliseconds');
-    expect(getExactDuration(-0.2)).toEqual('-200 milliseconds');
-    expect(getExactDuration(-13)).toEqual('-13 seconds');
-    expect(getExactDuration(-60)).toEqual('-1 minute');
-    expect(getExactDuration(-121)).toEqual('-2 minutes 1 second');
-    expect(getExactDuration(-234235435)).toEqual(
+    expect(getExactDuration(-2.030043848568126)).toBe('-2 seconds 30 milliseconds');
+    expect(getExactDuration(-0.2)).toBe('-200 milliseconds');
+    expect(getExactDuration(-13)).toBe('-13 seconds');
+    expect(getExactDuration(-60)).toBe('-1 minute');
+    expect(getExactDuration(-121)).toBe('-2 minutes 1 second');
+    expect(getExactDuration(-234235435)).toBe(
       '-387 weeks 2 days 1 hour 23 minutes 55 seconds'
     );
   });
 
   it('should abbreviate label', () => {
-    expect(getExactDuration(234235435, true)).toEqual('387wk 2d 1hr 23min 55s');
+    expect(getExactDuration(234235435, true)).toBe('387wk 2d 1hr 23min 55s');
   });
 
   it('should pin/truncate to the min suffix precision if provided', () => {
-    expect(getExactDuration(0, false, 'seconds')).toEqual('0 seconds');
-    expect(getExactDuration(0.2, false, 'seconds')).toEqual('0 seconds');
-    expect(getExactDuration(2.030043848568126, false, 'seconds')).toEqual('2 seconds');
-    expect(getExactDuration(13, false, 'seconds')).toEqual('13 seconds');
-    expect(getExactDuration(60, false, 'seconds')).toEqual('1 minute');
-    expect(getExactDuration(121, false, 'seconds')).toEqual('2 minutes 1 second');
-    expect(getExactDuration(234235435.2, false, 'seconds')).toEqual(
+    expect(getExactDuration(0, false, 'seconds')).toBe('0 seconds');
+    expect(getExactDuration(0.2, false, 'seconds')).toBe('0 seconds');
+    expect(getExactDuration(2.030043848568126, false, 'seconds')).toBe('2 seconds');
+    expect(getExactDuration(13, false, 'seconds')).toBe('13 seconds');
+    expect(getExactDuration(60, false, 'seconds')).toBe('1 minute');
+    expect(getExactDuration(121, false, 'seconds')).toBe('2 minutes 1 second');
+    expect(getExactDuration(234235435.2, false, 'seconds')).toBe(
       '387 weeks 2 days 1 hour 23 minutes 55 seconds'
     );
   });
diff --git a/static/app/utils/duration/getPeriod.tsx b/static/app/utils/duration/getPeriod.tsx
index e52ec829877394..aeebc707bd29e6 100644
--- a/static/app/utils/duration/getPeriod.tsx
+++ b/static/app/utils/duration/getPeriod.tsx
@@ -48,7 +48,7 @@ export function getPeriod(
     }
     const [, periodNumber, periodLength] = period.match(/([0-9]+)([mhdw])/)!;
 
-    return {statsPeriod: `${parseInt(periodNumber, 10) * 2}${periodLength}`};
+    return {statsPeriod: `${parseInt(periodNumber!, 10) * 2}${periodLength}`};
   }
 
   if (!start || !end) {
diff --git a/static/app/utils/duration/intervalToMilliseconds.tsx b/static/app/utils/duration/intervalToMilliseconds.tsx
index 97f778199c5010..56851876276ab8 100644
--- a/static/app/utils/duration/intervalToMilliseconds.tsx
+++ b/static/app/utils/duration/intervalToMilliseconds.tsx
@@ -20,5 +20,5 @@ export function intervalToMilliseconds(interval: string): number {
     h: 60 * 60,
     m: 60,
   };
-  return parseInt(value, 10) * multipliers[unit] * 1000;
+  return parseInt(value!, 10) * multipliers[unit!] * 1000;
 }
diff --git a/static/app/utils/duration/parseClockToSeconds.tsx b/static/app/utils/duration/parseClockToSeconds.tsx
index df9b793c00ff28..8bdfae5a24e6bc 100644
--- a/static/app/utils/duration/parseClockToSeconds.tsx
+++ b/static/app/utils/duration/parseClockToSeconds.tsx
@@ -2,13 +2,13 @@ import {DAY, HOUR, MINUTE, MONTH, SECOND, WEEK} from 'sentry/utils/formatters';
 
 export function parseClockToSeconds(clock: string) {
   const [rest, milliseconds] = clock.split('.');
-  const parts = rest.split(':');
+  const parts = rest!.split(':');
 
   let seconds = 0;
   const progression = [MONTH, WEEK, DAY, HOUR, MINUTE, SECOND].slice(parts.length * -1);
   for (let i = 0; i < parts.length; i++) {
     const num = Number(parts[i]) || 0;
-    const time = progression[i] / 1000;
+    const time = progression[i]! / 1000;
     seconds += num * time;
   }
   const ms = Number(milliseconds) || 0;
diff --git a/static/app/utils/duration/parsePeriodToHours.tsx b/static/app/utils/duration/parsePeriodToHours.tsx
index 7af09848c77650..972d21a163e527 100644
--- a/static/app/utils/duration/parsePeriodToHours.tsx
+++ b/static/app/utils/duration/parsePeriodToHours.tsx
@@ -13,7 +13,7 @@ export function parsePeriodToHours(str: string): number {
 
   const {period, periodLength} = result;
 
-  const periodNumber = parseInt(period, 10);
+  const periodNumber = parseInt(period!, 10);
 
   switch (periodLength) {
     case 's':
diff --git a/static/app/utils/eventExceptionGroup.spec.tsx b/static/app/utils/eventExceptionGroup.spec.tsx
new file mode 100644
index 00000000000000..142afd34171cf6
--- /dev/null
+++ b/static/app/utils/eventExceptionGroup.spec.tsx
@@ -0,0 +1,334 @@
+import {EventEntryExceptionGroupFixture} from 'sentry-fixture/eventEntryExceptionGroup';
+import {ExceptionValueFixture} from 'sentry-fixture/exceptionValue';
+
+import {EntryType} from 'sentry/types/event';
+import {
+  buildExceptionGroupTree,
+  getExceptionGroupHeight,
+  getExceptionGroupWidth,
+} from 'sentry/utils/eventExceptionGroup';
+
+describe('eventExceptionGroup', function () {
+  describe('buildExceptionGroupTree', function () {
+    it('builds the exception group tree', function () {
+      const exception = EventEntryExceptionGroupFixture();
+
+      expect(buildExceptionGroupTree(exception)).toEqual([
+        {
+          value: expect.objectContaining({
+            type: 'ExceptionGroup 1',
+          }),
+          children: [
+            {
+              value: expect.objectContaining({
+                type: 'ExceptionGroup 2',
+              }),
+              children: [
+                {
+                  value: expect.objectContaining({
+                    type: 'ValueError',
+                  }),
+                  children: [],
+                },
+              ],
+            },
+            {
+              value: expect.objectContaining({
+                type: 'TypeError',
+              }),
+              children: [],
+            },
+          ],
+        },
+      ]);
+    });
+  });
+
+  describe('getExceptionGroupHeight', function () {
+    it('gets the height of the exception group', function () {
+      const exception = EventEntryExceptionGroupFixture();
+      expect(getExceptionGroupHeight(exception)).toBe(3);
+    });
+
+    it('returns 0 with no values', function () {
+      expect(
+        getExceptionGroupHeight({
+          type: EntryType.EXCEPTION,
+          data: {
+            excOmitted: null,
+            hasSystemFrames: false,
+            values: [],
+          },
+        })
+      ).toBe(0);
+    });
+
+    it('returns 1 with single parent', function () {
+      expect(
+        getExceptionGroupHeight({
+          type: EntryType.EXCEPTION,
+          data: {
+            excOmitted: null,
+            hasSystemFrames: false,
+            values: [
+              ExceptionValueFixture({
+                mechanism: {
+                  handled: true,
+                  exception_id: 1,
+                  is_exception_group: true,
+                  type: 'ExceptionGroup 1',
+                },
+              }),
+            ],
+          },
+        })
+      ).toBe(1);
+    });
+
+    it('returns 2 with a parent and a child', function () {
+      expect(
+        getExceptionGroupHeight({
+          type: EntryType.EXCEPTION,
+          data: {
+            excOmitted: null,
+            hasSystemFrames: false,
+            values: [
+              ExceptionValueFixture({
+                mechanism: {
+                  handled: true,
+                  type: 'ExceptionGroup 2',
+                  is_exception_group: false,
+                  exception_id: 2,
+                  parent_id: 1,
+                },
+              }),
+              ExceptionValueFixture({
+                mechanism: {
+                  handled: true,
+                  type: 'ExceptionGroup 1',
+                  is_exception_group: true,
+                  exception_id: 1,
+                },
+              }),
+            ],
+          },
+        })
+      ).toBe(2);
+    });
+
+    it('returns 2 with a parent and 2 children', function () {
+      expect(
+        getExceptionGroupHeight({
+          type: EntryType.EXCEPTION,
+          data: {
+            excOmitted: null,
+            hasSystemFrames: false,
+            values: [
+              ExceptionValueFixture({
+                mechanism: {
+                  handled: true,
+                  type: 'ExceptionGroup 2',
+                  is_exception_group: false,
+                  exception_id: 2,
+                  parent_id: 1,
+                },
+              }),
+              ExceptionValueFixture({
+                mechanism: {
+                  handled: true,
+                  type: 'ExceptionGroup 3',
+                  is_exception_group: false,
+                  exception_id: 3,
+                  parent_id: 1,
+                },
+              }),
+              ExceptionValueFixture({
+                mechanism: {
+                  handled: true,
+                  type: 'ExceptionGroup 1',
+                  is_exception_group: true,
+                  exception_id: 1,
+                },
+              }),
+            ],
+          },
+        })
+      ).toBe(2);
+    });
+  });
+
+  describe('getExceptionGroupWidth', function () {
+    it('returns 0 with no values', function () {
+      expect(
+        getExceptionGroupWidth({
+          type: EntryType.EXCEPTION,
+          data: {
+            excOmitted: null,
+            hasSystemFrames: false,
+            values: [],
+          },
+        })
+      ).toBe(0);
+    });
+
+    it('returns 1 with a single parent', function () {
+      expect(
+        getExceptionGroupWidth({
+          type: EntryType.EXCEPTION,
+          data: {
+            excOmitted: null,
+            hasSystemFrames: false,
+            values: [
+              ExceptionValueFixture({
+                mechanism: {
+                  handled: true,
+                  type: 'ExceptionGroup 1',
+                  is_exception_group: true,
+                  exception_id: 1,
+                },
+              }),
+            ],
+          },
+        })
+      ).toBe(1);
+    });
+
+    it('returns 1 with a parent and a child', function () {
+      expect(
+        getExceptionGroupWidth({
+          type: EntryType.EXCEPTION,
+          data: {
+            excOmitted: null,
+            hasSystemFrames: false,
+            values: [
+              ExceptionValueFixture({
+                mechanism: {
+                  handled: true,
+                  type: 'ExceptionGroup 2',
+                  is_exception_group: false,
+                  exception_id: 2,
+                  parent_id: 1,
+                },
+              }),
+              ExceptionValueFixture({
+                mechanism: {
+                  handled: true,
+                  type: 'ExceptionGroup 1',
+                  is_exception_group: true,
+                  exception_id: 1,
+                },
+              }),
+            ],
+          },
+        })
+      ).toBe(1);
+    });
+
+    it('returns 2 with a parent and 2 children', function () {
+      expect(
+        getExceptionGroupWidth({
+          type: EntryType.EXCEPTION,
+          data: {
+            excOmitted: null,
+            hasSystemFrames: false,
+            values: [
+              ExceptionValueFixture({
+                mechanism: {
+                  handled: true,
+                  type: 'ExceptionGroup 2',
+                  is_exception_group: false,
+                  exception_id: 2,
+                  parent_id: 1,
+                },
+              }),
+              ExceptionValueFixture({
+                mechanism: {
+                  handled: true,
+                  type: 'ExceptionGroup 3',
+                  is_exception_group: false,
+                  exception_id: 3,
+                  parent_id: 1,
+                },
+              }),
+              ExceptionValueFixture({
+                mechanism: {
+                  handled: true,
+                  type: 'ExceptionGroup 1',
+                  is_exception_group: true,
+                  exception_id: 1,
+                },
+              }),
+            ],
+          },
+        })
+      ).toBe(2);
+    });
+
+    it('returns 3 with a parent 3 grandchildren', function () {
+      expect(
+        getExceptionGroupWidth({
+          type: EntryType.EXCEPTION,
+          data: {
+            excOmitted: null,
+            hasSystemFrames: false,
+            values: [
+              ExceptionValueFixture({
+                mechanism: {
+                  handled: true,
+                  type: 'ExceptionGroup 4',
+                  is_exception_group: false,
+                  exception_id: 4,
+                  parent_id: 2,
+                },
+              }),
+              ExceptionValueFixture({
+                mechanism: {
+                  handled: true,
+                  type: 'ExceptionGroup 5',
+                  is_exception_group: false,
+                  exception_id: 5,
+                  parent_id: 2,
+                },
+              }),
+              ExceptionValueFixture({
+                mechanism: {
+                  handled: true,
+                  type: 'ExceptionGroup 6',
+                  is_exception_group: false,
+                  exception_id: 6,
+                  parent_id: 3,
+                },
+              }),
+              ExceptionValueFixture({
+                mechanism: {
+                  handled: true,
+                  type: 'ExceptionGroup 2',
+                  is_exception_group: false,
+                  exception_id: 2,
+                  parent_id: 1,
+                },
+              }),
+              ExceptionValueFixture({
+                mechanism: {
+                  handled: true,
+                  type: 'ExceptionGroup 3',
+                  is_exception_group: false,
+                  exception_id: 3,
+                  parent_id: 1,
+                },
+              }),
+              ExceptionValueFixture({
+                mechanism: {
+                  handled: true,
+                  type: 'ExceptionGroup 1',
+                  is_exception_group: true,
+                  exception_id: 1,
+                },
+              }),
+            ],
+          },
+        })
+      ).toBe(3);
+    });
+  });
+});
diff --git a/static/app/utils/eventExceptionGroup.tsx b/static/app/utils/eventExceptionGroup.tsx
new file mode 100644
index 00000000000000..341f9f9567e027
--- /dev/null
+++ b/static/app/utils/eventExceptionGroup.tsx
@@ -0,0 +1,87 @@
+import type {EntryException, ExceptionValue} from 'sentry/types/event';
+import {defined} from 'sentry/utils';
+
+type ExceptionGroupTreeItem = {
+  children: Array<ExceptionGroupTreeItem>;
+  value: ExceptionValue;
+};
+
+function buildExceptionGroupTreeRecursive(
+  values: ExceptionValue[],
+  parentId: number | undefined,
+  visited: Set<number> = new Set<number>()
+): ExceptionGroupTreeItem[] {
+  const tree: ExceptionGroupTreeItem[] = [];
+
+  values.forEach(value => {
+    if (
+      value.mechanism?.parent_id === parentId &&
+      defined(value.mechanism?.exception_id) &&
+      !visited.has(value.mechanism.exception_id)
+    ) {
+      visited.add(value.mechanism.exception_id);
+      tree.push({
+        children: buildExceptionGroupTreeRecursive(
+          values,
+          value.mechanism.exception_id,
+          visited
+        ),
+        value,
+      });
+    }
+  });
+
+  return tree;
+}
+
+export function buildExceptionGroupTree(entry: EntryException) {
+  const values = entry.data.values || [];
+
+  return buildExceptionGroupTreeRecursive(values, undefined);
+}
+
+function getTreeHeightRecursive(tree: ExceptionGroupTreeItem[], maxHeight: number = 0) {
+  if (!tree.length) {
+    return maxHeight;
+  }
+
+  let maxLevelHeight = maxHeight;
+
+  for (const node of tree) {
+    const height = 1 + getTreeHeightRecursive(node.children, maxHeight);
+    maxLevelHeight = Math.max(maxLevelHeight, height);
+  }
+
+  return Math.max(maxHeight, maxLevelHeight);
+}
+
+function getTreeWidthRecursive(
+  tree: ExceptionGroupTreeItem[],
+  depth: number = 0,
+  widthByDepth: number[] = []
+) {
+  if (!tree.length) {
+    return 0;
+  }
+
+  widthByDepth[depth] = widthByDepth[depth] || 0;
+
+  for (const node of tree) {
+    widthByDepth[depth] += 1;
+    getTreeWidthRecursive(node.children, depth + 1, widthByDepth);
+  }
+
+  return Math.max(...widthByDepth);
+}
+
+export function getExceptionGroupHeight(entry: EntryException) {
+  const tree = buildExceptionGroupTree(entry);
+
+  return getTreeHeightRecursive(tree);
+}
+
+export function getExceptionGroupWidth(entry: EntryException) {
+  const tree = buildExceptionGroupTree(entry);
+
+  return getTreeWidthRecursive(tree);
+}
diff --git a/static/app/utils/events.tsx b/static/app/utils/events.tsx
index 50ffc2e58506a2..3800a7c3c0d9b7 100644
--- a/static/app/utils/events.tsx
+++ b/static/app/utils/events.tsx
@@ -1,3 +1,5 @@
+import * as Sentry from '@sentry/react';
+
 import {SymbolicatorStatus} from 'sentry/components/events/interfaces/types';
 import ConfigStore from 'sentry/stores/configStore';
 import type {
@@ -20,6 +22,10 @@ import {GroupActivityType, IssueCategory, IssueType} from 'sentry/types/group';
 import {defined} from 'sentry/utils';
 import type {BaseEventAnalyticsParams} from 'sentry/utils/analytics/workflowAnalyticsEvents';
 import {uniq} from 'sentry/utils/array/uniq';
+import {
+  getExceptionGroupHeight,
+  getExceptionGroupWidth,
+} from 'sentry/utils/eventExceptionGroup';
 import {getDaysSinceDatePrecise} from 'sentry/utils/getDaysSinceDate';
 import {isMobilePlatform, isNativePlatform} from 'sentry/utils/platform';
 import {getReplayIdFromEvent} from 'sentry/utils/replays/getReplayIdFromEvent';
@@ -269,7 +275,7 @@ function getExceptionFrames(event: Event, inAppOnly: boolean) {
 /**
  * Returns all entries of type 'exception' of this event
  */
-function getExceptionEntries(event: Event) {
+export function getExceptionEntries(event: Event) {
   return (event.entries?.filter(entry => entry.type === EntryType.EXCEPTION) ||
     []) as EntryException[];
 }
@@ -349,6 +355,36 @@ export function eventHasExceptionGroup(event: Event) {
   );
 }
 
+export function eventExceptionGroupHeight(event: Event) {
+  try {
+    const exceptionEntry = getExceptionEntries(event)[0];
+
+    if (!exceptionEntry) {
+      return 0;
+    }
+
+    return getExceptionGroupHeight(exceptionEntry);
+  } catch (e) {
+    Sentry.captureException(e);
+    return 0;
+  }
+}
+
+export function eventExceptionGroupWidth(event: Event) {
+  try {
+    const exceptionEntry = getExceptionEntries(event)[0];
+
+    if (!exceptionEntry) {
+      return 0;
+    }
+
+    return getExceptionGroupWidth(exceptionEntry);
+  } catch (e) {
+    Sentry.captureException(e);
+    return 0;
+  }
+}
+
 export function eventHasGraphQlRequest(event: Event) {
   const requestEntry = event.entries?.find(entry => entry.type === EntryType.REQUEST) as
     | EntryRequest
@@ -390,6 +426,8 @@ export function getAnalyticsDataForEvent(event?: Event | null): BaseEventAnalyti
     event_type: event?.type,
     has_release: !!event?.release,
     has_exception_group: event ? eventHasExceptionGroup(event) : false,
+    exception_group_height: event ? eventExceptionGroupHeight(event) : 0,
+    exception_group_width: event ? eventExceptionGroupWidth(event) : 0,
     has_graphql_request: event ? eventHasGraphQlRequest(event) : false,
     has_profile: event ? hasProfile(event) : false,
     has_source_context: event ? eventHasSourceContext(event) : false,
diff --git a/static/app/utils/extractSlug.tsx b/static/app/utils/extractSlug.tsx
index bee8a0a7726cc8..d89f260da2bee3 100644
--- a/static/app/utils/extractSlug.tsx
+++ b/static/app/utils/extractSlug.tsx
@@ -24,7 +24,7 @@ export function extractSlug(hostname: string): ExtractedSlug | null {
   ] = match;
 
   const [slug, ...domainParts] = hostname.replace(matchedExpression, '').split('.');
-  const domain = domainParts.concat(matchedDomain).join('.');
+  const domain = domainParts.concat(matchedDomain!).join('.');
 
-  return {slug, domain};
+  return {slug: slug!, domain};
 }
diff --git a/static/app/utils/featureFlagOverrides.spec.ts b/static/app/utils/featureFlagOverrides.spec.ts
index 156736974cf60f..6a0e172d3fe4a0 100644
--- a/static/app/utils/featureFlagOverrides.spec.ts
+++ b/static/app/utils/featureFlagOverrides.spec.ts
@@ -39,12 +39,12 @@ describe('FeatureFlagOverrides', () => {
       const inst = new FeatureFlagOverrides();
 
       inst.setStoredOverride('enable-replay', false);
-      expect(localStorageWrapper.getItem(LOCALSTORAGE_KEY)).toEqual(
+      expect(localStorageWrapper.getItem(LOCALSTORAGE_KEY)).toBe(
         '{"enable-issues":true,"enable-profiling":false,"enable-replay":false}'
       );
 
       inst.setStoredOverride('enable-replay', true);
-      expect(localStorageWrapper.getItem(LOCALSTORAGE_KEY)).toEqual(
+      expect(localStorageWrapper.getItem(LOCALSTORAGE_KEY)).toBe(
         '{"enable-issues":true,"enable-profiling":false,"enable-replay":true}'
       );
     });
@@ -54,7 +54,7 @@ describe('FeatureFlagOverrides', () => {
       const inst = new FeatureFlagOverrides();
 
       inst.setStoredOverride('enable-issues', false);
-      expect(localStorageWrapper.getItem(LOCALSTORAGE_KEY)).toEqual(
+      expect(localStorageWrapper.getItem(LOCALSTORAGE_KEY)).toBe(
         '{"enable-issues":false}'
       );
     });
diff --git a/static/app/utils/featureFlags.spec.ts b/static/app/utils/featureFlags.spec.ts
new file mode 100644
index 00000000000000..d547d952601e36
--- /dev/null
+++ b/static/app/utils/featureFlags.spec.ts
@@ -0,0 +1,69 @@
+import {OrganizationFixture} from 'sentry-fixture/organization';
+import {ProjectFixture} from 'sentry-fixture/project';
+
+import {
+  addOrganizationFeaturesHandler,
+  addProjectFeaturesHandler,
+} from 'sentry/utils/featureFlags';
+
+describe('addOrganizationFeaturesHandler', () => {
+  let organization;
+
+  beforeEach(() => {
+    organization = OrganizationFixture({
+      features: ['enable-issues', 'enable-replay'],
+    });
+  });
+
+  it('should pass the flag name and result to the handler on each evaluation', () => {
+    const mockHandler = jest.fn();
+    addOrganizationFeaturesHandler({organization, handler: mockHandler});
+
+    organization.features.includes('enable-replay');
+    organization.features.includes('replay-mobile-ui');
+    organization.features.includes('enable-issues');
+
+    expect(mockHandler).toHaveBeenNthCalledWith(1, 'enable-replay', true);
+    expect(mockHandler).toHaveBeenNthCalledWith(2, 'replay-mobile-ui', false);
+    expect(mockHandler).toHaveBeenNthCalledWith(3, 'enable-issues', true);
+  });
+
+  it('should not change the functionality of `includes`', () => {
+    const mockHandler = jest.fn();
+    addOrganizationFeaturesHandler({organization, handler: mockHandler});
+    expect(organization.features).toContain('enable-issues');
+    expect(organization.features).toContain('enable-replay');
+    expect(organization.features).not.toContain('replay-mobile-ui');
+  });
+});
+
+describe('addProjectFeaturesHandler', () => {
+  let project;
+
+  beforeEach(() => {
+    project = ProjectFixture({
+      features: ['enable-issues', 'enable-replay'],
+    });
+  });
+
+  it('should pass the flag name and result to the handler on each evaluation', () => {
+    const mockHandler = jest.fn();
+    addProjectFeaturesHandler({project, handler: mockHandler});
+
+    project.features.includes('enable-replay');
+    project.features.includes('replay-mobile-ui');
+    project.features.includes('enable-issues');
+
+    expect(mockHandler).toHaveBeenNthCalledWith(1, 'enable-replay', true);
+    expect(mockHandler).toHaveBeenNthCalledWith(2, 'replay-mobile-ui', false);
+    expect(mockHandler).toHaveBeenNthCalledWith(3, 'enable-issues', true);
+  });
+
+  it('should not change the functionality of `includes`', () => {
+    const mockHandler = jest.fn();
+    addProjectFeaturesHandler({project, handler: mockHandler});
+    expect(project.features).toContain('enable-issues');
+    expect(project.features).toContain('enable-replay');
+    expect(project.features).not.toContain('replay-mobile-ui');
+  });
+});
diff --git a/static/app/utils/featureFlags.ts b/static/app/utils/featureFlags.ts
new file mode 100644
index 00000000000000..34e7db20acfd43
--- /dev/null
+++ b/static/app/utils/featureFlags.ts
@@ -0,0 +1,78 @@
+import {logger} from '@sentry/core';
+import * as Sentry from '@sentry/react';
+
+import type {Organization} from 'sentry/types/organization';
+import type {Project} from 'sentry/types/project';
+
+/**
+ * Returns a callback that can be used to track sentry flag evaluations through
+ * the Sentry SDK, in the event context. If the FeatureFlagsIntegration is not
+ * installed, the callback is a no-op.
+ *
+ * @param prefix - optionally specifies a prefix for flag names, before calling
+ *  the SDK hook
+ */
+export function buildSentryFeaturesHandler(
+  prefix?: string
+): (name: string, value: unknown) => void {
+  const featureFlagsIntegration =
+    Sentry.getClient()?.getIntegrationByName<Sentry.FeatureFlagsIntegration>(
+      'FeatureFlags'
+    );
+  if (!featureFlagsIntegration || !('addFeatureFlag' in featureFlagsIntegration)) {
+    logger.error(
+      'Unable to track flag evaluations because FeatureFlagsIntegration is not installed correctly.'
+    );
+    return (_name, _value) => {};
+  }
+  return (name: string, value: unknown) => {
+    // Append `feature.organizations:` in front to match the Sentry options automator format
+    featureFlagsIntegration?.addFeatureFlag((prefix ?? '') + name, value);
+  };
+}
+
+/**
+ * Registers a handler that processes feature names and values on each call to
+ * organization.features.includes().
+ */
+export function addOrganizationFeaturesHandler({
+  organization,
+  handler,
+}: {
+  handler: (name: string, value: unknown) => void;
+  organization: Organization;
+}) {
+  const includesHandler = {
+    apply: (includes: any, orgFeatures: string[], flagName: string[]) => {
+      // Evaluate the result of .includes() and pass it to hook before returning
+      const flagResult = includes.apply(orgFeatures, flagName);
+      handler(flagName[0]!, flagResult);
+      return flagResult;
+    },
+  };
+  const proxy = new Proxy(organization.features.includes, includesHandler);
+  organization.features.includes = proxy;
+}
+
+/**
+ * Registers a handler that processes feature names and values on each call to
+ * organization.features.includes().
+ */
+export function addProjectFeaturesHandler({
+  project,
+  handler,
+}: {
+  handler: (name: string, value: unknown) => void;
+  project: Project;
+}) {
+  const includesHandler = {
+    apply: (includes: any, projFeatures: string[], flagName: string[]) => {
+      // Evaluate the result of .includes() and pass it to hook before returning
+      const flagResult = includes.apply(projFeatures, flagName);
+      handler(flagName[0]!, flagResult);
+      return flagResult;
+    },
+  };
+  const proxy = new Proxy(project.features.includes, includesHandler);
+  project.features.includes = proxy;
+}
diff --git a/static/app/utils/featureObserver.spec.ts b/static/app/utils/featureObserver.spec.ts
deleted file mode 100644
index d7722ff30d4479..00000000000000
--- a/static/app/utils/featureObserver.spec.ts
+++ /dev/null
@@ -1,251 +0,0 @@
-import {OrganizationFixture} from 'sentry-fixture/organization';
-import {ProjectFixture} from 'sentry-fixture/project';
-
-import type {Organization} from 'sentry/types/organization';
-import type {Project} from 'sentry/types/project';
-import FeatureObserver from 'sentry/utils/featureObserver';
-
-describe('FeatureObserver', () => {
-  let organization: Organization;
-  let project: Project;
-
-  beforeEach(() => {
-    organization = OrganizationFixture({
-      features: ['enable-issues', 'enable-profiling', 'enable-replay'],
-    });
-    project = ProjectFixture({
-      features: ['enable-proj-flag', 'enable-performance'],
-    });
-  });
-
-  describe('observeOrganizationFlags', () => {
-    it('should add recently evaluated org flags to the flag queue', () => {
-      const inst = new FeatureObserver({bufferSize: 3});
-      expect(organization.features).toEqual([
-        'enable-issues',
-        'enable-profiling',
-        'enable-replay',
-      ]);
-
-      inst.observeOrganizationFlags({organization});
-      expect(inst.getFeatureFlags().values).toEqual([]);
-
-      organization.features.includes('enable-issues');
-      organization.features.includes('replay-mobile-ui');
-      expect(inst.getFeatureFlags().values).toEqual([
-        {flag: 'feature.organizations:enable-issues', result: true},
-        {flag: 'feature.organizations:replay-mobile-ui', result: false},
-      ]);
-
-      // do more evaluations to fill up and overflow the buffer
-      organization.features.includes('enable-replay');
-      organization.features.includes('autofix-ui');
-      organization.features.includes('new-issue-details');
-      expect(inst.getFeatureFlags().values).toEqual([
-        {flag: 'feature.organizations:enable-replay', result: true},
-        {flag: 'feature.organizations:autofix-ui', result: false},
-        {flag: 'feature.organizations:new-issue-details', result: false},
-      ]);
-    });
-
-    it('should remove duplicate flags with a full queue', () => {
-      const inst = new FeatureObserver({bufferSize: 3});
-      inst.observeOrganizationFlags({organization});
-      expect(inst.getFeatureFlags().values).toEqual([]);
-
-      organization.features.includes('enable-issues');
-      organization.features.includes('replay-mobile-ui');
-      organization.features.includes('enable-discover');
-      expect(inst.getFeatureFlags().values).toEqual([
-        {flag: 'feature.organizations:enable-issues', result: true},
-        {flag: 'feature.organizations:replay-mobile-ui', result: false},
-        {flag: 'feature.organizations:enable-discover', result: false},
-      ]);
-
-      // this is already in the queue; it should be removed and
-      // added back to the end of the queue
-      organization.features.includes('enable-issues');
-      expect(inst.getFeatureFlags().values).toEqual([
-        {flag: 'feature.organizations:replay-mobile-ui', result: false},
-        {flag: 'feature.organizations:enable-discover', result: false},
-        {flag: 'feature.organizations:enable-issues', result: true},
-      ]);
-
-      organization.features.includes('spam-ingest');
-      expect(inst.getFeatureFlags().values).toEqual([
-        {flag: 'feature.organizations:enable-discover', result: false},
-        {flag: 'feature.organizations:enable-issues', result: true},
-        {flag: 'feature.organizations:spam-ingest', result: false},
-      ]);
-
-      // this is already in the queue but in the back
-      // the queue should not change
-      organization.features.includes('spam-ingest');
-      expect(inst.getFeatureFlags().values).toEqual([
-        {flag: 'feature.organizations:enable-discover', result: false},
-        {flag: 'feature.organizations:enable-issues', result: true},
-        {flag: 'feature.organizations:spam-ingest', result: false},
-      ]);
-    });
-
-    it('should remove duplicate flags with an unfilled queue', () => {
-      const inst = new FeatureObserver({bufferSize: 3});
-      inst.observeOrganizationFlags({organization});
-      expect(inst.getFeatureFlags().values).toEqual([]);
-
-      organization.features.includes('enable-issues');
-      organization.features.includes('replay-mobile-ui');
-      expect(inst.getFeatureFlags().values).toEqual([
-        {flag: 'feature.organizations:enable-issues', result: true},
-        {flag: 'feature.organizations:replay-mobile-ui', result: false},
-      ]);
-
-      // this is already in the queue; it should be removed and
-      // added back to the end of the queue
-      organization.features.includes('enable-issues');
-      expect(inst.getFeatureFlags().values).toEqual([
-        {flag: 'feature.organizations:replay-mobile-ui', result: false},
-        {flag: 'feature.organizations:enable-issues', result: true},
-      ]);
-
-      // this is already in the queue but in the back
-      // the queue should not change
-      organization.features.includes('enable-issues');
-      expect(inst.getFeatureFlags().values).toEqual([
-        {flag: 'feature.organizations:replay-mobile-ui', result: false},
-        {flag: 'feature.organizations:enable-issues', result: true},
-      ]);
-    });
-
-    it('should not change the functionality of `includes`', () => {
-      const inst = new FeatureObserver({bufferSize: 3});
-      inst.observeOrganizationFlags({organization});
-      expect(inst.getFeatureFlags().values).toEqual([]);
-
-      organization.features.includes('enable-issues');
-      organization.features.includes('replay-mobile-ui');
-      expect(inst.getFeatureFlags().values).toEqual([
-        {flag: 'feature.organizations:enable-issues', result: true},
-        {flag: 'feature.organizations:replay-mobile-ui', result: false},
-      ]);
-
-      expect(organization.features.includes('enable-issues')).toBe(true);
-      expect(organization.features.includes('replay-mobile-ui')).toBe(false);
-    });
-  });
-
-  describe('observeProjectFlags', () => {
-    it('should add recently evaluated proj flags to the flag queue', () => {
-      const inst = new FeatureObserver({bufferSize: 3});
-      expect(project.features).toEqual(['enable-proj-flag', 'enable-performance']);
-
-      inst.observeProjectFlags({project});
-      expect(inst.getFeatureFlags().values).toEqual([]);
-
-      project.features.includes('enable-proj-flag');
-      project.features.includes('replay-mobile-ui');
-      expect(inst.getFeatureFlags().values).toEqual([
-        {flag: 'feature.projects:enable-proj-flag', result: true},
-        {flag: 'feature.projects:replay-mobile-ui', result: false},
-      ]);
-
-      // do more evaluations to fill up and overflow the buffer
-      project.features.includes('enable-performance');
-      project.features.includes('autofix-ui');
-      project.features.includes('new-issue-details');
-      expect(inst.getFeatureFlags().values).toEqual([
-        {flag: 'feature.projects:enable-performance', result: true},
-        {flag: 'feature.projects:autofix-ui', result: false},
-        {flag: 'feature.projects:new-issue-details', result: false},
-      ]);
-    });
-
-    it('should not change the functionality of `includes`', () => {
-      const inst = new FeatureObserver({bufferSize: 3});
-      inst.observeProjectFlags({project});
-      expect(inst.getFeatureFlags().values).toEqual([]);
-
-      project.features.includes('enable-proj-flag');
-      project.features.includes('replay-mobile-ui');
-      expect(inst.getFeatureFlags().values).toEqual([
-        {flag: 'feature.projects:enable-proj-flag', result: true},
-        {flag: 'feature.projects:replay-mobile-ui', result: false},
-      ]);
-
-      expect(project.features.includes('enable-proj-flag')).toBe(true);
-      expect(project.features.includes('replay-mobile-ui')).toBe(false);
-    });
-  });
-
-  describe('observeProjectFlags and observeOrganizationFlags', () => {
-    it('should add recently evaluated org and proj flags to the flag queue', () => {
-      const inst = new FeatureObserver({bufferSize: 3});
-      expect(project.features).toEqual(['enable-proj-flag', 'enable-performance']);
-      expect(organization.features).toEqual([
-        'enable-issues',
-        'enable-profiling',
-        'enable-replay',
-      ]);
-
-      inst.observeProjectFlags({project});
-      inst.observeOrganizationFlags({organization});
-      expect(inst.getFeatureFlags().values).toEqual([]);
-
-      project.features.includes('enable-proj-flag');
-      project.features.includes('enable-replay');
-      organization.features.includes('enable-issues');
-      expect(inst.getFeatureFlags().values).toEqual([
-        {flag: 'feature.projects:enable-proj-flag', result: true},
-        {flag: 'feature.projects:enable-replay', result: false},
-        {flag: 'feature.organizations:enable-issues', result: true},
-      ]);
-
-      organization.features.includes('enable-replay');
-      expect(inst.getFeatureFlags().values).toEqual([
-        {flag: 'feature.projects:enable-replay', result: false},
-        {flag: 'feature.organizations:enable-issues', result: true},
-        {flag: 'feature.organizations:enable-replay', result: true},
-      ]);
-    });
-
-    it('should keep the same queue if the project changes', () => {
-      const inst = new FeatureObserver({bufferSize: 3});
-      expect(project.features).toEqual(['enable-proj-flag', 'enable-performance']);
-      expect(organization.features).toEqual([
-        'enable-issues',
-        'enable-profiling',
-        'enable-replay',
-      ]);
-
-      inst.observeProjectFlags({project});
-      inst.observeOrganizationFlags({organization});
-      expect(inst.getFeatureFlags().values).toEqual([]);
-
-      project.features.includes('enable-proj-flag');
-      project.features.includes('enable-replay');
-      organization.features.includes('enable-issues');
-      expect(inst.getFeatureFlags().values).toEqual([
-        {flag: 'feature.projects:enable-proj-flag', result: true},
-        {flag: 'feature.projects:enable-replay', result: false},
-        {flag: 'feature.organizations:enable-issues', result: true},
-      ]);
-
-      project = ProjectFixture({
-        features: ['enable-new-flag'],
-      });
-      inst.observeProjectFlags({project});
-      expect(inst.getFeatureFlags().values).toEqual([
-        {flag: 'feature.projects:enable-proj-flag', result: true},
-        {flag: 'feature.projects:enable-replay', result: false},
-        {flag: 'feature.organizations:enable-issues', result: true},
-      ]);
-
-      project.features.includes('enable-new-flag');
-      expect(inst.getFeatureFlags().values).toEqual([
-        {flag: 'feature.projects:enable-replay', result: false},
-        {flag: 'feature.organizations:enable-issues', result: true},
-        {flag: 'feature.projects:enable-new-flag', result: true},
-      ]);
-    });
-  });
-});
diff --git a/static/app/utils/featureObserver.ts b/static/app/utils/featureObserver.ts
deleted file mode 100644
index 0d3a66043ce9d3..00000000000000
--- a/static/app/utils/featureObserver.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-import type {FeatureFlagContext} from '@sentry/types/build/types/context';
-
-import type {Organization} from 'sentry/types/organization';
-import type {Project} from 'sentry/types/project';
-
-const FEATURE_FLAG_BUFFER_SIZE = 100;
-let __SINGLETON: FeatureObserver | null = null;
-
-export default class FeatureObserver {
-  /**
-   * Return the same instance of FeatureObserver in each part of the app.
-   * Multiple instances of FeatureObserver are needed by tests only.
-   */
-  public static singleton({
-    bufferSize = FEATURE_FLAG_BUFFER_SIZE,
-  }: {
-    bufferSize?: number;
-  }) {
-    if (!__SINGLETON) {
-      __SINGLETON = new FeatureObserver({bufferSize});
-    }
-    return __SINGLETON;
-  }
-
-  private _bufferSize = 0;
-  private FEATURE_FLAGS: FeatureFlagContext = {values: []};
-
-  constructor({bufferSize}: {bufferSize: number}) {
-    this._bufferSize = bufferSize;
-  }
-
-  /**
-   * Return list of recently accessed feature flags.
-   */
-  public getFeatureFlags() {
-    return this.FEATURE_FLAGS;
-  }
-
-  public updateFlagBuffer({
-    flagName,
-    flagResult,
-  }: {
-    flagName: string;
-    flagResult: boolean;
-  }) {
-    const flagBuffer = this.FEATURE_FLAGS;
-    // Check if the flag is already in the buffer
-    const index = flagBuffer.values.findIndex(f => f.flag === flagName);
-
-    // The flag is already in the buffer
-    if (index !== -1) {
-      flagBuffer.values.splice(index, 1);
-    }
-
-    // If at capacity, we need to remove the earliest flag
-    // This will only happen if not a duplicate flag
-    if (flagBuffer.values.length === this._bufferSize) {
-      flagBuffer.values.shift();
-    }
-
-    // Store the flag and its result in the buffer
-    flagBuffer.values.push({
-      flag: flagName,
-      result: flagResult,
-    });
-  }
-
-  public observeOrganizationFlags({organization}: {organization: Organization}) {
-    // Track names of features that are passed into the .includes() function.
-    const handler = {
-      apply: (target: any, orgFeatures: string[], flagName: string[]) => {
-        // Evaluate the result of .includes()
-        const flagResult = target.apply(orgFeatures, flagName);
-
-        // Append `feature.organizations:` in front to match the Sentry options automator format
-        const name = 'feature.organizations:' + flagName[0];
-
-        this.updateFlagBuffer({
-          flagName: name,
-          flagResult,
-        });
-
-        return flagResult;
-      },
-    };
-    const proxy = new Proxy(organization.features.includes, handler);
-    organization.features.includes = proxy;
-  }
-
-  public observeProjectFlags({project}: {project: Project}) {
-    // Track names of features that are passed into the .includes() function.
-    const handler = {
-      apply: (target: any, projFeatures: string[], flagName: string[]) => {
-        // Evaluate the result of .includes()
-        const flagResult = target.apply(projFeatures, flagName);
-
-        // Append `feature.projects:` in front to match the Sentry options automator format
-        const name = 'feature.projects:' + flagName[0];
-
-        this.updateFlagBuffer({
-          flagName: name,
-          flagResult,
-        });
-
-        return flagResult;
-      },
-    };
-    const proxy = new Proxy(project.features.includes, handler);
-    project.features.includes = proxy;
-  }
-}
diff --git a/static/app/utils/fields/index.ts b/static/app/utils/fields/index.ts
index 42b8df7dce5c45..0335bdfc632002 100644
--- a/static/app/utils/fields/index.ts
+++ b/static/app/utils/fields/index.ts
@@ -438,7 +438,7 @@ export const AGGREGATION_FIELDS: Record<AggregationKey, FieldDefinition> = {
         name: 'value',
         kind: 'value',
         dataType: FieldValueType.STRING,
-        defaultValue: CONDITIONS_ARGUMENTS[0].value,
+        defaultValue: CONDITIONS_ARGUMENTS[0]!.value,
         options: CONDITIONS_ARGUMENTS,
         required: true,
       },
@@ -476,7 +476,7 @@ export const AGGREGATION_FIELDS: Record<AggregationKey, FieldDefinition> = {
         kind: 'value',
         options: WEB_VITALS_QUALITY,
         dataType: FieldValueType.STRING,
-        defaultValue: WEB_VITALS_QUALITY[0].value,
+        defaultValue: WEB_VITALS_QUALITY[0]!.value,
         required: true,
       },
     ],
diff --git a/static/app/utils/formatters.spec.tsx b/static/app/utils/formatters.spec.tsx
index 591bf57b807dab..1cad1664576c75 100644
--- a/static/app/utils/formatters.spec.tsx
+++ b/static/app/utils/formatters.spec.tsx
@@ -147,7 +147,7 @@ describe('userDisplayName', function () {
         name: 'foo@bar.com',
         email: 'foo@bar.com',
       })
-    ).toEqual('foo@bar.com');
+    ).toBe('foo@bar.com');
   });
 
   it('should show name + email, if name and email differ', function () {
@@ -156,7 +156,7 @@ describe('userDisplayName', function () {
         name: 'user',
         email: 'foo@bar.com',
       })
-    ).toEqual('user (foo@bar.com)');
+    ).toBe('user (foo@bar.com)');
   });
 
   it('should show unknown author with email, if email is only provided', function () {
@@ -164,35 +164,33 @@ describe('userDisplayName', function () {
       userDisplayName({
         email: 'foo@bar.com',
       })
-    ).toEqual('Unknown author (foo@bar.com)');
+    ).toBe('Unknown author (foo@bar.com)');
   });
 
   it('should show unknown author, if author or email is just whitespace', function () {
     expect(
       userDisplayName({
-        // eslint-disable-next-line quotes
         name: `\t\n `,
       })
-    ).toEqual('Unknown author');
+    ).toBe('Unknown author');
 
     expect(
       userDisplayName({
-        // eslint-disable-next-line quotes
         email: `\t\n `,
       })
-    ).toEqual('Unknown author');
+    ).toBe('Unknown author');
   });
 
   it('should show unknown author, if user object is either not an object or incomplete', function () {
     // @ts-expect-error
-    expect(userDisplayName()).toEqual('Unknown author');
-    expect(userDisplayName({})).toEqual('Unknown author');
+    expect(userDisplayName()).toBe('Unknown author');
+    expect(userDisplayName({})).toBe('Unknown author');
   });
 });
 
 describe('formatSpanOperation', () => {
   it('falls back to "span"', () => {
-    expect(formatSpanOperation()).toEqual('span');
+    expect(formatSpanOperation()).toBe('span');
   });
 
   it.each([
diff --git a/static/app/utils/getDynamicText.spec.tsx b/static/app/utils/getDynamicText.spec.tsx
index ccf5338c6d989f..26959a834045d0 100644
--- a/static/app/utils/getDynamicText.spec.tsx
+++ b/static/app/utils/getDynamicText.spec.tsx
@@ -14,7 +14,7 @@ describe('getDynamicText', function () {
         fixed: 'Text',
         value: 'Dynamic Content',
       })
-    ).toEqual('Dynamic Content');
+    ).toBe('Dynamic Content');
   });
 
   it('renders fixed content when `app/constants/IS_ACCEPTANCE_TEST` is true', function () {
@@ -28,6 +28,6 @@ describe('getDynamicText', function () {
         fixed: 'Text',
         value: 'Dynamic Content',
       })
-    ).toEqual('Text');
+    ).toBe('Text');
   });
 });
diff --git a/static/app/utils/getErrorDebugIds.ts b/static/app/utils/getErrorDebugIds.ts
index 5aab5267629def..05155ef5f257c8 100644
--- a/static/app/utils/getErrorDebugIds.ts
+++ b/static/app/utils/getErrorDebugIds.ts
@@ -40,8 +40,8 @@ export async function getErrorDebugIds(e: Error): Promise<{[filename: string]: s
         return;
       }
 
-      fileDebugIdCache.set(stackFrame.filename, debugIdMatch[1]);
-      debugIdMap[stackFrame.filename] = debugIdMatch[1];
+      fileDebugIdCache.set(stackFrame.filename, debugIdMatch[1]!);
+      debugIdMap[stackFrame.filename] = debugIdMatch[1]!;
     } catch {
       // noop
       return;
diff --git a/static/app/utils/getMinMax.tsx b/static/app/utils/getMinMax.tsx
index 40d950eba07ef6..a3b67fa1f9a68b 100644
--- a/static/app/utils/getMinMax.tsx
+++ b/static/app/utils/getMinMax.tsx
@@ -15,8 +15,8 @@ export default function getMinMax(arr: number[]) {
   let max = -Infinity;
 
   while (len--) {
-    min = arr[len] < min ? arr[len] : min;
-    max = arr[len] > max ? arr[len] : max;
+    min = arr[len]! < min ? arr[len]! : min;
+    max = arr[len]! > max ? arr[len]! : max;
   }
 
   return {min, max};
diff --git a/static/app/utils/getProjectsByTeams.tsx b/static/app/utils/getProjectsByTeams.tsx
index 6522b9d48c16bc..5772c60b9e105d 100644
--- a/static/app/utils/getProjectsByTeams.tsx
+++ b/static/app/utils/getProjectsByTeams.tsx
@@ -25,7 +25,7 @@ export default function getProjectsByTeams(
         if (!projectsByTeam.hasOwnProperty(team.slug)) {
           projectsByTeam[team.slug] = [];
         }
-        projectsByTeam[team.slug].push(project);
+        projectsByTeam[team.slug]!.push(project);
       });
     }
   });
diff --git a/static/app/utils/gettingStartedDocs/getPlatformPath.spec.ts b/static/app/utils/gettingStartedDocs/getPlatformPath.spec.ts
index 09d19ae29f99c9..bed1c6a13aac1c 100644
--- a/static/app/utils/gettingStartedDocs/getPlatformPath.spec.ts
+++ b/static/app/utils/gettingStartedDocs/getPlatformPath.spec.ts
@@ -11,7 +11,7 @@ describe('getPlatformPath', () => {
       name: 'name',
     };
 
-    expect(getPlatformPath(platform)).toEqual('javascript/react');
+    expect(getPlatformPath(platform)).toBe('javascript/react');
   });
 
   it('returns the correct path for a language platform', () => {
@@ -23,7 +23,19 @@ describe('getPlatformPath', () => {
       name: 'name',
     };
 
-    expect(getPlatformPath(platform)).toEqual('python/python');
+    expect(getPlatformPath(platform)).toBe('python/python');
+  });
+
+  it('returns the correct path for the multi-word framework', () => {
+    const platform: PlatformIntegration = {
+      type: 'framework',
+      id: 'java-spring-boot',
+      language: 'java',
+      link: 'link',
+      name: 'name',
+    };
+
+    expect(getPlatformPath(platform)).toBe('java/spring-boot');
   });
 
   it('handles special cases', () => {
@@ -48,41 +60,37 @@ describe('getPlatformPath', () => {
     }
 
     // Frameworks
-    expect(getPlatformPath(getFrameworkPlatformWithId('capacitor'))).toEqual(
+    expect(getPlatformPath(getFrameworkPlatformWithId('capacitor'))).toBe(
       'language/language'
     );
 
-    expect(getPlatformPath(getFrameworkPlatformWithId('ionic'))).toEqual(
+    expect(getPlatformPath(getFrameworkPlatformWithId('ionic'))).toBe(
       'language/language'
     );
-    expect(getPlatformPath(getFrameworkPlatformWithId('dart'))).toEqual(
+    expect(getPlatformPath(getFrameworkPlatformWithId('dart'))).toBe('language/language');
+    expect(getPlatformPath(getFrameworkPlatformWithId('android'))).toBe(
       'language/language'
     );
-    expect(getPlatformPath(getFrameworkPlatformWithId('android'))).toEqual(
+    expect(getPlatformPath(getFrameworkPlatformWithId('flutter'))).toBe(
       'language/language'
     );
-    expect(getPlatformPath(getFrameworkPlatformWithId('flutter'))).toEqual(
+    expect(getPlatformPath(getFrameworkPlatformWithId('unreal'))).toBe(
       'language/language'
     );
-    expect(getPlatformPath(getFrameworkPlatformWithId('unreal'))).toEqual(
+    expect(getPlatformPath(getFrameworkPlatformWithId('unity'))).toBe(
       'language/language'
     );
-    expect(getPlatformPath(getFrameworkPlatformWithId('unity'))).toEqual(
+    expect(getPlatformPath(getFrameworkPlatformWithId('minidump'))).toBe(
       'language/language'
     );
-    expect(getPlatformPath(getFrameworkPlatformWithId('minidump'))).toEqual(
-      'language/language'
-    );
-    expect(getPlatformPath(getFrameworkPlatformWithId('native-qt'))).toEqual(
-      'language/qt'
-    );
+    expect(getPlatformPath(getFrameworkPlatformWithId('native-qt'))).toBe('language/qt');
 
     // Library
-    expect(getPlatformPath(getLibraryPlatformWithId('python-celery'))).toEqual(
+    expect(getPlatformPath(getLibraryPlatformWithId('python-celery'))).toBe(
       'language/celery'
     );
-    expect(getPlatformPath(getLibraryPlatformWithId('python-rq'))).toEqual('language/rq');
-    expect(getPlatformPath(getLibraryPlatformWithId('python-pymongo'))).toEqual(
+    expect(getPlatformPath(getLibraryPlatformWithId('python-rq'))).toBe('language/rq');
+    expect(getPlatformPath(getLibraryPlatformWithId('python-pymongo'))).toBe(
       'language/pymongo'
     );
   });
diff --git a/static/app/utils/gettingStartedDocs/getPlatformPath.ts b/static/app/utils/gettingStartedDocs/getPlatformPath.ts
index 1e3cdfe000dae6..c3a1f25e6e7d77 100644
--- a/static/app/utils/gettingStartedDocs/getPlatformPath.ts
+++ b/static/app/utils/gettingStartedDocs/getPlatformPath.ts
@@ -6,7 +6,11 @@ export function getPlatformPath(platform: PlatformIntegration) {
     return `${platform.language}/${platform.language}`;
   }
 
-  const framework = platform.id.split('-')[1];
+  // splits the platform.id into language and framework, framework can have multiple words so we
+  // only want to split it at the first hyphen
+  const hyphenIndex = platform.id.indexOf('-');
+  const framework =
+    hyphenIndex !== -1 ? platform.id.substring(hyphenIndex + 1) : undefined;
 
   if (framework) {
     return `${platform.language}/${framework}`;
diff --git a/static/app/utils/git/parseRepo.spec.tsx b/static/app/utils/git/parseRepo.spec.tsx
index 428b6e39992ca8..92b60b9114b34d 100644
--- a/static/app/utils/git/parseRepo.spec.tsx
+++ b/static/app/utils/git/parseRepo.spec.tsx
@@ -2,30 +2,28 @@ import {parseRepo} from 'sentry/utils/git/parseRepo';
 
 describe('parseRepo', function () {
   it('should work for simple github url', function () {
-    expect(parseRepo('github.com/example/example')).toEqual('example/example');
+    expect(parseRepo('github.com/example/example')).toBe('example/example');
   });
   it('should work for full github url', function () {
-    expect(parseRepo('https://github.com/example/example')).toEqual('example/example');
+    expect(parseRepo('https://github.com/example/example')).toBe('example/example');
   });
   it('should work for trailing slash', function () {
-    expect(parseRepo('https://github.com/example/example/')).toEqual('example/example');
+    expect(parseRepo('https://github.com/example/example/')).toBe('example/example');
   });
   it('should work for simple BitBucket url', function () {
-    expect(parseRepo('bitbucket.org/example/example')).toEqual('example/example');
+    expect(parseRepo('bitbucket.org/example/example')).toBe('example/example');
   });
   it('should work for full BitBucket url', function () {
-    expect(parseRepo('https://bitbucket.org/example/example')).toEqual('example/example');
+    expect(parseRepo('https://bitbucket.org/example/example')).toBe('example/example');
   });
   it('should work for trailing Bitbucket slash', function () {
-    expect(parseRepo('https://bitbucket.org/example/example/')).toEqual(
-      'example/example'
-    );
+    expect(parseRepo('https://bitbucket.org/example/example/')).toBe('example/example');
   });
   it('should work for repo only', function () {
-    expect(parseRepo('example/example')).toEqual('example/example');
+    expect(parseRepo('example/example')).toBe('example/example');
   });
   it('should parse repo from url with extra info', function () {
-    expect(parseRepo('github.com/example/example/commits/adsadsa')).toEqual(
+    expect(parseRepo('github.com/example/example/commits/adsadsa')).toBe(
       'example/example'
     );
   });
diff --git a/static/app/utils/highlightFuseMatches.tsx b/static/app/utils/highlightFuseMatches.tsx
index c6fb2b0d813296..b571274716aa2c 100644
--- a/static/app/utils/highlightFuseMatches.tsx
+++ b/static/app/utils/highlightFuseMatches.tsx
@@ -46,7 +46,7 @@ const getFuseMatches = ({value, indices}: Match): MatchResult => {
 
   indices.forEach(([start, end]) => {
     // Unhighlighted string before the match
-    const stringBeforeMatch = value.substring(prev[1] + 1, start);
+    const stringBeforeMatch = value.substring(prev[1]! + 1, start);
 
     // Only add to result if non-empty string
     if (stringBeforeMatch) {
@@ -67,7 +67,7 @@ const getFuseMatches = ({value, indices}: Match): MatchResult => {
   });
 
   // The rest of the string starting from the last match index
-  const restOfString = value.substring(prev[1] + 1, strLength);
+  const restOfString = value.substring(prev[1]! + 1, strLength);
   // Only add to result if non-empty string
   if (restOfString) {
     result.push({highlight: false, text: restOfString});
diff --git a/static/app/utils/integrationUtil.spec.tsx b/static/app/utils/integrationUtil.spec.tsx
index 66c42679fc4d01..cc4bcb7869fa77 100644
--- a/static/app/utils/integrationUtil.spec.tsx
+++ b/static/app/utils/integrationUtil.spec.tsx
@@ -3,17 +3,17 @@ import {getIntegrationSourceUrl} from 'sentry/utils/integrationUtil';
 describe('getIntegrationSourceUrl()', function () {
   it('returns the correct url for Bitbucket', function () {
     const result = getIntegrationSourceUrl('bitbucket', 'https://example.com', 10);
-    expect(result).toEqual('https://example.com#lines-10');
+    expect(result).toBe('https://example.com#lines-10');
   });
 
   it('returns the correct url for Bitbucket Server', function () {
     const result = getIntegrationSourceUrl('bitbucket_server', 'https://example.com', 10);
-    expect(result).toEqual('https://example.com#lines-10');
+    expect(result).toBe('https://example.com#lines-10');
   });
 
   it('returns the correct url for GitHub', function () {
     const result = getIntegrationSourceUrl('github', 'https://example.com', 10);
-    expect(result).toEqual('https://example.com#L10');
+    expect(result).toBe('https://example.com#L10');
   });
 
   it('returns the correct url for GitHub Enterprise', function () {
@@ -22,12 +22,12 @@ describe('getIntegrationSourceUrl()', function () {
       'https://example.com',
       10
     );
-    expect(result).toEqual('https://example.com#L10');
+    expect(result).toBe('https://example.com#L10');
   });
 
   it('returns the correct url for VSTS', function () {
     const result = getIntegrationSourceUrl('vsts', 'https://example.com', 10);
-    expect(result).toEqual(
+    expect(result).toBe(
       'https://example.com/?line=10&lineEnd=11&lineStartColumn=1&lineEndColumn=1&lineStyle=plain&_a=contents'
     );
   });
diff --git a/static/app/utils/marked.spec.tsx b/static/app/utils/marked.spec.tsx
index 50ab55b382386f..0f52f8b5182081 100644
--- a/static/app/utils/marked.spec.tsx
+++ b/static/app/utils/marked.spec.tsx
@@ -74,7 +74,7 @@ describe('marked', function () {
       ['![alt](http://example.com/rick.gif)', 'http://example.com/rick.gif'],
       ['[click me](http://example.com)', 'http://example.com'],
     ]) {
-      expect(limitedMarked(test[0])).toEqual('<p>' + test[1] + '</p>\n');
+      expect(limitedMarked(test[0]!)).toEqual('<p>' + test[1] + '</p>\n');
     }
   });
 });
diff --git a/static/app/utils/marked.tsx b/static/app/utils/marked.tsx
index 4188831d4252a4..9f7fe1b1967a01 100644
--- a/static/app/utils/marked.tsx
+++ b/static/app/utils/marked.tsx
@@ -69,11 +69,12 @@ marked.setOptions({
     }
 
     if (lang in Prism.languages) {
-      return Prism.highlight(code, Prism.languages[lang], lang);
+      return Prism.highlight(code, Prism.languages[lang]!, lang);
     }
 
     loadPrismLanguage(lang, {
-      onLoad: () => callback?.(null!, Prism.highlight(code, Prism.languages[lang], lang)),
+      onLoad: () =>
+        callback?.(null!, Prism.highlight(code, Prism.languages[lang]!, lang)),
       onError: error => callback?.(error, code),
       suppressExistenceWarning: true,
     });
diff --git a/static/app/utils/metrics/dashboardImport.spec.tsx b/static/app/utils/metrics/dashboardImport.spec.tsx
index 60d69f6b50c6cb..738ec2357e7bce 100644
--- a/static/app/utils/metrics/dashboardImport.spec.tsx
+++ b/static/app/utils/metrics/dashboardImport.spec.tsx
@@ -84,7 +84,7 @@ describe('WidgetParser', () => {
     ).parse();
     const {report, widget} = await result;
 
-    expect(report.outcome).toEqual('success');
+    expect(report.outcome).toBe('success');
     expect(report.errors).toEqual([]);
 
     expect(widget).toBeDefined();
@@ -121,7 +121,7 @@ describe('WidgetParser', () => {
     ).parse();
     const {report, widget} = await result;
 
-    expect(report.outcome).toEqual('success');
+    expect(report.outcome).toBe('success');
     expect(report.errors).toEqual([]);
 
     expect(widget?.queries).toHaveLength(2);
@@ -165,7 +165,7 @@ describe('WidgetParser', () => {
     ).parse();
     const {report, widget} = await result;
 
-    expect(report.outcome).toEqual('success');
+    expect(report.outcome).toBe('success');
     expect(widget).toEqual({
       displayType: 'line',
       limit: 10,
@@ -197,7 +197,7 @@ describe('WidgetParser', () => {
     ).parse();
     const {report} = await result;
 
-    expect(report.outcome).toEqual('error');
+    expect(report.outcome).toBe('error');
     expect(report.errors).toEqual([
       'widget - no parseable queries found',
       'widget.request.query - metric not found: sentry.unknown-metric',
@@ -212,7 +212,7 @@ describe('WidgetParser', () => {
     const result = new WidgetParser(widget, availableMetrics, 'test-org', false).parse();
     const {report} = await result;
 
-    expect(report.outcome).toEqual('warning');
+    expect(report.outcome).toBe('warning');
     expect(report.errors).toEqual([
       'widget.request.query - unsupported filter: not-a-tag',
     ]);
@@ -226,7 +226,7 @@ describe('WidgetParser', () => {
     const result = new WidgetParser(widget, availableMetrics, 'test-org', false).parse();
     const {report} = await result;
 
-    expect(report.outcome).toEqual('warning');
+    expect(report.outcome).toBe('warning');
     expect(report.errors).toEqual([
       'widget.request.query.filter - unsupported value: bar*, using bar',
     ]);
@@ -268,9 +268,9 @@ describe('parseDashboard', () => {
     );
     const {report, widgets} = result;
 
-    expect(report.length).toEqual(2);
-    expect(report[0].outcome).toEqual('success');
-    expect(widgets.length).toEqual(2);
+    expect(report).toHaveLength(2);
+    expect(report[0]!.outcome).toBe('success');
+    expect(widgets).toHaveLength(2);
   });
 
   it('should parse a dashboard and explode widgets', async () => {
@@ -296,9 +296,9 @@ describe('parseDashboard', () => {
     );
     const {report, widgets} = result;
 
-    expect(report.length).toEqual(2);
-    expect(report[0].outcome).toEqual('success');
-    expect(widgets.length).toEqual(2);
+    expect(report).toHaveLength(2);
+    expect(report[0]!.outcome).toBe('success');
+    expect(widgets).toHaveLength(2);
   });
 
   it('should parse a dashboard with formulas', async () => {
@@ -330,13 +330,13 @@ describe('parseDashboard', () => {
     );
 
     const {report, widgets} = result;
-    expect(report.length).toEqual(1);
-    expect(widgets.length).toEqual(1);
-
-    const queries = widgets[0].queries;
-    expect(queries.length).toEqual(5);
-    expect(queries[2].aggregates[0]).toEqual('equation|2 * $b');
-    expect(queries[3].aggregates[0]).toEqual('equation|$a + $b');
-    expect(queries[4].aggregates[0]).toEqual('equation|($b + $b) - $a');
+    expect(report).toHaveLength(1);
+    expect(widgets).toHaveLength(1);
+
+    const queries = widgets[0]!.queries;
+    expect(queries).toHaveLength(5);
+    expect(queries[2]!.aggregates[0]).toBe('equation|2 * $b');
+    expect(queries[3]!.aggregates[0]).toBe('equation|$a + $b');
+    expect(queries[4]!.aggregates[0]).toBe('equation|($b + $b) - $a');
   });
 });
diff --git a/static/app/utils/metrics/dashboardImport.tsx b/static/app/utils/metrics/dashboardImport.tsx
index df311829883f56..59a2a05d7e9b8f 100644
--- a/static/app/utils/metrics/dashboardImport.tsx
+++ b/static/app/utils/metrics/dashboardImport.tsx
@@ -205,7 +205,7 @@ export class WidgetParser {
 
     return convertToDashboardWidget(
       [...nonEmptyQueries, ...metricsEquations],
-      parsedRequests[0].displayType,
+      parsedRequests[0]!.displayType,
       title
     );
   }
diff --git a/static/app/utils/metrics/index.spec.tsx b/static/app/utils/metrics/index.spec.tsx
index 6d09bd06300770..7367076f3f99e6 100644
--- a/static/app/utils/metrics/index.spec.tsx
+++ b/static/app/utils/metrics/index.spec.tsx
@@ -72,7 +72,7 @@ describe('getFormattedMQL', () => {
       query: 'result:success',
     });
 
-    expect(result).toEqual(
+    expect(result).toBe(
       'avg(sentry.process_profile.symbolicate.process){result:success} by result'
     );
   });
@@ -85,7 +85,7 @@ describe('getFormattedMQL', () => {
       query: '',
     });
 
-    expect(result).toEqual('');
+    expect(result).toBe('');
   });
 });
 
diff --git a/static/app/utils/metrics/mri.spec.tsx b/static/app/utils/metrics/mri.spec.tsx
index fa87ad0e06a497..a4464aa1582a27 100644
--- a/static/app/utils/metrics/mri.spec.tsx
+++ b/static/app/utils/metrics/mri.spec.tsx
@@ -10,10 +10,10 @@ import {
 
 describe('parseMRI', () => {
   it('should handle falsy values', () => {
-    expect(parseMRI('')).toEqual(null);
-    expect(parseMRI()).toEqual(null);
-    expect(parseMRI(null)).toEqual(null);
-    expect(parseMRI(undefined)).toEqual(null);
+    expect(parseMRI('')).toBeNull();
+    expect(parseMRI()).toBeNull();
+    expect(parseMRI(null)).toBeNull();
+    expect(parseMRI(undefined)).toBeNull();
   });
 
   it.each(['c', 'd', 'e', 'g', 's'])(
@@ -214,9 +214,9 @@ describe('toMRI', () => {
 
 describe('formatMRI', () => {
   it('returns the metric name', () => {
-    expect(formatMRI('c:custom/foo@none')).toEqual('foo');
-    expect(formatMRI('c:custom/bar@ms')).toEqual('bar');
-    expect(formatMRI('d:transactions/baz@ms')).toEqual('baz');
+    expect(formatMRI('c:custom/foo@none')).toBe('foo');
+    expect(formatMRI('c:custom/bar@ms')).toBe('bar');
+    expect(formatMRI('d:transactions/baz@ms')).toBe('baz');
   });
 });
 
diff --git a/static/app/utils/metrics/mri.tsx b/static/app/utils/metrics/mri.tsx
index 3b60451cec8d3b..e28338344fb6b6 100644
--- a/static/app/utils/metrics/mri.tsx
+++ b/static/app/utils/metrics/mri.tsx
@@ -54,8 +54,8 @@ function _parseMRI(mri: string): ParsedMRI {
 
   return {
     type: metricType as MetricType,
-    name: parseName(name, useCase as UseCase),
-    unit,
+    name: parseName(name!, useCase as UseCase),
+    unit: unit!,
     useCase: useCase as UseCase,
   };
 }
diff --git a/static/app/utils/metrics/useBlockMetric.tsx b/static/app/utils/metrics/useBlockMetric.tsx
index 3e4afcef291d96..9eac459f0bff8b 100644
--- a/static/app/utils/metrics/useBlockMetric.tsx
+++ b/static/app/utils/metrics/useBlockMetric.tsx
@@ -67,7 +67,7 @@ export const useBlockMetric = (project: Project) => {
           if (index !== undefined && index !== -1) {
             const newMeta = [...oldMeta];
             newMeta[index] = {
-              ...newMeta[index],
+              ...newMeta[index]!,
               blockingStatus: [{...data, project: project.id}],
             };
 
diff --git a/static/app/utils/metrics/useCardinalityLimitedMetricVolume.tsx b/static/app/utils/metrics/useCardinalityLimitedMetricVolume.tsx
index eae63e2bfcae87..59cb4b27890366 100644
--- a/static/app/utils/metrics/useCardinalityLimitedMetricVolume.tsx
+++ b/static/app/utils/metrics/useCardinalityLimitedMetricVolume.tsx
@@ -33,7 +33,7 @@ export function useCardinalityLimitedMetricVolume({projects}: Props) {
     {
       environments: [],
       datetime: CARDINALITY_DATE_TIME,
-      projects: projects,
+      projects,
     },
     {interval: CARDINALITY_INTERVAL, includeSeries: false}
   );
@@ -41,7 +41,7 @@ export function useCardinalityLimitedMetricVolume({projects}: Props) {
   if (cardinalityQuery.data?.data[0]) {
     const data = cardinalityQuery.data.data[0].reduce(
       (acc, group) => {
-        acc[group.by.mri] = group.totals;
+        acc[group.by.mri!] = group.totals;
         return acc;
       },
       {} as Record<string, number>
diff --git a/static/app/utils/metrics/useMetricsQuery.spec.tsx b/static/app/utils/metrics/useMetricsQuery.spec.tsx
index 06000b41b0d158..6ad187ede2d934 100644
--- a/static/app/utils/metrics/useMetricsQuery.spec.tsx
+++ b/static/app/utils/metrics/useMetricsQuery.spec.tsx
@@ -10,7 +10,7 @@ describe('createMqlQuery', () => {
     const field = 'avg(transaction.duration)';
 
     const result = createMqlQuery({field});
-    expect(result).toEqual(`avg(transaction.duration)`);
+    expect(result).toBe(`avg(transaction.duration)`);
   });
 
   it('should create a mql query with a query', () => {
@@ -18,7 +18,7 @@ describe('createMqlQuery', () => {
     const query = 'event.type:error';
 
     const result = createMqlQuery({field, query});
-    expect(result).toEqual(`avg(transaction.duration){event.type:error}`);
+    expect(result).toBe(`avg(transaction.duration){event.type:error}`);
   });
 
   it('should create a mql query with a groupBy', () => {
@@ -26,7 +26,7 @@ describe('createMqlQuery', () => {
     const groupBy = ['environment'];
 
     const result = createMqlQuery({field, groupBy});
-    expect(result).toEqual(`avg(transaction.duration) by (environment)`);
+    expect(result).toBe(`avg(transaction.duration) by (environment)`);
   });
 
   it('should create a mql query with a query and groupBy', () => {
@@ -35,7 +35,7 @@ describe('createMqlQuery', () => {
     const groupBy = ['environment', 'project'];
 
     const result = createMqlQuery({field, query, groupBy});
-    expect(result).toEqual(
+    expect(result).toBe(
       `avg(transaction.duration){event.type:error} by (environment,project)`
     );
   });
diff --git a/static/app/utils/number/divide.spec.tsx b/static/app/utils/number/divide.spec.tsx
index 312c6ea38fa9d5..48f495ec78d9c1 100644
--- a/static/app/utils/number/divide.spec.tsx
+++ b/static/app/utils/number/divide.spec.tsx
@@ -2,10 +2,10 @@ import divide from 'sentry/utils/number/divide';
 
 describe('divide', () => {
   it('divides numbers safely', () => {
-    expect(divide(81, 9)).toEqual(9);
+    expect(divide(81, 9)).toBe(9);
   });
 
   it('dividing by zero returns zero', () => {
-    expect(divide(81, 0)).toEqual(0);
+    expect(divide(81, 0)).toBe(0);
   });
 });
diff --git a/static/app/utils/number/formatNumberWithDynamicDecimalPoints.spec.tsx b/static/app/utils/number/formatNumberWithDynamicDecimalPoints.spec.tsx
index 17d3bfe72c8d69..435963c5bddc98 100644
--- a/static/app/utils/number/formatNumberWithDynamicDecimalPoints.spec.tsx
+++ b/static/app/utils/number/formatNumberWithDynamicDecimalPoints.spec.tsx
@@ -2,47 +2,47 @@ import {formatNumberWithDynamicDecimalPoints} from 'sentry/utils/number/formatNu
 
 describe('formatNumberWithDynamicDecimals', () => {
   it('rounds to two decimal points without forcing them', () => {
-    expect(formatNumberWithDynamicDecimalPoints(1)).toEqual('1');
-    expect(formatNumberWithDynamicDecimalPoints(1.0)).toEqual('1');
-    expect(formatNumberWithDynamicDecimalPoints(1.5)).toEqual('1.5');
-    expect(formatNumberWithDynamicDecimalPoints(1.05)).toEqual('1.05');
-    expect(formatNumberWithDynamicDecimalPoints(1.004)).toEqual('1');
-    expect(formatNumberWithDynamicDecimalPoints(1.005)).toEqual('1.01');
-    expect(formatNumberWithDynamicDecimalPoints(1.1009)).toEqual('1.1');
-    expect(formatNumberWithDynamicDecimalPoints(2.236)).toEqual('2.24');
+    expect(formatNumberWithDynamicDecimalPoints(1)).toBe('1');
+    expect(formatNumberWithDynamicDecimalPoints(1.0)).toBe('1');
+    expect(formatNumberWithDynamicDecimalPoints(1.5)).toBe('1.5');
+    expect(formatNumberWithDynamicDecimalPoints(1.05)).toBe('1.05');
+    expect(formatNumberWithDynamicDecimalPoints(1.004)).toBe('1');
+    expect(formatNumberWithDynamicDecimalPoints(1.005)).toBe('1.01');
+    expect(formatNumberWithDynamicDecimalPoints(1.1009)).toBe('1.1');
+    expect(formatNumberWithDynamicDecimalPoints(2.236)).toBe('2.24');
   });
 
   it('rounds up to the maximum fraction digits passed', () => {
-    expect(formatNumberWithDynamicDecimalPoints(1, 2)).toEqual('1');
-    expect(formatNumberWithDynamicDecimalPoints(1.0, 2)).toEqual('1');
-    expect(formatNumberWithDynamicDecimalPoints(1.2345, 1)).toEqual('1.2');
-    expect(formatNumberWithDynamicDecimalPoints(1.2345, 2)).toEqual('1.23');
-    expect(formatNumberWithDynamicDecimalPoints(1.2345, 3)).toEqual('1.235');
-    expect(formatNumberWithDynamicDecimalPoints(1.2345, 4)).toEqual('1.2345');
-    expect(formatNumberWithDynamicDecimalPoints(1.2345, 5)).toEqual('1.2345');
+    expect(formatNumberWithDynamicDecimalPoints(1, 2)).toBe('1');
+    expect(formatNumberWithDynamicDecimalPoints(1.0, 2)).toBe('1');
+    expect(formatNumberWithDynamicDecimalPoints(1.2345, 1)).toBe('1.2');
+    expect(formatNumberWithDynamicDecimalPoints(1.2345, 2)).toBe('1.23');
+    expect(formatNumberWithDynamicDecimalPoints(1.2345, 3)).toBe('1.235');
+    expect(formatNumberWithDynamicDecimalPoints(1.2345, 4)).toBe('1.2345');
+    expect(formatNumberWithDynamicDecimalPoints(1.2345, 5)).toBe('1.2345');
   });
 
   it('preserves significant decimal places', () => {
-    expect(formatNumberWithDynamicDecimalPoints(0.001234)).toEqual('0.0012');
-    expect(formatNumberWithDynamicDecimalPoints(0.000125)).toEqual('0.00013');
-    expect(formatNumberWithDynamicDecimalPoints(0.0000123)).toEqual('0.000012');
+    expect(formatNumberWithDynamicDecimalPoints(0.001234)).toBe('0.0012');
+    expect(formatNumberWithDynamicDecimalPoints(0.000125)).toBe('0.00013');
+    expect(formatNumberWithDynamicDecimalPoints(0.0000123)).toBe('0.000012');
   });
 
   it('handles zero, NaN and Infinity', () => {
-    expect(formatNumberWithDynamicDecimalPoints(0)).toEqual('0');
-    expect(formatNumberWithDynamicDecimalPoints(NaN)).toEqual('NaN');
-    expect(formatNumberWithDynamicDecimalPoints(Infinity)).toEqual('∞');
-    expect(formatNumberWithDynamicDecimalPoints(-Infinity)).toEqual('-∞');
+    expect(formatNumberWithDynamicDecimalPoints(0)).toBe('0');
+    expect(formatNumberWithDynamicDecimalPoints(NaN)).toBe('NaN');
+    expect(formatNumberWithDynamicDecimalPoints(Infinity)).toBe('∞');
+    expect(formatNumberWithDynamicDecimalPoints(-Infinity)).toBe('-∞');
   });
 
   it('handles negative numbers', () => {
-    expect(formatNumberWithDynamicDecimalPoints(-1)).toEqual('-1');
-    expect(formatNumberWithDynamicDecimalPoints(-1.0)).toEqual('-1');
-    expect(formatNumberWithDynamicDecimalPoints(-1.5)).toEqual('-1.5');
-    expect(formatNumberWithDynamicDecimalPoints(-1.05)).toEqual('-1.05');
-    expect(formatNumberWithDynamicDecimalPoints(-1.004)).toEqual('-1');
-    expect(formatNumberWithDynamicDecimalPoints(-1.005)).toEqual('-1.01');
-    expect(formatNumberWithDynamicDecimalPoints(-1.1009)).toEqual('-1.1');
-    expect(formatNumberWithDynamicDecimalPoints(-2.236)).toEqual('-2.24');
+    expect(formatNumberWithDynamicDecimalPoints(-1)).toBe('-1');
+    expect(formatNumberWithDynamicDecimalPoints(-1.0)).toBe('-1');
+    expect(formatNumberWithDynamicDecimalPoints(-1.5)).toBe('-1.5');
+    expect(formatNumberWithDynamicDecimalPoints(-1.05)).toBe('-1.05');
+    expect(formatNumberWithDynamicDecimalPoints(-1.004)).toBe('-1');
+    expect(formatNumberWithDynamicDecimalPoints(-1.005)).toBe('-1.01');
+    expect(formatNumberWithDynamicDecimalPoints(-1.1009)).toBe('-1.1');
+    expect(formatNumberWithDynamicDecimalPoints(-2.236)).toBe('-2.24');
   });
 });
diff --git a/static/app/utils/number/toPixels.spec.tsx b/static/app/utils/number/toPixels.spec.tsx
index b2168696b50c2f..4ea794e7bca169 100644
--- a/static/app/utils/number/toPixels.spec.tsx
+++ b/static/app/utils/number/toPixels.spec.tsx
@@ -2,13 +2,13 @@ import toPixels from 'sentry/utils/number/toPixels';
 
 describe('toPixels', () => {
   it('should convert a number to a string suffixed with px', () => {
-    expect(toPixels(12)).toEqual('12px');
+    expect(toPixels(12)).toBe('12px');
   });
 
   it('should leave a string alone and return it', () => {
-    expect(toPixels('12px')).toEqual('12px');
-    expect(toPixels('100%')).toEqual('100%');
-    expect(toPixels('1em')).toEqual('1em');
+    expect(toPixels('12px')).toBe('12px');
+    expect(toPixels('100%')).toBe('100%');
+    expect(toPixels('1em')).toBe('1em');
   });
 
   it('should return undefined if that was passed in', () => {
diff --git a/static/app/utils/onDemandMetrics/constants.tsx b/static/app/utils/onDemandMetrics/constants.tsx
index 39c9ea4e3b9c0f..e9098e99155296 100644
--- a/static/app/utils/onDemandMetrics/constants.tsx
+++ b/static/app/utils/onDemandMetrics/constants.tsx
@@ -21,6 +21,7 @@ export const ON_DEMAND_METRICS_UNSUPPORTED_TAGS = new Set([
   FieldKey.ID,
   FieldKey.MESSAGE,
   FieldKey.PROFILE_ID,
+  FieldKey.RELEASE_STAGE,
   FieldKey.TIMESTAMP_TO_DAY,
   FieldKey.TIMESTAMP_TO_HOUR,
   FieldKey.TIMESTAMP,
diff --git a/static/app/utils/onDemandMetrics/index.spec.tsx b/static/app/utils/onDemandMetrics/index.spec.tsx
index d070e94b474f89..a5dfc60bb01364 100644
--- a/static/app/utils/onDemandMetrics/index.spec.tsx
+++ b/static/app/utils/onDemandMetrics/index.spec.tsx
@@ -31,7 +31,7 @@ describe('createOnDemandFilterWarning', () => {
     const message = "This filter isn't supported";
     const getOnDemandFilterWarning = createOnDemandFilterWarning(message);
     STANDARD_SEARCH_FIELD_KEYS.forEach(key => {
-      expect(getOnDemandFilterWarning(key)).toBe(null);
+      expect(getOnDemandFilterWarning(key)).toBeNull();
     });
   });
 });
diff --git a/static/app/utils/oxfordizeArray.spec.tsx b/static/app/utils/oxfordizeArray.spec.tsx
index 6bf74b1837b8d1..38319a51cbaa0b 100644
--- a/static/app/utils/oxfordizeArray.spec.tsx
+++ b/static/app/utils/oxfordizeArray.spec.tsx
@@ -10,11 +10,11 @@ describe('oxfordizeArray', function () {
     const three = ['A', 'B', 'C'];
     const four = ['A', 'B', 'C', 'D'];
 
-    expect(oxfordizeArray(zero)).toEqual('');
-    expect(oxfordizeArray(one)).toEqual('A');
-    expect(oxfordizeArray(two)).toEqual('A and B');
-    expect(oxfordizeArray(three)).toEqual('A, B, and C');
-    expect(oxfordizeArray(four)).toEqual('A, B, C, and D');
+    expect(oxfordizeArray(zero)).toBe('');
+    expect(oxfordizeArray(one)).toBe('A');
+    expect(oxfordizeArray(two)).toBe('A and B');
+    expect(oxfordizeArray(three)).toBe('A, B, and C');
+    expect(oxfordizeArray(four)).toBe('A, B, C, and D');
   });
 });
 
diff --git a/static/app/utils/parseHtmlMarks.tsx b/static/app/utils/parseHtmlMarks.tsx
index 23369b8352182a..74687b6c2fa6cb 100644
--- a/static/app/utils/parseHtmlMarks.tsx
+++ b/static/app/utils/parseHtmlMarks.tsx
@@ -25,7 +25,6 @@ export default function parseHtmlMarks({key, htmlString, markTags}: Options) {
   const indices: [number, number][] = [];
   let value = htmlString;
 
-  // eslint-disable-next-line no-constant-condition
   while (true) {
     const openIndex = value.indexOf(highlightPreTag);
     const openIndexEnd = openIndex + highlightPreTag.length;
diff --git a/static/app/utils/parseLinkHeader.tsx b/static/app/utils/parseLinkHeader.tsx
index b1d87d1aa5b7a1..26ea91972eb59e 100644
--- a/static/app/utils/parseLinkHeader.tsx
+++ b/static/app/utils/parseLinkHeader.tsx
@@ -24,10 +24,10 @@ export default function parseLinkHeader(header: string | null): Result {
     const [, href, rel, results, cursor] = match;
     const hasResults = results === 'true' ? true : results === 'false' ? false : null;
 
-    links[rel] = {
-      href,
+    links[rel!] = {
+      href: href!,
       results: hasResults,
-      cursor,
+      cursor: cursor!,
     };
   });
 
diff --git a/static/app/utils/performance/contexts/genericQueryBatcher.tsx b/static/app/utils/performance/contexts/genericQueryBatcher.tsx
index 528ca7ad9d0b9a..971bfa4759c89c 100644
--- a/static/app/utils/performance/contexts/genericQueryBatcher.tsx
+++ b/static/app/utils/performance/contexts/genericQueryBatcher.tsx
@@ -57,7 +57,7 @@ function queriesToMap(collectedQueries: Record<symbol, BatchQueryDefinition>) {
   keys.forEach(key => {
     const query = collectedQueries[key];
     mergeMap[mergeKey(query)] = mergeMap[mergeKey(query)] || [];
-    mergeMap[mergeKey(query)].push(query);
+    mergeMap[mergeKey(query)]!.push(query);
     delete collectedQueries[key];
   });
 
@@ -81,12 +81,12 @@ function _handleUnmergeableQueries(mergeMap: MergeMap) {
   let queriesSent = 0;
   Object.keys(mergeMap).forEach(k => {
     // Using async forEach to ensure calls start in parallel.
-    const mergeList = mergeMap[k];
+    const mergeList = mergeMap[k]!;
 
     if (mergeList.length === 1) {
       const [queryDefinition] = mergeList;
       queriesSent++;
-      _handleUnmergeableQuery(queryDefinition);
+      _handleUnmergeableQuery(queryDefinition!);
     }
   });
 
@@ -96,16 +96,16 @@ function _handleUnmergeableQueries(mergeMap: MergeMap) {
 function _handleMergeableQueries(mergeMap: MergeMap) {
   let queriesSent = 0;
   Object.keys(mergeMap).forEach(async k => {
-    const mergeList = mergeMap[k];
+    const mergeList = mergeMap[k]!;
 
     if (mergeList.length <= 1) {
       return;
     }
 
     const [exampleDefinition] = mergeList;
-    const batchProperty = exampleDefinition.batchProperty;
-    const query = {...exampleDefinition.requestQueryObject.query};
-    const requestQueryObject = {...exampleDefinition.requestQueryObject, query};
+    const batchProperty = exampleDefinition!.batchProperty;
+    const query = {...exampleDefinition!.requestQueryObject.query};
+    const requestQueryObject = {...exampleDefinition!.requestQueryObject, query};
 
     const batchValues: string[] = [];
 
@@ -129,8 +129,8 @@ function _handleMergeableQueries(mergeMap: MergeMap) {
 
     queriesSent++;
     const requestPromise = requestFunction(
-      exampleDefinition.api,
-      exampleDefinition.path,
+      exampleDefinition!.api,
+      exampleDefinition!.path,
       requestQueryObject
     );
 
diff --git a/static/app/utils/performance/histogram/index.tsx b/static/app/utils/performance/histogram/index.tsx
index 1f60a53f93d953..9363cbd0f58b6d 100644
--- a/static/app/utils/performance/histogram/index.tsx
+++ b/static/app/utils/performance/histogram/index.tsx
@@ -1,9 +1,8 @@
-import {Component} from 'react';
 import type {Location} from 'history';
 
 import type {SelectValue} from 'sentry/types/core';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {decodeScalar} from 'sentry/utils/queryString';
+import {useNavigate} from 'sentry/utils/useNavigate';
 
 import {FILTER_OPTIONS} from './constants';
 import type {DataFilter} from './types';
@@ -22,34 +21,30 @@ type Props = {
   zoomKeys: string[];
 };
 
-class Histogram extends Component<Props> {
-  isZoomed() {
-    const {location, zoomKeys} = this.props;
-    return zoomKeys.map(key => location.query[key]).some(value => value !== undefined);
-  }
+function Histogram(props: Props) {
+  const {location, zoomKeys, children} = props;
+  const navigate = useNavigate();
 
-  handleResetView = () => {
-    const {location, zoomKeys} = this.props;
+  const isZoomed = () => {
+    return zoomKeys.map(key => location.query[key]).some(value => value !== undefined);
+  };
 
-    browserHistory.push({
+  const handleResetView = () => {
+    navigate({
       pathname: location.pathname,
       query: removeHistogramQueryStrings(location, zoomKeys),
     });
   };
 
-  getActiveFilter() {
-    const {location} = this.props;
-
+  const getActiveFilter = () => {
     const dataFilter = location.query.dataFilter
       ? decodeScalar(location.query.dataFilter)
-      : FILTER_OPTIONS[0].value;
+      : FILTER_OPTIONS[0]!.value;
     return FILTER_OPTIONS.find(item => item.value === dataFilter) || FILTER_OPTIONS[0];
-  }
-
-  handleFilterChange = (value: string) => {
-    const {location, zoomKeys} = this.props;
+  };
 
-    browserHistory.push({
+  const handleFilterChange = (value: string) => {
+    navigate({
       pathname: location.pathname,
       query: {
         ...removeHistogramQueryStrings(location, zoomKeys),
@@ -58,16 +53,14 @@ class Histogram extends Component<Props> {
     });
   };
 
-  render() {
-    const childrenProps = {
-      isZoomed: this.isZoomed(),
-      handleResetView: this.handleResetView,
-      activeFilter: this.getActiveFilter(),
-      handleFilterChange: this.handleFilterChange,
-      filterOptions: FILTER_OPTIONS,
-    };
-    return this.props.children(childrenProps);
-  }
+  const childrenProps = {
+    isZoomed: isZoomed(),
+    handleResetView,
+    activeFilter: getActiveFilter()!,
+    handleFilterChange,
+    filterOptions: FILTER_OPTIONS,
+  };
+  return children(childrenProps);
 }
 
 export function removeHistogramQueryStrings(location: Location, zoomKeys: string[]) {
diff --git a/static/app/utils/performance/histogram/utils.tsx b/static/app/utils/performance/histogram/utils.tsx
index a62d4cefc00932..7d57cae722147e 100644
--- a/static/app/utils/performance/histogram/utils.tsx
+++ b/static/app/utils/performance/histogram/utils.tsx
@@ -7,7 +7,7 @@ export function getBucketWidth(data: HistogramData) {
   // We can assume that all buckets are of equal width, use the first two
   // buckets to get the width. The value of each histogram function indicates
   // the beginning of the bucket.
-  return data.length >= 2 ? data[1].bin - data[0].bin : 0;
+  return data.length >= 2 ? data[1]!.bin - data[0]!.bin : 0;
 }
 
 export function computeBuckets(data: HistogramData) {
diff --git a/static/app/utils/performanceForSentry/index.tsx b/static/app/utils/performanceForSentry/index.tsx
index 9845b2637aa224..de15d5d3b72911 100644
--- a/static/app/utils/performanceForSentry/index.tsx
+++ b/static/app/utils/performanceForSentry/index.tsx
@@ -1,7 +1,7 @@
 import type {ProfilerOnRenderCallback, ReactNode} from 'react';
 import {Fragment, Profiler, useEffect, useRef} from 'react';
+import type {MeasurementUnit, Span, TransactionEvent} from '@sentry/core';
 import * as Sentry from '@sentry/react';
-import type {MeasurementUnit, Span, TransactionEvent} from '@sentry/types';
 import {
   _browserPerformanceTimeOriginMode,
   browserPerformanceTimeOrigin,
diff --git a/static/app/utils/prism.tsx b/static/app/utils/prism.tsx
index d1b13b196b2f91..e8e190950596a6 100644
--- a/static/app/utils/prism.tsx
+++ b/static/app/utils/prism.tsx
@@ -92,7 +92,7 @@ export async function loadPrismLanguage(
     const language: string | undefined = getPrismLanguage(lang);
 
     // Short-circuit if language already loaded
-    if (Prism.languages[language]) {
+    if (Prism.languages[language!]) {
       onLoad?.();
       return;
     }
diff --git a/static/app/utils/profiling/canvasScheduler.spec.tsx b/static/app/utils/profiling/canvasScheduler.spec.tsx
index 6289f190d1a8d3..c0511f52e84532 100644
--- a/static/app/utils/profiling/canvasScheduler.spec.tsx
+++ b/static/app/utils/profiling/canvasScheduler.spec.tsx
@@ -110,7 +110,7 @@ describe('CanvasScheduler', () => {
 
     jest.runAllTimers();
     expect(drawBeforeFn.mock.invocationCallOrder[0]).toBeLessThan(
-      drawAfterFn.mock.invocationCallOrder[0]
+      drawAfterFn.mock.invocationCallOrder[0]!
     );
   });
   it('drawSync', () => {
@@ -127,7 +127,7 @@ describe('CanvasScheduler', () => {
     scheduler.drawSync();
 
     expect(drawBeforeFn.mock.invocationCallOrder[0]).toBeLessThan(
-      drawAfterFn.mock.invocationCallOrder[0]
+      drawAfterFn.mock.invocationCallOrder[0]!
     );
   });
   it('dispose', () => {
diff --git a/static/app/utils/profiling/canvasView.spec.tsx b/static/app/utils/profiling/canvasView.spec.tsx
index 5492044b5a2dff..e633ea603e3cf6 100644
--- a/static/app/utils/profiling/canvasView.spec.tsx
+++ b/static/app/utils/profiling/canvasView.spec.tsx
@@ -330,8 +330,8 @@ describe('CanvasView', () => {
         flamegraphCanvas
       );
       // 500 - 500 offset = 0
-      expect(cursor[0]).toEqual(0);
-      expect(cursor[1]).toEqual(25);
+      expect(cursor[0]).toBe(0);
+      expect(cursor[1]).toBe(25);
     });
     it('getTransformedConfigViewCursor', () => {
       const canvas = makeCanvasMock({width: 1000, height: 1000});
@@ -359,8 +359,8 @@ describe('CanvasView', () => {
         flamegraphCanvas
       );
 
-      expect(cursor[0]).toEqual(600);
-      expect(cursor[1]).toEqual(25);
+      expect(cursor[0]).toBe(600);
+      expect(cursor[1]).toBe(25);
     });
   });
 });
diff --git a/static/app/utils/profiling/colors/utils.tsx b/static/app/utils/profiling/colors/utils.tsx
index 4ff009843c97c5..ca3f4b921f7919 100644
--- a/static/app/utils/profiling/colors/utils.tsx
+++ b/static/app/utils/profiling/colors/utils.tsx
@@ -15,7 +15,7 @@ function uniqueCountBy<T>(
 
   let count = 0;
   for (let i = 0; i < arr.length; i++) {
-    const key = predicate(arr[i]);
+    const key = predicate(arr[i]!);
 
     if (key === true) {
       count++;
@@ -48,7 +48,7 @@ function uniqueBy<T>(arr: ReadonlyArray<T>, predicate: (t: T) => unknown): Array
       continue;
     }
     seen.add(key);
-    set.push(item);
+    set.push(item!);
   }
 
   return set;
@@ -75,10 +75,10 @@ export function makeColorBufferForNodes(
 
     for (let i = 0; i < 6; i++) {
       const offset = index * 6 * 4 + i * 4;
-      colorBuffer[offset] = colorWithAlpha[0];
-      colorBuffer[offset + 1] = colorWithAlpha[1];
-      colorBuffer[offset + 2] = colorWithAlpha[2];
-      colorBuffer[offset + 3] = colorWithAlpha[3];
+      colorBuffer[offset] = colorWithAlpha[0]!;
+      colorBuffer[offset + 1] = colorWithAlpha[1]!;
+      colorBuffer[offset + 2] = colorWithAlpha[2]!;
+      colorBuffer[offset + 3] = colorWithAlpha[3]!;
     }
   }
 
@@ -106,10 +106,10 @@ export function makeColorBuffer(
 
     for (let i = 0; i < 6; i++) {
       const offset = index * 6 * 4 + i * 4;
-      colorBuffer[offset] = colorWithAlpha[0];
-      colorBuffer[offset + 1] = colorWithAlpha[1];
-      colorBuffer[offset + 2] = colorWithAlpha[2];
-      colorBuffer[offset + 3] = colorWithAlpha[3];
+      colorBuffer[offset] = colorWithAlpha[0]!;
+      colorBuffer[offset + 1] = colorWithAlpha[1]!;
+      colorBuffer[offset + 2] = colorWithAlpha[2]!;
+      colorBuffer[offset + 3] = colorWithAlpha[3]!;
     }
   }
 
@@ -189,7 +189,7 @@ export function makeColorMapBySymbolName(
   const uniqueCount = uniqueCountBy(sortedFrames, t => defaultFrameKey(t));
 
   for (let i = 0; i < sortedFrames.length; i++) {
-    const frame = sortedFrames[i];
+    const frame = sortedFrames[i]!;
 
     const key = defaultFrameKey(frame);
 
@@ -215,7 +215,7 @@ export function makeColorMapByRecursion(
   const uniqueCount = uniqueCountBy(sortedFrames, t => !!t.node.recursive);
 
   for (let i = 0; i < sortedFrames.length; i++) {
-    if (!sortedFrames[i].node.recursive) {
+    if (!sortedFrames[i]!.node.recursive) {
       continue;
     }
     const frame = sortedFrames[i]!;
@@ -246,7 +246,7 @@ export function makeColorMapByLibrary(
   const uniqueCount = uniqueCountBy(sortedFrames, t => frameLibraryKey(t));
 
   for (let i = 0; i < sortedFrames.length; i++) {
-    const frame = sortedFrames[i];
+    const frame = sortedFrames[i]!;
 
     const key = frameLibraryKey(frame);
 
@@ -277,17 +277,17 @@ export function makeColorMapBySystemFrame(
 
   const uniqueCount = uniqueCountBy(sortedFrames, t => defaultFrameKey(t));
   for (let i = 0; i < sortedFrames.length; i++) {
-    if (sortedFrames[i].frame.is_application) {
+    if (sortedFrames[i]!.frame.is_application) {
       continue;
     }
 
-    const key = defaultFrameKey(sortedFrames[i]);
+    const key = defaultFrameKey(sortedFrames[i]!);
     if (!colorCache.has(key)) {
       const color = colorBucket(Math.floor((255 * i) / uniqueCount) / 256);
       colorCache.set(key, color);
     }
 
-    colors.set(sortedFrames[i].key, colorCache.get(key)!);
+    colors.set(sortedFrames[i]!.key, colorCache.get(key)!);
   }
 
   return colors;
@@ -306,15 +306,15 @@ export function makeColorMapBySystemVsApplicationFrame(
   });
 
   for (let i = 0; i < sortedFrames.length; i++) {
-    const key = defaultFrameKey(sortedFrames[i]);
+    const key = defaultFrameKey(sortedFrames[i]!);
 
-    if (sortedFrames[i].frame.is_application) {
+    if (sortedFrames[i]!.frame.is_application) {
       colorCache.set(key, theme.COLORS.FRAME_APPLICATION_COLOR);
     } else {
       colorCache.set(key, theme.COLORS.FRAME_SYSTEM_COLOR);
     }
 
-    colors.set(sortedFrames[i].key, colorCache.get(key)!);
+    colors.set(sortedFrames[i]!.key, colorCache.get(key)!);
   }
 
   return colors;
@@ -333,17 +333,17 @@ export function makeColorMapByApplicationFrame(
 
   const uniqueCount = uniqueCountBy(sortedFrames, t => defaultFrameKey(t));
   for (let i = 0; i < sortedFrames.length; i++) {
-    if (!sortedFrames[i].frame.is_application) {
+    if (!sortedFrames[i]!.frame.is_application) {
       continue;
     }
 
-    const key = defaultFrameKey(sortedFrames[i]);
+    const key = defaultFrameKey(sortedFrames[i]!);
     if (!colorCache.has(key)) {
       const color = colorBucket(Math.floor((255 * i) / uniqueCount) / 256);
       colorCache.set(key, color);
     }
 
-    colors.set(sortedFrames[i].key, colorCache.get(key)!);
+    colors.set(sortedFrames[i]!.key, colorCache.get(key)!);
   }
 
   return colors;
@@ -393,7 +393,7 @@ export function makeSpansColorMapByOpAndDescription(
   const uniqueSpans = uniqueBy(spans, s => s.node.span.op ?? '');
 
   for (let i = 0; i < uniqueSpans.length; i++) {
-    const key = uniqueSpans[i].node.span.op ?? '';
+    const key = uniqueSpans[i]!.node.span.op ?? '';
     if (key === 'missing span instrumentation') {
       continue;
     }
@@ -401,7 +401,7 @@ export function makeSpansColorMapByOpAndDescription(
   }
 
   for (let i = 0; i < spans.length; i++) {
-    colors.set(spans[i].node.span.span_id, colors.get(spans[i].node.span.op ?? '')!);
+    colors.set(spans[i]!.node.span.span_id, colors.get(spans[i]!.node.span.op ?? '')!);
   }
 
   return colors;
@@ -409,7 +409,7 @@ export function makeSpansColorMapByOpAndDescription(
 
 // Convert color component from 0-1 to 0-255 range
 export function colorComponentsToRGBA(color: number[]): string {
-  return `rgba(${Math.floor(color[0] * 255)}, ${Math.floor(color[1] * 255)}, ${Math.floor(
-    color[2] * 255
+  return `rgba(${Math.floor(color[0]! * 255)}, ${Math.floor(color[1]! * 255)}, ${Math.floor(
+    color[2]! * 255
   )}, ${color[3] ?? 1})`;
 }
diff --git a/static/app/utils/profiling/differentialFlamegraph.spec.tsx b/static/app/utils/profiling/differentialFlamegraph.spec.tsx
index b26fa7bd5940c6..4eb5772d3e0213 100644
--- a/static/app/utils/profiling/differentialFlamegraph.spec.tsx
+++ b/static/app/utils/profiling/differentialFlamegraph.spec.tsx
@@ -171,7 +171,7 @@ describe('differentialFlamegraph', () => {
     );
 
     expect(flamegraph.removedFrames?.length).toBe(1);
-    expect(flamegraph.removedFrames?.[0].frame.name).toBe('removed function');
+    expect(flamegraph.removedFrames?.[0]!.frame.name).toBe('removed function');
     expect([...flamegraph.colors.values()][0]).toEqual([
       ...THEME.COLORS.DIFFERENTIAL_DECREASE,
       1 * DifferentialFlamegraph.ALPHA_SCALING,
@@ -211,7 +211,7 @@ describe('differentialFlamegraph', () => {
     );
 
     expect(flamegraph.removedFrames?.length).toBe(1);
-    expect(flamegraph.removedFrames?.[0].frame.name).toBe('removed function');
+    expect(flamegraph.removedFrames?.[0]!.frame.name).toBe('removed function');
     expect([...flamegraph.colors.values()][0]).toEqual([
       ...THEME.COLORS.DIFFERENTIAL_DECREASE,
       1 * DifferentialFlamegraph.ALPHA_SCALING,
diff --git a/static/app/utils/profiling/differentialFlamegraph.tsx b/static/app/utils/profiling/differentialFlamegraph.tsx
index d161e367e2e691..9c49c71fc6e847 100644
--- a/static/app/utils/profiling/differentialFlamegraph.tsx
+++ b/static/app/utils/profiling/differentialFlamegraph.tsx
@@ -183,7 +183,7 @@ export function diffFlamegraphTreeRecursive(
     // other node has children, add them to the removedFrames list
     if (!afterFrameChildrenLength && beforeFrameChildrenLength) {
       for (let i = 0; i < beforeFrameChildrenLength; i++) {
-        removedFrames = removedFrames.concat(getTreeNodes(beforeFrame.children[i]));
+        removedFrames = removedFrames.concat(getTreeNodes(beforeFrame.children[i]!));
       }
       return;
     }
@@ -192,7 +192,7 @@ export function diffFlamegraphTreeRecursive(
     // we mark the entire part of the tree as new
     if (!beforeFrameChildrenLength && afterFrameChildrenLength) {
       for (let i = 0; i < afterFrameChildrenLength; i++) {
-        newFrames = newFrames.concat(getTreeNodes(afterFrame.children[i]));
+        newFrames = newFrames.concat(getTreeNodes(afterFrame.children[i]!));
       }
       return;
     }
@@ -200,26 +200,26 @@ export function diffFlamegraphTreeRecursive(
     let j = 0;
     for (let i = 0; i < afterFrameChildrenLength; i++) {
       for (; j < beforeFrameChildrenLength; j++) {
-        const result = compareFrames(beforeFrame.children[j], afterFrame.children[i]);
+        const result = compareFrames(beforeFrame.children[j]!, afterFrame.children[i]!);
 
         if (result === 0) {
-          visit(beforeFrame.children[j], afterFrame.children[i]);
+          visit(beforeFrame.children[j]!, afterFrame.children[i]!);
           ++j;
           break;
         }
         if (result === -1) {
-          removedFrames = removedFrames.concat(getTreeNodes(beforeFrame.children[j]));
+          removedFrames = removedFrames.concat(getTreeNodes(beforeFrame.children[j]!));
           continue;
         }
         if (result === 1) {
-          newFrames = newFrames.concat(getTreeNodes(afterFrame.children[i]));
+          newFrames = newFrames.concat(getTreeNodes(afterFrame.children[i]!));
           break;
         }
       }
     }
 
     while (j < beforeFrameChildrenLength) {
-      removedFrames = removedFrames.concat(getTreeNodes(beforeFrame.children[j]));
+      removedFrames = removedFrames.concat(getTreeNodes(beforeFrame.children[j]!));
       j++;
     }
   }
diff --git a/static/app/utils/profiling/filterFlamegraphTree.spec.tsx b/static/app/utils/profiling/filterFlamegraphTree.spec.tsx
index 2def65599f7a56..3cff1eeeb5f3f8 100644
--- a/static/app/utils/profiling/filterFlamegraphTree.spec.tsx
+++ b/static/app/utils/profiling/filterFlamegraphTree.spec.tsx
@@ -30,7 +30,7 @@ function assertImmutability(baseNode: FlamegraphFrame, newNode: FlamegraphFrame)
       map.set(n.key, n);
 
       for (let i = 0; i < n.children.length; i++) {
-        stack.push(n.children[i]);
+        stack.push(n.children[i]!);
       }
     }
   }
@@ -80,7 +80,7 @@ describe('filterFlamegraphTree', () => {
 
     const result = filterFlamegraphTree([root], skipFn);
     expect(result).toEqual([{...child1, parent: null}]);
-    assertImmutability(root, result[0]);
+    assertImmutability(root, result[0]!);
   });
 
   it('persists multiple children', () => {
@@ -106,9 +106,9 @@ describe('filterFlamegraphTree', () => {
     root.children = [child1, child2];
 
     const result = filterFlamegraphTree([root], skipFn);
-    expect(result[0].children.map(c => c.key)).toEqual([1, 2]);
+    expect(result[0]!.children.map(c => c.key)).toEqual([1, 2]);
 
-    assertImmutability(root, result[0]);
+    assertImmutability(root, result[0]!);
   });
 
   it('skips a level', () => {
@@ -138,10 +138,10 @@ describe('filterFlamegraphTree', () => {
     child2.parent = child1;
 
     const result = filterFlamegraphTree([root], skipFn);
-    expect(result[0].key).toBe(0);
-    expect(result[0].children[0].key).toBe(2);
+    expect(result[0]!.key).toBe(0);
+    expect(result[0]!.children[0]!.key).toBe(2);
 
-    assertImmutability(root, result[0]);
+    assertImmutability(root, result[0]!);
   });
 
   it('persists hierarchy level', () => {
@@ -171,11 +171,11 @@ describe('filterFlamegraphTree', () => {
     child2.parent = child1;
 
     const result = filterFlamegraphTree([root], skipFn);
-    expect(result[0].key).toBe(0);
-    expect(result[0].children[0].key).toBe(1);
-    expect(result[0].children[0].children[0].key).toBe(2);
+    expect(result[0]!.key).toBe(0);
+    expect(result[0]!.children[0]!.key).toBe(1);
+    expect(result[0]!.children[0]!.children[0]!.key).toBe(2);
 
-    assertImmutability(root, result[0]);
+    assertImmutability(root, result[0]!);
   });
 
   it('preserves child order', () => {
@@ -210,11 +210,11 @@ describe('filterFlamegraphTree', () => {
     child3.parent = child1;
 
     const result = filterFlamegraphTree([root], skipFn);
-    expect(result[0].key).toBe(0);
-    expect(result[0].children[0].key).toBe(1);
-    expect(result[0].children[0].children[0].key).toBe(3);
-    expect(result[0].children[0].children[1].key).toBe(2);
+    expect(result[0]!.key).toBe(0);
+    expect(result[0]!.children[0]!.key).toBe(1);
+    expect(result[0]!.children[0]!.children[0]!.key).toBe(3);
+    expect(result[0]!.children[0]!.children[1]!.key).toBe(2);
 
-    assertImmutability(root, result[0]);
+    assertImmutability(root, result[0]!);
   });
 });
diff --git a/static/app/utils/profiling/filterFlamegraphTree.tsx b/static/app/utils/profiling/filterFlamegraphTree.tsx
index a5355185dd8de6..ea7e8c2a7efe0c 100644
--- a/static/app/utils/profiling/filterFlamegraphTree.tsx
+++ b/static/app/utils/profiling/filterFlamegraphTree.tsx
@@ -38,7 +38,7 @@ export function filterFlamegraphTree(
 
       // enqueue children
       for (let i = 0; i < node.children.length; i++) {
-        stack.push(node.children[node.children.length - i - 1]);
+        stack.push(node.children[node.children.length - i - 1]!);
       }
     }
   }
diff --git a/static/app/utils/profiling/flamegraph.spec.tsx b/static/app/utils/profiling/flamegraph.spec.tsx
index dec7a8c319e3d7..7c290405f3f384 100644
--- a/static/app/utils/profiling/flamegraph.spec.tsx
+++ b/static/app/utils/profiling/flamegraph.spec.tsx
@@ -142,8 +142,8 @@ describe('flamegraph', () => {
 
     const order = ['f0', 'f1', 'f2'].reverse();
     for (let i = 0; i < order.length; i++) {
-      expect(flamegraph.frames[i].frame.name).toBe(order[i]);
-      expect(flamegraph.frames[i].depth).toBe(order.length - i - 1);
+      expect(flamegraph.frames[i]!.frame.name).toBe(order[i]);
+      expect(flamegraph.frames[i]!.depth).toBe(order.length - i - 1);
     }
   });
 
@@ -174,7 +174,7 @@ describe('flamegraph', () => {
         sort: 'call order',
       }
     );
-    expect(flamegraph.frames.length).toBe(1);
+    expect(flamegraph.frames).toHaveLength(1);
     expect(flamegraph.frames.every(f => f.frame.name !== 'f1')).toBe(true);
   });
 
@@ -270,15 +270,15 @@ describe('flamegraph', () => {
       }
     );
 
-    expect(flamegraph.frames[1].frame.name).toBe('f0');
-    expect(flamegraph.frames[1].frame.totalWeight).toBe(1);
-    expect(flamegraph.frames[1].start).toBe(2);
-    expect(flamegraph.frames[1].end).toBe(3);
+    expect(flamegraph.frames[1]!.frame.name).toBe('f0');
+    expect(flamegraph.frames[1]!.frame.totalWeight).toBe(1);
+    expect(flamegraph.frames[1]!.start).toBe(2);
+    expect(flamegraph.frames[1]!.end).toBe(3);
 
-    expect(flamegraph.frames[0].frame.name).toBe('f1');
-    expect(flamegraph.frames[0].frame.totalWeight).toBe(2);
-    expect(flamegraph.frames[0].start).toBe(0);
-    expect(flamegraph.frames[0].end).toBe(2);
+    expect(flamegraph.frames[0]!.frame.name).toBe('f1');
+    expect(flamegraph.frames[0]!.frame.totalWeight).toBe(2);
+    expect(flamegraph.frames[0]!.start).toBe(0);
+    expect(flamegraph.frames[0]!.end).toBe(2);
   });
 
   it('updates startTime and endTime of left heavy children graph', () => {
@@ -311,7 +311,7 @@ describe('flamegraph', () => {
       }
     );
 
-    expect(flamegraph.frames[2].frame.name).toBe('f0');
+    expect(flamegraph.frames[2]!.frame.name).toBe('f0');
   });
 
   it('From', () => {
diff --git a/static/app/utils/profiling/flamegraph.ts b/static/app/utils/profiling/flamegraph.ts
index 1819b329396feb..36e6e440d1a225 100644
--- a/static/app/utils/profiling/flamegraph.ts
+++ b/static/app/utils/profiling/flamegraph.ts
@@ -26,7 +26,7 @@ function makeTreeSort(sortFn: (a: CallTreeNode, b: CallTreeNode) => number) {
       next.children.sort(sortFn);
 
       for (let i = 0; i < next.children.length; i++) {
-        queue.push(next.children[i]);
+        queue.push(next.children[i]!);
       }
     }
   };
@@ -313,8 +313,8 @@ export class Flamegraph {
 
     if (fields.length === 1) {
       for (let i = 0; i < this.frames.length; i++) {
-        if (this.frames[i].frame[fields[0]] === query) {
-          matches.push(this.frames[i]);
+        if (this.frames[i]!.frame[fields[0]!] === query) {
+          matches.push(this.frames[i]!);
         }
       }
       return matches;
@@ -322,8 +322,8 @@ export class Flamegraph {
 
     for (let i = 0; i < this.frames.length; i++) {
       for (let j = fields.length; j--; ) {
-        if (this.frames[i].frame[fields[j]] === query) {
-          matches.push(this.frames[i]);
+        if (this.frames[i]!.frame[fields[j]!] === query) {
+          matches.push(this.frames[i]!);
         }
       }
     }
@@ -338,13 +338,13 @@ export class Flamegraph {
 
     for (let i = 0; i < this.frames.length; i++) {
       if (
-        this.frames[i].frame.name === frameName &&
+        this.frames[i]!.frame.name === frameName &&
         // the framePackage can match either the package or the module
         // this is an artifact of how we previously used image
-        (tryTrimPackage(this.frames[i].frame.package) === framePackage ||
-          this.frames[i].frame.module === framePackage)
+        (tryTrimPackage(this.frames[i]!.frame.package) === framePackage ||
+          this.frames[i]!.frame.module === framePackage)
       ) {
-        matches.push(this.frames[i]);
+        matches.push(this.frames[i]!);
       }
     }
 
diff --git a/static/app/utils/profiling/flamegraph/flamegraphTheme.tsx b/static/app/utils/profiling/flamegraph/flamegraphTheme.tsx
index 21d2e7708f4461..88940d2f734cea 100644
--- a/static/app/utils/profiling/flamegraph/flamegraphTheme.tsx
+++ b/static/app/utils/profiling/flamegraph/flamegraphTheme.tsx
@@ -203,10 +203,10 @@ export const LightFlamegraphTheme: FlamegraphTheme = {
       'by frequency': makeColorMapByFrequency,
       'by system vs application frame': makeColorMapBySystemVsApplicationFrame,
     },
-    CPU_CHART_COLORS: CHART_PALETTE[12].map(c => hexToColorChannels(c, 0.8)),
+    CPU_CHART_COLORS: CHART_PALETTE[12]!.map(c => hexToColorChannels(c, 0.8)),
     MEMORY_CHART_COLORS: [
-      hexToColorChannels(CHART_PALETTE[4][2], 0.8),
-      hexToColorChannels(CHART_PALETTE[4][3], 0.8),
+      hexToColorChannels(CHART_PALETTE[4]![2]!, 0.8),
+      hexToColorChannels(CHART_PALETTE[4]![3]!, 0.8),
     ],
     CHART_CURSOR_INDICATOR: 'rgba(31,35,58,.75)',
     CHART_LABEL_COLOR: 'rgba(31,35,58,.75)',
@@ -257,10 +257,10 @@ export const DarkFlamegraphTheme: FlamegraphTheme = {
       'by frequency': makeColorMapByFrequency,
       'by system vs application frame': makeColorMapBySystemVsApplicationFrame,
     },
-    CPU_CHART_COLORS: CHART_PALETTE[12].map(c => hexToColorChannels(c, 0.8)),
+    CPU_CHART_COLORS: CHART_PALETTE[12]!.map(c => hexToColorChannels(c, 0.8)),
     MEMORY_CHART_COLORS: [
-      hexToColorChannels(CHART_PALETTE[4][2], 0.5),
-      hexToColorChannels(CHART_PALETTE[4][3], 0.5),
+      hexToColorChannels(CHART_PALETTE[4]![2]!, 0.5),
+      hexToColorChannels(CHART_PALETTE[4]![3]!, 0.5),
     ],
     CHART_CURSOR_INDICATOR: 'rgba(255, 255, 255, 0.5)',
     CHART_LABEL_COLOR: 'rgba(255, 255, 255, 0.5)',
diff --git a/static/app/utils/profiling/flamegraphChart.tsx b/static/app/utils/profiling/flamegraphChart.tsx
index 29531dbc36b759..650cdc294ef3f6 100644
--- a/static/app/utils/profiling/flamegraphChart.tsx
+++ b/static/app/utils/profiling/flamegraphChart.tsx
@@ -82,7 +82,7 @@ export class FlamegraphChart {
     const type = options.type ? options.type : measurements.length > 1 ? 'line' : 'area';
 
     for (let j = 0; j < measurements.length; j++) {
-      const measurement = measurements[j];
+      const measurement = measurements[j]!;
 
       if (!colors[j]) {
         throw new Error(
@@ -93,8 +93,8 @@ export class FlamegraphChart {
       this.series[j] = {
         type,
         name: measurement.name,
-        lineColor: colorComponentsToRGBA(colors[j]),
-        fillColor: colorComponentsToRGBA(colors[j]),
+        lineColor: colorComponentsToRGBA(colors[j]!),
+        fillColor: colorComponentsToRGBA(colors[j]!),
         points: new Array(measurement?.values?.length ?? 0).fill(0),
       };
 
@@ -107,7 +107,7 @@ export class FlamegraphChart {
 
       this.status = 'ok';
       for (let i = 0; i < measurement.values.length; i++) {
-        const m = measurement.values[i];
+        const m = measurement.values[i]!;
 
         // Track and update Y max and min
         if (m.value > this.domains.y[1]) {
@@ -125,7 +125,7 @@ export class FlamegraphChart {
           this.domains.x[1] = m.elapsed;
         }
 
-        this.series[j].points[i] = {x: m.elapsed, y: m.value};
+        this.series[j]!.points[i] = {x: m.elapsed, y: m.value};
       }
     }
 
@@ -138,15 +138,15 @@ export class FlamegraphChart {
     this.domains.y[1] = this.domains.y[1] + this.domains.y[1] * 0.1;
     this.configSpace = configSpace.withHeight(this.domains.y[1] - this.domains.y[0]);
 
-    assertValidProfilingUnit(measurements[0].unit);
-    this.unit = measurements[0].unit;
+    assertValidProfilingUnit(measurements[0]!.unit);
+    this.unit = measurements[0]!.unit;
 
     this.formatter = makeFormatter(
-      measurements[0].unit,
+      measurements[0]!.unit,
       computeLabelPrecision(this.domains.y[0], this.domains.y[1])
     );
     this.tooltipFormatter = makeFormatter(
-      measurements[0].unit,
+      measurements[0]!.unit,
       computeLabelPrecision(this.domains.y[0], this.domains.y[1])
     );
   }
diff --git a/static/app/utils/profiling/frame.spec.tsx b/static/app/utils/profiling/frame.spec.tsx
index d3e3fe86a8986a..8e41b3cbd34b8c 100644
--- a/static/app/utils/profiling/frame.spec.tsx
+++ b/static/app/utils/profiling/frame.spec.tsx
@@ -61,7 +61,7 @@ describe('Frame', () => {
           },
           'node'
         ).module
-      ).toBe(undefined);
+      ).toBeUndefined();
     });
     it.each([
       ['node:internal/crypto/hash', 'node:internal/crypto'],
diff --git a/static/app/utils/profiling/frame.tsx b/static/app/utils/profiling/frame.tsx
index 68836c9b1a1746..515bae66de9024 100644
--- a/static/app/utils/profiling/frame.tsx
+++ b/static/app/utils/profiling/frame.tsx
@@ -118,7 +118,7 @@ export class Frame {
           if (match?.groups) {
             const {maybeScopeOrPackage, maybePackage} = match.groups;
 
-            if (maybeScopeOrPackage.startsWith('@')) {
+            if (maybeScopeOrPackage!.startsWith('@')) {
               this.module = `${maybeScopeOrPackage}/${maybePackage}`;
             } else {
               this.module = match.groups.maybeScopeOrPackage;
diff --git a/static/app/utils/profiling/fzf/fzf.ts b/static/app/utils/profiling/fzf/fzf.ts
index f867b7ff21205b..90b47565ec9fef 100644
--- a/static/app/utils/profiling/fzf/fzf.ts
+++ b/static/app/utils/profiling/fzf/fzf.ts
@@ -86,7 +86,7 @@ export function fzf(text: string, pattern: string, caseSensitive: boolean): Resu
   const patternLength = pattern.length;
 
   for (let index = 0; index < textLength; index++) {
-    let char = text[index];
+    let char = text[index]!;
     // This is considerably faster than blindly applying strings.ToLower to the whole string
     if (!caseSensitive) {
       const cc = char.charCodeAt(0);
@@ -118,7 +118,7 @@ export function fzf(text: string, pattern: string, caseSensitive: boolean): Resu
     let char = text[index];
     // This is considerably faster than blindly applying strings.ToLower to the whole string
     if (!caseSensitive) {
-      const cc = char.charCodeAt(0);
+      const cc = char!.charCodeAt(0);
       if (cc >= 65 && cc <= 90) {
         char = String.fromCharCode(cc + 32);
       }
@@ -187,13 +187,13 @@ function calculateScore(
   for (let idx = sidx; idx < eidx; idx++) {
     let char = text[idx];
     if (!caseSensitive) {
-      const cc = char.charCodeAt(0);
+      const cc = char!.charCodeAt(0);
       if (cc >= 65 && cc <= 90) {
         char = String.fromCharCode(cc + 32);
       }
     }
     const patternchar = pattern[pidx];
-    const currentCharClass = getCharClass(char.charCodeAt(0));
+    const currentCharClass = getCharClass(char!.charCodeAt(0));
 
     if (char === patternchar) {
       pos[pidx] = idx;
@@ -238,18 +238,18 @@ function calculateScore(
   // we want to update/extend our current range, otherwise we want to add a new range.
 
   // Init range to first match, at this point we should have at least 1
-  const matches = [[pos[0], pos[0] + 1]] as [number, number][];
+  const matches = [[pos[0], pos[0]! + 1]] as [number, number][];
 
   // iterate over all positions and check for overlaps from current and end of last
   // range. Positions are already sorted by match index, we can just check the last range.
   for (let i = 1; i < pos.length; i++) {
-    const lastrange = matches[matches.length - 1];
+    const lastrange = matches[matches.length - 1]!;
     // if last range ends where new range stars, we can extend it
     if (lastrange[1] === pos[i]) {
-      lastrange[1] = pos[i] + 1;
+      lastrange[1] = pos[i]! + 1;
     } else {
       // otherwise we add a new range
-      matches.push([pos[i], pos[i] + 1]);
+      matches.push([pos[i]!, pos[i]! + 1]);
     }
   }
 
diff --git a/static/app/utils/profiling/gl/utils.spec.tsx b/static/app/utils/profiling/gl/utils.spec.tsx
index e311d01967aad5..8b01665879a393 100644
--- a/static/app/utils/profiling/gl/utils.spec.tsx
+++ b/static/app/utils/profiling/gl/utils.spec.tsx
@@ -67,8 +67,8 @@ describe('upperBound', () => {
     const view = new Rect(4, 0, 2, 0);
 
     expect(upperBound(view.right, frames)).toBe(6);
-    expect(frames[6].start).toBeGreaterThanOrEqual(view.right);
-    expect(frames[6].end).toBeGreaterThanOrEqual(view.right);
+    expect(frames[6]!.start).toBeGreaterThanOrEqual(view.right);
+    expect(frames[6]!.end).toBeGreaterThanOrEqual(view.right);
   });
 });
 
@@ -93,8 +93,8 @@ describe('lowerBound', () => {
     const view = new Rect(4, 0, 2, 0);
 
     expect(lowerBound(view.left, frames)).toBe(3);
-    expect(frames[3].start).toBeLessThanOrEqual(view.left);
-    expect(frames[3].end).toBeLessThanOrEqual(view.left);
+    expect(frames[3]!.start).toBeLessThanOrEqual(view.left);
+    expect(frames[3]!.end).toBeLessThanOrEqual(view.left);
   });
 });
 
diff --git a/static/app/utils/profiling/gl/utils.ts b/static/app/utils/profiling/gl/utils.ts
index d1a84794cecfcb..bbf8ffd6c81bf5 100644
--- a/static/app/utils/profiling/gl/utils.ts
+++ b/static/app/utils/profiling/gl/utils.ts
@@ -177,8 +177,8 @@ function onResize(entries: ResizeObserverEntry[]) {
       // NOTE: Only this path gives the correct answer
       // The other paths are imperfect fallbacks
       // for browsers that don't provide anyway to do this
-      width = entry.devicePixelContentBoxSize[0].inlineSize;
-      height = entry.devicePixelContentBoxSize[0].blockSize;
+      width = entry.devicePixelContentBoxSize[0]!.inlineSize;
+      height = entry.devicePixelContentBoxSize[0]!.blockSize;
       dpr = 1; // it's already in width and height
     } else if (entry.contentBoxSize) {
       if (entry.contentBoxSize[0]) {
@@ -414,17 +414,17 @@ export function lowerBound<T extends {end: number; start: number}>(
 
   if (high === 1) {
     return getValue
-      ? getValue(values[0]) < target
+      ? getValue(values[0]!) < target
         ? 1
         : 0
-      : values[0].end < target
+      : values[0]!.end < target
         ? 1
         : 0;
   }
 
   while (low !== high) {
     const mid = low + Math.floor((high - low) / 2);
-    const value = getValue ? getValue(values[mid]) : values[mid].end;
+    const value = getValue ? getValue(values[mid]!) : values[mid]!.end;
 
     if (value < target) {
       low = mid + 1;
@@ -628,7 +628,7 @@ export function computeMinZoomConfigViewForFrames(view: Rect, frames: Rect[]): R
   }
 
   if (frames.length === 1) {
-    return new Rect(frames[0].x, frames[0].y, frames[0].width, view.height);
+    return new Rect(frames[0]!.x, frames[0]!.y, frames[0]!.width, view.height);
   }
 
   const frame = frames.reduce(
@@ -703,12 +703,12 @@ export function getTranslationMatrixFromPhysicalSpace(
   const [m00, m01, m02, m10, m11, m12] = physicalToConfig;
 
   const configDelta = vec2.transformMat3(vec2.create(), physicalDelta, [
-    m00,
-    m01,
-    m02,
-    m10,
-    m11,
-    m12,
+    m00!,
+    m01!,
+    m02!,
+    m10!,
+    m11!,
+    m12!,
     0,
     0,
     0,
@@ -741,12 +741,12 @@ export function getConfigViewTranslationBetweenVectors(
   const [m00, m01, m02, m10, m11, m12] = physicalToConfig;
 
   const configDelta = vec2.transformMat3(vec2.create(), physicalDelta, [
-    m00,
-    m01,
-    m02,
-    m10,
-    m11,
-    m12,
+    m00!,
+    m01!,
+    m02!,
+    m10!,
+    m11!,
+    m12!,
     0,
     0,
     0,
@@ -778,12 +778,12 @@ export function getConfigSpaceTranslationBetweenVectors(
   );
   const [m00, m01, m02, m10, m11, m12] = physicalToConfig;
   const configDelta = vec2.transformMat3(vec2.create(), physicalDelta, [
-    m00,
-    m01,
-    m02,
-    m10,
-    m11,
-    m12,
+    m00!,
+    m01!,
+    m02!,
+    m10!,
+    m11!,
+    m12!,
     0,
     0,
     0,
@@ -837,7 +837,7 @@ export function useResizeCanvasObserver(
     const observer = watchForResize(canvases as HTMLCanvasElement[], entries => {
       // 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();
+      const rect = entries[0]!.target.getBoundingClientRect();
       setCanvasBounds(new Rect(rect.x, rect.y, rect.width, rect.height));
 
       canvas.initPhysicalSpace();
diff --git a/static/app/utils/profiling/hooks/useContextMenu.tsx b/static/app/utils/profiling/hooks/useContextMenu.tsx
index 1c9b9634b848a4..15e287980bdb6e 100644
--- a/static/app/utils/profiling/hooks/useContextMenu.tsx
+++ b/static/app/utils/profiling/hooks/useContextMenu.tsx
@@ -146,7 +146,7 @@ export function useContextMenu({container}: UseContextMenuOptions) {
     }
 
     const resizeObserver = new window.ResizeObserver(entries => {
-      const contentRect = entries[0].contentRect;
+      const contentRect = entries[0]!.contentRect;
       setMenuCoordinates(new Rect(0, 0, contentRect.width, contentRect.height));
     });
 
@@ -164,7 +164,7 @@ export function useContextMenu({container}: UseContextMenuOptions) {
     }
 
     const resizeObserver = new window.ResizeObserver(entries => {
-      const contentRect = entries[0].contentRect;
+      const contentRect = entries[0]!.contentRect;
       setContainerCoordinates(new Rect(0, 0, contentRect.width, contentRect.height));
     });
 
diff --git a/static/app/utils/profiling/hooks/useCurrentProjectFromRouteParam.tsx b/static/app/utils/profiling/hooks/useCurrentProjectFromRouteParam.tsx
index 88744c437c9a39..3737f3354ffede 100644
--- a/static/app/utils/profiling/hooks/useCurrentProjectFromRouteParam.tsx
+++ b/static/app/utils/profiling/hooks/useCurrentProjectFromRouteParam.tsx
@@ -4,6 +4,6 @@ import useProjects from 'sentry/utils/useProjects';
 
 export function useCurrentProjectFromRouteParam(): Project | null {
   const params = useParams();
-  const projects = useProjects({limit: 1, slugs: [params?.projectId]});
+  const projects = useProjects({limit: 1, slugs: [params?.projectId!]});
   return projects.projects?.[0] ?? null;
 }
diff --git a/static/app/utils/profiling/hooks/useDifferentialFlamegraphModel.tsx b/static/app/utils/profiling/hooks/useDifferentialFlamegraphModel.tsx
index 7937c5726b48c2..0ad7e00e8c1f41 100644
--- a/static/app/utils/profiling/hooks/useDifferentialFlamegraphModel.tsx
+++ b/static/app/utils/profiling/hooks/useDifferentialFlamegraphModel.tsx
@@ -43,7 +43,7 @@ export function useDifferentialFlamegraphModel(
       'flamegraph',
       props.frameFilter
     );
-    return new Flamegraph(profile.profiles[0], {
+    return new Flamegraph(profile.profiles[0]!, {
       sort: flamegraphPreferences.sorting,
       inverted: flamegraphPreferences.view === 'bottom up',
     });
@@ -73,7 +73,7 @@ export function useDifferentialFlamegraphModel(
       return null;
     }
 
-    return new Flamegraph(afterProfileGroup.profiles[0], {
+    return new Flamegraph(afterProfileGroup.profiles[0]!, {
       sort: flamegraphPreferences.sorting,
       inverted: flamegraphPreferences.view === 'bottom up',
     });
diff --git a/static/app/utils/profiling/hooks/useProfileEvents.spec.tsx b/static/app/utils/profiling/hooks/useProfileEvents.spec.tsx
index dbbb4e3e6a231d..ffbc6aeeda6135 100644
--- a/static/app/utils/profiling/hooks/useProfileEvents.spec.tsx
+++ b/static/app/utils/profiling/hooks/useProfileEvents.spec.tsx
@@ -91,7 +91,7 @@ describe('useProfileEvents', function () {
     });
 
     await waitFor(() => result.current.isError);
-    await waitFor(() => expect(result.current.status).toEqual('error'));
+    await waitFor(() => expect(result.current.status).toBe('error'));
   });
 });
 
diff --git a/static/app/utils/profiling/hooks/useProfileFunctionTrends.spec.tsx b/static/app/utils/profiling/hooks/useProfileFunctionTrends.spec.tsx
index 7b225077dc29c1..9b6d8cbdfae110 100644
--- a/static/app/utils/profiling/hooks/useProfileFunctionTrends.spec.tsx
+++ b/static/app/utils/profiling/hooks/useProfileFunctionTrends.spec.tsx
@@ -60,8 +60,8 @@ describe('useProfileFunctionTrendss', function () {
         }),
       {wrapper: TestContext}
     );
-    expect(hook.result.current.isPending).toEqual(true);
-    expect(hook.result.current.isFetched).toEqual(false);
+    expect(hook.result.current.isPending).toBe(true);
+    expect(hook.result.current.isFetched).toBe(false);
     await waitFor(() =>
       expect(hook.result.current).toMatchObject(
         expect.objectContaining({
diff --git a/static/app/utils/profiling/hooks/useProfileFunctions.spec.tsx b/static/app/utils/profiling/hooks/useProfileFunctions.spec.tsx
index 9c37b0b0f8c924..18707ebd473831 100644
--- a/static/app/utils/profiling/hooks/useProfileFunctions.spec.tsx
+++ b/static/app/utils/profiling/hooks/useProfileFunctions.spec.tsx
@@ -68,8 +68,8 @@ describe('useProfileFunctions', function () {
         }),
       {wrapper: TestContext}
     );
-    expect(hook.result.current.isPending).toEqual(true);
-    expect(hook.result.current.isFetched).toEqual(false);
+    expect(hook.result.current.isPending).toBe(true);
+    expect(hook.result.current.isFetched).toBe(false);
     await waitFor(() =>
       expect(hook.result.current).toMatchObject(
         expect.objectContaining({
diff --git a/static/app/utils/profiling/hooks/useVirtualizedTree/VirtualizedTree.spec.tsx b/static/app/utils/profiling/hooks/useVirtualizedTree/VirtualizedTree.spec.tsx
index 9e88edf901a3ff..eadc44880c8713 100644
--- a/static/app/utils/profiling/hooks/useVirtualizedTree/VirtualizedTree.spec.tsx
+++ b/static/app/utils/profiling/hooks/useVirtualizedTree/VirtualizedTree.spec.tsx
@@ -12,12 +12,12 @@ function toFlattenedList(tree: VirtualizedTree<any>): VirtualizedTreeNode<any>[]
     list.push(node);
 
     for (let i = 0; i < node.children.length; i++) {
-      visit(node.children[i]);
+      visit(node.children[i]!);
     }
   }
 
   for (let i = 0; i < tree.roots.length; i++) {
-    visit(tree.roots[i]);
+    visit(tree.roots[i]!);
   }
 
   return list;
@@ -31,7 +31,7 @@ describe('VirtualizedTree', () => {
       root.children = [child1];
 
       const tree = VirtualizedTree.fromRoots([root]);
-      tree.expandNode(tree.roots[0], true, {expandChildren: true});
+      tree.expandNode(tree.roots[0]!, true, {expandChildren: true});
 
       expect(tree.flattened).toHaveLength(2);
     });
@@ -48,11 +48,11 @@ describe('VirtualizedTree', () => {
         return node.node.id === 'child1';
       });
 
-      tree.expandNode(tree.roots[0], true, {expandChildren: true});
+      tree.expandNode(tree.roots[0]!, true, {expandChildren: true});
       expect(tree.flattened).toHaveLength(2);
 
-      expect(tree.flattened[1].depth).toBe(1);
-      expect(tree.flattened[1].node.id).toBe('child2');
+      expect(tree.flattened[1]!.depth).toBe(1);
+      expect(tree.flattened[1]!.node.id).toBe('child2');
     });
   });
   describe('expandNode', () => {
@@ -62,11 +62,11 @@ describe('VirtualizedTree', () => {
       root.children = [child1];
 
       const tree = VirtualizedTree.fromRoots([root]);
-      const addedNodes = tree.expandNode(tree.roots[0], true);
+      const addedNodes = tree.expandNode(tree.roots[0]!, true);
 
-      expect(addedNodes.length).toBe(1);
+      expect(addedNodes).toHaveLength(1);
 
-      expect(tree.flattened[1]).toBe(tree.roots[0].children[0]);
+      expect(tree.flattened[1]).toBe(tree.roots[0]!.children[0]);
       expect(tree.flattened).toHaveLength(2);
     });
 
@@ -78,11 +78,11 @@ describe('VirtualizedTree', () => {
       const tree = VirtualizedTree.fromRoots([root]);
 
       // Expand all
-      tree.expandNode(tree.roots[0], true, {expandChildren: true});
+      tree.expandNode(tree.roots[0]!, true, {expandChildren: true});
 
       // Close root
-      const removedNodes = tree.expandNode(tree.roots[0], false);
-      expect(removedNodes.length).toBe(1);
+      const removedNodes = tree.expandNode(tree.roots[0]!, false);
+      expect(removedNodes).toHaveLength(1);
 
       expect(tree.flattened[0]).toBe(tree.roots[0]);
       expect(tree.flattened).toHaveLength(1);
@@ -97,7 +97,7 @@ describe('VirtualizedTree', () => {
       root.children = [child1];
       const tree = VirtualizedTree.fromRoots([root]);
 
-      tree.roots[0].setExpanded(false);
+      tree.roots[0]!.setExpanded(false);
 
       expect(VirtualizedTree.toExpandedList(tree.roots).map(i => i.node.id)).toEqual([
         'root',
diff --git a/static/app/utils/profiling/hooks/useVirtualizedTree/VirtualizedTree.tsx b/static/app/utils/profiling/hooks/useVirtualizedTree/VirtualizedTree.tsx
index 2bb9e8422295ce..13991d513b0717 100644
--- a/static/app/utils/profiling/hooks/useVirtualizedTree/VirtualizedTree.tsx
+++ b/static/app/utils/profiling/hooks/useVirtualizedTree/VirtualizedTree.tsx
@@ -60,7 +60,7 @@ export class VirtualizedTree<T extends TreeLike> {
     }
 
     for (let i = 0; i < items.length; i++) {
-      toTreeNode(items[i], null, roots, 0);
+      toTreeNode(items[i]!, null, roots, 0);
     }
 
     return new VirtualizedTree<T>(roots, undefined);
@@ -80,12 +80,12 @@ export class VirtualizedTree<T extends TreeLike> {
       }
 
       for (let i = 0; i < node.children.length; i++) {
-        visit(node.children[i]);
+        visit(node.children[i]!);
       }
     }
 
     for (let i = 0; i < nodes.length; i++) {
-      visit(nodes[i]);
+      visit(nodes[i]!);
     }
 
     return list;
@@ -102,7 +102,7 @@ export class VirtualizedTree<T extends TreeLike> {
       }
 
       for (let i = 0; i < candidate.children.length; i++) {
-        queue.push(candidate.children[i]);
+        queue.push(candidate.children[i]!);
       }
     }
 
@@ -163,13 +163,13 @@ export class VirtualizedTree<T extends TreeLike> {
     function visit(node: VirtualizedTreeNode<T>) {
       const sortedChildren = node.children.sort(sortFn);
       for (let i = 0; i < sortedChildren.length; i++) {
-        visit(sortedChildren[i]);
+        visit(sortedChildren[i]!);
       }
     }
 
     const sortedRoots = this.roots.sort(sortFn);
     for (let i = 0; i < sortedRoots.length; i++) {
-      visit(sortedRoots[i]);
+      visit(sortedRoots[i]!);
     }
 
     this.flattened = VirtualizedTree.toExpandedList(this.roots);
@@ -184,12 +184,12 @@ export class VirtualizedTree<T extends TreeLike> {
       }
 
       for (let i = 0; i < node.children.length; i++) {
-        visit(node.children[i]);
+        visit(node.children[i]!);
       }
     }
 
     for (let i = 0; i < this.roots.length; i++) {
-      visit(this.roots[i]);
+      visit(this.roots[i]!);
     }
 
     return expandedNodes;
diff --git a/static/app/utils/profiling/hooks/useVirtualizedTree/VirtualizedTreeNode.tsx b/static/app/utils/profiling/hooks/useVirtualizedTree/VirtualizedTreeNode.tsx
index 5bc17bad6be984..016f2e8cb97ed4 100644
--- a/static/app/utils/profiling/hooks/useVirtualizedTree/VirtualizedTreeNode.tsx
+++ b/static/app/utils/profiling/hooks/useVirtualizedTree/VirtualizedTreeNode.tsx
@@ -34,7 +34,7 @@ export class VirtualizedTreeNode<T> {
 
       if (next.expanded) {
         for (let i = 0; i < next.children.length; i++) {
-          queue.push(next.children[i]);
+          queue.push(next.children[i]!);
         }
       }
       count++;
@@ -73,12 +73,12 @@ export class VirtualizedTreeNode<T> {
       }
 
       for (let i = 0; i < node.children.length; i++) {
-        visit(node.children[i]);
+        visit(node.children[i]!);
       }
     }
 
     for (let i = 0; i < this.children.length; i++) {
-      visit(this.children[i]);
+      visit(this.children[i]!);
     }
 
     return list;
diff --git a/static/app/utils/profiling/hooks/useVirtualizedTree/useVirtualizedTree.spec.tsx b/static/app/utils/profiling/hooks/useVirtualizedTree/useVirtualizedTree.spec.tsx
index 875eb05cd0fd15..2b1839dabf63fc 100644
--- a/static/app/utils/profiling/hooks/useVirtualizedTree/useVirtualizedTree.spec.tsx
+++ b/static/app/utils/profiling/hooks/useVirtualizedTree/useVirtualizedTree.spec.tsx
@@ -75,7 +75,7 @@ describe('useVirtualizedTree', () => {
       },
     });
 
-    expect(result.current.items.length).toBe(5);
+    expect(result.current.items).toHaveLength(5);
   });
 
   it('shows first 10 items', () => {
@@ -95,8 +95,8 @@ describe('useVirtualizedTree', () => {
 
     act(() => {
       result.current.handleExpandTreeNode(
-        result.current.tree.roots[0],
-        !result.current.tree.roots[0].expanded,
+        result.current.tree.roots[0]!,
+        !result.current.tree.roots[0]!.expanded,
         {
           expandChildren: true,
         }
@@ -104,9 +104,9 @@ describe('useVirtualizedTree', () => {
     });
 
     for (let i = 0; i < 10; i++) {
-      expect(result.current.items[i].item.node.id).toEqual(`child-${i}`);
+      expect(result.current.items[i]!.item.node.id).toBe(`child-${i}`);
     }
-    expect(result.current.items.length).toBe(10);
+    expect(result.current.items).toHaveLength(10);
   });
 
   it('shows 5-15 items', async () => {
@@ -126,8 +126,8 @@ describe('useVirtualizedTree', () => {
 
     act(() => {
       result.current.handleExpandTreeNode(
-        result.current.tree.roots[0],
-        !result.current.tree.roots[0].expanded,
+        result.current.tree.roots[0]!,
+        !result.current.tree.roots[0]!.expanded,
         {
           expandChildren: true,
         }
@@ -136,12 +136,12 @@ describe('useVirtualizedTree', () => {
     });
 
     await waitFor(() => {
-      expect(result.current.items.length).toBe(10);
+      expect(result.current.items).toHaveLength(10);
     });
     for (let i = 0; i < 10; i++) {
-      expect(result.current.items[i].item.node.id).toEqual(`child-${i + 5}`);
+      expect(result.current.items[i]!.item.node.id).toBe(`child-${i + 5}`);
     }
-    expect(result.current.items.length).toBe(10);
+    expect(result.current.items).toHaveLength(10);
   });
 
   it('shows last 10 items', async () => {
@@ -161,8 +161,8 @@ describe('useVirtualizedTree', () => {
 
     act(() => {
       result.current.handleExpandTreeNode(
-        result.current.tree.roots[0],
-        !result.current.tree.roots[0].expanded,
+        result.current.tree.roots[0]!,
+        !result.current.tree.roots[0]!.expanded,
         {
           expandChildren: true,
         }
@@ -171,12 +171,12 @@ describe('useVirtualizedTree', () => {
     });
 
     await waitFor(() => {
-      expect(result.current.items.length).toBe(10);
+      expect(result.current.items).toHaveLength(10);
     });
     for (let i = 0; i < 10; i++) {
-      expect(result.current.items[i].item.node.id).toEqual(`child-${i + 10}`);
+      expect(result.current.items[i]!.item.node.id).toBe(`child-${i + 10}`);
     }
-    expect(result.current.items.length).toBe(10);
+    expect(result.current.items).toHaveLength(10);
   });
 
   it('shows overscroll items', () => {
@@ -196,8 +196,8 @@ describe('useVirtualizedTree', () => {
 
     act(() => {
       result.current.handleExpandTreeNode(
-        result.current.tree.roots[0],
-        !result.current.tree.roots[0].expanded,
+        result.current.tree.roots[0]!,
+        !result.current.tree.roots[0]!.expanded,
         {
           expandChildren: true,
         }
@@ -207,9 +207,9 @@ describe('useVirtualizedTree', () => {
 
     for (let i = 3; i < 17; i++) {
       // Should display nodes 5-15, but since we use overscroll, it should display nodes 3-17
-      expect(result.current.items[i - 3].item.node.id).toEqual(`child-${i}`);
+      expect(result.current.items[i - 3]!.item.node.id).toBe(`child-${i}`);
     }
-    expect(result.current.items.length).toBe(14);
+    expect(result.current.items).toHaveLength(14);
   });
 
   it('items have a stable key', () => {
@@ -229,8 +229,8 @@ describe('useVirtualizedTree', () => {
 
     act(() => {
       result.current.handleExpandTreeNode(
-        result.current.tree.roots[0],
-        !result.current.tree.roots[0].expanded,
+        result.current.tree.roots[0]!,
+        !result.current.tree.roots[0]!.expanded,
         {
           expandChildren: true,
         }
@@ -246,12 +246,12 @@ describe('useVirtualizedTree', () => {
 
     // First 9 items should be the same, the last item should be different
     for (let i = 1; i < stableKeys.length; i++) {
-      expect(stableKeys[i]).toBe(result.current.items[i - 1].key);
+      expect(stableKeys[i]!).toBe(result.current.items[i - 1]!.key);
     }
 
     // Last item should be different
-    expect(result.current.items[result.current.items.length - 1].key).toBe(
-      stableKeys[stableKeys.length - 1] + 1
+    expect(result.current.items[result.current.items.length - 1]!.key).toBe(
+      stableKeys[stableKeys.length - 1]! + 1
     );
   });
 });
diff --git a/static/app/utils/profiling/hooks/useVirtualizedTree/useVirtualizedTree.tsx b/static/app/utils/profiling/hooks/useVirtualizedTree/useVirtualizedTree.tsx
index aa59b06ebef78b..9a87c396b32b9f 100644
--- a/static/app/utils/profiling/hooks/useVirtualizedTree/useVirtualizedTree.tsx
+++ b/static/app/utils/profiling/hooks/useVirtualizedTree/useVirtualizedTree.tsx
@@ -256,7 +256,7 @@ export function useVirtualizedTree<T extends TreeLike>(
               // our scroll event is non blocking, so we only need to update the other containers
               continue;
             }
-            props.scrollContainer[i].scrollTop = scrollTop;
+            props.scrollContainer[i]!.scrollTop = scrollTop;
           }
         }
         if (Array.isArray(props.scrollContainer)) {
@@ -554,8 +554,8 @@ export function useVirtualizedTree<T extends TreeLike>(
 
       if (event.key === 'Enter') {
         handleExpandTreeNode(
-          latestTreeRef.current.flattened[latestStateRef.current.selectedNodeIndex],
-          !latestTreeRef.current.flattened[latestStateRef.current.selectedNodeIndex]
+          latestTreeRef.current.flattened[latestStateRef.current.selectedNodeIndex]!,
+          !latestTreeRef.current.flattened[latestStateRef.current.selectedNodeIndex]!
             .expanded,
           {
             expandChildren: event.metaKey || event.ctrlKey,
@@ -565,7 +565,7 @@ export function useVirtualizedTree<T extends TreeLike>(
 
       if (event.key === 'ArrowRight' || event.key === 'ArrowLeft') {
         handleExpandTreeNode(
-          latestTreeRef.current.flattened[latestStateRef.current.selectedNodeIndex],
+          latestTreeRef.current.flattened[latestStateRef.current.selectedNodeIndex]!,
           event.key === 'ArrowLeft' ? false : true,
           {
             expandChildren: event.metaKey || event.ctrlKey,
@@ -608,7 +608,7 @@ export function useVirtualizedTree<T extends TreeLike>(
 
           dispatch({
             type: 'set selected node index',
-            payload: latestItemsRef.current[nextIndex].key,
+            payload: latestItemsRef.current[nextIndex]!.key,
           });
 
           const node = latestItemsRef.current[nextIndex];
@@ -623,7 +623,7 @@ export function useVirtualizedTree<T extends TreeLike>(
           }
 
           markRowAsClicked(
-            latestItemsRef.current[nextIndex].key,
+            latestItemsRef.current[nextIndex]!.key,
             latestItemsRef.current,
             {
               ghostRowRef: clickedGhostRowRef.current,
@@ -665,10 +665,10 @@ export function useVirtualizedTree<T extends TreeLike>(
 
           dispatch({
             type: 'set selected node index',
-            payload: latestItemsRef.current[nextIndex].key,
+            payload: latestItemsRef.current[nextIndex]!.key,
           });
           markRowAsClicked(
-            latestItemsRef.current[nextIndex].key,
+            latestItemsRef.current[nextIndex]!.key,
             latestItemsRef.current,
             {
               ghostRowRef: clickedGhostRowRef.current,
@@ -804,10 +804,14 @@ export function useVirtualizedTree<T extends TreeLike>(
       }
 
       if (onScrollToNode) {
-        onScrollToNode(latestItemsRef.current[newlyVisibleIndex], props.scrollContainer, {
-          top: newScrollTop,
-          depth: node.depth,
-        });
+        onScrollToNode(
+          latestItemsRef.current[newlyVisibleIndex]!,
+          props.scrollContainer,
+          {
+            top: newScrollTop,
+            depth: node.depth,
+          }
+        );
       }
     },
 
@@ -844,11 +848,11 @@ export function useVirtualizedTree<T extends TreeLike>(
     // If we map, we get a new object that our internals will not be able to access.
     for (let i = 0; i < latestItemsRef.current.length; i++) {
       renderered.push(
-        renderRow(latestItemsRef.current[i], {
-          handleRowClick: handleRowClick(latestItemsRef.current[i].key),
+        renderRow(latestItemsRef.current[i]!, {
+          handleRowClick: handleRowClick(latestItemsRef.current[i]!.key),
           handleExpandTreeNode,
           handleRowKeyDown,
-          handleRowMouseEnter: handleRowMouseEnter(latestItemsRef.current[i].key),
+          handleRowMouseEnter: handleRowMouseEnter(latestItemsRef.current[i]!.key),
           selectedNodeIndex: state.selectedNodeIndex,
         })
       );
diff --git a/static/app/utils/profiling/hooks/useVirtualizedTree/virtualizedTreeUtils.tsx b/static/app/utils/profiling/hooks/useVirtualizedTree/virtualizedTreeUtils.tsx
index a69c0774c77a64..5a9749de896a52 100644
--- a/static/app/utils/profiling/hooks/useVirtualizedTree/virtualizedTreeUtils.tsx
+++ b/static/app/utils/profiling/hooks/useVirtualizedTree/virtualizedTreeUtils.tsx
@@ -237,7 +237,7 @@ export function findRenderedItems<T extends TreeLike>({
         key: indexPointer,
         ref: null,
         styles: {position: 'absolute', top: elementTop},
-        item: items[indexPointer],
+        item: items[indexPointer]!,
       };
 
       visibleItemIndex++;
diff --git a/static/app/utils/profiling/hooks/utils.tsx b/static/app/utils/profiling/hooks/utils.tsx
index 6cd1ada19d495e..0cd1c81bab45a2 100644
--- a/static/app/utils/profiling/hooks/utils.tsx
+++ b/static/app/utils/profiling/hooks/utils.tsx
@@ -61,7 +61,7 @@ export function transformStatsResponse<F extends string>(
   }
 
   if (yAxes.length === 1) {
-    const {series, meta, timestamps} = transformSingleSeries(dataset, yAxes[0], rawData);
+    const {series, meta, timestamps} = transformSingleSeries(dataset, yAxes[0]!, rawData);
     return {
       data: [series],
       meta,
diff --git a/static/app/utils/profiling/jsSelfProfiling.tsx b/static/app/utils/profiling/jsSelfProfiling.tsx
index eb864a4384141f..a12606da14d64b 100644
--- a/static/app/utils/profiling/jsSelfProfiling.tsx
+++ b/static/app/utils/profiling/jsSelfProfiling.tsx
@@ -51,7 +51,7 @@ export function resolveJSSelfProfilingStack(
       return callStack;
     }
 
-    callStack.unshift(frameIndex[stack.frameId]);
+    callStack.unshift(frameIndex[stack.frameId]!);
 
     if (stack.parentId !== undefined) {
       stack = trace.stacks[stack.parentId];
diff --git a/static/app/utils/profiling/profile/continuousProfile.spec.tsx b/static/app/utils/profiling/profile/continuousProfile.spec.tsx
index da3c9e44781e36..29d8aa13818289 100644
--- a/static/app/utils/profiling/profile/continuousProfile.spec.tsx
+++ b/static/app/utils/profiling/profile/continuousProfile.spec.tsx
@@ -1,44 +1,7 @@
-import merge from 'lodash/merge';
-
-import type {DeepPartial} from 'sentry/types/utils';
 import {ContinuousProfile} from 'sentry/utils/profiling/profile/continuousProfile';
 import {createContinuousProfileFrameIndex} from 'sentry/utils/profiling/profile/utils';
 
-import {makeTestingBoilerplate} from './profile.spec';
-
-export function makeSentryContinuousProfile(
-  profile?: DeepPartial<Profiling.SentryContinousProfileChunk>
-): Profiling.SentryContinousProfileChunk {
-  return merge(
-    {
-      chunk_id: 'chunk_id',
-      environment: '',
-      project_id: 0,
-      received: 0,
-      release: '',
-      organization_id: 0,
-      retention_days: 0,
-      version: '2',
-      platform: 'node',
-      profile: {
-        samples: [
-          {timestamp: Date.now() / 1e3, stack_id: 0, thread_id: '0'},
-          // 10ms later
-          {timestamp: Date.now() / 1e3 + 0.01, stack_id: 1, thread_id: '0'},
-        ],
-        frames: [
-          {function: 'foo', in_app: true},
-          {function: 'bar', in_app: true},
-        ],
-        stacks: [
-          [0, 1],
-          [0, 1],
-        ],
-      },
-    },
-    profile
-  ) as Profiling.SentryContinousProfileChunk;
-}
+import {makeSentryContinuousProfile, makeTestingBoilerplate} from './testUtils';
 
 describe('ContinuousProfile', () => {
   it('imports the base properties', () => {
diff --git a/static/app/utils/profiling/profile/continuousProfile.tsx b/static/app/utils/profiling/profile/continuousProfile.tsx
index ce85f2d360046c..1b0627bd01ab9c 100644
--- a/static/app/utils/profiling/profile/continuousProfile.tsx
+++ b/static/app/utils/profiling/profile/continuousProfile.tsx
@@ -10,8 +10,8 @@ export class ContinuousProfile extends Profile {
     chunk: Profiling.ContinuousProfile,
     frameIndex: ReturnType<typeof createContinuousProfileFrameIndex>
   ): ContinuousProfile {
-    const firstSample = chunk.samples[0];
-    const lastSample = chunk.samples[chunk.samples.length - 1];
+    const firstSample = chunk.samples[0]!;
+    const lastSample = chunk.samples[chunk.samples.length - 1]!;
 
     const {threadId, threadName} = getThreadData(chunk);
 
@@ -20,7 +20,7 @@ export class ContinuousProfile extends Profile {
       duration: (lastSample.timestamp - firstSample.timestamp) * 1e3,
       endedAt: lastSample.timestamp * 1e3,
       startedAt: firstSample.timestamp * 1e3,
-      threadId: threadId,
+      threadId,
       name: threadName,
       type: 'flamechart',
       unit: 'milliseconds',
@@ -38,7 +38,7 @@ export class ContinuousProfile extends Profile {
     const resolvedStack: Frame[] = new Array(256); // stack size limit
 
     for (let i = 0; i < chunk.samples.length; i++) {
-      const sample = chunk.samples[i];
+      const sample = chunk.samples[i]!;
       const nextSampleTimestamp = chunk.samples[i + 1]?.timestamp ?? sample.timestamp;
 
       const stack = chunk.stacks[sample.stack_id];
@@ -74,7 +74,7 @@ export class ContinuousProfile extends Profile {
     let node = this.callTree;
     const framesInStack: CallTreeNode[] = [];
     for (let i = 0; i < end; i++) {
-      const frame = stack[i];
+      const frame = stack[i]!;
       const last = node.children[node.children.length - 1];
       // Find common frame between two stacks
       if (last && !last.isLocked() && last.frame === frame) {
@@ -92,10 +92,10 @@ export class ContinuousProfile extends Profile {
       // We check the stack in a top-down order to find the first recursive frame.
       let start = framesInStack.length - 1;
       while (start >= 0) {
-        if (framesInStack[start].frame === node.frame) {
+        if (framesInStack[start]!.frame === node.frame) {
           // The recursion edge is bidirectional
-          framesInStack[start].recursive = node;
-          node.recursive = framesInStack[start];
+          framesInStack[start]!.recursive = node;
+          node.recursive = framesInStack[start]!;
           break;
         }
         start--;
@@ -123,7 +123,7 @@ export class ContinuousProfile extends Profile {
 
     // If node is the same as the previous sample, add the weight to the previous sample
     if (node === this.samples[this.samples.length - 1]) {
-      this.weights[this.weights.length - 1] += duration;
+      this.weights[this.weights.length - 1]! += duration;
     } else {
       this.samples.push(node);
       this.weights.push(duration);
@@ -163,7 +163,7 @@ function getThreadData(profile: Profiling.ContinuousProfile): {
   threadName: string;
 } {
   const {samples, thread_metadata = {}} = profile;
-  const sample = samples[0];
+  const sample = samples[0]!;
   const threadId = parseInt(sample.thread_id, 10);
 
   return {
diff --git a/static/app/utils/profiling/profile/eventedProfile.spec.tsx b/static/app/utils/profiling/profile/eventedProfile.spec.tsx
index 9af14ed788d1ef..a8b653c12c303f 100644
--- a/static/app/utils/profiling/profile/eventedProfile.spec.tsx
+++ b/static/app/utils/profiling/profile/eventedProfile.spec.tsx
@@ -3,7 +3,7 @@ import {createFrameIndex} from 'sentry/utils/profiling/profile/utils';
 
 import {Frame} from '../frame';
 
-import {firstCallee, makeTestingBoilerplate} from './profile.spec';
+import {firstCallee, makeTestingBoilerplate} from './testUtils';
 
 describe('EventedProfile', () => {
   it('imports the base properties', () => {
@@ -95,7 +95,7 @@ describe('EventedProfile', () => {
       {type: 'flamechart'}
     );
 
-    expect(profile.rawWeights.length).toBe(2);
+    expect(profile.rawWeights).toHaveLength(2);
   });
 
   it('rebuilds the stack', () => {
@@ -135,11 +135,11 @@ describe('EventedProfile', () => {
 
     const root = firstCallee(profile.callTree);
 
-    expect(root.totalWeight).toEqual(4);
-    expect(firstCallee(root).totalWeight).toEqual(1);
+    expect(root!.totalWeight).toBe(4);
+    expect(firstCallee(root!)!.totalWeight).toBe(1);
 
-    expect(root.selfWeight).toEqual(3);
-    expect(firstCallee(root).selfWeight).toEqual(1);
+    expect(root!.selfWeight).toBe(3);
+    expect(firstCallee(root!)!.selfWeight).toBe(1);
   });
 
   it('marks direct recursion', () => {
@@ -164,7 +164,7 @@ describe('EventedProfile', () => {
       {type: 'flamechart'}
     );
 
-    expect(!!firstCallee(firstCallee(profile.callTree)).recursive).toBe(true);
+    expect(!!firstCallee(firstCallee(profile.callTree)!)!.recursive).toBe(true);
   });
 
   it('marks indirect recursion', () => {
@@ -191,7 +191,7 @@ describe('EventedProfile', () => {
       {type: 'flamechart'}
     );
 
-    expect(!!firstCallee(firstCallee(firstCallee(profile.callTree))).recursive).toBe(
+    expect(!!firstCallee(firstCallee(firstCallee(profile.callTree)!)!)!.recursive).toBe(
       true
     );
   });
@@ -296,8 +296,8 @@ describe('EventedProfile - flamegraph', () => {
       {type: 'flamegraph'}
     );
 
-    expect(profile.callTree.children.length).toBe(1);
-    expect(profile.callTree.children[0].selfWeight).toBe(2);
+    expect(profile.callTree.children).toHaveLength(1);
+    expect(profile.callTree.children[0]!.selfWeight).toBe(2);
     expect(profile.callTree.totalWeight).toBe(2);
   });
 
@@ -330,14 +330,14 @@ describe('EventedProfile - flamegraph', () => {
       {type: 'flamegraph'}
     );
 
-    expect(profile.callTree.children[0].frame.name).toBe('f0');
-    expect(profile.callTree.children[1].frame.name).toBe('f1');
+    expect(profile.callTree.children[0]!.frame.name).toBe('f0');
+    expect(profile.callTree.children[1]!.frame.name).toBe('f1');
 
     // frame 0 is opened twice, so the weight gets merged
-    expect(profile.samples.length).toBe(2);
+    expect(profile.samples).toHaveLength(2);
     expect(profile.weights[0]).toBe(2);
     expect(profile.weights[1]).toBe(1);
-    expect(profile.weights.length).toBe(2);
+    expect(profile.weights).toHaveLength(2);
   });
 
   it('flamegraph tracks node count', () => {
@@ -363,8 +363,8 @@ describe('EventedProfile - flamegraph', () => {
     );
 
     // frame 0 is opened twice, so the weight gets merged
-    expect(profile.callTree.children[0].count).toBe(3);
-    expect(profile.callTree.children[0].children[0].count).toBe(1);
+    expect(profile.callTree.children[0]!.count).toBe(3);
+    expect(profile.callTree.children[0]!.children[0]!.count).toBe(1);
   });
 
   it('filters frames', () => {
@@ -394,8 +394,8 @@ describe('EventedProfile - flamegraph', () => {
 
     expect(profile.callTree.frame).toBe(Frame.Root);
     expect(profile.callTree.children).toHaveLength(1);
-    expect(profile.callTree.children[0].frame.name).toEqual('f0');
+    expect(profile.callTree.children[0]!.frame.name).toBe('f0');
     // the f1 frame is filtered out, so the f0 frame has no children
-    expect(profile.callTree.children[0].children).toHaveLength(0);
+    expect(profile.callTree.children[0]!.children).toHaveLength(0);
   });
 });
diff --git a/static/app/utils/profiling/profile/eventedProfile.tsx b/static/app/utils/profiling/profile/eventedProfile.tsx
index bf6ba54e8e5788..e737b8050ae504 100644
--- a/static/app/utils/profiling/profile/eventedProfile.tsx
+++ b/static/app/utils/profiling/profile/eventedProfile.tsx
@@ -80,7 +80,7 @@ export class EventedProfile extends Profile {
       const weights: number[] = [];
 
       for (let i = 0; i < built.samples.length; i++) {
-        const sample = built.samples[i];
+        const sample = built.samples[i]!;
 
         if (visited.has(sample)) {
           continue;
@@ -177,10 +177,10 @@ export class EventedProfile extends Profile {
       // We check the stack in a top-down order to find the first recursive frame.
       let start = this.calltree.length - 1;
       while (start >= 0) {
-        if (this.calltree[start].frame === node.frame) {
+        if (this.calltree[start]!.frame === node.frame) {
           // The recursion edge is bidirectional
-          this.calltree[start].recursive = node;
-          node.recursive = this.calltree[start];
+          this.calltree[start]!.recursive = node;
+          node.recursive = this.calltree[start]!;
           break;
         }
         start--;
diff --git a/static/app/utils/profiling/profile/importProfile.spec.tsx b/static/app/utils/profiling/profile/importProfile.spec.tsx
index 8a3e4c57702e88..59fd3d59323e72 100644
--- a/static/app/utils/profiling/profile/importProfile.spec.tsx
+++ b/static/app/utils/profiling/profile/importProfile.spec.tsx
@@ -7,9 +7,8 @@ import {
 import {JSSelfProfile} from 'sentry/utils/profiling/profile/jsSelfProfile';
 import {SampledProfile} from 'sentry/utils/profiling/profile/sampledProfile';
 
-import {makeSentryContinuousProfile} from './continuousProfile.spec';
 import {SentrySampledProfile} from './sentrySampledProfile';
-import {makeSentrySampledProfile} from './sentrySampledProfile.spec';
+import {makeSentryContinuousProfile, makeSentrySampledProfile} from './testUtils';
 
 describe('importProfile', () => {
   it('imports evented profile', () => {
@@ -187,7 +186,7 @@ describe('parseDroppedProfile', () => {
       reader.dispatchEvent(loadEvent);
     });
 
-    await expect(parseDroppedProfile(file)).rejects.toEqual(
+    await expect(parseDroppedProfile(file)).rejects.toBe(
       'Failed to read string contents of input file'
     );
 
@@ -211,7 +210,7 @@ describe('parseDroppedProfile', () => {
       reader.dispatchEvent(loadEvent);
     });
 
-    await expect(parseDroppedProfile(file)).rejects.toEqual(
+    await expect(parseDroppedProfile(file)).rejects.toBe(
       'Failed to read string contents of input file'
     );
 
diff --git a/static/app/utils/profiling/profile/importProfile.tsx b/static/app/utils/profiling/profile/importProfile.tsx
index 701ae5d446fd4d..594677b9eb9db8 100644
--- a/static/app/utils/profiling/profile/importProfile.tsx
+++ b/static/app/utils/profiling/profile/importProfile.tsx
@@ -1,5 +1,5 @@
+import type {Span} from '@sentry/core';
 import * as Sentry from '@sentry/react';
-import type {Span} from '@sentry/types';
 
 import type {Image} from 'sentry/types/debugImage';
 
@@ -147,15 +147,15 @@ function importSentrySampledProfile(
   > = {};
 
   for (let i = 0; i < input.profile.samples.length; i++) {
-    const sample = input.profile.samples[i];
+    const sample = input.profile.samples[i]!;
     if (!samplesByThread[sample.thread_id]) {
       samplesByThread[sample.thread_id] = [];
     }
-    samplesByThread[sample.thread_id].push(sample);
+    samplesByThread[sample.thread_id]!.push(sample);
   }
 
   for (const key in samplesByThread) {
-    samplesByThread[key].sort(
+    samplesByThread[key]!.sort(
       (a, b) => a.elapsed_since_start_ns - b.elapsed_since_start_ns
     );
   }
@@ -168,7 +168,7 @@ function importSentrySampledProfile(
       ...input,
       profile: {
         ...input.profile,
-        samples: samplesByThread[key],
+        samples: samplesByThread[key]!,
       },
     };
 
@@ -269,15 +269,15 @@ export function importSentryContinuousProfileChunk(
   > = {};
 
   for (let i = 0; i < input.profile.samples.length; i++) {
-    const sample = input.profile.samples[i];
+    const sample = input.profile.samples[i]!;
     if (!samplesByThread[sample.thread_id]) {
       samplesByThread[sample.thread_id] = [];
     }
-    samplesByThread[sample.thread_id].push(sample);
+    samplesByThread[sample.thread_id]!.push(sample);
   }
 
   for (const key in samplesByThread) {
-    samplesByThread[key].sort((a, b) => a.timestamp - b.timestamp);
+    samplesByThread[key]!.sort((a, b) => a.timestamp - b.timestamp);
   }
 
   const profiles: ContinuousProfile[] = [];
@@ -287,7 +287,7 @@ export function importSentryContinuousProfileChunk(
     const profile: Profiling.ContinuousProfile = {
       ...input,
       ...input.profile,
-      samples: samplesByThread[key],
+      samples: samplesByThread[key]!,
     };
 
     if (options.activeThreadId && key === options.activeThreadId) {
diff --git a/static/app/utils/profiling/profile/jsSelfProfile.spec.tsx b/static/app/utils/profiling/profile/jsSelfProfile.spec.tsx
index 732402edd1b299..832e491537cb03 100644
--- a/static/app/utils/profiling/profile/jsSelfProfile.spec.tsx
+++ b/static/app/utils/profiling/profile/jsSelfProfile.spec.tsx
@@ -1,7 +1,7 @@
 import {JSSelfProfile} from 'sentry/utils/profiling/profile/jsSelfProfile';
 import {createFrameIndex} from 'sentry/utils/profiling/profile/utils';
 
-import {firstCallee, makeTestingBoilerplate, nthCallee} from './profile.spec';
+import {firstCallee, makeTestingBoilerplate, nthCallee} from './testUtils';
 
 describe('jsSelfProfile', () => {
   it('imports the base properties', () => {
@@ -34,8 +34,8 @@ describe('jsSelfProfile', () => {
     expect(profile.duration).toBe(1000);
     expect(profile.startedAt).toBe(0);
     expect(profile.endedAt).toBe(1000);
-    expect(profile.callTree.children[0].frame.name).toBe('ReactDOM.render');
-    expect(profile.callTree.children[0].frame.resource).toBe('app.js');
+    expect(profile.callTree.children[0]!.frame.name).toBe('ReactDOM.render');
+    expect(profile.callTree.children[0]!.frame.resource).toBe('app.js');
   });
 
   it('tracks discarded samples', () => {
@@ -124,7 +124,7 @@ describe('jsSelfProfile', () => {
     );
     // For JsSelfProfile, first sample is appended with 0 weight because it
     // contains the stack sample of when startProfile was called
-    expect(profile.rawWeights.length).toBe(2);
+    expect(profile.rawWeights).toHaveLength(2);
   });
 
   it('handles the first stack sample differently', () => {
@@ -179,14 +179,14 @@ describe('jsSelfProfile', () => {
       throw new Error('root is null');
     }
 
-    expect(root.totalWeight).toEqual(1000);
-    expect(root.selfWeight).toEqual(0);
+    expect(root.totalWeight).toBe(1000);
+    expect(root.selfWeight).toBe(0);
 
-    expect(nthCallee(root, 0).selfWeight).toEqual(0);
-    expect(nthCallee(root, 0).totalWeight).toEqual(0);
+    expect(nthCallee(root, 0).selfWeight).toBe(0);
+    expect(nthCallee(root, 0).totalWeight).toBe(0);
 
-    expect(nthCallee(root, 1).selfWeight).toEqual(1000);
-    expect(nthCallee(root, 1).totalWeight).toEqual(1000);
+    expect(nthCallee(root, 1).selfWeight).toBe(1000);
+    expect(nthCallee(root, 1).totalWeight).toBe(1000);
   });
 
   it('rebuilds the stack', () => {
@@ -228,13 +228,13 @@ describe('jsSelfProfile', () => {
     expect(openSpy).toHaveBeenCalledTimes(2);
     expect(closeSpy).toHaveBeenCalledTimes(2);
 
-    const root = firstCallee(profile.callTree);
+    const root = firstCallee(profile.callTree)!;
 
-    expect(root.totalWeight).toEqual(1000);
-    expect(firstCallee(root).totalWeight).toEqual(1000);
+    expect(root.totalWeight).toBe(1000);
+    expect(firstCallee(root)!.totalWeight).toBe(1000);
 
-    expect(root.selfWeight).toEqual(0);
-    expect(firstCallee(root).selfWeight).toEqual(1000);
+    expect(root.selfWeight).toBe(0);
+    expect(firstCallee(root)!.selfWeight).toBe(1000);
   });
 
   it('marks direct recursion', () => {
@@ -260,7 +260,7 @@ describe('jsSelfProfile', () => {
       {type: 'flamechart'}
     );
 
-    expect(!!firstCallee(firstCallee(profile.callTree)).recursive).toBe(true);
+    expect(!!firstCallee(firstCallee(profile.callTree)!)!.recursive).toBe(true);
   });
 
   it('marks indirect recursion', () => {
@@ -293,7 +293,7 @@ describe('jsSelfProfile', () => {
       {type: 'flamechart'}
     );
 
-    expect(!!firstCallee(firstCallee(firstCallee(profile.callTree))).recursive).toBe(
+    expect(!!firstCallee(firstCallee(firstCallee(profile.callTree)!)!)!.recursive).toBe(
       true
     );
   });
@@ -416,7 +416,7 @@ describe('jsSelfProfile', () => {
       {type: 'flamechart'}
     );
 
-    expect(profile.callTree.children[0].count).toBe(3);
-    expect(profile.callTree.children[0].children[0].count).toBe(1);
+    expect(profile.callTree.children[0]!.count).toBe(3);
+    expect(profile.callTree.children[0]!.children[0]!.count).toBe(1);
   });
 });
diff --git a/static/app/utils/profiling/profile/jsSelfProfile.tsx b/static/app/utils/profiling/profile/jsSelfProfile.tsx
index 4af3dbaac9e68b..c2ce91a65f497f 100644
--- a/static/app/utils/profiling/profile/jsSelfProfile.tsx
+++ b/static/app/utils/profiling/profile/jsSelfProfile.tsx
@@ -41,8 +41,8 @@ export class JSSelfProfile extends Profile {
       );
     }
 
-    const startedAt = profile.samples[0].timestamp;
-    const endedAt = profile.samples[profile.samples.length - 1]?.timestamp;
+    const startedAt = profile.samples[0]!.timestamp;
+    const endedAt = profile.samples[profile.samples.length - 1]!?.timestamp;
 
     const jsSelfProfile = new JSSelfProfile({
       duration: endedAt - startedAt,
@@ -66,9 +66,9 @@ export class JSSelfProfile extends Profile {
       jsSelfProfile.appendSample(
         resolveJSSelfProfilingStack(
           profile,
-          profile.samples[0].stackId,
+          profile.samples[0]!.stackId,
           frameIndex,
-          profile.samples[0].marker
+          profile.samples[0]!.marker
         ),
         0
       );
@@ -80,26 +80,26 @@ export class JSSelfProfile extends Profile {
       // When gc is triggered, the stack may be indicated as empty. In that case, the thread was not idle
       // and we should append gc to the top of the previous stack.
       // https://github.com/WICG/js-self-profiling/issues/59
-      if (samples[i].marker === 'gc' && options.type === 'flamechart') {
+      if (samples[i]!.marker === 'gc' && options.type === 'flamechart') {
         jsSelfProfile.appendSample(
           resolveJSSelfProfilingStack(
             profile,
             // use the previous sample
-            samples[i - 1].stackId,
+            samples[i - 1]!.stackId,
             frameIndex,
-            samples[i].marker
+            samples[i]!.marker
           ),
-          samples[i].timestamp - samples[i - 1].timestamp
+          samples[i]!.timestamp - samples[i - 1]!.timestamp
         );
       } else {
         jsSelfProfile.appendSample(
           resolveJSSelfProfilingStack(
             profile,
-            samples[i].stackId,
+            samples[i]!.stackId,
             frameIndex,
-            samples[i].marker
+            samples[i]!.marker
           ),
-          samples[i].timestamp - samples[i - 1].timestamp
+          samples[i]!.timestamp - samples[i - 1]!.timestamp
         );
       }
     }
@@ -132,10 +132,10 @@ export class JSSelfProfile extends Profile {
       let stackHeight = framesInStack.length - 1;
 
       while (stackHeight >= 0) {
-        if (framesInStack[stackHeight].frame === node.frame) {
+        if (framesInStack[stackHeight]!.frame === node.frame) {
           // The recursion edge is bidirectional
-          framesInStack[stackHeight].recursive = node;
-          node.recursive = framesInStack[stackHeight];
+          framesInStack[stackHeight]!.recursive = node;
+          node.recursive = framesInStack[stackHeight]!;
           break;
         }
         stackHeight--;
@@ -166,7 +166,7 @@ export class JSSelfProfile extends Profile {
 
     // If node is the same as the previous sample, add the weight to the previous sample
     if (node === this.samples[this.samples.length - 1]) {
-      this.weights[this.weights.length - 1] += weight;
+      this.weights[this.weights.length - 1]! += weight;
     } else {
       this.samples.push(node);
       this.weights.push(weight);
diff --git a/static/app/utils/profiling/profile/profile.spec.tsx b/static/app/utils/profiling/profile/profile.spec.tsx
index 1a92cb0103976d..293afa550fb15d 100644
--- a/static/app/utils/profiling/profile/profile.spec.tsx
+++ b/static/app/utils/profiling/profile/profile.spec.tsx
@@ -1,75 +1,13 @@
-import {CallTreeNode} from 'sentry/utils/profiling/callTreeNode';
 import {Frame} from 'sentry/utils/profiling/frame';
 import {Profile} from 'sentry/utils/profiling/profile/profile';
 
-// Test utils to keep the tests code dry
-export const f = (name: string, key: number, in_app: boolean = true) =>
-  new Frame({name, key, is_application: in_app});
-export const c = (fr: Frame) => new CallTreeNode(fr, null);
-export const firstCallee = (node: CallTreeNode) => node.children[0];
-export const nthCallee = (node: CallTreeNode, n: number) => {
-  const child = node.children[n];
-  if (!child) {
-    throw new Error('Child not found');
-  }
-  return child;
-};
-
-export const makeTestingBoilerplate = () => {
-  const timings: [Frame['name'], string][] = [];
-
-  const openSpy = jest.fn();
-  const closeSpy = jest.fn();
-
-  // We need to wrap the spy fn because they are not allowed to reference external variables
-  const open = (node, value) => {
-    timings.push([node.frame.name, 'open']);
-    openSpy(node, value);
-  };
-  // We need to wrap the spy fn because they are not allowed to reference external variables
-  const close = (node, val) => {
-    timings.push([node.frame.name, 'close']);
-    closeSpy(node, val);
-  };
-
-  return {open, close, timings, openSpy, closeSpy};
-};
-
-// Since it's easy to make mistakes or accidentally assign parents to the wrong nodes, this utility fn
-// will format the stack samples as a tree string so it's more human friendly.
-export const _logExpectedStack = (samples: Profile['samples']): string => {
-  const head = `
-Samples follow a top-down chronological order\n\n`;
-
-  const tail = `\n
------------------------>
-stack top -> stack bottom`;
-
-  const final: string[] = [];
-
-  const visit = (node: CallTreeNode, str: string[]) => {
-    str.push(`${node.frame.name}`);
-
-    if (node.parent) {
-      visit(node.parent, str);
-    }
-  };
-
-  for (const stackTop of samples) {
-    const str = [];
-    visit(stackTop, str);
-
-    final.push(str.join(' -> '));
-  }
-
-  return `${head}${final.join('\n')}${tail}`;
-};
+import {c, f, makeTestingBoilerplate} from './testUtils';
 
 describe('Profile', () => {
   it('Empty profile duration is not infinity', () => {
     const profile = Profile.Empty;
-    expect(profile.duration).toEqual(1000);
-    expect(profile.minFrameDuration).toEqual(1000);
+    expect(profile.duration).toBe(1000);
+    expect(profile.minFrameDuration).toBe(1000);
   });
 
   it('forEach - iterates over a single sample', () => {
diff --git a/static/app/utils/profiling/profile/profile.tsx b/static/app/utils/profiling/profile/profile.tsx
index 958002d7aae87b..4a387171994e83 100644
--- a/static/app/utils/profiling/profile/profile.tsx
+++ b/static/app/utils/profiling/profile/profile.tsx
@@ -135,16 +135,16 @@ export class Profile {
       }
 
       for (let i = toOpen.length - 1; i >= 0; i--) {
-        openFrame(toOpen[i], value);
-        prevStack.push(toOpen[i]);
+        openFrame(toOpen[i]!, value);
+        prevStack.push(toOpen[i]!);
       }
 
-      value += this.weights[sampleIndex++];
+      value += this.weights[sampleIndex++]!;
     }
 
     // Close any remaining frames
     for (let i = prevStack.length - 1; i >= 0; i--) {
-      closeFrame(prevStack[i], value);
+      closeFrame(prevStack[i]!, value);
     }
   }
 
diff --git a/static/app/utils/profiling/profile/sampledProfile.spec.tsx b/static/app/utils/profiling/profile/sampledProfile.spec.tsx
index b6ab8ce90d5e04..470d3d0dcca518 100644
--- a/static/app/utils/profiling/profile/sampledProfile.spec.tsx
+++ b/static/app/utils/profiling/profile/sampledProfile.spec.tsx
@@ -3,7 +3,7 @@ import {createFrameIndex} from 'sentry/utils/profiling/profile/utils';
 
 import {Frame} from '../frame';
 
-import {firstCallee, makeTestingBoilerplate} from './profile.spec';
+import {firstCallee, makeTestingBoilerplate} from './testUtils';
 
 describe('SampledProfile', () => {
   it('imports the base properties', () => {
@@ -86,7 +86,7 @@ describe('SampledProfile', () => {
       createFrameIndex('mobile', [{name: 'f0'}]),
       {type: 'flamechart'}
     );
-    expect(profile.rawWeights.length).toBe(2);
+    expect(profile.rawWeights).toHaveLength(2);
   });
 
   it('rebuilds the stack', () => {
@@ -123,13 +123,13 @@ describe('SampledProfile', () => {
     expect(openSpy).toHaveBeenCalledTimes(2);
     expect(closeSpy).toHaveBeenCalledTimes(2);
 
-    const root = firstCallee(profile.callTree);
+    const root = firstCallee(profile.callTree)!;
 
-    expect(root.totalWeight).toEqual(2);
-    expect(firstCallee(root).totalWeight).toEqual(2);
+    expect(root!.totalWeight).toBe(2);
+    expect(firstCallee(root)!.totalWeight).toBe(2);
 
-    expect(root.selfWeight).toEqual(0);
-    expect(firstCallee(root).selfWeight).toEqual(2);
+    expect(root!.selfWeight).toBe(0);
+    expect(firstCallee(root)!.selfWeight).toBe(2);
   });
 
   it('marks direct recursion', () => {
@@ -150,7 +150,7 @@ describe('SampledProfile', () => {
       {type: 'flamechart'}
     );
 
-    expect(!!firstCallee(firstCallee(profile.callTree)).recursive).toBe(true);
+    expect(!!firstCallee(firstCallee(profile.callTree)!)!.recursive).toBe(true);
   });
 
   it('marks indirect recursion', () => {
@@ -171,7 +171,7 @@ describe('SampledProfile', () => {
       {type: 'flamechart'}
     );
 
-    expect(!!firstCallee(firstCallee(firstCallee(profile.callTree))).recursive).toBe(
+    expect(!!firstCallee(firstCallee(firstCallee(profile.callTree)!)!)!.recursive).toBe(
       true
     );
   });
@@ -226,14 +226,18 @@ describe('SampledProfile', () => {
     );
 
     // GC gets places on top of the previous stack and the weight is updated
-    expect(profile.callTree.children[0].children[0].frame.name).toBe('f1 [native code]');
+    expect(profile.callTree.children[0]!.children[0]!.frame.name).toBe(
+      'f1 [native code]'
+    );
     // The total weight of the previous top is now the weight of the GC call + the weight of the previous top
-    expect(profile.callTree.children[0].children[0].frame.totalWeight).toBe(4);
-    expect(profile.callTree.children[0].children[0].children[0].frame.name).toBe(
+    expect(profile.callTree.children[0]!.children[0]!.frame.totalWeight).toBe(4);
+    expect(profile.callTree.children[0]!.children[0]!.children[0]!.frame.name).toBe(
       '(garbage collector) [native code]'
     );
     // The self weight of the GC call is only the weight of the GC call
-    expect(profile.callTree.children[0].children[0].children[0].frame.selfWeight).toBe(3);
+    expect(profile.callTree.children[0]!.children[0]!.children[0]!.frame.selfWeight).toBe(
+      3
+    );
   });
 
   it('places garbage collector calls on top of previous stack and skips stack', () => {
@@ -292,11 +296,11 @@ describe('SampledProfile', () => {
       {type: 'flamechart'}
     );
 
-    expect(profile.callTree.children[0].children[0].children.length).toBe(2);
-    expect(profile.callTree.children[0].children[0].children[0].frame.name).toBe(
+    expect(profile.callTree.children[0]!.children[0]!.children).toHaveLength(2);
+    expect(profile.callTree.children[0]!.children[0]!.children[0]!.frame.name).toBe(
       'f2 [native code]'
     );
-    expect(profile.callTree.children[0].children[0].children[1].frame.name).toBe(
+    expect(profile.callTree.children[0]!.children[0]!.children[1]!.frame.name).toBe(
       '(garbage collector) [native code]'
     );
   });
@@ -329,8 +333,10 @@ describe('SampledProfile', () => {
     );
 
     // There are no other children than the GC call meaning merge happened
-    expect(profile.callTree.children[0].children[0].children[1]).toBe(undefined);
-    expect(profile.callTree.children[0].children[0].children[0].frame.selfWeight).toBe(6);
+    expect(profile.callTree.children[0]!.children[0]!.children[1]).toBeUndefined();
+    expect(profile.callTree.children[0]!.children[0]!.children[0]!.frame.selfWeight).toBe(
+      6
+    );
   });
 
   it('flamegraph tracks node occurrences', () => {
@@ -351,8 +357,8 @@ describe('SampledProfile', () => {
       {type: 'flamechart'}
     );
 
-    expect(profile.callTree.children[0].count).toBe(3);
-    expect(profile.callTree.children[0].children[0].count).toBe(1);
+    expect(profile.callTree.children[0]!.count).toBe(3);
+    expect(profile.callTree.children[0]!.children[0]!.count).toBe(1);
   });
 
   it('filters frames', () => {
@@ -383,9 +389,9 @@ describe('SampledProfile', () => {
 
     expect(profile.callTree.frame).toBe(Frame.Root);
     expect(profile.callTree.children).toHaveLength(1);
-    expect(profile.callTree.children[0].frame.name).toEqual('f0');
+    expect(profile.callTree.children[0]!.frame.name).toBe('f0');
     // the f1 frame is filtered out, so the f0 frame has no children
-    expect(profile.callTree.children[0].children).toHaveLength(0);
+    expect(profile.callTree.children[0]!.children).toHaveLength(0);
   });
 
   it('aggregates durations for flamegraph', () => {
@@ -412,12 +418,12 @@ describe('SampledProfile', () => {
       }
     );
 
-    expect(profile.callTree.children[0].frame.name).toBe('f0');
-    expect(profile.callTree.children[0].aggregate_duration_ns).toBe(15);
-    expect(profile.callTree.children[0].children[0].aggregate_duration_ns).toBe(10);
-    expect(profile.callTree.children[0].children[1].aggregate_duration_ns).toBe(5);
-    expect(profile.callTree.children[0].frame.aggregateDuration).toBe(15);
-    expect(profile.callTree.children[0].children[0].frame.aggregateDuration).toBe(10);
-    expect(profile.callTree.children[0].children[1].frame.aggregateDuration).toBe(5);
+    expect(profile.callTree.children[0]!.frame.name).toBe('f0');
+    expect(profile.callTree.children[0]!.aggregate_duration_ns).toBe(15);
+    expect(profile.callTree.children[0]!.children[0]!.aggregate_duration_ns).toBe(10);
+    expect(profile.callTree.children[0]!.children[1]!.aggregate_duration_ns).toBe(5);
+    expect(profile.callTree.children[0]!.frame.aggregateDuration).toBe(15);
+    expect(profile.callTree.children[0]!.children[0]!.frame.aggregateDuration).toBe(10);
+    expect(profile.callTree.children[0]!.children[1]!.frame.aggregateDuration).toBe(5);
   });
 });
diff --git a/static/app/utils/profiling/profile/sampledProfile.tsx b/static/app/utils/profiling/profile/sampledProfile.tsx
index 38b6decb189a81..302cda952b6aee 100644
--- a/static/app/utils/profiling/profile/sampledProfile.tsx
+++ b/static/app/utils/profiling/profile/sampledProfile.tsx
@@ -8,8 +8,8 @@ import type {createFrameIndex} from './utils';
 import {resolveFlamegraphSamplesProfileIds} from './utils';
 
 function sortStacks(
-  a: {stack: number[]; weight: number},
-  b: {stack: number[]; weight: number}
+  a: {stack: number[]; weight: number | undefined},
+  b: {stack: number[]; weight: number | undefined}
 ) {
   const max = Math.max(a.stack.length, b.stack.length);
 
@@ -20,10 +20,10 @@ function sortStacks(
     if (b.stack[i] === undefined) {
       return 1;
     }
-    if (a.stack[i] === b.stack[i]) {
+    if (a.stack[i]! === b.stack[i]!) {
       continue;
     }
-    return a.stack[i] - b.stack[i];
+    return a.stack[i]! - b.stack[i]!;
   }
   return 0;
 }
@@ -47,7 +47,7 @@ function sortSamples(
   profile: Readonly<Profiling.SampledProfile>,
   profileIds: Profiling.ProfileReference[][] = [],
   frameFilter?: (i: number) => boolean
-): {aggregate_sample_duration: number; stack: number[]; weight: number}[] {
+): {aggregate_sample_duration: number; stack: number[]; weight: number | undefined}[] {
   return stacksWithWeights(profile, profileIds, frameFilter).sort(sortStacks);
 }
 
@@ -144,9 +144,9 @@ export class SampledProfile extends Profile {
     let frame: Frame | null = null;
 
     for (let i = 0; i < samples.length; i++) {
-      const stack = samples[i].stack;
-      let weight = samples[i].weight;
-      let aggregate_duration_ns = samples[i].aggregate_sample_duration;
+      const stack = samples[i]!.stack;
+      let weight = samples[i]!.weight!;
+      let aggregate_duration_ns = samples[i]!.aggregate_sample_duration;
 
       const isGCStack =
         options.type === 'flamechart' &&
@@ -157,15 +157,16 @@ export class SampledProfile extends Profile {
         // and when that happens, we do not want to enter this case as the GC will already
         // be placed at the top of the previous stack and the new stack length will be > 2
         stack.length <= 2 &&
-        frameIndex[stack[stack.length - 1]]?.name === '(garbage collector) [native code]';
+        frameIndex[stack[stack.length - 1]!]?.name ===
+          '(garbage collector) [native code]';
 
       if (isGCStack) {
         // The next stack we will process will be the previous stack + our new gc frame.
         // We write the GC frame on top of the previous stack and set the size to the new stack length.
-        frame = resolveFrame(stack[stack.length - 1]);
+        frame = resolveFrame(stack[stack.length - 1]!);
         if (frame) {
-          resolvedStack[samples[i - 1].stack.length] =
-            frameIndex[stack[stack.length - 1]];
+          resolvedStack[samples[i - 1]!.stack.length] =
+            frameIndex[stack[stack.length - 1]!]!;
           size += 1; // size of previous stack + new gc frame
 
           // Now collect all weights of all the consecutive gc frames and skip the samples
@@ -176,12 +177,12 @@ export class SampledProfile extends Profile {
             // There is a good chance that this logic will at some point live on the backend
             // and when that happens, we do not want to enter this case as the GC will already
             // be placed at the top of the previous stack and the new stack length will be > 2
-            samples[i + 1].stack.length <= 2 &&
-            frameIndex[samples[i + 1].stack[samples[i + 1].stack.length - 1]]?.name ===
+            samples[i + 1]!.stack.length <= 2 &&
+            frameIndex[samples[i + 1]!.stack[samples[i + 1]!.stack.length - 1]!]?.name ===
               '(garbage collector) [native code]'
           ) {
-            weight += samples[++i].weight;
-            aggregate_duration_ns += samples[i].aggregate_sample_duration;
+            weight += samples[++i]!.weight!;
+            aggregate_duration_ns += samples[i]!.aggregate_sample_duration;
           }
         }
       } else {
@@ -189,7 +190,7 @@ export class SampledProfile extends Profile {
         // If we are using the current stack, then we need to resolve the frames,
         // else the processed frames will be the frames that were previously resolved
         for (let j = 0; j < stack.length; j++) {
-          frame = resolveFrame(stack[j]);
+          frame = resolveFrame(stack[j]!);
           if (!frame) {
             continue;
           }
@@ -255,7 +256,7 @@ export class SampledProfile extends Profile {
     let node = this.callTree;
     const framesInStack: CallTreeNode[] = [];
     for (let i = 0; i < end; i++) {
-      const frame = stack[i];
+      const frame = stack[i]!;
       const last = node.children[node.children.length - 1];
       // Find common frame between two stacks
       if (last && !last.isLocked() && last.frame === frame) {
@@ -277,10 +278,10 @@ export class SampledProfile extends Profile {
       // We check the stack in a top-down order to find the first recursive frame.
       let start = framesInStack.length - 1;
       while (start >= 0) {
-        if (framesInStack[start].frame === node.frame) {
+        if (framesInStack[start]!.frame === node.frame) {
           // The recursion edge is bidirectional
-          framesInStack[start].recursive = node;
-          node.recursive = framesInStack[start];
+          framesInStack[start]!.recursive = node;
+          node.recursive = framesInStack[start]!;
           break;
         }
         start--;
@@ -309,7 +310,7 @@ export class SampledProfile extends Profile {
 
     // If node is the same as the previous sample, add the weight to the previous sample
     if (node === this.samples[this.samples.length - 1]) {
-      this.weights[this.weights.length - 1] += weight;
+      this.weights[this.weights.length - 1]! += weight;
     } else {
       this.samples.push(node);
       this.weights.push(weight);
diff --git a/static/app/utils/profiling/profile/sentrySampledProfile.spec.tsx b/static/app/utils/profiling/profile/sentrySampledProfile.spec.tsx
index 8323fc32217460..b3f1582955cb6a 100644
--- a/static/app/utils/profiling/profile/sentrySampledProfile.spec.tsx
+++ b/static/app/utils/profiling/profile/sentrySampledProfile.spec.tsx
@@ -1,76 +1,9 @@
-import merge from 'lodash/merge';
-
-import type {DeepPartial} from 'sentry/types/utils';
-
 import {Frame} from '../frame';
 
-import {makeTestingBoilerplate} from './profile.spec';
 import {SentrySampledProfile} from './sentrySampledProfile';
+import {makeSentrySampledProfile, makeTestingBoilerplate} from './testUtils';
 import {createSentrySampleProfileFrameIndex} from './utils';
 
-export const makeSentrySampledProfile = (
-  profile?: DeepPartial<Profiling.SentrySampledProfile>
-) => {
-  return merge(
-    {
-      event_id: '1',
-      version: '1',
-      os: {
-        name: 'iOS',
-        version: '16.0',
-        build_number: '19H253',
-      },
-      device: {
-        architecture: 'arm64e',
-        is_emulator: false,
-        locale: 'en_US',
-        manufacturer: 'Apple',
-        model: 'iPhone14,3',
-      },
-      timestamp: '2022-09-01T09:45:00.000Z',
-      platform: 'cocoa',
-      profile: {
-        samples: [
-          {
-            stack_id: 0,
-            thread_id: '0',
-            elapsed_since_start_ns: 0,
-          },
-          {
-            stack_id: 1,
-            thread_id: '0',
-            elapsed_since_start_ns: 1000,
-          },
-        ],
-        frames: [
-          {
-            function: 'main',
-            instruction_addr: '',
-            lineno: 1,
-            colno: 1,
-            file: 'main.c',
-          },
-          {
-            function: 'foo',
-            instruction_addr: '',
-            lineno: 2,
-            colno: 2,
-            file: 'main.c',
-          },
-        ],
-        stacks: [[1, 0], [0]],
-      },
-      transaction: {
-        id: '',
-        name: 'foo',
-        active_thread_id: 0,
-        trace_id: '1',
-      },
-    },
-    profile
-  ) as Profiling.SentrySampledProfile;
-};
-
 describe('SentrySampledProfile', () => {
   it('constructs a profile', () => {
     const sampledProfile: Profiling.SentrySampledProfile = makeSentrySampledProfile();
@@ -91,8 +24,8 @@ describe('SentrySampledProfile', () => {
       ['foo', 'close'],
       ['main', 'close'],
     ]);
-    expect(profile.startedAt).toEqual(0);
-    expect(profile.endedAt).toEqual(1000);
+    expect(profile.startedAt).toBe(0);
+    expect(profile.endedAt).toBe(1000);
   });
 
   it('tracks discarded samples', () => {
@@ -211,7 +144,7 @@ describe('SentrySampledProfile', () => {
       {type: 'flamechart'}
     );
 
-    expect(profile.rawWeights.length).toBe(2);
+    expect(profile.rawWeights).toHaveLength(2);
   });
 
   it('derives a profile name from the transaction.name and thread_id', () => {
@@ -464,8 +397,8 @@ describe('SentrySampledProfile', () => {
       {type: 'flamegraph'}
     );
 
-    expect(profile.callTree.children[0].count).toBe(2);
-    expect(profile.callTree.children[0].children[0].count).toBe(1);
+    expect(profile.callTree.children[0]!.count).toBe(2);
+    expect(profile.callTree.children[0]!.children[0]!.count).toBe(1);
   });
 
   it('filters frames', () => {
@@ -510,8 +443,8 @@ describe('SentrySampledProfile', () => {
 
     expect(profile.callTree.frame).toBe(Frame.Root);
     expect(profile.callTree.children).toHaveLength(1);
-    expect(profile.callTree.children[0].frame.name).toEqual('f0');
+    expect(profile.callTree.children[0]!.frame.name).toBe('f0');
     // the f1 frame is filtered out, so the f0 frame has no children
-    expect(profile.callTree.children[0].children).toHaveLength(0);
+    expect(profile.callTree.children[0]!.children).toHaveLength(0);
   });
 });
diff --git a/static/app/utils/profiling/profile/sentrySampledProfile.tsx b/static/app/utils/profiling/profile/sentrySampledProfile.tsx
index 0931e8e96d1bf2..507a12ffcb0220 100644
--- a/static/app/utils/profiling/profile/sentrySampledProfile.tsx
+++ b/static/app/utils/profiling/profile/sentrySampledProfile.tsx
@@ -18,8 +18,8 @@ function sortSentrySampledProfileSamples(
   frameFilter?: (i: number) => boolean
 ) {
   const frameIds = [...Array(frames.length).keys()].sort((a, b) => {
-    const frameA = frames[a];
-    const frameB = frames[b];
+    const frameA = frames[a]!;
+    const frameB = frames[b]!;
 
     if (defined(frameA.function) && defined(frameB.function)) {
       // sort alphabetically first
@@ -139,8 +139,8 @@ export class SentrySampledProfile extends Profile {
           )
         : weightedSamples;
 
-    const startedAt = samples[0].elapsed_since_start_ns;
-    const endedAt = samples[samples.length - 1].elapsed_since_start_ns;
+    const startedAt = samples[0]!.elapsed_since_start_ns;
+    const endedAt = samples[samples.length - 1]!.elapsed_since_start_ns;
     if (Number.isNaN(startedAt) || Number.isNaN(endedAt)) {
       throw TypeError('startedAt or endedAt is NaN');
     }
@@ -160,8 +160,8 @@ export class SentrySampledProfile extends Profile {
     });
 
     for (let i = 0; i < samples.length; i++) {
-      const sample = samples[i];
-      let stack = stacks[sample.stack_id].map(resolveFrame);
+      const sample = samples[i]!;
+      let stack = stacks[sample!.stack_id].map(resolveFrame);
 
       if (options.frameFilter) {
         stack = stack.filter(frame => options.frameFilter!(frame));
@@ -187,7 +187,7 @@ export class SentrySampledProfile extends Profile {
 
     // frames are ordered outermost -> innermost so we have to iterate backward
     for (let i = stack.length - 1; i >= 0; i--) {
-      const frame = stack[i];
+      const frame = stack[i]!;
       const last = node.children[node.children.length - 1];
       // Find common frame between two stacks
       if (last && !last.isLocked() && last.frame === frame) {
@@ -205,10 +205,10 @@ export class SentrySampledProfile extends Profile {
       // We check the stack in a top-down order to find the first recursive frame.
       let start = framesInStack.length - 1;
       while (start >= 0) {
-        if (framesInStack[start].frame === node.frame) {
+        if (framesInStack[start]!.frame === node.frame) {
           // The recursion edge is bidirectional
-          framesInStack[start].recursive = node;
-          node.recursive = framesInStack[start];
+          framesInStack[start]!.recursive = node;
+          node.recursive = framesInStack[start]!;
           break;
         }
         start--;
@@ -236,7 +236,7 @@ export class SentrySampledProfile extends Profile {
 
     // If node is the same as the previous sample, add the weight to the previous sample
     if (node === this.samples[this.samples.length - 1]) {
-      this.weights[this.weights.length - 1] += weight;
+      this.weights[this.weights.length - 1]! += weight;
     } else {
       this.samples.push(node);
       this.weights.push(weight);
@@ -269,7 +269,7 @@ function getThreadData(profile: Profiling.SentrySampledProfile): {
   threadName: string;
 } {
   const {samples, queue_metadata = {}, thread_metadata = {}} = profile.profile;
-  const sample = samples[0];
+  const sample = samples[0]!;
   const threadId = parseInt(sample.thread_id, 10);
 
   const threadName = thread_metadata?.[threadId]?.name;
diff --git a/static/app/utils/profiling/profile/testUtils.tsx b/static/app/utils/profiling/profile/testUtils.tsx
new file mode 100644
index 00000000000000..ac8cd0fed88499
--- /dev/null
+++ b/static/app/utils/profiling/profile/testUtils.tsx
@@ -0,0 +1,134 @@
+import merge from 'lodash/merge';
+
+import type {DeepPartial} from 'sentry/types/utils';
+import {CallTreeNode} from 'sentry/utils/profiling/callTreeNode';
+import {Frame} from 'sentry/utils/profiling/frame';
+
+export const f = (name: string, key: number, in_app: boolean = true) =>
+  new Frame({name, key, is_application: in_app});
+export const c = (fr: Frame) => new CallTreeNode(fr, null);
+export const firstCallee = (node: CallTreeNode) => node.children[0];
+export const nthCallee = (node: CallTreeNode, n: number) => {
+  const child = node.children[n];
+  if (!child) {
+    throw new Error('Child not found');
+  }
+  return child;
+};
+
+export const makeTestingBoilerplate = () => {
+  const timings: [Frame['name'], string][] = [];
+
+  const openSpy = jest.fn();
+  const closeSpy = jest.fn();
+
+  // We need to wrap the spy fn because they are not allowed to reference external variables
+  const open = (node: CallTreeNode, value: number) => {
+    timings.push([node.frame.name, 'open']);
+    openSpy(node, value);
+  };
+  // We need to wrap the spy fn because they are not allowed to reference external variables
+  const close = (node: CallTreeNode, val: number) => {
+    timings.push([node.frame.name, 'close']);
+    closeSpy(node, val);
+  };
+
+  return {open, close, timings, openSpy, closeSpy};
+};
+
+export function makeSentryContinuousProfile(
+  profile?: DeepPartial<Profiling.SentryContinousProfileChunk>
+): Profiling.SentryContinousProfileChunk {
+  return merge(
+    {
+      chunk_id: 'chunk_id',
+      environment: '',
+      project_id: 0,
+      received: 0,
+      release: '',
+      organization_id: 0,
+      retention_days: 0,
+      version: '2',
+      platform: 'node',
+      profile: {
+        samples: [
+          {timestamp: Date.now() / 1e3, stack_id: 0, thread_id: '0'},
+          // 10ms later
+          {timestamp: Date.now() / 1e3 + 0.01, stack_id: 1, thread_id: '0'},
+        ],
+        frames: [
+          {function: 'foo', in_app: true},
+          {function: 'bar', in_app: true},
+        ],
+        stacks: [
+          [0, 1],
+          [0, 1],
+        ],
+      },
+    },
+    profile
+  ) as Profiling.SentryContinousProfileChunk;
+}
+
+export const makeSentrySampledProfile = (
+  profile?: DeepPartial<Profiling.SentrySampledProfile>
+) => {
+  return merge(
+    {
+      event_id: '1',
+      version: '1',
+      os: {
+        name: 'iOS',
+        version: '16.0',
+        build_number: '19H253',
+      },
+      device: {
+        architecture: 'arm64e',
+        is_emulator: false,
+        locale: 'en_US',
+        manufacturer: 'Apple',
+        model: 'iPhone14,3',
+      },
+      timestamp: '2022-09-01T09:45:00.000Z',
+      platform: 'cocoa',
+      profile: {
+        samples: [
+          {
+            stack_id: 0,
+            thread_id: '0',
+            elapsed_since_start_ns: 0,
+          },
+          {
+            stack_id: 1,
+            thread_id: '0',
+            elapsed_since_start_ns: 1000,
+          },
+        ],
+        frames: [
+          {
+            function: 'main',
+            instruction_addr: '',
+            lineno: 1,
+            colno: 1,
+            file: 'main.c',
+          },
+          {
+            function: 'foo',
+            instruction_addr: '',
+            lineno: 2,
+            colno: 2,
+            file: 'main.c',
+          },
+        ],
+        stacks: [[1, 0], [0]],
+      },
+      transaction: {
+        id: '',
+        name: 'foo',
+        active_thread_id: 0,
+        trace_id: '1',
+      },
+    },
+    profile
+  ) as Profiling.SentrySampledProfile;
+};
diff --git a/static/app/utils/profiling/profile/utils.spec.tsx b/static/app/utils/profiling/profile/utils.spec.tsx
index 6669a4e09110b3..5b37027087b00c 100644
--- a/static/app/utils/profiling/profile/utils.spec.tsx
+++ b/static/app/utils/profiling/profile/utils.spec.tsx
@@ -70,7 +70,7 @@ describe('memoizeByReference', () => {
     const _discard = memoized(1);
     const result = memoized(2);
 
-    expect(result).toEqual(2);
+    expect(result).toBe(2);
     expect(fn).toHaveBeenCalledTimes(2);
   });
 });
diff --git a/static/app/utils/profiling/profile/utils.tsx b/static/app/utils/profiling/profile/utils.tsx
index d23831ccd854ab..a94fa967495de4 100644
--- a/static/app/utils/profiling/profile/utils.tsx
+++ b/static/app/utils/profiling/profile/utils.tsx
@@ -1,5 +1,5 @@
+import type {Span} from '@sentry/core';
 import * as Sentry from '@sentry/react';
-import type {Span} from '@sentry/types';
 
 import {defined} from 'sentry/utils';
 import type {FlamegraphFrame} from 'sentry/utils/profiling/flamegraphFrame';
@@ -18,7 +18,7 @@ export function createContinuousProfileFrameIndex(
   let idx = -1;
 
   for (let i = 0; i < frames.length; i++) {
-    const frame = frames[i];
+    const frame = frames[i]!;
     const frameKey = `${frame.filename ?? ''}:${frame.function ?? 'unknown'}:${
       String(frame.lineno) ?? ''
     }:${frame.instruction_addr ?? ''}`;
@@ -63,7 +63,7 @@ export function createSentrySampleProfileFrameIndex(
   let idx = -1;
 
   for (let i = 0; i < frames.length; i++) {
-    const frame = frames[i];
+    const frame = frames[i]!;
     const frameKey = `${frame.filename ?? ''}:${frame.function ?? 'unknown'}:${
       String(frame.lineno) ?? ''
     }:${frame.instruction_addr ?? ''}`;
@@ -247,18 +247,18 @@ function indexNodeToParents(
   // Begin in each root node
   for (let i = 0; i < roots.length; i++) {
     // If the root is a leaf node, push it to the leafs array
-    if (!roots[i].children?.length) {
-      leafs.push(roots[i]);
+    if (!roots[i]!.children?.length) {
+      leafs.push(roots[i]!);
     }
 
     // Init the map for the root in case we havent yet
-    if (!map[roots[i].key]) {
-      map[roots[i].key] = [];
+    if (!map[roots[i]!.key]) {
+      map[roots[i]!.key] = [];
     }
 
     // descend down to each child and index them
-    for (let j = 0; j < roots[i].children.length; j++) {
-      indexNode(roots[i].children[j], roots[i]);
+    for (let j = 0; j < roots[i]!.children.length; j++) {
+      indexNode(roots[i]!.children[j]!, roots[i]!);
     }
   }
 }
@@ -304,6 +304,6 @@ export function resolveFlamegraphSamplesProfileIds(
   profileIds: Profiling.ProfileReference[]
 ): Profiling.ProfileReference[][] {
   return samplesProfiles.map(profileIdIndices => {
-    return profileIdIndices.map(i => profileIds[i]);
+    return profileIdIndices.map(i => profileIds[i]!);
   });
 }
diff --git a/static/app/utils/profiling/renderers/UIFramesRenderer.tsx b/static/app/utils/profiling/renderers/UIFramesRenderer.tsx
index 7439a4db846b16..63180a6de93e92 100644
--- a/static/app/utils/profiling/renderers/UIFramesRenderer.tsx
+++ b/static/app/utils/profiling/renderers/UIFramesRenderer.tsx
@@ -58,7 +58,7 @@ export abstract class UIFramesRenderer {
     const end = upperBound(configSpaceCursor[0], this.uiFrames.frames);
 
     for (let i = 0; i < end; i++) {
-      const frame = this.uiFrames.frames[i];
+      const frame = this.uiFrames.frames[i]!;
       if (configSpaceCursor[0] <= frame.end && configSpaceCursor[0] >= frame.start) {
         overlaps.push(frame);
       }
diff --git a/static/app/utils/profiling/renderers/chartRenderer.tsx b/static/app/utils/profiling/renderers/chartRenderer.tsx
index 0582685a01a1f5..34981b3e55d443 100644
--- a/static/app/utils/profiling/renderers/chartRenderer.tsx
+++ b/static/app/utils/profiling/renderers/chartRenderer.tsx
@@ -51,10 +51,10 @@ function binaryFindNearest(
   if (!serie.points.length) {
     return null;
   }
-  if (target < serie.points[0].x) {
+  if (target < serie.points[0]!.x) {
     return null;
   }
-  if (target > serie.points[serie.points.length - 1].x) {
+  if (target > serie.points[serie.points.length - 1]!.x) {
     return null;
   }
 
@@ -63,7 +63,7 @@ function binaryFindNearest(
 
   while (left <= right) {
     const mid = Math.floor(left + (right - left) / 2);
-    const point = serie.points[mid];
+    const point = serie.points[mid]!;
 
     if (Math.abs(point.x - target) < tolerance) {
       return mid;
@@ -111,18 +111,18 @@ export class FlamegraphChartRenderer {
     const matches: FlamegraphChart['series'] = [];
     for (let i = 0; i < this.chart.series.length; i++) {
       const index = binaryFindNearest(
-        this.chart.series[i],
+        this.chart.series[i]!,
         _configSpaceCursor[0],
         tolerance
       );
 
       if (index !== null) {
         matches.push({
-          name: this.chart.series[i].name,
-          type: this.chart.series[i].type,
-          lineColor: this.chart.series[i].lineColor,
-          fillColor: this.chart.series[i].fillColor,
-          points: [this.chart.series[i].points[index]],
+          name: this.chart.series[i]!.name,
+          type: this.chart.series[i]!.type,
+          lineColor: this.chart.series[i]!.lineColor,
+          fillColor: this.chart.series[i]!.fillColor,
+          points: [this.chart.series[i]!.points[index]!],
         });
       }
     }
@@ -174,11 +174,11 @@ export class FlamegraphChartRenderer {
     // Draw series
     for (let i = 0; i < this.chart.series.length; i++) {
       this.context.lineWidth = 1 * window.devicePixelRatio;
-      this.context.fillStyle = this.chart.series[i].fillColor;
-      this.context.strokeStyle = this.chart.series[i].lineColor;
+      this.context.fillStyle = this.chart.series[i]!.fillColor;
+      this.context.strokeStyle = this.chart.series[i]!.lineColor;
       this.context.lineCap = 'round';
       this.context.beginPath();
-      const serie = this.chart.series[i];
+      const serie = this.chart.series[i]!;
 
       let start = lowerBound(configView.left, serie.points, a => a.x);
       let end = upperBound(configView.right, serie.points, a => a.x);
@@ -194,7 +194,7 @@ export class FlamegraphChartRenderer {
       }
 
       for (let j = start; j < end; j++) {
-        const point = serie.points[j];
+        const point = serie.points[j]!;
 
         const r = vec3.fromValues(point.x, point.y, 1);
         vec3.transformMat3(r, r, configViewToPhysicalSpace);
@@ -211,7 +211,7 @@ export class FlamegraphChartRenderer {
         // this.context.arc(r[0], r[1], 2, 0, 2 * Math.PI);
       }
 
-      if (this.chart.series[i].type === 'line') {
+      if (this.chart.series[i]!.type === 'line') {
         this.context.stroke();
       } else {
         this.context.fill();
@@ -223,8 +223,8 @@ export class FlamegraphChartRenderer {
     this.context.fillStyle = this.theme.COLORS.CHART_LABEL_COLOR;
     let lastIntervalTxt: string | undefined = undefined;
     for (let i = 0; i < intervals.length; i++) {
-      const interval = vec3.fromValues(configView.left, intervals[i], 1);
-      const text = this.chart.formatter(intervals[i]);
+      const interval = vec3.fromValues(configView.left, intervals[i]!, 1);
+      const text = this.chart.formatter(intervals[i]!);
 
       if (text === lastIntervalTxt) {
         continue;
diff --git a/static/app/utils/profiling/renderers/flamegraphRenderer.tsx b/static/app/utils/profiling/renderers/flamegraphRenderer.tsx
index 193ea81a542b0a..6e714cf7784bd9 100644
--- a/static/app/utils/profiling/renderers/flamegraphRenderer.tsx
+++ b/static/app/utils/profiling/renderers/flamegraphRenderer.tsx
@@ -118,7 +118,7 @@ export abstract class FlamegraphRenderer {
 
       // Descend into the rest of the children
       for (let i = 0; i < frame.children.length; i++) {
-        queue.push(frame.children[i]);
+        queue.push(frame.children[i]!);
       }
     }
     return hoveredNode;
diff --git a/static/app/utils/profiling/renderers/flamegraphRenderer2D.tsx b/static/app/utils/profiling/renderers/flamegraphRenderer2D.tsx
index 7b54c8a4dccbad..4521f048cf742e 100644
--- a/static/app/utils/profiling/renderers/flamegraphRenderer2D.tsx
+++ b/static/app/utils/profiling/renderers/flamegraphRenderer2D.tsx
@@ -14,8 +14,8 @@ import {
 import {Rect} from 'sentry/utils/profiling/speedscope';
 
 function colorComponentsToRgba(color: number[]): string {
-  return `rgba(${Math.floor(color[0] * 255)}, ${Math.floor(color[1] * 255)}, ${Math.floor(
-    color[2] * 255
+  return `rgba(${Math.floor(color[0]! * 255)}, ${Math.floor(color[1]! * 255)}, ${Math.floor(
+    color[2]! * 255
   )}, ${color[3] ?? 1})`;
 }
 
@@ -92,7 +92,7 @@ export class FlamegraphRenderer2D extends FlamegraphRenderer {
       );
 
       for (let i = 0; i < frame.children.length; i++) {
-        queue.push(frame.children[i]);
+        queue.push(frame.children[i]!);
       }
     }
   }
diff --git a/static/app/utils/profiling/renderers/flamegraphRendererDOM.tsx b/static/app/utils/profiling/renderers/flamegraphRendererDOM.tsx
index 259e3a8eb355f5..0ae6f8cc815e23 100644
--- a/static/app/utils/profiling/renderers/flamegraphRendererDOM.tsx
+++ b/static/app/utils/profiling/renderers/flamegraphRendererDOM.tsx
@@ -13,8 +13,8 @@ import {Rect} from 'sentry/utils/profiling/speedscope';
 
 // Convert color component from 0-1 to 0-255 range
 function colorComponentsToRgba(color: number[]): string {
-  return `rgba(${Math.floor(color[0] * 255)}, ${Math.floor(color[1] * 255)}, ${Math.floor(
-    color[2] * 255
+  return `rgba(${Math.floor(color[0]! * 255)}, ${Math.floor(color[1]! * 255)}, ${Math.floor(
+    color[2]! * 255
   )}, ${color[3] ?? 1})`;
 }
 
diff --git a/static/app/utils/profiling/renderers/flamegraphRendererWebGL.spec.tsx b/static/app/utils/profiling/renderers/flamegraphRendererWebGL.spec.tsx
index 786fecaf40487a..dcfe808f769bf8 100644
--- a/static/app/utils/profiling/renderers/flamegraphRendererWebGL.spec.tsx
+++ b/static/app/utils/profiling/renderers/flamegraphRendererWebGL.spec.tsx
@@ -153,14 +153,14 @@ describe('flamegraphRendererWebGL', () => {
       theme
     );
 
-    expect(renderer.getColorForFrame(flamegraph.frames[0])).toEqual([
+    expect(renderer.getColorForFrame(flamegraph.frames[0]!)).toEqual([
       0.9625, 0.7125, 0.7125,
     ]);
     expect(
       renderer.getColorForFrame({
         key: 20,
-        frame: flamegraph.frames[0].frame,
-        node: flamegraph.frames[0].node,
+        frame: flamegraph.frames[0]!.frame,
+        node: flamegraph.frames[0]!.node,
         parent: null,
         children: [],
         depth: 0,
diff --git a/static/app/utils/profiling/renderers/flamegraphRendererWebGL.tsx b/static/app/utils/profiling/renderers/flamegraphRendererWebGL.tsx
index 5ce0670d6f2e9e..a6998f2db36255 100644
--- a/static/app/utils/profiling/renderers/flamegraphRendererWebGL.tsx
+++ b/static/app/utils/profiling/renderers/flamegraphRendererWebGL.tsx
@@ -115,7 +115,7 @@ export class FlamegraphRendererWebGL extends FlamegraphRenderer {
     this.searchResults = new Float32Array(FRAME_COUNT * VERTICES_PER_FRAME);
 
     for (let index = 0; index < FRAME_COUNT; index++) {
-      const frame = this.frames[index];
+      const frame = this.frames[index]!;
 
       const x1 = frame.start;
       const x2 = frame.end;
@@ -259,7 +259,6 @@ export class FlamegraphRendererWebGL extends FlamegraphRenderer {
     });
 
     // Use shader program
-    // biome-ignore lint/correctness/useHookAtTopLevel: not a hook
     this.ctx.useProgram(this.program);
 
     // Check if we should draw border - order matters here
@@ -289,7 +288,7 @@ export class FlamegraphRendererWebGL extends FlamegraphRenderer {
 
     for (let i = 0; i < this.frames.length; i++) {
       this.searchResults.set(
-        searchResults.has(getFlamegraphFrameSearchId(this.frames[i]))
+        searchResults.has(getFlamegraphFrameSearchId(this.frames[i]!))
           ? MATCHED_SEARCH_FRAME_ATTRIBUTES
           : UNMATCHED_SEARCH_FRAME_ATTRIBUTES,
         i * 6
diff --git a/static/app/utils/profiling/renderers/flamegraphTextRenderer.spec.tsx b/static/app/utils/profiling/renderers/flamegraphTextRenderer.spec.tsx
index 82829c0c3e0805..e97d7d62b25571 100644
--- a/static/app/utils/profiling/renderers/flamegraphTextRenderer.spec.tsx
+++ b/static/app/utils/profiling/renderers/flamegraphTextRenderer.spec.tsx
@@ -55,7 +55,7 @@ describe('TextRenderer', () => {
     textRenderer.maybeInvalidateCache();
     textRenderer.maybeInvalidateCache();
 
-    expect(textRenderer.textCache.test).toBe(undefined);
+    expect(textRenderer.textCache.test).toBeUndefined();
     expect(textRenderer.textCache).toEqual({
       'Who knows if this changed, font-display: swap wont tell me': {
         width: 20,
diff --git a/static/app/utils/profiling/renderers/flamegraphTextRenderer.tsx b/static/app/utils/profiling/renderers/flamegraphTextRenderer.tsx
index 4b5ee21b55893e..e3f832e7905fed 100644
--- a/static/app/utils/profiling/renderers/flamegraphTextRenderer.tsx
+++ b/static/app/utils/profiling/renderers/flamegraphTextRenderer.tsx
@@ -102,7 +102,7 @@ class FlamegraphTextRenderer extends TextRenderer {
 
       const endChild = upperBound(configView.right, frame.children);
       for (let i = lowerBound(configView.left, frame.children); i < endChild; i++) {
-        frames.push(frame.children[i]);
+        frames.push(frame.children[i]!);
       }
 
       // If a frame is lower than the top, we can skip drawing its text, however
@@ -149,7 +149,7 @@ class FlamegraphTextRenderer extends TextRenderer {
 
           for (let i = 0; i < frameResults.match.length; i++) {
             const highlightedBounds = computeHighlightedBounds(
-              frameResults.match[i],
+              frameResults.match[i]!,
               trim
             );
 
diff --git a/static/app/utils/profiling/renderers/gridRenderer.tsx b/static/app/utils/profiling/renderers/gridRenderer.tsx
index 98e09f97652a5d..c49b495d18d852 100644
--- a/static/app/utils/profiling/renderers/gridRenderer.tsx
+++ b/static/app/utils/profiling/renderers/gridRenderer.tsx
@@ -82,11 +82,11 @@ class GridRenderer {
       for (let i = 0; i < intervals.length; i++) {
         // Compute the x position of our interval from config space to physical
         const physicalIntervalPosition = Math.round(
-          intervals[i] * configViewToPhysicalSpace[0] + configViewToPhysicalSpace[6]
+          intervals[i]! * configViewToPhysicalSpace[0] + configViewToPhysicalSpace[6]
         );
 
         // Format the label text
-        const labelText = this.formatter(intervals[i]);
+        const labelText = this.formatter(intervals[i]!);
 
         this.context.fillStyle = this.theme.COLORS.LABEL_FONT_COLOR;
         // Subtract width of the text and padding so that the text is align to the left of our interval
diff --git a/static/app/utils/profiling/renderers/selectedFrameRenderer.tsx b/static/app/utils/profiling/renderers/selectedFrameRenderer.tsx
index 85fa5bbdc38d0a..1cb9fa26f7d58f 100644
--- a/static/app/utils/profiling/renderers/selectedFrameRenderer.tsx
+++ b/static/app/utils/profiling/renderers/selectedFrameRenderer.tsx
@@ -25,7 +25,7 @@ class SelectedFrameRenderer {
     context.lineWidth = style.BORDER_WIDTH;
 
     for (let i = 0; i < frames.length; i++) {
-      const frameInPhysicalSpace = frames[i].transformRect(configViewToPhysicalSpace);
+      const frameInPhysicalSpace = frames[i]!.transformRect(configViewToPhysicalSpace);
 
       context.beginPath();
 
diff --git a/static/app/utils/profiling/renderers/spansRenderer.tsx b/static/app/utils/profiling/renderers/spansRenderer.tsx
index 7fd4ac6abc935b..eb1f3ffb468f44 100644
--- a/static/app/utils/profiling/renderers/spansRenderer.tsx
+++ b/static/app/utils/profiling/renderers/spansRenderer.tsx
@@ -9,10 +9,10 @@ import {Rect} from 'sentry/utils/profiling/speedscope';
 import {makeSpansColorMapByOpAndDescription} from '../colors/utils';
 
 // Convert color component from 0-1 to 0-255 range
-function colorComponentsToRgba(color: number[]): string {
-  return `rgba(${Math.floor(color[0] * 255)}, ${Math.floor(color[1] * 255)}, ${Math.floor(
-    color[2] * 255
-  )}, ${color[3] ?? 1})`;
+function colorComponentsToRgba(color: number[] | undefined): string {
+  return `rgba(${Math.floor(color?.[0]! * 255)}, ${Math.floor(color?.[1]! * 255)}, ${Math.floor(
+    color?.[2]! * 255
+  )}, ${color?.[3] ?? 1})`;
 }
 
 /**
@@ -143,7 +143,7 @@ export class SpanChartRenderer2D {
 
       // Descend into the rest of the children
       for (let i = 0; i < span.children.length; i++) {
-        queue.push(span.children[i]);
+        queue.push(span.children[i]!);
       }
     }
     return hoveredNode;
@@ -163,7 +163,7 @@ export class SpanChartRenderer2D {
     const spans: SpanChartNode[] = [...this.spanChart.root.children];
 
     for (let i = 0; i < spans.length; i++) {
-      const span = spans[i];
+      const span = spans[i]!;
 
       if (span.end < configView.left || span.start > configView.right) {
         continue;
@@ -174,7 +174,7 @@ export class SpanChartRenderer2D {
       }
 
       for (let j = 0; j < span.children.length; j++) {
-        spans.push(span.children[j]);
+        spans.push(span.children[j]!);
       }
 
       if (span.depth < TOP_BOUNDARY) {
diff --git a/static/app/utils/profiling/renderers/spansTextRenderer.tsx b/static/app/utils/profiling/renderers/spansTextRenderer.tsx
index 96194099acd62c..3b7e589d6531da 100644
--- a/static/app/utils/profiling/renderers/spansTextRenderer.tsx
+++ b/static/app/utils/profiling/renderers/spansTextRenderer.tsx
@@ -100,7 +100,7 @@ class SpansTextRenderer extends TextRenderer {
 
       const endChild = upperBound(configView.right, span.children);
       for (let i = lowerBound(configView.left, span.children); i < endChild; i++) {
-        spans.push(span.children[i]);
+        spans.push(span.children[i]!);
       }
 
       // If a span is lower than the top, we can skip drawing its text, however
@@ -146,7 +146,7 @@ class SpansTextRenderer extends TextRenderer {
           this.context.fillStyle = HIGHLIGHT_BACKGROUND_COLOR;
 
           for (let i = 0; i < frameResults.match.length; i++) {
-            const match = frameResults.match[i];
+            const match = frameResults.match[i]!;
             const highlightedBounds = computeHighlightedBounds(match, trim);
 
             const frontMatter = trim.text.slice(0, highlightedBounds[0]);
diff --git a/static/app/utils/profiling/renderers/uiFramesRendererWebGL.tsx b/static/app/utils/profiling/renderers/uiFramesRendererWebGL.tsx
index 97393cccd41c52..3a9e87eb0f7354 100644
--- a/static/app/utils/profiling/renderers/uiFramesRendererWebGL.tsx
+++ b/static/app/utils/profiling/renderers/uiFramesRendererWebGL.tsx
@@ -84,7 +84,7 @@ class UIFramesRendererWebGL extends UIFramesRenderer {
     this.bounds = new Float32Array(VERTICES_PER_FRAME * BOUNDS * FRAME_COUNT);
 
     for (let index = 0; index < FRAME_COUNT; index++) {
-      const frame = this.uiFrames.frames[index];
+      const frame = this.uiFrames.frames[index]!;
 
       const x1 = frame.start;
       const x2 = frame.end;
@@ -225,7 +225,6 @@ class UIFramesRendererWebGL extends UIFramesRenderer {
     });
 
     // Use shader program
-    // biome-ignore lint/correctness/useHookAtTopLevel: not a hook
     this.ctx.useProgram(this.program);
   }
 
@@ -252,7 +251,6 @@ class UIFramesRendererWebGL extends UIFramesRenderer {
       return;
     }
 
-    // biome-ignore lint/correctness/useHookAtTopLevel: not a hook
     this.ctx.useProgram(this.program);
 
     const projectionMatrix = makeProjectionMatrix(
diff --git a/static/app/utils/profiling/routes.tsx b/static/app/utils/profiling/routes.tsx
index 63c73c4019ee68..61556e6835c1a3 100644
--- a/static/app/utils/profiling/routes.tsx
+++ b/static/app/utils/profiling/routes.tsx
@@ -232,12 +232,12 @@ export function generateProfileRouteFromProfileReference({
 }): LocationDescriptor {
   if (typeof reference === 'string') {
     return generateProfileFlamechartRouteWithHighlightFrame({
-      orgSlug: orgSlug,
-      projectSlug: projectSlug,
+      orgSlug,
+      projectSlug,
       profileId: reference,
-      frameName: frameName,
-      framePackage: framePackage,
-      query: query,
+      frameName,
+      framePackage,
+      query,
     });
   }
 
diff --git a/static/app/utils/profiling/spanChart.spec.tsx b/static/app/utils/profiling/spanChart.spec.tsx
index 73995963495739..1a51cba3bb5358 100644
--- a/static/app/utils/profiling/spanChart.spec.tsx
+++ b/static/app/utils/profiling/spanChart.spec.tsx
@@ -87,10 +87,10 @@ describe('spanChart', () => {
       ]
     );
 
-    expect(tree.root.children[0].children[1].span.span_id).toBe('4');
+    expect(tree.root.children[0]!.children[1]!.span.span_id).toBe('4');
     const chart = new SpanChart(tree);
 
-    chart.forEachSpanOfTree(chart.spanTrees[0], 0, span => {
+    chart.forEachSpanOfTree(chart.spanTrees[0]!, 0, span => {
       if (span.node.span.span_id === '1') {
         expect(span.depth).toBe(1);
       } else if (span.node.span.span_id === '2') {
@@ -236,11 +236,11 @@ describe('spanChart', () => {
     );
 
     const chart = new SpanChart(tree);
-    expect(chart.spans[1].start).toBe(1 * 1e3);
-    expect(chart.spans[1].end).toBe(5 * 1e3);
+    expect(chart.spans[1]!.start).toBe(1 * 1e3);
+    expect(chart.spans[1]!.end).toBe(5 * 1e3);
 
-    expect(chart.spans[2].start).toBe(3 * 1e3);
-    expect(chart.spans[2].end).toBe(4 * 1e3);
+    expect(chart.spans[2]!.start).toBe(3 * 1e3);
+    expect(chart.spans[2]!.end).toBe(4 * 1e3);
   });
 
   it('converts durations to final unit', () => {
@@ -262,9 +262,9 @@ describe('spanChart', () => {
     );
 
     const chart = new SpanChart(tree, {unit: 'nanoseconds'});
-    expect(chart.spans[1].start).toBe(1 * 1e9);
-    expect(chart.spans[1].end).toBe(3 * 1e9);
-    expect(chart.spans[1].duration).toBe(2 * 1e9);
+    expect(chart.spans[1]!.start).toBe(1 * 1e9);
+    expect(chart.spans[1]!.end).toBe(3 * 1e9);
+    expect(chart.spans[1]!.duration).toBe(2 * 1e9);
 
     expect(chart.configSpace.height).toBe(1);
     expect(chart.configSpace.width).toBe(10 * 1e9);
@@ -298,7 +298,7 @@ describe('spanChart', () => {
     );
 
     const chart = new SpanChart(tree);
-    expect(chart.spanTrees.length).toBe(2);
+    expect(chart.spanTrees).toHaveLength(2);
   });
 
   it('creates a new tree from orphaned spans', () => {
@@ -329,11 +329,11 @@ describe('spanChart', () => {
     );
 
     const chart = new SpanChart(tree);
-    expect(chart.spanTrees.length).toBe(2);
+    expect(chart.spanTrees).toHaveLength(2);
 
     // Even though they belong to the same root,
     // the spans are offset visually by the tree height
-    expect(chart.spans[1].depth).toBe(1);
-    expect(chart.spans[2].depth).toBe(2);
+    expect(chart.spans[1]!.depth).toBe(1);
+    expect(chart.spans[2]!.depth).toBe(2);
   });
 });
diff --git a/static/app/utils/profiling/spanChart.tsx b/static/app/utils/profiling/spanChart.tsx
index 2f7a7bf06263e4..c5255118d570e7 100644
--- a/static/app/utils/profiling/spanChart.tsx
+++ b/static/app/utils/profiling/spanChart.tsx
@@ -207,7 +207,7 @@ class SpanChart {
     };
 
     for (let i = 0; i < this.spanTrees.length; i++) {
-      depth += this.forEachSpanOfTree(this.spanTrees[i], depth, visit);
+      depth += this.forEachSpanOfTree(this.spanTrees[i]!, depth, visit);
     }
 
     return nodes;
diff --git a/static/app/utils/profiling/spanTree.spec.tsx b/static/app/utils/profiling/spanTree.spec.tsx
index 34c8e157afc6b3..d5d3124f8318f8 100644
--- a/static/app/utils/profiling/spanTree.spec.tsx
+++ b/static/app/utils/profiling/spanTree.spec.tsx
@@ -83,9 +83,9 @@ describe('SpanTree', () => {
         }),
       ]
     );
-    expect(tree.orphanedSpans.length).toBe(0);
-    expect(tree.root.children[0].span.span_id).toBe('1');
-    expect(tree.root.children[0].children[0].span.span_id).toBe('2');
+    expect(tree.orphanedSpans).toHaveLength(0);
+    expect(tree.root.children[0]!.span.span_id).toBe('1');
+    expect(tree.root.children[0]!.children[0]!.span.span_id).toBe('2');
   });
 
   it('checks for span overlaps that contains span', () => {
@@ -119,10 +119,10 @@ describe('SpanTree', () => {
       ]
     );
 
-    expect(tree.orphanedSpans.length).toBe(1);
-    expect(tree.root.children[0].span.span_id).toBe('1');
-    expect(tree.root.children[0].children[0].span.span_id).toBe('2');
-    expect(tree.root.children[0].children[1]).toBe(undefined);
+    expect(tree.orphanedSpans).toHaveLength(1);
+    expect(tree.root.children[0]!.span.span_id).toBe('1');
+    expect(tree.root.children[0]!.children[0]!.span.span_id).toBe('2');
+    expect(tree.root.children[0]!.children[1]).toBeUndefined();
   });
 
   it('creates missing instrumentation node', () => {
@@ -149,10 +149,10 @@ describe('SpanTree', () => {
         }),
       ]
     );
-    expect(tree.orphanedSpans.length).toBe(0);
-    expect(tree.root.children[0].span.span_id).toBe('1');
-    expect(tree.root.children[1].span.op).toBe('missing span instrumentation');
-    expect(tree.root.children[2].span.span_id).toBe('2');
+    expect(tree.orphanedSpans).toHaveLength(0);
+    expect(tree.root.children[0]!.span.span_id).toBe('1');
+    expect(tree.root.children[1]!.span.op).toBe('missing span instrumentation');
+    expect(tree.root.children[2]!.span.span_id).toBe('2');
   });
 
   it('does not create missing instrumentation if elapsed < threshold', () => {
@@ -180,8 +180,8 @@ describe('SpanTree', () => {
         }),
       ]
     );
-    expect(tree.root.children[0].span.span_id).toBe('1');
-    expect(tree.root.children[1].span.span_id).toBe('2');
+    expect(tree.root.children[0]!.span.span_id).toBe('1');
+    expect(tree.root.children[1]!.span.span_id).toBe('2');
   });
 
   it('pushes consecutive span', () => {
@@ -209,9 +209,9 @@ describe('SpanTree', () => {
       ]
     );
 
-    expect(tree.orphanedSpans.length).toBe(0);
-    expect(tree.root.children[0].span.span_id).toBe('1');
-    expect(tree.root.children[1].span.span_id).toBe('2');
+    expect(tree.orphanedSpans).toHaveLength(0);
+    expect(tree.root.children[0]!.span.span_id).toBe('1');
+    expect(tree.root.children[1]!.span.span_id).toBe('2');
   });
   it('marks span as orphaned if parent_id does not match', () => {
     const tree = new SpanTree(
@@ -231,6 +231,6 @@ describe('SpanTree', () => {
         }),
       ]
     );
-    expect(tree.orphanedSpans[0].span_id).toBe('2');
+    expect(tree.orphanedSpans[0]!.span_id).toBe('2');
   });
 });
diff --git a/static/app/utils/profiling/spanTree.tsx b/static/app/utils/profiling/spanTree.tsx
index 1df04bb9002f91..779ec4ca8eea91 100644
--- a/static/app/utils/profiling/spanTree.tsx
+++ b/static/app/utils/profiling/spanTree.tsx
@@ -115,13 +115,13 @@ class SpanTree {
     const MISSING_INSTRUMENTATION_THRESHOLD_S = 0.1;
 
     for (let i = 0; i < spansSortedByStartTime.length; i++) {
-      const span = spansSortedByStartTime[i];
+      const span = spansSortedByStartTime[i]!;
       let parent = this.root;
 
       while (parent.contains(span)) {
         let nextParent: SpanTreeNode | null = null;
         for (let j = 0; j < parent.children.length; j++) {
-          const child = parent.children[j];
+          const child = parent.children[j]!;
           if (child.span.op !== 'missing instrumentation' && child.contains(span)) {
             nextParent = child;
             break;
@@ -142,7 +142,7 @@ class SpanTree {
           this.injectMissingInstrumentationSpans &&
           parent.children.length > 0 &&
           span.start_timestamp -
-            parent.children[parent.children.length - 1].span.timestamp >
+            parent.children[parent.children.length - 1]!.span.timestamp >
             MISSING_INSTRUMENTATION_THRESHOLD_S
         ) {
           parent.children.push(
@@ -151,7 +151,7 @@ class SpanTree {
                 description: t('Missing span instrumentation'),
                 op: 'missing span instrumentation',
                 start_timestamp:
-                  parent.children[parent.children.length - 1].span.timestamp,
+                  parent.children[parent.children.length - 1]!.span.timestamp,
                 timestamp: span.start_timestamp,
                 span_id: uuid4(),
                 data: {},
@@ -165,7 +165,7 @@ class SpanTree {
         let foundOverlap = false;
         let start = parent.children.length - 1;
         while (start >= 0) {
-          const child = parent.children[start];
+          const child = parent.children[start]!;
           if (span.start_timestamp < child.span.timestamp) {
             foundOverlap = true;
             break;
diff --git a/static/app/utils/profiling/speedscope.tsx b/static/app/utils/profiling/speedscope.tsx
index 93187ffefee060..35e57fe1612b10 100644
--- a/static/app/utils/profiling/speedscope.tsx
+++ b/static/app/utils/profiling/speedscope.tsx
@@ -305,7 +305,6 @@ export function findRangeBinarySearch(
   target: number,
   precision = 1
 ): [number, number] {
-  // eslint-disable-next-line
   while (true) {
     if (high - low <= precision) {
       return [low, high];
diff --git a/static/app/utils/profiling/uiFrames.spec.tsx b/static/app/utils/profiling/uiFrames.spec.tsx
index 45265fdeb15418..fa67d2ebfdceb6 100644
--- a/static/app/utils/profiling/uiFrames.spec.tsx
+++ b/static/app/utils/profiling/uiFrames.spec.tsx
@@ -18,7 +18,7 @@ describe('UIFrames', () => {
       }
     );
 
-    expect(tree.frames[0].duration).toBe(tree.frames[1].duration);
+    expect(tree.frames[0]!.duration).toBe(tree.frames[1]!.duration);
   });
 
   it.each([
diff --git a/static/app/utils/profiling/uiFrames.tsx b/static/app/utils/profiling/uiFrames.tsx
index d77bc9ad3e2e7d..cff8fa78554a65 100644
--- a/static/app/utils/profiling/uiFrames.tsx
+++ b/static/app/utils/profiling/uiFrames.tsx
@@ -86,8 +86,8 @@ class UIFrames {
         ? 'frozen'
         : !frozenFramesQueue.length
           ? 'slow'
-          : slowFramesQueue[0].elapsed - slowFramesQueue[0].value <
-              frozenFramesQueue[0].elapsed - frozenFramesQueue[0].value
+          : slowFramesQueue[0]!.elapsed - slowFramesQueue[0]!.value <
+              frozenFramesQueue[0]!.elapsed - frozenFramesQueue[0]!.value
             ? 'slow'
             : 'frozen';
 
diff --git a/static/app/utils/project/useSelectedProjectsHaveField.tsx b/static/app/utils/project/useSelectedProjectsHaveField.tsx
index b46537f3947e95..484f1d052ade1e 100644
--- a/static/app/utils/project/useSelectedProjectsHaveField.tsx
+++ b/static/app/utils/project/useSelectedProjectsHaveField.tsx
@@ -27,7 +27,7 @@ export default function useSelectedProjectsHaveField(field: keyof Project) {
 
   const hasField = useMemo(() => {
     const selectedProjects = getSelectedProjectList(selection.projects, projects);
-    const hasSetupOneFeedback = selectedProjects.some(project => project[field]);
+    const hasSetupOneFeedback = selectedProjects.some(project => project![field]);
     return hasSetupOneFeedback;
   }, [field, selection.projects, projects]);
 
diff --git a/static/app/utils/projects.tsx b/static/app/utils/projects.tsx
index e7df3a39738045..78c646d195801c 100644
--- a/static/app/utils/projects.tsx
+++ b/static/app/utils/projects.tsx
@@ -515,8 +515,8 @@ async function fetchProjects(
     const paginationObject = parseLinkHeader(pageLinks);
     hasMore =
       paginationObject &&
-      (paginationObject.next.results || paginationObject.previous.results);
-    nextCursor = paginationObject.next.cursor;
+      (paginationObject.next!.results || paginationObject.previous!.results);
+    nextCursor = paginationObject.next!.cursor;
   }
 
   // populate the projects store if all projects were fetched
diff --git a/static/app/utils/queryClient.tsx b/static/app/utils/queryClient.tsx
index 370e79e925bd6b..7f04f2f9c1cce9 100644
--- a/static/app/utils/queryClient.tsx
+++ b/static/app/utils/queryClient.tsx
@@ -329,5 +329,4 @@ export function fetchMutation(api: Client) {
   };
 }
 
-// eslint-disable-next-line import/export
 export * from '@tanstack/react-query';
diff --git a/static/app/utils/queryString.spec.tsx b/static/app/utils/queryString.spec.tsx
index 6cbcd25622d8d6..c8233eb757b5d5 100644
--- a/static/app/utils/queryString.spec.tsx
+++ b/static/app/utils/queryString.spec.tsx
@@ -33,46 +33,46 @@ describe('addQueryParamsToExistingUrl', function () {
 describe('appendTagCondition', function () {
   it('adds simple values', function () {
     const result = utils.appendTagCondition('error+text', 'color', 'red');
-    expect(result).toEqual('error+text color:red');
+    expect(result).toBe('error+text color:red');
   });
 
   it('handles array current value', function () {
     const result = utils.appendTagCondition(['', 'thing'], 'color', 'red');
-    expect(result).toEqual('thing color:red');
+    expect(result).toBe('thing color:red');
   });
 
   it('handles empty string current value', function () {
     const result = utils.appendTagCondition('', 'color', 'red');
-    expect(result).toEqual('color:red');
+    expect(result).toBe('color:red');
   });
 
   it('handles null current value', function () {
     const result = utils.appendTagCondition(null, 'color', 'red');
-    expect(result).toEqual('color:red');
+    expect(result).toBe('color:red');
   });
 
   it('wraps values with spaces', function () {
     const result = utils.appendTagCondition(null, 'color', 'purple red');
-    expect(result).toEqual('color:"purple red"');
+    expect(result).toBe('color:"purple red"');
   });
 
   it('wraps values with colon', function () {
     const result = utils.appendTagCondition(null, 'color', 'id:red');
-    expect(result).toEqual('color:"id:red"');
+    expect(result).toBe('color:"id:red"');
   });
 
   it('handles user tag values', function () {
     let result = utils.appendTagCondition('', 'user', 'something');
-    expect(result).toEqual('user:something');
+    expect(result).toBe('user:something');
 
     result = utils.appendTagCondition('', 'user', 'id:1');
-    expect(result).toEqual('user:"id:1"');
+    expect(result).toBe('user:"id:1"');
 
     result = utils.appendTagCondition('', 'user', 'email:foo@example.com');
-    expect(result).toEqual('user:"email:foo@example.com"');
+    expect(result).toBe('user:"email:foo@example.com"');
 
     result = utils.appendTagCondition('', 'user', 'name:jill jones');
-    expect(result).toEqual('user:"name:jill jones"');
+    expect(result).toBe('user:"name:jill jones"');
   });
 });
 
@@ -83,7 +83,7 @@ describe('appendExcludeTagValuesCondition', function () {
       'blue',
       'green',
     ]);
-    expect(result).toEqual('!color:[red, blue, green]');
+    expect(result).toBe('!color:[red, blue, green]');
   });
   it('excludes tag values on an existing query', function () {
     const result = utils.appendExcludeTagValuesCondition('user.id:123', 'color', [
@@ -91,7 +91,7 @@ describe('appendExcludeTagValuesCondition', function () {
       'blue',
       'green',
     ]);
-    expect(result).toEqual('user.id:123 !color:[red, blue, green]');
+    expect(result).toBe('user.id:123 !color:[red, blue, green]');
   });
   it('wraps double quotes when a space exists in the tag value', function () {
     const result = utils.appendExcludeTagValuesCondition(null, 'color', [
@@ -100,17 +100,17 @@ describe('appendExcludeTagValuesCondition', function () {
       '"green"',
       '"sky blue"',
     ]);
-    expect(result).toEqual('!color:[red, "ocean blue", "\\"green\\"", "\\"sky blue\\""]');
+    expect(result).toBe('!color:[red, "ocean blue", "\\"green\\"", "\\"sky blue\\""]');
   });
 });
 
 describe('decodeScalar()', function () {
   it('unwraps array values', function () {
-    expect(utils.decodeScalar(['one', 'two'])).toEqual('one');
+    expect(utils.decodeScalar(['one', 'two'])).toBe('one');
   });
 
   it('handles strings', function () {
-    expect(utils.decodeScalar('one')).toEqual('one');
+    expect(utils.decodeScalar('one')).toBe('one');
   });
 
   it('handles falsey values', function () {
@@ -121,11 +121,11 @@ describe('decodeScalar()', function () {
   });
 
   it('uses fallback values', function () {
-    expect(utils.decodeScalar('value', 'default')).toEqual('value');
-    expect(utils.decodeScalar('', 'default')).toEqual('default');
-    expect(utils.decodeScalar(null, 'default')).toEqual('default');
-    expect(utils.decodeScalar(undefined, 'default')).toEqual('default');
-    expect(utils.decodeScalar([], 'default')).toEqual('default');
+    expect(utils.decodeScalar('value', 'default')).toBe('value');
+    expect(utils.decodeScalar('', 'default')).toBe('default');
+    expect(utils.decodeScalar(null, 'default')).toBe('default');
+    expect(utils.decodeScalar(undefined, 'default')).toBe('default');
+    expect(utils.decodeScalar([], 'default')).toBe('default');
   });
 });
 
@@ -148,26 +148,26 @@ describe('decodeList()', function () {
 
 describe('decodeInteger()', function () {
   it('handles integer strings', function () {
-    expect(utils.decodeInteger('1')).toEqual(1);
-    expect(utils.decodeInteger('1.2')).toEqual(1);
-    expect(utils.decodeInteger('1.9')).toEqual(1);
-    expect(utils.decodeInteger('foo')).toEqual(undefined);
-    expect(utils.decodeInteger('foo', 2020)).toEqual(2020);
+    expect(utils.decodeInteger('1')).toBe(1);
+    expect(utils.decodeInteger('1.2')).toBe(1);
+    expect(utils.decodeInteger('1.9')).toBe(1);
+    expect(utils.decodeInteger('foo')).toBeUndefined();
+    expect(utils.decodeInteger('foo', 2020)).toBe(2020);
   });
 
   it('handles arrays', function () {
-    expect(utils.decodeInteger(['1', 'foo'])).toEqual(1);
-    expect(utils.decodeInteger(['1.2', 'foo'])).toEqual(1);
-    expect(utils.decodeInteger(['1.9', 'foo'])).toEqual(1);
-    expect(utils.decodeInteger(['foo', '1'])).toEqual(undefined);
-    expect(utils.decodeInteger(['foo'], 2020)).toEqual(2020);
+    expect(utils.decodeInteger(['1', 'foo'])).toBe(1);
+    expect(utils.decodeInteger(['1.2', 'foo'])).toBe(1);
+    expect(utils.decodeInteger(['1.9', 'foo'])).toBe(1);
+    expect(utils.decodeInteger(['foo', '1'])).toBeUndefined();
+    expect(utils.decodeInteger(['foo'], 2020)).toBe(2020);
   });
 
   it('handles falsey values', function () {
-    expect(utils.decodeInteger(undefined, 2020)).toEqual(2020);
+    expect(utils.decodeInteger(undefined, 2020)).toBe(2020);
     // @ts-expect-error
-    expect(utils.decodeInteger(false, 2020)).toEqual(2020);
-    expect(utils.decodeInteger('', 2020)).toEqual(2020);
+    expect(utils.decodeInteger(false, 2020)).toBe(2020);
+    expect(utils.decodeInteger('', 2020)).toBe(2020);
   });
 });
 
@@ -210,10 +210,10 @@ describe('decodeSorts', () => {
 
 describe('decodeBoolean', function () {
   it('handles boolean strings', function () {
-    expect(utils.decodeBoolean('true')).toEqual(true);
-    expect(utils.decodeBoolean('false')).toEqual(false);
-    expect(utils.decodeBoolean('foo')).toEqual(undefined);
-    expect(utils.decodeBoolean('foo', true)).toEqual(true);
-    expect(utils.decodeBoolean('foo', false)).toEqual(false);
+    expect(utils.decodeBoolean('true')).toBe(true);
+    expect(utils.decodeBoolean('false')).toBe(false);
+    expect(utils.decodeBoolean('foo')).toBeUndefined();
+    expect(utils.decodeBoolean('foo', true)).toBe(true);
+    expect(utils.decodeBoolean('foo', false)).toBe(false);
   });
 });
diff --git a/static/app/utils/reactRouter6Compat/location.tsx b/static/app/utils/reactRouter6Compat/location.tsx
index 8357c007c1bf52..76fe29df469ab9 100644
--- a/static/app/utils/reactRouter6Compat/location.tsx
+++ b/static/app/utils/reactRouter6Compat/location.tsx
@@ -52,9 +52,9 @@ export function locationDescriptorToTo(path: LocationDescriptor): To {
     to.pathname = pathname;
 
     if (query) {
-      query = {...query, ...qs.parse(search)};
+      query = {...query, ...qs.parse(search!)};
     } else {
-      query = qs.parse(search);
+      query = qs.parse(search!);
     }
   }
 
@@ -86,10 +86,10 @@ export function location6ToLocation3<Q extends Query = DefaultQuery>(
   const {pathname, search, hash, state, key} = location;
 
   return {
-    pathname: pathname,
-    search: search,
+    pathname,
+    search,
     query: qs.parse(search) as Q,
-    hash: hash,
+    hash,
     state,
     key,
 
diff --git a/static/app/utils/recreateRoute.spec.tsx b/static/app/utils/recreateRoute.spec.tsx
index bafe0dea5b3b5f..54c4f4889d267b 100644
--- a/static/app/utils/recreateRoute.spec.tsx
+++ b/static/app/utils/recreateRoute.spec.tsx
@@ -34,17 +34,17 @@ const location = {
 
 describe('recreateRoute', function () {
   it('returns correct path to a route object', function () {
-    expect(recreateRoute(routes[0], {routes, params})).toBe('/');
-    expect(recreateRoute(routes[1], {routes, params})).toBe('/');
-    expect(recreateRoute(routes[2], {routes, params})).toBe('/settings/');
-    expect(recreateRoute(routes[3], {routes, params})).toBe('/settings/org-slug/');
-    expect(recreateRoute(routes[4], {routes, params})).toBe('/settings/org-slug/');
-    expect(recreateRoute(routes[5], {routes, params})).toBe(
+    expect(recreateRoute(routes[0]!, {routes, params})).toBe('/');
+    expect(recreateRoute(routes[1]!, {routes, params})).toBe('/');
+    expect(recreateRoute(routes[2]!, {routes, params})).toBe('/settings/');
+    expect(recreateRoute(routes[3]!, {routes, params})).toBe('/settings/org-slug/');
+    expect(recreateRoute(routes[4]!, {routes, params})).toBe('/settings/org-slug/');
+    expect(recreateRoute(routes[5]!, {routes, params})).toBe(
       '/settings/org-slug/api-keys/'
     );
 
     expect(
-      recreateRoute(projectRoutes[5], {routes: projectRoutes, location, params})
+      recreateRoute(projectRoutes[5]!, {routes: projectRoutes, location, params})
     ).toBe('/settings/org-slug/project-slug/alerts/');
   });
 
@@ -61,7 +61,7 @@ describe('recreateRoute', function () {
       {path: 'api-keys/', name: 'API Key'},
     ];
 
-    expect(recreateRoute(r[4], {routes: r, params})).toBe('/foo/bar/');
+    expect(recreateRoute(r[4]!, {routes: r, params})).toBe('/foo/bar/');
   });
 
   it('returns correct path to a string (at the end of the routes)', function () {
@@ -77,9 +77,9 @@ describe('recreateRoute', function () {
   });
 
   it('switches to new org but keeps current route', function () {
-    expect(recreateRoute(routes[5], {routes, location, params: {orgId: 'new-org'}})).toBe(
-      '/settings/new-org/api-keys/'
-    );
+    expect(
+      recreateRoute(routes[5]!, {routes, location, params: {orgId: 'new-org'}})
+    ).toBe('/settings/new-org/api-keys/');
   });
 
   it('maintains the query string', function () {
@@ -88,7 +88,7 @@ describe('recreateRoute', function () {
       search: '?key1=foo&key2=bar',
     };
 
-    expect(recreateRoute(routes[5], {routes, params, location: withSearch})).toBe(
+    expect(recreateRoute(routes[5]!, {routes, params, location: withSearch})).toBe(
       '/settings/org-slug/api-keys/?key1=foo&key2=bar'
     );
   });
diff --git a/static/app/utils/removeBodyTheme.tsx b/static/app/utils/removeBodyTheme.tsx
new file mode 100644
index 00000000000000..b8895032bbea96
--- /dev/null
+++ b/static/app/utils/removeBodyTheme.tsx
@@ -0,0 +1,9 @@
+/**
+ * Removes any theme class from the body element.
+ *
+ * These classes are added in base-react.html to avoid white flash when
+ * the page loads in dark mode before the react app is bootstrapped.
+ */
+export const removeBodyTheme = (): void => {
+  document.body.classList.remove('theme-light', 'theme-dark', 'theme-system');
+};
diff --git a/static/app/utils/replayCount/useReplayCount.spec.tsx b/static/app/utils/replayCount/useReplayCount.spec.tsx
index 13189213ecfcee..8a2095d9bd492d 100644
--- a/static/app/utils/replayCount/useReplayCount.spec.tsx
+++ b/static/app/utils/replayCount/useReplayCount.spec.tsx
@@ -41,9 +41,9 @@ describe('useReplayCount', () => {
         initialProps,
       });
 
-      expect(result.current.getOne('1111')).toBe(undefined);
-      expect(result.current.getOne('2222')).toBe(undefined);
-      expect(result.current.getOne('3333')).toBe(undefined);
+      expect(result.current.getOne('1111')).toBeUndefined();
+      expect(result.current.getOne('2222')).toBeUndefined();
+      expect(result.current.getOne('3333')).toBeUndefined();
       expect(result.current.hasOne('1111')).toBeFalsy();
       expect(result.current.hasOne('2222')).toBeFalsy();
       expect(result.current.hasOne('3333')).toBeFalsy();
@@ -77,8 +77,8 @@ describe('useReplayCount', () => {
         initialProps,
       });
 
-      expect(result.current.getOne('1111')).toBe(undefined);
-      expect(result.current.getOne('2222')).toBe(undefined);
+      expect(result.current.getOne('1111')).toBeUndefined();
+      expect(result.current.getOne('2222')).toBeUndefined();
       expect(result.current.hasOne('1111')).toBeFalsy();
       expect(result.current.hasOne('2222')).toBeFalsy();
 
diff --git a/static/app/utils/replays/extractDomNodes.tsx b/static/app/utils/replays/extractDomNodes.tsx
index 2c6b74ee7bbaf1..b110d87759ee08 100644
--- a/static/app/utils/replays/extractDomNodes.tsx
+++ b/static/app/utils/replays/extractDomNodes.tsx
@@ -92,7 +92,7 @@ function extractSelector(node: Node): string | null {
 
 function removeChildLevel(max: number, collection: HTMLCollection, current: number = 0) {
   for (let i = 0; i < collection.length; i++) {
-    const child = collection[i];
+    const child = collection[i]!;
     if (child.nodeName === 'STYLE') {
       child.textContent = '/* Inline CSS */';
     }
diff --git a/static/app/utils/replays/fetchReplayList.tsx b/static/app/utils/replays/fetchReplayList.tsx
index a19d766f3110f3..796c6b9c4c3697 100644
--- a/static/app/utils/replays/fetchReplayList.tsx
+++ b/static/app/utils/replays/fetchReplayList.tsx
@@ -46,7 +46,7 @@ async function fetchReplayList({
 
     // HACK!!! Because the sort field needs to be in the eventView, but I cannot
     // ask the server for compound fields like `os.name`.
-    payload.field = payload.field.map(field => field.split('.')[0]);
+    payload.field = payload.field.map(field => field.split('.')[0]!);
     if (perPage) {
       payload.per_page = perPage;
     }
diff --git a/static/app/utils/replays/getCurrentScreenName.spec.tsx b/static/app/utils/replays/getCurrentScreenName.spec.tsx
index 3def027299a878..ce19f31e6f99ce 100644
--- a/static/app/utils/replays/getCurrentScreenName.spec.tsx
+++ b/static/app/utils/replays/getCurrentScreenName.spec.tsx
@@ -5,6 +5,7 @@ import getCurrentScreenName from 'sentry/utils/replays/getCurrentScreenName';
 import hydrateBreadcrumbs, {
   replayInitBreadcrumb,
 } from 'sentry/utils/replays/hydrateBreadcrumbs';
+import type {BreadcrumbFrame} from 'sentry/utils/replays/types';
 
 const START_DATE = new Date('2022-06-15T00:40:00.111Z');
 const NAVIGATION_DATE_1 = new Date('2022-06-15T00:46:00.333Z');
@@ -31,7 +32,7 @@ const [NAV_FRAME_1, NAV_FRAME_2] = hydrateBreadcrumbs(replayRecord, [
 
 describe('getCurrentScreenName', () => {
   it('should return the screen name based on the closest navigation crumb', () => {
-    const frames = [PAGELOAD_FRAME, NAV_FRAME_1, NAV_FRAME_2];
+    const frames = [PAGELOAD_FRAME, NAV_FRAME_1, NAV_FRAME_2] as BreadcrumbFrame[];
 
     const offsetMS = 0; // at the beginning
     const screenName = getCurrentScreenName(
diff --git a/static/app/utils/replays/getCurrentUrl.spec.tsx b/static/app/utils/replays/getCurrentUrl.spec.tsx
index 9a3a37feee76c3..7434c9a609d596 100644
--- a/static/app/utils/replays/getCurrentUrl.spec.tsx
+++ b/static/app/utils/replays/getCurrentUrl.spec.tsx
@@ -7,6 +7,7 @@ import {ReplayRecordFixture} from 'sentry-fixture/replayRecord';
 import getCurrentUrl from 'sentry/utils/replays/getCurrentUrl';
 import {replayInitBreadcrumb} from 'sentry/utils/replays/hydrateBreadcrumbs';
 import hydrateSpans from 'sentry/utils/replays/hydrateSpans';
+import type {SpanFrame} from 'sentry/utils/replays/types';
 
 const START_DATE = new Date('2022-06-15T00:40:00.111Z');
 const NAVIGATION_DATE = new Date('2022-06-15T00:46:00.333Z');
@@ -32,7 +33,7 @@ const [NAV_FRAME, NEW_DOMAIN_FRAME] = hydrateSpans(replayRecord, [
     startTimestamp: NEW_DOMAIN_DATE,
     endTimestamp: NEW_DOMAIN_DATE,
   }),
-]);
+]) as [SpanFrame, SpanFrame];
 
 describe('getCurrentUrl', () => {
   it('should return the origin of the first url from the url array if the offset is early', () => {
diff --git a/static/app/utils/replays/getDiffTimestamps.spec.tsx b/static/app/utils/replays/getDiffTimestamps.spec.tsx
index eb55d62b484af2..aef32fdac9fd73 100644
--- a/static/app/utils/replays/getDiffTimestamps.spec.tsx
+++ b/static/app/utils/replays/getDiffTimestamps.spec.tsx
@@ -102,7 +102,7 @@ function getMockReplayWithCrumbFrame(
     attachments,
   });
 
-  invariant(isHydrationErrorFrame(hydrationErrorFrame), '');
+  invariant(isHydrationErrorFrame(hydrationErrorFrame!), '');
   return {hydrationErrorFrame, replay};
 }
 
diff --git a/static/app/utils/replays/getFrameDetails.tsx b/static/app/utils/replays/getFrameDetails.tsx
index 60c2f18baca963..161507504b2bea 100644
--- a/static/app/utils/replays/getFrameDetails.tsx
+++ b/static/app/utils/replays/getFrameDetails.tsx
@@ -43,6 +43,7 @@ import type {
   RawBreadcrumbFrame,
   ReplayFrame,
   SlowClickFrame,
+  SwipeFrame,
   TapFrame,
   WebVitalFrame,
 } from 'sentry/utils/replays/types';
@@ -203,6 +204,13 @@ const MAPPER_FOR_FRAME: Record<string, (frame) => Details> = {
     title: 'User Click',
     icon: <IconCursorArrow size="xs" />,
   }),
+  'ui.swipe': (frame: SwipeFrame) => ({
+    color: 'blue400',
+    description: frame.data,
+    tabKey: TabKey.BREADCRUMBS,
+    title: 'User Swipe',
+    icon: <IconTap size="xs" />,
+  }),
   'ui.tap': (frame: TapFrame) => ({
     color: 'purple400',
     description: frame.message,
diff --git a/static/app/utils/replays/getReplayEvent.spec.tsx b/static/app/utils/replays/getReplayEvent.spec.tsx
index 9e20b41502c065..64432a2d509d14 100644
--- a/static/app/utils/replays/getReplayEvent.spec.tsx
+++ b/static/app/utils/replays/getReplayEvent.spec.tsx
@@ -35,7 +35,7 @@ const frames = hydrateBreadcrumbs(
   ]
 );
 
-const CURRENT_OFFSET_MS = frames[0].offsetMs + 15000;
+const CURRENT_OFFSET_MS = frames[0]!.offsetMs + 15000;
 
 describe('getNextReplayFrame', () => {
   it('should return the next crumb', () => {
@@ -50,7 +50,7 @@ describe('getNextReplayFrame', () => {
   it('should return the next crumb when the list is not sorted', () => {
     const [one, two, three, four, five] = frames;
     const result = getNextReplayFrame({
-      frames: [one, four, five, three, two],
+      frames: [one!, four!, five!, three!, two!],
       targetOffsetMs: CURRENT_OFFSET_MS,
     });
 
@@ -85,7 +85,7 @@ describe('getNextReplayFrame', () => {
   });
 
   it('should return the next frame when a timestamp exactly matches', () => {
-    const exactTime = frames[1].offsetMs;
+    const exactTime = frames[1]!.offsetMs;
     const result = getNextReplayFrame({
       frames,
       targetOffsetMs: exactTime,
@@ -96,7 +96,7 @@ describe('getNextReplayFrame', () => {
   });
 
   it('should return the same frame if timestamps exactly match and allowMatch is enabled', () => {
-    const exactTime = frames[1].offsetMs;
+    const exactTime = frames[1]!.offsetMs;
     const result = getNextReplayFrame({
       frames,
       targetOffsetMs: exactTime,
@@ -120,7 +120,7 @@ describe('getPrevReplayFrame', () => {
   it('should return the previous crumb when the list is not sorted', () => {
     const [one, two, three, four, five] = frames;
     const result = getPrevReplayFrame({
-      frames: [one, four, five, three, two],
+      frames: [one!, four!, five!, three!, two!],
       targetOffsetMs: CURRENT_OFFSET_MS,
     });
 
@@ -155,7 +155,7 @@ describe('getPrevReplayFrame', () => {
   });
 
   it('should return the prev frame if timestamp exactly matches', () => {
-    const exactTime = frames[1].offsetMs;
+    const exactTime = frames[1]!.offsetMs;
     const result = getPrevReplayFrame({
       frames,
       targetOffsetMs: exactTime,
@@ -166,7 +166,7 @@ describe('getPrevReplayFrame', () => {
   });
 
   it('should return the same frame if timestamps exactly match and allowExact is enabled', () => {
-    const exactTime = frames[1].offsetMs;
+    const exactTime = frames[1]!.offsetMs;
     const result = getPrevReplayFrame({
       frames,
       targetOffsetMs: exactTime,
diff --git a/static/app/utils/replays/hooks/useActiveReplayTab.spec.tsx b/static/app/utils/replays/hooks/useActiveReplayTab.spec.tsx
index 8ec6b8f95f6744..e2f30938a70594 100644
--- a/static/app/utils/replays/hooks/useActiveReplayTab.spec.tsx
+++ b/static/app/utils/replays/hooks/useActiveReplayTab.spec.tsx
@@ -5,8 +5,6 @@ import {renderHook} from 'sentry-test/reactTestingLibrary';
 import {browserHistory} from 'sentry/utils/browserHistory';
 import useActiveReplayTab, {TabKey} from 'sentry/utils/replays/hooks/useActiveReplayTab';
 
-const mockPush = jest.mocked(browserHistory.push);
-
 function mockLocation(query: string = '') {
   window.location.search = qs.stringify({query});
 }
@@ -14,13 +12,10 @@ function mockLocation(query: string = '') {
 describe('useActiveReplayTab', () => {
   beforeEach(() => {
     mockLocation();
-    mockPush.mockReset();
   });
 
   it('should use Breadcrumbs as a default', () => {
-    const {result} = renderHook(useActiveReplayTab, {
-      initialProps: {},
-    });
+    const {result} = renderHook(useActiveReplayTab, {initialProps: {}});
 
     expect(result.current.getActiveTab()).toBe(TabKey.BREADCRUMBS);
   });
@@ -42,7 +37,7 @@ describe('useActiveReplayTab', () => {
     expect(result.current.getActiveTab()).toBe(TabKey.BREADCRUMBS);
 
     result.current.setActiveTab('nEtWoRk');
-    expect(mockPush).toHaveBeenLastCalledWith({
+    expect(browserHistory.push).toHaveBeenLastCalledWith({
       pathname: '/',
       state: undefined,
       query: {query: '', t_main: TabKey.NETWORK},
@@ -56,7 +51,7 @@ describe('useActiveReplayTab', () => {
     expect(result.current.getActiveTab()).toBe(TabKey.BREADCRUMBS);
 
     result.current.setActiveTab('foo bar');
-    expect(mockPush).toHaveBeenLastCalledWith({
+    expect(browserHistory.push).toHaveBeenLastCalledWith({
       pathname: '/',
       query: {query: '', t_main: TabKey.BREADCRUMBS},
     });
diff --git a/static/app/utils/replays/hooks/useExtractDiffMutations.tsx b/static/app/utils/replays/hooks/useExtractDiffMutations.tsx
index 6cf8e68caa527e..340a1c178c6948 100644
--- a/static/app/utils/replays/hooks/useExtractDiffMutations.tsx
+++ b/static/app/utils/replays/hooks/useExtractDiffMutations.tsx
@@ -102,8 +102,8 @@ async function extractDiffMutations({
 
         const item = collection.get(lastFrame);
         if (item) {
-          item[lastFrame.timestamp].adds = adds;
-          item[lastFrame.timestamp].attributes = attributes;
+          item[lastFrame.timestamp]!.adds = adds;
+          item[lastFrame.timestamp]!.attributes = attributes;
         }
       }
 
diff --git a/static/app/utils/replays/hooks/useFiltersInLocationQuery.tsx b/static/app/utils/replays/hooks/useFiltersInLocationQuery.tsx
index bd150dfe35ec5a..bdfffa1845caec 100644
--- a/static/app/utils/replays/hooks/useFiltersInLocationQuery.tsx
+++ b/static/app/utils/replays/hooks/useFiltersInLocationQuery.tsx
@@ -1,17 +1,18 @@
 import {useCallback} from 'react';
 import type {Query} from 'history';
 
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 
 function useFiltersInLocationQuery<Q extends Query>() {
   const {pathname, query} = useLocation<Q>();
+  const navigate = useNavigate();
 
   const setFilter = useCallback(
     (updatedQuery: Partial<Q>) => {
-      browserHistory.replace({pathname, query: {...query, ...updatedQuery}});
+      navigate({pathname, query: {...query, ...updatedQuery}}, {replace: true});
     },
-    [pathname, query]
+    [pathname, query, navigate]
   );
 
   return {
diff --git a/static/app/utils/replays/hooks/useReplayReader.spec.tsx b/static/app/utils/replays/hooks/useLoadReplayReader.spec.tsx
similarity index 84%
rename from static/app/utils/replays/hooks/useReplayReader.spec.tsx
rename to static/app/utils/replays/hooks/useLoadReplayReader.spec.tsx
index 758279bd4766f3..3d590d32b0738a 100644
--- a/static/app/utils/replays/hooks/useReplayReader.spec.tsx
+++ b/static/app/utils/replays/hooks/useLoadReplayReader.spec.tsx
@@ -1,7 +1,7 @@
 import {initializeOrg} from 'sentry-test/initializeOrg';
 import {renderHook} from 'sentry-test/reactTestingLibrary';
 
-import useReplayReader from 'sentry/utils/replays/hooks/useReplayReader';
+import useLoadReplayReader from 'sentry/utils/replays/hooks/useLoadReplayReader';
 import {OrganizationContext} from 'sentry/views/organizationContext';
 
 jest.mock('sentry/utils/replays/hooks/useReplayData', () => ({
@@ -17,13 +17,13 @@ const wrapper = ({children}: {children?: React.ReactNode}) => (
   </OrganizationContext.Provider>
 );
 
-describe('useReplayReader', () => {
+describe('useLoadReplayReader', () => {
   beforeEach(() => {
     MockApiClient.clearMockResponses();
   });
 
   it('should accept a replaySlug with project and id parts', () => {
-    const {result} = renderHook(useReplayReader, {
+    const {result} = renderHook(useLoadReplayReader, {
       wrapper,
       initialProps: {
         orgSlug: organization.slug,
@@ -39,7 +39,7 @@ describe('useReplayReader', () => {
   });
 
   it('should accept a replaySlug with only the replay-id', () => {
-    const {result} = renderHook(useReplayReader, {
+    const {result} = renderHook(useLoadReplayReader, {
       wrapper,
       initialProps: {
         orgSlug: organization.slug,
diff --git a/static/app/utils/replays/hooks/useReplayReader.tsx b/static/app/utils/replays/hooks/useLoadReplayReader.tsx
similarity index 95%
rename from static/app/utils/replays/hooks/useReplayReader.tsx
rename to static/app/utils/replays/hooks/useLoadReplayReader.tsx
index 23744b31abcb20..32dde9973bbaa6 100644
--- a/static/app/utils/replays/hooks/useReplayReader.tsx
+++ b/static/app/utils/replays/hooks/useLoadReplayReader.tsx
@@ -20,7 +20,7 @@ interface ReplayReaderResult extends ReturnType<typeof useReplayData> {
   replayId: string;
 }
 
-export default function useReplayReader({
+export default function useLoadReplayReader({
   orgSlug,
   replaySlug,
   clipWindow,
@@ -88,10 +88,10 @@ export default function useReplayReader({
 function parseReplayId(replaySlug: string) {
   const maybeProjectSlugAndReplayId = replaySlug.split(':');
   if (maybeProjectSlugAndReplayId.length === 2) {
-    return maybeProjectSlugAndReplayId[1];
+    return maybeProjectSlugAndReplayId[1]!;
   }
 
   // if there is no projectSlug then we assume we just have the replayId
   // all other cases would be a malformed url
-  return maybeProjectSlugAndReplayId[0];
+  return maybeProjectSlugAndReplayId[0]!;
 }
diff --git a/static/app/utils/replays/hooks/useLogReplayDataLoaded.tsx b/static/app/utils/replays/hooks/useLogReplayDataLoaded.tsx
index 921c3be6276dae..36f9273c47adb3 100644
--- a/static/app/utils/replays/hooks/useLogReplayDataLoaded.tsx
+++ b/static/app/utils/replays/hooks/useLogReplayDataLoaded.tsx
@@ -2,14 +2,14 @@ import {useEffect} from 'react';
 import * as Sentry from '@sentry/react';
 
 import {trackAnalytics} from 'sentry/utils/analytics';
-import type useReplayReader from 'sentry/utils/replays/hooks/useReplayReader';
+import type useLoadReplayReader from 'sentry/utils/replays/hooks/useLoadReplayReader';
 import type {BreadcrumbFrame} from 'sentry/utils/replays/types';
 import useOrganization from 'sentry/utils/useOrganization';
 import useProjectFromSlug from 'sentry/utils/useProjectFromSlug';
 
 interface Props
   extends Pick<
-    ReturnType<typeof useReplayReader>,
+    ReturnType<typeof useLoadReplayReader>,
     'fetchError' | 'fetching' | 'projectSlug' | 'replay'
   > {}
 
diff --git a/static/app/utils/replays/hooks/useReplayData.spec.tsx b/static/app/utils/replays/hooks/useReplayData.spec.tsx
index 2c1d204db73265..7b652a074240d7 100644
--- a/static/app/utils/replays/hooks/useReplayData.spec.tsx
+++ b/static/app/utils/replays/hooks/useReplayData.spec.tsx
@@ -278,28 +278,28 @@ describe('useReplayData', () => {
 
     const mockErrorResponse1 = [
       ReplayErrorFixture({
-        id: ERROR_IDS[0],
+        id: ERROR_IDS[0]!,
         issue: 'JAVASCRIPT-123E',
         timestamp: startedAt.toISOString(),
       }),
     ];
     const mockErrorResponse2 = [
       ReplayErrorFixture({
-        id: ERROR_IDS[1],
+        id: ERROR_IDS[1]!,
         issue: 'JAVASCRIPT-789Z',
         timestamp: startedAt.toISOString(),
       }),
     ];
     const mockErrorResponse3 = [
       ReplayErrorFixture({
-        id: ERROR_IDS[0],
+        id: ERROR_IDS[0]!,
         issue: 'JAVASCRIPT-123E',
         timestamp: startedAt.toISOString(),
       }),
     ];
     const mockErrorResponse4 = [
       ReplayErrorFixture({
-        id: ERROR_IDS[1],
+        id: ERROR_IDS[1]!,
         issue: 'JAVASCRIPT-789Z',
         timestamp: startedAt.toISOString(),
       }),
@@ -416,7 +416,7 @@ describe('useReplayData', () => {
     });
     const mockErrorResponse = [
       ReplayErrorFixture({
-        id: ERROR_IDS[0],
+        id: ERROR_IDS[0]!,
         issue: 'JAVASCRIPT-123E',
         timestamp: startedAt.toISOString(),
       }),
diff --git a/static/app/utils/replays/hooks/useReplayData.tsx b/static/app/utils/replays/hooks/useReplayData.tsx
index 05d15ed0ed20c6..021b9b1ca64ad8 100644
--- a/static/app/utils/replays/hooks/useReplayData.tsx
+++ b/static/app/utils/replays/hooks/useReplayData.tsx
@@ -7,9 +7,9 @@ import {DiscoverDatasets} from 'sentry/utils/discover/types';
 import parseLinkHeader from 'sentry/utils/parseLinkHeader';
 import type {ApiQueryKey} from 'sentry/utils/queryClient';
 import {useApiQuery, useQueryClient} from 'sentry/utils/queryClient';
+import {useReplayProjectSlug} from 'sentry/utils/replays/hooks/useReplayProjectSlug';
 import {mapResponseToReplayRecord} from 'sentry/utils/replays/replayDataUtils';
 import type RequestError from 'sentry/utils/requestError/requestError';
-import useProjects from 'sentry/utils/useProjects';
 import type {ReplayError, ReplayRecord} from 'sentry/views/replays/types';
 
 type Options = {
@@ -77,7 +77,6 @@ function useReplayData({
   segmentsPerPage = 100,
 }: Options): Result {
   const hasFetchedAttachments = useRef(false);
-  const projects = useProjects();
   const queryClient = useQueryClient();
 
   // Fetch every field of the replay. The TS type definition lists every field
@@ -98,12 +97,7 @@ function useReplayData({
     [replayData?.data]
   );
 
-  const projectSlug = useMemo(() => {
-    if (!replayRecord) {
-      return null;
-    }
-    return projects.projects.find(p => p.id === replayRecord.project_id)?.slug ?? null;
-  }, [replayRecord, projects.projects]);
+  const projectSlug = useReplayProjectSlug({replayRecord});
 
   const getAttachmentsQueryKey = useCallback(
     ({cursor, per_page}): ApiQueryKey => {
diff --git a/static/app/utils/replays/hooks/useReplayOnboarding.tsx b/static/app/utils/replays/hooks/useReplayOnboarding.tsx
index 66504d4716e613..5fd3785919c992 100644
--- a/static/app/utils/replays/hooks/useReplayOnboarding.tsx
+++ b/static/app/utils/replays/hooks/useReplayOnboarding.tsx
@@ -5,6 +5,7 @@ import SidebarPanelStore from 'sentry/stores/sidebarPanelStore';
 import {trackAnalytics} from 'sentry/utils/analytics';
 import useSelectedProjectsHaveField from 'sentry/utils/project/useSelectedProjectsHaveField';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 
 export function useHaveSelectedProjectsSentAnyReplayEvents() {
@@ -14,6 +15,7 @@ export function useHaveSelectedProjectsSentAnyReplayEvents() {
 }
 
 export function useReplayOnboardingSidebarPanel() {
+  const navigate = useNavigate();
   const location = useLocation();
   const organization = useOrganization();
 
@@ -26,11 +28,22 @@ export function useReplayOnboardingSidebarPanel() {
     }
   }, [location.hash, organization]);
 
-  const activateSidebar = useCallback((event: {preventDefault: () => void}) => {
-    event.preventDefault();
-    window.location.hash = 'replay-sidequest';
-    SidebarPanelStore.activatePanel(SidebarPanelKey.REPLAYS_ONBOARDING);
-  }, []);
+  const activateSidebar = useCallback(
+    (projectId?: string) => {
+      navigate({
+        ...location,
+        hash: 'replay-sidequest',
+        query: projectId
+          ? {
+              ...location.query,
+              project: projectId,
+            }
+          : location.query,
+      });
+      SidebarPanelStore.activatePanel(SidebarPanelKey.REPLAYS_ONBOARDING);
+    },
+    [location, navigate]
+  );
 
   return {activateSidebar};
 }
diff --git a/static/app/utils/replays/hooks/useReplayProjectSlug.tsx b/static/app/utils/replays/hooks/useReplayProjectSlug.tsx
new file mode 100644
index 00000000000000..c35a40f2b0321a
--- /dev/null
+++ b/static/app/utils/replays/hooks/useReplayProjectSlug.tsx
@@ -0,0 +1,18 @@
+import {useMemo} from 'react';
+
+import useProjects from 'sentry/utils/useProjects';
+import type {ReplayRecord} from 'sentry/views/replays/types';
+
+interface Props {
+  replayRecord: ReplayRecord | undefined;
+}
+
+export function useReplayProjectSlug({replayRecord}: Props) {
+  const projects = useProjects();
+  return useMemo(() => {
+    if (!replayRecord) {
+      return null;
+    }
+    return projects.projects.find(p => p.id === replayRecord.project_id)?.slug ?? null;
+  }, [replayRecord, projects]);
+}
diff --git a/static/app/utils/replays/playback/hooks/useTouchEventsCheck.tsx b/static/app/utils/replays/playback/hooks/useTouchEventsCheck.tsx
new file mode 100644
index 00000000000000..f49bc159978691
--- /dev/null
+++ b/static/app/utils/replays/playback/hooks/useTouchEventsCheck.tsx
@@ -0,0 +1,32 @@
+import {useEffect} from 'react';
+import * as Sentry from '@sentry/react';
+
+import type ReplayReader from 'sentry/utils/replays/replayReader';
+
+interface Props {
+  replay: ReplayReader | null;
+}
+
+export default function useTouchEventsCheck({replay}: Props) {
+  useEffect(() => {
+    if (!replay || !replay.getVideoEvents()) {
+      return;
+    }
+    const touchEvents = replay.getRRwebTouchEvents() ?? [];
+    const grouped = Object.groupBy(touchEvents, (t: any) => t.data.pointerId);
+    Object.values(grouped).forEach(t => {
+      if (t?.length !== 2) {
+        Sentry.captureMessage(
+          'Mobile replay has mismatching touch start and end events',
+          {
+            tags: {
+              sdk_name: replay.getReplay().sdk.name,
+              sdk_version: replay.getReplay().sdk.version,
+              touch_event_type: typeof t,
+            },
+          }
+        );
+      }
+    });
+  }, [replay]);
+}
diff --git a/static/app/utils/replays/playback/providers/replayPlayerEventsContext.spec.tsx b/static/app/utils/replays/playback/providers/replayPlayerEventsContext.spec.tsx
deleted file mode 100644
index c0302e257c6daf..00000000000000
--- a/static/app/utils/replays/playback/providers/replayPlayerEventsContext.spec.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import type {ReactNode} from 'react';
-import {ReplayRecordFixture} from 'sentry-fixture/replayRecord';
-
-import {renderHook} from 'sentry-test/reactTestingLibrary';
-
-import {
-  ReplayPlayerEventsContextProvider,
-  useReplayPlayerEvents,
-} from 'sentry/utils/replays/playback/providers/replayPlayerEventsContext';
-import ReplayReader from 'sentry/utils/replays/replayReader';
-
-function makeWrapper(replay: ReplayReader) {
-  return function ({children}: {children?: ReactNode}) {
-    return (
-      <ReplayPlayerEventsContextProvider replay={replay}>
-        {children}
-      </ReplayPlayerEventsContextProvider>
-    );
-  };
-}
-
-describe('replayPlayerEventsContext', () => {
-  it('should have a stable to the list of rrweb event frames', () => {
-    const mockReplay = ReplayReader.factory({
-      attachments: [],
-      errors: [],
-      fetching: false,
-      replayRecord: ReplayRecordFixture(),
-    });
-
-    const {result, rerender} = renderHook(useReplayPlayerEvents, {
-      wrapper: makeWrapper(mockReplay!),
-    });
-
-    const initialRef = result.current;
-
-    rerender();
-
-    expect(result.current).toEqual(initialRef);
-  });
-
-  it('should return the rrweb frames for the replay', () => {
-    const mockReplay = ReplayReader.factory({
-      attachments: [],
-      errors: [],
-      fetching: false,
-      replayRecord: ReplayRecordFixture(),
-    });
-    const mockRRwebFrames: any[] = [];
-    mockReplay!.getRRWebFrames = jest.fn().mockReturnValue(mockRRwebFrames);
-
-    const {result} = renderHook(useReplayPlayerEvents, {
-      wrapper: makeWrapper(mockReplay!),
-    });
-
-    expect(result.current).toStrictEqual(mockRRwebFrames);
-  });
-});
diff --git a/static/app/utils/replays/playback/providers/replayPlayerEventsContext.tsx b/static/app/utils/replays/playback/providers/replayPlayerEventsContext.tsx
deleted file mode 100644
index 034c5daa934f8b..00000000000000
--- a/static/app/utils/replays/playback/providers/replayPlayerEventsContext.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import {createContext, useContext} from 'react';
-
-import type ReplayReader from 'sentry/utils/replays/replayReader';
-import type {RecordingFrame} from 'sentry/utils/replays/types';
-
-const context = createContext<RecordingFrame[]>([]);
-
-export function ReplayPlayerEventsContextProvider({
-  children,
-  replay,
-}: {
-  children: React.ReactNode;
-  replay: ReplayReader;
-}) {
-  return <context.Provider value={replay.getRRWebFrames()}>{children}</context.Provider>;
-}
-
-export function useReplayPlayerEvents() {
-  return useContext(context);
-}
diff --git a/static/app/utils/replays/playback/providers/replayReaderProvider.tsx b/static/app/utils/replays/playback/providers/replayReaderProvider.tsx
new file mode 100644
index 00000000000000..c6085c1c579005
--- /dev/null
+++ b/static/app/utils/replays/playback/providers/replayReaderProvider.tsx
@@ -0,0 +1,26 @@
+import type {ReactNode} from 'react';
+import {createContext, useContext} from 'react';
+
+import ReplayReader from 'sentry/utils/replays/replayReader';
+
+interface Props {
+  children: ReactNode;
+  replay: ReplayReader;
+}
+
+const context = createContext<ReplayReader>(
+  ReplayReader.factory({
+    attachments: [],
+    errors: [],
+    fetching: false,
+    replayRecord: undefined,
+  })!
+);
+
+export function ReplayReaderProvider({children, replay}: Props) {
+  return <context.Provider value={replay}>{children}</context.Provider>;
+}
+
+export function useReplayReader() {
+  return useContext(context);
+}
diff --git a/static/app/utils/replays/replayReader.spec.tsx b/static/app/utils/replays/replayReader.spec.tsx
index 9bc7909a2d4542..ed393aee180694 100644
--- a/static/app/utils/replays/replayReader.spec.tsx
+++ b/static/app/utils/replays/replayReader.spec.tsx
@@ -450,7 +450,7 @@ describe('ReplayReader', () => {
 
     it('should adjust the end time and duration for the clip window', () => {
       // Duration should be between the clip start time and end time
-      expect(replay?.getDurationMs()).toEqual(10_000);
+      expect(replay?.getDurationMs()).toBe(10_000);
       // Start offset should be set
       expect(replay?.getStartOffsetMs()).toEqual(
         clipStartTimestamp.getTime() - replayStartedAt.getTime()
diff --git a/static/app/utils/replays/replayReader.tsx b/static/app/utils/replays/replayReader.tsx
index d66577036532b8..835ba85cb40079 100644
--- a/static/app/utils/replays/replayReader.tsx
+++ b/static/app/utils/replays/replayReader.tsx
@@ -249,7 +249,7 @@ export default class ReplayReader {
     this._errors = errorFrames.sort(sortFrames);
     // RRWeb Events are not sorted here, they are fetched in sorted order.
     this._sortedRRWebEvents = rrwebFrames;
-    this._videoEvents = videoFrames;
+    this._videoEvents = videoFrames.sort((a, b) => a.timestamp - b.timestamp);
     // Breadcrumbs must be sorted. Crumbs like `slowClick` and `multiClick` will
     // have the same timestamp as the click breadcrumb, but will be emitted a
     // few seconds later.
@@ -486,7 +486,7 @@ export default class ReplayReader {
       // 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];
+        const nextEvent = events[index + 1]!;
         if (isTouchEndFrame(nextEvent)) {
           nextEvent.timestamp = Math.max(nextEvent.timestamp, e.timestamp + 500);
         }
@@ -638,7 +638,7 @@ export default class ReplayReader {
     const crumbs = removeDuplicateClicks(
       this._sortedBreadcrumbFrames.filter(
         frame =>
-          ['navigation', 'ui.click', 'ui.tap'].includes(frame.category) ||
+          ['navigation', 'ui.click', 'ui.tap', 'ui.swipe'].includes(frame.category) ||
           (frame.category === 'ui.slowClickDetected' &&
             (isDeadClick(frame as SlowClickFrame) ||
               isDeadRageClick(frame as SlowClickFrame)))
diff --git a/static/app/utils/replays/replayerStepper.tsx b/static/app/utils/replays/replayerStepper.tsx
index 042fd88d487190..be53495260ed6c 100644
--- a/static/app/utils/replays/replayerStepper.tsx
+++ b/static/app/utils/replays/replayerStepper.tsx
@@ -97,6 +97,6 @@ export default function replayerStepper<
     };
 
     replayer.on('pause', handlePause);
-    considerFrame(nextFrame());
+    considerFrame(nextFrame()!);
   });
 }
diff --git a/static/app/utils/replays/types.tsx b/static/app/utils/replays/types.tsx
index 5009f98aace421..5c15ea11c745a7 100644
--- a/static/app/utils/replays/types.tsx
+++ b/static/app/utils/replays/types.tsx
@@ -72,6 +72,13 @@ type MobileBreadcrumbTypes =
       timestamp: number;
       type: string;
     }
+  | {
+      category: 'ui.swipe';
+      data: any;
+      timestamp: number;
+      type: string;
+      message?: string;
+    }
   | {
       category: 'device.battery';
       data: {charging: boolean; level: number};
@@ -344,6 +351,7 @@ export type BackgroundFrame = HydratedBreadcrumb<'app.background'>;
 export type BlurFrame = HydratedBreadcrumb<'ui.blur'>;
 export type ClickFrame = HydratedBreadcrumb<'ui.click'>;
 export type TapFrame = HydratedBreadcrumb<'ui.tap'>;
+export type SwipeFrame = HydratedBreadcrumb<'ui.swipe'>;
 export type ConsoleFrame = HydratedBreadcrumb<'console'>;
 export type FocusFrame = HydratedBreadcrumb<'ui.focus'>;
 export type InputFrame = HydratedBreadcrumb<'ui.input'>;
@@ -380,6 +388,7 @@ export const BreadcrumbCategories = [
   'ui.blur',
   'ui.click',
   'ui.tap',
+  'ui.swipe',
   'ui.focus',
   'ui.input',
   'ui.keyDown',
diff --git a/static/app/utils/requestError/sanitizePath.spec.tsx b/static/app/utils/requestError/sanitizePath.spec.tsx
index 9caa5a80c41793..ae5ee6829df219 100644
--- a/static/app/utils/requestError/sanitizePath.spec.tsx
+++ b/static/app/utils/requestError/sanitizePath.spec.tsx
@@ -187,7 +187,7 @@ describe('sanitizePath', function () {
   }
 
   it('uses original value if placeholder type not found', () => {
-    expect(sanitizePath('/organizations/sentry/dogName/maisey')).toEqual(
+    expect(sanitizePath('/organizations/sentry/dogName/maisey')).toBe(
       '/organizations/{orgSlug}/dogName/maisey'
     );
   });
diff --git a/static/app/utils/requestError/sanitizePath.tsx b/static/app/utils/requestError/sanitizePath.tsx
index fd29f8837f5319..ab0f0ed753e213 100644
--- a/static/app/utils/requestError/sanitizePath.tsx
+++ b/static/app/utils/requestError/sanitizePath.tsx
@@ -35,7 +35,7 @@ export function sanitizePath(path: string) {
   return (
     path
       // Remove any querystring
-      .split('?')[0]
+      .split('?')[0]!
       .replace(
         /(?<start>.*?\/)(?<type>organizations|issues|groups|customers|subscriptions|projects|teams|users)\/(?<second>[^/]+)\/(?<third>[^/]+\/)?(?<fourth>[^/]+\/)?(?<fifth>[^/]+\/)?(?<sixth>[^/]+\/)?(?<seventh>[^/]+\/)?(?<end>.*)/,
         function (...args) {
diff --git a/static/app/utils/sessions.spec.tsx b/static/app/utils/sessions.spec.tsx
index a7725e781d5b9c..8dec09c5dbe665 100644
--- a/static/app/utils/sessions.spec.tsx
+++ b/static/app/utils/sessions.spec.tsx
@@ -140,7 +140,7 @@ const sessionsApiResponse = {
 
 describe('utils/sessions', () => {
   describe('getCount', () => {
-    const groups = [sessionsApiResponse.groups[1], sessionsApiResponse.groups[2]];
+    const groups = [sessionsApiResponse.groups[1]!, sessionsApiResponse.groups[2]!];
     it('returns sessions count', () => {
       expect(getCount(groups, SessionFieldWithOperation.SESSIONS)).toBe(1942);
     });
@@ -150,7 +150,7 @@ describe('utils/sessions', () => {
   });
 
   describe('getCountAtIndex', () => {
-    const groups = [sessionsApiResponse.groups[1], sessionsApiResponse.groups[2]];
+    const groups = [sessionsApiResponse.groups[1]!, sessionsApiResponse.groups[2]!];
     it('returns sessions count', () => {
       expect(getCountAtIndex(groups, SessionFieldWithOperation.SESSIONS, 1)).toBe(35);
     });
diff --git a/static/app/utils/sessions.tsx b/static/app/utils/sessions.tsx
index 89f808d845368d..0bee1ddf4e344e 100644
--- a/static/app/utils/sessions.tsx
+++ b/static/app/utils/sessions.tsx
@@ -29,7 +29,7 @@ export function getCount(
   groups: SessionApiResponse['groups'] = [],
   field: SessionFieldWithOperation
 ) {
-  return groups.reduce((acc, group) => acc + group.totals[field], 0);
+  return groups.reduce((acc, group) => acc + group.totals[field]!, 0);
 }
 
 export function getCountAtIndex(
@@ -37,7 +37,7 @@ export function getCountAtIndex(
   field: SessionFieldWithOperation,
   index: number
 ) {
-  return groups.reduce((acc, group) => acc + group.series[field][index], 0);
+  return groups.reduce((acc, group) => acc + group.series[field]![index]!, 0);
 }
 
 export function getCrashFreeRate(
@@ -71,7 +71,7 @@ export function getSeriesSum(
   const groupSeries = groups.map(group => group.series[field]);
 
   groupSeries.forEach(series => {
-    series.forEach((dataPoint, idx) => (dataPointsSums[idx] += dataPoint));
+    series!.forEach((dataPoint, idx) => (dataPointsSums[idx]! += dataPoint));
   });
 
   return dataPointsSums;
@@ -136,12 +136,12 @@ export function getSessionStatusRateSeries(
   return compact(
     intervals.map((interval, i) => {
       const intervalTotalSessions = groups.reduce(
-        (acc, group) => acc + group.series[field][i],
+        (acc, group) => acc + group.series[field]![i]!,
         0
       );
 
       const intervalStatusSessions =
-        groups.find(group => group.by['session.status'] === status)?.series[field][i] ??
+        groups.find(group => group.by['session.status'] === status)?.series[field]![i] ??
         0;
 
       const statusSessionsPercent = percent(
@@ -193,7 +193,7 @@ export function getCountSeries(
 ): SeriesDataUnit[] {
   return intervals.map((interval, index) => ({
     name: interval,
-    value: group?.series[field][index] ?? 0,
+    value: group?.series[field]![index] ?? 0,
   }));
 }
 
@@ -216,9 +216,9 @@ export function initSessionsChart(theme: Theme) {
     [SessionStatus.ERRORED]: {
       seriesName: sessionTerm.errored,
       data: [],
-      color: colors[12],
+      color: colors[12]!,
       areaStyle: {
-        color: colors[12],
+        color: colors[12]!,
         opacity: 1,
       },
       lineStyle: {
@@ -229,9 +229,9 @@ export function initSessionsChart(theme: Theme) {
     [SessionStatus.ABNORMAL]: {
       seriesName: sessionTerm.abnormal,
       data: [],
-      color: colors[15],
+      color: colors[15]!,
       areaStyle: {
-        color: colors[15],
+        color: colors[15]!,
         opacity: 1,
       },
       lineStyle: {
@@ -334,7 +334,7 @@ export function filterSessionsInTimeWindow(
     const totals: Record<string, number> = {};
     Object.keys(group.series).forEach(field => {
       totals[field] = 0;
-      series[field] = group.series[field].filter((value, index) => {
+      series[field] = group.series[field]!.filter((value, index) => {
         const isBetween = filteredIndexes.includes(index);
         if (isBetween) {
           totals[field] = (totals[field] ?? 0) + value;
@@ -352,15 +352,15 @@ export function filterSessionsInTimeWindow(
         // We cannot sum here because users would not be unique anymore.
         // User can be repeated and part of multiple buckets in series but it's still that one user so totals would be wrong.
         // This operation is not 100% correct, because we are filtering series in time window but the total is for unfiltered series (it's the closest thing we can do right now)
-        totals[field] = group.totals[field];
+        totals[field] = group.totals[field]!;
       }
     });
     return {...group, series, totals};
   });
 
   return {
-    start: intervals[0],
-    end: intervals[intervals.length - 1],
+    start: intervals[0]!,
+    end: intervals[intervals.length - 1]!,
     query: sessions.query,
     intervals,
     groups,
diff --git a/static/app/utils/sqlish/SQLishFormatter.spec.tsx b/static/app/utils/sqlish/SQLishFormatter.spec.tsx
index 0d04a505ebfceb..3c6c2e056c2c60 100644
--- a/static/app/utils/sqlish/SQLishFormatter.spec.tsx
+++ b/static/app/utils/sqlish/SQLishFormatter.spec.tsx
@@ -9,7 +9,7 @@ describe('SQLishFormatter', function () {
     const formatter = new SQLishFormatter();
 
     it('Falls back to original string if unable to parse', () => {
-      expect(formatter.toString('😤')).toEqual('😤');
+      expect(formatter.toString('😤')).toBe('😤');
     });
 
     it('Adds newlines for keywords in SELECTs', () => {
diff --git a/static/app/utils/string/capitalize.spec.tsx b/static/app/utils/string/capitalize.spec.tsx
index fa59ea667f80e3..25f4505783c5e6 100644
--- a/static/app/utils/string/capitalize.spec.tsx
+++ b/static/app/utils/string/capitalize.spec.tsx
@@ -2,14 +2,14 @@ import {capitalize} from 'sentry/utils/string/capitalize';
 
 describe('capitalize', () => {
   it('capitalizes the first letter of a string', () => {
-    expect(capitalize('hello')).toEqual('Hello');
+    expect(capitalize('hello')).toBe('Hello');
   });
 
   it('lowercases the rest of the string', () => {
-    expect(capitalize('HELLO')).toEqual('Hello');
+    expect(capitalize('HELLO')).toBe('Hello');
   });
 
   it('does not change the string if it is already capitalized', () => {
-    expect(capitalize('Hello')).toEqual('Hello');
+    expect(capitalize('Hello')).toBe('Hello');
   });
 });
diff --git a/static/app/utils/string/middleEllipsis.tsx b/static/app/utils/string/middleEllipsis.tsx
index a5c23fed95c419..738aabb9fa22dc 100644
--- a/static/app/utils/string/middleEllipsis.tsx
+++ b/static/app/utils/string/middleEllipsis.tsx
@@ -72,10 +72,10 @@ export function middleEllipsis(
   // from the middle.
   const debt = getLength(words) - maxLength;
   const toTrimFromLeftWord = Math.ceil(debt / 2);
-  const leftWordLength = Math.max(words[0].length - toTrimFromLeftWord, 3);
-  const leftWord = words[0].slice(0, leftWordLength);
+  const leftWordLength = Math.max(words[0]!.length - toTrimFromLeftWord, 3);
+  const leftWord = words[0]!.slice(0, leftWordLength);
   const rightWordLength = maxLength - leftWord.length;
-  const rightWord = words[1].slice(-rightWordLength);
+  const rightWord = words[1]!.slice(-rightWordLength);
 
   return `${leftWord}\u2026${rightWord}`;
 }
diff --git a/static/app/utils/string/toTitleCase.spec.tsx b/static/app/utils/string/toTitleCase.spec.tsx
index d255e1f7caf58f..0bddde1ff9b99f 100644
--- a/static/app/utils/string/toTitleCase.spec.tsx
+++ b/static/app/utils/string/toTitleCase.spec.tsx
@@ -2,19 +2,19 @@ import {toTitleCase} from 'sentry/utils/string/toTitleCase';
 
 describe('toTitleCase', () => {
   it('capitalizes the first letter of each word', () => {
-    expect(toTitleCase('sentry: fix your code')).toEqual('Sentry: Fix Your Code');
+    expect(toTitleCase('sentry: fix your code')).toBe('Sentry: Fix Your Code');
   });
 
   it('treats non-word characters as the parts of the same word', () => {
-    expect(toTitleCase('sentry-code-breaks')).toEqual('Sentry-code-breaks');
+    expect(toTitleCase('sentry-code-breaks')).toBe('Sentry-code-breaks');
   });
 
   it('flattens words with capitals in the middle', () => {
-    expect(toTitleCase('seNTRy: fIX youR Code')).toEqual('Sentry: Fix Your Code');
+    expect(toTitleCase('seNTRy: fIX youR Code')).toBe('Sentry: Fix Your Code');
   });
 
   it("doesn't flatten inner capitals if specified", () => {
-    expect(toTitleCase('seNTRy: fIX youR Code', {allowInnerUpperCase: true})).toEqual(
+    expect(toTitleCase('seNTRy: fIX youR Code', {allowInnerUpperCase: true})).toBe(
       'SeNTRy: FIX YouR Code'
     );
   });
diff --git a/static/app/utils/tempest/features.tsx b/static/app/utils/tempest/features.tsx
new file mode 100644
index 00000000000000..7360191782f1c5
--- /dev/null
+++ b/static/app/utils/tempest/features.tsx
@@ -0,0 +1,5 @@
+import type {Organization} from 'sentry/types/organization';
+
+export function hasTempestAccess(organization: Organization) {
+  return organization.features.includes('tempest-access');
+}
diff --git a/static/app/utils/theme.tsx b/static/app/utils/theme.tsx
index 1ccd40caf556b4..a8b4960dd6e183 100644
--- a/static/app/utils/theme.tsx
+++ b/static/app/utils/theme.tsx
@@ -413,10 +413,10 @@ const generateAliases = (colors: BaseColors) => ({
 });
 
 const dataCategory = {
-  [DATA_CATEGORY_INFO.error.plural]: CHART_PALETTE[4][3],
-  [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.error.plural]: CHART_PALETTE[4]![3],
+  [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]: '#a397f7',
 };
 
@@ -424,12 +424,12 @@ const dataCategory = {
  * Default colors for data usage outcomes
  */
 const outcome = {
-  [Outcome.ACCEPTED]: CHART_PALETTE[5][0], // #444674 - chart 100
-  [Outcome.FILTERED]: CHART_PALETTE[5][2], // #B85586 - chart 300
-  [Outcome.RATE_LIMITED]: CHART_PALETTE[5][3], // #E9626E - chart 400
-  [Outcome.INVALID]: CHART_PALETTE[5][4], // #F58C46 - chart 500
-  [Outcome.CLIENT_DISCARD]: CHART_PALETTE[5][5], // #F2B712 - chart 600
-  [Outcome.DROPPED]: CHART_PALETTE[5][3], // #F58C46 - chart 500
+  [Outcome.ACCEPTED]: CHART_PALETTE[5]![0], // #444674 - chart 100
+  [Outcome.FILTERED]: CHART_PALETTE[5]![2], // #B85586 - chart 300
+  [Outcome.RATE_LIMITED]: CHART_PALETTE[5]![3], // #E9626E - chart 400
+  [Outcome.INVALID]: CHART_PALETTE[5]![4], // #F58C46 - chart 500
+  [Outcome.CLIENT_DISCARD]: CHART_PALETTE[5]![5], // #F2B712 - chart 600
+  [Outcome.DROPPED]: CHART_PALETTE[5]![3], // #F58C46 - chart 500
 };
 
 const generateAlertTheme = (colors: BaseColors, alias: Aliases) => ({
@@ -929,7 +929,7 @@ const commonTheme = {
 
     // We have an array that maps `number + 1` --> list of `number` colors
     getColorPalette: (length: number) =>
-      CHART_PALETTE[Math.min(CHART_PALETTE.length - 1, length + 1)] as string[],
+      CHART_PALETTE[Math.min(CHART_PALETTE.length - 1, length + 1)]!,
 
     previousPeriod: lightColors.gray200,
     symbolSize: 6,
diff --git a/static/app/utils/tokenizeSearch.spec.tsx b/static/app/utils/tokenizeSearch.spec.tsx
index be02240fc0b1f0..7f94e408ed18c1 100644
--- a/static/app/utils/tokenizeSearch.spec.tsx
+++ b/static/app/utils/tokenizeSearch.spec.tsx
@@ -197,8 +197,7 @@ describe('utils/tokenizeSearch', function () {
     ];
 
     for (const {name, string, object} of cases) {
-      // eslint-disable-next-line jest/valid-title
-      it(name, () => expect(new MutableSearch(string)).toEqual(object));
+      it(`${name}`, () => expect(new MutableSearch(string)).toEqual(object));
     }
   });
 
@@ -207,58 +206,56 @@ describe('utils/tokenizeSearch', function () {
       const results = new MutableSearch([]);
 
       results.addStringFilter('a:a');
-      expect(results.formatString()).toEqual('a:a');
+      expect(results.formatString()).toBe('a:a');
 
       results.addFilterValues('b', ['b']);
-      expect(results.formatString()).toEqual('a:a b:b');
+      expect(results.formatString()).toBe('a:a b:b');
 
       results.addFilterValues('c', ['c1', 'c2']);
-      expect(results.formatString()).toEqual('a:a b:b c:c1 c:c2');
+      expect(results.formatString()).toBe('a:a b:b c:c1 c:c2');
 
       results.addFilterValues('d', ['d']);
-      expect(results.formatString()).toEqual('a:a b:b c:c1 c:c2 d:d');
+      expect(results.formatString()).toBe('a:a b:b c:c1 c:c2 d:d');
 
       results.addFilterValues('e', ['e1*e2\\e3']);
-      expect(results.formatString()).toEqual('a:a b:b c:c1 c:c2 d:d e:"e1\\*e2\\e3"');
+      expect(results.formatString()).toBe('a:a b:b c:c1 c:c2 d:d e:"e1\\*e2\\e3"');
 
       results.addStringFilter('d:d2');
-      expect(results.formatString()).toEqual(
-        'a:a b:b c:c1 c:c2 d:d e:"e1\\*e2\\e3" d:d2'
-      );
+      expect(results.formatString()).toBe('a:a b:b c:c1 c:c2 d:d e:"e1\\*e2\\e3" d:d2');
     });
 
     it('adds individual values to query object', function () {
       const results = new MutableSearch([]);
 
       results.addFilterValue('e', 'e1*e2\\e3');
-      expect(results.formatString()).toEqual('e:"e1\\*e2\\e3"');
+      expect(results.formatString()).toBe('e:"e1\\*e2\\e3"');
     });
 
     it('add text searches to query object', function () {
       const results = new MutableSearch(['a:a']);
 
       results.addFreeText('b');
-      expect(results.formatString()).toEqual('a:a b');
+      expect(results.formatString()).toBe('a:a b');
       expect(results.freeText).toEqual(['b']);
 
       results.addFreeText('c');
-      expect(results.formatString()).toEqual('a:a b c');
+      expect(results.formatString()).toBe('a:a b c');
       expect(results.freeText).toEqual(['b', 'c']);
 
       results.addStringFilter('d:d').addFreeText('e');
-      expect(results.formatString()).toEqual('a:a b c d:d e');
+      expect(results.formatString()).toBe('a:a b c d:d e');
       expect(results.freeText).toEqual(['b', 'c', 'e']);
 
       results.freeText = ['x', 'y'];
-      expect(results.formatString()).toEqual('a:a d:d x y');
+      expect(results.formatString()).toBe('a:a d:d x y');
       expect(results.freeText).toEqual(['x', 'y']);
 
       results.freeText = ['a b c'];
-      expect(results.formatString()).toEqual('a:a d:d "a b c"');
+      expect(results.formatString()).toBe('a:a d:d "a b c"');
       expect(results.freeText).toEqual(['a b c']);
 
       results.freeText = ['invalid literal for int() with base'];
-      expect(results.formatString()).toEqual(
+      expect(results.formatString()).toBe(
         'a:a d:d "invalid literal for int() with base"'
       );
       expect(results.freeText).toEqual(['invalid literal for int() with base']);
@@ -268,10 +265,10 @@ describe('utils/tokenizeSearch', function () {
       const results = new MutableSearch(['x', 'a:a', 'y']);
 
       results.addOp('OR');
-      expect(results.formatString()).toEqual('x a:a y OR');
+      expect(results.formatString()).toBe('x a:a y OR');
 
       results.addFreeText('z');
-      expect(results.formatString()).toEqual('x a:a y OR z');
+      expect(results.formatString()).toBe('x a:a y OR z');
 
       results
         .addOp('(')
@@ -279,21 +276,21 @@ describe('utils/tokenizeSearch', function () {
         .addOp('AND')
         .addStringFilter('c:c')
         .addOp(')');
-      expect(results.formatString()).toEqual('x a:a y OR z ( b:b AND c:c )');
+      expect(results.formatString()).toBe('x a:a y OR z ( b:b AND c:c )');
     });
 
     it('adds tags to query', function () {
       const results = new MutableSearch(['tag:value']);
 
       results.addStringFilter('new:too');
-      expect(results.formatString()).toEqual('tag:value new:too');
+      expect(results.formatString()).toBe('tag:value new:too');
     });
 
     it('setTag() replaces tags', function () {
       const results = new MutableSearch(['tag:value']);
 
       results.setFilterValues('tag', ['too']);
-      expect(results.formatString()).toEqual('tag:too');
+      expect(results.formatString()).toBe('tag:too');
     });
 
     it('setTag() replaces tags in OR', function () {
@@ -306,11 +303,11 @@ describe('utils/tokenizeSearch', function () {
       ]);
 
       results.setFilterValues('transaction', ['def']);
-      expect(results.formatString()).toEqual('transaction:def');
+      expect(results.formatString()).toBe('transaction:def');
 
       results = new MutableSearch(['(transaction:xyz', 'OR', 'transaction:abc)']);
       results.setFilterValues('transaction', ['def']);
-      expect(results.formatString()).toEqual('transaction:def');
+      expect(results.formatString()).toBe('transaction:def');
     });
 
     it('does not remove boolean operators after setting tag values', function () {
@@ -329,7 +326,7 @@ describe('utils/tokenizeSearch', function () {
       ]);
 
       results.setFilterValues('transaction', ['def']);
-      expect(results.formatString()).toEqual(
+      expect(results.formatString()).toBe(
         '( start:xyz AND end:abc ) OR ( start:abc AND end:xyz ) transaction:def'
       );
     });
@@ -337,43 +334,43 @@ describe('utils/tokenizeSearch', function () {
     it('removes tags from query object', function () {
       let results = new MutableSearch(['x', 'a:a', 'b:b']);
       results.removeFilter('a');
-      expect(results.formatString()).toEqual('x b:b');
+      expect(results.formatString()).toBe('x b:b');
 
       results = new MutableSearch(['a:a']);
       results.removeFilter('a');
-      expect(results.formatString()).toEqual('');
+      expect(results.formatString()).toBe('');
 
       results = new MutableSearch(['x', 'a:a', 'a:a2']);
       results.removeFilter('a');
-      expect(results.formatString()).toEqual('x');
+      expect(results.formatString()).toBe('x');
 
       results = new MutableSearch(['a:a', 'OR', 'b:b']);
       results.removeFilter('a');
-      expect(results.formatString()).toEqual('b:b');
+      expect(results.formatString()).toBe('b:b');
 
       results = new MutableSearch(['a:a', 'OR', 'a:a1', 'AND', 'b:b']);
       results.removeFilter('a');
-      expect(results.formatString()).toEqual('b:b');
+      expect(results.formatString()).toBe('b:b');
 
       results = new MutableSearch(['(a:a', 'OR', 'b:b)']);
       results.removeFilter('a');
-      expect(results.formatString()).toEqual('b:b');
+      expect(results.formatString()).toBe('b:b');
 
       results = new MutableSearch(['(a:a', 'OR', 'b:b', 'OR', 'y)']);
       results.removeFilter('a');
-      expect(results.formatString()).toEqual('( b:b OR y )');
+      expect(results.formatString()).toBe('( b:b OR y )');
 
       results = new MutableSearch(['(a:a', 'OR', '(b:b1', 'OR', '(c:c', 'OR', 'b:b2)))']);
       results.removeFilter('b');
-      expect(results.formatString()).toEqual('( a:a OR c:c )');
+      expect(results.formatString()).toBe('( a:a OR c:c )');
 
       results = new MutableSearch(['(((a:a', 'OR', 'b:b1)', 'OR', 'c:c)', 'OR', 'b:b2)']);
       results.removeFilter('b');
-      expect(results.formatString()).toEqual('( ( a:a OR c:c ) )');
+      expect(results.formatString()).toBe('( ( a:a OR c:c ) )');
 
       results = new MutableSearch(['a:a', '(b:b1', 'OR', 'b:b2', 'OR', 'b:b3)', 'c:c']);
       results.removeFilter('b');
-      expect(results.formatString()).toEqual('a:a c:c');
+      expect(results.formatString()).toBe('a:a c:c');
     });
 
     it('can return the tag keys', function () {
@@ -505,8 +502,7 @@ describe('utils/tokenizeSearch', function () {
     ];
 
     for (const {name, string, object} of cases) {
-      // eslint-disable-next-line jest/valid-title
-      it(name, () => expect(object.formatString()).toEqual(string));
+      it(`${name}`, () => expect(object.formatString()).toEqual(string));
     }
   });
 });
diff --git a/static/app/utils/tokenizeSearch.tsx b/static/app/utils/tokenizeSearch.tsx
index f5b26c527aa319..cb5ad985eea29d 100644
--- a/static/app/utils/tokenizeSearch.tsx
+++ b/static/app/utils/tokenizeSearch.tsx
@@ -192,7 +192,7 @@ export class MutableSearch {
    */
   addStringFilter(filter: string, shouldEscape = true) {
     const [key, value] = parseFilter(filter);
-    this.addFilterValues(key, [value], shouldEscape);
+    this.addFilterValues(key!, [value!], shouldEscape);
     return this;
   }
 
@@ -217,7 +217,7 @@ export class MutableSearch {
       if (i > 0) {
         this.addOp('OR');
       }
-      this.addFilterValue(key, values[i], shouldEscape);
+      this.addFilterValue(key, values[i]!, shouldEscape);
     }
     this.addOp(')');
     return this;
@@ -272,7 +272,7 @@ export class MutableSearch {
         }
 
         for (let i = 0; i < this.tokens.length; i++) {
-          const token = this.tokens[i];
+          const token = this.tokens[i]!;
           const prev = this.tokens[i - 1];
           const next = this.tokens[i + 1];
           if (isOp(token) && isBooleanOp(token.value)) {
@@ -313,14 +313,14 @@ export class MutableSearch {
       parensToDelete = [];
 
       for (let i = 0; i < this.tokens.length; i++) {
-        const token = this.tokens[i];
+        const token = this.tokens[i]!;
         if (!isOp(token) || token.value !== '(') {
           continue;
         }
 
         let alreadySeen = false;
         for (let j = i + 1; j < this.tokens.length; j++) {
-          const nextToken = this.tokens[j];
+          const nextToken = this.tokens[j]!;
           if (isOp(nextToken) && nextToken.value === '(') {
             // Continue down to the nested parens. We can skip i forward since we know
             // everything between i and j is NOT an open paren.
@@ -415,8 +415,8 @@ function splitSearchIntoTokens(query: string) {
   let quoteEnclosed = false;
 
   for (let idx = 0; idx < queryChars.length; idx++) {
-    const char = queryChars[idx];
-    const nextChar = queryChars.length - 1 > idx ? queryChars[idx + 1] : null;
+    const char = queryChars[idx]!;
+    const nextChar = queryChars.length - 1 > idx ? queryChars[idx + 1]! : null;
     token += char;
 
     if (nextChar !== null && !isSpace(char) && isSpace(nextChar)) {
diff --git a/static/app/utils/touch.tsx b/static/app/utils/touch.tsx
index d31fcabe4e40b1..c181c257b8e5d3 100644
--- a/static/app/utils/touch.tsx
+++ b/static/app/utils/touch.tsx
@@ -15,7 +15,7 @@ export function getPointerPosition(
 ): number {
   const actual = isReactEvent(event) ? event.nativeEvent : event;
   if (window.TouchEvent && actual instanceof TouchEvent) {
-    return actual.targetTouches[0][property];
+    return actual.targetTouches[0]![property];
   }
   if (actual instanceof MouseEvent) {
     return actual[property];
diff --git a/static/app/utils/url/normalizeUrl.spec.tsx b/static/app/utils/url/normalizeUrl.spec.tsx
index 50a7ffb07b635a..d21b7757ea18fe 100644
--- a/static/app/utils/url/normalizeUrl.spec.tsx
+++ b/static/app/utils/url/normalizeUrl.spec.tsx
@@ -111,35 +111,35 @@ describe('normalizeUrl', function () {
       ],
     ];
     for (const [input, expected] of cases) {
-      result = normalizeUrl(input);
+      result = normalizeUrl(input!);
       expect(result).toEqual(expected);
 
-      result = normalizeUrl(input, location);
+      result = normalizeUrl(input!, location);
       expect(result).toEqual(expected);
 
-      result = normalizeUrl(input, {forceCustomerDomain: false});
+      result = normalizeUrl(input!, {forceCustomerDomain: false});
       expect(result).toEqual(expected);
 
-      result = normalizeUrl(input, location, {forceCustomerDomain: false});
+      result = normalizeUrl(input!, location, {forceCustomerDomain: false});
       expect(result).toEqual(expected);
     }
 
     // Normalizes urls if options.customerDomain is true and orgslug.sentry.io isn't being used
     ConfigStore.set('customerDomain', null);
     for (const [input, expected] of cases) {
-      result = normalizeUrl(input, {forceCustomerDomain: true});
+      result = normalizeUrl(input!, {forceCustomerDomain: true});
       expect(result).toEqual(expected);
 
-      result = normalizeUrl(input, location, {forceCustomerDomain: true});
+      result = normalizeUrl(input!, location, {forceCustomerDomain: true});
       expect(result).toEqual(expected);
     }
 
     ConfigStore.set('customerDomain', null);
     for (const [input, _expected] of cases) {
-      result = normalizeUrl(input);
+      result = normalizeUrl(input!);
       expect(result).toEqual(input);
 
-      result = normalizeUrl(input, location);
+      result = normalizeUrl(input!, location);
       expect(result).toEqual(input);
     }
   });
@@ -147,18 +147,18 @@ describe('normalizeUrl', function () {
   it('replaces pathname in objects', function () {
     const location = LocationFixture();
     result = normalizeUrl({pathname: '/settings/acme/'}, location);
-    expect(result.pathname).toEqual('/settings/organization/');
+    expect(result.pathname).toBe('/settings/organization/');
 
     result = normalizeUrl({pathname: '/settings/acme/'}, location, {
       forceCustomerDomain: false,
     });
-    expect(result.pathname).toEqual('/settings/organization/');
+    expect(result.pathname).toBe('/settings/organization/');
 
     result = normalizeUrl({pathname: '/settings/sentry/members'}, location);
-    expect(result.pathname).toEqual('/settings/members');
+    expect(result.pathname).toBe('/settings/members');
 
     result = normalizeUrl({pathname: '/organizations/albertos-apples/issues'}, location);
-    expect(result.pathname).toEqual('/issues');
+    expect(result.pathname).toBe('/issues');
 
     result = normalizeUrl(
       {
@@ -167,7 +167,7 @@ describe('normalizeUrl', function () {
       },
       location
     );
-    expect(result.pathname).toEqual('/profiling/profile/sentry/abc123/');
+    expect(result.pathname).toBe('/profiling/profile/sentry/abc123/');
 
     result = normalizeUrl(
       {
@@ -176,14 +176,14 @@ describe('normalizeUrl', function () {
       },
       location
     );
-    expect(result.pathname).toEqual('/issues');
+    expect(result.pathname).toBe('/issues');
 
     // Normalizes urls if options.customerDomain is true and orgslug.sentry.io isn't being used
     ConfigStore.set('customerDomain', null);
     result = normalizeUrl({pathname: '/settings/acme/'}, location, {
       forceCustomerDomain: true,
     });
-    expect(result.pathname).toEqual('/settings/organization/');
+    expect(result.pathname).toBe('/settings/organization/');
 
     result = normalizeUrl(
       {
@@ -195,6 +195,6 @@ describe('normalizeUrl', function () {
         forceCustomerDomain: true,
       }
     );
-    expect(result.pathname).toEqual('/issues');
+    expect(result.pathname).toBe('/issues');
   });
 });
diff --git a/static/app/utils/url/stripURLOrigin.spec.tsx b/static/app/utils/url/stripURLOrigin.spec.tsx
index 32f9c6199ee851..e4463e027d5303 100644
--- a/static/app/utils/url/stripURLOrigin.spec.tsx
+++ b/static/app/utils/url/stripURLOrigin.spec.tsx
@@ -2,7 +2,7 @@ import stripURLOrigin from 'sentry/utils/url/stripURLOrigin';
 
 describe('stripURLOrigin', () => {
   it('should preserve the url path, query, and hash', () => {
-    expect(stripURLOrigin('https://example.com/path/name?query=params#hash')).toEqual(
+    expect(stripURLOrigin('https://example.com/path/name?query=params#hash')).toBe(
       '/path/name?query=params#hash'
     );
   });
diff --git a/static/app/utils/useCombinedReducer.tsx b/static/app/utils/useCombinedReducer.tsx
index 9ec3c89bb94749..da778d940d0bb7 100644
--- a/static/app/utils/useCombinedReducer.tsx
+++ b/static/app/utils/useCombinedReducer.tsx
@@ -38,7 +38,7 @@ export function makeCombinedReducers<M extends ReducersObject>(
     const nextState = {} as ReducersState<M>;
 
     for (const key of keys) {
-      nextState[key] = reducers[key](state[key], action);
+      nextState[key] = reducers[key]!(state[key], action);
     }
 
     return nextState;
diff --git a/static/app/utils/useDispatchingReducer.spec.tsx b/static/app/utils/useDispatchingReducer.spec.tsx
index f506c8d2f226e5..23b0b0b82e9c66 100644
--- a/static/app/utils/useDispatchingReducer.spec.tsx
+++ b/static/app/utils/useDispatchingReducer.spec.tsx
@@ -53,8 +53,8 @@ describe('useDispatchingReducer', () => {
 
       await waitFor(() => {
         expect(reducer).toHaveBeenCalledTimes(1);
-        expect(result.current[0]).toEqual({type: 'action'});
       });
+      expect(result.current[0]).toEqual({type: 'action'});
     });
     it('calls before action with state and action args', () => {
       const initialState = {type: 'initial'};
diff --git a/static/app/utils/useExperiment.tsx b/static/app/utils/useExperiment.tsx
index 70b7b01a521456..8c3e1cffbf7178 100644
--- a/static/app/utils/useExperiment.tsx
+++ b/static/app/utils/useExperiment.tsx
@@ -41,6 +41,6 @@ const DEFAULT_RETURN_VALUE = {
 
 export const useExperiment: UseExperiment = (...params) => {
   return (
-    HookStore.get('react-hook:use-experiment')[0]?.(...params) ?? DEFAULT_RETURN_VALUE
+    HookStore.get('react-hook:use-experiment')[0]!?.(...params) ?? DEFAULT_RETURN_VALUE
   );
 };
diff --git a/static/app/utils/useFeedbackForm.spec.tsx b/static/app/utils/useFeedbackForm.spec.tsx
index 21a5dd395e3cac..9b99cd14c79586 100644
--- a/static/app/utils/useFeedbackForm.spec.tsx
+++ b/static/app/utils/useFeedbackForm.spec.tsx
@@ -36,7 +36,7 @@ describe('useFeedbackForm', function () {
     const {result} = renderHook(useFeedbackForm, {wrapper: GlobalFeedbackForm});
     const openForm = result.current;
 
-    expect(openForm).not.toBe(null);
+    expect(openForm).not.toBeNull();
 
     // Calling openForm() should create a form and append it to the DOM
     await openForm!();
diff --git a/static/app/utils/useFeedbackForm.tsx b/static/app/utils/useFeedbackForm.tsx
index 070379cbe3357b..0fcf451e56dc0d 100644
--- a/static/app/utils/useFeedbackForm.tsx
+++ b/static/app/utils/useFeedbackForm.tsx
@@ -6,7 +6,7 @@ import {
   useEffect,
   useRef,
 } from 'react';
-import type {FeedbackModalIntegration} from '@sentry/types';
+import type {FeedbackModalIntegration} from '@sentry/core';
 
 import {
   useFeedback,
diff --git a/static/app/utils/useHotkeys.spec.tsx b/static/app/utils/useHotkeys.spec.tsx
index 6691ba0f49af31..1c4858252f9ad8 100644
--- a/static/app/utils/useHotkeys.spec.tsx
+++ b/static/app/utils/useHotkeys.spec.tsx
@@ -39,7 +39,7 @@ describe('useHotkeys', function () {
     expect(callback).not.toHaveBeenCalled();
 
     const evt = makeKeyEventFixture('s', {ctrlKey: true});
-    events.keydown(evt);
+    events.keydown!(evt);
 
     expect(evt.preventDefault).toHaveBeenCalled();
     expect(callback).toHaveBeenCalled();
@@ -55,12 +55,12 @@ describe('useHotkeys', function () {
     expect(events.keydown).toBeDefined();
     expect(callback).not.toHaveBeenCalled();
 
-    events.keydown(makeKeyEventFixture('s', {ctrlKey: true}));
+    events.keydown!(makeKeyEventFixture('s', {ctrlKey: true}));
 
     expect(callback).toHaveBeenCalled();
     callback.mockClear();
 
-    events.keydown(makeKeyEventFixture('m', {metaKey: true}));
+    events.keydown!(makeKeyEventFixture('m', {metaKey: true}));
 
     expect(callback).toHaveBeenCalled();
   });
@@ -75,7 +75,7 @@ describe('useHotkeys', function () {
     expect(events.keydown).toBeDefined();
     expect(callback).not.toHaveBeenCalled();
 
-    events.keydown(
+    events.keydown!(
       makeKeyEventFixture('x', {
         altKey: true,
         metaKey: true,
@@ -97,7 +97,7 @@ describe('useHotkeys', function () {
     expect(events.keydown).toBeDefined();
     expect(callback).not.toHaveBeenCalled();
 
-    events.keydown(
+    events.keydown!(
       makeKeyEventFixture('x', {
         altKey: true,
         metaKey: true,
@@ -119,17 +119,17 @@ describe('useHotkeys', function () {
     expect(events.keydown).toBeDefined();
     expect(callback).not.toHaveBeenCalled();
 
-    events.keydown(makeKeyEventFixture('s', {ctrlKey: true}));
+    events.keydown!(makeKeyEventFixture('s', {ctrlKey: true}));
 
     expect(callback).toHaveBeenCalled();
     callback.mockClear();
 
     rerender({match: 'command+m'});
 
-    events.keydown(makeKeyEventFixture('s', {ctrlKey: true}));
+    events.keydown!(makeKeyEventFixture('s', {ctrlKey: true}));
     expect(callback).not.toHaveBeenCalled();
 
-    events.keydown(makeKeyEventFixture('m', {metaKey: true}));
+    events.keydown!(makeKeyEventFixture('m', {metaKey: true}));
     expect(callback).toHaveBeenCalled();
   });
 
@@ -140,7 +140,7 @@ describe('useHotkeys', function () {
       initialProps: [{match: ['/'], callback}],
     });
 
-    events.keydown(makeKeyEventFixture('/', {target: document.createElement('input')}));
+    events.keydown!(makeKeyEventFixture('/', {target: document.createElement('input')}));
 
     expect(callback).not.toHaveBeenCalled();
   });
@@ -152,7 +152,7 @@ describe('useHotkeys', function () {
       initialProps: [{match: ['/'], callback, includeInputs: true}],
     });
 
-    events.keydown(makeKeyEventFixture('/', {target: document.createElement('input')}));
+    events.keydown!(makeKeyEventFixture('/', {target: document.createElement('input')}));
 
     expect(callback).toHaveBeenCalled();
   });
@@ -165,7 +165,7 @@ describe('useHotkeys', function () {
     });
 
     const evt = makeKeyEventFixture('s', {ctrlKey: true});
-    events.keydown(evt);
+    events.keydown!(evt);
 
     expect(evt.preventDefault).not.toHaveBeenCalled();
     expect(callback).toHaveBeenCalled();
diff --git a/static/app/utils/useHoverOverlay.tsx b/static/app/utils/useHoverOverlay.tsx
index 2032436cfb229c..ea5c8d3191357d 100644
--- a/static/app/utils/useHoverOverlay.tsx
+++ b/static/app/utils/useHoverOverlay.tsx
@@ -98,6 +98,19 @@ interface UseHoverOverlayProps {
    * Offset along the main axis.
    */
   offset?: number;
+
+  /**
+   * Callback whenever the hovercard is blurred
+   * See also `onHover`
+   */
+  onBlur?: () => void;
+
+  /**
+   * Callback whenever the hovercard is hovered
+   * See also `onBlur`
+   */
+  onHover?: () => void;
+
   /**
    * Position for the overlay.
    */
@@ -115,6 +128,7 @@ interface UseHoverOverlayProps {
    * If child node supports ref forwarding, you can skip apply a wrapper
    */
   skipWrapper?: boolean;
+
   /**
    * Color of the dotted underline, if available. See also: showUnderline.
    */
@@ -159,6 +173,8 @@ function useHoverOverlay(
     offset = 8,
     position = 'top',
     containerDisplayMode = 'inline-block',
+    onHover,
+    onBlur,
   }: UseHoverOverlayProps
 ) {
   const theme = useTheme();
@@ -167,6 +183,14 @@ function useHoverOverlay(
   const [isVisible, setIsVisible] = useState(forceVisible ?? false);
   const isOpen = forceVisible ?? isVisible;
 
+  useEffect(() => {
+    if (isOpen) {
+      onHover?.();
+    } else {
+      onBlur?.();
+    }
+  }, [isOpen, onBlur, onHover]);
+
   const [triggerElement, setTriggerElement] = useState<HTMLElement | null>(null);
   const [overlayElement, setOverlayElement] = useState<HTMLElement | null>(null);
   const [arrowElement, setArrowElement] = useState<HTMLElement | null>(null);
diff --git a/static/app/utils/useIsStuck.tsx b/static/app/utils/useIsStuck.tsx
index b000acadf271d6..af0802c51899e4 100644
--- a/static/app/utils/useIsStuck.tsx
+++ b/static/app/utils/useIsStuck.tsx
@@ -14,7 +14,7 @@ export function useIsStuck(el: HTMLElement | null) {
     }
 
     const observer = new IntersectionObserver(
-      ([entry]) => setIsStuck(entry.intersectionRatio < 1),
+      ([entry]) => setIsStuck(entry!.intersectionRatio < 1),
       {
         rootMargin: '-1px 0px 0px 0px',
         threshold: [1],
diff --git a/static/app/utils/useLocalStorageState.spec.tsx b/static/app/utils/useLocalStorageState.spec.tsx
index 80473c7b694a2c..8f10ef7d2f0409 100644
--- a/static/app/utils/useLocalStorageState.spec.tsx
+++ b/static/app/utils/useLocalStorageState.spec.tsx
@@ -18,7 +18,6 @@ describe('useLocalStorageState', () => {
     renderHook(() => {
       try {
         // @ts-expect-error force incorrect usage
-        // biome-ignore lint/correctness/useHookAtTopLevel: <explanation>
         useLocalStorageState({}, 'default value');
       } catch (err) {
         errorResult = err;
diff --git a/static/app/utils/useMembers.spec.tsx b/static/app/utils/useMembers.spec.tsx
index 91318dad4b301e..651c72d9d644f0 100644
--- a/static/app/utils/useMembers.spec.tsx
+++ b/static/app/utils/useMembers.spec.tsx
@@ -75,7 +75,7 @@ describe('useMembers', function () {
     expect(result.current.initiallyLoaded).toBe(false);
     expect(mockRequest).toHaveBeenCalled();
 
-    await waitFor(() => expect(result.current.members.length).toBe(1));
+    await waitFor(() => expect(result.current.members).toHaveLength(1));
 
     const {members} = result.current;
     expect(members).toEqual(expect.arrayContaining([userFoo]));
@@ -97,7 +97,7 @@ describe('useMembers', function () {
     expect(result.current.initiallyLoaded).toBe(false);
     expect(mockRequest).toHaveBeenCalled();
 
-    await waitFor(() => expect(result.current.members.length).toBe(1));
+    await waitFor(() => expect(result.current.members).toHaveLength(1));
 
     const {members} = result.current;
     expect(members).toEqual(expect.arrayContaining([userFoo]));
@@ -107,7 +107,7 @@ describe('useMembers', function () {
     MemberListStore.loadInitialData(mockUsers);
 
     const {result} = renderHook(useMembers, {
-      initialProps: {emails: [mockUsers[0].email]},
+      initialProps: {emails: [mockUsers[0]!.email]},
     });
 
     const {members, initiallyLoaded} = result.current;
@@ -119,11 +119,11 @@ describe('useMembers', function () {
     const {result} = renderHook(useMembers);
 
     const {members, hasMore} = result.current;
-    expect(hasMore).toBe(null);
+    expect(hasMore).toBeNull();
     expect(members).toEqual(expect.arrayContaining([]));
 
     act(() => MemberListStore.loadInitialData(mockUsers, false, null));
-    await waitFor(() => expect(result.current.members.length).toBe(1));
+    await waitFor(() => expect(result.current.members).toHaveLength(1));
 
     expect(result.current.hasMore).toBe(false);
   });
diff --git a/static/app/utils/useMembers.tsx b/static/app/utils/useMembers.tsx
index e5f13077547c60..87b425e0302cd0 100644
--- a/static/app/utils/useMembers.tsx
+++ b/static/app/utils/useMembers.tsx
@@ -140,8 +140,8 @@ async function fetchMembers(
   const pageLinks = resp?.getResponseHeader('Link');
   if (pageLinks) {
     const paginationObject = parseLinkHeader(pageLinks);
-    hasMore = paginationObject?.next?.results;
-    nextCursor = paginationObject?.next?.cursor;
+    hasMore = paginationObject?.next!?.results;
+    nextCursor = paginationObject?.next!?.cursor;
   }
 
   return {results: data as Member[], hasMore, nextCursor};
diff --git a/static/app/utils/useMemoWithPrevious.spec.tsx b/static/app/utils/useMemoWithPrevious.spec.tsx
index 1ffd959d250faa..17ba405d7c3c18 100644
--- a/static/app/utils/useMemoWithPrevious.spec.tsx
+++ b/static/app/utils/useMemoWithPrevious.spec.tsx
@@ -10,7 +10,7 @@ describe('useMemoWithPrevious', () => {
 
     const {result} = renderHook(() => useMemoWithPrevious(factory, [dep]));
     expect(factory).toHaveBeenCalledWith(null);
-    expect(result.current).toEqual('foo');
+    expect(result.current).toBe('foo');
   });
 
   it('calls factory with previous value', () => {
diff --git a/static/app/utils/useNavigate.tsx b/static/app/utils/useNavigate.tsx
index 2145b973b88faf..2ec76e16943f89 100644
--- a/static/app/utils/useNavigate.tsx
+++ b/static/app/utils/useNavigate.tsx
@@ -12,7 +12,7 @@ type NavigateOptions = {
   state?: any;
 };
 
-interface ReactRouter3Navigate {
+export interface ReactRouter3Navigate {
   (to: LocationDescriptor, options?: NavigateOptions): void;
   (delta: number): void;
 }
diff --git a/static/app/utils/useOverlay.tsx b/static/app/utils/useOverlay.tsx
index e7ff0e1caf4f05..411aa03ffeba27 100644
--- a/static/app/utils/useOverlay.tsx
+++ b/static/app/utils/useOverlay.tsx
@@ -38,7 +38,7 @@ const maxSize: Modifier<'maxSize', NonNullable<PreventOverflowModifier['options'
     const flippedWidthSide = basePlacement === 'left' ? 'right' : 'left';
     const flippedHeightSide = basePlacement === 'top' ? 'bottom' : 'top';
 
-    const maxHeight = ['left', 'right'].includes(basePlacement)
+    const maxHeight = ['left', 'right'].includes(basePlacement!)
       ? // If the main axis is horizontal, then maxHeight = the boundary's height
         height - overflow.top - overflow.bottom
       : // Otherwise, set max height unless there is enough space on the other side to
@@ -47,7 +47,7 @@ const maxSize: Modifier<'maxSize', NonNullable<PreventOverflowModifier['options'
 
     // If there is enough space on the other side, then allow the popper to flip
     // without constraining its size
-    const maxWidth = ['top', 'bottom'].includes(basePlacement)
+    const maxWidth = ['top', 'bottom'].includes(basePlacement!)
       ? // If the main axis is vertical, then maxWidth = the boundary's width
         width - overflow.left - overflow.right
       : // Otherwise, set max width unless there is enough space on the other side to
@@ -68,8 +68,8 @@ const applyMaxSize: Modifier<'applyMaxSize', {}> = {
   enabled: false, // will be enabled when overlay is open
   fn({state}) {
     const {width, height} = state.modifiersData.maxSize;
-    state.styles.popper.maxHeight = height;
-    state.styles.popper.maxWidth = width;
+    state.styles.popper!.maxHeight = height;
+    state.styles.popper!.maxWidth = width;
   },
 };
 
@@ -79,7 +79,7 @@ const applyMinWidth: Modifier<'applyMinWidth', {}> = {
   enabled: false, // will be enabled when overlay is open
   fn({state}) {
     const {reference} = state.rects;
-    state.styles.popper.minWidth = `${reference.width}px`;
+    state.styles.popper!.minWidth = `${reference.width}px`;
   },
 };
 
diff --git a/static/app/utils/usePrevious.spec.tsx b/static/app/utils/usePrevious.spec.tsx
index 5834732d5c2dd7..af02a3bd4b64ff 100644
--- a/static/app/utils/usePrevious.spec.tsx
+++ b/static/app/utils/usePrevious.spec.tsx
@@ -23,7 +23,7 @@ describe('usePrevious', () => {
 
     rerender('New Value');
     // We did not pass anything under initialProps
-    expect(result.current).toBe(undefined);
+    expect(result.current).toBeUndefined();
     rerender('New New Value');
     // Result should point to old value
     expect(result.current).toBe('New Value');
diff --git a/static/app/utils/usePrismTokens.tsx b/static/app/utils/usePrismTokens.tsx
index b101a447ee0b5a..6fab7f7f64dc94 100644
--- a/static/app/utils/usePrismTokens.tsx
+++ b/static/app/utils/usePrismTokens.tsx
@@ -41,7 +41,7 @@ const useLoadPrismLanguage = (
 const getPrismGrammar = (language: string) => {
   try {
     const fullLanguage = getPrismLanguage(language);
-    return Prism.languages[fullLanguage] ?? null;
+    return Prism.languages[fullLanguage!] ?? null;
   } catch (e) {
     Sentry.captureException(e);
     return null;
@@ -61,11 +61,11 @@ const splitMultipleTokensByLine = (
       continue;
     }
 
-    currentLine.push(...tokenLines[0]);
+    currentLine.push(...tokenLines[0]!);
     if (tokenLines.length > 1) {
       for (let i = 1; i < tokenLines.length; i++) {
         lines.push(currentLine);
-        currentLine = tokenLines[i];
+        currentLine = tokenLines[i]!;
       }
     }
   }
diff --git a/static/app/utils/useProjectSdkNeedsUpdate.spec.tsx b/static/app/utils/useProjectSdkNeedsUpdate.spec.tsx
index 68a2a40fb10eb3..701c6132c0ac4a 100644
--- a/static/app/utils/useProjectSdkNeedsUpdate.spec.tsx
+++ b/static/app/utils/useProjectSdkNeedsUpdate.spec.tsx
@@ -54,9 +54,11 @@ describe('useProjectSdkNeedsUpdate', () => {
 
     await waitFor(() => {
       expect(result.current.isError).toBeFalsy();
+    });
+    await waitFor(() => {
       expect(result.current.isFetching).toBeFalsy();
-      expect(result.current.needsUpdate).toBeFalsy();
     });
+    expect(result.current.needsUpdate).toBeFalsy();
   });
 
   it('should be updated it the sdk version is too low', async () => {
@@ -77,9 +79,11 @@ describe('useProjectSdkNeedsUpdate', () => {
     });
     await waitFor(() => {
       expect(result.current.isError).toBeFalsy();
+    });
+    await waitFor(() => {
       expect(result.current.isFetching).toBeFalsy();
-      expect(result.current.needsUpdate).toBeTruthy();
     });
+    expect(result.current.needsUpdate).toBeTruthy();
   });
 
   it('should return needsUpdate if multiple projects', async () => {
@@ -105,9 +109,11 @@ describe('useProjectSdkNeedsUpdate', () => {
 
     await waitFor(() => {
       expect(result.current.isError).toBeFalsy();
+    });
+    await waitFor(() => {
       expect(result.current.isFetching).toBeFalsy();
-      expect(result.current.needsUpdate).toBeTruthy();
     });
+    expect(result.current.needsUpdate).toBeTruthy();
   });
 
   it('should not return needsUpdate if some projects meet minSdk', async () => {
@@ -133,8 +139,10 @@ describe('useProjectSdkNeedsUpdate', () => {
 
     await waitFor(() => {
       expect(result.current.isError).toBeFalsy();
+    });
+    await waitFor(() => {
       expect(result.current.isFetching).toBeFalsy();
-      expect(result.current.needsUpdate).toBeFalsy();
     });
+    expect(result.current.needsUpdate).toBeFalsy();
   });
 });
diff --git a/static/app/utils/useProjects.spec.tsx b/static/app/utils/useProjects.spec.tsx
index 476ba5e0a90ebe..7112ddaeb9b944 100644
--- a/static/app/utils/useProjects.spec.tsx
+++ b/static/app/utils/useProjects.spec.tsx
@@ -82,7 +82,7 @@ describe('useProjects', function () {
     expect(result.current.initiallyLoaded).toBe(false);
     expect(mockRequest).toHaveBeenCalled();
 
-    await waitFor(() => expect(result.current.projects.length).toBe(1));
+    await waitFor(() => expect(result.current.projects).toHaveLength(1));
 
     const {projects} = result.current;
     expect(projects).toEqual(expect.arrayContaining([projectFoo]));
@@ -92,7 +92,7 @@ describe('useProjects', function () {
     act(() => void ProjectsStore.loadInitialData(mockProjects));
 
     const {result} = renderHook(useProjects, {
-      initialProps: {slugs: [mockProjects[0].slug]},
+      initialProps: {slugs: [mockProjects[0]!.slug]},
       wrapper: TestContext,
     });
 
diff --git a/static/app/utils/useProjects.tsx b/static/app/utils/useProjects.tsx
index 9bdb30d2706a81..34fa2ef1c669d5 100644
--- a/static/app/utils/useProjects.tsx
+++ b/static/app/utils/useProjects.tsx
@@ -135,8 +135,8 @@ async function fetchProjects(
   const pageLinks = resp?.getResponseHeader('Link');
   if (pageLinks) {
     const paginationObject = parseLinkHeader(pageLinks);
-    hasMore = paginationObject?.next?.results || paginationObject?.previous?.results;
-    nextCursor = paginationObject?.next?.cursor;
+    hasMore = paginationObject?.next!?.results || paginationObject?.previous!?.results;
+    nextCursor = paginationObject?.next!?.cursor;
   }
 
   return {results: data, hasMore, nextCursor};
diff --git a/static/app/utils/useRoutes.spec.tsx b/static/app/utils/useRoutes.spec.tsx
index cb85d89f40668c..58c30dd5c23692 100644
--- a/static/app/utils/useRoutes.spec.tsx
+++ b/static/app/utils/useRoutes.spec.tsx
@@ -32,7 +32,7 @@ describe('useRoutes', () => {
         <HomePage />
       </RouteContext.Provider>
     );
-    expect(routes.length).toEqual(1);
+    expect(routes).toHaveLength(1);
     expect(routes[0]).toEqual({path: '/', component: HomePage});
   });
 });
diff --git a/static/app/utils/useTeams.spec.tsx b/static/app/utils/useTeams.spec.tsx
index d0fe6196d9c56e..ed6506675fb095 100644
--- a/static/app/utils/useTeams.spec.tsx
+++ b/static/app/utils/useTeams.spec.tsx
@@ -69,7 +69,7 @@ describe('useTeams', function () {
     });
     const {teams} = result.current;
 
-    expect(teams.length).toBe(1);
+    expect(teams).toHaveLength(1);
     expect(teams).toEqual(expect.arrayContaining(userTeams));
   });
 
@@ -89,7 +89,7 @@ describe('useTeams', function () {
     expect(result.current.initiallyLoaded).toBe(false);
     expect(mockRequest).toHaveBeenCalled();
 
-    await waitFor(() => expect(result.current.teams.length).toBe(1));
+    await waitFor(() => expect(result.current.teams).toHaveLength(1));
 
     const {teams} = result.current;
     expect(teams).toEqual(expect.arrayContaining([teamFoo]));
@@ -99,7 +99,7 @@ describe('useTeams', function () {
     TeamStore.loadInitialData(mockTeams);
 
     const {result} = renderHook(useTeams, {
-      initialProps: {slugs: [mockTeams[0].slug]},
+      initialProps: {slugs: [mockTeams[0]!.slug]},
     });
 
     const {teams, initiallyLoaded} = result.current;
@@ -111,11 +111,11 @@ describe('useTeams', function () {
     const {result} = renderHook(useTeams);
 
     const {teams, hasMore} = result.current;
-    expect(hasMore).toBe(null);
+    expect(hasMore).toBeNull();
     expect(teams).toEqual(expect.arrayContaining([]));
 
     act(() => TeamStore.loadInitialData(mockTeams, false, null));
-    await waitFor(() => expect(result.current.teams.length).toBe(1));
+    await waitFor(() => expect(result.current.teams).toHaveLength(1));
 
     expect(result.current.hasMore).toBe(false);
   });
diff --git a/static/app/utils/useTeams.tsx b/static/app/utils/useTeams.tsx
index 67ea4d2e31caba..e7b646481d4355 100644
--- a/static/app/utils/useTeams.tsx
+++ b/static/app/utils/useTeams.tsx
@@ -138,8 +138,8 @@ async function fetchTeams(
   const pageLinks = resp?.getResponseHeader('Link');
   if (pageLinks) {
     const paginationObject = parseLinkHeader(pageLinks);
-    hasMore = paginationObject?.next?.results;
-    nextCursor = paginationObject?.next?.cursor;
+    hasMore = paginationObject?.next!?.results;
+    nextCursor = paginationObject?.next!?.cursor;
   }
 
   return {results: data, hasMore, nextCursor};
diff --git a/static/app/utils/useTeamsById.spec.tsx b/static/app/utils/useTeamsById.spec.tsx
index d6e8d62b838402..b6defd83727169 100644
--- a/static/app/utils/useTeamsById.spec.tsx
+++ b/static/app/utils/useTeamsById.spec.tsx
@@ -75,7 +75,7 @@ describe('useTeamsById', function () {
     expect(mockRequest).toHaveBeenCalled();
 
     await waitFor(() => {
-      expect(result.current.teams.length).toBe(1);
+      expect(result.current.teams).toHaveLength(1);
     });
 
     const {teams} = result.current;
@@ -87,7 +87,7 @@ describe('useTeamsById', function () {
     TeamStore.loadInitialData(mockTeams);
 
     const {result} = renderHook(useTeamsById, {
-      initialProps: {slugs: [mockTeams[0].slug]},
+      initialProps: {slugs: [mockTeams[0]!.slug]},
       wrapper,
     });
 
@@ -114,7 +114,7 @@ describe('useTeamsById', function () {
     expect(result.current.isLoading).toBe(true);
     expect(mockRequest).toHaveBeenCalled();
 
-    await waitFor(() => expect(result.current.teams.length).toBe(1));
+    await waitFor(() => expect(result.current.teams).toHaveLength(1));
 
     const {teams} = result.current;
     expect(teams).toEqual(expect.arrayContaining(requestedTeams));
@@ -125,7 +125,7 @@ describe('useTeamsById', function () {
     TeamStore.loadInitialData(mockTeams);
 
     const {result} = renderHook(useTeamsById, {
-      initialProps: {ids: [mockTeams[0].id]},
+      initialProps: {ids: [mockTeams[0]!.id]},
       wrapper,
     });
 
diff --git a/static/app/utils/useUndoableReducer.spec.tsx b/static/app/utils/useUndoableReducer.spec.tsx
index 7b6da190115e97..456ee7aea6fc1b 100644
--- a/static/app/utils/useUndoableReducer.spec.tsx
+++ b/static/app/utils/useUndoableReducer.spec.tsx
@@ -67,7 +67,7 @@ describe('makeUndoableReducer', () => {
         }
       );
       expect(reducer).not.toHaveBeenCalled();
-      expect(result.current[0]).toEqual(100);
+      expect(result.current[0]).toBe(100);
     });
 
     it('updates state', () => {
@@ -84,11 +84,11 @@ describe('makeUndoableReducer', () => {
       );
       act(() => result.current[1]('add'));
 
-      expect(result.current[0]).toEqual(1);
+      expect(result.current[0]).toBe(1);
       expect(reducer).toHaveBeenNthCalledWith(1, 0, 'add');
 
       act(() => result.current[1]('add'));
-      expect(result.current[0]).toEqual(2);
+      expect(result.current[0]).toBe(2);
       // TODO(react18): switch back to .toHaveBeenNthCalledWith(2, 1, 'add');
       expect(reducer).toHaveBeenLastCalledWith(1, 'add');
     });
@@ -101,10 +101,10 @@ describe('makeUndoableReducer', () => {
       );
 
       act(() => result.current[1](0));
-      expect(result.current[0]).toEqual(1);
+      expect(result.current[0]).toBe(1);
 
       act(() => result.current[1]({type: 'undo'}));
-      expect(result.current[0]).toEqual(0);
+      expect(result.current[0]).toBe(0);
     });
 
     it('can redo state', () => {
@@ -119,14 +119,14 @@ describe('makeUndoableReducer', () => {
 
       act(() => result.current[1]({type: 'undo'})); // 2 -> 1
       act(() => result.current[1]({type: 'undo'})); // 1 -> 0
-      expect(result.current[0]).toEqual(0);
+      expect(result.current[0]).toBe(0);
 
       act(() => result.current[1]({type: 'redo'})); // 0 -> 1
       act(() => result.current[1]({type: 'redo'})); // 1 -> 2
-      expect(result.current[0]).toEqual(2);
+      expect(result.current[0]).toBe(2);
 
       act(() => result.current[1]({type: 'redo'})); // 2 -> undefined
-      expect(result.current[0]).toEqual(2);
+      expect(result.current[0]).toBe(2);
     });
   });
 
@@ -143,10 +143,10 @@ describe('makeUndoableReducer', () => {
     );
 
     act(() => result.current[1]({type: 'add'}));
-    expect(result.current?.[2].previousState).toEqual(0);
+    expect(result.current?.[2].previousState).toBe(0);
 
     act(() => result.current[1]({type: 'undo'}));
-    expect(result.current?.[2].nextState).toEqual(1);
+    expect(result.current?.[2].nextState).toBe(1);
   });
 
   it('can work with primitives', () => {
diff --git a/static/app/views/settings/featureFlags/useUserFromId.tsx b/static/app/utils/useUserFromId.tsx
similarity index 92%
rename from static/app/views/settings/featureFlags/useUserFromId.tsx
rename to static/app/utils/useUserFromId.tsx
index 837dbe8300218c..8b15847c47db1f 100644
--- a/static/app/views/settings/featureFlags/useUserFromId.tsx
+++ b/static/app/utils/useUserFromId.tsx
@@ -1,4 +1,4 @@
-import type {User} from '@sentry/types';
+import type {User} from '@sentry/core';
 
 import {useApiQuery} from 'sentry/utils/queryClient';
 import useOrganization from 'sentry/utils/useOrganization';
diff --git a/static/app/utils/useUserTeams.spec.tsx b/static/app/utils/useUserTeams.spec.tsx
index a7445526583253..ae8573a52f8def 100644
--- a/static/app/utils/useUserTeams.spec.tsx
+++ b/static/app/utils/useUserTeams.spec.tsx
@@ -47,7 +47,7 @@ describe('useUserTeams', () => {
 
     const {result} = renderHook(useUserTeams, {wrapper});
     const {teams} = result.current;
-    expect(teams.length).toBe(0);
+    expect(teams).toHaveLength(0);
 
     expect(TeamStore.getState().loading).toBe(true);
     expect(mockapi).toHaveBeenCalledTimes(0);
@@ -70,7 +70,7 @@ describe('useUserTeams', () => {
     const {result} = renderHook(useUserTeams, {wrapper});
     const {teams} = result.current;
 
-    expect(teams.length).toBe(1);
+    expect(teams).toHaveLength(1);
     expect(teams).toEqual(userTeams);
   });
 
@@ -86,7 +86,7 @@ describe('useUserTeams', () => {
     const {result} = renderHook(useUserTeams, {wrapper});
     const {teams} = result.current;
 
-    expect(teams.length).toBe(2);
+    expect(teams).toHaveLength(2);
     expect(teams).toEqual(userTeams.concat(nonUserTeams));
   });
 
@@ -105,7 +105,7 @@ describe('useUserTeams', () => {
     const {result} = renderHook(() => useUserTeams(), {wrapper});
     const {teams} = result.current;
 
-    expect(teams.length).toBe(2);
+    expect(teams).toHaveLength(2);
     expect(teams).toEqual(userTeams.concat(nonUserTeams));
   });
 });
diff --git a/static/app/utils/utils.spec.tsx b/static/app/utils/utils.spec.tsx
index 3ea98d561c46e2..7352eee4d03287 100644
--- a/static/app/utils/utils.spec.tsx
+++ b/static/app/utils/utils.spec.tsx
@@ -31,7 +31,7 @@ five`
 
 describe('utils.explodeSlug', function () {
   it('replaces slug special chars with whitespace', function () {
-    expect(explodeSlug('test--slug__replace-')).toEqual('test slug replace');
+    expect(explodeSlug('test--slug__replace-')).toBe('test slug replace');
   });
 });
 
@@ -61,7 +61,7 @@ describe('utils.escapeDoubleQuotes', function () {
 
     for (const testCase of cases) {
       const [input, expected] = testCase;
-      expect(escapeDoubleQuotes(input)).toBe(expected);
+      expect(escapeDoubleQuotes(input!)).toBe(expected);
     }
 
     // should return the same input as the output
diff --git a/static/app/utils/versions.tsx b/static/app/utils/versions.tsx
deleted file mode 100644
index a889526e798bfa..00000000000000
--- a/static/app/utils/versions.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import {semverCompare} from 'sentry/utils/versions/semverCompare';
-
-/**
- * This is here for getsentry
- *
- * @deprecated Import directly from sentry/utils/versions/semverCompare instead.
- */
-export {semverCompare};
diff --git a/static/app/utils/window/requestIdleCallback.tsx b/static/app/utils/window/requestIdleCallback.tsx
deleted file mode 100644
index 6a07ed082587aa..00000000000000
--- a/static/app/utils/window/requestIdleCallback.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-const requestIdleCallback =
-  window.requestIdleCallback ||
-  function requestIdleCallbackPolyfill(cb) {
-    const start = Date.now();
-    return setTimeout(function () {
-      cb({
-        didTimeout: false,
-        timeRemaining: function () {
-          return Math.max(0, 50 - (Date.now() - start));
-        },
-      });
-    }, 1);
-  };
-
-export default requestIdleCallback;
diff --git a/static/app/views/acceptOrganizationInvite/index.spec.tsx b/static/app/views/acceptOrganizationInvite/index.spec.tsx
index e449adabec9cb4..e7f97f1af2bc43 100644
--- a/static/app/views/acceptOrganizationInvite/index.spec.tsx
+++ b/static/app/views/acceptOrganizationInvite/index.spec.tsx
@@ -1,11 +1,11 @@
 import {OrganizationFixture} from 'sentry-fixture/organization';
 import {RouteComponentPropsFixture} from 'sentry-fixture/routeComponentPropsFixture';
+import {RouterFixture} from 'sentry-fixture/routerFixture';
 
 import {render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrary';
 
 import {logout} from 'sentry/actionCreators/account';
 import ConfigStore from 'sentry/stores/configStore';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import AcceptOrganizationInvite from 'sentry/views/acceptOrganizationInvite';
 
 jest.mock('sentry/actionCreators/account');
@@ -25,6 +25,7 @@ const getJoinButton = () => {
 };
 
 describe('AcceptOrganizationInvite', function () {
+  const router = RouterFixture();
   const organization = OrganizationFixture({slug: 'org-slug'});
   const configState = ConfigStore.getState();
 
@@ -46,7 +47,8 @@ describe('AcceptOrganizationInvite', function () {
       <AcceptOrganizationInvite
         {...RouteComponentPropsFixture()}
         params={{orgId: 'org-slug', memberId: '1', token: 'abc'}}
-      />
+      />,
+      {router}
     );
 
     const acceptMock = MockApiClient.addMockResponse({
@@ -58,7 +60,7 @@ describe('AcceptOrganizationInvite', function () {
 
     await userEvent.click(joinButton!);
     expect(acceptMock).toHaveBeenCalled();
-    expect(browserHistory.replace).toHaveBeenCalledWith('/org-slug/');
+    expect(router.replace).toHaveBeenCalledWith('/org-slug/');
   });
 
   it('can accept invitation on customer-domains', async function () {
@@ -85,7 +87,8 @@ describe('AcceptOrganizationInvite', function () {
       <AcceptOrganizationInvite
         {...RouteComponentPropsFixture()}
         params={{memberId: '1', token: 'abc'}}
-      />
+      />,
+      {router}
     );
 
     const acceptMock = MockApiClient.addMockResponse({
@@ -97,7 +100,7 @@ describe('AcceptOrganizationInvite', function () {
 
     await userEvent.click(joinButton!);
     expect(acceptMock).toHaveBeenCalled();
-    expect(browserHistory.replace).toHaveBeenCalledWith('/org-slug/');
+    expect(router.replace).toHaveBeenCalledWith('/org-slug/');
   });
 
   it('renders error message', function () {
diff --git a/static/app/views/admin/adminOverview/apiChart.tsx b/static/app/views/admin/adminOverview/apiChart.tsx
index 2ded93d344745d..432a7efde16c29 100644
--- a/static/app/views/admin/adminOverview/apiChart.tsx
+++ b/static/app/views/admin/adminOverview/apiChart.tsx
@@ -98,17 +98,17 @@ class ApiChart extends Component<Props, State> {
     return [
       {
         seriesName: '2xx',
-        data: this.processRawSeries(rawData['client-api.all-versions.responses.2xx']),
+        data: this.processRawSeries(rawData['client-api.all-versions.responses.2xx']!),
         color: theme.green200,
       },
       {
         seriesName: '4xx',
-        data: this.processRawSeries(rawData['client-api.all-versions.responses.4xx']),
+        data: this.processRawSeries(rawData['client-api.all-versions.responses.4xx']!),
         color: theme.blue300,
       },
       {
         seriesName: '5xx',
-        data: this.processRawSeries(rawData['client-api.all-versions.responses.5xx']),
+        data: this.processRawSeries(rawData['client-api.all-versions.responses.5xx']!),
         color: theme.red200,
       },
     ];
diff --git a/static/app/views/admin/adminOverview/eventChart.tsx b/static/app/views/admin/adminOverview/eventChart.tsx
index 597043db4d48f6..31233a0411d99f 100644
--- a/static/app/views/admin/adminOverview/eventChart.tsx
+++ b/static/app/views/admin/adminOverview/eventChart.tsx
@@ -90,20 +90,20 @@ class EventChart extends Component<Props, State> {
     const sRejected: Record<string, number> = {};
     const aReceived = [0, 0]; // received, points
 
-    rawData['events.total'].forEach((point, idx) => {
-      const dReceived = point[1];
-      const dRejected = rawData['events.dropped'][idx]?.[1];
-      const ts = point[0];
+    rawData['events.total']!.forEach((point, idx) => {
+      const dReceived = point![1];
+      const dRejected = rawData['events.dropped']![idx]!?.[1];
+      const ts = point![0]!;
       if (sReceived[ts] === undefined) {
         sReceived[ts] = dReceived;
         sRejected[ts] = dRejected;
       } else {
         sReceived[ts] += dReceived;
-        sRejected[ts] += dRejected;
+        sRejected[ts]! += dRejected;
       }
       if (dReceived > 0) {
-        aReceived[0] += dReceived;
-        aReceived[1] += 1;
+        aReceived[0]! += dReceived;
+        aReceived[1]! += 1;
       }
     });
 
@@ -115,7 +115,7 @@ class EventChart extends Component<Props, State> {
         })),
         accepted: Object.keys(sReceived).map(ts =>
           // total number of events accepted (received - rejected)
-          ({name: parseInt(ts, 10) * 1000, value: sReceived[ts] - sRejected[ts]})
+          ({name: parseInt(ts, 10) * 1000, value: sReceived[ts]! - sRejected[ts]!})
         ),
       },
       loading: false,
@@ -128,12 +128,12 @@ class EventChart extends Component<Props, State> {
     return [
       {
         seriesName: t('Accepted'),
-        data: stats.accepted,
+        data: stats.accepted!,
         color: theme.blue300,
       },
       {
         seriesName: t('Dropped'),
-        data: stats.rejected,
+        data: stats.rejected!,
         color: theme.red200,
       },
     ];
diff --git a/static/app/views/admin/adminSettings.tsx b/static/app/views/admin/adminSettings.tsx
index 2a7c1989b8fbe2..f26a632b7aa57e 100644
--- a/static/app/views/admin/adminSettings.tsx
+++ b/static/app/views/admin/adminSettings.tsx
@@ -89,7 +89,7 @@ export default function AdminSettings() {
   const fields = {};
   for (const key of optionsAvailable) {
     // TODO(dcramer): we should not be mutating options
-    const option = data[key] ?? {field: {}, value: undefined};
+    const option = data[key]! ?? {field: {}, value: undefined};
 
     if (option.value === undefined || option.value === '') {
       const defn = getOption(key);
diff --git a/static/app/views/admin/installWizard/index.tsx b/static/app/views/admin/installWizard/index.tsx
index f4cfeace301ce3..f0dda6d86b9b3a 100644
--- a/static/app/views/admin/installWizard/index.tsx
+++ b/static/app/views/admin/installWizard/index.tsx
@@ -42,7 +42,7 @@ export default class InstallWizard extends DeprecatedAsyncView<
     const options = this.state.data!;
 
     let missingOptions = new Set(
-      Object.keys(options).filter(option => !options[option].field.isSet)
+      Object.keys(options).filter(option => !options[option]!.field.isSet)
     );
     // This is to handle the initial installation case.
     // Even if all options are filled out, we want to prompt to confirm
@@ -57,7 +57,7 @@ export default class InstallWizard extends DeprecatedAsyncView<
     const fields: Record<string, React.ReactNode> = {};
 
     for (const key of missingOptions) {
-      const option = options[key];
+      const option = options[key]!;
       if (option.field.disabled) {
         continue;
       }
@@ -71,7 +71,7 @@ export default class InstallWizard extends DeprecatedAsyncView<
     const options = this.state.data!;
     const data = {};
     Object.keys(options).forEach(optionName => {
-      const option = options[optionName];
+      const option = options[optionName]!;
       if (option.field.disabled) {
         return;
       }
@@ -135,7 +135,7 @@ export default class InstallWizard extends DeprecatedAsyncView<
     return (
       <ApiForm
         apiMethod="PUT"
-        apiEndpoint={this.getEndpoints()[0][1]}
+        apiEndpoint={this.getEndpoints()[0]![1]!}
         submitLabel={t('Continue')}
         initialData={this.getInitialData()}
         onSubmitSuccess={this.props.onConfigured}
diff --git a/static/app/views/admin/options.tsx b/static/app/views/admin/options.tsx
index 7b70f3eda335d9..1753302934b97b 100644
--- a/static/app/views/admin/options.tsx
+++ b/static/app/views/admin/options.tsx
@@ -634,7 +634,7 @@ const disabledReasons = {
 };
 
 export function getOption(option: string): Field {
-  return definitionsMap[option];
+  return definitionsMap[option]!;
 }
 
 export function getOptionDefault(option: string): string | number | false | undefined {
diff --git a/static/app/views/alerts/create.spec.tsx b/static/app/views/alerts/create.spec.tsx
index 9f4b1a5c00dfe9..d43b3c7d0bf97c 100644
--- a/static/app/views/alerts/create.spec.tsx
+++ b/static/app/views/alerts/create.spec.tsx
@@ -173,7 +173,7 @@ describe('ProjectAlertsCreate', function () {
         'The issue is older or newer than...',
       ]);
 
-      await userEvent.click(screen.getAllByLabelText('Delete Node')[1]);
+      await userEvent.click(screen.getAllByLabelText('Delete Node')[1]!);
 
       await userEvent.click(screen.getByText('Save Rule'));
 
@@ -208,7 +208,7 @@ describe('ProjectAlertsCreate', function () {
         body: ProjectAlertRuleFixture(),
       });
       // delete node
-      await userEvent.click(screen.getAllByLabelText('Delete Node')[0]);
+      await userEvent.click(screen.getAllByLabelText('Delete Node')[0]!);
 
       // Change name of alert rule
       await userEvent.type(screen.getByPlaceholderText('Enter Alert Name'), 'myname');
@@ -275,7 +275,7 @@ describe('ProjectAlertsCreate', function () {
         'Send a notification to all legacy integrations',
       ]);
 
-      await userEvent.click(screen.getAllByLabelText('Delete Node')[1]);
+      await userEvent.click(screen.getAllByLabelText('Delete Node')[1]!);
 
       await userEvent.click(screen.getByText('Save Rule'));
 
@@ -428,7 +428,7 @@ describe('ProjectAlertsCreate', function () {
         await userEvent.click(screen.getByPlaceholderText('Enter Alert Name'));
         await userEvent.paste('myname');
         // delete one condition
-        await userEvent.click(screen.getAllByLabelText('Delete Node')[0]);
+        await userEvent.click(screen.getAllByLabelText('Delete Node')[0]!);
 
         // Add a new filter
         await selectEvent.select(screen.getByText('Add optional filter...'), [
@@ -523,7 +523,7 @@ describe('ProjectAlertsCreate', function () {
       const groups = GroupsFixture();
       const date = new Date();
       for (let i = 0; i < groups.length; i++) {
-        groups[i].lastTriggered = String(date);
+        groups[i]!.lastTriggered = String(date);
       }
       const mock = MockApiClient.addMockResponse({
         url: '/projects/org-slug/project-slug/rules/preview/',
@@ -573,7 +573,7 @@ describe('ProjectAlertsCreate', function () {
       });
       createWrapper();
       // delete existion conditions
-      await userEvent.click(screen.getAllByLabelText('Delete Node')[0]);
+      await userEvent.click(screen.getAllByLabelText('Delete Node')[0]!);
 
       await waitFor(() => {
         expect(mock).toHaveBeenCalled();
@@ -616,7 +616,7 @@ describe('ProjectAlertsCreate', function () {
 
     it('shows error for incompatible conditions', async () => {
       createWrapper();
-      await userEvent.click(screen.getAllByLabelText('Delete Node')[0]);
+      await userEvent.click(screen.getAllByLabelText('Delete Node')[0]!);
 
       await selectEvent.select(screen.getByText('Add optional trigger...'), [
         'A new issue is created',
@@ -636,13 +636,13 @@ describe('ProjectAlertsCreate', function () {
         'true'
       );
 
-      await userEvent.click(screen.getAllByLabelText('Delete Node')[0]);
+      await userEvent.click(screen.getAllByLabelText('Delete Node')[0]!);
       expect(screen.queryByText(errorText)).not.toBeInTheDocument();
     });
 
     it('test any filterMatch', async () => {
       createWrapper();
-      await userEvent.click(screen.getAllByLabelText('Delete Node')[0]);
+      await userEvent.click(screen.getAllByLabelText('Delete Node')[0]!);
 
       await selectEvent.select(screen.getByText('Add optional trigger...'), [
         'A new issue is created',
@@ -663,7 +663,7 @@ describe('ProjectAlertsCreate', function () {
 
       expect(screen.getByText(errorText)).toBeInTheDocument();
 
-      await userEvent.click(screen.getAllByLabelText('Delete Node')[1]);
+      await userEvent.click(screen.getAllByLabelText('Delete Node')[1]!);
       await userEvent.clear(screen.getByDisplayValue('10'));
       await userEvent.click(document.body);
 
@@ -691,7 +691,7 @@ describe('ProjectAlertsCreate', function () {
       body: ProjectAlertRuleFixture(),
     });
     createWrapper();
-    await userEvent.click((await screen.findAllByLabelText('Delete Node'))[0]);
+    await userEvent.click((await screen.findAllByLabelText('Delete Node'))[0]!);
 
     await selectEvent.select(screen.getByText('Add action...'), [
       'Suggested Assignees, Team, or Member',
@@ -723,7 +723,7 @@ describe('ProjectAlertsCreate', function () {
 
   it('does not display noisy alert banner for legacy integrations', async function () {
     createWrapper();
-    await userEvent.click((await screen.findAllByLabelText('Delete Node'))[0]);
+    await userEvent.click((await screen.findAllByLabelText('Delete Node'))[0]!);
 
     await selectEvent.select(screen.getByText('Add action...'), [
       'Send a notification to all legacy integrations',
diff --git a/static/app/views/alerts/incidentRedirect.spec.tsx b/static/app/views/alerts/incidentRedirect.spec.tsx
index 4565546145417e..c4bbef77c0782d 100644
--- a/static/app/views/alerts/incidentRedirect.spec.tsx
+++ b/static/app/views/alerts/incidentRedirect.spec.tsx
@@ -4,7 +4,6 @@ import {initializeOrg} from 'sentry-test/initializeOrg';
 import {render, waitFor} from 'sentry-test/reactTestingLibrary';
 
 import {trackAnalytics} from 'sentry/utils/analytics';
-import {browserHistory} from 'sentry/utils/browserHistory';
 
 import IncidentRedirect from './incidentRedirect';
 
@@ -44,7 +43,7 @@ describe('IncidentRedirect', () => {
     );
 
     await waitFor(() => {
-      expect(browserHistory.replace).toHaveBeenCalledWith({
+      expect(router.replace).toHaveBeenCalledWith({
         pathname: '/organizations/org-slug/alerts/rules/details/4/',
         query: {
           alert: '123',
diff --git a/static/app/views/alerts/list/incidents/index.spec.tsx b/static/app/views/alerts/list/incidents/index.spec.tsx
index 4f4091c40ad9e3..f04ad1bd1efcac 100644
--- a/static/app/views/alerts/list/incidents/index.spec.tsx
+++ b/static/app/views/alerts/list/incidents/index.spec.tsx
@@ -89,11 +89,11 @@ describe('IncidentsList', () => {
     const items = await screen.findAllByTestId('alert-title');
 
     expect(items).toHaveLength(2);
-    expect(within(items[0]).getByText('First incident')).toBeInTheDocument();
-    expect(within(items[1]).getByText('Second incident')).toBeInTheDocument();
+    expect(within(items[0]!).getByText('First incident')).toBeInTheDocument();
+    expect(within(items[1]!).getByText('Second incident')).toBeInTheDocument();
 
     const projectBadges = screen.getAllByTestId('badge-display-name');
-    expect(within(projectBadges[0]).getByText('a')).toBeInTheDocument();
+    expect(within(projectBadges[0]!).getByText('a')).toBeInTheDocument();
   });
 
   it('displays empty state (first time experience)', async () => {
diff --git a/static/app/views/alerts/list/incidents/row.tsx b/static/app/views/alerts/list/incidents/row.tsx
index c6b674f31e1db9..bc4a9e74a2ecda 100644
--- a/static/app/views/alerts/list/incidents/row.tsx
+++ b/static/app/views/alerts/list/incidents/row.tsx
@@ -28,7 +28,7 @@ type Props = {
 };
 
 function AlertListRow({incident, projectsLoaded, projects, organization}: Props) {
-  const slug = incident.projects[0];
+  const slug = incident.projects[0]!;
   const started = moment(incident.dateStarted);
   const duration = moment
     .duration(moment(incident.dateClosed || new Date()).diff(started))
diff --git a/static/app/views/alerts/list/rules/alertLastIncidentActivationInfo.tsx b/static/app/views/alerts/list/rules/alertLastIncidentActivationInfo.tsx
index a6ed5ceb0960c9..069e3698ca3c78 100644
--- a/static/app/views/alerts/list/rules/alertLastIncidentActivationInfo.tsx
+++ b/static/app/views/alerts/list/rules/alertLastIncidentActivationInfo.tsx
@@ -53,7 +53,7 @@ function LastMetricAlertIncident({rule}: {rule: MetricAlert}) {
     return (
       <div>
         {t('Last activated ')}
-        <TimeSince date={rule.activations[0].dateCreated} />
+        <TimeSince date={rule.activations[0]!.dateCreated} />
       </div>
     );
   }
diff --git a/static/app/views/alerts/list/rules/alertRulesList.spec.tsx b/static/app/views/alerts/list/rules/alertRulesList.spec.tsx
index e3415eee2071be..30772c99a8e522 100644
--- a/static/app/views/alerts/list/rules/alertRulesList.spec.tsx
+++ b/static/app/views/alerts/list/rules/alertRulesList.spec.tsx
@@ -128,8 +128,8 @@ describe('AlertRulesList', () => {
   it('displays team dropdown context if unassigned', async () => {
     const {router, organization} = initializeOrg({organization: defaultOrg});
     render(<AlertRulesList />, {router, organization});
-    const assignee = (await screen.findAllByTestId('alert-row-assignee'))[0];
-    const btn = within(assignee).getAllByRole('button')[0];
+    const assignee = (await screen.findAllByTestId('alert-row-assignee'))[0]!;
+    const btn = within(assignee).getAllByRole('button')[0]!;
 
     expect(assignee).toBeInTheDocument();
     expect(btn).toBeInTheDocument();
@@ -149,8 +149,8 @@ describe('AlertRulesList', () => {
     const {router, organization} = initializeOrg({organization: defaultOrg});
     render(<AlertRulesList />, {router, organization});
 
-    const assignee = (await screen.findAllByTestId('alert-row-assignee'))[0];
-    const btn = within(assignee).getAllByRole('button')[0];
+    const assignee = (await screen.findAllByTestId('alert-row-assignee'))[0]!;
+    const btn = within(assignee).getAllByRole('button')[0]!;
 
     expect(assignee).toBeInTheDocument();
     expect(btn).toBeInTheDocument();
@@ -169,7 +169,7 @@ describe('AlertRulesList', () => {
   it('displays dropdown context menu with actions', async () => {
     const {router, organization} = initializeOrg({organization: defaultOrg});
     render(<AlertRulesList />, {router, organization});
-    const actions = (await screen.findAllByRole('button', {name: 'Actions'}))[0];
+    const actions = (await screen.findAllByRole('button', {name: 'Actions'}))[0]!;
     expect(actions).toBeInTheDocument();
 
     await userEvent.click(actions);
@@ -202,7 +202,7 @@ describe('AlertRulesList', () => {
       body: {},
     });
 
-    const actions = (await screen.findAllByRole('button', {name: 'Actions'}))[0];
+    const actions = (await screen.findAllByRole('button', {name: 'Actions'}))[0]!;
 
     // Add a new response to the mock with no rules
     const emptyListMock = MockApiClient.addMockResponse({
@@ -211,7 +211,7 @@ describe('AlertRulesList', () => {
       body: [],
     });
 
-    expect(screen.queryByText(deletedRuleName)).toBeInTheDocument();
+    expect(screen.getByText(deletedRuleName)).toBeInTheDocument();
     await userEvent.click(actions);
     await userEvent.click(screen.getByRole('menuitemradio', {name: 'Delete'}));
     await userEvent.click(screen.getByRole('button', {name: 'Delete Rule'}));
@@ -243,7 +243,7 @@ describe('AlertRulesList', () => {
       body: {},
     });
 
-    const actions = (await screen.findAllByRole('button', {name: 'Actions'}))[0];
+    const actions = (await screen.findAllByRole('button', {name: 'Actions'}))[0]!;
 
     // Add a new response to the mock with no rules
     const emptyListMock = MockApiClient.addMockResponse({
@@ -252,7 +252,7 @@ describe('AlertRulesList', () => {
       body: [],
     });
 
-    expect(screen.queryByText(deletedRuleName)).toBeInTheDocument();
+    expect(screen.getByText(deletedRuleName)).toBeInTheDocument();
     await userEvent.click(actions);
     await userEvent.click(screen.getByRole('menuitemradio', {name: 'Delete'}));
     await userEvent.click(screen.getByRole('button', {name: 'Delete Rule'}));
@@ -267,7 +267,7 @@ describe('AlertRulesList', () => {
       organization: defaultOrg,
     });
     render(<AlertRulesList />, {router, organization});
-    const actions = (await screen.findAllByRole('button', {name: 'Actions'}))[0];
+    const actions = (await screen.findAllByRole('button', {name: 'Actions'}))[0]!;
     expect(actions).toBeInTheDocument();
 
     await userEvent.click(actions);
@@ -362,7 +362,7 @@ describe('AlertRulesList', () => {
 
     // Uncheck myteams
     const myTeams = await screen.findAllByText('My Teams');
-    await userEvent.click(myTeams[1]);
+    await userEvent.click(myTeams[1]!);
 
     expect(router.push).toHaveBeenCalledWith(
       expect.objectContaining({
@@ -651,7 +651,7 @@ describe('AlertRulesList', () => {
       body: {},
     });
 
-    const actions = (await screen.findAllByRole('button', {name: 'Actions'}))[0];
+    const actions = (await screen.findAllByRole('button', {name: 'Actions'}))[0]!;
 
     // Add a new response to the mock with no rules
     const emptyListMock = MockApiClient.addMockResponse({
@@ -661,7 +661,7 @@ describe('AlertRulesList', () => {
     });
 
     expect(
-      screen.queryByRole('link', {name: 'Uptime Rule Auto Detected'})
+      screen.getByRole('link', {name: 'Uptime Rule Auto Detected'})
     ).toBeInTheDocument();
     await userEvent.click(actions);
     await userEvent.click(screen.getByRole('menuitemradio', {name: 'Delete'}));
diff --git a/static/app/views/alerts/list/rules/combinedAlertBadge.tsx b/static/app/views/alerts/list/rules/combinedAlertBadge.tsx
index b816eeaadc3240..7d7aecfc3e07f5 100644
--- a/static/app/views/alerts/list/rules/combinedAlertBadge.tsx
+++ b/static/app/views/alerts/list/rules/combinedAlertBadge.tsx
@@ -51,7 +51,7 @@ export default function CombinedAlertBadge({rule}: Props) {
   if (!isIssueAlertInstance && rule.monitorType === MonitorType.ACTIVATED) {
     const isWaiting =
       !rule.activations?.length ||
-      (rule.activations?.length && rule.activations[0].isComplete);
+      (rule.activations?.length && rule.activations[0]!.isComplete);
 
     return (
       <Tooltip
diff --git a/static/app/views/alerts/list/rules/row.tsx b/static/app/views/alerts/list/rules/row.tsx
index b2c0bdbec4aeb9..9f669bfd101c71 100644
--- a/static/app/views/alerts/list/rules/row.tsx
+++ b/static/app/views/alerts/list/rules/row.tsx
@@ -65,7 +65,7 @@ function RuleListRow({
     rule.type === CombinedAlertType.METRIC && rule.monitorType === MonitorType.ACTIVATED;
   const isUptime = rule.type === CombinedAlertType.UPTIME;
 
-  const slug = isUptime ? rule.projectSlug : rule.projects[0];
+  const slug = isUptime ? rule.projectSlug : rule.projects[0]!;
 
   const editKey = {
     [CombinedAlertType.ISSUE]: 'rules',
@@ -174,7 +174,7 @@ function RuleListRow({
     }))
     .concat(unassignedOption);
 
-  const teamId = assignee?.split(':')[1];
+  const teamId = assignee?.split(':')[1]!;
   const teamName = filteredProjectTeams.find(team => team.id === teamId);
 
   const assigneeTeamActor = assignee && {
diff --git a/static/app/views/alerts/list/rules/teamFilter.tsx b/static/app/views/alerts/list/rules/teamFilter.tsx
index a0552245bcd783..5816188ef76bb7 100644
--- a/static/app/views/alerts/list/rules/teamFilter.tsx
+++ b/static/app/views/alerts/list/rules/teamFilter.tsx
@@ -16,17 +16,13 @@ interface Props {
   handleChangeFilter: (activeFilters: string[]) => void;
   selectedTeams: string[];
   /**
-   * only show teams user is a member of
+   * hide other teams suggestion
    */
-  showIsMemberTeams?: boolean;
+  hideOtherTeams?: boolean;
   /**
-   * show My Teams as the default dropdown description
+   * hide unassigned suggestion
    */
-  showMyTeamsDescription?: boolean;
-  /**
-   * show suggested options (My Teams and Unassigned)
-   */
-  showSuggestedOptions?: boolean;
+  hideUnassigned?: boolean;
 }
 
 const suggestedOptions = [
@@ -49,11 +45,10 @@ const makeTeamOption = (team: Team) => ({
 function TeamFilter({
   selectedTeams,
   handleChangeFilter,
-  showIsMemberTeams = false,
-  showSuggestedOptions = true,
-  showMyTeamsDescription = false,
+  hideUnassigned = false,
+  hideOtherTeams = false,
 }: Props) {
-  const {teams, onSearch, fetching} = useTeams({provideUserTeams: showIsMemberTeams});
+  const {teams, onSearch, fetching} = useTeams();
 
   const [myTeams, otherTeams] = partition(teams, team => team.isMember);
   const myTeamOptions = myTeams.map(makeTeamOption);
@@ -77,11 +72,8 @@ function TeamFilter({
       ];
     }
 
-    return [
-      <IconUser key={0} />,
-      showMyTeamsDescription ? t('My Teams') : t('All Teams'),
-    ];
-  }, [selectedTeams, teams, showMyTeamsDescription]);
+    return [<IconUser key={0} />, t('All Teams')];
+  }, [selectedTeams, teams]);
 
   return (
     <CompactSelect
@@ -91,11 +83,17 @@ function TeamFilter({
       loading={fetching}
       menuTitle={t('Filter teams')}
       options={[
-        ...(showSuggestedOptions
-          ? [{value: '_suggested', label: t('Suggested'), options: suggestedOptions}]
-          : []),
+        {
+          value: '_suggested',
+          label: t('Suggested'),
+          options: suggestedOptions.filter(
+            opt => !hideUnassigned || opt.value !== 'unassigned'
+          ),
+        },
         {value: '_my_teams', label: t('My Teams'), options: myTeamOptions},
-        {value: '_teams', label: t('Other Teams'), options: otherTeamOptions},
+        ...(hideOtherTeams
+          ? []
+          : [{value: '_teams', label: t('Other Teams'), options: otherTeamOptions}]),
       ]}
       value={selectedTeams}
       onSearch={debounce(val => void onSearch(val), DEFAULT_DEBOUNCE_DURATION)}
diff --git a/static/app/views/alerts/rules/issue/addIntegrationRow.spec.tsx b/static/app/views/alerts/rules/issue/addIntegrationRow.spec.tsx
index 6d261b388374b4..2497fc827f8ee9 100644
--- a/static/app/views/alerts/rules/issue/addIntegrationRow.spec.tsx
+++ b/static/app/views/alerts/rules/issue/addIntegrationRow.spec.tsx
@@ -22,7 +22,7 @@ describe('AddIntegrationRow', function () {
   const getComponent = () => (
     <IntegrationContext.Provider
       value={{
-        provider: provider,
+        provider,
         type: 'first_party',
         installStatus: 'Not Installed',
         analyticsParams: {
diff --git a/static/app/views/alerts/rules/issue/addIntegrationRow.tsx b/static/app/views/alerts/rules/issue/addIntegrationRow.tsx
index bd6f0404a0236d..35085ad5e682ba 100644
--- a/static/app/views/alerts/rules/issue/addIntegrationRow.tsx
+++ b/static/app/views/alerts/rules/issue/addIntegrationRow.tsx
@@ -6,7 +6,6 @@ import {LinkButton} from 'sentry/components/button';
 import PluginIcon from 'sentry/plugins/components/pluginIcon';
 import ConfigStore from 'sentry/stores/configStore';
 import {space} from 'sentry/styles/space';
-import {trackAnalytics} from 'sentry/utils/analytics';
 import useOrganization from 'sentry/utils/useOrganization';
 import IntegrationButton from 'sentry/views/settings/organizationIntegrations/integrationButton';
 import {IntegrationContext} from 'sentry/views/settings/organizationIntegrations/integrationContext';
@@ -27,13 +26,6 @@ function AddIntegrationRow({onClick}: Props) {
     integration.onAddIntegration?.();
     onClick();
   };
-  const onExternalClick = () => {
-    trackAnalytics('onboarding.messaging_integration_external_install_clicked', {
-      provider_key: provider.key,
-      organization,
-    });
-    onClick();
-  };
 
   const buttonProps = {
     size: 'sm',
@@ -61,7 +53,7 @@ function AddIntegrationRow({onClick}: Props) {
             <StyledButton
               userHasAccess={hasAccess}
               onAddIntegration={onAddIntegration}
-              onExternalClick={onExternalClick}
+              onExternalClick={onClick}
               externalInstallText={`Add ${provider.metadata.noun}`}
               buttonProps={buttonProps}
             />
diff --git a/static/app/views/alerts/rules/issue/details/ruleDetails.spec.tsx b/static/app/views/alerts/rules/issue/details/ruleDetails.spec.tsx
index 0d1d7af82ceb16..5814a0532b59f7 100644
--- a/static/app/views/alerts/rules/issue/details/ruleDetails.spec.tsx
+++ b/static/app/views/alerts/rules/issue/details/ruleDetails.spec.tsx
@@ -9,7 +9,6 @@ import {initializeOrg} from 'sentry-test/initializeOrg';
 import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 
 import ProjectsStore from 'sentry/stores/projectsStore';
-import {browserHistory} from 'sentry/utils/browserHistory';
 
 import AlertRuleDetails from './ruleDetails';
 
@@ -41,7 +40,6 @@ describe('AlertRuleDetails', () => {
   };
 
   beforeEach(() => {
-    browserHistory.push = jest.fn();
     MockApiClient.addMockResponse({
       url: `/projects/${organization.slug}/${project.slug}/rules/${rule.id}/`,
       body: rule,
@@ -111,7 +109,7 @@ describe('AlertRuleDetails', () => {
     expect(await screen.findByLabelText('Next')).toBeEnabled();
     await userEvent.click(screen.getByLabelText('Next'));
 
-    expect(browserHistory.push).toHaveBeenCalledWith({
+    expect(context.router.push).toHaveBeenCalledWith({
       pathname: '/mock-pathname/',
       query: {
         cursor: '0:100:0',
diff --git a/static/app/views/alerts/rules/issue/index.spec.tsx b/static/app/views/alerts/rules/issue/index.spec.tsx
index bf17d3a6a5c597..653892a1a448a4 100644
--- a/static/app/views/alerts/rules/issue/index.spec.tsx
+++ b/static/app/views/alerts/rules/issue/index.spec.tsx
@@ -27,7 +27,6 @@ import {updateOnboardingTask} from 'sentry/actionCreators/onboardingTasks';
 import ProjectsStore from 'sentry/stores/projectsStore';
 import type {PlainRoute} from 'sentry/types/legacyReactRouter';
 import {metric} from 'sentry/utils/analytics';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import IssueRuleEditor from 'sentry/views/alerts/rules/issue';
 import {permissionAlertText} from 'sentry/views/settings/project/permissionAlert';
 import ProjectAlerts from 'sentry/views/settings/projectAlerts';
@@ -125,7 +124,6 @@ const createWrapper = (props = {}) => {
 describe('IssueRuleEditor', function () {
   beforeEach(function () {
     MockApiClient.clearMockResponses();
-    browserHistory.replace = jest.fn();
     MockApiClient.addMockResponse({
       url: '/projects/org-slug/project-slug/rules/configuration/',
       body: ProjectAlertRuleConfigurationFixture(),
@@ -227,8 +225,8 @@ describe('IssueRuleEditor', function () {
         method: 'DELETE',
         body: {},
       });
-      createWrapper();
-      renderGlobalModal();
+      const {router} = createWrapper();
+      renderGlobalModal({router});
       await userEvent.click(screen.getByLabelText('Delete Rule'));
 
       expect(
@@ -237,7 +235,7 @@ describe('IssueRuleEditor', function () {
       await userEvent.click(screen.getByTestId('confirm-button'));
 
       await waitFor(() => expect(deleteMock).toHaveBeenCalled());
-      expect(browserHistory.replace).toHaveBeenCalledWith(
+      expect(router.replace).toHaveBeenCalledWith(
         '/settings/org-slug/projects/project-slug/alerts/'
       );
     });
@@ -425,7 +423,7 @@ describe('IssueRuleEditor', function () {
       // Production environment is preselected because it's the first option.
       // staging should also be selectable.
       await selectEvent.select(
-        within(filtersContainer).getAllByText('production')[0],
+        within(filtersContainer).getAllByText('production')[0]!,
         'staging'
       );
     });
@@ -542,7 +540,7 @@ describe('IssueRuleEditor', function () {
       });
 
       expect(await screen.findByTestId('alert-name')).toHaveValue(`${rule.name} copy`);
-      expect(screen.queryByText('A new issue is created')).toBeInTheDocument();
+      expect(screen.getByText('A new issue is created')).toBeInTheDocument();
       expect(mock).toHaveBeenCalled();
     });
 
diff --git a/static/app/views/alerts/rules/issue/index.tsx b/static/app/views/alerts/rules/issue/index.tsx
index edc9575a9da464..acb9858f8c5f19 100644
--- a/static/app/views/alerts/rules/issue/index.tsx
+++ b/static/app/views/alerts/rules/issue/index.tsx
@@ -693,7 +693,7 @@ class IssueRuleEditor extends DeprecatedAsyncView<Props, State> {
       const clonedState = cloneDeep(prevState);
 
       // Set initial configuration, but also set
-      const id = (clonedState.rule as IssueAlertRule)[type][idx].id;
+      const id = (clonedState.rule as IssueAlertRule)[type]![idx]!.id;
       const newRule = {
         ...this.getInitialValue(type, id),
         id,
@@ -1104,7 +1104,7 @@ class IssueRuleEditor extends DeprecatedAsyncView<Props, State> {
                     undefined &&
                   nextSelectedProject.teams.length
                 ) {
-                  this.handleOwnerChange({value: nextSelectedProject.teams[0].id});
+                  this.handleOwnerChange({value: nextSelectedProject.teams[0]!.id});
                 }
 
                 this.setState({project: nextSelectedProject});
@@ -1239,9 +1239,7 @@ class IssueRuleEditor extends DeprecatedAsyncView<Props, State> {
               <SetupMessagingIntegrationButton
                 projectId={project.id}
                 refetchConfigs={this.refetchConfigs}
-                analyticsParams={{
-                  view: MessagingIntegrationAnalyticsView.ALERT_RULE_CREATION,
-                }}
+                analyticsView={MessagingIntegrationAnalyticsView.ALERT_RULE_CREATION}
               />
             </SetConditionsListItem>
             <ContentIndent>
@@ -1310,8 +1308,8 @@ class IssueRuleEditor extends DeprecatedAsyncView<Props, State> {
                           error={
                             this.hasError('conditions') && (
                               <StyledAlert type="error">
-                                {detailedError?.conditions[0]}
-                                {(detailedError?.conditions[0] || '').startsWith(
+                                {detailedError?.conditions![0]}
+                                {(detailedError?.conditions![0] || '').startsWith(
                                   'You may not exceed'
                                 ) && (
                                   <Fragment>
@@ -1395,7 +1393,7 @@ class IssueRuleEditor extends DeprecatedAsyncView<Props, State> {
                           error={
                             this.hasError('filters') && (
                               <StyledAlert type="error">
-                                {detailedError?.filters[0]}
+                                {detailedError?.filters![0]}
                               </StyledAlert>
                             )
                           }
@@ -1444,7 +1442,7 @@ class IssueRuleEditor extends DeprecatedAsyncView<Props, State> {
                           error={
                             this.hasError('actions') && (
                               <StyledAlert type="error">
-                                {detailedError?.actions[0]}
+                                {detailedError?.actions![0]}
                               </StyledAlert>
                             )
                           }
@@ -1530,7 +1528,7 @@ export const findIncompatibleRules = (
     let eventFrequency = -1;
     let userFrequency = -1;
     for (let i = 0; i < conditions.length; i++) {
-      const id = conditions[i].id;
+      const id = conditions[i]!.id;
       if (id === IssueAlertConditionType.FIRST_SEEN_EVENT) {
         firstSeen = i;
       } else if (id === IssueAlertConditionType.REGRESSION_EVENT) {
@@ -1539,12 +1537,12 @@ export const findIncompatibleRules = (
         reappeared = i;
       } else if (
         id === IssueAlertConditionType.EVENT_FREQUENCY &&
-        (conditions[i].value as number) >= 1
+        (conditions[i]!.value as number) >= 1
       ) {
         eventFrequency = i;
       } else if (
         id === IssueAlertConditionType.EVENT_UNIQUE_USER_FREQUENCY &&
-        (conditions[i].value as number) >= 1
+        (conditions[i]!.value as number) >= 1
       ) {
         userFrequency = i;
       }
@@ -1569,7 +1567,7 @@ export const findIncompatibleRules = (
   if (firstSeen !== -1 && (rule.actionMatch === 'all' || conditions.length === 1)) {
     let incompatibleFilters = 0;
     for (let i = 0; i < filters.length; i++) {
-      const filter = filters[i];
+      const filter = filters[i]!;
       const id = filter.id;
       if (id === IssueAlertFilterType.ISSUE_OCCURRENCES && filter) {
         if (
diff --git a/static/app/views/alerts/rules/issue/messagingIntegrationModal.spec.tsx b/static/app/views/alerts/rules/issue/messagingIntegrationModal.spec.tsx
index 99623d4611298c..bb55c8ab260385 100644
--- a/static/app/views/alerts/rules/issue/messagingIntegrationModal.spec.tsx
+++ b/static/app/views/alerts/rules/issue/messagingIntegrationModal.spec.tsx
@@ -9,8 +9,8 @@ import {
   ModalBody,
   ModalFooter,
 } from 'sentry/components/globalModal/components';
-import {t} from 'sentry/locale';
 import MessagingIntegrationModal from 'sentry/views/alerts/rules/issue/messagingIntegrationModal';
+import {MessagingIntegrationAnalyticsView} from 'sentry/views/alerts/rules/issue/setupMessagingIntegrationButton';
 
 jest.mock('sentry/actionCreators/modal');
 
@@ -26,17 +26,18 @@ describe('MessagingIntegrationModal', function () {
       closeModal={closeModal}
       Header={makeClosableHeader(() => {})}
       Body={ModalBody}
-      headerContent={t('Connect with a messaging tool')}
-      bodyContent={t('Receive alerts and digests right where you work.')}
+      headerContent={'Connect with a messaging tool'}
+      bodyContent={'Receive alerts and digests right where you work.'}
       providers={providers}
       CloseButton={makeCloseButton(() => {})}
       Footer={ModalFooter}
+      analyticsView={MessagingIntegrationAnalyticsView.PROJECT_CREATION}
       {...props}
     />
   );
 
   it('renders', async function () {
-    render(getComponent(), {organization: organization});
+    render(getComponent(), {organization});
 
     const heading = await screen.findByRole('heading', {
       name: /connect with a messaging tool/i,
diff --git a/static/app/views/alerts/rules/issue/messagingIntegrationModal.tsx b/static/app/views/alerts/rules/issue/messagingIntegrationModal.tsx
index d7f2e9fa80118c..4b57671369e3bc 100644
--- a/static/app/views/alerts/rules/issue/messagingIntegrationModal.tsx
+++ b/static/app/views/alerts/rules/issue/messagingIntegrationModal.tsx
@@ -5,9 +5,11 @@ import type {ModalRenderProps} from 'sentry/actionCreators/modal';
 import {space} from 'sentry/styles/space';
 import type {IntegrationProvider} from 'sentry/types/integrations';
 import AddIntegrationRow from 'sentry/views/alerts/rules/issue/addIntegrationRow';
+import type {MessagingIntegrationAnalyticsView} from 'sentry/views/alerts/rules/issue/setupMessagingIntegrationButton';
 import {IntegrationContext} from 'sentry/views/settings/organizationIntegrations/integrationContext';
 
 type Props = ModalRenderProps & {
+  analyticsView: MessagingIntegrationAnalyticsView;
   headerContent: React.ReactNode;
   providers: IntegrationProvider[];
   bodyContent?: React.ReactNode;
@@ -24,6 +26,7 @@ function MessagingIntegrationModal({
   providers,
   modalParams,
   onAddIntegration,
+  analyticsView,
 }: Props) {
   return (
     <Fragment>
@@ -38,14 +41,14 @@ function MessagingIntegrationModal({
               <IntegrationContext.Provider
                 key={provider.key}
                 value={{
-                  provider: provider,
+                  provider,
                   type: 'first_party',
                   installStatus: 'Not Installed',
                   analyticsParams: {
                     already_installed: false,
-                    view: 'messaging_integration_onboarding',
+                    view: analyticsView,
                   },
-                  onAddIntegration: onAddIntegration,
+                  onAddIntegration,
                   ...(modalParams && {modalParams}),
                 }}
               >
diff --git a/static/app/views/alerts/rules/issue/ruleNodeList.tsx b/static/app/views/alerts/rules/issue/ruleNodeList.tsx
index 376504d50d3d3d..3c9bd8cab738bc 100644
--- a/static/app/views/alerts/rules/issue/ruleNodeList.tsx
+++ b/static/app/views/alerts/rules/issue/ruleNodeList.tsx
@@ -184,7 +184,7 @@ class RuleNodeList extends Component<Props> {
       return node;
     }
 
-    const item = items[itemIdx];
+    const item = items[itemIdx]!;
 
     let changeAlertNode: IssueAlertGenericConditionConfig = {
       ...(node as IssueAlertGenericConditionConfig),
diff --git a/static/app/views/alerts/rules/issue/sentryAppRuleModal.spec.tsx b/static/app/views/alerts/rules/issue/sentryAppRuleModal.spec.tsx
index 3c727c34d41a5e..11aa2b96e15a1c 100644
--- a/static/app/views/alerts/rules/issue/sentryAppRuleModal.spec.tsx
+++ b/static/app/views/alerts/rules/issue/sentryAppRuleModal.spec.tsx
@@ -145,17 +145,17 @@ describe('SentryAppRuleModal', function () {
       const descriptionInput = screen.getByTestId('description');
       await userEvent.type(descriptionInput, 'some description');
 
-      const channelInput = screen.getAllByText('Type to search')[0];
+      const channelInput = screen.getAllByText('Type to search')[0]!;
       await userEvent.type(channelInput, '{keyDown}');
       await userEvent.click(screen.getByText('valor'));
 
       // Ensure text fields are persisted on edit
       const savedExtraDetailsInput = screen.getByDisplayValue(
-        resetValues.settings[0].value
+        resetValues.settings[0]!.value
       );
       expect(savedExtraDetailsInput).toBeInTheDocument();
       // Ensure select fields are persisted with labels on edit
-      const savedAssigneeInput = screen.getByText(resetValues.settings[1].label!);
+      const savedAssigneeInput = screen.getByText(resetValues.settings[1]!.label!);
       expect(savedAssigneeInput).toBeInTheDocument();
 
       // Ensure async select fields filter correctly
@@ -169,13 +169,106 @@ describe('SentryAppRuleModal', function () {
       });
       const workspaceInput = screen.getByText('Type to search');
       // Search by value
-      await userEvent.type(workspaceInput, workspaceChoices[1][0]);
+      await userEvent.type(workspaceInput, workspaceChoices[1]![0]!);
       await waitFor(() => expect(workspaceResponse).toHaveBeenCalled());
       // Select by label
-      await userEvent.click(screen.getByText(workspaceChoices[1][1]));
+      await userEvent.click(screen.getByText(workspaceChoices[1]![1]!));
 
       await submitSuccess();
     });
+    it('should load all default fields correctly', function () {
+      const schema: SchemaFormConfig = {
+        uri: '/api/sentry/issue-link/create/',
+        required_fields: [
+          {
+            type: 'text',
+            label: 'Task Name',
+            name: 'title',
+            default: 'issue.title',
+          },
+        ],
+        optional_fields: [
+          {
+            type: 'select',
+            label: 'What is the estimated complexity?',
+            name: 'complexity',
+            choices: [
+              ['low', 'low'],
+              ['high', 'high'],
+              ['medium', 'medium'],
+            ],
+          },
+        ],
+      };
+      const defaultValues = {
+        settings: [
+          {
+            name: 'title',
+            value: 'poiggers',
+          },
+          {
+            name: 'complexity',
+            value: 'low',
+          },
+        ],
+      };
+
+      createWrapper({config: schema, resetValues: defaultValues});
+
+      expect(screen.getByText('low')).toBeInTheDocument();
+      expect(screen.queryByText('poiggers')).not.toBeInTheDocument();
+    });
+    it('should not make external calls until depends on fields are filled in', async function () {
+      const mockApi = MockApiClient.addMockResponse({
+        url: `/sentry-app-installations/${sentryAppInstallation.uuid}/external-requests/`,
+        body: {
+          choices: [
+            ['low', 'Low'],
+            ['medium', 'Medium'],
+            ['high', 'High'],
+          ],
+        },
+      });
+
+      const schema: SchemaFormConfig = {
+        uri: '/api/sentry/issue-link/create/',
+        required_fields: [
+          {
+            type: 'text',
+            label: 'Task Name',
+            name: 'title',
+          },
+        ],
+        optional_fields: [
+          {
+            type: 'select',
+            label: 'What is the estimated complexity?',
+            name: 'complexity',
+            depends_on: ['title'],
+            skip_load_on_open: true,
+            uri: '/api/sentry/options/complexity-options/',
+            choices: [],
+          },
+        ],
+      };
+      const defaultValues = {
+        settings: [
+          {
+            name: 'extra',
+            value: 'saved details from last edit',
+          },
+        ],
+      };
+
+      createWrapper({config: schema, resetValues: defaultValues});
+      await waitFor(() => expect(mockApi).not.toHaveBeenCalled());
+
+      await userEvent.type(screen.getByText('Task Name'), 'sooo coooool');
+
+      // Now that the title is filled we should get the options
+      await waitFor(() => expect(mockApi).toHaveBeenCalled());
+    });
+
     it('should load complexity options from backend when column has a default value', async function () {
       const mockApi = MockApiClient.addMockResponse({
         url: `/sentry-app-installations/${sentryAppInstallation.uuid}/external-requests/`,
@@ -233,10 +326,74 @@ describe('SentryAppRuleModal', function () {
       const complexityInput = screen.getByLabelText('What is the estimated complexity?', {
         selector: 'input#complexity',
       });
+
+      expect(screen.queryByText('Low')).not.toBeInTheDocument();
       await userEvent.click(complexityInput);
       expect(screen.getByText('Low')).toBeInTheDocument();
       expect(screen.getByText('Medium')).toBeInTheDocument();
       expect(screen.getByText('High')).toBeInTheDocument();
     });
+
+    it('should populate skip_load_on fields with the default value', async function () {
+      const mockApi = MockApiClient.addMockResponse({
+        url: `/sentry-app-installations/${sentryAppInstallation.uuid}/external-requests/`,
+        body: {
+          choices: [
+            ['low', 'Low'],
+            ['medium', 'Medium'],
+            ['high', 'High'],
+          ],
+        },
+      });
+
+      const schema: SchemaFormConfig = {
+        uri: '/api/sentry/issue-link/create/',
+        required_fields: [
+          {
+            type: 'text',
+            label: 'Task Name',
+            name: 'title',
+            defaultValue: 'pog',
+            default: 'issue.title',
+          },
+        ],
+        optional_fields: [
+          {
+            type: 'select',
+            label: 'What is the estimated complexity?',
+            name: 'complexity',
+            depends_on: ['title'],
+            skip_load_on_open: true,
+            uri: '/api/sentry/options/complexity-options/',
+            choices: [],
+          },
+        ],
+      };
+      const defaultValues = {
+        settings: [
+          {
+            name: 'extra',
+            value: 'saved details from last edit',
+          },
+          {
+            name: 'assignee',
+            value: 'edna-mode',
+            label: 'Edna Mode',
+          },
+          {
+            name: 'complexity',
+            value: 'low',
+          },
+        ],
+      };
+
+      createWrapper({config: schema, resetValues: defaultValues});
+
+      // Wait for component to mount and state to update
+      await waitFor(() => expect(mockApi).toHaveBeenCalled());
+      expect(screen.getByText('Low')).toBeInTheDocument();
+      expect(screen.queryByText('Medium')).not.toBeInTheDocument();
+      expect(screen.queryByText('High')).not.toBeInTheDocument();
+    });
   });
 });
diff --git a/static/app/views/alerts/rules/issue/setupMessagingIntegrationButton.spec.tsx b/static/app/views/alerts/rules/issue/setupMessagingIntegrationButton.spec.tsx
index d2af62e760707d..9417c3d6bec191 100644
--- a/static/app/views/alerts/rules/issue/setupMessagingIntegrationButton.spec.tsx
+++ b/static/app/views/alerts/rules/issue/setupMessagingIntegrationButton.spec.tsx
@@ -25,7 +25,7 @@ describe('SetupAlertIntegrationButton', function () {
     <SetupMessagingIntegrationButton
       projectId={project.id}
       refetchConfigs={jest.fn()}
-      analyticsParams={{view: MessagingIntegrationAnalyticsView.ALERT_RULE_CREATION}}
+      analyticsView={MessagingIntegrationAnalyticsView.ALERT_RULE_CREATION}
     />
   );
 
@@ -49,7 +49,7 @@ describe('SetupAlertIntegrationButton', function () {
         body: [{status: 'disabled'}, {status: 'disabled'}, {status: 'disabled'}],
       })
     );
-    render(getComponent(), {organization: organization});
+    render(getComponent(), {organization});
     mockResponses.forEach(mock => {
       expect(mock).toHaveBeenCalled();
     });
@@ -63,7 +63,7 @@ describe('SetupAlertIntegrationButton', function () {
         body: [{status: 'active'}, {status: 'disabled'}, {status: 'disabled'}],
       })
     );
-    render(getComponent(), {organization: organization});
+    render(getComponent(), {organization});
     mockResponses.forEach(mock => {
       expect(mock).toHaveBeenCalled();
     });
@@ -77,7 +77,7 @@ describe('SetupAlertIntegrationButton', function () {
         body: [{status: 'disabled'}, {status: 'disabled'}, {status: 'disabled'}],
       })
     );
-    render(getComponent(), {organization: organization});
+    render(getComponent(), {organization});
     mockResponses.forEach(mock => {
       expect(mock).toHaveBeenCalled();
     });
@@ -94,7 +94,7 @@ describe('SetupAlertIntegrationButton', function () {
         body: {error: 'internal error'},
       })
     );
-    render(getComponent(), {organization: organization});
+    render(getComponent(), {organization});
     expect(screen.queryByRole('button')).not.toBeInTheDocument();
   });
 
@@ -119,7 +119,7 @@ describe('SetupAlertIntegrationButton', function () {
       };
     });
 
-    render(getComponent(), {organization: organization});
+    render(getComponent(), {organization});
     mockResponses.forEach(mock => {
       expect(mock).toHaveBeenCalled();
     });
diff --git a/static/app/views/alerts/rules/issue/setupMessagingIntegrationButton.tsx b/static/app/views/alerts/rules/issue/setupMessagingIntegrationButton.tsx
index 8094dd8535b40d..6eef65e5e55403 100644
--- a/static/app/views/alerts/rules/issue/setupMessagingIntegrationButton.tsx
+++ b/static/app/views/alerts/rules/issue/setupMessagingIntegrationButton.tsx
@@ -9,28 +9,25 @@ import type {
   IntegrationProvider,
   OrganizationIntegration,
 } from 'sentry/types/integrations';
-import {trackAnalytics} from 'sentry/utils/analytics';
 import {getIntegrationFeatureGate} from 'sentry/utils/integrationUtil';
 import {useApiQueries, useApiQuery} from 'sentry/utils/queryClient';
 import useOrganization from 'sentry/utils/useOrganization';
 import MessagingIntegrationModal from 'sentry/views/alerts/rules/issue/messagingIntegrationModal';
 
 export enum MessagingIntegrationAnalyticsView {
-  ALERT_RULE_CREATION = 'alert_rule_creation',
-  PROJECT_CREATION = 'project_creation',
+  ALERT_RULE_CREATION = 'alert_rule_creation_messaging_integration_onboarding',
+  PROJECT_CREATION = 'project_creation_messaging_integration_onboarding',
 }
 
 type Props = {
-  analyticsParams?: {
-    view: MessagingIntegrationAnalyticsView;
-  };
+  analyticsView: MessagingIntegrationAnalyticsView;
   projectId?: string;
   refetchConfigs?: () => void;
 };
 
 function SetupMessagingIntegrationButton({
   refetchConfigs,
-  analyticsParams,
+  analyticsView,
   projectId,
 }: Props) {
   const providerKeys = ['slack', 'discord', 'msteams'];
@@ -66,7 +63,7 @@ function SetupMessagingIntegrationButton({
     messagingIntegrationsQuery.isError ||
     integrationProvidersQuery.some(({isPending}) => isPending) ||
     integrationProvidersQuery.some(({isError}) => isError) ||
-    integrationProvidersQuery[0].data == null
+    integrationProvidersQuery[0]!.data == null
   ) {
     return null;
   }
@@ -78,7 +75,7 @@ function SetupMessagingIntegrationButton({
   return (
     <IntegrationFeatures
       organization={organization}
-      features={integrationProvidersQuery[0].data.providers[0]?.metadata?.features}
+      features={integrationProvidersQuery[0]!.data.providers[0]!?.metadata?.features}
     >
       {({disabled, disabledReason}) => (
         <div>
@@ -111,17 +108,14 @@ function SetupMessagingIntegrationButton({
                           provider !== undefined
                       )}
                     onAddIntegration={onAddIntegration}
-                    {...(projectId && {modalParams: {projectId: projectId}})}
+                    {...(projectId && {modalParams: {projectId}})}
+                    analyticsView={analyticsView}
                   />
                 ),
                 {
                   closeEvents: 'escape-key',
                 }
               );
-              trackAnalytics('onboarding.messaging_integration_modal_rendered', {
-                organization,
-                ...analyticsParams,
-              });
             }}
           >
             {t('Connect to messaging')}
diff --git a/static/app/views/alerts/rules/metric/constants.tsx b/static/app/views/alerts/rules/metric/constants.tsx
index f8ee77718f4b61..6df9c964b72b80 100644
--- a/static/app/views/alerts/rules/metric/constants.tsx
+++ b/static/app/views/alerts/rules/metric/constants.tsx
@@ -202,7 +202,7 @@ export function getAlertTimeWindow(period: string | undefined): TimeWindow | und
     .sort((a, b) => a - b);
 
   for (let index = 0; index < timeWindows.length; index++) {
-    const timeWindow = timeWindows[index];
+    const timeWindow = timeWindows[index]!;
     if (periodMinutes <= timeWindow) {
       return timeWindow;
     }
@@ -235,7 +235,7 @@ export function createRuleFromEventView(eventView: EventView): UnsavedMetricRule
     query: parsedQuery?.query ?? eventView.query,
     aggregate,
     timeWindow: getAlertTimeWindow(eventView.interval) ?? defaultRule.timeWindow,
-    environment: eventView.environment.length ? eventView.environment[0] : null,
+    environment: eventView.environment.length ? eventView.environment[0]! : null,
   };
 }
 
diff --git a/static/app/views/alerts/rules/metric/details/index.tsx b/static/app/views/alerts/rules/metric/details/index.tsx
index 912c6261368bc4..0649b2e57d21e5 100644
--- a/static/app/views/alerts/rules/metric/details/index.tsx
+++ b/static/app/views/alerts/rules/metric/details/index.tsx
@@ -152,7 +152,7 @@ class MetricAlertDetails extends Component<Props, State> {
     }
 
     const timeOption =
-      TIME_OPTIONS.find(item => item.value === period) ?? TIME_OPTIONS[1];
+      TIME_OPTIONS.find(item => item.value === period) ?? TIME_OPTIONS[1]!;
     const start = getUtcDateString(
       moment(moment.utc().diff(TIME_WINDOWS[timeOption.value]))
     );
diff --git a/static/app/views/alerts/rules/metric/details/metricActivity.tsx b/static/app/views/alerts/rules/metric/details/metricActivity.tsx
index 640db2240b260b..116b223593058e 100644
--- a/static/app/views/alerts/rules/metric/details/metricActivity.tsx
+++ b/static/app/views/alerts/rules/metric/details/metricActivity.tsx
@@ -75,7 +75,7 @@ function MetricAlertActivity({organization, incident}: MetricAlertActivityProps)
               pathname: `/organizations/${
                 organization.slug
               }/releases/${encodeURIComponent(activation.activator)}/`,
-              query: {project: project},
+              query: {project},
             }}
             style={{textOverflow: 'ellipsis', overflowX: 'inherit'}}
           >
@@ -130,7 +130,7 @@ function MetricAlertActivity({organization, incident}: MetricAlertActivityProps)
               )}
               {COMPARISON_DELTA_OPTIONS.find(
                 ({value}) => value === incident.alertRule.comparisonDelta
-              )?.label ?? COMPARISON_DELTA_OPTIONS[0].label}
+              )?.label ?? COMPARISON_DELTA_OPTIONS[0]!.label}
             </Fragment>
           )}
         {/* If an alert rule is a static detection type */}
diff --git a/static/app/views/alerts/rules/metric/details/metricChart.tsx b/static/app/views/alerts/rules/metric/details/metricChart.tsx
index 5ec93e2e362aae..8337ddaec0e50d 100644
--- a/static/app/views/alerts/rules/metric/details/metricChart.tsx
+++ b/static/app/views/alerts/rules/metric/details/metricChart.tsx
@@ -114,12 +114,12 @@ function getRuleChangeSeries(
   data: AreaChartSeries[]
 ): LineSeriesOption[] {
   const {dateModified} = rule;
-  if (!data.length || !data[0].data.length || !dateModified) {
+  if (!data.length || !data[0]!.data.length || !dateModified) {
     return [];
   }
 
-  const seriesData = data[0].data;
-  const seriesStart = new Date(seriesData[0].name).getTime();
+  const seriesData = data[0]!.data;
+  const seriesStart = new Date(seriesData[0]!.name).getTime();
   const ruleChanged = new Date(dateModified).getTime();
 
   if (ruleChanged < seriesStart) {
@@ -254,13 +254,20 @@ class MetricChart extends PureComponent<Props, State> {
             </StyledSectionValue>
           </Fragment>
         </StyledInlineContainer>
-        {!isSessionAggregate(rule.aggregate) && (
-          <Feature features="discover-basic">
-            <Button size="sm" {...props}>
-              {buttonText}
-            </Button>
-          </Feature>
-        )}
+        {!isSessionAggregate(rule.aggregate) &&
+          (getAlertTypeFromAggregateDataset(rule) === 'eap_metrics' ? (
+            <Feature features="visibility-explore-view">
+              <Button size="sm" {...props}>
+                {buttonText}
+              </Button>
+            </Feature>
+          ) : (
+            <Feature features="discover-basic">
+              <Button size="sm" {...props}>
+                {buttonText}
+              </Button>
+            </Feature>
+          ))}
       </StyledChartControls>
     );
   }
@@ -399,7 +406,7 @@ class MetricChart extends PureComponent<Props, State> {
                         };
                         const endTime = formatTooltipDate(
                           moment(pointX).add(
-                            parseInt(period, 10),
+                            parseInt(period!, 10),
                             periodLength as StatsPeriodType
                           ),
                           'MMM D LT'
@@ -493,7 +500,7 @@ class MetricChart extends PureComponent<Props, State> {
       loading ||
       !this.props.isOnDemandAlert ||
       !shouldShowOnDemandMetricAlertUI(organization) ||
-      !isEmptySeries(timeseriesData[0])
+      !isEmptySeries(timeseriesData[0]!)
     ) {
       return null;
     }
diff --git a/static/app/views/alerts/rules/metric/details/metricChartOption.tsx b/static/app/views/alerts/rules/metric/details/metricChartOption.tsx
index f895a141d473ae..230ab9e45444f6 100644
--- a/static/app/views/alerts/rules/metric/details/metricChartOption.tsx
+++ b/static/app/views/alerts/rules/metric/details/metricChartOption.tsx
@@ -187,10 +187,10 @@ export function getMetricAlertChartOption({
   }));
   const areaSeries: AreaChartSeries[] = [];
   // Ensure series data appears below incident/mark lines
-  series[0].z = 1;
-  series[0].color = CHART_PALETTE[0][0];
+  series[0]!.z = 1;
+  series[0]!.color = CHART_PALETTE[0]![0]!;
 
-  const dataArr = timeseriesData[0].data;
+  const dataArr = timeseriesData[0]!.data;
 
   let maxSeriesValue = Number.NEGATIVE_INFINITY;
   let minSeriesValue = Number.POSITIVE_INFINITY;
@@ -218,9 +218,9 @@ export function getMetricAlertChartOption({
         ) / ALERT_CHART_MIN_MAX_BUFFER
       )
     : 0;
-  const startDate = new Date(dataArr[0]?.name);
+  const startDate = new Date(dataArr[0]!?.name);
   const endDate =
-    dataArr.length > 1 ? new Date(dataArr[dataArr.length - 1]?.name) : new Date();
+    dataArr.length > 1 ? new Date(dataArr[dataArr.length - 1]!?.name) : new Date();
   const firstPoint = startDate.getTime();
   const lastPoint = endDate.getTime();
   const totalDuration = lastPoint - firstPoint;
@@ -234,8 +234,8 @@ export function getMetricAlertChartOption({
 
   if (showWaitingForData) {
     const {startIndex, endIndex} = getWaitingForDataRange(dataArr);
-    const startTime = new Date(dataArr[startIndex]?.name).getTime();
-    const endTime = new Date(dataArr[endIndex]?.name).getTime();
+    const startTime = new Date(dataArr[startIndex]!?.name).getTime();
+    const endTime = new Date(dataArr[endIndex]!?.name).getTime();
 
     waitingForDataDuration = Math.abs(endTime - startTime);
 
@@ -283,15 +283,15 @@ export function getMetricAlertChartOption({
             incidentColor,
             incidentStartDate,
             incidentStartValue,
-            seriesName ?? series[0].seriesName,
+            seriesName ?? series[0]!.seriesName,
             rule.aggregate,
             handleIncidentClick
           )
         );
         const areaStart = Math.max(new Date(incident.dateStarted).getTime(), firstPoint);
         const areaEnd = Math.min(
-          statusChanges.length && statusChanges[0].dateCreated
-            ? new Date(statusChanges[0].dateCreated).getTime() - timeWindowMs
+          statusChanges.length && statusChanges[0]!.dateCreated
+            ? new Date(statusChanges[0]!.dateCreated).getTime() - timeWindowMs
             : new Date(incidentEnd).getTime(),
           lastPoint
         );
@@ -316,7 +316,7 @@ export function getMetricAlertChartOption({
           const statusAreaEnd = Math.min(
             idx === statusChanges.length - 1
               ? new Date(incidentEnd).getTime()
-              : new Date(statusChanges[idx + 1].dateCreated).getTime() - timeWindowMs,
+              : new Date(statusChanges[idx + 1]!.dateCreated).getTime() - timeWindowMs,
             lastPoint
           );
           const statusAreaColor =
@@ -390,7 +390,7 @@ export function getMetricAlertChartOption({
   const yAxis: YAXisComponentOption = {
     axisLabel: {
       formatter: (value: number) =>
-        alertAxisFormatter(value, timeseriesData[0].seriesName, rule.aggregate),
+        alertAxisFormatter(value, timeseriesData[0]!.seriesName, rule.aggregate),
     },
     max: isCrashFreeAlert(rule.dataset)
       ? 100
diff --git a/static/app/views/alerts/rules/metric/details/metricHistory.spec.tsx b/static/app/views/alerts/rules/metric/details/metricHistory.spec.tsx
index 7100372b1e59bd..d1e7e9b1ee127c 100644
--- a/static/app/views/alerts/rules/metric/details/metricHistory.spec.tsx
+++ b/static/app/views/alerts/rules/metric/details/metricHistory.spec.tsx
@@ -37,9 +37,9 @@ describe('MetricHistory', () => {
       IncidentFixture({id: `${id}`, identifier: `${id}`})
     );
     render(<MetricHistory incidents={incidents} />);
-    expect(screen.getAllByRole('link').length).toBe(3);
+    expect(screen.getAllByRole('link')).toHaveLength(3);
     await userEvent.click(screen.getByRole('button', {name: 'Show 7 Hidden Alerts'}));
-    expect(screen.getAllByRole('link').length).toBe(incidents.length);
+    expect(screen.getAllByRole('link')).toHaveLength(incidents.length);
   });
 
   it('filters incidents with no activities (unexpected behavior)', () => {
diff --git a/static/app/views/alerts/rules/metric/details/sidebar.tsx b/static/app/views/alerts/rules/metric/details/sidebar.tsx
index 3c0f4bf126b05a..40b5eec9b1f413 100644
--- a/static/app/views/alerts/rules/metric/details/sidebar.tsx
+++ b/static/app/views/alerts/rules/metric/details/sidebar.tsx
@@ -90,7 +90,7 @@ function TriggerDescription({
           timeWindow,
           comparisonDelta: (
             COMPARISON_DELTA_OPTIONS.find(({value}) => value === rule.comparisonDelta) ??
-            COMPARISON_DELTA_OPTIONS[0]
+            COMPARISON_DELTA_OPTIONS[0]!
           ).label,
         }
       )
diff --git a/static/app/views/alerts/rules/metric/duplicate.spec.tsx b/static/app/views/alerts/rules/metric/duplicate.spec.tsx
index ccf7e0038367b8..633bbb607759de 100644
--- a/static/app/views/alerts/rules/metric/duplicate.spec.tsx
+++ b/static/app/views/alerts/rules/metric/duplicate.spec.tsx
@@ -107,7 +107,7 @@ describe('MetricRuleDuplicate', function () {
 
   it('duplicates slack actions', async function () {
     const rule = MetricRuleFixture();
-    rule.triggers[0].actions.push({
+    rule.triggers[0]!.actions.push({
       id: '13',
       alertRuleTriggerId: '12',
       type: 'slack',
diff --git a/static/app/views/alerts/rules/metric/edit.tsx b/static/app/views/alerts/rules/metric/edit.tsx
index 61310cf28a7f22..0f1ccec0553be2 100644
--- a/static/app/views/alerts/rules/metric/edit.tsx
+++ b/static/app/views/alerts/rules/metric/edit.tsx
@@ -47,6 +47,7 @@ export function MetricRulesEdit({
     {
       staleTime: 0,
       retry: false,
+      refetchOnMount: true,
     }
   );
 
@@ -97,6 +98,9 @@ export function MetricRulesEdit({
   return (
     <RuleForm
       {...props}
+      // HACK: gnarly workaround to force the component to re-render when rule updates
+      // Remove this once the RuleForm component is refactored to use `react-query`
+      key={JSON.stringify(rule)}
       params={params}
       project={project}
       userTeamIds={userTeamIds}
diff --git a/static/app/views/alerts/rules/metric/metricRulePresets.tsx b/static/app/views/alerts/rules/metric/metricRulePresets.tsx
index b778e481660132..9440d02047e82c 100644
--- a/static/app/views/alerts/rules/metric/metricRulePresets.tsx
+++ b/static/app/views/alerts/rules/metric/metricRulePresets.tsx
@@ -8,8 +8,9 @@ import {getMetricsUrl} from 'sentry/utils/metrics';
 import {parseField} from 'sentry/utils/metrics/mri';
 import {MetricDisplayType} from 'sentry/utils/metrics/types';
 import type {TimePeriodType} from 'sentry/views/alerts/rules/metric/details/constants';
-import type {MetricRule} from 'sentry/views/alerts/rules/metric/types';
+import {Dataset, type MetricRule} from 'sentry/views/alerts/rules/metric/types';
 import {isCustomMetricField} from 'sentry/views/alerts/rules/metric/utils/isCustomMetricField';
+import {getAlertRuleExploreUrl} from 'sentry/views/alerts/rules/utils';
 import {getMetricRuleDiscoverUrl} from 'sentry/views/alerts/utils/getMetricRuleDiscoverUrl';
 
 interface PresetCta {
@@ -52,6 +53,17 @@ export function makeDefaultCta({
       to: '',
     };
   }
+  if (rule.dataset === Dataset.EVENTS_ANALYTICS_PLATFORM) {
+    return {
+      buttonText: t('Open in Explore'),
+      to: getAlertRuleExploreUrl({
+        rule,
+        orgSlug,
+        period: timePeriod.period,
+        projectId: projects[0]!.id,
+      }),
+    };
+  }
 
   if (isCustomMetricField(rule.aggregate)) {
     const {mri, aggregation} = parseField(rule.aggregate) ?? {};
diff --git a/static/app/views/alerts/rules/metric/mriField.tsx b/static/app/views/alerts/rules/metric/mriField.tsx
index 12e8d799e657b8..5f60362d13ca9e 100644
--- a/static/app/views/alerts/rules/metric/mriField.tsx
+++ b/static/app/views/alerts/rules/metric/mriField.tsx
@@ -59,7 +59,7 @@ function MriField({aggregate, project, onChange}: Props) {
         onChange(
           MRIToField(
             newSelection.mri,
-            filterAndSortAggregations(newSelection.operations)[0]
+            filterAndSortAggregations(newSelection.operations)[0]!
           ),
           {}
         );
diff --git a/static/app/views/alerts/rules/metric/ruleConditionsForm.spec.tsx b/static/app/views/alerts/rules/metric/ruleConditionsForm.spec.tsx
index c38e48b0529bda..e45d52156960cf 100644
--- a/static/app/views/alerts/rules/metric/ruleConditionsForm.spec.tsx
+++ b/static/app/views/alerts/rules/metric/ruleConditionsForm.spec.tsx
@@ -23,11 +23,11 @@ describe('RuleConditionsForm', () => {
     dataset: Dataset.ERRORS,
     disabled: false,
     isEditing: true,
-    onComparisonDeltaChange: _ => {},
+    onComparisonDeltaChange: () => {},
     onFilterSearch: mockSearch,
-    onMonitorTypeSelect: _ => {},
-    onTimeWindowChange: _ => {},
-    project: projects[0],
+    onMonitorTypeSelect: () => {},
+    onTimeWindowChange: () => {},
+    project: projects[0]!,
     thresholdChart: <div>chart</div>,
     timeWindow: 30,
   };
diff --git a/static/app/views/alerts/rules/metric/ruleConditionsForm.tsx b/static/app/views/alerts/rules/metric/ruleConditionsForm.tsx
index 44af1731f2fb9c..6c0e69418a0733 100644
--- a/static/app/views/alerts/rules/metric/ruleConditionsForm.tsx
+++ b/static/app/views/alerts/rules/metric/ruleConditionsForm.tsx
@@ -191,7 +191,7 @@ class RuleConditionsForm extends PureComponent<Props, State> {
 
     const tagsWithKind = Object.keys(tags).reduce<Record<string, Tag>>((acc, key) => {
       acc[key] = {
-        ...tags[key],
+        ...tags[key]!,
         kind: FieldKind.TAG,
       };
       return acc;
@@ -288,6 +288,19 @@ class RuleConditionsForm extends PureComponent<Props, State> {
       ]);
     }
 
+    if (this.props.dataset === Dataset.EVENTS_ANALYTICS_PLATFORM) {
+      options = pick(TIME_WINDOW_MAP, [
+        TimeWindow.FIVE_MINUTES,
+        TimeWindow.TEN_MINUTES,
+        TimeWindow.FIFTEEN_MINUTES,
+        TimeWindow.THIRTY_MINUTES,
+        TimeWindow.ONE_HOUR,
+        TimeWindow.TWO_HOURS,
+        TimeWindow.FOUR_HOURS,
+        TimeWindow.ONE_DAY,
+      ]);
+    }
+
     return Object.entries(options).map(([value, label]) => ({
       value: parseInt(value, 10),
       label: tct('[timeWindow] interval', {
@@ -461,7 +474,7 @@ class RuleConditionsForm extends PureComponent<Props, State> {
                     undefined &&
                   nextSelectedProject.teams.length
                 ) {
-                  model.setValue('owner', `team:${nextSelectedProject.teams[0].id}`);
+                  model.setValue('owner', `team:${nextSelectedProject.teams[0]!.id}`);
                 }
                 onChange(value, {});
                 onBlur(value, {});
@@ -768,16 +781,12 @@ class RuleConditionsForm extends PureComponent<Props, State> {
                           <EAPSpanSearchQueryBuilder
                             numberTags={tags?.number ?? {}}
                             stringTags={tags?.string ?? {}}
-                            initialQuery={initialData?.query ?? ''}
+                            initialQuery={value ?? ''}
                             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)]}
                           />
diff --git a/static/app/views/alerts/rules/metric/ruleForm.spec.tsx b/static/app/views/alerts/rules/metric/ruleForm.spec.tsx
index 02332d045fbc2c..e53a2609b1c857 100644
--- a/static/app/views/alerts/rules/metric/ruleForm.spec.tsx
+++ b/static/app/views/alerts/rules/metric/ruleForm.spec.tsx
@@ -214,7 +214,7 @@ describe('Incident Rules Form', () => {
       );
 
       // Set thresholdPeriod
-      await selectEvent.select(screen.getAllByText('For 1 minute')[0], 'For 10 minutes');
+      await selectEvent.select(screen.getAllByText('For 1 minute')[0]!, 'For 10 minutes');
 
       await userEvent.click(screen.getByLabelText('Save Rule'));
 
@@ -492,7 +492,7 @@ describe('Incident Rules Form', () => {
       );
 
       // Set thresholdPeriod
-      await selectEvent.select(screen.getAllByText('For 1 minute')[0], 'For 10 minutes');
+      await selectEvent.select(screen.getAllByText('For 1 minute')[0]!, 'For 10 minutes');
 
       await userEvent.click(screen.getByLabelText('Save Rule'));
 
diff --git a/static/app/views/alerts/rules/metric/ruleForm.tsx b/static/app/views/alerts/rules/metric/ruleForm.tsx
index 8c82d5b9f875b2..d6d97f11e40ebb 100644
--- a/static/app/views/alerts/rules/metric/ruleForm.tsx
+++ b/static/app/views/alerts/rules/metric/ruleForm.tsx
@@ -482,8 +482,8 @@ class RuleFormContainer extends DeprecatedAsyncComponent<Props, State> {
       );
       const warningTriggerIndex = criticalTriggerIndex ^ 1;
       const triggersCopy = [...triggers];
-      const criticalTrigger = triggersCopy[criticalTriggerIndex];
-      const warningTrigger = triggersCopy[warningTriggerIndex];
+      const criticalTrigger = triggersCopy[criticalTriggerIndex]!;
+      const warningTrigger = triggersCopy[warningTriggerIndex]!;
       criticalTrigger.alertThreshold = 0;
       warningTrigger.alertThreshold = ''; // we need to set this to empty
       this.setState({triggers: triggersCopy});
@@ -524,8 +524,8 @@ class RuleFormContainer extends DeprecatedAsyncComponent<Props, State> {
       ({label}) => label === AlertRuleTriggerType.CRITICAL
     );
     const warningTriggerIndex = criticalTriggerIndex ^ 1;
-    const criticalTrigger = triggers[criticalTriggerIndex];
-    const warningTrigger = triggers[warningTriggerIndex];
+    const criticalTrigger = triggers[criticalTriggerIndex]!;
+    const warningTrigger = triggers[warningTriggerIndex]!;
 
     const isEmptyWarningThreshold = isEmpty(warningTrigger.alertThreshold);
     const warningThreshold = warningTrigger.alertThreshold ?? 0;
@@ -836,7 +836,7 @@ class RuleFormContainer extends DeprecatedAsyncComponent<Props, State> {
             queryType: DatasetMEPAlertQueryTypes[dataset],
             sensitivity: sensitivity ?? null,
             seasonality: seasonality ?? null,
-            detectionType: detectionType,
+            detectionType,
           },
           {
             duplicateRule: this.isDuplicateRule ? 'true' : 'false',
@@ -1228,7 +1228,7 @@ class RuleFormContainer extends DeprecatedAsyncComponent<Props, State> {
       location,
       query: this.chartQuery,
       aggregate,
-      formattedAggregate: formattedAggregate,
+      formattedAggregate,
       dataset,
       newAlertOrQuery: !ruleId || query !== rule.query,
       timeWindow,
diff --git a/static/app/views/alerts/rules/metric/triggers/actionsPanel/index.tsx b/static/app/views/alerts/rules/metric/triggers/actionsPanel/index.tsx
index e2e089c18e984b..19512b8cf31af6 100644
--- a/static/app/views/alerts/rules/metric/triggers/actionsPanel/index.tsx
+++ b/static/app/views/alerts/rules/metric/triggers/actionsPanel/index.tsx
@@ -135,9 +135,9 @@ class ActionsPanel extends PureComponent<Props> {
     value: string
   ) {
     const {triggers, onChange} = this.props;
-    const {actions} = triggers[triggerIndex];
+    const {actions} = triggers[triggerIndex]!;
     const newAction = {
-      ...actions[index],
+      ...actions[index]!,
       [key]: value,
     };
 
@@ -146,7 +146,7 @@ class ActionsPanel extends PureComponent<Props> {
 
   conditionallyRenderHelpfulBanner(triggerIndex: number, index: number) {
     const {triggers} = this.props;
-    const {actions} = triggers[triggerIndex];
+    const {actions} = triggers[triggerIndex]!;
     const newAction = {...actions[index]};
     if (newAction.type === 'slack') {
       return (
@@ -208,7 +208,7 @@ class ActionsPanel extends PureComponent<Props> {
 
   handleDeleteAction = (triggerIndex: number, index: number) => {
     const {triggers, onChange} = this.props;
-    const {actions} = triggers[triggerIndex];
+    const {actions} = triggers[triggerIndex]!;
 
     onChange(triggerIndex, triggers, removeAtArrayIndex(actions, index));
   };
@@ -220,10 +220,10 @@ class ActionsPanel extends PureComponent<Props> {
   ) => {
     const {triggers, onChange} = this.props;
     // Convert saved action to unsaved by removing id
-    const {id: _, ...action} = triggers[triggerIndex].actions[index];
+    const {id: _, ...action} = triggers[triggerIndex]!.actions[index]!;
     action.unsavedId = uniqueId();
-    triggers[value.value].actions.push(action);
-    onChange(value.value, triggers, triggers[value.value].actions);
+    triggers[value.value]!.actions.push(action);
+    onChange(value.value, triggers, triggers[value.value]!.actions);
     this.handleDeleteAction(triggerIndex, index);
   };
 
@@ -233,7 +233,7 @@ class ActionsPanel extends PureComponent<Props> {
     value: SelectValue<ActionType>
   ) => {
     const {triggers, onChange, availableActions} = this.props;
-    const {actions} = triggers[triggerIndex];
+    const {actions} = triggers[triggerIndex]!;
     const actionConfig = availableActions?.find(
       availableAction => getActionUniqueKey(availableAction) === value.value
     );
@@ -244,7 +244,7 @@ class ActionsPanel extends PureComponent<Props> {
     }
 
     const existingDateCreated =
-      actions[index].dateCreated ?? actions[index].unsavedDateCreated;
+      actions[index]!.dateCreated ?? actions[index]!.unsavedDateCreated;
     const newAction: Action = getCleanAction(actionConfig, existingDateCreated);
     onChange(triggerIndex, triggers, replaceAtArrayIndex(actions, index, newAction));
   };
@@ -255,9 +255,9 @@ class ActionsPanel extends PureComponent<Props> {
     value: SelectValue<keyof typeof TargetLabel>
   ) => {
     const {triggers, onChange} = this.props;
-    const {actions} = triggers[triggerIndex];
+    const {actions} = triggers[triggerIndex]!;
     const newAction = {
-      ...actions[index],
+      ...actions[index]!,
       targetType: value.value,
       targetIdentifier: '',
     };
@@ -271,9 +271,9 @@ class ActionsPanel extends PureComponent<Props> {
     value: SelectValue<keyof typeof PriorityOptions>
   ) => {
     const {triggers, onChange} = this.props;
-    const {actions} = triggers[triggerIndex];
+    const {actions} = triggers[triggerIndex]!;
     const newAction = {
-      ...actions[index],
+      ...actions[index]!,
       priority: value.value,
     };
 
@@ -291,9 +291,9 @@ class ActionsPanel extends PureComponent<Props> {
     formData: {[key: string]: string}
   ): void => {
     const {triggers, onChange} = this.props;
-    const {actions} = triggers[triggerIndex];
+    const {actions} = triggers[triggerIndex]!;
     const newAction = {
-      ...actions[actionIndex],
+      ...actions[actionIndex]!,
       ...formData,
     };
 
@@ -321,9 +321,6 @@ class ActionsPanel extends PureComponent<Props> {
       value: getActionUniqueKey(availableAction),
       label: getFullActionTitle(availableAction),
     }));
-    const hasPriorityFlag = organization.features.includes(
-      'integrations-custom-alert-priorities'
-    );
 
     const levels = [
       {value: 0, label: 'Critical Status'},
@@ -361,7 +358,7 @@ class ActionsPanel extends PureComponent<Props> {
         {loading && <LoadingIndicator />}
         {actions.map(({action, actionIdx, triggerIndex, availableAction}) => {
           const actionDisabled =
-            triggers[triggerIndex].actions[actionIdx]?.disabled || disabled;
+            triggers[triggerIndex]!.actions[actionIdx]?.disabled || disabled;
           return (
             <div key={action.id ?? action.unsavedId}>
               <RuleRowContainer>
@@ -437,7 +434,7 @@ class ActionsPanel extends PureComponent<Props> {
                                   actionIdx
                                 )}
                                 resetValues={
-                                  triggers[triggerIndex].actions[actionIdx] || {}
+                                  triggers[triggerIndex]!.actions[actionIdx] || {}
                                 }
                               />
                             ),
@@ -472,8 +469,7 @@ class ActionsPanel extends PureComponent<Props> {
                         'inputChannelId'
                       )}
                     />
-                    {hasPriorityFlag &&
-                    availableAction &&
+                    {availableAction &&
                     (availableAction.type === 'opsgenie' ||
                       availableAction.type === 'pagerduty') ? (
                       <SelectControl
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 967df8630dff52..2f995cb53f96f4 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
@@ -282,7 +282,7 @@ describe('Incident Rules Create', () => {
       expect.objectContaining({
         query: expect.objectContaining({
           dataset: 'spans',
-          statsPeriod: '7d',
+          statsPeriod: '9998m',
           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 2ecad746b2a64d..e2e28aa6f57045 100644
--- a/static/app/views/alerts/rules/metric/triggers/chart/index.tsx
+++ b/static/app/views/alerts/rules/metric/triggers/chart/index.tsx
@@ -138,7 +138,28 @@ export const AVAILABLE_TIME_PERIODS: Record<TimeWindow, readonly TimePeriod[]> =
   [TimeWindow.ONE_DAY]: [TimePeriod.FOURTEEN_DAYS],
 };
 
-const TIME_WINDOW_TO_SESSION_INTERVAL = {
+const MOST_EAP_TIME_PERIOD = [
+  TimePeriod.ONE_DAY,
+  TimePeriod.THREE_DAYS,
+  TimePeriod.SEVEN_DAYS,
+];
+
+const EAP_AVAILABLE_TIME_PERIODS = {
+  [TimeWindow.ONE_MINUTE]: [], // One minute intervals are not allowed on EAP Alerts
+  [TimeWindow.FIVE_MINUTES]: MOST_EAP_TIME_PERIOD,
+  [TimeWindow.TEN_MINUTES]: MOST_EAP_TIME_PERIOD,
+  [TimeWindow.FIFTEEN_MINUTES]: MOST_EAP_TIME_PERIOD,
+  [TimeWindow.THIRTY_MINUTES]: MOST_EAP_TIME_PERIOD,
+  [TimeWindow.ONE_HOUR]: MOST_EAP_TIME_PERIOD,
+  [TimeWindow.TWO_HOURS]: MOST_EAP_TIME_PERIOD,
+  [TimeWindow.FOUR_HOURS]: [TimePeriod.SEVEN_DAYS],
+  [TimeWindow.ONE_DAY]: [TimePeriod.SEVEN_DAYS],
+};
+
+export const TIME_WINDOW_TO_INTERVAL = {
+  [TimeWindow.FIVE_MINUTES]: '5m',
+  [TimeWindow.TEN_MINUTES]: '10m',
+  [TimeWindow.FIFTEEN_MINUTES]: '15m',
   [TimeWindow.THIRTY_MINUTES]: '30m',
   [TimeWindow.ONE_HOUR]: '1h',
   [TimeWindow.TWO_HOURS]: '2h',
@@ -246,6 +267,10 @@ class TriggersChart extends PureComponent<Props, State> {
       };
     }
 
+    if (this.props.dataset === Dataset.EVENTS_ANALYTICS_PLATFORM) {
+      return EAP_AVAILABLE_TIME_PERIODS;
+    }
+
     return AVAILABLE_TIME_PERIODS;
   }
 
@@ -361,7 +386,7 @@ class TriggersChart extends PureComponent<Props, State> {
 
     const showExtrapolatedChartData =
       shouldShowOnDemandMetricAlertUI(organization) &&
-      seriesAdditionalInfo?.[timeseriesData[0]?.seriesName]?.isExtrapolatedData;
+      seriesAdditionalInfo?.[timeseriesData[0]!?.seriesName]?.isExtrapolatedData;
 
     const totalCountLabel = isSessionAggregate(aggregate)
       ? SESSION_AGGREGATE_TO_HEADING[aggregate]
@@ -426,7 +451,6 @@ class TriggersChart extends PureComponent<Props, State> {
                 borderless: true,
                 prefix: t('Display'),
               }}
-              disabled={isLoading || isReloading}
             />
           </InlineContainer>
         </ChartControls>
@@ -457,7 +481,7 @@ class TriggersChart extends PureComponent<Props, State> {
       onConfidenceDataLoaded,
     } = this.props;
 
-    const period = this.getStatsPeriod();
+    const period = this.getStatsPeriod()!;
     const renderComparisonStats = Boolean(
       organization.features.includes('change-alerts') && comparisonDelta
     );
@@ -504,8 +528,8 @@ class TriggersChart extends PureComponent<Props, State> {
               api={this.historicalAPI}
               period={
                 timeWindow === 5
-                  ? HISTORICAL_TIME_PERIOD_MAP_FIVE_MINS[period]
-                  : HISTORICAL_TIME_PERIOD_MAP[period]
+                  ? HISTORICAL_TIME_PERIOD_MAP_FIVE_MINS[period]!
+                  : HISTORICAL_TIME_PERIOD_MAP[period]!
               }
               dataLoadedCallback={onHistoricalDataLoaded}
             />
@@ -551,13 +575,13 @@ class TriggersChart extends PureComponent<Props, State> {
 
     if (isSessionAggregate(aggregate)) {
       const baseProps: ComponentProps<typeof SessionsRequest> = {
-        api: api,
-        organization: organization,
+        api,
+        organization,
         project: projects.map(({id}) => Number(id)),
         environment: environment ? [environment] : undefined,
         statsPeriod: period,
-        query: query,
-        interval: TIME_WINDOW_TO_SESSION_INTERVAL[timeWindow],
+        query,
+        interval: TIME_WINDOW_TO_INTERVAL[timeWindow],
         field: SESSION_AGGREGATE_TO_FIELD[aggregate],
         groupBy: ['session.status'],
         children: noop,
@@ -628,8 +652,8 @@ class TriggersChart extends PureComponent<Props, State> {
             api={this.historicalAPI}
             period={
               timeWindow === 5
-                ? HISTORICAL_TIME_PERIOD_MAP_FIVE_MINS[period]
-                : HISTORICAL_TIME_PERIOD_MAP[period]
+                ? HISTORICAL_TIME_PERIOD_MAP_FIVE_MINS[period]!
+                : HISTORICAL_TIME_PERIOD_MAP[period]!
             }
             dataLoadedCallback={onHistoricalDataLoaded}
           >
@@ -640,7 +664,7 @@ class TriggersChart extends PureComponent<Props, State> {
           <EventsRequest
             {...baseProps}
             api={this.confidenceAPI}
-            period="7d"
+            period={TimePeriod.SEVEN_DAYS}
             dataLoadedCallback={onConfidenceDataLoaded}
           >
             {noop}
diff --git a/static/app/views/alerts/rules/metric/triggers/chart/thresholdsChart.tsx b/static/app/views/alerts/rules/metric/triggers/chart/thresholdsChart.tsx
index 9ddfc01eb5d33c..450af18ae13119 100644
--- a/static/app/views/alerts/rules/metric/triggers/chart/thresholdsChart.tsx
+++ b/static/app/views/alerts/rules/metric/triggers/chart/thresholdsChart.tsx
@@ -375,7 +375,7 @@ export default class ThresholdsChart extends PureComponent<Props, State> {
             : [seriesParamsOrParam];
 
           const pointY = (
-            seriesParams.length > 1 ? seriesParams[0].data[1] : undefined
+            seriesParams.length > 1 ? seriesParams[0]!.data[1] : undefined
           ) as number | undefined;
 
           const comparisonSeries =
@@ -415,7 +415,7 @@ export default class ThresholdsChart extends PureComponent<Props, State> {
         max: this.state.yAxisMax ?? undefined,
         axisLabel: {
           formatter: (value: number) =>
-            alertAxisFormatter(value, data[0].seriesName, aggregate),
+            alertAxisFormatter(value, data[0]!.seriesName, aggregate),
         },
       },
     };
diff --git a/static/app/views/alerts/rules/metric/triggers/form.tsx b/static/app/views/alerts/rules/metric/triggers/form.tsx
index 5d2585c242b668..0d620770bee623 100644
--- a/static/app/views/alerts/rules/metric/triggers/form.tsx
+++ b/static/app/views/alerts/rules/metric/triggers/form.tsx
@@ -214,7 +214,7 @@ class TriggerFormContainer extends Component<TriggerFormContainerProps> {
       <Fragment>
         {triggers.map((trigger, index) => {
           const isCritical = index === 0;
-          // eslint-disable-next-line no-use-before-define
+
           return (
             <TriggerFormItem
               key={index}
diff --git a/static/app/views/alerts/rules/metric/triggers/index.tsx b/static/app/views/alerts/rules/metric/triggers/index.tsx
index d8d20b6188f586..322507486809f9 100644
--- a/static/app/views/alerts/rules/metric/triggers/index.tsx
+++ b/static/app/views/alerts/rules/metric/triggers/index.tsx
@@ -74,7 +74,7 @@ class Triggers extends Component<Props> {
 
   handleAddAction = (triggerIndex: number, action: Action) => {
     const {onChange, triggers} = this.props;
-    const trigger = triggers[triggerIndex];
+    const trigger = triggers[triggerIndex]!;
     const actions = [...trigger.actions, action];
     const updatedTriggers = replaceAtArrayIndex(triggers, triggerIndex, {
       ...trigger,
@@ -89,7 +89,7 @@ class Triggers extends Component<Props> {
     actions: Action[]
   ): void => {
     const {onChange} = this.props;
-    const trigger = triggers[triggerIndex];
+    const trigger = triggers[triggerIndex]!;
     const updatedTriggers = replaceAtArrayIndex(triggers, triggerIndex, {
       ...trigger,
       actions,
diff --git a/static/app/views/alerts/rules/metric/utils/determineSeriesConfidence.spec.tsx b/static/app/views/alerts/rules/metric/utils/determineSeriesConfidence.spec.tsx
index c405b67a31f347..ffa23a67615d34 100644
--- a/static/app/views/alerts/rules/metric/utils/determineSeriesConfidence.spec.tsx
+++ b/static/app/views/alerts/rules/metric/utils/determineSeriesConfidence.spec.tsx
@@ -54,7 +54,7 @@ describe('determineSeriesConfidence', () => {
         [200, [{count: 'high'}]],
       ],
     });
-    expect(confidence).toEqual('high');
+    expect(confidence).toBe('high');
   });
 
   it('equal high if all confidence high or null', () => {
@@ -68,7 +68,7 @@ describe('determineSeriesConfidence', () => {
         [200, [{count: null}]],
       ],
     });
-    expect(confidence).toEqual('high');
+    expect(confidence).toBe('high');
   });
 
   it('equal high if <25% is low', () => {
@@ -92,7 +92,7 @@ describe('determineSeriesConfidence', () => {
         [700, [{count: null}]],
       ],
     });
-    expect(confidence).toEqual('high');
+    expect(confidence).toBe('high');
   });
 
   it('equal low if >25% is low', () => {
@@ -112,7 +112,7 @@ describe('determineSeriesConfidence', () => {
         [500, [{count: 'low'}]],
       ],
     });
-    expect(confidence).toEqual('low');
+    expect(confidence).toBe('low');
   });
 
   it('equal low if all low', () => {
@@ -132,7 +132,7 @@ describe('determineSeriesConfidence', () => {
         [500, [{count: 'low'}]],
       ],
     });
-    expect(confidence).toEqual('low');
+    expect(confidence).toBe('low');
   });
 
   it('equals low if any in bucket is low', () => {
@@ -143,7 +143,7 @@ describe('determineSeriesConfidence', () => {
         [200, [{count: null}, {count: 'low'}, {count: 'high'}]],
       ],
     });
-    expect(confidence).toEqual('low');
+    expect(confidence).toBe('low');
   });
 
   it('equals high if no lows in bucket', () => {
@@ -154,6 +154,6 @@ describe('determineSeriesConfidence', () => {
         [200, [{count: null}, {count: null}, {count: 'high'}]],
       ],
     });
-    expect(confidence).toEqual('high');
+    expect(confidence).toBe('high');
   });
 });
diff --git a/static/app/views/alerts/rules/uptime/httpSnippet.spec.tsx b/static/app/views/alerts/rules/uptime/httpSnippet.spec.tsx
index f49f860ef51558..3582c340851f8b 100644
--- a/static/app/views/alerts/rules/uptime/httpSnippet.spec.tsx
+++ b/static/app/views/alerts/rules/uptime/httpSnippet.spec.tsx
@@ -1,6 +1,6 @@
 import {generateSentryTraceHeader} from '@sentry/utils';
 
-import {render} from 'sentry-test/reactTestingLibrary';
+import {render, screen} from 'sentry-test/reactTestingLibrary';
 
 import {HTTPSnippet} from './httpSnippet';
 
@@ -11,7 +11,7 @@ jest.mock('@sentry/utils', () => ({
 
 describe('HTTPSnippet', function () {
   it('renders', function () {
-    const {container} = render(
+    render(
       <HTTPSnippet
         url="https://example.com/test?query=value"
         method="POST"
@@ -38,8 +38,9 @@ describe('HTTPSnippet', function () {
       `{"key": "value"}`,
     ].join('\r\n');
 
-    // XXX(epurkhiser): Using toHaveTextContent would be nice here, but it
-    // loses the newlines.
-    expect(container.getElementsByTagName('code')[0].innerHTML).toBe(expected);
+    const codeElem = screen.getByText('POST /test?query=value HTTP/1.1', {exact: false});
+
+    // Using toHaveTextContent would be nice here, but it loses the newlines.
+    expect(codeElem.innerHTML).toBe(expected);
   });
 });
diff --git a/static/app/views/alerts/rules/uptime/uptimeAlertForm.tsx b/static/app/views/alerts/rules/uptime/uptimeAlertForm.tsx
index 082b2b030e86a7..330f8cb012797d 100644
--- a/static/app/views/alerts/rules/uptime/uptimeAlertForm.tsx
+++ b/static/app/views/alerts/rules/uptime/uptimeAlertForm.tsx
@@ -16,11 +16,12 @@ import TextareaField from 'sentry/components/forms/fields/textareaField';
 import TextField from 'sentry/components/forms/fields/textField';
 import Form from 'sentry/components/forms/form';
 import FormModel from 'sentry/components/forms/model';
+import ExternalLink from 'sentry/components/links/externalLink';
 import List from 'sentry/components/list';
 import ListItem from 'sentry/components/list/listItem';
 import Panel from 'sentry/components/panels/panel';
 import Text from 'sentry/components/text';
-import {t} from 'sentry/locale';
+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';
@@ -246,9 +247,14 @@ export function UptimeAlertForm({project, handleDelete, rule}: Props) {
             <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.'
+              showHelpInTooltip={{isHoverable: true}}
+              help={tct(
+                'Defer the sampling decision to a Sentry SDK configured in your application. Disable to prevent all span sampling. [link:Learn more].',
+                {
+                  link: (
+                    <ExternalLink href="https://docs.sentry.io/product/alerts/uptime-monitoring/uptime-tracing/" />
+                  ),
+                }
               )}
               flexibleControlStateSize
             />
diff --git a/static/app/views/alerts/rules/uptime/uptimeHeadersField.tsx b/static/app/views/alerts/rules/uptime/uptimeHeadersField.tsx
index 10bf6e1e9f25af..f6d841004a30a0 100644
--- a/static/app/views/alerts/rules/uptime/uptimeHeadersField.tsx
+++ b/static/app/views/alerts/rules/uptime/uptimeHeadersField.tsx
@@ -52,16 +52,20 @@ function UptimHeadersControl(props) {
   function handleNameChange(index: number, newName: string) {
     setItems(currentItems =>
       currentItems.toSpliced(index, 1, [
-        items[index][0],
+        items[index]![0],
         newName.replaceAll(INVALID_NAME_HEADER_REGEX, ''),
-        items[index][2],
+        items[index]![2],
       ])
     );
   }
 
   function handleValueChange(index: number, newHeaderValue: string) {
     setItems(currentItems =>
-      currentItems.toSpliced(index, 1, [items[index][0], items[index][1], newHeaderValue])
+      currentItems.toSpliced(index, 1, [
+        items[index]![0],
+        items[index]![1],
+        newHeaderValue,
+      ])
     );
   }
 
@@ -70,7 +74,7 @@ function UptimHeadersControl(props) {
    * the end of the name in the order they were added.
    */
   function disambiguateHeaderName(index: number) {
-    const headerName = items[index][1];
+    const headerName = items[index]![1];
     const matchingIndexes = items
       .map((item, idx) => [idx, item[1]])
       .filter(([_, itemName]) => itemName === headerName)
diff --git a/static/app/views/alerts/rules/utils.spec.tsx b/static/app/views/alerts/rules/utils.spec.tsx
new file mode 100644
index 00000000000000..4540ceffeccdaa
--- /dev/null
+++ b/static/app/views/alerts/rules/utils.spec.tsx
@@ -0,0 +1,41 @@
+import {MetricRuleFixture} from 'sentry-fixture/metricRule';
+
+import {Dataset, TimeWindow} from 'sentry/views/alerts/rules/metric/types';
+import {getAlertRuleExploreUrl} from 'sentry/views/alerts/rules/utils';
+
+describe('getExploreUrl', () => {
+  it('should return the correct url', () => {
+    const rule = MetricRuleFixture();
+    rule.dataset = Dataset.EVENTS_ANALYTICS_PLATFORM;
+    rule.timeWindow = TimeWindow.THIRTY_MINUTES;
+    rule.aggregate = 'p75(span.duration)';
+    rule.query = 'span.op:http.client';
+    rule.environment = 'prod';
+    const url = getAlertRuleExploreUrl({
+      rule,
+      orgSlug: 'slug',
+      period: '7d',
+      projectId: '1',
+    });
+    expect(url).toBe(
+      '/organizations/slug/traces/?dataset=spansRpc&environment=prod&interval=30m&project=1&query=span.op%3Ahttp.client&statsPeriod=7d&visualize=%7B%22chartType%22%3A1%2C%22yAxes%22%3A%5B%22p75%28span.duration%29%22%5D%7D'
+    );
+  });
+  it('should return the correct url for 9998m', () => {
+    const rule = MetricRuleFixture();
+    rule.dataset = Dataset.EVENTS_ANALYTICS_PLATFORM;
+    rule.timeWindow = TimeWindow.THIRTY_MINUTES;
+    rule.aggregate = 'p75(span.duration)';
+    rule.query = 'span.op:http.client';
+    rule.environment = 'prod';
+    const url = getAlertRuleExploreUrl({
+      rule,
+      orgSlug: 'slug',
+      period: '9998m',
+      projectId: '1',
+    });
+    expect(url).toBe(
+      '/organizations/slug/traces/?dataset=spansRpc&environment=prod&interval=30m&project=1&query=span.op%3Ahttp.client&statsPeriod=7d&visualize=%7B%22chartType%22%3A1%2C%22yAxes%22%3A%5B%22p75%28span.duration%29%22%5D%7D'
+    );
+  });
+});
diff --git a/static/app/views/alerts/rules/utils.tsx b/static/app/views/alerts/rules/utils.tsx
index af9d6d84b1fc6d..200003f383c9f7 100644
--- a/static/app/views/alerts/rules/utils.tsx
+++ b/static/app/views/alerts/rules/utils.tsx
@@ -5,9 +5,12 @@ import {IssueAlertActionType, RuleActionsCategories} from 'sentry/types/alerts';
 import type {Organization} from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
 import {isActiveSuperuser} from 'sentry/utils/isActiveSuperuser';
+import {TIME_WINDOW_TO_INTERVAL} from 'sentry/views/alerts/rules/metric/triggers/chart';
 import type {MetricRule} from 'sentry/views/alerts/rules/metric/types';
 import {Dataset} from 'sentry/views/alerts/rules/metric/types';
 import {hasDatasetSelector} from 'sentry/views/dashboards/utils';
+import {getExploreUrl} from 'sentry/views/explore/utils';
+import {ChartType} from 'sentry/views/insights/common/components/chart';
 
 export function getProjectOptions({
   organization,
@@ -113,3 +116,42 @@ export function shouldUseErrorsDiscoverDataset(
 
   return dataset === Dataset.ERRORS;
 }
+
+export function getAlertRuleExploreUrl({
+  rule,
+  orgSlug,
+  period,
+  projectId,
+}: {
+  orgSlug: string;
+  period: string;
+  projectId: string;
+  rule: MetricRule;
+}) {
+  if (rule.dataset !== Dataset.EVENTS_ANALYTICS_PLATFORM) {
+    return '';
+  }
+  const interval = TIME_WINDOW_TO_INTERVAL[rule.timeWindow];
+
+  return getExploreUrl({
+    orgSlug,
+    selection: {
+      datetime: {
+        period: period === '9998m' ? '7d' : period,
+        start: null,
+        end: null,
+        utc: null,
+      },
+      environments: rule.environment ? [rule.environment] : [],
+      projects: [parseInt(projectId, 10)],
+    },
+    interval,
+    visualize: [
+      {
+        chartType: ChartType.LINE,
+        yAxes: [rule.aggregate],
+      },
+    ],
+    query: rule.query,
+  });
+}
diff --git a/static/app/views/alerts/utils/getComparisonMarkLines.tsx b/static/app/views/alerts/utils/getComparisonMarkLines.tsx
index 55943400be8d80..1ae0cd2538a4ca 100644
--- a/static/app/views/alerts/utils/getComparisonMarkLines.tsx
+++ b/static/app/views/alerts/utils/getComparisonMarkLines.tsx
@@ -31,9 +31,9 @@ export const getComparisonMarkLines = (
 
     if (triggers.some(({alertThreshold}) => typeof alertThreshold === 'number')) {
       const lastPointLimit =
-        (baseData[changeData.length - 1].name as number) - timeWindow * MINUTE;
+        (baseData[changeData.length - 1]!.name as number) - timeWindow * MINUTE;
       changeData.forEach(({name, value: comparisonValue}, idx) => {
-        const baseValue = baseData[idx].value;
+        const baseValue = baseData[idx]!.value;
         const comparisonPercentage =
           comparisonValue === 0
             ? baseValue === 0
@@ -44,7 +44,7 @@ export const getComparisonMarkLines = (
         if (
           idx === 0 ||
           idx === changeData.length - 1 ||
-          status !== changeStatuses[changeStatuses.length - 1].status
+          status !== changeStatuses[changeStatuses.length - 1]!.status
         ) {
           changeStatuses.push({name, status});
         }
@@ -70,7 +70,7 @@ export const getComparisonMarkLines = (
               {coord: [name, 0]},
               {
                 coord: [
-                  Math.min(changeStatuses[idx + 1].name as number, lastPointLimit),
+                  Math.min(changeStatuses[idx + 1]!.name as number, lastPointLimit),
                   0,
                 ],
               },
diff --git a/static/app/views/alerts/utils/index.tsx b/static/app/views/alerts/utils/index.tsx
index 13a0735009cf2a..6fb66b755a5c84 100644
--- a/static/app/views/alerts/utils/index.tsx
+++ b/static/app/views/alerts/utils/index.tsx
@@ -8,7 +8,10 @@ import toArray from 'sentry/utils/array/toArray';
 import {getUtcDateString} from 'sentry/utils/dates';
 import {axisLabelFormatter, tooltipFormatter} from 'sentry/utils/discover/charts';
 import {aggregateOutputType} from 'sentry/utils/discover/fields';
-import {formatMetricUsingFixedUnit} from 'sentry/utils/metrics/formatters';
+import {
+  formatMetricUsingFixedUnit,
+  formatMetricUsingUnit,
+} from 'sentry/utils/metrics/formatters';
 import {parseField, parseMRI} from 'sentry/utils/metrics/mri';
 import {
   Dataset,
@@ -25,9 +28,9 @@ import {AlertRuleStatus, CombinedAlertType} from '../types';
  * Gets start and end date query parameters from stats
  */
 export function getStartEndFromStats(stats: IncidentStats) {
-  const start = getUtcDateString(stats.eventStats.data[0][0] * 1000);
+  const start = getUtcDateString(stats.eventStats.data[0]![0] * 1000);
   const end = getUtcDateString(
-    stats.eventStats.data[stats.eventStats.data.length - 1][0] * 1000
+    stats.eventStats.data[stats.eventStats.data.length - 1]![0] * 1000
   );
 
   return {start, end};
@@ -112,9 +115,9 @@ export function getQueryDatasource(
   }
 
   match = query.match(/(^|\s)event\.type:(error|default|transaction)/i);
-  if (match && Datasource[match[2].toUpperCase()]) {
+  if (match && Datasource[match[2]!.toUpperCase()]) {
     return {
-      source: Datasource[match[2].toUpperCase()],
+      source: Datasource[match[2]!.toUpperCase()],
       query: query.replace(match[0], '').trim(),
     };
   }
@@ -142,7 +145,13 @@ export function alertAxisFormatter(value: number, seriesName: string, aggregate:
     return formatMetricUsingFixedUnit(value, unit, aggregation);
   }
 
-  return axisLabelFormatter(value, aggregateOutputType(seriesName));
+  const type = aggregateOutputType(seriesName);
+
+  if (type === 'duration') {
+    return formatMetricUsingUnit(value, 'milliseconds');
+  }
+
+  return axisLabelFormatter(value, type);
 }
 
 export function alertTooltipValueFormatter(
diff --git a/static/app/views/alerts/wizard/index.spec.tsx b/static/app/views/alerts/wizard/index.spec.tsx
index dd291fbc52f85a..6df2c24e6ec8e7 100644
--- a/static/app/views/alerts/wizard/index.spec.tsx
+++ b/static/app/views/alerts/wizard/index.spec.tsx
@@ -74,7 +74,7 @@ describe('AlertWizard', () => {
     expect(screen.getByText('LLM Monitoring')).toBeInTheDocument();
     expect(screen.getByText('Custom')).toBeInTheDocument();
     const alertGroups = screen.getAllByRole('radiogroup');
-    expect(alertGroups.length).toEqual(6);
+    expect(alertGroups).toHaveLength(6);
   });
 
   it('should only render alerts for errors in self-hosted errors only', () => {
@@ -102,7 +102,7 @@ describe('AlertWizard', () => {
 
     expect(screen.getByText('Errors')).toBeInTheDocument();
     const alertGroups = screen.getAllByRole('radiogroup');
-    expect(alertGroups.length).toEqual(1);
+    expect(alertGroups).toHaveLength(1);
   });
 
   it('shows uptime alert according to feature flag', () => {
diff --git a/static/app/views/alerts/wizard/options.tsx b/static/app/views/alerts/wizard/options.tsx
index 4c4df842cce060..c653eb88e18386 100644
--- a/static/app/views/alerts/wizard/options.tsx
+++ b/static/app/views/alerts/wizard/options.tsx
@@ -93,7 +93,7 @@ export const AlertWizardAlertNames: Record<AlertType, string> = {
   llm_cost: t('LLM cost'),
   llm_tokens: t('LLM token usage'),
   uptime_monitor: t('Uptime Monitor'),
-  eap_metrics: t('EAP Metric'),
+  eap_metrics: t('Spans'),
 };
 
 /**
diff --git a/static/app/views/alerts/wizard/panelContent.tsx b/static/app/views/alerts/wizard/panelContent.tsx
index e3271051aab814..c6ccc7447d64bf 100644
--- a/static/app/views/alerts/wizard/panelContent.tsx
+++ b/static/app/views/alerts/wizard/panelContent.tsx
@@ -187,11 +187,11 @@ export const AlertWizardPanelContent: Record<AlertType, PanelContent> = {
     illustration: diagramUptime,
   },
   eap_metrics: {
-    description: t('Alert on eap metrics.'),
+    description: t('Alert on spans.'),
     examples: [
       t('When your average time in queue exceeds 100ms.'),
       t('When your app runs more than 1000 queries in a minute.'),
     ],
-    illustration: diagramCustomMetrics,
+    illustration: diagramThroughput,
   },
 };
diff --git a/static/app/views/alerts/wizard/utils.spec.tsx b/static/app/views/alerts/wizard/utils.spec.tsx
index 5a6158351211f5..ccad3259593ebb 100644
--- a/static/app/views/alerts/wizard/utils.spec.tsx
+++ b/static/app/views/alerts/wizard/utils.spec.tsx
@@ -8,19 +8,19 @@ describe('Wizard utils', function () {
         aggregate: 'p95(measurements.lcp)',
         dataset: Dataset.TRANSACTIONS,
       })
-    ).toEqual('lcp');
+    ).toBe('lcp');
     expect(
       getAlertTypeFromAggregateDataset({
         aggregate: 'percentile(measurements.lcp,0.7)',
         dataset: Dataset.TRANSACTIONS,
       })
-    ).toEqual('lcp');
+    ).toBe('lcp');
     expect(
       getAlertTypeFromAggregateDataset({
         aggregate: 'avg(measurements.lcp)',
         dataset: Dataset.TRANSACTIONS,
       })
-    ).toEqual('lcp');
+    ).toBe('lcp');
   });
 
   it('extracts duration alert', function () {
@@ -29,19 +29,19 @@ describe('Wizard utils', function () {
         aggregate: 'p95(transaction.duration)',
         dataset: Dataset.TRANSACTIONS,
       })
-    ).toEqual('trans_duration');
+    ).toBe('trans_duration');
     expect(
       getAlertTypeFromAggregateDataset({
         aggregate: 'percentile(transaction.duration,0.3)',
         dataset: Dataset.TRANSACTIONS,
       })
-    ).toEqual('trans_duration');
+    ).toBe('trans_duration');
     expect(
       getAlertTypeFromAggregateDataset({
         aggregate: 'avg(transaction.duration)',
         dataset: Dataset.TRANSACTIONS,
       })
-    ).toEqual('trans_duration');
+    ).toBe('trans_duration');
   });
 
   it('extracts throughput alert', function () {
@@ -50,7 +50,7 @@ describe('Wizard utils', function () {
         aggregate: 'count()',
         dataset: Dataset.TRANSACTIONS,
       })
-    ).toEqual('throughput');
+    ).toBe('throughput');
   });
 
   it('extracts user error alert', function () {
@@ -59,7 +59,7 @@ describe('Wizard utils', function () {
         aggregate: 'count_unique(user)',
         dataset: Dataset.ERRORS,
       })
-    ).toEqual('users_experiencing_errors');
+    ).toBe('users_experiencing_errors');
   });
 
   it('extracts error count alert', function () {
@@ -68,7 +68,7 @@ describe('Wizard utils', function () {
         aggregate: 'count()',
         dataset: Dataset.ERRORS,
       })
-    ).toEqual('num_errors');
+    ).toBe('num_errors');
   });
 
   it('extracts crash free sessions alert', function () {
@@ -77,7 +77,7 @@ describe('Wizard utils', function () {
         aggregate: SessionsAggregate.CRASH_FREE_SESSIONS,
         dataset: Dataset.METRICS,
       })
-    ).toEqual('crash_free_sessions');
+    ).toBe('crash_free_sessions');
   });
 
   it('extracts crash free users alert', function () {
@@ -86,7 +86,7 @@ describe('Wizard utils', function () {
         aggregate: SessionsAggregate.CRASH_FREE_USERS,
         dataset: Dataset.METRICS,
       })
-    ).toEqual('crash_free_users');
+    ).toBe('crash_free_users');
   });
 
   it('extracts crash free users alert from metrics', function () {
@@ -113,21 +113,21 @@ describe('Wizard utils', function () {
         aggregate: 'count_unique(tags[sentry:user])',
         dataset: Dataset.TRANSACTIONS,
       })
-    ).toEqual('custom_transactions');
+    ).toBe('custom_transactions');
 
     expect(
       getAlertTypeFromAggregateDataset({
         aggregate: 'p95(measurements.fp)',
         dataset: Dataset.TRANSACTIONS,
       })
-    ).toEqual('custom_transactions');
+    ).toBe('custom_transactions');
 
     expect(
       getAlertTypeFromAggregateDataset({
         aggregate: 'p95(measurements.ttfb)',
         dataset: Dataset.TRANSACTIONS,
       })
-    ).toEqual('custom_transactions');
+    ).toBe('custom_transactions');
 
     expect(
       getAlertTypeFromAggregateDataset({
@@ -143,6 +143,6 @@ describe('Wizard utils', function () {
         aggregate: 'count(span.duration)',
         dataset: Dataset.EVENTS_ANALYTICS_PLATFORM,
       })
-    ).toEqual('eap_metrics');
+    ).toBe('eap_metrics');
   });
 });
diff --git a/static/app/views/app/index.spec.tsx b/static/app/views/app/index.spec.tsx
index bbeb01c9b976d3..516d5d0d1cb4a2 100644
--- a/static/app/views/app/index.spec.tsx
+++ b/static/app/views/app/index.spec.tsx
@@ -210,7 +210,7 @@ describe('App', function () {
 
     await waitFor(() => OrganizationsStore.getAll().length === 1);
     expect(screen.queryByText('placeholder content')).not.toBeInTheDocument();
-    expect(sentryUrl).toEqual('https://sentry.io');
+    expect(sentryUrl).toBe('https://sentry.io');
     expect(window.location.replace).toHaveBeenCalledWith('https://sentry.io');
     expect(window.location.replace).toHaveBeenCalledTimes(1);
   });
diff --git a/static/app/views/app/root.tsx b/static/app/views/app/root.tsx
index 12d9b577ce7b3d..27b3bf42f5c44c 100644
--- a/static/app/views/app/root.tsx
+++ b/static/app/views/app/root.tsx
@@ -3,8 +3,8 @@ import {useEffect} from 'react';
 import {DEFAULT_APP_ROUTE} from 'sentry/constants';
 import ConfigStore from 'sentry/stores/configStore';
 import {useLegacyStore} from 'sentry/stores/useLegacyStore';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import replaceRouterParams from 'sentry/utils/replaceRouterParams';
+import {useNavigate} from 'sentry/utils/useNavigate';
 
 /**
  * This view is used when a user lands on the route `/` which historically
@@ -19,6 +19,7 @@ import replaceRouterParams from 'sentry/utils/replaceRouterParams';
  */
 function AppRoot() {
   const {lastOrganization} = useLegacyStore(ConfigStore);
+  const navigate = useNavigate();
 
   useEffect(() => {
     if (!lastOrganization) {
@@ -28,8 +29,8 @@ function AppRoot() {
     const orgSlug = lastOrganization;
     const url = replaceRouterParams(DEFAULT_APP_ROUTE, {orgSlug});
 
-    browserHistory.replace(url);
-  }, [lastOrganization]);
+    navigate(url, {replace: true});
+  }, [lastOrganization, navigate]);
 
   return null;
 }
diff --git a/static/app/views/auth/loginForm.spec.tsx b/static/app/views/auth/loginForm.spec.tsx
index 92e29592ac4468..f2d602f1ccf955 100644
--- a/static/app/views/auth/loginForm.spec.tsx
+++ b/static/app/views/auth/loginForm.spec.tsx
@@ -1,7 +1,8 @@
+import {RouterFixture} from 'sentry-fixture/routerFixture';
+
 import {render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrary';
 
 import ConfigStore from 'sentry/stores/configStore';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import LoginForm from 'sentry/views/auth/loginForm';
 
 async function doLogin() {
@@ -38,6 +39,7 @@ describe('LoginForm', function () {
   });
 
   it('handles success', async function () {
+    const router = RouterFixture();
     const userObject = {
       id: 1,
       name: 'Joe',
@@ -53,7 +55,7 @@ describe('LoginForm', function () {
       },
     });
 
-    render(<LoginForm authConfig={emptyAuthConfig} />);
+    render(<LoginForm authConfig={emptyAuthConfig} />, {router});
     await doLogin();
 
     expect(mockRequest).toHaveBeenCalledWith(
@@ -64,7 +66,7 @@ describe('LoginForm', function () {
     );
 
     await waitFor(() => expect(ConfigStore.get('user')).toEqual(userObject));
-    expect(browserHistory.push).toHaveBeenCalledWith({pathname: '/next/'});
+    expect(router.push).toHaveBeenCalledWith({pathname: '/next/'});
   });
 
   it('renders login provider buttons', function () {
diff --git a/static/app/views/auth/registerForm.spec.tsx b/static/app/views/auth/registerForm.spec.tsx
index 29fed77c5a9983..51847ad2b59d86 100644
--- a/static/app/views/auth/registerForm.spec.tsx
+++ b/static/app/views/auth/registerForm.spec.tsx
@@ -1,7 +1,8 @@
+import {RouterFixture} from 'sentry-fixture/routerFixture';
+
 import {render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrary';
 
 import ConfigStore from 'sentry/stores/configStore';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import RegisterForm from 'sentry/views/auth/registerForm';
 
 describe('Register', function () {
@@ -52,6 +53,7 @@ describe('Register', function () {
   });
 
   it('handles success', async function () {
+    const router = RouterFixture();
     const userObject = {
       id: 1,
       name: 'Joe',
@@ -67,10 +69,10 @@ describe('Register', function () {
       },
     });
 
-    render(<RegisterForm authConfig={emptyAuthConfig} />);
+    render(<RegisterForm authConfig={emptyAuthConfig} />, {router});
     await doLogin(mockRequest);
 
     await waitFor(() => expect(ConfigStore.get('user')).toEqual(userObject));
-    expect(browserHistory.push).toHaveBeenCalledWith({pathname: '/next/'});
+    expect(router.push).toHaveBeenCalledWith({pathname: '/next/'});
   });
 });
diff --git a/static/app/views/auth/ssoForm.spec.tsx b/static/app/views/auth/ssoForm.spec.tsx
index cfbe889bca349e..7a5cb3f896e556 100644
--- a/static/app/views/auth/ssoForm.spec.tsx
+++ b/static/app/views/auth/ssoForm.spec.tsx
@@ -1,6 +1,7 @@
+import {RouterFixture} from 'sentry-fixture/routerFixture';
+
 import {render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrary';
 
-import {browserHistory} from 'sentry/utils/browserHistory';
 import SsoForm from 'sentry/views/auth/ssoForm';
 
 describe('SsoForm', function () {
@@ -54,6 +55,7 @@ describe('SsoForm', function () {
   });
 
   it('handles success', async function () {
+    const router = RouterFixture();
     const mockRequest = MockApiClient.addMockResponse({
       url: '/auth/sso-locate/',
       method: 'POST',
@@ -63,11 +65,9 @@ describe('SsoForm', function () {
       },
     });
 
-    render(<SsoForm authConfig={emptyAuthConfig} />);
+    render(<SsoForm authConfig={emptyAuthConfig} />, {router});
     await doSso(mockRequest);
 
-    await waitFor(() =>
-      expect(browserHistory.push).toHaveBeenCalledWith({pathname: '/next/'})
-    );
+    await waitFor(() => expect(router.push).toHaveBeenCalledWith({pathname: '/next/'}));
   });
 });
diff --git a/static/app/views/dashboards/contexts/widgetSyncContext.stories.tsx b/static/app/views/dashboards/contexts/widgetSyncContext.stories.tsx
index 28c4b8a73421a5..e3951f4bdd7531 100644
--- a/static/app/views/dashboards/contexts/widgetSyncContext.stories.tsx
+++ b/static/app/views/dashboards/contexts/widgetSyncContext.stories.tsx
@@ -35,14 +35,6 @@ export default storyBook('WidgetSyncContext', story => {
               <LineChartWidget
                 title="span.duration"
                 timeseries={[sampleDurationTimeSeries]}
-                meta={{
-                  fields: {
-                    'span.duration': 'duration',
-                  },
-                  units: {
-                    'span.duration': 'millisecond',
-                  },
-                }}
               />
             </MediumWidget>
             {visible && (
@@ -50,14 +42,6 @@ export default storyBook('WidgetSyncContext', story => {
                 <LineChartWidget
                   title="span.duration"
                   timeseries={[sampleThroughputTimeSeries]}
-                  meta={{
-                    fields: {
-                      'spm()': 'rate',
-                    },
-                    units: {
-                      'spm()': '1/minute',
-                    },
-                  }}
                 />
               </MediumWidget>
             )}
diff --git a/static/app/views/dashboards/controls.tsx b/static/app/views/dashboards/controls.tsx
index 5b78f05f53866a..61cca4cd38ecc4 100644
--- a/static/app/views/dashboards/controls.tsx
+++ b/static/app/views/dashboards/controls.tsx
@@ -164,10 +164,10 @@ function Controls({
 
   return (
     <StyledButtonBar gap={1} key="controls">
+      <FeedbackWidgetButton />
       <DashboardEditFeature>
         {hasFeature => (
           <Fragment>
-            <FeedbackWidgetButton />
             <Feature features="dashboards-import">
               <Button
                 data-test-id="dashboard-export"
@@ -182,40 +182,44 @@ 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);
+            {dashboard.id !== 'default-overview' && (
+              <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'}
+                    />
                   }
-                }}
-              />
-            </Feature>
-            <Feature features="dashboards-edit-access">
-              <EditAccessSelector
-                dashboard={dashboard}
-                onChangeEditAccess={onChangeEditAccess}
-              />
-            </Feature>
+                  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>
+            )}
+            {dashboard.id !== 'default-overview' && (
+              <Feature features="dashboards-edit-access">
+                <EditAccessSelector
+                  dashboard={dashboard}
+                  onChangeEditAccess={onChangeEditAccess}
+                />
+              </Feature>
+            )}
             <Button
               data-test-id="dashboard-edit"
               onClick={e => {
diff --git a/static/app/views/dashboards/dashboard.spec.tsx b/static/app/views/dashboards/dashboard.spec.tsx
index f6bfd87e6dc6fc..cc2492f45574dc 100644
--- a/static/app/views/dashboards/dashboard.spec.tsx
+++ b/static/app/views/dashboards/dashboard.spec.tsx
@@ -295,8 +295,8 @@ describe('Dashboards > Dashboard', () => {
     await userEvent.click(await screen.findByText(/Switch to Transactions/));
     await waitFor(() => {
       expect(mockOnUpdate).toHaveBeenCalled();
-      expect(mockHandleUpdateWidgetList).toHaveBeenCalled();
     });
+    expect(mockHandleUpdateWidgetList).toHaveBeenCalled();
   });
 
   it('handles duplicate widget in view mode', async () => {
diff --git a/static/app/views/dashboards/dashboard.tsx b/static/app/views/dashboards/dashboard.tsx
index 18dee93546c5ad..2b1d2f9931e79c 100644
--- a/static/app/views/dashboards/dashboard.tsx
+++ b/static/app/views/dashboards/dashboard.tsx
@@ -375,7 +375,7 @@ class Dashboard extends Component<Props, State> {
 
   handleEditWidget = (index: number) => () => {
     const {organization, router, location, paramDashboardId, onEditWidget} = this.props;
-    const widget = this.props.dashboard.widgets[index];
+    const widget = this.props.dashboard.widgets[index]!;
 
     trackAnalytics('dashboards_views.widget.edit', {
       organization,
@@ -467,8 +467,8 @@ class Dashboard extends Component<Props, State> {
     const {dashboard, onUpdate} = this.props;
     const isNotAddButton = ({i}) => i !== ADD_WIDGET_BUTTON_DRAG_ID;
     const newLayouts = {
-      [DESKTOP]: allLayouts[DESKTOP].filter(isNotAddButton),
-      [MOBILE]: allLayouts[MOBILE].filter(isNotAddButton),
+      [DESKTOP]: allLayouts[DESKTOP]!.filter(isNotAddButton),
+      [MOBILE]: allLayouts[MOBILE]!.filter(isNotAddButton),
     };
 
     // Generate a new list of widgets where the layouts are associated
@@ -537,7 +537,7 @@ class Dashboard extends Component<Props, State> {
         isMobile: true,
         layouts: {
           ...layouts,
-          [MOBILE]: getMobileLayout(layouts[DESKTOP], widgets),
+          [MOBILE]: getMobileLayout(layouts[DESKTOP]!, widgets),
         },
       });
       return;
@@ -549,7 +549,7 @@ class Dashboard extends Component<Props, State> {
     const {isMobile, layouts} = this.state;
     let position: Position = BOTTOM_MOBILE_VIEW_POSITION;
     if (!isMobile) {
-      const columnDepths = calculateColumnDepths(layouts[DESKTOP]);
+      const columnDepths = calculateColumnDepths(layouts[DESKTOP]!);
       const [nextPosition] = getNextAvailablePosition(columnDepths, 1);
       position = nextPosition;
     }
@@ -567,7 +567,7 @@ class Dashboard extends Component<Props, State> {
       this.props;
     const {widgets} = dashboard;
 
-    const columnDepths = calculateColumnDepths(layouts[DESKTOP]);
+    const columnDepths = calculateColumnDepths(layouts[DESKTOP]!);
 
     const widgetsWithLayout = assignDefaultLayout(widgets, columnDepths);
 
diff --git a/static/app/views/dashboards/datasetConfig/base.tsx b/static/app/views/dashboards/datasetConfig/base.tsx
index cad50cc20ca9af..b9db7c0091034f 100644
--- a/static/app/views/dashboards/datasetConfig/base.tsx
+++ b/static/app/views/dashboards/datasetConfig/base.tsx
@@ -44,11 +44,18 @@ export interface DatasetConfig<SeriesResponse, TableResponse> {
    * widget builder.
    */
   SearchBar: (props: WidgetBuilderSearchBarProps) => JSX.Element;
+  /**
+   * Default field to add to the widget query when adding a new field.
+   */
+  defaultField: QueryFieldValue;
   /**
    * Default query to display when dataset is selected in the
    * Widget Builder.
    */
   defaultWidgetQuery: WidgetQuery;
+  /**
+   * Whether or not the current dataset supports adding equations.
+   */
   enableEquations: boolean;
   /**
    * Field options to display in the Column selectors for
diff --git a/static/app/views/dashboards/datasetConfig/errors.spec.tsx b/static/app/views/dashboards/datasetConfig/errors.spec.tsx
index acac6d5dc039d9..880d5ff5e3b4eb 100644
--- a/static/app/views/dashboards/datasetConfig/errors.spec.tsx
+++ b/static/app/views/dashboards/datasetConfig/errors.spec.tsx
@@ -7,6 +7,7 @@ import {WidgetFixture} from 'sentry-fixture/widget';
 import {initializeOrg} from 'sentry-test/initializeOrg';
 import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 
+import type {Client} from 'sentry/api';
 import type {EventViewOptions} from 'sentry/utils/discover/eventView';
 import EventView from 'sentry/utils/discover/eventView';
 import {DiscoverDatasets} from 'sentry/utils/discover/types';
@@ -105,7 +106,9 @@ describe('ErrorsConfig', function () {
   });
 
   describe('getEventsRequest', function () {
-    let api, organization, mockEventsRequest;
+    let api!: Client;
+    let organization!: ReturnType<typeof OrganizationFixture>;
+    let mockEventsRequest!: jest.Mock;
 
     beforeEach(function () {
       MockApiClient.clearMockResponses();
@@ -152,7 +155,9 @@ describe('ErrorsConfig', function () {
   });
 
   describe('getSeriesRequest', function () {
-    let api, organization, mockEventsRequest;
+    let api!: Client;
+    let organization!: ReturnType<typeof OrganizationFixture>;
+    let mockEventsRequest!: jest.Mock;
 
     beforeEach(function () {
       MockApiClient.clearMockResponses();
diff --git a/static/app/views/dashboards/datasetConfig/errors.tsx b/static/app/views/dashboards/datasetConfig/errors.tsx
index de9240da1ef9e6..1fcf3e3262e778 100644
--- a/static/app/views/dashboards/datasetConfig/errors.tsx
+++ b/static/app/views/dashboards/datasetConfig/errors.tsx
@@ -16,6 +16,7 @@ import {
   ERROR_FIELDS,
   ERRORS_AGGREGATION_FUNCTIONS,
   getAggregations,
+  type QueryFieldValue,
 } from 'sentry/utils/discover/fields';
 import type {DiscoverQueryRequestParams} from 'sentry/utils/discover/genericDiscoverQuery';
 import {doDiscoverQuery} from 'sentry/utils/discover/genericDiscoverQuery';
@@ -25,6 +26,7 @@ import type {MEPState} from 'sentry/utils/performance/contexts/metricsEnhancedSe
 import type {OnDemandControlContext} from 'sentry/utils/performance/contexts/onDemandControl';
 import {getSeriesRequestData} from 'sentry/views/dashboards/datasetConfig/utils/getSeriesRequestData';
 import type {FieldValueOption} from 'sentry/views/discover/table/queryField';
+import {FieldValueKind} from 'sentry/views/discover/table/types';
 import {generateFieldOptions} from 'sentry/views/discover/utils';
 
 import type {Widget, WidgetQuery} from '../types';
@@ -55,12 +57,18 @@ const DEFAULT_WIDGET_QUERY: WidgetQuery = {
   orderby: '-count()',
 };
 
+const DEFAULT_FIELD: QueryFieldValue = {
+  function: ['count', '', undefined, undefined],
+  kind: FieldValueKind.FUNCTION,
+};
+
 export type SeriesWithOrdering = [order: number, series: Series];
 
 export const ErrorsConfig: DatasetConfig<
   EventsStats | MultiSeriesEventsStats,
   TableData | EventsTableData
 > = {
+  defaultField: DEFAULT_FIELD,
   defaultWidgetQuery: DEFAULT_WIDGET_QUERY,
   enableEquations: true,
   getCustomFieldRenderer: getCustomEventsFieldRenderer,
diff --git a/static/app/views/dashboards/datasetConfig/errorsAndTransactions.tsx b/static/app/views/dashboards/datasetConfig/errorsAndTransactions.tsx
index 4511f8b5805fd1..8c74cde111270b 100644
--- a/static/app/views/dashboards/datasetConfig/errorsAndTransactions.tsx
+++ b/static/app/views/dashboards/datasetConfig/errorsAndTransactions.tsx
@@ -89,12 +89,18 @@ const DEFAULT_WIDGET_QUERY: WidgetQuery = {
   orderby: '-count()',
 };
 
+const DEFAULT_FIELD: QueryFieldValue = {
+  function: ['count', '', undefined, undefined],
+  kind: FieldValueKind.FUNCTION,
+};
+
 export type SeriesWithOrdering = [order: number, series: Series];
 
 export const ErrorsAndTransactionsConfig: DatasetConfig<
   EventsStats | MultiSeriesEventsStats,
   TableData | EventsTableData
 > = {
+  defaultField: DEFAULT_FIELD,
   defaultWidgetQuery: DEFAULT_WIDGET_QUERY,
   enableEquations: true,
   getCustomFieldRenderer: getCustomEventsFieldRenderer,
@@ -356,7 +362,7 @@ export function transformEventsResponseToSeries(
     } else {
       seriesWithOrdering = Object.keys(data).map((seriesName: string) => {
         const prefixedName = queryAlias ? `${queryAlias} : ${seriesName}` : seriesName;
-        const seriesData: EventsStats = data[seriesName];
+        const seriesData: EventsStats = data[seriesName]!;
         return [
           seriesData.order || 0,
           transformSeries(seriesData, prefixedName, seriesName),
@@ -370,7 +376,7 @@ export function transformEventsResponseToSeries(
         .map(item => item[1]),
     ];
   } else {
-    const field = widgetQuery.aggregates[0];
+    const field = widgetQuery.aggregates[0]!;
     const prefixedName = queryAlias ? `${queryAlias} : ${field}` : field;
     const transformed = transformSeries(data, prefixedName, field);
     output.push(transformed);
@@ -384,12 +390,12 @@ function getSeriesResultType(
   data: EventsStats | MultiSeriesEventsStats,
   widgetQuery: WidgetQuery
 ): Record<string, AggregationOutputType> {
-  const field = widgetQuery.aggregates[0];
+  const field = widgetQuery.aggregates[0]!;
   const resultTypes = {};
   // Need to use getAggregateAlias since events-stats still uses aggregate alias format
   if (isMultiSeriesStats(data)) {
     Object.keys(data).forEach(
-      key => (resultTypes[key] = data[key].meta?.fields[getAggregateAlias(key)])
+      key => (resultTypes[key] = data[key]!.meta?.fields[getAggregateAlias(key)])
     );
   } else {
     resultTypes[field] = data.meta?.fields[getAggregateAlias(field)];
@@ -538,7 +544,7 @@ function getEventsSeriesRequest(
   referrer?: string,
   mepSetting?: MEPState | null
 ) {
-  const widgetQuery = widget.queries[queryIndex];
+  const widgetQuery = widget.queries[queryIndex]!;
   const {displayType, limit} = widget;
   const {environments, projects} = pageFilters;
   const {start, end, period: statsPeriod} = pageFilters.datetime;
diff --git a/static/app/views/dashboards/datasetConfig/issues.tsx b/static/app/views/dashboards/datasetConfig/issues.tsx
index d0ce770b24e1d2..c5c25c1f7b1d51 100644
--- a/static/app/views/dashboards/datasetConfig/issues.tsx
+++ b/static/app/views/dashboards/datasetConfig/issues.tsx
@@ -8,7 +8,9 @@ import type {Organization} from 'sentry/types/organization';
 import {getIssueFieldRenderer} from 'sentry/utils/dashboards/issueFieldRenderers';
 import {getUtcDateString} from 'sentry/utils/dates';
 import type {TableData, TableDataRow} from 'sentry/utils/discover/discoverQuery';
+import type {QueryFieldValue} from 'sentry/utils/discover/fields';
 import type {OnDemandControlContext} from 'sentry/utils/performance/contexts/onDemandControl';
+import {FieldValueKind} from 'sentry/views/discover/table/types';
 import {
   DISCOVER_EXCLUSION_FIELDS,
   getSortLabel,
@@ -36,6 +38,11 @@ const DEFAULT_WIDGET_QUERY: WidgetQuery = {
 const DEFAULT_SORT = IssueSortOptions.DATE;
 const DEFAULT_EXPAND = ['owners'];
 
+const DEFAULT_FIELD: QueryFieldValue = {
+  field: 'issue',
+  kind: FieldValueKind.FIELD,
+};
+
 type EndpointParams = Partial<PageFilters['datetime']> & {
   environment: string[];
   project: number[];
@@ -51,6 +58,7 @@ type EndpointParams = Partial<PageFilters['datetime']> & {
 };
 
 export const IssuesConfig: DatasetConfig<never, Group[]> = {
+  defaultField: DEFAULT_FIELD,
   defaultWidgetQuery: DEFAULT_WIDGET_QUERY,
   enableEquations: false,
   disableSortOptions,
diff --git a/static/app/views/dashboards/datasetConfig/releases.tsx b/static/app/views/dashboards/datasetConfig/releases.tsx
index cd78e27aec2367..2972d8211498e6 100644
--- a/static/app/views/dashboards/datasetConfig/releases.tsx
+++ b/static/app/views/dashboards/datasetConfig/releases.tsx
@@ -14,7 +14,10 @@ import {SessionField} from 'sentry/types/sessions';
 import {defined} from 'sentry/utils';
 import type {TableData} from 'sentry/utils/discover/discoverQuery';
 import {getFieldRenderer} from 'sentry/utils/discover/fieldRenderers';
-import type {QueryFieldValue} from 'sentry/utils/discover/fields';
+import type {
+  AggregationKeyWithAlias,
+  QueryFieldValue,
+} from 'sentry/utils/discover/fields';
 import {statsPeriodToDays} from 'sentry/utils/duration/statsPeriodToDays';
 import type {OnDemandControlContext} from 'sentry/utils/performance/contexts/onDemandControl';
 import type {FieldValueOption} from 'sentry/views/discover/table/queryField';
@@ -60,12 +63,23 @@ const DEFAULT_WIDGET_QUERY: WidgetQuery = {
   orderby: `-crash_free_rate(${SessionField.SESSION})`,
 };
 
+const DEFAULT_FIELD: QueryFieldValue = {
+  function: [
+    'crash_free_rate' as AggregationKeyWithAlias,
+    SessionField.SESSION,
+    undefined,
+    undefined,
+  ],
+  kind: FieldValueKind.FUNCTION,
+};
+
 const METRICS_BACKED_SESSIONS_START_DATE = new Date('2022-07-12');
 
 export const ReleasesConfig: DatasetConfig<
   SessionApiResponse | MetricsApiResponse,
   SessionApiResponse | MetricsApiResponse
 > = {
+  defaultField: DEFAULT_FIELD,
   defaultWidgetQuery: DEFAULT_WIDGET_QUERY,
   enableEquations: false,
   disableSortOptions,
@@ -190,7 +204,7 @@ function getReleasesSeriesRequest(
   organization: Organization,
   pageFilters: PageFilters
 ) {
-  const query = widget.queries[queryIndex];
+  const query = widget.queries[queryIndex]!;
   const {displayType, limit} = widget;
 
   const {datetime} = pageFilters;
diff --git a/static/app/views/dashboards/datasetConfig/spans.tsx b/static/app/views/dashboards/datasetConfig/spans.tsx
index 61303f0f35850f..636c2b62865c77 100644
--- a/static/app/views/dashboards/datasetConfig/spans.tsx
+++ b/static/app/views/dashboards/datasetConfig/spans.tsx
@@ -13,6 +13,7 @@ import toArray from 'sentry/utils/array/toArray';
 import type {CustomMeasurementCollection} from 'sentry/utils/customMeasurements/customMeasurements';
 import type {EventsTableData, TableData} from 'sentry/utils/discover/discoverQuery';
 import {getFieldRenderer} from 'sentry/utils/discover/fieldRenderers';
+import type {QueryFieldValue} from 'sentry/utils/discover/fields';
 import {
   type DiscoverQueryExtras,
   type DiscoverQueryRequestParams,
@@ -20,6 +21,7 @@ import {
 } from 'sentry/utils/discover/genericDiscoverQuery';
 import {DiscoverDatasets} from 'sentry/utils/discover/types';
 import {ALLOWED_EXPLORE_VISUALIZE_AGGREGATES} from 'sentry/utils/fields';
+import localStorage from 'sentry/utils/localStorage';
 import type {MEPState} from 'sentry/utils/performance/contexts/metricsEnhancedSetting';
 import type {OnDemandControlContext} from 'sentry/utils/performance/contexts/onDemandControl';
 import {
@@ -35,6 +37,7 @@ import {getSeriesRequestData} from 'sentry/views/dashboards/datasetConfig/utils/
 import {DisplayType, type Widget, type WidgetQuery} from 'sentry/views/dashboards/types';
 import {eventViewFromWidget} from 'sentry/views/dashboards/utils';
 import SpansSearchBar from 'sentry/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/spansSearchBar';
+import {DASHBOARD_RPC_TOGGLE_KEY} from 'sentry/views/dashboards/widgetBuilder/components/rpcToggle';
 import type {FieldValueOption} from 'sentry/views/discover/table/queryField';
 import {FieldValueKind} from 'sentry/views/discover/table/types';
 import {generateFieldOptions} from 'sentry/views/discover/utils';
@@ -46,7 +49,12 @@ const DEFAULT_WIDGET_QUERY: WidgetQuery = {
   fieldAliases: [],
   aggregates: ['count(span.duration)'],
   conditions: '',
-  orderby: '',
+  orderby: '-count(span.duration)',
+};
+
+const DEFAULT_FIELD: QueryFieldValue = {
+  function: ['count', 'span.duration', undefined, undefined],
+  kind: FieldValueKind.FUNCTION,
 };
 
 const EAP_AGGREGATIONS = ALLOWED_EXPLORE_VISUALIZE_AGGREGATES.reduce((acc, aggregate) => {
@@ -72,13 +80,14 @@ export const SpansConfig: DatasetConfig<
   EventsStats | MultiSeriesEventsStats,
   TableData | EventsTableData
 > = {
+  defaultField: DEFAULT_FIELD,
   defaultWidgetQuery: DEFAULT_WIDGET_QUERY,
   enableEquations: false,
   SearchBar: SpansSearchBar,
   filterYAxisAggregateParams: () => filterAggregateParams,
   filterYAxisOptions,
   getTableFieldOptions: getPrimaryFieldOptions,
-  getTableSortOptions: getTableSortOptions,
+  getTableSortOptions,
   getGroupByFieldOptions,
   handleOrderByReset,
   supportedDisplayTypes: [
@@ -196,11 +205,14 @@ function getEventsRequest(
   const url = `/organizations/${organization.slug}/events/`;
   const eventView = eventViewFromWidget('', query, pageFilters);
 
+  const useRpc = localStorage.getItem(DASHBOARD_RPC_TOGGLE_KEY) === 'true';
+
   const params: DiscoverQueryRequestParams = {
     per_page: limit,
     cursor,
     referrer,
     dataset: DiscoverDatasets.SPANS_EAP,
+    useRpc: useRpc ? '1' : undefined,
     ...queryExtras,
   };
 
@@ -263,5 +275,9 @@ function getSeriesRequest(
     DiscoverDatasets.SPANS_EAP,
     referrer
   );
+
+  const useRpc = localStorage.getItem(DASHBOARD_RPC_TOGGLE_KEY) === 'true';
+  requestData.useRpc = useRpc;
+
   return doEventsRequest<true>(api, requestData);
 }
diff --git a/static/app/views/dashboards/datasetConfig/transactions.spec.tsx b/static/app/views/dashboards/datasetConfig/transactions.spec.tsx
index acc5a02f32336d..42a9433aeefda5 100644
--- a/static/app/views/dashboards/datasetConfig/transactions.spec.tsx
+++ b/static/app/views/dashboards/datasetConfig/transactions.spec.tsx
@@ -2,13 +2,17 @@ import {OrganizationFixture} from 'sentry-fixture/organization';
 import {PageFiltersFixture} from 'sentry-fixture/pageFilters';
 import {WidgetFixture} from 'sentry-fixture/widget';
 
+import type {Client} from 'sentry/api';
 import {DiscoverDatasets} from 'sentry/utils/discover/types';
 import {MEPState} from 'sentry/utils/performance/contexts/metricsEnhancedSetting';
 import {TransactionsConfig} from 'sentry/views/dashboards/datasetConfig/transactions';
 
 describe('TransactionsConfig', function () {
   describe('getEventsRequest', function () {
-    let api, organization, mockEventsRequest, mockEventsStatsRequest;
+    let api!: Client;
+    let organization!: ReturnType<typeof OrganizationFixture>;
+    let mockEventsRequest!: jest.Mock;
+    let mockEventsStatsRequest!: jest.Mock;
 
     beforeEach(function () {
       MockApiClient.clearMockResponses();
diff --git a/static/app/views/dashboards/datasetConfig/transactions.tsx b/static/app/views/dashboards/datasetConfig/transactions.tsx
index 6b83167ee2efba..1fca37b1d10932 100644
--- a/static/app/views/dashboards/datasetConfig/transactions.tsx
+++ b/static/app/views/dashboards/datasetConfig/transactions.tsx
@@ -11,7 +11,11 @@ import type {
 import {defined} from 'sentry/utils';
 import type {CustomMeasurementCollection} from 'sentry/utils/customMeasurements/customMeasurements';
 import type {EventsTableData, TableData} from 'sentry/utils/discover/discoverQuery';
-import {SPAN_OP_BREAKDOWN_FIELDS, TRANSACTION_FIELDS} from 'sentry/utils/discover/fields';
+import {
+  type QueryFieldValue,
+  SPAN_OP_BREAKDOWN_FIELDS,
+  TRANSACTION_FIELDS,
+} from 'sentry/utils/discover/fields';
 import type {
   DiscoverQueryExtras,
   DiscoverQueryRequestParams,
@@ -25,6 +29,7 @@ import {
   shouldUseOnDemandMetrics,
 } from 'sentry/utils/performance/contexts/onDemandControl';
 import {getSeriesRequestData} from 'sentry/views/dashboards/datasetConfig/utils/getSeriesRequestData';
+import {FieldValueKind} from 'sentry/views/discover/table/types';
 import {generateFieldOptions} from 'sentry/views/discover/utils';
 
 import type {Widget, WidgetQuery} from '../types';
@@ -56,12 +61,18 @@ const DEFAULT_WIDGET_QUERY: WidgetQuery = {
   orderby: '-count()',
 };
 
+const DEFAULT_FIELD: QueryFieldValue = {
+  function: ['count', '', undefined, undefined],
+  kind: FieldValueKind.FUNCTION,
+};
+
 export type SeriesWithOrdering = [order: number, series: Series];
 
 export const TransactionsConfig: DatasetConfig<
   EventsStats | MultiSeriesEventsStats,
   TableData | EventsTableData
 > = {
+  defaultField: DEFAULT_FIELD,
   defaultWidgetQuery: DEFAULT_WIDGET_QUERY,
   enableEquations: true,
   getCustomFieldRenderer: getCustomEventsFieldRenderer,
diff --git a/static/app/views/dashboards/datasetConfig/utils/getSeriesRequestData.tsx b/static/app/views/dashboards/datasetConfig/utils/getSeriesRequestData.tsx
index d18664eae5ec8f..ee4ccd36fa8d1b 100644
--- a/static/app/views/dashboards/datasetConfig/utils/getSeriesRequestData.tsx
+++ b/static/app/views/dashboards/datasetConfig/utils/getSeriesRequestData.tsx
@@ -25,7 +25,7 @@ export function getSeriesRequestData(
   dataset: DiscoverDatasets,
   referrer?: string
 ): EventsStatsOptions<true> {
-  const widgetQuery = widget.queries[queryIndex];
+  const widgetQuery = widget.queries[queryIndex]!;
   const {displayType, limit} = widget;
   const {environments, projects} = pageFilters;
   const {start, end, period: statsPeriod} = pageFilters.datetime;
diff --git a/static/app/views/dashboards/detail.spec.tsx b/static/app/views/dashboards/detail.spec.tsx
index f1638d5d8fbf07..b83d6b16d536cc 100644
--- a/static/app/views/dashboards/detail.spec.tsx
+++ b/static/app/views/dashboards/detail.spec.tsx
@@ -24,7 +24,6 @@ import ConfigStore from 'sentry/stores/configStore';
 import PageFiltersStore from 'sentry/stores/pageFiltersStore';
 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 DashboardDetail, {
   handleUpdateDashboardSplit,
@@ -33,8 +32,11 @@ 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 useWidgetBuilderState from 'sentry/views/dashboards/widgetBuilder/hooks/useWidgetBuilderState';
 import {OrganizationContext} from 'sentry/views/organizationContext';
 
+jest.mock('sentry/views/dashboards/widgetBuilder/hooks/useWidgetBuilderState');
+
 describe('Dashboards > Detail', function () {
   const organization = OrganizationFixture({
     features: ['global-views', 'dashboards-basic', 'dashboards-edit', 'discover-query'],
@@ -42,7 +44,7 @@ describe('Dashboards > Detail', function () {
   const projects = [ProjectFixture()];
 
   describe('prebuilt dashboards', function () {
-    let initialData;
+    let initialData!: ReturnType<typeof initializeOrg>;
 
     beforeEach(function () {
       act(() => ProjectsStore.loadInitialData(projects));
@@ -228,7 +230,10 @@ describe('Dashboards > Detail', function () {
   });
 
   describe('custom dashboards', function () {
-    let initialData, widgets, mockVisit, mockPut;
+    let initialData!: ReturnType<typeof initializeOrg>;
+    let widgets!: ReturnType<typeof WidgetFixture>[];
+    let mockVisit!: jest.Mock;
+    let mockPut!: jest.Mock;
 
     beforeEach(function () {
       window.confirm = jest.fn();
@@ -407,7 +412,7 @@ describe('Dashboards > Detail', function () {
       const updateMock = MockApiClient.addMockResponse({
         url: '/organizations/org-slug/dashboards/1/',
         method: 'PUT',
-        body: DashboardFixture([widgets[0]], {id: '1', title: 'Custom Errors'}),
+        body: DashboardFixture([widgets[0]!], {id: '1', title: 'Custom Errors'}),
       });
       render(
         <OrganizationContext.Provider value={initialData.organization}>
@@ -431,10 +436,10 @@ describe('Dashboards > Detail', function () {
 
       // Remove the second and third widgets
       await userEvent.click(
-        (await screen.findAllByRole('button', {name: 'Delete Widget'}))[1]
+        (await screen.findAllByRole('button', {name: 'Delete Widget'}))[1]!
       );
       await userEvent.click(
-        (await screen.findAllByRole('button', {name: 'Delete Widget'}))[1]
+        (await screen.findAllByRole('button', {name: 'Delete Widget'}))[1]!
       );
 
       // Save changes
@@ -546,7 +551,7 @@ describe('Dashboards > Detail', function () {
         {router: initialData.router}
       );
 
-      await userEvent.click(screen.getAllByText('Add Widget')[0]);
+      await userEvent.click(screen.getAllByText('Add Widget')[0]!);
       const menuOptions = await screen.findAllByTestId('menu-list-item-label');
       expect(menuOptions.map(e => e.textContent)).toEqual([
         'Errors',
@@ -584,7 +589,7 @@ describe('Dashboards > Detail', function () {
         {router: initialData.router}
       );
 
-      await userEvent.click(screen.getAllByText('Add Widget')[0]);
+      await userEvent.click(screen.getAllByText('Add Widget')[0]!);
       const menuOptions = await screen.findAllByTestId('menu-list-item-label');
       expect(menuOptions.map(e => e.textContent)).toEqual([
         'Errors and Transactions',
@@ -1221,12 +1226,12 @@ describe('Dashboards > Detail', function () {
 
       await screen.findByText('7D');
       await userEvent.click(await screen.findByText('sentry-android-shop@1.2.0'));
-      await userEvent.click(screen.getAllByText('Clear')[0]);
+      await userEvent.click(screen.getAllByText('Clear')[0]!);
       screen.getByText('All Releases');
       await userEvent.click(document.body);
 
       await waitFor(() => {
-        expect(browserHistory.push).toHaveBeenCalledWith(
+        expect(testData.router.push).toHaveBeenCalledWith(
           expect.objectContaining({
             query: expect.objectContaining({
               release: '',
@@ -1334,7 +1339,7 @@ describe('Dashboards > Detail', function () {
       await userEvent.click(screen.getByText('Cancel'));
 
       screen.getByText('All Releases');
-      expect(browserHistory.replace).toHaveBeenCalledWith(
+      expect(testData.router.replace).toHaveBeenCalledWith(
         expect.objectContaining({
           query: expect.objectContaining({
             project: undefined,
@@ -1544,7 +1549,7 @@ describe('Dashboards > Detail', function () {
       await userEvent.click(screen.getByText('Cancel'));
 
       // release isn't used in the redirect
-      expect(browserHistory.replace).toHaveBeenCalledWith(
+      expect(testData.router.replace).toHaveBeenCalledWith(
         expect.objectContaining({
           query: {
             end: undefined,
@@ -1599,7 +1604,7 @@ describe('Dashboards > Detail', function () {
       await userEvent.click(document.body);
 
       await waitFor(() => {
-        expect(browserHistory.push).toHaveBeenCalledWith(
+        expect(testData.router.push).toHaveBeenCalledWith(
           expect.objectContaining({
             query: expect.objectContaining({
               release: ['sentry-android-shop@1.2.0'],
@@ -1660,7 +1665,7 @@ describe('Dashboards > Detail', function () {
       );
 
       await userEvent.click(await screen.findByText('All Releases'));
-      await userEvent.type(screen.getAllByPlaceholderText('Search\u2026')[2], 's');
+      await userEvent.type(screen.getAllByPlaceholderText('Search\u2026')[2]!, 's');
       await userEvent.click(await screen.findByRole('option', {name: 'search-result'}));
 
       // Validate that after search is cleared, search result still appears
@@ -1677,8 +1682,8 @@ describe('Dashboards > Detail', function () {
         {
           router: initialData.router,
           organization: {
-            features: ['dashboards-edit-access'],
             ...initialData.organization,
+            features: ['dashboards-edit-access'],
           },
         }
       );
@@ -1733,15 +1738,15 @@ describe('Dashboards > Detail', function () {
 
       await waitFor(() => {
         expect(mockPUT).toHaveBeenCalledTimes(1);
-        expect(mockPUT).toHaveBeenCalledWith(
-          '/organizations/org-slug/dashboards/1/',
-          expect.objectContaining({
-            data: expect.objectContaining({
-              permissions: {isEditableByEveryone: false, teamsWithEditAccess: []},
-            }),
-          })
-        );
       });
+      expect(mockPUT).toHaveBeenCalledWith(
+        '/organizations/org-slug/dashboards/1/',
+        expect.objectContaining({
+          data: expect.objectContaining({
+            permissions: {isEditableByEveryone: false, teamsWithEditAccess: []},
+          }),
+        })
+      );
     });
 
     it('creator can update permissions for dashboard', async function () {
@@ -1801,15 +1806,15 @@ describe('Dashboards > Detail', function () {
 
       await waitFor(() => {
         expect(mockPUT).toHaveBeenCalledTimes(1);
-        expect(mockPUT).toHaveBeenCalledWith(
-          '/organizations/org-slug/dashboards/1/',
-          expect.objectContaining({
-            data: expect.objectContaining({
-              permissions: {isEditableByEveryone: true, teamsWithEditAccess: []},
-            }),
-          })
-        );
       });
+      expect(mockPUT).toHaveBeenCalledWith(
+        '/organizations/org-slug/dashboards/1/',
+        expect.objectContaining({
+          data: expect.objectContaining({
+            permissions: {isEditableByEveryone: true, teamsWithEditAccess: []},
+          }),
+        })
+      );
     });
 
     it('creator can update permissions with teams for dashboard', async function () {
@@ -1885,15 +1890,15 @@ describe('Dashboards > Detail', function () {
 
       await waitFor(() => {
         expect(mockPUT).toHaveBeenCalledTimes(1);
-        expect(mockPUT).toHaveBeenCalledWith(
-          '/organizations/org-slug/dashboards/1/',
-          expect.objectContaining({
-            data: expect.objectContaining({
-              permissions: {isEditableByEveryone: false, teamsWithEditAccess: [1, 2]},
-            }),
-          })
-        );
       });
+      expect(mockPUT).toHaveBeenCalledWith(
+        '/organizations/org-slug/dashboards/1/',
+        expect.objectContaining({
+          data: expect.objectContaining({
+            permissions: {isEditableByEveryone: false, teamsWithEditAccess: [1, 2]},
+          }),
+        })
+      );
     });
 
     it('disables edit dashboard and add widget button if user cannot edit dashboard', async function () {
@@ -2118,7 +2123,7 @@ describe('Dashboards > Detail', function () {
     });
 
     describe('widget builder redesign', function () {
-      let mockUpdateDashboard;
+      let mockUpdateDashboard!: jest.SpyInstance;
       beforeEach(function () {
         initialData = initializeOrg({
           organization: OrganizationFixture({
@@ -2139,6 +2144,11 @@ describe('Dashboards > Detail', function () {
           .mockResolvedValue({
             ...DashboardFixture([WidgetFixture({id: '1', title: 'Custom Widget'})]),
           });
+
+        jest.mocked(useWidgetBuilderState).mockReturnValue({
+          dispatch: jest.fn(),
+          state: {},
+        });
       });
 
       afterEach(() => {
@@ -2185,6 +2195,12 @@ describe('Dashboards > Detail', function () {
           id: '1',
           title: 'Custom Errors',
         });
+        jest.mocked(useWidgetBuilderState).mockReturnValue({
+          dispatch: jest.fn(),
+          state: {
+            title: 'Updated Widget',
+          },
+        });
         render(
           <DashboardDetail
             {...RouteComponentPropsFixture()}
@@ -2198,7 +2214,7 @@ describe('Dashboards > Detail', function () {
           {
             organization: initialData.organization,
             // Mock the widgetIndex param so it's available when the widget builder opens
-            router: {...initialData.router, params: {widgetIndex: 0}},
+            router: {...initialData.router, params: {widgetIndex: '0'}},
           }
         );
 
@@ -2207,9 +2223,6 @@ describe('Dashboards > Detail', function () {
 
         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
@@ -2226,6 +2239,12 @@ describe('Dashboards > Detail', function () {
           id: '1',
           title: 'Custom Errors',
         });
+        jest.mocked(useWidgetBuilderState).mockReturnValue({
+          dispatch: jest.fn(),
+          state: {
+            title: 'Totally new widget',
+          },
+        });
         render(
           <DashboardDetail
             {...RouteComponentPropsFixture()}
@@ -2245,9 +2264,6 @@ describe('Dashboards > Detail', function () {
 
         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
@@ -2265,6 +2281,12 @@ describe('Dashboards > Detail', function () {
           id: '1',
           title: 'Custom Errors',
         });
+        jest.mocked(useWidgetBuilderState).mockReturnValue({
+          dispatch: jest.fn(),
+          state: {
+            title: 'Updated Widget Title',
+          },
+        });
         render(
           <DashboardDetail
             {...RouteComponentPropsFixture()}
@@ -2278,7 +2300,7 @@ describe('Dashboards > Detail', function () {
           {
             organization: initialData.organization,
             // Mock the widgetIndex param so it's available when the widget builder opens
-            router: {...initialData.router, params: {widgetIndex: 0}},
+            router: {...initialData.router, params: {widgetIndex: '0'}},
           }
         );
 
@@ -2290,12 +2312,6 @@ describe('Dashboards > Detail', function () {
 
         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
@@ -2318,6 +2334,12 @@ describe('Dashboards > Detail', function () {
           id: '1',
           title: 'Custom Errors',
         });
+        jest.mocked(useWidgetBuilderState).mockReturnValue({
+          dispatch: jest.fn(),
+          state: {
+            title: 'Totally new widget',
+          },
+        });
         render(
           <DashboardDetail
             {...RouteComponentPropsFixture()}
@@ -2337,9 +2359,6 @@ describe('Dashboards > Detail', function () {
 
         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')
         );
diff --git a/static/app/views/dashboards/detail.tsx b/static/app/views/dashboards/detail.tsx
index e4660388e957f2..93a31f59a32b6b 100644
--- a/static/app/views/dashboards/detail.tsx
+++ b/static/app/views/dashboards/detail.tsx
@@ -59,6 +59,8 @@ import {
 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 {getDefaultWidget} from 'sentry/views/dashboards/widgetBuilder/utils/getDefaultWidget';
+import {DATA_SET_TO_WIDGET_TYPE} from 'sentry/views/dashboards/widgetBuilder/widgetBuilder';
 import WidgetLegendNameEncoderDecoder from 'sentry/views/dashboards/widgetLegendNameEncoderDecoder';
 import {MetricsDataSwitcherAlert} from 'sentry/views/performance/landing/metricsDataSwitcherAlert';
 
@@ -157,7 +159,7 @@ export function handleUpdateDashboardSplit({
   );
 
   if (widgetIndex >= 0) {
-    updatedDashboard.widgets[widgetIndex].widgetType = splitDecision;
+    updatedDashboard.widgets[widgetIndex]!.widgetType = splitDecision;
   }
   onDashboardUpdate?.(updatedDashboard);
 
@@ -698,7 +700,9 @@ class DashboardDetail extends Component<Props, State> {
               pathname,
               query: {
                 ...location.query,
-                dataset,
+                ...convertWidgetToBuilderStateParams(
+                  getDefaultWidget(DATA_SET_TO_WIDGET_TYPE[dataset ?? DataSet.ERRORS])
+                ),
               },
             })
           );
@@ -815,6 +819,7 @@ class DashboardDetail extends Component<Props, State> {
 
   handleCloseWidgetBuilder = () => {
     const {organization, router, location, params} = this.props;
+
     this.setState({isWidgetBuilderOpen: false});
     router.push(
       getDashboardLocation({
diff --git a/static/app/views/dashboards/editAccessSelector.tsx b/static/app/views/dashboards/editAccessSelector.tsx
index 2ac341d5a877df..21c2c05925015f 100644
--- a/static/app/views/dashboards/editAccessSelector.tsx
+++ b/static/app/views/dashboards/editAccessSelector.tsx
@@ -331,6 +331,7 @@ const StyledDisplayName = styled('div')`
 const StyledAvatarList = styled(AvatarList)`
   margin-left: 10px;
   margin-right: -3px;
+  font-weight: normal;
 `;
 
 const StyledFeatureBadge = styled(FeatureBadge)`
diff --git a/static/app/views/dashboards/layoutUtils.tsx b/static/app/views/dashboards/layoutUtils.tsx
index dc319fbcbea55f..813f4a4d01633e 100644
--- a/static/app/views/dashboards/layoutUtils.tsx
+++ b/static/app/views/dashboards/layoutUtils.tsx
@@ -144,7 +144,7 @@ export function getNextAvailablePosition(
   // we get the top-most available spot
   for (let currDepth = 0; currDepth <= maxColumnDepth; currDepth++) {
     for (let start = 0; start <= columnDepths.length - DEFAULT_WIDGET_WIDTH; start++) {
-      if (columnDepths[start] > currDepth) {
+      if (columnDepths[start]! > currDepth) {
         // There are potentially widgets in the way here, so skip
         continue;
       }
diff --git a/static/app/views/dashboards/manage/dashboardGrid.spec.tsx b/static/app/views/dashboards/manage/dashboardGrid.spec.tsx
index 393a6540ebe3a1..4d8e4702bf99d0 100644
--- a/static/app/views/dashboards/manage/dashboardGrid.spec.tsx
+++ b/static/app/views/dashboards/manage/dashboardGrid.spec.tsx
@@ -190,7 +190,9 @@ describe('Dashboards - DashboardGrid', function () {
     );
     renderGlobalModal();
 
-    await userEvent.click(screen.getAllByRole('button', {name: /dashboard actions/i})[1]);
+    await userEvent.click(
+      screen.getAllByRole('button', {name: /dashboard actions/i})[1]!
+    );
     await userEvent.click(screen.getByTestId('dashboard-delete'));
 
     expect(deleteMock).not.toHaveBeenCalled();
@@ -201,8 +203,8 @@ describe('Dashboards - DashboardGrid', function () {
 
     await waitFor(() => {
       expect(deleteMock).toHaveBeenCalled();
-      expect(dashboardUpdateMock).toHaveBeenCalled();
     });
+    expect(dashboardUpdateMock).toHaveBeenCalled();
   });
 
   it('cannot delete last dashboard', async function () {
@@ -246,7 +248,9 @@ describe('Dashboards - DashboardGrid', function () {
     );
     renderGlobalModal();
 
-    await userEvent.click(screen.getAllByRole('button', {name: /dashboard actions/i})[1]);
+    await userEvent.click(
+      screen.getAllByRole('button', {name: /dashboard actions/i})[1]!
+    );
     await userEvent.click(screen.getByTestId('dashboard-duplicate'));
 
     expect(createMock).not.toHaveBeenCalled();
@@ -257,8 +261,8 @@ describe('Dashboards - DashboardGrid', function () {
 
     await waitFor(() => {
       expect(createMock).toHaveBeenCalled();
-      expect(dashboardUpdateMock).toHaveBeenCalled();
     });
+    expect(dashboardUpdateMock).toHaveBeenCalled();
   });
 
   it('does not throw an error if the POST fails during duplication', async function () {
@@ -280,7 +284,9 @@ describe('Dashboards - DashboardGrid', function () {
     );
     renderGlobalModal();
 
-    await userEvent.click(screen.getAllByRole('button', {name: /dashboard actions/i})[1]);
+    await userEvent.click(
+      screen.getAllByRole('button', {name: /dashboard actions/i})[1]!
+    );
     await userEvent.click(screen.getByTestId('dashboard-duplicate'));
 
     expect(postMock).not.toHaveBeenCalled();
@@ -291,9 +297,9 @@ describe('Dashboards - DashboardGrid', function () {
 
     await waitFor(() => {
       expect(postMock).toHaveBeenCalled();
-      // Should not update, and not throw error
-      expect(dashboardUpdateMock).not.toHaveBeenCalled();
     });
+    // Should not update, and not throw error
+    expect(dashboardUpdateMock).not.toHaveBeenCalled();
   });
 
   it('renders favorite and unfavorite buttons on cards', function () {
@@ -321,7 +327,7 @@ describe('Dashboards - DashboardGrid', function () {
         rowCount={3}
       />,
       {
-        router: router,
+        router,
         organization: {
           features: ['dashboards-favourite', ...organization.features],
         },
@@ -365,7 +371,7 @@ describe('Dashboards - DashboardGrid', function () {
         rowCount={3}
       />,
       {
-        router: router,
+        router,
         organization: {
           features: ['dashboards-favourite', ...organization.features],
         },
@@ -373,7 +379,7 @@ describe('Dashboards - DashboardGrid', function () {
     );
 
     expect(screen.queryAllByLabelText('Favorite')).toHaveLength(1);
-    const favoriteButton = screen.queryAllByLabelText('Favorite')[0];
+    const favoriteButton = screen.queryAllByLabelText('Favorite')[0]!;
     await userEvent.click(favoriteButton);
 
     await waitFor(() => {
diff --git a/static/app/views/dashboards/manage/dashboardGrid.tsx b/static/app/views/dashboards/manage/dashboardGrid.tsx
index d937a0bf1fc988..d4a135554a8844 100644
--- a/static/app/views/dashboards/manage/dashboardGrid.tsx
+++ b/static/app/views/dashboards/manage/dashboardGrid.tsx
@@ -105,6 +105,7 @@ function DashboardGrid({
   async function handleFavorite(dashboard: DashboardListItem, isFavorited: boolean) {
     try {
       await updateDashboardFavorite(api, organization.slug, dashboard.id, isFavorited);
+      onDashboardsChange();
     } catch (error) {
       throw error;
     }
diff --git a/static/app/views/dashboards/manage/dashboardTable.spec.tsx b/static/app/views/dashboards/manage/dashboardTable.spec.tsx
index c6e10c40dc094f..1aea077f417139 100644
--- a/static/app/views/dashboards/manage/dashboardTable.spec.tsx
+++ b/static/app/views/dashboards/manage/dashboardTable.spec.tsx
@@ -191,7 +191,7 @@ describe('Dashboards - DashboardTable', function () {
     );
     renderGlobalModal();
 
-    await userEvent.click(screen.getAllByTestId('dashboard-delete')[1]);
+    await userEvent.click(screen.getAllByTestId('dashboard-delete')[1]!);
 
     expect(deleteMock).not.toHaveBeenCalled();
 
@@ -201,8 +201,8 @@ describe('Dashboards - DashboardTable', function () {
 
     await waitFor(() => {
       expect(deleteMock).toHaveBeenCalled();
-      expect(dashboardUpdateMock).toHaveBeenCalled();
     });
+    expect(dashboardUpdateMock).toHaveBeenCalled();
   });
 
   it('cannot delete last dashboard', function () {
@@ -241,7 +241,7 @@ describe('Dashboards - DashboardTable', function () {
     );
     renderGlobalModal();
 
-    await userEvent.click(screen.getAllByTestId('dashboard-duplicate')[1]);
+    await userEvent.click(screen.getAllByTestId('dashboard-duplicate')[1]!);
 
     expect(createMock).not.toHaveBeenCalled();
 
@@ -251,8 +251,8 @@ describe('Dashboards - DashboardTable', function () {
 
     await waitFor(() => {
       expect(createMock).toHaveBeenCalled();
-      expect(dashboardUpdateMock).toHaveBeenCalled();
     });
+    expect(dashboardUpdateMock).toHaveBeenCalled();
   });
 
   it('does not throw an error if the POST fails during duplication', async function () {
@@ -272,7 +272,7 @@ describe('Dashboards - DashboardTable', function () {
     );
     renderGlobalModal();
 
-    await userEvent.click(screen.getAllByTestId('dashboard-duplicate')[1]);
+    await userEvent.click(screen.getAllByTestId('dashboard-duplicate')[1]!);
 
     expect(postMock).not.toHaveBeenCalled();
 
@@ -282,9 +282,9 @@ describe('Dashboards - DashboardTable', function () {
 
     await waitFor(() => {
       expect(postMock).toHaveBeenCalled();
-      // Should not update, and not throw error
-      expect(dashboardUpdateMock).not.toHaveBeenCalled();
     });
+    // Should not update, and not throw error
+    expect(dashboardUpdateMock).not.toHaveBeenCalled();
   });
 
   it('renders access column', async function () {
@@ -308,9 +308,9 @@ describe('Dashboards - DashboardTable', function () {
       />
     );
 
-    expect((await screen.findAllByTestId('grid-head-cell')).length).toBe(5);
+    expect(await screen.findAllByTestId('grid-head-cell')).toHaveLength(5);
     expect(screen.getByText('Access')).toBeInTheDocument();
-    await userEvent.click((await screen.findAllByTestId('edit-access-dropdown'))[0]);
+    await userEvent.click((await screen.findAllByTestId('edit-access-dropdown'))[0]!);
     expect(screen.getAllByPlaceholderText('Search Teams')[0]).toBeInTheDocument();
   });
 
@@ -344,12 +344,11 @@ describe('Dashboards - DashboardTable', function () {
       }
     );
 
-    expect((await screen.findAllByTestId('grid-head-cell')).length).toBe(5);
     expect(screen.getByLabelText('Favorite Column')).toBeInTheDocument();
     expect(screen.queryAllByLabelText('Favorite')).toHaveLength(1);
     expect(screen.queryAllByLabelText('UnFavorite')).toHaveLength(1);
 
-    await userEvent.click(screen.queryAllByLabelText('Favorite')[0]);
+    await userEvent.click(screen.queryAllByLabelText('Favorite')[0]!);
     expect(screen.queryAllByLabelText('UnFavorite')).toHaveLength(2);
   });
 });
diff --git a/static/app/views/dashboards/manage/dashboardTable.tsx b/static/app/views/dashboards/manage/dashboardTable.tsx
index 436f91984d5b39..8608652460cf6b 100644
--- a/static/app/views/dashboards/manage/dashboardTable.tsx
+++ b/static/app/views/dashboards/manage/dashboardTable.tsx
@@ -12,8 +12,8 @@ import {
 } from 'sentry/actionCreators/dashboards';
 import {addErrorMessage, addSuccessMessage} from 'sentry/actionCreators/indicator';
 import type {Client} from 'sentry/api';
-import Feature from 'sentry/components/acl/feature';
 import {ActivityAvatar} from 'sentry/components/activity/item/avatar';
+import UserAvatar from 'sentry/components/avatar/userAvatar';
 import {Button} from 'sentry/components/button';
 import {openConfirmModal} from 'sentry/components/confirm';
 import EmptyStateWarning from 'sentry/components/emptyStateWarning';
@@ -21,6 +21,7 @@ import GridEditable, {
   COL_WIDTH_UNDEFINED,
   type GridColumnOrder,
 } from 'sentry/components/gridEditable';
+import SortLink from 'sentry/components/gridEditable/sortLink';
 import Link from 'sentry/components/links/link';
 import TimeSince from 'sentry/components/timeSince';
 import {IconCopy, IconDelete, IconStar} from 'sentry/icons';
@@ -28,6 +29,7 @@ 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 {decodeScalar} from 'sentry/utils/queryString';
 import withApi from 'sentry/utils/withApi';
 import EditAccessSelector from 'sentry/views/dashboards/editAccessSelector';
 import type {
@@ -56,10 +58,17 @@ enum ResponseKeys {
   FAVORITE = 'isFavorited',
 }
 
+const SortKeys = {
+  title: {asc: 'title', desc: '-title'},
+  dateCreated: {asc: 'dateCreated', desc: '-dateCreated'},
+  createdBy: {asc: 'mydashboards', desc: 'mydashboards'},
+};
+
 type FavoriteButtonProps = {
   api: Client;
   dashboardId: string;
   isFavorited: boolean;
+  onDashboardsChange: () => void;
   organization: Organization;
 };
 
@@ -68,38 +77,33 @@ function FavoriteButton({
   api,
   organization,
   dashboardId,
+  onDashboardsChange,
 }: FavoriteButtonProps) {
   const [favorited, setFavorited] = useState(isFavorited);
   return (
-    <Feature features="dashboards-favourite">
-      <StyledFavoriteButton
-        aria-label={t('Favorite Button')}
-        size="zero"
-        borderless
-        icon={
-          <IconStar
-            color={favorited ? 'yellow300' : 'gray300'}
-            isSolid={favorited}
-            aria-label={favorited ? t('UnFavorite') : t('Favorite')}
-            size="sm"
-          />
+    <Button
+      aria-label={t('Favorite Button')}
+      size="zero"
+      borderless
+      icon={
+        <IconStar
+          color={favorited ? 'yellow300' : 'gray300'}
+          isSolid={favorited}
+          aria-label={favorited ? t('UnFavorite') : t('Favorite')}
+          size="sm"
+        />
+      }
+      onClick={async () => {
+        try {
+          setFavorited(!favorited);
+          await updateDashboardFavorite(api, organization.slug, dashboardId, !favorited);
+          onDashboardsChange();
+        } catch (error) {
+          // If the api call fails, revert the state
+          setFavorited(favorited);
         }
-        onClick={async () => {
-          try {
-            setFavorited(!favorited);
-            await updateDashboardFavorite(
-              api,
-              organization.slug,
-              dashboardId,
-              !favorited
-            );
-          } catch (error) {
-            // If the api call fails, revert the state
-            setFavorited(favorited);
-          }
-        }}
-      />
-    </Feature>
+      }}
+    />
   );
 }
 
@@ -112,9 +116,6 @@ function DashboardTable({
   isLoading,
 }: Props) {
   const columnOrder: GridColumnOrder<ResponseKeys>[] = [
-    ...(organization.features.includes('dashboards-favourite')
-      ? [{key: ResponseKeys.FAVORITE, name: t('Favorite'), width: 50}]
-      : []),
     {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},
@@ -166,6 +167,41 @@ function DashboardTable({
       : {}),
   };
 
+  function renderHeadCell(column: GridColumnOrder<string>) {
+    if (column.key in SortKeys) {
+      const urlSort = decodeScalar(location.query.sort, 'mydashboards');
+      const isCurrentSort =
+        urlSort === SortKeys[column.key].asc || urlSort === SortKeys[column.key].desc;
+      const sortDirection =
+        !isCurrentSort || column.key === 'createdBy'
+          ? undefined
+          : urlSort.startsWith('-')
+            ? 'desc'
+            : 'asc';
+
+      return (
+        <SortLink
+          align={'left'}
+          title={column.name}
+          direction={sortDirection}
+          canSort
+          generateSortLink={() => {
+            const newSort = isCurrentSort
+              ? sortDirection === 'asc'
+                ? SortKeys[column.key].desc
+                : SortKeys[column.key].asc
+              : SortKeys[column.key].asc;
+            return {
+              ...location,
+              query: {...location.query, sort: newSort},
+            };
+          }}
+        />
+      );
+    }
+    return column.name;
+  }
+
   const renderBodyCell = (
     column: GridColumnOrder<string>,
     dataRow: DashboardListItem
@@ -177,6 +213,8 @@ function DashboardTable({
           api={api}
           organization={organization}
           dashboardId={dataRow.id}
+          onDashboardsChange={onDashboardsChange}
+          key={dataRow.id}
         />
       );
     }
@@ -200,7 +238,9 @@ function DashboardTable({
 
     if (column.key === ResponseKeys.OWNER) {
       return dataRow[ResponseKeys.OWNER] ? (
-        <ActivityAvatar type="user" user={dataRow[ResponseKeys.OWNER]} size={26} />
+        <BodyCellContainer>
+          <UserAvatar hasTooltip user={dataRow[ResponseKeys.OWNER]} size={26} />
+        </BodyCellContainer>
       ) : (
         <ActivityAvatar type="system" size={26} />
       );
@@ -235,7 +275,7 @@ function DashboardTable({
 
     if (column.key === ResponseKeys.CREATED) {
       return (
-        <DateActionsContainer>
+        <BodyCellContainer>
           <DateSelected>
             {dataRow[ResponseKeys.CREATED] ? (
               <DateStatus>
@@ -276,7 +316,7 @@ function DashboardTable({
               disabled={dashboards && dashboards.length <= 1}
             />
           </ActionsIconWrapper>
-        </DateActionsContainer>
+        </BodyCellContainer>
       );
     }
 
@@ -292,20 +332,34 @@ function DashboardTable({
       columnSortBy={[]}
       grid={{
         renderBodyCell,
-        renderHeadCell: column => {
-          if (column.key === ResponseKeys.FAVORITE) {
-            return (
-              <Feature features="dashboards-favourite">
-                <StyledIconStar
-                  color="yellow300"
-                  isSolid
-                  aria-label={t('Favorite Column')}
-                />
-              </Feature>
-            );
+        renderHeadCell: column => renderHeadCell(column),
+        // favorite column
+        renderPrependColumns: (isHeader: boolean, dataRow?: any) => {
+          if (!organization.features.includes('dashboards-favourite')) {
+            return [];
+          }
+          const favoriteColumn = {
+            key: ResponseKeys.FAVORITE,
+            name: t('Favorite'),
+          };
+          if (isHeader) {
+            return [
+              <StyledIconStar
+                color="yellow300"
+                isSolid
+                aria-label={t('Favorite Column')}
+                key="favorite-header"
+              />,
+            ];
+          }
+          if (!dataRow) {
+            return [];
           }
-          return column.name;
+          return [renderBodyCell(favoriteColumn, dataRow) as any];
         },
+        prependColumnWidths: organization.features.includes('dashboards-favourite')
+          ? ['max-content']
+          : [],
       }}
       isLoading={isLoading}
       emptyMessage={
@@ -332,7 +386,7 @@ const DateStatus = styled('span')`
   padding-left: ${space(1)};
 `;
 
-const DateActionsContainer = styled('div')`
+const BodyCellContainer = styled('div')`
   display: flex;
   gap: ${space(4)};
   justify-content: space-between;
@@ -348,12 +402,6 @@ const StyledButton = styled(Button)`
   box-shadow: none;
 `;
 
-const StyledFavoriteButton = styled(Button)`
-  padding: 0;
-  width: 16px;
-  border: 3px solid transparent;
-`;
-
 const StyledIconStar = styled(IconStar)`
-  margin-left: ${space(0.5)};
+  margin-left: ${space(0.25)};
 `;
diff --git a/static/app/views/dashboards/manage/index.tsx b/static/app/views/dashboards/manage/index.tsx
index f34d53614be4a6..5e2d40c01e3bff 100644
--- a/static/app/views/dashboards/manage/index.tsx
+++ b/static/app/views/dashboards/manage/index.tsx
@@ -60,6 +60,7 @@ import TemplateCard from './templateCard';
 const SORT_OPTIONS: SelectValue<string>[] = [
   {label: t('My Dashboards'), value: 'mydashboards'},
   {label: t('Dashboard Name (A-Z)'), value: 'title'},
+  {label: t('Dashboard Name (Z-A)'), value: '-title'},
   {label: t('Date Created (Newest)'), value: '-dateCreated'},
   {label: t('Date Created (Oldest)'), value: 'dateCreated'},
   {label: t('Most Popular'), value: 'mostPopular'},
@@ -119,7 +120,10 @@ function ManageDashboards() {
       {
         query: {
           ...pick(location.query, ['cursor', 'query']),
-          sort: getActiveSort().value,
+          sort: getActiveSort()!.value,
+          ...(organization.features.includes('dashboards-favourite')
+            ? {pin: 'favorites'}
+            : {}),
           per_page:
             dashboardsLayout === GRID ? rowCount * columnCount : DASHBOARD_TABLE_NUM_ROWS,
         },
@@ -164,7 +168,7 @@ function ManageDashboards() {
           const paginationObject = parseLinkHeader(dashboardsPageLinks);
           if (
             dashboards?.length &&
-            paginationObject.next.results &&
+            paginationObject.next!.results &&
             rowCount * columnCount > dashboards.length
           ) {
             refetchDashboards();
@@ -281,7 +285,7 @@ function ManageDashboards() {
         </Feature>
         <CompactSelect
           triggerProps={{prefix: t('Sort By')}}
-          value={activeSort.value}
+          value={activeSort!.value}
           options={SORT_OPTIONS}
           onChange={opt => handleSortChange(opt.value)}
           position="bottom-end"
diff --git a/static/app/views/dashboards/metrics/bigNumber.tsx b/static/app/views/dashboards/metrics/bigNumber.tsx
index ed9bcee6cdf7ba..75bdbc3c00283a 100644
--- a/static/app/views/dashboards/metrics/bigNumber.tsx
+++ b/static/app/views/dashboards/metrics/bigNumber.tsx
@@ -30,8 +30,8 @@ export function MetricBigNumberContainer({
 export function getBigNumberData(data: MetricsQueryApiResponse): string {
   try {
     // Big number widgets only have one query
-    const value = data.data[0][0].totals;
-    const lastMetaEntry = data.meta[0][1];
+    const value = data.data[0]![0]!.totals;
+    const lastMetaEntry = data.meta[0]![1];
     const metaUnit =
       (lastMetaEntry && 'unit' in lastMetaEntry && lastMetaEntry.unit) || 'none';
 
diff --git a/static/app/views/dashboards/metrics/table.spec.tsx b/static/app/views/dashboards/metrics/table.spec.tsx
index eb3b16e28c6d93..84db581a98ab99 100644
--- a/static/app/views/dashboards/metrics/table.spec.tsx
+++ b/static/app/views/dashboards/metrics/table.spec.tsx
@@ -137,14 +137,14 @@ describe('getTableSeries', () => {
       },
     ]);
 
-    expect(result.rows.length).toEqual(7);
-    const ingestRow = result.rows[2];
+    expect(result.rows).toHaveLength(7);
+    const ingestRow = result.rows[2]!;
 
-    expect(ingestRow.a.value).toBeDefined();
-    expect(ingestRow.b.value).toBeUndefined();
+    expect(ingestRow.a!.value).toBeDefined();
+    expect(ingestRow.b!.value).toBeUndefined();
 
-    const defaultRow = result.rows[5];
-    expect(defaultRow.a.value).toBeDefined();
-    expect(defaultRow.b.value).toBeDefined();
+    const defaultRow = result.rows[5]!;
+    expect(defaultRow.a!.value).toBeDefined();
+    expect(defaultRow.b!.value).toBeDefined();
   });
 });
diff --git a/static/app/views/dashboards/metrics/table.tsx b/static/app/views/dashboards/metrics/table.tsx
index 969a6bfcf55706..bf117a9bc1f501 100644
--- a/static/app/views/dashboards/metrics/table.tsx
+++ b/static/app/views/dashboards/metrics/table.tsx
@@ -66,7 +66,7 @@ export function MetricTable({
   function renderRow(row: Row, index: number) {
     return data.headers.map((column, columnIndex) => {
       const key = `${index}-${columnIndex}:${column.name}`;
-      const value = row[column.name].formattedValue ?? row[column.name].value;
+      const value = row[column.name]!.formattedValue ?? row[column.name]!.value;
       if (!value) {
         return (
           <TableCell type={column.type} key={key} noValue>
@@ -162,8 +162,8 @@ export function getTableData(
   const tags = [...new Set(queries.flatMap(query => query.groupBy ?? []))];
 
   const normalizedResults = shownExpressions.map((expression, index) => {
-    const expressionResults = data.data[index];
-    const meta = data.meta[index];
+    const expressionResults = data.data[index]!;
+    const meta = data.meta[index]!;
     const lastMetaEntry = data.meta[index]?.[meta.length - 1];
     const metaUnit =
       (lastMetaEntry && 'unit' in lastMetaEntry && lastMetaEntry.unit) || 'none';
diff --git a/static/app/views/dashboards/metrics/utils.tsx b/static/app/views/dashboards/metrics/utils.tsx
index d7541208020cc7..736c1ff94a2c02 100644
--- a/static/app/views/dashboards/metrics/utils.tsx
+++ b/static/app/views/dashboards/metrics/utils.tsx
@@ -99,7 +99,7 @@ export function getMetricQueries(
   const indizesWithoutId: number[] = [];
 
   const queries = widget.queries.map((query, index): DashboardMetricsQuery | null => {
-    if (query.aggregates[0].startsWith('equation|')) {
+    if (query.aggregates[0]!.startsWith('equation|')) {
       return null;
     }
 
@@ -110,7 +110,7 @@ export function getMetricQueries(
       usedIds.add(id);
     }
 
-    const parsed = parseField(query.aggregates[0]);
+    const parsed = parseField(query.aggregates[0]!);
     if (!parsed) {
       return null;
     }
@@ -129,11 +129,11 @@ export function getMetricQueries(
 
     const orderBy = query.orderby ? query.orderby : undefined;
     return {
-      id: id,
+      id,
       type: MetricExpressionType.QUERY,
-      condition: condition,
-      mri: mri,
-      aggregation: aggregation,
+      condition,
+      mri,
+      aggregation,
       query: extendQuery(query.conditions, dashboardFilters),
       groupBy: query.columns,
       orderBy: orderBy === 'asc' || orderBy === 'desc' ? orderBy : undefined,
@@ -153,7 +153,7 @@ export function getMetricEquations(widget: Widget): DashboardMetricsEquation[] {
 
   const equations = widget.queries.map(
     (query, index): DashboardMetricsEquation | null => {
-      if (!query.aggregates[0].startsWith('equation|')) {
+      if (!query.aggregates[0]!.startsWith('equation|')) {
         return null;
       }
 
@@ -165,9 +165,9 @@ export function getMetricEquations(widget: Widget): DashboardMetricsEquation[] {
       }
 
       return {
-        id: id,
+        id,
         type: MetricExpressionType.EQUATION,
-        formula: query.aggregates[0].slice(9),
+        formula: query.aggregates[0]!.slice(9),
         isHidden: !!query.isHidden,
         alias: query.fieldAliases?.[0],
       } satisfies DashboardMetricsEquation;
@@ -266,7 +266,7 @@ export function expressionsToWidget(
   return {
     title,
     interval,
-    displayType: displayType,
+    displayType,
     widgetType: WidgetType.METRICS,
     limit: 10,
     queries: expressions.map(e => {
diff --git a/static/app/views/dashboards/metrics/widgetCard.tsx b/static/app/views/dashboards/metrics/widgetCard.tsx
index 0cf6d8ef527976..c8970e584f21fe 100644
--- a/static/app/views/dashboards/metrics/widgetCard.tsx
+++ b/static/app/views/dashboards/metrics/widgetCard.tsx
@@ -65,7 +65,7 @@ export function getWidgetTitle(expressions: DashboardMetricsExpression[]) {
   const filteredExpressions = expressions.filter(query => !query.isQueryOnly);
 
   if (filteredExpressions.length === 1) {
-    const firstQuery = filteredExpressions[0];
+    const firstQuery = filteredExpressions[0]!;
     if (isMetricsEquation(firstQuery)) {
       return (
         <Fragment>
diff --git a/static/app/views/dashboards/orgDashboards.spec.tsx b/static/app/views/dashboards/orgDashboards.spec.tsx
index 02675e75007661..da5bd07180c448 100644
--- a/static/app/views/dashboards/orgDashboards.spec.tsx
+++ b/static/app/views/dashboards/orgDashboards.spec.tsx
@@ -5,7 +5,6 @@ import {initializeOrg} from 'sentry-test/initializeOrg';
 import {render, screen, waitFor} from 'sentry-test/reactTestingLibrary';
 
 import ProjectsStore from 'sentry/stores/projectsStore';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import DashboardDetail from 'sentry/views/dashboards/detail';
 import OrgDashboards from 'sentry/views/dashboards/orgDashboards';
 import {DashboardState} from 'sentry/views/dashboards/types';
@@ -16,7 +15,7 @@ describe('OrgDashboards', () => {
     features: ['dashboards-basic', 'dashboards-edit'],
   });
 
-  let initialData;
+  let initialData!: ReturnType<typeof initializeOrg>;
   beforeEach(() => {
     initialData = initializeOrg({
       organization,
@@ -84,11 +83,9 @@ describe('OrgDashboards', () => {
             <DashboardDetail
               api={api}
               initialState={DashboardState.VIEW}
-              location={initialData.router.location}
-              router={initialData.router}
               dashboard={dashboard}
               dashboards={dashboards}
-              {...initialData.router}
+              {...initialData.routerProps}
             />
           ) : (
             <div>loading</div>
@@ -99,7 +96,7 @@ describe('OrgDashboards', () => {
     );
 
     await waitFor(() =>
-      expect(browserHistory.replace).toHaveBeenCalledWith(
+      expect(initialData.router.replace).toHaveBeenCalledWith(
         expect.objectContaining({
           query: expect.objectContaining({
             project: [1, 2],
@@ -150,11 +147,9 @@ describe('OrgDashboards', () => {
             <DashboardDetail
               api={api}
               initialState={DashboardState.VIEW}
-              location={initialData.router.location}
-              router={initialData.router}
               dashboard={dashboard}
               dashboards={dashboards}
-              {...initialData.router}
+              {...initialData.routerProps}
             />
           ) : (
             <div>loading</div>
@@ -165,7 +160,7 @@ describe('OrgDashboards', () => {
     );
 
     await waitFor(() =>
-      expect(browserHistory.replace).toHaveBeenCalledWith(
+      expect(initialData.router.replace).toHaveBeenCalledWith(
         expect.objectContaining({
           query: expect.objectContaining({
             project: [1, 2],
@@ -223,11 +218,9 @@ describe('OrgDashboards', () => {
             <DashboardDetail
               api={api}
               initialState={DashboardState.VIEW}
-              location={initialData.router.location}
-              router={initialData.router}
               dashboard={dashboard}
               dashboards={dashboards}
-              {...initialData.router}
+              {...initialData.routerProps}
             />
           ) : (
             <div>loading</div>
@@ -237,7 +230,8 @@ describe('OrgDashboards', () => {
       {router: initialData.router}
     );
 
-    expect(browserHistory.replace).not.toHaveBeenCalled();
+    // The first call is done by the page filters
+    expect(initialData.router.replace).not.toHaveBeenCalledTimes(2);
   });
 
   it('does not add query params for page filters if none are saved', () => {
@@ -253,11 +247,9 @@ describe('OrgDashboards', () => {
             <DashboardDetail
               api={api}
               initialState={DashboardState.VIEW}
-              location={initialData.router.location}
-              router={initialData.router}
               dashboard={dashboard}
               dashboards={dashboards}
-              {...initialData.router}
+              {...initialData.routerProps}
             />
           ) : (
             <div>loading</div>
@@ -267,7 +259,7 @@ describe('OrgDashboards', () => {
       {router: initialData.router}
     );
 
-    expect(browserHistory.replace).not.toHaveBeenCalled();
+    expect(initialData.router.replace).not.toHaveBeenCalled();
   });
 
   it('does not redirect to add query params if location is cleared manually', async () => {
@@ -300,11 +292,9 @@ describe('OrgDashboards', () => {
             <DashboardDetail
               api={api}
               initialState={DashboardState.VIEW}
-              location={initialData.router.location}
-              router={initialData.router}
               dashboard={dashboard}
               dashboards={dashboards}
-              {...initialData.router}
+              {...initialData.routerProps}
             />
           ) : (
             <div>loading</div>
@@ -314,7 +304,7 @@ describe('OrgDashboards', () => {
       {router: initialData.router}
     );
 
-    await waitFor(() => expect(browserHistory.replace).toHaveBeenCalledTimes(1));
+    await waitFor(() => expect(initialData.router.replace).toHaveBeenCalledTimes(1));
 
     rerender(
       <OrgDashboards
@@ -328,11 +318,9 @@ describe('OrgDashboards', () => {
             <DashboardDetail
               api={api}
               initialState={DashboardState.VIEW}
-              location={initialData.router.location}
-              router={initialData.router}
               dashboard={dashboard}
               dashboards={dashboards}
-              {...initialData.router}
+              {...initialData.routerProps}
             />
           ) : (
             <div>loading</div>
@@ -342,6 +330,6 @@ describe('OrgDashboards', () => {
     );
 
     expect(screen.queryByTestId('loading-indicator')).not.toBeInTheDocument();
-    expect(browserHistory.replace).toHaveBeenCalledTimes(1);
+    expect(initialData.router.replace).toHaveBeenCalledTimes(1);
   });
 });
diff --git a/static/app/views/dashboards/utils.spec.tsx b/static/app/views/dashboards/utils.spec.tsx
index 1141c3fb235747..0a6dd94a6e4f82 100644
--- a/static/app/views/dashboards/utils.spec.tsx
+++ b/static/app/views/dashboards/utils.spec.tsx
@@ -30,7 +30,7 @@ describe('Dashboards util', () => {
     projects: [],
   };
   describe('constructWidgetFromQuery', () => {
-    let baseQuery;
+    let baseQuery!: NonNullable<Parameters<typeof constructWidgetFromQuery>[0]>;
     beforeEach(() => {
       baseQuery = {
         displayType: 'line',
@@ -47,8 +47,8 @@ describe('Dashboards util', () => {
     it('returns a widget when given a valid query', () => {
       const widget = constructWidgetFromQuery(baseQuery);
       expect(widget?.displayType).toEqual(DisplayType.LINE);
-      expect(widget?.interval).toEqual('5m');
-      expect(widget?.title).toEqual('Widget Title');
+      expect(widget?.interval).toBe('5m');
+      expect(widget?.title).toBe('Widget Title');
       expect(widget?.queries).toEqual([
         {
           name: '1',
@@ -67,7 +67,7 @@ describe('Dashboards util', () => {
           orderby: '',
         },
       ]);
-      expect(widget?.widgetType).toEqual('discover');
+      expect(widget?.widgetType).toBe('discover');
     });
     it('returns undefined if query is missing title', () => {
       baseQuery.title = '';
@@ -90,8 +90,8 @@ describe('Dashboards util', () => {
       baseQuery.queryAggregates = 'count()';
       const widget = constructWidgetFromQuery(baseQuery);
       expect(widget?.displayType).toEqual(DisplayType.LINE);
-      expect(widget?.interval).toEqual('5m');
-      expect(widget?.title).toEqual('Widget Title');
+      expect(widget?.interval).toBe('5m');
+      expect(widget?.title).toBe('Widget Title');
       expect(widget?.queries).toEqual([
         {
           name: '1',
@@ -105,7 +105,7 @@ describe('Dashboards util', () => {
     });
   });
   describe('eventViewFromWidget', () => {
-    let widget;
+    let widget!: Widget;
     beforeEach(() => {
       widget = {
         title: 'Test Query',
@@ -125,9 +125,9 @@ describe('Dashboards util', () => {
       };
     });
     it('handles sorts in function format', () => {
-      const query = {...widget.queries[0], orderby: '-count()'};
+      const query = {...widget.queries[0]!, orderby: '-count()'};
       const eventView = eventViewFromWidget(widget.title, query, selection);
-      expect(eventView.fields[0].field).toEqual('count()');
+      expect(eventView.fields[0]!.field).toBe('count()');
       expect(eventView.sorts).toEqual([{field: 'count', kind: 'desc'}]);
     });
   });
@@ -149,7 +149,7 @@ describe('Dashboards util', () => {
   });
 
   describe('getWidgetDiscoverUrl', function () {
-    let widget;
+    let widget!: Widget;
     beforeEach(() => {
       widget = {
         title: 'Test Query',
@@ -170,7 +170,7 @@ describe('Dashboards util', () => {
     });
     it('returns the discover url of the widget query', () => {
       const url = getWidgetDiscoverUrl(widget, selection, OrganizationFixture());
-      expect(url).toEqual(
+      expect(url).toBe(
         '/organizations/org-slug/discover/results/?field=count%28%29&name=Test%20Query&query=&statsPeriod=7d&yAxis=count%28%29'
       );
     });
@@ -192,13 +192,13 @@ describe('Dashboards util', () => {
         },
       };
       const url = getWidgetDiscoverUrl(widget, selection, OrganizationFixture());
-      expect(url).toEqual(
+      expect(url).toBe(
         '/organizations/org-slug/discover/results/?display=top5&field=error.type&field=count%28%29&name=Test%20Query&query=error.unhandled%3Atrue&sort=-count&statsPeriod=7d&yAxis=count%28%29'
       );
     });
   });
   describe('getWidgetIssueUrl', function () {
-    let widget;
+    let widget!: Widget;
     beforeEach(() => {
       widget = {
         title: 'Test Query',
@@ -211,13 +211,15 @@ describe('Dashboards util', () => {
             conditions: 'is:unresolved',
             fields: ['events'],
             orderby: 'date',
+            aggregates: [],
+            columns: [],
           },
         ],
       };
     });
     it('returns the issue url of the widget query', () => {
       const url = getWidgetIssueUrl(widget, selection, OrganizationFixture());
-      expect(url).toEqual(
+      expect(url).toBe(
         '/organizations/org-slug/issues/?query=is%3Aunresolved&sort=date&statsPeriod=7d'
       );
     });
@@ -367,7 +369,7 @@ describe('Dashboards util', () => {
 });
 
 describe('isWidgetUsingTransactionName', () => {
-  let baseQuery;
+  let baseQuery!: NonNullable<Parameters<typeof constructWidgetFromQuery>[0]>;
   beforeEach(() => {
     baseQuery = {
       displayType: 'line',
@@ -382,37 +384,41 @@ describe('isWidgetUsingTransactionName', () => {
 
   it('returns false when widget does not use transaction', () => {
     const widget = constructWidgetFromQuery(baseQuery)!;
-    expect(isWidgetUsingTransactionName(widget)).toEqual(false);
+    expect(isWidgetUsingTransactionName(widget)).toBe(false);
   });
 
   it('returns true when widget uses transaction as a selected field', () => {
-    baseQuery.queryFields.push('transaction');
+    (baseQuery.queryFields as string[]).push('transaction');
     const widget = constructWidgetFromQuery(baseQuery)!;
-    expect(isWidgetUsingTransactionName(widget)).toEqual(true);
+    expect(isWidgetUsingTransactionName(widget)).toBe(true);
   });
 
   it('returns true when widget uses transaction as part of the query filter', () => {
     baseQuery.queryConditions = ['transaction:test'];
     const widget = constructWidgetFromQuery(baseQuery)!;
-    expect(isWidgetUsingTransactionName(widget)).toEqual(true);
+    expect(isWidgetUsingTransactionName(widget)).toBe(true);
   });
 
   describe('isUsingPerformanceScore', () => {
     it('returns false when widget does not use performance_score', () => {
       const widget = constructWidgetFromQuery(baseQuery)!;
-      expect(isUsingPerformanceScore(widget)).toEqual(false);
+      expect(isUsingPerformanceScore(widget)).toBe(false);
     });
 
     it('returns true when widget uses performance_score as aggregate', () => {
-      baseQuery.queryFields.push('performance_score(measurements.score.total)');
+      (baseQuery.queryFields as string[]).push(
+        'performance_score(measurements.score.total)'
+      );
       const widget = constructWidgetFromQuery(baseQuery)!;
-      expect(isUsingPerformanceScore(widget)).toEqual(true);
+      expect(isUsingPerformanceScore(widget)).toBe(true);
     });
 
     it('returns true when widget uses performance_score as condition', () => {
-      baseQuery.queryConditions.push('performance_score(measurements.score.total):>0.5');
+      (baseQuery.queryConditions as string[]).push(
+        'performance_score(measurements.score.total):>0.5'
+      );
       const widget = constructWidgetFromQuery(baseQuery)!;
-      expect(isUsingPerformanceScore(widget)).toEqual(true);
+      expect(isUsingPerformanceScore(widget)).toBe(true);
     });
   });
 });
diff --git a/static/app/views/dashboards/utils.tsx b/static/app/views/dashboards/utils.tsx
index 0e52b4af52dfbe..a48df9154ec4d6 100644
--- a/static/app/views/dashboards/utils.tsx
+++ b/static/app/views/dashboards/utils.tsx
@@ -163,7 +163,7 @@ export function constructWidgetFromQuery(query?: Query): Widget | undefined {
       const {columns, aggregates} = getColumnsAndAggregates(queryFields);
       queryConditions.forEach((condition, index) => {
         queries.push({
-          name: queryNames[index],
+          name: queryNames[index]!,
           conditions: condition,
           fields: queryFields,
           columns,
@@ -264,7 +264,7 @@ export function getWidgetDiscoverUrl(
   index: number = 0,
   isMetricsData: boolean = false
 ) {
-  const eventView = eventViewFromWidget(widget.title, widget.queries[index], selection);
+  const eventView = eventViewFromWidget(widget.title, widget.queries[index]!, selection);
   const discoverLocation = eventView.getResultsViewUrlTarget(
     organization.slug,
     false,
@@ -277,7 +277,7 @@ export function getWidgetDiscoverUrl(
   const yAxisOptions = eventView.getYAxisOptions().map(({value}) => value);
   discoverLocation.query.yAxis = [
     ...new Set(
-      widget.queries[0].aggregates.filter(aggregate => yAxisOptions.includes(aggregate))
+      widget.queries[0]!.aggregates.filter(aggregate => yAxisOptions.includes(aggregate))
     ),
   ].slice(0, 3);
 
@@ -289,9 +289,9 @@ export function getWidgetDiscoverUrl(
     case DisplayType.TOP_N:
       discoverLocation.query.display = DisplayModes.TOP5;
       // Last field is used as the yAxis
-      const aggregates = widget.queries[0].aggregates;
+      const aggregates = widget.queries[0]!.aggregates;
       discoverLocation.query.yAxis = aggregates[aggregates.length - 1];
-      if (aggregates.slice(0, -1).includes(aggregates[aggregates.length - 1])) {
+      if (aggregates.slice(0, -1).includes(aggregates[aggregates.length - 1]!)) {
         discoverLocation.query.field = aggregates.slice(0, -1);
       }
       break;
@@ -305,7 +305,7 @@ export function getWidgetDiscoverUrl(
       ? discoverLocation.query.field
       : [discoverLocation.query.field];
 
-  const query = widget.queries[0];
+  const query = widget.queries[0]!;
   const queryFields = defined(query.fields)
     ? query.fields
     : [...query.columns, ...query.aggregates];
@@ -386,7 +386,7 @@ export function getWidgetMetricsUrl(
     project,
     environment: selection.environments,
     widgets: _widget.queries.map(query => {
-      const parsed = parseField(query.aggregates[0]);
+      const parsed = parseField(query.aggregates[0]!);
 
       return {
         mri: parsed?.mri,
@@ -647,7 +647,7 @@ export function appendQueryDatasetParam(
   queryDataset?: SavedQueryDatasets
 ) {
   if (hasDatasetSelector(organization) && queryDataset) {
-    return {queryDataset: queryDataset};
+    return {queryDataset};
   }
   return {};
 }
diff --git a/static/app/views/dashboards/utils/getWidgetExploreUrl.spec.tsx b/static/app/views/dashboards/utils/getWidgetExploreUrl.spec.tsx
index cb3b08d87c6404..7e40923ea75767 100644
--- a/static/app/views/dashboards/utils/getWidgetExploreUrl.spec.tsx
+++ b/static/app/views/dashboards/utils/getWidgetExploreUrl.spec.tsx
@@ -28,7 +28,7 @@ describe('getWidgetExploreUrl', () => {
 
     // 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'
+      '/organizations/org-slug/traces/?dataset=spansRpc&field=span.description&field=avg%28span.duration%29&groupBy=span.description&interval=30m&mode=samples&statsPeriod=14d&visualize=%7B%22chartType%22%3A1%2C%22yAxes%22%3A%5B%22avg%28span.duration%29%22%5D%7D'
     );
   });
 
@@ -52,7 +52,7 @@ describe('getWidgetExploreUrl', () => {
     // 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'
+      '/organizations/org-slug/traces/?dataset=spansRpc&field=span.description&field=avg%28span.duration%29&groupBy=span.description&interval=30m&mode=aggregate&statsPeriod=14d&visualize=%7B%22chartType%22%3A2%2C%22yAxes%22%3A%5B%22avg%28span.duration%29%22%5D%7D'
     );
   });
 });
diff --git a/static/app/views/dashboards/utils/getWidgetExploreUrl.tsx b/static/app/views/dashboards/utils/getWidgetExploreUrl.tsx
index bca2e043bddf6f..f48afef13b51d3 100644
--- a/static/app/views/dashboards/utils/getWidgetExploreUrl.tsx
+++ b/static/app/views/dashboards/utils/getWidgetExploreUrl.tsx
@@ -1,6 +1,3 @@
-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';
@@ -8,13 +5,15 @@ import {
   getAggregateAlias,
   isAggregateFieldOrEquation,
 } from 'sentry/utils/discover/fields';
+import {decodeBoolean, decodeList, decodeScalar} from 'sentry/utils/queryString';
 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 {Mode} from 'sentry/views/explore/contexts/pageParamsContext/mode';
+import {getExploreUrl} from 'sentry/views/explore/utils';
 import {ChartType} from 'sentry/views/insights/common/components/chart';
 
 export function getWidgetExploreUrl(
@@ -22,7 +21,7 @@ export function getWidgetExploreUrl(
   selection: PageFilters,
   organization: Organization
 ) {
-  const eventView = eventViewFromWidget(widget.title, widget.queries[0], selection);
+  const eventView = eventViewFromWidget(widget.title, widget.queries[0]!, selection);
   const {query: locationQueryParams} = eventView.getResultsViewUrlTarget(
     organization.slug,
     false,
@@ -33,28 +32,29 @@ export function getWidgetExploreUrl(
   const yAxisOptions = eventView.getYAxisOptions().map(({value}) => value);
   locationQueryParams.yAxes = [
     ...new Set(
-      widget.queries[0].aggregates.filter(aggregate => yAxisOptions.includes(aggregate))
+      widget.queries[0]!.aggregates.filter(aggregate => yAxisOptions.includes(aggregate))
     ),
   ].slice(0, 3);
 
   // Visualization specific transforms
-  let exploreMode: ResultMode | undefined = undefined;
+  let exploreMode: Mode | undefined = undefined;
+  let chartType: ChartType = ChartType.LINE;
   switch (widget.displayType) {
     case DisplayType.BAR:
-      exploreMode = 'aggregate';
-      locationQueryParams.chartType = ChartType.BAR.toString();
+      exploreMode = Mode.AGGREGATE;
+      chartType = ChartType.BAR;
       break;
     case DisplayType.LINE:
-      exploreMode = 'aggregate';
-      locationQueryParams.chartType = ChartType.LINE.toString();
+      exploreMode = Mode.AGGREGATE;
+      chartType = ChartType.LINE;
       break;
     case DisplayType.AREA:
-      exploreMode = 'aggregate';
-      locationQueryParams.chartType = ChartType.AREA.toString();
+      exploreMode = Mode.AGGREGATE;
+      chartType = ChartType.AREA;
       break;
     case DisplayType.TABLE:
     case DisplayType.BIG_NUMBER:
-      exploreMode = 'samples';
+      exploreMode = Mode.SAMPLES;
       break;
     default:
       break;
@@ -66,7 +66,7 @@ export function getWidgetExploreUrl(
       ? locationQueryParams.field
       : [locationQueryParams.field];
 
-  const query = widget.queries[0];
+  const query = widget.queries[0]!;
   const queryFields = defined(query.fields)
     ? query.fields
     : [...query.columns, ...query.aggregates];
@@ -79,31 +79,40 @@ export function getWidgetExploreUrl(
   });
   locationQueryParams.field = fields;
 
+  const datetime = {
+    end: decodeScalar(locationQueryParams.end) ?? null,
+    period: decodeScalar(locationQueryParams.statsPeriod) ?? null,
+    start: decodeScalar(locationQueryParams.start) ?? null,
+    utc: decodeBoolean(locationQueryParams.utc) ?? null,
+  };
+
   const queryParams = {
     // Page filters should propagate
-    ...pick(locationQueryParams, [
-      'start',
-      'end',
-      'statsPeriod',
-      'project',
-      'environment',
-    ]),
-
+    selection: {
+      ...selection,
+      datetime,
+    },
+    orgSlug: organization.slug,
     mode: exploreMode,
-    visualize: JSON.stringify(pick(locationQueryParams, ['yAxes', 'chartType'])),
+    visualize: [
+      {
+        chartType,
+        yAxes: locationQueryParams.yAxes,
+      },
+    ],
     groupBy: fields?.filter(field => !isAggregateFieldOrEquation(field)),
-    field: locationQueryParams.field,
-    query: locationQueryParams.query,
+    field: decodeList(locationQueryParams.field),
+    query: decodeScalar(locationQueryParams.query),
     sort:
       defined(fields) && defined(locationQueryParams.sort)
         ? _getSort(fields, locationQueryParams.sort as string)
         : undefined,
     interval:
-      locationQueryParams.interval ??
+      decodeScalar(locationQueryParams.interval) ??
       getWidgetInterval(widget.displayType, selection.datetime),
   };
 
-  return `/traces/?${qs.stringify(queryParams)}`;
+  return getExploreUrl(queryParams);
 }
 
 function _getSort(fields: string[], sort: string) {
diff --git a/static/app/views/dashboards/view.spec.tsx b/static/app/views/dashboards/view.spec.tsx
index b2ae44868ce0cf..ab56e0b661f236 100644
--- a/static/app/views/dashboards/view.spec.tsx
+++ b/static/app/views/dashboards/view.spec.tsx
@@ -1,35 +1,36 @@
 import {Fragment} from 'react';
-import {LocationFixture} from 'sentry-fixture/locationFixture';
+import {RouterFixture} from 'sentry-fixture/routerFixture';
 
 import {initializeOrg} from 'sentry-test/initializeOrg';
 import {render} from 'sentry-test/reactTestingLibrary';
 
-import {browserHistory} from 'sentry/utils/browserHistory';
 import ViewEditDashboard from 'sentry/views/dashboards/view';
 
 describe('Dashboards > ViewEditDashboard', function () {
   const initialData = initializeOrg();
 
   it('removes widget params from url and preserves selection params', function () {
-    const location = {
-      pathname: '/',
-      query: {
-        environment: 'canary',
-        period: '7d',
-        project: '11111',
-        start: null,
-        end: null,
-        utc: null,
-        displayType: 'line',
-        interval: '5m',
-        queryConditions: '',
-        queryFields: 'count()',
-        queryNames: '',
-        queryOrderby: '',
-        title: 'test',
-        statsPeriod: '7d',
+    const router = RouterFixture({
+      location: {
+        pathname: '/',
+        query: {
+          environment: 'canary',
+          period: '7d',
+          project: '11111',
+          start: null,
+          end: null,
+          utc: null,
+          displayType: 'line',
+          interval: '5m',
+          queryConditions: '',
+          queryFields: 'count()',
+          queryNames: '',
+          queryOrderby: '',
+          title: 'test',
+          statsPeriod: '7d',
+        },
       },
-    };
+    });
 
     MockApiClient.addMockResponse({
       url: `/organizations/${initialData.organization.slug}/dashboards/1/visit/`,
@@ -39,7 +40,7 @@ describe('Dashboards > ViewEditDashboard', function () {
 
     render(
       <ViewEditDashboard
-        location={LocationFixture(location)}
+        location={router.location}
         organization={initialData.organization}
         router={initialData.router}
         params={{
@@ -51,10 +52,11 @@ describe('Dashboards > ViewEditDashboard', function () {
         routeParams={{}}
       >
         <Fragment />
-      </ViewEditDashboard>
+      </ViewEditDashboard>,
+      {router}
     );
 
-    expect(browserHistory.replace).toHaveBeenCalledWith(
+    expect(router.replace).toHaveBeenCalledWith(
       expect.objectContaining({
         pathname: '/',
         query: {
diff --git a/static/app/views/dashboards/widgetBuilder/buildSteps/columnsStep/columnFields.tsx b/static/app/views/dashboards/widgetBuilder/buildSteps/columnsStep/columnFields.tsx
index cff05461069c91..6986f15cab0c54 100644
--- a/static/app/views/dashboards/widgetBuilder/buildSteps/columnsStep/columnFields.tsx
+++ b/static/app/views/dashboards/widgetBuilder/buildSteps/columnsStep/columnFields.tsx
@@ -67,7 +67,7 @@ export function ColumnFields({
         <ColumnCollectionEdit
           columns={fields.slice(0, fields.length - 1)}
           onChange={newColumns => {
-            onChange([...newColumns, fields[fields.length - 1]]);
+            onChange([...newColumns, fields[fields.length - 1]!]);
           }}
           fieldOptions={fieldOptions}
           organization={organization}
diff --git a/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/index.tsx b/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/index.tsx
index 310233b361fba5..8f8dbdbf307aae 100644
--- a/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/index.tsx
+++ b/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/index.tsx
@@ -78,7 +78,7 @@ export function FilterResultsStep({
     (queryIndex: number) => {
       return (field: string) => {
         const newQuery: WidgetQuery = {
-          ...queries[queryIndex],
+          ...queries[queryIndex]!,
           conditions: field,
         };
 
@@ -95,7 +95,7 @@ export function FilterResultsStep({
         setQueryConditionValidity(queryConditionValidity);
         onQueryConditionChange(!queryConditionValidity.some(validity => !validity));
         const newQuery: WidgetQuery = {
-          ...queries[queryIndex],
+          ...queries[queryIndex]!,
           conditions: field,
         };
         onQueryChange(queryIndex, newQuery);
@@ -193,7 +193,7 @@ export function FilterResultsStep({
                     placeholder={t('Legend Alias')}
                     onChange={event => {
                       const newQuery: WidgetQuery = {
-                        ...queries[queryIndex],
+                        ...queries[queryIndex]!,
                         name: event.target.value,
                       };
                       onQueryChange(queryIndex, newQuery);
diff --git a/static/app/views/dashboards/widgetBuilder/buildSteps/groupByStep/groupBySelector.tsx b/static/app/views/dashboards/widgetBuilder/buildSteps/groupByStep/groupBySelector.tsx
index 0bbaa0c409f995..e12580255e2a20 100644
--- a/static/app/views/dashboards/widgetBuilder/buildSteps/groupByStep/groupBySelector.tsx
+++ b/static/app/views/dashboards/widgetBuilder/buildSteps/groupByStep/groupBySelector.tsx
@@ -73,7 +73,7 @@ export function GroupBySelector({
 
   const hasOnlySingleColumnWithValue =
     columns.length === 1 &&
-    columns[0].kind === FieldValueKind.FIELD &&
+    columns[0]!.kind === FieldValueKind.FIELD &&
     columns[0]?.field !== '';
 
   const canDrag = columns.length > 1;
@@ -86,9 +86,9 @@ export function GroupBySelector({
       filteredFieldOptions: FieldOptions;
     }>(
       (acc, key) => {
-        const value = fieldOptions[key];
+        const value = fieldOptions[key]!;
         const optionInColumnsIndex = columnFieldsAsString.findIndex(
-          column => column === value.value.meta.name
+          column => column === value!.value.meta.name
         );
         if (optionInColumnsIndex === -1) {
           acc.filteredFieldOptions[key] = value;
@@ -149,7 +149,7 @@ export function GroupBySelector({
                 {columns.map((column, index) => (
                   <SortableQueryField
                     key={items[index]}
-                    dragId={items[index]}
+                    dragId={items[index]!}
                     value={column}
                     fieldOptions={{
                       ...filteredFieldOptions,
@@ -173,7 +173,7 @@ export function GroupBySelector({
               {activeId ? (
                 <Ghost>
                   <QueryField
-                    value={columns[Number(activeId)]}
+                    value={columns[Number(activeId)]!}
                     fieldOptions={{
                       ...filteredFieldOptions,
                       ...columnsAsFieldOptions[Number(activeId)],
diff --git a/static/app/views/dashboards/widgetBuilder/buildSteps/sortByStep/index.tsx b/static/app/views/dashboards/widgetBuilder/buildSteps/sortByStep/index.tsx
index f1de7cbe062377..b0b7290b51bee7 100644
--- a/static/app/views/dashboards/widgetBuilder/buildSteps/sortByStep/index.tsx
+++ b/static/app/views/dashboards/widgetBuilder/buildSteps/sortByStep/index.tsx
@@ -54,12 +54,12 @@ export function SortByStep({
 
   if (datasetConfig.disableSortOptions) {
     ({disableSort, disableSortDirection, disableSortReason} =
-      datasetConfig.disableSortOptions(queries[0]));
+      datasetConfig.disableSortOptions(queries[0]!));
   }
 
-  const orderBy = queries[0].orderby;
+  const orderBy = queries[0]!.orderby;
   const strippedOrderBy = trimStart(orderBy, '-');
-  const maxLimit = getResultsLimit(queries.length, queries[0].aggregates.length);
+  const maxLimit = getResultsLimit(queries.length, queries[0]!.aggregates.length);
 
   const isTimeseriesChart = [
     DisplayType.LINE,
@@ -115,11 +115,11 @@ export function SortByStep({
           <SortBySelectors
             displayType={displayType}
             widgetType={widgetType}
-            hasGroupBy={isTimeseriesChart && !!queries[0].columns.length}
+            hasGroupBy={isTimeseriesChart && !!queries[0]!.columns.length}
             disableSortReason={disableSortReason}
             disableSort={disableSort}
             disableSortDirection={disableSortDirection}
-            widgetQuery={queries[0]}
+            widgetQuery={queries[0]!}
             values={{
               sortDirection:
                 orderBy[0] === '-'
diff --git a/static/app/views/dashboards/widgetBuilder/components/common/draggableUtils.tsx b/static/app/views/dashboards/widgetBuilder/components/common/draggableUtils.tsx
new file mode 100644
index 00000000000000..544f1dcf71e80c
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/components/common/draggableUtils.tsx
@@ -0,0 +1,57 @@
+import type {Translate} from '@dnd-kit/core';
+
+import {space} from 'sentry/styles/space';
+
+export type WidgetDragPositioning = {
+  initialTranslate: Translate;
+  translate: Translate;
+  left?: number;
+  top?: number;
+};
+
+export const WIDGET_PREVIEW_DRAG_ID = 'widget-preview-draggable';
+
+export const SIDEBAR_HEIGHT = 54;
+
+export const DEFAULT_TRANSLATE_COORDINATES = {x: 0, y: 0};
+const DEFAULT_SPACING = parseInt(space(2).replace('px', ''), 10);
+export const DEFAULT_LEFT = DEFAULT_SPACING;
+export const DEFAULT_TOP = SIDEBAR_HEIGHT + DEFAULT_SPACING; // 54px sidebar + 16px space
+
+export const DEFAULT_WIDGET_DRAG_POSITIONING: WidgetDragPositioning = {
+  initialTranslate: DEFAULT_TRANSLATE_COORDINATES,
+  translate: DEFAULT_TRANSLATE_COORDINATES,
+  left: DEFAULT_LEFT,
+  top: DEFAULT_TOP,
+};
+
+export const DRAGGABLE_PREVIEW_HEIGHT = 200;
+export const DRAGGABLE_PREVIEW_WIDTH = 300;
+export const PREVIEW_HEIGHT = 400;
+
+export const DRAGGABLE_PREVIEW_HEIGHT_PX = `${DRAGGABLE_PREVIEW_HEIGHT}px`;
+export const DRAGGABLE_PREVIEW_WIDTH_PX = `${DRAGGABLE_PREVIEW_WIDTH}px`;
+export const PREVIEW_HEIGHT_PX = `${PREVIEW_HEIGHT}px`;
+
+/**
+ * Snaps the preview to the visible corners of the slideout
+ * @param over - The droppable area object from the drag end event
+ * @returns The new position of the preview
+ */
+export function snapPreviewToCorners(over: any | null): WidgetDragPositioning {
+  const selectedCorner = over?.id?.toString().split('-');
+  return {
+    translate: DEFAULT_TRANSLATE_COORDINATES,
+    initialTranslate: DEFAULT_TRANSLATE_COORDINATES,
+    left: over?.rect
+      ? selectedCorner?.[1] === 'left'
+        ? over?.rect.left
+        : over?.rect.right - DRAGGABLE_PREVIEW_WIDTH
+      : undefined,
+    top: over?.rect
+      ? selectedCorner?.[0] === 'top'
+        ? over?.rect.top
+        : over?.rect.bottom - DRAGGABLE_PREVIEW_HEIGHT
+      : undefined,
+  };
+}
diff --git a/static/app/views/dashboards/widgetBuilder/components/datasetSelector.spec.tsx b/static/app/views/dashboards/widgetBuilder/components/datasetSelector.spec.tsx
new file mode 100644
index 00000000000000..753b4e203dcc6f
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/components/datasetSelector.spec.tsx
@@ -0,0 +1,47 @@
+import {OrganizationFixture} from 'sentry-fixture/organization';
+import {RouterFixture} from 'sentry-fixture/routerFixture';
+
+import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
+
+import {useNavigate} from 'sentry/utils/useNavigate';
+import DatasetSelector from 'sentry/views/dashboards/widgetBuilder/components/datasetSelector';
+import {WidgetBuilderProvider} from 'sentry/views/dashboards/widgetBuilder/contexts/widgetBuilderContext';
+
+jest.mock('sentry/utils/useNavigate', () => ({
+  useNavigate: jest.fn(),
+}));
+
+const mockUseNavigate = jest.mocked(useNavigate);
+
+describe('DatasetSelector', function () {
+  let router!: ReturnType<typeof RouterFixture>;
+  let organization!: ReturnType<typeof OrganizationFixture>;
+  beforeEach(function () {
+    router = RouterFixture();
+    organization = OrganizationFixture({});
+  });
+
+  it('changes the dataset', async function () {
+    const mockNavigate = jest.fn();
+    mockUseNavigate.mockReturnValue(mockNavigate);
+
+    render(
+      <WidgetBuilderProvider>
+        <DatasetSelector />
+      </WidgetBuilderProvider>,
+      {
+        router,
+        organization,
+      }
+    );
+
+    await userEvent.click(await screen.findByLabelText('Issues'));
+
+    expect(mockNavigate).toHaveBeenCalledWith(
+      expect.objectContaining({
+        ...router.location,
+        query: expect.objectContaining({dataset: 'issue'}),
+      })
+    );
+  });
+});
diff --git a/static/app/views/dashboards/widgetBuilder/components/devBuilder.tsx b/static/app/views/dashboards/widgetBuilder/components/devBuilder.tsx
deleted file mode 100644
index 022e8791c2cfe5..00000000000000
--- a/static/app/views/dashboards/widgetBuilder/components/devBuilder.tsx
+++ /dev/null
@@ -1,328 +0,0 @@
-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/groupBySelector.spec.tsx b/static/app/views/dashboards/widgetBuilder/components/groupBySelector.spec.tsx
index f132041164b254..a50e490180e3ba 100644
--- a/static/app/views/dashboards/widgetBuilder/components/groupBySelector.spec.tsx
+++ b/static/app/views/dashboards/widgetBuilder/components/groupBySelector.spec.tsx
@@ -59,7 +59,7 @@ describe('WidgetBuilderGroupBySelector', function () {
 
     expect(await screen.findAllByLabelText('Remove group')).toHaveLength(2);
 
-    await userEvent.click((await screen.findAllByLabelText('Remove group'))[0]);
+    await userEvent.click((await screen.findAllByLabelText('Remove group'))[0]!);
 
     expect(await screen.findByText('id')).toBeInTheDocument();
     await waitFor(() => {
diff --git a/static/app/views/dashboards/widgetBuilder/components/nameAndDescFields.spec.tsx b/static/app/views/dashboards/widgetBuilder/components/nameAndDescFields.spec.tsx
new file mode 100644
index 00000000000000..2b063f496e9a28
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/components/nameAndDescFields.spec.tsx
@@ -0,0 +1,65 @@
+import {OrganizationFixture} from 'sentry-fixture/organization';
+import {RouterFixture} from 'sentry-fixture/routerFixture';
+
+import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
+
+import {useNavigate} from 'sentry/utils/useNavigate';
+import WidgetBuilderNameAndDescription from 'sentry/views/dashboards/widgetBuilder/components/nameAndDescFields';
+import {WidgetBuilderProvider} from 'sentry/views/dashboards/widgetBuilder/contexts/widgetBuilderContext';
+
+jest.mock('sentry/utils/useNavigate', () => ({
+  useNavigate: jest.fn(),
+}));
+
+const mockUseNavigate = jest.mocked(useNavigate);
+
+describe('WidgetBuilder', () => {
+  let router!: ReturnType<typeof RouterFixture>;
+  let organization!: ReturnType<typeof OrganizationFixture>;
+  beforeEach(function () {
+    router = RouterFixture({
+      location: {
+        pathname: '/organizations/org-slug/dashboard/1/',
+        query: {project: '-1'},
+      },
+      params: {},
+    });
+    organization = OrganizationFixture({});
+  });
+
+  it('edits name and description', async function () {
+    const mockNavigate = jest.fn();
+    mockUseNavigate.mockReturnValue(mockNavigate);
+
+    render(
+      <WidgetBuilderProvider>
+        <WidgetBuilderNameAndDescription />
+      </WidgetBuilderProvider>,
+      {
+        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'}),
+      })
+    );
+  });
+});
diff --git a/static/app/views/dashboards/widgetBuilder/components/newWidgetBuilder.spec.tsx b/static/app/views/dashboards/widgetBuilder/components/newWidgetBuilder.spec.tsx
index c17dddf26941b2..663938abd28b97 100644
--- a/static/app/views/dashboards/widgetBuilder/components/newWidgetBuilder.spec.tsx
+++ b/static/app/views/dashboards/widgetBuilder/components/newWidgetBuilder.spec.tsx
@@ -7,7 +7,6 @@ import {render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrar
 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({
@@ -26,12 +25,6 @@ const {organization, projects, router} = initializeOrg({
   },
 });
 
-jest.mock('sentry/utils/useNavigate', () => ({
-  useNavigate: jest.fn(),
-}));
-
-const mockUseNavigate = jest.mocked(useNavigate);
-
 describe('NewWidgetBuiler', function () {
   const onCloseMock = jest.fn();
   const onSaveMock = jest.fn();
@@ -91,6 +84,10 @@ describe('NewWidgetBuiler', function () {
       url: '/organizations/org-slug/measurements-meta/',
       body: [],
     });
+
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/recent-searches/',
+    });
   });
 
   afterEach(() => PageFiltersStore.reset());
@@ -133,7 +130,13 @@ describe('NewWidgetBuiler', function () {
     // ensure the dropdown input has the default value 'table'
     expect(screen.getByDisplayValue('table')).toBeInTheDocument();
 
-    expect(screen.getByPlaceholderText('Search')).toBeInTheDocument();
+    expect(screen.getByText('Filter')).toBeInTheDocument();
+    expect(screen.getByLabelText('Create a search query')).toBeInTheDocument();
+
+    // Test sort by selector for table display type
+    expect(screen.getByText('Sort by')).toBeInTheDocument();
+    expect(screen.getByText('High to low')).toBeInTheDocument();
+    expect(screen.getByText(`Select a column\u{2026}`)).toBeInTheDocument();
 
     expect(await screen.findByPlaceholderText('Name')).toBeInTheDocument();
     expect(await screen.findByTestId('add-description')).toBeInTheDocument();
@@ -145,105 +148,6 @@ describe('NewWidgetBuiler', function () {
     });
   });
 
-  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,
@@ -296,9 +200,9 @@ describe('NewWidgetBuiler', function () {
     // 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();
     });
+    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 () {
diff --git a/static/app/views/dashboards/widgetBuilder/components/newWidgetBuilder.tsx b/static/app/views/dashboards/widgetBuilder/components/newWidgetBuilder.tsx
index 89be389a5dfdc8..94b22bba9b54fd 100644
--- a/static/app/views/dashboards/widgetBuilder/components/newWidgetBuilder.tsx
+++ b/static/app/views/dashboards/widgetBuilder/components/newWidgetBuilder.tsx
@@ -1,15 +1,21 @@
-import {Fragment, useEffect} from 'react';
-import {css} from '@emotion/react';
+import {type CSSProperties, Fragment, useEffect, useState} from 'react';
+import {closestCorners, DndContext, useDraggable, useDroppable} from '@dnd-kit/core';
+import {css, useTheme} from '@emotion/react';
 import styled from '@emotion/styled';
 import {AnimatePresence, motion} from 'framer-motion';
 
+import {t} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
 import {CustomMeasurementsProvider} from 'sentry/utils/customMeasurements/customMeasurementsProvider';
 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 {decodeBoolean} from 'sentry/utils/queryString';
+import useLocationQuery from 'sentry/utils/url/useLocationQuery';
 import useKeyPress from 'sentry/utils/useKeyPress';
 import {useLocation} from 'sentry/utils/useLocation';
+import useMedia from 'sentry/utils/useMedia';
 import useOrganization from 'sentry/utils/useOrganization';
 import usePageFilters from 'sentry/utils/usePageFilters';
 import {
@@ -17,7 +23,18 @@ import {
   type DashboardFilters,
   DisplayType,
   type Widget,
+  WidgetType,
 } from 'sentry/views/dashboards/types';
+import {
+  DEFAULT_WIDGET_DRAG_POSITIONING,
+  DRAGGABLE_PREVIEW_HEIGHT_PX,
+  DRAGGABLE_PREVIEW_WIDTH_PX,
+  PREVIEW_HEIGHT_PX,
+  SIDEBAR_HEIGHT,
+  snapPreviewToCorners,
+  WIDGET_PREVIEW_DRAG_ID,
+  type WidgetDragPositioning,
+} from 'sentry/views/dashboards/widgetBuilder/components/common/draggableUtils';
 import WidgetBuilderSlideout from 'sentry/views/dashboards/widgetBuilder/components/widgetBuilderSlideout';
 import WidgetPreview from 'sentry/views/dashboards/widgetBuilder/components/widgetPreview';
 import {
@@ -47,6 +64,17 @@ function WidgetBuilderV2({
   const organization = useOrganization();
   const {selection} = usePageFilters();
 
+  const [queryConditionsValid, setQueryConditionsValid] = useState<boolean>(true);
+  const theme = useTheme();
+  const [isPreviewDraggable, setIsPreviewDraggable] = useState(false);
+
+  const isSmallScreen = useMedia(`(max-width: ${theme.breakpoints.small})`);
+
+  const [translate, setTranslate] = useState<WidgetDragPositioning>(
+    DEFAULT_WIDGET_DRAG_POSITIONING
+  );
+
+  // do we want to keep this?
   useEffect(() => {
     if (escapeKeyPressed) {
       if (isOpen) {
@@ -55,6 +83,21 @@ function WidgetBuilderV2({
     }
   }, [escapeKeyPressed, isOpen, onClose]);
 
+  const handleDragEnd = ({over}) => {
+    setTranslate(snapPreviewToCorners(over));
+  };
+
+  const handleDragMove = ({delta}) => {
+    setTranslate(previousTranslate => ({
+      ...previousTranslate,
+      initialTranslate: previousTranslate.initialTranslate,
+      translate: {
+        x: previousTranslate.initialTranslate.x + delta.x,
+        y: previousTranslate.initialTranslate.y + delta.y,
+      },
+    }));
+  };
+
   return (
     <Fragment>
       {isOpen && <Backdrop style={{opacity: 0.5, pointerEvents: 'auto'}} />}
@@ -70,13 +113,32 @@ function WidgetBuilderV2({
                   <WidgetBuilderContainer>
                     <WidgetBuilderSlideout
                       isOpen={isOpen}
-                      onClose={onClose}
+                      onClose={() => {
+                        onClose();
+                        setTranslate(DEFAULT_WIDGET_DRAG_POSITIONING);
+                      }}
                       onSave={onSave}
-                    />
-                    <WidgetPreviewContainer
-                      dashboardFilters={dashboardFilters}
+                      onQueryConditionChange={setQueryConditionsValid}
                       dashboard={dashboard}
+                      dashboardFilters={dashboardFilters}
+                      setIsPreviewDraggable={setIsPreviewDraggable}
+                      isWidgetInvalid={!queryConditionsValid}
                     />
+                    {(!isSmallScreen || isPreviewDraggable) && (
+                      <DndContext
+                        onDragEnd={handleDragEnd}
+                        onDragMove={handleDragMove}
+                        collisionDetection={closestCorners}
+                      >
+                        <WidgetPreviewContainer
+                          dashboardFilters={dashboardFilters}
+                          dashboard={dashboard}
+                          dragPosition={translate}
+                          isDraggable={isPreviewDraggable}
+                          isWidgetInvalid={!queryConditionsValid}
+                        />
+                      </DndContext>
+                    )}
                   </WidgetBuilderContainer>
                 </ContainerWithoutSidebar>
               </SpanTagsProvider>
@@ -90,16 +152,67 @@ function WidgetBuilderV2({
 
 export default WidgetBuilderV2;
 
-function WidgetPreviewContainer({
+export function WidgetPreviewContainer({
   dashboardFilters,
   dashboard,
+  isWidgetInvalid,
+  dragPosition,
+  isDraggable,
 }: {
   dashboard: DashboardDetails;
   dashboardFilters: DashboardFilters;
+  isWidgetInvalid: boolean;
+  dragPosition?: WidgetDragPositioning;
+  isDraggable?: boolean;
 }) {
   const {state} = useWidgetBuilderContext();
   const organization = useOrganization();
   const location = useLocation();
+  const theme = useTheme();
+  const {useRpc} = useLocationQuery({
+    fields: {
+      useRpc: decodeBoolean,
+    },
+  });
+
+  const isSmallScreen = useMedia(`(max-width: ${theme.breakpoints.small})`);
+  // if small screen and draggable, enable dragging
+  const isDragEnabled = isSmallScreen && isDraggable;
+
+  const {attributes, listeners, setNodeRef, isDragging} = useDraggable({
+    id: WIDGET_PREVIEW_DRAG_ID,
+    disabled: !isDragEnabled,
+    // May need to add 'handle' prop if we want to drag the preview by a specific area
+  });
+
+  const {translate, top, left} = dragPosition ?? {};
+
+  const draggableStyle: CSSProperties = {
+    transform: isDragEnabled
+      ? `translate3d(${translate?.x ?? 0}px, ${translate?.y ?? 0}px, 0)`
+      : undefined,
+    top: isDragEnabled ? top ?? 0 : undefined,
+    left: isDragEnabled ? left ?? 0 : undefined,
+    opacity: isDragging ? 0.5 : 1,
+    zIndex: isDragEnabled ? theme.zIndex.modal : theme.zIndex.initial,
+    cursor: isDragEnabled ? 'grab' : undefined,
+    margin: isDragEnabled ? '0' : undefined,
+    alignSelf: isDragEnabled ? 'flex-start' : undefined,
+    position: isDragEnabled ? 'fixed' : undefined,
+  };
+
+  const getPreviewHeight = () => {
+    if (isDragEnabled) {
+      return DRAGGABLE_PREVIEW_HEIGHT_PX;
+    }
+    if (state.displayType === DisplayType.TABLE) {
+      return 'auto';
+    }
+    if (state.displayType === DisplayType.BIG_NUMBER && !isSmallScreen) {
+      return '20vw';
+    }
+    return PREVIEW_HEIGHT_PX;
+  };
 
   return (
     <DashboardsMEPProvider>
@@ -115,22 +228,41 @@ function WidgetPreviewContainer({
               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}
+              {isDragEnabled && <DroppablePreviewContainer />}
+              <DraggableWidgetContainer
+                ref={setNodeRef}
+                id={WIDGET_PREVIEW_DRAG_ID}
+                style={draggableStyle}
+                aria-label={t('Draggable Widget Preview')}
+                {...attributes}
+                {...listeners}
               >
-                <WidgetPreview
-                  dashboardFilters={dashboardFilters}
-                  dashboard={dashboard}
-                />
-              </SampleWidgetCard>
+                <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,
+                  }}
+                  style={{
+                    width: isDragEnabled ? DRAGGABLE_PREVIEW_WIDTH_PX : undefined,
+                    height: getPreviewHeight(),
+                    outline: isDragEnabled
+                      ? `${space(1)} solid ${theme.border}`
+                      : undefined,
+                  }}
+                >
+                  <WidgetPreview
+                    // While we test out RPC for spans, force a re-render if the spans toggle changes
+                    key={state.dataset === WidgetType.SPANS && useRpc ? 'spans' : 'other'}
+                    dashboardFilters={dashboardFilters}
+                    dashboard={dashboard}
+                    isWidgetInvalid={isWidgetInvalid}
+                  />
+                </SampleWidgetCard>
+              </DraggableWidgetContainer>
             </MEPSettingProvider>
           )}
         </MetricsDataSwitcher>
@@ -139,6 +271,26 @@ function WidgetPreviewContainer({
   );
 }
 
+function DroppablePreviewContainer() {
+  const containers = ['top-left', 'top-right', 'bottom-left', 'bottom-right'];
+
+  return (
+    <DroppableGrid>
+      {containers.map(id => (
+        <Droppable key={id} id={id} />
+      ))}
+    </DroppableGrid>
+  );
+}
+
+function Droppable({id}: {id: string}) {
+  const {setNodeRef} = useDroppable({
+    id,
+  });
+
+  return <div ref={setNodeRef} id={id} />;
+}
+
 const fullPageCss = css`
   position: absolute;
   top: 0;
@@ -147,6 +299,16 @@ const fullPageCss = css`
   left: 0;
 `;
 
+const fillAvailableCss = css`
+  height: 100%; /* default */
+  height: -webkit-fill-available; /* Chrome */
+  height: -moz-available; /* Firefox */
+  height: fill-available; /* others */
+  width: -webkit-fill-available; /* Chrome */
+  width: -moz-available; /* Firefox */
+  width: fill-available; /* others */
+`;
+
 const Backdrop = styled('div')`
   ${fullPageCss};
   z-index: ${p => p.theme.zIndex.widgetBuilderDrawer};
@@ -157,17 +319,42 @@ const Backdrop = styled('div')`
   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};
+const SampleWidgetCard = styled(motion.div)`
+  width: 100%;
+  min-width: 100%;
+  border: 1px dashed ${p => p.theme.gray300};
   border-radius: ${p => p.theme.borderRadius};
   background-color: ${p => p.theme.background};
+  z-index: ${p => p.theme.zIndex.initial};
+  position: relative;
+
+  @media (min-width: ${p => p.theme.breakpoints.small}) {
+    width: 30vw;
+    min-width: 300px;
+    z-index: ${p => p.theme.zIndex.modal};
+    cursor: auto;
+  }
+
+  @media (max-width: ${p => p.theme.breakpoints.large}) and (min-width: ${p =>
+      p.theme.breakpoints.medium}) {
+    width: 25vw;
+    min-width: 100px;
+    max-width: 300px;
+  }
+`;
+
+const DraggableWidgetContainer = styled(`div`)`
   align-content: center;
-  z-index: ${p => p.theme.zIndex.modal};
+  z-index: ${p => p.theme.zIndex.initial};
   position: relative;
   margin: auto;
+  cursor: auto;
+
+  @media (min-width: ${p => p.theme.breakpoints.small}) {
+    z-index: ${p => p.theme.zIndex.modal};
+    transform: none;
+    cursor: auto;
+  }
 `;
 
 const ContainerWithoutSidebar = styled('div')`
@@ -181,9 +368,19 @@ const WidgetBuilderContainer = styled('div')`
   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 */
+  ${fillAvailableCss};
+`;
+
+const DroppableGrid = styled('div')`
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  grid-template-rows: 1fr 1fr;
+  position: fixed;
+  gap: ${space(4)};
+  margin: ${space(2)};
+  top: ${SIDEBAR_HEIGHT}px;
+  right: ${space(2)};
+  bottom: ${space(2)};
+  left: 0;
 `;
diff --git a/static/app/views/dashboards/widgetBuilder/components/queryFilterBuilder.spec.tsx b/static/app/views/dashboards/widgetBuilder/components/queryFilterBuilder.spec.tsx
new file mode 100644
index 00000000000000..97ee6b52706600
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/components/queryFilterBuilder.spec.tsx
@@ -0,0 +1,98 @@
+import {LocationFixture} from 'sentry-fixture/locationFixture';
+import {OrganizationFixture} from 'sentry-fixture/organization';
+import {RouterFixture} from 'sentry-fixture/routerFixture';
+
+import {render, screen} from 'sentry-test/reactTestingLibrary';
+
+import type {Organization} from 'sentry/types/organization';
+import useCustomMeasurements from 'sentry/utils/useCustomMeasurements';
+import {DisplayType, WidgetType} from 'sentry/views/dashboards/types';
+import WidgetBuilderQueryFilterBuilder from 'sentry/views/dashboards/widgetBuilder/components/queryFilterBuilder';
+import {WidgetBuilderProvider} from 'sentry/views/dashboards/widgetBuilder/contexts/widgetBuilderContext';
+import {useSpanTags} from 'sentry/views/explore/contexts/spanTagsContext';
+
+jest.mock('sentry/utils/useCustomMeasurements');
+jest.mock('sentry/views/explore/contexts/spanTagsContext');
+
+describe('QueryFilterBuilder', () => {
+  let organization: Organization;
+  beforeEach(() => {
+    organization = OrganizationFixture({
+      features: ['dashboards-widget-builder-redesign'],
+    });
+    jest.mocked(useCustomMeasurements).mockReturnValue({
+      customMeasurements: {},
+    });
+    jest.mocked(useSpanTags).mockReturnValue({});
+
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/recent-searches/',
+    });
+  });
+
+  it('renders a dataset-specific query filter bar', async () => {
+    render(
+      <WidgetBuilderProvider>
+        <WidgetBuilderQueryFilterBuilder onQueryConditionChange={() => {}} />
+      </WidgetBuilderProvider>,
+      {
+        organization,
+        router: RouterFixture({
+          location: LocationFixture({
+            query: {
+              query: [],
+              dataset: WidgetType.TRANSACTIONS,
+              displayType: DisplayType.TABLE,
+            },
+          }),
+        }),
+      }
+    );
+    expect(
+      await screen.findByPlaceholderText('Search for events, users, tags, and more')
+    ).toBeInTheDocument();
+
+    render(
+      <WidgetBuilderProvider>
+        <WidgetBuilderQueryFilterBuilder onQueryConditionChange={() => {}} />
+      </WidgetBuilderProvider>,
+      {
+        organization,
+        router: RouterFixture({
+          location: LocationFixture({
+            query: {
+              query: [],
+              dataset: WidgetType.SPANS,
+              displayType: DisplayType.TABLE,
+            },
+          }),
+        }),
+      }
+    );
+    expect(
+      await screen.findByPlaceholderText('Search for spans, users, tags, and more')
+    ).toBeInTheDocument();
+  });
+
+  it('renders a legend alias input for charts', async () => {
+    render(
+      <WidgetBuilderProvider>
+        <WidgetBuilderQueryFilterBuilder onQueryConditionChange={() => {}} />
+      </WidgetBuilderProvider>,
+      {
+        organization,
+        router: RouterFixture({
+          location: LocationFixture({
+            query: {
+              query: [],
+              dataset: WidgetType.TRANSACTIONS,
+              displayType: DisplayType.LINE,
+            },
+          }),
+        }),
+      }
+    );
+
+    expect(await screen.findByPlaceholderText('Legend Alias')).toBeInTheDocument();
+  });
+});
diff --git a/static/app/views/dashboards/widgetBuilder/components/queryFilterBuilder.tsx b/static/app/views/dashboards/widgetBuilder/components/queryFilterBuilder.tsx
index 79edb81fda7c8f..d9c68d1ae1cc62 100644
--- a/static/app/views/dashboards/widgetBuilder/components/queryFilterBuilder.tsx
+++ b/static/app/views/dashboards/widgetBuilder/components/queryFilterBuilder.tsx
@@ -1,19 +1,46 @@
-import {Fragment} from 'react';
+import {Fragment, useCallback, useState} from 'react';
 import styled from '@emotion/styled';
+import cloneDeep from 'lodash/cloneDeep';
 
 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 {t, tct} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
-import {DisplayType} from 'sentry/views/dashboards/types';
+import {
+  createOnDemandFilterWarning,
+  shouldDisplayOnDemandWidgetWarning,
+} from 'sentry/utils/onDemandMetrics';
+import useOrganization from 'sentry/utils/useOrganization';
+import usePageFilters from 'sentry/utils/usePageFilters';
+import {getDatasetConfig} from 'sentry/views/dashboards/datasetConfig/base';
+import {DisplayType, WidgetType} from 'sentry/views/dashboards/types';
 import {SectionHeader} from 'sentry/views/dashboards/widgetBuilder/components/common/sectionHeader';
 import {useWidgetBuilderContext} from 'sentry/views/dashboards/widgetBuilder/contexts/widgetBuilderContext';
 import {BuilderStateAction} from 'sentry/views/dashboards/widgetBuilder/hooks/useWidgetBuilderState';
+import {getDiscoverDatasetFromWidgetType} from 'sentry/views/dashboards/widgetBuilder/utils';
+import {convertBuilderStateToWidget} from 'sentry/views/dashboards/widgetBuilder/utils/convertBuilderStateToWidget';
 
-function WidgetBuilderQueryFilterBuilder() {
+interface WidgetBuilderQueryFilterBuilderProps {
+  onQueryConditionChange: (valid: boolean) => void;
+}
+
+function WidgetBuilderQueryFilterBuilder({
+  onQueryConditionChange,
+}: WidgetBuilderQueryFilterBuilderProps) {
   const {state, dispatch} = useWidgetBuilderContext();
+  const {selection} = usePageFilters();
+  const organization = useOrganization();
+
+  const [queryConditionValidity, setQueryConditionValidity] = useState<boolean[]>(() => {
+    // Make a validity entry for each query condition initially
+    return state.query?.map(() => true) ?? [];
+  });
+
+  const widgetType = state.dataset ?? WidgetType.ERRORS;
+  const datasetConfig = getDatasetConfig(state.dataset);
+
+  const widget = convertBuilderStateToWidget(state);
 
   const canAddSearchConditions =
     state.displayType !== DisplayType.TABLE &&
@@ -25,8 +52,62 @@ function WidgetBuilderQueryFilterBuilder() {
       type: BuilderStateAction.SET_QUERY,
       payload: state.query?.length ? [...state.query, ''] : ['', ''],
     });
+
+    dispatch({
+      type: BuilderStateAction.SET_LEGEND_ALIAS,
+      payload: state.legendAlias?.length ? [...state.legendAlias, ''] : ['', ''],
+    });
   };
 
+  const handleClose = useCallback(
+    (queryIndex: number) => {
+      return (field: string, props: any) => {
+        const {validSearch} = props;
+        const nextQueryConditionValidity = cloneDeep(queryConditionValidity);
+        nextQueryConditionValidity[queryIndex] = validSearch;
+        setQueryConditionValidity(nextQueryConditionValidity);
+        onQueryConditionChange(nextQueryConditionValidity.every(validity => validity));
+        dispatch({
+          type: BuilderStateAction.SET_QUERY,
+          payload: state.query?.map((q, i) => (i === queryIndex ? field : q)) ?? [],
+        });
+      };
+    },
+    [dispatch, queryConditionValidity, state.query, onQueryConditionChange]
+  );
+
+  const handleRemove = useCallback(
+    (queryIndex: number) => () => {
+      queryConditionValidity.splice(queryIndex, 1);
+      setQueryConditionValidity(queryConditionValidity);
+      onQueryConditionChange(queryConditionValidity.every(validity => validity));
+      dispatch({
+        type: BuilderStateAction.SET_QUERY,
+        payload: state.query?.filter((_, i) => i !== queryIndex) ?? [],
+      });
+      dispatch({
+        type: BuilderStateAction.SET_LEGEND_ALIAS,
+        payload: state.legendAlias?.filter((_, i) => i !== queryIndex) ?? [],
+      });
+    },
+    [
+      dispatch,
+      queryConditionValidity,
+      state.query,
+      onQueryConditionChange,
+      state.legendAlias,
+    ]
+  );
+
+  const getOnDemandFilterWarning = createOnDemandFilterWarning(
+    tct(
+      'We don’t routinely collect metrics from this property. However, we’ll do so [strong:once this widget has been saved.]',
+      {
+        strong: <strong />,
+      }
+    )
+  );
+
   return (
     <Fragment>
       <SectionHeader
@@ -40,16 +121,29 @@ function WidgetBuilderQueryFilterBuilder() {
         }
         optional
       />
-      {!state.query?.length ? (
-        <QueryFieldRowWrapper key={0}>
-          <QueryField
-            query={''}
+      {state.query?.map((_, index) => (
+        <QueryFieldRowWrapper key={index}>
+          <datasetConfig.SearchBar
+            getFilterWarning={
+              shouldDisplayOnDemandWidgetWarning(
+                widget.queries[index]!,
+                widgetType,
+                organization
+              )
+                ? getOnDemandFilterWarning
+                : undefined
+            }
+            pageFilters={selection}
+            onClose={handleClose(index)}
             onSearch={queryString => {
               dispatch({
                 type: BuilderStateAction.SET_QUERY,
-                payload: [queryString],
+                payload:
+                  state.query?.map((q, i) => (i === index ? queryString : q)) ?? [],
               });
             }}
+            widgetQuery={widget.queries[index]!}
+            dataset={getDiscoverDatasetFromWidgetType(widgetType)}
           />
           {canAddSearchConditions && (
             // TODO: Hook up alias to query hook when it's implemented
@@ -57,45 +151,22 @@ function WidgetBuilderQueryFilterBuilder() {
               type="text"
               name="name"
               placeholder={t('Legend Alias')}
-              onChange={() => {}}
-            />
-          )}
-        </QueryFieldRowWrapper>
-      ) : (
-        state.query?.map((query, index) => (
-          <QueryFieldRowWrapper key={index}>
-            <QueryField
-              query={query}
-              onSearch={queryString => {
+              value={state.legendAlias?.[index] || ''}
+              onChange={e => {
                 dispatch({
-                  type: BuilderStateAction.SET_QUERY,
-                  payload:
-                    state.query?.map((q, i) => (i === index ? queryString : q)) ?? [],
+                  type: BuilderStateAction.SET_LEGEND_ALIAS,
+                  payload: state.legendAlias?.length
+                    ? state.legendAlias?.map((q, i) => (i === index ? e.target.value : q))
+                    : [e.target.value],
                 });
               }}
             />
-            {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>
-        ))
-      )}
+          )}
+          {state.query && state.query?.length > 1 && canAddSearchConditions && (
+            <DeleteButton onDelete={handleRemove(index)} />
+          )}
+        </QueryFieldRowWrapper>
+      ))}
       {canAddSearchConditions && (
         <Button size="sm" icon={<IconAdd isCircled />} onClick={onAddSearchConditions}>
           {t('Add Filter')}
@@ -107,27 +178,6 @@ function WidgetBuilderQueryFilterBuilder() {
 
 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
diff --git a/static/app/views/dashboards/widgetBuilder/components/rpcToggle.tsx b/static/app/views/dashboards/widgetBuilder/components/rpcToggle.tsx
new file mode 100644
index 00000000000000..72de67744f9cb0
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/components/rpcToggle.tsx
@@ -0,0 +1,36 @@
+import {Flex} from 'sentry/components/container/flex';
+import SwitchButton from 'sentry/components/switchButton';
+import {t} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
+import {useLocalStorageState} from 'sentry/utils/useLocalStorageState';
+import {useQueryParamState} from 'sentry/views/dashboards/widgetBuilder/hooks/useQueryParamState';
+
+export const DASHBOARD_RPC_TOGGLE_KEY = 'dashboards-spans-use-rpc';
+
+function RPCToggle() {
+  const [_, setIsRpcEnabled] = useQueryParamState<boolean>({
+    fieldName: 'useRpc',
+  });
+  // This is hacky, but we need to access the RPC toggle state in the spans dataset config
+  // and I don't want to pass it down as a prop when it's only temporary.
+  const [isRpcEnabled, setRpcLocalStorage] = useLocalStorageState(
+    DASHBOARD_RPC_TOGGLE_KEY,
+    false
+  );
+
+  return (
+    <Flex gap={space(1)}>
+      <SwitchButton
+        isActive={isRpcEnabled}
+        toggle={() => {
+          const newValue = !isRpcEnabled;
+          setIsRpcEnabled(newValue);
+          setRpcLocalStorage(newValue);
+        }}
+      />
+      <div>{t('Use RPC')}</div>
+    </Flex>
+  );
+}
+
+export default RPCToggle;
diff --git a/static/app/views/dashboards/widgetBuilder/components/saveButton.tsx b/static/app/views/dashboards/widgetBuilder/components/saveButton.tsx
index 954c1f479f1ce1..0c5cffa79b0fdf 100644
--- a/static/app/views/dashboards/widgetBuilder/components/saveButton.tsx
+++ b/static/app/views/dashboards/widgetBuilder/components/saveButton.tsx
@@ -1,7 +1,11 @@
 import {useCallback} from 'react';
 
+import {validateWidget} from 'sentry/actionCreators/dashboards';
+import {addErrorMessage} from 'sentry/actionCreators/indicator';
 import {Button} from 'sentry/components/button';
 import {t} from 'sentry/locale';
+import useApi from 'sentry/utils/useApi';
+import useOrganization from 'sentry/utils/useOrganization';
 import {useParams} from 'sentry/utils/useParams';
 import type {Widget} from 'sentry/views/dashboards/types';
 import {useWidgetBuilderContext} from 'sentry/views/dashboards/widgetBuilder/contexts/widgetBuilderContext';
@@ -15,11 +19,18 @@ interface SaveButtonProps {
 function SaveButton({isEditing, onSave}: SaveButtonProps) {
   const {state} = useWidgetBuilderContext();
   const {widgetIndex} = useParams();
+  const api = useApi();
+  const organization = useOrganization();
 
-  const handleSave = useCallback(() => {
+  const handleSave = useCallback(async () => {
     const widget = convertBuilderStateToWidget(state);
-    onSave({index: Number(widgetIndex), widget});
-  }, [onSave, state, widgetIndex]);
+    try {
+      await validateWidget(api, organization.slug, widget);
+      onSave({index: Number(widgetIndex), widget});
+    } catch (error) {
+      addErrorMessage(t('Unable to save widget'));
+    }
+  }, [api, onSave, organization.slug, state, widgetIndex]);
 
   return (
     <Button priority="primary" onClick={handleSave}>
diff --git a/static/app/views/dashboards/widgetBuilder/components/sortBySelector.spec.tsx b/static/app/views/dashboards/widgetBuilder/components/sortBySelector.spec.tsx
new file mode 100644
index 00000000000000..6200d2aba258eb
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/components/sortBySelector.spec.tsx
@@ -0,0 +1,186 @@
+import {RouterFixture} from 'sentry-fixture/routerFixture';
+
+import {initializeOrg} from 'sentry-test/initializeOrg';
+import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
+
+import {DiscoverDatasets} from 'sentry/utils/discover/types';
+import {useNavigate} from 'sentry/utils/useNavigate';
+import WidgetBuilderSortBySelector from 'sentry/views/dashboards/widgetBuilder/components/sortBySelector';
+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 {organization, router} = initializeOrg({
+  organization: {features: ['global-views', 'open-membership', 'dashboards-eap']},
+  projects: [],
+  router: {
+    location: {
+      pathname: '/organizations/org-slug/dashboard/1/',
+      query: {
+        displayType: 'line',
+        fields: ['transaction.duration', 'count()', 'id'],
+        yAxis: ['count()', 'count_unique(transaction.duration)'],
+      },
+    },
+    params: {},
+  },
+});
+
+const mockUseNavigate = jest.mocked(useNavigate);
+
+describe('WidgetBuilderSortBySelector', 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>
+          <WidgetBuilderSortBySelector />
+        </SpanTagsProvider>
+      </WidgetBuilderProvider>,
+      {
+        router,
+        organization,
+      }
+    );
+
+    expect(await screen.findByText('Sort by')).toBeInTheDocument();
+    expect(await screen.findByText('Limit to 5 results')).toBeInTheDocument();
+    expect(await screen.findByText('High to low')).toBeInTheDocument();
+    expect(await screen.findByText('(Required)')).toBeInTheDocument();
+  });
+
+  it('renders correct fields for table widgets', async function () {
+    const tableRouter = RouterFixture({
+      ...router,
+      location: {
+        ...router.location,
+        query: {...router.location.query, displayType: 'table'},
+      },
+    });
+
+    render(
+      <WidgetBuilderProvider>
+        <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
+          <WidgetBuilderSortBySelector />
+        </SpanTagsProvider>
+      </WidgetBuilderProvider>,
+      {
+        router: tableRouter,
+        organization,
+      }
+    );
+
+    expect(await screen.findByText('Sort by')).toBeInTheDocument();
+    expect(await screen.findByText('High to low')).toBeInTheDocument();
+    expect(await screen.findByText(`Select a column\u{2026}`)).toBeInTheDocument();
+  });
+
+  it('renders and functions correctly', async function () {
+    const mockNavigate = jest.fn();
+    mockUseNavigate.mockReturnValue(mockNavigate);
+
+    render(
+      <WidgetBuilderProvider>
+        <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
+          <WidgetBuilderSortBySelector />
+        </SpanTagsProvider>
+      </WidgetBuilderProvider>,
+      {router, organization}
+    );
+
+    const sortDirectionSelector = await screen.findByText('High to low');
+    const sortFieldSelector = await screen.findByText('(Required)');
+
+    expect(sortFieldSelector).toBeInTheDocument();
+
+    await userEvent.click(sortFieldSelector);
+    await userEvent.click(await screen.findByText('count()'));
+
+    expect(mockNavigate).toHaveBeenLastCalledWith(
+      expect.objectContaining({
+        ...router.location,
+        query: expect.objectContaining({sort: ['-count()']}),
+      })
+    );
+
+    await userEvent.click(sortDirectionSelector);
+    await userEvent.click(await screen.findByText('Low to high'));
+    expect(mockNavigate).toHaveBeenLastCalledWith(
+      expect.objectContaining({
+        ...router.location,
+        query: expect.objectContaining({sort: ['count()']}),
+      })
+    );
+  });
+
+  it('renders the correct limit options', async function () {
+    render(
+      <WidgetBuilderProvider>
+        <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
+          <WidgetBuilderSortBySelector />
+        </SpanTagsProvider>
+      </WidgetBuilderProvider>,
+      {router, organization}
+    );
+
+    // default limit is 5
+    expect(await screen.findByText('Limit to 5 results')).toBeInTheDocument();
+
+    const moreAggregatesRouter = RouterFixture({
+      ...router,
+      location: {
+        ...router.location,
+        query: {
+          ...router.location.query,
+          yAxis: ['count()', 'count_unique(transaction.duration)', 'eps()'],
+        },
+      },
+    });
+
+    render(
+      <WidgetBuilderProvider>
+        <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
+          <WidgetBuilderSortBySelector />
+        </SpanTagsProvider>
+      </WidgetBuilderProvider>,
+      {router: moreAggregatesRouter, organization}
+    );
+
+    // default limit changes to 3 since its the max limit for 3 aggregates
+    expect(await screen.findByText('Limit to 3 results')).toBeInTheDocument();
+  });
+
+  it('correctly handles limit changes', async function () {
+    const mockNavigate = jest.fn();
+    mockUseNavigate.mockReturnValue(mockNavigate);
+
+    render(
+      <WidgetBuilderProvider>
+        <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
+          <WidgetBuilderSortBySelector />
+        </SpanTagsProvider>
+      </WidgetBuilderProvider>,
+      {router, organization}
+    );
+
+    const limitSelector = await screen.findByText('Limit to 5 results');
+    await userEvent.click(limitSelector);
+    await userEvent.click(await screen.findByText('Limit to 3 results'));
+
+    expect(mockNavigate).toHaveBeenLastCalledWith(
+      expect.objectContaining({query: expect.objectContaining({limit: 3})})
+    );
+  });
+});
diff --git a/static/app/views/dashboards/widgetBuilder/components/sortBySelector.tsx b/static/app/views/dashboards/widgetBuilder/components/sortBySelector.tsx
new file mode 100644
index 00000000000000..e7663652f8c368
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/components/sortBySelector.tsx
@@ -0,0 +1,149 @@
+import {Fragment, useEffect} from 'react';
+import styled from '@emotion/styled';
+
+import SelectControl from 'sentry/components/forms/controls/selectControl';
+import FieldGroup from 'sentry/components/forms/fieldGroup';
+import {Tooltip} from 'sentry/components/tooltip';
+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 useTags from 'sentry/utils/useTags';
+import {getDatasetConfig} from 'sentry/views/dashboards/datasetConfig/base';
+import {DisplayType, WidgetType} from 'sentry/views/dashboards/types';
+import {SortBySelectors} from 'sentry/views/dashboards/widgetBuilder/buildSteps/sortByStep/sortBySelectors';
+import {SectionHeader} from 'sentry/views/dashboards/widgetBuilder/components/common/sectionHeader';
+import {useWidgetBuilderContext} from 'sentry/views/dashboards/widgetBuilder/contexts/widgetBuilderContext';
+import {BuilderStateAction} from 'sentry/views/dashboards/widgetBuilder/hooks/useWidgetBuilderState';
+import {
+  getResultsLimit,
+  SortDirection,
+} from 'sentry/views/dashboards/widgetBuilder/utils';
+import {convertBuilderStateToWidget} from 'sentry/views/dashboards/widgetBuilder/utils/convertBuilderStateToWidget';
+import {useSpanTags} from 'sentry/views/explore/contexts/spanTagsContext';
+
+function WidgetBuilderSortBySelector() {
+  const {state, dispatch} = useWidgetBuilderContext();
+  const widget = convertBuilderStateToWidget(state);
+
+  const datasetConfig = getDatasetConfig(state.dataset);
+
+  let tags: TagCollection = useTags();
+  const numericSpanTags = useSpanTags('number');
+  const stringSpanTags = useSpanTags('string');
+  if (state.dataset === WidgetType.SPANS) {
+    tags = {...numericSpanTags, ...stringSpanTags};
+  }
+
+  let disableSort = false;
+  let disableSortDirection = false;
+  let disableSortReason: string | undefined = undefined;
+
+  if (datasetConfig.disableSortOptions) {
+    ({disableSort, disableSortDirection, disableSortReason} =
+      datasetConfig.disableSortOptions(widget.queries[0]!));
+  }
+
+  const displayType = state.displayType ?? DisplayType.TABLE;
+
+  const isTimeseriesChart = [
+    DisplayType.LINE,
+    DisplayType.BAR,
+    DisplayType.AREA,
+  ].includes(displayType);
+
+  const maxLimit = getResultsLimit(
+    widget.queries.length,
+    widget.queries[0]!.aggregates.length
+  );
+
+  // handles when the maxLimit changes to a value less than the current selected limit
+  useEffect(() => {
+    if (!state.limit) {
+      return;
+    }
+    if (state.limit > maxLimit) {
+      dispatch({
+        type: BuilderStateAction.SET_LIMIT,
+        payload: maxLimit,
+      });
+    }
+  }, [state.limit, maxLimit, dispatch]);
+
+  function handleSortByChange(newSortBy: string, sortDirection: 'asc' | 'desc') {
+    dispatch({
+      type: BuilderStateAction.SET_SORT,
+      payload: [{field: newSortBy, kind: sortDirection}],
+    });
+  }
+
+  return (
+    <Fragment>
+      <SectionHeader
+        title={t('Sort by')}
+        tooltipText={t('Results you see first and last in your samples or aggregates')}
+      />
+      <Tooltip
+        title={disableSortReason}
+        disabled={!(disableSortDirection && disableSort)}
+      >
+        <FieldGroup
+          inline={false}
+          style={{paddingRight: 0}}
+          flexibleControlStateSize
+          stacked
+        >
+          {isTimeseriesChart && state.limit && (
+            <ResultsLimitSelector
+              disabled={disableSortDirection && disableSort}
+              name="resultsLimit"
+              menuPlacement="auto"
+              options={[...Array(maxLimit).keys()].map(resultLimit => {
+                const value = resultLimit + 1;
+                return {
+                  label: tn('Limit to %s result', 'Limit to %s results', value),
+                  value,
+                };
+              })}
+              value={state.limit}
+              onChange={(option: SelectValue<number>) => {
+                dispatch({
+                  type: BuilderStateAction.SET_LIMIT,
+                  payload: option.value,
+                });
+              }}
+            />
+          )}
+          <SortBySelectors
+            displayType={displayType}
+            widgetType={state.dataset ?? WidgetType.ERRORS}
+            hasGroupBy={isTimeseriesChart && !!widget.queries[0]!.columns.length}
+            disableSortReason={disableSortReason}
+            disableSort={disableSort}
+            disableSortDirection={disableSortDirection}
+            widgetQuery={widget.queries[0]!}
+            values={{
+              sortDirection:
+                state.sort?.[0]?.kind === 'asc'
+                  ? SortDirection.LOW_TO_HIGH
+                  : SortDirection.HIGH_TO_LOW,
+              sortBy: state.sort?.length ? state.sort?.[0]!?.field : '',
+            }}
+            onChange={({sortDirection, sortBy}) => {
+              const newSortDirection =
+                sortDirection === SortDirection.HIGH_TO_LOW ? 'desc' : 'asc';
+              handleSortByChange(sortBy, newSortDirection);
+            }}
+            tags={tags}
+          />
+        </FieldGroup>
+      </Tooltip>
+    </Fragment>
+  );
+}
+
+export default WidgetBuilderSortBySelector;
+
+const ResultsLimitSelector = styled(SelectControl)`
+  margin-bottom: ${space(1)};
+`;
diff --git a/static/app/views/dashboards/widgetBuilder/components/typeSelector.spec.tsx b/static/app/views/dashboards/widgetBuilder/components/typeSelector.spec.tsx
new file mode 100644
index 00000000000000..087c33ca48cd56
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/components/typeSelector.spec.tsx
@@ -0,0 +1,50 @@
+import {OrganizationFixture} from 'sentry-fixture/organization';
+import {RouterFixture} from 'sentry-fixture/routerFixture';
+
+import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
+
+import {useNavigate} from 'sentry/utils/useNavigate';
+import TypeSelector from 'sentry/views/dashboards/widgetBuilder/components/typeSelector';
+import {WidgetBuilderProvider} from 'sentry/views/dashboards/widgetBuilder/contexts/widgetBuilderContext';
+
+jest.mock('sentry/utils/useNavigate', () => ({
+  useNavigate: jest.fn(),
+}));
+
+const mockUseNavigate = jest.mocked(useNavigate);
+
+describe('TypeSelector', () => {
+  let router!: ReturnType<typeof RouterFixture>;
+  let organization!: ReturnType<typeof OrganizationFixture>;
+  beforeEach(function () {
+    router = RouterFixture();
+    organization = OrganizationFixture({});
+  });
+
+  it('changes the visualization type', async function () {
+    const mockNavigate = jest.fn();
+    mockUseNavigate.mockReturnValue(mockNavigate);
+
+    render(
+      <WidgetBuilderProvider>
+        <TypeSelector />
+      </WidgetBuilderProvider>,
+      {
+        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'}),
+      })
+    );
+  });
+});
diff --git a/static/app/views/dashboards/widgetBuilder/components/typeSelector.tsx b/static/app/views/dashboards/widgetBuilder/components/typeSelector.tsx
index c4d8293067ce26..4e3489dede4c58 100644
--- a/static/app/views/dashboards/widgetBuilder/components/typeSelector.tsx
+++ b/static/app/views/dashboards/widgetBuilder/components/typeSelector.tsx
@@ -6,6 +6,7 @@ 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 {getDatasetConfig} from 'sentry/views/dashboards/datasetConfig/base';
 import {DisplayType} from 'sentry/views/dashboards/types';
 import {SectionHeader} from 'sentry/views/dashboards/widgetBuilder/components/common/sectionHeader';
 import {useWidgetBuilderContext} from 'sentry/views/dashboards/widgetBuilder/contexts/widgetBuilderContext';
@@ -29,6 +30,7 @@ const displayTypes = {
 
 function WidgetBuilderTypeSelector() {
   const {state, dispatch} = useWidgetBuilderContext();
+  const config = getDatasetConfig(state.dataset);
 
   return (
     <Fragment>
@@ -43,12 +45,17 @@ function WidgetBuilderTypeSelector() {
           leadingItems: typeIcons[value],
           label: displayTypes[value],
           value,
+          disabled: !config.supportedDisplayTypes.includes(value as DisplayType),
         }))}
         clearable={false}
         onChange={newValue => {
+          if (newValue?.value === state.displayType) {
+            return;
+          }
+
           dispatch({
             type: BuilderStateAction.SET_DISPLAY_TYPE,
-            payload: newValue.value,
+            payload: newValue?.value,
           });
           if (
             (newValue.value === DisplayType.TABLE ||
@@ -57,7 +64,7 @@ function WidgetBuilderTypeSelector() {
           ) {
             dispatch({
               type: BuilderStateAction.SET_QUERY,
-              payload: [state.query[0]],
+              payload: [state.query[0]!],
             });
           }
         }}
diff --git a/static/app/views/dashboards/widgetBuilder/components/visualize.spec.tsx b/static/app/views/dashboards/widgetBuilder/components/visualize.spec.tsx
index b3a104aca70cc2..f007afb5fea77d 100644
--- a/static/app/views/dashboards/widgetBuilder/components/visualize.spec.tsx
+++ b/static/app/views/dashboards/widgetBuilder/components/visualize.spec.tsx
@@ -6,6 +6,7 @@ import {render, screen, userEvent, within} from 'sentry-test/reactTestingLibrary
 
 import type {TagCollection} from 'sentry/types/group';
 import useCustomMeasurements from 'sentry/utils/useCustomMeasurements';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import {DisplayType, WidgetType} from 'sentry/views/dashboards/types';
 import Visualize from 'sentry/views/dashboards/widgetBuilder/components/visualize';
 import {WidgetBuilderProvider} from 'sentry/views/dashboards/widgetBuilder/contexts/widgetBuilderContext';
@@ -13,9 +14,11 @@ import {useSpanTags} from 'sentry/views/explore/contexts/spanTagsContext';
 
 jest.mock('sentry/utils/useCustomMeasurements');
 jest.mock('sentry/views/explore/contexts/spanTagsContext');
+jest.mock('sentry/utils/useNavigate');
 
 describe('Visualize', () => {
-  let organization;
+  let organization!: ReturnType<typeof OrganizationFixture>;
+  let mockNavigate!: jest.Mock;
 
   beforeEach(() => {
     organization = OrganizationFixture({
@@ -27,6 +30,9 @@ describe('Visualize', () => {
     });
 
     jest.mocked(useSpanTags).mockReturnValue({});
+
+    mockNavigate = jest.fn();
+    jest.mocked(useNavigate).mockReturnValue(mockNavigate);
   });
 
   it('renders basic aggregates correctly from the URL params', async () => {
@@ -86,17 +92,475 @@ describe('Visualize', () => {
     await userEvent.click(screen.getByRole('button', {name: 'Add Series'}));
 
     expect(screen.queryAllByRole('button', {name: 'Remove field'})[0]).toBeEnabled();
-    await userEvent.click(screen.queryAllByRole('button', {name: 'Remove field'})[0]);
+    await userEvent.click(screen.queryAllByRole('button', {name: 'Remove field'})[0]!);
 
     expect(screen.queryAllByRole('button', {name: 'Remove field'})[0]).toBeDisabled();
   });
 
+  it('disables the column selection when the aggregate has no parameters', async () => {
+    render(
+      <WidgetBuilderProvider>
+        <Visualize />
+      </WidgetBuilderProvider>,
+      {
+        organization,
+        router: RouterFixture({
+          location: LocationFixture({
+            query: {
+              yAxis: ['max(spans.db)'],
+              dataset: WidgetType.TRANSACTIONS,
+              displayType: DisplayType.LINE,
+            },
+          }),
+        }),
+      }
+    );
+
+    expect(screen.getByRole('button', {name: 'Column Selection'})).toBeEnabled();
+    await userEvent.click(screen.getByRole('button', {name: 'Aggregate Selection'}));
+    await userEvent.click(screen.getByRole('option', {name: 'count'}));
+
+    expect(screen.getByRole('button', {name: 'Column Selection'})).toBeDisabled();
+    expect(screen.getByRole('button', {name: 'Aggregate Selection'})).toBeEnabled();
+
+    expect(screen.getByRole('button', {name: 'Column Selection'})).toHaveValue('');
+  });
+
+  it('adds the default value for the column selection when the aggregate has parameters', async () => {
+    render(
+      <WidgetBuilderProvider>
+        <Visualize />
+      </WidgetBuilderProvider>,
+      {
+        organization,
+        router: RouterFixture({
+          location: LocationFixture({
+            query: {
+              yAxis: ['count()'],
+              dataset: WidgetType.TRANSACTIONS,
+              displayType: DisplayType.LINE,
+            },
+          }),
+        }),
+      }
+    );
+
+    expect(screen.getByRole('button', {name: 'Column Selection'})).toBeDisabled();
+
+    await userEvent.click(screen.getByRole('button', {name: 'Aggregate Selection'}));
+    await userEvent.click(screen.getByRole('option', {name: 'p95'}));
+
+    expect(screen.getByRole('button', {name: 'Column Selection'})).toBeEnabled();
+    expect(screen.getByRole('button', {name: 'Column Selection'})).toHaveTextContent(
+      'transaction.duration'
+    );
+    expect(screen.getByRole('button', {name: 'Aggregate Selection'})).toHaveTextContent(
+      'p95'
+    );
+  });
+
+  it('maintains the selected aggregate when the column selection is changed and there are parameters', async () => {
+    render(
+      <WidgetBuilderProvider>
+        <Visualize />
+      </WidgetBuilderProvider>,
+      {
+        organization,
+        router: RouterFixture({
+          location: LocationFixture({
+            query: {
+              yAxis: ['max(spans.db)'],
+              dataset: WidgetType.TRANSACTIONS,
+              displayType: DisplayType.LINE,
+            },
+          }),
+        }),
+      }
+    );
+
+    await userEvent.click(screen.getByRole('button', {name: 'Aggregate Selection'}));
+    await userEvent.click(screen.getByRole('option', {name: 'p95'}));
+
+    expect(screen.getByRole('button', {name: 'Column Selection'})).toHaveTextContent(
+      'spans.db'
+    );
+    expect(screen.getByRole('button', {name: 'Aggregate Selection'})).toHaveTextContent(
+      'p95'
+    );
+  });
+
+  it('allows adding equations', async () => {
+    render(
+      <WidgetBuilderProvider>
+        <Visualize />
+      </WidgetBuilderProvider>,
+      {
+        organization,
+        router: RouterFixture({
+          location: LocationFixture({
+            query: {
+              yAxis: ['count()'],
+              dataset: WidgetType.TRANSACTIONS,
+              displayType: DisplayType.LINE,
+            },
+          }),
+        }),
+      }
+    );
+
+    await userEvent.click(screen.getByRole('button', {name: 'Add Equation'}));
+
+    expect(screen.getByLabelText('Equation')).toBeInTheDocument();
+
+    await userEvent.click(screen.getByLabelText('Equation'));
+
+    // Check the menu items
+    const headers = screen.getAllByRole('banner');
+    expect(headers[0]).toHaveTextContent('Fields');
+    expect(headers[1]).toHaveTextContent('Operators');
+    expect(screen.getByRole('listitem', {name: 'count()'})).toBeInTheDocument();
+
+    // Make a selection and type in the equation
+    await userEvent.click(screen.getByRole('listitem', {name: 'count()'}));
+    await userEvent.type(screen.getByLabelText('Equation'), '* 2');
+
+    expect(screen.getByLabelText('Equation')).toHaveValue('count() * 2');
+  });
+
+  it('renders a field without an aggregate in tables', async () => {
+    render(
+      <WidgetBuilderProvider>
+        <Visualize />
+      </WidgetBuilderProvider>,
+      {
+        organization,
+        router: RouterFixture({
+          location: LocationFixture({
+            query: {
+              field: ['transaction.duration'],
+              dataset: WidgetType.TRANSACTIONS,
+              displayType: DisplayType.TABLE,
+            },
+          }),
+        }),
+      }
+    );
+
+    expect(
+      await screen.findByRole('button', {name: 'Column Selection'})
+    ).toHaveTextContent('transaction.duration');
+    expect(screen.getByRole('button', {name: 'Aggregate Selection'})).toHaveTextContent(
+      'None'
+    );
+  });
+
+  it('allows setting a field without an aggregate in tables', async () => {
+    render(
+      <WidgetBuilderProvider>
+        <Visualize />
+      </WidgetBuilderProvider>,
+      {
+        organization,
+        router: RouterFixture({
+          location: LocationFixture({
+            query: {
+              field: ['count()'],
+              dataset: WidgetType.TRANSACTIONS,
+              displayType: DisplayType.TABLE,
+            },
+          }),
+        }),
+      }
+    );
+
+    await userEvent.click(screen.getByRole('button', {name: 'Aggregate Selection'}));
+    await userEvent.click(screen.getByRole('option', {name: 'None'}));
+
+    await userEvent.click(screen.getByRole('button', {name: 'Column Selection'}));
+    await userEvent.click(screen.getByRole('option', {name: 'transaction.duration'}));
+
+    expect(screen.getByRole('button', {name: 'Column Selection'})).toHaveTextContent(
+      'transaction.duration'
+    );
+    expect(screen.getByRole('button', {name: 'Aggregate Selection'})).toHaveTextContent(
+      'None'
+    );
+  });
+
+  it('allows setting an equation in tables', async () => {
+    render(
+      <WidgetBuilderProvider>
+        <Visualize />
+      </WidgetBuilderProvider>,
+      {
+        organization,
+        router: RouterFixture({
+          location: LocationFixture({
+            query: {
+              field: ['count()'],
+              dataset: WidgetType.TRANSACTIONS,
+              displayType: DisplayType.TABLE,
+            },
+          }),
+        }),
+      }
+    );
+
+    await userEvent.click(screen.getByRole('button', {name: 'Add Equation'}));
+    await userEvent.click(screen.getByLabelText('Equation'));
+    await userEvent.click(screen.getByRole('listitem', {name: 'count()'}));
+    await userEvent.type(screen.getByLabelText('Equation'), '* 2');
+
+    expect(screen.getByLabelText('Equation')).toHaveValue('count() * 2');
+  });
+
+  it('maintains the selected column when switching from field to aggregate', async () => {
+    render(
+      <WidgetBuilderProvider>
+        <Visualize />
+      </WidgetBuilderProvider>,
+      {
+        organization,
+        router: RouterFixture({
+          location: LocationFixture({
+            query: {
+              yAxis: ['transaction.duration'],
+              dataset: WidgetType.TRANSACTIONS,
+              displayType: DisplayType.LINE,
+            },
+          }),
+        }),
+      }
+    );
+
+    await userEvent.click(screen.getByRole('button', {name: 'Aggregate Selection'}));
+    await userEvent.click(screen.getByRole('option', {name: 'p95'}));
+
+    expect(screen.getByRole('button', {name: 'Column Selection'})).toHaveTextContent(
+      'transaction.duration'
+    );
+  });
+
+  it('maintains the selected column when switching from aggregate to aggregate', async () => {
+    render(
+      <WidgetBuilderProvider>
+        <Visualize />
+      </WidgetBuilderProvider>,
+      {
+        organization,
+        router: RouterFixture({
+          location: LocationFixture({
+            query: {
+              field: ['max(spans.db)'],
+              dataset: WidgetType.TRANSACTIONS,
+              displayType: DisplayType.TABLE,
+            },
+          }),
+        }),
+      }
+    );
+
+    await userEvent.click(screen.getByRole('button', {name: 'Aggregate Selection'}));
+    await userEvent.click(screen.getByRole('option', {name: 'p95'}));
+
+    expect(screen.getByRole('button', {name: 'Column Selection'})).toHaveTextContent(
+      'spans.db'
+    );
+  });
+
+  it('properly transitions between aggregates of higher to no parameter count', async () => {
+    render(
+      <WidgetBuilderProvider>
+        <Visualize />
+      </WidgetBuilderProvider>,
+      {
+        organization,
+        router: RouterFixture({
+          location: LocationFixture({
+            query: {
+              field: ['count_if(transaction.duration,equals,testValue)'],
+              dataset: WidgetType.TRANSACTIONS,
+              displayType: DisplayType.TABLE,
+            },
+          }),
+        }),
+      }
+    );
+
+    await userEvent.click(screen.getByRole('button', {name: 'Aggregate Selection'}));
+    await userEvent.click(screen.getByRole('option', {name: 'count'}));
+
+    expect(screen.getByRole('button', {name: 'Column Selection'})).toHaveTextContent(
+      'None'
+    );
+    expect(screen.getByRole('button', {name: 'Aggregate Selection'})).toHaveTextContent(
+      'count'
+    );
+    expect(mockNavigate).toHaveBeenCalledWith(
+      expect.objectContaining({
+        query: expect.objectContaining({
+          field: ['count()'],
+        }),
+      })
+    );
+  });
+
+  it('properly transitions between aggregates of higher to lower parameter count', async () => {
+    render(
+      <WidgetBuilderProvider>
+        <Visualize />
+      </WidgetBuilderProvider>,
+      {
+        organization,
+        router: RouterFixture({
+          location: LocationFixture({
+            query: {
+              field: ['count_if(transaction.duration,equals,testValue)'],
+              dataset: WidgetType.TRANSACTIONS,
+              displayType: DisplayType.TABLE,
+            },
+          }),
+        }),
+      }
+    );
+
+    await userEvent.click(screen.getByRole('button', {name: 'Aggregate Selection'}));
+    await userEvent.click(screen.getByRole('option', {name: 'count_miserable'}));
+
+    expect(screen.getByRole('button', {name: 'Column Selection'})).toHaveTextContent(
+      'transaction.duration'
+    );
+    expect(screen.getByRole('button', {name: 'Aggregate Selection'})).toHaveTextContent(
+      'count_miserable'
+    );
+    expect(screen.getByDisplayValue('300')).toBeInTheDocument();
+    expect(mockNavigate).toHaveBeenCalledWith(
+      expect.objectContaining({
+        query: expect.objectContaining({
+          field: ['count_miserable(transaction.duration,300)'],
+        }),
+      })
+    );
+  });
+
+  it('adds the default value for an aggregate with 2 parameters', async () => {
+    render(
+      <WidgetBuilderProvider>
+        <Visualize />
+      </WidgetBuilderProvider>,
+      {
+        organization,
+        router: RouterFixture({
+          location: LocationFixture({
+            query: {
+              field: ['transaction.duration'],
+              dataset: WidgetType.TRANSACTIONS,
+              displayType: DisplayType.TABLE,
+            },
+          }),
+        }),
+      }
+    );
+
+    await userEvent.click(screen.getByRole('button', {name: 'Aggregate Selection'}));
+    await userEvent.click(screen.getByRole('option', {name: 'count_miserable'}));
+
+    // TODO: This is supposed to only allow the user field
+    expect(screen.getByRole('button', {name: 'Column Selection'})).toHaveTextContent(
+      'transaction.duration'
+    );
+  });
+
+  it('adds the default values for an aggregate with 3 parameters', async () => {
+    render(
+      <WidgetBuilderProvider>
+        <Visualize />
+      </WidgetBuilderProvider>,
+      {
+        organization,
+        router: RouterFixture({
+          location: LocationFixture({
+            query: {
+              field: ['transaction'],
+              dataset: WidgetType.TRANSACTIONS,
+              displayType: DisplayType.TABLE,
+            },
+          }),
+        }),
+      }
+    );
+
+    await userEvent.click(screen.getByRole('button', {name: 'Aggregate Selection'}));
+    await userEvent.click(screen.getByRole('option', {name: 'count_if'}));
+
+    expect(screen.getByRole('button', {name: 'Column Selection'})).toHaveTextContent(
+      'transaction'
+    );
+    expect(screen.getByRole('button', {name: 'Aggregate Selection'})).toHaveTextContent(
+      'count_if'
+    );
+    expect(screen.getByText('is equal to')).toBeInTheDocument();
+    expect(screen.getByDisplayValue('300')).toBeInTheDocument();
+  });
+
+  it('disables the aggregate selection when there is only one aggregate option', async () => {
+    render(
+      <WidgetBuilderProvider>
+        <Visualize />
+      </WidgetBuilderProvider>,
+      {
+        organization,
+        router: RouterFixture({
+          location: LocationFixture({
+            query: {
+              dataset: WidgetType.ISSUE,
+              field: ['issue.id'],
+              displayType: DisplayType.TABLE,
+            },
+          }),
+        }),
+      }
+    );
+
+    expect(
+      await screen.findByRole('button', {name: 'Aggregate Selection'})
+    ).toBeDisabled();
+  });
+
+  it('does not show the legend alias input for chart widgets', async () => {
+    render(
+      <WidgetBuilderProvider>
+        <Visualize />
+      </WidgetBuilderProvider>,
+      {
+        organization,
+        router: RouterFixture({
+          location: LocationFixture({
+            query: {
+              dataset: WidgetType.TRANSACTIONS,
+              displayType: DisplayType.LINE,
+              yAxis: ['p90(transaction.duration)'],
+            },
+          }),
+        }),
+      }
+    );
+
+    expect(
+      await screen.findByRole('button', {name: 'Column Selection'})
+    ).toHaveTextContent('transaction.duration');
+    expect(
+      await screen.findByRole('button', {name: 'Aggregate Selection'})
+    ).toHaveTextContent('p90');
+    expect(screen.queryByLabelText('Legend Alias')).not.toBeInTheDocument();
+  });
+
   describe('spans', () => {
     beforeEach(() => {
       jest.mocked(useSpanTags).mockImplementation((type?: 'string' | 'number') => {
         if (type === 'number') {
           return {
-            'tags[span.duration,number]': {
+            'span.duration': {
               key: 'span.duration',
               name: 'span.duration',
               kind: 'measurement',
@@ -184,5 +648,61 @@ describe('Visualize', () => {
       expect(screen.getByText('p100')).toBeInTheDocument();
       expect(screen.getByText('sum')).toBeInTheDocument();
     });
+
+    it('shows the correct column options for the aggregate field type', async () => {
+      render(
+        <WidgetBuilderProvider>
+          <Visualize />
+        </WidgetBuilderProvider>,
+        {
+          organization,
+          router: RouterFixture({
+            location: LocationFixture({
+              query: {
+                dataset: WidgetType.SPANS,
+                displayType: DisplayType.TABLE,
+                field: ['p90(span.duration)'],
+              },
+            }),
+          }),
+        }
+      );
+
+      await userEvent.click(
+        await screen.findByRole('button', {name: 'Column Selection'})
+      );
+
+      const listbox = await screen.findByRole('listbox', {name: 'Column Selection'});
+      expect(within(listbox).getByText('span.duration')).toBeInTheDocument();
+      expect(within(listbox).getByText('anotherNumericTag')).toBeInTheDocument();
+    });
+
+    it('shows the correct column options for the non-aggregate field type', async () => {
+      render(
+        <WidgetBuilderProvider>
+          <Visualize />
+        </WidgetBuilderProvider>,
+        {
+          organization,
+          router: RouterFixture({
+            location: LocationFixture({
+              query: {
+                dataset: WidgetType.SPANS,
+                displayType: DisplayType.TABLE,
+                field: ['span.duration'],
+              },
+            }),
+          }),
+        }
+      );
+
+      await userEvent.click(
+        await screen.findByRole('button', {name: 'Column Selection'})
+      );
+
+      const listbox = await screen.findByRole('listbox', {name: 'Column Selection'});
+      expect(within(listbox).getByText('span.duration')).toBeInTheDocument();
+      expect(within(listbox).getByText('span.description')).toBeInTheDocument();
+    });
   });
 });
diff --git a/static/app/views/dashboards/widgetBuilder/components/visualize.tsx b/static/app/views/dashboards/widgetBuilder/components/visualize.tsx
index 7d1cd1bc312f3b..3372382e81b93d 100644
--- a/static/app/views/dashboards/widgetBuilder/components/visualize.tsx
+++ b/static/app/views/dashboards/widgetBuilder/components/visualize.tsx
@@ -1,18 +1,24 @@
 import {Fragment, useMemo} from 'react';
 import styled from '@emotion/styled';
+import cloneDeep from 'lodash/cloneDeep';
 
 import {Button} from 'sentry/components/button';
 import {CompactSelect} from 'sentry/components/compactSelect';
+import SelectControl from 'sentry/components/forms/controls/selectControl';
 import Input from 'sentry/components/input';
 import {IconDelete} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import {
   type AggregationKeyWithAlias,
+  type AggregationRefinement,
+  classifyTagKey,
   generateFieldAsString,
   parseFunction,
   prettifyTagKey,
+  type QueryFieldValue,
 } from 'sentry/utils/discover/fields';
+import {FieldKind} from 'sentry/utils/fields';
 import useCustomMeasurements from 'sentry/utils/useCustomMeasurements';
 import useOrganization from 'sentry/utils/useOrganization';
 import useTags from 'sentry/utils/useTags';
@@ -21,9 +27,30 @@ import {DisplayType, WidgetType} from 'sentry/views/dashboards/types';
 import {SectionHeader} from 'sentry/views/dashboards/widgetBuilder/components/common/sectionHeader';
 import {useWidgetBuilderContext} from 'sentry/views/dashboards/widgetBuilder/contexts/widgetBuilderContext';
 import {BuilderStateAction} from 'sentry/views/dashboards/widgetBuilder/hooks/useWidgetBuilderState';
+import ArithmeticInput from 'sentry/views/discover/table/arithmeticInput';
+import {
+  BufferedInput,
+  type ParameterDescription,
+} from 'sentry/views/discover/table/queryField';
 import {FieldValueKind} from 'sentry/views/discover/table/types';
+import {TypeBadge} from 'sentry/views/explore/components/typeBadge';
 import {useSpanTags} from 'sentry/views/explore/contexts/spanTagsContext';
 
+type AggregateFunction = [
+  AggregationKeyWithAlias,
+  string,
+  AggregationRefinement,
+  AggregationRefinement,
+];
+
+const MAX_FUNCTION_PARAMETERS = 4;
+const NONE = 'none';
+
+const NONE_AGGREGATE = {
+  label: t('None'),
+  value: NONE,
+};
+
 function Visualize() {
   const organization = useOrganization();
   const {state, dispatch} = useWidgetBuilderContext();
@@ -35,10 +62,65 @@ function Visualize() {
     state.displayType !== DisplayType.BIG_NUMBER;
   const numericSpanTags = useSpanTags('number');
   const stringSpanTags = useSpanTags('string');
-  if (state.dataset === WidgetType.SPANS && isChartWidget) {
-    tags = numericSpanTags;
-  } else if (state.dataset === WidgetType.SPANS && !isChartWidget) {
-    tags = stringSpanTags;
+
+  // Span column options are explicitly defined and bypass all of the
+  // fieldOptions filtering and logic used for showing options for
+  // chart types.
+  let spanColumnOptions;
+  if (state.dataset === WidgetType.SPANS) {
+    // Explicitly merge numeric and string tags to ensure filtering
+    // compatibility for timeseries chart types.
+    tags = {...numericSpanTags, ...stringSpanTags};
+
+    const columns =
+      state.fields
+        ?.filter(field => field.kind === FieldValueKind.FIELD)
+        .map(field => field.field) ?? [];
+    spanColumnOptions = [
+      // Columns that are not in the tag responses, e.g. old tags
+      ...columns
+        .filter(
+          column =>
+            column !== '' &&
+            !stringSpanTags.hasOwnProperty(column) &&
+            !numericSpanTags.hasOwnProperty(column)
+        )
+        .map(column => {
+          return {
+            label: prettifyTagKey(column),
+            value: column,
+            textValue: column,
+            trailingItems: <TypeBadge kind={classifyTagKey(column)} />,
+          };
+        }),
+      ...Object.values(stringSpanTags).map(tag => {
+        return {
+          label: tag.name,
+          value: tag.key,
+          textValue: tag.name,
+          trailingItems: <TypeBadge kind={FieldKind.TAG} />,
+        };
+      }),
+      ...Object.values(numericSpanTags).map(tag => {
+        return {
+          label: tag.name,
+          value: tag.key,
+          textValue: tag.name,
+          trailingItems: <TypeBadge kind={FieldKind.MEASUREMENT} />,
+        };
+      }),
+    ];
+    spanColumnOptions.sort((a, b) => {
+      if (a.label < b.label) {
+        return -1;
+      }
+
+      if (a.label > b.label) {
+        return 1;
+      }
+
+      return 0;
+    });
   }
 
   const datasetConfig = useMemo(() => getDatasetConfig(state.dataset), [state.dataset]);
@@ -53,11 +135,7 @@ function Visualize() {
     [organization, tags, customMeasurements, datasetConfig]
   );
 
-  // TODO: no parameters should show up as primary options?
-  // let aggregateOptions = Object.values(fieldOptions).filter(
-  //   option => option.value.kind === 'function' && option.value.meta.parameters.length > 0
-  // );
-  const aggregateOptions = useMemo(
+  const aggregates = useMemo(
     () =>
       Object.values(fieldOptions).filter(option =>
         datasetConfig.filterYAxisOptions?.(state.displayType ?? DisplayType.TABLE)(option)
@@ -83,16 +161,21 @@ function Visualize() {
           // For charts, we show aggregate parameter options for the y-axis as primary options.
           // For tables, we show all string tags and fields as primary options, as well
           // as aggregates that don't take parameters.
+          const columnFilterMethod = isChartWidget
+            ? datasetConfig.filterYAxisAggregateParams?.(
+                field,
+                state.displayType ?? DisplayType.LINE
+              )
+            : field.kind === FieldValueKind.FUNCTION
+              ? datasetConfig.filterAggregateParams
+              : datasetConfig.filterTableOptions;
           const columnOptions = Object.values(fieldOptions)
             .filter(option => {
+              // Don't show any aggregates under the columns, and if
+              // there isn't a filter method, just show the option
               return (
-                // TODO: This should allow for aggregates without parameters
                 option.value.kind !== FieldValueKind.FUNCTION &&
-                (datasetConfig.filterYAxisAggregateParams?.(
-                  field,
-                  state.displayType ?? DisplayType.TABLE
-                )?.(option) ??
-                  true)
+                (columnFilterMethod?.(option, field) ?? true)
               );
             })
             .map(option => ({
@@ -101,64 +184,266 @@ function Visualize() {
                 state.dataset === WidgetType.SPANS
                   ? prettifyTagKey(option.value.meta.name)
                   : option.value.meta.name,
+
+              // For the spans dataset, all of the options are measurements,
+              // so we force the number badge to show
+              trailingItems:
+                state.dataset === WidgetType.SPANS ? (
+                  <TypeBadge kind={FieldKind.MEASUREMENT} />
+                ) : null,
             }));
 
+          let aggregateOptions = aggregates.map(option => ({
+            value: option.value.meta.name,
+            label: option.value.meta.name,
+          }));
+          aggregateOptions = isChartWidget
+            ? aggregateOptions
+            : [NONE_AGGREGATE, ...aggregateOptions];
+
+          let matchingAggregate;
+          if (
+            fields[index]!.kind === FieldValueKind.FUNCTION &&
+            FieldValueKind.FUNCTION in fields[index]!
+          ) {
+            matchingAggregate = aggregates.find(
+              option =>
+                option.value.meta.name ===
+                parseFunction(stringFields?.[index] ?? '')?.name
+            );
+          }
+
+          const parameterRefinements =
+            matchingAggregate?.value.meta.parameters.length > 1
+              ? matchingAggregate?.value.meta.parameters.slice(1)
+              : [];
+
           return (
             <FieldRow key={index}>
               <FieldBar data-testid={'field-bar'}>
-                <ColumnCompactSelect
-                  searchable
-                  options={columnOptions}
-                  value={parseFunction(stringFields?.[index] ?? '')?.arguments[0] ?? ''}
-                  onChange={newField => {
-                    // TODO: Handle scalars (i.e. no aggregate, for tables)
-                    // Update the current field's aggregate with the new aggregate
-                    if (field.kind === 'function') {
-                      field.function[1] = newField.value as string;
-                    }
-                    dispatch({
-                      type: updateAction,
-                      payload: fields,
-                    });
-                  }}
-                  triggerProps={{
-                    'aria-label': t('Column Selection'),
-                  }}
-                />
-                {/* TODO: Add equation options */}
-                {/* TODO: Handle aggregates with no parameters */}
-                {/* TODO: Handle aggregates with multiple parameters */}
-                <AggregateCompactSelect
-                  options={aggregateOptions.map(option => ({
-                    value: option.value.meta.name,
-                    label: option.value.meta.name,
-                  }))}
-                  value={parseFunction(stringFields?.[index] ?? '')?.name ?? ''}
-                  onChange={newAggregate => {
-                    // TODO: Handle scalars (i.e. no aggregate, for tables)
-                    // Update the current field's aggregate with the new aggregate
-                    const currentField = fields?.[index];
-                    if (currentField.kind === 'function') {
-                      currentField.function[0] =
-                        newAggregate.value as AggregationKeyWithAlias;
+                {field.kind === FieldValueKind.EQUATION ? (
+                  <StyledArithmeticInput
+                    name="arithmetic"
+                    key="parameter:text"
+                    type="text"
+                    required
+                    value={field.field}
+                    onUpdate={value =>
+                      dispatch({
+                        type: updateAction,
+                        payload: fields.map((_field, i) =>
+                          i === index ? {..._field, field: value} : _field
+                        ),
+                      })
                     }
-                    dispatch({
-                      type: updateAction,
-                      payload: fields,
-                    });
-                  }}
-                  triggerProps={{
-                    'aria-label': t('Aggregate Selection'),
-                  }}
-                />
+                    options={fields}
+                    placeholder={t('Equation')}
+                    aria-label={t('Equation')}
+                  />
+                ) : (
+                  <Fragment>
+                    <PrimarySelectRow>
+                      <ColumnCompactSelect
+                        searchable
+                        options={
+                          state.dataset === WidgetType.SPANS &&
+                          field.kind !== FieldValueKind.FUNCTION
+                            ? spanColumnOptions
+                            : columnOptions
+                        }
+                        value={
+                          field.kind === FieldValueKind.FUNCTION
+                            ? parseFunction(stringFields?.[index] ?? '')?.arguments[0] ??
+                              ''
+                            : field.field
+                        }
+                        onChange={newField => {
+                          // Update the current field's aggregate with the new aggregate
+                          if (field.kind === FieldValueKind.FUNCTION) {
+                            field.function[1] = newField.value as string;
+                          }
+                          if (field.kind === FieldValueKind.FIELD) {
+                            field.field = newField.value as string;
+                          }
+                          dispatch({
+                            type: updateAction,
+                            payload: fields,
+                          });
+                        }}
+                        triggerProps={{
+                          'aria-label': t('Column Selection'),
+                        }}
+                        disabled={
+                          fields[index]!.kind === FieldValueKind.FUNCTION &&
+                          matchingAggregate?.value.meta.parameters.length === 0
+                        }
+                      />
+                      <AggregateCompactSelect
+                        disabled={aggregateOptions.length <= 1}
+                        options={aggregateOptions}
+                        value={parseFunction(stringFields?.[index] ?? '')?.name ?? ''}
+                        onChange={aggregateSelection => {
+                          const isNone = aggregateSelection.value === NONE;
+                          const newFields = cloneDeep(fields);
+                          const currentField = newFields[index]!;
+                          const newAggregate = aggregates.find(
+                            option => option.value.meta.name === aggregateSelection.value
+                          );
+                          // Update the current field's aggregate with the new aggregate
+                          if (!isNone) {
+                            if (currentField.kind === FieldValueKind.FUNCTION) {
+                              // Handle setting an aggregate from an aggregate
+                              currentField.function[0] =
+                                aggregateSelection.value as AggregationKeyWithAlias;
+                              if (
+                                newAggregate?.value.meta &&
+                                'parameters' in newAggregate.value.meta
+                              ) {
+                                // There are aggregates that have no parameters, so wipe out the argument
+                                // if it's supposed to be empty
+                                if (newAggregate.value.meta.parameters.length === 0) {
+                                  currentField.function[1] = '';
+                                } else {
+                                  currentField.function[1] =
+                                    (currentField.function[1] ||
+                                      newAggregate.value.meta.parameters[0]!
+                                        .defaultValue) ??
+                                    '';
+                                  // Set the remaining parameters for the new aggregate
+                                  for (
+                                    let i = 1; // The first parameter is the column selection
+                                    i < newAggregate.value.meta.parameters.length;
+                                    i++
+                                  ) {
+                                    // Increment by 1 to skip past the aggregate name
+                                    currentField.function[i + 1] =
+                                      newAggregate.value.meta.parameters[i]!.defaultValue;
+                                  }
+                                }
+
+                                // Wipe out the remaining parameters that are unnecessary
+                                // This is necessary for transitioning between aggregates that have
+                                // more parameters to ones of fewer parameters
+                                for (
+                                  let i = newAggregate.value.meta.parameters.length;
+                                  i < MAX_FUNCTION_PARAMETERS;
+                                  i++
+                                ) {
+                                  currentField.function[i + 1] = undefined;
+                                }
+                              }
+                            } else {
+                              if (
+                                !newAggregate ||
+                                !('parameters' in newAggregate.value.meta)
+                              ) {
+                                return;
+                              }
+
+                              // Handle setting an aggregate from a field
+                              const newFunction: AggregateFunction = [
+                                aggregateSelection.value as AggregationKeyWithAlias,
+                                (currentField.field ||
+                                  newAggregate?.value.meta?.parameters?.[0]
+                                    ?.defaultValue) ??
+                                  '',
+                                newAggregate?.value.meta?.parameters?.[1]?.defaultValue ??
+                                  undefined,
+                                newAggregate?.value.meta?.parameters?.[2]?.defaultValue ??
+                                  undefined,
+                              ];
+                              if (
+                                newAggregate?.value.meta &&
+                                'parameters' in newAggregate.value.meta
+                              ) {
+                                newAggregate?.value.meta.parameters.forEach(
+                                  (parameter, parameterIndex) => {
+                                    // Increment by 1 to skip past the aggregate name
+                                    newFunction[parameterIndex + 1] =
+                                      newFunction[parameterIndex + 1] ??
+                                      parameter.defaultValue;
+                                  }
+                                );
+                              }
+                              newFields[index] = {
+                                kind: FieldValueKind.FUNCTION,
+                                function: newFunction,
+                              };
+                            }
+                          } else {
+                            // Handle selecting None so we can select just a field, e.g. for samples
+                            // If none is selected, set the field to a field value
+                            newFields[index] = {
+                              kind: FieldValueKind.FIELD,
+                              field:
+                                'function' in currentField
+                                  ? (currentField.function[1] as string) ??
+                                    columnOptions[0]!.value
+                                  : '',
+                            };
+                          }
+                          dispatch({
+                            type: updateAction,
+                            payload: newFields,
+                          });
+                        }}
+                        triggerProps={{
+                          'aria-label': t('Aggregate Selection'),
+                        }}
+                      />
+                    </PrimarySelectRow>
+                    {field.kind === FieldValueKind.FUNCTION &&
+                      parameterRefinements.length > 0 && (
+                        <ParameterRefinements>
+                          {parameterRefinements.map((parameter, parameterIndex) => {
+                            // The current value is displaced by 2 because the first two parameters
+                            // are the aggregate name and the column selection
+                            const currentValue = field.function[parameterIndex + 2] || '';
+                            const key = `${field.function.join('_')}-${parameterIndex}`;
+                            return (
+                              <AggregateParameter
+                                key={key}
+                                parameter={parameter}
+                                fieldValue={field}
+                                currentValue={currentValue}
+                                onChange={value => {
+                                  const newFields = cloneDeep(fields);
+                                  if (
+                                    newFields[index]!.kind !== FieldValueKind.FUNCTION
+                                  ) {
+                                    return;
+                                  }
+                                  newFields[index]!.function[parameterIndex + 2] = value;
+                                  dispatch({
+                                    type: updateAction,
+                                    payload: newFields,
+                                  });
+                                }}
+                              />
+                            );
+                          })}
+                        </ParameterRefinements>
+                      )}
+                  </Fragment>
+                )}
               </FieldBar>
-              <FieldExtras>
-                <LegendAliasInput
-                  type="text"
-                  name="name"
-                  placeholder={t('Add Alias')}
-                  onChange={() => {}}
-                />
+              <FieldExtras isChartWidget={isChartWidget}>
+                {!isChartWidget && (
+                  <LegendAliasInput
+                    type="text"
+                    name="name"
+                    placeholder={t('Add Alias')}
+                    value={field.alias}
+                    onChange={e => {
+                      const newFields = cloneDeep(fields);
+                      newFields[index]!.alias = e.target.value;
+                      dispatch({
+                        type: updateAction,
+                        payload: newFields,
+                      });
+                    }}
+                  />
+                )}
                 <StyledDeleteButton
                   borderless
                   icon={<IconDelete />}
@@ -185,22 +470,26 @@ function Visualize() {
           onClick={() =>
             dispatch({
               type: updateAction,
-              payload: [
-                ...(fields ?? []),
-                // TODO: Define a default aggregate/field for the datasets?
-                {
-                  function: ['count', '', undefined, undefined],
-                  kind: 'function',
-                },
-              ],
+              payload: [...(fields ?? []), datasetConfig.defaultField],
             })
           }
         >
-          {t('+ Add Series')}
-        </AddButton>
-        <AddButton priority="link" aria-label={t('Add Equation')} onClick={() => {}}>
-          {t('+ Add Equation')}
+          {isChartWidget ? t('+ Add Series') : t('+ Add Field')}
         </AddButton>
+        {datasetConfig.enableEquations && (
+          <AddButton
+            priority="link"
+            aria-label={t('Add Equation')}
+            onClick={() =>
+              dispatch({
+                type: updateAction,
+                payload: [...(fields ?? []), {kind: FieldValueKind.EQUATION, field: ''}],
+              })
+            }
+          >
+            {t('+ Add Equation')}
+          </AddButton>
+        )}
       </AddButtons>
     </Fragment>
   );
@@ -208,6 +497,80 @@ function Visualize() {
 
 export default Visualize;
 
+function AggregateParameter({
+  parameter,
+  fieldValue,
+  onChange,
+  currentValue,
+}: {
+  currentValue: string;
+  fieldValue: QueryFieldValue;
+  onChange: (value: string) => void;
+  parameter: ParameterDescription;
+}) {
+  if (parameter.kind === 'value') {
+    const inputProps = {
+      required: parameter.required,
+      value:
+        parameter.value ?? ('defaultValue' in parameter && parameter?.defaultValue) ?? '',
+      onUpdate: value => {
+        onChange(value);
+      },
+      placeholder: parameter.placeholder,
+    };
+    switch (parameter.dataType) {
+      case 'number':
+        return (
+          <BufferedInput
+            name="refinement"
+            key="parameter:number"
+            type="text"
+            inputMode="numeric"
+            pattern="[0-9]*(\.[0-9]*)?"
+            {...inputProps}
+          />
+        );
+      case 'integer':
+        return (
+          <BufferedInput
+            name="refinement"
+            key="parameter:integer"
+            type="text"
+            inputMode="numeric"
+            pattern="[0-9]*"
+            {...inputProps}
+          />
+        );
+      default:
+        return (
+          <BufferedInput
+            name="refinement"
+            key="parameter:text"
+            type="text"
+            {...inputProps}
+          />
+        );
+    }
+  }
+  if (parameter.kind === 'dropdown') {
+    return (
+      <SelectControl
+        key="dropdown"
+        name="dropdown"
+        menuPlacement="auto"
+        placeholder={t('Select value')}
+        options={parameter.options}
+        value={currentValue}
+        required={parameter.required}
+        onChange={({value}) => {
+          onChange(value);
+        }}
+      />
+    );
+  }
+  throw new Error(`Unknown parameter type encountered for ${fieldValue}`);
+}
+
 const ColumnCompactSelect = styled(CompactSelect)`
   flex: 1 1 auto;
   min-width: 0;
@@ -229,8 +592,26 @@ const AggregateCompactSelect = styled(CompactSelect)`
 
 const LegendAliasInput = styled(Input)``;
 
+const ParameterRefinements = styled('div')`
+  display: flex;
+  flex-direction: row;
+  gap: ${space(1)};
+
+  > * {
+    flex: 1;
+  }
+`;
+
 const FieldBar = styled('div')`
+  display: grid;
+  grid-template-columns: 1fr;
+  gap: ${space(1)};
+  flex: 3;
+`;
+
+const PrimarySelectRow = styled('div')`
   display: flex;
+  width: 100%;
   flex: 3;
 
   & > ${ColumnCompactSelect} > button {
@@ -252,11 +633,11 @@ const FieldRow = styled('div')`
 
 const StyledDeleteButton = styled(Button)``;
 
-const FieldExtras = styled('div')`
+const FieldExtras = styled('div')<{isChartWidget: boolean}>`
   display: flex;
   flex-direction: row;
   gap: ${space(1)};
-  flex: 1;
+  flex: ${p => (p.isChartWidget ? '0' : '1')};
 `;
 
 const AddButton = styled(Button)`
@@ -273,3 +654,7 @@ const Fields = styled('div')`
   flex-direction: column;
   gap: ${space(1)};
 `;
+
+const StyledArithmeticInput = styled(ArithmeticInput)`
+  width: 100%;
+`;
diff --git a/static/app/views/dashboards/widgetBuilder/components/widgetBuilderSlideout.spec.tsx b/static/app/views/dashboards/widgetBuilder/components/widgetBuilderSlideout.spec.tsx
new file mode 100644
index 00000000000000..01473de659dc41
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/components/widgetBuilderSlideout.spec.tsx
@@ -0,0 +1,255 @@
+import {DashboardFixture} from 'sentry-fixture/dashboard';
+import {LocationFixture} from 'sentry-fixture/locationFixture';
+import {OrganizationFixture} from 'sentry-fixture/organization';
+import {RouterFixture} from 'sentry-fixture/routerFixture';
+
+import {
+  render,
+  renderGlobalModal,
+  screen,
+  userEvent,
+  waitFor,
+} from 'sentry-test/reactTestingLibrary';
+
+import {addErrorMessage} from 'sentry/actionCreators/indicator';
+import ModalStore from 'sentry/stores/modalStore';
+import useCustomMeasurements from 'sentry/utils/useCustomMeasurements';
+import {DisplayType, WidgetType} from 'sentry/views/dashboards/types';
+import WidgetBuilderSlideout from 'sentry/views/dashboards/widgetBuilder/components/widgetBuilderSlideout';
+import {WidgetBuilderProvider} from 'sentry/views/dashboards/widgetBuilder/contexts/widgetBuilderContext';
+import {useSpanTags} from 'sentry/views/explore/contexts/spanTagsContext';
+
+jest.mock('sentry/utils/useCustomMeasurements');
+jest.mock('sentry/views/explore/contexts/spanTagsContext');
+jest.mock('sentry/actionCreators/indicator');
+
+describe('WidgetBuilderSlideout', () => {
+  let organization!: ReturnType<typeof OrganizationFixture>;
+  beforeEach(() => {
+    organization = OrganizationFixture();
+
+    jest.mocked(useCustomMeasurements).mockReturnValue({
+      customMeasurements: {},
+    });
+
+    jest.mocked(useSpanTags).mockReturnValue({});
+
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/recent-searches/',
+    });
+
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/dashboards/widgets/',
+      method: 'POST',
+      body: {
+        title: 'Title is required during creation',
+      },
+      statusCode: 400,
+    });
+  });
+
+  afterEach(() => {
+    ModalStore.reset();
+  });
+
+  it('should show the sort by step if the widget is a chart and there are fields selected', async () => {
+    render(
+      <WidgetBuilderProvider>
+        <WidgetBuilderSlideout
+          dashboard={DashboardFixture([])}
+          dashboardFilters={{
+            release: undefined,
+          }}
+          isWidgetInvalid={false}
+          onClose={jest.fn()}
+          onQueryConditionChange={jest.fn()}
+          onSave={jest.fn()}
+          setIsPreviewDraggable={jest.fn()}
+          isOpen
+        />
+      </WidgetBuilderProvider>,
+      {
+        organization,
+        router: RouterFixture({
+          location: LocationFixture({
+            query: {
+              field: ['project'],
+              yAxis: ['count()'],
+              dataset: WidgetType.TRANSACTIONS,
+              displayType: DisplayType.LINE,
+            },
+          }),
+        }),
+      }
+    );
+
+    expect(await screen.findByText('Sort by')).toBeInTheDocument();
+    expect(await screen.findByText('Limit to 5 results')).toBeInTheDocument();
+    expect(await screen.findByText('High to low')).toBeInTheDocument();
+    expect(await screen.findByText('(Required)')).toBeInTheDocument();
+  });
+
+  it('should show the sort by step if the widget is a table', async () => {
+    render(
+      <WidgetBuilderProvider>
+        <WidgetBuilderSlideout
+          dashboard={DashboardFixture([])}
+          dashboardFilters={{
+            release: undefined,
+          }}
+          isWidgetInvalid={false}
+          onClose={jest.fn()}
+          onQueryConditionChange={jest.fn()}
+          onSave={jest.fn()}
+          setIsPreviewDraggable={jest.fn()}
+          isOpen
+        />
+      </WidgetBuilderProvider>,
+      {
+        organization,
+        router: RouterFixture({
+          location: LocationFixture({
+            query: {
+              field: [],
+              yAxis: [],
+              dataset: WidgetType.TRANSACTIONS,
+              displayType: DisplayType.TABLE,
+            },
+          }),
+        }),
+      }
+    );
+
+    expect(await screen.findByText('Sort by')).toBeInTheDocument();
+  });
+
+  it('should not show the sort by step if the widget is a chart without fields', async () => {
+    render(
+      <WidgetBuilderProvider>
+        <WidgetBuilderSlideout
+          dashboard={DashboardFixture([])}
+          dashboardFilters={{
+            release: undefined,
+          }}
+          isWidgetInvalid={false}
+          onClose={jest.fn()}
+          onQueryConditionChange={jest.fn()}
+          onSave={jest.fn()}
+          setIsPreviewDraggable={jest.fn()}
+          isOpen
+        />
+      </WidgetBuilderProvider>,
+      {
+        organization,
+        router: RouterFixture({
+          location: LocationFixture({
+            query: {
+              field: [],
+              yAxis: ['count()'],
+              dataset: WidgetType.TRANSACTIONS,
+              displayType: DisplayType.LINE,
+            },
+          }),
+        }),
+      }
+    );
+
+    expect(await screen.findByText('count')).toBeInTheDocument();
+    expect(screen.queryByText('Sort by')).not.toBeInTheDocument();
+  });
+
+  it('should show the confirm modal if the widget is unsaved', async () => {
+    render(
+      <WidgetBuilderProvider>
+        <WidgetBuilderSlideout
+          dashboard={DashboardFixture([])}
+          dashboardFilters={{release: undefined}}
+          isWidgetInvalid={false}
+          onClose={jest.fn()}
+          onQueryConditionChange={jest.fn()}
+          onSave={jest.fn()}
+          setIsPreviewDraggable={jest.fn()}
+          isOpen
+        />
+      </WidgetBuilderProvider>,
+      {organization}
+    );
+    renderGlobalModal();
+
+    await userEvent.type(await screen.findByPlaceholderText('Name'), 'some name');
+    await userEvent.click(await screen.findByText('Close'));
+
+    expect(screen.getByRole('dialog')).toBeInTheDocument();
+    expect(
+      screen.getByText('You have unsaved changes. Are you sure you want to leave?')
+    ).toBeInTheDocument();
+  });
+
+  it('should not show the confirm modal if the widget is unsaved', async () => {
+    render(
+      <WidgetBuilderProvider>
+        <WidgetBuilderSlideout
+          dashboard={DashboardFixture([])}
+          dashboardFilters={{release: undefined}}
+          isWidgetInvalid={false}
+          onClose={jest.fn()}
+          onQueryConditionChange={jest.fn()}
+          onSave={jest.fn()}
+          setIsPreviewDraggable={jest.fn()}
+          isOpen
+        />
+      </WidgetBuilderProvider>,
+      {organization}
+    );
+
+    renderGlobalModal();
+
+    await userEvent.click(await screen.findByText('Close'));
+
+    await waitFor(() => {
+      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
+    });
+    expect(
+      screen.queryByText('You have unsaved changes. Are you sure you want to leave?')
+    ).not.toBeInTheDocument();
+  });
+
+  it('should not save and close the widget builder if the widget is invalid', async () => {
+    render(
+      <WidgetBuilderProvider>
+        <WidgetBuilderSlideout
+          dashboard={DashboardFixture([])}
+          dashboardFilters={{release: undefined}}
+          isWidgetInvalid
+          onClose={jest.fn()}
+          onQueryConditionChange={jest.fn()}
+          onSave={jest.fn()}
+          setIsPreviewDraggable={jest.fn()}
+          isOpen
+        />
+      </WidgetBuilderProvider>,
+      {
+        organization,
+        router: RouterFixture({
+          location: LocationFixture({
+            query: {
+              field: [],
+              yAxis: ['count()'],
+              dataset: WidgetType.TRANSACTIONS,
+              displayType: DisplayType.LINE,
+              title: undefined,
+            },
+          }),
+        }),
+      }
+    );
+
+    await userEvent.click(await screen.findByText('Add Widget'));
+
+    await waitFor(() => {
+      expect(addErrorMessage).toHaveBeenCalledWith('Unable to save widget');
+    });
+
+    expect(screen.getByText('Create Custom Widget')).toBeInTheDocument();
+  });
+});
diff --git a/static/app/views/dashboards/widgetBuilder/components/widgetBuilderSlideout.tsx b/static/app/views/dashboards/widgetBuilder/components/widgetBuilderSlideout.tsx
index 10020cd7be614e..0d6f7828027bab 100644
--- a/static/app/views/dashboards/widgetBuilder/components/widgetBuilderSlideout.tsx
+++ b/static/app/views/dashboards/widgetBuilder/components/widgetBuilderSlideout.tsx
@@ -1,38 +1,93 @@
+import {useEffect, useRef, useState} from 'react';
+import {useTheme} from '@emotion/react';
 import styled from '@emotion/styled';
+import isEqual from 'lodash/isEqual';
 
 import {Button} from 'sentry/components/button';
+import {openConfirmModal} from 'sentry/components/confirm';
 import SlideOverPanel from 'sentry/components/slideOverPanel';
 import {IconClose} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
+import useMedia from 'sentry/utils/useMedia';
+import useOrganization from 'sentry/utils/useOrganization';
 import {useParams} from 'sentry/utils/useParams';
-import {DisplayType, type Widget} from 'sentry/views/dashboards/types';
+import {
+  type DashboardDetails,
+  type DashboardFilters,
+  DisplayType,
+  type Widget,
+  WidgetType,
+} 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 {WidgetPreviewContainer} from 'sentry/views/dashboards/widgetBuilder/components/newWidgetBuilder';
 import WidgetBuilderQueryFilterBuilder from 'sentry/views/dashboards/widgetBuilder/components/queryFilterBuilder';
+import RPCToggle from 'sentry/views/dashboards/widgetBuilder/components/rpcToggle';
 import SaveButton from 'sentry/views/dashboards/widgetBuilder/components/saveButton';
+import WidgetBuilderSortBySelector from 'sentry/views/dashboards/widgetBuilder/components/sortBySelector';
 import WidgetBuilderTypeSelector from 'sentry/views/dashboards/widgetBuilder/components/typeSelector';
 import Visualize from 'sentry/views/dashboards/widgetBuilder/components/visualize';
 import {useWidgetBuilderContext} from 'sentry/views/dashboards/widgetBuilder/contexts/widgetBuilderContext';
 
 type WidgetBuilderSlideoutProps = {
+  dashboard: DashboardDetails;
+  dashboardFilters: DashboardFilters;
   isOpen: boolean;
+  isWidgetInvalid: boolean;
   onClose: () => void;
+  onQueryConditionChange: (valid: boolean) => void;
   onSave: ({index, widget}: {index: number; widget: Widget}) => void;
+  setIsPreviewDraggable: (draggable: boolean) => void;
 };
 
-function WidgetBuilderSlideout({isOpen, onClose, onSave}: WidgetBuilderSlideoutProps) {
+function WidgetBuilderSlideout({
+  isOpen,
+  onClose,
+  onSave,
+  onQueryConditionChange,
+  dashboard,
+  dashboardFilters,
+  setIsPreviewDraggable,
+  isWidgetInvalid,
+}: WidgetBuilderSlideoutProps) {
+  const organization = useOrganization();
   const {state} = useWidgetBuilderContext();
+  const [initialState] = useState(state);
   const {widgetIndex} = useParams();
+  const theme = useTheme();
+
   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;
 
+  const previewRef = useRef<HTMLDivElement>(null);
+
+  const isSmallScreen = useMedia(`(max-width: ${theme.breakpoints.small})`);
+
+  const showSortByStep =
+    (isChartWidget && state.fields && state.fields.length > 0) ||
+    state.displayType === DisplayType.TABLE;
+
+  useEffect(() => {
+    const observer = new IntersectionObserver(
+      ([entry]) => {
+        setIsPreviewDraggable(!entry!.isIntersecting);
+      },
+      {threshold: 0}
+    );
+
+    if (previewRef.current) {
+      observer.observe(previewRef.current);
+    }
+
+    return () => observer.disconnect();
+  }, [setIsPreviewDraggable]);
+
   return (
     <SlideOverPanel
       collapsed={!isOpen}
@@ -47,7 +102,14 @@ function WidgetBuilderSlideout({isOpen, onClose, onSave}: WidgetBuilderSlideoutP
           borderless
           aria-label={t('Close Widget Builder')}
           icon={<IconClose size="sm" />}
-          onClick={onClose}
+          onClick={() => {
+            openConfirmModal({
+              bypass: isEqual(initialState, state),
+              message: t('You have unsaved changes. Are you sure you want to leave?'),
+              priority: 'danger',
+              onConfirm: onClose,
+            });
+          }}
         >
           {t('Close')}
         </CloseButton>
@@ -59,25 +121,48 @@ function WidgetBuilderSlideout({isOpen, onClose, onSave}: WidgetBuilderSlideoutP
         <Section>
           <WidgetBuilderDatasetSelector />
         </Section>
+        {organization.features.includes('visibility-explore-dataset') &&
+          state.dataset === WidgetType.SPANS && (
+            <Section>
+              <RPCToggle />
+            </Section>
+          )}
         <Section>
           <WidgetBuilderTypeSelector />
         </Section>
+        <div ref={previewRef}>
+          {isSmallScreen && (
+            <Section>
+              <WidgetPreviewContainer
+                dashboard={dashboard}
+                dashboardFilters={dashboardFilters}
+                isWidgetInvalid={isWidgetInvalid}
+              />
+            </Section>
+          )}
+        </div>
         <Section>
           <Visualize />
         </Section>
         <Section>
-          <WidgetBuilderQueryFilterBuilder />
+          <WidgetBuilderQueryFilterBuilder
+            onQueryConditionChange={onQueryConditionChange}
+          />
         </Section>
         {isChartWidget && (
           <Section>
             <WidgetBuilderGroupBySelector />
           </Section>
         )}
+        {showSortByStep && (
+          <Section>
+            <WidgetBuilderSortBySelector />
+          </Section>
+        )}
         <Section>
           <WidgetBuilderNameAndDescription />
         </Section>
         <SaveButton isEditing={isEditing} onSave={onSave} />
-        <DevBuilder />
       </SlideoutBodyWrapper>
     </SlideOverPanel>
   );
diff --git a/static/app/views/dashboards/widgetBuilder/components/widgetPreview.tsx b/static/app/views/dashboards/widgetBuilder/components/widgetPreview.tsx
index b46657c63e33ac..b917f1f7f34005 100644
--- a/static/app/views/dashboards/widgetBuilder/components/widgetPreview.tsx
+++ b/static/app/views/dashboards/widgetBuilder/components/widgetPreview.tsx
@@ -17,9 +17,14 @@ import WidgetLegendSelectionState from 'sentry/views/dashboards/widgetLegendSele
 interface WidgetPreviewProps {
   dashboard: DashboardDetails;
   dashboardFilters: DashboardFilters;
+  isWidgetInvalid?: boolean;
 }
 
-function WidgetPreview({dashboard, dashboardFilters}: WidgetPreviewProps) {
+function WidgetPreview({
+  dashboard,
+  dashboardFilters,
+  isWidgetInvalid,
+}: WidgetPreviewProps) {
   const organization = useOrganization();
   const location = useLocation();
   const router = useRouter();
@@ -30,10 +35,10 @@ function WidgetPreview({dashboard, dashboardFilters}: WidgetPreviewProps) {
   const widget = convertBuilderStateToWidget(state);
 
   const widgetLegendState = new WidgetLegendSelectionState({
-    location: location,
+    location,
     organization,
-    dashboard: dashboard,
-    router: router,
+    dashboard,
+    router,
   });
 
   // TODO: The way we create the widget here does not propagate a widget ID
@@ -46,6 +51,8 @@ function WidgetPreview({dashboard, dashboardFilters}: WidgetPreviewProps) {
   return (
     <WidgetCard
       disableFullscreen
+      borderless
+      isWidgetInvalid={isWidgetInvalid}
       shouldResize={state.displayType !== DisplayType.TABLE}
       organization={organization}
       selection={pageFilters.selection}
@@ -66,10 +73,6 @@ function WidgetPreview({dashboard, dashboardFilters}: WidgetPreviewProps) {
           : 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}
diff --git a/static/app/views/dashboards/widgetBuilder/contexts/urlParamBatchContext.spec.tsx b/static/app/views/dashboards/widgetBuilder/contexts/urlParamBatchContext.spec.tsx
new file mode 100644
index 00000000000000..e32ccbbdf274a4
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/contexts/urlParamBatchContext.spec.tsx
@@ -0,0 +1,47 @@
+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 {UrlParamBatchProvider, useUrlBatchContext} from './urlParamBatchContext';
+
+jest.mock('sentry/utils/useLocation');
+jest.mock('sentry/utils/useNavigate');
+
+describe('UrlParamBatchProvider', () => {
+  let mockNavigate: jest.Mock;
+  beforeEach(() => {
+    mockNavigate = jest.fn();
+    jest.mocked(useNavigate).mockReturnValue(mockNavigate);
+    jest.useFakeTimers();
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+    jest.clearAllTimers();
+  });
+
+  it('should batch updates to the URL query params', () => {
+    jest.mocked(useLocation).mockReturnValue(LocationFixture());
+    const {result} = renderHook(() => useUrlBatchContext(), {
+      wrapper: UrlParamBatchProvider,
+    });
+    const {batchUrlParamUpdates} = result.current;
+
+    act(() => {
+      batchUrlParamUpdates({foo: 'bar'});
+      batchUrlParamUpdates({potato: 'test'});
+    });
+
+    act(() => {
+      jest.runAllTimers();
+    });
+
+    expect(mockNavigate).toHaveBeenCalledTimes(1);
+    expect(mockNavigate).toHaveBeenCalledWith(
+      expect.objectContaining({query: {foo: 'bar', potato: 'test'}})
+    );
+  });
+});
diff --git a/static/app/views/dashboards/widgetBuilder/contexts/urlParamBatchContext.tsx b/static/app/views/dashboards/widgetBuilder/contexts/urlParamBatchContext.tsx
new file mode 100644
index 00000000000000..123191017156f7
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/contexts/urlParamBatchContext.tsx
@@ -0,0 +1,78 @@
+import {
+  createContext,
+  useCallback,
+  useContext,
+  useEffect,
+  useMemo,
+  useState,
+} from 'react';
+import debounce from 'lodash/debounce';
+
+import {DEFAULT_DEBOUNCE_DURATION} from 'sentry/constants';
+import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
+
+type BatchContextType = {
+  batchUrlParamUpdates: (updates: Record<string, string | string[] | undefined>) => void;
+  flushUpdates: () => void;
+};
+
+const BatchContext = createContext<BatchContextType | null>(null);
+
+export function UrlParamBatchProvider({children}: {children: React.ReactNode}) {
+  const navigate = useNavigate();
+  const location = useLocation();
+  const [pendingUpdates, setPendingUpdates] = useState<
+    Record<string, string | string[] | undefined>
+  >({});
+
+  const batchUrlParamUpdates = useCallback(
+    (updates: Record<string, string | string[] | undefined>) => {
+      setPendingUpdates(current => ({...current, ...updates}));
+    },
+    []
+  );
+
+  const flushUpdates = useCallback(() => {
+    if (Object.keys(pendingUpdates).length === 0) {
+      return;
+    }
+    navigate({
+      ...location,
+      query: {
+        ...location.query,
+        ...pendingUpdates,
+      },
+    });
+    setPendingUpdates({});
+  }, [location, navigate, pendingUpdates]);
+
+  // Debounce URL updates
+  const updateURL = useMemo(
+    () =>
+      debounce(() => {
+        flushUpdates();
+      }, DEFAULT_DEBOUNCE_DURATION),
+    [flushUpdates]
+  );
+
+  // Trigger the URL updates
+  useEffect(() => {
+    updateURL();
+    return () => updateURL.cancel();
+  }, [updateURL]);
+
+  return (
+    <BatchContext.Provider value={{batchUrlParamUpdates, flushUpdates}}>
+      {children}
+    </BatchContext.Provider>
+  );
+}
+
+export const useUrlBatchContext = () => {
+  const context = useContext(BatchContext);
+  if (!context) {
+    throw new Error('useUrlBatchContext must be used within a UrlParamBatchProvider');
+  }
+  return context;
+};
diff --git a/static/app/views/dashboards/widgetBuilder/contexts/widgetBuilderContext.tsx b/static/app/views/dashboards/widgetBuilder/contexts/widgetBuilderContext.tsx
index d0d64414a18dbd..0750294ae7ef25 100644
--- a/static/app/views/dashboards/widgetBuilder/contexts/widgetBuilderContext.tsx
+++ b/static/app/views/dashboards/widgetBuilder/contexts/widgetBuilderContext.tsx
@@ -3,6 +3,8 @@ import {createContext, useContext} from 'react';
 
 import useWidgetBuilderState from '../hooks/useWidgetBuilderState';
 
+import {UrlParamBatchProvider} from './urlParamBatchContext';
+
 const WidgetBuilderContext = createContext<
   ReturnType<typeof useWidgetBuilderState> | undefined
 >(undefined);
@@ -14,7 +16,7 @@ interface WidgetBuilderProviderProps {
 /**
  * Provider for maintaining a single source of truth for the widget builder state.
  */
-export function WidgetBuilderProvider({children}: WidgetBuilderProviderProps) {
+function WidgetBuilderStateProvider({children}: WidgetBuilderProviderProps) {
   const widgetBuilderState = useWidgetBuilderState();
   return (
     <WidgetBuilderContext.Provider value={widgetBuilderState}>
@@ -23,6 +25,14 @@ export function WidgetBuilderProvider({children}: WidgetBuilderProviderProps) {
   );
 }
 
+export function WidgetBuilderProvider({children}: WidgetBuilderProviderProps) {
+  return (
+    <UrlParamBatchProvider>
+      <WidgetBuilderStateProvider>{children}</WidgetBuilderStateProvider>
+    </UrlParamBatchProvider>
+  );
+}
+
 /**
  * Custom hook to get state and dispatch from the WidgetBuilderContext
  */
diff --git a/static/app/views/dashboards/widgetBuilder/hooks/useQueryParamState.spec.tsx b/static/app/views/dashboards/widgetBuilder/hooks/useQueryParamState.spec.tsx
index cb196efbee4ec5..51f1a1b80f8316 100644
--- a/static/app/views/dashboards/widgetBuilder/hooks/useQueryParamState.spec.tsx
+++ b/static/app/views/dashboards/widgetBuilder/hooks/useQueryParamState.spec.tsx
@@ -6,8 +6,9 @@ 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 {UrlParamBatchProvider} from 'sentry/views/dashboards/widgetBuilder/contexts/urlParamBatchContext';
 import {useQueryParamState} from 'sentry/views/dashboards/widgetBuilder/hooks/useQueryParamState';
-import {formatSort} from 'sentry/views/explore/tables/aggregatesTable';
+import {formatSort} from 'sentry/views/explore/contexts/pageParamsContext/sortBys';
 
 jest.mock('sentry/utils/useLocation');
 jest.mock('sentry/utils/useNavigate');
@@ -29,7 +30,9 @@ describe('useQueryParamState', () => {
       LocationFixture({query: {testField: 'initial state'}})
     );
 
-    const {result} = renderHook(() => useQueryParamState({fieldName: 'testField'}));
+    const {result} = renderHook(() => useQueryParamState({fieldName: 'testField'}), {
+      wrapper: UrlParamBatchProvider,
+    });
 
     expect(result.current[0]).toBe('initial state');
   });
@@ -38,7 +41,9 @@ describe('useQueryParamState', () => {
     const mockedNavigate = jest.fn();
     mockedUseNavigate.mockReturnValue(mockedNavigate);
 
-    const {result} = renderHook(() => useQueryParamState({fieldName: 'testField'}));
+    const {result} = renderHook(() => useQueryParamState({fieldName: 'testField'}), {
+      wrapper: UrlParamBatchProvider,
+    });
 
     act(() => {
       result.current[1]('newValue');
@@ -73,8 +78,11 @@ describe('useQueryParamState', () => {
 
     const testDeserializer = (value: string) => `${value.toUpperCase()} - decoded`;
 
-    const {result} = renderHook(() =>
-      useQueryParamState({fieldName: 'testField', deserializer: testDeserializer})
+    const {result} = renderHook(
+      () => useQueryParamState({fieldName: 'testField', deserializer: testDeserializer}),
+      {
+        wrapper: UrlParamBatchProvider,
+      }
     );
 
     expect(result.current[0]).toBe('INITIAL STATE - decoded');
@@ -93,8 +101,11 @@ describe('useQueryParamState', () => {
     const testSerializer = (value: TestType) =>
       `${value.value} - ${value.count} - ${value.isActive}`;
 
-    const {result} = renderHook(() =>
-      useQueryParamState({fieldName: 'testField', serializer: testSerializer})
+    const {result} = renderHook(
+      () => useQueryParamState({fieldName: 'testField', serializer: testSerializer}),
+      {
+        wrapper: UrlParamBatchProvider,
+      }
     );
 
     act(() => {
@@ -113,12 +124,16 @@ describe('useQueryParamState', () => {
     const mockedNavigate = jest.fn();
     mockedUseNavigate.mockReturnValue(mockedNavigate);
 
-    const {result} = renderHook(() =>
-      useQueryParamState<Sort[]>({
-        fieldName: 'sort',
-        decoder: decodeSorts,
-        serializer: value => value.map(formatSort),
-      })
+    const {result} = renderHook(
+      () =>
+        useQueryParamState<Sort[]>({
+          fieldName: 'sort',
+          decoder: decodeSorts,
+          serializer: value => value.map(formatSort),
+        }),
+      {
+        wrapper: UrlParamBatchProvider,
+      }
     );
 
     expect(result.current[0]).toEqual([{field: 'testField', kind: 'desc'}]);
diff --git a/static/app/views/dashboards/widgetBuilder/hooks/useQueryParamState.tsx b/static/app/views/dashboards/widgetBuilder/hooks/useQueryParamState.tsx
index 1caf6111e1af8d..7430ddf6e816fb 100644
--- a/static/app/views/dashboards/widgetBuilder/hooks/useQueryParamState.tsx
+++ b/static/app/views/dashboards/widgetBuilder/hooks/useQueryParamState.tsx
@@ -1,13 +1,11 @@
-import {useCallback, useMemo, useState} from 'react';
+import {useCallback, 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';
+
+import {useUrlBatchContext} from '../contexts/urlParamBatchContext';
 
 interface UseQueryParamStateWithScalarDecoder<T> {
   fieldName: string;
@@ -48,8 +46,7 @@ export function useQueryParamState<T = string>({
   deserializer,
   serializer,
 }: UseQueryParamStateProps<T>): [T | undefined, (newField: T | undefined) => void] {
-  const navigate = useNavigate();
-  const location = useLocation();
+  const {batchUrlParamUpdates} = useUrlBatchContext();
 
   // The URL query params give us our initial state
   const parsedQueryParams = useLocationQuery({
@@ -72,45 +69,32 @@ export function useQueryParamState<T = string>({
         (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);
+        batchUrlParamUpdates({[fieldName]: undefined});
       } else if (serializer) {
-        updateQueryParam(serializer(newField));
+        batchUrlParamUpdates({[fieldName]: 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);
+          batchUrlParamUpdates({[fieldName]: newField as any});
         } else {
           Sentry.captureException(
             new Error(
               'useQueryParamState: newField is not a primitive value and not provided a serializer'
             )
           );
-          updateQueryParam(undefined);
+          batchUrlParamUpdates({[fieldName]: undefined});
         }
       }
     },
-    [updateQueryParam, serializer]
+    [batchUrlParamUpdates, serializer, fieldName]
   );
 
   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
index 20ef2fe084e354..5eee1daa3fb9f7 100644
--- a/static/app/views/dashboards/widgetBuilder/hooks/useWidgetBuilderState.spec.tsx
+++ b/static/app/views/dashboards/widgetBuilder/hooks/useWidgetBuilderState.spec.tsx
@@ -2,12 +2,16 @@ import {LocationFixture} from 'sentry-fixture/locationFixture';
 
 import {act, renderHook} from 'sentry-test/reactTestingLibrary';
 
+import type {Column} from 'sentry/utils/discover/fields';
 import {useLocation} from 'sentry/utils/useLocation';
 import {useNavigate} from 'sentry/utils/useNavigate';
 import {DisplayType, WidgetType} from 'sentry/views/dashboards/types';
+import {WidgetBuilderProvider} from 'sentry/views/dashboards/widgetBuilder/contexts/widgetBuilderContext';
 import useWidgetBuilderState, {
   BuilderStateAction,
+  serializeFields,
 } from 'sentry/views/dashboards/widgetBuilder/hooks/useWidgetBuilderState';
+import {FieldValueKind} from 'sentry/views/discover/table/types';
 
 jest.mock('sentry/utils/useLocation');
 jest.mock('sentry/utils/useNavigate');
@@ -16,7 +20,10 @@ const mockedUsedLocation = jest.mocked(useLocation);
 const mockedUseNavigate = jest.mocked(useNavigate);
 
 describe('useWidgetBuilderState', () => {
+  let mockNavigate!: jest.Mock;
   beforeEach(() => {
+    mockNavigate = jest.fn();
+    mockedUseNavigate.mockReturnValue(mockNavigate);
     jest.useFakeTimers();
   });
 
@@ -35,17 +42,18 @@ describe('useWidgetBuilderState', () => {
       })
     );
 
-    const {result} = renderHook(() => useWidgetBuilderState());
+    const {result} = renderHook(() => useWidgetBuilderState(), {
+      wrapper: WidgetBuilderProvider,
+    });
 
     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());
+    const {result} = renderHook(() => useWidgetBuilderState(), {
+      wrapper: WidgetBuilderProvider,
+    });
     act(() => {
       result.current.dispatch({
         type: BuilderStateAction.SET_TITLE,
@@ -80,7 +88,9 @@ describe('useWidgetBuilderState', () => {
         })
       );
 
-      const {result} = renderHook(() => useWidgetBuilderState());
+      const {result} = renderHook(() => useWidgetBuilderState(), {
+        wrapper: WidgetBuilderProvider,
+      });
 
       expect(result.current.state.displayType).toBe(DisplayType.AREA);
     });
@@ -92,16 +102,17 @@ describe('useWidgetBuilderState', () => {
         })
       );
 
-      const {result} = renderHook(() => useWidgetBuilderState());
+      const {result} = renderHook(() => useWidgetBuilderState(), {
+        wrapper: WidgetBuilderProvider,
+      });
 
       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());
+      const {result} = renderHook(() => useWidgetBuilderState(), {
+        wrapper: WidgetBuilderProvider,
+      });
 
       act(() => {
         result.current.dispatch({
@@ -118,6 +129,252 @@ describe('useWidgetBuilderState', () => {
         })
       );
     });
+
+    it('persists the values when going from timeseries to timeseries', () => {
+      mockedUsedLocation.mockReturnValue(
+        LocationFixture({
+          query: {
+            displayType: DisplayType.LINE,
+            field: ['event.type'],
+            yAxis: ['count()', 'count_unique(user)'],
+          },
+        })
+      );
+
+      const {result} = renderHook(() => useWidgetBuilderState(), {
+        wrapper: WidgetBuilderProvider,
+      });
+
+      expect(result.current.state.displayType).toBe(DisplayType.LINE);
+      expect(result.current.state.fields).toEqual([
+        {field: 'event.type', alias: undefined, kind: 'field'},
+      ]);
+      expect(result.current.state.yAxis).toEqual([
+        {
+          function: ['count', '', undefined, undefined],
+          alias: undefined,
+          kind: 'function',
+        },
+        {
+          function: ['count_unique', 'user', undefined, undefined],
+          alias: undefined,
+          kind: 'function',
+        },
+      ]);
+
+      act(() => {
+        result.current.dispatch({
+          type: BuilderStateAction.SET_DISPLAY_TYPE,
+          payload: DisplayType.AREA,
+        });
+      });
+
+      expect(result.current.state.displayType).toBe(DisplayType.AREA);
+      expect(result.current.state.fields).toEqual([
+        {field: 'event.type', alias: undefined, kind: 'field'},
+      ]);
+      expect(result.current.state.yAxis).toEqual([
+        {
+          function: ['count', '', undefined, undefined],
+          alias: undefined,
+          kind: 'function',
+        },
+        {
+          function: ['count_unique', 'user', undefined, undefined],
+          alias: undefined,
+          kind: 'function',
+        },
+      ]);
+    });
+
+    it('concatenates the values when going from timeseries to table', () => {
+      mockedUsedLocation.mockReturnValue(
+        LocationFixture({
+          query: {
+            displayType: DisplayType.LINE,
+            field: ['event.type'],
+            yAxis: ['count()', 'count_unique(user)'],
+          },
+        })
+      );
+
+      const {result} = renderHook(() => useWidgetBuilderState(), {
+        wrapper: WidgetBuilderProvider,
+      });
+
+      expect(result.current.state.displayType).toBe(DisplayType.LINE);
+      expect(result.current.state.fields).toEqual([
+        {field: 'event.type', alias: undefined, kind: 'field'},
+      ]);
+      expect(result.current.state.yAxis).toEqual([
+        {
+          function: ['count', '', undefined, undefined],
+          alias: undefined,
+          kind: 'function',
+        },
+        {
+          function: ['count_unique', 'user', undefined, undefined],
+          alias: undefined,
+          kind: 'function',
+        },
+      ]);
+
+      act(() => {
+        result.current.dispatch({
+          type: BuilderStateAction.SET_DISPLAY_TYPE,
+          payload: DisplayType.TABLE,
+        });
+      });
+
+      expect(result.current.state.displayType).toBe(DisplayType.TABLE);
+      expect(result.current.state.fields).toEqual([
+        {field: 'event.type', alias: undefined, kind: 'field'},
+        {
+          function: ['count', '', undefined, undefined],
+          alias: undefined,
+          kind: 'function',
+        },
+        {
+          function: ['count_unique', 'user', undefined, undefined],
+          alias: undefined,
+          kind: 'function',
+        },
+      ]);
+    });
+
+    it('separates the values when going from table to timeseries', () => {
+      // remember, this takes up to 3 yAxes
+      mockedUsedLocation.mockReturnValue(
+        LocationFixture({
+          query: {
+            displayType: DisplayType.TABLE,
+            field: [
+              'event.type',
+              'potato',
+              'count()',
+              'count_unique(user)',
+              'count_unique(potato)',
+              'count_unique(thisIsRemoved)',
+            ],
+          },
+        })
+      );
+
+      const {result} = renderHook(() => useWidgetBuilderState(), {
+        wrapper: WidgetBuilderProvider,
+      });
+
+      expect(result.current.state.displayType).toBe(DisplayType.TABLE);
+      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',
+        },
+        {
+          function: ['count_unique', 'user', undefined, undefined],
+          alias: undefined,
+          kind: 'function',
+        },
+        {
+          function: ['count_unique', 'potato', undefined, undefined],
+          alias: undefined,
+          kind: 'function',
+        },
+        {
+          function: ['count_unique', 'thisIsRemoved', undefined, undefined],
+          alias: undefined,
+          kind: 'function',
+        },
+      ]);
+
+      act(() => {
+        result.current.dispatch({
+          type: BuilderStateAction.SET_DISPLAY_TYPE,
+          payload: DisplayType.LINE,
+        });
+      });
+
+      expect(result.current.state.displayType).toBe(DisplayType.LINE);
+      expect(result.current.state.fields).toEqual([
+        {field: 'event.type', alias: undefined, kind: 'field'},
+        {field: 'potato', alias: undefined, kind: 'field'},
+      ]);
+      expect(result.current.state.yAxis).toEqual([
+        {
+          function: ['count', '', undefined, undefined],
+          alias: undefined,
+          kind: 'function',
+        },
+        {
+          function: ['count_unique', 'user', undefined, undefined],
+          alias: undefined,
+          kind: 'function',
+        },
+        {
+          function: ['count_unique', 'potato', undefined, undefined],
+          alias: undefined,
+          kind: 'function',
+        },
+      ]);
+    });
+
+    it('does not duplicate fields when changing display from table to chart', () => {
+      mockedUsedLocation.mockReturnValue(
+        LocationFixture({
+          query: {
+            displayType: DisplayType.TABLE,
+            dataset: WidgetType.ERRORS,
+            field: ['count()'],
+          },
+        })
+      );
+
+      const {result} = renderHook(() => useWidgetBuilderState(), {
+        wrapper: WidgetBuilderProvider,
+      });
+
+      expect(result.current.state.fields).toEqual([
+        {
+          function: ['count', '', undefined, undefined],
+          alias: undefined,
+          kind: 'function',
+        },
+      ]);
+
+      act(() => {
+        result.current.dispatch({
+          type: BuilderStateAction.SET_DATASET,
+          payload: WidgetType.SPANS,
+        });
+      });
+
+      expect(result.current.state.fields).toEqual([
+        {
+          function: ['count', 'span.duration', undefined, undefined],
+          alias: undefined,
+          kind: 'function',
+        },
+      ]);
+      expect(result.current.state.yAxis).toEqual([]);
+
+      act(() => {
+        result.current.dispatch({
+          type: BuilderStateAction.SET_DISPLAY_TYPE,
+          payload: DisplayType.LINE,
+        });
+      });
+
+      expect(result.current.state.yAxis).toEqual([
+        {
+          function: ['count', 'span.duration', undefined, undefined],
+          alias: undefined,
+          kind: 'function',
+        },
+      ]);
+    });
   });
 
   describe('dataset', () => {
@@ -126,16 +383,17 @@ describe('useWidgetBuilderState', () => {
         LocationFixture({query: {dataset: WidgetType.ISSUE}})
       );
 
-      const {result} = renderHook(() => useWidgetBuilderState());
+      const {result} = renderHook(() => useWidgetBuilderState(), {
+        wrapper: WidgetBuilderProvider,
+      });
 
       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());
+      const {result} = renderHook(() => useWidgetBuilderState(), {
+        wrapper: WidgetBuilderProvider,
+      });
 
       act(() => {
         result.current.dispatch({
@@ -156,10 +414,118 @@ describe('useWidgetBuilderState', () => {
     it('returns errors as the default dataset', () => {
       mockedUsedLocation.mockReturnValue(LocationFixture({query: {dataset: 'invalid'}}));
 
-      const {result} = renderHook(() => useWidgetBuilderState());
+      const {result} = renderHook(() => useWidgetBuilderState(), {
+        wrapper: WidgetBuilderProvider,
+      });
 
       expect(result.current.state.dataset).toBe(WidgetType.ERRORS);
     });
+
+    it('resets the display type to table when the dataset is switched to issues', () => {
+      mockedUsedLocation.mockReturnValue(
+        LocationFixture({
+          query: {dataset: WidgetType.TRANSACTIONS, displayType: DisplayType.LINE},
+        })
+      );
+
+      const {result} = renderHook(() => useWidgetBuilderState(), {
+        wrapper: WidgetBuilderProvider,
+      });
+
+      expect(result.current.state.displayType).toBe(DisplayType.LINE);
+
+      act(() => {
+        result.current.dispatch({
+          type: BuilderStateAction.SET_DATASET,
+          payload: WidgetType.ISSUE,
+        });
+      });
+
+      expect(result.current.state.displayType).toBe(DisplayType.TABLE);
+    });
+
+    it('resets the fields, yAxis, query, and sort when the dataset is switched', () => {
+      mockedUsedLocation.mockReturnValue(
+        LocationFixture({
+          query: {
+            title: 'This title should persist',
+            description: 'This description should persist',
+            dataset: WidgetType.TRANSACTIONS,
+            field: ['event.type', 'potato', 'count()'],
+            yAxis: ['count()', 'count_unique(user)'],
+            query: ['event.type = "test"'],
+            sort: ['-testField'],
+          },
+        })
+      );
+
+      const {result} = renderHook(() => useWidgetBuilderState(), {
+        wrapper: WidgetBuilderProvider,
+      });
+
+      act(() => {
+        result.current.dispatch({
+          type: BuilderStateAction.SET_DATASET,
+          payload: WidgetType.SPANS,
+        });
+      });
+
+      expect(result.current.state.title).toBe('This title should persist');
+      expect(result.current.state.description).toBe('This description should persist');
+      expect(result.current.state.fields).toEqual([
+        {
+          function: ['count', 'span.duration', undefined, undefined],
+          alias: undefined,
+          kind: 'function',
+        },
+      ]);
+      expect(result.current.state.yAxis).toEqual([]);
+      expect(result.current.state.query).toEqual(['']);
+      expect(result.current.state.sort).toEqual([
+        {
+          field: 'count(span.duration)',
+          kind: 'desc',
+        },
+      ]);
+    });
+
+    it('resets the yAxis when the dataset is switched from anything to issues', () => {
+      mockedUsedLocation.mockReturnValue(
+        LocationFixture({
+          query: {
+            dataset: WidgetType.TRANSACTIONS,
+            yAxis: ['count()', 'count_unique(user)'],
+            displayType: DisplayType.LINE,
+          },
+        })
+      );
+
+      const {result} = renderHook(() => useWidgetBuilderState(), {
+        wrapper: WidgetBuilderProvider,
+      });
+
+      expect(result.current.state.yAxis).toEqual([
+        {
+          function: ['count', '', undefined, undefined],
+          alias: undefined,
+          kind: 'function',
+        },
+        {
+          function: ['count_unique', 'user', undefined, undefined],
+          alias: undefined,
+          kind: 'function',
+        },
+      ]);
+
+      act(() => {
+        result.current.dispatch({
+          type: BuilderStateAction.SET_DATASET,
+          payload: WidgetType.ISSUE,
+        });
+      });
+
+      expect(result.current.state.yAxis).toEqual([]);
+    });
   });
 
   describe('fields', () => {
@@ -168,7 +534,9 @@ describe('useWidgetBuilderState', () => {
         LocationFixture({query: {field: ['event.type', 'potato', 'count()']}})
       );
 
-      const {result} = renderHook(() => useWidgetBuilderState());
+      const {result} = renderHook(() => useWidgetBuilderState(), {
+        wrapper: WidgetBuilderProvider,
+      });
 
       expect(result.current.state.fields).toEqual([
         {field: 'event.type', alias: undefined, kind: 'field'},
@@ -180,6 +548,44 @@ describe('useWidgetBuilderState', () => {
         },
       ]);
     });
+
+    it('decodes both JSON formatted fields and non-JSON formatted fields', () => {
+      mockedUsedLocation.mockReturnValue(
+        LocationFixture({
+          query: {
+            field: [
+              '{"field": "event.type", "alias": "test"}',
+              'p90(transaction.duration)',
+            ],
+          },
+        })
+      );
+
+      const {result} = renderHook(() => useWidgetBuilderState(), {
+        wrapper: WidgetBuilderProvider,
+      });
+
+      expect(result.current.state.fields).toEqual([
+        {field: 'event.type', alias: 'test', kind: 'field'},
+        {
+          function: ['p90', 'transaction.duration', undefined, undefined],
+          alias: undefined,
+          kind: 'function',
+        },
+      ]);
+    });
+
+    it('encodes fields to JSON when they have aliases', () => {
+      const fields = [
+        {field: 'event.type', alias: 'test', kind: FieldValueKind.FIELD},
+        {field: 'event.type', alias: undefined, kind: FieldValueKind.FIELD},
+      ] as Column[];
+      const encodedFields = serializeFields(fields);
+      expect(encodedFields).toEqual([
+        '{"field":"event.type","alias":"test"}',
+        'event.type',
+      ]);
+    });
   });
 
   describe('yAxis', () => {
@@ -193,7 +599,9 @@ describe('useWidgetBuilderState', () => {
         })
       );
 
-      const {result} = renderHook(() => useWidgetBuilderState());
+      const {result} = renderHook(() => useWidgetBuilderState(), {
+        wrapper: WidgetBuilderProvider,
+      });
 
       expect(result.current.state.fields).toEqual([
         {field: 'event.type', alias: undefined, kind: 'field'},
@@ -229,7 +637,9 @@ describe('useWidgetBuilderState', () => {
         })
       );
 
-      const {result} = renderHook(() => useWidgetBuilderState());
+      const {result} = renderHook(() => useWidgetBuilderState(), {
+        wrapper: WidgetBuilderProvider,
+      });
 
       expect(result.current.state.sort).toEqual([{field: 'testField', kind: 'desc'}]);
 
@@ -243,4 +653,58 @@ describe('useWidgetBuilderState', () => {
       expect(result.current.state.sort).toEqual([{field: 'testField', kind: 'asc'}]);
     });
   });
+
+  describe('limit', () => {
+    it('can decode and update limit', () => {
+      mockedUsedLocation.mockReturnValue(
+        LocationFixture({
+          query: {
+            limit: '4',
+          },
+        })
+      );
+
+      const {result} = renderHook(() => useWidgetBuilderState(), {
+        wrapper: WidgetBuilderProvider,
+      });
+
+      expect(result.current.state.limit).toBe(4);
+
+      act(() => {
+        result.current.dispatch({
+          type: BuilderStateAction.SET_LIMIT,
+          payload: 10,
+        });
+      });
+
+      expect(result.current.state.limit).toBe(10);
+    });
+  });
+
+  describe('legendAlias', () => {
+    it('can decode and update legendAlias', () => {
+      mockedUsedLocation.mockReturnValue(
+        LocationFixture({
+          query: {
+            legendAlias: ['test', 'test2'],
+          },
+        })
+      );
+
+      const {result} = renderHook(() => useWidgetBuilderState(), {
+        wrapper: WidgetBuilderProvider,
+      });
+
+      expect(result.current.state.legendAlias).toEqual(['test', 'test2']);
+
+      act(() => {
+        result.current.dispatch({
+          type: BuilderStateAction.SET_LEGEND_ALIAS,
+          payload: ['test3', 'test4'],
+        });
+      });
+
+      expect(result.current.state.legendAlias).toEqual(['test3', 'test4']);
+    });
+  });
 });
diff --git a/static/app/views/dashboards/widgetBuilder/hooks/useWidgetBuilderState.tsx b/static/app/views/dashboards/widgetBuilder/hooks/useWidgetBuilderState.tsx
index 74f5ecdcf0d1a2..25491057d035b7 100644
--- a/static/app/views/dashboards/widgetBuilder/hooks/useWidgetBuilderState.tsx
+++ b/static/app/views/dashboards/widgetBuilder/hooks/useWidgetBuilderState.tsx
@@ -1,21 +1,32 @@
 import {useCallback, useMemo} from 'react';
+import partition from 'lodash/partition';
 
 import {
   type Column,
   explodeField,
   generateFieldAsString,
+  isAggregateFieldOrEquation,
   type Sort,
 } from 'sentry/utils/discover/fields';
-import {decodeList, decodeSorts} from 'sentry/utils/queryString';
+import {
+  decodeInteger,
+  decodeList,
+  decodeScalar,
+  decodeSorts,
+} from 'sentry/utils/queryString';
+import {getDatasetConfig} from 'sentry/views/dashboards/datasetConfig/base';
 import {DisplayType, WidgetType} from 'sentry/views/dashboards/types';
+import {MAX_NUM_Y_AXES} from 'sentry/views/dashboards/widgetBuilder/buildSteps/yAxisStep/yAxisSelector';
 import {useQueryParamState} from 'sentry/views/dashboards/widgetBuilder/hooks/useQueryParamState';
-import {formatSort} from 'sentry/views/explore/tables/aggregatesTable';
+import {DEFAULT_RESULTS_LIMIT} from 'sentry/views/dashboards/widgetBuilder/utils';
 
 export type WidgetBuilderStateQueryParams = {
   dataset?: WidgetType;
   description?: string;
   displayType?: DisplayType;
   field?: (string | undefined)[];
+  legendAlias?: string[];
+  limit?: number;
   query?: string[];
   sort?: string[];
   title?: string;
@@ -31,6 +42,8 @@ export const BuilderStateAction = {
   SET_Y_AXIS: 'SET_Y_AXIS',
   SET_QUERY: 'SET_QUERY',
   SET_SORT: 'SET_SORT',
+  SET_LIMIT: 'SET_LIMIT',
+  SET_LEGEND_ALIAS: 'SET_LEGEND_ALIAS',
 } as const;
 
 type WidgetAction =
@@ -41,13 +54,17 @@ type WidgetAction =
   | {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};
+  | {payload: Sort[]; type: typeof BuilderStateAction.SET_SORT}
+  | {payload: number; type: typeof BuilderStateAction.SET_LIMIT}
+  | {payload: string[]; type: typeof BuilderStateAction.SET_LEGEND_ALIAS};
 
 export interface WidgetBuilderState {
   dataset?: WidgetType;
   description?: string;
   displayType?: DisplayType;
   fields?: Column[];
+  legendAlias?: string[];
+  limit?: number;
   query?: string[];
   sort?: Sort[];
   title?: string;
@@ -85,16 +102,48 @@ function useWidgetBuilderState(): {
   const [query, setQuery] = useQueryParamState<string[]>({
     fieldName: 'query',
     decoder: decodeList,
+    deserializer: deserializeQuery,
   });
   const [sort, setSort] = useQueryParamState<Sort[]>({
     fieldName: 'sort',
     decoder: decodeSorts,
     serializer: serializeSorts,
   });
+  const [limit, setLimit] = useQueryParamState<number>({
+    fieldName: 'limit',
+    decoder: decodeScalar,
+    deserializer: deserializeLimit,
+  });
+  const [legendAlias, setLegendAlias] = useQueryParamState<string[]>({
+    fieldName: 'legendAlias',
+    decoder: decodeList,
+  });
 
   const state = useMemo(
-    () => ({title, description, displayType, dataset, fields, yAxis, query, sort}),
-    [title, description, displayType, dataset, fields, yAxis, query, sort]
+    () => ({
+      title,
+      description,
+      displayType,
+      dataset,
+      fields,
+      yAxis,
+      query,
+      sort,
+      limit,
+      legendAlias,
+    }),
+    [
+      title,
+      description,
+      displayType,
+      dataset,
+      fields,
+      yAxis,
+      query,
+      sort,
+      limit,
+      legendAlias,
+    ]
   );
 
   const dispatch = useCallback(
@@ -108,9 +157,51 @@ function useWidgetBuilderState(): {
           break;
         case BuilderStateAction.SET_DISPLAY_TYPE:
           setDisplayType(action.payload);
+          if (action.payload === DisplayType.BIG_NUMBER) {
+            setSort([]);
+            setLegendAlias([]);
+          }
+          const [aggregates, columns] = partition(fields, field => {
+            const fieldString = generateFieldAsString(field);
+            return isAggregateFieldOrEquation(fieldString);
+          });
+          if (action.payload === DisplayType.TABLE) {
+            setYAxis([]);
+            setFields([...columns, ...aggregates, ...(yAxis ?? [])]);
+            setLegendAlias([]);
+          } else {
+            setFields(columns);
+            setYAxis([
+              ...aggregates.slice(0, MAX_NUM_Y_AXES),
+              ...(yAxis?.slice(0, MAX_NUM_Y_AXES) ?? []),
+            ]);
+          }
           break;
         case BuilderStateAction.SET_DATASET:
           setDataset(action.payload);
+
+          let nextDisplayType = displayType;
+          if (action.payload === WidgetType.ISSUE) {
+            // Issues only support table display type
+            setDisplayType(DisplayType.TABLE);
+            nextDisplayType = DisplayType.TABLE;
+          }
+
+          const config = getDatasetConfig(action.payload);
+          setFields(
+            config.defaultWidgetQuery.fields?.map(field => explodeField({field}))
+          );
+          if (nextDisplayType === DisplayType.TABLE) {
+            setYAxis([]);
+          } else {
+            setYAxis(
+              config.defaultWidgetQuery.aggregates?.map(aggregate =>
+                explodeField({field: aggregate})
+              )
+            );
+          }
+          setQuery([config.defaultWidgetQuery.conditions]);
+          setSort(decodeSorts(config.defaultWidgetQuery.orderby));
           break;
         case BuilderStateAction.SET_FIELDS:
           setFields(action.payload);
@@ -124,6 +215,12 @@ function useWidgetBuilderState(): {
         case BuilderStateAction.SET_SORT:
           setSort(action.payload);
           break;
+        case BuilderStateAction.SET_LIMIT:
+          setLimit(action.payload);
+          break;
+        case BuilderStateAction.SET_LEGEND_ALIAS:
+          setLegendAlias(action.payload);
+          break;
         default:
           break;
       }
@@ -137,6 +234,11 @@ function useWidgetBuilderState(): {
       setYAxis,
       setQuery,
       setSort,
+      setLimit,
+      setLegendAlias,
+      fields,
+      yAxis,
+      displayType,
     ]
   );
 
@@ -173,19 +275,56 @@ function deserializeDataset(value: string): WidgetType {
  * them into a list of fields and functions
  */
 function deserializeFields(fields: string[]): Column[] {
-  return fields.map(field => explodeField({field}));
+  return fields.map(stringifiedField => {
+    try {
+      const {field, alias} = JSON.parse(stringifiedField);
+      return explodeField({field, alias});
+    } catch (error) {
+      return explodeField({field: stringifiedField, alias: undefined});
+    }
+  });
 }
 
 /**
  * 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);
+export function serializeFields(fields: Column[]): string[] {
+  return fields.map(field => {
+    if (field.alias) {
+      return JSON.stringify({
+        field: generateFieldAsString(field),
+        alias: field.alias,
+      });
+    }
+    return generateFieldAsString(field);
+  });
 }
 
 function serializeSorts(sorts: Sort[]): string[] {
-  return sorts.map(formatSort);
+  return sorts.map(sort => {
+    const direction = sort.kind === 'desc' ? '-' : '';
+    return `${direction}${sort.field}`;
+  });
+}
+
+/**
+ * Decodes the limit from the query params
+ * Returns the default limit if the value is not a valid limit
+ */
+function deserializeLimit(value: string): number {
+  return decodeInteger(value, DEFAULT_RESULTS_LIMIT);
+}
+
+/**
+ * Decodes the query from the query params
+ * Returns an array with an empty string if the query is empty
+ */
+function deserializeQuery(queries: string[]): string[] {
+  if (queries.length === 0) {
+    return [''];
+  }
+  return queries;
 }
 
 export default useWidgetBuilderState;
diff --git a/static/app/views/dashboards/widgetBuilder/issueWidget/utils.tsx b/static/app/views/dashboards/widgetBuilder/issueWidget/utils.tsx
index fb437f81851d05..010d1cf741e535 100644
--- a/static/app/views/dashboards/widgetBuilder/issueWidget/utils.tsx
+++ b/static/app/views/dashboards/widgetBuilder/issueWidget/utils.tsx
@@ -19,7 +19,7 @@ export function generateIssueWidgetFieldOptions(
         kind: FieldValueKind.FIELD,
         meta: {
           name: field,
-          dataType: issueFields[field],
+          dataType: issueFields[field]!,
         },
       },
     };
diff --git a/static/app/views/dashboards/widgetBuilder/utils.tsx b/static/app/views/dashboards/widgetBuilder/utils.tsx
index 9817cddf1657a1..8e269dd813e8b4 100644
--- a/static/app/views/dashboards/widgetBuilder/utils.tsx
+++ b/static/app/views/dashboards/widgetBuilder/utils.tsx
@@ -190,8 +190,8 @@ export function normalizeQueries({
 
     const queryOrderBy =
       widgetType === WidgetType.RELEASE
-        ? stripDerivedMetricsPrefix(queries[0].orderby)
-        : queries[0].orderby;
+        ? stripDerivedMetricsPrefix(queries[0]!.orderby)
+        : queries[0]!.orderby;
     const rawOrderBy = trimStart(queryOrderBy, '-');
 
     const resetOrderBy =
@@ -211,8 +211,8 @@ export function normalizeQueries({
         ? queryOrderBy ?? IssueSortOptions.DATE
         : generateOrderOptions({
             widgetType: widgetType ?? WidgetType.DISCOVER,
-            columns: queries[0].columns,
-            aggregates: queries[0].aggregates,
+            columns: queries[0]!.columns,
+            aggregates: queries[0]!.aggregates,
           })[0]?.value);
 
     if (!orderBy) {
@@ -263,7 +263,7 @@ export function normalizeQueries({
   if (isTimeseriesChart) {
     // For timeseries widget, all queries must share identical set of fields.
 
-    const referenceAggregates = [...queries[0].aggregates];
+    const referenceAggregates = [...queries[0]!.aggregates];
 
     queryLoop: for (const query of queries) {
       if (referenceAggregates.length >= 3) {
diff --git a/static/app/views/dashboards/widgetBuilder/utils/convertBuilderStateToWidget.spec.tsx b/static/app/views/dashboards/widgetBuilder/utils/convertBuilderStateToWidget.spec.tsx
index 563e27c814516a..a9f72d7c5387c9 100644
--- a/static/app/views/dashboards/widgetBuilder/utils/convertBuilderStateToWidget.spec.tsx
+++ b/static/app/views/dashboards/widgetBuilder/utils/convertBuilderStateToWidget.spec.tsx
@@ -1,67 +1,16 @@
-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';
+import {FieldValueKind} from 'sentry/views/discover/table/types';
 
 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,
+      limit: 5,
       fields: [
         {kind: 'field', field: 'geo.country'},
         {
@@ -84,10 +33,11 @@ describe('convertBuilderStateToWidget', function () {
       widgetType: WidgetType.ERRORS,
       displayType: DisplayType.TABLE,
       interval: '1h',
+      limit: 5,
       queries: [
         {
           fields: ['geo.country', 'count()', 'count_unique(user)'],
-          fieldAliases: [],
+          fieldAliases: ['', '', ''],
           aggregates: ['count()'],
           columns: ['geo.country'],
           conditions: '',
@@ -106,7 +56,47 @@ describe('convertBuilderStateToWidget', function () {
 
     const widget = convertBuilderStateToWidget(mockState);
 
-    expect(widget.queries[0].orderby).toEqual('-geo.country');
-    expect(widget.queries[1].orderby).toEqual('-geo.country');
+    expect(widget.queries[0]!.orderby).toBe('-geo.country');
+    expect(widget.queries[1]!.orderby).toBe('-geo.country');
+  });
+
+  it('does not convert aggregates to aliased format', function () {
+    const mockState: WidgetBuilderState = {
+      query: ['transaction.duration:>100', 'transaction.duration:>50'],
+      sort: [{field: 'count()', kind: 'desc'}],
+    };
+
+    const widget = convertBuilderStateToWidget(mockState);
+
+    expect(widget.queries[0]!.orderby).toBe('-count()');
+    expect(widget.queries[1]!.orderby).toBe('-count()');
+  });
+
+  it('adds aliases to the widget queries', function () {
+    const mockState: WidgetBuilderState = {
+      fields: [
+        {field: 'geo.country', alias: 'test', kind: FieldValueKind.FIELD},
+        {field: 'geo.country', alias: undefined, kind: FieldValueKind.FIELD},
+        {field: 'geo.country', alias: 'another one', kind: FieldValueKind.FIELD},
+      ],
+    };
+
+    const widget = convertBuilderStateToWidget(mockState);
+
+    expect(widget.queries[0]!.fieldAliases).toEqual(['test', '', 'another one']);
+  });
+
+  it('adds legend aliases to the widget queries', function () {
+    const mockState: WidgetBuilderState = {
+      legendAlias: ['test', 'test2'],
+      query: ['transaction.duration:>100', 'transaction.duration:>50'],
+    };
+
+    const widget = convertBuilderStateToWidget(mockState);
+
+    expect(widget.queries[0]!.name).toBe('test');
+    expect(widget.queries[0]!.conditions).toBe('transaction.duration:>100');
+    expect(widget.queries[1]!.name).toBe('test2');
+    expect(widget.queries[1]!.conditions).toBe('transaction.duration:>50');
   });
 });
diff --git a/static/app/views/dashboards/widgetBuilder/utils/convertBuilderStateToWidget.ts b/static/app/views/dashboards/widgetBuilder/utils/convertBuilderStateToWidget.ts
index 5ec914b8cc3620..cf6f623e6504e6 100644
--- a/static/app/views/dashboards/widgetBuilder/utils/convertBuilderStateToWidget.ts
+++ b/static/app/views/dashboards/widgetBuilder/utils/convertBuilderStateToWidget.ts
@@ -1,5 +1,5 @@
 import {defined} from 'sentry/utils';
-import {generateFieldAsString} from 'sentry/utils/discover/fields';
+import {generateFieldAsString, type Sort} from 'sentry/utils/discover/fields';
 import {getDatasetConfig} from 'sentry/views/dashboards/datasetConfig/base';
 import {
   DisplayType,
@@ -7,7 +7,7 @@ import {
   type WidgetQuery,
   WidgetType,
 } from 'sentry/views/dashboards/types';
-import {formatSort} from 'sentry/views/explore/tables/aggregatesTable';
+import {FieldValueKind} from 'sentry/views/discover/table/types';
 
 import type {WidgetBuilderState} from '../hooks/useWidgetBuilderState';
 
@@ -16,31 +16,42 @@ export function convertBuilderStateToWidget(state: WidgetBuilderState): Widget {
   const defaultQuery = datasetConfig.defaultWidgetQuery;
 
   const queries = defined(state.query) && state.query.length > 0 ? state.query : [''];
+  const legendAlias =
+    defined(state.legendAlias) && state.legendAlias.length > 0 ? state.legendAlias : [];
 
   const fields = state.fields?.map(generateFieldAsString);
-  const aggregates = state.yAxis?.map(generateFieldAsString);
+  const fieldAliases = state.fields?.map(field => field.alias ?? '');
+  const aggregates =
+    (state.yAxis?.length ?? 0) > 0
+      ? state.yAxis?.map(generateFieldAsString)
+      : state.fields
+          ?.filter(field =>
+            [FieldValueKind.FUNCTION, FieldValueKind.EQUATION].includes(
+              field.kind as FieldValueKind
+            )
+          )
+          .map(generateFieldAsString);
   const columns = state.fields
-    ?.filter(field => 'kind' in field && field.kind === 'field')
+    ?.filter(field => field.kind === FieldValueKind.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])
+      ? _formatSort(state.sort[0]!)
       : defaultSort;
 
-  const widgetQueries: WidgetQuery[] = queries.map(query => {
+  const widgetQueries: WidgetQuery[] = queries.map((query, index) => {
     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,
+      fields,
+      aggregates: aggregates ?? [],
+      columns: columns ?? [],
       conditions: query,
       orderby: sort,
+      fieldAliases: fieldAliases ?? [],
+      name: legendAlias[index] ?? '',
     };
   });
 
@@ -51,5 +62,11 @@ export function convertBuilderStateToWidget(state: WidgetBuilderState): Widget {
     interval: '1h', // TODO: Not sure what to put here yet
     queries: widgetQueries,
     widgetType: state.dataset,
+    limit: state.limit,
   };
 }
+
+function _formatSort(sort: Sort): string {
+  const direction = sort.kind === 'desc' ? '-' : '';
+  return `${direction}${sort.field}`;
+}
diff --git a/static/app/views/dashboards/widgetBuilder/utils/convertWidgetToBuilderStateParams.spec.tsx b/static/app/views/dashboards/widgetBuilder/utils/convertWidgetToBuilderStateParams.spec.tsx
new file mode 100644
index 00000000000000..6ed3c133f6a137
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/utils/convertWidgetToBuilderStateParams.spec.tsx
@@ -0,0 +1,56 @@
+import {DisplayType, WidgetType} from 'sentry/views/dashboards/types';
+import {convertWidgetToBuilderStateParams} from 'sentry/views/dashboards/widgetBuilder/utils/convertWidgetToBuilderStateParams';
+import {getDefaultWidget} from 'sentry/views/dashboards/widgetBuilder/utils/getDefaultWidget';
+
+describe('convertWidgetToBuilderStateParams', () => {
+  it('should not pass along yAxis when converting a table to builder params', () => {
+    const widget = {...getDefaultWidget(WidgetType.ERRORS), aggregates: ['count()']};
+    const params = convertWidgetToBuilderStateParams(widget);
+    expect(params.yAxis).toEqual([]);
+  });
+
+  it('stringifies the fields when converting a table to builder params', () => {
+    const widget = {
+      ...getDefaultWidget(WidgetType.ERRORS),
+      queries: [
+        {
+          aggregates: [],
+          columns: [],
+          conditions: '',
+          name: '',
+          orderby: '',
+
+          fields: ['geo.country'],
+          fieldAliases: ['test'],
+        },
+      ],
+    };
+    const params = convertWidgetToBuilderStateParams(widget);
+    expect(params.field).toEqual(['{"field":"geo.country","alias":"test"}']);
+  });
+
+  it('adds legend aliases to the builder params on charts', () => {
+    const widget = {
+      ...getDefaultWidget(WidgetType.ERRORS),
+      displayType: DisplayType.AREA,
+      queries: [
+        {
+          aggregates: [],
+          columns: [],
+          conditions: 'transaction.duration:>100',
+          orderby: '',
+          name: 'test',
+        },
+        {
+          aggregates: [],
+          columns: [],
+          conditions: 'transaction.duration:>50',
+          orderby: '',
+          name: 'test2',
+        },
+      ],
+    };
+    const params = convertWidgetToBuilderStateParams(widget);
+    expect(params.legendAlias).toEqual(['test', 'test2']);
+  });
+});
diff --git a/static/app/views/dashboards/widgetBuilder/utils/convertWidgetToBuilderStateParams.ts b/static/app/views/dashboards/widgetBuilder/utils/convertWidgetToBuilderStateParams.ts
index 64424e45792cf1..719f50ab94501a 100644
--- a/static/app/views/dashboards/widgetBuilder/utils/convertWidgetToBuilderStateParams.ts
+++ b/static/app/views/dashboards/widgetBuilder/utils/convertWidgetToBuilderStateParams.ts
@@ -1,5 +1,24 @@
-import {DisplayType, type Widget, WidgetType} from 'sentry/views/dashboards/types';
-import type {WidgetBuilderStateQueryParams} from 'sentry/views/dashboards/widgetBuilder/hooks/useWidgetBuilderState';
+import {explodeField} from 'sentry/utils/discover/fields';
+import {
+  DisplayType,
+  type Widget,
+  type WidgetQuery,
+  WidgetType,
+} from 'sentry/views/dashboards/types';
+import {
+  serializeFields,
+  type WidgetBuilderStateQueryParams,
+} from 'sentry/views/dashboards/widgetBuilder/hooks/useWidgetBuilderState';
+
+function stringifyFields(
+  query: WidgetQuery,
+  fieldKey: 'fields' | 'columns' | 'aggregates'
+) {
+  const fields = query[fieldKey]?.map((field, index) =>
+    explodeField({field, alias: query.fieldAliases?.[index]})
+  );
+  return fields ? serializeFields(fields) : [];
+}
 
 /**
  * Converts a widget to a set of query params that can be used to
@@ -8,18 +27,23 @@ import type {WidgetBuilderStateQueryParams} from 'sentry/views/dashboards/widget
 export function convertWidgetToBuilderStateParams(
   widget: Widget
 ): WidgetBuilderStateQueryParams {
-  const yAxis = widget.queries.flatMap(q => q.aggregates);
+  let yAxis = widget.queries.flatMap(q => q.aggregates);
   const query = widget.queries.flatMap(q => q.conditions);
   const sort = widget.queries.flatMap(q => q.orderby);
+  let legendAlias = widget.queries.flatMap(q => q.name);
 
   let field: string[] = [];
   if (
     widget.displayType === DisplayType.TABLE ||
     widget.displayType === DisplayType.BIG_NUMBER
   ) {
-    field = widget.queries.flatMap(q => q.fields ?? []);
+    field = widget.queries.flatMap(widgetQuery => stringifyFields(widgetQuery, 'fields'));
+    yAxis = [];
+    legendAlias = [];
   } else {
-    field = widget.queries.flatMap(q => q.columns);
+    field = widget.queries.flatMap(widgetQuery =>
+      stringifyFields(widgetQuery, 'columns')
+    );
   }
 
   return {
@@ -27,9 +51,11 @@ export function convertWidgetToBuilderStateParams(
     description: widget.description ?? '',
     dataset: widget.widgetType ?? WidgetType.ERRORS,
     displayType: widget.displayType ?? DisplayType.TABLE,
+    limit: widget.limit,
     field,
     yAxis,
     query,
     sort,
+    legendAlias,
   };
 }
diff --git a/static/app/views/dashboards/widgetBuilder/utils/getDefaultWidget.spec.tsx b/static/app/views/dashboards/widgetBuilder/utils/getDefaultWidget.spec.tsx
new file mode 100644
index 00000000000000..2dc0f335cfb38e
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/utils/getDefaultWidget.spec.tsx
@@ -0,0 +1,89 @@
+import {SessionField} from 'sentry/types/sessions';
+import {DisplayType, WidgetType} from 'sentry/views/dashboards/types';
+import {getDefaultWidget} from 'sentry/views/dashboards/widgetBuilder/utils/getDefaultWidget';
+
+describe('getDefaultWidget', () => {
+  it('should return a default widget for errors', () => {
+    const widget = getDefaultWidget(WidgetType.ERRORS);
+    expect(widget).toEqual({
+      displayType: DisplayType.TABLE,
+      interval: '',
+      title: 'Custom Widget',
+      widgetType: WidgetType.ERRORS,
+      queries: [
+        {
+          fields: ['count()'],
+          conditions: '',
+          aggregates: ['count()'],
+          columns: [],
+          orderby: '-count()',
+          fieldAliases: [],
+          name: '',
+        },
+      ],
+    });
+  });
+
+  it('should return a default widget for spans', () => {
+    const widget = getDefaultWidget(WidgetType.SPANS);
+    expect(widget).toEqual({
+      displayType: DisplayType.TABLE,
+      interval: '',
+      title: 'Custom Widget',
+      widgetType: WidgetType.SPANS,
+      queries: [
+        {
+          fields: ['count(span.duration)'],
+          conditions: '',
+          aggregates: ['count(span.duration)'],
+          columns: [],
+          orderby: '-count(span.duration)',
+          fieldAliases: [],
+          name: '',
+        },
+      ],
+    });
+  });
+
+  it('should return a default widget for issues', () => {
+    const widget = getDefaultWidget(WidgetType.ISSUE);
+    expect(widget).toEqual({
+      displayType: DisplayType.TABLE,
+      interval: '',
+      title: 'Custom Widget',
+      widgetType: WidgetType.ISSUE,
+      queries: [
+        {
+          fields: ['issue', 'assignee', 'title'] as string[],
+          columns: ['issue', 'assignee', 'title'],
+          conditions: '',
+          aggregates: [],
+          orderby: 'date',
+          fieldAliases: [],
+          name: '',
+        },
+      ],
+    });
+  });
+
+  it('should return a default widget for releases', () => {
+    const widget = getDefaultWidget(WidgetType.RELEASE);
+    expect(widget).toEqual({
+      displayType: DisplayType.TABLE,
+      interval: '',
+      title: 'Custom Widget',
+      widgetType: WidgetType.RELEASE,
+      queries: [
+        {
+          fields: [`crash_free_rate(${SessionField.SESSION})`],
+          columns: [],
+          fieldAliases: [],
+          aggregates: [`crash_free_rate(${SessionField.SESSION})`],
+          conditions: '',
+          orderby: `-crash_free_rate(${SessionField.SESSION})`,
+          name: '',
+        },
+      ],
+    });
+  });
+});
diff --git a/static/app/views/dashboards/widgetBuilder/utils/getDefaultWidget.tsx b/static/app/views/dashboards/widgetBuilder/utils/getDefaultWidget.tsx
new file mode 100644
index 00000000000000..b221822f7e692c
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/utils/getDefaultWidget.tsx
@@ -0,0 +1,13 @@
+import {getDatasetConfig} from 'sentry/views/dashboards/datasetConfig/base';
+import {DisplayType, type Widget, type WidgetType} from 'sentry/views/dashboards/types';
+
+export function getDefaultWidget(widgetType: WidgetType): Widget {
+  const config = getDatasetConfig(widgetType);
+  return {
+    displayType: DisplayType.TABLE,
+    interval: '',
+    title: 'Custom Widget',
+    widgetType,
+    queries: [config.defaultWidgetQuery],
+  };
+}
diff --git a/static/app/views/dashboards/widgetBuilder/widgetBuilder.spec.tsx b/static/app/views/dashboards/widgetBuilder/widgetBuilder.spec.tsx
index 3c471ed285e448..60190d5d3a6c6d 100644
--- a/static/app/views/dashboards/widgetBuilder/widgetBuilder.spec.tsx
+++ b/static/app/views/dashboards/widgetBuilder/widgetBuilder.spec.tsx
@@ -546,7 +546,7 @@ describe('WidgetBuilder', function () {
     const countFields = screen.getAllByText('count()');
     expect(countFields).toHaveLength(3);
 
-    await selectEvent.select(countFields[1], ['last_seen()']);
+    await selectEvent.select(countFields[1]!, ['last_seen()']);
 
     await userEvent.click(screen.getByText('Add Widget'));
 
@@ -1198,7 +1198,7 @@ describe('WidgetBuilder', function () {
 
     // Triggering the onBlur of the new field should not error
     await userEvent.click(
-      screen.getAllByPlaceholderText('Search for events, users, tags, and more')[1],
+      screen.getAllByPlaceholderText('Search for events, users, tags, and more')[1]!,
       {delay: null}
     );
     await userEvent.keyboard('{Escape}', {delay: null});
@@ -1267,7 +1267,7 @@ describe('WidgetBuilder', function () {
     await selectEvent.select(screen.getByText('Select group'), /project/);
 
     // Change the y-axis
-    await selectEvent.select(screen.getAllByText('count()')[0], 'eps()');
+    await selectEvent.select(screen.getAllByText('count()')[0]!, 'eps()');
 
     await waitFor(() => {
       expect(eventsStatsMock).toHaveBeenLastCalledWith(
@@ -1624,7 +1624,7 @@ describe('WidgetBuilder', function () {
 
     await userEvent.click(screen.getByLabelText('Add a Column'));
 
-    await userEvent.click(screen.getAllByPlaceholderText('Alias')[1]);
+    await userEvent.click(screen.getAllByPlaceholderText('Alias')[1]!);
     await userEvent.paste('Second Alias');
 
     await userEvent.click(screen.getByText('Add Widget'));
@@ -1646,9 +1646,9 @@ describe('WidgetBuilder', function () {
     });
 
     await userEvent.click(screen.getByText('Add an Equation'));
-    await userEvent.click(screen.getAllByPlaceholderText('Alias')[1]);
+    await userEvent.click(screen.getAllByPlaceholderText('Alias')[1]!);
     await userEvent.paste('This should persist');
-    await userEvent.type(screen.getAllByPlaceholderText('Alias')[0], 'A');
+    await userEvent.type(screen.getAllByPlaceholderText('Alias')[0]!, 'A');
 
     expect(await screen.findByText('This should persist')).toBeInTheDocument();
   });
@@ -1659,12 +1659,12 @@ describe('WidgetBuilder', function () {
     });
 
     await userEvent.click(screen.getByText('Add an Equation'));
-    await userEvent.click(screen.getAllByPlaceholderText('Alias')[1]);
+    await userEvent.click(screen.getAllByPlaceholderText('Alias')[1]!);
     await userEvent.paste('This should persist');
 
     // 1 for the table, 1 for the column selector, 1 for the sort
     await waitFor(() => expect(screen.getAllByText('count()')).toHaveLength(3));
-    await selectEvent.select(screen.getAllByText('count()')[1], /count_unique/);
+    await selectEvent.select(screen.getAllByText('count()')[1]!, /count_unique/);
 
     expect(screen.getByText('This should persist')).toBeInTheDocument();
   });
@@ -1677,7 +1677,7 @@ describe('WidgetBuilder', function () {
     await userEvent.click(await screen.findByText('Table'));
     await userEvent.click(screen.getByText('Line Chart'));
     await selectEvent.select(screen.getByText('Select group'), 'project');
-    await selectEvent.select(screen.getAllByText('count()')[1], 'count_unique(…)');
+    await selectEvent.select(screen.getAllByText('count()')[1]!, 'count_unique(…)');
 
     MockApiClient.clearMockResponses();
     eventsStatsMock = MockApiClient.addMockResponse({
@@ -2277,7 +2277,7 @@ describe('WidgetBuilder', function () {
       // Confirm modal doesn't open because no changes were made
       expect(mockModal).not.toHaveBeenCalled();
 
-      await userEvent.click(screen.getAllByLabelText('Remove this Y-Axis')[0]);
+      await userEvent.click(screen.getAllByLabelText('Remove this Y-Axis')[0]!);
       await userEvent.click(screen.getByText('High Throughput Transactions'));
 
       // Should not have overwritten widget data, and confirm modal should open
@@ -2318,7 +2318,7 @@ describe('WidgetBuilder', function () {
       });
 
       await selectEvent.select(await screen.findByText('Select group'), 'project');
-      await userEvent.click(screen.getAllByText('count()')[0], {
+      await userEvent.click(screen.getAllByText('count()')[0]!, {
         skipHover: true,
       });
       await userEvent.click(screen.getByText(/count_unique/), {
@@ -2377,7 +2377,7 @@ describe('WidgetBuilder', function () {
       await userEvent.click(await screen.findByText('Add Group'));
       expect(screen.getAllByLabelText('Remove group')).toHaveLength(2);
 
-      await userEvent.click(screen.getAllByLabelText('Remove group')[1]);
+      await userEvent.click(screen.getAllByLabelText('Remove group')[1]!);
       await waitFor(() =>
         expect(screen.queryByLabelText('Remove group')).not.toBeInTheDocument()
       );
diff --git a/static/app/views/dashboards/widgetBuilder/widgetBuilder.tsx b/static/app/views/dashboards/widgetBuilder/widgetBuilder.tsx
index f9a20b234a3ea0..8d6caedea19596 100644
--- a/static/app/views/dashboards/widgetBuilder/widgetBuilder.tsx
+++ b/static/app/views/dashboards/widgetBuilder/widgetBuilder.tsx
@@ -269,7 +269,7 @@ function WidgetBuilder({
           orderby:
             defaultWidgetQuery.orderby ||
             (datasetConfig.getTableSortOptions
-              ? datasetConfig.getTableSortOptions(organization, defaultWidgetQuery)[0]
+              ? datasetConfig.getTableSortOptions(organization, defaultWidgetQuery)[0]!
                   .value
               : ''),
         },
@@ -279,10 +279,10 @@ function WidgetBuilder({
         ![DisplayType.TABLE, DisplayType.TOP_N].includes(defaultState.displayType) &&
         !(
           getIsTimeseriesChart(defaultState.displayType) &&
-          defaultState.queries[0].columns.length
+          defaultState.queries[0]!.columns.length
         )
       ) {
-        defaultState.queries[0].orderby = '';
+        defaultState.queries[0]!.orderby = '';
       }
     } else {
       defaultState.queries = [{...datasetConfig.defaultWidgetQuery}];
@@ -327,7 +327,7 @@ function WidgetBuilder({
     }
 
     if (isEditing && isValidWidgetIndex) {
-      const widgetFromDashboard = dashboard.widgets[widgetIndexNum];
+      const widgetFromDashboard = dashboard.widgets[widgetIndexNum]!;
 
       let queries;
       let newDisplayType = widgetFromDashboard.displayType;
@@ -506,14 +506,14 @@ function WidgetBuilder({
 
       if (
         getIsTimeseriesChart(newDisplayType) &&
-        normalized[0].columns.filter(column => !!column).length
+        normalized[0]!.columns.filter(column => !!column).length
       ) {
         // If a limit already exists (i.e. going between timeseries) then keep it,
         // otherwise calculate a limit
         newState.limit =
           prevState.limit ??
           Math.min(
-            getResultsLimit(normalized.length, normalized[0].columns.length),
+            getResultsLimit(normalized.length, normalized[0]!.columns.length),
             DEFAULT_RESULTS_LIMIT
           );
       } else {
@@ -618,10 +618,10 @@ function WidgetBuilder({
       const newState = cloneDeep(prevState);
       const config = getDatasetConfig(DATA_SET_TO_WIDGET_TYPE[prevState.dataSet]);
       const query = cloneDeep(config.defaultWidgetQuery);
-      query.fields = prevState.queries[0].fields;
-      query.aggregates = prevState.queries[0].aggregates;
-      query.columns = prevState.queries[0].columns;
-      query.orderby = prevState.queries[0].orderby;
+      query.fields = prevState.queries[0]!.fields;
+      query.aggregates = prevState.queries[0]!.aggregates;
+      query.columns = prevState.queries[0]!.columns;
+      query.orderby = prevState.queries[0]!.orderby;
       newState.queries.push(query);
       return newState;
     });
@@ -649,7 +649,7 @@ function WidgetBuilder({
       const fieldStrings = newFields.map(generateFieldAsString);
       const splitFields = getColumnsAndAggregatesAsStrings(newFields);
       const newState = cloneDeep(state);
-      let newQuery = cloneDeep(newState.queries[0]);
+      let newQuery = cloneDeep(newState.queries[0]!);
 
       newQuery.fields = fieldStrings;
       newQuery.aggregates = splitFields.aggregates;
@@ -720,13 +720,13 @@ function WidgetBuilder({
     });
 
     if (defined(newSelectedAggregate)) {
-      newQueries[0].selectedAggregate = newSelectedAggregate;
+      newQueries[0]!.selectedAggregate = newSelectedAggregate;
     }
 
     set(newState, 'queries', newQueries);
     set(newState, 'userHasModified', true);
 
-    const groupByFields = newState.queries[0].columns.filter(
+    const groupByFields = newState.queries[0]!.columns.filter(
       field => !(field === 'equation|')
     );
     if (groupByFields.length === 0) {
@@ -737,7 +737,7 @@ function WidgetBuilder({
         'limit',
         Math.min(
           newState.limit ?? DEFAULT_RESULTS_LIMIT,
-          getResultsLimit(newQueries.length, newQueries[0].aggregates.length)
+          getResultsLimit(newQueries.length, newQueries[0]!.aggregates.length)
         )
       );
     }
@@ -770,7 +770,7 @@ function WidgetBuilder({
         if (!orderOptions.length) {
           newQuery.orderby = '';
         } else {
-          orderOption = orderOptions[0].value;
+          orderOption = orderOptions[0]!.value;
           newQuery.orderby = `-${orderOption}`;
         }
       }
@@ -780,7 +780,7 @@ function WidgetBuilder({
     set(newState, 'userHasModified', true);
     set(newState, 'queries', newQueries);
 
-    const groupByFields = newState.queries[0].columns.filter(
+    const groupByFields = newState.queries[0]!.columns.filter(
       field => !(field === 'equation|')
     );
 
@@ -792,7 +792,7 @@ function WidgetBuilder({
         'limit',
         Math.min(
           newState.limit ?? DEFAULT_RESULTS_LIMIT,
-          getResultsLimit(newQueries.length, newQueries[0].aggregates.length)
+          getResultsLimit(newQueries.length, newQueries[0]!.aggregates.length)
         )
       );
     }
@@ -950,10 +950,10 @@ function WidgetBuilder({
       queryNames: [],
       queryConditions: [],
       queryFields: [
-        ...widgetData.queries[0].columns,
-        ...widgetData.queries[0].aggregates,
+        ...widgetData.queries[0]!.columns,
+        ...widgetData.queries[0]!.aggregates,
       ],
-      queryOrderby: widgetData.queries[0].orderby,
+      queryOrderby: widgetData.queries[0]!.orderby,
     };
 
     widgetData.queries.forEach(query => {
@@ -1040,9 +1040,9 @@ function WidgetBuilder({
   }
 
   function handleWidgetDataFetched(tableData: TableDataWithTitle[]) {
-    const tableMeta = {...tableData[0].meta};
+    const tableMeta = {...tableData[0]!.meta};
     const keys = Object.keys(tableMeta);
-    const field = keys[0];
+    const field = keys[0]!;
     const dataType = tableMeta[field];
     const dataUnit = tableMeta.units?.[field];
 
@@ -1099,7 +1099,7 @@ function WidgetBuilder({
 
   // Tabular visualizations will always have only one query and that query cannot be deleted,
   // so we will always have the first query available to get data from.
-  const {columns, aggregates, fields, fieldAliases = []} = state.queries[0];
+  const {columns, aggregates, fields, fieldAliases = []} = state.queries[0]!;
 
   const explodedColumns = useMemo(() => {
     return columns.map((field, index) =>
@@ -1137,10 +1137,10 @@ function WidgetBuilder({
   }
 
   const widgetDiscoverSplitSource = isValidWidgetIndex
-    ? dashboard.widgets[widgetIndexNum].datasetSource
+    ? dashboard.widgets[widgetIndexNum]!.datasetSource
     : undefined;
   const originalWidgetType = isValidWidgetIndex
-    ? dashboard.widgets[widgetIndexNum].widgetType
+    ? dashboard.widgets[widgetIndexNum]!.widgetType
     : undefined;
 
   return (
@@ -1276,7 +1276,7 @@ function WidgetBuilder({
                                       }}
                                       aggregates={explodedAggregates}
                                       selectedAggregate={
-                                        state.queries[0].selectedAggregate
+                                        state.queries[0]!.selectedAggregate
                                       }
                                       tags={tags}
                                     />
diff --git a/static/app/views/dashboards/widgetBuilder/widgetBuilderDataset.spec.tsx b/static/app/views/dashboards/widgetBuilder/widgetBuilderDataset.spec.tsx
index 9b2f23c241c1d8..6a70e896736f2b 100644
--- a/static/app/views/dashboards/widgetBuilder/widgetBuilderDataset.spec.tsx
+++ b/static/app/views/dashboards/widgetBuilder/widgetBuilderDataset.spec.tsx
@@ -413,7 +413,7 @@ describe('WidgetBuilder', function () {
       expect(screen.getByText('High to low')).toBeInTheDocument();
 
       // Selector "sortBy"
-      await userEvent.click(screen.getAllByText('crash_free_rate(session)')[1], {
+      await userEvent.click(screen.getAllByText('crash_free_rate(session)')[1]!, {
         delay: null,
       });
 
@@ -627,7 +627,7 @@ describe('WidgetBuilder', function () {
       const menu = screen.getByRole('listbox');
       const groups = within(menu).getAllByRole('group');
 
-      const all = groups[0];
+      const all = groups[0]!;
       expect(within(all).getByRole('option', {name: 'environment'})).toBeInTheDocument();
       expect(within(all).getByRole('option', {name: 'project'})).toBeInTheDocument();
       expect(within(all).getByRole('option', {name: 'release'})).toBeInTheDocument();
@@ -754,8 +754,8 @@ describe('WidgetBuilder', function () {
         )
       ).toHaveLength(3);
 
-      await userEvent.click(screen.getAllByLabelText('Remove column')[1]);
-      await userEvent.click(screen.getAllByLabelText('Remove column')[0]);
+      await userEvent.click(screen.getAllByLabelText('Remove column')[1]!);
+      await userEvent.click(screen.getAllByLabelText('Remove column')[0]!);
 
       expect(
         within(screen.getByTestId('choose-column-step')).getByText('issue')
@@ -817,7 +817,7 @@ describe('WidgetBuilder', function () {
 
       await userEvent.click(screen.getByText('Issues (States, Assignment, Time, etc.)'));
 
-      await userEvent.type(screen.getAllByPlaceholderText('Alias')[0], 'First Alias');
+      await userEvent.type(screen.getAllByPlaceholderText('Alias')[0]!, 'First Alias');
 
       await userEvent.click(screen.getByText('Add Widget'));
 
@@ -868,7 +868,7 @@ describe('WidgetBuilder', function () {
         const countFields = screen.getAllByText('count()');
         expect(countFields).toHaveLength(3);
 
-        await selectEvent.select(countFields[1], ['p99(…)']);
+        await selectEvent.select(countFields[1]!, ['p99(…)']);
         await selectEvent.select(screen.getByText('transaction.duration'), [
           'measurements.custom.measurement',
         ]);
@@ -1069,13 +1069,13 @@ describe('WidgetBuilder', function () {
 
         expect(await screen.findByText('Custom Widget')).toBeInTheDocument();
 
-        await selectEvent.select(screen.getAllByText('count()')[1], ['p99(…)']);
+        await selectEvent.select(screen.getAllByText('count()')[1]!, ['p99(…)']);
         await userEvent.click(screen.getByText('transaction.duration'));
         screen.getByText('measurements.custom.measurement');
         expect(
           screen.queryByText('measurements.another.custom.measurement')
         ).not.toBeInTheDocument();
-        await selectEvent.select(screen.getAllByText('p99(…)')[0], ['p95(…)']);
+        await selectEvent.select(screen.getAllByText('p99(…)')[0]!, ['p95(…)']);
         await userEvent.click(screen.getByText('transaction.duration'));
         screen.getByText('measurements.another.custom.measurement');
         expect(
@@ -1296,7 +1296,7 @@ describe('WidgetBuilder', function () {
           orgFeatures: [...defaultOrgFeatures],
         });
         await screen.findByText('transaction');
-        await userEvent.click(screen.getAllByText('count()')[1]);
+        await userEvent.click(screen.getAllByText('count()')[1]!);
         expect(
           await screen.findByText('measurements.custom.measurement')
         ).toBeInTheDocument();
@@ -1340,7 +1340,7 @@ describe('WidgetBuilder', function () {
           await screen.findByText('p99(measurements.custom.measurement)')
         ).toBeInTheDocument();
         // Delete p99(measurements.custom.measurement) column
-        await userEvent.click(screen.getAllByLabelText('Remove column')[0]);
+        await userEvent.click(screen.getAllByLabelText('Remove column')[0]!);
         expect(
           screen.queryByText('p99(measurements.custom.measurement)')
         ).not.toBeInTheDocument();
diff --git a/static/app/views/dashboards/widgetBuilder/widgetBuilderSortBy.spec.tsx b/static/app/views/dashboards/widgetBuilder/widgetBuilderSortBy.spec.tsx
index 19447f3caac89d..694d53e55ee367 100644
--- a/static/app/views/dashboards/widgetBuilder/widgetBuilderSortBy.spec.tsx
+++ b/static/app/views/dashboards/widgetBuilder/widgetBuilderSortBy.spec.tsx
@@ -359,7 +359,7 @@ describe('WidgetBuilder', function () {
       // Selector "sortBy"
       expect(screen.getAllByText('count()')).toHaveLength(3);
 
-      await selectEvent.select(screen.getAllByText('count()')[2], 'count_unique(id)');
+      await selectEvent.select(screen.getAllByText('count()')[2]!, 'count_unique(id)');
 
       // Wait for the Builder update the widget values
       await waitFor(() => {
@@ -445,13 +445,13 @@ describe('WidgetBuilder', function () {
       expect(screen.queryByText('Sort by a y-axis')).not.toBeInTheDocument();
 
       // Select GroupBy value
-      await selectEvent.select(screen.getAllByText('Select group')[0], 'project');
+      await selectEvent.select(screen.getAllByText('Select group')[0]!, 'project');
 
       // Now that at least one groupBy value is selected, the SortBy step shall be visible
       expect(screen.getByText('Sort by a y-axis')).toBeInTheDocument();
 
       // Remove selected GroupBy value
-      await userEvent.click(screen.getAllByLabelText('Remove group')[0]);
+      await userEvent.click(screen.getAllByLabelText('Remove group')[0]!);
 
       // SortBy step shall no longer be visible
       expect(screen.queryByText('Sort by a y-axis')).not.toBeInTheDocument();
@@ -467,7 +467,7 @@ describe('WidgetBuilder', function () {
 
       await selectEvent.select(await screen.findByText('Select group'), 'project');
       expect(screen.getAllByText('count()')).toHaveLength(2);
-      await selectEvent.select(screen.getAllByText('count()')[1], 'Custom Equation');
+      await selectEvent.select(screen.getAllByText('count()')[1]!, 'Custom Equation');
       await userEvent.click(screen.getByPlaceholderText('Enter Equation'));
       await userEvent.paste('count_unique(user) * 2');
       await userEvent.keyboard('{Enter}');
@@ -495,7 +495,7 @@ describe('WidgetBuilder', function () {
 
       await selectEvent.select(await screen.findByText('Select group'), 'project');
       expect(screen.getAllByText('count()')).toHaveLength(2);
-      await selectEvent.select(screen.getAllByText('count()')[1], 'Custom Equation');
+      await selectEvent.select(screen.getAllByText('count()')[1]!, 'Custom Equation');
       await userEvent.click(screen.getByPlaceholderText('Enter Equation'));
       await userEvent.paste('count_unique(user) * 2');
       await userEvent.keyboard('{Enter}');
@@ -506,7 +506,7 @@ describe('WidgetBuilder', function () {
       expect(screen.getAllByText('project')).toHaveLength(2);
 
       // Switch back, the equation should still be visible
-      await selectEvent.select(screen.getAllByText('project')[1], 'Custom Equation');
+      await selectEvent.select(screen.getAllByText('project')[1]!, 'Custom Equation');
       expect(screen.getByPlaceholderText('Enter Equation')).toHaveValue(
         'count_unique(user) * 2'
       );
@@ -522,7 +522,7 @@ describe('WidgetBuilder', function () {
 
       await selectEvent.select(await screen.findByText('Select group'), 'project');
       expect(screen.getAllByText('count()')).toHaveLength(2);
-      await selectEvent.select(screen.getAllByText('count()')[1], 'Custom Equation');
+      await selectEvent.select(screen.getAllByText('count()')[1]!, 'Custom Equation');
       await userEvent.click(screen.getByPlaceholderText('Enter Equation'));
       await userEvent.paste('count_unique(user) * 2');
       await userEvent.keyboard('{Enter}');
@@ -581,7 +581,7 @@ describe('WidgetBuilder', function () {
 
       await selectEvent.select(await screen.findByText('Select group'), 'project');
       expect(screen.getAllByText('count()')).toHaveLength(2);
-      await selectEvent.select(screen.getAllByText('count()')[1], 'Custom Equation');
+      await selectEvent.select(screen.getAllByText('count()')[1]!, 'Custom Equation');
       await selectEvent.openMenu(screen.getByPlaceholderText('Enter Equation'));
 
       await userEvent.click(screen.getByPlaceholderText('Enter Equation'));
@@ -600,7 +600,7 @@ describe('WidgetBuilder', function () {
 
       await selectEvent.select(await screen.findByText('Select group'), 'project');
       expect(screen.getAllByText('count()')).toHaveLength(2);
-      await selectEvent.select(screen.getAllByText('count()')[1], 'Custom Equation');
+      await selectEvent.select(screen.getAllByText('count()')[1]!, 'Custom Equation');
       await userEvent.click(screen.getByPlaceholderText('Enter Equation'));
       await userEvent.paste('count_unique(user) * 2');
       await userEvent.keyboard('{Enter}');
@@ -634,7 +634,7 @@ describe('WidgetBuilder', function () {
 
       await selectEvent.select(await screen.findByText('Select group'), 'project');
       await userEvent.click(screen.getByText('Add an Equation'));
-      await userEvent.click(screen.getAllByLabelText('Remove this Y-Axis')[0]);
+      await userEvent.click(screen.getAllByLabelText('Remove this Y-Axis')[0]!);
 
       expect(screen.queryByPlaceholderText('Enter Equation')).not.toBeInTheDocument();
     });
@@ -651,8 +651,8 @@ describe('WidgetBuilder', function () {
       expect(screen.getAllByText('count()')).toHaveLength(2);
 
       // Change the sort option to a grouping field, and then change a y-axis
-      await selectEvent.select(screen.getAllByText('count()')[1], 'project');
-      await selectEvent.select(screen.getAllByText('count()')[0], /count_unique/);
+      await selectEvent.select(screen.getAllByText('count()')[1]!, 'project');
+      await selectEvent.select(screen.getAllByText('count()')[0]!, /count_unique/);
 
       // project should appear in the group by field, as well as the sort field
       expect(screen.getAllByText('project')).toHaveLength(2);
@@ -670,7 +670,7 @@ describe('WidgetBuilder', function () {
       await selectEvent.select(screen.getByText('Select group'), 'project');
 
       // Change the sort by to count_unique
-      await selectEvent.select(screen.getAllByText('count()')[1], /count_unique/);
+      await selectEvent.select(screen.getAllByText('count()')[1]!, /count_unique/);
 
       // Change the grouping
       await selectEvent.select(screen.getByText('project'), 'environment');
@@ -689,7 +689,7 @@ describe('WidgetBuilder', function () {
       });
 
       await selectEvent.select(await screen.findByText('Select group'), 'project');
-      await selectEvent.select(screen.getAllByText('count()')[1], 'Custom Equation');
+      await selectEvent.select(screen.getAllByText('count()')[1]!, 'Custom Equation');
       await userEvent.click(screen.getByPlaceholderText('Enter Equation'));
       await userEvent.paste('count_unique(user) * 2');
       await userEvent.keyboard('{Enter}');
@@ -788,7 +788,7 @@ describe('WidgetBuilder', function () {
 
       await selectEvent.select(await screen.findByText('Select group'), 'project');
       expect(screen.getAllByText('count()')).toHaveLength(2);
-      await selectEvent.select(screen.getAllByText('count()')[1], /count_unique/);
+      await selectEvent.select(screen.getAllByText('count()')[1]!, /count_unique/);
 
       await userEvent.click(screen.getByText('Line Chart'));
       await userEvent.click(screen.getByText('Table'));
@@ -813,7 +813,7 @@ describe('WidgetBuilder', function () {
 
       await selectEvent.select(screen.getByText('Select group'), 'project');
       expect(screen.getAllByText('count()')).toHaveLength(2);
-      await selectEvent.select(screen.getAllByText('count()')[1], 'count() * 100');
+      await selectEvent.select(screen.getAllByText('count()')[1]!, 'count() * 100');
     });
 
     it('does not reset the orderby when ordered by an equation in table', async function () {
@@ -887,7 +887,7 @@ describe('WidgetBuilder', function () {
     });
 
     const projectElements = screen.getAllByText('project');
-    await selectEvent.select(projectElements[projectElements.length - 1], 'count()');
+    await selectEvent.select(projectElements[projectElements.length - 1]!, 'count()');
 
     await waitFor(() => {
       expect(eventsMock).toHaveBeenCalledWith(
@@ -912,7 +912,7 @@ describe('WidgetBuilder', function () {
 
     await selectEvent.select(await screen.findByText('Select group'), 'project');
     expect(screen.getAllByText('count()')).toHaveLength(2);
-    await selectEvent.select(screen.getAllByText('count()')[1], 'Custom Equation');
+    await selectEvent.select(screen.getAllByText('count()')[1]!, 'Custom Equation');
     await userEvent.click(screen.getByPlaceholderText('Enter Equation'));
     await userEvent.paste('count_unique(user) * 2');
     await userEvent.keyboard('{Enter}');
diff --git a/static/app/views/dashboards/widgetBuilder/widgetLibrary/index.tsx b/static/app/views/dashboards/widgetBuilder/widgetLibrary/index.tsx
index 581a8271d7dc77..a8d36f440e01d0 100644
--- a/static/app/views/dashboards/widgetBuilder/widgetLibrary/index.tsx
+++ b/static/app/views/dashboards/widgetBuilder/widgetLibrary/index.tsx
@@ -55,7 +55,7 @@ export function WidgetLibrary({
         {defaultWidgets.map((widget, index) => {
           const iconColor = theme.charts.getColorPalette(defaultWidgets.length - 2)[
             index
-          ];
+          ]!;
 
           const displayType =
             widget.displayType === DisplayType.TOP_N
@@ -66,7 +66,7 @@ export function WidgetLibrary({
             displayType,
             queries: widget.queries,
             widgetType: widget.widgetType,
-            organization: organization,
+            organization,
           });
 
           const newWidget = {
diff --git a/static/app/views/dashboards/widgetCard/chart.tsx b/static/app/views/dashboards/widgetCard/chart.tsx
index b648a20fb370f4..f9c7d0741f9877 100644
--- a/static/app/views/dashboards/widgetCard/chart.tsx
+++ b/static/app/views/dashboards/widgetCard/chart.tsx
@@ -3,7 +3,7 @@ import {Component} from 'react';
 import type {Theme} from '@emotion/react';
 import {withTheme} from '@emotion/react';
 import styled from '@emotion/styled';
-import type {DataZoomComponentOption, LegendComponentOption} from 'echarts';
+import type {LegendComponentOption} from 'echarts';
 import type {Location} from 'history';
 import isEqual from 'lodash/isEqual';
 import omit from 'lodash/omit';
@@ -65,15 +65,6 @@ import type {GenericWidgetQueriesChildrenProps} from './genericWidgetQueries';
 
 const OTHER = 'Other';
 const PERCENTAGE_DECIMAL_POINTS = 3;
-export const SLIDER_HEIGHT = 60;
-
-export type AugmentedEChartDataZoomHandler = (
-  params: Parameters<EChartDataZoomHandler>[0] & {
-    seriesEnd: string | number;
-    seriesStart: string | number;
-  },
-  instance: Parameters<EChartDataZoomHandler>[1]
-) => void;
 
 type TableResultProps = Pick<
   GenericWidgetQueriesChildrenProps,
@@ -91,7 +82,6 @@ type WidgetCardChartProps = Pick<
   widget: Widget;
   widgetLegendState: WidgetLegendSelectionState;
   chartGroup?: string;
-  chartZoomOptions?: DataZoomComponentOption;
   expandNumbers?: boolean;
   isMobile?: boolean;
   legendOptions?: LegendComponentOption;
@@ -101,9 +91,8 @@ type WidgetCardChartProps = Pick<
     selected: Record<string, boolean>;
     type: 'legendselectchanged';
   }>;
-  onZoom?: AugmentedEChartDataZoomHandler;
+  onZoom?: EChartDataZoomHandler;
   shouldResize?: boolean;
-  showSlider?: boolean;
   timeseriesResultsTypes?: Record<string, AggregationOutputType>;
   windowWidth?: number;
 };
@@ -163,7 +152,7 @@ class WidgetCardChart extends Component<WidgetCardChartProps> {
     return tableResults.map((result, i) => {
       const fields = widget.queries[i]?.fields?.map(stripDerivedMetricsPrefix) ?? [];
       const fieldAliases = widget.queries[i]?.fieldAliases ?? [];
-      const eventView = eventViewFromWidget(widget.title, widget.queries[0], selection);
+      const eventView = eventViewFromWidget(widget.title, widget.queries[0]!, selection);
 
       return (
         <TableWrapper key={`table:${result.title}`}>
@@ -209,12 +198,12 @@ class WidgetCardChart extends Component<WidgetCardChartProps> {
       const tableMeta = {...result.meta};
       const fields = Object.keys(tableMeta?.fields ?? {});
 
-      let field = fields[0];
+      let field = fields[0]!;
       let selectedField = field;
 
-      if (defined(widget.queries[0].selectedAggregate)) {
-        const index = widget.queries[0].selectedAggregate;
-        selectedField = widget.queries[0].aggregates[index];
+      if (defined(widget.queries[0]!.selectedAggregate)) {
+        const index = widget.queries[0]!.selectedAggregate;
+        selectedField = widget.queries[0]!.aggregates[index]!;
         if (fields.includes(selectedField)) {
           field = selectedField;
         }
@@ -268,11 +257,11 @@ class WidgetCardChart extends Component<WidgetCardChartProps> {
 
   chartComponent(chartProps): React.ReactNode {
     const {widget} = this.props;
-    const stacked = widget.queries[0]?.columns.length > 0;
+    const stacked = widget.queries[0]!?.columns.length > 0;
 
     switch (widget.displayType) {
       case 'bar':
-        return <BarChart {...chartProps} stacked={stacked} />;
+        return <BarChart {...chartProps} stacked={stacked} animation={false} />;
       case 'area':
       case 'top_n':
         return <AreaChart stacked {...chartProps} />;
@@ -292,9 +281,7 @@ class WidgetCardChart extends Component<WidgetCardChartProps> {
       widget,
       onZoom,
       legendOptions,
-      showSlider,
       noPadding,
-      chartZoomOptions,
       timeseriesResultsTypes,
       shouldResize,
     } = this.props;
@@ -339,7 +326,8 @@ class WidgetCardChart extends Component<WidgetCardChartProps> {
       top: 0,
       selected: getSeriesSelection(location),
       formatter: (seriesName: string) => {
-        seriesName = WidgetLegendNameEncoderDecoder.decodeSeriesNameForLegend(seriesName);
+        seriesName =
+          WidgetLegendNameEncoderDecoder.decodeSeriesNameForLegend(seriesName)!;
         const arg = getAggregateArg(seriesName);
         if (arg !== null) {
           const slug = getMeasurementSlug(arg);
@@ -361,7 +349,7 @@ class WidgetCardChart extends Component<WidgetCardChartProps> {
     // Check to see if all series output types are the same. If not, then default to number.
     const outputType =
       timeseriesResultsTypes && new Set(Object.values(timeseriesResultsTypes)).size === 1
-        ? timeseriesResultsTypes[axisLabel]
+        ? timeseriesResultsTypes[axisLabel]!
         : 'number';
     const isDurationChart = outputType === 'duration';
     const durationUnit = isDurationChart
@@ -383,7 +371,7 @@ class WidgetCardChart extends Component<WidgetCardChartProps> {
     };
 
     const nameFormatter = (name: string) => {
-      return WidgetLegendNameEncoderDecoder.decodeSeriesNameForLegend(name);
+      return WidgetLegendNameEncoderDecoder.decodeSeriesNameForLegend(name)!;
     };
 
     const chartOptions = {
@@ -393,7 +381,7 @@ class WidgetCardChart extends Component<WidgetCardChartProps> {
         left: 0,
         right: 4,
         top: '40px',
-        bottom: showSlider ? SLIDER_HEIGHT : 0,
+        bottom: 0,
       },
       seriesOptions: {
         showSymbol: false,
@@ -469,14 +457,7 @@ class WidgetCardChart extends Component<WidgetCardChartProps> {
     };
 
     return (
-      <ChartZoom
-        period={period}
-        start={start}
-        end={end}
-        utc={utc}
-        showSlider={showSlider}
-        chartZoomOptions={chartZoomOptions}
-      >
+      <ChartZoom period={period} start={start} end={end} utc={utc}>
         {zoomRenderProps => {
           if (errorMessage) {
             return (
@@ -519,9 +500,6 @@ class WidgetCardChart extends Component<WidgetCardChartProps> {
                 .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;
-          const seriesEnd = series[0]?.data[series[0].data.length - 1]?.name;
-
           const forwardedRef = this.props.chartGroup ? this.handleRef : undefined;
 
           return widgetLegendState.widgetRequiresLegendUnselection(widget) ? (
@@ -554,15 +532,7 @@ class WidgetCardChart extends Component<WidgetCardChartProps> {
                           ...zoomRenderProps,
                           ...chartOptions,
                           // Override default datazoom behaviour for updating Global Selection Header
-                          ...(onZoom
-                            ? {
-                                onDataZoom: (evt, chartProps) =>
-                                  // Need to pass seriesStart and seriesEnd to onZoom since slider zooms
-                                  // callback with percentage instead of datetime values. Passing seriesStart
-                                  // and seriesEnd allows calculating datetime values with percentage.
-                                  onZoom({...evt, seriesStart, seriesEnd}, chartProps),
-                              }
-                            : {}),
+                          ...(onZoom ? {onDataZoom: onZoom} : {}),
                           legend,
                           series: [...series, ...(modifiedReleaseSeriesResults ?? [])],
                           onLegendSelectChanged,
@@ -584,15 +554,7 @@ class WidgetCardChart extends Component<WidgetCardChartProps> {
                     ...zoomRenderProps,
                     ...chartOptions,
                     // Override default datazoom behaviour for updating Global Selection Header
-                    ...(onZoom
-                      ? {
-                          onDataZoom: (evt, chartProps) =>
-                            // Need to pass seriesStart and seriesEnd to onZoom since slider zooms
-                            // callback with percentage instead of datetime values. Passing seriesStart
-                            // and seriesEnd allows calculating datetime values with percentage.
-                            onZoom({...evt, seriesStart, seriesEnd}, chartProps),
-                        }
-                      : {}),
+                    ...(onZoom ? {onDataZoom: onZoom} : {}),
                     legend,
                     series,
                     onLegendSelectChanged,
diff --git a/static/app/views/dashboards/widgetCard/genericWidgetQueries.tsx b/static/app/views/dashboards/widgetCard/genericWidgetQueries.tsx
index 03182af966bb79..93258931b48eb1 100644
--- a/static/app/views/dashboards/widgetCard/genericWidgetQueries.tsx
+++ b/static/app/views/dashboards/widgetCard/genericWidgetQueries.tsx
@@ -179,11 +179,10 @@ class GenericWidgetQueries<SeriesResponse, TableResponse> extends Component<
     ) {
       // If the query names has changed, then update timeseries labels
 
-      // eslint-disable-next-line react/no-did-update-set-state
       this.setState(prevState => {
         const timeseriesResults = widget.queries.reduce((acc: Series[], query, index) => {
           return acc.concat(
-            config.transformSeries!(prevState.rawResults![index], query, organization)
+            config.transformSeries!(prevState.rawResults![index]!, query, organization)
           );
         }, []);
 
@@ -268,7 +267,7 @@ class GenericWidgetQueries<SeriesResponse, TableResponse> extends Component<
       // Cast so we can add the title.
       const transformedData = config.transformTable(
         data,
-        widget.queries[0],
+        widget.queries[0]!,
         organization,
         selection
       ) as TableDataWithTitle;
@@ -330,7 +329,7 @@ class GenericWidgetQueries<SeriesResponse, TableResponse> extends Component<
       rawResultsClone[requestIndex] = data;
       const transformedResult = config.transformSeries!(
         data,
-        widget.queries[requestIndex],
+        widget.queries[requestIndex]!,
         organization
       );
       // When charting timeseriesData on echarts, color association to a timeseries result
@@ -348,8 +347,8 @@ class GenericWidgetQueries<SeriesResponse, TableResponse> extends Component<
     // Get series result type
     // Only used by custom measurements in errorsAndTransactions at the moment
     const timeseriesResultsTypes = config.getSeriesResultType?.(
-      responses[0][0],
-      widget.queries[0]
+      responses[0]![0],
+      widget.queries[0]!
     );
 
     if (this._isMounted && this.state.queryFetchID === queryFetchID) {
diff --git a/static/app/views/dashboards/widgetCard/index.spec.tsx b/static/app/views/dashboards/widgetCard/index.spec.tsx
index 65119b759d3438..2f5883f5cd6ee0 100644
--- a/static/app/views/dashboards/widgetCard/index.spec.tsx
+++ b/static/app/views/dashboards/widgetCard/index.spec.tsx
@@ -145,7 +145,7 @@ describe('Dashboards > WidgetCard', function () {
     renderWithProviders(
       <WidgetCard
         api={api}
-        widget={{...multipleQueryWidget, queries: [multipleQueryWidget.queries[0]]}}
+        widget={{...multipleQueryWidget, queries: [multipleQueryWidget.queries[0]!]}}
         selection={selection}
         isEditingDashboard={false}
         onDelete={() => undefined}
@@ -194,7 +194,7 @@ describe('Dashboards > WidgetCard', function () {
           ...multipleQueryWidget,
           queries: [
             {
-              ...multipleQueryWidget.queries[0],
+              ...multipleQueryWidget.queries[0]!,
               fields: [
                 'equation|(count() + failure_count()) / count_if(transaction.duration,equals,300)',
               ],
@@ -233,7 +233,7 @@ describe('Dashboards > WidgetCard', function () {
           displayType: DisplayType.TOP_N,
           queries: [
             {
-              ...multipleQueryWidget.queries[0],
+              ...multipleQueryWidget.queries[0]!,
               fields: ['transaction', 'count()'],
               columns: ['transaction'],
               aggregates: ['count()'],
@@ -268,7 +268,7 @@ describe('Dashboards > WidgetCard', function () {
           displayType: DisplayType.LINE,
           queries: [
             {
-              ...multipleQueryWidget.queries[0],
+              ...multipleQueryWidget.queries[0]!,
               conditions: '',
               fields: [],
               columns: [],
@@ -303,7 +303,7 @@ describe('Dashboards > WidgetCard', function () {
         widget={{
           ...multipleQueryWidget,
           displayType: DisplayType.AREA,
-          queries: [{...multipleQueryWidget.queries[0], fields: ['count()']}],
+          queries: [{...multipleQueryWidget.queries[0]!, fields: ['count()']}],
         }}
         selection={selection}
         isEditingDashboard={false}
@@ -330,7 +330,7 @@ describe('Dashboards > WidgetCard', function () {
         widget={{
           ...multipleQueryWidget,
           displayType: DisplayType.AREA,
-          queries: [{...multipleQueryWidget.queries[0], fields: ['count()']}],
+          queries: [{...multipleQueryWidget.queries[0]!, fields: ['count()']}],
         }}
         selection={selection}
         isEditingDashboard={false}
@@ -357,7 +357,7 @@ describe('Dashboards > WidgetCard', function () {
         widget={{
           ...multipleQueryWidget,
           displayType: DisplayType.AREA,
-          queries: [{...multipleQueryWidget.queries[0], fields: ['count()']}],
+          queries: [{...multipleQueryWidget.queries[0]!, fields: ['count()']}],
         }}
         selection={selection}
         isEditingDashboard={false}
@@ -384,7 +384,7 @@ describe('Dashboards > WidgetCard', function () {
         widget={{
           ...multipleQueryWidget,
           displayType: DisplayType.AREA,
-          queries: [{...multipleQueryWidget.queries[0], fields: ['count()']}],
+          queries: [{...multipleQueryWidget.queries[0]!, fields: ['count()']}],
         }}
         selection={selection}
         isEditingDashboard={false}
@@ -418,7 +418,7 @@ describe('Dashboards > WidgetCard', function () {
         widget={{
           ...multipleQueryWidget,
           displayType: DisplayType.TABLE,
-          queries: [{...multipleQueryWidget.queries[0], fields: ['count()']}],
+          queries: [{...multipleQueryWidget.queries[0]!, fields: ['count()']}],
         }}
         selection={selection}
         isEditingDashboard={false}
@@ -453,7 +453,7 @@ describe('Dashboards > WidgetCard', function () {
         widget={{
           ...multipleQueryWidget,
           displayType: DisplayType.TABLE,
-          queries: [{...multipleQueryWidget.queries[0], fields: ['count()']}],
+          queries: [{...multipleQueryWidget.queries[0]!, fields: ['count()']}],
         }}
         selection={selection}
         isEditingDashboard={false}
@@ -652,11 +652,12 @@ describe('Dashboards > WidgetCard', function () {
     await waitFor(() => {
       const mockCall = spy.mock.calls?.at(-1)?.[0];
       expect(mockCall?.tooltip).toBeDefined();
-      // @ts-expect-error
-      expect(mockCall?.yAxis.axisLabel.formatter(24, 'p95(measurements.custom)')).toEqual(
-        '24ms'
-      );
     });
+    const mockCall = spy.mock.calls?.at(-1)?.[0];
+    // @ts-expect-error
+    expect(mockCall?.yAxis.axisLabel.formatter(24, 'p95(measurements.custom)')).toBe(
+      '24ms'
+    );
   });
 
   it('renders label in seconds when there is a transition from seconds to minutes in the y axis', async function () {
@@ -750,14 +751,14 @@ describe('Dashboards > WidgetCard', function () {
     await waitFor(() => {
       const mockCall = spy.mock.calls?.at(-1)?.[0];
       expect(mockCall?.yAxis).toBeDefined();
-
-      expect(
-        // @ts-expect-error
-        mockCall?.yAxis.axisLabel.formatter(60000, 'p50(transaction.duration)')
-      ).toEqual('60s');
-      // @ts-expect-error
-      expect(mockCall?.yAxis?.minInterval).toEqual(SECOND);
     });
+    const mockCall = spy.mock.calls?.at(-1)?.[0];
+    expect(
+      // @ts-expect-error
+      mockCall?.yAxis.axisLabel.formatter(60000, 'p50(transaction.duration)')
+    ).toBe('60s');
+    // @ts-expect-error
+    expect(mockCall?.yAxis?.minInterval).toEqual(SECOND);
   });
 
   it('displays indexed badge in preview mode', async function () {
diff --git a/static/app/views/dashboards/widgetCard/index.tsx b/static/app/views/dashboards/widgetCard/index.tsx
index 2dcdc100d9ec90..170c290362ceb2 100644
--- a/static/app/views/dashboards/widgetCard/index.tsx
+++ b/static/app/views/dashboards/widgetCard/index.tsx
@@ -67,6 +67,7 @@ type Props = WithRouterProps & {
   widget: Widget;
   widgetLegendState: WidgetLegendSelectionState;
   widgetLimitReached: boolean;
+  borderless?: boolean;
   dashboardFilters?: DashboardFilters;
   disableFullscreen?: boolean;
   hasEditAccess?: boolean;
@@ -138,7 +139,7 @@ function WidgetCard(props: Props) {
       ...query,
       // Use the last aggregate because that's where the y-axis is stored
       aggregates: query.aggregates.length
-        ? [query.aggregates[query.aggregates.length - 1]]
+        ? [query.aggregates[query.aggregates.length - 1]!]
         : [],
     }));
     widget.queries = queries;
@@ -269,12 +270,12 @@ function WidgetCard(props: Props) {
               const tableMeta = tableResults?.[0]?.meta as Meta | undefined;
               const fields = Object.keys(tableMeta?.fields ?? {});
 
-              let field = fields[0];
+              let field = fields[0]!;
               let selectedField = field;
 
-              if (defined(widget.queries[0].selectedAggregate)) {
-                const index = widget.queries[0].selectedAggregate;
-                selectedField = widget.queries[0].aggregates[index];
+              if (defined(widget.queries[0]!.selectedAggregate)) {
+                const index = widget.queries[0]!.selectedAggregate;
+                selectedField = widget.queries[0]!.aggregates[index]!;
                 if (fields.includes(selectedField)) {
                   field = selectedField;
                 }
@@ -301,6 +302,7 @@ function WidgetCard(props: Props) {
                   meta={tableMeta}
                   error={widgetQueryError || errorMessage || undefined}
                   preferredPolarity="-"
+                  borderless={props.borderless}
                 />
               );
             }}
@@ -316,6 +318,7 @@ function WidgetCard(props: Props) {
             actionsMessage={actionsMessage}
             actions={actions}
             onFullScreenViewClick={disableFullscreen ? undefined : onFullScreenViewClick}
+            borderless={props.borderless}
           >
             <WidgetCardChartContainer
               location={location}
diff --git a/static/app/views/dashboards/widgetCard/issueWidgetCard.spec.tsx b/static/app/views/dashboards/widgetCard/issueWidgetCard.spec.tsx
index 8591e943d78356..4dda83ac523abf 100644
--- a/static/app/views/dashboards/widgetCard/issueWidgetCard.spec.tsx
+++ b/static/app/views/dashboards/widgetCard/issueWidgetCard.spec.tsx
@@ -233,7 +233,7 @@ describe('Dashboards > IssueWidgetCard', function () {
           ...widget,
           queries: [
             {
-              ...widget.queries[0],
+              ...widget.queries[0]!,
               fields: ['issue', 'assignee', 'title', 'lifetimeEvents', 'lifetimeUsers'],
             },
           ],
diff --git a/static/app/views/dashboards/widgetCard/issueWidgetCard.tsx b/static/app/views/dashboards/widgetCard/issueWidgetCard.tsx
index f555b8c807fd2a..f186723416ae52 100644
--- a/static/app/views/dashboards/widgetCard/issueWidgetCard.tsx
+++ b/static/app/views/dashboards/widgetCard/issueWidgetCard.tsx
@@ -48,12 +48,12 @@ export function IssueWidgetCard({
     return <LoadingPlaceholder height="200px" />;
   }
 
-  const query = widget.queries[0];
+  const query = widget.queries[0]!;
   const queryFields = defined(query.fields)
     ? query.fields
     : [...query.columns, ...query.aggregates];
   const fieldAliases = query.fieldAliases ?? [];
-  const eventView = eventViewFromWidget(widget.title, widget.queries[0], selection);
+  const eventView = eventViewFromWidget(widget.title, widget.queries[0]!, selection);
 
   return (
     <StyledSimpleTableChart
diff --git a/static/app/views/dashboards/widgetCard/releaseWidgetQueries.spec.tsx b/static/app/views/dashboards/widgetCard/releaseWidgetQueries.spec.tsx
index 1e2c76ebc06c4d..2e3a06214fed51 100644
--- a/static/app/views/dashboards/widgetCard/releaseWidgetQueries.spec.tsx
+++ b/static/app/views/dashboards/widgetCard/releaseWidgetQueries.spec.tsx
@@ -772,9 +772,9 @@ describe('Dashboards > ReleaseWidgetQueries', function () {
           ...singleQueryWidget,
           queries: [
             {
-              ...singleQueryWidget.queries[0],
+              ...singleQueryWidget.queries[0]!,
               name: 'New Legend Alias',
-              fields: [...singleQueryWidget.queries[0].fields, ''],
+              fields: [...singleQueryWidget.queries[0]!.fields, ''],
             },
           ],
         }}
diff --git a/static/app/views/dashboards/widgetCard/releaseWidgetQueries.tsx b/static/app/views/dashboards/widgetCard/releaseWidgetQueries.tsx
index 62af5aaeab263c..94f185c00d2589 100644
--- a/static/app/views/dashboards/widgetCard/releaseWidgetQueries.tsx
+++ b/static/app/views/dashboards/widgetCard/releaseWidgetQueries.tsx
@@ -66,11 +66,11 @@ function getReleasesQuery(releases: Release[]): {
 } {
   let releaseCondition = '';
   const releasesArray: string[] = [];
-  releaseCondition += 'release:[' + releases[0].version;
-  releasesArray.push(releases[0].version);
+  releaseCondition += 'release:[' + releases[0]!.version;
+  releasesArray.push(releases[0]!.version);
   for (let i = 1; i < releases.length; i++) {
-    releaseCondition += ',' + releases[i].version;
-    releasesArray.push(releases[i].version);
+    releaseCondition += ',' + releases[i]!.version;
+    releasesArray.push(releases[i]!.version);
   }
   releaseCondition += ']';
   if (releases.length < 10) {
@@ -153,7 +153,7 @@ class ReleaseWidgetQueries extends Component<Props, State> {
 
   componentDidMount() {
     this._isMounted = true;
-    if (requiresCustomReleaseSorting(this.props.widget.queries[0])) {
+    if (requiresCustomReleaseSorting(this.props.widget.queries[0]!)) {
       this.fetchReleases();
       return;
     }
@@ -280,16 +280,16 @@ class ReleaseWidgetQueries extends Component<Props, State> {
     const {releases} = this.state;
     const widget = cloneDeep(initialWidget);
 
-    const isCustomReleaseSorting = requiresCustomReleaseSorting(widget.queries[0]);
-    const isDescending = widget.queries[0].orderby.startsWith('-');
-    const useSessionAPI = widget.queries[0].columns.includes('session.status');
+    const isCustomReleaseSorting = requiresCustomReleaseSorting(widget.queries[0]!);
+    const isDescending = widget.queries[0]!.orderby.startsWith('-');
+    const useSessionAPI = widget.queries[0]!.columns.includes('session.status');
 
     let releaseCondition = '';
     const releasesArray: string[] = [];
     if (isCustomReleaseSorting) {
       if (releases && releases.length === 1) {
-        releaseCondition += `release:${releases[0].version}`;
-        releasesArray.push(releases[0].version);
+        releaseCondition += `release:${releases[0]!.version}`;
+        releasesArray.push(releases[0]!.version);
       }
       if (releases && releases.length > 1) {
         const {releaseQueryString, releasesUsed} = getReleasesQuery(releases);
@@ -316,12 +316,12 @@ class ReleaseWidgetQueries extends Component<Props, State> {
     const {widget} = this.props;
     const {releases} = this.state;
 
-    const isDescending = widget.queries[0].orderby.startsWith('-');
+    const isDescending = widget.queries[0]!.orderby.startsWith('-');
 
     const releasesArray: string[] = [];
-    if (requiresCustomReleaseSorting(widget.queries[0])) {
+    if (requiresCustomReleaseSorting(widget.queries[0]!)) {
       if (releases && releases.length === 1) {
-        releasesArray.push(releases[0].version);
+        releasesArray.push(releases[0]!.version);
       }
       if (releases && releases.length > 1) {
         const {releasesUsed} = getReleasesQuery(releases);
@@ -371,7 +371,7 @@ class ReleaseWidgetQueries extends Component<Props, State> {
         limit={this.limit}
         onDataFetched={onDataFetched}
         loading={
-          requiresCustomReleaseSorting(widget.queries[0])
+          requiresCustomReleaseSorting(widget.queries[0]!)
             ? !this.state.releases
             : undefined
         }
diff --git a/static/app/views/dashboards/widgetCard/utils.tsx b/static/app/views/dashboards/widgetCard/utils.tsx
index 8b36054301dfa3..00e7abacd0c30d 100644
--- a/static/app/views/dashboards/widgetCard/utils.tsx
+++ b/static/app/views/dashboards/widgetCard/utils.tsx
@@ -5,5 +5,5 @@ export const getBucketSize = (series: Series[] | undefined) => {
     return 0;
   }
 
-  return Number(series[0].data[1]?.name) - Number(series[0].data[0]?.name);
+  return Number(series[0]!.data[1]?.name) - Number(series[0]!.data[0]?.name);
 };
diff --git a/static/app/views/dashboards/widgetCard/widgetCardChartContainer.tsx b/static/app/views/dashboards/widgetCard/widgetCardChartContainer.tsx
index e1e277c4e0f3b1..fc0c1e62541f04 100644
--- a/static/app/views/dashboards/widgetCard/widgetCardChartContainer.tsx
+++ b/static/app/views/dashboards/widgetCard/widgetCardChartContainer.tsx
@@ -1,13 +1,17 @@
 import {Fragment} from 'react';
 import styled from '@emotion/styled';
-import type {DataZoomComponentOption, LegendComponentOption} from 'echarts';
+import type {LegendComponentOption} from 'echarts';
 import type {Location} from 'history';
 
 import type {Client} from 'sentry/api';
 import TransparentLoadingMask from 'sentry/components/charts/transparentLoadingMask';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
 import type {PageFilters} from 'sentry/types/core';
-import type {EChartEventHandler, Series} from 'sentry/types/echarts';
+import type {
+  EChartDataZoomHandler,
+  EChartEventHandler,
+  Series,
+} from 'sentry/types/echarts';
 import type {Organization} from 'sentry/types/organization';
 import type {TableDataWithTitle} from 'sentry/utils/discover/discoverQuery';
 import type {AggregationOutputType} from 'sentry/utils/discover/fields';
@@ -18,7 +22,6 @@ import type {DashboardFilters, Widget} from '../types';
 import {WidgetType} from '../types';
 import type WidgetLegendSelectionState from '../widgetLegendSelectionState';
 
-import type {AugmentedEChartDataZoomHandler} from './chart';
 import WidgetCardChart from './chart';
 import {IssueWidgetCard} from './issueWidgetCard';
 import {WidgetCardDataLoader} from './widgetCardDataLoader';
@@ -31,7 +34,6 @@ type Props = {
   widget: Widget;
   widgetLegendState: WidgetLegendSelectionState;
   chartGroup?: string;
-  chartZoomOptions?: DataZoomComponentOption;
   dashboardFilters?: DashboardFilters;
   expandNumbers?: boolean;
   isMobile?: boolean;
@@ -50,10 +52,9 @@ type Props = {
     type: 'legendselectchanged';
   }>;
   onWidgetSplitDecision?: (splitDecision: WidgetType) => void;
-  onZoom?: AugmentedEChartDataZoomHandler;
+  onZoom?: EChartDataZoomHandler;
   renderErrorMessage?: (errorMessage?: string) => React.ReactNode;
   shouldResize?: boolean;
-  showSlider?: boolean;
   tableItemLimit?: number;
   windowWidth?: number;
 };
@@ -72,9 +73,7 @@ export function WidgetCardChartContainer({
   legendOptions,
   expandNumbers,
   onDataFetched,
-  showSlider,
   noPadding,
-  chartZoomOptions,
   onWidgetSplitDecision,
   chartGroup,
   shouldResize,
@@ -115,7 +114,7 @@ export function WidgetCardChartContainer({
                 : null}
               <LoadingScreen loading={loading} />
               <IssueWidgetCard
-                transformedResults={tableResults?.[0].data ?? []}
+                transformedResults={tableResults?.[0]!.data ?? []}
                 loading={loading}
                 errorMessage={errorMessage}
                 widget={widget}
@@ -148,10 +147,8 @@ export function WidgetCardChartContainer({
               windowWidth={windowWidth}
               expandNumbers={expandNumbers}
               onZoom={onZoom}
-              showSlider={showSlider}
               timeseriesResultsTypes={timeseriesResultsTypes}
               noPadding={noPadding}
-              chartZoomOptions={chartZoomOptions}
               chartGroup={chartGroup}
               shouldResize={shouldResize}
               onLegendSelectChanged={
diff --git a/static/app/views/dashboards/widgetCard/widgetQueries.spec.tsx b/static/app/views/dashboards/widgetCard/widgetQueries.spec.tsx
index cefed1f6e400f6..bacc7c174126cd 100644
--- a/static/app/views/dashboards/widgetCard/widgetQueries.spec.tsx
+++ b/static/app/views/dashboards/widgetCard/widgetQueries.spec.tsx
@@ -20,7 +20,7 @@ import WidgetQueries, {
 describe('Dashboards > WidgetQueries', function () {
   const initialData = initializeOrg();
 
-  const renderWithProviders = component =>
+  const renderWithProviders = (component: React.ReactNode) =>
     render(
       <MetricsResultsMetaProvider>
         <DashboardsMEPProvider>
@@ -212,7 +212,7 @@ describe('Dashboards > WidgetQueries', function () {
     // Child should be rendered and 2 requests should be sent.
     expect(await screen.findByTestId('child')).toBeInTheDocument();
     await waitFor(() => {
-      expect(error).toEqual('Bad request data');
+      expect(error).toBe('Bad request data');
     });
     expect(okMock).toHaveBeenCalledTimes(1);
     expect(failMock).toHaveBeenCalledTimes(1);
@@ -332,8 +332,8 @@ describe('Dashboards > WidgetQueries', function () {
       })
     );
     expect(childProps?.timeseriesResults).toBeUndefined();
-    await waitFor(() => expect(childProps?.tableResults?.[0].data).toHaveLength(1));
-    expect(childProps?.tableResults?.[0].meta).toBeDefined();
+    await waitFor(() => expect(childProps?.tableResults?.[0]!.data).toHaveLength(1));
+    expect(childProps?.tableResults?.[0]!.meta).toBeDefined();
   });
 
   it('can send multiple table queries', async function () {
@@ -399,8 +399,8 @@ describe('Dashboards > WidgetQueries', function () {
     expect(secondQuery).toHaveBeenCalledTimes(1);
 
     await waitFor(() => expect(childProps?.tableResults).toHaveLength(2));
-    expect(childProps?.tableResults?.[0].data[0]['sdk.name']).toBeDefined();
-    expect(childProps?.tableResults?.[1].data[0].title).toBeDefined();
+    expect(childProps?.tableResults?.[0]!.data[0]!['sdk.name']).toBeDefined();
+    expect(childProps?.tableResults?.[1]!.data[0]!.title).toBeDefined();
   });
 
   it('can send big number result queries', async function () {
@@ -522,7 +522,7 @@ describe('Dashboards > WidgetQueries', function () {
     expect(firstQuery).toHaveBeenCalledTimes(1);
     expect(secondQuery).toHaveBeenCalledTimes(1);
 
-    await waitFor(() => expect(childProps?.loading).toEqual(false));
+    await waitFor(() => expect(childProps?.loading).toBe(false));
   });
 
   it('sets bar charts to 1d interval', async function () {
@@ -674,7 +674,7 @@ describe('Dashboards > WidgetQueries', function () {
       displayType: DisplayType.LINE,
       interval: '5m',
     };
-    let childProps;
+    let childProps!: GenericWidgetQueriesChildrenProps;
     const {rerender} = renderWithProviders(
       <WidgetQueries
         api={new MockApiClient()}
@@ -690,7 +690,7 @@ describe('Dashboards > WidgetQueries', function () {
     );
 
     expect(eventsStatsMock).toHaveBeenCalledTimes(1);
-    await waitFor(() => expect(childProps.loading).toEqual(false));
+    await waitFor(() => expect(childProps.loading).toBe(false));
 
     // Simulate a re-render with a new query alias
     rerender(
@@ -727,7 +727,7 @@ describe('Dashboards > WidgetQueries', function () {
 
     // Did not re-query
     expect(eventsStatsMock).toHaveBeenCalledTimes(1);
-    expect(childProps.timeseriesResults[0].seriesName).toEqual(
+    expect(childProps.timeseriesResults![0]!.seriesName).toBe(
       'this query alias changed : count()'
     );
   });
diff --git a/static/app/views/dashboards/widgetLegendSelectionState.spec.tsx b/static/app/views/dashboards/widgetLegendSelectionState.spec.tsx
index e539bf53ddb284..f9131b13182fce 100644
--- a/static/app/views/dashboards/widgetLegendSelectionState.spec.tsx
+++ b/static/app/views/dashboards/widgetLegendSelectionState.spec.tsx
@@ -130,7 +130,7 @@ describe('WidgetLegend functions util', () => {
         legendFunctions.encodeLegendQueryParam(widget, {
           [`Releases${SERIES_NAME_DELIMITER}${widget.id}`]: false,
         })
-      ).toEqual(`${widget.id}${WIDGET_ID_DELIMITER}Releases`);
+      ).toBe(`${widget.id}${WIDGET_ID_DELIMITER}Releases`);
     });
 
     it('formats to selected format from query param', () => {
diff --git a/static/app/views/dashboards/widgetLegendSelectionState.tsx b/static/app/views/dashboards/widgetLegendSelectionState.tsx
index 20ad8817e69986..3b7b6a521845b3 100644
--- a/static/app/views/dashboards/widgetLegendSelectionState.tsx
+++ b/static/app/views/dashboards/widgetLegendSelectionState.tsx
@@ -161,7 +161,7 @@ class WidgetLegendSelectionState {
         .filter(key => !selected[key])
         .map(series =>
           encodeURIComponent(
-            WidgetLegendNameEncoderDecoder.decodeSeriesNameForLegend(series)
+            WidgetLegendNameEncoderDecoder.decodeSeriesNameForLegend(series)!
           )
         )
         .join(SERIES_LIST_DELIMITER)
@@ -177,7 +177,7 @@ class WidgetLegendSelectionState {
     );
     if (widgetLegendString) {
       const [_, seriesNameString] = widgetLegendString.split(WIDGET_ID_DELIMITER);
-      const seriesNames = seriesNameString.split(SERIES_LIST_DELIMITER);
+      const seriesNames = seriesNameString!.split(SERIES_LIST_DELIMITER);
       return seriesNames.reduce((acc, series) => {
         acc[
           decodeURIComponent(
diff --git a/static/app/views/dashboards/widgets/areaChartWidget/areaChartWidget.spec.tsx b/static/app/views/dashboards/widgets/areaChartWidget/areaChartWidget.spec.tsx
new file mode 100644
index 00000000000000..9d84891002ff77
--- /dev/null
+++ b/static/app/views/dashboards/widgets/areaChartWidget/areaChartWidget.spec.tsx
@@ -0,0 +1,80 @@
+import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
+
+import {AreaChartWidget} from './areaChartWidget';
+import sampleLatencyTimeSeries from './sampleLatencyTimeSeries.json';
+import sampleSpanDurationTimeSeries from './sampleSpanDurationTimeSeries.json';
+
+describe('AreaChartWidget', () => {
+  describe('Layout', () => {
+    it('Renders', () => {
+      render(
+        <AreaChartWidget
+          title="eps()"
+          description="Number of events per second"
+          timeseries={[sampleLatencyTimeSeries, sampleSpanDurationTimeSeries]}
+        />
+      );
+    });
+  });
+
+  describe('Visualization', () => {
+    it('Explains missing data', () => {
+      render(<AreaChartWidget />);
+
+      expect(screen.getByText('No Data')).toBeInTheDocument();
+    });
+  });
+
+  describe('State', () => {
+    it('Shows a loading placeholder', () => {
+      render(<AreaChartWidget isLoading />);
+
+      expect(screen.getByTestId('loading-indicator')).toBeInTheDocument();
+    });
+
+    it('Loading state takes precedence over error state', () => {
+      render(
+        <AreaChartWidget isLoading error={new Error('Parsing error of old value')} />
+      );
+
+      expect(screen.getByTestId('loading-indicator')).toBeInTheDocument();
+    });
+
+    it('Shows an error message', () => {
+      render(<AreaChartWidget error={new Error('Uh oh')} />);
+
+      expect(screen.getByText('Error: Uh oh')).toBeInTheDocument();
+    });
+
+    it('Shows a retry button', async () => {
+      const onRetry = jest.fn();
+
+      render(<AreaChartWidget 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(
+        <AreaChartWidget
+          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/areaChartWidget/areaChartWidget.stories.tsx b/static/app/views/dashboards/widgets/areaChartWidget/areaChartWidget.stories.tsx
new file mode 100644
index 00000000000000..5cf50f27a14d95
--- /dev/null
+++ b/static/app/views/dashboards/widgets/areaChartWidget/areaChartWidget.stories.tsx
@@ -0,0 +1,204 @@
+import {Fragment} from 'react';
+import {useTheme} from '@emotion/react';
+import styled from '@emotion/styled';
+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 {Release, TimeseriesData} from '../common/types';
+
+import {AreaChartWidget} from './areaChartWidget';
+import sampleLatencyTimeSeries from './sampleLatencyTimeSeries.json';
+import sampleSpanDurationTimeSeries from './sampleSpanDurationTimeSeries.json';
+
+export default storyBook(AreaChartWidget, story => {
+  story('Getting Started', () => {
+    return (
+      <Fragment>
+        <p>
+          <JSXNode name="AreaChartWidget" /> is a Dashboard Widget Component. It displays
+          a timeseries chart with multiple timeseries, and the timeseries are stacked.
+          Each timeseries is shown using a solid block of color. This chart is used to
+          visualize multiple timeseries that represent parts of something. For example, a
+          chart that shows time spent in the app broken down by component. In all other
+          ways, it behaves like <JSXNode name="LineChartWidget" />, though it doesn't
+          support features like "Previous Period Data".
+        </p>
+        <p>
+          <em>NOTE:</em> This chart is not appropriate for showing a single timeseries!
+          You should use <JSXNode name="LineChartWidget" /> instead.
+        </p>
+      </Fragment>
+    );
+  });
+
+  story('Visualization', () => {
+    const {selection} = usePageFilters();
+    const {datetime} = selection;
+    const {start, end} = datetime;
+
+    const latencyTimeSeries = toTimeSeriesSelection(
+      sampleLatencyTimeSeries as unknown as TimeseriesData,
+      start,
+      end
+    );
+
+    const spanDurationTimeSeries = toTimeSeriesSelection(
+      sampleSpanDurationTimeSeries as unknown as TimeseriesData,
+      start,
+      end
+    );
+
+    return (
+      <Fragment>
+        <p>
+          The visualization of <JSXNode name="AreaChartWidget" /> a stacked area 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>
+          <AreaChartWidget
+            title="Duration Breakdown"
+            description="Explains what proportion of total duration is taken up by latency vs. span duration"
+            timeseries={[latencyTimeSeries, spanDurationTimeSeries]}
+          />
+        </SmallSizingWindow>
+      </Fragment>
+    );
+  });
+
+  story('State', () => {
+    return (
+      <Fragment>
+        <p>
+          <JSXNode name="AreaChartWidget" /> 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>
+            <AreaChartWidget title="Loading Count" isLoading />
+          </SmallWidget>
+          <SmallWidget>
+            <AreaChartWidget title="Missing Count" />
+          </SmallWidget>
+          <SmallWidget>
+            <AreaChartWidget
+              title="Count Error"
+              error={new Error('Something went wrong!')}
+            />
+          </SmallWidget>
+          <SmallWidget>
+            <AreaChartWidget
+              title="Data Error"
+              error={new Error('Something went wrong!')}
+              onRetry={() => {}}
+            />
+          </SmallWidget>
+        </SideBySide>
+      </Fragment>
+    );
+  });
+
+  story('Colors', () => {
+    const theme = useTheme();
+
+    return (
+      <Fragment>
+        <p>
+          You can control the color of each timeseries by setting the <code>color</code>{' '}
+          attribute to a string that contains a valid hex color code.
+        </p>
+
+        <MediumWidget>
+          <AreaChartWidget
+            title="error_rate()"
+            description="Rate of Errors"
+            timeseries={[
+              {...sampleLatencyTimeSeries, color: theme.error},
+
+              {...sampleSpanDurationTimeSeries, color: theme.warning},
+            ]}
+          />
+        </MediumWidget>
+      </Fragment>
+    );
+  });
+
+  story('Releases', () => {
+    const releases = [
+      {
+        version: 'ui@0.1.2',
+        timestamp: sampleLatencyTimeSeries.data.at(2)?.timestamp,
+      },
+      {
+        version: 'ui@0.1.3',
+        timestamp: sampleLatencyTimeSeries.data.at(20)?.timestamp,
+      },
+    ].filter(hasTimestamp);
+
+    return (
+      <Fragment>
+        <p>
+          <JSXNode name="AreaChartWidget" /> 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>
+          <AreaChartWidget
+            title="error_rate()"
+            timeseries={[sampleLatencyTimeSeries, sampleSpanDurationTimeSeries]}
+            releases={releases}
+          />
+        </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(
+  timeSeries: TimeseriesData,
+  start: DateString | null,
+  end: DateString | null
+): TimeseriesData {
+  return {
+    ...timeSeries,
+    data: timeSeries.data.filter(datum => {
+      if (start && moment(datum.timestamp).isBefore(moment.utc(start))) {
+        return false;
+      }
+
+      if (end && moment(datum.timestamp).isAfter(moment.utc(end))) {
+        return false;
+      }
+
+      return true;
+    }),
+  };
+}
+
+function hasTimestamp(release: Partial<Release>): release is Release {
+  return Boolean(release?.timestamp);
+}
diff --git a/static/app/views/dashboards/widgets/areaChartWidget/areaChartWidget.tsx b/static/app/views/dashboards/widgets/areaChartWidget/areaChartWidget.tsx
new file mode 100644
index 00000000000000..e06d015f465e06
--- /dev/null
+++ b/static/app/views/dashboards/widgets/areaChartWidget/areaChartWidget.tsx
@@ -0,0 +1,78 @@
+import styled from '@emotion/styled';
+
+import TransparentLoadingMask from 'sentry/components/charts/transparentLoadingMask';
+import LoadingIndicator from 'sentry/components/loadingIndicator';
+import {defined} from 'sentry/utils';
+import {
+  AreaChartWidgetVisualization,
+  type AreaChartWidgetVisualizationProps,
+} from 'sentry/views/dashboards/widgets/areaChartWidget/areaChartWidgetVisualization';
+import {
+  WidgetFrame,
+  type WidgetFrameProps,
+} from 'sentry/views/dashboards/widgets/common/widgetFrame';
+
+import {MISSING_DATA_MESSAGE, X_GUTTER, Y_GUTTER} from '../common/settings';
+import type {StateProps} from '../common/types';
+
+export interface AreaChartWidgetProps
+  extends StateProps,
+    Omit<WidgetFrameProps, 'children'>,
+    Partial<AreaChartWidgetVisualizationProps> {}
+
+export function AreaChartWidget(props: AreaChartWidgetProps) {
+  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={error}
+      onRetry={props.onRetry}
+    >
+      {defined(timeseries) && (
+        <AreaChartWrapper>
+          <AreaChartWidgetVisualization
+            timeseries={timeseries}
+            releases={props.releases}
+            aliases={props.aliases}
+          />
+        </AreaChartWrapper>
+      )}
+    </WidgetFrame>
+  );
+}
+
+const AreaChartWrapper = 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/areaChartWidget/areaChartWidgetVisualization.tsx b/static/app/views/dashboards/widgets/areaChartWidget/areaChartWidgetVisualization.tsx
new file mode 100644
index 00000000000000..8e7ff044528c01
--- /dev/null
+++ b/static/app/views/dashboards/widgets/areaChartWidget/areaChartWidgetVisualization.tsx
@@ -0,0 +1,225 @@
+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 AreaSeries from 'sentry/components/charts/series/areaSeries';
+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 {useWidgetSyncContext} from '../../contexts/widgetSyncContext';
+import {formatTooltipValue} from '../common/formatTooltipValue';
+import {formatYAxisValue} from '../common/formatYAxisValue';
+import {ReleaseSeries} from '../common/releaseSeries';
+import type {Aliases, Release, TimeseriesData} from '../common/types';
+
+export interface AreaChartWidgetVisualizationProps {
+  timeseries: TimeseriesData[];
+  aliases?: Aliases;
+  releases?: Release[];
+}
+
+export function AreaChartWidgetVisualization(props: AreaChartWidgetVisualizationProps) {
+  const chartRef = useRef<EChartsReactCore | null>(null);
+  const {register: registerWithWidgetSyncContext} = useWidgetSyncContext();
+
+  const pageFilters = usePageFilters();
+  const {start, end, period, utc} = pageFilters.selection.datetime;
+
+  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 formatSeriesName: (string) => string = name => {
+    return props.aliases?.[name] ?? name;
+  };
+
+  const chartZoomProps = useChartZoom({
+    saveOnZoom: true,
+  });
+
+  // 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 = firstSeries?.field;
+  const type = firstSeries?.meta?.fields?.[firstSeriesField] ?? 'number';
+  const unit = firstSeries?.meta?.units?.[firstSeriesField] ?? undefined;
+
+  const formatTooltip: 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 formatTooltipValue(value, type, unit);
+      },
+      nameFormatter: formatSeriesName,
+      truncate: true,
+      utc: utc ?? false,
+    })(deDupedParams, asyncTicket);
+  };
+
+  let visibleSeriesCount = props.timeseries.length;
+  if (releaseSeries) {
+    visibleSeriesCount += 1;
+  }
+
+  const showLegend = visibleSeriesCount > 1;
+
+  return (
+    <BaseChart
+      ref={e => {
+        chartRef.current = e;
+
+        if (e?.getEchartsInstance) {
+          registerWithWidgetSyncContext(e.getEchartsInstance());
+        }
+      }}
+      autoHeightResize
+      series={[
+        ...props.timeseries.map(timeserie => {
+          return AreaSeries({
+            name: timeserie.field,
+            color: timeserie.color,
+            stack: 'area',
+            animation: false,
+            areaStyle: {
+              color: timeserie.color,
+              opacity: 1.0,
+            },
+            data: timeserie.data.map(datum => {
+              return [datum.timestamp, datum.value];
+            }),
+          });
+        }),
+        releaseSeries &&
+          LineSeries({
+            ...releaseSeries,
+            name: releaseSeries.seriesName,
+            data: [],
+          }),
+      ].filter(defined)}
+      grid={{
+        left: 0,
+        top: showLegend ? 25 : 10,
+        right: 4,
+        bottom: 0,
+        containLabel: true,
+      }}
+      legend={
+        showLegend
+          ? {
+              top: 0,
+              left: 0,
+              formatter(name: string) {
+                return formatSeriesName(name);
+              },
+            }
+          : undefined
+      }
+      tooltip={{
+        trigger: 'axis',
+        axisPointer: {
+          type: 'cross',
+        },
+        formatter: formatTooltip,
+      }}
+      xAxis={{
+        animation: false,
+        axisLabel: {
+          padding: [0, 10, 0, 10],
+          width: 60,
+        },
+        splitNumber: 0,
+      }}
+      yAxis={{
+        animation: false,
+        axisLabel: {
+          formatter(value: number) {
+            return formatYAxisValue(value, type, unit);
+          },
+        },
+        axisPointer: {
+          type: 'line',
+          snap: false,
+          lineStyle: {
+            type: 'solid',
+            width: 0.5,
+          },
+          label: {
+            show: false,
+          },
+        },
+      }}
+      {...chartZoomProps}
+      isGroupedByDate
+      useMultilineDate
+      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/areaChartWidget/sampleLatencyTimeSeries.json b/static/app/views/dashboards/widgets/areaChartWidget/sampleLatencyTimeSeries.json
new file mode 100644
index 00000000000000..93a6f8851acdd0
--- /dev/null
+++ b/static/app/views/dashboards/widgets/areaChartWidget/sampleLatencyTimeSeries.json
@@ -0,0 +1,213 @@
+{
+  "field": "avg(latency)",
+  "meta": {
+    "fields": {
+      "avg(latency)": "duration"
+    },
+    "units": {
+      "avg(latency)": "millisecond"
+    }
+  },
+  "data": [
+    {
+      "timestamp": "2024-12-09T22:00:00Z",
+      "value": 15.797387473297285
+    },
+    {
+      "timestamp": "2024-12-09T22:30:00Z",
+      "value": 6.098785205112891
+    },
+    {
+      "timestamp": "2024-12-09T23:00:00Z",
+      "value": 10.023521061981072
+    },
+    {
+      "timestamp": "2024-12-09T23:30:00Z",
+      "value": 6.303244308149576
+    },
+    {
+      "timestamp": "2024-12-10T00:00:00Z",
+      "value": 11.352363343199878
+    },
+    {
+      "timestamp": "2024-12-10T00:30:00Z",
+      "value": 4.845476325747717
+    },
+    {
+      "timestamp": "2024-12-10T01:00:00Z",
+      "value": 11.251521855070287
+    },
+    {
+      "timestamp": "2024-12-10T01:30:00Z",
+      "value": 4.425860645618586
+    },
+    {
+      "timestamp": "2024-12-10T02:00:00Z",
+      "value": 9.989218687466126
+    },
+    {
+      "timestamp": "2024-12-10T02:30:00Z",
+      "value": 4.025772756170272
+    },
+    {
+      "timestamp": "2024-12-10T03:00:00Z",
+      "value": 9.17541579241641
+    },
+    {
+      "timestamp": "2024-12-10T03:30:00Z",
+      "value": 4.2380217489924865
+    },
+    {
+      "timestamp": "2024-12-10T04:00:00Z",
+      "value": 8.027566877217474
+    },
+    {
+      "timestamp": "2024-12-10T04:30:00Z",
+      "value": 5.295137636393576
+    },
+    {
+      "timestamp": "2024-12-10T05:00:00Z",
+      "value": 8.656494836655359
+    },
+    {
+      "timestamp": "2024-12-10T05:30:00Z",
+      "value": 5.475662654003712
+    },
+    {
+      "timestamp": "2024-12-10T06:00:00Z",
+      "value": 9.793632841698757
+    },
+    {
+      "timestamp": "2024-12-10T06:30:00Z",
+      "value": 5.591866790430932
+    },
+    {
+      "timestamp": "2024-12-10T07:00:00Z",
+      "value": 9.187478698931766
+    },
+    {
+      "timestamp": "2024-12-10T07:30:00Z",
+      "value": 3.779925204205954
+    },
+    {
+      "timestamp": "2024-12-10T08:00:00Z",
+      "value": 10.315176397597504
+    },
+    {
+      "timestamp": "2024-12-10T08:30:00Z",
+      "value": 5.101678176894567
+    },
+    {
+      "timestamp": "2024-12-10T09:00:00Z",
+      "value": 10.405819741300553
+    },
+    {
+      "timestamp": "2024-12-10T09:30:00Z",
+      "value": 5.157673142672812
+    },
+    {
+      "timestamp": "2024-12-10T10:00:00Z",
+      "value": 13.454678120116997
+    },
+    {
+      "timestamp": "2024-12-10T10:30:00Z",
+      "value": 5.633257152519796
+    },
+    {
+      "timestamp": "2024-12-10T11:00:00Z",
+      "value": 12.38331484233643
+    },
+    {
+      "timestamp": "2024-12-10T11:30:00Z",
+      "value": 6.7168414807525245
+    },
+    {
+      "timestamp": "2024-12-10T12:00:00Z",
+      "value": 10.82394699109634
+    },
+    {
+      "timestamp": "2024-12-10T12:30:00Z",
+      "value": 6.649313439563898
+    },
+    {
+      "timestamp": "2024-12-10T13:00:00Z",
+      "value": 10.957238674362912
+    },
+    {
+      "timestamp": "2024-12-10T13:30:00Z",
+      "value": 7.891612896606848
+    },
+    {
+      "timestamp": "2024-12-10T14:00:00Z",
+      "value": 9.83684972309017
+    },
+    {
+      "timestamp": "2024-12-10T14:30:00Z",
+      "value": 4.472633330313572
+    },
+    {
+      "timestamp": "2024-12-10T15:00:00Z",
+      "value": 13.886404361521333
+    },
+    {
+      "timestamp": "2024-12-10T15:30:00Z",
+      "value": 9.212753388080626
+    },
+    {
+      "timestamp": "2024-12-10T16:00:00Z",
+      "value": 12.213060522650725
+    },
+    {
+      "timestamp": "2024-12-10T16:30:00Z",
+      "value": 5.308362659314872
+    },
+    {
+      "timestamp": "2024-12-10T17:00:00Z",
+      "value": 12.167955277129803
+    },
+    {
+      "timestamp": "2024-12-10T17:30:00Z",
+      "value": 5.95843470061378
+    },
+    {
+      "timestamp": "2024-12-10T18:00:00Z",
+      "value": 11.623431372484815
+    },
+    {
+      "timestamp": "2024-12-10T18:30:00Z",
+      "value": 7.133246343117738
+    },
+    {
+      "timestamp": "2024-12-10T19:00:00Z",
+      "value": 9.91670999332601
+    },
+    {
+      "timestamp": "2024-12-10T19:30:00Z",
+      "value": 8.220551566043556
+    },
+    {
+      "timestamp": "2024-12-10T20:00:00Z",
+      "value": 10.644324473372116
+    },
+    {
+      "timestamp": "2024-12-10T20:30:00Z",
+      "value": 6.380262999155083
+    },
+    {
+      "timestamp": "2024-12-10T21:00:00Z",
+      "value": 11.611059631291011
+    },
+    {
+      "timestamp": "2024-12-10T21:30:00Z",
+      "value": 4.830427051517974
+    },
+    {
+      "timestamp": "2024-12-10T22:00:00Z",
+      "value": 14.018863061817425
+    },
+    {
+      "timestamp": "2024-12-10T22:30:00Z",
+      "value": 0
+    }
+  ]
+}
diff --git a/static/app/views/dashboards/widgets/areaChartWidget/sampleSpanDurationTimeSeries.json b/static/app/views/dashboards/widgets/areaChartWidget/sampleSpanDurationTimeSeries.json
new file mode 100644
index 00000000000000..278ec199649563
--- /dev/null
+++ b/static/app/views/dashboards/widgets/areaChartWidget/sampleSpanDurationTimeSeries.json
@@ -0,0 +1,213 @@
+{
+  "field": "avg(span.duration)",
+  "meta": {
+    "fields": {
+      "avg(span.duration)": "duration"
+    },
+    "units": {
+      "avg(span.duration)": "millisecond"
+    }
+  },
+  "data": [
+    {
+      "timestamp": "2024-12-09T22:00:00Z",
+      "value": 97.16045076146938
+    },
+    {
+      "timestamp": "2024-12-09T22:30:00Z",
+      "value": 73.81276498986948
+    },
+    {
+      "timestamp": "2024-12-09T23:00:00Z",
+      "value": 83.65629482432625
+    },
+    {
+      "timestamp": "2024-12-09T23:30:00Z",
+      "value": 77.4773209216508
+    },
+    {
+      "timestamp": "2024-12-10T00:00:00Z",
+      "value": 88.87920889091058
+    },
+    {
+      "timestamp": "2024-12-10T00:30:00Z",
+      "value": 74.81035769529551
+    },
+    {
+      "timestamp": "2024-12-10T01:00:00Z",
+      "value": 74.18713473976618
+    },
+    {
+      "timestamp": "2024-12-10T01:30:00Z",
+      "value": 75.51014337607224
+    },
+    {
+      "timestamp": "2024-12-10T02:00:00Z",
+      "value": 71.75338738667213
+    },
+    {
+      "timestamp": "2024-12-10T02:30:00Z",
+      "value": 71.44267608528102
+    },
+    {
+      "timestamp": "2024-12-10T03:00:00Z",
+      "value": 73.23258991739772
+    },
+    {
+      "timestamp": "2024-12-10T03:30:00Z",
+      "value": 73.62710321499654
+    },
+    {
+      "timestamp": "2024-12-10T04:00:00Z",
+      "value": 73.24679865212109
+    },
+    {
+      "timestamp": "2024-12-10T04:30:00Z",
+      "value": 71.00435116898733
+    },
+    {
+      "timestamp": "2024-12-10T05:00:00Z",
+      "value": 78.74461664047831
+    },
+    {
+      "timestamp": "2024-12-10T05:30:00Z",
+      "value": 72.30733243572487
+    },
+    {
+      "timestamp": "2024-12-10T06:00:00Z",
+      "value": 78.42600782679243
+    },
+    {
+      "timestamp": "2024-12-10T06:30:00Z",
+      "value": 74.29718208848486
+    },
+    {
+      "timestamp": "2024-12-10T07:00:00Z",
+      "value": 77.86389655145648
+    },
+    {
+      "timestamp": "2024-12-10T07:30:00Z",
+      "value": 74.11896494459268
+    },
+    {
+      "timestamp": "2024-12-10T08:00:00Z",
+      "value": 77.83106835851203
+    },
+    {
+      "timestamp": "2024-12-10T08:30:00Z",
+      "value": 80.87383050251273
+    },
+    {
+      "timestamp": "2024-12-10T09:00:00Z",
+      "value": 85.53912058349381
+    },
+    {
+      "timestamp": "2024-12-10T09:30:00Z",
+      "value": 82.16649885587427
+    },
+    {
+      "timestamp": "2024-12-10T10:00:00Z",
+      "value": 96.46710756423539
+    },
+    {
+      "timestamp": "2024-12-10T10:30:00Z",
+      "value": 90.2296730934056
+    },
+    {
+      "timestamp": "2024-12-10T11:00:00Z",
+      "value": 86.49672620288618
+    },
+    {
+      "timestamp": "2024-12-10T11:30:00Z",
+      "value": 81.76636615572134
+    },
+    {
+      "timestamp": "2024-12-10T12:00:00Z",
+      "value": 91.30479930843254
+    },
+    {
+      "timestamp": "2024-12-10T12:30:00Z",
+      "value": 86.5261930482867
+    },
+    {
+      "timestamp": "2024-12-10T13:00:00Z",
+      "value": 88.58528428072619
+    },
+    {
+      "timestamp": "2024-12-10T13:30:00Z",
+      "value": 84.57326040990161
+    },
+    {
+      "timestamp": "2024-12-10T14:00:00Z",
+      "value": 82.43636182893853
+    },
+    {
+      "timestamp": "2024-12-10T14:30:00Z",
+      "value": 90.33512756892627
+    },
+    {
+      "timestamp": "2024-12-10T15:00:00Z",
+      "value": 103.27654137156406
+    },
+    {
+      "timestamp": "2024-12-10T15:30:00Z",
+      "value": 127.10951181976695
+    },
+    {
+      "timestamp": "2024-12-10T16:00:00Z",
+      "value": 95.72899826334971
+    },
+    {
+      "timestamp": "2024-12-10T16:30:00Z",
+      "value": 84.04312923323451
+    },
+    {
+      "timestamp": "2024-12-10T17:00:00Z",
+      "value": 85.59506151608197
+    },
+    {
+      "timestamp": "2024-12-10T17:30:00Z",
+      "value": 82.71849476828766
+    },
+    {
+      "timestamp": "2024-12-10T18:00:00Z",
+      "value": 89.57229292359843
+    },
+    {
+      "timestamp": "2024-12-10T18:30:00Z",
+      "value": 81.22558140363343
+    },
+    {
+      "timestamp": "2024-12-10T19:00:00Z",
+      "value": 86.8826705009411
+    },
+    {
+      "timestamp": "2024-12-10T19:30:00Z",
+      "value": 79.4383370343256
+    },
+    {
+      "timestamp": "2024-12-10T20:00:00Z",
+      "value": 82.63652211651058
+    },
+    {
+      "timestamp": "2024-12-10T20:30:00Z",
+      "value": 77.87329880924307
+    },
+    {
+      "timestamp": "2024-12-10T21:00:00Z",
+      "value": 82.0189272882679
+    },
+    {
+      "timestamp": "2024-12-10T21:30:00Z",
+      "value": 80.03621684743777
+    },
+    {
+      "timestamp": "2024-12-10T22:00:00Z",
+      "value": 80.69735445090794
+    },
+    {
+      "timestamp": "2024-12-10T22:30:00Z",
+      "value": 0
+    }
+  ]
+}
diff --git a/static/app/views/dashboards/widgets/bigNumberWidget/bigNumberWidget.tsx b/static/app/views/dashboards/widgets/bigNumberWidget/bigNumberWidget.tsx
index a12f0c3e58112b..c613861ad58333 100644
--- a/static/app/views/dashboards/widgets/bigNumberWidget/bigNumberWidget.tsx
+++ b/static/app/views/dashboards/widgets/bigNumberWidget/bigNumberWidget.tsx
@@ -21,17 +21,21 @@ import type {StateProps} from '../common/types';
 
 import {DEEMPHASIS_COLOR_NAME, LOADING_PLACEHOLDER} from './settings';
 
-interface Props
+export interface BigNumberWidgetProps
   extends StateProps,
     Omit<WidgetFrameProps, 'children'>,
     Partial<BigNumberWidgetVisualizationProps> {}
 
-export function BigNumberWidget(props: Props) {
+export function BigNumberWidget(props: BigNumberWidgetProps) {
   const {value, previousPeriodValue, field} = props;
 
   if (props.isLoading) {
     return (
-      <WidgetFrame title={props.title} description={props.description}>
+      <WidgetFrame
+        title={props.title}
+        description={props.description}
+        borderless={props.borderless}
+      >
         <LoadingPlaceholder>{LOADING_PLACEHOLDER}</LoadingPlaceholder>
       </WidgetFrame>
     );
@@ -62,6 +66,7 @@ export function BigNumberWidget(props: Props) {
       warnings={props.warnings}
       error={error}
       onRetry={props.onRetry}
+      borderless={props.borderless}
     >
       {defined(value) && (
         <BigNumberResizeWrapper>
diff --git a/static/app/views/dashboards/widgets/common/formatTooltipValue.spec.tsx b/static/app/views/dashboards/widgets/common/formatTooltipValue.spec.tsx
new file mode 100644
index 00000000000000..8b3f0e8ee21616
--- /dev/null
+++ b/static/app/views/dashboards/widgets/common/formatTooltipValue.spec.tsx
@@ -0,0 +1,67 @@
+import {formatTooltipValue} from './formatTooltipValue';
+
+describe('formatTooltipValue', () => {
+  describe('integer', () => {
+    it.each([
+      [0, '0'],
+      [17, '17'],
+      [171, '171'],
+      [17111, '17,111'],
+      [17_000_110, '17,000,110'],
+      [1_000_110_000, '1,000,110,000'],
+    ])('Formats %s as %s', (value, formattedValue) => {
+      expect(formatTooltipValue(value, 'integer')).toEqual(formattedValue);
+    });
+  });
+
+  describe('number', () => {
+    it.each([
+      [17.1238, '17.124'],
+      [1772313.1, '1,772,313.1'],
+    ])('Formats %s as %s', (value, formattedValue) => {
+      expect(formatTooltipValue(value, 'number')).toEqual(formattedValue);
+    });
+  });
+
+  describe('percentage', () => {
+    it.each([
+      [0, '0%'],
+      [0.712, '71.2%'],
+      [17.123, '1,712.3%'],
+      [1, '100%'],
+    ])('Formats %s as %s', (value, formattedValue) => {
+      expect(formatTooltipValue(value, 'percentage')).toEqual(formattedValue);
+    });
+  });
+
+  describe('duration', () => {
+    it.each([
+      [0, 'millisecond', '0.00ms'],
+      [0.712, 'second', '712.00ms'],
+      [1231, 'second', '20.52min'],
+    ])('Formats %s as %s', (value, unit, formattedValue) => {
+      expect(formatTooltipValue(value, 'duration', unit)).toEqual(formattedValue);
+    });
+  });
+
+  describe('size', () => {
+    it.each([
+      [0, 'byte', '0.0 B'],
+      [0.712, 'megabyte', '712 KB'],
+      [1231, 'kibibyte', '1.2 MiB'],
+    ])('Formats %s as %s', (value, unit, formattedValue) => {
+      expect(formatTooltipValue(value, 'size', unit)).toEqual(formattedValue);
+    });
+  });
+
+  describe('rate', () => {
+    it.each([
+      [0, '1/second', '0/s'],
+      [0.712, '1/second', '0.712/s'],
+      [12712, '1/second', '12.7K/s'],
+      [1231, '1/minute', '1.23K/min'],
+    ])('Formats %s as %s', (value, unit, formattedValue) => {
+      expect(formatTooltipValue(value, 'rate', unit)).toEqual(formattedValue);
+    });
+  });
+});
diff --git a/static/app/views/dashboards/widgets/lineChartWidget/formatChartValue.tsx b/static/app/views/dashboards/widgets/common/formatTooltipValue.tsx
similarity index 92%
rename from static/app/views/dashboards/widgets/lineChartWidget/formatChartValue.tsx
rename to static/app/views/dashboards/widgets/common/formatTooltipValue.tsx
index a65758d2c3004d..653dc8e400111a 100644
--- a/static/app/views/dashboards/widgets/lineChartWidget/formatChartValue.tsx
+++ b/static/app/views/dashboards/widgets/common/formatTooltipValue.tsx
@@ -10,7 +10,7 @@ import getDuration from 'sentry/utils/duration/getDuration';
 import {formatRate} from 'sentry/utils/formatters';
 import {formatPercentage} from 'sentry/utils/number/formatPercentage';
 
-export function formatChartValue(value: number, type: string, unit?: string): string {
+export function formatTooltipValue(value: number, type: string, unit?: string): string {
   switch (type) {
     case 'integer':
     case 'number':
diff --git a/static/app/views/dashboards/widgets/lineChartWidget/formatChartValue.spec.tsx b/static/app/views/dashboards/widgets/common/formatYAxisValue.spec.tsx
similarity index 68%
rename from static/app/views/dashboards/widgets/lineChartWidget/formatChartValue.spec.tsx
rename to static/app/views/dashboards/widgets/common/formatYAxisValue.spec.tsx
index 8bd67e3ef9d761..ac77301fc9878a 100644
--- a/static/app/views/dashboards/widgets/lineChartWidget/formatChartValue.spec.tsx
+++ b/static/app/views/dashboards/widgets/common/formatYAxisValue.spec.tsx
@@ -1,34 +1,37 @@
-import {formatChartValue} from './formatChartValue';
+import {formatYAxisValue} from './formatYAxisValue';
 
-describe('formatChartValue', () => {
+describe('formatYAxisValue', () => {
   describe('integer', () => {
     it.each([
       [0, '0'],
       [17, '17'],
-      [1772313, '1,772,313'],
+      [171, '171'],
+      [17111, '17k'],
+      [17_000_110, '17m'],
+      [1_000_110_000, '1b'],
     ])('Formats %s as %s', (value, formattedValue) => {
-      expect(formatChartValue(value, 'integer')).toEqual(formattedValue);
+      expect(formatYAxisValue(value, 'integer')).toEqual(formattedValue);
     });
   });
 
   describe('number', () => {
     it.each([
-      [0, '0'],
       [17.1238, '17.124'],
       [1772313.1, '1,772,313.1'],
     ])('Formats %s as %s', (value, formattedValue) => {
-      expect(formatChartValue(value, 'number')).toEqual(formattedValue);
+      expect(formatYAxisValue(value, 'number')).toEqual(formattedValue);
     });
   });
 
   describe('percentage', () => {
     it.each([
       [0, '0%'],
+      [0.00005, '0.005%'],
       [0.712, '71.2%'],
       [17.123, '1,712.3%'],
       [1, '100%'],
     ])('Formats %s as %s', (value, formattedValue) => {
-      expect(formatChartValue(value, 'percentage')).toEqual(formattedValue);
+      expect(formatYAxisValue(value, 'percentage')).toEqual(formattedValue);
     });
   });
 
@@ -38,7 +41,7 @@ describe('formatChartValue', () => {
       [0.712, 'second', '712.00ms'],
       [1231, 'second', '20.52min'],
     ])('Formats %s as %s', (value, unit, formattedValue) => {
-      expect(formatChartValue(value, 'duration', unit)).toEqual(formattedValue);
+      expect(formatYAxisValue(value, 'duration', unit)).toEqual(formattedValue);
     });
   });
 
@@ -48,7 +51,7 @@ describe('formatChartValue', () => {
       [0.712, 'megabyte', '712 KB'],
       [1231, 'kibibyte', '1.2 MiB'],
     ])('Formats %s as %s', (value, unit, formattedValue) => {
-      expect(formatChartValue(value, 'size', unit)).toEqual(formattedValue);
+      expect(formatYAxisValue(value, 'size', unit)).toEqual(formattedValue);
     });
   });
 
@@ -59,7 +62,7 @@ describe('formatChartValue', () => {
       [12712, '1/second', '12.7K/s'],
       [1231, '1/minute', '1.23K/min'],
     ])('Formats %s as %s', (value, unit, formattedValue) => {
-      expect(formatChartValue(value, 'rate', unit)).toEqual(formattedValue);
+      expect(formatYAxisValue(value, 'rate', unit)).toEqual(formattedValue);
     });
   });
 });
diff --git a/static/app/views/dashboards/widgets/common/formatYAxisValue.tsx b/static/app/views/dashboards/widgets/common/formatYAxisValue.tsx
new file mode 100644
index 00000000000000..5cf3c0d7ab43da
--- /dev/null
+++ b/static/app/views/dashboards/widgets/common/formatYAxisValue.tsx
@@ -0,0 +1,36 @@
+import {formatBytesBase2} from 'sentry/utils/bytes/formatBytesBase2';
+import {formatBytesBase10} from 'sentry/utils/bytes/formatBytesBase10';
+import {
+  ABYTE_UNITS,
+  DURATION_UNITS,
+  SIZE_UNITS,
+} from 'sentry/utils/discover/fieldRenderers';
+import type {RateUnit} from 'sentry/utils/discover/fields';
+import getDuration from 'sentry/utils/duration/getDuration';
+import {formatAbbreviatedNumber, formatRate} from 'sentry/utils/formatters';
+import {formatPercentage} from 'sentry/utils/number/formatPercentage';
+
+export function formatYAxisValue(value: number, type: string, unit?: string): string {
+  switch (type) {
+    case 'integer':
+      return formatAbbreviatedNumber(value);
+    case 'number':
+      return value.toLocaleString();
+    case 'percentage':
+      return formatPercentage(value, 3);
+    case 'duration':
+      return getDuration((value * (unit ? DURATION_UNITS[unit] : 1)) / 1000, 2, true);
+    case 'size':
+      const bytes = value * SIZE_UNITS[unit ?? 'byte'];
+
+      const formatter = ABYTE_UNITS.includes(unit ?? 'byte')
+        ? formatBytesBase10
+        : formatBytesBase2;
+
+      return formatter(bytes);
+    case 'rate':
+      return formatRate(value, unit as RateUnit);
+    default:
+      return value.toString();
+  }
+}
diff --git a/static/app/views/dashboards/widgets/common/settings.tsx b/static/app/views/dashboards/widgets/common/settings.tsx
index 997cf344ab11d1..9e5cb22fcc306d 100644
--- a/static/app/views/dashboards/widgets/common/settings.tsx
+++ b/static/app/views/dashboards/widgets/common/settings.tsx
@@ -11,3 +11,6 @@ export const DEFAULT_FIELD = 'unknown'; // Numeric data might, in theory, have a
 
 export const MISSING_DATA_MESSAGE = t('No Data');
 export const NON_FINITE_NUMBER_MESSAGE = t('Value is not a finite number.');
+export const WIDGET_RENDER_ERROR_MESSAGE = t(
+  'Sorry, something went wrong when rendering this widget.'
+);
diff --git a/static/app/views/dashboards/widgets/lineChartWidget/shiftTimeserieToNow.tsx b/static/app/views/dashboards/widgets/common/shiftTimeserieToNow.tsx
similarity index 91%
rename from static/app/views/dashboards/widgets/lineChartWidget/shiftTimeserieToNow.tsx
rename to static/app/views/dashboards/widgets/common/shiftTimeserieToNow.tsx
index 2c484d1e2cbce1..abb7552e88a93f 100644
--- a/static/app/views/dashboards/widgets/lineChartWidget/shiftTimeserieToNow.tsx
+++ b/static/app/views/dashboards/widgets/common/shiftTimeserieToNow.tsx
@@ -1,4 +1,4 @@
-import type {TimeseriesData} from '../common/types';
+import type {TimeseriesData} from './types';
 
 export function shiftTimeserieToNow(timeserie: TimeseriesData): TimeseriesData {
   const currentTimestamp = new Date().getTime();
diff --git a/static/app/views/dashboards/widgets/common/types.tsx b/static/app/views/dashboards/widgets/common/types.tsx
index 4b5959990400b4..22d9c7e10af983 100644
--- a/static/app/views/dashboards/widgets/common/types.tsx
+++ b/static/app/views/dashboards/widgets/common/types.tsx
@@ -17,6 +17,7 @@ export type TimeseriesData = {
   data: TimeSeriesItem[];
   field: string;
   color?: string;
+  meta?: Meta;
 };
 
 export type ErrorProp = Error | string;
@@ -33,3 +34,5 @@ export type Release = {
   timestamp: string;
   version: string;
 };
+
+export type Aliases = Record<string, string>;
diff --git a/static/app/views/dashboards/widgets/common/widgetFrame.spec.tsx b/static/app/views/dashboards/widgets/common/widgetFrame.spec.tsx
index 32a3fa17293b16..7667cc5bb46b09 100644
--- a/static/app/views/dashboards/widgets/common/widgetFrame.spec.tsx
+++ b/static/app/views/dashboards/widgets/common/widgetFrame.spec.tsx
@@ -12,6 +12,24 @@ describe('WidgetFrame', () => {
       await userEvent.hover(screen.getByRole('button', {name: 'Widget description'}));
       expect(await screen.findByText('Number of events per second')).toBeInTheDocument();
     });
+
+    it('Catches errors in the visualization', async () => {
+      jest.spyOn(console, 'error').mockImplementation();
+
+      render(
+        <WidgetFrame title="Uh Oh">
+          <UhOh />
+        </WidgetFrame>
+      );
+
+      expect(screen.getByText('Uh Oh')).toBeInTheDocument();
+
+      expect(
+        await screen.findByText('Sorry, something went wrong when rendering this widget.')
+      ).toBeInTheDocument();
+
+      jest.resetAllMocks();
+    });
   });
 
   describe('Warnings', () => {
@@ -184,6 +202,41 @@ describe('WidgetFrame', () => {
       await userEvent.hover($trigger);
       expect(await screen.findByText('Actions are not supported')).toBeInTheDocument();
     });
+
+    it('Shows actions even in error state', async () => {
+      const onAction = jest.fn();
+      const error = new Error('Something is wrong');
+
+      render(
+        <WidgetFrame
+          title="EPS"
+          description="Number of events per second"
+          error={error}
+          actions={[
+            {
+              key: 'hello',
+              label: 'Make Go',
+              onAction,
+            },
+          ]}
+        />
+      );
+
+      const $button = screen.getByRole('button', {name: 'Make Go'});
+      expect($button).toBeInTheDocument();
+      await userEvent.click($button);
+
+      expect(onAction).toHaveBeenCalledTimes(1);
+    });
+
+    it('Shows a "Retry" action if a retry callback is provided', () => {
+      const onRetry = jest.fn();
+      const error = new Error('Something is wrong');
+
+      render(<WidgetFrame title="EPS" error={error} onRetry={onRetry} />);
+
+      expect(screen.getByRole('button', {name: 'Retry'})).toBeInTheDocument();
+    });
   });
 
   describe('Full Screen View Button', () => {
@@ -205,5 +258,25 @@ describe('WidgetFrame', () => {
 
       expect(onFullScreenViewClick).toHaveBeenCalledTimes(1);
     });
+
+    it('Hides full screen button if the widget has an error', () => {
+      const onFullScreenViewClick = jest.fn();
+
+      render(
+        <WidgetFrame
+          title="count()"
+          onFullScreenViewClick={onFullScreenViewClick}
+          error={new Error('Something went wrong')}
+        />
+      );
+
+      const $button = screen.queryByRole('button', {name: 'Open Full-Screen View'});
+      expect($button).not.toBeInTheDocument();
+    });
   });
 });
+
+function UhOh() {
+  const items: string[] = [];
+  return <div>{items[0]!.toUpperCase()}</div>;
+}
diff --git a/static/app/views/dashboards/widgets/common/widgetFrame.tsx b/static/app/views/dashboards/widgets/common/widgetFrame.tsx
index d1d17d37215514..25fe9010a4aeae 100644
--- a/static/app/views/dashboards/widgets/common/widgetFrame.tsx
+++ b/static/app/views/dashboards/widgets/common/widgetFrame.tsx
@@ -4,13 +4,20 @@ import Badge, {type BadgeProps} from 'sentry/components/badge/badge';
 import {Button, LinkButton} from 'sentry/components/button';
 import {HeaderTitle} from 'sentry/components/charts/styles';
 import {DropdownMenu, type MenuItemProps} from 'sentry/components/dropdownMenu';
+import ErrorBoundary from 'sentry/components/errorBoundary';
 import {Tooltip} from 'sentry/components/tooltip';
 import {IconEllipsis, IconExpand, IconInfo, IconWarning} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 
 import {ErrorPanel} from './errorPanel';
-import {MIN_HEIGHT, MIN_WIDTH, X_GUTTER, Y_GUTTER} from './settings';
+import {
+  MIN_HEIGHT,
+  MIN_WIDTH,
+  WIDGET_RENDER_ERROR_MESSAGE,
+  X_GUTTER,
+  Y_GUTTER,
+} from './settings';
 import {TooltipIconTrigger} from './tooltipIconTrigger';
 import type {StateProps} from './types';
 import {WarningsList} from './warningsList';
@@ -20,6 +27,7 @@ export interface WidgetFrameProps extends StateProps {
   actionsDisabled?: boolean;
   actionsMessage?: string;
   badgeProps?: BadgeProps | BadgeProps[];
+  borderless?: boolean;
   children?: React.ReactNode;
   description?: React.ReactElement | string;
   onFullScreenViewClick?: () => void;
@@ -41,11 +49,16 @@ export function WidgetFrame(props: WidgetFrameProps) {
               onAction: props.onRetry,
             },
           ]
-        : []
+        : props.actions
       : props.actions) ?? [];
 
+  const shouldShowFullScreenViewButton =
+    Boolean(props.onFullScreenViewClick) && !props.error;
+
+  const shouldShowActions = actions && actions.length > 0;
+
   return (
-    <Frame aria-label="Widget panel">
+    <Frame aria-label="Widget panel" borderless={props.borderless}>
       <Header>
         {props.warnings && props.warnings.length > 0 && (
           <Tooltip title={<WarningsList warnings={props.warnings} />} isHoverable>
@@ -64,9 +77,7 @@ export function WidgetFrame(props: WidgetFrameProps) {
             (currentBadgeProps, i) => <RigidBadge key={i} {...currentBadgeProps} />
           )}
 
-        {(props.description ||
-          props.onFullScreenViewClick ||
-          (actions && actions.length > 0)) && (
+        {(props.description || shouldShowFullScreenViewButton || shouldShowActions) && (
           <TitleHoverItems>
             {props.description && (
               // Ideally we'd use `QuestionTooltip` but we need to firstly paint the icon dark, give it 100% opacity, and remove hover behaviour.
@@ -95,48 +106,50 @@ export function WidgetFrame(props: WidgetFrameProps) {
               </Tooltip>
             )}
 
-            <TitleActionsWrapper
-              disabled={Boolean(props.actionsDisabled)}
-              disabledMessage={props.actionsMessage ?? ''}
-            >
-              {actions.length === 1 ? (
-                actions[0].to ? (
-                  <LinkButton
-                    size="xs"
-                    disabled={props.actionsDisabled}
-                    onClick={actions[0].onAction}
-                    to={actions[0].to}
-                  >
-                    {actions[0].label}
-                  </LinkButton>
-                ) : (
-                  <Button
-                    size="xs"
-                    disabled={props.actionsDisabled}
-                    onClick={actions[0].onAction}
-                  >
-                    {actions[0].label}
-                  </Button>
-                )
-              ) : null}
-
-              {actions.length > 1 ? (
-                <DropdownMenu
-                  items={actions}
-                  isDisabled={props.actionsDisabled}
-                  triggerProps={{
-                    'aria-label': t('Widget actions'),
-                    size: 'xs',
-                    borderless: true,
-                    showChevron: false,
-                    icon: <IconEllipsis direction="down" size="sm" />,
-                  }}
-                  position="bottom-end"
-                />
-              ) : null}
-            </TitleActionsWrapper>
+            {shouldShowActions && (
+              <TitleActionsWrapper
+                disabled={Boolean(props.actionsDisabled)}
+                disabledMessage={props.actionsMessage ?? ''}
+              >
+                {actions.length === 1 ? (
+                  actions[0]!.to ? (
+                    <LinkButton
+                      size="xs"
+                      disabled={props.actionsDisabled}
+                      onClick={actions[0]!.onAction}
+                      to={actions[0]!.to}
+                    >
+                      {actions[0]!.label}
+                    </LinkButton>
+                  ) : (
+                    <Button
+                      size="xs"
+                      disabled={props.actionsDisabled}
+                      onClick={actions[0]!.onAction}
+                    >
+                      {actions[0]!.label}
+                    </Button>
+                  )
+                ) : null}
+
+                {actions.length > 1 ? (
+                  <DropdownMenu
+                    items={actions}
+                    isDisabled={props.actionsDisabled}
+                    triggerProps={{
+                      'aria-label': t('Widget actions'),
+                      size: 'xs',
+                      borderless: true,
+                      showChevron: false,
+                      icon: <IconEllipsis direction="down" size="sm" />,
+                    }}
+                    position="bottom-end"
+                  />
+                ) : null}
+              </TitleActionsWrapper>
+            )}
 
-            {props.onFullScreenViewClick && (
+            {shouldShowFullScreenViewButton && (
               <Button
                 aria-label={t('Open Full-Screen View')}
                 borderless
@@ -152,7 +165,15 @@ export function WidgetFrame(props: WidgetFrameProps) {
       </Header>
 
       <VisualizationWrapper>
-        {props.error ? <ErrorPanel error={error} /> : props.children}
+        {props.error ? (
+          <ErrorPanel error={error} />
+        ) : (
+          <ErrorBoundary
+            customComponent={<ErrorPanel error={WIDGET_RENDER_ERROR_MESSAGE} />}
+          >
+            {props.children}
+          </ErrorBoundary>
+        )}
       </VisualizationWrapper>
     </Frame>
   );
@@ -186,7 +207,7 @@ function TitleActionsWrapper({disabled, disabledMessage, children}: TitleActions
   );
 }
 
-const Frame = styled('div')`
+const Frame = styled('div')<{borderless?: boolean}>`
   position: relative;
   display: flex;
   flex-direction: column;
@@ -197,8 +218,7 @@ const Frame = styled('div')`
   min-width: ${MIN_WIDTH}px;
 
   border-radius: ${p => p.theme.panelBorderRadius};
-  border: ${p => p.theme.border};
-  border: 1px ${p => 'solid ' + p.theme.border};
+  ${p => !p.borderless && `border: 1px solid ${p.theme.border};`}
 
   background: ${p => p.theme.background};
 
diff --git a/static/app/views/dashboards/widgets/lineChartWidget/lineChartWidget.spec.tsx b/static/app/views/dashboards/widgets/lineChartWidget/lineChartWidget.spec.tsx
index 64fcbe832b9e32..0ddf8090e667e3 100644
--- a/static/app/views/dashboards/widgets/lineChartWidget/lineChartWidget.spec.tsx
+++ b/static/app/views/dashboards/widgets/lineChartWidget/lineChartWidget.spec.tsx
@@ -11,14 +11,6 @@ describe('LineChartWidget', () => {
           title="eps()"
           description="Number of events per second"
           timeseries={[sampleDurationTimeSeries]}
-          meta={{
-            fields: {
-              'eps()': 'rate',
-            },
-            units: {
-              'eps()': '1/second',
-            },
-          }}
         />
       );
     });
diff --git a/static/app/views/dashboards/widgets/lineChartWidget/lineChartWidget.stories.tsx b/static/app/views/dashboards/widgets/lineChartWidget/lineChartWidget.stories.tsx
index d3cbb4653a4454..bf3430a3ceac8b 100644
--- a/static/app/views/dashboards/widgets/lineChartWidget/lineChartWidget.stories.tsx
+++ b/static/app/views/dashboards/widgets/lineChartWidget/lineChartWidget.stories.tsx
@@ -10,12 +10,12 @@ import storyBook from 'sentry/stories/storyBook';
 import type {DateString} from 'sentry/types/core';
 import usePageFilters from 'sentry/utils/usePageFilters';
 
+import {shiftTimeserieToNow} from '../common/shiftTimeserieToNow';
 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,
@@ -26,6 +26,14 @@ const sampleDurationTimeSeries2 = {
       value: datum.value * 0.3 + 30 * Math.random(),
     };
   }),
+  meta: {
+    fields: {
+      'p50(span.duration)': 'duration',
+    },
+    units: {
+      'p50(span.duration)': 'millisecond',
+    },
+  },
 };
 
 export default storyBook(LineChartWidget, story => {
@@ -76,14 +84,6 @@ export default storyBook(LineChartWidget, story => {
             title="eps()"
             description="Number of events per second"
             timeseries={[throughputTimeSeries]}
-            meta={{
-              fields: {
-                'eps()': 'rate',
-              },
-              units: {
-                'eps()': '1/second',
-              },
-            }}
           />
         </SmallSizingWindow>
 
@@ -103,15 +103,9 @@ export default storyBook(LineChartWidget, story => {
                 shiftTimeserieToNow(durationTimeSeries1),
                 shiftTimeserieToNow(durationTimeSeries2),
               ]}
-              meta={{
-                fields: {
-                  'p99(span.duration)': 'duration',
-                  'p50(span.duration)': 'duration',
-                },
-                units: {
-                  'p99(span.duration)': 'millisecond',
-                  'p50(span.duration)': 'millisecond',
-                },
+              aliases={{
+                'p50(span.duration)': '50th Percentile',
+                'p99(span.duration)': '99th Percentile',
               }}
             />
           </MediumWidget>
@@ -172,17 +166,17 @@ export default storyBook(LineChartWidget, story => {
               {
                 ...sampleThroughputTimeSeries,
                 field: 'error_rate()',
+                meta: {
+                  fields: {
+                    'error_rate()': 'rate',
+                  },
+                  units: {
+                    'error_rate()': '1/second',
+                  },
+                },
                 color: theme.error,
               } as unknown as TimeseriesData,
             ]}
-            meta={{
-              fields: {
-                'error_rate()': 'rate',
-              },
-              units: {
-                'error_rate()': '1/second',
-              },
-            }}
           />
         </MediumWidget>
       </Fragment>
@@ -216,17 +210,17 @@ export default storyBook(LineChartWidget, story => {
               {
                 ...sampleThroughputTimeSeries,
                 field: 'error_rate()',
+                meta: {
+                  fields: {
+                    'error_rate()': 'rate',
+                  },
+                  units: {
+                    'error_rate()': '1/second',
+                  },
+                },
               } as unknown as TimeseriesData,
             ]}
             releases={releases}
-            meta={{
-              fields: {
-                'error_rate()': 'rate',
-              },
-              units: {
-                'error_rate()': '1/second',
-              },
-            }}
           />
         </MediumWidget>
       </Fragment>
diff --git a/static/app/views/dashboards/widgets/lineChartWidget/lineChartWidget.tsx b/static/app/views/dashboards/widgets/lineChartWidget/lineChartWidget.tsx
index 283dfa55c35d8a..3696ffe98376e8 100644
--- a/static/app/views/dashboards/widgets/lineChartWidget/lineChartWidget.tsx
+++ b/static/app/views/dashboards/widgets/lineChartWidget/lineChartWidget.tsx
@@ -15,12 +15,12 @@ import {
 import {MISSING_DATA_MESSAGE, X_GUTTER, Y_GUTTER} from '../common/settings';
 import type {StateProps} from '../common/types';
 
-interface Props
+export interface LineChartWidgetProps
   extends StateProps,
     Omit<WidgetFrameProps, 'children'>,
     Partial<LineChartWidgetVisualizationProps> {}
 
-export function LineChartWidget(props: Props) {
+export function LineChartWidget(props: LineChartWidgetProps) {
   const {timeseries} = props;
 
   if (props.isLoading) {
@@ -47,6 +47,11 @@ export function LineChartWidget(props: Props) {
       title={props.title}
       description={props.description}
       actions={props.actions}
+      actionsDisabled={props.actionsDisabled}
+      actionsMessage={props.actionsMessage}
+      badgeProps={props.badgeProps}
+      onFullScreenViewClick={props.onFullScreenViewClick}
+      warnings={props.warnings}
       error={error}
       onRetry={props.onRetry}
     >
@@ -55,7 +60,7 @@ export function LineChartWidget(props: Props) {
           <LineChartWidgetVisualization
             timeseries={timeseries}
             releases={props.releases}
-            meta={props.meta}
+            aliases={props.aliases}
             dataCompletenessDelay={props.dataCompletenessDelay}
           />
         </LineChartWrapper>
diff --git a/static/app/views/dashboards/widgets/lineChartWidget/lineChartWidgetVisualization.tsx b/static/app/views/dashboards/widgets/lineChartWidget/lineChartWidgetVisualization.tsx
index adf1ed425dcf25..d4e51adc1fa281 100644
--- a/static/app/views/dashboards/widgets/lineChartWidget/lineChartWidgetVisualization.tsx
+++ b/static/app/views/dashboards/widgets/lineChartWidget/lineChartWidgetVisualization.tsx
@@ -19,16 +19,17 @@ import useOrganization from 'sentry/utils/useOrganization';
 import usePageFilters from 'sentry/utils/usePageFilters';
 
 import {useWidgetSyncContext} from '../../contexts/widgetSyncContext';
+import {formatTooltipValue} from '../common/formatTooltipValue';
+import {formatYAxisValue} from '../common/formatYAxisValue';
 import {ReleaseSeries} from '../common/releaseSeries';
-import type {Meta, Release, TimeseriesData} from '../common/types';
+import type {Aliases, Release, TimeseriesData} from '../common/types';
 
-import {formatChartValue} from './formatChartValue';
 import {splitSeriesIntoCompleteAndIncomplete} from './splitSeriesIntoCompleteAndIncomplete';
 
 export interface LineChartWidgetVisualizationProps {
   timeseries: TimeseriesData[];
+  aliases?: Aliases;
   dataCompletenessDelay?: number;
-  meta?: Meta;
   releases?: Release[];
 }
 
@@ -38,7 +39,6 @@ export function LineChartWidgetVisualization(props: LineChartWidgetVisualization
 
   const pageFilters = usePageFilters();
   const {start, end, period, utc} = pageFilters.selection.datetime;
-  const {meta} = props;
 
   const dataCompletenessDelay = props.dataCompletenessDelay ?? 0;
 
@@ -61,6 +61,10 @@ export function LineChartWidgetVisualization(props: LineChartWidgetVisualization
     releaseSeries = ReleaseSeries(theme, props.releases, onClick, utc ?? false);
   }
 
+  const formatSeriesName: (string) => string = name => {
+    return props.aliases?.[name] ?? name;
+  };
+
   const chartZoomProps = useChartZoom({
     saveOnZoom: true,
   });
@@ -90,14 +94,14 @@ export function LineChartWidgetVisualization(props: LineChartWidgetVisualization
   // 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];
+  const firstSeries = props.timeseries[0]!;
 
   // TODO: Raise error if attempting to plot series of different types or units
   const firstSeriesField = firstSeries?.field;
-  const type = meta?.fields?.[firstSeriesField] ?? 'number';
-  const unit = meta?.units?.[firstSeriesField] ?? undefined;
+  const type = firstSeries?.meta?.fields?.[firstSeriesField] ?? 'number';
+  const unit = firstSeries?.meta?.units?.[firstSeriesField] ?? undefined;
 
-  const formatter: TooltipFormatterCallback<TopLevelFormatterParams> = (
+  const formatTooltip: TooltipFormatterCallback<TopLevelFormatterParams> = (
     params,
     asyncTicket
   ) => {
@@ -135,8 +139,9 @@ export function LineChartWidgetVisualization(props: LineChartWidgetVisualization
       isGroupedByDate: true,
       showTimeInTooltip: true,
       valueFormatter: value => {
-        return formatChartValue(value, type, unit);
+        return formatTooltipValue(value, type, unit);
       },
+      nameFormatter: formatSeriesName,
       truncate: true,
       utc: utc ?? false,
     })(deDupedParams, asyncTicket);
@@ -203,6 +208,9 @@ export function LineChartWidgetVisualization(props: LineChartWidgetVisualization
           ? {
               top: 0,
               left: 0,
+              formatter(name: string) {
+                return formatSeriesName(name);
+              },
             }
           : undefined
       }
@@ -211,9 +219,10 @@ export function LineChartWidgetVisualization(props: LineChartWidgetVisualization
         axisPointer: {
           type: 'cross',
         },
-        formatter,
+        formatter: formatTooltip,
       }}
       xAxis={{
+        animation: false,
         axisLabel: {
           padding: [0, 10, 0, 10],
           width: 60,
@@ -221,9 +230,10 @@ export function LineChartWidgetVisualization(props: LineChartWidgetVisualization
         splitNumber: 0,
       }}
       yAxis={{
+        animation: false,
         axisLabel: {
           formatter(value: number) {
-            return formatChartValue(value, type, unit);
+            return formatYAxisValue(value, type, unit);
           },
         },
         axisPointer: {
diff --git a/static/app/views/dashboards/widgets/lineChartWidget/sampleDurationTimeSeries.json b/static/app/views/dashboards/widgets/lineChartWidget/sampleDurationTimeSeries.json
index 9a17607b405dca..65ac173fc8b976 100644
--- a/static/app/views/dashboards/widgets/lineChartWidget/sampleDurationTimeSeries.json
+++ b/static/app/views/dashboards/widgets/lineChartWidget/sampleDurationTimeSeries.json
@@ -1,5 +1,13 @@
 {
   "field": "p99(span.duration)",
+  "meta": {
+    "fields": {
+      "p99(span.duration)": "duration"
+    },
+    "units": {
+      "p99(span.duration)": "millisecond"
+    }
+  },
   "data": [
     {
       "value": 163.26759544018776,
diff --git a/static/app/views/dashboards/widgets/lineChartWidget/sampleThroughputTimeSeries.json b/static/app/views/dashboards/widgets/lineChartWidget/sampleThroughputTimeSeries.json
index fcda062750ee1b..eea4cac77dc6f8 100644
--- a/static/app/views/dashboards/widgets/lineChartWidget/sampleThroughputTimeSeries.json
+++ b/static/app/views/dashboards/widgets/lineChartWidget/sampleThroughputTimeSeries.json
@@ -1,5 +1,13 @@
 {
   "field": "eps()",
+  "meta": {
+    "fields": {
+      "eps()": "rate"
+    },
+    "units": {
+      "eps()": "1/second"
+    }
+  },
   "data": [
     {
       "value": 7456.966666666666,
diff --git a/static/app/views/dashboards/widgets/lineChartWidget/splitSeriesIntoCompleteAndIncomplete.spec.tsx b/static/app/views/dashboards/widgets/lineChartWidget/splitSeriesIntoCompleteAndIncomplete.spec.tsx
index 5e1ce965384a9d..7207f367cbffda 100644
--- a/static/app/views/dashboards/widgets/lineChartWidget/splitSeriesIntoCompleteAndIncomplete.spec.tsx
+++ b/static/app/views/dashboards/widgets/lineChartWidget/splitSeriesIntoCompleteAndIncomplete.spec.tsx
@@ -52,7 +52,7 @@ describe('splitSeriesIntoCompleteAndIncomplete', () => {
       },
     ]);
 
-    expect(incompleteSerie).toEqual(undefined);
+    expect(incompleteSerie).toBeUndefined();
   });
 
   it('Does not split a series with all incomplete data', () => {
@@ -83,7 +83,7 @@ describe('splitSeriesIntoCompleteAndIncomplete', () => {
       90
     );
 
-    expect(completeSerie).toEqual(undefined);
+    expect(completeSerie).toBeUndefined();
 
     expect(incompleteSerie?.data).toEqual([
       {
diff --git a/static/app/views/dataExport/dataDownload.spec.tsx b/static/app/views/dataExport/dataDownload.spec.tsx
index 790407c46475dc..207318511ae906 100644
--- a/static/app/views/dataExport/dataDownload.spec.tsx
+++ b/static/app/views/dataExport/dataDownload.spec.tsx
@@ -16,7 +16,7 @@ describe('DataDownload', function () {
     dataExportId: '721',
   };
 
-  const getDataExportDetails = (body, statusCode = 200) =>
+  const getDataExportDetails = (body: any, statusCode = 200) =>
     MockApiClient.addMockResponse({
       url: `/organizations/${mockRouteParams.orgId}/data-export/${mockRouteParams.dataExportId}/`,
       body,
diff --git a/static/app/views/discover/chartFooter.tsx b/static/app/views/discover/chartFooter.tsx
index 9a3dd11bc59fa4..f8329cd2c52329 100644
--- a/static/app/views/discover/chartFooter.tsx
+++ b/static/app/views/discover/chartFooter.tsx
@@ -83,7 +83,7 @@ export default function ChartFooter({
         {TOP_EVENT_MODES.includes(displayMode) ? (
           <OptionSelector
             title={t('Y-Axis')}
-            selected={yAxisValue[0]}
+            selected={yAxisValue[0]!}
             options={yAxisOptions}
             onChange={yAxis => onAxisChange([yAxis])}
           />
diff --git a/static/app/views/discover/eventDetails/content.tsx b/static/app/views/discover/eventDetails/content.tsx
index ad8a7a655fbaf9..8a6ac72a21f463 100644
--- a/static/app/views/discover/eventDetails/content.tsx
+++ b/static/app/views/discover/eventDetails/content.tsx
@@ -78,7 +78,7 @@ function EventHeader({event}: {event: Event}) {
 
 function EventDetailsContent(props: Props) {
   const [isSidebarVisible, setIsSidebarVisible] = useState<boolean>(true);
-  const projectId = props.eventSlug.split(':')[0];
+  const projectId = props.eventSlug.split(':')[0]!;
 
   const {
     data: event,
diff --git a/static/app/views/discover/eventDetails/linkedIssue.tsx b/static/app/views/discover/eventDetails/linkedIssue.tsx
index 90bb4479dbfea1..1ecc32b776e20f 100644
--- a/static/app/views/discover/eventDetails/linkedIssue.tsx
+++ b/static/app/views/discover/eventDetails/linkedIssue.tsx
@@ -52,11 +52,11 @@ function LinkedIssue({eventId, groupId}: Props) {
   const issueUrl = `${group.permalink}events/${eventId}/`;
 
   const groupStats: ReadonlyArray<TimeseriesValue> = group.filtered
-    ? group.filtered.stats?.['30d']
-    : group.stats?.['30d'];
+    ? group.filtered.stats?.['30d']!
+    : group.stats?.['30d']!;
 
   const groupSecondaryStats: ReadonlyArray<TimeseriesValue> = group.filtered
-    ? group.stats?.['30d']
+    ? group.stats?.['30d']!
     : [];
 
   return (
diff --git a/static/app/views/discover/homepage.spec.tsx b/static/app/views/discover/homepage.spec.tsx
index 16f4764151f29e..d9190880ee3dc8 100644
--- a/static/app/views/discover/homepage.spec.tsx
+++ b/static/app/views/discover/homepage.spec.tsx
@@ -9,11 +9,11 @@ import {
   screen,
   userEvent,
   waitFor,
+  within,
 } from 'sentry-test/reactTestingLibrary';
 
 import * as pageFilterUtils from 'sentry/components/organizations/pageFilters/persistence';
 import ProjectsStore from 'sentry/stores/projectsStore';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import EventView from 'sentry/utils/discover/eventView';
 
 import {DEFAULT_EVENT_VIEW} from './data';
@@ -21,7 +21,10 @@ import Homepage from './homepage';
 
 describe('Discover > Homepage', () => {
   const features = ['global-views', 'discover-query'];
-  let initialData, organization, mockHomepage, measurementsMetaMock;
+  let initialData: ReturnType<typeof initializeOrg>;
+  let organization: ReturnType<typeof OrganizationFixture>;
+  let mockHomepage: jest.Mock;
+  let measurementsMetaMock: jest.Mock;
 
   beforeEach(() => {
     organization = OrganizationFixture({
@@ -91,6 +94,10 @@ describe('Discover > Homepage', () => {
       method: 'GET',
       body: {},
     });
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/recent-searches/',
+      body: [],
+    });
   });
 
   it('renders the Discover banner', async () => {
@@ -127,7 +134,7 @@ describe('Discover > Homepage', () => {
     await screen.findByText('environment');
 
     // Only the environment field
-    expect(screen.getAllByTestId('grid-head-cell').length).toEqual(1);
+    expect(screen.getAllByTestId('grid-head-cell')).toHaveLength(1);
     screen.getByText('Previous Period');
     screen.getByText('event.type:error');
     expect(screen.queryByText('Dataset')).not.toBeInTheDocument();
@@ -176,15 +183,17 @@ describe('Discover > Homepage', () => {
       />,
       {router: initialData.router, organization: initialData.organization}
     );
-    renderGlobalModal();
+    renderGlobalModal({router: initialData.router});
 
     await userEvent.click(await screen.findByText('Columns'));
 
-    await userEvent.click(screen.getByTestId('label'));
-    await userEvent.click(screen.getByText('event.type'));
-    await userEvent.click(screen.getByText('Apply'));
+    const modal = await screen.findByRole('dialog');
 
-    expect(browserHistory.push).toHaveBeenCalledWith(
+    await userEvent.click(within(modal).getByTestId('label'));
+    await userEvent.click(within(modal).getByText('event.type'));
+    await userEvent.click(within(modal).getByText('Apply'));
+
+    expect(initialData.router.push).toHaveBeenCalledWith(
       expect.objectContaining({
         pathname: '/organizations/org-slug/discover/homepage/',
         query: expect.objectContaining({
@@ -519,7 +528,7 @@ describe('Discover > Homepage', () => {
       ],
     });
     initialData = initializeOrg({
-      organization: organization,
+      organization,
       router: {
         location: LocationFixture(),
       },
@@ -578,7 +587,7 @@ describe('Discover > Homepage', () => {
 
     await screen.findByText('environment');
 
-    expect(screen.getAllByTestId('grid-head-cell').length).toEqual(1);
+    expect(screen.getAllByTestId('grid-head-cell')).toHaveLength(1);
     screen.getByText('event.type:error');
     expect(screen.getByRole('tab', {name: 'Errors'})).toHaveAttribute(
       'aria-selected',
@@ -600,7 +609,7 @@ describe('Discover > Homepage', () => {
       ],
     });
     initialData = initializeOrg({
-      organization: organization,
+      organization,
       router: {
         location: LocationFixture(),
       },
diff --git a/static/app/views/discover/landing.tsx b/static/app/views/discover/landing.tsx
index b065793d7fc5fe..e04201aaf43ce5 100644
--- a/static/app/views/discover/landing.tsx
+++ b/static/app/views/discover/landing.tsx
@@ -124,7 +124,7 @@ class DiscoverLanding extends DeprecatedAsyncComponent<Props, State> {
       cursor,
       query: `version:2 name:"${searchQuery}"`,
       per_page: perPage.toString(),
-      sortBy: this.getActiveSort().value,
+      sortBy: this.getActiveSort()!.value,
     };
     if (!cursor) {
       delete queryParams.cursor;
@@ -208,7 +208,7 @@ class DiscoverLanding extends DeprecatedAsyncComponent<Props, State> {
         </PrebuiltSwitch>
         <CompactSelect
           triggerProps={{prefix: t('Sort By')}}
-          value={activeSort.value}
+          value={activeSort!.value}
           options={SORT_OPTIONS}
           onChange={opt => this.handleSortChange(opt.value)}
           position="bottom-end"
diff --git a/static/app/views/discover/miniGraph.spec.tsx b/static/app/views/discover/miniGraph.spec.tsx
index 6523227b33f78d..f9df7648a14fe4 100644
--- a/static/app/views/discover/miniGraph.spec.tsx
+++ b/static/app/views/discover/miniGraph.spec.tsx
@@ -17,7 +17,9 @@ describe('Discover > MiniGraph', function () {
     pathname: '/',
   });
 
-  let organization, eventView, initialData;
+  let organization!: ReturnType<typeof OrganizationFixture>;
+  let eventView!: ReturnType<typeof EventView.fromSavedQueryOrLocation>;
+  let initialData!: ReturnType<typeof initializeOrg>;
 
   beforeEach(() => {
     organization = OrganizationFixture({
diff --git a/static/app/views/discover/miniGraph.tsx b/static/app/views/discover/miniGraph.tsx
index 2a21e9f9bae09c..edbfbefb731359 100644
--- a/static/app/views/discover/miniGraph.tsx
+++ b/static/app/views/discover/miniGraph.tsx
@@ -191,7 +191,7 @@ class MiniGraph extends Component<Props> {
               ? display
               : this.getChartType({
                   showDaily,
-                  yAxis: Array.isArray(yAxis) ? yAxis[0] : yAxis,
+                  yAxis: Array.isArray(yAxis) ? yAxis[0]! : yAxis,
                   timeseriesData: allSeries,
                 });
           const data = allSeries.map(series => ({
diff --git a/static/app/views/discover/queryList.spec.tsx b/static/app/views/discover/queryList.spec.tsx
index b0f6cfea9faccf..f0ecd68bfb8113 100644
--- a/static/app/views/discover/queryList.spec.tsx
+++ b/static/app/views/discover/queryList.spec.tsx
@@ -1,4 +1,5 @@
 import {DiscoverSavedQueryFixture} from 'sentry-fixture/discover';
+import {LocationFixture} from 'sentry-fixture/locationFixture';
 import {OrganizationFixture} from 'sentry-fixture/organization';
 import {RouterFixture} from 'sentry-fixture/routerFixture';
 
@@ -12,7 +13,6 @@ import {
 } from 'sentry-test/reactTestingLibrary';
 
 import {openAddToDashboardModal} from 'sentry/actionCreators/modal';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {DisplayModes, SavedQueryDatasets} from 'sentry/utils/discover/types';
 import {DashboardWidgetSource, DisplayType} from 'sentry/views/dashboards/types';
 import QueryList from 'sentry/views/discover/queryList';
@@ -20,15 +20,14 @@ import QueryList from 'sentry/views/discover/queryList';
 jest.mock('sentry/actionCreators/modal');
 
 describe('Discover > QueryList', function () {
-  let location,
-    savedQueries,
-    organization,
-    deleteMock,
-    duplicateMock,
-    queryChangeMock,
-    updateHomepageMock,
-    eventsStatsMock,
-    wrapper;
+  let location: ReturnType<typeof LocationFixture>;
+  let savedQueries: ReturnType<typeof DiscoverSavedQueryFixture>[];
+  let organization: ReturnType<typeof OrganizationFixture>;
+  let deleteMock: jest.Mock;
+  let duplicateMock: jest.Mock;
+  let queryChangeMock: jest.Mock;
+  let updateHomepageMock: jest.Mock;
+  let eventsStatsMock: jest.Mock;
 
   const {router} = initializeOrg();
 
@@ -74,17 +73,15 @@ describe('Discover > QueryList', function () {
       statusCode: 204,
     });
 
-    location = {
+    location = LocationFixture({
       pathname: '/organizations/org-slug/discover/queries/',
       query: {cursor: '0:1:1', statsPeriod: '14d'},
-    };
+    });
     queryChangeMock = jest.fn();
   });
 
   afterEach(() => {
     jest.clearAllMocks();
-    wrapper?.unmount();
-    wrapper = null;
   });
 
   it('renders an empty list', function () {
@@ -255,7 +252,8 @@ describe('Discover > QueryList', function () {
         renderPrebuilt={false}
         onQueryChange={queryChangeMock}
         location={location}
-      />
+      />,
+      {router}
     );
 
     const card = screen.getAllByTestId(/card-*/).at(0)!;
@@ -266,7 +264,7 @@ describe('Discover > QueryList', function () {
     await userEvent.click(withinCard.getByText('Duplicate Query'));
 
     await waitFor(() => {
-      expect(browserHistory.push).toHaveBeenCalledWith({
+      expect(router.push).toHaveBeenCalledWith({
         pathname: location.pathname,
         query: {},
       });
@@ -350,7 +348,7 @@ describe('Discover > QueryList', function () {
     expect(queryChangeMock).not.toHaveBeenCalled();
 
     await waitFor(() => {
-      expect(browserHistory.push).toHaveBeenCalledWith({
+      expect(router.push).toHaveBeenCalledWith({
         pathname: location.pathname,
         query: {cursor: undefined, statsPeriod: '14d'},
       });
@@ -429,7 +427,7 @@ describe('Discover > QueryList', function () {
     });
     const yAxis = ['count()', 'failure_count()'];
     const savedQueryWithMultiYAxis = {
-      ...savedQueries.slice(1)[0],
+      ...savedQueries.slice(1)[0]!,
       yAxis,
     };
 
diff --git a/static/app/views/discover/results.spec.tsx b/static/app/views/discover/results.spec.tsx
index 6f78a668f321e2..10ec7188cfd930 100644
--- a/static/app/views/discover/results.spec.tsx
+++ b/static/app/views/discover/results.spec.tsx
@@ -9,7 +9,6 @@ import selectEvent from 'sentry-test/selectEvent';
 import * as PageFilterPersistence from 'sentry/components/organizations/pageFilters/persistence';
 import ProjectsStore from 'sentry/stores/projectsStore';
 import {SavedSearchType} from 'sentry/types/group';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import EventView from 'sentry/utils/discover/eventView';
 import Results from 'sentry/views/discover/results';
 
@@ -261,7 +260,7 @@ describe('Results', function () {
           setSavedQuery={jest.fn()}
         />,
         {
-          router: router,
+          router,
           organization,
         }
       );
@@ -270,7 +269,7 @@ describe('Results', function () {
       expect(mockRequests.eventsStatsMock).not.toHaveBeenCalled();
 
       // Should redirect and retain the old query value
-      expect(browserHistory.replace).toHaveBeenCalledWith(
+      expect(router.replace).toHaveBeenCalledWith(
         expect.objectContaining({
           pathname: '/organizations/org-slug/discover/results/',
           query: expect.objectContaining({
@@ -310,7 +309,7 @@ describe('Results', function () {
           setSavedQuery={jest.fn()}
         />,
         {
-          router: router,
+          router,
           organization,
         }
       );
@@ -373,7 +372,7 @@ describe('Results', function () {
           setSavedQuery={jest.fn()}
         />,
         {
-          router: router,
+          router,
           organization,
         }
       );
@@ -410,7 +409,7 @@ describe('Results', function () {
           setSavedQuery={jest.fn()}
         />,
         {
-          router: router,
+          router,
           organization,
         }
       );
@@ -447,7 +446,7 @@ describe('Results', function () {
           setSavedQuery={jest.fn()}
         />,
         {
-          router: router,
+          router,
           organization,
         }
       );
@@ -483,7 +482,7 @@ describe('Results', function () {
           setSavedQuery={jest.fn()}
         />,
         {
-          router: router,
+          router,
           organization,
         }
       );
@@ -525,7 +524,7 @@ describe('Results', function () {
           setSavedQuery={jest.fn()}
         />,
         {
-          router: router,
+          router,
           organization,
         }
       );
@@ -561,7 +560,7 @@ describe('Results', function () {
           setSavedQuery={jest.fn()}
         />,
         {
-          router: router,
+          router,
           organization,
         }
       );
@@ -603,7 +602,7 @@ describe('Results', function () {
           setSavedQuery={jest.fn()}
         />,
         {
-          router: router,
+          router,
           organization,
         }
       );
@@ -640,7 +639,7 @@ describe('Results', function () {
           setSavedQuery={jest.fn()}
         />,
         {
-          router: router,
+          router,
           organization,
         }
       );
@@ -707,7 +706,7 @@ describe('Results', function () {
           setSavedQuery={jest.fn()}
         />,
         {
-          router: router,
+          router,
           organization,
         }
       );
@@ -745,7 +744,7 @@ describe('Results', function () {
           setSavedQuery={jest.fn()}
         />,
         {
-          router: router,
+          router,
           organization,
         }
       );
@@ -822,7 +821,7 @@ describe('Results', function () {
           setSavedQuery={jest.fn()}
         />,
         {
-          router: router,
+          router,
           organization,
         }
       );
@@ -899,7 +898,7 @@ describe('Results', function () {
           setSavedQuery={jest.fn()}
         />,
         {
-          router: router,
+          router,
           organization,
         }
       );
@@ -980,7 +979,7 @@ describe('Results', function () {
           setSavedQuery={jest.fn()}
         />,
         {
-          router: router,
+          router,
           organization,
         }
       );
@@ -1043,7 +1042,7 @@ describe('Results', function () {
           loading={false}
           setSavedQuery={jest.fn()}
         />,
-        {router: router, organization}
+        {router, organization}
       );
 
       const projectPageFilter = await screen.findByTestId('page-filter-project-selector');
@@ -1086,7 +1085,7 @@ describe('Results', function () {
           loading={false}
           setSavedQuery={jest.fn()}
         />,
-        {router: router, organization}
+        {router, organization}
       );
 
       expect(await screen.findByText('this is a tip')).toBeInTheDocument();
@@ -1117,7 +1116,7 @@ describe('Results', function () {
           setSavedQuery={jest.fn()}
         />,
         {
-          router: router,
+          router,
           organization,
         }
       );
@@ -1154,7 +1153,7 @@ describe('Results', function () {
           setSavedQuery={jest.fn()}
         />,
         {
-          router: router,
+          router,
           organization,
         }
       );
@@ -1194,7 +1193,7 @@ describe('Results', function () {
           loading={false}
           setSavedQuery={jest.fn()}
         />,
-        {router: router, organization}
+        {router, organization}
       );
 
       await waitFor(() =>
@@ -1260,7 +1259,7 @@ describe('Results', function () {
           location={router.location}
           router={router}
         />,
-        {router: router, organization}
+        {router, organization}
       );
 
       await waitFor(() =>
@@ -1309,7 +1308,7 @@ describe('Results', function () {
             ...LocationFixture(),
             query: {
               ...EventView.fromNewQueryWithLocation(
-                getTransactionViews(organization)[0],
+                getTransactionViews(organization)[0]!,
                 LocationFixture()
               ).generateQueryStringObject(),
             },
@@ -1328,10 +1327,10 @@ describe('Results', function () {
           loading={false}
           setSavedQuery={jest.fn()}
         />,
-        {router: router, organization}
+        {router, organization}
       );
 
-      await screen.findAllByText(getTransactionViews(organization)[0].name);
+      await screen.findAllByText(getTransactionViews(organization)[0]!.name);
       await userEvent.click(screen.getByText('Set as Default'));
       expect(await screen.findByText('Remove Default')).toBeInTheDocument();
 
@@ -1380,7 +1379,7 @@ describe('Results', function () {
           loading={false}
           setSavedQuery={jest.fn()}
         />,
-        {router: router, organization}
+        {router, organization}
       );
 
       await waitFor(() => {
@@ -1414,7 +1413,7 @@ describe('Results', function () {
           loading={false}
           setSavedQuery={jest.fn()}
         />,
-        {router: router, organization}
+        {router, organization}
       );
 
       await waitFor(() => {
@@ -1458,7 +1457,7 @@ describe('Results', function () {
           loading={false}
           setSavedQuery={jest.fn()}
         />,
-        {router: router, organization}
+        {router, organization}
       );
 
       await waitFor(() => {
@@ -1496,7 +1495,7 @@ describe('Results', function () {
           loading={false}
           setSavedQuery={jest.fn()}
         />,
-        {router: router, organization}
+        {router, organization}
       );
 
       await waitFor(() => {
@@ -1535,7 +1534,7 @@ describe('Results', function () {
           setSavedQuery={jest.fn()}
         />,
         {
-          router: router,
+          router,
           organization,
         }
       );
@@ -1613,7 +1612,7 @@ describe('Results', function () {
           setSavedQuery={jest.fn()}
         />,
         {
-          router: router,
+          router,
           organization,
         }
       );
@@ -1705,7 +1704,7 @@ describe('Results', function () {
           setSavedQuery={jest.fn()}
         />,
         {
-          router: router,
+          router,
           organization,
         }
       );
@@ -1828,7 +1827,7 @@ describe('Results', function () {
           setSavedQuery={jest.fn()}
         />,
         {
-          router: router,
+          router,
           organization,
         }
       );
@@ -1946,7 +1945,7 @@ describe('Results', function () {
           setSavedQuery={jest.fn()}
         />,
         {
-          router: router,
+          router,
           organization,
         }
       );
diff --git a/static/app/views/discover/resultsChart.tsx b/static/app/views/discover/resultsChart.tsx
index 5940287b2554fa..9181c4f691fba7 100644
--- a/static/app/views/discover/resultsChart.tsx
+++ b/static/app/views/discover/resultsChart.tsx
@@ -93,7 +93,7 @@ class ResultsChart extends Component<ResultsChartProps> {
     const isPrevious = display === DisplayModes.PREVIOUS;
     const referrer = `api.discover.${display}-chart`;
     const topEvents = eventView.topEvents ? parseInt(eventView.topEvents, 10) : TOP_N;
-    const aggregateParam = getAggregateArg(yAxisValue[0]) || '';
+    const aggregateParam = getAggregateArg(yAxisValue[0]!) || '';
     const customPerformanceMetricFieldType = isCustomMeasurement(aggregateParam)
       ? customMeasurements
         ? customMeasurements[aggregateParam]?.fieldType
diff --git a/static/app/views/discover/resultsSearchQueryBuilder.tsx b/static/app/views/discover/resultsSearchQueryBuilder.tsx
index 59709c0a8f1324..3c95b26aeb4546 100644
--- a/static/app/views/discover/resultsSearchQueryBuilder.tsx
+++ b/static/app/views/discover/resultsSearchQueryBuilder.tsx
@@ -194,7 +194,7 @@ function ResultsSearchQueryBuilder(props: Props) {
               search: query,
               projectIds: projectIdStrings,
               // allows searching for tags on transactions as well
-              includeTransactions: includeTransactions,
+              includeTransactions,
               // allows searching for tags on sessions as well
               includeSessions: includeSessionTagsValues,
               dataset: dataset ? DiscoverDatasetsToDatasetMap[dataset] : undefined,
diff --git a/static/app/views/discover/savedQuery/datasetSelectorTabs.tsx b/static/app/views/discover/savedQuery/datasetSelectorTabs.tsx
index 76246dd047dc7f..47c802adda419e 100644
--- a/static/app/views/discover/savedQuery/datasetSelectorTabs.tsx
+++ b/static/app/views/discover/savedQuery/datasetSelectorTabs.tsx
@@ -87,7 +87,7 @@ function getValidEventViewForDataset(eventView: EventView, toDataset: DiscoverDa
   const remainingSearchFilter = search.formatString();
 
   for (let index = 0; index < denylistedFields.length; index++) {
-    const element = denylistedFields[index];
+    const element = denylistedFields[index]!;
     if (remainingSearchFilter.includes(element)) {
       search.removeFilter(element);
       modifiedQuery = true;
diff --git a/static/app/views/discover/savedQuery/index.spec.tsx b/static/app/views/discover/savedQuery/index.spec.tsx
index 463becf79a91a4..d018260078e35b 100644
--- a/static/app/views/discover/savedQuery/index.spec.tsx
+++ b/static/app/views/discover/savedQuery/index.spec.tsx
@@ -1,4 +1,6 @@
+import {LocationFixture} from 'sentry-fixture/locationFixture';
 import {OrganizationFixture} from 'sentry-fixture/organization';
+import {RouterFixture} from 'sentry-fixture/routerFixture';
 
 import {render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrary';
 
@@ -14,12 +16,12 @@ import * as utils from 'sentry/views/discover/savedQuery/utils';
 jest.mock('sentry/actionCreators/modal');
 
 function mount(
-  location,
-  organization,
-  router,
-  eventView,
-  savedQuery,
-  yAxis,
+  location: ReturnType<typeof LocationFixture>,
+  organization: Organization,
+  router: ReturnType<typeof RouterFixture>,
+  eventView: EventView,
+  savedQuery: SavedQuery | NewQuery | undefined,
+  yAxis: string[],
   disabled = false,
   setSavedQuery = jest.fn()
 ) {
@@ -28,7 +30,7 @@ function mount(
       location={location}
       organization={organization}
       eventView={eventView}
-      savedQuery={savedQuery}
+      savedQuery={savedQuery as SavedQuery}
       disabled={disabled}
       updateCallback={() => {}}
       yAxis={yAxis}
@@ -47,13 +49,13 @@ describe('Discover > SaveQueryButtonGroup', function () {
   let errorsViewSaved: EventView;
   let errorsViewModified: EventView;
   let errorsQuery: NewQuery;
-  const location = {
+  const location = LocationFixture({
     pathname: '/organization/eventsv2/',
     query: {},
-  };
-  const router = {
+  });
+  const router = RouterFixture({
     location: {query: {}},
-  };
+  });
   const yAxis = ['count()', 'failure_count()'];
 
   beforeEach(() => {
@@ -138,7 +140,7 @@ describe('Discover > SaveQueryButtonGroup', function () {
 
       await userEvent.click(screen.getByRole('button', {name: /discover context menu/i}));
       expect(
-        screen.queryByRole('menuitemradio', {name: /add to dashboard/i})
+        screen.getByRole('menuitemradio', {name: /add to dashboard/i})
       ).toBeInTheDocument();
     });
 
@@ -165,7 +167,7 @@ describe('Discover > SaveQueryButtonGroup', function () {
 
       await userEvent.click(screen.getByRole('button', {name: /discover context menu/i}));
       expect(
-        screen.queryByRole('menuitemradio', {name: /add to dashboard/i})
+        screen.getByRole('menuitemradio', {name: /add to dashboard/i})
       ).toBeInTheDocument();
       await userEvent.click(
         screen.getByRole('menuitemradio', {name: /add to dashboard/i})
@@ -331,7 +333,7 @@ describe('Discover > SaveQueryButtonGroup', function () {
         organization,
         router,
         errorsViewSaved,
-        {...savedQuery, yAxis: 'count()'},
+        {...savedQuery, yAxis: ['count()']},
         ['count()']
       );
 
@@ -374,7 +376,7 @@ describe('Discover > SaveQueryButtonGroup', function () {
         yAxis
       );
 
-      expect(screen.queryByRole('button', {name: /save as/i})).toBeInTheDocument();
+      expect(screen.getByRole('button', {name: /save as/i})).toBeInTheDocument();
       expect(screen.getByRole('button', {name: /save changes/i})).toBeInTheDocument();
 
       await userEvent.click(screen.getByRole('button', {name: /discover context menu/i}));
@@ -419,8 +421,8 @@ describe('Discover > SaveQueryButtonGroup', function () {
             }),
             yAxis
           );
-          expect(mockSetSavedQuery).toHaveBeenCalled();
         });
+        expect(mockSetSavedQuery).toHaveBeenCalled();
       });
     });
 
@@ -501,11 +503,9 @@ describe('Discover > SaveQueryButtonGroup', function () {
       const href = createAlertButton.getAttribute('href')!;
       const queryParameters = new URLSearchParams(href.split('?')[1]);
 
-      expect(queryParameters.get('query')).toEqual(
-        '(foo:bar) AND (event.type:transaction)'
-      );
-      expect(queryParameters.get('dataset')).toEqual('transactions');
-      expect(queryParameters.get('eventTypes')).toEqual('transaction');
+      expect(queryParameters.get('query')).toBe('(foo:bar) AND (event.type:transaction)');
+      expect(queryParameters.get('dataset')).toBe('transactions');
+      expect(queryParameters.get('eventTypes')).toBe('transaction');
     });
     it('uses the num errors alert type for error queries', () => {
       const metricAlertOrg = {
@@ -524,9 +524,9 @@ describe('Discover > SaveQueryButtonGroup', function () {
       const href = createAlertButton.getAttribute('href')!;
       const queryParameters = new URLSearchParams(href.split('?')[1]);
 
-      expect(queryParameters.get('query')).toEqual('foo:bar');
-      expect(queryParameters.get('dataset')).toEqual('events');
-      expect(queryParameters.get('eventTypes')).toEqual('error');
+      expect(queryParameters.get('query')).toBe('foo:bar');
+      expect(queryParameters.get('dataset')).toBe('events');
+      expect(queryParameters.get('eventTypes')).toBe('error');
     });
   });
 });
diff --git a/static/app/views/discover/table/arithmeticInput.spec.tsx b/static/app/views/discover/table/arithmeticInput.spec.tsx
index dfabe6975a5239..52f44ffd4540c5 100644
--- a/static/app/views/discover/table/arithmeticInput.spec.tsx
+++ b/static/app/views/discover/table/arithmeticInput.spec.tsx
@@ -81,10 +81,10 @@ describe('ArithmeticInput', function () {
 
     options.forEach((option, i) => {
       if (i < numericColumns.length) {
-        expect(option).toHaveTextContent(generateFieldAsString(numericColumns[i]));
+        expect(option).toHaveTextContent(generateFieldAsString(numericColumns[i]!));
         return;
       }
-      expect(option).toHaveTextContent(operators[i - numericColumns.length]);
+      expect(option).toHaveTextContent(operators[i - numericColumns.length]!);
     });
   });
 
@@ -142,7 +142,7 @@ describe('ArithmeticInput', function () {
     await userEvent.keyboard('{Escape}');
 
     expect(screen.getByRole('textbox')).toHaveValue(
-      `${generateFieldAsString(numericColumns[0])} `
+      `${generateFieldAsString(numericColumns[0]!)} `
     );
   });
 
@@ -161,10 +161,10 @@ describe('ArithmeticInput', function () {
 
     await userEvent.click(screen.getByRole('textbox'));
 
-    await userEvent.click(screen.getByText(generateFieldAsString(numericColumns[2])));
+    await userEvent.click(screen.getByText(generateFieldAsString(numericColumns[2]!)));
 
     expect(screen.getByRole('textbox')).toHaveValue(
-      `${generateFieldAsString(numericColumns[2])} `
+      `${generateFieldAsString(numericColumns[2]!)} `
     );
   });
 
diff --git a/static/app/views/discover/table/arithmeticInput.tsx b/static/app/views/discover/table/arithmeticInput.tsx
index efbee4bf00e224..023fa92769c6b6 100644
--- a/static/app/views/discover/table/arithmeticInput.tsx
+++ b/static/app/views/discover/table/arithmeticInput.tsx
@@ -24,6 +24,7 @@ type DropdownOptionGroup = {
 
 type DefaultProps = {
   options: Column[];
+  className?: string;
 };
 
 type Props = DefaultProps &
@@ -104,7 +105,7 @@ export default class ArithmeticInput extends PureComponent<Props, State> {
     // TODO: add support for when there are no spaces
 
     const matches = [...query.substring(0, currentPosition).matchAll(/\s|^/g)];
-    const match = matches[matches.length - 1];
+    const match = matches[matches.length - 1]!;
     const startOfTerm = match[0] === '' ? 0 : (match.index || 0) + 1;
 
     const cursorOffset = query.slice(currentPosition).search(/\s|$/);
@@ -146,7 +147,7 @@ export default class ArithmeticInput extends PureComponent<Props, State> {
         continue;
       }
 
-      return group.options[selection];
+      return group.options[selection]!;
     }
 
     return null;
@@ -180,7 +181,7 @@ export default class ArithmeticInput extends PureComponent<Props, State> {
       }
       // This is modifying the `active` value of the references so make sure to
       // use `newOptionGroups` at the end.
-      flattenedOptions[newSelection].active = true;
+      flattenedOptions[newSelection]!.active = true;
 
       this.setState({
         activeSelection: newSelection,
@@ -259,11 +260,11 @@ export default class ArithmeticInput extends PureComponent<Props, State> {
   }
 
   render() {
-    const {onUpdate: _onUpdate, options: _options, ...props} = this.props;
+    const {onUpdate: _onUpdate, options: _options, className, ...props} = this.props;
     const {dropdownVisible, dropdownOptionGroups} = this.state;
 
     return (
-      <Container isOpen={dropdownVisible}>
+      <Container isOpen={dropdownVisible} className={className}>
         <Input
           {...props}
           ref={this.input}
@@ -317,7 +318,7 @@ function TermDropdown({isOpen, optionGroups, handleSelect}: TermDropdownProps) {
             return (
               <Fragment key={title}>
                 <ListItem>
-                  <DropdownTitle>{title}</DropdownTitle>
+                  <DropdownTitle aria-label={title}>{title}</DropdownTitle>
                 </ListItem>
                 {options.map(option => {
                   return (
diff --git a/static/app/views/discover/table/cellAction.spec.tsx b/static/app/views/discover/table/cellAction.spec.tsx
index 7e355a46693f39..4779902449d084 100644
--- a/static/app/views/discover/table/cellAction.spec.tsx
+++ b/static/app/views/discover/table/cellAction.spec.tsx
@@ -47,7 +47,7 @@ function renderComponent({
   return render(
     <CellAction
       dataRow={data}
-      column={eventView.getColumns()[columnIndex]}
+      column={eventView.getColumns()[columnIndex]!}
       handleCellAction={handleCellAction}
     >
       <strong>some content</strong>
@@ -92,7 +92,7 @@ describe('Discover -> CellAction', function () {
   describe('hover menu button', function () {
     it('shows no menu by default', function () {
       renderComponent({eventView: view});
-      expect(screen.queryByRole('button', {name: 'Actions'})).toBeInTheDocument();
+      expect(screen.getByRole('button', {name: 'Actions'})).toBeInTheDocument();
     });
   });
 
@@ -428,79 +428,79 @@ describe('updateQuery()', function () {
     // TODO: Fix this type
     // @ts-ignore
     updateQuery(results, Actions.ADD, columnA, null);
-    expect(results.formatString()).toEqual('!has:a');
+    expect(results.formatString()).toBe('!has:a');
     // TODO: Fix this type
     // @ts-ignore
     updateQuery(results, Actions.EXCLUDE, columnA, null);
-    expect(results.formatString()).toEqual('has:a');
+    expect(results.formatString()).toBe('has:a');
     // TODO: Fix this type
     // @ts-ignore
     updateQuery(results, Actions.ADD, columnA, null);
-    expect(results.formatString()).toEqual('!has:a');
+    expect(results.formatString()).toBe('!has:a');
 
     results = new MutableSearch([]);
     // TODO: Fix this type
     // @ts-ignore
     updateQuery(results, Actions.ADD, columnA, [null]);
-    expect(results.formatString()).toEqual('!has:a');
+    expect(results.formatString()).toBe('!has:a');
   });
 
   it('modifies the query with additions', function () {
     const results = new MutableSearch([]);
     updateQuery(results, Actions.ADD, columnA, '1');
-    expect(results.formatString()).toEqual('a:1');
+    expect(results.formatString()).toBe('a:1');
     updateQuery(results, Actions.ADD, columnB, '1');
-    expect(results.formatString()).toEqual('a:1 b:1');
+    expect(results.formatString()).toBe('a:1 b:1');
     updateQuery(results, Actions.ADD, columnA, '2');
-    expect(results.formatString()).toEqual('b:1 a:2');
+    expect(results.formatString()).toBe('b:1 a:2');
     updateQuery(results, Actions.ADD, columnA, ['1', '2', '3']);
-    expect(results.formatString()).toEqual('b:1 a:2 a:1 a:3');
+    expect(results.formatString()).toBe('b:1 a:2 a:1 a:3');
   });
 
   it('modifies the query with exclusions', function () {
     const results = new MutableSearch([]);
     updateQuery(results, Actions.EXCLUDE, columnA, '1');
-    expect(results.formatString()).toEqual('!a:1');
+    expect(results.formatString()).toBe('!a:1');
     updateQuery(results, Actions.EXCLUDE, columnB, '1');
-    expect(results.formatString()).toEqual('!a:1 !b:1');
+    expect(results.formatString()).toBe('!a:1 !b:1');
     updateQuery(results, Actions.EXCLUDE, columnA, '2');
-    expect(results.formatString()).toEqual('!b:1 !a:1 !a:2');
+    expect(results.formatString()).toBe('!b:1 !a:1 !a:2');
     updateQuery(results, Actions.EXCLUDE, columnA, ['1', '2', '3']);
-    expect(results.formatString()).toEqual('!b:1 !a:1 !a:2 !a:3');
+    expect(results.formatString()).toBe('!b:1 !a:1 !a:2 !a:3');
   });
 
   it('modifies the query with a mix of additions and exclusions', function () {
     const results = new MutableSearch([]);
     updateQuery(results, Actions.ADD, columnA, '1');
-    expect(results.formatString()).toEqual('a:1');
+    expect(results.formatString()).toBe('a:1');
     updateQuery(results, Actions.ADD, columnB, '2');
-    expect(results.formatString()).toEqual('a:1 b:2');
+    expect(results.formatString()).toBe('a:1 b:2');
     updateQuery(results, Actions.EXCLUDE, columnA, '3');
-    expect(results.formatString()).toEqual('b:2 !a:3');
+    expect(results.formatString()).toBe('b:2 !a:3');
     updateQuery(results, Actions.EXCLUDE, columnB, '4');
-    expect(results.formatString()).toEqual('!a:3 !b:4');
+    expect(results.formatString()).toBe('!a:3 !b:4');
     results.addFilterValues('!a', ['*dontescapeme*'], false);
-    expect(results.formatString()).toEqual('!a:3 !b:4 !a:*dontescapeme*');
+    expect(results.formatString()).toBe('!a:3 !b:4 !a:*dontescapeme*');
     updateQuery(results, Actions.EXCLUDE, columnA, '*escapeme*');
-    expect(results.formatString()).toEqual(
+    expect(results.formatString()).toBe(
       '!b:4 !a:3 !a:*dontescapeme* !a:"\\*escapeme\\*"'
     );
     updateQuery(results, Actions.ADD, columnA, '5');
-    expect(results.formatString()).toEqual('!b:4 a:5');
+    expect(results.formatString()).toBe('!b:4 a:5');
     updateQuery(results, Actions.ADD, columnB, '6');
-    expect(results.formatString()).toEqual('a:5 b:6');
+    expect(results.formatString()).toBe('a:5 b:6');
   });
 
   it('modifies the query with greater/less than', function () {
     const results = new MutableSearch([]);
     updateQuery(results, Actions.SHOW_GREATER_THAN, columnA, 1);
-    expect(results.formatString()).toEqual('a:>1');
+    expect(results.formatString()).toBe('a:>1');
     updateQuery(results, Actions.SHOW_GREATER_THAN, columnA, 2);
-    expect(results.formatString()).toEqual('a:>2');
+    expect(results.formatString()).toBe('a:>2');
     updateQuery(results, Actions.SHOW_LESS_THAN, columnA, 3);
-    expect(results.formatString()).toEqual('a:<3');
+    expect(results.formatString()).toBe('a:<3');
     updateQuery(results, Actions.SHOW_LESS_THAN, columnA, 4);
-    expect(results.formatString()).toEqual('a:<4');
+    expect(results.formatString()).toBe('a:<4');
   });
 
   it('modifies the query with greater/less than on duration fields', function () {
@@ -511,13 +511,13 @@ describe('updateQuery()', function () {
 
     const results = new MutableSearch([]);
     updateQuery(results, Actions.SHOW_GREATER_THAN, columnADuration, 1);
-    expect(results.formatString()).toEqual('a:>1.00ms');
+    expect(results.formatString()).toBe('a:>1.00ms');
     updateQuery(results, Actions.SHOW_GREATER_THAN, columnADuration, 2);
-    expect(results.formatString()).toEqual('a:>2.00ms');
+    expect(results.formatString()).toBe('a:>2.00ms');
     updateQuery(results, Actions.SHOW_LESS_THAN, columnADuration, 3);
-    expect(results.formatString()).toEqual('a:<3.00ms');
+    expect(results.formatString()).toBe('a:<3.00ms');
     updateQuery(results, Actions.SHOW_LESS_THAN, columnADuration, 4.1234);
-    expect(results.formatString()).toEqual('a:<4.12ms');
+    expect(results.formatString()).toBe('a:<4.12ms');
   });
 
   it('does not error for special actions', function () {
diff --git a/static/app/views/discover/table/cellAction.tsx b/static/app/views/discover/table/cellAction.tsx
index c9fa0e6fe18514..01fc69dc2cda7e 100644
--- a/static/app/views/discover/table/cellAction.tsx
+++ b/static/app/views/discover/table/cellAction.tsx
@@ -45,7 +45,7 @@ export function updateQuery(
   if (Array.isArray(value)) {
     value = [...new Set(value)];
     if (value.length === 1) {
-      value = value[0];
+      value = value[0]!;
     }
   }
 
@@ -187,7 +187,7 @@ function makeCellActions({
         key: action,
         label: itemLabel,
         textValue: itemTextValue,
-        onAction: () => handleCellAction(action, value),
+        onAction: () => handleCellAction(action, value!),
       });
     }
   }
diff --git a/static/app/views/discover/table/columnEditCollection.tsx b/static/app/views/discover/table/columnEditCollection.tsx
index 73915026ee9f9f..d8927b3ad6da81 100644
--- a/static/app/views/discover/table/columnEditCollection.tsx
+++ b/static/app/views/discover/table/columnEditCollection.tsx
@@ -114,7 +114,7 @@ class ColumnEditCollection extends Component<Props, State> {
   checkColumnErrors(columns: Column[]) {
     const error = new Map();
     for (let i = 0; i < columns.length; i += 1) {
-      const column = columns[i];
+      const column = columns[i]!;
       if (column.kind === 'equation') {
         const result = parseArithmetic(column.field);
         if (result.error) {
@@ -180,15 +180,15 @@ class ColumnEditCollection extends Component<Props, State> {
   };
 
   updateEquationFields = (newColumns: Column[], index: number, updatedColumn: Column) => {
-    const oldColumn = newColumns[index];
-    const existingColumn = generateFieldAsString(newColumns[index]);
+    const oldColumn = newColumns[index]!;
+    const existingColumn = generateFieldAsString(newColumns[index]!);
     const updatedColumnString = generateFieldAsString(updatedColumn);
     if (!isLegalEquationColumn(updatedColumn) || hasDuplicate(newColumns, oldColumn)) {
       return;
     }
     // Find the equations in the list of columns
     for (let i = 0; i < newColumns.length; i++) {
-      const newColumn = newColumns[i];
+      const newColumn = newColumns[i]!;
 
       if (newColumn.kind === 'equation') {
         const result = parseArithmetic(newColumn.field);
@@ -218,7 +218,7 @@ class ColumnEditCollection extends Component<Props, State> {
         newColumns[i] = {
           kind: 'equation',
           field: newEquation,
-          alias: newColumns[i].alias,
+          alias: newColumns[i]!.alias,
         };
       }
     }
@@ -328,7 +328,7 @@ class ColumnEditCollection extends Component<Props, State> {
 
   isFixedIssueColumn = (columnIndex: number) => {
     const {source, columns} = this.props;
-    const column = columns[columnIndex];
+    const column = columns[columnIndex]!;
     const issueFieldColumnCount = columns.filter(
       col => col.kind === 'field' && col.field === FieldKey.ISSUE
     ).length;
@@ -347,7 +347,7 @@ class ColumnEditCollection extends Component<Props, State> {
 
   isRemainingReleaseHealthAggregate = (columnIndex: number) => {
     const {source, columns} = this.props;
-    const column = columns[columnIndex];
+    const column = columns[columnIndex]!;
     const aggregateCount = columns.filter(
       col => col.kind === FieldValueKind.FUNCTION
     ).length;
@@ -381,7 +381,7 @@ class ColumnEditCollection extends Component<Props, State> {
     // Reorder columns and trigger change.
     const newColumns = [...this.props.columns];
     const removed = newColumns.splice(sourceIndex, 1);
-    newColumns.splice(targetIndex, 0, removed[0]);
+    newColumns.splice(targetIndex, 0, removed[0]!);
     this.checkColumnErrors(newColumns);
     this.props.onChange(newColumns);
 
@@ -407,7 +407,7 @@ class ColumnEditCollection extends Component<Props, State> {
 
     const top = Number(this.state.top) - dragOffsetY;
     const left = Number(this.state.left) - dragOffsetX;
-    const col = this.props.columns[index];
+    const col = this.props.columns[index]!;
 
     const style = {
       top: `${top}px`,
@@ -502,8 +502,8 @@ class ColumnEditCollection extends Component<Props, State> {
           {source === WidgetType.METRICS && !this.isFixedMetricsColumn(i) ? (
             <MetricTagQueryField
               mri={
-                columns[0].kind === FieldValueKind.FUNCTION
-                  ? columns[0].function[1]
+                columns[0]!.kind === FieldValueKind.FUNCTION
+                  ? columns[0]!.function[1]
                   : // We should never get here because the first column should always be function for metrics
                     undefined
               }
diff --git a/static/app/views/discover/table/columnEditModal.spec.tsx b/static/app/views/discover/table/columnEditModal.spec.tsx
index 4937ba16896d2a..25ab6280d3d04d 100644
--- a/static/app/views/discover/table/columnEditModal.spec.tsx
+++ b/static/app/views/discover/table/columnEditModal.spec.tsx
@@ -28,7 +28,7 @@ function mountModal(
     React.ComponentProps<typeof ColumnEditModal>,
     'columns' | 'onApply' | 'customMeasurements' | 'dataset'
   >,
-  initialData
+  initialData: ReturnType<typeof initializeOrg>
 ) {
   return render(
     <ColumnEditModal
@@ -52,32 +52,35 @@ function mountModal(
 const findAllQueryFields = () => screen.findAllByTestId('queryField');
 
 // Get the nth label (value) within the row of the column editor.
-const findAllQueryFieldNthCell = async nth =>
+const findAllQueryFieldNthCell = async (nth: number) =>
   (await findAllQueryFields())
     .map(f => within(f).getAllByTestId('label')[nth])
     .filter(Boolean);
 
 const getAllQueryFields = () => screen.getAllByTestId('queryField');
-const getAllQueryFieldsNthCell = nth =>
+const getAllQueryFieldsNthCell = (nth: number) =>
   getAllQueryFields()
     .map(f => within(f).getAllByTestId('label')[nth])
     .filter(Boolean);
 
-const openMenu = async (row, column = 0) => {
+const openMenu = async (row: number, column = 0) => {
   const queryFields = await screen.findAllByTestId('queryField');
-  const queryField = queryFields[row];
+  const queryField = queryFields[row]!;
   expect(queryField).toBeInTheDocument();
 
   const labels = within(queryField).queryAllByTestId('label');
   if (labels.length > 0) {
-    await userEvent.click(labels[column]);
+    await userEvent.click(labels[column]!);
   } else {
     // For test adding a new column, no existing label.
     await userEvent.click(screen.getByText('(Required)'));
   }
 };
 
-const selectByLabel = async (label, options) => {
+const selectByLabel = async (
+  label: string,
+  options: {at: number; control?: boolean; name?: string}
+) => {
   await openMenu(options.at);
   const menuOptions = screen.getAllByTestId('menu-list-item-label'); // TODO: Can likely switch to menuitem role and match against label
   const opt = menuOptions.find(e => e.textContent?.includes(label));
@@ -140,7 +143,7 @@ describe('Discover -> ColumnEditModal', function () {
         initialData
       );
       // Should have fields equal to the columns.
-      expect((await findAllQueryFieldNthCell(0)).map(el => el.textContent)).toEqual([
+      expect((await findAllQueryFieldNthCell(0)).map(el => el!.textContent)).toEqual([
         'event.type',
         'browser.name',
         'count()',
@@ -178,12 +181,12 @@ describe('Discover -> ColumnEditModal', function () {
         initialData
       );
 
-      expect((await findAllQueryFieldNthCell(0)).map(el => el.textContent)).toEqual([
+      expect((await findAllQueryFieldNthCell(0)).map(el => el!.textContent)).toEqual([
         'count_unique(…)',
         'user-def',
       ]);
 
-      expect(getAllQueryFieldsNthCell(1).map(el => el.textContent)).toEqual([
+      expect(getAllQueryFieldsNthCell(1).map(el => el!.textContent)).toEqual([
         'user-defined',
       ]);
     });
@@ -211,7 +214,7 @@ describe('Discover -> ColumnEditModal', function () {
         initialData
       );
 
-      expect((await findAllQueryFieldNthCell(0)).map(el => el.textContent)).toEqual([
+      expect((await findAllQueryFieldNthCell(0)).map(el => el!.textContent)).toEqual([
         'project',
         'count',
       ]);
@@ -230,7 +233,7 @@ describe('Discover -> ColumnEditModal', function () {
         initialData
       );
 
-      expect((await findAllQueryFieldNthCell(0)).map(el => el.textContent)).toEqual([
+      expect((await findAllQueryFieldNthCell(0)).map(el => el!.textContent)).toEqual([
         'project',
         'count',
       ]);
@@ -257,20 +260,20 @@ describe('Discover -> ColumnEditModal', function () {
 
       const queryFields = await findAllQueryFields();
 
-      const countRow = queryFields[0];
+      const countRow = queryFields[0]!;
 
       expect(
         within(countRow)
           .getAllByTestId('label')
-          .map(el => el.textContent)
+          .map(el => el!.textContent)
       ).toEqual(['count()']);
 
-      const percentileRow = queryFields[2];
+      const percentileRow = queryFields[2]!;
 
       expect(
         within(percentileRow)
           .getAllByTestId('label')
-          .map(el => el.textContent)
+          .map(el => el!.textContent)
       ).toEqual(['percentile(…)', 'transaction.duration']);
       expect(within(percentileRow).getByDisplayValue('0.66')).toBeInTheDocument();
     });
@@ -285,7 +288,7 @@ describe('Discover -> ColumnEditModal', function () {
     it('restricts column choices', async function () {
       mountModal(
         {
-          columns: [columns[0]],
+          columns: [columns[0]!],
           onApply,
           customMeasurements: {},
         },
@@ -298,7 +301,7 @@ describe('Discover -> ColumnEditModal', function () {
       await openMenu(0, 1);
 
       const menuOptions = await screen.findAllByTestId('menu-list-item-label');
-      const menuOptionsText = menuOptions.map(el => el.textContent);
+      const menuOptionsText = menuOptions.map(el => el!.textContent);
       expect(menuOptionsText).toContain('transaction.duration');
       expect(menuOptionsText).not.toContain('title');
     });
@@ -306,7 +309,7 @@ describe('Discover -> ColumnEditModal', function () {
     it('shows no options for parameterless functions', async function () {
       mountModal(
         {
-          columns: [columns[0]],
+          columns: [columns[0]!],
           onApply,
           customMeasurements: {},
         },
@@ -320,7 +323,7 @@ describe('Discover -> ColumnEditModal', function () {
     it('shows additional inputs for multi-parameter functions', async function () {
       mountModal(
         {
-          columns: [columns[0]],
+          columns: [columns[0]!],
           onApply,
           customMeasurements: {},
         },
@@ -340,7 +343,7 @@ describe('Discover -> ColumnEditModal', function () {
     it('handles scalar field parameters', async function () {
       mountModal(
         {
-          columns: [columns[0]],
+          columns: [columns[0]!],
           onApply,
           customMeasurements: {},
         },
@@ -364,7 +367,7 @@ describe('Discover -> ColumnEditModal', function () {
     it('handles parameter overrides', async function () {
       mountModal(
         {
-          columns: [columns[0]],
+          columns: [columns[0]!],
           onApply,
           customMeasurements: {},
         },
@@ -381,7 +384,7 @@ describe('Discover -> ColumnEditModal', function () {
     it('clears unused parameters', async function () {
       mountModal(
         {
-          columns: [columns[0]],
+          columns: [columns[0]!],
           onApply,
           customMeasurements: {},
         },
@@ -408,7 +411,7 @@ describe('Discover -> ColumnEditModal', function () {
     it('clears all unused parameters', async function () {
       mountModal(
         {
-          columns: [columns[0]],
+          columns: [columns[0]!],
           onApply,
           customMeasurements: {},
         },
@@ -435,7 +438,7 @@ describe('Discover -> ColumnEditModal', function () {
     it('clears all unused parameters with count_if to two parameter function', async function () {
       mountModal(
         {
-          columns: [columns[0]],
+          columns: [columns[0]!],
           onApply,
           customMeasurements: {},
         },
@@ -462,7 +465,7 @@ describe('Discover -> ColumnEditModal', function () {
     it('clears all unused parameters with count_if to one parameter function', async function () {
       mountModal(
         {
-          columns: [columns[0]],
+          columns: [columns[0]!],
           onApply,
           customMeasurements: {},
         },
@@ -489,7 +492,7 @@ describe('Discover -> ColumnEditModal', function () {
     it('clears all unused parameters with count_if to parameterless function', async function () {
       mountModal(
         {
-          columns: [columns[0]],
+          columns: [columns[0]!],
           onApply,
           customMeasurements: {},
         },
@@ -530,7 +533,7 @@ describe('Discover -> ColumnEditModal', function () {
       await userEvent.hover(await screen.findByTestId('arithmeticErrorWarning'));
       expect(await screen.findByText('Division by 0 is not allowed')).toBeInTheDocument();
 
-      const input = screen.getAllByRole('textbox')[0];
+      const input = screen.getAllByRole('textbox')[0]!;
       expect(input).toHaveValue('1 / 0');
 
       await userEvent.clear(input);
@@ -564,7 +567,7 @@ describe('Discover -> ColumnEditModal', function () {
         initialData
       );
 
-      const input = screen.getAllByRole('textbox')[2]; // The numeric input
+      const input = screen.getAllByRole('textbox')[2]!; // The numeric input
       expect(input).toHaveValue(initialColumnVal);
       await userEvent.clear(input);
       await userEvent.click(document.body); // Unfocusing the input should revert it to the previous value
@@ -814,7 +817,7 @@ describe('Discover -> ColumnEditModal', function () {
     it('allows rows to be added, async but only up to 20', async function () {
       mountModal(
         {
-          columns: [columns[0]],
+          columns: [columns[0]!],
           onApply: jest.fn(),
           customMeasurements: {},
         },
@@ -835,7 +838,7 @@ describe('Discover -> ColumnEditModal', function () {
     it('allows rows to be removed, async but not the last one', async function () {
       mountModal(
         {
-          columns: [columns[0], columns[1]],
+          columns: [columns[0]!, columns[1]!],
           onApply: jest.fn(),
           customMeasurements: {},
         },
@@ -858,8 +861,8 @@ describe('Discover -> ColumnEditModal', function () {
       mountModal(
         {
           columns: [
-            columns[0],
-            columns[1],
+            columns[0]!,
+            columns[1]!,
             {
               kind: 'equation',
               field: '5 + 5',
@@ -875,7 +878,7 @@ describe('Discover -> ColumnEditModal', function () {
 
       expect(await screen.findAllByTestId('queryField')).toHaveLength(2);
 
-      expect(screen.queryByRole('button', {name: 'Remove column'})).toBeInTheDocument();
+      expect(screen.getByRole('button', {name: 'Remove column'})).toBeInTheDocument();
       expect(screen.queryAllByRole('button', {name: 'Drag to reorder'})).toHaveLength(2);
     });
     it('handles equations being deleted', async function () {
@@ -886,8 +889,8 @@ describe('Discover -> ColumnEditModal', function () {
               kind: 'equation',
               field: '1 / 0',
             },
-            columns[0],
-            columns[1],
+            columns[0]!,
+            columns[1]!,
           ],
           onApply: jest.fn(),
           customMeasurements: {},
@@ -910,7 +913,7 @@ describe('Discover -> ColumnEditModal', function () {
     it('reflects added and removed columns', async function () {
       mountModal(
         {
-          columns: [columns[0], columns[1]],
+          columns: [columns[0]!, columns[1]!],
           onApply,
           customMeasurements: {},
         },
@@ -941,7 +944,7 @@ describe('Discover -> ColumnEditModal', function () {
           Footer={stubEl()}
           Body={stubEl()}
           organization={initialData.organization}
-          columns={[columns[0]]}
+          columns={[columns[0]!]}
           onApply={() => undefined}
           closeModal={() => undefined}
           measurementKeys={[]}
@@ -972,7 +975,7 @@ describe('Discover -> ColumnEditModal', function () {
       );
       expect(screen.getByText('event.type')).toBeInTheDocument();
       await userEvent.click(screen.getByText('event.type'));
-      await userEvent.type(screen.getAllByText('event.type')[0], 'custom');
+      await userEvent.type(screen.getAllByText('event.type')[0]!, 'custom');
       expect(screen.getByText('measurements.custom.kibibyte')).toBeInTheDocument();
     });
   });
diff --git a/static/app/views/discover/table/index.tsx b/static/app/views/discover/table/index.tsx
index 6ac2a4b3bac467..4ad45fa9c449e9 100644
--- a/static/app/views/discover/table/index.tsx
+++ b/static/app/views/discover/table/index.tsx
@@ -286,7 +286,7 @@ class Table extends PureComponent<TableProps, TableState> {
     const {pageLinks, tableData, isLoading, error} = this.state;
 
     const isFirstPage = pageLinks
-      ? parseLinkHeader(pageLinks).previous.results === false
+      ? parseLinkHeader(pageLinks).previous!.results === false
       : false;
 
     return (
diff --git a/static/app/views/discover/table/queryField.tsx b/static/app/views/discover/table/queryField.tsx
index 911f6355e4f077..d2118e376a3dd4 100644
--- a/static/app/views/discover/table/queryField.tsx
+++ b/static/app/views/discover/table/queryField.tsx
@@ -36,7 +36,7 @@ type FieldOptions = Record<string, FieldValueOption>;
 
 // Intermediate type that combines the current column
 // data with the AggregateParameter type.
-type ParameterDescription =
+export type ParameterDescription =
   | {
       dataType: ColumnType;
       kind: 'value';
@@ -739,7 +739,7 @@ type InputState = {value: string};
  * Using a buffered input lets us throttle rendering and enforce data
  * constraints better.
  */
-class BufferedInput extends Component<BufferedInputProps, InputState> {
+export class BufferedInput extends Component<BufferedInputProps, InputState> {
   constructor(props: BufferedInputProps) {
     super(props);
     this.input = createRef();
diff --git a/static/app/views/discover/table/quickContext/actionDropdown.spec.tsx b/static/app/views/discover/table/quickContext/actionDropdown.spec.tsx
index 83c04ccc0ef827..880ce515e7df7b 100644
--- a/static/app/views/discover/table/quickContext/actionDropdown.spec.tsx
+++ b/static/app/views/discover/table/quickContext/actionDropdown.spec.tsx
@@ -1,10 +1,10 @@
 import type {Location} from 'history';
 import {LocationFixture} from 'sentry-fixture/locationFixture';
 import {OrganizationFixture} from 'sentry-fixture/organization';
+import {RouterFixture} from 'sentry-fixture/routerFixture';
 
 import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 
-import {browserHistory} from 'sentry/utils/browserHistory';
 import type {EventData} from 'sentry/utils/discover/eventView';
 import EventView from 'sentry/utils/discover/eventView';
 
@@ -33,6 +33,8 @@ const mockedLocation = LocationFixture({
   },
 });
 
+const mockedRouter = RouterFixture();
+
 const renderActionDropdown = (
   location: Location,
   eventView: EventView,
@@ -51,7 +53,7 @@ const renderActionDropdown = (
       value={value}
       contextValueType={contextValueType}
     />,
-    {organization}
+    {organization, router: mockedRouter}
   );
 };
 
@@ -122,7 +124,7 @@ describe('Quick Context Actions', function () {
 
     await userEvent.click(addAsColumn);
 
-    expect(browserHistory.push).toHaveBeenCalledWith(
+    expect(mockedRouter.push).toHaveBeenCalledWith(
       expect.objectContaining({
         pathname: '/mock-pathname/',
         query: expect.objectContaining({
@@ -150,7 +152,7 @@ describe('Quick Context Actions', function () {
 
     await userEvent.click(addToFilter);
 
-    expect(browserHistory.push).toHaveBeenCalledWith(
+    expect(mockedRouter.push).toHaveBeenCalledWith(
       expect.objectContaining({
         pathname: '/mock-pathname/',
         query: expect.objectContaining({
@@ -180,7 +182,7 @@ describe('Quick Context Actions', function () {
 
     await userEvent.click(addToFilter);
 
-    expect(browserHistory.push).toHaveBeenCalledWith(
+    expect(mockedRouter.push).toHaveBeenCalledWith(
       expect.objectContaining({
         pathname: '/mock-pathname/',
         query: expect.objectContaining({
@@ -210,7 +212,7 @@ describe('Quick Context Actions', function () {
 
     await userEvent.click(showGreaterThanBtn);
 
-    expect(browserHistory.push).toHaveBeenCalledWith(
+    expect(mockedRouter.push).toHaveBeenCalledWith(
       expect.objectContaining({
         pathname: '/mock-pathname/',
         query: expect.objectContaining({
@@ -240,7 +242,7 @@ describe('Quick Context Actions', function () {
 
     await userEvent.click(showLessThanBtn);
 
-    expect(browserHistory.push).toHaveBeenCalledWith(
+    expect(mockedRouter.push).toHaveBeenCalledWith(
       expect.objectContaining({
         pathname: '/mock-pathname/',
         query: expect.objectContaining({
diff --git a/static/app/views/discover/table/quickContext/releaseContext.spec.tsx b/static/app/views/discover/table/quickContext/releaseContext.spec.tsx
index b443c16a499186..3008c48dee40b0 100644
--- a/static/app/views/discover/table/quickContext/releaseContext.spec.tsx
+++ b/static/app/views/discover/table/quickContext/releaseContext.spec.tsx
@@ -12,7 +12,7 @@ import {QueryClientProvider} from 'sentry/utils/queryClient';
 import ReleaseContext from './releaseContext';
 import {defaultRow, mockedCommit, mockedUser1, mockedUser2} from './testUtils';
 
-export const mockedReleaseWithHealth = ReleaseFixture({
+const mockedReleaseWithHealth = ReleaseFixture({
   id: '1',
   shortVersion: 'sentry-android-shop@1.2.0',
   version: 'sentry-android-shop@1.2.0',
diff --git a/static/app/views/discover/table/tableView.spec.tsx b/static/app/views/discover/table/tableView.spec.tsx
index 51ffe0019700e2..b82a863c4a2657 100644
--- a/static/app/views/discover/table/tableView.spec.tsx
+++ b/static/app/views/discover/table/tableView.spec.tsx
@@ -6,7 +6,6 @@ import {act, render, screen, userEvent, within} from 'sentry-test/reactTestingLi
 
 import ProjectsStore from 'sentry/stores/projectsStore';
 import TagStore from 'sentry/stores/tagStore';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import type {TableData} from 'sentry/utils/discover/discoverQuery';
 import EventView from 'sentry/utils/discover/eventView';
 import {SavedQueryDatasets} from 'sentry/utils/discover/types';
@@ -65,16 +64,13 @@ describe('TableView > CellActions', function () {
   }
 
   async function openContextMenu(cellIndex: number) {
-    const firstRow = screen.getAllByRole('row')[1];
-    const emptyValueCell = within(firstRow).getAllByRole('cell')[cellIndex];
+    const firstRow = screen.getAllByRole('row')[1]!;
+    const emptyValueCell = within(firstRow).getAllByRole('cell')[cellIndex]!;
 
     await userEvent.click(within(emptyValueCell).getByRole('button', {name: 'Actions'}));
   }
 
   beforeEach(function () {
-    jest.mocked(browserHistory.push).mockReset();
-    jest.mocked(browserHistory.replace).mockReset();
-
     const organization = OrganizationFixture({
       features: ['discover-basic'],
     });
@@ -161,7 +157,7 @@ describe('TableView > CellActions', function () {
     await openContextMenu(1);
     await userEvent.click(screen.getByRole('menuitemradio', {name: 'Add to filter'}));
 
-    expect(browserHistory.push).toHaveBeenCalledWith({
+    expect(initialData.router.push).toHaveBeenCalledWith({
       pathname: location.pathname,
       query: expect.objectContaining({
         query: '!has:title',
@@ -178,7 +174,7 @@ describe('TableView > CellActions', function () {
     await openContextMenu(1);
     await userEvent.click(screen.getByRole('menuitemradio', {name: 'Add to filter'}));
 
-    expect(browserHistory.push).toHaveBeenCalledWith({
+    expect(initialData.router.push).toHaveBeenCalledWith({
       pathname: location.pathname,
       query: expect.objectContaining({
         query: 'tag:value !has:title',
@@ -194,7 +190,7 @@ describe('TableView > CellActions', function () {
     await openContextMenu(1);
     await userEvent.click(screen.getByRole('menuitemradio', {name: 'Add to filter'}));
 
-    expect(browserHistory.push).toHaveBeenCalledWith({
+    expect(initialData.router.push).toHaveBeenCalledWith({
       pathname: location.pathname,
       query: expect.objectContaining({
         query: 'tag:value title:"some title"',
@@ -209,7 +205,7 @@ describe('TableView > CellActions', function () {
     await openContextMenu(1);
     await userEvent.click(screen.getByRole('menuitemradio', {name: 'Add to filter'}));
 
-    expect(browserHistory.push).toHaveBeenCalledWith({
+    expect(initialData.router.push).toHaveBeenCalledWith({
       pathname: location.pathname,
       query: expect.objectContaining({
         query: 'title:"some title"',
@@ -225,7 +221,7 @@ describe('TableView > CellActions', function () {
       screen.getByRole('menuitemradio', {name: 'Exclude from filter'})
     );
 
-    expect(browserHistory.push).toHaveBeenCalledWith({
+    expect(initialData.router.push).toHaveBeenCalledWith({
       pathname: location.pathname,
       query: expect.objectContaining({
         query: '!title:"some title"',
@@ -243,7 +239,7 @@ describe('TableView > CellActions', function () {
       screen.getByRole('menuitemradio', {name: 'Exclude from filter'})
     );
 
-    expect(browserHistory.push).toHaveBeenCalledWith({
+    expect(initialData.router.push).toHaveBeenCalledWith({
       pathname: location.pathname,
       query: expect.objectContaining({
         query: 'tag:value !title:"some title"',
@@ -260,7 +256,7 @@ describe('TableView > CellActions', function () {
       screen.getByRole('menuitemradio', {name: 'Exclude from filter'})
     );
 
-    expect(browserHistory.push).toHaveBeenCalledWith({
+    expect(initialData.router.push).toHaveBeenCalledWith({
       pathname: location.pathname,
       query: expect.objectContaining({
         query: 'has:title',
@@ -279,7 +275,7 @@ describe('TableView > CellActions', function () {
       screen.getByRole('menuitemradio', {name: 'Exclude from filter'})
     );
 
-    expect(browserHistory.push).toHaveBeenCalledWith({
+    expect(initialData.router.push).toHaveBeenCalledWith({
       pathname: location.pathname,
       query: expect.objectContaining({
         query: 'tag:value has:title',
@@ -294,7 +290,7 @@ describe('TableView > CellActions', function () {
       screen.getByRole('menuitemradio', {name: 'Show values greater than'})
     );
 
-    expect(browserHistory.push).toHaveBeenCalledWith({
+    expect(initialData.router.push).toHaveBeenCalledWith({
       pathname: location.pathname,
       query: expect.objectContaining({
         query: 'count():>9',
@@ -309,7 +305,7 @@ describe('TableView > CellActions', function () {
       screen.getByRole('menuitemradio', {name: 'Show values less than'})
     );
 
-    expect(browserHistory.push).toHaveBeenCalledWith({
+    expect(initialData.router.push).toHaveBeenCalledWith({
       pathname: location.pathname,
       query: expect.objectContaining({
         query: 'count():<9',
@@ -322,7 +318,7 @@ describe('TableView > CellActions', function () {
 
     renderComponent(initialData, rows, eventView);
 
-    const firstRow = screen.getAllByRole('row')[1];
+    const firstRow = screen.getAllByRole('row')[1]!;
     const link = within(firstRow).getByTestId('tableView-transaction-link');
 
     expect(link).toHaveAttribute(
@@ -386,7 +382,7 @@ describe('TableView > CellActions', function () {
 
     renderComponent(initialData, rows, EventView.fromLocation(loc));
 
-    const firstRow = screen.getAllByRole('row')[1];
+    const firstRow = screen.getAllByRole('row')[1]!;
     const link = within(firstRow).getByTestId('view-event');
 
     expect(link).toHaveAttribute(
@@ -404,7 +400,7 @@ describe('TableView > CellActions', function () {
     await openContextMenu(5);
     await userEvent.click(screen.getByRole('menuitemradio', {name: 'Go to release'}));
 
-    expect(browserHistory.push).toHaveBeenCalledWith({
+    expect(initialData.router.push).toHaveBeenCalledWith({
       pathname: '/organizations/org-slug/releases/v1.0.2/',
       query: expect.objectContaining({
         environment: eventView.environment,
@@ -416,8 +412,8 @@ describe('TableView > CellActions', function () {
     rows.data[0]['count()'] = 1000;
     renderComponent(initialData, rows, eventView);
 
-    const firstRow = screen.getAllByRole('row')[1];
-    const emptyValueCell = within(firstRow).getAllByRole('cell')[3];
+    const firstRow = screen.getAllByRole('row')[1]!;
+    const emptyValueCell = within(firstRow).getAllByRole('cell')[3]!;
 
     expect(within(emptyValueCell).getByText('1k')).toHaveAttribute('title', '1,000');
   });
@@ -507,13 +503,14 @@ describe('TableView > CellActions', function () {
         measurementKeys={null}
         showTags={false}
         title=""
-      />
+      />,
+      {router: initialData.router}
     );
     await userEvent.hover(screen.getByText('444.3 KB'));
     const buttons = screen.getAllByRole('button');
-    await userEvent.click(buttons[buttons.length - 1]);
+    await userEvent.click(buttons[buttons.length - 1]!);
     await userEvent.click(screen.getByText('Show values less than'));
-    expect(browserHistory.push).toHaveBeenCalledWith({
+    expect(initialData.router.push).toHaveBeenCalledWith({
       pathname: location.pathname,
       query: expect.objectContaining({
         query: 'p99(measurements.custom.kilobyte):<444300',
diff --git a/static/app/views/discover/table/tableView.tsx b/static/app/views/discover/table/tableView.tsx
index fedbd5f945a513..3a2ba098e2abab 100644
--- a/static/app/views/discover/table/tableView.tsx
+++ b/static/app/views/discover/table/tableView.tsx
@@ -49,6 +49,7 @@ import {generateProfileFlamechartRoute} from 'sentry/utils/profiling/routes';
 import {decodeList} from 'sentry/utils/queryString';
 import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import normalizeUrl from 'sentry/utils/url/normalizeUrl';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useProjects from 'sentry/utils/useProjects';
 import {useRoutes} from 'sentry/utils/useRoutes';
 import {appendQueryDatasetParam, hasDatasetSelector} from 'sentry/views/dashboards/utils';
@@ -109,6 +110,7 @@ export type TableViewProps = {
 function TableView(props: TableViewProps) {
   const {projects} = useProjects();
   const routes = useRoutes();
+  const navigate = useNavigate();
   const replayLinkGenerator = generateReplayLink(routes);
 
   /**
@@ -124,6 +126,7 @@ function TableView(props: TableViewProps) {
     const nextEventView = eventView.withResizedColumn(columnIndex, newWidth);
 
     pushEventViewToLocation({
+      navigate,
       location,
       nextEventView,
       extraQuery: {
@@ -290,7 +293,7 @@ function TableView(props: TableViewProps) {
     const currentSort = eventView.sortForField(field, tableMeta);
     const canSort = isFieldSortable(field, tableMeta);
     let titleText = isEquationAlias(column.name)
-      ? eventView.getEquations()[getEquationAliasIndex(column.name)]
+      ? eventView.getEquations()[getEquationAliasIndex(column.name)]!
       : column.name;
 
     if (column.name.toLowerCase() === 'replayid') {
@@ -375,8 +378,8 @@ function TableView(props: TableViewProps) {
         target = generateLinkToEventInTraceView({
           traceSlug: dataRow.trace?.toString(),
           eventId: dataRow.id,
-          projectSlug: (dataRow.project || dataRow['project.name']).toString(),
-          timestamp: dataRow.timestamp,
+          projectSlug: (dataRow.project || dataRow['project.name']!).toString(),
+          timestamp: dataRow.timestamp!,
           organization,
           isHomepage,
           location,
diff --git a/static/app/views/discover/tags.spec.tsx b/static/app/views/discover/tags.spec.tsx
index a649a447cdde36..e0c2783efc3d1a 100644
--- a/static/app/views/discover/tags.spec.tsx
+++ b/static/app/views/discover/tags.spec.tsx
@@ -34,7 +34,7 @@ const commonQueryConditions = {
 };
 
 describe('Tags', function () {
-  function generateUrl(key, value) {
+  function generateUrl(key: string, value: string) {
     return `/endpoint/${key}/${value}`;
   }
 
diff --git a/static/app/views/discover/tags.tsx b/static/app/views/discover/tags.tsx
index 26fa9a2a6ee73a..6a68d26fa655d9 100644
--- a/static/app/views/discover/tags.tsx
+++ b/static/app/views/discover/tags.tsx
@@ -163,7 +163,7 @@ class Tags extends Component<Props, State> {
     // endpoint and the totals endpoint
     const maxTotalValues =
       segments.length > 0
-        ? Math.max(Number(totalValues), segments[0].count)
+        ? Math.max(Number(totalValues), segments[0]!.count)
         : totalValues;
     return (
       <li key={tag.key} aria-label={tag.key}>
diff --git a/static/app/views/discover/utils.spec.tsx b/static/app/views/discover/utils.spec.tsx
index 50d62fcad067bd..5c9f2f1e479aea 100644
--- a/static/app/views/discover/utils.spec.tsx
+++ b/static/app/views/discover/utils.spec.tsx
@@ -4,7 +4,6 @@ import {LocationFixture} from 'sentry-fixture/locationFixture';
 import {initializeOrg} from 'sentry-test/initializeOrg';
 
 import {COL_WIDTH_UNDEFINED} from 'sentry/components/gridEditable';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import type {EventViewOptions} from 'sentry/utils/discover/eventView';
 import EventView from 'sentry/utils/discover/eventView';
 import {DisplayType} from 'sentry/views/dashboards/types';
@@ -113,10 +112,10 @@ describe('decodeColumnOrder', function () {
     });
 
     results = decodeColumnOrder([{field: 'p75()', width: 123}]);
-    expect(results[0].type).toEqual('duration');
+    expect(results[0]!.type).toBe('duration');
 
     results = decodeColumnOrder([{field: 'p99()', width: 123}]);
-    expect(results[0].type).toEqual('duration');
+    expect(results[0]!.type).toBe('duration');
   });
 
   it('can decode elements with aggregate functions with arguments', function () {
@@ -252,14 +251,16 @@ describe('pushEventViewToLocation', function () {
   });
 
   it('correct query string object pushed to history', function () {
+    const navigate = jest.fn();
     const eventView = new EventView({...baseView, ...state});
 
     pushEventViewToLocation({
+      navigate,
       location,
       nextEventView: eventView,
     });
 
-    expect(browserHistory.push).toHaveBeenCalledWith(
+    expect(navigate).toHaveBeenCalledWith(
       expect.objectContaining({
         query: expect.objectContaining({
           id: '1234',
@@ -280,9 +281,11 @@ describe('pushEventViewToLocation', function () {
   });
 
   it('extra query params', function () {
+    const navigate = jest.fn();
     const eventView = new EventView({...baseView, ...state});
 
     pushEventViewToLocation({
+      navigate,
       location,
       nextEventView: eventView,
       extraQuery: {
@@ -290,7 +293,7 @@ describe('pushEventViewToLocation', function () {
       },
     });
 
-    expect(browserHistory.push).toHaveBeenCalledWith(
+    expect(navigate).toHaveBeenCalledWith(
       expect.objectContaining({
         query: expect.objectContaining({
           id: '1234',
@@ -354,7 +357,7 @@ describe('getExpandedResults()', function () {
       {field: 'title'},
       {field: 'custom_tag'},
     ]);
-    expect(result.query).toEqual('event.type:error title:ApiException');
+    expect(result.query).toBe('event.type:error title:ApiException');
 
     // de-duplicate transformed columns
     view = new EventView({
@@ -441,33 +444,33 @@ describe('getExpandedResults()', function () {
       fields: [...state.fields, {field: 'measurements.lcp'}, {field: 'measurements.fcp'}],
     });
     let result = getExpandedResults(view, {extra: 'condition'}, EventFixture());
-    expect(result.query).toEqual('event.type:error extra:condition title:ApiException');
+    expect(result.query).toBe('event.type:error extra:condition title:ApiException');
 
     // handles user tag values.
     result = getExpandedResults(view, {user: 'id:12735'}, EventFixture());
-    expect(result.query).toEqual('event.type:error user:id:12735 title:ApiException');
+    expect(result.query).toBe('event.type:error user:id:12735 title:ApiException');
     result = getExpandedResults(view, {user: 'name:uhoh'}, EventFixture());
-    expect(result.query).toEqual('event.type:error user:name:uhoh title:ApiException');
+    expect(result.query).toBe('event.type:error user:name:uhoh title:ApiException');
 
     // quotes value
     result = getExpandedResults(view, {extra: 'has space'}, EventFixture());
-    expect(result.query).toEqual('event.type:error extra:"has space" title:ApiException');
+    expect(result.query).toBe('event.type:error extra:"has space" title:ApiException');
 
     // appends to existing conditions
     result = getExpandedResults(view, {'event.type': 'csp'}, EventFixture());
-    expect(result.query).toEqual('event.type:csp title:ApiException');
+    expect(result.query).toBe('event.type:csp title:ApiException');
 
     // Includes empty strings
     result = getExpandedResults(view, {}, EventFixture({id: '0', custom_tag: ''}));
-    expect(result.query).toEqual('event.type:error title:ApiException custom_tag:""');
+    expect(result.query).toBe('event.type:error title:ApiException custom_tag:""');
 
     // Includes 0
     result = getExpandedResults(view, {}, EventFixture({id: '0', custom_tag: 0}));
-    expect(result.query).toEqual('event.type:error title:ApiException custom_tag:0');
+    expect(result.query).toBe('event.type:error title:ApiException custom_tag:0');
 
     // Includes null
     result = getExpandedResults(view, {}, EventFixture({id: '0', custom_tag: null}));
-    expect(result.query).toEqual('event.type:error title:ApiException custom_tag:""');
+    expect(result.query).toBe('event.type:error title:ApiException custom_tag:""');
 
     // Handles measurements while ignoring null values
     result = getExpandedResults(
@@ -478,13 +481,13 @@ describe('getExpandedResults()', function () {
       // @ts-expect-error
       {'measurements.lcp': 2, 'measurements.fcp': null}
     );
-    expect(result.query).toEqual('event.type:error measurements.lcp:2');
+    expect(result.query).toBe('event.type:error measurements.lcp:2');
   });
 
   it('removes any aggregates in either search conditions or extra conditions', () => {
     const view = new EventView({...state, query: 'event.type:error count(id):<10'});
     const result = getExpandedResults(view, {'count(id)': '>2'}, EventFixture());
-    expect(result.query).toEqual('event.type:error title:ApiException');
+    expect(result.query).toBe('event.type:error title:ApiException');
   });
 
   it('applies conditions from dataRow map structure based on fields', () => {
@@ -494,7 +497,7 @@ describe('getExpandedResults()', function () {
       {extra: 'condition'},
       EventFixture({title: 'Event title'})
     );
-    expect(result.query).toEqual('event.type:error extra:condition title:"Event title"');
+    expect(result.query).toBe('event.type:error extra:condition title:"Event title"');
   });
 
   it('applies tag key conditions from event data', () => {
@@ -507,16 +510,14 @@ describe('getExpandedResults()', function () {
       ],
     });
     const result = getExpandedResults(view, {}, event);
-    expect(result.query).toEqual(
-      'event.type:error title:ApiException custom_tag:tag_value'
-    );
+    expect(result.query).toBe('event.type:error title:ApiException custom_tag:tag_value');
   });
 
   it('generate eventview from an empty eventview', () => {
     const view = EventView.fromLocation(LocationFixture());
     const result = getExpandedResults(view, {some_tag: 'value'}, EventFixture());
     expect(result.fields).toEqual([]);
-    expect(result.query).toEqual('some_tag:value');
+    expect(result.query).toBe('some_tag:value');
   });
 
   it('removes equations on aggregates', () => {
@@ -568,7 +569,7 @@ describe('getExpandedResults()', function () {
       'error.type': ['DeadSystem Exception', 'RuntimeException', 'RuntimeException'],
     });
     const result = getExpandedResults(view, {}, event);
-    expect(result.query).toEqual(
+    expect(result.query).toBe(
       'event.type:error title:ApiException custom_tag:tag_value error.type:"DeadSystem Exception" error.type:RuntimeException error.type:RuntimeException'
     );
   });
@@ -584,7 +585,7 @@ describe('getExpandedResults()', function () {
   it('applies environment condition to environment property', () => {
     const view = new EventView(state);
     const result = getExpandedResults(view, {environment: 'dev'});
-    expect(result.query).toEqual('event.type:error');
+    expect(result.query).toBe('event.type:error');
     expect(result.environment).toEqual(['staging', 'dev']);
   });
 
@@ -603,7 +604,7 @@ describe('getExpandedResults()', function () {
       ],
     });
     const result = getExpandedResults(view, {}, event);
-    expect(result.query).toEqual(
+    expect(result.query).toBe(
       'event.type:error tags[project]:12345 tags[environment]:earth title:"something bad"'
     );
     expect(result.project).toEqual([42]);
@@ -626,14 +627,14 @@ describe('getExpandedResults()', function () {
       tags: [{key: 'user', value: 'id:1234'}],
     });
     let result = getExpandedResults(view, {}, event);
-    expect(result.query).toEqual('event.type:error user:id:1234 title:"something bad"');
+    expect(result.query).toBe('event.type:error user:id:1234 title:"something bad"');
 
     event = EventFixture({
       title: 'something bad',
       tags: [{key: 'user', value: '1234'}],
     });
     result = getExpandedResults(view, {}, event);
-    expect(result.query).toEqual('event.type:error user:1234 title:"something bad"');
+    expect(result.query).toBe('event.type:error user:1234 title:"something bad"');
   });
 
   it('applies the user field in a table row', function () {
@@ -646,7 +647,7 @@ describe('getExpandedResults()', function () {
       user: 'id:1234',
     });
     const result = getExpandedResults(view, {}, event);
-    expect(result.query).toEqual('event.type:error user:id:1234 title:"something bad"');
+    expect(result.query).toBe('event.type:error user:id:1234 title:"something bad"');
   });
 
   it('normalizes the timestamp field', () => {
@@ -660,7 +661,7 @@ describe('getExpandedResults()', function () {
       timestamp: '2020-02-13T17:05:46+00:00',
     });
     const result = getExpandedResults(view, {}, event);
-    expect(result.query).toEqual('event.type:error timestamp:2020-02-13T17:05:46');
+    expect(result.query).toBe('event.type:error timestamp:2020-02-13T17:05:46');
   });
 
   it('does not duplicate conditions', () => {
@@ -673,7 +674,7 @@ describe('getExpandedResults()', function () {
       title: 'bogus',
     });
     const result = getExpandedResults(view, {trace: 'abc123'}, event);
-    expect(result.query).toEqual('event.type:error trace:abc123 title:bogus');
+    expect(result.query).toBe('event.type:error trace:abc123 title:bogus');
   });
 
   it('applies project as condition if present', () => {
@@ -685,7 +686,7 @@ describe('getExpandedResults()', function () {
     });
     const event = EventFixture({project: 'whoosh'});
     const result = getExpandedResults(view, {}, event);
-    expect(result.query).toEqual('project:whoosh');
+    expect(result.query).toBe('project:whoosh');
   });
 
   it('applies project name as condition if present', () => {
@@ -697,7 +698,7 @@ describe('getExpandedResults()', function () {
     });
     const event = EventFixture({'project.name': 'whoosh'});
     const result = getExpandedResults(view, {}, event);
-    expect(result.query).toEqual('project.name:whoosh');
+    expect(result.query).toBe('project.name:whoosh');
   });
 
   it('should not trim values that need to be quoted', () => {
@@ -710,7 +711,7 @@ describe('getExpandedResults()', function () {
     // needs to be quoted because of whitespace in middle
     const event = EventFixture({title: 'hello there '});
     const result = getExpandedResults(view, {}, event);
-    expect(result.query).toEqual('title:"hello there "');
+    expect(result.query).toBe('title:"hello there "');
   });
 
   it('should add environment from the data row', () => {
@@ -821,7 +822,7 @@ describe('eventViewToWidgetQuery', function () {
       displayType: DisplayType.TOP_N,
       yAxis: ['count()'],
     });
-    expect(widgetQuery.orderby).toEqual('-count()');
+    expect(widgetQuery.orderby).toBe('-count()');
   });
 
   it('updates orderby to function format for complex function', function () {
@@ -835,7 +836,7 @@ describe('eventViewToWidgetQuery', function () {
       eventView: view,
       displayType: DisplayType.TABLE,
     });
-    expect(widgetQuery.orderby).toEqual('-count_unique(device.locale)');
+    expect(widgetQuery.orderby).toBe('-count_unique(device.locale)');
   });
 
   it('updates orderby to field', function () {
@@ -848,7 +849,7 @@ describe('eventViewToWidgetQuery', function () {
       eventView: view,
       displayType: DisplayType.TABLE,
     });
-    expect(widgetQuery.orderby).toEqual('-project.id');
+    expect(widgetQuery.orderby).toBe('-project.id');
   });
 });
 
diff --git a/static/app/views/discover/utils.tsx b/static/app/views/discover/utils.tsx
index 5d47f82828d50e..36894458e4f37e 100644
--- a/static/app/views/discover/utils.tsx
+++ b/static/app/views/discover/utils.tsx
@@ -15,7 +15,6 @@ import type {
   OrganizationSummary,
 } from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {getUtcDateString} from 'sentry/utils/dates';
 import type {TableDataRow} from 'sentry/utils/discover/discoverQuery';
 import type {EventData} from 'sentry/utils/discover/eventView';
@@ -48,6 +47,7 @@ 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 type {ReactRouter3Navigate} from 'sentry/utils/useNavigate';
 
 import {
   DashboardWidgetSource,
@@ -124,14 +124,15 @@ export function decodeColumnOrder(fields: Readonly<Field[]>): TableColumn<string
 
 export function pushEventViewToLocation(props: {
   location: Location;
+  navigate: ReactRouter3Navigate;
   nextEventView: EventView;
   extraQuery?: Query;
 }) {
-  const {location, nextEventView} = props;
+  const {navigate, location, nextEventView} = props;
   const extraQuery = props.extraQuery || {};
   const queryStringObject = nextEventView.generateQueryStringObject();
 
-  browserHistory.push({
+  navigate({
     ...location,
     query: {
       ...extraQuery,
@@ -391,7 +392,7 @@ function generateAdditionalConditions(
           ? `tags[${column.field}]`
           : column.field;
 
-        const tagValue = dataRow.tags[tagIndex].value;
+        const tagValue = dataRow.tags[tagIndex]!.value;
         conditions[key] = tagValue;
       }
     }
@@ -408,7 +409,7 @@ export function usesTransactionsDataset(eventView: EventView, yAxisValue: string
   let usesTransactions: boolean = false;
   const parsedQuery = new MutableSearch(eventView.query);
   for (let index = 0; index < yAxisValue.length; index++) {
-    const yAxis = yAxisValue[index];
+    const yAxis = yAxisValue[index]!;
     const aggregateArg = getAggregateArg(yAxis) ?? '';
     if (isMeasurement(aggregateArg) || aggregateArg === 'transaction.duration') {
       usesTransactions = true;
@@ -451,7 +452,7 @@ function generateExpandedConditions(
 
   // Add additional conditions provided and generated.
   for (const key in conditions) {
-    const value = conditions[key];
+    const value = conditions[key]!;
 
     if (Array.isArray(value)) {
       parsedQuery.setFilterValues(key, value);
@@ -518,9 +519,9 @@ export function generateFieldOptions({
   // function names. Having a mapping makes finding the value objects easier
   // later as well.
   functions.forEach(func => {
-    const ellipsis = aggregations[func].parameters.length ? '\u2026' : '';
-    const parameters = aggregations[func].parameters.map(param => {
-      const overrides = aggregations[func].getFieldOverrides;
+    const ellipsis = aggregations[func]!.parameters.length ? '\u2026' : '';
+    const parameters = aggregations[func]!.parameters.map(param => {
+      const overrides = aggregations[func]!.getFieldOverrides;
       if (typeof overrides === 'undefined') {
         return param;
       }
@@ -591,13 +592,17 @@ export function generateFieldOptions({
   if (Array.isArray(spanOperationBreakdownKeys)) {
     spanOperationBreakdownKeys.sort();
     spanOperationBreakdownKeys.forEach(breakdownField => {
-      fieldOptions[`span_op_breakdown:${breakdownField}`] = {
-        label: breakdownField,
-        value: {
-          kind: FieldValueKind.BREAKDOWN,
-          meta: {name: breakdownField, dataType: 'duration'},
-        },
-      };
+      if (!fieldKeys.includes(breakdownField)) {
+        // These span op breakdowns are sometimes included in the fieldKeys
+        // so check before we add them, or else we surface duplicates
+        fieldOptions[`span_op_breakdown:${breakdownField}`] = {
+          label: breakdownField,
+          value: {
+            kind: FieldValueKind.BREAKDOWN,
+            meta: {name: breakdownField, dataType: 'duration'},
+          },
+        };
+      }
     });
   }
 
@@ -652,8 +657,8 @@ export function eventViewToWidgetQuery({
     let orderbyFunction = '';
     const aggregateFields = [...queryYAxis, ...aggregates];
     for (let i = 0; i < aggregateFields.length; i++) {
-      if (sort.field === getAggregateAlias(aggregateFields[i])) {
-        orderbyFunction = aggregateFields[i];
+      if (sort.field === getAggregateAlias(aggregateFields[i]!)) {
+        orderbyFunction = aggregateFields[i]!;
         break;
       }
     }
@@ -712,20 +717,23 @@ export function handleAddQueryToDashboard({
     location,
     widgetType,
   });
+
   openAddToDashboardModal({
     organization,
     selection: {
-      projects: eventView.project,
-      environments: eventView.environment,
+      projects: eventView.project.slice(),
+      environments: eventView.environment.slice(),
       datetime: {
-        start: eventView.start,
-        end: eventView.end,
-        period: eventView.statsPeriod,
+        start: eventView.start!,
+        end: eventView.end!,
+        period: eventView.statsPeriod!,
+        // Previously undetected because the type used to rely on an implicit any value.
+        // @ts-expect-error
         utc: eventView.utc,
       },
     },
     widget: {
-      title: query?.name ?? eventView.name,
+      title: (query?.name ?? eventView.name)!,
       displayType: displayType === DisplayType.TOP_N ? DisplayType.AREA : displayType,
       queries: [
         {
@@ -733,7 +741,7 @@ export function handleAddQueryToDashboard({
           aggregates: [...(typeof yAxis === 'string' ? [yAxis] : yAxis ?? ['count()'])],
         },
       ],
-      interval: eventView.interval,
+      interval: eventView.interval!,
       limit:
         displayType === DisplayType.TOP_N
           ? Number(eventView.topEvents) || TOP_N
@@ -741,6 +749,8 @@ export function handleAddQueryToDashboard({
       widgetType,
     },
     router,
+    // Previously undetected because the type relied on implicit any.
+    // @ts-expect-error
     widgetAsQueryParams,
     location,
   });
diff --git a/static/app/views/explore/charts/index.tsx b/static/app/views/explore/charts/index.tsx
index cd7ff629874112..f59f20ff3d13a9 100644
--- a/static/app/views/explore/charts/index.tsx
+++ b/static/app/views/explore/charts/index.tsx
@@ -20,15 +20,22 @@ import {
   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 usePageFilters from 'sentry/utils/usePageFilters';
 import usePrevious from 'sentry/utils/usePrevious';
 import {formatVersion} from 'sentry/utils/versions/formatVersion';
 import ChartContextMenu from 'sentry/views/explore/components/chartContextMenu';
+import {
+  useExploreDataset,
+  useExploreGroupBys,
+  useExploreMode,
+  useExploreSortBys,
+  useExploreVisualizes,
+  useSetExploreVisualizes,
+} from 'sentry/views/explore/contexts/pageParamsContext';
+import {Mode} from 'sentry/views/explore/contexts/pageParamsContext/mode';
+import {formatSort} from 'sentry/views/explore/contexts/pageParamsContext/sortBys';
 import {useChartInterval} from 'sentry/views/explore/hooks/useChartInterval';
-import {useDataset} from 'sentry/views/explore/hooks/useDataset';
-import {useVisualizes} from 'sentry/views/explore/hooks/useVisualizes';
 import Chart, {
   ChartType,
   useSynchronizeCharts,
@@ -38,11 +45,7 @@ import {useSortedTimeSeries} from 'sentry/views/insights/common/queries/useSorte
 import {useSpansQuery} from 'sentry/views/insights/common/queries/useSpansQuery';
 import {CHART_HEIGHT} from 'sentry/views/insights/database/settings';
 
-import {useGroupBys} from '../hooks/useGroupBys';
-import {useResultMode} from '../hooks/useResultsMode';
-import {useSorts} from '../hooks/useSorts';
 import {TOP_EVENTS_LIMIT, useTopEvents} from '../hooks/useTopEvents';
-import {formatSort} from '../tables/aggregatesTable';
 
 interface ExploreChartsProps {
   query: string;
@@ -68,11 +71,12 @@ const exploreChartTypeOptions = [
 export const EXPLORE_CHART_GROUP = 'explore-charts_group';
 
 export function ExploreCharts({query, setConfidence, setError}: ExploreChartsProps) {
-  const [dataset] = useDataset({allowRPC: true});
-  const [visualizes, setVisualizes] = useVisualizes();
+  const dataset = useExploreDataset();
+  const visualizes = useExploreVisualizes();
+  const setVisualizes = useSetExploreVisualizes();
   const [interval, setInterval, intervalOptions] = useChartInterval();
-  const {groupBys} = useGroupBys();
-  const [resultMode] = useResultMode();
+  const groupBys = useExploreGroupBys();
+  const mode = useExploreMode();
   const topEvents = useTopEvents();
 
   const extrapolationMetaResults = useExtrapolationMeta({
@@ -81,23 +85,24 @@ export function ExploreCharts({query, setConfidence, setError}: ExploreChartsPro
   });
 
   const fields: string[] = useMemo(() => {
-    if (resultMode === 'samples') {
+    if (mode === Mode.SAMPLES) {
       return [];
     }
 
     return [...groupBys, ...visualizes.flatMap(visualize => visualize.yAxes)].filter(
       Boolean
     );
-  }, [resultMode, groupBys, visualizes]);
-  const [sorts] = useSorts({fields});
+  }, [mode, groupBys, visualizes]);
+
+  const sortBys = useExploreSortBys();
 
   const orderby: string | string[] | undefined = useMemo(() => {
-    if (!sorts.length) {
+    if (!sortBys.length) {
       return undefined;
     }
 
-    return sorts.map(formatSort);
-  }, [sorts]);
+    return sortBys.map(formatSort);
+  }, [sortBys]);
 
   const yAxes = useMemo(() => {
     const deduped = dedupeArray(visualizes.flatMap(visualize => visualize.yAxes));
@@ -241,7 +246,7 @@ export function ExploreCharts({query, setConfidence, setError}: ExploreChartsPro
   const handleChartTypeChange = useCallback(
     (chartType: ChartType, index: number) => {
       const newVisualizes = visualizes.slice();
-      newVisualizes[index] = {...newVisualizes[index], chartType};
+      newVisualizes[index] = {...newVisualizes[index]!, chartType};
       setVisualizes(newVisualizes);
     },
     [visualizes, setVisualizes]
@@ -329,10 +334,14 @@ export function ExploreCharts({query, setConfidence, setError}: ExploreChartsPro
                 grid={{
                   left: '0',
                   right: '0',
-                  top: '8px',
+                  top: '32px', // make room to fit the legend above the chart
                   bottom: '0',
                 }}
                 legendFormatter={value => formatVersion(value)}
+                legendOptions={{
+                  itemGap: 24,
+                  top: '4px',
+                }}
                 data={data}
                 error={error}
                 loading={loading}
@@ -347,24 +356,41 @@ export function ExploreCharts({query, setConfidence, setError}: ExploreChartsPro
               />
               {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]',
-                        {
+                  {!defined(extrapolationMetaResults.data?.[0]?.['count_sample()'])
+                    ? t('* Extrapolated from \u2026')
+                    : resultConfidence === 'low'
+                      ? tct(
+                          '* Extrapolated from [sampleCount] samples ([insufficientSamples])',
+                          {
+                            sampleCount: (
+                              <Count
+                                value={
+                                  extrapolationMetaResults.data?.[0]?.['count_sample()']
+                                }
+                              />
+                            ),
+                            insufficientSamples: (
+                              <Tooltip
+                                title={t(
+                                  'Shortening the date range, increasing the time interval or removing extra filters may improve accuracy.'
+                                )}
+                              >
+                                <InsufficientSamples>
+                                  {t('insufficient for accuracy')}
+                                </InsufficientSamples>
+                              </Tooltip>
+                            ),
+                          }
+                        )
+                      : tct('* Extrapolated from [sampleCount] samples', {
                           sampleCount: (
                             <Count
-                              value={extrapolationMetaResults.data[0]['count_sample()']}
+                              value={
+                                extrapolationMetaResults.data?.[0]?.['count_sample()']
+                              }
                             />
                           ),
-                          sampleRate: formatPercentage(
-                            extrapolationMetaResults.data[0]['avg_sample(sampling_rate)']
-                          ),
-                        }
-                      )
-                    : t('foo')}
+                        })}
                 </ChartFooter>
               )}
             </ChartPanel>
@@ -395,7 +421,7 @@ function useExtrapolationMeta({
     const discoverQuery: NewQuery = {
       id: undefined,
       name: 'Explore - Extrapolation Meta',
-      fields: ['count_sample()', 'avg_sample(sampling_rate)', 'min(sampling_rate)'],
+      fields: ['count_sample()', 'min(sampling_rate)'],
       query: search.formatString(),
       version: 2,
       dataset,
@@ -449,3 +475,7 @@ const ChartFooter = styled('div')`
   margin-top: ${space(1.5)};
   margin-bottom: 0;
 `;
+
+const InsufficientSamples = styled('span')`
+  text-decoration: underline dotted ${p => p.theme.gray300};
+`;
diff --git a/static/app/views/explore/components/table.tsx b/static/app/views/explore/components/table.tsx
index 8d56f3a32a4f2a..de4be6de80f207 100644
--- a/static/app/views/explore/components/table.tsx
+++ b/static/app/views/explore/components/table.tsx
@@ -1,4 +1,4 @@
-import {useMemo} from 'react';
+import React, {useCallback, useEffect, useMemo, useRef} from 'react';
 import styled from '@emotion/styled';
 
 import {COL_WIDTH_MINIMUM} from 'sentry/components/gridEditable';
@@ -16,17 +16,20 @@ import {
   HeaderButtonContainer,
   HeaderTitle,
 } from 'sentry/components/gridEditable/styles';
+import {space} from 'sentry/styles/space';
 import {Actions} from 'sentry/views/discover/table/cellAction';
 
 interface TableProps extends React.ComponentProps<typeof _TableWrapper> {}
 
-export function Table({children, style, ...props}: TableProps) {
-  return (
+export const Table = React.forwardRef<HTMLTableElement, TableProps>(
+  ({children, styles, ...props}, ref) => (
     <_TableWrapper {...props}>
-      <_Table style={style}>{children}</_Table>
+      <_Table ref={ref} style={styles}>
+        {children}
+      </_Table>
     </_TableWrapper>
-  );
-}
+  )
+);
 
 interface TableStatusProps {
   children: React.ReactNode;
@@ -49,38 +52,83 @@ export const ALLOWED_CELL_ACTIONS: Actions[] = [
 
 const MINIMUM_COLUMN_WIDTH = COL_WIDTH_MINIMUM;
 
-type Item = {
-  label: React.ReactNode;
-  value: string;
-  width?: number | 'min-content';
-};
+export function useTableStyles(
+  fields: string[],
+  tableRef: React.RefObject<HTMLDivElement>,
+  minimumColumnWidth = MINIMUM_COLUMN_WIDTH
+) {
+  const resizingColumnIndex = useRef<number | null>(null);
+  const columnWidthsRef = useRef<(number | null)[]>(fields.map(() => null));
 
-interface UseTableStylesOptions {
-  items: Item[];
-  minimumColumnWidth?: number;
-}
+  useEffect(() => {
+    columnWidthsRef.current = fields.map(
+      (_, index) => columnWidthsRef.current[index] ?? null
+    );
+  }, [fields]);
+
+  const initialTableStyles = useMemo(
+    () => ({
+      gridTemplateColumns: fields
+        .map(() => `minmax(${minimumColumnWidth}px, auto)`)
+        .join(' '),
+    }),
+    [fields, minimumColumnWidth]
+  );
+
+  const onResizeMouseDown = useCallback(
+    (event: React.MouseEvent<HTMLDivElement>, index: number) => {
+      event.preventDefault();
+
+      // <GridResizer> is expected to be nested 1 level down from <GridHeadCell>
+      const cell = event.currentTarget!.parentElement;
+      if (!cell) {
+        return;
+      }
+
+      resizingColumnIndex.current = index;
 
-export function useTableStyles({
-  items,
-  minimumColumnWidth = MINIMUM_COLUMN_WIDTH,
-}: UseTableStylesOptions) {
-  const tableStyles = useMemo(() => {
-    const columns = new Array(items.length);
-
-    for (let i = 0; i < items.length; i++) {
-      if (typeof items[i].width === 'number') {
-        columns[i] = `${items[i].width}px`;
-      } else {
-        columns[i] = items[i].width ?? `minmax(${minimumColumnWidth}px, auto)`;
+      const startX = event.clientX;
+      const initialWidth = cell.offsetWidth;
+
+      const gridElement = tableRef.current;
+
+      function onMouseMove(e: MouseEvent) {
+        if (resizingColumnIndex.current === null || !gridElement) {
+          return;
+        }
+
+        const newWidth = Math.max(
+          MINIMUM_COLUMN_WIDTH,
+          initialWidth + (e.clientX - startX)
+        );
+
+        columnWidthsRef.current[index] = newWidth;
+
+        // Updating the grid's `gridTemplateColumns` directly
+        gridElement.style.gridTemplateColumns = columnWidthsRef.current
+          .map(width => {
+            return typeof width === 'number'
+              ? `${width}px`
+              : `minmax(${minimumColumnWidth}px, auto)`;
+          })
+          .join(' ');
       }
-    }
 
-    return {
-      gridTemplateColumns: columns.join(' '),
-    };
-  }, [items, minimumColumnWidth]);
+      function onMouseUp() {
+        resizingColumnIndex.current = null;
 
-  return {tableStyles};
+        // Cleaning up event listeners
+        window.removeEventListener('mousemove', onMouseMove);
+        window.removeEventListener('mouseup', onMouseUp);
+      }
+
+      window.addEventListener('mousemove', onMouseMove);
+      window.addEventListener('mouseup', onMouseUp);
+    },
+    [tableRef, minimumColumnWidth]
+  );
+
+  return {initialTableStyles, onResizeMouseDown};
 }
 
 export const TableBody = GridBody;
@@ -94,3 +142,9 @@ export const TableHeaderTitle = HeaderTitle;
 export const TableHeadCell = styled(GridHeadCell)<{align?: Alignments}>`
   ${p => p.align && `justify-content: ${p.align};`}
 `;
+export const TableHeadCellContent = styled('div')`
+  display: flex;
+  align-items: center;
+  gap: ${space(0.5)};
+  cursor: pointer;
+`;
diff --git a/static/app/views/explore/content.tsx b/static/app/views/explore/content.tsx
index 45048858806a4d..5aa80505da6909 100644
--- a/static/app/views/explore/content.tsx
+++ b/static/app/views/explore/content.tsx
@@ -1,5 +1,6 @@
 import {useCallback, useState} from 'react';
 import styled from '@emotion/styled';
+import * as Sentry from '@sentry/react';
 import type {Location} from 'history';
 
 import Feature from 'sentry/components/acl/feature';
@@ -32,17 +33,21 @@ import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import usePageFilters from 'sentry/utils/usePageFilters';
 import {ExploreCharts} from 'sentry/views/explore/charts';
+import {
+  PageParamsProvider,
+  useExploreDataset,
+  useExploreMode,
+  useExploreQuery,
+  useSetExploreQuery,
+} from 'sentry/views/explore/contexts/pageParamsContext';
+import {Mode} from 'sentry/views/explore/contexts/pageParamsContext/mode';
 import {
   SpanTagsProvider,
   useSpanTags,
 } from 'sentry/views/explore/contexts/spanTagsContext';
-import {useDataset} from 'sentry/views/explore/hooks/useDataset';
-import {useUserQuery} from 'sentry/views/explore/hooks/useUserQuery';
 import {ExploreTables} from 'sentry/views/explore/tables';
 import {ExploreToolbar} from 'sentry/views/explore/toolbar';
 
-import {useResultMode} from './hooks/useResultsMode';
-
 interface ExploreContentProps {
   location: Location;
 }
@@ -52,13 +57,14 @@ function ExploreContentImpl({}: ExploreContentProps) {
   const navigate = useNavigate();
   const organization = useOrganization();
   const {selection} = usePageFilters();
-  const [dataset] = useDataset();
-  const [resultsMode] = useResultMode();
+  const dataset = useExploreDataset();
+  const mode = useExploreMode();
 
   const numberTags = useSpanTags('number');
   const stringTags = useSpanTags('string');
 
-  const [userQuery, setUserQuery] = useUserQuery();
+  const query = useExploreQuery();
+  const setQuery = useSetExploreQuery();
 
   const toolbarExtras = organization.features.includes('visibility-explore-dataset')
     ? ['dataset toggle' as const]
@@ -109,13 +115,6 @@ function ExploreContentImpl({}: ExploreContentProps) {
             </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 />
@@ -134,18 +133,18 @@ function ExploreContentImpl({}: ExploreContentProps) {
               {dataset === DiscoverDatasets.SPANS_INDEXED ? (
                 <SpanSearchQueryBuilder
                   projects={selection.projects}
-                  initialQuery={userQuery}
-                  onSearch={setUserQuery}
+                  initialQuery={query}
+                  onSearch={setQuery}
                   searchSource="explore"
                 />
               ) : (
                 <EAPSpanSearchQueryBuilder
                   projects={selection.projects}
-                  initialQuery={userQuery}
-                  onSearch={setUserQuery}
+                  initialQuery={query}
+                  onSearch={setQuery}
                   searchSource="explore"
                   getFilterTokenWarning={
-                    resultsMode === 'samples'
+                    mode === Mode.SAMPLES
                       ? key => {
                           if (
                             ALLOWED_EXPLORE_VISUALIZE_AGGREGATES.includes(
@@ -174,7 +173,7 @@ function ExploreContentImpl({}: ExploreContentProps) {
                 </Alert>
               )}
               <ExploreCharts
-                query={userQuery}
+                query={query}
                 setConfidence={setConfidence}
                 setError={setChartError}
               />
@@ -187,16 +186,28 @@ function ExploreContentImpl({}: ExploreContentProps) {
   );
 }
 
-export function ExploreContent(props: ExploreContentProps) {
-  const [dataset] = useDataset();
+function ExploreTagsProvider({children}) {
+  const dataset = useExploreDataset();
 
   return (
     <SpanTagsProvider dataset={dataset} enabled>
-      <ExploreContentImpl {...props} />
+      {children}
     </SpanTagsProvider>
   );
 }
 
+export function ExploreContent(props: ExploreContentProps) {
+  Sentry.setTag('explore.visited', 'yes');
+
+  return (
+    <PageParamsProvider>
+      <ExploreTagsProvider>
+        <ExploreContentImpl {...props} />
+      </ExploreTagsProvider>
+    </PageParamsProvider>
+  );
+}
+
 const Body = styled(Layout.Body)`
   gap: ${space(2)};
 
@@ -210,11 +221,6 @@ const Body = styled(Layout.Body)`
   }
 `;
 
-const ConfidenceAlert = styled(Alert)`
-  grid-column: 1/3;
-  margin: 0;
-`;
-
 const TopSection = styled('div')`
   display: grid;
   gap: ${space(2)};
diff --git a/static/app/views/explore/contexts/pageParamsContext/dataset.tsx b/static/app/views/explore/contexts/pageParamsContext/dataset.tsx
new file mode 100644
index 00000000000000..8688bd42f3f00e
--- /dev/null
+++ b/static/app/views/explore/contexts/pageParamsContext/dataset.tsx
@@ -0,0 +1,41 @@
+import type {Location} from 'history';
+
+import {defined} from 'sentry/utils';
+import {DiscoverDatasets} from 'sentry/utils/discover/types';
+import {decodeScalar} from 'sentry/utils/queryString';
+
+export function defaultDataset(): DiscoverDatasets | undefined {
+  return undefined;
+}
+
+export function getDatasetFromLocation(location: Location): DiscoverDatasets | undefined {
+  const rawDataset = decodeScalar(location.query.dataset);
+  return parseDataset(rawDataset);
+}
+
+export function parseDataset(rawDataset: string | undefined) {
+  if (rawDataset === 'spansIndexed') {
+    return DiscoverDatasets.SPANS_INDEXED;
+  }
+
+  if (rawDataset === 'spansRpc') {
+    return DiscoverDatasets.SPANS_EAP_RPC;
+  }
+
+  if (rawDataset === 'spans') {
+    return DiscoverDatasets.SPANS_EAP;
+  }
+
+  return undefined;
+}
+
+export function updateLocationWithDataset(
+  location: Location,
+  dataset: DiscoverDatasets | null | undefined
+) {
+  if (defined(dataset)) {
+    location.query.dataset = dataset;
+  } else if (dataset === null) {
+    delete location.query.dataset;
+  }
+}
diff --git a/static/app/views/explore/contexts/pageParamsContext/fields.tsx b/static/app/views/explore/contexts/pageParamsContext/fields.tsx
new file mode 100644
index 00000000000000..9bb1f79a7be82c
--- /dev/null
+++ b/static/app/views/explore/contexts/pageParamsContext/fields.tsx
@@ -0,0 +1,29 @@
+import type {Location} from 'history';
+
+import {defined} from 'sentry/utils';
+import {decodeList} from 'sentry/utils/queryString';
+
+export function defaultFields(): string[] {
+  return ['id', 'project', 'span.op', 'span.description', 'span.duration', 'timestamp'];
+}
+
+export function getFieldsFromLocation(location: Location): string[] {
+  const fields = decodeList(location.query.field);
+
+  if (fields.length) {
+    return fields;
+  }
+
+  return defaultFields();
+}
+
+export function updateLocationWithFields(
+  location: Location,
+  fields: string[] | undefined | null
+) {
+  if (defined(fields)) {
+    location.query.field = fields;
+  } else if (fields === null) {
+    delete location.query.field;
+  }
+}
diff --git a/static/app/views/explore/contexts/pageParamsContext/groupBys.tsx b/static/app/views/explore/contexts/pageParamsContext/groupBys.tsx
new file mode 100644
index 00000000000000..0cf6e7b36c380b
--- /dev/null
+++ b/static/app/views/explore/contexts/pageParamsContext/groupBys.tsx
@@ -0,0 +1,31 @@
+import type {Location} from 'history';
+
+import {defined} from 'sentry/utils';
+import {decodeList} from 'sentry/utils/queryString';
+
+export const UNGROUPED = '';
+
+export function defaultGroupBys(): string[] {
+  return [UNGROUPED];
+}
+
+export function getGroupBysFromLocation(location: Location): string[] {
+  const rawGroupBys = decodeList(location.query.groupBy);
+
+  if (rawGroupBys.length) {
+    return rawGroupBys;
+  }
+
+  return defaultGroupBys();
+}
+
+export function updateLocationWithGroupBys(
+  location: Location,
+  groupBys: string[] | null | undefined
+) {
+  if (defined(groupBys)) {
+    location.query.groupBy = groupBys;
+  } else if (groupBys === null) {
+    delete location.query.groupBy;
+  }
+}
diff --git a/static/app/views/explore/contexts/pageParamsContext/index.spec.tsx b/static/app/views/explore/contexts/pageParamsContext/index.spec.tsx
new file mode 100644
index 00000000000000..b2fd76c007768d
--- /dev/null
+++ b/static/app/views/explore/contexts/pageParamsContext/index.spec.tsx
@@ -0,0 +1,449 @@
+import {act, render} from 'sentry-test/reactTestingLibrary';
+
+import {DiscoverDatasets} from 'sentry/utils/discover/types';
+import {
+  PageParamsProvider,
+  useExplorePageParams,
+  useSetExploreDataset,
+  useSetExploreFields,
+  useSetExploreGroupBys,
+  useSetExploreMode,
+  useSetExplorePageParams,
+  useSetExploreQuery,
+  useSetExploreSortBys,
+  useSetExploreVisualizes,
+} from 'sentry/views/explore/contexts/pageParamsContext';
+import {Mode} from 'sentry/views/explore/contexts/pageParamsContext/mode';
+import {ChartType} from 'sentry/views/insights/common/components/chart';
+
+describe('PageParamsProvider', function () {
+  let pageParams: ReturnType<typeof useExplorePageParams>;
+  let setPageParams: ReturnType<typeof useSetExplorePageParams>;
+  let setDataset: ReturnType<typeof useSetExploreDataset>;
+  let setFields: ReturnType<typeof useSetExploreFields>;
+  let setGroupBys: ReturnType<typeof useSetExploreGroupBys>;
+  let setMode: ReturnType<typeof useSetExploreMode>;
+  let setQuery: ReturnType<typeof useSetExploreQuery>;
+  let setSortBys: ReturnType<typeof useSetExploreSortBys>;
+  let setVisualizes: ReturnType<typeof useSetExploreVisualizes>;
+
+  function Component() {
+    pageParams = useExplorePageParams();
+    setPageParams = useSetExplorePageParams();
+    setDataset = useSetExploreDataset();
+    setFields = useSetExploreFields();
+    setGroupBys = useSetExploreGroupBys();
+    setMode = useSetExploreMode();
+    setQuery = useSetExploreQuery();
+    setSortBys = useSetExploreSortBys();
+    setVisualizes = useSetExploreVisualizes();
+    return <br />;
+  }
+
+  function renderTestComponent(defaultPageParams?: any) {
+    render(
+      <PageParamsProvider>
+        <Component />
+      </PageParamsProvider>,
+      {disableRouterMocks: true}
+    );
+
+    act(() =>
+      setPageParams({
+        dataset: DiscoverDatasets.SPANS_EAP_RPC,
+        fields: ['id', 'timestamp'],
+        groupBys: ['span.op'],
+        mode: Mode.AGGREGATE,
+        query: '',
+        sortBys: [{field: 'count(span.self_time)', kind: 'asc'}],
+        visualizes: [
+          {
+            chartType: ChartType.AREA,
+            label: 'A',
+            yAxes: ['count(span.self_time)'],
+          },
+        ],
+        ...defaultPageParams,
+      })
+    );
+  }
+
+  it('has expected default', function () {
+    render(
+      <PageParamsProvider>
+        <Component />
+      </PageParamsProvider>,
+      {disableRouterMocks: true}
+    );
+
+    expect(pageParams).toEqual({
+      dataset: undefined,
+      fields: [
+        'id',
+        'project',
+        'span.op',
+        'span.description',
+        'span.duration',
+        'timestamp',
+      ],
+      groupBys: [''],
+      mode: Mode.SAMPLES,
+      query: '',
+      sortBys: [{field: 'timestamp', kind: 'desc'}],
+      visualizes: [
+        {
+          chartType: ChartType.LINE,
+          label: 'A',
+          yAxes: ['avg(span.duration)'],
+        },
+      ],
+    });
+  });
+
+  it('correctly updates dataset', function () {
+    renderTestComponent();
+
+    act(() => setDataset(DiscoverDatasets.SPANS_EAP));
+
+    expect(pageParams).toEqual({
+      dataset: DiscoverDatasets.SPANS_EAP,
+      fields: ['id', 'timestamp'],
+      groupBys: ['span.op'],
+      mode: Mode.AGGREGATE,
+      query: '',
+      sortBys: [{field: 'count(span.self_time)', kind: 'asc'}],
+      visualizes: [
+        {
+          chartType: ChartType.AREA,
+          label: 'A',
+          yAxes: ['count(span.self_time)'],
+        },
+      ],
+    });
+  });
+
+  it('correctly updates fields', function () {
+    renderTestComponent();
+
+    act(() => setFields(['id', 'span.op', 'timestamp']));
+
+    expect(pageParams).toEqual({
+      dataset: DiscoverDatasets.SPANS_EAP_RPC,
+      fields: ['id', 'span.op', 'timestamp'],
+      groupBys: ['span.op'],
+      mode: Mode.AGGREGATE,
+      query: '',
+      sortBys: [{field: 'count(span.self_time)', kind: 'asc'}],
+      visualizes: [
+        {
+          chartType: ChartType.AREA,
+          label: 'A',
+          yAxes: ['count(span.self_time)'],
+        },
+      ],
+    });
+  });
+
+  it('correctly updates groupBys', function () {
+    renderTestComponent();
+
+    act(() => setGroupBys(['browser.name', 'sdk.name']));
+
+    expect(pageParams).toEqual({
+      dataset: DiscoverDatasets.SPANS_EAP_RPC,
+      fields: ['id', 'timestamp'],
+      groupBys: ['browser.name', 'sdk.name'],
+      mode: Mode.AGGREGATE,
+      query: '',
+      sortBys: [{field: 'count(span.self_time)', kind: 'asc'}],
+      visualizes: [
+        {
+          chartType: ChartType.AREA,
+          label: 'A',
+          yAxes: ['count(span.self_time)'],
+        },
+      ],
+    });
+  });
+
+  it('correctly updates mode from samples to aggregates', function () {
+    renderTestComponent({mode: Mode.SAMPLES});
+
+    act(() => setMode(Mode.AGGREGATE));
+
+    expect(pageParams).toEqual({
+      dataset: DiscoverDatasets.SPANS_EAP_RPC,
+      fields: ['id', 'timestamp'],
+      groupBys: ['span.op'],
+      mode: Mode.AGGREGATE,
+      query: '',
+      sortBys: [{field: 'count(span.self_time)', kind: 'asc'}],
+      visualizes: [
+        {
+          chartType: ChartType.AREA,
+          label: 'A',
+          yAxes: ['count(span.self_time)'],
+        },
+      ],
+    });
+  });
+
+  it('correctly updates mode from aggregates to sample without group bys', function () {
+    renderTestComponent({mode: Mode.AGGREGATE, groupBys: [''], sortBys: null});
+
+    act(() => setMode(Mode.SAMPLES));
+
+    expect(pageParams).toEqual({
+      dataset: DiscoverDatasets.SPANS_EAP_RPC,
+      fields: ['id', 'timestamp'],
+      groupBys: [''],
+      mode: Mode.SAMPLES,
+      query: '',
+      sortBys: [{field: 'timestamp', kind: 'desc'}],
+      visualizes: [
+        {
+          chartType: ChartType.AREA,
+          label: 'A',
+          yAxes: ['count(span.self_time)'],
+        },
+      ],
+    });
+  });
+
+  it('correctly updates mode from aggregates to sample with group bys', function () {
+    renderTestComponent({
+      mode: Mode.AGGREGATE,
+      sortBys: null,
+      fields: ['id', 'sdk.name', 'sdk.version', 'timestamp'],
+      groupBys: ['sdk.name', 'sdk.version', 'span.op', ''],
+    });
+
+    act(() => setMode(Mode.SAMPLES));
+
+    expect(pageParams).toEqual({
+      dataset: DiscoverDatasets.SPANS_EAP_RPC,
+      fields: ['id', 'sdk.name', 'sdk.version', 'timestamp', 'span.op'],
+      groupBys: ['sdk.name', 'sdk.version', 'span.op', ''],
+      mode: Mode.SAMPLES,
+      query: '',
+      sortBys: [{field: 'timestamp', kind: 'desc'}],
+      visualizes: [
+        {
+          chartType: ChartType.AREA,
+          label: 'A',
+          yAxes: ['count(span.self_time)'],
+        },
+      ],
+    });
+  });
+
+  it('correctly updates query', function () {
+    renderTestComponent();
+
+    act(() => setQuery('foo:bar'));
+
+    expect(pageParams).toEqual({
+      dataset: DiscoverDatasets.SPANS_EAP_RPC,
+      fields: ['id', 'timestamp'],
+      groupBys: ['span.op'],
+      mode: Mode.AGGREGATE,
+      query: 'foo:bar',
+      sortBys: [{field: 'count(span.self_time)', kind: 'asc'}],
+      visualizes: [
+        {
+          chartType: ChartType.AREA,
+          label: 'A',
+          yAxes: ['count(span.self_time)'],
+        },
+      ],
+    });
+  });
+
+  it('correctly updates sort bys in samples mode with known field', function () {
+    renderTestComponent({mode: Mode.SAMPLES});
+
+    act(() => setSortBys([{field: 'id', kind: 'desc'}]));
+
+    expect(pageParams).toEqual({
+      dataset: DiscoverDatasets.SPANS_EAP_RPC,
+      fields: ['id', 'timestamp'],
+      groupBys: ['span.op'],
+      mode: Mode.SAMPLES,
+      query: '',
+      sortBys: [{field: 'id', kind: 'desc'}],
+      visualizes: [
+        {
+          chartType: ChartType.AREA,
+          label: 'A',
+          yAxes: ['count(span.self_time)'],
+        },
+      ],
+    });
+  });
+
+  it('correctly updates sort bys in samples mode with unknown field', function () {
+    renderTestComponent({mode: Mode.SAMPLES});
+
+    act(() => setSortBys([{field: 'span.op', kind: 'desc'}]));
+
+    expect(pageParams).toEqual({
+      dataset: DiscoverDatasets.SPANS_EAP_RPC,
+      fields: ['id', 'timestamp'],
+      groupBys: ['span.op'],
+      mode: Mode.SAMPLES,
+      query: '',
+      sortBys: [{field: 'timestamp', kind: 'desc'}],
+      visualizes: [
+        {
+          chartType: ChartType.AREA,
+          label: 'A',
+          yAxes: ['count(span.self_time)'],
+        },
+      ],
+    });
+  });
+
+  it('correctly updates sort bys in aggregates mode with known y axis', function () {
+    renderTestComponent({
+      mode: Mode.AGGREGATE,
+      visualizes: [
+        {
+          chartType: ChartType.AREA,
+          label: 'A',
+          yAxes: ['min(span.self_time)', 'max(span.duration)'],
+        },
+      ],
+    });
+
+    act(() => setSortBys([{field: 'max(span.duration)', kind: 'desc'}]));
+
+    expect(pageParams).toEqual({
+      dataset: DiscoverDatasets.SPANS_EAP_RPC,
+      fields: ['id', 'timestamp'],
+      groupBys: ['span.op'],
+      mode: Mode.AGGREGATE,
+      query: '',
+      sortBys: [{field: 'max(span.duration)', kind: 'desc'}],
+      visualizes: [
+        {
+          chartType: ChartType.AREA,
+          label: 'A',
+          yAxes: ['min(span.self_time)', 'max(span.duration)'],
+        },
+      ],
+    });
+  });
+
+  it('correctly updates sort bys in aggregates mode with unknown y axis', function () {
+    renderTestComponent({
+      mode: Mode.AGGREGATE,
+      visualizes: [
+        {
+          chartType: ChartType.AREA,
+          label: 'A',
+          yAxes: ['min(span.self_time)', 'max(span.duration)'],
+        },
+      ],
+    });
+
+    act(() => setSortBys([{field: 'avg(span.duration)', kind: 'desc'}]));
+
+    expect(pageParams).toEqual({
+      dataset: DiscoverDatasets.SPANS_EAP_RPC,
+      fields: ['id', 'timestamp'],
+      groupBys: ['span.op'],
+      mode: Mode.AGGREGATE,
+      query: '',
+      sortBys: [{field: 'min(span.self_time)', kind: 'desc'}],
+      visualizes: [
+        {
+          chartType: ChartType.AREA,
+          label: 'A',
+          yAxes: ['min(span.self_time)', 'max(span.duration)'],
+        },
+      ],
+    });
+  });
+
+  it('correctly updates sort bys in aggregates mode with known group by', function () {
+    renderTestComponent({mode: Mode.AGGREGATE, groupBys: ['sdk.name']});
+
+    act(() => setSortBys([{field: 'sdk.name', kind: 'desc'}]));
+
+    expect(pageParams).toEqual({
+      dataset: DiscoverDatasets.SPANS_EAP_RPC,
+      fields: ['id', 'timestamp'],
+      groupBys: ['sdk.name'],
+      mode: Mode.AGGREGATE,
+      query: '',
+      sortBys: [{field: 'sdk.name', kind: 'desc'}],
+      visualizes: [
+        {
+          chartType: ChartType.AREA,
+          label: 'A',
+          yAxes: ['count(span.self_time)'],
+        },
+      ],
+    });
+  });
+
+  it('correctly updates sort bys in aggregates mode with unknown group by', function () {
+    renderTestComponent({mode: Mode.AGGREGATE, groupBys: ['sdk.name']});
+
+    act(() => setSortBys([{field: 'sdk.version', kind: 'desc'}]));
+
+    expect(pageParams).toEqual({
+      dataset: DiscoverDatasets.SPANS_EAP_RPC,
+      fields: ['id', 'timestamp'],
+      groupBys: ['sdk.name'],
+      mode: Mode.AGGREGATE,
+      query: '',
+      sortBys: [{field: 'count(span.self_time)', kind: 'desc'}],
+      visualizes: [
+        {
+          chartType: ChartType.AREA,
+          label: 'A',
+          yAxes: ['count(span.self_time)'],
+        },
+      ],
+    });
+  });
+
+  it('correctly updates visualizes with labels', function () {
+    renderTestComponent();
+
+    act(() =>
+      setVisualizes([
+        {
+          chartType: ChartType.AREA,
+          yAxes: ['count(span.self_time)'],
+        },
+        {
+          chartType: ChartType.LINE,
+          yAxes: ['avg(span.duration)', 'avg(span.self_time)'],
+        },
+      ])
+    );
+
+    expect(pageParams).toEqual({
+      dataset: DiscoverDatasets.SPANS_EAP_RPC,
+      fields: ['id', 'timestamp'],
+      groupBys: ['span.op'],
+      mode: Mode.AGGREGATE,
+      query: '',
+      sortBys: [{field: 'count(span.self_time)', kind: 'asc'}],
+      visualizes: [
+        {
+          chartType: ChartType.AREA,
+          label: 'A',
+          yAxes: ['count(span.self_time)'],
+        },
+        {
+          chartType: ChartType.LINE,
+          label: 'B',
+          yAxes: ['avg(span.duration)', 'avg(span.self_time)'],
+        },
+      ],
+    });
+  });
+});
diff --git a/static/app/views/explore/contexts/pageParamsContext/index.tsx b/static/app/views/explore/contexts/pageParamsContext/index.tsx
new file mode 100644
index 00000000000000..53a56230156889
--- /dev/null
+++ b/static/app/views/explore/contexts/pageParamsContext/index.tsx
@@ -0,0 +1,296 @@
+import type React from 'react';
+import {createContext, useCallback, useContext, useMemo} from 'react';
+import type {Location} from 'history';
+
+import {defined} from 'sentry/utils';
+import type {Sort} from 'sentry/utils/discover/fields';
+import {DiscoverDatasets} from 'sentry/utils/discover/types';
+import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
+import useOrganization from 'sentry/utils/useOrganization';
+
+import {
+  defaultDataset,
+  getDatasetFromLocation,
+  updateLocationWithDataset,
+} from './dataset';
+import {defaultFields, getFieldsFromLocation, updateLocationWithFields} from './fields';
+import {
+  defaultGroupBys,
+  getGroupBysFromLocation,
+  updateLocationWithGroupBys,
+} from './groupBys';
+import {defaultMode, getModeFromLocation, Mode, updateLocationWithMode} from './mode';
+import {defaultQuery, getQueryFromLocation, updateLocationWithQuery} from './query';
+import {
+  defaultSortBys,
+  getSortBysFromLocation,
+  updateLocationWithSortBys,
+} from './sortBys';
+import {defaultTitle, getTitleFromLocation, updateLocationWithTitle} from './title';
+import {
+  defaultVisualizes,
+  getVisualizesFromLocation,
+  updateLocationWithVisualizes,
+  type Visualize,
+} from './visualizes';
+
+interface ReadablePageParams {
+  dataset: DiscoverDatasets | undefined;
+  fields: string[];
+  groupBys: string[];
+  mode: Mode;
+  query: string;
+  sortBys: Sort[];
+  visualizes: Visualize[];
+  title?: string;
+}
+
+interface WritablePageParams {
+  dataset?: DiscoverDatasets | null;
+  fields?: string[] | null;
+  groupBys?: string[] | null;
+  mode?: Mode | null;
+  query?: string | null;
+  sortBys?: Sort[] | null;
+  title?: string | null;
+  visualizes?: Omit<Visualize, 'label'>[] | null;
+}
+
+export interface SuggestedQuery {
+  fields: string[];
+  groupBys: string[];
+  mode: Mode;
+  query: string;
+  sortBys: Sort[];
+  title: string;
+  visualizes: Omit<Visualize, 'label'>[];
+}
+
+function defaultPageParams(): ReadablePageParams {
+  const dataset = defaultDataset();
+  const fields = defaultFields();
+  const groupBys = defaultGroupBys();
+  const mode = defaultMode();
+  const query = defaultQuery();
+  const visualizes = defaultVisualizes();
+  const title = defaultTitle();
+  const sortBys = defaultSortBys(mode, fields, visualizes);
+
+  return {
+    dataset,
+    fields,
+    groupBys,
+    mode,
+    query,
+    sortBys,
+    title,
+    visualizes,
+  };
+}
+
+const PageParamsContext = createContext<ReadablePageParams>(defaultPageParams());
+
+interface PageParamsProviderProps {
+  children: React.ReactNode;
+}
+
+export function PageParamsProvider({children}: PageParamsProviderProps) {
+  const location = useLocation();
+
+  const pageParams: ReadablePageParams = useMemo(() => {
+    const dataset = getDatasetFromLocation(location);
+    const fields = getFieldsFromLocation(location);
+    const groupBys = getGroupBysFromLocation(location);
+    const mode = getModeFromLocation(location);
+    const query = getQueryFromLocation(location);
+    const visualizes = getVisualizesFromLocation(location);
+    const sortBys = getSortBysFromLocation(location, mode, fields, groupBys, visualizes);
+    const title = getTitleFromLocation(location);
+
+    return {
+      dataset,
+      fields,
+      groupBys,
+      mode,
+      query,
+      sortBys,
+      title,
+      visualizes,
+    };
+  }, [location]);
+
+  return (
+    <PageParamsContext.Provider value={pageParams}>{children}</PageParamsContext.Provider>
+  );
+}
+
+export function useExplorePageParams(): ReadablePageParams {
+  return useContext(PageParamsContext);
+}
+
+export function useExploreDataset(): DiscoverDatasets {
+  const organization = useOrganization();
+  const pageParams = useExplorePageParams();
+
+  if (defined(pageParams.dataset)) {
+    return pageParams.dataset;
+  }
+
+  return organization.features.includes('visibility-explore-rpc')
+    ? DiscoverDatasets.SPANS_EAP_RPC
+    : DiscoverDatasets.SPANS_EAP;
+}
+
+export function useExploreFields(): string[] {
+  const pageParams = useExplorePageParams();
+  return pageParams.fields;
+}
+
+export function useExploreGroupBys(): string[] {
+  const pageParams = useExplorePageParams();
+  return pageParams.groupBys;
+}
+
+export function useExploreMode(): Mode {
+  const pageParams = useExplorePageParams();
+  return pageParams.mode;
+}
+
+export function useExploreQuery(): string {
+  const pageParams = useExplorePageParams();
+  return pageParams.query;
+}
+
+export function useExploreSortBys(): Sort[] {
+  const pageParams = useExplorePageParams();
+  return pageParams.sortBys;
+}
+
+export function useExploreTitle(): string | undefined {
+  const pageParams = useExplorePageParams();
+  return pageParams.title;
+}
+
+export function useExploreVisualizes(): Visualize[] {
+  const pageParams = useExplorePageParams();
+  return pageParams.visualizes;
+}
+
+export function newExploreTarget(
+  location: Location,
+  pageParams: WritablePageParams
+): Location {
+  const target = {...location, query: {...location.query}};
+  updateLocationWithDataset(target, pageParams.dataset);
+  updateLocationWithFields(target, pageParams.fields);
+  updateLocationWithGroupBys(target, pageParams.groupBys);
+  updateLocationWithMode(target, pageParams.mode);
+  updateLocationWithQuery(target, pageParams.query);
+  updateLocationWithSortBys(target, pageParams.sortBys);
+  updateLocationWithVisualizes(target, pageParams.visualizes);
+  updateLocationWithTitle(target, pageParams.title);
+  return target;
+}
+
+export function useSetExplorePageParams() {
+  const location = useLocation();
+  const navigate = useNavigate();
+
+  return useCallback(
+    (pageParams: WritablePageParams) => {
+      const target = newExploreTarget(location, pageParams);
+      navigate(target);
+    },
+    [location, navigate]
+  );
+}
+
+export function useSetExploreDataset() {
+  const setPageParams = useSetExplorePageParams();
+  return useCallback(
+    (dataset: DiscoverDatasets) => {
+      setPageParams({dataset});
+    },
+    [setPageParams]
+  );
+}
+
+export function useSetExploreFields() {
+  const setPageParams = useSetExplorePageParams();
+  return useCallback(
+    (fields: string[]) => {
+      setPageParams({fields});
+    },
+    [setPageParams]
+  );
+}
+
+export function useSetExploreGroupBys() {
+  const setPageParams = useSetExplorePageParams();
+  return useCallback(
+    (groupBys: string[]) => {
+      setPageParams({groupBys});
+    },
+    [setPageParams]
+  );
+}
+
+export function useSetExploreMode() {
+  const pageParams = useExplorePageParams();
+  const setPageParams = useSetExplorePageParams();
+
+  return useCallback(
+    (mode: Mode) => {
+      if (mode === Mode.SAMPLES && pageParams.groupBys.some(groupBy => groupBy !== '')) {
+        // When switching from the aggregates to samples mode, carry
+        // over any group bys as they are helpful context when looking
+        // for examples.
+        const fields = [...pageParams.fields];
+        for (const groupBy of pageParams.groupBys) {
+          if (groupBy !== '' && !fields.includes(groupBy)) {
+            fields.push(groupBy);
+          }
+        }
+
+        setPageParams({
+          mode,
+          fields,
+        });
+      } else {
+        setPageParams({mode});
+      }
+    },
+    [pageParams, setPageParams]
+  );
+}
+
+export function useSetExploreQuery() {
+  const setPageParams = useSetExplorePageParams();
+  return useCallback(
+    (query: string) => {
+      setPageParams({query});
+    },
+    [setPageParams]
+  );
+}
+
+export function useSetExploreSortBys() {
+  const setPageParams = useSetExplorePageParams();
+  return useCallback(
+    (sortBys: Sort[]) => {
+      setPageParams({sortBys});
+    },
+    [setPageParams]
+  );
+}
+
+export function useSetExploreVisualizes() {
+  const setPageParams = useSetExplorePageParams();
+  return useCallback(
+    (visualizes: Omit<Visualize, 'label'>[]) => {
+      setPageParams({visualizes});
+    },
+    [setPageParams]
+  );
+}
diff --git a/static/app/views/explore/contexts/pageParamsContext/mode.tsx b/static/app/views/explore/contexts/pageParamsContext/mode.tsx
new file mode 100644
index 00000000000000..8cc198504a59a4
--- /dev/null
+++ b/static/app/views/explore/contexts/pageParamsContext/mode.tsx
@@ -0,0 +1,32 @@
+import type {Location} from 'history';
+
+import {defined} from 'sentry/utils';
+import {decodeScalar} from 'sentry/utils/queryString';
+
+export enum Mode {
+  SAMPLES = 'samples',
+  AGGREGATE = 'aggregate',
+}
+
+export function defaultMode(): Mode {
+  return Mode.SAMPLES;
+}
+
+export function getModeFromLocation(location: Location): Mode {
+  const rawMode = decodeScalar(location.query.mode);
+  if (rawMode === 'aggregate') {
+    return Mode.AGGREGATE;
+  }
+  return defaultMode();
+}
+
+export function updateLocationWithMode(
+  location: Location,
+  mode: Mode | null | undefined
+) {
+  if (defined(mode)) {
+    location.query.mode = mode;
+  } else if (mode === null) {
+    delete location.query.mode;
+  }
+}
diff --git a/static/app/views/explore/contexts/pageParamsContext/query.tsx b/static/app/views/explore/contexts/pageParamsContext/query.tsx
new file mode 100644
index 00000000000000..32866abbb404fb
--- /dev/null
+++ b/static/app/views/explore/contexts/pageParamsContext/query.tsx
@@ -0,0 +1,23 @@
+import type {Location} from 'history';
+
+import {defined} from 'sentry/utils';
+import {decodeQuery} from 'sentry/utils/discover/eventView';
+
+export function defaultQuery(): string {
+  return '';
+}
+
+export function getQueryFromLocation(location: Location) {
+  return decodeQuery(location);
+}
+
+export function updateLocationWithQuery(
+  location: Location,
+  query: string | null | undefined
+) {
+  if (defined(query)) {
+    location.query.query = query;
+  } else if (query === null) {
+    delete location.query.query;
+  }
+}
diff --git a/static/app/views/explore/contexts/pageParamsContext/sortBys.tsx b/static/app/views/explore/contexts/pageParamsContext/sortBys.tsx
new file mode 100644
index 00000000000000..ed9145000f8309
--- /dev/null
+++ b/static/app/views/explore/contexts/pageParamsContext/sortBys.tsx
@@ -0,0 +1,96 @@
+import type {Location} from 'history';
+
+import {defined} from 'sentry/utils';
+import type {Sort} from 'sentry/utils/discover/fields';
+import {getAggregateAlias} from 'sentry/utils/discover/fields';
+import {decodeSorts} from 'sentry/utils/queryString';
+
+import {Mode} from './mode';
+import type {Visualize} from './visualizes';
+
+export function defaultSortBys(
+  mode: Mode,
+  fields: string[],
+  visualizes: Visualize[]
+): Sort[] {
+  if (mode === Mode.SAMPLES) {
+    if (fields.includes('timestamp')) {
+      return [
+        {
+          field: 'timestamp',
+          kind: 'desc' as const,
+        },
+      ];
+    }
+
+    if (fields.length) {
+      return [
+        {
+          field: fields[0]!,
+          kind: 'desc' as const,
+        },
+      ];
+    }
+  }
+
+  if (mode === Mode.AGGREGATE) {
+    if (visualizes[0]?.yAxes?.[0]) {
+      return [
+        {
+          field: visualizes[0].yAxes[0],
+          kind: 'desc' as const,
+        },
+      ];
+    }
+  }
+
+  return [];
+}
+
+export function getSortBysFromLocation(
+  location: Location,
+  mode: Mode,
+  fields: string[],
+  groupBys: string[],
+  visualizes: Visualize[]
+): Sort[] {
+  const sortBys = decodeSorts(location.query.sort);
+
+  if (sortBys.length > 0) {
+    if (mode === Mode.SAMPLES && sortBys.every(sortBy => fields.includes(sortBy.field))) {
+      return sortBys;
+    }
+
+    if (
+      mode === Mode.AGGREGATE &&
+      sortBys.every(
+        sortBy =>
+          groupBys.includes(sortBy.field) ||
+          visualizes.some(visualize => visualize.yAxes.includes(sortBy.field))
+      )
+    ) {
+      return sortBys;
+    }
+  }
+
+  return defaultSortBys(mode, fields, visualizes);
+}
+
+export function updateLocationWithSortBys(
+  location: Location,
+  sortBys: Sort[] | null | undefined
+) {
+  if (defined(sortBys)) {
+    location.query.sort = sortBys.map(sortBy =>
+      sortBy.kind === 'desc' ? `-${sortBy.field}` : sortBy.field
+    );
+  } else if (sortBys === null) {
+    delete location.query.sort;
+  }
+}
+
+export function formatSort(sort: Sort): string {
+  // The event view still expects the alias in the sort
+  const direction = sort.kind === 'desc' ? '-' : '';
+  return `${direction}${getAggregateAlias(sort.field)}`;
+}
diff --git a/static/app/views/explore/contexts/pageParamsContext/title.tsx b/static/app/views/explore/contexts/pageParamsContext/title.tsx
new file mode 100644
index 00000000000000..2efd99f8b97dd6
--- /dev/null
+++ b/static/app/views/explore/contexts/pageParamsContext/title.tsx
@@ -0,0 +1,23 @@
+import type {Location} from 'history';
+
+import {defined} from 'sentry/utils';
+import {decodeScalar} from 'sentry/utils/queryString';
+
+export function defaultTitle(): string | undefined {
+  return undefined;
+}
+
+export function getTitleFromLocation(location: Location) {
+  return decodeScalar(location.query.title);
+}
+
+export function updateLocationWithTitle(
+  location: Location,
+  title: string | null | undefined
+) {
+  if (defined(title)) {
+    location.query.title = title;
+  } else if (title === null) {
+    delete location.query.title;
+  }
+}
diff --git a/static/app/views/explore/contexts/pageParamsContext/visualizes.tsx b/static/app/views/explore/contexts/pageParamsContext/visualizes.tsx
new file mode 100644
index 00000000000000..0241efb60dda36
--- /dev/null
+++ b/static/app/views/explore/contexts/pageParamsContext/visualizes.tsx
@@ -0,0 +1,87 @@
+import type {Location} from 'history';
+
+import {defined} from 'sentry/utils';
+import {parseFunction} from 'sentry/utils/discover/fields';
+import {
+  ALLOWED_EXPLORE_VISUALIZE_AGGREGATES,
+  ALLOWED_EXPLORE_VISUALIZE_FIELDS,
+} from 'sentry/utils/fields';
+import {decodeList} from 'sentry/utils/queryString';
+import {ChartType} from 'sentry/views/insights/common/components/chart';
+
+export const MAX_VISUALIZES = 4;
+
+export const DEFAULT_VISUALIZATION = `${ALLOWED_EXPLORE_VISUALIZE_AGGREGATES[0]}(${ALLOWED_EXPLORE_VISUALIZE_FIELDS[0]})`;
+
+export function defaultVisualizes(): Visualize[] {
+  return [
+    {
+      chartType: ChartType.LINE,
+      yAxes: [DEFAULT_VISUALIZATION],
+      label: 'A',
+    },
+  ];
+}
+
+export type Visualize = {
+  chartType: ChartType;
+  label: string;
+  yAxes: string[];
+};
+
+export function getVisualizesFromLocation(location: Location): Visualize[] {
+  const rawVisualizes = decodeList(location.query.visualize);
+
+  const result: Visualize[] = rawVisualizes
+    .map(parseVisualizes)
+    .filter(defined)
+    .filter(parsed => parsed.yAxes.length > 0)
+    .map((parsed, i) => {
+      return {
+        chartType: parsed.chartType,
+        yAxes: parsed.yAxes,
+        label: String.fromCharCode(65 + i), // starts from 'A'
+      };
+    });
+
+  return result.length ? result : defaultVisualizes();
+}
+
+function parseVisualizes(raw: string): Omit<Visualize, 'label'> | null {
+  try {
+    const parsed = JSON.parse(raw);
+    if (!defined(parsed) || !Array.isArray(parsed.yAxes)) {
+      return null;
+    }
+
+    const yAxes = parsed.yAxes.filter(parseFunction);
+    if (yAxes.length <= 0) {
+      return null;
+    }
+
+    let chartType = Number(parsed.chartType);
+    if (isNaN(chartType) || !Object.values(ChartType).includes(chartType)) {
+      chartType = ChartType.LINE;
+    }
+
+    return {yAxes, chartType};
+  } catch (error) {
+    return null;
+  }
+}
+
+export function updateLocationWithVisualizes(
+  location: Location,
+  visualizes: Omit<Visualize, 'label'>[] | null | undefined
+) {
+  if (defined(visualizes)) {
+    location.query.visualize = visualizes.map(visualize =>
+      JSON.stringify({
+        chartType: visualize.chartType,
+        yAxes: visualize.yAxes,
+      })
+    );
+  } else if (visualizes === null) {
+    delete location.query.visualize;
+  }
+}
diff --git a/static/app/views/explore/contexts/spanTagsContext.tsx b/static/app/views/explore/contexts/spanTagsContext.tsx
index d8d4ca4e720da6..40a05ccb74f4b5 100644
--- a/static/app/views/explore/contexts/spanTagsContext.tsx
+++ b/static/app/views/explore/contexts/spanTagsContext.tsx
@@ -29,13 +29,16 @@ export function SpanTagsProvider({children, dataset, enabled}: SpanTagsProviderP
     enabled: dataset === DiscoverDatasets.SPANS_INDEXED && enabled,
   });
 
+  const isEAP =
+    dataset === DiscoverDatasets.SPANS_EAP || dataset === DiscoverDatasets.SPANS_EAP_RPC;
+
   const numberTags: TagCollection = useTypedSpanTags({
-    enabled: dataset === DiscoverDatasets.SPANS_EAP && enabled,
+    enabled: isEAP && enabled,
     type: 'number',
   });
 
   const stringTags: TagCollection = useTypedSpanTags({
-    enabled: dataset === DiscoverDatasets.SPANS_EAP && enabled,
+    enabled: isEAP && enabled,
     type: 'string',
   });
 
diff --git a/static/app/views/explore/hooks/useAddToDashboard.spec.tsx b/static/app/views/explore/hooks/useAddToDashboard.spec.tsx
index 1780ce8e4cdacd..d56659be9973fe 100644
--- a/static/app/views/explore/hooks/useAddToDashboard.spec.tsx
+++ b/static/app/views/explore/hooks/useAddToDashboard.spec.tsx
@@ -1,41 +1,41 @@
-import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
+import {act, render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 
 import {openAddToDashboardModal} from 'sentry/actionCreators/modal';
 import {DisplayType, WidgetType} from 'sentry/views/dashboards/types';
+import {
+  PageParamsProvider,
+  useSetExploreMode,
+  useSetExploreVisualizes,
+} from 'sentry/views/explore/contexts/pageParamsContext';
+import {Mode} from 'sentry/views/explore/contexts/pageParamsContext/mode';
 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();
+  let setMode: ReturnType<typeof useSetExploreMode>;
+  let setVisualizes: ReturnType<typeof useSetExploreVisualizes>;
 
-    jest.mocked(useVisualizes).mockReturnValue([
-      [
-        {
-          yAxes: ['avg(span.duration)'],
-          chartType: ChartType.LINE,
-          label: 'Custom Explore Widget',
-        },
-      ],
-      jest.fn(),
-    ]);
+  function TestPage({visualizeIndex}: {visualizeIndex: number}) {
+    setMode = useSetExploreMode();
+    setVisualizes = useSetExploreVisualizes();
+    const {addToDashboard} = useAddToDashboard();
+    return (
+      <button onClick={() => addToDashboard(visualizeIndex)}>Add to Dashboard</button>
+    );
+  }
 
-    jest.mocked(useResultMode).mockReturnValue(['samples', jest.fn()]);
+  beforeEach(() => {
+    jest.clearAllMocks();
   });
 
   it('opens the dashboard modal with the correct query for samples mode', async () => {
-    render(<TestPage visualizeIndex={0} />);
+    render(
+      <PageParamsProvider>
+        <TestPage visualizeIndex={0} />
+      </PageParamsProvider>
+    );
 
     await userEvent.click(screen.getByText('Add to Dashboard'));
 
@@ -90,24 +90,26 @@ describe('AddToDashboardButton', () => {
   });
 
   it('opens the dashboard modal with the correct query based on the visualize index', async () => {
-    // Mock a second visualize object
-    jest.mocked(useVisualizes).mockReturnValue([
-      [
+    render(
+      <PageParamsProvider>
+        <TestPage visualizeIndex={1} />
+      </PageParamsProvider>,
+      {disableRouterMocks: true}
+    );
+
+    act(() =>
+      setVisualizes([
         {
           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
@@ -161,9 +163,15 @@ describe('AddToDashboardButton', () => {
   });
 
   it('uses the yAxes for the aggregate mode', async () => {
-    jest.mocked(useResultMode).mockReturnValue(['aggregate', jest.fn()]);
+    render(
+      <PageParamsProvider>
+        <TestPage visualizeIndex={0} />
+      </PageParamsProvider>,
+      {disableRouterMocks: true}
+    );
+
+    act(() => setMode(Mode.AGGREGATE));
 
-    render(<TestPage visualizeIndex={0} />);
     await userEvent.click(screen.getByText('Add to Dashboard'));
 
     expect(openAddToDashboardModal).toHaveBeenCalledWith(
@@ -202,9 +210,16 @@ describe('AddToDashboardButton', () => {
   });
 
   it('takes the first 3 yAxes', async () => {
-    jest.mocked(useResultMode).mockReturnValue(['aggregate', jest.fn()]);
-    jest.mocked(useVisualizes).mockReturnValue([
-      [
+    render(
+      <PageParamsProvider>
+        <TestPage visualizeIndex={0} />
+      </PageParamsProvider>,
+      {disableRouterMocks: true}
+    );
+
+    act(() => setMode(Mode.AGGREGATE));
+    act(() =>
+      setVisualizes([
         {
           yAxes: [
             'avg(span.duration)',
@@ -213,13 +228,10 @@ describe('AddToDashboardButton', () => {
             '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(
diff --git a/static/app/views/explore/hooks/useAddToDashboard.tsx b/static/app/views/explore/hooks/useAddToDashboard.tsx
index cb8b3ce6a59b55..e0e4e1438247ea 100644
--- a/static/app/views/explore/hooks/useAddToDashboard.tsx
+++ b/static/app/views/explore/hooks/useAddToDashboard.tsx
@@ -11,14 +11,17 @@ 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';
+import {
+  useExploreDataset,
+  useExploreFields,
+  useExploreGroupBys,
+  useExploreMode,
+  useExploreQuery,
+  useExploreSortBys,
+  useExploreVisualizes,
+} from 'sentry/views/explore/contexts/pageParamsContext';
+import {Mode} from 'sentry/views/explore/contexts/pageParamsContext/mode';
+import {formatSort} from 'sentry/views/explore/contexts/pageParamsContext/sortBys';
 
 export function useAddToDashboard() {
   const location = useLocation();
@@ -26,31 +29,31 @@ export function useAddToDashboard() {
   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 mode = useExploreMode();
+  const dataset = useExploreDataset();
+  const groupBys = useExploreGroupBys();
+  const sortBys = useExploreSortBys();
+  const visualizes = useExploreVisualizes();
+  const sampleFields = useExploreFields();
+  const query = useExploreQuery();
 
   const getEventView = useCallback(
     (visualizeIndex: number) => {
-      const yAxes = visualizes[visualizeIndex].yAxes.slice(0, MAX_NUM_Y_AXES);
+      const yAxes = visualizes[visualizeIndex]!.yAxes.slice(0, MAX_NUM_Y_AXES);
 
       let fields;
-      if (resultMode === 'samples') {
+      if (mode === Mode.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),
+        orderby: sortBys.map(formatSort),
         query: search.formatString(),
         version: 2,
         dataset,
@@ -64,7 +67,7 @@ export function useAddToDashboard() {
       newEventView.dataset = dataset;
       return newEventView;
     },
-    [visualizes, resultMode, sampleFields, groupBys, query, location, dataset, selection]
+    [visualizes, mode, sampleFields, groupBys, query, dataset, selection, sortBys]
   );
 
   const addToDashboard = useCallback(
diff --git a/static/app/views/explore/hooks/useAnalytics.tsx b/static/app/views/explore/hooks/useAnalytics.tsx
index 970c24b1a7c70f..330196caa2c42b 100644
--- a/static/app/views/explore/hooks/useAnalytics.tsx
+++ b/static/app/views/explore/hooks/useAnalytics.tsx
@@ -6,8 +6,7 @@ import type {DiscoverDatasets} from 'sentry/utils/discover/types';
 import type {UseApiQueryResult} from 'sentry/utils/queryClient';
 import type RequestError from 'sentry/utils/requestError/requestError';
 import {MutableSearch} from 'sentry/utils/tokenizeSearch';
-
-import type {Visualize} from './useVisualizes';
+import type {Visualize} from 'sentry/views/explore/contexts/pageParamsContext/visualizes';
 
 export function useAnalytics({
   dataset,
@@ -20,6 +19,7 @@ export function useAnalytics({
   columns,
   userQuery,
   confidence,
+  title,
 }: {
   columns: string[];
   confidence: Confidence;
@@ -31,6 +31,7 @@ export function useAnalytics({
   userQuery: string;
   visualizes: Visualize[];
   resultMissingRoot?: number;
+  title?: string;
 }) {
   useEffect(() => {
     if (resultStatus === 'pending') {
@@ -52,6 +53,7 @@ export function useAnalytics({
       user_queries_count: search.tokens.length,
       visualizes,
       visualizes_count: visualizes.length,
+      title,
     };
 
     trackAnalytics('trace.explorer.metadata', params);
@@ -66,5 +68,6 @@ export function useAnalytics({
     userQuery,
     confidence,
     dataset,
+    title,
   ]);
 }
diff --git a/static/app/views/explore/hooks/useChartInterval.spec.tsx b/static/app/views/explore/hooks/useChartInterval.spec.tsx
index f977e883061374..274f34822d5434 100644
--- a/static/app/views/explore/hooks/useChartInterval.spec.tsx
+++ b/static/app/views/explore/hooks/useChartInterval.spec.tsx
@@ -1,8 +1,9 @@
 import {act, render} from 'sentry-test/reactTestingLibrary';
 
 import PageFiltersStore from 'sentry/stores/pageFiltersStore';
+import {parsePeriodToHours} from 'sentry/utils/duration/parsePeriodToHours';
 
-import {useChartInterval} from './useChartInterval';
+import {getIntervalOptionsForPageFilter, useChartInterval} from './useChartInterval';
 
 describe('useChartInterval', function () {
   beforeEach(() => {
@@ -11,7 +12,9 @@ describe('useChartInterval', function () {
   });
 
   it('allows changing chart interval', async function () {
-    let chartInterval, setChartInterval, intervalOptions;
+    let chartInterval!: ReturnType<typeof useChartInterval>[0];
+    let setChartInterval!: ReturnType<typeof useChartInterval>[1];
+    let intervalOptions!: ReturnType<typeof useChartInterval>[2];
 
     function TestPage() {
       [chartInterval, setChartInterval, intervalOptions] = useChartInterval();
@@ -22,14 +25,14 @@ describe('useChartInterval', function () {
 
     expect(intervalOptions).toEqual([
       {value: '1h', label: '1 hour'},
-      {value: '4h', label: '4 hours'},
+      {value: '3h', label: '3 hours'},
+      {value: '12h', label: '12 hours'},
       {value: '1d', label: '1 day'},
-      {value: '1w', label: '1 week'},
     ]);
-    expect(chartInterval).toEqual('1h'); // default
+    expect(chartInterval).toBe('3h'); // default
 
     await act(() => setChartInterval('1d'));
-    expect(chartInterval).toEqual('1d');
+    expect(chartInterval).toBe('1d');
 
     // Update page filters to change interval options
     await act(() =>
@@ -49,6 +52,39 @@ describe('useChartInterval', function () {
     await act(() => {
       setChartInterval('1m');
     });
-    expect(chartInterval).toEqual('1m');
+    expect(chartInterval).toBe('1m');
   });
 });
+
+describe('getIntervalOptionsForPageFilter', function () {
+  it.each([
+    '1h',
+    '23h',
+    '1d',
+    '6d',
+    '7d',
+    '13d',
+    '14d',
+    '29d',
+    '30d',
+    '59d',
+    '60d',
+    '89d',
+    '90d',
+  ])(
+    'returns interval options with resulting in less than 1000 buckets',
+    function (period) {
+      const periodInHours = parsePeriodToHours(period);
+      const options = getIntervalOptionsForPageFilter({
+        period,
+        start: null,
+        end: null,
+        utc: null,
+      });
+      options.forEach(({value}) => {
+        const intervalInHours = parsePeriodToHours(value);
+        expect(periodInHours / intervalInHours).toBeLessThan(1000);
+      });
+    }
+  );
+});
diff --git a/static/app/views/explore/hooks/useChartInterval.tsx b/static/app/views/explore/hooks/useChartInterval.tsx
index 6fdf0ea709aa4d..cc75b806a0fcce 100644
--- a/static/app/views/explore/hooks/useChartInterval.tsx
+++ b/static/app/views/explore/hooks/useChartInterval.tsx
@@ -1,11 +1,22 @@
 import {useCallback, useMemo} from 'react';
 import type {Location} from 'history';
 
+import {
+  FORTY_EIGHT_HOURS,
+  getDiffInMinutes,
+  GranularityLadder,
+  ONE_WEEK,
+  SIX_HOURS,
+  THIRTY_DAYS,
+  TWO_WEEKS,
+} from 'sentry/components/charts/utils';
+import {t} from 'sentry/locale';
+import type {PageFilters} from 'sentry/types/core';
+import {parsePeriodToHours} from 'sentry/utils/duration/parsePeriodToHours';
 import {decodeScalar} from 'sentry/utils/queryString';
 import {useLocation} from 'sentry/utils/useLocation';
 import {useNavigate} from 'sentry/utils/useNavigate';
 import usePageFilters from 'sentry/utils/usePageFilters';
-import {getIntervalOptionsForStatsPeriod} from 'sentry/views/metrics/utils/useMetricsIntervalParam';
 
 interface Options {
   location: Location;
@@ -36,9 +47,10 @@ function useChartIntervalImpl({
   intervalOptions: {label: string; value: string}[],
 ] {
   const {datetime} = pagefilters.selection;
-  const intervalOptions = useMemo(() => {
-    return getIntervalOptionsForStatsPeriod(datetime);
-  }, [datetime]);
+  const intervalOptions = useMemo(
+    () => getIntervalOptionsForPageFilter(datetime),
+    [datetime]
+  );
 
   const interval: string = useMemo(() => {
     const decodedInterval = decodeScalar(location.query.interval);
@@ -46,7 +58,8 @@ function useChartIntervalImpl({
     return decodedInterval &&
       intervalOptions.some(option => option.value === decodedInterval)
       ? decodedInterval
-      : intervalOptions[0].value;
+      : // Default to the second option so we're not defaulting to the smallest option
+        intervalOptions[1]!.value;
   }, [location.query.interval, intervalOptions]);
 
   const setInterval = useCallback(
@@ -64,3 +77,51 @@ function useChartIntervalImpl({
 
   return [interval, setInterval, intervalOptions];
 }
+
+const ALL_INTERVAL_OPTIONS = [
+  {value: '1m', label: t('1 minute')},
+  {value: '5m', label: t('5 minutes')},
+  {value: '15m', label: t('15 minutes')},
+  {value: '30m', label: t('30 minutes')},
+  {value: '1h', label: t('1 hour')},
+  {value: '3h', label: t('3 hours')},
+  {value: '12h', label: t('12 hours')},
+  {value: '1d', label: t('1 day')},
+];
+
+/**
+ * The minimum interval is chosen in such a way that there will be
+ * at most 1000 data points per series for the chosen period.
+ */
+const MINIMUM_INTERVAL = new GranularityLadder([
+  [THIRTY_DAYS, '3h'],
+  [TWO_WEEKS, '1h'],
+  [ONE_WEEK, '30m'],
+  [FORTY_EIGHT_HOURS, '15m'],
+  [SIX_HOURS, '5m'],
+  [0, '1m'],
+]);
+
+const MAXIMUM_INTERVAL = new GranularityLadder([
+  [THIRTY_DAYS, '1d'],
+  [TWO_WEEKS, '1d'],
+  [ONE_WEEK, '1d'],
+  [FORTY_EIGHT_HOURS, '4h'],
+  [SIX_HOURS, '1h'],
+  [0, '15m'],
+]);
+
+export function getIntervalOptionsForPageFilter(datetime: PageFilters['datetime']) {
+  const diffInMinutes = getDiffInMinutes(datetime);
+
+  const minimumOption = MINIMUM_INTERVAL.getInterval(diffInMinutes);
+  const minimumOptionInHours = parsePeriodToHours(minimumOption);
+
+  const maximumOption = MAXIMUM_INTERVAL.getInterval(diffInMinutes);
+  const maximumOptionInHours = parsePeriodToHours(maximumOption);
+
+  return ALL_INTERVAL_OPTIONS.filter(option => {
+    const optionInHours = parsePeriodToHours(option.value);
+    return optionInHours >= minimumOptionInHours && optionInHours <= maximumOptionInHours;
+  });
+}
diff --git a/static/app/views/explore/hooks/useDataset.tsx b/static/app/views/explore/hooks/useDataset.tsx
deleted file mode 100644
index 6e276672c60a8a..00000000000000
--- a/static/app/views/explore/hooks/useDataset.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import {useCallback, useMemo} from 'react';
-import type {Location} from 'history';
-
-import {DiscoverDatasets} from 'sentry/utils/discover/types';
-import {decodeScalar} from 'sentry/utils/queryString';
-import {useLocation} from 'sentry/utils/useLocation';
-import {useNavigate} from 'sentry/utils/useNavigate';
-
-interface Options {
-  location: Location;
-  navigate: ReturnType<typeof useNavigate>;
-  allowRPC?: boolean;
-}
-
-interface UseDatasetOptions {
-  allowRPC?: boolean;
-}
-
-export function useDataset(
-  options?: UseDatasetOptions
-): [DiscoverDatasets, (dataset: DiscoverDatasets) => void] {
-  const location = useLocation();
-  const navigate = useNavigate();
-
-  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, allowRPC]);
-
-  const setDataset = useCallback(
-    (newDataset: DiscoverDatasets) => {
-      navigate({
-        ...location,
-        query: {
-          ...location.query,
-          dataset: newDataset,
-        },
-      });
-    },
-    [location, navigate]
-  );
-
-  return [dataset, setDataset];
-}
diff --git a/static/app/views/explore/hooks/useDragNDropColumns.spec.tsx b/static/app/views/explore/hooks/useDragNDropColumns.spec.tsx
index b56f5b6c91c553..c119de9b774a64 100644
--- a/static/app/views/explore/hooks/useDragNDropColumns.spec.tsx
+++ b/static/app/views/explore/hooks/useDragNDropColumns.spec.tsx
@@ -8,7 +8,9 @@ describe('useDragNDropColumns', () => {
   const initialColumns = ['span.op', 'span_id', 'timestamp'];
 
   it('should insert a column', () => {
-    let columns, setColumns, insertColumn;
+    let columns!: string[];
+    let setColumns: (columns: string[]) => void;
+    let insertColumn: ReturnType<typeof useDragNDropColumns>['insertColumn'];
 
     function TestPage() {
       [columns, setColumns] = useState(initialColumns);
@@ -26,7 +28,11 @@ describe('useDragNDropColumns', () => {
   });
 
   it('should update a column at a specific index', () => {
-    let columns, setColumns, updateColumnAtIndex;
+    let columns!: string[];
+    let setColumns: (columns: string[]) => void;
+    let updateColumnAtIndex: ReturnType<
+      typeof useDragNDropColumns
+    >['updateColumnAtIndex'];
 
     function TestPage() {
       [columns, setColumns] = useState(initialColumns);
@@ -44,7 +50,9 @@ describe('useDragNDropColumns', () => {
   });
 
   it('should delete a column at a specific index', () => {
-    let columns, setColumns, deleteColumnAtIndex;
+    let columns!: string[];
+    let setColumns: (columns: string[]) => void;
+    let deleteColumnAtIndex: (index: number) => void;
 
     function TestPage() {
       [columns, setColumns] = useState(initialColumns);
@@ -62,7 +70,9 @@ describe('useDragNDropColumns', () => {
   });
 
   it('should swap two columns at specific indices', () => {
-    let columns, setColumns, onDragEnd;
+    let columns!: string[];
+    let setColumns: (columns: string[]) => void;
+    let onDragEnd: (arg: any) => void;
 
     function TestPage() {
       [columns, setColumns] = useState(initialColumns);
diff --git a/static/app/views/explore/hooks/useDragNDropColumns.tsx b/static/app/views/explore/hooks/useDragNDropColumns.tsx
index 5a3c301d7ebbf9..d6d5df3a14b458 100644
--- a/static/app/views/explore/hooks/useDragNDropColumns.tsx
+++ b/static/app/views/explore/hooks/useDragNDropColumns.tsx
@@ -53,7 +53,7 @@ export function useDragNDropColumns({columns, setColumns}: UseDragAndDropColumns
   function updateColumnAtIndex(i: number, column: string) {
     setEditableColumns(oldEditableColumns => {
       const newEditableColumns = [...oldEditableColumns];
-      newEditableColumns[i].column = column;
+      newEditableColumns[i]!.column = column;
 
       setColumns(extractColumns(newEditableColumns));
 
diff --git a/static/app/views/explore/hooks/useGroupBys.spec.tsx b/static/app/views/explore/hooks/useGroupBys.spec.tsx
deleted file mode 100644
index 2bdbafaad4ea95..00000000000000
--- a/static/app/views/explore/hooks/useGroupBys.spec.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import {OrganizationFixture} from 'sentry-fixture/organization';
-
-import {act, render, waitFor} from 'sentry-test/reactTestingLibrary';
-
-import {DiscoverDatasets} from 'sentry/utils/discover/types';
-import {useGroupBys} from 'sentry/views/explore/hooks/useGroupBys';
-
-import {SpanTagsProvider} from '../contexts/spanTagsContext';
-
-describe('useGroupBys', function () {
-  it('allows changing group bys', async function () {
-    const organization = OrganizationFixture();
-
-    const mockSpanTagsApiCall = MockApiClient.addMockResponse({
-      url: `/organizations/${organization.slug}/spans/fields/`,
-      method: 'GET',
-      body: [
-        {
-          key: 'foo',
-          name: 'Foo',
-        },
-        {
-          key: 'bar',
-          name: 'Bar',
-        },
-      ],
-    });
-
-    let groupBys, setGroupBys;
-
-    function TestPage() {
-      ({groupBys, setGroupBys} = useGroupBys());
-      return null;
-    }
-
-    render(
-      <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
-        <TestPage />
-      </SpanTagsProvider>,
-      {disableRouterMocks: true}
-    );
-
-    await waitFor(() => expect(mockSpanTagsApiCall).toHaveBeenCalled());
-    expect(groupBys).toEqual(['']); // default
-
-    act(() => setGroupBys(['foo', 'bar']));
-    expect(groupBys).toEqual(['foo', 'bar']);
-
-    act(() => setGroupBys([]));
-    expect(groupBys).toEqual(['']); // default
-  });
-});
diff --git a/static/app/views/explore/hooks/useGroupBys.tsx b/static/app/views/explore/hooks/useGroupBys.tsx
deleted file mode 100644
index ee14f76c8264a9..00000000000000
--- a/static/app/views/explore/hooks/useGroupBys.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import {useCallback, useMemo} from 'react';
-import type {Location} from 'history';
-
-import {decodeList} from 'sentry/utils/queryString';
-import {useLocation} from 'sentry/utils/useLocation';
-import {useNavigate} from 'sentry/utils/useNavigate';
-import type {Field} from 'sentry/views/explore/hooks/useSampleFields';
-
-interface Options {
-  location: Location;
-  navigate: ReturnType<typeof useNavigate>;
-}
-
-type GroupBysResult = {
-  groupBys: Field[];
-  setGroupBys: (fields: Field[]) => void;
-};
-
-export function useGroupBys(): GroupBysResult {
-  const location = useLocation();
-  const navigate = useNavigate();
-  const options = {location, navigate};
-
-  return useGroupBysImpl(options);
-}
-
-function useGroupBysImpl({location, navigate}: Options): GroupBysResult {
-  const groupBys = useMemo(() => {
-    const rawGroupBys = decodeList(location.query.groupBy);
-
-    if (rawGroupBys.length) {
-      return rawGroupBys;
-    }
-
-    return [''];
-  }, [location.query.groupBy]);
-
-  const setGroupBys = useCallback(
-    (newGroupBys: Field[]) => {
-      navigate({
-        ...location,
-        query: {
-          ...location.query,
-          groupBy: newGroupBys,
-        },
-      });
-    },
-    [location, navigate]
-  );
-
-  return {
-    groupBys,
-    setGroupBys,
-  };
-}
diff --git a/static/app/views/explore/hooks/useResultsMode.spec.tsx b/static/app/views/explore/hooks/useResultsMode.spec.tsx
deleted file mode 100644
index 7b62332b3bd6b0..00000000000000
--- a/static/app/views/explore/hooks/useResultsMode.spec.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import {OrganizationFixture} from 'sentry-fixture/organization';
-
-import {act, render} from 'sentry-test/reactTestingLibrary';
-
-import {DiscoverDatasets} from 'sentry/utils/discover/types';
-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 {SpanTagsProvider} from '../contexts/spanTagsContext';
-
-describe('useResultMode', function () {
-  it('allows changing results mode', function () {
-    let resultMode, setResultMode;
-    let sampleFields;
-    let setGroupBys;
-
-    const organization = OrganizationFixture();
-
-    MockApiClient.addMockResponse({
-      url: `/organizations/${organization.slug}/spans/fields/`,
-      method: 'GET',
-      body: [],
-    });
-
-    function TestPage() {
-      [sampleFields] = useSampleFields();
-      ({setGroupBys} = useGroupBys());
-      [resultMode, setResultMode] = useResultMode();
-      return null;
-    }
-
-    render(
-      <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
-        <TestPage />
-      </SpanTagsProvider>,
-      {disableRouterMocks: true}
-    );
-
-    expect(resultMode).toEqual('samples'); // default
-    expect(sampleFields).toEqual([
-      'id',
-      'project',
-      'span.op',
-      'span.description',
-      'span.duration',
-      'timestamp',
-    ]); // default
-
-    act(() => setResultMode('aggregate'));
-    expect(resultMode).toEqual('aggregate');
-
-    act(() => setGroupBys(['release', '']));
-
-    act(() => setResultMode('samples'));
-    expect(resultMode).toEqual('samples');
-
-    expect(sampleFields).toEqual([
-      'id',
-      'project',
-      'span.op',
-      'span.description',
-      'span.duration',
-      'timestamp',
-      'release',
-    ]);
-  });
-});
diff --git a/static/app/views/explore/hooks/useResultsMode.tsx b/static/app/views/explore/hooks/useResultsMode.tsx
deleted file mode 100644
index 8c78c0b2264ce8..00000000000000
--- a/static/app/views/explore/hooks/useResultsMode.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import {useCallback, useMemo} from 'react';
-import type {Location} from 'history';
-
-import {decodeScalar} from 'sentry/utils/queryString';
-import {useLocation} from 'sentry/utils/useLocation';
-import {useNavigate} from 'sentry/utils/useNavigate';
-import {useGroupBys} from 'sentry/views/explore/hooks/useGroupBys';
-import {useSampleFields} from 'sentry/views/explore/hooks/useSampleFields';
-
-interface Options {
-  location: Location;
-  navigate: ReturnType<typeof useNavigate>;
-}
-
-export type ResultMode = 'samples' | 'aggregate';
-
-export function useResultMode(): [ResultMode, (newMode: ResultMode) => void] {
-  const location = useLocation();
-  const navigate = useNavigate();
-  const options = {location, navigate};
-
-  return useResultModeImpl(options);
-}
-
-function useResultModeImpl({
-  location,
-  navigate,
-}: Options): [ResultMode, (newMode: ResultMode) => void] {
-  const [sampleFields] = useSampleFields();
-  const {groupBys} = useGroupBys();
-
-  const resultMode: ResultMode = useMemo(() => {
-    const rawMode = decodeScalar(location.query.mode);
-    if (rawMode === 'aggregate') {
-      return 'aggregate' as const;
-    }
-    return 'samples' as const;
-  }, [location.query.mode]);
-
-  const setResultMode = useCallback(
-    (newMode: ResultMode) => {
-      // When switching from the aggregates to samples mode, carry
-      // over any group bys as they are helpful context when looking
-      // for examples.
-      const fields = [...sampleFields];
-      if (newMode === 'samples') {
-        for (const groupBy of groupBys) {
-          if (groupBy && !fields.includes(groupBy)) {
-            fields.push(groupBy);
-          }
-        }
-      }
-
-      navigate({
-        ...location,
-        query: {
-          ...location.query,
-          mode: newMode,
-          field: fields,
-        },
-      });
-    },
-    [location, navigate, sampleFields, groupBys]
-  );
-
-  return [resultMode, setResultMode];
-}
diff --git a/static/app/views/explore/hooks/useSampleFields.spec.tsx b/static/app/views/explore/hooks/useSampleFields.spec.tsx
deleted file mode 100644
index 59ccc2aff095b4..00000000000000
--- a/static/app/views/explore/hooks/useSampleFields.spec.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import {act, render} from 'sentry-test/reactTestingLibrary';
-
-import {useSampleFields} from 'sentry/views/explore/hooks/useSampleFields';
-
-describe('useSampleFields', function () {
-  it('allows changing sample fields', function () {
-    let sampleFields, setSampleFields;
-
-    function TestPage() {
-      [sampleFields, setSampleFields] = useSampleFields();
-      return null;
-    }
-
-    render(<TestPage />, {disableRouterMocks: true});
-
-    expect(sampleFields).toEqual([
-      'id',
-      'project',
-      'span.op',
-      'span.description',
-      'span.duration',
-      'timestamp',
-    ]); // default
-
-    act(() => setSampleFields(['foo', 'bar']));
-    expect(sampleFields).toEqual(['foo', 'bar']);
-
-    act(() => setSampleFields([]));
-    expect(sampleFields).toEqual([
-      'id',
-      'project',
-      'span.op',
-      'span.description',
-      'span.duration',
-      'timestamp',
-    ]); // default
-  });
-});
diff --git a/static/app/views/explore/hooks/useSampleFields.tsx b/static/app/views/explore/hooks/useSampleFields.tsx
deleted file mode 100644
index 701e6b80db9458..00000000000000
--- a/static/app/views/explore/hooks/useSampleFields.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import {useCallback, useMemo} from 'react';
-import type {Location} from 'history';
-
-import {decodeList} from 'sentry/utils/queryString';
-import {useLocation} from 'sentry/utils/useLocation';
-import {useNavigate} from 'sentry/utils/useNavigate';
-
-interface Options {
-  location: Location;
-  navigate: ReturnType<typeof useNavigate>;
-}
-
-export type Field = string;
-
-export function useSampleFields(): [Field[], (fields: Field[]) => void] {
-  const location = useLocation();
-  const navigate = useNavigate();
-  const options = {location, navigate};
-
-  return useSampleFieldsImpl(options);
-}
-
-function useSampleFieldsImpl({
-  location,
-  navigate,
-}: Options): [Field[], (fields: Field[]) => void] {
-  const sampleFields = useMemo(() => {
-    const fields = decodeList(location.query.field);
-
-    if (fields.length) {
-      return fields;
-    }
-
-    return ['id', 'project', 'span.op', 'span.description', 'span.duration', 'timestamp'];
-  }, [location.query.field]);
-
-  const setSampleFields = useCallback(
-    (fields: Field[]) => {
-      navigate({
-        ...location,
-        query: {
-          ...location.query,
-          field: fields,
-        },
-      });
-    },
-    [location, navigate]
-  );
-
-  return [sampleFields, setSampleFields];
-}
diff --git a/static/app/views/explore/hooks/useSorts.spec.tsx b/static/app/views/explore/hooks/useSorts.spec.tsx
deleted file mode 100644
index a02325c70374a1..00000000000000
--- a/static/app/views/explore/hooks/useSorts.spec.tsx
+++ /dev/null
@@ -1,111 +0,0 @@
-import {act, render} from 'sentry-test/reactTestingLibrary';
-
-import {useSorts} from 'sentry/views/explore/hooks/useSorts';
-
-describe('useSorts', function () {
-  it('allows changing sorts', function () {
-    let sorts, setSorts;
-
-    const fields = ['id', 'timestamp'];
-
-    function TestPage() {
-      [sorts, setSorts] = useSorts({fields});
-      return null;
-    }
-
-    render(<TestPage />, {disableRouterMocks: true});
-
-    expect(sorts).toEqual([
-      {
-        kind: 'desc',
-        field: 'timestamp',
-      },
-    ]); // default
-
-    act(() =>
-      setSorts([
-        {
-          kind: 'asc',
-          field: 'timestamp',
-        },
-      ])
-    );
-    expect(sorts).toEqual([
-      {
-        kind: 'asc',
-        field: 'timestamp',
-      },
-    ]);
-
-    act(() =>
-      setSorts([
-        {
-          kind: 'desc',
-          field: 'id',
-        },
-      ])
-    );
-    expect(sorts).toEqual([
-      {
-        kind: 'desc',
-        field: 'id',
-      },
-    ]);
-  });
-
-  it('falls back to timestamp desc if possible', function () {
-    let sorts, setSorts;
-
-    const fields = ['id', 'timestamp'];
-
-    function TestPage() {
-      [sorts, setSorts] = useSorts({fields});
-      return null;
-    }
-
-    render(<TestPage />, {disableRouterMocks: true});
-
-    act(() =>
-      setSorts([
-        {
-          kind: 'asc',
-          field: 'foo',
-        },
-      ])
-    );
-    expect(sorts).toEqual([
-      {
-        kind: 'desc',
-        field: 'timestamp',
-      },
-    ]);
-  });
-
-  it('falls back to first column desc if timestamp is not available', function () {
-    let sorts, setSorts;
-
-    const fields = ['id'];
-
-    function TestPage() {
-      [sorts, setSorts] = useSorts({fields});
-      return null;
-    }
-
-    render(<TestPage />, {disableRouterMocks: true});
-
-    act(() =>
-      setSorts([
-        {
-          kind: 'asc',
-          field: 'foo',
-        },
-      ])
-    );
-    expect(sorts).toEqual([
-      {
-        kind: 'desc',
-        field: 'id',
-      },
-    ]);
-  });
-});
diff --git a/static/app/views/explore/hooks/useSorts.tsx b/static/app/views/explore/hooks/useSorts.tsx
deleted file mode 100644
index 6a700f2d4d777e..00000000000000
--- a/static/app/views/explore/hooks/useSorts.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import {useCallback, useMemo} from 'react';
-import type {Location} from 'history';
-
-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 type {Field} from './useSampleFields';
-
-interface Options {
-  fields: Field[];
-}
-
-export function useSorts(props): [Sort[], (newSorts: Sort[]) => void] {
-  const location = useLocation();
-  const navigate = useNavigate();
-  const options = {location, navigate, ...props};
-
-  return useSortsImpl(options);
-}
-
-interface ImplOptions extends Options {
-  location: Location;
-  navigate: ReturnType<typeof useNavigate>;
-}
-
-function useSortsImpl({
-  fields,
-  location,
-  navigate,
-}: ImplOptions): [Sort[], (newSorts: Sort[]) => void] {
-  const sorts = useMemo(() => getSorts(fields, location), [fields, location]);
-
-  const setSort = useCallback(
-    (newSorts: Sort[]) => {
-      const formatted = newSorts.map(newSort => {
-        return newSort.kind === 'desc' ? `-${newSort.field}` : newSort.field;
-      });
-      navigate({
-        ...location,
-        query: {
-          ...location.query,
-          sort: formatted,
-        },
-      });
-    },
-    [location, navigate]
-  );
-
-  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/useTopEvents.tsx b/static/app/views/explore/hooks/useTopEvents.tsx
index 276ca3b527e284..2d6247d48fad6e 100644
--- a/static/app/views/explore/hooks/useTopEvents.tsx
+++ b/static/app/views/explore/hooks/useTopEvents.tsx
@@ -1,22 +1,25 @@
 import {useMemo} from 'react';
 
-import {useGroupBys} from './useGroupBys';
-import {useResultMode} from './useResultsMode';
-import {useVisualizes} from './useVisualizes';
+import {
+  useExploreGroupBys,
+  useExploreMode,
+  useExploreVisualizes,
+} from 'sentry/views/explore/contexts/pageParamsContext';
+import {Mode} from 'sentry/views/explore/contexts/pageParamsContext/mode';
 
 export const TOP_EVENTS_LIMIT: number = 5;
 
 export function useTopEvents(): number | undefined {
-  const [visualizes] = useVisualizes();
-  const {groupBys} = useGroupBys();
-  const [resultMode] = useResultMode();
+  const visualizes = useExploreVisualizes();
+  const groupBys = useExploreGroupBys();
+  const mode = useExploreMode();
 
   const hasChartWithMultipleYaxes = useMemo(() => {
     return visualizes.some(visualize => visualize.yAxes.length > 1);
   }, [visualizes]);
 
   const topEvents: number | undefined = useMemo(() => {
-    if (resultMode === 'samples') {
+    if (mode === Mode.SAMPLES) {
       return undefined;
     }
 
@@ -25,7 +28,7 @@ export function useTopEvents(): number | undefined {
     return hasChartWithMultipleYaxes || (groupBys.length === 1 && groupBys[0] === '')
       ? undefined
       : TOP_EVENTS_LIMIT;
-  }, [hasChartWithMultipleYaxes, groupBys, resultMode]);
+  }, [hasChartWithMultipleYaxes, groupBys, mode]);
 
   return topEvents;
 }
diff --git a/static/app/views/explore/hooks/useTraces.tsx b/static/app/views/explore/hooks/useTraces.tsx
index 8f78eb9b02863c..211e8c2624633d 100644
--- a/static/app/views/explore/hooks/useTraces.tsx
+++ b/static/app/views/explore/hooks/useTraces.tsx
@@ -2,7 +2,7 @@ import {normalizeDateTimeParams} from 'sentry/components/organizations/pageFilte
 import type {PageFilters} from 'sentry/types/core';
 import type {QueryError} from 'sentry/utils/discover/genericDiscoverQuery';
 import {parseError} from 'sentry/utils/discover/genericDiscoverQuery';
-import type {DiscoverDatasets} from 'sentry/utils/discover/types';
+import {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';
@@ -88,7 +88,9 @@ export function useTraces({
       project: selection.projects,
       environment: selection.environments,
       ...normalizeDateTimeParams(datetime ?? selection.datetime),
-      dataset,
+      // RPC not supported here yet, fall back to EAP directly
+      dataset:
+        dataset === DiscoverDatasets.SPANS_EAP_RPC ? DiscoverDatasets.SPANS_EAP : dataset,
       query,
       sort, // only has an effect when `dataset` is `EAPSpans`
       per_page: limit,
diff --git a/static/app/views/explore/hooks/useUserQuery.spec.tsx b/static/app/views/explore/hooks/useUserQuery.spec.tsx
deleted file mode 100644
index 3f8f27db3e1f2b..00000000000000
--- a/static/app/views/explore/hooks/useUserQuery.spec.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import {act, render} from 'sentry-test/reactTestingLibrary';
-
-import {useUserQuery} from 'sentry/views/explore/hooks/useUserQuery';
-
-describe('useUserQuery', function () {
-  it('allows changing user query', function () {
-    let userQuery, setUserQuery;
-
-    function TestPage() {
-      [userQuery, setUserQuery] = useUserQuery();
-      return null;
-    }
-
-    render(<TestPage />, {disableRouterMocks: true});
-
-    expect(userQuery).toEqual(''); // default
-
-    act(() => setUserQuery('foo:bar'));
-    expect(userQuery).toEqual('foo:bar');
-  });
-});
diff --git a/static/app/views/explore/hooks/useUserQuery.tsx b/static/app/views/explore/hooks/useUserQuery.tsx
deleted file mode 100644
index c162b82237bf1e..00000000000000
--- a/static/app/views/explore/hooks/useUserQuery.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import {useCallback} from 'react';
-import type {Location} from 'history';
-
-import {decodeQuery} from 'sentry/utils/discover/eventView';
-import {useLocation} from 'sentry/utils/useLocation';
-import {useNavigate} from 'sentry/utils/useNavigate';
-
-interface Options {
-  location: Location;
-  navigate: ReturnType<typeof useNavigate>;
-}
-
-export function useUserQuery(): [string, (newQuery: string) => void] {
-  const location = useLocation();
-  const navigate = useNavigate();
-  const options = {location, navigate};
-
-  return useUserQueryImpl(options);
-}
-
-function useUserQueryImpl({
-  location,
-  navigate,
-}: Options): [string, (newQuery: string) => void] {
-  const userQuery = decodeQuery(location);
-
-  const setUserQuery = useCallback(
-    (newQuery: string) => {
-      navigate({
-        ...location,
-        query: {
-          ...location.query,
-          query: newQuery,
-        },
-      });
-    },
-    [location, navigate]
-  );
-
-  return [userQuery, setUserQuery];
-}
diff --git a/static/app/views/explore/hooks/useVisualizes.spec.tsx b/static/app/views/explore/hooks/useVisualizes.spec.tsx
deleted file mode 100644
index ee5773ef46ce0e..00000000000000
--- a/static/app/views/explore/hooks/useVisualizes.spec.tsx
+++ /dev/null
@@ -1,95 +0,0 @@
-import {act, render} from 'sentry-test/reactTestingLibrary';
-
-import {useVisualizes} from 'sentry/views/explore/hooks/useVisualizes';
-import {ChartType} from 'sentry/views/insights/common/components/chart';
-
-describe('useVisualizes', function () {
-  it('allows changing visualizes function', function () {
-    let visualizes, setVisualizes;
-
-    function TestPage() {
-      [visualizes, setVisualizes] = useVisualizes();
-      return null;
-    }
-
-    render(<TestPage />, {disableRouterMocks: true});
-
-    expect(visualizes).toEqual([
-      {
-        chartType: ChartType.LINE,
-        label: 'A',
-        yAxes: ['avg(span.duration)'],
-      },
-    ]); // default
-
-    act(() => setVisualizes([{yAxes: ['p75(span.duration)'], chartType: ChartType.BAR}]));
-    expect(visualizes).toEqual([
-      {
-        chartType: ChartType.BAR,
-        label: 'A',
-        yAxes: ['p75(span.duration)'],
-      },
-    ]);
-
-    act(() => setVisualizes([]));
-    expect(visualizes).toEqual([
-      {
-        chartType: ChartType.LINE,
-        label: 'A',
-        yAxes: ['avg(span.duration)'],
-      },
-    ]); // default
-
-    act(() => setVisualizes([{yAxes: ['count(span.duration)']}]));
-    expect(visualizes).toEqual([
-      {
-        chartType: ChartType.LINE,
-        label: 'A',
-        yAxes: ['count(span.duration)'],
-      },
-    ]); // default
-
-    act(() =>
-      setVisualizes([
-        {
-          yAxes: ['count(span.duration)', 'p75(span.duration)'],
-          chartType: ChartType.LINE,
-        },
-      ])
-    );
-    expect(visualizes).toEqual([
-      {
-        chartType: ChartType.LINE,
-        label: 'A',
-        yAxes: ['count(span.duration)', 'p75(span.duration)'],
-      },
-    ]);
-
-    act(() =>
-      setVisualizes([
-        {
-          chartType: ChartType.BAR,
-          label: 'A',
-          yAxes: ['count(span.duration)', 'p75(span.duration)'],
-        },
-        {
-          chartType: ChartType.AREA,
-          label: 'B',
-          yAxes: ['count(span.duration)'],
-        },
-      ])
-    );
-    expect(visualizes).toEqual([
-      {
-        chartType: ChartType.BAR,
-        label: 'A',
-        yAxes: ['count(span.duration)', 'p75(span.duration)'],
-      },
-      {
-        chartType: ChartType.AREA,
-        label: 'B',
-        yAxes: ['count(span.duration)'],
-      },
-    ]);
-  });
-});
diff --git a/static/app/views/explore/hooks/useVisualizes.tsx b/static/app/views/explore/hooks/useVisualizes.tsx
deleted file mode 100644
index 5f7ec106f6e54c..00000000000000
--- a/static/app/views/explore/hooks/useVisualizes.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-import {useCallback, useMemo} from 'react';
-import type {Location} from 'history';
-
-import {defined} from 'sentry/utils';
-import {parseFunction} from 'sentry/utils/discover/fields';
-import {
-  ALLOWED_EXPLORE_VISUALIZE_AGGREGATES,
-  ALLOWED_EXPLORE_VISUALIZE_FIELDS,
-} from 'sentry/utils/fields';
-import {decodeList} from 'sentry/utils/queryString';
-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[];
-};
-
-export type Visualize = BaseVisualize & {
-  label: string;
-};
-
-interface Options {
-  location: Location;
-  navigate: ReturnType<typeof useNavigate>;
-}
-
-export const DEFAULT_VISUALIZATION = `${ALLOWED_EXPLORE_VISUALIZE_AGGREGATES[0]}(${ALLOWED_EXPLORE_VISUALIZE_FIELDS[0]})`;
-
-export function useVisualizes(): [Visualize[], (visualizes: BaseVisualize[]) => void] {
-  const location = useLocation();
-  const navigate = useNavigate();
-  const options = {location, navigate};
-
-  return useVisualizesImpl(options);
-}
-
-function useVisualizesImpl({
-  location,
-  navigate,
-}: Options): [Visualize[], (visualizes: BaseVisualize[]) => void] {
-  const visualizes: Visualize[] = useMemo(() => {
-    const rawVisualizes = decodeList(location.query.visualize);
-
-    const result: Visualize[] = rawVisualizes
-      .map(parseVisualizes)
-      .filter(defined)
-      .filter(parsed => parsed.yAxes.length > 0)
-      .map((parsed, i) => {
-        return {
-          chartType: parsed.chartType,
-          yAxes: parsed.yAxes,
-          label: String.fromCharCode(65 + i), // starts from 'A'
-        };
-      });
-
-    return result.length
-      ? result
-      : [{chartType: ChartType.LINE, label: 'A', yAxes: [DEFAULT_VISUALIZATION]}];
-  }, [location.query.visualize]);
-
-  const setVisualizes = useCallback(
-    (newVisualizes: BaseVisualize[]) => {
-      const stringified: string[] = [];
-      for (const visualize of newVisualizes) {
-        // ignore the label from visualize because it'll determined later
-        stringified.push(
-          JSON.stringify({
-            chartType: visualize.chartType,
-            yAxes: visualize.yAxes,
-          })
-        );
-      }
-
-      navigate({
-        ...location,
-        query: {
-          ...location.query,
-          visualize: stringified,
-        },
-      });
-    },
-    [location, navigate]
-  );
-
-  return [visualizes, setVisualizes];
-}
-
-function parseVisualizes(raw: string): BaseVisualize | null {
-  try {
-    const parsed = JSON.parse(raw);
-    if (!defined(parsed) || !Array.isArray(parsed.yAxes)) {
-      return null;
-    }
-
-    const yAxes = parsed.yAxes.filter(parseFunction);
-    if (yAxes.length <= 0) {
-      return null;
-    }
-
-    let chartType = Number(parsed.chartType);
-    if (isNaN(chartType) || !Object.values(ChartType).includes(chartType)) {
-      chartType = ChartType.LINE;
-    }
-
-    return {yAxes, chartType};
-  } catch (error) {
-    return null;
-  }
-}
diff --git a/static/app/views/explore/tables/aggregatesTable.tsx b/static/app/views/explore/tables/aggregatesTable.tsx
index b09d3a02cafcd4..cb0f537b772fc6 100644
--- a/static/app/views/explore/tables/aggregatesTable.tsx
+++ b/static/app/views/explore/tables/aggregatesTable.tsx
@@ -1,8 +1,9 @@
 import type {Dispatch, SetStateAction} from 'react';
-import {Fragment, useEffect, useMemo} from 'react';
+import {Fragment, useEffect, useMemo, useRef} from 'react';
 import styled from '@emotion/styled';
 
 import EmptyStateWarning from 'sentry/components/emptyStateWarning';
+import {GridResizer} from 'sentry/components/gridEditable/styles';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
 import Pagination from 'sentry/components/pagination';
 import {CHART_PALETTE} from 'sentry/constants/chartPalette';
@@ -12,10 +13,8 @@ import {t} from 'sentry/locale';
 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,
-  getAggregateAlias,
   parseFunction,
   prettifyParsedFunction,
 } from 'sentry/utils/discover/fields';
@@ -28,27 +27,28 @@ import {
   TableBodyCell,
   TableHead,
   TableHeadCell,
+  TableHeadCellContent,
   TableRow,
   TableStatus,
   useTableStyles,
 } from 'sentry/views/explore/components/table';
+import {
+  useExploreDataset,
+  useExploreGroupBys,
+  useExploreQuery,
+  useExploreSortBys,
+  useExploreTitle,
+  useExploreVisualizes,
+  useSetExploreSortBys,
+} from 'sentry/views/explore/contexts/pageParamsContext';
+import {formatSort} from 'sentry/views/explore/contexts/pageParamsContext/sortBys';
 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 {FieldRenderer} from './fieldRenderer';
 
-export function formatSort(sort: Sort): string {
-  const direction = sort.kind === 'desc' ? '-' : '';
-  return `${direction}${getAggregateAlias(sort.field)}`;
-}
-
 interface AggregatesTableProps {
   confidence: Confidence;
   setError: Dispatch<SetStateAction<string>>;
@@ -58,9 +58,11 @@ export function AggregatesTable({confidence, setError}: AggregatesTableProps) {
   const {selection} = usePageFilters();
   const topEvents = useTopEvents();
   const organization = useOrganization();
-  const [dataset] = useDataset({allowRPC: true});
-  const {groupBys} = useGroupBys();
-  const [visualizes] = useVisualizes();
+  const title = useExploreTitle();
+  const dataset = useExploreDataset();
+  const groupBys = useExploreGroupBys();
+  const visualizes = useExploreVisualizes();
+
   const fields = useMemo(() => {
     // When rendering the table, we want the group bys first
     // then the aggregates.
@@ -84,31 +86,10 @@ export function AggregatesTable({confidence, setError}: AggregatesTableProps) {
 
     return allFields.filter(Boolean);
   }, [groupBys, visualizes]);
-  const orderByFields = useMemo(() => {
-    // When rendering the order by, we want the aggregates
-    // first then the group bys.
-    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: orderByFields});
-  const [query] = useUserQuery();
+  const sorts = useExploreSortBys();
+  const setSorts = useSetExploreSortBys();
+  const query = useExploreQuery();
 
   const eventView = useMemo(() => {
     const search = new MutableSearch(query);
@@ -153,16 +134,11 @@ export function AggregatesTable({confidence, setError}: AggregatesTableProps) {
     columns: groupBys,
     userQuery: query,
     confidence,
+    title,
   });
 
-  const {tableStyles} = useTableStyles({
-    items: fields.map(field => {
-      return {
-        label: field,
-        value: field,
-      };
-    }),
-  });
+  const tableRef = useRef<HTMLTableElement>(null);
+  const {initialTableStyles, onResizeMouseDown} = useTableStyles(fields, tableRef);
 
   const meta = result.meta ?? {};
 
@@ -171,7 +147,7 @@ export function AggregatesTable({confidence, setError}: AggregatesTableProps) {
 
   return (
     <Fragment>
-      <Table style={tableStyles}>
+      <Table ref={tableRef} styles={initialTableStyles}>
         <TableHead>
           <TableRow>
             {fields.map((field, i) => {
@@ -202,26 +178,33 @@ export function AggregatesTable({confidence, setError}: AggregatesTableProps) {
               }
 
               return (
-                <StyledTableHeadCell
-                  align={align}
-                  key={i}
-                  isFirst={i === 0}
-                  onClick={updateSort}
-                >
-                  <span>{label}</span>
-                  {defined(direction) && (
-                    <IconArrow
-                      size="xs"
-                      direction={
-                        direction === 'desc'
-                          ? 'down'
-                          : direction === 'asc'
-                            ? 'up'
-                            : undefined
+                <TableHeadCell align={align} key={i} isFirst={i === 0}>
+                  <TableHeadCellContent onClick={updateSort}>
+                    <span>{label}</span>
+                    {defined(direction) && (
+                      <IconArrow
+                        size="xs"
+                        direction={
+                          direction === 'desc'
+                            ? 'down'
+                            : direction === 'asc'
+                              ? 'up'
+                              : undefined
+                        }
+                      />
+                    )}
+                  </TableHeadCellContent>
+                  {i !== fields.length - 1 && (
+                    <GridResizer
+                      dataRows={
+                        !result.isError && !result.isPending && result.data
+                          ? result.data.length
+                          : 0
                       }
+                      onMouseDown={e => onResizeMouseDown(e, i)}
                     />
                   )}
-                </StyledTableHeadCell>
+                </TableHeadCell>
               );
             })}
           </TableRow>
@@ -245,7 +228,7 @@ export function AggregatesTable({confidence, setError}: AggregatesTableProps) {
                         <TopResultsIndicator index={i} />
                       )}
                       <FieldRenderer
-                        column={columns[j]}
+                        column={columns[j]!}
                         data={row}
                         unit={meta?.units?.[field]}
                         meta={meta}
@@ -278,10 +261,6 @@ const TopResultsIndicator = styled('div')<{index: number}>`
   border-radius: 0 3px 3px 0;
 
   background-color: ${p => {
-    return CHART_PALETTE[TOP_EVENTS_LIMIT - 1][p.index];
+    return CHART_PALETTE[TOP_EVENTS_LIMIT - 1]![p.index];
   }};
 `;
-
-const StyledTableHeadCell = styled(TableHeadCell)`
-  cursor: pointer;
-`;
diff --git a/static/app/views/explore/tables/columnEditorModal.spec.tsx b/static/app/views/explore/tables/columnEditorModal.spec.tsx
index 42fdead7c28858..714eef1d7845a5 100644
--- a/static/app/views/explore/tables/columnEditorModal.spec.tsx
+++ b/static/app/views/explore/tables/columnEditorModal.spec.tsx
@@ -79,14 +79,14 @@ describe('ColumnEditorModal', function () {
 
     const columns1 = ['id', 'project'];
     screen.getAllByTestId('editor-column').forEach((column, i) => {
-      expect(column).toHaveTextContent(columns1[i]);
+      expect(column).toHaveTextContent(columns1[i]!);
     });
 
-    await userEvent.click(screen.getAllByLabelText('Remove Column')[0]);
+    await userEvent.click(screen.getAllByLabelText('Remove Column')[0]!);
 
     const columns2 = ['project'];
     screen.getAllByTestId('editor-column').forEach((column, i) => {
-      expect(column).toHaveTextContent(columns2[i]);
+      expect(column).toHaveTextContent(columns2[i]!);
     });
 
     // only 1 column remaining, disable the delete option
@@ -118,14 +118,14 @@ describe('ColumnEditorModal', function () {
 
     const columns1 = ['id', 'project'];
     screen.getAllByTestId('editor-column').forEach((column, i) => {
-      expect(column).toHaveTextContent(columns1[i]);
+      expect(column).toHaveTextContent(columns1[i]!);
     });
 
     await userEvent.click(screen.getByRole('button', {name: 'Add a Column'}));
 
     const columns2 = ['id', 'project', 'None'];
     screen.getAllByTestId('editor-column').forEach((column, i) => {
-      expect(column).toHaveTextContent(columns2[i]);
+      expect(column).toHaveTextContent(columns2[i]!);
     });
 
     const options: [string, 'string' | 'number'][] = [
@@ -137,14 +137,14 @@ describe('ColumnEditorModal', function () {
     await userEvent.click(screen.getByRole('button', {name: 'Column None'}));
     const columnOptions = await screen.findAllByRole('option');
     columnOptions.forEach((option, i) => {
-      expect(option).toHaveTextContent(options[i][0]);
-      expect(option).toHaveTextContent(options[i][1]);
+      expect(option).toHaveTextContent(options[i]![0]);
+      expect(option).toHaveTextContent(options[i]![1]);
     });
 
-    await userEvent.click(columnOptions[3]);
+    await userEvent.click(columnOptions[3]!);
     const columns3 = ['id', 'project', 'span.op'];
     screen.getAllByTestId('editor-column').forEach((column, i) => {
-      expect(column).toHaveTextContent(columns3[i]);
+      expect(column).toHaveTextContent(columns3[i]!);
     });
 
     await userEvent.click(screen.getByRole('button', {name: 'Apply'}));
@@ -173,7 +173,7 @@ describe('ColumnEditorModal', function () {
 
     const columns1 = ['id', 'project'];
     screen.getAllByTestId('editor-column').forEach((column, i) => {
-      expect(column).toHaveTextContent(columns1[i]);
+      expect(column).toHaveTextContent(columns1[i]!);
     });
 
     const options: [string, 'string' | 'number'][] = [
@@ -185,14 +185,14 @@ describe('ColumnEditorModal', function () {
     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][0]);
-      expect(option).toHaveTextContent(options[i][1]);
+      expect(option).toHaveTextContent(options[i]![0]);
+      expect(option).toHaveTextContent(options[i]![1]);
     });
 
-    await userEvent.click(columnOptions[3]);
+    await userEvent.click(columnOptions[3]!);
     const columns2 = ['id', 'span.op'];
     screen.getAllByTestId('editor-column').forEach((column, i) => {
-      expect(column).toHaveTextContent(columns2[i]);
+      expect(column).toHaveTextContent(columns2[i]!);
     });
 
     await userEvent.click(screen.getByRole('button', {name: 'Apply'}));
diff --git a/static/app/views/explore/tables/fieldRenderer.spec.tsx b/static/app/views/explore/tables/fieldRenderer.spec.tsx
index 9cc7a89ba55184..a52a3042420e58 100644
--- a/static/app/views/explore/tables/fieldRenderer.spec.tsx
+++ b/static/app/views/explore/tables/fieldRenderer.spec.tsx
@@ -44,7 +44,7 @@ describe('FieldRenderer tests', function () {
   it('renders span.op', function () {
     render(
       <FieldRenderer
-        column={eventView.getColumns()[3]}
+        column={eventView.getColumns()[3]!}
         data={mockedEventData}
         meta={{}}
       />,
@@ -57,7 +57,7 @@ describe('FieldRenderer tests', function () {
   it('renders span id link to traceview', function () {
     render(
       <FieldRenderer
-        column={eventView.getColumns()[0]}
+        column={eventView.getColumns()[0]!}
         data={mockedEventData}
         meta={{}}
       />,
@@ -74,7 +74,7 @@ describe('FieldRenderer tests', function () {
   it('renders transaction id link to traceview', function () {
     render(
       <FieldRenderer
-        column={eventView.getColumns()[4]}
+        column={eventView.getColumns()[4]!}
         data={mockedEventData}
         meta={{}}
       />,
@@ -91,7 +91,7 @@ describe('FieldRenderer tests', function () {
   it('renders trace id link to traceview', function () {
     render(
       <FieldRenderer
-        column={eventView.getColumns()[2]}
+        column={eventView.getColumns()[2]!}
         data={mockedEventData}
         meta={{}}
       />,
@@ -108,7 +108,7 @@ describe('FieldRenderer tests', function () {
   it('renders timestamp', function () {
     render(
       <FieldRenderer
-        column={eventView.getColumns()[1]}
+        column={eventView.getColumns()[1]!}
         data={mockedEventData}
         meta={{}}
       />,
diff --git a/static/app/views/explore/tables/fieldRenderer.tsx b/static/app/views/explore/tables/fieldRenderer.tsx
index d55bf4844d4eec..bcbbd381701bc2 100644
--- a/static/app/views/explore/tables/fieldRenderer.tsx
+++ b/static/app/views/explore/tables/fieldRenderer.tsx
@@ -15,11 +15,14 @@ import {useLocation} from 'sentry/utils/useLocation';
 import useOrganization from 'sentry/utils/useOrganization';
 import CellAction, {updateQuery} from 'sentry/views/discover/table/cellAction';
 import type {TableColumn} from 'sentry/views/discover/table/types';
+import {
+  useExploreQuery,
+  useSetExploreQuery,
+} from 'sentry/views/explore/contexts/pageParamsContext';
 import {TraceViewSources} from 'sentry/views/performance/newTraceDetails/traceHeader/breadcrumbs';
 import {getTraceDetailsUrl} from 'sentry/views/performance/traceDetails/utils';
 
 import {ALLOWED_CELL_ACTIONS} from '../components/table';
-import {useUserQuery} from '../hooks/useUserQuery';
 
 interface FieldProps {
   column: TableColumn<keyof TableDataRow>;
@@ -31,7 +34,8 @@ interface FieldProps {
 export function FieldRenderer({data, meta, unit, column}: FieldProps) {
   const location = useLocation();
   const organization = useOrganization();
-  const [userQuery, setUserQuery] = useUserQuery();
+  const userQuery = useExploreQuery();
+  const setUserQuery = useSetExploreQuery();
   const dateSelection = EventView.fromLocation(location).normalizeDateSelection(location);
   const query = new MutableSearch(userQuery);
   const field = column.name;
diff --git a/static/app/views/explore/tables/index.tsx b/static/app/views/explore/tables/index.tsx
index 14dd2eeea628b9..f9bc28a5e178df 100644
--- a/static/app/views/explore/tables/index.tsx
+++ b/static/app/views/explore/tables/index.tsx
@@ -9,9 +9,13 @@ import {IconTable} from 'sentry/icons/iconTable';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {Confidence} from 'sentry/types/organization';
+import {
+  useExploreFields,
+  useExploreMode,
+  useSetExploreFields,
+} from 'sentry/views/explore/contexts/pageParamsContext';
+import {Mode} from 'sentry/views/explore/contexts/pageParamsContext/mode';
 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 {Tab, useTab} from 'sentry/views/explore/hooks/useTab';
 import {AggregatesTable} from 'sentry/views/explore/tables/aggregatesTable';
 import {ColumnEditorModal} from 'sentry/views/explore/tables/columnEditorModal';
@@ -24,12 +28,12 @@ interface ExploreTablesProps {
 }
 
 export function ExploreTables(props: ExploreTablesProps) {
-  const [resultMode] = useResultMode();
+  const mode = useExploreMode();
 
   return (
     <Fragment>
-      {resultMode === 'aggregate' && <ExploreAggregatesTable {...props} />}
-      {resultMode === 'samples' && <ExploreSamplesTable {...props} />}
+      {mode === Mode.AGGREGATE && <ExploreAggregatesTable {...props} />}
+      {mode === Mode.SAMPLES && <ExploreSamplesTable {...props} />}
     </Fragment>
   );
 }
@@ -41,7 +45,9 @@ function ExploreAggregatesTable(props: ExploreTablesProps) {
 function ExploreSamplesTable(props: ExploreTablesProps) {
   const [tab, setTab] = useTab();
 
-  const [fields, setFields] = useSampleFields();
+  const fields = useExploreFields();
+  const setFields = useSetExploreFields();
+
   const numberTags = useSpanTags('number');
   const stringTags = useSpanTags('string');
 
diff --git a/static/app/views/explore/tables/spansTable.tsx b/static/app/views/explore/tables/spansTable.tsx
index 517f0dba3db8c4..9003dd2e1bcb98 100644
--- a/static/app/views/explore/tables/spansTable.tsx
+++ b/static/app/views/explore/tables/spansTable.tsx
@@ -1,8 +1,8 @@
 import type {Dispatch, SetStateAction} from 'react';
-import {Fragment, useEffect, useMemo} from 'react';
-import styled from '@emotion/styled';
+import {Fragment, useEffect, useMemo, useRef} from 'react';
 
 import EmptyStateWarning from 'sentry/components/emptyStateWarning';
+import {GridResizer} from 'sentry/components/gridEditable/styles';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
 import Pagination from 'sentry/components/pagination';
 import {IconArrow} from 'sentry/icons/iconArrow';
@@ -21,17 +21,22 @@ import {
   TableBodyCell,
   TableHead,
   TableHeadCell,
+  TableHeadCellContent,
   TableRow,
   TableStatus,
   useTableStyles,
 } from 'sentry/views/explore/components/table';
+import {
+  useExploreDataset,
+  useExploreFields,
+  useExploreQuery,
+  useExploreSortBys,
+  useExploreTitle,
+  useExploreVisualizes,
+  useSetExploreSortBys,
+} from 'sentry/views/explore/contexts/pageParamsContext';
 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 {FieldRenderer} from './fieldRenderer';
@@ -44,11 +49,13 @@ interface SpansTableProps {
 export function SpansTable({confidence, setError}: SpansTableProps) {
   const {selection} = usePageFilters();
 
-  const [dataset] = useDataset({allowRPC: true});
-  const [fields] = useSampleFields();
-  const [sorts, setSorts] = useSorts({fields});
-  const [query] = useUserQuery();
-  const [visualizes] = useVisualizes();
+  const dataset = useExploreDataset();
+  const title = useExploreTitle();
+  const fields = useExploreFields();
+  const sortBys = useExploreSortBys();
+  const setSortBys = useSetExploreSortBys();
+  const query = useExploreQuery();
+  const visualizes = useExploreVisualizes();
   const organization = useOrganization();
 
   const visibleFields = useMemo(
@@ -77,16 +84,16 @@ export function SpansTable({confidence, setError}: SpansTableProps) {
       id: undefined,
       name: 'Explore - Span Samples',
       fields: queryFields,
-      orderby: sorts.map(sort => `${sort.kind === 'desc' ? '-' : ''}${sort.field}`),
+      orderby: sortBys.map(sort => `${sort.kind === 'desc' ? '-' : ''}${sort.field}`),
       query: search.formatString(),
       version: 2,
       dataset,
     };
 
     return EventView.fromNewQueryWithPageFilters(discoverQuery, selection);
-  }, [dataset, sorts, query, selection, visibleFields]);
+  }, [dataset, sortBys, query, selection, visibleFields]);
 
-  const columns = useMemo(() => eventView.getColumns(), [eventView]);
+  const columnsFromEventView = useMemo(() => eventView.getColumns(), [eventView]);
 
   const result = useSpansQuery({
     eventView,
@@ -109,16 +116,11 @@ export function SpansTable({confidence, setError}: SpansTableProps) {
     columns: fields,
     userQuery: query,
     confidence,
+    title,
   });
 
-  const {tableStyles} = useTableStyles({
-    items: visibleFields.map(field => {
-      return {
-        label: field,
-        value: field,
-      };
-    }),
-  });
+  const tableRef = useRef<HTMLTableElement>(null);
+  const {initialTableStyles, onResizeMouseDown} = useTableStyles(visibleFields, tableRef);
 
   const meta = result.meta ?? {};
 
@@ -127,7 +129,7 @@ export function SpansTable({confidence, setError}: SpansTableProps) {
 
   return (
     <Fragment>
-      <Table style={tableStyles}>
+      <Table ref={tableRef} styles={initialTableStyles}>
         <TableHead>
           <TableRow>
             {visibleFields.map((field, i) => {
@@ -140,34 +142,41 @@ export function SpansTable({confidence, setError}: SpansTableProps) {
               const align = fieldAlignment(field, fieldType);
               const tag = stringTags[field] ?? numberTags[field] ?? null;
 
-              const direction = sorts.find(s => s.field === field)?.kind;
+              const direction = sortBys.find(s => s.field === field)?.kind;
 
               function updateSort() {
                 const kind = direction === 'desc' ? 'asc' : 'desc';
-                setSorts([{field, kind}]);
+                setSortBys([{field, kind}]);
               }
 
               return (
-                <StyledTableHeadCell
-                  align={align}
-                  key={i}
-                  isFirst={i === 0}
-                  onClick={updateSort}
-                >
-                  <span>{tag?.name ?? prettifyTagKey(field)}</span>
-                  {defined(direction) && (
-                    <IconArrow
-                      size="xs"
-                      direction={
-                        direction === 'desc'
-                          ? 'down'
-                          : direction === 'asc'
-                            ? 'up'
-                            : undefined
+                <TableHeadCell align={align} key={i} isFirst={i === 0}>
+                  <TableHeadCellContent onClick={updateSort}>
+                    <span>{tag?.name ?? prettifyTagKey(field)}</span>
+                    {defined(direction) && (
+                      <IconArrow
+                        size="xs"
+                        direction={
+                          direction === 'desc'
+                            ? 'down'
+                            : direction === 'asc'
+                              ? 'up'
+                              : undefined
+                        }
+                      />
+                    )}
+                  </TableHeadCellContent>
+                  {i !== visibleFields.length - 1 && (
+                    <GridResizer
+                      dataRows={
+                        !result.isError && !result.isPending && result.data
+                          ? result.data.length
+                          : 0
                       }
+                      onMouseDown={e => onResizeMouseDown(e, i)}
                     />
                   )}
-                </StyledTableHeadCell>
+                </TableHeadCell>
               );
             })}
           </TableRow>
@@ -188,7 +197,7 @@ export function SpansTable({confidence, setError}: SpansTableProps) {
                   return (
                     <TableBodyCell key={j}>
                       <FieldRenderer
-                        column={columns[j]}
+                        column={columnsFromEventView[j]!}
                         data={row}
                         unit={meta?.units?.[field]}
                         meta={meta}
@@ -211,7 +220,3 @@ export function SpansTable({confidence, setError}: SpansTableProps) {
     </Fragment>
   );
 }
-
-const StyledTableHeadCell = styled(TableHeadCell)`
-  cursor: pointer;
-`;
diff --git a/static/app/views/explore/tables/tracesTable/index.tsx b/static/app/views/explore/tables/tracesTable/index.tsx
index 480f99389b84c5..0180ae5cb8c13c 100644
--- a/static/app/views/explore/tables/tracesTable/index.tsx
+++ b/static/app/views/explore/tables/tracesTable/index.tsx
@@ -24,11 +24,14 @@ 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 {
+  useExploreDataset,
+  useExploreQuery,
+  useExploreTitle,
+  useExploreVisualizes,
+} from 'sentry/views/explore/contexts/pageParamsContext';
 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,
@@ -55,9 +58,10 @@ interface TracesTableProps {
 }
 
 export function TracesTable({confidence, setError}: TracesTableProps) {
-  const [dataset] = useDataset();
-  const [query] = useUserQuery();
-  const [visualizes] = useVisualizes();
+  const title = useExploreTitle();
+  const dataset = useExploreDataset();
+  const query = useExploreQuery();
+  const visualizes = useExploreVisualizes();
   const organization = useOrganization();
 
   const location = useLocation();
@@ -93,6 +97,7 @@ export function TracesTable({confidence, setError}: TracesTableProps) {
     ],
     userQuery: query,
     confidence,
+    title,
   });
 
   const {data, isPending, isError, getResponseHeader} = result;
@@ -202,7 +207,7 @@ function TraceRow({
     const trailingProjects: string[] = [];
 
     for (let i = 0; i < trace.breakdowns.length; i++) {
-      const project = trace.breakdowns[i].project;
+      const project = trace.breakdowns[i]!.project;
       if (!defined(project) || seenProjects.has(project)) {
         continue;
       }
diff --git a/static/app/views/explore/tables/tracesTable/spansTable.tsx b/static/app/views/explore/tables/tracesTable/spansTable.tsx
index 4b88287b51dda7..bc69f07027b7a1 100644
--- a/static/app/views/explore/tables/tracesTable/spansTable.tsx
+++ b/static/app/views/explore/tables/tracesTable/spansTable.tsx
@@ -12,10 +12,12 @@ import type {Organization} from 'sentry/types/organization';
 import {trackAnalytics} from 'sentry/utils/analytics';
 import {getUtcDateString} from 'sentry/utils/dates';
 import useOrganization from 'sentry/utils/useOrganization';
-import {useDataset} from 'sentry/views/explore/hooks/useDataset';
+import {
+  useExploreDataset,
+  useExploreQuery,
+} from 'sentry/views/explore/contexts/pageParamsContext';
 import type {TraceResult} from 'sentry/views/explore/hooks/useTraces';
 import {type SpanResult, useTraceSpans} from 'sentry/views/explore/hooks/useTraceSpans';
-import {useUserQuery} from 'sentry/views/explore/hooks/useUserQuery';
 import {type Field, FIELDS, SORTS} from 'sentry/views/explore/tables/tracesTable/data';
 import {
   SpanBreakdownSliceRenderer,
@@ -40,8 +42,8 @@ const ONE_MINUTE = 60 * 1000; // in milliseconds
 export function SpanTable({trace}: {trace: TraceResult}) {
   const organization = useOrganization();
 
-  const [dataset] = useDataset();
-  const [query] = useUserQuery();
+  const dataset = useExploreDataset();
+  const query = useExploreQuery();
 
   const {data, isPending, isError} = useTraceSpans({
     dataset,
diff --git a/static/app/views/explore/tables/tracesTable/utils.tsx b/static/app/views/explore/tables/tracesTable/utils.tsx
index 5ecd8adf5803d8..9e8451ae4bbcdf 100644
--- a/static/app/views/explore/tables/tracesTable/utils.tsx
+++ b/static/app/views/explore/tables/tracesTable/utils.tsx
@@ -36,7 +36,7 @@ export function areQueriesEmpty(queries: string[]): boolean {
   }
 
   if (queries.length === 1) {
-    return queries[0].length === 0;
+    return queries[0]!.length === 0;
   }
 
   return false;
diff --git a/static/app/views/explore/toolbar/index.spec.tsx b/static/app/views/explore/toolbar/index.spec.tsx
index 0b0f9c0b1809e8..015e49e63c2d51 100644
--- a/static/app/views/explore/toolbar/index.spec.tsx
+++ b/static/app/views/explore/toolbar/index.spec.tsx
@@ -3,11 +3,17 @@ import {OrganizationFixture} from 'sentry-fixture/organization';
 import {render, screen, userEvent, within} from 'sentry-test/reactTestingLibrary';
 
 import {DiscoverDatasets} from 'sentry/utils/discover/types';
-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 {useSorts} from 'sentry/views/explore/hooks/useSorts';
-import {useVisualizes} from 'sentry/views/explore/hooks/useVisualizes';
+import {
+  PageParamsProvider,
+  useExploreDataset,
+  useExploreFields,
+  useExploreGroupBys,
+  useExploreMode,
+  useExplorePageParams,
+  useExploreSortBys,
+  useExploreVisualizes,
+} from 'sentry/views/explore/contexts/pageParamsContext';
+import {Mode} from 'sentry/views/explore/contexts/pageParamsContext/mode';
 import {ExploreToolbar} from 'sentry/views/explore/toolbar';
 import {ChartType} from 'sentry/views/insights/common/components/chart';
 
@@ -27,32 +33,121 @@ describe('ExploreToolbar', function () {
     });
   });
 
-  it('allows changing results mode', async function () {
-    let resultMode, sampleFields, groupBys;
-
+  it('should not render dataset selector', function () {
     function Component() {
-      [resultMode] = useResultMode();
-      [sampleFields] = useSampleFields();
-      ({groupBys} = useGroupBys());
       return <ExploreToolbar />;
     }
+    render(
+      <PageParamsProvider>
+        <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
+          <Component />
+        </SpanTagsProvider>
+      </PageParamsProvider>,
+      {disableRouterMocks: true}
+    );
+    const section = screen.queryByTestId('section-dataset');
+    expect(section).not.toBeInTheDocument();
+  });
+
+  it('allows changing datasets', async function () {
+    let dataset;
+    function Component() {
+      dataset = useExploreDataset();
+      return <ExploreToolbar extras={['dataset toggle']} />;
+    }
 
     render(
-      <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
-        <Component />
-      </SpanTagsProvider>,
+      <PageParamsProvider>
+        <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
+          <Component />
+        </SpanTagsProvider>
+      </PageParamsProvider>,
       {disableRouterMocks: true}
     );
 
-    const section = screen.getByTestId('section-result-mode');
+    const section = screen.getByTestId('section-dataset');
+
+    const eapSpans = within(section).getByRole('radio', {name: 'EAP Spans'});
+    const rpcSpans = within(section).getByRole('radio', {name: 'EAP RPC Spans'});
+    const indexedSpans = within(section).getByRole('radio', {name: 'Indexed Spans'});
+
+    expect(eapSpans).toBeChecked();
+    expect(rpcSpans).not.toBeChecked();
+    expect(indexedSpans).not.toBeChecked();
+    expect(dataset).toEqual(DiscoverDatasets.SPANS_EAP);
+
+    await userEvent.click(rpcSpans);
+    expect(eapSpans).not.toBeChecked();
+    expect(rpcSpans).toBeChecked();
+    expect(indexedSpans).not.toBeChecked();
+    expect(dataset).toEqual(DiscoverDatasets.SPANS_EAP_RPC);
+
+    await userEvent.click(indexedSpans);
+    expect(eapSpans).not.toBeChecked();
+    expect(rpcSpans).not.toBeChecked();
+    expect(indexedSpans).toBeChecked();
+    expect(dataset).toEqual(DiscoverDatasets.SPANS_INDEXED);
+  });
+
+  it('allows changing mode', async function () {
+    let mode;
+    function Component() {
+      mode = useExploreMode();
+      return <ExploreToolbar extras={['dataset toggle']} />;
+    }
+
+    render(
+      <PageParamsProvider>
+        <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
+          <Component />
+        </SpanTagsProvider>
+      </PageParamsProvider>,
+      {disableRouterMocks: true}
+    );
+
+    const section = screen.getByTestId('section-mode');
+
     const samples = within(section).getByRole('radio', {name: 'Samples'});
     const aggregates = within(section).getByRole('radio', {name: 'Aggregates'});
 
     expect(samples).toBeChecked();
     expect(aggregates).not.toBeChecked();
-    expect(resultMode).toEqual('samples');
+    expect(mode).toEqual(Mode.SAMPLES);
+
+    await userEvent.click(aggregates);
+    expect(samples).not.toBeChecked();
+    expect(aggregates).toBeChecked();
+    expect(mode).toEqual(Mode.AGGREGATE);
+
+    await userEvent.click(samples);
+    expect(samples).toBeChecked();
+    expect(aggregates).not.toBeChecked();
+    expect(mode).toEqual(Mode.SAMPLES);
+  });
+
+  it('inserts group bys from aggregate mode as fields in samples mode', async function () {
+    let fields, groupBys;
+    function Component() {
+      fields = useExploreFields();
+      groupBys = useExploreGroupBys();
+      return <ExploreToolbar extras={['dataset toggle']} />;
+    }
+
+    render(
+      <PageParamsProvider>
+        <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
+          <Component />
+        </SpanTagsProvider>
+      </PageParamsProvider>,
+      {disableRouterMocks: true}
+    );
+
+    const section = screen.getByTestId('section-mode');
 
-    expect(sampleFields).toEqual([
+    const samples = within(section).getByRole('radio', {name: 'Samples'});
+    const aggregates = within(section).getByRole('radio', {name: 'Aggregates'});
+
+    expect(fields).toEqual([
       'id',
       'project',
       'span.op',
@@ -61,12 +156,8 @@ describe('ExploreToolbar', function () {
       'timestamp',
     ]); // default
 
-    await userEvent.click(aggregates);
-    expect(samples).not.toBeChecked();
-    expect(aggregates).toBeChecked();
-    expect(resultMode).toEqual('aggregate');
-
     // Add a group by, and leave one unselected
+    await userEvent.click(aggregates);
     const groupBy = screen.getByTestId('section-group-by');
     await userEvent.click(within(groupBy).getByRole('button', {name: 'None'}));
     await userEvent.click(within(groupBy).getByRole('option', {name: 'release'}));
@@ -75,11 +166,7 @@ describe('ExploreToolbar', function () {
     expect(groupBys).toEqual(['release', '']);
 
     await userEvent.click(samples);
-    expect(samples).toBeChecked();
-    expect(aggregates).not.toBeChecked();
-    expect(resultMode).toEqual('samples');
-
-    expect(sampleFields).toEqual([
+    expect(fields).toEqual([
       'id',
       'project',
       'span.op',
@@ -87,20 +174,22 @@ describe('ExploreToolbar', function () {
       'span.duration',
       'timestamp',
       'release',
-    ]);
+    ]); // default
   });
 
   it('allows changing visualizes', async function () {
     let visualizes;
-
     function Component() {
-      [visualizes] = useVisualizes();
+      visualizes = useExploreVisualizes();
       return <ExploreToolbar />;
     }
+
     render(
-      <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
-        <Component />
-      </SpanTagsProvider>,
+      <PageParamsProvider>
+        <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
+          <Component />
+        </SpanTagsProvider>
+      </PageParamsProvider>,
       {disableRouterMocks: true}
     );
 
@@ -165,7 +254,7 @@ describe('ExploreToolbar', function () {
     ]);
 
     // delete first overlay
-    await userEvent.click(within(section).getAllByLabelText('Remove Overlay')[0]);
+    await userEvent.click(within(section).getAllByLabelText('Remove Overlay')[0]!);
     expect(visualizes).toEqual([
       {
         chartType: ChartType.LINE,
@@ -180,7 +269,7 @@ describe('ExploreToolbar', function () {
     ]);
 
     // delete second chart
-    await userEvent.click(within(section).getAllByLabelText('Remove Overlay')[1]);
+    await userEvent.click(within(section).getAllByLabelText('Remove Overlay')[1]!);
     expect(visualizes).toEqual([
       {
         chartType: ChartType.LINE,
@@ -193,18 +282,82 @@ describe('ExploreToolbar', function () {
     expect(within(section).getByLabelText('Remove Overlay')).toBeDisabled();
   });
 
-  it('allows changing sort by', async function () {
-    let sorts;
+  it('allows changing group bys', async function () {
+    let groupBys;
+
+    function Component() {
+      groupBys = useExploreGroupBys();
+      return <ExploreToolbar />;
+    }
+    render(
+      <PageParamsProvider>
+        <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
+          <Component />
+        </SpanTagsProvider>
+      </PageParamsProvider>,
+      {disableRouterMocks: true}
+    );
+
+    const section = screen.getByTestId('section-group-by');
+
+    expect(within(section).getByRole('button', {name: 'None'})).toBeInTheDocument();
+    expect(groupBys).toEqual(['']);
+
+    // disabled in the samples mode
+    expect(within(section).getByRole('button', {name: 'None'})).toBeDisabled();
+
+    // click the aggregates mode to enable
+    await userEvent.click(
+      within(screen.getByTestId('section-mode')).getByRole('radio', {
+        name: 'Aggregates',
+      })
+    );
 
+    expect(within(section).getByRole('button', {name: 'None'})).toBeEnabled();
+    await userEvent.click(within(section).getByRole('button', {name: 'None'}));
+    const groupByOptions1 = await within(section).findAllByRole('option');
+    expect(groupByOptions1.length).toBeGreaterThan(0);
+
+    await userEvent.click(within(section).getByRole('option', {name: 'span.op'}));
+    expect(groupBys).toEqual(['span.op']);
+
+    await userEvent.click(within(section).getByRole('button', {name: 'Add Group'}));
+    expect(groupBys).toEqual(['span.op', '']);
+
+    await userEvent.click(within(section).getByRole('button', {name: 'None'}));
+    const groupByOptions2 = await within(section).findAllByRole('option');
+    expect(groupByOptions2.length).toBeGreaterThan(0);
+
+    await userEvent.click(
+      within(section).getByRole('option', {name: 'span.description'})
+    );
+    expect(groupBys).toEqual(['span.op', 'span.description']);
+
+    await userEvent.click(within(section).getAllByLabelText('Remove Column')[0]!);
+    expect(groupBys).toEqual(['span.description']);
+
+    // only 1 left but it's not empty
+    expect(within(section).getByLabelText('Remove Column')).toBeEnabled();
+
+    await userEvent.click(within(section).getByLabelText('Remove Column'));
+    expect(groupBys).toEqual(['']);
+
+    // last one and it's empty
+    expect(within(section).getByLabelText('Remove Column')).toBeDisabled();
+  });
+
+  it('allows changing sort by', async function () {
+    let sortBys;
     function Component() {
-      const [sampleFields] = useSampleFields();
-      [sorts] = useSorts({fields: sampleFields});
+      sortBys = useExploreSortBys();
       return <ExploreToolbar />;
     }
     render(
-      <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
-        <Component />
-      </SpanTagsProvider>,
+      <PageParamsProvider>
+        <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
+          <Component />
+        </SpanTagsProvider>
+      </PageParamsProvider>,
       {disableRouterMocks: true}
     );
 
@@ -213,7 +366,7 @@ describe('ExploreToolbar', function () {
     // this is the default
     expect(within(section).getByRole('button', {name: 'timestamp'})).toBeInTheDocument();
     expect(within(section).getByRole('button', {name: 'Desc'})).toBeInTheDocument();
-    expect(sorts).toEqual([{field: 'timestamp', kind: 'desc'}]);
+    expect(sortBys).toEqual([{field: 'timestamp', kind: 'desc'}]);
 
     // check the default field options
     const fields = [
@@ -228,14 +381,14 @@ describe('ExploreToolbar', function () {
     const fieldOptions = await within(section).findAllByRole('option');
     expect(fieldOptions).toHaveLength(fields.length);
     fieldOptions.forEach((option, i) => {
-      expect(option).toHaveTextContent(fields[i]);
+      expect(option).toHaveTextContent(fields[i]!);
     });
 
     // try changing the field
     await userEvent.click(within(section).getByRole('option', {name: 'span.op'}));
     expect(within(section).getByRole('button', {name: 'span.op'})).toBeInTheDocument();
     expect(within(section).getByRole('button', {name: 'Desc'})).toBeInTheDocument();
-    expect(sorts).toEqual([{field: 'span.op', kind: 'desc'}]);
+    expect(sortBys).toEqual([{field: 'span.op', kind: 'desc'}]);
 
     // check the kind options
     await userEvent.click(within(section).getByRole('button', {name: 'Desc'}));
@@ -248,68 +401,54 @@ describe('ExploreToolbar', function () {
     await userEvent.click(within(section).getByRole('option', {name: 'Asc'}));
     expect(within(section).getByRole('button', {name: 'span.op'})).toBeInTheDocument();
     expect(within(section).getByRole('button', {name: 'Asc'})).toBeInTheDocument();
-    expect(sorts).toEqual([{field: 'span.op', kind: 'asc'}]);
+    expect(sortBys).toEqual([{field: 'span.op', kind: 'asc'}]);
   });
 
-  it('allows changing group bys', async function () {
-    let groupBys;
-
+  it('takes you to suggested query', async function () {
+    let pageParams;
     function Component() {
-      ({groupBys} = useGroupBys());
+      pageParams = useExplorePageParams();
       return <ExploreToolbar />;
     }
     render(
-      <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
-        <Component />
-      </SpanTagsProvider>,
+      <PageParamsProvider>
+        <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
+          <Component />
+        </SpanTagsProvider>
+      </PageParamsProvider>,
       {disableRouterMocks: true}
     );
 
-    const section = screen.getByTestId('section-group-by');
-
-    expect(within(section).getByRole('button', {name: 'None'})).toBeInTheDocument();
-    expect(groupBys).toEqual(['']);
-
-    // disabled in the samples mode
-    expect(within(section).getByRole('button', {name: 'None'})).toBeDisabled();
-
-    // click the aggregates mode to enable
-    await userEvent.click(
-      within(screen.getByTestId('section-result-mode')).getByRole('radio', {
-        name: 'Aggregates',
+    const section = screen.getByTestId('section-suggested-queries');
+
+    await userEvent.click(within(section).getByText('Slowest Ops'));
+    expect(pageParams).toEqual(
+      expect.objectContaining({
+        fields: [
+          'id',
+          'project',
+          'span.op',
+          'span.description',
+          'span.duration',
+          'timestamp',
+        ],
+        groupBys: ['span.op'],
+        mode: Mode.AGGREGATE,
+        query: '',
+        sortBys: [{field: 'avg(span.duration)', kind: 'desc'}],
+        visualizes: [
+          {
+            chartType: ChartType.LINE,
+            label: 'A',
+            yAxes: ['avg(span.duration)'],
+          },
+          {
+            chartType: ChartType.LINE,
+            label: 'B',
+            yAxes: ['p50(span.duration)'],
+          },
+        ],
       })
     );
-
-    expect(within(section).getByRole('button', {name: 'None'})).toBeEnabled();
-    await userEvent.click(within(section).getByRole('button', {name: 'None'}));
-    const groupByOptions1 = await within(section).findAllByRole('option');
-    expect(groupByOptions1.length).toBeGreaterThan(0);
-
-    await userEvent.click(within(section).getByRole('option', {name: 'span.op'}));
-    expect(groupBys).toEqual(['span.op']);
-
-    await userEvent.click(within(section).getByRole('button', {name: 'Add Group'}));
-    expect(groupBys).toEqual(['span.op', '']);
-
-    await userEvent.click(within(section).getByRole('button', {name: 'None'}));
-    const groupByOptions2 = await within(section).findAllByRole('option');
-    expect(groupByOptions2.length).toBeGreaterThan(0);
-
-    await userEvent.click(
-      within(section).getByRole('option', {name: 'span.description'})
-    );
-    expect(groupBys).toEqual(['span.op', 'span.description']);
-
-    await userEvent.click(within(section).getAllByLabelText('Remove Column')[0]);
-    expect(groupBys).toEqual(['span.description']);
-
-    // only 1 left but it's not empty
-    expect(within(section).getByLabelText('Remove Column')).toBeEnabled();
-
-    await userEvent.click(within(section).getByLabelText('Remove Column'));
-    expect(groupBys).toEqual(['']);
-
-    // last one and it's empty
-    expect(within(section).getByLabelText('Remove Column')).toBeDisabled();
   });
 });
diff --git a/static/app/views/explore/toolbar/index.tsx b/static/app/views/explore/toolbar/index.tsx
index 2e3b37543ff657..af5386677a5f7f 100644
--- a/static/app/views/explore/toolbar/index.tsx
+++ b/static/app/views/explore/toolbar/index.tsx
@@ -1,15 +1,20 @@
-import {useMemo} from 'react';
-
-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 {useSorts} from 'sentry/views/explore/hooks/useSorts';
-import {useVisualizes} from 'sentry/views/explore/hooks/useVisualizes';
+import {
+  useExploreDataset,
+  useExploreFields,
+  useExploreGroupBys,
+  useExploreMode,
+  useExploreSortBys,
+  useExploreVisualizes,
+  useSetExploreDataset,
+  useSetExploreMode,
+  useSetExploreSortBys,
+} from 'sentry/views/explore/contexts/pageParamsContext';
+import {Mode} from 'sentry/views/explore/contexts/pageParamsContext/mode';
 import {ToolbarDataset} from 'sentry/views/explore/toolbar/toolbarDataset';
 import {ToolbarGroupBy} from 'sentry/views/explore/toolbar/toolbarGroupBy';
-import {ToolbarResults} from 'sentry/views/explore/toolbar/toolbarResults';
+import {ToolbarMode} from 'sentry/views/explore/toolbar/toolbarMode';
 import {ToolbarSortBy} from 'sentry/views/explore/toolbar/toolbarSortBy';
+import {ToolbarSuggestedQueries} from 'sentry/views/explore/toolbar/toolbarSuggestedQueries';
 import {ToolbarVisualize} from 'sentry/views/explore/toolbar/toolbarVisualize';
 
 type Extras = 'dataset toggle';
@@ -19,48 +24,32 @@ interface ExploreToolbarProps {
 }
 
 export function ExploreToolbar({extras}: ExploreToolbarProps) {
-  const [dataset, setDataset] = useDataset({allowRPC: true});
-  const [resultMode, setResultMode] = useResultMode();
-
-  const [sampleFields] = useSampleFields();
-  const {groupBys} = useGroupBys();
-  const [visualizes] = useVisualizes();
-  const fields = useMemo(() => {
-    if (resultMode === 'samples') {
-      return sampleFields;
-    }
-
-    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});
+  const dataset = useExploreDataset();
+  const setDataset = useSetExploreDataset();
+  const mode = useExploreMode();
+  const setMode = useSetExploreMode();
+  const fields = useExploreFields();
+  const groupBys = useExploreGroupBys();
+  const visualizes = useExploreVisualizes();
+  const sortBys = useExploreSortBys();
+  const setSortBys = useSetExploreSortBys();
 
   return (
     <div>
       {extras?.includes('dataset toggle') && (
         <ToolbarDataset dataset={dataset} setDataset={setDataset} />
       )}
-      <ToolbarResults resultMode={resultMode} setResultMode={setResultMode} />
+      <ToolbarMode mode={mode} setMode={setMode} />
       <ToolbarVisualize />
-      <ToolbarGroupBy disabled={resultMode !== 'aggregate'} />
-      <ToolbarSortBy fields={fields} sorts={sorts} setSorts={setSorts} />
+      <ToolbarGroupBy disabled={mode !== Mode.AGGREGATE} />
+      <ToolbarSortBy
+        fields={fields}
+        groupBys={groupBys}
+        visualizes={visualizes}
+        sorts={sortBys}
+        setSorts={setSortBys}
+      />
+      <ToolbarSuggestedQueries />
     </div>
   );
 }
diff --git a/static/app/views/explore/toolbar/styles.tsx b/static/app/views/explore/toolbar/styles.tsx
index 7ec2e5a9009ba3..e82baa3dc3240a 100644
--- a/static/app/views/explore/toolbar/styles.tsx
+++ b/static/app/views/explore/toolbar/styles.tsx
@@ -2,6 +2,7 @@ import styled from '@emotion/styled';
 
 import {Button} from 'sentry/components/button';
 import {space} from 'sentry/styles/space';
+import {defined} from 'sentry/utils';
 
 export const ToolbarSection = styled('div')`
   margin-bottom: ${space(2)};
@@ -15,14 +16,16 @@ export const ToolbarHeader = styled('div')`
   margin-bottom: ${space(0.5)};
 `;
 
-export const ToolbarLabel = styled('h6')<{disabled?: boolean}>`
+export const ToolbarLabel = styled('h6')<{disabled?: boolean; underlined?: boolean}>`
   color: ${p => (p.disabled ? p.theme.gray300 : p.theme.gray500)};
   height: ${p => p.theme.form.md.height};
   min-height: ${p => p.theme.form.md.minHeight};
   font-size: ${p => p.theme.form.md.fontSize};
-  text-decoration: underline dotted
-    ${p => (p.disabled ? p.theme.gray300 : p.theme.gray300)};
   margin: 0;
+  ${p =>
+    !defined(p.underlined) || p.underlined
+      ? `text-decoration: underline dotted ${p.disabled ? p.theme.gray300 : p.theme.gray300}`
+      : ''};
 `;
 
 export const ToolbarHeaderButton = styled(Button)<{disabled?: boolean}>`
diff --git a/static/app/views/explore/toolbar/toolbarGroupBy.tsx b/static/app/views/explore/toolbar/toolbarGroupBy.tsx
index 89b466ef9e49b6..1e07998901d1ab 100644
--- a/static/app/views/explore/toolbar/toolbarGroupBy.tsx
+++ b/static/app/views/explore/toolbar/toolbarGroupBy.tsx
@@ -12,12 +12,16 @@ import {IconDelete} from 'sentry/icons/iconDelete';
 import {IconGrabbable} from 'sentry/icons/iconGrabbable';
 import {t} from 'sentry/locale';
 import {defined} from 'sentry/utils';
-import {useGroupBys} from 'sentry/views/explore/hooks/useGroupBys';
+import {
+  useExploreGroupBys,
+  useExploreMode,
+  useSetExploreGroupBys,
+} from 'sentry/views/explore/contexts/pageParamsContext';
+import {Mode} from 'sentry/views/explore/contexts/pageParamsContext/mode';
 
 import {DragNDropContext} from '../contexts/dragNDropContext';
 import {useSpanTags} from '../contexts/spanTagsContext';
 import type {Column} from '../hooks/useDragNDropColumns';
-import {useResultMode} from '../hooks/useResultsMode';
 
 import {
   ToolbarHeader,
@@ -33,9 +37,10 @@ interface ToolbarGroupByProps {
 
 export function ToolbarGroupBy({disabled}: ToolbarGroupByProps) {
   const tags = useSpanTags();
-  const [resultMode] = useResultMode();
+  const mode = useExploreMode();
 
-  const {groupBys, setGroupBys} = useGroupBys();
+  const groupBys = useExploreGroupBys();
+  const setGroupBys = useSetExploreGroupBys();
 
   const options: SelectOption<string>[] = useMemo(() => {
     const potentialOptions = [
@@ -68,7 +73,7 @@ export function ToolbarGroupBy({disabled}: ToolbarGroupByProps) {
           <Fragment>
             {editableColumns.map((column, i) => (
               <ColumnEditorRow
-                disabled={resultMode === 'samples'}
+                disabled={mode === Mode.SAMPLES}
                 key={column.id}
                 canDelete={
                   editableColumns.length > 1 || !['', undefined].includes(column.column)
diff --git a/static/app/views/explore/toolbar/toolbarMode.tsx b/static/app/views/explore/toolbar/toolbarMode.tsx
new file mode 100644
index 00000000000000..c6f2808b919909
--- /dev/null
+++ b/static/app/views/explore/toolbar/toolbarMode.tsx
@@ -0,0 +1,37 @@
+import styled from '@emotion/styled';
+
+import {SegmentedControl} from 'sentry/components/segmentedControl';
+import {t} from 'sentry/locale';
+import {Mode} from 'sentry/views/explore/contexts/pageParamsContext/mode';
+
+import {ToolbarRow, ToolbarSection} from './styles';
+
+interface ToolbarModeProps {
+  mode: Mode;
+  setMode: (mode: Mode) => void;
+}
+
+export function ToolbarMode({mode, setMode}: ToolbarModeProps) {
+  return (
+    <ToolbarSection data-test-id="section-mode">
+      <StyledToolbarRow>
+        <SegmentedControl aria-label={t('Result Mode')} value={mode} onChange={setMode}>
+          <SegmentedControl.Item key={Mode.SAMPLES}>{t('Samples')}</SegmentedControl.Item>
+          <SegmentedControl.Item key={Mode.AGGREGATE}>
+            {t('Aggregates')}
+          </SegmentedControl.Item>
+        </SegmentedControl>
+      </StyledToolbarRow>
+    </ToolbarSection>
+  );
+}
+
+const StyledToolbarRow = styled(ToolbarRow)`
+  > div {
+    flex-grow: 1;
+
+    > label > :last-child {
+      flex-grow: 1;
+    }
+  }
+`;
diff --git a/static/app/views/explore/toolbar/toolbarResults.tsx b/static/app/views/explore/toolbar/toolbarResults.tsx
deleted file mode 100644
index d0e538a52fa9a7..00000000000000
--- a/static/app/views/explore/toolbar/toolbarResults.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-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';
-
-import {ToolbarRow, ToolbarSection} from './styles';
-
-interface ToolbarResultsProps {
-  resultMode: ResultMode;
-  setResultMode: (newMode: ResultMode) => void;
-}
-
-export function ToolbarResults({resultMode, setResultMode}: ToolbarResultsProps) {
-  return (
-    <ToolbarSection data-test-id="section-result-mode">
-      <StyledToolbarRow>
-        <SegmentedControl
-          aria-label={t('Result Mode')}
-          value={resultMode}
-          onChange={setResultMode}
-        >
-          <SegmentedControl.Item key={'samples' as const}>
-            {t('Samples')}
-          </SegmentedControl.Item>
-          <SegmentedControl.Item key={'aggregate' as const}>
-            {t('Aggregates')}
-          </SegmentedControl.Item>
-        </SegmentedControl>
-      </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 44bbd099e94720..41231841d033d7 100644
--- a/static/app/views/explore/toolbar/toolbarSortBy.tsx
+++ b/static/app/views/explore/toolbar/toolbarSortBy.tsx
@@ -13,38 +13,62 @@ import {
   prettifyTagKey,
 } from 'sentry/utils/discover/fields';
 import {TypeBadge} from 'sentry/views/explore/components/typeBadge';
+import {useExploreMode} from 'sentry/views/explore/contexts/pageParamsContext';
+import {Mode} from 'sentry/views/explore/contexts/pageParamsContext/mode';
+import type {Visualize} from 'sentry/views/explore/contexts/pageParamsContext/visualizes';
 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';
 
 interface ToolbarSortByProps {
-  fields: Field[];
+  fields: string[];
+  groupBys: string[];
   setSorts: (newSorts: Sort[]) => void;
   sorts: Sort[];
+  visualizes: Visualize[];
 }
 
-export function ToolbarSortBy({fields, setSorts, sorts}: ToolbarSortByProps) {
-  const [resultMode] = useResultMode();
+export function ToolbarSortBy({
+  fields,
+  groupBys,
+  setSorts,
+  sorts,
+  visualizes,
+}: ToolbarSortByProps) {
+  const mode = useExploreMode();
   const [tab] = useTab();
 
   // traces table is only sorted by timestamp so disable the sort by
-  const disabled = resultMode === 'samples' && tab === Tab.TRACE;
+  const disabled = mode === Mode.SAMPLES && tab === Tab.TRACE;
 
   const numberTags = useSpanTags('number');
   const stringTags = useSpanTags('string');
 
-  const fieldOptions: SelectOption<Field>[] = useMemo(() => {
-    const uniqFields: Field[] = [];
-    for (const field of fields) {
-      if (!uniqFields.includes(field)) {
-        uniqFields.push(field);
+  const fieldOptions: SelectOption<string>[] = useMemo(() => {
+    const uniqueOptions: string[] = [];
+    if (mode === Mode.SAMPLES) {
+      for (const field of fields) {
+        if (!uniqueOptions.includes(field)) {
+          uniqueOptions.push(field);
+        }
+      }
+    } else {
+      for (const visualize of visualizes) {
+        for (const yAxis of visualize.yAxes) {
+          if (!uniqueOptions.includes(yAxis)) {
+            uniqueOptions.push(yAxis);
+          }
+        }
+      }
+      for (const groupBy of groupBys) {
+        if (!uniqueOptions.includes(groupBy)) {
+          uniqueOptions.push(groupBy);
+        }
       }
     }
 
-    const options = uniqFields.map(field => {
+    const options = uniqueOptions.filter(Boolean).map(field => {
       const tag = stringTags[field] ?? numberTags[field] ?? null;
       if (tag) {
         return {
@@ -86,7 +110,7 @@ export function ToolbarSortBy({fields, setSorts, sorts}: ToolbarSortByProps) {
     });
 
     return options;
-  }, [fields, numberTags, stringTags]);
+  }, [fields, groupBys, mode, numberTags, stringTags, visualizes]);
 
   const setSortField = useCallback(
     (i: number, {value}: SelectOption<SelectKey>) => {
diff --git a/static/app/views/explore/toolbar/toolbarSuggestedQueries.tsx b/static/app/views/explore/toolbar/toolbarSuggestedQueries.tsx
new file mode 100644
index 00000000000000..9b4e5012ac13bb
--- /dev/null
+++ b/static/app/views/explore/toolbar/toolbarSuggestedQueries.tsx
@@ -0,0 +1,341 @@
+import {useMemo} from 'react';
+import styled from '@emotion/styled';
+
+import Tag from 'sentry/components/badge/tag';
+import Panel from 'sentry/components/panels/panel';
+import {ALL_ACCESS_PROJECTS} from 'sentry/constants/pageFilters';
+import {
+  backend,
+  frontend,
+  mobile,
+  PlatformCategory,
+  serverless,
+} from 'sentry/data/platformCategories';
+import {IconClose} from 'sentry/icons/iconClose';
+import {t} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
+import type {PageFilters} from 'sentry/types/core';
+import type {Project} from 'sentry/types/project';
+import {defined} from 'sentry/utils';
+import useDismissAlert from 'sentry/utils/useDismissAlert';
+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 {
+  newExploreTarget,
+  type SuggestedQuery,
+} from 'sentry/views/explore/contexts/pageParamsContext';
+import {Mode} from 'sentry/views/explore/contexts/pageParamsContext/mode';
+import {ChartType} from 'sentry/views/insights/common/components/chart';
+
+import {ToolbarHeader, ToolbarHeaderButton, ToolbarLabel, ToolbarSection} from './styles';
+
+interface ToolbarSuggestedQueriesProps {}
+
+export function ToolbarSuggestedQueries(props: ToolbarSuggestedQueriesProps) {
+  const organization = useOrganization();
+
+  const {dismiss, isDismissed} = useDismissAlert({
+    key: `${organization.id}:metrics-empty-state-dismissed`,
+    expirationDays: 30,
+  });
+
+  if (isDismissed) {
+    return null;
+  }
+
+  return <ToolbarSuggestedQueriesInner {...props} dismiss={dismiss} />;
+}
+
+interface ToolbarSuggestedQueriesInnerProps extends ToolbarSuggestedQueriesProps {
+  dismiss: () => void;
+}
+
+function ToolbarSuggestedQueriesInner({dismiss}: ToolbarSuggestedQueriesInnerProps) {
+  const {selection} = usePageFilters();
+  const {projects} = useProjects();
+
+  const suggestedQueries: SuggestedQuery[] = useMemo(() => {
+    const counters = {
+      [PlatformCategory.FRONTEND]: 0,
+      [PlatformCategory.MOBILE]: 0,
+      [PlatformCategory.BACKEND]: 0,
+    };
+
+    for (const project of getSelectedProjectsList(selection.projects, projects)) {
+      if (!defined(project.platform)) {
+        continue;
+      }
+      if (frontend.includes(project.platform)) {
+        counters[PlatformCategory.FRONTEND] += 1;
+      } else if (mobile.includes(project.platform)) {
+        counters[PlatformCategory.MOBILE] += 1;
+      } else if (backend.includes(project.platform)) {
+        counters[PlatformCategory.BACKEND] += 1;
+      } else if (serverless.includes(project.platform)) {
+        // consider serverless as a type of backend platform
+        counters[PlatformCategory.BACKEND] += 1;
+      }
+    }
+
+    const platforms = [
+      PlatformCategory.FRONTEND,
+      PlatformCategory.MOBILE,
+      PlatformCategory.BACKEND,
+    ]
+      .filter(k => counters[k] > 0)
+      .sort((a, b) => counters[b] - counters[a]);
+
+    return getSuggestedQueries(platforms);
+  }, [selection, projects]);
+
+  return (
+    <ToolbarSection data-test-id="section-suggested-queries">
+      <StyledPanel>
+        <ToolbarHeader>
+          <ToolbarLabel underlined={false}>{t('Suggested Queries')}</ToolbarLabel>
+          <ToolbarHeaderButton
+            size="zero"
+            onClick={dismiss}
+            borderless
+            aria-label={t('Dismiss Suggested Queries')}
+            icon={<IconClose />}
+          />
+        </ToolbarHeader>
+        <div>
+          {t("Feeling like a newb? Been there, done that. Here's a few to get you goin.")}
+        </div>
+        <SuggestedQueriesContainer>
+          {suggestedQueries.map(suggestedQuery => (
+            <SuggestedQueryLink
+              key={suggestedQuery.title}
+              suggestedQuery={suggestedQuery}
+            />
+          ))}
+        </SuggestedQueriesContainer>
+      </StyledPanel>
+    </ToolbarSection>
+  );
+}
+
+interface SuggestedQueryLinkProps {
+  suggestedQuery: SuggestedQuery;
+}
+
+function SuggestedQueryLink({suggestedQuery}: SuggestedQueryLinkProps) {
+  const location = useLocation();
+  const target = useMemo(
+    () => newExploreTarget(location, suggestedQuery),
+    [location, suggestedQuery]
+  );
+
+  return (
+    <Tag to={target} icon={null} type="info">
+      {suggestedQuery.title}
+    </Tag>
+  );
+}
+
+function getSelectedProjectsList(
+  selectedProjects: PageFilters['projects'],
+  projects: Project[]
+): Project[] {
+  if (
+    selectedProjects[0] === ALL_ACCESS_PROJECTS || // all projects
+    selectedProjects.length === 0 // my projects
+  ) {
+    return projects;
+  }
+
+  const projectIds = new Set(selectedProjects.map(String));
+
+  return projects.filter(project => projectIds.has(project.id));
+}
+
+function getSuggestedQueries(platforms: PlatformCategory[], maxQueries = 5) {
+  const frontendQueries: SuggestedQuery[] = [
+    {
+      title: t('Worst LCPs'),
+      fields: [
+        'id',
+        'project',
+        'span.op',
+        'span.description',
+        'span.duration',
+        'measurements.lcp',
+      ],
+      groupBys: ['span.description'],
+      mode: Mode.AGGREGATE,
+      query: 'span.op:[pageload,navigation]',
+      sortBys: [{field: 'avg(measurements.lcp)', kind: 'desc'}],
+      visualizes: [
+        {chartType: ChartType.LINE, yAxes: ['p50(measurements.lcp)']},
+        {chartType: ChartType.LINE, yAxes: ['avg(measurements.lcp)']},
+      ],
+    },
+    {
+      title: t('Biggest Assets'),
+      fields: [
+        'id',
+        'project',
+        'span.op',
+        'span.description',
+        'span.duration',
+        'http.response_transfer_size',
+        'timestamp',
+      ],
+      groupBys: ['span.description'],
+      mode: Mode.AGGREGATE,
+      query: 'span.op:[resource.css,resource.img,resource.script]',
+      sortBys: [{field: 'p75(http.response_transfer_size)', kind: 'desc'}],
+      visualizes: [
+        {chartType: ChartType.LINE, yAxes: ['p75(http.response_transfer_size)']},
+        {chartType: ChartType.LINE, yAxes: ['p90(http.response_transfer_size)']},
+      ],
+    },
+    {
+      title: t('Top Pageloads'),
+      fields: [
+        'id',
+        'project',
+        'span.op',
+        'span.description',
+        'span.duration',
+        'timestamp',
+      ],
+      groupBys: ['span.description'],
+      mode: Mode.AGGREGATE,
+      query: 'span.op:[pageload,navigation]',
+      sortBys: [{field: 'avg(span.duration)', kind: 'desc'}],
+      visualizes: [
+        {chartType: ChartType.LINE, yAxes: ['avg(span.duration)']},
+        {chartType: ChartType.LINE, yAxes: ['p50(span.duration)']},
+      ],
+    },
+  ];
+
+  const backendQueries: SuggestedQuery[] = [
+    {
+      title: t('Slowest Server Calls'),
+      fields: [
+        'id',
+        'project',
+        'span.op',
+        'span.description',
+        'span.duration',
+        'timestamp',
+      ],
+      groupBys: ['span.description'],
+      mode: Mode.AGGREGATE,
+      query: 'span.op:http.server',
+      sortBys: [{field: 'p75(span.duration)', kind: 'desc'}],
+      visualizes: [
+        {chartType: ChartType.LINE, yAxes: ['p75(span.duration)']},
+        {chartType: ChartType.LINE, yAxes: ['p90(span.duration)']},
+      ],
+    },
+  ];
+
+  const mobileQueries: SuggestedQuery[] = [
+    {
+      title: t('Top Screenloads'),
+      fields: [
+        'id',
+        'project',
+        'span.op',
+        'span.description',
+        'span.duration',
+        'timestamp',
+      ],
+      groupBys: ['span.description'],
+      mode: Mode.AGGREGATE,
+      query: 'span.op:ui.load',
+      sortBys: [{field: 'count(span.duration)', kind: 'desc'}],
+      visualizes: [{chartType: ChartType.LINE, yAxes: ['count(span.duration)']}],
+    },
+  ];
+
+  const allQueries: Partial<Record<PlatformCategory, SuggestedQuery[]>> = {
+    [PlatformCategory.FRONTEND]: frontendQueries,
+    [PlatformCategory.BACKEND]: backendQueries,
+    [PlatformCategory.MOBILE]: mobileQueries,
+  };
+
+  const genericQueries: SuggestedQuery[] = [
+    {
+      title: t('Slowest Ops'),
+      fields: [
+        'id',
+        'project',
+        'span.op',
+        'span.description',
+        'span.duration',
+        'timestamp',
+      ],
+      groupBys: ['span.op'],
+      mode: Mode.AGGREGATE,
+      query: '',
+      sortBys: [{field: 'avg(span.duration)', kind: 'desc'}],
+      visualizes: [
+        {chartType: ChartType.LINE, yAxes: ['avg(span.duration)']},
+        {chartType: ChartType.LINE, yAxes: ['p50(span.duration)']},
+      ],
+    },
+    {
+      title: t('Database Latency'),
+      fields: [
+        'id',
+        'project',
+        'span.op',
+        'span.description',
+        'span.duration',
+        'db.system',
+      ],
+      groupBys: ['span.op', 'db.system'],
+      mode: Mode.AGGREGATE,
+      query: 'span.op:db',
+      sortBys: [{field: 'avg(span.duration)', kind: 'desc'}],
+      visualizes: [
+        {chartType: ChartType.LINE, yAxes: ['avg(span.duration)']},
+        {chartType: ChartType.LINE, yAxes: ['p50(span.duration)']},
+      ],
+    },
+  ];
+
+  const queries: SuggestedQuery[] = [];
+
+  for (const platform of platforms) {
+    for (const query of allQueries[platform] || []) {
+      queries.push(query);
+      if (queries.length >= maxQueries) {
+        return queries;
+      }
+    }
+  }
+
+  for (const query of genericQueries) {
+    queries.push(query);
+    if (queries.length >= maxQueries) {
+      return queries;
+    }
+  }
+
+  return queries;
+}
+
+const StyledPanel = styled(Panel)`
+  padding: ${space(2)};
+  background: linear-gradient(
+    269.35deg,
+    ${p => p.theme.backgroundTertiary} 0.32%,
+    rgba(245, 243, 247, 0) 99.69%
+  );
+`;
+
+const SuggestedQueriesContainer = styled('div')`
+  display: flex;
+  flex-wrap: wrap;
+  gap: ${space(1)};
+  margin-top: ${space(2)};
+`;
diff --git a/static/app/views/explore/toolbar/toolbarVisualize.tsx b/static/app/views/explore/toolbar/toolbarVisualize.tsx
index 95090a13620437..47cb2c4b22d0b3 100644
--- a/static/app/views/explore/toolbar/toolbarVisualize.tsx
+++ b/static/app/views/explore/toolbar/toolbarVisualize.tsx
@@ -12,13 +12,16 @@ import {defined} from 'sentry/utils';
 import type {ParsedFunction} 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 {
+  useExploreVisualizes,
+  useSetExploreVisualizes,
+} from 'sentry/views/explore/contexts/pageParamsContext';
+import type {Visualize} from 'sentry/views/explore/contexts/pageParamsContext/visualizes';
 import {
   DEFAULT_VISUALIZATION,
   MAX_VISUALIZES,
-  useVisualizes,
-} from 'sentry/views/explore/hooks/useVisualizes';
+} from 'sentry/views/explore/contexts/pageParamsContext/visualizes';
+import {useSpanTags} from 'sentry/views/explore/contexts/spanTagsContext';
 import {ChartType} from 'sentry/views/insights/common/components/chart';
 
 import {
@@ -39,7 +42,8 @@ type ParsedVisualize = {
 interface ToolbarVisualizeProps {}
 
 export function ToolbarVisualize({}: ToolbarVisualizeProps) {
-  const [visualizes, setVisualizes] = useVisualizes();
+  const visualizes = useExploreVisualizes();
+  const setVisualizes = useSetExploreVisualizes();
 
   const numberTags = useSpanTags('number');
 
@@ -118,7 +122,7 @@ export function ToolbarVisualize({}: ToolbarVisualizeProps) {
   const addOverlay = useCallback(
     (group: number) => {
       const newVisualizes = visualizes.slice();
-      newVisualizes[group].yAxes.push(DEFAULT_VISUALIZATION);
+      newVisualizes[group]!.yAxes.push(DEFAULT_VISUALIZATION);
       setVisualizes(newVisualizes);
     },
     [setVisualizes, visualizes]
@@ -127,8 +131,8 @@ export function ToolbarVisualize({}: ToolbarVisualizeProps) {
   const setChartField = useCallback(
     (group: number, index: number, {value}: SelectOption<SelectKey>) => {
       const newVisualizes = visualizes.slice();
-      newVisualizes[group].yAxes[index] =
-        `${parsedVisualizeGroups[group][index].func.name}(${value})`;
+      newVisualizes[group]!.yAxes[index] =
+        `${parsedVisualizeGroups[group]![index]!.func.name}(${value})`;
       setVisualizes(newVisualizes);
     },
     [parsedVisualizeGroups, setVisualizes, visualizes]
@@ -137,8 +141,8 @@ export function ToolbarVisualize({}: ToolbarVisualizeProps) {
   const setChartAggregate = useCallback(
     (group: number, index: number, {value}: SelectOption<SelectKey>) => {
       const newVisualizes = visualizes.slice();
-      newVisualizes[group].yAxes[index] =
-        `${value}(${parsedVisualizeGroups[group][index].func.arguments[0]})`;
+      newVisualizes[group]!.yAxes[index] =
+        `${value}(${parsedVisualizeGroups[group]![index]!.func.arguments[0]})`;
       setVisualizes(newVisualizes);
     },
     [parsedVisualizeGroups, setVisualizes, visualizes]
diff --git a/static/app/views/explore/utils.tsx b/static/app/views/explore/utils.tsx
new file mode 100644
index 00000000000000..0827ec99e64947
--- /dev/null
+++ b/static/app/views/explore/utils.tsx
@@ -0,0 +1,51 @@
+import * as qs from 'query-string';
+
+import type {PageFilters} from 'sentry/types/core';
+import {DiscoverDatasets} from 'sentry/utils/discover/types';
+import normalizeUrl from 'sentry/utils/url/normalizeUrl';
+import type {Mode} from 'sentry/views/explore/contexts/pageParamsContext/mode';
+import type {Visualize} from 'sentry/views/explore/contexts/pageParamsContext/visualizes';
+
+export function getExploreUrl({
+  orgSlug,
+  selection,
+  interval,
+  mode,
+  visualize,
+  query,
+  groupBy,
+  sort,
+  field,
+}: {
+  interval: string;
+  orgSlug: string;
+  selection: PageFilters;
+  visualize: Omit<Visualize, 'label'>[];
+  field?: string[];
+  groupBy?: string[];
+  mode?: Mode;
+  query?: string;
+  sort?: string;
+}) {
+  const {start, end, period: statsPeriod, utc} = selection.datetime;
+  const {environments, projects} = selection;
+  const queryParams = {
+    dataset: DiscoverDatasets.SPANS_EAP_RPC,
+    project: projects,
+    environment: environments,
+    statsPeriod,
+    start,
+    end,
+    interval,
+    mode,
+    query,
+    visualize: visualize.map(v => JSON.stringify(v)),
+    groupBy,
+    sort,
+    field,
+    utc,
+  };
+  return normalizeUrl(
+    `/organizations/${orgSlug}/traces/?${qs.stringify(queryParams, {skipNull: true})}`
+  );
+}
diff --git a/static/app/views/insights/browser/common/queries/useResourcesQuery.ts b/static/app/views/insights/browser/common/queries/useResourcesQuery.ts
index 7ce7f2f389a408..b2faade18eec51 100644
--- a/static/app/views/insights/browser/common/queries/useResourcesQuery.ts
+++ b/static/app/views/insights/browser/common/queries/useResourcesQuery.ts
@@ -122,12 +122,12 @@ export const useResourcesQuery = ({
   });
 
   const data = result?.data?.data.map(row => ({
-    [SPAN_OP]: row[SPAN_OP].toString() as `resource.${string}`,
-    [SPAN_DESCRIPTION]: row[SPAN_DESCRIPTION].toString(),
+    [SPAN_OP]: row[SPAN_OP]!.toString() as `resource.${string}`,
+    [SPAN_DESCRIPTION]: row[SPAN_DESCRIPTION]!.toString(),
     ['avg(span.self_time)']: row[`avg(${SPAN_SELF_TIME})`] as number,
     'count()': row['count()'] as number,
     'spm()': row['spm()'] as number,
-    [SPAN_GROUP]: row[SPAN_GROUP].toString(),
+    [SPAN_GROUP]: row[SPAN_GROUP]!.toString(),
     [PROJECT_ID]: row[PROJECT_ID] as number,
     [`avg(http.response_content_length)`]: row[
       `avg(${HTTP_RESPONSE_CONTENT_LENGTH})`
diff --git a/static/app/views/insights/browser/resources/components/charts/assetSizeChart.tsx b/static/app/views/insights/browser/resources/components/charts/assetSizeChart.tsx
new file mode 100644
index 00000000000000..1f0a942098645d
--- /dev/null
+++ b/static/app/views/insights/browser/resources/components/charts/assetSizeChart.tsx
@@ -0,0 +1,39 @@
+import {tct} from 'sentry/locale';
+import type {Series} from 'sentry/types/echarts';
+import {formatBytesBase2} from 'sentry/utils/bytes/formatBytesBase2';
+import getDynamicText from 'sentry/utils/getDynamicText';
+import {DATA_TYPE} from 'sentry/views/insights/browser/resources/settings';
+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 {DataTitles} from 'sentry/views/insights/common/views/spans/types';
+
+interface Props {
+  isLoading: boolean;
+  series: Series[];
+  error?: Error | null;
+}
+
+export function AssetSizeChart({series, isLoading}: Props) {
+  return (
+    <ChartPanel title={tct('Average [dataType] Size', {dataType: DATA_TYPE})}>
+      <Chart
+        height={160}
+        aggregateOutputFormat="size"
+        data={series}
+        loading={isLoading}
+        chartColors={[AVG_COLOR]}
+        type={ChartType.LINE}
+        definedAxisTicks={4}
+        tooltipFormatterOptions={{
+          valueFormatter: bytes =>
+            getDynamicText({
+              value: formatBytesBase2(bytes),
+              fixed: 'xx KiB',
+            }),
+          nameFormatter: name => DataTitles[name],
+        }}
+      />
+    </ChartPanel>
+  );
+}
diff --git a/static/app/views/insights/browser/resources/components/charts/durationChart.tsx b/static/app/views/insights/browser/resources/components/charts/durationChart.tsx
new file mode 100644
index 00000000000000..f635c78d3e3ba2
--- /dev/null
+++ b/static/app/views/insights/browser/resources/components/charts/durationChart.tsx
@@ -0,0 +1,33 @@
+import type {Series} from 'sentry/types/echarts';
+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 {CHART_HEIGHT} from 'sentry/views/insights/database/settings';
+
+interface Props {
+  isLoading: boolean;
+  series: Series[];
+  error?: Error | null;
+}
+
+export function DurationChart({series, isLoading, error}: Props) {
+  return (
+    <ChartPanel title={getDurationChartTitle('resource')}>
+      <Chart
+        height={CHART_HEIGHT}
+        grid={{
+          left: '0',
+          right: '0',
+          top: '8px',
+          bottom: '0',
+        }}
+        data={series}
+        loading={isLoading}
+        error={error}
+        chartColors={[AVG_COLOR]}
+        type={ChartType.LINE}
+      />
+    </ChartPanel>
+  );
+}
diff --git a/static/app/views/insights/browser/resources/components/charts/resourceLandingPageCharts.tsx b/static/app/views/insights/browser/resources/components/charts/resourceLandingPageCharts.tsx
new file mode 100644
index 00000000000000..3b11f3ac0943a0
--- /dev/null
+++ b/static/app/views/insights/browser/resources/components/charts/resourceLandingPageCharts.tsx
@@ -0,0 +1,82 @@
+import styled from '@emotion/styled';
+
+import {space} from 'sentry/styles/space';
+import {EMPTY_OPTION_VALUE, MutableSearch} from 'sentry/utils/tokenizeSearch';
+import {useSynchronizeCharts} from 'sentry/views/insights/common/components/chart';
+import {useSpanMetricsSeries} from 'sentry/views/insights/common/queries/useDiscoverSeries';
+import type {ModuleFilters} from 'sentry/views/insights/common/views/spans/useModuleFilters';
+import {SpanMetricsField} from 'sentry/views/insights/types';
+
+import {DurationChart} from './durationChart';
+import {ThroughputChart} from './throughputChart';
+
+const {SPAN_SELF_TIME, SPAN_DESCRIPTION, SPAN_DOMAIN} = SpanMetricsField;
+
+type Props = {
+  appliedFilters: ModuleFilters;
+  extraQuery?: string[];
+};
+
+export function ResourceLandingPageCharts({appliedFilters, extraQuery}: Props) {
+  let query: string = buildDiscoverQueryConditions(appliedFilters);
+
+  if (extraQuery) {
+    query += ` ${extraQuery.join(' ')}`;
+  }
+
+  const {data, isPending, error} = useSpanMetricsSeries(
+    {
+      search: new MutableSearch(query),
+      yAxis: ['spm()', `avg(${SPAN_SELF_TIME})`],
+    },
+    'api.starfish.span-time-charts'
+  );
+
+  useSynchronizeCharts(1, !isPending);
+
+  return (
+    <ChartsContainer>
+      <ChartsContainerItem>
+        <ThroughputChart series={data['spm()']} isLoading={isPending} error={error} />
+      </ChartsContainerItem>
+
+      <ChartsContainerItem>
+        <DurationChart
+          series={[data[`avg(${SPAN_SELF_TIME})`]]}
+          isLoading={isPending}
+          error={error}
+        />
+      </ChartsContainerItem>
+    </ChartsContainer>
+  );
+}
+
+const SPAN_FILTER_KEYS = ['span_operation', SPAN_DOMAIN, 'action'];
+
+const buildDiscoverQueryConditions = (appliedFilters: ModuleFilters) => {
+  const result = Object.keys(appliedFilters)
+    .filter(key => SPAN_FILTER_KEYS.includes(key))
+    .filter(key => Boolean(appliedFilters[key]))
+    .map(key => {
+      const value = appliedFilters[key];
+      if (key === SPAN_DOMAIN && value === EMPTY_OPTION_VALUE) {
+        return [`!has:${SPAN_DOMAIN}`];
+      }
+      return `${key}:${value}`;
+    });
+
+  result.push(`has:${SPAN_DESCRIPTION}`);
+
+  return result.join(' ');
+};
+
+const ChartsContainer = styled('div')`
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  gap: ${space(2)};
+`;
+
+const ChartsContainerItem = styled('div')`
+  flex: 1;
+`;
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 a12e2f86dccb91..c939e9035c3675 100644
--- a/static/app/views/insights/browser/resources/components/charts/resourceSummaryCharts.tsx
+++ b/static/app/views/insights/browser/resources/components/charts/resourceSummaryCharts.tsx
@@ -1,28 +1,16 @@
 import {Fragment} from 'react';
 
-import {t, tct} from 'sentry/locale';
-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 {Referrer} from 'sentry/views/insights/browser/resources/referrer';
-import {
-  DATA_TYPE,
-  RESOURCE_THROUGHPUT_UNIT,
-} from 'sentry/views/insights/browser/resources/settings';
 import {useResourceModuleFilters} from 'sentry/views/insights/browser/resources/utils/useResourceFilters';
-import {AVG_COLOR, 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 * as ModuleLayout from 'sentry/views/insights/common/components/moduleLayout';
 import {useSpanMetricsSeries} from 'sentry/views/insights/common/queries/useDiscoverSeries';
-import {
-  DataTitles,
-  getDurationChartTitle,
-  getThroughputChartTitle,
-} from 'sentry/views/insights/common/views/spans/types';
 import {SpanMetricsField} from 'sentry/views/insights/types';
 
+import {AssetSizeChart} from './assetSizeChart';
+import {DurationChart} from './durationChart';
+import {ThroughputChart} from './throughputChart';
+
 const {
   SPAN_SELF_TIME,
   HTTP_RESPONSE_CONTENT_LENGTH,
@@ -76,62 +64,28 @@ function ResourceSummaryCharts(props: {groupId: string}) {
   return (
     <Fragment>
       <ModuleLayout.Third>
-        <ChartPanel title={getThroughputChartTitle('http', RESOURCE_THROUGHPUT_UNIT)}>
-          <Chart
-            height={160}
-            data={[spanMetricsSeriesData?.[`spm()`]]}
-            loading={areSpanMetricsSeriesLoading}
-            type={ChartType.LINE}
-            definedAxisTicks={4}
-            aggregateOutputFormat="rate"
-            rateUnit={RESOURCE_THROUGHPUT_UNIT}
-            stacked
-            chartColors={[THROUGHPUT_COLOR]}
-            tooltipFormatterOptions={{
-              valueFormatter: value => formatRate(value, RESOURCE_THROUGHPUT_UNIT),
-              nameFormatter: () => t('Requests'),
-            }}
-          />
-        </ChartPanel>
+        <ThroughputChart
+          series={spanMetricsSeriesData?.[`spm()`]}
+          isLoading={areSpanMetricsSeriesLoading}
+        />
       </ModuleLayout.Third>
 
       <ModuleLayout.Third>
-        <ChartPanel title={getDurationChartTitle('http')}>
-          <Chart
-            height={160}
-            data={[spanMetricsSeriesData?.[`avg(${SPAN_SELF_TIME})`]]}
-            loading={areSpanMetricsSeriesLoading}
-            chartColors={[AVG_COLOR]}
-            type={ChartType.LINE}
-            definedAxisTicks={4}
-          />
-        </ChartPanel>
+        <DurationChart
+          series={[spanMetricsSeriesData?.[`avg(${SPAN_SELF_TIME})`]]}
+          isLoading={areSpanMetricsSeriesLoading}
+        />
       </ModuleLayout.Third>
 
       <ModuleLayout.Third>
-        <ChartPanel title={tct('Average [dataType] Size', {dataType: DATA_TYPE})}>
-          <Chart
-            height={160}
-            aggregateOutputFormat="size"
-            data={[
-              spanMetricsSeriesData?.[`avg(${HTTP_DECODED_RESPONSE_CONTENT_LENGTH})`],
-              spanMetricsSeriesData?.[`avg(${HTTP_RESPONSE_TRANSFER_SIZE})`],
-              spanMetricsSeriesData?.[`avg(${HTTP_RESPONSE_CONTENT_LENGTH})`],
-            ]}
-            loading={areSpanMetricsSeriesLoading}
-            chartColors={[AVG_COLOR]}
-            type={ChartType.LINE}
-            definedAxisTicks={4}
-            tooltipFormatterOptions={{
-              valueFormatter: bytes =>
-                getDynamicText({
-                  value: formatBytesBase2(bytes),
-                  fixed: 'xx KiB',
-                }),
-              nameFormatter: name => DataTitles[name],
-            }}
-          />
-        </ChartPanel>
+        <AssetSizeChart
+          series={[
+            spanMetricsSeriesData?.[`avg(${HTTP_DECODED_RESPONSE_CONTENT_LENGTH})`],
+            spanMetricsSeriesData?.[`avg(${HTTP_RESPONSE_TRANSFER_SIZE})`],
+            spanMetricsSeriesData?.[`avg(${HTTP_RESPONSE_CONTENT_LENGTH})`],
+          ]}
+          isLoading={areSpanMetricsSeriesLoading}
+        />
       </ModuleLayout.Third>
     </Fragment>
   );
diff --git a/static/app/views/insights/browser/resources/components/charts/throughputChart.tsx b/static/app/views/insights/browser/resources/components/charts/throughputChart.tsx
new file mode 100644
index 00000000000000..eb1eaab0d31a57
--- /dev/null
+++ b/static/app/views/insights/browser/resources/components/charts/throughputChart.tsx
@@ -0,0 +1,41 @@
+import type {Series} from 'sentry/types/echarts';
+import {RateUnit} from 'sentry/utils/discover/fields';
+import {formatRate} from 'sentry/utils/formatters';
+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 {CHART_HEIGHT} from 'sentry/views/insights/database/settings';
+
+import {RESOURCE_THROUGHPUT_UNIT} from '../../settings';
+
+interface Props {
+  isLoading: boolean;
+  series: Series;
+  error?: Error | null;
+}
+
+export function ThroughputChart({series, isLoading}: Props) {
+  return (
+    <ChartPanel title={getThroughputChartTitle('resource', RESOURCE_THROUGHPUT_UNIT)}>
+      <Chart
+        height={CHART_HEIGHT}
+        grid={{
+          left: '0',
+          right: '0',
+          top: '8px',
+          bottom: '0',
+        }}
+        data={[series]}
+        loading={isLoading}
+        chartColors={[THROUGHPUT_COLOR]}
+        type={ChartType.LINE}
+        aggregateOutputFormat="rate"
+        rateUnit={RateUnit.PER_MINUTE}
+        tooltipFormatterOptions={{
+          valueFormatter: value => formatRate(value, RESOURCE_THROUGHPUT_UNIT),
+        }}
+      />
+    </ChartPanel>
+  );
+}
diff --git a/static/app/views/insights/browser/resources/components/renderBlockingSelector.tsx b/static/app/views/insights/browser/resources/components/renderBlockingSelector.tsx
index 7eb72421f53f92..09422a63792f50 100644
--- a/static/app/views/insights/browser/resources/components/renderBlockingSelector.tsx
+++ b/static/app/views/insights/browser/resources/components/renderBlockingSelector.tsx
@@ -1,8 +1,8 @@
 import {CompactSelect} from 'sentry/components/compactSelect';
 import {t} from 'sentry/locale';
 import {trackAnalytics} from 'sentry/utils/analytics';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import {QueryParameterNames} from 'sentry/views/insights/common/views/queryParameters';
 import {SpanMetricsField} from 'sentry/views/insights/types';
@@ -10,6 +10,7 @@ import {SpanMetricsField} from 'sentry/views/insights/types';
 const {RESOURCE_RENDER_BLOCKING_STATUS} = SpanMetricsField;
 
 function RenderBlockingSelector({value}: {value?: string}) {
+  const navigate = useNavigate();
   const location = useLocation();
   const organization = useOrganization();
 
@@ -29,7 +30,7 @@ function RenderBlockingSelector({value}: {value?: string}) {
           organization,
           filter: newValue?.value,
         });
-        browserHistory.push({
+        navigate({
           ...location,
           query: {
             ...location.query,
diff --git a/static/app/views/insights/browser/resources/components/resourceView.tsx b/static/app/views/insights/browser/resources/components/resourceView.tsx
index 665fa0a8dac477..3bd5817bba5484 100644
--- a/static/app/views/insights/browser/resources/components/resourceView.tsx
+++ b/static/app/views/insights/browser/resources/components/resourceView.tsx
@@ -5,8 +5,8 @@ import {CompactSelect} from 'sentry/components/compactSelect';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import {trackAnalytics} from 'sentry/utils/analytics';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import {getResourceTypeFilter} from 'sentry/views/insights/browser/common/queries/useResourcesQuery';
 import RenderBlockingSelector from 'sentry/views/insights/browser/resources/components/renderBlockingSelector';
@@ -15,10 +15,7 @@ import {
   FONT_FILE_EXTENSIONS,
   IMAGE_FILE_EXTENSIONS,
 } from 'sentry/views/insights/browser/resources/constants';
-import {
-  DEFAULT_RESOURCE_TYPES,
-  RESOURCE_THROUGHPUT_UNIT,
-} from 'sentry/views/insights/browser/resources/settings';
+import {DEFAULT_RESOURCE_TYPES} from 'sentry/views/insights/browser/resources/settings';
 import {ResourceSpanOps} from 'sentry/views/insights/browser/resources/types';
 import {
   BrowserStarfishFields,
@@ -27,9 +24,9 @@ import {
 import {useResourceSort} from 'sentry/views/insights/browser/resources/utils/useResourceSort';
 import {QueryParameterNames} from 'sentry/views/insights/common/views/queryParameters';
 import {TransactionSelector} from 'sentry/views/insights/common/views/spans/selectors/transactionSelector';
-import {SpanTimeCharts} from 'sentry/views/insights/common/views/spans/spanTimeCharts';
 import type {ModuleFilters} from 'sentry/views/insights/common/views/spans/useModuleFilters';
-import {ModuleName} from 'sentry/views/insights/types';
+
+import {ResourceLandingPageCharts} from './charts/resourceLandingPageCharts';
 
 const {
   SPAN_OP: RESOURCE_TYPE,
@@ -63,10 +60,8 @@ function ResourceView() {
   return (
     <Fragment>
       <SpanTimeChartsContainer>
-        <SpanTimeCharts
-          moduleName={ModuleName.RESOURCE}
+        <ResourceLandingPageCharts
           appliedFilters={spanTimeChartsFilters}
-          throughputUnit={RESOURCE_THROUGHPUT_UNIT}
           extraQuery={extraQuery}
         />
       </SpanTimeChartsContainer>
@@ -85,6 +80,7 @@ function ResourceView() {
 }
 
 function ResourceTypeSelector({value}: {value?: string}) {
+  const navigate = useNavigate();
   const location = useLocation();
   const organization = useOrganization();
   const hasImageView = organization.features.includes('insights-initial-modules');
@@ -118,7 +114,7 @@ function ResourceTypeSelector({value}: {value?: string}) {
           organization,
           filter: newValue?.value,
         });
-        browserHistory.push({
+        navigate({
           ...location,
           query: {
             ...location.query,
diff --git a/static/app/views/insights/browser/resources/components/sampleImages.spec.tsx b/static/app/views/insights/browser/resources/components/sampleImages.spec.tsx
index 0ed22a91c8667f..3eb59496cd4fdd 100644
--- a/static/app/views/insights/browser/resources/components/sampleImages.spec.tsx
+++ b/static/app/views/insights/browser/resources/components/sampleImages.spec.tsx
@@ -53,7 +53,7 @@ describe('SampleImages', function () {
       render(<SampleImages groupId="group123" projectId={2} />, {organization});
       await waitForElementToBeRemoved(() => screen.queryAllByTestId('loading-indicator'));
       expect(screen.queryByTestId('sample-image')).not.toBeInTheDocument();
-      expect(screen.queryByTestId('enable-sample-images-button')).toBeInTheDocument();
+      expect(screen.getByTestId('enable-sample-images-button')).toBeInTheDocument();
     });
   });
 });
diff --git a/static/app/views/insights/browser/resources/components/sampleImages.tsx b/static/app/views/insights/browser/resources/components/sampleImages.tsx
index a5c30b1f42599b..30c39336cad9b0 100644
--- a/static/app/views/insights/browser/resources/components/sampleImages.tsx
+++ b/static/app/views/insights/browser/resources/components/sampleImages.tsx
@@ -53,7 +53,7 @@ function SampleImages({groupId, projectId}: Props) {
 
   const filteredResources = imageResources
     .filter(resource => {
-      const fileName = getFileNameFromDescription(resource[SPAN_DESCRIPTION]);
+      const fileName = getFileNameFromDescription(resource[SPAN_DESCRIPTION]!);
       if (uniqueResources.has(fileName)) {
         return false;
       }
@@ -126,11 +126,11 @@ function SampleImagesChartPanelBody(props: {
     <ImageWrapper>
       {images.map(resource => {
         const hasRawDomain = Boolean(resource[RAW_DOMAIN]);
-        const isRelativeUrl = resource[SPAN_DESCRIPTION].startsWith('/');
-        let src = resource[SPAN_DESCRIPTION];
+        const isRelativeUrl = resource[SPAN_DESCRIPTION]!.startsWith('/');
+        let src = resource[SPAN_DESCRIPTION]!;
         if (isRelativeUrl && hasRawDomain) {
           try {
-            const url = new URL(resource[SPAN_DESCRIPTION], resource[RAW_DOMAIN]);
+            const url = new URL(resource[SPAN_DESCRIPTION]!, resource[RAW_DOMAIN]!);
             src = url.href;
           } catch {
             Sentry.setContext('resource', {
@@ -146,7 +146,7 @@ function SampleImagesChartPanelBody(props: {
           <ImageContainer
             src={src}
             showImage={isImagesEnabled}
-            fileName={getFileNameFromDescription(resource[SPAN_DESCRIPTION])}
+            fileName={getFileNameFromDescription(resource[SPAN_DESCRIPTION]!)}
             size={resource[`measurements.${HTTP_RESPONSE_CONTENT_LENGTH}`]}
             key={resource[SPAN_DESCRIPTION]}
           />
@@ -156,16 +156,21 @@ function SampleImagesChartPanelBody(props: {
   );
 }
 
-function DisabledImages(props: {onClickShowLinks?: () => void}) {
+export function DisabledImages(props: {
+  onClickShowLinks?: () => void;
+  projectSlug?: string;
+}) {
   const {onClickShowLinks} = props;
   const organization = useOrganization();
   const {
     selection: {projects: selectedProjects},
   } = usePageFilters();
   const {projects} = useProjects();
-  const firstProjectSelected = projects.find(
-    project => project.id === selectedProjects[0].toString()
-  );
+  const firstProjectSelected = props.projectSlug
+    ? {
+        slug: props.projectSlug,
+      }
+    : projects.find(project => project.id === selectedProjects[0]?.toString());
 
   return (
     <div>
@@ -244,7 +249,7 @@ function ImageContainer(props: {
   );
 }
 
-function MissingImage() {
+export function MissingImage() {
   const theme = useTheme();
 
   return (
diff --git a/static/app/views/insights/browser/resources/components/tables/resourceSummaryTable.tsx b/static/app/views/insights/browser/resources/components/tables/resourceSummaryTable.tsx
index 37a1338e4c41a3..22b0f0d98895ff 100644
--- a/static/app/views/insights/browser/resources/components/tables/resourceSummaryTable.tsx
+++ b/static/app/views/insights/browser/resources/components/tables/resourceSummaryTable.tsx
@@ -8,9 +8,9 @@ import type {CursorHandler} from 'sentry/components/pagination';
 import Pagination from 'sentry/components/pagination';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {decodeScalar} from 'sentry/utils/queryString';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import {useParams} from 'sentry/utils/useParams';
 import {useResourcePagesQuery} from 'sentry/views/insights/browser/resources/queries/useResourcePageQuery';
 import {RESOURCE_THROUGHPUT_UNIT} from 'sentry/views/insights/browser/resources/settings';
@@ -52,12 +52,13 @@ type Row = {
 type Column = GridColumnHeader<keyof Row>;
 
 function ResourceSummaryTable() {
+  const navigate = useNavigate();
   const location = useLocation();
   const {groupId} = useParams();
   const sort = useResourceSummarySort();
   const filters = useResourceModuleFilters();
   const cursor = decodeScalar(location.query?.[QueryParameterNames.PAGES_CURSOR]);
-  const {data, isPending, pageLinks} = useResourcePagesQuery(groupId, {
+  const {data, isPending, pageLinks} = useResourcePagesQuery(groupId!, {
     sort,
     cursor,
     subregions: filters[USER_GEO_SUBREGION],
@@ -159,7 +160,7 @@ function ResourceSummaryTable() {
   };
 
   const handleCursor: CursorHandler = (newCursor, pathname, query) => {
-    browserHistory.push({
+    navigate({
       pathname,
       query: {...query, [QueryParameterNames.PAGES_CURSOR]: newCursor},
     });
@@ -173,7 +174,7 @@ function ResourceSummaryTable() {
         columnOrder={columnOrder}
         columnSortBy={[
           {
-            key: sort.field,
+            key: sort.field as keyof Row,
             order: sort.kind,
           },
         ]}
diff --git a/static/app/views/insights/browser/resources/components/tables/resourceTable.tsx b/static/app/views/insights/browser/resources/components/tables/resourceTable.tsx
index 78f36409656810..8747f9ac306956 100644
--- a/static/app/views/insights/browser/resources/components/tables/resourceTable.tsx
+++ b/static/app/views/insights/browser/resources/components/tables/resourceTable.tsx
@@ -10,10 +10,10 @@ import {IconImage} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import {trackAnalytics} from 'sentry/utils/analytics';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {DismissId, usePageAlert} from 'sentry/utils/performance/contexts/pageAlert';
 import {decodeScalar} from 'sentry/utils/queryString';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import {useResourcesQuery} from 'sentry/views/insights/browser/common/queries/useResourcesQuery';
 import {
@@ -77,6 +77,7 @@ type Props = {
 };
 
 function ResourceTable({sort, defaultResourceTypes}: Props) {
+  const navigate = useNavigate();
   const location = useLocation();
   const organization = useOrganization();
   const cursor = decodeScalar(location.query?.[QueryParameterNames.SPANS_CURSOR]);
@@ -187,7 +188,7 @@ function ResourceTable({sort, defaultResourceTypes}: Props) {
   };
 
   const handleCursor: CursorHandler = (newCursor, pathname, query) => {
-    browserHistory.push({
+    navigate({
       pathname,
       query: {...query, [QueryParameterNames.SPANS_CURSOR]: newCursor},
     });
diff --git a/static/app/views/insights/browser/resources/queries/useResourcePagesQuery.ts b/static/app/views/insights/browser/resources/queries/useResourcePagesQuery.ts
index 40c78defcf606c..d185ae48fa2ba5 100644
--- a/static/app/views/insights/browser/resources/queries/useResourcePagesQuery.ts
+++ b/static/app/views/insights/browser/resources/queries/useResourcePagesQuery.ts
@@ -57,6 +57,6 @@ export const useResourcePagesQuery = (
     limit: 100,
   });
 
-  const pages = result?.data?.data.map(row => row.transaction.toString()).sort() || [];
+  const pages = result?.data?.data.map(row => row.transaction!.toString()).sort() || [];
   return {...result, data: pages};
 };
diff --git a/static/app/views/insights/browser/resources/utils/useResourceSort.ts b/static/app/views/insights/browser/resources/utils/useResourceSort.ts
index 600336f9fda28f..085096c4f68248 100644
--- a/static/app/views/insights/browser/resources/utils/useResourceSort.ts
+++ b/static/app/views/insights/browser/resources/utils/useResourceSort.ts
@@ -34,7 +34,7 @@ export function useResourceSort(
   const location = useLocation<Query>();
 
   return (
-    decodeSorts(location.query[sortParameterName]).filter(isAValidSort)[0] ?? fallback
+    decodeSorts(location.query[sortParameterName]).filter(isAValidSort)[0]! ?? fallback
   );
 }
 
diff --git a/static/app/views/insights/browser/resources/views/resourceSummaryPage.tsx b/static/app/views/insights/browser/resources/views/resourceSummaryPage.tsx
index 56a14b0b86afbb..a82dc06d91efcc 100644
--- a/static/app/views/insights/browser/resources/views/resourceSummaryPage.tsx
+++ b/static/app/views/insights/browser/resources/views/resourceSummaryPage.tsx
@@ -127,11 +127,14 @@ function ResourceSummary() {
 
               {isImage && (
                 <ModuleLayout.Full>
-                  <SampleImages groupId={groupId} projectId={data?.[0]?.['project.id']} />
+                  <SampleImages
+                    groupId={groupId!}
+                    projectId={data?.[0]?.['project.id']}
+                  />
                 </ModuleLayout.Full>
               )}
 
-              <ResourceSummaryCharts groupId={groupId} />
+              <ResourceSummaryCharts groupId={groupId!} />
 
               <ModuleLayout.Full>
                 <ResourceSummaryTable />
@@ -141,7 +144,7 @@ function ResourceSummary() {
                 <SampleList
                   transactionRoute={webVitalsModuleURL}
                   subregions={filters[SpanMetricsField.USER_GEO_SUBREGION]}
-                  groupId={groupId}
+                  groupId={groupId!}
                   moduleName={ModuleName.RESOURCE}
                   transactionName={transaction as string}
                   referrer={TraceViewSources.ASSETS_MODULE}
diff --git a/static/app/views/insights/browser/resources/views/resourcesLandingPage.spec.tsx b/static/app/views/insights/browser/resources/views/resourcesLandingPage.spec.tsx
index a87790a1252a83..1b8b3500649d4d 100644
--- a/static/app/views/insights/browser/resources/views/resourcesLandingPage.spec.tsx
+++ b/static/app/views/insights/browser/resources/views/resourcesLandingPage.spec.tsx
@@ -61,7 +61,7 @@ describe('ResourcesLandingPage', function () {
     render(<ResourcesLandingPage />, {organization});
     await waitForElementToBeRemoved(() => screen.queryAllByTestId('loading-indicator'));
 
-    expect(requestMocks.domainSelector.mock.calls).toMatchInlineSnapshot(`
+    expect(requestMocks.domainSelector!.mock.calls).toMatchInlineSnapshot(`
 [
   [
     "/organizations/org-slug/events/",
@@ -94,7 +94,7 @@ describe('ResourcesLandingPage', function () {
     render(<ResourcesLandingPage />, {organization});
     await waitForElementToBeRemoved(() => screen.queryAllByTestId('loading-indicator'));
 
-    expect(requestMocks.mainTable.mock.calls).toMatchInlineSnapshot(`
+    expect(requestMocks.mainTable!.mock.calls).toMatchInlineSnapshot(`
 [
   [
     "/organizations/org-slug/events/",
diff --git a/static/app/views/insights/browser/webVitals/components/browserTypeSelector.tsx b/static/app/views/insights/browser/webVitals/components/browserTypeSelector.tsx
index 2744029fa31995..a6ff75ea020435 100644
--- a/static/app/views/insights/browser/webVitals/components/browserTypeSelector.tsx
+++ b/static/app/views/insights/browser/webVitals/components/browserTypeSelector.tsx
@@ -5,9 +5,9 @@ import ContextIcon from 'sentry/components/events/contexts/contextIcon';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import {trackAnalytics} from 'sentry/utils/analytics';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {decodeList} from 'sentry/utils/queryString';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import {BrowserType} from 'sentry/views/insights/browser/webVitals/utils/queryParameterDecoders/browserType';
 import {SpanIndexedField} from 'sentry/views/insights/types';
@@ -73,8 +73,9 @@ const browserOptions = [
 ];
 
 export default function BrowserTypeSelector() {
-  const organization = useOrganization();
+  const navigate = useNavigate();
   const location = useLocation();
+  const organization = useOrganization();
 
   const value = decodeList(location.query[SpanIndexedField.BROWSER_NAME]);
 
@@ -93,7 +94,7 @@ export default function BrowserTypeSelector() {
           browsers: selectedOptions.map(v => v.value),
         });
 
-        browserHistory.push({
+        navigate({
           ...location,
           query: {
             ...location.query,
diff --git a/static/app/views/insights/browser/webVitals/components/charts/performanceScoreBreakdownChart.spec.tsx b/static/app/views/insights/browser/webVitals/components/charts/performanceScoreBreakdownChart.spec.tsx
index 525b58e68b2ae4..61931dc8493b21 100644
--- a/static/app/views/insights/browser/webVitals/components/charts/performanceScoreBreakdownChart.spec.tsx
+++ b/static/app/views/insights/browser/webVitals/components/charts/performanceScoreBreakdownChart.spec.tsx
@@ -14,7 +14,7 @@ jest.mock('sentry/utils/usePageFilters');
 
 describe('PerformanceScoreBreakdownChart', function () {
   const organization = OrganizationFixture();
-  let eventsStatsMock;
+  let eventsStatsMock: jest.Mock;
 
   beforeEach(function () {
     jest.mocked(useLocation).mockReturnValue({
@@ -64,7 +64,7 @@ describe('PerformanceScoreBreakdownChart', function () {
       key: '',
     });
     render(<PerformanceScoreBreakdownChart />, {organization});
-    await waitForElementToBeRemoved(() => screen.getByTestId('loading-indicator'));
+    await waitForElementToBeRemoved(() => screen.queryByTestId('loading-indicator'));
 
     expect(eventsStatsMock).toHaveBeenCalledWith(
       '/organizations/org-slug/events-stats/',
@@ -72,11 +72,6 @@ describe('PerformanceScoreBreakdownChart', function () {
         method: 'GET',
         query: expect.objectContaining({
           yAxis: [
-            'weighted_performance_score(measurements.score.lcp)',
-            'weighted_performance_score(measurements.score.fcp)',
-            'weighted_performance_score(measurements.score.cls)',
-            'weighted_performance_score(measurements.score.inp)',
-            'weighted_performance_score(measurements.score.ttfb)',
             'performance_score(measurements.score.lcp)',
             'performance_score(measurements.score.fcp)',
             'performance_score(measurements.score.cls)',
@@ -101,7 +96,6 @@ describe('PerformanceScoreBreakdownChart', function () {
           total: [],
         },
         ['#444674', '#895289', '#d6567f', '#f38150', '#f2b712'],
-        false,
         ['lcp', 'fcp', 'inp', 'cls', 'ttfb']
       );
       expect(result).toEqual([
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 6ae6914104ce00..688b8415547f6e 100644
--- a/static/app/views/insights/browser/webVitals/components/charts/performanceScoreBreakdownChart.tsx
+++ b/static/app/views/insights/browser/webVitals/components/charts/performanceScoreBreakdownChart.tsx
@@ -5,13 +5,16 @@ 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 useOrganization from 'sentry/utils/useOrganization';
 import usePageFilters from 'sentry/utils/usePageFilters';
 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 type {WebVitals} from 'sentry/views/insights/browser/webVitals/types';
 import {applyStaticWeightsToTimeseries} from 'sentry/views/insights/browser/webVitals/utils/applyStaticWeightsToTimeseries';
+import {getWeights} from 'sentry/views/insights/browser/webVitals/utils/getWeights';
 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';
@@ -24,12 +27,11 @@ type Props = {
   transaction?: string;
 };
 
-export const formatTimeSeriesResultsToChartData = (
+export function formatTimeSeriesResultsToChartData(
   data: WebVitalsScoreBreakdown,
   segmentColors: string[],
-  useWeights = true,
-  order = ORDER
-): Series[] => {
+  order: WebVitals[] = ORDER
+): Series[] {
   return order.map((webVital, index) => {
     const series = data[webVital];
     const color = segmentColors[index];
@@ -37,24 +39,26 @@ export const formatTimeSeriesResultsToChartData = (
       seriesName: webVital.toUpperCase(),
       data: series.map(({name, value}) => ({
         name,
-        value: Math.round(
-          value * (useWeights ? PERFORMANCE_SCORE_WEIGHTS[webVital] : 100) * 0.01
-        ),
+        value: Math.round(value),
       })),
       color,
     };
   });
-};
+}
 
 export function PerformanceScoreBreakdownChart({
   transaction,
   browserTypes,
   subregions,
 }: Props) {
+  const organization = useOrganization();
   const theme = useTheme();
   const segmentColors = [...theme.charts.getColorPalette(3).slice(0, 5)];
 
   const pageFilters = usePageFilters();
+  const handleMissingWebVitals = organization.features.includes(
+    'performance-vitals-handle-missing-webvitals'
+  );
 
   const {data: timeseriesData, isLoading: isTimeseriesLoading} =
     useProjectWebVitalsScoresTimeseriesQuery({transaction, browserTypes, subregions});
@@ -63,33 +67,37 @@ export function PerformanceScoreBreakdownChart({
   const performanceScoreSubtext = (period && DEFAULT_RELATIVE_PERIODS[period]) ?? '';
   const chartSeriesOrder = ORDER;
 
-  const weightedTimeseriesData = applyStaticWeightsToTimeseries(timeseriesData);
+  const weightedTimeseriesData = applyStaticWeightsToTimeseries(
+    organization,
+    timeseriesData
+  );
 
   const weightedTimeseries = formatTimeSeriesResultsToChartData(
     weightedTimeseriesData,
     segmentColors,
-    false,
     chartSeriesOrder
   );
 
-  const unweightedTimeseries = formatTimeSeriesResultsToChartData(
+  const timeseries = formatTimeSeriesResultsToChartData(
     {
-      lcp: timeseriesData.unweightedLcp,
-      fcp: timeseriesData.unweightedFcp,
-      cls: timeseriesData.unweightedCls,
-      ttfb: timeseriesData.unweightedTtfb,
-      inp: timeseriesData.unweightedInp,
+      lcp: timeseriesData.lcp,
+      fcp: timeseriesData.fcp,
+      cls: timeseriesData.cls,
+      ttfb: timeseriesData.ttfb,
+      inp: timeseriesData.inp,
       total: timeseriesData.total,
     },
     segmentColors,
-    false,
     chartSeriesOrder
   );
 
-  const weightsSeries = weightedTimeseries[0].data.map(({name}) => {
-    const value = PERFORMANCE_SCORE_WEIGHTS;
-    return {name, value};
-  });
+  const weights = handleMissingWebVitals
+    ? getWeights(
+        ORDER.filter(webVital =>
+          timeseriesData[webVital].some(series => series.value > 0)
+        )
+      )
+    : PERFORMANCE_SCORE_WEIGHTS;
 
   return (
     <StyledChartPanel title={t('Score Breakdown')}>
@@ -111,27 +119,23 @@ export function PerformanceScoreBreakdownChart({
         dataMax={100}
         chartColors={segmentColors}
         tooltipFormatterOptions={{
-          nameFormatter: (name, seriesParams: any) => {
-            const timestamp = seriesParams?.data[0];
-            const weights = weightsSeries.find(
-              series => series.name === timestamp
-            )?.value;
+          nameFormatter: name => {
             // nameFormatter expects a string an will wrap the output in an html string.
             // Kind of a hack, but we can inject some html to escape styling for the subLabel.
             const subLabel =
               weights !== undefined
-                ? ` </strong>(${
-                    weights[name.toLocaleLowerCase()]
-                  }% of Perf Score)<strong>`
+                ? ` </strong>(${weights[name.toLocaleLowerCase()].toFixed(
+                    0
+                  )}% of Perf Score)<strong>`
                 : '';
             return `${name} Score${subLabel}`;
           },
           valueFormatter: (_value, _label, seriesParams: any) => {
             const timestamp = seriesParams?.data[0];
-            const unweightedValue = unweightedTimeseries
+            const value = timeseries
               .find(series => series.seriesName === seriesParams?.seriesName)
               ?.data.find(dataPoint => dataPoint.name === timestamp)?.value;
-            return `<span class="tooltip-label-value">${unweightedValue}</span>`;
+            return `<span class="tooltip-label-value">${value}</span>`;
           },
         }}
       />
diff --git a/static/app/views/insights/browser/webVitals/components/charts/performanceScoreChart.tsx b/static/app/views/insights/browser/webVitals/components/charts/performanceScoreChart.tsx
index 2786d92b71ecd5..2ef901f1d240a3 100644
--- a/static/app/views/insights/browser/webVitals/components/charts/performanceScoreChart.tsx
+++ b/static/app/views/insights/browser/webVitals/components/charts/performanceScoreChart.tsx
@@ -28,7 +28,7 @@ type Props = {
   webVital?: WebVitals | null;
 };
 
-export const ORDER = ['lcp', 'fcp', 'inp', 'cls', 'ttfb'];
+export const ORDER: WebVitals[] = ['lcp', 'fcp', 'inp', 'cls', 'ttfb'];
 
 export function PerformanceScoreChart({
   projectScore,
diff --git a/static/app/views/insights/browser/webVitals/components/pageOverviewWebVitalsDetailPanel.tsx b/static/app/views/insights/browser/webVitals/components/pageOverviewWebVitalsDetailPanel.tsx
index c9fa266832d595..6391caaadb6e95 100644
--- a/static/app/views/insights/browser/webVitals/components/pageOverviewWebVitalsDetailPanel.tsx
+++ b/static/app/views/insights/browser/webVitals/components/pageOverviewWebVitalsDetailPanel.tsx
@@ -27,7 +27,7 @@ import {PerformanceBadge} from 'sentry/views/insights/browser/webVitals/componen
 import {WebVitalDetailHeader} from 'sentry/views/insights/browser/webVitals/components/webVitalDescription';
 import {useProjectRawWebVitalsQuery} from 'sentry/views/insights/browser/webVitals/queries/rawWebVitalsQueries/useProjectRawWebVitalsQuery';
 import {useProjectRawWebVitalsValuesTimeseriesQuery} from 'sentry/views/insights/browser/webVitals/queries/rawWebVitalsQueries/useProjectRawWebVitalsValuesTimeseriesQuery';
-import {calculatePerformanceScoreFromStoredTableDataRow} from 'sentry/views/insights/browser/webVitals/queries/storedScoreQueries/calculatePerformanceScoreFromStored';
+import {getWebVitalScoresFromTableDataRow} from 'sentry/views/insights/browser/webVitals/queries/storedScoreQueries/getWebVitalScoresFromTableDataRow';
 import {useProjectWebVitalsScoresQuery} from 'sentry/views/insights/browser/webVitals/queries/storedScoreQueries/useProjectWebVitalsScoresQuery';
 import {useInteractionsCategorizedSamplesQuery} from 'sentry/views/insights/browser/webVitals/queries/useInteractionsCategorizedSamplesQuery';
 import {useTransactionsCategorizedSamplesQuery} from 'sentry/views/insights/browser/webVitals/queries/useTransactionsCategorizedSamplesQuery';
@@ -119,9 +119,7 @@ export function PageOverviewWebVitalsDetailPanel({
     subregions,
   });
 
-  const projectScore = calculatePerformanceScoreFromStoredTableDataRow(
-    projectScoresData?.data?.[0]
-  );
+  const projectScore = getWebVitalScoresFromTableDataRow(projectScoresData?.data?.[0]);
 
   const {data: transactionsTableData, isLoading: isTransactionWebVitalsQueryLoading} =
     useTransactionsCategorizedSamplesQuery({
diff --git a/static/app/views/insights/browser/webVitals/components/performanceScoreRing.tsx b/static/app/views/insights/browser/webVitals/components/performanceScoreRing.tsx
index 765cdd70e3a7b6..e29971da9b57fc 100644
--- a/static/app/views/insights/browser/webVitals/components/performanceScoreRing.tsx
+++ b/static/app/views/insights/browser/webVitals/components/performanceScoreRing.tsx
@@ -76,14 +76,17 @@ function PerformanceScoreRing({
       const ringSegmentPadding = values.length > 1 ? PADDING : 0;
       // TODO: Hacky way to add padding to ring segments. Should clean this up so it's more accurate to the value.
       // This only mostly works because we expect values to be somewhere between 0 and 100.
-      const maxOffset =
-        (1 - Math.max(maxValue - ringSegmentPadding, 0) / sumMaxValues) * circumference;
-      const progressOffset =
-        (1 - Math.max(boundedValue - ringSegmentPadding, 0) / sumMaxValues) *
-        circumference;
+      const maxOffset = sumMaxValues
+        ? (1 - Math.max(maxValue - ringSegmentPadding, 0) / sumMaxValues) * circumference
+        : 0;
+      const progressOffset = sumMaxValues
+        ? (1 - Math.max(boundedValue - ringSegmentPadding, 0) / sumMaxValues) *
+          circumference
+        : 0;
       const rotate = currentRotate;
-      currentRotate += (360 * maxValue) / sumMaxValues;
-
+      if (sumMaxValues) {
+        currentRotate += (360 * maxValue) / sumMaxValues;
+      }
       const cx = radius + barWidth / 2;
 
       return [
@@ -95,7 +98,7 @@ function PerformanceScoreRing({
           circumference={circumference}
           cx={cx}
           cy={cx}
-          color={backgroundColors[index]}
+          color={backgroundColors[index]!}
           rotate={rotate}
           onMouseOver={() => onHoverActions?.()}
           onMouseLeave={() => onUnhover?.()}
@@ -109,7 +112,7 @@ function PerformanceScoreRing({
           barWidth={barWidth}
           cx={cx}
           cy={cx}
-          color={segmentColors[index]}
+          color={segmentColors[index]!}
           rotate={rotate}
           onMouseOver={() => onHoverActions?.()}
           onMouseLeave={() => onUnhover?.()}
diff --git a/static/app/views/insights/browser/webVitals/components/performanceScoreRingWithTooltips.spec.tsx b/static/app/views/insights/browser/webVitals/components/performanceScoreRingWithTooltips.spec.tsx
index eff3da2192fe34..87efac66043f7b 100644
--- a/static/app/views/insights/browser/webVitals/components/performanceScoreRingWithTooltips.spec.tsx
+++ b/static/app/views/insights/browser/webVitals/components/performanceScoreRingWithTooltips.spec.tsx
@@ -11,11 +11,6 @@ describe('PerformanceScoreRingWithTooltips', function () {
       ttfbScore: 99,
       inpScore: 98,
       totalScore: 83,
-      lcpWeight: 38,
-      fcpWeight: 23,
-      clsWeight: 18,
-      ttfbWeight: 16,
-      inpWeight: 10,
     };
     render(
       <PerformanceScoreRingWithTooltips
@@ -36,17 +31,12 @@ describe('PerformanceScoreRingWithTooltips', function () {
 
   it('renders empty state with default weights', async () => {
     const projectScore = {
-      lcpScore: 0,
-      fcpScore: 0,
-      clsScore: 0,
-      ttfbScore: 0,
-      inpScore: 0,
-      totalScore: 0,
-      lcpWeight: 0,
-      fcpWeight: 0,
-      clsWeight: 0,
-      ttfbWeight: 0,
-      inpWeight: 0,
+      lcpScore: 10,
+      fcpScore: 10,
+      clsScore: 10,
+      ttfbScore: 10,
+      inpScore: 10,
+      totalScore: 10,
     };
     render(
       <PerformanceScoreRingWithTooltips
diff --git a/static/app/views/insights/browser/webVitals/components/performanceScoreRingWithTooltips.tsx b/static/app/views/insights/browser/webVitals/components/performanceScoreRingWithTooltips.tsx
index 75feddbdb3f5a8..92f9fb749441bd 100644
--- a/static/app/views/insights/browser/webVitals/components/performanceScoreRingWithTooltips.tsx
+++ b/static/app/views/insights/browser/webVitals/components/performanceScoreRingWithTooltips.tsx
@@ -16,6 +16,7 @@ import type {
   ProjectScore,
   WebVitals,
 } from 'sentry/views/insights/browser/webVitals/types';
+import {getWeights} from 'sentry/views/insights/browser/webVitals/utils/getWeights';
 import {PERFORMANCE_SCORE_WEIGHTS} from 'sentry/views/insights/browser/webVitals/utils/scoreThresholds';
 import {useModuleURL} from 'sentry/views/insights/common/utils/useModuleURL';
 
@@ -162,7 +163,11 @@ function PerformanceScoreRingWithTooltips({
     });
   }
 
-  const weights = PERFORMANCE_SCORE_WEIGHTS;
+  const weights = organization.features.includes(
+    'performance-vitals-handle-missing-webvitals'
+  )
+    ? getWeights(ORDER.filter(webVital => projectScore[`${webVital}Score`]))
+    : PERFORMANCE_SCORE_WEIGHTS;
 
   const commonWebVitalLabelProps = {
     organization,
@@ -192,7 +197,7 @@ function PerformanceScoreRingWithTooltips({
           <TooltipRow>
             <span>
               <Dot
-                color={ringBackgroundColors[ringSegmentOrder.indexOf(webVitalTooltip)]}
+                color={ringBackgroundColors[ringSegmentOrder.indexOf(webVitalTooltip)]!}
               />
               {webVitalTooltip.toUpperCase()} {t('Opportunity')}
             </span>
@@ -202,7 +207,9 @@ function PerformanceScoreRingWithTooltips({
           </TooltipRow>
           <TooltipRow>
             <span>
-              <Dot color={ringSegmentColors[ringSegmentOrder.indexOf(webVitalTooltip)]} />
+              <Dot
+                color={ringSegmentColors[ringSegmentOrder.indexOf(webVitalTooltip)]!}
+              />
               {webVitalTooltip.toUpperCase()} {t('Score')}
             </span>
             <TooltipValue>{projectScore[`${webVitalTooltip}Score`]}</TooltipValue>
@@ -317,8 +324,8 @@ function calculateLabelCoordinates(
   Object.keys(weights).forEach((key, index) => {
     results[key] = {
       // Padding hack for now since ttfb label is longer than the others
-      x: coordinates[index].x + (key === 'ttfb' ? -12 : 0),
-      y: coordinates[index].y,
+      x: coordinates[index]!.x + (key === 'ttfb' ? -12 : 0),
+      y: coordinates[index]!.y,
     };
   });
   return results;
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 422453cdf43d14..f7fe9cb4e6e79b 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
@@ -115,15 +115,15 @@ describe('PagePerformanceTable', function () {
     render(<PagePerformanceTable />, {router, organization});
     await waitFor(() => {
       expect(eventsMock).toHaveBeenCalledTimes(1);
-      expect(eventsMock).toHaveBeenLastCalledWith(
-        '/organizations/org-slug/events/',
-        expect.objectContaining({
-          query: expect.objectContaining({
-            query: expect.stringContaining('transaction:"*/issues/\\**"'),
-          }),
-        })
-      );
     });
+    expect(eventsMock).toHaveBeenLastCalledWith(
+      '/organizations/org-slug/events/',
+      expect.objectContaining({
+        query: expect.objectContaining({
+          query: expect.stringContaining('transaction:"*/issues/\\**"'),
+        }),
+      })
+    );
   });
 
   it('renders a list of pages', async function () {
diff --git a/static/app/views/insights/browser/webVitals/components/tables/pagePerformanceTable.tsx b/static/app/views/insights/browser/webVitals/components/tables/pagePerformanceTable.tsx
index 8bd2482b0e39cb..0c883ea8257318 100644
--- a/static/app/views/insights/browser/webVitals/components/tables/pagePerformanceTable.tsx
+++ b/static/app/views/insights/browser/webVitals/components/tables/pagePerformanceTable.tsx
@@ -14,7 +14,6 @@ import {IconChevron} from 'sentry/icons/iconChevron';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import {trackAnalytics} from 'sentry/utils/analytics';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {getFieldRenderer} from 'sentry/utils/discover/fieldRenderers';
 import type {Sort} from 'sentry/utils/discover/fields';
 import {parseFunction} from 'sentry/utils/discover/fields';
@@ -23,6 +22,7 @@ import {formatAbbreviatedNumber} from 'sentry/utils/formatters';
 import {decodeList, decodeScalar} from 'sentry/utils/queryString';
 import {escapeFilterValue} from 'sentry/utils/tokenizeSearch';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import {PerformanceBadge} from 'sentry/views/insights/browser/webVitals/components/performanceBadge';
 import {useTransactionWebVitalsScoresQuery} from 'sentry/views/insights/browser/webVitals/queries/storedScoreQueries/useTransactionWebVitalsScoresQuery';
@@ -65,6 +65,7 @@ const DEFAULT_SORT: Sort = {
 };
 
 export function PagePerformanceTable() {
+  const navigate = useNavigate();
   const location = useLocation();
   const organization = useOrganization();
   const moduleUrl = useModuleURL(ModuleName.VITAL);
@@ -289,7 +290,7 @@ export function PagePerformanceTable() {
       query: newQuery,
       source: ModuleName.VITAL,
     });
-    browserHistory.push({
+    navigate({
       ...location,
       query: {
         ...location.query,
diff --git a/static/app/views/insights/browser/webVitals/components/webVitalDescription.tsx b/static/app/views/insights/browser/webVitals/components/webVitalDescription.tsx
index b69ec24c37f670..97bdc28a356ba4 100644
--- a/static/app/views/insights/browser/webVitals/components/webVitalDescription.tsx
+++ b/static/app/views/insights/browser/webVitals/components/webVitalDescription.tsx
@@ -2,6 +2,7 @@ import {useTheme} from '@emotion/react';
 import styled from '@emotion/styled';
 
 import {CopyToClipboardButton} from 'sentry/components/copyToClipboardButton';
+import ExternalLink from 'sentry/components/links/externalLink';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
 import {COUNTRY_CODE_TO_NAME_MAP} from 'sentry/data/countryCodesMap';
 import {IconCheckmark} from 'sentry/icons/iconCheckmark';
@@ -40,22 +41,89 @@ const WEB_VITAL_FULL_NAME_MAP = {
   ttfb: t('Time to First Byte'),
 };
 
-const VITAL_DESCRIPTIONS: Partial<Record<WebVital, string>> = {
-  [WebVital.FCP]: t(
-    'First Contentful Paint (FCP) measures the amount of time the first content takes to render in the viewport. Like FP, this could also show up in any form from the document object model (DOM), such as images, SVGs, or text blocks.'
-  ),
-  [WebVital.CLS]: t(
-    'Cumulative Layout Shift (CLS) is the sum of individual layout shift scores for every unexpected element shift during the rendering process. Imagine navigating to an article and trying to click a link before the page finishes loading. Before your cursor even gets there, the link may have shifted down due to an image rendering. Rather than using duration for this Web Vital, the CLS score represents the degree of disruptive and visually unstable shifts.'
-  ),
-  [WebVital.LCP]: t(
-    'Largest Contentful Paint (LCP) measures the render time for the largest content to appear in the viewport. This may be in any form from the document object model (DOM), such as images, SVGs, or text blocks. It’s the largest pixel area in the viewport, thus most visually defining. LCP helps developers understand how long it takes to see the main content on the page.'
-  ),
-  [WebVital.TTFB]: t(
-    'Time to First Byte (TTFB) is a foundational metric for measuring connection setup time and web server responsiveness in both the lab and the field. It helps identify when a web server is too slow to respond to requests. In the case of navigation requests—that is, requests for an HTML document—it precedes every other meaningful loading performance metric.'
-  ),
-  [WebVital.INP]: t(
-    "Interaction to Next Paint (INP) is a metric that assesses a page's overall responsiveness to user interactions by observing the latency of all click, tap, and keyboard interactions that occur throughout the lifespan of a user's visit to a page. The final INP value is the longest interaction observed, ignoring outliers."
-  ),
+export const VITAL_DESCRIPTIONS: Partial<
+  Record<
+    WebVital,
+    {longDescription: string; shortDescription: string; link?: React.ReactNode}
+  >
+> = {
+  [WebVital.FCP]: {
+    shortDescription: t(
+      'Time for first DOM content to render. Bad FCP makes users feel like the page isn’t responding or loading.'
+    ),
+    longDescription: t(
+      'First Contentful Paint (FCP) measures the amount of time the first content takes to render in the viewport. Like FP, this could also show up in any form from the document object model (DOM), such as images, SVGs, or text blocks.'
+    ),
+    link: (
+      <ExternalLink
+        openInNewTab
+        href="https://blog.sentry.io/how-to-make-your-web-page-faster-before-it-even-loads/"
+      >
+        How can I fix my FCP?
+      </ExternalLink>
+    ),
+  },
+  [WebVital.CLS]: {
+    shortDescription: t(
+      'Measures content ‘shifting’ during load. Bad CLS indicates a janky website, degrading UX and trust.'
+    ),
+    longDescription: t(
+      'Cumulative Layout Shift (CLS) is the sum of individual layout shift scores for every unexpected element shift during the rendering process. Imagine navigating to an article and trying to click a link before the page finishes loading. Before your cursor even gets there, the link may have shifted down due to an image rendering. Rather than using duration for this Web Vital, the CLS score represents the degree of disruptive and visually unstable shifts.'
+    ),
+    link: (
+      <ExternalLink
+        openInNewTab
+        href="https://blog.sentry.io/from-lcp-to-cls-improve-your-core-web-vitals-with-image-loading-best/"
+      >
+        How can I fix my CLS?
+      </ExternalLink>
+    ),
+  },
+  [WebVital.LCP]: {
+    shortDescription: t(
+      'Time to render the largest item in the viewport. Bad LCP frustrates users because the website feels slow to load.'
+    ),
+    longDescription: t(
+      'Largest Contentful Paint (LCP) measures the render time for the largest content to appear in the viewport. This may be in any form from the document object model (DOM), such as images, SVGs, or text blocks. It’s the largest pixel area in the viewport, thus most visually defining. LCP helps developers understand how long it takes to see the main content on the page.'
+    ),
+    link: (
+      <ExternalLink
+        openInNewTab
+        href="https://blog.sentry.io/from-lcp-to-cls-improve-your-core-web-vitals-with-image-loading-best/"
+      >
+        How can I fix my LCP?
+      </ExternalLink>
+    ),
+  },
+  [WebVital.TTFB]: {
+    shortDescription: t(
+      'Time until first byte is delivered to the client. Bad TTFB makes the server feel unresponsive.'
+    ),
+    longDescription: t(
+      'Time to First Byte (TTFB) is a foundational metric for measuring connection setup time and web server responsiveness in both the lab and the field. It helps identify when a web server is too slow to respond to requests. In the case of navigation requests—that is, requests for an HTML document—it precedes every other meaningful loading performance metric.'
+    ),
+    link: (
+      <ExternalLink
+        openInNewTab
+        href="https://blog.sentry.io/how-i-fixed-my-brutal-ttfb/"
+      >
+        How can I fix my TTFB?
+      </ExternalLink>
+    ),
+  },
+  [WebVital.INP]: {
+    shortDescription: t(
+      'Latency between user input and visual response. Bad INP makes users feel like the site is laggy, outdated, and unresponsive. '
+    ),
+    longDescription: t(
+      "Interaction to Next Paint (INP) is a metric that assesses a page's overall responsiveness to user interactions by observing the latency of all click, tap, and keyboard interactions that occur throughout the lifespan of a user's visit to a page. The final INP value is the longest interaction observed, ignoring outliers."
+    ),
+    link: (
+      <ExternalLink openInNewTab href="https://blog.sentry.io/what-is-inp/">
+        How can I fix my INP?
+      </ExternalLink>
+    ),
+  },
 };
 
 type WebVitalDetailHeaderProps = {
@@ -68,7 +136,7 @@ type WebVitalDetailHeaderProps = {
 export function WebVitalDetailHeader({score, value, webVital}: Props) {
   const theme = useTheme();
   const colors = theme.charts.getColorPalette(3);
-  const dotColor = colors[ORDER.indexOf(webVital)];
+  const dotColor = colors[ORDER.indexOf(webVital)]!;
   const status = score !== undefined ? scoreToStatus(score) : undefined;
 
   return (
@@ -136,11 +204,16 @@ export function WebVitalTagsDetailHeader({
 }
 
 export function WebVitalDescription({score, value, webVital}: Props) {
-  const description: string = VITAL_DESCRIPTIONS[WebVital[webVital.toUpperCase()]];
+  const {longDescription, link} = VITAL_DESCRIPTIONS[WebVital[webVital.toUpperCase()]];
+
   return (
     <div>
       <WebVitalDetailHeader score={score} value={value} webVital={webVital} />
-      <p>{description}</p>
+      <DescriptionWrapper>
+        {longDescription}
+        {link}
+      </DescriptionWrapper>
+
       <p>
         <b>
           {tct(
@@ -185,6 +258,12 @@ const Header = styled('span')`
   margin-bottom: ${space(3)};
 `;
 
+const DescriptionWrapper = styled('div')`
+  display: flex;
+  flex-direction: column;
+  margin-bottom: ${space(2)};
+`;
+
 const Value = styled('h2')`
   display: flex;
   align-items: center;
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 c8398c218cdfbe..f33de950326d46 100644
--- a/static/app/views/insights/browser/webVitals/components/webVitalMeters.spec.tsx
+++ b/static/app/views/insights/browser/webVitals/components/webVitalMeters.spec.tsx
@@ -14,11 +14,6 @@ jest.mock('sentry/utils/usePageFilters');
 describe('WebVitalMeters', function () {
   const organization = OrganizationFixture();
   const projectScore: ProjectScore = {
-    lcpWeight: 30,
-    fcpWeight: 20,
-    clsWeight: 15,
-    ttfbWeight: 10,
-    inpWeight: 10,
     lcpScore: 100,
     fcpScore: 100,
     clsScore: 100,
diff --git a/static/app/views/insights/browser/webVitals/components/webVitalMeters.tsx b/static/app/views/insights/browser/webVitals/components/webVitalMeters.tsx
index e74d8b45beccfa..3afc3967260b3e 100644
--- a/static/app/views/insights/browser/webVitals/components/webVitalMeters.tsx
+++ b/static/app/views/insights/browser/webVitals/components/webVitalMeters.tsx
@@ -10,6 +10,7 @@ import {t, tct} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {TableData} from 'sentry/utils/discover/discoverQuery';
 import getDuration from 'sentry/utils/duration/getDuration';
+import {VITAL_DESCRIPTIONS} from 'sentry/views/insights/browser/webVitals/components/webVitalDescription';
 import {MODULE_DOC_LINK} from 'sentry/views/insights/browser/webVitals/settings';
 import type {
   ProjectScore,
@@ -86,7 +87,7 @@ export default function WebVitalMeters({
           showTooltip={showTooltip}
           score={score}
           meterValue={meterValue}
-          color={colors[index]}
+          color={colors[index]!}
           onClick={onClick}
         />
       );
@@ -129,6 +130,9 @@ export function VitalMeter({
       <NoValue />
     );
 
+  const webVitalKey = `measurements.${webVital}`;
+  const {shortDescription} = VITAL_DESCRIPTIONS[webVitalKey];
+
   const headerText = webVitalsConfig[webVital].name;
   const meterBody = (
     <Fragment>
@@ -139,13 +143,7 @@ export function VitalMeter({
             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(),
-                  }
-                )}
+                {shortDescription}
                 <br />
                 <ExternalLink href={`${MODULE_DOC_LINK}#performance-score`}>
                   {t('Find out how performance scores are calculated here.')}
@@ -316,3 +314,82 @@ export const Dot = styled('span')<{color: string}>`
   height: ${space(1)};
   background-color: ${p => p.color};
 `;
+
+// A compressed version of the VitalMeter component used in the trace context panel
+type VitalPillProps = Omit<
+  VitalMeterProps,
+  'showTooltip' | 'isAggregateMode' | 'onClick' | 'color'
+>;
+export function VitalPill({webVital, score, meterValue}: VitalPillProps) {
+  const status = score !== undefined ? scoreToStatus(score) : 'none';
+  const webVitalExists = score !== undefined;
+  const webVitalsConfig = WEB_VITALS_METERS_CONFIG;
+
+  const formattedMeterValueText =
+    webVitalExists && meterValue ? (
+      webVitalsConfig[webVital].formatter(meterValue)
+    ) : (
+      <NoValue />
+    );
+
+  const tooltipText = VITAL_DESCRIPTIONS[`measurements.${webVital}`];
+
+  return (
+    <VitalPillContainer>
+      <Tooltip title={tooltipText?.shortDescription}>
+        <VitalPillName status={status}>
+          {`${webVital ? webVital.toUpperCase() : ''} (${STATUS_TEXT[status] ?? 'N/A'})`}
+        </VitalPillName>
+      </Tooltip>
+      <VitalPillValue>{formattedMeterValueText}</VitalPillValue>
+    </VitalPillContainer>
+  );
+}
+
+const VitalPillContainer = styled('div')`
+  display: flex;
+  flex-direction: row;
+  width: 100%;
+  height: 30px;
+`;
+
+const VitalPillName = styled('div')<{status: string}>`
+  display: flex;
+  align-items: center;
+  position: relative;
+
+  height: 100%;
+  padding: 0 ${space(1)};
+  border: solid 1px ${p => p.theme[PERFORMANCE_SCORE_COLORS[p.status].border]};
+  border-radius: ${p => p.theme.borderRadius} 0 0 ${p => p.theme.borderRadius};
+
+  background-color: ${p => p.theme[PERFORMANCE_SCORE_COLORS[p.status].light]};
+  color: ${p => p.theme[PERFORMANCE_SCORE_COLORS[p.status].normal]};
+
+  font-size: ${p => p.theme.fontSizeSmall};
+  font-weight: ${p => p.theme.fontWeightBold};
+  text-decoration: underline;
+  text-decoration-style: dotted;
+  text-underline-offset: ${space(0.25)};
+  text-decoration-thickness: 1px;
+
+  cursor: pointer;
+`;
+
+const VitalPillValue = styled('div')`
+  display: flex;
+  flex: 1;
+  align-items: center;
+  justify-content: flex-end;
+
+  height: 100%;
+  padding: 0 ${space(0.5)};
+  border: 1px solid ${p => p.theme.gray200};
+  border-left: none;
+  border-radius: 0 ${p => p.theme.borderRadius} ${p => p.theme.borderRadius} 0;
+
+  background: ${p => p.theme.background};
+  color: ${p => p.theme.textColor};
+
+  font-size: ${p => p.theme.fontSizeLarge};
+`;
diff --git a/static/app/views/insights/browser/webVitals/components/webVitalsDetailPanel.spec.tsx b/static/app/views/insights/browser/webVitals/components/webVitalsDetailPanel.spec.tsx
index 9efddce3c5b599..5129c77ae406c2 100644
--- a/static/app/views/insights/browser/webVitals/components/webVitalsDetailPanel.spec.tsx
+++ b/static/app/views/insights/browser/webVitals/components/webVitalsDetailPanel.spec.tsx
@@ -11,7 +11,8 @@ jest.mock('sentry/utils/usePageFilters');
 
 describe('WebVitalsDetailPanel', function () {
   const organization = OrganizationFixture();
-  let eventsMock, eventsStatsMock;
+  let eventsMock: jest.Mock;
+  let eventsStatsMock: jest.Mock;
 
   beforeEach(function () {
     jest.mocked(useLocation).mockReturnValue({
@@ -60,7 +61,7 @@ describe('WebVitalsDetailPanel', function () {
     render(<WebVitalsDetailPanel onClose={() => undefined} webVital="lcp" />, {
       organization,
     });
-    await waitForElementToBeRemoved(() => screen.getByTestId('loading-indicator'));
+    await waitForElementToBeRemoved(() => screen.queryByTestId('loading-indicator'));
     // Raw web vital metric tile queries
     expect(eventsMock).toHaveBeenNthCalledWith(
       1,
diff --git a/static/app/views/insights/browser/webVitals/components/webVitalsDetailPanel.tsx b/static/app/views/insights/browser/webVitals/components/webVitalsDetailPanel.tsx
index 08543cd697bf0b..9cad88eedddd59 100644
--- a/static/app/views/insights/browser/webVitals/components/webVitalsDetailPanel.tsx
+++ b/static/app/views/insights/browser/webVitals/components/webVitalsDetailPanel.tsx
@@ -24,7 +24,7 @@ import {PerformanceBadge} from 'sentry/views/insights/browser/webVitals/componen
 import {WebVitalDescription} from 'sentry/views/insights/browser/webVitals/components/webVitalDescription';
 import {useProjectRawWebVitalsQuery} from 'sentry/views/insights/browser/webVitals/queries/rawWebVitalsQueries/useProjectRawWebVitalsQuery';
 import {useProjectRawWebVitalsValuesTimeseriesQuery} from 'sentry/views/insights/browser/webVitals/queries/rawWebVitalsQueries/useProjectRawWebVitalsValuesTimeseriesQuery';
-import {calculatePerformanceScoreFromStoredTableDataRow} from 'sentry/views/insights/browser/webVitals/queries/storedScoreQueries/calculatePerformanceScoreFromStored';
+import {getWebVitalScoresFromTableDataRow} from 'sentry/views/insights/browser/webVitals/queries/storedScoreQueries/getWebVitalScoresFromTableDataRow';
 import {useProjectWebVitalsScoresQuery} from 'sentry/views/insights/browser/webVitals/queries/storedScoreQueries/useProjectWebVitalsScoresQuery';
 import {useTransactionWebVitalsScoresQuery} from 'sentry/views/insights/browser/webVitals/queries/storedScoreQueries/useTransactionWebVitalsScoresQuery';
 import {MODULE_DOC_LINK} from 'sentry/views/insights/browser/webVitals/settings';
@@ -72,9 +72,7 @@ export function WebVitalsDetailPanel({
     subregions,
   });
 
-  const projectScore = calculatePerformanceScoreFromStoredTableDataRow(
-    projectScoresData?.data?.[0]
-  );
+  const projectScore = getWebVitalScoresFromTableDataRow(projectScoresData?.data?.[0]);
   const {data, isPending} = useTransactionWebVitalsScoresQuery({
     limit: 100,
     webVital: webVital ?? 'total',
diff --git a/static/app/views/insights/browser/webVitals/queries/storedScoreQueries/calculatePerformanceScoreFromStored.tsx b/static/app/views/insights/browser/webVitals/queries/storedScoreQueries/calculatePerformanceScoreFromStored.tsx
deleted file mode 100644
index efc5ec6c65f91f..00000000000000
--- a/static/app/views/insights/browser/webVitals/queries/storedScoreQueries/calculatePerformanceScoreFromStored.tsx
+++ /dev/null
@@ -1,109 +0,0 @@
-import type {TableDataRow} from 'sentry/utils/discover/discoverQuery';
-import type {
-  ProjectScore,
-  WebVitals,
-} from 'sentry/views/insights/browser/webVitals/types';
-import {PERFORMANCE_SCORE_WEIGHTS} from 'sentry/views/insights/browser/webVitals/utils/scoreThresholds';
-
-export const calculatePerformanceScoreFromStoredTableDataRow = (
-  data?: TableDataRow
-): ProjectScore => {
-  const scores = getWebVitalScores(data);
-  return scores;
-};
-
-function getWebVitalScore(data: TableDataRow, webVital: WebVitals): number {
-  return data[`performance_score(measurements.score.${webVital})`] as number;
-}
-
-function getWebVitalWeight(data: TableDataRow, webVital: WebVitals): number {
-  const weight = data[`avg(measurements.score.weight.${webVital})`] as number;
-  if (weight > 1) {
-    throw new Error(`${webVital} weight should not exceed 1: ${weight}`);
-  }
-  if (weight < 0) {
-    throw new Error(`${webVital} weight should not be less than 0: ${weight}`);
-  }
-  return weight;
-}
-
-function getTotalScore(data: TableDataRow): number {
-  return data[`avg(measurements.score.total)`] as number;
-}
-
-function getWebVitalScoreCount(
-  data: TableDataRow,
-  webVital: WebVitals | 'total'
-): number {
-  return data[`count_scores(measurements.score.${webVital})`] as number;
-}
-
-function hasWebVitalScore(data: TableDataRow, webVital: WebVitals): boolean {
-  if (data.hasOwnProperty(`count_scores(measurements.score.${webVital})`)) {
-    return getWebVitalScoreCount(data, webVital) > 0;
-  }
-  return false;
-}
-
-export function getWebVitalScores(data?: TableDataRow): ProjectScore {
-  if (!data) {
-    return {
-      lcpWeight: PERFORMANCE_SCORE_WEIGHTS.lcp,
-      fcpWeight: PERFORMANCE_SCORE_WEIGHTS.fcp,
-      clsWeight: PERFORMANCE_SCORE_WEIGHTS.cls,
-      ttfbWeight: PERFORMANCE_SCORE_WEIGHTS.ttfb,
-      inpWeight: PERFORMANCE_SCORE_WEIGHTS.inp,
-    };
-  }
-
-  const hasLcp = hasWebVitalScore(data, 'lcp');
-  const hasFcp = hasWebVitalScore(data, 'fcp');
-  const hasCls = hasWebVitalScore(data, 'cls');
-  const hasInp = hasWebVitalScore(data, 'inp');
-  const hasTtfb = hasWebVitalScore(data, 'ttfb');
-
-  const scores = {
-    lcpScore: hasLcp ? Math.round(getWebVitalScore(data, 'lcp') * 100) : undefined,
-    fcpScore: hasFcp ? Math.round(getWebVitalScore(data, 'fcp') * 100) : undefined,
-    clsScore: hasCls ? Math.round(getWebVitalScore(data, 'cls') * 100) : undefined,
-    ttfbScore: hasTtfb ? Math.round(getWebVitalScore(data, 'ttfb') * 100) : undefined,
-    inpScore: hasInp ? Math.round(getWebVitalScore(data, 'inp') * 100) : undefined,
-    totalScore: Math.round(getTotalScore(data) * 100),
-    ...calculateWeights(data),
-  };
-  return scores;
-}
-
-const calculateWeights = (data: TableDataRow) => {
-  const hasLcp = hasWebVitalScore(data, 'lcp');
-  const hasFcp = hasWebVitalScore(data, 'fcp');
-  const hasCls = hasWebVitalScore(data, 'cls');
-  const hasInp = hasWebVitalScore(data, 'inp');
-  const hasTtfb = hasWebVitalScore(data, 'ttfb');
-
-  // We need to do this because INP and pageLoads are different score profiles
-  const inpScoreCount = getWebVitalScoreCount(data, 'inp') || 0;
-  const totalScoreCount = getWebVitalScoreCount(data, 'total');
-  const pageLoadCount = totalScoreCount - inpScoreCount;
-
-  const inpWeight = getWebVitalWeight(data, 'inp');
-  const inpActualWeight = Math.round(
-    ((inpWeight * inpScoreCount) / totalScoreCount) * 100
-  );
-
-  const pageLoadWebVitals: WebVitals[] = ['lcp', 'fcp', 'cls', 'ttfb'];
-  const [lcpWeight, fcpWeight, clsWeight, ttfbWeight] = pageLoadWebVitals.map(
-    webVital => {
-      const weight = getWebVitalWeight(data, webVital);
-      const actualWeight = Math.round(((weight * pageLoadCount) / totalScoreCount) * 100);
-      return actualWeight;
-    }
-  );
-  return {
-    lcpWeight: hasLcp ? lcpWeight : 0,
-    fcpWeight: hasFcp ? fcpWeight : 0,
-    clsWeight: hasCls ? clsWeight : 0,
-    ttfbWeight: hasTtfb ? ttfbWeight : 0,
-    inpWeight: hasInp ? inpActualWeight : 0,
-  };
-};
diff --git a/static/app/views/insights/browser/webVitals/queries/storedScoreQueries/getWebVitalScoresFromTableDataRow.tsx b/static/app/views/insights/browser/webVitals/queries/storedScoreQueries/getWebVitalScoresFromTableDataRow.tsx
new file mode 100644
index 00000000000000..a26280d217689f
--- /dev/null
+++ b/static/app/views/insights/browser/webVitals/queries/storedScoreQueries/getWebVitalScoresFromTableDataRow.tsx
@@ -0,0 +1,50 @@
+import type {TableDataRow} from 'sentry/utils/discover/discoverQuery';
+import type {
+  ProjectScore,
+  WebVitals,
+} from 'sentry/views/insights/browser/webVitals/types';
+
+function getWebVitalScore(data: TableDataRow, webVital: WebVitals): number {
+  return (data[`performance_score(measurements.score.${webVital})`] as number) * 100;
+}
+
+function getTotalScore(data: TableDataRow): number {
+  return (data[`avg(measurements.score.total)`] as number) * 100;
+}
+
+function getWebVitalScoreCount(
+  data: TableDataRow,
+  webVital: WebVitals | 'total'
+): number {
+  return data[`count_scores(measurements.score.${webVital})`] as number;
+}
+
+function hasWebVitalScore(data: TableDataRow, webVital: WebVitals): boolean {
+  if (data.hasOwnProperty(`count_scores(measurements.score.${webVital})`)) {
+    return getWebVitalScoreCount(data, webVital) > 0;
+  }
+  return false;
+}
+
+export function getWebVitalScoresFromTableDataRow(data?: TableDataRow): ProjectScore {
+  if (!data) {
+    return {};
+  }
+
+  const [hasLcp, hasFcp, hasCls, hasTtfb, hasInp] = [
+    'lcp',
+    'fcp',
+    'cls',
+    'ttfb',
+    'inp',
+  ].map(webVital => hasWebVitalScore(data, webVital as WebVitals));
+
+  return {
+    lcpScore: hasLcp ? Math.round(getWebVitalScore(data, 'lcp')) : undefined,
+    fcpScore: hasFcp ? Math.round(getWebVitalScore(data, 'fcp')) : undefined,
+    clsScore: hasCls ? Math.round(getWebVitalScore(data, 'cls')) : undefined,
+    ttfbScore: hasTtfb ? Math.round(getWebVitalScore(data, 'ttfb')) : undefined,
+    inpScore: hasInp ? Math.round(getWebVitalScore(data, 'inp')) : undefined,
+    totalScore: Math.round(getTotalScore(data)),
+  };
+}
diff --git a/static/app/views/insights/browser/webVitals/queries/storedScoreQueries/useProjectWebVitalsScoresTimeseriesQuery.tsx b/static/app/views/insights/browser/webVitals/queries/storedScoreQueries/useProjectWebVitalsScoresTimeseriesQuery.tsx
index 346c69c2ce0583..343f9758a590fe 100644
--- a/static/app/views/insights/browser/webVitals/queries/storedScoreQueries/useProjectWebVitalsScoresTimeseriesQuery.tsx
+++ b/static/app/views/insights/browser/webVitals/queries/storedScoreQueries/useProjectWebVitalsScoresTimeseriesQuery.tsx
@@ -32,14 +32,6 @@ export type WebVitalsScoreBreakdown = {
   ttfb: SeriesDataUnit[];
 };
 
-export type UnweightedWebVitalsScoreBreakdown = {
-  unweightedCls: SeriesDataUnit[];
-  unweightedFcp: SeriesDataUnit[];
-  unweightedInp: SeriesDataUnit[];
-  unweightedLcp: SeriesDataUnit[];
-  unweightedTtfb: SeriesDataUnit[];
-};
-
 export const useProjectWebVitalsScoresTimeseriesQuery = ({
   transaction,
   tag,
@@ -66,11 +58,6 @@ export const useProjectWebVitalsScoresTimeseriesQuery = ({
   const projectTimeSeriesEventView = EventView.fromNewQueryWithPageFilters(
     {
       yAxis: [
-        'weighted_performance_score(measurements.score.lcp)',
-        'weighted_performance_score(measurements.score.fcp)',
-        'weighted_performance_score(measurements.score.cls)',
-        'weighted_performance_score(measurements.score.inp)',
-        'weighted_performance_score(measurements.score.ttfb)',
         'performance_score(measurements.score.lcp)',
         'performance_score(measurements.score.fcp)',
         'performance_score(measurements.score.cls)',
@@ -115,36 +102,19 @@ export const useProjectWebVitalsScoresTimeseriesQuery = ({
     referrer: 'api.performance.browser.web-vitals.timeseries-scores',
   });
 
-  const data: WebVitalsScoreBreakdown & UnweightedWebVitalsScoreBreakdown = {
+  const data: WebVitalsScoreBreakdown = {
     lcp: [],
     fcp: [],
     cls: [],
     ttfb: [],
     inp: [],
     total: [],
-    unweightedCls: [],
-    unweightedFcp: [],
-    unweightedInp: [],
-    unweightedLcp: [],
-    unweightedTtfb: [],
   };
 
-  result?.data?.['weighted_performance_score(measurements.score.lcp)']?.data.forEach(
+  result?.data?.['performance_score(measurements.score.lcp)']?.data.forEach(
     (interval, index) => {
-      // Weighted data
       ['lcp', 'fcp', 'cls', 'ttfb', 'inp'].forEach(webVital => {
         data[webVital].push({
-          value:
-            result?.data?.[`weighted_performance_score(measurements.score.${webVital})`]
-              ?.data[index][1][0].count * 100,
-          name: interval[0] * 1000,
-        });
-      });
-      // Unweighted data
-      ['lcp', 'fcp', 'cls', 'ttfb', 'inp'].forEach(webVital => {
-        // Capitalize first letter of webVital
-        const capitalizedWebVital = webVital.charAt(0).toUpperCase() + webVital.slice(1);
-        data[`unweighted${capitalizedWebVital}`].push({
           value:
             result?.data?.[`performance_score(measurements.score.${webVital})`]?.data[
               index
diff --git a/static/app/views/insights/browser/webVitals/queries/storedScoreQueries/useTransactionSamplesWebVitalsScoresQuery.tsx b/static/app/views/insights/browser/webVitals/queries/storedScoreQueries/useTransactionSamplesWebVitalsScoresQuery.tsx
index d5f0512075401c..1c6309df220807 100644
--- a/static/app/views/insights/browser/webVitals/queries/storedScoreQueries/useTransactionSamplesWebVitalsScoresQuery.tsx
+++ b/static/app/views/insights/browser/webVitals/queries/storedScoreQueries/useTransactionSamplesWebVitalsScoresQuery.tsx
@@ -130,27 +130,27 @@ export const useTransactionSamplesWebVitalsScoresQuery = ({
             trace: row.trace?.toString(),
             'user.display': row['user.display']?.toString(),
             transaction: row.transaction?.toString(),
-            'measurements.lcp': toNumber(row['measurements.lcp']),
-            'measurements.fcp': toNumber(row['measurements.fcp']),
-            'measurements.cls': toNumber(row['measurements.cls']),
-            'measurements.ttfb': toNumber(row['measurements.ttfb']),
-            'transaction.duration': toNumber(row['transaction.duration']),
+            'measurements.lcp': toNumber(row['measurements.lcp']!),
+            'measurements.fcp': toNumber(row['measurements.fcp']!),
+            'measurements.cls': toNumber(row['measurements.cls']!),
+            'measurements.ttfb': toNumber(row['measurements.ttfb']!),
+            'transaction.duration': toNumber(row['transaction.duration']!),
             replayId: row.replayId?.toString(),
             'profile.id': row['profile.id']?.toString(),
             projectSlug: row.project?.toString(),
             timestamp: row.timestamp?.toString(),
             totalScore: Math.round(
-              (toNumber(row['measurements.score.total']) ?? 0) * 100
+              (toNumber(row['measurements.score.total']!) ?? 0) * 100
             ),
             ...(webVital
               ? {
                   [`${webVital}Score`]: Math.round(
-                    ((toNumber(row[`measurements.score.${webVital}`]) ?? 0) /
-                      (toNumber(row[`measurements.score.weight.${webVital}`]) ?? 0)) *
+                    ((toNumber(row[`measurements.score.${webVital}`]!) ?? 0) /
+                      (toNumber(row[`measurements.score.weight.${webVital}`]!) ?? 0)) *
                       100
                   ),
                   [`${webVital}Weight`]: Math.round(
-                    (toNumber(row[`measurements.score.weight.${webVital}`]) ?? 0) * 100
+                    (toNumber(row[`measurements.score.weight.${webVital}`]!) ?? 0) * 100
                   ),
                 }
               : {}),
diff --git a/static/app/views/insights/browser/webVitals/queries/storedScoreQueries/useTransactionWebVitalsScoresQuery.tsx b/static/app/views/insights/browser/webVitals/queries/storedScoreQueries/useTransactionWebVitalsScoresQuery.tsx
index 83e8ae61dccfef..7ec6aa1a9d9559 100644
--- a/static/app/views/insights/browser/webVitals/queries/storedScoreQueries/useTransactionWebVitalsScoresQuery.tsx
+++ b/static/app/views/insights/browser/webVitals/queries/storedScoreQueries/useTransactionWebVitalsScoresQuery.tsx
@@ -6,7 +6,7 @@ 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 {calculatePerformanceScoreFromStoredTableDataRow} from 'sentry/views/insights/browser/webVitals/queries/storedScoreQueries/calculatePerformanceScoreFromStored';
+import {getWebVitalScoresFromTableDataRow} from 'sentry/views/insights/browser/webVitals/queries/storedScoreQueries/getWebVitalScoresFromTableDataRow';
 import {DEFAULT_QUERY_FILTER} from 'sentry/views/insights/browser/webVitals/settings';
 import type {
   RowWithScoreAndOpportunity,
@@ -124,11 +124,11 @@ export const useTransactionWebVitalsScoresQuery = ({
               row['performance_score(measurements.score.total)'];
           }
           const {totalScore, clsScore, fcpScore, lcpScore, ttfbScore, inpScore} =
-            calculatePerformanceScoreFromStoredTableDataRow(row);
+            getWebVitalScoresFromTableDataRow(row);
           return {
-            transaction: row.transaction?.toString(),
-            project: row.project?.toString(),
-            'project.id': parseInt(row['project.id'].toString(), 10),
+            transaction: row.transaction!?.toString(),
+            project: row.project!?.toString(),
+            'project.id': parseInt(row['project.id']!.toString(), 10),
             'p75(measurements.lcp)': row['p75(measurements.lcp)'] as number,
             'p75(measurements.fcp)': row['p75(measurements.fcp)'] as number,
             'p75(measurements.cls)': row['p75(measurements.cls)'] as number,
diff --git a/static/app/views/insights/browser/webVitals/types.tsx b/static/app/views/insights/browser/webVitals/types.tsx
index 5c6069d6dc8c87..45bbe7c8f1cd63 100644
--- a/static/app/views/insights/browser/webVitals/types.tsx
+++ b/static/app/views/insights/browser/webVitals/types.tsx
@@ -40,8 +40,6 @@ type Score = {
   ttfbScore: number;
 };
 
-export type ScoreWithWeightsAndOpportunity = Score & Weight & Opportunity;
-
 export type InteractionSpanSampleRow = {
   [SpanIndexedField.INP]: number;
   'profile.id': string;
@@ -58,19 +56,11 @@ export type InteractionSpanSampleRowWithScore = InteractionSpanSampleRow & {
   totalScore: number;
 };
 
-export type Weight = {
-  clsWeight: number;
-  fcpWeight: number;
-  inpWeight: number;
-  lcpWeight: number;
-  ttfbWeight: number;
-};
-
 export type Opportunity = {
   opportunity: number;
 };
 
-export type ProjectScore = Partial<Score> & Weight;
+export type ProjectScore = Partial<Score>;
 
 export type RowWithScoreAndOpportunity = Row & Score & Opportunity;
 
diff --git a/static/app/views/insights/browser/webVitals/utils/applyStaticWeightsToTimeseries.spec.tsx b/static/app/views/insights/browser/webVitals/utils/applyStaticWeightsToTimeseries.spec.tsx
index 8bbe2c6125cf8f..35b80141833dee 100644
--- a/static/app/views/insights/browser/webVitals/utils/applyStaticWeightsToTimeseries.spec.tsx
+++ b/static/app/views/insights/browser/webVitals/utils/applyStaticWeightsToTimeseries.spec.tsx
@@ -1,30 +1,28 @@
+import {OrganizationFixture} from 'sentry-fixture/organization';
+
 import {applyStaticWeightsToTimeseries} from 'sentry/views/insights/browser/webVitals/utils/applyStaticWeightsToTimeseries';
 
 describe('applyStaticWeightsToTimeseries', function () {
   it('updates timeseries scores with static weighing', function () {
+    const organization = OrganizationFixture();
     const timeseriesData = {
-      lcp: [],
-      fcp: [],
-      cls: [],
-      ttfb: [],
-      inp: [],
-      unweightedLcp: [
+      lcp: [
         {name: '2024-07-01T00:00:00.000Z', value: 90},
         {name: '2024-07-02T00:00:00.000Z', value: 40},
       ],
-      unweightedFcp: [
+      fcp: [
         {name: '2024-07-01T00:00:00.000Z', value: 30},
         {name: '2024-07-02T00:00:00.000Z', value: 20},
       ],
-      unweightedCls: [
+      cls: [
         {name: '2024-07-01T00:00:00.000Z', value: 10},
         {name: '2024-07-02T00:00:00.000Z', value: 90},
       ],
-      unweightedTtfb: [
+      ttfb: [
         {name: '2024-07-01T00:00:00.000Z', value: 22},
         {name: '2024-07-02T00:00:00.000Z', value: 43},
       ],
-      unweightedInp: [
+      inp: [
         {name: '2024-07-01T00:00:00.000Z', value: 100},
         {name: '2024-07-02T00:00:00.000Z', value: 0},
       ],
@@ -33,7 +31,7 @@ describe('applyStaticWeightsToTimeseries', function () {
         {name: '2024-07-02T00:00:00.000Z', value: 50},
       ],
     };
-    const result = applyStaticWeightsToTimeseries(timeseriesData);
+    const result = applyStaticWeightsToTimeseries(organization, timeseriesData);
     expect(result).toEqual({
       lcp: [
         {name: '2024-07-01T00:00:00.000Z', value: 90 * 0.3},
diff --git a/static/app/views/insights/browser/webVitals/utils/applyStaticWeightsToTimeseries.tsx b/static/app/views/insights/browser/webVitals/utils/applyStaticWeightsToTimeseries.tsx
index 234c2137f9f040..1be5b5e7308328 100644
--- a/static/app/views/insights/browser/webVitals/utils/applyStaticWeightsToTimeseries.tsx
+++ b/static/app/views/insights/browser/webVitals/utils/applyStaticWeightsToTimeseries.tsx
@@ -1,23 +1,33 @@
-import type {
-  UnweightedWebVitalsScoreBreakdown,
-  WebVitalsScoreBreakdown,
-} from 'sentry/views/insights/browser/webVitals/queries/storedScoreQueries/useProjectWebVitalsScoresTimeseriesQuery';
+import type {Organization} from 'sentry/types/organization';
+import type {WebVitalsScoreBreakdown} from 'sentry/views/insights/browser/webVitals/queries/storedScoreQueries/useProjectWebVitalsScoresTimeseriesQuery';
+import type {WebVitals} from 'sentry/views/insights/browser/webVitals/types';
+import {getWeights} from 'sentry/views/insights/browser/webVitals/utils/getWeights';
 import {PERFORMANCE_SCORE_WEIGHTS} from 'sentry/views/insights/browser/webVitals/utils/scoreThresholds';
 
 // Returns a weighed score timeseries with each interval calculated from applying hardcoded weights to unweighted scores
 export function applyStaticWeightsToTimeseries(
-  timeseriesData: WebVitalsScoreBreakdown & UnweightedWebVitalsScoreBreakdown
+  organization: Organization,
+  timeseriesData: WebVitalsScoreBreakdown
 ) {
+  const weights = organization.features.includes(
+    'performance-vitals-handle-missing-webvitals'
+  )
+    ? getWeights(
+        Object.keys(timeseriesData)
+          .filter(key => key !== 'total')
+          .filter(key =>
+            timeseriesData[key].some(series => series.value > 0)
+          ) as WebVitals[]
+      )
+    : PERFORMANCE_SCORE_WEIGHTS;
   return {
-    ...Object.keys(PERFORMANCE_SCORE_WEIGHTS).reduce((acc, webVital) => {
-      acc[webVital] = timeseriesData[
-        `unweighted${webVital.charAt(0).toUpperCase()}${webVital.slice(1)}`
-      ].map(({name, value}) => ({
+    ...Object.keys(weights).reduce((acc, webVital) => {
+      acc[webVital] = timeseriesData[webVital].map(({name, value}) => ({
         name,
-        value: value * PERFORMANCE_SCORE_WEIGHTS[webVital] * 0.01,
+        value: value * weights[webVital] * 0.01,
       }));
       return acc;
     }, {}),
     total: timeseriesData.total,
-  } as WebVitalsScoreBreakdown & UnweightedWebVitalsScoreBreakdown;
+  } as WebVitalsScoreBreakdown;
 }
diff --git a/static/app/views/insights/browser/webVitals/utils/getWeights.tsx b/static/app/views/insights/browser/webVitals/utils/getWeights.tsx
new file mode 100644
index 00000000000000..6d029df7fcad2a
--- /dev/null
+++ b/static/app/views/insights/browser/webVitals/utils/getWeights.tsx
@@ -0,0 +1,20 @@
+import {ORDER} from 'sentry/views/insights/browser/webVitals/components/charts/performanceScoreChart';
+import type {WebVitals} from 'sentry/views/insights/browser/webVitals/types';
+import {PERFORMANCE_SCORE_WEIGHTS} from 'sentry/views/insights/browser/webVitals/utils/scoreThresholds';
+
+export function getWeights(webVitals: WebVitals[] = []): Record<WebVitals, number> {
+  const totalWeight = ORDER.filter(webVital => webVitals.includes(webVital)).reduce(
+    (acc, webVital) => acc + PERFORMANCE_SCORE_WEIGHTS[webVital],
+    0
+  );
+  return Object.keys(PERFORMANCE_SCORE_WEIGHTS).reduce(
+    (acc, webVital) => {
+      acc[webVital] =
+        (webVitals.includes(webVital as WebVitals)
+          ? PERFORMANCE_SCORE_WEIGHTS[webVital] * 100
+          : 0) / totalWeight;
+      return acc;
+    },
+    {} as Record<WebVitals, number>
+  );
+}
diff --git a/static/app/views/insights/browser/webVitals/utils/scoreThresholds.tsx b/static/app/views/insights/browser/webVitals/utils/scoreThresholds.tsx
index 6d40d25ab79007..c1f4dbec64eac7 100644
--- a/static/app/views/insights/browser/webVitals/utils/scoreThresholds.tsx
+++ b/static/app/views/insights/browser/webVitals/utils/scoreThresholds.tsx
@@ -1,4 +1,6 @@
-export const PERFORMANCE_SCORE_WEIGHTS = {
+import type {WebVitals} from 'sentry/views/insights/browser/webVitals/types';
+
+export const PERFORMANCE_SCORE_WEIGHTS: Record<WebVitals, number> = {
   lcp: 30,
   fcp: 15,
   inp: 30,
@@ -6,7 +8,7 @@ export const PERFORMANCE_SCORE_WEIGHTS = {
   ttfb: 10,
 };
 
-export const PERFORMANCE_SCORE_MEDIANS = {
+export const PERFORMANCE_SCORE_MEDIANS: Record<WebVitals, number> = {
   lcp: 2400,
   fcp: 1600,
   cls: 0.25,
@@ -14,7 +16,7 @@ export const PERFORMANCE_SCORE_MEDIANS = {
   inp: 500,
 };
 
-export const PERFORMANCE_SCORE_P90S = {
+export const PERFORMANCE_SCORE_P90S: Record<WebVitals, number> = {
   lcp: 1200,
   fcp: 900,
   cls: 0.1,
diff --git a/static/app/views/insights/browser/webVitals/views/pageOverview.spec.tsx b/static/app/views/insights/browser/webVitals/views/pageOverview.spec.tsx
index 7b4fb8c26d50d7..bdd75bcbaa7aae 100644
--- a/static/app/views/insights/browser/webVitals/views/pageOverview.spec.tsx
+++ b/static/app/views/insights/browser/webVitals/views/pageOverview.spec.tsx
@@ -14,7 +14,7 @@ describe('PageOverview', function () {
     features: ['insights-initial-modules'],
   });
 
-  let eventsMock;
+  let eventsMock: jest.Mock;
 
   beforeEach(function () {
     jest.mocked(useLocation).mockReturnValue({
diff --git a/static/app/views/insights/browser/webVitals/views/pageOverview.tsx b/static/app/views/insights/browser/webVitals/views/pageOverview.tsx
index 612eff239f9e53..edf82257080230 100644
--- a/static/app/views/insights/browser/webVitals/views/pageOverview.tsx
+++ b/static/app/views/insights/browser/webVitals/views/pageOverview.tsx
@@ -11,9 +11,9 @@ import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import {defined} from 'sentry/utils';
 import {trackAnalytics} from 'sentry/utils/analytics';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {decodeList, decodeScalar} from 'sentry/utils/queryString';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import useProjects from 'sentry/utils/useProjects';
 import useRouter from 'sentry/utils/useRouter';
@@ -24,7 +24,7 @@ import {PageOverviewWebVitalsDetailPanel} from 'sentry/views/insights/browser/we
 import {PageSamplePerformanceTable} from 'sentry/views/insights/browser/webVitals/components/tables/pageSamplePerformanceTable';
 import WebVitalMeters from 'sentry/views/insights/browser/webVitals/components/webVitalMeters';
 import {useProjectRawWebVitalsQuery} from 'sentry/views/insights/browser/webVitals/queries/rawWebVitalsQueries/useProjectRawWebVitalsQuery';
-import {calculatePerformanceScoreFromStoredTableDataRow} from 'sentry/views/insights/browser/webVitals/queries/storedScoreQueries/calculatePerformanceScoreFromStored';
+import {getWebVitalScoresFromTableDataRow} from 'sentry/views/insights/browser/webVitals/queries/storedScoreQueries/getWebVitalScoresFromTableDataRow';
 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';
@@ -66,6 +66,7 @@ function getCurrentTabSelection(selectedTab) {
 }
 
 export function PageOverview() {
+  const navigate = useNavigate();
   const moduleURL = useModuleURL('vital');
   const organization = useOrganization();
   const location = useLocation();
@@ -126,14 +127,14 @@ export function PageOverview() {
   const projectScore =
     isProjectScoresLoading || isPending
       ? undefined
-      : calculatePerformanceScoreFromStoredTableDataRow(projectScores?.data?.[0]);
+      : getWebVitalScoresFromTableDataRow(projectScores?.data?.[0]);
 
   const handleTabChange = (value: string) => {
     trackAnalytics('insight.vital.overview.toggle_tab', {
       organization,
       tab: value,
     });
-    browserHistory.push({
+    navigate({
       ...location,
       query: {
         ...location.query,
@@ -163,7 +164,7 @@ export function PageOverview() {
                 }}
                 size="sm"
               >
-                {t('View Transaction Summary')}
+                {t('View Summary')}
               </LinkButton>
             )
           }
diff --git a/static/app/views/insights/browser/webVitals/views/webVitalsLandingPage.spec.tsx b/static/app/views/insights/browser/webVitals/views/webVitalsLandingPage.spec.tsx
index 25cb3ea6eecf03..2ebc8613a0c75c 100644
--- a/static/app/views/insights/browser/webVitals/views/webVitalsLandingPage.spec.tsx
+++ b/static/app/views/insights/browser/webVitals/views/webVitalsLandingPage.spec.tsx
@@ -19,7 +19,7 @@ describe('WebVitalsLandingPage', function () {
     features: ['insights-initial-modules'],
   });
 
-  let eventsMock;
+  let eventsMock: jest.Mock;
 
   beforeEach(function () {
     jest.mocked(useOnboardingProject).mockReturnValue(undefined);
diff --git a/static/app/views/insights/browser/webVitals/views/webVitalsLandingPage.tsx b/static/app/views/insights/browser/webVitals/views/webVitalsLandingPage.tsx
index 89a23b43b3677a..689e89adcbf2f1 100644
--- a/static/app/views/insights/browser/webVitals/views/webVitalsLandingPage.tsx
+++ b/static/app/views/insights/browser/webVitals/views/webVitalsLandingPage.tsx
@@ -19,7 +19,7 @@ import {PagePerformanceTable} from 'sentry/views/insights/browser/webVitals/comp
 import WebVitalMeters from 'sentry/views/insights/browser/webVitals/components/webVitalMeters';
 import {WebVitalsDetailPanel} from 'sentry/views/insights/browser/webVitals/components/webVitalsDetailPanel';
 import {useProjectRawWebVitalsQuery} from 'sentry/views/insights/browser/webVitals/queries/rawWebVitalsQueries/useProjectRawWebVitalsQuery';
-import {calculatePerformanceScoreFromStoredTableDataRow} from 'sentry/views/insights/browser/webVitals/queries/storedScoreQueries/calculatePerformanceScoreFromStored';
+import {getWebVitalScoresFromTableDataRow} from 'sentry/views/insights/browser/webVitals/queries/storedScoreQueries/getWebVitalScoresFromTableDataRow';
 import {useProjectWebVitalsScoresQuery} from 'sentry/views/insights/browser/webVitals/queries/storedScoreQueries/useProjectWebVitalsScoresQuery';
 import {
   MODULE_DESCRIPTION,
@@ -65,7 +65,7 @@ export function WebVitalsLandingPage() {
   const projectScore =
     isProjectScoresLoading || isPending
       ? undefined
-      : calculatePerformanceScoreFromStoredTableDataRow(projectScores?.data?.[0]);
+      : getWebVitalScoresFromTableDataRow(projectScores?.data?.[0]);
 
   return (
     <React.Fragment>
diff --git a/static/app/views/insights/cache/components/charts/transactionDurationChart.tsx b/static/app/views/insights/cache/components/charts/transactionDurationChart.tsx
index c8cdcdf871ab41..5af4d29eb72f39 100644
--- a/static/app/views/insights/cache/components/charts/transactionDurationChart.tsx
+++ b/static/app/views/insights/cache/components/charts/transactionDurationChart.tsx
@@ -65,7 +65,7 @@ export function TransactionDurationChart({
     const highlightedDataPoints = event.batch.map(batch => {
       const {seriesIndex, dataIndex} = batch;
 
-      const highlightedSeries = allSeries?.[seriesIndex];
+      const highlightedSeries = allSeries?.[seriesIndex]!;
       const highlightedDataPoint = highlightedSeries.data?.[dataIndex];
 
       return {series: highlightedSeries, dataPoint: highlightedDataPoint};
diff --git a/static/app/views/insights/cache/components/samplePanel.tsx b/static/app/views/insights/cache/components/samplePanel.tsx
index fa7f92b95f9e84..cccee628a406c5 100644
--- a/static/app/views/insights/cache/components/samplePanel.tsx
+++ b/static/app/views/insights/cache/components/samplePanel.tsx
@@ -223,7 +223,7 @@ export function CacheSamplePanel() {
     cacheSamples?.map(span => ({
       ...span,
       'transaction.duration':
-        transactionDurationsMap[span['transaction.id']]?.['transaction.duration'],
+        transactionDurationsMap[span['transaction.id']]?.['transaction.duration']!,
     })) || [];
 
   const {projects} = useProjects();
@@ -340,7 +340,7 @@ export function CacheSamplePanel() {
                 value={cacheTransactionMetrics?.[0]?.['sum(span.self_time)']}
                 unit={DurationUnit.MILLISECOND}
                 tooltip={getTimeSpentExplanation(
-                  cacheTransactionMetrics?.[0]?.['time_spent_percentage()']
+                  cacheTransactionMetrics?.[0]!?.['time_spent_percentage()']
                 )}
                 isLoading={areCacheTransactionMetricsFetching}
               />
@@ -366,7 +366,7 @@ export function CacheSamplePanel() {
             <TransactionDurationChart
               samples={spansWithDuration}
               averageTransactionDuration={
-                transactionDurationData?.[0]?.[
+                transactionDurationData?.[0]!?.[
                   `avg(${MetricsFields.TRANSACTION_DURATION})`
                 ]
               }
diff --git a/static/app/views/insights/cache/components/tables/transactionsTable.tsx b/static/app/views/insights/cache/components/tables/transactionsTable.tsx
index 720686d740b7e5..bdd3c6a346dab8 100644
--- a/static/app/views/insights/cache/components/tables/transactionsTable.tsx
+++ b/static/app/views/insights/cache/components/tables/transactionsTable.tsx
@@ -10,11 +10,11 @@ import Pagination from 'sentry/components/pagination';
 import {t} from 'sentry/locale';
 import type {Organization} from 'sentry/types/organization';
 import {trackAnalytics} from 'sentry/utils/analytics';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import type {EventsMetaType} from 'sentry/utils/discover/eventView';
 import {getFieldRenderer} from 'sentry/utils/discover/fieldRenderers';
 import {RATE_UNIT_TITLE, RateUnit, type Sort} from 'sentry/utils/discover/fields';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import {TransactionCell} from 'sentry/views/insights/cache/components/tables/transactionCell';
 import {renderHeadCell} from 'sentry/views/insights/common/components/tableCells/renderHeadCell';
@@ -126,11 +126,12 @@ export function TransactionsTable({
   pageLinks,
   sort,
 }: Props) {
+  const navigate = useNavigate();
   const location = useLocation();
   const organization = useOrganization();
 
   const handleCursor: CursorHandler = (newCursor, pathname, query) => {
-    browserHistory.push({
+    navigate({
       pathname,
       query: {...query, [QueryParameterNames.TRANSACTIONS_CURSOR]: newCursor},
     });
diff --git a/static/app/views/insights/cache/views/cacheLandingPage.tsx b/static/app/views/insights/cache/views/cacheLandingPage.tsx
index 1ac8e199d2a1fe..f3194f6fb587e2 100644
--- a/static/app/views/insights/cache/views/cacheLandingPage.tsx
+++ b/static/app/views/insights/cache/views/cacheLandingPage.tsx
@@ -168,7 +168,7 @@ export function CacheLandingPage() {
     transactionsList?.map(transaction => ({
       ...transaction,
       'avg(transaction.duration)':
-        transactionDurationsMap[transaction.transaction]?.['avg(transaction.duration)'],
+        transactionDurationsMap[transaction.transaction]?.['avg(transaction.duration)']!,
     })) || [];
 
   const meta = combineMeta(transactionsListMeta, transactionDurationMeta);
diff --git a/static/app/views/insights/colors.tsx b/static/app/views/insights/colors.tsx
index 104a5098132908..55e01303742b20 100644
--- a/static/app/views/insights/colors.tsx
+++ b/static/app/views/insights/colors.tsx
@@ -2,13 +2,13 @@ import Color from 'color';
 
 import {CHART_PALETTE} from 'sentry/constants/chartPalette';
 
-export const COUNT_COLOR = CHART_PALETTE[0][0];
-export const THROUGHPUT_COLOR = CHART_PALETTE[3][3];
-export const TXN_THROUGHPUT_COLOR = CHART_PALETTE[3][2];
-export const P50_COLOR = CHART_PALETTE[3][1];
-export const P95_COLOR = CHART_PALETTE[0][0];
-export const AVG_COLOR = CHART_PALETTE[0][0];
-export const ERRORS_COLOR = CHART_PALETTE[5][3];
+export const COUNT_COLOR = CHART_PALETTE[0]![0]!;
+export const THROUGHPUT_COLOR = CHART_PALETTE[3]![3]!;
+export const TXN_THROUGHPUT_COLOR = CHART_PALETTE[3]![2]!;
+export const P50_COLOR = CHART_PALETTE[3]![1]!;
+export const P95_COLOR = CHART_PALETTE[0]![0]!;
+export const AVG_COLOR = CHART_PALETTE[0]![0]!;
+export const ERRORS_COLOR = CHART_PALETTE[5]![3]!;
 
 // TODO: Synchronize with `theme.tsx` or `CHART_PALETTE`
 export const HTTP_RESPONSE_3XX_COLOR = '#F2B712';
diff --git a/static/app/views/insights/common/components/chart.spec.tsx b/static/app/views/insights/common/components/chart.spec.tsx
index 0e5f7fee800202..069fe27a350330 100644
--- a/static/app/views/insights/common/components/chart.spec.tsx
+++ b/static/app/views/insights/common/components/chart.spec.tsx
@@ -56,10 +56,10 @@ describe('Chart', function () {
       },
     ];
     render(<Chart data={mockedSeries} loading={false} type={ChartType.LINE} />);
-    expect(jest.mocked(BaseChart).mock.calls[0][0].series?.[0]).toHaveProperty(
+    expect(jest.mocked(BaseChart).mock.calls[0]![0].series?.[0]).toHaveProperty(
       'markLine'
     );
-    expect(jest.mocked(BaseChart).mock.calls[0][0].series?.[1]).not.toHaveProperty(
+    expect(jest.mocked(BaseChart).mock.calls[0]![0].series?.[1]).not.toHaveProperty(
       'markLine'
     );
   });
diff --git a/static/app/views/insights/common/components/chart.tsx b/static/app/views/insights/common/components/chart.tsx
index 8e3093c7a80dae..964323b668b242 100644
--- a/static/app/views/insights/common/components/chart.tsx
+++ b/static/app/views/insights/common/components/chart.tsx
@@ -2,7 +2,7 @@ import type {RefObject} from 'react';
 import {createContext, useContext, useEffect, useMemo, useReducer, useRef} from 'react';
 import {useTheme} from '@emotion/react';
 import styled from '@emotion/styled';
-import type {LineSeriesOption} from 'echarts';
+import type {LegendComponentOption, LineSeriesOption} from 'echarts';
 import * as echarts from 'echarts/core';
 import type {
   MarkLineOption,
@@ -88,6 +88,7 @@ type Props = {
   hideYAxis?: boolean;
   hideYAxisSplitLine?: boolean;
   legendFormatter?: (name: string) => string;
+  legendOptions?: LegendComponentOption;
   log?: boolean;
   markLine?: MarkLineOption;
   onClick?: EChartClickHandler;
@@ -139,6 +140,7 @@ function Chart({
   error,
   onLegendSelectChanged,
   onDataZoom,
+  legendOptions,
   /**
    * Setting a default formatter for some reason causes `>` to
    * render correctly instead of rendering as `&gt;` in the legend.
@@ -163,7 +165,7 @@ function Chart({
     echartsInstance.group = chartGroup ?? STARFISH_CHART_GROUP;
   }
 
-  const colors = chartColors ?? theme.charts.getColorPalette(4);
+  const colors = chartColors ?? theme.charts.getColorPalette(4)!;
 
   const durationOnly =
     aggregateOutputFormat === 'duration' ||
@@ -227,10 +229,10 @@ function Chart({
   let incompleteSeries: Series[] = [];
 
   const bucketSize =
-    new Date(series[0]?.data[1]?.name).getTime() -
-    new Date(series[0]?.data[0]?.name).getTime();
+    new Date(series[0]!?.data[1]!?.name).getTime() -
+    new Date(series[0]!?.data[0]!?.name).getTime();
   const lastBucketTimestamp = new Date(
-    series[0]?.data?.[series[0]?.data?.length - 1]?.name
+    series[0]!?.data?.[series[0]!?.data?.length - 1]!?.name
   ).getTime();
   const ingestionBuckets = useMemo(() => {
     if (isNaN(bucketSize) || isNaN(lastBucketTimestamp)) {
@@ -260,10 +262,10 @@ function Chart({
     [series, incompleteSeries] = seriesToShow.reduce(
       (acc, serie, index) => {
         const [trimmed, incomplete] = acc;
-        const {markLine: _, ...incompleteSerie} = serie[1] ?? {};
+        const {markLine: _, ...incompleteSerie} = serie[1]! ?? {};
 
         return [
-          [...trimmed, {...serie[0], color: colors[index]}],
+          [...trimmed, {...serie[0]!, color: colors[index]!}],
           [
             ...incomplete,
             ...(Object.keys(incompleteSerie).length > 0 ? [incompleteSerie] : []),
@@ -285,7 +287,7 @@ function Chart({
         formatter(value: number) {
           return axisLabelFormatter(
             value,
-            aggregateOutputFormat ?? aggregateOutputType(data[0].seriesName),
+            aggregateOutputFormat ?? aggregateOutputType(data[0]!.seriesName),
             true,
             durationUnit ?? getDurationUnit(data),
             rateUnit
@@ -346,6 +348,10 @@ function Chart({
     })(deDupedParams, asyncTicket);
   };
 
+  const legend = isLegendVisible
+    ? {top: 0, right: 10, formatter: legendFormatter, ...legendOptions}
+    : undefined;
+
   const areaChartProps = {
     seriesOptions: {
       showSymbol: false,
@@ -353,7 +359,7 @@ function Chart({
     grid,
     yAxes,
     utc,
-    legend: isLegendVisible ? {top: 0, right: 10, formatter: legendFormatter} : undefined,
+    legend,
     isGroupedByDate: true,
     showTimeInTooltip: true,
     tooltip: {
@@ -367,7 +373,7 @@ function Chart({
         return tooltipFormatter(
           value,
           aggregateOutputFormat ??
-            aggregateOutputType(data?.length ? data[0].seriesName : seriesName)
+            aggregateOutputType(data?.length ? data[0]!.seriesName : seriesName)
         );
       },
       nameFormatter(value: string) {
@@ -401,9 +407,7 @@ function Chart({
           tooltip={areaChartProps.tooltip}
           colors={colors}
           grid={grid}
-          legend={
-            isLegendVisible ? {top: 0, right: 10, formatter: legendFormatter} : undefined
-          }
+          legend={legend}
           onClick={onClick}
           onMouseOut={onMouseOut}
           onMouseOver={onMouseOver}
@@ -468,7 +472,7 @@ function Chart({
               formatter(value: number) {
                 return axisLabelFormatter(
                   value,
-                  aggregateOutputFormat ?? aggregateOutputType(data[0].seriesName),
+                  aggregateOutputFormat ?? aggregateOutputType(data[0]!.seriesName),
                   true,
                   durationUnit ?? getDurationUnit(data),
                   rateUnit
@@ -481,15 +485,13 @@ function Chart({
               return tooltipFormatter(
                 value,
                 aggregateOutputFormat ??
-                  aggregateOutputType(data?.length ? data[0].seriesName : seriesName)
+                  aggregateOutputType(data?.length ? data[0]!.seriesName : seriesName)
               );
             },
           }}
           colors={colors}
           grid={grid}
-          legend={
-            isLegendVisible ? {top: 0, right: 10, formatter: legendFormatter} : undefined
-          }
+          legend={legend}
           onClick={onClick}
         />
       );
@@ -587,7 +589,7 @@ export function computeAxisMax(data: Series[], stacked?: boolean) {
   let maxValue = 0;
   if (data.length > 1 && stacked) {
     for (let i = 0; i < data.length; i++) {
-      maxValue += max(data[i].data.map(point => point.value)) as number;
+      maxValue += max(data[i]!.data.map(point => point.value)) as number;
     }
   } else {
     maxValue = computeMax(data);
diff --git a/static/app/views/insights/common/components/fullSpanDescription.spec.tsx b/static/app/views/insights/common/components/fullSpanDescription.spec.tsx
index a97a94039c757a..75df64db45e015 100644
--- a/static/app/views/insights/common/components/fullSpanDescription.spec.tsx
+++ b/static/app/views/insights/common/components/fullSpanDescription.spec.tsx
@@ -81,7 +81,7 @@ describe('FullSpanDescription', function () {
       {organization}
     );
 
-    await waitForElementToBeRemoved(() => screen.getByTestId('loading-indicator'));
+    await waitForElementToBeRemoved(() => screen.queryByTestId('loading-indicator'));
 
     const queryCodeSnippet = await screen.findByText(
       /select users from my_table limit 1;/i
@@ -127,7 +127,7 @@ describe('FullSpanDescription', function () {
       organization,
     });
 
-    await waitForElementToBeRemoved(() => screen.getByTestId('loading-indicator'));
+    await waitForElementToBeRemoved(() => screen.queryByTestId('loading-indicator'));
 
     const queryCodeSnippet = screen.getByText(
       /\{ "insert": "my_cool_collection😎", "a": \{\} \}/i
@@ -173,7 +173,7 @@ describe('FullSpanDescription', function () {
       organization,
     });
 
-    await waitForElementToBeRemoved(() => screen.getByTestId('loading-indicator'));
+    await waitForElementToBeRemoved(() => screen.queryByTestId('loading-indicator'));
 
     // The last truncated entry will have a null value assigned and the JSON document is properly closed
     const queryCodeSnippet = screen.getByText(
diff --git a/static/app/views/insights/common/components/issues.tsx b/static/app/views/insights/common/components/issues.tsx
index 1c4e67e8f4b7ef..483c503dec98b1 100644
--- a/static/app/views/insights/common/components/issues.tsx
+++ b/static/app/views/insights/common/components/issues.tsx
@@ -37,8 +37,8 @@ function Issue({data}: {data: Group}) {
       </IssueSummaryWrapper>
       <ChartWrapper>
         <GroupChart
-          stats={data.filtered ? data.filtered.stats?.['24h'] : data.stats?.['24h']}
-          secondaryStats={data.filtered ? data.stats?.['24h'] : []}
+          stats={data.filtered ? data.filtered.stats?.['24h']! : data.stats?.['24h']!}
+          secondaryStats={data.filtered ? data.stats?.['24h']! : []}
           showSecondaryPoints
           showMarkLine
         />
diff --git a/static/app/views/insights/common/components/modulesOnboarding.spec.tsx b/static/app/views/insights/common/components/modulesOnboarding.spec.tsx
index b1d8f1ea48ca10..a9f266927ce11c 100644
--- a/static/app/views/insights/common/components/modulesOnboarding.spec.tsx
+++ b/static/app/views/insights/common/components/modulesOnboarding.spec.tsx
@@ -18,7 +18,7 @@ describe('ModulesOnboarding', () => {
     jest.resetAllMocks();
   });
 
-  it('renders children correctly', async () => {
+  it('renders children correctly', () => {
     const project = ProjectFixture({hasInsightsCaches: true});
     project.firstTransactionEvent = true;
     project.hasInsightsCaches = true;
@@ -59,7 +59,7 @@ describe('ModulesOnboarding', () => {
       </ModulesOnboarding>
     );
 
-    await screen.getByText('Module Content');
+    screen.getByText('Module Content');
   });
 
   it('renders onboarding content correctly', async () => {
diff --git a/static/app/views/insights/common/components/modulesOnboarding.tsx b/static/app/views/insights/common/components/modulesOnboarding.tsx
index 7a4aa7b488ec8d..b090f2430f9062 100644
--- a/static/app/views/insights/common/components/modulesOnboarding.tsx
+++ b/static/app/views/insights/common/components/modulesOnboarding.tsx
@@ -480,4 +480,20 @@ const EMPTY_STATE_CONTENT: Record<TitleableModuleNames, EmptyStateContent> = {
     ],
     supportedSdks: ['android', 'flutter', 'apple-ios', 'react-native'],
   },
+  // XXX(epurkhiser): Crons does not use the insights onboarding component.
+  crons: {
+    description: null,
+    heading: null,
+    imageSrc: null,
+    valuePropDescription: null,
+    valuePropPoints: [],
+  },
+  // XXX(epurkhiser): Uptime does not use the insights onboarding component.
+  uptime: {
+    description: null,
+    heading: null,
+    imageSrc: null,
+    valuePropDescription: null,
+    valuePropPoints: [],
+  },
 };
diff --git a/static/app/views/insights/common/components/releaseSelector.tsx b/static/app/views/insights/common/components/releaseSelector.tsx
index a6381a99e007f2..4d294c7e405cf8 100644
--- a/static/app/views/insights/common/components/releaseSelector.tsx
+++ b/static/app/views/insights/common/components/releaseSelector.tsx
@@ -10,9 +10,9 @@ import {IconReleases} from 'sentry/icons/iconReleases';
 import {t, tn} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import {defined} from 'sentry/utils';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {getFormattedDate} from 'sentry/utils/dates';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import {
   useReleases,
   useReleaseSelection,
@@ -33,6 +33,7 @@ export function ReleaseSelector({selectorKey, selectorValue, triggerLabelPrefix}
   const [searchTerm, setSearchTerm] = useState<string | undefined>(undefined);
   const {data, isLoading} = useReleases(searchTerm);
   const {primaryRelease, secondaryRelease} = useReleaseSelection();
+  const navigate = useNavigate();
   const location = useLocation();
 
   const options: SelectOption<string>[] = [];
@@ -97,7 +98,7 @@ export function ReleaseSelector({selectorKey, selectorValue, triggerLabelPrefix}
         setSearchTerm(val);
       }, DEFAULT_DEBOUNCE_DURATION)}
       onChange={newValue => {
-        browserHistory.push({
+        navigate({
           ...location,
           query: {
             ...location.query,
diff --git a/static/app/views/insights/common/components/spanDescription.spec.tsx b/static/app/views/insights/common/components/spanDescription.spec.tsx
index b59afb98f1e272..115af8f1389d8a 100644
--- a/static/app/views/insights/common/components/spanDescription.spec.tsx
+++ b/static/app/views/insights/common/components/spanDescription.spec.tsx
@@ -54,7 +54,7 @@ describe('DatabaseSpanDescription', function () {
       {organization}
     );
 
-    await waitForElementToBeRemoved(() => screen.getByTestId('loading-indicator'));
+    await waitForElementToBeRemoved(() => screen.queryByTestId('loading-indicator'));
 
     expect(screen.getByText('SELECT USERS FRO*')).toBeInTheDocument();
   });
@@ -99,7 +99,7 @@ describe('DatabaseSpanDescription', function () {
       {organization}
     );
 
-    await waitForElementToBeRemoved(() => screen.getByTestId('loading-indicator'));
+    await waitForElementToBeRemoved(() => screen.queryByTestId('loading-indicator'));
 
     expect(
       await screen.findByText('SELECT users FROM my_table LIMIT 1;')
@@ -150,7 +150,7 @@ describe('DatabaseSpanDescription', function () {
       {organization}
     );
 
-    await waitForElementToBeRemoved(() => screen.getByTestId('loading-indicator'));
+    await waitForElementToBeRemoved(() => screen.queryByTestId('loading-indicator'));
 
     expect(
       await screen.findByText('SELECT users FROM my_table LIMIT 1;')
@@ -205,7 +205,7 @@ describe('DatabaseSpanDescription', function () {
       {organization}
     );
 
-    await waitForElementToBeRemoved(() => screen.getByTestId('loading-indicator'));
+    await waitForElementToBeRemoved(() => screen.queryByTestId('loading-indicator'));
 
     // expect(await screen.findBy).toBeInTheDocument();
     const mongoQuerySnippet = await screen.findByText(
diff --git a/static/app/views/insights/common/queries/useDiscover.spec.tsx b/static/app/views/insights/common/queries/useDiscover.spec.tsx
index 1c91ae369fa4e9..f3d185f6d47c39 100644
--- a/static/app/views/insights/common/queries/useDiscover.spec.tsx
+++ b/static/app/views/insights/common/queries/useDiscover.spec.tsx
@@ -78,7 +78,7 @@ describe('useDiscover', () => {
         }
       );
 
-      expect(result.current.isFetching).toEqual(false);
+      expect(result.current.isFetching).toBe(false);
       expect(eventsRequest).not.toHaveBeenCalled();
     });
 
@@ -127,7 +127,7 @@ describe('useDiscover', () => {
         }
       );
 
-      expect(result.current.isPending).toEqual(true);
+      expect(result.current.isPending).toBe(true);
 
       expect(eventsRequest).toHaveBeenCalledWith(
         '/organizations/org-slug/events/',
@@ -147,7 +147,7 @@ describe('useDiscover', () => {
         })
       );
 
-      await waitFor(() => expect(result.current.isPending).toEqual(false));
+      await waitFor(() => expect(result.current.isPending).toBe(false));
       expect(result.current.data).toEqual([
         {
           'span.op': 'db',
@@ -206,7 +206,7 @@ describe('useDiscover', () => {
         }
       );
 
-      expect(result.current.isFetching).toEqual(false);
+      expect(result.current.isFetching).toBe(false);
       expect(eventsRequest).not.toHaveBeenCalled();
     });
 
@@ -266,7 +266,7 @@ describe('useDiscover', () => {
         }
       );
 
-      expect(result.current.isPending).toEqual(true);
+      expect(result.current.isPending).toBe(true);
 
       expect(eventsRequest).toHaveBeenCalledWith(
         '/organizations/org-slug/events/',
@@ -286,7 +286,7 @@ describe('useDiscover', () => {
         })
       );
 
-      await waitFor(() => expect(result.current.isPending).toEqual(false));
+      await waitFor(() => expect(result.current.isPending).toBe(false));
       expect(result.current.data).toEqual([
         {
           'span.group': '221aa7ebd216',
diff --git a/static/app/views/insights/common/queries/useDiscoverSeries.spec.tsx b/static/app/views/insights/common/queries/useDiscoverSeries.spec.tsx
index 438973c1d7416e..8d1dc6a543a45f 100644
--- a/static/app/views/insights/common/queries/useDiscoverSeries.spec.tsx
+++ b/static/app/views/insights/common/queries/useDiscoverSeries.spec.tsx
@@ -82,7 +82,7 @@ describe('useSpanMetricsSeries', () => {
       }
     );
 
-    expect(result.current.isFetching).toEqual(false);
+    expect(result.current.isFetching).toBe(false);
     expect(eventsRequest).not.toHaveBeenCalled();
   });
 
@@ -121,7 +121,7 @@ describe('useSpanMetricsSeries', () => {
       }
     );
 
-    expect(result.current.isPending).toEqual(true);
+    expect(result.current.isPending).toBe(true);
 
     expect(eventsRequest).toHaveBeenCalledWith(
       '/organizations/org-slug/events-stats/',
@@ -138,7 +138,7 @@ describe('useSpanMetricsSeries', () => {
       })
     );
 
-    await waitFor(() => expect(result.current.isPending).toEqual(false));
+    await waitFor(() => expect(result.current.isPending).toBe(false));
   });
 
   it('adjusts interval based on the yAxis', async () => {
@@ -196,6 +196,14 @@ describe('useSpanMetricsSeries', () => {
           [1699907700, [{count: 7810.2}]],
           [1699908000, [{count: 1216.8}]],
         ],
+        meta: {
+          fields: {
+            'spm()': 'rate',
+          },
+          units: {
+            'spm()': '1/minute',
+          },
+        },
       },
     });
 
@@ -209,7 +217,7 @@ describe('useSpanMetricsSeries', () => {
       }
     );
 
-    await waitFor(() => expect(result.current.isPending).toEqual(false));
+    await waitFor(() => expect(result.current.isPending).toBe(false));
 
     expect(result.current.data).toEqual({
       'spm()': {
@@ -217,6 +225,14 @@ describe('useSpanMetricsSeries', () => {
           {name: '2023-11-13T20:35:00+00:00', value: 7810.2},
           {name: '2023-11-13T20:40:00+00:00', value: 1216.8},
         ],
+        meta: {
+          fields: {
+            'spm()': 'rate',
+          },
+          units: {
+            'spm()': '1/minute',
+          },
+        },
         seriesName: 'spm()',
       },
     });
@@ -232,12 +248,28 @@ describe('useSpanMetricsSeries', () => {
             [1699907700, [{count: 10.1}]],
             [1699908000, [{count: 11.2}]],
           ],
+          meta: {
+            fields: {
+              'http_response_rate(3)': 'rate',
+            },
+            units: {
+              'http_response_rate(3)': '1/minute',
+            },
+          },
         },
         'http_response_rate(4)': {
           data: [
             [1699907700, [{count: 12.6}]],
             [1699908000, [{count: 13.8}]],
           ],
+          meta: {
+            fields: {
+              'http_response_rate(4)': 'rate',
+            },
+            units: {
+              'http_response_rate(4)': '1/minute',
+            },
+          },
         },
       },
     });
@@ -255,7 +287,7 @@ describe('useSpanMetricsSeries', () => {
       }
     );
 
-    await waitFor(() => expect(result.current.isPending).toEqual(false));
+    await waitFor(() => expect(result.current.isPending).toBe(false));
 
     expect(result.current.data).toEqual({
       'http_response_rate(3)': {
@@ -263,6 +295,14 @@ describe('useSpanMetricsSeries', () => {
           {name: '2023-11-13T20:35:00+00:00', value: 10.1},
           {name: '2023-11-13T20:40:00+00:00', value: 11.2},
         ],
+        meta: {
+          fields: {
+            'http_response_rate(3)': 'rate',
+          },
+          units: {
+            'http_response_rate(3)': '1/minute',
+          },
+        },
         seriesName: 'http_response_rate(3)',
       },
       'http_response_rate(4)': {
@@ -270,6 +310,50 @@ describe('useSpanMetricsSeries', () => {
           {name: '2023-11-13T20:35:00+00:00', value: 12.6},
           {name: '2023-11-13T20:40:00+00:00', value: 13.8},
         ],
+        meta: {
+          fields: {
+            'http_response_rate(4)': 'rate',
+          },
+          units: {
+            'http_response_rate(4)': '1/minute',
+          },
+        },
+        seriesName: 'http_response_rate(4)',
+      },
+    });
+  });
+
+  it('returns a series for all requested yAxis even without data', async () => {
+    MockApiClient.addMockResponse({
+      url: `/organizations/${organization.slug}/events-stats/`,
+      method: 'GET',
+      body: {},
+    });
+
+    const {result} = renderHook(
+      ({yAxis}) => useSpanMetricsSeries({yAxis}, 'span-metrics-series'),
+      {
+        wrapper: Wrapper,
+        initialProps: {
+          yAxis: [
+            'http_response_rate(3)',
+            'http_response_rate(4)',
+          ] as SpanMetricsProperty[],
+        },
+      }
+    );
+
+    await waitFor(() => expect(result.current.isPending).toBe(false));
+
+    expect(result.current.data).toEqual({
+      'http_response_rate(3)': {
+        data: [],
+        meta: undefined,
+        seriesName: 'http_response_rate(3)',
+      },
+      'http_response_rate(4)': {
+        data: [],
+        meta: undefined,
         seriesName: 'http_response_rate(4)',
       },
     });
diff --git a/static/app/views/insights/common/queries/useDiscoverSeries.ts b/static/app/views/insights/common/queries/useDiscoverSeries.ts
index 9be9f5386efbbf..f9d956e709aa37 100644
--- a/static/app/views/insights/common/queries/useDiscoverSeries.ts
+++ b/static/app/views/insights/common/queries/useDiscoverSeries.ts
@@ -1,11 +1,21 @@
-import keyBy from 'lodash/keyBy';
+import moment from 'moment-timezone';
 
 import type {Series} from 'sentry/types/echarts';
+import {encodeSort, type EventsMetaType} from 'sentry/utils/discover/eventView';
+import {
+  type DiscoverQueryProps,
+  useGenericDiscoverQuery,
+} from 'sentry/utils/discover/genericDiscoverQuery';
 import {DiscoverDatasets} from 'sentry/utils/discover/types';
 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 {getSeriesEventView} from 'sentry/views/insights/common/queries/getSeriesEventView';
-import {useWrappedDiscoverTimeseriesQuery} from 'sentry/views/insights/common/queries/useSpansQuery';
+import {
+  getRetryDelay,
+  shouldRetryHandler,
+} from 'sentry/views/insights/common/utils/retryHandlers';
 import type {
   MetricsProperty,
   SpanFunctions,
@@ -13,11 +23,17 @@ import type {
   SpanMetricsProperty,
 } from 'sentry/views/insights/types';
 
+import {DATE_FORMAT} from './useSpansQuery';
+
 export interface MetricTimeseriesRow {
   [key: string]: number;
   interval: number;
 }
 
+type DiscoverSeries = Series & {
+  meta?: EventsMetaType;
+};
+
 interface UseMetricsSeriesOptions<Fields> {
   enabled?: boolean;
   interval?: string;
@@ -66,6 +82,8 @@ const useDiscoverSeries = <T extends string[]>(
   const {search = undefined, yAxis = [], interval = undefined} = options;
 
   const pageFilters = usePageFilters();
+  const location = useLocation();
+  const organization = useOrganization();
 
   const eventView = getSeriesEventView(
     search,
@@ -80,28 +98,57 @@ const useDiscoverSeries = <T extends string[]>(
     eventView.interval = interval;
   }
 
-  const result = useWrappedDiscoverTimeseriesQuery<MetricTimeseriesRow[]>({
+  const result = useGenericDiscoverQuery<
+    {
+      data: any[];
+      meta: EventsMetaType;
+    },
+    DiscoverQueryProps
+  >({
+    route: 'events-stats',
     eventView,
-    initialData: [],
+    location,
+    orgSlug: organization.slug,
+    getRequestPayload: () => ({
+      ...eventView.getEventsAPIPayload(location),
+      yAxis: eventView.yAxis,
+      topEvents: eventView.topEvents,
+      excludeOther: 0,
+      partial: 1,
+      orderby: eventView.sorts?.[0] ? encodeSort(eventView.sorts?.[0]) : undefined,
+      interval: eventView.interval,
+    }),
+    options: {
+      enabled: options.enabled && pageFilters.isReady,
+      refetchOnWindowFocus: false,
+      retry: shouldRetryHandler,
+      retryDelay: getRetryDelay,
+      staleTime: Infinity,
+    },
     referrer,
-    enabled: options.enabled,
-    overriddenRoute: options.overriddenRoute,
   });
 
-  const parsedData = keyBy(
-    yAxis.map(seriesName => {
-      const series: Series = {
-        seriesName,
-        data: (result?.data ?? []).map(datum => ({
-          value: datum[seriesName],
-          name: datum?.interval,
-        })),
-      };
-
-      return series;
-    }),
-    'seriesName'
-  ) as Record<T[number], Series>;
+  const parsedData: Record<string, DiscoverSeries> = {};
+
+  yAxis.forEach(seriesName => {
+    const dataSeries = result.data?.[seriesName] ?? result?.data ?? {};
+    const convertedSeries: DiscoverSeries = {
+      seriesName,
+      data: convertDiscoverTimeseriesResponse(dataSeries?.data ?? []),
+      meta: dataSeries?.meta,
+    };
 
-  return {...result, data: parsedData};
+    parsedData[seriesName] = convertedSeries;
+  });
+
+  return {...result, data: parsedData as Record<T[number], DiscoverSeries>};
 };
+
+function convertDiscoverTimeseriesResponse(data: any[]): DiscoverSeries['data'] {
+  return data.map(([timestamp, [{count: value}]]) => {
+    return {
+      name: moment(parseInt(timestamp, 10) * 1000).format(DATE_FORMAT),
+      value,
+    };
+  });
+}
diff --git a/static/app/views/insights/common/queries/useHasFirstSpan.tsx b/static/app/views/insights/common/queries/useHasFirstSpan.tsx
index b8835047c9364e..d89b6b7d48a4e8 100644
--- a/static/app/views/insights/common/queries/useHasFirstSpan.tsx
+++ b/static/app/views/insights/common/queries/useHasFirstSpan.tsx
@@ -1,4 +1,5 @@
 import type {Project} from 'sentry/types/project';
+import {isActiveSuperuser} from 'sentry/utils/isActiveSuperuser';
 import usePageFilters from 'sentry/utils/usePageFilters';
 import useProjects from 'sentry/utils/useProjects';
 import {ModuleName} from 'sentry/views/insights/types';
@@ -7,6 +8,8 @@ const excludedModuleNames = [
   ModuleName.OTHER,
   ModuleName.MOBILE_UI,
   ModuleName.MOBILE_SCREENS,
+  ModuleName.CRONS,
+  ModuleName.UPTIME,
 ] as const;
 
 type ExcludedModuleNames = (typeof excludedModuleNames)[number];
@@ -52,6 +55,9 @@ export function useHasFirstSpan(module: ModuleName, projects?: Project[]): boole
   //  - [] empty list represents "My Projects"
   //  - [-1] represents "All Projects"
   //  - [.., ..] otherwise, represents a list of project IDs
+  if (pageFilters.selection.projects.length === 0 && isActiveSuperuser()) {
+    selectedProjects = allProjects; // when superuser is enabled, My Projects isn't applicable, and in reality all projects are selected when projects.length === 0
+  }
   if (pageFilters.selection.projects.length === 0) {
     selectedProjects = allProjects.filter(p => p.isMember);
   } else if (
diff --git a/static/app/views/insights/common/queries/useHasTtfdConfigured.tsx b/static/app/views/insights/common/queries/useHasTtfdConfigured.tsx
index 51ea1859c781b3..f9d5d51a830aa2 100644
--- a/static/app/views/insights/common/queries/useHasTtfdConfigured.tsx
+++ b/static/app/views/insights/common/queries/useHasTtfdConfigured.tsx
@@ -49,8 +49,8 @@ export function useTTFDConfigured(additionalFilters?: string[]) {
 
   const hasTTFD: boolean | undefined = result.data?.data?.length
     ? !(
-        result.data.data?.[0]['avg(measurements.time_to_initial_display)'] !== 0 &&
-        result.data.data?.[0]['avg(measurements.time_to_full_display)'] === 0
+        result.data.data?.[0]!['avg(measurements.time_to_initial_display)'] !== 0 &&
+        result.data.data?.[0]!['avg(measurements.time_to_full_display)'] === 0
       )
     : undefined;
 
diff --git a/static/app/views/insights/common/queries/useReleases.tsx b/static/app/views/insights/common/queries/useReleases.tsx
index 2a1822d93c3891..f8b43f68276575 100644
--- a/static/app/views/insights/common/queries/useReleases.tsx
+++ b/static/app/views/insights/common/queries/useReleases.tsx
@@ -81,7 +81,7 @@ export function useReleases(searchTerm?: string) {
   if (metricsFetched) {
     releaseMetrics.forEach(c =>
       c.data?.data?.forEach(release => {
-        metricsStats[release.release] = {count: release['count()'] as number};
+        metricsStats[release.release!] = {count: release['count()'] as number};
       })
     );
   }
diff --git a/static/app/views/insights/common/queries/useSortedTimeSeries.tsx b/static/app/views/insights/common/queries/useSortedTimeSeries.tsx
index 0c81710e851e26..872ff93328adb9 100644
--- a/static/app/views/insights/common/queries/useSortedTimeSeries.tsx
+++ b/static/app/views/insights/common/queries/useSortedTimeSeries.tsx
@@ -156,7 +156,7 @@ function transformToSeriesMap(
   const hasMultipleYAxes = yAxis.length > 1;
   if (isMultiSeriesEventsStats(result)) {
     const processedResults: [number, Series][] = Object.keys(result).map(seriesName =>
-      processSingleEventStats(seriesName, result[seriesName])
+      processSingleEventStats(seriesName, result[seriesName]!)
     );
 
     if (!hasMultipleYAxes) {
@@ -180,7 +180,7 @@ function transformToSeriesMap(
   // to enable sorting.
   const processedResults: [string, number, MultiSeriesEventsStats][] = [];
   Object.keys(result).forEach(seriesName => {
-    const {order: groupOrder, ...groupData} = result[seriesName];
+    const {order: groupOrder, ...groupData} = result[seriesName]!;
     processedResults.push([seriesName, groupOrder || 0, groupData]);
   });
 
@@ -190,7 +190,7 @@ function transformToSeriesMap(
       Object.keys(groupData).forEach(aggFunctionAlias => {
         const [, series] = processSingleEventStats(
           seriesName,
-          groupData[aggFunctionAlias]
+          groupData[aggFunctionAlias]!
         );
 
         if (!acc[aggFunctionAlias]) {
diff --git a/static/app/views/insights/common/queries/useSpanMetricsTopNSeries.spec.tsx b/static/app/views/insights/common/queries/useSpanMetricsTopNSeries.spec.tsx
index cde41d16ec0e15..d82805340065b0 100644
--- a/static/app/views/insights/common/queries/useSpanMetricsTopNSeries.spec.tsx
+++ b/static/app/views/insights/common/queries/useSpanMetricsTopNSeries.spec.tsx
@@ -113,7 +113,7 @@ describe('useSpanMetricsTopNSeries', () => {
       })
     );
 
-    await waitFor(() => expect(result.current.isPending).toEqual(false));
+    await waitFor(() => expect(result.current.isPending).toBe(false));
 
     expect(result.current.data).toEqual({
       '200': {
diff --git a/static/app/views/insights/common/queries/useSpanMetricsTopNSeries.tsx b/static/app/views/insights/common/queries/useSpanMetricsTopNSeries.tsx
index b8f77d55df0086..7d6b2efbecc122 100644
--- a/static/app/views/insights/common/queries/useSpanMetricsTopNSeries.tsx
+++ b/static/app/views/insights/common/queries/useSpanMetricsTopNSeries.tsx
@@ -69,11 +69,11 @@ export const useSpanMetricsTopNSeries = <Fields extends SpanMetricsProperty[]>(
     Object.keys(data).forEach(key => {
       const value = {
         name: interval,
-        value: datum[key],
+        value: datum[key]!,
       };
 
       if (seriesByKey[key]) {
-        seriesByKey[key].data.push(value);
+        seriesByKey[key]!.data.push(value);
       } else {
         seriesByKey[key] = {
           seriesName: key,
diff --git a/static/app/views/insights/common/queries/useSpansQuery.tsx b/static/app/views/insights/common/queries/useSpansQuery.tsx
index ff489354f1e299..0880b74f7b19da 100644
--- a/static/app/views/insights/common/queries/useSpansQuery.tsx
+++ b/static/app/views/insights/common/queries/useSpansQuery.tsx
@@ -205,7 +205,7 @@ function processDiscoverTimeseriesResult(
   }
 
   const firstYAxis =
-    typeof eventView.yAxis === 'string' ? eventView.yAxis : eventView.yAxis[0];
+    typeof eventView.yAxis === 'string' ? eventView.yAxis : eventView.yAxis[0]!;
 
   if (result.data) {
     // Result data only returned one series. This means there was only only one yAxis requested, and no sub-series. Iterate the data, and return the result
diff --git a/static/app/views/insights/common/utils/getAlertsUrl.spec.tsx b/static/app/views/insights/common/utils/getAlertsUrl.spec.tsx
index 3e9efa5c6be966..bf5056d130e438 100644
--- a/static/app/views/insights/common/utils/getAlertsUrl.spec.tsx
+++ b/static/app/views/insights/common/utils/getAlertsUrl.spec.tsx
@@ -19,7 +19,7 @@ describe('getAlertsUrl', function () {
       orgSlug,
       pageFilters,
     });
-    expect(url).toEqual(
+    expect(url).toBe(
       '/organizations/orgSlug/alerts/new/metric/?aggregate=avg%28d%3Aspans%2Fduration%40millisecond%29&dataset=generic_metrics&eventTypes=transaction&project=project-slug&query=span.module%3Adb&statsPeriod=7d'
     );
   });
@@ -35,7 +35,7 @@ describe('getAlertsUrl', function () {
       pageFilters,
       dataset: Dataset.EVENTS_ANALYTICS_PLATFORM,
     });
-    expect(url).toEqual(
+    expect(url).toBe(
       '/organizations/orgSlug/alerts/new/metric/?aggregate=count%28span.duration%29&dataset=events_analytics_platform&eventTypes=transaction&project=project-slug&query=span.op%3Ahttp.client&statsPeriod=7d'
     );
   });
diff --git a/static/app/views/insights/common/utils/getAlertsUrl.tsx b/static/app/views/insights/common/utils/getAlertsUrl.tsx
index f32b6f484e46a1..8c117d3e867ffb 100644
--- a/static/app/views/insights/common/utils/getAlertsUrl.tsx
+++ b/static/app/views/insights/common/utils/getAlertsUrl.tsx
@@ -27,7 +27,7 @@ export function getAlertsUrl({
   const statsPeriod = getStatsPeriod(pageFilters);
   const environment = pageFilters.environments;
   const queryParams = {
-    aggregate: aggregate,
+    aggregate,
     dataset,
     project: project.slug,
     eventTypes: 'transaction',
diff --git a/static/app/views/insights/common/utils/getAxisMaxForPercentageSeries.spec.tsx b/static/app/views/insights/common/utils/getAxisMaxForPercentageSeries.spec.tsx
new file mode 100644
index 00000000000000..106a5de80bb40a
--- /dev/null
+++ b/static/app/views/insights/common/utils/getAxisMaxForPercentageSeries.spec.tsx
@@ -0,0 +1,46 @@
+import type {Series} from 'sentry/types/echarts';
+import {getAxisMaxForPercentageSeries} from 'sentry/views/insights/common/utils/getAxisMaxForPercentageSeries';
+
+describe('getAxisMaxForPercentageSeries', function () {
+  it('Returns nearest significant digit for small series', function () {
+    expect(getAxisMaxForPercentageSeries([HTTP_5XX_SERIES])).toBeCloseTo(0.0001);
+  });
+
+  it('Returns 1 for larger series', function () {
+    expect(getAxisMaxForPercentageSeries([HTTP_2XX_SERIES])).toBeCloseTo(1);
+  });
+
+  it('Takes all series into account', function () {
+    expect(getAxisMaxForPercentageSeries([HTTP_2XX_SERIES, HTTP_5XX_SERIES])).toBeCloseTo(
+      1
+    );
+  });
+});
+
+const HTTP_2XX_SERIES: Series = {
+  seriesName: '5XX',
+  data: [
+    {
+      value: 0.9812,
+      name: '2024-03-12T13:30:00-04:00',
+    },
+    {
+      value: 0.9992,
+      name: '2024-03-12T14:00:00-04:00',
+    },
+  ],
+};
+
+const HTTP_5XX_SERIES: Series = {
+  seriesName: '5XX',
+  data: [
+    {
+      value: 0.00006713689346852019,
+      name: '2024-03-12T13:30:00-04:00',
+    },
+    {
+      value: 0.000041208717375685543,
+      name: '2024-03-12T14:00:00-04:00',
+    },
+  ],
+};
diff --git a/static/app/views/insights/common/utils/getAxisMaxForPercentageSeries.tsx b/static/app/views/insights/common/utils/getAxisMaxForPercentageSeries.tsx
new file mode 100644
index 00000000000000..ca9c94fac255e7
--- /dev/null
+++ b/static/app/views/insights/common/utils/getAxisMaxForPercentageSeries.tsx
@@ -0,0 +1,16 @@
+import type {Series} from 'sentry/types/echarts';
+
+/**
+ * Given a set of `Series` objects that contain percentage data (i.e., every item in `data` has a `value` between 0 and 1) return an appropriate max value.
+ *
+ * e.g., for series with very low values (like 5xx rates), it rounds to the nearest significant digit. For other cases, it limits it to 100
+ */
+export function getAxisMaxForPercentageSeries(series: Series[]): number {
+  const maxValue = Math.max(
+    ...series.map(serie => Math.max(...serie.data.map(datum => datum.value)))
+  );
+
+  const maxNumberOfDecimalPlaces = Math.ceil(Math.min(0, Math.log10(maxValue)));
+
+  return Math.pow(10, maxNumberOfDecimalPlaces);
+}
diff --git a/static/app/views/insights/common/utils/moduleTitles.tsx b/static/app/views/insights/common/utils/moduleTitles.tsx
index 534050f288d9c5..a6769eb419f505 100644
--- a/static/app/views/insights/common/utils/moduleTitles.tsx
+++ b/static/app/views/insights/common/utils/moduleTitles.tsx
@@ -1,6 +1,7 @@
 import {MODULE_TITLE as RESOURCES_MODULE_TITLE} from 'sentry/views/insights/browser/resources/settings';
 import {MODULE_TITLE as VITALS_MODULE_TITLE} from 'sentry/views/insights/browser/webVitals/settings';
 import {MODULE_TITLE as CACHE_MODULE_TITLE} from 'sentry/views/insights/cache/settings';
+import {MODULE_TITLE as CRONS_MODULE_TITLE} from 'sentry/views/insights/crons/settings';
 import {MODULE_TITLE as DB_MODULE_TITLE} from 'sentry/views/insights/database/settings';
 import {
   FRONTEND_MODULE_TITLE as HTTP_FRONTEND_MODULE_TITLE,
@@ -16,6 +17,7 @@ import {MODULE_TITLE as MOBILE_UI_MODULE_TITLE} from 'sentry/views/insights/mobi
 import type {DomainView} from 'sentry/views/insights/pages/useFilters';
 import {MODULE_TITLE as QUEUE_MODULE_TITLE} from 'sentry/views/insights/queues/settings';
 import {ModuleName} from 'sentry/views/insights/types';
+import {MODULE_TITLE as UPTIME_MODULE_TITLE} from 'sentry/views/insights/uptime/settings';
 
 export const MODULE_TITLES: Record<ModuleName, string> = {
   [ModuleName.DB]: DB_MODULE_TITLE,
@@ -30,6 +32,8 @@ export const MODULE_TITLES: Record<ModuleName, string> = {
   [ModuleName.MOBILE_UI]: MOBILE_UI_MODULE_TITLE,
   [ModuleName.MOBILE_SCREENS]: MOBILE_VITALS_MODULE_TITLE,
   [ModuleName.SCREEN_RENDERING]: SCREEN_RENDERING_MODULE_TITLE,
+  [ModuleName.CRONS]: CRONS_MODULE_TITLE,
+  [ModuleName.UPTIME]: UPTIME_MODULE_TITLE,
   [ModuleName.OTHER]: '',
 };
 
diff --git a/static/app/views/insights/common/utils/useModuleNameFromUrl.tsx b/static/app/views/insights/common/utils/useModuleNameFromUrl.tsx
index 483c5fbc850baf..d64fbce060ad6e 100644
--- a/static/app/views/insights/common/utils/useModuleNameFromUrl.tsx
+++ b/static/app/views/insights/common/utils/useModuleNameFromUrl.tsx
@@ -16,7 +16,7 @@ export function useModuleNameFromUrl(): ModuleName | null {
   });
 
   if (moduleKey) {
-    return urlToModuleNameMap[moduleKey];
+    return urlToModuleNameMap[moduleKey]!;
   }
 
   return null;
diff --git a/static/app/views/insights/common/utils/useModuleURL.tsx b/static/app/views/insights/common/utils/useModuleURL.tsx
index cbd303192697f2..487bef9642e4bb 100644
--- a/static/app/views/insights/common/utils/useModuleURL.tsx
+++ b/static/app/views/insights/common/utils/useModuleURL.tsx
@@ -3,6 +3,7 @@ import useOrganization from 'sentry/utils/useOrganization';
 import {BASE_URL as RESOURCES_BASE_URL} from 'sentry/views/insights/browser/resources/settings';
 import {BASE_URL as VITALS_BASE_URL} from 'sentry/views/insights/browser/webVitals/settings';
 import {BASE_URL as CACHE_BASE_URL} from 'sentry/views/insights/cache/settings';
+import {BASE_URL as CRONS_BASE_URL} from 'sentry/views/insights/crons/settings';
 import {BASE_URL as DB_BASE_URL} from 'sentry/views/insights/database/settings';
 import {BASE_URL as HTTP_BASE_URL} from 'sentry/views/insights/http/settings';
 import {BASE_URL as AI_BASE_URL} from 'sentry/views/insights/llmMonitoring/settings';
@@ -19,6 +20,7 @@ import {
 import {getModuleView} from 'sentry/views/insights/pages/utils';
 import {BASE_URL as QUEUE_BASE_URL} from 'sentry/views/insights/queues/settings';
 import {ModuleName} from 'sentry/views/insights/types';
+import {BASE_URL as UPTIME_BASE_URL} from 'sentry/views/insights/uptime/settings';
 
 export const MODULE_BASE_URLS: Record<ModuleName, string> = {
   [ModuleName.DB]: DB_BASE_URL,
@@ -33,6 +35,8 @@ export const MODULE_BASE_URLS: Record<ModuleName, string> = {
   [ModuleName.MOBILE_UI]: MOBILE_UI_BASE_URL,
   [ModuleName.MOBILE_SCREENS]: MOBILE_SCREENS_BASE_URL,
   [ModuleName.SCREEN_RENDERING]: SCREEN_RENDERING_BASE_URL,
+  [ModuleName.CRONS]: CRONS_BASE_URL,
+  [ModuleName.UPTIME]: UPTIME_BASE_URL,
   [ModuleName.OTHER]: '',
 };
 
diff --git a/static/app/views/insights/common/views/spanSummaryPage/sampleList/durationChart/index.tsx b/static/app/views/insights/common/views/spanSummaryPage/sampleList/durationChart/index.tsx
index 9a9d8a20b42f36..fbfbfd61b56a32 100644
--- a/static/app/views/insights/common/views/spanSummaryPage/sampleList/durationChart/index.tsx
+++ b/static/app/views/insights/common/views/spanSummaryPage/sampleList/durationChart/index.tsx
@@ -149,7 +149,7 @@ function DurationChart({
       seriesIndex > 1 && seriesIndex < 2 + sampledSpanDataSeries.length;
     if (isSpanSample && onMouseOverSample) {
       const spanSampleData = sampledSpanDataSeries?.[seriesIndex - 2]?.data[0];
-      const {name: timestamp, value: duration} = spanSampleData;
+      const {name: timestamp, value: duration} = spanSampleData!;
       const sample = getSample(timestamp as string, duration);
       if (sample) {
         onMouseOverSample(sample);
diff --git a/static/app/views/insights/common/views/spanSummaryPage/sampleList/sampleTable/sampleTable.spec.tsx b/static/app/views/insights/common/views/spanSummaryPage/sampleList/sampleTable/sampleTable.spec.tsx
index 0b92c60f619a61..803f2a21584036 100644
--- a/static/app/views/insights/common/views/spanSummaryPage/sampleList/sampleTable/sampleTable.spec.tsx
+++ b/static/app/views/insights/common/views/spanSummaryPage/sampleList/sampleTable/sampleTable.spec.tsx
@@ -1,5 +1,6 @@
 import {
   render,
+  screen,
   waitFor,
   waitForElementToBeRemoved,
 } from 'sentry-test/reactTestingLibrary';
@@ -39,7 +40,7 @@ describe('SampleTable', function () {
 
   describe('When all data is available', () => {
     it('should finsh loading', async () => {
-      const container = render(
+      render(
         <SampleTable
           groupId="groupId123"
           moduleName={ModuleName.OTHER}
@@ -48,11 +49,11 @@ describe('SampleTable', function () {
         />
       );
 
-      await waitForElementToBeRemoved(() => container.queryByTestId('loading-indicator'));
+      await waitForElementToBeRemoved(() => screen.queryByTestId('loading-indicator'));
     });
 
     it('should never show no results', async () => {
-      const container = render(
+      render(
         <SampleTable
           groupId="groupId123"
           moduleName={ModuleName.OTHER}
@@ -61,12 +62,12 @@ describe('SampleTable', function () {
         />
       );
 
-      await expectNever(() => container.getByText('No results found for your query'));
-      expect(container.queryByTestId('loading-indicator')).not.toBeInTheDocument();
+      await expectNever(() => screen.getByText('No results found for your query'));
+      expect(screen.queryByTestId('loading-indicator')).not.toBeInTheDocument();
     });
 
     it('should show span IDs by default', async () => {
-      const container = render(
+      render(
         <SampleTable
           groupId="groupId123"
           moduleName={ModuleName.OTHER}
@@ -76,19 +77,17 @@ describe('SampleTable', function () {
       );
 
       await waitFor(() =>
-        expect(container.queryByTestId('loading-indicator')).not.toBeInTheDocument()
+        expect(screen.queryByTestId('loading-indicator')).not.toBeInTheDocument()
       );
 
-      expect(container.queryAllByTestId('grid-head-cell')[0]).toHaveTextContent(
-        'Span ID'
-      );
-      expect(container.queryAllByTestId('grid-body-cell')[0]).toHaveTextContent(
+      expect(screen.queryAllByTestId('grid-head-cell')[0]).toHaveTextContent('Span ID');
+      expect(screen.queryAllByTestId('grid-body-cell')[0]).toHaveTextContent(
         'span-id123'
       );
     });
 
     it('should show transaction IDs instead of span IDs when in columnOrder', async () => {
-      const container = render(
+      render(
         <SampleTable
           groupId="groupId123"
           moduleName={ModuleName.OTHER}
@@ -115,13 +114,11 @@ describe('SampleTable', function () {
       );
 
       await waitFor(() =>
-        expect(container.queryByTestId('loading-indicator')).not.toBeInTheDocument()
+        expect(screen.queryByTestId('loading-indicator')).not.toBeInTheDocument()
       );
 
-      expect(container.queryAllByTestId('grid-head-cell')[0]).toHaveTextContent(
-        'Event ID'
-      );
-      expect(container.queryAllByTestId('grid-body-cell')[0]).toHaveTextContent(
+      expect(screen.queryAllByTestId('grid-head-cell')[0]).toHaveTextContent('Event ID');
+      expect(screen.queryAllByTestId('grid-body-cell')[0]).toHaveTextContent(
         'transaction-id123'.slice(0, 8)
       );
     });
@@ -137,7 +134,7 @@ describe('SampleTable', function () {
         },
       });
 
-      const container = render(
+      render(
         <SampleTable
           groupId="groupId123"
           moduleName={ModuleName.OTHER}
@@ -145,10 +142,8 @@ describe('SampleTable', function () {
           transactionName="/endpoint"
         />
       );
-      await waitForElementToBeRemoved(() => container.queryByTestId('loading-indicator'));
-      expect(
-        container.queryByText('No results found for your query')
-      ).toBeInTheDocument();
+      await waitForElementToBeRemoved(() => screen.queryByTestId('loading-indicator'));
+      expect(screen.getByText('No results found for your query')).toBeInTheDocument();
     });
   });
 });
diff --git a/static/app/views/insights/common/views/spanSummaryPage/sampleList/sampleTable/sampleTable.tsx b/static/app/views/insights/common/views/spanSummaryPage/sampleList/sampleTable/sampleTable.tsx
index a8bd848e7e29e8..0254c6fc324d4c 100644
--- a/static/app/views/insights/common/views/spanSummaryPage/sampleList/sampleTable/sampleTable.tsx
+++ b/static/app/views/insights/common/views/spanSummaryPage/sampleList/sampleTable/sampleTable.tsx
@@ -173,8 +173,8 @@ function SampleTable({
           data={spans.map(sample => {
             return {
               ...sample,
-              op: spanMetrics[SPAN_OP],
-              transaction: transactionsById[sample['transaction.id']],
+              op: spanMetrics[SPAN_OP]!,
+              transaction: transactionsById[sample['transaction.id']]!,
             };
           })}
           isLoading={isLoading}
diff --git a/static/app/views/insights/common/views/spans/selectors/actionSelector.tsx b/static/app/views/insights/common/views/spans/selectors/actionSelector.tsx
index 90289d2cf6b8b2..3d507940b8cd44 100644
--- a/static/app/views/insights/common/views/spans/selectors/actionSelector.tsx
+++ b/static/app/views/insights/common/views/spans/selectors/actionSelector.tsx
@@ -5,11 +5,11 @@ import omit from 'lodash/omit';
 import {CompactSelect} from 'sentry/components/compactSelect';
 import {t} from 'sentry/locale';
 import {trackAnalytics} from 'sentry/utils/analytics';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import EventView from 'sentry/utils/discover/eventView';
 import {DiscoverDatasets} from 'sentry/utils/discover/types';
 import {EMPTY_OPTION_VALUE} from 'sentry/utils/tokenizeSearch';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import {useSpansQuery} from 'sentry/views/insights/common/queries/useSpansQuery';
 import {buildEventViewQuery} from 'sentry/views/insights/common/utils/buildEventViewQuery';
@@ -30,6 +30,7 @@ type Props = {
 export function ActionSelector({value = '', moduleName, spanCategory, filters}: Props) {
   // TODO: This only returns the top 25 actions. It should either load them all, or paginate, or allow searching
   //
+  const navigate = useNavigate();
   const location = useLocation();
   const organization = useOrganization();
   const eventView = getEventView(location, moduleName, spanCategory);
@@ -88,7 +89,7 @@ export function ActionSelector({value = '', moduleName, spanCategory, filters}:
           source: moduleName,
           value: newValue.value,
         });
-        browserHistory.push({
+        navigate({
           ...location,
           query: {
             ...location.query,
@@ -118,6 +119,8 @@ const LABEL_FOR_MODULE_NAME: {[key in ModuleName]: ReactNode} = {
   screen_load: t('Action'),
   app_start: t('Action'),
   resource: t('Resource'),
+  crons: t('Action'),
+  uptime: t('Action'),
   other: t('Action'),
   'mobile-ui': t('Action'),
   'mobile-screens': t('Action'),
diff --git a/static/app/views/insights/common/views/spans/selectors/domainSelector.spec.tsx b/static/app/views/insights/common/views/spans/selectors/domainSelector.spec.tsx
index 30a5d19530e453..701a064293d60c 100644
--- a/static/app/views/insights/common/views/spans/selectors/domainSelector.spec.tsx
+++ b/static/app/views/insights/common/views/spans/selectors/domainSelector.spec.tsx
@@ -64,7 +64,7 @@ describe('DomainSelector', function () {
   it('allows selecting a domain', async function () {
     render(<DomainSelector moduleName={ModuleName.DB} />);
 
-    await waitForElementToBeRemoved(() => screen.getByTestId('loading-indicator'));
+    await waitForElementToBeRemoved(() => screen.queryByTestId('loading-indicator'));
 
     await selectEvent.openMenu(screen.getByText('All'));
 
@@ -93,7 +93,7 @@ describe('DomainSelector', function () {
     render(<DomainSelector moduleName={ModuleName.DB} />);
     expect(fetchMoreResponse).not.toHaveBeenCalled();
 
-    await waitForElementToBeRemoved(() => screen.getByTestId('loading-indicator'));
+    await waitForElementToBeRemoved(() => screen.queryByTestId('loading-indicator'));
 
     await selectEvent.openMenu(screen.getByText('All'));
 
diff --git a/static/app/views/insights/common/views/spans/selectors/domainSelector.tsx b/static/app/views/insights/common/views/spans/selectors/domainSelector.tsx
index 2049b4e507fb9a..59b4f70c87a7c1 100644
--- a/static/app/views/insights/common/views/spans/selectors/domainSelector.tsx
+++ b/static/app/views/insights/common/views/spans/selectors/domainSelector.tsx
@@ -8,11 +8,11 @@ import {CompactSelect, type SelectOption} from 'sentry/components/compactSelect'
 import {t} from 'sentry/locale';
 import {trackAnalytics} from 'sentry/utils/analytics';
 import {uniq} from 'sentry/utils/array/uniq';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import EventView from 'sentry/utils/discover/eventView';
 import {DiscoverDatasets} from 'sentry/utils/discover/types';
 import {EMPTY_OPTION_VALUE} from 'sentry/utils/tokenizeSearch';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import usePageFilters from 'sentry/utils/usePageFilters';
 import {useSpansQuery} from 'sentry/views/insights/common/queries/useSpansQuery';
@@ -45,6 +45,7 @@ export function DomainSelector({
   emptyOptionLocation = 'bottom',
   domainAlias,
 }: Props) {
+  const navigate = useNavigate();
   const location = useLocation();
   const organization = useOrganization();
   const pageFilters = usePageFilters();
@@ -156,7 +157,7 @@ export function DomainSelector({
           organization,
           source: moduleName,
         });
-        browserHistory.push({
+        navigate({
           ...location,
           query: {
             ...location.query,
@@ -182,6 +183,8 @@ const LABEL_FOR_MODULE_NAME: {[key in ModuleName]: ReactNode} = {
   resource: t('Resource'),
   other: t('Domain'),
   ai: t('Domain'),
+  crons: t('Domain'),
+  uptime: t('Domain'),
   'screen-rendering': t('Domain'),
   'mobile-ui': t('Domain'),
   'mobile-screens': t('Domain'),
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 bdb73be362b391..550e830a397a37 100644
--- a/static/app/views/insights/common/views/spans/selectors/subregionSelector.tsx
+++ b/static/app/views/insights/common/views/spans/selectors/subregionSelector.tsx
@@ -1,7 +1,6 @@
 import {type ComponentProps, Fragment} from 'react';
 import styled from '@emotion/styled';
 
-import FeatureBadge from 'sentry/components/badge/featureBadge';
 import {
   CompactSelect,
   type SelectOption,
@@ -64,12 +63,7 @@ export default function SubregionSelector({size}: Props) {
       size={size}
       searchable
       triggerProps={{
-        prefix: (
-          <Fragment>
-            <StyledFeatureBadge type="new" />
-            {t('Geo region')}
-          </Fragment>
-        ),
+        prefix: t('Geo region'),
       }}
       multiple
       loading={isPending}
@@ -84,9 +78,9 @@ export default function SubregionSelector({size}: Props) {
       }
       options={options}
       onChange={(selectedOptions: SelectOption<string>[]) => {
-        trackAnalytics('insight.vital.select_browser_value', {
+        trackAnalytics('insight.general.select_region_value', {
           organization,
-          browsers: selectedOptions.map(v => v.value),
+          regions: selectedOptions.map(v => subregionCodeToName[v.value]),
         });
 
         navigate({
@@ -103,10 +97,6 @@ export default function SubregionSelector({size}: Props) {
   );
 }
 
-const StyledFeatureBadge = styled(FeatureBadge)`
-  margin-right: ${space(1)};
-`;
-
 const MenuTitleContainer = styled('div')`
   display: flex;
   align-items: center;
diff --git a/static/app/views/insights/common/views/spans/selectors/transactionSelector.tsx b/static/app/views/insights/common/views/spans/selectors/transactionSelector.tsx
index ad8654ee5394f8..7f8c56b4e08646 100644
--- a/static/app/views/insights/common/views/spans/selectors/transactionSelector.tsx
+++ b/static/app/views/insights/common/views/spans/selectors/transactionSelector.tsx
@@ -4,8 +4,8 @@ import debounce from 'lodash/debounce';
 import {CompactSelect} from 'sentry/components/compactSelect';
 import {t} from 'sentry/locale';
 import {trackAnalytics} from 'sentry/utils/analytics';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import usePageFilters from 'sentry/utils/usePageFilters';
 import {useResourcePagesQuery} from 'sentry/views/insights/browser/resources/queries/useResourcePagesQuery';
@@ -21,6 +21,7 @@ export function TransactionSelector({
   defaultResourceTypes?: string[];
   value?: string;
 }) {
+  const navigate = useNavigate();
   const location = useLocation();
   const organization = useOrganization();
   const pageFilters = usePageFilters();
@@ -84,7 +85,7 @@ export function TransactionSelector({
         trackAnalytics('insight.asset.filter_by_page', {
           organization,
         });
-        browserHistory.push({
+        navigate({
           ...location,
           query: {
             ...location.query,
diff --git a/static/app/views/insights/common/views/spans/spanTimeCharts.tsx b/static/app/views/insights/common/views/spans/spanTimeCharts.tsx
deleted file mode 100644
index 22843c3e5cacb8..00000000000000
--- a/static/app/views/insights/common/views/spans/spanTimeCharts.tsx
+++ /dev/null
@@ -1,423 +0,0 @@
-import styled from '@emotion/styled';
-
-import {getInterval} from 'sentry/components/charts/utils';
-import {t} from 'sentry/locale';
-import {space} from 'sentry/styles/space';
-import type {PageFilters} from 'sentry/types/core';
-import type {Series} from 'sentry/types/echarts';
-import EventView from 'sentry/utils/discover/eventView';
-import {RateUnit} from 'sentry/utils/discover/fields';
-import {DiscoverDatasets} from 'sentry/utils/discover/types';
-import {formatRate} from 'sentry/utils/formatters';
-import {EMPTY_OPTION_VALUE} from 'sentry/utils/tokenizeSearch';
-import useOrganization from 'sentry/utils/useOrganization';
-import usePageFilters from 'sentry/utils/usePageFilters';
-import {AVG_COLOR, ERRORS_COLOR, THROUGHPUT_COLOR} from 'sentry/views/insights/colors';
-import Chart, {
-  ChartType,
-  useSynchronizeCharts,
-} from 'sentry/views/insights/common/components/chart';
-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';
-import {
-  DataTitles,
-  getDurationChartTitle,
-  getThroughputChartTitle,
-} from 'sentry/views/insights/common/views/spans/types';
-import type {ModuleFilters} from 'sentry/views/insights/common/views/spans/useModuleFilters';
-import {ModuleName, SpanMetricsField} from 'sentry/views/insights/types';
-
-const NULL_SPAN_CATEGORY = t('custom');
-
-const {SPAN_SELF_TIME, SPAN_MODULE, SPAN_DESCRIPTION, SPAN_DOMAIN} = SpanMetricsField;
-
-const CHART_HEIGHT = 140;
-
-type Props = {
-  appliedFilters: ModuleFilters;
-  moduleName: ModuleName;
-  eventView?: EventView;
-  extraQuery?: string[];
-  spanCategory?: string;
-  throughputUnit?: RateUnit;
-};
-
-type ChartProps = {
-  filters: ModuleFilters;
-  moduleName: ModuleName;
-  throughputUnit: RateUnit;
-  extraQuery?: string[];
-};
-
-function getSegmentLabel(moduleName: ModuleName) {
-  return moduleName === ModuleName.DB ? 'Queries' : 'Requests';
-}
-
-export function SpanTimeCharts({
-  moduleName,
-  appliedFilters,
-  spanCategory,
-  throughputUnit = RateUnit.PER_MINUTE,
-  extraQuery,
-}: Props) {
-  const {selection} = usePageFilters();
-  const {features} = useOrganization();
-
-  const eventView = getEventView(moduleName, selection, appliedFilters, spanCategory);
-  if (extraQuery) {
-    eventView.query += ` ${extraQuery.join(' ')}`;
-  }
-
-  const {isPending} = useSpansQuery({
-    eventView,
-    initialData: [],
-    referrer: 'api.starfish.span-time-charts',
-  });
-
-  useSynchronizeCharts(1, !isPending);
-
-  const moduleCharts: Record<
-    ModuleName,
-    {
-      Comp: (props: ChartProps) => JSX.Element;
-      title: string;
-    }[]
-  > = {
-    [ModuleName.DB]: [],
-    [ModuleName.CACHE]: [],
-    [ModuleName.VITAL]: [],
-    [ModuleName.QUEUE]: [],
-    [ModuleName.SCREEN_LOAD]: [],
-    [ModuleName.APP_START]: [],
-    [ModuleName.RESOURCE]: features.includes(
-      'starfish-browser-resource-module-bundle-analysis'
-    )
-      ? [{title: DataTitles.bundleSize, Comp: BundleSizeChart}]
-      : [],
-    [ModuleName.HTTP]: [{title: DataTitles.errorCount, Comp: ErrorChart}],
-    [ModuleName.AI]: [],
-    [ModuleName.MOBILE_UI]: [],
-    [ModuleName.MOBILE_SCREENS]: [],
-    [ModuleName.SCREEN_RENDERING]: [],
-    [ModuleName.OTHER]: [],
-  };
-
-  const charts = [
-    {
-      title: getThroughputChartTitle(moduleName, throughputUnit),
-      Comp: ThroughputChart,
-    },
-    {
-      title: getDurationChartTitle(moduleName),
-      Comp: DurationChart,
-    },
-    ...moduleCharts[moduleName],
-  ];
-
-  return (
-    <ChartsContainer>
-      {charts.map(({title, Comp}) => (
-        <ChartsContainerItem key={title}>
-          <ChartPanel title={title}>
-            <Comp
-              moduleName={moduleName}
-              filters={appliedFilters}
-              throughputUnit={throughputUnit}
-              extraQuery={extraQuery}
-            />
-          </ChartPanel>
-        </ChartsContainerItem>
-      ))}
-    </ChartsContainer>
-  );
-}
-
-function ThroughputChart({
-  moduleName,
-  filters,
-  throughputUnit,
-  extraQuery,
-}: ChartProps): JSX.Element {
-  const pageFilters = usePageFilters();
-  const eventView = getEventView(moduleName, pageFilters.selection, filters);
-  if (extraQuery) {
-    eventView.query += ` ${extraQuery.join(' ')}`;
-  }
-
-  const label = getSegmentLabel(moduleName);
-  const {isPending, data} = useSpansQuery<
-    {
-      'avg(span.self_time)': number;
-      interval: number;
-      'spm()': number;
-    }[]
-  >({
-    eventView,
-    initialData: [],
-    referrer: 'api.starfish.span-time-charts',
-  });
-  const dataByGroup = {[label]: data};
-
-  const throughputTimeSeries = Object.keys(dataByGroup).map(groupName => {
-    const groupData = dataByGroup[groupName];
-
-    let throughputMultiplier = 1; // We're fetching per minute, so default is 1
-    if (throughputUnit === RateUnit.PER_SECOND) {
-      throughputMultiplier = 1 / 60;
-    } else if (throughputUnit === RateUnit.PER_HOUR) {
-      throughputMultiplier = 60;
-    }
-
-    return {
-      seriesName: label ?? 'Throughput',
-      data: (groupData ?? []).map(datum => ({
-        value: datum['spm()'] * throughputMultiplier,
-        name: datum.interval,
-      })),
-    };
-  });
-
-  return (
-    <Chart
-      height={CHART_HEIGHT}
-      data={throughputTimeSeries}
-      loading={isPending}
-      grid={{
-        left: '0',
-        right: '0',
-        top: '8px',
-        bottom: '0',
-      }}
-      definedAxisTicks={4}
-      aggregateOutputFormat="rate"
-      rateUnit={throughputUnit}
-      stacked
-      type={ChartType.LINE}
-      chartColors={[THROUGHPUT_COLOR]}
-      tooltipFormatterOptions={{
-        valueFormatter: value => formatRate(value, throughputUnit),
-      }}
-    />
-  );
-}
-
-function DurationChart({moduleName, filters, extraQuery}: ChartProps): JSX.Element {
-  const pageFilters = usePageFilters();
-  const eventView = getEventView(moduleName, pageFilters.selection, filters);
-  if (extraQuery) {
-    eventView.query += ` ${extraQuery.join(' ')}`;
-  }
-
-  const label = `avg(${SPAN_SELF_TIME})`;
-
-  const {isPending, data} = useSpansQuery<
-    {
-      'avg(span.self_time)': number;
-      interval: number;
-      'spm()': number;
-    }[]
-  >({
-    eventView,
-    initialData: [],
-    referrer: 'api.starfish.span-time-charts',
-  });
-  const dataByGroup = {[label]: data};
-
-  const avgSeries = Object.keys(dataByGroup).map(groupName => {
-    const groupData = dataByGroup[groupName];
-
-    return {
-      seriesName: label,
-      data: (groupData ?? []).map(datum => ({
-        value: datum[`avg(${SPAN_SELF_TIME})`],
-        name: datum.interval,
-      })),
-    };
-  });
-
-  return (
-    <Chart
-      height={CHART_HEIGHT}
-      data={[...avgSeries]}
-      loading={isPending}
-      grid={{
-        left: '0',
-        right: '0',
-        top: '8px',
-        bottom: '0',
-      }}
-      definedAxisTicks={4}
-      stacked
-      type={ChartType.LINE}
-      chartColors={[AVG_COLOR]}
-    />
-  );
-}
-
-function ErrorChart({moduleName, filters}: ChartProps): JSX.Element {
-  const query = buildDiscoverQueryConditions(moduleName, filters);
-  const {isPending, data} = useErrorCountQuery(query);
-
-  const errorRateSeries: Series = {
-    seriesName: DataTitles.errorCount,
-    data: data?.length
-      ? data?.map(entry => ({
-          name: entry.interval,
-          value: entry['http_error_count()'],
-        }))
-      : [],
-  };
-
-  return (
-    <Chart
-      height={CHART_HEIGHT}
-      data={[errorRateSeries]}
-      loading={isPending}
-      grid={{
-        left: '0',
-        right: '0',
-        top: '8px',
-        bottom: '0',
-      }}
-      definedAxisTicks={4}
-      stacked
-      type={ChartType.LINE}
-      chartColors={[ERRORS_COLOR]}
-    />
-  );
-}
-
-/** This fucntion is just to generate mock data based on other time stamps we have found */
-const useMockSeries = ({moduleName, filters, extraQuery}: ChartProps) => {
-  const pageFilters = usePageFilters();
-  const eventView = getEventView(moduleName, pageFilters.selection, filters);
-  if (extraQuery) {
-    eventView.query += ` ${extraQuery.join(' ')}`;
-  }
-
-  const label = `avg(${SPAN_SELF_TIME})`;
-
-  const {isPending, data} = useSpansQuery<
-    {
-      'avg(span.self_time)': number;
-      interval: number;
-      'spm()': number;
-    }[]
-  >({
-    eventView,
-    initialData: [],
-    referrer: 'api.starfish.span-time-charts',
-  });
-  const dataByGroup = {[label]: data};
-
-  const avgSeries = Object.keys(dataByGroup).map(groupName => {
-    const groupData = dataByGroup[groupName];
-
-    return {
-      seriesName: label,
-      data: (groupData ?? []).map(datum => ({
-        value: datum[`avg(${SPAN_SELF_TIME})`],
-        name: datum.interval,
-      })),
-    };
-  });
-  const seriesTimes = avgSeries[0].data.map(({name}) => name);
-  const assetTypes = ['javascript', 'css', 'fonts', 'images'];
-
-  const mockData: Series[] = assetTypes.map(
-    type =>
-      ({
-        seriesName: type,
-        data: seriesTimes.map((time, i) => ({
-          name: time,
-          value: 1000 + Math.ceil(i / 100) * 100,
-        })),
-      }) satisfies Series
-  );
-
-  return {isPending, data: mockData};
-};
-
-function BundleSizeChart(props: ChartProps) {
-  const {isPending, data} = useMockSeries(props);
-  return (
-    <Chart
-      stacked
-      type={ChartType.AREA}
-      loading={isPending}
-      data={data}
-      aggregateOutputFormat="size"
-      height={CHART_HEIGHT}
-    />
-  );
-}
-
-const SPAN_FILTER_KEYS = ['span_operation', SPAN_DOMAIN, 'action'];
-
-const getEventView = (
-  moduleName: ModuleName,
-  pageFilters: PageFilters,
-  appliedFilters: ModuleFilters,
-  spanCategory?: string
-) => {
-  const query = buildDiscoverQueryConditions(moduleName, appliedFilters, spanCategory);
-
-  return EventView.fromNewQueryWithPageFilters(
-    {
-      name: '',
-      fields: [''],
-      yAxis: ['spm()', `avg(${SPAN_SELF_TIME})`],
-      query,
-      dataset: DiscoverDatasets.SPANS_METRICS,
-      interval: getInterval(pageFilters.datetime, STARFISH_CHART_INTERVAL_FIDELITY),
-      version: 2,
-    },
-    pageFilters
-  );
-};
-
-const buildDiscoverQueryConditions = (
-  moduleName: ModuleName,
-  appliedFilters: ModuleFilters,
-  spanCategory?: string
-) => {
-  const result = Object.keys(appliedFilters)
-    .filter(key => SPAN_FILTER_KEYS.includes(key))
-    .filter(key => Boolean(appliedFilters[key]))
-    .map(key => {
-      const value = appliedFilters[key];
-      if (key === SPAN_DOMAIN && value === EMPTY_OPTION_VALUE) {
-        return [`!has:${SPAN_DOMAIN}`];
-      }
-      return `${key}:${value}`;
-    });
-
-  result.push(`has:${SPAN_DESCRIPTION}`);
-
-  if (moduleName !== ModuleName.RESOURCE) {
-    result.push(`${SPAN_MODULE}:${moduleName}`);
-  }
-
-  if (spanCategory) {
-    if (spanCategory === NULL_SPAN_CATEGORY) {
-      result.push(`!has:span.category`);
-    } else if (spanCategory !== 'Other') {
-      result.push(`span.category:${spanCategory}`);
-    }
-  }
-
-  return result.join(' ');
-};
-
-const ChartsContainer = styled('div')`
-  display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
-  gap: ${space(2)};
-`;
-
-const ChartsContainerItem = styled('div')`
-  flex: 1;
-`;
diff --git a/static/app/views/insights/crons/settings.ts b/static/app/views/insights/crons/settings.ts
new file mode 100644
index 00000000000000..585d75ebcf08c6
--- /dev/null
+++ b/static/app/views/insights/crons/settings.ts
@@ -0,0 +1,15 @@
+import {t} from 'sentry/locale';
+
+export const MODULE_TITLE = t('Cron Monitors');
+export const MODULE_SIDEBAR_TITLE = t('Crons');
+export const DATA_TYPE = t('Cron Check-In');
+export const DATA_TYPE_PLURAL = t('Cron Check-Ins');
+export const BASE_URL = 'crons';
+
+export const MODULE_DESCRIPTION = t(
+  'Scheduled monitors that check in on recurring jobs and tell you if they’re running on schedule, failing, or succeeding.'
+);
+export const MODULE_DOC_LINK = 'https://docs.sentry.io/product/crons/';
+
+export const MODULE_FEATURES = ['insights-crons'];
+export const MODULE_VISIBLE_FEATURES = ['insights-crons'];
diff --git a/static/app/views/insights/database/components/databasePageFilters.tsx b/static/app/views/insights/database/components/databasePageFilters.tsx
index ed529c48765ce6..3456f8be122bde 100644
--- a/static/app/views/insights/database/components/databasePageFilters.tsx
+++ b/static/app/views/insights/database/components/databasePageFilters.tsx
@@ -20,7 +20,10 @@ type Props = {
 export function DatabasePageFilters(props: Props) {
   const {system, databaseCommand, table} = props;
 
-  const additionalQuery = useMemo(() => [`span.system:${system}`], [system]);
+  const additionalQuery = useMemo(
+    () => (system ? [`span.system:${system}`] : []),
+    [system]
+  );
 
   return (
     <PageFilterWrapper>
diff --git a/static/app/views/insights/database/components/databaseSystemSelector.spec.tsx b/static/app/views/insights/database/components/databaseSystemSelector.spec.tsx
index 77eb1c37ad44d8..9a9092a021054a 100644
--- a/static/app/views/insights/database/components/databaseSystemSelector.spec.tsx
+++ b/static/app/views/insights/database/components/databaseSystemSelector.spec.tsx
@@ -218,7 +218,7 @@ describe('DatabaseSystemSelector', function () {
     expect(dropdownOptionLabels[0]).toHaveTextContent('PostgreSQL');
     expect(dropdownOptionLabels[1]).toHaveTextContent('MongoDB');
 
-    await userEvent.click(dropdownOptionLabels[0]);
+    await userEvent.click(dropdownOptionLabels[0]!);
     expect(dropdownSelector).toHaveTextContent('SystemPostgreSQL');
     expect(mockSetState).toHaveBeenCalledWith('postgresql');
     expect(mockNavigate).toHaveBeenCalledWith({
diff --git a/static/app/views/insights/database/components/noDataMessage.spec.tsx b/static/app/views/insights/database/components/noDataMessage.spec.tsx
index 11c2ca7c92f343..5bcba3b19f877a 100644
--- a/static/app/views/insights/database/components/noDataMessage.spec.tsx
+++ b/static/app/views/insights/database/components/noDataMessage.spec.tsx
@@ -65,7 +65,7 @@ describe('NoDataMessage', () => {
     await tick(); // There is no visual indicator, this awaits the promise resolve
 
     expect(
-      screen.queryByText(textWithMarkupMatcher('No queries found.'))
+      screen.getByText(textWithMarkupMatcher('No queries found.'))
     ).toBeInTheDocument();
     expect(
       screen.queryByText(
@@ -86,7 +86,7 @@ describe('NoDataMessage', () => {
     await tick(); // There is no visual indicator, this awaits the promise resolve
 
     expect(
-      screen.queryByText(textWithMarkupMatcher('No queries found.'))
+      screen.getByText(textWithMarkupMatcher('No queries found.'))
     ).toBeInTheDocument();
     expect(
       screen.getByText(
diff --git a/static/app/views/insights/database/components/tables/queriesTable.tsx b/static/app/views/insights/database/components/tables/queriesTable.tsx
index 300de458b10954..e2d6b1e05f2105 100644
--- a/static/app/views/insights/database/components/tables/queriesTable.tsx
+++ b/static/app/views/insights/database/components/tables/queriesTable.tsx
@@ -7,13 +7,13 @@ import Pagination from 'sentry/components/pagination';
 import {t} from 'sentry/locale';
 import type {Organization} from 'sentry/types/organization';
 import {trackAnalytics} from 'sentry/utils/analytics';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import type {EventsMetaType} from 'sentry/utils/discover/eventView';
 import {getFieldRenderer} from 'sentry/utils/discover/fieldRenderers';
 import type {Sort} from 'sentry/utils/discover/fields';
 import {RATE_UNIT_TITLE, RateUnit} from 'sentry/utils/discover/fields';
 import {VisuallyCompleteWithData} from 'sentry/utils/performanceForSentry';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import {renderHeadCell} from 'sentry/views/insights/common/components/tableCells/renderHeadCell';
 import {SpanDescriptionCell} from 'sentry/views/insights/common/components/tableCells/spanDescriptionCell';
@@ -85,11 +85,12 @@ interface Props {
 
 export function QueriesTable({response, sort, system}: Props) {
   const {data, isLoading, meta, pageLinks} = response;
+  const navigate = useNavigate();
   const location = useLocation();
   const organization = useOrganization();
 
   const handleCursor: CursorHandler = (newCursor, pathname, query) => {
-    browserHistory.push({
+    navigate({
       pathname,
       query: {...query, [QueryParameterNames.SPANS_CURSOR]: newCursor},
     });
diff --git a/static/app/views/insights/database/components/tables/queryTransactionsTable.tsx b/static/app/views/insights/database/components/tables/queryTransactionsTable.tsx
index 6423698e467bf8..e5c307f1b69ba9 100644
--- a/static/app/views/insights/database/components/tables/queryTransactionsTable.tsx
+++ b/static/app/views/insights/database/components/tables/queryTransactionsTable.tsx
@@ -9,11 +9,11 @@ import type {CursorHandler} from 'sentry/components/pagination';
 import Pagination from 'sentry/components/pagination';
 import {t} from 'sentry/locale';
 import type {Organization} from 'sentry/types/organization';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import type {EventsMetaType} from 'sentry/utils/discover/eventView';
 import {getFieldRenderer} from 'sentry/utils/discover/fieldRenderers';
 import type {Sort} from 'sentry/utils/discover/fields';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import {renderHeadCell} from 'sentry/views/insights/common/components/tableCells/renderHeadCell';
 import {OverflowEllipsisTextContainer} from 'sentry/views/insights/common/components/textAlign';
@@ -97,11 +97,12 @@ export function QueryTransactionsTable({
   span,
 }: Props) {
   const moduleURL = useModuleURL('db');
+  const navigate = useNavigate();
   const location = useLocation();
   const organization = useOrganization();
 
   const handleCursor: CursorHandler = (newCursor, pathname, query) => {
-    browserHistory.push({
+    navigate({
       pathname,
       query: {...query, [QueryParameterNames.TRANSACTIONS_CURSOR]: newCursor},
     });
diff --git a/static/app/views/insights/database/components/useSystemSelectorOptions.tsx b/static/app/views/insights/database/components/useSystemSelectorOptions.tsx
index e8f2054452f7d1..be00e31cb842ef 100644
--- a/static/app/views/insights/database/components/useSystemSelectorOptions.tsx
+++ b/static/app/views/insights/database/components/useSystemSelectorOptions.tsx
@@ -43,12 +43,12 @@ export function useSystemSelectorOptions() {
 
   // Edge case: Invalid DB system was retrieved from localStorage
   if (!options.find(option => selectedSystem === option.value) && options.length > 0) {
-    setSelectedSystem(options[0].value);
+    setSelectedSystem(options[0]!.value);
   }
 
   // Edge case: No current system is saved in localStorage
   if (!selectedSystem && options.length > 0) {
-    setSelectedSystem(options[0].value);
+    setSelectedSystem(options[0]!.value);
   }
 
   return {selectedSystem, setSelectedSystem, options, isLoading: isPending, isError};
diff --git a/static/app/views/insights/database/utils/formatMongoDBQuery.tsx b/static/app/views/insights/database/utils/formatMongoDBQuery.tsx
index 3fe3a63781d3b5..712191b849298c 100644
--- a/static/app/views/insights/database/utils/formatMongoDBQuery.tsx
+++ b/static/app/views/insights/database/utils/formatMongoDBQuery.tsx
@@ -50,7 +50,7 @@ export function formatMongoDBQuery(query: string, command: string) {
   });
 
   if (tokens.length === 1 && tempTokens.length > 0) {
-    tokens.push(stringToToken(', ', `${tokens[0].key}:,`));
+    tokens.push(stringToToken(', ', `${tokens[0]!.key}:,`));
   }
 
   tempTokens.forEach((token, index) => {
diff --git a/static/app/views/insights/database/views/databaseLandingPage.spec.tsx b/static/app/views/insights/database/views/databaseLandingPage.spec.tsx
index f4df7902a2e261..b6d83bff22b904 100644
--- a/static/app/views/insights/database/views/databaseLandingPage.spec.tsx
+++ b/static/app/views/insights/database/views/databaseLandingPage.spec.tsx
@@ -215,7 +215,6 @@ describe('DatabaseLandingPage', function () {
   });
 
   it('renders a list of queries', async function () {
-    // eslint-disable-next-line no-console
     jest.spyOn(console, 'error').mockImplementation(jest.fn()); // This silences pointless unique key errors that React throws because of the tokenized query descriptions
 
     render(<DatabaseLandingPage />, {organization});
diff --git a/static/app/views/insights/http/components/charts/durationChart.tsx b/static/app/views/insights/http/components/charts/durationChart.tsx
index 39a856dace93c9..c65a8ab4a38196 100644
--- a/static/app/views/insights/http/components/charts/durationChart.tsx
+++ b/static/app/views/insights/http/components/charts/durationChart.tsx
@@ -1,6 +1,4 @@
-import type {ComponentProps} from 'react';
-
-import type {EChartHighlightHandler, Series} from 'sentry/types/echarts';
+import type {Series} from 'sentry/types/echarts';
 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';
@@ -11,47 +9,9 @@ interface Props {
   isLoading: boolean;
   series: Series[];
   error?: Error | null;
-  onHighlight?: (highlights: Highlight[], event: Event) => void; // TODO: Correctly type this
-  scatterPlot?: ComponentProps<typeof Chart>['scatterPlot'];
 }
 
-interface Highlight {
-  dataPoint: Series['data'][number];
-  series: Series[];
-}
-
-export function DurationChart({
-  series,
-  scatterPlot,
-  isLoading,
-  error,
-  onHighlight,
-}: Props) {
-  // TODO: This is duplicated from `DurationChart` in `SampleList`. Resolve the duplication
-  const handleChartHighlight: EChartHighlightHandler = function (event) {
-    // ignore mouse hovering over the chart legend
-    if (!event.batch) {
-      return;
-    }
-
-    // TODO: Gross hack. Even though `scatterPlot` is a separate prop, it's just an array of `Series` that gets appended to the main series. To find the point that was hovered, we re-construct the correct series order. It would have been cleaner to just pass the scatter plot as its own, single series
-    const allSeries = [...series, ...(scatterPlot ?? [])];
-
-    const highlightedDataPoints = event.batch.map(batch => {
-      let {seriesIndex} = batch;
-      const {dataIndex} = batch;
-      // TODO: More hacks. The Chart component partitions the data series into a complete and incomplete series. Wrap the series index to work around overflowing index.
-      seriesIndex = seriesIndex % allSeries.length;
-
-      const highlightedSeries = allSeries?.[seriesIndex];
-      const highlightedDataPoint = highlightedSeries?.data?.[dataIndex];
-
-      return {series: highlightedSeries, dataPoint: highlightedDataPoint};
-    });
-
-    onHighlight?.(highlightedDataPoints, event);
-  };
-
+export function DurationChart({series, isLoading, error}: Props) {
   return (
     <ChartPanel title={getDurationChartTitle('http')}>
       <Chart
@@ -63,8 +23,6 @@ export function DurationChart({
           bottom: '0',
         }}
         data={series}
-        onHighlight={handleChartHighlight}
-        scatterPlot={scatterPlot}
         loading={isLoading}
         error={error}
         chartColors={[AVG_COLOR]}
diff --git a/static/app/views/insights/http/components/charts/durationChartWithSamples.tsx b/static/app/views/insights/http/components/charts/durationChartWithSamples.tsx
new file mode 100644
index 00000000000000..0126b65b39ed42
--- /dev/null
+++ b/static/app/views/insights/http/components/charts/durationChartWithSamples.tsx
@@ -0,0 +1,76 @@
+import type {ComponentProps} from 'react';
+
+import type {EChartHighlightHandler, Series} from 'sentry/types/echarts';
+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 {CHART_HEIGHT} from 'sentry/views/insights/http/settings';
+
+interface Props {
+  isLoading: boolean;
+  series: Series[];
+  error?: Error | null;
+  onHighlight?: (highlights: Highlight[], event: Event) => void; // TODO: Correctly type this
+  scatterPlot?: ComponentProps<typeof Chart>['scatterPlot'];
+}
+
+interface Highlight {
+  dataPoint: Series['data'][number];
+  series: Series[];
+}
+
+export function DurationChartWithSamples({
+  series,
+  scatterPlot,
+  isLoading,
+  error,
+  onHighlight,
+}: Props) {
+  // TODO: This is duplicated from `DurationChart` in `SampleList`. Resolve the duplication
+  const handleChartHighlight: EChartHighlightHandler = function (event) {
+    // ignore mouse hovering over the chart legend
+    if (!event.batch) {
+      return;
+    }
+
+    // TODO: Gross hack. Even though `scatterPlot` is a separate prop, it's just an array of `Series` that gets appended to the main series. To find the point that was hovered, we re-construct the correct series order. It would have been cleaner to just pass the scatter plot as its own, single series
+    const allSeries = [...series, ...(scatterPlot ?? [])];
+
+    const highlightedDataPoints = event.batch.map(batch => {
+      let {seriesIndex} = batch;
+      const {dataIndex} = batch;
+      // TODO: More hacks. The Chart component partitions the data series into a complete and incomplete series. Wrap the series index to work around overflowing index.
+      seriesIndex = seriesIndex % allSeries.length;
+
+      const highlightedSeries = allSeries?.[seriesIndex];
+      const highlightedDataPoint = highlightedSeries?.data?.[dataIndex];
+
+      return {series: highlightedSeries, dataPoint: highlightedDataPoint};
+    });
+
+    onHighlight?.(highlightedDataPoints, event);
+  };
+
+  return (
+    <ChartPanel title={getDurationChartTitle('http')}>
+      <Chart
+        height={CHART_HEIGHT}
+        grid={{
+          left: '0',
+          right: '0',
+          top: '8px',
+          bottom: '0',
+        }}
+        data={series}
+        onHighlight={handleChartHighlight}
+        scatterPlot={scatterPlot}
+        loading={isLoading}
+        error={error}
+        chartColors={[AVG_COLOR]}
+        type={ChartType.LINE}
+        aggregateOutputFormat="duration"
+      />
+    </ChartPanel>
+  );
+}
diff --git a/static/app/views/insights/http/components/charts/responseRateChart.spec.tsx b/static/app/views/insights/http/components/charts/responseRateChart.spec.tsx
deleted file mode 100644
index 423aff6f1f67d3..00000000000000
--- a/static/app/views/insights/http/components/charts/responseRateChart.spec.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import type {Series} from 'sentry/types/echarts';
-import {getAxisMaxForPercentageSeries} from 'sentry/views/insights/http/components/charts/responseRateChart';
-
-describe('ResponseRateChart', function () {
-  describe('getAxisMaxForPercentageSeries', function () {
-    it('Returns nearest significant digit for small series', function () {
-      expect(getAxisMaxForPercentageSeries([HTTP_5XX_SERIES])).toBeCloseTo(0.0001);
-    });
-
-    it('Returns 1 for larger series', function () {
-      expect(getAxisMaxForPercentageSeries([HTTP_2XX_SERIES])).toBeCloseTo(1);
-    });
-
-    it('Takes all series into account', function () {
-      expect(
-        getAxisMaxForPercentageSeries([HTTP_2XX_SERIES, HTTP_5XX_SERIES])
-      ).toBeCloseTo(1);
-    });
-  });
-});
-
-const HTTP_2XX_SERIES: Series = {
-  seriesName: '5XX',
-  data: [
-    {
-      value: 0.9812,
-      name: '2024-03-12T13:30:00-04:00',
-    },
-    {
-      value: 0.9992,
-      name: '2024-03-12T14:00:00-04:00',
-    },
-  ],
-};
-
-const HTTP_5XX_SERIES: Series = {
-  seriesName: '5XX',
-  data: [
-    {
-      value: 0.00006713689346852019,
-      name: '2024-03-12T13:30:00-04:00',
-    },
-    {
-      value: 0.000041208717375685543,
-      name: '2024-03-12T14:00:00-04:00',
-    },
-  ],
-};
diff --git a/static/app/views/insights/http/components/charts/responseRateChart.tsx b/static/app/views/insights/http/components/charts/responseRateChart.tsx
index a5fd79dc09d754..0cfdf610aeda52 100644
--- a/static/app/views/insights/http/components/charts/responseRateChart.tsx
+++ b/static/app/views/insights/http/components/charts/responseRateChart.tsx
@@ -7,6 +7,7 @@ import {
 } 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 {getAxisMaxForPercentageSeries} from 'sentry/views/insights/common/utils/getAxisMaxForPercentageSeries';
 import {DataTitles} from 'sentry/views/insights/common/views/spans/types';
 import {CHART_HEIGHT} from 'sentry/views/insights/http/settings';
 
@@ -46,18 +47,3 @@ export function ResponseRateChart({series, isLoading, error}: Props) {
     </ChartPanel>
   );
 }
-
-/**
- * Given a set of `Series` objects that contain percentage data (i.e., every item in `data` has a `value` between 0 and 1) return an appropriate max value.
- *
- * e.g., for series with very low values (like 5xx rates), it rounds to the nearest significant digit. For other cases, it limits it to 100
- */
-export function getAxisMaxForPercentageSeries(series: Series[]): number {
-  const maxValue = Math.max(
-    ...series.map(serie => Math.max(...serie.data.map(datum => datum.value)))
-  );
-
-  const maxNumberOfDecimalPlaces = Math.ceil(Math.min(0, Math.log10(maxValue)));
-
-  return Math.pow(10, maxNumberOfDecimalPlaces);
-}
diff --git a/static/app/views/insights/http/components/httpSamplesPanel.tsx b/static/app/views/insights/http/components/httpSamplesPanel.tsx
index 79c979ca79bbe1..c8aae218f61a92 100644
--- a/static/app/views/insights/http/components/httpSamplesPanel.tsx
+++ b/static/app/views/insights/http/components/httpSamplesPanel.tsx
@@ -44,7 +44,7 @@ import {
   getThroughputTitle,
 } from 'sentry/views/insights/common/views/spans/types';
 import {useSampleScatterPlotSeries} from 'sentry/views/insights/common/views/spanSummaryPage/sampleList/durationChart/useSampleScatterPlotSeries';
-import {DurationChart} from 'sentry/views/insights/http/components/charts/durationChart';
+import {DurationChartWithSamples} from 'sentry/views/insights/http/components/charts/durationChartWithSamples';
 import {ResponseCodeCountChart} from 'sentry/views/insights/http/components/charts/responseCodeCountChart';
 import {SpanSamplesTable} from 'sentry/views/insights/http/components/tables/spanSamplesTable';
 import {HTTP_RESPONSE_STATUS_CODES} from 'sentry/views/insights/http/data/definitions';
@@ -393,7 +393,7 @@ export function HTTPSamplesPanel() {
                 value={domainTransactionMetrics?.[0]?.['sum(span.self_time)']}
                 unit={DurationUnit.MILLISECOND}
                 tooltip={getTimeSpentExplanation(
-                  domainTransactionMetrics?.[0]?.['time_spent_percentage()'],
+                  domainTransactionMetrics?.[0]!?.['time_spent_percentage()'],
                   'http.client'
                 )}
                 isLoading={areDomainTransactionMetricsFetching}
@@ -430,7 +430,7 @@ export function HTTPSamplesPanel() {
           {query.panel === 'duration' && (
             <Fragment>
               <ModuleLayout.Full>
-                <DurationChart
+                <DurationChartWithSamples
                   series={[
                     {
                       ...durationData[`avg(span.self_time)`],
diff --git a/static/app/views/insights/http/components/tables/domainTransactionsTable.tsx b/static/app/views/insights/http/components/tables/domainTransactionsTable.tsx
index f2a0589c7c52ab..91e144d802d920 100644
--- a/static/app/views/insights/http/components/tables/domainTransactionsTable.tsx
+++ b/static/app/views/insights/http/components/tables/domainTransactionsTable.tsx
@@ -9,11 +9,11 @@ import type {CursorHandler} from 'sentry/components/pagination';
 import Pagination from 'sentry/components/pagination';
 import {t} from 'sentry/locale';
 import type {Organization} from 'sentry/types/organization';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import type {EventsMetaType} from 'sentry/utils/discover/eventView';
 import {getFieldRenderer} from 'sentry/utils/discover/fieldRenderers';
 import {RATE_UNIT_TITLE, RateUnit, type Sort} from 'sentry/utils/discover/fields';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import {renderHeadCell} from 'sentry/views/insights/common/components/tableCells/renderHeadCell';
 import {QueryParameterNames} from 'sentry/views/insights/common/views/queryParameters';
@@ -119,11 +119,12 @@ export function DomainTransactionsTable({
   sort,
   domain,
 }: Props) {
+  const navigate = useNavigate();
   const location = useLocation();
   const organization = useOrganization();
 
   const handleCursor: CursorHandler = (newCursor, pathname, query) => {
-    browserHistory.push({
+    navigate({
       pathname,
       query: {...query, [QueryParameterNames.TRANSACTIONS_CURSOR]: newCursor},
     });
diff --git a/static/app/views/insights/http/components/tables/domainsTable.tsx b/static/app/views/insights/http/components/tables/domainsTable.tsx
index 19d3deb76aa750..4ea181f1c0b77b 100644
--- a/static/app/views/insights/http/components/tables/domainsTable.tsx
+++ b/static/app/views/insights/http/components/tables/domainsTable.tsx
@@ -7,13 +7,13 @@ import Pagination from 'sentry/components/pagination';
 import {t} from 'sentry/locale';
 import type {Organization} from 'sentry/types/organization';
 import {trackAnalytics} from 'sentry/utils/analytics';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import type {EventsMetaType} from 'sentry/utils/discover/eventView';
 import {getFieldRenderer} from 'sentry/utils/discover/fieldRenderers';
 import type {Sort} from 'sentry/utils/discover/fields';
 import {RATE_UNIT_TITLE, RateUnit} from 'sentry/utils/discover/fields';
 import {VisuallyCompleteWithData} from 'sentry/utils/performanceForSentry';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import {renderHeadCell} from 'sentry/views/insights/common/components/tableCells/renderHeadCell';
 import {QueryParameterNames} from 'sentry/views/insights/common/views/queryParameters';
@@ -119,11 +119,12 @@ interface Props {
 
 export function DomainsTable({response, sort}: Props) {
   const {data, isLoading, meta, pageLinks} = response;
+  const navigate = useNavigate();
   const location = useLocation();
   const organization = useOrganization();
 
   const handleCursor: CursorHandler = (newCursor, pathname, query) => {
-    browserHistory.push({
+    navigate({
       pathname,
       query: {...query, [QueryParameterNames.DOMAINS_CURSOR]: newCursor},
     });
diff --git a/static/app/views/insights/http/queries/useSpanSamples.spec.tsx b/static/app/views/insights/http/queries/useSpanSamples.spec.tsx
index d0274dfb0d0ed9..dd3dc6b38f837b 100644
--- a/static/app/views/insights/http/queries/useSpanSamples.spec.tsx
+++ b/static/app/views/insights/http/queries/useSpanSamples.spec.tsx
@@ -68,7 +68,7 @@ describe('useSpanSamples', () => {
       }
     );
 
-    expect(result.current.isFetching).toEqual(false);
+    expect(result.current.isFetching).toBe(false);
     expect(request).not.toHaveBeenCalled();
   });
 
@@ -112,7 +112,7 @@ describe('useSpanSamples', () => {
       }
     );
 
-    expect(result.current.isPending).toEqual(true);
+    expect(result.current.isPending).toBe(true);
 
     expect(request).toHaveBeenCalledWith(
       '/api/0/organizations/org-slug/spans-samples/',
@@ -133,7 +133,7 @@ describe('useSpanSamples', () => {
       })
     );
 
-    await waitFor(() => expect(result.current.isPending).toEqual(false));
+    await waitFor(() => expect(result.current.isPending).toBe(false));
     expect(result.current.data).toEqual([
       {
         'transaction.id': '7663aab8a',
diff --git a/static/app/views/insights/http/views/httpDomainSummaryPage.spec.tsx b/static/app/views/insights/http/views/httpDomainSummaryPage.spec.tsx
index aa04150addb9cf..5d504e00d3dea8 100644
--- a/static/app/views/insights/http/views/httpDomainSummaryPage.spec.tsx
+++ b/static/app/views/insights/http/views/httpDomainSummaryPage.spec.tsx
@@ -17,7 +17,8 @@ jest.mock('sentry/utils/usePageFilters');
 describe('HTTPSummaryPage', function () {
   const organization = OrganizationFixture({features: ['insights-initial-modules']});
 
-  let domainChartsRequestMock, domainTransactionsListRequestMock;
+  let domainChartsRequestMock: jest.Mock;
+  let domainTransactionsListRequestMock: jest.Mock;
 
   jest.mocked(usePageFilters).mockReturnValue({
     isReady: true,
diff --git a/static/app/views/insights/http/views/httpDomainSummaryPage.tsx b/static/app/views/insights/http/views/httpDomainSummaryPage.tsx
index 3acd1dbcc0054f..33ec1acbb8c306 100644
--- a/static/app/views/insights/http/views/httpDomainSummaryPage.tsx
+++ b/static/app/views/insights/http/views/httpDomainSummaryPage.tsx
@@ -274,7 +274,7 @@ export function HTTPDomainSummaryPage() {
                       value={domainMetrics?.[0]?.['sum(span.self_time)']}
                       unit={DurationUnit.MILLISECOND}
                       tooltip={getTimeSpentExplanation(
-                        domainMetrics?.[0]?.['time_spent_percentage()'],
+                        domainMetrics?.[0]!?.['time_spent_percentage()'],
                         'http'
                       )}
                       isLoading={areDomainMetricsLoading}
diff --git a/static/app/views/insights/http/views/httpLandingPage.spec.tsx b/static/app/views/insights/http/views/httpLandingPage.spec.tsx
index 4fa1cc74b73178..1657ab55093302 100644
--- a/static/app/views/insights/http/views/httpLandingPage.spec.tsx
+++ b/static/app/views/insights/http/views/httpLandingPage.spec.tsx
@@ -17,7 +17,8 @@ jest.mock('sentry/views/insights/common/queries/useOnboardingProject');
 describe('HTTPLandingPage', function () {
   const organization = OrganizationFixture({features: ['insights-initial-modules']});
 
-  let spanListRequestMock, spanChartsRequestMock;
+  let spanListRequestMock!: jest.Mock;
+  let spanChartsRequestMock!: jest.Mock;
 
   jest.mocked(useOnboardingProject).mockReturnValue(undefined);
 
diff --git a/static/app/views/insights/http/views/httpLandingPage.tsx b/static/app/views/insights/http/views/httpLandingPage.tsx
index fcd000b2411c29..7aa95c0ec9632b 100644
--- a/static/app/views/insights/http/views/httpLandingPage.tsx
+++ b/static/app/views/insights/http/views/httpLandingPage.tsx
@@ -5,11 +5,11 @@ import {PageHeadingQuestionTooltip} from 'sentry/components/pageHeadingQuestionT
 import SearchBar from 'sentry/components/searchBar';
 import {t} from 'sentry/locale';
 import {trackAnalytics} from 'sentry/utils/analytics';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {decodeList, decodeScalar, decodeSorts} from 'sentry/utils/queryString';
 import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import useLocationQuery from 'sentry/utils/url/useLocationQuery';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import {useSynchronizeCharts} from 'sentry/views/insights/common/components/chart';
 import * as ModuleLayout from 'sentry/views/insights/common/components/moduleLayout';
@@ -47,6 +47,7 @@ import {ModuleName, SpanMetricsField} from 'sentry/views/insights/types';
 
 export function HTTPLandingPage() {
   const organization = useOrganization();
+  const navigate = useNavigate();
   const location = useLocation();
   const {view} = useDomainViewFilters();
   const moduleTitle = useModuleTitle(ModuleName.HTTP);
@@ -89,7 +90,7 @@ export function HTTPLandingPage() {
       query: newDomain,
       source: ModuleName.HTTP,
     });
-    browserHistory.push({
+    navigate({
       ...location,
       query: {
         ...location.query,
diff --git a/static/app/views/insights/llmMonitoring/components/charts/llmMonitoringCharts.tsx b/static/app/views/insights/llmMonitoring/components/charts/llmMonitoringCharts.tsx
index 4534b3e777337f..934e62bd881c71 100644
--- a/static/app/views/insights/llmMonitoring/components/charts/llmMonitoringCharts.tsx
+++ b/static/app/views/insights/llmMonitoring/components/charts/llmMonitoringCharts.tsx
@@ -43,7 +43,7 @@ export function EAPTotalTokensUsedChart({groupId}: TotalTokensUsedChartProps) {
         loading={isPending}
         error={error}
         type={ChartType.LINE}
-        chartColors={[CHART_PALETTE[2][0]]}
+        chartColors={[CHART_PALETTE[2]![0]!]}
       />
     </ChartPanel>
   );
@@ -78,7 +78,7 @@ export function TotalTokensUsedChart({groupId}: TotalTokensUsedChartProps) {
         loading={isPending}
         error={error}
         type={ChartType.LINE}
-        chartColors={[CHART_PALETTE[2][0]]}
+        chartColors={[CHART_PALETTE[2]![0]!]}
       />
     </ChartPanel>
   );
@@ -118,7 +118,7 @@ export function EAPNumberOfPipelinesChart({groupId}: NumberOfPipelinesChartProps
         loading={isPending}
         error={error}
         type={ChartType.LINE}
-        chartColors={[CHART_PALETTE[2][1]]}
+        chartColors={[CHART_PALETTE[2]![1]!]}
       />
     </ChartPanel>
   );
@@ -152,7 +152,7 @@ export function NumberOfPipelinesChart({groupId}: NumberOfPipelinesChartProps) {
         loading={isPending}
         error={error}
         type={ChartType.LINE}
-        chartColors={[CHART_PALETTE[2][1]]}
+        chartColors={[CHART_PALETTE[2]![1]!]}
       />
     </ChartPanel>
   );
@@ -191,7 +191,7 @@ export function EAPPipelineDurationChart({groupId}: PipelineDurationChartProps)
         loading={isPending}
         error={error}
         type={ChartType.LINE}
-        chartColors={[CHART_PALETTE[2][2]]}
+        chartColors={[CHART_PALETTE[2]![2]!]}
       />
     </ChartPanel>
   );
@@ -225,7 +225,7 @@ export function PipelineDurationChart({groupId}: PipelineDurationChartProps) {
         loading={isPending}
         error={error}
         type={ChartType.LINE}
-        chartColors={[CHART_PALETTE[2][2]]}
+        chartColors={[CHART_PALETTE[2]![2]!]}
       />
     </ChartPanel>
   );
diff --git a/static/app/views/insights/llmMonitoring/components/tables/pipelinesTable.tsx b/static/app/views/insights/llmMonitoring/components/tables/pipelinesTable.tsx
index ddd3f4f1bb5305..15b45534e210f1 100644
--- a/static/app/views/insights/llmMonitoring/components/tables/pipelinesTable.tsx
+++ b/static/app/views/insights/llmMonitoring/components/tables/pipelinesTable.tsx
@@ -15,7 +15,6 @@ import {IconInfo} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {Organization} from 'sentry/types/organization';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import type {EventsMetaType} from 'sentry/utils/discover/eventView';
 import {getFieldRenderer} from 'sentry/utils/discover/fieldRenderers';
 import type {Sort} from 'sentry/utils/discover/fields';
@@ -24,6 +23,7 @@ import {VisuallyCompleteWithData} from 'sentry/utils/performanceForSentry';
 import {decodeScalar, decodeSorts} from 'sentry/utils/queryString';
 import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import {renderHeadCell} from 'sentry/views/insights/common/components/tableCells/renderHeadCell';
 import {
@@ -94,6 +94,7 @@ export function isAValidSort(sort: Sort): sort is ValidSort {
 }
 
 export function EAPPipelinesTable() {
+  const navigate = useNavigate();
   const location = useLocation();
   const moduleURL = useModuleURL('ai');
 
@@ -183,14 +184,14 @@ export function EAPPipelinesTable() {
   });
 
   const handleCursor: CursorHandler = (newCursor, pathname, query) => {
-    browserHistory.push({
+    navigate({
       pathname,
       query: {...query, [QueryParameterNames.SPANS_CURSOR]: newCursor},
     });
   };
 
   const handleSearch = (newQuery: string) => {
-    browserHistory.push({
+    navigate({
       ...location,
       query: {
         ...location.query,
@@ -242,6 +243,7 @@ export function EAPPipelinesTable() {
 }
 
 export function PipelinesTable() {
+  const navigate = useNavigate();
   const location = useLocation();
   const moduleURL = useModuleURL('ai');
 
@@ -329,14 +331,14 @@ export function PipelinesTable() {
   });
 
   const handleCursor: CursorHandler = (newCursor, pathname, query) => {
-    browserHistory.push({
+    navigate({
       pathname,
       query: {...query, [QueryParameterNames.SPANS_CURSOR]: newCursor},
     });
   };
 
   const handleSearch = (newQuery: string) => {
-    browserHistory.push({
+    navigate({
       ...location,
       query: {
         ...location.query,
diff --git a/static/app/views/insights/mobile/appStarts/components/appStartup.tsx b/static/app/views/insights/mobile/appStarts/components/appStartup.tsx
index ef3a794e79f8e8..7e21f4a2ab7e14 100644
--- a/static/app/views/insights/mobile/appStarts/components/appStartup.tsx
+++ b/static/app/views/insights/mobile/appStarts/components/appStartup.tsx
@@ -199,7 +199,7 @@ function AppStartup({additionalFilters, chartHeight}: Props) {
               title: countTopScreens > 1 ? pluralTopScreenTitle : singularTopScreenTitle,
               yAxis,
               xAxisLabel: topTransactions,
-              series: Object.values(transformedReleaseEvents[yAxis]),
+              series: Object.values(transformedReleaseEvents[yAxis]!),
               subtitle: primaryRelease
                 ? t(
                     '%s v. %s',
@@ -233,7 +233,7 @@ function AppStartup({additionalFilters, chartHeight}: Props) {
           });
         }}
         organization={organization}
-        query={getFreeTextFromQuery(derivedQuery)}
+        query={getFreeTextFromQuery(derivedQuery)!}
         placeholder={t('Search for Screen')}
         additionalConditions={
           new MutableSearch(
diff --git a/static/app/views/insights/mobile/appStarts/components/charts/countChart.tsx b/static/app/views/insights/mobile/appStarts/components/charts/countChart.tsx
index 3b9812090fbd99..c5c0d36be1ff1a 100644
--- a/static/app/views/insights/mobile/appStarts/components/charts/countChart.tsx
+++ b/static/app/views/insights/mobile/appStarts/components/charts/countChart.tsx
@@ -41,7 +41,7 @@ function transformData(data?: MultiSeriesEventsStats, primaryRelease?: string) {
           data[release]?.data?.map(datum => {
             return {
               name: datum[0] * 1000,
-              value: datum[1][0].count,
+              value: datum[1]![0]!.count,
             };
           }) ?? [],
         ...(primaryRelease === release
diff --git a/static/app/views/insights/mobile/appStarts/components/charts/deviceClassBreakdownBarChart.tsx b/static/app/views/insights/mobile/appStarts/components/charts/deviceClassBreakdownBarChart.tsx
index 700f80521c6a56..21cd54a015ab3b 100644
--- a/static/app/views/insights/mobile/appStarts/components/charts/deviceClassBreakdownBarChart.tsx
+++ b/static/app/views/insights/mobile/appStarts/components/charts/deviceClassBreakdownBarChart.tsx
@@ -116,7 +116,7 @@ function DeviceClassBreakdownBarChart({
   const data = Object.values(
     transformedData[
       YAXIS_COLUMNS[startType === COLD_START_TYPE ? YAxis.COLD_START : YAxis.WARM_START]
-    ]
+    ]!
   );
 
   return (
diff --git a/static/app/views/insights/mobile/appStarts/components/eventSamples.spec.tsx b/static/app/views/insights/mobile/appStarts/components/eventSamples.spec.tsx
index 32bf3335e719e3..33e45ffe09a94a 100644
--- a/static/app/views/insights/mobile/appStarts/components/eventSamples.spec.tsx
+++ b/static/app/views/insights/mobile/appStarts/components/eventSamples.spec.tsx
@@ -18,7 +18,7 @@ describe('ScreenLoadEventSamples', function () {
   const organization = OrganizationFixture();
   const project = ProjectFixture();
 
-  let mockEventsRequest;
+  let mockEventsRequest!: jest.Mock;
   beforeEach(function () {
     jest.mocked(usePageFilters).mockReturnValue({
       isReady: true,
diff --git a/static/app/views/insights/mobile/appStarts/components/spanOpSelector.tsx b/static/app/views/insights/mobile/appStarts/components/spanOpSelector.tsx
index 2959405ae37b18..08c3dd7c4afbed 100644
--- a/static/app/views/insights/mobile/appStarts/components/spanOpSelector.tsx
+++ b/static/app/views/insights/mobile/appStarts/components/spanOpSelector.tsx
@@ -2,12 +2,12 @@ import {CompactSelect} from 'sentry/components/compactSelect';
 import {t} from 'sentry/locale';
 import type {NewQuery} from 'sentry/types/organization';
 import {trackAnalytics} from 'sentry/utils/analytics';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import EventView from 'sentry/utils/discover/eventView';
 import {DiscoverDatasets} from 'sentry/utils/discover/types';
 import {decodeScalar} from 'sentry/utils/queryString';
 import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import usePageFilters from 'sentry/utils/usePageFilters';
 import {appendReleaseFilters} from 'sentry/views/insights/common/utils/releaseComparison';
@@ -35,6 +35,7 @@ type Props = {
 };
 
 export function SpanOpSelector({transaction, primaryRelease, secondaryRelease}: Props) {
+  const navigate = useNavigate();
   const location = useLocation();
   const organization = useOrganization();
   const {selection} = usePageFilters();
@@ -91,7 +92,7 @@ export function SpanOpSelector({transaction, primaryRelease, secondaryRelease}:
       .filter(datum => Boolean(datum[SpanMetricsField.SPAN_OP]))
       .map(datum => {
         return {
-          value: datum[SpanMetricsField.SPAN_OP],
+          value: datum[SpanMetricsField.SPAN_OP]!,
           label: datum[SpanMetricsField.SPAN_OP],
         };
       }),
@@ -105,10 +106,10 @@ export function SpanOpSelector({transaction, primaryRelease, secondaryRelease}:
       onChange={newValue => {
         trackAnalytics('insight.app_start.spans.filter_by_operation', {
           organization,
-          filter: newValue.value as string,
+          filter: newValue.value as unknown as string,
         });
 
-        browserHistory.push({
+        navigate({
           ...location,
           query: {
             ...location.query,
diff --git a/static/app/views/insights/mobile/appStarts/components/startDurationWidget.tsx b/static/app/views/insights/mobile/appStarts/components/startDurationWidget.tsx
index b0daa27fa6cb33..c396dfae8c3874 100644
--- a/static/app/views/insights/mobile/appStarts/components/startDurationWidget.tsx
+++ b/static/app/views/insights/mobile/appStarts/components/startDurationWidget.tsx
@@ -41,7 +41,7 @@ export function transformData(data?: MultiSeriesEventsStats, primaryRelease?: st
           data[releaseName]?.data?.map(datum => {
             return {
               name: datum[0] * 1000,
-              value: datum[1][0].count,
+              value: datum[1]![0]!.count,
             } as SeriesDataUnit;
           }) ?? [],
         ...(primaryRelease === releaseName
diff --git a/static/app/views/insights/mobile/appStarts/components/startTypeSelector.tsx b/static/app/views/insights/mobile/appStarts/components/startTypeSelector.tsx
index 11d6c726abde29..adf22d6f9a7bd5 100644
--- a/static/app/views/insights/mobile/appStarts/components/startTypeSelector.tsx
+++ b/static/app/views/insights/mobile/appStarts/components/startTypeSelector.tsx
@@ -1,9 +1,9 @@
 import {CompactSelect} from 'sentry/components/compactSelect';
 import {t} from 'sentry/locale';
 import {trackAnalytics} from 'sentry/utils/analytics';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {decodeScalar} from 'sentry/utils/queryString';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import {MobileCursors} from 'sentry/views/insights/mobile/screenload/constants';
 import {SpanMetricsField} from 'sentry/views/insights/types';
@@ -12,6 +12,7 @@ export const COLD_START_TYPE = 'cold';
 export const WARM_START_TYPE = 'warm';
 
 export function StartTypeSelector() {
+  const navigate = useNavigate();
   const location = useLocation();
   const organization = useOrganization();
 
@@ -33,7 +34,7 @@ export function StartTypeSelector() {
           organization,
           type: newValue.value,
         });
-        browserHistory.push({
+        navigate({
           ...location,
           query: {
             ...location.query,
diff --git a/static/app/views/insights/mobile/appStarts/components/systemApplicationBreakdown.tsx b/static/app/views/insights/mobile/appStarts/components/systemApplicationBreakdown.tsx
index da37c097cf6cec..024f2d0a8985e0 100644
--- a/static/app/views/insights/mobile/appStarts/components/systemApplicationBreakdown.tsx
+++ b/static/app/views/insights/mobile/appStarts/components/systemApplicationBreakdown.tsx
@@ -51,9 +51,9 @@ function aggregateSystemApplicationBreakdown(data: TableDataRow[]) {
       type = 'application';
     }
 
-    acc[row.release] = {
-      ...acc[row.release],
-      [type]: (acc[row.release]?.[type] ?? 0) + (row['sum(span.self_time)'] ?? 0),
+    acc[row.release!] = {
+      ...acc[row.release!],
+      [type]: (acc[row.release!]?.[type] ?? 0) + (row['sum(span.self_time)'] ?? 0),
     };
 
     return acc;
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 5f174ba07a3f7f..58bf5c707979a6 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
@@ -14,7 +14,7 @@ jest.mock('sentry/utils/useLocation');
 describe('SpanOpSelector', function () {
   const organization = OrganizationFixture();
   const project = ProjectFixture();
-  let mockEventsRequest;
+  let mockEventsRequest: jest.Mock;
 
   jest.mocked(usePageFilters).mockReturnValue({
     isReady: true,
diff --git a/static/app/views/insights/mobile/appStarts/components/tables/spanOperationTable.tsx b/static/app/views/insights/mobile/appStarts/components/tables/spanOperationTable.tsx
index 863e3e6b38dbfe..f1a06842106c44 100644
--- a/static/app/views/insights/mobile/appStarts/components/tables/spanOperationTable.tsx
+++ b/static/app/views/insights/mobile/appStarts/components/tables/spanOperationTable.tsx
@@ -11,7 +11,6 @@ import Pagination from 'sentry/components/pagination';
 import {t} from 'sentry/locale';
 import type {NewQuery} from 'sentry/types/organization';
 import {defined} from 'sentry/utils';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import type {TableDataRow} from 'sentry/utils/discover/discoverQuery';
 import type {MetaType} from 'sentry/utils/discover/eventView';
 import EventView, {isFieldSortable} from 'sentry/utils/discover/eventView';
@@ -22,6 +21,7 @@ import {DiscoverDatasets} from 'sentry/utils/discover/types';
 import {decodeList, decodeScalar, decodeSorts} from 'sentry/utils/queryString';
 import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import usePageFilters from 'sentry/utils/usePageFilters';
 import {
@@ -59,6 +59,7 @@ export function SpanOperationTable({
   secondaryRelease,
 }: Props) {
   const moduleURL = useModuleURL('app_start');
+  const navigate = useNavigate();
   const location = useLocation();
   const {selection} = usePageFilters();
   const organization = useOrganization();
@@ -247,7 +248,7 @@ export function SpanOperationTable({
   const columnSortBy = eventView.getSorts();
 
   const handleCursor: CursorHandler = (newCursor, pathname, query) => {
-    browserHistory.push({
+    navigate({
       pathname,
       query: {...query, [MobileCursors.SPANS_TABLE]: newCursor},
     });
diff --git a/static/app/views/insights/mobile/appStarts/views/screenSummaryPage.spec.tsx b/static/app/views/insights/mobile/appStarts/views/screenSummaryPage.spec.tsx
index e17117d7c1fd60..b965b569931c9a 100644
--- a/static/app/views/insights/mobile/appStarts/views/screenSummaryPage.spec.tsx
+++ b/static/app/views/insights/mobile/appStarts/views/screenSummaryPage.spec.tsx
@@ -49,7 +49,7 @@ describe('Screen Summary', function () {
   });
 
   describe('Native Project', function () {
-    let eventsMock;
+    let eventsMock: jest.Mock;
 
     beforeEach(() => {
       MockApiClient.addMockResponse({
diff --git a/static/app/views/insights/mobile/appStarts/views/screenSummaryPage.tsx b/static/app/views/insights/mobile/appStarts/views/screenSummaryPage.tsx
index e92291033984b8..e158ca516e3bbb 100644
--- a/static/app/views/insights/mobile/appStarts/views/screenSummaryPage.tsx
+++ b/static/app/views/insights/mobile/appStarts/views/screenSummaryPage.tsx
@@ -6,13 +6,12 @@ import ErrorBoundary from 'sentry/components/errorBoundary';
 import * as Layout from 'sentry/components/layouts/thirds';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
-import {browserHistory} from 'sentry/utils/browserHistory';
 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 {useNavigate} from 'sentry/utils/useNavigate';
 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';
@@ -81,8 +80,8 @@ export function ScreenSummary() {
 }
 
 export function ScreenSummaryContentPage() {
+  const navigate = useNavigate();
   const location = useLocation<Query>();
-  const router = useRouter();
 
   const {
     primaryRelease,
@@ -98,15 +97,18 @@ export function ScreenSummaryContentPage() {
   useEffect(() => {
     // Default the start type to cold start if not present
     if (!appStartType) {
-      browserHistory.replace({
-        ...location,
-        query: {
-          ...location.query,
-          [SpanMetricsField.APP_START_TYPE]: COLD_START_TYPE,
+      navigate(
+        {
+          ...location,
+          query: {
+            ...location.query,
+            [SpanMetricsField.APP_START_TYPE]: COLD_START_TYPE,
+          },
         },
-      });
+        {replace: true}
+      );
     }
-  }, [location, appStartType]);
+  }, [location, appStartType, navigate]);
 
   return (
     <Fragment>
@@ -191,16 +193,19 @@ export function ScreenSummaryContentPage() {
           spanDescription={spanDescription}
           spanOp={spanOp}
           onClose={() => {
-            router.replace({
-              pathname: router.location.pathname,
-              query: omit(
-                router.location.query,
-                'spanGroup',
-                'transactionMethod',
-                'spanDescription',
-                'spanOp'
-              ),
-            });
+            navigate(
+              {
+                pathname: location.pathname,
+                query: omit(
+                  location.query,
+                  'spanGroup',
+                  'transactionMethod',
+                  'spanDescription',
+                  'spanOp'
+                ),
+              },
+              {replace: true}
+            );
           }}
         />
       )}
diff --git a/static/app/views/insights/mobile/common/components/deviceClassSelector.tsx b/static/app/views/insights/mobile/common/components/deviceClassSelector.tsx
index 2ce3c0ca4c06f5..091bc6e1330112 100644
--- a/static/app/views/insights/mobile/common/components/deviceClassSelector.tsx
+++ b/static/app/views/insights/mobile/common/components/deviceClassSelector.tsx
@@ -3,9 +3,9 @@ import type {ComponentProps} from 'react';
 import {CompactSelect} from 'sentry/components/compactSelect';
 import {t} from 'sentry/locale';
 import {trackAnalytics} from 'sentry/utils/analytics';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {decodeScalar} from 'sentry/utils/queryString';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import {MobileCursors} from 'sentry/views/insights/mobile/screenload/constants';
 import {ModuleName} from 'sentry/views/insights/types';
@@ -21,6 +21,7 @@ export function DeviceClassSelector({
   clearSpansTableCursor,
   moduleName = ModuleName.OTHER,
 }: Props) {
+  const navigate = useNavigate();
   const location = useLocation();
   const organization = useOrganization();
 
@@ -52,7 +53,7 @@ export function DeviceClassSelector({
             filter: newValue.value,
           });
         }
-        browserHistory.push({
+        navigate({
           ...location,
           query: {
             ...location.query,
diff --git a/static/app/views/insights/mobile/common/components/screensTemplate.tsx b/static/app/views/insights/mobile/common/components/screensTemplate.tsx
index f7b1fc48ca765d..b1be18c493da5a 100644
--- a/static/app/views/insights/mobile/common/components/screensTemplate.tsx
+++ b/static/app/views/insights/mobile/common/components/screensTemplate.tsx
@@ -6,9 +6,9 @@ import ErrorBoundary from 'sentry/components/errorBoundary';
 import * as Layout from 'sentry/components/layouts/thirds';
 import {PageHeadingQuestionTooltip} from 'sentry/components/pageHeadingQuestionTooltip';
 import {space} from 'sentry/styles/space';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {PageAlert, PageAlertProvider} from 'sentry/utils/performance/contexts/pageAlert';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import {ModulePageFilterBar} from 'sentry/views/insights/common/components/modulePageFilterBar';
 import {ModulesOnboarding} from 'sentry/views/insights/common/components/modulesOnboarding';
 import {ModuleBodyUpsellHook} from 'sentry/views/insights/common/components/moduleUpsellHookWrapper';
@@ -35,17 +35,21 @@ export default function ScreensTemplate({
   additionalSelectors,
   content,
 }: ScreensTemplateProps) {
+  const navigate = useNavigate();
   const location = useLocation();
   const {isProjectCrossPlatform} = useCrossPlatformProject();
 
   const handleProjectChange = useCallback(() => {
-    browserHistory.replace({
-      ...location,
-      query: {
-        ...omit(location.query, ['primaryRelease', 'secondaryRelease']),
+    navigate(
+      {
+        ...location,
+        query: {
+          ...omit(location.query, ['primaryRelease', 'secondaryRelease']),
+        },
       },
-    });
-  }, [location]);
+      {replace: true}
+    );
+  }, [location, navigate]);
 
   return (
     <Layout.Page>
diff --git a/static/app/views/insights/mobile/common/components/tables/screensTable.tsx b/static/app/views/insights/mobile/common/components/tables/screensTable.tsx
index bba1999085b9e0..c6c77a65488824 100644
--- a/static/app/views/insights/mobile/common/components/tables/screensTable.tsx
+++ b/static/app/views/insights/mobile/common/components/tables/screensTable.tsx
@@ -146,7 +146,7 @@ export function ScreensTable({
         columnOrder={columnOrder.map(columnKey => {
           return {
             key: columnKey,
-            name: columnNameMap[columnKey],
+            name: columnNameMap[columnKey]!,
             width: COL_WIDTH_UNDEFINED,
           };
         })}
diff --git a/static/app/views/insights/mobile/screenload/components/charts/screenBarChart.tsx b/static/app/views/insights/mobile/screenload/components/charts/screenBarChart.tsx
index 70d364a472c5d5..b64d17d4a6a26d 100644
--- a/static/app/views/insights/mobile/screenload/components/charts/screenBarChart.tsx
+++ b/static/app/views/insights/mobile/screenload/components/charts/screenBarChart.tsx
@@ -89,8 +89,8 @@ export function ScreensBarChart({
             )}
           </ChartLabel>
         </Header>
-        {chartOptions[selectedDisplay].subtitle && (
-          <Subtitle>{chartOptions[selectedDisplay].subtitle}</Subtitle>
+        {chartOptions[selectedDisplay]!.subtitle && (
+          <Subtitle>{chartOptions[selectedDisplay]!.subtitle}</Subtitle>
         )}
       </HeaderContainer>
       <TransitionChart
@@ -108,7 +108,7 @@ export function ScreensBarChart({
             {...chartProps}
             height={chartHeight ?? 180}
             series={
-              chartOptions[selectedDisplay].series?.map(series => ({
+              chartOptions[selectedDisplay]!.series?.map(series => ({
                 ...series,
                 name: formatVersion(series.seriesName),
               })) ?? []
@@ -123,7 +123,7 @@ export function ScreensBarChart({
             xAxis={{
               type: 'category',
               axisTick: {show: true},
-              data: chartOptions[selectedDisplay].xAxisLabel,
+              data: chartOptions[selectedDisplay]!.xAxisLabel,
               truncate: 14,
               axisLabel: {
                 interval: 0,
@@ -134,9 +134,9 @@ export function ScreensBarChart({
                 formatter(value: number) {
                   return axisLabelFormatter(
                     value,
-                    aggregateOutputType(chartOptions[selectedDisplay].yAxis),
+                    aggregateOutputType(chartOptions[selectedDisplay]!.yAxis),
                     undefined,
-                    getDurationUnit(chartOptions[selectedDisplay].series ?? [])
+                    getDurationUnit(chartOptions[selectedDisplay]!.series ?? [])
                   );
                 },
               },
@@ -145,7 +145,7 @@ export function ScreensBarChart({
               valueFormatter: (value, _seriesName) => {
                 return tooltipFormatter(
                   value,
-                  aggregateOutputType(chartOptions[selectedDisplay].yAxis)
+                  aggregateOutputType(chartOptions[selectedDisplay]!.yAxis)
                 );
               },
             }}
diff --git a/static/app/views/insights/mobile/screenload/components/charts/screenCharts.tsx b/static/app/views/insights/mobile/screenload/components/charts/screenCharts.tsx
index eb76ad185ca321..8504ad0cd6f270 100644
--- a/static/app/views/insights/mobile/screenload/components/charts/screenCharts.tsx
+++ b/static/app/views/insights/mobile/screenload/components/charts/screenCharts.tsx
@@ -132,19 +132,19 @@ export function ScreenCharts({yAxes, additionalFilters}: Props) {
     Object.keys(series).forEach(release => {
       const isPrimary = release === primaryRelease;
 
-      Object.keys(series[release]).forEach(yAxis => {
+      Object.keys(series[release]!).forEach(yAxis => {
         const label = release;
         if (yAxis in transformedReleaseSeries) {
           const data =
-            series[release][yAxis]?.data.map(datum => {
+            series[release]![yAxis]!?.data.map(datum => {
               return {
                 name: datum[0] * 1000,
                 value: datum[1][0].count,
               } as SeriesDataUnit;
             }) ?? [];
 
-          const color = isPrimary ? CHART_PALETTE[3][0] : CHART_PALETTE[3][1];
-          transformedReleaseSeries[yAxis][release] = {
+          const color = isPrimary ? CHART_PALETTE[3]![0]! : CHART_PALETTE[3]![1]!;
+          transformedReleaseSeries[yAxis]![release] = {
             seriesName: formatVersion(label, true),
             color,
             data,
@@ -201,8 +201,10 @@ export function ScreenCharts({yAxes, additionalFilters}: Props) {
                   chartOptions={[
                     {
                       title: t('TTID by Device Class'),
-                      yAxis: YAXIS_COLUMNS[yAxes[0]],
-                      series: Object.values(transformedEvents[YAXIS_COLUMNS[yAxes[0]]]),
+                      yAxis: YAXIS_COLUMNS[yAxes[0]!],
+                      series: Object.values(
+                        transformedEvents[YAXIS_COLUMNS[yAxes[0]!]!]!
+                      ),
                       xAxisLabel: ['high', 'medium', 'low', 'Unknown'],
                       subtitle: primaryRelease
                         ? t(
@@ -238,7 +240,7 @@ export function ScreenCharts({yAxes, additionalFilters}: Props) {
                   <Chart
                     height={80}
                     data={Object.values(
-                      transformedReleaseSeries[YAXIS_COLUMNS[yAxes[0]]]
+                      transformedReleaseSeries[YAXIS_COLUMNS[yAxes[0]!]!]!
                     )}
                     loading={isSeriesLoading}
                     grid={{
@@ -269,8 +271,10 @@ export function ScreenCharts({yAxes, additionalFilters}: Props) {
                   chartOptions={[
                     {
                       title: t('TTFD by Device Class'),
-                      yAxis: YAXIS_COLUMNS[yAxes[1]],
-                      series: Object.values(transformedEvents[YAXIS_COLUMNS[yAxes[1]]]),
+                      yAxis: YAXIS_COLUMNS[yAxes[1]!],
+                      series: Object.values(
+                        transformedEvents[YAXIS_COLUMNS[yAxes[1]!]!]!
+                      ),
                       xAxisLabel: ['high', 'medium', 'low', 'Unknown'],
                       subtitle: primaryRelease
                         ? t(
@@ -306,7 +310,7 @@ export function ScreenCharts({yAxes, additionalFilters}: Props) {
                   <Chart
                     height={80}
                     data={Object.values(
-                      transformedReleaseSeries[YAXIS_COLUMNS[yAxes[1]]]
+                      transformedReleaseSeries[YAXIS_COLUMNS[yAxes[1]!]!]!
                     )}
                     loading={isSeriesLoading}
                     grid={{
@@ -348,7 +352,7 @@ export function ScreenCharts({yAxes, additionalFilters}: Props) {
               }
             >
               <Chart
-                data={Object.values(transformedReleaseSeries[YAXIS_COLUMNS[yAxes[2]]])}
+                data={Object.values(transformedReleaseSeries[YAXIS_COLUMNS[yAxes[2]!]!]!)}
                 height={245}
                 loading={isSeriesLoading}
                 grid={{
diff --git a/static/app/views/insights/mobile/screenload/components/eventSamples.spec.tsx b/static/app/views/insights/mobile/screenload/components/eventSamples.spec.tsx
index 934106ea00fb69..480bfe5e9d9225 100644
--- a/static/app/views/insights/mobile/screenload/components/eventSamples.spec.tsx
+++ b/static/app/views/insights/mobile/screenload/components/eventSamples.spec.tsx
@@ -18,7 +18,7 @@ describe('ScreenLoadEventSamples', function () {
   const organization = OrganizationFixture();
   const project = ProjectFixture();
 
-  let mockEventsRequest;
+  let mockEventsRequest: jest.Mock;
   beforeEach(function () {
     jest.mocked(usePageFilters).mockReturnValue({
       isReady: true,
diff --git a/static/app/views/insights/mobile/screenload/components/eventSamples.tsx b/static/app/views/insights/mobile/screenload/components/eventSamples.tsx
index 33e191350e2b3d..998984a1453324 100644
--- a/static/app/views/insights/mobile/screenload/components/eventSamples.tsx
+++ b/static/app/views/insights/mobile/screenload/components/eventSamples.tsx
@@ -76,7 +76,7 @@ export function ScreenLoadEventSamples({
     return mutableQuery;
   }, [deviceClass, isProjectCrossPlatform, platform, release, transaction, subregions]);
 
-  const sort = decodeSorts(location.query[sortKey])[0] ?? DEFAULT_SORT;
+  const sort = decodeSorts(location.query[sortKey])[0]! ?? DEFAULT_SORT;
 
   const columnNameMap = {
     id: t(
diff --git a/static/app/views/insights/mobile/screenload/components/platformSelector.spec.tsx b/static/app/views/insights/mobile/screenload/components/platformSelector.spec.tsx
index 48419efeae2090..4101c136f18a2d 100644
--- a/static/app/views/insights/mobile/screenload/components/platformSelector.spec.tsx
+++ b/static/app/views/insights/mobile/screenload/components/platformSelector.spec.tsx
@@ -1,6 +1,7 @@
+import {RouterFixture} from 'sentry-fixture/routerFixture';
+
 import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 
-import {browserHistory} from 'sentry/utils/browserHistory';
 import localStorage from 'sentry/utils/localStorage';
 import {PlatformSelector} from 'sentry/views/insights/mobile/screenload/components/platformSelector';
 
@@ -15,10 +16,11 @@ describe('PlatformSelector', function () {
   });
 
   it('updates url params on click', async function () {
-    render(<PlatformSelector />);
+    const router = RouterFixture();
+    render(<PlatformSelector />, {router});
     await userEvent.click(screen.getByRole('radio', {name: 'iOS'}));
 
-    expect(browserHistory.push).toHaveBeenCalledWith({
+    expect(router.push).toHaveBeenCalledWith({
       pathname: '/mock-pathname/',
       query: {
         platform: 'iOS',
diff --git a/static/app/views/insights/mobile/screenload/components/platformSelector.tsx b/static/app/views/insights/mobile/screenload/components/platformSelector.tsx
index d6e52cfeb142a0..d50ae02838e9ac 100644
--- a/static/app/views/insights/mobile/screenload/components/platformSelector.tsx
+++ b/static/app/views/insights/mobile/screenload/components/platformSelector.tsx
@@ -3,10 +3,10 @@ import {PlatformIcon} from 'platformicons';
 import {Flex} from 'sentry/components/container/flex';
 import {SegmentedControl} from 'sentry/components/segmentedControl';
 import {t} from 'sentry/locale';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import localStorage from 'sentry/utils/localStorage';
 import {decodeScalar} from 'sentry/utils/queryString';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import {
   DEFAULT_PLATFORM,
   PLATFORM_LOCAL_STORAGE_KEY,
@@ -15,6 +15,7 @@ import {
 import {MobileCursors} from 'sentry/views/insights/mobile/screenload/constants';
 
 export function PlatformSelector() {
+  const navigate = useNavigate();
   const {query, pathname} = useLocation();
   const platform =
     decodeScalar(query[PLATFORM_QUERY_PARAM]) ??
@@ -29,7 +30,7 @@ export function PlatformSelector() {
         aria-label={t('Filter platform')}
         onChange={val => {
           localStorage.setItem(PLATFORM_LOCAL_STORAGE_KEY, val);
-          browserHistory.push({
+          navigate({
             pathname,
             query: {
               ...query,
diff --git a/static/app/views/insights/mobile/screenload/components/screensView.tsx b/static/app/views/insights/mobile/screenload/components/screensView.tsx
index 17c5e1e992cec9..12d9035d69ea1b 100644
--- a/static/app/views/insights/mobile/screenload/components/screensView.tsx
+++ b/static/app/views/insights/mobile/screenload/components/screensView.tsx
@@ -12,12 +12,12 @@ import {space} from 'sentry/styles/space';
 import type {NewQuery} from 'sentry/types/organization';
 import {defined} from 'sentry/utils';
 import {trackAnalytics} from 'sentry/utils/analytics';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import EventView from 'sentry/utils/discover/eventView';
 import {DiscoverDatasets} from 'sentry/utils/discover/types';
 import {decodeScalar} from 'sentry/utils/queryString';
 import {escapeFilterValue, MutableSearch} from 'sentry/utils/tokenizeSearch';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import usePageFilters from 'sentry/utils/usePageFilters';
 import useRouter from 'sentry/utils/useRouter';
@@ -54,9 +54,10 @@ type Props = {
 };
 
 export function ScreensView({yAxes, additionalFilters, chartHeight}: Props) {
+  const navigate = useNavigate();
+  const location = useLocation();
   const pageFilter = usePageFilters();
   const {selection} = pageFilter;
-  const location = useLocation();
   const theme = useTheme();
   const organization = useOrganization();
   const {isProjectCrossPlatform, selectedPlatform} = useCrossPlatformProject();
@@ -219,7 +220,7 @@ export function ScreensView({yAxes, additionalFilters, chartHeight}: Props) {
   const tableSearchFilters = new MutableSearch(['transaction.op:ui.load']);
 
   const handleCursor: CursorHandler = (newCursor, pathname, query_) => {
-    browserHistory.push({
+    navigate({
       pathname,
       query: {...query_, [MobileCursors.SCREENS_TABLE]: newCursor},
     });
@@ -233,11 +234,11 @@ export function ScreensView({yAxes, additionalFilters, chartHeight}: Props) {
             <ScreensBarChart
               chartOptions={[
                 {
-                  title: t('%s by Top Screen', CHART_TITLES[yAxes[0]]),
-                  yAxis: YAXIS_COLUMNS[yAxes[0]],
+                  title: t('%s by Top Screen', CHART_TITLES[yAxes[0]!]!),
+                  yAxis: YAXIS_COLUMNS[yAxes[0]!],
                   xAxisLabel: topTransactions,
                   series: Object.values(
-                    transformedReleaseEvents[YAXIS_COLUMNS[yAxes[0]]]
+                    transformedReleaseEvents[YAXIS_COLUMNS[yAxes[0]!]!]!
                   ),
                   subtitle: primaryRelease
                     ? t(
@@ -265,11 +266,11 @@ export function ScreensView({yAxes, additionalFilters, chartHeight}: Props) {
               <ScreensBarChart
                 chartOptions={[
                   {
-                    title: t('%s by Top Screen', CHART_TITLES[yAxes[1]]),
-                    yAxis: YAXIS_COLUMNS[yAxes[1]],
+                    title: t('%s by Top Screen', CHART_TITLES[yAxes[1]!]!),
+                    yAxis: YAXIS_COLUMNS[yAxes[1]!],
                     xAxisLabel: topTransactions,
                     series: Object.values(
-                      transformedReleaseEvents[YAXIS_COLUMNS[yAxes[1]]]
+                      transformedReleaseEvents[YAXIS_COLUMNS[yAxes[1]!]!]!
                     ),
                     subtitle: primaryRelease
                       ? t(
@@ -306,7 +307,7 @@ export function ScreensView({yAxes, additionalFilters, chartHeight}: Props) {
           });
         }}
         organization={organization}
-        query={getFreeTextFromQuery(derivedQuery)}
+        query={getFreeTextFromQuery(derivedQuery)!}
         placeholder={t('Search for Screens')}
         additionalConditions={
           new MutableSearch(
diff --git a/static/app/views/insights/mobile/screenload/components/spanOpSelector.tsx b/static/app/views/insights/mobile/screenload/components/spanOpSelector.tsx
index d014a947003c90..a289574dceae3e 100644
--- a/static/app/views/insights/mobile/screenload/components/spanOpSelector.tsx
+++ b/static/app/views/insights/mobile/screenload/components/spanOpSelector.tsx
@@ -5,12 +5,12 @@ import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {NewQuery} from 'sentry/types/organization';
 import {trackAnalytics} from 'sentry/utils/analytics';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import EventView from 'sentry/utils/discover/eventView';
 import {DiscoverDatasets} from 'sentry/utils/discover/types';
 import {decodeScalar} from 'sentry/utils/queryString';
 import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import usePageFilters from 'sentry/utils/usePageFilters';
 import {appendReleaseFilters} from 'sentry/views/insights/common/utils/releaseComparison';
@@ -36,6 +36,7 @@ type Props = {
 };
 
 export function SpanOpSelector({transaction, primaryRelease, secondaryRelease}: Props) {
+  const navigate = useNavigate();
   const location = useLocation();
   const organization = useOrganization();
   const {selection} = usePageFilters();
@@ -77,8 +78,8 @@ export function SpanOpSelector({transaction, primaryRelease, secondaryRelease}:
       .filter(datum => Boolean(datum[SpanMetricsField.SPAN_OP]))
       .map(datum => {
         return {
-          value: datum[SpanMetricsField.SPAN_OP],
-          label: datum[SpanMetricsField.SPAN_OP],
+          value: datum[SpanMetricsField.SPAN_OP]!,
+          label: datum[SpanMetricsField.SPAN_OP]!,
         };
       }),
   ];
@@ -94,7 +95,7 @@ export function SpanOpSelector({transaction, primaryRelease, secondaryRelease}:
           filter: newValue.value as string,
         });
 
-        browserHistory.push({
+        navigate({
           ...location,
           query: {
             ...location.query,
diff --git a/static/app/views/insights/mobile/screenload/components/tabbedCodeSnippets.tsx b/static/app/views/insights/mobile/screenload/components/tabbedCodeSnippets.tsx
index 324f0641bb678a..2e3ad4de345ebc 100644
--- a/static/app/views/insights/mobile/screenload/components/tabbedCodeSnippets.tsx
+++ b/static/app/views/insights/mobile/screenload/components/tabbedCodeSnippets.tsx
@@ -20,8 +20,8 @@ interface TabbedCodeSnippetProps {
 }
 
 export function TabbedCodeSnippet({tabs}: TabbedCodeSnippetProps) {
-  const [selectedTabValue, setSelectedTabValue] = useState(tabs[0].value);
-  const selectedTab = tabs.find(tab => tab.value === selectedTabValue) ?? tabs[0];
+  const [selectedTabValue, setSelectedTabValue] = useState(tabs[0]!.value);
+  const selectedTab = tabs.find(tab => tab.value === selectedTabValue) ?? tabs[0]!;
   const {code, language, filename} = selectedTab;
 
   return (
diff --git a/static/app/views/insights/mobile/screenload/components/tables/eventSamplesTable.spec.tsx b/static/app/views/insights/mobile/screenload/components/tables/eventSamplesTable.spec.tsx
index 91a838219fb7e8..1f25fbfbb3109d 100644
--- a/static/app/views/insights/mobile/screenload/components/tables/eventSamplesTable.spec.tsx
+++ b/static/app/views/insights/mobile/screenload/components/tables/eventSamplesTable.spec.tsx
@@ -1,15 +1,20 @@
 import {LocationFixture} from 'sentry-fixture/locationFixture';
+import {RouterFixture} from 'sentry-fixture/routerFixture';
 
 import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 
+import type {InjectedRouter} from 'sentry/types/legacyReactRouter';
 import type {NewQuery} from 'sentry/types/organization';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import EventView from 'sentry/utils/discover/eventView';
 import {EventSamplesTable} from 'sentry/views/insights/mobile/screenload/components/tables/eventSamplesTable';
 
 describe('EventSamplesTable', function () {
-  let mockLocation, mockQuery: NewQuery, mockEventView;
+  let mockRouter: InjectedRouter;
+  let mockLocation: ReturnType<typeof LocationFixture>;
+  let mockQuery: NewQuery;
+  let mockEventView: EventView;
   beforeEach(function () {
+    mockRouter = RouterFixture();
     mockLocation = LocationFixture({
       query: {
         statsPeriod: '99d',
@@ -50,7 +55,8 @@ describe('EventSamplesTable', function () {
           kind: 'desc',
         }}
         sortKey=""
-      />
+      />,
+      {router: mockRouter}
     );
 
     expect(screen.getByText('Readable Column Name')).toBeInTheDocument();
@@ -80,7 +86,8 @@ describe('EventSamplesTable', function () {
         }}
         sortKey=""
         data={{data: [{id: '1', 'transaction.id': 'abc'}], meta: {}}}
-      />
+      />,
+      {router: mockRouter}
     );
 
     // Test only one column to isolate event ID
@@ -116,7 +123,8 @@ describe('EventSamplesTable', function () {
           data: [{id: '1', 'profile.id': 'abc', 'project.name': 'project'}],
           meta: {fields: {'profile.id': 'string', 'project.name': 'string'}},
         }}
-      />
+      />,
+      {router: mockRouter}
     );
 
     // Test only one column to isolate profile column
@@ -149,13 +157,14 @@ describe('EventSamplesTable', function () {
         }}
         sortKey=""
         data={{data: [{id: '1', 'transaction.id': 'abc'}], meta: {}}}
-      />
+      />,
+      {router: mockRouter}
     );
 
     expect(screen.getByRole('button', {name: /device class all/i})).toBeInTheDocument();
     await userEvent.click(screen.getByRole('button', {name: /device class all/i}));
     await userEvent.click(screen.getByText('Medium'));
-    expect(browserHistory.push).toHaveBeenCalledWith(
+    expect(mockRouter.push).toHaveBeenCalledWith(
       expect.objectContaining({
         pathname: '/mock-pathname/',
         query: expect.objectContaining({
@@ -185,11 +194,12 @@ describe('EventSamplesTable', function () {
         sortKey=""
         data={{data: [{id: '1', 'transaction.id': 'abc'}], meta: {}}}
         pageLinks={pageLinks}
-      />
+      />,
+      {router: mockRouter}
     );
     expect(screen.getByRole('button', {name: 'Next'})).toBeInTheDocument();
     await userEvent.click(screen.getByRole('button', {name: 'Next'}));
-    expect(browserHistory.push).toHaveBeenCalledWith(
+    expect(mockRouter.push).toHaveBeenCalledWith(
       expect.objectContaining({
         pathname: '/mock-pathname/',
         query: expect.objectContaining({
@@ -223,7 +233,8 @@ describe('EventSamplesTable', function () {
         }}
         sortKey="customSortKey"
         data={{data: [{id: '1', 'transaction.id': 'abc', duration: 'def'}], meta: {}}}
-      />
+      />,
+      {router: mockRouter}
     );
 
     // Ascending sort in transaction ID because the default is descending
@@ -260,7 +271,8 @@ describe('EventSamplesTable', function () {
         }}
         sortKey="customSortKey"
         data={{data: [{id: '1', 'transaction.id': 'abc', duration: 'def'}], meta: {}}}
-      />
+      />,
+      {router: mockRouter}
     );
 
     // Although ID is queried for, because it's not defined in the map
diff --git a/static/app/views/insights/mobile/screenload/components/tables/eventSamplesTable.tsx b/static/app/views/insights/mobile/screenload/components/tables/eventSamplesTable.tsx
index 6d9258b63130ab..2cb38c9ce0337c 100644
--- a/static/app/views/insights/mobile/screenload/components/tables/eventSamplesTable.tsx
+++ b/static/app/views/insights/mobile/screenload/components/tables/eventSamplesTable.tsx
@@ -13,7 +13,6 @@ import {IconProfiling} from 'sentry/icons/iconProfiling';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import {defined} from 'sentry/utils';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import type {TableData, TableDataRow} from 'sentry/utils/discover/discoverQuery';
 import type {MetaType} from 'sentry/utils/discover/eventView';
 import type EventView from 'sentry/utils/discover/eventView';
@@ -24,6 +23,7 @@ import {fieldAlignment} from 'sentry/utils/discover/fields';
 import {generateLinkToEventInTraceView} from 'sentry/utils/discover/urls';
 import {generateProfileFlamechartRoute} from 'sentry/utils/profiling/routes';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import type {TableColumn} from 'sentry/views/discover/table/types';
 import SubregionSelector from 'sentry/views/insights/common/views/spans/selectors/subregionSelector';
@@ -62,6 +62,7 @@ export function EventSamplesTable({
   sort,
   footerAlignedPagination = false,
 }: Props) {
+  const navigate = useNavigate();
   const location = useLocation();
   const organization = useOrganization();
 
@@ -172,7 +173,7 @@ export function EventSamplesTable({
   const columnSortBy = eventView.getSorts();
 
   const handleCursor: CursorHandler = (newCursor, pathname, query) => {
-    browserHistory.push({
+    navigate({
       pathname,
       query: {...query, [cursorName]: newCursor},
     });
@@ -201,7 +202,7 @@ export function EventSamplesTable({
               Object.keys(columnNameMap).includes(col.name)
             )
             .map((col: TableColumn<React.ReactText>) => {
-              return {...col, name: columnNameMap[col.key]};
+              return {...col, name: columnNameMap[col.key]!};
             })}
           columnSortBy={columnSortBy}
           grid={{
diff --git a/static/app/views/insights/mobile/screenload/components/tables/screenLoadSpansTable.spec.tsx b/static/app/views/insights/mobile/screenload/components/tables/screenLoadSpansTable.spec.tsx
index 95e6b70890f639..79d215fb65b602 100644
--- a/static/app/views/insights/mobile/screenload/components/tables/screenLoadSpansTable.spec.tsx
+++ b/static/app/views/insights/mobile/screenload/components/tables/screenLoadSpansTable.spec.tsx
@@ -3,7 +3,6 @@ import {OrganizationFixture} from 'sentry-fixture/organization';
 
 import {render, screen, within} from 'sentry-test/reactTestingLibrary';
 
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {useLocation} from 'sentry/utils/useLocation';
 import usePageFilters from 'sentry/utils/usePageFilters';
 import {ScreenLoadSpansTable} from 'sentry/views/insights/mobile/screenload/components/tables/screenLoadSpansTable';
@@ -43,9 +42,8 @@ describe('ScreenLoadSpansTable', function () {
     },
   });
 
-  let eventsMock;
+  let eventsMock: jest.Mock;
   beforeEach(function () {
-    browserHistory.push = jest.fn();
     MockApiClient.addMockResponse({
       url: `/organizations/${organization.slug}/releases/`,
       body: [],
@@ -128,7 +126,7 @@ describe('ScreenLoadSpansTable', function () {
     );
 
     const header = await screen.findAllByTestId('grid-head-row');
-    const headerCells = within(header[0]).getAllByTestId('grid-head-cell');
+    const headerCells = within(header[0]!).getAllByTestId('grid-head-cell');
     const headerCell = headerCells[4];
     expect(headerCell).toHaveTextContent('Affects TTID');
     expect(await screen.findByRole('link', {name: 'Affects TTID'})).toHaveAttribute(
@@ -158,7 +156,7 @@ describe('ScreenLoadSpansTable', function () {
     );
 
     const header = await screen.findAllByTestId('grid-head-row');
-    const headerCells = within(header[0]).getAllByTestId('grid-head-cell');
+    const headerCells = within(header[0]!).getAllByTestId('grid-head-cell');
     const headerCell = headerCells[4];
     expect(headerCell).toHaveTextContent('Affects TTID');
     expect(await screen.findByRole('link', {name: 'Affects TTID'})).toHaveAttribute(
diff --git a/static/app/views/insights/mobile/screenload/components/tables/screenLoadSpansTable.tsx b/static/app/views/insights/mobile/screenload/components/tables/screenLoadSpansTable.tsx
index ba732783dad0c3..791f49916c1e87 100644
--- a/static/app/views/insights/mobile/screenload/components/tables/screenLoadSpansTable.tsx
+++ b/static/app/views/insights/mobile/screenload/components/tables/screenLoadSpansTable.tsx
@@ -13,7 +13,6 @@ import Pagination from 'sentry/components/pagination';
 import {Tooltip} from 'sentry/components/tooltip';
 import {t, tct} from 'sentry/locale';
 import type {NewQuery} from 'sentry/types/organization';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import type {TableDataRow} from 'sentry/utils/discover/discoverQuery';
 import type {MetaType} from 'sentry/utils/discover/eventView';
 import EventView, {isFieldSortable} from 'sentry/utils/discover/eventView';
@@ -24,6 +23,7 @@ import {DiscoverDatasets} from 'sentry/utils/discover/types';
 import {decodeScalar, decodeSorts} from 'sentry/utils/queryString';
 import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import usePageFilters from 'sentry/utils/usePageFilters';
 import {
@@ -61,6 +61,7 @@ export function ScreenLoadSpansTable({
   secondaryRelease,
 }: Props) {
   const moduleURL = useModuleURL('screen_load');
+  const navigate = useNavigate();
   const location = useLocation();
   const {selection} = usePageFilters();
   const organization = useOrganization();
@@ -348,7 +349,7 @@ export function ScreenLoadSpansTable({
   const columnSortBy = eventView.getSorts();
 
   const handleCursor: CursorHandler = (newCursor, pathname, query) => {
-    browserHistory.push({
+    navigate({
       pathname,
       query: {...query, [MobileCursors.SPANS_TABLE]: newCursor},
     });
diff --git a/static/app/views/insights/mobile/screenload/utils.tsx b/static/app/views/insights/mobile/screenload/utils.tsx
index b7660700b6d908..ff0dfc53d2a0c7 100644
--- a/static/app/views/insights/mobile/screenload/utils.tsx
+++ b/static/app/views/insights/mobile/screenload/utils.tsx
@@ -113,7 +113,7 @@ export function transformDeviceClassEvents({
 
   if (defined(data)) {
     data.data?.forEach(row => {
-      const deviceClass = row['device.class'];
+      const deviceClass = row['device.class']!;
       const index = deviceClassIndex[deviceClass];
 
       const release = row.release;
@@ -124,7 +124,7 @@ export function transformDeviceClassEvents({
             name: deviceClass,
             value: row[YAXIS_COLUMNS[val]],
             itemStyle: {
-              color: isPrimary ? CHART_PALETTE[3][0] : CHART_PALETTE[3][1],
+              color: isPrimary ? CHART_PALETTE[3]![0]! : CHART_PALETTE[3]![1]!,
             },
           } as SeriesDataUnit;
         }
diff --git a/static/app/views/insights/mobile/screenload/views/screenLoadSpansPage.spec.tsx b/static/app/views/insights/mobile/screenload/views/screenLoadSpansPage.spec.tsx
index 82fb5c40a16545..4d53af0f12f534 100644
--- a/static/app/views/insights/mobile/screenload/views/screenLoadSpansPage.spec.tsx
+++ b/static/app/views/insights/mobile/screenload/views/screenLoadSpansPage.spec.tsx
@@ -6,7 +6,6 @@ import {render, screen, waitFor, within} from 'sentry-test/reactTestingLibrary';
 
 import type {Organization} from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import localStorage from 'sentry/utils/localStorage';
 import {useLocation} from 'sentry/utils/useLocation';
 import usePageFilters from 'sentry/utils/usePageFilters';
@@ -124,7 +123,6 @@ describe('Screen Summary', function () {
       });
       mockResponses(organization, project);
       localStorage.clear();
-      browserHistory.push = jest.fn();
       eventsMock = MockApiClient.addMockResponse({
         url: `/organizations/${organization.slug}/events/`,
       });
@@ -219,7 +217,6 @@ describe('Screen Summary', function () {
       });
       mockResponses(organization, project);
       localStorage.clear();
-      browserHistory.push = jest.fn();
       eventsMock = MockApiClient.addMockResponse({
         url: `/organizations/${organization.slug}/events/`,
       });
diff --git a/static/app/views/insights/mobile/screenload/views/screenloadLandingPage.spec.tsx b/static/app/views/insights/mobile/screenload/views/screenloadLandingPage.spec.tsx
index 4c35fa724a8b55..f3698d059dd297 100644
--- a/static/app/views/insights/mobile/screenload/views/screenloadLandingPage.spec.tsx
+++ b/static/app/views/insights/mobile/screenload/views/screenloadLandingPage.spec.tsx
@@ -4,7 +4,6 @@ import {ProjectFixture} from 'sentry-fixture/project';
 
 import {render, screen, waitFor} from 'sentry-test/reactTestingLibrary';
 
-import {browserHistory} from 'sentry/utils/browserHistory';
 import localStorage from 'sentry/utils/localStorage';
 import {useLocation} from 'sentry/utils/useLocation';
 import usePageFilters from 'sentry/utils/usePageFilters';
@@ -66,7 +65,6 @@ describe('PageloadModule', function () {
   let eventsMock: jest.Mock;
   beforeEach(function () {
     localStorage.clear();
-    browserHistory.push = jest.fn();
     MockApiClient.addMockResponse({
       url: `/organizations/${organization.slug}/releases/`,
       body: [
diff --git a/static/app/views/insights/mobile/screens/components/screensOverview.spec.tsx b/static/app/views/insights/mobile/screens/components/screensOverview.spec.tsx
index 657f25e658915a..dd3f44da0d2ad6 100644
--- a/static/app/views/insights/mobile/screens/components/screensOverview.spec.tsx
+++ b/static/app/views/insights/mobile/screens/components/screensOverview.spec.tsx
@@ -49,7 +49,7 @@ describe('ScreensOverview', () => {
   });
 
   jest.mocked(useCrossPlatformProject).mockReturnValue({
-    project: project,
+    project,
     isProjectCrossPlatform: true,
     selectedPlatform: 'Android',
   });
@@ -164,6 +164,8 @@ describe('ScreensOverview', () => {
     render(<ScreensOverview />, {organization});
     await waitFor(() => {
       expect(transactionMetricsMock).toHaveBeenCalled();
+    });
+    await waitFor(() => {
       expect(spanMetricsMock).toHaveBeenCalled();
     });
   });
diff --git a/static/app/views/insights/mobile/screens/components/screensOverview.tsx b/static/app/views/insights/mobile/screens/components/screensOverview.tsx
index 03d2cdbc314387..608eb25a098273 100644
--- a/static/app/views/insights/mobile/screens/components/screensOverview.tsx
+++ b/static/app/views/insights/mobile/screens/components/screensOverview.tsx
@@ -56,9 +56,9 @@ function useMetrics(
 
   const newQuery: NewQuery = {
     name: '',
-    fields: fields,
+    fields,
     query: queryString,
-    dataset: dataset,
+    dataset,
     version: 2,
     projects: selection.projects,
   };
@@ -71,7 +71,7 @@ function useMetrics(
     eventView: tableEventView,
     ...useTableQuery({
       eventView: tableEventView,
-      enabled: enabled,
+      enabled,
       referrer: Referrer.SCREENS_SCREEN_TABLE,
     }),
   };
@@ -85,7 +85,7 @@ export function ScreensOverview() {
   const {isProjectCrossPlatform, selectedPlatform} = useCrossPlatformProject();
   const [visibleScreens, setVisibleScreens] = useState<string[]>([]);
   const sortedBy = decodeScalar(location.query.sort, '-count');
-  const sortField = decodeSorts([sortedBy])[0].field;
+  const sortField = decodeSorts([sortedBy])[0]!.field;
 
   const transactionMetricsDataset = DiscoverDatasets.METRICS;
   const transactionMetricsFields = [
@@ -209,7 +209,7 @@ export function ScreensOverview() {
           });
         }}
         organization={organization}
-        query={getFreeTextFromQuery(derivedQuery)}
+        query={getFreeTextFromQuery(derivedQuery)!}
         placeholder={t('Search for Screen')}
         additionalConditions={tableSearchFilters}
       />
diff --git a/static/app/views/insights/mobile/screens/utils.ts b/static/app/views/insights/mobile/screens/utils.ts
index 72b8044fbf7a68..3cc29dcd288f2f 100644
--- a/static/app/views/insights/mobile/screens/utils.ts
+++ b/static/app/views/insights/mobile/screens/utils.ts
@@ -85,7 +85,7 @@ export function getColdAppStartPerformance(metric: MetricValue): VitalStatus {
     value: metric,
     formattedValue: formatMetricValue(metric),
     score: status,
-    description: description,
+    description,
   };
 }
 
@@ -112,7 +112,7 @@ export function getWarmAppStartPerformance(metric: MetricValue): VitalStatus {
     value: metric,
     formattedValue: formatMetricValue(metric),
     score: status,
-    description: description,
+    description,
   };
 }
 
diff --git a/static/app/views/insights/mobile/screens/views/screenDetailsPage.tsx b/static/app/views/insights/mobile/screens/views/screenDetailsPage.tsx
index f48d9058feb1d2..e029d30d2d8485 100644
--- a/static/app/views/insights/mobile/screens/views/screenDetailsPage.tsx
+++ b/static/app/views/insights/mobile/screens/views/screenDetailsPage.tsx
@@ -1,6 +1,5 @@
 import type React from 'react';
 import {useState} from 'react';
-import type {Location} from 'history';
 
 import FeatureBadge from 'sentry/components/badge/featureBadge';
 import * as Layout from 'sentry/components/layouts/thirds';
@@ -8,10 +7,10 @@ import PageFiltersContainer from 'sentry/components/organizations/pageFilters/co
 import SentryDocumentTitle from 'sentry/components/sentryDocumentTitle';
 import {TabList, Tabs} from 'sentry/components/tabs';
 import {t} from 'sentry/locale';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {PageAlert, PageAlertProvider} from 'sentry/utils/performance/contexts/pageAlert';
 import {decodeScalar} from 'sentry/utils/queryString';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import {ScreenSummaryContentPage as AppStartPage} from 'sentry/views/insights/mobile/appStarts/views/screenSummaryPage';
 import useCrossPlatformProject from 'sentry/views/insights/mobile/common/queries/useCrossPlatformProject';
@@ -36,7 +35,8 @@ type Tab = {
 };
 
 export function ScreenDetailsPage() {
-  const location: Location = useLocation<Query>();
+  const navigate = useNavigate();
+  const location = useLocation<Query>();
   const organization = useOrganization();
   const {isProjectCrossPlatform} = useCrossPlatformProject();
 
@@ -72,7 +72,7 @@ export function ScreenDetailsPage() {
   const getTabKeyFromQuery = () => {
     const queryTab = decodeScalar(location?.query?.tab);
     const selectedTab = tabs.find((tab: Tab) => tab.key === queryTab);
-    return selectedTab?.key ?? tabs[0].key;
+    return selectedTab?.key ?? tabs[0]!.key;
   };
 
   const [selectedTabKey, setSelectedTabKey] = useState(getTabKeyFromQuery());
@@ -82,7 +82,7 @@ export function ScreenDetailsPage() {
 
     const newQuery = {...location.query, tab: tabKey};
 
-    browserHistory.push({
+    navigate({
       pathname: location.pathname,
       query: newQuery,
     });
diff --git a/static/app/views/insights/mobile/screens/views/screensLandingPage.spec.tsx b/static/app/views/insights/mobile/screens/views/screensLandingPage.spec.tsx
index b25278553f2cda..6d1c1357f559be 100644
--- a/static/app/views/insights/mobile/screens/views/screensLandingPage.spec.tsx
+++ b/static/app/views/insights/mobile/screens/views/screensLandingPage.spec.tsx
@@ -4,7 +4,6 @@ import {ProjectFixture} from 'sentry-fixture/project';
 
 import {render, screen, waitFor, within} from 'sentry-test/reactTestingLibrary';
 
-import {t} from 'sentry/locale';
 import {useLocation} from 'sentry/utils/useLocation';
 import usePageFilters from 'sentry/utils/usePageFilters';
 import useCrossPlatformProject from 'sentry/views/insights/mobile/common/queries/useCrossPlatformProject';
@@ -51,7 +50,7 @@ describe('Screens Landing Page', function () {
   });
 
   jest.mocked(useCrossPlatformProject).mockReturnValue({
-    project: project,
+    project,
     selectedPlatform: 'Android',
     isProjectCrossPlatform: true,
   });
@@ -160,8 +159,8 @@ describe('Screens Landing Page', function () {
 
       await waitFor(() => {
         expect(metricsMock).toHaveBeenCalled();
-        expect(spanMetricsMock).toHaveBeenCalled();
       });
+      expect(spanMetricsMock).toHaveBeenCalled();
 
       const cards = [
         {header: 'Cold App Start', value: '1'},
@@ -199,14 +198,14 @@ describe('Screens Landing Page', function () {
       organization.features = [];
       render(<ScreensLandingPage />, {organization});
       expect(
-        await screen.findByText(t("You don't have access to this feature"))
+        await screen.findByText("You don't have access to this feature")
       ).toBeInTheDocument();
     });
 
     it('shows content if permission is there', async function () {
       organization.features = [MODULE_FEATURE];
       render(<ScreensLandingPage />, {organization});
-      expect(await screen.findAllByText(t('Mobile Screens'))).toHaveLength(2);
+      expect(await screen.findAllByText('Mobile Screens')).toHaveLength(2);
     });
   });
 });
diff --git a/static/app/views/insights/mobile/screens/views/screensLandingPage.tsx b/static/app/views/insights/mobile/screens/views/screensLandingPage.tsx
index f8aecceb75ff55..c4a806c334f592 100644
--- a/static/app/views/insights/mobile/screens/views/screensLandingPage.tsx
+++ b/static/app/views/insights/mobile/screens/views/screensLandingPage.tsx
@@ -13,13 +13,13 @@ import {PageHeadingQuestionTooltip} from 'sentry/components/pageHeadingQuestionT
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {NewQuery} from 'sentry/types/organization';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {useDiscoverQuery} from 'sentry/utils/discover/discoverQuery';
 import EventView from 'sentry/utils/discover/eventView';
 import {DiscoverDatasets} from 'sentry/utils/discover/types';
 import {PageAlert, PageAlertProvider} from 'sentry/utils/performance/contexts/pageAlert';
 import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import usePageFilters from 'sentry/utils/usePageFilters';
 import {ModulePageProviders} from 'sentry/views/insights/common/components/modulePageProviders';
@@ -50,18 +50,22 @@ import {ModuleName} from 'sentry/views/insights/types';
 
 export function ScreensLandingPage() {
   const moduleName = ModuleName.MOBILE_SCREENS;
+  const navigate = useNavigate();
   const location = useLocation();
   const organization = useOrganization();
   const {isProjectCrossPlatform, selectedPlatform} = useCrossPlatformProject();
 
   const handleProjectChange = useCallback(() => {
-    browserHistory.replace({
-      ...location,
-      query: {
-        ...omit(location.query, ['primaryRelease', 'secondaryRelease']),
+    navigate(
+      {
+        ...location,
+        query: {
+          ...omit(location.query, ['primaryRelease', 'secondaryRelease']),
+        },
       },
-    });
-  }, [location]);
+      {replace: true}
+    );
+  }, [location, navigate]);
   const {selection} = usePageFilters();
 
   const vitalItems: VitalItem[] = [
@@ -265,7 +269,7 @@ export function ScreensLandingPage() {
       item.dataset === DiscoverDatasets.METRICS ? metricsResult : spanMetricsResult;
 
     if (dataset.data) {
-      const row = dataset.data.data[0];
+      const row = dataset.data.data[0]!;
       const units = dataset.data.meta?.units;
       const fieldTypes = dataset.data.meta?.fields;
 
@@ -275,8 +279,8 @@ export function ScreensLandingPage() {
 
       return {
         type: fieldType,
-        unit: unit,
-        value: value,
+        unit,
+        value,
       };
     }
 
@@ -324,7 +328,7 @@ export function ScreensLandingPage() {
                             onClick={() => {
                               setState({
                                 vital: item,
-                                status: status,
+                                status,
                               });
                             }}
                             key={item.field}
diff --git a/static/app/views/insights/mobile/ui/components/uiScreens.tsx b/static/app/views/insights/mobile/ui/components/uiScreens.tsx
index a876501ded3e07..d4dd1979264351 100644
--- a/static/app/views/insights/mobile/ui/components/uiScreens.tsx
+++ b/static/app/views/insights/mobile/ui/components/uiScreens.tsx
@@ -188,7 +188,7 @@ export function UIScreens() {
           });
         }}
         organization={organization}
-        query={getFreeTextFromQuery(derivedQuery)}
+        query={getFreeTextFromQuery(derivedQuery)!}
         placeholder={t('Search for Screen')}
         additionalConditions={
           new MutableSearch(
diff --git a/static/app/views/insights/pages/ai/aiOverviewPage.tsx b/static/app/views/insights/pages/ai/aiOverviewPage.tsx
index 01ddbff22c0e0d..efb354aed1bf06 100644
--- a/static/app/views/insights/pages/ai/aiOverviewPage.tsx
+++ b/static/app/views/insights/pages/ai/aiOverviewPage.tsx
@@ -47,13 +47,13 @@ import {
 } from 'sentry/views/performance/utils';
 
 export const AI_COLUMN_TITLES = [
-  'transaction',
-  'operation',
-  'project',
-  'tpm',
-  'p50()',
-  'p95()',
-  'users',
+  {title: 'transaction'},
+  {title: 'operation'},
+  {title: 'project'},
+  {title: 'tpm'},
+  {title: 'p50()'},
+  {title: 'p95()'},
+  {title: 'users'},
 ];
 
 function AiOverviewPage() {
@@ -164,7 +164,7 @@ function AiOverviewPage() {
                     onSearch={(query: string) => {
                       handleSearch(query);
                     }}
-                    query={getFreeTextFromQuery(derivedQuery)}
+                    query={getFreeTextFromQuery(derivedQuery)!}
                   />
                 )}
               </ToolRibbon>
diff --git a/static/app/views/insights/pages/ai/settings.ts b/static/app/views/insights/pages/ai/settings.ts
index 9a40db82d2c6b1..baa393f67a607b 100644
--- a/static/app/views/insights/pages/ai/settings.ts
+++ b/static/app/views/insights/pages/ai/settings.ts
@@ -3,7 +3,7 @@ import {t} from 'sentry/locale';
 import {ModuleName} from 'sentry/views/insights/types';
 
 export const AI_LANDING_SUB_PATH = 'ai';
-export const AI_LANDING_TITLE = t('AI Performance');
+export const AI_LANDING_TITLE = t('AI');
 export const AI_SIDEBAR_LABEL = t('AI');
 export const AI_RELEASE_LEVEL: BadgeType = 'beta';
 
diff --git a/static/app/views/insights/pages/backend/backendOverviewPage.tsx b/static/app/views/insights/pages/backend/backendOverviewPage.tsx
index 3e68d8c204f7a4..ff19a33302a390 100644
--- a/static/app/views/insights/pages/backend/backendOverviewPage.tsx
+++ b/static/app/views/insights/pages/backend/backendOverviewPage.tsx
@@ -47,17 +47,17 @@ import {
 } from 'sentry/views/performance/utils';
 
 export const BACKEND_COLUMN_TITLES = [
-  'http method',
-  'transaction',
-  'operation',
-  'project',
-  'tpm',
-  'p50()',
-  'p95()',
-  'failure rate',
-  'apdex',
-  'users',
-  'user misery',
+  {title: 'http method'},
+  {title: 'transaction'},
+  {title: 'operation'},
+  {title: 'project'},
+  {title: 'tpm'},
+  {title: 'p50()'},
+  {title: 'p95()'},
+  {title: 'failure rate'},
+  {title: 'apdex'},
+  {title: 'users'},
+  {title: 'user misery'},
 ];
 
 function BackendOverviewPage() {
@@ -191,7 +191,7 @@ function BackendOverviewPage() {
                     onSearch={(query: string) => {
                       handleSearch(query);
                     }}
-                    query={getFreeTextFromQuery(derivedQuery)}
+                    query={getFreeTextFromQuery(derivedQuery)!}
                   />
                 )}
               </ToolRibbon>
diff --git a/static/app/views/insights/pages/backend/settings.ts b/static/app/views/insights/pages/backend/settings.ts
index 6ed7f0b69da990..d8a72bfade2d75 100644
--- a/static/app/views/insights/pages/backend/settings.ts
+++ b/static/app/views/insights/pages/backend/settings.ts
@@ -2,7 +2,7 @@ import {t} from 'sentry/locale';
 import {ModuleName} from 'sentry/views/insights/types';
 
 export const BACKEND_LANDING_SUB_PATH = 'backend';
-export const BACKEND_LANDING_TITLE = t('Backend Performance');
+export const BACKEND_LANDING_TITLE = t('Backend');
 export const BACKEND_SIDEBAR_LABEL = t('Backend');
 
 export const MODULES = [
@@ -10,4 +10,6 @@ export const MODULES = [
   ModuleName.HTTP,
   ModuleName.CACHE,
   ModuleName.QUEUE,
+  ModuleName.CRONS,
+  ModuleName.UPTIME,
 ];
diff --git a/static/app/views/insights/pages/domainViewHeader.tsx b/static/app/views/insights/pages/domainViewHeader.tsx
index edf03e68c90aa8..de1c9879ba47ea 100644
--- a/static/app/views/insights/pages/domainViewHeader.tsx
+++ b/static/app/views/insights/pages/domainViewHeader.tsx
@@ -1,12 +1,12 @@
 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';
 import FeedbackWidgetButton from 'sentry/components/feedback/widget/feedbackWidgetButton';
 import * as Layout from 'sentry/components/layouts/thirds';
 import {TabList, Tabs} from 'sentry/components/tabs';
+import type {TabListItemProps} from 'sentry/components/tabs/item';
 import {IconBusiness} from 'sentry/icons';
 import {space} from 'sentry/styles/space';
 import useOrganization from 'sentry/utils/useOrganization';
@@ -19,7 +19,7 @@ import {
   DOMAIN_VIEW_BASE_TITLE,
   OVERVIEW_PAGE_TITLE,
 } from 'sentry/views/insights/pages/settings';
-import {isModuleEnabled} from 'sentry/views/insights/pages/utils';
+import {isModuleEnabled, isModuleVisible} from 'sentry/views/insights/pages/utils';
 import type {ModuleName} from 'sentry/views/insights/types';
 
 export type Props = {
@@ -34,12 +34,6 @@ export type Props = {
   tabs?: {onTabChange: (key: string) => void; tabList: React.ReactNode; value: string};
 };
 
-type Tab = {
-  key: string;
-  label: React.ReactNode;
-  to: LocationDescriptor;
-};
-
 export function DomainViewHeader({
   modules,
   headerTitle,
@@ -76,28 +70,23 @@ export function DomainViewHeader({
     ...additionalBreadCrumbs,
   ];
 
-  const showModuleTabs = organization.features.includes('insights-entry-points');
-
   const tabValue =
     hideDefaultTabs && tabs?.value ? tabs.value : selectedModule ?? OVERVIEW_PAGE_TITLE;
 
-  const tabList: Tab[] = [
+  const tabList: TabListItemProps[] = [
     {
       key: OVERVIEW_PAGE_TITLE,
-      label: OVERVIEW_PAGE_TITLE,
+      children: OVERVIEW_PAGE_TITLE,
       to: domainBaseUrl,
     },
-  ];
-
-  if (showModuleTabs) {
-    tabList.push(
-      ...modules.map(moduleName => ({
+    ...modules
+      .filter(moduleName => isModuleVisible(moduleName, organization))
+      .map(moduleName => ({
         key: moduleName,
-        label: <TabLabel moduleName={moduleName} />,
+        children: <TabLabel moduleName={moduleName} />,
         to: `${moduleURLBuilder(moduleName as RoutableModuleNames)}/`,
-      }))
-    );
-  }
+      })),
+  ];
 
   return (
     <Fragment>
@@ -117,9 +106,7 @@ export function DomainViewHeader({
           {!hideDefaultTabs && (
             <TabList hideBorder>
               {tabList.map(tab => (
-                <TabList.Item key={tab.key} to={tab.to}>
-                  {tab.label}
-                </TabList.Item>
+                <TabList.Item {...tab} key={tab.key} />
               ))}
             </TabList>
           )}
diff --git a/static/app/views/insights/pages/frontend/frontendOverviewPage.tsx b/static/app/views/insights/pages/frontend/frontendOverviewPage.tsx
index 3acbb180657884..9a081f2e7a3e4b 100644
--- a/static/app/views/insights/pages/frontend/frontendOverviewPage.tsx
+++ b/static/app/views/insights/pages/frontend/frontendOverviewPage.tsx
@@ -3,6 +3,7 @@ import styled from '@emotion/styled';
 import Feature from 'sentry/components/acl/feature';
 import {COL_WIDTH_UNDEFINED} from 'sentry/components/gridEditable';
 import * as Layout from 'sentry/components/layouts/thirds';
+import ExternalLink from 'sentry/components/links/externalLink';
 import {NoAccess} from 'sentry/components/noAccess';
 import {DatePageFilter} from 'sentry/components/organizations/datePageFilter';
 import {EnvironmentPageFilter} from 'sentry/components/organizations/environmentPageFilter';
@@ -10,6 +11,7 @@ import PageFilterBar from 'sentry/components/organizations/pageFilterBar';
 import {ProjectPageFilter} from 'sentry/components/organizations/projectPageFilter';
 import TransactionNameSearchBar from 'sentry/components/performance/searchBar';
 import * as TeamKeyTransactionManager from 'sentry/components/performance/teamKeyTransactionsManager';
+import {tct} from 'sentry/locale';
 import {trackAnalytics} from 'sentry/utils/analytics';
 import {
   canUseMetricsData,
@@ -47,16 +49,25 @@ import {
   ProjectPerformanceType,
 } from 'sentry/views/performance/utils';
 
+const DURATION_TOOLTIP = tct(
+  'A heuristic measuring when a pageload or navigation completes. Based on whether the initial load of the webpage has become idle [link:Learn more.]',
+  {
+    link: (
+      <ExternalLink href="https://docs.sentry.io/platforms/javascript/tracing/instrumentation/automatic-instrumentation/#idletimeout" />
+    ),
+  }
+);
+
 export const FRONTEND_COLUMN_TITLES = [
-  'transaction',
-  'operation',
-  'project',
-  'tpm',
-  'p50()',
-  'p75()',
-  'p95()',
-  'users',
-  'user misery',
+  {title: 'transaction'},
+  {title: 'operation'},
+  {title: 'project'},
+  {title: 'tpm'},
+  {title: 'p50()', tooltip: DURATION_TOOLTIP},
+  {title: 'p75()', tooltip: DURATION_TOOLTIP},
+  {title: 'p95()', tooltip: DURATION_TOOLTIP},
+  {title: 'users'},
+  {title: 'user misery'},
 ];
 
 function FrontendOverviewPage() {
@@ -182,7 +193,7 @@ function FrontendOverviewPage() {
                     onSearch={(query: string) => {
                       handleSearch(query);
                     }}
-                    query={getFreeTextFromQuery(derivedQuery)}
+                    query={getFreeTextFromQuery(derivedQuery)!}
                   />
                 )}
               </ToolRibbon>
diff --git a/static/app/views/insights/pages/frontend/settings.ts b/static/app/views/insights/pages/frontend/settings.ts
index 8b263ad4d3a25a..35b8271ba9eedc 100644
--- a/static/app/views/insights/pages/frontend/settings.ts
+++ b/static/app/views/insights/pages/frontend/settings.ts
@@ -2,7 +2,7 @@ import {t} from 'sentry/locale';
 import {ModuleName} from 'sentry/views/insights/types';
 
 export const FRONTEND_LANDING_SUB_PATH = 'frontend';
-export const FRONTEND_LANDING_TITLE = t('Frontend Performance');
+export const FRONTEND_LANDING_TITLE = t('Frontend');
 export const FRONTEND_SIDEBAR_LABEL = t('Frontend');
 
 export const OVERVIEW_PAGE_ALLOWED_OPS = [
diff --git a/static/app/views/insights/pages/mobile/mobileOverviewPage.tsx b/static/app/views/insights/pages/mobile/mobileOverviewPage.tsx
index e4e1f9a39fa16b..393375c6feb6ec 100644
--- a/static/app/views/insights/pages/mobile/mobileOverviewPage.tsx
+++ b/static/app/views/insights/pages/mobile/mobileOverviewPage.tsx
@@ -51,26 +51,26 @@ import {
 } from 'sentry/views/performance/utils';
 
 const MOBILE_COLUMN_TITLES = [
-  'transaction',
-  'operation',
-  'project',
-  'tpm',
-  'slow frame %',
-  'frozen frame %',
-  'users',
-  'user misery',
+  {title: 'transaction'},
+  {title: 'operation'},
+  {title: 'project'},
+  {title: 'tpm'},
+  {title: 'slow frame %'},
+  {title: 'frozen frame %'},
+  {title: 'users'},
+  {title: 'user misery'},
 ];
 
 const REACT_NATIVE_COLUMN_TITLES = [
-  'transaction',
-  'operation',
-  'project',
-  'tpm',
-  'slow frame %',
-  'frozen frame %',
-  'stall %',
-  'users',
-  'user misery',
+  {title: 'transaction'},
+  {title: 'operation'},
+  {title: 'project'},
+  {title: 'tpm'},
+  {title: 'slow frame %'},
+  {title: 'frozen frame %'},
+  {title: 'stall %'},
+  {title: 'users'},
+  {title: 'user misery'},
 ];
 
 function MobileOverviewPage() {
@@ -124,7 +124,11 @@ function MobileOverviewPage() {
   );
 
   if (organization.features.includes('mobile-vitals')) {
-    columnTitles = [...columnTitles.slice(0, 5), 'ttid', ...columnTitles.slice(5, 0)];
+    columnTitles = [
+      ...columnTitles.slice(0, 5),
+      {title: 'ttid'},
+      ...columnTitles.slice(5, 0),
+    ];
     tripleChartRowCharts.push(
       ...[
         PerformanceWidgetSetting.TIME_TO_INITIAL_DISPLAY,
@@ -205,7 +209,7 @@ function MobileOverviewPage() {
                     onSearch={(query: string) => {
                       handleSearch(query);
                     }}
-                    query={getFreeTextFromQuery(derivedQuery)}
+                    query={getFreeTextFromQuery(derivedQuery)!}
                   />
                 )}
               </ToolRibbon>
diff --git a/static/app/views/insights/pages/mobile/settings.ts b/static/app/views/insights/pages/mobile/settings.ts
index 80a6d966389f25..346ac1d542159d 100644
--- a/static/app/views/insights/pages/mobile/settings.ts
+++ b/static/app/views/insights/pages/mobile/settings.ts
@@ -2,7 +2,7 @@ import {t} from 'sentry/locale';
 import {ModuleName} from 'sentry/views/insights/types';
 
 export const MOBILE_LANDING_SUB_PATH = 'mobile';
-export const MOBILE_LANDING_TITLE = t('Mobile Performance');
+export const MOBILE_LANDING_TITLE = t('Mobile');
 export const MOBILE_SIDEBAR_LABEL = t('Mobile');
 
 export const OVERVIEW_PAGE_ALLOWED_OPS = [
diff --git a/static/app/views/insights/pages/utils.ts b/static/app/views/insights/pages/utils.ts
index ea34355286ad5d..7f388f626f256c 100644
--- a/static/app/views/insights/pages/utils.ts
+++ b/static/app/views/insights/pages/utils.ts
@@ -1,16 +1,17 @@
 import type {Organization} from 'sentry/types/organization';
 import {DOMAIN_VIEW_MODULES} from 'sentry/views/insights/pages/settings';
 import type {DomainView} from 'sentry/views/insights/pages/useFilters';
-import {MODULE_FEATURE_MAP} from 'sentry/views/insights/settings';
+import {
+  MODULE_FEATURE_MAP,
+  MODULE_FEATURE_VISIBLE_MAP,
+} from 'sentry/views/insights/settings';
 import type {ModuleName} from 'sentry/views/insights/types';
 
-export const isModuleEnabled = (module: ModuleName, organization: Organization) => {
-  const moduleFeatures: string[] | undefined = MODULE_FEATURE_MAP[module];
-  if (!moduleFeatures) {
-    return false;
-  }
-  return moduleFeatures.every(feature => organization.features.includes(feature));
-};
+export const isModuleEnabled = (module: ModuleName, organization: Organization) =>
+  MODULE_FEATURE_MAP[module].every(f => organization.features.includes(f));
+
+export const isModuleVisible = (module: ModuleName, organization: Organization) =>
+  MODULE_FEATURE_VISIBLE_MAP[module].every(f => organization.features.includes(f));
 
 export const getModuleView = (module: ModuleName): DomainView => {
   if (DOMAIN_VIEW_MODULES.backend.includes(module)) {
diff --git a/static/app/views/insights/queues/charts/latencyChart.tsx b/static/app/views/insights/queues/charts/latencyChart.tsx
index 84fe0b4ec767c9..0bf5b08f0733de 100644
--- a/static/app/views/insights/queues/charts/latencyChart.tsx
+++ b/static/app/views/insights/queues/charts/latencyChart.tsx
@@ -40,7 +40,7 @@ export function LatencyChart({error, destination, referrer}: Props) {
         ]}
         loading={isPending}
         error={error}
-        chartColors={CHART_PALETTE[2].slice(1)}
+        chartColors={CHART_PALETTE[2]!.slice(1)}
         type={ChartType.AREA}
         showLegend
         stacked
diff --git a/static/app/views/insights/queues/charts/throughputChart.spec.tsx b/static/app/views/insights/queues/charts/throughputChart.spec.tsx
index 093752e68bf6f8..06e4bf4a2d0d1b 100644
--- a/static/app/views/insights/queues/charts/throughputChart.spec.tsx
+++ b/static/app/views/insights/queues/charts/throughputChart.spec.tsx
@@ -8,7 +8,7 @@ import {Referrer} from 'sentry/views/insights/queues/referrers';
 describe('throughputChart', () => {
   const organization = OrganizationFixture();
 
-  let eventsStatsMock;
+  let eventsStatsMock!: jest.Mock;
 
   beforeEach(() => {
     eventsStatsMock = MockApiClient.addMockResponse({
diff --git a/static/app/views/insights/queues/charts/throughputChart.tsx b/static/app/views/insights/queues/charts/throughputChart.tsx
index 857489ccd946ca..d5689f365e9357 100644
--- a/static/app/views/insights/queues/charts/throughputChart.tsx
+++ b/static/app/views/insights/queues/charts/throughputChart.tsx
@@ -48,7 +48,7 @@ export function ThroughputChart({error, destination, referrer}: Props) {
         ]}
         loading={isPublishDataLoading || isProcessDataLoading}
         error={error}
-        chartColors={CHART_PALETTE[2].slice(1, 3)}
+        chartColors={CHART_PALETTE[2]!.slice(1, 3)}
         type={ChartType.LINE}
         aggregateOutputFormat="rate"
         rateUnit={RateUnit.PER_MINUTE}
diff --git a/static/app/views/insights/queues/components/messageSpanSamplesPanel.tsx b/static/app/views/insights/queues/components/messageSpanSamplesPanel.tsx
index 03713e0ba4ce8f..9fcd6566105986 100644
--- a/static/app/views/insights/queues/components/messageSpanSamplesPanel.tsx
+++ b/static/app/views/insights/queues/components/messageSpanSamplesPanel.tsx
@@ -28,7 +28,7 @@ import {ReadoutRibbon} from 'sentry/views/insights/common/components/ribbon';
 import {useSpanMetricsSeries} from 'sentry/views/insights/common/queries/useDiscoverSeries';
 import {AverageValueMarkLine} from 'sentry/views/insights/common/utils/averageValueMarkLine';
 import {useSampleScatterPlotSeries} from 'sentry/views/insights/common/views/spanSummaryPage/sampleList/durationChart/useSampleScatterPlotSeries';
-import {DurationChart} from 'sentry/views/insights/http/components/charts/durationChart';
+import {DurationChartWithSamples} from 'sentry/views/insights/http/components/charts/durationChartWithSamples';
 import {useSpanSamples} from 'sentry/views/insights/http/queries/useSpanSamples';
 import {useDebouncedState} from 'sentry/views/insights/http/utils/useDebouncedState';
 import {useDomainViewFilters} from 'sentry/views/insights/pages/useFilters';
@@ -328,7 +328,7 @@ export function MessageSpanSamplesPanel() {
           </ModuleLayout.Full>
 
           <ModuleLayout.Full>
-            <DurationChart
+            <DurationChartWithSamples
               series={[
                 {
                   ...durationData[`avg(span.duration)`],
diff --git a/static/app/views/insights/queues/components/tables/queuesTable.tsx b/static/app/views/insights/queues/components/tables/queuesTable.tsx
index 58cadff85dcdc9..ab06514d93ef26 100644
--- a/static/app/views/insights/queues/components/tables/queuesTable.tsx
+++ b/static/app/views/insights/queues/components/tables/queuesTable.tsx
@@ -13,12 +13,12 @@ import Pagination from 'sentry/components/pagination';
 import {t} from 'sentry/locale';
 import type {Organization} from 'sentry/types/organization';
 import {trackAnalytics} from 'sentry/utils/analytics';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import type {EventsMetaType} from 'sentry/utils/discover/eventView';
 import {FIELD_FORMATTERS, getFieldRenderer} from 'sentry/utils/discover/fieldRenderers';
 import type {Sort} from 'sentry/utils/discover/fields';
 import {formatAbbreviatedNumber} from 'sentry/utils/formatters';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import {renderHeadCell} from 'sentry/views/insights/common/components/tableCells/renderHeadCell';
 import {useModuleURL} from 'sentry/views/insights/common/utils/useModuleURL';
@@ -106,6 +106,7 @@ interface Props {
 }
 
 export function QueuesTable({error, destination, sort}: Props) {
+  const navigate = useNavigate();
   const location = useLocation();
   const organization = useOrganization();
 
@@ -116,7 +117,7 @@ export function QueuesTable({error, destination, sort}: Props) {
   });
 
   const handleCursor: CursorHandler = (newCursor, pathname, query) => {
-    browserHistory.push({
+    navigate({
       pathname,
       query: {...query, [QueryParameterNames.DESTINATIONS_CURSOR]: newCursor},
     });
diff --git a/static/app/views/insights/queues/components/tables/transactionsTable.tsx b/static/app/views/insights/queues/components/tables/transactionsTable.tsx
index df3bb8fd600ee8..e741c309e46dae 100644
--- a/static/app/views/insights/queues/components/tables/transactionsTable.tsx
+++ b/static/app/views/insights/queues/components/tables/transactionsTable.tsx
@@ -12,13 +12,13 @@ import type {CursorHandler} from 'sentry/components/pagination';
 import Pagination from 'sentry/components/pagination';
 import {t} from 'sentry/locale';
 import type {Organization} from 'sentry/types/organization';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import type {EventsMetaType} from 'sentry/utils/discover/eventView';
 import {FIELD_FORMATTERS, getFieldRenderer} from 'sentry/utils/discover/fieldRenderers';
 import type {Sort} from 'sentry/utils/discover/fields';
 import {decodeScalar, decodeSorts} from 'sentry/utils/queryString';
 import useLocationQuery from 'sentry/utils/url/useLocationQuery';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import {renderHeadCell} from 'sentry/views/insights/common/components/tableCells/renderHeadCell';
 import {useModuleURL} from 'sentry/views/insights/common/utils/useModuleURL';
@@ -103,8 +103,9 @@ const DEFAULT_SORT = {
 };
 
 export function TransactionsTable() {
-  const organization = useOrganization();
+  const navigate = useNavigate();
   const location = useLocation();
+  const organization = useOrganization();
 
   const locationQuery = useLocationQuery({
     fields: {
@@ -124,7 +125,7 @@ export function TransactionsTable() {
   });
 
   const handleCursor: CursorHandler = (newCursor, pathname, query) => {
-    browserHistory.push({
+    navigate({
       pathname,
       query: {...query, [QueryParameterNames.TRANSACTIONS_CURSOR]: newCursor},
     });
diff --git a/static/app/views/insights/queues/views/destinationSummaryPage.tsx b/static/app/views/insights/queues/views/destinationSummaryPage.tsx
index 925f8a1671a605..549fe1c419d7e4 100644
--- a/static/app/views/insights/queues/views/destinationSummaryPage.tsx
+++ b/static/app/views/insights/queues/views/destinationSummaryPage.tsx
@@ -99,7 +99,7 @@ function DestinationSummaryPage() {
                         value={data[0]?.['sum(span.duration)']}
                         unit={DurationUnit.MILLISECOND}
                         tooltip={getTimeSpentExplanation(
-                          data[0]?.['time_spent_percentage(app,span.duration)']
+                          data[0]!?.['time_spent_percentage(app,span.duration)']
                         )}
                         isLoading={isPending}
                       />
diff --git a/static/app/views/insights/queues/views/queuesLandingPage.spec.tsx b/static/app/views/insights/queues/views/queuesLandingPage.spec.tsx
index 66d70bec26d1ab..4a68d53ffd33eb 100644
--- a/static/app/views/insights/queues/views/queuesLandingPage.spec.tsx
+++ b/static/app/views/insights/queues/views/queuesLandingPage.spec.tsx
@@ -58,7 +58,8 @@ describe('queuesLandingPage', () => {
     initiallyLoaded: false,
   });
 
-  let eventsMock, eventsStatsMock;
+  let eventsMock: jest.Mock;
+  let eventsStatsMock: jest.Mock;
 
   beforeEach(() => {
     eventsMock = MockApiClient.addMockResponse({
diff --git a/static/app/views/insights/queues/views/queuesLandingPage.tsx b/static/app/views/insights/queues/views/queuesLandingPage.tsx
index 0b661cbfcc966b..0e4e59c0255728 100644
--- a/static/app/views/insights/queues/views/queuesLandingPage.tsx
+++ b/static/app/views/insights/queues/views/queuesLandingPage.tsx
@@ -7,11 +7,11 @@ import SearchBar from 'sentry/components/searchBar';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import {trackAnalytics} from 'sentry/utils/analytics';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {decodeScalar, decodeSorts} from 'sentry/utils/queryString';
 import {escapeFilterValue} from 'sentry/utils/tokenizeSearch';
 import useLocationQuery from 'sentry/utils/url/useLocationQuery';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import * as ModuleLayout from 'sentry/views/insights/common/components/moduleLayout';
 import {ModulePageFilterBar} from 'sentry/views/insights/common/components/modulePageFilterBar';
@@ -40,6 +40,7 @@ const DEFAULT_SORT = {
 };
 
 function QueuesLandingPage() {
+  const navigate = useNavigate();
   const location = useLocation();
   const organization = useOrganization();
 
@@ -61,7 +62,7 @@ function QueuesLandingPage() {
       query: newDestination,
       source: ModuleName.QUEUE,
     });
-    browserHistory.push({
+    navigate({
       ...location,
       query: {
         ...location.query,
diff --git a/static/app/views/insights/settings.ts b/static/app/views/insights/settings.ts
index 6a579cbfb285a7..949e5842eabda4 100644
--- a/static/app/views/insights/settings.ts
+++ b/static/app/views/insights/settings.ts
@@ -20,6 +20,14 @@ import {
   MODULE_FEATURES as CACHE_MODULE_FEATURES,
   MODULE_TITLE as CACHE_MODULE_TITLE,
 } from 'sentry/views/insights/cache/settings';
+import {
+  DATA_TYPE as CRONS_DATA_TYPE,
+  DATA_TYPE_PLURAL as CRONS_DATA_TYPE_PLURAL,
+  MODULE_DOC_LINK as CRONS_MODULE_DOC_LINK,
+  MODULE_FEATURES as CRONS_MODULE_FEATURES,
+  MODULE_TITLE as CRONS_MODULE_TITLE,
+  MODULE_VISIBLE_FEATURES as CRONS_MODULE_VISIBLE_FEATURES,
+} from 'sentry/views/insights/crons/settings';
 import {
   DATA_TYPE as DB_DATA_TYPE,
   DATA_TYPE_PLURAL as DB_DATA_TYPE_PLURAL,
@@ -81,7 +89,16 @@ import {
   MODULE_FEATURES as QUEUE_MODULE_FEATURES,
   MODULE_TITLE as QUEUE_MODULE_TITLE,
 } from 'sentry/views/insights/queues/settings';
-import {ModuleName} from 'sentry/views/insights/types';
+import {
+  DATA_TYPE as UPTIME_DATA_TYPE,
+  DATA_TYPE_PLURAL as UPTIME_DATA_TYPE_PLURAL,
+  MODULE_DOC_LINK as UPTIME_MODULE_DOC_LINK,
+  MODULE_FEATURES as UPTIME_MODULE_FEATURES,
+  MODULE_TITLE as UPTIME_MODULE_TITLE,
+  MODULE_VISIBLE_FEATURES as UPTIME_MODULE_VISIBLE_FEATURES,
+} from 'sentry/views/insights/uptime/settings';
+
+import {ModuleName} from './types';
 
 export const INSIGHTS_TITLE = t('Insights');
 export const INSIGHTS_BASE_URL = 'insights';
@@ -103,6 +120,8 @@ export const MODULE_TITLES: Record<ModuleName, string> = {
   [ModuleName.MOBILE_UI]: MOBILE_UI_MODULE_TITLE,
   [ModuleName.MOBILE_SCREENS]: MOBILE_SCREENS_MODULE_TITLE,
   [ModuleName.SCREEN_RENDERING]: SCREEN_RENDERING_MODULE_TITLE,
+  [ModuleName.UPTIME]: UPTIME_MODULE_TITLE,
+  [ModuleName.CRONS]: CRONS_MODULE_TITLE,
   [ModuleName.OTHER]: '',
 };
 
@@ -119,6 +138,8 @@ export const MODULE_DATA_TYPES: Record<ModuleName, string> = {
   [ModuleName.MOBILE_UI]: t('Mobile UI'),
   [ModuleName.MOBILE_SCREENS]: MOBILE_SCREENS_DATA_TYPE,
   [ModuleName.SCREEN_RENDERING]: SCREEN_RENDERING_DATA_TYPE,
+  [ModuleName.UPTIME]: UPTIME_DATA_TYPE,
+  [ModuleName.CRONS]: CRONS_DATA_TYPE,
   [ModuleName.OTHER]: '',
 };
 
@@ -135,6 +156,8 @@ export const MODULE_DATA_TYPES_PLURAL: Record<ModuleName, string> = {
   [ModuleName.MOBILE_UI]: t('Mobile UI'),
   [ModuleName.MOBILE_SCREENS]: MOBILE_SCREENS_DATA_TYPE_PLURAL,
   [ModuleName.SCREEN_RENDERING]: SCREEN_RENDERING_DATA_TYPE_PLURAL,
+  [ModuleName.UPTIME]: UPTIME_DATA_TYPE_PLURAL,
+  [ModuleName.CRONS]: CRONS_DATA_TYPE_PLURAL,
   [ModuleName.OTHER]: '',
 };
 
@@ -151,9 +174,14 @@ export const MODULE_PRODUCT_DOC_LINKS: Record<ModuleName, string> = {
   [ModuleName.MOBILE_UI]: MODULE_UI_DOC_LINK,
   [ModuleName.MOBILE_SCREENS]: MODULE_SCREENS_DOC_LINK,
   [ModuleName.SCREEN_RENDERING]: SCREEN_RENDERING_MODULE_DOC_LINK,
+  [ModuleName.UPTIME]: UPTIME_MODULE_DOC_LINK,
+  [ModuleName.CRONS]: CRONS_MODULE_DOC_LINK,
   [ModuleName.OTHER]: '',
 };
 
+/**
+ * Features that control gating of modules, falling back to upsell style hooks.
+ */
 export const MODULE_FEATURE_MAP: Record<ModuleName, string[]> = {
   [ModuleName.DB]: DB_MODULE_FEATURES,
   [ModuleName.APP_START]: APP_STARTS_MODULE_FEATURES,
@@ -167,5 +195,28 @@ export const MODULE_FEATURE_MAP: Record<ModuleName, string[]> = {
   [ModuleName.MOBILE_UI]: MOBILE_UI_MODULE_FEATURES,
   [ModuleName.MOBILE_SCREENS]: [MOBILE_SCREENS_MODULE_FEATURE],
   [ModuleName.SCREEN_RENDERING]: SCREEN_RENDERING_MODULE_FEATURES,
+  [ModuleName.UPTIME]: UPTIME_MODULE_FEATURES,
+  [ModuleName.CRONS]: CRONS_MODULE_FEATURES,
   [ModuleName.OTHER]: [],
 };
+
+/**
+ * Features that control the visibility of modules.
+ */
+export const MODULE_FEATURE_VISIBLE_MAP: Record<ModuleName, string[]> = {
+  [ModuleName.DB]: ['insights-entry-points'],
+  [ModuleName.APP_START]: ['insights-entry-points'],
+  [ModuleName.HTTP]: ['insights-entry-points'],
+  [ModuleName.RESOURCE]: ['insights-entry-points'],
+  [ModuleName.VITAL]: ['insights-entry-points'],
+  [ModuleName.CACHE]: ['insights-entry-points'],
+  [ModuleName.QUEUE]: ['insights-entry-points'],
+  [ModuleName.AI]: ['insights-entry-points'],
+  [ModuleName.SCREEN_LOAD]: ['insights-entry-points'],
+  [ModuleName.MOBILE_UI]: ['insights-entry-points'],
+  [ModuleName.MOBILE_SCREENS]: ['insights-entry-points'],
+  [ModuleName.SCREEN_RENDERING]: ['insights-entry-points'],
+  [ModuleName.UPTIME]: ['insights-entry-points', ...UPTIME_MODULE_VISIBLE_FEATURES],
+  [ModuleName.CRONS]: ['insights-entry-points', ...CRONS_MODULE_VISIBLE_FEATURES],
+  [ModuleName.OTHER]: ['insights-entry-points'],
+};
diff --git a/static/app/views/insights/types.tsx b/static/app/views/insights/types.tsx
index af4efcb98be3eb..97e4e231fdb871 100644
--- a/static/app/views/insights/types.tsx
+++ b/static/app/views/insights/types.tsx
@@ -17,6 +17,8 @@ export enum ModuleName {
   MOBILE_UI = 'mobile-ui',
   MOBILE_SCREENS = 'mobile-screens',
   SCREEN_RENDERING = 'screen-rendering',
+  CRONS = 'crons',
+  UPTIME = 'uptime',
   OTHER = 'other',
 }
 
diff --git a/static/app/views/insights/uptime/components/overviewTimeline/index.tsx b/static/app/views/insights/uptime/components/overviewTimeline/index.tsx
new file mode 100644
index 00000000000000..0a736c5a3b41d6
--- /dev/null
+++ b/static/app/views/insights/uptime/components/overviewTimeline/index.tsx
@@ -0,0 +1,57 @@
+import styled from '@emotion/styled';
+
+import Panel from 'sentry/components/panels/panel';
+import {Sticky} from 'sentry/components/sticky';
+import type {UptimeAlert} from 'sentry/views/alerts/types';
+
+import {OverviewRow} from './overviewRow';
+
+interface Props {
+  uptimeAlerts: UptimeAlert[];
+}
+
+export function OverviewTimeline({uptimeAlerts}: Props) {
+  return (
+    <MonitorListPanel role="region">
+      <Header />
+      <UptimeAlertRow>
+        {uptimeAlerts.map(uptimeAlert => (
+          <OverviewRow key={uptimeAlert.id} uptimeAlert={uptimeAlert} />
+        ))}
+      </UptimeAlertRow>
+    </MonitorListPanel>
+  );
+}
+
+const Header = styled(Sticky)`
+  display: grid;
+  grid-column: 1/-1;
+  grid-template-columns: subgrid;
+
+  z-index: 1;
+  background: ${p => p.theme.background};
+  border-top-left-radius: ${p => p.theme.panelBorderRadius};
+  border-top-right-radius: ${p => p.theme.panelBorderRadius};
+  box-shadow: 0 1px ${p => p.theme.translucentBorder};
+
+  &[data-stuck] {
+    border-radius: 0;
+    border-left: 1px solid ${p => p.theme.border};
+    border-right: 1px solid ${p => p.theme.border};
+    margin: 0 -1px;
+  }
+`;
+
+const MonitorListPanel = styled(Panel)`
+  display: grid;
+  grid-template-columns: 350px 1fr max-content;
+`;
+
+const UptimeAlertRow = styled('ul')`
+  display: grid;
+  grid-template-columns: subgrid;
+  grid-column: 1 / -1;
+  list-style: none;
+  padding: 0;
+  margin: 0;
+`;
diff --git a/static/app/views/insights/uptime/components/overviewTimeline/overviewRow.tsx b/static/app/views/insights/uptime/components/overviewTimeline/overviewRow.tsx
new file mode 100644
index 00000000000000..602792f15d9657
--- /dev/null
+++ b/static/app/views/insights/uptime/components/overviewTimeline/overviewRow.tsx
@@ -0,0 +1,166 @@
+import {css} from '@emotion/react';
+import styled from '@emotion/styled';
+import pick from 'lodash/pick';
+
+import ActorBadge from 'sentry/components/idBadge/actorBadge';
+import ProjectBadge from 'sentry/components/idBadge/projectBadge';
+import Link from 'sentry/components/links/link';
+import {IconTimer, IconUser} from 'sentry/icons';
+import {t} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
+import getDuration from 'sentry/utils/duration/getDuration';
+import {useLocation} from 'sentry/utils/useLocation';
+import useOrganization from 'sentry/utils/useOrganization';
+import useProjectFromSlug from 'sentry/utils/useProjectFromSlug';
+import type {UptimeAlert} from 'sentry/views/alerts/types';
+
+interface Props {
+  uptimeAlert: UptimeAlert;
+}
+
+export function OverviewRow({uptimeAlert}: Props) {
+  const organization = useOrganization();
+  const project = useProjectFromSlug({
+    organization,
+    projectSlug: uptimeAlert.projectSlug,
+  });
+
+  const location = useLocation();
+  const query = pick(location.query, ['start', 'end', 'statsPeriod', 'environment']);
+
+  return (
+    <TimelineRow key={uptimeAlert.id}>
+      <DetailsArea>
+        <DetailsLink
+          to={{
+            pathname: `/organizations/${organization.slug}/alerts/rules/uptime/${uptimeAlert.projectSlug}/${uptimeAlert.id}/details/`,
+            query,
+          }}
+        >
+          <DetailsHeadline>
+            <Name>{uptimeAlert.name}</Name>
+          </DetailsHeadline>
+          <DetailsContainer>
+            <OwnershipDetails>
+              {project && <ProjectBadge project={project} avatarSize={12} disableLink />}
+              {uptimeAlert.owner ? (
+                <ActorBadge actor={uptimeAlert.owner} avatarSize={12} />
+              ) : (
+                <UnassignedLabel>
+                  <IconUser size="xs" />
+                  {t('Unassigned')}
+                </UnassignedLabel>
+              )}
+            </OwnershipDetails>
+            <ScheduleDetails>
+              <IconTimer size="xs" />
+              {t('Checked every %s', getDuration(uptimeAlert.intervalSeconds))}
+            </ScheduleDetails>
+          </DetailsContainer>
+        </DetailsLink>
+      </DetailsArea>
+      <TimelineContainer />
+    </TimelineRow>
+  );
+}
+
+const DetailsLink = styled(Link)`
+  display: block;
+  padding: ${space(3)};
+  color: ${p => p.theme.textColor};
+
+  &:focus-visible {
+    outline: none;
+  }
+`;
+
+const DetailsArea = styled('div')`
+  border-right: 1px solid ${p => p.theme.border};
+  border-radius: 0;
+  position: relative;
+`;
+
+const DetailsHeadline = styled('div')`
+  display: grid;
+  gap: ${space(1)};
+  grid-template-columns: 1fr minmax(30px, max-content);
+`;
+
+const DetailsContainer = styled('div')`
+  display: flex;
+  flex-direction: column;
+  gap: ${space(0.5)};
+`;
+
+const OwnershipDetails = styled('div')`
+  display: flex;
+  gap: ${space(0.75)};
+  align-items: center;
+  color: ${p => p.theme.subText};
+  font-size: ${p => p.theme.fontSizeSmall};
+`;
+
+const UnassignedLabel = styled('div')`
+  display: flex;
+  gap: ${space(0.5)};
+  align-items: center;
+`;
+
+const Name = styled('h3')`
+  font-size: ${p => p.theme.fontSizeLarge};
+  word-break: break-word;
+  margin-bottom: ${space(0.5)};
+`;
+
+const ScheduleDetails = styled('small')`
+  display: flex;
+  gap: ${space(0.5)};
+  align-items: center;
+  color: ${p => p.theme.subText};
+  font-size: ${p => p.theme.fontSizeSmall};
+`;
+
+interface TimelineRowProps {
+  isDisabled?: boolean;
+  singleMonitorView?: boolean;
+}
+
+const TimelineRow = styled('li')<TimelineRowProps>`
+  grid-column: 1/-1;
+
+  display: grid;
+  grid-template-columns: subgrid;
+
+  ${p =>
+    !p.singleMonitorView &&
+    css`
+      transition: background 50ms ease-in-out;
+
+      &:nth-child(odd) {
+        background: ${p.theme.backgroundSecondary};
+      }
+      &:hover {
+        background: ${p.theme.backgroundTertiary};
+      }
+      &:has(*:focus-visible) {
+        background: ${p.theme.backgroundTertiary};
+      }
+    `}
+
+  /* Disabled monitors become more opaque */
+  --disabled-opacity: ${p => (p.isDisabled ? '0.6' : 'unset')};
+
+  &:last-child {
+    border-bottom-left-radius: ${p => p.theme.borderRadius};
+    border-bottom-right-radius: ${p => p.theme.borderRadius};
+  }
+`;
+
+const TimelineContainer = styled('div')`
+  display: flex;
+  padding: ${space(3)} 0;
+  flex-direction: column;
+  gap: ${space(4)};
+  contain: content;
+  grid-column: 2/-1;
+`;
diff --git a/static/app/views/insights/uptime/settings.ts b/static/app/views/insights/uptime/settings.ts
new file mode 100644
index 00000000000000..649531c85aea4b
--- /dev/null
+++ b/static/app/views/insights/uptime/settings.ts
@@ -0,0 +1,13 @@
+import {t} from 'sentry/locale';
+
+export const MODULE_TITLE = t('Uptime Monitors');
+export const MODULE_SIDEBAR_TITLE = t('Uptime');
+export const DATA_TYPE = t('Uptime Check');
+export const DATA_TYPE_PLURAL = t('Uptime Checks');
+export const BASE_URL = 'uptime';
+
+export const MODULE_DESCRIPTION = t('Monitor availability of HTTP URLs.');
+export const MODULE_DOC_LINK = 'https://docs.sentry.io/product/alerts/uptime-monitoring/';
+
+export const MODULE_FEATURES = ['insights-uptime'];
+export const MODULE_VISIBLE_FEATURES = ['insights-uptime'];
diff --git a/static/app/views/insights/uptime/views/overview.spec.tsx b/static/app/views/insights/uptime/views/overview.spec.tsx
new file mode 100644
index 00000000000000..a4e876b3f13004
--- /dev/null
+++ b/static/app/views/insights/uptime/views/overview.spec.tsx
@@ -0,0 +1,84 @@
+import {ProjectFixture} from 'sentry-fixture/project';
+import {TeamFixture} from 'sentry-fixture/team';
+import {UptimeRuleFixture} from 'sentry-fixture/uptimeRule';
+
+import {initializeOrg} from 'sentry-test/initializeOrg';
+import {render, screen} from 'sentry-test/reactTestingLibrary';
+
+import OrganizationStore from 'sentry/stores/organizationStore';
+import {useNavigate} from 'sentry/utils/useNavigate';
+import usePageFilters from 'sentry/utils/usePageFilters';
+import UptimeOverview from 'sentry/views/insights/uptime/views/overview';
+
+jest.mock('sentry/utils/usePageFilters');
+
+jest.mock('sentry/utils/useNavigate', () => ({
+  useNavigate: jest.fn(),
+}));
+
+const mockUseNavigate = jest.mocked(useNavigate);
+const mockNavigate = jest.fn();
+mockUseNavigate.mockReturnValue(mockNavigate);
+
+describe('Uptime Overview', function () {
+  const project = ProjectFixture();
+  const team = TeamFixture();
+
+  jest.mocked(usePageFilters).mockReturnValue({
+    isReady: true,
+    desyncedFilters: new Set(),
+    pinnedFilters: new Set(),
+    shouldPersist: true,
+    selection: {
+      datetime: {
+        period: '10d',
+        start: null,
+        end: null,
+        utc: false,
+      },
+      environments: [],
+      projects: [],
+    },
+  });
+
+  beforeEach(function () {
+    OrganizationStore.init();
+    MockApiClient.clearMockResponses();
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/uptime/',
+      body: [
+        UptimeRuleFixture({
+          name: 'Test Monitor',
+          projectSlug: project.slug,
+          owner: undefined,
+        }),
+      ],
+    });
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/projects/',
+      body: [project],
+    });
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/members/',
+      body: [],
+    });
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/teams/',
+      body: [team],
+    });
+  });
+
+  it('renders', async function () {
+    const {organization, router} = initializeOrg({
+      organization: {features: ['insights-initial-modules', 'insights-uptime']},
+    });
+    OrganizationStore.onUpdate(organization);
+
+    render(<UptimeOverview />, {organization, router});
+    expect(
+      await screen.findByRole('heading', {name: 'Uptime Monitors'})
+    ).toBeInTheDocument();
+
+    expect(screen.getByRole('heading', {name: 'Test Monitor'})).toBeInTheDocument();
+  });
+});
diff --git a/static/app/views/insights/uptime/views/overview.tsx b/static/app/views/insights/uptime/views/overview.tsx
new file mode 100644
index 00000000000000..a844630a3608c2
--- /dev/null
+++ b/static/app/views/insights/uptime/views/overview.tsx
@@ -0,0 +1,163 @@
+import {Fragment} from 'react';
+import styled from '@emotion/styled';
+import * as qs from 'query-string';
+
+import {LinkButton} 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 LoadingIndicator from 'sentry/components/loadingIndicator';
+import {DatePageFilter} from 'sentry/components/organizations/datePageFilter';
+import {EnvironmentPageFilter} from 'sentry/components/organizations/environmentPageFilter';
+import PageFilterBar from 'sentry/components/organizations/pageFilterBar';
+import {normalizeDateTimeParams} from 'sentry/components/organizations/pageFilters/parse';
+import {ProjectPageFilter} from 'sentry/components/organizations/projectPageFilter';
+import {PageHeadingQuestionTooltip} from 'sentry/components/pageHeadingQuestionTooltip';
+import Pagination from 'sentry/components/pagination';
+import SearchBar from 'sentry/components/searchBar';
+import {IconAdd} from 'sentry/icons';
+import {t} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
+import {useApiQuery} from 'sentry/utils/queryClient';
+import {decodeList, decodeScalar} from 'sentry/utils/queryString';
+import useRouteAnalyticsEventNames from 'sentry/utils/routeAnalytics/useRouteAnalyticsEventNames';
+import useRouteAnalyticsParams from 'sentry/utils/routeAnalytics/useRouteAnalyticsParams';
+import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
+import useOrganization from 'sentry/utils/useOrganization';
+import type {UptimeAlert} from 'sentry/views/alerts/types';
+import {ModulePageProviders} from 'sentry/views/insights/common/components/modulePageProviders';
+import {BackendHeader} from 'sentry/views/insights/pages/backend/backendPageHeader';
+import {ModuleName} from 'sentry/views/insights/types';
+import {
+  MODULE_DESCRIPTION,
+  MODULE_DOC_LINK,
+  MODULE_TITLE,
+} from 'sentry/views/insights/uptime/settings';
+import {OwnerFilter} from 'sentry/views/monitors/components/ownerFilter';
+
+import {OverviewTimeline} from '../components/overviewTimeline';
+
+export default function UptimeOverview() {
+  const organization = useOrganization();
+  const navigate = useNavigate();
+  const location = useLocation();
+  const project = decodeList(location.query?.project);
+
+  function makeQueryKey() {
+    const {query, environment, owner, cursor, sort, asc} = location.query;
+    return [
+      `/organizations/${organization.slug}/uptime/`,
+      {
+        query: {
+          cursor,
+          query,
+          project,
+          environment,
+          owner,
+          includeNew: true,
+          per_page: 20,
+          sort,
+          asc,
+        },
+      },
+    ] as const;
+  }
+
+  const {
+    data: uptimeList,
+    getResponseHeader: uptimeListHeaders,
+    isPending,
+  } = useApiQuery<UptimeAlert[]>(makeQueryKey(), {staleTime: 0});
+
+  useRouteAnalyticsEventNames('uptime.page_viewed', 'Uptime: Page Viewed');
+  useRouteAnalyticsParams({empty_state: !uptimeList || uptimeList.length === 0});
+
+  const uptimeListPageLinks = uptimeListHeaders?.('Link');
+
+  const handleSearch = (query: string) => {
+    const currentQuery = {...(location.query ?? {}), cursor: undefined};
+    navigate({
+      pathname: location.pathname,
+      query: normalizeDateTimeParams({...currentQuery, query}),
+    });
+  };
+
+  return (
+    <ModulePageProviders moduleName="uptime" pageTitle={t('Overview')}>
+      <BackendHeader
+        headerTitle={
+          <Fragment>
+            {MODULE_TITLE}
+            <PageHeadingQuestionTooltip
+              docsUrl={MODULE_DOC_LINK}
+              title={MODULE_DESCRIPTION}
+            />
+          </Fragment>
+        }
+        module={ModuleName.UPTIME}
+        headerActions={
+          <ButtonBar gap={1}>
+            <FeedbackWidgetButton />
+            <LinkButton
+              size="sm"
+              priority="primary"
+              to={`/organizations/${organization.slug}/alerts/new/uptime/`}
+              icon={<IconAdd isCircled />}
+            >
+              {t('Add Uptime Monitor')}
+            </LinkButton>
+          </ButtonBar>
+        }
+      />
+      <Layout.Body>
+        <Layout.Main fullWidth>
+          <Filters>
+            <OwnerFilter
+              selectedOwners={decodeList(location.query.owner)}
+              onChangeFilter={owner => {
+                navigate(
+                  {
+                    ...location,
+                    query: {...location.query, owner, cursor: undefined},
+                  },
+                  {replace: true}
+                );
+              }}
+            />
+            <PageFilterBar>
+              <ProjectPageFilter resetParamsOnChange={['cursor']} />
+              <EnvironmentPageFilter resetParamsOnChange={['cursor']} />
+              <DatePageFilter />
+            </PageFilterBar>
+            <SearchBar
+              query={decodeScalar(qs.parse(location.search)?.query, '')}
+              placeholder={t('Search by name or slug')}
+              onSearch={handleSearch}
+            />
+          </Filters>
+          {isPending ? (
+            <LoadingIndicator />
+          ) : uptimeList?.length ? (
+            <Fragment>
+              <OverviewTimeline uptimeAlerts={uptimeList} />
+              {uptimeListPageLinks && <Pagination pageLinks={uptimeListPageLinks} />}
+            </Fragment>
+          ) : (
+            'LAnding thing here'
+          )}
+        </Layout.Main>
+      </Layout.Body>
+    </ModulePageProviders>
+  );
+}
+
+const Filters = styled('div')`
+  display: flex;
+  gap: ${space(1.5)};
+  margin-bottom: ${space(2)};
+
+  > :last-child {
+    flex-grow: 1;
+  }
+`;
diff --git a/static/app/views/integrationPipeline/awsLambdaCloudformation.spec.tsx b/static/app/views/integrationPipeline/awsLambdaCloudformation.spec.tsx
index 02c17fddb82167..6f2ac16f8a5bdf 100644
--- a/static/app/views/integrationPipeline/awsLambdaCloudformation.spec.tsx
+++ b/static/app/views/integrationPipeline/awsLambdaCloudformation.spec.tsx
@@ -7,7 +7,7 @@ import selectEvent from 'sentry-test/selectEvent';
 import AwsLambdaCloudformation from 'sentry/views/integrationPipeline/awsLambdaCloudformation';
 
 describe('AwsLambdaCloudformation', () => {
-  let windowAssignMock;
+  let windowAssignMock!: jest.Mock;
 
   beforeEach(() => {
     windowAssignMock = jest.fn();
diff --git a/static/app/views/issueDetails/actions/index.spec.tsx b/static/app/views/issueDetails/actions/index.spec.tsx
index e8f713e060ea22..8b5738ba955a7a 100644
--- a/static/app/views/issueDetails/actions/index.spec.tsx
+++ b/static/app/views/issueDetails/actions/index.spec.tsx
@@ -3,6 +3,7 @@ import {EventStacktraceExceptionFixture} from 'sentry-fixture/eventStacktraceExc
 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,
@@ -17,7 +18,6 @@ import ConfigStore from 'sentry/stores/configStore';
 import ModalStore from 'sentry/stores/modalStore';
 import {GroupStatus, IssueCategory} from 'sentry/types/group';
 import * as analytics from 'sentry/utils/analytics';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import GroupActions from 'sentry/views/issueDetails/actions';
 
 const project = ProjectFixture({
@@ -192,11 +192,6 @@ describe('GroupActions', function () {
       features: ['shared-issues'],
     };
 
-    const updateMock = MockApiClient.addMockResponse({
-      url: `/projects/${org.slug}/${project.slug}/issues/`,
-      method: 'PUT',
-      body: {},
-    });
     render(
       <Fragment>
         <GlobalModal />
@@ -216,11 +211,11 @@ describe('GroupActions', function () {
 
     const modal = screen.getByRole('dialog');
     expect(within(modal).getByText('Share Issue')).toBeInTheDocument();
-    expect(updateMock).toHaveBeenCalled();
   });
 
   describe('delete', function () {
     it('opens delete confirm modal from more actions dropdown', async () => {
+      const router = RouterFixture();
       const org = OrganizationFixture({
         ...organization,
         access: [...organization.access, 'event:admin'],
@@ -246,7 +241,7 @@ describe('GroupActions', function () {
             event={null}
           />
         </Fragment>,
-        {organization: org}
+        {router, organization: org}
       );
 
       await userEvent.click(screen.getByLabelText('More Actions'));
@@ -260,7 +255,7 @@ describe('GroupActions', function () {
       await userEvent.click(within(modal).getByRole('button', {name: 'Delete'}));
 
       expect(deleteMock).toHaveBeenCalled();
-      expect(browserHistory.push).toHaveBeenCalledWith({
+      expect(router.push).toHaveBeenCalledWith({
         pathname: `/organizations/${org.slug}/issues/`,
         query: {project: project.id},
       });
diff --git a/static/app/views/issueDetails/actions/newIssueExperienceButton.tsx b/static/app/views/issueDetails/actions/newIssueExperienceButton.tsx
index 18383fe84c58c7..2b74637ace8139 100644
--- a/static/app/views/issueDetails/actions/newIssueExperienceButton.tsx
+++ b/static/app/views/issueDetails/actions/newIssueExperienceButton.tsx
@@ -30,7 +30,7 @@ export function NewIssueExperienceButton() {
     mutate({['prefersIssueDetailsStreamlinedUI']: !hasStreamlinedUI});
     trackAnalytics('issue_details.streamline_ui_toggle', {
       isEnabled: !hasStreamlinedUI,
-      organization: organization,
+      organization,
     });
   }, [mutate, organization, hasStreamlinedUI]);
 
diff --git a/static/app/views/issueDetails/actions/shareModal.spec.tsx b/static/app/views/issueDetails/actions/shareModal.spec.tsx
index f8c70fdbcb60bb..6d626f508732e0 100644
--- a/static/app/views/issueDetails/actions/shareModal.spec.tsx
+++ b/static/app/views/issueDetails/actions/shareModal.spec.tsx
@@ -24,7 +24,7 @@ describe('shareModal', () => {
     jest.clearAllMocks();
   });
 
-  it('should share on open', async () => {
+  it('should share', async () => {
     const group = GroupFixture();
     GroupStore.add([group]);
 
@@ -48,6 +48,7 @@ describe('shareModal', () => {
     );
 
     expect(screen.getByText('Share Issue')).toBeInTheDocument();
+    await userEvent.click(screen.getByLabelText('Share'));
     expect(await screen.findByRole('button', {name: 'Copy Link'})).toBeInTheDocument();
     expect(issuesApi).toHaveBeenCalledTimes(1);
     expect(onToggle).toHaveBeenCalledTimes(1);
diff --git a/static/app/views/issueDetails/actions/shareModal.tsx b/static/app/views/issueDetails/actions/shareModal.tsx
index 79c691efb5e8af..b4d27f317b55ab 100644
--- a/static/app/views/issueDetails/actions/shareModal.tsx
+++ b/static/app/views/issueDetails/actions/shareModal.tsx
@@ -1,4 +1,4 @@
-import {Fragment, useCallback, useEffect, useRef, useState} from 'react';
+import {Fragment, useCallback, useRef, useState} from 'react';
 import styled from '@emotion/styled';
 
 import {bulkUpdate} from 'sentry/actionCreators/group';
@@ -80,18 +80,6 @@ function ShareIssueModal({
     [api, setLoading, onToggle, isShared, organization.slug, projectSlug, groupId]
   );
 
-  /**
-   * Share as soon as modal is opened
-   */
-  useEffect(() => {
-    if (isShared) {
-      return;
-    }
-
-    handleShare(null, true);
-    // eslint-disable-next-line react-hooks/exhaustive-deps -- we only want to run this on open
-  }, []);
-
   const shareUrl = group?.shareId ? getShareUrl(group) : null;
 
   const {onClick: handleCopy} = useCopyToClipboard({
diff --git a/static/app/views/issueDetails/groupActivityItem.tsx b/static/app/views/issueDetails/groupActivityItem.tsx
index 0b874e7ed346e5..4edc01f752e295 100644
--- a/static/app/views/issueDetails/groupActivityItem.tsx
+++ b/static/app/views/issueDetails/groupActivityItem.tsx
@@ -326,7 +326,7 @@ function GroupActivityItem({
               break: <br />,
               release: (
                 <Version
-                  version={deployedReleases[0].version}
+                  version={deployedReleases[0]!.version}
                   projectId={projectId}
                   tooltipRawVersion
                 />
@@ -350,7 +350,7 @@ function GroupActivityItem({
               break: <br />,
               release: (
                 <Version
-                  version={deployedReleases[0].version}
+                  version={deployedReleases[0]!.version}
                   projectId={projectId}
                   tooltipRawVersion
                 />
@@ -474,6 +474,13 @@ function GroupActivityItem({
       }
       case GroupActivityType.CREATE_ISSUE: {
         const {data} = activity;
+        if (data.new === true) {
+          return tct('[author] linked this issue to [issue] on [provider]', {
+            author,
+            issue: <ExternalLink href={data.location}>{data.title}</ExternalLink>,
+            provider: data.provider,
+          });
+        }
         return tct('[author] created an issue on [provider] titled [title]', {
           author,
           provider: data.provider,
diff --git a/static/app/views/issueDetails/groupDetails.tsx b/static/app/views/issueDetails/groupDetails.tsx
index 9e0da594d3b0e1..fbeb27350f2770 100644
--- a/static/app/views/issueDetails/groupDetails.tsx
+++ b/static/app/views/issueDetails/groupDetails.tsx
@@ -41,7 +41,6 @@ import useApi from 'sentry/utils/useApi';
 import {useDetailedProject} from 'sentry/utils/useDetailedProject';
 import {useLocation} from 'sentry/utils/useLocation';
 import {useMemoWithPrevious} from 'sentry/utils/useMemoWithPrevious';
-import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import {useParams} from 'sentry/utils/useParams';
 import useProjects from 'sentry/utils/useProjects';
@@ -223,8 +222,6 @@ 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);
 
@@ -236,7 +233,6 @@ function useFetchGroupDetails(): FetchGroupDetailsState {
   const {
     data: event,
     isPending: loadingEvent,
-    isError: isEventError,
     refetch: refetchEvent,
   } = useGroupEvent({
     groupId,
@@ -252,27 +248,6 @@ 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
diff --git a/static/app/views/issueDetails/groupEventAttachments/groupEventAttachments.spec.tsx b/static/app/views/issueDetails/groupEventAttachments/groupEventAttachments.spec.tsx
index 59b98a700dda62..d202a7bb0f0244 100644
--- a/static/app/views/issueDetails/groupEventAttachments/groupEventAttachments.spec.tsx
+++ b/static/app/views/issueDetails/groupEventAttachments/groupEventAttachments.spec.tsx
@@ -81,15 +81,6 @@ describe('GroupEventAttachments', function () {
     );
   });
 
-  it('does not render screenshots tab if not mobile platform', function () {
-    project.platform = 'javascript';
-    render(<GroupEventAttachments project={project} group={group} />, {
-      router: screenshotRouter,
-      organization,
-    });
-    expect(screen.queryByText('Screenshots')).not.toBeInTheDocument();
-  });
-
   it('calls opens modal when clicking on panel body', async function () {
     render(<GroupEventAttachments project={project} group={group} />, {
       router: screenshotRouter,
diff --git a/static/app/views/issueDetails/groupEventAttachments/groupEventAttachments.tsx b/static/app/views/issueDetails/groupEventAttachments/groupEventAttachments.tsx
index 76b4efabf9222e..ba89086bc688c8 100644
--- a/static/app/views/issueDetails/groupEventAttachments/groupEventAttachments.tsx
+++ b/static/app/views/issueDetails/groupEventAttachments/groupEventAttachments.tsx
@@ -33,7 +33,7 @@ function GroupEventAttachments({project, group}: GroupEventAttachmentsProps) {
   const location = useLocation();
   const organization = useOrganization();
   const hasStreamlinedUI = useHasStreamlinedUI();
-  const eventQuery = useEventQuery({group});
+  const eventQuery = useEventQuery({groupId: group.id});
   const eventView = useIssueDetailsEventView({group});
   const activeAttachmentsTab =
     (location.query.attachmentFilter as EventAttachmentFilter | undefined) ??
@@ -128,10 +128,10 @@ function GroupEventAttachments({project, group}: GroupEventAttachmentsProps) {
             <IconFilter size="xs" />
             {t('Results are filtered by the selections above.')}
           </FilterMessage>
-          <GroupEventAttachmentsFilter project={project} />
+          <GroupEventAttachmentsFilter />
         </Flex>
       ) : (
-        <GroupEventAttachmentsFilter project={project} />
+        <GroupEventAttachmentsFilter />
       )}
       {activeAttachmentsTab === EventAttachmentFilter.SCREENSHOT
         ? renderScreenshotGallery()
diff --git a/static/app/views/issueDetails/groupEventAttachments/groupEventAttachmentsFilter.tsx b/static/app/views/issueDetails/groupEventAttachments/groupEventAttachmentsFilter.tsx
index f26187f78216f2..a0f05cee456ebb 100644
--- a/static/app/views/issueDetails/groupEventAttachments/groupEventAttachmentsFilter.tsx
+++ b/static/app/views/issueDetails/groupEventAttachments/groupEventAttachmentsFilter.tsx
@@ -2,8 +2,6 @@ import styled from '@emotion/styled';
 
 import {SegmentedControl} from 'sentry/components/segmentedControl';
 import {t} from 'sentry/locale';
-import type {Project} from 'sentry/types/project';
-import {isMobilePlatform} from 'sentry/utils/platform';
 import {useLocation} from 'sentry/utils/useLocation';
 import {useNavigate} from 'sentry/utils/useNavigate';
 
@@ -15,12 +13,7 @@ export const enum EventAttachmentFilter {
 
 type AttachmentFilterValue = `${EventAttachmentFilter}`;
 
-type Props = {
-  project: Project;
-};
-
-function GroupEventAttachmentsFilter(props: Props) {
-  const {project} = props;
+function GroupEventAttachmentsFilter() {
   const location = useLocation();
   const navigate = useNavigate();
 
@@ -44,21 +37,15 @@ function GroupEventAttachmentsFilter(props: Props) {
           );
         }}
       >
-        {[
-          <SegmentedControl.Item key={EventAttachmentFilter.ALL}>
-            {t('All Attachments')}
-          </SegmentedControl.Item>,
-          ...(isMobilePlatform(project.platform)
-            ? [
-                <SegmentedControl.Item key={EventAttachmentFilter.SCREENSHOT}>
-                  {t('Screenshots')}
-                </SegmentedControl.Item>,
-              ]
-            : []),
-          <SegmentedControl.Item key={EventAttachmentFilter.CRASH_REPORTS}>
-            {t('Only Crash Reports')}
-          </SegmentedControl.Item>,
-        ]}
+        <SegmentedControl.Item key={EventAttachmentFilter.ALL}>
+          {t('All Attachments')}
+        </SegmentedControl.Item>
+        <SegmentedControl.Item key={EventAttachmentFilter.SCREENSHOT}>
+          {t('Screenshots')}
+        </SegmentedControl.Item>
+        <SegmentedControl.Item key={EventAttachmentFilter.CRASH_REPORTS}>
+          {t('Only Crash Reports')}
+        </SegmentedControl.Item>
       </SegmentedControl>
     </FilterWrapper>
   );
diff --git a/static/app/views/issueDetails/groupEventAttachments/index.tsx b/static/app/views/issueDetails/groupEventAttachments/index.tsx
index c733715cc959c8..280ec817f39962 100644
--- a/static/app/views/issueDetails/groupEventAttachments/index.tsx
+++ b/static/app/views/issueDetails/groupEventAttachments/index.tsx
@@ -25,7 +25,7 @@ function GroupEventAttachmentsContainer() {
     isPending: isGroupPending,
     isError: isGroupError,
     refetch: refetchGroup,
-  } = useGroup({groupId: params.groupId});
+  } = useGroup({groupId: params.groupId!});
 
   if (isGroupPending) {
     return <LoadingIndicator />;
diff --git a/static/app/views/issueDetails/groupEventAttachments/useGroupEventAttachments.tsx b/static/app/views/issueDetails/groupEventAttachments/useGroupEventAttachments.tsx
index 101c0c09d9185e..351fb087ac2332 100644
--- a/static/app/views/issueDetails/groupEventAttachments/useGroupEventAttachments.tsx
+++ b/static/app/views/issueDetails/groupEventAttachments/useGroupEventAttachments.tsx
@@ -106,7 +106,7 @@ export function useGroupEventAttachments({
   const hasStreamlinedUI = useHasStreamlinedUI();
   const location = useLocation();
   const organization = useOrganization();
-  const eventQuery = useEventQuery({group});
+  const eventQuery = useEventQuery({groupId: group.id});
   const eventView = useIssueDetailsEventView({group});
 
   const fetchAllAvailable = hasStreamlinedUI ? options?.fetchAllAvailable : true;
diff --git a/static/app/views/issueDetails/groupEventCarousel.spec.tsx b/static/app/views/issueDetails/groupEventCarousel.spec.tsx
index 8f84138d962329..a21544b1bfa8f0 100644
--- a/static/app/views/issueDetails/groupEventCarousel.spec.tsx
+++ b/static/app/views/issueDetails/groupEventCarousel.spec.tsx
@@ -2,16 +2,18 @@ import {ConfigFixture} from 'sentry-fixture/config';
 import {EventFixture} from 'sentry-fixture/event';
 import {GroupFixture} from 'sentry-fixture/group';
 import {OrganizationFixture} from 'sentry-fixture/organization';
+import {RouterFixture} from 'sentry-fixture/routerFixture';
 import {UserFixture} from 'sentry-fixture/user';
 
 import {render, screen, userEvent, within} from 'sentry-test/reactTestingLibrary';
 
 import ConfigStore from 'sentry/stores/configStore';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import * as useMedia from 'sentry/utils/useMedia';
 import {GroupEventCarousel} from 'sentry/views/issueDetails/groupEventCarousel';
 
 describe('GroupEventCarousel', () => {
+  const router = RouterFixture();
+
   const testEvent = EventFixture({
     id: 'event-id',
     size: 7,
@@ -66,12 +68,12 @@ describe('GroupEventCarousel', () => {
     it('can navigate to the oldest event', async () => {
       jest.spyOn(useMedia, 'default').mockReturnValue(true);
 
-      render(<GroupEventCarousel {...defaultProps} />);
+      render(<GroupEventCarousel {...defaultProps} />, {router});
 
       await userEvent.click(screen.getByRole('button', {name: /recommended/i}));
       await userEvent.click(screen.getByRole('option', {name: /oldest/i}));
 
-      expect(browserHistory.push).toHaveBeenCalledWith({
+      expect(router.push).toHaveBeenCalledWith({
         pathname: '/organizations/org-slug/issues/group-id/events/oldest/',
         query: {referrer: 'oldest-event'},
       });
@@ -80,30 +82,27 @@ describe('GroupEventCarousel', () => {
     it('can navigate to the latest event', async () => {
       jest.spyOn(useMedia, 'default').mockReturnValue(true);
 
-      render(<GroupEventCarousel {...defaultProps} />);
+      render(<GroupEventCarousel {...defaultProps} />, {router});
 
       await userEvent.click(screen.getByRole('button', {name: /recommended/i}));
       await userEvent.click(screen.getByRole('option', {name: /latest/i}));
 
-      expect(browserHistory.push).toHaveBeenCalledWith({
+      expect(router.push).toHaveBeenCalledWith({
         pathname: '/organizations/org-slug/issues/group-id/events/latest/',
         query: {referrer: 'latest-event'},
       });
     });
 
     it('can navigate to the recommended event', async () => {
+      const newRouter = RouterFixture({params: {eventId: 'latest'}});
       jest.spyOn(useMedia, 'default').mockReturnValue(true);
 
-      render(<GroupEventCarousel {...defaultProps} />, {
-        router: {
-          params: {eventId: 'latest'},
-        },
-      });
+      render(<GroupEventCarousel {...defaultProps} />, {router: newRouter});
 
       await userEvent.click(screen.getByRole('button', {name: /latest/i}));
       await userEvent.click(screen.getByRole('option', {name: /recommended/i}));
 
-      expect(browserHistory.push).toHaveBeenCalledWith({
+      expect(newRouter.push).toHaveBeenCalledWith({
         pathname: '/organizations/org-slug/issues/group-id/events/recommended/',
         query: {referrer: 'recommended-event'},
       });
diff --git a/static/app/views/issueDetails/groupEventCarousel.tsx b/static/app/views/issueDetails/groupEventCarousel.tsx
index 602153d4eeace1..b2db5a8874b778 100644
--- a/static/app/views/issueDetails/groupEventCarousel.tsx
+++ b/static/app/views/issueDetails/groupEventCarousel.tsx
@@ -234,7 +234,7 @@ type GroupEventActionsProps = {
   projectSlug: string;
 };
 
-export function GroupEventActions({event, group, projectSlug}: GroupEventActionsProps) {
+function GroupEventActions({event, group, projectSlug}: GroupEventActionsProps) {
   const theme = useTheme();
   const xlargeViewport = useMedia(`(min-width: ${theme.breakpoints.xlarge})`);
   const organization = useOrganization();
@@ -251,6 +251,7 @@ export function GroupEventActions({event, group, projectSlug}: GroupEventActions
     trackAnalytics('issue_details.event_json_clicked', {
       organization,
       group_id: parseInt(`${event.groupID}`, 10),
+      streamline: false,
     });
   };
 
@@ -264,12 +265,20 @@ export function GroupEventActions({event, group, projectSlug}: GroupEventActions
         organization,
         ...getAnalyticsDataForGroup(group),
         ...getAnalyticsDataForEvent(event),
+        streamline: false,
       }),
   });
 
   const {onClick: copyEventId} = useCopyToClipboard({
     successMessage: t('Event ID copied to clipboard'),
     text: event.id,
+    onCopy: () =>
+      trackAnalytics('issue_details.copy_event_id_clicked', {
+        organization,
+        ...getAnalyticsDataForGroup(group),
+        ...getAnalyticsDataForEvent(event),
+        streamline: false,
+      }),
   });
 
   return (
diff --git a/static/app/views/issueDetails/groupEventDetails/groupEventDetails.spec.tsx b/static/app/views/issueDetails/groupEventDetails/groupEventDetails.spec.tsx
index 5239843a3fe155..f1462ab0dcb59b 100644
--- a/static/app/views/issueDetails/groupEventDetails/groupEventDetails.spec.tsx
+++ b/static/app/views/issueDetails/groupEventDetails/groupEventDetails.spec.tsx
@@ -19,7 +19,6 @@ import {IssueCategory, IssueType} from 'sentry/types/group';
 import type {InjectedRouter} from 'sentry/types/legacyReactRouter';
 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 GroupEventDetails from 'sentry/views/issueDetails/groupEventDetails/groupEventDetails';
 
@@ -346,7 +345,6 @@ describe('groupEventDetails', () => {
 
   afterEach(function () {
     MockApiClient.clearMockResponses();
-    jest.mocked(browserHistory.replace).mockClear();
   });
 
   it('redirects on switching to an invalid environment selection for event', async function () {
@@ -364,12 +362,12 @@ describe('groupEventDetails', () => {
       router: props.router,
     });
     expect(await screen.findByTestId('group-event-details')).toBeInTheDocument();
-    expect(browserHistory.replace).not.toHaveBeenCalled();
+    expect(props.router.replace).not.toHaveBeenCalled();
 
     props.router.location.query.environment = ['prod'];
     rerender(<GroupEventDetails />);
 
-    await waitFor(() => expect(browserHistory.replace).toHaveBeenCalled());
+    await waitFor(() => expect(props.router.replace).toHaveBeenCalled());
   });
 
   it('does not redirect when switching to a valid environment selection for event', async function () {
@@ -381,13 +379,13 @@ describe('groupEventDetails', () => {
       router: props.router,
     });
 
-    expect(browserHistory.replace).not.toHaveBeenCalled();
+    expect(props.router.replace).not.toHaveBeenCalled();
     props.router.location.query.environment = [];
     rerender(<GroupEventDetails />);
 
     expect(await screen.findByTestId('group-event-details')).toBeInTheDocument();
 
-    expect(browserHistory.replace).not.toHaveBeenCalled();
+    expect(props.router.replace).not.toHaveBeenCalled();
   });
 
   it('displays error on event error', async function () {
@@ -509,7 +507,6 @@ describe('EventCause', () => {
 
   afterEach(function () {
     MockApiClient.clearMockResponses();
-    jest.mocked(browserHistory.replace).mockClear();
   });
 
   it('renders suspect commit', async function () {
diff --git a/static/app/views/issueDetails/groupEventDetails/groupEventDetails.tsx b/static/app/views/issueDetails/groupEventDetails/groupEventDetails.tsx
index a59ed95901ba03..b2e54fc8e65e16 100644
--- a/static/app/views/issueDetails/groupEventDetails/groupEventDetails.tsx
+++ b/static/app/views/issueDetails/groupEventDetails/groupEventDetails.tsx
@@ -16,12 +16,11 @@ import {space} from 'sentry/styles/space';
 import type {Event} from 'sentry/types/event';
 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 {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import {useParams} from 'sentry/utils/useParams';
 import usePrevious from 'sentry/utils/usePrevious';
@@ -44,8 +43,9 @@ import {
 } from '../utils';
 
 function GroupEventDetails() {
-  const organization = useOrganization();
+  const navigate = useNavigate();
   const location = useLocation();
+  const organization = useOrganization();
   const params = useParams<{groupId: string; orgId: string; eventId?: string}>();
   const environments = useEnvironmentsFromUrl();
 
@@ -101,11 +101,12 @@ function GroupEventDetails() {
         !environments.find(env => env === getEventEnvironment(prevEvent as Event));
 
       if (shouldRedirect) {
-        browserHistory.replace(
-          normalizeUrl({
+        navigate(
+          {
             pathname: `/organizations/${organization.slug}/issues/${params.groupId}/`,
             query: location.query,
-          })
+          },
+          {replace: true}
         );
         return;
       }
@@ -117,6 +118,7 @@ function GroupEventDetails() {
     organization.slug,
     params,
     prevEvent,
+    navigate,
   ]);
 
   // Group and project should already be loaded, but we can render a loading state if it's not
@@ -162,13 +164,11 @@ function GroupEventDetails() {
 
   const renderContent = () => {
     if (isLoadingEvent) {
-      if (hasStreamlinedUI) {
-        return <GroupEventDetailsLoading />;
-      }
-      return <LoadingIndicator />;
+      return hasStreamlinedUI ? <GroupEventDetailsLoading /> : <LoadingIndicator />;
     }
 
-    if (isEventError) {
+    // The streamlined UI uses a different error interface
+    if (isEventError && !hasStreamlinedUI) {
       return (
         <GroupEventDetailsLoadingError
           environments={environments}
diff --git a/static/app/views/issueDetails/groupEventDetails/groupEventDetailsContent.tsx b/static/app/views/issueDetails/groupEventDetails/groupEventDetailsContent.tsx
index 7abe655495f2e6..296937a3f4ff45 100644
--- a/static/app/views/issueDetails/groupEventDetails/groupEventDetailsContent.tsx
+++ b/static/app/views/issueDetails/groupEventDetails/groupEventDetailsContent.tsx
@@ -1,4 +1,5 @@
 import {Fragment, lazy, useMemo, useRef} from 'react';
+import {ClassNames} from '@emotion/react';
 import styled from '@emotion/styled';
 
 import {usePrompt} from 'sentry/actionCreators/prompts';
@@ -89,7 +90,7 @@ export function EventDetailsContent({
   group,
   event,
   project,
-}: Required<EventDetailsContentProps>) {
+}: Required<Pick<EventDetailsContentProps, 'group' | 'event' | 'project'>>) {
   const organization = useOrganization();
   const location = useLocation();
   const hasStreamlinedUI = useHasStreamlinedUI();
@@ -228,51 +229,59 @@ export function EventDetailsContent({
         </EntryErrorBoundary>
       )}
       {/* Wrapping all stacktrace components since multiple could appear */}
-      <GuideAnchor
-        target="stacktrace"
-        position="top"
-        disabled={
-          !(
-            defined(eventEntries[EntryType.EXCEPTION]) ||
-            defined(eventEntries[EntryType.STACKTRACE]) ||
-            defined(eventEntries[EntryType.THREADS])
-          )
-        }
-      >
-        {defined(eventEntries[EntryType.EXCEPTION]) && (
-          <EntryErrorBoundary type={EntryType.EXCEPTION}>
-            <Exception
-              event={event}
-              data={eventEntries[EntryType.EXCEPTION].data}
-              projectSlug={project.slug}
-              group={group}
-              groupingCurrentLevel={groupingCurrentLevel}
-            />
-          </EntryErrorBoundary>
+      <ClassNames>
+        {({css}) => (
+          <GuideAnchor
+            target="stacktrace"
+            position="top"
+            disabled={
+              !(
+                defined(eventEntries[EntryType.EXCEPTION]) ||
+                defined(eventEntries[EntryType.STACKTRACE]) ||
+                defined(eventEntries[EntryType.THREADS])
+              )
+            }
+            // Prevent the container span from shrinking the content
+            containerClassName={css`
+              display: block !important;
+            `}
+          >
+            {defined(eventEntries[EntryType.EXCEPTION]) && (
+              <EntryErrorBoundary type={EntryType.EXCEPTION}>
+                <Exception
+                  event={event}
+                  data={eventEntries[EntryType.EXCEPTION].data}
+                  projectSlug={project.slug}
+                  group={group}
+                  groupingCurrentLevel={groupingCurrentLevel}
+                />
+              </EntryErrorBoundary>
+            )}
+            {issueTypeConfig.stacktrace.enabled &&
+              defined(eventEntries[EntryType.STACKTRACE]) && (
+                <EntryErrorBoundary type={EntryType.STACKTRACE}>
+                  <StackTrace
+                    event={event}
+                    data={eventEntries[EntryType.STACKTRACE].data}
+                    projectSlug={projectSlug}
+                    groupingCurrentLevel={groupingCurrentLevel}
+                  />
+                </EntryErrorBoundary>
+              )}
+            {defined(eventEntries[EntryType.THREADS]) && (
+              <EntryErrorBoundary type={EntryType.THREADS}>
+                <Threads
+                  event={event}
+                  data={eventEntries[EntryType.THREADS].data}
+                  projectSlug={project.slug}
+                  groupingCurrentLevel={groupingCurrentLevel}
+                  group={group}
+                />
+              </EntryErrorBoundary>
+            )}
+          </GuideAnchor>
         )}
-        {issueTypeConfig.stacktrace.enabled &&
-          defined(eventEntries[EntryType.STACKTRACE]) && (
-            <EntryErrorBoundary type={EntryType.STACKTRACE}>
-              <StackTrace
-                event={event}
-                data={eventEntries[EntryType.STACKTRACE].data}
-                projectSlug={projectSlug}
-                groupingCurrentLevel={groupingCurrentLevel}
-              />
-            </EntryErrorBoundary>
-          )}
-        {defined(eventEntries[EntryType.THREADS]) && (
-          <EntryErrorBoundary type={EntryType.THREADS}>
-            <Threads
-              event={event}
-              data={eventEntries[EntryType.THREADS].data}
-              projectSlug={project.slug}
-              groupingCurrentLevel={groupingCurrentLevel}
-              group={group}
-            />
-          </EntryErrorBoundary>
-        )}
-      </GuideAnchor>
+      </ClassNames>
       {defined(eventEntries[EntryType.DEBUGMETA]) && (
         <EntryErrorBoundary type={EntryType.DEBUGMETA}>
           <DebugMeta
@@ -454,6 +463,10 @@ export default function GroupEventDetailsContent({
 }: EventDetailsContentProps) {
   const hasStreamlinedUI = useHasStreamlinedUI();
 
+  if (hasStreamlinedUI) {
+    return <EventDetails event={event} group={group} project={project} />;
+  }
+
   if (!event) {
     return (
       <NotFoundMessage>
@@ -462,11 +475,7 @@ export default function GroupEventDetailsContent({
     );
   }
 
-  return hasStreamlinedUI ? (
-    <EventDetails event={event} group={group} project={project} />
-  ) : (
-    <EventDetailsContent group={group} event={event} project={project} />
-  );
+  return <EventDetailsContent group={group} event={event} project={project} />;
 }
 
 /**
diff --git a/static/app/views/issueDetails/groupEvents.spec.tsx b/static/app/views/issueDetails/groupEvents.spec.tsx
index 83592306050fac..38caab2ae571b9 100644
--- a/static/app/views/issueDetails/groupEvents.spec.tsx
+++ b/static/app/views/issueDetails/groupEvents.spec.tsx
@@ -13,7 +13,6 @@ import {
 
 import {type Group, IssueCategory} from 'sentry/types/group';
 import type {Organization} from 'sentry/types/organization';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import GroupEvents from 'sentry/views/issueDetails/groupEvents';
 
 describe('groupEvents', () => {
@@ -143,7 +142,7 @@ describe('groupEvents', () => {
     await userEvent.keyboard('{enter}');
 
     await waitFor(() => {
-      expect(browserHistory.push).toHaveBeenCalledWith(
+      expect(router.push).toHaveBeenCalledWith(
         expect.objectContaining({
           query: {query: 'foo'},
         })
diff --git a/static/app/views/issueDetails/groupMerged/index.spec.tsx b/static/app/views/issueDetails/groupMerged/index.spec.tsx
index f317f53ceb3f03..f2e4701a7b93cb 100644
--- a/static/app/views/issueDetails/groupMerged/index.spec.tsx
+++ b/static/app/views/issueDetails/groupMerged/index.spec.tsx
@@ -72,11 +72,14 @@ describe('Issues -> Merged View', function () {
       {router, organization}
     );
 
-    expect(await screen.findByText(mockData.merged[0].id)).toBeInTheDocument();
+    expect(await screen.findByText(mockData.merged[0]!.id)).toBeInTheDocument();
 
     const title = await screen.findByText('Fingerprints included in this issue');
     expect(title.parentElement).toHaveTextContent(
       'Fingerprints included in this issue (2)'
     );
+
+    const links = await screen.findAllByRole('button', {name: 'View latest event'});
+    expect(links).toHaveLength(mockData.merged.length);
   });
 });
diff --git a/static/app/views/issueDetails/groupMerged/mergedItem.tsx b/static/app/views/issueDetails/groupMerged/mergedItem.tsx
index 7b6a4f5a84329d..92a35839f84365 100644
--- a/static/app/views/issueDetails/groupMerged/mergedItem.tsx
+++ b/static/app/views/issueDetails/groupMerged/mergedItem.tsx
@@ -1,44 +1,37 @@
-import {Component} from 'react';
+import {useEffect, useState} from 'react';
 import styled from '@emotion/styled';
 
-import {Button} from 'sentry/components/button';
+import {Button, LinkButton} from 'sentry/components/button';
 import Checkbox from 'sentry/components/checkbox';
+import {Flex} from 'sentry/components/container/flex';
 import EventOrGroupHeader from 'sentry/components/eventOrGroupHeader';
 import {Tooltip} from 'sentry/components/tooltip';
-import {IconChevron} from 'sentry/icons';
+import {IconChevron, IconLink} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import type {Fingerprint} from 'sentry/stores/groupingStore';
 import GroupingStore from 'sentry/stores/groupingStore';
 import {space} from 'sentry/styles/space';
-import type {Organization} from 'sentry/types/organization';
+import {useLocation} from 'sentry/utils/useLocation';
+import useOrganization from 'sentry/utils/useOrganization';
+import {createIssueLink} from 'sentry/views/issueList/utils';
 
-type Props = {
+interface Props {
   fingerprint: Fingerprint;
-  organization: Organization;
   totalFingerprint: number;
-};
-
-type State = {
-  busy: boolean;
-  checked: boolean;
-  collapsed: boolean;
-};
-
-class MergedItem extends Component<Props, State> {
-  state: State = {
-    collapsed: false,
-    checked: false,
-    busy: false,
-  };
+}
 
-  listener = GroupingStore.listen(data => this.onGroupChange(data), undefined);
+function MergedItem({fingerprint, totalFingerprint}: Props) {
+  const organization = useOrganization();
+  const location = useLocation();
+  const [busy, setBusy] = useState(false);
+  const [collapsed, setCollapsed] = useState(false);
+  const [checked, setChecked] = useState(false);
 
-  onGroupChange = ({unmergeState}) => {
+  function onGroupChange({unmergeState}) {
     if (!unmergeState) {
       return;
     }
 
-    const {fingerprint} = this.props;
     const stateForId = unmergeState.has(fingerprint.id)
       ? unmergeState.get(fingerprint.id)
       : undefined;
@@ -48,42 +41,37 @@ class MergedItem extends Component<Props, State> {
     }
 
     Object.keys(stateForId).forEach(key => {
-      if (stateForId[key] === this.state[key]) {
-        return;
+      if (key === 'collapsed') {
+        setCollapsed(Boolean(stateForId[key]));
+      } else if (key === 'checked') {
+        setChecked(Boolean(stateForId[key]));
+      } else if (key === 'busy') {
+        setBusy(Boolean(stateForId[key]));
       }
-
-      this.setState(prevState => ({...prevState, [key]: stateForId[key]}));
     });
-  };
+  }
 
-  handleToggleEvents = () => {
-    const {fingerprint} = this.props;
+  function handleToggleEvents() {
     GroupingStore.onToggleCollapseFingerprint(fingerprint.id);
-  };
-
-  // Disable default behavior of toggling checkbox
-  handleLabelClick(event: React.MouseEvent) {
-    event.preventDefault();
   }
 
-  handleToggle = () => {
-    const {fingerprint} = this.props;
+  function handleToggle() {
     const {latestEvent} = fingerprint;
 
-    if (this.state.busy) {
+    if (busy) {
       return;
     }
 
     // clicking anywhere in the row will toggle the checkbox
     GroupingStore.onToggleUnmerge([fingerprint.id, latestEvent.id]);
-  };
+  }
 
-  handleCheckClick() {
+  function handleCheckClick() {
     // noop because of react warning about being a controlled input without `onChange`
     // we handle change via row click
   }
 
-  renderFingerprint(id: string, label?: string) {
+  function renderFingerprint(id: string, label?: string) {
     if (!label) {
       return id;
     }
@@ -95,55 +83,77 @@ class MergedItem extends Component<Props, State> {
     );
   }
 
-  render() {
-    const {fingerprint, organization, totalFingerprint} = this.props;
-    const {latestEvent, id, label} = fingerprint;
-    const {collapsed, busy, checked} = this.state;
-    const checkboxDisabled = busy || totalFingerprint === 1;
-
-    // `latestEvent` can be null if last event w/ fingerprint is not within retention period
-    return (
-      <MergedGroup busy={busy}>
-        <Controls expanded={!collapsed}>
-          <FingerprintLabel onClick={this.handleToggle}>
-            <Tooltip
-              containerDisplayMode="flex"
-              disabled={!checkboxDisabled}
-              title={
-                checkboxDisabled && totalFingerprint === 1
-                  ? t('To check, the list must contain 2 or more items')
-                  : undefined
-              }
-            >
-              <Checkbox
-                value={id}
-                checked={checked}
-                disabled={checkboxDisabled}
-                onChange={this.handleCheckClick}
+  useEffect(() => {
+    const teardown = GroupingStore.listen(data => onGroupChange(data), undefined);
+    return () => {
+      teardown();
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  const {latestEvent, id, label} = fingerprint;
+  const checkboxDisabled = busy || totalFingerprint === 1;
+
+  const issueLink = latestEvent
+    ? createIssueLink({
+        organization,
+        location,
+        data: latestEvent,
+        eventId: latestEvent.id,
+        referrer: 'merged-item',
+      })
+    : null;
+
+  // `latestEvent` can be null if last event w/ fingerprint is not within retention period
+  return (
+    <MergedGroup busy={busy}>
+      <Controls expanded={!collapsed}>
+        <FingerprintLabel onClick={handleToggle}>
+          <Tooltip
+            containerDisplayMode="flex"
+            disabled={!checkboxDisabled}
+            title={
+              checkboxDisabled && totalFingerprint === 1
+                ? t('To check, the list must contain 2 or more items')
+                : undefined
+            }
+          >
+            <Checkbox
+              value={id}
+              checked={checked}
+              disabled={checkboxDisabled}
+              onChange={handleCheckClick}
+              size="xs"
+            />
+          </Tooltip>
+          {renderFingerprint(id, label)}
+        </FingerprintLabel>
+
+        <Button
+          aria-label={
+            collapsed ? t('Show %s fingerprints', id) : t('Collapse %s fingerprints', id)
+          }
+          size="zero"
+          borderless
+          icon={<IconChevron direction={collapsed ? 'down' : 'up'} size="xs" />}
+          onClick={handleToggleEvents}
+        />
+      </Controls>
+
+      {!collapsed && (
+        <MergedEventList>
+          {issueLink ? (
+            <Flex align="center" gap={space(0.5)}>
+              <LinkButton
+                to={issueLink}
+                icon={<IconLink color={'linkColor'} />}
+                title={t('View latest event')}
+                aria-label={t('View latest event')}
+                borderless
                 size="xs"
+                style={{marginLeft: space(1)}}
               />
-            </Tooltip>
-
-            {this.renderFingerprint(id, label)}
-          </FingerprintLabel>
-
-          <Button
-            aria-label={
-              collapsed
-                ? t('Show %s fingerprints', id)
-                : t('Collapse %s fingerprints', id)
-            }
-            size="zero"
-            borderless
-            icon={<IconChevron direction={collapsed ? 'down' : 'up'} size="xs" />}
-            onClick={this.handleToggleEvents}
-          />
-        </Controls>
-
-        {!collapsed && (
-          <MergedEventList className="event-list">
-            {latestEvent && (
-              <EventDetails className="event-details">
+              <EventDetails>
                 <EventOrGroupHeader
                   data={latestEvent}
                   organization={organization}
@@ -152,12 +162,12 @@ class MergedItem extends Component<Props, State> {
                   source="merged-item"
                 />
               </EventDetails>
-            )}
-          </MergedEventList>
-        )}
-      </MergedGroup>
-    );
-  }
+            </Flex>
+          ) : null}
+        </MergedEventList>
+      )}
+    </MergedGroup>
+  );
 }
 
 const MergedGroup = styled('div')<{busy: boolean}>`
@@ -202,10 +212,7 @@ const MergedEventList = styled('div')`
 const EventDetails = styled('div')`
   display: flex;
   justify-content: space-between;
-
-  .event-list & {
-    padding: ${space(1)};
-  }
+  padding: ${space(1)};
 `;
 
 export default MergedItem;
diff --git a/static/app/views/issueDetails/groupMerged/mergedList.tsx b/static/app/views/issueDetails/groupMerged/mergedList.tsx
index ea8d566e5a3f7f..3d8875fadda0ac 100644
--- a/static/app/views/issueDetails/groupMerged/mergedList.tsx
+++ b/static/app/views/issueDetails/groupMerged/mergedList.tsx
@@ -70,7 +70,6 @@ function MergedList({
           {fingerprintsWithLatestEvent.map(fingerprint => (
             <MergedItem
               key={fingerprint.id}
-              organization={organization}
               fingerprint={fingerprint}
               totalFingerprint={fingerprintsWithLatestEvent.length}
             />
diff --git a/static/app/views/issueDetails/groupRelatedIssues/index.tsx b/static/app/views/issueDetails/groupRelatedIssues/index.tsx
index 5f825c1dd9ffc8..ee9615fe648738 100644
--- a/static/app/views/issueDetails/groupRelatedIssues/index.tsx
+++ b/static/app/views/issueDetails/groupRelatedIssues/index.tsx
@@ -114,7 +114,7 @@ function RelatedIssuesSection({
           </HeaderWrapper>
           <GroupList
             orgSlug={orgSlug}
-            queryParams={{query: query}}
+            queryParams={{query}}
             source="similar-issues-tab"
             canSelectGroups={false}
             withChart={false}
diff --git a/static/app/views/issueDetails/groupReplays/groupReplays.spec.tsx b/static/app/views/issueDetails/groupReplays/groupReplays.spec.tsx
index c437c1de6a4b77..1691d46f2695c7 100644
--- a/static/app/views/issueDetails/groupReplays/groupReplays.spec.tsx
+++ b/static/app/views/issueDetails/groupReplays/groupReplays.spec.tsx
@@ -10,8 +10,7 @@ import {render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrar
 import {resetMockDate, setMockDate} from 'sentry-test/utils';
 
 import ProjectsStore from 'sentry/stores/projectsStore';
-import {browserHistory} from 'sentry/utils/browserHistory';
-import useReplayReader from 'sentry/utils/replays/hooks/useReplayReader';
+import useLoadReplayReader from 'sentry/utils/replays/hooks/useLoadReplayReader';
 import ReplayReader from 'sentry/utils/replays/replayReader';
 import GroupReplays from 'sentry/views/issueDetails/groupReplays';
 
@@ -21,8 +20,8 @@ const mockReplayUrl = '/organizations/org-slug/replays/';
 const REPLAY_ID_1 = '346789a703f6454384f1de473b8b9fcc';
 const REPLAY_ID_2 = 'b05dae9b6be54d21a4d5ad9f8f02b780';
 
-jest.mock('sentry/utils/replays/hooks/useReplayReader');
-const mockUseReplayReader = jest.mocked(useReplayReader);
+jest.mock('sentry/utils/replays/hooks/useLoadReplayReader');
+const mockUseLoadReplayReader = jest.mocked(useLoadReplayReader);
 
 const mockEventTimestamp = new Date('2022-09-22T16:59:41Z');
 const mockEventTimestampMs = mockEventTimestamp.getTime();
@@ -50,7 +49,7 @@ const mockReplay = ReplayReader.factory({
   },
 });
 
-mockUseReplayReader.mockImplementation(() => {
+mockUseLoadReplayReader.mockImplementation(() => {
   return {
     attachments: [],
     errors: [],
@@ -167,38 +166,38 @@ describe('GroupReplays', () => {
             },
           })
         );
-        // Expect api path to have the correct query params
-        expect(mockReplayApi).toHaveBeenCalledWith(
-          mockReplayUrl,
-          expect.objectContaining({
-            query: expect.objectContaining({
-              environment: [],
-              field: [
-                'activity',
-                'browser',
-                'count_dead_clicks',
-                'count_errors',
-                'count_rage_clicks',
-                'duration',
-                'finished_at',
-                'has_viewed',
-                'id',
-                'is_archived',
-                'os',
-                'project_id',
-                'started_at',
-                'user',
-              ],
-              per_page: 50,
-              project: -1,
-              queryReferrer: 'issueReplays',
-              query: `id:[${REPLAY_ID_1},${REPLAY_ID_2}]`,
-              sort: '-started_at',
-              statsPeriod: '90d',
-            }),
-          })
-        );
       });
+      // Expect api path to have the correct query params
+      expect(mockReplayApi).toHaveBeenCalledWith(
+        mockReplayUrl,
+        expect.objectContaining({
+          query: expect.objectContaining({
+            environment: [],
+            field: [
+              'activity',
+              'browser',
+              'count_dead_clicks',
+              'count_errors',
+              'count_rage_clicks',
+              'duration',
+              'finished_at',
+              'has_viewed',
+              'id',
+              'is_archived',
+              'os',
+              'project_id',
+              'started_at',
+              'user',
+            ],
+            per_page: 50,
+            project: -1,
+            queryReferrer: 'issueReplays',
+            query: `id:[${REPLAY_ID_1},${REPLAY_ID_2}]`,
+            sort: '-started_at',
+            statsPeriod: '90d',
+          }),
+        })
+      );
     });
 
     it('should show empty message when no replays are found', async () => {
@@ -261,8 +260,8 @@ describe('GroupReplays', () => {
 
       await waitFor(() => {
         expect(mockReplayCountApi).toHaveBeenCalled();
-        expect(mockReplayApi).toHaveBeenCalledTimes(1);
       });
+      expect(mockReplayApi).toHaveBeenCalledTimes(1);
     });
 
     it('should display default error message when api call fails without a body', async () => {
@@ -294,8 +293,8 @@ describe('GroupReplays', () => {
 
       await waitFor(() => {
         expect(mockReplayCountApi).toHaveBeenCalled();
-        expect(mockReplayApi).toHaveBeenCalledTimes(1);
       });
+      expect(mockReplayApi).toHaveBeenCalledTimes(1);
     });
 
     it('should show loading indicator when loading replays', async () => {
@@ -324,8 +323,8 @@ describe('GroupReplays', () => {
       expect(screen.getByTestId('loading-indicator')).toBeInTheDocument();
       await waitFor(() => {
         expect(mockReplayCountApi).toHaveBeenCalled();
-        expect(mockReplayApi).toHaveBeenCalledTimes(1);
       });
+      expect(mockReplayApi).toHaveBeenCalledTimes(1);
     });
 
     it('should show a list of replays and have the correct values', async () => {
@@ -386,8 +385,8 @@ describe('GroupReplays', () => {
 
       await waitFor(() => {
         expect(mockReplayCountApi).toHaveBeenCalled();
-        expect(mockReplayApi).toHaveBeenCalledTimes(1);
       });
+      expect(mockReplayApi).toHaveBeenCalledTimes(1);
 
       // Expect the table to have 2 rows
       expect(await screen.findAllByText('testDisplayName')).toHaveLength(2);
@@ -573,14 +572,13 @@ describe('GroupReplays', () => {
         );
       });
 
-      const mockReplace = jest.mocked(browserHistory.replace);
       const replayPlayPlause = (
         await screen.findAllByTestId('replay-table-play-button')
-      )[0];
+      )[0]!;
       await userEvent.click(replayPlayPlause);
 
       await waitFor(() =>
-        expect(mockReplace).toHaveBeenCalledWith(
+        expect(router.replace).toHaveBeenCalledWith(
           expect.objectContaining({
             pathname: '/organizations/org-slug/replays/',
             query: {
diff --git a/static/app/views/issueDetails/groupReplays/groupReplays.tsx b/static/app/views/issueDetails/groupReplays/groupReplays.tsx
index a5321df37b74ac..5397942912ea89 100644
--- a/static/app/views/issueDetails/groupReplays/groupReplays.tsx
+++ b/static/app/views/issueDetails/groupReplays/groupReplays.tsx
@@ -16,8 +16,8 @@ import {trackAnalytics} from 'sentry/utils/analytics';
 import {browserHistory} from 'sentry/utils/browserHistory';
 import type EventView from 'sentry/utils/discover/eventView';
 import useReplayCountForIssues from 'sentry/utils/replayCount/useReplayCountForIssues';
+import useLoadReplayReader from 'sentry/utils/replays/hooks/useLoadReplayReader';
 import useReplayList from 'sentry/utils/replays/hooks/useReplayList';
-import useReplayReader from 'sentry/utils/replays/hooks/useReplayReader';
 import {useLocation} from 'sentry/utils/useLocation';
 import useOrganization from 'sentry/utils/useOrganization';
 import useUrlParams from 'sentry/utils/useUrlParams';
@@ -132,7 +132,7 @@ function GroupReplaysTableInner({
   overlayContent?: React.ReactNode;
 }) {
   const orgSlug = organization.slug;
-  const {fetching, replay} = useReplayReader({
+  const {fetching, replay} = useLoadReplayReader({
     orgSlug,
     replaySlug,
     group,
diff --git a/static/app/views/issueDetails/groupReplays/replayClipPreviewWrapper.tsx b/static/app/views/issueDetails/groupReplays/replayClipPreviewWrapper.tsx
index d6788562c0f02f..6e844c5362cd35 100644
--- a/static/app/views/issueDetails/groupReplays/replayClipPreviewWrapper.tsx
+++ b/static/app/views/issueDetails/groupReplays/replayClipPreviewWrapper.tsx
@@ -1,7 +1,7 @@
 import ReplayClipPreviewPlayer from 'sentry/components/events/eventReplay/replayClipPreviewPlayer';
 import {useReplayContext} from 'sentry/components/replays/replayContext';
 import type {Group} from 'sentry/types/group';
-import useReplayReader from 'sentry/utils/replays/hooks/useReplayReader';
+import useLoadReplayReader from 'sentry/utils/replays/hooks/useLoadReplayReader';
 import type {ReplayColumn} from 'sentry/views/replays/replayTable/types';
 import type {ReplayListRecord} from 'sentry/views/replays/types';
 
@@ -20,7 +20,7 @@ type Props = {
 export function ReplayClipPreviewWrapper(props: Props) {
   const {selectedReplayIndex} = props;
   const {analyticsContext} = useReplayContext();
-  const replayReaderData = useReplayReader({
+  const replayReaderData = useLoadReplayReader({
     orgSlug: props.orgSlug,
     replaySlug: props.replaySlug,
     group: props.group,
diff --git a/static/app/views/issueDetails/groupSidebar.spec.tsx b/static/app/views/issueDetails/groupSidebar.spec.tsx
index 355f7ec54a7fcd..3ab3b01dd4c704 100644
--- a/static/app/views/issueDetails/groupSidebar.spec.tsx
+++ b/static/app/views/issueDetails/groupSidebar.spec.tsx
@@ -238,7 +238,7 @@ describe('GroupSidebar', function () {
     expect(screen.queryByText('#team-slug')).not.toBeInTheDocument();
 
     await userEvent.click(
-      screen.getAllByRole('button', {name: 'Expand Participants'})[0]
+      screen.getAllByRole('button', {name: 'Expand Participants'})[0]!
     );
 
     await waitFor(() => expect(screen.getByText('#team-slug')).toBeVisible());
diff --git a/static/app/views/issueDetails/groupSimilarIssues/similarStackTrace/index.tsx b/static/app/views/issueDetails/groupSimilarIssues/similarStackTrace/index.tsx
index d6768927e767f6..6313910f7a58f6 100644
--- a/static/app/views/issueDetails/groupSimilarIssues/similarStackTrace/index.tsx
+++ b/static/app/views/issueDetails/groupSimilarIssues/similarStackTrace/index.tsx
@@ -165,7 +165,7 @@ function SimilarStackTrace({project}: Props) {
     GroupingStore.onMerge({
       params,
       query: location.query.query as string,
-      projectId: firstIssue.issue.project.slug,
+      projectId: firstIssue!.issue.project.slug,
     });
   }, [params, location.query, items]);
 
diff --git a/static/app/views/issueDetails/groupSimilarIssues/similarStackTrace/item.tsx b/static/app/views/issueDetails/groupSimilarIssues/similarStackTrace/item.tsx
index 27cbab8bfde3ad..26dd2c1db604b9 100644
--- a/static/app/views/issueDetails/groupSimilarIssues/similarStackTrace/item.tsx
+++ b/static/app/views/issueDetails/groupSimilarIssues/similarStackTrace/item.tsx
@@ -160,7 +160,7 @@ class Item extends Component<Props, State> {
             // If hasSimilarityEmbeddingsFeature is on, translate similarity score in range 0.9-1 to score between 1-5
             if (hasSimilarityEmbeddingsFeature) {
               for (let i = 0; i <= similarityEmbeddingScoreValues.length; i++) {
-                if (scoreValue <= similarityEmbeddingScoreValues[i]) {
+                if (scoreValue <= similarityEmbeddingScoreValues[i]!) {
                   scoreValue = i;
                   break;
                 }
diff --git a/static/app/views/issueDetails/groupTagValues.spec.tsx b/static/app/views/issueDetails/groupTagValues.spec.tsx
index a25096c8ac0d75..4bb98d37758495 100644
--- a/static/app/views/issueDetails/groupTagValues.spec.tsx
+++ b/static/app/views/issueDetails/groupTagValues.spec.tsx
@@ -13,7 +13,6 @@ import {
 } from 'sentry-test/reactTestingLibrary';
 
 import ProjectsStore from 'sentry/stores/projectsStore';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {GroupTagValues} from 'sentry/views/issueDetails/groupTagValues';
 
 describe('GroupTagValues', () => {
@@ -92,7 +91,7 @@ describe('GroupTagValues', () => {
     // Clicking next button loads page with query param ?cursor=0:100:0
     await userEvent.click(screen.getByRole('button', {name: 'Next'}));
     await waitFor(() => {
-      expect(browserHistory.push).toHaveBeenCalledWith(
+      expect(router.push).toHaveBeenCalledWith(
         expect.objectContaining({query: expect.objectContaining({cursor: '0:100:0'})})
       );
     });
diff --git a/static/app/views/issueDetails/groupTags/groupTagsDrawer.tsx b/static/app/views/issueDetails/groupTags/groupTagsDrawer.tsx
index 38dcb40b115316..028e59145f037a 100644
--- a/static/app/views/issueDetails/groupTags/groupTagsDrawer.tsx
+++ b/static/app/views/issueDetails/groupTags/groupTagsDrawer.tsx
@@ -12,7 +12,6 @@ import {
   EventDrawerContainer,
   EventDrawerHeader,
   EventNavigator,
-  Header,
   NavigationCrumbs,
   SearchInput,
   ShortId,
@@ -115,7 +114,13 @@ export function GroupTagsDrawer({group}: {group: Group}) {
         {
           key: 'export-page',
           label: t('Export Page to CSV'),
-          to: `${organization.slug}/${project.slug}/issues/${group.id}/tags/${tagKey}/export/`,
+          // TODO(issues): Dropdown menu doesn't support hrefs yet
+          onAction: () => {
+            window.open(
+              `/${organization.slug}/${project.slug}/issues/${group.id}/tags/${tagKey}/export/`,
+              '_blank'
+            );
+          },
         },
         {
           key: 'export-all',
@@ -211,3 +216,10 @@ const Container = styled('div')`
   gap: ${space(2)};
   margin-bottom: ${space(2)};
 `;
+
+const Header = styled('h3')`
+  ${p => p.theme.overflowEllipsis};
+  font-size: ${p => p.theme.fontSizeExtraLarge};
+  font-weight: ${p => p.theme.fontWeightBold};
+  margin: 0;
+`;
diff --git a/static/app/views/issueDetails/groupTags/tagDetailsDrawerContent.spec.tsx b/static/app/views/issueDetails/groupTags/tagDetailsDrawerContent.spec.tsx
index 384db0225c935d..548377b2b422e5 100644
--- a/static/app/views/issueDetails/groupTags/tagDetailsDrawerContent.spec.tsx
+++ b/static/app/views/issueDetails/groupTags/tagDetailsDrawerContent.spec.tsx
@@ -1,4 +1,5 @@
 import {GroupFixture} from 'sentry-fixture/group';
+import {OrganizationFixture} from 'sentry-fixture/organization';
 import {TagsFixture} from 'sentry-fixture/tags';
 import {TagValuesFixture} from 'sentry-fixture/tagvalues';
 
@@ -62,18 +63,28 @@ describe('TagDetailsDrawerContent', () => {
     });
     render(<TagDetailsDrawerContent group={group} />, {router});
 
-    await waitForElementToBeRemoved(() => screen.getByTestId('loading-indicator'));
+    await waitForElementToBeRemoved(() => screen.queryByTestId('loading-indicator'));
 
     expect(screen.getByText('Value')).toBeInTheDocument();
     expect(screen.getByText('Last Seen')).toBeInTheDocument();
     expect(screen.getByText('Count')).toBeInTheDocument();
-    expect(screen.getByText('Percentage')).toBeInTheDocument();
+    expect(screen.getByText('Share')).toBeInTheDocument();
 
     // Affected user column
     expect(screen.getByText('David Cramer')).toBeInTheDocument();
     expect(screen.getByText('17%')).toBeInTheDocument();
     // Count column
     expect(screen.getByText('3')).toBeInTheDocument();
+
+    // Displays dropdown menu
+    await userEvent.hover(screen.getByText('David Cramer'));
+    expect(
+      screen.getByRole('button', {name: 'Tag Value Actions Menu'})
+    ).toBeInTheDocument();
+    await userEvent.click(screen.getByRole('button', {name: 'Tag Value Actions Menu'}));
+    expect(
+      await screen.findByRole('menuitemradio', {name: 'Copy tag value to clipboard'})
+    ).toBeInTheDocument();
   });
 
   it('can page through tag values', async () => {
@@ -90,7 +101,7 @@ describe('TagDetailsDrawerContent', () => {
     });
     render(<TagDetailsDrawerContent group={group} />, {router});
 
-    await waitForElementToBeRemoved(() => screen.getByTestId('loading-indicator'));
+    await waitForElementToBeRemoved(() => screen.queryByTestId('loading-indicator'));
 
     expect(screen.getByRole('button', {name: 'Previous'})).toBeDisabled();
     expect(screen.getByRole('button', {name: 'Next'})).toBeEnabled();
@@ -127,6 +138,41 @@ describe('TagDetailsDrawerContent', () => {
     });
   });
 
+  it('navigates to discover with issue + tag query', async () => {
+    const {router} = init('user');
+    const discoverOrganization = OrganizationFixture({
+      features: ['discover-basic'],
+    });
+
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/issues/1/tags/user/values/',
+      body: TagValuesFixture(),
+    });
+    render(<TagDetailsDrawerContent group={group} />, {
+      router,
+      organization: discoverOrganization,
+    });
+
+    await userEvent.click(
+      await screen.findByRole('button', {name: 'Tag Value Actions Menu'})
+    );
+    await userEvent.click(await screen.findByRole('link', {name: 'Open in Discover'}));
+
+    expect(router.push).toHaveBeenCalledWith({
+      pathname: '/organizations/org-slug/discover/results/',
+      query: {
+        dataset: 'errors',
+        field: ['title', 'release', 'environment', 'user.display', 'timestamp'],
+        interval: '4h',
+        name: 'RequestError: GET /issues/ 404',
+        project: '2',
+        query: 'issue:JAVASCRIPT-6QS user.username:david',
+        statsPeriod: '14d',
+        yAxis: ['count()', 'count_unique(user)'],
+      },
+    });
+  });
+
   it('renders an error message if tag values request fails', async () => {
     const {router} = init('user');
 
diff --git a/static/app/views/issueDetails/groupTags/tagDetailsDrawerContent.tsx b/static/app/views/issueDetails/groupTags/tagDetailsDrawerContent.tsx
index 22514f4d7fdffe..b5539c9c61b58b 100644
--- a/static/app/views/issueDetails/groupTags/tagDetailsDrawerContent.tsx
+++ b/static/app/views/issueDetails/groupTags/tagDetailsDrawerContent.tsx
@@ -1,5 +1,4 @@
 import {Fragment, useState} from 'react';
-import {css} from '@emotion/react';
 import styled from '@emotion/styled';
 import type {LocationDescriptor} from 'history';
 
@@ -18,9 +17,10 @@ import {IconArrow, IconEllipsis, IconMail, IconOpen} from 'sentry/icons';
 import {t, tct} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {Group, Tag, TagValue} from 'sentry/types/group';
-import {parseCursor} from 'sentry/utils/cursor';
+import {percent} from 'sentry/utils';
 import {SavedQueryDatasets} from 'sentry/utils/discover/types';
 import {isUrl} from 'sentry/utils/string/isUrl';
+import useCopyToClipboard from 'sentry/utils/useCopyToClipboard';
 import {useLocation} from 'sentry/utils/useLocation';
 import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
@@ -68,15 +68,8 @@ export function TagDetailsDrawerContent({group}: {group: Group}) {
   const isError = tagValuesIsError || tagIsError;
   const isPending = tagValuesIsPending || tagIsPending;
 
-  const currentCursor = parseCursor(location.query?.tagDrawerCursor);
-  const start = currentCursor?.offset ?? 0;
-  const pageCount = tagValues?.length ?? 0;
-
   const {cursor: _cursor, page: _page, ...currentQuery} = location.query;
-
-  const paginationCaption = tct('Showing [start]-[end] of [count]', {
-    start: start.toLocaleString(),
-    end: (start + pageCount).toLocaleString(),
+  const paginationCaption = tct('[count] results', {
     count: (tag?.uniqueValues ?? 0).toLocaleString(),
   });
 
@@ -120,7 +113,7 @@ export function TagDetailsDrawerContent({group}: {group: Group}) {
               {sort === 'count' && sortArrow}
               {t('Count')}
             </ColumnSort>
-            <ColumnTitle>{t('Percentage')}</ColumnTitle>
+            <ColumnTitle>{t('Share')}</ColumnTitle>
           </Header>
           <Body>
             {tagValues.map((tv, i) => (
@@ -162,70 +155,32 @@ function TagDetailsRow({
   tagValue: TagValue;
 }) {
   const organization = useOrganization();
-  const [isHovered, setIsHovered] = useState(false);
+
   const key = tagValue.key ?? tag.key;
   const query = {query: tagValue.query || `${key}:"${tagValue.value}"`};
-  const eventView = useIssueDetailsEventView({group, queryProps: query});
   const allEventsLocation = {
     pathname: `/organizations/${organization.slug}/issues/${group.id}/events/`,
     query,
   };
+  const percentage = percent(tagValue.count ?? 0, tag.totalValues ?? 0);
+  const displayPercentage = percentage < 1 ? '<1%' : `${percentage.toFixed(0)}%`;
 
   return (
-    <Row onMouseEnter={() => setIsHovered(true)} onMouseLeave={() => setIsHovered(false)}>
+    <Row>
       <TagDetailsValue
         valueLocation={allEventsLocation}
         tagKey={key}
         tagValue={tagValue}
       />
       <OverflowTimeSince date={tagValue.lastSeen} />
-      <div>{tagValue.count.toLocaleString()}</div>
+      <RightAlignedValue>{tagValue.count.toLocaleString()}</RightAlignedValue>
+      <RightAlignedValue>{displayPercentage}</RightAlignedValue>
       {tag.totalValues ? (
-        <TagBar
-          style={{height: space(2)}}
-          count={tagValue.count}
-          total={tag.totalValues}
-        />
+        <TagBar percentage={percentage} style={{height: space(1.5)}} />
       ) : (
         '--'
       )}
-      <DropdownMenu
-        size="xs"
-        trigger={triggerProps => (
-          <ActionButton
-            {...triggerProps}
-            isHidden={!isHovered}
-            size="xs"
-            icon={<IconEllipsis />}
-            aria-label={t('Tag Value Actions Menu')}
-          />
-        )}
-        items={[
-          {
-            key: 'open-in-discover',
-            label: t('Open in Discover'),
-            to: eventView.getResultsViewUrlTarget(
-              organization.slug,
-              false,
-              hasDatasetSelector(organization) ? SavedQueryDatasets.ERRORS : undefined
-            ),
-            hidden: !group || !organization.features.includes('discover-basic'),
-          },
-          {
-            key: 'view-events',
-            label: t('View other events with this tag value'),
-            to: allEventsLocation,
-          },
-          {
-            key: 'view-issues',
-            label: t('View issues with this tag value'),
-            to: {
-              pathname: `/organizations/${organization.slug}/issues/`,
-              query,
-            },
-          },
-        ]}
-      />
+      <TagValueActionsMenu group={group} tag={tag} tagValue={tagValue} />
     </Row>
   );
 }
@@ -271,9 +226,75 @@ function TagDetailsValue({
   );
 }
 
+function TagValueActionsMenu({
+  group,
+  tag,
+  tagValue,
+}: {
+  group: Group;
+  tag: Tag;
+  tagValue: TagValue;
+}) {
+  const organization = useOrganization();
+  const {onClick: handleCopy} = useCopyToClipboard({
+    text: tagValue.value,
+  });
+  const key = tagValue.key ?? tag.key;
+  const query = {query: tagValue.query || `${key}:"${tagValue.value}"`};
+  const eventView = useIssueDetailsEventView({group, queryProps: query});
+  const [isVisible, setIsVisible] = useState(false);
+
+  return (
+    <DropdownMenu
+      size="xs"
+      className={isVisible ? '' : 'invisible'}
+      onOpenChange={isOpen => setIsVisible(isOpen)}
+      triggerProps={{
+        'aria-label': t('Tag Value Actions Menu'),
+        icon: <IconEllipsis />,
+        showChevron: false,
+        size: 'xs',
+      }}
+      items={[
+        {
+          key: 'open-in-discover',
+          label: t('Open in Discover'),
+          to: eventView.getResultsViewUrlTarget(
+            organization.slug,
+            false,
+            hasDatasetSelector(organization) ? SavedQueryDatasets.ERRORS : undefined
+          ),
+          hidden: !group || !organization.features.includes('discover-basic'),
+        },
+        {
+          key: 'view-events',
+          label: t('View other events with this tag value'),
+          to: {
+            pathname: `/organizations/${organization.slug}/issues/${group.id}/events/`,
+            query,
+          },
+        },
+        {
+          key: 'view-issues',
+          label: t('Search issues with this tag value'),
+          to: {
+            pathname: `/organizations/${organization.slug}/issues/`,
+            query,
+          },
+        },
+        {
+          key: 'copy-value',
+          label: t('Copy tag value to clipboard'),
+          onAction: handleCopy,
+        },
+      ]}
+    />
+  );
+}
+
 const Table = styled('div')`
   display: grid;
-  grid-template-columns: repeat(3, auto) 1fr auto;
+  grid-template-columns: 1fr repeat(3, auto) 45px min-content;
   column-gap: ${space(2)};
   row-gap: ${space(0.5)};
   margin: 0 -${space(1)};
@@ -321,6 +342,16 @@ const Row = styled(Body)`
   align-items: center;
   border-radius: 4px;
   padding: ${space(0.25)} ${space(1)};
+
+  .invisible {
+    visibility: hidden;
+  }
+  &:hover,
+  &:active {
+    .invisible {
+      visibility: visible;
+    }
+  }
 `;
 
 const Value = styled('div')`
@@ -329,6 +360,10 @@ const Value = styled('div')`
   align-items: center;
 `;
 
+const RightAlignedValue = styled('div')`
+  text-align: right;
+`;
+
 const ValueLink = styled(Link)`
   color: ${p => p.theme.textColor};
   text-decoration: underline;
@@ -347,17 +382,6 @@ const OverflowTimeSince = styled(TimeSince)`
   overflow: hidden;
 `;
 
-// We need to do the hiding here so that focus styles from the `Button` component take precedent
-const ActionButton = styled(Button)<{isHidden: boolean}>`
-  ${p =>
-    p.isHidden &&
-    css`
-      border: 0;
-      color: transparent;
-      background: transparent;
-    `}
-`;
-
 const ExternalLinkbutton = styled(Button)`
   color: ${p => p.theme.subText};
 `;
diff --git a/static/app/views/issueDetails/groupTags/tagDistribution.tsx b/static/app/views/issueDetails/groupTags/tagDistribution.tsx
index 42b18e0077b728..1c89474b11a647 100644
--- a/static/app/views/issueDetails/groupTags/tagDistribution.tsx
+++ b/static/app/views/issueDetails/groupTags/tagDistribution.tsx
@@ -1,102 +1,143 @@
-import {type CSSProperties, useState} from 'react';
 import styled from '@emotion/styled';
+import Color from 'color';
 
-import {LinkButton} from 'sentry/components/button';
 import {DeviceName} from 'sentry/components/deviceName';
 import Link from 'sentry/components/links/link';
 import {Tooltip} from 'sentry/components/tooltip';
 import Version from 'sentry/components/version';
-import {t} from 'sentry/locale';
+import {t, tct} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import {percent} from 'sentry/utils';
 import {useLocation} from 'sentry/utils/useLocation';
 import type {GroupTag} from 'sentry/views/issueDetails/groupTags/useGroupTags';
-import {Tab, TabPaths} from 'sentry/views/issueDetails/types';
-import {useGroupDetailsRoute} from 'sentry/views/issueDetails/useGroupDetailsRoute';
 
-export function TagDistribution({tag}: {tag: GroupTag}) {
-  const location = useLocation();
-  const {baseUrl} = useGroupDetailsRoute();
-  const [isHovered, setIsHovered] = useState(false);
+export function TagPreviewDistribution({tag}: {tag: GroupTag}) {
+  const totalVisible = tag.topValues.reduce((sum, value) => sum + value.count, 0);
+  const hasOther = totalVisible < tag.totalValues;
+
+  const otherPercentage = percent(tag.totalValues - totalVisible, tag.totalValues);
+  const otherDisplayPercentage =
+    otherPercentage < 1 ? '<1%' : `${otherPercentage.toFixed(0)}%`;
 
   return (
-    <div onMouseEnter={() => setIsHovered(true)} onMouseLeave={() => setIsHovered(false)}>
+    <div>
       <TagHeader>
-        <Tooltip title={tag.key} showOnlyOnOverflow skipWrapper>
-          <TagTitle>{tag.key}</TagTitle>
-        </Tooltip>
-        <TagDetailsButton
-          borderless
-          size="zero"
-          to={{
-            pathname: `${location.pathname}${tag.key}/`,
-            query: location.query,
-            replace: true,
-          }}
-          isVisible={isHovered}
-        >
-          {t('Details')}
-        </TagDetailsButton>
+        <TagPreviewTitle>{tag.key}</TagPreviewTitle>
       </TagHeader>
       <TagValueContent>
-        {tag.topValues.map((tagValue, tagValueIdx) => (
-          <TagValueRow key={tagValueIdx}>
-            <Tooltip delay={300} title={tagValue.name} skipWrapper>
-              <TagValue
-                to={{
-                  pathname: `${baseUrl}${TabPaths[Tab.EVENTS]}`,
-                  query: {
-                    ...location.query,
-                    query: tagValue.query || `${tag.key}:"${tagValue.value}"`,
-                  },
-                }}
-              >
-                {tag.key === 'release' ? (
-                  <Version version={tagValue.name} anchor={false} />
-                ) : (
+        {tag.topValues.map((tagValue, tagValueIdx) => {
+          const percentage = percent(tagValue.count, tag.totalValues);
+          const displayPercentage = percentage < 1 ? '<1%' : `${percentage.toFixed(0)}%`;
+          return (
+            <TagValueRow key={tagValueIdx}>
+              <Tooltip delay={300} title={tagValue.name} skipWrapper>
+                <TagValue>
                   <DeviceName value={tagValue.name} />
-                )}
-              </TagValue>
-            </Tooltip>
-            <TagBar count={tagValue.count} total={tag.totalValues} />
+                </TagValue>
+              </Tooltip>
+              <TagBarValue>{displayPercentage}</TagBarValue>
+              <TagBar percentage={percentage} />
+            </TagValueRow>
+          );
+        })}
+        {hasOther && (
+          <TagValueRow>
+            <TagValue>{t('Other')}</TagValue>
+            <TagBarValue>{otherDisplayPercentage}</TagBarValue>
+            <TagBar percentage={otherPercentage} />
           </TagValueRow>
-        ))}
+        )}
       </TagValueContent>
     </div>
   );
 }
 
+export function TagDistribution({tag}: {tag: GroupTag}) {
+  const location = useLocation();
+
+  return (
+    <div>
+      <TagPanel
+        to={{
+          pathname: `${location.pathname}${tag.key}/`,
+          query: location.query,
+        }}
+      >
+        <TagHeader>
+          <Tooltip title={tag.key} showOnlyOnOverflow skipWrapper>
+            <TagTitle>{tag.key}</TagTitle>
+          </Tooltip>
+        </TagHeader>
+        <TagValueContent>
+          {tag.topValues.map((tagValue, tagValueIdx) => {
+            const percentage = percent(tagValue.count, tag.totalValues);
+            const displayPercentage =
+              percentage < 1 ? '<1%' : `${percentage.toFixed(0)}%`;
+            return (
+              <TagValueRow key={tagValueIdx}>
+                <Tooltip delay={300} title={tagValue.name} skipWrapper>
+                  <TagValue>
+                    {tag.key === 'release' ? (
+                      <Version version={tagValue.name} anchor={false} />
+                    ) : (
+                      <DeviceName value={tagValue.name} />
+                    )}
+                  </TagValue>
+                </Tooltip>
+                <Tooltip
+                  title={tct('[count] of [total] tagged events', {
+                    count: tagValue.count.toLocaleString(),
+                    total: tag.totalValues.toLocaleString(),
+                  })}
+                  skipWrapper
+                >
+                  <TooltipContainer>
+                    <TagBarValue>{displayPercentage}</TagBarValue>
+                    <TagBar percentage={percentage} />
+                  </TooltipContainer>
+                </Tooltip>
+              </TagValueRow>
+            );
+          })}
+        </TagValueContent>
+      </TagPanel>
+    </div>
+  );
+}
+
 export function TagBar({
-  count,
-  total,
+  percentage,
+  style,
   ...props
 }: {
-  count: number;
-  total: number;
+  percentage: number;
   className?: string;
-  style?: CSSProperties;
+  style?: React.CSSProperties;
 }) {
-  const percentage = percent(count, total);
-  const displayPercentage = percentage < 1 ? '<1%' : `${percentage.toFixed(0)}%`;
   return (
-    <Tooltip delay={300} title={`${count} / ${total}`} skipWrapper>
-      <TagBarContainer
-        displayPercentage={displayPercentage}
-        widthPercent={percentage}
-        {...props}
-      >
-        <TagBarValue>{displayPercentage}</TagBarValue>
-      </TagBarContainer>
-    </Tooltip>
+    <TagBarPlaceholder>
+      <TagBarContainer style={{width: `${percentage}%`, ...style}} {...props} />
+    </TagBarPlaceholder>
   );
 }
 
-const TagHeader = styled('div')`
+const TagPanel = styled(Link)`
+  display: block;
+  border-radius: ${p => p.theme.borderRadius};
+  border: 1px solid ${p => p.theme.border};
+  padding: ${space(1)};
+
+  &:hover > h5 {
+    text-decoration: underline;
+  }
+`;
+
+const TagHeader = styled('h5')`
   grid-area: header;
   display: flex;
   justify-content: space-between;
-  border-bottom: 1px solid ${p => p.theme.translucentBorder};
-  margin-bottom: ${space(1)};
+  margin-bottom: ${space(0.5)};
+  color: ${p => p.theme.textColor};
 `;
 
 const TagTitle = styled('div')`
@@ -105,17 +146,21 @@ const TagTitle = styled('div')`
   ${p => p.theme.overflowEllipsis}
 `;
 
-const TagDetailsButton = styled(LinkButton)<{isVisible: boolean}>`
+const TagPreviewTitle = styled(TagTitle)`
   font-size: ${p => p.theme.fontSizeSmall};
-  font-weight: ${p => p.theme.fontWeightNormal};
-  color: ${p => (p.isVisible ? p.theme.subText : 'transparent')};
 `;
 
 // The 40px is a buffer to prevent percentages from overflowing
+const progressBarWidth = '45px';
 const TagValueContent = styled('div')`
   display: grid;
-  grid-template-columns: 50% 1fr 40px;
+  grid-template-columns: 4fr auto ${progressBarWidth};
   color: ${p => p.theme.subText};
+  grid-column-gap: ${space(1)};
+
+  & > :nth-child(2n) {
+    background-color: ${p => p.theme.backgroundSecondary};
+  }
 `;
 
 const TagValueRow = styled('div')`
@@ -125,40 +170,46 @@ const TagValueRow = styled('div')`
   align-items: center;
 `;
 
-const TagValue = styled(Link)`
-  display: block;
-  text-align: right;
-  color: ${p => p.theme.subText};
+const TagValue = styled('div')`
   text-overflow: ellipsis;
   overflow: hidden;
   white-space: nowrap;
-  margin-right: ${space(1)};
-  justify-self: end;
-  max-width: calc(100% - ${space(2)});
+  margin-right: ${space(0.5)};
 `;
 
-const TagBarContainer = styled('div')<{displayPercentage: string; widthPercent: number}>`
-  height: ${space(1)};
+const TagBarPlaceholder = styled('div')`
   position: relative;
-  flex: 1;
-  width: calc(${p => p.widthPercent}%);
+  height: ${space(1)};
+  width: 100%;
+  border-radius: 3px;
+  box-shadow: inset 0 0 0 1px ${p => p.theme.translucentBorder};
+  background: ${p => Color(p.theme.gray300).alpha(0.1).toString()};
+  overflow: hidden;
+`;
+
+const TagBarContainer = styled('div')`
+  height: ${space(1)};
+  position: absolute;
+  left: 0;
+  top: 0;
   min-width: ${space(1)};
-  display: flex;
-  align-items: center;
   &:before {
     position: absolute;
     inset: 0;
     content: '';
-    border-radius: 1000px;
-    background: ${p => p.theme.border};
-    border: 1px solid ${p => p.theme.translucentBorder};
+    background: ${p =>
+      `linear-gradient(to right, ${Color(p.theme.gray300).alpha(0.5).toString()} 0px, ${Color(p.theme.gray300).alpha(0.7).toString()} ${progressBarWidth})`};
     width: 100%;
   }
 `;
 
 const TagBarValue = styled('div')`
-  margin-left: 100%;
-  padding-left: ${space(0.5)};
+  text-align: right;
+`;
 
-  color: ${p => p.theme.subText};
+const TooltipContainer = styled('div')`
+  display: grid;
+  grid-template-columns: subgrid;
+  grid-column: 2 / -1;
+  align-items: center;
 `;
diff --git a/static/app/views/issueDetails/groupTags/useGroupTags.tsx b/static/app/views/issueDetails/groupTags/useGroupTags.tsx
index 8fd90c67de62c0..26de2eae866c25 100644
--- a/static/app/views/issueDetails/groupTags/useGroupTags.tsx
+++ b/static/app/views/issueDetails/groupTags/useGroupTags.tsx
@@ -79,7 +79,7 @@ export function useGroupTags(
  * Primarily used for tag facets
  */
 export function useGroupTagsReadable(
-  parameters: Omit<FetchIssueTagsParameters, 'orgSlug' | 'limit' | 'readable'>,
+  parameters: Omit<FetchIssueTagsParameters, 'orgSlug' | 'readable'>,
   options: GroupTagUseQueryOptions = {}
 ) {
   return useGroupTags(
diff --git a/static/app/views/issueDetails/header.spec.tsx b/static/app/views/issueDetails/header.spec.tsx
index 5b5ff2a608fa3c..31465166b3f64f 100644
--- a/static/app/views/issueDetails/header.spec.tsx
+++ b/static/app/views/issueDetails/header.spec.tsx
@@ -103,7 +103,7 @@ describe('GroupHeader', () => {
         query: {},
       });
 
-      expect(screen.queryByRole('tab', {name: /replays/i})).toBeInTheDocument();
+      expect(screen.getByRole('tab', {name: /replays/i})).toBeInTheDocument();
     });
   });
 
diff --git a/static/app/views/issueDetails/streamline/context.tsx b/static/app/views/issueDetails/streamline/context.tsx
index 795c2e5e37cedb..dfa4ff6d9fb607 100644
--- a/static/app/views/issueDetails/streamline/context.tsx
+++ b/static/app/views/issueDetails/streamline/context.tsx
@@ -86,46 +86,77 @@ export interface SectionConfig {
   initialCollapse?: boolean;
 }
 
-export interface EventDetailsContextType extends EventDetailsState {
-  dispatch: Dispatch<EventDetailsActions>;
+export interface IssueDetailsContextType extends IssueDetailsState {
+  dispatch: Dispatch<IssueDetailsActions>;
 }
 
-export const EventDetailsContext = createContext<EventDetailsContextType>({
+export const IssueDetailsContext = createContext<IssueDetailsContextType>({
   sectionData: {},
+  isSidebarOpen: true,
+  navScrollMargin: 0,
+  eventCount: 0,
   dispatch: () => {},
 });
 
-export function useEventDetails() {
-  return useContext(EventDetailsContext);
+export function useIssueDetails() {
+  return useContext(IssueDetailsContext);
 }
 
-export interface EventDetailsState {
+export interface IssueDetailsState {
+  /**
+   * Allows updating the event count based on the date/time/environment filters.
+   */
+  eventCount: number;
+  /**
+   * Controls whether the sidebar is open.
+   */
+  isSidebarOpen: boolean;
+  /**
+   * The margin to add to the 'Jump To' nav (accounts for the main app sidebar on small screen sizes).
+   */
+  navScrollMargin: number;
+  /**
+   * Controls the state of each section.
+   */
   sectionData: {
     [key in SectionKey]?: SectionConfig;
   };
-  navScrollMargin?: number;
 }
 
-type UpdateSectionAction = {
+type UpdateEventSectionAction = {
   key: SectionKey;
-  type: 'UPDATE_SECTION';
+  type: 'UPDATE_EVENT_SECTION';
   config?: Partial<SectionConfig>;
 };
 
-type UpdateDetailsAction = {
-  type: 'UPDATE_DETAILS';
-  state?: Omit<EventDetailsState, 'sectionData'>;
+type UpdateNavScrollMarginAction = {
+  margin: number;
+  type: 'UPDATE_NAV_SCROLL_MARGIN';
+};
+
+type UpdateEventCountAction = {
+  count: number;
+  type: 'UPDATE_EVENT_COUNT';
+};
+
+type UpdateSidebarAction = {
+  isOpen: boolean;
+  type: 'UPDATE_SIDEBAR_STATE';
 };
 
-export type EventDetailsActions = UpdateSectionAction | UpdateDetailsAction;
+export type IssueDetailsActions =
+  | UpdateEventSectionAction
+  | UpdateNavScrollMarginAction
+  | UpdateEventCountAction
+  | UpdateSidebarAction;
 
-function updateSection(
-  state: EventDetailsState,
+function updateEventSection(
+  state: IssueDetailsState,
   sectionKey: SectionKey,
   updatedConfig: Partial<SectionConfig>
-): EventDetailsState {
+): IssueDetailsState {
   const existingConfig = state.sectionData[sectionKey] ?? {key: sectionKey};
-  const nextState: EventDetailsState = {
+  const nextState: IssueDetailsState = {
     ...state,
     sectionData: {
       ...state.sectionData,
@@ -136,21 +167,28 @@ function updateSection(
 }
 
 /**
- * If trying to use the current state of the event page, you likely want to use `useEventDetails`
- * instead. This hook is just meant to create state for the provider.
+ * If trying to use the current state of the issue/event page, you likely want to use
+ * `useIssueDetails` instead. This hook is just meant to create state for the provider.
  */
-export function useEventDetailsReducer() {
-  const initialState: EventDetailsState = {
+export function useIssueDetailsReducer() {
+  const initialState: IssueDetailsState = {
     sectionData: {},
+    isSidebarOpen: true,
+    eventCount: 0,
+    navScrollMargin: 0,
   };
 
-  const reducer: Reducer<EventDetailsState, EventDetailsActions> = useCallback(
-    (state, action): EventDetailsState => {
+  const reducer: Reducer<IssueDetailsState, IssueDetailsActions> = useCallback(
+    (state, action): IssueDetailsState => {
       switch (action.type) {
-        case 'UPDATE_SECTION':
-          return updateSection(state, action.key, action.config ?? {});
-        case 'UPDATE_DETAILS':
-          return {...state, ...action.state};
+        case 'UPDATE_SIDEBAR_STATE':
+          return {...state, isSidebarOpen: action.isOpen};
+        case 'UPDATE_NAV_SCROLL_MARGIN':
+          return {...state, navScrollMargin: action.margin};
+        case 'UPDATE_EVENT_SECTION':
+          return updateEventSection(state, action.key, action.config ?? {});
+        case 'UPDATE_EVENT_COUNT':
+          return {...state, eventCount: action.count};
         default:
           return state;
       }
@@ -158,10 +196,10 @@ export function useEventDetailsReducer() {
     []
   );
 
-  const [eventDetails, dispatch] = useReducer(reducer, initialState);
+  const [issueDetails, dispatch] = useReducer(reducer, initialState);
 
   return {
-    eventDetails,
+    issueDetails,
     dispatch,
   };
 }
diff --git a/static/app/views/issueDetails/streamline/eventDetails.tsx b/static/app/views/issueDetails/streamline/eventDetails.tsx
index 33a2de3f6f3fbe..1fed047a0f1631 100644
--- a/static/app/views/issueDetails/streamline/eventDetails.tsx
+++ b/static/app/views/issueDetails/streamline/eventDetails.tsx
@@ -13,31 +13,30 @@ import {
   EventDetailsContent,
   type EventDetailsContentProps,
 } from 'sentry/views/issueDetails/groupEventDetails/groupEventDetailsContent';
-import {
-  EventDetailsContext,
-  useEventDetails,
-  useEventDetailsReducer,
-} from 'sentry/views/issueDetails/streamline/context';
+import {useIssueDetails} from 'sentry/views/issueDetails/streamline/context';
+import {EventMissingBanner} from 'sentry/views/issueDetails/streamline/eventMissingBanner';
 import {EventTitle} from 'sentry/views/issueDetails/streamline/eventTitle';
 
-export function EventDetails({
-  group,
-  event,
-  project,
-}: Required<EventDetailsContentProps>) {
-  const {eventDetails, dispatch} = useEventDetailsReducer();
+export function EventDetails({group, event, project}: EventDetailsContentProps) {
+  if (!event) {
+    return (
+      <GroupContent role="main">
+        <BannerPadding>
+          <EventMissingBanner />
+        </BannerPadding>
+      </GroupContent>
+    );
+  }
 
   return (
-    <EventDetailsContext.Provider value={{...eventDetails, dispatch}}>
-      <PageErrorBoundary mini message={t('There was an error loading the event content')}>
-        <GroupContent role="main">
-          <StickyEventNav event={event} group={group} />
-          <ContentPadding>
-            <EventDetailsContent group={group} event={event} project={project} />
-          </ContentPadding>
-        </GroupContent>
-      </PageErrorBoundary>
-    </EventDetailsContext.Provider>
+    <PageErrorBoundary mini message={t('There was an error loading the event content')}>
+      <GroupContent role="main">
+        <StickyEventNav event={event} group={group} />
+        <ContentPadding>
+          <EventDetailsContent group={group} event={event} project={project} />
+        </ContentPadding>
+      </GroupContent>
+    </PageErrorBoundary>
   );
 }
 
@@ -46,18 +45,17 @@ function StickyEventNav({event, group}: {event: Event; group: Group}) {
   const [nav, setNav] = useState<HTMLDivElement | null>(null);
   const isStuck = useIsStuck(nav);
   const isScreenMedium = useMedia(`(max-width: ${theme.breakpoints.medium})`);
-  const {dispatch} = useEventDetails();
+  const {dispatch} = useIssueDetails();
 
   useLayoutEffect(() => {
     if (!nav) {
       return;
     }
-
     const navHeight = nav.offsetHeight ?? 0;
     const sidebarHeight = isScreenMedium ? theme.sidebar.mobileHeightNumber : 0;
     dispatch({
-      type: 'UPDATE_DETAILS',
-      state: {navScrollMargin: navHeight + sidebarHeight},
+      type: 'UPDATE_NAV_SCROLL_MARGIN',
+      margin: navHeight + sidebarHeight,
     });
   }, [nav, isScreenMedium, dispatch, theme.sidebar.mobileHeightNumber]);
 
@@ -97,6 +95,10 @@ const ContentPadding = styled('div')`
   padding: ${space(1)} ${space(1.5)};
 `;
 
+const BannerPadding = styled('div')`
+  padding: 40px;
+`;
+
 const PageErrorBoundary = styled(ErrorBoundary)`
   margin: 0;
   border: 1px solid ${p => p.theme.translucentBorder};
diff --git a/static/app/views/issueDetails/streamline/eventDetailsHeader.tsx b/static/app/views/issueDetails/streamline/eventDetailsHeader.tsx
index 6faffc4b77d80e..9beb9ce4ef4e40 100644
--- a/static/app/views/issueDetails/streamline/eventDetailsHeader.tsx
+++ b/static/app/views/issueDetails/streamline/eventDetailsHeader.tsx
@@ -18,6 +18,7 @@ import {
   EventSearch,
   useEventQuery,
 } from 'sentry/views/issueDetails/streamline/eventSearch';
+import IssueTagsPreview from 'sentry/views/issueDetails/streamline/issueTagsPreview';
 import {ToggleSidebar} from 'sentry/views/issueDetails/streamline/sidebar/toggleSidebar';
 import {Tab, TabPaths} from 'sentry/views/issueDetails/types';
 import {useGroupDetailsRoute} from 'sentry/views/issueDetails/useGroupDetailsRoute';
@@ -35,7 +36,7 @@ export function EventDetailsHeader({
   const navigate = useNavigate();
   const location = useLocation();
   const environments = useEnvironmentsFromUrl();
-  const searchQuery = useEventQuery({group});
+  const searchQuery = useEventQuery({groupId: group.id});
   const {baseUrl} = useGroupDetailsRoute();
 
   const issueTypeConfig = getConfigForIssueType(group, project);
@@ -80,6 +81,7 @@ export function EventDetailsHeader({
         <GraphSection>
           <EventGraph event={event} group={group} style={{flex: 1}} />
           <SectionDivider />
+          <IssueTagsPreview groupId={group.id} environments={environments} />
           <IssueTagsButton
             aria-label={t('View issue tag distributions')}
             to={{
@@ -90,7 +92,7 @@ export function EventDetailsHeader({
             analyticsEventKey="issue_details.issue_tags_clicked"
             analyticsEventName="Issue Details: Issue Tags Clicked"
           >
-            {t('Issue Tags')}
+            {t('All Tags')}
           </IssueTagsButton>
         </GraphSection>
       </FilterContainer>
diff --git a/static/app/views/issueDetails/streamline/eventGraph.tsx b/static/app/views/issueDetails/streamline/eventGraph.tsx
index b1122dedef020e..d8a1ed3e792b6c 100644
--- a/static/app/views/issueDetails/streamline/eventGraph.tsx
+++ b/static/app/views/issueDetails/streamline/eventGraph.tsx
@@ -1,4 +1,4 @@
-import {type CSSProperties, useMemo, useState} from 'react';
+import {type CSSProperties, useEffect, useMemo, useState} from 'react';
 import {useTheme} from '@emotion/react';
 import styled from '@emotion/styled';
 import Color from 'color';
@@ -26,6 +26,8 @@ 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 {useIssueDetails} from 'sentry/views/issueDetails/streamline/context';
+import {useCurrentEventMarklineSeries} from 'sentry/views/issueDetails/streamline/hooks/useEventMarkLineSeries';
 import useFlagSeries from 'sentry/views/issueDetails/streamline/hooks/useFlagSeries';
 import {
   useIssueDetailsDiscoverQuery,
@@ -33,7 +35,7 @@ import {
 } from 'sentry/views/issueDetails/streamline/hooks/useIssueDetailsDiscoverQuery';
 import {useReleaseMarkLineSeries} from 'sentry/views/issueDetails/streamline/hooks/useReleaseMarkLineSeries';
 
-export const enum EventGraphSeries {
+const enum EventGraphSeries {
   EVENT = 'event',
   USER = 'user',
 }
@@ -72,8 +74,8 @@ export function EventGraph({group, event, ...styleProps}: EventGraphProps) {
     EventGraphSeries.EVENT
   );
   const eventView = useIssueDetailsEventView({group});
-
   const config = getConfigForIssueType(group, group.project);
+  const {dispatch} = useIssueDetails();
 
   const {
     data: groupStats = {},
@@ -136,6 +138,12 @@ export function EventGraph({group, event, ...styleProps}: EventGraphProps) {
     }
     return createSeriesAndCount(groupStats['count()']);
   }, [groupStats]);
+
+  // Ensure the dropdown can access the new filtered event count
+  useEffect(() => {
+    dispatch({type: 'UPDATE_EVENT_COUNT', count: eventCount});
+  }, [eventCount, dispatch]);
+
   const {series: unfilteredEventSeries} = useMemo(() => {
     if (!unfilteredGroupStats?.['count()']) {
       return {series: []};
@@ -161,6 +169,10 @@ export function EventGraph({group, event, ...styleProps}: EventGraphProps) {
     saveOnZoom: true,
   });
 
+  const currentEventSeries = useCurrentEventMarklineSeries({
+    event,
+    group,
+  });
   const releaseSeries = useReleaseMarkLineSeries({group});
   const flagSeries = useFlagSeries({
     query: {
@@ -228,6 +240,10 @@ export function EventGraph({group, event, ...styleProps}: EventGraphProps) {
       });
     }
 
+    if (currentEventSeries.markLine) {
+      seriesData.push(currentEventSeries as BarChartSeries);
+    }
+
     if (releaseSeries.markLine) {
       seriesData.push(releaseSeries as BarChartSeries);
     }
@@ -241,6 +257,7 @@ export function EventGraph({group, event, ...styleProps}: EventGraphProps) {
     visibleSeries,
     userSeries,
     eventSeries,
+    currentEventSeries,
     releaseSeries,
     flagSeries,
     theme,
@@ -260,7 +277,7 @@ export function EventGraph({group, event, ...styleProps}: EventGraphProps) {
   );
 
   const legend = Legend({
-    theme: theme,
+    theme,
     orient: 'horizontal',
     align: 'left',
     show: true,
diff --git a/static/app/views/issueDetails/streamline/eventMissingBanner.spec.tsx b/static/app/views/issueDetails/streamline/eventMissingBanner.spec.tsx
new file mode 100644
index 00000000000000..9e3168586d1c0a
--- /dev/null
+++ b/static/app/views/issueDetails/streamline/eventMissingBanner.spec.tsx
@@ -0,0 +1,43 @@
+import {OrganizationFixture} from 'sentry-fixture/organization';
+import {RouterFixture} from 'sentry-fixture/routerFixture';
+
+import {render, screen} from 'sentry-test/reactTestingLibrary';
+
+import {EventMissingBanner} from 'sentry/views/issueDetails/streamline/eventMissingBanner';
+
+describe('EventMissingBanner', () => {
+  it('renders elements for known event IDs', () => {
+    const organization = OrganizationFixture();
+    const router = RouterFixture({params: {groupId: 'group-1', eventId: 'recommended'}});
+
+    render(<EventMissingBanner />, {organization, router});
+
+    // Header
+    expect(screen.getByText(/We couldn't track down an event/)).toBeInTheDocument();
+    // Body
+    expect(screen.getByText(/here are some things to try/)).toBeInTheDocument();
+    expect(screen.getByText(/Change up your filters./)).toBeInTheDocument();
+    expect(screen.getByRole('link', {name: 'Clear event filters'})).toBeInTheDocument();
+    // Image
+    expect(screen.getByAltText('Compass illustration')).toBeInTheDocument();
+  });
+
+  it('renders elements for specific event IDs', () => {
+    const organization = OrganizationFixture();
+    const router = RouterFixture({params: {groupId: 'group-1', eventId: 'abc123'}});
+
+    render(<EventMissingBanner />, {organization, router});
+
+    // Header
+    expect(screen.getByText(/We couldn't track down that event/)).toBeInTheDocument();
+    expect(screen.getByText(/(abc123)/)).toBeInTheDocument();
+    // Body
+    expect(screen.getByText(/here are some things to try/)).toBeInTheDocument();
+    expect(screen.getByText(/Double check the event ID./)).toBeInTheDocument();
+    expect(
+      screen.getByRole('link', {name: 'View recommended event'})
+    ).toBeInTheDocument();
+    // Image
+    expect(screen.getByAltText('Compass illustration')).toBeInTheDocument();
+  });
+});
diff --git a/static/app/views/issueDetails/streamline/eventMissingBanner.tsx b/static/app/views/issueDetails/streamline/eventMissingBanner.tsx
new file mode 100644
index 00000000000000..11fa6a2cbe9ed4
--- /dev/null
+++ b/static/app/views/issueDetails/streamline/eventMissingBanner.tsx
@@ -0,0 +1,88 @@
+import styled from '@emotion/styled';
+
+import compassImage from 'sentry-images/spot/onboarding-compass.svg';
+
+import {Flex} from 'sentry/components/container/flex';
+import Link from 'sentry/components/links/link';
+import {t, tct} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
+import useOrganization from 'sentry/utils/useOrganization';
+import {useParams} from 'sentry/utils/useParams';
+import {RESERVED_EVENT_IDS} from 'sentry/views/issueDetails/useGroupEvent';
+import {useDefaultIssueEvent} from 'sentry/views/issueDetails/utils';
+
+export function EventMissingBanner() {
+  const organization = useOrganization();
+  const defaultEventId = useDefaultIssueEvent();
+  const {groupId, eventId = defaultEventId} = useParams<{
+    eventId: string;
+    groupId: string;
+  }>();
+  const baseUrl = `/organizations/${organization.slug}/issues/${groupId}/events`;
+  const isReservedEventId = RESERVED_EVENT_IDS.has(eventId);
+
+  const specificEventTips = [
+    t(
+      'Double check the event ID. It may be incorrect, or its age exceeded the retention policy.'
+    ),
+    tct(
+      'Switch over to a [link:recommended] event instead, it should have more useful data.',
+      {
+        link: (
+          <Link to={`${baseUrl}/recommended/`} aria-label={t('View recommended event')} />
+        ),
+      }
+    ),
+  ];
+  const reservedEventTips = [
+    t(
+      'Change up your filters. Try more environments, a wider date range, or a different query'
+    ),
+    tct('If nothing stands out, try [link:clearing your filters] all together', {
+      link: <Link to={`${baseUrl}/${eventId}/`} aria-label={t('Clear event filters')} />,
+    }),
+  ];
+
+  const tips = isReservedEventId ? reservedEventTips : specificEventTips;
+
+  return (
+    <Flex align="center" justify="center">
+      <Flex align="center" gap={36}>
+        <img src={compassImage} alt="Compass illustration" height={122} />
+        <Flex justify="center" column gap={space(1)}>
+          <MainText>
+            {tct("We couldn't track down [prep] event", {
+              prep: isReservedEventId ? 'an' : 'that',
+            })}
+            {!isReservedEventId && eventId ? (
+              <EventIdText>({eventId})</EventIdText>
+            ) : null}
+          </MainText>
+          <SubText>
+            {t('If this is unexpected, here are some things to try:')}
+            <ul style={{margin: 0}}>
+              {tips.map((tip, i) => (
+                <li key={i}>{tip}</li>
+              ))}
+            </ul>
+          </SubText>
+        </Flex>
+      </Flex>
+    </Flex>
+  );
+}
+
+const MainText = styled('div')`
+  font-size: ${p => p.theme.fontSizeExtraLarge};
+  font-weight: ${p => p.theme.fontWeightBold};
+`;
+
+const SubText = styled('div')`
+  font-size: ${p => p.theme.fontSizeMedium};
+  font-weight: ${p => p.theme.fontWeightNormal};
+`;
+
+const EventIdText = styled(SubText)`
+  font-style: italic;
+  color: ${p => p.theme.subText};
+`;
diff --git a/static/app/views/issueDetails/streamline/eventNavigation.spec.tsx b/static/app/views/issueDetails/streamline/eventNavigation.spec.tsx
index c5ab2f3dba17c6..6bfcb0bb74fbfb 100644
--- a/static/app/views/issueDetails/streamline/eventNavigation.spec.tsx
+++ b/static/app/views/issueDetails/streamline/eventNavigation.spec.tsx
@@ -8,7 +8,7 @@ import {initializeOrg} from 'sentry-test/initializeOrg';
 import {render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrary';
 
 import * as useMedia from 'sentry/utils/useMedia';
-import {SectionKey, useEventDetails} from 'sentry/views/issueDetails/streamline/context';
+import {SectionKey, useIssueDetails} from 'sentry/views/issueDetails/streamline/context';
 import {Tab, TabPaths} from 'sentry/views/issueDetails/types';
 
 import {IssueEventNavigation} from './eventNavigation';
@@ -34,17 +34,19 @@ describe('EventNavigation', () => {
   const defaultProps: React.ComponentProps<typeof IssueEventNavigation> = {
     event: testEvent,
     group,
-    query: undefined,
   };
 
   beforeEach(() => {
     jest.resetAllMocks();
-    jest.mocked(useEventDetails).mockReturnValue({
+    jest.mocked(useIssueDetails).mockReturnValue({
       sectionData: {
         highlights: {key: SectionKey.HIGHLIGHTS},
         tags: {key: SectionKey.TAGS},
         replay: {key: SectionKey.REPLAY},
       },
+      eventCount: 0,
+      isSidebarOpen: true,
+      navScrollMargin: 0,
       dispatch: jest.fn(),
     });
     MockApiClient.addMockResponse({
@@ -187,9 +189,7 @@ describe('EventNavigation', () => {
       expect(
         await screen.findByRole('menuitemradio', {name: 'Attachments 0'})
       ).toBeInTheDocument();
-      expect(
-        screen.getByRole('menuitemradio', {name: 'Events 327k'})
-      ).toBeInTheDocument();
+      expect(screen.getByRole('menuitemradio', {name: 'Events 0'})).toBeInTheDocument();
       expect(screen.getByRole('menuitemradio', {name: 'Replays 0'})).toBeInTheDocument();
       expect(screen.getByRole('menuitemradio', {name: 'Feedback 0'})).toBeInTheDocument();
     });
diff --git a/static/app/views/issueDetails/streamline/eventNavigation.tsx b/static/app/views/issueDetails/streamline/eventNavigation.tsx
index 4997a8ebde48c2..f2c38ad0e12a1f 100644
--- a/static/app/views/issueDetails/streamline/eventNavigation.tsx
+++ b/static/app/views/issueDetails/streamline/eventNavigation.tsx
@@ -28,6 +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 {useIssueDetails} from 'sentry/views/issueDetails/streamline/context';
 import {useIssueDetailsEventView} from 'sentry/views/issueDetails/streamline/hooks/useIssueDetailsDiscoverQuery';
 import {Tab, TabPaths} from 'sentry/views/issueDetails/types';
 import {useGroupDetailsRoute} from 'sentry/views/issueDetails/useGroupDetailsRoute';
@@ -62,10 +63,9 @@ const TabName = {
 interface IssueEventNavigationProps {
   event: Event | undefined;
   group: Group;
-  query: string | undefined;
 }
 
-export function IssueEventNavigation({event, group, query}: IssueEventNavigationProps) {
+export function IssueEventNavigation({event, group}: IssueEventNavigationProps) {
   const theme = useTheme();
   const organization = useOrganization();
   const {baseUrl, currentTab} = useGroupDetailsRoute();
@@ -76,7 +76,7 @@ export function IssueEventNavigation({event, group, query}: IssueEventNavigation
   const [shouldPreload, setShouldPreload] = useState({next: false, previous: false});
   const environments = useEnvironmentsFromUrl();
   const eventView = useIssueDetailsEventView({group});
-
+  const {eventCount} = useIssueDetails();
   const issueTypeConfig = getConfigForIssueType(group, group.project);
 
   const hideDropdownButton =
@@ -156,9 +156,6 @@ export function IssueEventNavigation({event, group, query}: IssueEventNavigation
     attachmentPagination.next?.results || attachmentPagination.previous?.results;
 
   const selectedOption = useMemo(() => {
-    if (query?.trim()) {
-      return EventNavOptions.CUSTOM;
-    }
     switch (params.eventId) {
       case EventNavOptions.RECOMMENDED:
       case EventNavOptions.LATEST:
@@ -169,7 +166,7 @@ export function IssueEventNavigation({event, group, query}: IssueEventNavigation
       default:
         return EventNavOptions.CUSTOM;
     }
-  }, [query, params.eventId, defaultIssueEvent]);
+  }, [params.eventId, defaultIssueEvent]);
 
   const onTabChange = (tabKey: typeof selectedOption) => {
     trackAnalytics('issue_details.event_navigation_selected', {
@@ -207,7 +204,7 @@ export function IssueEventNavigation({event, group, query}: IssueEventNavigation
               key: Tab.DETAILS,
               label: (
                 <DropdownCountWrapper isCurrentTab={currentTab === Tab.DETAILS}>
-                  {TabName[Tab.DETAILS]} <ItemCount value={group.count} />
+                  {TabName[Tab.DETAILS]} <ItemCount value={eventCount ?? 0} />
                 </DropdownCountWrapper>
               ),
               textValue: TabName[Tab.DETAILS],
@@ -292,125 +289,123 @@ export function IssueEventNavigation({event, group, query}: IssueEventNavigation
         />
         <LargeInThisIssueText aria-hidden>{t('in this issue')}</LargeInThisIssueText>
       </LargeDropdownButtonWrapper>
-      {event ? (
-        <NavigationWrapper>
-          {currentTab === Tab.DETAILS && (
-            <Fragment>
-              <Navigation>
-                <Tooltip title={t('Previous Event')} skipWrapper>
-                  <LinkButton
-                    aria-label={t('Previous Event')}
-                    borderless
-                    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'},
-                    }}
-                    css={grayText}
-                    onMouseEnter={handleHoverPagination(
-                      'previous',
-                      defined(event.previousEventID)
-                    )}
-                    onClick={() => {
-                      // Assume they will continue to paginate
-                      setShouldPreload({next: true, previous: true});
-                    }}
-                  />
-                </Tooltip>
-                <Tooltip title={t('Next Event')} skipWrapper>
-                  <LinkButton
-                    aria-label={t('Next Event')}
-                    borderless
-                    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'},
-                    }}
-                    css={grayText}
-                    onMouseEnter={handleHoverPagination(
-                      'next',
-                      defined(event.nextEventID)
-                    )}
-                    onClick={() => {
-                      // Assume they will continue to paginate
-                      setShouldPreload({next: true, previous: true});
-                    }}
-                  />
-                </Tooltip>
-              </Navigation>
-              <Tabs value={selectedOption} disableOverflow onChange={onTabChange}>
-                <TabList hideBorder variant="floating">
-                  {EventNavOrder.map(label => {
-                    const eventPath =
-                      label === selectedOption
-                        ? undefined
-                        : {
-                            pathname: normalizeUrl(baseEventsPath + label + '/'),
-                            query: {...location.query, referrer: `${label}-event`},
-                          };
-                    return (
-                      <TabList.Item
-                        to={eventPath}
-                        key={label}
-                        hidden={label === EventNavOptions.CUSTOM}
-                        textValue={EventNavLabels[label]}
-                      >
-                        {EventNavLabels[label]}
-                      </TabList.Item>
-                    );
-                  })}
-                </TabList>
-              </Tabs>
-            </Fragment>
-          )}
-          {currentTab === Tab.DETAILS && (
+      <NavigationWrapper>
+        {currentTab === Tab.DETAILS && (
+          <Fragment>
+            <Navigation>
+              <Tooltip title={t('Previous Event')} skipWrapper>
+                <LinkButton
+                  aria-label={t('Previous Event')}
+                  borderless
+                  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'},
+                  }}
+                  css={grayText}
+                  onMouseEnter={handleHoverPagination(
+                    'previous',
+                    defined(event?.previousEventID)
+                  )}
+                  onClick={() => {
+                    // Assume they will continue to paginate
+                    setShouldPreload({next: true, previous: true});
+                  }}
+                />
+              </Tooltip>
+              <Tooltip title={t('Next Event')} skipWrapper>
+                <LinkButton
+                  aria-label={t('Next Event')}
+                  borderless
+                  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'},
+                  }}
+                  css={grayText}
+                  onMouseEnter={handleHoverPagination(
+                    'next',
+                    defined(event?.nextEventID)
+                  )}
+                  onClick={() => {
+                    // Assume they will continue to paginate
+                    setShouldPreload({next: true, previous: true});
+                  }}
+                />
+              </Tooltip>
+            </Navigation>
+            <Tabs value={selectedOption} disableOverflow onChange={onTabChange}>
+              <TabList hideBorder variant="floating">
+                {EventNavOrder.map(label => {
+                  const eventPath =
+                    label === selectedOption
+                      ? undefined
+                      : {
+                          pathname: normalizeUrl(baseEventsPath + label + '/'),
+                          query: {...location.query, referrer: `${label}-event`},
+                        };
+                  return (
+                    <TabList.Item
+                      to={eventPath}
+                      key={label}
+                      hidden={label === EventNavOptions.CUSTOM}
+                      textValue={EventNavLabels[label]}
+                    >
+                      {EventNavLabels[label]}
+                    </TabList.Item>
+                  );
+                })}
+              </TabList>
+            </Tabs>
+          </Fragment>
+        )}
+        {currentTab === Tab.DETAILS && (
+          <LinkButton
+            to={{
+              pathname: `${baseUrl}${TabPaths[Tab.EVENTS]}`,
+              query: location.query,
+            }}
+            size="xs"
+            analyticsEventKey="issue_details.all_events_clicked"
+            analyticsEventName="Issue Details: All Events Clicked"
+          >
+            {t('All Events')}
+          </LinkButton>
+        )}
+
+        {currentTab === Tab.EVENTS && (
+          <ButtonBar gap={1}>
+            <LinkButton
+              to={discoverUrl}
+              aria-label={t('Open in Discover')}
+              size="xs"
+              icon={<IconTelescope />}
+              analyticsEventKey="issue_details.discover_clicked"
+              analyticsEventName="Issue Details: Discover Clicked"
+            >
+              {t('Discover')}
+            </LinkButton>
             <LinkButton
               to={{
-                pathname: `${baseUrl}${TabPaths[Tab.EVENTS]}`,
-                query: location.query,
+                pathname: `${baseUrl}${TabPaths[Tab.DETAILS]}`,
+                query: {...location.query, cursor: undefined},
               }}
+              aria-label={t('Return to event details')}
               size="xs"
-              analyticsEventKey="issue_details.all_events_clicked"
-              analyticsEventName="Issue Details: All Events Clicked"
             >
-              {t('All Events')}
+              {t('Close')}
             </LinkButton>
-          )}
-
-          {currentTab === Tab.EVENTS && (
-            <ButtonBar gap={1}>
-              <LinkButton
-                to={discoverUrl}
-                aria-label={t('Open in Discover')}
-                size="xs"
-                icon={<IconTelescope />}
-                analyticsEventKey="issue_details.discover_clicked"
-                analyticsEventName="Issue Details: Discover Clicked"
-              >
-                {t('Discover')}
-              </LinkButton>
-              <LinkButton
-                to={{
-                  pathname: `${baseUrl}${TabPaths[Tab.DETAILS]}`,
-                  query: {...location.query, cursor: undefined},
-                }}
-                aria-label={t('Return to event details')}
-                size="xs"
-              >
-                {t('Close')}
-              </LinkButton>
-            </ButtonBar>
-          )}
-        </NavigationWrapper>
-      ) : null}
+          </ButtonBar>
+        )}
+      </NavigationWrapper>
     </EventNavigationWrapper>
   );
 }
diff --git a/static/app/views/issueDetails/streamline/eventSearch.spec.tsx b/static/app/views/issueDetails/streamline/eventSearch.spec.tsx
index e3e757ea9c433a..6f4409a9e3812a 100644
--- a/static/app/views/issueDetails/streamline/eventSearch.spec.tsx
+++ b/static/app/views/issueDetails/streamline/eventSearch.spec.tsx
@@ -74,53 +74,65 @@ describe('EventSearch', () => {
   it('filters issue tokens from event queries', function () {
     const validQuery = `${tagKey}:${tagValue} device.family:[iphone,pixel]`;
 
-    const {result: onlyIssueTokens} = renderHook(() => useEventQuery({group}), {
-      wrapper: makeAllTheProviders({
-        organization,
-        router: RouterFixture({
-          location: LocationFixture({
-            query: {query: 'is:resolved assigned:[me,#issues] issue.priority:high'},
+    const {result: onlyIssueTokens} = renderHook(
+      () => useEventQuery({groupId: group.id}),
+      {
+        wrapper: makeAllTheProviders({
+          organization,
+          router: RouterFixture({
+            location: LocationFixture({
+              query: {query: 'is:resolved assigned:[me,#issues] issue.priority:high'},
+            }),
           }),
         }),
-      }),
-    });
+      }
+    );
     expect(onlyIssueTokens.current).toBe('');
 
-    const {result: combinedTokens} = renderHook(() => useEventQuery({group}), {
-      wrapper: makeAllTheProviders({
-        organization,
-        router: RouterFixture({
-          location: LocationFixture({
-            query: {query: `is:resolved assigned:[me,#issues] ${validQuery}`},
+    const {result: combinedTokens} = renderHook(
+      () => useEventQuery({groupId: group.id}),
+      {
+        wrapper: makeAllTheProviders({
+          organization,
+          router: RouterFixture({
+            location: LocationFixture({
+              query: {query: `is:resolved assigned:[me,#issues] ${validQuery}`},
+            }),
           }),
         }),
-      }),
-    });
+      }
+    );
     expect(combinedTokens.current).toBe(validQuery);
 
-    const {result: onlyEventTokens} = renderHook(() => useEventQuery({group}), {
-      wrapper: makeAllTheProviders({
-        organization,
-        router: RouterFixture({
-          location: LocationFixture({
-            query: {query: validQuery},
+    const {result: onlyEventTokens} = renderHook(
+      () => useEventQuery({groupId: group.id}),
+      {
+        wrapper: makeAllTheProviders({
+          organization,
+          router: RouterFixture({
+            location: LocationFixture({
+              query: {query: validQuery},
+            }),
           }),
         }),
-      }),
-    });
+      }
+    );
     expect(onlyEventTokens.current).toBe(validQuery);
 
-    const {result: unrecognizedFilterKey} = renderHook(() => useEventQuery({group}), {
-      wrapper: makeAllTheProviders({
-        organization,
-        router: RouterFixture({
-          location: LocationFixture({
-            // This isn't in the TagsFixture or ISSUE_EVENT_PROPERTY_FIELDS
-            query: {query: `${validQuery} organization.slug:sentry`},
+    const {result: unrecognizedFilterKey} = renderHook(
+      () => useEventQuery({groupId: group.id}),
+      {
+        wrapper: makeAllTheProviders({
+          organization,
+          router: RouterFixture({
+            location: LocationFixture({
+              // This isn't in the TagsFixture or ISSUE_EVENT_PROPERTY_FIELDS
+              query: {query: `${validQuery} organization.slug:sentry`},
+            }),
           }),
         }),
-      }),
-    });
+      }
+    );
     expect(unrecognizedFilterKey.current).toBe(validQuery);
   });
 });
diff --git a/static/app/views/issueDetails/streamline/eventSearch.tsx b/static/app/views/issueDetails/streamline/eventSearch.tsx
index 5ae001f4aa6cf6..be279498617820 100644
--- a/static/app/views/issueDetails/streamline/eventSearch.tsx
+++ b/static/app/views/issueDetails/streamline/eventSearch.tsx
@@ -41,7 +41,7 @@ interface EventSearchProps {
   queryBuilderProps?: Partial<SearchQueryBuilderProps>;
 }
 
-export function useEventQuery({group}: {group: Group}): string {
+export function useEventQuery({groupId}: {groupId: string}): string {
   const {selection} = usePageFilters();
   const location = useLocation();
   const environments = selection.environments;
@@ -55,7 +55,7 @@ export function useEventQuery({group}: {group: Group}): string {
   }
 
   const {data = []} = useGroupTags({
-    groupId: group.id,
+    groupId,
     environment: environments,
   });
   const filterKeys = useEventSearchFilterKeys(data);
diff --git a/static/app/views/issueDetails/streamline/eventTitle.spec.tsx b/static/app/views/issueDetails/streamline/eventTitle.spec.tsx
index 0148a50e0de6da..314f0d92130c3c 100644
--- a/static/app/views/issueDetails/streamline/eventTitle.spec.tsx
+++ b/static/app/views/issueDetails/streamline/eventTitle.spec.tsx
@@ -3,7 +3,7 @@ import {GroupFixture} from 'sentry-fixture/group';
 
 import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 
-import {SectionKey, useEventDetails} from 'sentry/views/issueDetails/streamline/context';
+import {SectionKey, useIssueDetails} from 'sentry/views/issueDetails/streamline/context';
 
 import {EventTitle} from './eventTitle';
 
@@ -30,12 +30,15 @@ describe('EventNavigation', () => {
 
   beforeEach(() => {
     jest.resetAllMocks();
-    jest.mocked(useEventDetails).mockReturnValue({
+    jest.mocked(useIssueDetails).mockReturnValue({
       sectionData: {
         highlights: {key: SectionKey.HIGHLIGHTS},
         tags: {key: SectionKey.TAGS},
         replay: {key: SectionKey.REPLAY},
       },
+      eventCount: 0,
+      isSidebarOpen: true,
+      navScrollMargin: 0,
       dispatch: jest.fn(),
     });
     Object.assign(navigator, {
@@ -53,8 +56,11 @@ describe('EventNavigation', () => {
   });
 
   it('does not show jump to sections by default', () => {
-    jest.mocked(useEventDetails).mockReturnValue({
+    jest.mocked(useIssueDetails).mockReturnValue({
       sectionData: {},
+      eventCount: 0,
+      isSidebarOpen: true,
+      navScrollMargin: 0,
       dispatch: jest.fn(),
     });
     render(<EventTitle {...defaultProps} />);
diff --git a/static/app/views/issueDetails/streamline/eventTitle.tsx b/static/app/views/issueDetails/streamline/eventTitle.tsx
index f44e638faa6136..fecf0075ef95a5 100644
--- a/static/app/views/issueDetails/streamline/eventTitle.tsx
+++ b/static/app/views/issueDetails/streamline/eventTitle.tsx
@@ -28,7 +28,7 @@ import EventCreatedTooltip from 'sentry/views/issueDetails/eventCreatedTooltip';
 import {
   type SectionConfig,
   SectionKey,
-  useEventDetails,
+  useIssueDetails,
 } from 'sentry/views/issueDetails/streamline/context';
 import {getFoldSectionKey} from 'sentry/views/issueDetails/streamline/foldSection';
 
@@ -64,7 +64,7 @@ export const EventTitle = forwardRef<HTMLDivElement, EventNavigationProps>(
     const organization = useOrganization();
     const theme = useTheme();
 
-    const {sectionData} = useEventDetails();
+    const {sectionData} = useIssueDetails();
     const eventSectionConfigs = Object.values(sectionData ?? {}).filter(
       config => sectionLabels[config.key]
     );
@@ -95,6 +95,7 @@ export const EventTitle = forwardRef<HTMLDivElement, EventNavigationProps>(
       trackAnalytics('issue_details.event_json_clicked', {
         organization,
         group_id: parseInt(`${event.groupID}`, 10),
+        streamline: true,
       });
     };
 
@@ -106,12 +107,20 @@ export const EventTitle = forwardRef<HTMLDivElement, EventNavigationProps>(
           organization,
           ...getAnalyticsDataForGroup(group),
           ...getAnalyticsDataForEvent(event),
+          streamline: true,
         }),
     });
 
     const {onClick: copyEventId} = useCopyToClipboard({
       successMessage: t('Event ID copied to clipboard'),
       text: event.id,
+      onCopy: () =>
+        trackAnalytics('issue_details.copy_event_id_clicked', {
+          organization,
+          ...getAnalyticsDataForGroup(group),
+          ...getAnalyticsDataForEvent(event),
+          streamline: true,
+        }),
     });
 
     return (
diff --git a/static/app/views/issueDetails/streamline/foldSection.tsx b/static/app/views/issueDetails/streamline/foldSection.tsx
index 17a64e129b403d..367d1418836f62 100644
--- a/static/app/views/issueDetails/streamline/foldSection.tsx
+++ b/static/app/views/issueDetails/streamline/foldSection.tsx
@@ -19,7 +19,7 @@ import mergeRefs from 'sentry/utils/mergeRefs';
 import useOrganization from 'sentry/utils/useOrganization';
 import {useSyncedLocalStorageState} from 'sentry/utils/useSyncedLocalStorageState';
 import type {SectionKey} from 'sentry/views/issueDetails/streamline/context';
-import {useEventDetails} from 'sentry/views/issueDetails/streamline/context';
+import {useIssueDetails} from 'sentry/views/issueDetails/streamline/context';
 
 export function getFoldSectionKey(key: SectionKey) {
   return `'issue-details-fold-section-collapse:${key}`;
@@ -60,7 +60,7 @@ export const FoldSection = forwardRef<HTMLElement, FoldSectionProps>(function Fo
   forwardedRef
 ) {
   const organization = useOrganization();
-  const {sectionData, navScrollMargin, dispatch} = useEventDetails();
+  const {sectionData, navScrollMargin, dispatch} = useIssueDetails();
   // Does not control open/close state. Controls what state is persisted to local storage
   const [isCollapsed, setIsCollapsed] = useSyncedLocalStorageState(
     getFoldSectionKey(sectionKey),
@@ -94,7 +94,11 @@ export const FoldSection = forwardRef<HTMLElement, FoldSectionProps>(function Fo
 
   useLayoutEffect(() => {
     if (!sectionData.hasOwnProperty(sectionKey)) {
-      dispatch({type: 'UPDATE_SECTION', key: sectionKey, config: {initialCollapse}});
+      dispatch({
+        type: 'UPDATE_EVENT_SECTION',
+        key: sectionKey,
+        config: {initialCollapse},
+      });
     }
   }, [sectionData, dispatch, sectionKey, initialCollapse]);
 
@@ -172,7 +176,7 @@ export const SectionDivider = styled('hr')`
   }
 `;
 
-export const Section = styled('section')<{scrollMargin: number}>`
+const Section = styled('section')<{scrollMargin: number}>`
   scroll-margin-top: calc(${space(1)} + ${p => p.scrollMargin ?? 0}px);
 `;
 
diff --git a/static/app/views/issueDetails/streamline/groupDetailsLayout.tsx b/static/app/views/issueDetails/streamline/groupDetailsLayout.tsx
index 5c819d1292cea3..335f4dec8fc983 100644
--- a/static/app/views/issueDetails/streamline/groupDetailsLayout.tsx
+++ b/static/app/views/issueDetails/streamline/groupDetailsLayout.tsx
@@ -1,4 +1,3 @@
-import {Fragment} from 'react';
 import styled from '@emotion/styled';
 
 import * as Layout from 'sentry/components/layouts/thirds';
@@ -9,10 +8,12 @@ import type {Project} from 'sentry/types/project';
 import {getConfigForIssueType} from 'sentry/utils/issueTypeConfig';
 import theme from 'sentry/utils/theme';
 import useMedia from 'sentry/utils/useMedia';
-import {useSyncedLocalStorageState} from 'sentry/utils/useSyncedLocalStorageState';
+import {
+  IssueDetailsContext,
+  useIssueDetailsReducer,
+} from 'sentry/views/issueDetails/streamline/context';
 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/header';
 import StreamlinedSidebar from 'sentry/views/issueDetails/streamline/sidebar/sidebar';
 import {ToggleSidebar} from 'sentry/views/issueDetails/streamline/sidebar/toggleSidebar';
@@ -31,29 +32,31 @@ export function GroupDetailsLayout({
   project,
   children,
 }: GroupDetailsLayoutProps) {
-  const searchQuery = useEventQuery({group});
-  const [sidebarOpen] = useSyncedLocalStorageState('issue-details-sidebar-open', true);
+  const {issueDetails, dispatch} = useIssueDetailsReducer();
   const isScreenSmall = useMedia(`(max-width: ${theme.breakpoints.large})`);
-  const shouldDisplaySidebar = sidebarOpen || isScreenSmall;
+  const shouldDisplaySidebar = issueDetails.isSidebarOpen || isScreenSmall;
   const issueTypeConfig = getConfigForIssueType(group, group.project);
   const groupReprocessingStatus = getGroupReprocessingStatus(group);
 
   return (
-    <Fragment>
+    <IssueDetailsContext.Provider value={{...issueDetails, dispatch}}>
       <StreamlinedGroupHeader
         group={group}
         event={event ?? null}
         project={project}
         groupReprocessingStatus={groupReprocessingStatus}
       />
-      <StyledLayoutBody data-test-id="group-event-details" sidebarOpen={sidebarOpen}>
+      <StyledLayoutBody
+        data-test-id="group-event-details"
+        sidebarOpen={issueDetails.isSidebarOpen}
+      >
         <div>
           <EventDetailsHeader event={event} group={group} project={project} />
           <GroupContent>
             <NavigationSidebarWrapper
               hasToggleSidebar={!issueTypeConfig.filterAndSearchHeader.enabled}
             >
-              <IssueEventNavigation event={event} group={group} query={searchQuery} />
+              <IssueEventNavigation event={event} group={group} />
               {/* Since the event details header is disabled, display the sidebar toggle here */}
               {!issueTypeConfig.filterAndSearchHeader.enabled && (
                 <ToggleSidebar size="sm" />
@@ -66,7 +69,7 @@ export function GroupDetailsLayout({
           <StreamlinedSidebar group={group} event={event} project={project} />
         ) : null}
       </StyledLayoutBody>
-    </Fragment>
+    </IssueDetailsContext.Provider>
   );
 }
 
diff --git a/static/app/views/issueDetails/streamline/header/userFeedbackBadge.tsx b/static/app/views/issueDetails/streamline/header/userFeedbackBadge.tsx
index fcf8af2ebbe27d..5a1bedbe14433e 100644
--- a/static/app/views/issueDetails/streamline/header/userFeedbackBadge.tsx
+++ b/static/app/views/issueDetails/streamline/header/userFeedbackBadge.tsx
@@ -43,7 +43,7 @@ export function UserFeedbackBadge({group, project}: {group: Group; project: Proj
   );
 }
 
-export const UserFeedbackButton = styled(LinkButton)`
+const UserFeedbackButton = styled(LinkButton)`
   color: ${p => p.theme.gray300};
   text-decoration: underline;
   text-decoration-style: dotted;
diff --git a/static/app/views/issueDetails/streamline/hooks/useAiConfig.tsx b/static/app/views/issueDetails/streamline/hooks/useAiConfig.tsx
index 3170c20ae427bb..6a3ffcd235c0b0 100644
--- a/static/app/views/issueDetails/streamline/hooks/useAiConfig.tsx
+++ b/static/app/views/issueDetails/streamline/hooks/useAiConfig.tsx
@@ -8,7 +8,7 @@ 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) {
+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)) {
diff --git a/static/app/views/issueDetails/streamline/hooks/useEventMarkLineSeries.tsx b/static/app/views/issueDetails/streamline/hooks/useEventMarkLineSeries.tsx
new file mode 100644
index 00000000000000..dfd3634cb7633b
--- /dev/null
+++ b/static/app/views/issueDetails/streamline/hooks/useEventMarkLineSeries.tsx
@@ -0,0 +1,119 @@
+import {useTheme} from '@emotion/react';
+import type {LineSeriesOption} from 'echarts';
+
+import MarkLine from 'sentry/components/charts/components/markLine';
+import {t} from 'sentry/locale';
+import type {Event} from 'sentry/types/event';
+import type {Group} from 'sentry/types/group';
+import {getFormattedDate} from 'sentry/utils/dates';
+import {getShortEventId} from 'sentry/utils/events';
+import {useNavigate} from 'sentry/utils/useNavigate';
+import useOrganization from 'sentry/utils/useOrganization';
+import {useIssueDetailsEventView} from 'sentry/views/issueDetails/streamline/hooks/useIssueDetailsDiscoverQuery';
+
+function useEventMarklineSeries({
+  events,
+  group,
+  markLineProps = {},
+}: {
+  events: Event[];
+  group: Group;
+  markLineProps?: Partial<LineSeriesOption['markLine']>;
+}) {
+  const theme = useTheme();
+  const navigate = useNavigate();
+  const organization = useOrganization();
+  const eventView = useIssueDetailsEventView({group});
+  const baseEventsPath = `/organizations/${organization.slug}/issues/${group.id}/events/`;
+
+  const markLine = events.length
+    ? MarkLine({
+        animation: false,
+        lineStyle: {
+          color: theme.pink200,
+          type: 'solid',
+        },
+        label: {
+          show: false,
+        },
+        data: events.map(event => ({
+          xAxis: +new Date(event.dateCreated ?? event.dateReceived),
+          name: getShortEventId(event.id),
+          value: getShortEventId(event.id),
+          onClick: () => {
+            navigate({
+              pathname: `${baseEventsPath}${event.id}/`,
+            });
+          },
+          label: {
+            formatter: () => getShortEventId(event.id),
+          },
+        })),
+        tooltip: {
+          trigger: 'item',
+          formatter: ({data}: any) => {
+            const time = getFormattedDate(data.value, 'MMM D, YYYY LT', {
+              local: !eventView.utc,
+            });
+            return [
+              '<div class="tooltip-series">',
+              `<div><span class="tooltip-label"><strong>${data.name}</strong></span></div>`,
+              '</div>',
+              `<div class="tooltip-footer">${time}</div>`,
+              '<div class="tooltip-arrow"></div>',
+            ].join('');
+          },
+        },
+        ...markLineProps,
+      })
+    : undefined;
+
+  return {
+    seriesName: t('Specific Events'),
+    data: [],
+    markLine,
+    color: theme.pink200,
+    type: 'line',
+  };
+}
+
+export function useCurrentEventMarklineSeries({
+  event,
+  group,
+  markLineProps = {},
+}: {
+  group: Group;
+  event?: Event;
+  markLineProps?: Partial<LineSeriesOption['markLine']>;
+}) {
+  const eventView = useIssueDetailsEventView({group});
+
+  const result = useEventMarklineSeries({
+    events: event ? [event] : [],
+    group,
+    markLineProps: {
+      tooltip: {
+        trigger: 'item',
+        formatter: ({data}: any) => {
+          const time = getFormattedDate(data.value, 'MMM D, YYYY LT', {
+            local: !eventView.utc,
+          });
+          return [
+            '<div class="tooltip-series">',
+            `<div><span class="tooltip-label"><strong>${t(
+              'Current Event'
+            )}</strong></span></div>`,
+            '</div>',
+            `<div class="tooltip-footer">${time}</div>`,
+            '<div class="tooltip-arrow"></div>',
+          ].join('');
+        },
+      },
+      ...markLineProps,
+    },
+  });
+  return {
+    ...result,
+    seriesName: t('Current Event'),
+  };
+}
diff --git a/static/app/views/issueDetails/streamline/hooks/useFlagSeries.tsx b/static/app/views/issueDetails/streamline/hooks/useFlagSeries.tsx
index 095c6661cc3a51..13fca675343fb1 100644
--- a/static/app/views/issueDetails/streamline/hooks/useFlagSeries.tsx
+++ b/static/app/views/issueDetails/streamline/hooks/useFlagSeries.tsx
@@ -39,6 +39,14 @@ export default function useFlagSeries({query = {}, event}: FlagSeriesProps) {
     evaluatedFlagNames?.includes(f.name)
   );
 
+  if (!intersectionFlags.length) {
+    return {
+      seriesName: t('Feature Flags'),
+      markLine: {},
+      data: [],
+    };
+  }
+
   // create a markline series using hydrated flag data
   const markLine = MarkLine({
     animation: false,
diff --git a/static/app/views/issueDetails/streamline/hooks/useIssueDetailsDiscoverQuery.tsx b/static/app/views/issueDetails/streamline/hooks/useIssueDetailsDiscoverQuery.tsx
index d66664687e3166..370085383c3690 100644
--- a/static/app/views/issueDetails/streamline/hooks/useIssueDetailsDiscoverQuery.tsx
+++ b/static/app/views/issueDetails/streamline/hooks/useIssueDetailsDiscoverQuery.tsx
@@ -22,13 +22,13 @@ export function useIssueDetailsEventView({
   queryProps?: Partial<SavedQuery>;
 }) {
   const {selection: pageFilters} = usePageFilters();
-  const searchQuery = useEventQuery({group});
+  const searchQuery = useEventQuery({groupId: group.id});
   const periodQuery = getPeriod(pageFilters.datetime);
   const interval = getInterval(pageFilters.datetime, 'issues');
   const config = getConfigForIssueType(group, group.project);
 
-  const query = [`issue:${group.shortId}`, searchQuery]
-    .filter(s => s.length > 0)
+  const query = [`issue:${group.shortId}`, searchQuery, queryProps?.query]
+    .filter(s => s && s.length > 0)
     .join(' ');
 
   const discoverQuery: NewQuery = {
diff --git a/static/app/views/issueDetails/streamline/hooks/useSuspectFlags.tsx b/static/app/views/issueDetails/streamline/hooks/useSuspectFlags.tsx
index 28b7c791c30c41..e8752057b174dc 100644
--- a/static/app/views/issueDetails/streamline/hooks/useSuspectFlags.tsx
+++ b/static/app/views/issueDetails/streamline/hooks/useSuspectFlags.tsx
@@ -35,8 +35,13 @@ export default function useSuspectFlags({
   );
 
   // no flags in common between event evaluations and audit log
+  // only track this analytic if there is at least 1 flag recorded
+  // in either the audit log or the event context
   useEffect(() => {
-    if (!intersectionFlags.length) {
+    if (
+      !intersectionFlags.length &&
+      (hydratedFlagData.length || evaluatedFlagNames?.length)
+    ) {
       trackAnalytics('flags.event_and_suspect_flags_found', {
         numTotalFlags: hydratedFlagData.length,
         numEventFlags: 0,
@@ -44,7 +49,12 @@ export default function useSuspectFlags({
         organization,
       });
     }
-  }, [hydratedFlagData.length, intersectionFlags.length, organization]);
+  }, [
+    hydratedFlagData.length,
+    intersectionFlags.length,
+    organization,
+    evaluatedFlagNames?.length,
+  ]);
 
   // get all the audit log flag changes which happened prior to the first seen date
   const start = moment(firstSeen).subtract(1, 'year').format('YYYY-MM-DD HH:mm:ss');
diff --git a/static/app/views/issueDetails/streamline/issueTagsPreview.tsx b/static/app/views/issueDetails/streamline/issueTagsPreview.tsx
new file mode 100644
index 00000000000000..188a6edceb6eda
--- /dev/null
+++ b/static/app/views/issueDetails/streamline/issueTagsPreview.tsx
@@ -0,0 +1,82 @@
+import {Fragment, useMemo} from 'react';
+import styled from '@emotion/styled';
+
+import Placeholder from 'sentry/components/placeholder';
+import {space} from 'sentry/styles/space';
+import {TagPreviewDistribution} from 'sentry/views/issueDetails/groupTags/tagDistribution';
+import {useGroupTagsReadable} from 'sentry/views/issueDetails/groupTags/useGroupTags';
+
+export default function IssueTagsPreview({
+  groupId,
+  environments,
+}: {
+  environments: string[];
+  groupId: string;
+}) {
+  const {
+    isError,
+    isPending,
+    data: tags,
+  } = useGroupTagsReadable({
+    groupId,
+    environment: environments,
+    limit: 3,
+  });
+  const tagToPreview = useMemo(() => {
+    const priorityTags = ['browser.name', 'os.name', 'runtime.name', 'environment'];
+    // Sort tags based on priority order defined in priorityTags array
+    const sortedTags = tags
+      ?.filter(tag => priorityTags.includes(tag.key))
+      .sort((a, b) => priorityTags.indexOf(a.key) - priorityTags.indexOf(b.key));
+
+    return sortedTags?.[0] ?? null;
+  }, [tags]);
+
+  if (isPending) {
+    return (
+      <LoadingContainer style={{paddingTop: space(1)}}>
+        <Placeholder width="155px" height="95px" />
+        <SectionDivider />
+      </LoadingContainer>
+    );
+  }
+
+  if (isError || !tagToPreview) {
+    return null;
+  }
+
+  return (
+    <Fragment>
+      <TagsPreview>
+        <TagPreviewDistribution tag={tagToPreview} />
+      </TagsPreview>
+      <SectionDivider />
+    </Fragment>
+  );
+}
+
+const TagsPreview = styled('div')`
+  padding-top: ${space(1)};
+  max-width: 25%;
+  width: 155px;
+
+  @media (max-width: ${p => p.theme.breakpoints.small}) {
+    display: none;
+  }
+`;
+
+const LoadingContainer = styled('div')`
+  padding-top: ${space(1)};
+  display: flex;
+`;
+
+const SectionDivider = styled('div')`
+  border-left: 1px solid ${p => p.theme.translucentBorder};
+  display: flex;
+  align-items: center;
+  margin: ${space(1)};
+
+  @media (max-width: ${p => p.theme.breakpoints.small}) {
+    display: none;
+  }
+`;
diff --git a/static/app/views/issueDetails/streamline/sidebar/activitySection.spec.tsx b/static/app/views/issueDetails/streamline/sidebar/activitySection.spec.tsx
index 07aebcfa91abed..a46cfdd69e4775 100644
--- a/static/app/views/issueDetails/streamline/sidebar/activitySection.spec.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/activitySection.spec.tsx
@@ -34,7 +34,7 @@ describe('StreamlinedActivitySection', function () {
         id: 'note-1',
         data: {text: 'Test Note'},
         dateCreated: '2020-01-01T00:00:00',
-        user: user,
+        user,
         project,
       },
     ],
@@ -142,7 +142,7 @@ describe('StreamlinedActivitySection', function () {
           id: 'note-1',
           data: {text: 'Group Test'},
           dateCreated: '2020-01-01T00:00:00',
-          user: user,
+          user,
           project,
         },
       ],
diff --git a/static/app/views/issueDetails/streamline/sidebar/externalIssueList.tsx b/static/app/views/issueDetails/streamline/sidebar/externalIssueList.tsx
index 75d56f76166961..95940b34ea7369 100644
--- a/static/app/views/issueDetails/streamline/sidebar/externalIssueList.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/externalIssueList.tsx
@@ -135,7 +135,7 @@ export function ExternalIssueList({group, event, project}: ExternalIssueListProp
                         title={
                           integration.disabled ? integration.disabledText : undefined
                         }
-                        onClick={integration.actions[0].onClick}
+                        onClick={integration.actions[0]!.onClick}
                       />
                     </ErrorBoundary>
                   );
diff --git a/static/app/views/issueDetails/streamline/sidebar/firstLastSeenSection.tsx b/static/app/views/issueDetails/streamline/sidebar/firstLastSeenSection.tsx
index 8c3d711339c7c1..efa1fac52a554a 100644
--- a/static/app/views/issueDetails/streamline/sidebar/firstLastSeenSection.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/firstLastSeenSection.tsx
@@ -13,7 +13,7 @@ import {useApiQuery} from 'sentry/utils/queryClient';
 import useOrganization from 'sentry/utils/useOrganization';
 import {useFetchAllEnvsGroupData} from 'sentry/views/issueDetails/groupSidebar';
 
-export interface GroupRelease {
+interface GroupRelease {
   firstRelease: Release;
   lastRelease: Release;
 }
diff --git a/static/app/views/issueDetails/streamline/sidebar/groupActivityItem.tsx b/static/app/views/issueDetails/streamline/sidebar/groupActivityItem.tsx
index a33b875909eb0e..24bde87fc29bf7 100644
--- a/static/app/views/issueDetails/streamline/sidebar/groupActivityItem.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/groupActivityItem.tsx
@@ -332,7 +332,7 @@ export default function getGroupActivityItem(
                 release: (
                   <ActivityRelease
                     project={project}
-                    version={deployedReleases[0].version}
+                    version={deployedReleases[0]!.version}
                   />
                 ),
               }
@@ -357,7 +357,7 @@ export default function getGroupActivityItem(
                 release: (
                   <ActivityRelease
                     project={project}
-                    version={deployedReleases[0].version}
+                    version={deployedReleases[0]!.version}
                   />
                 ),
               }
@@ -493,8 +493,13 @@ export default function getGroupActivityItem(
       }
       case GroupActivityType.CREATE_ISSUE: {
         const {data} = activity;
+        let title = t('Created Issue');
+        if (data.new === true) {
+          title = t('Linked Issue');
+        }
+
         return {
-          title: t('Created Issue'),
+          title,
           message: tct('by [author] on [provider] titled [title]', {
             author,
             provider: data.provider,
diff --git a/static/app/views/issueDetails/streamline/sidebar/participantList.spec.tsx b/static/app/views/issueDetails/streamline/sidebar/participantList.spec.tsx
index b462c898bf7888..9b0e38f658d2df 100644
--- a/static/app/views/issueDetails/streamline/sidebar/participantList.spec.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/participantList.spec.tsx
@@ -36,7 +36,7 @@ describe('ParticipantList', () => {
     expect(screen.getByText('Teams (2)')).toBeInTheDocument();
     expect(screen.getByText('Individuals (2)')).toBeInTheDocument();
 
-    await userEvent.click(screen.getAllByText('JD')[0], {skipHover: true});
+    await userEvent.click(screen.getAllByText('JD')[0]!, {skipHover: true});
     expect(screen.queryByText('Bob Alice')).not.toBeInTheDocument();
   });
 
diff --git a/static/app/views/issueDetails/streamline/sidebar/sidebar.spec.tsx b/static/app/views/issueDetails/streamline/sidebar/sidebar.spec.tsx
index 679ee5a33d7fa4..e79a4bc19ae2ab 100644
--- a/static/app/views/issueDetails/streamline/sidebar/sidebar.spec.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/sidebar.spec.tsx
@@ -32,7 +32,7 @@ describe('StreamlinedSidebar', function () {
         id: 'note-1',
         data: {text: activityContent},
         dateCreated: '2020-01-01T00:00:00',
-        user: user,
+        user,
         project,
       },
     ],
diff --git a/static/app/views/issueDetails/streamline/sidebar/sidebar.tsx b/static/app/views/issueDetails/streamline/sidebar/sidebar.tsx
index 47ec3828f4038b..380be6f458d896 100644
--- a/static/app/views/issueDetails/streamline/sidebar/sidebar.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/sidebar.tsx
@@ -107,4 +107,7 @@ export const SidebarSectionTitle = styled(SidebarSection.Title)`
 const Side = styled(Layout.Side)`
   position: relative;
   padding: ${space(1.5)} ${space(2)};
+  @media (max-width: ${p => p.theme.breakpoints.large}) {
+    border-top: 1px solid ${p => p.theme.border};
+  }
 `;
diff --git a/static/app/views/issueDetails/streamline/sidebar/solutionsHubDrawer.spec.tsx b/static/app/views/issueDetails/streamline/sidebar/solutionsHubDrawer.spec.tsx
index ee3a30a2e4cf4b..2785a80d97fbef 100644
--- a/static/app/views/issueDetails/streamline/sidebar/solutionsHubDrawer.spec.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/solutionsHubDrawer.spec.tsx
@@ -14,7 +14,6 @@ import {
   waitForElementToBeRemoved,
 } from 'sentry-test/reactTestingLibrary';
 
-import {t} from 'sentry/locale';
 import {EntryType} from 'sentry/types/event';
 import {SolutionsHubDrawer} from 'sentry/views/issueDetails/streamline/sidebar/solutionsHubDrawer';
 
@@ -142,9 +141,7 @@ describe('SolutionsHubDrawer', () => {
     const startButton = screen.getByRole('button', {name: 'Start Autofix'});
     await userEvent.click(startButton);
 
-    expect(
-      await screen.findByRole('button', {name: t('Start Over')})
-    ).toBeInTheDocument();
+    expect(await screen.findByRole('button', {name: 'Start Over'})).toBeInTheDocument();
   });
 
   it('displays autofix steps and Start Over button when autofixData is available', async () => {
@@ -158,9 +155,7 @@ describe('SolutionsHubDrawer', () => {
       {organization}
     );
 
-    expect(
-      await screen.findByRole('button', {name: t('Start Over')})
-    ).toBeInTheDocument();
+    expect(await screen.findByRole('button', {name: 'Start Over'})).toBeInTheDocument();
   });
 
   it('resets autofix on clicking the start over button', async () => {
@@ -174,7 +169,7 @@ describe('SolutionsHubDrawer', () => {
       {organization}
     );
 
-    const startOverButton = await screen.findByRole('button', {name: t('Start Over')});
+    const startOverButton = await screen.findByRole('button', {name: 'Start Over'});
     expect(startOverButton).toBeInTheDocument();
     await userEvent.click(startOverButton);
 
diff --git a/static/app/views/issueDetails/streamline/sidebar/solutionsHubDrawer.tsx b/static/app/views/issueDetails/streamline/sidebar/solutionsHubDrawer.tsx
index 632a8d8579edd3..21a2194c08e640 100644
--- a/static/app/views/issueDetails/streamline/sidebar/solutionsHubDrawer.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/solutionsHubDrawer.tsx
@@ -8,8 +8,6 @@ import ProjectAvatar from 'sentry/components/avatar/projectAvatar';
 import FeatureBadge from 'sentry/components/badge/featureBadge';
 import {Breadcrumbs as NavigationBreadcrumbs} from 'sentry/components/breadcrumbs';
 import {Button} from 'sentry/components/button';
-import ButtonBar from 'sentry/components/buttonBar';
-import 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';
@@ -194,20 +192,17 @@ export function SolutionsHubDrawer({group, project, event}: SolutionsHubDrawerPr
             />
           </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>
+            <Button
+              size="xs"
+              onClick={reset}
+              title={
+                autofixData.created_at
+                  ? `Last run at ${autofixData.created_at.split('T')[0]}`
+                  : null
+              }
+            >
+              {t('Start Over')}
+            </Button>
           )}
         </HeaderText>
         {aiConfig.isAutofixSetupLoading ? (
diff --git a/static/app/views/issueDetails/streamline/sidebar/toggleSidebar.tsx b/static/app/views/issueDetails/streamline/sidebar/toggleSidebar.tsx
index f2e4b5f998847f..b446c5384994d1 100644
--- a/static/app/views/issueDetails/streamline/sidebar/toggleSidebar.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/toggleSidebar.tsx
@@ -4,27 +4,24 @@ import {Button} from 'sentry/components/button';
 import {IconChevron} from 'sentry/icons/iconChevron';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
-import {useSyncedLocalStorageState} from 'sentry/utils/useSyncedLocalStorageState';
+import {useIssueDetails} from 'sentry/views/issueDetails/streamline/context';
 
 export function ToggleSidebar({size = 'lg'}: {size?: 'lg' | 'sm'}) {
-  const [sidebarOpen, setSidebarOpen] = useSyncedLocalStorageState(
-    'issue-details-sidebar-open',
-    true
-  );
-  const direction = sidebarOpen ? 'right' : 'left';
+  const {isSidebarOpen, dispatch} = useIssueDetails();
+  const direction = isSidebarOpen ? 'right' : 'left';
   return (
     <ToggleContainer
-      sidebarOpen={sidebarOpen}
+      sidebarOpen={isSidebarOpen ?? true}
       style={{paddingTop: size === 'lg' ? '4px' : '0px'}}
     >
       <ToggleButton
-        onClick={() => setSidebarOpen(!sidebarOpen)}
-        aria-label={sidebarOpen ? t('Close sidebar') : t('Open sidebar')}
+        onClick={() => dispatch({type: 'UPDATE_SIDEBAR_STATE', isOpen: !isSidebarOpen})}
+        aria-label={isSidebarOpen ? t('Close sidebar') : t('Open sidebar')}
         style={{height: size === 'lg' ? '30px' : '26px'}}
         analyticsEventKey="issue_details.sidebar_toggle"
         analyticsEventName="Issue Details: Sidebar Toggle"
         analyticsParams={{
-          sidebar_open: !sidebarOpen,
+          sidebar_open: !isSidebarOpen,
         }}
       >
         <LeftChevron direction={direction} />
diff --git a/static/app/views/issueDetails/traceDataSection.spec.tsx b/static/app/views/issueDetails/traceDataSection.spec.tsx
index e03cfc443f3cc5..0b5f7c91bbd37b 100644
--- a/static/app/views/issueDetails/traceDataSection.spec.tsx
+++ b/static/app/views/issueDetails/traceDataSection.spec.tsx
@@ -64,7 +64,7 @@ describe('TraceDataSection', () => {
     culprit: 'n/a',
     'error.value': ['some-other-error-value', 'The last error value'],
     timestamp: firstEventTimestamp,
-    'issue.id': event['issue.id'],
+    'issue.id': (event as any)['issue.id'],
     project: project.slug,
     'project.name': project.name,
     title: event.title,
@@ -243,18 +243,18 @@ describe('TraceDataSection', () => {
     expect(trackAnalytics).toHaveBeenCalledWith(
       'issue_details.related_trace_issue.trace_issue_clicked',
       {
-        group_id: issuePlatformBody.data[0]['issue.id'],
-        organization: organization,
+        group_id: issuePlatformBody.data[0]!['issue.id'],
+        organization,
       }
     );
     expect(trackAnalytics).toHaveBeenCalledWith('one_other_related_trace_issue.clicked', {
-      group_id: issuePlatformBody.data[0]['issue.id'],
-      organization: organization,
+      group_id: issuePlatformBody.data[0]!['issue.id'],
+      organization,
       area: 'issue_details',
     });
   });
 
-  it('skips the timeline and shows NO related issues (only 1 issue)', async () => {
+  it('skips the timeline and shows NO related issues (only 1 issue)', () => {
     MockApiClient.addMockResponse({
       url: `/organizations/${organization.slug}/events/`,
       body: emptyBody,
@@ -275,13 +275,13 @@ describe('TraceDataSection', () => {
     render(<TraceDataSection event={event} />, {organization});
 
     // We do not display any related issues because we only have 1 issue
-    expect(await screen.queryByText('Slow DB Query')).not.toBeInTheDocument();
+    expect(screen.queryByText('Slow DB Query')).not.toBeInTheDocument();
     expect(
-      await screen.queryByText('AttributeError: Something Failed')
+      screen.queryByText('AttributeError: Something Failed')
     ).not.toBeInTheDocument();
 
     // We do not display the timeline because we only have 1 event
-    expect(await screen.queryByLabelText('Current Event')).not.toBeInTheDocument();
+    expect(screen.queryByLabelText('Current Event')).not.toBeInTheDocument();
     expect(useRouteAnalyticsParams).toHaveBeenCalledWith({});
   });
 
@@ -369,12 +369,12 @@ function createEvent({
   stack_function?: string[];
 }) {
   const event = {
-    culprit: culprit,
+    culprit,
     timestamp: '2024-01-24T09:09:04+00:00',
     'issue.id': 9999,
     project: 'foo',
     'project.name': 'bar',
-    title: title,
+    title,
     id: '12345',
     transaction: 'n/a',
     'event.type': event_type,
@@ -391,7 +391,7 @@ function createEvent({
   } else if (event['event.type'] === '') {
     return_event = {
       ...event,
-      message: message,
+      message,
     };
   } else {
     return_event = event;
diff --git a/static/app/views/issueDetails/traceDataSection.tsx b/static/app/views/issueDetails/traceDataSection.tsx
index a326444995e824..140c05096c119f 100644
--- a/static/app/views/issueDetails/traceDataSection.tsx
+++ b/static/app/views/issueDetails/traceDataSection.tsx
@@ -5,6 +5,7 @@ import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {Event} from 'sentry/types/event';
 import useRouteAnalyticsParams from 'sentry/utils/routeAnalytics/useRouteAnalyticsParams';
+import {useHasStreamlinedUI} from 'sentry/views/issueDetails/utils';
 
 import {TraceIssueEvent} from './traceTimeline/traceIssue';
 import {TraceLink} from './traceTimeline/traceLink';
@@ -12,8 +13,9 @@ import {TraceTimeline} from './traceTimeline/traceTimeline';
 import {useTraceTimelineEvents} from './traceTimeline/useTraceTimelineEvents';
 
 export function TraceDataSection({event}: {event: Event}) {
+  const hasStreamlinedUI = useHasStreamlinedUI();
   // This is also called within the TraceTimeline component but caching will save a second call
-  const {isLoading, oneOtherIssueEvent} = useTraceTimelineEvents({
+  const {isLoading, oneOtherIssueEvent, traceEvents} = useTraceTimelineEvents({
     event,
   });
   let params: Record<string, boolean> = {};
@@ -28,6 +30,11 @@ export function TraceDataSection({event}: {event: Event}) {
     return null;
   }
 
+  const noEvents = !isLoading && traceEvents.length === 0;
+  if (hasStreamlinedUI && (!oneOtherIssueEvent || noEvents)) {
+    return null;
+  }
+
   return (
     <Fragment>
       <StyledTraceLink>
diff --git a/static/app/views/issueDetails/traceTimeline/traceIssue.tsx b/static/app/views/issueDetails/traceTimeline/traceIssue.tsx
index 985ecb3dfeeacc..81347a57e58aab 100644
--- a/static/app/views/issueDetails/traceTimeline/traceIssue.tsx
+++ b/static/app/views/issueDetails/traceTimeline/traceIssue.tsx
@@ -51,7 +51,7 @@ export function TraceIssueEvent({event}: TraceIssueEventProps) {
           trackAnalytics('one_other_related_trace_issue.clicked', {
             organization,
             group_id: issueId,
-            area: area,
+            area,
           });
         }}
       >
@@ -101,7 +101,7 @@ export function getTitleSubtitleMessage(event: TimelineEvent) {
   try {
     if (event['event.type'] === 'error') {
       if (title[title.length - 1] !== ':') {
-        title = event.title.split(':')[0];
+        title = event.title.split(':')[0]!;
       }
       // It uses metadata.value which could differ depending on what error.value is used in the event manager
       // TODO: Add support for chained exceptions since we grab the value from the first stack trace
diff --git a/static/app/views/issueDetails/traceTimeline/traceTimelineTooltip.tsx b/static/app/views/issueDetails/traceTimeline/traceTimelineTooltip.tsx
index 8b319d2c7726e6..90041a80b63ba0 100644
--- a/static/app/views/issueDetails/traceTimeline/traceTimelineTooltip.tsx
+++ b/static/app/views/issueDetails/traceTimeline/traceTimelineTooltip.tsx
@@ -26,7 +26,7 @@ export function TraceTimelineTooltip({event, timelineEvents}: TraceTimelineToolt
   const area = useAnalyticsArea();
 
   // TODO: should handling of current event + other events look different
-  if (timelineEvents.length === 1 && timelineEvents[0].id === event.id) {
+  if (timelineEvents.length === 1 && timelineEvents[0]!.id === event.id) {
     return <YouAreHere>{t('You are here')}</YouAreHere>;
   }
 
diff --git a/static/app/views/issueDetails/traceTimeline/useTraceTimelineEvents.tsx b/static/app/views/issueDetails/traceTimeline/useTraceTimelineEvents.tsx
index 6d5604cceb3a71..2dce25fb27690e 100644
--- a/static/app/views/issueDetails/traceTimeline/useTraceTimelineEvents.tsx
+++ b/static/app/views/issueDetails/traceTimeline/useTraceTimelineEvents.tsx
@@ -88,7 +88,7 @@ export function useTraceTimelineEvents({event}: UseTraceTimelineEventsOptions):
           sort: '-timestamp',
           start,
           end,
-          project: project,
+          project,
         },
       },
     ],
@@ -125,7 +125,7 @@ export function useTraceTimelineEvents({event}: UseTraceTimelineEventsOptions):
           sort: '-timestamp',
           start,
           end,
-          project: project,
+          project,
         },
       },
     ],
diff --git a/static/app/views/issueDetails/useGroupEvent.tsx b/static/app/views/issueDetails/useGroupEvent.tsx
index 257d9ade179769..896ca0dbeb5f73 100644
--- a/static/app/views/issueDetails/useGroupEvent.tsx
+++ b/static/app/views/issueDetails/useGroupEvent.tsx
@@ -1,43 +1,63 @@
 import type {Event} from 'sentry/types/event';
+import {getPeriod} from 'sentry/utils/duration/getPeriod';
 import {useApiQuery} from 'sentry/utils/queryClient';
 import {useLocation} from 'sentry/utils/useLocation';
 import useOrganization from 'sentry/utils/useOrganization';
+import usePageFilters from 'sentry/utils/usePageFilters';
+import {useEventQuery} from 'sentry/views/issueDetails/streamline/eventSearch';
 import {
   getGroupEventQueryKey,
   useDefaultIssueEvent,
+  useHasStreamlinedUI,
 } from 'sentry/views/issueDetails/utils';
 
+export const RESERVED_EVENT_IDS = new Set(['recommended', 'latest', 'oldest']);
 interface UseGroupEventOptions {
   environments: string[];
   eventId: string | undefined;
   groupId: string;
 }
 
-export function useGroupEvent({groupId, eventId, environments}: UseGroupEventOptions) {
+export function useGroupEvent({
+  groupId,
+  eventId: eventIdProp,
+  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 hasStreamlinedUI = useHasStreamlinedUI();
+  const eventQuery = useEventQuery({groupId});
+  const eventId = eventIdProp ?? defaultIssueEvent;
 
-  const isLatestOrRecommendedEvent =
-    eventIdUrl === 'latest' || eventIdUrl === 'recommended';
+  const isReservedEventId = RESERVED_EVENT_IDS.has(eventId);
+  const isLatestOrRecommendedEvent = eventId === 'latest' || eventId === 'recommended';
+
+  const query =
+    isLatestOrRecommendedEvent && typeof location.query.query === 'string'
+      ? location.query.query
+      : undefined;
+
+  const {selection: pageFilters} = usePageFilters();
+  const periodQuery = hasStreamlinedUI ? getPeriod(pageFilters.datetime) : {};
 
   const queryKey = getGroupEventQueryKey({
     orgSlug: organization.slug,
     groupId,
-    eventId: eventIdUrl,
+    eventId,
     environments,
-    recommendedEventQuery: isLatestOrRecommendedEvent ? recommendedEventQuery : undefined,
+    query: hasStreamlinedUI ? eventQuery : query,
+    ...periodQuery,
   });
 
-  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,
+  // Legacy: Latest/recommended event will change over time, so only cache for 30 seconds
+  // Oldest/specific events will never change
+  const staleTime = isLatestOrRecommendedEvent ? 30000 : Infinity;
+  // Streamlined: Only specific events will never change, so cache indefinitely
+  const streamlineStaleTime = isReservedEventId ? Infinity : 30000;
+
+  return useApiQuery<Event>(queryKey, {
+    staleTime: hasStreamlinedUI ? streamlineStaleTime : staleTime,
     retry: false,
   });
-
-  return eventQuery;
 }
diff --git a/static/app/views/issueDetails/utils.tsx b/static/app/views/issueDetails/utils.tsx
index 7abe559db33865..58e189a84744f8 100644
--- a/static/app/views/issueDetails/utils.tsx
+++ b/static/app/views/issueDetails/utils.tsx
@@ -58,9 +58,9 @@ export function mergeAndSortTagValues(
   );
   tagValues2.forEach(tagValue => {
     if (tagValueCollection[tagValue.value]) {
-      tagValueCollection[tagValue.value].count += tagValue.count;
-      if (tagValue.lastSeen > tagValueCollection[tagValue.value].lastSeen) {
-        tagValueCollection[tagValue.value].lastSeen = tagValue.lastSeen;
+      tagValueCollection[tagValue.value]!.count += tagValue.count;
+      if (tagValue.lastSeen > tagValueCollection[tagValue.value]!.lastSeen) {
+        tagValueCollection[tagValue.value]!.lastSeen = tagValue.lastSeen;
       }
     } else {
       tagValueCollection[tagValue.value] = tagValue;
@@ -193,9 +193,15 @@ export function useEnvironmentsFromUrl(): string[] {
 export function getGroupEventDetailsQueryData({
   environments,
   query,
+  start,
+  end,
+  statsPeriod,
 }: {
   query: string | undefined;
+  end?: string;
   environments?: string[];
+  start?: string;
+  statsPeriod?: string;
 }): Record<string, string | string[]> {
   const params: Record<string, string | string[]> = {
     collapse: ['fullRelease'],
@@ -209,6 +215,18 @@ export function getGroupEventDetailsQueryData({
     params.environment = environments;
   }
 
+  if (start) {
+    params.start = start;
+  }
+
+  if (end) {
+    params.end = end;
+  }
+
+  if (statsPeriod) {
+    params.statsPeriod = statsPeriod;
+  }
+
   return params;
 }
 
@@ -217,20 +235,29 @@ export function getGroupEventQueryKey({
   groupId,
   eventId,
   environments,
-  recommendedEventQuery,
+  query,
+  start,
+  end,
+  statsPeriod,
 }: {
   environments: string[];
   eventId: string;
   groupId: string;
   orgSlug: string;
-  recommendedEventQuery?: string;
+  end?: string;
+  query?: string;
+  start?: string;
+  statsPeriod?: string;
 }): ApiQueryKey {
   return [
     `/organizations/${orgSlug}/issues/${groupId}/events/${eventId}/`,
     {
       query: getGroupEventDetailsQueryData({
         environments,
-        query: recommendedEventQuery,
+        query,
+        start,
+        end,
+        statsPeriod,
       }),
     },
   ];
@@ -265,7 +292,7 @@ export function useIsSampleEvent(): boolean {
 
   const {data} = useGroupTagsReadable(
     {
-      groupId: groupId,
+      groupId,
       environment: environments,
     },
     // Don't want this query to take precedence over the main requests
diff --git a/static/app/views/issueList/actions/sortOptions.tsx b/static/app/views/issueList/actions/sortOptions.tsx
index 3aecd1f36b7c03..1dc2f0ac0d0ca1 100644
--- a/static/app/views/issueList/actions/sortOptions.tsx
+++ b/static/app/views/issueList/actions/sortOptions.tsx
@@ -17,7 +17,7 @@ type Props = {
   triggerSize?: DropdownButtonProps['size'];
 };
 
-export function getSortTooltip(key: IssueSortOptions) {
+function getSortTooltip(key: IssueSortOptions) {
   switch (key) {
     case IssueSortOptions.INBOX:
       return t('When issue was flagged for review.');
diff --git a/static/app/views/issueList/actions/utils.tsx b/static/app/views/issueList/actions/utils.tsx
index 50839d5269c3d8..a48d75daa32f2f 100644
--- a/static/app/views/issueList/actions/utils.tsx
+++ b/static/app/views/issueList/actions/utils.tsx
@@ -3,7 +3,6 @@ import {Fragment} from 'react';
 import {Alert} from 'sentry/components/alert';
 import ExternalLink from 'sentry/components/links/externalLink';
 import {t, tct, tn} from 'sentry/locale';
-import type {IgnoredStatusDetails} from 'sentry/types/group';
 import {capitalize} from 'sentry/utils/string/capitalize';
 import commonTheme from 'sentry/utils/theme';
 
@@ -157,12 +156,6 @@ export function getLabel(numIssues: number, allInQuerySelected: boolean) {
   };
 }
 
-export function performanceIssuesSupportsIgnoreAction(
-  statusDetails: IgnoredStatusDetails
-) {
-  return !(statusDetails.ignoreWindow || statusDetails.ignoreUserWindow);
-}
-
 // A mapping of which screen sizes will trigger the column to disappear
 // e.g. 'Trend': screen.small => 'Trend' column will disappear on screen.small widths
 export const COLUMN_BREAKPOINTS = {
diff --git a/static/app/views/issueList/groupSearchViewTabs/draggableTabBar.tsx b/static/app/views/issueList/groupSearchViewTabs/draggableTabBar.tsx
deleted file mode 100644
index a17801ed94e374..00000000000000
--- a/static/app/views/issueList/groupSearchViewTabs/draggableTabBar.tsx
+++ /dev/null
@@ -1,595 +0,0 @@
-import 'intersection-observer'; // polyfill
-
-import {useCallback, useContext, useEffect, useState} from 'react';
-import styled from '@emotion/styled';
-import type {Node} from '@react-types/shared';
-import {motion} from 'framer-motion';
-
-import {addSuccessMessage} from 'sentry/actionCreators/indicator';
-import {
-  DraggableTabList,
-  TEMPORARY_TAB_KEY,
-} from 'sentry/components/draggableTabs/draggableTabList';
-import type {DraggableTabListItemProps} from 'sentry/components/draggableTabs/item';
-import type {MenuItemProps} from 'sentry/components/dropdownMenu';
-import {TabsContext} from 'sentry/components/tabs';
-import {t} from 'sentry/locale';
-import type {InjectedRouter} from 'sentry/types/legacyReactRouter';
-import {defined} from 'sentry/utils';
-import {trackAnalytics} from 'sentry/utils/analytics';
-import normalizeUrl from 'sentry/utils/url/normalizeUrl';
-import {useHotkeys} from 'sentry/utils/useHotkeys';
-import {useLocation} from 'sentry/utils/useLocation';
-import {useNavigate} from 'sentry/utils/useNavigate';
-import useOrganization from 'sentry/utils/useOrganization';
-import {DraggableTabMenuButton} from 'sentry/views/issueList/groupSearchViewTabs/draggableTabMenuButton';
-import EditableTabTitle from 'sentry/views/issueList/groupSearchViewTabs/editableTabTitle';
-import {IssueSortOptions} from 'sentry/views/issueList/utils';
-import {NewTabContext, type NewView} from 'sentry/views/issueList/utils/newTabContext';
-
-export interface Tab {
-  id: string;
-  /**
-   * False for tabs that were added view the "Add View" button, but
-   * have not been edited in any way. Only tabs with isCommitted=true
-   * will be saved to the backend.
-   */
-  isCommitted: boolean;
-  key: string;
-  label: string;
-  query: string;
-  querySort: IssueSortOptions;
-  content?: React.ReactNode;
-  unsavedChanges?: [string, IssueSortOptions];
-}
-
-export interface DraggableTabBarProps {
-  initialTabKey: string;
-  orgSlug: string;
-  router: InjectedRouter;
-  setTabs: (tabs: Tab[]) => void;
-  setTempTab: (tab: Tab | undefined) => void;
-  tabs: Tab[];
-  /**
-   * Callback function to be called when user clicks the `Add View` button.
-   */
-  onAddView?: (newTabs: Tab[]) => void;
-  /**
-   * Callback function to be called when user clicks the `Delete` button.
-   * Note: The `Delete` button only appears for persistent views
-   */
-  onDelete?: (newTabs: Tab[]) => void;
-  /**
-   * Callback function to be called when user clicks on the `Discard Changes` button.
-   * Note: The `Discard Changes` button only appears for persistent views when `isChanged=true`
-   */
-  onDiscard?: () => void;
-  /**
-   * Callback function to be called when user clicks on the `Discard` button for temporary views.
-   * Note: The `Discard` button only appears for temporary views
-   */
-  onDiscardTempView?: () => void;
-  /**
-   * Callback function to be called when user clicks the 'Duplicate' button.
-   * Note: The `Duplicate` button only appears for persistent views
-   */
-  onDuplicate?: (newTabs: Tab[]) => void;
-  /**
-   * Callback function to be called when the user reorders the tabs. Returns the
-   * new order of the tabs along with their props.
-   */
-  onReorder?: (newTabs: Tab[]) => void;
-  /**
-   * Callback function to be called when user clicks the 'Save' button.
-   * Note: The `Save` button only appears for persistent views when `isChanged=true`
-   */
-  onSave?: (newTabs: Tab[]) => void;
-  /**
-   * Callback function to be called when user clicks the 'Save View' button for temporary views.
-   */
-  onSaveTempView?: (newTabs: Tab[]) => void;
-  /**
-   * Callback function to be called when user renames a tab.
-   * Note: The `Rename` button only appears for persistent views
-   */
-  onTabRenamed?: (newTabs: Tab[], newLabel: string) => void;
-  tempTab?: Tab;
-}
-
-export const generateTempViewId = () => `_${Math.random().toString().substring(2, 7)}`;
-
-export function DraggableTabBar({
-  initialTabKey,
-  tabs,
-  setTabs,
-  tempTab,
-  setTempTab,
-  orgSlug,
-  router,
-  onReorder,
-  onAddView,
-  onDelete,
-  onDiscard,
-  onDuplicate,
-  onTabRenamed,
-  onSave,
-  onDiscardTempView,
-  onSaveTempView,
-}: DraggableTabBarProps) {
-  // TODO: Extract this to a separate component encompassing Tab.Item in the future
-  const [editingTabKey, setEditingTabKey] = useState<string | null>(null);
-
-  const organization = useOrganization();
-  const navigate = useNavigate();
-  const location = useLocation();
-
-  const {cursor: _cursor, page: _page, ...queryParams} = router?.location?.query ?? {};
-  const {viewId} = queryParams;
-
-  const {tabListState} = useContext(TabsContext);
-  const {setNewViewActive, setOnNewViewsSaved} = useContext(NewTabContext);
-
-  const handleOnReorder = (newOrder: Node<DraggableTabListItemProps>[]) => {
-    const newTabs: Tab[] = newOrder
-      .map(node => {
-        const foundTab = tabs.find(tab => tab.key === node.key);
-        return foundTab?.key === node.key ? foundTab : null;
-      })
-      .filter(defined);
-    setTabs(newTabs);
-    trackAnalytics('issue_views.reordered_views', {
-      organization,
-    });
-  };
-
-  const handleOnSaveChanges = useCallback(() => {
-    const originalTab = tabs.find(tab => tab.key === tabListState?.selectedKey);
-    if (originalTab) {
-      const newTabs: Tab[] = tabs.map(tab => {
-        return tab.key === tabListState?.selectedKey && tab.unsavedChanges
-          ? {
-              ...tab,
-              query: tab.unsavedChanges[0],
-              querySort: tab.unsavedChanges[1],
-              unsavedChanges: undefined,
-            }
-          : tab;
-      });
-      setTabs(newTabs);
-      onSave?.(newTabs);
-      trackAnalytics('issue_views.saved_changes', {
-        organization,
-      });
-    }
-  }, [onSave, organization, setTabs, tabListState?.selectedKey, tabs]);
-
-  useHotkeys(
-    [
-      {
-        match: ['command+s', 'ctrl+s'],
-        includeInputs: true,
-        callback: () => {
-          if (tabs.find(tab => tab.key === tabListState?.selectedKey)?.unsavedChanges) {
-            handleOnSaveChanges();
-            addSuccessMessage(t('Changes saved to view'));
-          }
-        },
-      },
-    ],
-    [handleOnSaveChanges, tabListState?.selectedKey, tabs]
-  );
-
-  const handleOnDiscardChanges = () => {
-    const originalTab = tabs.find(tab => tab.key === tabListState?.selectedKey);
-    if (originalTab) {
-      setTabs(
-        tabs.map(tab => {
-          return tab.key === tabListState?.selectedKey
-            ? {...tab, unsavedChanges: undefined}
-            : tab;
-        })
-      );
-      navigate({
-        ...location,
-        query: {
-          ...queryParams,
-          query: originalTab.query,
-          sort: originalTab.querySort,
-          ...(originalTab.id ? {viewId: originalTab.id} : {}),
-        },
-      });
-      onDiscard?.();
-      trackAnalytics('issue_views.discarded_changes', {
-        organization,
-      });
-    }
-  };
-
-  const handleOnTabRenamed = (newLabel: string, tabKey: string) => {
-    const renamedTab = tabs.find(tb => tb.key === tabKey);
-    if (renamedTab && newLabel !== renamedTab.label) {
-      const newTabs = tabs.map(tab =>
-        tab.key === renamedTab.key ? {...tab, label: newLabel, isCommitted: true} : tab
-      );
-      setTabs(newTabs);
-      onTabRenamed?.(newTabs, newLabel);
-      trackAnalytics('issue_views.renamed_view', {
-        organization,
-      });
-    }
-  };
-
-  const handleOnDuplicate = () => {
-    const idx = tabs.findIndex(tb => tb.key === tabListState?.selectedKey);
-    if (idx !== -1) {
-      const tempId = generateTempViewId();
-      const duplicatedTab = tabs[idx];
-      const newTabs: Tab[] = [
-        ...tabs.slice(0, idx + 1),
-        {
-          ...duplicatedTab,
-          id: tempId,
-          key: tempId,
-          label: `${duplicatedTab.label} (Copy)`,
-          isCommitted: true,
-        },
-        ...tabs.slice(idx + 1),
-      ];
-      navigate({
-        ...location,
-        query: {
-          ...queryParams,
-          query: duplicatedTab.query,
-          sort: duplicatedTab.querySort,
-          viewId: tempId,
-        },
-      });
-      setTabs(newTabs);
-      tabListState?.setSelectedKey(tempId);
-      onDuplicate?.(newTabs);
-      trackAnalytics('issue_views.duplicated_view', {
-        organization,
-      });
-    }
-  };
-
-  const handleOnDelete = () => {
-    if (tabs.length > 1) {
-      const newTabs = tabs.filter(tb => tb.key !== tabListState?.selectedKey);
-      setTabs(newTabs);
-      tabListState?.setSelectedKey(newTabs[0].key);
-      onDelete?.(newTabs);
-      trackAnalytics('issue_views.deleted_view', {
-        organization,
-      });
-    }
-  };
-
-  const handleOnSaveTempView = () => {
-    if (tempTab) {
-      const tempId = generateTempViewId();
-      const newTab: Tab = {
-        id: tempId,
-        key: tempId,
-        label: 'New View',
-        query: tempTab.query,
-        querySort: tempTab.querySort,
-        isCommitted: true,
-      };
-      const newTabs = [...tabs, newTab];
-      navigate(
-        {
-          ...location,
-          query: {
-            ...queryParams,
-            query: tempTab.query,
-            querySort: tempTab.querySort,
-            viewId: tempId,
-          },
-        },
-        {replace: true}
-      );
-      setTabs(newTabs);
-      setTempTab(undefined);
-      tabListState?.setSelectedKey(tempId);
-      onSaveTempView?.(newTabs);
-      trackAnalytics('issue_views.temp_view_saved', {
-        organization,
-      });
-    }
-  };
-
-  const handleOnDiscardTempView = () => {
-    tabListState?.setSelectedKey(tabs[0].key);
-    setTempTab(undefined);
-    onDiscardTempView?.();
-    trackAnalytics('issue_views.temp_view_discarded', {
-      organization,
-    });
-  };
-
-  const handleCreateNewView = () => {
-    // Triggers the add view flow page
-    setNewViewActive(true);
-    const tempId = generateTempViewId();
-    const currentTab = tabs.find(tab => tab.key === tabListState?.selectedKey);
-    if (currentTab) {
-      const newTabs: Tab[] = [
-        ...tabs,
-        {
-          id: tempId,
-          key: tempId,
-          label: 'New View',
-          query: '',
-          querySort: IssueSortOptions.DATE,
-          isCommitted: false,
-        },
-      ];
-      navigate({
-        ...location,
-        query: {
-          ...queryParams,
-          query: '',
-          viewId: tempId,
-        },
-      });
-      setTabs(newTabs);
-      tabListState?.setSelectedKey(tempId);
-      trackAnalytics('issue_views.add_view.clicked', {
-        organization,
-      });
-    }
-  };
-
-  const handleNewViewsSaved: NewTabContext['onNewViewsSaved'] = useCallback<
-    NewTabContext['onNewViewsSaved']
-  >(
-    () => (newViews: NewView[]) => {
-      if (newViews.length === 0) {
-        return;
-      }
-      setNewViewActive(false);
-      const {label, query, saveQueryToView} = newViews[0];
-      const remainingNewViews: Tab[] = newViews.slice(1)?.map(view => {
-        const newId = generateTempViewId();
-        const viewToTab: Tab = {
-          id: newId,
-          key: newId,
-          label: view.label,
-          query: view.query,
-          querySort: IssueSortOptions.DATE,
-          unsavedChanges: view.saveQueryToView
-            ? undefined
-            : [view.query, IssueSortOptions.DATE],
-          isCommitted: true,
-        };
-        return viewToTab;
-      });
-      let updatedTabs: Tab[] = tabs.map(tab => {
-        if (tab.key === viewId) {
-          return {
-            ...tab,
-            label: label,
-            query: saveQueryToView ? query : '',
-            querySort: IssueSortOptions.DATE,
-            unsavedChanges: saveQueryToView ? undefined : [query, IssueSortOptions.DATE],
-            isCommitted: true,
-          };
-        }
-        return tab;
-      });
-
-      if (remainingNewViews.length > 0) {
-        updatedTabs = [...updatedTabs, ...remainingNewViews];
-      }
-
-      setTabs(updatedTabs);
-      navigate(
-        {
-          ...location,
-          query: {
-            ...queryParams,
-            query: query,
-            sort: IssueSortOptions.DATE,
-          },
-        },
-        {replace: true}
-      );
-      onAddView?.(updatedTabs);
-    },
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [location, navigate, onAddView, setNewViewActive, setTabs, tabs, viewId]
-  );
-
-  useEffect(() => {
-    setOnNewViewsSaved(handleNewViewsSaved);
-  }, [setOnNewViewsSaved, handleNewViewsSaved]);
-
-  const makeMenuOptions = (tab: Tab): MenuItemProps[] => {
-    if (tab.key === TEMPORARY_TAB_KEY) {
-      return makeTempViewMenuOptions({
-        onSaveTempView: handleOnSaveTempView,
-        onDiscardTempView: handleOnDiscardTempView,
-      });
-    }
-    if (tab.unsavedChanges) {
-      return makeUnsavedChangesMenuOptions({
-        onRename: () => setEditingTabKey(tab.key),
-        onDuplicate: handleOnDuplicate,
-        onDelete: tabs.length > 1 ? handleOnDelete : undefined,
-        onSave: handleOnSaveChanges,
-        onDiscard: handleOnDiscardChanges,
-      });
-    }
-    return makeDefaultMenuOptions({
-      onRename: () => setEditingTabKey(tab.key),
-      onDuplicate: handleOnDuplicate,
-      onDelete: tabs.length > 1 ? handleOnDelete : undefined,
-    });
-  };
-
-  const allTabs = tempTab ? [...tabs, tempTab] : tabs;
-
-  return (
-    <DraggableTabList
-      onReorder={handleOnReorder}
-      onReorderComplete={() => onReorder?.(tabs)}
-      defaultSelectedKey={initialTabKey}
-      onAddView={handleCreateNewView}
-      orientation="horizontal"
-      editingTabKey={editingTabKey ?? undefined}
-      hideBorder
-    >
-      {allTabs.map(tab => (
-        <DraggableTabList.Item
-          textValue={tab.label}
-          key={tab.key}
-          to={normalizeUrl({
-            query: {
-              ...queryParams,
-              query: tab.unsavedChanges?.[0] ?? tab.query,
-              sort: tab.unsavedChanges?.[1] ?? tab.querySort,
-              viewId: tab.id !== TEMPORARY_TAB_KEY ? tab.id : undefined,
-            },
-            pathname: `/organizations/${orgSlug}/issues/`,
-          })}
-          disabled={tab.key === editingTabKey}
-        >
-          <TabContentWrap>
-            <EditableTabTitle
-              label={tab.label}
-              isEditing={editingTabKey === tab.key}
-              setIsEditing={isEditing => setEditingTabKey(isEditing ? tab.key : null)}
-              onChange={newLabel => handleOnTabRenamed(newLabel.trim(), tab.key)}
-              isSelected={
-                (tabListState && tabListState?.selectedKey === tab.key) ||
-                (!tabListState && tab.key === initialTabKey)
-              }
-            />
-            {/* If tablistState isn't initialized, we want to load the elipsis menu
-                for the initial tab, that way it won't load in a second later
-                and cause the tabs to shift and animate on load.
-            */}
-            {((tabListState && tabListState?.selectedKey === tab.key) ||
-              (!tabListState && tab.key === initialTabKey)) && (
-              <motion.div
-                // This stops the ellipsis menu from animating in on load (when tabListState isn't initialized yet),
-                // but enables the animation later on when switching tabs
-                initial={tabListState ? {opacity: 0} : false}
-                animate={{opacity: 1}}
-                transition={{delay: 0.1, duration: 0.1}}
-              >
-                <DraggableTabMenuButton
-                  hasUnsavedChanges={!!tab.unsavedChanges}
-                  menuOptions={makeMenuOptions(tab)}
-                  aria-label={t(`%s Ellipsis Menu`, tab.label)}
-                />
-              </motion.div>
-            )}
-          </TabContentWrap>
-        </DraggableTabList.Item>
-      ))}
-    </DraggableTabList>
-  );
-}
-
-const makeDefaultMenuOptions = ({
-  onRename,
-  onDuplicate,
-  onDelete,
-}: {
-  onDelete?: () => void;
-  onDuplicate?: () => void;
-  onRename?: () => void;
-}): MenuItemProps[] => {
-  const menuOptions: MenuItemProps[] = [
-    {
-      key: 'rename-tab',
-      label: t('Rename'),
-      onAction: onRename,
-    },
-    {
-      key: 'duplicate-tab',
-      label: t('Duplicate'),
-      onAction: onDuplicate,
-    },
-  ];
-  if (onDelete) {
-    menuOptions.push({
-      key: 'delete-tab',
-      label: t('Delete'),
-      priority: 'danger',
-      onAction: onDelete,
-    });
-  }
-  return menuOptions;
-};
-
-const makeUnsavedChangesMenuOptions = ({
-  onRename,
-  onDuplicate,
-  onDelete,
-  onSave,
-  onDiscard,
-}: {
-  onDelete?: () => void;
-  onDiscard?: () => void;
-  onDuplicate?: () => void;
-  onRename?: () => void;
-  onSave?: () => void;
-}): MenuItemProps[] => {
-  return [
-    {
-      key: 'changed',
-      children: [
-        {
-          key: 'save-changes',
-          label: t('Save Changes'),
-          priority: 'primary',
-          onAction: onSave,
-        },
-        {
-          key: 'discard-changes',
-          label: t('Discard Changes'),
-          onAction: onDiscard,
-        },
-      ],
-    },
-    {
-      key: 'default',
-      children: makeDefaultMenuOptions({onRename, onDuplicate, onDelete}),
-    },
-  ];
-};
-
-const makeTempViewMenuOptions = ({
-  onSaveTempView,
-  onDiscardTempView,
-}: {
-  onDiscardTempView: () => void;
-  onSaveTempView: () => void;
-}): MenuItemProps[] => {
-  return [
-    {
-      key: 'save-changes',
-      label: t('Save View'),
-      priority: 'primary',
-      onAction: onSaveTempView,
-    },
-    {
-      key: 'discard-changes',
-      label: t('Discard'),
-      onAction: onDiscardTempView,
-    },
-  ];
-};
-
-const TabContentWrap = styled('span')`
-  white-space: nowrap;
-  display: flex;
-  align-items: center;
-  flex-direction: row;
-  padding: 0;
-  gap: 6px;
-`;
diff --git a/static/app/views/issueList/groupSearchViewTabs/draggableTabMenuButton.tsx b/static/app/views/issueList/groupSearchViewTabs/issueViewEllipsisMenu.tsx
similarity index 95%
rename from static/app/views/issueList/groupSearchViewTabs/draggableTabMenuButton.tsx
rename to static/app/views/issueList/groupSearchViewTabs/issueViewEllipsisMenu.tsx
index aad5709094e3ce..2849cea0703618 100644
--- a/static/app/views/issueList/groupSearchViewTabs/draggableTabMenuButton.tsx
+++ b/static/app/views/issueList/groupSearchViewTabs/issueViewEllipsisMenu.tsx
@@ -7,17 +7,17 @@ import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import {useFeedbackForm} from 'sentry/utils/useFeedbackForm';
 
-interface DraggableTabMenuButtonProps {
+interface IssueViewEllipsisMenuProps {
   menuOptions: MenuItemProps[];
   'aria-label'?: string;
   hasUnsavedChanges?: boolean;
 }
 
-export function DraggableTabMenuButton({
+export function IssueViewEllipsisMenu({
   hasUnsavedChanges = false,
   menuOptions,
   ...props
-}: DraggableTabMenuButtonProps) {
+}: IssueViewEllipsisMenuProps) {
   return (
     <TriggerIconWrap>
       <StyledDropdownMenu
diff --git a/static/app/views/issueList/groupSearchViewTabs/issueViewTab.tsx b/static/app/views/issueList/groupSearchViewTabs/issueViewTab.tsx
new file mode 100644
index 00000000000000..20636e1ee9567e
--- /dev/null
+++ b/static/app/views/issueList/groupSearchViewTabs/issueViewTab.tsx
@@ -0,0 +1,242 @@
+import {useContext} from 'react';
+import styled from '@emotion/styled';
+import {motion} from 'framer-motion';
+
+import {TEMPORARY_TAB_KEY} from 'sentry/components/draggableTabs/draggableTabList';
+import type {MenuItemProps} from 'sentry/components/dropdownMenu';
+import {t} from 'sentry/locale';
+import type {InjectedRouter} from 'sentry/types/legacyReactRouter';
+import {useNavigate} from 'sentry/utils/useNavigate';
+import EditableTabTitle from 'sentry/views/issueList/groupSearchViewTabs/editableTabTitle';
+import {IssueViewEllipsisMenu} from 'sentry/views/issueList/groupSearchViewTabs/issueViewEllipsisMenu';
+import {
+  generateTempViewId,
+  type IssueView,
+  IssueViewsContext,
+} from 'sentry/views/issueList/groupSearchViewTabs/issueViews';
+
+interface IssueViewTabProps {
+  editingTabKey: string | null;
+  initialTabKey: string;
+  router: InjectedRouter;
+  setEditingTabKey: (key: string | null) => void;
+  view: IssueView;
+}
+
+export function IssueViewTab({
+  editingTabKey,
+  initialTabKey,
+  router,
+  setEditingTabKey,
+  view,
+}: IssueViewTabProps) {
+  const navigate = useNavigate();
+
+  const {cursor: _cursor, page: _page, ...queryParams} = router?.location?.query ?? {};
+  const {tabListState, state, dispatch} = useContext(IssueViewsContext);
+  const {views: tabs} = state;
+
+  const handleDuplicateView = () => {
+    const newViewId = generateTempViewId();
+    const duplicatedTab = state.views.find(tab => tab.key === tabListState?.selectedKey);
+    if (!duplicatedTab) {
+      return;
+    }
+    dispatch({type: 'DUPLICATE_VIEW', newViewId, syncViews: true});
+    navigate({
+      ...location,
+      query: {
+        ...queryParams,
+        query: duplicatedTab.query,
+        sort: duplicatedTab.querySort,
+        viewId: newViewId,
+      },
+    });
+  };
+
+  const handleDiscardChanges = () => {
+    dispatch({type: 'DISCARD_CHANGES'});
+    const originalTab = state.views.find(tab => tab.key === tabListState?.selectedKey);
+    if (originalTab) {
+      navigate({
+        ...location,
+        query: {
+          ...queryParams,
+          query: originalTab.query,
+          sort: originalTab.querySort,
+          viewId: originalTab.id,
+        },
+      });
+    }
+  };
+
+  const handleDeleteView = (tab: IssueView) => {
+    dispatch({type: 'DELETE_VIEW', syncViews: true});
+    // Including this logic in the dispatch call breaks the tests for some reason
+    // so we're doing it here instead
+    tabListState?.setSelectedKey(tabs.filter(tb => tb.key !== tab.key)[0]!.key);
+  };
+
+  const makeMenuOptions = (tab: IssueView): MenuItemProps[] => {
+    if (tab.key === TEMPORARY_TAB_KEY) {
+      return makeTempViewMenuOptions({
+        onSaveTempView: () => dispatch({type: 'SAVE_TEMP_VIEW', syncViews: true}),
+        onDiscardTempView: () => dispatch({type: 'DISCARD_TEMP_VIEW'}),
+      });
+    }
+    if (tab.unsavedChanges) {
+      return makeUnsavedChangesMenuOptions({
+        onRename: () => setEditingTabKey(tab.key),
+        onDuplicate: handleDuplicateView,
+        onDelete: tabs.length > 1 ? () => handleDeleteView(tab) : undefined,
+        onSave: () => dispatch({type: 'SAVE_CHANGES', syncViews: true}),
+        onDiscard: handleDiscardChanges,
+      });
+    }
+    return makeDefaultMenuOptions({
+      onRename: () => setEditingTabKey(tab.key),
+      onDuplicate: handleDuplicateView,
+      onDelete: tabs.length > 1 ? () => handleDeleteView(tab) : undefined,
+    });
+  };
+
+  return (
+    <TabContentWrap>
+      <EditableTabTitle
+        label={view.label}
+        isEditing={editingTabKey === view.key}
+        setIsEditing={isEditing => setEditingTabKey(isEditing ? view.key : null)}
+        onChange={newLabel =>
+          dispatch({type: 'RENAME_TAB', newLabel: newLabel.trim(), syncViews: true})
+        }
+        isSelected={
+          (tabListState && tabListState?.selectedKey === view.key) ||
+          (!tabListState && view.key === initialTabKey)
+        }
+      />
+      {/* If tablistState isn't initialized, we want to load the elipsis menu
+                for the initial tab, that way it won't load in a second later
+                and cause the tabs to shift and animate on load.
+            */}
+      {((tabListState && tabListState?.selectedKey === view.key) ||
+        (!tabListState && view.key === initialTabKey)) && (
+        <motion.div
+          // This stops the ellipsis menu from animating in on load (when tabListState isn't initialized yet),
+          // but enables the animation later on when switching tabs
+          initial={tabListState ? {opacity: 0} : false}
+          animate={{opacity: 1}}
+          transition={{delay: 0.1, duration: 0.1}}
+        >
+          <IssueViewEllipsisMenu
+            hasUnsavedChanges={!!view.unsavedChanges}
+            menuOptions={makeMenuOptions(view)}
+            aria-label={t(`%s Ellipsis Menu`, view.label)}
+          />
+        </motion.div>
+      )}
+    </TabContentWrap>
+  );
+}
+
+const makeDefaultMenuOptions = ({
+  onRename,
+  onDuplicate,
+  onDelete,
+}: {
+  onDelete?: () => void;
+  onDuplicate?: () => void;
+  onRename?: () => void;
+}): MenuItemProps[] => {
+  const menuOptions: MenuItemProps[] = [
+    {
+      key: 'rename-tab',
+      label: t('Rename'),
+      onAction: onRename,
+    },
+    {
+      key: 'duplicate-tab',
+      label: t('Duplicate'),
+      onAction: onDuplicate,
+    },
+  ];
+  if (onDelete) {
+    return [
+      ...menuOptions,
+      {
+        key: 'delete-tab',
+        label: t('Delete'),
+        priority: 'danger',
+        onAction: onDelete,
+      },
+    ];
+  }
+  return menuOptions;
+};
+
+const makeUnsavedChangesMenuOptions = ({
+  onRename,
+  onDuplicate,
+  onDelete,
+  onSave,
+  onDiscard,
+}: {
+  onDelete?: () => void;
+  onDiscard?: () => void;
+  onDuplicate?: () => void;
+  onRename?: () => void;
+  onSave?: () => void;
+}): MenuItemProps[] => {
+  return [
+    {
+      key: 'changed',
+      children: [
+        {
+          key: 'save-changes',
+          label: t('Save Changes'),
+          priority: 'primary',
+          onAction: onSave,
+        },
+        {
+          key: 'discard-changes',
+          label: t('Discard Changes'),
+          onAction: onDiscard,
+        },
+      ],
+    },
+    {
+      key: 'default',
+      children: makeDefaultMenuOptions({onRename, onDuplicate, onDelete}),
+    },
+  ];
+};
+
+const makeTempViewMenuOptions = ({
+  onSaveTempView,
+  onDiscardTempView,
+}: {
+  onDiscardTempView: () => void;
+  onSaveTempView: () => void;
+}): MenuItemProps[] => {
+  return [
+    {
+      key: 'save-changes',
+      label: t('Save View'),
+      priority: 'primary',
+      onAction: onSaveTempView,
+    },
+    {
+      key: 'discard-changes',
+      label: t('Discard'),
+      onAction: onDiscardTempView,
+    },
+  ];
+};
+
+const TabContentWrap = styled('span')`
+  white-space: nowrap;
+  display: flex;
+  align-items: center;
+  flex-direction: row;
+  padding: 0;
+  gap: 6px;
+`;
diff --git a/static/app/views/issueList/groupSearchViewTabs/issueViews.tsx b/static/app/views/issueList/groupSearchViewTabs/issueViews.tsx
new file mode 100644
index 00000000000000..f21af8a544699a
--- /dev/null
+++ b/static/app/views/issueList/groupSearchViewTabs/issueViews.tsx
@@ -0,0 +1,643 @@
+import type {Dispatch, Reducer} from 'react';
+import {
+  createContext,
+  useCallback,
+  useContext,
+  useEffect,
+  useMemo,
+  useReducer,
+  useState,
+} from 'react';
+import styled from '@emotion/styled';
+import type {TabListState} from '@react-stately/tabs';
+import type {Orientation} from '@react-types/shared';
+import debounce from 'lodash/debounce';
+
+import {normalizeDateTimeParams} from 'sentry/components/organizations/pageFilters/parse';
+import type {TabContext, TabsProps} from 'sentry/components/tabs';
+import {tabsShouldForwardProp} from 'sentry/components/tabs/utils';
+import {t} from 'sentry/locale';
+import type {InjectedRouter} from 'sentry/types/legacyReactRouter';
+import {defined} from 'sentry/utils';
+import {trackAnalytics} from 'sentry/utils/analytics';
+import normalizeUrl from 'sentry/utils/url/normalizeUrl';
+import {useNavigate} from 'sentry/utils/useNavigate';
+import useOrganization from 'sentry/utils/useOrganization';
+import usePageFilters from 'sentry/utils/usePageFilters';
+import {useUpdateGroupSearchViews} from 'sentry/views/issueList/mutations/useUpdateGroupSearchViews';
+import type {
+  GroupSearchView,
+  UpdateGroupSearchViewPayload,
+} from 'sentry/views/issueList/types';
+import {IssueSortOptions} from 'sentry/views/issueList/utils';
+import {NewTabContext, type NewView} from 'sentry/views/issueList/utils/newTabContext';
+
+const TEMPORARY_TAB_KEY = 'temporary-tab';
+
+export const generateTempViewId = () => `_${Math.random().toString().substring(2, 7)}`;
+
+export interface IssueView {
+  id: string;
+  /**
+   * False for tabs that were added view the "Add View" button, but
+   * have not been edited in any way. Only tabs with isCommitted=true
+   * will be saved to the backend.
+   */
+  isCommitted: boolean;
+  key: string;
+  label: string;
+  query: string;
+  querySort: IssueSortOptions;
+  content?: React.ReactNode;
+  unsavedChanges?: [string, IssueSortOptions];
+}
+
+type BaseIssueViewsAction = {
+  /** If true, the new views state created by the action will be synced to the backend */
+  syncViews?: boolean;
+};
+
+type ReorderTabsAction = {
+  newKeyOrder: string[];
+  type: 'REORDER_TABS';
+} & BaseIssueViewsAction;
+
+type SaveChangesAction = {
+  type: 'SAVE_CHANGES';
+} & BaseIssueViewsAction;
+
+type DiscardChangesAction = {
+  type: 'DISCARD_CHANGES';
+} & BaseIssueViewsAction;
+
+type RenameTabAction = {
+  newLabel: string;
+  type: 'RENAME_TAB';
+} & BaseIssueViewsAction;
+
+type DuplicateViewAction = {
+  newViewId: string;
+  type: 'DUPLICATE_VIEW';
+} & BaseIssueViewsAction;
+
+type DeleteViewAction = {
+  type: 'DELETE_VIEW';
+} & BaseIssueViewsAction;
+
+type CreateNewViewAction = {
+  tempId: string;
+  type: 'CREATE_NEW_VIEW';
+} & BaseIssueViewsAction;
+
+type SetTempViewAction = {
+  query: string;
+  sort: IssueSortOptions;
+  type: 'SET_TEMP_VIEW';
+} & BaseIssueViewsAction;
+
+type DiscardTempViewAction = {
+  type: 'DISCARD_TEMP_VIEW';
+} & BaseIssueViewsAction;
+
+type SaveTempViewAction = {
+  type: 'SAVE_TEMP_VIEW';
+} & BaseIssueViewsAction;
+
+type UpdateUnsavedChangesAction = {
+  type: 'UPDATE_UNSAVED_CHANGES';
+  unsavedChanges: [string, IssueSortOptions] | undefined;
+  isCommitted?: boolean;
+} & BaseIssueViewsAction;
+
+type UpdateViewIdsAction = {
+  newViews: UpdateGroupSearchViewPayload[];
+  type: 'UPDATE_VIEW_IDS';
+} & BaseIssueViewsAction;
+
+type SetViewsAction = {
+  type: 'SET_VIEWS';
+  views: IssueView[];
+} & BaseIssueViewsAction;
+
+type SyncViewsToBackendAction = {
+  /** Syncs the current views state to the backend. Does not make any changes to the views state. */
+  type: 'SYNC_VIEWS_TO_BACKEND';
+};
+
+export type IssueViewsActions =
+  | ReorderTabsAction
+  | SaveChangesAction
+  | DiscardChangesAction
+  | RenameTabAction
+  | DuplicateViewAction
+  | DeleteViewAction
+  | CreateNewViewAction
+  | SetTempViewAction
+  | DiscardTempViewAction
+  | SaveTempViewAction
+  | UpdateUnsavedChangesAction
+  | UpdateViewIdsAction
+  | SetViewsAction
+  | SyncViewsToBackendAction;
+
+const ACTION_ANALYTICS_MAP: Partial<Record<IssueViewsActions['type'], string>> = {
+  REORDER_TABS: 'issue_views.reordered_views',
+  SAVE_CHANGES: 'issue_views.saved_changes',
+  DISCARD_CHANGES: 'issue_views.discarded_changes',
+  RENAME_TAB: 'issue_views.renamed_view',
+  DUPLICATE_VIEW: 'issue_views.duplicated_view',
+  DELETE_VIEW: 'issue_views.deleted_view',
+  SAVE_TEMP_VIEW: 'issue_views.temp_view_saved',
+  DISCARD_TEMP_VIEW: 'issue_views.temp_view_discarded',
+  CREATE_NEW_VIEW: 'issue_views.add_view.clicked',
+};
+
+export interface IssueViewsState {
+  views: IssueView[];
+  tempView?: IssueView;
+}
+
+export interface IssueViewsContextType extends TabContext {
+  dispatch: Dispatch<IssueViewsActions>;
+  state: IssueViewsState;
+}
+
+export const IssueViewsContext = createContext<IssueViewsContextType>({
+  rootProps: {orientation: 'horizontal'},
+  setTabListState: () => {},
+  // Issue Views specific state
+  dispatch: () => {},
+  state: {views: []},
+});
+
+function reorderTabs(state: IssueViewsState, action: ReorderTabsAction) {
+  const newTabs: IssueView[] = action.newKeyOrder
+    .map(key => {
+      const foundTab = state.views.find(tab => tab.key === key);
+      return foundTab?.key === key ? foundTab : null;
+    })
+    .filter(defined);
+  return {...state, views: newTabs};
+}
+
+function saveChanges(state: IssueViewsState, tabListState: TabListState<any>) {
+  const originalTab = state.views.find(tab => tab.key === tabListState?.selectedKey);
+  if (originalTab) {
+    const newViews = state.views.map(tab => {
+      return tab.key === tabListState?.selectedKey && tab.unsavedChanges
+        ? {
+            ...tab,
+            query: tab.unsavedChanges[0],
+            querySort: tab.unsavedChanges[1],
+            unsavedChanges: undefined,
+          }
+        : tab;
+    });
+    return {...state, views: newViews};
+  }
+  return state;
+}
+
+function discardChanges(state: IssueViewsState, tabListState: TabListState<any>) {
+  const originalTab = state.views.find(tab => tab.key === tabListState?.selectedKey);
+  if (originalTab) {
+    const newViews = state.views.map(tab => {
+      return tab.key === tabListState?.selectedKey
+        ? {...tab, unsavedChanges: undefined}
+        : tab;
+    });
+    return {...state, views: newViews};
+  }
+  return state;
+}
+
+function renameView(
+  state: IssueViewsState,
+  action: RenameTabAction,
+  tabListState: TabListState<any>
+) {
+  const renamedTab = state.views.find(tab => tab.key === tabListState?.selectedKey);
+  if (renamedTab && action.newLabel !== renamedTab.label) {
+    const newViews = state.views.map(tab =>
+      tab.key === renamedTab.key
+        ? {...tab, label: action.newLabel, isCommitted: true}
+        : tab
+    );
+    return {...state, views: newViews};
+  }
+  return state;
+}
+
+function duplicateView(
+  state: IssueViewsState,
+  action: DuplicateViewAction,
+  tabListState: TabListState<any>
+) {
+  const idx = state.views.findIndex(tb => tb.key === tabListState?.selectedKey);
+  if (idx !== -1) {
+    const duplicatedTab = state.views[idx]!;
+    const newTabs: IssueView[] = [
+      ...state.views.slice(0, idx + 1),
+      {
+        ...duplicatedTab,
+        id: action.newViewId,
+        key: action.newViewId,
+        label: `${duplicatedTab.label} (Copy)`,
+        isCommitted: true,
+      },
+      ...state.views.slice(idx + 1),
+    ];
+    return {...state, views: newTabs};
+  }
+  return state;
+}
+
+function deleteView(state: IssueViewsState, tabListState: TabListState<any>) {
+  const newViews = state.views.filter(tab => tab.key !== tabListState?.selectedKey);
+  return {...state, views: newViews};
+}
+
+function createNewView(state: IssueViewsState, action: CreateNewViewAction) {
+  const newTabs: IssueView[] = [
+    ...state.views,
+    {
+      id: action.tempId,
+      key: action.tempId,
+      label: 'New View',
+      query: '',
+      querySort: IssueSortOptions.DATE,
+      isCommitted: false,
+    },
+  ];
+  return {...state, views: newTabs};
+}
+
+function setTempView(state: IssueViewsState, action: SetTempViewAction) {
+  const tempView: IssueView = {
+    id: TEMPORARY_TAB_KEY,
+    key: TEMPORARY_TAB_KEY,
+    label: t('Unsaved'),
+    query: action.query,
+    querySort: action.sort ?? IssueSortOptions.DATE,
+    isCommitted: true,
+  };
+  return {...state, tempView};
+}
+
+function discardTempView(state: IssueViewsState, tabListState: TabListState<any>) {
+  tabListState?.setSelectedKey(state.views[0]!.key);
+  return {...state, tempView: undefined};
+}
+
+function saveTempView(state: IssueViewsState, tabListState: TabListState<any>) {
+  if (state.tempView) {
+    const tempId = generateTempViewId();
+    const newTab: IssueView = {
+      id: tempId,
+      key: tempId,
+      label: 'New View',
+      query: state.tempView?.query,
+      querySort: state.tempView?.querySort,
+      isCommitted: true,
+    };
+    tabListState?.setSelectedKey(tempId);
+    return {...state, views: [...state.views, newTab], tempView: undefined};
+  }
+  return state;
+}
+
+function updateUnsavedChanges(
+  state: IssueViewsState,
+  action: UpdateUnsavedChangesAction,
+  tabListState: TabListState<any>
+) {
+  return {
+    ...state,
+    views: state.views.map(tab =>
+      tab.key === tabListState?.selectedKey
+        ? {
+            ...tab,
+            unsavedChanges: action.unsavedChanges,
+            isCommitted: action.isCommitted ?? tab.isCommitted,
+          }
+        : tab
+    ),
+  };
+}
+
+function updateViewIds(state: IssueViewsState, action: UpdateViewIdsAction) {
+  const assignedIds = new Set();
+  const updatedViews = state.views.map(tab => {
+    if (tab.id && tab.id[0] === '_') {
+      const matchingView = action.newViews.find(
+        view =>
+          view.id &&
+          !assignedIds.has(view.id) &&
+          tab.query === view.query &&
+          tab.querySort === view.querySort &&
+          tab.label === view.name
+      );
+      if (matchingView?.id) {
+        assignedIds.add(matchingView.id);
+        return {...tab, id: matchingView.id};
+      }
+    }
+    return tab;
+  });
+  return {...state, views: updatedViews};
+}
+
+function setViews(state: IssueViewsState, action: SetViewsAction) {
+  return {...state, views: action.views};
+}
+
+interface IssueViewsStateProviderProps extends Omit<TabsProps<any>, 'children'> {
+  children: React.ReactNode;
+  initialViews: IssueView[];
+  // TODO(msun): Replace router with useLocation() / useUrlParams() / useSearchParams() in the future
+  router: InjectedRouter;
+}
+
+export function IssueViewsStateProvider({
+  children,
+  initialViews,
+  router,
+  ...props
+}: IssueViewsStateProviderProps) {
+  const navigate = useNavigate();
+  const pageFilters = usePageFilters();
+  const organization = useOrganization();
+  const {setNewViewActive, setOnNewViewsSaved} = useContext(NewTabContext);
+  const [tabListState, setTabListState] = useState<TabListState<any>>();
+  const {className: _className, ...restProps} = props;
+
+  const {cursor: _cursor, page: _page, ...queryParams} = router?.location.query;
+  const {query, sort, viewId, project, environment} = queryParams;
+
+  const queryParamsWithPageFilters = useMemo(() => {
+    return {
+      ...queryParams,
+      project: project ?? pageFilters.selection.projects,
+      environment: environment ?? pageFilters.selection.environments,
+      ...normalizeDateTimeParams(pageFilters.selection.datetime),
+    };
+  }, [
+    environment,
+    pageFilters.selection.datetime,
+    pageFilters.selection.environments,
+    pageFilters.selection.projects,
+    project,
+    queryParams,
+  ]);
+
+  // This function is fired upon receiving new views from the backend - it replaces any previously
+  // generated temporary view ids with the permanent view ids from the backend
+  const replaceWithPersistantViewIds = (views: GroupSearchView[]) => {
+    const newlyCreatedViews = views.filter(
+      view => !state.views.find(tab => tab.id === view.id)
+    );
+    if (newlyCreatedViews.length > 0) {
+      dispatch({type: 'UPDATE_VIEW_IDS', newViews: newlyCreatedViews});
+      const currentView = state.views.find(tab => tab.id === viewId);
+
+      if (viewId?.startsWith('_') && currentView) {
+        const matchingView = newlyCreatedViews.find(
+          view =>
+            view.id &&
+            currentView.query === view.query &&
+            currentView.querySort === view.querySort
+        );
+        if (matchingView?.id) {
+          navigate(
+            normalizeUrl({
+              ...location,
+              query: {
+                ...queryParamsWithPageFilters,
+                viewId: matchingView.id,
+              },
+            }),
+            {replace: true}
+          );
+        }
+      }
+    }
+    return;
+  };
+
+  const {mutate: updateViews} = useUpdateGroupSearchViews({
+    onSuccess: replaceWithPersistantViewIds,
+  });
+
+  const debounceUpdateViews = useMemo(
+    () =>
+      debounce((newTabs: IssueView[]) => {
+        if (newTabs) {
+          updateViews({
+            orgSlug: organization.slug,
+            groupSearchViews: newTabs
+              .filter(tab => tab.isCommitted)
+              .map(tab => ({
+                // Do not send over an ID if it's a temporary or default tab so that
+                // the backend will save these and generate permanent Ids for them
+                ...(tab.id[0] !== '_' && !tab.id.startsWith('default')
+                  ? {id: tab.id}
+                  : {}),
+                name: tab.label,
+                query: tab.query,
+                querySort: tab.querySort,
+              })),
+          });
+        }
+      }, 500),
+    [organization.slug, updateViews]
+  );
+
+  const reducer: Reducer<IssueViewsState, IssueViewsActions> = useCallback(
+    (state, action): IssueViewsState => {
+      if (!tabListState) {
+        return state;
+      }
+      switch (action.type) {
+        case 'REORDER_TABS':
+          return reorderTabs(state, action);
+        case 'SAVE_CHANGES':
+          return saveChanges(state, tabListState);
+        case 'DISCARD_CHANGES':
+          return discardChanges(state, tabListState);
+        case 'RENAME_TAB':
+          return renameView(state, action, tabListState);
+        case 'DUPLICATE_VIEW':
+          return duplicateView(state, action, tabListState);
+        case 'DELETE_VIEW':
+          return deleteView(state, tabListState);
+        case 'CREATE_NEW_VIEW':
+          return createNewView(state, action);
+        case 'SET_TEMP_VIEW':
+          return setTempView(state, action);
+        case 'DISCARD_TEMP_VIEW':
+          return discardTempView(state, tabListState);
+        case 'SAVE_TEMP_VIEW':
+          return saveTempView(state, tabListState);
+        case 'UPDATE_UNSAVED_CHANGES':
+          return updateUnsavedChanges(state, action, tabListState);
+        case 'UPDATE_VIEW_IDS':
+          return updateViewIds(state, action);
+        case 'SET_VIEWS':
+          return setViews(state, action);
+        case 'SYNC_VIEWS_TO_BACKEND':
+          return state;
+        default:
+          return state;
+      }
+    },
+    [tabListState]
+  );
+
+  const sortOption =
+    sort && Object.values(IssueSortOptions).includes(sort.toString() as IssueSortOptions)
+      ? (sort.toString() as IssueSortOptions)
+      : IssueSortOptions.DATE;
+
+  const initialTempView: IssueView | undefined =
+    query && (!viewId || !initialViews.find(tab => tab.id === viewId))
+      ? {
+          id: TEMPORARY_TAB_KEY,
+          key: TEMPORARY_TAB_KEY,
+          label: t('Unsaved'),
+          query: query.toString(),
+          querySort: sortOption,
+          isCommitted: true,
+        }
+      : undefined;
+
+  const [state, dispatch] = useReducer(reducer, {
+    views: initialViews,
+    tempView: initialTempView,
+  });
+
+  const dispatchWrapper = (action: IssueViewsActions) => {
+    const newState = reducer(state, action);
+    dispatch(action);
+
+    if (action.type === 'SYNC_VIEWS_TO_BACKEND' || action.syncViews) {
+      debounceUpdateViews(newState.views);
+    }
+
+    const actionAnalyticsKey = ACTION_ANALYTICS_MAP[action.type];
+    if (actionAnalyticsKey) {
+      trackAnalytics(actionAnalyticsKey, {
+        organization,
+      });
+    }
+  };
+
+  const handleNewViewsSaved: NewTabContext['onNewViewsSaved'] = useCallback<
+    NewTabContext['onNewViewsSaved']
+  >(
+    () => (newViews: NewView[]) => {
+      if (newViews.length === 0) {
+        return;
+      }
+      setNewViewActive(false);
+      const {label, query: newQuery, saveQueryToView} = newViews[0]!;
+      const remainingNewViews: IssueView[] = newViews.slice(1)?.map(view => {
+        const newId = generateTempViewId();
+        const viewToTab: IssueView = {
+          id: newId,
+          key: newId,
+          label: view.label,
+          query: view.query,
+          querySort: IssueSortOptions.DATE,
+          unsavedChanges: view.saveQueryToView
+            ? undefined
+            : [view.query, IssueSortOptions.DATE],
+          isCommitted: true,
+        };
+        return viewToTab;
+      });
+      let updatedTabs: IssueView[] = state.views.map(tab => {
+        if (tab.key === viewId) {
+          return {
+            ...tab,
+            label,
+            query: saveQueryToView ? newQuery : '',
+            querySort: IssueSortOptions.DATE,
+            unsavedChanges: saveQueryToView ? undefined : [query, IssueSortOptions.DATE],
+            isCommitted: true,
+          };
+        }
+        return tab;
+      });
+
+      if (remainingNewViews.length > 0) {
+        updatedTabs = [...updatedTabs, ...remainingNewViews];
+      }
+
+      dispatch({type: 'SET_VIEWS', views: updatedTabs, syncViews: true});
+      navigate(
+        {
+          ...location,
+          query: {
+            ...queryParams,
+            query,
+            sort: IssueSortOptions.DATE,
+          },
+        },
+        {replace: true}
+      );
+    },
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [location, navigate, setNewViewActive, state.views, viewId]
+  );
+
+  useEffect(() => {
+    setOnNewViewsSaved(handleNewViewsSaved);
+  }, [setOnNewViewsSaved, handleNewViewsSaved]);
+
+  return (
+    <IssueViewsContext.Provider
+      value={{
+        rootProps: {...restProps, orientation: 'horizontal'},
+        tabListState,
+        setTabListState,
+        dispatch: dispatchWrapper,
+        state,
+      }}
+    >
+      {children}
+    </IssueViewsContext.Provider>
+  );
+}
+
+export function IssueViews<T extends string | number>({
+  orientation = 'horizontal',
+  className,
+  children,
+  initialViews,
+  router,
+  ...props
+}: TabsProps<T> & Omit<IssueViewsStateProviderProps, 'children'>) {
+  return (
+    <IssueViewsStateProvider initialViews={initialViews} router={router} {...props}>
+      <TabsWrap orientation={orientation} className={className}>
+        {children}
+      </TabsWrap>
+    </IssueViewsStateProvider>
+  );
+}
+
+const TabsWrap = styled('div', {shouldForwardProp: tabsShouldForwardProp})<{
+  orientation: Orientation;
+}>`
+  display: flex;
+  flex-direction: ${p => (p.orientation === 'horizontal' ? 'column' : 'row')};
+  flex-grow: 1;
+
+  ${p =>
+    p.orientation === 'vertical' &&
+    `
+      height: 100%;
+      align-items: stretch;
+    `};
+`;
diff --git a/static/app/views/issueList/issueListSetAsDefault.tsx b/static/app/views/issueList/issueListSetAsDefault.tsx
index 490072ab8e8591..51ecaf101ad0f1 100644
--- a/static/app/views/issueList/issueListSetAsDefault.tsx
+++ b/static/app/views/issueList/issueListSetAsDefault.tsx
@@ -1,5 +1,5 @@
 import {Button} from 'sentry/components/button';
-import {removeSpace} from 'sentry/components/smartSearchBar/utils';
+import {removeSpace} from 'sentry/components/deprecatedSmartSearchBar/utils';
 import {IconBookmark} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {SavedSearchType} from 'sentry/types/group';
diff --git a/static/app/views/issueList/customViewsHeader.spec.tsx b/static/app/views/issueList/issueViewsHeader.spec.tsx
similarity index 85%
rename from static/app/views/issueList/customViewsHeader.spec.tsx
rename to static/app/views/issueList/issueViewsHeader.spec.tsx
index 1813f59e20399b..78a9cc4dbfb8d5 100644
--- a/static/app/views/issueList/customViewsHeader.spec.tsx
+++ b/static/app/views/issueList/issueViewsHeader.spec.tsx
@@ -4,10 +4,10 @@ import {RouterFixture} from 'sentry-fixture/routerFixture';
 
 import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 
-import CustomViewsIssueListHeader from 'sentry/views/issueList/customViewsHeader';
+import IssueViewsIssueListHeader from 'sentry/views/issueList/issueViewsHeader';
 import {IssueSortOptions} from 'sentry/views/issueList/utils';
 
-describe('CustomViewsHeader', () => {
+describe('IssueViewsHeader', () => {
   const organization = OrganizationFixture();
 
   const getRequestViews = [
@@ -43,7 +43,7 @@ describe('CustomViewsHeader', () => {
       pathname: `/organizations/${organization.slug}/issues/`,
       query: {
         query: 'is:unresolved',
-        viewId: getRequestViews[0].id,
+        viewId: getRequestViews[0]!.id,
       },
     }),
   });
@@ -76,7 +76,7 @@ describe('CustomViewsHeader', () => {
     });
 
     it('renders all tabs, selects the first one by default, and replaces the query params accordingly', async () => {
-      render(<CustomViewsIssueListHeader {...defaultProps} />, {router: defaultRouter});
+      render(<IssueViewsIssueListHeader {...defaultProps} />, {router: defaultRouter});
 
       expect(await screen.findByRole('tab', {name: 'High Priority'})).toBeInTheDocument();
       expect(screen.getByRole('tab', {name: 'Medium Priority'})).toBeInTheDocument();
@@ -99,9 +99,9 @@ describe('CustomViewsHeader', () => {
       expect(defaultRouter.replace).toHaveBeenCalledWith(
         expect.objectContaining({
           query: expect.objectContaining({
-            query: getRequestViews[0].query,
-            viewId: getRequestViews[0].id,
-            sort: getRequestViews[0].querySort,
+            query: getRequestViews[0]!.query,
+            viewId: getRequestViews[0]!.id,
+            sort: getRequestViews[0]!.querySort,
           }),
         })
       );
@@ -121,7 +121,7 @@ describe('CustomViewsHeader', () => {
         ],
       });
 
-      render(<CustomViewsIssueListHeader {...defaultProps} />, {router: defaultRouter});
+      render(<IssueViewsIssueListHeader {...defaultProps} />, {router: defaultRouter});
 
       expect(await screen.findByRole('tab', {name: 'Prioritized'})).toBeInTheDocument();
       expect(screen.getByRole('tab', {name: 'Prioritized'})).toHaveAttribute(
@@ -154,7 +154,7 @@ describe('CustomViewsHeader', () => {
         ],
       });
 
-      render(<CustomViewsIssueListHeader {...defaultProps} router={queryOnlyRouter} />, {
+      render(<IssueViewsIssueListHeader {...defaultProps} router={queryOnlyRouter} />, {
         router: queryOnlyRouter,
       });
 
@@ -180,15 +180,14 @@ describe('CustomViewsHeader', () => {
         location: LocationFixture({
           pathname: `/organizations/${organization.slug}/issues/`,
           query: {
-            viewId: getRequestViews[1].id,
+            viewId: getRequestViews[1]!.id,
           },
         }),
       });
 
-      render(
-        <CustomViewsIssueListHeader {...defaultProps} router={specificTabRouter} />,
-        {router: specificTabRouter}
-      );
+      render(<IssueViewsIssueListHeader {...defaultProps} router={specificTabRouter} />, {
+        router: specificTabRouter,
+      });
 
       expect(await screen.findByRole('tab', {name: 'Medium Priority'})).toHaveAttribute(
         'aria-selected',
@@ -198,16 +197,16 @@ describe('CustomViewsHeader', () => {
       expect(specificTabRouter.replace).toHaveBeenCalledWith(
         expect.objectContaining({
           query: expect.objectContaining({
-            viewId: getRequestViews[1].id,
-            query: getRequestViews[1].query,
-            sort: getRequestViews[1].querySort,
+            viewId: getRequestViews[1]!.id,
+            query: getRequestViews[1]!.query,
+            sort: getRequestViews[1]!.querySort,
           }),
         })
       );
     });
 
     it('initially selects a temporary tab when only a query is present in the url', async () => {
-      render(<CustomViewsIssueListHeader {...defaultProps} router={queryOnlyRouter} />, {
+      render(<IssueViewsIssueListHeader {...defaultProps} router={queryOnlyRouter} />, {
         router: queryOnlyRouter,
       });
 
@@ -240,10 +239,9 @@ describe('CustomViewsHeader', () => {
           },
         }),
       });
-      render(
-        <CustomViewsIssueListHeader {...defaultProps} router={specificTabRouter} />,
-        {router: specificTabRouter}
-      );
+      render(<IssueViewsIssueListHeader {...defaultProps} router={specificTabRouter} />, {
+        router: specificTabRouter,
+      });
 
       expect(await screen.findByRole('tab', {name: 'High Priority'})).toBeInTheDocument();
       expect(screen.getByRole('tab', {name: 'Medium Priority'})).toBeInTheDocument();
@@ -291,7 +289,7 @@ describe('CustomViewsHeader', () => {
       });
 
       render(
-        <CustomViewsIssueListHeader
+        <IssueViewsIssueListHeader
           {...defaultProps}
           router={defaultTabDifferentQueryRouter}
         />,
@@ -325,7 +323,7 @@ describe('CustomViewsHeader', () => {
     });
 
     it('switches tabs when clicked, and updates the query params accordingly', async () => {
-      render(<CustomViewsIssueListHeader {...defaultProps} />, {router: defaultRouter});
+      render(<IssueViewsIssueListHeader {...defaultProps} />, {router: defaultRouter});
 
       await userEvent.click(await screen.findByRole('tab', {name: 'Medium Priority'}));
 
@@ -346,17 +344,17 @@ describe('CustomViewsHeader', () => {
       expect(defaultRouter.push).toHaveBeenCalledWith(
         expect.objectContaining({
           query: expect.objectContaining({
-            query: getRequestViews[1].query,
-            viewId: getRequestViews[1].id,
-            sort: getRequestViews[1].querySort,
+            query: getRequestViews[1]!.query,
+            viewId: getRequestViews[1]!.id,
+            sort: getRequestViews[1]!.querySort,
           }),
         })
       );
     });
 
-    // biome-ignore lint/suspicious/noSkippedTests: <This behavior works when testing in browser, need to debug why its failing tests>
+    // eslint-disable-next-line jest/no-disabled-tests
     it.skip('retains unsaved changes after switching tabs', async () => {
-      render(<CustomViewsIssueListHeader {...defaultProps} router={unsavedTabRouter} />, {
+      render(<IssueViewsIssueListHeader {...defaultProps} router={unsavedTabRouter} />, {
         router: unsavedTabRouter,
       });
       expect(await screen.findByTestId('unsaved-changes-indicator')).toBeInTheDocument();
@@ -377,14 +375,14 @@ describe('CustomViewsHeader', () => {
         location: LocationFixture({
           pathname: `/organizations/${organization.slug}/issues/`,
           query: {
-            viewId: getRequestViews[1].id,
+            viewId: getRequestViews[1]!.id,
             query: 'is:unresolved',
           },
         }),
       });
 
       render(
-        <CustomViewsIssueListHeader
+        <IssueViewsIssueListHeader
           {...defaultProps}
           router={goodViewIdChangedQueryRouter}
         />,
@@ -401,9 +399,9 @@ describe('CustomViewsHeader', () => {
       expect(goodViewIdChangedQueryRouter.replace).toHaveBeenCalledWith(
         expect.objectContaining({
           query: expect.objectContaining({
-            viewId: getRequestViews[1].id,
+            viewId: getRequestViews[1]!.id,
             query: 'is:unresolved',
-            sort: getRequestViews[1].querySort,
+            sort: getRequestViews[1]!.querySort,
           }),
         })
       );
@@ -414,14 +412,14 @@ describe('CustomViewsHeader', () => {
         location: LocationFixture({
           pathname: `/organizations/${organization.slug}/issues/`,
           query: {
-            viewId: getRequestViews[1].id,
+            viewId: getRequestViews[1]!.id,
             sort: IssueSortOptions.FREQ,
           },
         }),
       });
 
       render(
-        <CustomViewsIssueListHeader
+        <IssueViewsIssueListHeader
           {...defaultProps}
           router={goodViewIdChangedSortRouter}
         />,
@@ -438,8 +436,8 @@ describe('CustomViewsHeader', () => {
       expect(goodViewIdChangedSortRouter.replace).toHaveBeenCalledWith(
         expect.objectContaining({
           query: expect.objectContaining({
-            viewId: getRequestViews[1].id,
-            query: getRequestViews[1].query,
+            viewId: getRequestViews[1]!.id,
+            query: getRequestViews[1]!.query,
             sort: IssueSortOptions.FREQ,
           }),
         })
@@ -464,9 +462,9 @@ describe('CustomViewsHeader', () => {
         body: getRequestViews,
       });
 
-      render(<CustomViewsIssueListHeader {...defaultProps} />);
+      render(<IssueViewsIssueListHeader {...defaultProps} />);
 
-      userEvent.click(
+      await userEvent.click(
         await screen.findByRole('button', {name: 'High Priority Ellipsis Menu'})
       );
 
@@ -495,9 +493,9 @@ describe('CustomViewsHeader', () => {
         body: getRequestViews,
       });
 
-      render(<CustomViewsIssueListHeader {...defaultProps} router={unsavedTabRouter} />);
+      render(<IssueViewsIssueListHeader {...defaultProps} router={unsavedTabRouter} />);
 
-      userEvent.click(
+      await userEvent.click(
         await screen.findByRole('button', {name: 'High Priority Ellipsis Menu'})
       );
 
@@ -525,9 +523,9 @@ describe('CustomViewsHeader', () => {
         body: [getRequestViews[0]],
       });
 
-      render(<CustomViewsIssueListHeader {...defaultProps} />);
+      render(<IssueViewsIssueListHeader {...defaultProps} />);
 
-      userEvent.click(
+      await userEvent.click(
         await screen.findByRole('button', {name: 'High Priority Ellipsis Menu'})
       );
 
@@ -558,9 +556,9 @@ describe('CustomViewsHeader', () => {
           method: 'PUT',
         });
 
-        render(<CustomViewsIssueListHeader {...defaultProps} />, {router: defaultRouter});
+        render(<IssueViewsIssueListHeader {...defaultProps} />, {router: defaultRouter});
 
-        userEvent.click(
+        await userEvent.click(
           await screen.findByRole('button', {name: 'High Priority Ellipsis Menu'})
         );
 
@@ -584,10 +582,10 @@ describe('CustomViewsHeader', () => {
         expect(putRequestViews).toEqual(
           expect.arrayContaining([
             expect.objectContaining({
-              id: getRequestViews[0].id,
+              id: getRequestViews[0]!.id,
               name: 'New Name',
-              query: getRequestViews[0].query,
-              querySort: getRequestViews[0].querySort,
+              query: getRequestViews[0]!.query,
+              querySort: getRequestViews[0]!.querySort,
             }),
           ])
         );
@@ -609,9 +607,9 @@ describe('CustomViewsHeader', () => {
           method: 'PUT',
         });
 
-        render(<CustomViewsIssueListHeader {...defaultProps} />, {router: defaultRouter});
+        render(<IssueViewsIssueListHeader {...defaultProps} />, {router: defaultRouter});
 
-        userEvent.click(
+        await userEvent.click(
           await screen.findByRole('button', {name: 'High Priority Ellipsis Menu'})
         );
 
@@ -627,13 +625,13 @@ describe('CustomViewsHeader', () => {
           expect.arrayContaining([
             expect.objectContaining({
               name: 'High Priority',
-              query: getRequestViews[0].query,
-              querySort: getRequestViews[0].querySort,
+              query: getRequestViews[0]!.query,
+              querySort: getRequestViews[0]!.querySort,
             }),
             expect.objectContaining({
               name: 'High Priority (Copy)',
-              query: getRequestViews[0].query,
-              querySort: getRequestViews[0].querySort,
+              query: getRequestViews[0]!.query,
+              querySort: getRequestViews[0]!.querySort,
             }),
           ])
         );
@@ -643,8 +641,8 @@ describe('CustomViewsHeader', () => {
           expect.objectContaining({
             query: expect.objectContaining({
               viewId: expect.stringContaining('_'),
-              query: getRequestViews[0].query,
-              sort: getRequestViews[0].querySort,
+              query: getRequestViews[0]!.query,
+              sort: getRequestViews[0]!.querySort,
             }),
           })
         );
@@ -658,9 +656,9 @@ describe('CustomViewsHeader', () => {
           method: 'PUT',
         });
 
-        render(<CustomViewsIssueListHeader {...defaultProps} />, {router: defaultRouter});
+        render(<IssueViewsIssueListHeader {...defaultProps} />, {router: defaultRouter});
 
-        userEvent.click(
+        await userEvent.click(
           await screen.findByRole('button', {name: 'High Priority Ellipsis Menu'})
         );
 
@@ -671,16 +669,16 @@ describe('CustomViewsHeader', () => {
         const putRequestViews = mockPutRequest.mock.calls[0][1].data.views;
         expect(putRequestViews).toHaveLength(2);
         expect(putRequestViews.every).not.toEqual(
-          expect.objectContaining({id: getRequestViews[0].id})
+          expect.objectContaining({id: getRequestViews[0]!.id})
         );
 
         // Make sure the new first tab is selected
         expect(defaultRouter.push).toHaveBeenCalledWith(
           expect.objectContaining({
             query: expect.objectContaining({
-              query: getRequestViews[1].query,
-              viewId: getRequestViews[1].id,
-              sort: getRequestViews[1].querySort,
+              query: getRequestViews[1]!.query,
+              viewId: getRequestViews[1]!.id,
+              sort: getRequestViews[1]!.querySort,
             }),
           })
         );
@@ -695,11 +693,11 @@ describe('CustomViewsHeader', () => {
         });
 
         render(
-          <CustomViewsIssueListHeader {...defaultProps} router={unsavedTabRouter} />,
+          <IssueViewsIssueListHeader {...defaultProps} router={unsavedTabRouter} />,
           {router: unsavedTabRouter}
         );
 
-        userEvent.click(
+        await userEvent.click(
           await screen.findByRole('button', {name: 'High Priority Ellipsis Menu'})
         );
 
@@ -714,10 +712,10 @@ describe('CustomViewsHeader', () => {
         expect(putRequestViews).toEqual(
           expect.arrayContaining([
             expect.objectContaining({
-              id: getRequestViews[0].id,
+              id: getRequestViews[0]!.id,
               name: 'High Priority',
               query: 'is:unresolved',
-              querySort: getRequestViews[0].querySort,
+              querySort: getRequestViews[0]!.querySort,
             }),
           ])
         );
@@ -725,7 +723,7 @@ describe('CustomViewsHeader', () => {
         expect(unsavedTabRouter.push).not.toHaveBeenCalled();
       });
 
-      // biome-ignore lint/suspicious/noSkippedTests: Works in browser, unclear why its not passing this test
+      // eslint-disable-next-line jest/no-disabled-tests
       it.skip('should save changes when hitting ctrl+s', async () => {
         const mockPutRequest = MockApiClient.addMockResponse({
           url: `/organizations/org-slug/group-search-views/`,
@@ -733,7 +731,7 @@ describe('CustomViewsHeader', () => {
         });
 
         render(
-          <CustomViewsIssueListHeader {...defaultProps} router={unsavedTabRouter} />,
+          <IssueViewsIssueListHeader {...defaultProps} router={unsavedTabRouter} />,
           {router: unsavedTabRouter}
         );
 
@@ -747,10 +745,10 @@ describe('CustomViewsHeader', () => {
         expect(putRequestViews).toEqual(
           expect.arrayContaining([
             expect.objectContaining({
-              id: getRequestViews[0].id,
+              id: getRequestViews[0]!.id,
               name: 'High Priority',
               query: 'is:unresolved',
-              querySort: getRequestViews[0].querySort,
+              querySort: getRequestViews[0]!.querySort,
             }),
           ])
         );
@@ -767,11 +765,11 @@ describe('CustomViewsHeader', () => {
         });
 
         render(
-          <CustomViewsIssueListHeader {...defaultProps} router={unsavedTabRouter} />,
+          <IssueViewsIssueListHeader {...defaultProps} router={unsavedTabRouter} />,
           {router: unsavedTabRouter}
         );
 
-        userEvent.click(
+        await userEvent.click(
           await screen.findByRole('button', {name: 'High Priority Ellipsis Menu'})
         );
 
@@ -785,9 +783,9 @@ describe('CustomViewsHeader', () => {
         expect(unsavedTabRouter.push).toHaveBeenCalledWith(
           expect.objectContaining({
             query: expect.objectContaining({
-              query: getRequestViews[0].query,
-              viewId: getRequestViews[0].id,
-              sort: getRequestViews[0].querySort,
+              query: getRequestViews[0]!.query,
+              viewId: getRequestViews[0]!.id,
+              sort: getRequestViews[0]!.querySort,
             }),
           })
         );
diff --git a/static/app/views/issueList/customViewsHeader.tsx b/static/app/views/issueList/issueViewsHeader.tsx
similarity index 58%
rename from static/app/views/issueList/customViewsHeader.tsx
rename to static/app/views/issueList/issueViewsHeader.tsx
index 50f6c0b4306f6d..bd554b5a27d37a 100644
--- a/static/app/views/issueList/customViewsHeader.tsx
+++ b/static/app/views/issueList/issueViewsHeader.tsx
@@ -1,15 +1,19 @@
 import {useContext, useEffect, useMemo, useState} from 'react';
 import styled from '@emotion/styled';
-import debounce from 'lodash/debounce';
+import type {Node} from '@react-types/shared';
 
+import {addSuccessMessage} from 'sentry/actionCreators/indicator';
 import {Button} from 'sentry/components/button';
 import ButtonBar from 'sentry/components/buttonBar';
-import {TEMPORARY_TAB_KEY} from 'sentry/components/draggableTabs/draggableTabList';
+import {
+  DraggableTabList,
+  TEMPORARY_TAB_KEY,
+} from 'sentry/components/draggableTabs/draggableTabList';
+import type {DraggableTabListItemProps} from 'sentry/components/draggableTabs/item';
 import GlobalEventProcessingAlert from 'sentry/components/globalEventProcessingAlert';
 import * as Layout from 'sentry/components/layouts/thirds';
 import {normalizeDateTimeParams} from 'sentry/components/organizations/pageFilters/parse';
 import {PageHeadingQuestionTooltip} from 'sentry/components/pageHeadingQuestionTooltip';
-import {Tabs, TabsContext} from 'sentry/components/tabs';
 import {IconMegaphone, IconPause, IconPlay} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
@@ -17,24 +21,25 @@ import type {InjectedRouter} from 'sentry/types/legacyReactRouter';
 import type {Organization} from 'sentry/types/organization';
 import {trackAnalytics} from 'sentry/utils/analytics';
 import normalizeUrl from 'sentry/utils/url/normalizeUrl';
-import {useEffectAfterFirstRender} from 'sentry/utils/useEffectAfterFirstRender';
 import {useFeedbackForm} from 'sentry/utils/useFeedbackForm';
+import {useHotkeys} from 'sentry/utils/useHotkeys';
 import {useLocation} from 'sentry/utils/useLocation';
 import {useNavigate} from 'sentry/utils/useNavigate';
 import usePageFilters from 'sentry/utils/usePageFilters';
 import useProjects from 'sentry/utils/useProjects';
 import {
-  DraggableTabBar,
-  type Tab,
-} from 'sentry/views/issueList/groupSearchViewTabs/draggableTabBar';
-import {useUpdateGroupSearchViews} from 'sentry/views/issueList/mutations/useUpdateGroupSearchViews';
+  generateTempViewId,
+  type IssueView,
+  IssueViews,
+  IssueViewsContext,
+} from 'sentry/views/issueList/groupSearchViewTabs/issueViews';
+import {IssueViewTab} from 'sentry/views/issueList/groupSearchViewTabs/issueViewTab';
 import {useFetchGroupSearchViews} from 'sentry/views/issueList/queries/useFetchGroupSearchViews';
-import type {UpdateGroupSearchViewPayload} from 'sentry/views/issueList/types';
 import {NewTabContext} from 'sentry/views/issueList/utils/newTabContext';
 
 import {IssueSortOptions} from './utils';
 
-type CustomViewsIssueListHeaderProps = {
+type IssueViewsIssueListHeaderProps = {
   onRealtimeChange: (realtime: boolean) => void;
   organization: Organization;
   realtimeActive: boolean;
@@ -42,23 +47,24 @@ type CustomViewsIssueListHeaderProps = {
   selectedProjectIds: number[];
 };
 
-type CustomViewsIssueListHeaderTabsContentProps = {
+type IssueViewsIssueListHeaderTabsContentProps = {
   organization: Organization;
   router: InjectedRouter;
-  views: UpdateGroupSearchViewPayload[];
 };
 
-function CustomViewsIssueListHeader({
+function IssueViewsIssueListHeader({
   selectedProjectIds,
   realtimeActive,
   onRealtimeChange,
   ...props
-}: CustomViewsIssueListHeaderProps) {
+}: IssueViewsIssueListHeaderProps) {
   const {projects} = useProjects();
   const selectedProjects = projects.filter(({id}) =>
     selectedProjectIds.includes(Number(id))
   );
 
+  const {newViewActive} = useContext(NewTabContext);
+
   const {data: groupSearchViews} = useFetchGroupSearchViews({
     orgSlug: props.organization.slug,
   });
@@ -67,8 +73,6 @@ function CustomViewsIssueListHeader({
     ? t('Pause real-time updates')
     : t('Enable real-time updates');
 
-  const {newViewActive} = useContext(NewTabContext);
-
   const openForm = useFeedbackForm();
   const hasNewLayout = props.organization.features.includes('issue-stream-table-layout');
 
@@ -127,9 +131,28 @@ function CustomViewsIssueListHeader({
       </Layout.HeaderActions>
       <StyledGlobalEventProcessingAlert projects={selectedProjects} />
       {groupSearchViews ? (
-        <StyledTabs>
-          <CustomViewsIssueListHeaderTabsContent {...props} views={groupSearchViews} />
-        </StyledTabs>
+        <StyledIssueViews
+          router={props.router}
+          initialViews={groupSearchViews.map(
+            (
+              {id, name, query: viewQuery, querySort: viewQuerySort},
+              index
+            ): IssueView => {
+              const tabId = id ?? `default${index.toString()}`;
+
+              return {
+                id: tabId,
+                key: tabId,
+                label: name,
+                query: viewQuery,
+                querySort: viewQuerySort,
+                isCommitted: true,
+              };
+            }
+          )}
+        >
+          <IssueViewsIssueListHeaderTabsContent {...props} />
+        </StyledIssueViews>
       ) : (
         <div style={{height: 33}} />
       )}
@@ -137,22 +160,23 @@ function CustomViewsIssueListHeader({
   );
 }
 
-function CustomViewsIssueListHeaderTabsContent({
+function IssueViewsIssueListHeaderTabsContent({
   organization,
   router,
-  views,
-}: CustomViewsIssueListHeaderTabsContentProps) {
-  // TODO(msun): Possible replace navigate with useSearchParams() in the future?
+}: IssueViewsIssueListHeaderTabsContentProps) {
   const navigate = useNavigate();
   const location = useLocation();
-  const {setNewViewActive, newViewActive} = useContext(NewTabContext);
   const pageFilters = usePageFilters();
 
+  const {newViewActive, setNewViewActive} = useContext(NewTabContext);
+  const {tabListState, state, dispatch} = useContext(IssueViewsContext);
+  const {views, tempView} = state;
+
+  const [editingTabKey, setEditingTabKey] = useState<string | null>(null);
+
   // TODO(msun): Use the location from useLocation instead of props router in the future
   const {cursor: _cursor, page: _page, ...queryParams} = router?.location.query;
-
   const {query, sort, viewId, project, environment} = queryParams;
-
   const queryParamsWithPageFilters = useMemo(() => {
     return {
       ...queryParams,
@@ -169,74 +193,6 @@ function CustomViewsIssueListHeaderTabsContent({
     queryParams,
   ]);
 
-  const [draggableTabs, setDraggableTabs] = useState<Tab[]>(
-    views.map(({id, name, query: viewQuery, querySort: viewQuerySort}, index): Tab => {
-      const tabId = id ?? `default${index.toString()}`;
-
-      return {
-        id: tabId,
-        key: tabId,
-        label: name,
-        query: viewQuery,
-        querySort: viewQuerySort,
-        unsavedChanges: undefined,
-        isCommitted: true,
-      };
-    })
-  );
-
-  const getInitialTabKey = () => {
-    if (viewId && draggableTabs.find(tab => tab.id === viewId)) {
-      return draggableTabs.find(tab => tab.id === viewId)!.key;
-    }
-    if (query) {
-      return TEMPORARY_TAB_KEY;
-    }
-    return draggableTabs[0].key;
-  };
-
-  const {tabListState} = useContext(TabsContext);
-
-  // TODO: Try to remove this state if possible
-  const [tempTab, setTempTab] = useState<Tab | undefined>(
-    getInitialTabKey() === TEMPORARY_TAB_KEY && query
-      ? {
-          id: TEMPORARY_TAB_KEY,
-          key: TEMPORARY_TAB_KEY,
-          label: t('Unsaved'),
-          query: query,
-          querySort: sort ?? IssueSortOptions.DATE,
-          isCommitted: true,
-        }
-      : undefined
-  );
-
-  const {mutate: updateViews} = useUpdateGroupSearchViews();
-
-  const debounceUpdateViews = useMemo(
-    () =>
-      debounce((newTabs: Tab[]) => {
-        if (newTabs) {
-          updateViews({
-            orgSlug: organization.slug,
-            groupSearchViews: newTabs
-              .filter(tab => tab.isCommitted)
-              .map(tab => ({
-                // Do not send over an ID if it's a temporary or default tab so that
-                // the backend will save these and generate permanent Ids for them
-                ...(tab.id[0] !== '_' && !tab.id.startsWith('default')
-                  ? {id: tab.id}
-                  : {}),
-                name: tab.label,
-                query: tab.query,
-                querySort: tab.querySort,
-              })),
-          });
-        }
-      }, 500),
-    [organization.slug, updateViews]
-  );
-
   // This insane useEffect ensures that the correct tab is selected when the url updates
   useEffect(() => {
     // If no query, sort, or viewId is present, set the first tab as the selected tab, update query accordingly
@@ -246,19 +202,19 @@ function CustomViewsIssueListHeaderTabsContent({
           ...location,
           query: {
             ...queryParamsWithPageFilters,
-            query: draggableTabs[0].query,
-            sort: draggableTabs[0].querySort,
-            viewId: draggableTabs[0].id,
+            query: views[0]!.query,
+            sort: views[0]!.querySort,
+            viewId: views[0]!.id,
           },
         }),
         {replace: true}
       );
-      tabListState?.setSelectedKey(draggableTabs[0].key);
+      tabListState?.setSelectedKey(views[0]!.key);
       return;
     }
     // if a viewId is present, check if it exists in the existing views.
     if (viewId) {
-      const selectedTab = draggableTabs.find(tab => tab.id === viewId);
+      const selectedTab = views.find(tab => tab.id === viewId);
       if (selectedTab) {
         const issueSortOption = Object.values(IssueSortOptions).includes(sort)
           ? sort
@@ -275,30 +231,14 @@ function CustomViewsIssueListHeaderTabsContent({
         ) {
           // If there were no unsaved changes before, or the existing unsaved changes
           // don't match the new query and/or sort, update the unsaved changes
-          setDraggableTabs(
-            draggableTabs.map(tab =>
-              tab.key === selectedTab.key
-                ? {
-                    ...tab,
-                    unsavedChanges: newUnsavedChanges,
-                  }
-                : tab
-            )
-          );
+          dispatch({
+            type: 'UPDATE_UNSAVED_CHANGES',
+            unsavedChanges: newUnsavedChanges,
+          });
         } else if (!newUnsavedChanges && selectedTab.unsavedChanges) {
           // If there are no longer unsaved changes but there were before, remove them
-          setDraggableTabs(
-            draggableTabs.map(tab =>
-              tab.key === selectedTab.key
-                ? {
-                    ...tab,
-                    unsavedChanges: undefined,
-                  }
-                : tab
-            )
-          );
+          dispatch({type: 'UPDATE_UNSAVED_CHANGES', unsavedChanges: undefined});
         }
-
         if (!tabListState?.selectionManager.isSelected(selectedTab.key)) {
           navigate(
             normalizeUrl({
@@ -336,15 +276,7 @@ function CustomViewsIssueListHeaderTabsContent({
     }
     if (query) {
       if (!tabListState?.selectionManager.isSelected(TEMPORARY_TAB_KEY)) {
-        tabListState?.setSelectedKey(TEMPORARY_TAB_KEY);
-        setTempTab({
-          id: TEMPORARY_TAB_KEY,
-          key: TEMPORARY_TAB_KEY,
-          label: t('Unsaved'),
-          query: query,
-          querySort: sort ?? IssueSortOptions.DATE,
-          isCommitted: true,
-        });
+        dispatch({type: 'SET_TEMP_VIEW', query, sort});
         navigate(
           normalizeUrl({
             ...location,
@@ -355,6 +287,7 @@ function CustomViewsIssueListHeaderTabsContent({
           }),
           {replace: true}
         );
+        tabListState?.setSelectedKey(TEMPORARY_TAB_KEY);
         return;
       }
     }
@@ -367,69 +300,15 @@ function CustomViewsIssueListHeaderTabsContent({
     tabListState,
     location,
     queryParamsWithPageFilters,
-    draggableTabs,
+    views,
     organization,
+    dispatch,
   ]);
 
-  // Update local tabs when new views are received from mutation request
-  useEffectAfterFirstRender(() => {
-    const newlyCreatedViews = views.filter(
-      view => !draggableTabs.find(tab => tab.id === view.id)
-    );
-    const currentView = draggableTabs.find(tab => tab.id === viewId);
-
-    setDraggableTabs(oldDraggableTabs => {
-      const assignedIds = new Set();
-      return oldDraggableTabs.map(tab => {
-        // Temp viewIds are prefixed with '_'
-        if (tab.id && tab.id[0] === '_') {
-          const matchingView = newlyCreatedViews.find(
-            view =>
-              view.id &&
-              !assignedIds.has(view.id) &&
-              tab.query === view.query &&
-              tab.querySort === view.querySort &&
-              tab.label === view.name
-          );
-          if (matchingView?.id) {
-            assignedIds.add(matchingView.id);
-            return {
-              ...tab,
-              id: matchingView.id,
-            };
-          }
-        }
-        return tab;
-      });
-    });
-
-    if (viewId?.startsWith('_') && currentView) {
-      const matchingView = newlyCreatedViews.find(
-        view =>
-          view.id &&
-          currentView.query === view.query &&
-          currentView.querySort === view.querySort &&
-          currentView.label === view.name
-      );
-      if (matchingView?.id) {
-        navigate(
-          normalizeUrl({
-            ...location,
-            query: {
-              ...queryParamsWithPageFilters,
-              viewId: matchingView.id,
-            },
-          }),
-          {replace: true}
-        );
-      }
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [views]);
-
+  // This useEffect ensures the "new view" page is displayed/hidden correctly
   useEffect(() => {
     if (viewId?.startsWith('_')) {
-      if (draggableTabs.find(tab => tab.id === viewId)?.isCommitted) {
+      if (views.find(tab => tab.id === viewId)?.isCommitted) {
         return;
       }
       // If the user types in query manually while the new view flow is showing,
@@ -437,17 +316,12 @@ function CustomViewsIssueListHeaderTabsContent({
       // and persist the query
       if (newViewActive && query !== '') {
         setNewViewActive(false);
-        const updatedTabs: Tab[] = draggableTabs.map(tab =>
-          tab.id === viewId
-            ? {
-                ...tab,
-                unsavedChanges: [query, sort ?? IssueSortOptions.DATE],
-                isCommitted: true,
-              }
-            : tab
-        );
-        setDraggableTabs(updatedTabs);
-        debounceUpdateViews(updatedTabs);
+        dispatch({
+          type: 'UPDATE_UNSAVED_CHANGES',
+          unsavedChanges: [query, sort ?? IssueSortOptions.DATE],
+          isCommitted: true,
+          syncViews: true,
+        });
         trackAnalytics('issue_views.add_view.custom_query_saved', {
           organization,
           query,
@@ -461,29 +335,92 @@ function CustomViewsIssueListHeaderTabsContent({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [viewId, query]);
 
+  useHotkeys(
+    [
+      {
+        match: ['command+s', 'ctrl+s'],
+        includeInputs: true,
+        callback: () => {
+          if (views.find(tab => tab.key === tabListState?.selectedKey)?.unsavedChanges) {
+            dispatch({type: 'SAVE_CHANGES', syncViews: true});
+            addSuccessMessage(t('Changes saved to view'));
+          }
+        },
+      },
+    ],
+    [dispatch, tabListState?.selectedKey, views]
+  );
+
+  const handleCreateNewView = () => {
+    const tempId = generateTempViewId();
+    dispatch({type: 'CREATE_NEW_VIEW', tempId});
+    tabListState?.setSelectedKey(tempId);
+    navigate({
+      ...location,
+      query: {
+        ...queryParams,
+        query: '',
+        viewId: tempId,
+      },
+    });
+  };
+
+  const allTabs = tempView ? [...views, tempView] : views;
+
+  const initialTabKey =
+    viewId && views.find(tab => tab.id === viewId)
+      ? views.find(tab => tab.id === viewId)!.key
+      : query
+        ? TEMPORARY_TAB_KEY
+        : views[0]!.key;
+
   return (
-    <DraggableTabBar
-      initialTabKey={getInitialTabKey()}
-      tabs={draggableTabs}
-      setTabs={setDraggableTabs}
-      tempTab={tempTab}
-      setTempTab={setTempTab}
-      orgSlug={organization.slug}
-      onReorder={debounceUpdateViews}
-      onAddView={debounceUpdateViews}
-      onDelete={debounceUpdateViews}
-      onDuplicate={debounceUpdateViews}
-      onTabRenamed={newTabs => debounceUpdateViews(newTabs)}
-      onSave={debounceUpdateViews}
-      onSaveTempView={debounceUpdateViews}
-      router={router}
-    />
+    <DraggableTabList
+      onReorder={(newOrder: Node<DraggableTabListItemProps>[]) =>
+        dispatch({
+          type: 'REORDER_TABS',
+          newKeyOrder: newOrder.map(node => node.key.toString()),
+        })
+      }
+      onReorderComplete={() => dispatch({type: 'SYNC_VIEWS_TO_BACKEND'})}
+      defaultSelectedKey={initialTabKey}
+      onAddView={handleCreateNewView}
+      orientation="horizontal"
+      editingTabKey={editingTabKey ?? undefined}
+      hideBorder
+    >
+      {allTabs.map(view => (
+        <DraggableTabList.Item
+          textValue={view.label}
+          key={view.key}
+          to={normalizeUrl({
+            query: {
+              ...queryParams,
+              query: view.unsavedChanges?.[0] ?? view.query,
+              sort: view.unsavedChanges?.[1] ?? view.querySort,
+              viewId: view.id !== TEMPORARY_TAB_KEY ? view.id : undefined,
+            },
+            pathname: `/organizations/${organization.slug}/issues/`,
+          })}
+          disabled={view.key === editingTabKey}
+        >
+          <IssueViewTab
+            key={view.key}
+            view={view}
+            initialTabKey={initialTabKey}
+            router={router}
+            editingTabKey={editingTabKey}
+            setEditingTabKey={setEditingTabKey}
+          />
+        </DraggableTabList.Item>
+      ))}
+    </DraggableTabList>
   );
 }
 
-export default CustomViewsIssueListHeader;
+export default IssueViewsIssueListHeader;
 
-const StyledTabs = styled(Tabs)`
+const StyledIssueViews = styled(IssueViews)`
   grid-column: 1 / -1;
 `;
 
diff --git a/static/app/views/issueList/overview.actions.spec.tsx b/static/app/views/issueList/overview.actions.spec.tsx
index 9c19a65aaac5fc..01d93a8e33f591 100644
--- a/static/app/views/issueList/overview.actions.spec.tsx
+++ b/static/app/views/issueList/overview.actions.spec.tsx
@@ -153,7 +153,7 @@ describe('IssueListOverview (actions)', function () {
       const groups = await screen.findAllByTestId('group');
 
       await userEvent.click(
-        within(groups[0]).getByRole('checkbox', {name: /select issue/i})
+        within(groups[0]!).getByRole('checkbox', {name: /select issue/i})
       );
 
       expect(screen.getByText('Group 1')).toBeInTheDocument();
@@ -197,7 +197,7 @@ describe('IssueListOverview (actions)', function () {
       const groups = await screen.findAllByTestId('group');
 
       await userEvent.click(
-        within(groups[0]).getByRole('checkbox', {name: /select issue/i})
+        within(groups[0]!).getByRole('checkbox', {name: /select issue/i})
       );
 
       expect(screen.getByText('Group 1')).toBeInTheDocument();
@@ -292,7 +292,7 @@ describe('IssueListOverview (actions)', function () {
       const groups = await screen.findAllByTestId('group');
 
       await userEvent.click(
-        within(groups[0]).getByRole('checkbox', {name: /select issue/i})
+        within(groups[0]!).getByRole('checkbox', {name: /select issue/i})
       );
 
       expect(screen.getByText('Group 1')).toBeInTheDocument();
@@ -354,7 +354,7 @@ describe('IssueListOverview (actions)', function () {
       const groups = await screen.findAllByTestId('group');
 
       await userEvent.click(
-        within(groups[0]).getByRole('checkbox', {name: /select issue/i})
+        within(groups[0]!).getByRole('checkbox', {name: /select issue/i})
       );
 
       expect(screen.getByText('Medium priority issue')).toBeInTheDocument();
@@ -443,7 +443,7 @@ describe('IssueListOverview (actions)', function () {
       const groups = await screen.findAllByTestId('group');
 
       await userEvent.click(
-        within(groups[0]).getByRole('checkbox', {name: /select issue/i})
+        within(groups[0]!).getByRole('checkbox', {name: /select issue/i})
       );
 
       expect(screen.getByText('Medium priority issue')).toBeInTheDocument();
diff --git a/static/app/views/issueList/overview.polling.spec.tsx b/static/app/views/issueList/overview.polling.spec.tsx
index 13f586775756c9..233ff54103b533 100644
--- a/static/app/views/issueList/overview.polling.spec.tsx
+++ b/static/app/views/issueList/overview.polling.spec.tsx
@@ -75,7 +75,7 @@ describe('IssueList -> Polling', function () {
 
     // The tests fail because we have a "component update was not wrapped in act" error.
     // It should be safe to ignore this error, but we should remove the mock once we move to react testing library
-    // eslint-disable-next-line no-console
+
     jest.spyOn(console, 'error').mockImplementation(jest.fn());
 
     MockApiClient.clearMockResponses();
diff --git a/static/app/views/issueList/overview.spec.tsx b/static/app/views/issueList/overview.spec.tsx
index 15dab03ff4bce0..03a5d6f76aa98a 100644
--- a/static/app/views/issueList/overview.spec.tsx
+++ b/static/app/views/issueList/overview.spec.tsx
@@ -5,6 +5,7 @@ import {LocationFixture} from 'sentry-fixture/locationFixture';
 import {MemberFixture} from 'sentry-fixture/member';
 import {OrganizationFixture} from 'sentry-fixture/organization';
 import {ProjectFixture} from 'sentry-fixture/project';
+import {RouterFixture} from 'sentry-fixture/routerFixture';
 import {SearchFixture} from 'sentry-fixture/search';
 import {TagsFixture} from 'sentry-fixture/tags';
 
@@ -24,7 +25,6 @@ import {DEFAULT_QUERY} from 'sentry/constants';
 import ProjectsStore from 'sentry/stores/projectsStore';
 import TagStore from 'sentry/stores/tagStore';
 import {SavedSearchVisibility} from 'sentry/types/group';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import localStorageWrapper from 'sentry/utils/localStorage';
 import * as parseLinkHeader from 'sentry/utils/parseLinkHeader';
 import IssueListWithStores, {IssueListOverview} from 'sentry/views/issueList/overview';
@@ -91,7 +91,7 @@ describe('IssueList', function () {
   beforeEach(function () {
     // The tests fail because we have a "component update was not wrapped in act" error.
     // It should be safe to ignore this error, but we should remove the mock once we move to react testing library
-    // eslint-disable-next-line no-console
+
     jest.spyOn(console, 'error').mockImplementation(jest.fn());
     Object.defineProperty(Element.prototype, 'clientWidth', {value: 1000});
 
@@ -163,7 +163,7 @@ describe('IssueList', function () {
       savedSearches: [savedSearch],
       useOrgSavedSearches: true,
       selection: {
-        projects: [parseInt(projects[0].id, 10)],
+        projects: [parseInt(projects[0]!.id, 10)],
         environments: [],
         datetime: {period: '14d'},
       },
@@ -214,7 +214,7 @@ describe('IssueList', function () {
       render(<IssueListWithStores {...routerProps} />, {router});
 
       // Loading saved searches
-      await waitForElementToBeRemoved(() => screen.getByTestId('loading-indicator'));
+      await waitForElementToBeRemoved(() => screen.queryByTestId('loading-indicator'));
       expect(savedSearchesRequest).toHaveBeenCalledTimes(1);
 
       await screen.findByRole('grid', {name: 'Create a search query'});
@@ -481,12 +481,12 @@ describe('IssueList', function () {
         router,
       });
 
-      await waitForElementToBeRemoved(() => screen.getByTestId('loading-indicator'));
+      await waitForElementToBeRemoved(() => screen.queryByTestId('loading-indicator'));
 
       await userEvent.click(screen.getByRole('button', {name: /custom search/i}));
       await userEvent.click(screen.getByRole('button', {name: localSavedSearch.name}));
 
-      expect(browserHistory.push).toHaveBeenLastCalledWith(
+      expect(router.push).toHaveBeenLastCalledWith(
         expect.objectContaining({
           pathname: '/organizations/org-slug/issues/searches/789/',
         })
@@ -512,14 +512,14 @@ describe('IssueList', function () {
         router,
       });
 
-      await waitForElementToBeRemoved(() => screen.getByTestId('loading-indicator'));
+      await waitForElementToBeRemoved(() => screen.queryByTestId('loading-indicator'));
 
       await screen.findByRole('grid', {name: 'Create a search query'});
       await userEvent.click(screen.getByRole('button', {name: 'Clear search query'}));
       await userEvent.click(getSearchInput());
       await userEvent.keyboard('dogs{Enter}');
 
-      expect(browserHistory.push).toHaveBeenLastCalledWith(
+      expect(router.push).toHaveBeenLastCalledWith(
         expect.objectContaining({
           pathname: '/organizations/org-slug/issues/',
           query: {
@@ -552,7 +552,7 @@ describe('IssueList', function () {
         router,
       });
 
-      await waitForElementToBeRemoved(() => screen.getByTestId('loading-indicator'));
+      await waitForElementToBeRemoved(() => screen.queryByTestId('loading-indicator'));
 
       await screen.findByRole('grid', {name: 'Create a search query'});
       await userEvent.click(screen.getByRole('button', {name: 'Clear search query'}));
@@ -560,7 +560,7 @@ describe('IssueList', function () {
       await userEvent.paste('assigned:me level:fatal');
       await userEvent.keyboard('{Enter}');
 
-      expect(browserHistory.push as jest.Mock).toHaveBeenCalledWith(
+      expect(router.push).toHaveBeenCalledWith(
         expect.objectContaining({
           query: expect.objectContaining({
             query: 'assigned:me level:fatal',
@@ -590,16 +590,16 @@ describe('IssueList', function () {
 
       await waitFor(() => {
         expect(createPin).toHaveBeenCalled();
-        expect(browserHistory.replace).toHaveBeenLastCalledWith(
-          expect.objectContaining({
-            pathname: '/organizations/org-slug/issues/searches/666/',
-            query: {
-              referrer: 'search-bar',
-            },
-            search: '',
-          })
-        );
       });
+      expect(router.replace).toHaveBeenLastCalledWith(
+        expect.objectContaining({
+          pathname: '/organizations/org-slug/issues/searches/666/',
+          query: {
+            referrer: 'search-bar',
+          },
+          search: '',
+        })
+      );
     });
 
     it('unpins a custom query', async function () {
@@ -620,15 +620,15 @@ describe('IssueList', function () {
         method: 'DELETE',
       });
 
-      const routerWithSavedSearch = {
+      const routerWithSavedSearch = RouterFixture({
         params: {searchId: pinnedSearch.id},
-      };
+      });
 
       render(<IssueListWithStores {...merge({}, routerProps, routerWithSavedSearch)} />, {
         router: routerWithSavedSearch,
       });
 
-      await waitForElementToBeRemoved(() => screen.getByTestId('loading-indicator'));
+      await waitForElementToBeRemoved(() => screen.queryByTestId('loading-indicator'));
 
       expect(screen.getByRole('button', {name: 'My Default Search'})).toBeInTheDocument();
 
@@ -639,7 +639,7 @@ describe('IssueList', function () {
       });
 
       await waitFor(() => {
-        expect(browserHistory.replace).toHaveBeenLastCalledWith(
+        expect(routerWithSavedSearch.replace).toHaveBeenLastCalledWith(
           expect.objectContaining({
             pathname: '/organizations/org-slug/issues/',
           })
@@ -671,13 +671,13 @@ describe('IssueList', function () {
           isPinned: true,
         },
       });
-      const routerWithSavedSearch = {params: {searchId: '789'}};
+      const routerWithSavedSearch = RouterFixture({params: {searchId: '789'}});
 
       render(<IssueListWithStores {...merge({}, routerProps, routerWithSavedSearch)} />, {
         router: routerWithSavedSearch,
       });
 
-      await waitForElementToBeRemoved(() => screen.getByTestId('loading-indicator'));
+      await waitForElementToBeRemoved(() => screen.queryByTestId('loading-indicator'));
 
       expect(screen.getByRole('button', {name: savedSearch.name})).toBeInTheDocument();
 
@@ -685,12 +685,12 @@ describe('IssueList', function () {
 
       await waitFor(() => {
         expect(createPin).toHaveBeenCalled();
-        expect(browserHistory.replace).toHaveBeenLastCalledWith(
-          expect.objectContaining({
-            pathname: '/organizations/org-slug/issues/searches/789/',
-          })
-        );
       });
+      expect(routerWithSavedSearch.replace).toHaveBeenLastCalledWith(
+        expect.objectContaining({
+          pathname: '/organizations/org-slug/issues/searches/789/',
+        })
+      );
     });
 
     it('pinning search should keep project selected', async function () {
@@ -728,7 +728,7 @@ describe('IssueList', function () {
         {router: newRouter}
       );
 
-      await waitForElementToBeRemoved(() => screen.getByTestId('loading-indicator'));
+      await waitForElementToBeRemoved(() => screen.queryByTestId('loading-indicator'));
 
       const createPin = MockApiClient.addMockResponse({
         url: '/organizations/org-slug/pinned-searches/',
@@ -747,18 +747,18 @@ describe('IssueList', function () {
 
       await waitFor(() => {
         expect(createPin).toHaveBeenCalled();
-        expect(browserHistory.replace).toHaveBeenLastCalledWith(
-          expect.objectContaining({
-            pathname: '/organizations/org-slug/issues/searches/666/',
-            query: expect.objectContaining({
-              project: ['123'],
-              environment: ['prod'],
-              query: 'assigned:me level:fatal',
-              referrer: 'search-bar',
-            }),
-          })
-        );
       });
+      expect(newRouter.replace).toHaveBeenLastCalledWith(
+        expect.objectContaining({
+          pathname: '/organizations/org-slug/issues/searches/666/',
+          query: expect.objectContaining({
+            project: ['123'],
+            environment: ['prod'],
+            query: 'assigned:me level:fatal',
+            referrer: 'search-bar',
+          }),
+        })
+      );
     });
 
     it('unpinning search should keep project selected', async function () {
@@ -810,24 +810,24 @@ describe('IssueList', function () {
         {router: newRouter}
       );
 
-      await waitForElementToBeRemoved(() => screen.getByTestId('loading-indicator'));
+      await waitForElementToBeRemoved(() => screen.queryByTestId('loading-indicator'));
 
       await userEvent.click(screen.getByLabelText(/Remove Default/i));
 
       await waitFor(() => {
         expect(deletePin).toHaveBeenCalled();
-        expect(browserHistory.replace).toHaveBeenLastCalledWith(
-          expect.objectContaining({
-            pathname: '/organizations/org-slug/issues/',
-            query: expect.objectContaining({
-              project: ['123'],
-              environment: ['prod'],
-              query: 'assigned:me level:fatal',
-              referrer: 'search-bar',
-            }),
-          })
-        );
       });
+      expect(newRouter.replace).toHaveBeenLastCalledWith(
+        expect.objectContaining({
+          pathname: '/organizations/org-slug/issues/',
+          query: expect.objectContaining({
+            project: ['123'],
+            environment: ['prod'],
+            query: 'assigned:me level:fatal',
+            referrer: 'search-bar',
+          }),
+        })
+      );
     });
 
     it('does not allow pagination to "previous" while on first page and resets cursors when navigating back to initial page', async function () {
@@ -835,7 +835,7 @@ describe('IssueList', function () {
         router,
       });
 
-      await waitForElementToBeRemoved(() => screen.getByTestId('loading-indicator'));
+      await waitForElementToBeRemoved(() => screen.queryByTestId('loading-indicator'));
 
       expect(screen.getByRole('button', {name: 'Previous'})).toBeDisabled();
 
@@ -863,7 +863,7 @@ describe('IssueList', function () {
       };
 
       await waitFor(() => {
-        expect(browserHistory.push).toHaveBeenLastCalledWith(pushArgs);
+        expect(router.push).toHaveBeenLastCalledWith(pushArgs);
       });
 
       rerender(<IssueListWithStores {...merge({}, routerProps, {location: pushArgs})} />);
@@ -887,7 +887,7 @@ describe('IssueList', function () {
       };
 
       await waitFor(() => {
-        expect(browserHistory.push).toHaveBeenLastCalledWith(pushArgs);
+        expect(router.push).toHaveBeenLastCalledWith(pushArgs);
       });
 
       rerender(<IssueListWithStores {...merge({}, routerProps, {location: pushArgs})} />);
@@ -909,7 +909,7 @@ describe('IssueList', function () {
       };
 
       await waitFor(() => {
-        expect(browserHistory.push).toHaveBeenLastCalledWith(pushArgs);
+        expect(router.push).toHaveBeenLastCalledWith(pushArgs);
       });
 
       rerender(<IssueListWithStores {...merge({}, routerProps, {location: pushArgs})} />);
@@ -919,7 +919,7 @@ describe('IssueList', function () {
 
       await waitFor(() => {
         // cursor is undefined because "prev" cursor is === initial "next" cursor
-        expect(browserHistory.push).toHaveBeenLastCalledWith({
+        expect(router.push).toHaveBeenLastCalledWith({
           pathname: '/organizations/org-slug/issues/',
           query: {
             cursor: undefined,
@@ -955,7 +955,7 @@ describe('IssueList', function () {
       await userEvent.keyboard('{enter}');
 
       await waitFor(() => {
-        expect(browserHistory.push).toHaveBeenCalledWith({
+        expect(router.push).toHaveBeenCalledWith({
           pathname: '/organizations/org-slug/issues/',
           query: {
             environment: [],
@@ -1159,7 +1159,7 @@ describe('IssueList', function () {
       };
       render(<IssueListOverview {...defaultProps} />, {router});
 
-      await waitForElementToBeRemoved(() => screen.getByTestId('loading-indicator'));
+      await waitForElementToBeRemoved(() => screen.queryByTestId('loading-indicator'));
     };
 
     it('displays when no projects selected and all projects user is member of, async does not have first event', async function () {
diff --git a/static/app/views/issueList/overview.tsx b/static/app/views/issueList/overview.tsx
index 9f62760711b2f2..ca2ee0ed32c7e0 100644
--- a/static/app/views/issueList/overview.tsx
+++ b/static/app/views/issueList/overview.tsx
@@ -47,9 +47,9 @@ import withApi from 'sentry/utils/withApi';
 import withOrganization from 'sentry/utils/withOrganization';
 import withPageFilters from 'sentry/utils/withPageFilters';
 import withSavedSearches from 'sentry/utils/withSavedSearches';
-import CustomViewsIssueListHeader from 'sentry/views/issueList/customViewsHeader';
 import IssueListTable from 'sentry/views/issueList/issueListTable';
 import {IssuesDataConsentBanner} from 'sentry/views/issueList/issuesDataConsentBanner';
+import IssueViewsIssueListHeader from 'sentry/views/issueList/issueViewsHeader';
 import SavedIssueSearches from 'sentry/views/issueList/savedIssueSearches';
 import type {IssueUpdateData} from 'sentry/views/issueList/types';
 import {NewTabContextProvider} from 'sentry/views/issueList/utils/newTabContext';
@@ -163,7 +163,7 @@ class IssueListOverview extends Component<Props, State> {
   componentDidMount() {
     this._performanceObserver = makeIssuesINPObserver();
     this._poller = new CursorPoller({
-      linkPreviousHref: parseLinkHeader(this.state.pageLinks)?.previous?.href,
+      linkPreviousHref: parseLinkHeader(this.state.pageLinks)?.previous!?.href,
       success: this.onRealtimePoll,
     });
 
@@ -735,7 +735,7 @@ class IssueListOverview extends Component<Props, State> {
 
     // Only resume polling if we're on the first page of results
     const links = parseLinkHeader(this.state.pageLinks);
-    if (links && !links.previous.results && this.state.realtimeActive) {
+    if (links && !links.previous!.results && this.state.realtimeActive) {
       this._poller.setEndpoint(links?.previous?.href);
       this._poller.enable();
     }
@@ -883,7 +883,7 @@ class IssueListOverview extends Component<Props, State> {
     }
 
     const links = parseLinkHeader(this.state.pageLinks);
-    return links && !links.previous.results && !links.next.results;
+    return links && !links.previous!.results && !links.next!.results;
   }
 
   transitionTo = (
@@ -1121,7 +1121,7 @@ class IssueListOverview extends Component<Props, State> {
       // If we run out of issues on the last page, navigate back a page to
       // avoid showing an empty state - if not on the last page, just show a spinner
       const shouldGoBackAPage = links?.previous?.results && !links?.next?.results;
-      this.transitionTo({cursor: shouldGoBackAPage ? links.previous.cursor : undefined});
+      this.transitionTo({cursor: shouldGoBackAPage ? links.previous!.cursor : undefined});
       this.fetchCounts(queryCount, true);
     } else {
       this.fetchData(true);
@@ -1191,7 +1191,7 @@ class IssueListOverview extends Component<Props, State> {
         <Layout.Page>
           {organization.features.includes('issue-stream-custom-views') ? (
             <ErrorBoundary message={'Failed to load custom tabs'} mini>
-              <CustomViewsIssueListHeader
+              <IssueViewsIssueListHeader
                 organization={organization}
                 router={router}
                 selectedProjectIds={selection.projects}
diff --git a/static/app/views/issueList/savedIssueSearches.spec.tsx b/static/app/views/issueList/savedIssueSearches.spec.tsx
index a5992abc203ef8..e36abb9d2a967e 100644
--- a/static/app/views/issueList/savedIssueSearches.spec.tsx
+++ b/static/app/views/issueList/savedIssueSearches.spec.tsx
@@ -173,8 +173,8 @@ describe('SavedIssueSearches', function () {
 
     await waitFor(() => {
       expect(deleteMock).toHaveBeenCalledTimes(1);
-      expect(screen.queryByText(orgSearch.name)).not.toBeInTheDocument();
     });
+    expect(screen.queryByText(orgSearch.name)).not.toBeInTheDocument();
   });
 
   it('can edit an org saved search with correct permissions', async function () {
@@ -219,8 +219,8 @@ describe('SavedIssueSearches', function () {
           }),
         })
       );
-      expect(screen.getByText('new name')).toBeInTheDocument();
     });
+    expect(screen.getByText('new name')).toBeInTheDocument();
   });
 
   it('cannot delete or edit a saved search without correct permissions', async function () {
diff --git a/static/app/views/issueList/searchBar.tsx b/static/app/views/issueList/searchBar.tsx
index cc12fb7a42d68f..c1cd9ad82a3da3 100644
--- a/static/app/views/issueList/searchBar.tsx
+++ b/static/app/views/issueList/searchBar.tsx
@@ -1,7 +1,6 @@
 import {useCallback, useMemo} from 'react';
 import orderBy from 'lodash/orderBy';
 
-// eslint-disable-next-line no-restricted-imports
 import {fetchTagValues} from 'sentry/actionCreators/tags';
 import {
   SearchQueryBuilder,
diff --git a/static/app/views/issueList/utils/useFetchIssueTags.tsx b/static/app/views/issueList/utils/useFetchIssueTags.tsx
index 1c9bc1d85ad868..37900729ce844f 100644
--- a/static/app/views/issueList/utils/useFetchIssueTags.tsx
+++ b/static/app/views/issueList/utils/useFetchIssueTags.tsx
@@ -1,8 +1,11 @@
 import {useMemo} from 'react';
 
 import {useFetchOrganizationTags} from 'sentry/actionCreators/tags';
-import {ItemType, type SearchGroup} from 'sentry/components/smartSearchBar/types';
-import {escapeTagValue} from 'sentry/components/smartSearchBar/utils';
+import {
+  ItemType,
+  type SearchGroup,
+} from 'sentry/components/deprecatedSmartSearchBar/types';
+import {escapeTagValue} from 'sentry/components/deprecatedSmartSearchBar/utils';
 import {IconStar, IconUser} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import MemberListStore from 'sentry/stores/memberListStore';
@@ -159,8 +162,8 @@ export const useFetchIssueTags = ({
 
     issuePlatformTags.forEach(tag => {
       if (allTagsCollection[tag.key]) {
-        allTagsCollection[tag.key].totalValues =
-          (allTagsCollection[tag.key].totalValues ?? 0) + (tag.totalValues ?? 0);
+        allTagsCollection[tag.key]!.totalValues =
+          (allTagsCollection[tag.key]!.totalValues ?? 0) + (tag.totalValues ?? 0);
       } else {
         allTagsCollection[tag.key] = {...tag, kind: FieldKind.TAG};
       }
@@ -237,20 +240,20 @@ function builtInIssuesFields(
       predefined: true,
     },
     [FieldKey.ASSIGNED_OR_SUGGESTED]: {
-      ...PREDEFINED_FIELDS[FieldKey.ASSIGNED_OR_SUGGESTED],
+      ...PREDEFINED_FIELDS[FieldKey.ASSIGNED_OR_SUGGESTED]!,
       name: 'Assigned or Suggested',
       isInput: true,
       values: assigneeFieldValues,
       predefined: true,
     },
     [FieldKey.BOOKMARKS]: {
-      ...PREDEFINED_FIELDS[FieldKey.BOOKMARKS],
+      ...PREDEFINED_FIELDS[FieldKey.BOOKMARKS]!,
       name: 'Bookmarked By',
       values: bookmarksValues,
       predefined: true,
     },
     [FieldKey.ISSUE_CATEGORY]: {
-      ...PREDEFINED_FIELDS[FieldKey.ISSUE_CATEGORY],
+      ...PREDEFINED_FIELDS[FieldKey.ISSUE_CATEGORY]!,
       name: 'Issue Category',
       values: [
         IssueCategory.ERROR,
@@ -262,7 +265,7 @@ function builtInIssuesFields(
       predefined: true,
     },
     [FieldKey.ISSUE_TYPE]: {
-      ...PREDEFINED_FIELDS[FieldKey.ISSUE_TYPE],
+      ...PREDEFINED_FIELDS[FieldKey.ISSUE_TYPE]!,
       name: 'Issue Type',
       values: [
         IssueType.PERFORMANCE_N_PLUS_ONE_DB_QUERIES,
@@ -289,31 +292,31 @@ function builtInIssuesFields(
       predefined: true,
     },
     [FieldKey.LAST_SEEN]: {
-      ...PREDEFINED_FIELDS[FieldKey.LAST_SEEN],
+      ...PREDEFINED_FIELDS[FieldKey.LAST_SEEN]!,
       name: 'Last Seen',
       values: [],
       predefined: false,
     },
     [FieldKey.FIRST_SEEN]: {
-      ...PREDEFINED_FIELDS[FieldKey.FIRST_SEEN],
+      ...PREDEFINED_FIELDS[FieldKey.FIRST_SEEN]!,
       name: 'First Seen',
       values: [],
       predefined: false,
     },
     [FieldKey.FIRST_RELEASE]: {
-      ...PREDEFINED_FIELDS[FieldKey.FIRST_RELEASE],
+      ...PREDEFINED_FIELDS[FieldKey.FIRST_RELEASE]!,
       name: 'First Release',
       values: ['latest'],
       predefined: true,
     },
     [FieldKey.EVENT_TIMESTAMP]: {
-      ...PREDEFINED_FIELDS[FieldKey.EVENT_TIMESTAMP],
+      ...PREDEFINED_FIELDS[FieldKey.EVENT_TIMESTAMP]!,
       name: 'Event Timestamp',
       values: [],
       predefined: true,
     },
     [FieldKey.TIMES_SEEN]: {
-      ...PREDEFINED_FIELDS[FieldKey.TIMES_SEEN],
+      ...PREDEFINED_FIELDS[FieldKey.TIMES_SEEN]!,
       name: 'Times Seen',
       isInput: true,
       // Below values are required or else SearchBar will attempt to get values
@@ -322,7 +325,7 @@ function builtInIssuesFields(
       predefined: true,
     },
     [FieldKey.ISSUE_PRIORITY]: {
-      ...PREDEFINED_FIELDS[FieldKey.ISSUE_PRIORITY],
+      ...PREDEFINED_FIELDS[FieldKey.ISSUE_PRIORITY]!,
       name: 'Issue Priority',
       values: [PriorityLevel.HIGH, PriorityLevel.MEDIUM, PriorityLevel.LOW],
       predefined: true,
diff --git a/static/app/views/metrics/codeLocations.tsx b/static/app/views/metrics/codeLocations.tsx
index feca04e82477b0..219272bbea6126 100644
--- a/static/app/views/metrics/codeLocations.tsx
+++ b/static/app/views/metrics/codeLocations.tsx
@@ -58,7 +58,7 @@ export function CodeLocations({mri, ...rangeOpts}: CodeLocationsProps) {
     );
   }
 
-  const codeLocations = data[0].frames ?? [];
+  const codeLocations = data[0]!.frames ?? [];
 
   // We only want to show the first 5 code locations
   const codeLocationsToShow = codeLocations.slice(0, 5);
diff --git a/static/app/views/metrics/context.tsx b/static/app/views/metrics/context.tsx
index 1ba7851e27947d..5d1348409673ad 100644
--- a/static/app/views/metrics/context.tsx
+++ b/static/app/views/metrics/context.tsx
@@ -158,7 +158,7 @@ export function useMetricWidgets(defaultQuery: Record<string, any> | null) {
     (index: number, data: Partial<Omit<MetricsWidget, 'type'>>) => {
       setWidgets(currentWidgets => {
         const newWidgets = [...currentWidgets];
-        const oldWidget = currentWidgets[index];
+        const oldWidget = currentWidgets[index]!;
 
         if (isMetricsQueryWidget(oldWidget)) {
           // Reset focused series if mri, query or groupBy changes
@@ -172,7 +172,7 @@ export function useMetricWidgets(defaultQuery: Record<string, any> | null) {
         }
 
         newWidgets[index] = {
-          ...currentWidgets[index],
+          ...currentWidgets[index]!,
           ...data,
         };
         return newWidgets;
@@ -185,7 +185,7 @@ export function useMetricWidgets(defaultQuery: Record<string, any> | null) {
     (index: number) => {
       setWidgets(currentWidgets => {
         const newWidgets = [...currentWidgets];
-        const newWidget = {...currentWidgets[index]};
+        const newWidget = {...currentWidgets[index]!};
         newWidget.id = NO_QUERY_ID;
         newWidgets.splice(index + 1, 0, newWidget);
         return newWidgets;
@@ -393,7 +393,7 @@ export function MetricsContextProvider({children}: {children: React.ReactNode})
           return currentWidgets.map(w => ({...w, focusedSeries: undefined}));
         });
       }
-      updateWidget(index, {isHidden: !widgets[index].isHidden});
+      updateWidget(index, {isHidden: !widgets[index]!.isHidden});
     },
     [isMultiChartMode, selectedWidgetIndex, setWidgets, updateWidget, widgets]
   );
@@ -421,7 +421,7 @@ export function MetricsContextProvider({children}: {children: React.ReactNode})
       showQuerySymbols: widgets.length > 1,
       highlightedSampleId,
       setHighlightedSampleId,
-      isMultiChartMode: isMultiChartMode,
+      isMultiChartMode,
       setIsMultiChartMode: handleSetIsMultiChartMode,
       metricsSamples,
       setMetricsSamples,
diff --git a/static/app/views/metrics/createAlertModal.tsx b/static/app/views/metrics/createAlertModal.tsx
index b642c87b2a760d..c8aecff0d12803 100644
--- a/static/app/views/metrics/createAlertModal.tsx
+++ b/static/app/views/metrics/createAlertModal.tsx
@@ -102,7 +102,7 @@ export function getAlertInterval(
   }
 
   for (let index = 0; index < TIME_WINDOWS_TO_CHECK.length; index++) {
-    const timeWindow = TIME_WINDOWS_TO_CHECK[index];
+    const timeWindow = TIME_WINDOWS_TO_CHECK[index]!;
     if (inMinutes <= timeWindow && AVAILABLE_TIME_PERIODS[timeWindow].includes(period)) {
       return toInterval(timeWindow);
     }
@@ -129,7 +129,7 @@ export function CreateAlertModal({
   const {selection} = usePageFilters();
   const [formState, setFormState] = useState<FormState>(() => {
     let project =
-      selection.projects.length === 1 ? selection.projects[0].toString() : null;
+      selection.projects.length === 1 ? selection.projects[0]!.toString() : null;
 
     if (isVirtualMetric(metricsQuery) && metricsQuery.condition) {
       const rule = getExtractionRule(metricsQuery.mri, metricsQuery.condition);
@@ -139,7 +139,7 @@ export function CreateAlertModal({
     }
 
     const environment =
-      selection.environments.length === 1 && project ? selection.environments[0] : null;
+      selection.environments.length === 1 && project ? selection.environments[0]! : null;
 
     return {
       project,
diff --git a/static/app/views/metrics/layout.spec.tsx b/static/app/views/metrics/layout.spec.tsx
index 3aa242c1afee00..7e2d4a8a8e8170 100644
--- a/static/app/views/metrics/layout.spec.tsx
+++ b/static/app/views/metrics/layout.spec.tsx
@@ -57,7 +57,7 @@ describe('Metrics Layout', function () {
     expect(screen.getByText(/we are ending the beta/i)).toBeInTheDocument();
 
     // Main View: Displays the empty state.
-    expect(screen.queryByText(/track and solve what matters/i)).toBeInTheDocument();
+    expect(screen.getByText(/track and solve what matters/i)).toBeInTheDocument();
 
     expect(
       screen.getByRole('button', {name: 'View Performance Metrics'})
@@ -81,7 +81,7 @@ describe('Metrics Layout', function () {
     expect(screen.getByRole('button', {name: 'Read Docs'})).toBeInTheDocument();
 
     expect(
-      screen.queryByRole('button', {name: 'Set Up Custom Metric'})
+      screen.getByRole('button', {name: 'Set Up Custom Metric'})
     ).toBeInTheDocument();
   });
 
diff --git a/static/app/views/metrics/metricFormulaContextMenu.tsx b/static/app/views/metrics/metricFormulaContextMenu.tsx
index 1621342b676e5e..fa067db0bb4188 100644
--- a/static/app/views/metrics/metricFormulaContextMenu.tsx
+++ b/static/app/views/metrics/metricFormulaContextMenu.tsx
@@ -122,7 +122,7 @@ function useCreateDashboardWidget(
   formulaWidget: MetricsEquationWidget,
   formulaDependencies: ReturnType<typeof useFormulaDependencies>
 ) {
-  const {dependencies, isError} = formulaDependencies[formulaWidget.id];
+  const {dependencies, isError} = formulaDependencies[formulaWidget.id]!;
 
   const widgetArray = useMemo(() => [formulaWidget], [formulaWidget]);
   const createDashboard = useCreateDashboard(widgetArray, formulaDependencies, false);
diff --git a/static/app/views/metrics/metricQueryContextMenu.tsx b/static/app/views/metrics/metricQueryContextMenu.tsx
index 1a1b7e83ce6f14..7e1b6f47592ae8 100644
--- a/static/app/views/metrics/metricQueryContextMenu.tsx
+++ b/static/app/views/metrics/metricQueryContextMenu.tsx
@@ -222,7 +222,7 @@ export function getCreateAlert(organization: Organization, metricsQuery: Metrics
     return undefined;
   }
   return function () {
-    openCreateAlertModal({metricsQuery: metricsQuery, organization});
+    openCreateAlertModal({metricsQuery, organization});
   };
 }
 
@@ -269,6 +269,8 @@ function useCreateDashboardWidget(
         selection,
         widget: convertToDashboardWidget([queryCopy], displayType),
         router,
+        // Previously undetected because the type relied on implicit any.
+        // @ts-expect-error
         widgetAsQueryParams,
         location: router.location,
         actions: ['add-and-open-dashboard', 'add-and-stay-on-current-page'],
diff --git a/static/app/views/metrics/pageHeaderActions.tsx b/static/app/views/metrics/pageHeaderActions.tsx
index 64e1ed0a21e8df..8bc1fe9bbb545d 100644
--- a/static/app/views/metrics/pageHeaderActions.tsx
+++ b/static/app/views/metrics/pageHeaderActions.tsx
@@ -162,8 +162,8 @@ export function PageHeaderActions({showAddMetricButton, addCustomMetric}: Props)
               <Button
                 size="sm"
                 icon={<IconSiren />}
-                disabled={!alertItems[0].onAction || !hasFeature}
-                onClick={alertItems[0].onAction}
+                disabled={!alertItems[0]!.onAction || !hasFeature}
+                onClick={alertItems[0]!.onAction}
               >
                 {t('Create Alert')}
               </Button>
diff --git a/static/app/views/metrics/scratchpad.tsx b/static/app/views/metrics/scratchpad.tsx
index 7e3e6224f79894..7b73c915d65348 100644
--- a/static/app/views/metrics/scratchpad.tsx
+++ b/static/app/views/metrics/scratchpad.tsx
@@ -166,9 +166,9 @@ export function MetricScratchpad() {
           index={0}
           getChartPalette={getChartPalette}
           onSelect={setSelectedWidgetIndex}
-          displayType={firstWidget.displayType}
-          focusedSeries={firstWidget.focusedSeries}
-          tableSort={firstWidget.sort}
+          displayType={firstWidget!.displayType}
+          focusedSeries={firstWidget!.focusedSeries}
+          tableSort={firstWidget!.sort}
           queries={filteredWidgets
             .filter(w => !(w.type === MetricExpressionType.EQUATION && w.isHidden))
             .map(w => widgetToQuery({widget: w, metricsNewInputs}))}
@@ -182,7 +182,7 @@ export function MetricScratchpad() {
           chartHeight={200}
           highlightedSampleId={highlightedSampleId}
           metricsSamples={metricsSamples}
-          overlays={firstWidget.overlays}
+          overlays={firstWidget!.overlays}
         />
       )}
     </Wrapper>
@@ -204,7 +204,7 @@ function MultiChartWidgetQueries({
     return [
       widgetToQuery({widget, metricsNewInputs}),
       ...(isMetricsEquationWidget(widget)
-        ? formulaDependencies[widget.id]?.dependencies?.map(dependency =>
+        ? formulaDependencies[widget.id]!?.dependencies?.map(dependency =>
             widgetToQuery({widget: dependency, isQueryOnly: true, metricsNewInputs})
           )
         : []),
diff --git a/static/app/views/metrics/useCreateDashboard.tsx b/static/app/views/metrics/useCreateDashboard.tsx
index f6ce39fe64adc6..d0ec1c0335f487 100644
--- a/static/app/views/metrics/useCreateDashboard.tsx
+++ b/static/app/views/metrics/useCreateDashboard.tsx
@@ -59,7 +59,7 @@ export function useCreateDashboard(
       const queryIdsInArray = new Set<number>();
       const widgetsWithDependencies = widgets.reduce<MetricsWidget[]>((acc, widget) => {
         if (isMetricsEquationWidget(widget)) {
-          const {dependencies, isError} = formulaDependencies[widget.id];
+          const {dependencies, isError} = formulaDependencies[widget.id]!;
           if (isError) {
             return acc;
           }
@@ -81,7 +81,7 @@ export function useCreateDashboard(
         queryIdsInArray.add(widget.id);
         return [...acc, widget];
       }, []);
-      return [convertWidget(widgetsWithDependencies, widgets[0].displayType)];
+      return [convertWidget(widgetsWithDependencies, widgets[0]!.displayType)];
     }
 
     return widgets
@@ -90,7 +90,7 @@ export function useCreateDashboard(
           return convertWidget([widget], widget.displayType);
         }
 
-        const {dependencies, isError} = formulaDependencies[widget.id];
+        const {dependencies, isError} = formulaDependencies[widget.id]!;
 
         if (isError) {
           return null;
diff --git a/static/app/views/metrics/utils/index.spec.tsx b/static/app/views/metrics/utils/index.spec.tsx
index 08c198ebb53387..9831a00852e671 100644
--- a/static/app/views/metrics/utils/index.spec.tsx
+++ b/static/app/views/metrics/utils/index.spec.tsx
@@ -20,7 +20,7 @@ describe('updateQueryWithSeriesFilter', () => {
       MetricSeriesFilterUpdateType.ADD
     );
 
-    expect(updatedQuery.query).toEqual('project:"1"');
+    expect(updatedQuery.query).toBe('project:"1"');
     expect(updatedQuery.groupBy).toEqual([]);
   });
 
@@ -38,7 +38,7 @@ describe('updateQueryWithSeriesFilter', () => {
       MetricSeriesFilterUpdateType.ADD
     );
 
-    expect(updatedQuery.query).toEqual(
+    expect(updatedQuery.query).toBe(
       '( release:latest AND ( environment:production OR environment:staging ) ) project:"1"'
     );
     expect(updatedQuery.groupBy).toEqual([]);
@@ -58,7 +58,7 @@ describe('updateQueryWithSeriesFilter', () => {
       MetricSeriesFilterUpdateType.EXCLUDE
     );
 
-    expect(updatedQuery.query).toEqual('!project:"1"');
+    expect(updatedQuery.query).toBe('!project:"1"');
     expect(updatedQuery.groupBy).toEqual([]);
   });
 
@@ -76,7 +76,7 @@ describe('updateQueryWithSeriesFilter', () => {
       MetricSeriesFilterUpdateType.EXCLUDE
     );
 
-    expect(updatedQuery.query).toEqual(
+    expect(updatedQuery.query).toBe(
       '( environment:prod1 OR environment:prod2 ) !project:"2"'
     );
     expect(updatedQuery.groupBy).toEqual([]);
@@ -96,7 +96,7 @@ describe('updateQueryWithSeriesFilter', () => {
       MetricSeriesFilterUpdateType.ADD
     );
 
-    expect(updatedQuery.query).toEqual('project:"1" release:"latest"');
+    expect(updatedQuery.query).toBe('project:"1" release:"latest"');
     expect(updatedQuery.groupBy).toEqual(['environment']);
   });
 
@@ -114,30 +114,30 @@ describe('updateQueryWithSeriesFilter', () => {
       MetricSeriesFilterUpdateType.ADD
     );
 
-    expect(updatedQuery.query).toEqual('project:""');
+    expect(updatedQuery.query).toBe('project:""');
     expect(updatedQuery.groupBy).toEqual([]);
   });
 });
 
 describe('ensureQuotedTextFilters', () => {
   it('returns a query with all text filters quoted', () => {
-    expect(ensureQuotedTextFilters('transaction:/{organization_slug}/')).toEqual(
+    expect(ensureQuotedTextFilters('transaction:/{organization_slug}/')).toBe(
       'transaction:"/{organization_slug}/"'
     );
 
     // transaction.duration defaults to a number filter
-    expect(ensureQuotedTextFilters('transaction.duration:100')).toEqual(
+    expect(ensureQuotedTextFilters('transaction.duration:100')).toBe(
       'transaction.duration:100'
     );
   });
 
   it('handles negated filters', () => {
-    expect(ensureQuotedTextFilters('!transaction:/{organization_slug}/')).toEqual(
+    expect(ensureQuotedTextFilters('!transaction:/{organization_slug}/')).toBe(
       '!transaction:"/{organization_slug}/"'
     );
 
     // transaction.duration defaults to a number filter
-    expect(ensureQuotedTextFilters('!transaction.duration:100')).toEqual(
+    expect(ensureQuotedTextFilters('!transaction.duration:100')).toBe(
       '!transaction.duration:100'
     );
   });
@@ -147,12 +147,12 @@ describe('ensureQuotedTextFilters', () => {
       ensureQuotedTextFilters('transaction:100', {
         numericKeys: new Set(['transaction']),
       })
-    ).toEqual('transaction:100');
+    ).toBe('transaction:100');
 
     expect(
       ensureQuotedTextFilters('transaction.duration:100', {
         numericKeys: new Set([]),
       })
-    ).toEqual('transaction.duration:"100"');
+    ).toBe('transaction.duration:"100"');
   });
 });
diff --git a/static/app/views/metrics/utils/index.tsx b/static/app/views/metrics/utils/index.tsx
index 97c3875d8ddc0f..6c74c30ba7065f 100644
--- a/static/app/views/metrics/utils/index.tsx
+++ b/static/app/views/metrics/utils/index.tsx
@@ -52,7 +52,7 @@ export function ensureQuotedTextFilters(
   }
 
   for (let i = 0; i < parsedSearch.length; i++) {
-    const token = parsedSearch[i];
+    const token = parsedSearch[i]!;
     if (token.type === Token.FILTER && token.filter === FilterType.TEXT) {
       // joinQuery() does not access nested tokens, so we need to manipulate the text of the filter instead of its value
       if (!token.value.quoted) {
diff --git a/static/app/views/metrics/utils/metricsChartPalette.spec.tsx b/static/app/views/metrics/utils/metricsChartPalette.spec.tsx
index 9a29a133625c6c..e5b2710cf67cab 100644
--- a/static/app/views/metrics/utils/metricsChartPalette.spec.tsx
+++ b/static/app/views/metrics/utils/metricsChartPalette.spec.tsx
@@ -5,16 +5,16 @@ describe('getQuerySymbol', () => {
     const cache: Record<string, string>[] = [];
 
     const abcPalette = getCachedChartPalette(cache, ['a', 'b', 'c']);
-    expect(cache.length).toBe(1);
+    expect(cache).toHaveLength(1);
 
     // As a, b is a subset of a, b, c, we should get the same palette
     const baPalette = getCachedChartPalette(cache, ['b', 'a']);
-    expect(cache.length).toBe(1);
+    expect(cache).toHaveLength(1);
     expect(baPalette).toBe(abcPalette);
 
     // As a, b, z is not a subset of a, b, c we should get a new palette
     const azbPalette = getCachedChartPalette(cache, ['a', 'z', 'b']);
-    expect(cache.length).toBe(2);
+    expect(cache).toHaveLength(2);
     // a will still be the same as it is the first entry in both arrays
     expect(azbPalette).not.toBe(abcPalette);
   });
@@ -23,10 +23,10 @@ describe('getQuerySymbol', () => {
     const cache: Record<string, string>[] = [];
 
     const aPalette = getCachedChartPalette(cache, ['a']);
-    expect(cache.length).toBe(0);
+    expect(cache).toHaveLength(0);
 
     const bPalette = getCachedChartPalette(cache, ['b']);
-    expect(cache.length).toBe(0);
+    expect(cache).toHaveLength(0);
 
     expect(aPalette).not.toBe(bPalette);
   });
@@ -38,7 +38,7 @@ describe('getQuerySymbol', () => {
 
     getCachedChartPalette(cache, ['a', 'b', 'c']);
 
-    expect(cache.length).toBe(20);
+    expect(cache).toHaveLength(20);
 
     // Ensure it removes more than 1 cache entry
     const cache2: Record<string, string>[] = Array.from({length: 100}).map(() => ({
@@ -47,6 +47,6 @@ describe('getQuerySymbol', () => {
 
     getCachedChartPalette(cache2, ['a', 'b', 'c']);
 
-    expect(cache2.length).toBe(20);
+    expect(cache2).toHaveLength(20);
   });
 });
diff --git a/static/app/views/metrics/utils/metricsChartPalette.tsx b/static/app/views/metrics/utils/metricsChartPalette.tsx
index 24912117c80b1b..678679ad29c7c8 100644
--- a/static/app/views/metrics/utils/metricsChartPalette.tsx
+++ b/static/app/views/metrics/utils/metricsChartPalette.tsx
@@ -15,7 +15,7 @@ export function createChartPalette(seriesNames: string[]): Record<string, string
 
   return uniqueSeriesNames.reduce(
     (palette, seriesName, i) => {
-      palette[seriesName] = chartColors[i % chartColors.length];
+      palette[seriesName] = chartColors[i % chartColors.length]!;
       return palette;
     },
     {} as Record<string, string>
@@ -41,7 +41,7 @@ export function getCachedChartPalette(
   // We search in reverse to get the most recent palettes first
   let cacheIndex = -1;
   for (let i = cache.length - 1; i >= 0; i--) {
-    const palette = cache[i];
+    const palette = cache[i]!;
     if (seriesNames.every(seriesName => seriesName in palette)) {
       cacheIndex = i;
       break;
@@ -49,7 +49,7 @@ export function getCachedChartPalette(
   }
 
   if (cacheIndex > -1) {
-    const cachedPalette = cache[cacheIndex];
+    const cachedPalette = cache[cacheIndex]!;
 
     if (cacheIndex !== cache.length - 1) {
       // Move the cached palette to the end of the cache, so it is the most recent one
diff --git a/static/app/views/metrics/utils/parseMetricWidgetsQueryParam.tsx b/static/app/views/metrics/utils/parseMetricWidgetsQueryParam.tsx
index 5500ab1d6f0155..2edcea6a3ee2ee 100644
--- a/static/app/views/metrics/utils/parseMetricWidgetsQueryParam.tsx
+++ b/static/app/views/metrics/utils/parseMetricWidgetsQueryParam.tsx
@@ -284,11 +284,11 @@ export function parseMetricWidgetsQueryParam(queryParam?: string): MetricsWidget
 
   // We can reset the id if there is only one widget
   if (queries.length === 1) {
-    queries[0].id = 0;
+    queries[0]!.id = 0;
   }
 
   if (formulas.length === 1) {
-    formulas[0].id = 0;
+    formulas[0]!.id = 0;
   }
 
   return [
diff --git a/static/app/views/metrics/utils/useMetricsIntervalParam.tsx b/static/app/views/metrics/utils/useMetricsIntervalParam.tsx
index 1913d961516e15..d1a42341083833 100644
--- a/static/app/views/metrics/utils/useMetricsIntervalParam.tsx
+++ b/static/app/views/metrics/utils/useMetricsIntervalParam.tsx
@@ -87,7 +87,7 @@ export function validateInterval(
   return isPeriod && currentIntervalValues.includes(interval)
     ? interval
     : // Take the 2nd most granular option if available
-      enabledOptions[1]?.value ?? enabledOptions[0].value;
+      enabledOptions[1]?.value ?? enabledOptions[0]!.value;
 }
 
 export function useMetricsIntervalParam() {
diff --git a/static/app/views/metrics/widget.tsx b/static/app/views/metrics/widget.tsx
index 5bac80718dc7ff..a3ffe55d6ab4b1 100644
--- a/static/app/views/metrics/widget.tsx
+++ b/static/app/views/metrics/widget.tsx
@@ -102,7 +102,7 @@ export function getWidgetTitle(queries: MetricsQueryApiQueryParams[]) {
   const filteredQueries = queries.filter(isNotQueryOnly);
 
   if (filteredQueries.length === 1) {
-    const firstQuery = filteredQueries[0];
+    const firstQuery = filteredQueries[0]!;
     if (isMetricFormula(firstQuery)) {
       return (
         <Fragment>
@@ -488,7 +488,7 @@ const MetricWidgetBody = memo(
     const setSeriesVisibility = useCallback(
       (series: FocusedMetricsSeries) => {
         setHoveredSeries('');
-        if (focusedSeries?.length === 1 && focusedSeries[0].id === series.id) {
+        if (focusedSeries?.length === 1 && focusedSeries[0]!.id === series.id) {
           onChange?.({
             focusedSeries: [],
           });
@@ -586,9 +586,9 @@ export function getChartTimeseries(
   const filteredQueries = queries.filter(isNotQueryOnly);
 
   const series = data.data.flatMap((group, index) => {
-    const query = filteredQueries[index];
-    const meta = data.meta[index];
-    const lastMetaEntry = meta[meta.length - 1];
+    const query = filteredQueries[index]!;
+    const meta = data.meta[index]!;
+    const lastMetaEntry = meta[meta.length - 1]!;
     const unit =
       (lastMetaEntry && 'unit' in lastMetaEntry && lastMetaEntry.unit) || 'none';
     const scalingFactor =
@@ -601,10 +601,10 @@ export function getChartTimeseries(
     const isMultiQuery = filteredQueries.length > 1;
 
     return group.map(entry => ({
-      unit: unit,
-      operation: operation,
+      unit,
+      operation,
       values: entry.series,
-      scalingFactor: scalingFactor,
+      scalingFactor,
       name: getMetricsSeriesName(query, entry.by, isMultiQuery),
       id: getMetricsSeriesId(query, entry.by),
       queryIndex: index,
diff --git a/static/app/views/metrics/widgetDetails.tsx b/static/app/views/metrics/widgetDetails.tsx
index abfd351e8dbfc0..f627bfaa2206e2 100644
--- a/static/app/views/metrics/widgetDetails.tsx
+++ b/static/app/views/metrics/widgetDetails.tsx
@@ -138,7 +138,7 @@ export function MetricDetails({
           min: selectionRange?.min,
           op: aggregation,
           query: queryWithFocusedSeries,
-          mri: mri,
+          mri,
         },
         query: {
           project: selection.projects as unknown as string[],
diff --git a/static/app/views/monitors/components/cronsLandingPanel.tsx b/static/app/views/monitors/components/cronsLandingPanel.tsx
index 37feb8e5a685e9..1b577b35599a8c 100644
--- a/static/app/views/monitors/components/cronsLandingPanel.tsx
+++ b/static/app/views/monitors/components/cronsLandingPanel.tsx
@@ -10,9 +10,9 @@ import {IconChevron} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import {trackAnalytics} from 'sentry/utils/analytics';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {decodeScalar} from 'sentry/utils/queryString';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import MonitorCreateForm from 'sentry/views/monitors/components/monitorCreateForm';
 
@@ -122,6 +122,7 @@ export function isValidGuide(guide?: string): guide is GuideKey {
 export function CronsLandingPanel() {
   const organization = useOrganization();
   const location = useLocation();
+  const navigate = useNavigate();
   const platform = decodeScalar(location.query?.platform) ?? null;
   const guide = decodeScalar(location.query?.guide);
 
@@ -147,7 +148,7 @@ export function CronsLandingPanel() {
     selectedGuide?: string
   ) => {
     if (!selectedPlatform) {
-      browserHistory.push({
+      navigate({
         pathname: location.pathname,
         query: {...location.query, platform: undefined, guide: undefined},
       });
@@ -157,7 +158,7 @@ export function CronsLandingPanel() {
     if (!selectedGuide) {
       selectedGuide = platformGuides[selectedPlatform][0]?.key ?? GuideKey.MANUAL;
     }
-    browserHistory.push({
+    navigate({
       pathname: location.pathname,
       query: {...location.query, platform: selectedPlatform, guide: selectedGuide},
     });
diff --git a/static/app/views/monitors/components/detailsSidebar.tsx b/static/app/views/monitors/components/detailsSidebar.tsx
index 92f1e3b1f6a00e..f104123508b448 100644
--- a/static/app/views/monitors/components/detailsSidebar.tsx
+++ b/static/app/views/monitors/components/detailsSidebar.tsx
@@ -32,7 +32,7 @@ interface Props {
   showUnknownLegend?: boolean;
 }
 
-export default function DetailsSidebar({monitorEnv, monitor, showUnknownLegend}: Props) {
+export function DetailsSidebar({monitorEnv, monitor, showUnknownLegend}: Props) {
   const {checkin_margin, schedule, schedule_type, max_runtime, timezone} = monitor.config;
   const {onClick, label} = useCopyToClipboard({text: monitor.slug});
 
diff --git a/static/app/views/monitors/components/detailsTimeline.tsx b/static/app/views/monitors/components/detailsTimeline.tsx
index 8534f76f48cb16..fa2a51a7b190be 100644
--- a/static/app/views/monitors/components/detailsTimeline.tsx
+++ b/static/app/views/monitors/components/detailsTimeline.tsx
@@ -55,7 +55,7 @@ export function DetailsTimeline({monitor, onStatsLoaded}: Props) {
   });
 
   useEffect(
-    () => monitorStats?.[monitor.id] && onStatsLoaded?.(monitorStats[monitor.id]),
+    () => monitorStats?.[monitor.id] && onStatsLoaded?.(monitorStats[monitor.id]!),
     [onStatsLoaded, monitorStats, monitor.id]
   );
 
@@ -98,7 +98,7 @@ export function DetailsTimeline({monitor, onStatsLoaded}: Props) {
       }
 
       oldMonitorDetails.environments[oldMonitorEnvIdx] = {
-        ...oldMonitorDetails.environments[oldMonitorEnvIdx],
+        ...oldMonitorDetails.environments[oldMonitorEnvIdx]!,
         isMuted,
       };
       return oldMonitorDetails;
diff --git a/static/app/views/monitors/components/monitorCheckIns.tsx b/static/app/views/monitors/components/monitorCheckIns.tsx
index 7f3573b83b2f0e..484491a6a3ba72 100644
--- a/static/app/views/monitors/components/monitorCheckIns.tsx
+++ b/static/app/views/monitors/components/monitorCheckIns.tsx
@@ -49,7 +49,7 @@ export const checkStatusToIndicatorStatus: Record<
   [CheckInStatus.UNKNOWN]: 'muted',
 };
 
-function MonitorCheckIns({monitor, monitorEnvs, orgSlug}: Props) {
+export function MonitorCheckIns({monitor, monitorEnvs, orgSlug}: Props) {
   const user = useUser();
   const location = useLocation();
   const organization = useOrganization();
@@ -218,8 +218,6 @@ function MonitorCheckIns({monitor, monitorEnvs, orgSlug}: Props) {
   );
 }
 
-export default MonitorCheckIns;
-
 const Status = styled('div')`
   line-height: 1.1;
 `;
diff --git a/static/app/views/monitors/components/monitorForm.tsx b/static/app/views/monitors/components/monitorForm.tsx
index a0d514a09188d8..234f4d8acaf259 100644
--- a/static/app/views/monitors/components/monitorForm.tsx
+++ b/static/app/views/monitors/components/monitorForm.tsx
@@ -97,7 +97,7 @@ export function transformMonitorFormData(_data: Record<string, any>, model: Form
         // See SentryMemberTeamSelectorField to understand why these are strings
         const [type, id] = item.split(':');
 
-        const targetType = RULE_TARGET_MAP[type];
+        const targetType = RULE_TARGET_MAP[type!];
 
         return {targetType, targetIdentifier: Number(id)};
       });
@@ -240,7 +240,7 @@ function MonitorForm({
           ? {
               name: monitor.name,
               slug: monitor.slug,
-              owner: owner,
+              owner,
               type: monitor.type ?? DEFAULT_MONITOR_TYPE,
               project: monitor.project.slug,
               'alertRule.targets': alertRuleTarget,
@@ -490,17 +490,17 @@ function MonitorForm({
           {t('Configure who to notify upon issue creation and when.')}
         </ListItemSubText>
         <InputGroup>
+          {monitor?.config.alert_rule_id && (
+            <AlertLink
+              priority="muted"
+              to={`/organizations/${organization.slug}/alerts/rules/${monitor.project.slug}/${monitor.config.alert_rule_id}/`}
+              withoutMarginBottom
+            >
+              {t('Customize this monitors notification configuration in Alerts')}
+            </AlertLink>
+          )}
           <Panel>
             <PanelBody>
-              {monitor?.config.alert_rule_id && (
-                <AlertLink
-                  priority="muted"
-                  to={`/organizations/${organization.slug}/alerts/rules/${monitor.project.slug}/${monitor.config.alert_rule_id}/`}
-                  withoutMarginBottom
-                >
-                  {t('Customize this monitors notification configuration in Alerts')}
-                </AlertLink>
-              )}
               <Observer>
                 {() => {
                   const projectSlug = form.current.getValue('project')?.toString();
diff --git a/static/app/views/monitors/components/monitorHeader.tsx b/static/app/views/monitors/components/monitorHeader.tsx
index 94115071e485f0..33f4af8e5fd36a 100644
--- a/static/app/views/monitors/components/monitorHeader.tsx
+++ b/static/app/views/monitors/components/monitorHeader.tsx
@@ -13,7 +13,7 @@ interface Props {
   orgSlug: string;
 }
 
-function MonitorHeader({monitor, orgSlug, onUpdate}: Props) {
+export function MonitorHeader({monitor, orgSlug, onUpdate}: Props) {
   const crumbs = [
     {
       label: t('Crons'),
@@ -45,5 +45,3 @@ function MonitorHeader({monitor, orgSlug, onUpdate}: Props) {
     </Layout.Header>
   );
 }
-
-export default MonitorHeader;
diff --git a/static/app/views/monitors/components/monitorIssues.tsx b/static/app/views/monitors/components/monitorIssues.tsx
index 86c850f0ce95f0..9b1360a4538700 100644
--- a/static/app/views/monitors/components/monitorIssues.tsx
+++ b/static/app/views/monitors/components/monitorIssues.tsx
@@ -42,7 +42,7 @@ function MonitorIssuesEmptyMessage() {
   );
 }
 
-function MonitorIssues({orgSlug, monitor, monitorEnvs}: Props) {
+export function MonitorIssues({orgSlug, monitor, monitorEnvs}: Props) {
   const {selection} = usePageFilters();
   const {start, end, period} = selection.datetime;
   const timeProps =
@@ -117,5 +117,3 @@ const ControlsWrapper = styled('div')`
   margin-bottom: ${space(1)};
   flex-wrap: wrap;
 `;
-
-export default MonitorIssues;
diff --git a/static/app/views/monitors/components/monitorQuickStartGuide.tsx b/static/app/views/monitors/components/monitorQuickStartGuide.tsx
index 3abdd58aaa99ca..93f24323b7bfa3 100644
--- a/static/app/views/monitors/components/monitorQuickStartGuide.tsx
+++ b/static/app/views/monitors/components/monitorQuickStartGuide.tsx
@@ -166,10 +166,10 @@ export default function MonitorQuickStartGuide({monitor}: Props) {
     guide.platforms?.has(monitor.project.platform ?? 'other')
   );
 
-  const defaultExample = platformSpecific.length > 0 ? platformSpecific[0].key : 'cli';
+  const defaultExample = platformSpecific.length > 0 ? platformSpecific[0]!.key : 'cli';
 
   const [selectedGuide, setSelectedGuide] = useState(defaultExample);
-  const {Guide} = onboardingGuides[selectedGuide];
+  const {Guide} = onboardingGuides[selectedGuide]!;
 
   return (
     <Container>
@@ -183,8 +183,8 @@ export default function MonitorQuickStartGuide({monitor}: Props) {
         orgSlug={org.slug}
         orgId={org.id}
         projectId={monitor.project.id}
-        cronsUrl={projectKeys?.[0].dsn.crons}
-        dsnKey={projectKeys?.[0].dsn.public}
+        cronsUrl={projectKeys?.[0]!.dsn.crons}
+        dsnKey={projectKeys?.[0]!.dsn.public}
       />
     </Container>
   );
diff --git a/static/app/views/monitors/components/monitorStats.tsx b/static/app/views/monitors/components/monitorStats.tsx
index d0e0851589c696..9dbe941246e9c6 100644
--- a/static/app/views/monitors/components/monitorStats.tsx
+++ b/static/app/views/monitors/components/monitorStats.tsx
@@ -28,7 +28,7 @@ type Props = {
   orgSlug: string;
 };
 
-function MonitorStats({monitor, monitorEnvs, orgSlug}: Props) {
+export function MonitorStats({monitor, monitorEnvs, orgSlug}: Props) {
   const {selection} = usePageFilters();
   const {start, end, period} = selection.datetime;
 
@@ -160,7 +160,7 @@ function MonitorStats({monitor, monitorEnvs, orgSlug}: Props) {
               useShortDate
               series={[duration]}
               height={height}
-              colors={[theme.charts.colors[0]]}
+              colors={[theme.charts.colors![0]!]}
               yAxis={getYAxisOptions('duration')}
               grid={{
                 top: 6,
diff --git a/static/app/views/monitors/components/onboarding.tsx b/static/app/views/monitors/components/onboarding.tsx
index 39c224e72c1465..17da8e3519226d 100644
--- a/static/app/views/monitors/components/onboarding.tsx
+++ b/static/app/views/monitors/components/onboarding.tsx
@@ -10,7 +10,7 @@ interface Props {
   monitor: Monitor;
 }
 
-function MonitorOnboarding({monitor}: Props) {
+export function MonitorOnboarding({monitor}: Props) {
   return (
     <OnboardingPanel noCenter>
       <h3>{t('Instrument your monitor')}</h3>
@@ -28,5 +28,3 @@ function MonitorOnboarding({monitor}: Props) {
     </OnboardingPanel>
   );
 }
-
-export default MonitorOnboarding;
diff --git a/static/app/views/monitors/components/overviewTimeline/index.tsx b/static/app/views/monitors/components/overviewTimeline/index.tsx
index 269958acae3dab..d8febf09720b3d 100644
--- a/static/app/views/monitors/components/overviewTimeline/index.tsx
+++ b/static/app/views/monitors/components/overviewTimeline/index.tsx
@@ -54,7 +54,7 @@ export function OverviewTimeline({monitorList}: Props) {
         return oldMonitorList;
       }
 
-      const oldMonitor = oldMonitorList[oldMonitorIdx];
+      const oldMonitor = oldMonitorList[oldMonitorIdx]!;
       const newEnvList = oldMonitor.environments.filter(e => e.name !== env);
       const updatedMonitor = {
         ...oldMonitor,
@@ -109,7 +109,7 @@ export function OverviewTimeline({monitorList}: Props) {
     const queryKey = makeMonitorListQueryKey(organization, location.query);
     setApiQueryData(queryClient, queryKey, (oldMonitorList: Monitor[]) => {
       const monitorIdx = oldMonitorList.findIndex(m => m.slug === monitor.slug);
-      oldMonitorList[monitorIdx] = {...oldMonitorList[monitorIdx], status: resp.status};
+      oldMonitorList[monitorIdx] = {...oldMonitorList[monitorIdx]!, status: resp.status};
 
       return oldMonitorList;
     });
diff --git a/static/app/views/monitors/components/processingErrors/monitorProcessingErrors.spec.tsx b/static/app/views/monitors/components/processingErrors/monitorProcessingErrors.spec.tsx
index ffe9c89ea6e7fe..2aa83a62b6eb73 100644
--- a/static/app/views/monitors/components/processingErrors/monitorProcessingErrors.spec.tsx
+++ b/static/app/views/monitors/components/processingErrors/monitorProcessingErrors.spec.tsx
@@ -8,7 +8,7 @@ import {
   userEvent,
 } from 'sentry-test/reactTestingLibrary';
 
-import MonitorProcessingErrors from 'sentry/views/monitors/components/processingErrors/monitorProcessingErrors';
+import {MonitorProcessingErrors} from 'sentry/views/monitors/components/processingErrors/monitorProcessingErrors';
 
 describe('MonitorProcessingErrors', () => {
   it('should group errors by type', async () => {
diff --git a/static/app/views/monitors/components/processingErrors/monitorProcessingErrors.tsx b/static/app/views/monitors/components/processingErrors/monitorProcessingErrors.tsx
index 18a3f86f74fa5c..406c33ec1fc973 100644
--- a/static/app/views/monitors/components/processingErrors/monitorProcessingErrors.tsx
+++ b/static/app/views/monitors/components/processingErrors/monitorProcessingErrors.tsx
@@ -26,7 +26,7 @@ import type {
 import {ProcessingErrorItem} from './processingErrorItem';
 import {ProcessingErrorTitle} from './processingErrorTitle';
 
-export default function MonitorProcessingErrors({
+export function MonitorProcessingErrors({
   checkinErrors,
   children,
   onDismiss,
@@ -82,7 +82,7 @@ export default function MonitorProcessingErrors({
       const project = projects.find(({id}) => id === projectId);
       const projectEntries = Object.values(errorsByType).map((errors, index) => {
         const isExpanded = expanded === `${projectId}:${index}`;
-        const errortype = errors[0].error.type;
+        const errortype = errors[0]!.error.type;
         return (
           <ErrorGroup key={index}>
             <ErrorHeader>
diff --git a/static/app/views/monitors/components/timeline/checkInTimeline.tsx b/static/app/views/monitors/components/timeline/checkInTimeline.tsx
index 24cef7a38fbf83..0895a7410641d5 100644
--- a/static/app/views/monitors/components/timeline/checkInTimeline.tsx
+++ b/static/app/views/monitors/components/timeline/checkInTimeline.tsx
@@ -60,7 +60,7 @@ export function CheckInTimeline(props: CheckInTimelineProps) {
           >
             <JobTick
               style={{left, width: tickWidth}}
-              status={getAggregateStatus(envMapping)}
+              status={getAggregateStatus(envMapping)!}
               roundedLeft={roundedLeft}
               roundedRight={roundedRight}
               data-test-id="monitor-checkin-tick"
diff --git a/static/app/views/monitors/components/timeline/checkInTooltip.spec.tsx b/static/app/views/monitors/components/timeline/checkInTooltip.spec.tsx
index 433ffbe284e2ec..3b24ba10236dab 100644
--- a/static/app/views/monitors/components/timeline/checkInTooltip.spec.tsx
+++ b/static/app/views/monitors/components/timeline/checkInTooltip.spec.tsx
@@ -14,7 +14,7 @@ type StatusCounts = [
   unknown: number,
 ];
 
-export function generateEnvMapping(name: string, counts: StatusCounts) {
+function generateEnvMapping(name: string, counts: StatusCounts) {
   const [in_progress, ok, missed, timeout, error, unknown] = counts;
   return {
     [name]: {in_progress, ok, missed, timeout, error, unknown},
@@ -54,10 +54,9 @@ describe('CheckInTooltip', function () {
     );
 
     // Skip the header row
-    const statusRow = (await screen.findAllByRole('row'))[1];
+    const statusRow = (await screen.findAllByRole('row'))[1]!;
 
     expect(within(statusRow).getByText('Missed')).toBeInTheDocument();
-    expect(within(statusRow).getByText('prod')).toBeInTheDocument();
     expect(within(statusRow).getByText('1')).toBeInTheDocument();
   });
 
@@ -78,24 +77,20 @@ describe('CheckInTooltip', function () {
       <CheckInTooltip jobTick={jobTick} timeWindowConfig={tickConfig} forceVisible />
     );
 
-    const okayRow = (await screen.findAllByRole('row'))[1];
+    const okayRow = (await screen.findAllByRole('row'))[1]!;
     expect(within(okayRow).getByText('Okay')).toBeInTheDocument();
-    expect(within(okayRow).getByText('prod')).toBeInTheDocument();
     expect(within(okayRow).getByText('1')).toBeInTheDocument();
 
-    const missedRow = screen.getAllByRole('row')[2];
+    const missedRow = screen.getAllByRole('row')[2]!;
     expect(within(missedRow).getByText('Missed')).toBeInTheDocument();
-    expect(within(missedRow).getByText('prod')).toBeInTheDocument();
     expect(within(missedRow).getByText('1')).toBeInTheDocument();
 
-    const timeoutRow = screen.getAllByRole('row')[3];
+    const timeoutRow = screen.getAllByRole('row')[3]!;
     expect(within(timeoutRow).getByText('Timed Out')).toBeInTheDocument();
-    expect(within(timeoutRow).getByText('prod')).toBeInTheDocument();
     expect(within(timeoutRow).getByText('1')).toBeInTheDocument();
 
-    const errorRow = screen.getAllByRole('row')[4];
+    const errorRow = screen.getAllByRole('row')[4]!;
     expect(within(errorRow).getByText('Failed')).toBeInTheDocument();
-    expect(within(errorRow).getByText('prod')).toBeInTheDocument();
     expect(within(errorRow).getByText('1')).toBeInTheDocument();
   });
 
@@ -118,24 +113,20 @@ describe('CheckInTooltip', function () {
       <CheckInTooltip jobTick={jobTick} timeWindowConfig={tickConfig} forceVisible />
     );
 
-    const missedProdRow = (await screen.findAllByRole('row'))[1];
+    const missedProdRow = (await screen.findAllByRole('row'))[1]!;
     expect(within(missedProdRow).getByText('Missed')).toBeInTheDocument();
-    expect(within(missedProdRow).getByText('prod')).toBeInTheDocument();
     expect(within(missedProdRow).getByText('1')).toBeInTheDocument();
 
-    const okDevRow = screen.getAllByRole('row')[2];
+    const okDevRow = screen.getAllByRole('row')[2]!;
     expect(within(okDevRow).getByText('Okay')).toBeInTheDocument();
-    expect(within(okDevRow).getByText('dev')).toBeInTheDocument();
     expect(within(okDevRow).getByText('1')).toBeInTheDocument();
 
-    const missedDevRow = screen.getAllByRole('row')[3];
+    const missedDevRow = screen.getAllByRole('row')[3]!;
     expect(within(missedDevRow).getByText('Missed')).toBeInTheDocument();
-    expect(within(missedDevRow).getByText('dev')).toBeInTheDocument();
     expect(within(missedDevRow).getByText('2')).toBeInTheDocument();
 
-    const timeoutDevRow = screen.getAllByRole('row')[4];
+    const timeoutDevRow = screen.getAllByRole('row')[4]!;
     expect(within(timeoutDevRow).getByText('Timed Out')).toBeInTheDocument();
-    expect(within(timeoutDevRow).getByText('dev')).toBeInTheDocument();
     expect(within(timeoutDevRow).getByText('1')).toBeInTheDocument();
   });
 });
diff --git a/static/app/views/monitors/components/timeline/checkInTooltip.tsx b/static/app/views/monitors/components/timeline/checkInTooltip.tsx
index 5cd41ceaeab390..5d5b62cc62cac4 100644
--- a/static/app/views/monitors/components/timeline/checkInTooltip.tsx
+++ b/static/app/views/monitors/components/timeline/checkInTooltip.tsx
@@ -23,8 +23,10 @@ export function CheckInTooltip({jobTick, timeWindowConfig, children, ...props}:
   const capturedEnvs = Object.keys(envMapping);
   const representsSingleJob =
     capturedEnvs.length === 1 &&
-    Object.values(envMapping[capturedEnvs[0]]).reduce((sum, count) => sum + count, 0) ===
-      1;
+    Object.values(envMapping[capturedEnvs[0]!]!).reduce(
+      (sum, count) => sum + count,
+      0
+    ) === 1;
 
   const tooltipTitle = (
     <Fragment>
@@ -56,8 +58,6 @@ export function CheckInTooltip({jobTick, timeWindowConfig, children, ...props}:
                     <StatusLabel status={status as CheckInStatus}>
                       {statusToText[status]}
                     </StatusLabel>
-                    {/* TODO(davidenwang): handle long env names */}
-                    <EnvLabel>{envName}</EnvLabel>
                     <StatusCount>{count}</StatusCount>
                   </tr>
                 )
@@ -101,7 +101,3 @@ const StatusLabel = styled('td')<{status: CheckInStatus}>`
 const StatusCount = styled('td')`
   font-variant-numeric: tabular-nums;
 `;
-
-const EnvLabel = styled('td')`
-  padding: ${space(0.25)} ${space(0.5)};
-`;
diff --git a/static/app/views/monitors/components/timeline/timelineCursor.spec.tsx b/static/app/views/monitors/components/timeline/timelineCursor.spec.tsx
index 5e379b502c2e1a..ba9605c3006f70 100644
--- a/static/app/views/monitors/components/timeline/timelineCursor.spec.tsx
+++ b/static/app/views/monitors/components/timeline/timelineCursor.spec.tsx
@@ -59,6 +59,6 @@ describe('TimelineCursor', function () {
 
     // move cursor outside it is not visible
     fireEvent.mouseMove(body, {clientX: 120, clientY: 20});
-    await waitForElementToBeRemoved(() => screen.getByRole('presentation'));
+    await waitForElementToBeRemoved(() => screen.queryByRole('presentation'));
   });
 });
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 ddb73855482981..0d6d12597e64b8 100644
--- a/static/app/views/monitors/components/timeline/utils/getAggregateStatus.spec.tsx
+++ b/static/app/views/monitors/components/timeline/utils/getAggregateStatus.spec.tsx
@@ -1,6 +1,9 @@
 import {CheckInStatus} from 'sentry/views/monitors/types';
 
-import {getAggregateStatus} from './getAggregateStatus';
+import {
+  getAggregateStatus,
+  getAggregateStatusFromStatsBucket,
+} from './getAggregateStatus';
 
 type StatusCounts = [
   in_progress: number,
@@ -11,13 +14,25 @@ type StatusCounts = [
   unknown: number,
 ];
 
-export function generateEnvMapping(name: string, counts: StatusCounts) {
+function generateEnvMapping(name: string, counts: StatusCounts) {
   const [in_progress, ok, missed, timeout, error, unknown] = counts;
   return {
     [name]: {in_progress, ok, missed, timeout, error, unknown},
   };
 }
 
+function generateStats(counts: StatusCounts) {
+  const [in_progress, ok, missed, timeout, error, unknown] = counts;
+  return {
+    in_progress,
+    ok,
+    missed,
+    timeout,
+    error,
+    unknown,
+  };
+}
+
 describe('getAggregateStatus', function () {
   it('aggregates correctly across multiple envs', function () {
     const envData = {
@@ -27,3 +42,10 @@ describe('getAggregateStatus', function () {
     expect(getAggregateStatus(envData)).toEqual(CheckInStatus.ERROR);
   });
 });
+
+describe('getAggregateStatusFromStatsBucket', function () {
+  it('aggregates correctly', function () {
+    const stats = generateStats([0, 1, 2, 0, 1, 0]);
+    expect(getAggregateStatusFromStatsBucket(stats)).toEqual(CheckInStatus.ERROR);
+  });
+});
diff --git a/static/app/views/monitors/components/timeline/utils/getAggregateStatus.tsx b/static/app/views/monitors/components/timeline/utils/getAggregateStatus.tsx
index c75aabc554c526..dcc1eeed706029 100644
--- a/static/app/views/monitors/components/timeline/utils/getAggregateStatus.tsx
+++ b/static/app/views/monitors/components/timeline/utils/getAggregateStatus.tsx
@@ -1,14 +1,21 @@
-import type {MonitorBucketEnvMapping} from '../types';
+import type {MonitorBucketEnvMapping, StatsBucket} from '../types';
 
 import {CHECKIN_STATUS_PRECEDENT} from './constants';
 
 export function getAggregateStatus(envData: MonitorBucketEnvMapping) {
   return Object.values(envData).reduce((currentStatus, value) => {
     for (const [index, status] of CHECKIN_STATUS_PRECEDENT.entries()) {
-      if (value[status] > 0 && index > CHECKIN_STATUS_PRECEDENT.indexOf(currentStatus)) {
+      if (value[status] > 0 && index > CHECKIN_STATUS_PRECEDENT.indexOf(currentStatus!)) {
         currentStatus = status;
       }
     }
     return currentStatus;
   }, CHECKIN_STATUS_PRECEDENT[0]);
 }
+
+export function getAggregateStatusFromStatsBucket(stats: StatsBucket) {
+  return (
+    [...CHECKIN_STATUS_PRECEDENT].reverse().find(status => stats[status] > 0) ||
+    CHECKIN_STATUS_PRECEDENT[0]
+  );
+}
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 2a3e023fde162e..209cd6eb3cd93c 100644
--- a/static/app/views/monitors/components/timeline/utils/getAggregateStatusFromMultipleBuckets.spec.tsx
+++ b/static/app/views/monitors/components/timeline/utils/getAggregateStatusFromMultipleBuckets.spec.tsx
@@ -1,6 +1,9 @@
 import {CheckInStatus} from 'sentry/views/monitors/types';
 
-import {getAggregateStatusFromMultipleBuckets} from './getAggregateStatusFromMultipleBuckets';
+import {
+  getAggregateStatusFromMultipleBuckets,
+  getAggregateStatusFromMultipleStatsBuckets,
+} from './getAggregateStatusFromMultipleBuckets';
 
 type StatusCounts = [
   in_progress: number,
@@ -11,13 +14,25 @@ type StatusCounts = [
   unknown: number,
 ];
 
-export function generateEnvMapping(name: string, counts: StatusCounts) {
+function generateEnvMapping(name: string, counts: StatusCounts) {
   const [in_progress, ok, missed, timeout, error, unknown] = counts;
   return {
     [name]: {in_progress, ok, missed, timeout, error, unknown},
   };
 }
 
+function generateStats(counts: StatusCounts) {
+  const [in_progress, ok, missed, timeout, error, unknown] = counts;
+  return {
+    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, 0]);
@@ -29,3 +44,15 @@ describe('getAggregateStatusFromMultipleBuckets', function () {
     expect(status).toEqual(CheckInStatus.TIMEOUT);
   });
 });
+
+describe('getAggregateStatusFromMultipleStatsBuckets', function () {
+  it('aggregates correctly across multiple envs', function () {
+    const stats1 = generateStats([2, 1, 2, 1, 0, 0]);
+    const stats2 = generateStats([1, 2, 0, 0, 0, 0]);
+    const stats3 = generateStats([1, 1, 1, 3, 0, 0]);
+
+    const status = getAggregateStatusFromMultipleStatsBuckets([stats1, stats2, stats3]);
+
+    expect(status).toEqual(CheckInStatus.TIMEOUT);
+  });
+});
diff --git a/static/app/views/monitors/components/timeline/utils/getAggregateStatusFromMultipleBuckets.tsx b/static/app/views/monitors/components/timeline/utils/getAggregateStatusFromMultipleBuckets.tsx
index c073bb4ac56094..483f21fbf4466e 100644
--- a/static/app/views/monitors/components/timeline/utils/getAggregateStatusFromMultipleBuckets.tsx
+++ b/static/app/views/monitors/components/timeline/utils/getAggregateStatusFromMultipleBuckets.tsx
@@ -1,7 +1,10 @@
-import type {MonitorBucketEnvMapping} from '../types';
+import type {MonitorBucketEnvMapping, StatsBucket} from '../types';
 
 import {CHECKIN_STATUS_PRECEDENT} from './constants';
-import {getAggregateStatus} from './getAggregateStatus';
+import {
+  getAggregateStatus,
+  getAggregateStatusFromStatsBucket,
+} from './getAggregateStatus';
 
 /**
  * Given multiple env buckets [{prod: {ok: 1, ...}, {prod: {ok: 0, ...}}]
@@ -14,8 +17,25 @@ export function getAggregateStatusFromMultipleBuckets(
     .map(getAggregateStatus)
     .reduce(
       (aggregateStatus, currentStatus) =>
-        CHECKIN_STATUS_PRECEDENT.indexOf(currentStatus) >
-        CHECKIN_STATUS_PRECEDENT.indexOf(aggregateStatus)
+        CHECKIN_STATUS_PRECEDENT.indexOf(currentStatus!) >
+        CHECKIN_STATUS_PRECEDENT.indexOf(aggregateStatus!)
+          ? currentStatus
+          : aggregateStatus,
+      CHECKIN_STATUS_PRECEDENT[0]
+    );
+}
+
+/**
+ * Given multiple stats buckets [{..., error: 1, unknown: 0}, {..., error: 0, unknown: 4}]
+ * returns the aggregate status across all buckets (unknown)
+ */
+export function getAggregateStatusFromMultipleStatsBuckets(statsArr: StatsBucket[]) {
+  return statsArr
+    .map(getAggregateStatusFromStatsBucket)
+    .reduce(
+      (aggregateStatus, currentStatus) =>
+        CHECKIN_STATUS_PRECEDENT.indexOf(currentStatus!) >
+        CHECKIN_STATUS_PRECEDENT.indexOf(aggregateStatus!)
           ? currentStatus
           : aggregateStatus,
       CHECKIN_STATUS_PRECEDENT[0]
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 eba38eac4c7e47..c24c676004950e 100644
--- a/static/app/views/monitors/components/timeline/utils/isEnvMappingEmpty.spec.tsx
+++ b/static/app/views/monitors/components/timeline/utils/isEnvMappingEmpty.spec.tsx
@@ -3,13 +3,13 @@ import {isEnvMappingEmpty} from './isEnvMappingEmpty';
 describe('isEnvMappingEmpty', function () {
   it('returns true for an empty env', function () {
     const envMapping = {};
-    expect(isEnvMappingEmpty(envMapping)).toEqual(true);
+    expect(isEnvMappingEmpty(envMapping)).toBe(true);
   });
 
   it('returns false for a filled env', function () {
     const envMapping = {
       prod: {ok: 1, missed: 0, timeout: 0, error: 0, in_progress: 0, unknown: 0},
     };
-    expect(isEnvMappingEmpty(envMapping)).toEqual(false);
+    expect(isEnvMappingEmpty(envMapping)).toBe(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 0bc05f1828975f..154ca5d4481102 100644
--- a/static/app/views/monitors/components/timeline/utils/mergeBuckets.spec.tsx
+++ b/static/app/views/monitors/components/timeline/utils/mergeBuckets.spec.tsx
@@ -13,7 +13,7 @@ type StatusCounts = [
   unknown: number,
 ];
 
-export function generateEnvMapping(name: string, counts: StatusCounts) {
+function generateEnvMapping(name: string, counts: StatusCounts) {
   const [in_progress, ok, missed, timeout, error, unknown] = counts;
   return {
     [name]: {in_progress, ok, missed, timeout, error, unknown},
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 87bfd6b4a7b373..2e27116c7b0245 100644
--- a/static/app/views/monitors/components/timeline/utils/mergeEnvMappings.spec.tsx
+++ b/static/app/views/monitors/components/timeline/utils/mergeEnvMappings.spec.tsx
@@ -1,6 +1,30 @@
-import type {MonitorBucketEnvMapping} from 'sentry/views/monitors/components/timeline/types';
+import type {
+  MonitorBucketEnvMapping,
+  StatsBucket,
+} from 'sentry/views/monitors/components/timeline/types';
 
-import {mergeEnvMappings} from './mergeEnvMappings';
+import {mergeEnvMappings, mergeStats} from './mergeEnvMappings';
+
+type StatusCounts = [
+  in_progress: number,
+  ok: number,
+  missed: number,
+  timeout: number,
+  error: number,
+  unknown: number,
+];
+
+function generateStats(counts: StatusCounts) {
+  const [in_progress, ok, missed, timeout, error, unknown] = counts;
+  return {
+    in_progress,
+    ok,
+    missed,
+    timeout,
+    error,
+    unknown,
+  };
+}
 
 describe('mergeEnvMappings', function () {
   it('merges two empty mappings', function () {
@@ -52,3 +76,14 @@ describe('mergeEnvMappings', function () {
     expect(mergedMapping).toEqual(expectedMerged);
   });
 });
+
+describe('mergeStats', function () {
+  it('merges two filled mappings', function () {
+    const statsA: StatsBucket = generateStats([0, 0, 1, 2, 1, 0]);
+    const statsB: StatsBucket = generateStats([2, 1, 1, 0, 2, 0]);
+    const expectedMerged: StatsBucket = generateStats([2, 1, 2, 2, 3, 0]);
+    const mergedStats = mergeStats(statsA, statsB);
+
+    expect(mergedStats).toEqual(expectedMerged);
+  });
+});
diff --git a/static/app/views/monitors/components/timeline/utils/mergeEnvMappings.tsx b/static/app/views/monitors/components/timeline/utils/mergeEnvMappings.tsx
index c2046bd2c2e854..e2adee78dd57f5 100644
--- a/static/app/views/monitors/components/timeline/utils/mergeEnvMappings.tsx
+++ b/static/app/views/monitors/components/timeline/utils/mergeEnvMappings.tsx
@@ -24,3 +24,14 @@ export function mergeEnvMappings(
     return mergedEnvs;
   }, {});
 }
+
+/**
+ * Combines job status counts
+ */
+export function mergeStats(statsA: StatsBucket, statsB: StatsBucket): StatsBucket {
+  const combinedStats = {} as StatsBucket;
+  for (const status of CHECKIN_STATUS_PRECEDENT) {
+    combinedStats[status] = (statsA[status] ?? 0) + (statsB[status] ?? 0);
+  }
+  return combinedStats;
+}
diff --git a/static/app/views/monitors/details.tsx b/static/app/views/monitors/details.tsx
index 350436d9c4cbf0..9234e99ee72b7c 100644
--- a/static/app/views/monitors/details.tsx
+++ b/static/app/views/monitors/details.tsx
@@ -20,20 +20,20 @@ import type {RouteComponentProps} from 'sentry/types/legacyReactRouter';
 import {setApiQueryData, useApiQuery, useQueryClient} from 'sentry/utils/queryClient';
 import useApi from 'sentry/utils/useApi';
 import useOrganization from 'sentry/utils/useOrganization';
-import DetailsSidebar from 'sentry/views/monitors/components/detailsSidebar';
-import {DetailsTimeline} from 'sentry/views/monitors/components/detailsTimeline';
-import MonitorProcessingErrors from 'sentry/views/monitors/components/processingErrors/monitorProcessingErrors';
-import {makeMonitorErrorsQueryKey} from 'sentry/views/monitors/components/processingErrors/utils';
-import {makeMonitorDetailsQueryKey} from 'sentry/views/monitors/utils';
-
-import MonitorCheckIns from './components/monitorCheckIns';
-import MonitorHeader from './components/monitorHeader';
-import MonitorIssues from './components/monitorIssues';
-import MonitorStats from './components/monitorStats';
-import MonitorOnboarding from './components/onboarding';
+
+import {DetailsSidebar} from './components/detailsSidebar';
+import {DetailsTimeline} from './components/detailsTimeline';
+import {MonitorCheckIns} from './components/monitorCheckIns';
+import {MonitorHeader} from './components/monitorHeader';
+import {MonitorIssues} from './components/monitorIssues';
+import {MonitorStats} from './components/monitorStats';
+import {MonitorOnboarding} from './components/onboarding';
+import {MonitorProcessingErrors} from './components/processingErrors/monitorProcessingErrors';
+import {makeMonitorErrorsQueryKey} from './components/processingErrors/utils';
 import {StatusToggleButton} from './components/statusToggleButton';
 import type {MonitorBucket} from './components/timeline/types';
 import type {CheckinProcessingError, Monitor, ProcessingErrorType} from './types';
+import {makeMonitorDetailsQueryKey} from './utils';
 
 const DEFAULT_POLL_INTERVAL_MS = 5000;
 
diff --git a/static/app/views/monitors/edit.tsx b/static/app/views/monitors/edit.tsx
index b24302c40b96cb..2566163e7a714a 100644
--- a/static/app/views/monitors/edit.tsx
+++ b/static/app/views/monitors/edit.tsx
@@ -14,10 +14,10 @@ import normalizeUrl from 'sentry/utils/url/normalizeUrl';
 import useOrganization from 'sentry/utils/useOrganization';
 import usePageFilters from 'sentry/utils/usePageFilters';
 import {useParams} from 'sentry/utils/useParams';
-import {makeMonitorDetailsQueryKey} from 'sentry/views/monitors/utils';
 
 import MonitorForm from './components/monitorForm';
 import type {Monitor} from './types';
+import {makeMonitorDetailsQueryKey} from './utils';
 
 export default function EditMonitor() {
   const {monitorSlug, projectId} = useParams<{monitorSlug: string; projectId: string}>();
diff --git a/static/app/views/monitors/overview.tsx b/static/app/views/monitors/overview.tsx
index 03f0dfb007a11e..7b52169509b50f 100644
--- a/static/app/views/monitors/overview.tsx
+++ b/static/app/views/monitors/overview.tsx
@@ -30,8 +30,6 @@ import useApi from 'sentry/utils/useApi';
 import {useLocation} from 'sentry/utils/useLocation';
 import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
-import MonitorProcessingErrors from 'sentry/views/monitors/components/processingErrors/monitorProcessingErrors';
-import {makeMonitorListErrorsQueryKey} from 'sentry/views/monitors/components/processingErrors/utils';
 
 import {
   CronsLandingPanel,
@@ -41,6 +39,8 @@ import {
 import {NewMonitorButton} from './components/newMonitorButton';
 import {OverviewTimeline} from './components/overviewTimeline';
 import {OwnerFilter} from './components/ownerFilter';
+import {MonitorProcessingErrors} from './components/processingErrors/monitorProcessingErrors';
+import {makeMonitorListErrorsQueryKey} from './components/processingErrors/utils';
 import type {CheckinProcessingError, Monitor, ProcessingErrorType} from './types';
 import {makeMonitorListQueryKey} from './utils';
 
diff --git a/static/app/views/monitors/utils.tsx b/static/app/views/monitors/utils.tsx
index 46f1c059fd621c..36bc20e5033f6b 100644
--- a/static/app/views/monitors/utils.tsx
+++ b/static/app/views/monitors/utils.tsx
@@ -4,7 +4,8 @@ import {t, tn} from 'sentry/locale';
 import type {SelectValue} from 'sentry/types/core';
 import type {Organization} from 'sentry/types/organization';
 import type {ColorOrAlias} from 'sentry/utils/theme';
-import {CheckInStatus} from 'sentry/views/monitors/types';
+
+import {CheckInStatus} from './types';
 
 export function makeMonitorListQueryKey(
   organization: Organization,
diff --git a/static/app/views/onboarding/components/createProjectsFooter.tsx b/static/app/views/onboarding/components/createProjectsFooter.tsx
index ba2d2f336033a0..0a98f76002f752 100644
--- a/static/app/views/onboarding/components/createProjectsFooter.tsx
+++ b/static/app/views/onboarding/components/createProjectsFooter.tsx
@@ -87,7 +87,7 @@ export function CreateProjectsFooter({
         const response = (await createProject({
           api,
           orgSlug: organization.slug,
-          team: teams[0].slug,
+          team: teams[0]!.slug,
           platform: createProjectForPlatform.key,
           name: createProjectForPlatform.key,
           options: {
@@ -101,7 +101,7 @@ export function CreateProjectsFooter({
         // Note: in the onboarding flow the projects are created based on the platform slug
         const newProjects = Object.keys(onboardingContext.data.projects).reduce(
           (acc, key) => {
-            if (onboardingContext.data.projects[key].slug !== response.slug) {
+            if (onboardingContext.data.projects[key]!.slug !== response.slug) {
               acc[key] = onboardingContext.data.projects[key];
             }
             return acc;
diff --git a/static/app/views/onboarding/createSampleEventButton.spec.tsx b/static/app/views/onboarding/createSampleEventButton.spec.tsx
index 27b6c353f498c3..cf0619200d2728 100644
--- a/static/app/views/onboarding/createSampleEventButton.spec.tsx
+++ b/static/app/views/onboarding/createSampleEventButton.spec.tsx
@@ -1,17 +1,18 @@
 import * as Sentry from '@sentry/react';
 import {OrganizationFixture} from 'sentry-fixture/organization';
 import {ProjectFixture} from 'sentry-fixture/project';
+import {RouterFixture} from 'sentry-fixture/routerFixture';
 
 import {render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrary';
 
 import {trackAnalytics} from 'sentry/utils/analytics';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import CreateSampleEventButton from 'sentry/views/onboarding/createSampleEventButton';
 
 jest.useFakeTimers();
 jest.mock('sentry/utils/analytics');
 
 describe('CreateSampleEventButton', function () {
+  const router = RouterFixture();
   const org = OrganizationFixture();
   const project = ProjectFixture();
   const groupID = '123';
@@ -25,7 +26,7 @@ describe('CreateSampleEventButton', function () {
       >
         {createSampleText}
       </CreateSampleEventButton>,
-      {organization: org}
+      {organization: org, router}
     );
   }
 
@@ -66,7 +67,7 @@ describe('CreateSampleEventButton', function () {
     // Wait for the api request and latestEventAvailable to resolve
     expect(sampleButton).toBeEnabled();
 
-    expect(browserHistory.push).toHaveBeenCalledWith(
+    expect(router.push).toHaveBeenCalledWith(
       `/organizations/${org.slug}/issues/${groupID}/?project=${project.id}&referrer=sample-error`
     );
   });
@@ -107,7 +108,7 @@ describe('CreateSampleEventButton', function () {
     jest.runAllTimers();
     await waitFor(() => expect(latestIssueRequest).toHaveBeenCalled());
 
-    expect(browserHistory.push).toHaveBeenCalledWith(
+    expect(router.push).toHaveBeenCalledWith(
       `/organizations/${org.slug}/issues/${groupID}/?project=${project.id}&referrer=sample-error`
     );
 
diff --git a/static/app/views/onboarding/createSampleEventButton.tsx b/static/app/views/onboarding/createSampleEventButton.tsx
index 2a481cfa9cae3d..3ecb319ff2d264 100644
--- a/static/app/views/onboarding/createSampleEventButton.tsx
+++ b/static/app/views/onboarding/createSampleEventButton.tsx
@@ -40,7 +40,6 @@ async function latestEventAvailable(
 ): Promise<{eventCreated: boolean; retries: number}> {
   let retries = 0;
 
-  // eslint-disable-next-line no-constant-condition
   while (true) {
     if (retries > EVENT_POLL_RETRIES) {
       return {eventCreated: false, retries: retries - 1};
diff --git a/static/app/views/onboarding/onboarding.tsx b/static/app/views/onboarding/onboarding.tsx
index bdff0981554204..146602d7e1d495 100644
--- a/static/app/views/onboarding/onboarding.tsx
+++ b/static/app/views/onboarding/onboarding.tsx
@@ -100,7 +100,7 @@ function Onboarding(props: Props) {
 
   useEffect(() => {
     if (
-      props.location.pathname === `/onboarding/${onboardingSteps[2].id}/` &&
+      props.location.pathname === `/onboarding/${onboardingSteps[2]!.id}/` &&
       props.location.query?.platform &&
       onboardingContext.data.selectedSDK === undefined
     ) {
@@ -113,7 +113,7 @@ function Onboarding(props: Props) {
       // if no platform found, we redirect the user to the platform select page
       if (!platform) {
         props.router.push(
-          normalizeUrl(`/onboarding/${organization.slug}/${onboardingSteps[1].id}/`)
+          normalizeUrl(`/onboarding/${organization.slug}/${onboardingSteps[1]!.id}/`)
         );
         return;
       }
@@ -194,7 +194,7 @@ function Onboarding(props: Props) {
   const goNextStep = useCallback(
     (step: StepDescriptor, platform?: OnboardingSelectedSDK) => {
       const currentStepIndex = onboardingSteps.findIndex(s => s.id === step.id);
-      const nextStep = onboardingSteps[currentStepIndex + 1];
+      const nextStep = onboardingSteps[currentStepIndex + 1]!;
 
       if (nextStep.id === 'setup-docs' && !platform) {
         return;
@@ -217,7 +217,7 @@ function Onboarding(props: Props) {
     const newProjects = Object.keys(onboardingContext.data.projects).reduce(
       (acc, key) => {
         if (
-          onboardingContext.data.projects[key].slug !==
+          onboardingContext.data.projects[key]!.slug !==
           onboardingContext.data.selectedSDK?.key
         ) {
           acc[key] = onboardingContext.data.projects[key];
@@ -271,12 +271,12 @@ function Onboarding(props: Props) {
 
       trackAnalytics('onboarding.back_button_clicked', {
         organization,
-        from: onboardingSteps[stepIndex].id,
+        from: onboardingSteps[stepIndex]!.id,
         to: previousStep.id,
       });
 
       // from selected platform to welcome
-      if (onboardingSteps[stepIndex].id === 'select-platform') {
+      if (onboardingSteps[stepIndex]!.id === 'select-platform') {
         onboardingContext.setData({...onboardingContext.data, selectedSDK: undefined});
 
         props.router.replace(
@@ -286,7 +286,7 @@ function Onboarding(props: Props) {
       }
 
       // from setup docs to selected platform
-      if (onboardingSteps[stepIndex].id === 'setup-docs' && shallProjectBeDeleted) {
+      if (onboardingSteps[stepIndex]!.id === 'setup-docs' && shallProjectBeDeleted) {
         trackAnalytics('onboarding.data_removal_modal_confirm_button_clicked', {
           organization,
           platform: recentCreatedProject.slug,
@@ -338,7 +338,7 @@ function Onboarding(props: Props) {
   if (!stepObj || stepIndex === -1 || isInvalidDocsStep) {
     return (
       <Redirect
-        to={normalizeUrl(`/onboarding/${organization.slug}/${onboardingSteps[0].id}/`)}
+        to={normalizeUrl(`/onboarding/${organization.slug}/${onboardingSteps[0]!.id}/`)}
       />
     );
   }
@@ -392,7 +392,7 @@ function Onboarding(props: Props) {
                 return;
               }
 
-              goToStep(onboardingSteps[i]);
+              goToStep(onboardingSteps[i]!);
             }}
           />
         )}
diff --git a/static/app/views/onboarding/setupDocs.spec.tsx b/static/app/views/onboarding/setupDocs.spec.tsx
index dc15f5d101294b..e58ea082393d91 100644
--- a/static/app/views/onboarding/setupDocs.spec.tsx
+++ b/static/app/views/onboarding/setupDocs.spec.tsx
@@ -387,7 +387,7 @@ describe('Onboarding Setup Docs', function () {
       });
 
       const updateLoaderMock = MockApiClient.addMockResponse({
-        url: `/projects/${organization.slug}/${project.slug}/keys/${PROJECT_KEY.id}/`,
+        url: `/projects/${organization.slug}/${project.slug}/keys/${PROJECT_KEY!.id}/`,
         method: 'PUT',
         body: PROJECT_KEY,
       });
diff --git a/static/app/views/organizationJoinRequest/index.spec.tsx b/static/app/views/organizationJoinRequest/index.spec.tsx
index bf328bf710415f..4f5496344cbb19 100644
--- a/static/app/views/organizationJoinRequest/index.spec.tsx
+++ b/static/app/views/organizationJoinRequest/index.spec.tsx
@@ -83,8 +83,8 @@ describe('OrganizationJoinRequest', function () {
 
     await waitFor(() => {
       expect(postMock).toHaveBeenCalled();
-      expect(addErrorMessage).toHaveBeenCalled();
     });
+    expect(addErrorMessage).toHaveBeenCalled();
 
     expect(screen.getByRole('heading', {name: 'Request to Join'})).toBeInTheDocument();
   });
diff --git a/static/app/views/organizationRestore/index.spec.tsx b/static/app/views/organizationRestore/index.spec.tsx
index 858e6d5b927eb4..1fe8641287df17 100644
--- a/static/app/views/organizationRestore/index.spec.tsx
+++ b/static/app/views/organizationRestore/index.spec.tsx
@@ -6,7 +6,8 @@ import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 import OrganizationRestore from 'sentry/views/organizationRestore';
 
 describe('OrganizationRestore', function () {
-  let mockUpdate, mockGet;
+  let mockUpdate!: jest.Mock;
+  let mockGet!: jest.Mock;
   const pendingDeleteOrg = OrganizationFixture({
     status: {id: 'pending_deletion', name: 'Pending Deletion'},
   });
diff --git a/static/app/views/organizationStats/index.spec.tsx b/static/app/views/organizationStats/index.spec.tsx
index 19a929190da3a3..5cd61766bf3a30 100644
--- a/static/app/views/organizationStats/index.spec.tsx
+++ b/static/app/views/organizationStats/index.spec.tsx
@@ -43,7 +43,7 @@ describe('OrganizationStats', function () {
     routeParams: {},
   };
 
-  let mockRequest;
+  let mockRequest: jest.Mock;
 
   beforeEach(() => {
     MockApiClient.clearMockResponses();
@@ -227,7 +227,7 @@ describe('OrganizationStats', function () {
   });
 
   it('does not leak query params onto next page links', async () => {
-    const dummyLocation = PAGE_QUERY_PARAMS.reduce(
+    const dummyLocation = PAGE_QUERY_PARAMS.reduce<{query: Record<string, string>}>(
       (location, param) => {
         location.query[param] = '';
         return location;
@@ -382,7 +382,7 @@ describe('OrganizationStats', function () {
     });
     await userEvent.click(screen.getByTestId('proj-1'));
     expect(screen.queryByText('My Projects')).not.toBeInTheDocument();
-    expect(screen.getAllByText('proj-1').length).toBe(2);
+    expect(screen.getAllByText('proj-1')).toHaveLength(2);
   });
 
   /**
@@ -453,7 +453,7 @@ describe('OrganizationStats', function () {
     // 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();
+    expect(screen.getByRole('option', {name: 'Profiles'})).toBeInTheDocument();
   });
 
   it('shows only profile duration category when both profiling features are enabled', async () => {
diff --git a/static/app/views/organizationStats/mapSeriesToChart.spec.ts b/static/app/views/organizationStats/mapSeriesToChart.spec.ts
index 34d1739b5f7235..ac94f5880ceb80 100644
--- a/static/app/views/organizationStats/mapSeriesToChart.spec.ts
+++ b/static/app/views/organizationStats/mapSeriesToChart.spec.ts
@@ -173,6 +173,6 @@ describe('mapSeriesToChart func', function () {
     });
 
     // sums up rate limited, abuse, and cardinality limited
-    expect(mappedSeries.cardStats.rateLimited).toEqual('11');
+    expect(mappedSeries.cardStats.rateLimited).toBe('11');
   });
 });
diff --git a/static/app/views/organizationStats/mapSeriesToChart.ts b/static/app/views/organizationStats/mapSeriesToChart.ts
index 58d0744778c5cf..2fb9392832acfa 100644
--- a/static/app/views/organizationStats/mapSeriesToChart.ts
+++ b/static/app/views/organizationStats/mapSeriesToChart.ts
@@ -98,12 +98,12 @@ export function mapSeriesToChart({
       // to get the `accepted_stored` count
       if (category !== 'span_indexed') {
         if (outcome !== Outcome.CLIENT_DISCARD) {
-          count.total += group.totals['sum(quantity)'];
+          count.total += group.totals['sum(quantity)']!;
         }
-        count[outcome] += group.totals['sum(quantity)'];
+        count[outcome!] += group.totals['sum(quantity)']!;
       } else {
         if (outcome === Outcome.ACCEPTED) {
-          countAcceptedStored += group.totals['sum(quantity)'];
+          countAcceptedStored += group.totals['sum(quantity)']!;
         }
       }
 
@@ -112,11 +112,11 @@ export function mapSeriesToChart({
         return;
       }
 
-      group.series['sum(quantity)'].forEach((stat, i) => {
-        const dataObject = {name: orgStats.intervals[i], value: stat};
+      group.series['sum(quantity)']!.forEach((stat, i) => {
+        const dataObject = {name: orgStats.intervals[i]!, value: stat};
 
         const strigfiedReason = String(group.by.reason ?? '');
-        const reason = getReasonGroupName(outcome, strigfiedReason);
+        const reason = getReasonGroupName(outcome!, strigfiedReason);
 
         // Function to handle chart sub-label updates
         const updateChartSubLabels = (
@@ -129,9 +129,9 @@ export function mapSeriesToChart({
 
           if (existingSubLabel) {
             // Check if the existing sub-label's data length matches the intervals length
-            if (existingSubLabel.data.length === group.series['sum(quantity)'].length) {
+            if (existingSubLabel.data.length === group.series['sum(quantity)']!.length) {
               // Update the value of the current interval
-              existingSubLabel.data[i].value += stat;
+              existingSubLabel.data[i]!.value += stat;
             } else {
               // Add a new data object if the length does not match
               existingSubLabel.data.push(dataObject);
@@ -148,7 +148,7 @@ 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;
+            usageStats[i]!.accepted_stored += stat;
             updateChartSubLabels(SeriesTypes.ACCEPTED, 'Stored');
             return;
           }
@@ -156,24 +156,24 @@ export function mapSeriesToChart({
 
         switch (outcome) {
           case Outcome.FILTERED:
-            usageStats[i].filtered += stat;
+            usageStats[i]!.filtered += stat;
             updateChartSubLabels(SeriesTypes.FILTERED);
             break;
           case Outcome.ACCEPTED:
-            usageStats[i].accepted += stat;
+            usageStats[i]!.accepted += stat;
             break;
           case Outcome.CARDINALITY_LIMITED:
           case Outcome.RATE_LIMITED:
           case Outcome.ABUSE:
-            usageStats[i].rateLimited += stat;
+            usageStats[i]!.rateLimited += stat;
             updateChartSubLabels(SeriesTypes.RATE_LIMITED);
             break;
           case Outcome.CLIENT_DISCARD:
-            usageStats[i].clientDiscard += stat;
+            usageStats[i]!.clientDiscard += stat;
             updateChartSubLabels(SeriesTypes.CLIENT_DISCARD);
             break;
           case Outcome.INVALID:
-            usageStats[i].invalid += stat;
+            usageStats[i]!.invalid += stat;
             updateChartSubLabels(SeriesTypes.INVALID);
             break;
           default:
diff --git a/static/app/views/organizationStats/teamInsights/health.spec.tsx b/static/app/views/organizationStats/teamInsights/health.spec.tsx
index 0e940854913b91..d30218ee5c9a79 100644
--- a/static/app/views/organizationStats/teamInsights/health.spec.tsx
+++ b/static/app/views/organizationStats/teamInsights/health.spec.tsx
@@ -220,7 +220,7 @@ describe('TeamStatsHealth', () => {
     await userEvent.type(screen.getByText('#backend'), '{mouseDown}');
     expect(screen.getByText('#frontend')).toBeInTheDocument();
     // Org owners can see all teams including ones they are not members of
-    expect(screen.queryByText('#internal')).toBeInTheDocument();
+    expect(screen.getByText('#internal')).toBeInTheDocument();
     await userEvent.click(screen.getByText('#internal'));
     expect(router.push).toHaveBeenCalledWith(
       expect.objectContaining({query: {team: team3.id}})
diff --git a/static/app/views/organizationStats/teamInsights/issues.spec.tsx b/static/app/views/organizationStats/teamInsights/issues.spec.tsx
index db46effdc06640..b03494418af5d7 100644
--- a/static/app/views/organizationStats/teamInsights/issues.spec.tsx
+++ b/static/app/views/organizationStats/teamInsights/issues.spec.tsx
@@ -181,7 +181,7 @@ describe('TeamStatsIssues', () => {
     await userEvent.type(screen.getByText('#backend'), '{mouseDown}');
     expect(screen.getByText('#frontend')).toBeInTheDocument();
     // Org owners can see all teams including ones they are not members of
-    expect(screen.queryByText('#internal')).toBeInTheDocument();
+    expect(screen.getByText('#internal')).toBeInTheDocument();
     await userEvent.click(screen.getByText('#internal'));
     expect(router.push).toHaveBeenCalledWith(
       expect.objectContaining({query: {team: team3.id}})
diff --git a/static/app/views/organizationStats/teamInsights/teamIssuesBreakdown.tsx b/static/app/views/organizationStats/teamInsights/teamIssuesBreakdown.tsx
index e64dd98a3e602f..519685bf1dd3bd 100644
--- a/static/app/views/organizationStats/teamInsights/teamIssuesBreakdown.tsx
+++ b/static/app/views/organizationStats/teamInsights/teamIssuesBreakdown.tsx
@@ -139,11 +139,13 @@ function TeamIssuesBreakdown({
   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))
+    .filter(projectId => (hasResults ? projectTotals[projectId]!.total !== 0 : true))
     .map(
       (projectId, idx): BarChartSeries => ({
         seriesName: ProjectsStore.getById(projectId)?.slug ?? projectId,
-        data: sortSeriesByDay(convertDayValueObjectToSeries(allReviewedByDay[projectId])),
+        data: sortSeriesByDay(
+          convertDayValueObjectToSeries(allReviewedByDay[projectId]!)
+        ),
         animationDuration: 500,
         animationDelay: idx * 500,
         silent: true,
@@ -202,10 +204,10 @@ function TeamIssuesBreakdown({
                     </ProjectBadgeContainer>
                     {statuses.map(action => (
                       <AlignRight key={action}>
-                        {projectTotals[projectId][action]}
+                        {projectTotals[projectId]![action]}
                       </AlignRight>
                     ))}
-                    <AlignRight>{projectTotals[projectId].total}</AlignRight>
+                    <AlignRight>{projectTotals[projectId]!.total}</AlignRight>
                   </Fragment>
                 );
               })}
diff --git a/static/app/views/organizationStats/teamInsights/teamStability.tsx b/static/app/views/organizationStats/teamInsights/teamStability.tsx
index f14db41f343a5f..ac16c5e42a4cec 100644
--- a/static/app/views/organizationStats/teamInsights/teamStability.tsx
+++ b/static/app/views/organizationStats/teamInsights/teamStability.tsx
@@ -137,14 +137,14 @@ function TeamStability({
     const sumSessionsCount = Math.floor(sumSessions.length / 7);
     const countSeriesWeeklyTotals: number[] = new Array(sumSessionsCount).fill(0);
     countSeries.forEach(
-      (s, idx) => (countSeriesWeeklyTotals[Math.floor(idx / 7)] += s.value)
+      (s, idx) => (countSeriesWeeklyTotals[Math.floor(idx / 7)]! += s.value)
     );
 
     const sumSessionsWeeklyTotals: number[] = new Array(sumSessionsCount).fill(0);
-    sumSessions.forEach((s, idx) => (sumSessionsWeeklyTotals[Math.floor(idx / 7)] += s));
+    sumSessions.forEach((s, idx) => (sumSessionsWeeklyTotals[Math.floor(idx / 7)]! += s));
 
     const data = countSeriesWeeklyTotals.map((value, idx) => ({
-      name: countSeries[idx * 7].name,
+      name: countSeries[idx * 7]!.name,
       value: sumSessionsWeeklyTotals[idx]
         ? formatFloat((value / sumSessionsWeeklyTotals[idx]) * 100, 2)
         : 0,
diff --git a/static/app/views/organizationStats/teamInsights/teamUnresolvedIssues.tsx b/static/app/views/organizationStats/teamInsights/teamUnresolvedIssues.tsx
index 9f4310b7ccde35..a3e044f45c6ae4 100644
--- a/static/app/views/organizationStats/teamInsights/teamUnresolvedIssues.tsx
+++ b/static/app/views/organizationStats/teamInsights/teamUnresolvedIssues.tsx
@@ -158,7 +158,7 @@ export function TeamUnresolvedIssues({
               ]}
             >
               {groupedProjects.map(({project}, idx) => {
-                const totals = projectTotals[project.id] ?? {};
+                const totals = projectTotals[project.id]! ?? {};
 
                 if (idx >= COLLAPSE_COUNT && !isExpanded) {
                   return null;
diff --git a/static/app/views/organizationStats/usageChart/index.tsx b/static/app/views/organizationStats/usageChart/index.tsx
index 02daeb9f36225c..09696db26017a8 100644
--- a/static/app/views/organizationStats/usageChart/index.tsx
+++ b/static/app/views/organizationStats/usageChart/index.tsx
@@ -418,11 +418,11 @@ function UsageChartBody({
   const colors = categoryColors?.length
     ? categoryColors
     : [
-        theme.outcome[Outcome.ACCEPTED],
-        theme.outcome[Outcome.FILTERED],
-        theme.outcome[Outcome.RATE_LIMITED],
-        theme.outcome[Outcome.INVALID],
-        theme.outcome[Outcome.CLIENT_DISCARD],
+        theme.outcome[Outcome.ACCEPTED]!,
+        theme.outcome[Outcome.FILTERED]!,
+        theme.outcome[Outcome.RATE_LIMITED]!,
+        theme.outcome[Outcome.INVALID]!,
+        theme.outcome[Outcome.CLIENT_DISCARD]!,
         theme.chartOther, // Projected
       ];
 
@@ -514,7 +514,7 @@ function UsageChartBody({
         },
         axisLabel: {
           interval: function (index: number) {
-            return xAxisLabelVisibility[index];
+            return xAxisLabelVisibility[index]!;
           },
           formatter: (label: string) => label.slice(0, 6), // Limit label to 6 chars
         },
diff --git a/static/app/views/organizationStats/usageChart/utils.tsx b/static/app/views/organizationStats/usageChart/utils.tsx
index 7fbd2db25f6039..5229c0a3445bb1 100644
--- a/static/app/views/organizationStats/usageChart/utils.tsx
+++ b/static/app/views/organizationStats/usageChart/utils.tsx
@@ -106,7 +106,7 @@ export function getXAxisLabelVisibility(dataPeriod: number, intervals: string[])
 
   // Collect unique labels and their positions
   intervals.forEach((label, index) => {
-    if (index === 0 || label.slice(0, 6) !== intervals[index - 1].slice(0, 6)) {
+    if (index === 0 || label.slice(0, 6) !== intervals[index - 1]!.slice(0, 6)) {
       uniqueLabels.add(label);
       labelToPositionMap.set(label, index);
     }
diff --git a/static/app/views/organizationStats/usageStatsPerMin.tsx b/static/app/views/organizationStats/usageStatsPerMin.tsx
index 0bfc4369cc8df5..5f2a510ddd7d1b 100644
--- a/static/app/views/organizationStats/usageStatsPerMin.tsx
+++ b/static/app/views/organizationStats/usageStatsPerMin.tsx
@@ -78,7 +78,7 @@ function UsageStatsPerMin({
         }
       }
 
-      count += group.series['sum(quantity)'][lastMin];
+      count += group.series['sum(quantity)']![lastMin]!;
       return count;
     }, 0);
 
diff --git a/static/app/views/organizationStats/usageStatsProjects.tsx b/static/app/views/organizationStats/usageStatsProjects.tsx
index 6aa298b390d2d6..eb6f61a6dffb87 100644
--- a/static/app/views/organizationStats/usageStatsProjects.tsx
+++ b/static/app/views/organizationStats/usageStatsProjects.tsx
@@ -393,20 +393,20 @@ class UsageStatsProjects extends DeprecatedAsyncComponent<Props, State> {
           return;
         }
 
-        if (!projectSet.has(projectId.toString())) {
+        if (!projectSet.has(projectId!.toString())) {
           return;
         }
 
-        if (!stats[projectId]) {
-          stats[projectId] = {...baseStat};
+        if (!stats[projectId!]) {
+          stats[projectId!] = {...baseStat};
         }
 
         if (outcome !== Outcome.CLIENT_DISCARD && category !== 'span_indexed') {
-          stats[projectId].total += group.totals['sum(quantity)'];
+          stats[projectId!]!.total += group.totals['sum(quantity)']!;
         }
 
         if (category === 'span_indexed' && outcome === Outcome.ACCEPTED) {
-          stats[projectId].accepted_stored += group.totals['sum(quantity)'];
+          stats[projectId!]!.accepted_stored += group.totals['sum(quantity)']!;
           return;
         }
 
@@ -415,7 +415,7 @@ class UsageStatsProjects extends DeprecatedAsyncComponent<Props, State> {
           outcome === Outcome.FILTERED ||
           outcome === Outcome.INVALID
         ) {
-          stats[projectId][outcome] += group.totals['sum(quantity)'];
+          stats[projectId!]![outcome!] += group.totals['sum(quantity)']!;
         }
 
         if (
@@ -423,7 +423,7 @@ class UsageStatsProjects extends DeprecatedAsyncComponent<Props, State> {
           outcome === Outcome.CARDINALITY_LIMITED ||
           outcome === Outcome.ABUSE
         ) {
-          stats[projectId][SortBy.RATE_LIMITED] += group.totals['sum(quantity)'];
+          stats[projectId!]![SortBy.RATE_LIMITED] += group.totals['sum(quantity)']!;
         }
       });
 
diff --git a/static/app/views/organizationStats/usageTable.tsx b/static/app/views/organizationStats/usageTable.tsx
index 7981d0eaf99227..fa68d18d17cf89 100644
--- a/static/app/views/organizationStats/usageTable.tsx
+++ b/static/app/views/organizationStats/usageTable.tsx
@@ -17,6 +17,7 @@ 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';
+// eslint-disable-next-line no-restricted-imports
 import withSentryRouter from 'sentry/utils/withSentryRouter';
 
 import {formatUsageWithUnits, getFormatUsageOptions} from './utils';
diff --git a/static/app/views/organizationStats/utils.spec.tsx b/static/app/views/organizationStats/utils.spec.tsx
index c50f7fa1f3d3bf..2aff9731b68bb7 100644
--- a/static/app/views/organizationStats/utils.spec.tsx
+++ b/static/app/views/organizationStats/utils.spec.tsx
@@ -116,7 +116,7 @@ describe('formatUsageWithUnits', function () {
       formatUsageWithUnits(1234 * BILLION, DATA_CATEGORY_INFO.attachment.plural, {
         isAbbreviated: true,
       })
-    ).toBe('1K GB');
+    ).toBe('1.2K GB');
 
     expect(
       formatUsageWithUnits(0, DATA_CATEGORY_INFO.attachment.plural, {
diff --git a/static/app/views/organizationStats/utils.tsx b/static/app/views/organizationStats/utils.tsx
index 0e51ce56d3bf09..ddf736b2bdb875 100644
--- a/static/app/views/organizationStats/utils.tsx
+++ b/static/app/views/organizationStats/utils.tsx
@@ -90,7 +90,7 @@ export function abbreviateUsageNumber(n: number) {
   }
 
   if (n >= 1000) {
-    return (n / 1000).toFixed().toLocaleString() + 'K';
+    return (n / 1000).toLocaleString(undefined, {maximumFractionDigits: 1}) + 'K';
   }
 
   // Do not show decimals
diff --git a/static/app/views/performance/charts/chart.tsx b/static/app/views/performance/charts/chart.tsx
index 22b0ba9d932924..d06d41014abba2 100644
--- a/static/app/views/performance/charts/chart.tsx
+++ b/static/app/views/performance/charts/chart.tsx
@@ -82,7 +82,7 @@ function Chart({
     return null;
   }
 
-  const colors = chartColors ?? theme.charts.getColorPalette(4);
+  const colors = chartColors ?? theme.charts.getColorPalette(4)!;
 
   const durationOnly = data.every(
     value => aggregateOutputType(value.seriesName) === 'duration'
@@ -115,7 +115,7 @@ function Chart({
             formatter(value: number) {
               return axisLabelFormatter(
                 value,
-                aggregateOutputType(data[0].seriesName),
+                aggregateOutputType(data[0]!.seriesName),
                 undefined,
                 durationUnit
               );
@@ -134,7 +134,7 @@ function Chart({
             formatter(value: number) {
               return axisLabelFormatter(
                 value,
-                aggregateOutputType(data[0].seriesName),
+                aggregateOutputType(data[0]!.seriesName),
                 undefined,
                 durationUnit
               );
@@ -151,7 +151,7 @@ function Chart({
             formatter(value: number) {
               return axisLabelFormatter(
                 value,
-                aggregateOutputType(data[1].seriesName),
+                aggregateOutputType(data[1]!.seriesName),
                 undefined,
                 durationUnit
               );
@@ -193,12 +193,12 @@ function Chart({
     utc,
     isGroupedByDate: true,
     showTimeInTooltip: true,
-    colors: [colors[0], colors[1]] as string[],
+    colors: [colors[0]!, colors[1]!],
     tooltip: {
       valueFormatter: (value, seriesName) => {
         return tooltipFormatter(
           value,
-          aggregateOutputType(data?.length ? data[0].seriesName : seriesName)
+          aggregateOutputType(data?.length ? data[0]!.seriesName : seriesName)
         );
       },
       nameFormatter(value: string) {
diff --git a/static/app/views/performance/charts/index.tsx b/static/app/views/performance/charts/index.tsx
index 179c59cef96f8f..372cd9ad005bcc 100644
--- a/static/app/views/performance/charts/index.tsx
+++ b/static/app/views/performance/charts/index.tsx
@@ -81,7 +81,7 @@ class Container extends Component<Props> {
           showLoading={false}
           query={apiPayload.query}
           includePrevious={false}
-          yAxis={axisOptions.map(opt => opt.value)}
+          yAxis={axisOptions.map(opt => opt!.value)}
           partial
         >
           {({loading, reloading, errored, results}) => {
@@ -97,13 +97,13 @@ class Container extends Component<Props> {
               <Fragment>
                 <DoubleHeaderContainer>
                   {axisOptions.map((option, i) => (
-                    <div key={`${option.label}:${i}`}>
+                    <div key={`${option!.label}:${i}`}>
                       <HeaderTitle>
-                        {option.label}
+                        {option!.label}
                         <QuestionTooltip
                           position="top"
                           size="sm"
-                          title={option.tooltip}
+                          title={option!.tooltip}
                         />
                       </HeaderTitle>
                     </div>
@@ -132,8 +132,8 @@ class Container extends Component<Props> {
         </EventsRequest>
         <Footer
           api={api}
-          leftAxis={axisOptions[0].value}
-          rightAxis={axisOptions[1].value}
+          leftAxis={axisOptions[0]!.value}
+          rightAxis={axisOptions[1]!.value}
           organization={organization}
           eventView={eventView}
           location={location}
diff --git a/static/app/views/performance/content.spec.tsx b/static/app/views/performance/content.spec.tsx
index 54eee53f89b7ea..e42e698f126938 100644
--- a/static/app/views/performance/content.spec.tsx
+++ b/static/app/views/performance/content.spec.tsx
@@ -8,14 +8,15 @@ import * as pageFilters from 'sentry/actionCreators/pageFilters';
 import OrganizationStore from 'sentry/stores/organizationStore';
 import ProjectsStore from 'sentry/stores/projectsStore';
 import TeamStore from 'sentry/stores/teamStore';
-import {browserHistory} from 'sentry/utils/browserHistory';
+import type {InjectedRouter} from 'sentry/types/legacyReactRouter';
+import type {Project} from 'sentry/types/project';
 import {MEPSettingProvider} from 'sentry/utils/performance/contexts/metricsEnhancedSetting';
 import PerformanceContent from 'sentry/views/performance/content';
 import {DEFAULT_MAX_DURATION} from 'sentry/views/performance/trends/utils';
 
 const FEATURES = ['performance-view'];
 
-function WrappedComponent({router}) {
+function WrappedComponent({router}: {router: InjectedRouter}) {
   return (
     <MEPSettingProvider>
       <PerformanceContent router={router} location={router.location} />
@@ -23,7 +24,11 @@ function WrappedComponent({router}) {
   );
 }
 
-function initializeData(projects, query, features = FEATURES) {
+function initializeData(
+  projects: Project[],
+  query: Record<string, string | string[] | undefined>,
+  features = FEATURES
+) {
   const organization = OrganizationFixture({
     features,
   });
@@ -42,7 +47,10 @@ function initializeData(projects, query, features = FEATURES) {
   return initialData;
 }
 
-function initializeTrendsData(query, addDefaultQuery = true) {
+function initializeTrendsData(
+  query: Record<string, string | string[] | undefined>,
+  addDefaultQuery = true
+) {
   const projects = [
     ProjectFixture({id: '1', firstTransactionEvent: false}),
     ProjectFixture({id: '2', firstTransactionEvent: true}),
@@ -75,7 +83,6 @@ function initializeTrendsData(query, addDefaultQuery = true) {
 describe('Performance > Content', function () {
   beforeEach(function () {
     act(() => void TeamStore.loadInitialData([], false, null));
-    browserHistory.push = jest.fn();
     jest.spyOn(pageFilters, 'updateDateTime');
 
     MockApiClient.addMockResponse({
@@ -275,7 +282,7 @@ describe('Performance > Content', function () {
     const {router} = initializeData(projects, {});
 
     render(<WrappedComponent router={router} />, {
-      router: router,
+      router,
     });
 
     expect(await screen.findByTestId('performance-landing-v3')).toBeInTheDocument();
@@ -288,14 +295,14 @@ describe('Performance > Content', function () {
       ProjectFixture({id: '1', firstTransactionEvent: false}),
       ProjectFixture({id: '2', firstTransactionEvent: true}),
     ];
-    const {router} = initializeData(projects, {project: [1]});
+    const {router} = initializeData(projects, {project: ['1']});
 
     render(<WrappedComponent router={router} />, {
-      router: router,
+      router,
     });
 
     expect(await screen.findByTestId('performance-landing-v3')).toBeInTheDocument();
-    expect(screen.queryByText('Pinpoint problems')).toBeInTheDocument();
+    expect(screen.getByText('Pinpoint problems')).toBeInTheDocument();
     expect(screen.queryByTestId('performance-table')).not.toBeInTheDocument();
   });
 
@@ -307,7 +314,7 @@ describe('Performance > Content', function () {
     const {router} = initializeData(projects, {project: ['-1']});
 
     render(<WrappedComponent router={router} />, {
-      router: router,
+      router,
     });
     expect(await screen.findByTestId('performance-landing-v3')).toBeInTheDocument();
     expect(screen.queryByText('Pinpoint problems')).not.toBeInTheDocument();
@@ -318,7 +325,7 @@ describe('Performance > Content', function () {
     const {router} = initializeData(projects, {project: ['1'], query: 'sentry:yes'});
 
     render(<WrappedComponent router={router} />, {
-      router: router,
+      router,
     });
 
     expect(await screen.findByTestId('performance-landing-v3')).toBeInTheDocument();
@@ -339,7 +346,7 @@ describe('Performance > Content', function () {
   it('Default period for trends does not call updateDateTime', async function () {
     const {router} = initializeTrendsData({query: 'tag:value'}, false);
     render(<WrappedComponent router={router} />, {
-      router: router,
+      router,
     });
 
     expect(await screen.findByTestId('performance-landing-v3')).toBeInTheDocument();
@@ -354,7 +361,7 @@ describe('Performance > Content', function () {
     });
 
     render(<WrappedComponent router={router} />, {
-      router: router,
+      router,
     });
 
     expect(await screen.findByTestId('performance-landing-v3')).toBeInTheDocument();
@@ -364,7 +371,7 @@ describe('Performance > Content', function () {
 
     expect(pageFilters.updateDateTime).toHaveBeenCalledTimes(0);
 
-    expect(browserHistory.push).toHaveBeenCalledWith(
+    expect(router.push).toHaveBeenCalledWith(
       expect.objectContaining({
         pathname: '/organizations/org-slug/performance/trends/',
         query: {
@@ -383,35 +390,35 @@ describe('Performance > Content', function () {
     const {router} = initializeData(projects, {view: undefined});
 
     render(<WrappedComponent router={router} />, {
-      router: router,
+      router,
     });
     expect(await screen.findByTestId('performance-landing-v3')).toBeInTheDocument();
 
-    expect(browserHistory.push).toHaveBeenCalledTimes(0);
+    expect(router.push).toHaveBeenCalledTimes(0);
   });
 
   it('Default page (transactions) with trends feature will not update filters if none are set', async function () {
     const {router} = initializeTrendsData({view: undefined}, false);
 
     render(<WrappedComponent router={router} />, {
-      router: router,
+      router,
     });
     expect(await screen.findByTestId('performance-landing-v3')).toBeInTheDocument();
-    expect(browserHistory.push).toHaveBeenCalledTimes(0);
+    expect(router.push).toHaveBeenCalledTimes(0);
   });
 
   it('Tags are replaced with trends default query if navigating to trends', async function () {
     const {router} = initializeTrendsData({query: 'device.family:Mac'}, false);
 
     render(<WrappedComponent router={router} />, {
-      router: router,
+      router,
     });
 
     const trendsLinks = await screen.findAllByTestId('landing-header-trends');
-    await userEvent.click(trendsLinks[0]);
+    await userEvent.click(trendsLinks[0]!);
 
     expect(await screen.findByTestId('performance-landing-v3')).toBeInTheDocument();
-    expect(browserHistory.push).toHaveBeenCalledWith(
+    expect(router.push).toHaveBeenCalledWith(
       expect.objectContaining({
         pathname: '/organizations/org-slug/performance/trends/',
         query: {
@@ -429,10 +436,10 @@ describe('Performance > Content', function () {
     const {router} = initializeData(projects, {view: undefined});
 
     render(<WrappedComponent router={router} />, {
-      router: router,
+      router,
     });
 
     expect(await screen.findByTestId('performance-landing-v3')).toBeInTheDocument();
-    expect(screen.queryByTestId('create-sample-transaction-btn')).toBeInTheDocument();
+    expect(screen.getByTestId('create-sample-transaction-btn')).toBeInTheDocument();
   });
 });
diff --git a/static/app/views/performance/data.spec.tsx b/static/app/views/performance/data.spec.tsx
index ad2ad7fc91138b..c9bd0869110ca7 100644
--- a/static/app/views/performance/data.spec.tsx
+++ b/static/app/views/performance/data.spec.tsx
@@ -22,10 +22,10 @@ describe('generatePerformanceEventView()', function () {
     );
 
     expect(result.id).toBeUndefined();
-    expect(result.name).toEqual('Performance');
+    expect(result.name).toBe('Performance');
     expect(result.fields.length).toBeGreaterThanOrEqual(7);
-    expect(result.query).toEqual('');
-    expect(result.getQueryWithAdditionalConditions()).toEqual('event.type:transaction');
+    expect(result.query).toBe('');
+    expect(result.getQueryWithAdditionalConditions()).toBe('event.type:transaction');
     expect(result.sorts).toEqual([{kind: 'desc', field: 'tpm'}]);
     expect(result.statsPeriod).toEqual(DEFAULT_STATS_PERIOD);
   });
@@ -51,7 +51,7 @@ describe('generatePerformanceEventView()', function () {
     );
     expect(result.start).toBeUndefined();
     expect(result.end).toBeUndefined();
-    expect(result.statsPeriod).toEqual('90d');
+    expect(result.statsPeriod).toBe('90d');
   });
 
   it('does not apply range when start and end are present', function () {
@@ -63,8 +63,8 @@ describe('generatePerformanceEventView()', function () {
       {},
       organization
     );
-    expect(result.start).toEqual('2020-04-25T12:00:00.000');
-    expect(result.end).toEqual('2020-05-25T12:00:00.000');
+    expect(result.start).toBe('2020-04-25T12:00:00.000');
+    expect(result.end).toBe('2020-05-25T12:00:00.000');
     expect(result.statsPeriod).toBeUndefined();
   });
 
@@ -139,6 +139,6 @@ describe('generatePerformanceEventView()', function () {
       {withStaticFilters: true},
       organization
     );
-    expect(result.query).toEqual('transaction:*auth*');
+    expect(result.query).toBe('transaction:*auth*');
   });
 });
diff --git a/static/app/views/performance/landing/chart/durationChart.tsx b/static/app/views/performance/landing/chart/durationChart.tsx
index 436b626e2e4b98..8a666a79ba5c98 100644
--- a/static/app/views/performance/landing/chart/durationChart.tsx
+++ b/static/app/views/performance/landing/chart/durationChart.tsx
@@ -19,7 +19,8 @@ import {useLocation} from 'sentry/utils/useLocation';
 
 import Chart from '../../charts/chart';
 import {DoubleHeaderContainer} from '../../styles';
-import {getFieldOrBackup} from '../display/utils';
+
+import {getFieldOrBackup} from './utils';
 
 type Props = {
   eventView: EventView;
diff --git a/static/app/views/performance/landing/chart/histogramChart.tsx b/static/app/views/performance/landing/chart/histogramChart.tsx
index ca299d947fe3d3..df7753e4ce83f3 100644
--- a/static/app/views/performance/landing/chart/histogramChart.tsx
+++ b/static/app/views/performance/landing/chart/histogramChart.tsx
@@ -27,7 +27,8 @@ import {
 } from 'sentry/utils/performance/histogram/utils';
 
 import {DoubleHeaderContainer} from '../../styles';
-import {getFieldOrBackup} from '../display/utils';
+
+import {getFieldOrBackup} from './utils';
 
 const NUM_BUCKETS = 50;
 const PRECISION = 0;
diff --git a/static/app/views/performance/landing/chart/utils.tsx b/static/app/views/performance/landing/chart/utils.tsx
new file mode 100644
index 00000000000000..d711b1fc4f3982
--- /dev/null
+++ b/static/app/views/performance/landing/chart/utils.tsx
@@ -0,0 +1,3 @@
+export function getFieldOrBackup(field: string, backupField?: string) {
+  return backupField ?? field;
+}
diff --git a/static/app/views/performance/landing/data.tsx b/static/app/views/performance/landing/data.tsx
index 84833e8ae26af8..171d4acc8de49b 100644
--- a/static/app/views/performance/landing/data.tsx
+++ b/static/app/views/performance/landing/data.tsx
@@ -1,60 +1,60 @@
 export const FRONTEND_PAGELOAD_COLUMN_TITLES = [
-  'transaction',
-  'project',
-  'tpm',
-  'FCP',
-  'LCP',
-  'FID',
-  'CLS',
-  'users',
-  'user misery',
+  {title: 'transaction'},
+  {title: 'project'},
+  {title: 'tpm'},
+  {title: 'FCP'},
+  {title: 'LCP'},
+  {title: 'FID'},
+  {title: 'CLS'},
+  {title: 'users'},
+  {title: 'user misery'},
 ];
 
 export const FRONTEND_OTHER_COLUMN_TITLES = [
-  'transaction',
-  'operation',
-  'project',
-  'tpm',
-  'p50()',
-  'p75()',
-  'p95()',
-  'users',
-  'user misery',
+  {title: 'transaction'},
+  {title: 'operation'},
+  {title: 'project'},
+  {title: 'tpm'},
+  {title: 'p50()'},
+  {title: 'p75()'},
+  {title: 'p95()'},
+  {title: 'users'},
+  {title: 'user misery'},
 ];
 
 export const BACKEND_COLUMN_TITLES = [
-  'http method',
-  'transaction',
-  'operation',
-  'project',
-  'tpm',
-  'p50',
-  'p95',
-  'failure rate',
-  'apdex',
-  'users',
-  'user misery',
+  {title: 'http method'},
+  {title: 'transaction'},
+  {title: 'operation'},
+  {title: 'project'},
+  {title: 'tpm'},
+  {title: 'p50'},
+  {title: 'p95'},
+  {title: 'failure rate'},
+  {title: 'apdex'},
+  {title: 'users'},
+  {title: 'user misery'},
 ];
 
 export const MOBILE_COLUMN_TITLES = [
-  'transaction',
-  'operation',
-  'project',
-  'tpm',
-  'slow frame %',
-  'frozen frame %',
-  'users',
-  'user misery',
+  {title: 'transaction'},
+  {title: 'operation'},
+  {title: 'project'},
+  {title: 'tpm'},
+  {title: 'slow frame %'},
+  {title: 'frozen frame %'},
+  {title: 'users'},
+  {title: 'user misery'},
 ];
 
 export const REACT_NATIVE_COLUMN_TITLES = [
-  'transaction',
-  'operation',
-  'project',
-  'tpm',
-  'slow frame %',
-  'frozen frame %',
-  'stall %',
-  'users',
-  'user misery',
+  {title: 'transaction'},
+  {title: 'operation'},
+  {title: 'project'},
+  {title: 'tpm'},
+  {title: 'slow frame %'},
+  {title: 'frozen frame %'},
+  {title: 'stall %'},
+  {title: 'users'},
+  {title: 'user misery'},
 ];
diff --git a/static/app/views/performance/landing/display/doubleAxisDisplay.tsx b/static/app/views/performance/landing/display/doubleAxisDisplay.tsx
deleted file mode 100644
index 349797e300afea..00000000000000
--- a/static/app/views/performance/landing/display/doubleAxisDisplay.tsx
+++ /dev/null
@@ -1,110 +0,0 @@
-import {useState} from 'react';
-import styled from '@emotion/styled';
-import type {Location} from 'history';
-
-import Panel from 'sentry/components/panels/panel';
-import {space} from 'sentry/styles/space';
-import type {Organization} from 'sentry/types/organization';
-import {trackAnalytics} from 'sentry/utils/analytics';
-import {browserHistory} from 'sentry/utils/browserHistory';
-import type EventView from 'sentry/utils/discover/eventView';
-import {MutableSearch} from 'sentry/utils/tokenizeSearch';
-import withApi from 'sentry/utils/withApi';
-
-import _Footer from '../../charts/footer';
-import type {AxisOption} from '../../data';
-import {getTransactionSearchQuery} from '../../utils';
-
-import {SingleAxisChart} from './singleAxisChart';
-import {getAxisOrBackupAxis, getBackupAxes} from './utils';
-
-type Props = {
-  axisOptions: AxisOption[];
-  eventView: EventView;
-  leftAxis: AxisOption;
-  location: Location;
-  organization: Organization;
-  rightAxis: AxisOption;
-};
-
-function DoubleAxisDisplay(props: Props) {
-  const {eventView, location, organization, axisOptions, leftAxis, rightAxis} = props;
-
-  const [usingBackupAxis, setUsingBackupAxis] = useState(false);
-
-  const onFilterChange = (field: string) => (minValue, maxValue) => {
-    const filterString = getTransactionSearchQuery(location);
-
-    const conditions = new MutableSearch(filterString);
-    conditions.setFilterValues(field, [
-      `>=${Math.round(minValue)}`,
-      `<${Math.round(maxValue)}`,
-    ]);
-    const query = conditions.formatString();
-    trackAnalytics('performance_views.landingv2.display.filter_change', {
-      organization,
-
-      field,
-      min_value: parseInt(minValue, 10),
-      max_value: parseInt(maxValue, 10),
-    });
-
-    browserHistory.push({
-      pathname: location.pathname,
-      query: {
-        ...location.query,
-        query: String(query).trim(),
-      },
-    });
-  };
-
-  const didReceiveMultiAxis = (useBackup: boolean) => {
-    setUsingBackupAxis(useBackup);
-  };
-
-  const leftAxisOrBackup = getAxisOrBackupAxis(leftAxis, usingBackupAxis);
-  const rightAxisOrBackup = getAxisOrBackupAxis(rightAxis, usingBackupAxis);
-
-  const optionsOrBackup = getBackupAxes(axisOptions, usingBackupAxis);
-
-  return (
-    <Panel>
-      <DoubleChartContainer>
-        <SingleAxisChart
-          axis={leftAxis}
-          onFilterChange={onFilterChange(leftAxis.field)}
-          didReceiveMultiAxis={didReceiveMultiAxis}
-          usingBackupAxis={usingBackupAxis}
-          {...props}
-        />
-        <SingleAxisChart
-          axis={rightAxis}
-          onFilterChange={onFilterChange(rightAxis.field)}
-          didReceiveMultiAxis={didReceiveMultiAxis}
-          usingBackupAxis={usingBackupAxis}
-          {...props}
-        />
-      </DoubleChartContainer>
-
-      <Footer
-        options={optionsOrBackup}
-        leftAxis={leftAxisOrBackup.value}
-        rightAxis={rightAxisOrBackup.value}
-        organization={organization}
-        eventView={eventView}
-        location={location}
-      />
-    </Panel>
-  );
-}
-
-const DoubleChartContainer = styled('div')`
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  gap: ${space(3)};
-  min-height: 282px;
-`;
-
-const Footer = withApi(_Footer);
-
-export default DoubleAxisDisplay;
diff --git a/static/app/views/performance/landing/display/singleAxisChart.tsx b/static/app/views/performance/landing/display/singleAxisChart.tsx
deleted file mode 100644
index 2984a602de5983..00000000000000
--- a/static/app/views/performance/landing/display/singleAxisChart.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-import type {Location} from 'history';
-
-import type {Organization} from 'sentry/types/organization';
-import type EventView from 'sentry/utils/discover/eventView';
-
-import _Footer from '../../charts/footer';
-import type {AxisOption} from '../../data';
-import DurationChart from '../chart/durationChart';
-import HistogramChart from '../chart/histogramChart';
-
-import {getAxisOrBackupAxis, getBackupField} from './utils';
-
-type DisplayProps = {
-  axis: AxisOption;
-  eventView: EventView;
-  location: Location;
-  onFilterChange: (minValue: number, maxValue: number) => void;
-  organization: Organization;
-  usingBackupAxis: boolean;
-  // only used for distribution graphs
-  didReceiveMultiAxis?: (useBackup: boolean) => void;
-};
-
-export function SingleAxisChart(props: DisplayProps) {
-  const {
-    axis,
-    onFilterChange,
-    eventView,
-    organization,
-    location,
-    didReceiveMultiAxis,
-    usingBackupAxis,
-  } = props;
-
-  const backupField = getBackupField(axis);
-
-  function didReceiveMulti(dataCounts: Record<string, number>) {
-    if (!didReceiveMultiAxis) {
-      return;
-    }
-    if (dataCounts[axis.field]) {
-      didReceiveMultiAxis(false);
-      return;
-    }
-    if (backupField && dataCounts[backupField]) {
-      didReceiveMultiAxis(true);
-      return;
-    }
-  }
-
-  const axisOrBackup = getAxisOrBackupAxis(axis, usingBackupAxis);
-
-  return axis.isDistribution ? (
-    <HistogramChart
-      field={axis.field}
-      eventView={eventView}
-      organization={organization}
-      location={location}
-      onFilterChange={onFilterChange}
-      title={axisOrBackup.label}
-      titleTooltip={axisOrBackup.tooltip}
-      didReceiveMultiAxis={didReceiveMulti}
-      usingBackupAxis={usingBackupAxis}
-      backupField={backupField}
-    />
-  ) : (
-    <DurationChart
-      field={axis.field}
-      eventView={eventView}
-      organization={organization}
-      title={axisOrBackup.label}
-      titleTooltip={axisOrBackup.tooltip}
-      usingBackupAxis={usingBackupAxis}
-      backupField={backupField}
-    />
-  );
-}
diff --git a/static/app/views/performance/landing/display/utils.tsx b/static/app/views/performance/landing/display/utils.tsx
deleted file mode 100644
index 3ed12116c30210..00000000000000
--- a/static/app/views/performance/landing/display/utils.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import type {AxisOption} from '../../data';
-
-export function getAxisOrBackupAxis(axis: AxisOption, usingBackupAxis: boolean) {
-  const displayedAxis = usingBackupAxis ? getBackupAxisOption(axis) ?? axis : axis;
-  return displayedAxis;
-}
-
-export function getBackupAxisOption(axis: AxisOption) {
-  return axis.backupOption;
-}
-
-export function getBackupAxes(axes: AxisOption[], usingBackupAxis: boolean) {
-  return usingBackupAxis ? axes.map(axis => getBackupAxisOption(axis) ?? axis) : axes;
-}
-
-export function getBackupField(axis: AxisOption) {
-  const backupOption = getBackupAxisOption(axis);
-
-  if (!backupOption) {
-    return undefined;
-  }
-
-  return backupOption.field;
-}
-
-export function getFieldOrBackup(field: string, backupField?: string) {
-  return backupField ?? field;
-}
diff --git a/static/app/views/performance/landing/index.spec.tsx b/static/app/views/performance/landing/index.spec.tsx
index 65ab8c3a39f8d4..687c19a260a089 100644
--- a/static/app/views/performance/landing/index.spec.tsx
+++ b/static/app/views/performance/landing/index.spec.tsx
@@ -1,4 +1,5 @@
 import {ProjectFixture} from 'sentry-fixture/project';
+import {RouterFixture} from 'sentry-fixture/routerFixture';
 
 import {addMetricsDataMock} from 'sentry-test/performance/addMetricsDataMock';
 import {initializeData} from 'sentry-test/performance/initializePerformanceData';
@@ -13,7 +14,6 @@ import {
 } from 'sentry-test/reactTestingLibrary';
 
 import TeamStore from 'sentry/stores/teamStore';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {MetricsCardinalityProvider} from 'sentry/utils/performance/contexts/metricsCardinality';
 import {QueryClientProvider} from 'sentry/utils/queryClient';
 import {OrganizationContext} from 'sentry/views/organizationContext';
@@ -67,7 +67,6 @@ describe('Performance > Landing > Index', function () {
 
   act(() => void TeamStore.loadInitialData([], false, null));
   beforeEach(function () {
-    // eslint-disable-next-line no-console
     jest.spyOn(console, 'error').mockImplementation(jest.fn());
 
     MockApiClient.addMockResponse({
@@ -199,7 +198,7 @@ describe('Performance > Landing > Index', function () {
 
     expect(columnHeaders).toHaveLength(REACT_NATIVE_COLUMN_TITLES.length);
     for (const [index, title] of columnHeaders.entries()) {
-      expect(title).toHaveTextContent(REACT_NATIVE_COLUMN_TITLES[index]);
+      expect(title).toHaveTextContent(REACT_NATIVE_COLUMN_TITLES[index].title!);
     }
   });
 
@@ -244,15 +243,16 @@ describe('Performance > Landing > Index', function () {
   });
 
   it('Can switch between landing displays', async function () {
+    const router = RouterFixture();
     const data = initializeData({
       query: {landingDisplay: LandingDisplayField.FRONTEND_OTHER, abc: '123'},
     });
 
-    wrapper = render(<WrappedComponent data={data} />);
+    wrapper = render(<WrappedComponent data={data} />, {router});
     expect(screen.getByTestId('frontend-other-view')).toBeInTheDocument();
     await userEvent.click(screen.getByRole('tab', {name: 'All Transactions'}));
 
-    expect(browserHistory.push).toHaveBeenNthCalledWith(
+    expect(router.push).toHaveBeenNthCalledWith(
       1,
       expect.objectContaining({
         pathname: data.location.pathname,
@@ -296,7 +296,7 @@ describe('Performance > Landing > Index', function () {
 
       render(<WrappedComponent data={data} withStaticFilters />);
 
-      await waitForElementToBeRemoved(() => screen.getAllByTestId('loading-indicator'));
+      await waitForElementToBeRemoved(() => screen.queryAllByTestId('loading-indicator'));
       await userEvent.type(screen.getByPlaceholderText('Search Transactions'), '{enter}');
       expect(searchHandlerMock).toHaveBeenCalledWith('', 'transactionsOnly');
     });
@@ -320,7 +320,7 @@ describe('Performance > Landing > Index', function () {
 
       wrapper = render(<WrappedComponent data={data} />);
 
-      await waitForElementToBeRemoved(() => screen.getAllByTestId('loading-indicator'));
+      await waitForElementToBeRemoved(() => screen.queryAllByTestId('loading-indicator'));
 
       expect(await screen.findByPlaceholderText('Search Transactions')).toHaveValue('');
     });
diff --git a/static/app/views/performance/landing/index.tsx b/static/app/views/performance/landing/index.tsx
index 5bdbfcd3243cb6..40533a4d400ff1 100644
--- a/static/app/views/performance/landing/index.tsx
+++ b/static/app/views/performance/landing/index.tsx
@@ -181,7 +181,7 @@ export function PerformanceLanding(props: Props) {
 
   const derivedQuery = getTransactionSearchQuery(location, eventView.query);
 
-  const ViewComponent = fieldToViewMap[landingDisplay.field];
+  const ViewComponent = fieldToViewMap[landingDisplay!.field];
 
   let pageFilters: React.ReactNode = (
     <PageFilterBar condensed>
@@ -202,7 +202,7 @@ export function PerformanceLanding(props: Props) {
   return (
     <Layout.Page data-test-id="performance-landing-v3">
       <Tabs
-        value={landingDisplay.field}
+        value={landingDisplay!.field}
         onChange={field =>
           handleLandingDisplayChange(field, location, projects, organization, eventView)
         }
@@ -245,7 +245,7 @@ export function PerformanceLanding(props: Props) {
         <Layout.Body data-test-id="performance-landing-body">
           <Layout.Main fullWidth>
             <TabPanels>
-              <TabPanels.Item key={landingDisplay.field}>
+              <TabPanels.Item key={landingDisplay!.field}>
                 <MetricsCardinalityProvider
                   sendOutcomeAnalytics
                   organization={organization}
@@ -296,7 +296,7 @@ export function PerformanceLanding(props: Props) {
                                           metricSettingState ?? undefined
                                         );
                                       }}
-                                      query={getFreeTextFromQuery(derivedQuery)}
+                                      query={getFreeTextFromQuery(derivedQuery)!}
                                     />
                                   )}
                                 </MEPConsumer>
diff --git a/static/app/views/performance/landing/metricsDataSwitcher.spec.tsx b/static/app/views/performance/landing/metricsDataSwitcher.spec.tsx
index 0655963356d769..8ae75c0957843c 100644
--- a/static/app/views/performance/landing/metricsDataSwitcher.spec.tsx
+++ b/static/app/views/performance/landing/metricsDataSwitcher.spec.tsx
@@ -57,7 +57,6 @@ describe('Performance > Landing > MetricsDataSwitcher', function () {
 
   act(() => void TeamStore.loadInitialData([], false, null));
   beforeEach(function () {
-    // eslint-disable-next-line no-console
     jest.spyOn(console, 'error').mockImplementation(jest.fn());
 
     MockApiClient.addMockResponse({
diff --git a/static/app/views/performance/landing/metricsDataSwitcher.tsx b/static/app/views/performance/landing/metricsDataSwitcher.tsx
index 221ce6572b1803..22ed5d53889b66 100644
--- a/static/app/views/performance/landing/metricsDataSwitcher.tsx
+++ b/static/app/views/performance/landing/metricsDataSwitcher.tsx
@@ -4,7 +4,6 @@ import type {Location} from 'history';
 
 import LoadingIndicator from 'sentry/components/loadingIndicator';
 import type {Organization} from 'sentry/types/organization';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import type EventView from 'sentry/utils/discover/eventView';
 import type {MetricDataSwitcherOutcome} from 'sentry/utils/performance/contexts/metricsCardinality';
 import {useMetricsCardinalityContext} from 'sentry/utils/performance/contexts/metricsCardinality';
@@ -14,6 +13,7 @@ import {
   METRIC_SEARCH_SETTING_PARAM,
 } from 'sentry/utils/performance/contexts/metricsEnhancedSetting';
 import {decodeScalar} from 'sentry/utils/queryString';
+import {useNavigate} from 'sentry/utils/useNavigate';
 
 interface MetricDataSwitchProps {
   children: (props: MetricDataSwitcherOutcome) => React.ReactNode;
@@ -91,13 +91,14 @@ function MetricsSwitchHandler({
   const mepSearchState = decodeScalar(query[METRIC_SEARCH_SETTING_PARAM], '');
   const hasQuery = decodeScalar(query.query, '');
   const queryIsTransactionsBased = mepSearchState === MEPState.TRANSACTIONS_ONLY;
+  const navigate = useNavigate();
 
   const shouldAdjustQuery =
     hasQuery && queryIsTransactionsBased && !outcome.forceTransactionsOnly;
 
   useEffect(() => {
     if (shouldAdjustQuery) {
-      browserHistory.push({
+      navigate({
         pathname: location.pathname,
         query: {
           ...location.query,
@@ -107,7 +108,7 @@ function MetricsSwitchHandler({
         },
       });
     }
-  }, [shouldAdjustQuery, location]);
+  }, [shouldAdjustQuery, location, navigate]);
 
   if (hasQuery && queryIsTransactionsBased && !outcome.forceTransactionsOnly) {
     eventView.query = ''; // TODO: Create switcher provider and move it to the route level to remove the need for this.
diff --git a/static/app/views/performance/landing/metricsDataSwitcherAlert.tsx b/static/app/views/performance/landing/metricsDataSwitcherAlert.tsx
index af24f898a6f5bc..6bb40bb560f50a 100644
--- a/static/app/views/performance/landing/metricsDataSwitcherAlert.tsx
+++ b/static/app/views/performance/landing/metricsDataSwitcherAlert.tsx
@@ -71,7 +71,7 @@ export function MetricsDataSwitcherAlert(
       return null;
     }
 
-    const platform = platforms[0];
+    const platform = platforms[0]!;
     if (UNSUPPORTED_TRANSACTION_NAME_DOCS.includes(platform)) {
       return null;
     }
diff --git a/static/app/views/performance/landing/samplingModal.tsx b/static/app/views/performance/landing/samplingModal.tsx
index b97ea59f043726..69cc686d8cce59 100644
--- a/static/app/views/performance/landing/samplingModal.tsx
+++ b/static/app/views/performance/landing/samplingModal.tsx
@@ -32,7 +32,7 @@ function SamplingModal(props: Props) {
     ['false', t('Always show sampled data')],
   ];
 
-  const [choice, setChoice] = useState(choices[isMEPEnabled ? 0 : 1][0]);
+  const [choice, setChoice] = useState(choices[isMEPEnabled ? 0 : 1]![0]!);
 
   return (
     <Fragment>
diff --git a/static/app/views/performance/landing/utils.spec.tsx b/static/app/views/performance/landing/utils.spec.tsx
index 761f64632ab2bd..a99c90522093df 100644
--- a/static/app/views/performance/landing/utils.spec.tsx
+++ b/static/app/views/performance/landing/utils.spec.tsx
@@ -34,14 +34,14 @@ describe('Utils', function () {
     it('returns all by default', function () {
       const projects = [ProjectFixture()];
       const data = initializeData(projects);
-      expect(getCurrentLandingDisplay(data.router.location, projects).label).toEqual(
+      expect(getCurrentLandingDisplay(data.router.location, projects).label).toBe(
         'All Transactions'
       );
     });
     it('returns specific landing display if query is set', function () {
       const projects = [ProjectFixture()];
       const data = initializeData(projects, {landingDisplay: 'frontend_pageload'});
-      expect(getCurrentLandingDisplay(data.router.location, projects).label).toEqual(
+      expect(getCurrentLandingDisplay(data.router.location, projects).label).toBe(
         'All Transactions'
       );
     });
@@ -50,28 +50,28 @@ describe('Utils', function () {
       const data = initializeData(projects, {project: 22});
       expect(
         getCurrentLandingDisplay(data.router.location, projects, data.eventView).label
-      ).toEqual('Frontend');
+      ).toBe('Frontend');
     });
     it('returns backend display if project matches', function () {
       const projects = [ProjectFixture({id: '22', platform: 'php'})];
       const data = initializeData(projects, {project: 22});
       expect(
         getCurrentLandingDisplay(data.router.location, projects, data.eventView).label
-      ).toEqual('Backend');
+      ).toBe('Backend');
     });
     it('returns all display for native platform', function () {
       const projects = [ProjectFixture({id: '22', platform: 'native'})];
       const data = initializeData(projects, {project: [22]});
       expect(
         getCurrentLandingDisplay(data.router.location, projects, data.eventView).label
-      ).toEqual('All Transactions');
+      ).toBe('All Transactions');
     });
     it('returns all display if multiple projects', function () {
       const projects = [ProjectFixture()];
       const data = initializeData(projects, {project: [1, 2]});
       expect(
         getCurrentLandingDisplay(data.router.location, projects, data.eventView).label
-      ).toEqual('All Transactions');
+      ).toBe('All Transactions');
     });
   });
 });
diff --git a/static/app/views/performance/landing/utils.tsx b/static/app/views/performance/landing/utils.tsx
index d3f61558145fea..8acf1c8a95d4fe 100644
--- a/static/app/views/performance/landing/utils.tsx
+++ b/static/app/views/performance/landing/utils.tsx
@@ -89,7 +89,7 @@ export function getDefaultDisplayForPlatform(projects: Project[], eventView?: Ev
   const defaultDisplay = LANDING_DISPLAYS.find(
     ({field}) => field === defaultDisplayField
   );
-  return defaultDisplay || LANDING_DISPLAYS[0];
+  return defaultDisplay || LANDING_DISPLAYS[0]!;
 }
 
 export function getCurrentLandingDisplay(
diff --git a/static/app/views/performance/landing/views/mobileView.tsx b/static/app/views/performance/landing/views/mobileView.tsx
index 649ca11f077535..87b2c66f0b1d4c 100644
--- a/static/app/views/performance/landing/views/mobileView.tsx
+++ b/static/app/views/performance/landing/views/mobileView.tsx
@@ -32,7 +32,11 @@ export function MobileView(props: BasePerformanceViewProps) {
   ];
 
   if (organization.features.includes('mobile-vitals')) {
-    columnTitles = [...columnTitles.slice(0, 5), 'ttid', ...columnTitles.slice(5, 0)];
+    columnTitles = [
+      ...columnTitles.slice(0, 5),
+      {title: 'ttid'},
+      ...columnTitles.slice(5, 0),
+    ];
     allowedCharts.push(
       ...[
         PerformanceWidgetSetting.TIME_TO_INITIAL_DISPLAY,
diff --git a/static/app/views/performance/landing/widgets/components/performanceWidget.tsx b/static/app/views/performance/landing/widgets/components/performanceWidget.tsx
index 08ca089d834509..4b49d67f288571 100644
--- a/static/app/views/performance/landing/widgets/components/performanceWidget.tsx
+++ b/static/app/views/performance/landing/widgets/components/performanceWidget.tsx
@@ -32,13 +32,13 @@ export function GenericPerformanceWidget<T extends WidgetDataConstraint>(
 ) {
   // Use object keyed to chart setting so switching between charts of a similar type doesn't retain data with query components still having inflight requests.
   const [allWidgetData, setWidgetData] = useState<{[chartSetting: string]: T}>({});
-  const widgetData = allWidgetData[props.chartSetting] ?? {};
+  const widgetData = allWidgetData[props.chartSetting]! ?? {};
   const widgetDataRef = useRef(widgetData);
 
   const setWidgetDataForKey = useCallback(
     (dataKey: string, result?: WidgetDataResult) => {
       const _widgetData = widgetDataRef.current;
-      const newWidgetData = {..._widgetData, [dataKey]: result};
+      const newWidgetData = {..._widgetData, [dataKey]: result} as T;
       widgetDataRef.current = newWidgetData;
       setWidgetData({[props.chartSetting]: newWidgetData});
     },
@@ -48,7 +48,7 @@ export function GenericPerformanceWidget<T extends WidgetDataConstraint>(
   const removeWidgetDataForKey = useCallback(
     (dataKey: string) => {
       const _widgetData = widgetDataRef.current;
-      const newWidgetData = {..._widgetData};
+      const newWidgetData = {..._widgetData} as T;
       delete newWidgetData[dataKey];
       widgetDataRef.current = newWidgetData;
       setWidgetData({[props.chartSetting]: newWidgetData});
diff --git a/static/app/views/performance/landing/widgets/components/widgetChartRow.tsx b/static/app/views/performance/landing/widgets/components/widgetChartRow.tsx
index f24a8a2d99ca22..79e244bdaff014 100644
--- a/static/app/views/performance/landing/widgets/components/widgetChartRow.tsx
+++ b/static/app/views/performance/landing/widgets/components/widgetChartRow.tsx
@@ -32,7 +32,7 @@ function getInitialChartSettings(
   return new Array(chartCount)
     .fill(0)
     .map((_, index) =>
-      getChartSetting(index, chartHeight, performanceType, allowedCharts[index])
+      getChartSetting(index, chartHeight, performanceType, allowedCharts[index]!)
     );
 }
 
@@ -40,7 +40,7 @@ function ChartRow(props: ChartRowProps) {
   const {chartCount, chartHeight, allowedCharts} = props;
   const theme = useTheme();
   const performanceType = usePerformanceDisplayType();
-  const palette = theme.charts.getColorPalette(chartCount);
+  const palette = theme.charts.getColorPalette(chartCount)!;
 
   const [chartSettings, setChartSettings] = useState(
     getInitialChartSettings(chartCount, chartHeight, performanceType, allowedCharts)
@@ -58,8 +58,8 @@ function ChartRow(props: ChartRowProps) {
           key={index}
           index={index}
           chartHeight={chartHeight}
-          chartColor={palette[index]}
-          defaultChartSetting={allowedCharts[index]}
+          chartColor={palette[index]!}
+          defaultChartSetting={allowedCharts[index]!}
           rowChartSettings={chartSettings}
           setRowChartSettings={setChartSettings}
         />
diff --git a/static/app/views/performance/landing/widgets/components/widgetContainer.tsx b/static/app/views/performance/landing/widgets/components/widgetContainer.tsx
index 45e1867b0a1c0d..92048b951e09ad 100644
--- a/static/app/views/performance/landing/widgets/components/widgetContainer.tsx
+++ b/static/app/views/performance/landing/widgets/components/widgetContainer.tsx
@@ -13,13 +13,12 @@ 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 {browserHistory} from 'sentry/utils/browserHistory';
 import type EventView from 'sentry/utils/discover/eventView';
 import type {Field} from 'sentry/utils/discover/fields';
 import {DisplayModes, SavedQueryDatasets} from 'sentry/utils/discover/types';
 import {useMEPSettingContext} from 'sentry/utils/performance/contexts/metricsEnhancedSetting';
 import {usePerformanceDisplayType} from 'sentry/utils/performance/contexts/performanceDisplayContext';
-import normalizeUrl from 'sentry/utils/url/normalizeUrl';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import withOrganization from 'sentry/utils/withOrganization';
 import {hasDatasetSelector} from 'sentry/views/dashboards/utils';
@@ -69,7 +68,7 @@ function trackChartSettingChange(
   });
 }
 
-function _WidgetContainer(props: Props) {
+function WidgetContainerInner(props: Props) {
   const {
     organization,
     index,
@@ -227,6 +226,7 @@ export function WidgetInteractiveTitle({
   rowChartSettings: PerformanceWidgetSetting[];
   setChartSetting: (setting: PerformanceWidgetSetting) => void;
 }) {
+  const navigate = useNavigate();
   const organization = useOrganization();
   const menuOptions: SelectOption<string>[] = [];
 
@@ -248,9 +248,7 @@ export function WidgetInteractiveTitle({
 
   const handleChange = (option: {value: string | number}) => {
     if (option.value === 'open_in_discover') {
-      browserHistory.push(
-        normalizeUrl(getEventViewDiscoverPath(organization, eventView))
-      );
+      navigate(getEventViewDiscoverPath(organization, eventView));
     } else {
       setChartSetting(option.value as PerformanceWidgetSetting);
     }
@@ -293,6 +291,7 @@ export function WidgetContainerActions({
   rowChartSettings: PerformanceWidgetSetting[];
   setChartSetting: (setting: PerformanceWidgetSetting) => void;
 }) {
+  const navigate = useNavigate();
   const organization = useOrganization();
   const menuOptions: SelectOption<PerformanceWidgetSetting>[] = [];
 
@@ -310,9 +309,7 @@ export function WidgetContainerActions({
 
   function handleWidgetActionChange(value: string) {
     if (value === 'open_in_discover') {
-      browserHistory.push(
-        normalizeUrl(getEventViewDiscoverPath(organization, eventView))
-      );
+      navigate(getEventViewDiscoverPath(organization, eventView));
     }
   }
 
@@ -386,6 +383,6 @@ const makeEventViewForWidget = (
   return widgetEventView;
 };
 
-const WidgetContainer = withOrganization(_WidgetContainer);
+const WidgetContainer = withOrganization(WidgetContainerInner);
 
 export default WidgetContainer;
diff --git a/static/app/views/performance/landing/widgets/transforms/transformEventsToArea.tsx b/static/app/views/performance/landing/widgets/transforms/transformEventsToArea.tsx
index 30850e75b2db30..8f625c7c06a1b3 100644
--- a/static/app/views/performance/landing/widgets/transforms/transformEventsToArea.tsx
+++ b/static/app/views/performance/landing/widgets/transforms/transformEventsToArea.tsx
@@ -23,7 +23,7 @@ export function transformEventsRequestToArea<T extends WidgetDataConstraint>(
     ...results,
     isLoading: results.loading || results.reloading,
     isErrored: results.errored,
-    hasData: defined(data) && !!data.length && !!data[0].data.length,
+    hasData: defined(data) && !!data.length && !!data[0]!.data.length,
     data,
     previousData: results.previousTimeseriesData ?? undefined,
 
diff --git a/static/app/views/performance/landing/widgets/transforms/transformEventsToVitals.tsx b/static/app/views/performance/landing/widgets/transforms/transformEventsToVitals.tsx
index c98d6548561eaf..c9d1b84b17d6c3 100644
--- a/static/app/views/performance/landing/widgets/transforms/transformEventsToVitals.tsx
+++ b/static/app/views/performance/landing/widgets/transforms/transformEventsToVitals.tsx
@@ -23,7 +23,7 @@ export function transformEventsRequestToVitals<T extends WidgetDataConstraint>(
     ...results,
     isLoading: results.loading || results.reloading,
     isErrored: results.errored,
-    hasData: defined(data) && !!data.length && !!data[0].data.length,
+    hasData: defined(data) && !!data.length && !!data[0]!.data.length,
     data,
 
     utc: utc === 'true',
diff --git a/static/app/views/performance/landing/widgets/widgetDefinitions.tsx b/static/app/views/performance/landing/widgets/widgetDefinitions.tsx
index 8bf14178f0d1ad..a753d4b3447a9f 100644
--- a/static/app/views/performance/landing/widgets/widgetDefinitions.tsx
+++ b/static/app/views/performance/landing/widgets/widgetDefinitions.tsx
@@ -75,7 +75,7 @@ export enum PerformanceWidgetSetting {
   HIGHEST_CACHE_MISS_RATE_TRANSACTIONS = 'highest_cache__miss_rate_transactions',
 }
 
-const WIDGET_PALETTE = CHART_PALETTE[5];
+const WIDGET_PALETTE = !CHART_PALETTE[5];
 export const WIDGET_DEFINITIONS: ({
   organization,
 }: {
@@ -91,28 +91,28 @@ export const WIDGET_DEFINITIONS: ({
       titleTooltip: getTermHelp(organization, PerformanceTerm.DURATION_DISTRIBUTION),
       fields: ['transaction.duration'],
       dataType: GenericPerformanceWidgetDataType.HISTOGRAM,
-      chartColor: WIDGET_PALETTE[5],
+      chartColor: WIDGET_PALETTE[5]!!,
     },
     [PerformanceWidgetSetting.LCP_HISTOGRAM]: {
       title: t('LCP Distribution'),
       titleTooltip: getTermHelp(organization, PerformanceTerm.DURATION_DISTRIBUTION),
       fields: ['measurements.lcp'],
       dataType: GenericPerformanceWidgetDataType.HISTOGRAM,
-      chartColor: WIDGET_PALETTE[5],
+      chartColor: WIDGET_PALETTE[5]!!,
     },
     [PerformanceWidgetSetting.FCP_HISTOGRAM]: {
       title: t('FCP Distribution'),
       titleTooltip: getTermHelp(organization, PerformanceTerm.DURATION_DISTRIBUTION),
       fields: ['measurements.fcp'],
       dataType: GenericPerformanceWidgetDataType.HISTOGRAM,
-      chartColor: WIDGET_PALETTE[5],
+      chartColor: WIDGET_PALETTE[5]!!,
     },
     [PerformanceWidgetSetting.FID_HISTOGRAM]: {
       title: t('FID Distribution'),
       titleTooltip: getTermHelp(organization, PerformanceTerm.DURATION_DISTRIBUTION),
       fields: ['measurements.fid'],
       dataType: GenericPerformanceWidgetDataType.HISTOGRAM,
-      chartColor: WIDGET_PALETTE[5],
+      chartColor: WIDGET_PALETTE[5]!!,
     },
     [PerformanceWidgetSetting.WORST_LCP_VITALS]: {
       title: t('Worst LCP Web Vitals'),
@@ -159,7 +159,7 @@ export const WIDGET_DEFINITIONS: ({
       titleTooltip: getTermHelp(organization, PerformanceTerm.TPM),
       fields: ['tpm()'],
       dataType: GenericPerformanceWidgetDataType.AREA,
-      chartColor: WIDGET_PALETTE[1],
+      chartColor: WIDGET_PALETTE[1]!,
       allowsOpenInDiscover: true,
     },
     [PerformanceWidgetSetting.APDEX_AREA]: {
@@ -167,7 +167,7 @@ export const WIDGET_DEFINITIONS: ({
       titleTooltip: getTermHelp(organization, PerformanceTerm.APDEX),
       fields: ['apdex()'],
       dataType: GenericPerformanceWidgetDataType.AREA,
-      chartColor: WIDGET_PALETTE[4],
+      chartColor: WIDGET_PALETTE[4]!,
       allowsOpenInDiscover: true,
     },
     [PerformanceWidgetSetting.P50_DURATION_AREA]: {
@@ -175,7 +175,7 @@ export const WIDGET_DEFINITIONS: ({
       titleTooltip: getTermHelp(organization, PerformanceTerm.P50),
       fields: ['p50(transaction.duration)'],
       dataType: GenericPerformanceWidgetDataType.AREA,
-      chartColor: WIDGET_PALETTE[3],
+      chartColor: WIDGET_PALETTE[3]!,
       allowsOpenInDiscover: true,
     },
     [PerformanceWidgetSetting.P75_DURATION_AREA]: {
@@ -183,7 +183,7 @@ export const WIDGET_DEFINITIONS: ({
       titleTooltip: getTermHelp(organization, PerformanceTerm.P75),
       fields: ['p75(transaction.duration)'],
       dataType: GenericPerformanceWidgetDataType.AREA,
-      chartColor: WIDGET_PALETTE[3],
+      chartColor: WIDGET_PALETTE[3]!,
       allowsOpenInDiscover: true,
     },
     [PerformanceWidgetSetting.P95_DURATION_AREA]: {
@@ -191,7 +191,7 @@ export const WIDGET_DEFINITIONS: ({
       titleTooltip: getTermHelp(organization, PerformanceTerm.P95),
       fields: ['p95(transaction.duration)'],
       dataType: GenericPerformanceWidgetDataType.AREA,
-      chartColor: WIDGET_PALETTE[3],
+      chartColor: WIDGET_PALETTE[3]!,
       allowsOpenInDiscover: true,
     },
     [PerformanceWidgetSetting.P99_DURATION_AREA]: {
@@ -199,7 +199,7 @@ export const WIDGET_DEFINITIONS: ({
       titleTooltip: getTermHelp(organization, PerformanceTerm.P99),
       fields: ['p99(transaction.duration)'],
       dataType: GenericPerformanceWidgetDataType.AREA,
-      chartColor: WIDGET_PALETTE[3],
+      chartColor: WIDGET_PALETTE[3]!,
       allowsOpenInDiscover: true,
     },
     [PerformanceWidgetSetting.P75_LCP_AREA]: {
@@ -207,7 +207,7 @@ export const WIDGET_DEFINITIONS: ({
       titleTooltip: getTermHelp(organization, PerformanceTerm.P75),
       fields: ['p75(measurements.lcp)'],
       dataType: GenericPerformanceWidgetDataType.AREA,
-      chartColor: WIDGET_PALETTE[1],
+      chartColor: WIDGET_PALETTE[1]!,
       allowsOpenInDiscover: true,
     },
     [PerformanceWidgetSetting.FAILURE_RATE_AREA]: {
@@ -215,7 +215,7 @@ export const WIDGET_DEFINITIONS: ({
       titleTooltip: getTermHelp(organization, PerformanceTerm.FAILURE_RATE),
       fields: ['failure_rate()'],
       dataType: GenericPerformanceWidgetDataType.AREA,
-      chartColor: WIDGET_PALETTE[2],
+      chartColor: WIDGET_PALETTE[2]!,
       allowsOpenInDiscover: true,
     },
     [PerformanceWidgetSetting.USER_MISERY_AREA]: {
@@ -223,7 +223,7 @@ export const WIDGET_DEFINITIONS: ({
       titleTooltip: getTermHelp(organization, PerformanceTerm.USER_MISERY),
       fields: [`user_misery()`],
       dataType: GenericPerformanceWidgetDataType.AREA,
-      chartColor: WIDGET_PALETTE[0],
+      chartColor: WIDGET_PALETTE[0]!,
       allowsOpenInDiscover: true,
     },
     [PerformanceWidgetSetting.COLD_STARTUP_AREA]: {
@@ -231,7 +231,7 @@ export const WIDGET_DEFINITIONS: ({
       titleTooltip: getTermHelp(organization, PerformanceTerm.APP_START_COLD),
       fields: ['p75(measurements.app_start_cold)'],
       dataType: GenericPerformanceWidgetDataType.AREA,
-      chartColor: WIDGET_PALETTE[4],
+      chartColor: WIDGET_PALETTE[4]!,
       allowsOpenInDiscover: true,
     },
     [PerformanceWidgetSetting.WARM_STARTUP_AREA]: {
@@ -239,7 +239,7 @@ export const WIDGET_DEFINITIONS: ({
       titleTooltip: getTermHelp(organization, PerformanceTerm.APP_START_WARM),
       fields: ['p75(measurements.app_start_warm)'],
       dataType: GenericPerformanceWidgetDataType.AREA,
-      chartColor: WIDGET_PALETTE[3],
+      chartColor: WIDGET_PALETTE[3]!,
       allowsOpenInDiscover: true,
     },
     [PerformanceWidgetSetting.SLOW_FRAMES_AREA]: {
@@ -247,7 +247,7 @@ export const WIDGET_DEFINITIONS: ({
       titleTooltip: getTermHelp(organization, PerformanceTerm.SLOW_FRAMES),
       fields: ['p75(measurements.frames_slow_rate)'],
       dataType: GenericPerformanceWidgetDataType.AREA,
-      chartColor: WIDGET_PALETTE[0],
+      chartColor: WIDGET_PALETTE[0]!,
       allowsOpenInDiscover: true,
     },
     [PerformanceWidgetSetting.FROZEN_FRAMES_AREA]: {
@@ -255,7 +255,7 @@ export const WIDGET_DEFINITIONS: ({
       titleTooltip: getTermHelp(organization, PerformanceTerm.FROZEN_FRAMES),
       fields: ['p75(measurements.frames_frozen_rate)'],
       dataType: GenericPerformanceWidgetDataType.AREA,
-      chartColor: WIDGET_PALETTE[5],
+      chartColor: WIDGET_PALETTE[5]!!,
       allowsOpenInDiscover: true,
     },
     [PerformanceWidgetSetting.MOST_RELATED_ERRORS]: {
@@ -263,14 +263,14 @@ export const WIDGET_DEFINITIONS: ({
       titleTooltip: getTermHelp(organization, PerformanceTerm.MOST_ERRORS),
       fields: [`failure_count()`],
       dataType: GenericPerformanceWidgetDataType.LINE_LIST,
-      chartColor: WIDGET_PALETTE[0],
+      chartColor: WIDGET_PALETTE[0]!,
     },
     [PerformanceWidgetSetting.MOST_RELATED_ISSUES]: {
       title: t('Most Related Issues'),
       titleTooltip: getTermHelp(organization, PerformanceTerm.MOST_ISSUES),
       fields: [`count()`],
       dataType: GenericPerformanceWidgetDataType.LINE_LIST,
-      chartColor: WIDGET_PALETTE[0],
+      chartColor: WIDGET_PALETTE[0]!,
     },
     [PerformanceWidgetSetting.MOST_TIME_SPENT_DB_QUERIES]: {
       title: `${t('Most Time-Consuming')} ${QUERIES_DATA_TYPE_PLURAL}`,
@@ -278,7 +278,7 @@ export const WIDGET_DEFINITIONS: ({
       titleTooltip: getTermHelp(organization, PerformanceTerm.MOST_TIME_SPENT_DB_QUERIES),
       fields: [`time_spent_percentage()`],
       dataType: GenericPerformanceWidgetDataType.LINE_LIST,
-      chartColor: WIDGET_PALETTE[0],
+      chartColor: WIDGET_PALETTE[0]!,
     },
     [PerformanceWidgetSetting.MOST_TIME_CONSUMING_RESOURCES]: {
       title: `${t('Most Time-Consuming')} ${RESOURCES_DATA_TYPE_PLURAL}`,
@@ -289,7 +289,7 @@ export const WIDGET_DEFINITIONS: ({
       ),
       fields: [`time_spent_percentage()`],
       dataType: GenericPerformanceWidgetDataType.LINE_LIST,
-      chartColor: WIDGET_PALETTE[0],
+      chartColor: WIDGET_PALETTE[0]!,
     },
     [PerformanceWidgetSetting.HIGHEST_CACHE_MISS_RATE_TRANSACTIONS]: {
       title: t('Highest Cache Miss Rates'),
@@ -300,7 +300,7 @@ export const WIDGET_DEFINITIONS: ({
       ),
       fields: [`cache_miss_rate()`],
       dataType: GenericPerformanceWidgetDataType.LINE_LIST,
-      chartColor: WIDGET_PALETTE[0],
+      chartColor: WIDGET_PALETTE[0]!,
     },
     [PerformanceWidgetSetting.MOST_TIME_CONSUMING_DOMAINS]: {
       title: t('Most Time-Consuming Domains'),
@@ -311,7 +311,7 @@ export const WIDGET_DEFINITIONS: ({
       ),
       fields: [`time_spent_percentage()`],
       dataType: GenericPerformanceWidgetDataType.LINE_LIST,
-      chartColor: WIDGET_PALETTE[0],
+      chartColor: WIDGET_PALETTE[0]!,
     },
     [PerformanceWidgetSetting.HIGHEST_OPPORTUNITY_PAGES]: {
       title: t('Best Page Opportunities'),
@@ -332,35 +332,35 @@ export const WIDGET_DEFINITIONS: ({
       titleTooltip: getTermHelp(organization, PerformanceTerm.SLOW_HTTP_SPANS),
       fields: [`p75(spans.http)`, 'p75(spans.db)'],
       dataType: GenericPerformanceWidgetDataType.LINE_LIST,
-      chartColor: WIDGET_PALETTE[0],
+      chartColor: WIDGET_PALETTE[0]!,
     },
     [PerformanceWidgetSetting.SLOW_BROWSER_OPS]: {
       title: t('Slow Browser Ops'),
       titleTooltip: getTermHelp(organization, PerformanceTerm.SLOW_HTTP_SPANS),
       fields: [`p75(spans.browser)`],
       dataType: GenericPerformanceWidgetDataType.LINE_LIST,
-      chartColor: WIDGET_PALETTE[0],
+      chartColor: WIDGET_PALETTE[0]!,
     },
     [PerformanceWidgetSetting.SLOW_RESOURCE_OPS]: {
       title: t('Slow Resource Ops'),
       titleTooltip: getTermHelp(organization, PerformanceTerm.SLOW_HTTP_SPANS),
       fields: [`p75(spans.resource)`],
       dataType: GenericPerformanceWidgetDataType.LINE_LIST,
-      chartColor: WIDGET_PALETTE[0],
+      chartColor: WIDGET_PALETTE[0]!,
     },
     [PerformanceWidgetSetting.SLOW_DB_OPS]: {
       title: t('Slow DB Ops'),
       titleTooltip: getTermHelp(organization, PerformanceTerm.SLOW_HTTP_SPANS),
       fields: [`p75(spans.db)`, 'p75(spans.http)'],
       dataType: GenericPerformanceWidgetDataType.LINE_LIST,
-      chartColor: WIDGET_PALETTE[0],
+      chartColor: WIDGET_PALETTE[0]!,
     },
     [PerformanceWidgetSetting.TIME_TO_INITIAL_DISPLAY]: {
       title: t('Time to Initial Display'),
       titleTooltip: getTermHelp(organization, PerformanceTerm.TIME_TO_INITIAL_DISPLAY),
       fields: ['p75(measurements.time_to_initial_display)'],
       dataType: GenericPerformanceWidgetDataType.AREA,
-      chartColor: WIDGET_PALETTE[4],
+      chartColor: WIDGET_PALETTE[4]!,
       allowsOpenInDiscover: true,
     },
     [PerformanceWidgetSetting.TIME_TO_FULL_DISPLAY]: {
@@ -368,7 +368,7 @@ export const WIDGET_DEFINITIONS: ({
       titleTooltip: getTermHelp(organization, PerformanceTerm.TIME_TO_FULL_DISPLAY),
       fields: ['p75(measurements.time_to_full_display)'],
       dataType: GenericPerformanceWidgetDataType.AREA,
-      chartColor: WIDGET_PALETTE[4],
+      chartColor: WIDGET_PALETTE[4]!,
       allowsOpenInDiscover: true,
     },
     [PerformanceWidgetSetting.MOST_SLOW_FRAMES]: {
@@ -376,14 +376,14 @@ export const WIDGET_DEFINITIONS: ({
       titleTooltip: getTermHelp(organization, PerformanceTerm.SLOW_FRAMES),
       fields: ['avg(measurements.frames_slow)'],
       dataType: GenericPerformanceWidgetDataType.LINE_LIST,
-      chartColor: WIDGET_PALETTE[0],
+      chartColor: WIDGET_PALETTE[0]!,
     },
     [PerformanceWidgetSetting.MOST_FROZEN_FRAMES]: {
       title: t('Most Frozen Frames'),
       titleTooltip: getTermHelp(organization, PerformanceTerm.FROZEN_FRAMES),
       fields: ['avg(measurements.frames_frozen)'],
       dataType: GenericPerformanceWidgetDataType.LINE_LIST,
-      chartColor: WIDGET_PALETTE[0],
+      chartColor: WIDGET_PALETTE[0]!,
     },
     [PerformanceWidgetSetting.MOST_IMPROVED]: {
       title: t('Most Improved (P95)'),
diff --git a/static/app/views/performance/landing/widgets/widgets/histogramWidget.tsx b/static/app/views/performance/landing/widgets/widgets/histogramWidget.tsx
index 3ed271f8d7d9d8..b17d041241f45f 100644
--- a/static/app/views/performance/landing/widgets/widgets/histogramWidget.tsx
+++ b/static/app/views/performance/landing/widgets/widgets/histogramWidget.tsx
@@ -79,8 +79,8 @@ export function HistogramWidget(props: PerformanceWidgetProps) {
               isLoading={false}
               isErrored={false}
               onFilterChange={onFilterChange}
-              field={props.fields[0]}
-              chartData={provided.widgetData.chart?.data?.[props.fields[0]]}
+              field={props.fields[0]!}
+              chartData={provided.widgetData.chart?.data?.[props.fields[0]!]!}
               disableXAxis
               disableZoom
               disableChartPadding
diff --git a/static/app/views/performance/landing/widgets/widgets/lineChartListWidget.tsx b/static/app/views/performance/landing/widgets/widgets/lineChartListWidget.tsx
index c7b44d49c93d88..a11ff47d01a091 100644
--- a/static/app/views/performance/landing/widgets/widgets/lineChartListWidget.tsx
+++ b/static/app/views/performance/landing/widgets/widgets/lineChartListWidget.tsx
@@ -132,7 +132,7 @@ export function LineChartListWidget(props: PerformanceWidgetProps) {
       : WidgetEmptyStateWarning;
   }
 
-  const field = props.fields[0];
+  const field = props.fields[0]!;
 
   if (props.fields.length !== 1 && !canHaveIntegrationEmptyState) {
     throw new Error(
@@ -420,17 +420,17 @@ export function LineChartListWidget(props: PerformanceWidgetProps) {
             ) {
               eventView.additionalConditions.addFilterValue(
                 SpanMetricsField.SPAN_DOMAIN,
-                provided.widgetData.list.data[selectedListIndex][
+                provided.widgetData.list.data[selectedListIndex]![
                   SpanMetricsField.SPAN_DOMAIN
-                ].toString(),
+                ]!.toString(),
                 false
               );
             } else {
               eventView.additionalConditions.addFilterValue(
                 SpanMetricsField.SPAN_GROUP,
-                provided.widgetData.list.data[selectedListIndex][
+                provided.widgetData.list.data[selectedListIndex]![
                   SpanMetricsField.SPAN_GROUP
-                ].toString()
+                ]!.toString()
               );
             }
 
@@ -579,7 +579,7 @@ export function LineChartListWidget(props: PerformanceWidgetProps) {
                 <ListClose
                   setSelectListIndex={setSelectListIndex}
                   onClick={() =>
-                    excludeTransaction(listItem.transaction, {
+                    excludeTransaction(listItem.transaction!, {
                       eventView: props.eventView,
                       location,
                     })
@@ -596,14 +596,14 @@ export function LineChartListWidget(props: PerformanceWidgetProps) {
               </GrowLink>
               <RightAlignedCell>
                 {tct('[count] errors', {
-                  count: <Count value={rightValue} />,
+                  count: <Count value={rightValue!} />,
                 })}
               </RightAlignedCell>
               {!props.withStaticFilters && (
                 <ListClose
                   setSelectListIndex={setSelectListIndex}
                   onClick={() =>
-                    excludeTransaction(listItem.transaction, {
+                    excludeTransaction(listItem.transaction!, {
                       eventView: props.eventView,
                       location,
                     })
@@ -617,7 +617,7 @@ export function LineChartListWidget(props: PerformanceWidgetProps) {
             <Fragment>
               <StyledTextOverflow>
                 <DomainCell
-                  projectId={listItem[SpanMetricsField.PROJECT_ID].toString()}
+                  projectId={listItem[SpanMetricsField.PROJECT_ID]!.toString()}
                   domain={listItem[SpanMetricsField.SPAN_DOMAIN] as any}
                 />
               </StyledTextOverflow>
@@ -634,7 +634,7 @@ export function LineChartListWidget(props: PerformanceWidgetProps) {
                 <ListClose
                   setSelectListIndex={setSelectListIndex}
                   onClick={() =>
-                    excludeTransaction(listItem.transaction, {
+                    excludeTransaction(listItem.transaction!, {
                       eventView: props.eventView,
                       location,
                     })
@@ -677,7 +677,7 @@ export function LineChartListWidget(props: PerformanceWidgetProps) {
                 <ListClose
                   setSelectListIndex={setSelectListIndex}
                   onClick={() =>
-                    excludeTransaction(listItem.transaction, {
+                    excludeTransaction(listItem.transaction!, {
                       eventView: props.eventView,
                       location,
                     })
@@ -691,7 +691,7 @@ export function LineChartListWidget(props: PerformanceWidgetProps) {
           const cacheMissRate = listItem[fieldString] as any;
 
           const target = normalizeUrl(
-            `/${moduleRoute}/?${qs.stringify({transaction: transaction, project: listItem['project.id']})}`
+            `/${moduleRoute}/?${qs.stringify({transaction, project: listItem['project.id']})}`
           );
 
           return (
@@ -704,7 +704,7 @@ export function LineChartListWidget(props: PerformanceWidgetProps) {
                 <ListClose
                   setSelectListIndex={setSelectListIndex}
                   onClick={() =>
-                    excludeTransaction(listItem.transaction, {
+                    excludeTransaction(listItem.transaction!, {
                       eventView: props.eventView,
                       location,
                     })
@@ -727,7 +727,7 @@ export function LineChartListWidget(props: PerformanceWidgetProps) {
                   <ListClose
                     setSelectListIndex={setSelectListIndex}
                     onClick={() =>
-                      excludeTransaction(listItem.transaction, {
+                      excludeTransaction(listItem.transaction!, {
                         eventView: props.eventView,
                         location,
                       })
@@ -747,7 +747,7 @@ export function LineChartListWidget(props: PerformanceWidgetProps) {
                 <ListClose
                   setSelectListIndex={setSelectListIndex}
                   onClick={() =>
-                    excludeTransaction(listItem.transaction, {
+                    excludeTransaction(listItem.transaction!, {
                       eventView: props.eventView,
                       location,
                     })
diff --git a/static/app/views/performance/landing/widgets/widgets/mobileReleaseComparisonListWidget.tsx b/static/app/views/performance/landing/widgets/widgets/mobileReleaseComparisonListWidget.tsx
index b66935c882a6b1..32e8804e1272b3 100644
--- a/static/app/views/performance/landing/widgets/widgets/mobileReleaseComparisonListWidget.tsx
+++ b/static/app/views/performance/landing/widgets/widgets/mobileReleaseComparisonListWidget.tsx
@@ -80,7 +80,7 @@ export function transformEventsChartRequest<T extends WidgetDataConstraint>(
     ...results,
     isLoading: results.loading || results.reloading,
     isErrored: results.errored,
-    hasData: defined(data) && !!data.length && !!data[0].data.length,
+    hasData: defined(data) && !!data.length && !!data[0]!.data.length,
     data,
     previousData: results.previousTimeseriesData ?? undefined,
 
@@ -108,7 +108,7 @@ function MobileReleaseComparisonListWidget(props: PerformanceWidgetProps) {
   const {InteractiveTitle} = props;
   const {setPageError} = usePageAlert();
 
-  const field = props.fields[0];
+  const field = props.fields[0]!;
 
   const listQuery = useMemo<QueryDefinition<DataType, WidgetDataResult>>(
     () => ({
@@ -202,7 +202,7 @@ function MobileReleaseComparisonListWidget(props: PerformanceWidgetProps) {
           const partialDataParam = true;
 
           eventView.additionalConditions.setFilterValues('transaction', [
-            provided.widgetData.list.data[selectedListIndex].transaction as string,
+            provided.widgetData.list.data[selectedListIndex]!.transaction as string,
           ]);
 
           eventView.dataset = DiscoverDatasets.METRICS;
@@ -285,7 +285,7 @@ function MobileReleaseComparisonListWidget(props: PerformanceWidgetProps) {
             } as SeriesDataUnit;
           }) ?? [];
 
-        const color = isPrimary ? CHART_PALETTE[3][0] : CHART_PALETTE[3][1];
+        const color = isPrimary ? CHART_PALETTE[3]![0]! : CHART_PALETTE[3]![1]!;
         transformedReleaseSeries[release] = {
           seriesName: formatVersion(label, true),
           color,
diff --git a/static/app/views/performance/landing/widgets/widgets/performanceScoreListWidget.tsx b/static/app/views/performance/landing/widgets/widgets/performanceScoreListWidget.tsx
index 85a1d25625eb48..fbe0a64c09b4a7 100644
--- a/static/app/views/performance/landing/widgets/widgets/performanceScoreListWidget.tsx
+++ b/static/app/views/performance/landing/widgets/widgets/performanceScoreListWidget.tsx
@@ -63,7 +63,10 @@ export function PerformanceScoreListWidget(props: PerformanceWidgetProps) {
 
   const order = ORDER;
 
-  const weightedTimeseriesData = applyStaticWeightsToTimeseries(timeseriesData);
+  const weightedTimeseriesData = applyStaticWeightsToTimeseries(
+    props.organization,
+    timeseriesData
+  );
 
   const getAreaChart = () => {
     const segmentColors = theme.charts.getColorPalette(3).slice(0, 5);
@@ -74,7 +77,6 @@ export function PerformanceScoreListWidget(props: PerformanceWidgetProps) {
         data={formatTimeSeriesResultsToChartData(
           weightedTimeseriesData,
           segmentColors,
-          false,
           order
         )}
         type={ChartType.AREA}
diff --git a/static/app/views/performance/landing/widgets/widgets/performanceScoreWidget.tsx b/static/app/views/performance/landing/widgets/widgets/performanceScoreWidget.tsx
index 8145b1e11211d5..442426c8bb4992 100644
--- a/static/app/views/performance/landing/widgets/widgets/performanceScoreWidget.tsx
+++ b/static/app/views/performance/landing/widgets/widgets/performanceScoreWidget.tsx
@@ -9,7 +9,7 @@ import {space} from 'sentry/styles/space';
 import {useLocation} from 'sentry/utils/useLocation';
 import PerformanceScoreRingWithTooltips from 'sentry/views/insights/browser/webVitals/components/performanceScoreRingWithTooltips';
 import {useProjectRawWebVitalsQuery} from 'sentry/views/insights/browser/webVitals/queries/rawWebVitalsQueries/useProjectRawWebVitalsQuery';
-import {calculatePerformanceScoreFromStoredTableDataRow} from 'sentry/views/insights/browser/webVitals/queries/storedScoreQueries/calculatePerformanceScoreFromStored';
+import {getWebVitalScoresFromTableDataRow} from 'sentry/views/insights/browser/webVitals/queries/storedScoreQueries/getWebVitalScoresFromTableDataRow';
 import {useProjectWebVitalsScoresQuery} from 'sentry/views/insights/browser/webVitals/queries/storedScoreQueries/useProjectWebVitalsScoresQuery';
 import {useModuleURL} from 'sentry/views/insights/common/utils/useModuleURL';
 
@@ -28,7 +28,7 @@ export function PerformanceScoreWidget(props: PerformanceWidgetProps) {
   const projectScore =
     isProjectScoresLoading || isPending
       ? undefined
-      : calculatePerformanceScoreFromStoredTableDataRow(projectScores?.data?.[0]);
+      : getWebVitalScoresFromTableDataRow(projectScores?.data?.[0]);
   const ringSegmentColors = theme.charts.getColorPalette(3);
   const ringBackgroundColors = ringSegmentColors.map(color => `${color}50`);
 
diff --git a/static/app/views/performance/landing/widgets/widgets/singleFieldAreaWidget.tsx b/static/app/views/performance/landing/widgets/widgets/singleFieldAreaWidget.tsx
index 3b0e99845ae362..a810f5c5a2367c 100644
--- a/static/app/views/performance/landing/widgets/widgets/singleFieldAreaWidget.tsx
+++ b/static/app/views/performance/landing/widgets/widgets/singleFieldAreaWidget.tsx
@@ -41,7 +41,7 @@ export function SingleFieldAreaWidget(props: PerformanceWidgetProps) {
 
   const chartQuery = useMemo<QueryDefinition<DataType, WidgetDataResult>>(
     () => ({
-      fields: props.fields[0],
+      fields: props.fields[0]!,
       component: provided => (
         <QueryBatchNode batchProperty="yAxis" transform={unmergeIntoIndividualResults}>
           {({queryBatching}) => (
@@ -52,8 +52,8 @@ export function SingleFieldAreaWidget(props: PerformanceWidgetProps) {
               includePrevious
               includeTransformedData
               partial
-              currentSeriesNames={[field]}
-              previousSeriesNames={[getPreviousSeriesName(field)]}
+              currentSeriesNames={[field!]}
+              previousSeriesNames={[getPreviousSeriesName(field!)]}
               query={provided.eventView.getQueryWithAdditionalConditions()}
               interval={getInterval(
                 {
@@ -78,7 +78,7 @@ export function SingleFieldAreaWidget(props: PerformanceWidgetProps) {
 
   const overallQuery = useMemo<QueryDefinition<DataType, WidgetDataResult>>(
     () => ({
-      fields: field,
+      fields: field!,
       component: provided => {
         const eventView = provided.eventView.clone();
 
diff --git a/static/app/views/performance/landing/widgets/widgets/stackedAreaChartListWidget.tsx b/static/app/views/performance/landing/widgets/widgets/stackedAreaChartListWidget.tsx
index 15f01e4b4329a1..44b8e0053c3422 100644
--- a/static/app/views/performance/landing/widgets/widgets/stackedAreaChartListWidget.tsx
+++ b/static/app/views/performance/landing/widgets/widgets/stackedAreaChartListWidget.tsx
@@ -245,7 +245,7 @@ export function StackedAreaChartListWidget(props: PerformanceWidgetProps) {
           });
 
       const displayedField = 'count()';
-      const rightValue = listItem[displayedField];
+      const rightValue = listItem[displayedField]!;
 
       return (
         <Fragment key={i}>
diff --git a/static/app/views/performance/landing/widgets/widgets/vitalWidget.tsx b/static/app/views/performance/landing/widgets/widgets/vitalWidget.tsx
index 92ee8a9671c6b2..9a411443874bee 100644
--- a/static/app/views/performance/landing/widgets/widgets/vitalWidget.tsx
+++ b/static/app/views/performance/landing/widgets/widgets/vitalWidget.tsx
@@ -32,7 +32,7 @@ import {
   UNPARAMETERIZED_TRANSACTION,
 } from 'sentry/views/performance/utils';
 import {vitalDetailRouteWithQuery} from 'sentry/views/performance/vitalDetail/utils';
-import {_VitalChart} from 'sentry/views/performance/vitalDetail/vitalChart';
+import {VitalChartInner} from 'sentry/views/performance/vitalDetail/vitalChart';
 
 import {excludeTransaction} from '../../utils';
 import {VitalBar} from '../../vitalsCards';
@@ -120,7 +120,7 @@ export function VitalWidget(props: PerformanceWidgetProps) {
   const mepSetting = useMEPSettingContext();
   const {ContainerActions, eventView, organization, InteractiveTitle} = props;
   const [selectedListIndex, setSelectListIndex] = useState<number>(0);
-  const field = props.fields[0];
+  const field = props.fields[0]!;
   const {setPageError} = usePageAlert();
 
   const {fieldsList, vitalFields, sortField} = transformFieldsWithStops({
@@ -132,7 +132,7 @@ export function VitalWidget(props: PerformanceWidgetProps) {
   const Queries = {
     list: useMemo<QueryDefinition<DataType, WidgetDataResult>>(
       () => ({
-        fields: sortField,
+        fields: sortField!,
         component: provided => {
           const _eventView = provided.eventView.clone();
 
@@ -140,7 +140,7 @@ export function VitalWidget(props: PerformanceWidgetProps) {
             field: propField,
           }));
 
-          _eventView.sorts = [{kind: 'desc', field: sortField}];
+          _eventView.sorts = [{kind: 'desc', field: sortField!}];
           if (canUseMetricsData(organization)) {
             _eventView.additionalConditions.setFilterValues('!transaction', [
               UNPARAMETERIZED_TRANSACTION,
@@ -203,7 +203,7 @@ export function VitalWidget(props: PerformanceWidgetProps) {
             <EventsRequest
               {...requestProps}
               limit={1}
-              currentSeriesNames={[sortField]}
+              currentSeriesNames={[sortField!]}
               includePrevious={false}
               partial={false}
               includeTransformedData
@@ -244,7 +244,7 @@ export function VitalWidget(props: PerformanceWidgetProps) {
     getItems(provided).map(item => ({header: item, content: getChart(provided)}));
 
   const getChart = (provided: ComponentData) => (
-    <_VitalChart
+    <VitalChartInner
       {...provided.widgetData.chart}
       {...provided}
       field={field}
@@ -261,7 +261,7 @@ export function VitalWidget(props: PerformanceWidgetProps) {
       const initialConditions = new MutableSearch(_eventView.query);
       initialConditions.addFilterValues('transaction', [transaction]);
 
-      const vital = settingToVital[props.chartSetting];
+      const vital = settingToVital[props.chartSetting]!;
 
       _eventView.query = initialConditions.formatString();
 
@@ -282,7 +282,7 @@ export function VitalWidget(props: PerformanceWidgetProps) {
         : transactionTarget;
 
       const data = {
-        [settingToVital[props.chartSetting]]: getVitalDataForListItem(
+        [settingToVital[props.chartSetting]!]: getVitalDataForListItem(
           listItem,
           vital,
           false
@@ -297,7 +297,7 @@ export function VitalWidget(props: PerformanceWidgetProps) {
           <VitalBarCell>
             <VitalBar
               isLoading={provided.widgetData.list?.isLoading}
-              vital={settingToVital[props.chartSetting]}
+              vital={settingToVital[props.chartSetting]!}
               data={data}
               showBar
               showDurationDetail={false}
@@ -310,7 +310,7 @@ export function VitalWidget(props: PerformanceWidgetProps) {
             <ListClose
               setSelectListIndex={setSelectListIndex}
               onClick={() =>
-                excludeTransaction(listItem.transaction, {
+                excludeTransaction(listItem.transaction!, {
                   eventView: props.eventView,
                   location,
                 })
@@ -340,7 +340,7 @@ export function VitalWidget(props: PerformanceWidgetProps) {
       : [
           {
             component: provided => (
-              <_VitalChart
+              <VitalChartInner
                 {...provided.widgetData.chart}
                 {...provided}
                 field={field}
@@ -379,10 +379,10 @@ export function VitalWidget(props: PerformanceWidgetProps) {
           return <Subtitle />;
         }
 
-        const vital = settingToVital[props.chartSetting];
+        const vital = settingToVital[props.chartSetting]!;
 
         const data = {
-          [settingToVital[props.chartSetting]]: getVitalDataForListItem(
+          [settingToVital[props.chartSetting]!]: getVitalDataForListItem(
             listItem,
             vital,
             false
@@ -393,7 +393,7 @@ export function VitalWidget(props: PerformanceWidgetProps) {
           <Subtitle>
             <VitalBar
               isLoading={provided.widgetData.list?.isLoading}
-              vital={settingToVital[props.chartSetting]}
+              vital={settingToVital[props.chartSetting]!}
               data={data}
               showBar={false}
               showDurationDetail={false}
@@ -404,7 +404,7 @@ export function VitalWidget(props: PerformanceWidgetProps) {
       }}
       EmptyComponent={WidgetEmptyStateWarning}
       HeaderActions={provided => {
-        const vital = settingToVital[props.chartSetting];
+        const vital = settingToVital[props.chartSetting]!;
         const target = vitalDetailRouteWithQuery({
           orgSlug: organization.slug,
           query: eventView.generateQueryStringObject(),
diff --git a/static/app/views/performance/newTraceDetails/issuesTraceWaterfall.tsx b/static/app/views/performance/newTraceDetails/issuesTraceWaterfall.tsx
index af971915585d38..227232c06aab2c 100644
--- a/static/app/views/performance/newTraceDetails/issuesTraceWaterfall.tsx
+++ b/static/app/views/performance/newTraceDetails/issuesTraceWaterfall.tsx
@@ -31,6 +31,7 @@ import {TraceScheduler} from './traceRenderers/traceScheduler';
 import {TraceView as TraceViewModel} from './traceRenderers/traceView';
 import {VirtualizedViewManager} from './traceRenderers/virtualizedViewManager';
 import {useTraceState, useTraceStateDispatch} from './traceState/traceStateProvider';
+import {usePerformanceSubscriptionDetails} from './traceTypeWarnings/usePerformanceSubscriptionDetails';
 import {Trace} from './trace';
 import {traceAnalytics} from './traceAnalytics';
 import type {TraceReducerState} from './traceState';
@@ -133,11 +134,24 @@ export function IssuesTraceWaterfall(props: IssuesTraceWaterfallProps) {
     [organization, projects, traceDispatch]
   );
 
+  const {
+    data: {hasExceededPerformanceUsageLimit},
+    isLoading: isLoadingSubscriptionDetails,
+  } = usePerformanceSubscriptionDetails();
+
   // 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);
+    if (!isLoadingSubscriptionDetails) {
+      traceAnalytics.trackTraceShape(
+        props.tree,
+        projectsRef.current,
+        props.organization,
+        hasExceededPerformanceUsageLimit
+      );
+    }
+
     // Construct the visual representation of the tree
     props.tree.build();
 
@@ -190,11 +204,38 @@ export function IssuesTraceWaterfall(props: IssuesTraceWaterfallProps) {
       nodes?.find(n => isSpanNode(n)) ||
       nodes?.find(n => isTransactionNode(n));
 
+    const index = node ? props.tree.list.indexOf(node) : -1;
+
     if (node) {
-      props.tree.collapseList([node]);
+      const preserveNodes: TraceTreeNode<TraceTree.NodeValue>[] = [node];
+
+      let start = index;
+      while (--start > 0) {
+        if (
+          isTraceErrorNode(props.tree.list[start]!) ||
+          node.errors.size > 0 ||
+          node.performance_issues.size > 0
+        ) {
+          preserveNodes.push(props.tree.list[start]!);
+          break;
+        }
+      }
+
+      start = index;
+      while (++start < props.tree.list.length) {
+        if (
+          isTraceErrorNode(props.tree.list[start]!) ||
+          node.errors.size > 0 ||
+          node.performance_issues.size > 0
+        ) {
+          preserveNodes.push(props.tree.list[start]!);
+          break;
+        }
+      }
+
+      props.tree.collapseList(preserveNodes);
     }
 
-    const index = node ? props.tree.list.indexOf(node) : -1;
     if (index === -1 || !node) {
       const hasScrollComponent = !!props.event.eventID;
       if (hasScrollComponent) {
@@ -238,6 +279,8 @@ export function IssuesTraceWaterfall(props: IssuesTraceWaterfallProps) {
     props.tree,
     props.organization,
     props.event,
+    isLoadingSubscriptionDetails,
+    hasExceededPerformanceUsageLimit,
   ]);
 
   useTraceTimelineChangeSync({
diff --git a/static/app/views/performance/newTraceDetails/trace.spec.tsx b/static/app/views/performance/newTraceDetails/trace.spec.tsx
index b69d838beae3f7..2b6352db9df3c0 100644
--- a/static/app/views/performance/newTraceDetails/trace.spec.tsx
+++ b/static/app/views/performance/newTraceDetails/trace.spec.tsx
@@ -4,8 +4,6 @@ import {TransactionEventFixture} from 'sentry-fixture/event';
 
 import {initializeOrg} from 'sentry-test/initializeOrg';
 import {
-  findAllByText,
-  findByText,
   render,
   screen,
   userEvent,
@@ -92,6 +90,15 @@ function mockTraceResponse(resp?: Partial<ResponseType>) {
   });
 }
 
+function mockPerformanceSubscriptionDetailsResponse(resp?: Partial<ResponseType>) {
+  MockApiClient.addMockResponse({
+    url: '/subscriptions/org-slug/',
+    method: 'GET',
+    asyncDelay: 1,
+    ...(resp ?? {body: {}}),
+  });
+}
+
 function mockTraceMetaResponse(resp?: Partial<ResponseType>) {
   MockApiClient.addMockResponse({
     url: '/organizations/org-slug/events-trace-meta/trace-id/',
@@ -234,6 +241,7 @@ function getVirtualizedRows(container: HTMLElement) {
 }
 
 async function keyboardNavigationTestSetup() {
+  mockPerformanceSubscriptionDetailsResponse();
   const keyboard_navigation_transactions: TraceFullDetailed[] = [];
   for (let i = 0; i < 1e2; i++) {
     keyboard_navigation_transactions.push(
@@ -275,16 +283,19 @@ async function keyboardNavigationTestSetup() {
   const virtualizedScrollContainer = getVirtualizedScrollContainer();
 
   // Awaits for the placeholder rendering rows to be removed
-  await findAllByText(virtualizedContainer, /transaction-op-/i, undefined, {
-    timeout: 5000,
-  }).catch(e => {
+  try {
+    await within(virtualizedContainer).findAllByText(/transaction-op-/i, undefined, {
+      timeout: 5000,
+    });
+  } catch (e) {
     printVirtualizedList(virtualizedContainer);
     throw e;
-  });
+  }
   return {...value, virtualizedContainer, virtualizedScrollContainer};
 }
 
 async function pageloadTestSetup() {
+  mockPerformanceSubscriptionDetailsResponse();
   const pageloadTransactions: TraceFullDetailed[] = [];
   for (let i = 0; i < 1e3; i++) {
     pageloadTransactions.push(
@@ -329,16 +340,19 @@ async function pageloadTestSetup() {
   const virtualizedScrollContainer = getVirtualizedScrollContainer();
 
   // Awaits for the placeholder rendering rows to be removed
-  await findAllByText(virtualizedContainer, /transaction-op-/i, undefined, {
-    timeout: 5000,
-  }).catch(e => {
+  try {
+    await within(virtualizedContainer).findAllByText(/transaction-op-/i, undefined, {
+      timeout: 5000,
+    });
+  } catch (e) {
     printVirtualizedList(virtualizedContainer);
     throw e;
-  });
+  }
   return {...value, virtualizedContainer, virtualizedScrollContainer};
 }
 
 async function nestedTransactionsTestSetup() {
+  mockPerformanceSubscriptionDetailsResponse();
   const transactions: TraceFullDetailed[] = [];
 
   let txn = makeTransaction({
@@ -369,7 +383,7 @@ async function nestedTransactionsTestSetup() {
 
   mockTraceResponse({
     body: {
-      transactions: transactions,
+      transactions,
       orphan_errors: [],
     },
   });
@@ -384,17 +398,19 @@ async function nestedTransactionsTestSetup() {
   const virtualizedScrollContainer = getVirtualizedScrollContainer();
 
   // Awaits for the placeholder rendering rows to be removed
-  await findAllByText(virtualizedContainer, /transaction-op-/i, undefined, {
-    timeout: 5000,
-  }).catch(e => {
+  try {
+    await within(virtualizedContainer).findAllByText(/transaction-op-/i, undefined, {
+      timeout: 5000,
+    });
+  } catch (e) {
     printVirtualizedList(virtualizedContainer);
     throw e;
-  });
-
+  }
   return {...value, virtualizedContainer, virtualizedScrollContainer};
 }
 
 async function searchTestSetup() {
+  mockPerformanceSubscriptionDetailsResponse();
   const transactions: TraceFullDetailed[] = [];
   for (let i = 0; i < 11; i++) {
     transactions.push(
@@ -410,7 +426,7 @@ async function searchTestSetup() {
   }
   mockTraceResponse({
     body: {
-      transactions: transactions,
+      transactions,
       orphan_errors: [],
     },
   });
@@ -438,16 +454,19 @@ async function searchTestSetup() {
   const virtualizedScrollContainer = getVirtualizedScrollContainer();
 
   // Awaits for the placeholder rendering rows to be removed
-  await findAllByText(virtualizedContainer, /transaction-op-/i, undefined, {
-    timeout: 5000,
-  }).catch(e => {
+  try {
+    await within(virtualizedContainer).findAllByText(/transaction-op-/i, undefined, {
+      timeout: 5000,
+    });
+  } catch (e) {
     printVirtualizedList(virtualizedContainer);
     throw e;
-  });
+  }
   return {...value, virtualizedContainer, virtualizedScrollContainer};
 }
 
 async function simpleTestSetup() {
+  mockPerformanceSubscriptionDetailsResponse();
   const transactions: TraceFullDetailed[] = [];
   let parent: any;
   for (let i = 0; i < 1e3; i++) {
@@ -469,7 +488,7 @@ async function simpleTestSetup() {
   }
   mockTraceResponse({
     body: {
-      transactions: transactions,
+      transactions,
       orphan_errors: [],
     },
   });
@@ -495,16 +514,19 @@ async function simpleTestSetup() {
   const virtualizedScrollContainer = getVirtualizedScrollContainer();
 
   // Awaits for the placeholder rendering rows to be removed
-  await findAllByText(virtualizedContainer, /transaction-op-/i, undefined, {
-    timeout: 5000,
-  }).catch(e => {
+  try {
+    await within(virtualizedContainer).findAllByText(/transaction-op-/i, undefined, {
+      timeout: 5000,
+    });
+  } catch (e) {
     printVirtualizedList(virtualizedContainer);
     throw e;
-  });
+  }
   return {...value, virtualizedContainer, virtualizedScrollContainer};
 }
 
 async function completeTestSetup() {
+  mockPerformanceSubscriptionDetailsResponse();
   const start = Date.now() / 1e3;
 
   mockTraceResponse({
@@ -669,7 +691,7 @@ async function completeTestSetup() {
             start_timestamp: start + 0.7,
             timestamp: start + 0.8,
           }),
-          // Missing instrumentation gap
+          // No instrumentation gap
           makeSpan({
             op: 'queue',
             description: 'process',
@@ -704,12 +726,14 @@ async function completeTestSetup() {
   const virtualizedScrollContainer = getVirtualizedScrollContainer();
 
   // Awaits for the placeholder rendering rows to be removed
-  await findAllByText(virtualizedContainer, /transaction-op-/i, undefined, {
-    timeout: 5000,
-  }).catch(e => {
+  try {
+    await within(virtualizedContainer).findAllByText(/transaction-op-/i, undefined, {
+      timeout: 5000,
+    });
+  } catch (e) {
     printVirtualizedList(virtualizedContainer);
     throw e;
-  });
+  }
   return {...value, virtualizedContainer, virtualizedScrollContainer};
 }
 
@@ -811,6 +835,8 @@ async function assertHighlightedRowAtIndex(
 ) {
   await waitFor(() => {
     expect(virtualizedContainer.querySelectorAll('.TraceRow.Highlight')).toHaveLength(1);
+  });
+  await waitFor(() => {
     const highlighted_row = virtualizedContainer.querySelector(
       ACTIVE_SEARCH_HIGHLIGHT_ROW
     );
@@ -834,6 +860,7 @@ describe('trace view', () => {
   });
 
   it('renders loading state', async () => {
+    mockPerformanceSubscriptionDetailsResponse();
     mockTraceResponse();
     mockTraceMetaResponse();
     mockTraceTagsResponse();
@@ -843,6 +870,7 @@ describe('trace view', () => {
   });
 
   it('renders error state if trace fails to load', async () => {
+    mockPerformanceSubscriptionDetailsResponse();
     mockTraceResponse({statusCode: 404});
     mockTraceMetaResponse({statusCode: 404});
     mockTraceTagsResponse({statusCode: 404});
@@ -852,6 +880,7 @@ describe('trace view', () => {
   });
 
   it('renders error state if meta fails to load', async () => {
+    mockPerformanceSubscriptionDetailsResponse();
     mockTraceResponse({
       statusCode: 200,
       body: {
@@ -867,6 +896,7 @@ describe('trace view', () => {
   });
 
   it('renders empty state', async () => {
+    mockPerformanceSubscriptionDetailsResponse();
     mockTraceResponse({
       body: {
         transactions: [],
@@ -905,97 +935,97 @@ describe('trace view', () => {
       mockQueryString('?node=span-span0&node=txn-1');
 
       const {virtualizedContainer} = await completeTestSetup();
-      await findAllByText(virtualizedContainer, /Autogrouped/i);
+      await within(virtualizedContainer).findAllByText(/Autogrouped/i);
 
+      // We need to await a tick because the row is not focused until the next tick
+      const rows = getVirtualizedRows(virtualizedContainer);
       await waitFor(() => {
-        // We need to await a tick because the row is not focused until the next tick
-        const rows = getVirtualizedRows(virtualizedContainer);
         expect(rows[3]).toHaveFocus();
-        expect(rows[3].textContent?.includes('http — request')).toBe(true);
       });
+      expect(rows[3]!.textContent?.includes('http — request')).toBe(true);
     });
 
     it('scrolls to parent autogroup node', async () => {
       mockQueryString('?node=ag-redis0&node=txn-1');
 
       const {virtualizedContainer} = await completeTestSetup();
-      await findAllByText(virtualizedContainer, /Autogrouped/i);
+      await within(virtualizedContainer).findAllByText(/Autogrouped/i);
 
+      // We need to await a tick because the row is not focused until the next tick
+      const rows = getVirtualizedRows(virtualizedContainer);
       await waitFor(() => {
-        // We need to await a tick because the row is not focused until the next tick
-        const rows = getVirtualizedRows(virtualizedContainer);
         expect(rows[4]).toHaveFocus();
-        expect(rows[4].textContent?.includes('Autogrouped')).toBe(true);
       });
+      expect(rows[4]!.textContent?.includes('Autogrouped')).toBe(true);
     });
     it('scrolls to child of parent autogroup node', async () => {
       mockQueryString('?node=span-redis0&node=txn-1');
 
       const {virtualizedContainer} = await completeTestSetup();
-      await findAllByText(virtualizedContainer, /Autogrouped/i);
+      await within(virtualizedContainer).findAllByText(/Autogrouped/i);
 
+      // We need to await a tick because the row is not focused until the next tick
+      const rows = getVirtualizedRows(virtualizedContainer);
       await waitFor(() => {
-        // We need to await a tick because the row is not focused until the next tick
-        const rows = getVirtualizedRows(virtualizedContainer);
         expect(rows[5]).toHaveFocus();
-        expect(rows[5].textContent?.includes('db — redis')).toBe(true);
       });
+      expect(rows[5]!.textContent?.includes('db — redis')).toBe(true);
     });
 
     it('scrolls to sibling autogroup node', async () => {
       mockQueryString('?node=ag-http0&node=txn-1');
 
       const {virtualizedContainer} = await completeTestSetup();
-      await findAllByText(virtualizedContainer, /Autogrouped/i);
+      await within(virtualizedContainer).findAllByText(/Autogrouped/i);
+
+      // We need to await a tick because the row is not focused until the next tick
+      const rows = getVirtualizedRows(virtualizedContainer);
       await waitFor(() => {
-        // We need to await a tick because the row is not focused until the next tick
-        const rows = getVirtualizedRows(virtualizedContainer);
         expect(rows[5]).toHaveFocus();
-        expect(rows[5].textContent?.includes('5Autogrouped')).toBe(true);
       });
+      expect(rows[5]!.textContent?.includes('5Autogrouped')).toBe(true);
     });
 
     it('scrolls to child of sibling autogroup node', async () => {
       mockQueryString('?node=span-http0&node=txn-1');
 
       const {virtualizedContainer} = await completeTestSetup();
-      await findAllByText(virtualizedContainer, /Autogrouped/i);
+      await within(virtualizedContainer).findAllByText(/Autogrouped/i);
 
+      // We need to await a tick because the row is not focused until the next tick
+      const rows = getVirtualizedRows(virtualizedContainer);
       await waitFor(() => {
-        // We need to await a tick because the row is not focused until the next tick
-        const rows = getVirtualizedRows(virtualizedContainer);
         expect(rows[6]).toHaveFocus();
-        expect(rows[6].textContent?.includes('http — request')).toBe(true);
       });
+      expect(rows[6]!.textContent?.includes('http — request')).toBe(true);
     });
 
     it('scrolls to missing instrumentation node', async () => {
       mockQueryString('?node=ms-queueprocess0&node=txn-1');
 
       const {virtualizedContainer} = await completeTestSetup();
-      await findAllByText(virtualizedContainer, /Autogrouped/i);
+      await within(virtualizedContainer).findAllByText(/Autogrouped/i);
 
       // We need to await a tick because the row is not focused until the next ticks
       const rows = getVirtualizedRows(virtualizedContainer);
-
       await waitFor(() => {
         expect(rows[7]).toHaveFocus();
-        expect(rows[7].textContent?.includes('Missing instrumentation')).toBe(true);
       });
+      expect(rows[7]!.textContent?.includes('No Instrumentation')).toBe(true);
     });
 
     it('scrolls to trace error node', async () => {
       mockQueryString('?node=error-error0&node=txn-1');
 
       const {virtualizedContainer} = await completeTestSetup();
-      await findAllByText(virtualizedContainer, /Autogrouped/i);
+      await within(virtualizedContainer).findAllByText(/Autogrouped/i);
 
+      // We need to await a tick because the row is not focused until the next ticks
+      const rows = getVirtualizedRows(virtualizedContainer);
       await waitFor(() => {
-        // We need to await a tick because the row is not focused until the next ticks
-        const rows = getVirtualizedRows(virtualizedContainer);
         expect(rows[11]).toHaveFocus();
-        expect(rows[11].textContent?.includes('error-title')).toBe(true);
       });
+      expect(rows[11]!.textContent?.includes('error-title')).toBe(true);
     });
 
     it('scrolls to event id query param', async () => {
@@ -1011,13 +1041,13 @@ describe('trace view', () => {
     it('supports expanded node path', async () => {
       mockQueryString('?node=span-span0&node=txn-1&span-0&node=txn-0');
       const {virtualizedContainer} = await completeTestSetup();
-      await findAllByText(virtualizedContainer, /Autogrouped/i);
+      await within(virtualizedContainer).findAllByText(/Autogrouped/i);
 
+      const rows = getVirtualizedRows(virtualizedContainer);
       await waitFor(() => {
-        const rows = getVirtualizedRows(virtualizedContainer);
         expect(rows[3]).toHaveFocus();
-        expect(rows[3].textContent?.includes('http — request')).toBe(true);
       });
+      expect(rows[3]!.textContent?.includes('http — request')).toBe(true);
     });
 
     it.each([
@@ -1049,7 +1079,7 @@ describe('trace view', () => {
 
       const {virtualizedContainer} = await completeTestSetup();
 
-      await findAllByText(virtualizedContainer, /process/i);
+      await within(virtualizedContainer).findAllByText(/process/i);
       expect(screen.queryByText(/Autogrouped/i)).not.toBeInTheDocument();
     });
 
@@ -1059,7 +1089,7 @@ describe('trace view', () => {
 
       const {virtualizedContainer} = await completeTestSetup();
 
-      await findAllByText(virtualizedContainer, /process/i);
+      await within(virtualizedContainer).findAllByText(/process/i);
       expect(screen.queryByText(/Missing instrumentation/i)).not.toBeInTheDocument();
     });
 
@@ -1069,7 +1099,7 @@ describe('trace view', () => {
         mockQueryString('?node=span-span0&node=txn-1');
 
         const {virtualizedContainer} = await completeTestSetup();
-        await findAllByText(virtualizedContainer, /Autogrouped/i);
+        await within(virtualizedContainer).findAllByText(/Autogrouped/i);
 
         const preferencesDropdownTrigger = screen.getByLabelText('Trace Preferences');
         await userEvent.click(preferencesDropdownTrigger);
@@ -1094,25 +1124,26 @@ describe('trace view', () => {
         mockQueryString('?node=span-span0&node=txn-1');
 
         const {virtualizedContainer} = await completeTestSetup();
-        await findAllByText(virtualizedContainer, /Missing instrumentation/i);
+        await within(virtualizedContainer).findAllByText(/No Instrumentation/i);
 
         const preferencesDropdownTrigger = screen.getByLabelText('Trace Preferences');
-
-        // Toggle missing instrumentation off
         await userEvent.click(preferencesDropdownTrigger);
 
-        expect(await screen.findByText('Missing Instrumentation')).toBeInTheDocument();
+        expect(await screen.findAllByText('No Instrumentation')).toHaveLength(2);
 
-        // Toggle missing instrumentation off
-        await userEvent.click(await screen.findByText('Missing Instrumentation'));
+        // Toggle autogrouping off
+        const autogroupingOption = await screen.findByTestId('no-instrumentation');
+        await userEvent.click(autogroupingOption);
 
-        await waitFor(() => {
-          expect(screen.queryByText('Missing instrumentation')).not.toBeInTheDocument();
+        await waitFor(async () => {
+          expect(await screen.findAllByText('No Instrumentation')).toHaveLength(1);
         });
 
-        // Toggle missing instrumentation on
-        await userEvent.click(await screen.findByText('Missing Instrumentation'));
-        expect(await screen.findAllByText('Missing instrumentation')).toHaveLength(1);
+        // Toggle autogrouping back on
+        await userEvent.click(autogroupingOption);
+        await waitFor(async () => {
+          expect(await screen.findAllByText('No Instrumentation')).toHaveLength(2);
+        });
       });
     });
   });
@@ -1122,7 +1153,7 @@ describe('trace view', () => {
       const {virtualizedContainer} = await keyboardNavigationTestSetup();
       const rows = getVirtualizedRows(virtualizedContainer);
 
-      await userEvent.click(rows[0]);
+      await userEvent.click(rows[0]!);
       await waitFor(() => expect(rows[0]).toHaveFocus());
 
       await userEvent.keyboard('{arrowdown}');
@@ -1133,7 +1164,7 @@ describe('trace view', () => {
       const {virtualizedContainer} = await keyboardNavigationTestSetup();
       const rows = getVirtualizedRows(virtualizedContainer);
 
-      await userEvent.click(rows[1]);
+      await userEvent.click(rows[1]!);
       await waitFor(() => expect(rows[1]).toHaveFocus());
 
       await userEvent.keyboard('{arrowup}');
@@ -1153,12 +1184,12 @@ describe('trace view', () => {
           ],
         }
       );
-      await userEvent.click(rows[1]);
+      await userEvent.click(rows[1]!);
       await waitFor(() => expect(rows[1]).toHaveFocus());
 
       await userEvent.keyboard('{arrowright}');
       await waitFor(() => {
-        expect(screen.queryByText('special-span')).toBeInTheDocument();
+        expect(screen.getByText('special-span')).toBeInTheDocument();
       });
     });
 
@@ -1175,7 +1206,7 @@ describe('trace view', () => {
           ],
         }
       );
-      await userEvent.click(rows[1]);
+      await userEvent.click(rows[1]!);
       await waitFor(() => expect(rows[1]).toHaveFocus());
 
       await userEvent.keyboard('{arrowright}');
@@ -1192,7 +1223,7 @@ describe('trace view', () => {
       const {virtualizedContainer} = await keyboardNavigationTestSetup();
       const rows = getVirtualizedRows(virtualizedContainer);
 
-      await userEvent.click(rows[0]);
+      await userEvent.click(rows[0]!);
       await waitFor(() => expect(rows[0]).toHaveFocus());
 
       await userEvent.keyboard('{arrowleft}');
@@ -1203,7 +1234,7 @@ describe('trace view', () => {
       const {virtualizedContainer} = await nestedTransactionsTestSetup();
       const rows = getVirtualizedRows(virtualizedContainer);
 
-      await userEvent.click(rows[1]);
+      await userEvent.click(rows[1]!);
       await waitFor(() => expect(rows[1]).toHaveFocus());
 
       await userEvent.keyboard('{arrowleft}');
@@ -1224,7 +1255,7 @@ describe('trace view', () => {
         }
       );
 
-      await userEvent.click(rows[1]);
+      await userEvent.click(rows[1]!);
       await waitFor(() => expect(rows[1]).toHaveFocus());
 
       expect(await screen.findByTestId('trace-drawer-title')).toHaveTextContent(
@@ -1250,13 +1281,13 @@ describe('trace view', () => {
       const {virtualizedContainer} = await keyboardNavigationTestSetup();
 
       let rows = getVirtualizedRows(virtualizedContainer);
-      await userEvent.click(rows[0]);
+      await userEvent.click(rows[0]!);
 
       await waitFor(() => expect(rows[0]).toHaveFocus());
       await userEvent.keyboard('{arrowup}');
 
       expect(
-        await findByText(virtualizedContainer, /transaction-op-99/i)
+        await within(virtualizedContainer).findByText(/transaction-op-99/i)
       ).toBeInTheDocument();
 
       await waitFor(() => {
@@ -1269,7 +1300,7 @@ describe('trace view', () => {
       const {virtualizedContainer} = await keyboardNavigationTestSetup();
 
       let rows = getVirtualizedRows(virtualizedContainer);
-      await userEvent.click(rows[0]);
+      await userEvent.click(rows[0]!);
       await waitFor(() => expect(rows[0]).toHaveFocus());
 
       await userEvent.keyboard('{arrowup}');
@@ -1295,7 +1326,7 @@ describe('trace view', () => {
       const {virtualizedContainer} = await keyboardNavigationTestSetup();
 
       let rows = getVirtualizedRows(virtualizedContainer);
-      await userEvent.click(rows[0]);
+      await userEvent.click(rows[0]!);
 
       await waitFor(() => expect(rows[0]).toHaveFocus());
       await userEvent.keyboard('{tab}');
@@ -1310,7 +1341,7 @@ describe('trace view', () => {
       const {virtualizedContainer} = await keyboardNavigationTestSetup();
 
       let rows = getVirtualizedRows(virtualizedContainer);
-      await userEvent.click(rows[1]);
+      await userEvent.click(rows[1]!);
 
       await waitFor(() => {
         rows = getVirtualizedRows(virtualizedContainer);
@@ -1328,7 +1359,7 @@ describe('trace view', () => {
       const {container, virtualizedContainer} = await keyboardNavigationTestSetup();
 
       let rows = container.querySelectorAll(VISIBLE_TRACE_ROW_SELECTOR);
-      await userEvent.click(rows[0]);
+      await userEvent.click(rows[0]!);
 
       await waitFor(() => {
         rows = container.querySelectorAll(VISIBLE_TRACE_ROW_SELECTOR);
@@ -1337,7 +1368,7 @@ describe('trace view', () => {
       await userEvent.keyboard('{Shift>}{arrowdown}{/Shift}');
 
       expect(
-        await findByText(virtualizedContainer, /transaction-op-99/i)
+        await within(virtualizedContainer).findByText(/transaction-op-99/i)
       ).toBeInTheDocument();
       await waitFor(() => {
         rows = container.querySelectorAll(VISIBLE_TRACE_ROW_SELECTOR);
@@ -1350,7 +1381,7 @@ describe('trace view', () => {
 
       let rows = getVirtualizedRows(virtualizedContainer);
 
-      await userEvent.click(rows[1]);
+      await userEvent.click(rows[1]!);
       await waitFor(() => {
         rows = getVirtualizedRows(virtualizedContainer);
         expect(rows[1]).toHaveFocus();
@@ -1358,7 +1389,7 @@ describe('trace view', () => {
 
       await userEvent.keyboard('{Shift>}{arrowdown}{/Shift}');
       expect(
-        await findByText(virtualizedContainer, /transaction-op-99/i)
+        await within(virtualizedContainer).findByText(/transaction-op-99/i)
       ).toBeInTheDocument();
 
       await waitFor(() => {
@@ -1369,7 +1400,7 @@ describe('trace view', () => {
       await userEvent.keyboard('{Shift>}{arrowup}{/Shift}');
 
       expect(
-        await findByText(virtualizedContainer, /transaction-op-0/i)
+        await within(virtualizedContainer).findByText(/transaction-op-0/i)
       ).toBeInTheDocument();
 
       await waitFor(() => {
@@ -1555,7 +1586,7 @@ describe('trace view', () => {
       );
 
       // Click on a random row in the list that is not a search result
-      await userEvent.click(rows[5]);
+      await userEvent.click(rows[5]!);
       await waitFor(() => {
         expect(screen.queryByTestId('trace-search-result-iterator')).toHaveTextContent(
           '-/2'
@@ -1563,7 +1594,7 @@ describe('trace view', () => {
       });
 
       // Click on a the row in the list that is a search result
-      await userEvent.click(rows[2]);
+      await userEvent.click(rows[2]!);
       await waitFor(() => {
         expect(screen.queryByTestId('trace-search-result-iterator')).toHaveTextContent(
           '1/2'
@@ -1572,6 +1603,7 @@ describe('trace view', () => {
     });
 
     it('during search, expanding a row retriggers search', async () => {
+      mockPerformanceSubscriptionDetailsResponse();
       mockTraceRootFacets();
       mockTraceRootEvent('0');
       mockTraceEventDetails();
@@ -1658,7 +1690,7 @@ describe('trace view', () => {
       const {container} = render(<TraceView />, {router});
 
       // Awaits for the placeholder rendering rows to be removed
-      await findByText(container, /transaction-op-0/i);
+      await within(container).findByText(/transaction-op-0/i);
 
       const searchInput = await screen.findByPlaceholderText('Search in trace');
       await userEvent.type(searchInput, 'op-0');
@@ -1673,7 +1705,7 @@ describe('trace view', () => {
       });
 
       const open = await screen.findAllByRole('button', {name: '+'});
-      await userEvent.click(open[0]);
+      await userEvent.click(open[0]!);
 
       await waitFor(() => {
         expect(screen.queryByTestId('trace-search-result-iterator')).toHaveTextContent(
@@ -1725,6 +1757,7 @@ describe('trace view', () => {
       await userEvent.clear(searchInput);
       await userEvent.type(searchInput, 'transaction-op-none');
       await searchToResolve();
+      // eslint-disable-next-line testing-library/no-container
       expect(container.querySelectorAll('.TraceRow.Highlight')).toHaveLength(0);
     });
   });
@@ -1734,7 +1767,7 @@ describe('trace view', () => {
       const {virtualizedContainer} = await simpleTestSetup();
       const rows = getVirtualizedRows(virtualizedContainer);
       expect(screen.queryAllByTestId(DRAWER_TABS_TEST_ID)).toHaveLength(1);
-      await userEvent.click(rows[5]);
+      await userEvent.click(rows[5]!);
 
       await waitFor(() => {
         expect(screen.queryAllByTestId(DRAWER_TABS_TEST_ID)).toHaveLength(2);
@@ -1746,23 +1779,25 @@ describe('trace view', () => {
       const rows = getVirtualizedRows(virtualizedContainer);
       expect(screen.queryAllByTestId(DRAWER_TABS_TEST_ID)).toHaveLength(1);
 
-      await userEvent.click(rows[5]);
+      await userEvent.click(rows[5]!);
 
       await waitFor(() => {
         expect(screen.queryAllByTestId(DRAWER_TABS_TEST_ID)).toHaveLength(2);
-        expect(
-          screen
-            .queryAllByTestId(DRAWER_TABS_TEST_ID)[1]
-            .textContent?.includes('transaction-op-4')
-        ).toBeTruthy();
       });
+      expect(
+        screen
+          .getAllByTestId(DRAWER_TABS_TEST_ID)[1]!
+          .textContent?.includes('transaction-op-4')
+      ).toBeTruthy();
 
-      await userEvent.click(rows[7]);
+      await userEvent.click(rows[7]!);
       await waitFor(() => {
         expect(screen.queryAllByTestId(DRAWER_TABS_TEST_ID)).toHaveLength(2);
+      });
+      await waitFor(() => {
         expect(
           screen
-            .queryAllByTestId(DRAWER_TABS_TEST_ID)[1]
+            .getAllByTestId(DRAWER_TABS_TEST_ID)[1]!
             .textContent?.includes('transaction-op-6')
         ).toBeTruthy();
       });
@@ -1773,27 +1808,27 @@ describe('trace view', () => {
       const rows = getVirtualizedRows(virtualizedContainer);
       expect(screen.queryAllByTestId(DRAWER_TABS_TEST_ID)).toHaveLength(1);
 
-      await userEvent.click(rows[5]);
+      await userEvent.click(rows[5]!);
       await waitFor(() => {
         expect(screen.queryAllByTestId(DRAWER_TABS_TEST_ID)).toHaveLength(2);
       });
 
       await userEvent.click(await screen.findByTestId(DRAWER_TABS_PIN_BUTTON_TEST_ID));
-      await userEvent.click(rows[7]);
+      await userEvent.click(rows[7]!);
 
       await waitFor(() => {
         expect(screen.queryAllByTestId(DRAWER_TABS_TEST_ID)).toHaveLength(3);
-        expect(
-          screen
-            .queryAllByTestId(DRAWER_TABS_TEST_ID)[1]
-            .textContent?.includes('transaction-op-4')
-        ).toBeTruthy();
-        expect(
-          screen
-            .queryAllByTestId(DRAWER_TABS_TEST_ID)[2]
-            .textContent?.includes('transaction-op-6')
-        ).toBeTruthy();
       });
+      expect(
+        screen
+          .getAllByTestId(DRAWER_TABS_TEST_ID)[1]!
+          .textContent?.includes('transaction-op-4')
+      ).toBeTruthy();
+      expect(
+        screen
+          .getAllByTestId(DRAWER_TABS_TEST_ID)[2]!
+          .textContent?.includes('transaction-op-6')
+      ).toBeTruthy();
     });
 
     it('unpinning a tab removes it', async () => {
@@ -1801,13 +1836,13 @@ describe('trace view', () => {
       const rows = getVirtualizedRows(virtualizedContainer);
       expect(screen.queryAllByTestId(DRAWER_TABS_TEST_ID)).toHaveLength(1);
 
-      await userEvent.click(rows[5]);
+      await userEvent.click(rows[5]!);
       await waitFor(() => {
         expect(screen.queryAllByTestId(DRAWER_TABS_TEST_ID)).toHaveLength(2);
       });
 
       await userEvent.click(await screen.findByTestId(DRAWER_TABS_PIN_BUTTON_TEST_ID));
-      await userEvent.click(rows[7]);
+      await userEvent.click(rows[7]!);
 
       await waitFor(() => {
         expect(screen.queryAllByTestId(DRAWER_TABS_TEST_ID)).toHaveLength(3);
@@ -1816,7 +1851,7 @@ describe('trace view', () => {
       const tabButtons = screen.queryAllByTestId(DRAWER_TABS_PIN_BUTTON_TEST_ID);
       expect(tabButtons).toHaveLength(2);
 
-      await userEvent.click(tabButtons[0]);
+      await userEvent.click(tabButtons[0]!);
       await waitFor(() => {
         expect(screen.queryAllByTestId(DRAWER_TABS_TEST_ID)).toHaveLength(2);
       });
@@ -1827,30 +1862,30 @@ describe('trace view', () => {
       const rows = getVirtualizedRows(virtualizedContainer);
       expect(screen.queryAllByTestId(DRAWER_TABS_TEST_ID)).toHaveLength(1);
 
-      await userEvent.click(rows[5]);
+      await userEvent.click(rows[5]!);
       await waitFor(() => {
         expect(screen.queryAllByTestId(DRAWER_TABS_TEST_ID)).toHaveLength(2);
       });
 
       await userEvent.click(await screen.findByTestId(DRAWER_TABS_PIN_BUTTON_TEST_ID));
-      await userEvent.click(rows[7]);
+      await userEvent.click(rows[7]!);
 
       await waitFor(() => {
         expect(screen.queryAllByTestId(DRAWER_TABS_TEST_ID)).toHaveLength(3);
-        expect(screen.queryAllByTestId(DRAWER_TABS_TEST_ID)[2]).toHaveAttribute(
-          'aria-selected',
-          'true'
-        );
       });
+      expect(screen.queryAllByTestId(DRAWER_TABS_TEST_ID)[2]).toHaveAttribute(
+        'aria-selected',
+        'true'
+      );
 
-      await userEvent.click(rows[5]);
+      await userEvent.click(rows[5]!);
       await waitFor(() => {
         expect(screen.queryAllByTestId(DRAWER_TABS_TEST_ID)[1]).toHaveAttribute(
           'aria-selected',
           'true'
         );
-        expect(screen.queryAllByTestId(DRAWER_TABS_TEST_ID)).toHaveLength(3);
       });
+      expect(screen.queryAllByTestId(DRAWER_TABS_TEST_ID)).toHaveLength(3);
     });
   });
 });
diff --git a/static/app/views/performance/newTraceDetails/trace.tsx b/static/app/views/performance/newTraceDetails/trace.tsx
index ea884b7fd45a52..73a9521819a9c6 100644
--- a/static/app/views/performance/newTraceDetails/trace.tsx
+++ b/static/app/views/performance/newTraceDetails/trace.tsx
@@ -21,6 +21,10 @@ import {replayPlayerTimestampEmitter} from 'sentry/utils/replays/replayPlayerTim
 import useApi from 'sentry/utils/useApi';
 import useOrganization from 'sentry/utils/useOrganization';
 import useProjects from 'sentry/utils/useProjects';
+import {
+  scoreToStatus,
+  STATUS_TEXT,
+} from 'sentry/views/insights/browser/webVitals/utils/scoreToStatus';
 
 import {TraceTree} from './traceModels/traceTree';
 import type {TraceTreeNode} from './traceModels/traceTreeNode';
@@ -263,7 +267,7 @@ export function Trace({
         traceDispatch({
           type: 'set roving index',
           index: nextIndex,
-          node: treeRef.current.list[nextIndex],
+          node: treeRef.current.list[nextIndex]!,
           action_source: 'keyboard',
         });
       }
@@ -371,7 +375,7 @@ export function Trace({
     manager,
     items: trace.list,
     container: scrollContainer,
-    render: render,
+    render,
     scheduler,
   });
 
@@ -397,14 +401,19 @@ export function Trace({
       >
         {trace.indicators.length > 0
           ? trace.indicators.map((indicator, i) => {
+              const status =
+                indicator.score === undefined
+                  ? 'none'
+                  : STATUS_TEXT[scoreToStatus(indicator.score)];
+
               return (
                 <div
                   key={i}
                   ref={r => manager.registerIndicatorRef(r, i, indicator)}
                   className={`TraceIndicator ${indicator.poor ? 'Errored' : ''}`}
                 >
-                  <div className="TraceIndicatorLabel">{indicator.label}</div>
-                  <div className="TraceIndicatorLine" />
+                  <div className={`TraceIndicatorLabel ${status}`}>{indicator.label}</div>
+                  <div className={`TraceIndicatorLine ${status}`} />
                 </div>
               );
             })
@@ -875,6 +884,24 @@ const TraceStylingWrapper = styled('div')`
       line-height: 1;
       margin-top: 2px;
       white-space: nowrap;
+
+      &.Poor {
+        color: ${p => p.theme.red300};
+        border: 1px solid ${p => p.theme.red300};
+        background: ${p => p.theme.red100};
+      }
+
+      &.Meh {
+        color: ${p => p.theme.yellow400};
+        border: 1px solid ${p => p.theme.yellow300};
+        background: ${p => p.theme.yellow100};
+      }
+
+      &.Good {
+        color: ${p => p.theme.green300};
+        border: 1px solid ${p => p.theme.green300};
+        background: ${p => p.theme.green100};
+      }
     }
 
     .TraceIndicatorLine {
@@ -883,13 +910,40 @@ const TraceStylingWrapper = styled('div')`
       top: 20px;
       position: absolute;
       left: 50%;
-      transform: translateX(-2px);
+      transform: translate(-2px, -7px);
       background: repeating-linear-gradient(
           to bottom,
           transparent 0 4px,
           ${p => p.theme.textColor} 4px 8px
         )
         80%/2px 100% no-repeat;
+
+      &.Poor {
+        background: repeating-linear-gradient(
+            to bottom,
+            transparent 0 4px,
+            ${p => p.theme.red300} 4px 8px
+          )
+          80%/2px 100% no-repeat;
+      }
+
+      &.Meh {
+        background: repeating-linear-gradient(
+            to bottom,
+            transparent 0 4px,
+            ${p => p.theme.yellow300} 4px 8px
+          )
+          80%/2px 100% no-repeat;
+      }
+
+      &.Good {
+        background: repeating-linear-gradient(
+            to bottom,
+            transparent 0 4px,
+            ${p => p.theme.green300} 4px 8px
+          )
+          80%/2px 100% no-repeat;
+      }
     }
 
     .Indicator {
diff --git a/static/app/views/performance/newTraceDetails/traceActionsMenu.tsx b/static/app/views/performance/newTraceDetails/traceActionsMenu.tsx
index 01e01a37c8a8ee..a45242e7609d7e 100644
--- a/static/app/views/performance/newTraceDetails/traceActionsMenu.tsx
+++ b/static/app/views/performance/newTraceDetails/traceActionsMenu.tsx
@@ -47,7 +47,7 @@ function TraceActionsMenu({
           label: t('Open Events in Discover'),
           onAction: () => {
             trackAnalytics('performance_views.trace_view.open_in_discover', {
-              organization: organization,
+              organization,
             });
             const target = traceEventView.getResultsViewUrlTarget(
               organization.slug,
diff --git a/static/app/views/performance/newTraceDetails/traceAnalytics.tsx b/static/app/views/performance/newTraceDetails/traceAnalytics.tsx
index a64157282041b9..fc423cb5bf46d7 100644
--- a/static/app/views/performance/newTraceDetails/traceAnalytics.tsx
+++ b/static/app/views/performance/newTraceDetails/traceAnalytics.tsx
@@ -1,4 +1,5 @@
 import * as Sentry from '@sentry/react';
+import * as qs from 'query-string';
 
 import type {Organization} from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
@@ -9,7 +10,8 @@ import {TraceShape, type TraceTree} from './traceModels/traceTree';
 const trackTraceMetadata = (
   tree: TraceTree,
   projects: Project[],
-  organization: Organization
+  organization: Organization,
+  hasExceededPerformanceUsageLimit: boolean | null
 ) => {
   Sentry.metrics.increment(`trace.trace_shape.${tree.shape}`);
 
@@ -25,10 +27,14 @@ const trackTraceMetadata = (
     .filter(p => projectSlugs.includes(p.slug))
     .map(project => project?.platform ?? '');
 
+  const query = qs.parse(location.search);
+
   trackAnalytics('trace.metadata', {
     shape: tree.shape,
     // round trace_duration_seconds to nearest two decimal places
     trace_duration_seconds: Math.round(trace_duration_seconds * 100) / 100,
+    has_exceeded_performance_usage_limit: hasExceededPerformanceUsageLimit,
+    referrer: query.source?.toString() || null,
     num_root_children: tree.root.children.length,
     num_nodes: tree.list.length,
     project_platforms: projectPlatforms,
@@ -169,7 +175,8 @@ const trackMissingInstrumentationPreferenceChange = (
 function trackTraceShape(
   tree: TraceTree,
   projects: Project[],
-  organization: Organization
+  organization: Organization,
+  hasExceededPerformanceUsageLimit: boolean | null
 ) {
   switch (tree.shape) {
     case TraceShape.BROKEN_SUBTRACES:
@@ -179,7 +186,12 @@ function trackTraceShape(
     case TraceShape.NO_ROOT:
     case TraceShape.ONLY_ERRORS:
     case TraceShape.BROWSER_MULTIPLE_ROOTS:
-      traceAnalytics.trackTraceMetadata(tree, projects, organization);
+      traceAnalytics.trackTraceMetadata(
+        tree,
+        projects,
+        organization,
+        hasExceededPerformanceUsageLimit
+      );
       break;
     default: {
       Sentry.captureMessage('Unknown trace type');
diff --git a/static/app/views/performance/newTraceDetails/traceApi/useIssuesTraceTree.tsx b/static/app/views/performance/newTraceDetails/traceApi/useIssuesTraceTree.tsx
index 949ad6da23899f..39f13c0c07220e 100644
--- a/static/app/views/performance/newTraceDetails/traceApi/useIssuesTraceTree.tsx
+++ b/static/app/views/performance/newTraceDetails/traceApi/useIssuesTraceTree.tsx
@@ -84,7 +84,7 @@ export function useIssuesTraceTree({
     if (trace.data && meta.data) {
       const newTree = IssuesTraceTree.FromTrace(trace.data, {
         meta: meta.data,
-        replay: replay,
+        replay,
       });
 
       setTree(newTree);
diff --git a/static/app/views/performance/newTraceDetails/traceApi/useTrace.tsx b/static/app/views/performance/newTraceDetails/traceApi/useTrace.tsx
index 51d046b4f9f925..4ec42cff4bdabf 100644
--- a/static/app/views/performance/newTraceDetails/traceApi/useTrace.tsx
+++ b/static/app/views/performance/newTraceDetails/traceApi/useTrace.tsx
@@ -108,7 +108,7 @@ function parseDemoEventSlug(
   }
 
   const [project_slug, event_id] = demoEventSlug.split(':');
-  return {project_slug, event_id};
+  return {project_slug: project_slug!, event_id: event_id!};
 }
 
 function makeTraceFromTransaction(
diff --git a/static/app/views/performance/newTraceDetails/traceApi/useTraceMeta.tsx b/static/app/views/performance/newTraceDetails/traceApi/useTraceMeta.tsx
index f058763a624c38..63aada13ad6211 100644
--- a/static/app/views/performance/newTraceDetails/traceApi/useTraceMeta.tsx
+++ b/static/app/views/performance/newTraceDetails/traceApi/useTraceMeta.tsx
@@ -124,7 +124,6 @@ export function useTraceMeta(replayTraces: ReplayTrace[]): TraceMetaQueryResults
     return normalizeDateTimeParams(query, {
       allowAbsolutePageDatetime: true,
     });
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   // demo has the format ${projectSlug}:${eventId}
diff --git a/static/app/views/performance/newTraceDetails/traceApi/useTraceTree.spec.tsx b/static/app/views/performance/newTraceDetails/traceApi/useTraceTree.spec.tsx
index 13d58680b348aa..b309ea5a2a1b2f 100644
--- a/static/app/views/performance/newTraceDetails/traceApi/useTraceTree.spec.tsx
+++ b/static/app/views/performance/newTraceDetails/traceApi/useTraceTree.spec.tsx
@@ -154,7 +154,7 @@ describe('useTraceTree', () => {
 
     await waitFor(() => {
       expect(result.current.type).toBe('trace');
-      expect(result.current.list).toHaveLength(7);
     });
+    expect(result.current.list).toHaveLength(7);
   });
 });
diff --git a/static/app/views/performance/newTraceDetails/traceApi/useTraceTree.tsx b/static/app/views/performance/newTraceDetails/traceApi/useTraceTree.tsx
index 6cbdc7c62003f6..057126f9c56a3b 100644
--- a/static/app/views/performance/newTraceDetails/traceApi/useTraceTree.tsx
+++ b/static/app/views/performance/newTraceDetails/traceApi/useTraceTree.tsx
@@ -83,7 +83,7 @@ export function useTraceTree({
     if (trace.data && meta.data) {
       const newTree = TraceTree.FromTrace(trace.data, {
         meta: meta.data,
-        replay: replay,
+        replay,
       });
 
       setTree(newTree);
diff --git a/static/app/views/performance/newTraceDetails/traceConfigurations.tsx b/static/app/views/performance/newTraceDetails/traceConfigurations.tsx
index 5af635ab0597a2..ec4ab4e8e41a28 100644
--- a/static/app/views/performance/newTraceDetails/traceConfigurations.tsx
+++ b/static/app/views/performance/newTraceDetails/traceConfigurations.tsx
@@ -57,7 +57,7 @@ function parsePlatform(platform: string): ParsedPlatform {
   // For example: dotnet-google-cloud-functions, we want to split it into
   // platformName: dotnet, framework: google-cloud-functions
   if (platformParts.length >= 3) {
-    return {platformName: platformParts[0], framework: platformParts.slice(1).join('-')};
+    return {platformName: platformParts[0]!, framework: platformParts.slice(1).join('-')};
   }
 
   // With some exceptions, all other project platforms have the following two structures:
@@ -66,18 +66,18 @@ function parsePlatform(platform: string): ParsedPlatform {
   const [platformName, framework] = platformParts;
 
   if (platform === 'react-native') {
-    return {platformName};
+    return {platformName: platformName!};
   }
 
   if (platform.includes('awslambda')) {
-    return {platformName, framework: 'aws-lambda'};
+    return {platformName: platformName!, framework: 'aws-lambda'};
   }
 
   if (platform.includes('gcpfunctions')) {
-    return {platformName, framework: 'gcp-functions'};
+    return {platformName: platformName!, framework: 'gcp-functions'};
   }
 
-  return {platformName, framework};
+  return {platformName: platformName!, framework: framework!};
 }
 
 export function getCustomInstrumentationLink(project: Project | undefined): string {
diff --git a/static/app/views/performance/newTraceDetails/traceContextPanel.tsx b/static/app/views/performance/newTraceDetails/traceContextPanel.tsx
index 329442d1fe5a9c..10d360d5b210d6 100644
--- a/static/app/views/performance/newTraceDetails/traceContextPanel.tsx
+++ b/static/app/views/performance/newTraceDetails/traceContextPanel.tsx
@@ -1,4 +1,4 @@
-import {useCallback, useRef, useState} from 'react';
+import {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import styled from '@emotion/styled';
 
 import EventTagsTree from 'sentry/components/events/eventTags/eventTagsTree';
@@ -12,6 +12,11 @@ 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';
+import {
+  DEFAULT_TRACE_VIEW_PREFERENCES,
+  loadTraceViewPreferences,
+} from 'sentry/views/performance/newTraceDetails/traceState/tracePreferences';
+import {useTraceStateDispatch} from 'sentry/views/performance/newTraceDetails/traceState/traceStateProvider';
 
 const MIN_HEIGHT = 0;
 const DEFAULT_HEIGHT = 150;
@@ -25,6 +30,23 @@ type Props = {
 export function TraceContextPanel({tree, rootEvent}: Props) {
   const [height, setHeight] = useState(DEFAULT_HEIGHT);
   const containerRef = useRef<HTMLDivElement>(null);
+  const traceDispatch = useTraceStateDispatch();
+
+  const preferences = useMemo(
+    () =>
+      loadTraceViewPreferences('trace-view-preferences') ||
+      DEFAULT_TRACE_VIEW_PREFERENCES,
+    []
+  );
+
+  useEffect(() => {
+    const loadedHeight = preferences.drawer.sizes['trace context height'];
+
+    if (containerRef.current && loadedHeight !== undefined) {
+      setHeight(loadedHeight);
+      containerRef.current.style.setProperty('--panel-height', `${loadedHeight}px`);
+    }
+  }, [preferences.drawer.sizes, containerRef]);
 
   const handleMouseDown = useCallback(
     (event: React.MouseEvent) => {
@@ -62,6 +84,7 @@ export function TraceContextPanel({tree, rootEvent}: Props) {
         );
 
         setHeight(finalHeight);
+        traceDispatch({type: 'set trace context height', payload: finalHeight});
 
         window.removeEventListener('mousemove', handleMouseMove);
         window.removeEventListener('mouseup', handleMouseUp);
@@ -70,7 +93,7 @@ export function TraceContextPanel({tree, rootEvent}: Props) {
       window.addEventListener('mousemove', handleMouseMove);
       window.addEventListener('mouseup', handleMouseUp);
     },
-    [height]
+    [height, traceDispatch]
   );
 
   const renderTags = useCallback(() => {
@@ -146,8 +169,8 @@ const GrabberContainer = styled(Container)`
 `;
 
 const VitalMetersContainer = styled('div')`
-  justify-content: center;
   display: flex;
+  justify-content: space-between;
   flex-direction: row;
   gap: ${space(1)};
   width: 100%;
diff --git a/static/app/views/performance/newTraceDetails/traceContextVitals.tsx b/static/app/views/performance/newTraceDetails/traceContextVitals.tsx
index 4f0589a6f07698..57ceab29eb5b8e 100644
--- a/static/app/views/performance/newTraceDetails/traceContextVitals.tsx
+++ b/static/app/views/performance/newTraceDetails/traceContextVitals.tsx
@@ -1,6 +1,4 @@
-import {useTheme} from '@emotion/react';
-
-import {VitalMeter} from 'sentry/views/insights/browser/webVitals/components/webVitalMeters';
+import {VitalPill} 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';
 
@@ -11,8 +9,6 @@ type Props = {
 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))
@@ -22,37 +18,16 @@ export function TraceContextVitals({tree}: Props) {
     return null;
   }
 
-  return ALLOWED_VITALS.map((webVital, index) => {
+  return ALLOWED_VITALS.map(webVital => {
     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}
+      <VitalPill
+        key={vital?.key}
+        webVital={webVital as WebVitals}
+        score={vital?.score}
+        meterValue={vital?.measurement.value}
       />
     );
   });
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/autogroup/index.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/autogroup/index.tsx
index 4f40da23ba8827..40d01322d9999b 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/autogroup/index.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/autogroup/index.tsx
@@ -36,7 +36,7 @@ export function AutogroupNodeDetails(
   }
 
   return (
-    <TraceDrawerComponents.DetailContainer hasNewTraceUi={hasTraceNewUi}>
+    <TraceDrawerComponents.DetailContainer>
       <TraceDrawerComponents.HeaderContainer>
         <TraceDrawerComponents.Title>
           <TraceDrawerComponents.LegacyTitleText>
@@ -54,20 +54,22 @@ export function AutogroupNodeDetails(
           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.BodyContainer hasNewTraceUi={hasTraceNewUi}>
+        <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.BodyContainer>
     </TraceDrawerComponents.DetailContainer>
   );
 }
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/autogroup/parentAutogroup.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/autogroup/parentAutogroup.tsx
index 89fbc4e222de00..592b9f6f7f742e 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/autogroup/parentAutogroup.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/autogroup/parentAutogroup.tsx
@@ -76,10 +76,11 @@ export function ParentAutogroupNodeDetails({
           onTabScrollToNode={onTabScrollToNode}
         />
       </TraceDrawerComponents.LegacyHeaderContainer>
+      <TraceDrawerComponents.BodyContainer>
+        <IssueList issues={issues} node={node} organization={organization} />
 
-      <IssueList issues={issues} node={node} organization={organization} />
-
-      <TraceDrawerComponents.SectionCard items={items} title={t('General')} />
+        <TraceDrawerComponents.SectionCard items={items} title={t('General')} />
+      </TraceDrawerComponents.BodyContainer>
     </TraceDrawerComponents.DetailContainer>
   );
 }
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/autogroup/siblingAutogroup.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/autogroup/siblingAutogroup.tsx
index b4fee0fbd8fceb..73b7df849a5475 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/autogroup/siblingAutogroup.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/autogroup/siblingAutogroup.tsx
@@ -77,10 +77,11 @@ export function SiblingAutogroupNodeDetails({
           onTabScrollToNode={onTabScrollToNode}
         />
       </TraceDrawerComponents.LegacyHeaderContainer>
+      <TraceDrawerComponents.BodyContainer>
+        <IssueList issues={issues} node={node} organization={organization} />
 
-      <IssueList issues={issues} node={node} organization={organization} />
-
-      <TraceDrawerComponents.SectionCard items={items} title={t('General')} />
+        <TraceDrawerComponents.SectionCard items={items} title={t('General')} />
+      </TraceDrawerComponents.BodyContainer>
     </TraceDrawerComponents.DetailContainer>
   );
 }
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/error.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/error.tsx
index 4fdb2a6c7945a1..06404e206ecdad 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/error.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/error.tsx
@@ -39,7 +39,7 @@ export function ErrorNodeDetails(
   }
 
   return (
-    <TraceDrawerComponents.DetailContainer hasNewTraceUi={hasTraceNewUi}>
+    <TraceDrawerComponents.DetailContainer>
       <TraceDrawerComponents.HeaderContainer>
         <TraceDrawerComponents.Title>
           <TraceDrawerComponents.LegacyTitleText>
@@ -57,12 +57,14 @@ export function ErrorNodeDetails(
           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.BodyContainer hasNewTraceUi={hasTraceNewUi}>
+        <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.BodyContainer>
     </TraceDrawerComponents.DetailContainer>
   );
 }
@@ -153,34 +155,35 @@ function LegacyErrorNodeDetails({
           </LinkButton>
         </TraceDrawerComponents.Actions>
       </TraceDrawerComponents.LegacyHeaderContainer>
+      <TraceDrawerComponents.BodyContainer>
+        <IssueList issues={issues} node={node} organization={organization} />
+
+        <TraceDrawerComponents.SectionCard
+          items={[
+            {
+              key: 'stack_trace',
+              subject: t('Stack Trace'),
+              subjectNode: null,
+              value:
+                stackTrace && data ? (
+                  <StackTraceWrapper>
+                    <StackTracePreviewContent event={data} stacktrace={stackTrace} />
+                  </StackTraceWrapper>
+                ) : (
+                  t('No stack trace has been reported with this error')
+                ),
+            },
+          ]}
+          title={t('Stack Trace')}
+        />
 
-      <IssueList issues={issues} node={node} organization={organization} />
-
-      <TraceDrawerComponents.SectionCard
-        items={[
-          {
-            key: 'stack_trace',
-            subject: t('Stack Trace'),
-            subjectNode: null,
-            value:
-              stackTrace && data ? (
-                <StackTraceWrapper>
-                  <StackTracePreviewContent event={data} stacktrace={stackTrace} />
-                </StackTraceWrapper>
-              ) : (
-                t('No stack trace has been reported with this error')
-              ),
-          },
-        ]}
-        title={t('Stack Trace')}
-      />
-
-      <TraceDrawerComponents.SectionCard items={items} title={t('General')} />
-
-      <TraceDrawerComponents.EventTags
-        projectSlug={node.value.project_slug}
-        event={data}
-      />
+        <TraceDrawerComponents.SectionCard items={items} title={t('General')} />
+
+        <TraceDrawerComponents.EventTags
+          projectSlug={node.value.project_slug}
+          event={data}
+        />
+      </TraceDrawerComponents.BodyContainer>
     </TraceDrawerComponents.DetailContainer>
   ) : null;
 }
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 7519c0022cdd7c..83cd604ed538a5 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/issues/issues.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/issues/issues.tsx
@@ -278,8 +278,8 @@ function LegacyIssue(
         <GroupStatusChart
           stats={
             props.fetchedIssue.filtered
-              ? props.fetchedIssue.filtered.stats?.['24h']
-              : props.fetchedIssue.stats?.['24h']
+              ? props.fetchedIssue.filtered.stats?.['24h']!
+              : props.fetchedIssue.stats?.['24h']!
           }
           secondaryStats={
             props.fetchedIssue.filtered ? props.fetchedIssue.stats?.['24h'] : []
@@ -630,7 +630,8 @@ const IssuesWrapper = styled('div')`
   flex-direction: column;
   gap: ${space(0.75)};
   justify-content: left;
-  margin-bottom: ${space(2)};
+  margin-bottom: ${space(1.5)};
+  margin-top: ${space(1)};
 
   ${StyledPanel} {
     margin-bottom: 0;
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/missingInstrumentation.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/missingInstrumentation.tsx
index 80a659b763a00d..df59e233fd0fa3 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/missingInstrumentation.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/missingInstrumentation.tsx
@@ -38,7 +38,7 @@ export function MissingInstrumentationNodeDetails(
   const profileId = event?.contexts?.profile?.profile_id ?? null;
 
   return (
-    <TraceDrawerComponents.DetailContainer hasNewTraceUi={hasTraceNewUi}>
+    <TraceDrawerComponents.DetailContainer>
       <TraceDrawerComponents.HeaderContainer>
         <TraceDrawerComponents.Title>
           <TraceDrawerComponents.LegacyTitleText>
@@ -57,43 +57,44 @@ export function MissingInstrumentationNodeDetails(
           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={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.BodyContainer hasNewTraceUi={hasTraceNewUi}>
+        <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={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.BodyContainer>
     </TraceDrawerComponents.DetailContainer>
   );
 }
@@ -185,28 +186,29 @@ function LegacyMissingInstrumentationNodeDetails({
           onTabScrollToNode={onTabScrollToNode}
         />
       </TraceDrawerComponents.LegacyHeaderContainer>
-
-      {node.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={node.event!} node={node} />
-              </ProfileGroupProvider>
-            )}
-          </ProfileContext.Consumer>
-        </ProfilesProvider>
-      ) : null}
-
-      <TraceDrawerComponents.SectionCard items={items} title={t('General')} />
+      <TraceDrawerComponents.BodyContainer>
+        {node.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={node.event!} node={node} />
+                </ProfileGroupProvider>
+              )}
+            </ProfileContext.Consumer>
+          </ProfilesProvider>
+        ) : null}
+
+        <TraceDrawerComponents.SectionCard items={items} title={t('General')} />
+      </TraceDrawerComponents.BodyContainer>
     </TraceDrawerComponents.DetailContainer>
   );
 }
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 d1951b3a8e639e..0fd8c552e02b33 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/profiling/profilePreview.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/profiling/profilePreview.tsx
@@ -136,7 +136,7 @@ export function ProfilePreview({event, node}: SpanProfileProps) {
         {message}
         <SectionDivider />
         <InterimSection
-          title={t('Related Profile')}
+          title={t('Profile')}
           type="no_instrumentation_profile"
           initialCollapse={false}
           actions={
@@ -327,7 +327,7 @@ function ProfilePreviewHeader({canvasView, event, organization}: ProfilePreviewP
   return (
     <HeaderContainer>
       <HeaderContainer>
-        <StyledSectionHeading>{t('Related Profile')}</StyledSectionHeading>
+        <StyledSectionHeading>{t('Profile')}</StyledSectionHeading>
         <QuestionTooltip
           position="top"
           size="sm"
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
index aa8b5e30052ddd..3e4cdb717ff734 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/components/spanSummaryLink.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/components/spanSummaryLink.tsx
@@ -2,14 +2,13 @@ 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 {IconGraph} from 'sentry/icons/iconGraph';
+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 {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';
@@ -57,8 +56,8 @@ function SpanSummaryLink(props: Props) {
           });
         }}
       >
-        <StyledIconStats size="xs" />
-        {t('View Query Summary')}
+        <StyledIconGraph type="area" size="xs" />
+        {t('View Summary')}
       </Link>
     );
   }
@@ -83,8 +82,8 @@ function SpanSummaryLink(props: Props) {
           });
         }}
       >
-        <StyledIconStats size="xs" />
-        {tct('View [dataType] Summary', {dataType: DATA_TYPE})}
+        <StyledIconGraph size="xs" />
+        {t('View Summary')}
       </Link>
     );
   }
@@ -92,7 +91,7 @@ function SpanSummaryLink(props: Props) {
   return null;
 }
 
-const StyledIconStats = styled(IconStats)`
+const StyledIconGraph = styled(IconGraph)`
   margin-right: ${space(0.5)};
 `;
 
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 bcd947ffdcac82..d3bc1864a803f9 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/index.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/index.tsx
@@ -9,10 +9,6 @@ import {
 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 {
-  CustomMetricsEventData,
-  eventHasCustomMetrics,
-} from 'sentry/components/metrics/customMetricsEventData';
 import {Tooltip} from 'sentry/components/tooltip';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
@@ -34,7 +30,7 @@ import {TraceDrawerComponents} from '.././styles';
 import {IssueList} from '../issues/issues';
 
 import Alerts from './sections/alerts';
-import {hasFormattedSpanDescription, SpanDescription} from './sections/description';
+import {SpanDescription} from './sections/description';
 import {GeneralInfo} from './sections/generalInfo';
 import {hasSpanHTTPInfo, SpanHTTPInfo} from './sections/http';
 import {hasSpanKeys, SpanKeys} from './sections/keys';
@@ -124,7 +120,6 @@ function LegacySpanNodeDetailHeader({
 
 function SpanSections({
   node,
-  project,
   organization,
   location,
   onParentClick,
@@ -141,7 +136,6 @@ function SpanSections({
     return (
       <LegacySpanSections
         node={node}
-        project={project}
         organization={organization}
         location={location}
         onParentClick={onParentClick}
@@ -150,10 +144,7 @@ function SpanSections({
   }
 
   const hasSpanSpecificData =
-    hasSpanHTTPInfo(node.value) ||
-    hasSpanKeys(node) ||
-    hasSpanTags(node.value) ||
-    eventHasCustomMetrics(organization, node.value._metrics_summary);
+    hasSpanHTTPInfo(node.value) || hasSpanKeys(node) || hasSpanTags(node.value);
 
   return (
     <Fragment>
@@ -169,13 +160,6 @@ function SpanSections({
             {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}
@@ -185,7 +169,6 @@ function SpanSections({
 
 function LegacySpanSections({
   node,
-  project,
   organization,
   location,
   onParentClick,
@@ -194,18 +177,9 @@ function LegacySpanSections({
   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}
@@ -215,13 +189,6 @@ function LegacySpanSections({
       {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>
   );
 }
@@ -274,51 +241,53 @@ export function SpanNodeDetails({
   const profileId = node.event?.contexts?.profile?.profile_id ?? null;
 
   return (
-    <TraceDrawerComponents.DetailContainer hasNewTraceUi={hasNewTraceUi}>
+    <TraceDrawerComponents.DetailContainer>
       <SpanNodeDetailHeader
         node={node}
         organization={organization}
         project={project}
         onTabScrollToNode={onTabScrollToNode}
       />
-      {node.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 || ''}
-              >
-                <Alerts node={node} />
-                {issues.length > 0 ? (
-                  <IssueList organization={organization} issues={issues} node={node} />
-                ) : null}
-                <SpanDescription
-                  node={node}
-                  project={project}
-                  organization={organization}
-                  location={location}
-                />
-                <SpanSections
-                  node={node}
-                  project={project}
-                  organization={organization}
-                  location={location}
-                  onParentClick={onParentClick}
-                />
-                {organization.features.includes('profiling') ? (
-                  <ProfileDetails event={node.event!} span={node.value} />
-                ) : null}
-              </ProfileGroupProvider>
-            )}
-          </ProfileContext.Consumer>
-        </ProfilesProvider>
-      ) : null}
+      <TraceDrawerComponents.BodyContainer hasNewTraceUi={hasNewTraceUi}>
+        {node.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 || ''}
+                >
+                  <Alerts node={node} />
+                  {issues.length > 0 ? (
+                    <IssueList organization={organization} issues={issues} node={node} />
+                  ) : null}
+                  <SpanDescription
+                    node={node}
+                    project={project}
+                    organization={organization}
+                    location={location}
+                  />
+                  <SpanSections
+                    node={node}
+                    project={project}
+                    organization={organization}
+                    location={location}
+                    onParentClick={onParentClick}
+                  />
+                  {organization.features.includes('profiling') ? (
+                    <ProfileDetails event={node.event!} span={node.value} />
+                  ) : null}
+                </ProfileGroupProvider>
+              )}
+            </ProfileContext.Consumer>
+          </ProfilesProvider>
+        ) : null}
+      </TraceDrawerComponents.BodyContainer>
     </TraceDrawerComponents.DetailContainer>
   );
 }
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 9b7bfece01ec73..f0741cb7a23ef7 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
@@ -1,4 +1,4 @@
-import {Fragment, useMemo} from 'react';
+import {Fragment, useMemo, useState} from 'react';
 import styled from '@emotion/styled';
 import type {Location} from 'history';
 
@@ -7,6 +7,7 @@ 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 LoadingIndicator from 'sentry/components/loadingIndicator';
 import LinkHint from 'sentry/components/structuredEventData/linkHint';
 import {IconGraph} from 'sentry/icons/iconGraph';
 import {t} from 'sentry/locale';
@@ -15,6 +16,13 @@ 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 {useLocalStorageState} from 'sentry/utils/useLocalStorageState';
+import ResourceSize from 'sentry/views/insights/browser/resources/components/resourceSize';
+import {
+  DisabledImages,
+  LOCAL_STORAGE_SHOW_LINKS,
+  MissingImage,
+} from 'sentry/views/insights/browser/resources/components/sampleImages';
 import {resolveSpanModule} from 'sentry/views/insights/common/utils/resolveSpanModule';
 import {
   MissingFrame,
@@ -28,6 +36,7 @@ import {
 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 {usePerformanceGeneralProjectSettings} from 'sentry/views/performance/utils';
 
 import type {TraceTree} from '../../../../traceModels/traceTree';
 import type {TraceTreeNode} from '../../../../traceModels/traceTreeNode';
@@ -138,8 +147,8 @@ export function SpanDescription({
                 });
           }}
         >
-          <StyledIconGraph type="area" size="xs" />
-          {hasNewSpansUIFlag ? t('View Span Summary') : t('View Similar Spans')}
+          <StyledIconGraph type="scatter" size="xs" />
+          {hasNewSpansUIFlag ? t('More Samples') : t('View Similar Spans')}
         </Link>
       </BodyContentWrapper>
     );
@@ -167,6 +176,8 @@ export function SpanDescription({
           <MissingFrame />
         )}
       </CodeSnippetWrapper>
+    ) : resolvedModule === ModuleName.RESOURCE && span.op === 'resource.img' ? (
+      <ResourceImageDescription formattedDescription={formattedDescription} node={node} />
     ) : (
       <DescriptionWrapper>
         {formattedDescription ? (
@@ -201,6 +212,127 @@ export function SpanDescription({
   );
 }
 
+function getImageSrc(span: TraceTree.Span) {
+  let src = span.description ?? '';
+
+  // Account for relative URLs
+  if (src.startsWith('/')) {
+    const urlScheme = span.data?.['url.scheme'];
+    const serverAddress = span.data?.['server.address'];
+
+    if (urlScheme && serverAddress) {
+      src = `${urlScheme}://${serverAddress}${src}`;
+    }
+  }
+
+  return src;
+}
+
+function ResourceImageDescription({
+  formattedDescription,
+  node,
+}: {
+  formattedDescription: string;
+  node: TraceTreeNode<TraceTree.Span>;
+}) {
+  const projectID = node.event?.projectID ? Number(node.event?.projectID) : undefined;
+  const span = node.value;
+
+  const {data: settings, isPending: isSettingsLoading} =
+    usePerformanceGeneralProjectSettings(Number(projectID));
+  const isImagesEnabled = settings?.enable_images ?? false;
+
+  const [showLinks, setShowLinks] = useLocalStorageState(LOCAL_STORAGE_SHOW_LINKS, false);
+  const size = span?.data?.['http.decoded_response_content_length'];
+
+  return (
+    <StyledDescriptionWrapper>
+      {isSettingsLoading ? (
+        <LoadingIndicator size={30} />
+      ) : !isImagesEnabled ? (
+        <DisabledImages
+          onClickShowLinks={() => setShowLinks(true)}
+          projectSlug={span.project_slug}
+        />
+      ) : (
+        <ResourceImage
+          fileName={formattedDescription}
+          showImage={!showLinks}
+          size={size}
+          src={getImageSrc(span)}
+        />
+      )}
+    </StyledDescriptionWrapper>
+  );
+}
+
+function ResourceImage(props: {
+  fileName: string;
+  showImage: boolean;
+  size: number;
+  src: string;
+}) {
+  const [hasError, setHasError] = useState(false);
+
+  const {fileName, size, src, showImage = true} = props;
+
+  return (
+    <ImageContainer>
+      <FilenameContainer>
+        <span>
+          {fileName} (<ResourceSize bytes={size} />)
+        </span>
+        <CopyToClipboardButton
+          borderless
+          size="zero"
+          iconSize="xs"
+          text={fileName}
+          title={t('Copy file name')}
+        />
+      </FilenameContainer>
+      {showImage && !hasError ? (
+        <ImageWrapper>
+          <img
+            data-test-id="sample-image"
+            onError={() => setHasError(true)}
+            src={src}
+            style={{
+              width: '100%',
+              height: '100%',
+              objectFit: 'contain',
+              objectPosition: 'center',
+            }}
+          />
+        </ImageWrapper>
+      ) : (
+        <MissingImage />
+      )}
+    </ImageContainer>
+  );
+}
+
+const FilenameContainer = styled('div')`
+  width: 100%;
+  display: flex;
+  align-items: baseline;
+  gap: ${space(1)};
+  justify-content: space-between;
+`;
+
+const ImageWrapper = styled('div')`
+  width: 200px;
+  height: 180px;
+  margin: auto;
+`;
+
+const ImageContainer = styled('div')`
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: ${space(0.5)};
+`;
+
 const CodeSnippetWrapper = styled('div')`
   display: flex;
   flex-direction: column;
@@ -272,7 +404,7 @@ function LegacySpanDescription({
                 });
           }}
         >
-          {hasNewSpansUIFlag ? t('View Span Summary') : t('View Similar Spans')}
+          {hasNewSpansUIFlag ? t('More Samples') : t('View Similar Spans')}
         </LinkButton>
       </ButtonGroup>
     );
@@ -363,3 +495,8 @@ const DescriptionWrapper = styled('div')`
   word-break: break-word;
   padding: ${space(1)};
 `;
+
+const StyledDescriptionWrapper = styled(DescriptionWrapper)`
+  padding: ${space(1)};
+  justify-content: center;
+`;
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/http.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/http.tsx
index 0be2c90f3a5e3f..d952240904fd66 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/http.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/http.tsx
@@ -12,7 +12,7 @@ export function hasSpanHTTPInfo(span: RawSpanType) {
   }
 
   const [_, url] = span.description.split(' ');
-  const parsedURL = safeURL(url);
+  const parsedURL = safeURL(url!);
 
   return !!parsedURL;
 }
@@ -21,7 +21,7 @@ export function SpanHTTPInfo({span}: {span: RawSpanType}) {
   if (span.op === 'http.client' && span.description) {
     const [method, url] = span.description.split(' ');
 
-    const parsedURL = safeURL(url);
+    const parsedURL = safeURL(url!);
     const queryString = qs.parse(parsedURL?.search ?? '');
 
     if (!parsedURL) {
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 302b327fc08533..f3576a74a32c3b 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
@@ -148,7 +148,7 @@ export function SpanKeys({node}: {node: TraceTreeNode<TraceTree.Span>}) {
   }
   Object.entries(sizeKeys).forEach(([key, value]) => {
     items.push({
-      key: key,
+      key,
       subject: key,
       value: (
         <Fragment>
@@ -161,7 +161,7 @@ export function SpanKeys({node}: {node: TraceTreeNode<TraceTree.Span>}) {
   Object.entries(nonSizeKeys).forEach(([key, value]) => {
     if (!isHiddenDataKey(key)) {
       items.push({
-        key: key,
+        key,
         subject: key,
         value: value as string | number,
       });
@@ -169,7 +169,7 @@ export function SpanKeys({node}: {node: TraceTreeNode<TraceTree.Span>}) {
   });
   unknownKeys.forEach(key => {
     items.push({
-      key: key,
+      key,
       subject: key,
       value: span[key],
     });
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/tags.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/tags.tsx
index 72d57175e61df5..306b1abb872993 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/tags.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/tags.tsx
@@ -23,7 +23,7 @@ export function Tags({span}: {span: RawSpanType}) {
   const items: SectionCardKeyValueList = keys.map(key => ({
     subject: key,
     value: String(tags[key]) || '',
-    key: key,
+    key,
   }));
 
   return (
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/styles.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/styles.tsx
index cc8420116eb106..5761397441829b 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/styles.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/styles.tsx
@@ -69,17 +69,25 @@ import type {TraceTreeNode} from '../../traceModels/traceTreeNode';
 import {useTraceState, useTraceStateDispatch} from '../../traceState/traceStateProvider';
 import {useHasTraceNewUi} from '../../useHasTraceNewUi';
 
-const DetailContainer = styled('div')<{hasNewTraceUi?: boolean}>`
+const BodyContainer = styled('div')<{hasNewTraceUi?: boolean}>`
   display: flex;
   flex-direction: column;
   gap: ${p => (p.hasNewTraceUi ? 0 : space(2))};
-  padding: ${p => (p.hasNewTraceUi ? `${space(1)} ${space(2)}` : space(1))};
+  padding: ${p => (p.hasNewTraceUi ? `${space(0.5)} ${space(2)}` : space(1))};
+  height: calc(100% - 52px);
+  overflow: auto;
 
   ${DataSection} {
     padding: 0;
   }
 `;
 
+const DetailContainer = styled('div')`
+  height: 100%;
+  overflow: hidden;
+  padding-bottom: ${space(1)};
+`;
+
 const FlexBox = styled('div')`
   display: flex;
   align-items: center;
@@ -210,6 +218,7 @@ const IconBorder = styled('div')<{backgroundColor: string; errored?: boolean}>`
 `;
 
 const LegacyHeaderContainer = styled(FlexBox)`
+  margin: ${space(1)};
   justify-content: space-between;
   gap: ${space(3)};
   container-type: inline-size;
@@ -234,7 +243,9 @@ const HeaderContainer = styled(FlexBox)`
   align-items: baseline;
   justify-content: space-between;
   gap: ${space(3)};
-  margin-bottom: ${space(1.5)};
+  padding: ${space(0.25)} 0 ${space(0.5)} 0;
+  margin: 0 ${space(2)} ${space(1)} ${space(2)};
+  border-bottom: 1px solid ${p => p.theme.border};
 `;
 
 const DURATION_COMPARISON_STATUS_COLORS: {
@@ -463,43 +474,37 @@ const StyledPanel = styled(Panel)`
 
 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,
-        })}
+        {t('Most frequent span ops for this transaction are')}
       </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}
+      <TopOpsList>
+        {breakdown.slice(0, 3).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>
+          );
+        })}
+      </TopOpsList>
     </HighlightsOpsBreakdownWrapper>
   );
 }
 
-const HighlightsOpsBreakdownMoreCount = styled('div')`
-  font-size: 12px;
-  color: ${p => p.theme.subText};
+const TopOpsList = styled('div')`
+  display: flex;
+  flex-direction: row;
+  gap: ${space(1)};
 `;
 
 const HighlightsOpPct = styled('div')`
@@ -576,7 +581,6 @@ const HighlightsWrapper = styled('div')`
   align-items: stretch;
   gap: ${space(1)};
   width: 100%;
-  overflow: hidden;
   margin: ${space(1)} 0;
 `;
 
@@ -1173,6 +1177,7 @@ export const CardContentSubject = styled('div')`
 
 const TraceDrawerComponents = {
   DetailContainer,
+  BodyContainer,
   FlexBox,
   Title: TitleWithTestId,
   Type,
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 7f6d96d0a6658e..677f6fd9bc0a42 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/index.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/index.tsx
@@ -12,10 +12,6 @@ import type {LazyRenderProps} from 'sentry/components/lazyRender';
 import ExternalLink from 'sentry/components/links/externalLink';
 import LoadingError from 'sentry/components/loadingError';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
-import {
-  CustomMetricsEventData,
-  eventHasCustomMetrics,
-} from 'sentry/components/metrics/customMetricsEventData';
 import {Tooltip} from 'sentry/components/tooltip';
 import {t, tct} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
@@ -185,25 +181,7 @@ export function TransactionNodeDetails({
   const project = projects.find(proj => proj.slug === event?.projectSlug);
 
   return (
-    <TraceDrawerComponents.DetailContainer hasNewTraceUi={hasNewTraceUi}>
-      {!node.canFetch ? (
-        <StyledAlert type="info" showIcon>
-          {tct(
-            'This transaction does not have any child spans. You can add more child spans via [customInstrumentationLink:custom instrumentation].',
-            {
-              customInstrumentationLink: (
-                <ExternalLink
-                  onClick={() => {
-                    traceAnalytics.trackMissingSpansDocLinkClicked(organization);
-                  }}
-                  href={getCustomInstrumentationLink(project)}
-                />
-              ),
-            }
-          )}
-        </StyledAlert>
-      ) : null}
-
+    <TraceDrawerComponents.DetailContainer>
       <TransactionNodeDetailHeader
         node={node}
         organization={organization}
@@ -211,61 +189,80 @@ export function TransactionNodeDetails({
         event={event}
         onTabScrollToNode={onTabScrollToNode}
       />
+      <TraceDrawerComponents.BodyContainer hasNewTraceUi={hasNewTraceUi}>
+        {!node.canFetch ? (
+          <StyledAlert type="info" showIcon>
+            {tct(
+              'This transaction does not have any child spans. You can add more child spans via [customInstrumentationLink:custom instrumentation].',
+              {
+                customInstrumentationLink: (
+                  <ExternalLink
+                    onClick={() => {
+                      traceAnalytics.trackMissingSpansDocLinkClicked(organization);
+                    }}
+                    href={getCustomInstrumentationLink(project)}
+                  />
+                ),
+              }
+            )}
+          </StyledAlert>
+        ) : null}
 
-      <IssueList node={node} organization={organization} issues={issues} />
+        <IssueList node={node} organization={organization} issues={issues} />
 
-      {hasNewTraceUi ? (
-        <TransactionHighlights
+        {hasNewTraceUi ? (
+          <TransactionHighlights
+            event={event}
+            node={node}
+            project={project}
+            organization={organization}
+          />
+        ) : null}
+
+        <TransactionSpecificSections
           event={event}
           node={node}
-          project={project}
+          onParentClick={onParentClick}
           organization={organization}
+          cacheMetrics={cacheMetrics}
         />
-      ) : null}
 
-      <TransactionSpecificSections
-        event={event}
-        node={node}
-        onParentClick={onParentClick}
-        organization={organization}
-        cacheMetrics={cacheMetrics}
-      />
+        {event.projectSlug ? (
+          <Entries
+            definedEvent={event}
+            projectSlug={event.projectSlug}
+            group={undefined}
+            organization={organization}
+          />
+        ) : null}
 
-      {event.projectSlug ? (
-        <Entries
-          definedEvent={event}
-          projectSlug={event.projectSlug}
-          group={undefined}
-          organization={organization}
+        <TraceDrawerComponents.EventTags
+          projectSlug={node.value.project_slug}
+          event={event}
         />
-      ) : null}
 
-      <TraceDrawerComponents.EventTags
-        projectSlug={node.value.project_slug}
-        event={event}
-      />
-
-      <EventContexts event={event} />
+        <EventContexts event={event} />
 
-      {project ? <EventEvidence event={event} project={project} /> : null}
+        {project ? <EventEvidence event={event} project={project} /> : null}
 
-      {replay ? null : <ReplayPreview event={event} organization={organization} />}
+        {replay ? null : <ReplayPreview event={event} organization={organization} />}
 
-      <BreadCrumbs event={event} organization={organization} />
+        <BreadCrumbs event={event} organization={organization} />
 
-      {project ? (
-        <EventAttachments event={event} project={project} group={undefined} />
-      ) : null}
+        {project ? (
+          <EventAttachments event={event} project={project} group={undefined} />
+        ) : null}
 
-      {project ? <EventViewHierarchy event={event} project={project} /> : null}
+        {project ? <EventViewHierarchy event={event} project={project} /> : null}
 
-      {event.projectSlug ? (
-        <EventRRWebIntegration
-          event={event}
-          orgId={organization.slug}
-          projectSlug={event.projectSlug}
-        />
-      ) : null}
+        {event.projectSlug ? (
+          <EventRRWebIntegration
+            event={event}
+            orgId={organization.slug}
+            projectSlug={event.projectSlug}
+          />
+        ) : null}
+      </TraceDrawerComponents.BodyContainer>
     </TraceDrawerComponents.DetailContainer>
   );
 }
@@ -310,13 +307,6 @@ function TransactionSpecificSections(props: TransactionSpecificSectionsProps) {
           {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}
@@ -353,13 +343,6 @@ function LegacyTransactionSpecificSections({
         ) : 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}
@@ -371,5 +354,5 @@ function LegacyTransactionSpecificSections({
 }
 
 const StyledAlert = styled(Alert)`
-  margin-bottom: ${space(2)};
+  margin-top: ${space(1)};
 `;
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/cacheMetrics.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/cacheMetrics.tsx
index 690c3ba43b74e4..a55b5a22c72cd2 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/cacheMetrics.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/cacheMetrics.tsx
@@ -11,8 +11,8 @@ export function CacheMetrics({
 }: {
   cacheMetrics: Pick<SpanMetricsResponse, 'avg(cache.item_size)' | 'cache_miss_rate()'>[];
 }) {
-  const itemSize: number | null = cacheMetrics[0]['avg(cache.item_size)'];
-  const missRate: number | null = cacheMetrics[0]['cache_miss_rate()'];
+  const itemSize: number | null = cacheMetrics[0]!['avg(cache.item_size)'];
+  const missRate: number | null = cacheMetrics[0]!['cache_miss_rate()'];
 
   const items: SectionCardKeyValueList = [];
 
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/entries.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/entries.tsx
index eb40c5a28db86a..6fb465f435dbf4 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/entries.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/entries.tsx
@@ -33,7 +33,7 @@ export function Entries({
 
   return (
     <Fragment>
-      {afterReplayEntries.map((entry, entryIdx) => {
+      {afterReplayEntries!.map((entry, entryIdx) => {
         // Breadcrumbs and request entries are rendered separately in the drawer.
         if (entry.type === EntryType.BREADCRUMBS || entry.type === EntryType.REQUEST) {
           return null;
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 b218cda728edbc..9adb2e31f3ae88 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
@@ -244,7 +244,7 @@ function LegacyGeneralInfo({
           query: omit(location.query, Object.values(PAGE_URL_PARAM).concat('query')),
           projectID: String(node.value.project_id),
         })}
-        linkText={t('View transaction summary')}
+        linkText={t('View Summary')}
       />
     ),
   });
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
index 6915bb316d2bac..406b84e6404ac3 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/highlights.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/highlights.tsx
@@ -73,7 +73,7 @@ export function TransactionHighlights(props: HighlightProps) {
         })}
       >
         <StyledIconGraph type="area" size="xs" />
-        {t('View transaction summary')}
+        {t('View Summary')}
       </Link>
     </BodyContentWrapper>
   );
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/tabs/trace/tagsSummary.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/tabs/trace/tagsSummary.tsx
index b55f6a4db7fbfa..6bcdebf093c519 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/tabs/trace/tagsSummary.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/tabs/trace/tagsSummary.tsx
@@ -99,7 +99,7 @@ function TagRow(props: TagProps) {
   // endpoint and the totals endpoint
   const maxTotalValues =
     segments.length > 0
-      ? Math.max(Number(props.totalValues), segments[0].count)
+      ? Math.max(Number(props.totalValues), segments[0]!.count)
       : props.totalValues;
   return (
     <li key={props.tag.key} aria-label={props.tag.key}>
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/tabs/traceProfiles.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/tabs/traceProfiles.tsx
index 7c7a05ec217479..7519cb396079cd 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/tabs/traceProfiles.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/tabs/traceProfiles.tsx
@@ -90,7 +90,7 @@ export function TraceProfiles({
                 start: new Date(node.space[0]).toISOString(),
                 end: new Date(node.space[0] + node.space[1]).toISOString(),
                 projectSlug: node.metadata.project_slug as string,
-                query: query,
+                query,
               })
             : generateProfileFlamechartRouteWithQuery({
                 orgSlug: organization.slug,
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/tabs/traceVitals.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/tabs/traceVitals.tsx
index 4d8b0915446046..a52230efdeb204 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/tabs/traceVitals.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/tabs/traceVitals.tsx
@@ -26,7 +26,7 @@ export function TraceVitals(props: TraceVitalsProps) {
   const measurements = Array.from(props.trace.vitals.entries());
 
   return (
-    <TraceDrawerComponents.DetailContainer>
+    <TraceDrawerComponents.BodyContainer>
       {measurements.map(([node, vital]) => {
         const op = isTransactionNode(node) ? node.value['transaction.op'] : '';
         const transaction = isTransactionNode(node) ? node.value.transaction : '';
@@ -66,7 +66,7 @@ export function TraceVitals(props: TraceVitalsProps) {
           </div>
         );
       })}
-    </TraceDrawerComponents.DetailContainer>
+    </TraceDrawerComponents.BodyContainer>
   );
 }
 
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/traceDrawer.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/traceDrawer.tsx
index c0e3f88ffa60f8..bfd0cb34e983d0 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/traceDrawer.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/traceDrawer.tsx
@@ -5,7 +5,7 @@ import pick from 'lodash/pick';
 
 import type {Tag} from 'sentry/actionCreators/events';
 import {Button} from 'sentry/components/button';
-import {IconChevron, IconPanel, IconPin} from 'sentry/icons';
+import {IconChevron, IconCircleFill, IconClose, IconPanel, IconPin} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {EventTransaction} from 'sentry/types/event';
@@ -18,6 +18,7 @@ import {
 import type {UseApiQueryResult} from 'sentry/utils/queryClient';
 import {useInfiniteApiQuery} from 'sentry/utils/queryClient';
 import type RequestError from 'sentry/utils/requestError/requestError';
+import type {Color} from 'sentry/utils/theme';
 import {useLocation} from 'sentry/utils/useLocation';
 import useOrganization from 'sentry/utils/useOrganization';
 import type {ReplayRecord} from 'sentry/views/replays/types';
@@ -102,6 +103,12 @@ export function TraceDrawer(props: TraceDrawerProps) {
   const traceStateRef = useRef(traceState);
   traceStateRef.current = traceState;
 
+  const isDrawerMinimized =
+    traceStateRef.current.preferences.drawer.minimized ||
+    (hasNewTraceUi && !traceStateRef.current.tabs.current_tab?.node);
+
+  const minimizedBottomDrawerSize = hasNewTraceUi ? 0 : 27;
+
   const initialSizeRef = useRef<Record<string, number> | null>(null);
   if (!initialSizeRef.current) {
     initialSizeRef.current = {};
@@ -128,10 +135,10 @@ export function TraceDrawer(props: TraceDrawerProps) {
         props.scheduler.dispatch('set container physical space', [0, 0, width, height]);
       }
 
-      minimized = minimized ?? traceStateRef.current.preferences.drawer.minimized;
+      minimized = minimized ?? isDrawerMinimized;
 
       if (traceStateRef.current.preferences.layout === 'drawer bottom' && user) {
-        if (size <= min && !minimized) {
+        if (size <= min && !minimized && !hasNewTraceUi) {
           traceDispatch({
             type: 'minimize drawer',
             payload: true,
@@ -153,7 +160,7 @@ export function TraceDrawer(props: TraceDrawerProps) {
         cancelAnimationTimeout(resizeEndRef.current);
       }
       resizeEndRef.current = requestAnimationTimeout(() => {
-        if (traceStateRef.current.preferences.drawer.minimized) {
+        if (isDrawerMinimized) {
           return;
         }
         const drawer_size =
@@ -168,7 +175,7 @@ export function TraceDrawer(props: TraceDrawerProps) {
       }, 1000);
 
       if (traceStateRef.current.preferences.layout === 'drawer bottom') {
-        min = minimized ? 27 : size;
+        min = minimized ? minimizedBottomDrawerSize : size;
       } else {
         min = minimized ? 0 : size;
       }
@@ -184,7 +191,15 @@ export function TraceDrawer(props: TraceDrawerProps) {
         props.traceGridRef.style.gridTemplateRows = '1fr auto';
       }
     },
-    [props.traceGridRef, props.manager, props.scheduler, traceDispatch]
+    [
+      props.traceGridRef,
+      props.manager,
+      props.scheduler,
+      traceDispatch,
+      isDrawerMinimized,
+      hasNewTraceUi,
+      minimizedBottomDrawerSize,
+    ]
   );
 
   const [drawerRef, setDrawerRef] = useState<HTMLDivElement | null>(null);
@@ -199,7 +214,7 @@ export function TraceDrawer(props: TraceDrawerProps) {
         height: 0,
       };
 
-      const initialSize = traceState.preferences.drawer.minimized
+      const initialSize = isDrawerMinimized
         ? 0
         : traceState.preferences.layout === 'drawer bottom'
           ? height * initialSizeInPercentage
@@ -211,7 +226,7 @@ export function TraceDrawer(props: TraceDrawerProps) {
         ref: drawerRef,
       };
       // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [props.traceGridRef, traceState.preferences.layout, drawerRef]);
+    }, [props.traceGridRef, traceState.preferences.layout, drawerRef, isDrawerMinimized]);
 
   const resizableDrawerOptions: UsePassiveResizableDrawerOptions = useMemo(() => {
     return {
@@ -243,9 +258,9 @@ export function TraceDrawer(props: TraceDrawerProps) {
     traceAnalytics.trackDrawerMinimize(organization);
     traceDispatch({
       type: 'minimize drawer',
-      payload: !traceState.preferences.drawer.minimized,
+      payload: !isDrawerMinimized,
     });
-    if (!traceState.preferences.drawer.minimized) {
+    if (!isDrawerMinimized) {
       onResize(0, 0, true, true);
       size.current = drawerOptions.min;
     } else {
@@ -274,13 +289,13 @@ export function TraceDrawer(props: TraceDrawerProps) {
     onResize,
     traceDispatch,
     props.traceGridRef,
-    traceState.preferences.drawer.minimized,
+    isDrawerMinimized,
     organization,
     drawerOptions,
   ]);
 
   const onDoubleClickResetToDefault = useCallback(() => {
-    if (!traceStateRef.current.preferences.drawer.minimized) {
+    if (!isDrawerMinimized) {
       onMinimizeClick();
       return;
     }
@@ -305,6 +320,7 @@ export function TraceDrawer(props: TraceDrawerProps) {
     drawerOptions.min,
     traceState.preferences.layout,
     props.traceGridRef,
+    isDrawerMinimized,
     traceDispatch,
   ]);
 
@@ -313,11 +329,11 @@ export function TraceDrawer(props: TraceDrawerProps) {
     if (initializedRef.current) {
       return;
     }
-    if (traceState.preferences.drawer.minimized && props.traceGridRef) {
+    if (isDrawerMinimized && props.traceGridRef) {
       if (traceStateRef.current.preferences.layout === 'drawer bottom') {
         props.traceGridRef.style.gridTemplateColumns = `1fr`;
-        props.traceGridRef.style.gridTemplateRows = `1fr minmax(${27}px, 0%)`;
-        size.current = 27;
+        props.traceGridRef.style.gridTemplateRows = `1fr minmax(${minimizedBottomDrawerSize}px, 0%)`;
+        size.current = minimizedBottomDrawerSize;
       } else if (traceStateRef.current.preferences.layout === 'drawer left') {
         props.traceGridRef.style.gridTemplateColumns = `minmax(${0}px, 0%) 1fr`;
         props.traceGridRef.style.gridTemplateRows = '1fr auto';
@@ -330,7 +346,7 @@ export function TraceDrawer(props: TraceDrawerProps) {
       initializedRef.current = true;
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [props.traceGridRef]);
+  }, [props.traceGridRef, minimizedBottomDrawerSize]);
 
   // Syncs the height of the tabs with the trace indicators
   const hasIndicators =
@@ -338,10 +354,10 @@ export function TraceDrawer(props: TraceDrawerProps) {
     traceState.preferences.layout !== 'drawer bottom';
 
   if (
-    traceState.preferences.drawer.minimized &&
-    traceState.preferences.layout !== 'drawer bottom'
+    isDrawerMinimized &&
+    (traceState.preferences.layout !== 'drawer bottom' || hasNewTraceUi)
   ) {
-    return (
+    return hasNewTraceUi ? null : (
       <TabsHeightContainer
         absolute
         layout={traceState.preferences.layout}
@@ -417,7 +433,7 @@ export function TraceDrawer(props: TraceDrawerProps) {
           ) : null}
         </TabsLayout>
       </TabsHeightContainer>
-      {traceState.preferences.drawer.minimized ? null : (
+      {isDrawerMinimized ? null : (
         <DrawerContainerRefContext.Provider value={contentContainerRef}>
           <Content
             ref={contentContainerRef}
@@ -431,7 +447,7 @@ export function TraceDrawer(props: TraceDrawerProps) {
                     meta={props.meta}
                     traceType={props.traceType}
                     tree={props.trace}
-                    node={props.trace.root.children[0]}
+                    node={props.trace.root.children[0]!}
                     rootEventResults={props.rootEventResults}
                     tagsInfiniteQueryResults={tagsInfiniteQueryResults}
                     traceEventView={props.traceEventView}
@@ -475,6 +491,7 @@ interface TraceDrawerTabProps {
 function TraceDrawerTab(props: TraceDrawerTabProps) {
   const organization = useOrganization();
   const node = props.tab.node;
+  const hasNewTraceUi = useHasTraceNewUi();
 
   if (typeof node === 'string') {
     const root = props.trace.root.children[0];
@@ -488,7 +505,7 @@ function TraceDrawerTab(props: TraceDrawerTabProps) {
         onClick={() => {
           if (props.tab.node !== 'vitals' && props.tab.node !== 'profiles') {
             traceAnalytics.trackTabView(node, organization);
-            props.onTabScrollToNode(root);
+            props.onTabScrollToNode(root!);
           }
           props.traceDispatch({type: 'activate tab', payload: props.index});
         }}
@@ -498,7 +515,7 @@ function TraceDrawerTab(props: TraceDrawerTabProps) {
         props.tab.node === 'vitals' ||
         props.tab.node === 'profiles' ? null : (
           <TabButtonIndicator
-            backgroundColor={makeTraceNodeBarColor(props.theme, root)}
+            backgroundColor={makeTraceNodeBarColor(props.theme, root!)}
           />
         )}
         <TabButton>{props.tab.label ?? node}</TabButton>
@@ -516,7 +533,14 @@ function TraceDrawerTab(props: TraceDrawerTabProps) {
         props.traceDispatch({type: 'activate tab', payload: props.index});
       }}
     >
-      <TabButtonIndicator backgroundColor={makeTraceNodeBarColor(props.theme, node)} />
+      {hasNewTraceUi ? (
+        <StyledIconCircleFilled
+          size="xs"
+          color={makeTraceNodeBarColor(props.theme, node) as Color}
+        />
+      ) : (
+        <TabButtonIndicator backgroundColor={makeTraceNodeBarColor(props.theme, node)} />
+      )}
       <TabButton>{getTraceTabTitle(node)}</TabButton>
       <TabPinButton
         pinned={props.pinned}
@@ -589,6 +613,45 @@ function TraceLayoutButtons(props: {
 function TraceLayoutMinimizeButton(props: {
   onClick: () => void;
   trace_state: TraceReducerState;
+}) {
+  const hasNewTraceUi = useHasTraceNewUi();
+
+  if (!hasNewTraceUi) {
+    return <LegacyTraceLayoutMinimizeButton {...props} />;
+  }
+
+  return (
+    <CloseButton
+      priority="link"
+      size="xs"
+      borderless
+      aria-label={t('Close Drawer')}
+      icon={<StyledIconClose />}
+      onClick={props.onClick}
+    >
+      {t('Close')}
+    </CloseButton>
+  );
+}
+
+const StyledIconClose = styled(IconClose)`
+  width: 10px;
+  height: 10px;
+`;
+
+const CloseButton = styled(Button)`
+  font-size: ${p => p.theme.fontSizeSmall};
+  color: ${p => p.theme.subText};
+  height: 100%;
+  border-bottom: 2px solid transparent;
+  &:hover {
+    color: ${p => p.theme.textColor};
+  }
+`;
+
+function LegacyTraceLayoutMinimizeButton(props: {
+  onClick: () => void;
+  trace_state: TraceReducerState;
 }) {
   return (
     <TabIconButton
@@ -619,6 +682,10 @@ function TraceLayoutMinimizeButton(props: {
   );
 }
 
+const StyledIconCircleFilled = styled(IconCircleFill)`
+  margin-right: ${space(0.25)};
+`;
+
 const ResizeableHandle = styled('div')<{
   layout: 'drawer bottom' | 'drawer left' | 'drawer right';
 }>`
@@ -682,7 +749,7 @@ const TabsHeightContainer = styled('div')<{
 const TabsLayout = styled('div')`
   display: grid;
   grid-template-columns: auto 1fr auto;
-  padding-left: ${space(0.25)};
+  padding-left: ${space(1)};
   padding-right: ${space(0.5)};
 `;
 
@@ -698,13 +765,15 @@ const TabsContainer = styled('ul')`
 `;
 
 const TabActions = styled('ul')`
+  display: flex;
+  align-items: center;
   list-style-type: none;
   padding-left: 0;
   margin-bottom: 0;
   flex: none;
 
   button {
-    padding: 0 ${space(0.5)};
+    padding: 0 ${space(0.25)};
   }
 `;
 
@@ -715,10 +784,7 @@ const TabSeparator = styled('span')`
   height: 16px;
   width: 1px;
   background-color: ${p => p.theme.border};
-  position: absolute;
-  top: 50%;
-  right: 0;
-  transform: translateY(-50%);
+  transform: translateY(3px);
 `;
 
 const TabLayoutControlItem = styled('li')`
@@ -727,6 +793,7 @@ const TabLayoutControlItem = styled('li')`
   position: relative;
   z-index: 10;
   background-color: ${p => p.theme.background};
+  height: 100%;
 `;
 
 const Tab = styled('li')`
@@ -797,7 +864,6 @@ const TabButton = styled('button')`
 const Content = styled('div')<{layout: 'drawer bottom' | 'drawer left' | 'drawer right'}>`
   position: relative;
   overflow: auto;
-  padding: ${space(1)};
   flex: 1;
 
   td {
@@ -814,10 +880,6 @@ const TabIconButton = styled(Button)<{active: boolean}>`
   height: 24px;
   max-height: 24px;
 
-  &:not(:last-child) {
-    margin-right: ${space(1)};
-  }
-
   &:hover {
     border: none;
     background-color: transparent;
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/traceProfilingLink.ts b/static/app/views/performance/newTraceDetails/traceDrawer/traceProfilingLink.ts
index ea87d9302f86d2..0acbb04505decd 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/traceProfilingLink.ts
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/traceProfilingLink.ts
@@ -99,7 +99,7 @@ export function makeTraceContinuousProfilingLink(
   return generateContinuousProfileFlamechartRouteWithQuery({
     orgSlug: options.orgSlug,
     projectSlug: options.projectSlug,
-    profilerId: profilerId,
+    profilerId,
     start: start.toISOString(),
     end: end.toISOString(),
     query: queryWithEventData,
diff --git a/static/app/views/performance/newTraceDetails/traceHeader/index.tsx b/static/app/views/performance/newTraceDetails/traceHeader/index.tsx
index 11e24a96029a1d..6c381fc5cd12ed 100644
--- a/static/app/views/performance/newTraceDetails/traceHeader/index.tsx
+++ b/static/app/views/performance/newTraceDetails/traceHeader/index.tsx
@@ -24,8 +24,10 @@ import {useModuleURLBuilder} from 'sentry/views/insights/common/utils/useModuleU
 import {useDomainViewFilters} from 'sentry/views/insights/pages/useFilters';
 import {useTraceStateDispatch} from 'sentry/views/performance/newTraceDetails/traceState/traceStateProvider';
 
+import {isRootTransaction} from '../../traceDetails/utils';
 import type {TraceMetaQueryResults} from '../traceApi/useTraceMeta';
 import TraceConfigurations from '../traceConfigurations';
+import {isTraceNode} from '../traceGuards';
 import type {TraceTree} from '../traceModels/traceTree';
 import {useHasTraceNewUi} from '../useHasTraceNewUi';
 
@@ -102,6 +104,49 @@ const StyledPlaceholder = styled(Placeholder)<{_height: number; _width: number}>
   width: ${p => p._width}px;
 `;
 
+const CANDIDATE_TRACE_TITLE_OPS = ['pageload', 'navigation'];
+
+export const getRepresentativeTransaction = (
+  tree: TraceTree
+): TraceTree.Transaction | null => {
+  const traceNode = tree.root.children[0];
+
+  if (!traceNode) {
+    return null;
+  }
+
+  if (!isTraceNode(traceNode)) {
+    throw new TypeError('Not trace node');
+  }
+
+  let firstRootTransaction: TraceTree.Transaction | null = null;
+  let candidateTransaction: TraceTree.Transaction | null = null;
+  let firstTransaction: TraceTree.Transaction | null = null;
+
+  for (const transaction of traceNode.value.transactions || []) {
+    // If we find a root transaction, we can stop looking and use it for the title.
+    if (!firstRootTransaction && isRootTransaction(transaction)) {
+      firstRootTransaction = transaction;
+      break;
+    } else if (
+      // If we haven't found a root transaction, but we found a candidate transaction
+      // with an op that we care about, we can use it for the title. We keep looking for
+      // a root.
+      !candidateTransaction &&
+      CANDIDATE_TRACE_TITLE_OPS.includes(transaction['transaction.op'])
+    ) {
+      candidateTransaction = transaction;
+      continue;
+    } else if (!firstTransaction) {
+      // If we haven't found a root or candidate transaction, we can use the first transaction
+      // in the trace for the title.
+      firstTransaction = transaction;
+    }
+  }
+
+  return firstRootTransaction ?? candidateTransaction ?? firstTransaction;
+};
+
 function LegacyTraceMetadataHeader(props: TraceMetadataHeaderProps) {
   const location = useLocation();
   const {view} = useDomainViewFilters();
@@ -181,6 +226,8 @@ export function TraceMetaDataHeader(props: TraceMetadataHeaderProps) {
     return <PlaceHolder organization={props.organization} />;
   }
 
+  const representativeTransaction = getRepresentativeTransaction(props.tree);
+
   return (
     <HeaderLayout>
       <HeaderContent>
@@ -195,12 +242,16 @@ export function TraceMetaDataHeader(props: TraceMetadataHeaderProps) {
           />
         </HeaderRow>
         <HeaderRow>
-          <Title traceSlug={props.traceSlug} tree={props.tree} />
+          <Title
+            traceSlug={props.traceSlug}
+            representativeTransaction={representativeTransaction}
+          />
           <Meta
             organization={props.organization}
             rootEventResults={props.rootEventResults}
             tree={props.tree}
             meta={props.metaResults.data}
+            representativeTransaction={representativeTransaction}
           />
         </HeaderRow>
         <StyledBreak />
diff --git a/static/app/views/performance/newTraceDetails/traceHeader/meta.tsx b/static/app/views/performance/newTraceDetails/traceHeader/meta.tsx
index ae721071709ed7..05044fe0973ebf 100644
--- a/static/app/views/performance/newTraceDetails/traceHeader/meta.tsx
+++ b/static/app/views/performance/newTraceDetails/traceHeader/meta.tsx
@@ -52,12 +52,13 @@ const SectionBody = styled('div')<{rightAlign?: boolean}>`
 interface MetaProps {
   meta: TraceMeta | undefined;
   organization: Organization;
+  representativeTransaction: TraceTree.Transaction | null;
   rootEventResults: UseApiQueryResult<EventTransaction, RequestError>;
   tree: TraceTree;
 }
 
 export function Meta(props: MetaProps) {
-  const traceNode = props.tree.root.children[0];
+  const traceNode = props.tree.root.children[0]!;
 
   const uniqueErrorIssues = useMemo(() => {
     if (!traceNode) {
@@ -134,11 +135,16 @@ export function Meta(props: MetaProps) {
       ) : null}
       {traceNode ? (
         <MetaSection
-          headingText={t('Trace Duration')}
+          headingText={t('Root Duration')}
           rightAlignBody
           bodyText={
-            traceNode.space[1] > 0
-              ? getDuration(traceNode.space[1] / 1e3, 2, true)
+            props.representativeTransaction
+              ? getDuration(
+                  props.representativeTransaction.timestamp -
+                    props.representativeTransaction.start_timestamp,
+                  2,
+                  true
+                )
               : '\u2014'
           }
         />
diff --git a/static/app/views/performance/newTraceDetails/traceHeader/title.tsx b/static/app/views/performance/newTraceDetails/traceHeader/title.tsx
index e13ad4a635d0fd..6d96899b7ed7b2 100644
--- a/static/app/views/performance/newTraceDetails/traceHeader/title.tsx
+++ b/static/app/views/performance/newTraceDetails/traceHeader/title.tsx
@@ -1,4 +1,4 @@
-import {Fragment, useMemo} from 'react';
+import {Fragment} from 'react';
 import styled from '@emotion/styled';
 
 import {CopyToClipboardButton} from 'sentry/components/copyToClipboardButton';
@@ -6,66 +6,20 @@ import ExternalLink from 'sentry/components/links/externalLink';
 import {Tooltip} from 'sentry/components/tooltip';
 import {t, tct} from 'sentry/locale';
 
-import {isRootTransaction} from '../../traceDetails/utils';
-import {isTraceNode} from '../traceGuards';
 import type {TraceTree} from '../traceModels/traceTree';
 
-const CANDIDATE_TRACE_TITLE_OPS = ['pageload', 'navigation'];
-
-type TraceTitle = {
-  op: string;
-  transaction?: string;
-} | null;
-
 interface TitleProps {
+  representativeTransaction: TraceTree.Transaction | null;
   traceSlug: string;
-  tree: TraceTree;
 }
 
-export function Title({traceSlug, tree}: TitleProps) {
-  const traceTitle: TraceTitle = useMemo(() => {
-    const trace = tree.root.children[0];
-
-    if (!trace) {
-      return null;
-    }
-
-    if (!isTraceNode(trace)) {
-      throw new TypeError('Not trace node');
-    }
-
-    let firstRootTransaction: TraceTitle = null;
-    let candidateTransaction: TraceTitle = null;
-    let firstTransaction: TraceTitle = null;
-
-    for (const transaction of trace.value.transactions || []) {
-      const title = {
-        op: transaction['transaction.op'],
-        transaction: transaction.transaction,
-      };
-
-      // If we find a root transaction, we can stop looking and use it for the title.
-      if (!firstRootTransaction && isRootTransaction(transaction)) {
-        firstRootTransaction = title;
-        break;
-      } else if (
-        // If we haven't found a root transaction, but we found a candidate transaction
-        // with an op that we care about, we can use it for the title. We keep looking for
-        // a root.
-        !candidateTransaction &&
-        CANDIDATE_TRACE_TITLE_OPS.includes(transaction['transaction.op'])
-      ) {
-        candidateTransaction = title;
-        continue;
-      } else if (!firstTransaction) {
-        // If we haven't found a root or candidate transaction, we can use the first transaction
-        // in the trace for the title.
-        firstTransaction = title;
+export function Title({traceSlug, representativeTransaction}: TitleProps) {
+  const traceTitle = representativeTransaction
+    ? {
+        op: representativeTransaction['transaction.op'],
+        transaction: representativeTransaction.transaction,
       }
-    }
-
-    return firstRootTransaction ?? candidateTransaction ?? firstTransaction;
-  }, [tree.root.children]);
+    : null;
 
   return (
     <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
index d4aeaf91abe184..83a2eaa9dbe675 100644
--- a/static/app/views/performance/newTraceDetails/traceModels/__snapshots__/issuesTraceTree.spec.tsx.snap
+++ b/static/app/views/performance/newTraceDetails/traceModels/__snapshots__/issuesTraceTree.spec.tsx.snap
@@ -3,7 +3,8 @@
 exports[`IssuesTraceTree FromSpans collapses spans 1`] = `
 "
 collapsed
-      http - GET /
+    transaction 2 - transaction.op
+      collapsed
       db - SELECT
       cache - GET
       http - GET /
@@ -13,7 +14,7 @@ collapsed
 
 exports[`IssuesTraceTree collapsed nodes without errors 1`] = `
 "
-trace root
+collapsed
   transaction 1 - transaction.op
   transaction 2 - transaction.op
   transaction 3 - transaction.op
diff --git a/static/app/views/performance/newTraceDetails/traceModels/issuesTraceTree.tsx b/static/app/views/performance/newTraceDetails/traceModels/issuesTraceTree.tsx
index 8817604608f4aa..6cc574ee74de0f 100644
--- a/static/app/views/performance/newTraceDetails/traceModels/issuesTraceTree.tsx
+++ b/static/app/views/performance/newTraceDetails/traceModels/issuesTraceTree.tsx
@@ -95,17 +95,24 @@ export class IssuesTraceTree extends TraceTree {
   collapseList(preserveLeafNodes: TraceTreeNode[]) {
     const preserveNodes = new Set(preserveLeafNodes);
 
+    for (const node of preserveLeafNodes) {
+      const parentTransaction = TraceTree.ParentTransaction(node);
+      if (parentTransaction) {
+        preserveNodes.add(parentTransaction);
+      }
+    }
+
     for (const node of preserveLeafNodes) {
       const index = this.list.indexOf(node);
       if (index === -1) {
         continue;
       }
 
-      // Preserve the previous 3 nodes
+      // Preserve the previous 2 nodes
       let i = Math.max(index - 1, 0);
-      while (i > index - 4) {
+      while (i > index - 3) {
         if (this.list[i]) {
-          preserveNodes.add(this.list[i]);
+          preserveNodes.add(this.list[i]!);
         }
         i--;
       }
@@ -114,7 +121,7 @@ export class IssuesTraceTree extends TraceTree {
       let j = Math.min(index + 1, this.list.length - 1);
       while (j < index + 3) {
         if (this.list[j]) {
-          preserveNodes.add(this.list[j]);
+          preserveNodes.add(this.list[j]!);
         }
         j++;
       }
@@ -123,15 +130,15 @@ export class IssuesTraceTree extends TraceTree {
     let i = 0;
     while (i < this.list.length) {
       const start = i;
-      while (this.list[i] && !preserveNodes.has(this.list[i])) {
+      while (this.list[i] && !preserveNodes.has(this.list[i]!)) {
         i++;
       }
 
       if (i - start > 0) {
         const collapsedNode = new CollapsedNode(
-          this.list[start].parent!,
+          this.list[start]!.parent!,
           {type: 'collapsed'},
-          this.list[start].metadata
+          this.list[start]!.metadata
         );
 
         const removed = this.list.splice(start, i - start, collapsedNode);
diff --git a/static/app/views/performance/newTraceDetails/traceModels/makeExampleTrace.tsx b/static/app/views/performance/newTraceDetails/traceModels/makeExampleTrace.tsx
index 650430c4aecae0..11185aa5d69759 100644
--- a/static/app/views/performance/newTraceDetails/traceModels/makeExampleTrace.tsx
+++ b/static/app/views/performance/newTraceDetails/traceModels/makeExampleTrace.tsx
@@ -54,7 +54,7 @@ export function makeExampleTrace(metadata: TraceTree.Metadata): TraceTree {
     const nest = i > 0 && Math.random() > 0.33;
 
     if (nest) {
-      const parent = root.children[root.children.length - 1];
+      const parent = root.children[root.children.length - 1]!;
       parent.children.push(
         partialTransaction({
           ...metadata,
diff --git a/static/app/views/performance/newTraceDetails/traceModels/parentAutogroupNode.tsx b/static/app/views/performance/newTraceDetails/traceModels/parentAutogroupNode.tsx
index 03943526ce7795..fb35b6f80df5b0 100644
--- a/static/app/views/performance/newTraceDetails/traceModels/parentAutogroupNode.tsx
+++ b/static/app/views/performance/newTraceDetails/traceModels/parentAutogroupNode.tsx
@@ -53,7 +53,7 @@ export function computeCollapsedBarSpace(
     return [];
   }
 
-  const first = nodes[0];
+  const first = nodes[0]!;
 
   const segments: [number, number][] = [];
 
@@ -62,7 +62,7 @@ export function computeCollapsedBarSpace(
   let i = 1;
 
   while (i < nodes.length) {
-    const next = nodes[i];
+    const next = nodes[i]!;
 
     if (next.space[0] > end) {
       segments.push([start, end - start]);
diff --git a/static/app/views/performance/newTraceDetails/traceModels/traceTree.autogrouping.spec.tsx b/static/app/views/performance/newTraceDetails/traceModels/traceTree.autogrouping.spec.tsx
index b7e246a3745064..0991300cb11e5c 100644
--- a/static/app/views/performance/newTraceDetails/traceModels/traceTree.autogrouping.spec.tsx
+++ b/static/app/views/performance/newTraceDetails/traceModels/traceTree.autogrouping.spec.tsx
@@ -73,7 +73,7 @@ describe('autogrouping', () => {
     it('groups parent chain with same op', () => {
       const tree = TraceTree.FromTrace(singleTransactionTrace, traceMetadata);
       TraceTree.FromSpans(
-        tree.root.children[0].children[0],
+        tree.root.children[0]!.children[0]!,
         parentAutogroupSpans,
         makeEventTransaction()
       );
@@ -85,7 +85,7 @@ describe('autogrouping', () => {
     it('assigns children to tail node', () => {
       const tree = TraceTree.FromTrace(singleTransactionTrace, traceMetadata);
       TraceTree.FromSpans(
-        tree.root.children[0].children[0],
+        tree.root.children[0]!.children[0]!,
         [
           makeSpan({op: 'db', description: 'redis', span_id: '0000'}),
           makeSpan({
@@ -118,13 +118,14 @@ describe('autogrouping', () => {
     it('autogrouped chain points to tail', () => {
       const tree = TraceTree.FromTrace(singleTransactionTrace, traceMetadata);
       TraceTree.FromSpans(
-        tree.root.children[0].children[0],
+        tree.root.children[0]!.children[0]!,
         [
           ...parentAutogroupSpans,
           makeSpan({
             op: 'http',
             description: 'request',
-            parent_span_id: parentAutogroupSpans[parentAutogroupSpans.length - 1].span_id,
+            parent_span_id:
+              parentAutogroupSpans[parentAutogroupSpans.length - 1]!.span_id,
           }),
         ],
         makeEventTransaction()
@@ -137,7 +138,7 @@ describe('autogrouping', () => {
     it('expanding parent autogroup renders head to tail chain', () => {
       const tree = TraceTree.FromTrace(singleTransactionTrace, traceMetadata);
       TraceTree.FromSpans(
-        tree.root.children[0].children[0],
+        tree.root.children[0]!.children[0]!,
         parentAutogroupSpans,
         makeEventTransaction()
       );
@@ -156,7 +157,7 @@ describe('autogrouping', () => {
     it('collapsing parent autogroup removes its children', () => {
       const tree = TraceTree.FromTrace(singleTransactionTrace, traceMetadata);
       TraceTree.FromSpans(
-        tree.root.children[0].children[0],
+        tree.root.children[0]!.children[0]!,
         parentAutogroupSpans,
         makeEventTransaction()
       );
@@ -183,7 +184,7 @@ describe('autogrouping', () => {
     it('can expand and collapse', () => {
       const tree = TraceTree.FromTrace(singleTransactionTrace, traceMetadata);
       TraceTree.FromSpans(
-        tree.root.children[0].children[0],
+        tree.root.children[0]!.children[0]!,
         [
           makeSpan({op: 'db', description: 'redis', span_id: '0000'}),
           makeSpan({
@@ -234,7 +235,7 @@ describe('autogrouping', () => {
     it('autogroups siblings when they are children of a parent autogroup chain', () => {
       const tree = TraceTree.FromTrace(singleTransactionTrace, traceMetadata);
       TraceTree.FromSpans(
-        tree.root.children[0].children[0],
+        tree.root.children[0]!.children[0]!,
         [
           ...parentAutogroupSpans,
           ...[1, 2, 3, 4, 5].map(_i =>
@@ -244,7 +245,7 @@ describe('autogrouping', () => {
               start_timestamp: start,
               timestamp: start + 1,
               parent_span_id:
-                parentAutogroupSpans[parentAutogroupSpans.length - 1].span_id,
+                parentAutogroupSpans[parentAutogroupSpans.length - 1]!.span_id,
             })
           ),
         ],
@@ -260,7 +261,7 @@ describe('autogrouping', () => {
     it('removes collapsed parent autogroup', () => {
       const tree = TraceTree.FromTrace(singleTransactionTrace, traceMetadata);
       TraceTree.FromSpans(
-        tree.root.children[0].children[0],
+        tree.root.children[0]!.children[0]!,
         parentAutogroupSpansWithChilden,
         makeEventTransaction()
       );
@@ -281,7 +282,7 @@ describe('autogrouping', () => {
     it('removes expanded parent autogroup', () => {
       const tree = TraceTree.FromTrace(singleTransactionTrace, traceMetadata);
       TraceTree.FromSpans(
-        tree.root.children[0].children[0],
+        tree.root.children[0]!.children[0]!,
         parentAutogroupSpansWithChilden,
         makeEventTransaction()
       );
@@ -311,7 +312,7 @@ describe('autogrouping', () => {
     it('groups spans with the same op and description', () => {
       const tree = TraceTree.FromTrace(singleTransactionTrace, traceMetadata);
       TraceTree.FromSpans(
-        tree.root.children[0].children[0],
+        tree.root.children[0]!.children[0]!,
         siblingAutogroupSpans,
         makeEventTransaction()
       );
@@ -324,7 +325,7 @@ describe('autogrouping', () => {
     it('does not autogroup if count is less 5', () => {
       const tree = TraceTree.FromTrace(singleTransactionTrace, traceMetadata);
       TraceTree.FromSpans(
-        tree.root.children[0].children[0],
+        tree.root.children[0]!.children[0]!,
         siblingAutogroupSpans.slice(0, 4),
         makeEventTransaction()
       );
@@ -337,7 +338,7 @@ describe('autogrouping', () => {
     it('autogroups multiple consecutive groups', () => {
       const tree = TraceTree.FromTrace(singleTransactionTrace, traceMetadata);
       TraceTree.FromSpans(
-        tree.root.children[0].children[0],
+        tree.root.children[0]!.children[0]!,
         [
           ...siblingAutogroupSpans,
           ...siblingAutogroupSpans.map(s => ({...s, op: 'mysql'})),
@@ -353,7 +354,7 @@ describe('autogrouping', () => {
     it('expanding sibling autogroup renders its children', () => {
       const tree = TraceTree.FromTrace(singleTransactionTrace, traceMetadata);
       TraceTree.FromSpans(
-        tree.root.children[0].children[0],
+        tree.root.children[0]!.children[0]!,
         siblingAutogroupSpans,
         makeEventTransaction()
       );
@@ -372,7 +373,7 @@ describe('autogrouping', () => {
     it('collapsing sibling autogroup removes its children', () => {
       const tree = TraceTree.FromTrace(singleTransactionTrace, traceMetadata);
       TraceTree.FromSpans(
-        tree.root.children[0].children[0],
+        tree.root.children[0]!.children[0]!,
         siblingAutogroupSpans,
         makeEventTransaction()
       );
@@ -396,7 +397,7 @@ describe('autogrouping', () => {
     it('removes sibling autogroup', () => {
       const tree = TraceTree.FromTrace(singleTransactionTrace, traceMetadata);
       TraceTree.FromSpans(
-        tree.root.children[0].children[0],
+        tree.root.children[0]!.children[0]!,
         siblingAutogroupSpans,
         makeEventTransaction()
       );
diff --git a/static/app/views/performance/newTraceDetails/traceModels/traceTree.incremental.spec.tsx b/static/app/views/performance/newTraceDetails/traceModels/traceTree.incremental.spec.tsx
index c93f7e50f61b1c..9e0054a12f5665 100644
--- a/static/app/views/performance/newTraceDetails/traceModels/traceTree.incremental.spec.tsx
+++ b/static/app/views/performance/newTraceDetails/traceModels/traceTree.incremental.spec.tsx
@@ -81,7 +81,7 @@ describe('incremental trace fetch', () => {
     });
 
     tree.build();
-    expect(tree.list.length).toBe(3);
+    expect(tree.list).toHaveLength(3);
 
     tree.fetchAdditionalTraces({
       replayTraces: traces,
@@ -93,9 +93,9 @@ describe('incremental trace fetch', () => {
       meta: null,
     });
 
-    await waitFor(() => expect(tree.root.children[0].fetchStatus).toBe('idle'));
+    await waitFor(() => expect(tree.root.children[0]!.fetchStatus).toBe('idle'));
 
-    expect(tree.list.length).toBe(7);
+    expect(tree.list).toHaveLength(7);
   });
 
   it('Does not infinitely fetch on error', async () => {
@@ -154,7 +154,7 @@ describe('incremental trace fetch', () => {
     });
 
     tree.build();
-    expect(tree.list.length).toBe(3);
+    expect(tree.list).toHaveLength(3);
 
     tree.fetchAdditionalTraces({
       replayTraces: traces,
@@ -166,10 +166,10 @@ describe('incremental trace fetch', () => {
       meta: null,
     });
 
-    await waitFor(() => expect(tree.root.children[0].fetchStatus).toBe('idle'));
+    await waitFor(() => expect(tree.root.children[0]!.fetchStatus).toBe('idle'));
     tree.build();
 
-    expect(tree.list.length).toBe(7);
+    expect(tree.list).toHaveLength(7);
     expect(mockedResponse1).toHaveBeenCalledTimes(1);
     expect(mockedResponse2).toHaveBeenCalledTimes(1);
     expect(mockedResponse3).toHaveBeenCalledTimes(1);
diff --git a/static/app/views/performance/newTraceDetails/traceModels/traceTree.measurements.tsx b/static/app/views/performance/newTraceDetails/traceModels/traceTree.measurements.tsx
index 835dfb8c8a169e..c5f9d4723c5ca3 100644
--- a/static/app/views/performance/newTraceDetails/traceModels/traceTree.measurements.tsx
+++ b/static/app/views/performance/newTraceDetails/traceModels/traceTree.measurements.tsx
@@ -125,7 +125,11 @@ 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 score = Math.round(
+      (measurements[`score.${measurement}`]!?.value /
+        measurements[`score.weight.${measurement}`]!?.value) *
+        100
+    );
 
     const vital = vitals.get(node)!;
     vital.push({
@@ -153,6 +157,7 @@ export function collectTraceMeasurements(
         : false,
       type: measurement as TraceTree.Indicator['type'],
       label: (MEASUREMENT_ACRONYM_MAPPING[measurement] ?? measurement).toUpperCase(),
+      score,
     };
 
     indicators.push(indicator);
diff --git a/static/app/views/performance/newTraceDetails/traceModels/traceTree.missinginstrumentation.spec.tsx b/static/app/views/performance/newTraceDetails/traceModels/traceTree.missinginstrumentation.spec.tsx
index 63253601b47dfc..0f726096d76b2d 100644
--- a/static/app/views/performance/newTraceDetails/traceModels/traceTree.missinginstrumentation.spec.tsx
+++ b/static/app/views/performance/newTraceDetails/traceModels/traceTree.missinginstrumentation.spec.tsx
@@ -59,7 +59,7 @@ describe('missing instrumentation', () => {
   it('adds missing instrumentation between sibling spans', () => {
     const tree = TraceTree.FromTrace(singleTransactionTrace, traceMetadata);
     TraceTree.FromSpans(
-      tree.root.children[0].children[0],
+      tree.root.children[0]!.children[0]!,
       missingInstrumentationSpans,
       makeEventTransaction()
     );
@@ -71,7 +71,7 @@ describe('missing instrumentation', () => {
   it('adds missing instrumentation between children spans', () => {
     const tree = TraceTree.FromTrace(singleTransactionTrace, traceMetadata);
     TraceTree.FromSpans(
-      tree.root.children[0].children[0],
+      tree.root.children[0]!.children[0]!,
       childrenMissingInstrumentationSpans,
       makeEventTransaction()
     );
@@ -93,7 +93,7 @@ describe('missing instrumentation', () => {
     );
 
     TraceTree.FromSpans(
-      tree.root.children[0].children[0],
+      tree.root.children[0]!.children[0]!,
       [
         makeSpan({
           op: 'http',
@@ -130,7 +130,7 @@ describe('missing instrumentation', () => {
   it('removes missing instrumentation nodes', () => {
     const tree = TraceTree.FromTrace(singleTransactionTrace, traceMetadata);
     TraceTree.FromSpans(
-      tree.root.children[0].children[0],
+      tree.root.children[0]!.children[0]!,
       missingInstrumentationSpans,
       makeEventTransaction()
     );
@@ -154,7 +154,7 @@ describe('missing instrumentation', () => {
   it('does not add missing instrumentation for browser SDKs', () => {
     const tree = TraceTree.FromTrace(singleTransactionTrace, traceMetadata);
     TraceTree.FromSpans(
-      tree.root.children[0].children[0],
+      tree.root.children[0]!.children[0]!,
       missingInstrumentationSpans,
       makeEventTransaction({sdk: {name: 'sentry.javascript.browser', version: '1.0.0'}})
     );
@@ -170,7 +170,11 @@ describe('missing instrumentation', () => {
     ['siblings', missingInstrumentationSpans],
   ])('idempotent - %s', (_type, setup) => {
     const tree = TraceTree.FromTrace(singleTransactionTrace, traceMetadata);
-    TraceTree.FromSpans(tree.root.children[0].children[0], setup, makeEventTransaction());
+    TraceTree.FromSpans(
+      tree.root.children[0]!.children[0]!,
+      setup,
+      makeEventTransaction()
+    );
 
     TraceTree.DetectMissingInstrumentation(tree.root);
     const initial = tree.build().serialize();
diff --git a/static/app/views/performance/newTraceDetails/traceModels/traceTree.spec.tsx b/static/app/views/performance/newTraceDetails/traceModels/traceTree.spec.tsx
index 82f4cab10a6ea4..836c6f9c233275 100644
--- a/static/app/views/performance/newTraceDetails/traceModels/traceTree.spec.tsx
+++ b/static/app/views/performance/newTraceDetails/traceModels/traceTree.spec.tsx
@@ -179,7 +179,7 @@ describe('TraceTree', () => {
         }),
         traceMetadata
       );
-      expect(tree.root.children[0].errors.size).toBe(1);
+      expect(tree.root.children[0]!.errors.size).toBe(1);
     });
 
     it('stores trace error as error on node', () => {
@@ -189,7 +189,7 @@ describe('TraceTree', () => {
         }),
         traceMetadata
       );
-      expect(tree.root.children[0].children[0].errors.size).toBe(1);
+      expect(tree.root.children[0]!.children[0]!.errors.size).toBe(1);
     });
 
     it('adds performance issues to node', () => {
@@ -203,7 +203,7 @@ describe('TraceTree', () => {
         }),
         traceMetadata
       );
-      expect(tree.root.children[0].children[0].performance_issues.size).toBe(1);
+      expect(tree.root.children[0]!.children[0]!.performance_issues.size).toBe(1);
     });
 
     it('adds transaction profile to node', () => {
@@ -217,7 +217,7 @@ describe('TraceTree', () => {
         }),
         traceMetadata
       );
-      expect(tree.root.children[0].children[0].profiles.length).toBe(1);
+      expect(tree.root.children[0]!.children[0]!.profiles).toHaveLength(1);
     });
 
     it('adds continuous profile to node', () => {
@@ -232,14 +232,14 @@ describe('TraceTree', () => {
         }),
         traceMetadata
       );
-      expect(tree.root.children[0].children[0].profiles.length).toBe(1);
+      expect(tree.root.children[0]!.children[0]!.profiles).toHaveLength(1);
     });
   });
 
   describe('adjusts trace start and end', () => {
     it('based off min(events.start_timestamp)', () => {
       const tree = TraceTree.FromTrace(trace, traceMetadata);
-      expect(tree.root.space[0]).toBe(trace.transactions[0].start_timestamp * 1e3);
+      expect(tree.root.space[0]).toBe(trace.transactions[0]!.start_timestamp * 1e3);
     });
 
     it('based off max(events.timestamp)', () => {
@@ -361,8 +361,8 @@ describe('TraceTree', () => {
   describe('indicators', () => {
     it('measurements are converted to indicators', () => {
       const tree = TraceTree.FromTrace(traceWithVitals, traceMetadata);
-      expect(tree.indicators.length).toBe(1);
-      expect(tree.indicators[0].start).toBe(start * 1e3);
+      expect(tree.indicators).toHaveLength(1);
+      expect(tree.indicators[0]!.start).toBe(start * 1e3);
     });
 
     it('sorts indicators by start', () => {
@@ -381,8 +381,8 @@ describe('TraceTree', () => {
         }),
         traceMetadata
       );
-      expect(tree.indicators.length).toBe(2);
-      expect(tree.indicators[0].start < tree.indicators[1].start).toBe(true);
+      expect(tree.indicators).toHaveLength(2);
+      expect(tree.indicators[0]!.start < tree.indicators[1]!.start).toBe(true);
     });
   });
 
@@ -420,7 +420,7 @@ describe('TraceTree', () => {
         traceMetadata
       );
 
-      TraceTree.FromSpans(tree.root.children[0], [makeSpan()], makeEventTransaction());
+      TraceTree.FromSpans(tree.root.children[0]!, [makeSpan()], makeEventTransaction());
 
       expect(tree.build().serialize()).toMatchSnapshot();
     });
@@ -588,7 +588,7 @@ describe('TraceTree', () => {
       const tree = TraceTree.FromTrace(trace, traceMetadata);
 
       TraceTree.FromSpans(
-        tree.root.children[0].children[0],
+        tree.root.children[0]!.children[0]!,
         parentAutogroupSpansWithTailChildren,
         makeEventTransaction()
       );
@@ -606,7 +606,7 @@ describe('TraceTree', () => {
     it('collapsing a parent autogroup node shows tail chain', () => {
       const tree = TraceTree.FromTrace(trace, traceMetadata);
       TraceTree.FromSpans(
-        tree.root.children[0].children[0],
+        tree.root.children[0]!.children[0]!,
         parentAutogroupSpansWithTailChildren,
         makeEventTransaction()
       );
@@ -624,7 +624,7 @@ describe('TraceTree', () => {
     it('collapsing intermediary children is preserved', () => {
       const tree = TraceTree.FromTrace(trace, traceMetadata);
       TraceTree.FromSpans(
-        tree.root.children[0].children[0],
+        tree.root.children[0]!.children[0]!,
         parentAutogroupSpansWithTailChildren,
         makeEventTransaction()
       );
@@ -654,7 +654,7 @@ describe('TraceTree', () => {
     it('expanding a sibling autogroup node shows sibling span', () => {
       const tree = TraceTree.FromTrace(trace, traceMetadata);
       TraceTree.FromSpans(
-        tree.root.children[0].children[0],
+        tree.root.children[0]!.children[0]!,
         siblingAutogroupSpans,
         makeEventTransaction()
       );
@@ -671,7 +671,7 @@ describe('TraceTree', () => {
     it('collapsing a sibling autogroup node hides children', () => {
       const tree = TraceTree.FromTrace(trace, traceMetadata);
       TraceTree.FromSpans(
-        tree.root.children[0].children[0],
+        tree.root.children[0]!.children[0]!,
         siblingAutogroupSpans,
         makeEventTransaction()
       );
@@ -697,8 +697,8 @@ describe('TraceTree', () => {
       const tree = TraceTree.FromTrace(traceWithEventId, traceMetadata);
       const request = mockSpansResponse([], 'project', 'event-id');
 
-      tree.root.children[0].children[0].canFetch = false;
-      tree.zoom(tree.root.children[0].children[0], true, {
+      tree.root.children[0]!.children[0]!.canFetch = false;
+      tree.zoom(tree.root.children[0]!.children[0]!, true, {
         api: new MockApiClient(),
         organization: OrganizationFixture(),
         preferences: DEFAULT_TRACE_VIEW_PREFERENCES,
@@ -711,13 +711,13 @@ describe('TraceTree', () => {
       const tree = TraceTree.FromTrace(traceWithEventId, traceMetadata);
       const request = mockSpansResponse([], 'project', 'event-id');
 
-      tree.zoom(tree.root.children[0].children[0], true, {
+      tree.zoom(tree.root.children[0]!.children[0]!, true, {
         api: new MockApiClient(),
         organization: OrganizationFixture(),
         preferences: DEFAULT_TRACE_VIEW_PREFERENCES,
       });
 
-      tree.zoom(tree.root.children[0], true, {
+      tree.zoom(tree.root.children[0]!, true, {
         api: new MockApiClient(),
         organization: OrganizationFixture(),
         preferences: DEFAULT_TRACE_VIEW_PREFERENCES,
@@ -733,7 +733,7 @@ describe('TraceTree', () => {
       // Zoom mutates the list, so we need to build first
       tree.build();
 
-      await tree.zoom(tree.root.children[0].children[0].children[0], true, {
+      await tree.zoom(tree.root.children[0]!.children[0]!.children[0]!, true, {
         api: new MockApiClient(),
         organization: OrganizationFixture(),
         preferences: DEFAULT_TRACE_VIEW_PREFERENCES,
@@ -748,7 +748,7 @@ describe('TraceTree', () => {
       tree.build();
       // Zoom in on child span
       mockSpansResponse([makeSpan()], 'project', 'child-event-id');
-      await tree.zoom(tree.root.children[0].children[0].children[0], true, {
+      await tree.zoom(tree.root.children[0]!.children[0]!.children[0]!, true, {
         api: new MockApiClient(),
         organization: OrganizationFixture(),
         preferences: DEFAULT_TRACE_VIEW_PREFERENCES,
@@ -756,7 +756,7 @@ describe('TraceTree', () => {
 
       // Then zoom in on a parent
       mockSpansResponse([makeSpan()], 'project', 'event-id');
-      await tree.zoom(tree.root.children[0].children[0], true, {
+      await tree.zoom(tree.root.children[0]!.children[0]!, true, {
         api: new MockApiClient(),
         organization: OrganizationFixture(),
         preferences: DEFAULT_TRACE_VIEW_PREFERENCES,
@@ -791,14 +791,14 @@ describe('TraceTree', () => {
       tree.build();
 
       mockSpansResponse([makeSpan({span_id: '0001'})], 'project', 'child-event-id');
-      await tree.zoom(tree.root.children[0].children[0].children[0], true, {
+      await tree.zoom(tree.root.children[0]!.children[0]!.children[0]!, true, {
         api: new MockApiClient(),
         organization: OrganizationFixture(),
         preferences: DEFAULT_TRACE_VIEW_PREFERENCES,
       });
 
       mockSpansResponse([makeSpan({span_id: '0000'})], 'project', 'parent-event-id');
-      await tree.zoom(tree.root.children[0].children[0], true, {
+      await tree.zoom(tree.root.children[0]!.children[0]!, true, {
         api: new MockApiClient(),
         organization: OrganizationFixture(),
         preferences: DEFAULT_TRACE_VIEW_PREFERENCES,
@@ -840,7 +840,7 @@ describe('TraceTree', () => {
       tree.build();
 
       mockSpansResponse([makeSpan({span_id: '0000'})], 'project', 'parent-event-id');
-      await tree.zoom(tree.root.children[0].children[0], true, {
+      await tree.zoom(tree.root.children[0]!.children[0]!, true, {
         api: new MockApiClient(),
         organization: OrganizationFixture(),
         preferences: DEFAULT_TRACE_VIEW_PREFERENCES,
@@ -887,7 +887,7 @@ describe('TraceTree', () => {
 
       mockSpansResponse([makeSpan({span_id: '0000'})], 'project', 'parent-event-id');
       for (const bool of [true, false]) {
-        await tree.zoom(tree.root.children[0].children[0], bool, {
+        await tree.zoom(tree.root.children[0]!.children[0]!, bool, {
           api: new MockApiClient(),
           organization: OrganizationFixture(),
           preferences: DEFAULT_TRACE_VIEW_PREFERENCES,
@@ -964,7 +964,7 @@ describe('TraceTree', () => {
       });
 
       const spans = TraceTree.FindAll(tree.root, n => isSpanNode(n));
-      expect(spans.length).toBe(1);
+      expect(spans).toHaveLength(1);
       expect(tree.serialize()).toMatchSnapshot();
     });
   });
@@ -1030,15 +1030,15 @@ describe('TraceTree', () => {
     it('finds all nodes by predicate', () => {
       const tree = TraceTree.FromTrace(trace, traceMetadata);
       const nodes = TraceTree.FindAll(tree.root, n => isTransactionNode(n));
-      expect(nodes.length).toBe(2);
+      expect(nodes).toHaveLength(2);
     });
   });
 
   describe('DirectVisibleChildren', () => {
     it('returns children for transaction', () => {
       const tree = TraceTree.FromTrace(trace, traceMetadata);
-      expect(TraceTree.DirectVisibleChildren(tree.root.children[0])).toEqual(
-        tree.root.children[0].children
+      expect(TraceTree.DirectVisibleChildren(tree.root.children[0]!)).toEqual(
+        tree.root.children[0]!.children
       );
     });
 
@@ -1046,7 +1046,7 @@ describe('TraceTree', () => {
       const tree = TraceTree.FromTrace(trace, traceMetadata);
 
       TraceTree.FromSpans(
-        tree.root.children[0],
+        tree.root.children[0]!,
         parentAutogroupSpansWithTailChildren,
         makeEventTransaction()
       );
@@ -1066,7 +1066,7 @@ describe('TraceTree', () => {
       const tree = TraceTree.FromTrace(trace, traceMetadata);
 
       TraceTree.FromSpans(
-        tree.root.children[0],
+        tree.root.children[0]!,
         parentAutogroupSpans,
         makeEventTransaction()
       );
@@ -1093,7 +1093,7 @@ describe('TraceTree', () => {
         }),
         traceMetadata
       );
-      expect(TraceTree.HasVisibleChildren(tree.root.children[0])).toBe(true);
+      expect(TraceTree.HasVisibleChildren(tree.root.children[0]!)).toBe(true);
     });
 
     describe('span', () => {
@@ -1105,7 +1105,7 @@ describe('TraceTree', () => {
           traceMetadata
         );
         TraceTree.FromSpans(
-          tree.root.children[0],
+          tree.root.children[0]!,
           [
             makeSpan({span_id: '0000'}),
             makeSpan({span_id: '0001', parent_span_id: '0000'}),
@@ -1128,7 +1128,7 @@ describe('TraceTree', () => {
         const tree = TraceTree.FromTrace(trace, traceMetadata);
 
         TraceTree.FromSpans(
-          tree.root.children[0],
+          tree.root.children[0]!,
           siblingAutogroupSpans,
           makeEventTransaction()
         );
@@ -1148,7 +1148,7 @@ describe('TraceTree', () => {
         const tree = TraceTree.FromTrace(trace, traceMetadata);
 
         TraceTree.FromSpans(
-          tree.root.children[0],
+          tree.root.children[0]!,
           parentAutogroupSpans,
           makeEventTransaction()
         );
@@ -1169,7 +1169,7 @@ describe('TraceTree', () => {
         const tree = TraceTree.FromTrace(trace, traceMetadata);
 
         TraceTree.FromSpans(
-          tree.root.children[0],
+          tree.root.children[0]!,
           parentAutogroupSpansWithTailChildren,
           makeEventTransaction()
         );
@@ -1195,7 +1195,7 @@ describe('TraceTree', () => {
         }),
         traceMetadata
       );
-      expect(TraceTree.IsLastChild(tree.root.children[0].children[0])).toBe(false);
+      expect(TraceTree.IsLastChild(tree.root.children[0]!.children[0]!)).toBe(false);
     });
     it('returns true if node is last child', () => {
       const tree = TraceTree.FromTrace(
@@ -1204,27 +1204,27 @@ describe('TraceTree', () => {
         }),
         traceMetadata
       );
-      expect(TraceTree.IsLastChild(tree.root.children[0].children[1])).toBe(true);
+      expect(TraceTree.IsLastChild(tree.root.children[0]!.children[1]!)).toBe(true);
     });
   });
 
   describe('Invalidate', () => {
     it('invalidates node', () => {
       const tree = TraceTree.FromTrace(trace, traceMetadata);
-      tree.root.children[0].depth = 10;
-      tree.root.children[0].connectors = [1, 2, 3];
+      tree.root.children[0]!.depth = 10;
+      tree.root.children[0]!.connectors = [1, 2, 3];
 
-      TraceTree.invalidate(tree.root.children[0], false);
-      expect(tree.root.children[0].depth).toBeUndefined();
-      expect(tree.root.children[0].connectors).toBeUndefined();
+      TraceTree.invalidate(tree.root.children[0]!, false);
+      expect(tree.root.children[0]!.depth).toBeUndefined();
+      expect(tree.root.children[0]!.connectors).toBeUndefined();
     });
     it('recursively invalidates children', () => {
       const tree = TraceTree.FromTrace(trace, traceMetadata);
-      tree.root.children[0].depth = 10;
-      tree.root.children[0].connectors = [1, 2, 3];
+      tree.root.children[0]!.depth = 10;
+      tree.root.children[0]!.connectors = [1, 2, 3];
       TraceTree.invalidate(tree.root, true);
-      expect(tree.root.children[0].depth).toBeUndefined();
-      expect(tree.root.children[0].connectors).toBeUndefined();
+      expect(tree.root.children[0]!.depth).toBeUndefined();
+      expect(tree.root.children[0]!.connectors).toBeUndefined();
     });
   });
 
@@ -1447,7 +1447,7 @@ describe('TraceTree', () => {
           isSiblingAutogroupedNode(node)
         ) as SiblingAutogroupNode;
 
-        const path = TraceTree.PathToNode(siblingAutogroup.children[1]);
+        const path = TraceTree.PathToNode(siblingAutogroup.children[1]!);
         expect(path).toEqual(['span-1', 'txn-child-event-id']);
       });
     });
diff --git a/static/app/views/performance/newTraceDetails/traceModels/traceTree.ssr.spec.tsx b/static/app/views/performance/newTraceDetails/traceModels/traceTree.ssr.spec.tsx
index daea0ad495e4bc..c4a882e113be0d 100644
--- a/static/app/views/performance/newTraceDetails/traceModels/traceTree.ssr.spec.tsx
+++ b/static/app/views/performance/newTraceDetails/traceModels/traceTree.ssr.spec.tsx
@@ -47,8 +47,8 @@ describe('server side rendering', () => {
   it('reparents pageload transaction as parent of server handler', () => {
     const tree = TraceTree.FromTrace(ssrTrace, traceMetadata);
 
-    const pageload = tree.root.children[0].children[0];
-    const serverHandler = pageload.children[0];
+    const pageload = tree.root.children[0]!.children[0]!;
+    const serverHandler = pageload.children[0]!;
 
     expect(serverHandler.parent).toBe(pageload);
     expect(pageload.parent).toBe(tree.root.children[0]);
@@ -59,7 +59,7 @@ describe('server side rendering', () => {
     const tree = TraceTree.FromTrace(ssrTrace, traceMetadata);
 
     TraceTree.FromSpans(
-      tree.root.children[0].children[0],
+      tree.root.children[0]!.children[0]!,
       ssrSpans,
       makeEventTransaction()
     );
diff --git a/static/app/views/performance/newTraceDetails/traceModels/traceTree.tsx b/static/app/views/performance/newTraceDetails/traceModels/traceTree.tsx
index d1300c4c30ac8c..7cbc239ac6f718 100644
--- a/static/app/views/performance/newTraceDetails/traceModels/traceTree.tsx
+++ b/static/app/views/performance/newTraceDetails/traceModels/traceTree.tsx
@@ -195,6 +195,7 @@ export declare namespace TraceTree {
     poor: boolean;
     start: number;
     type: 'cls' | 'fcp' | 'fp' | 'lcp' | 'ttfb';
+    score?: number;
   };
 
   type CollectedVital = {key: string; measurement: Measurement; score?: number};
@@ -336,8 +337,8 @@ export class TraceTree extends TraceTreeEventDispatcher {
     const traceSpaceBounds = [Number.POSITIVE_INFINITY, Number.NEGATIVE_INFINITY];
 
     TraceTree.ForEachChild(traceNode, c => {
-      traceSpaceBounds[0] = Math.min(traceSpaceBounds[0], c.space[0]);
-      traceSpaceBounds[1] = Math.max(traceSpaceBounds[1], c.space[0] + c.space[1]);
+      traceSpaceBounds[0] = Math.min(traceSpaceBounds[0]!, c.space[0]);
+      traceSpaceBounds[1] = Math.max(traceSpaceBounds[1]!, c.space[0] + c.space[1]);
 
       if (isTransactionNode(c)) {
         for (const error of c.value.errors) {
@@ -391,17 +392,17 @@ export class TraceTree extends TraceTreeEventDispatcher {
       const replayStart = options.replay.started_at.getTime();
       const replayEnd = options.replay.finished_at.getTime();
 
-      traceSpaceBounds[0] = Math.min(traceSpaceBounds[0], replayStart);
-      traceSpaceBounds[1] = Math.max(traceSpaceBounds[1], replayEnd);
+      traceSpaceBounds[0] = Math.min(traceSpaceBounds[0]!, replayStart);
+      traceSpaceBounds[1] = Math.max(traceSpaceBounds[1]!, replayEnd);
     }
 
     for (const indicator of tree.indicators) {
       // If any indicator starts after the trace ends, set end to the indicator start
-      if (indicator.start > traceSpaceBounds[1]) {
+      if (indicator.start > traceSpaceBounds[1]!) {
         traceSpaceBounds[1] = indicator.start;
       }
       // If an indicator starts before the trace start, set start to the indicator start
-      if (indicator.start < traceSpaceBounds[0]) {
+      if (indicator.start < traceSpaceBounds[0]!) {
         traceSpaceBounds[0] = indicator.start;
       }
     }
@@ -414,10 +415,10 @@ export class TraceTree extends TraceTreeEventDispatcher {
       traceSpaceBounds[1] = 0;
     }
 
-    const space = [traceSpaceBounds[0], traceSpaceBounds[1] - traceSpaceBounds[0]];
+    const space = [traceSpaceBounds[0]!, traceSpaceBounds[1]! - traceSpaceBounds[0]!];
 
-    tree.root.space = [space[0], space[1]];
-    traceNode.space = [space[0], space[1]];
+    tree.root.space = [space[0]!, space[1]!];
+    traceNode.space = [space[0]!, space[1]!];
 
     tree.indicators.sort((a, b) => a.start - b.start);
     return tree;
@@ -596,7 +597,7 @@ export class TraceTree extends TraceTreeEventDispatcher {
 
     // We need to invalidate the data in the last node of the tree
     // so that the connectors are updated and pointing to the sibling nodes
-    const last = this.root.children[this.root.children.length - 1];
+    const last = this.root.children[this.root.children.length - 1]!;
     TraceTree.invalidate(last, true);
 
     const previousEnd = this.root.space[0] + this.root.space[1];
@@ -638,7 +639,7 @@ export class TraceTree extends TraceTreeEventDispatcher {
         }
 
         for (let i = 0; i < next.children.length; i++) {
-          queue.push(next.children[i]);
+          queue.push(next.children[i]!);
         }
       }
     }
@@ -746,7 +747,7 @@ export class TraceTree extends TraceTreeEventDispatcher {
       while (
         tail &&
         tail.children.length === 1 &&
-        isSpanNode(tail.children[0]) &&
+        isSpanNode(tail.children[0]!) &&
         tail.children[0].value.op === head.value.op
       ) {
         start = Math.min(start, tail.space[0]);
@@ -878,7 +879,7 @@ export class TraceTree extends TraceTreeEventDispatcher {
 
       while (index < node.children.length) {
         // Skip until we find a span candidate
-        if (!isSpanNode(node.children[index])) {
+        if (!isSpanNode(node.children[index]!)) {
           index++;
           matchCount = 0;
           continue;
@@ -928,15 +929,15 @@ export class TraceTree extends TraceTreeEventDispatcher {
           let timestamp = Number.NEGATIVE_INFINITY;
 
           for (let j = start; j < start + matchCount + 1; j++) {
-            const child = node.children[j];
+            const child = node.children[j]!;
 
-            start_timestamp = Math.min(start_timestamp, node.children[j].space[0]);
+            start_timestamp = Math.min(start_timestamp, node.children[j]!.space[0]!);
             timestamp = Math.max(
               timestamp,
-              node.children[j].space[0] + node.children[j].space[1]
+              node.children[j]!.space[0]! + node.children[j]!.space[1]!
             );
 
-            if (node.children[j].hasErrors) {
+            if (node.children[j]!.hasErrors) {
               for (const error of child.errors) {
                 autoGroupedNode.errors.add(error);
               }
@@ -946,8 +947,8 @@ export class TraceTree extends TraceTreeEventDispatcher {
               }
             }
 
-            autoGroupedNode.children.push(node.children[j]);
-            node.children[j].parent = autoGroupedNode;
+            autoGroupedNode.children.push(node.children[j]!);
+            node.children[j]!.parent = autoGroupedNode;
           }
 
           autoGroupedNode.space = [start_timestamp, timestamp - start_timestamp];
@@ -1010,7 +1011,7 @@ export class TraceTree extends TraceTreeEventDispatcher {
       const children = TraceTree.DirectVisibleChildren(root);
 
       for (let i = children.length - 1; i >= 0; i--) {
-        queue.push(children[i]);
+        queue.push(children[i]!);
       }
     }
 
@@ -1024,7 +1025,7 @@ export class TraceTree extends TraceTreeEventDispatcher {
         const children = TraceTree.DirectVisibleChildren(node);
 
         for (let i = children.length - 1; i >= 0; i--) {
-          queue.push(children[i]);
+          queue.push(children[i]!);
         }
       }
     }
@@ -1064,7 +1065,7 @@ export class TraceTree extends TraceTreeEventDispatcher {
       queue.push(root.head);
     } else {
       for (let i = root.children.length - 1; i >= 0; i--) {
-        queue.push(root.children[i]);
+        queue.push(root.children[i]!);
       }
     }
 
@@ -1077,7 +1078,7 @@ export class TraceTree extends TraceTreeEventDispatcher {
         queue.push(next.head);
       } else {
         for (let i = next.children.length - 1; i >= 0; i--) {
-          queue.push(next.children[i]);
+          queue.push(next.children[i]!);
         }
       }
     }
@@ -1148,7 +1149,7 @@ export class TraceTree extends TraceTreeEventDispatcher {
         queue.push(next.head);
       } else {
         for (let i = next.children.length - 1; i >= 0; i--) {
-          queue.push(next.children[i]);
+          queue.push(next.children[i]!);
         }
       }
     }
@@ -1171,7 +1172,7 @@ export class TraceTree extends TraceTreeEventDispatcher {
     }
 
     if (type === 'trace' && id === 'root') {
-      return tree.root.children[0];
+      return tree.root.children[0]!;
     }
 
     return TraceTree.Find(tree.root, node => {
@@ -1193,7 +1194,7 @@ export class TraceTree extends TraceTreeEventDispatcher {
           );
         }
         if (isSiblingAutogroupedNode(node)) {
-          const child = node.children[0];
+          const child = node.children[0]!;
           if (isSpanNode(child)) {
             return child.value.span_id === id;
           }
@@ -1271,7 +1272,7 @@ export class TraceTree extends TraceTreeEventDispatcher {
       }
 
       if (isSiblingAutogroupedNode(n)) {
-        const child = n.children[0];
+        const child = n.children[0]!;
         if (isSpanNode(child)) {
           return child.value.span_id === eventId;
         }
@@ -1813,7 +1814,7 @@ export class TraceTree extends TraceTreeEventDispatcher {
     const {organization, api, urlParams, filters, rerender, replayTraces} = options;
     const clonedTraceIds = [...replayTraces];
 
-    const root = this.root.children[0];
+    const root = this.root.children[0]!;
     root.fetchStatus = 'loading';
     rerender();
 
@@ -1901,7 +1902,7 @@ function nodeToId(n: TraceTreeNode<TraceTree.NodeValue>): TraceTree.NodePath {
       return `ag-${n.head.value.span_id}`;
     }
     if (isSiblingAutogroupedNode(n)) {
-      const child = n.children[0];
+      const child = n.children[0]!;
       if (isSpanNode(child)) {
         return `ag-${child.value.span_id}`;
       }
diff --git a/static/app/views/performance/newTraceDetails/tracePreferencesDropdown.tsx b/static/app/views/performance/newTraceDetails/tracePreferencesDropdown.tsx
index 287f3272ede474..69241f62a2986a 100644
--- a/static/app/views/performance/newTraceDetails/tracePreferencesDropdown.tsx
+++ b/static/app/views/performance/newTraceDetails/tracePreferencesDropdown.tsx
@@ -28,8 +28,8 @@ const TRACE_PREFERENCES_DROPDOWN_OPTIONS: SelectOption<string>[] = [
     ),
   },
   {
-    label: t('Missing Instrumentation'),
-    value: 'missing-instrumentation',
+    label: t('No Instrumentation'),
+    value: 'no-instrumentation',
     details: t(
       'Shows when there is more than 100ms of unaccounted elapsed time between two spans.'
     ),
@@ -43,7 +43,7 @@ export function TracePreferencesDropdown(props: TracePreferencesDropdownProps) {
       value.push('autogroup');
     }
     if (props.missingInstrumentation) {
-      value.push('missing-instrumentation');
+      value.push('no-instrumentation');
     }
     return value;
   }, [props.autogroup, props.missingInstrumentation]);
@@ -60,7 +60,7 @@ export function TracePreferencesDropdown(props: TracePreferencesDropdownProps) {
         if (newOption === 'autogroup') {
           onAutogroupChange();
         }
-        if (newOption === 'missing-instrumentation') {
+        if (newOption === 'no-instrumentation') {
           onMissingInstrumentationChange();
         }
       }
@@ -70,7 +70,7 @@ export function TracePreferencesDropdown(props: TracePreferencesDropdownProps) {
         if (removedOption === 'autogroup') {
           onAutogroupChange();
         }
-        if (removedOption === 'missing-instrumentation') {
+        if (removedOption === 'no-instrumentation') {
           onMissingInstrumentationChange();
         }
       }
diff --git a/static/app/views/performance/newTraceDetails/traceRenderers/traceVirtualizedList.tsx b/static/app/views/performance/newTraceDetails/traceRenderers/traceVirtualizedList.tsx
index c61219006e376f..b56107fb5d2fa8 100644
--- a/static/app/views/performance/newTraceDetails/traceRenderers/traceVirtualizedList.tsx
+++ b/static/app/views/performance/newTraceDetails/traceRenderers/traceVirtualizedList.tsx
@@ -96,13 +96,13 @@ export const useVirtualizedList = (
       styleCache.current?.clear();
       renderCache.current?.clear();
 
-      scrollHeightRef.current = elements[0].contentRect.height;
+      scrollHeightRef.current = elements[0]!.contentRect.height;
       if (list.current) {
         list.current.scrollHeight = scrollHeightRef.current;
       }
 
       maybeToggleScrollbar(
-        elements[0].target as HTMLElement,
+        elements[0]!.target as HTMLElement,
         scrollHeightRef.current,
         itemsRef.current.length * 24,
         managerRef.current
@@ -330,7 +330,7 @@ function findRenderedItems({
         key: indexPointer,
         style,
         index: indexPointer,
-        item: items[indexPointer],
+        item: items[indexPointer]!,
       };
 
       virtualized[visibleItemIndex] = virtualizedRow;
diff --git a/static/app/views/performance/newTraceDetails/traceRenderers/virtualizedViewManager.spec.tsx b/static/app/views/performance/newTraceDetails/traceRenderers/virtualizedViewManager.spec.tsx
index 8c01f927838760..61d2414032937c 100644
--- a/static/app/views/performance/newTraceDetails/traceRenderers/virtualizedViewManager.spec.tsx
+++ b/static/app/views/performance/newTraceDetails/traceRenderers/virtualizedViewManager.spec.tsx
@@ -159,7 +159,7 @@ describe('VirtualizedViewManger', () => {
       manager.view.setTraceSpace([0, 0, 1000, 1]);
       manager.view.setTracePhysicalSpace([0, 0, 1000, 1], [0, 0, 1000, 1]);
 
-      expect(manager.transformXFromTimestamp(50)).toEqual(50);
+      expect(manager.transformXFromTimestamp(50)).toBe(50);
     });
 
     it('computes x position correctly when view is offset', () => {
@@ -177,7 +177,7 @@ describe('VirtualizedViewManger', () => {
 
       manager.view.trace_view.x = 50;
 
-      expect(manager.transformXFromTimestamp(-50)).toEqual(-150);
+      expect(manager.transformXFromTimestamp(-50)).toBe(-150);
     });
 
     it('when view is offset and scaled', () => {
@@ -194,7 +194,7 @@ describe('VirtualizedViewManger', () => {
       manager.view.setTracePhysicalSpace([0, 0, 1000, 1], [0, 0, 1000, 1]);
       manager.view.setTraceView({width: 500, x: 500});
 
-      expect(Math.round(manager.transformXFromTimestamp(100))).toEqual(-500);
+      expect(Math.round(manager.transformXFromTimestamp(100))).toBe(-500);
     });
   });
 });
diff --git a/static/app/views/performance/newTraceDetails/traceRenderers/virtualizedViewManager.tsx b/static/app/views/performance/newTraceDetails/traceRenderers/virtualizedViewManager.tsx
index 9b5605986be809..e1d7f8d73062f9 100644
--- a/static/app/views/performance/newTraceDetails/traceRenderers/virtualizedViewManager.tsx
+++ b/static/app/views/performance/newTraceDetails/traceRenderers/virtualizedViewManager.tsx
@@ -453,7 +453,7 @@ export class VirtualizedViewManager {
       const scale = 1 - event.deltaY * 0.01 * -1;
       const x = offsetX > 0 ? event.clientX - offsetX : event.offsetX;
       const configSpaceCursor = this.view.getConfigSpaceCursor({
-        x: x,
+        x,
         y: 0,
       });
 
@@ -663,15 +663,15 @@ export class VirtualizedViewManager {
   maybeInitializeTraceViewFromQS(fov: string): void {
     const [x, width] = fov.split(',').map(parseFloat);
 
-    if (isNaN(x) || isNaN(width)) {
+    if (isNaN(x!) || isNaN(width!)) {
       return;
     }
 
-    if (width <= 0 || width > this.view.trace_space.width) {
+    if (width! <= 0 || width! > this.view.trace_space.width) {
       return;
     }
 
-    if (x < 0 || x > this.view.trace_space.width) {
+    if (x! < 0 || x! > this.view.trace_space.width) {
       return;
     }
 
@@ -933,7 +933,7 @@ export class VirtualizedViewManager {
     let innerMostNode: TraceTreeNode<any> | undefined;
 
     for (let i = 5; i < this.columns.span_list.column_refs.length - 5; i++) {
-      const width = this.row_measurer.cache.get(this.columns.list.column_nodes[i]);
+      const width = this.row_measurer.cache.get(this.columns.list.column_nodes[i]!);
       if (width === undefined) {
         // this is unlikely to happen, but we should trigger a sync measure event if it does
         continue;
@@ -943,7 +943,7 @@ export class VirtualizedViewManager {
       max = Math.max(max, width);
       innerMostNode =
         !innerMostNode ||
-        TraceTree.Depth(this.columns.list.column_nodes[i]) <
+        TraceTree.Depth(this.columns.list.column_nodes[i]!) <
           TraceTree.Depth(innerMostNode)
           ? this.columns.list.column_nodes[i]
           : innerMostNode;
@@ -1122,8 +1122,8 @@ export class VirtualizedViewManager {
     const text_width = this.text_measurer.measure(text);
 
     const timestamps = getIconTimestamps(node, span_space, icon_width_config_space);
-    const text_left = Math.min(span_space[0], timestamps[0]);
-    const text_right = Math.max(span_space[0] + span_space[1], timestamps[1]);
+    const text_left = Math.min(span_space[0], timestamps[0]!);
+    const text_right = Math.max(span_space[0] + span_space[1], timestamps[1]!);
 
     // precompute all anchor points aot, so we make the control flow more readable.
     /// |---| text
@@ -1449,7 +1449,7 @@ export class VirtualizedViewManager {
 
   drawVerticalIndicators() {
     for (const key in this.vertical_indicators) {
-      this.drawVerticalIndicator(this.vertical_indicators[key]);
+      this.drawVerticalIndicator(this.vertical_indicators[key]!);
     }
   }
 
@@ -1616,7 +1616,7 @@ export class VirtualizedViewManager {
 
       if (text) {
         const [inside, text_transform] = this.computeSpanTextPlacement(
-          this.columns.list.column_nodes[i],
+          this.columns.list.column_nodes[i]!,
           text.space,
           text.text
         );
diff --git a/static/app/views/performance/newTraceDetails/traceRow/traceCollapsedRow.tsx b/static/app/views/performance/newTraceDetails/traceRow/traceCollapsedRow.tsx
index 957a958177fb0e..3203417b17318e 100644
--- a/static/app/views/performance/newTraceDetails/traceRow/traceCollapsedRow.tsx
+++ b/static/app/views/performance/newTraceDetails/traceRow/traceCollapsedRow.tsx
@@ -53,7 +53,7 @@ export function TraceCollapsedRow(props: TraceRowProps<CollapsedNode>) {
               ? t('hidden span')
               : t('hidden spans')
             : null}
-          {stats.events > 0 && ', '}
+          {stats.issues > 0 && stats.events > 0 && ', '}
           {stats.issues > 0 ? stats.issues : null}{' '}
           {stats.issues > 0
             ? stats.issues === 1
diff --git a/static/app/views/performance/newTraceDetails/traceRow/traceIcons.tsx b/static/app/views/performance/newTraceDetails/traceRow/traceIcons.tsx
index 63945b3e23d382..82ee67716ce7f4 100644
--- a/static/app/views/performance/newTraceDetails/traceRow/traceIcons.tsx
+++ b/static/app/views/performance/newTraceDetails/traceRow/traceIcons.tsx
@@ -1,5 +1,4 @@
 import {Fragment, useMemo} from 'react';
-import styled from '@emotion/styled';
 import clamp from 'lodash/clamp';
 import {PlatformIcon} from 'platformicons';
 
@@ -107,10 +106,5 @@ export function SpanProjectIcon({platform}: {platform: string}) {
     return null;
   }
 
-  return <FaintProjectIcon platform={platform} />;
+  return <PlatformIcon platform={platform} />;
 }
-
-const FaintProjectIcon = styled(PlatformIcon)`
-  opacity: 0.2;
-  filter: grayscale(1);
-`;
diff --git a/static/app/views/performance/newTraceDetails/traceRow/traceMissingInstrumentationRow.tsx b/static/app/views/performance/newTraceDetails/traceRow/traceMissingInstrumentationRow.tsx
index d1bab9b439f055..cf3c081c20d7f1 100644
--- a/static/app/views/performance/newTraceDetails/traceRow/traceMissingInstrumentationRow.tsx
+++ b/static/app/views/performance/newTraceDetails/traceRow/traceMissingInstrumentationRow.tsx
@@ -39,7 +39,7 @@ export function TraceMissingInstrumentationRow(
           <div className="TraceChildrenCountWrapper">
             <TraceRowConnectors node={props.node} manager={props.manager} />
           </div>
-          <span className="TraceOperation">{t('Missing instrumentation')}</span>
+          <span className="TraceOperation">{t('No Instrumentation')}</span>
         </div>
       </div>
       <div
diff --git a/static/app/views/performance/newTraceDetails/traceRow/traceRootNode.tsx b/static/app/views/performance/newTraceDetails/traceRow/traceRootNode.tsx
index 61a51c4c8e28d5..0112bb5b0bd521 100644
--- a/static/app/views/performance/newTraceDetails/traceRow/traceRootNode.tsx
+++ b/static/app/views/performance/newTraceDetails/traceRow/traceRootNode.tsx
@@ -14,12 +14,15 @@ import {
   TraceRowConnectors,
   type TraceRowProps,
 } from '../traceRow/traceRow';
+import {useHasTraceNewUi} from '../useHasTraceNewUi';
 
 const NO_ERRORS = new Set<TraceTree.TraceError>();
 const NO_PERFORMANCE_ISSUES = new Set<TraceTree.TracePerformanceIssue>();
 const NO_PROFILES = [];
 
 export function TraceRootRow(props: TraceRowProps<TraceTreeNode<TraceTree.Trace>>) {
+  const hasTraceNewUi = useHasTraceNewUi();
+
   if (!isTraceNode(props.node)) {
     throw new Error('Trace row rendered called on row that is not root');
   }
@@ -77,23 +80,27 @@ export function TraceRootRow(props: TraceRowProps<TraceTreeNode<TraceTree.Trace>
         className={props.spanColumnClassName}
         onDoubleClick={props.onRowDoubleClick}
       >
-        <TraceBar
-          node={props.node}
-          virtualized_index={props.virtualized_index}
-          manager={props.manager}
-          color={makeTraceNodeBarColor(props.theme, props.node)}
-          node_space={props.node.space}
-          errors={NO_ERRORS}
-          performance_issues={NO_PERFORMANCE_ISSUES}
-          profiles={NO_PROFILES}
-        />
-        <button
-          ref={props.registerSpanArrowRef}
-          className="TraceArrow"
-          onClick={props.onSpanArrowClick}
-        >
-          <TraceIcons.Chevron direction="left" />
-        </button>
+        {!hasTraceNewUi && (
+          <Fragment>
+            <TraceBar
+              node={props.node}
+              virtualized_index={props.virtualized_index}
+              manager={props.manager}
+              color={makeTraceNodeBarColor(props.theme, props.node)}
+              node_space={props.node.space}
+              errors={NO_ERRORS}
+              performance_issues={NO_PERFORMANCE_ISSUES}
+              profiles={NO_PROFILES}
+            />
+            <button
+              ref={props.registerSpanArrowRef}
+              className="TraceArrow"
+              onClick={props.onSpanArrowClick}
+            >
+              <TraceIcons.Chevron direction="left" />
+            </button>
+          </Fragment>
+        )}
       </div>
     </div>
   );
diff --git a/static/app/views/performance/newTraceDetails/traceSearch/traceSearchEvaluator.spec.tsx b/static/app/views/performance/newTraceDetails/traceSearch/traceSearchEvaluator.spec.tsx
index 4219ad1a331fb8..7a46a770739a56 100644
--- a/static/app/views/performance/newTraceDetails/traceSearch/traceSearchEvaluator.spec.tsx
+++ b/static/app/views/performance/newTraceDetails/traceSearch/traceSearchEvaluator.spec.tsx
@@ -104,7 +104,7 @@ describe('TraceSearchEvaluator', () => {
     });
     expect(cb.mock.calls[0][0][0]).toEqual([]);
     expect(cb.mock.calls[0][0][1].size).toBe(0);
-    expect(cb.mock.calls[0][0][2]).toBe(null);
+    expect(cb.mock.calls[0][0][2]).toBeNull();
   });
   it.each([
     [''],
@@ -129,7 +129,7 @@ describe('TraceSearchEvaluator', () => {
     });
     expect(cb.mock.calls[0][0][0]).toEqual([]);
     expect(cb.mock.calls[0][0][1].size).toBe(0);
-    expect(cb.mock.calls[0][0][2]).toBe(null);
+    expect(cb.mock.calls[0][0][2]).toBeNull();
   });
 
   it('AND query', async () => {
@@ -145,7 +145,7 @@ describe('TraceSearchEvaluator', () => {
     });
     expect(cb.mock.calls[0][0][1].size).toBe(1);
     expect(cb.mock.calls[0][0][0]).toEqual([{index: 0, value: tree.list[0]}]);
-    expect(cb.mock.calls[0][0][2]).toBe(null);
+    expect(cb.mock.calls[0][0][2]).toBeNull();
   });
 
   it('OR query', async () => {
@@ -164,7 +164,7 @@ describe('TraceSearchEvaluator', () => {
       {index: 1, value: tree.list[1]},
     ]);
     expect(cb.mock.calls[0][0][1].size).toBe(2);
-    expect(cb.mock.calls[0][0][2]).toBe(null);
+    expect(cb.mock.calls[0][0][2]).toBeNull();
   });
 
   it('OR with AND respects precedence', async () => {
@@ -187,7 +187,7 @@ describe('TraceSearchEvaluator', () => {
       {index: 0, value: tree.list[0]},
       {index: 1, value: tree.list[1]},
     ]);
-    expect(cb.mock.calls[0][0][2]).toBe(null);
+    expect(cb.mock.calls[0][0][2]).toBeNull();
   });
 
   describe('transaction', () => {
@@ -202,7 +202,7 @@ describe('TraceSearchEvaluator', () => {
       await waitFor(() => expect(cb).toHaveBeenCalled());
       expect(cb.mock.calls[0][0][1].size).toBe(1);
       expect(cb.mock.calls[0][0][0]).toEqual([{index: 0, value: tree.list[0]}]);
-      expect(cb.mock.calls[0][0][2]).toBe(null);
+      expect(cb.mock.calls[0][0][2]).toBeNull();
     });
 
     it('text filter with prefix', async () => {
@@ -213,7 +213,7 @@ describe('TraceSearchEvaluator', () => {
       await waitFor(() => expect(cb).toHaveBeenCalled());
       expect(cb.mock.calls[0][0][1].size).toBe(1);
       expect(cb.mock.calls[0][0][0]).toEqual([{index: 0, value: tree.list[0]}]);
-      expect(cb.mock.calls[0][0][2]).toBe(null);
+      expect(cb.mock.calls[0][0][2]).toBeNull();
     });
 
     it('transaction.duration (milliseconds)', async () => {
@@ -227,7 +227,7 @@ describe('TraceSearchEvaluator', () => {
       await waitFor(() => expect(cb).toHaveBeenCalled());
       expect(cb.mock.calls[0][0][1].size).toBe(1);
       expect(cb.mock.calls[0][0][0]).toEqual([{index: 0, value: tree.list[0]}]);
-      expect(cb.mock.calls[0][0][2]).toBe(null);
+      expect(cb.mock.calls[0][0][2]).toBeNull();
     });
 
     it('transaction.duration (seconds)', async () => {
@@ -241,7 +241,7 @@ describe('TraceSearchEvaluator', () => {
       await waitFor(() => expect(cb).toHaveBeenCalled());
       expect(cb.mock.calls[0][0][1].size).toBe(1);
       expect(cb.mock.calls[0][0][0]).toEqual([{index: 0, value: tree.list[0]}]);
-      expect(cb.mock.calls[0][0][2]).toBe(null);
+      expect(cb.mock.calls[0][0][2]).toBeNull();
     });
 
     it('transaction.total_time', async () => {
@@ -255,7 +255,7 @@ describe('TraceSearchEvaluator', () => {
       await waitFor(() => expect(cb).toHaveBeenCalled());
       expect(cb.mock.calls[0][0][1].size).toBe(1);
       expect(cb.mock.calls[0][0][0]).toEqual([{index: 0, value: tree.list[0]}]);
-      expect(cb.mock.calls[0][0][2]).toBe(null);
+      expect(cb.mock.calls[0][0][2]).toBeNull();
     });
 
     // For consistency between spans and txns, should should be implemented
@@ -271,7 +271,7 @@ describe('TraceSearchEvaluator', () => {
       await waitFor(() => expect(cb).toHaveBeenCalled());
       expect(cb.mock.calls[0][0][1].size).toBe(1);
       expect(cb.mock.calls[0][0][0]).toEqual([{index: 0, value: tree.list[0]}]);
-      expect(cb.mock.calls[0][0][2]).toBe(null);
+      expect(cb.mock.calls[0][0][2]).toBeNull();
     });
 
     it('text filter with prefix', async () => {
@@ -282,7 +282,7 @@ describe('TraceSearchEvaluator', () => {
       await waitFor(() => expect(cb).toHaveBeenCalled());
       expect(cb.mock.calls[0][0][1].size).toBe(1);
       expect(cb.mock.calls[0][0][0]).toEqual([{index: 0, value: tree.list[0]}]);
-      expect(cb.mock.calls[0][0][2]).toBe(null);
+      expect(cb.mock.calls[0][0][2]).toBeNull();
     });
 
     it('span.duration (milliseconds)', async () => {
@@ -296,7 +296,7 @@ describe('TraceSearchEvaluator', () => {
       await waitFor(() => expect(cb).toHaveBeenCalled());
       expect(cb.mock.calls[0][0][1].size).toBe(1);
       expect(cb.mock.calls[0][0][0]).toEqual([{index: 0, value: tree.list[0]}]);
-      expect(cb.mock.calls[0][0][2]).toBe(null);
+      expect(cb.mock.calls[0][0][2]).toBeNull();
     });
 
     it('span.duration (seconds)', async () => {
@@ -310,7 +310,7 @@ describe('TraceSearchEvaluator', () => {
       await waitFor(() => expect(cb).toHaveBeenCalled());
       expect(cb.mock.calls[0][0][1].size).toBe(1);
       expect(cb.mock.calls[0][0][0]).toEqual([{index: 0, value: tree.list[0]}]);
-      expect(cb.mock.calls[0][0][2]).toBe(null);
+      expect(cb.mock.calls[0][0][2]).toBeNull();
     });
 
     it('span.total_time', async () => {
@@ -324,7 +324,7 @@ describe('TraceSearchEvaluator', () => {
       await waitFor(() => expect(cb).toHaveBeenCalled());
       expect(cb.mock.calls[0][0][1].size).toBe(1);
       expect(cb.mock.calls[0][0][0]).toEqual([{index: 0, value: tree.list[0]}]);
-      expect(cb.mock.calls[0][0][2]).toBe(null);
+      expect(cb.mock.calls[0][0][2]).toBeNull();
     });
     it('span.self_time', async () => {
       const tree = makeTree([
@@ -337,7 +337,7 @@ describe('TraceSearchEvaluator', () => {
       await waitFor(() => expect(cb).toHaveBeenCalled());
       expect(cb.mock.calls[0][0][1].size).toBe(1);
       expect(cb.mock.calls[0][0][0]).toEqual([{index: 0, value: tree.list[0]}]);
-      expect(cb.mock.calls[0][0][2]).toBe(null);
+      expect(cb.mock.calls[0][0][2]).toBeNull();
     });
     it('span.exclusive_time', async () => {
       const tree = makeTree([
@@ -350,7 +350,7 @@ describe('TraceSearchEvaluator', () => {
       await waitFor(() => expect(cb).toHaveBeenCalled());
       expect(cb.mock.calls[0][0][1].size).toBe(1);
       expect(cb.mock.calls[0][0][0]).toEqual([{index: 0, value: tree.list[0]}]);
-      expect(cb.mock.calls[0][0][2]).toBe(null);
+      expect(cb.mock.calls[0][0][2]).toBeNull();
     });
     it('exclusive_time', async () => {
       const tree = makeTree([
@@ -363,7 +363,7 @@ describe('TraceSearchEvaluator', () => {
       await waitFor(() => expect(cb).toHaveBeenCalled());
       expect(cb.mock.calls[0][0][1].size).toBe(1);
       expect(cb.mock.calls[0][0][0]).toEqual([{index: 0, value: tree.list[0]}]);
-      expect(cb.mock.calls[0][0][2]).toBe(null);
+      expect(cb.mock.calls[0][0][2]).toBeNull();
     });
   });
 
@@ -382,7 +382,7 @@ describe('TraceSearchEvaluator', () => {
         await waitFor(() => expect(cb).toHaveBeenCalled());
         expect(cb.mock.calls[0][0][1].size).toBe(1);
         expect(cb.mock.calls[0][0][0]).toEqual([{index: 0, value: tree.list[0]}]);
-        expect(cb.mock.calls[0][0][2]).toBe(null);
+        expect(cb.mock.calls[0][0][2]).toBeNull();
       });
       it.each(['issue', 'issues'])('%s (error on transaction)', async key => {
         const tree = makeTree([
@@ -397,7 +397,7 @@ describe('TraceSearchEvaluator', () => {
         await waitFor(() => expect(cb).toHaveBeenCalled());
         expect(cb.mock.calls[0][0][1].size).toBe(1);
         expect(cb.mock.calls[0][0][0]).toEqual([{index: 0, value: tree.list[0]}]);
-        expect(cb.mock.calls[0][0][2]).toBe(null);
+        expect(cb.mock.calls[0][0][2]).toBeNull();
       });
 
       it.each(['issue', 'issues'])('%s (performance issue on transaction)', async key => {
@@ -413,7 +413,7 @@ describe('TraceSearchEvaluator', () => {
         await waitFor(() => expect(cb).toHaveBeenCalled());
         expect(cb.mock.calls[0][0][1].size).toBe(1);
         expect(cb.mock.calls[0][0][0]).toEqual([{index: 0, value: tree.list[0]}]);
-        expect(cb.mock.calls[0][0][2]).toBe(null);
+        expect(cb.mock.calls[0][0][2]).toBeNull();
       });
       it.each(['profile', 'profiles'])('%s (profile on transaction)', async key => {
         const tree = makeTree([
@@ -428,7 +428,7 @@ describe('TraceSearchEvaluator', () => {
         await waitFor(() => expect(cb).toHaveBeenCalled());
         expect(cb.mock.calls[0][0][1].size).toBe(1);
         expect(cb.mock.calls[0][0][0]).toEqual([{index: 0, value: tree.list[0]}]);
-        expect(cb.mock.calls[0][0][2]).toBe(null);
+        expect(cb.mock.calls[0][0][2]).toBeNull();
       });
     });
   });
@@ -442,7 +442,7 @@ describe('TraceSearchEvaluator', () => {
       await waitFor(() => expect(cb).toHaveBeenCalled());
       expect(cb.mock.calls[0][0][1].size).toBe(1);
       expect(cb.mock.calls[0][0][0]).toEqual([{index: 0, value: tree.list[0]}]);
-      expect(cb.mock.calls[0][0][2]).toBe(null);
+      expect(cb.mock.calls[0][0][2]).toBeNull();
     });
     it('project.name -> project_slug', async () => {
       const tree = makeTree([makeTransaction({project_slug: 'test_project'})]);
@@ -452,7 +452,7 @@ describe('TraceSearchEvaluator', () => {
       await waitFor(() => expect(cb).toHaveBeenCalled());
       expect(cb.mock.calls[0][0][1].size).toBe(1);
       expect(cb.mock.calls[0][0][0]).toEqual([{index: 0, value: tree.list[0]}]);
-      expect(cb.mock.calls[0][0][2]).toBe(null);
+      expect(cb.mock.calls[0][0][2]).toBeNull();
     });
   });
 });
diff --git a/static/app/views/performance/newTraceDetails/traceSearch/traceSearchEvaluator.tsx b/static/app/views/performance/newTraceDetails/traceSearch/traceSearchEvaluator.tsx
index cb82be86934992..788ce3528971d8 100644
--- a/static/app/views/performance/newTraceDetails/traceSearch/traceSearchEvaluator.tsx
+++ b/static/app/views/performance/newTraceDetails/traceSearch/traceSearchEvaluator.tsx
@@ -65,8 +65,8 @@ export function searchInTraceTreeTokens(
     return handle;
   }
 
-  if (postfix.length === 1 && postfix[0].type === Token.FREE_TEXT) {
-    return searchInTraceTreeText(tree, postfix[0].value, previousNode, cb);
+  if (postfix.length === 1 && postfix[0]!.type === Token.FREE_TEXT) {
+    return searchInTraceTreeText(tree, postfix[0]!.value, previousNode, cb);
   }
 
   let i = 0;
@@ -77,8 +77,8 @@ export function searchInTraceTreeTokens(
   function searchSingleToken() {
     const ts = performance.now();
     while (i < count && performance.now() - ts < 12) {
-      const node = tree.list[i];
-      if (evaluateTokenForValue(postfix[0], resolveValueFromKey(node, postfix[0]))) {
+      const node = tree.list[i]!;
+      if (evaluateTokenForValue(postfix[0]!, resolveValueFromKey(node, postfix[0]!))) {
         resultsForSingleToken.push({index: i, value: node});
         resultLookup.set(node, matchCount);
 
@@ -100,7 +100,7 @@ export function searchInTraceTreeTokens(
     }
   }
 
-  if (postfix.length <= 1 && postfix[0].type === Token.FILTER) {
+  if (postfix.length <= 1 && postfix[0]!.type === Token.FILTER) {
     handle.id = requestAnimationFrame(searchSingleToken);
     return handle;
   }
@@ -130,7 +130,7 @@ export function searchInTraceTreeTokens(
     const ts = performance.now();
     if (!bool) {
       while (ti < postfix.length) {
-        const token = postfix[ti];
+        const token = postfix[ti]!;
         if (token.type === Token.LOGIC_BOOLEAN) {
           bool = token;
           if (stack.length < 2) {
@@ -169,7 +169,7 @@ export function searchInTraceTreeTokens(
 
     if (li < count && !(leftToken instanceof Map)) {
       while (li < count && performance.now() - ts < 12) {
-        const node = tree.list[li];
+        const node = tree.list[li]!;
         if (evaluateTokenForValue(leftToken, resolveValueFromKey(node, leftToken))) {
           left.set(node, li);
         }
@@ -178,7 +178,7 @@ export function searchInTraceTreeTokens(
       handle.id = requestAnimationFrame(search);
     } else if (ri < count && !(rightToken instanceof Map)) {
       while (ri < count && performance.now() - ts < 12) {
-        const node = tree.list[ri];
+        const node = tree.list[ri]!;
         if (evaluateTokenForValue(rightToken, resolveValueFromKey(node, rightToken))) {
           right.set(node, ri);
         }
@@ -265,7 +265,7 @@ export function searchInTraceTreeText(
   function search() {
     const ts = performance.now();
     while (i < count && performance.now() - ts < 12) {
-      const node = tree.list[i];
+      const node = tree.list[i]!;
 
       if (evaluateNodeFreeText(query, node)) {
         results.push({index: i, value: node});
diff --git a/static/app/views/performance/newTraceDetails/traceState/tracePreferences.tsx b/static/app/views/performance/newTraceDetails/traceState/tracePreferences.tsx
index d4f6a97d52f4ff..74a6b8fb19f7bd 100644
--- a/static/app/views/performance/newTraceDetails/traceState/tracePreferences.tsx
+++ b/static/app/views/performance/newTraceDetails/traceState/tracePreferences.tsx
@@ -15,13 +15,14 @@ type TracePreferencesAction =
   | {payload: number; type: 'set list width'}
   | {payload: boolean; type: 'minimize drawer'}
   | {payload: boolean; type: 'set missing instrumentation'}
-  | {payload: boolean; type: 'set autogrouping'};
+  | {payload: boolean; type: 'set autogrouping'}
+  | {payload: number; type: 'set trace context height'};
 
 type TraceDrawerPreferences = {
   layoutOptions: TraceLayoutPreferences[];
   minimized: boolean;
   sizes: {
-    [key in TraceLayoutPreferences]: number;
+    [key in TraceLayoutPreferences | 'trace context height']: number;
   };
 };
 
@@ -42,6 +43,7 @@ export const TRACE_DRAWER_DEFAULT_SIZES: TraceDrawerPreferences['sizes'] = {
   'drawer left': 0.33,
   'drawer right': 0.33,
   'drawer bottom': 0.5,
+  'trace context height': 150,
 };
 
 export const DEFAULT_TRACE_VIEW_PREFERENCES: TracePreferencesState = {
@@ -51,6 +53,7 @@ export const DEFAULT_TRACE_VIEW_PREFERENCES: TracePreferencesState = {
       'drawer left': 0.33,
       'drawer right': 0.33,
       'drawer bottom': 0.5,
+      'trace context height': 150,
     },
     layoutOptions: ['drawer left', 'drawer right', 'drawer bottom'],
   },
@@ -201,6 +204,17 @@ export function tracePreferencesReducer(
           width: clamp(action.payload, 0.1, 0.9),
         },
       };
+    case 'set trace context height':
+      return {
+        ...state,
+        drawer: {
+          ...state.drawer,
+          sizes: {
+            ...state.drawer.sizes,
+            'trace context height': action.payload,
+          },
+        },
+      };
     default:
       traceReducerExhaustiveActionCheck(action);
       return state;
diff --git a/static/app/views/performance/newTraceDetails/traceState/traceSearch.tsx b/static/app/views/performance/newTraceDetails/traceState/traceSearch.tsx
index e1db552c50436f..4848d4427555c7 100644
--- a/static/app/views/performance/newTraceDetails/traceState/traceSearch.tsx
+++ b/static/app/views/performance/newTraceDetails/traceState/traceSearch.tsx
@@ -69,9 +69,9 @@ export function traceSearchReducer(
       }
       return {
         ...state,
-        node: state.results[0].value,
+        node: state.results[0]!.value,
         resultIteratorIndex: 0,
-        resultIndex: state.results[0].index,
+        resultIndex: state.results[0]!.index,
       };
     }
     case 'go to last match': {
@@ -81,8 +81,8 @@ export function traceSearchReducer(
       return {
         ...state,
         resultIteratorIndex: state.results.length - 1,
-        resultIndex: state.results[state.results.length - 1].index,
-        node: state.results[state.results.length - 1].value,
+        resultIndex: state.results[state.results.length - 1]!.index,
+        node: state.results[state.results.length - 1]!.value,
       };
     }
     case 'go to next match': {
@@ -93,8 +93,8 @@ export function traceSearchReducer(
         return {
           ...state,
           resultIteratorIndex: 0,
-          resultIndex: state.results[0].index,
-          node: state.results[0].value,
+          resultIndex: state.results[0]!.index,
+          node: state.results[0]!.value,
         };
       }
       if (!state.results) {
@@ -110,8 +110,8 @@ export function traceSearchReducer(
       return {
         ...state,
         resultIteratorIndex: next,
-        resultIndex: state.results[next].index,
-        node: state.results[next].value,
+        resultIndex: state.results[next]!.index,
+        node: state.results[next]!.value,
       };
     }
     case 'go to previous match': {
@@ -122,8 +122,8 @@ export function traceSearchReducer(
         return {
           ...state,
           resultIteratorIndex: state.results.length - 1,
-          resultIndex: state.results[state.results.length - 1].index,
-          node: state.results[state.results.length - 1].value,
+          resultIndex: state.results[state.results.length - 1]!.index,
+          node: state.results[state.results.length - 1]!.value,
         };
       }
       if (!state.results) {
@@ -139,8 +139,8 @@ export function traceSearchReducer(
       return {
         ...state,
         resultIteratorIndex: previous,
-        resultIndex: state.results[previous].index,
-        node: state.results[previous].value,
+        resultIndex: state.results[previous]!.index,
+        node: state.results[previous]!.value,
       };
     }
     case 'set results': {
diff --git a/static/app/views/performance/newTraceDetails/traceState/traceStateProvider.tsx b/static/app/views/performance/newTraceDetails/traceState/traceStateProvider.tsx
index f50803806780ed..c6a7c6e56a0e00 100644
--- a/static/app/views/performance/newTraceDetails/traceState/traceStateProvider.tsx
+++ b/static/app/views/performance/newTraceDetails/traceState/traceStateProvider.tsx
@@ -8,6 +8,8 @@ import {
   useDispatchingReducer,
 } from 'sentry/utils/useDispatchingReducer';
 
+import {useHasTraceNewUi} from '../useHasTraceNewUi';
+
 import {TraceReducer, type TraceReducerAction, type TraceReducerState} from './index';
 import {storeTraceViewPreferences, type TracePreferencesState} from './tracePreferences';
 
@@ -63,6 +65,7 @@ interface TraceStateProviderProps {
 }
 
 export function TraceStateProvider(props: TraceStateProviderProps): React.ReactNode {
+  const hasTraceNewUi = useHasTraceNewUi();
   const initialQuery = useMemo((): string | undefined => {
     const query = qs.parse(location.search);
 
@@ -71,7 +74,6 @@ export function TraceStateProvider(props: TraceStateProviderProps): React.ReactN
     }
     return undefined;
     // We only want to decode on load
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   const [traceState, traceDispatch, traceStateEmitter] = useDispatchingReducer(
@@ -93,8 +95,8 @@ export function TraceStateProvider(props: TraceStateProviderProps): React.ReactN
       },
       preferences: props.initialPreferences,
       tabs: {
-        tabs: STATIC_DRAWER_TABS,
-        current_tab: STATIC_DRAWER_TABS[0] ?? null,
+        tabs: hasTraceNewUi ? [] : STATIC_DRAWER_TABS,
+        current_tab: hasTraceNewUi ? null : STATIC_DRAWER_TABS[0] ?? null,
         last_clicked_tab: null,
       },
     }
diff --git a/static/app/views/performance/newTraceDetails/traceState/traceTabs.tsx b/static/app/views/performance/newTraceDetails/traceState/traceTabs.tsx
index 19fc0c67b7656b..45246791b3c1a3 100644
--- a/static/app/views/performance/newTraceDetails/traceState/traceTabs.tsx
+++ b/static/app/views/performance/newTraceDetails/traceState/traceTabs.tsx
@@ -31,7 +31,7 @@ export function getTraceTabTitle(node: TraceTreeNode<TraceTree.NodeValue>) {
   }
 
   if (isMissingInstrumentationNode(node)) {
-    return t('Missing Instrumentation');
+    return t('No Instrumentation');
   }
 
   if (isTraceErrorNode(node)) {
@@ -139,7 +139,7 @@ export function traceTabsReducer(
         return index !== action.payload;
       });
 
-      const nextTabIsPersistent = typeof newTabs[newTabs.length - 1].node === 'string';
+      const nextTabIsPersistent = typeof newTabs[newTabs.length - 1]!.node === 'string';
       if (nextTabIsPersistent) {
         if (!state.last_clicked_tab && !state.current_tab) {
           throw new Error(
@@ -149,7 +149,7 @@ export function traceTabsReducer(
 
         const nextTab = nextTabIsPersistent
           ? state.last_clicked_tab ?? state.current_tab
-          : newTabs[newTabs.length - 1];
+          : newTabs[newTabs.length - 1]!;
 
         return {
           ...state,
@@ -159,16 +159,16 @@ export function traceTabsReducer(
         };
       }
 
-      if (state.current_tab?.node === state.tabs[action.payload].node) {
+      if (state.current_tab?.node === state.tabs[action.payload]!.node) {
         return {
           ...state,
-          current_tab: newTabs[newTabs.length - 1],
+          current_tab: newTabs[newTabs.length - 1]!,
           last_clicked_tab: state.last_clicked_tab,
           tabs: newTabs,
         };
       }
 
-      const next = state.last_clicked_tab ?? newTabs[newTabs.length - 1];
+      const next = state.last_clicked_tab ?? newTabs[newTabs.length - 1]!;
 
       return {
         ...state,
@@ -181,8 +181,8 @@ export function traceTabsReducer(
     case 'clear clicked tab': {
       const next =
         state.last_clicked_tab === state.current_tab
-          ? state.tabs[state.tabs.length - 1]
-          : state.current_tab;
+          ? state.tabs[state.tabs.length - 1]!
+          : state.current_tab!;
       return {
         ...state,
         current_tab: next,
diff --git a/static/app/views/performance/newTraceDetails/traceTypeWarnings/errorsOnlyWarnings.tsx b/static/app/views/performance/newTraceDetails/traceTypeWarnings/errorsOnlyWarnings.tsx
index 74f47314fd6ab2..5728bb81fe862d 100644
--- a/static/app/views/performance/newTraceDetails/traceTypeWarnings/errorsOnlyWarnings.tsx
+++ b/static/app/views/performance/newTraceDetails/traceTypeWarnings/errorsOnlyWarnings.tsx
@@ -11,7 +11,6 @@ import SidebarPanelStore from 'sentry/stores/sidebarPanelStore';
 import type {Organization} from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
 import {browserHistory} from 'sentry/utils/browserHistory';
-import {useApiQuery} from 'sentry/utils/queryClient';
 import {useLocation} from 'sentry/utils/useLocation';
 import useProjects from 'sentry/utils/useProjects';
 import {getDocsLinkForEventType} from 'sentry/views/settings/account/notifications/utils';
@@ -21,6 +20,7 @@ import type {TraceTree} from '../traceModels/traceTree';
 import {TraceShape} from '../traceModels/traceTree';
 
 import {TraceWarningComponents} from './styles';
+import {usePerformanceSubscriptionDetails} from './usePerformanceSubscriptionDetails';
 import {usePerformanceUsageStats} from './usePerformanceUsageStats';
 
 type ErrorOnlyWarningsProps = {
@@ -126,59 +126,23 @@ function PerformanceSetupBanner({
   );
 }
 
-type Subscription = {
-  categories:
-    | {
-        transactions: {
-          usageExceeded: boolean;
-        };
-      }
-    | {
-        spans: {
-          usageExceeded: boolean;
-        };
-      };
-  planDetails: {
-    billingInterval: 'monthly' | 'annual';
-  };
-  planTier: string;
-  onDemandBudgets?: {
-    enabled: boolean;
-  };
-};
-
 function PerformanceQuotaExceededWarning(props: ErrorOnlyWarningsProps) {
   const {data: performanceUsageStats} = usePerformanceUsageStats({
     organization: props.organization,
     tree: props.tree,
   });
 
-  const {data: subscription} = useApiQuery<Subscription>(
-    [`/subscriptions/${props.organization.slug}/`],
-    {
-      staleTime: Infinity,
-    }
-  );
+  const {
+    data: {hasExceededPerformanceUsageLimit, subscription},
+  } = usePerformanceSubscriptionDetails();
 
   // Check if events were dropped due to exceeding the transaction quota, around when the trace occurred.
   const droppedTransactionsCount = performanceUsageStats?.totals['sum(quantity)'] || 0;
 
-  // Check if the organization still has transaction quota maxed out.
-  const dataCategories = subscription?.categories;
-  let hasExceededTransactionLimit = false;
-
-  if (dataCategories) {
-    if ('transactions' in dataCategories) {
-      hasExceededTransactionLimit = dataCategories.transactions.usageExceeded || false;
-    } else if ('spans' in dataCategories) {
-      hasExceededTransactionLimit = dataCategories.spans.usageExceeded || false;
-    }
-  }
-
   const hideBanner =
     droppedTransactionsCount === 0 ||
     !props.organization.features.includes('trace-view-quota-exceeded-banner') ||
-    !hasExceededTransactionLimit;
+    !hasExceededPerformanceUsageLimit;
 
   useEffect(() => {
     if (hideBanner) {
@@ -235,7 +199,9 @@ function PerformanceQuotaExceededWarning(props: ErrorOnlyWarningsProps) {
         });
       }}
       docsRoute={getDocsLinkForEventType(
-        dataCategories && 'spans' in dataCategories ? 'span' : 'transaction'
+        subscription?.categories && 'spans' in subscription.categories
+          ? 'span'
+          : 'transaction'
       )}
       primaryButtonText={ctaText}
     />
diff --git a/static/app/views/performance/newTraceDetails/traceTypeWarnings/usePerformanceSubscriptionDetails.tsx b/static/app/views/performance/newTraceDetails/traceTypeWarnings/usePerformanceSubscriptionDetails.tsx
new file mode 100644
index 00000000000000..d30b9b59a523d8
--- /dev/null
+++ b/static/app/views/performance/newTraceDetails/traceTypeWarnings/usePerformanceSubscriptionDetails.tsx
@@ -0,0 +1,56 @@
+import {useApiQuery} from 'sentry/utils/queryClient';
+import useOrganization from 'sentry/utils/useOrganization';
+
+// Note: This does not fully represent the actual Subscription type.
+// Contains only the subset of attributes that we used in the hook.
+type Subscription = {
+  categories:
+    | {
+        transactions: {
+          usageExceeded: boolean;
+        };
+      }
+    | {
+        spans: {
+          usageExceeded: boolean;
+        };
+      };
+  planDetails: {
+    billingInterval: 'monthly' | 'annual';
+  };
+  planTier: string;
+  onDemandBudgets?: {
+    enabled: boolean;
+  };
+};
+
+export function usePerformanceSubscriptionDetails() {
+  const organization = useOrganization();
+
+  const {data: subscription, ...rest} = useApiQuery<Subscription>(
+    [`/subscriptions/${organization.slug}/`],
+    {
+      staleTime: Infinity,
+    }
+  );
+
+  let hasExceededPerformanceUsageLimit: boolean | null = null;
+
+  const dataCategories = subscription?.categories;
+  if (dataCategories) {
+    if ('transactions' in dataCategories) {
+      hasExceededPerformanceUsageLimit =
+        dataCategories.transactions.usageExceeded || false;
+    } else if ('spans' in dataCategories) {
+      hasExceededPerformanceUsageLimit = dataCategories.spans.usageExceeded || false;
+    }
+  }
+
+  return {
+    ...rest,
+    data: {
+      hasExceededPerformanceUsageLimit,
+      subscription,
+    },
+  };
+}
diff --git a/static/app/views/performance/newTraceDetails/traceTypeWarnings/usePerformanceUsageStats.tsx b/static/app/views/performance/newTraceDetails/traceTypeWarnings/usePerformanceUsageStats.tsx
index 73432ddd5326c4..8ee521282d35aa 100644
--- a/static/app/views/performance/newTraceDetails/traceTypeWarnings/usePerformanceUsageStats.tsx
+++ b/static/app/views/performance/newTraceDetails/traceTypeWarnings/usePerformanceUsageStats.tsx
@@ -28,8 +28,8 @@ export function usePerformanceUsageStats({
 }) {
   const traceNode = tree.root.children[0];
 
-  const traceStartDate = new Date(traceNode?.space?.[0]);
-  const traceEndDate = new Date(traceNode?.space?.[0] + traceNode?.space?.[1]);
+  const traceStartDate = new Date(traceNode?.space?.[0]!);
+  const traceEndDate = new Date(traceNode?.space?.[0]! + traceNode?.space?.[1]!);
 
   // Add 1 hour buffer to the trace start and end date.
   const start = traceNode
diff --git a/static/app/views/performance/newTraceDetails/traceWaterfall.tsx b/static/app/views/performance/newTraceDetails/traceWaterfall.tsx
index 83643190f259ea..007f0f9d8c60a7 100644
--- a/static/app/views/performance/newTraceDetails/traceWaterfall.tsx
+++ b/static/app/views/performance/newTraceDetails/traceWaterfall.tsx
@@ -63,6 +63,7 @@ import {
   useTraceStateDispatch,
   useTraceStateEmitter,
 } from './traceState/traceStateProvider';
+import {usePerformanceSubscriptionDetails} from './traceTypeWarnings/usePerformanceSubscriptionDetails';
 import {Trace} from './trace';
 import TraceActionsMenu from './traceActionsMenu';
 import {traceAnalytics} from './traceAnalytics';
@@ -209,7 +210,7 @@ export function TraceWaterfall(props: TraceWaterfallProps) {
 
     if (props.tree.vitals.size > 0 && !hasTraceNewUi) {
       const types = Array.from(props.tree.vital_types.values());
-      const label = types.length > 1 ? t('Vitals') : capitalize(types[0]) + ' Vitals';
+      const label = types.length > 1 ? t('Vitals') : capitalize(types[0]!) + ' Vitals';
 
       newTabs.push({
         ...VITALS_TAB,
@@ -227,7 +228,7 @@ export function TraceWaterfall(props: TraceWaterfallProps) {
     traceDispatch({
       type: 'initialize tabs reducer',
       payload: {
-        current_tab: traceStateRef?.current?.tabs?.tabs?.[0],
+        current_tab: traceStateRef?.current?.tabs?.tabs?.[0] ?? null,
         tabs: newTabs,
         last_clicked_tab: null,
       },
@@ -284,8 +285,8 @@ export function TraceWaterfall(props: TraceWaterfallProps) {
           type: 'set results',
           results: matches,
           resultsLookup: lookup,
-          resultIteratorIndex: resultIteratorIndex,
-          resultIndex: resultIndex,
+          resultIteratorIndex,
+          resultIndex,
           previousNode: activeNodeSearchResult,
           node,
         });
@@ -321,9 +322,16 @@ export function TraceWaterfall(props: TraceWaterfallProps) {
     ) => {
       // sync query string with the clicked node
       if (node) {
+        // The new ui has the trace info and web vitals in the bottom drawer and
+        // we don't treat the trace node as a clickable node
+        if (isTraceNode(node) && hasTraceNewUi) {
+          return;
+        }
+
         if (queryStringAnimationTimeoutRef.current) {
           cancelAnimationTimeout(queryStringAnimationTimeoutRef.current);
         }
+
         queryStringAnimationTimeoutRef.current = requestAnimationTimeout(() => {
           const currentQueryStringPath = qs.parse(location.search).node;
           const nextNodePath = TraceTree.PathToNode(node);
@@ -363,7 +371,7 @@ export function TraceWaterfall(props: TraceWaterfallProps) {
         });
       }
     },
-    [traceDispatch]
+    [traceDispatch, hasTraceNewUi]
   );
 
   const onRowClick = useCallback(
@@ -372,6 +380,18 @@ export function TraceWaterfall(props: TraceWaterfallProps) {
       event: React.MouseEvent<HTMLElement>,
       index: number
     ) => {
+      // The new ui has the trace info and web vitals in the bottom drawer and
+      // we don't treat the trace node as a clickable node
+      if (isTraceNode(node) && hasTraceNewUi) {
+        traceDispatch({
+          type: 'set roving index',
+          action_source: 'click',
+          index,
+          node,
+        });
+        return;
+      }
+
       trackAnalytics('trace.trace_layout.span_row_click', {
         organization,
         num_children: node.children.length,
@@ -404,7 +424,7 @@ export function TraceWaterfall(props: TraceWaterfallProps) {
         node,
       });
     },
-    [setRowAsFocused, traceDispatch, organization, projects]
+    [setRowAsFocused, traceDispatch, organization, projects, hasTraceNewUi]
   );
 
   const scrollRowIntoView = useCallback(
@@ -453,7 +473,7 @@ export function TraceWaterfall(props: TraceWaterfallProps) {
         traceDispatch({
           type: 'set roving index',
           node: maybeNode,
-          index: index,
+          index,
           action_source: 'click',
         });
 
@@ -495,11 +515,23 @@ export function TraceWaterfall(props: TraceWaterfallProps) {
     [onScrollToNode, setRowAsFocused]
   );
 
+  const {
+    data: {hasExceededPerformanceUsageLimit},
+    isLoading: isLoadingSubscriptionDetails,
+  } = usePerformanceSubscriptionDetails();
+
   // 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);
+    if (!isLoadingSubscriptionDetails) {
+      traceAnalytics.trackTraceShape(
+        props.tree,
+        projectsRef.current,
+        props.organization,
+        hasExceededPerformanceUsageLimit
+      );
+    }
     // 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.
@@ -539,9 +571,10 @@ export function TraceWaterfall(props: TraceWaterfallProps) {
     if (node) {
       if (isAutogroupedNode(node) && type !== 'ag') {
         if (isParentAutogroupedNode(node)) {
-          node = TraceTree.FindByID(node.head, eventId ?? path) ?? node;
+          node = TraceTree.FindByID(node.head, eventId! ?? path!) ?? node;
         } else if (isSiblingAutogroupedNode(node)) {
-          node = node.children.find(n => TraceTree.FindByID(n, eventId ?? path)) ?? node;
+          node =
+            node.children.find(n => TraceTree.FindByID(n, eventId! ?? path!)) ?? node;
         }
       }
     }
@@ -584,8 +617,8 @@ export function TraceWaterfall(props: TraceWaterfallProps) {
       setRowAsFocused(node, null, traceStateRef.current.search.resultsLookup, index);
       traceDispatch({
         type: 'set roving index',
-        node: node,
-        index: index,
+        node,
+        index,
         action_source: 'load',
       });
     });
@@ -598,6 +631,8 @@ export function TraceWaterfall(props: TraceWaterfallProps) {
     scrollQueueRef,
     props.tree,
     props.organization,
+    isLoadingSubscriptionDetails,
+    hasExceededPerformanceUsageLimit,
   ]);
 
   // Setup the middleware for the trace reducer
@@ -643,7 +678,7 @@ export function TraceWaterfall(props: TraceWaterfallProps) {
         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];
+        const nextNode = props.tree.list[nextSearchResultIndex]!;
         setRowAsFocused(
           nextNode,
           null,
diff --git a/static/app/views/performance/newTraceDetails/useTraceQueryParamStateSync.tsx b/static/app/views/performance/newTraceDetails/useTraceQueryParamStateSync.tsx
index f7f02739b1d37f..593842cfb57bde 100644
--- a/static/app/views/performance/newTraceDetails/useTraceQueryParamStateSync.tsx
+++ b/static/app/views/performance/newTraceDetails/useTraceQueryParamStateSync.tsx
@@ -1,12 +1,13 @@
 import {useEffect, useRef} from 'react';
 import * as qs from 'query-string';
 
-import {browserHistory} from 'sentry/utils/browserHistory';
+import {useNavigate} from 'sentry/utils/useNavigate';
 
 // Syncs query params with URL state. Only performs a state sync if the query params have changed.
 export function useTraceQueryParamStateSync(query: Record<string, string | undefined>) {
   const previousQueryRef = useRef<Record<string, string | undefined>>(query);
   const syncStateTimeoutRef = useRef<number | null>(null);
+  const navigate = useNavigate();
 
   useEffect(() => {
     const keys = Object.keys(query);
@@ -28,13 +29,16 @@ export function useTraceQueryParamStateSync(query: Record<string, string | undef
 
     previousQueryRef.current = query;
     syncStateTimeoutRef.current = window.setTimeout(() => {
-      browserHistory.replace({
-        pathname: location.pathname,
-        query: {
-          ...qs.parse(location.search),
-          ...previousQueryRef.current,
+      navigate(
+        {
+          pathname: location.pathname,
+          query: {
+            ...qs.parse(location.search),
+            ...previousQueryRef.current,
+          },
         },
-      });
+        {replace: true}
+      );
     }, 1000);
-  }, [query]);
+  }, [navigate, query]);
 }
diff --git a/static/app/views/performance/table.spec.tsx b/static/app/views/performance/table.spec.tsx
index 4c19caff60a3c6..825877d38f23f4 100644
--- a/static/app/views/performance/table.spec.tsx
+++ b/static/app/views/performance/table.spec.tsx
@@ -5,7 +5,6 @@ import {initializeData as _initializeData} from 'sentry-test/performance/initial
 import {render, screen, userEvent, within} from 'sentry-test/reactTestingLibrary';
 
 import ProjectsStore from 'sentry/stores/projectsStore';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import EventView from 'sentry/utils/discover/eventView';
 import {MEPSettingProvider} from 'sentry/utils/performance/contexts/metricsEnhancedSetting';
 import {MutableSearch} from 'sentry/utils/tokenizeSearch';
@@ -32,7 +31,7 @@ const initializeData = (settings = {}, features: string[] = []) => {
   });
 };
 
-function WrappedComponent({data, ...rest}) {
+function WrappedComponent({data, ...rest}: any) {
   return (
     <OrganizationContext.Provider value={data.organization}>
       <MEPSettingProvider>
@@ -49,7 +48,7 @@ function WrappedComponent({data, ...rest}) {
   );
 }
 
-function mockEventView(data) {
+function mockEventView(data: ReturnType<typeof initializeData>) {
   const eventView = new EventView({
     id: '1',
     name: 'my query',
@@ -90,7 +89,7 @@ function mockEventView(data) {
     ],
     sorts: [{field: 'tpm  ', kind: 'desc'}],
     query: 'event.type:transaction transaction:/api*',
-    project: [data.projects[0].id, data.projects[1].id],
+    project: [Number(data.projects[0]!.id), Number(data.projects[1]!.id)],
     start: '2019-10-01T00:00:00',
     end: '2019-10-02T00:00:00',
     statsPeriod: '14d',
@@ -107,9 +106,8 @@ function mockEventView(data) {
 }
 
 describe('Performance > Table', function () {
-  let eventsMock;
+  let eventsMock: jest.Mock;
   beforeEach(function () {
-    browserHistory.push = jest.fn();
     mockUseLocation.mockReturnValue(
       LocationFixture({pathname: '/organizations/org-slug/performance/summary'})
     );
@@ -215,8 +213,8 @@ describe('Performance > Table', function () {
       );
 
       const rows = await screen.findAllByTestId('grid-body-row');
-      const transactionCells = within(rows[0]).getAllByTestId('grid-body-cell');
-      const transactionCell = transactionCells[1];
+      const transactionCells = within(rows[0]!).getAllByTestId('grid-body-cell');
+      const transactionCell = transactionCells[1]!;
       const link = within(transactionCell).getByRole('link', {name: '/apple/cart'});
       expect(link).toHaveAttribute(
         'href',
@@ -227,7 +225,7 @@ describe('Performance > Table', function () {
       expect(cellActionContainers).toHaveLength(27); // 9 cols x 3 rows
       const cellActionTriggers = screen.getAllByRole('button', {name: 'Actions'});
       expect(cellActionTriggers[8]).toBeInTheDocument();
-      await userEvent.click(cellActionTriggers[8]);
+      await userEvent.click(cellActionTriggers[8]!);
 
       expect(
         screen.getByRole('menuitemradio', {name: 'Show values greater than'})
@@ -238,15 +236,15 @@ describe('Performance > Table', function () {
 
       await userEvent.keyboard('{Escape}'); // Close actions menu
 
-      const transactionCellTrigger = cellActionTriggers[0]; // Transaction name
+      const transactionCellTrigger = cellActionTriggers[0]!; // Transaction name
       expect(transactionCellTrigger).toBeInTheDocument();
       await userEvent.click(transactionCellTrigger);
 
-      expect(browserHistory.push).toHaveBeenCalledTimes(0);
+      expect(data.router.push).toHaveBeenCalledTimes(0);
       await userEvent.click(screen.getByRole('menuitemradio', {name: 'Add to filter'}));
 
-      expect(browserHistory.push).toHaveBeenCalledTimes(1);
-      expect(browserHistory.push).toHaveBeenNthCalledWith(1, {
+      expect(data.router.push).toHaveBeenCalledTimes(1);
+      expect(data.router.push).toHaveBeenNthCalledWith(1, {
         pathname: undefined,
         query: expect.objectContaining({
           query: 'transaction:/apple/cart',
diff --git a/static/app/views/performance/table.tsx b/static/app/views/performance/table.tsx
index 15fed2e06b431b..3cde9231804882 100644
--- a/static/app/views/performance/table.tsx
+++ b/static/app/views/performance/table.tsx
@@ -1,4 +1,4 @@
-import {Component, useEffect} from 'react';
+import {Component, type ReactNode, useEffect} from 'react';
 import styled from '@emotion/styled';
 import type {Location, LocationDescriptorObject} from 'history';
 
@@ -11,9 +11,11 @@ import SortLink from 'sentry/components/gridEditable/sortLink';
 import Link from 'sentry/components/links/link';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
 import Pagination from 'sentry/components/pagination';
+import QuestionTooltip from 'sentry/components/questionTooltip';
 import {Tooltip} from 'sentry/components/tooltip';
 import {IconStar} 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 {trackAnalytics} from 'sentry/utils/analytics';
@@ -55,6 +57,15 @@ import {
   UNPARAMETERIZED_TRANSACTION,
 } from './utils';
 
+type ColumnTitle = {
+  title: string | ReactNode;
+  tooltip?: string | ReactNode;
+};
+
+const COLUMN_TITLES_OPTIONAL_TOOLTIP = COLUMN_TITLES.map(title => {
+  return {title};
+});
+
 type Props = {
   eventView: EventView;
   location: Location;
@@ -62,7 +73,7 @@ type Props = {
   projects: Project[];
   setError: (msg: string | undefined) => void;
   withStaticFilters: boolean;
-  columnTitles?: string[];
+  columnTitles?: ColumnTitle[];
   domainViewFilters?: DomainViewFilters;
   summaryConditions?: string;
 };
@@ -87,7 +98,7 @@ function getProjectFirstEventGroup(project: Project): '14d' | '30d' | '>30d' {
   return '>30d';
 }
 
-function _TrackHasDataAnalytics({
+function TrackHasDataAnalytics({
   children,
   isLoading,
   tableData,
@@ -180,7 +191,7 @@ class _Table extends Component<Props, State> {
       });
 
       if (action === Actions.EDIT_THRESHOLD) {
-        const project_threshold = dataRow.project_threshold_config;
+        const project_threshold = dataRow.project_threshold_config!;
         const transactionName = dataRow.transaction as string;
         const projectID = getProjectID(dataRow, projects);
 
@@ -402,7 +413,7 @@ class _Table extends Component<Props, State> {
   renderHeadCell(
     tableMeta: TableData['meta'],
     column: TableColumn<keyof TableDataRow>,
-    title: React.ReactNode
+    title: ColumnTitle
   ): React.ReactNode {
     const {eventView, location} = this.props;
 
@@ -437,7 +448,7 @@ class _Table extends Component<Props, State> {
     const sortLink = (
       <SortLink
         align={align}
-        title={title || field.field}
+        title={title.title || field.field}
         direction={currentSortKind}
         canSort={canSort}
         generateSortLink={generateSortLink}
@@ -451,13 +462,22 @@ class _Table extends Component<Props, State> {
         </GuideAnchor>
       );
     }
-    return sortLink;
+
+    if (!title.tooltip) {
+      return sortLink;
+    }
+    return (
+      <Header>
+        {sortLink}
+        <QuestionTooltip size="xs" position="top" title={title.tooltip} isHoverable />
+      </Header>
+    );
   }
 
   renderHeadCellWithMeta = (tableMeta: TableData['meta']) => {
-    const columnTitles = this.props.columnTitles ?? COLUMN_TITLES;
+    const columnTitles = this.props.columnTitles ?? COLUMN_TITLES_OPTIONAL_TOOLTIP;
     return (column: TableColumn<keyof TableDataRow>, index: number): React.ReactNode =>
-      this.renderHeadCell(tableMeta, column, columnTitles[index]);
+      this.renderHeadCell(tableMeta, column, columnTitles[index]!);
   };
 
   renderPrependCellWithData = (tableData: TableData | null) => {
@@ -479,7 +499,9 @@ class _Table extends Component<Props, State> {
               />
             </TeamKeyTransactionWrapper>
           );
-          return [this.renderHeadCell(tableData?.meta, teamKeyTransactionColumn, star)];
+          return [
+            this.renderHeadCell(tableData?.meta, teamKeyTransactionColumn, {title: star}),
+          ];
         }
         return [this.renderBodyCell(tableData, teamKeyTransactionColumn, dataRow)];
       }
@@ -557,7 +579,7 @@ class _Table extends Component<Props, State> {
                   queryExtras={getMEPQueryParams(value)}
                 >
                   {({pageLinks, isLoading, tableData}) => (
-                    <_TrackHasDataAnalytics isLoading={isLoading} tableData={tableData}>
+                    <TrackHasDataAnalytics isLoading={isLoading} tableData={tableData}>
                       <VisuallyCompleteWithData
                         id="PerformanceTable"
                         hasData={
@@ -588,7 +610,7 @@ class _Table extends Component<Props, State> {
                         pageLinks={pageLinks}
                         paginationAnalyticsEvent={this.paginationAnalyticsEvent}
                       />
-                    </_TrackHasDataAnalytics>
+                    </TrackHasDataAnalytics>
                   )}
                 </DiscoverQuery>
               );
@@ -627,4 +649,12 @@ const UnparameterizedTooltipWrapper = styled('div')`
   justify-content: center;
 `;
 
+const Header = styled('div')`
+  display: grid;
+  grid-template-columns: repeat(2, max-content);
+  align-items: center;
+  padding: ${space(1.5)};
+  grid-column-gap: ${space(0.5)};
+`;
+
 export default Table;
diff --git a/static/app/views/performance/traceDetails/TraceDetailsRouting.tsx b/static/app/views/performance/traceDetails/TraceDetailsRouting.tsx
index 384c04d3e8c729..ae920137ec82d2 100644
--- a/static/app/views/performance/traceDetails/TraceDetailsRouting.tsx
+++ b/static/app/views/performance/traceDetails/TraceDetailsRouting.tsx
@@ -48,7 +48,7 @@ function TraceDetailsRouting(props: Props) {
       if (location.hash.includes('span')) {
         const spanHashValue = location.hash
           .split('#')
-          .filter(value => value.includes('span'))[0];
+          .filter(value => value.includes('span'))[0]!;
         const spanId = spanHashValue.split('-')[1];
 
         if (spanId) {
diff --git a/static/app/views/performance/traceDetails/content.spec.tsx b/static/app/views/performance/traceDetails/content.spec.tsx
index 04f2c39e203775..d3f8bcb4ff3913 100644
--- a/static/app/views/performance/traceDetails/content.spec.tsx
+++ b/static/app/views/performance/traceDetails/content.spec.tsx
@@ -64,17 +64,17 @@ describe('TraceDetailsContent', () => {
 
       const errorList = await screen.findByTestId('trace-view-errors');
       expect(
-        await within(errorList).findByText(SAMPLE_ERROR_DATA.data[0].title)
+        await within(errorList).findByText(SAMPLE_ERROR_DATA.data[0]!.title)
       ).toBeInTheDocument();
       expect(
-        await within(errorList).findByText(SAMPLE_ERROR_DATA.data[1].title)
+        await within(errorList).findByText(SAMPLE_ERROR_DATA.data[1]!.title)
       ).toBeInTheDocument();
 
       expect(
-        await within(errorList).findByText(SAMPLE_ERROR_DATA.data[0].level)
+        await within(errorList).findByText(SAMPLE_ERROR_DATA.data[0]!.level)
       ).toBeInTheDocument();
       expect(
-        await within(errorList).findByText(SAMPLE_ERROR_DATA.data[1].level)
+        await within(errorList).findByText(SAMPLE_ERROR_DATA.data[1]!.level)
       ).toBeInTheDocument();
     });
 
diff --git a/static/app/views/performance/traceDetails/newTraceDetailsTraceView.tsx b/static/app/views/performance/traceDetails/newTraceDetailsTraceView.tsx
index 90d1df097650fd..4430303a5c58e9 100644
--- a/static/app/views/performance/traceDetails/newTraceDetailsTraceView.tsx
+++ b/static/app/views/performance/traceDetails/newTraceDetailsTraceView.tsx
@@ -1,4 +1,4 @@
-import {createRef, Fragment, memo, useEffect, useState} from 'react';
+import {Fragment, memo, useEffect, useRef, useState} from 'react';
 import styled from '@emotion/styled';
 import * as Sentry from '@sentry/react';
 
@@ -253,7 +253,7 @@ function NewTraceView({
             }}
             measurements={
               traces && traces.length > 0
-                ? getMeasurements(traces[0], generateBounds(traceInfo))
+                ? getMeasurements(traces[0]!, generateBounds(traceInfo))
                 : undefined
             }
             generateBounds={generateBounds(traceInfo)}
@@ -273,8 +273,8 @@ function NewTraceView({
     };
   }
 
-  const traceViewRef = createRef<HTMLDivElement>();
-  const virtualScrollbarContainerRef = createRef<HTMLDivElement>();
+  const traceViewRef = useRef<HTMLDivElement>(null);
+  const virtualScrollbarContainerRef = useRef<HTMLDivElement>(null);
 
   if (!hasTraceData(traces, orphanErrors)) {
     return (
@@ -308,7 +308,7 @@ function NewTraceView({
       const isLastTransaction = index === traces.length - 1;
       const hasChildren = trace.children.length > 0;
       const isNextChildOrphaned =
-        !isLastTransaction && traces[index + 1].parent_span_id !== null;
+        !isLastTransaction && traces[index + 1]!.parent_span_id !== null;
 
       const result = renderTransaction(trace, {
         ...acc,
@@ -371,7 +371,7 @@ function NewTraceView({
             generateBounds={generateBounds(traceInfo)}
             measurements={
               traces && traces.length > 0
-                ? getMeasurements(traces[0], generateBounds(traceInfo))
+                ? getMeasurements(traces[0]!, generateBounds(traceInfo))
                 : undefined
             }
             continuingDepths={[]}
@@ -389,8 +389,8 @@ function NewTraceView({
 
   const bounds = generateBounds(traceInfo);
   const measurements =
-    traces.length > 0 && Object.keys(traces[0].measurements ?? {}).length > 0
-      ? getMeasurements(traces[0], bounds)
+    traces.length > 0 && Object.keys(traces[0]!.measurements ?? {}).length > 0
+      ? getMeasurements(traces[0]!, bounds)
       : undefined;
 
   const traceView = (
diff --git a/static/app/views/performance/traceDetails/newTraceDetailsTransactionBar.tsx b/static/app/views/performance/traceDetails/newTraceDetailsTransactionBar.tsx
index 8dc9a4e3507053..3c9bc79aa66caa 100644
--- a/static/app/views/performance/traceDetails/newTraceDetailsTransactionBar.tsx
+++ b/static/app/views/performance/traceDetails/newTraceDetailsTransactionBar.tsx
@@ -1,4 +1,4 @@
-import {createRef, Fragment, useCallback, useEffect, useMemo, useState} from 'react';
+import {Fragment, useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import styled from '@emotion/styled';
 import type {Location} from 'history';
 import {Observer} from 'mobx-react';
@@ -37,7 +37,6 @@ import {
   DividerLine,
   DividerLineGhostContainer,
   ErrorBadge,
-  MetricsBadge,
 } from 'sentry/components/performance/waterfall/rowDivider';
 import {
   RowTitle,
@@ -64,7 +63,6 @@ import {space} from 'sentry/styles/space';
 import type {EventTransaction} from 'sentry/types/event';
 import type {Organization} from 'sentry/types/organization';
 import {defined} from 'sentry/utils';
-import {hasMetricsExperimentalFeature} from 'sentry/utils/metrics/features';
 import toPercent from 'sentry/utils/number/toPercent';
 import QuickTraceQuery from 'sentry/utils/performance/quickTrace/quickTraceQuery';
 import type {
@@ -133,8 +131,8 @@ function NewTraceDetailsTransactionBar(props: Props) {
     isHighlighted || highlightEmbeddedSpan
   );
   const [isIntersecting, setIntersecting] = useState(false);
-  const transactionRowDOMRef = createRef<HTMLDivElement>();
-  const transactionTitleRef = createRef<HTMLDivElement>();
+  const transactionRowDOMRef = useRef<HTMLDivElement>(null);
+  const transactionTitleRef = useRef<HTMLDivElement>(null);
   let spanContentRef: HTMLDivElement | null = null;
   const navigate = useNavigate();
 
@@ -173,7 +171,7 @@ function NewTraceDetailsTransactionBar(props: Props) {
   useEffect(() => {
     const {transaction, isBarScrolledTo} = props;
     const observer = new IntersectionObserver(([entry]) =>
-      setIntersecting(entry.isIntersecting)
+      setIntersecting(entry!.isIntersecting)
     );
 
     if (transactionRowDOMRef.current) {
@@ -326,7 +324,7 @@ function NewTraceDetailsTransactionBar(props: Props) {
     return (
       <Fragment>
         {Array.from(measurements.values()).map(verticalMark => {
-          const mark = Object.values(verticalMark.marks)[0];
+          const mark = Object.values(verticalMark.marks)[0]!;
           const {timestamp} = mark;
           const bounds = getMeasurementBounds(timestamp, generateBounds);
 
@@ -767,22 +765,6 @@ function NewTraceDetailsTransactionBar(props: Props) {
     return <ErrorBadge />;
   };
 
-  const renderMetricsBadge = () => {
-    const {organization} = props;
-    const hasMetrics = Object.keys(embeddedChildren?._metrics_summary ?? {}).length > 0;
-
-    if (
-      !hasMetricsExperimentalFeature(organization) ||
-      isTraceRoot(transaction) ||
-      isTraceError(transaction) ||
-      !hasMetrics
-    ) {
-      return null;
-    }
-
-    return <MetricsBadge />;
-  };
-
   const renderRectangle = () => {
     const {transaction, traceInfo, barColor} = props;
 
@@ -814,7 +796,6 @@ function NewTraceDetailsTransactionBar(props: Props) {
           <ErrorBadge />
         ) : (
           <Fragment>
-            {renderMetricsBadge()}
             {renderErrorBadge()}
             <DurationPill
               durationDisplay={getDurationDisplay({
@@ -841,7 +822,7 @@ function NewTraceDetailsTransactionBar(props: Props) {
     // Use 1 as the difference in the case that startTimestamp === endTimestamp
     const delta = Math.abs(transaction.timestamp - transaction.start_timestamp) || 1;
     for (let i = 0; i < transaction.performance_issues.length; i++) {
-      const issue = transaction.performance_issues[i];
+      const issue = transaction.performance_issues[i]!;
       const startPosition = Math.abs(issue.start - transaction.start_timestamp);
       const startPercentage = startPosition / delta;
       const duration = Math.abs(issue.end - issue.start);
diff --git a/static/app/views/performance/traceDetails/traceView.tsx b/static/app/views/performance/traceDetails/traceView.tsx
index 986b5ffd4a1693..f5e2f2710f4a2a 100644
--- a/static/app/views/performance/traceDetails/traceView.tsx
+++ b/static/app/views/performance/traceDetails/traceView.tsx
@@ -1,4 +1,4 @@
-import {createRef, Fragment, useEffect} from 'react';
+import {Fragment, useEffect, useRef} from 'react';
 import styled from '@emotion/styled';
 import * as Sentry from '@sentry/react';
 
@@ -236,7 +236,7 @@ export default function TraceView({
             }}
             measurements={
               traces && traces.length > 0
-                ? getMeasurements(traces[0], generateBounds(traceInfo))
+                ? getMeasurements(traces[0]!, generateBounds(traceInfo))
                 : undefined
             }
             generateBounds={generateBounds(traceInfo)}
@@ -256,8 +256,8 @@ export default function TraceView({
     };
   }
 
-  const traceViewRef = createRef<HTMLDivElement>();
-  const virtualScrollbarContainerRef = createRef<HTMLDivElement>();
+  const traceViewRef = useRef<HTMLDivElement>(null);
+  const virtualScrollbarContainerRef = useRef<HTMLDivElement>(null);
 
   if (!hasTraceData(traces, orphanErrors)) {
     return (
@@ -291,7 +291,7 @@ export default function TraceView({
       const isLastTransaction = index === traces.length - 1;
       const hasChildren = trace.children.length > 0;
       const isNextChildOrphaned =
-        !isLastTransaction && traces[index + 1].parent_span_id !== null;
+        !isLastTransaction && traces[index + 1]!.parent_span_id !== null;
 
       const result = renderTransaction(trace, {
         ...acc,
@@ -351,7 +351,7 @@ export default function TraceView({
             generateBounds={generateBounds(traceInfo)}
             measurements={
               traces && traces.length > 0
-                ? getMeasurements(traces[0], generateBounds(traceInfo))
+                ? getMeasurements(traces[0]!, generateBounds(traceInfo))
                 : undefined
             }
             continuingDepths={[]}
@@ -369,8 +369,8 @@ export default function TraceView({
 
   const bounds = generateBounds(traceInfo);
   const measurements =
-    traces.length > 0 && Object.keys(traces[0].measurements ?? {}).length > 0
-      ? getMeasurements(traces[0], bounds)
+    traces.length > 0 && Object.keys(traces[0]!.measurements ?? {}).length > 0
+      ? getMeasurements(traces[0]!, bounds)
       : undefined;
 
   const traceView = (
diff --git a/static/app/views/performance/traceDetails/traceViewDetailPanel.tsx b/static/app/views/performance/traceDetails/traceViewDetailPanel.tsx
index 8fd4057a0581fe..5e241f9dfeba7c 100644
--- a/static/app/views/performance/traceDetails/traceViewDetailPanel.tsx
+++ b/static/app/views/performance/traceDetails/traceViewDetailPanel.tsx
@@ -1,4 +1,4 @@
-import {createRef, Fragment, useEffect, useState} from 'react';
+import {Fragment, useEffect, useRef, useState} from 'react';
 import styled from '@emotion/styled';
 import type {Location} from 'history';
 import omit from 'lodash/omit';
@@ -35,7 +35,6 @@ import FileSize from 'sentry/components/fileSize';
 import ProjectBadge from 'sentry/components/idBadge/projectBadge';
 import Link from 'sentry/components/links/link';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
-import {CustomMetricsEventData} from 'sentry/components/metrics/customMetricsEventData';
 import {
   ErrorDot,
   ErrorLevel,
@@ -136,7 +135,7 @@ function BreadCrumbsSection({
   organization: Organization;
 }) {
   const [showBreadCrumbs, setShowBreadCrumbs] = useState(false);
-  const breadCrumbsContainerRef = createRef<HTMLDivElement>();
+  const breadCrumbsContainerRef = useRef<HTMLDivElement>(null);
 
   useEffect(() => {
     setTimeout(() => {
@@ -236,7 +235,7 @@ function EventDetails({detail, organization, location}: EventDetailProps) {
             title={WEB_VITAL_DETAILS[`measurements.${measurement}`]?.name}
           >
             <PerformanceDuration
-              milliseconds={Number(measurements[measurement].value.toFixed(3))}
+              milliseconds={Number(measurements[measurement]!.value.toFixed(3))}
               abbreviation
             />
           </Row>
@@ -443,13 +442,6 @@ function EventDetails({detail, organization, location}: EventDetailProps) {
       )}
       <EventExtraData event={detail.event} />
       <EventSdk sdk={detail.event.sdk} meta={detail.event._meta?.sdk} />
-      {detail.event._metrics_summary ? (
-        <CustomMetricsEventData
-          projectId={detail.event.projectID}
-          metricsSummary={detail.event._metrics_summary}
-          startTimestamp={detail.event.startTimestamp}
-        />
-      ) : null}
       <BreadCrumbsSection event={detail.event} organization={organization} />
       {project && (
         <EventAttachments event={detail.event} project={project} group={undefined} />
diff --git a/static/app/views/performance/traceDetails/transactionBar.tsx b/static/app/views/performance/traceDetails/transactionBar.tsx
index 362bc26b851eb5..b510eed889dba6 100644
--- a/static/app/views/performance/traceDetails/transactionBar.tsx
+++ b/static/app/views/performance/traceDetails/transactionBar.tsx
@@ -1,4 +1,4 @@
-import {createRef, Fragment, useCallback, useEffect, useState} from 'react';
+import {Fragment, useCallback, useEffect, useRef, useState} from 'react';
 import styled from '@emotion/styled';
 import type {Location} from 'history';
 
@@ -99,8 +99,8 @@ type Props = {
 
 function TransactionBar(props: Props) {
   const [showDetail, setShowDetail] = useState(false);
-  const transactionRowDOMRef = createRef<HTMLDivElement>();
-  const transactionTitleRef = createRef<HTMLDivElement>();
+  const transactionRowDOMRef = useRef<HTMLDivElement>(null);
+  const transactionTitleRef = useRef<HTMLDivElement>(null);
   let spanContentRef: HTMLDivElement | null = null;
 
   const handleWheel = useCallback(
@@ -187,7 +187,7 @@ function TransactionBar(props: Props) {
     return (
       <Fragment>
         {Array.from(measurements.values()).map(verticalMark => {
-          const mark = Object.values(verticalMark.marks)[0];
+          const mark = Object.values(verticalMark.marks)[0]!;
           const {timestamp} = mark;
           const bounds = getMeasurementBounds(timestamp, generateBounds);
 
@@ -545,7 +545,7 @@ function TransactionBar(props: Props) {
     // Use 1 as the difference in the case that startTimestamp === endTimestamp
     const delta = Math.abs(transaction.timestamp - transaction.start_timestamp) || 1;
     for (let i = 0; i < transaction.performance_issues.length; i++) {
-      const issue = transaction.performance_issues[i];
+      const issue = transaction.performance_issues[i]!;
       const startPosition = Math.abs(issue.start - transaction.start_timestamp);
       const startPercentage = startPosition / delta;
       const duration = Math.abs(issue.end - issue.start);
diff --git a/static/app/views/performance/traceDetails/transactionDetail.tsx b/static/app/views/performance/traceDetails/transactionDetail.tsx
index 6b1858e04284a7..d031d7b9dfe664 100644
--- a/static/app/views/performance/traceDetails/transactionDetail.tsx
+++ b/static/app/views/performance/traceDetails/transactionDetail.tsx
@@ -172,7 +172,7 @@ class TransactionDetail extends Component<Props> {
             key={measurement}
             title={WEB_VITAL_DETAILS[`measurements.${measurement}`]?.name}
           >
-            {`${Number(measurements[measurement].value.toFixed(3)).toLocaleString()}ms`}
+            {`${Number(measurements[measurement]!.value.toFixed(3)).toLocaleString()}ms`}
           </Row>
         ))}
       </Fragment>
diff --git a/static/app/views/performance/traceDetails/utils.tsx b/static/app/views/performance/traceDetails/utils.tsx
index 0409a0df38614e..173c550b8e9858 100644
--- a/static/app/views/performance/traceDetails/utils.tsx
+++ b/static/app/views/performance/traceDetails/utils.tsx
@@ -200,7 +200,7 @@ export function getTraceInfo(
 }
 
 export function shortenErrorTitle(title: string): string {
-  return title.split(':')[0];
+  return title.split(':')[0]!;
 }
 
 export function isRootTransaction(trace: TraceFullDetailed): boolean {
diff --git a/static/app/views/performance/transactionDetails/content.tsx b/static/app/views/performance/transactionDetails/content.tsx
index 40c56c9d7e038e..fab14ec5ca642e 100644
--- a/static/app/views/performance/transactionDetails/content.tsx
+++ b/static/app/views/performance/transactionDetails/content.tsx
@@ -63,7 +63,7 @@ type Props = Pick<RouteComponentProps<{eventSlug: string}, {}>, 'params' | 'loca
 
 function EventDetailsContent(props: Props) {
   const [isSidebarVisible, setIsSidebarVisible] = useState<boolean>(true);
-  const projectId = props.eventSlug.split(':')[0];
+  const projectId = props.eventSlug.split(':')[0]!;
   const {organization, eventSlug, location} = props;
 
   const {
diff --git a/static/app/views/performance/transactionSummary/teamKeyTransactionButton.spec.tsx b/static/app/views/performance/transactionSummary/teamKeyTransactionButton.spec.tsx
index dfb926bb86b33e..e97b24ffab7cb4 100644
--- a/static/app/views/performance/transactionSummary/teamKeyTransactionButton.spec.tsx
+++ b/static/app/views/performance/transactionSummary/teamKeyTransactionButton.spec.tsx
@@ -95,11 +95,11 @@ describe('TeamKeyTransactionButton', function () {
     await clickTeamKeyTransactionDropdown();
 
     // all teams should be checked
-    expect(screen.getByRole('option', {name: `#${teams[0].slug}`})).toHaveAttribute(
+    expect(screen.getByRole('option', {name: `#${teams[0]!.slug}`})).toHaveAttribute(
       'aria-selected',
       'true'
     );
-    expect(screen.getByRole('option', {name: `#${teams[1].slug}`})).toHaveAttribute(
+    expect(screen.getByRole('option', {name: `#${teams[1]!.slug}`})).toHaveAttribute(
       'aria-selected',
       'true'
     );
@@ -111,9 +111,9 @@ describe('TeamKeyTransactionButton', function () {
       url: '/organizations/org-slug/key-transactions-list/',
       body: teams.map(({id}) => ({
         team: id,
-        count: id === teams[0].id ? 1 : 0,
+        count: id === teams[0]!.id ? 1 : 0,
         keyed:
-          id === teams[0].id
+          id === teams[0]!.id
             ? [{project_id: String(project.id), transaction: 'transaction'}]
             : [],
       })),
@@ -130,11 +130,11 @@ describe('TeamKeyTransactionButton', function () {
     await clickTeamKeyTransactionDropdown();
 
     // only team 1 should be checked
-    expect(screen.getByRole('option', {name: `#${teams[0].slug}`})).toHaveAttribute(
+    expect(screen.getByRole('option', {name: `#${teams[0]!.slug}`})).toHaveAttribute(
       'aria-selected',
       'true'
     );
-    expect(screen.getByRole('option', {name: `#${teams[1].slug}`})).toHaveAttribute(
+    expect(screen.getByRole('option', {name: `#${teams[1]!.slug}`})).toHaveAttribute(
       'aria-selected',
       'false'
     );
@@ -162,11 +162,11 @@ describe('TeamKeyTransactionButton', function () {
     await clickTeamKeyTransactionDropdown();
 
     // all teams should be unchecked
-    expect(screen.getByRole('option', {name: `#${teams[0].slug}`})).toHaveAttribute(
+    expect(screen.getByRole('option', {name: `#${teams[0]!.slug}`})).toHaveAttribute(
       'aria-selected',
       'false'
     );
-    expect(screen.getByRole('option', {name: `#${teams[1].slug}`})).toHaveAttribute(
+    expect(screen.getByRole('option', {name: `#${teams[1]!.slug}`})).toHaveAttribute(
       'aria-selected',
       'false'
     );
@@ -189,7 +189,7 @@ describe('TeamKeyTransactionButton', function () {
       body: [],
       match: [
         MockApiClient.matchQuery({project: [project.id]}),
-        MockApiClient.matchData({team: [teams[0].id], transaction: 'transaction'}),
+        MockApiClient.matchData({team: [teams[0]!.id], transaction: 'transaction'}),
       ],
     });
 
@@ -203,7 +203,7 @@ describe('TeamKeyTransactionButton', function () {
 
     await clickTeamKeyTransactionDropdown();
 
-    await userEvent.click(screen.getByRole('option', {name: `#${teams[0].slug}`}));
+    await userEvent.click(screen.getByRole('option', {name: `#${teams[0]!.slug}`}));
     expect(postTeamKeyTransactionsMock).toHaveBeenCalledTimes(1);
   });
 
@@ -224,7 +224,7 @@ describe('TeamKeyTransactionButton', function () {
       body: [],
       match: [
         MockApiClient.matchQuery({project: [project.id]}),
-        MockApiClient.matchData({team: [teams[0].id], transaction: 'transaction'}),
+        MockApiClient.matchData({team: [teams[0]!.id], transaction: 'transaction'}),
       ],
     });
 
@@ -238,7 +238,7 @@ describe('TeamKeyTransactionButton', function () {
 
     await clickTeamKeyTransactionDropdown();
 
-    await userEvent.click(screen.getByRole('option', {name: `#${teams[0].slug}`}));
+    await userEvent.click(screen.getByRole('option', {name: `#${teams[0]!.slug}`}));
     expect(deleteTeamKeyTransactionsMock).toHaveBeenCalledTimes(1);
   });
 
@@ -260,7 +260,7 @@ describe('TeamKeyTransactionButton', function () {
       match: [
         MockApiClient.matchQuery({project: [project.id]}),
         MockApiClient.matchData({
-          team: [teams[0].id, teams[1].id],
+          team: [teams[0]!.id, teams[1]!.id],
           transaction: 'transaction',
         }),
       ],
@@ -279,11 +279,11 @@ describe('TeamKeyTransactionButton', function () {
     await userEvent.click(screen.getByRole('button', {name: 'Select All in My Teams'}));
 
     // all teams should be checked now
-    expect(screen.getByRole('option', {name: `#${teams[0].slug}`})).toHaveAttribute(
+    expect(screen.getByRole('option', {name: `#${teams[0]!.slug}`})).toHaveAttribute(
       'aria-selected',
       'true'
     );
-    expect(screen.getByRole('option', {name: `#${teams[1].slug}`})).toHaveAttribute(
+    expect(screen.getByRole('option', {name: `#${teams[1]!.slug}`})).toHaveAttribute(
       'aria-selected',
       'true'
     );
@@ -309,7 +309,7 @@ describe('TeamKeyTransactionButton', function () {
       match: [
         MockApiClient.matchQuery({project: [project.id]}),
         MockApiClient.matchData({
-          team: [teams[0].id, teams[1].id],
+          team: [teams[0]!.id, teams[1]!.id],
           transaction: 'transaction',
         }),
       ],
@@ -328,11 +328,11 @@ describe('TeamKeyTransactionButton', function () {
     await userEvent.click(screen.getByRole('button', {name: 'Unselect All in My Teams'}));
 
     // all teams should be checked now
-    expect(screen.getByRole('option', {name: `#${teams[0].slug}`})).toHaveAttribute(
+    expect(screen.getByRole('option', {name: `#${teams[0]!.slug}`})).toHaveAttribute(
       'aria-selected',
       'false'
     );
-    expect(screen.getByRole('option', {name: `#${teams[1].slug}`})).toHaveAttribute(
+    expect(screen.getByRole('option', {name: `#${teams[1]!.slug}`})).toHaveAttribute(
       'aria-selected',
       'false'
     );
@@ -364,12 +364,12 @@ describe('TeamKeyTransactionButton', function () {
 
     await clickTeamKeyTransactionDropdown();
 
-    expect(screen.getByRole('option', {name: `#${teams[0].slug}`})).toHaveAttribute(
+    expect(screen.getByRole('option', {name: `#${teams[0]!.slug}`})).toHaveAttribute(
       'aria-disabled',
       'true'
     );
 
-    expect(screen.getByRole('option', {name: `#${teams[1].slug}`})).toHaveAttribute(
+    expect(screen.getByRole('option', {name: `#${teams[1]!.slug}`})).toHaveAttribute(
       'aria-disabled',
       'true'
     );
@@ -402,12 +402,12 @@ describe('TeamKeyTransactionButton', function () {
 
     await clickTeamKeyTransactionDropdown();
 
-    expect(screen.getByRole('option', {name: `#${teams[0].slug}`})).toHaveAttribute(
+    expect(screen.getByRole('option', {name: `#${teams[0]!.slug}`})).toHaveAttribute(
       'aria-selected',
       'true'
     );
 
-    expect(screen.getByRole('option', {name: `#${teams[1].slug}`})).toHaveAttribute(
+    expect(screen.getByRole('option', {name: `#${teams[1]!.slug}`})).toHaveAttribute(
       'aria-selected',
       'true'
     );
diff --git a/static/app/views/performance/transactionSummary/transactionEvents/content.tsx b/static/app/views/performance/transactionSummary/transactionEvents/content.tsx
index f3d4c85878404e..a34a26f3e535f7 100644
--- a/static/app/views/performance/transactionSummary/transactionEvents/content.tsx
+++ b/static/app/views/performance/transactionSummary/transactionEvents/content.tsx
@@ -16,12 +16,12 @@ 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 {browserHistory} from 'sentry/utils/browserHistory';
 import type EventView from 'sentry/utils/discover/eventView';
 import {SavedQueryDatasets} from 'sentry/utils/discover/types';
 import type {WebVital} from 'sentry/utils/fields';
 import {decodeScalar} from 'sentry/utils/queryString';
 import projectSupportsReplay from 'sentry/utils/replays/projectSupportsReplay';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import {useRoutes} from 'sentry/utils/useRoutes';
 import {hasDatasetSelector} from 'sentry/views/dashboards/utils';
 import {useDomainViewFilters} from 'sentry/views/insights/pages/useFilters';
@@ -185,6 +185,8 @@ function Search(props: Props) {
     percentileValues,
   } = props;
 
+  const navigate = useNavigate();
+
   const handleSearch = (query: string) => {
     const queryParams = normalizeDateTimeParams({
       ...(location.query || {}),
@@ -194,7 +196,7 @@ function Search(props: Props) {
     // do not propagate pagination when making a new search
     const searchQueryParams = omit(queryParams, 'cursor');
 
-    browserHistory.push({
+    navigate({
       pathname: location.pathname,
       query: searchQueryParams,
     });
diff --git a/static/app/views/performance/transactionSummary/transactionEvents/eventsTable.spec.tsx b/static/app/views/performance/transactionSummary/transactionEvents/eventsTable.spec.tsx
index b1d09b7aec677b..446d6369e8a616 100644
--- a/static/app/views/performance/transactionSummary/transactionEvents/eventsTable.spec.tsx
+++ b/static/app/views/performance/transactionSummary/transactionEvents/eventsTable.spec.tsx
@@ -50,7 +50,7 @@ describe('Performance GridEditable Table', function () {
   let fields = EVENTS_TABLE_RESPONSE_FIELDS;
   const organization = OrganizationFixture();
   const transactionName = 'transactionName';
-  let data;
+  let data: typeof MOCK_EVENTS_TABLE_DATA;
 
   const query =
     'transaction.duration:<15m event.type:transaction transaction:/api/0/organizations/{organization_slug}/events/';
@@ -179,14 +179,6 @@ describe('Performance GridEditable Table', function () {
       'spans.http',
     ];
 
-    data.forEach(result => {
-      delete result['span_ops_breakdown.relative'];
-      delete result['spans.resource'];
-      delete result['spans.browser'];
-      delete result['spans.db'];
-      delete result['spans.total.time'];
-    });
-
     const eventView = EventView.fromNewQueryWithLocation(
       {
         id: undefined,
@@ -267,9 +259,6 @@ describe('Performance GridEditable Table', function () {
     const initialData = initializeData();
 
     fields = [...fields, 'replayId'];
-    data.forEach(result => {
-      result.replayId = 'mock_replay_id';
-    });
 
     const eventView = EventView.fromNewQueryWithLocation(
       {
@@ -305,9 +294,6 @@ describe('Performance GridEditable Table', function () {
     const initialData = initializeData();
 
     fields = [...fields, 'profile.id'];
-    data.forEach(result => {
-      result['profile.id'] = 'mock_profile_id';
-    });
 
     const eventView = EventView.fromNewQueryWithLocation(
       {
diff --git a/static/app/views/performance/transactionSummary/transactionEvents/eventsTable.tsx b/static/app/views/performance/transactionSummary/transactionEvents/eventsTable.tsx
index 414a8d3307357b..5162bfbd903166 100644
--- a/static/app/views/performance/transactionSummary/transactionEvents/eventsTable.tsx
+++ b/static/app/views/performance/transactionSummary/transactionEvents/eventsTable.tsx
@@ -200,13 +200,13 @@ class EventsTable extends Component<Props, State> {
       } else {
         if (field === 'id') {
           target = generateLinkToEventInTraceView({
-            traceSlug: dataRow.trace?.toString(),
-            projectSlug: dataRow['project.name']?.toString(),
+            traceSlug: dataRow.trace?.toString()!,
+            projectSlug: dataRow['project.name']?.toString()!,
             eventId: dataRow.id,
-            timestamp: dataRow.timestamp,
+            timestamp: dataRow.timestamp!,
             location: locationWithTab,
             organization,
-            transactionName: transactionName,
+            transactionName,
             source: TraceViewSources.PERFORMANCE_TRANSACTION_SUMMARY,
             view: this.props.domainViewFilters?.view,
           });
@@ -244,7 +244,7 @@ class EventsTable extends Component<Props, State> {
           allowActions={allowActions}
         >
           {target ? (
-            <ViewReplayLink replayId={dataRow.replayId} to={target}>
+            <ViewReplayLink replayId={dataRow.replayId!} to={target}>
               {rendered}
             </ViewReplayLink>
           ) : (
@@ -523,7 +523,7 @@ class EventsTable extends Component<Props, State> {
                   tableData ??= {data: []};
                   const pageEventsCount = tableData?.data?.length ?? 0;
                   const parsedPageLinks = parseLinkHeader(pageLinks);
-                  const cursor = parsedPageLinks?.next?.cursor;
+                  const cursor = parsedPageLinks?.next!?.cursor;
                   const shouldFetchAttachments: boolean =
                     organization.features.includes('event-attachments') &&
                     !!this.props.issueId &&
diff --git a/static/app/views/performance/transactionSummary/transactionEvents/index.spec.tsx b/static/app/views/performance/transactionSummary/transactionEvents/index.spec.tsx
index ed874de0ce1415..068d1af21c1486 100644
--- a/static/app/views/performance/transactionSummary/transactionEvents/index.spec.tsx
+++ b/static/app/views/performance/transactionSummary/transactionEvents/index.spec.tsx
@@ -5,7 +5,6 @@ import {initializeData as _initializeData} from 'sentry-test/performance/initial
 import {act, render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 
 import ProjectsStore from 'sentry/stores/projectsStore';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {MEPSettingProvider} from 'sentry/utils/performance/contexts/metricsEnhancedSetting';
 import {useLocation} from 'sentry/utils/useLocation';
 import TransactionEvents from 'sentry/views/performance/transactionSummary/transactionEvents';
@@ -18,7 +17,7 @@ jest.mock('sentry/utils/useLocation');
 
 const mockUseLocation = jest.mocked(useLocation);
 
-function WrappedComponent({data}) {
+function WrappedComponent({data}: {data: ReturnType<typeof initializeData>}) {
   return (
     <MEPSettingProvider>
       <TransactionEvents
@@ -200,7 +199,7 @@ describe('Performance > Transaction Summary > Transaction Events > Index', () =>
 
     await userEvent.click(p50);
 
-    expect(browserHistory.push).toHaveBeenCalledWith(
+    expect(data.router.push).toHaveBeenCalledWith(
       expect.objectContaining({query: expect.objectContaining({showTransactions: 'p50'})})
     );
   });
diff --git a/static/app/views/performance/transactionSummary/transactionEvents/index.tsx b/static/app/views/performance/transactionSummary/transactionEvents/index.tsx
index cb5da2c3a49c18..0101e2c1dc3210 100644
--- a/static/app/views/performance/transactionSummary/transactionEvents/index.tsx
+++ b/static/app/views/performance/transactionSummary/transactionEvents/index.tsx
@@ -6,7 +6,6 @@ import {t} from 'sentry/locale';
 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 DiscoverQuery from 'sentry/utils/discover/discoverQuery';
 import EventView from 'sentry/utils/discover/eventView';
 import {
@@ -18,6 +17,7 @@ import {WebVital} from 'sentry/utils/fields';
 import {removeHistogramQueryStrings} from 'sentry/utils/performance/histogram';
 import {decodeScalar} from 'sentry/utils/queryString';
 import {MutableSearch} from 'sentry/utils/tokenizeSearch';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import withOrganization from 'sentry/utils/withOrganization';
 import withProjects from 'sentry/utils/withProjects';
 
@@ -75,6 +75,7 @@ function EventsContentWrapper(props: ChildProps) {
     projectId,
     projects,
   } = props;
+  const navigate = useNavigate();
   const eventsDisplayFilterName = decodeEventsDisplayFilterFromLocation(location);
   const spanOperationBreakdownFilter = decodeFilterFromLocation(location);
   const webVital = getWebVital(location);
@@ -88,7 +89,7 @@ function EventsContentWrapper(props: ChildProps) {
     const filteredEventView = eventView?.clone();
     if (filteredEventView && filter?.query) {
       const query = new MutableSearch(filteredEventView.query);
-      filter.query.forEach(item => query.setFilterValues(item[0], [item[1]]));
+      filter.query.forEach(item => query.setFilterValues(item[0]!, [item[1]!]));
       filteredEventView.query = query.formatString();
     }
     return filteredEventView;
@@ -126,7 +127,7 @@ function EventsContentWrapper(props: ChildProps) {
     if (newFilter === SpanOperationBreakdownFilter.NONE) {
       delete nextQuery.breakdown;
     }
-    browserHistory.push({
+    navigate({
       pathname: location.pathname,
       query: nextQuery,
     });
@@ -150,7 +151,7 @@ function EventsContentWrapper(props: ChildProps) {
       delete nextQuery.showTransaction;
     }
 
-    browserHistory.push({
+    navigate({
       pathname: location.pathname,
       query: nextQuery,
     });
diff --git a/static/app/views/performance/transactionSummary/transactionOverview/charts.tsx b/static/app/views/performance/transactionSummary/transactionOverview/charts.tsx
index 602ab802585600..563b2b9fb96e83 100644
--- a/static/app/views/performance/transactionSummary/transactionOverview/charts.tsx
+++ b/static/app/views/performance/transactionSummary/transactionOverview/charts.tsx
@@ -13,12 +13,12 @@ import type {SelectValue} from 'sentry/types/core';
 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 {useMetricsCardinalityContext} from 'sentry/utils/performance/contexts/metricsCardinality';
 import {useMEPSettingContext} from 'sentry/utils/performance/contexts/metricsEnhancedSetting';
 import {removeHistogramQueryStrings} from 'sentry/utils/performance/histogram';
 import {decodeScalar} from 'sentry/utils/queryString';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import {getTransactionMEPParamsIfApplicable} from 'sentry/views/performance/transactionSummary/transactionOverview/utils';
 import {DisplayModes} from 'sentry/views/performance/transactionSummary/utils';
 import {TransactionsListOption} from 'sentry/views/releases/detail/overview';
@@ -91,6 +91,8 @@ function TransactionSummaryCharts({
   withoutZerofill,
   project,
 }: Props) {
+  const navigate = useNavigate();
+
   function handleDisplayChange(value: string) {
     const display = decodeScalar(location.query.display, DisplayModes.DURATION);
     trackAnalytics('performance_views.transaction_summary.change_chart_display', {
@@ -99,7 +101,7 @@ function TransactionSummaryCharts({
       to_chart: value,
     });
 
-    browserHistory.push({
+    navigate({
       pathname: location.pathname,
       query: {
         ...removeHistogramQueryStrings(location, [ZOOM_START, ZOOM_END]),
@@ -109,14 +111,14 @@ function TransactionSummaryCharts({
   }
 
   function handleTrendDisplayChange(value: string) {
-    browserHistory.push({
+    navigate({
       pathname: location.pathname,
       query: {...location.query, trendFunction: value},
     });
   }
 
   function handleTrendColumnChange(value: string) {
-    browserHistory.push({
+    navigate({
       pathname: location.pathname,
       query: {
         ...location.query,
@@ -135,11 +137,11 @@ function TransactionSummaryCharts({
   let display = decodeScalar(location.query.display, DisplayModes.DURATION);
   let trendFunction = decodeScalar(
     location.query.trendFunction,
-    TREND_FUNCTIONS_OPTIONS[0].value
+    TREND_FUNCTIONS_OPTIONS[0]!.value
   ) as TrendFunctionField;
   let trendParameter = decodeScalar(
     location.query.trendParameter,
-    TREND_PARAMETERS_OPTIONS[0].value
+    TREND_PARAMETERS_OPTIONS[0]!.value
   );
 
   if (!Object.values(DisplayModes).includes(display as DisplayModes)) {
diff --git a/static/app/views/performance/transactionSummary/transactionOverview/content.spec.tsx b/static/app/views/performance/transactionSummary/transactionOverview/content.spec.tsx
index f045e3aad0b43d..dcfe5823fe31b6 100644
--- a/static/app/views/performance/transactionSummary/transactionOverview/content.spec.tsx
+++ b/static/app/views/performance/transactionSummary/transactionOverview/content.spec.tsx
@@ -23,7 +23,7 @@ jest.mocked(useLocation).mockReturnValue({
   state: undefined,
 });
 
-function initialize(query, additionalFeatures: string[] = []) {
+function initialize(query: Record<string, string>, additionalFeatures: string[] = []) {
   const features = ['transaction-event', 'performance-view', ...additionalFeatures];
   const organization = OrganizationFixture({
     features,
@@ -189,6 +189,10 @@ describe('Transaction Summary Content', function () {
         metrics: [],
       },
     });
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/recent-searches/',
+      body: [],
+    });
   });
 
   afterEach(function () {
@@ -227,7 +231,7 @@ describe('Transaction Summary Content', function () {
       await screen.findByTestId('page-filter-environment-selector')
     ).toBeInTheDocument();
     expect(screen.getByTestId('page-filter-timerange-selector')).toBeInTheDocument();
-    expect(screen.getByTestId('smart-search-bar')).toBeInTheDocument();
+    expect(screen.getByTestId('search-query-builder')).toBeInTheDocument();
     expect(screen.getByTestId('transaction-summary-charts')).toBeInTheDocument();
     expect(screen.getByRole('heading', {name: /user misery/i})).toBeInTheDocument();
 
diff --git a/static/app/views/performance/transactionSummary/transactionOverview/content.tsx b/static/app/views/performance/transactionSummary/transactionOverview/content.tsx
index ab46fa4342f19e..f5ed150b470708 100644
--- a/static/app/views/performance/transactionSummary/transactionOverview/content.tsx
+++ b/static/app/views/performance/transactionSummary/transactionOverview/content.tsx
@@ -5,7 +5,6 @@ import omit from 'lodash/omit';
 
 import type {DropdownOption} from 'sentry/components/discover/transactionsList';
 import TransactionsList from 'sentry/components/discover/transactionsList';
-import SearchBar from 'sentry/components/events/searchBar';
 import * as Layout from 'sentry/components/layouts/thirds';
 import {DatePageFilter} from 'sentry/components/organizations/datePageFilter';
 import {EnvironmentPageFilter} from 'sentry/components/organizations/environmentPageFilter';
@@ -13,9 +12,7 @@ import PageFilterBar from 'sentry/components/organizations/pageFilterBar';
 import {normalizeDateTimeParams} from 'sentry/components/organizations/pageFilters/parse';
 import {TransactionSearchQueryBuilder} from 'sentry/components/performance/transactionSearchQueryBuilder';
 import {SuspectFunctionsTable} from 'sentry/components/profiling/suspectFunctions/suspectFunctionsTable';
-import type {ActionBarItem} from 'sentry/components/smartSearchBar';
 import {Tooltip} from 'sentry/components/tooltip';
-import {MAX_QUERY_LENGTH} from 'sentry/constants';
 import {IconWarning} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
@@ -23,7 +20,6 @@ import type {Organization} from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
 import {defined, generateQueryWithTag} from 'sentry/utils';
 import {trackAnalytics} from 'sentry/utils/analytics';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import type EventView from 'sentry/utils/discover/eventView';
 import {
   formatTagKey,
@@ -32,10 +28,10 @@ import {
   SPAN_OP_RELATIVE_BREAKDOWN_FIELD,
 } from 'sentry/utils/discover/fields';
 import type {QueryError} from 'sentry/utils/discover/genericDiscoverQuery';
-import type {MetricsEnhancedPerformanceDataContext} from 'sentry/utils/performance/contexts/metricsEnhancedPerformanceDataContext';
 import {useMEPDataContext} from 'sentry/utils/performance/contexts/metricsEnhancedPerformanceDataContext';
 import {decodeScalar} from 'sentry/utils/queryString';
 import projectSupportsReplay from 'sentry/utils/replays/projectSupportsReplay';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import {useRoutes} from 'sentry/utils/useRoutes';
 import withProjects from 'sentry/utils/withProjects';
 import type {Actions} from 'sentry/views/discover/table/cellAction';
@@ -103,6 +99,7 @@ function SummaryContent({
   onChangeFilter,
 }: Props) {
   const routes = useRoutes();
+  const navigate = useNavigate();
   const mepDataContext = useMEPDataContext();
   const domainViewFilters = useDomainViewFilters();
 
@@ -116,12 +113,12 @@ function SummaryContent({
       // do not propagate pagination when making a new search
       const searchQueryParams = omit(queryParams, 'cursor');
 
-      browserHistory.push({
+      navigate({
         pathname: location.pathname,
         query: searchQueryParams,
       });
     },
-    [location]
+    [location, navigate]
   );
 
   function generateTagUrl(key: string, value: string) {
@@ -139,7 +136,7 @@ function SummaryContent({
 
       updateQuery(searchConditions, action, column, value);
 
-      browserHistory.push({
+      navigate({
         pathname: location.pathname,
         query: {
           ...location.query,
@@ -156,7 +153,7 @@ function SummaryContent({
       query: {...location.query, showTransactions: value, transactionCursor: undefined},
     };
 
-    browserHistory.push(target);
+    navigate(target);
   }
 
   function handleAllEventsViewClick() {
@@ -189,29 +186,6 @@ function SummaryContent({
     return sortedEventView;
   }
 
-  function generateActionBarItems(
-    _org: Organization,
-    _location: Location,
-    _mepDataContext: MetricsEnhancedPerformanceDataContext
-  ) {
-    let items: ActionBarItem[] | undefined = undefined;
-    if (!canUseTransactionMetricsData(_org, _mepDataContext)) {
-      items = [
-        {
-          key: 'alert',
-          makeAction: () => ({
-            Button: () => <MetricsWarningIcon />,
-            menuItem: {
-              key: 'alert',
-            },
-          }),
-        },
-      ];
-    }
-
-    return items;
-  }
-
   const trailingItems = useMemo(() => {
     if (!canUseTransactionMetricsData(organization, mepDataContext)) {
       return <MetricsWarningIcon />;
@@ -228,7 +202,7 @@ function SummaryContent({
     return decodeScalar(location.query.query, '');
   }, [location]);
 
-  const totalCount = totalValues === null ? null : totalValues['count()'];
+  const totalCount = totalValues === null ? null : totalValues['count()']!;
 
   // NOTE: This is not a robust check for whether or not a transaction is a front end
   // transaction, however it will suffice for now.
@@ -352,30 +326,15 @@ function SummaryContent({
   const projectIds = useMemo(() => eventView.project.slice(), [eventView.project]);
 
   function renderSearchBar() {
-    if (organization.features.includes('search-query-builder-performance')) {
-      return (
-        <TransactionSearchQueryBuilder
-          projects={projectIds}
-          initialQuery={query}
-          onSearch={handleSearch}
-          searchSource="transaction_summary"
-          disableLoadingTags // already loaded by the parent component
-          filterKeyMenuWidth={420}
-          trailingItems={trailingItems}
-        />
-      );
-    }
-
     return (
-      <SearchBar
-        searchSource="transaction_summary"
-        organization={organization}
-        projectIds={eventView.project}
-        query={query}
-        fields={eventView.fields}
+      <TransactionSearchQueryBuilder
+        projects={projectIds}
+        initialQuery={query}
         onSearch={handleSearch}
-        maxQueryLength={MAX_QUERY_LENGTH}
-        actionBarItems={generateActionBarItems(organization, location, mepDataContext)}
+        searchSource="transaction_summary"
+        disableLoadingTags // already loaded by the parent component
+        filterKeyMenuWidth={420}
+        trailingItems={trailingItems}
       />
     );
   }
@@ -589,7 +548,7 @@ function getTransactionsListSort(
     location.query.showTransactions,
     TransactionFilterOptions.SLOW
   );
-  const selectedSort = sortOptions.find(opt => opt.value === urlParam) || sortOptions[0];
+  const selectedSort = sortOptions.find(opt => opt.value === urlParam) || sortOptions[0]!;
   return {selected: selectedSort, options: sortOptions};
 }
 
diff --git a/static/app/views/performance/transactionSummary/transactionOverview/durationChart/index.tsx b/static/app/views/performance/transactionSummary/transactionOverview/durationChart/index.tsx
index d351638e6090da..a46725e15ee52a 100644
--- a/static/app/views/performance/transactionSummary/transactionOverview/durationChart/index.tsx
+++ b/static/app/views/performance/transactionSummary/transactionOverview/durationChart/index.tsx
@@ -9,11 +9,11 @@ import {normalizeDateTimeParams} from 'sentry/components/organizations/pageFilte
 import QuestionTooltip from 'sentry/components/questionTooltip';
 import {t, tct} from 'sentry/locale';
 import type {OrganizationSummary} from 'sentry/types/organization';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {getUtcToLocalDateObject} from 'sentry/utils/dates';
 import {parseFunction} from 'sentry/utils/discover/fields';
 import useApi from 'sentry/utils/useApi';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useRouter from 'sentry/utils/useRouter';
 
 import type {ViewProps} from '../../../types';
@@ -51,6 +51,7 @@ function DurationChart({
   end: propsEnd,
   queryExtras,
 }: Props) {
+  const navigate = useNavigate();
   const router = useRouter();
   const location = useLocation();
   const api = useApi();
@@ -72,7 +73,7 @@ function DurationChart({
       },
     };
 
-    browserHistory.push(to);
+    navigate(to);
   }
 
   const start = propsStart ? getUtcToLocalDateObject(propsStart) : null;
diff --git a/static/app/views/performance/transactionSummary/transactionOverview/durationPercentileChart/utils.tsx b/static/app/views/performance/transactionSummary/transactionOverview/durationPercentileChart/utils.tsx
index a22872b56ce865..8c7ce9b1abf4b5 100644
--- a/static/app/views/performance/transactionSummary/transactionOverview/durationPercentileChart/utils.tsx
+++ b/static/app/views/performance/transactionSummary/transactionOverview/durationPercentileChart/utils.tsx
@@ -12,7 +12,7 @@ export function transformData(
   data: Record<string, number>[],
   useAggregateAlias: boolean = true
 ) {
-  const extractedData = Object.keys(data[0])
+  const extractedData = Object.keys(data[0]!)
     .map((key: string) => {
       const nameMatch = (
         useAggregateAlias
@@ -26,15 +26,15 @@ export function transformData(
       if (nameValue > 100) {
         nameValue /= 10;
       }
-      return [nameValue, data[0][key]];
+      return [nameValue, data[0]![key]!];
     })
-    .filter(i => i[0] > 0);
+    .filter(i => i[0]! > 0);
 
   extractedData.sort((a, b) => {
-    if (a[0] > b[0]) {
+    if (a[0]! > b[0]!) {
       return 1;
     }
-    if (a[0] < b[0]) {
+    if (a[0]! < b[0]!) {
       return -1;
     }
     return 0;
@@ -43,7 +43,7 @@ export function transformData(
   return [
     {
       seriesName: t('Duration'),
-      data: extractedData.map(i => ({value: i[1], name: `${i[0].toLocaleString()}%`})),
+      data: extractedData.map(i => ({value: i[1]!, name: `${i[0]!.toLocaleString()}%`})),
     },
   ];
 }
diff --git a/static/app/views/performance/transactionSummary/transactionOverview/index.spec.tsx b/static/app/views/performance/transactionSummary/transactionOverview/index.spec.tsx
index 1e48c4c8123daf..036c598c895a3b 100644
--- a/static/app/views/performance/transactionSummary/transactionOverview/index.spec.tsx
+++ b/static/app/views/performance/transactionSummary/transactionOverview/index.spec.tsx
@@ -4,12 +4,12 @@ import {TeamFixture} from 'sentry-fixture/team';
 
 import {initializeOrg} from 'sentry-test/initializeOrg';
 import {
-  findByLabelText,
   render,
   renderGlobalModal,
   screen,
   userEvent,
   waitFor,
+  within,
 } from 'sentry-test/reactTestingLibrary';
 
 import OrganizationStore from 'sentry/stores/organizationStore';
@@ -17,7 +17,6 @@ import ProjectsStore from 'sentry/stores/projectsStore';
 import TeamStore from 'sentry/stores/teamStore';
 import type {InjectedRouter} from 'sentry/types/legacyReactRouter';
 import type {Project} from 'sentry/types/project';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {DiscoverDatasets} from 'sentry/utils/discover/types';
 import {MetricsCardinalityProvider} from 'sentry/utils/performance/contexts/metricsCardinality';
 import {
@@ -91,9 +90,11 @@ function TestComponent({
 describe('Performance > TransactionSummary', function () {
   let eventStatsMock: jest.Mock;
   beforeEach(function () {
-    // eslint-disable-next-line no-console
     jest.spyOn(console, 'error').mockImplementation(jest.fn());
 
+    // Small screen size will hide search bar trailing items like warning icon
+    Object.defineProperty(Element.prototype, 'clientWidth', {value: 1000});
+
     MockApiClient.clearMockResponses();
     MockApiClient.addMockResponse({
       url: '/organizations/org-slug/projects/',
@@ -528,6 +529,10 @@ describe('Performance > TransactionSummary', function () {
     MockApiClient.clearMockResponses();
     ProjectsStore.reset();
     jest.clearAllMocks();
+
+    // Cleanup clientWidth mock
+    // @ts-expect-error
+    delete HTMLElement.prototype.clientWidth;
   });
 
   describe('with events', function () {
@@ -556,7 +561,9 @@ describe('Performance > TransactionSummary', function () {
       ).toBeInTheDocument();
 
       // It shows a searchbar
-      expect(screen.getByLabelText('Search events')).toBeInTheDocument();
+      expect(
+        screen.getByPlaceholderText('Search for events, users, tags, and more')
+      ).toBeInTheDocument();
 
       // It shows a table
       expect(screen.getByTestId('transactions-table')).toBeInTheDocument();
@@ -820,14 +827,18 @@ describe('Performance > TransactionSummary', function () {
       );
 
       // Fill out the search box, and submit it.
-      await userEvent.type(
-        screen.getByLabelText('Search events'),
-        'user.email:uhoh*{enter}'
+      await userEvent.click(
+        screen.getByPlaceholderText('Search for events, users, tags, and more')
       );
+      await userEvent.paste('user.email:uhoh*');
+      await userEvent.keyboard('{enter}');
+
+      await waitFor(() => {
+        expect(router.push).toHaveBeenCalledTimes(1);
+      });
 
       // Check the navigation.
-      expect(browserHistory.push).toHaveBeenCalledTimes(1);
-      expect(browserHistory.push).toHaveBeenCalledWith({
+      expect(router.push).toHaveBeenCalledWith({
         pathname: '/',
         query: {
           transaction: '/performance',
@@ -896,10 +907,10 @@ describe('Performance > TransactionSummary', function () {
         screen.getByRole('button', {name: 'Filter Slow Transactions (p95)'})
       );
 
-      await userEvent.click(screen.getAllByText('Slow Transactions (p95)')[1]);
+      await userEvent.click(screen.getAllByText('Slow Transactions (p95)')[1]!);
 
       // Check the navigation.
-      expect(browserHistory.push).toHaveBeenCalledWith({
+      expect(router.push).toHaveBeenCalledWith({
         pathname: '/',
         query: {
           transaction: '/performance',
@@ -928,14 +939,14 @@ describe('Performance > TransactionSummary', function () {
       await screen.findByText('Transaction Summary');
 
       const pagination = await screen.findByTestId('pagination');
-      expect(await findByLabelText(pagination, 'Previous')).toBeInTheDocument();
-      expect(await findByLabelText(pagination, 'Next')).toBeInTheDocument();
+      expect(await within(pagination).findByLabelText('Previous')).toBeInTheDocument();
+      expect(await within(pagination).findByLabelText('Next')).toBeInTheDocument();
 
       // Click the 'next' button
-      await userEvent.click(await findByLabelText(pagination, 'Next'));
+      await userEvent.click(await within(pagination).findByLabelText('Next'));
 
       // Check the navigation.
-      expect(browserHistory.push).toHaveBeenCalledWith({
+      expect(router.push).toHaveBeenCalledWith({
         pathname: '/',
         query: {
           transaction: '/performance',
@@ -1047,8 +1058,8 @@ describe('Performance > TransactionSummary', function () {
 
       await userEvent.click(screen.getByTestId('status-ok'));
 
-      expect(browserHistory.push).toHaveBeenCalledTimes(1);
-      expect(browserHistory.push).toHaveBeenCalledWith(
+      expect(router.push).toHaveBeenCalledTimes(1);
+      expect(router.push).toHaveBeenCalledWith(
         expect.objectContaining({
           query: expect.objectContaining({
             query: expect.stringContaining('transaction.status:ok'),
@@ -1342,7 +1353,9 @@ describe('Performance > TransactionSummary', function () {
       // Renders Failure Rate widget
       expect(screen.getByRole('heading', {name: 'Failure Rate'})).toBeInTheDocument();
       expect(screen.getByTestId('failure-rate-summary-value')).toHaveTextContent('100%');
-      expect(screen.getByTestId('search-metrics-fallback-warning')).toBeInTheDocument();
+      expect(
+        await screen.findByTestId('search-metrics-fallback-warning')
+      ).toBeInTheDocument();
     });
   });
 });
diff --git a/static/app/views/performance/transactionSummary/transactionOverview/index.tsx b/static/app/views/performance/transactionSummary/transactionOverview/index.tsx
index 0aa8a7e8fb0ecd..dfdfeb7a335ff0 100644
--- a/static/app/views/performance/transactionSummary/transactionOverview/index.tsx
+++ b/static/app/views/performance/transactionSummary/transactionOverview/index.tsx
@@ -8,7 +8,6 @@ import type {PageFilters} from 'sentry/types/core';
 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 {useDiscoverQuery} from 'sentry/utils/discover/discoverQuery';
 import EventView from 'sentry/utils/discover/eventView';
 import type {Column, QueryFieldValue} from 'sentry/utils/discover/fields';
@@ -27,6 +26,7 @@ import {removeHistogramQueryStrings} from 'sentry/utils/performance/histogram';
 import {decodeScalar} from 'sentry/utils/queryString';
 import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import useApi from 'sentry/utils/useApi';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import withOrganization from 'sentry/utils/withOrganization';
 import withPageFilters from 'sentry/utils/withPageFilters';
 import withProjects from 'sentry/utils/withProjects';
@@ -109,6 +109,8 @@ function OverviewContentWrapper(props: ChildProps) {
     transactionThresholdMetric,
   } = props;
 
+  const navigate = useNavigate();
+
   const mepContext = useMEPDataContext();
   const mepSetting = useMEPSettingContext();
   const mepCardinalityContext = useMetricsCardinalityContext();
@@ -171,7 +173,7 @@ function OverviewContentWrapper(props: ChildProps) {
       delete nextQuery.breakdown;
     }
 
-    browserHistory.push({
+    navigate({
       pathname: location.pathname,
       query: nextQuery,
     });
diff --git a/static/app/views/performance/transactionSummary/transactionOverview/metricEvents/metricsEventsDropdown.tsx b/static/app/views/performance/transactionSummary/transactionOverview/metricEvents/metricsEventsDropdown.tsx
index a32741fbf5de9b..fa3d53ef2adbc9 100644
--- a/static/app/views/performance/transactionSummary/transactionOverview/metricEvents/metricsEventsDropdown.tsx
+++ b/static/app/views/performance/transactionSummary/transactionOverview/metricEvents/metricsEventsDropdown.tsx
@@ -60,7 +60,7 @@ function InnerDropdown() {
   const options = getOptions(mepSetting);
 
   const currentOption =
-    options.find(({value}) => value === mepSetting.metricSettingState) || options[0];
+    options.find(({value}) => value === mepSetting.metricSettingState) || options[0]!;
 
   return (
     <CompactSelect
diff --git a/static/app/views/performance/transactionSummary/transactionOverview/sidebarCharts.tsx b/static/app/views/performance/transactionSummary/transactionOverview/sidebarCharts.tsx
index 503467f90b11ed..de9a23b1040703 100644
--- a/static/app/views/performance/transactionSummary/transactionOverview/sidebarCharts.tsx
+++ b/static/app/views/performance/transactionSummary/transactionOverview/sidebarCharts.tsx
@@ -80,7 +80,7 @@ function SidebarCharts({
           data-test-id="apdex-summary-value"
           isLoading={isLoading}
           error={error}
-          value={totals ? formatFloat(totals['apdex()'], 4) : null}
+          value={totals ? formatFloat(totals['apdex()']!, 4) : null}
         />
       </ChartLabel>
 
@@ -97,7 +97,7 @@ function SidebarCharts({
           data-test-id="failure-rate-summary-value"
           isLoading={isLoading}
           error={error}
-          value={totals ? formatPercentage(totals['failure_rate()']) : null}
+          value={totals ? formatPercentage(totals['failure_rate()']!) : null}
         />
       </ChartLabel>
 
@@ -229,7 +229,7 @@ function SidebarChartsContainer({
     utc,
     isGroupedByDate: true,
     showTimeInTooltip: true,
-    colors: [colors[0], colors[1]],
+    colors: [colors[0]!, colors[1]!],
     tooltip: {
       trigger: 'axis',
       truncate: 80,
diff --git a/static/app/views/performance/transactionSummary/transactionOverview/statusBreakdown.tsx b/static/app/views/performance/transactionSummary/transactionOverview/statusBreakdown.tsx
index 57b3a34a03070d..6ee506a9414e20 100644
--- a/static/app/views/performance/transactionSummary/transactionOverview/statusBreakdown.tsx
+++ b/static/app/views/performance/transactionSummary/transactionOverview/statusBreakdown.tsx
@@ -12,10 +12,10 @@ import {IconWarning} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import type {Organization} from 'sentry/types/organization';
 import {trackAnalytics} from 'sentry/utils/analytics';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import DiscoverQuery from 'sentry/utils/discover/discoverQuery';
 import type EventView from 'sentry/utils/discover/eventView';
 import {MutableSearch} from 'sentry/utils/tokenizeSearch';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import {getTermHelp, PerformanceTerm} from 'sentry/views/performance/data';
 
 type Props = {
@@ -25,6 +25,8 @@ type Props = {
 };
 
 function StatusBreakdown({eventView, location, organization}: Props) {
+  const navigate = useNavigate();
+
   const breakdownView = eventView
     .withColumns([
       {kind: 'function', function: ['count', '', '', undefined]},
@@ -74,7 +76,7 @@ function StatusBreakdown({eventView, location, organization}: Props) {
                 .setFilterValues('transaction.status', [
                   row['transaction.status'] as string,
                 ]);
-              browserHistory.push({
+              navigate({
                 pathname: location.pathname,
                 query: {
                   ...location.query,
diff --git a/static/app/views/performance/transactionSummary/transactionOverview/suspectSpans.tsx b/static/app/views/performance/transactionSummary/transactionOverview/suspectSpans.tsx
index 46bf37dd91166b..603bf9273bd039 100644
--- a/static/app/views/performance/transactionSummary/transactionOverview/suspectSpans.tsx
+++ b/static/app/views/performance/transactionSummary/transactionOverview/suspectSpans.tsx
@@ -9,10 +9,10 @@ import Pagination from 'sentry/components/pagination';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {Organization} from 'sentry/types/organization';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import type EventView from 'sentry/utils/discover/eventView';
 import SuspectSpansQuery from 'sentry/utils/performance/suspectSpans/suspectSpansQuery';
 import {decodeScalar} from 'sentry/utils/queryString';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useProjects from 'sentry/utils/useProjects';
 
 import SuspectSpansTable from '../transactionSpans/suspectSpansTable';
@@ -96,6 +96,7 @@ type HeaderProps = {
 
 function SuspectSpansHeader(props: HeaderProps) {
   const {location, organization, projectId, transactionName, pageLinks} = props;
+  const navigate = useNavigate();
 
   const viewAllTarget = spansRouteWithQuery({
     orgSlug: organization.slug,
@@ -105,7 +106,7 @@ function SuspectSpansHeader(props: HeaderProps) {
   });
 
   const handleCursor: CursorHandler = (cursor, pathname, query) => {
-    browserHistory.push({
+    navigate({
       pathname,
       query: {...query, [SPANS_CURSOR_NAME]: cursor},
     });
diff --git a/static/app/views/performance/transactionSummary/transactionOverview/tagExplorer.spec.tsx b/static/app/views/performance/transactionSummary/transactionOverview/tagExplorer.spec.tsx
index 8590cc778a0803..f40991cd803209 100644
--- a/static/app/views/performance/transactionSummary/transactionOverview/tagExplorer.spec.tsx
+++ b/static/app/views/performance/transactionSummary/transactionOverview/tagExplorer.spec.tsx
@@ -6,7 +6,6 @@ import {initializeOrg} from 'sentry-test/initializeOrg';
 import {render, screen, waitFor} from 'sentry-test/reactTestingLibrary';
 
 import ProjectsStore from 'sentry/stores/projectsStore';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import EventView from 'sentry/utils/discover/eventView';
 import {MEPSettingProvider} from 'sentry/utils/performance/contexts/metricsEnhancedSetting';
 import {useLocation} from 'sentry/utils/useLocation';
@@ -18,7 +17,7 @@ jest.mock('sentry/utils/useLocation');
 
 const mockUseLocation = jest.mocked(useLocation);
 
-function WrapperComponent(props) {
+function WrapperComponent(props: React.ComponentProps<typeof TagExplorer>) {
   return (
     <OrganizationContext.Provider value={props.organization}>
       <MEPSettingProvider>
@@ -28,7 +27,7 @@ function WrapperComponent(props) {
   );
 }
 
-function initialize(query, additionalFeatures = []) {
+function initialize(query: Record<string, string>, additionalFeatures = []) {
   const features = ['transaction-event', 'performance-view', ...additionalFeatures];
   const organization = OrganizationFixture({
     features,
@@ -54,18 +53,16 @@ function initialize(query, additionalFeatures = []) {
     transactionName,
     location: initialData.router.location,
     eventView,
-    api: MockApiClient,
   };
 }
 
 describe('WrapperComponent', function () {
   const facetUrl = '/organizations/org-slug/events-facets-performance/';
-  let facetApiMock;
+  let facetApiMock: jest.Mock;
   beforeEach(function () {
     mockUseLocation.mockReturnValue(
       LocationFixture({pathname: '/organizations/org-slug/performance/summary'})
     );
-    browserHistory.push = jest.fn();
     facetApiMock = MockApiClient.addMockResponse({
       url: facetUrl,
       body: {
@@ -113,14 +110,12 @@ describe('WrapperComponent', function () {
       organization,
       location,
       eventView,
-      api,
       spanOperationBreakdownFilter,
       transactionName,
     } = initialize({});
 
     render(
       <WrapperComponent
-        api={api}
         location={location}
         organization={organization}
         eventView={eventView}
@@ -142,7 +137,6 @@ describe('WrapperComponent', function () {
       organization,
       location,
       eventView,
-      api,
       spanOperationBreakdownFilter,
       transactionName,
     } = initialize({
@@ -151,7 +145,6 @@ describe('WrapperComponent', function () {
 
     render(
       <WrapperComponent
-        api={api}
         location={location}
         organization={organization}
         eventView={eventView}
@@ -181,7 +174,6 @@ describe('WrapperComponent', function () {
       organization,
       location,
       eventView,
-      api,
       spanOperationBreakdownFilter,
       transactionName,
       router,
@@ -194,7 +186,6 @@ describe('WrapperComponent', function () {
 
     render(
       <WrapperComponent
-        api={api}
         location={location}
         organization={organization}
         eventView={eventView}
@@ -215,11 +206,10 @@ describe('WrapperComponent', function () {
 
   it('Tag explorer uses the operation breakdown as a column', async function () {
     const projects = [ProjectFixture({platform: 'javascript-react'})];
-    const {organization, location, eventView, api, transactionName} = initialize({});
+    const {organization, location, eventView, transactionName} = initialize({});
 
     render(
       <WrapperComponent
-        api={api}
         location={location}
         organization={organization}
         eventView={eventView}
@@ -249,7 +239,6 @@ describe('WrapperComponent', function () {
       organization,
       location,
       eventView,
-      api,
       spanOperationBreakdownFilter,
       transactionName,
       router,
@@ -257,7 +246,6 @@ describe('WrapperComponent', function () {
 
     render(
       <WrapperComponent
-        api={api}
         location={location}
         organization={organization}
         eventView={eventView}
diff --git a/static/app/views/performance/transactionSummary/transactionOverview/tagExplorer.tsx b/static/app/views/performance/transactionSummary/transactionOverview/tagExplorer.tsx
index 5ea15c59d269e9..16611e84f2b74c 100644
--- a/static/app/views/performance/transactionSummary/transactionOverview/tagExplorer.tsx
+++ b/static/app/views/performance/transactionSummary/transactionOverview/tagExplorer.tsx
@@ -267,7 +267,7 @@ export class TagExplorer extends Component<Props> {
     columns: TagColumn[]
   ) => {
     return (column: TableColumn<ColumnKeys>, index: number): React.ReactNode =>
-      this.renderHeadCell(sortedEventView, tableMeta, column, columns[index]);
+      this.renderHeadCell(sortedEventView, tableMeta, column, columns[index]!);
   };
 
   handleTagValueClick = (location: Location, tagKey: string, tagValue: string) => {
diff --git a/static/app/views/performance/transactionSummary/transactionOverview/trendChart/index.tsx b/static/app/views/performance/transactionSummary/transactionOverview/trendChart/index.tsx
index d46a989a64edb3..cbb8f5d96c812b 100644
--- a/static/app/views/performance/transactionSummary/transactionOverview/trendChart/index.tsx
+++ b/static/app/views/performance/transactionSummary/transactionOverview/trendChart/index.tsx
@@ -15,7 +15,6 @@ import type {
   OrganizationSummary,
 } from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {getUtcToLocalDateObject} from 'sentry/utils/dates';
 import type EventView from 'sentry/utils/discover/eventView';
 import {DURATION_UNITS, SIZE_UNITS} from 'sentry/utils/discover/fieldRenderers';
@@ -24,6 +23,7 @@ import {useMetricsCardinalityContext} from 'sentry/utils/performance/contexts/me
 import TrendsDiscoverQuery from 'sentry/utils/performance/trends/trendsDiscoverQuery';
 import useApi from 'sentry/utils/useApi';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import type {TrendFunctionField, TrendView} from 'sentry/views/performance/trends/types';
 import {TrendChangeType} from 'sentry/views/performance/trends/types';
 import {modifyTrendView, normalizeTrends} from 'sentry/views/performance/trends/utils';
@@ -60,6 +60,7 @@ function TrendChart({
   end: propsEnd,
   projects,
 }: Props) {
+  const navigate = useNavigate();
   const location = useLocation();
   const api = useApi();
   const theme = useTheme();
@@ -83,7 +84,7 @@ function TrendChart({
         unselectedSeries: unselected,
       },
     };
-    browserHistory.push(to);
+    navigate(to);
   }
 
   const start = propsStart ? getUtcToLocalDateObject(propsStart) : null;
diff --git a/static/app/views/performance/transactionSummary/transactionOverview/vitalsChart/index.tsx b/static/app/views/performance/transactionSummary/transactionOverview/vitalsChart/index.tsx
index 95d762ce803df5..1d2e6f9faa3a06 100644
--- a/static/app/views/performance/transactionSummary/transactionOverview/vitalsChart/index.tsx
+++ b/static/app/views/performance/transactionSummary/transactionOverview/vitalsChart/index.tsx
@@ -9,12 +9,12 @@ import {normalizeDateTimeParams} from 'sentry/components/organizations/pageFilte
 import QuestionTooltip from 'sentry/components/questionTooltip';
 import {t} from 'sentry/locale';
 import type {OrganizationSummary} from 'sentry/types/organization';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {getUtcToLocalDateObject} from 'sentry/utils/dates';
 import {getAggregateArg, getMeasurementSlug} from 'sentry/utils/discover/fields';
 import {WebVital} from 'sentry/utils/fields';
 import useApi from 'sentry/utils/useApi';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 
 import type {ViewProps} from '../../../types';
 
@@ -39,6 +39,7 @@ function VitalsChart({
   end: propsEnd,
   queryExtras,
 }: Props) {
+  const navigate = useNavigate();
   const location = useLocation();
   const api = useApi();
   const theme = useTheme();
@@ -58,7 +59,7 @@ function VitalsChart({
         unselectedSeries: unselected,
       },
     };
-    browserHistory.push(to);
+    navigate(to);
   };
 
   const vitals = [WebVital.FCP, WebVital.LCP, WebVital.FID, WebVital.CLS];
diff --git a/static/app/views/performance/transactionSummary/transactionProfiles/content.tsx b/static/app/views/performance/transactionSummary/transactionProfiles/content.tsx
index 1e9c061a58b20b..de719bb16871a2 100644
--- a/static/app/views/performance/transactionSummary/transactionProfiles/content.tsx
+++ b/static/app/views/performance/transactionSummary/transactionProfiles/content.tsx
@@ -21,7 +21,6 @@ import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {DeepPartial} from 'sentry/types/utils';
 import {trackAnalytics} from 'sentry/utils/analytics';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {generateLinkToEventInTraceView} from 'sentry/utils/discover/urls';
 import {getShortEventId} from 'sentry/utils/events';
 import {isEmptyObject} from 'sentry/utils/object/isEmptyObject';
@@ -41,6 +40,7 @@ import {useProfileEvents} from 'sentry/utils/profiling/hooks/useProfileEvents';
 import {decodeScalar} from 'sentry/utils/queryString';
 import {useLocalStorageState} from 'sentry/utils/useLocalStorageState';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import {
   FlamegraphProvider,
@@ -360,6 +360,7 @@ const PROFILES_SORT = 'profilesSort';
 const PROFILES_CURSOR = 'profilesCursor';
 
 function ProfileList({query: userQuery, transaction}: TransactionProfilesContentProps) {
+  const navigate = useNavigate();
   const location = useLocation();
   const organization = useOrganization();
 
@@ -418,7 +419,7 @@ function ProfileList({query: userQuery, transaction}: TransactionProfilesContent
 
   const handleSort = useCallback(
     (value: {value: SortOption}) => {
-      browserHistory.push({
+      navigate({
         ...location,
         query: {
           ...location.query,
@@ -427,15 +428,18 @@ function ProfileList({query: userQuery, transaction}: TransactionProfilesContent
         },
       });
     },
-    [location]
+    [location, navigate]
   );
 
-  const handleCursor = useCallback((newCursor, pathname, query) => {
-    browserHistory.push({
-      pathname,
-      query: {...query, [PROFILES_CURSOR]: newCursor},
-    });
-  }, []);
+  const handleCursor = useCallback(
+    (newCursor, pathname, query) => {
+      navigate({
+        pathname,
+        query: {...query, [PROFILES_CURSOR]: newCursor},
+      });
+    },
+    [navigate]
+  );
 
   return (
     <ProfileListContainer>
diff --git a/static/app/views/performance/transactionSummary/transactionProfiles/index.tsx b/static/app/views/performance/transactionSummary/transactionProfiles/index.tsx
index 014b917c354a1a..d3277c25769a80 100644
--- a/static/app/views/performance/transactionSummary/transactionProfiles/index.tsx
+++ b/static/app/views/performance/transactionSummary/transactionProfiles/index.tsx
@@ -1,23 +1,21 @@
 import {useCallback, useMemo} from 'react';
 import styled from '@emotion/styled';
 
-import SearchBar from 'sentry/components/events/searchBar';
+import type {SmartSearchBarProps} from 'sentry/components/deprecatedSmartSearchBar';
 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 {TransactionSearchQueryBuilder} from 'sentry/components/performance/transactionSearchQueryBuilder';
-import type {SmartSearchBarProps} from 'sentry/components/smartSearchBar';
-import {MAX_QUERY_LENGTH} from 'sentry/constants';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 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 {decodeScalar} from 'sentry/utils/queryString';
 import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import useProjects from 'sentry/utils/useProjects';
 import Tab from 'sentry/views/performance/transactionSummary/tabs';
@@ -32,6 +30,7 @@ interface ProfilesProps {
 }
 
 function Profiles({organization, transaction}: ProfilesProps) {
+  const navigate = useNavigate();
   const location = useLocation();
   const {projects} = useProjects();
 
@@ -58,7 +57,7 @@ function Profiles({organization, transaction}: ProfilesProps) {
 
   const handleSearch: SmartSearchBarProps['onSearch'] = useCallback(
     (searchQuery: string) => {
-      browserHistory.push({
+      navigate({
         ...location,
         query: {
           ...location.query,
@@ -67,7 +66,7 @@ function Profiles({organization, transaction}: ProfilesProps) {
         },
       });
     },
-    [location]
+    [location, navigate]
   );
 
   const projectIds = useMemo(
@@ -92,23 +91,12 @@ function Profiles({organization, transaction}: ProfilesProps) {
                 <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={projectIds}
-                  query={rawQuery}
-                  onSearch={handleSearch}
-                  maxQueryLength={MAX_QUERY_LENGTH}
-                />
-              )}
+              <TransactionSearchQueryBuilder
+                projects={projectIds}
+                initialQuery={rawQuery}
+                onSearch={handleSearch}
+                searchSource="transaction_profiles"
+              />
             </FilterActions>
             <TransactionProfilesContent query={query} transaction={transaction} />
           </StyledMain>
diff --git a/static/app/views/performance/transactionSummary/transactionReplays/index.spec.tsx b/static/app/views/performance/transactionSummary/transactionReplays/index.spec.tsx
index 7a5c4d2c704b5e..c73956ffddaf9d 100644
--- a/static/app/views/performance/transactionSummary/transactionReplays/index.spec.tsx
+++ b/static/app/views/performance/transactionSummary/transactionReplays/index.spec.tsx
@@ -154,8 +154,8 @@ describe('TransactionReplays', () => {
 
     await waitFor(() => {
       expect(replaysMockApi).toHaveBeenCalledTimes(1);
-      expect(screen.getByText('There are no items to display')).toBeInTheDocument();
     });
+    expect(screen.getByText('There are no items to display')).toBeInTheDocument();
   });
 
   it('should show loading indicator when loading replays', async () => {
diff --git a/static/app/views/performance/transactionSummary/transactionSpans/content.tsx b/static/app/views/performance/transactionSummary/transactionSpans/content.tsx
index 9a7e075865b2f9..173b973139bcb0 100644
--- a/static/app/views/performance/transactionSummary/transactionSpans/content.tsx
+++ b/static/app/views/performance/transactionSummary/transactionSpans/content.tsx
@@ -4,7 +4,6 @@ import type {Location} from 'history';
 import omit from 'lodash/omit';
 
 import {CompactSelect} from 'sentry/components/compactSelect';
-import SearchBar from 'sentry/components/events/searchBar';
 import * as Layout from 'sentry/components/layouts/thirds';
 import {DatePageFilter} from 'sentry/components/organizations/datePageFilter';
 import {EnvironmentPageFilter} from 'sentry/components/organizations/environmentPageFilter';
@@ -12,21 +11,18 @@ import PageFilterBar from 'sentry/components/organizations/pageFilterBar';
 import {normalizeDateTimeParams} from 'sentry/components/organizations/pageFilters/parse';
 import Pagination from 'sentry/components/pagination';
 import {SpanSearchQueryBuilder} from 'sentry/components/performance/spanSearchQueryBuilder';
-import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {Organization} from 'sentry/types/organization';
 import {defined} from 'sentry/utils';
 import {trackAnalytics} from 'sentry/utils/analytics';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import DiscoverQuery from 'sentry/utils/discover/discoverQuery';
 import type EventView from 'sentry/utils/discover/eventView';
-import {DiscoverDatasets} from 'sentry/utils/discover/types';
 import SuspectSpansQuery from 'sentry/utils/performance/suspectSpans/suspectSpansQuery';
 import {VisuallyCompleteWithData} from 'sentry/utils/performanceForSentry';
 import {decodeScalar} from 'sentry/utils/queryString';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useProjects from 'sentry/utils/useProjects';
 import SpanMetricsTable from 'sentry/views/performance/transactionSummary/transactionSpans/spanMetricsTable';
-import {useSpanMetricsFieldSupportedTags} from 'sentry/views/performance/utils/useSpanFieldSupportedTags';
 
 import type {SetStateAction} from '../types';
 
@@ -66,6 +62,7 @@ type Props = {
 
 function SpansContent(props: Props) {
   const {location, organization, eventView, projectId, transactionName} = props;
+  const navigate = useNavigate();
   const query = decodeScalar(location.query.query, '');
 
   const handleChange = useCallback(
@@ -85,13 +82,13 @@ function SpansContent(props: Props) {
         }
         const searchQueryParams = omit(queryParams, toOmit);
 
-        browserHistory.push({
+        navigate({
           ...location,
           query: searchQueryParams,
         });
       };
     },
-    [location, organization]
+    [location, navigate, organization]
   );
 
   const spanOp = decodeScalar(location.query.spanOp);
@@ -132,22 +129,12 @@ function SpansContent(props: Props) {
           />
         </PageFilterBar>
         <StyledSearchBarWrapper>
-          {organization.features.includes('search-query-builder-performance') ? (
-            <SpanSearchQueryBuilder
-              projects={projectIds}
-              initialQuery={query}
-              onSearch={onSearch}
-              searchSource="transaction_spans"
-            />
-          ) : (
-            <SearchBar
-              organization={organization}
-              projectIds={eventView.project}
-              query={query}
-              fields={eventView.fields}
-              onSearch={onSearch}
-            />
-          )}
+          <SpanSearchQueryBuilder
+            projects={projectIds}
+            initialQuery={query}
+            onSearch={onSearch}
+            searchSource="transaction_spans"
+          />
           <CompactSelect
             value={sort.field}
             options={SPAN_SORT_OPTIONS.map(opt => ({value: opt.field, label: opt.label}))}
@@ -210,7 +197,7 @@ function SpansContent(props: Props) {
 // TODO: Temporary component while we make the switch to spans only. Will fully replace the old Spans tab when GA'd
 function SpansContentV2(props: Props) {
   const {location, organization, eventView, projectId, transactionName} = props;
-  const supportedTags = useSpanMetricsFieldSupportedTags();
+  const navigate = useNavigate();
   const {projects} = useProjects();
   const project = projects.find(p => p.id === projectId);
   const spansQuery = decodeScalar(location.query.spansQuery, '');
@@ -232,13 +219,13 @@ function SpansContentV2(props: Props) {
         }
         const searchQueryParams = omit(queryParams, toOmit);
 
-        browserHistory.push({
+        navigate({
           ...location,
           query: searchQueryParams,
         });
       };
     },
-    [location, organization]
+    [location, navigate, organization]
   );
 
   const onSearch = useMemo(() => handleChange('spansQuery'), [handleChange]);
@@ -258,26 +245,12 @@ function SpansContentV2(props: Props) {
           <EnvironmentPageFilter />
           <DatePageFilter />
         </PageFilterBar>
-        {organization.features.includes('search-query-builder-performance') ? (
-          <SpanSearchQueryBuilder
-            projects={projectIds}
-            initialQuery={spansQuery}
-            onSearch={onSearch}
-            searchSource="transaction_spans"
-          />
-        ) : (
-          <SearchBar
-            organization={organization}
-            projectIds={eventView.project}
-            query={spansQuery}
-            fields={eventView.fields}
-            placeholder={t('Search for span attributes')}
-            supportedTags={supportedTags}
-            // This dataset is separate from the query itself which is on metrics; it's for obtaining autocomplete recommendations
-            dataset={DiscoverDatasets.SPANS_INDEXED}
-            onSearch={handleChange('spansQuery')}
-          />
-        )}
+        <SpanSearchQueryBuilder
+          projects={projectIds}
+          initialQuery={spansQuery}
+          onSearch={onSearch}
+          searchSource="transaction_spans"
+        />
       </FilterActions>
 
       <SpanMetricsTable
diff --git a/static/app/views/performance/transactionSummary/transactionSpans/index.spec.tsx b/static/app/views/performance/transactionSummary/transactionSpans/index.spec.tsx
index f72b146d4f584f..224108cfad5db3 100644
--- a/static/app/views/performance/transactionSummary/transactionSpans/index.spec.tsx
+++ b/static/app/views/performance/transactionSummary/transactionSpans/index.spec.tsx
@@ -87,6 +87,10 @@ describe('Performance > Transaction Spans', function () {
       url: '/organizations/org-slug/spans/fields/',
       body: [],
     });
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/recent-searches/',
+      body: [],
+    });
   });
 
   afterEach(function () {
@@ -208,13 +212,18 @@ describe('Performance > Transaction Spans', function () {
 
       await waitForElementToBeRemoved(() => screen.queryAllByTestId('loading-indicator'));
 
-      const searchTokens = await screen.findAllByTestId('filter-token');
-      expect(searchTokens).toHaveLength(2);
-      expect(searchTokens[0]).toHaveTextContent('span.op:db');
-      expect(searchTokens[1]).toHaveTextContent('span.action:SELECT');
-      expect(await screen.findByTestId('smart-search-bar')).not.toHaveTextContent(
-        'http.method:POST'
-      );
+      const searchBar = await screen.findByTestId('search-query-builder');
+
+      expect(
+        within(searchBar).getByRole('row', {name: 'span.op:db'})
+      ).toBeInTheDocument();
+      expect(
+        within(searchBar).getByRole('row', {name: 'span.action:SELECT'})
+      ).toBeInTheDocument();
+
+      expect(
+        within(searchBar).queryByRole('row', {name: 'http.method:POST'})
+      ).not.toBeInTheDocument();
     });
   });
 });
diff --git a/static/app/views/performance/transactionSummary/transactionSpans/spanDetails/chart.tsx b/static/app/views/performance/transactionSummary/transactionSpans/spanDetails/chart.tsx
index e18ee0215cdc34..a7a515fd52e2a3 100644
--- a/static/app/views/performance/transactionSummary/transactionSpans/spanDetails/chart.tsx
+++ b/static/app/views/performance/transactionSummary/transactionSpans/spanDetails/chart.tsx
@@ -13,11 +13,11 @@ import {t} from 'sentry/locale';
 import type {Organization} from 'sentry/types/organization';
 import {defined} from 'sentry/utils';
 import {trackAnalytics} from 'sentry/utils/analytics';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import type EventView from 'sentry/utils/discover/eventView';
 import type {SpanSlug} from 'sentry/utils/performance/suspectSpans/types';
 import {decodeScalar} from 'sentry/utils/queryString';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 
 import ExclusiveTimeHistogram from './exclusiveTimeHistogram';
 import ExclusiveTimeTimeSeries from './exclusiveTimeTimeSeries';
@@ -35,6 +35,7 @@ enum DisplayModes {
 }
 
 function Chart(props: Props) {
+  const navigate = useNavigate();
   const location = useLocation();
 
   const display = decodeScalar(location.query.display, DisplayModes.TIMESERIES);
@@ -52,7 +53,7 @@ function Chart(props: Props) {
       change_to_display: value,
     });
 
-    browserHistory.push({
+    navigate({
       pathname: location.pathname,
       query: {
         ...location.query,
diff --git a/static/app/views/performance/transactionSummary/transactionSpans/spanDetails/exclusiveTimeTimeSeries.tsx b/static/app/views/performance/transactionSummary/transactionSpans/spanDetails/exclusiveTimeTimeSeries.tsx
index de5d54d35da086..b2940f516bfe1d 100644
--- a/static/app/views/performance/transactionSummary/transactionSpans/spanDetails/exclusiveTimeTimeSeries.tsx
+++ b/static/app/views/performance/transactionSummary/transactionSpans/spanDetails/exclusiveTimeTimeSeries.tsx
@@ -15,7 +15,6 @@ import QuestionTooltip from 'sentry/components/questionTooltip';
 import {IconWarning} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import type {Organization} from 'sentry/types/organization';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {getUtcToLocalDateObject} from 'sentry/utils/dates';
 import {axisLabelFormatter, tooltipFormatter} from 'sentry/utils/discover/charts';
 import type EventView from 'sentry/utils/discover/eventView';
@@ -23,6 +22,7 @@ import getDynamicText from 'sentry/utils/getDynamicText';
 import type {SpanSlug} from 'sentry/utils/performance/suspectSpans/types';
 import useApi from 'sentry/utils/useApi';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 
 import {getExclusiveTimeDisplayedValue} from '../utils';
 
@@ -34,6 +34,7 @@ type Props = {
 };
 
 export default function ExclusiveTimeTimeSeries(props: Props) {
+  const navigate = useNavigate();
   const location = useLocation();
   const {organization, eventView, spanSlug, withoutZerofill} = props;
 
@@ -69,7 +70,7 @@ export default function ExclusiveTimeTimeSeries(props: Props) {
         unselectedSeries: unselected,
       },
     };
-    browserHistory.push(to);
+    navigate(to);
   };
 
   return (
diff --git a/static/app/views/performance/transactionSummary/transactionSpans/spanDetails/index.spec.tsx b/static/app/views/performance/transactionSummary/transactionSpans/spanDetails/index.spec.tsx
index 79d9dde6b32abf..3ca967c780a1c7 100644
--- a/static/app/views/performance/transactionSummary/transactionSpans/spanDetails/index.spec.tsx
+++ b/static/app/views/performance/transactionSummary/transactionSpans/spanDetails/index.spec.tsx
@@ -12,11 +12,10 @@ import {
 } from 'sentry-test/reactTestingLibrary';
 
 import ProjectsStore from 'sentry/stores/projectsStore';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import SpanDetails from 'sentry/views/performance/transactionSummary/transactionSpans/spanDetails';
 import {spanDetailsRouteWithQuery} from 'sentry/views/performance/transactionSummary/transactionSpans/spanDetails/utils';
 
-function initializeData(settings) {
+function initializeData(settings: Parameters<typeof _initializeData>[0]) {
   const data = _initializeData(settings);
   act(() => void ProjectsStore.loadInitialData(data.projects));
   return data;
@@ -38,8 +37,6 @@ describe('Performance > Transaction Spans > Span Summary', function () {
   afterEach(function () {
     MockApiClient.clearMockResponses();
     ProjectsStore.reset();
-    // need to typecast to any to be able to call mockReset
-    (browserHistory.push as any).mockReset();
   });
 
   describe('Without Span Data', function () {
@@ -147,7 +144,7 @@ describe('Performance > Transaction Spans > Span Summary', function () {
 
       // just want to get one span in the response
       const badExamples = [generateSuspectSpansResponse({examplesOnly: true})[0]];
-      for (const example of badExamples[0].examples) {
+      for (const example of badExamples[0]!.examples) {
         // make sure that the spans array is empty
         example.spans = [];
       }
@@ -446,7 +443,7 @@ describe('Performance > Transaction Spans > Span Summary', function () {
           name: /reset view/i,
         });
         await userEvent.click(resetButton);
-        expect(browserHistory.push).toHaveBeenCalledWith(
+        expect(data.router.push).toHaveBeenCalledWith(
           expect.not.objectContaining({min: expect.any(String), max: expect.any(String)})
         );
       });
@@ -466,7 +463,7 @@ describe('Performance > Transaction Spans > Span Summary', function () {
         await userEvent.click(searchBarNode);
         await userEvent.paste('count():>3');
         expect(searchBarNode).toHaveTextContent('count():>3');
-        expect(browserHistory.push).not.toHaveBeenCalled();
+        expect(data.router.push).not.toHaveBeenCalled();
       });
 
       it('renders a display toggle that changes a chart view between timeseries and histogram by pushing it to the browser history', async function () {
@@ -507,7 +504,7 @@ describe('Performance > Transaction Spans > Span Summary', function () {
           })
         );
 
-        expect(browserHistory.push).toHaveBeenCalledWith(
+        expect(data.router.push).toHaveBeenCalledWith(
           expect.objectContaining({
             query: {
               display: 'histogram',
diff --git a/static/app/views/performance/transactionSummary/transactionSpans/spanDetails/spanDetailsControls.tsx b/static/app/views/performance/transactionSummary/transactionSpans/spanDetails/spanDetailsControls.tsx
index 19d35d7a4f52fa..78148e131c0c93 100644
--- a/static/app/views/performance/transactionSummary/transactionSpans/spanDetails/spanDetailsControls.tsx
+++ b/static/app/views/performance/transactionSummary/transactionSpans/spanDetails/spanDetailsControls.tsx
@@ -9,10 +9,10 @@ import PageFilterBar from 'sentry/components/organizations/pageFilterBar';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {Organization} from 'sentry/types/organization';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import type EventView from 'sentry/utils/discover/eventView';
 import {removeHistogramQueryStrings} from 'sentry/utils/performance/histogram';
 import {decodeScalar} from 'sentry/utils/queryString';
+import {useNavigate} from 'sentry/utils/useNavigate';
 
 import {SPAN_RELATIVE_PERIODS, SPAN_RETENTION_DAYS} from '../utils';
 
@@ -29,10 +29,11 @@ export default function SpanDetailsControls({
   eventView,
   location,
 }: SpanDetailsControlsProps) {
+  const navigate = useNavigate();
   const query = decodeScalar(location.query.query, '');
 
   const handleSearchQuery = (searchQuery: string): void => {
-    browserHistory.push({
+    navigate({
       pathname: location.pathname,
       query: {
         ...location.query,
@@ -43,7 +44,7 @@ export default function SpanDetailsControls({
   };
 
   const handleResetView = () => {
-    browserHistory.push({
+    navigate({
       pathname: location.pathname,
       query: removeHistogramQueryStrings(location, Object.values(ZoomKeys)),
     });
diff --git a/static/app/views/performance/transactionSummary/transactionSpans/spanDetails/spanDetailsTable.tsx b/static/app/views/performance/transactionSummary/transactionSpans/spanDetails/spanDetailsTable.tsx
index 69a95edc9b008e..90419244fc16ae 100644
--- a/static/app/views/performance/transactionSummary/transactionSpans/spanDetails/spanDetailsTable.tsx
+++ b/static/app/views/performance/transactionSummary/transactionSpans/spanDetails/spanDetailsTable.tsx
@@ -169,7 +169,7 @@ function renderBodyCellWithMeta(
         location,
         organization,
         spanId: worstSpan.id,
-        transactionName: transactionName,
+        transactionName,
         source: TraceViewSources.PERFORMANCE_TRANSACTION_SUMMARY,
       });
 
diff --git a/static/app/views/performance/transactionSummary/transactionSpans/spanMetricsTable.tsx b/static/app/views/performance/transactionSummary/transactionSpans/spanMetricsTable.tsx
index b36bf9d56da890..ac00a479b27935 100644
--- a/static/app/views/performance/transactionSummary/transactionSpans/spanMetricsTable.tsx
+++ b/static/app/views/performance/transactionSummary/transactionSpans/spanMetricsTable.tsx
@@ -8,7 +8,6 @@ import Pagination, {type CursorHandler} from 'sentry/components/pagination';
 import {t} from 'sentry/locale';
 import type {Organization} from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {getFieldRenderer} from 'sentry/utils/discover/fieldRenderers';
 import type {ColumnType} from 'sentry/utils/discover/fields';
 import {Container as TableCellContainer} from 'sentry/utils/discover/styles';
@@ -17,6 +16,7 @@ import {decodeScalar} from 'sentry/utils/queryString';
 import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import useLocationQuery from 'sentry/utils/url/useLocationQuery';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import {renderHeadCell} from 'sentry/views/insights/common/components/tableCells/renderHeadCell';
 import {useSpanMetrics} from 'sentry/views/insights/common/queries/useDiscover';
@@ -97,6 +97,7 @@ type Props = {
 export default function SpanMetricsTable(props: Props) {
   const {project, transactionName, query: search} = props;
   const organization = useOrganization();
+  const navigate = useNavigate();
   const location = useLocation();
   const sort = useSpansTabTableSort();
   const domainViewFilters = useDomainViewFilters();
@@ -116,7 +117,7 @@ export default function SpanMetricsTable(props: Props) {
   };
 
   const handleCursor: CursorHandler = (cursor, pathname, q) => {
-    browserHistory.push({
+    navigate({
       pathname,
       query: {...q, [QueryParameterNames.SPANS_CURSOR]: cursor},
     });
@@ -167,6 +168,9 @@ export default function SpanMetricsTable(props: Props) {
                 location,
                 sort,
               }),
+            // This is now caught by noUncheckedIndexedAccess, ignoring for now as
+            // it seems related to some nasty grid editable generic.
+            // @ts-ignore
             renderBodyCell: renderBodyCell(
               location,
               organization,
diff --git a/static/app/views/performance/transactionSummary/transactionSpans/spanSummary/content.spec.tsx b/static/app/views/performance/transactionSummary/transactionSpans/spanSummary/content.spec.tsx
index 8f8f425ca20f8f..b7208db598e9b3 100644
--- a/static/app/views/performance/transactionSummary/transactionSpans/spanSummary/content.spec.tsx
+++ b/static/app/views/performance/transactionSummary/transactionSpans/spanSummary/content.spec.tsx
@@ -217,6 +217,11 @@ describe('SpanSummaryPage', function () {
         ],
       },
     });
+
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/recent-searches/',
+      body: [],
+    });
   });
 
   it('correctly renders the details in the header', async function () {
diff --git a/static/app/views/performance/transactionSummary/transactionSpans/spanSummary/content.tsx b/static/app/views/performance/transactionSummary/transactionSpans/spanSummary/content.tsx
index 06f60b8263d553..2f68140a2fa31c 100644
--- a/static/app/views/performance/transactionSummary/transactionSpans/spanSummary/content.tsx
+++ b/static/app/views/performance/transactionSummary/transactionSpans/spanSummary/content.tsx
@@ -140,7 +140,7 @@ function SpanSummaryContent(props: ContentProps) {
   const {transactionName, project} = props;
 
   const {spanSlug: spanParam} = useParams();
-  const [spanOp, groupId] = spanParam.split(':');
+  const [spanOp, groupId] = spanParam!.split(':');
 
   const filters: SpanMetricsQueryFilters = {
     'span.group': groupId,
diff --git a/static/app/views/performance/transactionSummary/transactionSpans/spanSummary/spanSummaryCharts.tsx b/static/app/views/performance/transactionSummary/transactionSpans/spanSummary/spanSummaryCharts.tsx
index 49b7bf0ad5ff57..3b9c5df769c129 100644
--- a/static/app/views/performance/transactionSummary/transactionSpans/spanSummary/spanSummaryCharts.tsx
+++ b/static/app/views/performance/transactionSummary/transactionSpans/spanSummary/spanSummaryCharts.tsx
@@ -33,7 +33,7 @@ import {SpanSummaryReferrer} from 'sentry/views/performance/transactionSummary/t
 function SpanSummaryCharts() {
   const organization = useOrganization();
   const {spanSlug} = useParams();
-  const [spanOp, groupId] = spanSlug.split(':');
+  const [spanOp, groupId] = spanSlug!.split(':');
 
   const location = useLocation();
   const {transaction} = location.query;
diff --git a/static/app/views/performance/transactionSummary/transactionSpans/spanSummary/spanSummaryTable.tsx b/static/app/views/performance/transactionSummary/transactionSpans/spanSummary/spanSummaryTable.tsx
index 6d6837dcffd017..0b25cc89b0dd46 100644
--- a/static/app/views/performance/transactionSummary/transactionSpans/spanSummary/spanSummaryTable.tsx
+++ b/static/app/views/performance/transactionSummary/transactionSpans/spanSummary/spanSummaryTable.tsx
@@ -2,7 +2,6 @@ import {Fragment, useCallback, useMemo} from 'react';
 import styled from '@emotion/styled';
 import type {Location} from 'history';
 
-import SearchBar from 'sentry/components/events/searchBar';
 import type {GridColumnHeader} from 'sentry/components/gridEditable';
 import GridEditable, {COL_WIDTH_UNDEFINED} from 'sentry/components/gridEditable';
 import Pagination, {type CursorHandler} from 'sentry/components/pagination';
@@ -15,7 +14,6 @@ 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 {browserHistory} from 'sentry/utils/browserHistory';
 import EventView, {type MetaType} from 'sentry/utils/discover/eventView';
 import {getFieldRenderer} from 'sentry/utils/discover/fieldRenderers';
 import type {ColumnType} from 'sentry/utils/discover/fields';
@@ -23,7 +21,6 @@ import {
   type DiscoverQueryProps,
   useGenericDiscoverQuery,
 } from 'sentry/utils/discover/genericDiscoverQuery';
-import {DiscoverDatasets} from 'sentry/utils/discover/types';
 import {VisuallyCompleteWithData} from 'sentry/utils/performanceForSentry';
 import {decodeScalar} from 'sentry/utils/queryString';
 import {MutableSearch} from 'sentry/utils/tokenizeSearch';
@@ -45,7 +42,6 @@ import {TraceViewSources} from 'sentry/views/performance/newTraceDetails/traceHe
 import {SpanDurationBar} from 'sentry/views/performance/transactionSummary/transactionSpans/spanDetails/spanDetailsTable';
 import {SpanSummaryReferrer} from 'sentry/views/performance/transactionSummary/transactionSpans/spanSummary/referrers';
 import {useSpanSummarySort} from 'sentry/views/performance/transactionSummary/transactionSpans/spanSummary/useSpanSummarySort';
-import {useSpanFieldSupportedTags} from 'sentry/views/performance/utils/useSpanFieldSupportedTags';
 
 import Tab from '../../tabs';
 
@@ -102,10 +98,9 @@ type Props = {
 export default function SpanSummaryTable(props: Props) {
   const {project} = props;
   const organization = useOrganization();
-  const {data: supportedTags} = useSpanFieldSupportedTags();
   const {spanSlug} = useParams();
   const navigate = useNavigate();
-  const [spanOp, groupId] = spanSlug.split(':');
+  const [spanOp, groupId] = spanSlug!.split(':');
 
   const location = useLocation();
   const {transaction} = location.query;
@@ -198,13 +193,13 @@ export default function SpanSummaryTable(props: Props) {
       const transactionId = row[SpanIndexedField.TRANSACTION_ID];
       const newRow = {
         ...row,
-        'transaction.duration': transactionDurationMap[transactionId],
+        'transaction.duration': transactionDurationMap[transactionId]!,
       };
       return newRow;
     }) ?? [];
 
   const handleCursor: CursorHandler = (cursor, pathname, query) => {
-    browserHistory.push({
+    navigate({
       pathname,
       query: {...query, [QueryParameterNames.SPANS_CURSOR]: cursor},
     });
@@ -227,25 +222,12 @@ export default function SpanSummaryTable(props: Props) {
   return (
     <Fragment>
       <StyledSearchBarWrapper>
-        {organization.features.includes('search-query-builder-performance') ? (
-          <SpanSearchQueryBuilder
-            projects={projectIds}
-            initialQuery={spansQuery}
-            onSearch={handleSearch}
-            searchSource="transaction_span_summary"
-          />
-        ) : (
-          <SearchBar
-            organization={organization}
-            projectIds={eventView.project}
-            query={spansQuery}
-            fields={eventView.fields}
-            placeholder={t('Search for span attributes')}
-            supportedTags={supportedTags}
-            dataset={DiscoverDatasets.SPANS_INDEXED}
-            onSearch={handleSearch}
-          />
-        )}
+        <SpanSearchQueryBuilder
+          projects={projectIds}
+          initialQuery={spansQuery}
+          onSearch={handleSearch}
+          searchSource="transaction_span_summary"
+        />
       </StyledSearchBarWrapper>
       <VisuallyCompleteWithData
         id="SpanDetails-SpanDetailsTable"
@@ -269,6 +251,9 @@ export default function SpanSummaryTable(props: Props) {
                 location,
                 sort,
               }),
+            // This is now caught by noUncheckedIndexedAccess, ignoring for now as
+            // it seems related to some nasty grid editable generic.
+            // @ts-ignore
             renderBodyCell: renderBodyCell(
               location,
               organization,
diff --git a/static/app/views/performance/transactionSummary/transactionSpans/suspectSpansTable.spec.tsx b/static/app/views/performance/transactionSummary/transactionSpans/suspectSpansTable.spec.tsx
index dd374bf63555fa..f801b4b2b15bb3 100644
--- a/static/app/views/performance/transactionSummary/transactionSpans/suspectSpansTable.spec.tsx
+++ b/static/app/views/performance/transactionSummary/transactionSpans/suspectSpansTable.spec.tsx
@@ -21,7 +21,7 @@ const initializeData = () => {
 describe('SuspectSpansTable', () => {
   it('should not calculate frequency percentages above 100%', async () => {
     const initialData = initializeData();
-    const suspectSpan = makeSuspectSpan(SAMPLE_SPANS[0]);
+    const suspectSpan = makeSuspectSpan(SAMPLE_SPANS[0]!);
     suspectSpan.frequency = 120;
 
     render(
diff --git a/static/app/views/performance/transactionSummary/transactionSpans/utils.tsx b/static/app/views/performance/transactionSummary/transactionSpans/utils.tsx
index c1cde655b3f1d6..9a667ec0a6bbc6 100644
--- a/static/app/views/performance/transactionSummary/transactionSpans/utils.tsx
+++ b/static/app/views/performance/transactionSummary/transactionSpans/utils.tsx
@@ -119,7 +119,7 @@ export function getSuspectSpanSortFromLocation(
 }
 
 export function getSuspectSpanSortFromEventView(eventView: EventView): SpanSortOption {
-  const sort = eventView.sorts.length ? eventView.sorts[0].field : DEFAULT_SORT;
+  const sort = eventView.sorts.length ? eventView.sorts[0]!.field : DEFAULT_SORT;
   return getSuspectSpanSort(sort);
 }
 
diff --git a/static/app/views/performance/transactionSummary/transactionTags/content.tsx b/static/app/views/performance/transactionSummary/transactionTags/content.tsx
index 523beb0f51631b..0cb35ca30ca37c 100644
--- a/static/app/views/performance/transactionSummary/transactionTags/content.tsx
+++ b/static/app/views/performance/transactionSummary/transactionTags/content.tsx
@@ -4,7 +4,6 @@ import type {Location} from 'history';
 
 import {SectionHeading} from 'sentry/components/charts/styles';
 import {CompactSelect} from 'sentry/components/compactSelect';
-import SearchBar from 'sentry/components/events/searchBar';
 import * as Layout from 'sentry/components/layouts/thirds';
 import {DatePageFilter} from 'sentry/components/organizations/datePageFilter';
 import {EnvironmentPageFilter} from 'sentry/components/organizations/environmentPageFilter';
@@ -19,11 +18,11 @@ 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 {browserHistory} from 'sentry/utils/browserHistory';
 import type EventView from 'sentry/utils/discover/eventView';
 import type {TableData} from 'sentry/utils/performance/segmentExplorer/segmentExplorerQuery';
 import SegmentExplorerQuery from 'sentry/utils/performance/segmentExplorer/segmentExplorerQuery';
 import {decodeScalar} from 'sentry/utils/queryString';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import {SidebarSpacer} from 'sentry/views/performance/transactionSummary/utils';
 
 import {SpanOperationBreakdownFilter} from '../filter';
@@ -125,6 +124,7 @@ function InnerContent(
 
   const initialTag = decodedTagFromOptions ?? defaultTag;
 
+  const navigate = useNavigate();
   const [tagSelected, _changeTagSelected] = useState(initialTag);
   const lastTag = useRef('');
 
@@ -137,15 +137,18 @@ function InnerContent(
           [TAG_PAGE_TABLE_CURSOR]: undefined,
         });
 
-        browserHistory.replace({
-          pathname: location.pathname,
-          query: queryParams,
-        });
+        navigate(
+          {
+            pathname: location.pathname,
+            query: queryParams,
+          },
+          {replace: true}
+        );
         _changeTagSelected(tagKey);
         lastTag.current = decodeScalar(location.query.tagKey, '');
       }
     },
-    [location.query, location.pathname]
+    [location.query, location.pathname, navigate]
   );
 
   useEffect(() => {
@@ -160,7 +163,7 @@ function InnerContent(
       query,
     });
 
-    browserHistory.push({
+    navigate({
       pathname: location.pathname,
       query: queryParams,
     });
@@ -200,22 +203,12 @@ function InnerContent(
             <DatePageFilter />
           </PageFilterBar>
           <StyledSearchBarWrapper>
-            {organization.features.includes('search-query-builder-performance') ? (
-              <TransactionSearchQueryBuilder
-                projects={projectIds}
-                initialQuery={query}
-                onSearch={handleSearch}
-                searchSource="transaction_tags"
-              />
-            ) : (
-              <SearchBar
-                organization={organization}
-                projectIds={eventView.project}
-                query={query}
-                fields={eventView.fields}
-                onSearch={handleSearch}
-              />
-            )}
+            <TransactionSearchQueryBuilder
+              projects={projectIds}
+              initialQuery={query}
+              onSearch={handleSearch}
+              searchSource="transaction_tags"
+            />
           </StyledSearchBarWrapper>
           <CompactSelect
             value={aggregateColumn}
diff --git a/static/app/views/performance/transactionSummary/transactionTags/index.spec.tsx b/static/app/views/performance/transactionSummary/transactionTags/index.spec.tsx
index 3e712b8b6e12e3..a8fc1995c0fc1f 100644
--- a/static/app/views/performance/transactionSummary/transactionTags/index.spec.tsx
+++ b/static/app/views/performance/transactionSummary/transactionTags/index.spec.tsx
@@ -6,7 +6,6 @@ import {act, render, screen, userEvent, waitFor} from 'sentry-test/reactTestingL
 import selectEvent from 'sentry-test/selectEvent';
 
 import ProjectsStore from 'sentry/stores/projectsStore';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {useLocation} from 'sentry/utils/useLocation';
 import TransactionTags from 'sentry/views/performance/transactionSummary/transactionTags';
 
@@ -55,7 +54,6 @@ describe('Performance > Transaction Tags', function () {
     mockUseLocation.mockReturnValue(
       LocationFixture({pathname: '/organizations/org-slug/performance/summary/tags/'})
     );
-    browserHistory.replace = jest.fn();
     MockApiClient.addMockResponse({
       url: '/organizations/org-slug/projects/',
       body: [],
@@ -152,6 +150,10 @@ describe('Performance > Transaction Tags', function () {
       url: '/organizations/org-slug/replay-count/',
       body: {},
     });
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/recent-searches/',
+      body: [],
+    });
   });
 
   afterEach(function () {
@@ -181,7 +183,7 @@ describe('Performance > Transaction Tags', function () {
     expect(screen.getByText('Heat Map')).toBeInTheDocument();
 
     await waitFor(() => {
-      expect(browserHistory.replace).toHaveBeenCalledWith({
+      expect(router.replace).toHaveBeenCalledWith({
         query: {
           project: '1',
           statsPeriod: '14d',
@@ -208,7 +210,7 @@ describe('Performance > Transaction Tags', function () {
     });
 
     await waitFor(() => {
-      expect(browserHistory.replace).toHaveBeenCalledWith({
+      expect(router.replace).toHaveBeenCalledWith({
         query: {
           project: '1',
           statsPeriod: '14d',
@@ -247,7 +249,7 @@ describe('Performance > Transaction Tags', function () {
     });
 
     await waitFor(() => {
-      expect(browserHistory.replace).toHaveBeenCalledWith({
+      expect(router.replace).toHaveBeenCalledWith({
         query: {
           project: '1',
           statsPeriod: '14d',
@@ -309,7 +311,7 @@ describe('Performance > Transaction Tags', function () {
     expect(await screen.findByText('Suspect Tags')).toBeInTheDocument();
 
     await waitFor(() => {
-      expect(browserHistory.replace).toHaveBeenCalledWith({
+      expect(router.replace).toHaveBeenCalledWith({
         query: {
           project: '1',
           statsPeriod: '14d',
@@ -329,7 +331,7 @@ describe('Performance > Transaction Tags', function () {
     await userEvent.click(screen.getByLabelText('Next'));
 
     await waitFor(() =>
-      expect(browserHistory.push).toHaveBeenCalledWith({
+      expect(router.push).toHaveBeenCalledWith({
         pathname: '/organizations/org-slug/performance/summary/tags/',
         query: {
           project: '1',
@@ -345,7 +347,7 @@ describe('Performance > Transaction Tags', function () {
     await userEvent.click(screen.getByRole('radio', {name: 'effectiveConnectionType'}));
 
     await waitFor(() => {
-      expect(browserHistory.replace).toHaveBeenCalledWith({
+      expect(router.replace).toHaveBeenCalledWith({
         query: {
           project: '1',
           statsPeriod: '14d',
diff --git a/static/app/views/performance/transactionSummary/transactionTags/tagValueTable.tsx b/static/app/views/performance/transactionSummary/transactionTags/tagValueTable.tsx
index 2de135267d8448..386bef7631ba93 100644
--- a/static/app/views/performance/transactionSummary/transactionTags/tagValueTable.tsx
+++ b/static/app/views/performance/transactionSummary/transactionTags/tagValueTable.tsx
@@ -104,7 +104,7 @@ export class TagValueTable extends Component<Props, State> {
     columns: TagsTableColumn[]
   ) => {
     return (column: TableColumn<TagsTableColumnKeys>, index: number): React.ReactNode =>
-      this.renderHeadCell(sortedEventView, tableMeta, column, columns[index]);
+      this.renderHeadCell(sortedEventView, tableMeta, column, columns[index]!);
   };
 
   handleTagValueClick = (location: Location, tagKey: string, tagValue: string) => {
diff --git a/static/app/views/performance/transactionSummary/transactionTags/tagsDisplay.tsx b/static/app/views/performance/transactionSummary/transactionTags/tagsDisplay.tsx
index c0629bd4fc87c2..313503e93099e0 100644
--- a/static/app/views/performance/transactionSummary/transactionTags/tagsDisplay.tsx
+++ b/static/app/views/performance/transactionSummary/transactionTags/tagsDisplay.tsx
@@ -5,11 +5,11 @@ import type {GridColumnOrder} from 'sentry/components/gridEditable';
 import type {CursorHandler} from 'sentry/components/pagination';
 import type {Organization} from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import type EventView from 'sentry/utils/discover/eventView';
 import SegmentExplorerQuery from 'sentry/utils/performance/segmentExplorer/segmentExplorerQuery';
 import TagKeyHistogramQuery from 'sentry/utils/performance/segmentExplorer/tagKeyHistogramQuery';
 import {decodeScalar, decodeSorts} from 'sentry/utils/queryString';
+import {useNavigate} from 'sentry/utils/useNavigate';
 
 import TagsHeatMap from './tagsHeatMap';
 import {TagValueTable} from './tagValueTable';
@@ -98,11 +98,12 @@ export const TAGS_TABLE_COLUMN_ORDER: TagsTableColumn[] = [
 ];
 
 function TagsDisplay(props: Props) {
+  const navigate = useNavigate();
   const {eventView: _eventView, location, organization, aggregateColumn, tagKey} = props;
   const eventView = _eventView.clone();
 
   const handleCursor: CursorHandler = (cursor, pathname, query) =>
-    browserHistory.push({
+    navigate({
       pathname,
       query: {...query, [TAG_PAGE_TABLE_CURSOR]: cursor},
     });
diff --git a/static/app/views/performance/transactionSummary/transactionTags/tagsHeatMap.tsx b/static/app/views/performance/transactionSummary/transactionTags/tagsHeatMap.tsx
index 8ae290d2b127b9..3997e91a32d935 100644
--- a/static/app/views/performance/transactionSummary/transactionTags/tagsHeatMap.tsx
+++ b/static/app/views/performance/transactionSummary/transactionTags/tagsHeatMap.tsx
@@ -131,7 +131,7 @@ function TagsHeatMap(
     : undefined;
   const tagData = tableData?.tags?.data ? tableData.tags.data : undefined;
 
-  const rowKey = histogramData && findRowKey(histogramData[0]);
+  const rowKey = histogramData && findRowKey(histogramData[0]!);
 
   // Reverse since e-charts takes the axis labels in the opposite order.
   const columnNames = tagData ? tagData.map(tag => tag.tags_value).reverse() : [];
@@ -154,7 +154,7 @@ function TagsHeatMap(
 
   _data?.sort((a, b) => {
     const i = b[0] === a[0] ? 1 : 0;
-    return b[i] - a[i];
+    return b[i]! - a[i]!;
   });
 
   // TODO(k-fish): Cleanup options
@@ -252,7 +252,7 @@ function TagsHeatMap(
     if (histogramBucketInfo && histogramData) {
       const row = histogramData[bucket.dataIndex];
       const currentBucketStart = parseInt(
-        `${row[histogramBucketInfo.histogramField]}`,
+        `${row![histogramBucketInfo.histogramField]}`,
         10
       );
       const currentBucketEnd = currentBucketStart + histogramBucketInfo.bucketSize;
@@ -354,9 +354,9 @@ function TagsHeatMap(
                     {[...(transactionTableData?.data ?? [])].slice(0, 3).map(row => {
                       const target = generateLinkToEventInTraceView({
                         eventId: row.id,
-                        traceSlug: row.trace?.toString(),
-                        projectSlug: (row.project || row['project.name']).toString(),
-                        timestamp: row.timestamp,
+                        traceSlug: row.trace?.toString()!,
+                        projectSlug: (row.project || row['project.name'])!.toString(),
+                        timestamp: row.timestamp!,
                         location: {
                           ...location,
                           query: {
@@ -401,7 +401,8 @@ function TagsHeatMap(
       </PositionWrapper>
     );
 
-  const histogramBucketInfo = histogramData && parseHistogramBucketInfo(histogramData[0]);
+  const histogramBucketInfo =
+    histogramData && parseHistogramBucketInfo(histogramData[0]!);
 
   return (
     <StyledPanel>
diff --git a/static/app/views/performance/transactionSummary/transactionTags/utils.tsx b/static/app/views/performance/transactionSummary/transactionTags/utils.tsx
index 843e1988da0c6f..f34a2472840d79 100644
--- a/static/app/views/performance/transactionSummary/transactionTags/utils.tsx
+++ b/static/app/views/performance/transactionSummary/transactionTags/utils.tsx
@@ -77,8 +77,8 @@ export function parseHistogramBucketInfo(row: {[key: string]: React.ReactText})
   const parts = field.split('_');
   return {
     histogramField: field,
-    bucketSize: parseInt(parts[parts.length - 3], 10),
-    offset: parseInt(parts[parts.length - 2], 10),
-    multiplier: parseInt(parts[parts.length - 1], 10),
+    bucketSize: parseInt(parts[parts.length - 3]!, 10),
+    offset: parseInt(parts[parts.length - 2]!, 10),
+    multiplier: parseInt(parts[parts.length - 1]!, 10),
   };
 }
diff --git a/static/app/views/performance/transactionSummary/transactionThresholdButton.spec.tsx b/static/app/views/performance/transactionSummary/transactionThresholdButton.spec.tsx
index 15e3e1f7a910d5..17db2b26a85be4 100644
--- a/static/app/views/performance/transactionSummary/transactionThresholdButton.spec.tsx
+++ b/static/app/views/performance/transactionSummary/transactionThresholdButton.spec.tsx
@@ -10,10 +10,15 @@ import {
 } from 'sentry-test/reactTestingLibrary';
 
 import ProjectsStore from 'sentry/stores/projectsStore';
+import type {Organization} from 'sentry/types/organization';
 import EventView from 'sentry/utils/discover/eventView';
 import TransactionThresholdButton from 'sentry/views/performance/transactionSummary/transactionThresholdButton';
 
-function renderComponent(eventView, organization, onChangeThreshold) {
+function renderComponent(
+  eventView: EventView,
+  organization: Organization,
+  onChangeThreshold: () => void
+) {
   return render(
     <TransactionThresholdButton
       eventView={eventView}
diff --git a/static/app/views/performance/transactionSummary/transactionVitals/content.tsx b/static/app/views/performance/transactionSummary/transactionVitals/content.tsx
index d2bb31e92410d4..fae91952a75974 100644
--- a/static/app/views/performance/transactionSummary/transactionVitals/content.tsx
+++ b/static/app/views/performance/transactionSummary/transactionVitals/content.tsx
@@ -5,24 +5,24 @@ import type {Location} from 'history';
 import {Alert} from 'sentry/components/alert';
 import {Button} from 'sentry/components/button';
 import {CompactSelect} from 'sentry/components/compactSelect';
-import SearchBar from 'sentry/components/events/searchBar';
 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 {normalizeDateTimeParams} from 'sentry/components/organizations/pageFilters/parse';
+import {TransactionSearchQueryBuilder} from 'sentry/components/performance/transactionSearchQueryBuilder';
 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 {browserHistory} from 'sentry/utils/browserHistory';
 import type EventView from 'sentry/utils/discover/eventView';
 import type {WebVital} from 'sentry/utils/fields';
 import Histogram from 'sentry/utils/performance/histogram';
 import {FILTER_OPTIONS} from 'sentry/utils/performance/histogram/constants';
 import VitalsCardsDiscoverQuery from 'sentry/utils/performance/vitals/vitalsCardsDiscoverQuery';
 import {decodeScalar} from 'sentry/utils/queryString';
+import {useNavigate} from 'sentry/utils/useNavigate';
 
 import {VITAL_GROUPS, ZOOM_KEYS} from './constants';
 import {isMissingVitalsData} from './utils';
@@ -36,6 +36,7 @@ type Props = {
 
 function VitalsContent(props: Props) {
   const {location, organization, eventView} = props;
+  const navigate = useNavigate();
   const query = decodeScalar(location.query.query, '');
 
   const handleSearch = (newQuery: string) => {
@@ -47,7 +48,7 @@ function VitalsContent(props: Props) {
     // do not propagate pagination when making a new search
     delete queryParams.cursor;
 
-    browserHistory.push({
+    navigate({
       pathname: location.pathname,
       query: queryParams,
     });
@@ -92,13 +93,14 @@ function VitalsContent(props: Props) {
                       <EnvironmentPageFilter />
                       <DatePageFilter />
                     </PageFilterBar>
-                    <StyledSearchBar
-                      organization={organization}
-                      projectIds={eventView.project}
-                      query={query}
-                      fields={eventView.fields}
-                      onSearch={handleSearch}
-                    />
+                    <StyledSearchBarWrapper>
+                      <TransactionSearchQueryBuilder
+                        projects={eventView.project}
+                        initialQuery={query}
+                        onSearch={handleSearch}
+                        searchSource="transaction_events"
+                      />
+                    </StyledSearchBarWrapper>
                     <CompactSelect
                       value={activeFilter.value}
                       options={FILTER_OPTIONS}
@@ -157,10 +159,10 @@ const FilterActions = styled('div')`
   }
 `;
 
-const StyledSearchBar = styled(SearchBar)`
+const StyledSearchBarWrapper = styled('div')`
   @media (min-width: ${p => p.theme.breakpoints.small}) {
     order: 1;
-    grid-column: 1/5;
+    grid-column: 1/6;
   }
 
   @media (min-width: ${p => p.theme.breakpoints.xlarge}) {
diff --git a/static/app/views/performance/transactionSummary/transactionVitals/index.spec.tsx b/static/app/views/performance/transactionSummary/transactionVitals/index.spec.tsx
index 1503cdce733888..07233b73b0d9b2 100644
--- a/static/app/views/performance/transactionSummary/transactionVitals/index.spec.tsx
+++ b/static/app/views/performance/transactionSummary/transactionVitals/index.spec.tsx
@@ -14,8 +14,8 @@ import {
 
 import ProjectsStore from 'sentry/stores/projectsStore';
 import type {Project} from 'sentry/types/project';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import TransactionVitals from 'sentry/views/performance/transactionSummary/transactionVitals';
 import {
   VITAL_GROUPS,
@@ -25,6 +25,9 @@ import {
 jest.mock('sentry/utils/useLocation');
 
 const mockUseLocation = jest.mocked(useLocation);
+jest.mock('sentry/utils/useNavigate');
+
+const mockUseNavigate = jest.mocked(useNavigate);
 
 interface HistogramData {
   count: number;
@@ -100,7 +103,7 @@ describe('Performance > Web Vitals', function () {
     mockUseLocation.mockReturnValue(
       LocationFixture({pathname: '/organizations/org-slug/performance/summary'})
     );
-    // eslint-disable-next-line no-console
+
     jest.spyOn(console, 'error').mockImplementation(jest.fn());
 
     MockApiClient.addMockResponse({
@@ -175,6 +178,10 @@ describe('Performance > Web Vitals', function () {
       url: '/organizations/org-slug/replay-count/',
       body: {},
     });
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/recent-searches/',
+      body: [],
+    });
   });
 
   afterEach(() => {
@@ -224,14 +231,11 @@ describe('Performance > Web Vitals', function () {
   describe('renders all vitals cards correctly', function () {
     const {organization, router} = initialize();
 
-    beforeEach(() => {
+    it.each(vitals)('Renders %s', async function (vital) {
       render(
         <TransactionVitals organization={organization} location={router.location} />,
         {router, organization}
       );
-    });
-
-    it.each(vitals)('Renders %s', async function (vital) {
       expect(await screen.findByText(vital.heading)).toBeInTheDocument();
       expect(await screen.findByText(vital.baseline)).toBeInTheDocument();
     });
@@ -296,6 +300,8 @@ describe('Performance > Web Vitals', function () {
     });
 
     it('resets view properly', async function () {
+      const mockNavigate = jest.fn();
+      mockUseNavigate.mockReturnValue(mockNavigate);
       const {organization, router} = initialize({
         query: {
           fidStart: '20',
@@ -310,7 +316,7 @@ describe('Performance > Web Vitals', function () {
 
       await userEvent.click(screen.getByRole('button', {name: 'Reset View'}));
 
-      expect(browserHistory.push).toHaveBeenCalledWith({
+      expect(mockNavigate).toHaveBeenCalledWith({
         query: expect.not.objectContaining(
           ZOOM_KEYS.reduce((obj, key) => {
             obj[key] = expect.anything();
diff --git a/static/app/views/performance/transactionSummary/transactionVitals/utils.spec.tsx b/static/app/views/performance/transactionSummary/transactionVitals/utils.spec.tsx
index 58817bc23eb6ae..620a127eb1568c 100644
--- a/static/app/views/performance/transactionSummary/transactionVitals/utils.spec.tsx
+++ b/static/app/views/performance/transactionSummary/transactionVitals/utils.spec.tsx
@@ -26,8 +26,8 @@ describe('Utils', function () {
         {bin: 20, count: 0},
       ];
 
-      expect(findNearestBucketIndex(data, 5)).toEqual(-1);
-      expect(findNearestBucketIndex(data, 9.9999)).toEqual(-1);
+      expect(findNearestBucketIndex(data, 5)).toBe(-1);
+      expect(findNearestBucketIndex(data, 9.9999)).toBe(-1);
     });
 
     it('returns the correct bin for the x axis', function () {
@@ -38,21 +38,21 @@ describe('Utils', function () {
         {bin: 40, count: 0},
       ];
 
-      expect(findNearestBucketIndex(data, 10)).toEqual(0);
-      expect(findNearestBucketIndex(data, 12)).toEqual(0);
-      expect(findNearestBucketIndex(data, 18.111)).toEqual(0);
-      expect(findNearestBucketIndex(data, 19.999)).toEqual(0);
-      expect(findNearestBucketIndex(data, 20)).toEqual(1);
-      expect(findNearestBucketIndex(data, 25)).toEqual(1);
-      expect(findNearestBucketIndex(data, 28.123)).toEqual(1);
-      expect(findNearestBucketIndex(data, 29.321)).toEqual(1);
-      expect(findNearestBucketIndex(data, 30)).toEqual(2);
-      expect(findNearestBucketIndex(data, 30.421)).toEqual(2);
-      expect(findNearestBucketIndex(data, 32.521)).toEqual(2);
-      expect(findNearestBucketIndex(data, 39.921)).toEqual(2);
-      expect(findNearestBucketIndex(data, 40)).toEqual(3);
-      expect(findNearestBucketIndex(data, 40.992)).toEqual(3);
-      expect(findNearestBucketIndex(data, 49.992)).toEqual(3);
+      expect(findNearestBucketIndex(data, 10)).toBe(0);
+      expect(findNearestBucketIndex(data, 12)).toBe(0);
+      expect(findNearestBucketIndex(data, 18.111)).toBe(0);
+      expect(findNearestBucketIndex(data, 19.999)).toBe(0);
+      expect(findNearestBucketIndex(data, 20)).toBe(1);
+      expect(findNearestBucketIndex(data, 25)).toBe(1);
+      expect(findNearestBucketIndex(data, 28.123)).toBe(1);
+      expect(findNearestBucketIndex(data, 29.321)).toBe(1);
+      expect(findNearestBucketIndex(data, 30)).toBe(2);
+      expect(findNearestBucketIndex(data, 30.421)).toBe(2);
+      expect(findNearestBucketIndex(data, 32.521)).toBe(2);
+      expect(findNearestBucketIndex(data, 39.921)).toBe(2);
+      expect(findNearestBucketIndex(data, 40)).toBe(3);
+      expect(findNearestBucketIndex(data, 40.992)).toBe(3);
+      expect(findNearestBucketIndex(data, 49.992)).toBe(3);
     });
   });
 
diff --git a/static/app/views/performance/transactionSummary/transactionVitals/utils.tsx b/static/app/views/performance/transactionSummary/transactionVitals/utils.tsx
index 77b62a4a3ceb60..674de62487b0ff 100644
--- a/static/app/views/performance/transactionSummary/transactionVitals/utils.tsx
+++ b/static/app/views/performance/transactionSummary/transactionVitals/utils.tsx
@@ -55,14 +55,14 @@ export function findNearestBucketIndex(
 ): number | null {
   const width = getBucketWidth(chartData);
   // it's possible that the data is not available yet or the x axis is out of range
-  if (!chartData.length || xAxis >= chartData[chartData.length - 1].bin + width) {
+  if (!chartData.length || xAxis >= chartData[chartData.length - 1]!.bin + width) {
     return null;
   }
-  if (xAxis < chartData[0].bin) {
+  if (xAxis < chartData[0]!.bin) {
     return -1;
   }
 
-  return Math.floor((xAxis - chartData[0].bin) / width);
+  return Math.floor((xAxis - chartData[0]!.bin) / width);
 }
 
 /**
@@ -81,12 +81,12 @@ export function getRefRect(chartData: HistogramData): Rectangle | null {
   for (let i = 0; i < chartData.length; i++) {
     const data1 = chartData[i];
     for (let j = i + 1; j < chartData.length; j++) {
-      const data2 = chartData[j];
+      const data2 = chartData[j]!;
 
-      if (data1.bin !== data2.bin && data1.count !== data2.count) {
+      if (data1!.bin !== data2!.bin && data1!.count !== data2!.count) {
         return {
-          point1: {x: i, y: Math.min(data1.count, data2.count)},
-          point2: {x: j, y: Math.max(data1.count, data2.count)},
+          point1: {x: i, y: Math.min(data1!.count, data2!.count)},
+          point2: {x: j, y: Math.max(data1!.count, data2!.count)},
         };
       }
     }
@@ -110,7 +110,7 @@ export function asPixelRect(chartRef: ECharts, dataRect: Rectangle): Rectangle |
     dataRect.point1.y,
   ]);
 
-  if (isNaN(point1?.[0]) || isNaN(point1?.[1])) {
+  if (isNaN(point1?.[0]!) || isNaN(point1?.[1]!)) {
     return null;
   }
 
@@ -119,13 +119,13 @@ export function asPixelRect(chartRef: ECharts, dataRect: Rectangle): Rectangle |
     dataRect.point2.y,
   ]);
 
-  if (isNaN(point2?.[0]) || isNaN(point2?.[1])) {
+  if (isNaN(point2?.[0]!) || isNaN(point2?.[1]!)) {
     return null;
   }
 
   return {
-    point1: {x: point1[0], y: point1[1]},
-    point2: {x: point2[0], y: point2[1]},
+    point1: {x: point1[0]!, y: point1[1]!},
+    point2: {x: point2[0]!, y: point2[1]!},
   };
 }
 
diff --git a/static/app/views/performance/transactionSummary/transactionVitals/vitalCard.tsx b/static/app/views/performance/transactionSummary/transactionVitals/vitalCard.tsx
index f5f9d8f514c2f8..6a5c4c99af9c0b 100644
--- a/static/app/views/performance/transactionSummary/transactionVitals/vitalCard.tsx
+++ b/static/app/views/performance/transactionSummary/transactionVitals/vitalCard.tsx
@@ -360,7 +360,7 @@ class VitalCard extends Component<Props, State> {
     // We can assume that all buckets are of equal width, use the first two
     // buckets to get the width. The value of each histogram function indicates
     // the beginning of the bucket.
-    return chartData.length >= 2 ? chartData[1].bin - chartData[0].bin : 0;
+    return chartData.length >= 2 ? chartData[1]!.bin - chartData[0]!.bin : 0;
   }
 
   getSeries() {
diff --git a/static/app/views/performance/transactionSummary/transactionVitals/vitalsPanel.tsx b/static/app/views/performance/transactionSummary/transactionVitals/vitalsPanel.tsx
index 48307abf1ff924..73c817900740be 100644
--- a/static/app/views/performance/transactionSummary/transactionVitals/vitalsPanel.tsx
+++ b/static/app/views/performance/transactionSummary/transactionVitals/vitalsPanel.tsx
@@ -131,7 +131,7 @@ class VitalsPanel extends Component<Props> {
                       error,
                       data,
                       histogram,
-                      [colors[index]],
+                      [colors[index]!],
                       parseBound(start, precision),
                       parseBound(end, precision),
                       precision
diff --git a/static/app/views/performance/transactionSummary/utils.tsx b/static/app/views/performance/transactionSummary/utils.tsx
index 456cb4b9e630e4..73763f9bd76ee4 100644
--- a/static/app/views/performance/transactionSummary/utils.tsx
+++ b/static/app/views/performance/transactionSummary/utils.tsx
@@ -165,9 +165,9 @@ export function generateTransactionIdLink(transactionName?: string, view?: Domai
   ): LocationDescriptor => {
     return generateLinkToEventInTraceView({
       eventId: tableRow.id,
-      timestamp: tableRow.timestamp,
-      traceSlug: tableRow.trace?.toString(),
-      projectSlug: tableRow['project.name']?.toString(),
+      timestamp: tableRow.timestamp!,
+      traceSlug: tableRow.trace?.toString()!,
+      projectSlug: tableRow['project.name']?.toString()!,
       location,
       organization,
       spanId,
diff --git a/static/app/views/performance/trends/content.tsx b/static/app/views/performance/trends/content.tsx
index 17d1a8f25eeabc..bbb65c2633c2f9 100644
--- a/static/app/views/performance/trends/content.tsx
+++ b/static/app/views/performance/trends/content.tsx
@@ -230,7 +230,7 @@ class TrendsContent extends Component<Props, State> {
                     organization={organization}
                     eventView={trendView}
                     onSearch={this.handleSearch}
-                    query={this.getFreeTextFromQuery(query)}
+                    query={this.getFreeTextFromQuery(query)!}
                   />
                 ) : (
                   <StyledSearchBar
diff --git a/static/app/views/performance/trends/index.spec.tsx b/static/app/views/performance/trends/index.spec.tsx
index ad5a8e86f517d9..571f22ce9bf268 100644
--- a/static/app/views/performance/trends/index.spec.tsx
+++ b/static/app/views/performance/trends/index.spec.tsx
@@ -17,7 +17,6 @@ import {
 
 import PageFiltersStore from 'sentry/stores/pageFiltersStore';
 import ProjectsStore from 'sentry/stores/projectsStore';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {WebVital} from 'sentry/utils/fields';
 import {useLocation} from 'sentry/utils/useLocation';
 import TrendsIndex from 'sentry/views/performance/trends/';
@@ -94,7 +93,7 @@ function _initializeData(
     newSettings.selectedProject = selectedProject.id;
   }
 
-  newSettings.selectedProject = settings.selectedProject ?? newSettings.projects[0].id;
+  newSettings.selectedProject = settings.selectedProject ?? newSettings.projects[0]!.id;
   const data = initializeData(newSettings);
 
   // Modify page filters store to stop rerendering due to the test harness.
@@ -109,7 +108,7 @@ function _initializeData(
   PageFiltersStore.updateDateTime(defaultTrendsSelectionDate);
   if (!options?.selectedProjectId) {
     PageFiltersStore.updateProjects(
-      settings.selectedProject ? [Number(newSettings.projects[0].id)] : [],
+      settings.selectedProject ? [Number(newSettings.projects[0]!.id)] : [],
       []
     );
   }
@@ -176,7 +175,6 @@ describe('Performance > Trends', function () {
       state: undefined,
     });
 
-    browserHistory.push = jest.fn();
     MockApiClient.addMockResponse({
       url: '/organizations/org-slug/projects/',
       body: [],
@@ -323,7 +321,7 @@ describe('Performance > Trends', function () {
 
     const transactions = await screen.findAllByTestId('trends-list-item-improved');
     expect(transactions).toHaveLength(2);
-    const firstTransaction = transactions[0];
+    const firstTransaction = transactions[0]!;
 
     const summaryLink = within(firstTransaction).getByTestId('item-transaction-name');
 
@@ -347,7 +345,7 @@ describe('Performance > Trends', function () {
 
     const transactions = await screen.findAllByTestId('trends-list-item-improved');
     expect(transactions).toHaveLength(2);
-    const firstTransaction = transactions[0];
+    const firstTransaction = transactions[0]!;
 
     await userEvent.click(
       within(firstTransaction).getByRole('button', {name: 'Actions'})
@@ -357,10 +355,10 @@ describe('Performance > Trends', function () {
       expect(menuActions).toHaveLength(3);
     });
 
-    const menuAction = within(firstTransaction).getAllByRole('menuitemradio')[2];
+    const menuAction = within(firstTransaction).getAllByRole('menuitemradio')[2]!;
     await clickEl(menuAction);
 
-    expect(browserHistory.push).toHaveBeenCalledWith({
+    expect(data.router.push).toHaveBeenCalledWith({
       pathname: '/trends/',
       query: expect.objectContaining({
         project: expect.anything(),
@@ -385,7 +383,7 @@ describe('Performance > Trends', function () {
     enterSearch(input, 'transaction.duration:>9000');
 
     await waitFor(() =>
-      expect(browserHistory.push).toHaveBeenCalledWith({
+      expect(data.router.push).toHaveBeenCalledWith({
         pathname: '/trends/',
         query: expect.objectContaining({
           project: ['1'],
@@ -411,7 +409,7 @@ describe('Performance > Trends', function () {
 
     const transactions = await screen.findAllByTestId('trends-list-item-improved');
     expect(transactions).toHaveLength(2);
-    const firstTransaction = transactions[0];
+    const firstTransaction = transactions[0]!;
 
     await userEvent.click(
       within(firstTransaction).getByRole('button', {name: 'Actions'})
@@ -421,10 +419,10 @@ describe('Performance > Trends', function () {
       expect(menuActions).toHaveLength(3);
     });
 
-    const menuAction = within(firstTransaction).getAllByRole('menuitemradio')[0];
+    const menuAction = within(firstTransaction).getAllByRole('menuitemradio')[0]!;
     await clickEl(menuAction);
 
-    expect(browserHistory.push).toHaveBeenCalledWith({
+    expect(data.router.push).toHaveBeenCalledWith({
       pathname: '/trends/',
       query: expect.objectContaining({
         project: expect.anything(),
@@ -447,7 +445,7 @@ describe('Performance > Trends', function () {
 
     const transactions = await screen.findAllByTestId('trends-list-item-improved');
     expect(transactions).toHaveLength(2);
-    const firstTransaction = transactions[0];
+    const firstTransaction = transactions[0]!;
 
     await userEvent.click(
       within(firstTransaction).getByRole('button', {name: 'Actions'})
@@ -457,10 +455,10 @@ describe('Performance > Trends', function () {
       expect(menuActions).toHaveLength(3);
     });
 
-    const menuAction = within(firstTransaction).getAllByRole('menuitemradio')[1];
+    const menuAction = within(firstTransaction).getAllByRole('menuitemradio')[1]!;
     await clickEl(menuAction);
 
-    expect(browserHistory.push).toHaveBeenCalledWith({
+    expect(data.router.push).toHaveBeenCalledWith({
       pathname: '/trends/',
       query: expect.objectContaining({
         project: expect.anything(),
@@ -490,7 +488,7 @@ describe('Performance > Trends', function () {
       const option = screen.getByRole('option', {name: trendFunction.label});
       await clickEl(option);
 
-      expect(browserHistory.push).toHaveBeenCalledWith({
+      expect(data.router.push).toHaveBeenCalledWith({
         pathname: '/trends/',
         query: expect.objectContaining({
           regressionCursor: undefined,
@@ -570,7 +568,7 @@ describe('Performance > Trends', function () {
       const option = screen.getByRole('option', {name: parameter.label});
       await clickEl(option);
 
-      expect(browserHistory.push).toHaveBeenCalledWith({
+      expect(data.router.push).toHaveBeenCalledWith({
         pathname: '/trends/',
         query: expect.objectContaining({
           trendParameter: parameter.label,
@@ -719,7 +717,7 @@ describe('Performance > Trends', function () {
     );
 
     await waitFor(() =>
-      expect(browserHistory.push).toHaveBeenNthCalledWith(
+      expect(data.router.push).toHaveBeenNthCalledWith(
         1,
         expect.objectContaining({
           query: {
@@ -747,7 +745,7 @@ describe('Performance > Trends', function () {
       }
     );
 
-    (browserHistory.push as any).mockReset();
+    jest.mocked(data.router.push).mockReset();
 
     const byTransactionLink = await screen.findByTestId('breadcrumb-link');
 
diff --git a/static/app/views/performance/trends/utils/index.tsx b/static/app/views/performance/trends/utils/index.tsx
index 469d0f8718735f..5dbedecd5f5242 100644
--- a/static/app/views/performance/trends/utils/index.tsx
+++ b/static/app/views/performance/trends/utils/index.tsx
@@ -158,7 +158,7 @@ export function getCurrentTrendFunction(
   const trendFunctionField =
     _trendFunctionField ?? decodeScalar(location?.query?.trendFunction);
   const trendFunction = TRENDS_FUNCTIONS.find(({field}) => field === trendFunctionField);
-  return trendFunction || TRENDS_FUNCTIONS[1];
+  return trendFunction || TRENDS_FUNCTIONS[1]!;
 }
 
 function getDefaultTrendParameter(
@@ -166,7 +166,7 @@ function getDefaultTrendParameter(
   projectIds: Readonly<number[]>
 ): TrendParameter {
   const performanceType = platformToPerformanceType(projects, projectIds);
-  const trendParameter = performanceTypeToTrendParameterLabel(performanceType);
+  const trendParameter = performanceTypeToTrendParameterLabel(performanceType!);
 
   return trendParameter;
 }
diff --git a/static/app/views/performance/utils/getIntervalLine.tsx b/static/app/views/performance/utils/getIntervalLine.tsx
index 8d3f5144d2f6fa..32eac66e4bae63 100644
--- a/static/app/views/performance/utils/getIntervalLine.tsx
+++ b/static/app/views/performance/utils/getIntervalLine.tsx
@@ -21,14 +21,14 @@ export function getIntervalLine(
   transaction?: NormalizedTrendsTransaction,
   useRegressionFormat?: boolean
 ): LineChartSeries[] {
-  if (!transaction || !series.length || !series[0].data || !series[0].data.length) {
+  if (!transaction || !series.length || !series[0]!.data || !series[0]!.data.length) {
     return [];
   }
 
   const transformedTransaction = transformTransaction(transaction);
 
-  const seriesStart = parseInt(series[0].data[0].name as string, 10);
-  const seriesEnd = parseInt(series[0].data.slice(-1)[0].name as string, 10);
+  const seriesStart = parseInt(series[0]!.data[0]!.name as string, 10);
+  const seriesEnd = parseInt(series[0]!.data.slice(-1)[0]!.name as string, 10);
 
   if (seriesEnd < seriesStart) {
     return [];
diff --git a/static/app/views/performance/vitalDetail/index.spec.tsx b/static/app/views/performance/vitalDetail/index.spec.tsx
index 43ab65ef900071..69c97b01369288 100644
--- a/static/app/views/performance/vitalDetail/index.spec.tsx
+++ b/static/app/views/performance/vitalDetail/index.spec.tsx
@@ -2,13 +2,18 @@ import {MetricsFieldFixture} from 'sentry-fixture/metrics';
 import {OrganizationFixture} from 'sentry-fixture/organization';
 
 import {initializeOrg} from 'sentry-test/initializeOrg';
-import {render, screen, userEvent, within} from 'sentry-test/reactTestingLibrary';
+import {
+  render,
+  screen,
+  userEvent,
+  waitFor,
+  within,
+} from 'sentry-test/reactTestingLibrary';
 import {textWithMarkupMatcher} from 'sentry-test/utils';
 
 import ProjectsStore from 'sentry/stores/projectsStore';
 import TeamStore from 'sentry/stores/teamStore';
 import type {InjectedRouter} from 'sentry/types/legacyReactRouter';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {WebVital} from 'sentry/utils/fields';
 import {Browser} from 'sentry/utils/performance/vitals/constants';
 import {DEFAULT_STATS_PERIOD} from 'sentry/views/performance/data';
@@ -68,7 +73,6 @@ describe('Performance > VitalDetail', function () {
   beforeEach(function () {
     TeamStore.loadInitialData([], false, null);
     ProjectsStore.loadInitialData([project]);
-    browserHistory.push = jest.fn();
     MockApiClient.addMockResponse({
       url: `/organizations/${organization.slug}/projects/`,
       body: [],
@@ -145,7 +149,9 @@ describe('Performance > VitalDetail', function () {
       },
       match: [
         (_url, options) => {
-          return options.query?.field?.find(f => f === 'p50(measurements.lcp)');
+          return (options.query?.field as string[])?.some(
+            f => f === 'p50(measurements.lcp)'
+          );
         },
       ],
     });
@@ -183,7 +189,9 @@ describe('Performance > VitalDetail', function () {
       },
       match: [
         (_url, options) => {
-          return options.query?.field?.find(f => f === 'p50(measurements.cls)');
+          return (options.query?.field as string[])?.some(
+            f => f === 'p50(measurements.cls)'
+          );
         },
       ],
     });
@@ -224,7 +232,9 @@ describe('Performance > VitalDetail', function () {
     });
 
     // It shows a search bar
-    expect(await screen.findByLabelText('Search events')).toBeInTheDocument();
+    expect(
+      await screen.findByPlaceholderText('Search for events, users, tags, and more')
+    ).toBeInTheDocument();
 
     // It shows the vital card
     expect(
@@ -249,13 +259,18 @@ describe('Performance > VitalDetail', function () {
     });
 
     // Fill out the search box, and submit it.
-    await userEvent.click(await screen.findByLabelText('Search events'));
+    await userEvent.click(
+      await screen.findByPlaceholderText('Search for events, users, tags, and more')
+    );
     await userEvent.paste('user.email:uhoh*');
     await userEvent.keyboard('{enter}');
 
     // Check the navigation.
-    expect(browserHistory.push).toHaveBeenCalledTimes(1);
-    expect(browserHistory.push).toHaveBeenCalledWith({
+    await waitFor(() => {
+      expect(router.push).toHaveBeenCalledTimes(1);
+    });
+
+    expect(router.push).toHaveBeenCalledWith({
       pathname: undefined,
       query: {
         project: '1',
@@ -380,8 +395,8 @@ describe('Performance > VitalDetail', function () {
     expect(menuItem).toBeInTheDocument();
     await userEvent.click(menuItem);
 
-    expect(browserHistory.push).toHaveBeenCalledTimes(1);
-    expect(browserHistory.push).toHaveBeenCalledWith({
+    expect(newRouter.push).toHaveBeenCalledTimes(1);
+    expect(newRouter.push).toHaveBeenCalledWith({
       pathname: undefined,
       query: {
         project: 1,
diff --git a/static/app/views/performance/vitalDetail/table.tsx b/static/app/views/performance/vitalDetail/table.tsx
index 22ccd6e5557727..c457549654e954 100644
--- a/static/app/views/performance/vitalDetail/table.tsx
+++ b/static/app/views/performance/vitalDetail/table.tsx
@@ -226,7 +226,7 @@ class Table extends Component<Props, State> {
       : undefined;
     if (tableMeta) {
       Object.keys(tableMeta).forEach(key => {
-        aggregateAliasTableMeta![getAggregateAlias(key)] = tableMeta[key];
+        aggregateAliasTableMeta![getAggregateAlias(key)] = tableMeta[key]!;
       });
     }
 
diff --git a/static/app/views/performance/vitalDetail/vitalChart.tsx b/static/app/views/performance/vitalDetail/vitalChart.tsx
index b0bbed7c071f62..5e7da67a8a52db 100644
--- a/static/app/views/performance/vitalDetail/vitalChart.tsx
+++ b/static/app/views/performance/vitalDetail/vitalChart.tsx
@@ -184,7 +184,7 @@ function VitalChart({
 
 export default VitalChart;
 
-export type _VitalChartProps = {
+export type VitalChartInnerProps = {
   field: string;
   grid: LineChartProps['grid'];
   loading: boolean;
@@ -201,7 +201,7 @@ export type _VitalChartProps = {
 
 function fieldToVitalType(
   seriesName: string,
-  vitalFields: _VitalChartProps['vitalFields']
+  vitalFields: VitalChartInnerProps['vitalFields']
 ): VitalState | undefined {
   if (seriesName === vitalFields?.poorCountField.replace('equation|', '')) {
     return VitalState.POOR;
@@ -216,7 +216,7 @@ function fieldToVitalType(
   return undefined;
 }
 
-export function _VitalChart(props: _VitalChartProps) {
+export function VitalChartInner(props: VitalChartInnerProps) {
   const {
     field: yAxis,
     data: _results,
diff --git a/static/app/views/performance/vitalDetail/vitalChartMetrics.tsx b/static/app/views/performance/vitalDetail/vitalChartMetrics.tsx
index dee7a597b0d1ba..5bef62fc9608a5 100644
--- a/static/app/views/performance/vitalDetail/vitalChartMetrics.tsx
+++ b/static/app/views/performance/vitalDetail/vitalChartMetrics.tsx
@@ -102,7 +102,7 @@ function VitalChartMetrics({
               seriesName: field,
               data: response.intervals.map((intervalValue, intervalIndex) => ({
                 name: moment(intervalValue).valueOf(),
-                value: group.series ? group.series[field][intervalIndex] : 0,
+                value: group.series ? group.series[field]![intervalIndex] : 0,
               })),
             })) as Series[] | undefined;
 
diff --git a/static/app/views/performance/vitalDetail/vitalDetailContent.tsx b/static/app/views/performance/vitalDetail/vitalDetailContent.tsx
index 1b410d8885d352..f145493aa01fe2 100644
--- a/static/app/views/performance/vitalDetail/vitalDetailContent.tsx
+++ b/static/app/views/performance/vitalDetail/vitalDetailContent.tsx
@@ -11,7 +11,6 @@ import {getInterval} from 'sentry/components/charts/utils';
 import {CreateAlertFromViewButton} from 'sentry/components/createAlertButton';
 import type {MenuItemProps} from 'sentry/components/dropdownMenu';
 import {DropdownMenu} from 'sentry/components/dropdownMenu';
-import SearchBar from 'sentry/components/events/searchBar';
 import * as Layout from 'sentry/components/layouts/thirds';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
 import {DatePageFilter} from 'sentry/components/organizations/datePageFilter';
@@ -20,6 +19,7 @@ import PageFilterBar from 'sentry/components/organizations/pageFilterBar';
 import {normalizeDateTimeParams} from 'sentry/components/organizations/pageFilters/parse';
 import {ProjectPageFilter} from 'sentry/components/organizations/projectPageFilter';
 import * as TeamKeyTransactionManager from 'sentry/components/performance/teamKeyTransactionsManager';
+import {TransactionSearchQueryBuilder} from 'sentry/components/performance/transactionSearchQueryBuilder';
 import {IconCheckmark, IconClose} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
@@ -176,7 +176,7 @@ function VitalDetailContent(props: Props) {
   function renderContent(vital: WebVital) {
     const {location, organization, eventView, projects} = props;
 
-    const {fields, start, end, statsPeriod, environment, project} = eventView;
+    const {start, end, statsPeriod, environment, project} = eventView;
 
     const query = decodeScalar(location.query.query, '');
     const orgSlug = organization.slug;
@@ -197,14 +197,14 @@ function VitalDetailContent(props: Props) {
             <EnvironmentPageFilter />
             <DatePageFilter />
           </PageFilterBar>
-          <SearchBar
-            searchSource="performance_vitals"
-            organization={organization}
-            projectIds={project}
-            query={query}
-            fields={fields}
-            onSearch={handleSearch}
-          />
+          <StyledSearchBarWrapper>
+            <TransactionSearchQueryBuilder
+              projects={project}
+              initialQuery={query}
+              onSearch={handleSearch}
+              searchSource="performance_vitals"
+            />
+          </StyledSearchBarWrapper>
         </FilterActions>
         <VitalChart
           organization={organization}
@@ -331,3 +331,15 @@ const FilterActions = styled('div')`
     grid-template-columns: auto 1fr;
   }
 `;
+
+const StyledSearchBarWrapper = styled('div')`
+  @media (min-width: ${p => p.theme.breakpoints.small}) {
+    order: 1;
+    grid-column: 1/6;
+  }
+
+  @media (min-width: ${p => p.theme.breakpoints.xlarge}) {
+    order: initial;
+    grid-column: auto;
+  }
+`;
diff --git a/static/app/views/profiling/content.tsx b/static/app/views/profiling/content.tsx
index 989cdae0fae4f4..29187163c0a67a 100644
--- a/static/app/views/profiling/content.tsx
+++ b/static/app/views/profiling/content.tsx
@@ -4,7 +4,7 @@ import type {Location} from 'history';
 
 import {Alert} from 'sentry/components/alert';
 import {Button, LinkButton} from 'sentry/components/button';
-import SearchBar from 'sentry/components/events/searchBar';
+import type {SmartSearchBarProps} from 'sentry/components/deprecatedSmartSearchBar';
 import FeedbackWidgetButton from 'sentry/components/feedback/widget/feedbackWidgetButton';
 import * as Layout from 'sentry/components/layouts/thirds';
 import {DatePageFilter} from 'sentry/components/organizations/datePageFilter';
@@ -23,9 +23,7 @@ import {
 import {ProfileEventsTable} from 'sentry/components/profiling/profileEventsTable';
 import SentryDocumentTitle from 'sentry/components/sentryDocumentTitle';
 import {SidebarPanelKey} from 'sentry/components/sidebar/types';
-import type {SmartSearchBarProps} from 'sentry/components/smartSearchBar';
 import {TabList, Tabs} from 'sentry/components/tabs';
-import {MAX_QUERY_LENGTH} from 'sentry/constants';
 import {ALL_ACCESS_PROJECTS} from 'sentry/constants/pageFilters';
 import {t} from 'sentry/locale';
 import SidebarPanelStore from 'sentry/stores/sidebarPanelStore';
@@ -228,23 +226,12 @@ function ProfilingTransactionsContent(props: ProfilingTabContentProps) {
           <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}
-          />
-        )}
+        <TransactionSearchQueryBuilder
+          projects={selection.projects}
+          initialQuery={query}
+          onSearch={handleSearch}
+          searchSource="profile_landing"
+        />
       </ActionBar>
       {props.shouldShowProfilingOnboardingPanel ? (
         <ProfilingOnboardingCTA />
diff --git a/static/app/views/profiling/continuousProfileFlamegraph.tsx b/static/app/views/profiling/continuousProfileFlamegraph.tsx
index 23c61ec7a291b8..b0229968780e7e 100644
--- a/static/app/views/profiling/continuousProfileFlamegraph.tsx
+++ b/static/app/views/profiling/continuousProfileFlamegraph.tsx
@@ -89,7 +89,7 @@ function ContinuousProfileFlamegraph(): React.ReactElement {
       <FlamegraphStateProvider initialState={initialFlamegraphPreferencesState}>
         <ProfileGroupTypeProvider
           input={profiles.type === 'resolved' ? profiles.data : null}
-          traceID={params.eventID}
+          traceID={params.eventID!}
         >
           <FlamegraphThemeProvider>
             <FlamegraphStateQueryParamSync />
diff --git a/static/app/views/profiling/differentialFlamegraph.tsx b/static/app/views/profiling/differentialFlamegraph.tsx
index c2ee9d50e0f0f1..314d9784513039 100644
--- a/static/app/views/profiling/differentialFlamegraph.tsx
+++ b/static/app/views/profiling/differentialFlamegraph.tsx
@@ -130,7 +130,7 @@ function DifferentialFlamegraphView() {
     },
 
     // We skip position.view dependency because it will go into an infinite loop
-    // eslint-disable-next-line react-hooks/exhaustive-deps
+
     [differentialFlamegraph.differentialFlamegraph, flamegraphCanvas, flamegraphTheme]
   );
 
diff --git a/static/app/views/profiling/landing/functionTrendsWidget.tsx b/static/app/views/profiling/landing/functionTrendsWidget.tsx
index f5b854da3f31d8..f9141a35f0a3a4 100644
--- a/static/app/views/profiling/landing/functionTrendsWidget.tsx
+++ b/static/app/views/profiling/landing/functionTrendsWidget.tsx
@@ -244,7 +244,7 @@ function FunctionTrendsEntry({
     const beforeTarget = generateProfileRouteFromProfileReference({
       orgSlug: organization.slug,
       projectSlug: project.slug,
-      reference: beforeExamples[beforeExamples.length - 2][1],
+      reference: beforeExamples[beforeExamples.length - 2]![1],
       frameName: func.function as string,
       framePackage: func.package as string,
     });
@@ -258,7 +258,7 @@ function FunctionTrendsEntry({
     const afterTarget = generateProfileRouteFromProfileReference({
       orgSlug: organization.slug,
       projectSlug: project.slug,
-      reference: afterExamples[afterExamples.length - 2][1],
+      reference: afterExamples[afterExamples.length - 2]![1],
       frameName: func.function as string,
       framePackage: func.package as string,
     });
@@ -331,9 +331,9 @@ function FunctionTrendsChart({func, trendFunction}: FunctionTrendsChartProps) {
       color: getTrendLineColor(func.change, theme),
     };
 
-    const seriesStart = func.stats.data[0][0] * 1e3;
+    const seriesStart = func.stats.data[0]![0] * 1e3;
     const seriesMid = func.breakpoint * 1e3;
-    const seriesEnd = func.stats.data[func.stats.data.length - 1][0] * 1e3;
+    const seriesEnd = func.stats.data[func.stats.data.length - 1]![0] * 1e3;
 
     const dividingLine = {
       data: [],
diff --git a/static/app/views/profiling/landing/slowestFunctionsWidget.spec.tsx b/static/app/views/profiling/landing/slowestFunctionsWidget.spec.tsx
index 7a33c442595804..17ba767868dba2 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 {getAllByRole, render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
+import {render, screen, userEvent, within} from 'sentry-test/reactTestingLibrary';
 
 import ProjectsStore from 'sentry/stores/projectsStore';
 import {SlowestFunctionsWidget} from 'sentry/views/profiling/landing/slowestFunctionsWidget';
@@ -244,11 +244,11 @@ describe('SlowestFunctionsWidget', function () {
     expect(await screen.findByTestId('function-chart')).toBeInTheDocument();
 
     const items = screen.getAllByRole('listitem', {});
-    expect(items.length).toEqual(2);
+    expect(items).toHaveLength(2);
 
-    const buttons = getAllByRole(items[0], 'button', {});
-    expect(buttons.length).toEqual(2);
-    await userEvent.click(buttons[1]);
+    const buttons = within(items[0]!).getAllByRole('button');
+    expect(buttons).toHaveLength(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 eaad7c5d40327e..0d9c9501e12f0b 100644
--- a/static/app/views/profiling/landing/slowestFunctionsWidget.tsx
+++ b/static/app/views/profiling/landing/slowestFunctionsWidget.tsx
@@ -231,7 +231,7 @@ function SlowestFunctionEntry<F extends BreakdownFunction>({
   const project = projects.find(p => p.id === String(func['project.id']));
 
   const score = Math.ceil((((func['sum()'] as number) ?? 0) / totalDuration) * BARS);
-  const palette = new Array(BARS).fill([CHART_PALETTE[0][0]]);
+  const palette = new Array(BARS).fill([CHART_PALETTE[0]![0]!]);
 
   const frame = useMemo(() => {
     return new Frame(
@@ -265,7 +265,7 @@ function SlowestFunctionEntry<F extends BreakdownFunction>({
         const timestamp = (
           <TimeSince
             unitStyle="extraShort"
-            date={timestamps[i] * 1000}
+            date={timestamps[i]! * 1000}
             tooltipShowSeconds
           />
         );
@@ -377,7 +377,7 @@ function FunctionChart<F extends BreakdownFunction>({
         data: timestamps.map((timestamp, i) => {
           return {
             name: timestamp * 1000,
-            value: rawData.values[i],
+            value: rawData.values[i]!,
           };
         }),
         seriesName: breakdownFunction,
diff --git a/static/app/views/profiling/landingAggregateFlamegraph.tsx b/static/app/views/profiling/landingAggregateFlamegraph.tsx
index 8f719f40a16e48..9bc7c550c340e2 100644
--- a/static/app/views/profiling/landingAggregateFlamegraph.tsx
+++ b/static/app/views/profiling/landingAggregateFlamegraph.tsx
@@ -706,6 +706,11 @@ const AggregateFlamegraphFunctionName = styled('button')`
   border: none;
   background: none;
   cursor: pointer;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 100%;
+  text-align: left;
 `;
 
 const AggregateFlamegraphFunctionBreakdownContainer = styled('div')`
diff --git a/static/app/views/profiling/profileFlamechart.tsx b/static/app/views/profiling/profileFlamechart.tsx
index 8dc30a79634fe4..f3d94db77b0ad3 100644
--- a/static/app/views/profiling/profileFlamechart.tsx
+++ b/static/app/views/profiling/profileFlamechart.tsx
@@ -90,7 +90,7 @@ function ProfileFlamegraph(): React.ReactElement {
       <FlamegraphStateProvider initialState={initialFlamegraphPreferencesState}>
         <ProfileGroupTypeProvider
           input={profiles.type === 'resolved' ? profiles.data : null}
-          traceID={params.eventID}
+          traceID={params.eventID!}
         >
           <FlamegraphThemeProvider>
             <FlamegraphStateQueryParamSync />
diff --git a/static/app/views/profiling/profileSummary/index.tsx b/static/app/views/profiling/profileSummary/index.tsx
index 6299cbc9a76b1b..03c1e057879f47 100644
--- a/static/app/views/profiling/profileSummary/index.tsx
+++ b/static/app/views/profiling/profileSummary/index.tsx
@@ -7,8 +7,8 @@ import {CompactSelect} from 'sentry/components/compactSelect';
 import type {SelectOption} from 'sentry/components/compactSelect/types';
 import Count from 'sentry/components/count';
 import {DateTime} from 'sentry/components/dateTime';
+import type {SmartSearchBarProps} from 'sentry/components/deprecatedSmartSearchBar';
 import ErrorBoundary from 'sentry/components/errorBoundary';
-import SearchBar from 'sentry/components/events/searchBar';
 import FeedbackWidgetButton from 'sentry/components/feedback/widget/feedbackWidgetButton';
 import IdBadge from 'sentry/components/idBadge';
 import * as Layout from 'sentry/components/layouts/thirds';
@@ -27,9 +27,7 @@ import type {ProfilingBreadcrumbsProps} from 'sentry/components/profiling/profil
 import {ProfilingBreadcrumbs} from 'sentry/components/profiling/profilingBreadcrumbs';
 import {SegmentedControl} from 'sentry/components/segmentedControl';
 import SentryDocumentTitle from 'sentry/components/sentryDocumentTitle';
-import type {SmartSearchBarProps} from 'sentry/components/smartSearchBar';
 import {TabList, Tabs} from 'sentry/components/tabs';
-import {MAX_QUERY_LENGTH} from 'sentry/constants';
 import {IconPanel} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
@@ -160,7 +158,7 @@ function ProfileSummaryHeader(props: ProfileSummaryHeaderProps) {
         <StyledHeaderActions>
           <FeedbackWidgetButton />
           <LinkButton to={transactionSummaryTarget} size="sm">
-            {t('View Transaction Summary')}
+            {t('View Summary')}
           </LinkButton>
         </StyledHeaderActions>
       )}
@@ -231,23 +229,12 @@ function ProfileFilters(props: ProfileFiltersProps) {
         <EnvironmentPageFilter />
         <DatePageFilter />
       </PageFilterBar>
-      {props.organization.features.includes('search-query-builder-performance') ? (
-        <TransactionSearchQueryBuilder
-          projects={projectIds}
-          initialQuery={props.query}
-          onSearch={handleSearch}
-          searchSource="transaction_profiles"
-        />
-      ) : (
-        <SearchBar
-          searchSource="profile_summary"
-          organization={props.organization}
-          projectIds={projectIds}
-          query={props.query}
-          onSearch={handleSearch}
-          maxQueryLength={MAX_QUERY_LENGTH}
-        />
-      )}
+      <TransactionSearchQueryBuilder
+        projects={projectIds}
+        initialQuery={props.query}
+        onSearch={handleSearch}
+        searchSource="transaction_profiles"
+      />
     </ActionBar>
   );
 }
diff --git a/static/app/views/profiling/profileSummary/regressedProfileFunctions.tsx b/static/app/views/profiling/profileSummary/regressedProfileFunctions.tsx
index 805c47ec93ef44..b01ec795597fd4 100644
--- a/static/app/views/profiling/profileSummary/regressedProfileFunctions.tsx
+++ b/static/app/views/profiling/profileSummary/regressedProfileFunctions.tsx
@@ -15,7 +15,6 @@ 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 {browserHistory} from 'sentry/utils/browserHistory';
 import {formatPercentage} from 'sentry/utils/number/formatPercentage';
 import type {FunctionTrend, TrendType} from 'sentry/utils/profiling/hooks/types';
 import {useCurrentProjectFromRouteParam} from 'sentry/utils/profiling/hooks/useCurrentProjectFromRouteParam';
@@ -28,6 +27,7 @@ import {relativeChange} from 'sentry/utils/profiling/units/units';
 import {decodeScalar} from 'sentry/utils/queryString';
 import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 
 import {ProfilingSparklineChart} from './profilingSparklineChart';
@@ -57,10 +57,9 @@ function findBreakPointIndex(
   let mid = 0;
   let bestMatch: number = examples.length;
 
-  // eslint-disable-next-line
   while (low <= high) {
     mid = Math.floor((low + high) / 2);
-    const value = examples[mid][0];
+    const value = examples[mid]![0];
 
     if (breakpoint === value) {
       return mid;
@@ -94,21 +93,21 @@ function findWorstProfileIDBeforeAndAfter(trend: FunctionTrend): {
     if (!defined(trend.examples[i])) {
       continue;
     }
-    if (trend.examples[i][0] < trend.breakpoint - STABILITY_WINDOW) {
+    if (trend.examples[i]![0] < trend.breakpoint - STABILITY_WINDOW) {
       break;
     }
 
-    beforeProfile = trend.examples[i][1];
+    beforeProfile = trend.examples[i]![1];
   }
 
   for (let i = breakPointIndex; i < trend.examples.length; i++) {
     if (!defined(trend.examples[i])) {
       continue;
     }
-    if (trend.examples[i][0] > trend.breakpoint + STABILITY_WINDOW) {
+    if (trend.examples[i]![0] > trend.breakpoint + STABILITY_WINDOW) {
       break;
     }
-    afterProfile = trend.examples[i][1];
+    afterProfile = trend.examples[i]![1];
   }
 
   return {
@@ -124,6 +123,7 @@ interface MostRegressedProfileFunctionsProps {
 export function MostRegressedProfileFunctions(props: MostRegressedProfileFunctionsProps) {
   const organization = useOrganization();
   const project = useCurrentProjectFromRouteParam();
+  const navigate = useNavigate();
   const location = useLocation();
   const theme = useTheme();
 
@@ -132,12 +132,15 @@ export function MostRegressedProfileFunctions(props: MostRegressedProfileFunctio
     [location.query]
   );
 
-  const handleRegressedFunctionsCursor = useCallback((cursor, pathname, query) => {
-    browserHistory.push({
-      pathname,
-      query: {...query, [REGRESSED_FUNCTIONS_CURSOR]: cursor},
-    });
-  }, []);
+  const handleRegressedFunctionsCursor = useCallback(
+    (cursor, pathname, query) => {
+      navigate({
+        pathname,
+        query: {...query, [REGRESSED_FUNCTIONS_CURSOR]: cursor},
+      });
+    },
+    [navigate]
+  );
 
   const functionQuery = useMemo(() => {
     const conditions = new MutableSearch('');
@@ -240,8 +243,8 @@ export function MostRegressedProfileFunctions(props: MostRegressedProfileFunctio
                   aggregate_range_1={fn.aggregate_range_1}
                   aggregate_range_2={fn.aggregate_range_2}
                   breakpoint={fn.breakpoint}
-                  start={fn.stats.data[0][0]}
-                  end={fn.stats.data[fn.stats.data.length - 1][0]}
+                  start={fn.stats.data[0]![0]}
+                  end={fn.stats.data[fn.stats.data.length - 1]![0]}
                 />
               </RegressedFunctionSparklineContainer>
             </RegressedFunctionRow>
diff --git a/static/app/views/profiling/profileSummary/slowestProfileFunctions.tsx b/static/app/views/profiling/profileSummary/slowestProfileFunctions.tsx
index f28c449a65b189..fa7106408662ad 100644
--- a/static/app/views/profiling/profileSummary/slowestProfileFunctions.tsx
+++ b/static/app/views/profiling/profileSummary/slowestProfileFunctions.tsx
@@ -15,7 +15,6 @@ 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 {browserHistory} from 'sentry/utils/browserHistory';
 import {Frame} from 'sentry/utils/profiling/frame';
 import type {EventsResultsDataRow} from 'sentry/utils/profiling/hooks/types';
 import {useCurrentProjectFromRouteParam} from 'sentry/utils/profiling/hooks/useCurrentProjectFromRouteParam';
@@ -25,6 +24,7 @@ import {generateProfileRouteFromProfileReference} from 'sentry/utils/profiling/r
 import {decodeScalar} from 'sentry/utils/queryString';
 import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 
 const SLOWEST_FUNCTIONS_LIMIT = 15;
@@ -45,12 +45,13 @@ interface SlowestProfileFunctionsProps {
 }
 
 export function SlowestProfileFunctions(props: SlowestProfileFunctionsProps) {
+  const navigate = useNavigate();
+  const location = useLocation();
   const organization = useOrganization();
   const project = useCurrentProjectFromRouteParam();
   const [functionType, setFunctionType] = useState<'application' | 'system' | 'all'>(
     'application'
   );
-  const location = useLocation();
   const functionsCursor = useMemo(
     () => decodeScalar(location.query[SLOWEST_FUNCTIONS_CURSOR]),
     [location.query]
@@ -68,12 +69,14 @@ export function SlowestProfileFunctions(props: SlowestProfileFunctionsProps) {
     [location.query.functionsSort]
   );
 
-  const handleFunctionsCursor = useCallback((cursor, pathname, query) => {
-    browserHistory.push({
-      pathname,
-      query: {...query, [SLOWEST_FUNCTIONS_CURSOR]: cursor},
-    });
-  }, []);
+  const handleFunctionsCursor = useCallback(
+    (cursor, pathname, query) =>
+      navigate({
+        pathname,
+        query: {...query, [SLOWEST_FUNCTIONS_CURSOR]: cursor},
+      }),
+    [navigate]
+  );
 
   const query = useMemo(() => {
     const conditions = new MutableSearch('');
diff --git a/static/app/views/profiling/profilesProvider.tsx b/static/app/views/profiling/profilesProvider.tsx
index aeb86d60327215..98b7b07c88a872 100644
--- a/static/app/views/profiling/profilesProvider.tsx
+++ b/static/app/views/profiling/profilesProvider.tsx
@@ -91,7 +91,7 @@ function ProfilesAndTransactionProvider(props: FlamegraphViewProps): React.React
 
   const profileTransaction = useSentryEvent<EventTransaction>(
     organization.slug,
-    params.projectId,
+    params.projectId!,
     profiles.type === 'resolved' ? getTransactionId(profiles.data) : null
   );
 
@@ -99,14 +99,14 @@ function ProfilesAndTransactionProvider(props: FlamegraphViewProps): React.React
     <ProfilesProvider
       onUpdateProfiles={setProfiles}
       orgSlug={organization.slug}
-      profileId={params.eventId}
-      projectSlug={params.projectId}
+      profileId={params.eventId!}
+      projectSlug={params.projectId!}
     >
       <SetProfileProvider.Provider value={setProfiles}>
         <ProfileTransactionContext.Provider value={profileTransaction}>
           <ProfileHeader
-            eventId={params.eventId}
-            projectId={params.projectId}
+            eventId={params.eventId!}
+            projectId={params.projectId!}
             transaction={
               profileTransaction.type === 'resolved' ? profileTransaction.data : null
             }
diff --git a/static/app/views/projectDetail/charts/projectSessionsAnrRequest.tsx b/static/app/views/projectDetail/charts/projectSessionsAnrRequest.tsx
index 1fd437a805d61d..4482511c574e14 100644
--- a/static/app/views/projectDetail/charts/projectSessionsAnrRequest.tsx
+++ b/static/app/views/projectDetail/charts/projectSessionsAnrRequest.tsx
@@ -103,9 +103,9 @@ function ProjectSessionsAnrRequest({
       const totalUsers = filteredResponse.groups.reduce(
         (acc, group) =>
           acc +
-          group.series['count_unique(user)']
-            .slice(shouldFetchWithPrevious ? dataMiddleIndex : 0)
-            .reduce((value, groupAcc) => groupAcc + value, 0),
+          group.series['count_unique(user)']!.slice(
+            shouldFetchWithPrevious ? dataMiddleIndex : 0
+          ).reduce((value, groupAcc) => groupAcc + value, 0),
         0
       );
 
@@ -116,9 +116,10 @@ function ProjectSessionsAnrRequest({
         ? filteredResponse.groups.reduce(
             (acc, group) =>
               acc +
-              group.series['count_unique(user)']
-                .slice(0, dataMiddleIndex)
-                .reduce((value, groupAcc) => groupAcc + value, 0),
+              group.series['count_unique(user)']!.slice(0, dataMiddleIndex).reduce(
+                (value, groupAcc) => groupAcc + value,
+                0
+              ),
             0
           )
         : 0;
@@ -134,7 +135,7 @@ function ProjectSessionsAnrRequest({
                   acc +
                   group.series[yAxis]?.slice(
                     shouldFetchWithPrevious ? dataMiddleIndex : 0
-                  )[i],
+                  )[i]!,
                 0
               );
 
@@ -174,7 +175,8 @@ function ProjectSessionsAnrRequest({
               .slice(0, dataMiddleIndex)
               .map((_interval, i) => {
                 const previousAnrRate = filteredResponse.groups.reduce(
-                  (acc, group) => acc + group.series[yAxis]?.slice(0, dataMiddleIndex)[i],
+                  (acc, group) =>
+                    acc + group.series[yAxis]?.slice(0, dataMiddleIndex)[i]!,
                   0
                 );
 
diff --git a/static/app/views/projectDetail/charts/projectSessionsChartRequest.tsx b/static/app/views/projectDetail/charts/projectSessionsChartRequest.tsx
index ce30e2b87add2d..6857c357e99c02 100644
--- a/static/app/views/projectDetail/charts/projectSessionsChartRequest.tsx
+++ b/static/app/views/projectDetail/charts/projectSessionsChartRequest.tsx
@@ -141,7 +141,7 @@ class ProjectSessionsChartRequest extends Component<
         await Promise.all(requests);
 
       const filteredResponse = filterSessionsInTimeWindow(
-        response,
+        response!,
         queryParams.start,
         queryParams.end
       );
@@ -149,7 +149,7 @@ class ProjectSessionsChartRequest extends Component<
       const {timeseriesData, previousTimeseriesData, totalCount} =
         displayMode === DisplayModes.SESSIONS
           ? this.transformSessionCountData(filteredResponse)
-          : this.transformData(filteredResponse, totalCountResponse, {
+          : this.transformData(filteredResponse, totalCountResponse!, {
               fetchedWithPrevious: shouldFetchWithPrevious,
             });
 
@@ -161,9 +161,9 @@ class ProjectSessionsChartRequest extends Component<
         reloading: false,
         timeseriesData,
         previousTimeseriesData,
-        totalSessions: totalCount,
+        totalSessions: totalCount!,
       });
-      onTotalValuesChange(totalCount);
+      onTotalValuesChange(totalCount!);
     } catch {
       addErrorMessage(t('Error loading chart data'));
       this.setState({
@@ -254,9 +254,9 @@ class ProjectSessionsChartRequest extends Component<
           .slice(fetchedWithPrevious ? dataMiddleIndex : 0)
           .map((interval, i) => {
             const crashedSessionsPercent =
-              responseData.groups[0]?.series[field].slice(
+              responseData.groups[0]?.series[field]!.slice(
                 fetchedWithPrevious ? dataMiddleIndex : 0
-              )[i] * 100;
+              )[i]! * 100;
 
             return {
               name: interval,
@@ -271,7 +271,7 @@ class ProjectSessionsChartRequest extends Component<
           seriesName: t('Previous Period'),
           data: responseData.intervals.slice(0, dataMiddleIndex).map((_interval, i) => {
             const crashedSessionsPercent =
-              responseData.groups[0]?.series[field].slice(0, dataMiddleIndex)[i] * 100;
+              responseData.groups[0]?.series[field]!.slice(0, dataMiddleIndex)[i]! * 100;
 
             return {
               name: responseData.intervals[i + dataMiddleIndex],
@@ -282,7 +282,7 @@ class ProjectSessionsChartRequest extends Component<
       : null;
 
     const totalCount =
-      totalCountResponse?.groups[0].totals[
+      totalCountResponse?.groups[0]!.totals[
         this.props.displayMode === DisplayModes.STABILITY_USERS
           ? SessionFieldWithOperation.USERS
           : SessionFieldWithOperation.SESSIONS
@@ -307,7 +307,7 @@ class ProjectSessionsChartRequest extends Component<
 
     const chartData = [
       {
-        ...sessionsChart[SessionStatus.HEALTHY],
+        ...sessionsChart[SessionStatus.HEALTHY]!,
         data: getCountSeries(
           SessionFieldWithOperation.SESSIONS,
           groups.find(g => g.by['session.status'] === SessionStatus.HEALTHY),
@@ -315,7 +315,7 @@ class ProjectSessionsChartRequest extends Component<
         ),
       },
       {
-        ...sessionsChart[SessionStatus.ERRORED],
+        ...sessionsChart[SessionStatus.ERRORED]!,
         data: getCountSeries(
           SessionFieldWithOperation.SESSIONS,
           groups.find(g => g.by['session.status'] === SessionStatus.ERRORED),
@@ -323,7 +323,7 @@ class ProjectSessionsChartRequest extends Component<
         ),
       },
       {
-        ...sessionsChart[SessionStatus.ABNORMAL],
+        ...sessionsChart[SessionStatus.ABNORMAL]!,
         data: getCountSeries(
           SessionFieldWithOperation.SESSIONS,
           groups.find(g => g.by['session.status'] === SessionStatus.ABNORMAL),
@@ -331,7 +331,7 @@ class ProjectSessionsChartRequest extends Component<
         ),
       },
       {
-        ...sessionsChart[SessionStatus.CRASHED],
+        ...sessionsChart[SessionStatus.CRASHED]!,
         data: getCountSeries(
           SessionFieldWithOperation.SESSIONS,
           groups.find(g => g.by['session.status'] === SessionStatus.CRASHED),
diff --git a/static/app/views/projectDetail/index.spec.tsx b/static/app/views/projectDetail/index.spec.tsx
index 1d55343767cec8..93d7b3ad383e9f 100644
--- a/static/app/views/projectDetail/index.spec.tsx
+++ b/static/app/views/projectDetail/index.spec.tsx
@@ -13,7 +13,7 @@ describe('ProjectDetail', function () {
   beforeEach(() => {
     PageFiltersStore.reset();
     ProjectsStore.reset();
-    // eslint-disable-next-line no-console
+
     jest.spyOn(console, 'error').mockImplementation(jest.fn());
 
     MockApiClient.addMockResponse({
diff --git a/static/app/views/projectDetail/projectCharts.tsx b/static/app/views/projectDetail/projectCharts.tsx
index e31bbf262961ac..42e5c564ceabc7 100644
--- a/static/app/views/projectDetail/projectCharts.tsx
+++ b/static/app/views/projectDetail/projectCharts.tsx
@@ -120,7 +120,7 @@ class ProjectCharts extends Component<Props, State> {
       .map(urlKey => {
         return decodeScalar(
           location.query[urlKey],
-          this.defaultDisplayModes[visibleCharts.findIndex(value => value === urlKey)]
+          this.defaultDisplayModes[visibleCharts.findIndex(value => value === urlKey)]!
         );
       });
   }
@@ -351,7 +351,7 @@ class ProjectCharts extends Component<Props, State> {
                   router={router}
                   organization={organization}
                   onTotalValuesChange={this.handleTotalValuesChange}
-                  colors={[CHART_PALETTE[0][0], theme.purple200]}
+                  colors={[CHART_PALETTE[0]![0]!, theme.purple200]}
                 />
               )}
               {displayMode === DisplayModes.FAILURE_RATE && (
@@ -509,7 +509,7 @@ class ProjectCharts extends Component<Props, State> {
               <InlineContainer>
                 <OptionSelector
                   title={t('Display')}
-                  selected={displayMode}
+                  selected={displayMode!}
                   options={this.displayModes}
                   onChange={this.handleDisplayModeChange}
                 />
diff --git a/static/app/views/projectDetail/projectDetail.spec.tsx b/static/app/views/projectDetail/projectDetail.spec.tsx
index b00110f0bc06c0..b987ee03575eab 100644
--- a/static/app/views/projectDetail/projectDetail.spec.tsx
+++ b/static/app/views/projectDetail/projectDetail.spec.tsx
@@ -14,7 +14,7 @@ jest.mock('sentry/actionCreators/organization');
 
 describe('ProjectDetail', function () {
   const {organization, router, projects} = initializeOrg();
-  const project = projects[0];
+  const project = projects[0]!;
 
   beforeEach(function () {
     ProjectsStore.init();
diff --git a/static/app/views/projectDetail/projectDetail.tsx b/static/app/views/projectDetail/projectDetail.tsx
index ef09c0800936de..9758ad2433664c 100644
--- a/static/app/views/projectDetail/projectDetail.tsx
+++ b/static/app/views/projectDetail/projectDetail.tsx
@@ -83,7 +83,7 @@ export default function ProjectDetail({router, location, organization}: Props) {
   }, [hasTransactions, hasSessions]);
 
   const onRetryProjects = useCallback(() => {
-    fetchOrganizationDetails(api, params.orgId, true, false);
+    fetchOrganizationDetails(api, params.orgId!, true, false);
   }, [api, params.orgId]);
 
   const handleSearch = useCallback(
@@ -102,7 +102,7 @@ export default function ProjectDetail({router, location, organization}: Props) {
   const tagValueLoader = useCallback(
     (key: string, search: string) => {
       return fetchTagValues({
-        api: api,
+        api,
         orgSlug: organization.slug,
         tagKey: key,
         search,
@@ -255,7 +255,7 @@ export default function ProjectDetail({router, location, organization}: Props) {
                     <ProjectIssues
                       organization={organization}
                       location={location}
-                      projectId={selection.projects[0]}
+                      projectId={selection.projects[0]!}
                       query={query}
                       api={api}
                     />
@@ -267,14 +267,14 @@ export default function ProjectDetail({router, location, organization}: Props) {
                 <Feature features="incidents" organization={organization}>
                   <ProjectLatestAlerts
                     organization={organization}
-                    projectSlug={params.projectId}
+                    projectSlug={params.projectId!}
                     location={location}
                     isProjectStabilized={isProjectStabilized}
                   />
                 </Feature>
                 <ProjectLatestReleases
                   organization={organization}
-                  projectSlug={params.projectId}
+                  projectSlug={params.projectId!}
                   location={location}
                   isProjectStabilized={isProjectStabilized}
                   project={project}
diff --git a/static/app/views/projectDetail/projectScoreCards/projectAnrScoreCard.spec.tsx b/static/app/views/projectDetail/projectScoreCards/projectAnrScoreCard.spec.tsx
index 713f0524c9722a..59d1e6ac2448f6 100644
--- a/static/app/views/projectDetail/projectScoreCards/projectAnrScoreCard.spec.tsx
+++ b/static/app/views/projectDetail/projectScoreCards/projectAnrScoreCard.spec.tsx
@@ -1,5 +1,5 @@
 import {initializeOrg} from 'sentry-test/initializeOrg';
-import {render, screen, waitFor} from 'sentry-test/reactTestingLibrary';
+import {render, screen} from 'sentry-test/reactTestingLibrary';
 
 import type {PageFilters} from 'sentry/types/core';
 import {ProjectAnrScoreCard} from 'sentry/views/projectDetail/projectScoreCards/projectAnrScoreCard';
@@ -109,8 +109,8 @@ describe('ProjectDetail > ProjectAnr', function () {
       })
     );
 
-    await waitFor(() => expect(screen.getByText('11.56%')).toBeInTheDocument());
-    await waitFor(() => expect(screen.getByText('3%')).toBeInTheDocument());
+    await screen.findByText('11.56%');
+    await screen.findByText('3%');
   });
 
   it('renders open in issues CTA', async function () {
@@ -128,7 +128,7 @@ describe('ProjectDetail > ProjectAnr', function () {
       }
     );
 
-    await waitFor(() => expect(screen.getByText('11.56%')).toBeInTheDocument());
+    await screen.findByText('11.56%');
 
     expect(screen.getByRole('button', {name: 'View Issues'})).toHaveAttribute(
       'href',
diff --git a/static/app/views/projectDetail/projectScoreCards/projectApdexScoreCard.tsx b/static/app/views/projectDetail/projectScoreCards/projectApdexScoreCard.tsx
index 80a08d12453503..93e8e7974cc722 100644
--- a/static/app/views/projectDetail/projectScoreCards/projectApdexScoreCard.tsx
+++ b/static/app/views/projectDetail/projectScoreCards/projectApdexScoreCard.tsx
@@ -61,7 +61,7 @@ const useApdex = (props: Props) => {
         },
       },
     ],
-    {staleTime: 0, enabled: isEnabled}
+    {staleTime: Infinity, enabled: isEnabled}
   );
 
   const isPreviousPeriodEnabled = shouldFetchPreviousPeriod({
@@ -82,7 +82,7 @@ const useApdex = (props: Props) => {
       },
     ],
     {
-      staleTime: 0,
+      staleTime: Infinity,
       enabled: isEnabled && isPreviousPeriodEnabled,
     }
   );
diff --git a/static/app/views/projectDetail/projectScoreCards/projectStabilityScoreCard.tsx b/static/app/views/projectDetail/projectScoreCards/projectStabilityScoreCard.tsx
index 0166282dcbf938..2873a789d3b247 100644
--- a/static/app/views/projectDetail/projectScoreCards/projectStabilityScoreCard.tsx
+++ b/static/app/views/projectDetail/projectScoreCards/projectStabilityScoreCard.tsx
@@ -68,7 +68,7 @@ const useCrashFreeRate = (props: Props) => {
         },
       },
     ],
-    {staleTime: 0, enabled: isEnabled}
+    {staleTime: Infinity, enabled: isEnabled}
   );
 
   const isPreviousPeriodEnabled = shouldFetchPreviousPeriod({
@@ -89,7 +89,7 @@ const useCrashFreeRate = (props: Props) => {
       },
     ],
     {
-      staleTime: 0,
+      staleTime: Infinity,
       enabled: isEnabled && isPreviousPeriodEnabled,
     }
   );
@@ -128,11 +128,11 @@ function ProjectStabilityScoreCard(props: Props) {
 
   const score = !crashFreeRate
     ? undefined
-    : crashFreeRate?.groups[0]?.totals[props.field] * 100;
+    : crashFreeRate?.groups[0]?.totals[props.field]! * 100;
 
   const previousScore = !previousCrashFreeRate
     ? undefined
-    : previousCrashFreeRate?.groups[0]?.totals[props.field] * 100;
+    : previousCrashFreeRate?.groups[0]?.totals[props.field]! * 100;
 
   if (hasSessions === false) {
     return (
diff --git a/static/app/views/projectDetail/projectScoreCards/projectVelocityScoreCard.tsx b/static/app/views/projectDetail/projectScoreCards/projectVelocityScoreCard.tsx
index 0e38ebd1b09401..b773a3a8b9545e 100644
--- a/static/app/views/projectDetail/projectScoreCards/projectVelocityScoreCard.tsx
+++ b/static/app/views/projectDetail/projectScoreCards/projectVelocityScoreCard.tsx
@@ -50,7 +50,7 @@ const useReleaseCount = (props: Props) => {
         },
       },
     ],
-    {staleTime: 0, enabled: isEnabled}
+    {staleTime: Infinity, enabled: isEnabled}
   );
 
   const isPreviousPeriodEnabled = shouldFetchPreviousPeriod({
@@ -71,7 +71,7 @@ const useReleaseCount = (props: Props) => {
       },
     ],
     {
-      staleTime: 0,
+      staleTime: Infinity,
       enabled: isEnabled && isPreviousPeriodEnabled,
     }
   );
@@ -97,7 +97,7 @@ const useReleaseCount = (props: Props) => {
       },
     ],
     {
-      staleTime: 0,
+      staleTime: Infinity,
       enabled: isEnabled && isAllTimePeriodEnabled,
     }
   );
diff --git a/static/app/views/projectInstall/components/platformHeaderButtonBar.tsx b/static/app/views/projectInstall/components/platformHeaderButtonBar.tsx
deleted file mode 100644
index 5d4d0916e53558..00000000000000
--- a/static/app/views/projectInstall/components/platformHeaderButtonBar.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import {LinkButton} from 'sentry/components/button';
-import ButtonBar from 'sentry/components/buttonBar';
-import {IconChevron} from 'sentry/icons';
-import {t} from 'sentry/locale';
-
-type Props = {
-  docsLink: string;
-  gettingStartedLink: string;
-};
-
-export default function PlatformHeaderButtonBar({gettingStartedLink, docsLink}: Props) {
-  return (
-    <ButtonBar gap={1}>
-      <LinkButton
-        size="sm"
-        icon={<IconChevron direction="left" />}
-        to={gettingStartedLink}
-      >
-        {t('Back')}
-      </LinkButton>
-      <LinkButton size="sm" href={docsLink} external>
-        {t('Full Documentation')}
-      </LinkButton>
-    </ButtonBar>
-  );
-}
diff --git a/static/app/views/projectInstall/createProject.spec.tsx b/static/app/views/projectInstall/createProject.spec.tsx
index e8b3cd7adae26f..8d61b0382e81a9 100644
--- a/static/app/views/projectInstall/createProject.spec.tsx
+++ b/static/app/views/projectInstall/createProject.spec.tsx
@@ -13,7 +13,6 @@ import {
 } from 'sentry-test/reactTestingLibrary';
 
 import {addErrorMessage, addSuccessMessage} from 'sentry/actionCreators/indicator';
-import {tct} from 'sentry/locale';
 import OrganizationStore from 'sentry/stores/organizationStore';
 import TeamStore from 'sentry/stores/teamStore';
 import type {Organization} from 'sentry/types/organization';
@@ -220,11 +219,7 @@ describe('CreateProject', function () {
     expect(frameWorkModalMockRequests.projectCreationMockRequest).toHaveBeenCalledTimes(
       1
     );
-    expect(addSuccessMessage).toHaveBeenCalledWith(
-      tct('Created project [project]', {
-        project: 'testProj',
-      })
-    );
+    expect(addSuccessMessage).toHaveBeenCalledWith('Created project testProj');
   });
 
   it('should display error message on proj creation failure', async function () {
@@ -261,11 +256,7 @@ describe('CreateProject', function () {
     expect(frameWorkModalMockRequests.projectCreationMockRequest).toHaveBeenCalledTimes(
       1
     );
-    expect(addErrorMessage).toHaveBeenCalledWith(
-      tct('Failed to create project [project]', {
-        project: 'apple-ios',
-      })
-    );
+    expect(addErrorMessage).toHaveBeenCalledWith('Failed to create project apple-ios');
   });
 
   it('should display success message when using member endpoint', async function () {
@@ -293,10 +284,7 @@ describe('CreateProject', function () {
       frameWorkModalMockRequests.experimentalprojectCreationMockRequest
     ).toHaveBeenCalledTimes(1);
     expect(addSuccessMessage).toHaveBeenCalledWith(
-      tct('Created [project] under new team [team]', {
-        project: 'testProj',
-        team: '#testTeam',
-      })
+      'Created testProj under new team #testTeam'
     );
   });
 
@@ -382,9 +370,7 @@ describe('CreateProject', function () {
   });
 
   describe('Issue Alerts Options', function () {
-    const organization = OrganizationFixture({
-      features: ['messaging-integration-onboarding-project-creation'],
-    });
+    const organization = OrganizationFixture();
     beforeEach(() => {
       TeamStore.loadUserTeams([teamWithAccess]);
 
diff --git a/static/app/views/projectInstall/createProject.tsx b/static/app/views/projectInstall/createProject.tsx
index c72f14a687287b..082bb93976be4b 100644
--- a/static/app/views/projectInstall/createProject.tsx
+++ b/static/app/views/projectInstall/createProject.tsx
@@ -162,26 +162,19 @@ function CreateProject() {
           project_id: projectData.id,
           platform: selectedPlatform.key,
           rule_ids: ruleIds,
-          has_onboarding_feature_flag: organization.features.includes(
-            'messaging-integration-onboarding-project-creation'
-          ),
-          created_integration_notification: shouldCreateRule ?? false,
         });
 
         ProjectsStore.onCreateSuccess(projectData, organization.slug);
 
         if (team) {
-          addSuccessMessage(
-            tct('Created project [project]', {
-              project: `${projectData.slug}`,
-            })
-          );
+          addSuccessMessage(t('Created project %s', `${projectData.slug}`));
         } else {
           addSuccessMessage(
-            tct('Created [project] under new team [team]', {
-              project: `${projectData.slug}`,
-              team: `#${projectData.team_slug}`,
-            })
+            t(
+              'Created %s under new team %s',
+              `${projectData.slug}`,
+              `#${projectData.team_slug}`
+            )
           );
         }
 
@@ -193,11 +186,7 @@ function CreateProject() {
       } catch (err) {
         setInFlight(false);
         setErrors(err.responseJSON);
-        addErrorMessage(
-          tct('Failed to create project [project]', {
-            project: `${projectName}`,
-          })
-        );
+        addErrorMessage(t('Failed to create project %s', `${projectName}`));
 
         // Only log this if the error is something other than:
         // * The user not having access to create a project, or,
@@ -296,7 +285,6 @@ function CreateProject() {
   const isMissingAlertThreshold =
     shouldCreateCustomRule && !conditions?.every?.(condition => condition.value);
   const isMissingMessagingIntegrationChannel =
-    organization.features.includes('messaging-integration-onboarding-project-creation') &&
     shouldCreateRule &&
     notificationProps.actions?.some(
       action => action === MultipleCheckboxOptions.INTEGRATION
@@ -346,14 +334,14 @@ function CreateProject() {
     }
 
     if (
-      alertRules?.[0].conditions?.[0].id?.endsWith('EventFrequencyCondition') ||
-      alertRules?.[0].conditions?.[0].id?.endsWith('EventUniqueUserFrequencyCondition')
+      alertRules?.[0]!.conditions?.[0]!.id?.endsWith('EventFrequencyCondition') ||
+      alertRules?.[0]!.conditions?.[0]!.id?.endsWith('EventUniqueUserFrequencyCondition')
     ) {
       return {
         alertSetting: String(RuleAction.CUSTOMIZED_ALERTS),
-        interval: String(alertRules?.[0].conditions?.[0].interval),
-        threshold: String(alertRules?.[0].conditions?.[0].value),
-        metric: alertRules?.[0].conditions?.[0].id?.endsWith('EventFrequencyCondition')
+        interval: String(alertRules?.[0]!.conditions?.[0]!.interval),
+        threshold: String(alertRules?.[0]!.conditions?.[0]!.value),
+        metric: alertRules?.[0]!.conditions?.[0]!.id?.endsWith('EventFrequencyCondition')
           ? MetricValues.ERRORS
           : MetricValues.USERS,
       };
diff --git a/static/app/views/projectInstall/issueAlertNotificationOptions.spec.tsx b/static/app/views/projectInstall/issueAlertNotificationOptions.spec.tsx
index 6eeed85b539c3f..023ec334a7b364 100644
--- a/static/app/views/projectInstall/issueAlertNotificationOptions.spec.tsx
+++ b/static/app/views/projectInstall/issueAlertNotificationOptions.spec.tsx
@@ -10,9 +10,7 @@ import IssueAlertNotificationOptions, {
 } from 'sentry/views/projectInstall/issueAlertNotificationOptions';
 
 describe('MessagingIntegrationAlertRule', function () {
-  const organization = OrganizationFixture({
-    features: ['messaging-integration-onboarding-project-creation'],
-  });
+  const organization = OrganizationFixture();
   const integrations: OrganizationIntegration[] = [];
   const mockSetAction = jest.fn();
 
@@ -54,7 +52,7 @@ describe('MessagingIntegrationAlertRule', function () {
     );
     render(
       <IssueAlertNotificationOptions {...notificationProps} shouldRenderSetupButton />,
-      {organization: organization}
+      {organization}
     );
     await screen.findByText(/notify via email/i);
     expect(screen.queryByText(/notify via integration/i)).not.toBeInTheDocument();
@@ -71,7 +69,7 @@ describe('MessagingIntegrationAlertRule', function () {
         status: 'active',
       })
     );
-    render(getComponent(), {organization: organization});
+    render(getComponent(), {organization});
     await screen.findByText(/notify via email/i);
     await screen.findByText(/notify via integration/i);
   });
@@ -83,7 +81,7 @@ describe('MessagingIntegrationAlertRule', function () {
         status: 'active',
       })
     );
-    render(getComponent(), {organization: organization});
+    render(getComponent(), {organization});
     await screen.findByText(/notify via email/i);
     await screen.findByText(/notify via integration/i);
     await userEvent.click(screen.getByText(/notify via integration/i));
diff --git a/static/app/views/projectInstall/issueAlertNotificationOptions.tsx b/static/app/views/projectInstall/issueAlertNotificationOptions.tsx
index 59a05633e30806..390d944ff6040b 100644
--- a/static/app/views/projectInstall/issueAlertNotificationOptions.tsx
+++ b/static/app/views/projectInstall/issueAlertNotificationOptions.tsx
@@ -112,7 +112,7 @@ export function useCreateNotificationAction() {
   useEffect(() => {
     if (messagingIntegrationsQuery.isSuccess) {
       const providerKeys = Object.keys(providersToIntegrations);
-      const firstProvider = providerKeys[0] ?? undefined;
+      const firstProvider = providerKeys[0]! ?? undefined;
       const firstIntegration = providersToIntegrations[firstProvider]?.[0] ?? undefined;
       setProvider(firstProvider);
       setIntegration(firstIntegration);
@@ -141,13 +141,7 @@ export function useCreateNotificationAction() {
       const isCreatingIntegrationNotification = actions.find(
         action => action === MultipleCheckboxOptions.INTEGRATION
       );
-      if (
-        !organization.features.includes(
-          'messaging-integration-onboarding-project-creation'
-        ) ||
-        !shouldCreateRule ||
-        !isCreatingIntegrationNotification
-      ) {
+      if (!shouldCreateRule || !isCreatingIntegrationNotification) {
         return undefined;
       }
 
@@ -157,7 +151,7 @@ export function useCreateNotificationAction() {
           integrationAction = {
             id: IssueAlertActionType.SLACK,
             workspace: integration?.id,
-            channel: channel,
+            channel,
           };
 
           break;
@@ -173,7 +167,7 @@ export function useCreateNotificationAction() {
           integrationAction = {
             id: IssueAlertActionType.MS_TEAMS,
             team: integration?.id,
-            channel: channel,
+            channel,
           };
           break;
         default:
@@ -191,15 +185,7 @@ export function useCreateNotificationAction() {
         },
       });
     },
-    [
-      actions,
-      api,
-      provider,
-      integration,
-      channel,
-      organization.features,
-      organization.slug,
-    ]
+    [actions, api, provider, integration, channel, organization.slug]
   );
 
   return {
@@ -262,9 +248,7 @@ export default function IssueAlertNotificationOptions(
       </MultipleCheckbox>
       {shouldRenderSetupButton && (
         <SetupMessagingIntegrationButton
-          analyticsParams={{
-            view: MessagingIntegrationAnalyticsView.PROJECT_CREATION,
-          }}
+          analyticsView={MessagingIntegrationAnalyticsView.PROJECT_CREATION}
         />
       )}
     </Fragment>
diff --git a/static/app/views/projectInstall/issueAlertOptions.spec.tsx b/static/app/views/projectInstall/issueAlertOptions.spec.tsx
index 1210e2061ea494..2952658a0f1778 100644
--- a/static/app/views/projectInstall/issueAlertOptions.spec.tsx
+++ b/static/app/views/projectInstall/issueAlertOptions.spec.tsx
@@ -14,9 +14,7 @@ import type {IssueAlertNotificationProps} from 'sentry/views/projectInstall/issu
 import IssueAlertOptions from 'sentry/views/projectInstall/issueAlertOptions';
 
 describe('IssueAlertOptions', function () {
-  const organization = OrganizationFixture({
-    features: ['messaging-integration-onboarding-project-creation'],
-  });
+  const organization = OrganizationFixture();
   const URL = `/projects/${organization.slug}/rule-conditions/`;
 
   const notificationProps: IssueAlertNotificationProps = {
diff --git a/static/app/views/projectInstall/issueAlertOptions.tsx b/static/app/views/projectInstall/issueAlertOptions.tsx
index 24ec10362b2933..67aad98c2ee422 100644
--- a/static/app/views/projectInstall/issueAlertOptions.tsx
+++ b/static/app/views/projectInstall/issueAlertOptions.tsx
@@ -313,10 +313,7 @@ class IssueAlertOptions extends DeprecatedAsyncComponent<Props, State> {
           onChange={alertSetting => this.setStateAndUpdateParents({alertSetting})}
           value={this.state.alertSetting}
         />
-        {this.props.organization.features.includes(
-          'messaging-integration-onboarding-project-creation'
-        ) &&
-          this.props.notificationProps &&
+        {this.props.notificationProps &&
           parseInt(this.state.alertSetting, 10) !== RuleAction.CREATE_ALERT_LATER && (
             <IssueAlertNotificationOptions {...this.props.notificationProps} />
           )}
diff --git a/static/app/views/projectInstall/messagingIntegrationAlertRule.spec.tsx b/static/app/views/projectInstall/messagingIntegrationAlertRule.spec.tsx
index 32db6b91fbc933..6d891c1cfb4ac9 100644
--- a/static/app/views/projectInstall/messagingIntegrationAlertRule.spec.tsx
+++ b/static/app/views/projectInstall/messagingIntegrationAlertRule.spec.tsx
@@ -41,7 +41,7 @@ describe('MessagingIntegrationAlertRule', function () {
     channel: 'channel',
     integration: slackIntegrations[0],
     provider: 'slack',
-    providersToIntegrations: providersToIntegrations,
+    providersToIntegrations,
     querySuccess: true,
     shouldRenderSetupButton: false,
     setActions: jest.fn(),
diff --git a/static/app/views/projectInstall/messagingIntegrationAlertRule.tsx b/static/app/views/projectInstall/messagingIntegrationAlertRule.tsx
index a24aac47958266..a718eaec9e7e72 100644
--- a/static/app/views/projectInstall/messagingIntegrationAlertRule.tsx
+++ b/static/app/views/projectInstall/messagingIntegrationAlertRule.tsx
@@ -53,7 +53,7 @@ export default function MessagingIntegrationAlertRule({
             options={providerOptions}
             onChange={p => {
               setProvider(p.value);
-              setIntegration(providersToIntegrations[p.value][0]);
+              setIntegration(providersToIntegrations[p.value]![0]!);
               setChannel('');
             }}
           />
diff --git a/static/app/views/projectInstall/otherPlatformsInfo.tsx b/static/app/views/projectInstall/otherPlatformsInfo.tsx
index 535ec379112c4e..3e832b861dafef 100644
--- a/static/app/views/projectInstall/otherPlatformsInfo.tsx
+++ b/static/app/views/projectInstall/otherPlatformsInfo.tsx
@@ -45,7 +45,7 @@ export function OtherPlatformsInfo({
         platform
       )}
       <CodeSnippet dark language="properties">
-        {t('dsn: %s', data[0].dsn.public)}
+        {t('dsn: %s', data[0]!.dsn.public)}
       </CodeSnippet>
       <Suggestion>
         {t(
diff --git a/static/app/views/projectInstall/platform.spec.tsx b/static/app/views/projectInstall/platform.spec.tsx
index ef4301b38fcd3e..5209f127b5e656 100644
--- a/static/app/views/projectInstall/platform.spec.tsx
+++ b/static/app/views/projectInstall/platform.spec.tsx
@@ -45,7 +45,7 @@ function mockProjectApiResponses(projects: (Project | ProjectWithBadPlatform)[])
   });
 
   MockApiClient.addMockResponse({
-    url: `/projects/org-slug/project-slug/keys/${ProjectKeysFixture()[0].public}/`,
+    url: `/projects/org-slug/project-slug/keys/${ProjectKeysFixture()[0]!.public}/`,
     method: 'PUT',
     body: {},
   });
diff --git a/static/app/views/projectInstall/platformOrIntegration.spec.tsx b/static/app/views/projectInstall/platformOrIntegration.spec.tsx
index d80f92df5a29a2..1f1a4057838dd1 100644
--- a/static/app/views/projectInstall/platformOrIntegration.spec.tsx
+++ b/static/app/views/projectInstall/platformOrIntegration.spec.tsx
@@ -33,7 +33,7 @@ function mockProjectApiResponses(projects: (Project | ProjectWithBadPlatform)[])
   });
 
   MockApiClient.addMockResponse({
-    url: `/projects/org-slug/project-slug/keys/${ProjectKeysFixture()[0].public}/`,
+    url: `/projects/org-slug/project-slug/keys/${ProjectKeysFixture()[0]!.public}/`,
     method: 'PUT',
     body: {},
   });
diff --git a/static/app/views/projects/projectContext.tsx b/static/app/views/projects/projectContext.tsx
index e7558d449a2fa3..b03f4e8d58cf10 100644
--- a/static/app/views/projects/projectContext.tsx
+++ b/static/app/views/projects/projectContext.tsx
@@ -17,7 +17,10 @@ import {space} from 'sentry/styles/space';
 import type {Organization} from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
 import type {User} from 'sentry/types/user';
-import FeatureObserver from 'sentry/utils/featureObserver';
+import {
+  addProjectFeaturesHandler,
+  buildSentryFeaturesHandler,
+} from 'sentry/utils/featureFlags';
 import withApi from 'sentry/utils/withApi';
 import withOrganization from 'sentry/utils/withOrganization';
 import withProjects from 'sentry/utils/withProjects';
@@ -181,8 +184,9 @@ class ProjectContextProvider extends Component<Props, State> {
 
         // assuming here that this means the project is considered the active project
         setActiveProject(project);
-        FeatureObserver.singleton({}).observeProjectFlags({
+        addProjectFeaturesHandler({
           project,
+          handler: buildSentryFeaturesHandler('feature.projects:'),
         });
       } catch (error) {
         this.setState({
diff --git a/static/app/views/projectsDashboard/index.spec.tsx b/static/app/views/projectsDashboard/index.spec.tsx
index 832120ba6ace83..ba8557a681a135 100644
--- a/static/app/views/projectsDashboard/index.spec.tsx
+++ b/static/app/views/projectsDashboard/index.spec.tsx
@@ -3,6 +3,7 @@ import {ProjectFixture} from 'sentry-fixture/project';
 import {RouteComponentPropsFixture} from 'sentry-fixture/routeComponentPropsFixture';
 import {TeamFixture} from 'sentry-fixture/team';
 
+import {initializeOrg} from 'sentry-test/initializeOrg';
 import {
   act,
   render,
@@ -15,14 +16,15 @@ import {
 import * as projectsActions from 'sentry/actionCreators/projects';
 import ProjectsStatsStore from 'sentry/stores/projectsStatsStore';
 import ProjectsStore from 'sentry/stores/projectsStore';
+import TeamStore from 'sentry/stores/teamStore';
 import {Dashboard} from 'sentry/views/projectsDashboard';
 
 jest.unmock('lodash/debounce');
 jest.mock('lodash/debounce', () => {
   const debounceMap = new Map();
   const mockDebounce =
-    (fn, timeout) =>
-    (...args) => {
+    (fn: (...args: any[]) => void, timeout: number) =>
+    (...args: any[]) => {
       if (debounceMap.has(fn)) {
         clearTimeout(debounceMap.get(fn));
       }
@@ -44,6 +46,7 @@ describe('ProjectsDashboard', function () {
   const teams = [team];
 
   beforeEach(function () {
+    TeamStore.loadInitialData(teams);
     MockApiClient.addMockResponse({
       url: `/teams/${org.slug}/${team.slug}/members/`,
       body: [],
@@ -57,6 +60,7 @@ describe('ProjectsDashboard', function () {
   });
 
   afterEach(function () {
+    TeamStore.reset();
     projectsActions._projectStatsToFetch.clear();
     MockApiClient.clearMockResponses();
   });
@@ -151,6 +155,156 @@ describe('ProjectsDashboard', function () {
       expect(screen.queryByTestId('loading-placeholder')).not.toBeInTheDocument();
     });
 
+    it('renders only projects for my teams by default', async function () {
+      const teamA = TeamFixture({slug: 'team1', isMember: true});
+      const teamProjects = [
+        ProjectFixture({
+          id: '1',
+          slug: 'project1',
+          teams: [teamA],
+          firstEvent: new Date().toISOString(),
+          stats: [],
+        }),
+      ];
+
+      ProjectsStore.loadInitialData([
+        ...teamProjects,
+        ProjectFixture({
+          id: '2',
+          slug: 'project2',
+          teams: [],
+          isBookmarked: true,
+          firstEvent: new Date().toISOString(),
+          stats: [],
+        }),
+      ]);
+      const teamsWithTwoProjects = [TeamFixture({projects: teamProjects})];
+
+      render(
+        <Dashboard
+          api={api}
+          error={null}
+          loadingTeams={false}
+          organization={org}
+          teams={teamsWithTwoProjects}
+          {...RouteComponentPropsFixture()}
+        />
+      );
+      expect(await screen.findByText('My Teams')).toBeInTheDocument();
+      expect(screen.getAllByTestId('badge-display-name')).toHaveLength(1);
+    });
+
+    it('renders all projects if open membership is enabled and user selects all teams', async function () {
+      const {
+        organization: openOrg,
+        router,
+        routerProps,
+      } = initializeOrg({
+        organization: {features: ['open-membership']},
+        router: {
+          // team='' removes the default selection of 'myteams', same as clicking "clear"
+          location: {query: {team: ''}},
+        },
+      });
+      const teamA = TeamFixture({slug: 'team1', isMember: true});
+      const teamB = TeamFixture({id: '2', slug: 'team2', name: 'team2', isMember: false});
+      TeamStore.loadInitialData([teamA, teamB]);
+      const teamProjects = [
+        ProjectFixture({
+          id: '1',
+          slug: 'project1',
+          teams: [teamA],
+          firstEvent: new Date().toISOString(),
+          stats: [],
+        }),
+      ];
+
+      ProjectsStore.loadInitialData([
+        ...teamProjects,
+        ProjectFixture({
+          id: '2',
+          slug: 'project2',
+          teams: [teamB],
+          firstEvent: new Date().toISOString(),
+          stats: [],
+        }),
+      ]);
+      const teamsWithTwoProjects = [TeamFixture({projects: teamProjects})];
+
+      render(
+        <Dashboard
+          api={api}
+          error={null}
+          loadingTeams={false}
+          organization={openOrg}
+          teams={teamsWithTwoProjects}
+          {...routerProps}
+        />,
+        {
+          router,
+          organization: openOrg,
+        }
+      );
+      expect(await screen.findByText('All Teams')).toBeInTheDocument();
+      expect(screen.getAllByTestId('badge-display-name')).toHaveLength(2);
+
+      await userEvent.click(screen.getByText('All Teams'));
+      expect(await screen.findByText('Other Teams')).toBeInTheDocument();
+      expect(screen.getByText('#team2')).toBeInTheDocument();
+    });
+
+    it('renders only projects for my teams if open membership is disabled', async function () {
+      const {
+        organization: closedOrg,
+        router,
+        routerProps,
+      } = initializeOrg({
+        organization: {features: []},
+        router: {
+          location: {query: {team: ''}},
+        },
+      });
+      const teamA = TeamFixture({slug: 'team1', isMember: true});
+      const teamProjects = [
+        ProjectFixture({
+          id: '1',
+          slug: 'project1',
+          teams: [teamA],
+          firstEvent: new Date().toISOString(),
+          stats: [],
+        }),
+      ];
+
+      ProjectsStore.loadInitialData([
+        ...teamProjects,
+        ProjectFixture({
+          id: '2',
+          slug: 'project2',
+          teams: [],
+          firstEvent: new Date().toISOString(),
+          stats: [],
+        }),
+      ]);
+      const teamsWithTwoProjects = [TeamFixture({projects: teamProjects})];
+
+      render(
+        <Dashboard
+          api={api}
+          error={null}
+          loadingTeams={false}
+          organization={closedOrg}
+          teams={teamsWithTwoProjects}
+          {...routerProps}
+        />,
+        {
+          router,
+          organization: closedOrg,
+        }
+      );
+      expect(await screen.findByText('All Teams')).toBeInTheDocument();
+      expect(screen.getAllByTestId('badge-display-name')).toHaveLength(1);
+    });
+
     it('renders correct project with selected team', async function () {
       const teamC = TeamFixture({
         id: '1',
@@ -373,12 +527,12 @@ describe('ProjectsDashboard', function () {
 
       const projectName = screen.getAllByTestId('badge-display-name');
       // check that projects are in the correct order - alphabetical with bookmarked projects in front
-      expect(within(projectName[0]).getByText('a-fave')).toBeInTheDocument();
-      expect(within(projectName[1]).getByText('m-fave')).toBeInTheDocument();
-      expect(within(projectName[2]).getByText('z-fave')).toBeInTheDocument();
-      expect(within(projectName[3]).getByText('a')).toBeInTheDocument();
-      expect(within(projectName[4]).getByText('m')).toBeInTheDocument();
-      expect(within(projectName[5]).getByText('z')).toBeInTheDocument();
+      expect(within(projectName[0]!).getByText('a-fave')).toBeInTheDocument();
+      expect(within(projectName[1]!).getByText('m-fave')).toBeInTheDocument();
+      expect(within(projectName[2]!).getByText('z-fave')).toBeInTheDocument();
+      expect(within(projectName[3]!).getByText('a')).toBeInTheDocument();
+      expect(within(projectName[4]!).getByText('m')).toBeInTheDocument();
+      expect(within(projectName[5]!).getByText('z')).toBeInTheDocument();
     });
   });
 
@@ -429,7 +583,9 @@ describe('ProjectsDashboard', function () {
       ProjectsStore.loadInitialData(projects);
 
       jest.useFakeTimers();
-      ProjectsStatsStore.onStatsLoadSuccess([{...projects[0], stats: [[1517281200, 2]]}]);
+      ProjectsStatsStore.onStatsLoadSuccess([
+        {...projects[0]!, stats: [[1517281200, 2]]},
+      ]);
       const loadStatsSpy = jest.spyOn(projectsActions, 'loadStatsForProject');
       const mock = MockApiClient.addMockResponse({
         url: `/organizations/${org.slug}/projects/`,
@@ -459,20 +615,20 @@ describe('ProjectsDashboard', function () {
       const projectSummary = screen.getAllByTestId('summary-links');
       // Has 5 Loading Cards because 1 project has been loaded in store already
       expect(
-        within(projectSummary[0]).getByTestId('loading-placeholder')
+        within(projectSummary[0]!).getByTestId('loading-placeholder')
       ).toBeInTheDocument();
       expect(
-        within(projectSummary[1]).getByTestId('loading-placeholder')
+        within(projectSummary[1]!).getByTestId('loading-placeholder')
       ).toBeInTheDocument();
       expect(
-        within(projectSummary[2]).getByTestId('loading-placeholder')
+        within(projectSummary[2]!).getByTestId('loading-placeholder')
       ).toBeInTheDocument();
       expect(
-        within(projectSummary[3]).getByTestId('loading-placeholder')
+        within(projectSummary[3]!).getByTestId('loading-placeholder')
       ).toBeInTheDocument();
-      expect(within(projectSummary[4]).getByText('Errors: 2')).toBeInTheDocument();
+      expect(within(projectSummary[4]!).getByText('Errors: 2')).toBeInTheDocument();
       expect(
-        within(projectSummary[5]).getByTestId('loading-placeholder')
+        within(projectSummary[5]!).getByTestId('loading-placeholder')
       ).toBeInTheDocument();
 
       // Advance timers so that batched request fires
@@ -492,13 +648,13 @@ describe('ProjectsDashboard', function () {
 
       // All cards have loaded
       await waitFor(() => {
-        expect(within(projectSummary[0]).getByText('Errors: 3')).toBeInTheDocument();
+        expect(within(projectSummary[0]!).getByText('Errors: 3')).toBeInTheDocument();
       });
-      expect(within(projectSummary[1]).getByText('Errors: 3')).toBeInTheDocument();
-      expect(within(projectSummary[2]).getByText('Errors: 3')).toBeInTheDocument();
-      expect(within(projectSummary[3]).getByText('Errors: 3')).toBeInTheDocument();
-      expect(within(projectSummary[4]).getByText('Errors: 3')).toBeInTheDocument();
-      expect(within(projectSummary[5]).getByText('Errors: 3')).toBeInTheDocument();
+      expect(within(projectSummary[1]!).getByText('Errors: 3')).toBeInTheDocument();
+      expect(within(projectSummary[2]!).getByText('Errors: 3')).toBeInTheDocument();
+      expect(within(projectSummary[3]!).getByText('Errors: 3')).toBeInTheDocument();
+      expect(within(projectSummary[4]!).getByText('Errors: 3')).toBeInTheDocument();
+      expect(within(projectSummary[5]!).getByText('Errors: 3')).toBeInTheDocument();
 
       // Resets store when it unmounts
       unmount();
diff --git a/static/app/views/projectsDashboard/index.tsx b/static/app/views/projectsDashboard/index.tsx
index 2badaf5891b4cf..fecf355bc88abb 100644
--- a/static/app/views/projectsDashboard/index.tsx
+++ b/static/app/views/projectsDashboard/index.tsx
@@ -31,6 +31,8 @@ import {
 } from 'sentry/utils/performanceForSentry';
 import {sortProjects} from 'sentry/utils/project/sortProjects';
 import useOrganization from 'sentry/utils/useOrganization';
+import useProjects from 'sentry/utils/useProjects';
+import {useUser} from 'sentry/utils/useUser';
 import withApi from 'sentry/utils/withApi';
 import withOrganization from 'sentry/utils/withOrganization';
 import withTeamsForUser from 'sentry/utils/withTeamsForUser';
@@ -85,53 +87,66 @@ function Dashboard({teams, organization, loadingTeams, error, router, location}:
       ProjectsStatsStore.reset();
     };
   }, []);
+  const user = useUser();
   const [projectQuery, setProjectQuery] = useState('');
   const debouncedSearchQuery = useMemo(
     () => debounce(handleSearch, DEFAULT_DEBOUNCE_DURATION),
     []
   );
+  const {projects, fetching, fetchError} = useProjects();
+
+  const showNonMemberProjects = useMemo(() => {
+    const isOrgAdminOrManager =
+      organization.orgRole === 'owner' || organization.orgRole === 'manager';
+    const isOpenMembership = organization.features.includes('open-membership');
+
+    return user.isSuperuser || isOrgAdminOrManager || isOpenMembership;
+  }, [user, organization.orgRole, organization.features]);
 
   const canUserCreateProject = canCreateProject(organization);
-  if (loadingTeams) {
+  if (loadingTeams || fetching) {
     return <LoadingIndicator />;
   }
 
-  if (error) {
+  if (error || fetchError) {
     return <LoadingError message={t('An error occurred while fetching your projects')} />;
   }
-  const canJoinTeam = organization.access.includes('team:read');
 
-  const selectedTeams = getTeamParams(location ? location.query.team : '');
-  const filteredTeams = teams.filter(team => selectedTeams.includes(team.id));
+  const canJoinTeam = organization.access.includes('team:read');
+  const selectedTeams = getTeamParams(location.query.team ?? 'myteams');
+  const filteredTeams =
+    selectedTeams[0] === 'myteams' || selectedTeams.length === 0
+      ? teams
+      : teams.filter(team => selectedTeams.includes(team.id));
 
   const filteredTeamProjects = uniqBy(
     (filteredTeams ?? teams).flatMap(team => team.projects),
     'id'
   );
-  const projects = uniqBy(
-    teams.flatMap(teamObj => teamObj.projects),
-    'id'
-  );
   setGroupedEntityTag('projects.total', 1000, projects.length);
 
-  const currentProjects = selectedTeams.length === 0 ? projects : filteredTeamProjects;
+  const currentProjects =
+    // No teams are specifically selected and query parameter is present
+    // Use all projects if open membership is enabled
+    location.query.team === '' && showNonMemberProjects
+      ? projects
+      : // No teams are specifically selected - Use "myteams"
+        filteredTeamProjects;
   const filteredProjects = (currentProjects ?? projects).filter(project =>
     project.slug.includes(projectQuery)
   );
 
-  const showResources = projects.length === 1 && !projects[0].firstEvent;
+  const showResources = projects.length === 1 && !projects[0]!.firstEvent;
 
   function handleSearch(searchQuery: string) {
     setProjectQuery(searchQuery);
   }
 
   function handleChangeFilter(activeFilters: string[]) {
-    const {...currentQuery} = location.query;
-
     router.push({
       pathname: location.pathname,
       query: {
-        ...currentQuery,
+        ...location.query,
         team: activeFilters.length > 0 ? activeFilters : '',
       },
     });
@@ -190,9 +205,8 @@ function Dashboard({teams, organization, loadingTeams, error, router, location}:
             <TeamFilter
               selectedTeams={selectedTeams}
               handleChangeFilter={handleChangeFilter}
-              showIsMemberTeams
-              showSuggestedOptions={false}
-              showMyTeamsDescription
+              hideUnassigned
+              hideOtherTeams={!showNonMemberProjects}
             />
             <StyledSearchBar
               defaultQuery=""
diff --git a/static/app/views/projectsDashboard/projectCard.tsx b/static/app/views/projectsDashboard/projectCard.tsx
index 32818f944dff78..16c13a39974568 100644
--- a/static/app/views/projectsDashboard/projectCard.tsx
+++ b/static/app/views/projectsDashboard/projectCard.tsx
@@ -281,7 +281,7 @@ class ProjectCardContainer extends Component<ContainerProps, ContainerState> {
     }
 
     this.setState({
-      projectDetails: itemsBySlug[project.slug],
+      projectDetails: itemsBySlug[project.slug]!,
     });
   }
 
diff --git a/static/app/views/releases/components/releaseDetailsSideTable.tsx b/static/app/views/releases/components/releaseDetailsSideTable.tsx
deleted file mode 100644
index b20d759f793aea..00000000000000
--- a/static/app/views/releases/components/releaseDetailsSideTable.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import styled from '@emotion/styled';
-
-import {space} from 'sentry/styles/space';
-
-type Props = {
-  children?: React.ReactNode;
-  type?: undefined | 'error' | 'warning';
-};
-
-export const ReleaseDetailsTable = styled('div')<{noMargin?: boolean}>`
-  ${p => (p.noMargin ? 'margin-bottom: 0;' : null)}
-`;
-
-export function ReleaseDetailsTableRow({type, children}: Props) {
-  return <Row type={type}>{children}</Row>;
-}
-
-const Row = styled('div')<{type: Props['type']}>`
-  ${p => p.theme.overflowEllipsis};
-  font-size: ${p => p.theme.fontSizeMedium};
-  padding: ${space(0.5)} ${space(1)};
-  font-weight: ${p => p.theme.fontWeightNormal};
-  line-height: inherit;
-
-  background-color: ${p => {
-    switch (p.type) {
-      case 'error':
-        return p.theme.red100 + ' !important';
-      case 'warning':
-        return 'var(--background-warning-default, rgba(245, 176, 0, 0.09)) !important';
-      default:
-        return 'inherit';
-    }
-  }};
-  &:nth-of-type(2n-1) {
-    background-color: ${p => p.theme.backgroundSecondary};
-  }
-`;
diff --git a/static/app/views/releases/detail/commitsAndFiles/filesChanged.tsx b/static/app/views/releases/detail/commitsAndFiles/filesChanged.tsx
index d1da9709edc91d..22b525d28d6bbd 100644
--- a/static/app/views/releases/detail/commitsAndFiles/filesChanged.tsx
+++ b/static/app/views/releases/detail/commitsAndFiles/filesChanged.tsx
@@ -89,7 +89,7 @@ function FilesChangedList({organization, releaseRepos, projectSlug}: FilesChange
           ) : fileList.length ? (
             <Fragment>
               {reposToRender.map(repoName => {
-                const repoData = filesByRepository[repoName];
+                const repoData = filesByRepository[repoName]!;
                 const files = Object.keys(repoData);
                 const fileCount = files.length;
                 return (
diff --git a/static/app/views/releases/detail/header/releaseActions.spec.tsx b/static/app/views/releases/detail/header/releaseActions.spec.tsx
index 9e91b32c6e475f..a56f69adbe0df8 100644
--- a/static/app/views/releases/detail/header/releaseActions.spec.tsx
+++ b/static/app/views/releases/detail/header/releaseActions.spec.tsx
@@ -6,6 +6,7 @@ import {ReleaseFixture} from 'sentry-fixture/release';
 import {ReleaseMetaFixture} from 'sentry-fixture/releaseMeta';
 import {ReleaseProjectFixture} from 'sentry-fixture/releaseProject';
 import {RouteComponentPropsFixture} from 'sentry-fixture/routeComponentPropsFixture';
+import {RouterFixture} from 'sentry-fixture/routerFixture';
 
 import {
   render,
@@ -17,10 +18,10 @@ import {
 
 import type {ReleaseProject} from 'sentry/types/release';
 import {ReleaseStatus} from 'sentry/types/release';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import ReleaseActions from 'sentry/views/releases/detail/header/releaseActions';
 
 describe('ReleaseActions', function () {
+  const router = RouterFixture();
   const organization = OrganizationFixture();
 
   const project1 = ReleaseProjectFixture({
@@ -65,14 +66,15 @@ describe('ReleaseActions', function () {
     render(
       <ReleaseActions
         organization={organization}
-        projectSlug={release.projects[0].slug}
+        projectSlug={release.projects[0]!.slug}
         release={release}
         refetchData={jest.fn()}
         releaseMeta={{...ReleaseMetaFixture(), projects: release.projects}}
         location={location}
-      />
+      />,
+      {router}
     );
-    renderGlobalModal();
+    renderGlobalModal({router});
 
     await userEvent.click(screen.getByLabelText('Actions'));
 
@@ -85,7 +87,7 @@ describe('ReleaseActions', function () {
 
     expect(await screen.findByText('Archive Release 1.2.0')).toBeInTheDocument();
     const affectedProjects = screen.getAllByTestId('badge-display-name');
-    expect(affectedProjects.length).toBe(2);
+    expect(affectedProjects).toHaveLength(2);
 
     // confirm modal
     await userEvent.click(screen.getByTestId('confirm-button'));
@@ -101,7 +103,7 @@ describe('ReleaseActions', function () {
       })
     );
     await waitFor(() =>
-      expect(browserHistory.push).toHaveBeenCalledWith(
+      expect(router.push).toHaveBeenCalledWith(
         `/organizations/${organization.slug}/releases/`
       )
     );
@@ -114,14 +116,15 @@ describe('ReleaseActions', function () {
       <ReleaseActions
         {...RouteComponentPropsFixture()}
         organization={organization}
-        projectSlug={release.projects[0].slug}
+        projectSlug={release.projects[0]!.slug}
         release={{...release, status: ReleaseStatus.ARCHIVED}}
         refetchData={refetchDataMock}
         releaseMeta={{...ReleaseMetaFixture(), projects: release.projects}}
         location={location}
-      />
+      />,
+      {router}
     );
-    renderGlobalModal();
+    renderGlobalModal({router});
 
     await userEvent.click(screen.getByLabelText('Actions'));
 
@@ -134,7 +137,7 @@ describe('ReleaseActions', function () {
 
     expect(await screen.findByText('Restore Release 1.2.0')).toBeInTheDocument();
     const affectedProjects = screen.getAllByTestId('badge-display-name');
-    expect(affectedProjects.length).toBe(2);
+    expect(affectedProjects).toHaveLength(2);
 
     // confirm modal
     await userEvent.click(screen.getByTestId('confirm-button'));
@@ -157,12 +160,13 @@ describe('ReleaseActions', function () {
     const {rerender} = render(
       <ReleaseActions
         organization={organization}
-        projectSlug={release.projects[0].slug}
+        projectSlug={release.projects[0]!.slug}
         release={release}
         refetchData={jest.fn()}
         releaseMeta={{...ReleaseMetaFixture(), projects: release.projects}}
         location={location}
-      />
+      />,
+      {router}
     );
 
     expect(screen.getByLabelText('Oldest')).toHaveAttribute(
@@ -185,7 +189,7 @@ describe('ReleaseActions', function () {
     rerender(
       <ReleaseActions
         organization={organization}
-        projectSlug={release.projects[0].slug}
+        projectSlug={release.projects[0]!.slug}
         release={release}
         refetchData={jest.fn()}
         releaseMeta={{...ReleaseMetaFixture(), projects: release.projects}}
diff --git a/static/app/views/releases/detail/header/releaseHeader.tsx b/static/app/views/releases/detail/header/releaseHeader.tsx
index 2ce3e3342a0cb6..62807a0dfb4f5a 100644
--- a/static/app/views/releases/detail/header/releaseHeader.tsx
+++ b/static/app/views/releases/detail/header/releaseHeader.tsx
@@ -81,7 +81,7 @@ function ReleaseHeader({
       return activeTab.to;
     }
 
-    return tabs[0].to; // default to 'Overview'
+    return tabs[0]!.to; // default to 'Overview'
   };
 
   return (
diff --git a/static/app/views/releases/detail/index.tsx b/static/app/views/releases/detail/index.tsx
index 63ea5ffebb9e64..84b6678927979f 100644
--- a/static/app/views/releases/detail/index.tsx
+++ b/static/app/views/releases/detail/index.tsx
@@ -375,7 +375,9 @@ class ReleasesDetailContainer extends DeprecatedAsyncComponent<
       <PageFiltersContainer
         shouldForceProject={projects.length === 1}
         forceProject={
-          projects.length === 1 ? {...projects[0], id: String(projects[0].id)} : undefined
+          projects.length === 1
+            ? {...projects[0]!, id: String(projects[0]!.id)}
+            : undefined
         }
         specificProjectSlugs={projects.map(p => p.slug)}
       >
diff --git a/static/app/views/releases/detail/overview/index.tsx b/static/app/views/releases/detail/overview/index.tsx
index e78f15a93deca9..cf2fd31e977256 100644
--- a/static/app/views/releases/detail/overview/index.tsx
+++ b/static/app/views/releases/detail/overview/index.tsx
@@ -383,7 +383,7 @@ class ReleaseOverview extends DeprecatedAsyncView<Props> {
             'release-comparison-performance'
           );
           const {environments} = selection;
-          const performanceType = platformToPerformanceType([project], [project.id]);
+          const performanceType = platformToPerformanceType([project], [project.id])!;
           const {selectedSort, sortOptions} = getTransactionsListSort(location);
           const releaseEventView = this.getReleaseEventView(
             version,
@@ -725,7 +725,7 @@ function getTransactionsListSort(location: Location): {
     location.query.showTransactions,
     TransactionsListOption.FAILURE_COUNT
   );
-  const selectedSort = sortOptions.find(opt => opt.value === urlParam) || sortOptions[0];
+  const selectedSort = sortOptions.find(opt => opt.value === urlParam) || sortOptions[0]!;
   return {selectedSort, sortOptions};
 }
 
diff --git a/static/app/views/releases/detail/overview/releaseComparisonChart/index.spec.tsx b/static/app/views/releases/detail/overview/releaseComparisonChart/index.spec.tsx
index 75eb7e343f1949..2aaf88dae26f15 100644
--- a/static/app/views/releases/detail/overview/releaseComparisonChart/index.spec.tsx
+++ b/static/app/views/releases/detail/overview/releaseComparisonChart/index.spec.tsx
@@ -8,7 +8,6 @@ import {initializeOrg} from 'sentry-test/initializeOrg';
 import {act, render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 
 import type {ReleaseProject} from 'sentry/types/release';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import ReleaseComparisonChart from 'sentry/views/releases/detail/overview/releaseComparisonChart';
 
 describe('Releases > Detail > Overview > ReleaseComparison', () => {
@@ -50,7 +49,7 @@ describe('Releases > Detail > Overview > ReleaseComparison', () => {
     );
     expect(screen.getByLabelText('Chart Value')).toHaveTextContent(/95\.006% 4\.51%/);
 
-    expect(screen.getAllByRole('radio').length).toBe(2);
+    expect(screen.getAllByRole('radio')).toHaveLength(2);
 
     // lazy way to make sure that all percentages are calculated correctly
     expect(
@@ -81,7 +80,7 @@ describe('Releases > Detail > Overview > ReleaseComparison', () => {
 
     await userEvent.click(screen.getByLabelText(/crash free user rate/i));
 
-    expect(browserHistory.push).toHaveBeenCalledWith(
+    expect(router.push).toHaveBeenCalledWith(
       expect.objectContaining({query: {chart: 'crashFreeUsers'}})
     );
 
@@ -133,7 +132,7 @@ describe('Releases > Detail > Overview > ReleaseComparison', () => {
 
     await userEvent.click(screen.getByLabelText(/toggle additional/i));
 
-    expect(screen.getAllByRole('radio').length).toBe(12);
+    expect(screen.getAllByRole('radio')).toHaveLength(12);
     // lazy way to make sure that all percentages are calculated correctly
     expect(
       screen.getByTestId('release-comparison-table').textContent
@@ -147,7 +146,7 @@ describe('Releases > Detail > Overview > ReleaseComparison', () => {
     }
     await userEvent.click(screen.getByLabelText(/toggle additional/i));
 
-    expect(screen.getAllByRole('radio').length).toBe(2);
+    expect(screen.getAllByRole('radio')).toHaveLength(2);
   });
 
   it('does not show expanders if there is no health data', async () => {
@@ -185,7 +184,7 @@ describe('Releases > Detail > Overview > ReleaseComparison', () => {
       {router}
     );
 
-    expect(screen.getAllByRole('radio').length).toBe(1);
+    expect(screen.getAllByRole('radio')).toHaveLength(1);
     expect(screen.queryByLabelText(/toggle chart/i)).not.toBeInTheDocument();
     expect(screen.queryByLabelText(/toggle additional/i)).not.toBeInTheDocument();
 
diff --git a/static/app/views/releases/detail/overview/releaseComparisonChart/index.tsx b/static/app/views/releases/detail/overview/releaseComparisonChart/index.tsx
index ec48e2c2236d50..214b4497143459 100644
--- a/static/app/views/releases/detail/overview/releaseComparisonChart/index.tsx
+++ b/static/app/views/releases/detail/overview/releaseComparisonChart/index.tsx
@@ -31,7 +31,6 @@ import {
 } from 'sentry/types/release';
 import {defined} from 'sentry/utils';
 import {trackAnalytics} from 'sentry/utils/analytics';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {DiscoverDatasets} from 'sentry/utils/discover/types';
 import getDynamicText from 'sentry/utils/getDynamicText';
 import {formatPercentage} from 'sentry/utils/number/formatPercentage';
@@ -39,6 +38,7 @@ import {decodeList, decodeScalar} from 'sentry/utils/queryString';
 import {getCount, getCrashFreeRate, getSessionStatusRate} from 'sentry/utils/sessions';
 import type {Color} from 'sentry/utils/theme';
 import {MutableSearch} from 'sentry/utils/tokenizeSearch';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import {
   displaySessionStatusPercent,
   getReleaseBounds,
@@ -105,6 +105,7 @@ function ReleaseComparisonChart({
   organization,
   hasHealthData,
 }: Props) {
+  const navigate = useNavigate();
   const [issuesTotals, setIssuesTotals] = useState<IssuesTotals>(null);
   const [eventsTotals, setEventsTotals] = useState<EventsTotals>(null);
   const [eventsLoading, setEventsLoading] = useState(false);
@@ -824,7 +825,7 @@ function ReleaseComparisonChart({
       organization,
       chartType,
     });
-    browserHistory.push({
+    navigate({
       ...location,
       query: {
         ...location.query,
@@ -890,8 +891,8 @@ function ReleaseComparisonChart({
   let chart = [...charts, ...additionalCharts].find(ch => ch.type === activeChart);
 
   if (!chart) {
-    chart = charts[0];
-    activeChart = charts[0].type;
+    chart = charts[0]!;
+    activeChart = charts[0]!.type;
   }
 
   const showPlaceholders = loading || eventsLoading;
diff --git a/static/app/views/releases/detail/overview/releaseComparisonChart/releaseEventsChart.tsx b/static/app/views/releases/detail/overview/releaseComparisonChart/releaseEventsChart.tsx
index d0df16994799f4..70ccbe8e2a82dc 100644
--- a/static/app/views/releases/detail/overview/releaseComparisonChart/releaseEventsChart.tsx
+++ b/static/app/views/releases/detail/overview/releaseComparisonChart/releaseEventsChart.tsx
@@ -63,11 +63,11 @@ function ReleaseEventsChart({
     const colors = theme.charts.getColorPalette(14);
     switch (chartType) {
       case ReleaseComparisonChartType.ERROR_COUNT:
-        return [colors[12]];
+        return [colors[12]!];
       case ReleaseComparisonChartType.TRANSACTION_COUNT:
-        return [colors[0]];
+        return [colors[0]!];
       case ReleaseComparisonChartType.FAILURE_RATE:
-        return [colors[9]];
+        return [colors[9]!];
       default:
         return undefined;
     }
diff --git a/static/app/views/releases/detail/overview/releaseComparisonChart/releaseSessionsChart.tsx b/static/app/views/releases/detail/overview/releaseComparisonChart/releaseSessionsChart.tsx
index 4d1bd23fbc3c4d..e9563dca9fee9b 100644
--- a/static/app/views/releases/detail/overview/releaseComparisonChart/releaseSessionsChart.tsx
+++ b/static/app/views/releases/detail/overview/releaseComparisonChart/releaseSessionsChart.tsx
@@ -26,6 +26,7 @@ import {
   initSessionsChart,
   MINUTES_THRESHOLD_TO_DISPLAY_SECONDS,
 } from 'sentry/utils/sessions';
+// eslint-disable-next-line no-restricted-imports
 import withSentryRouter from 'sentry/utils/withSentryRouter';
 import {displayCrashFreePercent} from 'sentry/views/releases/utils';
 
@@ -148,23 +149,23 @@ class ReleaseSessionsChart extends Component<Props> {
     const colors = theme.charts.getColorPalette(14);
     switch (chartType) {
       case ReleaseComparisonChartType.CRASH_FREE_SESSIONS:
-        return [colors[0]];
+        return [colors[0]!];
       case ReleaseComparisonChartType.HEALTHY_SESSIONS:
         return [theme.green300];
       case ReleaseComparisonChartType.ABNORMAL_SESSIONS:
-        return [colors[15]];
+        return [colors[15]!];
       case ReleaseComparisonChartType.ERRORED_SESSIONS:
-        return [colors[12]];
+        return [colors[12]!];
       case ReleaseComparisonChartType.CRASHED_SESSIONS:
         return [theme.red300];
       case ReleaseComparisonChartType.CRASH_FREE_USERS:
-        return [colors[6]];
+        return [colors[6]!];
       case ReleaseComparisonChartType.HEALTHY_USERS:
         return [theme.green300];
       case ReleaseComparisonChartType.ABNORMAL_USERS:
-        return [colors[15]];
+        return [colors[15]!];
       case ReleaseComparisonChartType.ERRORED_USERS:
-        return [colors[12]];
+        return [colors[12]!];
       case ReleaseComparisonChartType.CRASHED_USERS:
         return [theme.red300];
       case ReleaseComparisonChartType.SESSION_COUNT:
diff --git a/static/app/views/releases/detail/overview/sidebar/commitAuthorBreakdown.tsx b/static/app/views/releases/detail/overview/sidebar/commitAuthorBreakdown.tsx
index ba556c35c3fa19..d84b633a488b96 100644
--- a/static/app/views/releases/detail/overview/sidebar/commitAuthorBreakdown.tsx
+++ b/static/app/views/releases/detail/overview/sidebar/commitAuthorBreakdown.tsx
@@ -58,7 +58,7 @@ function CommitAuthorBreakdown({orgId, projectSlug, version}: Props) {
       const email = commit.author?.email ?? 'unknown';
 
       if (authorCommitsAccumulator.hasOwnProperty(email)) {
-        authorCommitsAccumulator[email].commitCount += 1;
+        authorCommitsAccumulator[email]!.commitCount += 1;
       } else {
         authorCommitsAccumulator[email] = {
           commitCount: 1,
diff --git a/static/app/views/releases/detail/overview/sidebar/totalCrashFreeUsers.tsx b/static/app/views/releases/detail/overview/sidebar/totalCrashFreeUsers.tsx
index c09fc5b97e3199..6238dad84e4262 100644
--- a/static/app/views/releases/detail/overview/sidebar/totalCrashFreeUsers.tsx
+++ b/static/app/views/releases/detail/overview/sidebar/totalCrashFreeUsers.tsx
@@ -71,7 +71,7 @@ function TotalCrashFreeUsers({location, organization, projectSlug, version}: Pro
       const dateLabel =
         index === 0
           ? t('Release created')
-          : `${moment(data[0].date).from(date, true)} ${t('later')}`;
+          : `${moment(data[0]!.date).from(date, true)} ${t('later')}`;
 
       return {date: moment(date), dateLabel, crashFreeUsers, crashFreeUserCount};
     })
diff --git a/static/app/views/releases/detail/utils.spec.tsx b/static/app/views/releases/detail/utils.spec.tsx
index 0cf929fdfa02f6..a6f130dcceb3c3 100644
--- a/static/app/views/releases/detail/utils.spec.tsx
+++ b/static/app/views/releases/detail/utils.spec.tsx
@@ -13,7 +13,7 @@ describe('releases/detail/utils', () => {
     const {created, adopted, unadopted} = releaseMarkLinesLabels;
     const {router} = initializeOrg();
     const release = ReleaseFixture();
-    const project = release.projects[0];
+    const project = release.projects[0]!;
 
     it('generates "Created" markline', () => {
       const marklines = generateReleaseMarkLines(
@@ -65,7 +65,7 @@ describe('releases/detail/utils', () => {
 
     it('does not generate Adoption marklines for non-mobile projects', () => {
       const marklines = generateReleaseMarkLines(
-        {...release, projects: [{...release.projects[0], platform: 'javascript'}]},
+        {...release, projects: [{...release.projects[0]!, platform: 'javascript'}]},
         {...project, platform: 'javascript'},
         lightTheme,
         {
diff --git a/static/app/views/releases/detail/utils.tsx b/static/app/views/releases/detail/utils.tsx
index d08454b747d04a..3efaaaad0544c7 100644
--- a/static/app/views/releases/detail/utils.tsx
+++ b/static/app/views/releases/detail/utils.tsx
@@ -35,18 +35,18 @@ export function getFilesByRepository(fileList: CommitFile[]) {
       filesByRepository[repoName] = {};
     }
 
-    if (!filesByRepository[repoName].hasOwnProperty(filename)) {
-      filesByRepository[repoName][filename] = {
+    if (!filesByRepository[repoName]!.hasOwnProperty(filename)) {
+      filesByRepository[repoName]![filename] = {
         authors: {},
         types: new Set(),
       };
     }
 
     if (author.email) {
-      filesByRepository[repoName][filename].authors[author.email] = author;
+      filesByRepository[repoName]![filename].authors[author.email] = author;
     }
 
-    filesByRepository[repoName][filename].types.add(type);
+    filesByRepository[repoName]![filename].types.add(type);
 
     return filesByRepository;
   }, {});
@@ -63,7 +63,7 @@ export function getCommitsByRepository(commitList: Commit[]): CommitsByRepositor
       commitsByRepository[repositoryName] = [];
     }
 
-    commitsByRepository[repositoryName].push(commit);
+    commitsByRepository[repositoryName]!.push(commit);
 
     return commitsByRepository;
   }, {});
diff --git a/static/app/views/releases/list/index.spec.tsx b/static/app/views/releases/list/index.spec.tsx
index db809e37ad3608..441c6fa1b95c2e 100644
--- a/static/app/views/releases/list/index.spec.tsx
+++ b/static/app/views/releases/list/index.spec.tsx
@@ -1,3 +1,4 @@
+import {LocationFixture} from 'sentry-fixture/locationFixture';
 import {OrganizationFixture} from 'sentry-fixture/organization';
 import {ProjectFixture} from 'sentry-fixture/project';
 import {ReleaseFixture} from 'sentry-fixture/release';
@@ -60,7 +61,8 @@ describe('ReleasesList', () => {
       },
     },
   };
-  let endpointMock, sessionApiMock;
+  let endpointMock: jest.Mock;
+  let sessionApiMock: jest.Mock;
 
   beforeEach(() => {
     act(() => ProjectsStore.loadInitialData(projects));
@@ -118,7 +120,7 @@ describe('ReleasesList', () => {
     });
     const items = await screen.findAllByTestId('release-panel');
 
-    expect(items.length).toEqual(3);
+    expect(items).toHaveLength(3);
 
     expect(within(items.at(0)!).getByText('1.0.0')).toBeInTheDocument();
     expect(within(items.at(0)!).getByText('Adoption')).toBeInTheDocument();
@@ -130,7 +132,7 @@ describe('ReleasesList', () => {
   });
 
   it('displays the right empty state', async () => {
-    let location;
+    let location: ReturnType<typeof LocationFixture>;
 
     const project = ProjectFixture({
       id: '3',
@@ -155,7 +157,7 @@ describe('ReleasesList', () => {
       body: [],
     });
     // does not have releases set up and no releases
-    location = {...routerProps.location, query: {}};
+    location = LocationFixture({...routerProps.location, query: {}});
     const {rerender} = render(
       <ReleasesList
         {...props}
@@ -172,7 +174,7 @@ describe('ReleasesList', () => {
     expect(screen.queryByTestId('release-panel')).not.toBeInTheDocument();
 
     // has releases set up and no releases
-    location = {query: {query: 'abc'}};
+    location = LocationFixture({query: {query: 'abc'}});
     rerender(
       <ReleasesList
         {...props}
@@ -185,7 +187,9 @@ describe('ReleasesList', () => {
       await screen.findByText("There are no releases that match: 'abc'.")
     ).toBeInTheDocument();
 
-    location = {query: {sort: ReleasesSortOption.SESSIONS, statsPeriod: '7d'}};
+    location = LocationFixture({
+      query: {sort: ReleasesSortOption.SESSIONS, statsPeriod: '7d'},
+    });
     rerender(
       <ReleasesList
         {...props}
@@ -198,7 +202,9 @@ describe('ReleasesList', () => {
       await screen.findByText('There are no releases with data in the last 7 days.')
     ).toBeInTheDocument();
 
-    location = {query: {sort: ReleasesSortOption.USERS_24_HOURS, statsPeriod: '7d'}};
+    location = LocationFixture({
+      query: {sort: ReleasesSortOption.USERS_24_HOURS, statsPeriod: '7d'},
+    });
     rerender(
       <ReleasesList
         {...props}
@@ -213,7 +219,9 @@ describe('ReleasesList', () => {
       )
     ).toBeInTheDocument();
 
-    location = {query: {sort: ReleasesSortOption.SESSIONS_24_HOURS, statsPeriod: '7d'}};
+    location = LocationFixture({
+      query: {sort: ReleasesSortOption.SESSIONS_24_HOURS, statsPeriod: '7d'},
+    });
     rerender(
       <ReleasesList
         {...props}
@@ -228,7 +236,7 @@ describe('ReleasesList', () => {
       )
     ).toBeInTheDocument();
 
-    location = {query: {sort: ReleasesSortOption.BUILD}};
+    location = LocationFixture({query: {sort: ReleasesSortOption.BUILD}});
     rerender(
       <ReleasesList
         {...props}
@@ -252,7 +260,7 @@ describe('ReleasesList', () => {
       statusCode: 400,
     });
 
-    render(<ReleasesList {...props} />, {
+    render(<ReleasesList {...props} selection={{...props.selection, projects: [3]}} />, {
       router,
       organization,
     });
@@ -261,7 +269,7 @@ describe('ReleasesList', () => {
 
     // we want release header to be visible despite the error message
     expect(
-      await screen.getByRole('combobox', {
+      await screen.findByRole('combobox', {
         name: 'Add a search term',
       })
     ).toBeInTheDocument();
@@ -574,7 +582,7 @@ describe('ReleasesList', () => {
     const hiddenProjectsMessage = await screen.findByTestId('hidden-projects');
     expect(hiddenProjectsMessage).toHaveTextContent('2 hidden projects');
 
-    expect(screen.getAllByTestId('release-card-project-row').length).toBe(1);
+    expect(screen.getAllByTestId('release-card-project-row')).toHaveLength(1);
 
     expect(screen.getByTestId('badge-display-name')).toHaveTextContent('test2');
   });
diff --git a/static/app/views/releases/list/index.tsx b/static/app/views/releases/list/index.tsx
index 7d34aadb6cbe56..534d12127c2c2c 100644
--- a/static/app/views/releases/list/index.tsx
+++ b/static/app/views/releases/list/index.tsx
@@ -187,6 +187,12 @@ class ReleasesList extends DeprecatedAsyncView<Props, State> {
   getSelectedProject(): Project | undefined {
     const {selection, projects} = this.props;
 
+    // Return the first project when 'All Projects' is displayed.
+    // This ensures the onboarding panel is shown correctly, for example.
+    if (selection.projects.length === 0) {
+      return projects[0];
+    }
+
     const selectedProjectId =
       selection.projects && selection.projects.length === 1 && selection.projects[0];
     return projects?.find(p => p.id === `${selectedProjectId}`);
@@ -507,7 +513,7 @@ class ReleasesList extends DeprecatedAsyncView<Props, State> {
 
               {releases.map((release, index) => (
                 <ReleaseCard
-                  key={`${release.projects[0].slug}-${release.version}`}
+                  key={`${release.projects[0]!.slug}-${release.version}`}
                   activeDisplay={activeDisplay}
                   release={release}
                   organization={organization}
diff --git a/static/app/views/releases/list/releaseCard/index.tsx b/static/app/views/releases/list/releaseCard/index.tsx
index 7f8f7be357d2d5..34cec2e0ff2c24 100644
--- a/static/app/views/releases/list/releaseCard/index.tsx
+++ b/static/app/views/releases/list/releaseCard/index.tsx
@@ -30,13 +30,13 @@ import ReleaseCardStatsPeriod from './releaseCardStatsPeriod';
 function getReleaseProjectId(release: Release, selection: PageFilters) {
   // if a release has only one project
   if (release.projects.length === 1) {
-    return release.projects[0].id;
+    return release.projects[0]!.id;
   }
 
   // if only one project is selected in global header and release has it (second condition will prevent false positives like -1)
   if (
     selection.projects.length === 1 &&
-    release.projects.map(p => p.id).includes(selection.projects[0])
+    release.projects.map(p => p.id).includes(selection.projects[0]!)
   ) {
     return selection.projects[0];
   }
diff --git a/static/app/views/releases/list/releaseCard/releaseCardProjectRow.tsx b/static/app/views/releases/list/releaseCard/releaseCardProjectRow.tsx
index cc8b6cf6f751a0..d01566a3bca8eb 100644
--- a/static/app/views/releases/list/releaseCard/releaseCardProjectRow.tsx
+++ b/static/app/views/releases/list/releaseCard/releaseCardProjectRow.tsx
@@ -103,7 +103,7 @@ function ReleaseCardProjectRow({
   const adoptionStage =
     showReleaseAdoptionStages &&
     adoptionStages?.[project.slug] &&
-    adoptionStages?.[project.slug].stage;
+    adoptionStages?.[project.slug]!.stage;
 
   const adoptionStageLabel =
     get24hCountByProject && adoptionStage && isMobileRelease(project.platform)
diff --git a/static/app/views/releases/list/releasesAdoptionChart.tsx b/static/app/views/releases/list/releasesAdoptionChart.tsx
index fc4e8b9e6fbb83..f88154aa9d7083 100644
--- a/static/app/views/releases/list/releasesAdoptionChart.tsx
+++ b/static/app/views/releases/list/releasesAdoptionChart.tsx
@@ -95,7 +95,7 @@ class ReleasesAdoptionChart extends Component<Props> {
       response?.groups.map(group => group.by.release as string) ?? [];
     if (response?.groups && response.groups.length > 50) {
       releases = response!.groups
-        .sort((a, b) => b.totals['sum(session)'] - a.totals['sum(session)'])
+        .sort((a, b) => b.totals['sum(session)']! - a.totals['sum(session)']!)
         .slice(0, 50)
         .map(group => group.by.release as string);
     }
@@ -176,11 +176,11 @@ class ReleasesAdoptionChart extends Component<Props> {
             return null;
           }
 
-          const numDataPoints = releasesSeries[0].data.length;
-          const xAxisData = releasesSeries[0].data.map(point => point.name);
+          const numDataPoints = releasesSeries[0]!.data.length;
+          const xAxisData = releasesSeries[0]!.data.map(point => point.name);
           const hideLastPoint =
             releasesSeries.findIndex(
-              series => series.data[numDataPoints - 1].value > 0
+              series => series.data[numDataPoints - 1]!.value > 0
             ) === -1;
 
           return (
@@ -252,7 +252,7 @@ class ReleasesAdoptionChart extends Component<Props> {
                               series[0].dataIndex === numDataPoints - 1
                                 ? moment(response?.end)
                                 : moment(timestamp).add(
-                                    parseInt(periodObj.period, 10),
+                                    parseInt(periodObj.period!, 10),
                                     periodObj.periodLength as StatsPeriodType
                                   )
                             ).format('MMM D LT');
diff --git a/static/app/views/releases/list/releasesRequest.tsx b/static/app/views/releases/list/releasesRequest.tsx
index a979d24b5a41ac..fcabd639b5be48 100644
--- a/static/app/views/releases/list/releasesRequest.tsx
+++ b/static/app/views/releases/list/releasesRequest.tsx
@@ -202,12 +202,12 @@ class ReleasesRequest extends Component<Props, State> {
 
       this.setState({
         loading: false,
-        statusCountByReleaseInPeriod,
-        totalCountByReleaseIn24h,
-        totalCountByProjectIn24h,
-        statusCountByProjectInPeriod,
-        totalCountByReleaseInPeriod,
-        totalCountByProjectInPeriod,
+        statusCountByReleaseInPeriod: statusCountByReleaseInPeriod!,
+        totalCountByReleaseIn24h: totalCountByReleaseIn24h!,
+        totalCountByProjectIn24h: totalCountByProjectIn24h!,
+        statusCountByProjectInPeriod: statusCountByProjectInPeriod!,
+        totalCountByReleaseInPeriod: totalCountByReleaseInPeriod!,
+        totalCountByProjectInPeriod: totalCountByProjectInPeriod!,
       });
     } catch (error) {
       addErrorMessage(error.responseJSON?.detail ?? t('Error loading health data'));
@@ -359,7 +359,7 @@ class ReleasesRequest extends Component<Props, State> {
 
     const totalCount = statusCountByReleaseInPeriod?.groups
       .filter(({by}) => by.release === version && by.project === project)
-      ?.reduce((acc, group) => acc + group.totals[field], 0);
+      ?.reduce((acc, group) => acc + group.totals[field]!, 0);
 
     const crashedCount = this.getCrashCount(version, project, display);
 
@@ -378,7 +378,7 @@ class ReleasesRequest extends Component<Props, State> {
 
     return totalCountByReleaseIn24h?.groups
       .filter(({by}) => by.release === version && by.project === project)
-      ?.reduce((acc, group) => acc + group.totals[field], 0);
+      ?.reduce((acc, group) => acc + group.totals[field]!, 0);
   };
 
   getPeriodCountByRelease = (
@@ -391,7 +391,7 @@ class ReleasesRequest extends Component<Props, State> {
 
     return totalCountByReleaseInPeriod?.groups
       .filter(({by}) => by.release === version && by.project === project)
-      ?.reduce((acc, group) => acc + group.totals[field], 0);
+      ?.reduce((acc, group) => acc + group.totals[field]!, 0);
   };
 
   get24hCountByProject = (project: number, display: ReleasesDisplayOption) => {
@@ -400,7 +400,7 @@ class ReleasesRequest extends Component<Props, State> {
 
     return totalCountByProjectIn24h?.groups
       .filter(({by}) => by.project === project)
-      ?.reduce((acc, group) => acc + group.totals[field], 0);
+      ?.reduce((acc, group) => acc + group.totals[field]!, 0);
   };
 
   getPeriodCountByProject = (project: number, display: ReleasesDisplayOption) => {
@@ -409,7 +409,7 @@ class ReleasesRequest extends Component<Props, State> {
 
     return totalCountByProjectInPeriod?.groups
       .filter(({by}) => by.project === project)
-      ?.reduce((acc, group) => acc + group.totals[field], 0);
+      ?.reduce((acc, group) => acc + group.totals[field]!, 0);
   };
 
   getTimeSeries = (version: string, project: number, display: ReleasesDisplayOption) => {
diff --git a/static/app/views/releases/utils/sessionTerm.spec.tsx b/static/app/views/releases/utils/sessionTerm.spec.tsx
index 6734332820d3ee..1347e89114c35b 100644
--- a/static/app/views/releases/utils/sessionTerm.spec.tsx
+++ b/static/app/views/releases/utils/sessionTerm.spec.tsx
@@ -96,7 +96,7 @@ describe('Release Health Session Term', function () {
       SessionTerm.CRASHES,
       'java-spring'
     );
-    expect(crashesSessionTerm).toEqual(
+    expect(crashesSessionTerm).toBe(
       'A request that resulted in an unhandled exception and hence a Server Error response'
     );
 
@@ -156,7 +156,7 @@ describe('Release Health Session Term', function () {
       SessionTerm.CRASHES,
       'dotnet-aspnetcore'
     );
-    expect(crashesSessionTerm).toEqual(
+    expect(crashesSessionTerm).toBe(
       'A request that resulted in an unhandled exception and hence a Server Error response'
     );
 
@@ -217,7 +217,7 @@ describe('Release Health Session Term', function () {
 
     // Crashed
     const crashedSessionTerm = getSessionTermDescription(SessionTerm.CRASHED, 'android');
-    expect(crashedSessionTerm).toEqual(
+    expect(crashedSessionTerm).toBe(
       'An unhandled exception that resulted in the application crashing'
     );
 
@@ -265,7 +265,7 @@ describe('Release Health Session Term', function () {
 
     // Crashed
     const crashedSessionTerm = getSessionTermDescription(SessionTerm.CRASHED, 'cordova');
-    expect(crashedSessionTerm).toEqual(
+    expect(crashedSessionTerm).toBe(
       'An unhandled exception that resulted in the application crashing'
     );
 
@@ -319,7 +319,7 @@ describe('Release Health Session Term', function () {
       SessionTerm.CRASHED,
       'react-native'
     );
-    expect(crashedSessionTerm).toEqual(
+    expect(crashedSessionTerm).toBe(
       'An unhandled exception that resulted in the application crashing'
     );
 
@@ -373,7 +373,7 @@ describe('Release Health Session Term', function () {
 
     // Crashed
     const crashedSessionTerm = getSessionTermDescription(SessionTerm.CRASHED, 'flutter');
-    expect(crashedSessionTerm).toEqual(
+    expect(crashedSessionTerm).toBe(
       'An unhandled exception that resulted in the application crashing'
     );
 
@@ -427,9 +427,7 @@ describe('Release Health Session Term', function () {
       SessionTerm.CRASHED,
       'apple-macos'
     );
-    expect(crashedSessionTerm).toEqual(
-      'An error that resulted in the application crashing'
-    );
+    expect(crashedSessionTerm).toBe('An error that resulted in the application crashing');
 
     // Crash Free Users
     const crashFreeUsersSessionTerm = getSessionTermDescription(
@@ -487,7 +485,7 @@ describe('Release Health Session Term', function () {
       SessionTerm.CRASHED,
       'node-express'
     );
-    expect(crashedSessionTerm).toEqual(
+    expect(crashedSessionTerm).toBe(
       'During the session an unhandled global error/promise rejection occurred.'
     );
 
@@ -510,23 +508,21 @@ describe('Release Health Session Term', function () {
       SessionTerm.ABNORMAL,
       'node-express'
     );
-    expect(abnormalSessionTerm).toEqual('Non applicable for Javascript.');
+    expect(abnormalSessionTerm).toBe('Non applicable for Javascript.');
 
     // Healthy
     const healthySessionTerm = getSessionTermDescription(
       SessionTerm.HEALTHY,
       'node-express'
     );
-    expect(healthySessionTerm).toEqual(
-      'No errors were captured during session life-time.'
-    );
+    expect(healthySessionTerm).toBe('No errors were captured during session life-time.');
 
     // Errored
     const erroredSessionTerm = getSessionTermDescription(
       SessionTerm.ERRORED,
       'node-express'
     );
-    expect(erroredSessionTerm).toEqual(
+    expect(erroredSessionTerm).toBe(
       'During the session at least one handled error occurred.'
     );
 
@@ -535,7 +531,7 @@ describe('Release Health Session Term', function () {
       SessionTerm.UNHANDLED,
       'node-express'
     );
-    expect(unhandledSessionTerm).toEqual(
+    expect(unhandledSessionTerm).toBe(
       "An error was captured by the global 'onerror' or 'onunhandledrejection' handler."
     );
   });
@@ -553,7 +549,7 @@ describe('Release Health Session Term', function () {
       SessionTerm.CRASHED,
       'javascript'
     );
-    expect(crashedSessionTerm).toEqual(
+    expect(crashedSessionTerm).toBe(
       'During the session an unhandled global error/promise rejection occurred.'
     );
 
@@ -576,23 +572,21 @@ describe('Release Health Session Term', function () {
       SessionTerm.ABNORMAL,
       'javascript'
     );
-    expect(abnormalSessionTerm).toEqual('Non applicable for Javascript.');
+    expect(abnormalSessionTerm).toBe('Non applicable for Javascript.');
 
     // Healthy
     const healthySessionTerm = getSessionTermDescription(
       SessionTerm.HEALTHY,
       'javascript'
     );
-    expect(healthySessionTerm).toEqual(
-      'No errors were captured during session life-time.'
-    );
+    expect(healthySessionTerm).toBe('No errors were captured during session life-time.');
 
     // Errored
     const erroredSessionTerm = getSessionTermDescription(
       SessionTerm.ERRORED,
       'javascript'
     );
-    expect(erroredSessionTerm).toEqual(
+    expect(erroredSessionTerm).toBe(
       'During the session at least one handled error occurred.'
     );
 
@@ -601,7 +595,7 @@ describe('Release Health Session Term', function () {
       SessionTerm.UNHANDLED,
       'javascript'
     );
-    expect(unhandledSessionTerm).toEqual(
+    expect(unhandledSessionTerm).toBe(
       "An error was captured by the global 'onerror' or 'onunhandledrejection' handler."
     );
   });
@@ -613,7 +607,7 @@ describe('Release Health Session Term', function () {
 
     // Crashed
     const crashedSessionTerm = getSessionTermDescription(SessionTerm.CRASHED, 'rust');
-    expect(crashedSessionTerm).toEqual(
+    expect(crashedSessionTerm).toBe(
       'The application had an unrecoverable error (a panic)'
     );
 
@@ -802,9 +796,7 @@ describe('Release Health Session Term', function () {
 
     // Crashed
     const crashedSessionTerm = getSessionTermDescription(SessionTerm.CRASHED, 'python');
-    expect(crashedSessionTerm).toEqual(
-      'Number of users who experienced an unhandled error'
-    );
+    expect(crashedSessionTerm).toBe('Number of users who experienced an unhandled error');
 
     // Crash Free Users
     const crashFreeUsersSessionTerm = getSessionTermDescription(
@@ -822,7 +814,7 @@ describe('Release Health Session Term', function () {
 
     // Abnormal
     const abnormalSessionTerm = getSessionTermDescription(SessionTerm.ABNORMAL, 'python');
-    expect(abnormalSessionTerm).toEqual('An unknown session exit');
+    expect(abnormalSessionTerm).toBe('An unknown session exit');
 
     // Healthy
     const healthySessionTerm = getSessionTermDescription(SessionTerm.HEALTHY, 'python');
@@ -847,9 +839,7 @@ describe('Release Health Session Term', function () {
 
     // Crashed
     const crashedSessionTerm = getSessionTermDescription(SessionTerm.CRASHED, null);
-    expect(crashedSessionTerm).toEqual(
-      'Number of users who experienced an unhandled error'
-    );
+    expect(crashedSessionTerm).toBe('Number of users who experienced an unhandled error');
 
     // Crash Free Users
     const crashFreeUsersSessionTerm = getSessionTermDescription(
@@ -867,7 +857,7 @@ describe('Release Health Session Term', function () {
 
     // Abnormal
     const abnormalSessionTerm = getSessionTermDescription(SessionTerm.ABNORMAL, null);
-    expect(abnormalSessionTerm).toEqual('An unknown session exit');
+    expect(abnormalSessionTerm).toBe('An unknown session exit');
 
     // Healthy
     const healthySessionTerm = getSessionTermDescription(SessionTerm.HEALTHY, null);
diff --git a/static/app/views/relocation/index.spec.tsx b/static/app/views/relocation/index.spec.tsx
index 1a15e9719c7635..18c3b34267a582 100644
--- a/static/app/views/relocation/index.spec.tsx
+++ b/static/app/views/relocation/index.spec.tsx
@@ -30,7 +30,7 @@ describe('Relocation Onboarding Container', function () {
     // be safe to ignore this error, but we should remove the mock once we move to react testing
     // library.
     //
-    // eslint-disable-next-line no-console
+
     jest.spyOn(console, 'error').mockImplementation(jest.fn());
   });
 
@@ -50,7 +50,7 @@ describe('Relocation Onboarding Container', function () {
     ).not.toBeInTheDocument();
   });
 
-  it('should not render if feature disabled', async function () {
+  it('should not render if feature disabled', function () {
     const {routerProps, router, organization} = initializeOrg({
       router: {
         params: {step: '1'},
@@ -61,8 +61,6 @@ describe('Relocation Onboarding Container', function () {
       router,
       organization,
     });
-    expect(
-      await screen.queryByText("You don't have access to this feature")
-    ).toBeInTheDocument();
+    expect(screen.getByText("You don't have access to this feature")).toBeInTheDocument();
   });
 });
diff --git a/static/app/views/relocation/relocation.spec.tsx b/static/app/views/relocation/relocation.spec.tsx
index 9aefa7d806d45e..8111bec5fb1380 100644
--- a/static/app/views/relocation/relocation.spec.tsx
+++ b/static/app/views/relocation/relocation.spec.tsx
@@ -9,7 +9,7 @@ import {
 
 import {addErrorMessage, addSuccessMessage} from 'sentry/actionCreators/indicator';
 import ConfigStore from 'sentry/stores/configStore';
-import {browserHistory} from 'sentry/utils/browserHistory';
+import type {InjectedRouter} from 'sentry/types/legacyReactRouter';
 import Relocation from 'sentry/views/relocation/relocation';
 
 jest.mock('sentry/actionCreators/indicator');
@@ -38,6 +38,7 @@ const fakeRegions: {[key: string]: FakeRegion} = {
 };
 
 describe('Relocation', function () {
+  let router: InjectedRouter;
   let fetchExistingRelocations: jest.Mock;
   let fetchPublicKeys: jest.Mock;
 
@@ -47,11 +48,11 @@ describe('Relocation', function () {
     sessionStorage.clear();
 
     ConfigStore.set('regions', [
-      {name: fakeRegions.Earth.name, url: fakeRegions.Earth.url},
-      {name: fakeRegions.Moon.name, url: fakeRegions.Moon.url},
+      {name: fakeRegions.Earth!.name, url: fakeRegions.Earth!.url},
+      {name: fakeRegions.Moon!.name, url: fakeRegions.Moon!.url},
     ]);
     ConfigStore.set('relocationConfig', {
-      selectableRegions: [fakeRegions.Earth.name, fakeRegions.Moon.name],
+      selectableRegions: [fakeRegions.Earth!.name, fakeRegions.Moon!.name],
     });
 
     // For tests that don't care about the difference between our "earth" and "moon" regions, we can
@@ -71,7 +72,7 @@ describe('Relocation', function () {
     // be safe to ignore this error, but we should remove the mock once we move to react testing
     // library.
     //
-    // eslint-disable-next-line no-console
+
     jest.spyOn(console, 'error').mockImplementation(jest.fn());
   });
 
@@ -81,16 +82,17 @@ describe('Relocation', function () {
     sessionStorage.clear();
   });
 
-  function renderPage(step) {
+  function renderPage(step: string) {
     const routeParams = {
       step,
     };
 
-    const {router, routerProps, organization} = initializeOrg({
+    const {routerProps, organization, ...rest} = initializeOrg({
       router: {
         params: routeParams,
       },
     });
+    router = rest.router;
 
     return render(<Relocation {...routerProps} />, {
       router,
@@ -98,14 +100,14 @@ describe('Relocation', function () {
     });
   }
 
-  async function waitForRenderSuccess(step) {
+  async function waitForRenderSuccess(step: string) {
     renderPage(step);
-    await waitFor(() => expect(screen.getByTestId(step)).toBeInTheDocument());
+    await screen.findByTestId(step);
   }
 
-  async function waitForRenderError(step) {
+  async function waitForRenderError(step: string) {
     renderPage(step);
-    await waitFor(() => expect(screen.getByTestId('loading-error')).toBeInTheDocument());
+    await screen.findByTestId('loading-error');
   }
 
   describe('Get Started', function () {
@@ -144,7 +146,7 @@ describe('Relocation', function () {
       await waitFor(() => expect(fetchExistingRelocations).toHaveBeenCalledTimes(2));
       await waitFor(() => expect(fetchPublicKeys).toHaveBeenCalledTimes(2));
 
-      expect(browserHistory.push).toHaveBeenCalledWith('/relocation/in-progress/');
+      expect(router.push).toHaveBeenCalledWith('/relocation/in-progress/');
     });
 
     it('should prevent user from going to the next step if no org slugs or region are entered', async function () {
@@ -164,7 +166,7 @@ describe('Relocation', function () {
       });
 
       await userEvent.type(screen.getByLabelText('org-slugs'), fakeOrgSlug);
-      await userEvent.type(screen.getByLabelText('region'), fakeRegions.Earth.name);
+      await userEvent.type(screen.getByLabelText('region'), fakeRegions.Earth!.name);
       await userEvent.click(screen.getByRole('menuitemradio'));
       expect(screen.getByRole('button', {name: 'Continue'})).toBeEnabled();
 
@@ -181,7 +183,7 @@ describe('Relocation', function () {
         JSON.stringify({
           orgSlugs: fakeOrgSlug,
           promoCode: fakePromoCode,
-          regionUrl: fakeRegions.Earth.url,
+          regionUrl: fakeRegions.Earth!.url,
         })
       );
 
@@ -202,7 +204,7 @@ describe('Relocation', function () {
       });
 
       await userEvent.type(screen.getByLabelText('org-slugs'), fakeOrgSlug);
-      await userEvent.type(screen.getByLabelText('region'), fakeRegions.Earth.name);
+      await userEvent.type(screen.getByLabelText('region'), fakeRegions.Earth!.name);
       await userEvent.click(screen.getByRole('menuitemradio'));
       expect(screen.getByRole('button', {name: 'Continue'})).toBeEnabled();
 
@@ -222,12 +224,12 @@ describe('Relocation', function () {
 
       // Note: only one fails, but that is enough.
       const failingFetchExistingEarthRelocation = MockApiClient.addMockResponse({
-        host: fakeRegions.Earth.url,
+        host: fakeRegions.Earth!.url,
         url: `/relocations/`,
         statusCode: 400,
       });
       const successfulFetchExistingMoonRelocation = MockApiClient.addMockResponse({
-        host: fakeRegions.Moon.url,
+        host: fakeRegions.Moon!.url,
         url: '/relocations/',
         body: [],
       });
@@ -252,14 +254,14 @@ describe('Relocation', function () {
       expect(screen.getByRole('button', {name: 'Retry'})).toBeInTheDocument();
 
       const successfulFetchExistingEarthRelocation = MockApiClient.addMockResponse({
-        host: fakeRegions.Earth.url,
+        host: fakeRegions.Earth!.url,
         url: '/relocations/',
         body: [],
       });
 
       await userEvent.click(screen.getByRole('button', {name: 'Retry'}));
       await waitFor(() => expect(fetchPublicKeys).toHaveBeenCalledTimes(2));
-      await waitFor(() => expect(screen.getByTestId('get-started')).toBeInTheDocument());
+      await screen.findByTestId('get-started');
 
       await waitFor(() =>
         expect(successfulFetchExistingEarthRelocation).toHaveBeenCalledTimes(1)
@@ -267,8 +269,8 @@ describe('Relocation', function () {
       await waitFor(() =>
         expect(successfulFetchExistingMoonRelocation).toHaveBeenCalledTimes(2)
       );
-      expect(screen.queryByLabelText('org-slugs')).toBeInTheDocument();
-      expect(screen.queryByRole('button', {name: 'Continue'})).toBeInTheDocument();
+      expect(screen.getByLabelText('org-slugs')).toBeInTheDocument();
+      expect(screen.getByRole('button', {name: 'Continue'})).toBeInTheDocument();
     });
   });
 
@@ -279,7 +281,7 @@ describe('Relocation', function () {
         JSON.stringify({
           orgSlugs: fakeOrgSlug,
           promoCode: fakePromoCode,
-          regionUrl: fakeRegions.Earth.url,
+          regionUrl: fakeRegions.Earth!.url,
         })
       );
     });
@@ -313,15 +315,15 @@ describe('Relocation', function () {
 
       // Note: only one fails, but that is enough.
       const failingFetchEarthPublicKey = MockApiClient.addMockResponse({
-        host: fakeRegions.Earth.url,
+        host: fakeRegions.Earth!.url,
         url: `/publickeys/relocations/`,
         statusCode: 400,
       });
       const successfulFetchMoonPublicKey = MockApiClient.addMockResponse({
-        host: fakeRegions.Moon.url,
+        host: fakeRegions.Moon!.url,
         url: '/publickeys/relocations/',
         body: {
-          public_key: fakeRegions.Moon.publicKey,
+          public_key: fakeRegions.Moon!.publicKey,
         },
       });
 
@@ -335,21 +337,21 @@ describe('Relocation', function () {
       expect(screen.getByRole('button', {name: 'Retry'})).toBeInTheDocument();
 
       const successfulFetchEarthPublicKey = MockApiClient.addMockResponse({
-        host: fakeRegions.Earth.url,
+        host: fakeRegions.Earth!.url,
         url: '/publickeys/relocations/',
         body: {
-          public_key: fakeRegions.Earth.publicKey,
+          public_key: fakeRegions.Earth!.publicKey,
         },
       });
 
       await userEvent.click(screen.getByRole('button', {name: 'Retry'}));
       await waitFor(() => expect(successfulFetchEarthPublicKey).toHaveBeenCalledTimes(1));
       await waitFor(() => expect(successfulFetchMoonPublicKey).toHaveBeenCalledTimes(2));
-      await waitFor(() => expect(screen.getByTestId('public-key')).toBeInTheDocument());
+      await screen.findByTestId('public-key');
 
       expect(fetchExistingRelocations).toHaveBeenCalledTimes(2);
-      expect(screen.queryByText('key.pub')).toBeInTheDocument();
-      expect(screen.queryByRole('button', {name: 'Continue'})).toBeInTheDocument();
+      expect(screen.getByText('key.pub')).toBeInTheDocument();
+      expect(screen.getByRole('button', {name: 'Continue'})).toBeInTheDocument();
     });
 
     it('redirects to `get-started` page if expected local storage data is missing', async function () {
@@ -365,7 +367,7 @@ describe('Relocation', function () {
       await waitFor(() => expect(fetchExistingRelocations).toHaveBeenCalledTimes(2));
       await waitFor(() => expect(fetchPublicKeys).toHaveBeenCalledTimes(2));
 
-      expect(browserHistory.push).toHaveBeenCalledWith('/relocation/get-started/');
+      expect(router.push).toHaveBeenCalledWith('/relocation/get-started/');
     });
   });
 
@@ -386,7 +388,7 @@ describe('Relocation', function () {
         'relocationOnboarding',
         JSON.stringify({
           // orgSlugs missing
-          regionUrl: fakeRegions.Earth.url,
+          regionUrl: fakeRegions.Earth!.url,
         })
       );
 
@@ -394,7 +396,7 @@ describe('Relocation', function () {
       await waitFor(() => expect(fetchExistingRelocations).toHaveBeenCalledTimes(2));
       await waitFor(() => expect(fetchPublicKeys).toHaveBeenCalledTimes(2));
 
-      expect(browserHistory.push).toHaveBeenCalledWith('/relocation/get-started/');
+      expect(router.push).toHaveBeenCalledWith('/relocation/get-started/');
     });
   });
 
@@ -405,7 +407,7 @@ describe('Relocation', function () {
         JSON.stringify({
           orgSlugs: fakeOrgSlug,
           promoCode: fakePromoCode,
-          regionUrl: fakeRegions.Earth.url,
+          regionUrl: fakeRegions.Earth!.url,
         })
       );
     });
@@ -463,7 +465,7 @@ describe('Relocation', function () {
 
       await waitForRenderSuccess('get-started');
       await userEvent.type(screen.getByLabelText('org-slugs'), fakeOrgSlug);
-      await userEvent.type(screen.getByLabelText('region'), fakeRegions.Earth.name);
+      await userEvent.type(screen.getByLabelText('region'), fakeRegions.Earth!.name);
       await userEvent.click(screen.getByRole('menuitemradio'));
       await userEvent.click(screen.getByRole('button', {name: 'Continue'}));
 
@@ -476,7 +478,7 @@ describe('Relocation', function () {
       await waitFor(() =>
         expect(postRelocation).toHaveBeenCalledWith(
           '/relocations/',
-          expect.objectContaining({host: fakeRegions.Earth.url, method: 'POST'})
+          expect.objectContaining({host: fakeRegions.Earth!.url, method: 'POST'})
         )
       );
       expect(addSuccessMessage).toHaveBeenCalledWith(
@@ -495,7 +497,7 @@ describe('Relocation', function () {
 
       await waitForRenderSuccess('get-started');
       await userEvent.type(screen.getByLabelText('org-slugs'), fakeOrgSlug);
-      await userEvent.type(screen.getByLabelText('region'), fakeRegions.Earth.name);
+      await userEvent.type(screen.getByLabelText('region'), fakeRegions.Earth!.name);
       await userEvent.click(screen.getByRole('menuitemradio'));
       await userEvent.click(screen.getByRole('button', {name: 'Continue'}));
 
@@ -520,7 +522,7 @@ describe('Relocation', function () {
 
       await waitForRenderSuccess('get-started');
       await userEvent.type(screen.getByLabelText('org-slugs'), fakeOrgSlug);
-      await userEvent.type(screen.getByLabelText('region'), fakeRegions.Earth.name);
+      await userEvent.type(screen.getByLabelText('region'), fakeRegions.Earth!.name);
       await userEvent.click(screen.getByRole('menuitemradio'));
       await userEvent.click(screen.getByRole('button', {name: 'Continue'}));
 
@@ -545,7 +547,7 @@ describe('Relocation', function () {
 
       await waitForRenderSuccess('get-started');
       await userEvent.type(screen.getByLabelText('org-slugs'), fakeOrgSlug);
-      await userEvent.type(screen.getByLabelText('region'), fakeRegions.Earth.name);
+      await userEvent.type(screen.getByLabelText('region'), fakeRegions.Earth!.name);
       await userEvent.click(screen.getByRole('menuitemradio'));
       await userEvent.click(screen.getByRole('button', {name: 'Continue'}));
 
@@ -568,7 +570,7 @@ describe('Relocation', function () {
 
       await waitForRenderSuccess('get-started');
       await userEvent.type(screen.getByLabelText('org-slugs'), fakeOrgSlug);
-      await userEvent.type(screen.getByLabelText('region'), fakeRegions.Earth.name);
+      await userEvent.type(screen.getByLabelText('region'), fakeRegions.Earth!.name);
       await userEvent.click(screen.getByRole('menuitemradio'));
       await userEvent.click(screen.getByRole('button', {name: 'Continue'}));
 
@@ -591,7 +593,7 @@ describe('Relocation', function () {
       await waitFor(() => expect(fetchExistingRelocations).toHaveBeenCalledTimes(2));
       await waitFor(() => expect(fetchPublicKeys).toHaveBeenCalledTimes(2));
 
-      expect(browserHistory.push).toHaveBeenCalledWith('/relocation/get-started/');
+      expect(router.push).toHaveBeenCalledWith('/relocation/get-started/');
     });
   });
 
@@ -625,7 +627,7 @@ describe('Relocation', function () {
       await waitFor(() => expect(fetchExistingRelocations).toHaveBeenCalledTimes(2));
       await waitFor(() => expect(fetchPublicKeys).toHaveBeenCalledTimes(2));
 
-      expect(browserHistory.push).toHaveBeenCalledWith('/relocation/get-started/');
+      expect(router.push).toHaveBeenCalledWith('/relocation/get-started/');
     });
 
     it('redirects to `get-started` page if there is no active relocation', async function () {
@@ -650,7 +652,7 @@ describe('Relocation', function () {
       await waitFor(() => expect(fetchExistingRelocations).toHaveBeenCalledTimes(2));
       await waitFor(() => expect(fetchPublicKeys).toHaveBeenCalledTimes(2));
 
-      expect(browserHistory.push).toHaveBeenCalledWith('/relocation/get-started/');
+      expect(router.push).toHaveBeenCalledWith('/relocation/get-started/');
     });
   });
 });
diff --git a/static/app/views/relocation/relocation.tsx b/static/app/views/relocation/relocation.tsx
index c1b18d77bdc93b..c50c64d6b2a5cb 100644
--- a/static/app/views/relocation/relocation.tsx
+++ b/static/app/views/relocation/relocation.tsx
@@ -225,7 +225,7 @@ function RelocationOnboarding(props: Props) {
   const goNextStep = useCallback(
     (step: StepDescriptor) => {
       const currentStepIndex = onboardingSteps.findIndex(s => s.id === step.id);
-      const nextStep = onboardingSteps[currentStepIndex + 1];
+      const nextStep = onboardingSteps[currentStepIndex + 1]!;
 
       if (step.cornerVariant !== nextStep.cornerVariant) {
         cornerVariantControl.start('none');
@@ -237,7 +237,7 @@ function RelocationOnboarding(props: Props) {
   );
 
   if (!stepObj || stepIndex === -1) {
-    return <Redirect to={normalizeUrl(`/relocation/${onboardingSteps[0].id}/`)} />;
+    return <Redirect to={normalizeUrl(`/relocation/${onboardingSteps[0]!.id}/`)} />;
   }
 
   const headerView =
@@ -249,7 +249,7 @@ function RelocationOnboarding(props: Props) {
             numSteps={onboardingSteps.length}
             currentStepIndex={stepIndex}
             onClick={i => {
-              goToStep(onboardingSteps[i]);
+              goToStep(onboardingSteps[i]!);
             }}
           />
         )}
@@ -259,7 +259,7 @@ function RelocationOnboarding(props: Props) {
   const backButtonView =
     stepId === 'in-progress' ? null : (
       <Back
-        onClick={() => goToStep(onboardingSteps[stepIndex - 1])}
+        onClick={() => goToStep(onboardingSteps[stepIndex - 1]!)}
         animate={stepIndex > 0 ? 'visible' : 'hidden'}
       />
     );
diff --git a/static/app/views/replays/deadRageClick/deadRageClickList.tsx b/static/app/views/replays/deadRageClick/deadRageClickList.tsx
index f9b41d73ca5fcb..608fd5bbba89d3 100644
--- a/static/app/views/replays/deadRageClick/deadRageClickList.tsx
+++ b/static/app/views/replays/deadRageClick/deadRageClickList.tsx
@@ -11,9 +11,9 @@ import Pagination from 'sentry/components/pagination';
 import SentryDocumentTitle from 'sentry/components/sentryDocumentTitle';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import useDeadRageSelectors from 'sentry/utils/replays/hooks/useDeadRageSelectors';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import SelectorTable from 'sentry/views/replays/deadRageClick/selectorTable';
 import ReplayTabs from 'sentry/views/replays/tabs';
@@ -21,6 +21,7 @@ import ReplayTabs from 'sentry/views/replays/tabs';
 export default function DeadRageClickList() {
   const organization = useOrganization();
   const location = useLocation();
+  const navigate = useNavigate();
 
   const {isLoading, isError, data, pageLinks} = useDeadRageSelectors({
     per_page: 50,
@@ -72,7 +73,7 @@ export default function DeadRageClickList() {
             <PaginationNoMargin
               pageLinks={pageLinks}
               onCursor={(cursor, path, searchQuery) => {
-                browserHistory.push({
+                navigate({
                   pathname: path,
                   query: {...searchQuery, cursor},
                 });
diff --git a/static/app/views/replays/deadRageClick/selectorTable.tsx b/static/app/views/replays/deadRageClick/selectorTable.tsx
index 7ae4763710bb3b..90c2ca3c45e42c 100644
--- a/static/app/views/replays/deadRageClick/selectorTable.tsx
+++ b/static/app/views/replays/deadRageClick/selectorTable.tsx
@@ -81,7 +81,7 @@ export default function SelectorTable({
   clickCountSortable,
 }: Props) {
   const {currentSort, makeSortLinkGenerator} = useQueryBasedSorting({
-    defaultSort: {field: clickCountColumns[0].key, kind: 'desc'},
+    defaultSort: {field: clickCountColumns[0]!.key, kind: 'desc'},
     location,
   });
 
diff --git a/static/app/views/replays/detail/breadcrumbs/index.tsx b/static/app/views/replays/detail/breadcrumbs/index.tsx
index 1eac2d60dee5cc..c221a6b749b049 100644
--- a/static/app/views/replays/detail/breadcrumbs/index.tsx
+++ b/static/app/views/replays/detail/breadcrumbs/index.tsx
@@ -83,7 +83,7 @@ function Breadcrumbs() {
   }, [isFetchingExtractions, updateList]);
 
   const renderRow = ({index, key, style, parent}: ListRowProps) => {
-    const item = (items || [])[index];
+    const item = (items || [])[index]!;
 
     return (
       <CellMeasurer
diff --git a/static/app/views/replays/detail/breadcrumbs/useBreadcrumbFilters.tsx b/static/app/views/replays/detail/breadcrumbs/useBreadcrumbFilters.tsx
index 5ee74784844b01..96dbf00fc2675c 100644
--- a/static/app/views/replays/detail/breadcrumbs/useBreadcrumbFilters.tsx
+++ b/static/app/views/replays/detail/breadcrumbs/useBreadcrumbFilters.tsx
@@ -50,6 +50,7 @@ const TYPE_TO_LABEL: Record<string, string> = {
   keydown: 'KeyDown',
   input: 'Input',
   tap: 'User Tap',
+  swipe: 'User Swipe',
   device: 'Device',
   app: 'App',
   custom: 'Custom',
@@ -75,6 +76,7 @@ const OPORCATEGORY_TO_TYPE: Record<string, keyof typeof TYPE_TO_LABEL> = {
   'web-vital': 'webVital',
   'ui.click': 'click',
   'ui.tap': 'tap',
+  'ui.swipe': 'swipe',
   'ui.keyDown': 'keydown',
   'ui.input': 'input',
   feedback: 'feedback',
@@ -151,8 +153,8 @@ function useBreadcrumbFilters({frames}: Options): Return {
       )
         .sort()
         .map(value => ({
-          value,
-          label: typeToLabel(value),
+          value: value!,
+          label: typeToLabel(value!),
         })),
     [frames, type]
   );
diff --git a/static/app/views/replays/detail/console/format.tsx b/static/app/views/replays/detail/console/format.tsx
index 58d80c94198477..144aff724d3a0b 100644
--- a/static/app/views/replays/detail/console/format.tsx
+++ b/static/app/views/replays/detail/console/format.tsx
@@ -120,7 +120,7 @@ export default function Format({onExpand, expandPaths, args}: FormatProps) {
         ['text-transform', 'textTransform'],
         ['writing-mode', 'writingMode'],
       ]
-        .map(([attr, reactAttr]) => [reactAttr, tempEl.style.getPropertyValue(attr)])
+        .map(([attr, reactAttr]) => [reactAttr, tempEl.style.getPropertyValue(attr!)])
         .filter(([, val]) => !!val)
     );
 
diff --git a/static/app/views/replays/detail/console/index.tsx b/static/app/views/replays/detail/console/index.tsx
index acf21825a332db..efcca35bf02abc 100644
--- a/static/app/views/replays/detail/console/index.tsx
+++ b/static/app/views/replays/detail/console/index.tsx
@@ -84,7 +84,7 @@ function Console() {
           currentHoverTime={currentHoverTime}
           currentTime={currentTime}
           expandPaths={Array.from(expandPathsRef.current?.get(index) || [])}
-          frame={item}
+          frame={item!}
           onMouseEnter={onMouseEnter}
           onMouseLeave={onMouseLeave}
           index={index}
diff --git a/static/app/views/replays/detail/console/messageFormatter.spec.tsx b/static/app/views/replays/detail/console/messageFormatter.spec.tsx
index a04a389c2f4d45..82334527964b6e 100644
--- a/static/app/views/replays/detail/console/messageFormatter.spec.tsx
+++ b/static/app/views/replays/detail/console/messageFormatter.spec.tsx
@@ -21,7 +21,7 @@ describe('MessageFormatter', () => {
       }),
     ]);
 
-    render(<MessageFormatter frame={frame} onExpand={() => {}} />);
+    render(<MessageFormatter frame={frame!} onExpand={() => {}} />);
 
     expect(screen.getByText('This is a test')).toBeInTheDocument();
   });
@@ -39,9 +39,9 @@ describe('MessageFormatter', () => {
     // This is reasonable because the type, at this point, `frame` is of type
     // `BreadcrumbFrame` and not `ConsoleFrame`.
     // When the type is narrowed to `ConsoleFrame` the `data` field is forced to exist.
-    delete frame.data;
+    delete frame!.data;
 
-    render(<MessageFormatter frame={frame} onExpand={() => {}} />);
+    render(<MessageFormatter frame={frame!} onExpand={() => {}} />);
 
     expect(screen.getByText('This is only a test')).toBeInTheDocument();
   });
@@ -59,7 +59,7 @@ describe('MessageFormatter', () => {
       }),
     ]);
 
-    const {container} = render(<MessageFormatter frame={frame} onExpand={() => {}} />);
+    const {container} = render(<MessageFormatter frame={frame!} onExpand={() => {}} />);
 
     expect(screen.getByText('test 1 false')).toBeInTheDocument();
     expect(container).toHaveTextContent('{}');
@@ -78,7 +78,7 @@ describe('MessageFormatter', () => {
       }),
     ]);
 
-    render(<MessageFormatter frame={frame} onExpand={() => {}} />);
+    render(<MessageFormatter frame={frame!} onExpand={() => {}} />);
 
     expect(screen.getByText('1 item')).toBeInTheDocument();
     await userEvent.click(screen.getByRole('button', {name: '1 item'}));
@@ -97,7 +97,7 @@ describe('MessageFormatter', () => {
       }),
     ]);
 
-    const {container} = render(<MessageFormatter frame={frame} onExpand={() => {}} />);
+    const {container} = render(<MessageFormatter frame={frame!} onExpand={() => {}} />);
 
     expect(container).toHaveTextContent('{}');
   });
@@ -122,7 +122,7 @@ describe('MessageFormatter', () => {
       }),
     ]);
 
-    const {container} = render(<MessageFormatter frame={frame} onExpand={() => {}} />);
+    const {container} = render(<MessageFormatter frame={frame!} onExpand={() => {}} />);
 
     const styledEl = screen.getByText('prev state');
     expect(styledEl).toBeInTheDocument();
@@ -147,7 +147,7 @@ describe('MessageFormatter', () => {
       }),
     ]);
 
-    render(<MessageFormatter frame={frame} onExpand={() => {}} />);
+    render(<MessageFormatter frame={frame!} onExpand={() => {}} />);
 
     expect(screen.getByText('test')).toBeInTheDocument();
     expect(screen.getByText('2 items')).toBeInTheDocument();
@@ -169,7 +169,7 @@ describe('MessageFormatter', () => {
       }),
     ]);
 
-    render(<MessageFormatter frame={frame} onExpand={() => {}} />);
+    render(<MessageFormatter frame={frame!} onExpand={() => {}} />);
 
     expect(screen.getByText('This is a literal 100%')).toBeInTheDocument();
   });
@@ -187,7 +187,7 @@ describe('MessageFormatter', () => {
       }),
     ]);
 
-    render(<MessageFormatter frame={frame} onExpand={() => {}} />);
+    render(<MessageFormatter frame={frame!} onExpand={() => {}} />);
 
     expect(screen.getByText('Unbound placeholder %s')).toBeInTheDocument();
   });
@@ -205,7 +205,7 @@ describe('MessageFormatter', () => {
       }),
     ]);
 
-    render(<MessageFormatter frame={frame} onExpand={() => {}} />);
+    render(<MessageFormatter frame={frame!} onExpand={() => {}} />);
 
     expect(screen.getByText('Placeholder myPlaceholder with 100%')).toBeInTheDocument();
   });
@@ -220,7 +220,7 @@ describe('MessageFormatter', () => {
       },
     ]);
 
-    render(<MessageFormatter frame={frame} onExpand={() => {}} />);
+    render(<MessageFormatter frame={frame!} onExpand={() => {}} />);
 
     expect(screen.getByText('cypress custom breadcrumb')).toBeInTheDocument();
   });
diff --git a/static/app/views/replays/detail/console/messageFormatter.tsx b/static/app/views/replays/detail/console/messageFormatter.tsx
index dbe493c029ca55..a617d3a4e09d29 100644
--- a/static/app/views/replays/detail/console/messageFormatter.tsx
+++ b/static/app/views/replays/detail/console/messageFormatter.tsx
@@ -48,7 +48,7 @@ export default function MessageFormatter({frame, expandPaths, onExpand}: Props)
   if (args && isSerializedError(frame)) {
     // Sometimes message can include stacktrace
     const splitMessage = frame.message.split('\n');
-    const errorMessagePiece = splitMessage[0].trim();
+    const errorMessagePiece = splitMessage[0]!.trim();
     // Error.prototype.toString() will prepend the error type meaning it will
     // not be the same as `message` property. We want message only when
     // creating a new Error instance, otherwise the type will repeat.
diff --git a/static/app/views/replays/detail/console/useConsoleFilters.spec.tsx b/static/app/views/replays/detail/console/useConsoleFilters.spec.tsx
index eefa3bae3ca7cf..58436463f0d450 100644
--- a/static/app/views/replays/detail/console/useConsoleFilters.spec.tsx
+++ b/static/app/views/replays/detail/console/useConsoleFilters.spec.tsx
@@ -5,14 +5,16 @@ import {ReplayRecordFixture} from 'sentry-fixture/replayRecord';
 import {renderHook, waitFor} from 'sentry-test/reactTestingLibrary';
 
 import {BreadcrumbLevelType, BreadcrumbType} from 'sentry/types/breadcrumbs';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import hydrateBreadcrumbs from 'sentry/utils/replays/hydrateBreadcrumbs';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import type {FilterFields} from 'sentry/views/replays/detail/console/useConsoleFilters';
 import useConsoleFilters from 'sentry/views/replays/detail/console/useConsoleFilters';
 
 jest.mock('sentry/utils/useLocation');
+jest.mock('sentry/utils/useNavigate');
 
+const mockUseNavigate = jest.mocked(useNavigate);
 const mockUseLocation = jest.mocked(useLocation);
 
 const frames = hydrateBreadcrumbs(ReplayRecordFixture(), [
@@ -93,11 +95,9 @@ const frames = hydrateBreadcrumbs(ReplayRecordFixture(), [
 ]);
 
 describe('useConsoleFilters', () => {
-  beforeEach(() => {
-    jest.mocked(browserHistory.replace).mockReset();
-  });
-
   it('should update the url when setters are called', () => {
+    const mockNavigate = jest.fn();
+    mockUseNavigate.mockReturnValue(mockNavigate);
     const LOG_FILTER = ['error'];
     const SEARCH_FILTER = 'component';
 
@@ -116,23 +116,29 @@ describe('useConsoleFilters', () => {
     });
 
     result.current.setLogLevel(LOG_FILTER);
-    expect(browserHistory.replace).toHaveBeenLastCalledWith({
-      pathname: '/',
-      query: {
-        f_c_logLevel: LOG_FILTER,
+    expect(mockNavigate).toHaveBeenLastCalledWith(
+      {
+        pathname: '/',
+        query: {
+          f_c_logLevel: LOG_FILTER,
+        },
       },
-    });
+      {replace: true}
+    );
 
     rerender({frames});
 
     result.current.setSearchTerm(SEARCH_FILTER);
-    expect(browserHistory.replace).toHaveBeenLastCalledWith({
-      pathname: '/',
-      query: {
-        f_c_logLevel: LOG_FILTER,
-        f_c_search: SEARCH_FILTER,
+    expect(mockNavigate).toHaveBeenLastCalledWith(
+      {
+        pathname: '/',
+        query: {
+          f_c_logLevel: LOG_FILTER,
+          f_c_search: SEARCH_FILTER,
+        },
       },
-    });
+      {replace: true}
+    );
   });
 
   it('should not filter anything when no values are set', async () => {
@@ -144,7 +150,7 @@ describe('useConsoleFilters', () => {
     const {result} = renderHook(useConsoleFilters, {
       initialProps: {frames},
     });
-    await waitFor(() => expect(result.current.items.length).toEqual(5));
+    await waitFor(() => expect(result.current.items).toHaveLength(5));
   });
 
   it('should filter by logLevel', () => {
@@ -158,7 +164,7 @@ describe('useConsoleFilters', () => {
     const {result} = renderHook(useConsoleFilters, {
       initialProps: {frames},
     });
-    expect(result.current.items.length).toEqual(2);
+    expect(result.current.items).toHaveLength(2);
   });
 
   it('should filter by searchTerm', () => {
@@ -172,7 +178,7 @@ describe('useConsoleFilters', () => {
     const {result} = renderHook(useConsoleFilters, {
       initialProps: {frames},
     });
-    expect(result.current.items.length).toEqual(2);
+    expect(result.current.items).toHaveLength(2);
   });
 
   it('should filter by searchTerm and logLevel', () => {
@@ -187,7 +193,7 @@ describe('useConsoleFilters', () => {
     const {result} = renderHook(useConsoleFilters, {
       initialProps: {frames},
     });
-    expect(result.current.items.length).toEqual(1);
+    expect(result.current.items).toHaveLength(1);
   });
 
   describe('getOptions', () => {
@@ -231,7 +237,7 @@ describe('useConsoleFilters', () => {
     });
 
     it('should return a sorted list of BreadcrumbLevelType', () => {
-      const simpleCrumbs = [CRUMB_LOG_1, CRUMB_WARN, CRUMB_ERROR];
+      const simpleCrumbs = [CRUMB_LOG_1!, CRUMB_WARN!, CRUMB_ERROR!];
 
       const {result} = renderHook(useConsoleFilters, {
         initialProps: {frames: simpleCrumbs},
@@ -244,7 +250,7 @@ describe('useConsoleFilters', () => {
     });
 
     it('should deduplicate BreadcrumbLevelType', () => {
-      const simpleCrumbs = [CRUMB_LOG_1, CRUMB_LOG_2];
+      const simpleCrumbs = [CRUMB_LOG_1!, CRUMB_LOG_2!];
 
       const {result} = renderHook(useConsoleFilters, {
         initialProps: {frames: simpleCrumbs},
@@ -253,7 +259,7 @@ describe('useConsoleFilters', () => {
     });
 
     it('should inject extra BreadcrumbLevelType values', () => {
-      const simpleCrumbs = [CRUMB_WARN, CRUMB_ERROR];
+      const simpleCrumbs = [CRUMB_WARN!, CRUMB_ERROR!];
 
       mockUseLocation.mockReturnValue({
         pathname: '/',
diff --git a/static/app/views/replays/detail/errorList/errorHeaderCell.tsx b/static/app/views/replays/detail/errorList/errorHeaderCell.tsx
index 3f5a8737209a13..43f4f96672df0b 100644
--- a/static/app/views/replays/detail/errorList/errorHeaderCell.tsx
+++ b/static/app/views/replays/detail/errorList/errorHeaderCell.tsx
@@ -29,7 +29,7 @@ export const COLUMN_COUNT = COLUMNS.length;
 
 const ErrorHeaderCell = forwardRef<HTMLButtonElement, Props>(
   ({handleSort, index, sortConfig, style}: Props, ref) => {
-    const {field, label, tooltipTitle} = COLUMNS[index];
+    const {field, label, tooltipTitle} = COLUMNS[index]!;
     return (
       <HeaderCell
         ref={ref}
diff --git a/static/app/views/replays/detail/errorList/errorTableCell.tsx b/static/app/views/replays/detail/errorList/errorTableCell.tsx
index 59c29aa3891aca..da24de900e65a0 100644
--- a/static/app/views/replays/detail/errorList/errorTableCell.tsx
+++ b/static/app/views/replays/detail/errorList/errorTableCell.tsx
@@ -219,7 +219,7 @@ const ErrorTableCell = forwardRef<HTMLDivElement, Props>(
       ),
     ];
 
-    return renderFns[columnIndex]();
+    return renderFns[columnIndex]!();
   }
 );
 
diff --git a/static/app/views/replays/detail/errorList/index.tsx b/static/app/views/replays/detail/errorList/index.tsx
index eb390265189704..51dc255774fafd 100644
--- a/static/app/views/replays/detail/errorList/index.tsx
+++ b/static/app/views/replays/detail/errorList/index.tsx
@@ -69,7 +69,7 @@ function ErrorList() {
   });
 
   const cellRenderer = ({columnIndex, rowIndex, key, style, parent}: GridCellProps) => {
-    const error = items[rowIndex - 1];
+    const error = items[rowIndex - 1]!;
 
     return (
       <CellMeasurer
diff --git a/static/app/views/replays/detail/errorList/useErrorFilters.spec.tsx b/static/app/views/replays/detail/errorList/useErrorFilters.spec.tsx
index fe726b6098e2f3..3cbee4af4dd0d3 100644
--- a/static/app/views/replays/detail/errorList/useErrorFilters.spec.tsx
+++ b/static/app/views/replays/detail/errorList/useErrorFilters.spec.tsx
@@ -4,9 +4,9 @@ import {ReplayRecordFixture} from 'sentry-fixture/replayRecord';
 
 import {renderHook, waitFor} from 'sentry-test/reactTestingLibrary';
 
-import {browserHistory} from 'sentry/utils/browserHistory';
 import hydrateErrors from 'sentry/utils/replays/hydrateErrors';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import type {
   ErrorSelectOption,
   FilterFields,
@@ -14,7 +14,9 @@ import type {
 import useErrorFilters from 'sentry/views/replays/detail/errorList/useErrorFilters';
 
 jest.mock('sentry/utils/useLocation');
+jest.mock('sentry/utils/useNavigate');
 
+const mockUseNavigate = jest.mocked(useNavigate);
 const mockUseLocation = jest.mocked(useLocation);
 
 const {
@@ -54,15 +56,13 @@ const {
 );
 
 describe('useErrorFilters', () => {
-  beforeEach(() => {
-    jest.mocked(browserHistory.replace).mockReset();
-  });
-
   it('should update the url when setters are called', () => {
+    const mockNavigate = jest.fn();
+    mockUseNavigate.mockReturnValue(mockNavigate);
     const errorFrames = [
-      ERROR_1_JS_RANGEERROR,
-      ERROR_2_NEXTJS_TYPEERROR,
-      ERROR_3_JS_UNDEFINED,
+      ERROR_1_JS_RANGEERROR!,
+      ERROR_2_NEXTJS_TYPEERROR!,
+      ERROR_3_JS_UNDEFINED!,
     ];
 
     const PROJECT_OPTION = {
@@ -87,30 +87,36 @@ describe('useErrorFilters', () => {
     });
 
     result.current.setFilters([PROJECT_OPTION]);
-    expect(browserHistory.replace).toHaveBeenLastCalledWith({
-      pathname: '/',
-      query: {
-        f_e_project: [PROJECT_OPTION.value],
+    expect(mockNavigate).toHaveBeenLastCalledWith(
+      {
+        pathname: '/',
+        query: {
+          f_e_project: [PROJECT_OPTION.value],
+        },
       },
-    });
+      {replace: true}
+    );
 
     rerender({errorFrames});
 
     result.current.setSearchTerm(SEARCH_FILTER);
-    expect(browserHistory.replace).toHaveBeenLastCalledWith({
-      pathname: '/',
-      query: {
-        f_e_project: [PROJECT_OPTION.value],
-        f_e_search: SEARCH_FILTER,
+    expect(mockNavigate).toHaveBeenLastCalledWith(
+      {
+        pathname: '/',
+        query: {
+          f_e_project: [PROJECT_OPTION.value],
+          f_e_search: SEARCH_FILTER,
+        },
       },
-    });
+      {replace: true}
+    );
   });
 
   it('should not filter anything when no values are set', async () => {
     const errorFrames = [
-      ERROR_1_JS_RANGEERROR,
-      ERROR_2_NEXTJS_TYPEERROR,
-      ERROR_3_JS_UNDEFINED,
+      ERROR_1_JS_RANGEERROR!,
+      ERROR_2_NEXTJS_TYPEERROR!,
+      ERROR_3_JS_UNDEFINED!,
     ];
 
     mockUseLocation.mockReturnValue({
@@ -126,9 +132,9 @@ describe('useErrorFilters', () => {
 
   it('should filter by project', () => {
     const errorFrames = [
-      ERROR_1_JS_RANGEERROR,
-      ERROR_2_NEXTJS_TYPEERROR,
-      ERROR_3_JS_UNDEFINED,
+      ERROR_1_JS_RANGEERROR!,
+      ERROR_2_NEXTJS_TYPEERROR!,
+      ERROR_3_JS_UNDEFINED!,
     ];
 
     mockUseLocation.mockReturnValue({
@@ -142,16 +148,16 @@ describe('useErrorFilters', () => {
       initialProps: {errorFrames},
     });
     expect(result.current.items).toStrictEqual([
-      ERROR_1_JS_RANGEERROR,
-      ERROR_3_JS_UNDEFINED,
+      ERROR_1_JS_RANGEERROR!,
+      ERROR_3_JS_UNDEFINED!,
     ]);
   });
 
   it('should filter by searchTerm', () => {
     const errorFrames = [
-      ERROR_1_JS_RANGEERROR,
-      ERROR_2_NEXTJS_TYPEERROR,
-      ERROR_3_JS_UNDEFINED,
+      ERROR_1_JS_RANGEERROR!,
+      ERROR_2_NEXTJS_TYPEERROR!,
+      ERROR_3_JS_UNDEFINED!,
     ];
 
     mockUseLocation.mockReturnValue({
@@ -179,7 +185,7 @@ describe('useErrorFilters', () => {
     });
 
     it('should return a sorted list of project slugs', () => {
-      const errorFrames = [ERROR_2_NEXTJS_TYPEERROR, ERROR_3_JS_UNDEFINED];
+      const errorFrames = [ERROR_2_NEXTJS_TYPEERROR!, ERROR_3_JS_UNDEFINED!];
 
       const {result} = renderHook(useErrorFilters, {
         initialProps: {errorFrames},
@@ -192,7 +198,7 @@ describe('useErrorFilters', () => {
     });
 
     it('should deduplicate BreadcrumbType', () => {
-      const errorFrames = [ERROR_1_JS_RANGEERROR, ERROR_3_JS_UNDEFINED];
+      const errorFrames = [ERROR_1_JS_RANGEERROR!, ERROR_3_JS_UNDEFINED!];
 
       const {result} = renderHook(useErrorFilters, {
         initialProps: {errorFrames},
diff --git a/static/app/views/replays/detail/errorList/useSortErrors.spec.tsx b/static/app/views/replays/detail/errorList/useSortErrors.spec.tsx
index bde4d73fcffdbe..a2de9377be52a1 100644
--- a/static/app/views/replays/detail/errorList/useSortErrors.spec.tsx
+++ b/static/app/views/replays/detail/errorList/useSortErrors.spec.tsx
@@ -58,7 +58,11 @@ const {
 );
 
 describe('useSortErrors', () => {
-  const items = [ERROR_1_JS_RANGEERROR, ERROR_3_JS_UNDEFINED, ERROR_2_NEXTJS_TYPEERROR];
+  const items = [
+    ERROR_1_JS_RANGEERROR!,
+    ERROR_3_JS_UNDEFINED!,
+    ERROR_2_NEXTJS_TYPEERROR!,
+  ];
 
   it('should the list by timestamp by default', () => {
     const {result} = renderHook(useSortErrors, {
@@ -71,9 +75,9 @@ describe('useSortErrors', () => {
       getValue: expect.any(Function),
     });
     expect(result.current.items).toStrictEqual([
-      ERROR_1_JS_RANGEERROR,
-      ERROR_2_NEXTJS_TYPEERROR,
-      ERROR_3_JS_UNDEFINED,
+      ERROR_1_JS_RANGEERROR!,
+      ERROR_2_NEXTJS_TYPEERROR!,
+      ERROR_3_JS_UNDEFINED!,
     ]);
   });
 
@@ -94,9 +98,9 @@ describe('useSortErrors', () => {
       getValue: expect.any(Function),
     });
     expect(result.current.items).toStrictEqual([
-      ERROR_3_JS_UNDEFINED,
-      ERROR_2_NEXTJS_TYPEERROR,
-      ERROR_1_JS_RANGEERROR,
+      ERROR_3_JS_UNDEFINED!,
+      ERROR_2_NEXTJS_TYPEERROR!,
+      ERROR_1_JS_RANGEERROR!,
     ]);
   });
 
@@ -117,17 +121,17 @@ describe('useSortErrors', () => {
       getValue: expect.any(Function),
     });
     expect(result.current.items).toStrictEqual([
-      ERROR_1_JS_RANGEERROR,
-      ERROR_3_JS_UNDEFINED,
-      ERROR_2_NEXTJS_TYPEERROR,
+      ERROR_1_JS_RANGEERROR!,
+      ERROR_3_JS_UNDEFINED!,
+      ERROR_2_NEXTJS_TYPEERROR!,
     ]);
   });
 
   it('should sort by project', () => {
     const mixedItems = [
-      ERROR_3_JS_UNDEFINED,
-      ERROR_2_NEXTJS_TYPEERROR,
-      ERROR_1_JS_RANGEERROR,
+      ERROR_3_JS_UNDEFINED!,
+      ERROR_2_NEXTJS_TYPEERROR!,
+      ERROR_1_JS_RANGEERROR!,
     ];
     const {result, rerender} = renderHook(useSortErrors, {
       initialProps: {items: mixedItems},
@@ -145,9 +149,9 @@ describe('useSortErrors', () => {
       getValue: expect.any(Function),
     });
     expect(result.current.items).toStrictEqual([
-      ERROR_3_JS_UNDEFINED,
-      ERROR_1_JS_RANGEERROR,
-      ERROR_2_NEXTJS_TYPEERROR,
+      ERROR_3_JS_UNDEFINED!,
+      ERROR_1_JS_RANGEERROR!,
+      ERROR_2_NEXTJS_TYPEERROR!,
     ]);
 
     act(() => {
diff --git a/static/app/views/replays/detail/iconWrapper.tsx b/static/app/views/replays/detail/iconWrapper.tsx
deleted file mode 100644
index 9f909505758cdc..00000000000000
--- a/static/app/views/replays/detail/iconWrapper.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import styled from '@emotion/styled';
-
-import type {SVGIconProps} from 'sentry/icons/svgIcon';
-
-/**
- * Taken `from events/interfaces/.../breadcrumbs/types`
- */
-const IconWrapper = styled('div')<
-  {hasOccurred: boolean} & Required<Pick<SVGIconProps, 'color'>>
->`
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 24px;
-  min-width: 24px;
-  height: 24px;
-  border-radius: 50%;
-  color: ${p => p.theme.white};
-  background: ${p => p.theme[p.color] ?? p.color};
-  position: relative;
-  opacity: ${p => (p.hasOccurred ? 1 : 0.8)};
-
-  /* Make sure the icon is above the line through the back */
-  z-index: ${p => p.theme.zIndex.initial};
-`;
-
-export default IconWrapper;
diff --git a/static/app/views/replays/detail/network/details/content.spec.tsx b/static/app/views/replays/detail/network/details/content.spec.tsx
index 715b57921e8381..d8bc3de63e5cef 100644
--- a/static/app/views/replays/detail/network/details/content.spec.tsx
+++ b/static/app/views/replays/detail/network/details/content.spec.tsx
@@ -111,12 +111,12 @@ const [
 ]);
 
 const mockItems = {
-  img,
-  fetchNoDataObj,
-  fetchUrlSkipped,
-  fetchBodySkipped,
-  fetchWithHeaders,
-  fetchWithRespBody,
+  img: img!,
+  fetchNoDataObj: fetchNoDataObj!,
+  fetchUrlSkipped: fetchUrlSkipped!,
+  fetchBodySkipped: fetchBodySkipped!,
+  fetchWithHeaders: fetchWithHeaders!,
+  fetchWithRespBody: fetchWithRespBody!,
 };
 
 function basicSectionProps() {
@@ -181,7 +181,7 @@ describe('NetworkDetailsContent', () => {
             <NetworkDetailsContent
               {...basicSectionProps()}
               isSetup={isSetup}
-              item={mockItems[itemName]}
+              item={mockItems[itemName as keyof typeof mockItems]}
               visibleTab={visibleTab}
             />
           );
@@ -204,7 +204,7 @@ describe('NetworkDetailsContent', () => {
             <NetworkDetailsContent
               {...basicSectionProps()}
               isSetup={isSetup}
-              item={mockItems[itemName]}
+              item={mockItems[itemName as keyof typeof mockItems]}
               visibleTab={visibleTab}
             />
           );
@@ -228,7 +228,7 @@ describe('NetworkDetailsContent', () => {
             <NetworkDetailsContent
               {...basicSectionProps()}
               isSetup={isSetup}
-              item={mockItems[itemName]}
+              item={mockItems[itemName as keyof typeof mockItems]}
               visibleTab={visibleTab}
             />
           );
@@ -285,7 +285,7 @@ describe('NetworkDetailsContent', () => {
             <NetworkDetailsContent
               {...basicSectionProps()}
               isSetup={isSetup}
-              item={mockItems[itemName]}
+              item={mockItems[itemName as keyof typeof mockItems]}
               visibleTab={visibleTab}
             />
           );
@@ -310,7 +310,7 @@ describe('NetworkDetailsContent', () => {
             <NetworkDetailsContent
               {...basicSectionProps()}
               isSetup={isSetup}
-              item={mockItems[itemName]}
+              item={mockItems[itemName as keyof typeof mockItems]}
               visibleTab={visibleTab}
             />
           );
@@ -330,7 +330,7 @@ describe('NetworkDetailsContent', () => {
             <NetworkDetailsContent
               {...basicSectionProps()}
               isSetup={isSetup}
-              item={mockItems[itemName]}
+              item={mockItems[itemName as keyof typeof mockItems]}
               visibleTab={visibleTab}
             />
           );
@@ -387,7 +387,7 @@ describe('NetworkDetailsContent', () => {
             <NetworkDetailsContent
               {...basicSectionProps()}
               isSetup={isSetup}
-              item={mockItems[itemName]}
+              item={mockItems[itemName as keyof typeof mockItems]}
               visibleTab={visibleTab}
             />
           );
@@ -412,7 +412,7 @@ describe('NetworkDetailsContent', () => {
             <NetworkDetailsContent
               {...basicSectionProps()}
               isSetup={isSetup}
-              item={mockItems[itemName]}
+              item={mockItems[itemName as keyof typeof mockItems]}
               visibleTab={visibleTab}
             />
           );
@@ -432,7 +432,7 @@ describe('NetworkDetailsContent', () => {
             <NetworkDetailsContent
               {...basicSectionProps()}
               isSetup={isSetup}
-              item={mockItems[itemName]}
+              item={mockItems[itemName as keyof typeof mockItems]}
               visibleTab={visibleTab}
             />
           );
diff --git a/static/app/views/replays/detail/network/details/onboarding.spec.tsx b/static/app/views/replays/detail/network/details/onboarding.spec.tsx
index c3f3508f3e5db3..172d16aceb8993 100644
--- a/static/app/views/replays/detail/network/details/onboarding.spec.tsx
+++ b/static/app/views/replays/detail/network/details/onboarding.spec.tsx
@@ -28,9 +28,9 @@ describe('Setup', () => {
 
   describe('Setup is not complete', () => {
     it('should render the full snippet when no setup is done yet', () => {
-      const {container} = render(
+      render(
         <Setup
-          item={MOCK_ITEM}
+          item={MOCK_ITEM!}
           projectId="0"
           showSnippet={Output.SETUP}
           visibleTab="details"
@@ -41,9 +41,23 @@ describe('Setup', () => {
         screen.getByText('Capture Request and Response Headers and Bodies')
       ).toBeInTheDocument();
 
-      expect(container.querySelector('code')).toHaveTextContent(
-        `networkRequestHeaders: ['X-Custom-Header'],`
+      const expectedSnippet = [
+        `Sentry.init({`,
+        `  integrations: [`,
+        `    Sentry.replayIntegration({`,
+        `      networkDetailAllowUrls: ['/api/0/issues/1234'],`,
+        `      networkRequestHeaders: ['X-Custom-Header'],`,
+        `      networkResponseHeaders: ['X-Custom-Header'],`,
+        `    }),`,
+        `  ],`,
+        `})`,
+      ].join('\n');
+      const snippetElem = screen.getByText(
+        `networkRequestHeaders: ['X-Custom-Header'],`,
+        {exact: false}
       );
+      // Using toHaveTextContent would be nice here, but it loses the newlines.
+      expect(snippetElem.innerHTML).toBe(expectedSnippet);
     });
   });
 
@@ -51,7 +65,7 @@ describe('Setup', () => {
     it('should render a note on the Details tab to allow this url', () => {
       render(
         <Setup
-          item={MOCK_ITEM}
+          item={MOCK_ITEM!}
           projectId="0"
           showSnippet={Output.URL_SKIPPED}
           visibleTab="details"
@@ -74,7 +88,7 @@ describe('Setup', () => {
     it('should render a note on the Requst & Response tabs to allow this url and enable capturing bodies', () => {
       render(
         <Setup
-          item={MOCK_ITEM}
+          item={MOCK_ITEM!}
           projectId="0"
           showSnippet={Output.URL_SKIPPED}
           visibleTab="request"
@@ -97,7 +111,7 @@ describe('Setup', () => {
     it('should render a note on the Requst & Response tabs to enable capturing bodies', () => {
       render(
         <Setup
-          item={MOCK_ITEM}
+          item={MOCK_ITEM!}
           projectId="0"
           showSnippet={Output.BODY_SKIPPED}
           visibleTab="request"
@@ -120,7 +134,7 @@ describe('Setup', () => {
     it('should render a short message reminding you to configure custom headers', () => {
       render(
         <Setup
-          item={MOCK_ITEM}
+          item={MOCK_ITEM!}
           projectId="0"
           showSnippet={Output.DATA}
           visibleTab="details"
diff --git a/static/app/views/replays/detail/network/index.tsx b/static/app/views/replays/detail/network/index.tsx
index f2b9afc0ac94d2..989b28e6039949 100644
--- a/static/app/views/replays/detail/network/index.tsx
+++ b/static/app/views/replays/detail/network/index.tsx
@@ -89,9 +89,9 @@ function NetworkList() {
         trackAnalytics('replay.details-network-panel-opened', {
           is_sdk_setup: isNetworkDetailsSetup,
           organization,
-          resource_method: getFrameMethod(item),
-          resource_status: String(getFrameStatus(item)),
-          resource_type: item.op,
+          resource_method: getFrameMethod(item!),
+          resource_status: String(getFrameStatus(item!)),
+          resource_type: item!.op,
         });
       },
       [organization, items, isNetworkDetailsSetup]
@@ -117,7 +117,7 @@ function NetworkList() {
   });
 
   const cellRenderer = ({columnIndex, rowIndex, key, style, parent}: GridCellProps) => {
-    const network = items[rowIndex - 1];
+    const network = items[rowIndex - 1]!;
 
     return (
       <CellMeasurer
diff --git a/static/app/views/replays/detail/network/networkHeaderCell.tsx b/static/app/views/replays/detail/network/networkHeaderCell.tsx
index 01b757a4c83c11..975a225bda5363 100644
--- a/static/app/views/replays/detail/network/networkHeaderCell.tsx
+++ b/static/app/views/replays/detail/network/networkHeaderCell.tsx
@@ -58,7 +58,7 @@ export const COLUMN_COUNT = COLUMNS.length;
 
 const NetworkHeaderCell = forwardRef<HTMLButtonElement, Props>(
   ({handleSort, index, sortConfig, style}: Props, ref) => {
-    const {field, label, tooltipTitle} = COLUMNS[index];
+    const {field, label, tooltipTitle} = COLUMNS[index]!;
     return (
       <HeaderCell
         ref={ref}
diff --git a/static/app/views/replays/detail/network/networkTableCell.tsx b/static/app/views/replays/detail/network/networkTableCell.tsx
index 3f9930cf1c1d61..d700f0612a98d9 100644
--- a/static/app/views/replays/detail/network/networkTableCell.tsx
+++ b/static/app/views/replays/detail/network/networkTableCell.tsx
@@ -172,7 +172,7 @@ const NetworkTableCell = forwardRef<HTMLDivElement, Props>(
       ),
     ];
 
-    return renderFns[columnIndex]();
+    return renderFns[columnIndex]!();
   }
 );
 
diff --git a/static/app/views/replays/detail/network/truncateJson/completeJson.ts b/static/app/views/replays/detail/network/truncateJson/completeJson.ts
index ca7c9ed4bbbbf8..dc14939e65f5e3 100644
--- a/static/app/views/replays/detail/network/truncateJson/completeJson.ts
+++ b/static/app/views/replays/detail/network/truncateJson/completeJson.ts
@@ -29,7 +29,7 @@ export function completeJson(incompleteJson: string, stack: JsonToken[]): string
 
   // Most checks are only needed for the last step in the stack
   const lastPos = stack.length - 1;
-  const lastStep = stack[lastPos];
+  const lastStep = stack[lastPos]!;
 
   json = _fixLastStep(json, lastStep);
 
diff --git a/static/app/views/replays/detail/network/truncateJson/evaluateJson.ts b/static/app/views/replays/detail/network/truncateJson/evaluateJson.ts
index 9bdc4021e2df7a..b330ba09e505fc 100644
--- a/static/app/views/replays/detail/network/truncateJson/evaluateJson.ts
+++ b/static/app/views/replays/detail/network/truncateJson/evaluateJson.ts
@@ -26,9 +26,9 @@ export function evaluateJson(json: string): JsonToken[] {
 }
 
 function _evaluateJsonPos(stack: JsonToken[], json: string, pos: number): void {
-  const curStep = stack[stack.length - 1];
+  const curStep = stack[stack.length - 1]!;
 
-  const char = json[pos];
+  const char = json[pos]!;
 
   const whitespaceRegex = /\s/;
 
diff --git a/static/app/views/replays/detail/network/truncateJson/fixJson.spec.ts b/static/app/views/replays/detail/network/truncateJson/fixJson.spec.ts
index 3348c4e3ab884e..29dca6f274d9a6 100644
--- a/static/app/views/replays/detail/network/truncateJson/fixJson.spec.ts
+++ b/static/app/views/replays/detail/network/truncateJson/fixJson.spec.ts
@@ -69,8 +69,8 @@ describe('Unit  | coreHandlers | util | truncateJson | fixJson', () => {
   });
 
   test.each(['1', '2'])('it works for fixture %s', fixture => {
-    const input = fixtures[fixture].incompleteJson.trim();
-    const expected = fixtures[fixture].completeJson.trim();
+    const input = fixtures[fixture as keyof typeof fixtures].incompleteJson.trim();
+    const expected = fixtures[fixture as keyof typeof fixtures].completeJson.trim();
 
     const actual = fixJson(input);
     expect(actual).toEqual(expected);
diff --git a/static/app/views/replays/detail/network/useNetworkFilters.spec.tsx b/static/app/views/replays/detail/network/useNetworkFilters.spec.tsx
index c38915855a0d7d..3325853d1af495 100644
--- a/static/app/views/replays/detail/network/useNetworkFilters.spec.tsx
+++ b/static/app/views/replays/detail/network/useNetworkFilters.spec.tsx
@@ -9,15 +9,17 @@ import {ReplayRecordFixture} from 'sentry-fixture/replayRecord';
 
 import {renderHook} from 'sentry-test/reactTestingLibrary';
 
-import {browserHistory} from 'sentry/utils/browserHistory';
 import hydrateSpans from 'sentry/utils/replays/hydrateSpans';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 
 import type {FilterFields, NetworkSelectOption} from './useNetworkFilters';
 import useNetworkFilters from './useNetworkFilters';
 
 jest.mock('sentry/utils/useLocation');
+jest.mock('sentry/utils/useNavigate');
 
+const mockUseNavigate = jest.mocked(useNavigate);
 const mockUseLocation = jest.mocked(useLocation);
 
 const [
@@ -105,22 +107,20 @@ const [
 
 describe('useNetworkFilters', () => {
   const networkFrames = [
-    SPAN_0_NAVIGATE,
-    SPAN_1_LINK,
-    SPAN_2_SCRIPT,
-    SPAN_3_FETCH,
-    SPAN_4_IMG,
-    SPAN_5_CSS,
-    SPAN_6_PUSH,
-    SPAN_7_FETCH_GET,
-    SPAN_8_FETCH_POST,
+    SPAN_0_NAVIGATE!,
+    SPAN_1_LINK!,
+    SPAN_2_SCRIPT!,
+    SPAN_3_FETCH!,
+    SPAN_4_IMG!,
+    SPAN_5_CSS!,
+    SPAN_6_PUSH!,
+    SPAN_7_FETCH_GET!,
+    SPAN_8_FETCH_POST!,
   ];
 
-  beforeEach(() => {
-    jest.mocked(browserHistory.replace).mockReset();
-  });
-
   it('should update the url when setters are called', () => {
+    const mockNavigate = jest.fn();
+    mockUseNavigate.mockReturnValue(mockNavigate);
     const TYPE_OPTION: NetworkSelectOption = {
       value: 'resource.fetch',
       label: 'resource.fetch',
@@ -152,41 +152,53 @@ describe('useNetworkFilters', () => {
     });
 
     result.current.setFilters([TYPE_OPTION]);
-    expect(browserHistory.replace).toHaveBeenLastCalledWith({
-      pathname: '/',
-      query: {
-        f_n_method: [],
-        f_n_status: [],
-        f_n_type: [TYPE_OPTION.value],
+    expect(mockNavigate).toHaveBeenLastCalledWith(
+      {
+        pathname: '/',
+        query: {
+          f_n_method: [],
+          f_n_status: [],
+          f_n_type: [TYPE_OPTION.value],
+        },
       },
-    });
+      {replace: true}
+    );
 
     rerender({networkFrames});
 
     result.current.setFilters([TYPE_OPTION, STATUS_OPTION]);
-    expect(browserHistory.replace).toHaveBeenLastCalledWith({
-      pathname: '/',
-      query: {
-        f_n_method: [],
-        f_n_status: [STATUS_OPTION.value],
-        f_n_type: [TYPE_OPTION.value],
+    expect(mockNavigate).toHaveBeenLastCalledWith(
+      {
+        pathname: '/',
+        query: {
+          f_n_method: [],
+          f_n_status: [STATUS_OPTION.value],
+          f_n_type: [TYPE_OPTION.value],
+        },
       },
-    });
+      {replace: true}
+    );
 
     rerender({networkFrames});
 
     result.current.setSearchTerm(SEARCH_FILTER);
-    expect(browserHistory.replace).toHaveBeenLastCalledWith({
-      pathname: '/',
-      query: {
-        f_n_type: [TYPE_OPTION.value],
-        f_n_status: [STATUS_OPTION.value],
-        f_n_search: SEARCH_FILTER,
+    expect(mockNavigate).toHaveBeenLastCalledWith(
+      {
+        pathname: '/',
+        query: {
+          f_n_type: [TYPE_OPTION.value],
+          f_n_status: [STATUS_OPTION.value],
+          f_n_search: SEARCH_FILTER,
+        },
       },
-    });
+      {replace: true}
+    );
   });
 
   it('should clear details params when setters are called', () => {
+    const mockNavigate = jest.fn();
+    mockUseNavigate.mockReturnValue(mockNavigate);
+
     const TYPE_OPTION: NetworkSelectOption = {
       value: 'resource.fetch',
       label: 'resource.fetch',
@@ -230,38 +242,47 @@ describe('useNetworkFilters', () => {
     });
 
     result.current.setFilters([TYPE_OPTION]);
-    expect(browserHistory.replace).toHaveBeenLastCalledWith({
-      pathname: '/',
-      query: {
-        f_n_method: [],
-        f_n_status: [],
-        f_n_type: [TYPE_OPTION.value],
+    expect(mockNavigate).toHaveBeenLastCalledWith(
+      {
+        pathname: '/',
+        query: {
+          f_n_method: [],
+          f_n_status: [],
+          f_n_type: [TYPE_OPTION.value],
+        },
       },
-    });
+      {replace: true}
+    );
 
     rerender({networkFrames});
 
     result.current.setFilters([TYPE_OPTION, STATUS_OPTION]);
-    expect(browserHistory.replace).toHaveBeenLastCalledWith({
-      pathname: '/',
-      query: {
-        f_n_method: [],
-        f_n_status: [STATUS_OPTION.value],
-        f_n_type: [TYPE_OPTION.value],
+    expect(mockNavigate).toHaveBeenLastCalledWith(
+      {
+        pathname: '/',
+        query: {
+          f_n_method: [],
+          f_n_status: [STATUS_OPTION.value],
+          f_n_type: [TYPE_OPTION.value],
+        },
       },
-    });
+      {replace: true}
+    );
 
     rerender({networkFrames});
 
     result.current.setSearchTerm(SEARCH_FILTER);
-    expect(browserHistory.replace).toHaveBeenLastCalledWith({
-      pathname: '/',
-      query: {
-        f_n_status: [STATUS_OPTION.value],
-        f_n_type: [TYPE_OPTION.value],
-        f_n_search: SEARCH_FILTER,
+    expect(mockNavigate).toHaveBeenLastCalledWith(
+      {
+        pathname: '/',
+        query: {
+          f_n_status: [STATUS_OPTION.value],
+          f_n_type: [TYPE_OPTION.value],
+          f_n_search: SEARCH_FILTER,
+        },
       },
-    });
+      {replace: true}
+    );
   });
 
   it('should not filter anything when no values are set', () => {
@@ -377,7 +398,7 @@ describe('getMethodTypes', () => {
   });
 
   it('should return a sorted list of method types', () => {
-    const networkFrames = [SPAN_8_FETCH_POST, SPAN_7_FETCH_GET];
+    const networkFrames = [SPAN_8_FETCH_POST!, SPAN_7_FETCH_GET!];
 
     const {result} = renderHook(useNetworkFilters, {
       initialProps: {networkFrames},
@@ -390,7 +411,7 @@ describe('getMethodTypes', () => {
   });
 
   it('should deduplicate BreadcrumbType', () => {
-    const networkFrames = [SPAN_2_SCRIPT, SPAN_3_FETCH, SPAN_7_FETCH_GET];
+    const networkFrames = [SPAN_2_SCRIPT!, SPAN_3_FETCH!, SPAN_7_FETCH_GET!];
 
     const {result} = renderHook(useNetworkFilters, {
       initialProps: {networkFrames},
@@ -416,7 +437,7 @@ describe('getResourceTypes', () => {
   });
 
   it('should return a sorted list of BreadcrumbType', () => {
-    const networkFrames = [SPAN_0_NAVIGATE, SPAN_1_LINK, SPAN_2_SCRIPT];
+    const networkFrames = [SPAN_0_NAVIGATE!, SPAN_1_LINK!, SPAN_2_SCRIPT!];
 
     const {result} = renderHook(useNetworkFilters, {
       initialProps: {networkFrames},
@@ -432,11 +453,11 @@ describe('getResourceTypes', () => {
 
   it('should deduplicate BreadcrumbType', () => {
     const networkFrames = [
-      SPAN_0_NAVIGATE,
-      SPAN_1_LINK,
-      SPAN_2_SCRIPT,
-      SPAN_3_FETCH,
-      SPAN_7_FETCH_GET,
+      SPAN_0_NAVIGATE!,
+      SPAN_1_LINK!,
+      SPAN_2_SCRIPT!,
+      SPAN_3_FETCH!,
+      SPAN_7_FETCH_GET!,
     ];
 
     const {result} = renderHook(useNetworkFilters, {
@@ -455,10 +476,10 @@ describe('getResourceTypes', () => {
 describe('getStatusTypes', () => {
   it('should return a sorted list of BreadcrumbType', () => {
     const networkFrames = [
-      SPAN_0_NAVIGATE,
-      SPAN_1_LINK,
-      SPAN_2_SCRIPT,
-      SPAN_8_FETCH_POST,
+      SPAN_0_NAVIGATE!,
+      SPAN_1_LINK!,
+      SPAN_2_SCRIPT!,
+      SPAN_8_FETCH_POST!,
     ];
 
     const {result} = renderHook(useNetworkFilters, {
@@ -478,12 +499,12 @@ describe('getStatusTypes', () => {
 
   it('should deduplicate BreadcrumbType', () => {
     const networkFrames = [
-      SPAN_0_NAVIGATE,
-      SPAN_1_LINK,
-      SPAN_2_SCRIPT,
-      SPAN_3_FETCH,
-      SPAN_7_FETCH_GET,
-      SPAN_8_FETCH_POST,
+      SPAN_0_NAVIGATE!,
+      SPAN_1_LINK!,
+      SPAN_2_SCRIPT!,
+      SPAN_3_FETCH!,
+      SPAN_7_FETCH_GET!,
+      SPAN_8_FETCH_POST!,
     ];
 
     const {result} = renderHook(useNetworkFilters, {
diff --git a/static/app/views/replays/detail/network/useSortNetwork.spec.tsx b/static/app/views/replays/detail/network/useSortNetwork.spec.tsx
index 017b2d4804edfe..6018f193ed83b8 100644
--- a/static/app/views/replays/detail/network/useSortNetwork.spec.tsx
+++ b/static/app/views/replays/detail/network/useSortNetwork.spec.tsx
@@ -14,13 +14,13 @@ import useSortNetwork from './useSortNetwork';
 
 jest.mock('sentry/utils/useUrlParams', () => {
   const map = new Map();
-  return (name, dflt) => {
+  return (name: string, dflt: string) => {
     if (!map.has(name)) {
       map.set(name, dflt);
     }
     return {
       getParamValue: () => map.get(name),
-      setParamValue: value => {
+      setParamValue: (value: string) => {
         map.set(name, value);
       },
     };
@@ -112,15 +112,15 @@ const [
 
 describe('useSortNetwork', () => {
   const items = [
-    SPAN_0_NAVIGATE,
-    SPAN_1_LINK,
-    SPAN_2_SCRIPT,
-    SPAN_3_FETCH,
-    SPAN_4_IMG,
-    SPAN_5_CSS,
-    SPAN_6_PUSH,
-    SPAN_7_FETCH_GET,
-    SPAN_8_FETCH_POST,
+    SPAN_0_NAVIGATE!,
+    SPAN_1_LINK!,
+    SPAN_2_SCRIPT!,
+    SPAN_3_FETCH!,
+    SPAN_4_IMG!,
+    SPAN_5_CSS!,
+    SPAN_6_PUSH!,
+    SPAN_7_FETCH_GET!,
+    SPAN_8_FETCH_POST!,
   ];
 
   it('should the list by timestamp by default', () => {
@@ -134,15 +134,15 @@ describe('useSortNetwork', () => {
       getValue: expect.any(Function),
     });
     expect(result.current.items).toStrictEqual([
-      SPAN_5_CSS,
-      SPAN_4_IMG,
-      SPAN_3_FETCH,
-      SPAN_2_SCRIPT,
-      SPAN_1_LINK,
-      SPAN_0_NAVIGATE,
-      SPAN_6_PUSH,
-      SPAN_7_FETCH_GET,
-      SPAN_8_FETCH_POST,
+      SPAN_5_CSS!,
+      SPAN_4_IMG!,
+      SPAN_3_FETCH!,
+      SPAN_2_SCRIPT!,
+      SPAN_1_LINK!,
+      SPAN_0_NAVIGATE!,
+      SPAN_6_PUSH!,
+      SPAN_7_FETCH_GET!,
+      SPAN_8_FETCH_POST!,
     ]);
   });
 
@@ -163,15 +163,15 @@ describe('useSortNetwork', () => {
       getValue: expect.any(Function),
     });
     expect(result.current.items).toStrictEqual([
-      SPAN_8_FETCH_POST,
-      SPAN_7_FETCH_GET,
-      SPAN_6_PUSH,
-      SPAN_5_CSS,
-      SPAN_4_IMG,
-      SPAN_3_FETCH,
-      SPAN_2_SCRIPT,
-      SPAN_1_LINK,
-      SPAN_0_NAVIGATE,
+      SPAN_8_FETCH_POST!,
+      SPAN_7_FETCH_GET!,
+      SPAN_6_PUSH!,
+      SPAN_5_CSS!,
+      SPAN_4_IMG!,
+      SPAN_3_FETCH!,
+      SPAN_2_SCRIPT!,
+      SPAN_1_LINK!,
+      SPAN_0_NAVIGATE!,
     ]);
   });
 
@@ -234,7 +234,7 @@ describe('useSortNetwork', () => {
   });
 
   it('should sort by method, using GET as a default', () => {
-    const mixedItems = [SPAN_6_PUSH, SPAN_8_FETCH_POST, SPAN_7_FETCH_GET];
+    const mixedItems = [SPAN_6_PUSH!, SPAN_8_FETCH_POST!, SPAN_7_FETCH_GET!];
     const {result, rerender} = renderHook(useSortNetwork, {
       initialProps: {items: mixedItems},
     });
diff --git a/static/app/views/replays/detail/page.tsx b/static/app/views/replays/detail/page.tsx
index 87d0893faef718..8a9d9a328541d5 100644
--- a/static/app/views/replays/detail/page.tsx
+++ b/static/app/views/replays/detail/page.tsx
@@ -8,6 +8,7 @@ import UserBadge from 'sentry/components/idBadge/userBadge';
 import FullViewport from 'sentry/components/layouts/fullViewport';
 import * as Layout from 'sentry/components/layouts/thirds';
 import Placeholder from 'sentry/components/placeholder';
+import ConfigureMobileReplayCard from 'sentry/components/replays/configureMobileReplayCard';
 import ConfigureReplayCard from 'sentry/components/replays/configureReplayCard';
 import DetailsPageBreadcrumbs from 'sentry/components/replays/header/detailsPageBreadcrumbs';
 import FeedbackButton from 'sentry/components/replays/header/feedbackButton';
@@ -95,7 +96,7 @@ export default function Page({
         ) : (
           <Fragment>
             {isVideoReplay ? <FeedbackWidgetButton /> : <FeedbackButton />}
-            {isVideoReplay ? null : <ConfigureReplayCard />}
+            {isVideoReplay ? <ConfigureMobileReplayCard /> : <ConfigureReplayCard />}
           </Fragment>
         )}
 
diff --git a/static/app/views/replays/detail/tagPanel/index.tsx b/static/app/views/replays/detail/tagPanel/index.tsx
index 51b494e9a4447c..ba8b2a9635e413 100644
--- a/static/app/views/replays/detail/tagPanel/index.tsx
+++ b/static/app/views/replays/detail/tagPanel/index.tsx
@@ -17,21 +17,6 @@ import TabItemContainer from 'sentry/views/replays/detail/tabItemContainer';
 import TagFilters from 'sentry/views/replays/detail/tagPanel/tagFilters';
 import useTagFilters from 'sentry/views/replays/detail/tagPanel/useTagFilters';
 
-const notSearchable = [
-  'sdk.blockAllMedia',
-  'sdk.errorSampleRate ',
-  'sdk.maskAllInputs',
-  'sdk.maskAllText',
-  'sdk.networkCaptureBodies',
-  'sdk.networkDetailHasUrls',
-  'sdk.networkRequestHasHeaders',
-  'sdk.networkResponseHasHeaders',
-  'sdk.sessionSampleRate',
-  'sdk.shouldRecordCanvas',
-  'sdk.useCompression',
-  'sdk.useCompressionOption',
-];
-
 function TagPanel() {
   const organization = useOrganization();
   const {replay} = useReplayContext();
@@ -43,7 +28,12 @@ function TagPanel() {
     const unorderedTags = {
       ...tags,
       ...Object.fromEntries(
-        Object.entries(sdkOptions ?? {}).map(([key, value]) => ['sdk.' + key, [value]])
+        Object.entries(sdkOptions ?? {}).map(
+          ([key, value]) =>
+            key === 'name' || key === 'version'
+              ? ['sdk.' + key, [value]]
+              : ['sdk.replay.' + key, [value]] // specify tags from the replay sdk; these tags are not searchable
+        )
       ),
     };
 
@@ -90,7 +80,7 @@ function TagPanel() {
                     key={key}
                     name={key}
                     values={values}
-                    generateUrl={notSearchable.includes(key) ? undefined : generateUrl}
+                    generateUrl={key.includes('sdk.replay.') ? undefined : generateUrl}
                   />
                 ))}
               </KeyValueTable>
diff --git a/static/app/views/replays/detail/tagPanel/useTagFilters.spec.tsx b/static/app/views/replays/detail/tagPanel/useTagFilters.spec.tsx
index f1dd253a6f6bae..baab29b42b155f 100644
--- a/static/app/views/replays/detail/tagPanel/useTagFilters.spec.tsx
+++ b/static/app/views/replays/detail/tagPanel/useTagFilters.spec.tsx
@@ -3,22 +3,18 @@ import {ReplayRecordFixture} from 'sentry-fixture/replayRecord';
 
 import {renderHook} from 'sentry-test/reactTestingLibrary';
 
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {useLocation} from 'sentry/utils/useLocation';
 import type {FilterFields} from 'sentry/views/replays/detail/tagPanel/useTagFilters';
 import useTagFilters from 'sentry/views/replays/detail/tagPanel/useTagFilters';
 
 jest.mock('sentry/utils/useLocation');
+jest.mock('sentry/utils/useNavigate');
 
 const mockUseLocation = jest.mocked(useLocation);
 
 const tags = ReplayRecordFixture().tags;
 
 describe('useTagsFilters', () => {
-  beforeEach(() => {
-    jest.mocked(browserHistory.push).mockReset();
-  });
-
   it('should not filter anything when no values are set', () => {
     mockUseLocation.mockReturnValue({
       pathname: '/',
@@ -28,7 +24,7 @@ describe('useTagsFilters', () => {
     const {result} = renderHook(useTagFilters, {
       initialProps: {tags},
     });
-    expect(Object.keys(result.current.items).length).toEqual(9);
+    expect(Object.keys(result.current.items)).toHaveLength(9);
   });
 
   it('should filter by searchTerm', () => {
diff --git a/static/app/views/replays/detail/tagPanel/useTagFilters.tsx b/static/app/views/replays/detail/tagPanel/useTagFilters.tsx
index 2645b7881b8783..bd6cf62c247d54 100644
--- a/static/app/views/replays/detail/tagPanel/useTagFilters.tsx
+++ b/static/app/views/replays/detail/tagPanel/useTagFilters.tsx
@@ -50,7 +50,7 @@ function useTagFilters({tags}: Options): Return {
   const items: Record<string, string[]> = {};
   Object.values(filteredItems).forEach(item => {
     for (const key in item) {
-      items[key] = item[key];
+      items[key] = item[key]!;
     }
   });
 
diff --git a/static/app/views/replays/detail/trace/replayTransactionContext.tsx b/static/app/views/replays/detail/trace/replayTransactionContext.tsx
index d96682a9e830be..aa18d67202ee16 100644
--- a/static/app/views/replays/detail/trace/replayTransactionContext.tsx
+++ b/static/app/views/replays/detail/trace/replayTransactionContext.tsx
@@ -247,7 +247,7 @@ function ReplayTransactionContext({children, replayRecord}: Options) {
         })();
 
         const pageLinks = listResp?.getResponseHeader('Link') ?? null;
-        cursor = parseLinkHeader(pageLinks)?.next;
+        cursor = parseLinkHeader(pageLinks)?.next!;
         const indexComplete = !cursor.results;
         setState(prev => ({...prev, indexComplete}) as InternalState);
       } catch (indexError) {
diff --git a/static/app/views/replays/detail/trace/trace.tsx b/static/app/views/replays/detail/trace/trace.tsx
index 5b6b4fe3959380..35e93656a78be1 100644
--- a/static/app/views/replays/detail/trace/trace.tsx
+++ b/static/app/views/replays/detail/trace/trace.tsx
@@ -88,6 +88,7 @@ const DEFAULT_REPLAY_TRACE_VIEW_PREFERENCES: TracePreferencesState = {
       'drawer left': 0.33,
       'drawer right': 0.33,
       'drawer bottom': 0.4,
+      'trace context height': 150,
     },
     layoutOptions: [],
   },
diff --git a/static/app/views/replays/detail/trace/useReplayTraces.spec.tsx b/static/app/views/replays/detail/trace/useReplayTraces.spec.tsx
index 0bce733c1ef393..7963691469b0ab 100644
--- a/static/app/views/replays/detail/trace/useReplayTraces.spec.tsx
+++ b/static/app/views/replays/detail/trace/useReplayTraces.spec.tsx
@@ -45,11 +45,11 @@ describe('useTraceMeta', () => {
 
     const {result} = renderHook(() => useReplayTraces({replayRecord}));
 
-    expect(result.current.indexComplete).toEqual(false);
+    expect(result.current.indexComplete).toBe(false);
 
     await waitFor(() => expect(result.current.indexComplete).toBe(true));
 
-    expect(result.current.indexComplete).toEqual(true);
+    expect(result.current.indexComplete).toBe(true);
     expect(result.current.replayTraces).toEqual([
       {traceSlug: 'trace1', timestamp: 1},
       {traceSlug: 'trace2', timestamp: 2},
@@ -71,12 +71,12 @@ describe('useTraceMeta', () => {
 
     const {result} = renderHook(() => useReplayTraces({replayRecord}));
 
-    expect(result.current.indexComplete).toEqual(false);
+    expect(result.current.indexComplete).toBe(false);
 
     await waitFor(() => expect(result.current.indexComplete).toBe(true));
 
-    expect(result.current.indexComplete).toEqual(true);
-    expect(result.current.replayTraces).toEqual(undefined);
+    expect(result.current.indexComplete).toBe(true);
+    expect(result.current.replayTraces).toBeUndefined();
     expect(result.current.indexError as Error).toEqual(
       expect.objectContaining({status: 400})
     );
diff --git a/static/app/views/replays/detail/trace/useReplayTraces.tsx b/static/app/views/replays/detail/trace/useReplayTraces.tsx
index 867639aee1821e..5d8c999adc65f4 100644
--- a/static/app/views/replays/detail/trace/useReplayTraces.tsx
+++ b/static/app/views/replays/detail/trace/useReplayTraces.tsx
@@ -103,12 +103,12 @@ export function useReplayTraces({
         const parsedData = data
           .filter(row => row.trace) // Filter out items where trace is not truthy
           .map(row => ({
-            traceSlug: row.trace.toString(),
+            traceSlug: row.trace!.toString(),
             timestamp: getTimeStampFromTableDateField(row['min(timestamp)']),
           }));
 
         const pageLinks = listResp?.getResponseHeader('Link') ?? null;
-        cursor = parseLinkHeader(pageLinks)?.next;
+        cursor = parseLinkHeader(pageLinks)?.next!;
         const indexComplete = !cursor.results;
         setState(prev => ({
           ...prev,
diff --git a/static/app/views/replays/details.tsx b/static/app/views/replays/details.tsx
index 9179dc9fde3ae5..af57abd584c0a3 100644
--- a/static/app/views/replays/details.tsx
+++ b/static/app/views/replays/details.tsx
@@ -16,10 +16,10 @@ import type {RouteComponentProps} from 'sentry/types/legacyReactRouter';
 import {decodeScalar} from 'sentry/utils/queryString';
 import type {TimeOffsetLocationQueryParams} from 'sentry/utils/replays/hooks/useInitialTimeOffsetMs';
 import useInitialTimeOffsetMs from 'sentry/utils/replays/hooks/useInitialTimeOffsetMs';
+import useLoadReplayReader from 'sentry/utils/replays/hooks/useLoadReplayReader';
 import useLogReplayDataLoaded from 'sentry/utils/replays/hooks/useLogReplayDataLoaded';
 import useMarkReplayViewed from 'sentry/utils/replays/hooks/useMarkReplayViewed';
 import useReplayPageview from 'sentry/utils/replays/hooks/useReplayPageview';
-import useReplayReader from 'sentry/utils/replays/hooks/useReplayReader';
 import {ReplayPreferencesContextProvider} from 'sentry/utils/replays/playback/providers/replayPreferencesContext';
 import useRouteAnalyticsEventNames from 'sentry/utils/routeAnalytics/useRouteAnalyticsEventNames';
 import useRouteAnalyticsParams from 'sentry/utils/routeAnalytics/useRouteAnalyticsParams';
@@ -55,7 +55,7 @@ function ReplayDetails({params: {replaySlug}}: Props) {
     replay,
     replayId,
     replayRecord,
-  } = useReplayReader({
+  } = useLoadReplayReader({
     replaySlug,
     orgSlug,
   });
diff --git a/static/app/views/replays/list/listContent.spec.tsx b/static/app/views/replays/list/listContent.spec.tsx
index ab4e2dfd131325..0d2e357a20c6ef 100644
--- a/static/app/views/replays/list/listContent.spec.tsx
+++ b/static/app/views/replays/list/listContent.spec.tsx
@@ -36,8 +36,8 @@ mockUseReplayOnboardingSidebarPanel.mockReturnValue({activateSidebar: jest.fn()}
 const mockUseAllMobileProj = jest.mocked(useAllMobileProj);
 mockUseAllMobileProj.mockReturnValue({allMobileProj: false});
 
-const AM1_FEATURES = [];
-const AM2_FEATURES = ['session-replay'];
+const AM1_FEATURES: string[] = [];
+const AM2_FEATURES: string[] = ['session-replay'];
 
 function getMockOrganizationFixture({features}: {features: string[]}) {
   const mockOrg = OrganizationFixture({
@@ -49,7 +49,7 @@ function getMockOrganizationFixture({features}: {features: string[]}) {
 }
 
 describe('ReplayList', () => {
-  let mockFetchReplayListRequest;
+  let mockFetchReplayListRequest: jest.Mock;
   beforeEach(() => {
     mockUseHaveSelectedProjectsSentAnyReplayEvents.mockClear();
     mockUseProjectSdkNeedsUpdate.mockClear();
@@ -88,9 +88,7 @@ describe('ReplayList', () => {
       organization: mockOrg,
     });
 
-    await waitFor(() =>
-      expect(screen.getByText('Get to the root cause faster')).toBeInTheDocument()
-    );
+    await screen.findByText('Get to the root cause faster');
     expect(mockFetchReplayListRequest).not.toHaveBeenCalled();
   });
 
@@ -110,9 +108,7 @@ describe('ReplayList', () => {
       organization: mockOrg,
     });
 
-    await waitFor(() =>
-      expect(screen.getByText('Get to the root cause faster')).toBeInTheDocument()
-    );
+    await screen.findByText('Get to the root cause faster');
     expect(mockFetchReplayListRequest).not.toHaveBeenCalled();
   });
 
@@ -132,9 +128,7 @@ describe('ReplayList', () => {
       organization: mockOrg,
     });
 
-    await waitFor(() =>
-      expect(screen.getByText('Get to the root cause faster')).toBeInTheDocument()
-    );
+    await screen.findByText('Get to the root cause faster');
     expect(mockFetchReplayListRequest).not.toHaveBeenCalled();
   });
 
@@ -156,8 +150,8 @@ describe('ReplayList', () => {
 
     await waitFor(() => {
       expect(screen.getByText('Introducing Rage and Dead Clicks')).toBeInTheDocument();
-      expect(screen.queryByTestId('replay-table')).toBeInTheDocument();
     });
+    expect(screen.getByTestId('replay-table')).toBeInTheDocument();
     expect(mockFetchReplayListRequest).toHaveBeenCalled();
   });
 
diff --git a/static/app/views/replays/list/replayOnboardingPanel.tsx b/static/app/views/replays/list/replayOnboardingPanel.tsx
index fa0314344ff83c..81c34f9a32c039 100644
--- a/static/app/views/replays/list/replayOnboardingPanel.tsx
+++ b/static/app/views/replays/list/replayOnboardingPanel.tsx
@@ -93,7 +93,7 @@ export default function ReplayOnboardingPanel() {
     <Fragment>
       <OnboardingAlertHook>
         {hasSelectedProjects && allSelectedProjectsUnsupported && (
-          <ReplayUnsupportedAlert projectSlug={selectedProjects[0].slug} />
+          <ReplayUnsupportedAlert projectSlug={selectedProjects[0]!.slug} />
         )}
       </OnboardingAlertHook>
       <ReplayPanel image={<HeroImage src={emptyStateImg} breakpoints={breakpoints} />}>
@@ -234,7 +234,8 @@ export function SetupReplaysCTA({
         >
           <Button
             data-test-id="setup-replays-btn"
-            onClick={activateSidebar}
+            type="button"
+            onClick={() => activateSidebar()}
             priority="primary"
             disabled={disabled}
           >
diff --git a/static/app/views/replays/list/replaySearchBar.tsx b/static/app/views/replays/list/replaySearchBar.tsx
index 9289aebcaa10a8..2fdc56f4c9f2cd 100644
--- a/static/app/views/replays/list/replaySearchBar.tsx
+++ b/static/app/views/replays/list/replaySearchBar.tsx
@@ -2,9 +2,9 @@ import {useCallback, useMemo} from 'react';
 import orderBy from 'lodash/orderBy';
 
 import {fetchTagValues, useFetchOrganizationTags} from 'sentry/actionCreators/tags';
+import type SmartSearchBar from 'sentry/components/deprecatedSmartSearchBar';
 import {SearchQueryBuilder} from 'sentry/components/searchQueryBuilder';
 import type {FilterKeySection} from 'sentry/components/searchQueryBuilder/types';
-import type SmartSearchBar from 'sentry/components/smartSearchBar';
 import {t} from 'sentry/locale';
 import type {PageFilters} from 'sentry/types/core';
 import type {Tag, TagCollection, TagValue} from 'sentry/types/group';
@@ -62,7 +62,7 @@ function getReplayFilterKeys(supportedTags: TagCollection): TagCollection {
         .map(key => [
           key,
           {
-            ...supportedTags[key],
+            ...supportedTags[key]!,
             kind: getReplayFieldDefinition(key)?.kind ?? FieldKind.TAG,
           },
         ])
@@ -126,9 +126,9 @@ function ReplaySearchBar(props: Props) {
       useCache: true,
       enabled: true,
       keepPreviousData: false,
-      start: start,
-      end: end,
-      statsPeriod: statsPeriod,
+      start,
+      end,
+      statsPeriod,
     },
     {}
   );
@@ -154,9 +154,9 @@ function ReplaySearchBar(props: Props) {
       }
 
       const endpointParams = {
-        start: start,
-        end: end,
-        statsPeriod: statsPeriod,
+        start,
+        end,
+        statsPeriod,
       };
 
       return fetchTagValues({
diff --git a/static/app/views/replays/list/replaysList.tsx b/static/app/views/replays/list/replaysList.tsx
index 526279acd71c3f..d775605d0512af 100644
--- a/static/app/views/replays/list/replaysList.tsx
+++ b/static/app/views/replays/list/replaysList.tsx
@@ -4,11 +4,11 @@ import styled from '@emotion/styled';
 import Pagination from 'sentry/components/pagination';
 import {t, tct} from 'sentry/locale';
 import {trackAnalytics} from 'sentry/utils/analytics';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {decodeList, decodeScalar, decodeSorts} from 'sentry/utils/queryString';
 import useFetchReplayList from 'sentry/utils/replays/hooks/useFetchReplayList';
 import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import useLocationQuery from 'sentry/utils/url/useLocationQuery';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import usePageFilters from 'sentry/utils/usePageFilters';
 import useProjectSdkNeedsUpdate from 'sentry/utils/useProjectSdkNeedsUpdate';
@@ -20,6 +20,7 @@ const MIN_REPLAY_CLICK_SDK = '7.44.0';
 
 function ReplaysList() {
   const organization = useOrganization();
+  const navigate = useNavigate();
 
   const query = useLocationQuery({
     fields: {
@@ -114,7 +115,7 @@ function ReplaysList() {
             organization,
             direction: cursor?.endsWith(':1') ? 'prev' : 'next',
           });
-          browserHistory.push({
+          navigate({
             pathname: path,
             query: {...searchQuery, cursor},
           });
diff --git a/static/app/views/replays/list/setupReplaysCTA.spec.tsx b/static/app/views/replays/list/setupReplaysCTA.spec.tsx
index 9723fdbf373b47..4ebe0d1e611ac1 100644
--- a/static/app/views/replays/list/setupReplaysCTA.spec.tsx
+++ b/static/app/views/replays/list/setupReplaysCTA.spec.tsx
@@ -1,4 +1,4 @@
-import {render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrary';
+import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 
 import {SetupReplaysCTA} from 'sentry/views/replays/list/replayOnboardingPanel';
 
@@ -12,7 +12,7 @@ describe('SetupReplaysCTA', () => {
     render(<SetupReplaysCTA primaryAction="setup" orgSlug="foo" disabled />);
     const setupBtn = screen.getByTestId('setup-replays-btn');
     await userEvent.hover(setupBtn);
-    await waitFor(() => screen.getByTestId('setup-replays-tooltip'));
+    await screen.findByTestId('setup-replays-tooltip');
     expect(screen.getByTestId('setup-replays-tooltip')).toBeInTheDocument();
   });
 
@@ -27,7 +27,7 @@ describe('SetupReplaysCTA', () => {
     render(<SetupReplaysCTA primaryAction="create" orgSlug="foo" disabled />);
     const createBtn = screen.getByTestId('create-project-btn');
     await userEvent.hover(createBtn);
-    await waitFor(() => screen.getByTestId('create-project-tooltip'));
+    await screen.findByTestId('create-project-tooltip');
     expect(screen.getByTestId('create-project-tooltip')).toBeInTheDocument();
   });
 });
diff --git a/static/app/views/replays/replayTable/tableCell.tsx b/static/app/views/replays/replayTable/tableCell.tsx
index f10b18ac45cf7e..edfd530237e7cb 100644
--- a/static/app/views/replays/replayTable/tableCell.tsx
+++ b/static/app/views/replays/replayTable/tableCell.tsx
@@ -179,13 +179,17 @@ function OSBrowserDropdownFilter({
   );
 }
 
+const DEFAULT_NUMERIC_DROPDOWN_FORMATTER = (val: number) => val.toString();
+
 function NumericDropdownFilter({
   type,
   val,
   triggerOverlay,
+  formatter = DEFAULT_NUMERIC_DROPDOWN_FORMATTER,
 }: {
   type: string;
   val: number;
+  formatter?: (val: number) => string;
   triggerOverlay?: boolean;
 }) {
   const location = useLocation<ReplayListLocationQuery>();
@@ -197,7 +201,7 @@ function NumericDropdownFilter({
           label: 'Add to filter',
           onAction: generateAction({
             key: type,
-            value: val.toString(),
+            value: formatter(val),
             edit: 'set',
             location,
           }),
@@ -207,7 +211,7 @@ function NumericDropdownFilter({
           label: 'Show values greater than',
           onAction: generateAction({
             key: type,
-            value: '>' + val.toString(),
+            value: '>' + formatter(val),
             edit: 'set',
             location,
           }),
@@ -217,7 +221,7 @@ function NumericDropdownFilter({
           label: 'Show values less than',
           onAction: generateAction({
             key: type,
-            value: '<' + val.toString(),
+            value: '<' + formatter(val),
             edit: 'set',
             location,
           }),
@@ -227,7 +231,7 @@ function NumericDropdownFilter({
           label: t('Exclude from filter'),
           onAction: generateAction({
             key: type,
-            value: val.toString(),
+            value: formatter(val),
             edit: 'remove',
             location,
           }),
@@ -528,7 +532,11 @@ export function DurationCell({replay, showDropdownFilters}: Props) {
       <Container>
         <Duration duration={[replay.duration.asMilliseconds(), 'ms']} precision="sec" />
         {showDropdownFilters ? (
-          <NumericDropdownFilter type="duration" val={replay.duration.asSeconds()} />
+          <NumericDropdownFilter
+            type="duration"
+            val={replay.duration.asSeconds()}
+            formatter={(val: number) => `${val}s`}
+          />
         ) : null}
       </Container>
     </Item>
@@ -614,7 +622,7 @@ export function ActivityCell({replay, showDropdownFilters}: Props) {
   if (replay.is_archived) {
     return <Item isArchived />;
   }
-  const scoreBarPalette = new Array(10).fill([CHART_PALETTE[0][0]]);
+  const scoreBarPalette = new Array(10).fill([CHART_PALETTE[0]![0]]);
   return (
     <Item>
       <Container>
diff --git a/static/app/views/routeError.tsx b/static/app/views/routeError.tsx
index 3f7acf24028084..530d986187cd4f 100644
--- a/static/app/views/routeError.tsx
+++ b/static/app/views/routeError.tsx
@@ -1,7 +1,7 @@
 import {useEffect} from 'react';
 import styled from '@emotion/styled';
+import type {Scope} from '@sentry/core';
 import * as Sentry from '@sentry/react';
-import type {Scope} from '@sentry/types';
 
 import {getLastEventId} from 'sentry/bootstrap/initializeSdk';
 import {Alert} from 'sentry/components/alert';
diff --git a/static/app/views/sentryAppExternalInstallation/index.tsx b/static/app/views/sentryAppExternalInstallation/index.tsx
index e4b58b2de1b013..07b4a94729f8b8 100644
--- a/static/app/views/sentryAppExternalInstallation/index.tsx
+++ b/static/app/views/sentryAppExternalInstallation/index.tsx
@@ -125,7 +125,7 @@ function SentryAppExternalInstallationContent({params, ...props}: Props) {
     }
     if (organizations.length === 1) {
       // auto select the org if there is only one
-      onSelectOrg(organizations[0].slug);
+      onSelectOrg(organizations[0]!.slug);
     }
 
     // now check the subomdain and use that org slug if it exists
@@ -294,7 +294,7 @@ type SingleOrgProps = {
   sentryApp: SentryApp;
 };
 function SingleOrgView({organizations, sentryApp}: SingleOrgProps) {
-  const organizationName = organizations[0].name;
+  const organizationName = organizations[0]!.name;
   return (
     <div>
       <p>
diff --git a/static/app/views/settings/account/accountAuthorizations.spec.tsx b/static/app/views/settings/account/accountAuthorizations.spec.tsx
index 6d182488fb5de2..4b8039cd806a88 100644
--- a/static/app/views/settings/account/accountAuthorizations.spec.tsx
+++ b/static/app/views/settings/account/accountAuthorizations.spec.tsx
@@ -64,6 +64,6 @@ describe('AccountAuthorizations', function () {
     await waitFor(() =>
       expect(screen.queryByText('Delete Shrimp')).not.toBeInTheDocument()
     );
-    await waitFor(() => expect(screen.queryByText('Keep Shrimp')).toBeInTheDocument());
+    await screen.findByText('Keep Shrimp');
   });
 });
diff --git a/static/app/views/settings/account/accountClose.spec.tsx b/static/app/views/settings/account/accountClose.spec.tsx
index fa2f46292d9777..1f27e3780b0216 100644
--- a/static/app/views/settings/account/accountClose.spec.tsx
+++ b/static/app/views/settings/account/accountClose.spec.tsx
@@ -10,7 +10,7 @@ import {
 import AccountClose from 'sentry/views/settings/account/accountClose';
 
 describe('AccountClose', function () {
-  let deleteMock;
+  let deleteMock: jest.Mock;
   const soloOrgSlug = 'solo-owner';
   const nonSingleOwnerSlug = 'non-single-owner';
 
diff --git a/static/app/views/settings/account/accountDetails.spec.tsx b/static/app/views/settings/account/accountDetails.spec.tsx
index 4819f14a643b51..4faf48c30c46d2 100644
--- a/static/app/views/settings/account/accountDetails.spec.tsx
+++ b/static/app/views/settings/account/accountDetails.spec.tsx
@@ -1,6 +1,6 @@
 import {UserDetailsFixture} from 'sentry-fixture/userDetails';
 
-import {render, screen} from 'sentry-test/reactTestingLibrary';
+import {render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrary';
 
 import AccountDetails from 'sentry/views/settings/account/accountDetails';
 
@@ -53,4 +53,30 @@ describe('AccountDetails', () => {
       expect(await screen.findByRole('textbox', {name: 'Username'})).toBeDisabled();
     });
   });
+
+  describe('Theme', () => {
+    it('toggles between light and dark and removes the theme class from body', async () => {
+      const mockUserUpdate = MockApiClient.addMockResponse({
+        url: '/users/me/',
+        method: 'PUT',
+        body: UserDetailsFixture(),
+      });
+      render(<AccountDetails />);
+
+      expect(await screen.findByLabelText('Theme')).toBeInTheDocument();
+      // Emulate the page being loaded with a light theme
+      document.body.classList.add('theme-light');
+
+      await userEvent.click(screen.getByText('Light'));
+      await userEvent.click(await screen.findByRole('menuitemradio', {name: 'Dark'}));
+
+      await waitFor(() => {
+        expect(mockUserUpdate).toHaveBeenCalledWith(
+          '/users/me/',
+          expect.objectContaining({data: {options: {theme: 'dark'}}})
+        );
+      });
+      expect(document.body).not.toHaveClass('theme-light');
+    });
+  });
 });
diff --git a/static/app/views/settings/account/accountDetails.tsx b/static/app/views/settings/account/accountDetails.tsx
index 068cfdb7496126..2ae0633e4da9cd 100644
--- a/static/app/views/settings/account/accountDetails.tsx
+++ b/static/app/views/settings/account/accountDetails.tsx
@@ -92,7 +92,7 @@ function AccountDetails() {
     help: `The unique identifier for your account. It cannot be modified.`,
   };
 
-  formConfig[0].fields = [...formConfig[0].fields, userIdField];
+  formConfig[0]!.fields = [...formConfig[0]!.fields, userIdField];
 
   return (
     <Fragment>
diff --git a/static/app/views/settings/account/accountEmails.spec.tsx b/static/app/views/settings/account/accountEmails.spec.tsx
index 3a356a8e89bcca..639987dd314349 100644
--- a/static/app/views/settings/account/accountEmails.spec.tsx
+++ b/static/app/views/settings/account/accountEmails.spec.tsx
@@ -32,7 +32,7 @@ describe('AccountEmails', function () {
     expect(mock).not.toHaveBeenCalled();
 
     await userEvent.click(
-      (await screen.findAllByRole('button', {name: 'Remove email'}))[0]
+      (await screen.findAllByRole('button', {name: 'Remove email'}))[0]!
     );
 
     expect(mock).toHaveBeenCalledWith(
@@ -57,7 +57,7 @@ describe('AccountEmails', function () {
     expect(mock).not.toHaveBeenCalled();
 
     await userEvent.click(
-      (await screen.findAllByRole('button', {name: 'Set as primary'}))[0]
+      (await screen.findAllByRole('button', {name: 'Set as primary'}))[0]!
     );
 
     expect(mock).toHaveBeenCalledWith(
@@ -82,7 +82,7 @@ describe('AccountEmails', function () {
     expect(mock).not.toHaveBeenCalled();
 
     await userEvent.click(
-      (await screen.findAllByRole('button', {name: 'Resend verification'}))[0]
+      (await screen.findAllByRole('button', {name: 'Resend verification'}))[0]!
     );
 
     expect(mock).toHaveBeenCalledWith(
diff --git a/static/app/views/settings/account/accountNotificationFineTuning.tsx b/static/app/views/settings/account/accountNotificationFineTuning.tsx
index a0f4db4006fdc8..9ed2a322f7b0a1 100644
--- a/static/app/views/settings/account/accountNotificationFineTuning.tsx
+++ b/static/app/views/settings/account/accountNotificationFineTuning.tsx
@@ -218,7 +218,7 @@ function AccountNotificationFineTuning({
   }
 
   const isProject = isGroupedByProject(fineTuneType) && organizations.length > 0;
-  const field = ACCOUNT_NOTIFICATION_FIELDS[fineTuneType];
+  const field = ACCOUNT_NOTIFICATION_FIELDS[fineTuneType]!;
   // TODO(isabella): once GA, remove this
   if (
     fineTuneType === 'quota' &&
diff --git a/static/app/views/settings/account/accountSecurity/accountSecurityEnroll.tsx b/static/app/views/settings/account/accountSecurity/accountSecurityEnroll.tsx
index 11862f5cba766c..c291a2fd734dc3 100644
--- a/static/app/views/settings/account/accountSecurity/accountSecurityEnroll.tsx
+++ b/static/app/views/settings/account/accountSecurity/accountSecurityEnroll.tsx
@@ -107,8 +107,8 @@ const getFields = ({
   if (authenticator.id === 'sms') {
     // Ideally we would have greater flexibility when rendering footer
     return [
-      {...form[0], disabled: sendingCode || hasSentCode},
-      ...(hasSentCode ? [{...form[1], required: true}] : []),
+      {...form[0]!, disabled: sendingCode || hasSentCode},
+      ...(hasSentCode ? [{...form[1]!, required: true}] : []),
       () => (
         <Actions key="sms-footer">
           <ButtonBar gap={1}>
@@ -361,7 +361,7 @@ class AccountSecurityEnroll extends DeprecatedAsyncView<Props, State> {
       return org.links.organizationUrl === new URL(window.location.href).origin;
     });
     if (!isAlreadyInOrgSubDomain) {
-      window.location.assign(generateOrgSlugUrl(orgs[0].slug));
+      window.location.assign(generateOrgSlugUrl(orgs[0]!.slug));
     }
   }
 
diff --git a/static/app/views/settings/account/accountSecurity/index.spec.tsx b/static/app/views/settings/account/accountSecurity/index.spec.tsx
index e1e40c8f603bf2..310a51030eac4d 100644
--- a/static/app/views/settings/account/accountSecurity/index.spec.tsx
+++ b/static/app/views/settings/account/accountSecurity/index.spec.tsx
@@ -52,7 +52,7 @@ describe('AccountSecurity', function () {
           onDisable={jest.fn()}
           orgsRequire2fa={[]}
           location={router.location}
-          route={router.routes[0]}
+          route={router.routes[0]!}
           routes={router.routes}
           router={router}
           routeParams={router.params}
@@ -175,7 +175,7 @@ describe('AccountSecurity', function () {
       await screen.findAllByRole('status', {name: 'Authentication Method Active'})
     ).toHaveLength(2);
 
-    await userEvent.click(screen.getAllByRole('button', {name: 'Delete'})[0]);
+    await userEvent.click(screen.getAllByRole('button', {name: 'Delete'})[0]!);
 
     renderGlobalModal();
     await userEvent.click(screen.getByTestId('confirm-button'));
diff --git a/static/app/views/settings/account/accountSubscriptions.spec.tsx b/static/app/views/settings/account/accountSubscriptions.spec.tsx
index cf20e754515a75..11460ad5fe0d3b 100644
--- a/static/app/views/settings/account/accountSubscriptions.spec.tsx
+++ b/static/app/views/settings/account/accountSubscriptions.spec.tsx
@@ -69,7 +69,7 @@ describe('AccountSubscriptions', function () {
     expect(elements).toHaveLength(2);
 
     await userEvent.click(
-      screen.getAllByRole('checkbox', {name: 'Sentry Newsletter'})[0]
+      screen.getAllByRole('checkbox', {name: 'Sentry Newsletter'})[0]!
     );
 
     expect(mock).toHaveBeenCalledWith(
diff --git a/static/app/views/settings/account/accountSubscriptions.tsx b/static/app/views/settings/account/accountSubscriptions.tsx
index df2936132f6748..62fcb969065ba1 100644
--- a/static/app/views/settings/account/accountSubscriptions.tsx
+++ b/static/app/views/settings/account/accountSubscriptions.tsx
@@ -105,7 +105,7 @@ function AccountSubscriptions() {
     }, {})
   );
 
-  subGroups.sort(([a], [b]) => a[0]?.localeCompare(b[0]));
+  subGroups.sort(([a], [b]) => a[0]!?.localeCompare(b[0]!));
 
   const handleToggle = (subscription: Subscription) => {
     const subscribed = !subscription.subscribed;
diff --git a/static/app/views/settings/account/apiNewToken.spec.tsx b/static/app/views/settings/account/apiNewToken.spec.tsx
index 4a693fc0317f7e..d96fcfaaa9b15e 100644
--- a/static/app/views/settings/account/apiNewToken.spec.tsx
+++ b/static/app/views/settings/account/apiNewToken.spec.tsx
@@ -8,10 +8,10 @@ describe('ApiNewToken', function () {
     render(<ApiNewToken />);
   });
 
-  it('renders with disabled "Create Token" button', async function () {
+  it('renders with disabled "Create Token" button', function () {
     render(<ApiNewToken />);
 
-    expect(await screen.getByRole('button', {name: 'Create Token'})).toBeDisabled();
+    expect(screen.getByRole('button', {name: 'Create Token'})).toBeDisabled();
   });
 
   it('submits with correct hierarchical scopes', async function () {
@@ -22,9 +22,9 @@ describe('ApiNewToken', function () {
     });
 
     render(<ApiNewToken />);
-    const createButton = await screen.getByRole('button', {name: 'Create Token'});
+    const createButton = screen.getByRole('button', {name: 'Create Token'});
 
-    const selectByValue = (name, value) =>
+    const selectByValue = (name: string, value: string) =>
       selectEvent.select(screen.getByRole('textbox', {name}), value);
 
     // Assigning Admin here will also grant read + write access to the resource
@@ -77,7 +77,7 @@ describe('ApiNewToken', function () {
     render(<ApiNewToken />);
     const createButton = screen.getByRole('button', {name: 'Create Token'});
 
-    const selectByValue = (name, value) =>
+    const selectByValue = (name: string, value: string) =>
       selectEvent.select(screen.getByRole('textbox', {name}), value);
 
     await selectByValue('Project', 'Admin');
@@ -115,7 +115,7 @@ describe('ApiNewToken', function () {
     render(<ApiNewToken />);
     const createButton = screen.getByRole('button', {name: 'Create Token'});
 
-    const selectByValue = (name, value) =>
+    const selectByValue = (name: string, value: string) =>
       selectEvent.select(screen.getByRole('textbox', {name}), value);
 
     await selectByValue('Project', 'Admin');
diff --git a/static/app/views/settings/account/apiNewToken.tsx b/static/app/views/settings/account/apiNewToken.tsx
index d970b6738f3b4f..cd04f11ce775d9 100644
--- a/static/app/views/settings/account/apiNewToken.tsx
+++ b/static/app/views/settings/account/apiNewToken.tsx
@@ -1,6 +1,7 @@
-import {Component} from 'react';
+import {useState} from 'react';
 
 import ApiForm from 'sentry/components/forms/apiForm';
+import TextareaField from 'sentry/components/forms/fields/textareaField';
 import TextField from 'sentry/components/forms/fields/textField';
 import ExternalLink from 'sentry/components/links/externalLink';
 import Panel from 'sentry/components/panels/panel';
@@ -19,114 +20,116 @@ import TextBlock from 'sentry/views/settings/components/text/textBlock';
 import PermissionSelection from 'sentry/views/settings/organizationDeveloperSettings/permissionSelection';
 
 const API_INDEX_ROUTE = '/settings/account/api/auth-tokens/';
-type State = {
-  name: string | null;
-  newToken: NewInternalAppApiToken | null;
-  permissions: Permissions;
-};
 
-export default class ApiNewToken extends Component<{}, State> {
-  constructor(props: {}) {
-    super(props);
-    this.state = {
-      name: null,
-      permissions: {
-        Event: 'no-access',
-        Team: 'no-access',
-        Member: 'no-access',
-        Project: 'no-access',
-        Release: 'no-access',
-        Organization: 'no-access',
-      },
-      newToken: null,
-    };
-  }
+export default function ApiNewToken() {
+  const [permissions, setPermissions] = useState<Permissions>({
+    Event: 'no-access',
+    Team: 'no-access',
+    Member: 'no-access',
+    Project: 'no-access',
+    Release: 'no-access',
+    Organization: 'no-access',
+    Alerts: 'no-access',
+  });
+  const [newToken, setNewToken] = useState<NewInternalAppApiToken | null>(null);
+  const [preview, setPreview] = useState<string>('');
 
-  onCancel = () => {
-    browserHistory.push(normalizeUrl(API_INDEX_ROUTE));
+  const getPreview = () => {
+    let previewString = '';
+    for (const k in permissions) {
+      if (permissions[k] !== 'no-access') {
+        previewString += `${k.toLowerCase()}:${permissions[k]}\n`;
+      }
+    }
+    return previewString;
   };
 
-  handleGoBack = () => {
+  const onCancel = () => {
     browserHistory.push(normalizeUrl(API_INDEX_ROUTE));
   };
 
-  render() {
-    const {permissions, newToken} = this.state;
+  const handleGoBack = () => {
+    browserHistory.push(normalizeUrl(API_INDEX_ROUTE));
+  };
 
-    return (
-      <SentryDocumentTitle title={t('Create User Auth Token')}>
-        <div>
-          <SettingsPageHeader title={t('Create New User Auth Token')} />
-          <TextBlock>
-            {t(
-              "Authentication tokens allow you to perform actions against the Sentry API on behalf of your account. They're the easiest way to get started using the API."
-            )}
-          </TextBlock>
-          <TextBlock>
-            {tct(
-              'For more information on how to use the web API, see our [link:documentation].',
-              {
-                link: <ExternalLink href="https://docs.sentry.io/api/" />,
-              }
-            )}
-          </TextBlock>
-          {newToken !== null ? (
-            <NewTokenHandler
-              token={
-                getDynamicText({value: newToken.token, fixed: 'CI_AUTH_TOKEN'}) ||
-                'CI_AUTH_TOKEN'
-              }
-              handleGoBack={this.handleGoBack}
-            />
-          ) : (
-            <div>
-              <ApiForm
-                apiMethod="POST"
-                apiEndpoint="/api-tokens/"
-                initialData={{scopes: [], name: ''}}
-                onSubmitSuccess={response => {
-                  this.setState({newToken: response});
-                }}
-                onCancel={this.onCancel}
-                footerStyle={{
-                  marginTop: 0,
-                  paddingRight: 20,
-                }}
-                submitDisabled={Object.values(permissions).every(
-                  value => value === 'no-access'
-                )}
-                submitLabel={t('Create Token')}
-              >
-                <Panel>
-                  <PanelHeader>{t('General')}</PanelHeader>
-                  <PanelBody>
-                    <TextField
-                      name="name"
-                      label={t('Name')}
-                      help={t('A name to help you identify this token.')}
-                      onChange={value => {
-                        this.setState({name: value});
-                      }}
-                    />
-                  </PanelBody>
-                </Panel>
-                <Panel>
-                  <PanelHeader>{t('Permissions')}</PanelHeader>
-                  <PanelBody>
-                    <PermissionSelection
-                      appPublished={false}
-                      permissions={permissions}
-                      onChange={value => {
-                        this.setState({permissions: value});
-                      }}
-                    />
-                  </PanelBody>
-                </Panel>
-              </ApiForm>
-            </div>
+  return (
+    <SentryDocumentTitle title={t('Create User Auth Token')}>
+      <div>
+        <SettingsPageHeader title={t('Create New User Auth Token')} />
+        <TextBlock>
+          {t(
+            "Authentication tokens allow you to perform actions against the Sentry API on behalf of your account. They're the easiest way to get started using the API."
+          )}
+        </TextBlock>
+        <TextBlock>
+          {tct(
+            'For more information on how to use the web API, see our [link:documentation].',
+            {
+              link: <ExternalLink href="https://docs.sentry.io/api/" />,
+            }
           )}
-        </div>
-      </SentryDocumentTitle>
-    );
-  }
+        </TextBlock>
+        {newToken !== null ? (
+          <NewTokenHandler
+            token={
+              getDynamicText({value: newToken.token, fixed: 'CI_AUTH_TOKEN'}) ||
+              'CI_AUTH_TOKEN'
+            }
+            handleGoBack={handleGoBack}
+          />
+        ) : (
+          <div>
+            <ApiForm
+              apiMethod="POST"
+              apiEndpoint="/api-tokens/"
+              initialData={{scopes: [], name: ''}}
+              onSubmitSuccess={setNewToken}
+              onCancel={onCancel}
+              footerStyle={{
+                marginTop: 0,
+                paddingRight: 20,
+              }}
+              submitDisabled={Object.values(permissions).every(
+                value => value === 'no-access'
+              )}
+              submitLabel={t('Create Token')}
+            >
+              <Panel>
+                <PanelHeader>{t('General')}</PanelHeader>
+                <PanelBody>
+                  <TextField
+                    name="name"
+                    label={t('Name')}
+                    help={t('A name to help you identify this token.')}
+                  />
+                </PanelBody>
+              </Panel>
+              <Panel>
+                <PanelHeader>{t('Permissions')}</PanelHeader>
+                <PanelBody>
+                  <PermissionSelection
+                    appPublished={false}
+                    permissions={permissions}
+                    onChange={p => {
+                      setPermissions(p);
+                      setPreview(getPreview());
+                    }}
+                  />
+                </PanelBody>
+                <TextareaField
+                  name="permissions-preview"
+                  label={t('Permissions Preview')}
+                  help={t('Your token will have the following scopes.')}
+                  rows={3}
+                  autosize
+                  placeholder={preview}
+                  disabled
+                />
+              </Panel>
+            </ApiForm>
+          </div>
+        )}
+      </div>
+    </SentryDocumentTitle>
+  );
 }
diff --git a/static/app/views/settings/account/apiTokenDetails.tsx b/static/app/views/settings/account/apiTokenDetails.tsx
index 73e9271b8adcc6..74a8569cf2298f 100644
--- a/static/app/views/settings/account/apiTokenDetails.tsx
+++ b/static/app/views/settings/account/apiTokenDetails.tsx
@@ -60,9 +60,9 @@ function ApiTokenDetailsForm({token}: {token: InternalAppApiToken}) {
   };
 
   const {mutate: submitToken} = useMutateApiToken({
-    token: token,
-    onSuccess: onSuccess,
-    onError: onError,
+    token,
+    onSuccess,
+    onError,
   });
 
   return (
diff --git a/static/app/views/settings/account/apiTokenRow.spec.tsx b/static/app/views/settings/account/apiTokenRow.spec.tsx
index 79176e69685090..d836c2f617481a 100644
--- a/static/app/views/settings/account/apiTokenRow.spec.tsx
+++ b/static/app/views/settings/account/apiTokenRow.spec.tsx
@@ -47,6 +47,6 @@ describe('ApiTokenRow', () => {
 
     const cb = jest.fn();
     render(<ApiTokenRow onRemove={cb} token={token} canEdit />);
-    expect(screen.queryByLabelText('Token preview')).toBeInTheDocument();
+    expect(screen.getByLabelText('Token preview')).toBeInTheDocument();
   });
 });
diff --git a/static/app/views/settings/account/notifications/constants.tsx b/static/app/views/settings/account/notifications/constants.tsx
index 0a5d704672334b..800742994cdfb9 100644
--- a/static/app/views/settings/account/notifications/constants.tsx
+++ b/static/app/views/settings/account/notifications/constants.tsx
@@ -1,29 +1,6 @@
-import {t} from 'sentry/locale';
-
-export const ALL_PROVIDERS = {
-  email: 'default',
-  slack: 'never',
-  msteams: 'never',
-};
-export const ALL_PROVIDER_NAMES = Object.keys(ALL_PROVIDERS);
-
-/**
- * These values are stolen from the DB.
- */
-export const VALUE_MAPPING = {
-  default: 0,
-  never: 10,
-  always: 20,
-  subscribe_only: 30,
-  committed_only: 40,
-};
-
 export const SUPPORTED_PROVIDERS = ['email', 'slack', 'msteams'] as const;
 export type SupportedProviders = (typeof SUPPORTED_PROVIDERS)[number];
 
-export const MIN_PROJECTS_FOR_CONFIRMATION = 3;
-export const MIN_PROJECTS_FOR_SEARCH = 3;
-export const MIN_PROJECTS_FOR_PAGINATION = 100;
 export type ProviderValue = 'always' | 'never';
 
 interface NotificationBaseObject {
@@ -65,7 +42,7 @@ export const SELF_NOTIFICATION_SETTINGS_TYPES = [
 ];
 
 // 'alerts' | 'workflow' ...
-export type NotificationSettingsType = (typeof NOTIFICATION_SETTINGS_TYPES)[number];
+type NotificationSettingsType = (typeof NOTIFICATION_SETTINGS_TYPES)[number];
 
 export const NOTIFICATION_SETTINGS_PATHNAMES: Record<NotificationSettingsType, string> = {
   alerts: 'alerts',
@@ -79,19 +56,6 @@ export const NOTIFICATION_SETTINGS_PATHNAMES: Record<NotificationSettingsType, s
   brokenMonitors: 'broken-monitors',
 };
 
-export const CONFIRMATION_MESSAGE = (
-  <div>
-    <p style={{marginBottom: '20px'}}>
-      <strong>Are you sure you want to disable these notifications?</strong>
-    </p>
-    <p>
-      {t(
-        'Turning this off will irreversibly overwrite all of your fine-tuning settings to "off".'
-      )}
-    </p>
-  </div>
-);
-
 export const NOTIFICATION_FEATURE_MAP: Partial<
   Record<NotificationSettingsType, string | Array<string>>
 > = {
diff --git a/static/app/views/settings/account/notifications/notificationSettings.spec.tsx b/static/app/views/settings/account/notifications/notificationSettings.spec.tsx
index 95855cc70a163b..22e20739b83574 100644
--- a/static/app/views/settings/account/notifications/notificationSettings.spec.tsx
+++ b/static/app/views/settings/account/notifications/notificationSettings.spec.tsx
@@ -39,7 +39,7 @@ describe('NotificationSettings', function () {
       ...SELF_NOTIFICATION_SETTINGS_TYPES,
     ]) {
       expect(
-        await screen.findByText(String(NOTIFICATION_SETTING_FIELDS[field].label))
+        await screen.findByText(String(NOTIFICATION_SETTING_FIELDS[field]!.label))
       ).toBeInTheDocument();
     }
     expect(screen.getByText('Issue Alerts')).toBeInTheDocument();
@@ -71,7 +71,7 @@ describe('NotificationSettings', function () {
       ...SELF_NOTIFICATION_SETTINGS_TYPES,
     ]) {
       expect(
-        await screen.findByText(String(NOTIFICATION_SETTING_FIELDS[field].label))
+        await screen.findByText(String(NOTIFICATION_SETTING_FIELDS[field]!.label))
       ).toBeInTheDocument();
     }
     expect(screen.getByText('Issue Alerts')).toBeInTheDocument();
diff --git a/static/app/views/settings/account/notifications/notificationSettings.tsx b/static/app/views/settings/account/notifications/notificationSettings.tsx
index 9b1268ab7f75bc..b488dc61484993 100644
--- a/static/app/views/settings/account/notifications/notificationSettings.tsx
+++ b/static/app/views/settings/account/notifications/notificationSettings.tsx
@@ -49,7 +49,7 @@ function NotificationSettings({organizations}: NotificationSettingsProps) {
 
   const renderOneSetting = (type: string) => {
     // TODO(isabella): Once GA, remove this
-    const field = NOTIFICATION_SETTING_FIELDS[type];
+    const field = NOTIFICATION_SETTING_FIELDS[type]!;
     if (type === 'quota' && checkFeatureFlag('spend-visibility-notifications')) {
       field.label = t('Spend');
       field.help = t('Notifications that help avoid surprise invoices.');
diff --git a/static/app/views/settings/account/notifications/notificationSettingsByEntity.tsx b/static/app/views/settings/account/notifications/notificationSettingsByEntity.tsx
index 2d4d3b28b91318..8372e75a4d9430 100644
--- a/static/app/views/settings/account/notifications/notificationSettingsByEntity.tsx
+++ b/static/app/views/settings/account/notifications/notificationSettingsByEntity.tsx
@@ -59,7 +59,7 @@ function NotificationSettingsByEntity({
     router.location?.query?.organizationId ?? orgFromSubdomain ?? organizations[0]?.id;
   let organization = organizations.find(({id}) => id === orgId);
   if (!organization) {
-    organization = organizations[0];
+    organization = organizations[0]!;
   }
   const orgSlug = organization.slug;
 
@@ -112,7 +112,7 @@ function NotificationSettingsByEntity({
     handleAddNotificationOption(data);
   };
 
-  const valueOptions = NOTIFICATION_SETTING_FIELDS[notificationType].choices;
+  const valueOptions = NOTIFICATION_SETTING_FIELDS[notificationType]!.choices;
 
   const renderOverrides = () => {
     const matchedOptions = notificationOptions.filter(
diff --git a/static/app/views/settings/account/notifications/notificationSettingsByType.spec.tsx b/static/app/views/settings/account/notifications/notificationSettingsByType.spec.tsx
index e6b9a2ec015a28..121f77411cf83f 100644
--- a/static/app/views/settings/account/notifications/notificationSettingsByType.spec.tsx
+++ b/static/app/views/settings/account/notifications/notificationSettingsByType.spec.tsx
@@ -222,7 +222,7 @@ describe('NotificationSettingsByType', function () {
     });
 
     expect(await screen.findByText('foo')).toBeInTheDocument();
-    await selectEvent.select(screen.getAllByText('On')[1], 'Off');
+    await selectEvent.select(screen.getAllByText('On')[1]!, 'Off');
 
     expect(editSettingMock).toHaveBeenCalledTimes(1);
     expect(editSettingMock).toHaveBeenCalledWith(
@@ -270,7 +270,7 @@ describe('NotificationSettingsByType', function () {
       organizations: [organizationWithFlag, organizationNoFlag],
     });
 
-    expect(await screen.getAllByText('Spend Notifications').length).toEqual(2);
+    expect(await screen.getAllByText('Spend Notifications').length).toBe(2);
     expect(screen.queryByText('Quota Notifications')).not.toBeInTheDocument();
     expect(
       screen.getByText('Control the notifications you receive for organization spend.')
@@ -286,7 +286,7 @@ describe('NotificationSettingsByType', function () {
       organizations: [organizationWithFlag, organizationNoFlag],
     });
 
-    expect(await screen.getAllByText('Spend Notifications').length).toEqual(2);
+    expect(await screen.getAllByText('Spend Notifications').length).toBe(2);
 
     const editSettingMock = MockApiClient.addMockResponse({
       url: `/users/me/notification-options/`,
@@ -301,7 +301,7 @@ describe('NotificationSettingsByType', function () {
     });
 
     // toggle spend notifications off
-    await selectEvent.select(screen.getAllByText('On')[0], 'Off');
+    await selectEvent.select(screen.getAllByText('On')[0]!, 'Off');
 
     expect(editSettingMock).toHaveBeenCalledTimes(1);
     expect(editSettingMock).toHaveBeenCalledWith(
@@ -326,7 +326,7 @@ describe('NotificationSettingsByType', function () {
       organizations: [organization],
     });
 
-    expect(await screen.getAllByText('Spend Notifications').length).toEqual(2);
+    expect(await screen.getAllByText('Spend Notifications').length).toBe(2);
 
     expect(screen.getByText('Errors')).toBeInTheDocument();
     expect(screen.getByText('Spans')).toBeInTheDocument();
@@ -349,7 +349,7 @@ describe('NotificationSettingsByType', function () {
     });
 
     // toggle spans quota notifications off
-    await selectEvent.select(screen.getAllByText('On')[4], 'Off');
+    await selectEvent.select(screen.getAllByText('On')[4]!, 'Off');
 
     expect(editSettingMock).toHaveBeenCalledTimes(1);
     expect(editSettingMock).toHaveBeenCalledWith(
@@ -375,7 +375,7 @@ describe('NotificationSettingsByType', function () {
       organizations: [organization, otherOrganization],
     });
 
-    expect(await screen.getAllByText('Spend Notifications').length).toEqual(2);
+    expect(await screen.getAllByText('Spend Notifications').length).toBe(2);
 
     expect(screen.getByText('Errors')).toBeInTheDocument();
     expect(screen.getByText('Spans')).toBeInTheDocument();
@@ -396,7 +396,7 @@ describe('NotificationSettingsByType', function () {
       organizations: [organization, otherOrganization],
     });
 
-    expect(await screen.getAllByText('Spend Notifications').length).toEqual(2);
+    expect(await screen.getAllByText('Spend Notifications').length).toBe(2);
 
     expect(screen.getByText('Errors')).toBeInTheDocument();
     expect(screen.getByText('Session Replays')).toBeInTheDocument();
@@ -415,7 +415,7 @@ describe('NotificationSettingsByType', function () {
       organizations: [organization],
     });
 
-    expect(await screen.getAllByText('Quota Notifications').length).toEqual(1);
+    expect(await screen.getAllByText('Quota Notifications').length).toBe(1);
     expect(screen.queryByText('Spend Notifications')).not.toBeInTheDocument();
 
     expect(screen.getByText('Errors')).toBeInTheDocument();
@@ -439,7 +439,7 @@ describe('NotificationSettingsByType', function () {
     });
 
     // toggle spans quota notifications off
-    await selectEvent.select(screen.getAllByText('On')[3], 'Off');
+    await selectEvent.select(screen.getAllByText('On')[3]!, 'Off');
 
     expect(editSettingMock).toHaveBeenCalledTimes(1);
     expect(editSettingMock).toHaveBeenCalledWith(
diff --git a/static/app/views/settings/account/notifications/notificationSettingsByType.tsx b/static/app/views/settings/account/notifications/notificationSettingsByType.tsx
index 0d2c7ed0613eec..d2a88e1efdcae8 100644
--- a/static/app/views/settings/account/notifications/notificationSettingsByType.tsx
+++ b/static/app/views/settings/account/notifications/notificationSettingsByType.tsx
@@ -122,7 +122,7 @@ class NotificationSettingsByTypeV2 extends DeprecatedAsyncComponent<Props, State
     let defaultValue: string;
     if (!matchedOption) {
       if (defaultSettings) {
-        defaultValue = defaultSettings.typeDefaults[notificationType];
+        defaultValue = defaultSettings.typeDefaults[notificationType]!;
       } else {
         // should never happen
         defaultValue = 'never';
@@ -290,7 +290,7 @@ class NotificationSettingsByTypeV2 extends DeprecatedAsyncComponent<Props, State
     const {notificationType} = this.props;
     // get the choices but only the ones that are available to the user
     const choices = (
-      NOTIFICATION_SETTING_FIELDS.provider.choices as [SupportedProviders, string][]
+      NOTIFICATION_SETTING_FIELDS.provider!.choices as [SupportedProviders, string][]
     ).filter(([providerSlug]) => this.isProviderSupported(providerSlug));
 
     const defaultField = Object.assign({}, NOTIFICATION_SETTING_FIELDS.provider, {
@@ -328,7 +328,7 @@ class NotificationSettingsByTypeV2 extends DeprecatedAsyncComponent<Props, State
     );
 
     return organizations.filter(organization => {
-      const externalID = integrationExternalIDsByOrganizationID[organization.id];
+      const externalID = integrationExternalIDsByOrganizationID[organization.id]!;
       const identity = identitiesByExternalId[externalID];
       return !!identity;
     });
@@ -401,7 +401,7 @@ class NotificationSettingsByTypeV2 extends DeprecatedAsyncComponent<Props, State
     const {notificationType, organizations} = this.props;
     const {notificationOptions} = this.state;
     const unlinkedSlackOrgs = this.getUnlinkedOrgs('slack');
-    let notificationDetails = ACCOUNT_NOTIFICATION_FIELDS[notificationType];
+    let notificationDetails = ACCOUNT_NOTIFICATION_FIELDS[notificationType]!;
     // TODO(isabella): Once GA, remove this
     if (
       notificationType === 'quota' &&
@@ -474,7 +474,7 @@ class NotificationSettingsByTypeV2 extends DeprecatedAsyncComponent<Props, State
 
 export default withOrganizations(NotificationSettingsByTypeV2);
 
-export const TopJsonForm = styled(JsonForm)`
+const TopJsonForm = styled(JsonForm)`
   ${Panel} {
     border-bottom: 0;
     margin-bottom: 0;
@@ -483,7 +483,7 @@ export const TopJsonForm = styled(JsonForm)`
   }
 `;
 
-export const BottomJsonForm = styled(JsonForm)`
+const BottomJsonForm = styled(JsonForm)`
   ${Panel} {
     border-top-right-radius: 0;
     border-top-left-radius: 0;
diff --git a/static/app/views/settings/account/notifications/utils.tsx b/static/app/views/settings/account/notifications/utils.tsx
index 71ba63a4d142fb..1c068cb1bc7d3b 100644
--- a/static/app/views/settings/account/notifications/utils.tsx
+++ b/static/app/views/settings/account/notifications/utils.tsx
@@ -23,7 +23,7 @@ export const groupByOrganization = (
   >((acc, project) => {
     const orgSlug = project.organization.slug;
     if (acc.hasOwnProperty(orgSlug)) {
-      acc[orgSlug].projects.push(project);
+      acc[orgSlug]!.projects.push(project);
     } else {
       acc[orgSlug] = {
         organization: project.organization,
diff --git a/static/app/views/settings/account/passwordForm.spec.tsx b/static/app/views/settings/account/passwordForm.spec.tsx
index f84b0ab8062bec..b42bc1281c7c3b 100644
--- a/static/app/views/settings/account/passwordForm.spec.tsx
+++ b/static/app/views/settings/account/passwordForm.spec.tsx
@@ -5,7 +5,7 @@ import PasswordForm from 'sentry/views/settings/account/passwordForm';
 const ENDPOINT = '/users/me/password/';
 
 describe('PasswordForm', function () {
-  let putMock;
+  let putMock: jest.Mock;
 
   beforeEach(function () {
     MockApiClient.clearMockResponses();
diff --git a/static/app/views/settings/components/dataScrubbing/convertRelayPiiConfig.tsx b/static/app/views/settings/components/dataScrubbing/convertRelayPiiConfig.tsx
index d131ba13034426..f757f5411f6fc5 100644
--- a/static/app/views/settings/components/dataScrubbing/convertRelayPiiConfig.tsx
+++ b/static/app/views/settings/components/dataScrubbing/convertRelayPiiConfig.tsx
@@ -15,7 +15,7 @@ export function convertRelayPiiConfig(relayPiiConfig?: string | null): Rule[] {
   const convertedRules: Array<Rule> = [];
 
   for (const application in applications) {
-    for (const rule of applications[application]) {
+    for (const rule of applications[application]!) {
       const resolvedRule = rules[rule];
       const id = convertedRules.length;
       const source = application;
diff --git a/static/app/views/settings/components/dataScrubbing/index.spec.tsx b/static/app/views/settings/components/dataScrubbing/index.spec.tsx
index bf584b345d8b61..7fb98590e5cdbc 100644
--- a/static/app/views/settings/components/dataScrubbing/index.spec.tsx
+++ b/static/app/views/settings/components/dataScrubbing/index.spec.tsx
@@ -92,7 +92,7 @@ describe('Data Scrubbing', function () {
 
       expect(screen.getByRole('button', {name: 'Add Rule'})).toBeDisabled();
 
-      for (const index in JSON.parse(relayPiiConfig).rules) {
+      for (const index in JSON.parse(relayPiiConfig).rules as number[]) {
         expect(screen.getAllByRole('button', {name: 'Edit Rule'})[index]).toBeDisabled();
         expect(
           screen.getAllByRole('button', {name: 'Delete Rule'})[index]
@@ -160,7 +160,7 @@ describe('Data Scrubbing', function () {
         </Fragment>
       );
 
-      await userEvent.click(screen.getAllByLabelText('Delete Rule')[0]);
+      await userEvent.click(screen.getAllByLabelText('Delete Rule')[0]!);
 
       expect(
         await screen.findByText('Are you sure you wish to delete this rule?')
@@ -209,7 +209,7 @@ describe('Data Scrubbing', function () {
         {router}
       );
 
-      await userEvent.click(screen.getAllByRole('button', {name: 'Edit Rule'})[0]);
+      await userEvent.click(screen.getAllByRole('button', {name: 'Edit Rule'})[0]!);
 
       // Verify the router to open the modal was called
       expect(router.push).toHaveBeenCalledWith(
diff --git a/static/app/views/settings/components/dataScrubbing/index.tsx b/static/app/views/settings/components/dataScrubbing/index.tsx
index 91b18a3cfb7134..cb7dad4ed48a5f 100644
--- a/static/app/views/settings/components/dataScrubbing/index.tsx
+++ b/static/app/views/settings/components/dataScrubbing/index.tsx
@@ -84,7 +84,7 @@ export function DataScrubbing({
       modalProps => (
         <Edit
           {...modalProps}
-          rule={rules[params.scrubbingId]}
+          rule={rules[params.scrubbingId!]}
           projectId={project?.id}
           savedRules={rules}
           api={api}
diff --git a/static/app/views/settings/components/dataScrubbing/modals/add.spec.tsx b/static/app/views/settings/components/dataScrubbing/modals/add.spec.tsx
index 043557083c40db..b8bb79ac108098 100644
--- a/static/app/views/settings/components/dataScrubbing/modals/add.spec.tsx
+++ b/static/app/views/settings/components/dataScrubbing/modals/add.spec.tsx
@@ -52,7 +52,7 @@ describe('Add Modal', function () {
     // Method Field
     expect(screen.getByText('Method')).toBeInTheDocument();
 
-    await userEvent.hover(screen.getAllByTestId('more-information')[0]);
+    await userEvent.hover(screen.getAllByTestId('more-information')[0]!);
     expect(await screen.findByText('What to do')).toBeInTheDocument();
 
     await userEvent.click(screen.getByText(getMethodLabel(MethodType.MASK).label));
@@ -67,7 +67,7 @@ describe('Add Modal', function () {
     // Type Field
     expect(screen.getByText('Data Type')).toBeInTheDocument();
 
-    await userEvent.hover(screen.getAllByTestId('more-information')[1]);
+    await userEvent.hover(screen.getAllByTestId('more-information')[1]!);
     expect(
       await screen.findByText(
         'What to look for. Use an existing pattern or define your own using regular expressions.'
@@ -91,7 +91,7 @@ describe('Add Modal', function () {
     // Source Field
     screen.getByRole('textbox', {name: 'Source'});
 
-    await userEvent.hover(screen.getAllByTestId('more-information')[2]);
+    await userEvent.hover(screen.getAllByTestId('more-information')[2]!);
 
     expect(
       await screen.findByText(
@@ -132,7 +132,7 @@ describe('Add Modal', function () {
 
     expect(screen.getByPlaceholderText('[Filtered]')).toBeInTheDocument();
 
-    await userEvent.hover(screen.getAllByTestId('more-information')[1]);
+    await userEvent.hover(screen.getAllByTestId('more-information')[1]!);
 
     expect(
       await screen.findByText('It will replace the default placeholder [Filtered]')
@@ -168,7 +168,7 @@ describe('Add Modal', function () {
 
     expect(screen.getByPlaceholderText('[a-zA-Z0-9]+')).toBeInTheDocument();
 
-    await userEvent.hover(screen.getAllByTestId('more-information')[2]);
+    await userEvent.hover(screen.getAllByTestId('more-information')[2]!);
 
     expect(
       await screen.findByText('Custom regular expression (see documentation)')
diff --git a/static/app/views/settings/components/dataScrubbing/modals/edit.spec.tsx b/static/app/views/settings/components/dataScrubbing/modals/edit.spec.tsx
index f5da1bb7f0363e..0acfae96df95d5 100644
--- a/static/app/views/settings/components/dataScrubbing/modals/edit.spec.tsx
+++ b/static/app/views/settings/components/dataScrubbing/modals/edit.spec.tsx
@@ -24,7 +24,7 @@ const stringRelayPiiConfig = JSON.stringify(relayPiiConfig);
 const organizationSlug = 'sentry';
 const convertedRules = convertRelayPiiConfig(stringRelayPiiConfig);
 const rules = convertedRules;
-const rule = rules[2];
+const rule = rules[2]!;
 const projectId = 'foo';
 const endpoint = `/projects/${organizationSlug}/${projectId}/`;
 const api = new MockApiClient();
@@ -58,7 +58,7 @@ describe('Edit Modal', function () {
 
     // Method Field
     expect(screen.getByText('Method')).toBeInTheDocument();
-    await userEvent.hover(screen.getAllByTestId('more-information')[0]);
+    await userEvent.hover(screen.getAllByTestId('more-information')[0]!);
     expect(await screen.findByText('What to do')).toBeInTheDocument();
     await userEvent.click(screen.getByText('Replace'));
 
@@ -70,7 +70,7 @@ describe('Edit Modal', function () {
 
     // Placeholder Field
     expect(screen.getByText('Custom Placeholder (Optional)')).toBeInTheDocument();
-    await userEvent.hover(screen.getAllByTestId('more-information')[1]);
+    await userEvent.hover(screen.getAllByTestId('more-information')[1]!);
     expect(
       await screen.findByText('It will replace the default placeholder [Filtered]')
     ).toBeInTheDocument();
@@ -78,13 +78,13 @@ describe('Edit Modal', function () {
 
     // Type Field
     expect(screen.getByText('Data Type')).toBeInTheDocument();
-    await userEvent.hover(screen.getAllByTestId('more-information')[2]);
+    await userEvent.hover(screen.getAllByTestId('more-information')[2]!);
     expect(
       await screen.findByText(
         'What to look for. Use an existing pattern or define your own using regular expressions.'
       )
     ).toBeInTheDocument();
-    await userEvent.click(screen.getAllByText('Regex matches')[0]);
+    await userEvent.click(screen.getAllByText('Regex matches')[0]!);
 
     Object.values(RuleType)
       .filter(ruleType => ruleType !== RuleType.PATTERN)
@@ -92,11 +92,11 @@ describe('Edit Modal', function () {
         expect(screen.getByText(getRuleLabel(ruleType))).toBeInTheDocument();
       });
 
-    await userEvent.click(screen.getAllByText('Regex matches')[0]);
+    await userEvent.click(screen.getAllByText('Regex matches')[0]!);
 
     // Regex matches Field
     expect(screen.getAllByText('Regex matches')).toHaveLength(2);
-    await userEvent.hover(screen.getAllByTestId('more-information')[3]);
+    await userEvent.hover(screen.getAllByTestId('more-information')[3]!);
     expect(
       await screen.findByText('Custom regular expression (see documentation)')
     ).toBeInTheDocument();
@@ -112,7 +112,7 @@ describe('Edit Modal', function () {
 
     // Source Field
     expect(screen.getByText('Source')).toBeInTheDocument();
-    await userEvent.hover(screen.getAllByTestId('more-information')[4]);
+    await userEvent.hover(screen.getAllByTestId('more-information')[4]!);
     expect(
       await screen.findByText(
         'Where to look. In the simplest case this can be an attribute name.'
@@ -153,7 +153,7 @@ describe('Edit Modal', function () {
     expect(screen.queryByText('Custom Placeholder (Optional)')).not.toBeInTheDocument();
 
     // Type Field
-    await selectEvent.select(screen.getAllByText('Regex matches')[0], 'Anything');
+    await selectEvent.select(screen.getAllByText('Regex matches')[0]!, 'Anything');
 
     // Regex Field should be now hidden
     expect(screen.queryByText('Regex matches')).not.toBeInTheDocument();
@@ -162,7 +162,7 @@ describe('Edit Modal', function () {
     await userEvent.clear(screen.getByRole('textbox', {name: 'Source'}));
     await userEvent.type(
       screen.getByRole('textbox', {name: 'Source'}),
-      valueSuggestions[2].value
+      valueSuggestions[2]!.value
     );
 
     // Save rule
@@ -183,7 +183,7 @@ describe('Edit Modal', function () {
         pattern: '',
         placeholder: '',
         type: 'anything',
-        source: valueSuggestions[2].value,
+        source: valueSuggestions[2]!.value,
       },
     ]);
   });
diff --git a/static/app/views/settings/components/dataScrubbing/modals/form/sourceField.spec.tsx b/static/app/views/settings/components/dataScrubbing/modals/form/sourceField.spec.tsx
index 43ef797277ad72..ce1714138710d4 100644
--- a/static/app/views/settings/components/dataScrubbing/modals/form/sourceField.spec.tsx
+++ b/static/app/views/settings/components/dataScrubbing/modals/form/sourceField.spec.tsx
@@ -74,9 +74,9 @@ describe('Source', function () {
     // binaryOperatorSuggestions.length === 2
     expect(suggestions).toHaveLength(2);
     // &&
-    expect(suggestions[0]).toHaveTextContent(binarySuggestions[0].value);
+    expect(suggestions[0]).toHaveTextContent(binarySuggestions[0]!.value);
     // ||
-    expect(suggestions[1]).toHaveTextContent(binarySuggestions[1].value);
+    expect(suggestions[1]).toHaveTextContent(binarySuggestions[1]!.value);
   });
 
   it('display defaultSuggestions + unaryOperatorSuggestions, if penultimateFieldValue has type binary', async function () {
@@ -96,7 +96,7 @@ describe('Source', function () {
     // [...defaultSuggestions, ...unaryOperatorSuggestions].length === 18
     expect(suggestions).toHaveLength(18);
     // !
-    expect(suggestions[17]).toHaveTextContent(unarySuggestions[0].value);
+    expect(suggestions[17]).toHaveTextContent(unarySuggestions[0]!.value);
   });
 
   it('display binaryOperatorSuggestions if penultimateFieldValue has type value', async function () {
@@ -116,9 +116,9 @@ describe('Source', function () {
     // binaryOperatorSuggestions.length === 2
     expect(suggestions).toHaveLength(2);
     // &&
-    expect(suggestions[0]).toHaveTextContent(binarySuggestions[0].value);
+    expect(suggestions[0]).toHaveTextContent(binarySuggestions[0]!.value);
     // ||
-    expect(suggestions[1]).toHaveTextContent(binarySuggestions[1].value);
+    expect(suggestions[1]).toHaveTextContent(binarySuggestions[1]!.value);
   });
 
   it('display binaryOperatorSuggestions if penultimateFieldValue is of typeof Array', async () => {
@@ -138,9 +138,9 @@ describe('Source', function () {
     // binaryOperatorSuggestions.length === 2
     expect(suggestions).toHaveLength(2);
     // &&
-    expect(suggestions[0]).toHaveTextContent(binarySuggestions[0].value);
+    expect(suggestions[0]).toHaveTextContent(binarySuggestions[0]!.value);
     // ||
-    expect(suggestions[1]).toHaveTextContent(binarySuggestions[1].value);
+    expect(suggestions[1]).toHaveTextContent(binarySuggestions[1]!.value);
   });
 
   it('display defaultSuggestions if penultimateFieldValue has type unary', async () => {
@@ -162,7 +162,7 @@ describe('Source', function () {
 
     // everywhere
     expect(suggestions[0]).toHaveTextContent(
-      `${valueSuggestions[0].value}(${valueSuggestions[0].description})`
+      `${valueSuggestions[0]!.value}(${valueSuggestions[0]!.description})`
     );
   });
 
@@ -182,7 +182,7 @@ describe('Source', function () {
 
     const suggestions = screen.getAllByRole('listitem');
 
-    await userEvent.click(suggestions[1]);
+    await userEvent.click(suggestions[1]!);
 
     expect(handleOnChange).toHaveBeenCalledWith('foo && password');
   });
diff --git a/static/app/views/settings/components/dataScrubbing/modals/form/sourceField.tsx b/static/app/views/settings/components/dataScrubbing/modals/form/sourceField.tsx
index 678f318781b413..3ba2591825514a 100644
--- a/static/app/views/settings/components/dataScrubbing/modals/form/sourceField.tsx
+++ b/static/app/views/settings/components/dataScrubbing/modals/form/sourceField.tsx
@@ -104,8 +104,8 @@ class SourceField extends Component<Props, State> {
   }
 
   getNewSuggestions(fieldValues: Array<SourceSuggestion | Array<SourceSuggestion>>) {
-    const lastFieldValue = fieldValues[fieldValues.length - 1];
-    const penultimateFieldValue = fieldValues[fieldValues.length - 2];
+    const lastFieldValue = fieldValues[fieldValues.length - 1]!;
+    const penultimateFieldValue = fieldValues[fieldValues.length - 2]!;
 
     if (Array.isArray(lastFieldValue)) {
       // recursion
@@ -172,8 +172,8 @@ class SourceField extends Component<Props, State> {
     const splittedValue = newValue.split(' ');
 
     for (const splittedValueIndex in splittedValue) {
-      const value = splittedValue[splittedValueIndex];
-      const lastFieldValue = fieldValues[fieldValues.length - 1];
+      const value = splittedValue[splittedValueIndex]!;
+      const lastFieldValue = fieldValues[fieldValues.length - 1]!;
 
       if (
         lastFieldValue &&
@@ -185,18 +185,18 @@ class SourceField extends Component<Props, State> {
       }
 
       if (value.includes('!') && !!value.split('!')[1]) {
-        const valueAfterUnaryOperator = value.split('!')[1];
+        const valueAfterUnaryOperator = value.split('!')[1]!;
         const selector = this.getAllSuggestions().find(
           s => s.value === valueAfterUnaryOperator
         );
         if (!selector) {
           fieldValues.push([
-            unarySuggestions[0],
+            unarySuggestions[0]!,
             {type: SourceSuggestionType.STRING, value: valueAfterUnaryOperator},
           ]);
           continue;
         }
-        fieldValues.push([unarySuggestions[0], selector]);
+        fieldValues.push([unarySuggestions[0]!, selector]);
         continue;
       }
 
@@ -221,7 +221,7 @@ class SourceField extends Component<Props, State> {
   scrollToSuggestion() {
     const {activeSuggestion, hideCaret} = this.state;
 
-    this.suggestionList?.current?.children[activeSuggestion].scrollIntoView({
+    this.suggestionList?.current?.children[activeSuggestion]!.scrollIntoView({
       behavior: 'smooth',
       block: 'nearest',
       inline: 'start',
@@ -240,7 +240,7 @@ class SourceField extends Component<Props, State> {
     const newValue: Array<string> = [];
 
     for (const index in fieldValues) {
-      const fieldValue = fieldValues[index];
+      const fieldValue = fieldValues[index]!;
       if (Array.isArray(fieldValue)) {
         if (fieldValue[0]?.value || fieldValue[1]?.value) {
           newValue.push(`${fieldValue[0]?.value ?? ''}${fieldValue[1]?.value ?? ''}`);
@@ -256,15 +256,15 @@ class SourceField extends Component<Props, State> {
   getNewFieldValues(
     suggestion: SourceSuggestion
   ): Array<SourceSuggestion | Array<SourceSuggestion>> {
-    const fieldValues = [...this.state.fieldValues];
-    const lastFieldValue = fieldValues[fieldValues.length - 1];
+    const fieldValues = [...this.state.fieldValues]!;
+    const lastFieldValue = fieldValues[fieldValues.length - 1]!;
 
     if (!defined(lastFieldValue)) {
       return [suggestion];
     }
 
     if (Array.isArray(lastFieldValue)) {
-      fieldValues[fieldValues.length - 1] = [lastFieldValue[0], suggestion];
+      fieldValues[fieldValues.length - 1] = [lastFieldValue[0]!, suggestion];
       return fieldValues;
     }
 
@@ -354,7 +354,7 @@ class SourceField extends Component<Props, State> {
     }
 
     if (key === 'Enter') {
-      this.handleClickSuggestionItem(suggestions[activeSuggestion]);
+      this.handleClickSuggestionItem(suggestions[activeSuggestion]!);
       return;
     }
 
diff --git a/static/app/views/settings/components/dataScrubbing/submitRules.tsx b/static/app/views/settings/components/dataScrubbing/submitRules.tsx
index 967b258df95c69..bfd53fa604aac3 100644
--- a/static/app/views/settings/components/dataScrubbing/submitRules.tsx
+++ b/static/app/views/settings/components/dataScrubbing/submitRules.tsx
@@ -48,7 +48,7 @@ function submitRules(api: Client, endpoint: string, rules: Array<Rule>) {
   const submitFormatRules: Record<string, PiiConfig> = {};
 
   for (let i = 0; i < rules.length; i++) {
-    const rule = rules[i];
+    const rule = rules[i]!;
     const ruleId = String(i);
     submitFormatRules[ruleId] = getSubmitFormatRule(rule);
 
@@ -56,8 +56,8 @@ function submitRules(api: Client, endpoint: string, rules: Array<Rule>) {
       applications[rule.source] = [];
     }
 
-    if (!applications[rule.source].includes(ruleId)) {
-      applications[rule.source].push(ruleId);
+    if (!applications[rule.source]!.includes(ruleId)) {
+      applications[rule.source]!.push(ruleId);
     }
   }
 
diff --git a/static/app/views/settings/components/dataSecrecy/index.spec.tsx b/static/app/views/settings/components/dataSecrecy/index.spec.tsx
index d509fe8ba333e6..72e847e5f48ff1 100644
--- a/static/app/views/settings/components/dataSecrecy/index.spec.tsx
+++ b/static/app/views/settings/components/dataSecrecy/index.spec.tsx
@@ -21,7 +21,7 @@ describe('DataSecrecy', function () {
       body: null,
     });
 
-    render(<DataSecrecy />, {organization: organization});
+    render(<DataSecrecy />, {organization});
 
     await waitFor(() => {
       expect(screen.getByText('Support Access')).toBeInTheDocument();
@@ -42,7 +42,7 @@ describe('DataSecrecy', function () {
       body: null,
     });
 
-    render(<DataSecrecy />, {organization: organization});
+    render(<DataSecrecy />, {organization});
 
     await waitFor(() => {
       expect(screen.getByText('Support Access')).toBeInTheDocument();
@@ -66,7 +66,7 @@ describe('DataSecrecy', function () {
       },
     });
 
-    render(<DataSecrecy />, {organization: organization});
+    render(<DataSecrecy />, {organization});
 
     await waitFor(() => {
       expect(screen.getByText('Support Access')).toBeInTheDocument();
@@ -94,7 +94,7 @@ describe('DataSecrecy', function () {
     });
 
     organization.allowSuperuserAccess = false;
-    render(<DataSecrecy />, {organization: organization});
+    render(<DataSecrecy />, {organization});
 
     await waitFor(() => {
       const accessMessage = screen.getByText(
@@ -103,4 +103,38 @@ describe('DataSecrecy', function () {
       expect(accessMessage).toBeInTheDocument();
     });
   });
+
+  it('can update permanent access', async function () {
+    MockApiClient.addMockResponse({
+      url: `/organizations/${organization.slug}/data-secrecy/`,
+      body: {
+        accessStart: '2023-08-29T01:05:00+00:00',
+        accessEnd: '2024-08-29T01:05:00+00:00',
+      },
+    });
+
+    const mockUpdate = MockApiClient.addMockResponse({
+      url: `/organizations/${organization.slug}/`,
+      method: 'PUT',
+    });
+
+    organization.allowSuperuserAccess = false;
+    render(<DataSecrecy />, {organization});
+
+    // Toggle permanent access on
+    const allowAccessToggle = screen.getByRole('checkbox', {
+      name: /Sentry employees will not have access to your data unless granted permission/,
+    });
+    allowAccessToggle.click();
+
+    await waitFor(() => {
+      expect(mockUpdate).toHaveBeenCalledWith(
+        `/organizations/${organization.slug}/`,
+        expect.objectContaining({
+          method: 'PUT',
+          data: {allowSuperuserAccess: true},
+        })
+      );
+    });
+  });
 });
diff --git a/static/app/views/settings/components/dataSecrecy/index.tsx b/static/app/views/settings/components/dataSecrecy/index.tsx
index db3d76a8803ea8..3165dba78e8e7d 100644
--- a/static/app/views/settings/components/dataSecrecy/index.tsx
+++ b/static/app/views/settings/components/dataSecrecy/index.tsx
@@ -26,8 +26,13 @@ export default function DataSecrecy() {
   const api = useApi();
   const organization = useOrganization();
 
+  // state for the allowSuperuserAccess bit field
   const [allowAccess, setAllowAccess] = useState(organization.allowSuperuserAccess);
-  const [allowDate, setAllowDate] = useState<WaiverData>();
+
+  // state of the data secrecy waiver
+  const [waiver, setWaiver] = useState<WaiverData>();
+
+  // state for the allowDateFormData field
   const [allowDateFormData, setAllowDateFormData] = useState<string>('');
 
   const {data, refetch} = useApiQuery<WaiverData>(
@@ -38,12 +43,9 @@ export default function DataSecrecy() {
     }
   );
 
-  const hasValidTempAccess =
-    allowDate?.accessEnd && moment().toISOString() < allowDate.accessEnd;
-
   useEffect(() => {
     if (data?.accessEnd) {
-      setAllowDate(data);
+      setWaiver(data);
       // slice it to yyyy-MM-ddThh:mm format (be aware of the timezone)
       const localDate = moment(data.accessEnd).local();
       setAllowDateFormData(localDate.format('YYYY-MM-DDTHH:mm'));
@@ -57,10 +59,31 @@ export default function DataSecrecy() {
         data: {allowSuperuserAccess: value},
       });
       setAllowAccess(value);
-      addSuccessMessage(t('Successfully updated access.'));
+
+      // if the user has allowed access, we need to remove the temporary access window
+      // only if there is an existing waiver
+      if (value && waiver) {
+        await api.requestPromise(`/organizations/${organization.slug}/data-secrecy/`, {
+          method: 'DELETE',
+        });
+        setAllowDateFormData('');
+        setWaiver(undefined);
+      }
+      addSuccessMessage(
+        value
+          ? waiver
+            ? t(
+                'Successfully removed temporary access window and allowed support access.'
+              )
+            : t('Successfully allowed support access.')
+          : t('Successfully removed support access.')
+      );
     } catch (error) {
       addErrorMessage(t('Unable to save changes.'));
     }
+
+    // refetch to get the latest waiver data
+    refetch();
   };
 
   const updateTempAccessDate = async () => {
@@ -69,7 +92,7 @@ export default function DataSecrecy() {
         await api.requestPromise(`/organizations/${organization.slug}/data-secrecy/`, {
           method: 'DELETE',
         });
-        setAllowDate({accessStart: '', accessEnd: ''});
+        setWaiver({accessStart: '', accessEnd: ''});
         addSuccessMessage(t('Successfully removed temporary access window.'));
       } catch (error) {
         addErrorMessage(t('Unable to remove temporary access window.'));
@@ -86,14 +109,11 @@ export default function DataSecrecy() {
     };
 
     try {
-      await await api.requestPromise(
-        `/organizations/${organization.slug}/data-secrecy/`,
-        {
-          method: 'PUT',
-          data: nextData,
-        }
-      );
-      setAllowDate(nextData);
+      await api.requestPromise(`/organizations/${organization.slug}/data-secrecy/`, {
+        method: 'PUT',
+        data: nextData,
+      });
+      setWaiver(nextData);
       addSuccessMessage(t('Successfully updated temporary access window.'));
     } catch (error) {
       addErrorMessage(t('Unable to save changes.'));
@@ -123,10 +143,20 @@ export default function DataSecrecy() {
     help: t(
       'Open a temporary time window for Sentry employees to access your organization'
     ),
-    disabled: allowAccess && !organization.access.includes('org:write'),
-    value: allowAccess ? '' : allowDateFormData,
+    // disable the field if the user has allowed access or if the user does not have org:write access
+    disabled: allowAccess || !organization.access.includes('org:write'),
+    disabledReason: allowAccess
+      ? t('Disable permanent access first to set temporary access')
+      : !organization.access.includes('org:write')
+        ? t('You do not have permission to modify access settings')
+        : undefined,
+    value: allowDateFormData,
     onBlur: updateTempAccessDate,
     onChange: v => {
+      // Don't allow the user to set the date if they have allowed access
+      if (allowAccess) {
+        return;
+      }
       // the picker doesn't like having a datetime string with seconds+ and a timezone,
       // so we remove it -- we will add it back when we save the date
       const formattedDate = v ? moment(v).format('YYYY-MM-DDTHH:mm') : '';
@@ -140,9 +170,9 @@ export default function DataSecrecy() {
       <PanelBody>
         {!allowAccess && (
           <PanelAlert>
-            {hasValidTempAccess
+            {waiver?.accessEnd && moment().isBefore(moment(waiver.accessEnd))
               ? tct(`Sentry employees has access to your organization until [date]`, {
-                  date: formatDateTime(allowDate?.accessEnd as string),
+                  date: formatDateTime(waiver?.accessEnd as string),
                 })
               : t('Sentry employees do not have access to your organization')}
           </PanelAlert>
diff --git a/static/app/views/settings/components/settingsBreadcrumb/organizationCrumb.spec.tsx b/static/app/views/settings/components/settingsBreadcrumb/organizationCrumb.spec.tsx
index 7f644ef38c8bc5..604d310d24193a 100644
--- a/static/app/views/settings/components/settingsBreadcrumb/organizationCrumb.spec.tsx
+++ b/static/app/views/settings/components/settingsBreadcrumb/organizationCrumb.spec.tsx
@@ -6,7 +6,6 @@ import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 import ConfigStore from 'sentry/stores/configStore';
 import OrganizationsStore from 'sentry/stores/organizationsStore';
 import type {Config} from 'sentry/types/system';
-import {browserHistory} from 'sentry/utils/browserHistory';
 
 import {OrganizationCrumb} from './organizationCrumb';
 import type {RouteWithName} from './types';
@@ -29,13 +28,12 @@ describe('OrganizationCrumb', function () {
     OrganizationsStore.load(organizations);
 
     initialData = ConfigStore.getState();
-    jest.mocked(browserHistory.push).mockReset();
     jest.mocked(window.location.assign).mockReset();
   });
 
   const switchOrganization = async () => {
     await userEvent.hover(screen.getByRole('link'));
-    await userEvent.click(screen.getAllByRole('option')[1]);
+    await userEvent.click(screen.getAllByRole('option')[1]!);
   };
 
   const renderComponent = (
@@ -67,7 +65,7 @@ describe('OrganizationCrumb', function () {
     renderComponent({routes, route});
     await switchOrganization();
 
-    expect(browserHistory.push).toHaveBeenCalledWith('/settings/org-slug2/');
+    expect(router.push).toHaveBeenCalledWith({pathname: '/settings/org-slug2/'});
   });
 
   it('switches organizations while on API Keys Details route', async function () {
@@ -88,7 +86,7 @@ describe('OrganizationCrumb', function () {
     renderComponent({routes, route});
     await switchOrganization();
 
-    expect(browserHistory.push).toHaveBeenCalledWith('/settings/org-slug2/api-keys/');
+    expect(router.push).toHaveBeenCalledWith({pathname: '/settings/org-slug2/api-keys/'});
   });
 
   it('switches organizations while on API Keys List route', async function () {
@@ -108,7 +106,7 @@ describe('OrganizationCrumb', function () {
     renderComponent({routes, route});
     await switchOrganization();
 
-    expect(browserHistory.push).toHaveBeenCalledWith('/settings/org-slug2/api-keys/');
+    expect(router.push).toHaveBeenCalledWith({pathname: '/settings/org-slug2/api-keys/'});
   });
 
   it('switches organizations while in Project Client Keys Details route', async function () {
@@ -130,7 +128,7 @@ describe('OrganizationCrumb', function () {
     });
     await switchOrganization();
 
-    expect(browserHistory.push).toHaveBeenCalledWith('/settings/org-slug2/');
+    expect(router.push).toHaveBeenCalledWith({pathname: '/settings/org-slug2/'});
   });
 
   it('switches organizations for child route with customer domains', async function () {
diff --git a/static/app/views/settings/components/settingsBreadcrumb/organizationCrumb.tsx b/static/app/views/settings/components/settingsBreadcrumb/organizationCrumb.tsx
index c617690ee6bac3..b7519122b0ce1d 100644
--- a/static/app/views/settings/components/settingsBreadcrumb/organizationCrumb.tsx
+++ b/static/app/views/settings/components/settingsBreadcrumb/organizationCrumb.tsx
@@ -6,9 +6,9 @@ import OrganizationsStore from 'sentry/stores/organizationsStore';
 import {useLegacyStore} from 'sentry/stores/useLegacyStore';
 import type {RouteComponentProps} from 'sentry/types/legacyReactRouter';
 import type {Organization} from 'sentry/types/organization';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import recreateRoute from 'sentry/utils/recreateRoute';
 import {resolveRoute} from 'sentry/utils/resolveRoute';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 
 import BreadcrumbDropdown from './breadcrumbDropdown';
@@ -19,6 +19,7 @@ import {CrumbLink} from '.';
 type Props = RouteComponentProps<{projectId?: string}, {}>;
 
 function OrganizationCrumb({params, routes, route, ...props}: Props) {
+  const navigate = useNavigate();
   const {organizations} = useLegacyStore(OrganizationsStore);
   const organization = useOrganization();
 
@@ -53,7 +54,7 @@ function OrganizationCrumb({params, routes, route, ...props}: Props) {
     if (resolvedUrl.startsWith('http')) {
       window.location.assign(resolvedUrl);
     } else {
-      browserHistory.push(resolvedUrl);
+      navigate(resolvedUrl);
     }
   };
 
diff --git a/static/app/views/settings/components/settingsBreadcrumb/projectCrumb.tsx b/static/app/views/settings/components/settingsBreadcrumb/projectCrumb.tsx
index 3793f316c884f6..424da5c85e02bc 100644
--- a/static/app/views/settings/components/settingsBreadcrumb/projectCrumb.tsx
+++ b/static/app/views/settings/components/settingsBreadcrumb/projectCrumb.tsx
@@ -6,9 +6,9 @@ import {space} from 'sentry/styles/space';
 import type {RouteComponentProps} from 'sentry/types/legacyReactRouter';
 import type {Organization} from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import recreateRoute from 'sentry/utils/recreateRoute';
 import replaceRouterParams from 'sentry/utils/replaceRouterParams';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useProjects from 'sentry/utils/useProjects';
 import withLatestContext from 'sentry/utils/withLatestContext';
 
@@ -31,6 +31,7 @@ function ProjectCrumb({
   route,
   ...props
 }: Props) {
+  const navigate = useNavigate();
   const {projects} = useProjects();
   const handleSelect = (item: {value: string}) => {
     // We have to make exceptions for routes like "Project Alerts Rule Edit" or "Client Key Details"
@@ -47,7 +48,7 @@ function ProjectCrumb({
       return;
     }
 
-    browserHistory.push(
+    navigate(
       recreateRoute(returnTo, {routes, params: {...params, projectId: item.value}})
     );
   };
diff --git a/static/app/views/settings/components/settingsBreadcrumb/teamCrumb.tsx b/static/app/views/settings/components/settingsBreadcrumb/teamCrumb.tsx
index 0bdcaaa027ce3c..eeaeee731d89ac 100644
--- a/static/app/views/settings/components/settingsBreadcrumb/teamCrumb.tsx
+++ b/static/app/views/settings/components/settingsBreadcrumb/teamCrumb.tsx
@@ -3,8 +3,8 @@ import debounce from 'lodash/debounce';
 import IdBadge from 'sentry/components/idBadge';
 import {DEFAULT_DEBOUNCE_DURATION} from 'sentry/constants';
 import type {RouteComponentProps} from 'sentry/types/legacyReactRouter';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import recreateRoute from 'sentry/utils/recreateRoute';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import {useParams} from 'sentry/utils/useParams';
 import {useTeams} from 'sentry/utils/useTeams';
 
@@ -15,6 +15,7 @@ import {CrumbLink} from '.';
 type Props = RouteComponentProps<{teamId: string}, {}>;
 
 function TeamCrumb({routes, route, ...props}: Props) {
+  const navigate = useNavigate();
   const {teams, onSearch, fetching} = useTeams();
   const params = useParams();
 
@@ -39,7 +40,7 @@ function TeamCrumb({routes, route, ...props}: Props) {
         </CrumbLink>
       }
       onSelect={item => {
-        browserHistory.push(
+        navigate(
           recreateRoute('', {
             routes,
             params: {...params, teamId: item.value},
diff --git a/static/app/views/settings/components/settingsLayout.tsx b/static/app/views/settings/components/settingsLayout.tsx
index 2008fe7c96b201..41cda3a0a2faa6 100644
--- a/static/app/views/settings/components/settingsLayout.tsx
+++ b/static/app/views/settings/components/settingsLayout.tsx
@@ -35,7 +35,7 @@ function SettingsLayout(props: Props) {
   const location = useLocation();
 
   const toggleNav = useCallback((visible: boolean) => {
-    const bodyElement = document.getElementsByTagName('body')[0];
+    const bodyElement = document.getElementsByTagName('body')[0]!;
 
     window.scrollTo?.(0, 0);
     bodyElement.classList[visible ? 'add' : 'remove']('scroll-lock');
diff --git a/static/app/views/settings/dynamicSampling/organizationSampling.tsx b/static/app/views/settings/dynamicSampling/organizationSampling.tsx
index c883c3decde7e5..374a0d5a8c1ff3 100644
--- a/static/app/views/settings/dynamicSampling/organizationSampling.tsx
+++ b/static/app/views/settings/dynamicSampling/organizationSampling.tsx
@@ -126,6 +126,7 @@ export function OrganizationSampling() {
           <ProjectsPreviewTable
             sampleCounts={sampleCountsQuery.data}
             isLoading={sampleCountsQuery.isPending}
+            period={period}
           />
         )}
         <SubTextParagraph>
diff --git a/static/app/views/settings/dynamicSampling/projectSampling.tsx b/static/app/views/settings/dynamicSampling/projectSampling.tsx
index 6c95d5b07208bd..923d60c885219a 100644
--- a/static/app/views/settings/dynamicSampling/projectSampling.tsx
+++ b/static/app/views/settings/dynamicSampling/projectSampling.tsx
@@ -1,5 +1,6 @@
-import {useMemo, useState} from 'react';
+import React, {Fragment, useEffect, useMemo, useState} from 'react';
 import styled from '@emotion/styled';
+import {motion} from 'framer-motion';
 
 import {
   addErrorMessage,
@@ -11,6 +12,8 @@ import LoadingError from 'sentry/components/loadingError';
 import Panel from 'sentry/components/panels/panel';
 import PanelBody from 'sentry/components/panels/panelBody';
 import PanelHeader from 'sentry/components/panels/panelHeader';
+import {Tooltip} from 'sentry/components/tooltip';
+import {IconArrow} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import {OnRouteLeave} from 'sentry/utils/reactRouter6Compat/onRouteLeave';
@@ -58,7 +61,7 @@ export function ProjectSampling() {
   const initialValues = useMemo(() => ({projectRates}), [projectRates]);
 
   const formState = useFormState({
-    initialValues: initialValues,
+    initialValues,
     enableReInitialize: true,
   });
 
@@ -150,6 +153,7 @@ export function ProjectSampling() {
           <LoadingError onRetry={sampleCountsQuery.refetch} />
         ) : (
           <ProjectsEditTable
+            period={period}
             editMode={editMode}
             onEditModeChange={setEditMode}
             isLoading={sampleRatesQuery.isPending || sampleCountsQuery.isPending}
@@ -160,19 +164,98 @@ export function ProjectSampling() {
           <Button disabled={isFormActionDisabled} onClick={handleReset}>
             {t('Reset')}
           </Button>
-          <Button
-            priority="primary"
-            disabled={isFormActionDisabled || !formState.isValid}
-            onClick={handleSubmit}
-          >
-            {t('Apply Changes')}
-          </Button>
+          <ScrollIntoViewButton enabled={!isFormActionDisabled && formState.isValid}>
+            <Button
+              priority="primary"
+              disabled={isFormActionDisabled || !formState.isValid}
+              onClick={handleSubmit}
+            >
+              {t('Apply Changes')}
+            </Button>
+          </ScrollIntoViewButton>
         </FormActions>
       </form>
     </FormProvider>
   );
 }
 
+function ScrollIntoViewButton({
+  children,
+  enabled,
+}: {
+  children: React.ReactElement;
+  enabled: boolean;
+}) {
+  if (React.Children.count(children) !== 1) {
+    throw new Error('ScrollIntoViewButton only accepts a single child');
+  }
+
+  const [isVisible, setIsVisible] = useState(false);
+  const [targetElement, setTargetElement] = useState<HTMLElement>();
+
+  useEffect(() => {
+    if (!targetElement || !enabled) {
+      return () => {};
+    }
+
+    const observer = new IntersectionObserver(
+      observerEntries => {
+        const entry = observerEntries[0]!;
+        setIsVisible(!entry.isIntersecting);
+      },
+      {
+        root: null,
+        threshold: 0.5,
+      }
+    );
+
+    observer.observe(targetElement);
+    return () => {
+      observer.disconnect();
+      setIsVisible(false);
+    };
+  }, [targetElement, enabled]);
+
+  return (
+    <Fragment>
+      {React.cloneElement(children, {ref: setTargetElement})}
+      {isVisible && (
+        <Tooltip title={t('Scroll down to apply changes')} skipWrapper>
+          <FloatingButton
+            type="button"
+            onClick={() => {
+              targetElement?.scrollIntoView({behavior: 'smooth'});
+            }}
+            initial={{opacity: 0, scale: 0.5}}
+            animate={{opacity: 1, scale: 1}}
+            transition={{
+              ease: [0, 0.71, 0.2, 1.4],
+            }}
+          >
+            <IconArrow direction="down" size="sm" />
+          </FloatingButton>
+        </Tooltip>
+      )}
+    </Fragment>
+  );
+}
+
+const FloatingButton = styled(motion.button)`
+  position: fixed;
+  bottom: ${space(4)};
+  right: ${space(1)};
+  border-radius: 50%;
+  border: 1px solid ${p => p.theme.border};
+  background-color: ${p => p.theme.purple400};
+  color: ${p => p.theme.white};
+  box-shadow: ${p => p.theme.dropShadowHeavy};
+  width: 36px;
+  height: 36px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+`;
+
 const FormActions = styled('div')`
   display: grid;
   grid-template-columns: repeat(2, max-content);
diff --git a/static/app/views/settings/dynamicSampling/projectsEditTable.tsx b/static/app/views/settings/dynamicSampling/projectsEditTable.tsx
index e1705a4ef5766b..c27264c32830e9 100644
--- a/static/app/views/settings/dynamicSampling/projectsEditTable.tsx
+++ b/static/app/views/settings/dynamicSampling/projectsEditTable.tsx
@@ -19,12 +19,16 @@ import {formatPercent} from 'sentry/views/settings/dynamicSampling/utils/formatP
 import {parsePercent} from 'sentry/views/settings/dynamicSampling/utils/parsePercent';
 import {projectSamplingForm} from 'sentry/views/settings/dynamicSampling/utils/projectSamplingForm';
 import {scaleSampleRates} from 'sentry/views/settings/dynamicSampling/utils/scaleSampleRates';
-import type {ProjectSampleCount} from 'sentry/views/settings/dynamicSampling/utils/useProjectSampleCounts';
+import type {
+  ProjectionSamplePeriod,
+  ProjectSampleCount,
+} from 'sentry/views/settings/dynamicSampling/utils/useProjectSampleCounts';
 
 interface Props {
   editMode: 'single' | 'bulk';
   isLoading: boolean;
   onEditModeChange: (mode: 'single' | 'bulk') => void;
+  period: ProjectionSamplePeriod;
   sampleCounts: ProjectSampleCount[];
 }
 
@@ -35,6 +39,7 @@ export function ProjectsEditTable({
   isLoading: isLoadingProp,
   sampleCounts,
   editMode,
+  period,
   onEditModeChange,
 }: Props) {
   const {projects, fetching} = useProjects();
@@ -130,9 +135,9 @@ export function ProjectsEditTable({
           count: item?.count || 0,
           ownCount: item?.ownCount || 0,
           subProjects: item?.subProjects ?? EMPTY_ARRAY,
-          project: project,
-          initialSampleRate: initialValue[project.id],
-          sampleRate: value[project.id],
+          project,
+          initialSampleRate: initialValue[project.id]!,
+          sampleRate: value[project.id]!,
           error: error?.[project.id],
         };
       }),
@@ -260,6 +265,7 @@ export function ProjectsEditTable({
         canEdit={!isBulkEditEnabled}
         onChange={handleProjectChange}
         emptyMessage={t('No active projects found in the selected period.')}
+        period={period}
         isLoading={isLoading}
         items={activeItems}
         inactiveItems={inactiveItems}
diff --git a/static/app/views/settings/dynamicSampling/projectsPreviewTable.tsx b/static/app/views/settings/dynamicSampling/projectsPreviewTable.tsx
index bac6e059277e87..e3bd177b3fcea7 100644
--- a/static/app/views/settings/dynamicSampling/projectsPreviewTable.tsx
+++ b/static/app/views/settings/dynamicSampling/projectsPreviewTable.tsx
@@ -13,16 +13,20 @@ import {formatPercent} from 'sentry/views/settings/dynamicSampling/utils/formatP
 import {organizationSamplingForm} from 'sentry/views/settings/dynamicSampling/utils/organizationSamplingForm';
 import {parsePercent} from 'sentry/views/settings/dynamicSampling/utils/parsePercent';
 import {balanceSampleRate} from 'sentry/views/settings/dynamicSampling/utils/rebalancing';
-import type {ProjectSampleCount} from 'sentry/views/settings/dynamicSampling/utils/useProjectSampleCounts';
+import type {
+  ProjectionSamplePeriod,
+  ProjectSampleCount,
+} from 'sentry/views/settings/dynamicSampling/utils/useProjectSampleCounts';
 
 const {useFormField} = organizationSamplingForm;
 
 interface Props {
   isLoading: boolean;
+  period: ProjectionSamplePeriod;
   sampleCounts: ProjectSampleCount[];
 }
 
-export function ProjectsPreviewTable({isLoading, sampleCounts}: Props) {
+export function ProjectsPreviewTable({isLoading, period, sampleCounts}: Props) {
   const {value: targetSampleRate, initialValue: initialTargetSampleRate} =
     useFormField('targetSampleRate');
 
@@ -98,6 +102,7 @@ export function ProjectsPreviewTable({isLoading, sampleCounts}: Props) {
         rateHeader={t('Estimated Rate')}
         inputTooltip={t('To edit project sample rates, switch to manual sampling mode.')}
         emptyMessage={t('No active projects found in the selected period.')}
+        period={period}
         isEmpty={!sampleCounts.length}
         isLoading={isLoading}
         items={itemsWithFormattedNumbers}
diff --git a/static/app/views/settings/dynamicSampling/projectsTable.tsx b/static/app/views/settings/dynamicSampling/projectsTable.tsx
index 7432d4f73845ff..e9e8bbba23d1e1 100644
--- a/static/app/views/settings/dynamicSampling/projectsTable.tsx
+++ b/static/app/views/settings/dynamicSampling/projectsTable.tsx
@@ -16,6 +16,7 @@ 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';
+import type {ProjectionSamplePeriod} from 'sentry/views/settings/dynamicSampling/utils/useProjectSampleCounts';
 
 interface ProjectItem {
   count: number;
@@ -29,6 +30,7 @@ interface ProjectItem {
 
 interface Props extends Omit<React.ComponentProps<typeof StyledPanelTable>, 'headers'> {
   items: ProjectItem[];
+  period: ProjectionSamplePeriod;
   rateHeader: React.ReactNode;
   canEdit?: boolean;
   inactiveItems?: ProjectItem[];
@@ -45,6 +47,7 @@ export function ProjectsTable({
   canEdit,
   rateHeader,
   onChange,
+  period,
   ...props
 }: Props) {
   const hasAccess = useHasDynamicSamplingWriteAccess();
@@ -64,12 +67,12 @@ export function ProjectsTable({
       {...props}
       isEmpty={!items.length && !inactiveItems.length}
       headers={[
-        t('Project'),
+        t('Originating Project'),
         <SortableHeader type="button" key="spans" onClick={handleTableSort}>
           {t('Accepted Spans')}
           <IconArrow direction={tableSort === 'desc' ? 'down' : 'up'} size="xs" />
         </SortableHeader>,
-        t('Stored Spans'),
+        period === '24h' ? t('Stored Spans (24h)') : t('Stored Spans (30d)'),
         rateHeader,
       ]}
     >
diff --git a/static/app/views/settings/dynamicSampling/samplingBreakdown.tsx b/static/app/views/settings/dynamicSampling/samplingBreakdown.tsx
index 9c9abfd571baf7..2827722fe7c0af 100644
--- a/static/app/views/settings/dynamicSampling/samplingBreakdown.tsx
+++ b/static/app/views/settings/dynamicSampling/samplingBreakdown.tsx
@@ -13,7 +13,7 @@ import {formatPercent} from 'sentry/views/settings/dynamicSampling/utils/formatP
 import type {ProjectSampleCount} from 'sentry/views/settings/dynamicSampling/utils/useProjectSampleCounts';
 
 const ITEMS_TO_SHOW = 5;
-const palette = CHART_PALETTE[ITEMS_TO_SHOW - 1];
+const palette = CHART_PALETTE[ITEMS_TO_SHOW - 1]!;
 
 interface Props extends React.HTMLAttributes<HTMLDivElement> {
   sampleCounts: ProjectSampleCount[];
diff --git a/static/app/views/settings/dynamicSampling/utils/parsePercent.spec.tsx b/static/app/views/settings/dynamicSampling/utils/parsePercent.spec.tsx
index 9a2bd2a6bdc366..822e077147ffdf 100644
--- a/static/app/views/settings/dynamicSampling/utils/parsePercent.spec.tsx
+++ b/static/app/views/settings/dynamicSampling/utils/parsePercent.spec.tsx
@@ -2,27 +2,27 @@ import {parsePercent} from 'sentry/views/settings/dynamicSampling/utils/parsePer
 
 describe('parsePercent', () => {
   it('parses a valid percent', () => {
-    expect(parsePercent('50')).toEqual(0.5);
-    expect(parsePercent('100')).toEqual(1);
-    expect(parsePercent('0')).toEqual(0);
+    expect(parsePercent('50')).toBe(0.5);
+    expect(parsePercent('100')).toBe(1);
+    expect(parsePercent('0')).toBe(0);
 
-    expect(parsePercent('50.5')).toEqual(0.505);
-    expect(parsePercent('1.5%')).toEqual(0.015);
+    expect(parsePercent('50.5')).toBe(0.505);
+    expect(parsePercent('1.5%')).toBe(0.015);
   });
 
   it('falls back to default value', () => {
-    expect(parsePercent(undefined, 0.1)).toEqual(0.1);
-    expect(parsePercent(null, 0.2)).toEqual(0.2);
-    expect(parsePercent('', 0.3)).toEqual(0.3);
-    expect(parsePercent('invalid', 0.4)).toEqual(0.4);
+    expect(parsePercent(undefined, 0.1)).toBe(0.1);
+    expect(parsePercent(null, 0.2)).toBe(0.2);
+    expect(parsePercent('', 0.3)).toBe(0.3);
+    expect(parsePercent('invalid', 0.4)).toBe(0.4);
   });
 
   it('clamps to 0-1 range', () => {
-    expect(parsePercent('-1')).toEqual(0);
-    expect(parsePercent('101')).toEqual(1);
+    expect(parsePercent('-1')).toBe(0);
+    expect(parsePercent('101')).toBe(1);
   });
 
   it('return 0 as default fallback', () => {
-    expect(parsePercent(null)).toEqual(0);
+    expect(parsePercent(null)).toBe(0);
   });
 });
diff --git a/static/app/views/settings/dynamicSampling/utils/testScaleSapleRates.spec.tsx b/static/app/views/settings/dynamicSampling/utils/testScaleSapleRates.spec.tsx
index 7c35138313f331..cdd533a35d933f 100644
--- a/static/app/views/settings/dynamicSampling/utils/testScaleSapleRates.spec.tsx
+++ b/static/app/views/settings/dynamicSampling/utils/testScaleSapleRates.spec.tsx
@@ -15,8 +15,8 @@ describe('scaleSampleRates', () => {
     const sampleRate = 0.4;
 
     const {scaledItems} = scaleSampleRates({items, sampleRate});
-    expect(scaledItems[0].sampleRate).toEqual(0.4);
-    expect(scaledItems[1].sampleRate).toEqual(0.4);
+    expect(scaledItems[0]!.sampleRate).toBe(0.4);
+    expect(scaledItems[1]!.sampleRate).toBe(0.4);
   });
 
   it('scales the sample rate from 100', () => {
@@ -28,8 +28,8 @@ describe('scaleSampleRates', () => {
     const sampleRate = 0.4;
 
     const {scaledItems} = scaleSampleRates({items, sampleRate});
-    expect(scaledItems[0].sampleRate).toEqual(0.4);
-    expect(scaledItems[1].sampleRate).toEqual(0.4);
+    expect(scaledItems[0]!.sampleRate).toBe(0.4);
+    expect(scaledItems[1]!.sampleRate).toBe(0.4);
   });
 
   it('scales the sample rate up', () => {
diff --git a/static/app/views/settings/dynamicSampling/utils/useProjectSampleCounts.tsx b/static/app/views/settings/dynamicSampling/utils/useProjectSampleCounts.tsx
index 8b783946ba7143..45c1408b656075 100644
--- a/static/app/views/settings/dynamicSampling/utils/useProjectSampleCounts.tsx
+++ b/static/app/views/settings/dynamicSampling/utils/useProjectSampleCounts.tsx
@@ -108,7 +108,7 @@ export function useProjectSampleCounts({period}: {period: ProjectionSamplePeriod
     () =>
       Array.from(projectEntries.entries()).map<ProjectSampleCount>(([key, value]) => {
         return {
-          project: projectBySlug[key],
+          project: projectBySlug[key]!,
           count: value.count,
           ownCount: value.ownCount,
           subProjects: value.subProjects.toSorted((a, b) => b.count - a.count),
diff --git a/static/app/views/settings/dynamicSampling/utils/useSamplingProjectRates.tsx b/static/app/views/settings/dynamicSampling/utils/useSamplingProjectRates.tsx
index d5135ec227e1d0..1e5d340bace291 100644
--- a/static/app/views/settings/dynamicSampling/utils/useSamplingProjectRates.tsx
+++ b/static/app/views/settings/dynamicSampling/utils/useSamplingProjectRates.tsx
@@ -50,7 +50,7 @@ const fetchAllSamplingRates = async (
 
     if (linkHeader) {
       const links = parseLinkHeader(linkHeader);
-      cursor = (links.next.results && links.next.cursor) || null;
+      cursor = (links.next!.results && links.next!.cursor) || null;
     }
   }
 
diff --git a/static/app/views/settings/earlyFeatures/settingsForm.tsx b/static/app/views/settings/earlyFeatures/settingsForm.tsx
index c2dcc328894871..fc847841a953d5 100644
--- a/static/app/views/settings/earlyFeatures/settingsForm.tsx
+++ b/static/app/views/settings/earlyFeatures/settingsForm.tsx
@@ -39,7 +39,7 @@ export default function EarlyFeaturesSettingsForm({access, location}: Props) {
   const initialData: Record<string, boolean> = {};
   for (const flag in featureFlags) {
     if (featureFlags.hasOwnProperty(flag)) {
-      const obj = featureFlags[flag];
+      const obj = featureFlags[flag]!;
       initialData[flag] = obj.value;
     }
   }
diff --git a/static/app/views/settings/featureFlags/newProviderForm.tsx b/static/app/views/settings/featureFlags/newProviderForm.tsx
index 07f2c7df76eaa2..1b75a5af3610ad 100644
--- a/static/app/views/settings/featureFlags/newProviderForm.tsx
+++ b/static/app/views/settings/featureFlags/newProviderForm.tsx
@@ -16,12 +16,12 @@ 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 {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import {makeFetchSecretQueryKey} from 'sentry/views/settings/featureFlags';
 
@@ -46,12 +46,13 @@ export default function NewProviderForm({
   const organization = useOrganization();
   const api = useApi();
   const queryClient = useQueryClient();
+  const navigate = useNavigate();
 
   const [selectedProvider, setSelectedProvider] = useState('<provider_name>');
 
   const handleGoBack = useCallback(() => {
-    browserHistory.push(normalizeUrl(`/settings/${organization.slug}/feature-flags/`));
-  }, [organization.slug]);
+    navigate(normalizeUrl(`/settings/${organization.slug}/feature-flags/`));
+  }, [organization.slug, navigate]);
 
   const {mutate: submitSecret, isPending} = useMutation<
     CreateSecretResponse,
@@ -133,7 +134,7 @@ export default function NewProviderForm({
       >
         <TextCopyInput
           aria-label={t('Webhook URL')}
-        >{`https://sentry.io/api/0/organizations/sentry/flags/hooks/provider/${selectedProvider.toLowerCase()}/`}</TextCopyInput>
+        >{`https://sentry.io/api/0/organizations/${organization.slug}/flags/hooks/provider/${selectedProvider.toLowerCase()}/`}</TextCopyInput>
       </StyledFieldGroup>
       <TextField
         name="secret"
diff --git a/static/app/views/settings/featureFlags/newSecretHandler.tsx b/static/app/views/settings/featureFlags/newSecretHandler.tsx
index a75de2dc7ccc82..b0dcc96710cc3b 100644
--- a/static/app/views/settings/featureFlags/newSecretHandler.tsx
+++ b/static/app/views/settings/featureFlags/newSecretHandler.tsx
@@ -10,6 +10,7 @@ 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';
+import useOrganization from 'sentry/utils/useOrganization';
 
 function NewSecretHandler({
   secret,
@@ -20,6 +21,8 @@ function NewSecretHandler({
   provider: string;
   secret: string;
 }) {
+  const organization = useOrganization();
+
   return (
     <div>
       <StyledAlert type="warning" showIcon system>
@@ -43,7 +46,7 @@ function NewSecretHandler({
           >
             <TextCopyInput
               aria-label={t('Webhook URL')}
-            >{`https://sentry.io/api/0/organizations/sentry/flags/hooks/provider/${provider.toLowerCase()}/`}</TextCopyInput>
+            >{`https://sentry.io/api/0/organizations/${organization.slug}/flags/hooks/provider/${provider.toLowerCase()}/`}</TextCopyInput>
           </StyledFieldGroup>
           <StyledFieldGroup
             label={t('Secret')}
diff --git a/static/app/views/settings/featureFlags/organizationFeatureFlagsNewSecret.tsx b/static/app/views/settings/featureFlags/organizationFeatureFlagsNewSecret.tsx
index 01bc117a296e2b..0f59682ae8d17e 100644
--- a/static/app/views/settings/featureFlags/organizationFeatureFlagsNewSecret.tsx
+++ b/static/app/views/settings/featureFlags/organizationFeatureFlagsNewSecret.tsx
@@ -6,8 +6,8 @@ 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 {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import SettingsPageHeader from 'sentry/views/settings/components/settingsPageHeader';
 import TextBlock from 'sentry/views/settings/components/text/textBlock';
@@ -18,10 +18,11 @@ export function OrganizationFeatureFlagsNewSecet() {
   const [newSecret, setNewSecret] = useState<string | null>(null);
   const [provider, setProvider] = useState<string>('');
   const organization = useOrganization();
+  const navigate = useNavigate();
 
   const handleGoBack = useCallback(() => {
-    browserHistory.push(normalizeUrl(`/settings/${organization.slug}/feature-flags/`));
-  }, [organization.slug]);
+    navigate(normalizeUrl(`/settings/${organization.slug}/feature-flags/`));
+  }, [organization.slug, navigate]);
 
   return (
     <Fragment>
diff --git a/static/app/views/settings/featureFlags/organizationFeatureFlagsProviderRow.tsx b/static/app/views/settings/featureFlags/organizationFeatureFlagsProviderRow.tsx
index 72e18d6541f525..2de05154f37154 100644
--- a/static/app/views/settings/featureFlags/organizationFeatureFlagsProviderRow.tsx
+++ b/static/app/views/settings/featureFlags/organizationFeatureFlagsProviderRow.tsx
@@ -10,8 +10,8 @@ import {Tooltip} from 'sentry/components/tooltip';
 import {IconSubtract} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
+import useUserFromId from 'sentry/utils/useUserFromId';
 import type {Secret} from 'sentry/views/settings/featureFlags';
-import useUserFromId from 'sentry/views/settings/featureFlags/useUserFromId';
 
 export function OrganizationFeatureFlagsProviderRow({
   isRemoving,
diff --git a/static/app/views/settings/organization/organizationSettingsNavigation.tsx b/static/app/views/settings/organization/organizationSettingsNavigation.tsx
index 41fb963aaf0cc8..d4f13dc5a42e4e 100644
--- a/static/app/views/settings/organization/organizationSettingsNavigation.tsx
+++ b/static/app/views/settings/organization/organizationSettingsNavigation.tsx
@@ -22,7 +22,6 @@ class OrganizationSettingsNavigation extends Component<Props, State> {
   state: State = this.getHooks();
 
   componentDidMount() {
-    // eslint-disable-next-line react/no-did-mount-set-state
     this.setState(this.getHooks());
   }
 
diff --git a/static/app/views/settings/organizationApiKeys/organizationApiKeyDetails.tsx b/static/app/views/settings/organizationApiKeys/organizationApiKeyDetails.tsx
index b3225331da4fc7..27df7460efbb13 100644
--- a/static/app/views/settings/organizationApiKeys/organizationApiKeyDetails.tsx
+++ b/static/app/views/settings/organizationApiKeys/organizationApiKeyDetails.tsx
@@ -11,7 +11,6 @@ import {API_ACCESS_SCOPES} from 'sentry/constants';
 import {t} from 'sentry/locale';
 import type {RouteComponentProps} from 'sentry/types/legacyReactRouter';
 import type {Organization} from 'sentry/types/organization';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import recreateRoute from 'sentry/utils/recreateRoute';
 import routeTitleGen from 'sentry/utils/routeTitle';
 import withOrganization from 'sentry/utils/withOrganization';
@@ -51,7 +50,7 @@ class OrganizationApiKeyDetails extends DeprecatedAsyncView<Props, State> {
     addSuccessMessage('Saved changes');
 
     // Go back to API list
-    browserHistory.push(
+    this.props.router.push(
       recreateRoute('', {
         stepBack: -1,
         routes: this.props.routes,
@@ -65,7 +64,7 @@ class OrganizationApiKeyDetails extends DeprecatedAsyncView<Props, State> {
   };
 
   renderBody() {
-    const {organization} = this.props;
+    const {organization, router} = this.props;
     return (
       <div>
         <SettingsPageHeader title={t('Edit API Key')} />
@@ -79,7 +78,7 @@ class OrganizationApiKeyDetails extends DeprecatedAsyncView<Props, State> {
             onSubmitSuccess={this.handleSubmitSuccess}
             onSubmitError={this.handleSubmitError}
             onCancel={() =>
-              browserHistory.push(
+              router.push(
                 recreateRoute('', {
                   stepBack: -1,
                   routes: this.props.routes,
diff --git a/static/app/views/settings/organizationAuditLog/auditLogView.spec.tsx b/static/app/views/settings/organizationAuditLog/auditLogView.spec.tsx
index 991815afbb7eed..fb6f41185fdc11 100644
--- a/static/app/views/settings/organizationAuditLog/auditLogView.spec.tsx
+++ b/static/app/views/settings/organizationAuditLog/auditLogView.spec.tsx
@@ -126,7 +126,7 @@ describe('OrganizationAuditLog', function () {
       router,
     });
 
-    await waitForElementToBeRemoved(() => screen.getByTestId('loading-indicator'));
+    await waitForElementToBeRemoved(() => screen.queryByTestId('loading-indicator'));
 
     // rule.edit -> issue-alert.edit
     expect(screen.getByText('issue-alert.edit')).toBeInTheDocument();
diff --git a/static/app/views/settings/organizationAuth/organizationAuthList.spec.tsx b/static/app/views/settings/organizationAuth/organizationAuthList.spec.tsx
index fa100744e98419..89356907e2e515 100644
--- a/static/app/views/settings/organizationAuth/organizationAuthList.spec.tsx
+++ b/static/app/views/settings/organizationAuth/organizationAuthList.spec.tsx
@@ -12,7 +12,7 @@ describe('OrganizationAuthList', function () {
     );
 
     expect(
-      screen.queryByText('No authentication providers are available.')
+      screen.getByText('No authentication providers are available.')
     ).toBeInTheDocument();
   });
 
@@ -24,9 +24,9 @@ describe('OrganizationAuthList', function () {
       />
     );
 
-    expect(screen.getAllByLabelText('Configure').length).toBe(2);
-    expect(screen.queryByText('Dummy')).toBeInTheDocument();
-    expect(screen.queryByText('Dummy SAML')).toBeInTheDocument();
+    expect(screen.getAllByLabelText('Configure')).toHaveLength(2);
+    expect(screen.getByText('Dummy')).toBeInTheDocument();
+    expect(screen.getByText('Dummy SAML')).toBeInTheDocument();
   });
 
   it('renders for members', function () {
diff --git a/static/app/views/settings/organizationAuth/organizationAuthList.tsx b/static/app/views/settings/organizationAuth/organizationAuthList.tsx
index ac1af9d93841d5..8c3b0f4dc95077 100644
--- a/static/app/views/settings/organizationAuth/organizationAuthList.tsx
+++ b/static/app/views/settings/organizationAuth/organizationAuthList.tsx
@@ -48,7 +48,7 @@ function OrganizationAuthList({organization, providerList, activeProvider}: Prop
     if (PROVIDER_POPULARITY[a.key] === PROVIDER_POPULARITY[b.key]) {
       return 0;
     }
-    return PROVIDER_POPULARITY[a.key] > PROVIDER_POPULARITY[b.key] ? 1 : -1;
+    return PROVIDER_POPULARITY[a.key]! > PROVIDER_POPULARITY[b.key]! ? 1 : -1;
   });
 
   const list = sortedByPopularity.sort((a, b) => {
diff --git a/static/app/views/settings/organizationAuth/providerItem.spec.tsx b/static/app/views/settings/organizationAuth/providerItem.spec.tsx
index a3cb9e64af75d7..bb55a8743c4527 100644
--- a/static/app/views/settings/organizationAuth/providerItem.spec.tsx
+++ b/static/app/views/settings/organizationAuth/providerItem.spec.tsx
@@ -7,7 +7,7 @@ import {descopeFeatureName} from 'sentry/utils';
 import ProviderItem from 'sentry/views/settings/organizationAuth/providerItem';
 
 describe('ProviderItem', function () {
-  const provider = AuthProvidersFixture()[0];
+  const provider = AuthProvidersFixture()[0]!;
   const org = OrganizationFixture({
     features: [descopeFeatureName(provider.requiredFeature)],
   });
diff --git a/static/app/views/settings/organizationAuthTokens/authTokenDetails.tsx b/static/app/views/settings/organizationAuthTokens/authTokenDetails.tsx
index 8146c320d2615a..8ced1d8032c78a 100644
--- a/static/app/views/settings/organizationAuthTokens/authTokenDetails.tsx
+++ b/static/app/views/settings/organizationAuthTokens/authTokenDetails.tsx
@@ -18,7 +18,6 @@ import SentryDocumentTitle from 'sentry/components/sentryDocumentTitle';
 import {t, tct} from 'sentry/locale';
 import type {Organization} from 'sentry/types/organization';
 import type {OrgAuthToken} from 'sentry/types/user';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import {handleXhrErrorResponse} from 'sentry/utils/handleXhrErrorResponse';
 import {
   getApiQueryData,
@@ -28,8 +27,8 @@ import {
   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 {useNavigate} from 'sentry/utils/useNavigate';
 import withOrganization from 'sentry/utils/withOrganization';
 import SettingsPageHeader from 'sentry/views/settings/components/settingsPageHeader';
 import TextBlock from 'sentry/views/settings/components/text/textBlock';
@@ -70,12 +69,14 @@ function AuthTokenDetailsForm({
     tokenPreview: tokenPreview(token.tokenLastCharacters || '****'),
   };
 
+  const navigate = useNavigate();
   const api = useApi();
   const queryClient = useQueryClient();
 
-  const handleGoBack = useCallback(() => {
-    browserHistory.push(normalizeUrl(`/settings/${organization.slug}/auth-tokens/`));
-  }, [organization.slug]);
+  const handleGoBack = useCallback(
+    () => navigate(`/settings/${organization.slug}/auth-tokens/`),
+    [navigate, organization.slug]
+  );
 
   const {mutate: submitToken} = useMutation<{}, RequestError, UpdateTokenQueryVariables>({
     mutationFn: ({name}) =>
diff --git a/static/app/views/settings/organizationAuthTokens/authTokenRow.tsx b/static/app/views/settings/organizationAuthTokens/authTokenRow.tsx
index c6f5e4030731e6..fde05a353e29a6 100644
--- a/static/app/views/settings/organizationAuthTokens/authTokenRow.tsx
+++ b/static/app/views/settings/organizationAuthTokens/authTokenRow.tsx
@@ -144,9 +144,7 @@ export function OrganizationAuthTokensAuthTokenRow({
 
       <Actions>
         <Tooltip
-          title={t(
-            'You must be an organization owner, manager or admin to revoke a token.'
-          )}
+          title={t('You must be an organization owner or manager to revoke a token.')}
           disabled={!!revokeToken}
         >
           <Confirm
diff --git a/static/app/views/settings/organizationAuthTokens/newAuthToken.tsx b/static/app/views/settings/organizationAuthTokens/newAuthToken.tsx
index 6c3b449820b960..bfbfdd97348526 100644
--- a/static/app/views/settings/organizationAuthTokens/newAuthToken.tsx
+++ b/static/app/views/settings/organizationAuthTokens/newAuthToken.tsx
@@ -17,13 +17,12 @@ import SentryDocumentTitle from 'sentry/components/sentryDocumentTitle';
 import {t, tct} from 'sentry/locale';
 import type {Organization} from 'sentry/types/organization';
 import type {OrgAuthToken} from 'sentry/types/user';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import getDynamicText from 'sentry/utils/getDynamicText';
 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 {useNavigate} from 'sentry/utils/useNavigate';
 import withOrganization from 'sentry/utils/withOrganization';
 import NewTokenHandler from 'sentry/views/settings/components/newTokenHandler';
 import SettingsPageHeader from 'sentry/views/settings/components/settingsPageHeader';
@@ -49,12 +48,14 @@ function AuthTokenCreateForm({
     name: '',
   };
 
+  const navigate = useNavigate();
   const api = useApi();
   const queryClient = useQueryClient();
 
-  const handleGoBack = useCallback(() => {
-    browserHistory.push(normalizeUrl(`/settings/${organization.slug}/auth-tokens/`));
-  }, [organization.slug]);
+  const handleGoBack = useCallback(
+    () => navigate(`/settings/${organization.slug}/auth-tokens/`),
+    [navigate, organization.slug]
+  );
 
   const {mutate: submitToken} = useMutation<
     CreateOrgAuthTokensResponse,
@@ -134,11 +135,13 @@ export function OrganizationAuthTokensNewAuthToken({
 }: {
   organization: Organization;
 }) {
+  const navigate = useNavigate();
   const [newToken, setNewToken] = useState<OrgAuthTokenWithToken | null>(null);
 
-  const handleGoBack = useCallback(() => {
-    browserHistory.push(normalizeUrl(`/settings/${organization.slug}/auth-tokens/`));
-  }, [organization.slug]);
+  const handleGoBack = useCallback(
+    () => navigate(`/settings/${organization.slug}/auth-tokens/`),
+    [navigate, organization.slug]
+  );
 
   return (
     <div>
diff --git a/static/app/views/settings/organizationDeveloperSettings/permissionSelection.spec.tsx b/static/app/views/settings/organizationDeveloperSettings/permissionSelection.spec.tsx
index c3e0d0a91de07e..296e9df8a00aa4 100644
--- a/static/app/views/settings/organizationDeveloperSettings/permissionSelection.spec.tsx
+++ b/static/app/views/settings/organizationDeveloperSettings/permissionSelection.spec.tsx
@@ -7,10 +7,10 @@ import ModalStore from 'sentry/stores/modalStore';
 import PermissionSelection from 'sentry/views/settings/organizationDeveloperSettings/permissionSelection';
 
 describe('PermissionSelection', () => {
-  let onChange;
-  let model;
+  let onChange: jest.Mock;
+  let model: FormModel;
 
-  beforeEach(() => {
+  function renderForm() {
     model = new FormModel();
     onChange = jest.fn();
     render(
@@ -30,9 +30,10 @@ describe('PermissionSelection', () => {
       </Form>
     );
     ModalStore.reset();
-  });
+  }
 
   it('renders a row for each resource', () => {
+    renderForm();
     expect(screen.getByRole('textbox', {name: 'Project'})).toBeInTheDocument();
     expect(screen.getByRole('textbox', {name: 'Team'})).toBeInTheDocument();
     expect(screen.getByRole('textbox', {name: 'Release'})).toBeInTheDocument();
@@ -42,7 +43,8 @@ describe('PermissionSelection', () => {
   });
 
   it('lists human readable permissions', async () => {
-    const expectOptions = async (name, options) => {
+    renderForm();
+    const expectOptions = async (name: string, options: string[]) => {
       for (const option of options) {
         await selectEvent.select(screen.getByRole('textbox', {name}), option);
       }
@@ -57,7 +59,8 @@ describe('PermissionSelection', () => {
   });
 
   it('stores the permissions the User has selected', async () => {
-    const selectByValue = (name, value) =>
+    renderForm();
+    const selectByValue = (name: string, value: string) =>
       selectEvent.select(screen.getByRole('textbox', {name}), value);
 
     await selectByValue('Project', 'Read & Write');
@@ -67,11 +70,11 @@ describe('PermissionSelection', () => {
     await selectByValue('Organization', 'Read');
     await selectByValue('Member', 'No Access');
 
-    expect(model.getValue('Project--permission')).toEqual('write');
-    expect(model.getValue('Team--permission')).toEqual('read');
-    expect(model.getValue('Release--permission')).toEqual('admin');
-    expect(model.getValue('Event--permission')).toEqual('admin');
-    expect(model.getValue('Organization--permission')).toEqual('read');
-    expect(model.getValue('Member--permission')).toEqual('no-access');
+    expect(model.getValue('Project--permission')).toBe('write');
+    expect(model.getValue('Team--permission')).toBe('read');
+    expect(model.getValue('Release--permission')).toBe('admin');
+    expect(model.getValue('Event--permission')).toBe('admin');
+    expect(model.getValue('Organization--permission')).toBe('read');
+    expect(model.getValue('Member--permission')).toBe('no-access');
   });
 });
diff --git a/static/app/views/settings/organizationDeveloperSettings/permissionsObserver.spec.tsx b/static/app/views/settings/organizationDeveloperSettings/permissionsObserver.spec.tsx
index 80a7a096ee9457..0ec29a67927076 100644
--- a/static/app/views/settings/organizationDeveloperSettings/permissionsObserver.spec.tsx
+++ b/static/app/views/settings/organizationDeveloperSettings/permissionsObserver.spec.tsx
@@ -5,9 +5,9 @@ import FormModel from 'sentry/components/forms/model';
 import PermissionsObserver from 'sentry/views/settings/organizationDeveloperSettings/permissionsObserver';
 
 describe('PermissionsObserver', () => {
-  let model;
+  let model: FormModel;
 
-  beforeEach(() => {
+  function renderForm() {
     model = new FormModel();
 
     render(
@@ -19,21 +19,24 @@ describe('PermissionsObserver', () => {
         />
       </Form>
     );
-  });
+  }
 
   it('defaults to no-access for all resources not passed', () => {
+    renderForm();
     expect(model.getValue('Team--permission')).toBe('no-access');
     expect(model.getValue('Event--permission')).toBe('no-access');
     expect(model.getValue('Member--permission')).toBe('no-access');
   });
 
   it('converts a raw list of scopes into permissions', () => {
+    renderForm();
     expect(model.getValue('Project--permission')).toBe('write');
     expect(model.getValue('Release--permission')).toBe('admin');
     expect(model.getValue('Organization--permission')).toBe('admin');
   });
 
   it('selects the highest ranking scope to convert to permission', () => {
+    renderForm();
     expect(model.getValue('Project--permission')).toBe('write');
   });
 });
diff --git a/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDashboard/index.spec.tsx b/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDashboard/index.spec.tsx
index c47eadf1faa8b7..4a73319ab8edcc 100644
--- a/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDashboard/index.spec.tsx
+++ b/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDashboard/index.spec.tsx
@@ -14,8 +14,8 @@ describe('Sentry Application Dashboard', function () {
   const NUM_INSTALLS = 5;
   const NUM_UNINSTALLS = 2;
 
-  let sentryApp;
-  let webhookRequest;
+  let sentryApp: ReturnType<typeof SentryAppFixture>;
+  let webhookRequest: ReturnType<typeof SentryAppWebhookRequestFixture>;
 
   afterEach(() => {
     MockApiClient.clearMockResponses();
diff --git a/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDashboard/index.tsx b/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDashboard/index.tsx
index 7e7803a7af4a51..b3f86b7bcd0820 100644
--- a/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDashboard/index.tsx
+++ b/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDashboard/index.tsx
@@ -226,7 +226,7 @@ type InteractionsChartProps = {
 function InteractionsChart({data}: InteractionsChartProps) {
   const elementInteractionsSeries: LineChartSeries[] = Object.keys(data).map(
     (key: string) => {
-      const seriesData = data[key].map(point => ({
+      const seriesData = data[key]!.map(point => ({
         value: point[1],
         name: point[0] * 1000,
       }));
diff --git a/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDetails.spec.tsx b/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDetails.spec.tsx
index 5e278600ee0f71..771a8c1f4cdba4 100644
--- a/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDetails.spec.tsx
+++ b/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDetails.spec.tsx
@@ -16,10 +16,10 @@ import selectEvent from 'sentry-test/selectEvent';
 import SentryApplicationDetails from 'sentry/views/settings/organizationDeveloperSettings/sentryApplicationDetails';
 
 describe('Sentry Application Details', function () {
-  let sentryApp;
-  let token;
-  let createAppRequest;
-  let editAppRequest;
+  let sentryApp: ReturnType<typeof SentryAppFixture>;
+  let token: ReturnType<typeof SentryAppTokenFixture>;
+  let createAppRequest: jest.Mock;
+  let editAppRequest: jest.Mock;
 
   const maskedValue = '************oken';
 
@@ -576,7 +576,7 @@ describe('Sentry Application Details', function () {
 
     it('handles client secret rotation', async function () {
       sentryApp = SentryAppFixture();
-      sentryApp.clientSecret = null;
+      sentryApp.clientSecret = undefined;
 
       MockApiClient.addMockResponse({
         url: `/sentry-apps/${sentryApp.slug}/`,
diff --git a/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDetails.tsx b/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDetails.tsx
index 657360ea4bb9e2..e3da493fbd5a9b 100644
--- a/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDetails.tsx
+++ b/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDetails.tsx
@@ -41,7 +41,6 @@ import type {SentryApp} from 'sentry/types/integrations';
 import type {RouteComponentProps} from 'sentry/types/legacyReactRouter';
 import type {Organization} from 'sentry/types/organization';
 import type {InternalAppApiToken, NewInternalAppApiToken} from 'sentry/types/user';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import getDynamicText from 'sentry/utils/getDynamicText';
 import normalizeUrl from 'sentry/utils/url/normalizeUrl';
 import withOrganization from 'sentry/utils/withOrganization';
@@ -200,7 +199,7 @@ class SentryApplicationDetails extends DeprecatedAsyncView<Props, State> {
 
   handleSubmitSuccess = (data: SentryApp) => {
     const {app} = this.state;
-    const {organization} = this.props;
+    const {organization, router} = this.props;
     const type = this.isInternal ? 'internal' : 'public';
     const baseUrl = `/settings/${organization.slug}/developer-settings/`;
     const url = app ? `${baseUrl}?type=${type}` : `${baseUrl}${data.slug}/`;
@@ -209,7 +208,7 @@ class SentryApplicationDetails extends DeprecatedAsyncView<Props, State> {
     } else {
       addSuccessMessage(t('%s successfully created.', data.name));
     }
-    browserHistory.push(normalizeUrl(url));
+    router.push(normalizeUrl(url));
   };
 
   handleSubmitError = err => {
diff --git a/static/app/views/settings/organizationGeneralSettings/index.spec.tsx b/static/app/views/settings/organizationGeneralSettings/index.spec.tsx
index 6d85feb399bb54..9a7d305604577c 100644
--- a/static/app/views/settings/organizationGeneralSettings/index.spec.tsx
+++ b/static/app/views/settings/organizationGeneralSettings/index.spec.tsx
@@ -161,10 +161,10 @@ describe('OrganizationGeneralSettings', function () {
           },
         })
       );
-      expect(window.location.replace).toHaveBeenCalledWith(
-        'https://acme.sentry.io/settings/organization/'
-      );
     });
+    expect(window.location.replace).toHaveBeenCalledWith(
+      'https://acme.sentry.io/settings/organization/'
+    );
   });
 
   it('disables the entire form if user does not have write access', function () {
diff --git a/static/app/views/settings/organizationGeneralSettings/index.tsx b/static/app/views/settings/organizationGeneralSettings/index.tsx
index a15b836069cc73..6391cb13e3c2d7 100644
--- a/static/app/views/settings/organizationGeneralSettings/index.tsx
+++ b/static/app/views/settings/organizationGeneralSettings/index.tsx
@@ -95,6 +95,7 @@ export default function OrganizationGeneralSettings({}: RouteComponentProps<{},
 
     addLoadingMessage();
     removeAndRedirectToRemainingOrganization(api, {
+      navigate,
       orgId: organization.slug,
       successMessage: `${organization.name} is queued for deletion.`,
       errorMessage: `Error removing the ${organization.name} organization`,
diff --git a/static/app/views/settings/organizationGeneralSettings/organizationSettingsForm.spec.tsx b/static/app/views/settings/organizationGeneralSettings/organizationSettingsForm.spec.tsx
index 20fc0deff0672a..bc28c079dd4174 100644
--- a/static/app/views/settings/organizationGeneralSettings/organizationSettingsForm.spec.tsx
+++ b/static/app/views/settings/organizationGeneralSettings/organizationSettingsForm.spec.tsx
@@ -76,7 +76,7 @@ describe('OrganizationSettingsForm', function () {
       'name'
     );
 
-    const model = saveOnBlur.mock.calls[0][1];
+    const model = saveOnBlur.mock.calls[0]![1];
 
     // Test "undo" call undo directly
     expect(model.getValue('name')).toBe('New Name');
diff --git a/static/app/views/settings/organizationGeneralSettings/organizationSettingsForm.tsx b/static/app/views/settings/organizationGeneralSettings/organizationSettingsForm.tsx
index 71eb1d18465f19..046b7ca13f83ca 100644
--- a/static/app/views/settings/organizationGeneralSettings/organizationSettingsForm.tsx
+++ b/static/app/views/settings/organizationGeneralSettings/organizationSettingsForm.tsx
@@ -72,10 +72,10 @@ function OrganizationSettingsForm({initialData, onSave}: Props) {
       help: `The unique identifier for this organization. It cannot be modified.`,
     };
 
-    formsConfig[0].fields = [
-      ...formsConfig[0].fields.slice(0, 2),
+    formsConfig[0]!.fields = [
+      ...formsConfig[0]!.fields.slice(0, 2),
       organizationIdField,
-      ...formsConfig[0].fields.slice(2),
+      ...formsConfig[0]!.fields.slice(2),
       makeHideAiFeaturesField(organization),
       {
         name: 'codecovAccess',
diff --git a/static/app/views/settings/organizationIntegrations/abstractIntegrationDetailedView.tsx b/static/app/views/settings/organizationIntegrations/abstractIntegrationDetailedView.tsx
index b70c91ba43c909..a5754874d3b2c9 100644
--- a/static/app/views/settings/organizationIntegrations/abstractIntegrationDetailedView.tsx
+++ b/static/app/views/settings/organizationIntegrations/abstractIntegrationDetailedView.tsx
@@ -62,7 +62,7 @@ abstract class AbstractIntegrationDetailedView<
     super.componentDidMount();
     const {location} = this.props;
     const value = location.query.tab === 'configurations' ? 'configurations' : 'overview';
-    // eslint-disable-next-line react/no-did-mount-set-state
+
     this.setState({tab: value});
   }
 
diff --git a/static/app/views/settings/organizationIntegrations/addIntegration.tsx b/static/app/views/settings/organizationIntegrations/addIntegration.tsx
index bcb977327b588f..d9bb010d427679 100644
--- a/static/app/views/settings/organizationIntegrations/addIntegration.tsx
+++ b/static/app/views/settings/organizationIntegrations/addIntegration.tsx
@@ -7,6 +7,7 @@ import ConfigStore from 'sentry/stores/configStore';
 import type {IntegrationProvider, IntegrationWithConfig} from 'sentry/types/integrations';
 import type {Organization} from 'sentry/types/organization';
 import {trackIntegrationAnalytics} from 'sentry/utils/integrationUtil';
+import type {MessagingIntegrationAnalyticsView} from 'sentry/views/alerts/rules/issue/setupMessagingIntegrationButton';
 
 type Props = {
   children: (
@@ -19,9 +20,9 @@ type Props = {
   analyticsParams?: {
     already_installed: boolean;
     view:
+      | MessagingIntegrationAnalyticsView
       | 'integrations_directory_integration_detail'
       | 'integrations_directory'
-      | 'messaging_integration_onboarding'
       | 'onboarding'
       | 'project_creation';
   };
diff --git a/static/app/views/settings/organizationIntegrations/configureIntegration.spec.tsx b/static/app/views/settings/organizationIntegrations/configureIntegration.spec.tsx
index 68acee72ceb80f..d58a3b488ea01e 100644
--- a/static/app/views/settings/organizationIntegrations/configureIntegration.spec.tsx
+++ b/static/app/views/settings/organizationIntegrations/configureIntegration.spec.tsx
@@ -68,7 +68,7 @@ describe('OpsgenieMigrationButton', function () {
 
     await userEvent.click(screen.getByRole('button', {name: 'Migrate Plugin'}));
 
-    expect(screen.queryByRole('button', {name: 'Confirm'})).toBeInTheDocument();
+    expect(screen.getByRole('button', {name: 'Confirm'})).toBeInTheDocument();
 
     await userEvent.click(screen.getByRole('button', {name: 'Confirm'}));
 
diff --git a/static/app/views/settings/organizationIntegrations/configureIntegration.tsx b/static/app/views/settings/organizationIntegrations/configureIntegration.tsx
index 89f4e1ccb0cb6e..9f286ea58a7e66 100644
--- a/static/app/views/settings/organizationIntegrations/configureIntegration.tsx
+++ b/static/app/views/settings/organizationIntegrations/configureIntegration.tsx
@@ -255,7 +255,7 @@ function ConfigureIntegration({params, router, routes, location}: Props) {
         <LinkButton
           aria-label={t('Open this server in the Discord app')}
           size="sm"
-          href={`discord://discord.com/channels/${integration.externalId}`}
+          href={`https://discord.com/channels/${integration.externalId}`}
         >
           {t('Open in Discord')}
         </LinkButton>
@@ -382,7 +382,7 @@ function ConfigureIntegration({params, router, routes, location}: Props) {
           <Alert type="info">
             {instructions.length === 1 ? (
               <span
-                dangerouslySetInnerHTML={{__html: singleLineRenderer(instructions[0])}}
+                dangerouslySetInnerHTML={{__html: singleLineRenderer(instructions[0]!)}}
               />
             ) : (
               <List symbol={<IconArrow size="xs" direction="right" />}>
diff --git a/static/app/views/settings/organizationIntegrations/integrationButton.spec.tsx b/static/app/views/settings/organizationIntegrations/integrationButton.spec.tsx
index a93a763ff20e49..32c497e956e6ad 100644
--- a/static/app/views/settings/organizationIntegrations/integrationButton.spec.tsx
+++ b/static/app/views/settings/organizationIntegrations/integrationButton.spec.tsx
@@ -26,7 +26,7 @@ describe('AddIntegrationButton', function () {
   const getComponent = () => (
     <IntegrationContext.Provider
       value={{
-        provider: provider,
+        provider,
         type: 'first_party',
         installStatus: 'Not Installed',
         analyticsParams: {
diff --git a/static/app/views/settings/organizationIntegrations/integrationCodeMappings.spec.tsx b/static/app/views/settings/organizationIntegrations/integrationCodeMappings.spec.tsx
index c03db5610e587f..c36f2d5eb15a7b 100644
--- a/static/app/views/settings/organizationIntegrations/integrationCodeMappings.spec.tsx
+++ b/static/app/views/settings/organizationIntegrations/integrationCodeMappings.spec.tsx
@@ -42,16 +42,16 @@ describe('IntegrationCodeMappings', function () {
   ];
 
   const pathConfig1 = RepositoryProjectPathConfigFixture({
-    project: projects[0],
-    repo: repos[0],
+    project: projects[0]!,
+    repo: repos[0]!,
     integration,
     stackRoot: 'stack/root',
     sourceRoot: 'source/root',
   });
 
   const pathConfig2 = RepositoryProjectPathConfigFixture({
-    project: projects[1],
-    repo: repos[1],
+    project: projects[1]!,
+    repo: repos[1]!,
     integration,
     id: '12',
     stackRoot: 'one/path',
@@ -100,8 +100,8 @@ describe('IntegrationCodeMappings', function () {
       url,
       method: 'POST',
       body: RepositoryProjectPathConfigFixture({
-        project: projects[1],
-        repo: repos[1],
+        project: projects[1]!,
+        repo: repos[1]!,
         integration,
         stackRoot,
         sourceRoot,
@@ -114,8 +114,11 @@ describe('IntegrationCodeMappings', function () {
     await userEvent.click(screen.getByRole('button', {name: 'Add Code Mapping'}));
     expect(screen.getByRole('dialog')).toBeInTheDocument();
 
-    await selectEvent.select(screen.getByText('Choose Sentry project'), projects[1].slug);
-    await selectEvent.select(screen.getByText('Choose repo'), repos[1].name);
+    await selectEvent.select(
+      screen.getByText('Choose Sentry project'),
+      projects[1]!.slug
+    );
+    await selectEvent.select(screen.getByText('Choose repo'), repos[1]!.name);
 
     await userEvent.type(
       screen.getByRole('textbox', {name: 'Stack Trace Root'}),
@@ -135,8 +138,8 @@ describe('IntegrationCodeMappings', function () {
       url,
       expect.objectContaining({
         data: expect.objectContaining({
-          projectId: projects[1].id,
-          repositoryId: repos[1].id,
+          projectId: projects[1]!.id,
+          repositoryId: repos[1]!.id,
           stackRoot,
           sourceRoot,
           defaultBranch,
@@ -155,8 +158,8 @@ describe('IntegrationCodeMappings', function () {
       url,
       method: 'PUT',
       body: RepositoryProjectPathConfigFixture({
-        project: projects[0],
-        repo: repos[0],
+        project: projects[0]!,
+        repo: repos[0]!,
         integration,
         stackRoot,
         sourceRoot,
@@ -166,7 +169,7 @@ describe('IntegrationCodeMappings', function () {
     render(<IntegrationCodeMappings organization={org} integration={integration} />);
     const {waitForModalToHide} = renderGlobalModal();
 
-    await userEvent.click(screen.getAllByRole('button', {name: 'edit'})[0]);
+    await userEvent.click(screen.getAllByRole('button', {name: 'edit'})[0]!);
     await userEvent.clear(screen.getByRole('textbox', {name: 'Stack Trace Root'}));
     await userEvent.type(
       screen.getByRole('textbox', {name: 'Stack Trace Root'}),
@@ -196,8 +199,8 @@ describe('IntegrationCodeMappings', function () {
       body: {
         repos: [
           {
-            id: repos[0].id,
-            identifier: repos[1].name,
+            id: repos[0]!.id,
+            identifier: repos[1]!.name,
             defaultBranch: 'main',
           },
         ],
@@ -209,7 +212,7 @@ describe('IntegrationCodeMappings', function () {
     await userEvent.click(screen.getByRole('button', {name: 'Add Code Mapping'}));
     expect(screen.getByRole('textbox', {name: 'Branch'})).toHaveValue('master');
 
-    await selectEvent.select(screen.getByText('Choose repo'), repos[1].name);
+    await selectEvent.select(screen.getByText('Choose repo'), repos[1]!.name);
     await waitFor(() => {
       expect(screen.getByRole('textbox', {name: 'Branch'})).toHaveValue('main');
     });
diff --git a/static/app/views/settings/organizationIntegrations/integrationContext.tsx b/static/app/views/settings/organizationIntegrations/integrationContext.tsx
index 6781d1fea2b686..fd1688e2ea21d3 100644
--- a/static/app/views/settings/organizationIntegrations/integrationContext.tsx
+++ b/static/app/views/settings/organizationIntegrations/integrationContext.tsx
@@ -1,14 +1,15 @@
 import {createContext} from 'react';
 
 import type {IntegrationProvider, IntegrationType} from 'sentry/types/integrations';
+import type {MessagingIntegrationAnalyticsView} from 'sentry/views/alerts/rules/issue/setupMessagingIntegrationButton';
 
 export type IntegrationContextProps = {
   analyticsParams: {
     already_installed: boolean;
     view:
+      | MessagingIntegrationAnalyticsView
       | 'integrations_directory_integration_detail'
       | 'integrations_directory'
-      | 'messaging_integration_onboarding'
       | 'onboarding'
       | 'project_creation';
     referrer?: string;
diff --git a/static/app/views/settings/organizationIntegrations/integrationDetailedView.tsx b/static/app/views/settings/organizationIntegrations/integrationDetailedView.tsx
index 6698669eda2d70..759480d4ef77a9 100644
--- a/static/app/views/settings/organizationIntegrations/integrationDetailedView.tsx
+++ b/static/app/views/settings/organizationIntegrations/integrationDetailedView.tsx
@@ -70,7 +70,7 @@ class IntegrationDetailedView extends AbstractIntegrationDetailedView<
   }
 
   get provider() {
-    return this.state.information.providers[0];
+    return this.state.information.providers[0]!;
   }
 
   get description() {
@@ -82,7 +82,7 @@ class IntegrationDetailedView extends AbstractIntegrationDetailedView<
   }
 
   get alerts() {
-    const provider = this.provider;
+    const provider = this.provider!;
     const metadata = this.metadata;
     // The server response for integration installations includes old icon CSS classes
     // We map those to the currently in use values to their react equivalents
@@ -111,7 +111,7 @@ class IntegrationDetailedView extends AbstractIntegrationDetailedView<
   }
 
   get metadata() {
-    return this.provider.metadata;
+    return this.provider!.metadata;
   }
 
   get isEnabled() {
@@ -136,7 +136,7 @@ class IntegrationDetailedView extends AbstractIntegrationDetailedView<
   }
 
   get integrationName() {
-    return this.provider.name;
+    return this.provider!.name;
   }
 
   get featureData() {
@@ -145,7 +145,7 @@ class IntegrationDetailedView extends AbstractIntegrationDetailedView<
 
   renderTabs() {
     // TODO: Convert to styled component
-    const tabs = integrationFeatures.includes(this.provider.key)
+    const tabs = integrationFeatures.includes(this.provider!.key)
       ? this.tabs
       : this.tabs.filter(tab => tab !== 'features');
 
@@ -240,7 +240,7 @@ class IntegrationDetailedView extends AbstractIntegrationDetailedView<
   }
 
   renderTopButton(disabledFromFeatures: boolean, userHasAccess: boolean) {
-    const provider = this.provider;
+    const provider = this.provider!;
     const location = this.props.location;
     const queryParams = new URLSearchParams(location.search);
     const referrer = queryParams.get('referrer');
@@ -255,7 +255,7 @@ class IntegrationDetailedView extends AbstractIntegrationDetailedView<
     return (
       <IntegrationContext.Provider
         value={{
-          provider: provider,
+          provider,
           type: this.integrationType,
           installStatus: this.installationStatus,
           analyticsParams: {
@@ -298,7 +298,7 @@ class IntegrationDetailedView extends AbstractIntegrationDetailedView<
             <PanelItem key={integration.id}>
               <InstalledIntegration
                 organization={organization}
-                provider={provider}
+                provider={provider!}
                 integration={integration}
                 onRemove={this.onRemove}
                 onDisable={this.onDisable}
diff --git a/static/app/views/settings/organizationIntegrations/integrationExternalMappingForm.spec.tsx b/static/app/views/settings/organizationIntegrations/integrationExternalMappingForm.spec.tsx
index 8664ed09972d9d..1a17b024ceb2e3 100644
--- a/static/app/views/settings/organizationIntegrations/integrationExternalMappingForm.spec.tsx
+++ b/static/app/views/settings/organizationIntegrations/integrationExternalMappingForm.spec.tsx
@@ -11,7 +11,7 @@ describe('IntegrationExternalMappingForm', function () {
     dataEndpoint,
     getBaseFormEndpoint: jest.fn(_mapping => dataEndpoint),
     sentryNamesMapper: mappings => mappings,
-  };
+  } satisfies Partial<React.ComponentProps<typeof IntegrationExternalMappingForm>>;
   const MOCK_USER_MAPPING = {
     id: '1',
     userId: '1',
@@ -30,7 +30,9 @@ describe('IntegrationExternalMappingForm', function () {
     {id: '3', name: 'option3'},
   ];
 
-  let getResponse, postResponse, putResponse;
+  let getResponse: jest.Mock;
+  let postResponse: jest.Mock;
+  let putResponse: jest.Mock;
 
   beforeEach(() => {
     jest.clearAllMocks();
@@ -143,7 +145,7 @@ describe('IntegrationExternalMappingForm', function () {
     expect(baseProps.getBaseFormEndpoint).not.toHaveBeenCalled();
     expect(postResponse).not.toHaveBeenCalled();
     await userEvent.type(screen.getByText('Select Sentry User'), 'option2');
-    await userEvent.click(screen.getAllByText('option2')[1]);
+    await userEvent.click(screen.getAllByText('option2')[1]!);
     await userEvent.click(screen.getByTestId('form-submit'));
 
     await waitFor(() => {
@@ -174,7 +176,7 @@ describe('IntegrationExternalMappingForm', function () {
     expect(putResponse).not.toHaveBeenCalled();
     await userEvent.type(screen.getByRole('textbox'), 'option3');
     expect(await screen.findAllByText('option3')).toHaveLength(2);
-    await userEvent.click(screen.getAllByText('option3')[1]);
+    await userEvent.click(screen.getAllByText('option3')[1]!);
     await waitFor(() => {
       expect(baseProps.getBaseFormEndpoint).toHaveBeenCalledWith({
         ...MOCK_TEAM_MAPPING,
@@ -204,7 +206,7 @@ describe('IntegrationExternalMappingForm', function () {
     expect(getResponse).not.toHaveBeenCalled();
     // Now that the user types, query for results
     await userEvent.type(sentryNameField, 'option2');
-    await userEvent.click(screen.getAllByText('option2')[1]);
+    await userEvent.click(screen.getAllByText('option2')[1]!);
     await waitFor(() => expect(getResponse).toHaveBeenCalled());
   });
 });
diff --git a/static/app/views/settings/organizationIntegrations/integrationExternalMappings.spec.tsx b/static/app/views/settings/organizationIntegrations/integrationExternalMappings.spec.tsx
index 453dc7573951fc..146c1563c519bd 100644
--- a/static/app/views/settings/organizationIntegrations/integrationExternalMappings.spec.tsx
+++ b/static/app/views/settings/organizationIntegrations/integrationExternalMappings.spec.tsx
@@ -178,7 +178,7 @@ describe('IntegrationExternalMappings', function () {
     expect(onCreateMock).toHaveBeenCalled();
 
     await userEvent.click(
-      screen.getAllByRole('button', {name: 'Remove user mapping'})[0]
+      screen.getAllByRole('button', {name: 'Remove user mapping'})[0]!
     );
     await userEvent.click(screen.getByTestId('confirm-button'));
     expect(onDeleteMock).toHaveBeenCalled();
diff --git a/static/app/views/settings/organizationIntegrations/integrationExternalMappings.tsx b/static/app/views/settings/organizationIntegrations/integrationExternalMappings.tsx
index 01835bf0095ac8..2ed783ee661a0a 100644
--- a/static/app/views/settings/organizationIntegrations/integrationExternalMappings.tsx
+++ b/static/app/views/settings/organizationIntegrations/integrationExternalMappings.tsx
@@ -92,7 +92,7 @@ class IntegrationExternalMappings extends DeprecatedAsyncComponent<Props, State>
     const errorKey = `missing_external_${type}s`;
     const unassociatedMappings = Object.values(associationMappings).reduce(
       (map, {errors}) => {
-        return new Set<string>([...map, ...errors[errorKey]]);
+        return new Set<string>([...map, ...errors[errorKey]!]);
       },
       new Set<string>()
     );
diff --git a/static/app/views/settings/organizationIntegrations/integrationListDirectory.spec.tsx b/static/app/views/settings/organizationIntegrations/integrationListDirectory.spec.tsx
index d9e7547553f348..fb39627ac811a6 100644
--- a/static/app/views/settings/organizationIntegrations/integrationListDirectory.spec.tsx
+++ b/static/app/views/settings/organizationIntegrations/integrationListDirectory.spec.tsx
@@ -13,7 +13,7 @@ import {render, screen} from 'sentry-test/reactTestingLibrary';
 
 import IntegrationListDirectory from 'sentry/views/settings/organizationIntegrations/integrationListDirectory';
 
-const mockResponse = mocks => {
+const mockResponse = (mocks: [string, unknown][]) => {
   mocks.forEach(([url, body]) => MockApiClient.addMockResponse({url, body}));
 };
 
diff --git a/static/app/views/settings/organizationIntegrations/integrationListDirectory.tsx b/static/app/views/settings/organizationIntegrations/integrationListDirectory.tsx
index 932a3562d48ef5..8655840e318bf5 100644
--- a/static/app/views/settings/organizationIntegrations/integrationListDirectory.tsx
+++ b/static/app/views/settings/organizationIntegrations/integrationListDirectory.tsx
@@ -29,7 +29,6 @@ import type {
 import type {RouteComponentProps} from 'sentry/types/legacyReactRouter';
 import type {Organization} from 'sentry/types/organization';
 import {uniq} from 'sentry/utils/array/uniq';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import type {Fuse} from 'sentry/utils/fuzzySearch';
 import {createFuzzySearch} from 'sentry/utils/fuzzySearch';
 import {
@@ -318,8 +317,8 @@ export class IntegrationListDirectory extends DeprecatedAsyncComponent<
   getFilterParameters = (): {searchInput: string; selectedCategory: string} => {
     const {category, search} = qs.parse(this.props.location.search);
 
-    const selectedCategory = Array.isArray(category) ? category[0] : category || '';
-    const searchInput = Array.isArray(search) ? search[0] : search || '';
+    const selectedCategory = Array.isArray(category) ? category[0]! : category || '';
+    const searchInput = Array.isArray(search) ? search[0]! : search || '';
 
     return {searchInput, selectedCategory};
   };
@@ -336,7 +335,7 @@ export class IntegrationListDirectory extends DeprecatedAsyncComponent<
       category: selectedCategory ? selectedCategory : undefined,
     });
 
-    browserHistory.replace({
+    this.props.router.replace({
       pathname: this.props.location.pathname,
       search: searchString ? `?${searchString}` : undefined,
     });
diff --git a/static/app/views/settings/organizationIntegrations/integrationRepos.tsx b/static/app/views/settings/organizationIntegrations/integrationRepos.tsx
index 0323ec6ad5c8e5..7cf9274584df92 100644
--- a/static/app/views/settings/organizationIntegrations/integrationRepos.tsx
+++ b/static/app/views/settings/organizationIntegrations/integrationRepos.tsx
@@ -16,6 +16,7 @@ import type {Integration, Repository} from 'sentry/types/integrations';
 import type {WithRouterProps} from 'sentry/types/legacyReactRouter';
 import type {Organization} from 'sentry/types/organization';
 import withOrganization from 'sentry/utils/withOrganization';
+// eslint-disable-next-line no-restricted-imports
 import withSentryRouter from 'sentry/utils/withSentryRouter';
 
 import {IntegrationReposAddRepository} from './integrationReposAddRepository';
diff --git a/static/app/views/settings/organizationIntegrations/integrationServerlessFunctions.tsx b/static/app/views/settings/organizationIntegrations/integrationServerlessFunctions.tsx
index 92e51be1e135bf..1537c58b4edf63 100644
--- a/static/app/views/settings/organizationIntegrations/integrationServerlessFunctions.tsx
+++ b/static/app/views/settings/organizationIntegrations/integrationServerlessFunctions.tsx
@@ -74,7 +74,7 @@ export function IntegrationServerlessFunctions({
                   existingServerlessFunctions => {
                     const newServerlessFunctions = [...existingServerlessFunctions];
                     const updatedFunction = {
-                      ...newServerlessFunctions[i],
+                      ...newServerlessFunctions[i]!,
                       ...update,
                     };
                     newServerlessFunctions[i] = updatedFunction;
diff --git a/static/app/views/settings/organizationIntegrations/pluginDetailedView.tsx b/static/app/views/settings/organizationIntegrations/pluginDetailedView.tsx
index b99b2070cadcb6..fdf7da2aa49bc5 100644
--- a/static/app/views/settings/organizationIntegrations/pluginDetailedView.tsx
+++ b/static/app/views/settings/organizationIntegrations/pluginDetailedView.tsx
@@ -41,7 +41,7 @@ class PluginDetailedView extends AbstractIntegrationDetailedView<
   }
 
   get plugin() {
-    return this.state.plugins[0];
+    return this.state.plugins[0]!;
   }
 
   get description() {
@@ -81,7 +81,7 @@ class PluginDetailedView extends AbstractIntegrationDetailedView<
     projectList.splice(index, 1);
     // update state
     this.setState({
-      plugins: [{...this.state.plugins[0], projectList}],
+      plugins: [{...this.state.plugins[0]!, projectList}],
     });
   };
 
@@ -97,13 +97,13 @@ class PluginDetailedView extends AbstractIntegrationDetailedView<
 
     // update item in array
     projectList[index] = {
-      ...projectList[index],
+      ...projectList[index]!,
       enabled: enable,
     };
 
     // update state
     this.setState({
-      plugins: [{...this.state.plugins[0], projectList}],
+      plugins: [{...this.state.plugins[0]!, projectList}],
     });
   };
 
diff --git a/static/app/views/settings/organizationIntegrations/sentryAppDetailedView.spec.tsx b/static/app/views/settings/organizationIntegrations/sentryAppDetailedView.spec.tsx
index 93c74d5928ee6f..cde2ce289ca466 100644
--- a/static/app/views/settings/organizationIntegrations/sentryAppDetailedView.spec.tsx
+++ b/static/app/views/settings/organizationIntegrations/sentryAppDetailedView.spec.tsx
@@ -37,9 +37,9 @@ describe('SentryAppDetailedView', function () {
   });
 
   describe('Published Sentry App', function () {
-    let createRequest;
-    let deleteRequest;
-    let sentryAppInteractionRequest;
+    let createRequest: jest.Mock;
+    let deleteRequest: jest.Mock;
+    let sentryAppInteractionRequest: jest.Mock;
 
     beforeEach(() => {
       sentryAppInteractionRequest = MockApiClient.addMockResponse({
@@ -221,7 +221,7 @@ describe('SentryAppDetailedView', function () {
   });
 
   describe('Unpublished Sentry App without Redirect Url', function () {
-    let createRequest;
+    let createRequest: jest.Mock;
 
     beforeEach(() => {
       MockApiClient.addMockResponse({
@@ -312,7 +312,7 @@ describe('SentryAppDetailedView', function () {
   });
 
   describe('Unpublished Sentry App with Redirect Url', function () {
-    let createRequest;
+    let createRequest: jest.Mock;
     beforeEach(() => {
       MockApiClient.addMockResponse({
         url: `/sentry-apps/go-to-google/interaction/`,
diff --git a/static/app/views/settings/organizationIntegrations/sentryAppExternalForm.tsx b/static/app/views/settings/organizationIntegrations/sentryAppExternalForm.tsx
index 28640be7068c97..a7c73f065e4050 100644
--- a/static/app/views/settings/organizationIntegrations/sentryAppExternalForm.tsx
+++ b/static/app/views/settings/organizationIntegrations/sentryAppExternalForm.tsx
@@ -148,7 +148,7 @@ export class SentryAppExternalForm extends Component<Props, State> {
         });
         // if ready to load, trigger a field change to trigger the api request to load options
         if (isReadyToLoad) {
-          this.handleFieldChange(field.depends_on[0]);
+          this.handleFieldChange(field.depends_on[0]!);
         }
       }
     });
@@ -284,7 +284,8 @@ export class SentryAppExternalForm extends Component<Props, State> {
     const choiceArray = await Promise.all(
       impactedFields.map(field => {
         // reset all impacted fields first
-        this.model.setValue(field.name || '', '', {quiet: true});
+        const defaultValue = this.getDefaultFieldValue(field);
+        this.model.setValue(field.name || '', defaultValue || '', {quiet: true});
         return this.makeExternalRequest(field, '');
       })
     );
diff --git a/static/app/views/settings/organizationMembers/inviteBanner.spec.tsx b/static/app/views/settings/organizationMembers/inviteBanner.spec.tsx
index 5da15bc59a078c..70e992289a5213 100644
--- a/static/app/views/settings/organizationMembers/inviteBanner.spec.tsx
+++ b/static/app/views/settings/organizationMembers/inviteBanner.spec.tsx
@@ -257,7 +257,7 @@ describe('inviteBanner', function () {
     expect(screen.queryAllByTestId('invite-missing-member')).toHaveLength(5);
     expect(screen.getByText('See all 5 missing members')).toBeInTheDocument();
 
-    const inviteButton = screen.queryAllByTestId('invite-missing-member')[0];
+    const inviteButton = screen.queryAllByTestId('invite-missing-member')[0]!;
     await userEvent.click(inviteButton);
     expect(screen.queryAllByTestId('invite-missing-member')).toHaveLength(4);
     expect(screen.getByText('See all 4 missing members')).toBeInTheDocument();
diff --git a/static/app/views/settings/organizationMembers/inviteRequestRow.spec.tsx b/static/app/views/settings/organizationMembers/inviteRequestRow.spec.tsx
index dee07a85670d8a..9f0ceb95225d62 100644
--- a/static/app/views/settings/organizationMembers/inviteRequestRow.spec.tsx
+++ b/static/app/views/settings/organizationMembers/inviteRequestRow.spec.tsx
@@ -192,11 +192,11 @@ describe('InviteRequestRow', function () {
     );
 
     // Select role from first select input
-    await selectEvent.select(screen.getAllByRole('textbox')[0], 'Member');
+    await selectEvent.select(screen.getAllByRole('textbox')[0]!, 'Member');
     expect(mockUpdate).toHaveBeenCalledWith({role: 'member'});
 
     // Select teams from first select input
-    await selectEvent.select(screen.getAllByRole('textbox')[1], ['#one']);
+    await selectEvent.select(screen.getAllByRole('textbox')[1]!, ['#one']);
     expect(mockUpdate).toHaveBeenCalledWith({teams: ['one']});
 
     TeamStore.reset();
diff --git a/static/app/views/settings/organizationMembers/organizationMemberDetail.spec.tsx b/static/app/views/settings/organizationMembers/organizationMemberDetail.spec.tsx
index 45fc1e2e12f627..fd2d0710f4a5b8 100644
--- a/static/app/views/settings/organizationMembers/organizationMemberDetail.spec.tsx
+++ b/static/app/views/settings/organizationMembers/organizationMemberDetail.spec.tsx
@@ -233,7 +233,7 @@ describe('OrganizationMemberDetail', function () {
       await userEvent.click(screen.getByText('#new-team'));
 
       // Assign as admin to new team
-      const teamRoleSelect = screen.getAllByText('Contributor')[0];
+      const teamRoleSelect = screen.getAllByText('Contributor')[0]!;
       await selectEvent.select(teamRoleSelect, ['Team Admin']);
 
       // Save Member
@@ -714,11 +714,11 @@ describe('OrganizationMemberDetail', function () {
       const teamRoleSelect = within(teamRow).getByText('Contributor');
 
       // Dropdown options are not visible
-      expect(screen.queryAllByText('...').length).toBe(0);
+      expect(screen.queryAllByText('...')).toHaveLength(0);
 
       // Dropdown can be opened
       await selectEvent.openMenu(teamRoleSelect);
-      expect(screen.queryAllByText('...').length).toBe(2);
+      expect(screen.queryAllByText('...')).toHaveLength(2);
 
       // Dropdown value can be changed
       await userEvent.click(screen.getByLabelText('Team Admin'));
@@ -745,11 +745,11 @@ describe('OrganizationMemberDetail', function () {
         const teamRoleSelect = within(teamRow).getByText('Team Admin');
 
         // Dropdown options are not visible
-        expect(screen.queryAllByText('...').length).toBe(0);
+        expect(screen.queryAllByText('...')).toHaveLength(0);
 
         // Dropdown cannot be opened
         await selectEvent.openMenu(teamRoleSelect);
-        expect(screen.queryAllByText('...').length).toBe(0);
+        expect(screen.queryAllByText('...')).toHaveLength(0);
       }
 
       for (const role of [admin, manager, owner]) {
@@ -782,17 +782,17 @@ describe('OrganizationMemberDetail', function () {
       expect(orgRoleRadio.at(-1)).toBeChecked();
 
       // Role info box is shown
-      expect(screen.queryByTestId('alert-role-overwrite')).toBeInTheDocument();
+      expect(screen.getByTestId('alert-role-overwrite')).toBeInTheDocument();
 
       // Dropdown has correct value set
       within(teamRow).getByText('Team Admin');
 
       // Dropdown options are not visible
-      expect(screen.queryAllByText('...').length).toBe(0);
+      expect(screen.queryAllByText('...')).toHaveLength(0);
 
       // Dropdown cannot be opened
       await selectEvent.openMenu(teamRoleSelect);
-      expect(screen.queryAllByText('...').length).toBe(0);
+      expect(screen.queryAllByText('...')).toHaveLength(0);
     });
   });
 });
diff --git a/static/app/views/settings/organizationMembers/organizationMemberDetail.tsx b/static/app/views/settings/organizationMembers/organizationMemberDetail.tsx
index 530af906140aaf..57832b525b6784 100644
--- a/static/app/views/settings/organizationMembers/organizationMemberDetail.tsx
+++ b/static/app/views/settings/organizationMembers/organizationMemberDetail.tsx
@@ -199,7 +199,7 @@ function OrganizationMemberDetailContent({member}: {member: Member}) {
       return;
     }
 
-    newTeamRoles[i] = {...newTeamRoles[i], role};
+    newTeamRoles[i] = {...newTeamRoles[i]!, role};
     setTeamRoles(newTeamRoles);
   };
 
diff --git a/static/app/views/settings/organizationMembers/organizationMemberRow.spec.tsx b/static/app/views/settings/organizationMembers/organizationMemberRow.spec.tsx
index d8f14d3b112cff..443664d7ee1847 100644
--- a/static/app/views/settings/organizationMembers/organizationMemberRow.spec.tsx
+++ b/static/app/views/settings/organizationMembers/organizationMemberRow.spec.tsx
@@ -120,7 +120,6 @@ describe('OrganizationMemberRow', function () {
 
     it('has "Resend Invite" button if invite was sent from curr user and feature is on', function () {
       const org = OrganizationFixture({
-        features: ['members-invite-teammates'],
         access: ['member:invite'],
       });
       render(<OrganizationMemberRow {...props} organization={org} />);
@@ -131,7 +130,6 @@ describe('OrganizationMemberRow', function () {
 
     it('does not have "Resend Invite" button if invite was sent from other user and feature is on', function () {
       const org = OrganizationFixture({
-        features: ['members-invite-teammates'],
         access: ['member:invite'],
       });
       render(
@@ -175,7 +173,6 @@ describe('OrganizationMemberRow', function () {
 
     it('has Remove button if invite was sent from curr user and feature is on', function () {
       const org = OrganizationFixture({
-        features: ['members-invite-teammates'],
         access: ['member:invite'],
       });
       render(<OrganizationMemberRow {...props} organization={org} />);
@@ -185,7 +182,6 @@ describe('OrganizationMemberRow', function () {
 
     it('has disabled Remove button if invite was sent from other user and feature is on', function () {
       const org = OrganizationFixture({
-        features: ['members-invite-teammates'],
         access: ['member:invite'],
       });
       render(
diff --git a/static/app/views/settings/organizationMembers/organizationMemberRow.tsx b/static/app/views/settings/organizationMembers/organizationMemberRow.tsx
index 9aa1bb0ac6805e..cc17d7b4351776 100644
--- a/static/app/views/settings/organizationMembers/organizationMemberRow.tsx
+++ b/static/app/views/settings/organizationMembers/organizationMemberRow.tsx
@@ -115,10 +115,7 @@ export default class OrganizationMemberRow extends PureComponent<Props, State> {
     const showRemoveButton = !isCurrentUser;
     const showLeaveButton = isCurrentUser;
     const isInviteFromCurrentUser = pending && inviterName === currentUser.name;
-    const canInvite =
-      organization.features?.includes('members-invite-teammates') &&
-      organization.allowMemberInvite &&
-      access.includes('member:invite');
+    const canInvite = organization.allowMemberInvite && access.includes('member:invite');
     // members can remove invites they sent if allowMemberInvite is true
     const canEditInvite = canInvite && isInviteFromCurrentUser;
     const canRemoveMember =
diff --git a/static/app/views/settings/organizationMembers/organizationMembersList.spec.tsx b/static/app/views/settings/organizationMembers/organizationMembersList.spec.tsx
index bc2f1c04720660..67d71ac86fc71e 100644
--- a/static/app/views/settings/organizationMembers/organizationMembersList.spec.tsx
+++ b/static/app/views/settings/organizationMembers/organizationMembersList.spec.tsx
@@ -21,7 +21,6 @@ import ConfigStore from 'sentry/stores/configStore';
 import ModalStore from 'sentry/stores/modalStore';
 import OrganizationsStore from 'sentry/stores/organizationsStore';
 import {trackAnalytics} from 'sentry/utils/analytics';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import OrganizationMembersList from 'sentry/views/settings/organizationMembers/organizationMembersList';
 
 jest.mock('sentry/utils/analytics');
@@ -72,7 +71,7 @@ describe('OrganizationMembersList', function () {
     },
   });
 
-  const currentUser = members[1];
+  const currentUser = members[1]!;
   currentUser.user = UserFixture({
     ...currentUser,
     flags: {newsletter_consent_prompt: true},
@@ -161,18 +160,18 @@ describe('OrganizationMembersList', function () {
 
   it('can remove a member', async function () {
     const deleteMock = MockApiClient.addMockResponse({
-      url: `/organizations/org-slug/members/${members[0].id}/`,
+      url: `/organizations/org-slug/members/${members[0]!.id}/`,
       method: 'DELETE',
     });
 
-    render(<OrganizationMembersList />, {organization});
-    renderGlobalModal();
+    render(<OrganizationMembersList />, {organization, router});
+    renderGlobalModal({router});
 
     // The organization member row
-    expect(await screen.findByTestId(members[0].email)).toBeInTheDocument();
+    expect(await screen.findByTestId(members[0]!.email)).toBeInTheDocument();
 
     await userEvent.click(
-      within(screen.getByTestId(members[0].email)).getByRole('button', {name: 'Remove'})
+      within(screen.getByTestId(members[0]!.email)).getByRole('button', {name: 'Remove'})
     );
     await userEvent.click(await screen.findByRole('button', {name: 'Confirm'}));
 
@@ -185,19 +184,19 @@ describe('OrganizationMembersList', function () {
 
   it('displays error message when failing to remove member', async function () {
     const deleteMock = MockApiClient.addMockResponse({
-      url: `/organizations/org-slug/members/${members[0].id}/`,
+      url: `/organizations/org-slug/members/${members[0]!.id}/`,
       method: 'DELETE',
       statusCode: 500,
     });
 
     render(<OrganizationMembersList />, {organization, router});
-    renderGlobalModal();
+    renderGlobalModal({router});
 
     // The organization member row
-    expect(await screen.findByTestId(members[0].email)).toBeInTheDocument();
+    expect(await screen.findByTestId(members[0]!.email)).toBeInTheDocument();
 
     await userEvent.click(
-      within(screen.getByTestId(members[0].email)).getByRole('button', {name: 'Remove'})
+      within(screen.getByTestId(members[0]!.email)).getByRole('button', {name: 'Remove'})
     );
     await userEvent.click(await screen.findByRole('button', {name: 'Confirm'}));
 
@@ -210,12 +209,12 @@ describe('OrganizationMembersList', function () {
 
   it('can leave org', async function () {
     const deleteMock = MockApiClient.addMockResponse({
-      url: `/organizations/org-slug/members/${members[1].id}/`,
+      url: `/organizations/org-slug/members/${members[1]!.id}/`,
       method: 'DELETE',
     });
 
     render(<OrganizationMembersList />, {organization, router});
-    renderGlobalModal();
+    renderGlobalModal({router});
 
     await userEvent.click(await screen.findByRole('button', {name: 'Leave'}));
     await userEvent.click(await screen.findByRole('button', {name: 'Confirm'}));
@@ -223,13 +222,13 @@ describe('OrganizationMembersList', function () {
     await waitFor(() => expect(addSuccessMessage).toHaveBeenCalled());
 
     expect(deleteMock).toHaveBeenCalled();
-    expect(browserHistory.push).toHaveBeenCalledTimes(1);
-    expect(browserHistory.push).toHaveBeenCalledWith('/organizations/new/');
+    expect(router.push).toHaveBeenCalledTimes(1);
+    expect(router.push).toHaveBeenCalledWith({pathname: '/organizations/new/'});
   });
 
   it('can redirect to remaining org after leaving', async function () {
     const deleteMock = MockApiClient.addMockResponse({
-      url: `/organizations/org-slug/members/${members[1].id}/`,
+      url: `/organizations/org-slug/members/${members[1]!.id}/`,
       method: 'DELETE',
     });
     const secondOrg = OrganizationFixture({
@@ -242,7 +241,7 @@ describe('OrganizationMembersList', function () {
     OrganizationsStore.addOrReplace(secondOrg);
 
     render(<OrganizationMembersList />, {organization, router});
-    renderGlobalModal();
+    renderGlobalModal({router});
 
     await userEvent.click(await screen.findByRole('button', {name: 'Leave'}));
     await userEvent.click(screen.getByTestId('confirm-button'));
@@ -250,20 +249,22 @@ describe('OrganizationMembersList', function () {
     await waitFor(() => expect(addSuccessMessage).toHaveBeenCalled());
 
     expect(deleteMock).toHaveBeenCalled();
-    expect(browserHistory.push).toHaveBeenCalledTimes(1);
-    expect(browserHistory.push).toHaveBeenCalledWith('/organizations/org-two/issues/');
+    expect(router.push).toHaveBeenCalledTimes(1);
+    expect(router.push).toHaveBeenCalledWith({
+      pathname: '/organizations/org-two/issues/',
+    });
     expect(OrganizationsStore.getAll()).toEqual([secondOrg]);
   });
 
   it('displays error message when failing to leave org', async function () {
     const deleteMock = MockApiClient.addMockResponse({
-      url: `/organizations/org-slug/members/${members[1].id}/`,
+      url: `/organizations/org-slug/members/${members[1]!.id}/`,
       method: 'DELETE',
       statusCode: 500,
     });
 
-    render(<OrganizationMembersList />, {organization});
-    renderGlobalModal();
+    render(<OrganizationMembersList />, {organization, router});
+    renderGlobalModal({router});
 
     await userEvent.click(await screen.findByRole('button', {name: 'Leave'}));
     await userEvent.click(await screen.findByRole('button', {name: 'Confirm'}));
@@ -277,7 +278,7 @@ describe('OrganizationMembersList', function () {
 
   it('can re-send SSO link to member', async function () {
     const inviteMock = MockApiClient.addMockResponse({
-      url: `/organizations/org-slug/members/${members[0].id}/`,
+      url: `/organizations/org-slug/members/${members[0]!.id}/`,
       method: 'PUT',
       body: {
         id: '1234',
@@ -294,7 +295,7 @@ describe('OrganizationMembersList', function () {
 
   it('can re-send invite to member', async function () {
     const inviteMock = MockApiClient.addMockResponse({
-      url: `/organizations/org-slug/members/${members[1].id}/`,
+      url: `/organizations/org-slug/members/${members[1]!.id}/`,
       method: 'PUT',
       body: {
         id: '1234',
@@ -474,13 +475,13 @@ describe('OrganizationMembersList', function () {
         method: 'PUT',
       });
 
-      render(<OrganizationMembersList />, {organization});
+      render(<OrganizationMembersList />, {organization, router});
 
       expect(await screen.findByText('Pending Members')).toBeInTheDocument();
 
       await userEvent.click(screen.getByRole('button', {name: 'Approve'}));
 
-      renderGlobalModal();
+      renderGlobalModal({router});
       await userEvent.click(screen.getByTestId('confirm-button'));
 
       expect(screen.queryByText('Pending Members')).not.toBeInTheDocument();
@@ -544,7 +545,7 @@ describe('OrganizationMembersList', function () {
         method: 'PUT',
       });
 
-      render(<OrganizationMembersList />, {organization: org});
+      render(<OrganizationMembersList />, {organization: org, router});
 
       expect(await screen.findByText('Pending Members')).toBeInTheDocument();
       await selectEvent.select(screen.getByRole('textbox', {name: 'Role: Member'}), [
@@ -553,7 +554,7 @@ describe('OrganizationMembersList', function () {
 
       await userEvent.click(screen.getByRole('button', {name: 'Approve'}));
 
-      renderGlobalModal();
+      renderGlobalModal({router});
       await userEvent.click(screen.getByTestId('confirm-button'));
 
       expect(updateWithApprove).toHaveBeenCalledWith(
@@ -574,8 +575,8 @@ describe('OrganizationMembersList', function () {
         },
       });
 
-      render(<OrganizationMembersList />, {organization: inviteOrg});
-      renderGlobalModal();
+      render(<OrganizationMembersList />, {organization: inviteOrg, router});
+      renderGlobalModal({router});
 
       await userEvent.click(await screen.findByRole('button', {name: 'Invite Members'}));
       expect(screen.getByRole('dialog')).toBeInTheDocument();
@@ -591,8 +592,8 @@ describe('OrganizationMembersList', function () {
         },
       });
 
-      render(<OrganizationMembersList />, {organization: org});
-      renderGlobalModal();
+      render(<OrganizationMembersList />, {organization: org, router});
+      renderGlobalModal({router});
 
       expect(await screen.findByRole('button', {name: 'Invite Members'})).toBeDisabled();
     });
@@ -608,8 +609,8 @@ describe('OrganizationMembersList', function () {
         requiresSso: true,
       });
 
-      render(<OrganizationMembersList />, {organization: org});
-      renderGlobalModal();
+      render(<OrganizationMembersList />, {organization: org, router});
+      renderGlobalModal({router});
 
       await userEvent.click(screen.getByRole('button', {name: 'Invite Members'}));
       expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
@@ -625,8 +626,8 @@ describe('OrganizationMembersList', function () {
         },
       });
 
-      render(<OrganizationMembersList />, {organization: org});
-      renderGlobalModal();
+      render(<OrganizationMembersList />, {organization: org, router});
+      renderGlobalModal({router});
 
       await userEvent.click(await screen.findByRole('button', {name: 'Invite Members'}));
       expect(screen.getByRole('dialog')).toBeInTheDocument();
@@ -643,8 +644,8 @@ describe('OrganizationMembersList', function () {
         method: 'GET',
         body: {},
       });
-      render(<OrganizationMembersList />, {organization});
-      renderGlobalModal();
+      render(<OrganizationMembersList />, {organization, router});
+      renderGlobalModal({router});
 
       expect(await screen.findByText('Members')).toBeInTheDocument();
       expect(screen.getByText(member.name)).toBeInTheDocument();
diff --git a/static/app/views/settings/organizationMembers/organizationMembersList.tsx b/static/app/views/settings/organizationMembers/organizationMembersList.tsx
index fe0658efe50b2c..dae8b3e448b762 100644
--- a/static/app/views/settings/organizationMembers/organizationMembersList.tsx
+++ b/static/app/views/settings/organizationMembers/organizationMembersList.tsx
@@ -145,6 +145,7 @@ function OrganizationMembersList() {
     }
 
     redirectToRemainingOrganization({
+      navigate,
       orgId: organization.slug,
       removeOrg: true,
     });
@@ -362,7 +363,7 @@ function OrganizationMembersList() {
                   key={member.id}
                   organization={organization}
                   member={member}
-                  status={invited[member.id]}
+                  status={invited[member.id]!}
                   memberCanLeave={
                     !(
                       isOnlyOwner ||
diff --git a/static/app/views/settings/organizationProjects/index.spec.tsx b/static/app/views/settings/organizationProjects/index.spec.tsx
index a0cd7f770fbf41..a8b968dea3c909 100644
--- a/static/app/views/settings/organizationProjects/index.spec.tsx
+++ b/static/app/views/settings/organizationProjects/index.spec.tsx
@@ -1,8 +1,8 @@
 import {ProjectFixture} from 'sentry-fixture/project';
+import {RouterFixture} from 'sentry-fixture/routerFixture';
 
 import {render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrary';
 
-import {browserHistory} from 'sentry/utils/browserHistory';
 import OrganizationProjectsContainer from 'sentry/views/settings/organizationProjects';
 
 describe('OrganizationProjects', function () {
@@ -10,6 +10,7 @@ describe('OrganizationProjects', function () {
   let statsGetMock: jest.Mock;
   let projectsPutMock: jest.Mock;
   const project = ProjectFixture();
+  const router = RouterFixture();
 
   beforeEach(function () {
     projectsGetMock = MockApiClient.addMockResponse({
@@ -33,7 +34,7 @@ describe('OrganizationProjects', function () {
   });
 
   it('should render the projects in the store', async function () {
-    render(<OrganizationProjectsContainer />);
+    render(<OrganizationProjectsContainer />, {router});
 
     expect(await screen.findByText('project-slug')).toBeInTheDocument();
 
@@ -62,7 +63,7 @@ describe('OrganizationProjects', function () {
   });
 
   it('should search organization projects', async function () {
-    render(<OrganizationProjectsContainer />);
+    render(<OrganizationProjectsContainer />, {router});
 
     expect(await screen.findByText('project-slug')).toBeInTheDocument();
 
@@ -70,7 +71,7 @@ describe('OrganizationProjects', function () {
     await userEvent.type(searchBox, 'random');
 
     await waitFor(() => {
-      expect(browserHistory.replace).toHaveBeenLastCalledWith({
+      expect(router.replace).toHaveBeenLastCalledWith({
         pathname: '/mock-pathname/',
         query: {query: 'random'},
       });
diff --git a/static/app/views/settings/organizationRelay/list/index.tsx b/static/app/views/settings/organizationRelay/list/index.tsx
index cc38f741213cd2..c8013593ce4a58 100644
--- a/static/app/views/settings/organizationRelay/list/index.tsx
+++ b/static/app/views/settings/organizationRelay/list/index.tsx
@@ -34,7 +34,7 @@ function List({relays, relayActivities, onRefresh, onDelete, onEdit, disabled}:
     <div>
       {Object.keys(relaysByPublicKey).map(relayByPublicKey => {
         const {name, description, created, activities} =
-          relaysByPublicKey[relayByPublicKey];
+          relaysByPublicKey[relayByPublicKey]!;
         return (
           <div key={relayByPublicKey}>
             <CardHeader
diff --git a/static/app/views/settings/organizationRelay/list/utils.tsx b/static/app/views/settings/organizationRelay/list/utils.tsx
index dc49687a14700c..a3b11d3917ef47 100644
--- a/static/app/views/settings/organizationRelay/list/utils.tsx
+++ b/static/app/views/settings/organizationRelay/list/utils.tsx
@@ -14,8 +14,8 @@ export function getRelaysByPublicKey(
       relaysByPublicKey[publicKey] = {name, description, created, activities: []};
     }
 
-    if (!relaysByPublicKey[publicKey].activities.length) {
-      relaysByPublicKey[publicKey].activities = relayActivities.filter(
+    if (!relaysByPublicKey[publicKey]!.activities.length) {
+      relaysByPublicKey[publicKey]!.activities = relayActivities.filter(
         activity => activity.publicKey === publicKey
       );
     }
diff --git a/static/app/views/settings/organizationTeams/organizationTeams.spec.tsx b/static/app/views/settings/organizationTeams/organizationTeams.spec.tsx
index ee4fdcd4c620a9..d9efb1b4ae25ea 100644
--- a/static/app/views/settings/organizationTeams/organizationTeams.spec.tsx
+++ b/static/app/views/settings/organizationTeams/organizationTeams.spec.tsx
@@ -251,7 +251,7 @@ describe('OrganizationTeams', function () {
       createWrapper({
         onRemoveAccessRequest: onUpdateRequestListMock,
       });
-      await userEvent.click(screen.getAllByLabelText('Approve')[0]);
+      await userEvent.click(screen.getAllByLabelText('Approve')[0]!);
 
       await tick();
 
@@ -277,7 +277,7 @@ describe('OrganizationTeams', function () {
         onRemoveAccessRequest: onUpdateRequestListMock,
       });
 
-      await userEvent.click(screen.getAllByLabelText('Deny')[0]);
+      await userEvent.click(screen.getAllByLabelText('Deny')[0]!);
 
       await tick();
 
diff --git a/static/app/views/settings/organizationTeams/roleOverwriteWarning.tsx b/static/app/views/settings/organizationTeams/roleOverwriteWarning.tsx
index fbaaf774287904..f1876f4e22edde 100644
--- a/static/app/views/settings/organizationTeams/roleOverwriteWarning.tsx
+++ b/static/app/views/settings/organizationTeams/roleOverwriteWarning.tsx
@@ -64,7 +64,7 @@ export function getOverwriteString(props: Props) {
     {
       selfNoun: isSelf ? 'Your' : "This user's",
       selfPronoun: isSelf ? 'you' : 'them',
-      article: 'AEIOU'.includes(orgRoleObj.name[0]) ? 'an' : 'a',
+      article: 'AEIOU'.includes(orgRoleObj.name[0]!) ? 'an' : 'a',
       orgRole: <strong>{orgRoleObj.name}</strong>,
       teamRole: <strong>{teamRoleObj.name}</strong>,
     }
diff --git a/static/app/views/settings/organizationTeams/teamMembers.spec.tsx b/static/app/views/settings/organizationTeams/teamMembers.spec.tsx
index 690b9f171259f6..346d9b77d96c46 100644
--- a/static/app/views/settings/organizationTeams/teamMembers.spec.tsx
+++ b/static/app/views/settings/organizationTeams/teamMembers.spec.tsx
@@ -19,7 +19,7 @@ jest.mock('sentry/actionCreators/modal', () => ({
 }));
 
 describe('TeamMembers', function () {
-  let createMock;
+  let createMock: jest.Mock;
 
   const organization = OrganizationFixture();
   const team = TeamFixture();
@@ -38,7 +38,7 @@ describe('TeamMembers', function () {
     routes: router.routes,
     params: router.params,
     routeParams: router.params,
-    route: router.routes[0],
+    route: router.routes[0]!,
     location: router.location,
   };
 
@@ -83,9 +83,9 @@ describe('TeamMembers', function () {
     );
 
     await userEvent.click(
-      (await screen.findAllByRole('button', {name: 'Add Member'}))[0]
+      (await screen.findAllByRole('button', {name: 'Add Member'}))[0]!!
     );
-    await userEvent.click(screen.getAllByTestId('letter_avatar-avatar')[0]);
+    await userEvent.click(screen.getAllByTestId('letter_avatar-avatar')[0]!);
 
     expect(createMock).toHaveBeenCalled();
   });
@@ -102,10 +102,10 @@ describe('TeamMembers', function () {
     );
 
     await userEvent.click(
-      (await screen.findAllByRole('button', {name: 'Add Member'}))[0]
+      (await screen.findAllByRole('button', {name: 'Add Member'}))[0]!!
     );
 
-    await userEvent.click(screen.getAllByTestId('letter_avatar-avatar')[0]);
+    await userEvent.click(screen.getAllByTestId('letter_avatar-avatar')[0]!);
     expect(createMock).toHaveBeenCalled();
     expect(screen.getAllByTestId('add-member-menu')[0]).toBeVisible();
   });
@@ -122,9 +122,9 @@ describe('TeamMembers', function () {
     );
 
     await userEvent.click(
-      (await screen.findAllByRole('button', {name: 'Add Member'}))[0]
+      (await screen.findAllByRole('button', {name: 'Add Member'}))[0]!!
     );
-    await userEvent.click(screen.getAllByTestId('letter_avatar-avatar')[0]);
+    await userEvent.click(screen.getAllByTestId('letter_avatar-avatar')[0]!);
 
     expect(createMock).toHaveBeenCalled();
   });
@@ -141,9 +141,9 @@ describe('TeamMembers', function () {
     );
 
     await userEvent.click(
-      (await screen.findAllByRole('button', {name: 'Add Member'}))[0]
+      (await screen.findAllByRole('button', {name: 'Add Member'}))[0]!!
     );
-    await userEvent.click(screen.getAllByTestId('letter_avatar-avatar')[0]);
+    await userEvent.click(screen.getAllByTestId('letter_avatar-avatar')[0]!);
 
     expect(createMock).toHaveBeenCalled();
   });
@@ -160,9 +160,9 @@ describe('TeamMembers', function () {
     );
 
     await userEvent.click(
-      (await screen.findAllByRole('button', {name: 'Add Member'}))[0]
+      (await screen.findAllByRole('button', {name: 'Add Member'}))[0]!!
     );
-    await userEvent.click(screen.getAllByTestId('letter_avatar-avatar')[0]);
+    await userEvent.click(screen.getAllByTestId('letter_avatar-avatar')[0]!);
 
     expect(openTeamAccessRequestModal).toHaveBeenCalled();
   });
@@ -185,7 +185,7 @@ describe('TeamMembers', function () {
     );
 
     await userEvent.click(
-      (await screen.findAllByRole('button', {name: 'Add Member'}))[0]
+      (await screen.findAllByRole('button', {name: 'Add Member'}))[0]!
     );
     await userEvent.click(screen.getByTestId('invite-member'));
 
@@ -210,7 +210,7 @@ describe('TeamMembers', function () {
     );
 
     await userEvent.click(
-      (await screen.findAllByRole('button', {name: 'Add Member'}))[0]
+      (await screen.findAllByRole('button', {name: 'Add Member'}))[0]!
     );
     await userEvent.click(screen.getByTestId('invite-member'));
 
@@ -232,7 +232,7 @@ describe('TeamMembers', function () {
     );
 
     await userEvent.click(
-      (await screen.findAllByRole('button', {name: 'Add Member'}))[0]
+      (await screen.findAllByRole('button', {name: 'Add Member'}))[0]!
     );
     await userEvent.click(screen.getByTestId('invite-member'));
 
@@ -254,7 +254,7 @@ describe('TeamMembers', function () {
     );
 
     await userEvent.click(
-      (await screen.findAllByRole('button', {name: 'Add Member'}))[0]
+      (await screen.findAllByRole('button', {name: 'Add Member'}))[0]!
     );
     await userEvent.click(screen.getByTestId('invite-member'));
 
@@ -263,7 +263,7 @@ describe('TeamMembers', function () {
 
   it('can remove member from team', async function () {
     const deleteMock = MockApiClient.addMockResponse({
-      url: `/organizations/${organization.slug}/members/${members[0].id}/teams/${team.slug}/`,
+      url: `/organizations/${organization.slug}/members/${members[0]!.id}/teams/${team.slug}/`,
       method: 'DELETE',
     });
     render(
@@ -278,7 +278,7 @@ describe('TeamMembers', function () {
     await screen.findAllByRole('button', {name: 'Add Member'});
 
     expect(deleteMock).not.toHaveBeenCalled();
-    await userEvent.click(screen.getAllByRole('button', {name: 'Remove'})[0]);
+    await userEvent.click(screen.getAllByRole('button', {name: 'Remove'})[0]!);
 
     expect(deleteMock).toHaveBeenCalled();
   });
diff --git a/static/app/views/settings/organizationTeams/teamNotifications.tsx b/static/app/views/settings/organizationTeams/teamNotifications.tsx
index ffdaa73a7fc3e2..f80ad9aa7b303c 100644
--- a/static/app/views/settings/organizationTeams/teamNotifications.tsx
+++ b/static/app/views/settings/organizationTeams/teamNotifications.tsx
@@ -134,7 +134,7 @@ class TeamNotificationSettings extends DeprecatedAsyncView<Props, State> {
             <div>
               <NotDisabledText>
                 {toTitleCase(externalTeam.provider)}:
-                {integrationsById[externalTeam.integrationId].name}
+                {integrationsById[externalTeam.integrationId]!.name}
               </NotDisabledText>
               <NotDisabledSubText>
                 {tct('Unlink this channel in Slack with [code]. [link].', {
diff --git a/static/app/views/settings/organizationTeams/teamProjects.spec.tsx b/static/app/views/settings/organizationTeams/teamProjects.spec.tsx
index 765541e804da45..b764dd2bc934e9 100644
--- a/static/app/views/settings/organizationTeams/teamProjects.spec.tsx
+++ b/static/app/views/settings/organizationTeams/teamProjects.spec.tsx
@@ -85,7 +85,7 @@ describe('OrganizationTeamProjects', function () {
     const stars = await screen.findAllByRole('button', {name: 'Bookmark'});
     expect(stars).toHaveLength(2);
 
-    await userEvent.click(stars[0]);
+    await userEvent.click(stars[0]!);
     expect(
       screen.getByRole('button', {name: 'Remove Bookmark', pressed: true})
     ).toBeInTheDocument();
@@ -114,7 +114,7 @@ describe('OrganizationTeamProjects', function () {
 
     // find second project's remove button
     const removeButtons = await screen.findAllByRole('button', {name: 'Remove'});
-    await userEvent.click(removeButtons[1]);
+    await userEvent.click(removeButtons[1]!);
 
     expect(deleteMock).toHaveBeenCalledTimes(1);
   });
diff --git a/static/app/views/settings/organizationTeams/teamProjects.tsx b/static/app/views/settings/organizationTeams/teamProjects.tsx
index 122b6559db5272..c26ce0e509c0ef 100644
--- a/static/app/views/settings/organizationTeams/teamProjects.tsx
+++ b/static/app/views/settings/organizationTeams/teamProjects.tsx
@@ -1,8 +1,9 @@
-import {Fragment, useState} from 'react';
+import {Fragment, useMemo, useState} from 'react';
 import styled from '@emotion/styled';
 
 import {addErrorMessage, addSuccessMessage} from 'sentry/actionCreators/indicator';
 import {hasEveryAccess} from 'sentry/components/acl/access';
+import ProjectAvatar from 'sentry/components/avatar/projectAvatar';
 import {Button} from 'sentry/components/button';
 import DropdownAutoComplete from 'sentry/components/dropdownAutoComplete';
 import DropdownButton from 'sentry/components/dropdownButton';
@@ -14,6 +15,7 @@ import Panel from 'sentry/components/panels/panel';
 import PanelBody from 'sentry/components/panels/panelBody';
 import PanelHeader from 'sentry/components/panels/panelHeader';
 import PanelItem from 'sentry/components/panels/panelItem';
+import TextOverflow from 'sentry/components/textOverflow';
 import {Tooltip} from 'sentry/components/tooltip';
 import {IconFlag, IconSubtract} from 'sentry/icons';
 import {t} from 'sentry/locale';
@@ -92,13 +94,20 @@ function TeamProjects({team, location, params}: TeamProjectsProps) {
 
   const linkedProjectsPageLinks = linkedProjectsHeaders?.('Link');
   const hasWriteAccess = hasEveryAccess(['team:write'], {organization, team});
-  const otherProjects = unlinkedProjects
-    .filter(p => p.access.includes('project:write'))
-    .map(p => ({
-      value: p.id,
-      searchKey: p.slug,
-      label: <ProjectListElement>{p.slug}</ProjectListElement>,
-    }));
+  const otherProjects = useMemo(() => {
+    return unlinkedProjects
+      .filter(p => p.access.includes('project:write'))
+      .map(p => ({
+        value: p.id,
+        searchKey: p.slug,
+        label: (
+          <ProjectListElement>
+            <ProjectAvatar project={p} size={16} />
+            <TextOverflow>{p.slug}</TextOverflow>
+          </ProjectListElement>
+        ),
+      }));
+  }, [unlinkedProjects]);
 
   return (
     <Fragment>
@@ -123,6 +132,7 @@ function TeamProjects({team, location, params}: TeamProjectsProps) {
             ) : (
               <DropdownAutoComplete
                 items={otherProjects}
+                minWidth={300}
                 onChange={evt => setQuery(evt.target.value)}
                 onSelect={selection => {
                   const project = unlinkedProjects.find(p => p.id === selection.value);
@@ -195,6 +205,9 @@ const StyledPanelItem = styled(PanelItem)`
 `;
 
 const ProjectListElement = styled('div')`
+  display: flex;
+  align-items: center;
+  gap: ${space(0.5)};
   padding: ${space(0.25)} 0;
 `;
 
diff --git a/static/app/views/settings/organizationTeams/teamSettings/index.spec.tsx b/static/app/views/settings/organizationTeams/teamSettings/index.spec.tsx
index 995ff92a34810f..801ae2a086cc79 100644
--- a/static/app/views/settings/organizationTeams/teamSettings/index.spec.tsx
+++ b/static/app/views/settings/organizationTeams/teamSettings/index.spec.tsx
@@ -11,11 +11,10 @@ import {
 } from 'sentry-test/reactTestingLibrary';
 
 import TeamStore from 'sentry/stores/teamStore';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import TeamSettings from 'sentry/views/settings/organizationTeams/teamSettings';
 
 describe('TeamSettings', function () {
-  const {routerProps} = initializeOrg();
+  const {router, routerProps} = initializeOrg();
 
   beforeEach(function () {
     TeamStore.reset();
@@ -37,7 +36,9 @@ describe('TeamSettings', function () {
       },
     });
 
-    render(<TeamSettings {...routerProps} team={team} params={{teamId: team.slug}} />);
+    render(<TeamSettings {...routerProps} team={team} params={{teamId: team.slug}} />, {
+      router,
+    });
 
     const input = screen.getByRole('textbox', {name: 'Team Slug'});
 
@@ -56,9 +57,9 @@ describe('TeamSettings', function () {
     );
 
     await waitFor(() =>
-      expect(browserHistory.replace).toHaveBeenCalledWith(
-        '/settings/org-slug/teams/new-slug/settings/'
-      )
+      expect(router.replace).toHaveBeenCalledWith({
+        pathname: '/settings/org-slug/teams/new-slug/settings/',
+      })
     );
   });
 
@@ -68,6 +69,7 @@ describe('TeamSettings', function () {
 
     render(<TeamSettings {...routerProps} team={team} params={{teamId: team.slug}} />, {
       organization,
+      router,
     });
 
     expect(screen.getByTestId('button-remove-team')).toBeDisabled();
@@ -81,13 +83,15 @@ describe('TeamSettings', function () {
     });
     TeamStore.loadInitialData([team]);
 
-    render(<TeamSettings {...routerProps} params={{teamId: team.slug}} team={team} />);
+    render(<TeamSettings {...routerProps} params={{teamId: team.slug}} team={team} />, {
+      router,
+    });
 
     // Click "Remove Team button
     await userEvent.click(screen.getByRole('button', {name: 'Remove Team'}));
 
     // Wait for modal
-    renderGlobalModal();
+    renderGlobalModal({router});
     await userEvent.click(screen.getByTestId('confirm-button'));
 
     expect(deleteMock).toHaveBeenCalledWith(
@@ -98,7 +102,7 @@ describe('TeamSettings', function () {
     );
 
     await waitFor(() =>
-      expect(browserHistory.replace).toHaveBeenCalledWith('/settings/org-slug/teams/')
+      expect(router.replace).toHaveBeenCalledWith({pathname: '/settings/org-slug/teams/'})
     );
 
     expect(TeamStore.getAll()).toEqual([]);
@@ -110,6 +114,7 @@ describe('TeamSettings', function () {
 
     render(<TeamSettings {...routerProps} team={team} params={{teamId: team.slug}} />, {
       organization,
+      router,
     });
 
     expect(
diff --git a/static/app/views/settings/organizationTeams/teamSettings/index.tsx b/static/app/views/settings/organizationTeams/teamSettings/index.tsx
index c90759286999cf..e6562ca49817af 100644
--- a/static/app/views/settings/organizationTeams/teamSettings/index.tsx
+++ b/static/app/views/settings/organizationTeams/teamSettings/index.tsx
@@ -20,9 +20,8 @@ import {IconDelete} from 'sentry/icons';
 import {t, tct} from 'sentry/locale';
 import type {RouteComponentProps} from 'sentry/types/legacyReactRouter';
 import type {Team} from 'sentry/types/organization';
-import {browserHistory} from 'sentry/utils/browserHistory';
-import normalizeUrl from 'sentry/utils/url/normalizeUrl';
 import useApi from 'sentry/utils/useApi';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import PermissionAlert from 'sentry/views/settings/project/permissionAlert';
 
@@ -31,6 +30,7 @@ interface TeamSettingsProps extends RouteComponentProps<{teamId: string}, {}> {
 }
 
 function TeamSettings({team, params}: TeamSettingsProps) {
+  const navigate = useNavigate();
   const organization = useOrganization();
   const api = useApi();
 
@@ -40,16 +40,16 @@ function TeamSettings({team, params}: TeamSettingsProps) {
     updateTeamSuccess(team.slug, resp);
     if (id === 'slug') {
       addSuccessMessage(t('Team name changed'));
-      browserHistory.replace(
-        normalizeUrl(`/settings/${organization.slug}/teams/${resp.slug}/settings/`)
-      );
+      navigate(`/settings/${organization.slug}/teams/${resp.slug}/settings/`, {
+        replace: true,
+      });
     }
   };
 
   const handleRemoveTeam = async () => {
     try {
       await removeTeam(api, {orgId: organization.slug, teamId: params.teamId});
-      browserHistory.replace(normalizeUrl(`/settings/${organization.slug}/teams/`));
+      navigate(`/settings/${organization.slug}/teams/`, {replace: true});
     } catch {
       // removeTeam already displays an error message
     }
@@ -73,7 +73,7 @@ function TeamSettings({team, params}: TeamSettingsProps) {
       help: `The unique identifier for this team. It cannot be modified.`,
     };
 
-    formsConfig[0].fields = [...formsConfig[0].fields, teamIdField];
+    formsConfig[0]!.fields = [...formsConfig[0]!.fields, teamIdField];
 
     return formsConfig;
   }, [team]);
diff --git a/static/app/views/settings/project/loaderScript.spec.tsx b/static/app/views/settings/project/loaderScript.spec.tsx
index ceecf663ba5bc5..1f93f2193dab63 100644
--- a/static/app/views/settings/project/loaderScript.spec.tsx
+++ b/static/app/views/settings/project/loaderScript.spec.tsx
@@ -64,7 +64,7 @@ describe('LoaderScript', function () {
 
   it('renders for single project', async function () {
     const {organization, project} = initializeOrg();
-    const projectKey = ProjectKeysFixture()[0];
+    const projectKey = ProjectKeysFixture()[0]!;
     const projectKeys = [projectKey];
 
     mockApi({organization, project, projectKeys});
@@ -79,7 +79,7 @@ describe('LoaderScript', function () {
       name: 'Loader Script',
     }) as HTMLInputElement;
     const loaderScriptValue = loaderScript.value;
-    expect(loaderScriptValue).toEqual(expect.stringContaining(projectKeys[0].dsn.cdn));
+    expect(loaderScriptValue).toEqual(expect.stringContaining(projectKeys[0]!.dsn.cdn));
   });
 
   it('renders multiple keys', async function () {
@@ -132,8 +132,8 @@ describe('LoaderScript', function () {
 
     await waitForElementToBeRemoved(() => screen.queryByTestId('loading-indicator'));
 
-    expect(screen.getByText(`Client Key: ${projectKeys[0].name}`)).toBeInTheDocument();
-    expect(screen.getByText(`Client Key: ${projectKeys[1].name}`)).toBeInTheDocument();
+    expect(screen.getByText(`Client Key: ${projectKeys[0]!.name}`)).toBeInTheDocument();
+    expect(screen.getByText(`Client Key: ${projectKeys[1]!.name}`)).toBeInTheDocument();
 
     const allLoaderScripts = screen.getAllByRole('textbox', {
       name: 'Loader Script',
@@ -144,7 +144,7 @@ describe('LoaderScript', function () {
 
   it('allows to update key settings', async function () {
     const {organization, project} = initializeOrg();
-    const baseKey = ProjectKeysFixture()[0];
+    const baseKey = ProjectKeysFixture()[0]!;
     const projectKey = {
       ...baseKey,
       dynamicSdkLoaderOptions: {
@@ -267,12 +267,12 @@ describe('LoaderScript', function () {
 
     mockApi({organization, project, projectKeys});
     const mockPut = MockApiClient.addMockResponse({
-      url: `/projects/${organization.slug}/${project.slug}/keys/${projectKey.id}/`,
+      url: `/projects/${organization.slug}/${project.slug}/keys/${projectKey!.id}/`,
       method: 'PUT',
       body: {
         ...projectKey,
         dynamicSdkLoaderOptions: {
-          ...projectKey.dynamicSdkLoaderOptions,
+          ...projectKey!.dynamicSdkLoaderOptions,
           hasPerformance: true,
         },
       },
@@ -305,7 +305,7 @@ describe('LoaderScript', function () {
     await userEvent.click(
       screen.getAllByRole('checkbox', {
         name: 'Enable Performance Monitoring',
-      })[1]
+      })[1]!
     );
 
     expect(
@@ -335,11 +335,11 @@ describe('LoaderScript', function () {
     ).toHaveLength(2);
 
     expect(mockPut).toHaveBeenCalledWith(
-      `/projects/${organization.slug}/${project.slug}/keys/${projectKey.id}/`,
+      `/projects/${organization.slug}/${project.slug}/keys/${projectKey!.id}/`,
       expect.objectContaining({
         data: expect.objectContaining({
           dynamicSdkLoaderOptions: {
-            ...projectKey.dynamicSdkLoaderOptions,
+            ...projectKey!.dynamicSdkLoaderOptions,
             hasPerformance: true,
           },
         }),
diff --git a/static/app/views/settings/project/navigationConfiguration.tsx b/static/app/views/settings/project/navigationConfiguration.tsx
index f5a5431b89ce31..e462ad3c1ce196 100644
--- a/static/app/views/settings/project/navigationConfiguration.tsx
+++ b/static/app/views/settings/project/navigationConfiguration.tsx
@@ -3,6 +3,7 @@ import ConfigStore from 'sentry/stores/configStore';
 import type {Organization} from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
 import {hasCustomMetrics} from 'sentry/utils/metrics/features';
+import {hasTempestAccess} from 'sentry/utils/tempest/features';
 import type {NavigationSection} from 'sentry/views/settings/types';
 
 type ConfigParams = {
@@ -20,6 +21,7 @@ export default function getConfiguration({
 }: ConfigParams): NavigationSection[] {
   const plugins = (project?.plugins || []).filter(plugin => plugin.enabled);
   const isSelfHostedErrorsOnly = ConfigStore.get('isSelfHostedErrorsOnly');
+  const isSelfHosted = ConfigStore.get('isSelfHosted');
   return [
     {
       name: t('Project'),
@@ -125,6 +127,11 @@ export default function getConfiguration({
             !!organization?.features?.includes('session-replay-ui') &&
             !isSelfHostedErrorsOnly,
         },
+        {
+          path: `${pathPrefix}/playstation/`,
+          title: t('PlayStation'),
+          show: () => !!(organization && hasTempestAccess(organization)) && !isSelfHosted,
+        },
       ],
     },
     {
diff --git a/static/app/views/settings/project/projectEnvironments.spec.tsx b/static/app/views/settings/project/projectEnvironments.spec.tsx
index d7c4d7f888cc20..3c99f36b4f66eb 100644
--- a/static/app/views/settings/project/projectEnvironments.spec.tsx
+++ b/static/app/views/settings/project/projectEnvironments.spec.tsx
@@ -131,7 +131,7 @@ describe('ProjectEnvironments', function () {
       // XXX(epurkhiser): In the future we should improve the accessability of
       // lists, because right now there's no way to associate the hide button
       // with its environment
-      await userEvent.click(screen.getAllByRole('button', {name: 'Hide'})[0]);
+      await userEvent.click(screen.getAllByRole('button', {name: 'Hide'})[0]!);
 
       expect(hideMock).toHaveBeenCalledWith(
         `${baseUrl}production/`,
diff --git a/static/app/views/settings/project/projectFilters/index.spec.tsx b/static/app/views/settings/project/projectFilters/index.spec.tsx
index 5716671d7ffbb9..7fbe4bf28cd986 100644
--- a/static/app/views/settings/project/projectFilters/index.spec.tsx
+++ b/static/app/views/settings/project/projectFilters/index.spec.tsx
@@ -92,7 +92,9 @@ describe('ProjectFilters', function () {
     for (const filter of Object.keys(FILTERS)) {
       const mock = createFilterMock(filter);
 
-      await userEvent.click(screen.getByRole('checkbox', {name: FILTERS[filter]}));
+      await userEvent.click(
+        screen.getByRole('checkbox', {name: FILTERS[filter as keyof typeof FILTERS]})
+      );
       expect(mock).toHaveBeenCalledWith(
         getFilterEndpoint(filter),
         expect.objectContaining({
diff --git a/static/app/views/settings/project/projectFilters/projectFiltersChart.tsx b/static/app/views/settings/project/projectFilters/projectFiltersChart.tsx
index 7ad6c8a11966ba..a1fb9c143c10c7 100644
--- a/static/app/views/settings/project/projectFilters/projectFiltersChart.tsx
+++ b/static/app/views/settings/project/projectFilters/projectFiltersChart.tsx
@@ -65,16 +65,16 @@ class ProjectFiltersChart extends Component<Props, State> {
 
   formatData(rawData: UsageSeries) {
     const formattedData = rawData.groups
-      .filter(group => STAT_OPS[group.by.reason])
+      .filter(group => STAT_OPS[group.by.reason!])
       .map(group => {
-        const {title, color} = STAT_OPS[group.by.reason];
+        const {title, color} = STAT_OPS[group.by.reason!];
         return {
           seriesName: title,
           color,
           data: rawData.intervals
             .map((interval, index) => ({
               name: interval,
-              value: group.series['sum(quantity)'][index],
+              value: group.series['sum(quantity)']![index]!,
             }))
             .filter(dataPoint => !!dataPoint.value),
         };
diff --git a/static/app/views/settings/project/projectFilters/projectFiltersSettings.tsx b/static/app/views/settings/project/projectFilters/projectFiltersSettings.tsx
index 85975c024c4e64..ac67e8c42b0a1d 100644
--- a/static/app/views/settings/project/projectFilters/projectFiltersSettings.tsx
+++ b/static/app/views/settings/project/projectFilters/projectFiltersSettings.tsx
@@ -82,7 +82,7 @@ const LEGACY_BROWSER_SUBFILTERS = {
   chrome: {
     icon: iconChrome,
     title: 'Chrome',
-    helpText: 'Version 62 and lower',
+    helpText: 'Version 63 and lower',
     legacy: false,
   },
   safari: {
diff --git a/static/app/views/settings/project/projectKeys/details/index.spec.tsx b/static/app/views/settings/project/projectKeys/details/index.spec.tsx
index 6e10efc3abef30..aa97cf27106a4d 100644
--- a/static/app/views/settings/project/projectKeys/details/index.spec.tsx
+++ b/static/app/views/settings/project/projectKeys/details/index.spec.tsx
@@ -24,6 +24,20 @@ describe('ProjectKeyDetails', function () {
   let putMock: jest.Mock;
   let projectKeys: ProjectKey[];
 
+  function renderProjectKeyDetails() {
+    render(
+      <ProjectKeyDetails
+        {...routerProps}
+        organization={org}
+        project={project}
+        params={{
+          keyId: projectKeys[0]!.id,
+          projectId: project.slug,
+        }}
+      />
+    );
+  }
+
   beforeEach(function () {
     org = OrganizationFixture();
     project = ProjectFixture();
@@ -31,16 +45,16 @@ describe('ProjectKeyDetails', function () {
 
     MockApiClient.clearMockResponses();
     MockApiClient.addMockResponse({
-      url: `/projects/${org.slug}/${project.slug}/keys/${projectKeys[0].id}/`,
+      url: `/projects/${org.slug}/${project.slug}/keys/${projectKeys[0]!.id}/`,
       method: 'GET',
       body: projectKeys[0],
     });
     putMock = MockApiClient.addMockResponse({
-      url: `/projects/${org.slug}/${project.slug}/keys/${projectKeys[0].id}/`,
+      url: `/projects/${org.slug}/${project.slug}/keys/${projectKeys[0]!.id}/`,
       method: 'PUT',
     });
     statsMock = MockApiClient.addMockResponse({
-      url: `/projects/${org.slug}/${project.slug}/keys/${projectKeys[0].id}/stats/`,
+      url: `/projects/${org.slug}/${project.slug}/keys/${projectKeys[0]!.id}/stats/`,
       method: 'GET',
       body: [
         {filtered: 0, accepted: 0, total: 0, ts: 1517270400, dropped: 0},
@@ -77,35 +91,25 @@ describe('ProjectKeyDetails', function () {
       ],
     });
     deleteMock = MockApiClient.addMockResponse({
-      url: `/projects/${org.slug}/${project.slug}/keys/${projectKeys[0].id}/`,
+      url: `/projects/${org.slug}/${project.slug}/keys/${projectKeys[0]!.id}/`,
       method: 'DELETE',
     });
-
-    render(
-      <ProjectKeyDetails
-        {...routerProps}
-        organization={org}
-        project={project}
-        params={{
-          keyId: projectKeys[0].id,
-          projectId: project.slug,
-        }}
-      />
-    );
   });
 
   it('has stats box', async function () {
+    renderProjectKeyDetails();
     expect(await screen.findByText('Key Details')).toBeInTheDocument();
     expect(statsMock).toHaveBeenCalled();
   });
 
   it('changes name', async function () {
+    renderProjectKeyDetails();
     await userEvent.clear(await screen.findByRole('textbox', {name: 'Name'}));
     await userEvent.type(await screen.findByRole('textbox', {name: 'Name'}), 'New Name');
     await userEvent.tab();
 
     expect(putMock).toHaveBeenCalledWith(
-      `/projects/${org.slug}/${project.slug}/keys/${projectKeys[0].id}/`,
+      `/projects/${org.slug}/${project.slug}/keys/${projectKeys[0]!.id}/`,
       expect.objectContaining({
         data: {
           name: 'New Name',
@@ -115,10 +119,11 @@ describe('ProjectKeyDetails', function () {
   });
 
   it('disable and enables key', async function () {
+    renderProjectKeyDetails();
     await userEvent.click(await screen.findByRole('checkbox', {name: 'Enabled'}));
 
     expect(putMock).toHaveBeenCalledWith(
-      `/projects/${org.slug}/${project.slug}/keys/${projectKeys[0].id}/`,
+      `/projects/${org.slug}/${project.slug}/keys/${projectKeys[0]!.id}/`,
       expect.objectContaining({
         data: {isActive: false},
       })
@@ -127,7 +132,7 @@ describe('ProjectKeyDetails', function () {
     await userEvent.click(await screen.findByRole('checkbox', {name: 'Enabled'}));
 
     expect(putMock).toHaveBeenCalledWith(
-      `/projects/${org.slug}/${project.slug}/keys/${projectKeys[0].id}/`,
+      `/projects/${org.slug}/${project.slug}/keys/${projectKeys[0]!.id}/`,
       expect.objectContaining({
         data: {isActive: false},
       })
@@ -135,6 +140,7 @@ describe('ProjectKeyDetails', function () {
   });
 
   it('revokes a key', async function () {
+    renderProjectKeyDetails();
     await userEvent.click(await screen.findByRole('button', {name: 'Revoke Key'}));
     renderGlobalModal();
     await userEvent.click(await screen.findByTestId('confirm-button'));
diff --git a/static/app/views/settings/project/projectKeys/list/index.spec.tsx b/static/app/views/settings/project/projectKeys/list/index.spec.tsx
index e10824c2965ee7..c7a086af2afaa4 100644
--- a/static/app/views/settings/project/projectKeys/list/index.spec.tsx
+++ b/static/app/views/settings/project/projectKeys/list/index.spec.tsx
@@ -25,7 +25,7 @@ describe('ProjectKeys', function () {
       body: projectKeys,
     });
     deleteMock = MockApiClient.addMockResponse({
-      url: `/projects/${organization.slug}/${project.slug}/keys/${projectKeys[0].id}/`,
+      url: `/projects/${organization.slug}/${project.slug}/keys/${projectKeys[0]!.id}/`,
       method: 'DELETE',
     });
   });
@@ -79,7 +79,7 @@ describe('ProjectKeys', function () {
     );
 
     const allDsn = screen.getAllByRole('textbox', {name: 'DSN URL'});
-    expect(allDsn.length).toBe(1);
+    expect(allDsn).toHaveLength(1);
 
     const expandButton = screen.getByRole('button', {name: 'Expand'});
     const dsn = screen.getByRole('textbox', {name: 'DSN URL'});
@@ -94,11 +94,11 @@ describe('ProjectKeys', function () {
     });
 
     expect(expandButton).toBeInTheDocument();
-    expect(dsn).toHaveValue(projectKeys[0].dsn.public);
-    expect(minidumpEndpoint).toHaveValue(projectKeys[0].dsn.minidump);
+    expect(dsn).toHaveValue(projectKeys[0]!.dsn.public);
+    expect(minidumpEndpoint).toHaveValue(projectKeys[0]!.dsn.minidump);
     // this is empty in the default ProjectKey
     expect(unrealEndpoint).toHaveValue('');
-    expect(securityHeaderEndpoint).toHaveValue(projectKeys[0].dsn.security);
+    expect(securityHeaderEndpoint).toHaveValue(projectKeys[0]!.dsn.security);
   });
 
   it('renders for javascript project', function () {
@@ -124,7 +124,7 @@ describe('ProjectKeys', function () {
     });
 
     expect(expandButton).not.toBeInTheDocument();
-    expect(dsn).toHaveValue(projectKeys[0].dsn.public);
+    expect(dsn).toHaveValue(projectKeys[0]!.dsn.public);
     expect(minidumpEndpoint).not.toBeInTheDocument();
     expect(unrealEndpoint).not.toBeInTheDocument();
     expect(securityHeaderEndpoint).not.toBeInTheDocument();
@@ -135,7 +135,7 @@ describe('ProjectKeys', function () {
       name: 'Loader Script',
     });
     expect(loaderScript).toHaveValue(
-      `<script src='${projectKeys[0].dsn.cdn}' crossorigin="anonymous"></script>`
+      `<script src='${projectKeys[0]!.dsn.cdn}' crossorigin="anonymous"></script>`
     );
   });
 
@@ -162,7 +162,7 @@ describe('ProjectKeys', function () {
     });
 
     expect(expandButton).not.toBeInTheDocument();
-    expect(dsn).toHaveValue(projectKeys[0].dsn.public);
+    expect(dsn).toHaveValue(projectKeys[0]!.dsn.public);
     expect(minidumpEndpoint).not.toBeInTheDocument();
     expect(unrealEndpoint).not.toBeInTheDocument();
     expect(securityHeaderEndpoint).not.toBeInTheDocument();
@@ -228,7 +228,7 @@ describe('ProjectKeys', function () {
     );
 
     const allDsn = screen.getAllByRole('textbox', {name: 'DSN URL'});
-    expect(allDsn.length).toBe(2);
+    expect(allDsn).toHaveLength(2);
   });
 
   it('deletes key', async function () {
@@ -259,7 +259,7 @@ describe('ProjectKeys', function () {
     );
 
     const enableMock = MockApiClient.addMockResponse({
-      url: `/projects/${organization.slug}/${project.slug}/keys/${projectKeys[0].id}/`,
+      url: `/projects/${organization.slug}/${project.slug}/keys/${projectKeys[0]!.id}/`,
       method: 'PUT',
     });
 
diff --git a/static/app/views/settings/project/projectOwnership/addCodeOwnerModal.tsx b/static/app/views/settings/project/projectOwnership/addCodeOwnerModal.tsx
index 88c13069dca20c..3134eb6ff61341 100644
--- a/static/app/views/settings/project/projectOwnership/addCodeOwnerModal.tsx
+++ b/static/app/views/settings/project/projectOwnership/addCodeOwnerModal.tsx
@@ -153,7 +153,9 @@ class AddCodeOwnerModal extends DeprecatedAsyncComponent<Props, State> {
     const {errorJSON, codeMappingId, codeMappings} = this.state;
     const codeMapping = codeMappings.find(mapping => mapping.id === codeMappingId);
     const {integrationId, provider} = codeMapping as RepositoryProjectPathConfig;
-    const errActors = errorJSON?.raw?.[0].split('\n').map((el, i) => <p key={i}>{el}</p>);
+    const errActors = errorJSON?.raw?.[0]!.split('\n').map((el, i) => (
+      <p key={i}>{el}</p>
+    ));
     return (
       <Alert type="error" showIcon>
         {errActors}
diff --git a/static/app/views/settings/project/projectOwnership/index.spec.tsx b/static/app/views/settings/project/projectOwnership/index.spec.tsx
index f9c84d1339bcf8..0e49935b04e188 100644
--- a/static/app/views/settings/project/projectOwnership/index.spec.tsx
+++ b/static/app/views/settings/project/projectOwnership/index.spec.tsx
@@ -60,7 +60,7 @@ describe('Project Ownership', () => {
 
       expect(await screen.findByTestId('project-permission-alert')).toBeInTheDocument();
       expect(screen.queryByRole('button', {name: 'Edit Rules'})).toBeEnabled();
-      // eslint-disable-next-line jest-dom/prefer-in-document
+
       expect(screen.getAllByTestId('project-permission-alert')).toHaveLength(1);
     });
   });
diff --git a/static/app/views/settings/project/projectOwnership/modal.spec.tsx b/static/app/views/settings/project/projectOwnership/modal.spec.tsx
index 071902f289bdb3..74b3fb9abe800d 100644
--- a/static/app/views/settings/project/projectOwnership/modal.spec.tsx
+++ b/static/app/views/settings/project/projectOwnership/modal.spec.tsx
@@ -52,7 +52,7 @@ describe('Project Ownership', () => {
       },
     });
     // Set one frame to in-app
-    stacktrace.data.frames![0].inApp = true;
+    stacktrace.data.frames![0]!.inApp = true;
     MockApiClient.addMockResponse({
       url: `/organizations/${org.slug}/members/`,
       body: MembersFixture(),
diff --git a/static/app/views/settings/project/projectOwnership/ownershipRulesTable.spec.tsx b/static/app/views/settings/project/projectOwnership/ownershipRulesTable.spec.tsx
index 3e392d111b2a06..62192733ecb37b 100644
--- a/static/app/views/settings/project/projectOwnership/ownershipRulesTable.spec.tsx
+++ b/static/app/views/settings/project/projectOwnership/ownershipRulesTable.spec.tsx
@@ -131,7 +131,7 @@ describe('OwnershipRulesTable', () => {
     await userEvent.click(screen.getByRole('button', {name: 'Clear'}));
 
     expect(screen.getByText('filepath')).toBeInTheDocument();
-    expect(screen.queryByText('mytag')).toBeInTheDocument();
+    expect(screen.getByText('mytag')).toBeInTheDocument();
   });
 
   it('preserves selected teams when rules are updated', async () => {
diff --git a/static/app/views/settings/project/projectOwnership/selectOwners.tsx b/static/app/views/settings/project/projectOwnership/selectOwners.tsx
deleted file mode 100644
index b1c633c6675b3b..00000000000000
--- a/static/app/views/settings/project/projectOwnership/selectOwners.tsx
+++ /dev/null
@@ -1,334 +0,0 @@
-import {Component, createRef} from 'react';
-import {findDOMNode} from 'react-dom';
-import type {MultiValueProps} from 'react-select';
-import styled from '@emotion/styled';
-import debounce from 'lodash/debounce';
-import isEqual from 'lodash/isEqual';
-
-import {addTeamToProject} from 'sentry/actionCreators/projects';
-import type {Client} from 'sentry/api';
-import ActorAvatar from 'sentry/components/avatar/actorAvatar';
-import {Button} from 'sentry/components/button';
-import SelectControl from 'sentry/components/forms/controls/selectControl';
-import IdBadge from 'sentry/components/idBadge';
-import {Tooltip} from 'sentry/components/tooltip';
-import {IconAdd} from 'sentry/icons';
-import {t} from 'sentry/locale';
-import MemberListStore from 'sentry/stores/memberListStore';
-import ProjectsStore from 'sentry/stores/projectsStore';
-import TeamStore from 'sentry/stores/teamStore';
-import {space} from 'sentry/styles/space';
-import type {Actor} from 'sentry/types/core';
-import type {Member, Organization, Team} from 'sentry/types/organization';
-import type {Project} from 'sentry/types/project';
-import type {User} from 'sentry/types/user';
-import {buildTeamId, buildUserId} from 'sentry/utils';
-import withApi from 'sentry/utils/withApi';
-import withProjects from 'sentry/utils/withProjects';
-
-export type Owner = {
-  actor: Actor;
-  label: React.ReactNode;
-  searchKey: string;
-  value: string;
-  disabled?: boolean;
-};
-
-function ValueComponent({data, removeProps}: MultiValueProps<Owner>) {
-  return (
-    <ValueWrapper onClick={removeProps.onClick}>
-      <ActorAvatar actor={data.actor} size={28} />
-    </ValueWrapper>
-  );
-}
-
-const getSearchKeyForUser = (user: User) =>
-  `${user.email?.toLowerCase()} ${user.name?.toLowerCase()}`;
-
-type Props = {
-  api: Client;
-  disabled: boolean;
-  onChange: (owners: Owner[]) => void;
-  organization: Organization;
-  project: Project;
-  projects: Project[];
-  value: any;
-  onInputChange?: (text: string) => void;
-};
-
-type State = {
-  inputValue: string;
-  loading: boolean;
-};
-
-class SelectOwners extends Component<Props, State> {
-  state: State = {
-    loading: false,
-    inputValue: '',
-  };
-
-  componentDidUpdate(prevProps: Props) {
-    // Once a team has been added to the project the menu can be closed.
-    if (!isEqual(this.props.projects, prevProps.projects)) {
-      this.closeSelectMenu();
-    }
-  }
-
-  private selectRef = createRef<any>();
-
-  renderUserBadge = (user: User) => (
-    <IdBadge avatarSize={24} user={user} hideEmail disableLink />
-  );
-
-  createMentionableUser = (user: User): Owner => ({
-    value: buildUserId(user.id),
-    label: this.renderUserBadge(user),
-    searchKey: getSearchKeyForUser(user),
-    actor: {
-      type: 'user' as const,
-      id: user.id,
-      name: user.name,
-    },
-  });
-
-  createUnmentionableUser = ({user}): Owner => ({
-    ...this.createMentionableUser(user),
-    disabled: true,
-    label: (
-      <DisabledLabel>
-        <Tooltip
-          position="left"
-          title={t('%s is not a member of project', user.name || user.email)}
-        >
-          {this.renderUserBadge(user)}
-        </Tooltip>
-      </DisabledLabel>
-    ),
-  });
-
-  createMentionableTeam = (team: Team): Owner => ({
-    value: buildTeamId(team.id),
-    label: <IdBadge team={team} />,
-    searchKey: `#${team.slug}`,
-    actor: {
-      type: 'team' as const,
-      id: team.id,
-      name: team.slug,
-    },
-  });
-
-  createUnmentionableTeam = (team: Team): Owner => {
-    const {organization} = this.props;
-    const canAddTeam = organization.access.includes('project:write');
-
-    return {
-      ...this.createMentionableTeam(team),
-      disabled: true,
-      label: (
-        <Container>
-          <DisabledLabel>
-            <Tooltip
-              position="left"
-              title={t('%s is not a member of project', `#${team.slug}`)}
-            >
-              <IdBadge team={team} />
-            </Tooltip>
-          </DisabledLabel>
-          <Tooltip
-            title={
-              canAddTeam
-                ? t('Add %s to project', `#${team.slug}`)
-                : t('You do not have permission to add team to project.')
-            }
-          >
-            <AddToProjectButton
-              size="zero"
-              borderless
-              disabled={!canAddTeam}
-              onClick={this.handleAddTeamToProject.bind(this, team)}
-              icon={<IconAdd isCircled />}
-              aria-label={t('Add %s to project', `#${team.slug}`)}
-            />
-          </Tooltip>
-        </Container>
-      ),
-    };
-  };
-
-  getMentionableUsers() {
-    return MemberListStore.getAll().map(this.createMentionableUser);
-  }
-
-  getMentionableTeams() {
-    const {project} = this.props;
-    const projectData = ProjectsStore.getBySlug(project.slug);
-
-    if (!projectData) {
-      return [];
-    }
-
-    return projectData.teams.map(this.createMentionableTeam);
-  }
-
-  /**
-   * Get list of teams that are not in the current project, for use in `MultiSelectMenu`
-   */
-  getTeamsNotInProject(teamsInProject: Owner[] = []) {
-    const teams = TeamStore.getAll() || [];
-    const excludedTeamIds = teamsInProject.map(({actor}) => actor.id);
-
-    return teams
-      .filter(team => !excludedTeamIds.includes(team.id))
-      .map(this.createUnmentionableTeam);
-  }
-
-  /**
-   * Closes the select menu by blurring input if possible since that seems to be the only
-   * way to close it.
-   */
-  closeSelectMenu() {
-    // Close select menu
-    if (this.selectRef.current) {
-      // eslint-disable-next-line react/no-find-dom-node
-      const node = findDOMNode(this.selectRef.current);
-      const input: HTMLInputElement | null = (node as Element)?.querySelector(
-        '.Select-input input'
-      );
-      if (input) {
-        // I don't think there's another way to close `react-select`
-        input.blur();
-      }
-    }
-  }
-
-  async handleAddTeamToProject(team) {
-    const {api, organization, project, value} = this.props;
-    // Copy old value
-    const oldValue = [...value];
-
-    // Optimistic update
-    this.props.onChange([...this.props.value, this.createMentionableTeam(team)]);
-
-    try {
-      // Try to add team to project
-      // Note: we can't close select menu here because we have to wait for ProjectsStore to update first
-      // The reason for this is because we have little control over `react-select`'s `AsyncSelect`
-      // We can't control when `handleLoadOptions` gets called, but it gets called when select closes, so
-      // wait for store to update before closing the menu. Otherwise, we'll have stale items in the select menu
-      await addTeamToProject(api, organization.slug, project.slug, team);
-    } catch (err) {
-      // Unable to add team to project, revert select menu value
-      this.props.onChange(oldValue);
-      this.closeSelectMenu();
-    }
-  }
-
-  handleChange = (newValue: Owner[]) => {
-    this.props.onChange(newValue);
-  };
-
-  handleInputChange = (inputValue: string) => {
-    this.setState({inputValue});
-
-    if (this.props.onInputChange) {
-      this.props.onInputChange(inputValue);
-    }
-  };
-
-  queryMembers = debounce((query, cb) => {
-    const {api, organization} = this.props;
-
-    // Because this function is debounced, the component can potentially be
-    // unmounted before this fires, in which case, `this.api` is null
-    if (!api) {
-      return null;
-    }
-
-    return api
-      .requestPromise(`/organizations/${organization.slug}/members/`, {
-        query: {query},
-      })
-      .then(
-        (data: Member[]) => cb(null, data),
-        err => cb(err)
-      );
-  }, 250);
-
-  handleLoadOptions = () => {
-    const usersInProject = this.getMentionableUsers();
-    const teamsInProject = this.getMentionableTeams();
-    const teamsNotInProject = this.getTeamsNotInProject(teamsInProject);
-    const usersInProjectById = usersInProject.map(({actor}) => actor.id);
-
-    // Return a promise for `react-select`
-    return new Promise((resolve, reject) => {
-      this.queryMembers(this.state.inputValue, (err, result) => {
-        if (err) {
-          reject(err);
-        } else {
-          resolve(result);
-        }
-      });
-    })
-      .then(members =>
-        // Be careful here as we actually want the `users` object, otherwise it means user
-        // has not registered for sentry yet, but has been invited
-        members
-          ? (members as Member[])
-              .filter(({user}) => user && !usersInProjectById.includes(user.id))
-              .map(this.createUnmentionableUser)
-          : []
-      )
-      .then(members => {
-        return [...usersInProject, ...teamsInProject, ...teamsNotInProject, ...members];
-      });
-  };
-
-  render() {
-    return (
-      <SelectControl
-        multiple
-        name="owners"
-        filterOption={(option, filterText) =>
-          option.data.searchKey.indexOf(filterText) > -1
-        }
-        ref={this.selectRef}
-        loadOptions={this.handleLoadOptions}
-        defaultOptions
-        async
-        clearable
-        disabled={this.props.disabled}
-        cache={false}
-        aria-label={t('Rule owner')}
-        placeholder={t('Owners')}
-        components={{
-          MultiValue: ValueComponent,
-        }}
-        onInputChange={this.handleInputChange}
-        onChange={this.handleChange}
-        value={this.props.value}
-        css={{width: 300}}
-      />
-    );
-  }
-}
-
-export default withApi(withProjects(SelectOwners));
-
-const Container = styled('div')`
-  display: flex;
-  justify-content: space-between;
-`;
-
-const DisabledLabel = styled('div')`
-  opacity: 0.5;
-  overflow: hidden; /* Needed so that "Add to team" button can fit */
-`;
-
-const AddToProjectButton = styled(Button)`
-  flex-shrink: 0;
-`;
-
-const ValueWrapper = styled('a')`
-  margin-right: ${space(0.5)};
-`;
diff --git a/static/app/views/settings/project/projectOwnership/viewCodeOwnerModal.spec.tsx b/static/app/views/settings/project/projectOwnership/viewCodeOwnerModal.spec.tsx
index 0ff1674cd12698..bbfe57ac31b762 100644
--- a/static/app/views/settings/project/projectOwnership/viewCodeOwnerModal.spec.tsx
+++ b/static/app/views/settings/project/projectOwnership/viewCodeOwnerModal.spec.tsx
@@ -5,7 +5,9 @@ import {render, screen} from 'sentry-test/reactTestingLibrary';
 import ViewCodeOwnerModal from './viewCodeOwnerModal';
 
 describe('ViewCodeOwnerModal', () => {
-  const mockComponent: any = ({children}) => <div>{children}</div>;
+  const mockComponent: any = ({children}: {children: React.ReactNode}) => (
+    <div>{children}</div>
+  );
 
   it('should display parsed codeowners file', () => {
     const ownershipSyntax = `codeowners:/src/sentry/migrations/ #developer-infrastructure\n`;
diff --git a/static/app/views/settings/project/projectTeams.spec.tsx b/static/app/views/settings/project/projectTeams.spec.tsx
index 4aeaa73fbcc713..19ad0752822651 100644
--- a/static/app/views/settings/project/projectTeams.spec.tsx
+++ b/static/app/views/settings/project/projectTeams.spec.tsx
@@ -96,7 +96,7 @@ describe('ProjectTeams', function () {
 
     expect(mock1).not.toHaveBeenCalled();
 
-    await userEvent.click(screen.getAllByRole('button', {name: 'Remove'})[0]);
+    await userEvent.click(screen.getAllByRole('button', {name: 'Remove'})[0]!);
 
     renderGlobalModal();
     expect(screen.getByRole('dialog')).toBeInTheDocument();
@@ -113,7 +113,7 @@ describe('ProjectTeams', function () {
     expect(screen.queryByText('#team-slug')).not.toBeInTheDocument();
 
     // Remove second team
-    await userEvent.click(screen.getAllByRole('button', {name: 'Remove'})[0]);
+    await userEvent.click(screen.getAllByRole('button', {name: 'Remove'})[0]!);
     await userEvent.click(screen.getByText('Remove Team'));
     await waitFor(() => {
       expect(mock2).toHaveBeenCalledWith(
@@ -151,7 +151,7 @@ describe('ProjectTeams', function () {
     expect(await screen.findByText('Project Teams for project-slug')).toBeInTheDocument();
 
     // Remove first team
-    await userEvent.click(screen.getAllByRole('button', {name: 'Remove'})[0]);
+    await userEvent.click(screen.getAllByRole('button', {name: 'Remove'})[0]!);
     renderGlobalModal();
     await userEvent.click(screen.getByText('Remove Team'));
     await waitFor(() => {
@@ -165,7 +165,7 @@ describe('ProjectTeams', function () {
     expect(screen.queryByText('#team-slug')).not.toBeInTheDocument();
 
     // Remove third team, but button should be disabled
-    await userEvent.click(screen.getAllByRole('button', {name: 'Remove'})[1]);
+    await userEvent.click(screen.getAllByRole('button', {name: 'Remove'})[1]!);
     expect(mock3).not.toHaveBeenCalled();
   });
 
@@ -201,7 +201,7 @@ describe('ProjectTeams', function () {
     expect(mock1).not.toHaveBeenCalled();
 
     // Remove first team
-    await userEvent.click(screen.getAllByRole('button', {name: 'Remove'})[0]);
+    await userEvent.click(screen.getAllByRole('button', {name: 'Remove'})[0]!);
     renderGlobalModal();
     await userEvent.click(screen.getByText('Remove Team'));
     await waitFor(() => {
@@ -215,7 +215,7 @@ describe('ProjectTeams', function () {
     expect(screen.queryByText('#team-slug')).not.toBeInTheDocument();
 
     // Remove second team
-    await userEvent.click(screen.getAllByRole('button', {name: 'Remove'})[0]);
+    await userEvent.click(screen.getAllByRole('button', {name: 'Remove'})[0]!);
 
     // Modal opens because this is the last team in project
     expect(screen.getByRole('dialog')).toBeInTheDocument();
@@ -248,7 +248,7 @@ describe('ProjectTeams', function () {
     expect(mock).not.toHaveBeenCalled();
 
     // Add a team
-    await userEvent.click(screen.getAllByRole('button', {name: 'Add Team'})[1]);
+    await userEvent.click(screen.getAllByRole('button', {name: 'Add Team'})[1]!);
     await userEvent.click(screen.getByText('#team-slug-2'));
 
     await waitFor(() => {
@@ -285,7 +285,7 @@ describe('ProjectTeams', function () {
     expect(await screen.findByText('Project Teams for project-slug')).toBeInTheDocument();
 
     // Add new team
-    await userEvent.click(screen.getAllByRole('button', {name: 'Add Team'})[1]);
+    await userEvent.click(screen.getAllByRole('button', {name: 'Add Team'})[1]!);
 
     // XXX(epurkhiser): Create Team should really be a button
     await userEvent.click(screen.getByRole('link', {name: 'Create Team'}));
diff --git a/static/app/views/settings/project/projectToolbar.spec.tsx b/static/app/views/settings/project/projectToolbar.spec.tsx
index 26ed685a0a917a..d45f7380f354e2 100644
--- a/static/app/views/settings/project/projectToolbar.spec.tsx
+++ b/static/app/views/settings/project/projectToolbar.spec.tsx
@@ -4,7 +4,11 @@ import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 import ProjectToolbarSettings from 'sentry/views/settings/project/projectToolbar';
 
 describe('ProjectToolbarSettings', function () {
-  const {routerProps, organization, project, router} = initializeOrg();
+  const {routerProps, organization, project, router} = initializeOrg({
+    organization: {
+      features: ['dev-toolbar-ui'],
+    },
+  });
   const url = `/projects/${organization.slug}/${project.slug}/`;
 
   beforeEach(function () {
diff --git a/static/app/views/settings/project/projectToolbar.tsx b/static/app/views/settings/project/projectToolbar.tsx
index c4d662686395f5..d3157ff55a9d48 100644
--- a/static/app/views/settings/project/projectToolbar.tsx
+++ b/static/app/views/settings/project/projectToolbar.tsx
@@ -1,7 +1,9 @@
 import Access from 'sentry/components/acl/access';
+import Feature from 'sentry/components/acl/feature';
 import Form from 'sentry/components/forms/form';
 import JsonForm from 'sentry/components/forms/jsonForm';
 import type {JsonFormObject} from 'sentry/components/forms/types';
+import {NoAccess} from 'sentry/components/noAccess';
 import SentryDocumentTitle from 'sentry/components/sentryDocumentTitle';
 import {t} from 'sentry/locale';
 import type {RouteComponentProps} from 'sentry/types/legacyReactRouter';
@@ -28,6 +30,7 @@ function ProjectToolbarSettings({organization, project, params: {projectId}}: Pr
           type: 'textarea',
           rows: 3,
           autosize: true,
+          formatMessageValue: false,
 
           // additional data/props that is related to rendering of form field rather than data
           label: t('Allowed Origins'),
@@ -43,24 +46,30 @@ function ProjectToolbarSettings({organization, project, params: {projectId}}: Pr
   return (
     <SentryDocumentTitle title={t('Toolbar Settings')} projectSlug={project.slug}>
       <SettingsPageHeader title={t('Developer Toolbar')} />
-      <PermissionAlert project={project} />
-
-      <Form
-        apiMethod="PUT"
-        apiEndpoint={`/projects/${organization.slug}/${projectId}/`}
-        initialData={project.options}
-        saveOnBlur
+      <Feature
+        features="dev-toolbar-ui"
+        organization={organization}
+        renderDisabled={NoAccess}
       >
-        <Access access={['project:write']} project={project}>
-          {({hasAccess}) => (
-            <JsonForm
-              disabled={!hasAccess}
-              features={new Set(organization.features)}
-              forms={formGroups}
-            />
-          )}
-        </Access>
-      </Form>
+        <PermissionAlert project={project} />
+
+        <Form
+          apiMethod="PUT"
+          apiEndpoint={`/projects/${organization.slug}/${projectId}/`}
+          initialData={project.options}
+          saveOnBlur
+        >
+          <Access access={['project:write']} project={project}>
+            {({hasAccess}) => (
+              <JsonForm
+                disabled={!hasAccess}
+                features={new Set(organization.features)}
+                forms={formGroups}
+              />
+            )}
+          </Access>
+        </Form>
+      </Feature>
     </SentryDocumentTitle>
   );
 }
diff --git a/static/app/views/settings/project/tempest/CredentialRow.tsx b/static/app/views/settings/project/tempest/CredentialRow.tsx
new file mode 100644
index 00000000000000..8891380d9d1230
--- /dev/null
+++ b/static/app/views/settings/project/tempest/CredentialRow.tsx
@@ -0,0 +1,24 @@
+import {Fragment} from 'react';
+
+import {Flex} from 'sentry/components/container/flex';
+import TimeSince from 'sentry/components/timeSince';
+
+import type {TempestCredentials} from './types';
+
+export function CredentialRow({credential}: {credential: TempestCredentials}) {
+  return (
+    <Fragment>
+      <Flex align="center">{credential.clientId}</Flex>
+
+      <Flex align="center">{credential.clientSecret}</Flex>
+
+      <Flex align="center">
+        <TimeSince date={credential.dateAdded} />
+      </Flex>
+
+      <Flex align="center">
+        {credential.createdByEmail ? credential.createdByEmail : '\u2014'}
+      </Flex>
+    </Fragment>
+  );
+}
diff --git a/static/app/views/settings/project/tempest/addTempestCredentialsForm.tsx b/static/app/views/settings/project/tempest/addTempestCredentialsForm.tsx
new file mode 100644
index 00000000000000..553bfaeef05066
--- /dev/null
+++ b/static/app/views/settings/project/tempest/addTempestCredentialsForm.tsx
@@ -0,0 +1,57 @@
+import {Fragment} from 'react';
+
+import TextField from 'sentry/components/forms/fields/textField';
+import Form from 'sentry/components/forms/form';
+import {t} from 'sentry/locale';
+import type {Organization} from 'sentry/types/organization';
+import type {Project} from 'sentry/types/project';
+
+type Payload = {
+  clientId: string;
+  clientSecret: string;
+};
+
+type Props = {
+  organization: Organization;
+  project: Project;
+  formProps?: Partial<typeof Form>;
+  onSuccess?: (data: Payload) => void;
+};
+
+export default function AddTempestCredentialsForm({
+  organization,
+  project,
+  formProps,
+  ...props
+}: Props) {
+  return (
+    <Fragment>
+      <Form
+        submitLabel={t('Add Credentials')}
+        apiEndpoint={`/projects/${organization.slug}/${project.slug}/tempest-credentials/`}
+        apiMethod="POST"
+        onSubmitSuccess={data => props.onSuccess?.(data)}
+        requireChanges
+        data-test-id="add-tempest-credentials-form"
+        {...formProps}
+      >
+        <TextField
+          name="clientId"
+          label={t('Client ID')}
+          required
+          stacked
+          flexibleControlStateSize
+          inline={false}
+        />
+        <TextField
+          name="clientSecret"
+          label={t('Client Secret')}
+          required
+          stacked
+          flexibleControlStateSize
+          inline={false}
+        />
+      </Form>
+    </Fragment>
+  );
+}
diff --git a/static/app/views/settings/project/tempest/hooks/useFetchTempestCredentials.ts b/static/app/views/settings/project/tempest/hooks/useFetchTempestCredentials.ts
new file mode 100644
index 00000000000000..ec817384c52999
--- /dev/null
+++ b/static/app/views/settings/project/tempest/hooks/useFetchTempestCredentials.ts
@@ -0,0 +1,39 @@
+import type {Organization} from 'sentry/types/organization';
+import type {Project} from 'sentry/types/project';
+import {useApiQuery, useQueryClient} from 'sentry/utils/queryClient';
+
+import type {TempestCredentials} from '../types';
+
+const makeFetchTempestCredentialsQueryKey = ({
+  orgSlug,
+  projectSlug,
+}: {
+  orgSlug: string;
+  projectSlug: string;
+}) => [`/projects/${orgSlug}/${projectSlug}/tempest-credentials/`] as const;
+
+export function useFetchTempestCredentials(organization: Organization, project: Project) {
+  const tempestCredentialsQuery = useApiQuery<TempestCredentials[]>(
+    makeFetchTempestCredentialsQueryKey({
+      orgSlug: organization.slug,
+      projectSlug: project.slug,
+    }),
+    {staleTime: Infinity}
+  );
+
+  const queryClient = useQueryClient();
+
+  const invalidateCredentialsCache = () => {
+    queryClient.invalidateQueries({
+      queryKey: makeFetchTempestCredentialsQueryKey({
+        orgSlug: organization.slug,
+        projectSlug: project.slug,
+      }),
+    });
+  };
+
+  return {
+    ...tempestCredentialsQuery,
+    invalidateCredentialsCache,
+  };
+}
diff --git a/static/app/views/settings/project/tempest/index.tsx b/static/app/views/settings/project/tempest/index.tsx
new file mode 100644
index 00000000000000..6df345f849c991
--- /dev/null
+++ b/static/app/views/settings/project/tempest/index.tsx
@@ -0,0 +1,103 @@
+import {Fragment} from 'react';
+
+import {openAddTempestCredentialsModal} from 'sentry/actionCreators/modal';
+import Alert from 'sentry/components/alert';
+import {Button} from 'sentry/components/button';
+import Form from 'sentry/components/forms/form';
+import JsonForm from 'sentry/components/forms/jsonForm';
+import {PanelTable} from 'sentry/components/panels/panelTable';
+import SentryDocumentTitle from 'sentry/components/sentryDocumentTitle';
+import {Tooltip} from 'sentry/components/tooltip';
+import {t} from 'sentry/locale';
+import type {Organization} from 'sentry/types/organization';
+import type {Project} from 'sentry/types/project';
+import {hasTempestAccess} from 'sentry/utils/tempest/features';
+import SettingsPageHeader from 'sentry/views/settings/components/settingsPageHeader';
+import {useFetchTempestCredentials} from 'sentry/views/settings/project/tempest/hooks/useFetchTempestCredentials';
+import {useHasTempestWriteAccess} from 'sentry/views/settings/project/tempest/utils/access';
+
+import {CredentialRow} from './CredentialRow';
+
+interface Props {
+  organization: Organization;
+  project: Project;
+}
+
+export default function TempestSettings({organization, project}: Props) {
+  const hasWriteAccess = useHasTempestWriteAccess();
+  const {data: tempestCredentials, isLoading} = useFetchTempestCredentials(
+    organization,
+    project
+  );
+
+  if (!hasTempestAccess(organization)) {
+    return <Alert type="warning">{t("You don't have access to this feature")}</Alert>;
+  }
+
+  return (
+    <Fragment>
+      <SentryDocumentTitle title={t('PlayStation')} />
+      <SettingsPageHeader
+        title={t('PlayStation')}
+        action={addNewCredentials(hasWriteAccess, organization, project)}
+      />
+
+      <Form
+        apiMethod="PUT"
+        apiEndpoint={`/organizations/${organization.slug}/`}
+        initialData={{
+          tempestFetchScreenshots: project.options?.tempestFetchScreenshots,
+        }}
+        saveOnBlur
+        hideFooter
+      >
+        <JsonForm
+          forms={[
+            {
+              title: t('General Settings'),
+              fields: [
+                {
+                  name: 'tempestFetchScreenshots',
+                  type: 'boolean',
+                  label: t('Fetch Screenshots'),
+                  help: t('Allow Tempest to fetch screenshots for the project.'),
+                },
+              ],
+            },
+          ]}
+        />
+      </Form>
+
+      <PanelTable
+        headers={[t('Client ID'), t('Client Secret'), t('Created At'), t('Created By')]}
+        isLoading={isLoading}
+        isEmpty={!tempestCredentials?.length}
+      >
+        {tempestCredentials?.map(credential => (
+          <CredentialRow key={credential.id} credential={credential} />
+        ))}
+      </PanelTable>
+    </Fragment>
+  );
+}
+
+const addNewCredentials = (
+  hasWriteAccess: boolean,
+  organization: Organization,
+  project: Project
+) => (
+  <Tooltip
+    title={t('You must be an organization admin to add new credentials.')}
+    disabled={hasWriteAccess}
+  >
+    <Button
+      priority="primary"
+      size="sm"
+      data-test-id="create-new-credentials"
+      disabled={!hasWriteAccess}
+      onClick={() => openAddTempestCredentialsModal({organization, project})}
+    >
+      {t('Add Credentials')}
+    </Button>
+  </Tooltip>
+);
diff --git a/static/app/views/settings/project/tempest/types.ts b/static/app/views/settings/project/tempest/types.ts
new file mode 100644
index 00000000000000..314133728cffae
--- /dev/null
+++ b/static/app/views/settings/project/tempest/types.ts
@@ -0,0 +1,16 @@
+export enum MessageType {
+  SUCCESS = 'success',
+  ERROR = 'error',
+}
+
+export type TempestCredentials = {
+  clientId: string;
+  clientSecret: string;
+  createdByEmail: string;
+  createdById: number;
+  dateAdded: string;
+  dateUpdated: string;
+  id: number;
+  message: string;
+  messageType: MessageType;
+};
diff --git a/static/app/views/settings/project/tempest/utils/access.tsx b/static/app/views/settings/project/tempest/utils/access.tsx
new file mode 100644
index 00000000000000..a007f68a822475
--- /dev/null
+++ b/static/app/views/settings/project/tempest/utils/access.tsx
@@ -0,0 +1,16 @@
+import {useMemo} from 'react';
+
+import {hasEveryAccess} from 'sentry/components/acl/access';
+import type {Scope} from 'sentry/types/core';
+import useOrganization from 'sentry/utils/useOrganization';
+
+const TEMPEST_WRITE_ACCESS: Scope[] = ['org:admin'];
+
+export function useHasTempestWriteAccess() {
+  const organization = useOrganization();
+
+  return useMemo(
+    () => hasEveryAccess(TEMPEST_WRITE_ACCESS, {organization}),
+    [organization]
+  );
+}
diff --git a/static/app/views/settings/projectAlerts/settings.tsx b/static/app/views/settings/projectAlerts/settings.tsx
index c62181cf7c8491..2115260fbe6aab 100644
--- a/static/app/views/settings/projectAlerts/settings.tsx
+++ b/static/app/views/settings/projectAlerts/settings.tsx
@@ -137,13 +137,13 @@ function ProjectAlertSettings({canEditRule, params}: ProjectAlertSettingsProps)
             <JsonForm
               disabled={!canEditRule}
               title={t('Email Settings')}
-              fields={[fields.subjectTemplate]}
+              fields={[fields.subjectTemplate!]}
             />
 
             <JsonForm
               title={t('Digests')}
               disabled={!canEditRule}
-              fields={[fields.digestsMinDelay, fields.digestsMaxDelay]}
+              fields={[fields.digestsMinDelay!, fields.digestsMaxDelay!]}
               renderHeader={() => (
                 <PanelAlert type="info">
                   {t(
diff --git a/static/app/views/settings/projectDebugFiles/sources/customRepositories/details.tsx b/static/app/views/settings/projectDebugFiles/sources/customRepositories/details.tsx
deleted file mode 100644
index a5a10f482dab1f..00000000000000
--- a/static/app/views/settings/projectDebugFiles/sources/customRepositories/details.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import styled from '@emotion/styled';
-
-import NotAvailable from 'sentry/components/notAvailable';
-import {t} from 'sentry/locale';
-import {space} from 'sentry/styles/space';
-
-function Details() {
-  return (
-    <Wrapper>
-      {t('Last detected version')}
-      <Value>
-        <NotAvailable tooltip={t('Not available')} />
-      </Value>
-
-      {t('Last detected build')}
-      <Value>{<NotAvailable tooltip={t('Not available')} />}</Value>
-
-      {t('Detected last build on')}
-      <Value>
-        <NotAvailable tooltip={t('Not available')} />
-      </Value>
-    </Wrapper>
-  );
-}
-
-export default Details;
-
-const Wrapper = styled('div')`
-  display: grid;
-  gap: ${space(1)};
-  margin-top: ${space(0.5)};
-  align-items: center;
-  font-size: ${p => p.theme.fontSizeSmall};
-  font-weight: ${p => p.theme.fontWeightBold};
-
-  grid-column: 2/-1;
-
-  @media (min-width: ${p => p.theme.breakpoints.small}) {
-    margin-top: ${space(1)};
-    grid-template-columns: max-content 1fr;
-    gap: ${space(1)};
-    grid-row: 3/3;
-  }
-`;
-
-const Value = styled('div')`
-  font-weight: ${p => p.theme.fontWeightNormal};
-  white-space: pre-wrap;
-  word-break: break-all;
-  padding: ${space(1)} ${space(1.5)};
-  font-family: ${p => p.theme.text.familyMono};
-  background-color: ${p => p.theme.backgroundSecondary};
-
-  @media (max-width: ${p => p.theme.breakpoints.small}) {
-    :not(:last-child) {
-      margin-bottom: ${space(1)};
-    }
-  }
-`;
diff --git a/static/app/views/settings/projectGeneralSettings/index.spec.tsx b/static/app/views/settings/projectGeneralSettings/index.spec.tsx
index 003731a5e15ba7..46a7e473429085 100644
--- a/static/app/views/settings/projectGeneralSettings/index.spec.tsx
+++ b/static/app/views/settings/projectGeneralSettings/index.spec.tsx
@@ -17,14 +17,13 @@ import selectEvent from 'sentry-test/selectEvent';
 import {addErrorMessage, addSuccessMessage} from 'sentry/actionCreators/indicator';
 import {removePageFiltersStorage} from 'sentry/components/organizations/pageFilters/persistence';
 import ProjectsStore from 'sentry/stores/projectsStore';
-import {browserHistory} from 'sentry/utils/browserHistory';
 import ProjectContextProvider from 'sentry/views/projects/projectContext';
 import ProjectGeneralSettings from 'sentry/views/settings/projectGeneralSettings';
 
 jest.mock('sentry/actionCreators/indicator');
 jest.mock('sentry/components/organizations/pageFilters/persistence');
 
-function getField(role, name) {
+function getField(role: string, name: string) {
   return screen.getByRole(role, {name});
 }
 
@@ -40,13 +39,13 @@ describe('projectGeneralSettings', function () {
     verifySSL: true,
   });
   const groupingConfigs = GroupingConfigsFixture();
-  let putMock;
+  let putMock: jest.Mock;
 
   const router = RouterFixture();
   const routerProps = {
     location: LocationFixture(),
     routes: router.routes,
-    route: router.routes[0],
+    route: router.routes[0]!,
     router,
     routeParams: router.params,
   };
@@ -298,7 +297,7 @@ describe('projectGeneralSettings', function () {
           params={params}
         />
       </ProjectContextProvider>,
-      {organization}
+      {organization, router}
     );
 
     await userEvent.type(
@@ -313,7 +312,7 @@ describe('projectGeneralSettings', function () {
     await userEvent.click(screen.getByRole('button', {name: 'Save'}));
 
     // Redirects the user
-    await waitFor(() => expect(browserHistory.replace).toHaveBeenCalled());
+    await waitFor(() => expect(router.replace).toHaveBeenCalled());
     expect(ProjectsStore.getById('2')!.slug).toBe('new-project');
   });
 
diff --git a/static/app/views/settings/projectGeneralSettings/index.tsx b/static/app/views/settings/projectGeneralSettings/index.tsx
index adf4336fefccde..679225c145a5cc 100644
--- a/static/app/views/settings/projectGeneralSettings/index.tsx
+++ b/static/app/views/settings/projectGeneralSettings/index.tsx
@@ -323,12 +323,12 @@ class ProjectGeneralSettings extends DeprecatedAsyncView<Props, State> {
           <JsonForm
             {...jsonFormProps}
             title={t('Project Details')}
-            fields={[fields.name, projectIdField, fields.platform]}
+            fields={[fields.name!, projectIdField, fields.platform!]}
           />
           <JsonForm
             {...jsonFormProps}
             title={t('Email')}
-            fields={[fields.subjectPrefix]}
+            fields={[fields.subjectPrefix!]}
           />
         </Form>
         <Hook
@@ -339,18 +339,18 @@ class ProjectGeneralSettings extends DeprecatedAsyncView<Props, State> {
           <JsonForm
             {...jsonFormProps}
             title={t('Event Settings')}
-            fields={[fields.resolveAge]}
+            fields={[fields.resolveAge!]}
           />
 
           <JsonForm
             {...jsonFormProps}
             title={t('Client Security')}
             fields={[
-              fields.allowedDomains,
-              fields.scrapeJavaScript,
-              fields.securityToken,
-              fields.securityTokenHeader,
-              fields.verifySSL,
+              fields.allowedDomains!,
+              fields.scrapeJavaScript!,
+              fields.securityToken!,
+              fields.securityTokenHeader!,
+              fields.verifySSL!,
             ]}
             renderHeader={() => (
               <PanelAlert type="info">
diff --git a/static/app/views/settings/projectIssueGrouping/index.spec.tsx b/static/app/views/settings/projectIssueGrouping/index.spec.tsx
index e7770fbea6c281..672aa6a8162e13 100644
--- a/static/app/views/settings/projectIssueGrouping/index.spec.tsx
+++ b/static/app/views/settings/projectIssueGrouping/index.spec.tsx
@@ -7,7 +7,7 @@ import ProjectIssueGrouping from 'sentry/views/settings/projectIssueGrouping';
 
 describe('projectIssueGrouping', () => {
   const {organization, projects} = initializeOrg();
-  const project = projects[0];
+  const project = projects[0]!;
 
   it('renders successfully', async () => {
     const request = MockApiClient.addMockResponse({
diff --git a/static/app/views/settings/projectIssueGrouping/index.tsx b/static/app/views/settings/projectIssueGrouping/index.tsx
index 7462d0b098e626..332dd28ce2c09d 100644
--- a/static/app/views/settings/projectIssueGrouping/index.tsx
+++ b/static/app/views/settings/projectIssueGrouping/index.tsx
@@ -92,13 +92,13 @@ export default function ProjectIssueGrouping({organization, project, params}: Pr
         <JsonForm
           {...jsonFormProps}
           title={t('Fingerprint Rules')}
-          fields={[fields.fingerprintingRules]}
+          fields={[fields.fingerprintingRules!]}
         />
 
         <JsonForm
           {...jsonFormProps}
           title={t('Stack Trace Rules')}
-          fields={[fields.groupingEnhancements]}
+          fields={[fields.groupingEnhancements!]}
         />
       </Form>
     </SentryDocumentTitle>
diff --git a/static/app/views/settings/projectIssueGrouping/utils.tsx b/static/app/views/settings/projectIssueGrouping/utils.tsx
deleted file mode 100644
index 89b321ba35339b..00000000000000
--- a/static/app/views/settings/projectIssueGrouping/utils.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import type {AlertProps} from 'sentry/components/alert';
-import {t} from 'sentry/locale';
-import type {EventGroupingConfig} from 'sentry/types/event';
-import type {Project} from 'sentry/types/project';
-
-export function getGroupingChanges(
-  project: Project,
-  groupingConfigs: EventGroupingConfig[]
-): {
-  latestGroupingConfig: EventGroupingConfig | null;
-  riskLevel: number;
-  updateNotes: string;
-} {
-  const byId: Record<string, EventGroupingConfig> = {};
-  let updateNotes: string = '';
-  let riskLevel: number = 0;
-  let latestGroupingConfig: EventGroupingConfig | null = null;
-
-  groupingConfigs.forEach(cfg => {
-    byId[cfg.id] = cfg;
-    if (cfg.latest && project.groupingConfig !== cfg.id) {
-      updateNotes = cfg.changelog;
-      latestGroupingConfig = cfg;
-      riskLevel = cfg.risk;
-    }
-  });
-
-  if (latestGroupingConfig) {
-    let next = (latestGroupingConfig as EventGroupingConfig).base ?? '';
-    while (next !== project.groupingConfig) {
-      const cfg = byId[next];
-      if (!cfg) {
-        break;
-      }
-      riskLevel = Math.max(riskLevel, cfg.risk);
-      updateNotes = cfg.changelog + '\n' + updateNotes;
-      next = cfg.base ?? '';
-    }
-  }
-
-  return {updateNotes, riskLevel, latestGroupingConfig};
-}
-
-export function getGroupingRisk(riskLevel: number): {
-  alertType: AlertProps['type'];
-  riskNote: React.ReactNode;
-} {
-  switch (riskLevel) {
-    case 0:
-      return {
-        riskNote: t('This upgrade has the chance to create some new issues.'),
-        alertType: 'info',
-      };
-    case 1:
-      return {
-        riskNote: t('This upgrade will create some new issues.'),
-        alertType: 'warning',
-      };
-    case 2:
-      return {
-        riskNote: (
-          <strong>
-            {t(
-              'The new grouping strategy is incompatible with the current and will create entirely new issues.'
-            )}
-          </strong>
-        ),
-        alertType: 'error',
-      };
-    default:
-      return {riskNote: undefined, alertType: undefined};
-  }
-}
diff --git a/static/app/views/settings/projectMetrics/customMetricsTable.tsx b/static/app/views/settings/projectMetrics/customMetricsTable.tsx
index d446932749729b..2c3f6dbac0eef9 100644
--- a/static/app/views/settings/projectMetrics/customMetricsTable.tsx
+++ b/static/app/views/settings/projectMetrics/customMetricsTable.tsx
@@ -169,7 +169,7 @@ function MetricsTable({metrics, isLoading, query, project}: MetricsTableProps) {
       isLoading={isLoading}
     >
       {metrics.map(({mri, type, unit, cardinality, blockingStatus}) => {
-        const isBlocked = blockingStatus[0]?.isBlocked;
+        const isBlocked = blockingStatus[0]?.isBlocked!;
         const isCardinalityLimited = cardinality > 0;
         return (
           <Fragment key={mri}>
diff --git a/static/app/views/settings/projectMetrics/projectMetricsDetails.tsx b/static/app/views/settings/projectMetrics/projectMetricsDetails.tsx
index 5bf805f9404ae9..5fa545ba0342cd 100644
--- a/static/app/views/settings/projectMetrics/projectMetricsDetails.tsx
+++ b/static/app/views/settings/projectMetrics/projectMetricsDetails.tsx
@@ -82,7 +82,7 @@ function ProjectMetricsDetails({project, params, organization}: Props) {
         })) ?? [],
     },
   ];
-  const isChartEmpty = series[0].data.every(({value}) => value === 0);
+  const isChartEmpty = series[0]!.data.every(({value}) => value === 0);
 
   const handleMetricBlockToggle = useCallback(() => {
     const operationType = isBlockedMetric ? 'unblockMetric' : 'blockMetric';
diff --git a/static/app/views/settings/projectPerformance/projectPerformance.spec.tsx b/static/app/views/settings/projectPerformance/projectPerformance.spec.tsx
index b1d41af3470ef7..131e2e24d6def7 100644
--- a/static/app/views/settings/projectPerformance/projectPerformance.spec.tsx
+++ b/static/app/views/settings/projectPerformance/projectPerformance.spec.tsx
@@ -27,14 +27,16 @@ describe('projectPerformance', function () {
   });
   const project = ProjectFixture();
   const configUrl = '/projects/org-slug/project-slug/transaction-threshold/configure/';
-  let getMock, postMock, deleteMock;
+  let getMock: jest.Mock;
+  let postMock: jest.Mock;
+  let deleteMock: jest.Mock;
 
   const router = RouterFixture();
   const routerProps = {
     router,
     location: LocationFixture(),
     routes: router.routes,
-    route: router.routes[0],
+    route: router.routes[0]!,
     routeParams: router.params,
   };
 
@@ -329,7 +331,7 @@ describe('projectPerformance', function () {
         await userEvent.click(chevron);
       }
 
-      const slider = screen.getAllByRole('slider')[sliderIndex];
+      const slider = screen.getAllByRole('slider')[sliderIndex]!;
       const indexOfValue = allowedValues.indexOf(defaultValue);
       const newValueIndex = allowedValues.indexOf(newValue);
 
@@ -351,7 +353,7 @@ describe('projectPerformance', function () {
 
       // Ensure that PUT request is fired to update
       // project settings
-      const expectedPUTPayload = {};
+      const expectedPUTPayload: Record<string, number> = {};
       expectedPUTPayload[threshold] = newValue;
       expect(performanceIssuesPutMock).toHaveBeenCalledWith(
         '/projects/org-slug/project-slug/performance-issues/configure/',
diff --git a/static/app/views/settings/projectPerformance/projectPerformance.tsx b/static/app/views/settings/projectPerformance/projectPerformance.tsx
index cba82eb1e05362..dc021a1d6202f7 100644
--- a/static/app/views/settings/projectPerformance/projectPerformance.tsx
+++ b/static/app/views/settings/projectPerformance/projectPerformance.tsx
@@ -162,7 +162,7 @@ class ProjectPerformance extends DeprecatedAsyncView<Props, State> {
     return endpoints;
   }
 
-  getRetentionPrioritiesData(...data) {
+  getRetentionPrioritiesData(...data: any) {
     return {
       dynamicSamplingBiases: Object.entries(data[1].form).map(([key, value]) => ({
         id: key,
@@ -943,10 +943,13 @@ class ProjectPerformance extends DeprecatedAsyncView<Props, State> {
             saveOnBlur
             allowUndo
             initialData={
-              project.dynamicSamplingBiases?.reduce((acc, bias) => {
-                acc[bias.id] = bias.active;
-                return acc;
-              }, {}) ?? {}
+              project.dynamicSamplingBiases?.reduce<Record<string, boolean>>(
+                (acc, bias) => {
+                  acc[bias.id] = bias.active;
+                  return acc;
+                },
+                {}
+              ) ?? {}
             }
             onSubmitSuccess={(response, _instance, id, change) => {
               ProjectsStore.onUpdateSuccess(response);
@@ -1045,7 +1048,7 @@ class ProjectPerformance extends DeprecatedAsyncView<Props, State> {
             apiEndpoint={performanceIssuesEndpoint}
             saveOnBlur
             onSubmitSuccess={(option: {[key: string]: number}) => {
-              const [threshold_key, threshold_value] = Object.entries(option)[0];
+              const [threshold_key, threshold_value] = Object.entries(option)[0]!;
 
               trackAnalytics(
                 'performance_views.project_issue_detection_threshold_changed',
diff --git a/static/app/views/settings/projectPlugins/index.spec.tsx b/static/app/views/settings/projectPlugins/index.spec.tsx
index 779a0852a16d78..fb1f92c778dd82 100644
--- a/static/app/views/settings/projectPlugins/index.spec.tsx
+++ b/static/app/views/settings/projectPlugins/index.spec.tsx
@@ -4,7 +4,7 @@ import {PluginsFixture} from 'sentry-fixture/plugins';
 import {ProjectFixture} from 'sentry-fixture/project';
 import {RouteComponentPropsFixture} from 'sentry-fixture/routeComponentPropsFixture';
 
-import {getByRole, render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
+import {render, screen, userEvent, within} from 'sentry-test/reactTestingLibrary';
 
 import {disablePlugin, enablePlugin, fetchPlugins} from 'sentry/actionCreators/plugins';
 import type {Plugin} from 'sentry/types/integrations';
@@ -24,6 +24,18 @@ describe('ProjectPluginsContainer', function () {
     plugins: Plugin[],
     params: {projectId: string};
 
+  function renderProjectPluginsContainer() {
+    render(
+      <ProjectPluginsContainer
+        {...RouteComponentPropsFixture()}
+        plugins={{plugins, loading: false, error: undefined}}
+        params={params}
+        organization={org}
+        project={project}
+      />
+    );
+  }
+
   beforeEach(function () {
     org = OrganizationFixture();
     project = ProjectFixture();
@@ -63,22 +75,15 @@ describe('ProjectPluginsContainer', function () {
       url: `/projects/${org.slug}/${project.slug}/plugins/github/`,
       method: 'DELETE',
     });
-    render(
-      <ProjectPluginsContainer
-        {...RouteComponentPropsFixture()}
-        plugins={{plugins, loading: false, error: undefined}}
-        params={params}
-        organization={org}
-        project={project}
-      />
-    );
   });
 
   it('calls `fetchPlugins` action creator after mount', function () {
+    renderProjectPluginsContainer();
     expect(fetchPlugins).toHaveBeenCalled();
   });
 
   it('calls `enablePlugin` action creator when enabling plugin', async function () {
+    renderProjectPluginsContainer();
     const amazonSQS = await screen.findByText('Amazon SQS');
 
     const pluginItem = amazonSQS.parentElement?.parentElement?.parentElement;
@@ -86,7 +91,7 @@ describe('ProjectPluginsContainer', function () {
     if (!pluginItem) {
       return;
     }
-    const button = getByRole(pluginItem, 'checkbox');
+    const button = within(pluginItem).getByRole('checkbox');
 
     expect(enablePlugin).not.toHaveBeenCalled();
 
@@ -96,6 +101,7 @@ describe('ProjectPluginsContainer', function () {
   });
 
   it('calls `disablePlugin` action creator when disabling plugin', async function () {
+    renderProjectPluginsContainer();
     const disabledPlugin = await screen.findByText('Disableable Plugin');
 
     const pluginItem = disabledPlugin.parentElement?.parentElement?.parentElement;
@@ -104,7 +110,7 @@ describe('ProjectPluginsContainer', function () {
       return;
     }
 
-    const button = getByRole(pluginItem, 'checkbox');
+    const button = within(pluginItem).getByRole('checkbox');
 
     expect(disablePlugin).not.toHaveBeenCalled();
 
diff --git a/static/app/views/settings/projectProguard/index.tsx b/static/app/views/settings/projectProguard/index.tsx
index b00043af01e3bf..ae5fe38f28928f 100644
--- a/static/app/views/settings/projectProguard/index.tsx
+++ b/static/app/views/settings/projectProguard/index.tsx
@@ -169,7 +169,7 @@ function ProjectProguard({organization, location, router, params}: ProjectProgua
               return (
                 <ProjectProguardRow
                   mapping={mapping}
-                  associations={associationsResults[index].data}
+                  associations={associationsResults[index]!.data}
                   downloadUrl={downloadUrl}
                   onDelete={handleDelete}
                   key={mapping.id}
diff --git a/static/app/views/settings/projectSecurityHeaders/csp.tsx b/static/app/views/settings/projectSecurityHeaders/csp.tsx
index 827914fbc91e05..4c44699e08b204 100644
--- a/static/app/views/settings/projectSecurityHeaders/csp.tsx
+++ b/static/app/views/settings/projectSecurityHeaders/csp.tsx
@@ -51,7 +51,7 @@ function getReportOnlyInstructions(keyList: ProjectKey[]) {
 export default function ProjectCspReports() {
   const organization = useOrganization();
   const params = useParams();
-  const projectId = params.projectId;
+  const projectId = params.projectId!;
 
   const {
     data: keyList,
diff --git a/static/app/views/settings/projectSecurityHeaders/expectCt.tsx b/static/app/views/settings/projectSecurityHeaders/expectCt.tsx
index 863e948c25309d..11cd44d628c989 100644
--- a/static/app/views/settings/projectSecurityHeaders/expectCt.tsx
+++ b/static/app/views/settings/projectSecurityHeaders/expectCt.tsx
@@ -45,13 +45,17 @@ function ProjectExpectCtReports() {
   return (
     <div>
       <SentryDocumentTitle
-        title={routeTitleGen(t('Certificate Transparency (Expect-CT)'), projectId, false)}
+        title={routeTitleGen(
+          t('Certificate Transparency (Expect-CT)'),
+          projectId!,
+          false
+        )}
       />
       <SettingsPageHeader title={t('Certificate Transparency')} />
 
       <PreviewFeature />
 
-      <ReportUri keyList={keyList} orgId={organization.slug} projectId={projectId} />
+      <ReportUri keyList={keyList} orgId={organization.slug} projectId={projectId!} />
 
       <Panel>
         <PanelHeader>{t('About')}</PanelHeader>
diff --git a/static/app/views/settings/projectSecurityHeaders/hpkp.tsx b/static/app/views/settings/projectSecurityHeaders/hpkp.tsx
index b57e75eeac405a..f01f2142163157 100644
--- a/static/app/views/settings/projectSecurityHeaders/hpkp.tsx
+++ b/static/app/views/settings/projectSecurityHeaders/hpkp.tsx
@@ -65,13 +65,13 @@ function ProjectHpkpReports() {
   return (
     <div>
       <SentryDocumentTitle
-        title={routeTitleGen(t('HTTP Public Key Pinning (HPKP)'), projectId, false)}
+        title={routeTitleGen(t('HTTP Public Key Pinning (HPKP)'), projectId!, false)}
       />
       <SettingsPageHeader title={t('HTTP Public Key Pinning')} />
 
       <PreviewFeature />
 
-      <ReportUri keyList={keyList} orgId={organization.slug} projectId={projectId} />
+      <ReportUri keyList={keyList} orgId={organization.slug} projectId={projectId!} />
 
       <Panel>
         <PanelHeader>{t('About')}</PanelHeader>
diff --git a/static/app/views/settings/projectSecurityHeaders/index.tsx b/static/app/views/settings/projectSecurityHeaders/index.tsx
index 4e716561e78c98..e1335079acbc67 100644
--- a/static/app/views/settings/projectSecurityHeaders/index.tsx
+++ b/static/app/views/settings/projectSecurityHeaders/index.tsx
@@ -66,11 +66,11 @@ function ProjectSecurityHeaders() {
   return (
     <div>
       <SentryDocumentTitle
-        title={routeTitleGen(t('Security Headers'), projectId, false)}
+        title={routeTitleGen(t('Security Headers'), projectId!, false)}
       />
       <SettingsPageHeader title={t('Security Header Reports')} />
 
-      <ReportUri keyList={keyList} projectId={projectId} orgId={organization.slug} />
+      <ReportUri keyList={keyList} projectId={projectId!} orgId={organization.slug} />
 
       <Panel>
         <PanelHeader>{t('Additional Configuration')}</PanelHeader>
diff --git a/static/app/views/settings/projectSecurityHeaders/reportUri.tsx b/static/app/views/settings/projectSecurityHeaders/reportUri.tsx
index a0dfecafdade42..777468fe7be224 100644
--- a/static/app/views/settings/projectSecurityHeaders/reportUri.tsx
+++ b/static/app/views/settings/projectSecurityHeaders/reportUri.tsx
@@ -12,7 +12,7 @@ import getDynamicText from 'sentry/utils/getDynamicText';
 const DEFAULT_ENDPOINT = 'https://sentry.example.com/api/security-report/';
 
 export function getSecurityDsn(keyList: ProjectKey[]) {
-  const endpoint = keyList.length ? keyList[0].dsn.security : DEFAULT_ENDPOINT;
+  const endpoint = keyList.length ? keyList[0]!.dsn.security : DEFAULT_ENDPOINT;
   return getDynamicText({
     value: endpoint,
     fixed: DEFAULT_ENDPOINT,
diff --git a/static/app/views/settings/projectTags/index.spec.tsx b/static/app/views/settings/projectTags/index.spec.tsx
index 8a7e4fed400531..c8117bc0db6bf9 100644
--- a/static/app/views/settings/projectTags/index.spec.tsx
+++ b/static/app/views/settings/projectTags/index.spec.tsx
@@ -72,7 +72,7 @@ describe('ProjectTags', function () {
     expect(tagCount).toBe(5);
 
     // Remove the first tag
-    await userEvent.click(screen.getAllByRole('button', {name: 'Remove tag'})[0]);
+    await userEvent.click(screen.getAllByRole('button', {name: 'Remove tag'})[0]!);
 
     // Press confirm in modal
     renderGlobalModal();
diff --git a/static/app/views/setupWizard/index.tsx b/static/app/views/setupWizard/index.tsx
index af0694b5ee62e3..c4e34e310c080f 100644
--- a/static/app/views/setupWizard/index.tsx
+++ b/static/app/views/setupWizard/index.tsx
@@ -41,7 +41,7 @@ function useAnalyticsParams(organizations: Organization[] | undefined) {
   // otherwise we don't know which org the user is in
   return useMemo(
     () => ({
-      organization: organizations?.length === 1 ? organizations[0] : null,
+      organization: organizations?.length === 1 ? organizations[0]! : null,
       project_platform: projectPlatform,
     }),
     [organizations, projectPlatform]
@@ -73,12 +73,12 @@ function useOrganizationProjects({
   );
 
   return useQuery<Project[], RequestError>({
-    queryKey: [`/organizations/${organization?.slug}/projects/`, {query: query}],
+    queryKey: [`/organizations/${organization?.slug}/projects/`, {query}],
     queryFn: () => {
       return api.requestPromise(`/organizations/${organization?.slug}/projects/`, {
         host: orgRegion?.url,
         query: {
-          query: query,
+          query,
         },
       });
     },
@@ -147,7 +147,7 @@ function ProjectSelection({hash, organizations = []}: Omit<Props, 'allowSelectio
   const isSearchStale = search !== debouncedSearch;
   const [selectedOrgId, setSelectedOrgId] = useState<string | null>(() => {
     if (organizations.length === 1) {
-      return organizations[0].id;
+      return organizations[0]!.id;
     }
 
     const urlParams = new URLSearchParams(location.search);
diff --git a/static/app/views/sharedGroupDetails/index.spec.tsx b/static/app/views/sharedGroupDetails/index.spec.tsx
index cb04222303fd7e..3cdb4b90c751de 100644
--- a/static/app/views/sharedGroupDetails/index.spec.tsx
+++ b/static/app/views/sharedGroupDetails/index.spec.tsx
@@ -6,7 +6,7 @@ import {OrganizationFixture} from 'sentry-fixture/organization';
 import {ProjectFixture} from 'sentry-fixture/project';
 import {RouterFixture} from 'sentry-fixture/routerFixture';
 
-import {render, screen, waitFor} from 'sentry-test/reactTestingLibrary';
+import {render, screen} from 'sentry-test/reactTestingLibrary';
 
 import SharedGroupDetails from 'sentry/views/sharedGroupDetails';
 
@@ -61,7 +61,7 @@ describe('SharedGroupDetails', function () {
       />,
       {router}
     );
-    await waitFor(() => expect(screen.getByText('Details')).toBeInTheDocument());
+    await screen.findByText('Details');
   });
 
   it('renders with org slug in path', async function () {
@@ -78,7 +78,7 @@ describe('SharedGroupDetails', function () {
       />,
       {router}
     );
-    await waitFor(() => expect(screen.getByText('Details')).toBeInTheDocument());
-    await waitFor(() => expect(screen.getByTestId('sgh-timestamp')).toBeInTheDocument());
+    await screen.findByText('Details');
+    await screen.findByTestId('sgh-timestamp');
   });
 });
diff --git a/static/app/views/stories/storyTree.tsx b/static/app/views/stories/storyTree.tsx
index a26fc73f13070a..9978299fbe2bd3 100644
--- a/static/app/views/stories/storyTree.tsx
+++ b/static/app/views/stories/storyTree.tsx
@@ -72,7 +72,7 @@ function toTree(files: string[]): TreeMapping {
       if (!(part in tree)) {
         tree[part] = {};
       }
-      tree = tree[part];
+      tree = tree[part]!;
     }
   }
   return root;
diff --git a/static/app/views/traces/fieldRenderers.spec.tsx b/static/app/views/traces/fieldRenderers.spec.tsx
index cf168738b75e59..42f8fb21d86b9b 100644
--- a/static/app/views/traces/fieldRenderers.spec.tsx
+++ b/static/app/views/traces/fieldRenderers.spec.tsx
@@ -77,7 +77,7 @@ describe('Renderers', function () {
 
   describe('SpanDescriptionRenderer', function () {
     it('renders op then description', function () {
-      const span = makeSpan(projects[0]);
+      const span = makeSpan(projects[0]!);
 
       render(<SpanDescriptionRenderer span={span} />);
 
@@ -89,7 +89,7 @@ describe('Renderers', function () {
     it.each(['unknown', 'foobar'])(
       'does not render span status %s',
       function (spanStatus) {
-        const span = makeSpan(projects[0], {'span.status': spanStatus});
+        const span = makeSpan(projects[0]!, {'span.status': spanStatus});
 
         render(<SpanDescriptionRenderer span={span} />);
 
@@ -100,7 +100,7 @@ describe('Renderers', function () {
     );
 
     it.each(['ok', 'internal_error'])('renders span status %s', function (spanStatus) {
-      const span = makeSpan(projects[0], {'span.status': spanStatus});
+      const span = makeSpan(projects[0]!, {'span.status': spanStatus});
 
       render(<SpanDescriptionRenderer span={span} />);
 
@@ -112,13 +112,13 @@ describe('Renderers', function () {
 
   describe('ProjectsRenderer', function () {
     it('renders one project', function () {
-      render(<ProjectsRenderer projectSlugs={[projects[0].slug]} />, context);
+      render(<ProjectsRenderer projectSlugs={[projects[0]!.slug]} />, context);
       expect(screen.getAllByRole('img')).toHaveLength(1);
     });
 
     it('renders two projects', function () {
       render(
-        <ProjectsRenderer projectSlugs={[projects[0].slug, projects[1].slug]} />,
+        <ProjectsRenderer projectSlugs={[projects[0]!.slug, projects[1]!.slug]} />,
         context
       );
       expect(screen.getAllByRole('img')).toHaveLength(2);
@@ -135,9 +135,9 @@ describe('Renderers', function () {
 
   describe('ProjectRenderer', function () {
     it('renders project badge with name', function () {
-      render(<ProjectRenderer projectSlug={projects[0].slug} />);
+      render(<ProjectRenderer projectSlug={projects[0]!.slug} />);
       expect(screen.getByRole('img')).toBeInTheDocument();
-      expect(screen.getByText(projects[0].slug)).toBeInTheDocument();
+      expect(screen.getByText(projects[0]!.slug)).toBeInTheDocument();
     });
   });
 
@@ -146,7 +146,7 @@ describe('Renderers', function () {
       const onClickHandler = jest.fn();
 
       const traceId = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa';
-      const span = makeSpan(projects[0]);
+      const span = makeSpan(projects[0]!);
 
       render(
         <SpanIdRenderer
@@ -204,13 +204,15 @@ describe('Renderers', function () {
 
   describe('TransactionRenderer', function () {
     it('renders transaction with link', function () {
-      render(<TransactionRenderer projectSlug={projects[0].slug} transaction="foobar" />);
+      render(
+        <TransactionRenderer projectSlug={projects[0]!.slug} transaction="foobar" />
+      );
 
       const link = screen.getByText('foobar');
       expect(link).toBeInTheDocument();
       expect(link).toHaveAttribute(
         'href',
-        `/organizations/${organization.slug}/performance/summary/?project=${projects[0].id}&referrer=performance-transaction-summary&transaction=foobar&unselectedSeries=p100%28%29&unselectedSeries=avg%28%29`
+        `/organizations/${organization.slug}/performance/summary/?project=${projects[0]!.id}&referrer=performance-transaction-summary&transaction=foobar&unselectedSeries=p100%28%29&unselectedSeries=avg%28%29`
       );
     });
   });
@@ -229,7 +231,7 @@ describe('Renderers', function () {
             numErrors: 0,
             numOccurrences: 0,
             numSpans: 2,
-            project: projects[0].slug,
+            project: projects[0]!.slug,
             slices: 40,
             trace: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
           }}
@@ -255,7 +257,7 @@ describe('Renderers', function () {
             numErrors: 50,
             numOccurrences: 50,
             numSpans: 2,
-            project: projects[0].slug,
+            project: projects[0]!.slug,
             slices: 40,
             trace: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
           }}
@@ -281,7 +283,7 @@ describe('Renderers', function () {
             numErrors: 5,
             numOccurrences: 5,
             numSpans: 2,
-            project: projects[0].slug,
+            project: projects[0]!.slug,
             slices: 40,
             trace: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
           }}
diff --git a/static/app/views/traces/tracesChart.tsx b/static/app/views/traces/tracesChart.tsx
index 145bba94cac4ca..3ca4fcd40e43a8 100644
--- a/static/app/views/traces/tracesChart.tsx
+++ b/static/app/views/traces/tracesChart.tsx
@@ -37,15 +37,15 @@ export function TracesChart({}: Props) {
 
   const firstCountSeries = useTraceCountSeries({
     query: queries?.[0] || '',
-    enabled: enabled[0],
+    enabled: enabled[0]!,
   });
   const secondCountSeries = useTraceCountSeries({
-    query: queries?.[1],
-    enabled: enabled[1],
+    query: queries?.[1]!,
+    enabled: enabled[1]!,
   });
   const thirdCountSeries = useTraceCountSeries({
-    query: queries?.[2],
-    enabled: enabled[2],
+    query: queries?.[2]!,
+    enabled: enabled[2]!,
   });
 
   const seriesAreLoading =
@@ -55,9 +55,9 @@ export function TracesChart({}: Props) {
     // References
     // - https://tanstack.com/query/v4/docs/framework/react/guides/disabling-queries
     // - https://tanstack.com/query/latest/docs/framework/react/guides/disabling-queries#isloading-previously-isinitialloading
-    (enabled[0] && firstCountSeries.isPending) ||
-    (enabled[1] && secondCountSeries.isPending) ||
-    (enabled[2] && thirdCountSeries.isPending);
+    (enabled[0]! && firstCountSeries.isPending) ||
+    (enabled[1]! && secondCountSeries.isPending) ||
+    (enabled[2]! && thirdCountSeries.isPending);
 
   const error = useMemo(() => {
     const errors = [
@@ -87,8 +87,8 @@ export function TracesChart({}: Props) {
       if (!enabled[i] || error) {
         continue;
       }
-      const data = series[i]['count()'];
-      data.color = CHART_PALETTE[2][i];
+      const data = series[i]!['count()'];
+      data.color = CHART_PALETTE[2]![i]!;
       data.seriesName =
         `span ${i + 1}: ${queries[i] || t('All spans')}` || t('All spans');
       allData.push(data);
diff --git a/static/app/views/traces/tracesSearchBar.tsx b/static/app/views/traces/tracesSearchBar.tsx
index c48e479aa98f4a..f71eb75e2c9454 100644
--- a/static/app/views/traces/tracesSearchBar.tsx
+++ b/static/app/views/traces/tracesSearchBar.tsx
@@ -1,17 +1,13 @@
 import styled from '@emotion/styled';
 
 import {Button} from 'sentry/components/button';
-import SearchBar from 'sentry/components/events/searchBar';
 import {SpanSearchQueryBuilder} from 'sentry/components/performance/spanSearchQueryBuilder';
 import {IconAdd, IconClose} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
-import {SavedSearchType} from 'sentry/types/group';
 import {trackAnalytics} from 'sentry/utils/analytics';
-import {DiscoverDatasets} from 'sentry/utils/discover/types';
 import useOrganization from 'sentry/utils/useOrganization';
 import usePageFilters from 'sentry/utils/usePageFilters';
-import {useSpanFieldSupportedTags} from 'sentry/views/performance/utils/useSpanFieldSupportedTags';
 
 interface TracesSearchBarProps {
   handleClearSearch: (index: number) => boolean;
@@ -38,35 +34,17 @@ export function TracesSearchBar({
   const canAddMoreQueries = queries.length <= 2;
   const localQueries = queries.length ? queries : [''];
 
-  // Since trace explorer permits cross project searches,
-  // autocompletion should also be cross projects.
-  const {data: supportedTags} = useSpanFieldSupportedTags();
-
   return (
     <TraceSearchBarsContainer>
       {localQueries.map((query, index) => (
         <TraceBar key={index}>
           <SpanLetter>{getSpanName(index)}</SpanLetter>
-          {organization.features.includes('search-query-builder-performance') ? (
-            <SpanSearchQueryBuilder
-              projects={selection.projects}
-              initialQuery={query}
-              onSearch={(queryString: string) => handleSearch(index, queryString)}
-              searchSource="trace-explorer"
-            />
-          ) : (
-            <StyledSearchBar
-              searchSource="trace-explorer"
-              query={query}
-              onSearch={(queryString: string) => handleSearch(index, queryString)}
-              placeholder={t('Search for span attributes')}
-              organization={organization}
-              supportedTags={supportedTags}
-              dataset={DiscoverDatasets.SPANS_INDEXED}
-              projectIds={selection.projects}
-              savedSearchType={SavedSearchType.SPAN}
-            />
-          )}
+          <SpanSearchQueryBuilder
+            projects={selection.projects}
+            initialQuery={query}
+            onSearch={(queryString: string) => handleSearch(index, queryString)}
+            searchSource="trace-explorer"
+          />
           <StyledButton
             aria-label={t('Remove Span')}
             icon={<IconClose size="sm" />}
@@ -128,10 +106,6 @@ const SpanLetter = styled('div')`
   align-content: center;
 `;
 
-const StyledSearchBar = styled(SearchBar)`
-  width: 100%;
-`;
-
 const StyledButton = styled(Button)`
   height: 38px;
 `;
diff --git a/static/app/views/traces/tracesTable.tsx b/static/app/views/traces/tracesTable.tsx
index 9c2cbb7970cd13..baad921890b4da 100644
--- a/static/app/views/traces/tracesTable.tsx
+++ b/static/app/views/traces/tracesTable.tsx
@@ -165,7 +165,7 @@ function TraceRow({defaultExpanded, trace}: {defaultExpanded; trace: TraceResult
     const trailingProjects: string[] = [];
 
     for (let i = 0; i < trace.breakdowns.length; i++) {
-      const project = trace.breakdowns[i].project;
+      const project = trace.breakdowns[i]!.project;
       if (!defined(project) || seenProjects.has(project)) {
         continue;
       }
diff --git a/static/app/views/traces/utils.tsx b/static/app/views/traces/utils.tsx
index a2e7510db4fadb..72a4ff555b0f8a 100644
--- a/static/app/views/traces/utils.tsx
+++ b/static/app/views/traces/utils.tsx
@@ -37,7 +37,7 @@ export function areQueriesEmpty(queries: string[]): boolean {
   }
 
   if (queries.length === 1) {
-    return queries[0].length === 0;
+    return queries[0]!.length === 0;
   }
 
   return false;
diff --git a/static/app/views/unsubscribe/issue.spec.tsx b/static/app/views/unsubscribe/issue.spec.tsx
index 06cbfea73243e5..0d3040e0b22cb2 100644
--- a/static/app/views/unsubscribe/issue.spec.tsx
+++ b/static/app/views/unsubscribe/issue.spec.tsx
@@ -5,7 +5,9 @@ import UnsubscribeIssue from 'sentry/views/unsubscribe/issue';
 
 describe('UnsubscribeIssue', function () {
   const params = {orgId: 'acme', id: '9876'};
-  let mockUpdate, mockGet;
+  let mockUpdate: jest.Mock;
+  let mockGet: jest.Mock;
+
   beforeEach(() => {
     mockUpdate = MockApiClient.addMockResponse({
       url: '/organizations/acme/unsubscribe/issue/9876/?_=signature-value',
diff --git a/static/app/views/unsubscribe/issue.tsx b/static/app/views/unsubscribe/issue.tsx
index 4883bf95ea3d09..b455f0e315a73d 100644
--- a/static/app/views/unsubscribe/issue.tsx
+++ b/static/app/views/unsubscribe/issue.tsx
@@ -30,8 +30,8 @@ function UnsubscribeIssue({location}: Props) {
         <h3>{t('Issue Notification Unsubscribe')}</h3>
         <UnsubscribeBody
           signature={signature}
-          orgSlug={params.orgId}
-          issueId={params.id}
+          orgSlug={params.orgId!}
+          issueId={params.id!}
         />
       </NarrowLayout>
     </SentryDocumentTitle>
diff --git a/static/app/views/unsubscribe/project.tsx b/static/app/views/unsubscribe/project.tsx
index e5be6b3657a89c..0eea9d43d109cc 100644
--- a/static/app/views/unsubscribe/project.tsx
+++ b/static/app/views/unsubscribe/project.tsx
@@ -28,8 +28,8 @@ function UnsubscribeProject({location}: Props) {
         <h3>{t('Unsubscribe')}</h3>
         <UnsubscribeBody
           signature={signature}
-          orgSlug={params.orgId}
-          issueId={params.id}
+          orgSlug={params.orgId!}
+          issueId={params.id!}
         />
       </NarrowLayout>
     </SentryDocumentTitle>
diff --git a/static/app/views/userFeedback/userFeedbackEmpty.tsx b/static/app/views/userFeedback/userFeedbackEmpty.tsx
index a3c0b60db01027..5b52c82061de63 100644
--- a/static/app/views/userFeedback/userFeedbackEmpty.tsx
+++ b/static/app/views/userFeedback/userFeedbackEmpty.tsx
@@ -54,7 +54,7 @@ export function UserFeedbackEmpty({projectIds, issueTab = false}: Props) {
     window.sentryEmbedCallback = function (embed) {
       // Mock the embed's submit xhr to always be successful
       // NOTE: this will not have errors if the form is empty
-      embed.submit = function (_body) {
+      embed.submit = function (_body: Record<string, unknown>) {
         this._submitInProgress = true;
         setTimeout(() => {
           this._submitInProgress = false;
diff --git a/static/images/spot/onboarding-compass.svg b/static/images/spot/onboarding-compass.svg
new file mode 100644
index 00000000000000..30b389f4d7a360
--- /dev/null
+++ b/static/images/spot/onboarding-compass.svg
@@ -0,0 +1 @@
+<svg id="compass" xmlns="http://www.w3.org/2000/svg" width="238.973" height="161.616" viewBox="0 0 179.228 121.215" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path class="cls-7" d="M89.981 52.194c-.924 2.618 1.608 4.896 4.39 5.467 3.002.616 6.083-.231 6.468-2.387.143-.805.308-3.696-3.928-5.005-2.77-.857-6.223-.078-6.93 1.925Z" id="reuse-0"/></defs><defs><style>.cls-2{stroke:#3f2b56;stroke-linecap:round;stroke-linejoin:round}.cls-3{fill:#3f2b56}.cls-2{fill:none}.cls-5{fill:#ebb432}.cls-6{fill:#fca9cb}.cls-7{fill:#b39ed3}.cls-8{fill:#b29dd2}.cls-9{fill:#e1557a}</style></defs><path class="cls-6" d="M15.046 14.549s6.79-8.7 18.159-11.884C39.67.854 46.935-.405 54.33 1.51s7.048 6.496 7.048 6.496-.446 3.742-3.775 7.247l-3.406-1.2s8.296-10.437-8.386-9.515S22.93 12.474 19.21 18.356l-4.164-3.807ZM100.3 13.538s10.67 1.638 17.236 4.401 13.515 5.267 25.323 15.324c0 0 9.112 8.357 10.7 19.522l-36.793 1.82S80.458 25.432 80.895 25.02s3.04-12.404 3.04-12.404 10.11.405 16.365.922Z"/><path class="cls-6" d="M0 17.63 68.053 4.691l111.175 43.413-22.187 71.41-134.161-8.32L0 17.63z"/><path d="M70.73 82.696c10.546 4.902 20.842 8.793 46.806 5.234 20.323-2.786 26.06-17.132 26.06-17.132.857-4.92 1.828-9.826-4.025-18.99-6.53-10.224-19.25-17.686-31.725-20.944-13.751-3.592-35.19-3.697-47.742 5.621-6.695 4.97-9.63 10.473-10.916 14.402 0 0-.78 2.604-.803 6.083 0 0 2.552 16.525 22.345 25.726Z" fill="#f6f6f8"/><path class="cls-6" d="m90.511 51.345 7.093-16.323 2.818 17.763"/><use class="cls-7" xlink:href="#reuse-0"/><path class="cls-8" d="m33.007 67.972 5.64-24.423S30.408 71.01 66.109 89.734c20.094 10.54 53.884 10.007 69.653.5 16.976-10.236 17.606-23.75 18.453-30.17l-2.287 37.044s-4.344 21.032-43.726 23.388c-15.664.938-35.316-1.156-53.489-12.218-14.924-9.084-24.04-24.134-21.706-40.306ZM41.84 23.09s.72-3.3 4.14-5.46c0 0 5.76 5.88 5.58 5.88s-2.969 2.764-5.009 5.043l-4.712-5.463Z"/><path class="cls-8" d="M45.811 25.39s-16.504 4.06-25.338.723c-9.61-3.631-.048-12.533 4.22-15.507 3.731-2.6 9.665-4.863 16.537-5.518 7.314-.697 11.455-.11 12.163.18 1.94.796 2.243 1.632 2.243 1.632-.923-3.186-4.394-4.807-13.411-4.051-7.639.64-18.211 4.677-22.635 8.247-6.165 4.976-9.493 9.29-7.337 15.071 2.64 7.079 13.564 5.805 17.49 4.725 4.085-1.123 14.841-4.494 16.069-5.502Z"/><path class="cls-7" d="M48.385 56.97s-5.353-14.7 8.152-26.364c13.506-11.664 39.228-12.132 56.651-6.603 23.446 7.44 30.683 21.137 32.562 28.033 2.584 9.48-2.154 18.762-2.154 18.762s-.92-21.18-23.003-32.137c-15.908-7.893-29.107-8.193-42.378-6.336-11.27 1.577-21.62 7.119-29.83 24.645Z"/><path class="cls-5" d="m70.73 34.637.693 15.287 19.636-8.511-20.329-6.776zM103.534 73.986l19.559-9.164 3.08 16.71-22.639-7.546z"/><path class="cls-9" d="m110.574 47.431 5.094 4.196 6.624-.29 5.581-2.711V44.64l-4.863-3.587-5.979-.478-5.501 2.63-.956 4.226zM60.749 71.904l1.196-5.421 6.218-2.63 6.218 1.116 4.145 3.747-1.275 5.022-5.421 2.79-6.059-.717-5.022-3.907z"/><path class="cls-2" d="M45.811 25.39s-18.663 9.115-28.6 5.361c-9.938-3.754-5.18-16.415 5.47-23.571C31.7 1.12 46.745-.61 53.15 1.157s8.228 4.418 8.228 6.848-3.104 7.32-7.962 11.516"/><path class="cls-2" d="M18.648 21.353c.332 2.164 2.733 3.94 9.825 3.656 11.042-.442 15.9-2.65 15.9-2.65s1.762-.937 2.65 1.104M53.223 16.08c1.549-2.39 3.978-6.832 2.413-9.18-2.208-3.312-10.903-2.87-19.033-.883s-14.276 6.69-17.04 11.65"/><path class="cls-2" d="M40.853 22.162s1.172-6.48 8.966-7.613l4.894 6.766M45.072 27.374l1.479 1.179"/><path class="cls-2" d="M116.115 17.423c15.469 5.463 29.055 15.243 34.314 25.761 8.701 17.403.693 34.729-6.853 41.043-7.225 6.045-23.16 17.723-60.756 10.704-35.884-6.7-44.2-32.881-44.97-40.042-.795-7.39 1.617-21.946 15.092-32.419 9.692-7.532 26.028-11.858 47.358-8.932a78.235 78.235 0 0 1 10.274 2.138s1.876.488 3.1.883 2.441.864 2.441.864Z"/><path class="cls-2" d="M47.244 45.802c1.54-9.317 12.475-25.642 42.891-25.334s47.511 15.94 51.9 23.101 9.164 20.56-3.465 34.113c-12.628 13.552-41.582 12.09-49.667 11.011-4.705-.627-21.87-4.774-32.65-16.632-7.41-8.152-9.89-20.924-9.01-26.259Z"/><use class="cls-2" xlink:href="#reuse-0"/><path class="cls-2" d="m90.511 51.345 7.093-16.323 2.818 17.763M103.534 73.986l19.559-9.164 3.08 16.71-22.639-7.546zM71.423 49.924l19.636-8.511-20.329-6.776.693 15.287z"/><path class="cls-2" d="M49.188 50.887c1.286-3.929 4.22-9.432 10.916-14.402 12.551-9.318 33.99-9.213 47.742-5.621 12.474 3.258 25.196 10.72 31.725 20.945 5.853 9.163 4.882 14.069 4.025 18.988M154.215 60.063l-.655 13.571M153.028 84.634l.167-3.453"/><path class="cls-2" d="m39.899 40.242-6.892 27.73s-4.66 21.89 18.642 38.272c23.302 16.382 52.361 15.786 67.93 12.851 17.229-3.248 32.199-12.145 33.046-26.126l.207-4.292"/><path class="cls-2" d="M36.19 55.163s-.782 16.057 13.058 28.485 31.748 17.73 51.174 18.5c24.947.989 49.667-9.58 53.138-28.514M56.142 58.99l6.122-.479M58.597 43.365l4.862 1.993M92.398 32.284l.318 3.428M110.095 35.552l-2.312 3.109M128.989 55.084l5.979-.957M130.743 64.49l6.218 1.914M105.312 79.637l2.232 3.667M81.954 80.195l2.392-3.906"/><path class="cls-2" d="m74.381 64.969 4.145 3.747-1.275 5.022-5.421 2.79-6.059-.717-5.022-3.907 1.196-5.421 6.218-2.63 6.218 1.116zM110.574 47.431l5.094 4.196 6.624-.29 5.581-2.711V44.64l-4.863-3.587-5.979-.478-5.501 2.63-.956 4.226z"/><path class="cls-3" d="m64.576 71.187 1.355 1.196 4.145-2.551-.877-.718-4.623 2.073z"/><ellipse class="cls-3" cx="72.483" cy="68.197" rx="1.42" ry="1.019"/><ellipse class="cls-3" cx="116.114" cy="47.079" rx="1.421" ry="1.025"/><path class="cls-3" d="m118.52 45.347 4.384-2.205 1.663 1.181-4.959 1.818-1.088-.794zM76.631 41.006l-3.532-2.729 1.606-.696 2.943 3.104-1.017.321z"/><ellipse class="cls-3" cx="79.12" cy="42.612" rx="1.365" ry=".963"/><path class="cls-3" d="m118.051 73.757 3.372 3.8 1.712-.964-4.281-3.371-.803.535z"/><ellipse class="cls-3" cx="116.232" cy="71.402" rx="1.445" ry="1.017"/><path d="M94.37 57.66c-1.634-.334-3.175-1.261-3.987-2.497h0l1.985 23.366 7.738-21.905h0c-1.164 1.133-3.47 1.502-5.736 1.037Z" fill="#3f2b56" stroke="#3f2b56" stroke-linecap="round" stroke-linejoin="round"/></svg>
\ No newline at end of file
diff --git a/static/less/base.less b/static/less/base.less
index d96c1dd87365bc..6db46ce9526263 100644
--- a/static/less/base.less
+++ b/static/less/base.less
@@ -32,6 +32,22 @@ body {
   min-height: 100vh;
 }
 
+// Applied to body
+body.theme-dark {
+  // theme.surface200
+  background: #1A141F;
+  // theme.gray400
+  color: #D6D0DC;
+}
+body.theme-system {
+  @media (prefers-color-scheme: dark) {
+    // theme.surface200
+    background: #1A141F;
+    // theme.gray400
+    color: #D6D0DC;
+  }
+}
+
 h1,
 h2,
 h3,
diff --git a/static/less/shared-components.less b/static/less/shared-components.less
index e32f2b1a5db5ec..d71932ee585f20 100644
--- a/static/less/shared-components.less
+++ b/static/less/shared-components.less
@@ -438,6 +438,11 @@ table.table.key-value {
   }
 }
 
+.theme-dark .loading .loading-indicator {
+  // theme.surface200
+  background: #1A141F;
+}
+
 @-webkit-keyframes loading {
   0% {
     -webkit-transform: rotate(0deg);
@@ -519,6 +524,19 @@ table.table.key-value {
   }
 }
 
+.theme-dark .loading.triangle .loading-indicator {
+  filter: invert(100%);
+  opacity: 0.8;
+}
+body.theme-system {
+  @media (prefers-color-scheme: dark) {
+    .loading.triangle .loading-indicator {
+      filter: invert(100%);
+      opacity: 0.8;
+    }
+  }
+}
+
 /**
 * Box
 * ============================================================================
diff --git a/tests/acceptance/test_issue_tag_values.py b/tests/acceptance/test_issue_tag_values.py
index 5952066b42a768..731cbe80baa869 100644
--- a/tests/acceptance/test_issue_tag_values.py
+++ b/tests/acceptance/test_issue_tag_values.py
@@ -1,6 +1,6 @@
 from fixtures.page_objects.issue_details import IssueDetailsPage
 from sentry.testutils.cases import AcceptanceTestCase, SnubaTestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.silo import no_silo_test
 from sentry.utils.samples import load_data
 
@@ -24,7 +24,7 @@ def setUp(self):
 
     def create_issue(self):
         event_data = load_data("javascript")
-        event_data["timestamp"] = iso_format(before_now(minutes=1))
+        event_data["timestamp"] = before_now(minutes=1).isoformat()
         event_data["tags"] = {"url": "http://example.org/path?key=value"}
         return self.store_event(data=event_data, project_id=self.project.id)
 
diff --git a/tests/acceptance/test_organization_dashboards.py b/tests/acceptance/test_organization_dashboards.py
index 4be11043fcb38f..8986cc42ec841f 100644
--- a/tests/acceptance/test_organization_dashboards.py
+++ b/tests/acceptance/test_organization_dashboards.py
@@ -20,7 +20,7 @@
     DashboardWidgetTypes,
 )
 from sentry.testutils.cases import AcceptanceTestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.silo import no_silo_test
 
 FEATURE_NAMES = [
@@ -41,7 +41,7 @@
 class OrganizationDashboardsAcceptanceTest(AcceptanceTestCase):
     def setUp(self):
         super().setUp()
-        min_ago = iso_format(before_now(minutes=1))
+        min_ago = before_now(minutes=1).isoformat()
         self.store_event(
             data={"event_id": "a" * 32, "message": "oh no", "timestamp": min_ago},
             project_id=self.project.id,
diff --git a/tests/acceptance/test_organization_events_v2.py b/tests/acceptance/test_organization_events_v2.py
index ec7dca227fb658..4d415ef2a611f9 100644
--- a/tests/acceptance/test_organization_events_v2.py
+++ b/tests/acceptance/test_organization_events_v2.py
@@ -9,7 +9,7 @@
 
 from sentry.discover.models import DiscoverSavedQuery
 from sentry.testutils.cases import AcceptanceTestCase, SnubaTestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format, timestamp_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.silo import no_silo_test
 from sentry.utils.samples import load_data
 
@@ -117,8 +117,8 @@ def build_span_tree(span_tree, spans, parent_span_id):
             (start_delta, span_length) = time_offsets.get(span_id, (timedelta(), timedelta()))
 
             span_start_time = start_datetime + start_delta
-            span["start_timestamp"] = timestamp_format(span_start_time)
-            span["timestamp"] = timestamp_format(span_start_time + span_length)
+            span["start_timestamp"] = span_start_time.timestamp()
+            span["timestamp"] = (span_start_time + span_length).timestamp()
             spans.append(span)
 
             if isinstance(child, dict):
@@ -135,8 +135,8 @@ def build_span_tree(span_tree, spans, parent_span_id):
                 (start_delta, span_length) = time_offsets.get(span_id, (timedelta(), timedelta()))
 
                 span_start_time = start_datetime + start_delta
-                span["start_timestamp"] = timestamp_format(span_start_time)
-                span["timestamp"] = timestamp_format(span_start_time + span_length)
+                span["start_timestamp"] = span_start_time.timestamp()
+                span["timestamp"] = (span_start_time + span_length).timestamp()
                 spans.append(span)
 
         return spans
@@ -183,8 +183,8 @@ def test_all_events_query_empty_state(self):
     def test_all_events_query(self, mock_now):
         now = before_now()
         mock_now.return_value = now
-        five_mins_ago = iso_format(now - timedelta(minutes=5))
-        ten_mins_ago = iso_format(now - timedelta(minutes=10))
+        five_mins_ago = (now - timedelta(minutes=5)).isoformat()
+        ten_mins_ago = (now - timedelta(minutes=10)).isoformat()
         self.store_event(
             data={
                 "event_id": "a" * 32,
@@ -238,7 +238,7 @@ def test_errors_query_empty_state(self):
     def test_errors_query(self, mock_now):
         now = before_now()
         mock_now.return_value = now
-        ten_mins_ago = iso_format(now - timedelta(minutes=10))
+        ten_mins_ago = (now - timedelta(minutes=10)).isoformat()
         self.store_event(
             data={
                 "event_id": "a" * 32,
@@ -306,7 +306,7 @@ def test_transactions_query(self, mock_now):
     def test_event_detail_view_from_all_events(self, mock_now):
         now = before_now()
         mock_now.return_value = now
-        ten_mins_ago = iso_format(now - timedelta(minutes=10))
+        ten_mins_ago = (now - timedelta(minutes=10)).isoformat()
 
         event_data = load_data("python")
         event_data.update(
@@ -346,7 +346,7 @@ def test_event_detail_view_from_errors_view(self, mock_now):
         event_data = load_data("javascript")
         event_data.update(
             {
-                "timestamp": iso_format(now - timedelta(minutes=5)),
+                "timestamp": (now - timedelta(minutes=5)).isoformat(),
                 "event_id": "d" * 32,
                 "fingerprint": ["group-1"],
             }
@@ -646,7 +646,7 @@ def test_duplicate_query(self):
     def test_drilldown_result(self, mock_now):
         now = before_now()
         mock_now.return_value = now
-        ten_mins_ago = iso_format(now - timedelta(minutes=10))
+        ten_mins_ago = (now - timedelta(minutes=10)).isoformat()
         events = (
             ("a" * 32, "oh no", "group-1"),
             ("b" * 32, "oh no", "group-1"),
diff --git a/tests/acceptance/test_organization_global_selection_header.py b/tests/acceptance/test_organization_global_selection_header.py
index e712c340a1d56a..bd59d2841a6243 100644
--- a/tests/acceptance/test_organization_global_selection_header.py
+++ b/tests/acceptance/test_organization_global_selection_header.py
@@ -7,7 +7,7 @@
 from fixtures.page_objects.issue_details import IssueDetailsPage
 from fixtures.page_objects.issue_list import IssueListPage
 from sentry.testutils.cases import AcceptanceTestCase, SnubaTestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.silo import no_silo_test
 
 event_time = before_now(days=3)
@@ -51,7 +51,7 @@ def create_issues(self):
             data={
                 "event_id": "a" * 32,
                 "message": "oh no",
-                "timestamp": iso_format(event_time),
+                "timestamp": event_time.isoformat(),
                 "fingerprint": ["group-1"],
             },
             project_id=self.project_1.id,
@@ -60,7 +60,7 @@ def create_issues(self):
             data={
                 "event_id": "b" * 32,
                 "message": "oh snap",
-                "timestamp": iso_format(event_time),
+                "timestamp": event_time.isoformat(),
                 "fingerprint": ["group-2"],
                 "environment": "prod",
             },
diff --git a/tests/acceptance/test_organization_group_index.py b/tests/acceptance/test_organization_group_index.py
index fca1fd2e02ffec..24958b38cb2204 100644
--- a/tests/acceptance/test_organization_group_index.py
+++ b/tests/acceptance/test_organization_group_index.py
@@ -8,7 +8,7 @@
 from sentry.models.group import GroupStatus
 from sentry.models.groupinbox import GroupInboxReason, add_group_to_inbox
 from sentry.testutils.cases import AcceptanceTestCase, SnubaTestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.silo import no_silo_test
 
 event_time = before_now(days=3)
@@ -36,7 +36,7 @@ def create_issues(self):
             data={
                 "event_id": "a" * 32,
                 "message": "oh no",
-                "timestamp": iso_format(event_time - timedelta(hours=1)),
+                "timestamp": (event_time - timedelta(hours=1)).isoformat(),
                 "fingerprint": ["group-1"],
             },
             project_id=self.project.id,
@@ -46,7 +46,7 @@ def create_issues(self):
             data={
                 "event_id": "b" * 32,
                 "message": "oh snap",
-                "timestamp": iso_format(event_time),
+                "timestamp": event_time.isoformat(),
                 "fingerprint": ["group-2"],
             },
             project_id=self.project.id,
diff --git a/tests/acceptance/test_performance_summary.py b/tests/acceptance/test_performance_summary.py
index 2b40d6df60c34d..eb22e6335b9391 100644
--- a/tests/acceptance/test_performance_summary.py
+++ b/tests/acceptance/test_performance_summary.py
@@ -4,7 +4,7 @@
 from fixtures.page_objects.transaction_summary import TransactionSummaryPage
 from sentry.models.assistant import AssistantActivity
 from sentry.testutils.cases import AcceptanceTestCase, SnubaTestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.silo import no_silo_test
 from sentry.utils.samples import load_data
 
@@ -52,7 +52,7 @@ def test_with_data(self, mock_now):
                 "transaction": "/country_by_code/",
                 "message": "This is bad",
                 "event_id": "b" * 32,
-                "timestamp": iso_format(before_now(minutes=1)),
+                "timestamp": before_now(minutes=1).isoformat(),
             },
             project_id=self.project.id,
         )
@@ -195,7 +195,7 @@ def test_transaction_threshold_modal(self, mock_now):
                 "transaction": "/country_by_code/",
                 "message": "This is bad",
                 "event_id": "b" * 32,
-                "timestamp": iso_format(before_now(minutes=3)),
+                "timestamp": before_now(minutes=3).isoformat(),
             },
             project_id=self.project.id,
         )
diff --git a/tests/acceptance/test_performance_trace_detail.py b/tests/acceptance/test_performance_trace_detail.py
index e0ae6743a68597..9e509dd890a954 100644
--- a/tests/acceptance/test_performance_trace_detail.py
+++ b/tests/acceptance/test_performance_trace_detail.py
@@ -3,7 +3,7 @@
 from uuid import uuid4
 
 from sentry.testutils.cases import AcceptanceTestCase, SnubaTestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.silo import no_silo_test
 from sentry.utils.samples import load_data
 
@@ -183,8 +183,8 @@ def path(self):
         return "/organizations/{}/performance/trace/{}/?pageStart={}&pageEnd={}".format(
             self.org.slug,
             self.trace_id,
-            iso_format(before_now(days=1).replace(hour=9, minute=0, second=0, microsecond=0)),
-            iso_format(before_now(days=1).replace(hour=11, minute=0, second=0, microsecond=0)),
+            before_now(days=1).replace(hour=9, minute=0, second=0, microsecond=0).isoformat(),
+            before_now(days=1).replace(hour=11, minute=0, second=0, microsecond=0).isoformat(),
         )
 
     @patch("django.utils.timezone.now")
diff --git a/tests/acceptance/test_performance_trends.py b/tests/acceptance/test_performance_trends.py
index 7329a9a499deaf..2d16aec4e54cb5 100644
--- a/tests/acceptance/test_performance_trends.py
+++ b/tests/acceptance/test_performance_trends.py
@@ -6,7 +6,7 @@
 from fixtures.page_objects.base import BasePage
 from sentry.models.project import Project
 from sentry.testutils.cases import AcceptanceTestCase, SnubaTestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.silo import no_silo_test
 from sentry.utils.samples import load_data
 
@@ -28,8 +28,8 @@ def make_trend(
                 {
                     "transaction": name,
                     "event_id": f"{index:02x}".rjust(32, "0"),
-                    "start_timestamp": iso_format(before_now(minutes=minutes, seconds=duration)),
-                    "timestamp": iso_format(before_now(minutes=minutes)),
+                    "start_timestamp": before_now(minutes=minutes, seconds=duration).isoformat(),
+                    "timestamp": before_now(minutes=minutes).isoformat(),
                 }
             )
             self.store_event(data=event, project_id=self.project.id)
diff --git a/tests/acceptance/test_project_tags_settings.py b/tests/acceptance/test_project_tags_settings.py
index 7131519c8e02c1..1bbc8cdf48eed2 100644
--- a/tests/acceptance/test_project_tags_settings.py
+++ b/tests/acceptance/test_project_tags_settings.py
@@ -2,7 +2,7 @@
 from unittest.mock import patch
 
 from sentry.testutils.cases import AcceptanceTestCase, SnubaTestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.silo import no_silo_test
 
 event_time = before_now(days=3)
@@ -29,7 +29,7 @@ def test_tags_list(self, mock_timezone):
                 "event_id": "a" * 32,
                 "message": "oh no",
                 "level": "error",
-                "timestamp": iso_format(event_time),
+                "timestamp": event_time.isoformat(),
             },
             project_id=self.project.id,
             assert_no_errors=False,
diff --git a/tests/acceptance/test_shared_issue.py b/tests/acceptance/test_shared_issue.py
index 415661ed9e93c1..3631eb7cedf137 100644
--- a/tests/acceptance/test_shared_issue.py
+++ b/tests/acceptance/test_shared_issue.py
@@ -1,6 +1,6 @@
 from sentry.models.groupshare import GroupShare
 from sentry.testutils.cases import AcceptanceTestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.silo import no_silo_test
 from sentry.utils.samples import load_data
 
@@ -17,7 +17,7 @@ def setUp(self):
 
     def test_python_event(self):
         data = load_data(platform="python")
-        data["timestamp"] = iso_format(before_now(days=1))
+        data["timestamp"] = before_now(days=1).isoformat()
         event = self.store_event(data=data, project_id=self.project.id)
         assert event.group is not None
 
diff --git a/tests/apidocs/endpoints/projects/test_dsyms.py b/tests/apidocs/endpoints/projects/test_dsyms.py
index dd51cfba5e769c..ace58d365add32 100644
--- a/tests/apidocs/endpoints/projects/test_dsyms.py
+++ b/tests/apidocs/endpoints/projects/test_dsyms.py
@@ -50,6 +50,6 @@ def test_post(self):
             data,
             format="multipart",
         )
-        request = RequestFactory().post(self.url, data)
+        request = RequestFactory().post(self.url, data, SERVER_NAME="de.sentry.io", secure=True)
 
         self.validate_schema(request, response)
diff --git a/tests/apidocs/endpoints/releases/test_organization_release_files.py b/tests/apidocs/endpoints/releases/test_organization_release_files.py
index 5f434d4fedd6aa..9702c0b4a98c9c 100644
--- a/tests/apidocs/endpoints/releases/test_organization_release_files.py
+++ b/tests/apidocs/endpoints/releases/test_organization_release_files.py
@@ -49,6 +49,12 @@ def test_post(self):
             data,
             format="multipart",
         )
-        request = RequestFactory().post(self.url, data=data, content_type="multipart/form-data")
+        request = RequestFactory().post(
+            self.url,
+            data=data,
+            content_type="multipart/form-data",
+            SERVER_NAME="us.sentry.io",
+            secure=True,
+        )
 
         self.validate_schema(request, response)
diff --git a/tests/apidocs/endpoints/releases/test_project_release_files.py b/tests/apidocs/endpoints/releases/test_project_release_files.py
index f5cb575b958c79..13671e3a3b738d 100644
--- a/tests/apidocs/endpoints/releases/test_project_release_files.py
+++ b/tests/apidocs/endpoints/releases/test_project_release_files.py
@@ -51,6 +51,12 @@ def test_post(self):
             data,
             format="multipart",
         )
-        request = RequestFactory().post(self.url, data=data, content_type="multipart/form-data")
+        request = RequestFactory().post(
+            self.url,
+            data=data,
+            content_type="multipart/form-data",
+            SERVER_NAME="us.sentry.io",
+            secure=True,
+        )
 
         self.validate_schema(request, response)
diff --git a/tests/js/fixtures/routeComponentPropsFixture.ts b/tests/js/fixtures/routeComponentPropsFixture.ts
index 7e6ef3a36bc3b1..3a401aab78b842 100644
--- a/tests/js/fixtures/routeComponentPropsFixture.ts
+++ b/tests/js/fixtures/routeComponentPropsFixture.ts
@@ -12,7 +12,7 @@ export function RouteComponentPropsFixture<
     location: router.location,
     params: router.params as QueryParams & RouteParams,
     routes: router.routes,
-    route: router.routes[0],
+    route: router.routes[0]!,
     routeParams: router.params as RouteParams,
     router,
   };
diff --git a/tests/js/sentry-test/importStyleMock.js b/tests/js/sentry-test/importStyleMock.js
index c10dc1f055ccd5..f053ebf7976e37 100644
--- a/tests/js/sentry-test/importStyleMock.js
+++ b/tests/js/sentry-test/importStyleMock.js
@@ -1,2 +1 @@
-// eslint-disable-next-line
 module.exports = {};
diff --git a/tests/js/sentry-test/initializeOrg.tsx b/tests/js/sentry-test/initializeOrg.tsx
index 6a2a2e66d973c3..82a02daf16e7e2 100644
--- a/tests/js/sentry-test/initializeOrg.tsx
+++ b/tests/js/sentry-test/initializeOrg.tsx
@@ -68,14 +68,14 @@ export function initializeOrg<RouterParams = {orgId: string; projectId: string}>
     params: router.params as any,
     routeParams: router.params,
     router,
-    route: router.routes[0],
+    route: router.routes[0]!,
     routes: router.routes,
     location: router.location,
   };
 
   return {
     organization,
-    project,
+    project: project!,
     projects,
     router,
     routerProps,
diff --git a/tests/js/sentry-test/performance/initializePerformanceData.ts b/tests/js/sentry-test/performance/initializePerformanceData.ts
index 13ea4212018c13..aa36cddcabacda 100644
--- a/tests/js/sentry-test/performance/initializePerformanceData.ts
+++ b/tests/js/sentry-test/performance/initializePerformanceData.ts
@@ -232,11 +232,11 @@ export function generateSampleSpan(
     data: {},
   };
 
-  if (!Array.isArray(event.entries[0].data)) {
+  if (!Array.isArray(event.entries[0]!.data)) {
     throw new Error('Event entries data is not an array');
   }
 
-  const data = event.entries[0].data as RawSpanType[];
+  const data = event.entries[0]!.data as RawSpanType[];
   data.push(span);
   return span;
 }
diff --git a/tests/js/sentry-test/performance/utils.ts b/tests/js/sentry-test/performance/utils.ts
index f49364fb0731b2..a3bf3553b3caed 100644
--- a/tests/js/sentry-test/performance/utils.ts
+++ b/tests/js/sentry-test/performance/utils.ts
@@ -256,7 +256,7 @@ export class MockSpan {
 
     for (let i = 0; i < depth; i++) {
       currentSpan.addChild(currentSpan.getOpts());
-      currentSpan = currentSpan.children[0];
+      currentSpan = currentSpan.children[0]!;
     }
 
     return this;
diff --git a/tests/js/sentry-test/reactTestingLibrary.spec.tsx b/tests/js/sentry-test/reactTestingLibrary.spec.tsx
index bae343582d90db..8a440a3ef0f94d 100644
--- a/tests/js/sentry-test/reactTestingLibrary.spec.tsx
+++ b/tests/js/sentry-test/reactTestingLibrary.spec.tsx
@@ -6,7 +6,7 @@ describe('rerender', () => {
   // Taken from https://testing-library.com/docs/example-update-props/
   let idCounter = 1;
 
-  function NumberDisplay({number}) {
+  function NumberDisplay({number}: {number: number}) {
     const id = useRef(idCounter++); // to ensure we don't remount a different instance
 
     return (
diff --git a/tests/js/sentry-test/reactTestingLibrary.tsx b/tests/js/sentry-test/reactTestingLibrary.tsx
index 1217a8ec69c286..91a3d28a16dc79 100644
--- a/tests/js/sentry-test/reactTestingLibrary.tsx
+++ b/tests/js/sentry-test/reactTestingLibrary.tsx
@@ -12,6 +12,7 @@ import {GlobalDrawer} from 'sentry/components/globalDrawer';
 import GlobalModal from 'sentry/components/globalModal';
 import type {InjectedRouter} from 'sentry/types/legacyReactRouter';
 import type {Organization} from 'sentry/types/organization';
+import {DANGEROUS_SET_TEST_HISTORY} from 'sentry/utils/browserHistory';
 import {QueryClientProvider} from 'sentry/utils/queryClient';
 import {lightTheme} from 'sentry/utils/theme';
 import {OrganizationContext} from 'sentry/views/organizationContext';
@@ -104,6 +105,15 @@ function makeAllTheProviders(options: ProviderOptions) {
       };
     }
 
+    DANGEROUS_SET_TEST_HISTORY({
+      goBack: router.goBack,
+      push: router.push,
+      replace: router.replace,
+      listen: jest.fn(() => {}),
+      listenBefore: jest.fn(),
+      getCurrentLocation: jest.fn(() => ({pathname: '', query: {}})),
+    });
+
     // By default react-router 6 catches exceptions and displays the stack
     // trace. For tests we want them to bubble out
     function ErrorBoundary(): React.ReactNode {
@@ -203,11 +213,12 @@ instrumentUserEvent();
 // eslint-disable-next-line no-restricted-imports, import/export
 export * from '@testing-library/react';
 
-// eslint-disable-next-line import/export
 export {
+  // eslint-disable-next-line import/export
   render,
   renderGlobalModal,
   userEvent,
+  // eslint-disable-next-line import/export
   fireEvent,
   waitForDrawerToHide,
   makeAllTheProviders,
diff --git a/tests/js/sentry-test/selectEvent.tsx b/tests/js/sentry-test/selectEvent.tsx
index 735329df7a7428..a7c2710d4800ab 100644
--- a/tests/js/sentry-test/selectEvent.tsx
+++ b/tests/js/sentry-test/selectEvent.tsx
@@ -23,7 +23,7 @@
 
 import userEvent from '@testing-library/user-event'; // eslint-disable-line no-restricted-imports
 
-import {findAllByText, findByText, type Matcher, waitFor} from './reactTestingLibrary';
+import {type Matcher, waitFor, within} from 'sentry-test/reactTestingLibrary';
 
 /**
  * Find the react-select container from its input field
@@ -107,14 +107,14 @@ const select = async (
     }
 
     // only consider visible, interactive elements
-    const matchingElements = await findAllByText(container, option, {
+    const matchingElements = await within(container).findAllByText(option, {
       ignore: "[aria-live] *,[style*='visibility: hidden']",
     });
 
     // When the target option is already selected, the react-select display text
     // will also match the selector. In this case, the actual dropdown element is
     // positioned last in the DOM tree.
-    const optionElement = matchingElements[matchingElements.length - 1];
+    const optionElement = matchingElements[matchingElements.length - 1]!;
     await user.click(optionElement, {skipHover: true});
   }
 };
@@ -147,7 +147,7 @@ const create = async (
   await select(input, createOptionText, {...config, user});
 
   if (waitForElement) {
-    await findByText(getReactSelectContainerFromInput(input), option);
+    await within(getReactSelectContainerFromInput(input)).findByText(option);
   }
 };
 
@@ -161,6 +161,7 @@ const clearFirst = async (
 ) => {
   const container = getReactSelectContainerFromInput(input);
   // The "clear" button is the first svg element that is hidden to screen readers
+  // eslint-disable-next-line testing-library/no-node-access
   const clearButton = container.querySelector('svg[aria-hidden="true"]')!;
   await clear(clearButton, {user});
 };
@@ -176,8 +177,9 @@ const clearAll = async (
   const container = getReactSelectContainerFromInput(input);
   // The "clear all" button is the penultimate svg element that is hidden to screen readers
   // (the last one is the dropdown arrow)
+  // eslint-disable-next-line testing-library/no-node-access
   const elements = container.querySelectorAll('svg[aria-hidden="true"]');
-  const clearAllButton = elements[elements.length - 2];
+  const clearAllButton = elements[elements.length - 2]!;
   await clear(clearAllButton, {user});
 };
 
diff --git a/tests/js/sentry-test/svgMock.js b/tests/js/sentry-test/svgMock.js
index 058b84e174e353..9bddbeab7c8f64 100644
--- a/tests/js/sentry-test/svgMock.js
+++ b/tests/js/sentry-test/svgMock.js
@@ -1,2 +1 @@
-// eslint-disable-next-line
 module.exports = {default: {id: 'test', viewBox: {}}};
diff --git a/tests/js/setup.ts b/tests/js/setup.ts
index 3fecd801cff6ce..89f36a61b5c5fc 100644
--- a/tests/js/setup.ts
+++ b/tests/js/setup.ts
@@ -12,6 +12,7 @@ import {resetMockDate} from 'sentry-test/utils';
 
 // eslint-disable-next-line jest/no-mocks-import
 import type {Client} from 'sentry/__mocks__/api';
+// eslint-disable-next-line no-restricted-imports
 import {DEFAULT_LOCALE_DATA, setLocale} from 'sentry/locale';
 import ConfigStore from 'sentry/stores/configStore';
 import {DANGEROUS_SET_TEST_HISTORY} from 'sentry/utils/browserHistory';
diff --git a/tests/relay_integration/lang/java/test_plugin.py b/tests/relay_integration/lang/java/test_plugin.py
index 76db769fd0cc1e..d35beccceff3c4 100644
--- a/tests/relay_integration/lang/java/test_plugin.py
+++ b/tests/relay_integration/lang/java/test_plugin.py
@@ -474,19 +474,6 @@ def test_basic_resolving(self):
         }
 
         event = self.post_and_retrieve_event(event_data)
-        if not self.use_relay():
-            # We measure the number of queries after an initial post,
-            # because there are many queries polluting the array
-            # before the actual "processing" happens (like, auth_user)
-            with self.assertWriteQueries(
-                {
-                    "nodestore_node": 2,
-                    "sentry_eventuser": 1,
-                    "sentry_groupedmessage": 1,
-                    "sentry_userreport": 1,
-                }
-            ):
-                self.post_and_retrieve_event(event_data)
 
         exc = event.interfaces["exception"].values[0]
         bt = exc.stacktrace
@@ -548,19 +535,6 @@ def test_resolving_does_not_fail_when_no_value(self):
         }
 
         event = self.post_and_retrieve_event(event_data)
-        if not self.use_relay():
-            # We measure the number of queries after an initial post,
-            # because there are many queries polluting the array
-            # before the actual "processing" happens (like, auth_user)
-            with self.assertWriteQueries(
-                {
-                    "nodestore_node": 2,
-                    "sentry_eventuser": 1,
-                    "sentry_groupedmessage": 1,
-                    "sentry_userreport": 1,
-                }
-            ):
-                self.post_and_retrieve_event(event_data)
 
         metrics = event.data["_metrics"]
         assert not metrics.get("flag.processing.error")
@@ -618,19 +592,6 @@ def test_resolving_does_not_fail_when_no_module_or_function(self):
         }
 
         event = self.post_and_retrieve_event(event_data)
-        if not self.use_relay():
-            # We measure the number of queries after an initial post,
-            # because there are many queries polluting the array
-            # before the actual "processing" happens (like, auth_user)
-            with self.assertWriteQueries(
-                {
-                    "nodestore_node": 2,
-                    "sentry_eventuser": 1,
-                    "sentry_groupedmessage": 1,
-                    "sentry_userreport": 1,
-                }
-            ):
-                self.post_and_retrieve_event(event_data)
 
         metrics = event.data["_metrics"]
         assert not metrics.get("flag.processing.error")
@@ -707,19 +668,6 @@ def test_sets_inapp_after_resolving(self):
         }
 
         event = self.post_and_retrieve_event(event_data)
-        if not self.use_relay():
-            # We measure the number of queries after an initial post,
-            # because there are many queries polluting the array
-            # before the actual "processing" happens (like, auth_user)
-            with self.assertWriteQueries(
-                {
-                    "nodestore_node": 2,
-                    "sentry_eventuser": 1,
-                    "sentry_groupedmessage": 1,
-                    "sentry_userreport": 1,
-                }
-            ):
-                self.post_and_retrieve_event(event_data)
 
         exc = event.interfaces["exception"].values[0]
         bt = exc.stacktrace
@@ -774,19 +722,6 @@ def test_resolving_inline(self):
         }
 
         event = self.post_and_retrieve_event(event_data)
-        if not self.use_relay():
-            # We measure the number of queries after an initial post,
-            # because there are many queries polluting the array
-            # before the actual "processing" happens (like, auth_user)
-            with self.assertWriteQueries(
-                {
-                    "nodestore_node": 2,
-                    "sentry_eventuser": 1,
-                    "sentry_groupedmessage": 1,
-                    "sentry_userreport": 1,
-                }
-            ):
-                self.post_and_retrieve_event(event_data)
 
         exc = event.interfaces["exception"].values[0]
         bt = exc.stacktrace
@@ -869,19 +804,6 @@ def test_resolving_inline_with_native_frames(self):
         }
 
         event = self.post_and_retrieve_event(event_data)
-        if not self.use_relay():
-            # We measure the number of queries after an initial post,
-            # because there are many queries polluting the array
-            # before the actual "processing" happens (like, auth_user)
-            with self.assertWriteQueries(
-                {
-                    "nodestore_node": 2,
-                    "sentry_eventuser": 1,
-                    "sentry_groupedmessage": 1,
-                    "sentry_userreport": 1,
-                }
-            ):
-                self.post_and_retrieve_event(event_data)
 
         exc = event.interfaces["exception"].values[0]
         bt = exc.stacktrace
@@ -1092,19 +1014,6 @@ def test_basic_source_lookup(self):
         }
 
         event = self.post_and_retrieve_event(event_data)
-        if not self.use_relay():
-            # We measure the number of queries after an initial post,
-            # because there are many queries polluting the array
-            # before the actual "processing" happens (like, auth_user)
-            with self.assertWriteQueries(
-                {
-                    "nodestore_node": 2,
-                    "sentry_eventuser": 1,
-                    "sentry_groupedmessage": 1,
-                    "sentry_userreport": 1,
-                }
-            ):
-                self.post_and_retrieve_event(event_data)
 
         exc = event.interfaces["exception"].values[0]
         bt = exc.stacktrace
@@ -1410,19 +1319,6 @@ def test_source_lookup_with_proguard(self):
         }
 
         event = self.post_and_retrieve_event(event_data)
-        if not self.use_relay():
-            # We measure the number of queries after an initial post,
-            # because there are many queries polluting the array
-            # before the actual "processing" happens (like, auth_user)
-            with self.assertWriteQueries(
-                {
-                    "nodestore_node": 2,
-                    "sentry_eventuser": 1,
-                    "sentry_groupedmessage": 1,
-                    "sentry_userreport": 1,
-                }
-            ):
-                self.post_and_retrieve_event(event_data)
 
         exc = event.interfaces["exception"].values[0]
         bt = exc.stacktrace
diff --git a/tests/relay_integration/test_integration.py b/tests/relay_integration/test_integration.py
index ebbaaf4bf16bfb..2416ee3dc1a10a 100644
--- a/tests/relay_integration/test_integration.py
+++ b/tests/relay_integration/test_integration.py
@@ -7,7 +7,7 @@
 from sentry.models.eventattachment import EventAttachment
 from sentry.tasks.relay import invalidate_project_config
 from sentry.testutils.cases import TransactionTestCase
-from sentry.testutils.helpers.datetime import before_now, timestamp_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.relay import RelayStoreHelper
 from sentry.testutils.skips import requires_kafka
 
@@ -158,8 +158,8 @@ def test_transaction(self):
                     "op": "react.mount",
                     "parent_span_id": "8f5a2b8768cafb4e",
                     "span_id": "bd429c44b67a3eb4",
-                    "start_timestamp": timestamp_format(before_now(minutes=1, milliseconds=250)),
-                    "timestamp": timestamp_format(before_now(minutes=1)),
+                    "start_timestamp": before_now(minutes=1, milliseconds=250).timestamp(),
+                    "timestamp": before_now(minutes=1).timestamp(),
                     "trace_id": "ff62a8b040f340bda5d830223def1d81",
                 },
                 {
@@ -167,8 +167,8 @@ def test_transaction(self):
                     "op": "browser",
                     "parent_span_id": "bd429c44b67a3eb4",
                     "span_id": "a99fd04e79e17631",
-                    "start_timestamp": timestamp_format(before_now(minutes=1, milliseconds=200)),
-                    "timestamp": timestamp_format(before_now(minutes=1)),
+                    "start_timestamp": before_now(minutes=1, milliseconds=200).timestamp(),
+                    "timestamp": before_now(minutes=1).timestamp(),
                     "trace_id": "ff62a8b040f340bda5d830223def1d81",
                 },
                 {
@@ -176,8 +176,8 @@ def test_transaction(self):
                     "op": "resource",
                     "parent_span_id": "bd429c44b67a3eb4",
                     "span_id": "a71a5e67db5ce938",
-                    "start_timestamp": timestamp_format(before_now(minutes=1, milliseconds=200)),
-                    "timestamp": timestamp_format(before_now(minutes=1)),
+                    "start_timestamp": before_now(minutes=1, milliseconds=200).timestamp(),
+                    "timestamp": before_now(minutes=1).timestamp(),
                     "trace_id": "ff62a8b040f340bda5d830223def1d81",
                 },
                 {
@@ -185,8 +185,8 @@ def test_transaction(self):
                     "op": "http",
                     "parent_span_id": "a99fd04e79e17631",
                     "span_id": "abe79ad9292b90a9",
-                    "start_timestamp": timestamp_format(before_now(minutes=1, milliseconds=200)),
-                    "timestamp": timestamp_format(before_now(minutes=1)),
+                    "start_timestamp": before_now(minutes=1, milliseconds=200).timestamp(),
+                    "timestamp": before_now(minutes=1).timestamp(),
                     "trace_id": "ff62a8b040f340bda5d830223def1d81",
                 },
                 {
@@ -194,8 +194,8 @@ def test_transaction(self):
                     "op": "db",
                     "parent_span_id": "abe79ad9292b90a9",
                     "span_id": "9c045ea336297177",
-                    "start_timestamp": timestamp_format(before_now(minutes=1, milliseconds=200)),
-                    "timestamp": timestamp_format(before_now(minutes=1)),
+                    "start_timestamp": before_now(minutes=1, milliseconds=200).timestamp(),
+                    "timestamp": before_now(minutes=1).timestamp(),
                     "trace_id": "ff62a8b040f340bda5d830223def1d81",
                 },
             ],
diff --git a/tests/sentry/api/bases/test_organization.py b/tests/sentry/api/bases/test_organization.py
index cbab0a57789914..92dadefe83a423 100644
--- a/tests/sentry/api/bases/test_organization.py
+++ b/tests/sentry/api/bases/test_organization.py
@@ -36,6 +36,7 @@
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import TestCase
 from sentry.testutils.helpers.datetime import freeze_time
+from sentry.testutils.requests import drf_request_from_request
 from sentry.testutils.silo import assume_test_silo_mode
 from sentry.users.services.user.serial import serialize_rpc_user
 from sentry.users.services.user.service import user_service
@@ -83,9 +84,10 @@ def has_object_perm(
         request = self.make_request(
             user=user, auth=auth, method=method, is_superuser=is_superuser, is_staff=is_staff
         )
+        drf_request = drf_request_from_request(request)
         result_with_obj = perm.has_permission(
-            request=request, view=None
-        ) and perm.has_object_permission(request=request, view=None, organization=obj)
+            request=drf_request, view=None
+        ) and perm.has_object_permission(request=drf_request, view=None, organization=obj)
         if result_with_org_rpc is not None:
             return bool(result_with_obj and result_with_org_rpc and result_with_org_context_rpc)
         return result_with_obj
@@ -237,11 +239,12 @@ def test_staff(self):
     def test_staff_passes_2FA(self):
         staff_user = self.create_user(is_staff=True)
         request = self.make_request(user=serialize_rpc_user(staff_user), is_staff=True)
+        drf_request = drf_request_from_request(request)
         permission = self.permission_cls()
         self.org.flags.require_2fa = True
         self.org.save()
 
-        assert not permission.is_not_2fa_compliant(request=request, organization=self.org)
+        assert not permission.is_not_2fa_compliant(request=drf_request, organization=self.org)
 
 
 class BaseOrganizationEndpointTest(TestCase):
diff --git a/tests/sentry/api/bases/test_organizationmember.py b/tests/sentry/api/bases/test_organizationmember.py
index 45a64f9b4f978c..42400aab11ee36 100644
--- a/tests/sentry/api/bases/test_organizationmember.py
+++ b/tests/sentry/api/bases/test_organizationmember.py
@@ -1,5 +1,4 @@
 from sentry.api.bases.organizationmember import MemberAndStaffPermission, MemberPermission
-from sentry.testutils.helpers import Feature
 from tests.sentry.api.bases.test_organization import PermissionBaseTestCase
 
 
@@ -27,34 +26,30 @@ def test_org_member(self):
         self.create_member(user=member_user, organization=self.org, role="member")
         assert self.has_object_perm("GET", self.org, user=member_user)
         assert not self.has_object_perm("PUT", self.org, user=member_user)
-        assert not self.has_object_perm("POST", self.org, user=member_user)
         assert not self.has_object_perm("DELETE", self.org, user=member_user)
 
-        with Feature({"organizations:members-invite-teammates": True}):
-            self.org.flags.disable_member_invite = False
-            self.org.save()
-            assert self.has_object_perm("POST", self.org, user=member_user)
+        self.org.flags.disable_member_invite = False
+        self.org.save()
+        assert self.has_object_perm("POST", self.org, user=member_user)
 
-            self.org.flags.disable_member_invite = True
-            self.org.save()
-            assert not self.has_object_perm("POST", self.org, user=member_user)
+        self.org.flags.disable_member_invite = True
+        self.org.save()
+        assert not self.has_object_perm("POST", self.org, user=member_user)
 
     def test_org_admin(self):
         admin_user = self.create_user()
         self.create_member(user=admin_user, organization=self.org, role="admin")
         assert self.has_object_perm("GET", self.org, user=admin_user)
         assert not self.has_object_perm("PUT", self.org, user=admin_user)
-        assert not self.has_object_perm("POST", self.org, user=admin_user)
         assert not self.has_object_perm("DELETE", self.org, user=admin_user)
 
-        with Feature({"organizations:members-invite-teammates": True}):
-            self.org.flags.disable_member_invite = False
-            self.org.save()
-            assert self.has_object_perm("POST", self.org, user=admin_user)
+        self.org.flags.disable_member_invite = False
+        self.org.save()
+        assert self.has_object_perm("POST", self.org, user=admin_user)
 
-            self.org.flags.disable_member_invite = True
-            self.org.save()
-            assert not self.has_object_perm("POST", self.org, user=admin_user)
+        self.org.flags.disable_member_invite = True
+        self.org.save()
+        assert not self.has_object_perm("POST", self.org, user=admin_user)
 
     def test_org_manager(self):
         manager_user = self.create_user()
diff --git a/tests/sentry/api/bases/test_project.py b/tests/sentry/api/bases/test_project.py
index b5c3e83d09884e..240f1db78523f7 100644
--- a/tests/sentry/api/bases/test_project.py
+++ b/tests/sentry/api/bases/test_project.py
@@ -1,6 +1,7 @@
 from sentry.api.bases.project import ProjectAndStaffPermission, ProjectPermission
 from sentry.testutils.cases import TestCase
 from sentry.testutils.helpers import with_feature
+from sentry.testutils.requests import drf_request_from_request
 from sentry.users.services.user.serial import serialize_rpc_user
 
 
@@ -14,7 +15,10 @@ def has_object_perm(self, method, obj, auth=None, user=None, is_superuser=None,
         request = self.make_request(
             user=user, auth=auth, method=method, is_superuser=is_superuser, is_staff=is_staff
         )
-        return perm.has_permission(request, None) and perm.has_object_permission(request, None, obj)
+        drf_request = drf_request_from_request(request)
+        return perm.has_permission(drf_request, None) and perm.has_object_permission(
+            drf_request, None, obj
+        )
 
 
 class ProjectPermissionTest(ProjectPermissionBase):
@@ -423,9 +427,12 @@ def test_staff_passes_2FA(self):
         staff_user = self.create_user(is_staff=True)
         self.login_as(user=staff_user, staff=True)
         request = self.make_request(user=serialize_rpc_user(staff_user), is_staff=True)
+        drf_request = drf_request_from_request(request)
         permission = self.permission_cls()
 
         self.organization.flags.require_2fa = True
         self.organization.save()
 
-        assert not permission.is_not_2fa_compliant(request=request, organization=self.organization)
+        assert not permission.is_not_2fa_compliant(
+            request=drf_request, organization=self.organization
+        )
diff --git a/tests/sentry/api/bases/test_team.py b/tests/sentry/api/bases/test_team.py
index b5dec296a341ff..81ad7717696b33 100644
--- a/tests/sentry/api/bases/test_team.py
+++ b/tests/sentry/api/bases/test_team.py
@@ -1,6 +1,7 @@
 from sentry.api.bases.team import TeamPermission
 from sentry.testutils.cases import TestCase
 from sentry.testutils.helpers import with_feature
+from sentry.testutils.requests import drf_request_from_request
 
 
 class TeamPermissionBase(TestCase):
@@ -14,7 +15,10 @@ def has_object_perm(self, method, obj, auth=None, user=None, is_superuser=None):
         request = self.make_request(user=user, auth=auth, method=method)
         if is_superuser:
             request.superuser.set_logged_in(request.user)
-        return perm.has_permission(request, None) and perm.has_object_permission(request, None, obj)
+        drf_request = drf_request_from_request(request)
+        return perm.has_permission(drf_request, None) and perm.has_object_permission(
+            drf_request, None, obj
+        )
 
 
 class TeamPermissionTest(TeamPermissionBase):
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 10c09f55151da0..482c6a81cfe5cf 100644
--- a/tests/sentry/api/endpoints/notifications/test_notification_actions_details.py
+++ b/tests/sentry/api/endpoints/notifications/test_notification_actions_details.py
@@ -50,14 +50,11 @@ def setUp(self):
         self.login_as(user=self.user)
 
     def mock_msg_schedule_response(self, channel_id, result_name="channel"):
-        if channel_id == "channel_not_found":
-            body = {"ok": False, "error": "channel_not_found"}
-        else:
-            body = {
-                "ok": True,
-                result_name: channel_id,
-                "scheduled_message_id": "Q1298393284",
-            }
+        body = {
+            "ok": True,
+            result_name: channel_id,
+            "scheduled_message_id": "Q1298393284",
+        }
         return mock_slack_response("chat_scheduleMessage", body=body)
 
     def mock_msg_delete_scheduled_response(self, channel_id, result_name="channel"):
diff --git a/tests/sentry/api/endpoints/secret_scanning/test_github.py b/tests/sentry/api/endpoints/secret_scanning/test_github.py
index 902e61e4eb7299..dea5f64f447eb9 100644
--- a/tests/sentry/api/endpoints/secret_scanning/test_github.py
+++ b/tests/sentry/api/endpoints/secret_scanning/test_github.py
@@ -122,7 +122,7 @@ def test_true_positive_user_token(self, mock_logger):
         payload = [
             {
                 "source": "commit",
-                "token": str(token),
+                "token": str(token.token),
                 "type": "sentry_user_auth_token",
                 "url": "https://example.com/base-repo-url/",
             }
diff --git a/tests/sentry/api/endpoints/test_admin_project_configs.py b/tests/sentry/api/endpoints/test_admin_project_configs.py
index fe8745a9908cea..0cd2d320efd8c2 100644
--- a/tests/sentry/api/endpoints/test_admin_project_configs.py
+++ b/tests/sentry/api/endpoints/test_admin_project_configs.py
@@ -98,7 +98,7 @@ def test_uncached_project(self):
         Asking for a project that was not cached in redis will return
         an empty marker
         """
-        expected = {"configs": {self.p2_pk.public_key: None}}
+        outdated = {"configs": {self.p2_pk.public_key: None}}
 
         self.login_as(self.superuser, superuser=True)
 
@@ -106,17 +106,17 @@ def test_uncached_project(self):
         response = self.client.get(url)
         assert response.status_code == status.HTTP_200_OK
         actual = response.json()
-        assert actual == expected
+        assert actual != outdated
 
         url = self.get_url(key=self.p2_pk.public_key)
         response = self.client.get(url)
         assert response.status_code == status.HTTP_200_OK
         actual = response.json()
-        assert actual == expected
+        assert actual != outdated
 
     def test_inexistent_project(self):
         """
-        Asking for an inexitent project will return 404
+        Asking for an inexistent project will return 404
         """
         inexistent_project_id = 2 ^ 32
         self.login_as(self.superuser, superuser=True)
@@ -129,22 +129,94 @@ def test_inexistent_key(self):
         """
         Asking for an inexistent project key will return an empty result
         """
-        inexsitent_key = 123
+        inexistent = 123
         self.login_as(self.superuser, superuser=True)
 
-        url = self.get_url(key=inexsitent_key)
+        url = self.get_url(key=inexistent)
         response = self.client.get(url)
 
-        assert response.status_code == status.HTTP_200_OK
-        expected = {"configs": {str(inexsitent_key): None}}
-        actual = response.json()
-        assert actual == expected
+        assert response.status_code == status.HTTP_404_NOT_FOUND
 
-    def test_invalidate_project_config(self):
-        response = self.get_response(method="post", project_id=self.project.id)
+    def test_invalidate_project_config_unauthorized(self):
+        url = self.get_url()
+        data = {"projectId": self.project.id}
+        response = self.client.post(url, data=data)
         assert response.status_code == 401
 
+    def test_invalidate_project_config_non_superuser(self):
+        url = self.get_url()
+        data = {"projectId": self.project.id}
+        self.login_as(self.user, superuser=False)
+        response = self.client.post(url, data=data)
+        assert response.status_code == 403
+
+    def test_invalidate_project_config_missing_project_id(self):
+        url = self.get_url()
+        self.login_as(self.superuser, superuser=True)
+        response = self.client.post(url)
+        assert response.status_code == 400
+
+    def test_invalidate_project_config_cached_project(self):
+        url = self.get_url()
         self.login_as(self.superuser, superuser=True)
+        data = {"projectId": self.proj2.id}
+        projectconfig_cache.backend.set_many(
+            {
+                self.p2_pk.public_key: {"proj2": "config"},
+            }
+        )
+        response = self.client.post(url, data=data)
+        assert response.status_code == 201
+
+    def test_invalidate_project_config_cached_project_sets_correct_config(self):
+        url = self.get_url()
+        self.login_as(self.superuser, superuser=True)
+        data = {"projectId": self.proj2.id}
+        projectconfig_cache.backend.set_many(
+            {
+                self.p2_pk.public_key: {"proj2": "config"},
+            }
+        )
+        response = self.client.post(url, data=data)
+        assert response.status_code == 201
+        assert projectconfig_cache.backend.get(self.p2_pk.public_key) != {"proj2": "config"}
+
+    def test_invalidate_project_config_uncached_project(self):
+        url = self.get_url()
+        self.login_as(self.superuser, superuser=True)
+        data = {"projectId": self.proj1.id}
+        response = self.client.post(url, data=data)
+        assert response.status_code == 201
+
+    def test_invalidate_project_config_uncached_project_returns_correct_config(self):
+        url = self.get_url()
+        self.login_as(self.superuser, superuser=True)
+        data = {"projectId": self.proj1.id}
+        response = self.client.post(url, data=data)
+        assert response.status_code == 201
+
+    def test_invalidate_project_config_with_multiple_project_keys(self):
+        url = self.get_url()
+        self.login_as(self.superuser, superuser=True)
+
+        # Create new project with two keys
+        test_project = self.create_project(
+            name="test_proj", organization=self.org, teams=[self.first_team]
+        )
+        first_key = self.create_project_key(test_project)
+        second_key = test_project.key_set.create()
+
+        # Set configs for both keys
+        projectconfig_cache.backend.set_many(
+            {
+                first_key.public_key: {"test_proj": "config1"},
+                second_key.public_key: {"test_proj": "config2"},
+            }
+        )
+
+        data = {"projectId": test_project.id}
+        response = self.client.post(url, data=data)
 
-        response = self.get_response(method="post", project_id=self.project.id)
-        assert response.status_code == 204
+        assert response.status_code == 201
+        assert projectconfig_cache.backend.get(first_key.public_key) != {"test_proj": "config1"}
+        assert projectconfig_cache.backend.get(second_key.public_key) != {"test_proj": "config2"}
diff --git a/tests/sentry/api/endpoints/test_api_authorizations.py b/tests/sentry/api/endpoints/test_api_authorizations.py
index 0f5b7a73fb7dc8..da1034b0de1ebc 100644
--- a/tests/sentry/api/endpoints/test_api_authorizations.py
+++ b/tests/sentry/api/endpoints/test_api_authorizations.py
@@ -51,3 +51,29 @@ def test_simple(self):
         self.get_success_response(authorization=auth.id, status_code=204)
         assert not ApiAuthorization.objects.filter(id=auth.id).exists()
         assert not ApiToken.objects.filter(id=token.id).exists()
+
+    def test_with_org(self):
+        org1 = self.organization
+        org2 = self.create_organization(owner=self.user, slug="test-org-2")
+        app_with_org = ApiApplication.objects.create(
+            name="test-app", owner=self.user, requires_org_level_access=True
+        )
+        org1_auth = ApiAuthorization.objects.create(
+            application=app_with_org, user=self.user, organization_id=org1.id
+        )
+        org2_auth = ApiAuthorization.objects.create(
+            application=app_with_org, user=self.user, organization_id=org2.id
+        )
+        org1_token = ApiToken.objects.create(
+            application=app_with_org, user=self.user, scoping_organization_id=org1.id
+        )
+        org2_token = ApiToken.objects.create(
+            application=app_with_org, user=self.user, scoping_organization_id=org2.id
+        )
+
+        self.get_success_response(authorization=org1_auth.id, status_code=204)
+        assert not ApiAuthorization.objects.filter(id=org1_auth.id).exists()
+        assert not ApiToken.objects.filter(id=org1_token.id).exists()
+
+        assert ApiAuthorization.objects.filter(id=org2_auth.id).exists()
+        assert ApiToken.objects.filter(id=org2_token.id).exists()
diff --git a/tests/sentry/api/endpoints/test_custom_rules.py b/tests/sentry/api/endpoints/test_custom_rules.py
index 1c7ba791b57ed8..6c3d42ae031456 100644
--- a/tests/sentry/api/endpoints/test_custom_rules.py
+++ b/tests/sentry/api/endpoints/test_custom_rules.py
@@ -10,7 +10,7 @@
     UnsupportedSearchQueryReason,
     get_rule_condition,
 )
-from sentry.models.dynamicsampling import CUSTOM_RULE_DATE_FORMAT, CustomDynamicSamplingRule
+from sentry.models.dynamicsampling import CustomDynamicSamplingRule
 from sentry.testutils.cases import APITestCase, TestCase
 
 
@@ -206,8 +206,8 @@ def test_create(self):
 
         data = resp.data
 
-        start_date = datetime.strptime(data["startDate"], CUSTOM_RULE_DATE_FORMAT)
-        end_date = datetime.strptime(data["endDate"], CUSTOM_RULE_DATE_FORMAT)
+        start_date = datetime.fromisoformat(data["startDate"])
+        end_date = datetime.fromisoformat(data["endDate"])
         assert end_date - start_date == timedelta(days=2)
         projects = data["projects"]
         assert projects == [self.project.id]
@@ -260,8 +260,8 @@ def test_updates_existing(self):
         data = resp.data
 
         rule_id = data["ruleId"]
-        start_date = datetime.strptime(data["startDate"], CUSTOM_RULE_DATE_FORMAT)
-        end_date = datetime.strptime(data["endDate"], CUSTOM_RULE_DATE_FORMAT)
+        start_date = datetime.fromisoformat(data["startDate"])
+        end_date = datetime.fromisoformat(data["endDate"])
         assert end_date - start_date == timedelta(days=2)
 
         request_data = {
@@ -275,8 +275,8 @@ def test_updates_existing(self):
         assert resp.status_code == 200
         data = resp.data
 
-        start_date = datetime.strptime(data["startDate"], CUSTOM_RULE_DATE_FORMAT)
-        end_date = datetime.strptime(data["endDate"], CUSTOM_RULE_DATE_FORMAT)
+        start_date = datetime.fromisoformat(data["startDate"])
+        end_date = datetime.fromisoformat(data["endDate"])
         assert end_date - start_date >= timedelta(days=2)
 
         projects = data["projects"]
diff --git a/tests/sentry/api/endpoints/test_event_attachment_details.py b/tests/sentry/api/endpoints/test_event_attachment_details.py
index 4599af4de28e84..778c4b32936c0a 100644
--- a/tests/sentry/api/endpoints/test_event_attachment_details.py
+++ b/tests/sentry/api/endpoints/test_event_attachment_details.py
@@ -4,7 +4,7 @@
 from sentry.attachments.base import CachedAttachment
 from sentry.models.activity import Activity
 from sentry.models.eventattachment import EventAttachment
-from sentry.testutils.cases import APITestCase, PermissionTestCase
+from sentry.testutils.cases import APITestCase, PermissionTestCase, TestCase
 from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.helpers.features import with_feature
 from sentry.testutils.helpers.options import override_options
@@ -17,7 +17,7 @@
 ATTACHMENT_CONTENT = b"File contents here" * 10_000
 
 
-class CreateAttachmentMixin:
+class CreateAttachmentMixin(TestCase):
     def create_attachment(self, content: bytes | None = None, group_id: int | None = None):
         self.project = self.create_project()
         self.release = self.create_release(self.project, self.user)
@@ -151,6 +151,7 @@ def test_delete_activity_with_group(self):
         delete_activity = Activity.objects.get(type=ActivityType.DELETED_ATTACHMENT.value)
         assert delete_activity.project == self.project
         assert delete_activity.group_id == group_id
+        assert delete_activity.group is not None
         assert delete_activity.group.id == group_id
 
 
diff --git a/tests/sentry/api/endpoints/test_group_ai_autofix.py b/tests/sentry/api/endpoints/test_group_ai_autofix.py
index 915274955569d3..568c5e13dbc92f 100644
--- a/tests/sentry/api/endpoints/test_group_ai_autofix.py
+++ b/tests/sentry/api/endpoints/test_group_ai_autofix.py
@@ -29,7 +29,7 @@ def test_ai_autofix_get_endpoint_with_autofix(self, mock_get_autofix_state):
         mock_get_autofix_state.return_value = AutofixState(
             run_id=123,
             request={"project_id": 456, "issue": {"id": 789}},
-            updated_at=datetime.strptime("2023-07-18T12:00:00Z", "%Y-%m-%dT%H:%M:%SZ"),
+            updated_at=datetime.fromisoformat("2023-07-18T12:00:00Z"),
             status=AutofixStatus.PROCESSING,
         )
 
@@ -64,7 +64,7 @@ def test_ai_autofix_get_endpoint_repositories(
         mock_get_autofix_state.return_value = AutofixState(
             run_id=123,
             request={"project_id": 456, "issue": {"id": 789}},
-            updated_at=datetime.strptime("2023-07-18T12:00:00Z", "%Y-%m-%dT%H:%M:%SZ"),
+            updated_at=datetime.fromisoformat("2023-07-18T12:00:00Z"),
             status=AutofixStatus.PROCESSING,
         )
 
diff --git a/tests/sentry/api/endpoints/test_group_integration_details.py b/tests/sentry/api/endpoints/test_group_integration_details.py
index 2f71f06150e443..202ce02a3594fb 100644
--- a/tests/sentry/api/endpoints/test_group_integration_details.py
+++ b/tests/sentry/api/endpoints/test_group_integration_details.py
@@ -1,3 +1,4 @@
+from typing import Any
 from unittest import mock
 
 from django.db.utils import IntegrityError
@@ -45,6 +46,18 @@ def setUp(self):
         )
         self.group = self.event.group
 
+    def assert_metric_recorded(
+        self, mock_metric_method, expected_exc: type[Exception], exc_args: Any | None = None
+    ):
+
+        assert mock_metric_method.call_count == 1
+        mock_metric_method.assert_called_with(mock.ANY)
+        call_arg = mock_metric_method.call_args_list[0][0][0]
+        assert isinstance(call_arg, expected_exc)
+
+        if exc_args:
+            assert call_arg.args == (exc_args,)
+
     def test_simple_get_link(self):
         self.login_as(user=self.user)
         org = self.organization
@@ -317,21 +330,18 @@ def test_put_group_after_link_raises_exception(
             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"}
+            self.assert_metric_recorded(
+                mock_record_halt, IntegrationFormError, str({"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",)
+            self.assert_metric_recorded(
+                mock_record_failure, IntegrationError, "The whole operation was invalid"
+            )
 
     def test_put_feature_disabled(self):
         self.login_as(user=self.user)
@@ -353,7 +363,8 @@ def test_put_feature_disabled(self):
         assert response.status_code == 400
         assert response.data["detail"] == "Your organization does not have access to this feature."
 
-    def test_simple_post(self):
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_simple_post(self, mock_record_event):
         self.login_as(user=self.user)
         org = self.organization
         group = self.create_group()
@@ -403,6 +414,42 @@ def test_simple_post(self):
                 "new": True,
             }
 
+            mock_record_event.assert_called_with(EventLifecycleOutcome.SUCCESS, None)
+
+    @mock.patch.object(ExampleIntegration, "create_issue")
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_halt")
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_failure")
+    def test_post_raises_issue_creation_exception(
+        self, mock_record_failure, mock_record_halt, mock_create_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"):
+            mock_create_issue.side_effect = raise_integration_error
+            response = self.client.post(path, data={})
+            assert response.status_code == 400
+
+            assert mock_record_failure.call_count == 1
+
+            self.assert_metric_recorded(
+                mock_record_failure, IntegrationError, "The whole operation was invalid"
+            )
+
+            mock_create_issue.side_effect = raise_integration_form_error
+
+            response = self.client.post(path, data={})
+            assert response.status_code == 400
+
+            self.assert_metric_recorded(
+                mock_record_halt, IntegrationFormError, str({"foo": "Invalid foo provided"})
+            )
+
     def test_post_feature_disabled(self):
         self.login_as(user=self.user)
         org = self.organization
diff --git a/tests/sentry/api/endpoints/test_onboarding.py b/tests/sentry/api/endpoints/test_onboarding.py
index e92b51a1990e92..dda5c44dcc3539 100644
--- a/tests/sentry/api/endpoints/test_onboarding.py
+++ b/tests/sentry/api/endpoints/test_onboarding.py
@@ -25,3 +25,33 @@ def test_update_onboarding_task(self):
         )
 
         assert oot
+
+    def test_skip_skippable_tasks(self):
+        """
+        Test if the tasks marked as skippable in the new quick start are skipped
+        """
+        with self.feature("organizations:quick-start-updates"):
+            skippable_tasks = OrganizationOnboardingTask.NEW_SKIPPABLE_TASKS
+
+            def get_skipped_tasks():
+                return set(
+                    OrganizationOnboardingTask.objects.filter(
+                        organization=self.organization, status=OnboardingTaskStatus.SKIPPED
+                    ).values_list("task", flat=True)
+                )
+
+            for task_id in skippable_tasks:
+                # Ensure the task is not initially marked as skipped
+                tasks_before = get_skipped_tasks()
+                assert task_id not in tasks_before
+
+                # Mark the task as skipped via API call
+                self.get_success_response(
+                    self.organization.slug,
+                    task=OrganizationOnboardingTask.TASK_KEY_MAP.get(task_id),
+                    status="skipped",
+                )
+
+                # Verify the task is now marked as skipped
+                tasks_after = get_skipped_tasks()
+                assert task_id in tasks_after
diff --git a/tests/sentry/api/endpoints/test_organization_dashboard_details.py b/tests/sentry/api/endpoints/test_organization_dashboard_details.py
index 928f6d99b66c87..114e7cdd72ac28 100644
--- a/tests/sentry/api/endpoints/test_organization_dashboard_details.py
+++ b/tests/sentry/api/endpoints/test_organization_dashboard_details.py
@@ -2755,9 +2755,6 @@ def setUp(self):
         )
         self.widget_ids = [self.widget_1.id, self.widget_2.id, self.widget_3.id, self.widget_4.id]
 
-    def get_widget_queries(self, widget):
-        return DashboardWidgetQuery.objects.filter(widget=widget).order_by("order")
-
     def test_ondemand_without_flags(self):
         data: dict[str, Any] = {
             "title": "First dashboard",
diff --git a/tests/sentry/api/endpoints/test_organization_dashboards.py b/tests/sentry/api/endpoints/test_organization_dashboards.py
index 5974a5aff2450e..4515974c380820 100644
--- a/tests/sentry/api/endpoints/test_organization_dashboards.py
+++ b/tests/sentry/api/endpoints/test_organization_dashboards.py
@@ -175,6 +175,13 @@ def test_get_sortby_mydashboards(self):
         values = [int(row["createdBy"]["id"]) for row in response.data if row["dateCreated"]]
         assert values == [self.user.id, self.user.id, user_1.id, user_2.id]
 
+        with self.feature("organizations:dashboards-table-view"):
+            response = self.client.get(self.url, data={"sort": "mydashboards"})
+            assert response.status_code == 200, response.content
+
+            values = [int(row["createdBy"]["id"]) for row in response.data if row["dateCreated"]]
+            assert values == [self.user.id, self.user.id, user_2.id, user_1.id]
+
     def test_get_sortby_mydashboards_and_recently_viewed(self):
         user_1 = self.create_user(username="user_1")
         self.create_member(organization=self.organization, user=user_1)
@@ -219,6 +226,59 @@ def test_get_sortby_mydashboards_and_recently_viewed(self):
             "Dashboard 3",
         ]
 
+    def test_get_sortby_mydashboards_with_owner_name(self):
+        user_1 = self.create_user(username="user_1", name="Cat")
+        self.create_member(organization=self.organization, user=user_1)
+
+        user_2 = self.create_user(username="user_2", name="Pineapple")
+        self.create_member(organization=self.organization, user=user_2)
+
+        user_3 = self.create_user(username="user_3", name="Banana")
+        self.create_member(organization=self.organization, user=user_3)
+
+        user_4 = self.create_user(username="user_4", name="Aapple")
+        self.create_member(organization=self.organization, user=user_4)
+
+        Dashboard.objects.create(title="A", created_by_id=user_1.id, organization=self.organization)
+        Dashboard.objects.create(title="B", created_by_id=user_2.id, organization=self.organization)
+        Dashboard.objects.create(title="C", created_by_id=user_3.id, organization=self.organization)
+        Dashboard.objects.create(title="D", created_by_id=user_4.id, organization=self.organization)
+        Dashboard.objects.create(title="E", created_by_id=user_2.id, organization=self.organization)
+        Dashboard.objects.create(title="F", created_by_id=user_1.id, organization=self.organization)
+
+        self.login_as(user_1)
+        with self.feature("organizations:dashboards-table-view"):
+            response = self.client.get(self.url, data={"sort": "mydashboards"})
+            assert response.status_code == 200, response.content
+
+            values = [row["createdBy"]["name"] for row in response.data if row["dateCreated"]]
+            assert values == [
+                "Cat",
+                "Cat",
+                "admin@localhost",  # name is empty
+                "admin@localhost",
+                "Aapple",
+                "Banana",
+                "Pineapple",
+                "Pineapple",
+            ]
+
+            # descending
+            response = self.client.get(self.url, data={"sort": "-mydashboards"})
+            assert response.status_code == 200, response.content
+
+            values = [row["createdBy"]["name"] for row in response.data if row["dateCreated"]]
+            assert values == [
+                "Cat",
+                "Cat",
+                "Pineapple",
+                "Pineapple",
+                "Banana",
+                "Aapple",
+                "admin@localhost",  # name is empty
+                "admin@localhost",
+            ]
+
     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)
@@ -449,7 +509,7 @@ def test_pin_favorites_with_my_dashboards_sort(self):
         )
 
         dashboard_B.favorited_by = [self.user.id]
-        dashboard_D.favorited_by = [self.user.id]
+        dashboard_D.favorited_by = [self.user.id, user_1.id]
         dashboard_E.favorited_by = [self.user.id]
         dashboard_C.favorited_by = [user_1.id]
 
@@ -499,7 +559,7 @@ def test_pin_favorites_with_my_date_created_sort(self):
             organization=self.organization,
         )
 
-        dashboard_B.favorited_by = [self.user.id]
+        dashboard_B.favorited_by = [self.user.id, user_1.id]
         dashboard_D.favorited_by = [self.user.id]
         dashboard_E.favorited_by = [self.user.id]
         dashboard_C.favorited_by = [user_1.id]
diff --git a/tests/sentry/api/endpoints/test_organization_events_anomalies.py b/tests/sentry/api/endpoints/test_organization_events_anomalies.py
index 9f62b2f0013432..7ee64e72a337bd 100644
--- a/tests/sentry/api/endpoints/test_organization_events_anomalies.py
+++ b/tests/sentry/api/endpoints/test_organization_events_anomalies.py
@@ -19,7 +19,7 @@
 )
 from sentry.seer.anomaly_detection.utils import translate_direction
 from sentry.testutils.cases import APITestCase
-from sentry.testutils.helpers.datetime import before_now, freeze_time, timestamp_format
+from sentry.testutils.helpers.datetime import before_now, freeze_time
 from sentry.testutils.helpers.features import with_feature
 from sentry.testutils.outbox import outbox_runner
 
@@ -39,10 +39,10 @@ class OrganizationEventsAnomaliesEndpointTest(APITestCase):
         direction=translate_direction(AlertRuleThresholdType.ABOVE.value),
         expected_seasonality=AlertRuleSeasonality.AUTO.value,
     )
-    historical_timestamp_1 = timestamp_format(four_weeks_ago)
-    historical_timestamp_2 = timestamp_format(four_weeks_ago + timedelta(days=10))
-    current_timestamp_1 = timestamp_format(one_week_ago)
-    current_timestamp_2 = timestamp_format(one_week_ago + timedelta(minutes=10))
+    historical_timestamp_1 = four_weeks_ago.timestamp()
+    historical_timestamp_2 = (four_weeks_ago + timedelta(days=10)).timestamp()
+    current_timestamp_1 = one_week_ago.timestamp()
+    current_timestamp_2 = (one_week_ago + timedelta(minutes=10)).timestamp()
     data = {
         "project_id": 1,
         "config": config,
diff --git a/tests/sentry/api/endpoints/test_organization_member_details.py b/tests/sentry/api/endpoints/test_organization_member_details.py
index 5afed6a43f08ce..cd8df983a8eb69 100644
--- a/tests/sentry/api/endpoints/test_organization_member_details.py
+++ b/tests/sentry/api/endpoints/test_organization_member_details.py
@@ -186,7 +186,6 @@ def test_reinvite_pending_member(self, mock_send_invite_email):
         mock_send_invite_email.assert_called_once_with()
 
     @patch("sentry.models.OrganizationMember.send_invite_email")
-    @with_feature("organizations:members-invite-teammates")
     def test_member_reinvite_pending_member(self, mock_send_invite_email):
         self.login_as(self.curr_user)
 
@@ -220,7 +219,6 @@ def test_member_reinvite_pending_member(self, mock_send_invite_email):
         assert not mock_send_invite_email.mock_calls
 
     @patch("sentry.models.OrganizationMember.send_invite_email")
-    @with_feature("organizations:members-invite-teammates")
     def test_member_can_only_reinvite(self, mock_send_invite_email):
         foo = self.create_team(organization=self.organization, name="Team Foo")
         self.login_as(self.curr_user)
@@ -253,7 +251,6 @@ def test_member_can_only_reinvite(self, mock_send_invite_email):
         assert not mock_send_invite_email.mock_calls
 
     @patch("sentry.models.OrganizationMember.send_invite_email")
-    @with_feature("organizations:members-invite-teammates")
     def test_member_cannot_reinvite_non_pending_members(self, mock_send_invite_email):
         self.login_as(self.curr_user)
 
@@ -340,7 +337,6 @@ def test_rate_limited(self, mock_send_invite_email, mock_rate_limit):
         assert not mock_send_invite_email.mock_calls
 
     @patch("sentry.models.OrganizationMember.send_invite_email")
-    @with_feature("organizations:members-invite-teammates")
     def test_member_cannot_regenerate_pending_invite(self, mock_send_invite_email):
         member_om = self.create_member(
             organization=self.organization, email="foo@example.com", role="member"
@@ -725,7 +721,7 @@ def test_with_internal_integration(self):
         response = self.client.put(
             reverse(self.endpoint, args=[self.organization.slug, member_om.id]),
             {"role": "manager"},
-            HTTP_AUTHORIZATION=f"Bearer {token}",
+            HTTP_AUTHORIZATION=f"Bearer {token.token}",
         )
 
         # The app token has no associated OrganizationMember and therefore no role.
@@ -1023,7 +1019,6 @@ def test_cannot_delete_partnership_member(self):
 
         self.get_error_response(self.organization.slug, member_om.id, status_code=403)
 
-    @with_feature("organizations:members-invite-teammates")
     def test_member_delete_pending_invite(self):
         curr_invite = self.create_member(
             organization=self.organization,
@@ -1052,7 +1047,6 @@ def test_member_delete_pending_invite(self):
         self.get_success_response(self.organization.slug, curr_invite.id)
         self.get_error_response(self.organization.slug, other_invite.id, status_code=400)
 
-    @with_feature("organizations:members-invite-teammates")
     def test_member_cannot_delete_members(self):
         self.login_as(self.curr_user)
 
diff --git a/tests/sentry/api/endpoints/test_organization_member_index.py b/tests/sentry/api/endpoints/test_organization_member_index.py
index 9a4a14a8f3a3c3..e7eab35303a867 100644
--- a/tests/sentry/api/endpoints/test_organization_member_index.py
+++ b/tests/sentry/api/endpoints/test_organization_member_index.py
@@ -521,7 +521,6 @@ def test_cannot_invite_retired_role_with_flag(self):
 class OrganizationMemberPermissionRoleTest(OrganizationMemberListTestBase, HybridCloudTestMixin):
     method = "post"
 
-    @with_feature("organizations:members-invite-teammates")
     def invite_all_helper(self, role):
         invite_roles = ["owner", "manager", "member"]
 
diff --git a/tests/sentry/api/endpoints/test_organization_metrics.py b/tests/sentry/api/endpoints/test_organization_metrics.py
index bfda3dbdc1d6d4..8e83c302750368 100644
--- a/tests/sentry/api/endpoints/test_organization_metrics.py
+++ b/tests/sentry/api/endpoints/test_organization_metrics.py
@@ -1,12 +1,9 @@
 import copy
-from functools import partial
 
 import pytest
 from django.urls import reverse
 
 from sentry.models.apitoken import ApiToken
-from sentry.sentry_metrics import indexer
-from sentry.sentry_metrics.use_case_id_registry import UseCaseID
 from sentry.silo.base import SiloMode
 from sentry.snuba.metrics import (
     DERIVED_METRICS,
@@ -40,20 +37,6 @@
 )
 
 
-def mocked_mri_resolver(metric_names, mri_func):
-    return lambda x: x if x in metric_names else mri_func(x)
-
-
-def indexer_record(use_case_id: UseCaseID, org_id: int, string: str) -> int:
-    ret = indexer.record(use_case_id=use_case_id, org_id=org_id, string=string)
-    assert ret is not None
-    return ret
-
-
-perf_indexer_record = partial(indexer_record, UseCaseID.TRANSACTIONS)
-rh_indexer_record = partial(indexer_record, UseCaseID.SESSIONS)
-
-
 class OrganizationMetricsPermissionTest(APITestCase):
     endpoints = (
         (
diff --git a/tests/sentry/api/endpoints/test_organization_metrics_tag_details.py b/tests/sentry/api/endpoints/test_organization_metrics_tag_details.py
index 33beffe73442c3..7cc608e7916fce 100644
--- a/tests/sentry/api/endpoints/test_organization_metrics_tag_details.py
+++ b/tests/sentry/api/endpoints/test_organization_metrics_tag_details.py
@@ -4,7 +4,7 @@
 
 from sentry.sentry_metrics import indexer
 from sentry.sentry_metrics.use_case_id_registry import UseCaseID
-from sentry.testutils.cases import MetricsAPIBaseTestCase, OrganizationMetricsIntegrationTestCase
+from sentry.testutils.cases import OrganizationMetricsIntegrationTestCase
 
 pytestmark = pytest.mark.sentry_metrics
 
@@ -17,10 +17,6 @@ class OrganizationMetricsTagDetailsTest(OrganizationMetricsIntegrationTestCase):
 
     endpoint = "sentry-api-0-organization-metrics-tag-details"
 
-    @property
-    def now(self):
-        return MetricsAPIBaseTestCase.MOCK_DATETIME
-
     def test_unknown_tag(self):
         _indexer_record(self.organization.id, "bar")
         response = self.get_response(self.project.organization.slug, "bar")
diff --git a/tests/sentry/api/endpoints/test_organization_projects_experiment.py b/tests/sentry/api/endpoints/test_organization_projects_experiment.py
index 7040f65f47b0e3..c8d8e72e965195 100644
--- a/tests/sentry/api/endpoints/test_organization_projects_experiment.py
+++ b/tests/sentry/api/endpoints/test_organization_projects_experiment.py
@@ -1,8 +1,6 @@
 import re
-from functools import cached_property
 from unittest.mock import patch
 
-from django.urls import reverse
 from django.utils.text import slugify
 
 from sentry.api.endpoints.organization_projects_experiment import (
@@ -33,10 +31,6 @@ def setUp(self):
         self.t1 = f"team-{self.email_username}"
         self.mock_experiment_get = patch.object(ExperimentManager, "get", return_value=1).start()
 
-    @cached_property
-    def path(self):
-        return reverse(self.endpoint, args=[self.organization.slug])
-
     def validate_team_with_suffix(self, team: Team):
         pattern = rf"^{self.t1}-[a-z]{{3}}$"
         return bool(re.match(pattern, team.slug)) and bool(re.match(pattern, team.name))
diff --git a/tests/sentry/api/endpoints/test_organization_region.py b/tests/sentry/api/endpoints/test_organization_region.py
index 18111286e52304..0466e0ba01cb39 100644
--- a/tests/sentry/api/endpoints/test_organization_region.py
+++ b/tests/sentry/api/endpoints/test_organization_region.py
@@ -96,7 +96,7 @@ def test_integration_token_access(self):
             self.org, self.org_owner, ["project:read"]
         )
 
-        response = self.send_get_request_with_auth(self.org.slug, token)
+        response = self.send_get_request_with_auth(self.org.slug, token.token)
 
         assert response.status_code == 200
         us_region = get_region_by_name("us")
@@ -108,7 +108,7 @@ def test_integration_token_with_invalid_scopes(self):
         response = self.get_response(
             self.org.slug,
             extra_headers={
-                "HTTP_AUTHORIZATION": f"Bearer {token}",
+                "HTTP_AUTHORIZATION": f"Bearer {token.token}",
             },
         )
         assert response.status_code == 403
@@ -119,12 +119,12 @@ def test_integration_for_different_organization(self):
             self.create_organization(owner=other_user), other_user, ["project:read"]
         )
 
-        response = self.send_get_request_with_auth(self.org.slug, token)
+        response = self.send_get_request_with_auth(self.org.slug, token.token)
         assert response.status_code == 403
 
     def test_user_auth_token_for_owner(self):
         user_auth_token = self.create_user_auth_token(user=self.org_owner, scope_list=["org:read"])
-        response = self.send_get_request_with_auth(self.org.slug, user_auth_token)
+        response = self.send_get_request_with_auth(self.org.slug, user_auth_token.token)
 
         assert response.status_code == 200
         us_region = get_region_by_name("us")
@@ -138,7 +138,7 @@ def test_user_auth_token_for_member(self):
             )
 
         user_auth_token = self.create_user_auth_token(user=org_user, scope_list=["org:read"])
-        response = self.send_get_request_with_auth(self.org.slug, user_auth_token)
+        response = self.send_get_request_with_auth(self.org.slug, user_auth_token.token)
 
         assert response.status_code == 200
         us_region = get_region_by_name("us")
@@ -148,18 +148,18 @@ def test_user_auth_token_for_non_member(self):
         user_auth_token = self.create_user_auth_token(
             user=self.create_user(), scope_list=["org:read"]
         )
-        response = self.send_get_request_with_auth(self.org.slug, user_auth_token)
+        response = self.send_get_request_with_auth(self.org.slug, user_auth_token.token)
         assert response.status_code == 403
 
     def test_user_auth_token_with_invalid_scopes(self):
         user_auth_token = self.create_user_auth_token(user=self.org_owner, scope_list=[])
-        response = self.send_get_request_with_auth(self.org.slug, user_auth_token)
+        response = self.send_get_request_with_auth(self.org.slug, user_auth_token.token)
 
         assert response.status_code == 403
 
         user_auth_token = self.create_user_auth_token(
             user=self.org_owner, scope_list=["event:read"]
         )
-        response = self.send_get_request_with_auth(self.org.slug, user_auth_token)
+        response = self.send_get_request_with_auth(self.org.slug, user_auth_token.token)
 
         assert response.status_code == 403
diff --git a/tests/sentry/api/endpoints/test_organization_root_cause_analysis.py b/tests/sentry/api/endpoints/test_organization_root_cause_analysis.py
index 72150e606e10ff..2eec2caf725eae 100644
--- a/tests/sentry/api/endpoints/test_organization_root_cause_analysis.py
+++ b/tests/sentry/api/endpoints/test_organization_root_cause_analysis.py
@@ -44,7 +44,6 @@ def create_transaction(
         project_id,
         start_timestamp,
         duration,
-        transaction_id=None,
     ):
         timestamp = start_timestamp + timedelta(milliseconds=duration)
 
@@ -56,8 +55,6 @@ def create_transaction(
             start_timestamp=start_timestamp,
             timestamp=timestamp,
         )
-        if transaction_id is not None:
-            data["event_id"] = transaction_id
         data["transaction"] = transaction
         data["contexts"]["trace"]["parent_span_id"] = parent_span_id
         return self.store_event(data, project_id=project_id)
diff --git a/tests/sentry/api/endpoints/test_organization_teams.py b/tests/sentry/api/endpoints/test_organization_teams.py
index 2a73efe6d01448..834cf9913be7af 100644
--- a/tests/sentry/api/endpoints/test_organization_teams.py
+++ b/tests/sentry/api/endpoints/test_organization_teams.py
@@ -1,7 +1,3 @@
-from functools import cached_property
-
-from django.urls import reverse
-
 from sentry.integrations.utils.providers import get_provider_string
 from sentry.models.organizationmember import OrganizationMember
 from sentry.models.organizationmemberteam import OrganizationMemberTeam
@@ -174,10 +170,6 @@ def setUp(self):
         super().setUp()
         self.login_as(user=self.user)
 
-    @cached_property
-    def path(self):
-        return reverse("sentry-api-0-organization-teams", args=[self.organization.slug])
-
     def test_missing_permission(self):
         user = self.create_user()
         self.login_as(user=user)
diff --git a/tests/sentry/api/endpoints/test_organization_traces.py b/tests/sentry/api/endpoints/test_organization_traces.py
index 1dbb69c357bef0..0758ca3ec60e41 100644
--- a/tests/sentry/api/endpoints/test_organization_traces.py
+++ b/tests/sentry/api/endpoints/test_organization_traces.py
@@ -281,8 +281,6 @@ def do_request(self, query, features=None, **kwargs):
             ]
 
         if self.is_eap:
-            if query is None:
-                query = {}
             query["dataset"] = "spans"
 
         with self.feature(features):
@@ -816,8 +814,6 @@ def do_request(self, trace_id, query, features=None, **kwargs):
             ]
 
         if self.is_eap:
-            if query is None:
-                query = {}
             query["dataset"] = "spans"
 
         with self.feature(features):
@@ -942,8 +938,6 @@ def do_request(self, query, features=None, **kwargs):
             ]
 
         if self.is_eap:
-            if query is None:
-                query = {}
             query["dataset"] = "spans"
 
         with self.feature(features):
diff --git a/tests/sentry/api/endpoints/test_organization_user_rollback.py b/tests/sentry/api/endpoints/test_organization_user_rollback.py
index b79ae1fd05fbf5..047c3522d61af5 100644
--- a/tests/sentry/api/endpoints/test_organization_user_rollback.py
+++ b/tests/sentry/api/endpoints/test_organization_user_rollback.py
@@ -1,4 +1,3 @@
-from django.urls import reverse
 from rest_framework import status
 
 from sentry.models.organizationmember import OrganizationMember
@@ -18,9 +17,6 @@ def setUp(self):
         super().setUp()
         self.login_as(user=self.user)
 
-    def _get_path(self) -> str:
-        return reverse(self.endpoint)
-
     @with_feature("organizations:sentry-rollback-2024")
     def test_simple(self):
         rollback_user = RollbackUser.objects.create(
diff --git a/tests/sentry/api/endpoints/test_project_backfill_similar_issues_embeddings_records.py b/tests/sentry/api/endpoints/test_project_backfill_similar_issues_embeddings_records.py
index fc10cb5ac0efb0..e837aeee1844a1 100644
--- a/tests/sentry/api/endpoints/test_project_backfill_similar_issues_embeddings_records.py
+++ b/tests/sentry/api/endpoints/test_project_backfill_similar_issues_embeddings_records.py
@@ -4,7 +4,6 @@
 from django.urls import reverse
 
 from sentry.testutils.cases import APITestCase
-from sentry.testutils.helpers.features import with_feature
 
 
 class ProjectBackfillSimilarIssuesEmbeddingsRecordsTest(APITestCase):
@@ -40,7 +39,6 @@ def test_post_not_superuser(self, mock_is_active_superuser):
     @patch(
         "sentry.api.endpoints.project_backfill_similar_issues_embeddings_records.backfill_seer_grouping_records_for_project.delay"
     )
-    @with_feature("projects:similarity-embeddings-backfill")
     def test_post_success_no_last_processed_id(
         self, mock_backfill_seer_grouping_records, mock_is_active_superuser
     ):
@@ -58,7 +56,6 @@ def test_post_success_no_last_processed_id(
     @patch(
         "sentry.api.endpoints.project_backfill_similar_issues_embeddings_records.backfill_seer_grouping_records_for_project.delay"
     )
-    @with_feature("projects:similarity-embeddings-backfill")
     @override_settings(SENTRY_SINGLE_ORGANIZATION=True)
     def test_post_success_no_last_processed_id_single_org(
         self, mock_backfill_seer_grouping_records
@@ -81,7 +78,6 @@ def test_post_success_no_last_processed_id_single_org(
     @patch(
         "sentry.api.endpoints.project_backfill_similar_issues_embeddings_records.backfill_seer_grouping_records_for_project.delay"
     )
-    @with_feature("projects:similarity-embeddings-backfill")
     def test_post_success_last_processed_id(
         self, mock_backfill_seer_grouping_records, mock_is_active_superuser
     ):
@@ -103,7 +99,6 @@ def test_post_success_last_processed_id(
     @patch(
         "sentry.api.endpoints.project_backfill_similar_issues_embeddings_records.backfill_seer_grouping_records_for_project.delay"
     )
-    @with_feature("projects:similarity-embeddings-backfill")
     def test_post_success_only_delete(
         self, mock_backfill_seer_grouping_records, mock_is_active_superuser
     ):
@@ -127,7 +122,6 @@ def test_post_success_only_delete(
     @patch(
         "sentry.api.endpoints.project_backfill_similar_issues_embeddings_records.backfill_seer_grouping_records_for_project.delay"
     )
-    @with_feature("projects:similarity-embeddings-backfill")
     def test_post_success_enable_ingestion(
         self, mock_backfill_seer_grouping_records, mock_is_active_superuser
     ):
@@ -151,7 +145,6 @@ def test_post_success_enable_ingestion(
     @patch(
         "sentry.api.endpoints.project_backfill_similar_issues_embeddings_records.backfill_seer_grouping_records_for_project.delay"
     )
-    @with_feature("projects:similarity-embeddings-backfill")
     def test_post_success_skip_processed_projects(
         self, mock_backfill_seer_grouping_records, mock_is_active_superuser
     ):
@@ -176,7 +169,6 @@ def test_post_success_skip_processed_projects(
     @patch(
         "sentry.api.endpoints.project_backfill_similar_issues_embeddings_records.backfill_seer_grouping_records_for_project.delay"
     )
-    @with_feature("projects:similarity-embeddings-backfill")
     def test_post_success_skip_project_ids(
         self, mock_backfill_seer_grouping_records, mock_is_active_superuser
     ):
diff --git a/tests/sentry/api/endpoints/test_project_details.py b/tests/sentry/api/endpoints/test_project_details.py
index fbee2be2f6f21c..08819b5f593ee1 100644
--- a/tests/sentry/api/endpoints/test_project_details.py
+++ b/tests/sentry/api/endpoints/test_project_details.py
@@ -39,72 +39,6 @@
 from sentry.testutils.silo import assume_test_silo_mode
 
 
-def _dyn_sampling_data(multiple_uniform_rules=False, uniform_rule_last_position=True):
-    rules = [
-        {
-            "sampleRate": 0.7,
-            "type": "trace",
-            "active": True,
-            "condition": {
-                "op": "and",
-                "inner": [
-                    {"op": "eq", "name": "field1", "value": ["val"]},
-                    {"op": "glob", "name": "field1", "value": ["val"]},
-                ],
-            },
-            "id": -1,
-        },
-        {
-            "sampleRate": 0.8,
-            "type": "trace",
-            "active": True,
-            "condition": {
-                "op": "and",
-                "inner": [
-                    {"op": "eq", "name": "field1", "value": ["val"]},
-                ],
-            },
-            "id": -1,
-        },
-    ]
-    if uniform_rule_last_position:
-        rules.append(
-            {
-                "sampleRate": 0.8,
-                "type": "trace",
-                "active": True,
-                "condition": {
-                    "op": "and",
-                    "inner": [],
-                },
-                "id": -1,
-            },
-        )
-    if multiple_uniform_rules:
-        new_rule_1 = {
-            "sampleRate": 0.22,
-            "type": "trace",
-            "condition": {
-                "op": "and",
-                "inner": [],
-            },
-            "id": -1,
-        }
-        rules.insert(0, new_rule_1)
-
-    return {
-        "rules": rules,
-    }
-
-
-def _remove_ids_from_dynamic_rules(dynamic_rules):
-    if dynamic_rules.get("next_id") is not None:
-        del dynamic_rules["next_id"]
-    for rule in dynamic_rules["rules"]:
-        del rule["id"]
-    return dynamic_rules
-
-
 def first_symbol_source_id(sources_json):
     sources = orjson.loads(sources_json)
     return sources[0]["id"]
diff --git a/tests/sentry/api/endpoints/test_project_filters.py b/tests/sentry/api/endpoints/test_project_filters.py
index efea077c4d836e..7c51530ef13051 100644
--- a/tests/sentry/api/endpoints/test_project_filters.py
+++ b/tests/sentry/api/endpoints/test_project_filters.py
@@ -15,7 +15,7 @@ def get_filter_spec(self, response_data, spec_id):
         for spec in response_data:
             if spec["id"] == spec_id:
                 return spec
-        return None
+        raise AssertionError(f"spec not found: {spec_id}")
 
     def test_get(self):
         org = self.create_organization(name="baz", slug="1", owner=self.user)
@@ -38,11 +38,9 @@ def test_health_check_filter(self):
         project.update_option("filters:filtered-transaction", "0")
         response = self.get_success_response(org.slug, project.slug)
         health_check = self.get_filter_spec(response.data, "filtered-transaction")
-        assert health_check is not None
         assert health_check["active"] is False
 
         project.update_option("filters:filtered-transaction", "1")
         response = self.get_success_response(org.slug, project.slug)
         health_check = self.get_filter_spec(response.data, "filtered-transaction")
-        assert health_check is not None
         assert health_check["active"] is True
diff --git a/tests/sentry/api/endpoints/test_project_index.py b/tests/sentry/api/endpoints/test_project_index.py
index 095984e0192f1b..42376756d1c451 100644
--- a/tests/sentry/api/endpoints/test_project_index.py
+++ b/tests/sentry/api/endpoints/test_project_index.py
@@ -197,7 +197,7 @@ def test_valid_with_internal_integration(self):
             user=self.user, internal_integration=internal_integration
         )
         path = reverse(self.endpoint)
-        response = self.client.get(path, HTTP_AUTHORIZATION=f"Bearer {token}")
+        response = self.client.get(path, HTTP_AUTHORIZATION=f"Bearer {token.token}")
         assert project.name.encode("utf-8") in response.content
 
     def test_deleted_token_with_internal_integration(self):
@@ -222,7 +222,7 @@ def test_deleted_token_with_internal_integration(self):
             schedule_hybrid_cloud_foreign_key_jobs()
 
         self.get_error_response(
-            extra_headers={"HTTP_AUTHORIZATION": f"Bearer {token}"},
+            extra_headers={"HTTP_AUTHORIZATION": f"Bearer {token.token}"},
             status_code=status.HTTP_401_UNAUTHORIZED,
         )
 
diff --git a/tests/sentry/api/endpoints/test_project_ownership.py b/tests/sentry/api/endpoints/test_project_ownership.py
index 78e48095b1ec85..367c78e422ea79 100644
--- a/tests/sentry/api/endpoints/test_project_ownership.py
+++ b/tests/sentry/api/endpoints/test_project_ownership.py
@@ -8,7 +8,6 @@
 from sentry.models.projectownership import ProjectOwnership
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import APITestCase
-from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.outbox import outbox_runner
 from sentry.testutils.silo import assume_test_silo_mode
 from sentry.testutils.skips import requires_snuba
@@ -44,26 +43,6 @@ def setUp(self):
             },
         )
 
-    def python_event_data(self):
-        return {
-            "message": "Kaboom!",
-            "platform": "python",
-            "timestamp": before_now(seconds=10),
-            "stacktrace": {
-                "frames": [
-                    {
-                        "function": "handle_set_commits",
-                        "abs_path": "/usr/src/sentry/src/sentry/api/foo.py",
-                        "module": "sentry.api",
-                        "in_app": True,
-                        "lineno": 30,
-                        "filename": "sentry/api/foo.py",
-                    }
-                ]
-            },
-            "tags": {"sentry:release": self.release.version},
-        }
-
     def test_empty_state(self):
         resp = self.client.get(self.path)
         assert resp.status_code == 200
diff --git a/tests/sentry/api/endpoints/test_project_rules.py b/tests/sentry/api/endpoints/test_project_rules.py
index 3f3772445a2018..70d7800295c10a 100644
--- a/tests/sentry/api/endpoints/test_project_rules.py
+++ b/tests/sentry/api/endpoints/test_project_rules.py
@@ -124,20 +124,6 @@ def test_get_max_alerts_slow_with_group_processing(self):
 class CreateProjectRuleTest(ProjectRuleBaseTestCase):
     method = "post"
 
-    def mock_conversations_list(self, channels):
-        return patch(
-            "slack_sdk.web.client.WebClient.conversations_list",
-            return_value=SlackResponse(
-                client=None,
-                http_verb="POST",
-                api_url="https://slack.com/api/conversations.list",
-                req_args={},
-                data={"ok": True, "channels": channels},
-                headers={},
-                status_code=200,
-            ),
-        )
-
     def mock_conversations_info(self, channel):
         return patch(
             "slack_sdk.web.client.WebClient.conversations_info",
diff --git a/tests/sentry/api/endpoints/test_relay_globalconfig_v3.py b/tests/sentry/api/endpoints/test_relay_globalconfig_v3.py
index b86cd0126bbe90..ecb2ad13413670 100644
--- a/tests/sentry/api/endpoints/test_relay_globalconfig_v3.py
+++ b/tests/sentry/api/endpoints/test_relay_globalconfig_v3.py
@@ -42,8 +42,6 @@ def inner(version, global_):
         "profiling.profile_metrics.unsampled_profiles.sample_rate": 1.0,
         "relay.span-usage-metric": True,
         "relay.cardinality-limiter.mode": "passive",
-        "profiling.generic_metrics.functions_ingestion.enabled": True,
-        "relay.compute-metrics-summaries.sample-rate": 1.0,
         "relay.metric-bucket-distribution-encodings": {
             "custom": "array",
             "metric_stats": "array",
diff --git a/tests/sentry/api/endpoints/test_relay_projectids.py b/tests/sentry/api/endpoints/test_relay_projectids.py
index a84552f40ee6d6..3d1ab0b2bd2795 100644
--- a/tests/sentry/api/endpoints/test_relay_projectids.py
+++ b/tests/sentry/api/endpoints/test_relay_projectids.py
@@ -19,14 +19,6 @@ def disable_internal_networks():
     return mock.patch.object(system, "INTERNAL_NETWORKS", ())
 
 
-def _get_all_keys(config):
-    for key in config:
-        yield key
-        if isinstance(config[key], dict):
-            for key in _get_all_keys(config[key]):
-                yield key
-
-
 class RelayProjectIdsEndpointTest(APITestCase):
     _date_regex = re.compile(r"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+Z$")
 
diff --git a/tests/sentry/api/endpoints/test_relay_register.py b/tests/sentry/api/endpoints/test_relay_register.py
index 1f7e8696064e84..7ebc391c882cc3 100644
--- a/tests/sentry/api/endpoints/test_relay_register.py
+++ b/tests/sentry/api/endpoints/test_relay_register.py
@@ -25,10 +25,6 @@ def setUp(self):
 
         self.path = reverse("sentry-api-0-relay-register-challenge")
 
-    def add_internal_key(self, public_key):
-        if public_key not in settings.SENTRY_RELAY_WHITELIST_PK:
-            settings.SENTRY_RELAY_WHITELIST_PK.append(str(self.public_key))
-
     def register_relay(self, key_pair, version, relay_id):
 
         private_key = key_pair[0]
diff --git a/tests/sentry/api/helpers/test_group_index.py b/tests/sentry/api/helpers/test_group_index.py
index 0a0a8d50e24985..2af2dcd6455fa7 100644
--- a/tests/sentry/api/helpers/test_group_index.py
+++ b/tests/sentry/api/helpers/test_group_index.py
@@ -8,6 +8,7 @@
 from sentry.api.helpers.group_index import update_groups, validate_search_filter_permissions
 from sentry.api.helpers.group_index.delete import delete_groups
 from sentry.api.helpers.group_index.update import (
+    get_group_list,
     handle_assigned_to,
     handle_has_seen,
     handle_is_bookmarked,
@@ -106,10 +107,8 @@ def test_unresolving_resolved_group(self, send_robust: Mock, send_unresolved: Mo
         request.data = {"status": "unresolved", "substatus": "ongoing"}
         request.GET = QueryDict(query_string=f"id={resolved_group.id}")
 
-        search_fn = Mock()
-        update_groups(
-            request, request.GET.getlist("id"), [self.project], self.organization.id, search_fn
-        )
+        group_list = get_group_list(self.organization.id, [self.project], request.GET.getlist("id"))
+        update_groups(request, group_list)
 
         resolved_group.refresh_from_db()
 
@@ -129,10 +128,8 @@ def test_resolving_unresolved_group(self, send_robust: Mock) -> None:
         request.data = {"status": "resolved", "substatus": None}
         request.GET = QueryDict(query_string=f"id={unresolved_group.id}")
 
-        search_fn = Mock()
-        update_groups(
-            request, request.GET.getlist("id"), [self.project], self.organization.id, search_fn
-        )
+        group_list = get_group_list(self.organization.id, [self.project], request.GET.getlist("id"))
+        update_groups(request, group_list)
 
         unresolved_group.refresh_from_db()
 
@@ -151,10 +148,8 @@ def test_ignoring_group_archived_forever(self, post_save: Mock, send_robust: Moc
         request.data = {"status": "ignored", "substatus": "archived_forever"}
         request.GET = QueryDict(query_string=f"id={group.id}")
 
-        search_fn = Mock()
-        update_groups(
-            request, request.GET.getlist("id"), [self.project], self.organization.id, search_fn
-        )
+        group_list = get_group_list(self.organization.id, [self.project], request.GET.getlist("id"))
+        update_groups(request, group_list)
 
         group.refresh_from_db()
 
@@ -183,10 +178,8 @@ def test_ignoring_group_archived_until_condition_met(self, send_robust: Mock) ->
         }
         request.GET = QueryDict(query_string=f"id={group.id}")
 
-        search_fn = Mock()
-        update_groups(
-            request, request.GET.getlist("id"), [self.project], self.organization.id, search_fn
-        )
+        group_list = get_group_list(self.organization.id, [self.project], request.GET.getlist("id"))
+        update_groups(request, group_list)
 
         group.refresh_from_db()
 
@@ -227,9 +220,10 @@ def test_unignoring_group(self, send_robust: Mock) -> None:
             request.data = data["request_data"]
             request.GET = QueryDict(query_string=f"id={group.id}")
 
-            update_groups(
-                request, request.GET.getlist("id"), [self.project], self.organization.id, Mock()
+            group_list = get_group_list(
+                self.organization.id, [self.project], request.GET.getlist("id")
             )
+            update_groups(request, group_list)
 
             group.refresh_from_db()
 
@@ -247,10 +241,8 @@ def test_mark_reviewed_group(self, send_robust: Mock) -> None:
         request.data = {"inbox": False}
         request.GET = QueryDict(query_string=f"id={group.id}")
 
-        search_fn = Mock()
-        update_groups(
-            request, request.GET.getlist("id"), [self.project], self.organization.id, search_fn
-        )
+        group_list = get_group_list(self.organization.id, [self.project], request.GET.getlist("id"))
+        update_groups(request, group_list)
 
         group.refresh_from_db()
 
@@ -267,10 +259,8 @@ def test_ignore_with_substatus_archived_until_escalating(self, send_robust: Mock
         request.data = {"status": "ignored", "substatus": "archived_until_escalating"}
         request.GET = QueryDict(query_string=f"id={group.id}")
 
-        search_fn = Mock()
-        update_groups(
-            request, request.GET.getlist("id"), [self.project], self.organization.id, search_fn
-        )
+        group_list = get_group_list(self.organization.id, [self.project], request.GET.getlist("id"))
+        update_groups(request, group_list)
 
         group.refresh_from_db()
 
@@ -279,6 +269,29 @@ def test_ignore_with_substatus_archived_until_escalating(self, send_robust: Mock
         assert send_robust.called
         assert not GroupInbox.objects.filter(group=group).exists()
 
+    @patch("sentry.signals.issue_resolved.send_robust")
+    def test_resolving_group_with_short_id(self, send_robust: Mock) -> None:
+        group = self.create_group(status=GroupStatus.UNRESOLVED)
+
+        request = self.make_request(
+            user=self.user,
+            method="GET",
+            # The UI calls the endpoint with the short ID, not the group ID
+            GET={"id": group.qualified_short_id},
+        )
+        request.data = {"status": "resolved", "substatus": None}
+
+        assert request.GET.getlist("id")[0] == group.qualified_short_id
+        assert request.GET.getlist("id")[0].isdigit() is False
+        group_list = get_group_list(self.organization.id, [self.project], request.GET.getlist("id"))
+        assert group_list == [group]
+        update_groups(request, group_list)
+
+        group.refresh_from_db()
+
+        assert group.status == GroupStatus.RESOLVED
+        assert send_robust.called
+
 
 class MergeGroupsTest(TestCase):
     @patch("sentry.api.helpers.group_index.update.handle_merge")
@@ -291,7 +304,8 @@ def test_simple(self, mock_handle_merge: MagicMock):
         request.data = {"merge": 1}
         request.GET = {"id": group_ids, "project": [project.id]}
 
-        update_groups(request, group_ids, [project], self.organization.id, search_fn=Mock())
+        group_list = get_group_list(self.organization.id, [project], group_ids)
+        update_groups(request, group_list)
 
         call_args = mock_handle_merge.call_args.args
 
@@ -318,9 +332,8 @@ def test_multiple_projects(self, mock_handle_merge: MagicMock):
         request.data = {"merge": 1}
         request.GET = {"id": group_ids, "project": project_ids}
 
-        response = update_groups(
-            request, group_ids, projects, self.organization.id, search_fn=Mock()
-        )
+        group_list = get_group_list(self.organization.id, projects, group_ids)
+        response = update_groups(request, group_list)
 
         assert response.data == {"detail": "Merging across multiple projects is not supported"}
         assert response.status_code == 400
@@ -342,7 +355,8 @@ def test_multiple_groups_same_project(self, mock_handle_merge: MagicMock):
         # we're passing multiple project ids
         request.GET = {"id": group_ids, "project": project_ids}
 
-        update_groups(request, group_ids, projects, self.organization.id)
+        group_list = get_group_list(self.organization.id, projects, group_ids)
+        update_groups(request, group_list)
 
         call_args = mock_handle_merge.call_args.args
 
@@ -364,7 +378,8 @@ def test_no_project_ids_passed(self, mock_handle_merge: MagicMock):
         request.data = {"merge": 1}
         request.GET = {"id": group_ids}
 
-        update_groups(request, group_ids, [project], self.organization.id, search_fn=Mock())
+        group_list = get_group_list(self.organization.id, [project], group_ids)
+        update_groups(request, group_list)
 
         call_args = mock_handle_merge.call_args.args
 
@@ -415,7 +430,8 @@ def test_metrics(self):
             request.META = {"HTTP_REFERER": referer}
 
             with patch("sentry.api.helpers.group_index.update.metrics.incr") as mock_metrics_incr:
-                update_groups(request, group_ids, [project], self.organization.id, search_fn=Mock())
+                group_list = get_group_list(self.organization.id, [project], group_ids)
+                update_groups(request, group_list)
 
                 mock_metrics_incr.assert_any_call(
                     "grouping.merge_issues",
@@ -1125,8 +1141,7 @@ def test_delete_groups_simple(self, send_robust: Mock):
             GroupHash.objects.create(project=self.project, group=group, hash=hashes[i])
             add_group_to_inbox(group, GroupInboxReason.NEW)
 
-        search_fn = Mock()
-        delete_groups(request, [self.project], self.organization.id, search_fn)
+        delete_groups(request, [self.project], self.organization.id)
 
         assert (
             len(GroupHash.objects.filter(project_id=self.project.id, group_id__in=group_ids).all())
@@ -1158,8 +1173,7 @@ def test_delete_groups_deletes_seer_records_by_hash(
             GroupHash.objects.create(project=self.project, group=group, hash=hashes[i])
             add_group_to_inbox(group, GroupInboxReason.NEW)
 
-        search_fn = Mock()
-        delete_groups(request, [self.project], self.organization.id, search_fn)
+        delete_groups(request, [self.project], self.organization.id)
 
         assert (
             len(GroupHash.objects.filter(project_id=self.project.id, group_id__in=group_ids).all())
diff --git a/tests/sentry/api/serializers/test_event.py b/tests/sentry/api/serializers/test_event.py
index 6c6eed2d46a6d1..c8dc5003bd9802 100644
--- a/tests/sentry/api/serializers/test_event.py
+++ b/tests/sentry/api/serializers/test_event.py
@@ -12,7 +12,7 @@
 from sentry.models.release import Release
 from sentry.sdk_updates import SdkIndexState
 from sentry.testutils.cases import TestCase
-from sentry.testutils.helpers.datetime import before_now, timestamp_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.performance_issues.event_generators import get_event
 from sentry.testutils.skips import requires_snuba
 from sentry.utils.samples import load_data
@@ -281,29 +281,6 @@ def test_transaction_event(self):
         assert "breakdowns" in result
         assert result["breakdowns"] == event_data["breakdowns"]
 
-    def test_transaction_event_with_metrics_summary(self):
-        metrics_summary = {
-            "d:custom/sentry.event_manager.get_event_instance@second": [
-                {
-                    "min": 10.0,
-                    "max": 20.0,
-                    "sum": 30.0,
-                    "count": 2,
-                    "tags": {
-                        "environment": "prod",
-                        "event_type": "default",
-                        "release": "backend",
-                        "result": "success",
-                        "transaction": "sentry.tasks.store.save_event",
-                    },
-                }
-            ]
-        }
-        event_data = load_data("transaction", metrics_summary=metrics_summary)
-        event = self.store_event(data=event_data, project_id=self.project.id)
-        result = serialize(event)
-        assert result["_metrics_summary"] == metrics_summary
-
     def test_transaction_event_empty_spans(self):
         event_data = load_data("transaction")
         event_data["spans"] = []
@@ -602,10 +579,8 @@ def test_event_db_span_formatting(self):
                         "op": "db",
                         "parent_span_id": "abe79ad9292b90a9",
                         "span_id": "9c045ea336297177",
-                        "start_timestamp": timestamp_format(
-                            before_now(minutes=1, milliseconds=200)
-                        ),
-                        "timestamp": timestamp_format(before_now(minutes=1)),
+                        "start_timestamp": before_now(minutes=1, milliseconds=200).timestamp(),
+                        "timestamp": before_now(minutes=1).timestamp(),
                         "trace_id": "ff62a8b040f340bda5d830223def1d81",
                     },
                     {
@@ -613,10 +588,8 @@ def test_event_db_span_formatting(self):
                         "op": "http",
                         "parent_span_id": "a99fd04e79e17631",
                         "span_id": "abe79ad9292b90a9",
-                        "start_timestamp": timestamp_format(
-                            before_now(minutes=1, milliseconds=200)
-                        ),
-                        "timestamp": timestamp_format(before_now(minutes=1)),
+                        "start_timestamp": before_now(minutes=1, milliseconds=200).timestamp(),
+                        "timestamp": before_now(minutes=1).timestamp(),
                         "trace_id": "ff62a8b040f340bda5d830223def1d81",
                     },
                 ],
diff --git a/tests/sentry/api/serializers/test_team.py b/tests/sentry/api/serializers/test_team.py
index 53c86f2e16c810..9c0552b7fc1c98 100644
--- a/tests/sentry/api/serializers/test_team.py
+++ b/tests/sentry/api/serializers/test_team.py
@@ -3,6 +3,7 @@
 from django.conf import settings
 
 from sentry.api.serializers import serialize
+from sentry.api.serializers.models.project import ProjectSerializer
 from sentry.api.serializers.models.team import TeamSCIMSerializer, TeamWithProjectsSerializer
 from sentry.app import env
 from sentry.models.organizationmember import InviteStatus
@@ -252,7 +253,9 @@ def test_simple(self):
         project2 = self.create_project(teams=[team], organization=organization, name="bar")
 
         result = serialize(team, user, TeamWithProjectsSerializer())
-        serialized_projects = serialize([project2, project], user)
+        serialized_projects = serialize(
+            [project2, project], user, ProjectSerializer(collapse=["unusedFeatures"])
+        )
 
         assert result == {
             "id": str(team.id),
diff --git a/tests/sentry/api/test_api_pagination_check.py b/tests/sentry/api/test_api_pagination_check.py
index 038734f3a45fd0..5cdaa64d055445 100644
--- a/tests/sentry/api/test_api_pagination_check.py
+++ b/tests/sentry/api/test_api_pagination_check.py
@@ -1,7 +1,7 @@
 from unittest import TestCase
 
 import pytest
-from django.http import HttpRequest
+from django.test import RequestFactory
 from rest_framework.request import Request
 from rest_framework.response import Response
 
@@ -16,10 +16,6 @@ def __init__(self, *args, **kwargs):
                 super().__init__(*args, **kwargs)
                 self.access = "read"
 
-            # Required to go through the dispatch method
-            def initialize_request(self, request, *args, **kwargs) -> Request:
-                return request
-
             # Required to go through the dispatch method
             def check_permissions(self, request: Request) -> None:
                 pass
@@ -30,8 +26,7 @@ def get(self, request, *args, **kwargs):
         # Test the endpoint, assert there is a MissingPaginationError
         with pytest.raises(MissingPaginationError):
             endpoint = ExampleEndpoint()
-            request = Request(HttpRequest())
-            request.method = "GET"
+            request = RequestFactory().get("/")
             request.access = "read"
             ExampleEndpoint.dispatch(endpoint, request)
 
@@ -41,10 +36,6 @@ def __init__(self, *args, **kwargs):
                 super().__init__(*args, **kwargs)
                 self.access = "read"
 
-            # Required to go through the dispatch method
-            def initialize_request(self, request, *args, **kwargs) -> Request:
-                return request
-
             # Required to go through the dispatch method
             def check_permissions(self, request: Request) -> None:
                 pass
@@ -54,21 +45,16 @@ def get(self, request, *args, **kwargs):
 
         # Test the endpoint, assert there is no MissingPaginationError
         endpoint = GroupTagsEndpoint()
-        request = Request(HttpRequest())
-        request.method = "GET"
+        request = RequestFactory().get("/")
         request.access = "read"
         GroupTagsEndpoint.dispatch(endpoint, request)
 
     def test_empty_payload_with_pagination(self) -> None:
-        class ExampleEndpoint(TestCase, Endpoint):
+        class ExampleEndpoint(Endpoint):
             def __init__(self, *args, **kwargs):
                 super().__init__(*args, **kwargs)
                 self.access = "read"
 
-            # Required to go through the dispatch method
-            def initialize_request(self, request, *args, **kwargs) -> Request:
-                return request
-
             # Required to go through the dispatch method
             def check_permissions(self, request: Request) -> None:
                 pass
@@ -84,7 +70,6 @@ def get(self, request, *args, **kwargs):
 
         # Test the endpoint, assert there is no MissingPaginationError
         endpoint = ExampleEndpoint()
-        request = Request(HttpRequest())
-        request.method = "GET"
+        request = RequestFactory().get("/")
         request.access = "read"
         ExampleEndpoint.dispatch(endpoint, request)
diff --git a/tests/sentry/api/test_authentication.py b/tests/sentry/api/test_authentication.py
index dfdb9ce919cc5c..ef3eb7e7f741fe 100644
--- a/tests/sentry/api/test_authentication.py
+++ b/tests/sentry/api/test_authentication.py
@@ -2,7 +2,6 @@
 from datetime import UTC, datetime
 
 import pytest
-from django.http import HttpRequest
 from django.test import RequestFactory, override_settings
 from rest_framework.exceptions import AuthenticationFailed
 from rest_framework.request import Request
@@ -31,11 +30,17 @@
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import TestCase
 from sentry.testutils.pytest.fixtures import django_db_all
+from sentry.testutils.requests import drf_request_from_request
 from sentry.testutils.silo import assume_test_silo_mode, control_silo_test, no_silo_test
 from sentry.types.token import AuthTokenType
 from sentry.utils.security.orgauthtoken_token import hash_token
 
 
+def _drf_request(data: dict[str, str] | None = None) -> Request:
+    req = RequestFactory().post("/example", data, format="json")
+    return drf_request_from_request(req)
+
+
 @control_silo_test
 class TestClientIdSecretAuthentication(TestCase):
     def setUp(self):
@@ -49,53 +54,53 @@ def setUp(self):
         self.api_app = self.sentry_app.application
 
     def test_authenticate(self):
-        request = HttpRequest()
-        request.json_body = {
-            "client_id": self.api_app.client_id,
-            "client_secret": self.api_app.client_secret,
-        }
+        request = _drf_request(
+            {
+                "client_id": self.api_app.client_id,
+                "client_secret": self.api_app.client_secret,
+            }
+        )
 
         user, _ = self.auth.authenticate(request)
 
         assert user.id == self.sentry_app.proxy_user.id
 
     def test_without_json_body(self):
-        request = HttpRequest()
-        request.json_body = None
+        request = _drf_request()
 
         with pytest.raises(AuthenticationFailed):
             self.auth.authenticate(request)
 
     def test_missing_client_id(self):
-        request = HttpRequest()
-        request.json_body = {"client_secret": self.api_app.client_secret}
+        request = _drf_request({"client_secret": self.api_app.client_secret})
 
         with pytest.raises(AuthenticationFailed):
             self.auth.authenticate(request)
 
     def test_missing_client_secret(self):
-        request = HttpRequest()
-        request.json_body = {"client_id": self.api_app.client_id}
+        request = _drf_request({"client_id": self.api_app.client_id})
 
         with pytest.raises(AuthenticationFailed):
             self.auth.authenticate(request)
 
     def test_incorrect_client_id(self):
-        request = HttpRequest()
-        request.json_body = {
-            "client_id": "notit",
-            "client_secret": self.api_app.client_secret,
-        }
+        request = _drf_request(
+            {
+                "client_id": "notit",
+                "client_secret": self.api_app.client_secret,
+            }
+        )
 
         with pytest.raises(AuthenticationFailed):
             self.auth.authenticate(request)
 
     def test_incorrect_client_secret(self):
-        request = HttpRequest()
-        request.json_body = {
-            "client_id": self.api_app.client_id,
-            "client_secret": "notit",
-        }
+        request = _drf_request(
+            {
+                "client_id": self.api_app.client_id,
+                "client_secret": "notit",
+            }
+        )
 
         with pytest.raises(AuthenticationFailed):
             self.auth.authenticate(request)
@@ -111,7 +116,7 @@ def setUp(self):
         self.project_key = self.create_project_key(project=self.project)
 
     def test_authenticate(self):
-        request = HttpRequest()
+        request = _drf_request()
         request.META["HTTP_AUTHORIZATION"] = f"DSN {self.project_key.dsn_public}"
 
         result = self.auth.authenticate(request)
@@ -123,7 +128,7 @@ def test_authenticate(self):
 
     def test_inactive_key(self):
         self.project_key.update(status=ProjectKeyStatus.INACTIVE)
-        request = HttpRequest()
+        request = _drf_request()
         request.META["HTTP_AUTHORIZATION"] = f"DSN {self.project_key.dsn_public}"
 
         with pytest.raises(AuthenticationFailed):
@@ -149,7 +154,7 @@ def setUp(self):
         )
 
     def test_authenticate(self):
-        request = HttpRequest()
+        request = _drf_request()
         request.META["HTTP_AUTHORIZATION"] = f"Bearer {self.token}"
 
         result = self.auth.authenticate(request)
@@ -162,7 +167,7 @@ def test_authenticate(self):
         )
 
     def test_no_match(self):
-        request = HttpRequest()
+        request = _drf_request()
         request.META["HTTP_AUTHORIZATION"] = "Bearer sntrys_abc"
 
         with pytest.raises(AuthenticationFailed):
@@ -170,7 +175,7 @@ def test_no_match(self):
 
     def test_inactive_key(self):
         self.org_auth_token.update(date_deactivated=datetime.now(UTC))
-        request = HttpRequest()
+        request = _drf_request()
         request.META["HTTP_AUTHORIZATION"] = f"Bearer {self.token}"
 
         with pytest.raises(AuthenticationFailed):
@@ -191,7 +196,7 @@ def setUp(self):
         self.token = self.api_token.plaintext_token
 
     def test_authenticate(self):
-        request = HttpRequest()
+        request = _drf_request()
         request.META["HTTP_AUTHORIZATION"] = f"Bearer {self.token}"
 
         result = self.auth.authenticate(request)
@@ -203,7 +208,7 @@ def test_authenticate(self):
         assert AuthenticatedToken.from_token(auth) == AuthenticatedToken.from_token(self.api_token)
 
     def test_no_match(self):
-        request = HttpRequest()
+        request = _drf_request()
         request.META["HTTP_AUTHORIZATION"] = "Bearer abc"
 
         with pytest.raises(AuthenticationFailed):
@@ -226,7 +231,7 @@ def setUp(self):
         self.token = self.api_token.plaintext_token
 
     def test_authenticate_correct_org(self):
-        request = HttpRequest()
+        request = _drf_request()
         request.META["HTTP_AUTHORIZATION"] = f"Bearer {self.token}"
         request.path_info = f"/api/0/organizations/{self.org.slug}/projects/"
 
@@ -239,7 +244,7 @@ def test_authenticate_correct_org(self):
         assert AuthenticatedToken.from_token(auth) == AuthenticatedToken.from_token(self.api_token)
 
     def test_authenticate_incorrect_org(self):
-        request = HttpRequest()
+        request = _drf_request()
         request.META["HTTP_AUTHORIZATION"] = f"Bearer {self.token}"
         request.path_info = f"/api/0/organizations/{self.another_org}/projects/"
 
@@ -247,7 +252,7 @@ def test_authenticate_incorrect_org(self):
             self.auth.authenticate(request)
 
     def test_authenticate_user_level_endpoints(self):
-        request = HttpRequest()
+        request = _drf_request()
         request.META["HTTP_AUTHORIZATION"] = f"Bearer {self.token}"
         request.path_info = "/api/0/projects/"
 
@@ -255,7 +260,7 @@ def test_authenticate_user_level_endpoints(self):
             self.auth.authenticate(request)
 
     def test_authenticate_allowlist_endpoint(self):
-        request = HttpRequest()
+        request = _drf_request()
         request.META["HTTP_AUTHORIZATION"] = f"Bearer {self.token}"
         request.path_info = "/api/0/organizations/"
 
@@ -268,7 +273,7 @@ def test_authenticate_allowlist_endpoint(self):
         assert AuthenticatedToken.from_token(auth) == AuthenticatedToken.from_token(self.api_token)
 
     def test_no_match(self):
-        request = HttpRequest()
+        request = _drf_request()
         request.META["HTTP_AUTHORIZATION"] = "Bearer abc"
         request.path_info = f"/api/0/organizations/{self.another_org}/projects/"
 
@@ -284,7 +289,9 @@ def test_registered_relay(internal):
 
     data = {"some_data": "hello"}
     packed, signature = sk.pack(data)
-    request = RequestFactory().post("/", data=packed, content_type="application/json")
+    request = drf_request_from_request(
+        RequestFactory().post("/", data=packed, content_type="application/json")
+    )
     request.META["HTTP_X_SENTRY_RELAY_SIGNATURE"] = signature
     request.META["HTTP_X_SENTRY_RELAY_ID"] = relay_id
     request.META["REMOTE_ADDR"] = "200.200.200.200"  # something that is NOT local network
@@ -315,7 +322,9 @@ def test_statically_configured_relay(settings, internal):
 
     data = {"some_data": "hello"}
     packed, signature = sk.pack(data)
-    request = RequestFactory().post("/", data=packed, content_type="application/json")
+    request = drf_request_from_request(
+        RequestFactory().post("/", data=packed, content_type="application/json")
+    )
     request.META["HTTP_X_SENTRY_RELAY_SIGNATURE"] = signature
     request.META["HTTP_X_SENTRY_RELAY_ID"] = relay_id
     request.META["REMOTE_ADDR"] = "200.200.200.200"  # something that is NOT local network
@@ -345,8 +354,9 @@ def setUp(self):
     @override_settings(RPC_SHARED_SECRET=["a-long-secret-key"])
     def test_authenticate_success(self):
         data = b'{"meta":{},"args":{"id":1}'
-        request = RequestFactory().post("/", data=data, content_type="application/json")
-        request = Request(request=request)
+        request = drf_request_from_request(
+            RequestFactory().post("/", data=data, content_type="application/json")
+        )
 
         signature = generate_request_signature(request.path_info, request.body)
         request.META["HTTP_AUTHORIZATION"] = f"rpcsignature {signature}"
@@ -356,13 +366,13 @@ def test_authenticate_success(self):
         assert token == signature
 
     def test_authenticate_old_key_validates(self):
-        request = RequestFactory().post("/", data="", content_type="application/json")
+        request = drf_request_from_request(
+            RequestFactory().post("/", data="", content_type="application/json")
+        )
         with override_settings(RPC_SHARED_SECRET=["an-old-key"]):
             signature = generate_request_signature(request.path_info, request.body)
             request.META["HTTP_AUTHORIZATION"] = f"rpcsignature {signature}"
 
-        request = Request(request=request)
-
         # Update settings so that we have a new key
         with override_settings(RPC_SHARED_SECRET=["a-long-secret-key", "an-old-key"]):
             user, token = self.auth.authenticate(request)
@@ -371,29 +381,29 @@ def test_authenticate_old_key_validates(self):
         assert token == signature
 
     def test_authenticate_without_signature(self):
-        request = RequestFactory().post("/", data="", content_type="application/json")
+        request = drf_request_from_request(
+            RequestFactory().post("/", data="", content_type="application/json")
+        )
         request.META["HTTP_AUTHORIZATION"] = "Bearer abcdef"
 
-        request = Request(request=request)
-
         assert self.auth.authenticate(request) is None
 
     @override_settings(RPC_SHARED_SECRET=["a-long-secret-key"])
     def test_authenticate_invalid_signature(self):
-        request = RequestFactory().post("/", data="", content_type="application/json")
+        request = drf_request_from_request(
+            RequestFactory().post("/", data="", content_type="application/json")
+        )
         request.META["HTTP_AUTHORIZATION"] = "rpcsignature abcdef"
 
-        request = Request(request=request)
-
         with pytest.raises(AuthenticationFailed):
             self.auth.authenticate(request)
 
     def test_authenticate_no_shared_secret(self):
-        request = RequestFactory().post("/", data="", content_type="application/json")
+        request = drf_request_from_request(
+            RequestFactory().post("/", data="", content_type="application/json")
+        )
         request.META["HTTP_AUTHORIZATION"] = "rpcsignature abcdef"
 
-        request = Request(request=request)
-
         with override_settings(RPC_SHARED_SECRET=None):
             with pytest.raises(RpcAuthenticationSetupException):
                 self.auth.authenticate(request)
@@ -405,6 +415,7 @@ def test_system_tokens(self):
         sys_token = SystemToken()
         auth_token = AuthenticatedToken.from_token(sys_token)
 
+        assert auth_token is not None
         assert auth_token.entity_id is None
         assert auth_token.user_id is None
         assert is_system_auth(sys_token) and is_system_auth(auth_token)
@@ -429,6 +440,7 @@ def test_api_tokens(self):
         for token in [at, atr]:
             auth_token = AuthenticatedToken.from_token(token)
 
+            assert auth_token is not None
             assert auth_token.entity_id == at.id
             assert auth_token.user_id == app.proxy_user_id
             assert is_api_token_auth(token) and is_api_token_auth(auth_token)
@@ -446,6 +458,7 @@ def test_api_keys(self):
         for token in [ak, akr]:
             auth_token = AuthenticatedToken.from_token(token)
 
+            assert auth_token is not None
             assert auth_token.entity_id == ak.id
             assert auth_token.user_id is None
             assert is_api_key_auth(token) and is_api_key_auth(auth_token)
@@ -467,9 +480,10 @@ def test_org_auth_tokens(self):
         with assume_test_silo_mode(SiloMode.REGION):
             oatr = OrgAuthTokenReplica.objects.get(orgauthtoken_id=oat.id)
 
-        for token in [oat, oatr]:
+        for token in (oat, oatr):
             auth_token = AuthenticatedToken.from_token(token)
 
+            assert auth_token is not None
             assert auth_token.entity_id == oat.id
             assert auth_token.user_id is None
             assert is_org_auth_token_auth(token) and is_org_auth_token_auth(auth_token)
diff --git a/tests/sentry/api/test_base.py b/tests/sentry/api/test_base.py
index 2189019e8300a3..e9f92edfd00e65 100644
--- a/tests/sentry/api/test_base.py
+++ b/tests/sentry/api/test_base.py
@@ -2,7 +2,7 @@
 from unittest import mock
 from unittest.mock import MagicMock
 
-from django.http import HttpRequest, QueryDict, StreamingHttpResponse
+from django.http import QueryDict, StreamingHttpResponse
 from django.test import override_settings
 from pytest import raises
 from rest_framework.permissions import AllowAny
@@ -500,43 +500,6 @@ def test_custom_response_type(self):
         assert response.has_header("content-type")
 
 
-class EndpointJSONBodyTest(APITestCase):
-    def setUp(self):
-        super().setUp()
-
-        self.request = HttpRequest()
-        self.request.method = "GET"
-        self.request.META["CONTENT_TYPE"] = "application/json"
-
-    def test_json(self):
-        self.request._body = b'{"foo":"bar"}'
-
-        Endpoint().load_json_body(self.request)
-
-        assert self.request.json_body == {"foo": "bar"}
-
-    def test_invalid_json(self):
-        self.request._body = b"hello"
-
-        Endpoint().load_json_body(self.request)
-
-        assert not self.request.json_body
-
-    def test_empty_request_body(self):
-        self.request._body = b""
-
-        Endpoint().load_json_body(self.request)
-
-        assert not self.request.json_body
-
-    def test_non_json_content_type(self):
-        self.request.META["CONTENT_TYPE"] = "text/plain"
-
-        Endpoint().load_json_body(self.request)
-
-        assert not self.request.json_body
-
-
 @all_silo_test(regions=create_test_regions("us", "eu"))
 class CustomerDomainTest(APITestCase):
     def test_resolve_region(self):
diff --git a/tests/sentry/api/test_event_search.py b/tests/sentry/api/test_event_search.py
index 6fbe14fd9f821d..8da6f3c184e64d 100644
--- a/tests/sentry/api/test_event_search.py
+++ b/tests/sentry/api/test_event_search.py
@@ -93,6 +93,12 @@ def node_visitor(token):
         if token["type"] == "keyExplicitTag":
             return SearchKey(name=f"tags[{token['key']['value']}]")
 
+        if token["type"] == "keyExplicitStringTag":
+            return SearchKey(name=f"tags[{token['key']['value']},string]")
+
+        if token["type"] == "keyExplicitNumberTag":
+            return SearchKey(name=f"tags[{token['key']['value']},number]")
+
         if token["type"] == "keyAggregate":
             name = node_visitor(token["name"]).name
             # Consistent join aggregate function parameters
diff --git a/tests/sentry/auth/providers/test_oauth2.py b/tests/sentry/auth/providers/test_oauth2.py
index a89cbd43bfbe0a..a455fcfdbedf08 100644
--- a/tests/sentry/auth/providers/test_oauth2.py
+++ b/tests/sentry/auth/providers/test_oauth2.py
@@ -28,7 +28,7 @@ def build_identity(self, state: Mapping[str, Any]) -> Mapping[str, Any]:
         raise NotImplementedError
 
     def build_config(self, state):
-        pass
+        raise NotImplementedError
 
 
 @control_silo_test
diff --git a/tests/sentry/auth/providers/test_saml2.py b/tests/sentry/auth/providers/test_saml2.py
index 347ad09333f8e0..e260552983e987 100644
--- a/tests/sentry/auth/providers/test_saml2.py
+++ b/tests/sentry/auth/providers/test_saml2.py
@@ -25,7 +25,7 @@ class DummySAML2Provider(SAML2Provider):
     name = "dummy"
 
     def get_saml_setup_pipeline(self):
-        pass
+        raise NotImplementedError
 
 
 @control_silo_test
diff --git a/tests/sentry/auth/services/test_model.py b/tests/sentry/auth/services/test_model.py
new file mode 100644
index 00000000000000..d17aa037736ad3
--- /dev/null
+++ b/tests/sentry/auth/services/test_model.py
@@ -0,0 +1,34 @@
+from sentry.auth.services.auth.serial import serialize_api_key, serialize_api_token
+from sentry.models.apikey import ApiKey
+from sentry.testutils.cases import TestCase
+from sentry.testutils.silo import control_silo_test
+
+
+@control_silo_test
+class TestRpcApiToken(TestCase):
+    def setUp(self):
+        self.user = self.create_user()
+        self.org = self.create_organization()
+
+    def test_serializes_correct_fields(self):
+        internal_app = self.create_internal_integration(organization=self.org)
+        api_token = self.create_internal_integration_token(
+            user=self.user, internal_integration=internal_app
+        )
+        serialized_token = serialize_api_token(api_token)
+        assert f"{serialized_token} is so skibidi".lower().find("token") == -1
+        assert f"{serialized_token} is so skibidi".lower().find("hashed_token") == -1
+
+
+@control_silo_test
+class TestRpcApiKey(TestCase):
+    def setUp(self):
+        self.user = self.create_user()
+        self.org = self.create_organization()
+
+    def test_serializes_correct_fields(self):
+        key = ApiKey.objects.create(
+            organization_id=self.create_organization().id, scope_list=["org:read"]
+        )
+        serialized_key = serialize_api_key(key)
+        assert f"{serialized_key} is so skibidi".lower().find("key") == -1
diff --git a/tests/sentry/auth/test_password_validation.py b/tests/sentry/auth/test_password_validation.py
index 42a24a1ade3a38..00339976a58fc6 100644
--- a/tests/sentry/auth/test_password_validation.py
+++ b/tests/sentry/auth/test_password_validation.py
@@ -84,10 +84,7 @@ def test_pwned_passwords_low_threshold(self):
             "https://api.pwnedpasswords.com/range/74BA3",
             body=PWNED_PASSWORDS_RESPONSE_MOCK,
         )
-        try:
-            validate_password("hiphophouse")
-        except ValidationError:
-            assert False, "ValidationError was thrown"
+        validate_password("hiphophouse")  # should not raise
 
     @responses.activate
     @override_settings(
@@ -101,7 +98,4 @@ def test_pwned_passwords_corrupted_content(self):
             "https://api.pwnedpasswords.com/range/74BA3",
             body="corrupted_content_with_no_colon",
         )
-        try:
-            validate_password("hiphophouse")
-        except ValidationError:
-            assert False, "ValidationError was thrown"
+        validate_password("hiphophouse")  # should not raise
diff --git a/tests/sentry/auth/test_superuser.py b/tests/sentry/auth/test_superuser.py
index 2965e91c36cabf..273859aa39f83e 100644
--- a/tests/sentry/auth/test_superuser.py
+++ b/tests/sentry/auth/test_superuser.py
@@ -207,7 +207,7 @@ def test_su_access_no_request(self):
 
         with pytest.raises(SuperuserAccessFormInvalidJson):
             superuser.set_logged_in(request.user)
-            assert superuser.is_active is False
+        assert superuser.is_active is False
 
     @freeze_time(BASETIME + OUTSIDE_PRIVILEGE_ACCESS_EXPIRE_TIME)
     def test_not_expired_check_org_in_request(self):
@@ -271,7 +271,7 @@ def test_su_access_invalid_request_body(
 
         with pytest.raises(SuperuserAccessFormInvalidJson):
             superuser.set_logged_in(request.user)
-            assert superuser.is_active is False
+        assert superuser.is_active is False
 
     def test_login_saves_session(self):
         user = self.create_user("foo@example.com", is_superuser=True)
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 c2ca97413bf1b5..cdcc5a4d6b104e 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-12-09T17:40:04.889774+00:00'
+created: '2024-12-18T23:54:45.830268+00:00'
 creator: sentry
 source: tests/sentry/backup/test_comparators.py
 ---
@@ -808,10 +808,6 @@ source: tests/sentry/backup/test_comparators.py
     fields:
     - user
   model_name: sentry.lostpasswordhash
-- comparators:
-  - class: ForeignKeyComparator
-    fields: []
-  model_name: sentry.metricskeyindexer
 - comparators:
   - class: UUID4Comparator
     fields:
@@ -1629,6 +1625,16 @@ source: tests/sentry/backup/test_comparators.py
     fields:
     - user
   model_name: social_auth.usersocialauth
+- comparators:
+  - class: DateUpdatedComparator
+    fields:
+    - date_added
+    - date_updated
+  - class: ForeignKeyComparator
+    fields:
+    - created_by_id
+    - project
+  model_name: tempest.tempestcredentials
 - comparators:
   - class: ForeignKeyComparator
     fields:
@@ -1642,6 +1648,11 @@ source: tests/sentry/backup/test_comparators.py
   - class: ForeignKeyComparator
     fields: []
   model_name: uptime.uptimesubscription
+- comparators:
+  - class: ForeignKeyComparator
+    fields:
+    - uptime_subscription
+  model_name: uptime.uptimesubscriptionregion
 - comparators:
   - class: DateUpdatedComparator
     fields:
diff --git a/tests/sentry/conf/types/test_imports.py b/tests/sentry/conf/types/test_imports.py
index 0964ef0cddd994..51b2bfc3d116e1 100644
--- a/tests/sentry/conf/types/test_imports.py
+++ b/tests/sentry/conf/types/test_imports.py
@@ -13,6 +13,7 @@
     (
         "sentry.conf",
         "sentry.conf.types",
+        "sentry.conf.types.kafka_definition",
         # these come from sentry.__init__ -- please don't make this longer!
         "sentry._importchecker",
         "sentry.monkey",
diff --git a/tests/sentry/workflow_engine/models/test_detector.py b/tests/sentry/consumers/__init__.py
similarity index 100%
rename from tests/sentry/workflow_engine/models/test_detector.py
rename to tests/sentry/consumers/__init__.py
diff --git a/tests/sentry/consumers/test_dlq.py b/tests/sentry/consumers/test_dlq.py
new file mode 100644
index 00000000000000..257f479534410f
--- /dev/null
+++ b/tests/sentry/consumers/test_dlq.py
@@ -0,0 +1,92 @@
+import time
+from datetime import datetime, timedelta, timezone
+from typing import cast
+from unittest.mock import Mock
+
+import msgpack
+import pytest
+from arroyo.backends.kafka import KafkaPayload
+from arroyo.dlq import InvalidMessage
+from arroyo.types import BrokerValue, Message, Partition, Topic
+
+from sentry.consumers.dlq import DlqStaleMessagesStrategyFactoryWrapper
+from sentry.testutils.pytest.fixtures import django_db_all
+
+
+def make_message(payload: bytes, partition: Partition, offset: int, timestamp: datetime) -> Message:
+    return Message(
+        BrokerValue(
+            KafkaPayload(None, payload, []),
+            partition,
+            offset,
+            timestamp,
+        )
+    )
+
+
+@pytest.mark.parametrize("stale_threshold_sec", [300])
+@django_db_all
+def test_dlq_stale_messages_timestamps(factories, stale_threshold_sec) -> None:
+
+    organization = factories.create_organization()
+    project = factories.create_project(organization=organization)
+
+    empty_event_payload = msgpack.packb(
+        {
+            "type": "event",
+            "project_id": project.id,
+            "payload": b"{}",
+            "start_time": int(time.time()),
+            "event_id": "aaa",
+        }
+    )
+
+    partition = Partition(Topic("topic"), 0)
+    offset = 10
+    inner_factory_mock = Mock()
+    inner_strategy_mock = Mock()
+    inner_factory_mock.create_with_partitions = Mock(return_value=inner_strategy_mock)
+    factory = DlqStaleMessagesStrategyFactoryWrapper(
+        stale_threshold_sec=stale_threshold_sec,
+        inner=inner_factory_mock,
+    )
+    strategy = factory.create_with_partitions(Mock(), Mock())
+
+    test_cases = [
+        {
+            "timestamp": datetime.now() - timedelta(seconds=stale_threshold_sec - 60),
+            "should_raise": False,
+        },
+        {
+            "timestamp": datetime.now() - timedelta(seconds=stale_threshold_sec + 60),
+            "should_raise": True,
+        },
+        {
+            "timestamp": datetime.now(timezone.utc) - timedelta(seconds=stale_threshold_sec + 60),
+            "should_raise": True,
+        },
+        {
+            "timestamp": datetime.now(timezone.utc) - timedelta(seconds=stale_threshold_sec - 60),
+            "should_raise": False,
+        },
+    ]
+
+    for idx, case in enumerate(test_cases):
+        message = make_message(
+            empty_event_payload,
+            partition,
+            offset + idx,
+            timestamp=cast(datetime, case["timestamp"]),
+        )
+
+        if case["should_raise"]:
+            with pytest.raises(InvalidMessage) as exc_info:
+                strategy.submit(message)
+
+            assert exc_info.value.partition == partition
+            assert exc_info.value.offset == offset + idx
+        else:
+            strategy.submit(message)
+
+    valid_messages = sum(1 for case in test_cases if not case["should_raise"])
+    assert inner_strategy_mock.submit.call_count == valid_messages
diff --git a/tests/sentry/consumers/test_synchronized.py b/tests/sentry/consumers/test_synchronized.py
index 53d5f590c004ab..112ff04e73d2da 100644
--- a/tests/sentry/consumers/test_synchronized.py
+++ b/tests/sentry/consumers/test_synchronized.py
@@ -67,7 +67,7 @@ def wait_for_consumer(consumer: Consumer[T], message: BrokerValue[T], attempts:
 
         time.sleep(0.1)
 
-    raise Exception(f"{message} was not received by {consumer} within {attempts} attempts")
+    raise AssertionError(f"{message} was not received by {consumer} within {attempts} attempts")
 
 
 def test_synchronized_consumer() -> None:
diff --git a/tests/sentry/db/models/fields/bitfield/test_bitfield.py b/tests/sentry/db/models/fields/bitfield/test_bitfield.py
index 90703240872af7..aa8677a7749110 100644
--- a/tests/sentry/db/models/fields/bitfield/test_bitfield.py
+++ b/tests/sentry/db/models/fields/bitfield/test_bitfield.py
@@ -322,10 +322,7 @@ def test_binary_capacity(self):
         # Big flags list
         flags = ["f" + str(i) for i in range(100)]
 
-        try:
-            BitField(flags=flags[:MAX_COUNT])
-        except ValueError:
-            self.fail("It should work well with these flags")
+        BitField(flags=flags[:MAX_COUNT])  # should not raise
 
         pytest.raises(ValueError, BitField, flags=flags[: (MAX_COUNT + 1)])
 
@@ -340,10 +337,7 @@ def test_dictionary_init(self):
             -100: "smallkey",
         }
 
-        try:
-            bf = BitField(flags)
-        except ValueError:
-            self.fail("It should work well with these flags")
+        bf = BitField(flags)
 
         self.assertEqual(bf.flags, ["zero", "first", "second", "", "", "", "", "", "", "", "tenth"])
         pytest.raises(ValueError, BitField, flags={})
diff --git a/tests/sentry/db/test_parse_query.py b/tests/sentry/db/test_parse_query.py
deleted file mode 100644
index 8a137d568ce06a..00000000000000
--- a/tests/sentry/db/test_parse_query.py
+++ /dev/null
@@ -1,92 +0,0 @@
-from sentry.testutils.cases import TestCase
-from sentry.testutils.helpers import parse_queries
-
-
-class ParseQuery(TestCase):
-    def test_parse_postgres_queries(self):
-        result = parse_queries(
-            [
-                {"sql": 'SAVEPOINT "s47890194282880_x49"', "time": "0.000"},
-                {"sql": 'RELEASE SAVEPOINT "s47890194282880_x49"', "time": "0.000"},
-                {
-                    "sql": 'SELECT "sentry_rawevent"."id", "sentry_rawevent"."project_id", "sentry_rawevent"."event_id", "sentry_rawevent"."datetime", "sentry_rawevent"."data" FROM "sentry_rawevent" WHERE ("sentry_rawevent"."event_id" = \'1fba9e314001443b93285dc4411f1593\'  AND "sentry_rawevent"."project_id" = 864 )',
-                    "time": "0.000",
-                },
-                {
-                    "sql": 'SELECT "sentry_reprocessingreport"."id", "sentry_reprocessingreport"."project_id", "sentry_reprocessingreport"."event_id", "sentry_reprocessingreport"."datetime" FROM "sentry_reprocessingreport" WHERE ("sentry_reprocessingreport"."event_id" = \'1fba9e314001443b93285dc4411f1593\'  AND "sentry_reprocessingreport"."project_id" = 864 )',
-                    "time": "0.001",
-                },
-                {"sql": 'SAVEPOINT "s47890194282880_x50"', "time": "0.000"},
-                {
-                    "sql": 'INSERT INTO "sentry_eventuser" ("project_id", "hash", "ident", "email", "username", "name", "ip_address", "date_added") VALUES (864, \'f528764d624db129b32c21fbca0cb8d6\', NULL, NULL, NULL, NULL, \'127.0.0.1\', \'2018-05-22 09:12:12.357888+00:00\') RETURNING "sentry_eventuser"."id"',
-                    "time": "0.000",
-                },
-                {"sql": 'ROLLBACK TO SAVEPOINT "s47890194282880_x50"', "time": "0.000"},
-                {
-                    "sql": 'SELECT "sentry_eventuser"."id", "sentry_eventuser"."project_id", "sentry_eventuser"."hash", "sentry_eventuser"."ident", "sentry_eventuser"."email", "sentry_eventuser"."username", "sentry_eventuser"."name", "sentry_eventuser"."ip_address", "sentry_eventuser"."date_added" FROM "sentry_eventuser" WHERE ("sentry_eventuser"."project_id" = 864  AND "sentry_eventuser"."hash" = \'f528764d624db129b32c21fbca0cb8d6\' )',
-                    "time": "0.000",
-                },
-                {
-                    "sql": 'SELECT "sentry_grouphash"."id", "sentry_grouphash"."project_id", "sentry_grouphash"."hash", "sentry_grouphash"."group_id", "sentry_grouphash"."group_tombstone_id", "sentry_grouphash"."state" FROM "sentry_grouphash" WHERE ("sentry_grouphash"."project_id" = 864  AND "sentry_grouphash"."hash" = \'5d41402abc4b2a76b9719d911017c592\' )',
-                    "time": "0.000",
-                },
-                {
-                    "sql": 'SELECT "sentry_groupedmessage"."id", "sentry_groupedmessage"."project_id", "sentry_groupedmessage"."logger", "sentry_groupedmessage"."level", "sentry_groupedmessage"."message", "sentry_groupedmessage"."view", "sentry_groupedmessage"."num_comments", "sentry_groupedmessage"."platform", "sentry_groupedmessage"."status", "sentry_groupedmessage"."times_seen", "sentry_groupedmessage"."last_seen", "sentry_groupedmessage"."first_seen", "sentry_groupedmessage"."first_release_id", "sentry_groupedmessage"."resolved_at", "sentry_groupedmessage"."active_at", "sentry_groupedmessage"."time_spent_total", "sentry_groupedmessage"."time_spent_count", "sentry_groupedmessage"."score", "sentry_groupedmessage"."is_public", "sentry_groupedmessage"."data", "sentry_groupedmessage"."short_id" FROM "sentry_groupedmessage" WHERE "sentry_groupedmessage"."id" = 662 ',
-                    "time": "0.000",
-                },
-                {
-                    "sql": 'SELECT "sentry_project"."id", "sentry_project"."slug", "sentry_project"."name", "sentry_project"."forced_color", "sentry_project"."organization_id", "sentry_project"."public", "sentry_project"."date_added", "sentry_project"."status", "sentry_project"."first_event", "sentry_project"."flags", "sentry_project"."platform" FROM "sentry_project" WHERE "sentry_project"."id" = 864 ',
-                    "time": "0.000",
-                },
-                {
-                    "sql": 'UPDATE "sentry_groupedmessage" SET "times_seen" = "sentry_groupedmessage"."times_seen" + 1, "score" = 1526980332, "data" = \'eJwVyksKhEAMRdF5NlKORKv89QbcgOBUgokopOlgRcHddxze905BWsMUBLMtJ6983EwBNMJYt7H7DFVKEfIU7FH2Pbkl3vAS82re58uGhIbeLRSknRM7TF7ew7yzyA90gJzLP+FOIA0=\', "last_seen" = \'2018-05-22 09:12:12+00:00\' WHERE "sentry_groupedmessage"."id" = 662 ',
-                    "time": "0.001",
-                },
-                {"sql": 'SAVEPOINT "s47890194282880_x51"', "time": "0.000"},
-                {
-                    "sql": 'INSERT INTO "sentry_environmentproject" ("project_id", "environment_id", "is_hidden") VALUES (864, 165, NULL) RETURNING "sentry_environmentproject"."id"',
-                    "time": "0.000",
-                },
-                {"sql": 'ROLLBACK TO SAVEPOINT "s47890194282880_x51"', "time": "0.000"},
-                {
-                    "sql": 'UPDATE "sentry_userreport" SET "environment_id" = 165, "group_id" = 662 WHERE ("sentry_userreport"."project_id" = 864  AND "sentry_userreport"."event_id" = \'1fba9e314001443b93285dc4411f1593\' )',
-                    "time": "0.000",
-                },
-                {"sql": 'SAVEPOINT "s47890194282880_x52"', "time": "0.000"},
-                {
-                    "sql": 'UPDATE "nodestore_node" SET "timestamp" = \'2018-05-22 09:12:12.374085+00:00\', "data" = \'eJxtU8Fu2zAMvesrfIsLbI4lS7KTnYoBW4qu7SFdcgxUm3G0OLEgq127ov8+UnHTSxHACMn3KOo9Km0cZ8uJ8/0fqMOEOcGuKi3ZsJwMcAz+JbPHAH5rahiy3wN4hBQsbZxElnUb0zQehgGzChNclFmOP46xZsOnTW4QblpAREl9KqQdzqkZW+2g63rmeB758By8wQLnBOaCBtt42G6ewA+2P1KpYFfi84EXIThCyEimCR99RwmN52BtPp3Cszm4DrK6P2C+pD47MA12J1zF0s7xGX1FzlYkwNfLFs9BoTgzq5v+n+06M1VZnqRre2z6v0Nye5/oTHxL1ndrLS+SS4f91/BwbcNUFWVW6CS9Xtzf/PqSdHYPyU+o9/1F8n3n+wNMRUX6qTzPSpEszdZ4O7LwSMGMIVXqHu/4HGhEEd0QZEcfYxVjjfGHRKJkt0g7mgOJLEjz92ErSsyi1g8eEyeHc2pScNYiczk5z0QllLqNHU4DU6pAOvK39tiCdx4NoKwk1QoS/fU1aWBrHruQvL1RSTMz+khR+bFyzZ4SVTx9hsy6syj2xpKLMmetJtTHvSRnK9q3HP/GFRhvKAu22rh+CGsbdotoJyZlvKWHGuwTNART7AdXQs+qvCgiH7zvo/NS0/Qy7kMwbUzFZZC4DMtJB09Ai6RyNpIo4Cw4hR6l73umis/3TElCqog8be388aS8ws20bn5+SIQrI64fstPtVmfrqFjF4mjdiHAK39HJHnyHOcI0Lmvaoq1jOjlbSkUceWhJyyjvHl42luTR+LBmyCEJXhz11bRmo5UUKqodIJjGBHqlWpNzmnYm2NBFSsXa+Jaz/zqNSI8=\' WHERE "nodestore_node"."id" = \'u9iv1Ih4RDqz5GtlwX3+TA==\' ',
-                    "time": "0.000",
-                },
-                {"sql": 'SAVEPOINT "s47890194282880_x53"', "time": "0.000"},
-                {
-                    "sql": 'INSERT INTO "nodestore_node" ("id", "data", "timestamp") VALUES (\'u9iv1Ih4RDqz5GtlwX3+TA==\', \'eJxtU8Fu2zAMvesrfIsLbI4lS7KTnYoBW4qu7SFdcgxUm3G0OLEgq127ov8+UnHTSxHACMn3KOo9Km0cZ8uJ8/0fqMOEOcGuKi3ZsJwMcAz+JbPHAH5rahiy3wN4hBQsbZxElnUb0zQehgGzChNclFmOP46xZsOnTW4QblpAREl9KqQdzqkZW+2g63rmeB758By8wQLnBOaCBtt42G6ewA+2P1KpYFfi84EXIThCyEimCR99RwmN52BtPp3Cszm4DrK6P2C+pD47MA12J1zF0s7xGX1FzlYkwNfLFs9BoTgzq5v+n+06M1VZnqRre2z6v0Nye5/oTHxL1ndrLS+SS4f91/BwbcNUFWVW6CS9Xtzf/PqSdHYPyU+o9/1F8n3n+wNMRUX6qTzPSpEszdZ4O7LwSMGMIVXqHu/4HGhEEd0QZEcfYxVjjfGHRKJkt0g7mgOJLEjz92ErSsyi1g8eEyeHc2pScNYiczk5z0QllLqNHU4DU6pAOvK39tiCdx4NoKwk1QoS/fU1aWBrHruQvL1RSTMz+khR+bFyzZ4SVTx9hsy6syj2xpKLMmetJtTHvSRnK9q3HP/GFRhvKAu22rh+CGsbdotoJyZlvKWHGuwTNART7AdXQs+qvCgiH7zvo/NS0/Qy7kMwbUzFZZC4DMtJB09Ai6RyNpIo4Cw4hR6l73umis/3TElCqog8be388aS8ws20bn5+SIQrI64fstPtVmfrqFjF4mjdiHAK39HJHnyHOcI0Lmvaoq1jOjlbSkUceWhJyyjvHl42luTR+LBmyCEJXhz11bRmo5UUKqodIJjGBHqlWpNzmnYm2NBFSsXa+Jaz/zqNSI8=\', \'2018-05-22 09:12:12.374085+00:00\')',
-                    "time": "0.000",
-                },
-                {"sql": 'RELEASE SAVEPOINT "s47890194282880_x53"', "time": "0.000"},
-                {"sql": 'RELEASE SAVEPOINT "s47890194282880_x52"', "time": "0.000"},
-                {"sql": 'SAVEPOINT "s47890194282880_x54"', "time": "0.000"},
-                {"sql": 'RELEASE SAVEPOINT "s47890194282880_x54"', "time": "0.000"},
-                {
-                    "sql": 'SELECT "sentry_groupedmessage"."id", "sentry_groupedmessage"."project_id", "sentry_groupedmessage"."logger", "sentry_groupedmessage"."level", "sentry_groupedmessage"."message", "sentry_groupedmessage"."view", "sentry_groupedmessage"."num_comments", "sentry_groupedmessage"."platform", "sentry_groupedmessage"."status", "sentry_groupedmessage"."times_seen", "sentry_groupedmessage"."last_seen", "sentry_groupedmessage"."first_seen", "sentry_groupedmessage"."first_release_id", "sentry_groupedmessage"."resolved_at", "sentry_groupedmessage"."active_at", "sentry_groupedmessage"."time_spent_total", "sentry_groupedmessage"."time_spent_count", "sentry_groupedmessage"."score", "sentry_groupedmessage"."is_public", "sentry_groupedmessage"."data", "sentry_groupedmessage"."short_id" FROM "sentry_groupedmessage" WHERE "sentry_groupedmessage"."id" = 662 ',
-                    "time": "0.001",
-                },
-                {
-                    "sql": 'SELECT "sentry_groupsnooze"."id", "sentry_groupsnooze"."group_id", "sentry_groupsnooze"."until", "sentry_groupsnooze"."count", "sentry_groupsnooze"."window", "sentry_groupsnooze"."user_count", "sentry_groupsnooze"."user_window", "sentry_groupsnooze"."state", "sentry_groupsnooze"."actor_id" FROM "sentry_groupsnooze" WHERE "sentry_groupsnooze"."group_id" = 662 ',
-                    "time": "0.000",
-                },
-                {
-                    "sql": 'SELECT "sentry_grouprulestatus"."id", "sentry_grouprulestatus"."project_id", "sentry_grouprulestatus"."rule_id", "sentry_grouprulestatus"."group_id", "sentry_grouprulestatus"."status", "sentry_grouprulestatus"."date_added", "sentry_grouprulestatus"."last_active" FROM "sentry_grouprulestatus" WHERE ("sentry_grouprulestatus"."group_id" = 662  AND "sentry_grouprulestatus"."rule_id" = 935 )',
-                    "time": "0.000",
-                },
-                {"sql": 'SAVEPOINT "s47890194282880_x55"', "time": "0.000"},
-                {"sql": 'RELEASE SAVEPOINT "s47890194282880_x55"', "time": "0.000"},
-            ]
-        )
-
-        assert result == {
-            "nodestore_node": 2,
-            "sentry_environmentproject": 1,
-            "sentry_eventuser": 1,
-            "sentry_groupedmessage": 1,
-            "sentry_userreport": 1,
-        }
diff --git a/tests/sentry/db/test_silo_models.py b/tests/sentry/db/test_silo_models.py
index 90866812e0d566..2a81fb339f1e08 100644
--- a/tests/sentry/db/test_silo_models.py
+++ b/tests/sentry/db/test_silo_models.py
@@ -36,6 +36,6 @@ def test_cross_silo_deletions():
 def test_no_serializers_for_hybrid_cloud_dataclasses():
     for type in registry.keys():
         if "hybrid_cloud" in type.__module__:
-            raise ValueError(
+            raise AssertionError(
                 f"{type!r} has a registered serializer, but we should not create serializers for hybrid cloud dataclasses."
             )
diff --git a/tests/sentry/digests/backends/test_redis.py b/tests/sentry/digests/backends/test_redis.py
index 037be690db83e5..3aea756930ba60 100644
--- a/tests/sentry/digests/backends/test_redis.py
+++ b/tests/sentry/digests/backends/test_redis.py
@@ -73,8 +73,8 @@ def test_maintenance_failure_recovery(self):
 
         # ...and you can't send a digest in the waiting state.
         with pytest.raises(InvalidState):
-            with backend.digest("timeline", 0) as records:
-                pass
+            with backend.digest("timeline", 0):
+                raise AssertionError("unreachable")
 
         record_2 = Record("record:2", self.notification, time.time())
         backend.add("timeline", record_2)
@@ -127,8 +127,8 @@ def test_delete(self):
         backend.delete("timeline")
 
         with pytest.raises(InvalidState):
-            with backend.digest("timeline", 0) as records:
-                assert not records
+            with backend.digest("timeline", 0):
+                raise AssertionError("unreachable")
 
         assert set(backend.schedule(time.time())) == set()
         assert len(backend._get_connection("timeline").keys("d:*")) == 0
diff --git a/tests/sentry/dynamic_sampling/tasks/test_tasks.py b/tests/sentry/dynamic_sampling/tasks/test_tasks.py
index 9d8817375ed3f6..981149da1f9978 100644
--- a/tests/sentry/dynamic_sampling/tasks/test_tasks.py
+++ b/tests/sentry/dynamic_sampling/tasks/test_tasks.py
@@ -588,10 +588,6 @@ def add_metrics(self, org, project, sample_rate):
                     org_id=org.id,
                 )
 
-    @staticmethod
-    def flush_redis():
-        get_redis_client_for_ds().flushdb()
-
     @staticmethod
     def set_sliding_window_org_cache_entry(org_id: int, value: str):
         redis = get_redis_client_for_ds()
diff --git a/tests/sentry/dynamic_sampling/test_generate_rules.py b/tests/sentry/dynamic_sampling/test_generate_rules.py
index 77404574363e13..22ecc124d8d4b2 100644
--- a/tests/sentry/dynamic_sampling/test_generate_rules.py
+++ b/tests/sentry/dynamic_sampling/test_generate_rules.py
@@ -724,7 +724,7 @@ def test_generate_rules_return_custom_rules(get_blended_sample_rate, default_old
 
     # no custom rule requests ==> no custom rules
     rules = generate_rules(default_old_project)
-    # only the BOOST_LOW_VOLUME_PROJECTS_RULE should be around (allways on)
+    # only the BOOST_LOW_VOLUME_PROJECTS_RULE should be around (always on)
     assert len(rules) == 1
     assert rules[0]["id"] == 1000
 
diff --git a/tests/sentry/event_manager/grouping/test_seer_grouping.py b/tests/sentry/event_manager/grouping/test_seer_grouping.py
index ccdfc9b7c3c8b2..d8244fe33db921 100644
--- a/tests/sentry/event_manager/grouping/test_seer_grouping.py
+++ b/tests/sentry/event_manager/grouping/test_seer_grouping.py
@@ -11,7 +11,6 @@
 from sentry.testutils.helpers.eventprocessing import save_new_event
 from sentry.testutils.helpers.features import with_feature
 from sentry.testutils.pytest.mocking import capture_results
-from sentry.utils.types import NonNone
 
 
 class SeerEventManagerGroupingTest(TestCase):
@@ -42,9 +41,10 @@ def setUp(self) -> None:
 
     def test_obeys_seer_similarity_flags(self):
         existing_event = save_new_event({"message": "Dogs are great!"}, self.project)
+        assert existing_event.group_id
         seer_result_data = SeerSimilarIssueData(
-            parent_hash=NonNone(existing_event.get_primary_hash()),
-            parent_group_id=NonNone(existing_event.group_id),
+            parent_hash=existing_event.get_primary_hash(),
+            parent_group_id=existing_event.group_id,
             stacktrace_distance=0.01,
             should_group=True,
         )
@@ -67,7 +67,7 @@ def test_obeys_seer_similarity_flags(self):
                 return_value=[seer_result_data],
             ),
             patch(
-                "sentry.grouping.ingest.seer.event_content_is_seer_eligible",
+                "sentry.grouping.ingest.seer._event_content_is_seer_eligible",
                 return_value=True,
             ),
         ):
@@ -103,9 +103,7 @@ def test_obeys_seer_similarity_flags(self):
             # In real life just filtering on group id wouldn't be enough to guarantee us a
             # single, specific GroupHash record, but since the database resets before each test,
             # here it's okay
-            expected_grouphash = GroupHash.objects.filter(
-                group_id=NonNone(existing_event.group_id)
-            ).first()
+            expected_grouphash = GroupHash.objects.filter(group_id=existing_event.group_id).first()
 
             # We checked whether to make the call, and then made it
             assert should_call_seer_spy.call_count == 1
@@ -183,9 +181,10 @@ def assert_correct_seer_metadata(
             )
 
         # Event which is sent and does find a match
+        assert existing_event.group_id is not None
         seer_result_data = SeerSimilarIssueData(
             parent_hash=existing_event.get_primary_hash(),
-            parent_group_id=NonNone(existing_event.group_id),
+            parent_group_id=existing_event.group_id,
             stacktrace_distance=0.01,
             should_group=True,
         )
@@ -256,9 +255,10 @@ def assert_correct_seer_metadata(
     def test_assigns_event_to_neighbor_group_if_found(self, _):
         existing_event = save_new_event({"message": "Dogs are great!"}, self.project)
 
+        assert existing_event.group_id is not None
         seer_result_data = SeerSimilarIssueData(
-            parent_hash=NonNone(existing_event.get_primary_hash()),
-            parent_group_id=NonNone(existing_event.group_id),
+            parent_hash=existing_event.get_primary_hash(),
+            parent_group_id=existing_event.group_id,
             stacktrace_distance=0.01,
             should_group=True,
         )
diff --git a/tests/sentry/event_manager/interfaces/test_breadcrumbs.py b/tests/sentry/event_manager/interfaces/test_breadcrumbs.py
index a9c94a913a443b..50f5a702212c2c 100644
--- a/tests/sentry/event_manager/interfaces/test_breadcrumbs.py
+++ b/tests/sentry/event_manager/interfaces/test_breadcrumbs.py
@@ -10,7 +10,7 @@ def make_breadcrumbs_snapshot(insta_snapshot):
     def inner(data):
         mgr = EventManager(data={"breadcrumbs": data})
         mgr.normalize()
-        evt = eventstore.backend.create_event(data=mgr.get_data())
+        evt = eventstore.backend.create_event(project_id=1, data=mgr.get_data())
         breadcrumbs = evt.interfaces.get("breadcrumbs")
 
         insta_snapshot(
diff --git a/tests/sentry/event_manager/interfaces/test_contexts.py b/tests/sentry/event_manager/interfaces/test_contexts.py
index ccad8bd66b7b15..8295cfa58fed78 100644
--- a/tests/sentry/event_manager/interfaces/test_contexts.py
+++ b/tests/sentry/event_manager/interfaces/test_contexts.py
@@ -9,7 +9,7 @@ def make_ctx_snapshot(insta_snapshot):
     def inner(data):
         mgr = EventManager(data={"contexts": data})
         mgr.normalize()
-        evt = eventstore.backend.create_event(data=mgr.get_data())
+        evt = eventstore.backend.create_event(project_id=1, data=mgr.get_data())
         interface = evt.interfaces.get("contexts")
 
         insta_snapshot(
@@ -125,7 +125,7 @@ def test_large_numbers():
 
     mgr = EventManager(data={"contexts": data})
     mgr.normalize()
-    evt = eventstore.backend.create_event(data=mgr.get_data())
+    evt = eventstore.backend.create_event(project_id=1, data=mgr.get_data())
     interface = evt.interfaces.get("contexts")
     ctx_data = interface.to_json()["large_numbers"]
     for key in numeric_keys:
@@ -157,7 +157,7 @@ def test_large_nested_numbers():
 
     mgr = EventManager(data={"contexts": data})
     mgr.normalize()
-    evt = eventstore.backend.create_event(data=mgr.get_data())
+    evt = eventstore.backend.create_event(project_id=1, data=mgr.get_data())
     interface = evt.interfaces.get("contexts")
     ctx_data = interface.to_json()["large_numbers"]
 
diff --git a/tests/sentry/event_manager/interfaces/test_csp.py b/tests/sentry/event_manager/interfaces/test_csp.py
index b7e5d72a2cdcbc..6706b811095c6b 100644
--- a/tests/sentry/event_manager/interfaces/test_csp.py
+++ b/tests/sentry/event_manager/interfaces/test_csp.py
@@ -15,7 +15,7 @@ def inner(data):
         event_type = get_event_type(data)
         event_metadata = event_type.get_metadata(data)
         data.update(materialize_metadata(data, event_type, event_metadata))
-        evt = eventstore.backend.create_event(data=data)
+        evt = eventstore.backend.create_event(project_id=1, data=data)
         interface = evt.interfaces.get("csp")
 
         insta_snapshot(
diff --git a/tests/sentry/event_manager/interfaces/test_debug_meta.py b/tests/sentry/event_manager/interfaces/test_debug_meta.py
index e77d7089e6ef27..04c353ecae0cff 100644
--- a/tests/sentry/event_manager/interfaces/test_debug_meta.py
+++ b/tests/sentry/event_manager/interfaces/test_debug_meta.py
@@ -9,7 +9,7 @@ def make_debug_meta_snapshot(insta_snapshot):
     def inner(data):
         mgr = EventManager(data={"debug_meta": data})
         mgr.normalize()
-        evt = eventstore.backend.create_event(data=mgr.get_data())
+        evt = eventstore.backend.create_event(project_id=1, data=mgr.get_data())
         interface = evt.interfaces.get("debug_meta")
         insta_snapshot(
             {"errors": evt.data.get("errors"), "to_json": interface and interface.to_json()}
diff --git a/tests/sentry/event_manager/interfaces/test_exception.py b/tests/sentry/event_manager/interfaces/test_exception.py
index 1b30c09328f088..0081fa6280ce31 100644
--- a/tests/sentry/event_manager/interfaces/test_exception.py
+++ b/tests/sentry/event_manager/interfaces/test_exception.py
@@ -11,7 +11,7 @@ def make_exception_snapshot(insta_snapshot):
     def inner(data):
         mgr = EventManager(data={"exception": data})
         mgr.normalize()
-        evt = eventstore.backend.create_event(data=mgr.get_data())
+        evt = eventstore.backend.create_event(project_id=1, data=mgr.get_data())
 
         interface = evt.interfaces.get("exception")
 
diff --git a/tests/sentry/event_manager/interfaces/test_expectct.py b/tests/sentry/event_manager/interfaces/test_expectct.py
index 55f29d272e5e48..c8d7700af38b41 100644
--- a/tests/sentry/event_manager/interfaces/test_expectct.py
+++ b/tests/sentry/event_manager/interfaces/test_expectct.py
@@ -18,7 +18,7 @@ def inner(data):
         event_type = get_event_type(data)
         event_metadata = event_type.get_metadata(data)
         data.update(materialize_metadata(data, event_type, event_metadata))
-        evt = eventstore.backend.create_event(data=data)
+        evt = eventstore.backend.create_event(project_id=1, data=data)
 
         interface = evt.interfaces.get("expectct")
 
diff --git a/tests/sentry/event_manager/interfaces/test_expectstaple.py b/tests/sentry/event_manager/interfaces/test_expectstaple.py
index 22220e78e52714..61ee06121d45c2 100644
--- a/tests/sentry/event_manager/interfaces/test_expectstaple.py
+++ b/tests/sentry/event_manager/interfaces/test_expectstaple.py
@@ -18,7 +18,7 @@ def inner(data):
         event_type = get_event_type(data)
         event_metadata = event_type.get_metadata(data)
         data.update(materialize_metadata(data, event_type, event_metadata))
-        evt = eventstore.backend.create_event(data=data)
+        evt = eventstore.backend.create_event(project_id=1, data=data)
         insta_snapshot(
             {
                 "errors": evt.data.get("errors"),
diff --git a/tests/sentry/event_manager/interfaces/test_frame.py b/tests/sentry/event_manager/interfaces/test_frame.py
index c32fe2a166924f..d3a63fffce30f3 100644
--- a/tests/sentry/event_manager/interfaces/test_frame.py
+++ b/tests/sentry/event_manager/interfaces/test_frame.py
@@ -10,7 +10,7 @@ def make_frames_snapshot(insta_snapshot):
     def inner(data):
         mgr = EventManager(data={"stacktrace": {"frames": [data]}})
         mgr.normalize()
-        evt = eventstore.backend.create_event(data=mgr.get_data())
+        evt = eventstore.backend.create_event(project_id=1, data=mgr.get_data())
         frame = evt.interfaces["stacktrace"].frames[0]
 
         insta_snapshot({"errors": evt.data.get("errors"), "to_json": frame.to_json()})
diff --git a/tests/sentry/event_manager/interfaces/test_geo.py b/tests/sentry/event_manager/interfaces/test_geo.py
index 5a318f840543c2..df3d0ce870c1bb 100644
--- a/tests/sentry/event_manager/interfaces/test_geo.py
+++ b/tests/sentry/event_manager/interfaces/test_geo.py
@@ -9,7 +9,7 @@ def make_geo_snapshot(insta_snapshot):
     def inner(data):
         mgr = EventManager(data={"user": {"id": "123", "geo": data}})
         mgr.normalize()
-        evt = eventstore.backend.create_event(data=mgr.get_data())
+        evt = eventstore.backend.create_event(project_id=1, data=mgr.get_data())
 
         interface = evt.interfaces["user"].geo
         insta_snapshot(
diff --git a/tests/sentry/event_manager/interfaces/test_http.py b/tests/sentry/event_manager/interfaces/test_http.py
index ed874a08d22687..458d408e762e36 100644
--- a/tests/sentry/event_manager/interfaces/test_http.py
+++ b/tests/sentry/event_manager/interfaces/test_http.py
@@ -10,7 +10,7 @@ def make_http_snapshot(insta_snapshot):
     def inner(data):
         mgr = EventManager(data={"request": data})
         mgr.normalize()
-        evt = eventstore.backend.create_event(data=mgr.get_data())
+        evt = eventstore.backend.create_event(project_id=1, data=mgr.get_data())
 
         interface = evt.interfaces.get("request")
 
diff --git a/tests/sentry/event_manager/interfaces/test_mechanism.py b/tests/sentry/event_manager/interfaces/test_mechanism.py
index 20998e79c5bf32..5c505b0e9114af 100644
--- a/tests/sentry/event_manager/interfaces/test_mechanism.py
+++ b/tests/sentry/event_manager/interfaces/test_mechanism.py
@@ -12,7 +12,7 @@ def inner(data):
             data={"exception": {"values": [{"type": "FooError", "mechanism": data}]}}
         )
         mgr.normalize()
-        evt = eventstore.backend.create_event(data=mgr.get_data())
+        evt = eventstore.backend.create_event(project_id=1, data=mgr.get_data())
         mechanism = evt.interfaces["exception"].values[0].mechanism
 
         insta_snapshot(
diff --git a/tests/sentry/event_manager/interfaces/test_message.py b/tests/sentry/event_manager/interfaces/test_message.py
index 2d8f9430fb999b..5a95a31ff67186 100644
--- a/tests/sentry/event_manager/interfaces/test_message.py
+++ b/tests/sentry/event_manager/interfaces/test_message.py
@@ -9,7 +9,7 @@ def make_message_snapshot(insta_snapshot):
     def inner(data):
         mgr = EventManager(data={"logentry": data})
         mgr.normalize()
-        evt = eventstore.backend.create_event(data=mgr.get_data())
+        evt = eventstore.backend.create_event(project_id=1, data=mgr.get_data())
 
         interface = evt.interfaces.get("logentry")
         insta_snapshot(
diff --git a/tests/sentry/event_manager/interfaces/test_sdk.py b/tests/sentry/event_manager/interfaces/test_sdk.py
index 26ce0892bfe385..332aae0d7f4752 100644
--- a/tests/sentry/event_manager/interfaces/test_sdk.py
+++ b/tests/sentry/event_manager/interfaces/test_sdk.py
@@ -9,7 +9,7 @@ def make_sdk_snapshot(insta_snapshot):
     def inner(data):
         mgr = EventManager(data={"sdk": data})
         mgr.normalize()
-        evt = eventstore.backend.create_event(data=mgr.get_data())
+        evt = eventstore.backend.create_event(project_id=1, data=mgr.get_data())
         insta_snapshot(
             {"errors": evt.data.get("errors"), "to_json": evt.interfaces.get("sdk").to_json()}
         )
diff --git a/tests/sentry/event_manager/interfaces/test_single_exception.py b/tests/sentry/event_manager/interfaces/test_single_exception.py
index 3acd3101f416d1..304c57f33a1356 100644
--- a/tests/sentry/event_manager/interfaces/test_single_exception.py
+++ b/tests/sentry/event_manager/interfaces/test_single_exception.py
@@ -10,7 +10,7 @@ def make_single_exception_snapshot(insta_snapshot):
     def inner(data):
         mgr = EventManager(data={"exception": {"values": [data]}})
         mgr.normalize()
-        evt = eventstore.backend.create_event(data=mgr.get_data())
+        evt = eventstore.backend.create_event(project_id=1, data=mgr.get_data())
 
         excs = evt.interfaces["exception"].values
         if excs:
diff --git a/tests/sentry/event_manager/interfaces/test_spans.py b/tests/sentry/event_manager/interfaces/test_spans.py
index df341d661008d5..6d31539f64de6e 100644
--- a/tests/sentry/event_manager/interfaces/test_spans.py
+++ b/tests/sentry/event_manager/interfaces/test_spans.py
@@ -12,7 +12,7 @@ def make_spans_snapshot(insta_snapshot):
     def inner(data):
         mgr = EventManager(data={"spans": data})
         mgr.normalize()
-        evt = eventstore.backend.create_event(data=mgr.get_data())
+        evt = eventstore.backend.create_event(project_id=1, data=mgr.get_data())
 
         interface = evt.interfaces.get("spans")
 
diff --git a/tests/sentry/event_manager/interfaces/test_stacktrace.py b/tests/sentry/event_manager/interfaces/test_stacktrace.py
index b1b375fc822d55..e34bf5175ba69f 100644
--- a/tests/sentry/event_manager/interfaces/test_stacktrace.py
+++ b/tests/sentry/event_manager/interfaces/test_stacktrace.py
@@ -28,7 +28,7 @@ def make_stacktrace_snapshot(insta_snapshot):
     def inner(data):
         mgr = EventManager(data={"stacktrace": data})
         mgr.normalize()
-        evt = eventstore.backend.create_event(data=mgr.get_data())
+        evt = eventstore.backend.create_event(project_id=1, data=mgr.get_data())
 
         interface = evt.interfaces.get("stacktrace")
 
diff --git a/tests/sentry/event_manager/interfaces/test_template.py b/tests/sentry/event_manager/interfaces/test_template.py
index 7cfcc8eca5fb8b..c67fa90398797f 100644
--- a/tests/sentry/event_manager/interfaces/test_template.py
+++ b/tests/sentry/event_manager/interfaces/test_template.py
@@ -9,7 +9,7 @@ def make_template_snapshot(insta_snapshot):
     def inner(data):
         mgr = EventManager(data={"template": data})
         mgr.normalize()
-        evt = eventstore.backend.create_event(data=mgr.get_data())
+        evt = eventstore.backend.create_event(project_id=1, data=mgr.get_data())
 
         interface = evt.interfaces.get("template")
         insta_snapshot(
diff --git a/tests/sentry/event_manager/interfaces/test_threads.py b/tests/sentry/event_manager/interfaces/test_threads.py
index 8371f5ab87c52b..9f08014b34eaa9 100644
--- a/tests/sentry/event_manager/interfaces/test_threads.py
+++ b/tests/sentry/event_manager/interfaces/test_threads.py
@@ -9,7 +9,7 @@ def make_threads_snapshot(insta_snapshot):
     def inner(data):
         mgr = EventManager(data={"threads": data})
         mgr.normalize()
-        evt = eventstore.backend.create_event(data=mgr.get_data())
+        evt = eventstore.backend.create_event(project_id=1, data=mgr.get_data())
 
         interface = evt.interfaces.get("threads")
         insta_snapshot(
diff --git a/tests/sentry/event_manager/interfaces/test_user.py b/tests/sentry/event_manager/interfaces/test_user.py
index 6bfcd5d2d9a9dc..6d4a8c8397eb4c 100644
--- a/tests/sentry/event_manager/interfaces/test_user.py
+++ b/tests/sentry/event_manager/interfaces/test_user.py
@@ -9,7 +9,7 @@ def make_user_snapshot(insta_snapshot):
     def inner(data):
         mgr = EventManager(data={"user": data})
         mgr.normalize()
-        evt = eventstore.backend.create_event(data=mgr.get_data())
+        evt = eventstore.backend.create_event(project_id=1, data=mgr.get_data())
 
         interface = evt.interfaces.get("user")
 
diff --git a/tests/sentry/event_manager/test_event_manager.py b/tests/sentry/event_manager/test_event_manager.py
index b853640d746036..9a2c80a4a79884 100644
--- a/tests/sentry/event_manager/test_event_manager.py
+++ b/tests/sentry/event_manager/test_event_manager.py
@@ -10,7 +10,6 @@
 from unittest.mock import MagicMock, patch
 
 import pytest
-import responses
 from arroyo.backends.kafka.consumer import KafkaPayload
 from arroyo.backends.local.backend import LocalBroker
 from arroyo.backends.local.storages.memory import MemoryMessageStorage
@@ -19,14 +18,6 @@
 from django.core.cache import cache
 from django.utils import timezone
 
-from fixtures.github import (
-    COMPARE_COMMITS_EXAMPLE_WITH_INTERMEDIATE,
-    EARLIER_COMMIT_SHA,
-    GET_COMMIT_EXAMPLE,
-    GET_LAST_2_COMMITS_EXAMPLE,
-    GET_PRIOR_COMMIT_EXAMPLE,
-    LATER_COMMIT_SHA,
-)
 from sentry import eventstore, nodestore, tsdb
 from sentry.attachments import CachedAttachment, attachment_cache
 from sentry.constants import MAX_VERSION_LENGTH, DataCategory
@@ -46,12 +37,11 @@
 )
 from sentry.eventstore.models import Event
 from sentry.exceptions import HashDiscarded
-from sentry.grouping.api import load_grouping_config
+from sentry.grouping.api import GroupingConfig, 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 (
     ErrorGroupType,
     GroupCategory,
@@ -72,7 +62,6 @@
 from sentry.models.pullrequest import PullRequest, PullRequestCommit
 from sentry.models.release import Release
 from sentry.models.releasecommit import ReleaseCommit
-from sentry.models.releaseheadcommit import ReleaseHeadCommit
 from sentry.models.releaseprojectenvironment import ReleaseProjectEnvironment
 from sentry.options import set
 from sentry.projectoptions.defaults import DEFAULT_GROUPING_CONFIG
@@ -88,7 +77,6 @@
 from sentry.testutils.helpers.datetime import before_now, freeze_time
 from sentry.testutils.performance_issues.event_generators import get_event
 from sentry.testutils.pytest.fixtures import django_db_all
-from sentry.testutils.silo import assume_test_silo_mode_of
 from sentry.testutils.skips import requires_snuba
 from sentry.tsdb.base import TSDBModel
 from sentry.types.activity import ActivityType
@@ -1121,7 +1109,7 @@ def test_group_release_no_env(self) -> None:
         ).exists()
 
         # ensure we're not erroring on second creation
-        event = self.make_release_event("1.0", project_id)
+        self.make_release_event("1.0", project_id)
 
     def test_group_release_with_env(self) -> None:
         manager = EventManager(make_event(release="1.0", environment="prod", event_id="a" * 32))
@@ -1891,9 +1879,7 @@ def test_throws_when_matches_discarded_hash(self) -> None:
             with self.feature("organizations:event-attachments"):
                 with self.tasks():
                     with pytest.raises(HashDiscarded):
-                        event = manager.save(
-                            self.project.id, cache_key=cache_key, has_attachments=True
-                        )
+                        manager.save(self.project.id, cache_key=cache_key, has_attachments=True)
 
         assert mock_track_outcome.call_count == 3
 
@@ -2115,14 +2101,15 @@ def test_transaction_indexed_outcome_accepted(self) -> None:
             mock_track_outcome, outcome=Outcome.ACCEPTED, category=DataCategory.TRANSACTION_INDEXED
         )
 
-    def test_checksum_rehashed(self) -> None:
+    def test_invalid_checksum_gets_hashed(self) -> None:
         checksum = "invalid checksum hash"
         manager = EventManager(make_event(**{"checksum": checksum}))
         manager.normalize()
         event = manager.save(self.project.id)
 
         hashes = [gh.hash for gh in GroupHash.objects.filter(group=event.group)]
-        assert sorted(hashes) == sorted([hash_from_values(checksum), checksum])
+        assert len(hashes) == 1
+        assert hashes[0] == hash_from_values(checksum)
 
     def test_legacy_attributes_moved(self) -> None:
         event_params = make_event(
@@ -2274,7 +2261,10 @@ def test_category_match_group(self) -> None:
             """
         ).dumps()
 
-        grouping_config = {"id": DEFAULT_GROUPING_CONFIG, "enhancements": enhancements_str}
+        grouping_config: GroupingConfig = {
+            "id": DEFAULT_GROUPING_CONFIG,
+            "enhancements": enhancements_str,
+        }
 
         with patch(
             "sentry.grouping.ingest.hashing.get_grouping_config_dict_for_project",
@@ -2618,69 +2608,6 @@ def test_new_group_metrics_logging_without_frame_mix(self) -> None:
             assert "grouping.in_app_frame_mix" not in metrics_logged
 
 
-class AutoAssociateCommitTest(TestCase, EventManagerTestMixin):
-    def setUp(self) -> None:
-        super().setUp()
-        self.repo_name = "example"
-        self.project = self.create_project(name="foo")
-        with assume_test_silo_mode_of(Integration):
-            self.org_integration = self.integration.add_organization(
-                self.project.organization, self.user
-            )
-        self.repo = self.create_repo(
-            project=self.project,
-            name=self.repo_name,
-            provider="integrations:github",
-            integration_id=self.integration.id,
-        )
-        self.repo.update(config={"name": self.repo_name})
-        self.create_code_mapping(
-            project=self.project,
-            repo=self.repo,
-            organization_integration=self.org_integration,
-            stack_root="/stack/root",
-            source_root="/source/root",
-            default_branch="main",
-        )
-        responses.add(
-            "GET",
-            f"https://api.github.com/repos/{self.repo_name}/commits/{LATER_COMMIT_SHA}",
-            json=json.loads(GET_COMMIT_EXAMPLE),
-        )
-        responses.add(
-            "GET",
-            f"https://api.github.com/repos/{self.repo_name}/commits/{EARLIER_COMMIT_SHA}",
-            json=json.loads(GET_PRIOR_COMMIT_EXAMPLE),
-        )
-        self.dummy_commit_sha = "a" * 40
-        responses.add(
-            responses.GET,
-            f"https://api.github.com/repos/{self.repo_name}/compare/{self.dummy_commit_sha}...{LATER_COMMIT_SHA}",
-            json=json.loads(COMPARE_COMMITS_EXAMPLE_WITH_INTERMEDIATE),
-        )
-        responses.add(
-            responses.GET,
-            f"https://api.github.com/repos/{self.repo_name}/commits?sha={LATER_COMMIT_SHA}",
-            json=json.loads(GET_LAST_2_COMMITS_EXAMPLE),
-        )
-
-    def _create_first_release_commit(self) -> None:
-        # Create a release
-        release = self.create_release(project=self.project, version="abcabcabc")
-        # Create a commit
-        commit = self.create_commit(
-            repo=self.repo,
-            key=self.dummy_commit_sha,
-        )
-        # Make a release head commit
-        ReleaseHeadCommit.objects.create(
-            organization_id=self.project.organization.id,
-            repository_id=self.repo.id,
-            release=release,
-            commit=commit,
-        )
-
-
 class ReleaseIssueTest(TestCase):
     def setUp(self) -> None:
         self.project = self.create_project()
@@ -2689,18 +2616,6 @@ def setUp(self) -> None:
         self.environment2 = Environment.get_or_create(self.project, "staging")
         self.timestamp = float(int(time() - 300))
 
-    def make_event(self, **kwargs: Any) -> dict[str, Any]:
-        result = {
-            "event_id": "a" * 32,
-            "message": "foo",
-            "timestamp": self.timestamp + 0.23,
-            "level": logging.ERROR,
-            "logger": "default",
-            "tags": [],
-        }
-        result.update(kwargs)
-        return result
-
     def make_release_event(
         self,
         release_version: str = "1.0",
diff --git a/tests/sentry/eventstore/test_base.py b/tests/sentry/eventstore/test_base.py
index ce953b4a916523..375e5bdf810aa8 100644
--- a/tests/sentry/eventstore/test_base.py
+++ b/tests/sentry/eventstore/test_base.py
@@ -1,16 +1,9 @@
-import logging
-from unittest import mock
-
-import pytest
-
-from sentry import eventstore
 from sentry.eventstore.base import EventStorage
 from sentry.eventstore.models import Event
 from sentry.snuba.dataset import Dataset
-from sentry.testutils.cases import SnubaTestCase, TestCase
+from sentry.testutils.cases import TestCase
 from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.skips import requires_snuba
-from sentry.utils.samples import load_data
 
 pytestmark = [requires_snuba]
 
@@ -39,64 +32,9 @@ def test_bind_nodes(self):
 
         event = Event(project_id=self.project.id, event_id="a" * 32)
         event2 = Event(project_id=self.project.id, event_id="b" * 32)
-        assert event.data._node_data is None
+        before = event.data._node_data
         self.eventstorage.bind_nodes([event, event2])
-        assert event.data._node_data is not None
+        after = event.data._node_data
+        assert before is None
+        assert after is not None
         assert event.data["user"]["id"] == "user1"
-
-
-class ServiceDelegationTest(TestCase, SnubaTestCase):
-    def setUp(self):
-        super().setUp()
-        self.min_ago = before_now(minutes=1)
-        self.two_min_ago = before_now(minutes=2)
-        self.project = self.create_project()
-
-        self.event = self.store_event(
-            data={
-                "event_id": "a" * 32,
-                "type": "default",
-                "platform": "python",
-                "fingerprint": ["group1"],
-                "timestamp": self.two_min_ago,
-                "tags": {"foo": "1"},
-            },
-            project_id=self.project.id,
-        )
-
-        event_data = load_data("transaction")
-        event_data["timestamp"] = before_now(minutes=1)
-        event_data["start_timestamp"] = before_now(minutes=1, seconds=1)
-        event_data["event_id"] = "b" * 32
-
-        self.transaction_event = self.store_event(data=event_data, project_id=self.project.id)
-
-    @pytest.mark.skip(reason="There is no longer a difference in underlying dataset.")
-    def test_logs_differences(self):
-        logger = logging.getLogger("sentry.eventstore")
-
-        with mock.patch.object(logger, "info") as mock_logger:
-            # No differences to log
-            _filter = eventstore.Filter(project_ids=[self.project.id])
-            eventstore.backend.get_events(filter=_filter)
-            eventstore.backend.get_event_by_id(self.project.id, "a" * 32)
-            assert mock_logger.call_count == 0
-
-            # Here we expect a difference since the original implementation handles type as a tag
-            event = eventstore.backend.get_event_by_id(self.project.id, "a" * 32)
-            _filter = eventstore.Filter(
-                project_ids=[self.project.id], conditions=[["type", "=", "transaction"]]
-            )
-            eventstore.get_next_event_id(event, _filter)
-            assert mock_logger.call_count == 1
-            mock_logger.assert_called_with(
-                "discover.result-mismatch",
-                extra={
-                    "snuba_result": None,
-                    "snuba_discover_result": (str(self.project.id), "b" * 32),
-                    "method": "get_next_event_id",
-                    "event_id": event.event_id,
-                    "filter_keys": _filter.filter_keys,
-                    "conditions": _filter.conditions,
-                },
-            )
diff --git a/tests/sentry/eventstream/test_eventstream.py b/tests/sentry/eventstream/test_eventstream.py
index a6b60b498f9769..1f3f522532104e 100644
--- a/tests/sentry/eventstream/test_eventstream.py
+++ b/tests/sentry/eventstream/test_eventstream.py
@@ -1,11 +1,9 @@
-import itertools
 import logging
 import time
 from datetime import timedelta
 from unittest.mock import Mock, patch
 
 import pytest
-from django.test import override_settings
 from django.utils import timezone
 from snuba_sdk import Column, Condition, Entity, Op, Query, Request
 
@@ -338,61 +336,6 @@ def test_transaction_queue(self, mock_eventstream_insert):
         assert "occurrence_id" not in dict(headers)
         assert body["queue"] == "post_process_transactions"
 
-    @override_settings()
-    @patch("sentry.eventstream.backend.insert", autospec=True)
-    def test_queue_legacy_split_router(self, mock_eventstream_insert):
-        event = self.__build_transaction_event()
-        event.group_id = None
-        event.groups = [self.group]
-        insert_args = ()
-        group_state = {
-            "is_new_group_environment": True,
-            "is_new": True,
-            "is_regression": False,
-        }
-        insert_kwargs = {
-            "event": event,
-            **group_state,
-            "primary_hash": "acbd18db4cc2f85cedef654fccc4a4d8",
-            "skip_consume": False,
-            "received_timestamp": event.data["received"],
-            "group_states": [{"id": event.groups[0].id, **group_state}],
-        }
-
-        queues_gen = itertools.cycle(
-            [
-                "post_process_transactions_1",
-                "post_process_transactions_2",
-                "post_process_transactions_3",
-            ]
-        )
-
-        with override_settings(
-            SENTRY_POST_PROCESS_QUEUE_SPLIT_ROUTER={
-                "post_process_transactions": lambda: next(queues_gen)
-            }
-        ):
-            _, body = self.__produce_payload(*insert_args, **insert_kwargs)
-            assert body["queue"] == "post_process_transactions_1"
-            _, body = self.__produce_payload(*insert_args, **insert_kwargs)
-            assert body["queue"] == "post_process_transactions_2"
-            _, body = self.__produce_payload(*insert_args, **insert_kwargs)
-            assert body["queue"] == "post_process_transactions_3"
-            _, body = self.__produce_payload(*insert_args, **insert_kwargs)
-            assert body["queue"] == "post_process_transactions_1"
-
-        # test default assignment
-        insert_kwargs = {
-            "event": self.__build_event(timezone.now()),
-            **group_state,
-            "primary_hash": "acbd18db4cc2f85cedef654fccc4a4d8",
-            "skip_consume": False,
-            "received_timestamp": event.data["received"],
-            "group_states": [{"id": event.groups[0].id, **group_state}],
-        }
-        headers, body = self.__produce_payload(*insert_args, **insert_kwargs)
-        assert body["queue"] == "post_process_errors"
-
     @patch("sentry.eventstream.backend.insert", autospec=True)
     def test_issue_platform_queue(self, mock_eventstream_insert):
         event = self.__build_transaction_event()
diff --git a/tests/sentry/features/test_manager.py b/tests/sentry/features/test_manager.py
index 028d145497d8fa..605d0ef75efbff 100644
--- a/tests/sentry/features/test_manager.py
+++ b/tests/sentry/features/test_manager.py
@@ -33,9 +33,6 @@ def has(
         return True
 
     def batch_has(self, feature_names, *args: Any, projects=None, organization=None, **kwargs: Any):
-        if isinstance(feature_names, str):
-            feature_names = [feature_names]
-
         feature_results = {
             feature_name: True for feature_name in feature_names if feature_name in self.features
         }
@@ -49,7 +46,7 @@ def batch_has(self, feature_names, *args: Any, projects=None, organization=None,
         return {"unscoped": feature_results}
 
     def _check_for_batch(self, feature_name, organization, actor):
-        return True if feature_name in self.features else None
+        raise NotImplementedError
 
 
 class MockUserBatchHandler(features.BatchFeatureHandler):
diff --git a/tests/sentry/flags/endpoints/test_hooks.py b/tests/sentry/flags/endpoints/test_hooks.py
index 782ac9a19b81c8..aa1835616e99e6 100644
--- a/tests/sentry/flags/endpoints/test_hooks.py
+++ b/tests/sentry/flags/endpoints/test_hooks.py
@@ -22,6 +22,61 @@ def setUp(self):
     def features(self):
         return {"organizations:feature-flag-audit-log": True}
 
+    def test_generic_post_create(self):
+        request_data = {
+            "data": [
+                {
+                    "action": "created",
+                    "change_id": 9734362632,
+                    "created_at": "2024-12-12T00:00:00+00:00",
+                    "created_by": {"id": "username", "type": "name"},
+                    "flag": "hello",
+                }
+            ],
+            "meta": {"version": 1},
+        }
+        signature = hmac_sha256_hex_digest(key="456", message=json.dumps(request_data).encode())
+        FlagWebHookSigningSecretModel.objects.create(
+            organization=self.organization, provider="generic", secret="456"
+        )
+
+        with self.feature(self.features):
+            response = self.client.post(
+                reverse(self.endpoint, args=(self.organization.slug, "generic")),
+                request_data,
+                headers={"X-Sentry-Signature": signature},
+            )
+            assert response.status_code == 200, response.content
+            assert FlagAuditLogModel.objects.count() == 1
+
+    def test_unleash_post_create(self):
+        request_data = {
+            "id": 28,
+            "tags": [{"type": "simple", "value": "testvalue"}],
+            "type": "feature-environment-enabled",
+            "project": "default",
+            "createdAt": "2024-12-30T00:00:00.000Z",
+            "createdBy": "admin",
+            "environment": "development",
+            "createdByUserId": 1,
+            "featureName": "test-flag",
+        }
+        signature = "testing12345abcdaslkflsldkfkdlks"
+        FlagWebHookSigningSecretModel.objects.create(
+            organization=self.organization,
+            provider="unleash",
+            secret="testing12345abcdaslkflsldkfkdlks",
+        )
+
+        with self.feature(self.features):
+            response = self.client.post(
+                reverse(self.endpoint, args=(self.organization.slug, "unleash")),
+                request_data,
+                headers={"Authorization": signature},
+            )
+            assert response.status_code == 200, response.content
+            assert FlagAuditLogModel.objects.count() == 1
+
     def test_launchdarkly_post_create(self):
         request_data = LD_REQUEST
         signature = hmac_sha256_hex_digest(key="456", message=json.dumps(request_data).encode())
@@ -79,6 +134,11 @@ def test_post_disabled(self):
         assert response.status_code == 404
         assert response.content == b'"Not enabled."'
 
+    def test_post_missing_signature(self):
+        with self.feature(self.features):
+            response = self.client.post(self.url, {})
+            assert response.status_code == 401, response.content
+
 
 LD_REQUEST = {
     "_links": {
diff --git a/tests/sentry/flags/endpoints/test_secrets.py b/tests/sentry/flags/endpoints/test_secrets.py
index 3acf2f3c238ff6..86b561ad742bfa 100644
--- a/tests/sentry/flags/endpoints/test_secrets.py
+++ b/tests/sentry/flags/endpoints/test_secrets.py
@@ -53,7 +53,7 @@ def test_browse_disabled(self):
         response = self.client.get(self.url)
         assert response.status_code == 404
 
-    def test_post(self):
+    def test_post_launchdarkly(self):
         with self.feature(self.features):
             response = self.client.post(
                 self.url,
@@ -61,7 +61,31 @@ def test_post(self):
             )
             assert response.status_code == 201, response.content
 
-        models = FlagWebHookSigningSecretModel.objects.all()
+        models = FlagWebHookSigningSecretModel.objects.filter(provider="launchdarkly").all()
+        assert len(models) == 1
+        assert models[0].secret == "41271af8b9804cd99a4c787a28274991"
+
+    def test_post_generic(self):
+        with self.feature(self.features):
+            response = self.client.post(
+                self.url,
+                data={"secret": "41271af8b9804cd99a4c787a28274991", "provider": "generic"},
+            )
+            assert response.status_code == 201, response.content
+
+        models = FlagWebHookSigningSecretModel.objects.filter(provider="generic").all()
+        assert len(models) == 1
+        assert models[0].secret == "41271af8b9804cd99a4c787a28274991"
+
+    def test_post_unleash(self):
+        with self.feature(self.features):
+            response = self.client.post(
+                self.url,
+                data={"secret": "41271af8b9804cd99a4c787a28274991", "provider": "unleash"},
+            )
+            assert response.status_code == 201, response.content
+
+        models = FlagWebHookSigningSecretModel.objects.filter(provider="unleash").all()
         assert len(models) == 1
         assert models[0].secret == "41271af8b9804cd99a4c787a28274991"
 
diff --git a/tests/sentry/flags/providers/test_generic.py b/tests/sentry/flags/providers/test_generic.py
new file mode 100644
index 00000000000000..8e691c25c9c313
--- /dev/null
+++ b/tests/sentry/flags/providers/test_generic.py
@@ -0,0 +1,99 @@
+from datetime import datetime, timezone
+
+from sentry.flags.providers import DeserializationError, GenericProvider
+
+
+def test_handle():
+    items = GenericProvider(123, None).handle(
+        {
+            "data": [
+                {
+                    "action": "created",
+                    "change_id": 93899375123,
+                    "created_at": "2024-12-12T00:00:00+00:00",
+                    "created_by": {"id": "user", "type": "name"},
+                    "flag": "test",
+                },
+                {
+                    "action": "created",
+                    "change_id": 3284729112,
+                    "created_at": "2024-12-12T00:00:00+00:00",
+                    "created_by": {"id": "user", "type": "name"},
+                    "flag": "other",
+                },
+            ],
+            "meta": {
+                "version": 1,
+            },
+        }
+    )
+    assert len(items) == 2
+    assert items[0]["action"] == 0
+    assert items[0]["created_at"] == datetime(2024, 12, 12, 0, 0, tzinfo=timezone.utc)
+    assert items[0]["created_by"] == "user"
+    assert items[0]["created_by_type"] == 2
+    assert items[0]["flag"] == "test"
+    assert items[0]["organization_id"] == 123
+    assert items[0]["tags"] == {}
+
+
+def test_handle_dedupe():
+    items = GenericProvider(123, None).handle(
+        {
+            "data": [
+                {
+                    "action": "created",
+                    "change_id": 93899375123,
+                    "created_at": "2024-12-12T00:00:00+00:00",
+                    "created_by": {"id": "user", "type": "name"},
+                    "flag": "test",
+                },
+                {
+                    "action": "created",
+                    "change_id": 93899375123,
+                    "created_at": "2024-12-12T00:00:00+00:00",
+                    "created_by": {"id": "user", "type": "name"},
+                    "flag": "test",
+                },
+            ],
+            "meta": {
+                "version": 1,
+            },
+        }
+    )
+    assert len(items) == 1
+    assert items[0]["action"] == 0
+    assert items[0]["created_at"] == datetime(2024, 12, 12, 0, 0, tzinfo=timezone.utc)
+    assert items[0]["created_by"] == "user"
+    assert items[0]["created_by_type"] == 2
+    assert items[0]["flag"] == "test"
+    assert items[0]["organization_id"] == 123
+    assert items[0]["tags"] == {}
+
+
+def test_blank():
+    try:
+        GenericProvider(123, None).handle({})
+    except DeserializationError as exc:
+        assert len(exc.errors) == 2
+        assert exc.errors["data"][0].code == "required"
+        assert exc.errors["meta"][0].code == "required"
+
+
+def test_partial_fill():
+    try:
+        GenericProvider(123, None).handle({"data": [], "meta": {}})
+    except DeserializationError as exc:
+        assert exc.errors["meta"]["version"][0].code == "required"
+
+
+def test_empty_data_item():
+    try:
+        GenericProvider(123, None).handle({"data": [{}], "meta": {"version": 1}})
+    except DeserializationError as exc:
+        assert len(exc.errors["data"][0]) == 5
+        assert exc.errors["data"][0]["action"][0].code == "required"
+        assert exc.errors["data"][0]["change_id"][0].code == "required"
+        assert exc.errors["data"][0]["created_at"][0].code == "required"
+        assert exc.errors["data"][0]["created_by"][0].code == "required"
+        assert exc.errors["data"][0]["flag"][0].code == "required"
diff --git a/tests/sentry/flags/providers/test_launchdarkly.py b/tests/sentry/flags/providers/test_launchdarkly.py
index 13dd00e70bae11..a83f4916c7a9e6 100644
--- a/tests/sentry/flags/providers/test_launchdarkly.py
+++ b/tests/sentry/flags/providers/test_launchdarkly.py
@@ -6,7 +6,7 @@
 from sentry.flags.providers import (
     DeserializationError,
     LaunchDarklyItemSerializer,
-    handle_provider_event,
+    LaunchDarklyProvider,
 )
 
 default_timezone = timezone.get_default_timezone()
@@ -147,7 +147,7 @@ def test_launchdarkly_create():
             },
         },
     }
-    res = handle_provider_event("launchdarkly", request_data, 123)
+    res = LaunchDarklyProvider(123, None).handle(request_data)
     assert len(res) == 1
     flag_row = res[0]
     assert flag_row["action"] == ACTION_MAP["created"]
@@ -345,7 +345,7 @@ def test_launchdarkly_update():
         },
     }
 
-    res = handle_provider_event("launchdarkly", request_data, 123)
+    res = LaunchDarklyProvider(123, None).handle(request_data)
     assert len(res) == 1
     flag_row = res[0]
     assert flag_row["action"] == ACTION_MAP["updated"]
@@ -379,7 +379,7 @@ def test_launchdarkly_delete_and_update():
         "title": "Michelle deleted the flag [test flag](https://app.launchdarkly.com/default/test/features/test-flag) in `Test`",
     }
 
-    res = handle_provider_event("launchdarkly", request_data, 123)
+    res = LaunchDarklyProvider(123, None).handle(request_data)
     assert len(res) == 1
     flag_row_delete = res[0]
     assert flag_row_delete["action"] == ACTION_MAP["deleted"]
@@ -419,7 +419,7 @@ def test_launchdarkly_no_valid_action():
         "title": "Michelle deleted the flag [test flag](https://app.launchdarkly.com/default/test/features/test-flag) in `Test`",
     }
 
-    res = handle_provider_event("launchdarkly", request_data, 123)
+    res = LaunchDarklyProvider(123, None).handle(request_data)
     assert len(res) == 0
 
 
@@ -454,5 +454,4 @@ def test_bad_launchdarkly_data():
     with pytest.raises(
         DeserializationError,
     ):
-
-        handle_provider_event("launchdarkly", request_data, 123)
+        LaunchDarklyProvider(123, None).handle(request_data)
diff --git a/tests/sentry/flags/providers/test_unleash.py b/tests/sentry/flags/providers/test_unleash.py
new file mode 100644
index 00000000000000..418b86055f89fd
--- /dev/null
+++ b/tests/sentry/flags/providers/test_unleash.py
@@ -0,0 +1,145 @@
+from datetime import datetime, timezone
+
+from sentry.flags.providers import DeserializationError, UnleashProvider
+
+
+def test_handle_update_no_email():
+    items = UnleashProvider(123, "abcdefgh").handle(
+        {
+            "id": 28,
+            "tags": [{"type": "simple", "value": "testvalue"}],
+            "type": "feature-environment-enabled",
+            "project": "default",
+            "createdAt": "2024-12-30T00:00:00.000Z",
+            "createdBy": "admin",
+            "environment": "development",
+            "featureName": "test-flag",
+            "createdByUserId": 1,
+        }
+    )
+    assert len(items) == 1
+    assert items[0]["action"] == 2
+    assert items[0]["created_at"] == datetime(2024, 12, 30, 0, 0, tzinfo=timezone.utc)
+    assert items[0]["created_by"] == 1
+    assert items[0]["created_by_type"] == 1
+    assert items[0]["flag"] == "test-flag"
+    assert items[0]["organization_id"] == 123
+    assert items[0]["tags"] == {
+        "environment": "development",
+        "project": "default",
+        "simple": "testvalue",
+    }
+
+
+def test_handle_update_with_email():
+    items = UnleashProvider(123, "abcdefgh").handle(
+        {
+            "id": 28,
+            "tags": [{"type": "simple", "value": "testvalue"}],
+            "type": "feature-environment-enabled",
+            "project": "default",
+            "createdAt": "2024-12-30T00:00:00.000Z",
+            "createdBy": "michelle@michelle.org",
+            "environment": "development",
+            "featureName": "test-flag",
+            "createdByUserId": 1,
+        }
+    )
+    assert len(items) == 1
+    assert items[0]["action"] == 2
+    assert items[0]["created_at"] == datetime(2024, 12, 30, 0, 0, tzinfo=timezone.utc)
+    assert items[0]["created_by"] == "michelle@michelle.org"
+    assert items[0]["created_by_type"] == 0
+    assert items[0]["flag"] == "test-flag"
+    assert items[0]["organization_id"] == 123
+    assert items[0]["tags"] == {
+        "environment": "development",
+        "project": "default",
+        "simple": "testvalue",
+    }
+
+
+def test_handle_create():
+    items = UnleashProvider(123, "abcdefgh").handle(
+        {
+            "id": 28,
+            "tags": [{"type": "simple", "value": "testvalue"}],
+            "type": "feature-created",
+            "project": "default",
+            "createdAt": "2024-12-30T00:00:00.000Z",
+            "createdBy": "michelle@michelle.org",
+            "environment": "development",
+            "featureName": "test-flag",
+            "createdByUserId": 1,
+        }
+    )
+    assert len(items) == 1
+    assert items[0]["action"] == 0
+
+
+def test_handle_junk_action():
+    items = UnleashProvider(123, "abcdefgh").handle(
+        {
+            "id": 28,
+            "tags": [{"type": "simple", "value": "testvalue"}],
+            "type": "feature-junk",
+            "project": "default",
+            "createdAt": "2024-12-30T00:00:00.000Z",
+            "createdBy": "michelle@michelle.org",
+            "environment": "development",
+            "featureName": "test-flag",
+            "createdByUserId": 1,
+        }
+    )
+    assert len(items) == 0
+
+
+def test_handle_no_tags():
+    items = UnleashProvider(123, "abcdefgh").handle(
+        {
+            "id": 28,
+            "tags": [],
+            "type": "feature-environment-enabled",
+            "createdAt": "2024-12-30T00:00:00.000Z",
+            "createdBy": "michelle@michelle.org",
+            "featureName": "test-flag",
+            "createdByUserId": 1,
+        }
+    )
+    assert len(items) == 1
+    assert items[0]["action"] == 2
+    assert items[0]["created_at"] == datetime(2024, 12, 30, 0, 0, tzinfo=timezone.utc)
+    assert items[0]["created_by"] == "michelle@michelle.org"
+    assert items[0]["created_by_type"] == 0
+    assert items[0]["flag"] == "test-flag"
+    assert items[0]["organization_id"] == 123
+    assert items[0]["tags"] == {}
+
+
+def test_blank():
+    try:
+        UnleashProvider(123, "abcdefgh").handle({})
+    except DeserializationError as exc:
+        assert len(exc.errors) == 4
+        assert exc.errors["featureName"][0].code == "required"
+        assert exc.errors["type"][0].code == "required"
+        assert exc.errors["createdAt"][0].code == "required"
+        assert exc.errors["createdBy"][0].code == "required"
+
+
+def test_partial_fill():
+    try:
+        UnleashProvider(123, "abcdefgh").handle(
+            {
+                "id": 28,
+                "tags": [{"type": "simple", "value": "testvalue"}],
+                "type": "feature-environment-enabled",
+                "project": "default",
+                "createdAt": "2024-12-30T00:00:00.000Z",
+                "createdBy": "admin",
+                "environment": "development",
+                "createdByUserId": 1,
+            }
+        )
+    except DeserializationError as exc:
+        assert exc.errors["featureName"][0].code == "required"
diff --git a/tests/sentry/grouping/__init__.py b/tests/sentry/grouping/__init__.py
index ce80912cae9f45..987e586f44e772 100644
--- a/tests/sentry/grouping/__init__.py
+++ b/tests/sentry/grouping/__init__.py
@@ -59,7 +59,7 @@ def _manually_save_event(
         event_metadata = event_type.get_metadata(data)
         data.update(materialize_metadata(data, event_type, event_metadata))
 
-        return eventstore.backend.create_event(data=data)
+        return eventstore.backend.create_event(project_id=1, data=data)
 
     def _save_event_with_pipeline(
         self,
@@ -147,7 +147,7 @@ def create_event(self):
         event_metadata = event_type.get_metadata(data)
         data.update(materialize_metadata(data, event_type, event_metadata))
 
-        evt = eventstore.backend.create_event(data=data)
+        evt = eventstore.backend.create_event(project_id=1, data=data)
         return config, evt
 
 
@@ -174,13 +174,10 @@ def to_json(value: Any, pretty_print: bool = False) -> str:
 
 def dump_variant(
     variant: BaseVariant,
-    lines: list[str] | None = None,
+    lines: list[str],
     indent: int = 0,
     include_non_contributing: bool = True,
 ) -> list[str]:
-    if lines is None:
-        lines = []
-
     def _dump_component(component: BaseGroupingComponent, indent: int) -> None:
         if not component.hint and not component.values:
             return
@@ -201,14 +198,27 @@ def _dump_component(component: BaseGroupingComponent, indent: int) -> None:
                     lines.append("{}{}".format("  " * (indent + 1), to_json(value)))
 
     lines.append("{}hash: {}".format("  " * indent, to_json(variant.get_hash())))
+    if hasattr(variant, "contributing_component"):
+        contributing_component_id = (
+            variant.contributing_component.id
+            if variant.contributing_component is not None
+            else to_json(None)
+        )
+        lines.append(
+            "{}contributing component: {}".format("  " * indent, contributing_component_id)
+        )
 
+    # Note that this prints `__dict__`, not `as_dict()`, so if something seems missing, that's
+    # probably why
     for key, value in sorted(variant.__dict__.items()):
+        if key in ["config", "hash", "contributing_component", "variant_name"]:
+            # We do not want to dump the config, and we've already dumped the hash and the
+            # contributing component
+            continue
+
         if isinstance(value, BaseGroupingComponent):
             lines.append("{}{}:".format("  " * indent, key))
             _dump_component(value, indent + 1)
-        elif key in ["config", "hash"]:
-            # We do not want to dump the config, and we've already dumped the hash
-            continue
         else:
             lines.append("{}{}: {}".format("  " * indent, key, to_json(value)))
 
diff --git a/tests/sentry/grouping/grouping_inputs/checksum-no-regex-match-long.json b/tests/sentry/grouping/grouping_inputs/checksum-no-regex-match-long.json
deleted file mode 100644
index 934ae780bb0e73..00000000000000
--- a/tests/sentry/grouping/grouping_inputs/checksum-no-regex-match-long.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "checksum": "not a legit checksum and also too long a string",
-  "message": "Dogs are great!"
-}
diff --git a/tests/sentry/grouping/ingest/test_seer.py b/tests/sentry/grouping/ingest/test_seer.py
index f46f5713b6e962..e140991c3d5b19 100644
--- a/tests/sentry/grouping/ingest/test_seer.py
+++ b/tests/sentry/grouping/ingest/test_seer.py
@@ -1,22 +1,24 @@
 from dataclasses import asdict
 from time import time
+from typing import Any
 from unittest.mock import ANY, MagicMock, Mock, call, patch
+from uuid import uuid1
 
 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 (
+    _event_content_is_seer_eligible,
     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.seer.similarity.utils import MAX_FRAME_COUNT, SEER_INELIGIBLE_EVENT_PLATFORMS
 from sentry.testutils.cases import TestCase
 from sentry.testutils.helpers.eventprocessing import save_new_event
 from sentry.testutils.helpers.options import override_options
-from sentry.utils.types import NonNone
 
 
 class ShouldCallSeerTest(TestCase):
@@ -65,7 +67,7 @@ def test_obeys_content_filter(self) -> None:
 
         for content_eligibility, expected_result in [(True, True), (False, False)]:
             with patch(
-                "sentry.grouping.ingest.seer.event_content_is_seer_eligible",
+                "sentry.grouping.ingest.seer._event_content_is_seer_eligible",
                 return_value=content_eligibility,
             ):
                 assert should_call_seer_for_grouping(self.event, self.variants) is expected_result
@@ -176,8 +178,18 @@ 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:
+    def test_obeys_excessive_frame_check(self) -> None:
+        self.project.update_option("sentry:similarity_backfill_completed", int(time()))
+
+        for frame_check_result, expected_result in [(True, False), (False, True)]:
+            with patch(
+                "sentry.grouping.ingest.seer._has_too_many_contributing_frames",
+                return_value=frame_check_result,
+            ):
+                assert should_call_seer_for_grouping(self.event, self.variants) is expected_result
+
+    @patch("sentry.grouping.ingest.seer.record_did_call_seer_metric")
+    def test_obeys_empty_stacktrace_string_check(self, mock_record_did_call_seer: Mock) -> None:
         self.project.update_option("sentry:similarity_backfill_completed", int(time()))
         new_event = Event(
             project_id=self.project.id,
@@ -190,14 +202,8 @@ def test_obeys_empty_stacktrace_string_check(self, mock_metrics: Mock) -> None:
         )
 
         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",
-            },
+        mock_record_did_call_seer.assert_any_call(
+            call_made=False, blocker="empty-stacktrace-string"
         )
 
     @patch("sentry.grouping.ingest.seer.get_similarity_data_from_seer", return_value=[])
@@ -220,8 +226,9 @@ def setUp(self) -> None:
         assert self.existing_event.get_primary_hash() == "04e89719410791836f0a0bbf03bf0d2e"
         # In real life just filtering on group id wouldn't be enough to guarantee us a single,
         # specific GroupHash record, but since the database resets before each test, here it's okay
+        assert self.existing_event.group_id is not None
         self.existing_event_grouphash = GroupHash.objects.filter(
-            group_id=NonNone(self.existing_event.group_id)
+            group_id=self.existing_event.group_id
         ).first()
         self.new_event = Event(
             project_id=self.project.id,
@@ -233,19 +240,19 @@ def setUp(self) -> None:
 
     @patch("sentry.grouping.ingest.seer.get_similarity_data_from_seer", return_value=[])
     def test_sends_expected_data_to_seer(self, mock_get_similarity_data: MagicMock) -> None:
-        type = "FailedToFetchError"
-        value = "Charlie didn't bring the ball back"
-        context_line = f"raise {type}('{value}')"
+        error_type = "FailedToFetchError"
+        error_value = "Charlie didn't bring the ball back"
+        context_line = f"raise {error_type}('{error_value}')"
         new_event = Event(
             project_id=self.project.id,
             event_id="12312012112120120908201304152013",
             data={
-                "title": f"{type}('{value}')",
+                "title": f"{error_type}('{error_value}')",
                 "exception": {
                     "values": [
                         {
-                            "type": type,
-                            "value": value,
+                            "type": error_type,
+                            "value": error_value,
                             "stacktrace": {
                                 "frames": [
                                     {
@@ -268,7 +275,7 @@ def test_sends_expected_data_to_seer(self, mock_get_similarity_data: MagicMock)
                 "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}',
+                "stacktrace": f'{error_type}: {error_value}\n  File "dogpark.py", function play_fetch\n    {context_line}',
                 "exception_type": "FailedToFetchError",
                 "k": 1,
                 "referrer": "ingest",
@@ -277,9 +284,10 @@ def test_sends_expected_data_to_seer(self, mock_get_similarity_data: MagicMock)
         )
 
     def test_returns_metadata_and_grouphash_if_sufficiently_close_group_found(self) -> None:
+        assert self.existing_event.group_id
         seer_result_data = SeerSimilarIssueData(
-            parent_hash=NonNone(self.existing_event.get_primary_hash()),
-            parent_group_id=NonNone(self.existing_event.group_id),
+            parent_hash=self.existing_event.get_primary_hash(),
+            parent_group_id=self.existing_event.group_id,
             stacktrace_distance=0.01,
             should_group=True,
         )
@@ -340,21 +348,24 @@ def test_returns_no_grouphash_and_empty_metadata_if_empty_stacktrace(
                 },
             )
 
+    @patch("sentry.seer.similarity.utils.record_did_call_seer_metric")
     @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}')"
+    def test_too_many_frames(
+        self, mock_metrics: Mock, mock_record_did_call_seer: MagicMock
+    ) -> None:
+        error_type = "FailedToFetchError"
+        error_value = "Charlie didn't bring the ball back"
+        context_line = f"raise {error_type}('{error_value}')"
         new_event = Event(
             project_id=self.project.id,
             event_id="22312012112120120908201304152013",
             data={
-                "title": f"{type}('{value}')",
+                "title": f"{error_type}('{error_value}')",
                 "exception": {
                     "values": [
                         {
-                            "type": type,
-                            "value": value,
+                            "type": error_type,
+                            "value": error_value,
                             "stacktrace": {
                                 "frames": [
                                     {
@@ -386,30 +397,23 @@ def test_too_many_only_system_frames(self, mock_metrics: Mock) -> None:
             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_record_did_call_seer.assert_any_call(call_made=False, blocker="over-threshold-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}')"
+    @patch("sentry.seer.similarity.utils.record_did_call_seer_metric")
+    def test_too_many_frames_allowed_platform(self, mock_record_did_call_seer: MagicMock) -> None:
+        error_type = "FailedToFetchError"
+        error_value = "Charlie didn't bring the ball back"
+        context_line = f"raise {error_type}('{error_value}')"
         new_event = Event(
             project_id=self.project.id,
             event_id="22312012112120120908201304152013",
             data={
-                "title": f"{type}('{value}')",
+                "title": f"{error_type}('{error_value}')",
                 "exception": {
                     "values": [
                         {
-                            "type": type,
-                            "value": value,
+                            "type": error_type,
+                            "value": error_value,
                             "stacktrace": {
                                 "frames": [
                                     {
@@ -436,15 +440,8 @@ def test_too_many_only_system_frames_invalid_platform(self, mock_metrics: Mock)
         )
 
         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
+            call(call_made=False, blocker="over-threshold-frames")
+            not in mock_record_did_call_seer.call_args_list
         )
 
 
@@ -456,19 +453,19 @@ def test_valid_maybe_check_seer_for_matching_group_hash(
     ) -> 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}')"
+        error_type = "FailedToFetchError"
+        error_value = "Charlie didn't bring the ball back"
+        context_line = f"raise {error_type}('{error_value}')"
         new_event = Event(
             project_id=self.project.id,
             event_id="12312012112120120908201304152013",
             data={
-                "title": f"{type}('{value}')",
+                "title": f"{error_type}('{error_value}')",
                 "exception": {
                     "values": [
                         {
-                            "type": type,
-                            "value": value,
+                            "type": error_type,
+                            "value": error_value,
                             "stacktrace": {
                                 "frames": [
                                     {
@@ -497,7 +494,7 @@ def test_valid_maybe_check_seer_for_matching_group_hash(
                 "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}',
+                "stacktrace": f'{error_type}: {error_value}\n  File "dogpark.py", function play_fetch\n    {context_line}',
                 "exception_type": "FailedToFetchError",
                 "k": 1,
                 "referrer": "ingest",
@@ -505,26 +502,30 @@ def test_valid_maybe_check_seer_for_matching_group_hash(
             }
         )
 
+    @patch("sentry.grouping.ingest.seer.record_did_call_seer_metric")
     @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
+    def test_too_many_frames_maybe_check_seer_for_matching_group_hash(
+        self,
+        mock_metrics: MagicMock,
+        mock_get_similar_issues: MagicMock,
+        mock_record_did_call_seer: 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}')"
+        error_type = "FailedToFetchError"
+        error_value = "Charlie didn't bring the ball back"
+        context_line = f"raise {error_type}('{error_value}')"
         new_event = Event(
             project_id=self.project.id,
             event_id="22312012112120120908201304152013",
             data={
-                "title": f"{type}('{value}')",
+                "title": f"{error_type}('{error_value}')",
                 "exception": {
                     "values": [
                         {
-                            "type": type,
-                            "value": value,
+                            "type": error_type,
+                            "value": error_value,
                             "stacktrace": {
                                 "frames": [
                                     {
@@ -552,40 +553,38 @@ def test_too_many_only_system_frames_maybe_check_seer_for_matching_group_hash(
 
         sample_rate = options.get("seer.similarity.metrics_sample_rate")
         mock_metrics.incr.assert_any_call(
-            "grouping.similarity.over_threshold_only_system_frames",
+            "grouping.similarity.frame_count_filter",
             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",
+                "platform": "java",
+                "referrer": "ingest",
+                "stacktrace_type": "system",
+                "outcome": "block",
             },
         )
+        mock_record_did_call_seer.assert_any_call(call_made=False, blocker="excess-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(
+    def test_too_many_frames_maybe_check_seer_for_matching_group_hash_bypassed_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}')"
+        error_type = "FailedToFetchError"
+        error_value = "Charlie didn't bring the ball back"
+        context_line = f"raise {error_type}('{error_value}')"
         new_event = Event(
             project_id=self.project.id,
             event_id="22312012112120120908201304152013",
             data={
-                "title": f"{type}('{value}')",
+                "title": f"{error_type}('{error_value}')",
                 "exception": {
                     "values": [
                         {
-                            "type": type,
-                            "value": value,
+                            "type": error_type,
+                            "value": error_value,
                             "stacktrace": {
                                 "frames": [
                                     {
@@ -623,3 +622,68 @@ def test_too_many_only_system_frames_maybe_check_seer_for_matching_group_hash_in
                 "use_reranking": True,
             }
         )
+
+
+class EventContentIsSeerEligibleTest(TestCase):
+    def get_eligible_event_data(self) -> dict[str, Any]:
+        return {
+            "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_no_stacktrace(self) -> None:
+        good_event_data = self.get_eligible_event_data()
+        good_event = Event(
+            project_id=self.project.id,
+            event_id=uuid1().hex,
+            data=good_event_data,
+        )
+
+        bad_event_data = self.get_eligible_event_data()
+        del bad_event_data["exception"]
+        bad_event = Event(
+            project_id=self.project.id,
+            event_id=uuid1().hex,
+            data=bad_event_data,
+        )
+
+        assert _event_content_is_seer_eligible(good_event) is True
+        assert _event_content_is_seer_eligible(bad_event) is False
+
+    def test_platform_filter(self) -> None:
+        good_event_data = self.get_eligible_event_data()
+        good_event = Event(
+            project_id=self.project.id,
+            event_id=uuid1().hex,
+            data=good_event_data,
+        )
+
+        bad_event_data = self.get_eligible_event_data()
+        bad_event_data["platform"] = "other"
+        bad_event = Event(
+            project_id=self.project.id,
+            event_id=uuid1().hex,
+            data=bad_event_data,
+        )
+
+        assert good_event_data["platform"] not in SEER_INELIGIBLE_EVENT_PLATFORMS
+        assert bad_event_data["platform"] in SEER_INELIGIBLE_EVENT_PLATFORMS
+        assert _event_content_is_seer_eligible(good_event) is True
+        assert _event_content_is_seer_eligible(bad_event) is False
diff --git a/tests/sentry/grouping/snapshots/test_fingerprinting/test_event_hash_variant/fingerprint_exception_type_and_module2.pysnap b/tests/sentry/grouping/snapshots/test_fingerprinting/test_event_hash_variant/fingerprint_exception_type_and_module2.pysnap
index a1de52dd0e3f66..b1f9f27a6eadff 100644
--- a/tests/sentry/grouping/snapshots/test_fingerprinting/test_event_hash_variant/fingerprint_exception_type_and_module2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_fingerprinting/test_event_hash_variant/fingerprint_exception_type_and_module2.pysnap
@@ -1,5 +1,5 @@
 ---
-created: '2024-11-08T22:03:13.965272+00:00'
+created: '2024-12-06T19:45:37.706347+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_fingerprinting.py
 ---
@@ -25,8 +25,8 @@ variants:
     - my-route
     - '{{ default }}'
     component:
-      contributes: false
-      hint: exception of system takes precedence
+      contributes: true
+      hint: null
     type: salted_component
     values:
     - my-route
@@ -36,8 +36,8 @@ variants:
     - my-route
     - '{{ default }}'
     component:
-      contributes: true
-      hint: null
+      contributes: false
+      hint: exception of app takes precedence
     type: salted_component
     values:
     - my-route
diff --git a/tests/sentry/grouping/snapshots/test_fingerprinting/test_event_hash_variant/fingerprint_exception_type_and_sdk_mismatch.pysnap b/tests/sentry/grouping/snapshots/test_fingerprinting/test_event_hash_variant/fingerprint_exception_type_and_sdk_mismatch.pysnap
index 740827fb4c9e3f..1a80fdc14c2ea7 100644
--- a/tests/sentry/grouping/snapshots/test_fingerprinting/test_event_hash_variant/fingerprint_exception_type_and_sdk_mismatch.pysnap
+++ b/tests/sentry/grouping/snapshots/test_fingerprinting/test_event_hash_variant/fingerprint_exception_type_and_sdk_mismatch.pysnap
@@ -1,5 +1,5 @@
 ---
-created: '2024-11-08T22:03:16.302941+00:00'
+created: '2024-12-06T19:45:39.610879+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_fingerprinting.py
 ---
@@ -25,8 +25,8 @@ variants:
     - my-route
     - '{{ default }}'
     component:
-      contributes: false
-      hint: exception of system takes precedence
+      contributes: true
+      hint: null
     type: salted_component
     values:
     - my-route
@@ -36,8 +36,8 @@ variants:
     - my-route
     - '{{ default }}'
     component:
-      contributes: true
-      hint: null
+      contributes: false
+      hint: exception of app takes precedence
     type: salted_component
     values:
     - my-route
diff --git a/tests/sentry/grouping/snapshots/test_fingerprinting/test_event_hash_variant/fingerprint_no_match.pysnap b/tests/sentry/grouping/snapshots/test_fingerprinting/test_event_hash_variant/fingerprint_no_match.pysnap
index 5e409c372758c5..01c6fd865bc4b2 100644
--- a/tests/sentry/grouping/snapshots/test_fingerprinting/test_event_hash_variant/fingerprint_no_match.pysnap
+++ b/tests/sentry/grouping/snapshots/test_fingerprinting/test_event_hash_variant/fingerprint_no_match.pysnap
@@ -1,5 +1,5 @@
 ---
-created: '2024-11-08T22:03:17.074388+00:00'
+created: '2024-12-06T19:45:40.127492+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_fingerprinting.py
 ---
@@ -25,8 +25,8 @@ variants:
     - my-route
     - '{{ default }}'
     component:
-      contributes: false
-      hint: exception of system takes precedence
+      contributes: true
+      hint: null
     type: salted_component
     values:
     - my-route
@@ -36,8 +36,8 @@ variants:
     - my-route
     - '{{ default }}'
     component:
-      contributes: true
-      hint: null
+      contributes: false
+      hint: exception of app takes precedence
     type: salted_component
     values:
     - my-route
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 d66f445b191eb1..9c24464099e37c 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:09.279390+00:00'
+created: '2024-12-17T22:49:55.796243+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "c9dc61e20bb252c9ec1e28a75f015132"
+    contributing component: exception
     component:
       app*
         exception*
@@ -273,6 +274,7 @@ contributing variants:
             "actix_web::pipeline"
   system*
     hash: "4796dda6f2cfa81ec7862cd24bcfb58e"
+    contributing component: exception
     component:
       system*
         exception*
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 22b0137915886b..ef7394ee19a4c4 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:09.350010+00:00'
+created: '2024-12-17T22:49:55.888627+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "2e41d71bc38b212d73f8d68415389f45"
+    contributing component: exception
     component:
       system*
         exception*
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 162c235442c86f..6cef741fffbe48 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:09.670094+00:00'
+created: '2024-12-17T22:49:55.959283+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "13dfa104801704079b63004347f8fae6"
+    contributing component: exception
     component:
       system*
         exception*
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 dbaa2a71cbb485..c4db33dcccc8c6 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:09.726063+00:00'
+created: '2024-12-17T22:49:56.029572+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "1356c67d7ad1638d816bfb822dd2c25d"
+    contributing component: message
     component:
       default*
         message*
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 941b6db3f2a6e6..82779e51fa2009 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:09.779592+00:00'
+created: '2024-12-17T22:49:56.099686+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "8ecc10ce70f427a50370968e7271fa51"
+    contributing component: exception
     component:
       system*
         exception*
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 9b12e756d9ee5c..5e81fad1631a35 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:09.913406+00:00'
+created: '2024-12-17T22:49:56.258096+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "925057f3a51f4b7bf154e59a63eb3f86"
+    contributing component: exception
     component:
       system*
         exception*
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 757f65c13b8585..6bcb5bd0102464 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:09.851999+00:00'
+created: '2024-12-17T22:49:56.178924+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -29,6 +29,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "8cce12f1da956a1fd4e7c6078bc311fb"
+    contributing component: exception
     component:
       system*
         exception*
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 db98bb788a4203..198d00d5268d14 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:09.967337+00:00'
+created: '2024-12-17T22:49:56.345478+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "211e972054c29fae035071309ac474aa"
+    contributing component: exception
     component:
       system*
         exception*
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 1127f4385dbc68..3cbcaccb6baf0b 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:10.059041+00:00'
+created: '2024-12-16T06:52:20.236565+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -17,9 +17,6 @@ metrics with tags: {
 }
 ---
 contributing variants:
-  checksum*
-    hash: "not a legit checksum"
-    checksum: "not a legit checksum"
   hashed_checksum*
     hash: "de46d023e69b171b90ccf3ebca7aede4"
     checksum: "de46d023e69b171b90ccf3ebca7aede4"
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
deleted file mode 100644
index a6b382be661d1d..00000000000000
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/checksum_no_regex_match_long.pysnap
+++ /dev/null
@@ -1,23 +0,0 @@
----
-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*
-    hash: "2c2e85a6e73109222f131228ed06a7af"
-    checksum: "2c2e85a6e73109222f131228ed06a7af"
-    raw_checksum: "not a legit checksum and also too long a string"
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 dfd7569435b962..06f9a0b97df9ca 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:10.171098+00:00'
+created: '2024-12-17T22:49:56.555804+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "1356c67d7ad1638d816bfb822dd2c25d"
+    contributing component: message
     component:
       default*
         message*
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 8d7dabaffd5684..8d9061f7fad939 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:10.226022+00:00'
+created: '2024-12-17T22:49:56.635713+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "8abb6be15864dac05d46e61bfe1dd6d3"
+    contributing component: exception
     component:
       app*
         exception*
@@ -58,6 +59,7 @@ contributing variants:
             "ConnectionError"
   system*
     hash: "6391c18be56c7e7c95e58be4b3eaf0bd"
+    contributing component: exception
     component:
       system*
         exception*
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 d4609b76013f75..563d552674aa76 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:10.668432+00:00'
+created: '2024-12-17T22:49:57.281748+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "666766514295bb52812324097cdaf53e"
+    contributing component: csp
     component:
       default*
         csp*
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 5acade7f28330d..6427e7a47f3e5c 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:10.292677+00:00'
+created: '2024-12-17T22:49:56.689059+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "1742101e08eb1608f569751dfedd0062"
+    contributing component: csp
     component:
       default*
         csp*
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 90170ac2b9066d..c4fc04abe04a4d 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:10.364292+00:00'
+created: '2024-12-17T22:49:56.749550+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "efddf1cde918097259aa7d4904fb1942"
+    contributing component: csp
     component:
       default*
         csp*
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 d7eda2d2dcb081..03f4ac6f1d0ea5 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:10.480219+00:00'
+created: '2024-12-17T22:49:56.952855+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "4e6f2bce9d121aa89f4dc5e5da08afb5"
+    contributing component: csp
     component:
       default*
         csp*
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
index 702fefe7fddb1c..9e89495f2c675e 100644
--- 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
@@ -1,5 +1,5 @@
 ---
-created: '2024-12-02T22:04:01.043471+00:00'
+created: '2024-12-17T22:49:57.030932+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -24,6 +24,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "56c6520f35bce2f89ed2c4e725ccef65"
+    contributing component: csp
     component:
       default*
         csp*
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
index 95771e21f31058..2a6dd717657fd7 100644
--- 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
@@ -1,5 +1,5 @@
 ---
-created: '2024-12-02T22:04:02.308585+00:00'
+created: '2024-12-17T22:49:57.102131+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -24,6 +24,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "d346ee37d19a2be6587e609075ca2d57"
+    contributing component: csp
     component:
       default*
         csp*
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 5a8144edba98f5..a63017fd3738dd 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:10.552853+00:00'
+created: '2024-12-17T22:49:57.158572+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "223cdacfe5b4b830dc700b5c18cc21b4"
+    contributing component: csp
     component:
       default*
         csp*
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 f3cee1225ba319..a6467a2f9f7f35 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:10.608021+00:00'
+created: '2024-12-17T22:49:57.218241+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "537a973f594c364842893e9a72af62a5"
+    contributing component: csp
     component:
       default*
         csp*
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 9b04f70dbe9d83..dc7c9beddb8e7f 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:10.922384+00:00'
+created: '2024-12-17T22:49:57.556465+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "a4846fd651dcaae1c580fb24af561567"
+    contributing component: exception
     component:
       system*
         exception*
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 5f56a820032c93..a4c0f508523bfb 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,5 +1,5 @@
 ---
-created: '2024-12-03T22:10:04.491433+00:00'
+created: '2024-12-17T22:49:57.729153+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "b23ee1963904c2ca87b145febf94b66c"
+    contributing component: exception
     component:
       system*
         exception*
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 46c82e482f1802..2b7dcec897ac71 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:11.012692+00:00'
+created: '2024-12-17T22:49:57.602978+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "baf0bfa8bb312627cd5ef4171aec9f4e"
+    contributing component: exception
     component:
       system*
         exception*
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 e9f133ee8d0a3e..51154438d59639 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:11.064090+00:00'
+created: '2024-12-17T22:49:57.669642+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "9aef9026a457d312531c07644b271314"
+    contributing component: chained-exception
     component:
       system*
         chained-exception*
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 ad6b0f36c338a2..0326b09bb16409 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:11.159452+00:00'
+created: '2024-12-17T22:49:57.796594+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "4e10ac3b57fc5fc8bd77a31e5888f117"
+    contributing component: chained-exception
     component:
       system*
         chained-exception*
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 7bf04a02faa169..15c362c09f5786 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:11.215124+00:00'
+created: '2024-12-17T22:49:57.909917+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "4e10ac3b57fc5fc8bd77a31e5888f117"
+    contributing component: chained-exception
     component:
       system*
         chained-exception*
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 f9e52e48380c3d..09016d648e2747 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:11.269222+00:00'
+created: '2024-12-17T22:49:57.972408+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "e90fd85a42d3ca0e0df2c7bc5cb98669"
+    contributing component: chained-exception
     component:
       system*
         chained-exception*
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 e11cfaeffe8dba..43621ce108fa36 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:11.325986+00:00'
+created: '2024-12-17T22:49:58.037297+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "0809098f9f613b63467605dd1739cc9b"
+    contributing component: exception
     component:
       system*
         exception*
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 141205e8f57609..7a79c992ead8bc 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:11.399791+00:00'
+created: '2024-12-17T22:49:58.090839+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "4e10ac3b57fc5fc8bd77a31e5888f117"
+    contributing component: chained-exception
     component:
       system*
         chained-exception*
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 8b37b05d0cab71..fe5d0986df7d36 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:11.451207+00:00'
+created: '2024-12-17T22:49:58.145033+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "9a0fed56ec0b6fe6138480d083b4cb4e"
+    contributing component: chained-exception
     component:
       system*
         chained-exception*
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 fb6ff1d83bb6f3..34e5e53f030e73 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:11.515775+00:00'
+created: '2024-12-17T22:49:58.194544+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "dc22f89ccd77059eeaadc02badebcfba"
+    contributing component: chained-exception
     component:
       system*
         chained-exception*
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 ee99e9ec1e13b7..93259d0a7ac9b1 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:11.558469+00:00'
+created: '2024-12-17T22:49:58.253423+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "09f99e79bcd7338d26d938563ca8c704"
+    contributing component: chained-exception
     component:
       system*
         chained-exception*
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 34c40336dfcc4e..45951435599bc6 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:11.740400+00:00'
+created: '2024-12-17T22:49:58.381656+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "b4cd3ea9b8777433e90ffecbb9601091"
+    contributing component: chained-exception
     component:
       system*
         chained-exception*
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 99acd0e5691085..0799d30f1e18e2 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:11.609707+00:00'
+created: '2024-12-17T22:49:58.321966+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "29a4f186cb9ff2099ef3604cf548671b"
+    contributing component: chained-exception
     component:
       system*
         chained-exception*
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
index fd43d232698278..4b62a38c07e4b7 100644
--- 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
@@ -1,5 +1,5 @@
 ---
-created: '2024-12-02T21:58:31.995290+00:00'
+created: '2024-12-17T22:49:58.433932+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "b8e05ed0c06d6bc6c6052bb9dae6d6eb"
+    contributing component: chained-exception
     component:
       system*
         chained-exception*
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 32e3f68ebdcf05..5723e665c78bc2 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:11.856138+00:00'
+created: '2024-12-17T22:49:58.533464+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "008a97014f94fbe6b23002026791427f"
+    contributing component: chained-exception
     component:
       system*
         chained-exception*
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 80fbafe8255623..80ea5dc749ade4 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:11.800334+00:00'
+created: '2024-12-17T22:49:58.482913+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "4033ab52235740de9983976a18833f5f"
+    contributing component: chained-exception
     component:
       system*
         chained-exception*
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 ed690cde500ef2..6582dc85518a15 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:11.916418+00:00'
+created: '2024-12-17T22:49:58.579028+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "d1f185038ed0941ba9e5d2bad519b773"
+    contributing component: exception
     component:
       system*
         exception*
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 648911c458a011..90cda831321a58 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:11.961449+00:00'
+created: '2024-12-17T22:49:58.630520+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "5eb63bbbe01eeed093cb22bb8f5acdc3"
+    contributing component: exception
     component:
       system*
         exception*
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 8e500c9333d8f7..10daaa705bf1b6 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:12.005131+00:00'
+created: '2024-12-17T22:49:58.677718+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "5a2cfd89b7b171fd7b4794b08023d04f"
+    contributing component: exception
     component:
       system*
         exception*
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 38c20a218b9da6..67bf53778a8a53 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:12.320017+00:00'
+created: '2024-12-17T22:49:59.047710+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -22,6 +22,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "3d2933f4b5ec459ec8d569a398fd328c"
+    contributing component: expect-ct
     component:
       default*
         expect-ct*
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 827ee830bcbc0a..1fae9dc6fab740 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:12.361445+00:00'
+created: '2024-12-17T22:49:59.092340+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "b0d6c60d82e250da178402493260c2f2"
+    contributing component: exception
     component:
       system*
         exception*
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
index 2a4d7728dd5215..826d21dbd377a7 100644
--- 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
@@ -1,5 +1,5 @@
 ---
-created: '2024-12-03T22:10:04.537204+00:00'
+created: '2024-12-17T22:49:59.138993+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "526b64456c48836a46ec1a89544fd412"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 7dd8b528d1d1ae..502090454f1f86 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:12.511595+00:00'
+created: '2024-12-17T22:49:59.261580+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "d8f406c2efb312db2231282f94647b1d"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 70f42c44a4c4e5..90ea9f38816f89 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:12.560929+00:00'
+created: '2024-12-17T22:49:59.319488+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "91f42e615037e91a3c6f8a6fcf04056b"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 6e8753cea829c3..3b917db90a9953 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:12.608337+00:00'
+created: '2024-12-17T22:49:59.371737+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "45c0b0a8c777e7a7040d7c39233a08a5"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 9220c4060460cd..00028924904f2a 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:12.665547+00:00'
+created: '2024-12-17T22:49:59.443003+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "74be9a8bc7117f22ea0a61a9b2f524c5"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 7acfeb284774d2..a126e56b87a454 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:12.720832+00:00'
+created: '2024-12-17T22:49:59.494177+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "353e05904b48bd3ae4fa9623934a70d0"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 c8180ed722c429..40b4b4da62fc76 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:12.765075+00:00'
+created: '2024-12-17T22:49:59.544010+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "f771960161f86b1f8eec4edc3016e1c0"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 5d0078e982882e..de6e49462e8007 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:12.828788+00:00'
+created: '2024-12-17T22:49:59.589670+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "be15ca3d511b96918e087c4f42503ca2"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 695125527a2d0a..e51833c8c18486 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:12.878724+00:00'
+created: '2024-12-17T22:49:59.635052+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "98f84fd484f8c2273f28cc645935f650"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 c9fcf73034398b..35ef7951a2ec8f 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:12.929450+00:00'
+created: '2024-12-17T22:49:59.683061+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "5eb63bbbe01eeed093cb22bb8f5acdc3"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 88941c73831079..fe32c49b3f31f4 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:13.032451+00:00'
+created: '2024-12-17T22:49:59.787311+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "5eb63bbbe01eeed093cb22bb8f5acdc3"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 0e2ebb948d30f0..004a3396575909 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:13.076989+00:00'
+created: '2024-12-17T22:49:59.835906+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "5eb63bbbe01eeed093cb22bb8f5acdc3"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 a6a002feab6166..3ba90be19e4a00 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:13.175268+00:00'
+created: '2024-12-17T22:49:59.888139+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "6d2345b21f168d7c55e70eac56589e3b"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 3951179ec9823a..70924656e62214 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:13.247919+00:00'
+created: '2024-12-17T22:49:59.941513+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "a01e3a60f8863fd9dfc5697fae1eed46"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 0bb60ad84f4e1f..9e9847e81b8666 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:13.410839+00:00'
+created: '2024-12-17T22:49:59.995058+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "aee9aaca552e7fd593d085ca5a2260cf"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 c203d18f523abc..419f1afd312978 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:13.489826+00:00'
+created: '2024-12-17T22:50:00.074071+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "5fd1358271b3a3dba3287e135029688d"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 f22111875641a3..2b938ab722f6ef 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:13.650849+00:00'
+created: '2024-12-17T22:50:00.263836+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "538bdfd8d7bb2495d0d6429c3689a420"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 a9aa6fd65955de..dd9a6da3efa5c5 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:13.547945+00:00'
+created: '2024-12-17T22:50:00.135973+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "538bdfd8d7bb2495d0d6429c3689a420"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 6449dc0cbf6115..e1da5d297164c1 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:13.597602+00:00'
+created: '2024-12-17T22:50:00.203896+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "813856376ba744b15a01916ed2557344"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 6e32b92887ea23..d9812a2d940012 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:13.694114+00:00'
+created: '2024-12-17T22:50:00.343784+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "37a2dbfebce02591474d46b7485e9923"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 852119f4805dcc..992e997fc6edef 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:13.840821+00:00'
+created: '2024-12-17T22:50:00.521122+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "278cdd35be92e2ffde1d0a40524e7786"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 59131b9295dc89..e4b13f38c6aa36 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:13.888371+00:00'
+created: '2024-12-17T22:50:00.578169+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "d1fe4234d1bddc3823d08dcc529fb161"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 476a1b19bbea48..68d9c26b4940f4 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:13.940903+00:00'
+created: '2024-12-17T22:50:00.637882+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "d1fe4234d1bddc3823d08dcc529fb161"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 f49c7684ad72ab..d1e31dd77387ab 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:14.038157+00:00'
+created: '2024-12-17T22:50:00.828449+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "07d1a8e5728b3c4c7aa8b8273fd0e753"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 a29d783f90373e..8d81f47d368b16 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:13.985763+00:00'
+created: '2024-12-17T22:50:00.749761+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "09e0efcab18f545166318118ed4e0292"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 57abce1b0f304a..48d710ec1bbfcc 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:14.084653+00:00'
+created: '2024-12-17T22:50:00.882178+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "9bc326575875422d0d4ced3c35d9f916"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 c50228741e26c6..7db70a2147885b 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:14.128991+00:00'
+created: '2024-12-17T22:50:00.938875+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "27eed4125fc13d42163ddb0b8f357b48"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 932e38bfde2b0f..20a836b145b1e2 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:14.175652+00:00'
+created: '2024-12-17T22:50:00.996475+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "140d61119ffa316766cf0f710bf1e7f1"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 22c65b270bf0a7..fe6a242a795843 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:14.273360+00:00'
+created: '2024-12-17T22:50:01.115861+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "00ffe2f3150414a00633fb5671a918f8"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 c61fb890944ea2..3b0b4597679589 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:14.226170+00:00'
+created: '2024-12-17T22:50:01.054216+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "babff59ccf75f6cade7c5805f6d9aa59"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 5d03808ce8f4ae..08e2badcf77f0e 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:14.324975+00:00'
+created: '2024-12-17T22:50:01.170141+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "a972f399399f5566f39b14a7afdd24ff"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 c28bf8ec773915..ccd8dc3888d344 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:14.369809+00:00'
+created: '2024-12-17T22:50:01.229007+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "60e0a667027bef0d0b7c4882891df7e8"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 41d36fdce10ecd..f727d850f0ecca 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:14.490365+00:00'
+created: '2024-12-17T22:50:01.285076+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "fb73cb54ced59b1c0c60d9bb40b7336b"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 a7d72dda9d661d..22365442e8b79d 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:14.556938+00:00'
+created: '2024-12-17T22:50:01.333816+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "299a0be4a5a79e6a59fdd251b19d78bb"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 ac3866cbb542c8..403a7b0b456c78 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:14.601833+00:00'
+created: '2024-12-17T22:50:01.379570+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "01143b49f8875c22617bac5bb1aaf638"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 661141368e0e38..e7a2ac64448cba 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:14.647870+00:00'
+created: '2024-12-17T22:50:01.428680+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "19fcc04a0c59eaf564ee1a00c58574cc"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 625445bd33a2ac..3cc59124a556b8 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:14.692409+00:00'
+created: '2024-12-17T22:50:01.486142+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "4b8bbc500bd2cabfcadc1f1be867e0bb"
+    contributing component: exception
     component:
       app*
         exception*
@@ -38,6 +39,7 @@ contributing variants:
             "*pq.Error"
   system*
     hash: "348fc4026c9fa11ffba8fbfa80a134c9"
+    contributing component: exception
     component:
       system*
         exception*
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 a6884a2c125a5f..2c8d45d8ca4ddb 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:14.749234+00:00'
+created: '2024-12-17T22:50:01.547455+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "c470859cd6d1e38f3bd089877a7b8b97"
+    contributing component: exception
     component:
       system*
         exception*
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 1b7cdbc28408cd..168d56a63b1183 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:14.803221+00:00'
+created: '2024-12-17T22:50:01.602331+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "e5c2dc6670a947b5251eb5ae72799124"
+    contributing component: exception
     component:
       system*
         exception*
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 0ef2cab3bc5edd..aed00a2cd991d8 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:14.858065+00:00'
+created: '2024-12-17T22:50:01.655824+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "b02fb88218293d772c2e20c8f6ab387a"
+    contributing component: exception
     component:
       system*
         exception*
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 21ab983f71d70c..d111b5e5c1dcef 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:14.911704+00:00'
+created: '2024-12-17T22:50:01.811801+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "445c51c35600b1cfdc2e5985c5bdd75b"
+    contributing component: exception
     component:
       system*
         exception*
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 03629a63fb9a46..e5b335556e5c99 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:14.967768+00:00'
+created: '2024-12-17T22:50:01.895448+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "f0671c4012732af1040a25d09e12afca"
+    contributing component: exception
     component:
       system*
         exception*
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 104a4b3a73b27d..d51d372aea9ca9 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:15.022203+00:00'
+created: '2024-12-17T22:50:01.958270+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "f0671c4012732af1040a25d09e12afca"
+    contributing component: exception
     component:
       system*
         exception*
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 47f9d7e3c2be3b..609ebadc90f4ad 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:15.069536+00:00'
+created: '2024-12-17T22:50:02.015152+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "2b6e7c38169cdf8db932529529331be5"
+    contributing component: exception
     component:
       system*
         exception*
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 6fd2e6429f0a6e..925850cb3380fc 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:15.122596+00:00'
+created: '2024-12-17T22:50:02.069690+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "2b6e7c38169cdf8db932529529331be5"
+    contributing component: exception
     component:
       system*
         exception*
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 90c3431477f4a6..a8f844095653f6 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:15.184288+00:00'
+created: '2024-12-17T22:50:02.133405+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "19208a8d2bfdfe0f14d6bcc72e7bb54a"
+    contributing component: exception
     component:
       system*
         exception*
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 4d97646cb64eba..5e1d439ff7706c 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:15.243374+00:00'
+created: '2024-12-17T22:50:02.196431+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "19208a8d2bfdfe0f14d6bcc72e7bb54a"
+    contributing component: exception
     component:
       system*
         exception*
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 c5cae962e7a54e..aa5048d21adc0c 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:15.308903+00:00'
+created: '2024-12-17T22:50:02.256179+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "a3ce3ffb7077f57549483112e3dcf68c"
+    contributing component: exception
     component:
       system*
         exception*
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 997a3d56154e99..0be8aacfb416ea 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:15.360180+00:00'
+created: '2024-12-17T22:50:02.306709+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "6f4e0b1cef47a64deadb07777bb652db"
+    contributing component: exception
     component:
       system*
         exception*
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 b17424d8c38beb..a49aa74635c3b1 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:15.417567+00:00'
+created: '2024-12-17T22:50:02.370155+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "3ec7691e31dedccb5a0b199b65958d9e"
+    contributing component: exception
     component:
       system*
         exception*
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 dd1880b1516fab..86801b0951054f 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:15.470941+00:00'
+created: '2024-12-17T22:50:02.432314+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "c0b8fd55ef872186a9eaf65ea6b29fc1"
+    contributing component: exception
     component:
       system*
         exception*
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 f56ef83305adac..edfb2fb8184de3 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:15.527902+00:00'
+created: '2024-12-17T22:50:02.505684+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "3e9f9ffdb23279c991df2017c6ca1cff"
+    contributing component: exception
     component:
       system*
         exception*
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 6a279f3c9fac22..4669c5144a63a7 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:15.573366+00:00'
+created: '2024-12-17T22:50:02.548727+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -22,6 +22,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "1e37a374cb33572622d02ff7a6237c44"
+    contributing component: hpkp
     component:
       default*
         hpkp*
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 de1c0697d7af33..6fda0e44e8eb74 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:15.617154+00:00'
+created: '2024-12-17T22:50:02.607328+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -27,6 +27,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "e3d593b4335190212ca7c18b8e967fb1"
+    contributing component: exception
     component:
       system*
         exception*
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 214651d1ecdcf4..4bc550f6ed24f0 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:15.665726+00:00'
+created: '2024-12-17T22:50:02.700731+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -30,6 +30,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "12f8483a96ef9ed502d804b62eaa9f26"
+    contributing component: exception
     component:
       app*
         exception*
@@ -100,6 +101,7 @@ contributing variants:
     values: ["{{ default }}","soft-timelimit-exceeded"]
   system*
     hash: "2105fd0d38b9aff20e44d2597d3a776b"
+    contributing component: exception
     component:
       system*
         exception*
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 e6bb9c62666474..c1b8b9d3f398c3 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:15.761176+00:00'
+created: '2024-12-17T22:50:02.825494+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -27,6 +27,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "5b5ad5a0fbb4deb5e3fc631ce42681ae"
+    contributing component: exception
     component:
       system*
         exception*
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 e97c5c3afa245e..9739ec0565ae94 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:15.809046+00:00'
+created: '2024-12-17T22:50:02.886386+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -27,6 +27,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "c5578778212497f1ff3435405e2a4a98"
+    contributing component: exception
     component:
       system*
         exception*
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 115317314310b2..3fff3cc55b63d6 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:15.869032+00:00'
+created: '2024-12-17T22:50:02.939468+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "c506663b9a1495d301bff1e82149d55e"
+    contributing component: exception
     component:
       system*
         exception*
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 3b9ad8aeba5434..757762ec851200 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:15.983114+00:00'
+created: '2024-12-17T22:50:03.060882+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "ca1e356d85bc74d82d4ae8f3f8bfbbf7"
+    contributing component: chained-exception
     component:
       app*
         chained-exception*
@@ -228,6 +229,7 @@ contributing variants:
               "LifecycleException"
   system*
     hash: "8924849495809d42431719c2b9ab65c8"
+    contributing component: chained-exception
     component:
       system*
         chained-exception*
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 226b963ef6600b..d0584f0492c4fa 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:16.067258+00:00'
+created: '2024-12-17T22:50:03.135736+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "ec87dd10e4f7512ecccb4a068c5774ae"
+    contributing component: exception
     component:
       system*
         exception*
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 7ffbc70e0c4b56..b89dc4197f4d93 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:16.176294+00:00'
+created: '2024-12-17T22:50:03.229863+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "ad1efff799d4f9435077701aee66dde0"
+    contributing component: exception
     component:
       system*
         exception*
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 9675d00df149a3..a14b9aeea86682 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:16.117971+00:00'
+created: '2024-12-17T22:50:03.181974+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "6de7447e45ffb49fd4fa5728aebdd488"
+    contributing component: exception
     component:
       system*
         exception*
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 9250f7f1b43241..9105b3c93c2ed8 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:16.280410+00:00'
+created: '2024-12-17T22:50:03.287017+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "60443ca22b22a43806f4358109278791"
+    contributing component: exception
     component:
       system*
         exception*
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 d94327bbb1ce1c..a75fdcffa26769 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:16.403420+00:00'
+created: '2024-12-17T22:50:03.381240+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "4119639092e62c55ea8be348e4d9260d"
+    contributing component: message
     component:
       default*
         message*
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 a68096ca692179..cfca63652d403a 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:16.353013+00:00'
+created: '2024-12-17T22:50:03.330780+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "bc485e4d2e22a2e4998479e52c370501"
+    contributing component: message
     component:
       default*
         message*
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 2084df65ad537a..1752b482227082 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:16.456102+00:00'
+created: '2024-12-17T22:50:03.429731+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "ff4f080caf40f8c396751f8b3b8c09d2"
+    contributing component: exception
     component:
       system*
         exception*
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 fd5806cfc4c4fd..b71f67b578e423 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:16.507210+00:00'
+created: '2024-12-17T22:50:03.484345+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "5a78ef040b2122b94fc8d7756971739c"
+    contributing component: exception
     component:
       system*
         exception*
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 3842a1d202d052..e1e55a2d24c1de 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:16.559845+00:00'
+created: '2024-12-17T22:50:03.533693+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "be36642f41f047346396f018f62375d3"
+    contributing component: exception
     component:
       system*
         exception*
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 b881b959772670..d1aaba0cf3c627 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:16.614494+00:00'
+created: '2024-12-17T22:50:03.637428+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "7abcb72eb9800b9f38b37f448697a673"
+    contributing component: exception
     component:
       system*
         exception*
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 ddaf55fd2cf8cc..e45c96ccc8ce4a 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:16.664732+00:00'
+created: '2024-12-17T22:50:03.700794+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "be36642f41f047346396f018f62375d3"
+    contributing component: exception
     component:
       system*
         exception*
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 4b31b53ab3e7a3..cb49c7ea4c6754 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:16.718059+00:00'
+created: '2024-12-17T22:50:03.759080+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "a06d7f718dc06157e7b8391cc5e56f10"
+    contributing component: exception
     component:
       system*
         exception*
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 59156314be6543..d031868a2d63d9 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:16.764265+00:00'
+created: '2024-12-17T22:50:03.805262+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "e834aba6bf7b758128da092a68a18e9a"
+    contributing component: exception
     component:
       system*
         exception*
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 6e082f3de32c6b..6b47e40e4b4750 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:16.817334+00:00'
+created: '2024-12-17T22:50:03.856105+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "71036056ea01a28f0931ab8e951206e2"
+    contributing component: exception
     component:
       system*
         exception*
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 51611f54f7aa52..67f9697215f470 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:16.866322+00:00'
+created: '2024-12-17T22:50:03.910328+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "1ff8b3514536db084acc996865d7efd6"
+    contributing component: exception
     component:
       system*
         exception*
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 d0e9e50496a4f2..8aa95302f4d2ec 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:16.917676+00:00'
+created: '2024-12-17T22:50:03.961856+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "be36642f41f047346396f018f62375d3"
+    contributing component: exception
     component:
       system*
         exception*
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 eb2ef774eb30b1..0a429f5b89f765 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:16.979130+00:00'
+created: '2024-12-17T22:50:04.023015+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "7e5b9ebe8c869ab99af044367bf7d347"
+    contributing component: exception
     component:
       app*
         exception*
@@ -53,6 +54,7 @@ contributing variants:
             "NotFoundError"
   system*
     hash: "e8f6c1a30ea99526223c0bba1bcd8c13"
+    contributing component: exception
     component:
       system*
         exception*
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 fdf91e62f95963..ae8663550ac1dc 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:17.045171+00:00'
+created: '2024-12-17T22:50:04.081852+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "7e5b9ebe8c869ab99af044367bf7d347"
+    contributing component: exception
     component:
       app*
         exception*
@@ -53,6 +54,7 @@ contributing variants:
             "NotFoundError"
   system*
     hash: "6e03a501145e36faab4fa152bb3b6a62"
+    contributing component: exception
     component:
       system*
         exception*
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 9f55875e832045..108bb99adb44fe 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:17.240716+00:00'
+created: '2024-12-17T22:50:04.206654+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "89037a724fe48e9f6144c3a14e182b9c"
+    contributing component: exception
     component:
       system*
         exception*
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 9d621e378cf337..adede53b5bee38 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:17.159806+00:00'
+created: '2024-12-17T22:50:04.137358+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "260f8f0a5856cd6db03c549b83080d5d"
+    contributing component: exception
     component:
       app*
         exception*
@@ -38,6 +39,7 @@ contributing variants:
             "Exception"
   system*
     hash: "babe97015e0a63eaaab253c266bae20d"
+    contributing component: exception
     component:
       system*
         exception*
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 af718a754f7518..6420e4ee107fba 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:17.290076+00:00'
+created: '2024-12-17T22:50:04.264037+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "8ec8bbc71eb6e2af7fbe5076a8534f96"
+    contributing component: message
     component:
       default*
         message*
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 5e9f9502ce7905..da39384adcec2b 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:17.349782+00:00'
+created: '2024-12-17T22:50:04.321796+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "329b29efcf1f77067a063e34f56e7791"
+    contributing component: message
     component:
       default*
         message*
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 e027bcabe62ceb..dbcf0d52d41f0a 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:17.406959+00:00'
+created: '2024-12-17T22:50:04.384707+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "a3ce3ffb7077f57549483112e3dcf68c"
+    contributing component: exception
     component:
       system*
         exception*
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 ede059cdce2115..8deee801f6bcfb 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:17.472796+00:00'
+created: '2024-12-17T22:50:04.453981+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "a3ce3ffb7077f57549483112e3dcf68c"
+    contributing component: exception
     component:
       system*
         exception*
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 8ec9f55990ab39..0c9228ed8a8647 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:17.527495+00:00'
+created: '2024-12-17T22:50:04.505001+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "d63ee001e5f5763d56b6e25284bd480e"
+    contributing component: exception
     component:
       system*
         exception*
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 b6af435eab9afd..e62ec5ceb7f589 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:17.573401+00:00'
+created: '2024-12-17T22:50:04.552180+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "8ec8bbc71eb6e2af7fbe5076a8534f96"
+    contributing component: message
     component:
       default*
         message*
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 83c4ea24e79a38..4670c3f4a51611 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:17.618482+00:00'
+created: '2024-12-17T22:50:04.600499+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "d3f5e52d24e9c1eae5abe6c866cced63"
+    contributing component: message
     component:
       default*
         message*
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 4cf9887ba8bfec..683fd0d08870d5 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:17.672393+00:00'
+created: '2024-12-17T22:50:04.660282+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "61490ee252f3d4dd5a19680dca2410d3"
+    contributing component: message
     component:
       default*
         message*
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 1fad2335cec3bb..c39063f2c7c224 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:17.724158+00:00'
+created: '2024-12-17T22:50:04.727523+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "074e2ed5d89f602d31be5742ac107fef"
+    contributing component: exception
     component:
       system*
         exception*
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 d4fb369fa2aa67..b49cf09c288292 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:17.773901+00:00'
+created: '2024-12-17T22:50:04.780385+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "3e0ae2ce25cce2fca3390f3416e6a82a"
+    contributing component: exception
     component:
       system*
         exception*
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 ffd2dec69a69cd..aa74de94fe48bb 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:17.827934+00:00'
+created: '2024-12-17T22:50:04.839572+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "c0efa3bdfea2264ffda696557937ff9f"
+    contributing component: exception
     component:
       system*
         exception*
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 8c198d4391af49..698f8bb55bdabf 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:17.875274+00:00'
+created: '2024-12-17T22:50:04.935891+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "c0efa3bdfea2264ffda696557937ff9f"
+    contributing component: exception
     component:
       system*
         exception*
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 dec9893b016d3c..583dec962ebb61 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:17.923246+00:00'
+created: '2024-12-17T22:50:04.993117+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "c0efa3bdfea2264ffda696557937ff9f"
+    contributing component: exception
     component:
       system*
         exception*
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 61f614a4cb3451..1f2d0d39031f58 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:17.975496+00:00'
+created: '2024-12-17T22:50:05.087605+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "3e0ae2ce25cce2fca3390f3416e6a82a"
+    contributing component: exception
     component:
       system*
         exception*
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 3450f5663e2ab1..84498198efd09d 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:18.025859+00:00'
+created: '2024-12-17T22:50:05.149998+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "a433bc7901e2b36f1f85a756f6457620"
+    contributing component: exception
     component:
       system*
         exception*
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 695678b72af3c3..45306520f38f18 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:18.076719+00:00'
+created: '2024-12-17T22:50:05.212420+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "3e0ae2ce25cce2fca3390f3416e6a82a"
+    contributing component: exception
     component:
       system*
         exception*
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 f809c3a01c33d7..da44f4974a8585 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:18.127562+00:00'
+created: '2024-12-17T22:50:05.277746+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "3e0ae2ce25cce2fca3390f3416e6a82a"
+    contributing component: exception
     component:
       system*
         exception*
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 df6c9c66457653..5c3d105dfcf798 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:18.176107+00:00'
+created: '2024-12-17T22:50:05.347294+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "f133068802b8a7f6162e0c7d8fc6b984"
+    contributing component: exception
     component:
       system*
         exception*
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 1560efa34da188..3e04f1e61288ee 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:18.229583+00:00'
+created: '2024-12-17T22:50:05.407480+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "7b28306805da7fea54ee3441e8e1dc1a"
+    contributing component: exception
     component:
       system*
         exception*
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 e6f9005d1c7136..47e80f8e905004 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:18.281193+00:00'
+created: '2024-12-17T22:50:05.465319+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "bc6bc0f8bfa8a2fe5f0e4034384bfec1"
+    contributing component: exception
     component:
       app*
         exception*
@@ -63,6 +64,7 @@ contributing variants:
             "Error"
   system*
     hash: "6a3275e56067560bf20cb311f724f897"
+    contributing component: exception
     component:
       system*
         exception*
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 3ead2d192dd208..5586beff5fa2d2 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:18.368399+00:00'
+created: '2024-12-17T22:50:05.528155+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "0006292929602ffceed7679beb242d96"
+    contributing component: exception
     component:
       system*
         exception*
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 f31ac009449402..56e065bf782717 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:18.415154+00:00'
+created: '2024-12-17T22:50:05.576458+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "9aef9026a457d312531c07644b271314"
+    contributing component: chained-exception
     component:
       system*
         chained-exception*
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 11f98e82998905..b36bff4fdca676 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:18.470784+00:00'
+created: '2024-12-17T22:50:05.632062+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "79f7443afa4022bb3e5093e765e755bb"
+    contributing component: exception
     component:
       app*
         exception*
@@ -43,6 +44,7 @@ contributing variants:
             "MultiValueDictKeyError"
   system*
     hash: "5586fbb54ed18866eea266e91cee7f8b"
+    contributing component: exception
     component:
       system*
         exception*
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 80de65e7efbd71..9a7e24bf213b21 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:18.522809+00:00'
+created: '2024-12-17T22:50:05.685773+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "20fc367de6e7f2dcfd2f08ddd4fd8618"
+    contributing component: exception
     component:
       system*
         exception*
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 2eb7a72c15bc6d..12e1cd5df43746 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:18.577396+00:00'
+created: '2024-12-17T22:50:05.740609+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "55b71821bccfe62d0df089e2f406c651"
+    contributing component: exception
     component:
       app*
         exception*
@@ -43,6 +44,7 @@ contributing variants:
             "HTTPError"
   system*
     hash: "a140a9ee6bbfb7ca9c21234dc287f2a6"
+    contributing component: exception
     component:
       system*
         exception*
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 d439f36837811b..794f972909e2e4 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:18.637716+00:00'
+created: '2024-12-17T22:50:05.800725+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "f8f4d8cbe0c85758ed193d0f5d9955b3"
+    contributing component: exception
     component:
       system*
         exception*
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 02d07c96238939..bf1c6c05998915 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:18.689883+00:00'
+created: '2024-12-17T22:50:05.850590+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "84ed5488c9c498282e0f1691b658f17f"
+    contributing component: stacktrace
     component:
       app*
         stacktrace*
@@ -35,6 +36,7 @@ contributing variants:
               1
   system*
     hash: "41156b93307634d3815da88429911825"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 a1e0bf58009915..b3911e6296aa1e 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:18.743390+00:00'
+created: '2024-12-17T22:50:05.901891+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "9bdadae4fa003cef6cf460ff1325e54b"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 7e57b2306451a3..2e7b275d3c5d6b 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:18.794699+00:00'
+created: '2024-12-17T22:50:05.953272+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "fbad177f80c1eff3bd6b252e09576292"
+    contributing component: stacktrace
     component:
       app*
         stacktrace*
@@ -35,6 +36,7 @@ contributing variants:
               1
   system*
     hash: "06d370794820bec071005bf2e589d247"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 e4bd6d3ba60e26..b24e18ecfd3ef1 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:18.996191+00:00'
+created: '2024-12-17T22:50:06.054357+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "9b478586e7375aef8bedb80ae2fcaab7"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 b90fb41c415f5c..53e4229c524bff 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:19.107720+00:00'
+created: '2024-12-17T22:50:06.159602+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "3e0ae2ce25cce2fca3390f3416e6a82a"
+    contributing component: exception
     component:
       system*
         exception*
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 7bfb9750a31739..804259e862f11a 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:19.269102+00:00'
+created: '2024-12-17T22:50:06.249597+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "19fcc04a0c59eaf564ee1a00c58574cc"
+    contributing component: stacktrace
     component:
       app*
         stacktrace*
@@ -35,6 +36,7 @@ contributing variants:
               1
   system*
     hash: "3aa7e7dacc3a98cf8316a226c4485053"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 c8936c1274e67a..ce32aa7262f685 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:19.386878+00:00'
+created: '2024-12-17T22:50:06.489980+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "3e0ae2ce25cce2fca3390f3416e6a82a"
+    contributing component: exception
     component:
       system*
         exception*
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 ada0a3146120ee..1fdbaaf08d5265 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:19.445595+00:00'
+created: '2024-12-17T22:50:06.569668+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "3e0ae2ce25cce2fca3390f3416e6a82a"
+    contributing component: exception
     component:
       system*
         exception*
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 bd39fdb8352cf1..189682c9627577 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:19.505056+00:00'
+created: '2024-12-17T22:50:06.624934+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "3e0ae2ce25cce2fca3390f3416e6a82a"
+    contributing component: exception
     component:
       system*
         exception*
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 967b8545ec6bed..dbcbf643ace507 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:19.556148+00:00'
+created: '2024-12-17T22:50:06.683741+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "3aa7e7dacc3a98cf8316a226c4485053"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 0f02a2d5c5f948..70bff3c133366e 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,5 +1,5 @@
 ---
-created: '2024-12-03T22:10:04.627914+00:00'
+created: '2024-12-17T22:50:06.744441+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -19,6 +19,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "1f5bdebe3c9f414c7dbb4296a8353245"
+    contributing component: template
     component:
       default*
         template*
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 495ca7e00f6b2a..e4be7b9aef29b8 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:19.655377+00:00'
+created: '2024-12-17T22:50:06.801387+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "39db5b4edf187e89cec12245e5c9fb3c"
+    contributing component: threads
     component:
       system*
         threads*
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 7abc40362eb414..6b5407b9cba408 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:19.865616+00:00'
+created: '2024-12-17T22:50:06.910997+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "ca611011ce2c949c4371754b1754bba9"
+    contributing component: exception
     component:
       app*
         exception*
@@ -38,6 +39,7 @@ contributing variants:
             "NullReferenceException"
   system*
     hash: "48fa46727e0f07477677a70d1e921f3f"
+    contributing component: exception
     component:
       system*
         exception*
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 be9e6e1d6ef61d..7306f776a40126 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:04.097039+00:00'
+created: '2024-12-17T22:49:48.892346+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -15,5 +15,6 @@ metrics with tags: {
 contributing variants:
   dogs*
     hash: "d41d8cd98f00b204e9800998ecf8427e"
+    contributing component: null
     component:
       not_a_known_component_type*
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 461b9b3d4f627f..2c2eaa387b92d9 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:19.932365+00:00'
+created: '2024-12-17T22:50:07.009551+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "703d3dd9cb763e3f5037f659d27da947"
+    contributing component: exception
     component:
       app*
         exception*
@@ -274,6 +275,7 @@ contributing variants:
             "actix_web::pipeline"
   system*
     hash: "1df163ce3be65319df4fcc9cb34b60c1"
+    contributing component: exception
     component:
       system*
         exception*
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 78ee24ec69f87b..f7f949fa787d50 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:19.988421+00:00'
+created: '2024-12-17T22:50:07.089762+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "2e41d71bc38b212d73f8d68415389f45"
+    contributing component: exception
     component:
       system*
         exception*
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 386c7867a86ffd..adf20cbd1b9740 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:20.046019+00:00'
+created: '2024-12-17T22:50:07.152070+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "228c649a3aa0901622c0a0e66ab0522c"
+    contributing component: exception
     component:
       app*
         exception*
@@ -43,6 +44,7 @@ contributing variants:
             "System.Exception"
   system*
     hash: "4ccd0f1953483581ba360c7518f90332"
+    contributing component: exception
     component:
       system*
         exception*
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 0899e594c2e2ee..f8a6e25486af6b 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:20.094923+00:00'
+created: '2024-12-17T22:50:07.213683+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "ff6c4ee7c54f118a9647ee86f0c2b0b0"
+    contributing component: threads
     component:
       app*
         threads*
@@ -37,6 +38,7 @@ contributing variants:
                 "__99+[Something else]_block_invoke_2"
   system*
     hash: "cff360e554b4acecd9fd2534d9051870"
+    contributing component: threads
     component:
       system*
         threads*
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 51ff8584122a59..373d304a7eabe6 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:20.149179+00:00'
+created: '2024-12-17T22:50:07.268381+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "d9c9b0f9ba46e32fddd7cd1512fad235"
+    contributing component: exception
     component:
       system*
         exception*
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 9f7a8a3824d81b..81835a9bf2dc0d 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:20.342224+00:00'
+created: '2024-12-17T22:50:07.375113+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "925057f3a51f4b7bf154e59a63eb3f86"
+    contributing component: exception
     component:
       system*
         exception*
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 6426e6e9cac830..b12d4e68217f5c 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:20.194943+00:00'
+created: '2024-12-17T22:50:07.325032+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -29,6 +29,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "8cce12f1da956a1fd4e7c6078bc311fb"
+    contributing component: exception
     component:
       system*
         exception*
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 04d3ce577c48ca..ded3f30976a859 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:20.402062+00:00'
+created: '2024-12-17T22:50:07.439416+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "e2ea2eb86d26407f06b59beb3a444c91"
+    contributing component: exception
     component:
       app*
         exception*
@@ -68,6 +69,7 @@ contributing variants:
             2
   system*
     hash: "d23d0dfeac5f1349ceb624b330670b25"
+    contributing component: exception
     component:
       system*
         exception*
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 a3ebe9c4628f49..37a303fd107f36 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:20.499036+00:00'
+created: '2024-12-16T06:52:28.725433+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -17,9 +17,6 @@ metrics with tags: {
 }
 ---
 contributing variants:
-  checksum*
-    hash: "not a legit checksum"
-    checksum: "not a legit checksum"
   hashed_checksum*
     hash: "de46d023e69b171b90ccf3ebca7aede4"
     checksum: "de46d023e69b171b90ccf3ebca7aede4"
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
deleted file mode 100644
index 8c6dd04a698b9d..00000000000000
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/checksum_no_regex_match_long.pysnap
+++ /dev/null
@@ -1,23 +0,0 @@
----
-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*
-    hash: "2c2e85a6e73109222f131228ed06a7af"
-    checksum: "2c2e85a6e73109222f131228ed06a7af"
-    raw_checksum: "not a legit checksum and also too long a string"
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 32bbb4e453e061..8932dd0324d16c 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:20.602343+00:00'
+created: '2024-12-17T22:50:07.806052+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "7b230a2bb8a040d3e337c6205147e990"
+    contributing component: threads
     component:
       app*
         threads*
@@ -49,6 +50,7 @@ contributing variants:
                 "closure"
   system*
     hash: "96df2174dd7e0ad3c31948a9de020fba"
+    contributing component: threads
     component:
       system*
         threads*
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 f20c5844fb1a75..8ba5a3dd4cc116 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:20.653381+00:00'
+created: '2024-12-17T22:50:07.862251+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "6b059b9febc815ac18ac4d2082e38a9b"
+    contributing component: exception
     component:
       app*
         exception*
@@ -68,6 +69,7 @@ contributing variants:
             "ConnectionError"
   system*
     hash: "013d3477a774fe20c468dc8accd516f1"
+    contributing component: exception
     component:
       system*
         exception*
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 0483bf9d601050..96e5d1f469baa6 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:20.932153+00:00'
+created: '2024-12-17T22:50:08.263669+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "666766514295bb52812324097cdaf53e"
+    contributing component: csp
     component:
       default*
         csp*
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 3e7acf61fb45b7..6fb54e394958b5 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:20.697148+00:00'
+created: '2024-12-17T22:50:07.910768+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "1742101e08eb1608f569751dfedd0062"
+    contributing component: csp
     component:
       default*
         csp*
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 9161e992f6ba3d..0fd787a27d1ef2 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:20.744606+00:00'
+created: '2024-12-17T22:50:07.953178+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "efddf1cde918097259aa7d4904fb1942"
+    contributing component: csp
     component:
       default*
         csp*
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 fd6cc7199fd147..734c0bb9c75a72 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:20.792786+00:00'
+created: '2024-12-17T22:50:07.991557+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "4e6f2bce9d121aa89f4dc5e5da08afb5"
+    contributing component: csp
     component:
       default*
         csp*
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
index 0421c183fa54e0..199c894fd7aba9 100644
--- 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
@@ -1,5 +1,5 @@
 ---
-created: '2024-12-02T22:04:08.965328+00:00'
+created: '2024-12-17T22:50:08.050817+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -24,6 +24,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "56c6520f35bce2f89ed2c4e725ccef65"
+    contributing component: csp
     component:
       default*
         csp*
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
index 8ce8174b43f8dd..bf8156489fe0e4 100644
--- 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
@@ -1,5 +1,5 @@
 ---
-created: '2024-12-02T22:04:10.035038+00:00'
+created: '2024-12-17T22:50:08.099041+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -24,6 +24,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "d346ee37d19a2be6587e609075ca2d57"
+    contributing component: csp
     component:
       default*
         csp*
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 8bdc417f49c713..a6340ebf08b0d4 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:20.842912+00:00'
+created: '2024-12-17T22:50:08.154121+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "223cdacfe5b4b830dc700b5c18cc21b4"
+    contributing component: csp
     component:
       default*
         csp*
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 ef8d8d2d11505d..6dcefc22edf376 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:20.888586+00:00'
+created: '2024-12-17T22:50:08.209627+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "537a973f594c364842893e9a72af62a5"
+    contributing component: csp
     component:
       default*
         csp*
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 0775b402ea6dfb..e67e9f6609980d 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:21.188449+00:00'
+created: '2024-12-17T22:50:08.550800+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "029f3b967068b1539f96957b7c0451d7"
+    contributing component: exception
     component:
       app*
         exception*
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 bc3c7df7bcfd49..b4c5888f411364 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,5 +1,5 @@
 ---
-created: '2024-12-03T22:10:04.830319+00:00'
+created: '2024-12-17T22:50:08.713532+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "b23ee1963904c2ca87b145febf94b66c"
+    contributing component: exception
     component:
       app*
         exception*
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 56a41e8571a398..f96db5c0276896 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:21.276433+00:00'
+created: '2024-12-17T22:50:08.608016+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -7,7 +7,7 @@ hash_basis: stacktrace
 hashing_metadata: {
   "num_stacktraces": 1,
   "stacktrace_location": "exception",
-  "stacktrace_type": "system"
+  "stacktrace_type": "in_app"
 }
 ---
 metrics with tags: {
@@ -18,15 +18,16 @@ metrics with tags: {
   "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
     "chained_exception": "False",
     "stacktrace_location": "exception",
-    "stacktrace_type": "system"
+    "stacktrace_type": "in_app"
   }
 }
 ---
 contributing variants:
-  system*
+  app*
     hash: "9509e122c6175606d52862fa4f64853c"
+    contributing component: exception
     component:
-      system*
+      app*
         exception*
           stacktrace*
             frame*
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 e384b0e276d3bf..a2030bedc09488 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:21.331408+00:00'
+created: '2024-12-17T22:50:08.666420+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -7,7 +7,7 @@ hash_basis: stacktrace
 hashing_metadata: {
   "num_stacktraces": 2,
   "stacktrace_location": "exception",
-  "stacktrace_type": "system"
+  "stacktrace_type": "in_app"
 }
 ---
 metrics with tags: {
@@ -18,15 +18,16 @@ metrics with tags: {
   "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
     "chained_exception": "True",
     "stacktrace_location": "exception",
-    "stacktrace_type": "system"
+    "stacktrace_type": "in_app"
   }
 }
 ---
 contributing variants:
-  system*
+  app*
     hash: "669cb6664e0f5fed38665da04e464f7e"
+    contributing component: chained-exception
     component:
-      system*
+      app*
         chained-exception*
           exception*
             stacktrace*
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 539e8e8e24d23b..da8bb990bc6571 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:21.426996+00:00'
+created: '2024-12-17T22:50:08.766107+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "e2bf1e0628b7b1824a9b63dec7a079a3"
+    contributing component: chained-exception
     component:
       app*
         chained-exception*
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 a85a75a4c83fc6..a7c2bcb19d0cfc 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:21.476691+00:00'
+created: '2024-12-17T22:50:08.817204+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "a4f16891fa438620699cb2d9af5cc827"
+    contributing component: exception
     component:
       app*
         exception*
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 1ac574142e9fb5..ac6000b42b30fe 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:21.524512+00:00'
+created: '2024-12-17T22:50:08.876708+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "f0078a82f351095ba595daa7d493aa3c"
+    contributing component: chained-exception
     component:
       app*
         chained-exception*
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 070f5872d70ca4..6aead91547ecc1 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:21.572584+00:00'
+created: '2024-12-17T22:50:08.925634+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "0809098f9f613b63467605dd1739cc9b"
+    contributing component: exception
     component:
       app*
         exception*
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 98c4a7ccb4cfdd..4199e73fd47def 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:21.616835+00:00'
+created: '2024-12-17T22:50:08.974652+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "0809098f9f613b63467605dd1739cc9b"
+    contributing component: exception
     component:
       app*
         exception*
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 772589154303a3..e19a5bb9a52398 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:21.666478+00:00'
+created: '2024-12-17T22:50:09.033815+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "a4f16891fa438620699cb2d9af5cc827"
+    contributing component: exception
     component:
       app*
         exception*
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 061d8c047c30f8..e24cac2d9696fc 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:21.713474+00:00'
+created: '2024-12-17T22:50:09.082564+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "a4f16891fa438620699cb2d9af5cc827"
+    contributing component: exception
     component:
       app*
         exception*
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 c0ae7417848d27..7454cd20717a44 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:21.764213+00:00'
+created: '2024-12-17T22:50:09.141283+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "17022e0561e9b6e6351723a08aa81b18"
+    contributing component: chained-exception
     component:
       app*
         chained-exception*
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 d46f1f20fb9b39..67414e6d2430ef 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:21.861291+00:00'
+created: '2024-12-17T22:50:09.263039+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "a4f16891fa438620699cb2d9af5cc827"
+    contributing component: exception
     component:
       app*
         exception*
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 2a797f61a4855f..f3a4d9f0f6fa5f 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:21.810584+00:00'
+created: '2024-12-17T22:50:09.198566+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "f0078a82f351095ba595daa7d493aa3c"
+    contributing component: chained-exception
     component:
       app*
         chained-exception*
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
index 4d9aeb4541432c..5fbcb3aab225c9 100644
--- 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
@@ -1,5 +1,5 @@
 ---
-created: '2024-12-02T21:57:59.770060+00:00'
+created: '2024-12-17T22:50:09.372857+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "d505dfb9059ac63c11955233323a9100"
+    contributing component: chained-exception
     component:
       app*
         chained-exception*
@@ -58,6 +59,7 @@ contributing variants:
               "One or more errors occurred."
   system*
     hash: "4f9cc6a81f4eb34f9e917374f281b9dc"
+    contributing component: chained-exception
     component:
       system*
         chained-exception*
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 05db22091c29a6..45aac4b3f1a146 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:21.956569+00:00'
+created: '2024-12-17T22:50:09.492268+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "bca604b98cb4637167eb6190a92e8933"
+    contributing component: chained-exception
     component:
       app*
         chained-exception*
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 6ca29e5fa8fd91..bbc0af94fac81b 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:21.909626+00:00'
+created: '2024-12-17T22:50:09.441774+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "fca0fd23f09e8da4481304ef2a531100"
+    contributing component: chained-exception
     component:
       app*
         chained-exception*
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 98160a93561a8f..8067e716fda774 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:22.060482+00:00'
+created: '2024-12-17T22:50:09.541748+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "26552f86ca2368e708afa1df6effc1c5"
+    contributing component: exception
     component:
       system*
         exception*
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 65cc4ff12986c9..c03f496525a9e2 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:22.122105+00:00'
+created: '2024-12-17T22:50:09.623817+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "5eb63bbbe01eeed093cb22bb8f5acdc3"
+    contributing component: exception
     component:
       app*
         exception*
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 27b7dc2e6b6ca5..e5bac1cae4cc82 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:22.181393+00:00'
+created: '2024-12-17T22:50:09.678527+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "5a2cfd89b7b171fd7b4794b08023d04f"
+    contributing component: exception
     component:
       app*
         exception*
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 4cbfa7cb3c69f5..4e225cc6eb40ea 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:22.227064+00:00'
+created: '2024-12-17T22:50:09.724987+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -22,6 +22,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "3d2933f4b5ec459ec8d569a398fd328c"
+    contributing component: expect-ct
     component:
       default*
         expect-ct*
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 45a861de05e20d..85b478ea09b858 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:22.276434+00:00'
+created: '2024-12-17T22:50:09.790385+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "b85897bf204fd8e90ff495b47502f281"
+    contributing component: exception
     component:
       system*
         exception*
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
index 26b044fefc0da5..ae6541cb277beb 100644
--- 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
@@ -1,5 +1,5 @@
 ---
-created: '2024-12-03T22:10:04.875280+00:00'
+created: '2024-12-17T22:50:09.841465+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "526b64456c48836a46ec1a89544fd412"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 e6f522e6321652..f48eeff7ca8dfb 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:22.420241+00:00'
+created: '2024-12-17T22:50:10.002905+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "d8f406c2efb312db2231282f94647b1d"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 c8631b00d84410..2d675ea0421b31 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:22.475777+00:00'
+created: '2024-12-17T22:50:10.053019+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "91f42e615037e91a3c6f8a6fcf04056b"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 3493ad51e102b3..63e9b7be0f44e8 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:22.540351+00:00'
+created: '2024-12-17T22:50:10.107757+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "45c0b0a8c777e7a7040d7c39233a08a5"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 6c77f859811142..6f0b180fa14d8d 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:22.621198+00:00'
+created: '2024-12-17T22:50:10.162087+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -7,7 +7,7 @@ hash_basis: stacktrace
 hashing_metadata: {
   "num_stacktraces": 1,
   "stacktrace_location": "top-level",
-  "stacktrace_type": "system"
+  "stacktrace_type": "in_app"
 }
 ---
 metrics with tags: {
@@ -18,15 +18,16 @@ metrics with tags: {
   "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
     "chained_exception": "False",
     "stacktrace_location": "top-level",
-    "stacktrace_type": "system"
+    "stacktrace_type": "in_app"
   }
 }
 ---
 contributing variants:
-  system*
+  app*
     hash: "82639bcdd4eca16551e8cd3448f48ed4"
+    contributing component: stacktrace
     component:
-      system*
+      app*
         stacktrace*
           frame*
             filename*
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 7d46560c8c6651..c75192d898563e 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:22.699666+00:00'
+created: '2024-12-17T22:50:10.219665+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "353e05904b48bd3ae4fa9623934a70d0"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 aa428cc53d4659..d8795c965b921a 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:22.762476+00:00'
+created: '2024-12-17T22:50:10.280162+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "f771960161f86b1f8eec4edc3016e1c0"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 9aef578f87d54c..17e77be70b8af5 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:22.869937+00:00'
+created: '2024-12-17T22:50:10.353284+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "be15ca3d511b96918e087c4f42503ca2"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 b75d05a4c37f5b..11d742ff62eb07 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:22.953431+00:00'
+created: '2024-12-17T22:50:10.402580+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "bd8c868a3914eeb4f48e7ef46f19a0df"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 b5053828df5a2b..ecfcc8faf16ae4 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:23.029477+00:00'
+created: '2024-12-17T22:50:10.495516+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "098f6bcd4621d373cade4e832627b4f6"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 ca719a0eebdd6f..ee6323ed83bbdd 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:23.167079+00:00'
+created: '2024-12-17T22:50:10.594948+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "098f6bcd4621d373cade4e832627b4f6"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 482936bba97ff8..d636a0ac1b7e48 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:23.232223+00:00'
+created: '2024-12-17T22:50:10.641221+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "098f6bcd4621d373cade4e832627b4f6"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 a39a6c9aab8ef7..83f8c9f2ef5bb1 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:23.309634+00:00'
+created: '2024-12-17T22:50:10.690384+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -7,7 +7,7 @@ hash_basis: stacktrace
 hashing_metadata: {
   "num_stacktraces": 1,
   "stacktrace_location": "top-level",
-  "stacktrace_type": "system"
+  "stacktrace_type": "in_app"
 }
 ---
 metrics with tags: {
@@ -18,15 +18,16 @@ metrics with tags: {
   "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
     "chained_exception": "False",
     "stacktrace_location": "top-level",
-    "stacktrace_type": "system"
+    "stacktrace_type": "in_app"
   }
 }
 ---
 contributing variants:
-  system*
+  app*
     hash: "e0e7c4713e9092dc77635d5a0d5db31d"
+    contributing component: stacktrace
     component:
-      system*
+      app*
         stacktrace*
           frame*
             module*
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 96cd9231ac4cb4..cec214b19ab356 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:23.385135+00:00'
+created: '2024-12-17T22:50:10.909748+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "a01e3a60f8863fd9dfc5697fae1eed46"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 aebbee5952486f..7b7060ca1b3c60 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:23.447567+00:00'
+created: '2024-12-17T22:50:11.109672+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "be7f1b8b4014de623c533a8218dba5bd"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 be62bf762d1df1..86fe808058a224 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:23.522445+00:00'
+created: '2024-12-17T22:50:11.154359+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "53b9e9679a8ea25880376080b76f98ad"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 cd651817ce7ddc..4d73193c8dc8af 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:23.680523+00:00'
+created: '2024-12-17T22:50:11.390184+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "538bdfd8d7bb2495d0d6429c3689a420"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 dbaddd4f31f6c7..d6ca2f5e3cd54a 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:23.577307+00:00'
+created: '2024-12-17T22:50:11.209484+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "538bdfd8d7bb2495d0d6429c3689a420"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 ee7e74f4b22816..a92ba5c9b25323 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:23.626729+00:00'
+created: '2024-12-17T22:50:11.267119+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "dc3d511120ce04996b1eef3496516e5c"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 4a6e76164a92b7..f57507540cfdb4 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:23.733948+00:00'
+created: '2024-12-17T22:50:11.444142+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "0cc175b9c0f1b6a831c399e269772661"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 9ba3781f145410..2a2b202a5c6a43 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:23.848508+00:00'
+created: '2024-12-17T22:50:11.549043+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "30eb5001914d29dd8461898b5b8094fe"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 8f3f1dcc7231a6..2a3860c33b3d85 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:23.927453+00:00'
+created: '2024-12-17T22:50:11.597289+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -7,7 +7,7 @@ hash_basis: stacktrace
 hashing_metadata: {
   "num_stacktraces": 1,
   "stacktrace_location": "top-level",
-  "stacktrace_type": "system"
+  "stacktrace_type": "in_app"
 }
 ---
 metrics with tags: {
@@ -18,15 +18,16 @@ metrics with tags: {
   "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
     "chained_exception": "False",
     "stacktrace_location": "top-level",
-    "stacktrace_type": "system"
+    "stacktrace_type": "in_app"
   }
 }
 ---
 contributing variants:
-  system*
+  app*
     hash: "278cdd35be92e2ffde1d0a40524e7786"
+    contributing component: stacktrace
     component:
-      system*
+      app*
         stacktrace*
           frame*
             filename*
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 e5e94528cf4ba8..c7e2e128fa7f4b 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:24.002276+00:00'
+created: '2024-12-17T22:50:11.646538+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -7,7 +7,7 @@ hash_basis: stacktrace
 hashing_metadata: {
   "num_stacktraces": 1,
   "stacktrace_location": "top-level",
-  "stacktrace_type": "system"
+  "stacktrace_type": "in_app"
 }
 ---
 metrics with tags: {
@@ -18,15 +18,16 @@ metrics with tags: {
   "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
     "chained_exception": "False",
     "stacktrace_location": "top-level",
-    "stacktrace_type": "system"
+    "stacktrace_type": "in_app"
   }
 }
 ---
 contributing variants:
-  system*
+  app*
     hash: "d1fe4234d1bddc3823d08dcc529fb161"
+    contributing component: stacktrace
     component:
-      system*
+      app*
         stacktrace*
           frame*
             filename*
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 8784c064e63035..916d068dfffadd 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:24.087117+00:00'
+created: '2024-12-17T22:50:11.699954+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -7,7 +7,7 @@ hash_basis: stacktrace
 hashing_metadata: {
   "num_stacktraces": 1,
   "stacktrace_location": "top-level",
-  "stacktrace_type": "system"
+  "stacktrace_type": "in_app"
 }
 ---
 metrics with tags: {
@@ -18,15 +18,16 @@ metrics with tags: {
   "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
     "chained_exception": "False",
     "stacktrace_location": "top-level",
-    "stacktrace_type": "system"
+    "stacktrace_type": "in_app"
   }
 }
 ---
 contributing variants:
-  system*
+  app*
     hash: "d1fe4234d1bddc3823d08dcc529fb161"
+    contributing component: stacktrace
     component:
-      system*
+      app*
         stacktrace*
           frame*
             filename*
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 22071083b3c6c5..70adf3b00f28fd 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:24.207832+00:00'
+created: '2024-12-17T22:50:11.801559+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "07d1a8e5728b3c4c7aa8b8273fd0e753"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 42d879ca04ff1d..76a3b87669fc00 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:24.151980+00:00'
+created: '2024-12-17T22:50:11.752982+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "09e0efcab18f545166318118ed4e0292"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 47b95e5e165e39..a2c8e5841ca214 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:24.268681+00:00'
+created: '2024-12-17T22:50:11.850931+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "9bc326575875422d0d4ced3c35d9f916"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 352a36b355b9ae..cd1c9f53b19476 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:24.318573+00:00'
+created: '2024-12-17T22:50:11.897166+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "27eed4125fc13d42163ddb0b8f357b48"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 353aeb79245cd2..0ebc426d6daa30 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:24.376056+00:00'
+created: '2024-12-17T22:50:11.947308+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "4067a71d7098866f87c746a57a77b2bb"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 357646ead3c0c8..5734bac0926d45 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:24.478548+00:00'
+created: '2024-12-17T22:50:12.045079+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "2f908c015ad77a50595512fcf65d344c"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 99eb9e30314164..e3e095b6fc5a2c 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:24.427841+00:00'
+created: '2024-12-17T22:50:11.993782+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "2f908c015ad77a50595512fcf65d344c"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 e6c79945d7e9d4..6e472b2c044600 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:24.528463+00:00'
+created: '2024-12-17T22:50:12.101191+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "a972f399399f5566f39b14a7afdd24ff"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 cc3df41a4559d3..ccdce6ff609d8e 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:24.584707+00:00'
+created: '2024-12-17T22:50:12.220834+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "fb73cb54ced59b1c0c60d9bb40b7336b"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 193716dc1501f9..b98521215a1ec0 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:24.637307+00:00'
+created: '2024-12-17T22:50:12.312344+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "fb73cb54ced59b1c0c60d9bb40b7336b"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 2c678495a7f42f..88762bcb40032c 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:24.674344+00:00'
+created: '2024-12-17T22:50:12.413524+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "acbd18db4cc2f85cedef654fccc4a4d8"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 3219b3a65de9a7..f41df8efa2b34f 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:24.719578+00:00'
+created: '2024-12-17T22:50:12.462877+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "23db4a9e73800923f345d2b868993345"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 d81db504e93455..5c841e29c3fe6b 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:24.774823+00:00'
+created: '2024-12-17T22:50:12.515397+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "1effb24729ae4c43efa36b460511136a"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 e81f6aa47e9f1f..89f31b4161740d 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:24.839685+00:00'
+created: '2024-12-17T22:50:12.569294+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "4b8bbc500bd2cabfcadc1f1be867e0bb"
+    contributing component: exception
     component:
       app*
         exception*
@@ -38,6 +39,7 @@ contributing variants:
             "*pq.Error"
   system*
     hash: "348fc4026c9fa11ffba8fbfa80a134c9"
+    contributing component: exception
     component:
       system*
         exception*
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 1de910bdc8e4ad..fa5d345961a2ed 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:24.959188+00:00'
+created: '2024-12-17T22:50:12.634816+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "725b26e5c390004cd0eca6018a7ad200"
+    contributing component: exception
     component:
       system*
         exception*
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 c7e2e34794c42a..20fa13358edbad 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:25.022973+00:00'
+created: '2024-12-17T22:50:12.683140+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "48a275d290e688b23878080257c9adc3"
+    contributing component: exception
     component:
       system*
         exception*
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 8a72300523db85..61cda310dce9c2 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:25.073201+00:00'
+created: '2024-12-17T22:50:12.739370+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "07fb068d9b0e76878c72b462ea20cab3"
+    contributing component: exception
     component:
       system*
         exception*
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 c4dc56ae439164..2c9a5ad5e6e890 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:25.142117+00:00'
+created: '2024-12-17T22:50:12.798172+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "94d5c188bc82790c397f7f97d5239ee0"
+    contributing component: exception
     component:
       system*
         exception*
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 9100c943763c9d..1eff03cddc03d8 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:25.205452+00:00'
+created: '2024-12-17T22:50:12.857903+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "b77a07388ce12082423da4abee4415fc"
+    contributing component: exception
     component:
       system*
         exception*
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 0d4579b3dcc424..41b188bf2d1665 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:25.268554+00:00'
+created: '2024-12-17T22:50:12.913321+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "76e54b047bb34b5d0ec6d210fcd8d995"
+    contributing component: exception
     component:
       system*
         exception*
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 d8745979021498..e5d32459895c4b 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:25.319414+00:00'
+created: '2024-12-17T22:50:12.963369+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "b7c6253ad69f02d33e770f3050d72c88"
+    contributing component: exception
     component:
       system*
         exception*
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 71f7dc46cfd966..705e56703d6be6 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:25.371760+00:00'
+created: '2024-12-17T22:50:13.019685+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "12c4b5346b5242ec65d3153bb45937b0"
+    contributing component: exception
     component:
       system*
         exception*
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 36a5265f1daea3..c8151e323b7b58 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:25.422141+00:00'
+created: '2024-12-17T22:50:13.079336+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "57d5f9c178ebe1364226ed6c90d30174"
+    contributing component: exception
     component:
       system*
         exception*
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 71e9d38fb00850..b2da59c7b52140 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:25.481265+00:00'
+created: '2024-12-17T22:50:13.146620+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "51856c096282b824c59e92b79dda4eec"
+    contributing component: exception
     component:
       system*
         exception*
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 f99af1b5d0d17d..cab69c2e380176 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:25.548878+00:00'
+created: '2024-12-17T22:50:13.211536+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "e4714f9479fea40111888ca143e02d8f"
+    contributing component: exception
     component:
       system*
         exception*
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 c4703321e39f6c..37ea0a676f891c 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:25.596322+00:00'
+created: '2024-12-17T22:50:13.268866+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "ba5ff7b8a3adc9b87681ff0f8275a72e"
+    contributing component: exception
     component:
       system*
         exception*
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 be0541693028e9..8e1ee885505a94 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:26.099774+00:00'
+created: '2024-12-17T22:50:13.335229+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "aeefa28dbbcc272df254d59c98aad03c"
+    contributing component: exception
     component:
       system*
         exception*
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 579ad4690a943a..97c7d872936603 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:26.165742+00:00'
+created: '2024-12-17T22:50:13.394719+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "50325a901e2db771dca1291283d8b54e"
+    contributing component: exception
     component:
       system*
         exception*
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 33693c2a0b0040..ef4145ba1d4ef1 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:26.240988+00:00'
+created: '2024-12-17T22:50:13.449464+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "2fa6bd4588d2ae97b62ef1f8db5b12bf"
+    contributing component: exception
     component:
       system*
         exception*
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 ec2ee40037b24c..53c81aa5a572d8 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:26.280313+00:00'
+created: '2024-12-17T22:50:13.495277+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -22,6 +22,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "1e37a374cb33572622d02ff7a6237c44"
+    contributing component: hpkp
     component:
       default*
         hpkp*
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 badb268f2661bc..d4c9a60a8e3430 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:26.329365+00:00'
+created: '2024-12-17T22:50:13.545937+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -27,6 +27,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "e3d593b4335190212ca7c18b8e967fb1"
+    contributing component: exception
     component:
       app*
         exception*
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 14b04542949582..490c5d2cc4c2db 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:26.373857+00:00'
+created: '2024-12-17T22:50:13.599351+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -30,6 +30,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "19163f3ca34f5995c69d85351ce3d697"
+    contributing component: exception
     component:
       app*
         exception*
@@ -124,6 +125,7 @@ contributing variants:
     values: ["{{ default }}","soft-timelimit-exceeded"]
   system*
     hash: "847950eb44d280e6758d136c763d6ddc"
+    contributing component: exception
     component:
       system*
         exception*
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 2532a2daf9a066..fb44e871f301e1 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:26.446531+00:00'
+created: '2024-12-17T22:50:13.695653+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -27,6 +27,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "5b5ad5a0fbb4deb5e3fc631ce42681ae"
+    contributing component: exception
     component:
       app*
         exception*
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 324fead6a58f49..d12ffa9540ca94 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:26.587514+00:00'
+created: '2024-12-17T22:50:13.743958+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -27,6 +27,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "c5578778212497f1ff3435405e2a4a98"
+    contributing component: exception
     component:
       app*
         exception*
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 62a9df86d830dc..12f2d0de64fecf 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:26.650583+00:00'
+created: '2024-12-17T22:50:13.805429+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "9b037f38798ea127aac3e8b8e1e1024a"
+    contributing component: exception
     component:
       app*
         exception*
@@ -106,6 +107,7 @@ contributing variants:
                 "value"
   system*
     hash: "fe8b15fe322c91ede2fc48363fe43587"
+    contributing component: exception
     component:
       system*
         exception*
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 d9de2a01d693ec..9c8a8fb8d2d84d 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:26.713127+00:00'
+created: '2024-12-17T22:50:13.869988+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "750486b8d8c51500fa0dfbb6f1577af0"
+    contributing component: chained-exception
     component:
       app*
         chained-exception*
@@ -49,6 +50,7 @@ contributing variants:
               "LifecycleException"
   system*
     hash: "8924849495809d42431719c2b9ab65c8"
+    contributing component: chained-exception
     component:
       system*
         chained-exception*
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 3214b13c082c35..dec25cb7590eb8 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:26.771501+00:00'
+created: '2024-12-17T22:50:13.939119+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "ec87dd10e4f7512ecccb4a068c5774ae"
+    contributing component: exception
     component:
       system*
         exception*
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 3b900deac8baeb..23b0fc5d375bf7 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:26.881694+00:00'
+created: '2024-12-17T22:50:14.036014+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "10dfd81e2df31e96fae451b9e205ad81"
+    contributing component: exception
     component:
       app*
         exception*
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 e1dc059288ecf1..09b2c922432126 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:26.822964+00:00'
+created: '2024-12-17T22:50:13.981740+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "b8e2a347e75266ca7bb565e2b3c0722e"
+    contributing component: exception
     component:
       app*
         exception*
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 1d4c547cd60967..6746adaf3d7b56 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:27.267671+00:00'
+created: '2024-12-17T22:50:14.096456+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "c0f3f7d6deb17aec9d07259ac684fad0"
+    contributing component: exception
     component:
       system*
         exception*
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 838764a9532c7d..26fee90a178b37 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:27.355355+00:00'
+created: '2024-12-17T22:50:14.201673+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "4119639092e62c55ea8be348e4d9260d"
+    contributing component: message
     component:
       default*
         message*
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 132a080d278fc0..a5fa910fc7f941 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:27.309045+00:00'
+created: '2024-12-17T22:50:14.153414+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "f9e47f16e3b9770b440157179c47bf7a"
+    contributing component: message
     component:
       default*
         message* (stripped event-specific values)
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 616dee006f46bb..1e166bebf76bc0 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:27.401458+00:00'
+created: '2024-12-17T22:50:14.265728+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "838d9553ed824c45d9125f42ec408472"
+    contributing component: exception
     component:
       system*
         exception*
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 c2bdaf37c424fe..3d0be15cb3c08b 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:27.517172+00:00'
+created: '2024-12-17T22:50:14.335852+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "6ab78545e13144405fb21dadb9045b91"
+    contributing component: exception
     component:
       system*
         exception*
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 4281c3c6a1821b..dc0ba00bea7977 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:27.571656+00:00'
+created: '2024-12-17T22:50:14.407610+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "c63e8727af1a8fe75872b6a762797113"
+    contributing component: exception
     component:
       system*
         exception*
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 e72f34702947eb..f2c1eb9ab70f0d 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:27.629710+00:00'
+created: '2024-12-17T22:50:14.453174+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "c63e8727af1a8fe75872b6a762797113"
+    contributing component: exception
     component:
       system*
         exception*
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 278d80aa62463a..061148d811834e 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:27.684164+00:00'
+created: '2024-12-17T22:50:14.494770+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "c63e8727af1a8fe75872b6a762797113"
+    contributing component: exception
     component:
       system*
         exception*
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 ccd9fce10bb787..7fb3cf18a4d0f9 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:27.800535+00:00'
+created: '2024-12-17T22:50:14.554796+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "b2602ad455472dede8e4c340d8a7eaba"
+    contributing component: exception
     component:
       system*
         exception*
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 fb3b8687134357..619a6f5eda46e4 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:27.872178+00:00'
+created: '2024-12-17T22:50:14.617579+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "b2602ad455472dede8e4c340d8a7eaba"
+    contributing component: exception
     component:
       system*
         exception*
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 8e7fa70332bd80..b8ed64dc0adaf9 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:27.922918+00:00'
+created: '2024-12-17T22:50:14.674515+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "b2602ad455472dede8e4c340d8a7eaba"
+    contributing component: exception
     component:
       system*
         exception*
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 626d9d4c00fb06..26148ac2ce9cb0 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:27.969746+00:00'
+created: '2024-12-17T22:50:14.724284+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "b2602ad455472dede8e4c340d8a7eaba"
+    contributing component: exception
     component:
       system*
         exception*
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 502dbbc79120c7..466572e7d736bb 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:28.019366+00:00'
+created: '2024-12-17T22:50:14.776726+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "c63e8727af1a8fe75872b6a762797113"
+    contributing component: exception
     component:
       system*
         exception*
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 a244f002d1ebe4..3ccd073a8763f3 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:28.071978+00:00'
+created: '2024-12-17T22:50:14.832466+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "4a3cf3893b6485428dd02da116c8370e"
+    contributing component: exception
     component:
       app*
         exception*
@@ -53,6 +54,7 @@ contributing variants:
             "NotFoundError"
   system*
     hash: "d5456487ea8dccfe96c1968b19870978"
+    contributing component: exception
     component:
       system*
         exception*
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 dc7c29b9781bf7..b79dbcac8c0717 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:28.134122+00:00'
+created: '2024-12-17T22:50:14.887950+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "4a3cf3893b6485428dd02da116c8370e"
+    contributing component: exception
     component:
       app*
         exception*
@@ -53,6 +54,7 @@ contributing variants:
             "NotFoundError"
   system*
     hash: "0b81da6ea3d7cc82b1d4825b7aac0b8d"
+    contributing component: exception
     component:
       system*
         exception*
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 0c3f4d8218f27a..68eb0a35ca6628 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:28.289327+00:00'
+created: '2024-12-17T22:50:15.016114+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "4665d486184740231357ab63f4543a8d"
+    contributing component: exception
     component:
       app*
         exception*
@@ -52,6 +53,7 @@ contributing variants:
             "Exception"
   system*
     hash: "107ed03036d901157372f260bc3df446"
+    contributing component: exception
     component:
       system*
         exception*
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 145d1ba94508ec..ee6f6863dc09ab 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:28.230899+00:00'
+created: '2024-12-17T22:50:14.934698+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "a728cdf5d62c8e017c35c3fe04051b6e"
+    contributing component: exception
     component:
       app*
         exception*
@@ -38,6 +39,7 @@ contributing variants:
             "Exception"
   system*
     hash: "38f89a430b4a251a06a5a15b382638b5"
+    contributing component: exception
     component:
       system*
         exception*
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 9fee576db1db98..788891b79e7fa0 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:28.340846+00:00'
+created: '2024-12-17T22:50:15.099860+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "8ec8bbc71eb6e2af7fbe5076a8534f96"
+    contributing component: message
     component:
       default*
         message*
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 1ce33538fbf750..68719f7e54ea3f 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:28.389162+00:00'
+created: '2024-12-17T22:50:15.171877+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "329b29efcf1f77067a063e34f56e7791"
+    contributing component: message
     component:
       default*
         message*
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 ee6a50c1a3f1c8..e5ef46d03087c0 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:28.468064+00:00'
+created: '2024-12-17T22:50:15.233711+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "6188cd480f18f1ce368de0500be00733"
+    contributing component: exception
     component:
       system*
         exception*
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 538177ff212398..998260a9e1780e 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:28.542277+00:00'
+created: '2024-12-17T22:50:15.311600+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "ab793fe47359148c7fc95f684bc5308d"
+    contributing component: exception
     component:
       system*
         exception*
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 cc6aa1c05c1d44..6357ad455013d9 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:28.623683+00:00'
+created: '2024-12-17T22:50:15.366694+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "2f4ae73b88dbbc7e1cee4f86e270c4b4"
+    contributing component: exception
     component:
       system*
         exception*
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 bd79f275d11574..ae8a9c92f8e87b 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:28.673119+00:00'
+created: '2024-12-17T22:50:15.413130+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "8ec8bbc71eb6e2af7fbe5076a8534f96"
+    contributing component: message
     component:
       default*
         message*
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 b189be38e4b25c..3c06aec540e440 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:28.731608+00:00'
+created: '2024-12-17T22:50:15.475917+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "d3f5e52d24e9c1eae5abe6c866cced63"
+    contributing component: message
     component:
       default*
         message*
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 6f8acd62932319..eadfabee965de4 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:28.782587+00:00'
+created: '2024-12-17T22:50:15.545775+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "d2ab1028e9cb44352a824e878951f412"
+    contributing component: message
     component:
       default*
         message* (stripped event-specific values)
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 e8c5649c949c93..971d8f9b31f530 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:28.850019+00:00'
+created: '2024-12-17T22:50:15.598795+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "dcfcd48a02c100bbe4023cbc783054f0"
+    contributing component: exception
     component:
       system*
         exception*
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 6271309f080121..923ed3ba489a88 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:28.906783+00:00'
+created: '2024-12-17T22:50:15.646480+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "61d21e6d53c0837718af047c20e5e7ea"
+    contributing component: exception
     component:
       system*
         exception*
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 24a94d63dfcd6d..b1a2dcb45c78bc 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:28.962732+00:00'
+created: '2024-12-17T22:50:15.698600+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "a6befffdc310c28b165bbceb1c0f59a8"
+    contributing component: exception
     component:
       system*
         exception*
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 7791f16fb4c154..8142d0f7daac38 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:29.012648+00:00'
+created: '2024-12-17T22:50:15.760151+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "6fcc3bb4fac6aa6e81bb6d0faf40b0dd"
+    contributing component: exception
     component:
       system*
         exception*
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 5dd4252f527506..56ae2bbcf39ee8 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:29.066891+00:00'
+created: '2024-12-17T22:50:15.815263+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "d69ad378fab4de58c7236a72ce3101ee"
+    contributing component: exception
     component:
       system*
         exception*
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 5c700fd8356b1f..d05031a5039e86 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:29.115826+00:00'
+created: '2024-12-17T22:50:15.862401+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "9bb5de55b854491dacc677184c9b019a"
+    contributing component: exception
     component:
       system*
         exception*
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 853ee6f0385f5b..0695362a9c6bee 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:29.160875+00:00'
+created: '2024-12-17T22:50:15.913061+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "69d066e455243e7c5762b7522b430ca9"
+    contributing component: exception
     component:
       system*
         exception*
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 c1e8cff4f81cb4..d060fcc05ef697 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:29.212071+00:00'
+created: '2024-12-17T22:50:15.965960+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "418120a66f7031923031f5c52aca0724"
+    contributing component: exception
     component:
       app*
         exception*
@@ -43,6 +44,7 @@ contributing variants:
                 "log::__private_api_log"
   system*
     hash: "00719910980352c06ba93641057012e0"
+    contributing component: exception
     component:
       system*
         exception*
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 af138b5ce262c5..f5d07b309e0fe3 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:29.263528+00:00'
+created: '2024-12-17T22:50:16.015161+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "61d21e6d53c0837718af047c20e5e7ea"
+    contributing component: exception
     component:
       system*
         exception*
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 44778a0bd0a219..5feb9204c8453d 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:29.310156+00:00'
+created: '2024-12-17T22:50:16.065954+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "15d397771f229af8dc42783542f81dd4"
+    contributing component: exception
     component:
       system*
         exception*
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 947aacde1b7fbf..364cc744913719 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:29.359577+00:00'
+created: '2024-12-17T22:50:16.115524+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "c29439027eafcf7642f641554ab0f0ef"
+    contributing component: exception
     component:
       system*
         exception*
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 018c2a8a3743f6..4c63000d47c982 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:29.415325+00:00'
+created: '2024-12-17T22:50:16.167354+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "a20509269752c9a1bea6078851e4d39c"
+    contributing component: exception
     component:
       app*
         exception*
@@ -69,6 +70,7 @@ contributing variants:
             "Error"
   system*
     hash: "252dc79eb5653bf822e2684d90734cb8"
+    contributing component: exception
     component:
       system*
         exception*
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 f1e0f5d1156ac6..cb6cfad89e4203 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:29.505869+00:00'
+created: '2024-12-17T22:50:16.215889+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "b3d321fab1665166fb7cacfa975db4bb"
+    contributing component: exception
     component:
       system*
         exception*
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 54516bc6b2e089..0e41e548c882a8 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:29.559347+00:00'
+created: '2024-12-17T22:50:16.268586+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "c52ebcc2d9d0780a23c7d99831678830"
+    contributing component: chained-exception
     component:
       app*
         chained-exception*
@@ -42,6 +43,7 @@ contributing variants:
               "hello world"
   system*
     hash: "669cb6664e0f5fed38665da04e464f7e"
+    contributing component: chained-exception
     component:
       system*
         chained-exception*
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 29531cc2b1dd8b..60df4fb313b8b3 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:29.609632+00:00'
+created: '2024-12-17T22:50:16.322207+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "121caa876de75ec51bf72ed4c852cd75"
+    contributing component: exception
     component:
       app*
         exception*
@@ -47,6 +48,7 @@ contributing variants:
             "MultiValueDictKeyError"
   system*
     hash: "a5af2577d4caca8f983657c5d1919e14"
+    contributing component: exception
     component:
       system*
         exception*
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 58d630f278a081..03dd53be99e430 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:29.654804+00:00'
+created: '2024-12-17T22:50:16.374953+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "90888e813b09fa25061af2883c0fb9bd"
+    contributing component: exception
     component:
       system*
         exception*
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 c6530c2e1667cc..473ec569d27ac9 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:29.710266+00:00'
+created: '2024-12-17T22:50:16.427311+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "d59239f5aad3304d60beb1fde3369b78"
+    contributing component: exception
     component:
       app*
         exception*
@@ -47,6 +48,7 @@ contributing variants:
             "HTTPError"
   system*
     hash: "133db3f366b1327dab4e661f66dfb961"
+    contributing component: exception
     component:
       system*
         exception*
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 e470cf9da55b14..3afbce9e181d9a 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:29.766330+00:00'
+created: '2024-12-17T22:50:16.484363+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "73470e545e51eea9cff8a6c006f68f57"
+    contributing component: exception
     component:
       app*
         exception*
@@ -43,6 +44,7 @@ contributing variants:
             "TypeError"
   system*
     hash: "ecd413627f0d90a5a25cb28d1ba9c39f"
+    contributing component: exception
     component:
       system*
         exception*
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 d89f7d516843cb..53867455ec7c82 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:29.815686+00:00'
+created: '2024-12-17T22:50:16.526716+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "eb416f98479efa56a77c524602dc9979"
+    contributing component: stacktrace
     component:
       app*
         stacktrace*
@@ -33,6 +34,7 @@ contributing variants:
               "bar.m"
   system*
     hash: "1df786c8c266506e1acb6669c8df5154"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 80f10c590b31e4..dadef8162333fb 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:29.860511+00:00'
+created: '2024-12-17T22:50:16.576161+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "9bdadae4fa003cef6cf460ff1325e54b"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 714b48de735b4d..014f1d40343777 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:29.944177+00:00'
+created: '2024-12-17T22:50:16.626287+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "1effb24729ae4c43efa36b460511136a"
+    contributing component: stacktrace
     component:
       app*
         stacktrace*
@@ -33,6 +34,7 @@ contributing variants:
               "foo.py"
   system*
     hash: "659ad79e2e70c822d30a53d7d889529e"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 28086b8cd779a7..eaaa8b7d63e735 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:30.028613+00:00'
+created: '2024-12-17T22:50:16.724624+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "acbd18db4cc2f85cedef654fccc4a4d8"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 ed66355b0c0af8..1ec16261f4a15e 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:30.136377+00:00'
+created: '2024-12-17T22:50:16.830471+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "e0b4eea234ff891472cb927c00153bbe"
+    contributing component: exception
     component:
       system*
         exception*
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 674efff763b89d..f3df3ef8afd20d 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:30.187882+00:00'
+created: '2024-12-17T22:50:16.876290+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "cd2a9fd0cdaa8cd55ed22b101fc65882"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 05662c9ec6e0a1..af85555b671628 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:30.236776+00:00'
+created: '2024-12-17T22:50:16.925041+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "1effb24729ae4c43efa36b460511136a"
+    contributing component: stacktrace
     component:
       app*
         stacktrace*
@@ -33,6 +34,7 @@ contributing variants:
               "foo.py"
   system*
     hash: "659ad79e2e70c822d30a53d7d889529e"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 1bd820eb24e8e5..b09ba10da9efd8 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:30.287223+00:00'
+created: '2024-12-17T22:50:16.973630+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "c5da56c71b31f34c5880d734cbc8f5bb"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 b952f43b18c6b4..ac3d42b550ebbd 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:30.347787+00:00'
+created: '2024-12-17T22:50:17.025729+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "eb87c1031dba55b67df86fb9fff59dc6"
+    contributing component: exception
     component:
       system*
         exception*
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 40746f6a7dbed1..b29d253dcb135a 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:30.402085+00:00'
+created: '2024-12-17T22:50:17.068712+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "eb87c1031dba55b67df86fb9fff59dc6"
+    contributing component: exception
     component:
       app*
         exception*
@@ -36,6 +37,7 @@ contributing variants:
             "log_demo"
   system*
     hash: "e0b4eea234ff891472cb927c00153bbe"
+    contributing component: exception
     component:
       system*
         exception*
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 a38b090f0b8e48..934bbc94bd35f4 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:30.453332+00:00'
+created: '2024-12-17T22:50:17.116277+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "eb87c1031dba55b67df86fb9fff59dc6"
+    contributing component: exception
     component:
       app*
         exception*
@@ -36,6 +37,7 @@ contributing variants:
             "log_demo"
   system*
     hash: "9b33b65a645c66239cafcd276fcd0659"
+    contributing component: exception
     component:
       system*
         exception*
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 1e27c9c8c0bafe..d3dfbb2160da03 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:30.502059+00:00'
+created: '2024-12-17T22:50:17.161684+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "1effb24729ae4c43efa36b460511136a"
+    contributing component: stacktrace
     component:
       app*
         stacktrace*
@@ -33,6 +34,7 @@ contributing variants:
               "foo.py"
   system*
     hash: "659ad79e2e70c822d30a53d7d889529e"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 1739ce94b545b9..9ffc4bf2ea0796 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,5 +1,5 @@
 ---
-created: '2024-12-03T22:10:04.969069+00:00'
+created: '2024-12-17T22:50:17.207242+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -19,6 +19,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "1f5bdebe3c9f414c7dbb4296a8353245"
+    contributing component: template
     component:
       default*
         template*
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 da5c24af3842b4..0988aac39704f0 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:30.654787+00:00'
+created: '2024-12-17T22:50:17.260968+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -7,7 +7,7 @@ hash_basis: stacktrace
 hashing_metadata: {
   "num_stacktraces": 1,
   "stacktrace_location": "thread",
-  "stacktrace_type": "system"
+  "stacktrace_type": "in_app"
 }
 ---
 metrics with tags: {
@@ -18,15 +18,16 @@ metrics with tags: {
   "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
     "chained_exception": "False",
     "stacktrace_location": "thread",
-    "stacktrace_type": "system"
+    "stacktrace_type": "in_app"
   }
 }
 ---
 contributing variants:
-  system*
+  app*
     hash: "1a11687556cf74559f0ae90b1c87e2fd"
+    contributing component: threads
     component:
-      system*
+      app*
         threads*
           stacktrace*
             frame*
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 7496e22f389054..eda3df0a490fcb 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:30.774180+00:00'
+created: '2024-12-17T22:50:17.371396+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "a12d579fed7636c2a5d2fae110c95ce5"
+    contributing component: exception
     component:
       app*
         exception*
@@ -38,6 +39,7 @@ contributing variants:
             "NullReferenceException"
   system*
     hash: "c0dbeebf0430b3310ad1f7ceb48553a6"
+    contributing component: exception
     component:
       system*
         exception*
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 bb55de443e8c65..7f15cec913e29f 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:05.628125+00:00'
+created: '2024-12-17T22:49:50.870236+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -15,5 +15,6 @@ metrics with tags: {
 contributing variants:
   dogs*
     hash: "d41d8cd98f00b204e9800998ecf8427e"
+    contributing component: null
     component:
       not_a_known_component_type*
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 3767e5da56d48f..7ce4286fcc57c8 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:30.849294+00:00'
+created: '2024-12-17T22:50:17.441123+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "703d3dd9cb763e3f5037f659d27da947"
+    contributing component: exception
     component:
       app*
         exception*
@@ -274,6 +275,7 @@ contributing variants:
             "actix_web::pipeline"
   system*
     hash: "1df163ce3be65319df4fcc9cb34b60c1"
+    contributing component: exception
     component:
       system*
         exception*
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 cfb6fc34b65bba..f6ce6f851ab0c5 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:30.906017+00:00'
+created: '2024-12-17T22:50:17.501892+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "2e41d71bc38b212d73f8d68415389f45"
+    contributing component: exception
     component:
       system*
         exception*
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 51a7420e68f624..795bb3823d3a8e 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:30.955367+00:00'
+created: '2024-12-17T22:50:17.652963+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "228c649a3aa0901622c0a0e66ab0522c"
+    contributing component: exception
     component:
       app*
         exception*
@@ -43,6 +44,7 @@ contributing variants:
             "System.Exception"
   system*
     hash: "4ccd0f1953483581ba360c7518f90332"
+    contributing component: exception
     component:
       system*
         exception*
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 d1d9d82aa0eaa6..1a3aa622794c73 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:31.015019+00:00'
+created: '2024-12-17T22:50:17.730938+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "ff6c4ee7c54f118a9647ee86f0c2b0b0"
+    contributing component: threads
     component:
       app*
         threads*
@@ -37,6 +38,7 @@ contributing variants:
                 "__99+[Something else]_block_invoke_2"
   system*
     hash: "cff360e554b4acecd9fd2534d9051870"
+    contributing component: threads
     component:
       system*
         threads*
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 e52748ba930143..7fb7958e75d49f 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:31.062575+00:00'
+created: '2024-12-17T22:50:17.775832+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "d9c9b0f9ba46e32fddd7cd1512fad235"
+    contributing component: exception
     component:
       system*
         exception*
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 2a391788d5d0c9..c9be843d36a1c6 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:31.197479+00:00'
+created: '2024-12-17T22:50:17.877247+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "925057f3a51f4b7bf154e59a63eb3f86"
+    contributing component: exception
     component:
       system*
         exception*
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 4a243428eaf750..15ae237316cda0 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:31.123961+00:00'
+created: '2024-12-17T22:50:17.826149+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -29,6 +29,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "8cce12f1da956a1fd4e7c6078bc311fb"
+    contributing component: exception
     component:
       system*
         exception*
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 27aa6c756d27cb..1d9c80af4d1aab 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:31.273609+00:00'
+created: '2024-12-17T22:50:17.988354+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "e2ea2eb86d26407f06b59beb3a444c91"
+    contributing component: exception
     component:
       app*
         exception*
@@ -68,6 +69,7 @@ contributing variants:
             2
   system*
     hash: "d23d0dfeac5f1349ceb624b330670b25"
+    contributing component: exception
     component:
       system*
         exception*
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 91d3a4b93aa439..f044c2f214425b 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:31.360609+00:00'
+created: '2024-12-16T06:52:37.537801+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -17,9 +17,6 @@ metrics with tags: {
 }
 ---
 contributing variants:
-  checksum*
-    hash: "not a legit checksum"
-    checksum: "not a legit checksum"
   hashed_checksum*
     hash: "de46d023e69b171b90ccf3ebca7aede4"
     checksum: "de46d023e69b171b90ccf3ebca7aede4"
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
deleted file mode 100644
index c398a3e62376bd..00000000000000
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/checksum_no_regex_match_long.pysnap
+++ /dev/null
@@ -1,23 +0,0 @@
----
-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*
-    hash: "2c2e85a6e73109222f131228ed06a7af"
-    checksum: "2c2e85a6e73109222f131228ed06a7af"
-    raw_checksum: "not a legit checksum and also too long a string"
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 40a694a59709da..5ea5f3de355e9c 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:31.457868+00:00'
+created: '2024-12-17T22:50:18.154691+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "7b230a2bb8a040d3e337c6205147e990"
+    contributing component: threads
     component:
       app*
         threads*
@@ -49,6 +50,7 @@ contributing variants:
                 "closure"
   system*
     hash: "96df2174dd7e0ad3c31948a9de020fba"
+    contributing component: threads
     component:
       system*
         threads*
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 bb31b26d0d09b3..55a9a09b4a696b 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:31.510163+00:00'
+created: '2024-12-17T22:50:18.214178+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "6b059b9febc815ac18ac4d2082e38a9b"
+    contributing component: exception
     component:
       app*
         exception*
@@ -68,6 +69,7 @@ contributing variants:
             "ConnectionError"
   system*
     hash: "013d3477a774fe20c468dc8accd516f1"
+    contributing component: exception
     component:
       system*
         exception*
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 33be40ff6229b6..2423df7349fdf4 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:31.789855+00:00'
+created: '2024-12-17T22:50:18.658530+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "666766514295bb52812324097cdaf53e"
+    contributing component: csp
     component:
       default*
         csp*
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 bf6a5f256d636b..98e09de67b2fef 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:31.559557+00:00'
+created: '2024-12-17T22:50:18.259305+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "1742101e08eb1608f569751dfedd0062"
+    contributing component: csp
     component:
       default*
         csp*
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 549bd9fcb5c942..cbe9beff2ee60f 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:31.604719+00:00'
+created: '2024-12-17T22:50:18.312063+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "efddf1cde918097259aa7d4904fb1942"
+    contributing component: csp
     component:
       default*
         csp*
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 623f9f14c50cd1..eecabb11a6ac00 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:31.652514+00:00'
+created: '2024-12-17T22:50:18.360838+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "4e6f2bce9d121aa89f4dc5e5da08afb5"
+    contributing component: csp
     component:
       default*
         csp*
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
index dda80a559b6f6e..5e4ad4fa4e396e 100644
--- 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
@@ -1,5 +1,5 @@
 ---
-created: '2024-12-02T22:04:02.951839+00:00'
+created: '2024-12-17T22:50:18.419568+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -24,6 +24,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "56c6520f35bce2f89ed2c4e725ccef65"
+    contributing component: csp
     component:
       default*
         csp*
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
index c965d845ffd181..cbbffd29a71578 100644
--- 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
@@ -1,5 +1,5 @@
 ---
-created: '2024-12-02T22:04:05.851532+00:00'
+created: '2024-12-17T22:50:18.493842+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -24,6 +24,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "d346ee37d19a2be6587e609075ca2d57"
+    contributing component: csp
     component:
       default*
         csp*
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 22d4f523772196..b8b7efe3e47236 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:31.694937+00:00'
+created: '2024-12-17T22:50:18.553314+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "223cdacfe5b4b830dc700b5c18cc21b4"
+    contributing component: csp
     component:
       default*
         csp*
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 3ff33e2e42dce1..78cd7892983c7d 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:31.744339+00:00'
+created: '2024-12-17T22:50:18.605059+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "537a973f594c364842893e9a72af62a5"
+    contributing component: csp
     component:
       default*
         csp*
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 02882fa3cf7bfa..0bf61206e80c3b 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:32.049682+00:00'
+created: '2024-12-17T22:50:18.962201+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "029f3b967068b1539f96957b7c0451d7"
+    contributing component: exception
     component:
       app*
         exception*
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 98c0d66ece91f9..04a17940c8dce3 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,5 +1,5 @@
 ---
-created: '2024-12-03T22:10:05.151366+00:00'
+created: '2024-12-17T22:50:19.161785+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "b23ee1963904c2ca87b145febf94b66c"
+    contributing component: exception
     component:
       app*
         exception*
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 050c70f6e7af53..ef76bf0e8fc8f2 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:32.149626+00:00'
+created: '2024-12-17T22:50:19.063726+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -7,7 +7,7 @@ hash_basis: stacktrace
 hashing_metadata: {
   "num_stacktraces": 1,
   "stacktrace_location": "exception",
-  "stacktrace_type": "system"
+  "stacktrace_type": "in_app"
 }
 ---
 metrics with tags: {
@@ -18,15 +18,16 @@ metrics with tags: {
   "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
     "chained_exception": "False",
     "stacktrace_location": "exception",
-    "stacktrace_type": "system"
+    "stacktrace_type": "in_app"
   }
 }
 ---
 contributing variants:
-  system*
+  app*
     hash: "9509e122c6175606d52862fa4f64853c"
+    contributing component: exception
     component:
-      system*
+      app*
         exception*
           stacktrace*
             frame*
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 4f3062fb2e8251..f527a8ca695546 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:32.194315+00:00'
+created: '2024-12-17T22:50:19.105229+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -7,7 +7,7 @@ hash_basis: stacktrace
 hashing_metadata: {
   "num_stacktraces": 2,
   "stacktrace_location": "exception",
-  "stacktrace_type": "system"
+  "stacktrace_type": "in_app"
 }
 ---
 metrics with tags: {
@@ -18,15 +18,16 @@ metrics with tags: {
   "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
     "chained_exception": "True",
     "stacktrace_location": "exception",
-    "stacktrace_type": "system"
+    "stacktrace_type": "in_app"
   }
 }
 ---
 contributing variants:
-  system*
+  app*
     hash: "669cb6664e0f5fed38665da04e464f7e"
+    contributing component: chained-exception
     component:
-      system*
+      app*
         chained-exception*
           exception*
             stacktrace*
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 b69add68aede54..8e7159d66be942 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:32.471166+00:00'
+created: '2024-12-17T22:50:19.214962+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "e2bf1e0628b7b1824a9b63dec7a079a3"
+    contributing component: chained-exception
     component:
       app*
         chained-exception*
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 6b8480ad034224..41fc2c6d0aebda 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:32.525570+00:00'
+created: '2024-12-17T22:50:19.278643+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "a4f16891fa438620699cb2d9af5cc827"
+    contributing component: exception
     component:
       app*
         exception*
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 cece12d5c22dbc..ea2a9688b0248c 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:32.585243+00:00'
+created: '2024-12-17T22:50:19.329398+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "f0078a82f351095ba595daa7d493aa3c"
+    contributing component: chained-exception
     component:
       app*
         chained-exception*
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 58f3a6060e55a5..20667c7b63545f 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:32.661187+00:00'
+created: '2024-12-17T22:50:19.381426+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "0809098f9f613b63467605dd1739cc9b"
+    contributing component: exception
     component:
       app*
         exception*
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 fdc3f787552a48..a94651326f8504 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:32.719327+00:00'
+created: '2024-12-17T22:50:19.479707+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "0809098f9f613b63467605dd1739cc9b"
+    contributing component: exception
     component:
       app*
         exception*
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 86fa6aadb7ac8d..32fe0cd344990d 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:32.766339+00:00'
+created: '2024-12-17T22:50:19.524067+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "a4f16891fa438620699cb2d9af5cc827"
+    contributing component: exception
     component:
       app*
         exception*
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 f3614e6add10da..a05c613f4ae1ae 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:32.902250+00:00'
+created: '2024-12-17T22:50:19.585765+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "a4f16891fa438620699cb2d9af5cc827"
+    contributing component: exception
     component:
       app*
         exception*
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 e3e0c3b7582113..2b992bb9009d7c 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:32.953288+00:00'
+created: '2024-12-17T22:50:19.633612+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "17022e0561e9b6e6351723a08aa81b18"
+    contributing component: chained-exception
     component:
       app*
         chained-exception*
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 93ae9e5c7a093d..f573bc76709738 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:33.045089+00:00'
+created: '2024-12-17T22:50:19.730817+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "a4f16891fa438620699cb2d9af5cc827"
+    contributing component: exception
     component:
       app*
         exception*
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 a76ec11ab59bab..fc658afcdebb42 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:32.999034+00:00'
+created: '2024-12-17T22:50:19.684954+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "f0078a82f351095ba595daa7d493aa3c"
+    contributing component: chained-exception
     component:
       app*
         chained-exception*
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
index 0496631077bdf6..3f3f30714ead1d 100644
--- 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
@@ -1,5 +1,5 @@
 ---
-created: '2024-12-02T21:58:09.985157+00:00'
+created: '2024-12-17T22:50:19.783495+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "d505dfb9059ac63c11955233323a9100"
+    contributing component: chained-exception
     component:
       app*
         chained-exception*
@@ -58,6 +59,7 @@ contributing variants:
               "One or more errors occurred."
   system*
     hash: "4f9cc6a81f4eb34f9e917374f281b9dc"
+    contributing component: chained-exception
     component:
       system*
         chained-exception*
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 92858567b589fd..69af847cae6a16 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:33.134261+00:00'
+created: '2024-12-17T22:50:19.874256+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "bca604b98cb4637167eb6190a92e8933"
+    contributing component: chained-exception
     component:
       app*
         chained-exception*
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 d6717a0cff34f5..74462d1886c821 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:33.090809+00:00'
+created: '2024-12-17T22:50:19.829709+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "fca0fd23f09e8da4481304ef2a531100"
+    contributing component: chained-exception
     component:
       app*
         chained-exception*
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 43e9960e154e2d..6261577f39fd70 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:33.179847+00:00'
+created: '2024-12-17T22:50:19.928239+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "26552f86ca2368e708afa1df6effc1c5"
+    contributing component: exception
     component:
       system*
         exception*
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 e34a364a4b2622..11f2c3b13cb277 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:33.225472+00:00'
+created: '2024-12-17T22:50:19.977106+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "5eb63bbbe01eeed093cb22bb8f5acdc3"
+    contributing component: exception
     component:
       app*
         exception*
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 dfff3ddc19a5a6..0d91bb2d183a90 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:33.268091+00:00'
+created: '2024-12-17T22:50:20.031263+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "5a2cfd89b7b171fd7b4794b08023d04f"
+    contributing component: exception
     component:
       app*
         exception*
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 f94081a70a6d36..b9a90ceb10db50 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:33.322607+00:00'
+created: '2024-12-17T22:50:20.078711+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -22,6 +22,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "3d2933f4b5ec459ec8d569a398fd328c"
+    contributing component: expect-ct
     component:
       default*
         expect-ct*
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 cb8d7c1c9704c2..a008fcfa945642 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:33.459836+00:00'
+created: '2024-12-17T22:50:20.135495+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "b85897bf204fd8e90ff495b47502f281"
+    contributing component: exception
     component:
       system*
         exception*
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
index 109ff2387818f3..fa4fbdafc719e3 100644
--- 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
@@ -1,5 +1,5 @@
 ---
-created: '2024-12-03T22:10:05.190151+00:00'
+created: '2024-12-17T22:50:20.190914+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "526b64456c48836a46ec1a89544fd412"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 fa8d60f6e30155..828564e41f9ca8 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:33.682467+00:00'
+created: '2024-12-17T22:50:20.290224+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "d8f406c2efb312db2231282f94647b1d"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 e26288e3e0f7ee..78c4b99e07fcd9 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:33.741831+00:00'
+created: '2024-12-17T22:50:20.347014+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "91f42e615037e91a3c6f8a6fcf04056b"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 cf08e188914742..f000d424fa7b01 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:33.846160+00:00'
+created: '2024-12-17T22:50:20.392325+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "45c0b0a8c777e7a7040d7c39233a08a5"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 1a9e29faed696c..40fb54c0282c64 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:33.912446+00:00'
+created: '2024-12-17T22:50:20.448238+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -7,7 +7,7 @@ hash_basis: stacktrace
 hashing_metadata: {
   "num_stacktraces": 1,
   "stacktrace_location": "top-level",
-  "stacktrace_type": "system"
+  "stacktrace_type": "in_app"
 }
 ---
 metrics with tags: {
@@ -18,15 +18,16 @@ metrics with tags: {
   "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
     "chained_exception": "False",
     "stacktrace_location": "top-level",
-    "stacktrace_type": "system"
+    "stacktrace_type": "in_app"
   }
 }
 ---
 contributing variants:
-  system*
+  app*
     hash: "82639bcdd4eca16551e8cd3448f48ed4"
+    contributing component: stacktrace
     component:
-      system*
+      app*
         stacktrace*
           frame*
             filename*
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 69b6c594b8384d..a310ccc4a4905f 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:33.963099+00:00'
+created: '2024-12-17T22:50:20.501989+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "353e05904b48bd3ae4fa9623934a70d0"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 bb08978eea416b..ac60c38e90afa5 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:34.006518+00:00'
+created: '2024-12-17T22:50:20.573952+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "f771960161f86b1f8eec4edc3016e1c0"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 b2b72833e58cab..c5f59fe82e330e 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:34.072721+00:00'
+created: '2024-12-17T22:50:20.626222+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "be15ca3d511b96918e087c4f42503ca2"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 0e569ca7c8038c..67ae2254bc6163 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:34.134093+00:00'
+created: '2024-12-17T22:50:20.688768+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "e04dce7550635e05dbd7f656102cf304"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 021042f0786271..3a8f0efa854ef3 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:34.186837+00:00'
+created: '2024-12-17T22:50:20.745321+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "098f6bcd4621d373cade4e832627b4f6"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 bc46825296a51b..0146c80e93efdc 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:34.373958+00:00'
+created: '2024-12-17T22:50:20.973321+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "64a0e0a34d99dce03a8c5a4c237a4b5a"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 43bccf1b425e0c..68c13d991fec70 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:34.419505+00:00'
+created: '2024-12-17T22:50:21.030310+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "64a0e0a34d99dce03a8c5a4c237a4b5a"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 bc37fd7107f73d..7187d8fa31b6fc 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:34.472398+00:00'
+created: '2024-12-17T22:50:21.078574+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -7,7 +7,7 @@ hash_basis: stacktrace
 hashing_metadata: {
   "num_stacktraces": 1,
   "stacktrace_location": "top-level",
-  "stacktrace_type": "system"
+  "stacktrace_type": "in_app"
 }
 ---
 metrics with tags: {
@@ -18,15 +18,16 @@ metrics with tags: {
   "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
     "chained_exception": "False",
     "stacktrace_location": "top-level",
-    "stacktrace_type": "system"
+    "stacktrace_type": "in_app"
   }
 }
 ---
 contributing variants:
-  system*
+  app*
     hash: "e0e7c4713e9092dc77635d5a0d5db31d"
+    contributing component: stacktrace
     component:
-      system*
+      app*
         stacktrace*
           frame*
             module*
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 b47b60cfc953ce..865400bcf8c33a 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:34.523632+00:00'
+created: '2024-12-17T22:50:21.150799+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "a01e3a60f8863fd9dfc5697fae1eed46"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 98b0a42a924fef..ad567eba8727d4 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:34.592075+00:00'
+created: '2024-12-17T22:50:21.270419+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "be7f1b8b4014de623c533a8218dba5bd"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 eaea3ce53e8c12..06e63f7e3fb0c4 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:34.640474+00:00'
+created: '2024-12-17T22:50:21.316451+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "53b9e9679a8ea25880376080b76f98ad"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 c19e32992cf5a7..6ae65a2b47124a 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:34.777669+00:00'
+created: '2024-12-17T22:50:21.476374+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "538bdfd8d7bb2495d0d6429c3689a420"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 052ddfbec5dc18..49fbd9693dcf05 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:34.685887+00:00'
+created: '2024-12-17T22:50:21.362484+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "538bdfd8d7bb2495d0d6429c3689a420"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 75fd629dda735f..2b656e5178ea55 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:34.730208+00:00'
+created: '2024-12-17T22:50:21.410933+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "dc3d511120ce04996b1eef3496516e5c"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 67c7e0cadb8f49..192f332a30f153 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:34.837802+00:00'
+created: '2024-12-17T22:50:21.567286+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "0cc175b9c0f1b6a831c399e269772661"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 a34aa66a8dff70..1d33af5e95ab7e 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:34.946766+00:00'
+created: '2024-12-17T22:50:21.655207+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "30eb5001914d29dd8461898b5b8094fe"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 fe67802cba2d50..06cb0789461651 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:35.011870+00:00'
+created: '2024-12-17T22:50:21.705908+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -7,7 +7,7 @@ hash_basis: stacktrace
 hashing_metadata: {
   "num_stacktraces": 1,
   "stacktrace_location": "top-level",
-  "stacktrace_type": "system"
+  "stacktrace_type": "in_app"
 }
 ---
 metrics with tags: {
@@ -18,15 +18,16 @@ metrics with tags: {
   "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
     "chained_exception": "False",
     "stacktrace_location": "top-level",
-    "stacktrace_type": "system"
+    "stacktrace_type": "in_app"
   }
 }
 ---
 contributing variants:
-  system*
+  app*
     hash: "278cdd35be92e2ffde1d0a40524e7786"
+    contributing component: stacktrace
     component:
-      system*
+      app*
         stacktrace*
           frame*
             filename*
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 c7fd829d78cf22..9fce3796d6b0c1 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:35.057039+00:00'
+created: '2024-12-17T22:50:21.756278+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -7,7 +7,7 @@ hash_basis: stacktrace
 hashing_metadata: {
   "num_stacktraces": 1,
   "stacktrace_location": "top-level",
-  "stacktrace_type": "system"
+  "stacktrace_type": "in_app"
 }
 ---
 metrics with tags: {
@@ -18,15 +18,16 @@ metrics with tags: {
   "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
     "chained_exception": "False",
     "stacktrace_location": "top-level",
-    "stacktrace_type": "system"
+    "stacktrace_type": "in_app"
   }
 }
 ---
 contributing variants:
-  system*
+  app*
     hash: "d1fe4234d1bddc3823d08dcc529fb161"
+    contributing component: stacktrace
     component:
-      system*
+      app*
         stacktrace*
           frame*
             filename*
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 90e31c04151f70..32f8e3673fdacf 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:35.102683+00:00'
+created: '2024-12-17T22:50:21.802176+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -7,7 +7,7 @@ hash_basis: stacktrace
 hashing_metadata: {
   "num_stacktraces": 1,
   "stacktrace_location": "top-level",
-  "stacktrace_type": "system"
+  "stacktrace_type": "in_app"
 }
 ---
 metrics with tags: {
@@ -18,15 +18,16 @@ metrics with tags: {
   "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
     "chained_exception": "False",
     "stacktrace_location": "top-level",
-    "stacktrace_type": "system"
+    "stacktrace_type": "in_app"
   }
 }
 ---
 contributing variants:
-  system*
+  app*
     hash: "d1fe4234d1bddc3823d08dcc529fb161"
+    contributing component: stacktrace
     component:
-      system*
+      app*
         stacktrace*
           frame*
             filename*
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 609139d5bb5b12..52f4a573da8a40 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:35.210683+00:00'
+created: '2024-12-17T22:50:21.893089+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "07d1a8e5728b3c4c7aa8b8273fd0e753"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 2e7de15587c38b..bf4a87d22f6e04 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:35.163136+00:00'
+created: '2024-12-17T22:50:21.846400+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "09e0efcab18f545166318118ed4e0292"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 8c5a88e4b3418e..8533733c9aed9c 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:35.257324+00:00'
+created: '2024-12-17T22:50:21.945284+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "9bc326575875422d0d4ced3c35d9f916"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 3488bdbf24b916..6c6a812f64096c 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:35.309941+00:00'
+created: '2024-12-17T22:50:21.993177+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "27eed4125fc13d42163ddb0b8f357b48"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 36a8230b17c165..cf9a4d7fef772f 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:35.414132+00:00'
+created: '2024-12-17T22:50:22.041157+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "4067a71d7098866f87c746a57a77b2bb"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 7dc23601492671..d6776717f03a13 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:35.505400+00:00'
+created: '2024-12-17T22:50:22.136439+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "2f908c015ad77a50595512fcf65d344c"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 812ba0c3dca113..c96bbc52408899 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:35.459465+00:00'
+created: '2024-12-17T22:50:22.090888+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "2f908c015ad77a50595512fcf65d344c"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 f74dc193590878..5eeba83fcdcfd9 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:35.555098+00:00'
+created: '2024-12-17T22:50:22.182299+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "a972f399399f5566f39b14a7afdd24ff"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 45b226f8be1a5a..29de32ccb23c08 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:35.606018+00:00'
+created: '2024-12-17T22:50:22.229879+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "fb73cb54ced59b1c0c60d9bb40b7336b"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 80eeeb9108f49d..8c626848b1eebe 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:35.654634+00:00'
+created: '2024-12-17T22:50:22.278519+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "fb73cb54ced59b1c0c60d9bb40b7336b"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 c68b48d524f2e9..dc2c23c9b73ff5 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:35.703373+00:00'
+created: '2024-12-17T22:50:22.326796+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "acbd18db4cc2f85cedef654fccc4a4d8"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 4bc5716dd122c7..065577e30d9181 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:35.751066+00:00'
+created: '2024-12-17T22:50:22.374823+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "23db4a9e73800923f345d2b868993345"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 98cda1e4ac7c9b..4603639b81b7ea 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:35.798170+00:00'
+created: '2024-12-17T22:50:22.420344+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "1effb24729ae4c43efa36b460511136a"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 7551ce9ac9da91..2fbc9082ba9897 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:35.855695+00:00'
+created: '2024-12-17T22:50:22.474214+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "4b8bbc500bd2cabfcadc1f1be867e0bb"
+    contributing component: exception
     component:
       app*
         exception*
@@ -38,6 +39,7 @@ contributing variants:
             "*pq.Error"
   system*
     hash: "348fc4026c9fa11ffba8fbfa80a134c9"
+    contributing component: exception
     component:
       system*
         exception*
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 9f67f603e768d4..6df32714dd6775 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:35.917579+00:00'
+created: '2024-12-17T22:50:22.536016+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "725b26e5c390004cd0eca6018a7ad200"
+    contributing component: exception
     component:
       system*
         exception*
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 15df0481b96c59..251cb5556543b2 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:35.976386+00:00'
+created: '2024-12-17T22:50:22.590589+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "48a275d290e688b23878080257c9adc3"
+    contributing component: exception
     component:
       system*
         exception*
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 fd28709bc7bcd3..b548d3cfb48d3a 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:36.035337+00:00'
+created: '2024-12-17T22:50:22.642730+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "07fb068d9b0e76878c72b462ea20cab3"
+    contributing component: exception
     component:
       system*
         exception*
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 4fdcc6ffffe12a..7deb028f7eff4a 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:36.088462+00:00'
+created: '2024-12-17T22:50:22.695054+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "94d5c188bc82790c397f7f97d5239ee0"
+    contributing component: exception
     component:
       system*
         exception*
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 622cc4732ee9d9..75a82a1953475b 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:36.148988+00:00'
+created: '2024-12-17T22:50:22.755938+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "b77a07388ce12082423da4abee4415fc"
+    contributing component: exception
     component:
       system*
         exception*
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 2f60ace65d6dcc..5ca04d7097d093 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:36.205986+00:00'
+created: '2024-12-17T22:50:22.816010+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "76e54b047bb34b5d0ec6d210fcd8d995"
+    contributing component: exception
     component:
       system*
         exception*
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 ab1251e23ad9ae..14fa9f95aaefdb 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:36.256234+00:00'
+created: '2024-12-17T22:50:22.866892+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "b7c6253ad69f02d33e770f3050d72c88"
+    contributing component: exception
     component:
       system*
         exception*
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 7b55f21bacd82f..d2a134c0f013fd 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:36.315116+00:00'
+created: '2024-12-17T22:50:22.922766+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "12c4b5346b5242ec65d3153bb45937b0"
+    contributing component: exception
     component:
       system*
         exception*
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 f93429ec7660b7..e34a38506b73f6 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:36.387806+00:00'
+created: '2024-12-17T22:50:22.990631+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "57d5f9c178ebe1364226ed6c90d30174"
+    contributing component: exception
     component:
       system*
         exception*
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 891ea4515c0e67..4bed6441bf6343 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:36.454445+00:00'
+created: '2024-12-17T22:50:23.050073+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "51856c096282b824c59e92b79dda4eec"
+    contributing component: exception
     component:
       system*
         exception*
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 693dec720e3155..b634136f37c956 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:36.527932+00:00'
+created: '2024-12-17T22:50:23.110777+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "e4714f9479fea40111888ca143e02d8f"
+    contributing component: exception
     component:
       system*
         exception*
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 26a4ca38fb513c..c2c334f6d5e1bf 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:36.635411+00:00'
+created: '2024-12-17T22:50:23.156285+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "ba5ff7b8a3adc9b87681ff0f8275a72e"
+    contributing component: exception
     component:
       system*
         exception*
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 f6e716da3d9095..08f341702b5d9e 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:36.696215+00:00'
+created: '2024-12-17T22:50:23.213618+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "aeefa28dbbcc272df254d59c98aad03c"
+    contributing component: exception
     component:
       system*
         exception*
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 c31d4631764a1e..301bf624949565 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:36.750205+00:00'
+created: '2024-12-17T22:50:23.273094+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "50325a901e2db771dca1291283d8b54e"
+    contributing component: exception
     component:
       system*
         exception*
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 e51d5042df9497..e8403ee00a3138 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:36.809606+00:00'
+created: '2024-12-17T22:50:23.349128+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "2fa6bd4588d2ae97b62ef1f8db5b12bf"
+    contributing component: exception
     component:
       system*
         exception*
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 13f67c50a09daf..116139f202e046 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:36.859122+00:00'
+created: '2024-12-17T22:50:23.394590+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -22,6 +22,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "1e37a374cb33572622d02ff7a6237c44"
+    contributing component: hpkp
     component:
       default*
         hpkp*
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 f09614218e5b5c..bc85aec6d82ecb 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:36.904565+00:00'
+created: '2024-12-17T22:50:23.455346+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -27,6 +27,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "e3d593b4335190212ca7c18b8e967fb1"
+    contributing component: exception
     component:
       app*
         exception*
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 ad682e9344426d..2fffeee75bd6c9 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:36.956861+00:00'
+created: '2024-12-17T22:50:23.515776+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -30,6 +30,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "19163f3ca34f5995c69d85351ce3d697"
+    contributing component: exception
     component:
       app*
         exception*
@@ -124,6 +125,7 @@ contributing variants:
     values: ["{{ default }}","soft-timelimit-exceeded"]
   system*
     hash: "847950eb44d280e6758d136c763d6ddc"
+    contributing component: exception
     component:
       system*
         exception*
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 448a1829328f9d..e760eefc3d1415 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:37.053486+00:00'
+created: '2024-12-17T22:50:23.624660+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -27,6 +27,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "5b5ad5a0fbb4deb5e3fc631ce42681ae"
+    contributing component: exception
     component:
       app*
         exception*
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 f85bf49c042d5b..01bd3c83514e36 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:37.101644+00:00'
+created: '2024-12-17T22:50:23.728519+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -27,6 +27,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "c5578778212497f1ff3435405e2a4a98"
+    contributing component: exception
     component:
       app*
         exception*
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 77d9718b993540..c867eca01a1ea9 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:37.161626+00:00'
+created: '2024-12-17T22:50:23.811551+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "9b037f38798ea127aac3e8b8e1e1024a"
+    contributing component: exception
     component:
       app*
         exception*
@@ -106,6 +107,7 @@ contributing variants:
                 "value"
   system*
     hash: "fe8b15fe322c91ede2fc48363fe43587"
+    contributing component: exception
     component:
       system*
         exception*
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 9e62103502f0c6..9176111e72e01c 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:37.217018+00:00'
+created: '2024-12-17T22:50:23.916528+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "750486b8d8c51500fa0dfbb6f1577af0"
+    contributing component: chained-exception
     component:
       app*
         chained-exception*
@@ -49,6 +50,7 @@ contributing variants:
               "LifecycleException"
   system*
     hash: "8924849495809d42431719c2b9ab65c8"
+    contributing component: chained-exception
     component:
       system*
         chained-exception*
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 3caf8a50398ae7..9f0096e605fa11 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:37.329269+00:00'
+created: '2024-12-17T22:50:23.988198+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "ec87dd10e4f7512ecccb4a068c5774ae"
+    contributing component: exception
     component:
       system*
         exception*
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 537afad797888b..a7ff40784c4532 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:37.443171+00:00'
+created: '2024-12-17T22:50:24.111967+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "10dfd81e2df31e96fae451b9e205ad81"
+    contributing component: exception
     component:
       app*
         exception*
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 30aca82f308acd..5910452bf1728b 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:37.378246+00:00'
+created: '2024-12-17T22:50:24.063822+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "b8e2a347e75266ca7bb565e2b3c0722e"
+    contributing component: exception
     component:
       app*
         exception*
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 18b8f80b557ce0..54b6ad52c2e6ed 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:37.537271+00:00'
+created: '2024-12-17T22:50:24.164468+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "c0f3f7d6deb17aec9d07259ac684fad0"
+    contributing component: exception
     component:
       system*
         exception*
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 21788c9665f259..a7ace474983d85 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:37.665534+00:00'
+created: '2024-12-17T22:50:24.269939+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "4119639092e62c55ea8be348e4d9260d"
+    contributing component: message
     component:
       default*
         message*
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 4f5636fcbdaaa6..4763ebbdf43f51 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:37.605555+00:00'
+created: '2024-12-17T22:50:24.215420+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "f9e47f16e3b9770b440157179c47bf7a"
+    contributing component: message
     component:
       default*
         message* (stripped event-specific values)
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 fcea499cd88ebe..cf33ab78f89f72 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:37.754984+00:00'
+created: '2024-12-17T22:50:24.335844+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "838d9553ed824c45d9125f42ec408472"
+    contributing component: exception
     component:
       system*
         exception*
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 6df3b7b740f33f..abb93d99528416 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:37.846359+00:00'
+created: '2024-12-17T22:50:24.388956+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "6ab78545e13144405fb21dadb9045b91"
+    contributing component: exception
     component:
       system*
         exception*
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 cf37eb696e69a0..2c1b86cad27dd2 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:37.901500+00:00'
+created: '2024-12-17T22:50:24.436400+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "c63e8727af1a8fe75872b6a762797113"
+    contributing component: exception
     component:
       system*
         exception*
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 8cbac13d226b36..b4dfad31830696 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:37.969630+00:00'
+created: '2024-12-17T22:50:24.486316+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "c63e8727af1a8fe75872b6a762797113"
+    contributing component: exception
     component:
       system*
         exception*
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 439d7b35d8cc4d..c34d706f3c6683 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:38.037041+00:00'
+created: '2024-12-17T22:50:24.532856+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "c63e8727af1a8fe75872b6a762797113"
+    contributing component: exception
     component:
       system*
         exception*
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 9b26b0f03ce743..dca60a7d957188 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:38.102862+00:00'
+created: '2024-12-17T22:50:24.584249+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "b2602ad455472dede8e4c340d8a7eaba"
+    contributing component: exception
     component:
       system*
         exception*
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 2c245705321a69..cbcc783e3774d1 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:38.195089+00:00'
+created: '2024-12-17T22:50:24.632788+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "b2602ad455472dede8e4c340d8a7eaba"
+    contributing component: exception
     component:
       system*
         exception*
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 45904a96259ec3..dd79977468e485 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:38.312441+00:00'
+created: '2024-12-17T22:50:24.689408+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "b2602ad455472dede8e4c340d8a7eaba"
+    contributing component: exception
     component:
       system*
         exception*
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 0a5e5900c84265..039fb46c1cd564 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:38.470929+00:00'
+created: '2024-12-17T22:50:24.743937+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "b2602ad455472dede8e4c340d8a7eaba"
+    contributing component: exception
     component:
       system*
         exception*
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 18df5bfea74e93..481f2242699afd 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:38.546444+00:00'
+created: '2024-12-17T22:50:24.793231+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "c63e8727af1a8fe75872b6a762797113"
+    contributing component: exception
     component:
       system*
         exception*
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 421ea9809f0f1d..dd0eb212f42719 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:38.648731+00:00'
+created: '2024-12-17T22:50:24.844384+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "4a3cf3893b6485428dd02da116c8370e"
+    contributing component: exception
     component:
       app*
         exception*
@@ -53,6 +54,7 @@ contributing variants:
             "NotFoundError"
   system*
     hash: "d5456487ea8dccfe96c1968b19870978"
+    contributing component: exception
     component:
       system*
         exception*
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 9dbcff79c8c4b1..5de08cefa5b06e 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:38.765694+00:00'
+created: '2024-12-17T22:50:24.900766+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "4a3cf3893b6485428dd02da116c8370e"
+    contributing component: exception
     component:
       app*
         exception*
@@ -53,6 +54,7 @@ contributing variants:
             "NotFoundError"
   system*
     hash: "0b81da6ea3d7cc82b1d4825b7aac0b8d"
+    contributing component: exception
     component:
       system*
         exception*
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 2f46cc7eb9de98..ad9dcf788c758d 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:39.209980+00:00'
+created: '2024-12-17T22:50:25.018061+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "4665d486184740231357ab63f4543a8d"
+    contributing component: exception
     component:
       app*
         exception*
@@ -52,6 +53,7 @@ contributing variants:
             "Exception"
   system*
     hash: "107ed03036d901157372f260bc3df446"
+    contributing component: exception
     component:
       system*
         exception*
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 4ee2ca659fa882..748bd668e82b5f 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:39.019249+00:00'
+created: '2024-12-17T22:50:24.955492+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "a728cdf5d62c8e017c35c3fe04051b6e"
+    contributing component: exception
     component:
       app*
         exception*
@@ -38,6 +39,7 @@ contributing variants:
             "Exception"
   system*
     hash: "63c67781779781d9b0a442a5b2bdb976"
+    contributing component: exception
     component:
       system*
         exception*
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 4e13a405feb9d1..54641e951a8a03 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:39.335836+00:00'
+created: '2024-12-17T22:50:25.067805+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "8ec8bbc71eb6e2af7fbe5076a8534f96"
+    contributing component: message
     component:
       default*
         message*
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 8e42372949fcf7..6cfc23f11f72f7 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:39.516815+00:00'
+created: '2024-12-17T22:50:25.118705+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "329b29efcf1f77067a063e34f56e7791"
+    contributing component: message
     component:
       default*
         message*
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 6ffc6ec3ec41a5..f475318f48b665 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:39.612234+00:00'
+created: '2024-12-17T22:50:25.181103+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "6188cd480f18f1ce368de0500be00733"
+    contributing component: exception
     component:
       system*
         exception*
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 ed14cbeaca6120..b16ec9590bdd98 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:39.718570+00:00'
+created: '2024-12-17T22:50:25.242539+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "ab793fe47359148c7fc95f684bc5308d"
+    contributing component: exception
     component:
       system*
         exception*
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 54008b8ca316b8..cc43fc22f260f4 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:39.894724+00:00'
+created: '2024-12-17T22:50:25.305765+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "2f4ae73b88dbbc7e1cee4f86e270c4b4"
+    contributing component: exception
     component:
       system*
         exception*
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 bc5f587d8fcf61..1a89cfe2504de2 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:39.989711+00:00'
+created: '2024-12-17T22:50:25.349437+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "8ec8bbc71eb6e2af7fbe5076a8534f96"
+    contributing component: message
     component:
       default*
         message*
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 71b3bf2b076b8d..de58628b4fcc23 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:40.101691+00:00'
+created: '2024-12-17T22:50:25.396749+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "d3f5e52d24e9c1eae5abe6c866cced63"
+    contributing component: message
     component:
       default*
         message*
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 cd3286b96077ab..317eee62d53d31 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:40.201393+00:00'
+created: '2024-12-17T22:50:25.448659+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "d2ab1028e9cb44352a824e878951f412"
+    contributing component: message
     component:
       default*
         message* (stripped event-specific values)
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 a3411c75beae8c..2e2288685ec1c5 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:40.301034+00:00'
+created: '2024-12-17T22:50:25.500148+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "dcfcd48a02c100bbe4023cbc783054f0"
+    contributing component: exception
     component:
       system*
         exception*
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 f0608dc6d5ba26..013c07bf4b3c9e 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:40.410450+00:00'
+created: '2024-12-17T22:50:25.545736+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "61d21e6d53c0837718af047c20e5e7ea"
+    contributing component: exception
     component:
       system*
         exception*
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 d140856cbef7ad..2f93c410eb55b8 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:40.532039+00:00'
+created: '2024-12-17T22:50:25.601014+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "a6befffdc310c28b165bbceb1c0f59a8"
+    contributing component: exception
     component:
       system*
         exception*
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 b764cbe490e3bf..bc4bf3c157ee78 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:40.622610+00:00'
+created: '2024-12-17T22:50:25.650618+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "6fcc3bb4fac6aa6e81bb6d0faf40b0dd"
+    contributing component: exception
     component:
       system*
         exception*
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 108922d6e8d4a3..04517f6b373d13 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:40.701927+00:00'
+created: '2024-12-17T22:50:25.707909+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "d69ad378fab4de58c7236a72ce3101ee"
+    contributing component: exception
     component:
       system*
         exception*
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 b190edcbbdbb12..e91f0adaef0297 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:40.812027+00:00'
+created: '2024-12-17T22:50:25.754909+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "9bb5de55b854491dacc677184c9b019a"
+    contributing component: exception
     component:
       system*
         exception*
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 7893e354675a01..abd94eafff6bb6 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:40.908787+00:00'
+created: '2024-12-17T22:50:25.806864+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "69d066e455243e7c5762b7522b430ca9"
+    contributing component: exception
     component:
       system*
         exception*
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 b55e7dec21911c..bc396f39a2f370 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:41.014776+00:00'
+created: '2024-12-17T22:50:25.865586+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "418120a66f7031923031f5c52aca0724"
+    contributing component: exception
     component:
       app*
         exception*
@@ -43,6 +44,7 @@ contributing variants:
                 "log::__private_api_log"
   system*
     hash: "00719910980352c06ba93641057012e0"
+    contributing component: exception
     component:
       system*
         exception*
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 fc0f54c81431f8..8f3cb690ce188b 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:41.111184+00:00'
+created: '2024-12-17T22:50:25.925488+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "61d21e6d53c0837718af047c20e5e7ea"
+    contributing component: exception
     component:
       system*
         exception*
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 4bb271ad1ba1cc..8580903256f5b2 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:41.198406+00:00'
+created: '2024-12-17T22:50:25.978484+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "15d397771f229af8dc42783542f81dd4"
+    contributing component: exception
     component:
       system*
         exception*
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 67bdc444ad7dd4..6aa170999706c8 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:41.284008+00:00'
+created: '2024-12-17T22:50:26.036920+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "c29439027eafcf7642f641554ab0f0ef"
+    contributing component: exception
     component:
       system*
         exception*
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 a725346f8a3b84..300e1654f5b782 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:41.385616+00:00'
+created: '2024-12-17T22:50:26.087550+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "a20509269752c9a1bea6078851e4d39c"
+    contributing component: exception
     component:
       app*
         exception*
@@ -69,6 +70,7 @@ contributing variants:
             "Error"
   system*
     hash: "252dc79eb5653bf822e2684d90734cb8"
+    contributing component: exception
     component:
       system*
         exception*
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 55de54bac977b2..f25273cf60c22f 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:41.463705+00:00'
+created: '2024-12-17T22:50:26.135857+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "b3d321fab1665166fb7cacfa975db4bb"
+    contributing component: exception
     component:
       system*
         exception*
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 046307a1582149..f1c10c1d1d146d 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:41.555994+00:00'
+created: '2024-12-17T22:50:26.188227+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "c52ebcc2d9d0780a23c7d99831678830"
+    contributing component: chained-exception
     component:
       app*
         chained-exception*
@@ -42,6 +43,7 @@ contributing variants:
               "hello world"
   system*
     hash: "669cb6664e0f5fed38665da04e464f7e"
+    contributing component: chained-exception
     component:
       system*
         chained-exception*
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 5526c27dc302f2..9e149eb5c8ba60 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:41.644983+00:00'
+created: '2024-12-17T22:50:26.324665+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "121caa876de75ec51bf72ed4c852cd75"
+    contributing component: exception
     component:
       app*
         exception*
@@ -47,6 +48,7 @@ contributing variants:
             "MultiValueDictKeyError"
   system*
     hash: "a5af2577d4caca8f983657c5d1919e14"
+    contributing component: exception
     component:
       system*
         exception*
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 4b877d58604533..6586d1c2538f32 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:41.731679+00:00'
+created: '2024-12-17T22:50:26.384483+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "90888e813b09fa25061af2883c0fb9bd"
+    contributing component: exception
     component:
       system*
         exception*
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 44d6ee2409f4a5..501dfd2a6eef0f 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:41.803076+00:00'
+created: '2024-12-17T22:50:26.450462+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "d59239f5aad3304d60beb1fde3369b78"
+    contributing component: exception
     component:
       app*
         exception*
@@ -47,6 +48,7 @@ contributing variants:
             "HTTPError"
   system*
     hash: "133db3f366b1327dab4e661f66dfb961"
+    contributing component: exception
     component:
       system*
         exception*
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 81179de3a20ac9..8e77aeb134bf6d 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:41.899496+00:00'
+created: '2024-12-17T22:50:26.523398+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "73470e545e51eea9cff8a6c006f68f57"
+    contributing component: exception
     component:
       app*
         exception*
@@ -43,6 +44,7 @@ contributing variants:
             "TypeError"
   system*
     hash: "ecd413627f0d90a5a25cb28d1ba9c39f"
+    contributing component: exception
     component:
       system*
         exception*
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 acf7bacc8a0286..892e4b9e3583f9 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:41.997079+00:00'
+created: '2024-12-17T22:50:26.621504+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "eb416f98479efa56a77c524602dc9979"
+    contributing component: stacktrace
     component:
       app*
         stacktrace*
@@ -33,6 +34,7 @@ contributing variants:
               "bar.m"
   system*
     hash: "1df786c8c266506e1acb6669c8df5154"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 c5fddfbfe79a86..80bfb2565e5cd4 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:42.099520+00:00'
+created: '2024-12-17T22:50:26.680177+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "9bdadae4fa003cef6cf460ff1325e54b"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 850efd459d416a..9b2677f2bf2fea 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:42.167063+00:00'
+created: '2024-12-17T22:50:26.731176+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "1effb24729ae4c43efa36b460511136a"
+    contributing component: stacktrace
     component:
       app*
         stacktrace*
@@ -33,6 +34,7 @@ contributing variants:
               "foo.py"
   system*
     hash: "659ad79e2e70c822d30a53d7d889529e"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 16e93a007817e1..6ddd15df820854 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:42.357662+00:00'
+created: '2024-12-17T22:50:26.827237+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "acbd18db4cc2f85cedef654fccc4a4d8"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 082d2106dec580..eaf36a30ca1b9c 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:42.584110+00:00'
+created: '2024-12-17T22:50:26.921306+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "e0b4eea234ff891472cb927c00153bbe"
+    contributing component: exception
     component:
       system*
         exception*
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 df42f808cb68fe..1bdf9f0e2cc25b 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:42.753483+00:00'
+created: '2024-12-17T22:50:26.968389+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "cd2a9fd0cdaa8cd55ed22b101fc65882"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 387f54e74e0211..2246a950df3e3a 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:42.868256+00:00'
+created: '2024-12-17T22:50:27.016343+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "1effb24729ae4c43efa36b460511136a"
+    contributing component: stacktrace
     component:
       app*
         stacktrace*
@@ -33,6 +34,7 @@ contributing variants:
               "foo.py"
   system*
     hash: "659ad79e2e70c822d30a53d7d889529e"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 ef33efa494e191..520334d2f55a7f 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:42.953419+00:00'
+created: '2024-12-17T22:50:27.061491+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "c5da56c71b31f34c5880d734cbc8f5bb"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 bb892f05c4655f..853418872a61d3 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:43.063264+00:00'
+created: '2024-12-17T22:50:27.112303+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "eb87c1031dba55b67df86fb9fff59dc6"
+    contributing component: exception
     component:
       system*
         exception*
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 469562c39ba95d..1ab183cb04a1b1 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:43.107734+00:00'
+created: '2024-12-17T22:50:27.163863+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "eb87c1031dba55b67df86fb9fff59dc6"
+    contributing component: exception
     component:
       app*
         exception*
@@ -36,6 +37,7 @@ contributing variants:
             "log_demo"
   system*
     hash: "e0b4eea234ff891472cb927c00153bbe"
+    contributing component: exception
     component:
       system*
         exception*
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 c31c77b5d31b2c..177b0d1ef923cb 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:43.157397+00:00'
+created: '2024-12-17T22:50:27.213015+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "eb87c1031dba55b67df86fb9fff59dc6"
+    contributing component: exception
     component:
       app*
         exception*
@@ -36,6 +37,7 @@ contributing variants:
             "log_demo"
   system*
     hash: "9b33b65a645c66239cafcd276fcd0659"
+    contributing component: exception
     component:
       system*
         exception*
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 e98ee0579cca15..de520916e2c4ae 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:43.211231+00:00'
+created: '2024-12-17T22:50:27.260288+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "1effb24729ae4c43efa36b460511136a"
+    contributing component: stacktrace
     component:
       app*
         stacktrace*
@@ -33,6 +34,7 @@ contributing variants:
               "foo.py"
   system*
     hash: "659ad79e2e70c822d30a53d7d889529e"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 2f91de0228f10c..eefa932087450c 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,5 +1,5 @@
 ---
-created: '2024-12-03T22:10:05.277287+00:00'
+created: '2024-12-17T22:50:27.305681+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -19,6 +19,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "1f5bdebe3c9f414c7dbb4296a8353245"
+    contributing component: template
     component:
       default*
         template*
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 589c453bdd9a47..7d2dbe4324df8b 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:43.508299+00:00'
+created: '2024-12-17T22:50:27.352255+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -7,7 +7,7 @@ hash_basis: stacktrace
 hashing_metadata: {
   "num_stacktraces": 1,
   "stacktrace_location": "thread",
-  "stacktrace_type": "system"
+  "stacktrace_type": "in_app"
 }
 ---
 metrics with tags: {
@@ -18,15 +18,16 @@ metrics with tags: {
   "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
     "chained_exception": "False",
     "stacktrace_location": "thread",
-    "stacktrace_type": "system"
+    "stacktrace_type": "in_app"
   }
 }
 ---
 contributing variants:
-  system*
+  app*
     hash: "1a11687556cf74559f0ae90b1c87e2fd"
+    contributing component: threads
     component:
-      system*
+      app*
         threads*
           stacktrace*
             frame*
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 3e8703f9b41508..4b0bb3f8cd2f71 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:43.834994+00:00'
+created: '2024-12-17T22:50:27.448933+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "a12d579fed7636c2a5d2fae110c95ce5"
+    contributing component: exception
     component:
       app*
         exception*
@@ -38,6 +39,7 @@ contributing variants:
             "NullReferenceException"
   system*
     hash: "c0dbeebf0430b3310ad1f7ceb48553a6"
+    contributing component: exception
     component:
       system*
         exception*
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 33f30d99bdf581..5bd25138bfb350 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:07.343118+00:00'
+created: '2024-12-17T22:49:53.279452+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -15,5 +15,6 @@ metrics with tags: {
 contributing variants:
   dogs*
     hash: "d41d8cd98f00b204e9800998ecf8427e"
+    contributing component: null
     component:
       not_a_known_component_type*
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 b2d2fb81bf6a8b..8d5e6f575c9a8f 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:44.822771+00:00'
+created: '2024-12-17T22:50:27.523403+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "738e7d2503464bc264b4f791286f5122"
+    contributing component: exception
     component:
       app*
         exception*
@@ -271,6 +272,7 @@ contributing variants:
             "actix_web::pipeline"
   system*
     hash: "19a96e0438d28e48355653def82f887a"
+    contributing component: exception
     component:
       system*
         exception*
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 06854092d4910b..154a3fb937696d 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:45.367713+00:00'
+created: '2024-12-17T22:50:27.585766+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "2552498cfe69a6ddf1dcdde5440ce9c3"
+    contributing component: exception
     component:
       system*
         exception*
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 bf31a207460ff5..b7e2949a614f6d 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:45.472699+00:00'
+created: '2024-12-17T22:50:27.637008+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "228c649a3aa0901622c0a0e66ab0522c"
+    contributing component: exception
     component:
       app*
         exception*
@@ -43,6 +44,7 @@ contributing variants:
             "System.Exception"
   system*
     hash: "4ccd0f1953483581ba360c7518f90332"
+    contributing component: exception
     component:
       system*
         exception*
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 4eb0defa61a6ea..4289cfbe9163a0 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:45.563342+00:00'
+created: '2024-12-17T22:50:27.690072+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -7,7 +7,7 @@ hash_basis: stacktrace
 hashing_metadata: {
   "num_stacktraces": 1,
   "stacktrace_location": "thread",
-  "stacktrace_type": "system"
+  "stacktrace_type": "in_app"
 }
 ---
 metrics with tags: {
@@ -18,15 +18,16 @@ metrics with tags: {
   "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
     "chained_exception": "False",
     "stacktrace_location": "thread",
-    "stacktrace_type": "system"
+    "stacktrace_type": "in_app"
   }
 }
 ---
 contributing variants:
-  system*
+  app*
     hash: "ff6c4ee7c54f118a9647ee86f0c2b0b0"
+    contributing component: threads
     component:
-      system*
+      app*
         threads*
           stacktrace*
             frame* (marked in-app by stack trace rule (family:native package:**/Containers/Bundle/Application/** +app))
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 29b813773fdf10..78fd3a0a3e73f0 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:45.676142+00:00'
+created: '2024-12-17T22:50:27.750560+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "d9c9b0f9ba46e32fddd7cd1512fad235"
+    contributing component: exception
     component:
       system*
         exception*
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 ec76ab7bd70424..469a9f61f8beb7 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:48.992102+00:00'
+created: '2024-12-17T22:50:27.905648+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "4ef1fb44d656c3be2a146971f2a222dc"
+    contributing component: exception
     component:
       app*
         exception*
@@ -45,6 +46,7 @@ contributing variants:
             2
   system*
     hash: "47481871aa8d5ab5729cf2db78ce3032"
+    contributing component: exception
     component:
       system*
         exception*
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 a16e31c88378fd..193101cb0939e8 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:49.294388+00:00'
+created: '2024-12-16T06:52:49.496260+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -17,9 +17,6 @@ metrics with tags: {
 }
 ---
 contributing variants:
-  checksum*
-    hash: "not a legit checksum"
-    checksum: "not a legit checksum"
   hashed_checksum*
     hash: "de46d023e69b171b90ccf3ebca7aede4"
     checksum: "de46d023e69b171b90ccf3ebca7aede4"
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
deleted file mode 100644
index 9d6da06f4316d5..00000000000000
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/checksum_no_regex_match_long.pysnap
+++ /dev/null
@@ -1,23 +0,0 @@
----
-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*
-    hash: "2c2e85a6e73109222f131228ed06a7af"
-    checksum: "2c2e85a6e73109222f131228ed06a7af"
-    raw_checksum: "not a legit checksum and also too long a string"
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 ef6cb8772c9447..907acb3701109b 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:49.541003+00:00'
+created: '2024-12-17T22:50:28.069968+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "7c8a196d16b94be382add324be2605ee"
+    contributing component: threads
     component:
       app*
         threads*
@@ -43,6 +44,7 @@ contributing variants:
                 "SentrySetupInteractor.setupSentry"
   system*
     hash: "cd7f51d716fd57adc1a5ce1c112e538f"
+    contributing component: threads
     component:
       system*
         threads*
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 21571c8d3eccab..0afc74e6f93853 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:49.688160+00:00'
+created: '2024-12-17T22:50:28.121116+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "6b059b9febc815ac18ac4d2082e38a9b"
+    contributing component: exception
     component:
       app*
         exception*
@@ -68,6 +69,7 @@ contributing variants:
             "ConnectionError"
   system*
     hash: "013d3477a774fe20c468dc8accd516f1"
+    contributing component: exception
     component:
       system*
         exception*
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 5328feb0471dce..9eaaaf3fdfdccf 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:50.633069+00:00'
+created: '2024-12-17T22:50:28.517549+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "666766514295bb52812324097cdaf53e"
+    contributing component: csp
     component:
       default*
         csp*
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 d9fc0d52312c9e..cd3621f564956e 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:50.019371+00:00'
+created: '2024-12-17T22:50:28.164949+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "1742101e08eb1608f569751dfedd0062"
+    contributing component: csp
     component:
       default*
         csp*
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 effffac2a33136..8e2958bfb4784d 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:50.131020+00:00'
+created: '2024-12-17T22:50:28.211783+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "efddf1cde918097259aa7d4904fb1942"
+    contributing component: csp
     component:
       default*
         csp*
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 e18d15e4b87740..ca1818bcc319e2 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:50.283878+00:00'
+created: '2024-12-17T22:50:28.258600+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "4e6f2bce9d121aa89f4dc5e5da08afb5"
+    contributing component: csp
     component:
       default*
         csp*
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
index d1e4273b9abe08..6ec3747ec3ab81 100644
--- 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
@@ -1,5 +1,5 @@
 ---
-created: '2024-12-02T22:04:06.906409+00:00'
+created: '2024-12-17T22:50:28.302380+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -24,6 +24,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "56c6520f35bce2f89ed2c4e725ccef65"
+    contributing component: csp
     component:
       default*
         csp*
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
index bce6f2144a8af5..3dc38e3f2ce723 100644
--- 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
@@ -1,5 +1,5 @@
 ---
-created: '2024-12-02T22:04:08.131452+00:00'
+created: '2024-12-17T22:50:28.351573+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -24,6 +24,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "d346ee37d19a2be6587e609075ca2d57"
+    contributing component: csp
     component:
       default*
         csp*
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 69199fefb275d7..85db2365be250a 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:50.398687+00:00'
+created: '2024-12-17T22:50:28.405407+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "223cdacfe5b4b830dc700b5c18cc21b4"
+    contributing component: csp
     component:
       default*
         csp*
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 45373fcfd3e5e6..4a81d68b96c6f3 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:50.489726+00:00'
+created: '2024-12-17T22:50:28.470712+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "537a973f594c364842893e9a72af62a5"
+    contributing component: csp
     component:
       default*
         csp*
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 f4c51d49ba4331..1cff09a234dbcf 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:51.311554+00:00'
+created: '2024-12-17T22:50:28.895227+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "029f3b967068b1539f96957b7c0451d7"
+    contributing component: exception
     component:
       app*
         exception*
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 4fcc4c279c2344..79938dc6283282 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,5 +1,5 @@
 ---
-created: '2024-12-03T22:10:05.464644+00:00'
+created: '2024-12-17T22:50:30.102806+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "b23ee1963904c2ca87b145febf94b66c"
+    contributing component: exception
     component:
       app*
         exception*
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 6621421398b25a..10d51b9d416d97 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:51.463977+00:00'
+created: '2024-12-17T22:50:29.214470+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -7,7 +7,7 @@ hash_basis: stacktrace
 hashing_metadata: {
   "num_stacktraces": 1,
   "stacktrace_location": "exception",
-  "stacktrace_type": "system"
+  "stacktrace_type": "in_app"
 }
 ---
 metrics with tags: {
@@ -18,15 +18,16 @@ metrics with tags: {
   "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
     "chained_exception": "False",
     "stacktrace_location": "exception",
-    "stacktrace_type": "system"
+    "stacktrace_type": "in_app"
   }
 }
 ---
 contributing variants:
-  system*
+  app*
     hash: "9509e122c6175606d52862fa4f64853c"
+    contributing component: exception
     component:
-      system*
+      app*
         exception*
           stacktrace*
             frame*
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 7609a20a691b0e..92682b9998d466 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:51.544069+00:00'
+created: '2024-12-17T22:50:29.774348+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -7,7 +7,7 @@ hash_basis: stacktrace
 hashing_metadata: {
   "num_stacktraces": 2,
   "stacktrace_location": "exception",
-  "stacktrace_type": "system"
+  "stacktrace_type": "in_app"
 }
 ---
 metrics with tags: {
@@ -18,15 +18,16 @@ metrics with tags: {
   "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
     "chained_exception": "True",
     "stacktrace_location": "exception",
-    "stacktrace_type": "system"
+    "stacktrace_type": "in_app"
   }
 }
 ---
 contributing variants:
-  system*
+  app*
     hash: "669cb6664e0f5fed38665da04e464f7e"
+    contributing component: chained-exception
     component:
-      system*
+      app*
         chained-exception*
           exception*
             stacktrace*
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 4a837a7cba2aab..7dcef1859768ce 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:51.750608+00:00'
+created: '2024-12-17T22:50:30.322927+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "e2bf1e0628b7b1824a9b63dec7a079a3"
+    contributing component: chained-exception
     component:
       app*
         chained-exception*
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 caf17329c10891..99a38444d1c493 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:51.868975+00:00'
+created: '2024-12-17T22:50:30.451327+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "a4f16891fa438620699cb2d9af5cc827"
+    contributing component: exception
     component:
       app*
         exception*
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 9908ce0627f6f8..c10e05e5d39bfa 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:52.023070+00:00'
+created: '2024-12-17T22:50:30.532099+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "f0078a82f351095ba595daa7d493aa3c"
+    contributing component: chained-exception
     component:
       app*
         chained-exception*
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 5134c47c874dd0..73c9380c8fb0c7 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:52.224594+00:00'
+created: '2024-12-17T22:50:30.657790+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "0809098f9f613b63467605dd1739cc9b"
+    contributing component: exception
     component:
       app*
         exception*
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 1bb6d11de79828..82131e059d1a78 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:52.352459+00:00'
+created: '2024-12-17T22:50:30.752309+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "0809098f9f613b63467605dd1739cc9b"
+    contributing component: exception
     component:
       app*
         exception*
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 7ddb28433b5ec3..b1a666a7c21457 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:52.468099+00:00'
+created: '2024-12-17T22:50:30.830766+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "a4f16891fa438620699cb2d9af5cc827"
+    contributing component: exception
     component:
       app*
         exception*
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 9549b1cf6bdda8..d989b2b7ed4ee1 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:52.554092+00:00'
+created: '2024-12-17T22:50:30.907294+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "a4f16891fa438620699cb2d9af5cc827"
+    contributing component: exception
     component:
       app*
         exception*
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 645b0f7225f94f..66a14080e3f637 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:52.781322+00:00'
+created: '2024-12-17T22:50:30.982447+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "17022e0561e9b6e6351723a08aa81b18"
+    contributing component: chained-exception
     component:
       app*
         chained-exception*
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 5358705c8fff71..23eaab4c05deb5 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:53.025934+00:00'
+created: '2024-12-17T22:50:31.134838+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "a4f16891fa438620699cb2d9af5cc827"
+    contributing component: exception
     component:
       app*
         exception*
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 2876edb4ccaa20..02a6738d090bbf 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:52.945951+00:00'
+created: '2024-12-17T22:50:31.061381+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "f0078a82f351095ba595daa7d493aa3c"
+    contributing component: chained-exception
     component:
       app*
         chained-exception*
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
index a737ff87b91336..3e9049c4fffc48 100644
--- 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
@@ -1,5 +1,5 @@
 ---
-created: '2024-12-02T21:58:19.855037+00:00'
+created: '2024-12-17T22:50:31.209191+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "d505dfb9059ac63c11955233323a9100"
+    contributing component: chained-exception
     component:
       app*
         chained-exception*
@@ -58,6 +59,7 @@ contributing variants:
               "One or more errors occurred."
   system*
     hash: "4f9cc6a81f4eb34f9e917374f281b9dc"
+    contributing component: chained-exception
     component:
       system*
         chained-exception*
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 b6b72103505bbb..bb098817a67058 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:53.316463+00:00'
+created: '2024-12-17T22:50:31.388880+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "bca604b98cb4637167eb6190a92e8933"
+    contributing component: chained-exception
     component:
       app*
         chained-exception*
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 21638898ab4716..1030f1d0d05c46 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:53.183556+00:00'
+created: '2024-12-17T22:50:31.331309+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "fca0fd23f09e8da4481304ef2a531100"
+    contributing component: chained-exception
     component:
       app*
         chained-exception*
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 7685c93ae5411c..53d1c1da9399db 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:53.393226+00:00'
+created: '2024-12-17T22:50:31.468845+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "26552f86ca2368e708afa1df6effc1c5"
+    contributing component: exception
     component:
       system*
         exception*
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 4f0a42cb3d3483..9a4bc93bbdf77e 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:53.468288+00:00'
+created: '2024-12-17T22:50:31.585212+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "5eb63bbbe01eeed093cb22bb8f5acdc3"
+    contributing component: exception
     component:
       app*
         exception*
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 fe40b1f8106ec1..8974d556288ca3 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:53.560630+00:00'
+created: '2024-12-17T22:50:31.683152+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "5a2cfd89b7b171fd7b4794b08023d04f"
+    contributing component: exception
     component:
       app*
         exception*
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 291b58a65567b0..8bdf7511494cae 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:53.615998+00:00'
+created: '2024-12-17T22:50:31.761139+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -22,6 +22,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "3d2933f4b5ec459ec8d569a398fd328c"
+    contributing component: expect-ct
     component:
       default*
         expect-ct*
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 5e9ac065bd44ba..f8dcf03bec1104 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:53.680757+00:00'
+created: '2024-12-17T22:50:31.865839+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "87497299851e09febfecf4e84e0d45ba"
+    contributing component: exception
     component:
       system*
         exception*
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
index 1fb98cae6fc5e2..b3cd100a41d44e 100644
--- 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
@@ -1,5 +1,5 @@
 ---
-created: '2024-12-03T22:10:05.511276+00:00'
+created: '2024-12-17T22:50:31.946715+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "526b64456c48836a46ec1a89544fd412"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 4eceecf094fb60..a5a8073f2285f3 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:53.856246+00:00'
+created: '2024-12-17T22:50:32.164960+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "7d2cc7acbf90328200d960bf78a26234"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 edc85f8c9af27d..ba706314a47b50 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:53.906713+00:00'
+created: '2024-12-17T22:50:32.241026+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "465d672b2d322bf6a1b44499f6dabc1f"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 50acbc7406c767..3e96ee58eb9007 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:53.960104+00:00'
+created: '2024-12-17T22:50:32.314907+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "45c0b0a8c777e7a7040d7c39233a08a5"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 ce485a1480cf33..49f1b85d4f5dc8 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:54.090529+00:00'
+created: '2024-12-17T22:50:32.464870+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "353e05904b48bd3ae4fa9623934a70d0"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 faec66ef5f7aea..6c663d61edb9d1 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:54.140934+00:00'
+created: '2024-12-17T22:50:32.529829+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "0094f39fc617031afb6c655419f4a9f2"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 a87315677be3cc..d933bbc1e05f51 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:54.186631+00:00'
+created: '2024-12-17T22:50:32.605542+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "be15ca3d511b96918e087c4f42503ca2"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 7bd79843d55ada..e8aea4d8cdafbf 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:54.225605+00:00'
+created: '2024-12-17T22:50:32.695941+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "e04dce7550635e05dbd7f656102cf304"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 29eb4b8ecc9c0c..32a2302d0fac90 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:54.289844+00:00'
+created: '2024-12-17T22:50:32.784229+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "098f6bcd4621d373cade4e832627b4f6"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 43c62697496758..4312bdf39f1d45 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:54.397645+00:00'
+created: '2024-12-17T22:50:33.065634+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "64a0e0a34d99dce03a8c5a4c237a4b5a"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 40fa13cf45349f..271febec20dd6b 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:54.451609+00:00'
+created: '2024-12-17T22:50:33.231415+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "64a0e0a34d99dce03a8c5a4c237a4b5a"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 e5958b70baad8e..b5135031a2bf89 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:54.499729+00:00'
+created: '2024-12-17T22:50:33.326055+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "e0e7c4713e9092dc77635d5a0d5db31d"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 88de00f8b33d06..58a912ec78913f 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:54.558084+00:00'
+created: '2024-12-17T22:50:33.450199+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "c32a94349d9e9b72d31a46610c6c9589"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 30e01ccdc5efac..27b19cd11a5b69 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:54.620478+00:00'
+created: '2024-12-17T22:50:33.550925+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "be7f1b8b4014de623c533a8218dba5bd"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 466cec28dcccc7..024f9627397da7 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:54.701980+00:00'
+created: '2024-12-17T22:50:33.667461+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "53b9e9679a8ea25880376080b76f98ad"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 76dc97645cb73f..f00ca17e289739 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:54.979229+00:00'
+created: '2024-12-17T22:50:33.955214+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "538bdfd8d7bb2495d0d6429c3689a420"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 324185fd4b73cc..c3935135ebfcc1 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:54.847800+00:00'
+created: '2024-12-17T22:50:33.756196+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "538bdfd8d7bb2495d0d6429c3689a420"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 7c76c4491ae729..4f9ca9046024a4 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:54.914470+00:00'
+created: '2024-12-17T22:50:33.843690+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "dc3d511120ce04996b1eef3496516e5c"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 eb5ab08d01fce3..c3db7a18e5ce29 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:55.041774+00:00'
+created: '2024-12-17T22:50:34.097465+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "0cc175b9c0f1b6a831c399e269772661"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 be43dd6877885f..524318e87dcd44 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:55.178179+00:00'
+created: '2024-12-17T22:50:34.271532+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "30eb5001914d29dd8461898b5b8094fe"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 afe4cd881d5514..aefd38d4def31e 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:55.548548+00:00'
+created: '2024-12-17T22:50:34.780688+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "07d1a8e5728b3c4c7aa8b8273fd0e753"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 4afaafae2e53f8..3e465aecd2002c 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:55.476851+00:00'
+created: '2024-12-17T22:50:34.680917+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "09e0efcab18f545166318118ed4e0292"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 cf8b5b6af679b0..ae2dc6b0528d80 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:55.613856+00:00'
+created: '2024-12-17T22:50:34.874174+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "9bc326575875422d0d4ced3c35d9f916"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 be4fa6b9577c25..21c723af589d0c 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:55.678399+00:00'
+created: '2024-12-17T22:50:34.972855+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "27eed4125fc13d42163ddb0b8f357b48"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 49295c7fd77c66..5a190f68803606 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:55.747136+00:00'
+created: '2024-12-17T22:50:35.072534+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "4067a71d7098866f87c746a57a77b2bb"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 2d46bf9c93f023..8e386c650e4601 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:55.851110+00:00'
+created: '2024-12-17T22:50:35.249862+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "2f908c015ad77a50595512fcf65d344c"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 2bc581f4eec183..e28a0ee96e4e37 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:55.801858+00:00'
+created: '2024-12-17T22:50:35.155305+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "2f908c015ad77a50595512fcf65d344c"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 9266c05afaad35..7572854e3b7a95 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:55.894387+00:00'
+created: '2024-12-17T22:50:35.332931+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "a972f399399f5566f39b14a7afdd24ff"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 cbccff19e488c0..664c111cc81beb 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:55.939475+00:00'
+created: '2024-12-17T22:50:35.428086+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "fb73cb54ced59b1c0c60d9bb40b7336b"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 9dd9524259123e..3c7f08202ba3fb 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:55.985224+00:00'
+created: '2024-12-17T22:50:35.542349+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "fb73cb54ced59b1c0c60d9bb40b7336b"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 671507718860b4..0fb6c7bd47926c 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:56.028208+00:00'
+created: '2024-12-17T22:50:35.662197+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "acbd18db4cc2f85cedef654fccc4a4d8"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 3884a2a3f8a5aa..47e3eba282b6a3 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:56.071150+00:00'
+created: '2024-12-17T22:50:35.821780+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "23db4a9e73800923f345d2b868993345"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 8750b3eceaa6bc..d6af6f55e03ace 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:56.110590+00:00'
+created: '2024-12-17T22:50:35.910248+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "1effb24729ae4c43efa36b460511136a"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 79646d01e07f6c..0d74387b214345 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:56.157569+00:00'
+created: '2024-12-17T22:50:36.015733+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "4b8bbc500bd2cabfcadc1f1be867e0bb"
+    contributing component: exception
     component:
       app*
         exception*
@@ -38,6 +39,7 @@ contributing variants:
             "*pq.Error"
   system*
     hash: "348fc4026c9fa11ffba8fbfa80a134c9"
+    contributing component: exception
     component:
       system*
         exception*
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 8389669221dfe0..2e3d68dc55368f 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:56.215588+00:00'
+created: '2024-12-17T22:50:36.137154+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "3da34e8c72dbcd4a490ac36eb7130638"
+    contributing component: exception
     component:
       system*
         exception*
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 438385cf992340..2af32bd1a1db45 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:56.262831+00:00'
+created: '2024-12-17T22:50:36.269236+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "ca733a48a19d237df8577d09449095d9"
+    contributing component: exception
     component:
       system*
         exception*
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 1217c0c0d04d1d..6f758e393aa37a 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:56.319381+00:00'
+created: '2024-12-17T22:50:36.398165+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "2c1bbd635b64d5adccdb64a620044075"
+    contributing component: exception
     component:
       system*
         exception*
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 1c817221c5ad29..f5cc65d72986db 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:56.371910+00:00'
+created: '2024-12-17T22:50:36.603142+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "9c336f632f6764c0f082a6a66edbf22d"
+    contributing component: exception
     component:
       system*
         exception*
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 d31e2984ecec84..f4aaefc4d9af6c 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:56.424428+00:00'
+created: '2024-12-17T22:50:36.703004+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "49b6f72b6635cb43190c57ee56b026b0"
+    contributing component: exception
     component:
       system*
         exception*
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 de9a217c1aac4d..39df3d754a79c7 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:56.476472+00:00'
+created: '2024-12-17T22:50:36.803315+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "49b6f72b6635cb43190c57ee56b026b0"
+    contributing component: exception
     component:
       system*
         exception*
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 ee60f31e680a81..12de78af5c0512 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:56.524861+00:00'
+created: '2024-12-17T22:50:36.905369+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "aeed765d29d1a60cb094f66d2cd8efb2"
+    contributing component: exception
     component:
       system*
         exception*
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 61c49eeb681972..f3377ac75128f1 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:56.613261+00:00'
+created: '2024-12-17T22:50:37.082795+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "aeed765d29d1a60cb094f66d2cd8efb2"
+    contributing component: exception
     component:
       system*
         exception*
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 1376e2ba92de44..dbc856ca0817fd 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:56.666886+00:00'
+created: '2024-12-17T22:50:37.194449+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "8be5979a334287a1b47457228f1d4612"
+    contributing component: exception
     component:
       system*
         exception*
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 3168f0a187d490..d21f9a8c766a72 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:56.720711+00:00'
+created: '2024-12-17T22:50:37.308867+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "8be5979a334287a1b47457228f1d4612"
+    contributing component: exception
     component:
       system*
         exception*
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 dbf3f82d05ed7a..fedba2fd1b4827 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:56.775180+00:00'
+created: '2024-12-17T22:50:37.400920+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "7e64037e487c78ce0439f750a2ef503f"
+    contributing component: exception
     component:
       system*
         exception*
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 95ff278bc7b131..aa1030f5f1f838 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:56.830201+00:00'
+created: '2024-12-17T22:50:37.494215+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "aeed765d29d1a60cb094f66d2cd8efb2"
+    contributing component: exception
     component:
       system*
         exception*
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 23eea36f15ea36..7a04a41578175c 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:56.872599+00:00'
+created: '2024-12-17T22:50:37.588354+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "6148c73af04344a8597354711f5951ea"
+    contributing component: exception
     component:
       system*
         exception*
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 ed7947deece1a3..a74a0809e2d687 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:56.923586+00:00'
+created: '2024-12-17T22:50:37.684154+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "1056f62d72ff8b4d0c3842d696dbb10a"
+    contributing component: exception
     component:
       system*
         exception*
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 5c925175d309b9..4937e83d2220dc 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:56.978514+00:00'
+created: '2024-12-17T22:50:37.774733+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "15526a7b64e9b5dc6d89e7ebec864260"
+    contributing component: exception
     component:
       system*
         exception*
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 8e23028f9e7935..4b2952a82b480f 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:57.099292+00:00'
+created: '2024-12-17T22:50:37.994068+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -22,6 +22,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "1e37a374cb33572622d02ff7a6237c44"
+    contributing component: hpkp
     component:
       default*
         hpkp*
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 aaab44541fbf55..eb53a57fb00d95 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:57.146195+00:00'
+created: '2024-12-17T22:50:38.190496+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -27,6 +27,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "e3d593b4335190212ca7c18b8e967fb1"
+    contributing component: exception
     component:
       app*
         exception*
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 7a934d711a8689..72bdaa9e92d1e1 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:57.197218+00:00'
+created: '2024-12-17T22:50:38.265612+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -30,6 +30,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "19163f3ca34f5995c69d85351ce3d697"
+    contributing component: exception
     component:
       app*
         exception*
@@ -124,6 +125,7 @@ contributing variants:
     values: ["{{ default }}","soft-timelimit-exceeded"]
   system*
     hash: "847950eb44d280e6758d136c763d6ddc"
+    contributing component: exception
     component:
       system*
         exception*
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 1c3421d90d4eeb..033b03433f94a7 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:57.297791+00:00'
+created: '2024-12-17T22:50:38.413505+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -27,6 +27,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "5b5ad5a0fbb4deb5e3fc631ce42681ae"
+    contributing component: exception
     component:
       app*
         exception*
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 ca9dca37f16e15..3f64f78d84f400 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:57.351200+00:00'
+created: '2024-12-17T22:50:38.503161+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -27,6 +27,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "c5578778212497f1ff3435405e2a4a98"
+    contributing component: exception
     component:
       app*
         exception*
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 2cf2f862e4990b..182b63c0dd3a4d 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:57.404891+00:00'
+created: '2024-12-17T22:50:38.609666+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "5b032559156688c9eabe4e4bd5ae6bd4"
+    contributing component: exception
     component:
       app*
         exception*
@@ -91,6 +92,7 @@ contributing variants:
                 "value"
   system*
     hash: "1921b991270e24c19ea1ed6863892d71"
+    contributing component: exception
     component:
       system*
         exception*
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 227d2840c22456..2dedcb80531743 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:57.458132+00:00'
+created: '2024-12-17T22:50:38.713071+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "1959b227a7cf6acf7f3fd401b5d9f09b"
+    contributing component: chained-exception
     component:
       system*
         chained-exception*
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 cba22312c2fa13..9af8765009fe3c 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:57.511600+00:00'
+created: '2024-12-17T22:50:38.811522+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "ef2555bf7958ada8eefafbfdaed1c409"
+    contributing component: exception
     component:
       system*
         exception*
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 f36adef6f58a2e..9ea0485cf0d3bc 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:57.606455+00:00'
+created: '2024-12-17T22:50:38.984446+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "10dfd81e2df31e96fae451b9e205ad81"
+    contributing component: exception
     component:
       app*
         exception*
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 3477476c8983dc..a4a75d61f6bb41 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:57.559201+00:00'
+created: '2024-12-17T22:50:38.902308+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "b8e2a347e75266ca7bb565e2b3c0722e"
+    contributing component: exception
     component:
       app*
         exception*
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 30f3460225acd6..e3162edc06c1c8 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:57.701301+00:00'
+created: '2024-12-17T22:50:39.076175+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "c0f3f7d6deb17aec9d07259ac684fad0"
+    contributing component: exception
     component:
       system*
         exception*
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 5debdba8f71981..1c2384b80caab8 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:57.803953+00:00'
+created: '2024-12-17T22:50:39.248563+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "4119639092e62c55ea8be348e4d9260d"
+    contributing component: message
     component:
       default*
         message*
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 0caf7599af6cc2..0fd1fd611f75cd 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:57.749228+00:00'
+created: '2024-12-17T22:50:39.144829+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "f9e47f16e3b9770b440157179c47bf7a"
+    contributing component: message
     component:
       default*
         message* (stripped event-specific values)
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 64400fe37c4f5b..c1197cf8d58c81 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:57.855118+00:00'
+created: '2024-12-17T22:50:39.445707+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -21,10 +21,11 @@ metrics with tags: {
 }
 ---
 contributing variants:
-  system*
+  app*
     hash: "be36642f41f047346396f018f62375d3"
+    contributing component: exception
     component:
-      system*
+      app*
         exception*
           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 0c5c8d2c79b6dd..e5a58787c0f951 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:57.897530+00:00'
+created: '2024-12-17T22:50:39.514362+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "6ab78545e13144405fb21dadb9045b91"
+    contributing component: exception
     component:
       system*
         exception*
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 18ab07e987cbda..d13dd9e849a71a 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:57.943831+00:00'
+created: '2024-12-17T22:50:39.595523+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "c63e8727af1a8fe75872b6a762797113"
+    contributing component: exception
     component:
       system*
         exception*
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 96ee6ec61d6ade..b6172553aa06f1 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:57.982326+00:00'
+created: '2024-12-17T22:50:39.677590+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "c63e8727af1a8fe75872b6a762797113"
+    contributing component: exception
     component:
       system*
         exception*
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 ed9500dafe78d1..823627be923f49 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:58.032833+00:00'
+created: '2024-12-17T22:50:39.770204+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "c63e8727af1a8fe75872b6a762797113"
+    contributing component: exception
     component:
       system*
         exception*
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 b688a5401c905a..d89aa21891d0a8 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:58.075149+00:00'
+created: '2024-12-17T22:50:39.872332+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "b2602ad455472dede8e4c340d8a7eaba"
+    contributing component: exception
     component:
       system*
         exception*
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 54ffce403f6bde..44a1ad7047bb90 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:58.117673+00:00'
+created: '2024-12-17T22:50:39.983796+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "b2602ad455472dede8e4c340d8a7eaba"
+    contributing component: exception
     component:
       system*
         exception*
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 f61c0b1ee542e0..0b5dc37b8b143f 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:58.162381+00:00'
+created: '2024-12-17T22:50:40.097495+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "b2602ad455472dede8e4c340d8a7eaba"
+    contributing component: exception
     component:
       system*
         exception*
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 87f085e573f166..fbf44b7202e46a 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:58.210210+00:00'
+created: '2024-12-17T22:50:40.183768+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "b2602ad455472dede8e4c340d8a7eaba"
+    contributing component: exception
     component:
       system*
         exception*
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 9d54df31a31cbd..217608b60d6070 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:58.257308+00:00'
+created: '2024-12-17T22:50:40.295521+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "c63e8727af1a8fe75872b6a762797113"
+    contributing component: exception
     component:
       system*
         exception*
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 081ec1248f7969..d58969313d9bd7 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:58.367289+00:00'
+created: '2024-12-17T22:50:40.410488+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "4a3cf3893b6485428dd02da116c8370e"
+    contributing component: exception
     component:
       app*
         exception*
@@ -53,6 +54,7 @@ contributing variants:
             "NotFoundError"
   system*
     hash: "d5456487ea8dccfe96c1968b19870978"
+    contributing component: exception
     component:
       system*
         exception*
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 2d85e2fc0748db..1a5d08803d1e5b 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:58.418268+00:00'
+created: '2024-12-17T22:50:40.556436+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "4a3cf3893b6485428dd02da116c8370e"
+    contributing component: exception
     component:
       app*
         exception*
@@ -53,6 +54,7 @@ contributing variants:
             "NotFoundError"
   system*
     hash: "0b81da6ea3d7cc82b1d4825b7aac0b8d"
+    contributing component: exception
     component:
       system*
         exception*
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 0a85a66641e36d..e49d27c9b92eba 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:58.562438+00:00'
+created: '2024-12-17T22:50:40.765760+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "4665d486184740231357ab63f4543a8d"
+    contributing component: exception
     component:
       app*
         exception*
@@ -52,6 +53,7 @@ contributing variants:
             "Exception"
   system*
     hash: "107ed03036d901157372f260bc3df446"
+    contributing component: exception
     component:
       system*
         exception*
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 778dbf721d2dcb..d1faac004e5f40 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:58.505758+00:00'
+created: '2024-12-17T22:50:40.642957+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "a728cdf5d62c8e017c35c3fe04051b6e"
+    contributing component: exception
     component:
       app*
         exception*
@@ -38,6 +39,7 @@ contributing variants:
             "Exception"
   system*
     hash: "63c67781779781d9b0a442a5b2bdb976"
+    contributing component: exception
     component:
       system*
         exception*
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 0c7c036b1d2c34..b23f292b3f6427 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:58.602525+00:00'
+created: '2024-12-17T22:50:40.875625+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "8ec8bbc71eb6e2af7fbe5076a8534f96"
+    contributing component: message
     component:
       default*
         message*
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 18f8619a72c3c0..cba1ba0ab52cd1 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:58.644313+00:00'
+created: '2024-12-17T22:50:40.978341+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "329b29efcf1f77067a063e34f56e7791"
+    contributing component: message
     component:
       default*
         message*
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 838b2c7858d2cc..e4291fe9571fc5 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:58.696739+00:00'
+created: '2024-12-17T22:50:41.080358+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "b8baf791d22ac902d5f59a7eedd844fd"
+    contributing component: exception
     component:
       system*
         exception*
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 38367418108718..dd6e3dcbb1aab2 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:58.750966+00:00'
+created: '2024-12-17T22:50:41.224165+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "36be6e0b6123ef6ecfbef62f5cb88406"
+    contributing component: exception
     component:
       system*
         exception*
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 a8e9f16f4f5852..66eaaa516c7c4e 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:58.847999+00:00'
+created: '2024-12-17T22:50:41.336121+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "70b7b816193e06eb5d6649989fbaf605"
+    contributing component: exception
     component:
       system*
         exception*
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 02ac6a5a7953e0..c8648dddcfdebd 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:58.886251+00:00'
+created: '2024-12-17T22:50:41.434397+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "8ec8bbc71eb6e2af7fbe5076a8534f96"
+    contributing component: message
     component:
       default*
         message*
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 7a6c6d51e37a07..b3ade98270edc3 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:58.922597+00:00'
+created: '2024-12-17T22:50:41.480162+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "d3f5e52d24e9c1eae5abe6c866cced63"
+    contributing component: message
     component:
       default*
         message*
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 33c595f17ec827..8159432a95ce4e 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:58.965486+00:00'
+created: '2024-12-17T22:50:41.534351+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -23,6 +23,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "d2ab1028e9cb44352a824e878951f412"
+    contributing component: message
     component:
       default*
         message* (stripped event-specific values)
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 78159ba0566b7c..60c36b28f5ca8e 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:59.016589+00:00'
+created: '2024-12-17T22:50:41.591718+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "dcfcd48a02c100bbe4023cbc783054f0"
+    contributing component: exception
     component:
       system*
         exception*
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 0b0cf049fe4d3b..1349d0b415d6fa 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:59.057468+00:00'
+created: '2024-12-17T22:50:41.644202+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "9b78cced1eefcd0c655a0a3d8ce2cdd2"
+    contributing component: exception
     component:
       system*
         exception*
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 97bf3082462000..ae17a082ee4f09 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:59.104955+00:00'
+created: '2024-12-17T22:50:41.699703+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "2e0d26cae5986fcda5edf66612a78268"
+    contributing component: exception
     component:
       system*
         exception*
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 f1190d871cfae7..7bd1859c5d6fe2 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:59.149120+00:00'
+created: '2024-12-17T22:50:41.747913+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "c85e23e804b52ea4b9f290ba838e77a0"
+    contributing component: exception
     component:
       system*
         exception*
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 d1988d18b0b7a6..87810ea515c53a 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:59.192799+00:00'
+created: '2024-12-17T22:50:41.863234+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "784442a33bd16c15013bb8f69f68e7d6"
+    contributing component: exception
     component:
       system*
         exception*
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 6ffd00a2b97c54..0c8422c19d4c41 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:59.234071+00:00'
+created: '2024-12-17T22:50:41.919971+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "8f4c7709e4af98d3c47ce3519690e6d9"
+    contributing component: exception
     component:
       system*
         exception*
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 ee18be964b0ea8..7636bfef4ff091 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:59.285778+00:00'
+created: '2024-12-17T22:50:41.985200+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "3ff01ce959249abecc6bc8a8f1432b0b"
+    contributing component: exception
     component:
       system*
         exception*
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 85ecd5a8c1c144..2e1b4e1df64c01 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:59.348565+00:00'
+created: '2024-12-17T22:50:42.047452+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "418120a66f7031923031f5c52aca0724"
+    contributing component: exception
     component:
       app*
         exception*
@@ -43,6 +44,7 @@ contributing variants:
                 "log::__private_api_log"
   system*
     hash: "bbcdb2e1d8df09ffe0fffd30fb361d4b"
+    contributing component: exception
     component:
       system*
         exception*
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 83313ae5479915..a7ea2cc3413af1 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:59.399299+00:00'
+created: '2024-12-17T22:50:42.110455+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "9b78cced1eefcd0c655a0a3d8ce2cdd2"
+    contributing component: exception
     component:
       system*
         exception*
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 cfaabdf3c97fd4..52ed35dbba3108 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:59.450537+00:00'
+created: '2024-12-17T22:50:42.222768+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "46b84e4da51648cc9f9741abd2bdad51"
+    contributing component: exception
     component:
       system*
         exception*
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 41f966f5b4bc6d..23447df51a4804 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:59.503185+00:00'
+created: '2024-12-17T22:50:42.292602+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "c29439027eafcf7642f641554ab0f0ef"
+    contributing component: exception
     component:
       system*
         exception*
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 582dfadc6421ff..f6c97034a68996 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:59.551998+00:00'
+created: '2024-12-17T22:50:42.442060+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "a20509269752c9a1bea6078851e4d39c"
+    contributing component: exception
     component:
       app*
         exception*
@@ -69,6 +70,7 @@ contributing variants:
             "Error"
   system*
     hash: "252dc79eb5653bf822e2684d90734cb8"
+    contributing component: exception
     component:
       system*
         exception*
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 96a0a532f10bff..6bf0bdf10953d0 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:59.597452+00:00'
+created: '2024-12-17T22:50:42.536533+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -21,10 +21,11 @@ metrics with tags: {
 }
 ---
 contributing variants:
-  system*
+  app*
     hash: "be36642f41f047346396f018f62375d3"
+    contributing component: exception
     component:
-      system*
+      app*
         exception*
           type*
             "Error"
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 cb29f390b4ab83..ac0d9e7decc220 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:59.649976+00:00'
+created: '2024-12-17T22:50:42.635138+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "c52ebcc2d9d0780a23c7d99831678830"
+    contributing component: chained-exception
     component:
       app*
         chained-exception*
@@ -42,6 +43,7 @@ contributing variants:
               "hello world"
   system*
     hash: "669cb6664e0f5fed38665da04e464f7e"
+    contributing component: chained-exception
     component:
       system*
         chained-exception*
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 30871d77b62307..9e6b596a5f0391 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:59.698423+00:00'
+created: '2024-12-17T22:50:42.731458+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "121caa876de75ec51bf72ed4c852cd75"
+    contributing component: exception
     component:
       app*
         exception*
@@ -47,6 +48,7 @@ contributing variants:
             "MultiValueDictKeyError"
   system*
     hash: "a5af2577d4caca8f983657c5d1919e14"
+    contributing component: exception
     component:
       system*
         exception*
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 6a15e0e440317d..e1464c3f201ff3 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:59.746430+00:00'
+created: '2024-12-17T22:50:42.815332+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "90888e813b09fa25061af2883c0fb9bd"
+    contributing component: exception
     component:
       system*
         exception*
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 d3d063620dfced..eaefc1f5919243 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:59.784911+00:00'
+created: '2024-12-17T22:50:42.859502+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "d59239f5aad3304d60beb1fde3369b78"
+    contributing component: exception
     component:
       app*
         exception*
@@ -47,6 +48,7 @@ contributing variants:
             "HTTPError"
   system*
     hash: "133db3f366b1327dab4e661f66dfb961"
+    contributing component: exception
     component:
       system*
         exception*
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 38eb53d4a65a27..e1bc220fb5697b 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:59.841725+00:00'
+created: '2024-12-17T22:50:42.954035+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "73470e545e51eea9cff8a6c006f68f57"
+    contributing component: exception
     component:
       app*
         exception*
@@ -43,6 +44,7 @@ contributing variants:
             "TypeError"
   system*
     hash: "ecd413627f0d90a5a25cb28d1ba9c39f"
+    contributing component: exception
     component:
       system*
         exception*
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 4f233f08d4a26b..673678344a380c 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:59.879991+00:00'
+created: '2024-12-17T22:50:42.996398+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "eb416f98479efa56a77c524602dc9979"
+    contributing component: stacktrace
     component:
       app*
         stacktrace*
@@ -33,6 +34,7 @@ contributing variants:
               "bar.m"
   system*
     hash: "1df786c8c266506e1acb6669c8df5154"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 d0d0248aee5205..af8e146f714e33 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:59.920207+00:00'
+created: '2024-12-17T22:50:43.046182+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "9bdadae4fa003cef6cf460ff1325e54b"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 c03bc5f11dac7f..5c6f3f8265ee06 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:59.962902+00:00'
+created: '2024-12-17T22:50:43.091123+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "1effb24729ae4c43efa36b460511136a"
+    contributing component: stacktrace
     component:
       app*
         stacktrace*
@@ -33,6 +34,7 @@ contributing variants:
               "foo.py"
   system*
     hash: "659ad79e2e70c822d30a53d7d889529e"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 e987de68df316d..dce3d7bb1dee00 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:27:00.058732+00:00'
+created: '2024-12-17T22:50:43.186747+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "acbd18db4cc2f85cedef654fccc4a4d8"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 d6fde06a3f27cd..e6ba283444ff95 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:27:00.149951+00:00'
+created: '2024-12-17T22:50:43.286038+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "cb57cfc73cc622c2ac1386c9ea531fb9"
+    contributing component: exception
     component:
       system*
         exception*
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 494f9bb72b7396..c4bffb634a08a7 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:27:00.187754+00:00'
+created: '2024-12-17T22:50:43.332530+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "cd2a9fd0cdaa8cd55ed22b101fc65882"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 7a8fa4839b9231..6f8e02a2b447e1 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:27:00.226303+00:00'
+created: '2024-12-17T22:50:43.379151+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "1effb24729ae4c43efa36b460511136a"
+    contributing component: stacktrace
     component:
       app*
         stacktrace*
@@ -33,6 +34,7 @@ contributing variants:
               "foo.py"
   system*
     hash: "659ad79e2e70c822d30a53d7d889529e"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 344c5a64287a2c..aecc7b3ceffbf8 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:27:00.271024+00:00'
+created: '2024-12-17T22:50:43.427960+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "c5da56c71b31f34c5880d734cbc8f5bb"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 66d58cbd0aced6..90c5044ceea836 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:27:00.319570+00:00'
+created: '2024-12-17T22:50:43.482286+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   system*
     hash: "eb87c1031dba55b67df86fb9fff59dc6"
+    contributing component: exception
     component:
       system*
         exception*
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 5c7d08efe6025b..0b7f0946b6163e 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:27:00.369741+00:00'
+created: '2024-12-17T22:50:43.536839+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "eb87c1031dba55b67df86fb9fff59dc6"
+    contributing component: exception
     component:
       app*
         exception*
@@ -36,6 +37,7 @@ contributing variants:
             "log_demo"
   system*
     hash: "cb57cfc73cc622c2ac1386c9ea531fb9"
+    contributing component: exception
     component:
       system*
         exception*
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 953c385ee2ca97..a2cc458f85f1d0 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:27:00.420945+00:00'
+created: '2024-12-17T22:50:43.587959+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "eb87c1031dba55b67df86fb9fff59dc6"
+    contributing component: exception
     component:
       app*
         exception*
@@ -36,6 +37,7 @@ contributing variants:
             "log_demo"
   system*
     hash: "0817e4e604fbe88c4534eff166df1db9"
+    contributing component: exception
     component:
       system*
         exception*
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 0036ce8dbe73b6..f68e0aa427695e 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:27:00.515636+00:00'
+created: '2024-12-17T22:50:43.633867+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "1effb24729ae4c43efa36b460511136a"
+    contributing component: stacktrace
     component:
       app*
         stacktrace*
@@ -33,6 +34,7 @@ contributing variants:
               "foo.py"
   system*
     hash: "659ad79e2e70c822d30a53d7d889529e"
+    contributing component: stacktrace
     component:
       system*
         stacktrace*
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 37e9dadd200dc0..28a15ea2ef6950 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,5 +1,5 @@
 ---
-created: '2024-12-03T22:10:05.596686+00:00'
+created: '2024-12-17T22:50:43.680038+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -19,6 +19,7 @@ metrics with tags: {
 contributing variants:
   default*
     hash: "1f5bdebe3c9f414c7dbb4296a8353245"
+    contributing component: template
     component:
       default*
         template*
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 26b46a96f74ba3..baeb9397550e73 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:27:00.622664+00:00'
+created: '2024-12-17T22:50:43.726962+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -7,7 +7,7 @@ hash_basis: stacktrace
 hashing_metadata: {
   "num_stacktraces": 1,
   "stacktrace_location": "thread",
-  "stacktrace_type": "system"
+  "stacktrace_type": "in_app"
 }
 ---
 metrics with tags: {
@@ -18,15 +18,16 @@ metrics with tags: {
   "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
     "chained_exception": "False",
     "stacktrace_location": "thread",
-    "stacktrace_type": "system"
+    "stacktrace_type": "in_app"
   }
 }
 ---
 contributing variants:
-  system*
+  app*
     hash: "1a11687556cf74559f0ae90b1c87e2fd"
+    contributing component: threads
     component:
-      system*
+      app*
         threads*
           stacktrace*
             frame*
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 a86a24614b3bb1..917fb8f62b51e0 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:27:00.719264+00:00'
+created: '2024-12-17T22:50:43.843896+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -25,6 +25,7 @@ metrics with tags: {
 contributing variants:
   app*
     hash: "a12d579fed7636c2a5d2fae110c95ce5"
+    contributing component: exception
     component:
       app*
         exception*
@@ -38,6 +39,7 @@ contributing variants:
             "NullReferenceException"
   system*
     hash: "c0dbeebf0430b3310ad1f7ceb48553a6"
+    contributing component: exception
     component:
       system*
         exception*
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 80ece84c6a0d6b..47e8e3d9b6c576 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,5 +1,5 @@
 ---
-created: '2024-11-20T21:26:09.148439+00:00'
+created: '2024-12-17T22:49:55.671362+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
@@ -15,5 +15,6 @@ metrics with tags: {
 contributing variants:
   dogs*
     hash: "d41d8cd98f00b204e9800998ecf8427e"
+    contributing component: null
     component:
       not_a_known_component_type*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/actix.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/actix.pysnap
index 83bdd769545c50..d13071e9cd4f4f 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/actix.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/actix.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-03-31T11:22:50.736722Z'
+created: '2024-12-17T22:46:34.915885+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "c9dc61e20bb252c9ec1e28a75f015132"
+  contributing component: exception
   component:
     app*
       exception*
@@ -547,6 +548,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "4796dda6f2cfa81ec7862cd24bcfb58e"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/android_anr.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/android_anr.pysnap
index 1f1b3c09d9950e..6becbac601104e 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/android_anr.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/android_anr.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-04-02T09:10:50.905917Z'
+created: '2024-12-17T22:46:35.051994+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -1004,6 +1005,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "2e41d71bc38b212d73f8d68415389f45"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/aspnetcore.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/aspnetcore.pysnap
index 3f90dff3b0a541..060299b2fbe294 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/aspnetcore.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/aspnetcore.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:26.384585Z'
+created: '2024-12-17T22:46:35.168053+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -236,6 +237,7 @@ app:
 --------------------------------------------------------------------------
 default:
   hash: null
+  contributing component: null
   component:
     default (exception of system takes precedence)
       message (exception of system takes precedence)
@@ -243,6 +245,7 @@ default:
 --------------------------------------------------------------------------
 system:
   hash: "13dfa104801704079b63004347f8fae6"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/block_invoke.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/block_invoke.pysnap
index 9b24347c451f42..3a28edb2a76faa 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/block_invoke.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/block_invoke.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-03-22T11:57:23.290728+00:00'
+created: '2024-12-17T22:46:35.210768+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (logentry takes precedence)
       threads
@@ -21,6 +22,7 @@ app:
 --------------------------------------------------------------------------
 default:
   hash: "1356c67d7ad1638d816bfb822dd2c25d"
+  contributing component: message
   component:
     default*
       message*
@@ -28,6 +30,7 @@ default:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: null
   component:
     system (logentry takes precedence)
       threads
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/bugly.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/bugly.pysnap
index 84583f5d273ad7..6470a97fe595e3 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/bugly.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/bugly.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-07-12T13:33:39.580522Z'
+created: '2024-12-17T22:46:35.261070+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -30,6 +31,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "8ecc10ce70f427a50370968e7271fa51"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/built_in_fingerprint_chunkload_error.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/built_in_fingerprint_chunkload_error.pysnap
index 1f70c514a89d01..639c6e0c1a4406 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/built_in_fingerprint_chunkload_error.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/built_in_fingerprint_chunkload_error.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-15T17:06:33.430647+00:00'
+created: '2024-12-17T22:46:35.396801+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -25,6 +26,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "925057f3a51f4b7bf154e59a63eb3f86"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/built_in_fingerprint_chunkload_error_hybrid_fingerprint.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/built_in_fingerprint_chunkload_error_hybrid_fingerprint.pysnap
index 34e48f3d943bc3..062dbc97f6ceab 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/built_in_fingerprint_chunkload_error_hybrid_fingerprint.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/built_in_fingerprint_chunkload_error_hybrid_fingerprint.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-15T17:23:20.437594+00:00'
+created: '2024-12-17T22:46:35.314432+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -27,6 +28,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "8cce12f1da956a1fd4e7c6078bc311fb"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/callee_guaranteed.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/callee_guaranteed.pysnap
index 03d67e9e0f619e..14792c97ff2bf9 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/callee_guaranteed.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/callee_guaranteed.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-07-08T10:36:04.055616Z'
+created: '2024-12-17T22:46:35.442713+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -125,6 +126,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "211e972054c29fae035071309ac474aa"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/checksum_no_regex_match.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/checksum_no_regex_match.pysnap
index 6adb096639e7d3..f72f6a77e66d0f 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/checksum_no_regex_match.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/checksum_no_regex_match.pysnap
@@ -1,12 +1,8 @@
 ---
-created: '2024-11-08T18:04:20.848101+00:00'
+created: '2024-12-16T06:50:24.051451+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
-checksum:
-  hash: "not a legit checksum"
-  checksum: "not a legit checksum"
---------------------------------------------------------------------------
 hashed_checksum:
   hash: "de46d023e69b171b90ccf3ebca7aede4"
   checksum: "de46d023e69b171b90ccf3ebca7aede4"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/checksum_no_regex_match_long.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/checksum_no_regex_match_long.pysnap
deleted file mode 100644
index d647f7baf6989f..00000000000000
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/checksum_no_regex_match_long.pysnap
+++ /dev/null
@@ -1,9 +0,0 @@
----
-created: '2024-11-08T18:04:20.645880+00:00'
-creator: sentry
-source: tests/sentry/grouping/test_variants.py
----
-hashed_checksum:
-  hash: "2c2e85a6e73109222f131228ed06a7af"
-  checksum: "2c2e85a6e73109222f131228ed06a7af"
-  raw_checksum: "not a legit checksum and also too long a string"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/cocoa_dispatch_client_callout.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/cocoa_dispatch_client_callout.pysnap
index b5a643303c0457..6f61a80627bea6 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/cocoa_dispatch_client_callout.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/cocoa_dispatch_client_callout.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-12-13T15:30:06.680639Z'
+created: '2024-12-17T22:46:35.578593+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (logentry takes precedence)
       threads
@@ -57,6 +58,7 @@ app:
 --------------------------------------------------------------------------
 default:
   hash: "1356c67d7ad1638d816bfb822dd2c25d"
+  contributing component: message
   component:
     default*
       message*
@@ -64,6 +66,7 @@ default:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: null
   component:
     system (logentry takes precedence)
       threads
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/connection_error.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/connection_error.pysnap
index b915563cfa9d89..0422a388a10493 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/connection_error.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/connection_error.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-08-25T09:17:10.213133Z'
+created: '2024-12-17T22:46:35.633314+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "8abb6be15864dac05d46e61bfe1dd6d3"
+  contributing component: exception
   component:
     app*
       exception*
@@ -137,6 +138,7 @@ app:
 --------------------------------------------------------------------------
 default:
   hash: null
+  contributing component: null
   component:
     default (exception of app/system takes precedence)
       message (exception of app/system takes precedence)
@@ -144,6 +146,7 @@ default:
 --------------------------------------------------------------------------
 system:
   hash: "6391c18be56c7e7c95e58be4b3eaf0bd"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/csp.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/csp.pysnap
index fb0242c54c41be..4256afa5338509 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/csp.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/csp.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:26.429762Z'
+created: '2024-12-17T22:46:36.014491+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "666766514295bb52812324097cdaf53e"
+  contributing component: csp
   component:
     default*
       csp*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/csp_img_src.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/csp_img_src.pysnap
index b2a45f17d5bacb..ff0a68e4292317 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/csp_img_src.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/csp_img_src.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:26.440643Z'
+created: '2024-12-17T22:46:35.674448+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "1742101e08eb1608f569751dfedd0062"
+  contributing component: csp
   component:
     default*
       csp*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/csp_no_blocked_uri.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/csp_no_blocked_uri.pysnap
index e444e36c96428a..ab3abc4d1bc707 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/csp_no_blocked_uri.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/csp_no_blocked_uri.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:26.453427Z'
+created: '2024-12-17T22:46:35.719746+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "efddf1cde918097259aa7d4904fb1942"
+  contributing component: csp
   component:
     default*
       csp*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/csp_script_data_uri.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/csp_script_data_uri.pysnap
index cdbd309becb689..a3b7ee772f5fe7 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/csp_script_data_uri.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/csp_script_data_uri.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:26.466319Z'
+created: '2024-12-17T22:46:35.765264+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "4e6f2bce9d121aa89f4dc5e5da08afb5"
+  contributing component: csp
   component:
     default*
       csp*
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
index b69989145a0443..c923054901be15 100644
--- 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
@@ -1,10 +1,11 @@
 ---
-created: '2024-12-02T21:59:54.483735+00:00'
+created: '2024-12-17T22:46:35.810925+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "56c6520f35bce2f89ed2c4e725ccef65"
+  contributing component: csp
   component:
     default*
       csp*
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
index fa901b732d6c33..b240c2c82000d6 100644
--- 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
@@ -1,10 +1,11 @@
 ---
-created: '2024-12-02T21:59:54.519184+00:00'
+created: '2024-12-17T22:46:35.856014+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "d346ee37d19a2be6587e609075ca2d57"
+  contributing component: csp
   component:
     default*
       csp*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/csp_script_src_uri.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/csp_script_src_uri.pysnap
index f7b7f8ec0a03e0..c9e4d3e02fb0dc 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/csp_script_src_uri.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/csp_script_src_uri.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:26.476293Z'
+created: '2024-12-17T22:46:35.905354+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "223cdacfe5b4b830dc700b5c18cc21b4"
+  contributing component: csp
   component:
     default*
       csp*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/csp_style_src_elem.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/csp_style_src_elem.pysnap
index 49dacbf166c316..ac1c8fd86abc27 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/csp_style_src_elem.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/csp_style_src_elem.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:26.490911Z'
+created: '2024-12-17T22:46:35.957665+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "537a973f594c364842893e9a72af62a5"
+  contributing component: csp
   component:
     default*
       csp*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/custom_fingerprint_client.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/custom_fingerprint_client.pysnap
index 0c5d133a347a11..ea62d0d89fdf2f 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/custom_fingerprint_client.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/custom_fingerprint_client.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-11-08T18:04:22.531848+00:00'
+created: '2024-12-17T22:46:36.135621+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: exception
   component:
     app (custom fingerprint takes precedence)
       exception*
@@ -208,6 +209,7 @@ custom_fingerprint:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: exception
   component:
     system (custom fingerprint takes precedence)
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/custom_fingerprint_client_and_server_rule.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/custom_fingerprint_client_and_server_rule.pysnap
index 8ed06a3e0b126e..b5980ed20b926f 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/custom_fingerprint_client_and_server_rule.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/custom_fingerprint_client_and_server_rule.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-11-08T18:04:22.342258+00:00'
+created: '2024-12-17T22:46:36.080554+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: exception
   component:
     app (custom fingerprint takes precedence)
       exception*
@@ -208,6 +209,7 @@ custom_fingerprint:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: exception
   component:
     system (custom fingerprint takes precedence)
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/custom_fingerprint_server_rule.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/custom_fingerprint_server_rule.pysnap
index b5252f18086974..81c864d8fd0f0d 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/custom_fingerprint_server_rule.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/custom_fingerprint_server_rule.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-11-08T18:04:22.646156+00:00'
+created: '2024-12-17T22:46:36.237342+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: exception
   component:
     app (custom fingerprint takes precedence)
       exception*
@@ -208,6 +209,7 @@ custom_fingerprint:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: exception
   component:
     system (custom fingerprint takes precedence)
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_cocoa_nserror.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_cocoa_nserror.pysnap
index bedb5767b52ec5..50895ba8c2b9cd 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_cocoa_nserror.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_cocoa_nserror.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-15T23:12:31.575228+00:00'
+created: '2024-12-17T22:46:36.331018+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "a4846fd651dcaae1c580fb24af561567"
+  contributing component: exception
   component:
     system*
       exception*
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 e2eb4bb15af76b..1c874c02da6a7d 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,10 +1,11 @@
 ---
-created: '2024-12-03T22:09:00.075675+00:00'
+created: '2024-12-17T22:46:36.479425+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -15,6 +16,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "b23ee1963904c2ca87b145febf94b66c"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_compute_hashes_2.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_compute_hashes_2.pysnap
index da1eee45c64588..3b508df692bb83 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_compute_hashes_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_compute_hashes_2.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-02-15T10:11:47.906066Z'
+created: '2024-12-17T22:46:36.382493+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -21,6 +22,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "baf0bfa8bb312627cd5ef4171aec9f4e"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_compute_hashes_3.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_compute_hashes_3.pysnap
index 229b865fe35078..16581837109295 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_compute_hashes_3.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_compute_hashes_3.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-02-15T10:11:47.604341Z'
+created: '2024-12-17T22:46:36.433373+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       chained-exception (ignored because hash matches system variant)
@@ -33,6 +34,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "9aef9026a457d312531c07644b271314"
+  contributing component: chained-exception
   component:
     system*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_bad_duplicate_id.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_bad_duplicate_id.pysnap
index f39eaa5139ad5f..233146543df27b 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_bad_duplicate_id.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_bad_duplicate_id.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-16T04:46:16.915957Z'
+created: '2024-12-17T22:46:36.527349+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       chained-exception (ignored because hash matches system variant)
@@ -26,6 +27,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "4e10ac3b57fc5fc8bd77a31e5888f117"
+  contributing component: chained-exception
   component:
     system*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_bad_missing_parent.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_bad_missing_parent.pysnap
index 7f23c208e3fbf3..8dcd692dff967f 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_bad_missing_parent.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_bad_missing_parent.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-16T04:46:09.640051Z'
+created: '2024-12-17T22:46:36.589621+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       chained-exception (ignored because hash matches system variant)
@@ -26,6 +27,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "4e10ac3b57fc5fc8bd77a31e5888f117"
+  contributing component: chained-exception
   component:
     system*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_bad_out_of_sequence.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_bad_out_of_sequence.pysnap
index aaeb20810080dd..73f91c1c3bb1a6 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_bad_out_of_sequence.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_bad_out_of_sequence.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-16T04:47:08.357069Z'
+created: '2024-12-17T22:46:36.644565+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       chained-exception (ignored because hash matches system variant)
@@ -26,6 +27,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "e90fd85a42d3ca0e0df2c7bc5cb98669"
+  contributing component: chained-exception
   component:
     system*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_bad_parent_with_parent.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_bad_parent_with_parent.pysnap
index 05f478f904e2a9..1ff8b607e4c6fd 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_bad_parent_with_parent.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_bad_parent_with_parent.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-16T04:46:18.088065Z'
+created: '2024-12-17T22:46:36.784756+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -15,6 +16,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "0809098f9f613b63467605dd1739cc9b"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_bad_with_cycle.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_bad_with_cycle.pysnap
index e92ba710ab897d..64775b4f134410 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_bad_with_cycle.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_bad_with_cycle.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-16T04:47:03.328532Z'
+created: '2024-12-17T22:46:36.880982+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       chained-exception (ignored because hash matches system variant)
@@ -26,6 +27,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "4e10ac3b57fc5fc8bd77a31e5888f117"
+  contributing component: chained-exception
   component:
     system*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_one_exception.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_one_exception.pysnap
index 02fb7929f2653e..3fe0da70c914b7 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_one_exception.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_one_exception.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-04T06:18:45.126611Z'
+created: '2024-12-17T22:46:36.958021+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       chained-exception (ignored because hash matches system variant)
@@ -21,6 +22,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "9a0fed56ec0b6fe6138480d083b4cb4e"
+  contributing component: chained-exception
   component:
     system*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_one_type_under_nested_groups.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_one_type_under_nested_groups.pysnap
index 9f8d8e05bdba96..ef4d72c2e0d518 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_one_type_under_nested_groups.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_one_type_under_nested_groups.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-04T05:13:35.442661Z'
+created: '2024-12-17T22:46:37.027054+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       chained-exception (ignored because hash matches system variant)
@@ -36,6 +37,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "dc22f89ccd77059eeaadc02badebcfba"
+  contributing component: chained-exception
   component:
     system*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_one_type_with_different_values.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_one_type_with_different_values.pysnap
index ca79aba2bbfae1..573ae05a21b8c7 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_one_type_with_different_values.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_one_type_with_different_values.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-04T20:21:21.568546Z'
+created: '2024-12-17T22:46:37.079472+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       chained-exception (ignored because hash matches system variant)
@@ -26,6 +27,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "09f99e79bcd7338d26d938563ca8c704"
+  contributing component: chained-exception
   component:
     system*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_one_type_with_similar_values.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_one_type_with_similar_values.pysnap
index 2ff60e2d3348d9..668e1270f9ab7a 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_one_type_with_similar_values.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_one_type_with_similar_values.pysnap
@@ -1,8 +1,11 @@
 ---
+created: '2024-12-17T22:46:37.199986+00:00'
+creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       chained-exception (ignored because hash matches system variant)
@@ -24,6 +27,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "b4cd3ea9b8777433e90ffecbb9601091"
+  contributing component: chained-exception
   component:
     system*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_one_type_with_similar_values_and_children.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_one_type_with_similar_values_and_children.pysnap
index 61972176cf9c5f..e2de8d61304130 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_one_type_with_similar_values_and_children.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_one_type_with_similar_values_and_children.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-04T01:19:24.087516Z'
+created: '2024-12-17T22:46:37.144376+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       chained-exception (ignored because hash matches system variant)
@@ -36,6 +37,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "29a4f186cb9ff2099ef3604cf548671b"
+  contributing component: chained-exception
   component:
     system*
       chained-exception*
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
index ff0ee18a483284..4f29f888eacf6c 100644
--- 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
@@ -1,10 +1,11 @@
 ---
-created: '2024-11-19T00:26:20.128888+00:00'
+created: '2024-12-17T22:46:37.256253+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       chained-exception (ignored because hash matches system variant)
@@ -56,6 +57,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "b8e05ed0c06d6bc6c6052bb9dae6d6eb"
+  contributing component: chained-exception
   component:
     system*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_two_types.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_two_types.pysnap
index 793edd44e8498b..78eabcba284d7c 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_two_types.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_two_types.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-04T05:13:35.418153Z'
+created: '2024-12-17T22:46:37.372615+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       chained-exception (ignored because hash matches system variant)
@@ -26,6 +27,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "008a97014f94fbe6b23002026791427f"
+  contributing component: chained-exception
   component:
     system*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_two_types_under_nested_groups.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_two_types_under_nested_groups.pysnap
index e7084836125788..738ba1fc097f8d 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_two_types_under_nested_groups.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_two_types_under_nested_groups.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-04T06:07:44.520237Z'
+created: '2024-12-17T22:46:37.313728+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       chained-exception (ignored because hash matches system variant)
@@ -31,6 +32,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "4033ab52235740de9983976a18833f5f"
+  contributing component: chained-exception
   component:
     system*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_javascript_no_in_app.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_javascript_no_in_app.pysnap
index 16d184ac14bc0a..c024f265bd524c 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_javascript_no_in_app.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_javascript_no_in_app.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:26.604429Z'
+created: '2024-12-17T22:46:37.429473+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -36,6 +37,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "d1f185038ed0941ba9e5d2bad519b773"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_without_type.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_without_type.pysnap
index 7f537ac7638ed6..c5100b1665badc 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_without_type.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_without_type.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:26.620529Z'
+created: '2024-12-17T22:46:37.493677+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -13,6 +14,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "5eb63bbbe01eeed093cb22bb8f5acdc3"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_without_value.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_without_value.pysnap
index c156809d37aa0b..06361fb6cc9e6c 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_without_value.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_without_value.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:26.634106Z'
+created: '2024-12-17T22:46:37.547578+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -13,6 +14,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "5a2cfd89b7b171fd7b4794b08023d04f"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/expectct.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/expectct.pysnap
index f38bbe4182d7d1..5ee09f8cd5903b 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/expectct.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/expectct.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:26.650163Z'
+created: '2024-12-17T22:46:37.851867+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "3d2933f4b5ec459ec8d569a398fd328c"
+  contributing component: expect-ct
   component:
     default*
       expect-ct*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/fallback_prefix_level_1.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/fallback_prefix_level_1.pysnap
index 7713662e12a549..f9ddb2fb2a5366 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/fallback_prefix_level_1.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/fallback_prefix_level_1.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-07-30T14:13:50.908037Z'
+created: '2024-12-17T22:46:37.895581+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -42,6 +43,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "b0d6c60d82e250da178402493260c2f2"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_compute_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
index 08cb508c2dbf7f..962d5176f7ae86 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_compute_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,10 +1,11 @@
 ---
-created: '2024-12-03T22:09:00.136553+00:00'
+created: '2024-12-17T22:46:37.940014+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "526b64456c48836a46ec1a89544fd412"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_empty_list.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_empty_list.pysnap
index 9f87f140d82c6f..5b1ae1d8ae4574 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_empty_list.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_empty_list.pysnap
@@ -1,8 +1,11 @@
 ---
+created: '2024-12-17T22:46:37.991714+00:00'
+creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app
 --------------------------------------------------------------------------
@@ -11,5 +14,6 @@ fallback:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: null
   component:
     system
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_ENHANCED_enhancer_by_classes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_ENHANCED_enhancer_by_classes.pysnap
index aec0e878d3d535..437d8f7e111960 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_ENHANCED_enhancer_by_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_ENHANCED_enhancer_by_classes.pysnap
@@ -1,8 +1,11 @@
 ---
+created: '2024-12-17T22:46:38.042194+00:00'
+creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -14,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "d8f406c2efb312db2231282f94647b1d"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_ENHANCED_fast_class_by_classes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_ENHANCED_fast_class_by_classes.pysnap
index 8e5526a0ac6a12..c7f599f69168a4 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_ENHANCED_fast_class_by_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_ENHANCED_fast_class_by_classes.pysnap
@@ -1,8 +1,11 @@
 ---
+created: '2024-12-17T22:46:38.093026+00:00'
+creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -14,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "91f42e615037e91a3c6f8a6fcf04056b"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_ENHANCED_spring_classes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_ENHANCED_spring_classes.pysnap
index 4158965b9f966c..8bf097ca51136d 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_ENHANCED_spring_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_ENHANCED_spring_classes.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:26.686813Z'
+created: '2024-12-17T22:46:38.146718+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "45c0b0a8c777e7a7040d7c39233a08a5"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_dartlang_sdk.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_dartlang_sdk.pysnap
index 118deb383b9369..83edfddafab8a7 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_dartlang_sdk.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_dartlang_sdk.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-08-23T14:18:12.299648Z'
+created: '2024-12-17T22:46:38.194245+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -18,6 +19,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "74be9a8bc7117f22ea0a61a9b2f524c5"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_extra_ENHANCED_clojure_classes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_extra_ENHANCED_clojure_classes.pysnap
index 2d4fb1e08cb1a1..89eeb87b9856df 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_extra_ENHANCED_clojure_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_extra_ENHANCED_clojure_classes.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:26.707292Z'
+created: '2024-12-17T22:46:38.250587+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "353e05904b48bd3ae4fa9623934a70d0"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_extra_ENHANCED_enhancer_by_classes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_extra_ENHANCED_enhancer_by_classes.pysnap
index d5bca32675bf62..3d40b26578fb5a 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_extra_ENHANCED_enhancer_by_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_extra_ENHANCED_enhancer_by_classes.pysnap
@@ -1,8 +1,11 @@
 ---
+created: '2024-12-17T22:46:38.316814+00:00'
+creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -14,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "f771960161f86b1f8eec4edc3016e1c0"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_extra_ENHANCED_spring_classes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_extra_ENHANCED_spring_classes.pysnap
index da181cf0c14451..cd541685bec97d 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_extra_ENHANCED_spring_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_extra_ENHANCED_spring_classes.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:26.725530Z'
+created: '2024-12-17T22:46:38.396334+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "be15ca3d511b96918e087c4f42503ca2"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_filename_from_url_origin_corner_cases.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_filename_from_url_origin_corner_cases.pysnap
index 4efa2ac9116b10..eb5f21c465b4be 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_filename_from_url_origin_corner_cases.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_filename_from_url_origin_corner_cases.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:26.743230Z'
+created: '2024-12-17T22:46:38.461849+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -29,6 +30,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "98f84fd484f8c2273f28cc645935f650"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_filename_if_abs_path_is_http.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_filename_if_abs_path_is_http.pysnap
index cc2ee8b085dd39..17f7c92465ba1e 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_filename_if_abs_path_is_http.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_filename_if_abs_path_is_http.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:26.760930Z'
+created: '2024-12-17T22:46:38.522340+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -18,6 +19,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "5eb63bbbe01eeed093cb22bb8f5acdc3"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_filename_if_blob.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_filename_if_blob.pysnap
index 48ccbc481f41a4..5a0fbbde5d74da 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_filename_if_blob.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_filename_if_blob.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:26.775547Z'
+created: '2024-12-17T22:46:38.594634+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app
       stacktrace (ignored single frame stack)
@@ -17,6 +18,7 @@ fallback:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: null
   component:
     system
       stacktrace (ignored single frame stack)
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_filename_if_http.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_filename_if_http.pysnap
index 762ae0ee035964..947e2dac383dc2 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_filename_if_http.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_filename_if_http.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:26.788098Z'
+created: '2024-12-17T22:46:38.660258+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -18,6 +19,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "5eb63bbbe01eeed093cb22bb8f5acdc3"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_filename_if_https.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_filename_if_https.pysnap
index d4c6bd6698db7e..6ac1e3d7e3bd46 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_filename_if_https.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_filename_if_https.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:26.806455Z'
+created: '2024-12-17T22:46:38.715306+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -18,6 +19,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "5eb63bbbe01eeed093cb22bb8f5acdc3"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_flutter_sdk.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_flutter_sdk.pysnap
index a43e6d7f52068d..c015d4b97883a6 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_flutter_sdk.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_flutter_sdk.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-09-20T12:35:57.165841Z'
+created: '2024-12-17T22:46:38.775411+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -20,6 +21,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "6d2345b21f168d7c55e70eac56589e3b"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_hibernate_classes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_hibernate_classes.pysnap
index d06dd134f9a732..aad48aebd82f1f 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_hibernate_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_hibernate_classes.pysnap
@@ -1,8 +1,11 @@
 ---
+created: '2024-12-17T22:46:38.828569+00:00'
+creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -14,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "a01e3a60f8863fd9dfc5697fae1eed46"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
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 57be4c905585f5..5d58e80b065f57 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,10 +1,11 @@
 ---
-created: '2024-11-13T17:26:12.765496+00:00'
+created: '2024-12-17T22:46:38.882432+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "aee9aaca552e7fd593d085ca5a2260cf"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
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 43b4a04c2dc8ce..15d787677ee7b2 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,10 +1,11 @@
 ---
-created: '2024-11-13T17:23:54.995527+00:00'
+created: '2024-12-17T22:46:38.940065+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "5fd1358271b3a3dba3287e135029688d"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_javassist.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_javassist.pysnap
index e481a7340c17e7..649c58e58712e0 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_javassist.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_javassist.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:26.851859Z'
+created: '2024-12-17T22:46:39.103060+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "538bdfd8d7bb2495d0d6429c3689a420"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_javassist_2.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_javassist_2.pysnap
index 94c75448c69d01..aed2b403c85ae5 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_javassist_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_javassist_2.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:26.866072Z'
+created: '2024-12-17T22:46:38.995928+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "538bdfd8d7bb2495d0d6429c3689a420"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_javassist_3.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_javassist_3.pysnap
index ccd58714a58da4..822ed9461f3ad5 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_javassist_3.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_javassist_3.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:26.882934Z'
+created: '2024-12-17T22:46:39.053287+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "813856376ba744b15a01916ed2557344"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_module_if_page_url.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_module_if_page_url.pysnap
index 349bad4aa78449..b649bc6af78cb8 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_module_if_page_url.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_module_if_page_url.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:26.901724Z'
+created: '2024-12-17T22:46:39.206442+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app
       stacktrace (ignored single frame stack)
@@ -19,6 +20,7 @@ fallback:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: null
   component:
     system
       stacktrace (ignored single frame stack)
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 db64f85ddf5b16..a09eba2e83fb3f 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,10 +1,11 @@
 ---
-created: '2024-11-13T17:23:55.422554+00:00'
+created: '2024-12-17T22:46:39.151202+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -18,6 +19,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "37a2dbfebce02591474d46b7485e9923"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_safari_native_code.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_safari_native_code.pysnap
index 2eee96986572b0..a207aad5a73050 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_safari_native_code.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_safari_native_code.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:26.932536Z'
+created: '2024-12-17T22:46:39.257847+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app
       stacktrace
@@ -17,6 +18,7 @@ fallback:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: null
   component:
     system
       stacktrace
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_sentry_dart_packages.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_sentry_dart_packages.pysnap
index 1d8b89445dad24..12a08b99f2fe60 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_sentry_dart_packages.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_sentry_dart_packages.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-06-05T14:22:34.954498+00:00'
+created: '2024-12-17T22:46:39.310811+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -46,6 +47,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "278cdd35be92e2ffde1d0a40524e7786"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_sentry_dart_sdk.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_sentry_dart_sdk.pysnap
index bc0a37abdd1a8c..15b4a1db909021 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_sentry_dart_sdk.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_sentry_dart_sdk.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-05-28T08:13:48.170799+00:00'
+created: '2024-12-17T22:46:39.355962+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -18,6 +19,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "d1fe4234d1bddc3823d08dcc529fb161"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_sentry_flutter_sdk.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_sentry_flutter_sdk.pysnap
index 58196d9c27fb89..f143761fd00152 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_sentry_flutter_sdk.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_sentry_flutter_sdk.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-05-28T08:13:47.759326+00:00'
+created: '2024-12-17T22:46:39.406159+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -18,6 +19,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "d1fe4234d1bddc3823d08dcc529fb161"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_sun_java_generated_constructors.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_sun_java_generated_constructors.pysnap
index f74631f59c3c85..fd25d9749f89ee 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_sun_java_generated_constructors.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_sun_java_generated_constructors.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:26.947731Z'
+created: '2024-12-17T22:46:39.513452+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "07d1a8e5728b3c4c7aa8b8273fd0e753"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_sun_java_generated_constructors_2.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_sun_java_generated_constructors_2.pysnap
index 8dc84fd8909793..39f17431096013 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_sun_java_generated_constructors_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_sun_java_generated_constructors_2.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:26.964240Z'
+created: '2024-12-17T22:46:39.455714+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "09e0efcab18f545166318118ed4e0292"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_sun_java_generated_methods.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_sun_java_generated_methods.pysnap
index bbcf55667a3998..10b99b46a40741 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_sun_java_generated_methods.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_sun_java_generated_methods.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:26.977309Z'
+created: '2024-12-17T22:46:39.569073+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -21,6 +22,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "9bc326575875422d0d4ced3c35d9f916"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_sanitizes_block_functions.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_sanitizes_block_functions.pysnap
index ae2c7756d4053e..fb66caf807087b 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_sanitizes_block_functions.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_sanitizes_block_functions.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:26.990741Z'
+created: '2024-12-17T22:46:39.679496+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "27eed4125fc13d42163ddb0b8f357b48"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_sanitizes_erb_templates.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_sanitizes_erb_templates.pysnap
index fd726c7df8f47d..ec3da27237cb43 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_sanitizes_erb_templates.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_sanitizes_erb_templates.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:27.008523Z'
+created: '2024-12-17T22:46:39.743972+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "140d61119ffa316766cf0f710bf1e7f1"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_sanitizes_versioned_filenames.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_sanitizes_versioned_filenames.pysnap
index 3dea5248ecdc55..5ebd551266ccb3 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_sanitizes_versioned_filenames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_sanitizes_versioned_filenames.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:27.026661Z'
+created: '2024-12-17T22:46:39.838643+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "00ffe2f3150414a00633fb5671a918f8"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_sanitizes_versioned_filenames_2.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_sanitizes_versioned_filenames_2.pysnap
index 05a90f062a949b..325ec51bfc7d6d 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_sanitizes_versioned_filenames_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_sanitizes_versioned_filenames_2.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:27.039455Z'
+created: '2024-12-17T22:46:39.789714+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "babff59ccf75f6cade7c5805f6d9aa59"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_skips_symbol_if_unknown.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_skips_symbol_if_unknown.pysnap
index a5fbfbf5916e9e..582eec02d38c27 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_skips_symbol_if_unknown.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_skips_symbol_if_unknown.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:27.058341Z'
+created: '2024-12-17T22:46:39.888503+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "a972f399399f5566f39b14a7afdd24ff"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_uses_context_line_over_function.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_uses_context_line_over_function.pysnap
index 8088b0dc19ed16..af6e20bcbc7ac0 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_uses_context_line_over_function.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_uses_context_line_over_function.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:27.075229Z'
+created: '2024-12-17T22:46:39.933231+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -20,6 +21,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "60e0a667027bef0d0b7c4882891df7e8"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_uses_function_over_lineno.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_uses_function_over_lineno.pysnap
index 1d39b0a49df418..81c4c0b6d8b716 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_uses_function_over_lineno.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_uses_function_over_lineno.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:27.092053Z'
+created: '2024-12-17T22:46:39.981785+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -18,6 +19,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "fb73cb54ced59b1c0c60d9bb40b7336b"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_uses_module_over_filename.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_uses_module_over_filename.pysnap
index ad5b46320cd1ca..337fccc97a05c6 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_uses_module_over_filename.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_uses_module_over_filename.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:27.113252Z'
+created: '2024-12-17T22:46:40.031457+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -18,6 +19,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "299a0be4a5a79e6a59fdd251b19d78bb"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_uses_symbol_instead_of_function.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_uses_symbol_instead_of_function.pysnap
index b38376c8d54b78..4439e805608f8d 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_uses_symbol_instead_of_function.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_uses_symbol_instead_of_function.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:27.128379Z'
+created: '2024-12-17T22:46:40.076387+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -18,6 +19,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "01143b49f8875c22617bac5bb1aaf638"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_with_only_required_vars.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_with_only_required_vars.pysnap
index 4d80aa61762651..d8762e1dc9c02c 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_with_only_required_vars.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_with_only_required_vars.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:27.147598Z'
+created: '2024-12-17T22:46:40.122272+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "19fcc04a0c59eaf564ee1a00c58574cc"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/go_pkg_mod.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/go_pkg_mod.pysnap
index 34590558479ebe..70944d915a46ab 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/go_pkg_mod.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/go_pkg_mod.pysnap
@@ -1,8 +1,11 @@
 ---
+created: '2024-12-17T22:46:40.171844+00:00'
+creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "4b8bbc500bd2cabfcadc1f1be867e0bb"
+  contributing component: exception
   component:
     app*
       exception*
@@ -28,6 +31,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "348fc4026c9fa11ffba8fbfa80a134c9"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_125_event_126.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_125_event_126.pysnap
index deaf853eb5d39c..7a31407e7bdcdc 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_125_event_126.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_125_event_126.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-04-02T09:10:50.505122Z'
+created: '2024-12-17T22:46:40.231203+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -144,6 +145,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "c470859cd6d1e38f3bd089877a7b8b97"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_200_event_200.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_200_event_200.pysnap
index 5701ae1477556f..83ddff3ce03271 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_200_event_200.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_200_event_200.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-04-02T09:10:50.868534Z'
+created: '2024-12-17T22:46:40.281259+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -88,6 +89,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "e5c2dc6670a947b5251eb5ae72799124"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_275_event_275.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_275_event_275.pysnap
index c36f1654bbfab4..b70d3872e2b90e 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_275_event_275.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_275_event_275.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-04-02T09:10:50.690678Z'
+created: '2024-12-17T22:46:40.341062+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -104,6 +105,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "b02fb88218293d772c2e20c8f6ab387a"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_289_event_312.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_289_event_312.pysnap
index bf70c6d83c3634..0501a10bd00c1b 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_289_event_312.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_289_event_312.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-04-02T09:10:51.026405Z'
+created: '2024-12-17T22:46:40.426366+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -96,6 +97,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "445c51c35600b1cfdc2e5985c5bdd75b"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_294_event_294.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_294_event_294.pysnap
index f4b03eaae121cf..f8a61c0197e4f5 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_294_event_294.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_294_event_294.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-04-02T09:10:50.925451Z'
+created: '2024-12-17T22:46:40.489615+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -145,6 +146,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "f0671c4012732af1040a25d09e12afca"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_294_event_329.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_294_event_329.pysnap
index 4f3a2d73b7203e..f6db6b84f75f33 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_294_event_329.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_294_event_329.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-04-02T09:10:51.429761Z'
+created: '2024-12-17T22:46:40.571107+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -160,6 +161,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "f0671c4012732af1040a25d09e12afca"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_307_event_307.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_307_event_307.pysnap
index e3da9313765660..fa4f3e0df9d73e 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_307_event_307.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_307_event_307.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-03-26T18:53:36.859040Z'
+created: '2024-12-17T22:46:40.622136+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -64,6 +65,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "2b6e7c38169cdf8db932529529331be5"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_307_event_657.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_307_event_657.pysnap
index b65747c6d83707..f15232512ace52 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_307_event_657.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_307_event_657.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-03-26T18:53:41.637824Z'
+created: '2024-12-17T22:46:40.674330+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -59,6 +60,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "2b6e7c38169cdf8db932529529331be5"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_313_event_313.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_313_event_313.pysnap
index 71445a9cbcbb56..8ab6b95533337c 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_313_event_313.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_313_event_313.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-04-02T09:10:51.516288Z'
+created: '2024-12-17T22:46:40.736624+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -193,6 +194,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "19208a8d2bfdfe0f14d6bcc72e7bb54a"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_313_event_333.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_313_event_333.pysnap
index 783bc6162165b5..870752bc3c6511 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_313_event_333.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_313_event_333.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-04-02T09:10:51.548358Z'
+created: '2024-12-17T22:46:40.799009+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -198,6 +199,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "19208a8d2bfdfe0f14d6bcc72e7bb54a"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_319_event_321.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_319_event_321.pysnap
index 1afbab106e3f55..71e0fbf6cfc9b6 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_319_event_321.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_319_event_321.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-04-02T09:10:50.851227Z'
+created: '2024-12-17T22:46:40.862292+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -196,6 +197,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "a3ce3ffb7077f57549483112e3dcf68c"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_389_event_389.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_389_event_389.pysnap
index f0e2535d68107d..c16c67c272ad1c 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_389_event_389.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_389_event_389.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-03-26T18:53:36.581044Z'
+created: '2024-12-17T22:46:40.908637+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -46,6 +47,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "6f4e0b1cef47a64deadb07777bb652db"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_432_event_432.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_432_event_432.pysnap
index d3f2797c925142..901402210cceb8 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_432_event_432.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_432_event_432.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-04-02T09:10:50.776036Z'
+created: '2024-12-17T22:46:40.961487+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -130,6 +131,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "3ec7691e31dedccb5a0b199b65958d9e"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_432_event_453.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_432_event_453.pysnap
index 42ab36a91009de..95b1e8aa793cbb 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_432_event_453.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_432_event_453.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-04-02T09:10:50.750366Z'
+created: '2024-12-17T22:46:41.016300+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -130,6 +131,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "c0b8fd55ef872186a9eaf65ea6b29fc1"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_445_event_445.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_445_event_445.pysnap
index 3cdf761c81013a..020b09cf26566b 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_445_event_445.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/group_445_event_445.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-04-02T09:10:50.487541Z'
+created: '2024-12-17T22:46:41.066038+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -151,6 +152,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "3e9f9ffdb23279c991df2017c6ca1cff"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/hpkp.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/hpkp.pysnap
index 2bf193448ca244..f0e36e1af2fc1a 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/hpkp.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/hpkp.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:27.166113Z'
+created: '2024-12-17T22:46:41.116119+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "1e37a374cb33572622d02ff7a6237c44"
+  contributing component: hpkp
   component:
     default*
       hpkp*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/hybrid_fingerprint_base.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/hybrid_fingerprint_base.pysnap
index ed0b9aded21d54..6ef17dbaaffaa8 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/hybrid_fingerprint_base.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/hybrid_fingerprint_base.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-15T17:23:30.431453+00:00'
+created: '2024-12-17T22:46:41.169810+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -17,6 +18,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "e3d593b4335190212ca7c18b8e967fb1"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/hybrid_fingerprint_custom_client_hybrid_server.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/hybrid_fingerprint_custom_client_hybrid_server.pysnap
index 8b0d4b4d3610a7..211fc51aebe43b 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/hybrid_fingerprint_custom_client_hybrid_server.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/hybrid_fingerprint_custom_client_hybrid_server.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-16T19:26:51.182801+00:00'
+created: '2024-12-17T22:46:41.220865+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "12f8483a96ef9ed502d804b62eaa9f26"
+  contributing component: exception
   component:
     app*
       exception*
@@ -205,6 +206,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "2105fd0d38b9aff20e44d2597d3a776b"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/hybrid_fingerprint_hybrid_client_custom_server.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/hybrid_fingerprint_hybrid_client_custom_server.pysnap
index c4f4897ead44f6..0412b512f3a879 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/hybrid_fingerprint_hybrid_client_custom_server.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/hybrid_fingerprint_hybrid_client_custom_server.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-11-08T18:04:31.516329+00:00'
+created: '2024-12-17T22:46:41.428253+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: exception
   component:
     app (custom fingerprint takes precedence)
       exception*
@@ -208,6 +209,7 @@ custom_fingerprint:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: exception
   component:
     system (custom fingerprint takes precedence)
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/hybrid_fingerprint_same_default_different_extra.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/hybrid_fingerprint_same_default_different_extra.pysnap
index b984b61f7962d4..3d008c1204308e 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/hybrid_fingerprint_same_default_different_extra.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/hybrid_fingerprint_same_default_different_extra.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-15T17:23:30.782465+00:00'
+created: '2024-12-17T22:46:41.510347+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -17,6 +18,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "5b5ad5a0fbb4deb5e3fc631ce42681ae"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/hybrid_fingerprint_same_extra_different_default.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/hybrid_fingerprint_same_extra_different_default.pysnap
index ae7d34b3682257..1936d361ff0d65 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/hybrid_fingerprint_same_extra_different_default.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/hybrid_fingerprint_same_extra_different_default.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-15T17:23:30.884110+00:00'
+created: '2024-12-17T22:46:41.578225+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -17,6 +18,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "c5578778212497f1ff3435405e2a4a98"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/in_app_in_ui.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/in_app_in_ui.pysnap
index 3ac88323573487..3901b518586f7e 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/in_app_in_ui.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/in_app_in_ui.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-07-26T19:38:19.001536Z'
+created: '2024-12-17T22:46:41.652349+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -150,6 +151,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "c506663b9a1495d301bff1e82149d55e"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/java_chained.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/java_chained.pysnap
index 313d489d271ebc..addd3749100f81 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/java_chained.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/java_chained.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-08-25T09:17:10.052466Z'
+created: '2024-12-17T22:46:41.747505+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "ca1e356d85bc74d82d4ae8f3f8bfbbf7"
+  contributing component: chained-exception
   component:
     app*
       chained-exception*
@@ -495,6 +496,7 @@ app:
 --------------------------------------------------------------------------
 default:
   hash: null
+  contributing component: null
   component:
     default (exception of app/system takes precedence)
       message (exception of app/system takes precedence)
@@ -502,6 +504,7 @@ default:
 --------------------------------------------------------------------------
 system:
   hash: "8924849495809d42431719c2b9ab65c8"
+  contributing component: chained-exception
   component:
     system*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/java_minimal.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/java_minimal.pysnap
index 11320a95ae36bf..388d3f714ec25d 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/java_minimal.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/java_minimal.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:27.284036Z'
+created: '2024-12-17T22:46:41.832919+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -509,6 +510,7 @@ app:
 --------------------------------------------------------------------------
 default:
   hash: null
+  contributing component: null
   component:
     default (exception of system takes precedence)
       message (exception of system takes precedence)
@@ -516,6 +518,7 @@ default:
 --------------------------------------------------------------------------
 system:
   hash: "ec87dd10e4f7512ecccb4a068c5774ae"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_exception_fallback_to_message.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_exception_fallback_to_message.pysnap
index d64f8115d1bf14..f05c6eb3141046 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_exception_fallback_to_message.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_exception_fallback_to_message.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:27.298305Z'
+created: '2024-12-17T22:46:41.927883+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -15,6 +16,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "ad1efff799d4f9435077701aee66dde0"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_exception_fallback_to_message_whistles.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_exception_fallback_to_message_whistles.pysnap
index 64a8884ab30442..f67c221b7a1247 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_exception_fallback_to_message_whistles.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_exception_fallback_to_message_whistles.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:27.314719Z'
+created: '2024-12-17T22:46:41.877376+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -15,6 +16,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "6de7447e45ffb49fd4fa5728aebdd488"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_exception_no_in_app.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_exception_no_in_app.pysnap
index c3194a89feedea..0467e9633a475b 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_exception_no_in_app.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_exception_no_in_app.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:27.342709Z'
+created: '2024-12-17T22:46:41.986441+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -100,6 +101,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "60443ca22b22a43806f4358109278791"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_message.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_message.pysnap
index 73b95a02248b93..513c0e08678fd0 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_message.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_message.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:27.354291Z'
+created: '2024-12-17T22:46:42.125330+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "4119639092e62c55ea8be348e4d9260d"
+  contributing component: message
   component:
     default*
       message*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_message_parameterization.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_message_parameterization.pysnap
index abfd6803c04144..3556a7ad024809 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_message_parameterization.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_message_parameterization.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-15T17:12:23.426449+00:00'
+created: '2024-12-17T22:46:42.083018+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "bc485e4d2e22a2e4998479e52c370501"
+  contributing component: message
   component:
     default*
       message*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_polyfills.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_polyfills.pysnap
index c3b5d3efce58d1..8f11c659e2f214 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_polyfills.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_polyfills.pysnap
@@ -1,8 +1,11 @@
 ---
+created: '2024-12-17T22:46:42.170391+00:00'
+creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -35,6 +38,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "ff4f080caf40f8c396751f8b3b8c09d2"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_unpkg.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_unpkg.pysnap
index 36f1bd6a50c098..887bc48cd8915e 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_unpkg.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_unpkg.pysnap
@@ -1,8 +1,11 @@
 ---
+created: '2024-12-17T22:46:42.275404+00:00'
+creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -44,6 +47,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "5a78ef040b2122b94fc8d7756971739c"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_chrome.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_chrome.pysnap
index c9ebe323efb137..f411ec9d27c86e 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_chrome.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_chrome.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:27.375454Z'
+created: '2024-12-17T22:46:42.328610+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -80,6 +81,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "be36642f41f047346396f018f62375d3"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_edge.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_edge.pysnap
index d6f31b4e880c4e..aaf8688edee6f8 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_edge.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_edge.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:27.400857Z'
+created: '2024-12-17T22:46:42.539184+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -84,6 +85,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "7abcb72eb9800b9f38b37f448697a673"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_firefox.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_firefox.pysnap
index 79e684b70b6d93..f59d091cfdad06 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_firefox.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_firefox.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:27.420542Z'
+created: '2024-12-17T22:46:42.628100+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -77,6 +78,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "be36642f41f047346396f018f62375d3"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_http_chrome.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_http_chrome.pysnap
index cd403a1c6ecc86..873ed3f4cd3fdc 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_http_chrome.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_http_chrome.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:27.439751Z'
+created: '2024-12-17T22:46:42.698353+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -98,6 +99,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "a06d7f718dc06157e7b8391cc5e56f10"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_http_edge.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_http_edge.pysnap
index 4997d4cf57de87..2892e036184a30 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_http_edge.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_http_edge.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:27.467317Z'
+created: '2024-12-17T22:46:42.851953+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -102,6 +103,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "e834aba6bf7b758128da092a68a18e9a"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_http_firefox.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_http_firefox.pysnap
index 074222a86f58ec..6fecb26544b35e 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_http_firefox.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_http_firefox.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:27.486633Z'
+created: '2024-12-17T22:46:42.905609+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -95,6 +96,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "71036056ea01a28f0931ab8e951206e2"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_http_safari.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_http_safari.pysnap
index 0b55998607dd50..0302fde4dd5180 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_http_safari.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_http_safari.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:27.507300Z'
+created: '2024-12-17T22:46:43.075453+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -93,6 +94,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "1ff8b3514536db084acc996865d7efd6"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_safari.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_safari.pysnap
index 9f6ad87e88c852..37640393cd7651 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_safari.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_safari.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:27.527586Z'
+created: '2024-12-17T22:46:43.135021+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -77,6 +78,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "be36642f41f047346396f018f62375d3"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_sentryui_firefox.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_sentryui_firefox.pysnap
index ca456a3e8487d9..d71b0c1b6b6e4c 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_sentryui_firefox.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_sentryui_firefox.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:27.567632Z'
+created: '2024-12-17T22:46:43.202240+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "7e5b9ebe8c869ab99af044367bf7d347"
+  contributing component: exception
   component:
     app*
       exception*
@@ -208,6 +209,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "e8f6c1a30ea99526223c0bba1bcd8c13"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_sentryui_safari.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_sentryui_safari.pysnap
index eef318aec46b2a..6598e157e371a8 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_sentryui_safari.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_xbrowser_sentryui_safari.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:27.597109Z'
+created: '2024-12-17T22:46:43.269974+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "7e5b9ebe8c869ab99af044367bf7d347"
+  contributing component: exception
   component:
     app*
       exception*
@@ -167,6 +168,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "6e03a501145e36faab4fa152bb3b6a62"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/laravel.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/laravel.pysnap
index 10ebbcc978a923..6c1df877c3d5d2 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/laravel.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/laravel.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:27.654897Z'
+created: '2024-12-17T22:46:43.402517+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -464,6 +465,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "89037a724fe48e9f6144c3a14e182b9c"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/laravel_anonymous.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/laravel_anonymous.pysnap
index 9e6554dafc1280..792a5656f518bf 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/laravel_anonymous.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/laravel_anonymous.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:27.675057Z'
+created: '2024-12-17T22:46:43.328076+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "260f8f0a5856cd6db03c549b83080d5d"
+  contributing component: exception
   component:
     app*
       exception*
@@ -41,6 +42,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "babe97015e0a63eaaab253c266bae20d"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/logentry_prefers_message.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/logentry_prefers_message.pysnap
index 4acbd660a98893..ceb302bee4c062 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/logentry_prefers_message.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/logentry_prefers_message.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:27.688954Z'
+created: '2024-12-17T22:46:43.455258+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "8ec8bbc71eb6e2af7fbe5076a8534f96"
+  contributing component: message
   component:
     default*
       message*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/logentry_uses_formatted.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/logentry_uses_formatted.pysnap
index f814050e40cb97..c42bdd3680d0ac 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/logentry_uses_formatted.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/logentry_uses_formatted.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:27.705952Z'
+created: '2024-12-17T22:46:43.518310+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "329b29efcf1f77067a063e34f56e7791"
+  contributing component: message
   component:
     default*
       message*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/macos_amd_driver.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/macos_amd_driver.pysnap
index d5be73720cc688..85780e50bb23d8 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/macos_amd_driver.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/macos_amd_driver.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-04-02T09:10:51.147544Z'
+created: '2024-12-17T22:46:43.591053+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -159,6 +160,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "a3ce3ffb7077f57549483112e3dcf68c"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/macos_intel_driver.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/macos_intel_driver.pysnap
index 4ee53ec5eafacb..d04aa8df2f0efd 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/macos_intel_driver.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/macos_intel_driver.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-04-02T09:10:51.735084Z'
+created: '2024-12-17T22:46:43.658967+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -187,6 +188,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "a3ce3ffb7077f57549483112e3dcf68c"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/malloc_sentinel.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/malloc_sentinel.pysnap
index e3c2fa892bae05..5e42e1fcb33367 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/malloc_sentinel.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/malloc_sentinel.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-07-08T15:46:20.880500Z'
+created: '2024-12-17T22:46:43.713466+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -148,6 +149,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "d63ee001e5f5763d56b6e25284bd480e"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/message_prefers_message.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/message_prefers_message.pysnap
index 612551e2059520..d4ca13fb3938fa 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/message_prefers_message.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/message_prefers_message.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:27.721503Z'
+created: '2024-12-17T22:46:43.765547+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "8ec8bbc71eb6e2af7fbe5076a8534f96"
+  contributing component: message
   component:
     default*
       message*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/message_uses_formatted.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/message_uses_formatted.pysnap
index 8de16af5b9a195..0227123deae0ab 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/message_uses_formatted.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/message_uses_formatted.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:27.734195Z'
+created: '2024-12-17T22:46:43.816342+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "d3f5e52d24e9c1eae5abe6c866cced63"
+  contributing component: message
   component:
     default*
       message*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/message_with_key_pair_values.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/message_with_key_pair_values.pysnap
index 8ccf1ee8ff4b2d..2e52974be5436c 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/message_with_key_pair_values.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/message_with_key_pair_values.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-07-24T22:42:31.602082Z'
+created: '2024-12-17T22:46:43.868876+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "61490ee252f3d4dd5a19680dca2410d3"
+  contributing component: message
   component:
     default*
       message*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/minified_javascript.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/minified_javascript.pysnap
index 110e219f5c2315..49a86d4444dc22 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/minified_javascript.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/minified_javascript.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:27.774505Z'
+created: '2024-12-17T22:46:43.929047+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -234,6 +235,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "074e2ed5d89f602d31be5742ac107fef"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_complex_function_names.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_complex_function_names.pysnap
index a7dced73d0ab73..b4fe5d7fa69037 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_complex_function_names.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_complex_function_names.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:27.988807Z'
+created: '2024-12-17T22:46:43.972288+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -25,6 +26,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "3e0ae2ce25cce2fca3390f3416e6a82a"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_driver_crash1.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_driver_crash1.pysnap
index 0f9a3ab513b8b5..dbfab6978221ae 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_driver_crash1.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_driver_crash1.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-04-02T09:10:51.843353Z'
+created: '2024-12-17T22:46:44.038186+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -47,6 +48,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "c0efa3bdfea2264ffda696557937ff9f"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_driver_crash2.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_driver_crash2.pysnap
index 8926234cadd98f..0756d8f0924125 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_driver_crash2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_driver_crash2.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-04-02T09:10:50.785912Z'
+created: '2024-12-17T22:46:44.083479+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -38,6 +39,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "c0efa3bdfea2264ffda696557937ff9f"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_driver_crash3.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_driver_crash3.pysnap
index 8fd541f8ed0a54..cb6e8e6117e1bb 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_driver_crash3.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_driver_crash3.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-04-02T09:10:50.664082Z'
+created: '2024-12-17T22:46:44.183141+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -48,6 +49,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "c0efa3bdfea2264ffda696557937ff9f"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_limit_frames.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_limit_frames.pysnap
index 975b0167bc0b5c..b27484ce659687 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_limit_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_limit_frames.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:28.119869Z'
+created: '2024-12-17T22:46:44.431518+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -25,6 +26,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "3e0ae2ce25cce2fca3390f3416e6a82a"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_malloc_chain.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_malloc_chain.pysnap
index 83b44a65ff8572..ff86d8ca12774e 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_malloc_chain.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_malloc_chain.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-04-02T09:10:51.071132Z'
+created: '2024-12-17T22:46:44.510989+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -44,6 +45,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "a433bc7901e2b36f1f85a756f6457620"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_no_filenames.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_no_filenames.pysnap
index ee6e73b104c269..cd26018528a910 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_no_filenames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_no_filenames.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-03-31T11:22:50.321475Z'
+created: '2024-12-17T22:46:44.571847+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -58,6 +59,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "3e0ae2ce25cce2fca3390f3416e6a82a"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_unlimited_frames.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_unlimited_frames.pysnap
index ede2de1c6e439e..9f3634f00c246b 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_unlimited_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_unlimited_frames.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:28.351104Z'
+created: '2024-12-17T22:46:44.624647+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -25,6 +26,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "3e0ae2ce25cce2fca3390f3416e6a82a"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_windows_anon_namespace.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_windows_anon_namespace.pysnap
index eb0cc2bb8d73b3..27e517c8923830 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_windows_anon_namespace.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_windows_anon_namespace.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:28.397519Z'
+created: '2024-12-17T22:46:44.679820+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -51,6 +52,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "f133068802b8a7f6162e0c7d8fc6b984"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_with_function_name.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_with_function_name.pysnap
index e298cb10f8efea..4e3e1cc6521bb2 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_with_function_name.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/native_with_function_name.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:28.432813Z'
+created: '2024-12-17T22:46:44.734477+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -51,6 +52,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "7b28306805da7fea54ee3441e8e1dc1a"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/node_exception_weird.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/node_exception_weird.pysnap
index 4ab1931dcc536c..63bf0426fc4200 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/node_exception_weird.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/node_exception_weird.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:28.459367Z'
+created: '2024-12-17T22:46:44.794988+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "bc6bc0f8bfa8a2fe5f0e4034384bfec1"
+  contributing component: exception
   component:
     app*
       exception*
@@ -122,6 +123,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "6a3275e56067560bf20cb311f724f897"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/node_low_level_async.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/node_low_level_async.pysnap
index 63a6bed1ee5097..517b6ada67df84 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/node_low_level_async.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/node_low_level_async.pysnap
@@ -1,8 +1,11 @@
 ---
+created: '2024-12-17T22:46:44.849809+00:00'
+creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -26,6 +29,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "0006292929602ffceed7679beb242d96"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/python_exception_base.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/python_exception_base.pysnap
index f5e14afea8559a..27e6cbf95fd536 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/python_exception_base.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/python_exception_base.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-02-15T10:11:48.466717Z'
+created: '2024-12-17T22:46:44.897341+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       chained-exception (ignored because hash matches system variant)
@@ -33,6 +34,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "9aef9026a457d312531c07644b271314"
+  contributing component: chained-exception
   component:
     system*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/python_grouping_enhancer_away_from_crash.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/python_grouping_enhancer_away_from_crash.pysnap
index 1809510fa96bbb..d0d88612a30882 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/python_grouping_enhancer_away_from_crash.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/python_grouping_enhancer_away_from_crash.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-11-12T10:56:55.271811Z'
+created: '2024-12-17T22:46:44.948326+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "79f7443afa4022bb3e5093e765e755bb"
+  contributing component: exception
   component:
     app*
       exception*
@@ -126,6 +127,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "5586fbb54ed18866eea266e91cee7f8b"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/python_grouping_enhancer_towards_crash.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/python_grouping_enhancer_towards_crash.pysnap
index 2a72f056a36b08..15b1c08a34ce8d 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/python_grouping_enhancer_towards_crash.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/python_grouping_enhancer_towards_crash.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-11-12T10:56:53.981604Z'
+created: '2024-12-17T22:46:45.002075+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -126,6 +127,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "20fc367de6e7f2dcfd2f08ddd4fd8618"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/python_http_error.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/python_http_error.pysnap
index 76286f4f373008..9a283af50a235e 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/python_http_error.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/python_http_error.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-08-25T09:17:10.249624Z'
+created: '2024-12-17T22:46:45.052386+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "55b71821bccfe62d0df089e2f406c651"
+  contributing component: exception
   component:
     app*
       exception*
@@ -49,6 +50,7 @@ app:
 --------------------------------------------------------------------------
 default:
   hash: null
+  contributing component: null
   component:
     default (exception of app/system takes precedence)
       message (exception of app/system takes precedence)
@@ -56,6 +58,7 @@ default:
 --------------------------------------------------------------------------
 system:
   hash: "a140a9ee6bbfb7ca9c21234dc287f2a6"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/react_native.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/react_native.pysnap
index 1454a6134b244a..7218ebb5de0944 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/react_native.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/react_native.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:28.763183Z'
+created: '2024-12-17T22:46:45.111865+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -250,6 +251,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "f8f4d8cbe0c85758ed193d0f5d9955b3"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_cocoa.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_cocoa.pysnap
index 75c5d914222880..0a397273641b32 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_cocoa.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_cocoa.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:28.785640Z'
+created: '2024-12-17T22:46:45.157670+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "84ed5488c9c498282e0f1691b658f17f"
+  contributing component: stacktrace
   component:
     app*
       stacktrace*
@@ -21,6 +22,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "41156b93307634d3815da88429911825"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_collapse_recursion.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_collapse_recursion.pysnap
index 71d0a700204a47..62a81629c28026 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_collapse_recursion.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_collapse_recursion.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-11-28T16:31:35.546537Z'
+created: '2024-12-17T22:46:45.205064+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -74,6 +75,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "9bdadae4fa003cef6cf460ff1325e54b"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_compute_hashes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_compute_hashes.pysnap
index d3544618070388..d35f66b44cb27a 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_compute_hashes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_compute_hashes.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:28.830007Z'
+created: '2024-12-17T22:46:45.247796+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "fbad177f80c1eff3bd6b252e09576292"
+  contributing component: stacktrace
   component:
     app*
       stacktrace*
@@ -21,6 +22,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "06d370794820bec071005bf2e589d247"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_discards_seemingly_useless_stack.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_discards_seemingly_useless_stack.pysnap
index 46643f5683f28b..6c7898a644bb21 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_discards_seemingly_useless_stack.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_discards_seemingly_useless_stack.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:28.843497Z'
+created: '2024-12-17T22:46:45.300313+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app
       stacktrace (ignored single frame stack)
@@ -20,6 +21,7 @@ fallback:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: null
   component:
     system
       stacktrace (ignored single frame stack)
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_does_not_discard_non_urls.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_does_not_discard_non_urls.pysnap
index 6e8125e0b06e72..df8205b5746035 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_does_not_discard_non_urls.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_does_not_discard_non_urls.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:28.870371Z'
+created: '2024-12-17T22:46:45.352443+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
@@ -18,6 +19,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "9b478586e7375aef8bedb80ae2fcaab7"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_does_not_group_different_js_errors.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_does_not_group_different_js_errors.pysnap
index fde030b07a6f4a..4a8157f34f0a98 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_does_not_group_different_js_errors.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_does_not_group_different_js_errors.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:28.910289Z'
+created: '2024-12-17T22:46:45.403432+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app
       stacktrace (ignored single frame stack)
@@ -20,6 +21,7 @@ fallback:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: null
   component:
     system
       stacktrace (ignored single frame stack)
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_enforce_min_frames.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_enforce_min_frames.pysnap
index 235a640e9547a4..1ce975ec4bc185 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_enforce_min_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_enforce_min_frames.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-04-02T10:31:43.854003Z'
+created: '2024-12-17T22:46:45.510365+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -37,6 +38,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "3e0ae2ce25cce2fca3390f3416e6a82a"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_excludes_single_frame_urls.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_excludes_single_frame_urls.pysnap
index 1a68777f2406ee..c8ffbf1e7baab6 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_excludes_single_frame_urls.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_excludes_single_frame_urls.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:29.005269Z'
+created: '2024-12-17T22:46:45.582772+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app
       stacktrace (ignored single frame stack)
@@ -22,6 +23,7 @@ fallback:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: null
   component:
     system
       stacktrace (ignored single frame stack)
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_hash_without_system_frames.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_hash_without_system_frames.pysnap
index 8387521e466b79..6c31e5e8b21c2c 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_hash_without_system_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_hash_without_system_frames.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:29.024347Z'
+created: '2024-12-17T22:46:45.626406+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "19fcc04a0c59eaf564ee1a00c58574cc"
+  contributing component: stacktrace
   component:
     app*
       stacktrace*
@@ -21,6 +22,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "3aa7e7dacc3a98cf8316a226c4485053"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_ignores_singular_anonymous_frame.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_ignores_singular_anonymous_frame.pysnap
index de7778ae2dae7b..374ff5e7b26f81 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_ignores_singular_anonymous_frame.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_ignores_singular_anonymous_frame.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:29.043130Z'
+created: '2024-12-17T22:46:45.668011+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app
       stacktrace
@@ -31,6 +32,7 @@ fallback:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: null
   component:
     system
       stacktrace
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_negated_match.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_negated_match.pysnap
index 3108360ee29d55..51adedc38c151c 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_negated_match.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_negated_match.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-04-02T10:31:44.323391Z'
+created: '2024-12-17T22:46:45.728262+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -37,6 +38,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "3e0ae2ce25cce2fca3390f3416e6a82a"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_rust.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_rust.pysnap
index 6b98ccda55a3ac..d47679e0c691fb 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_rust.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_rust.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-04-02T10:31:43.480874Z'
+created: '2024-12-17T22:46:45.777881+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -37,6 +38,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "3e0ae2ce25cce2fca3390f3416e6a82a"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_rust2.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_rust2.pysnap
index a5fbbe51d1223e..37a489640cbc65 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_rust2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_rust2.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-04-02T10:31:43.591879Z'
+created: '2024-12-17T22:46:45.838431+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
@@ -37,6 +38,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "3e0ae2ce25cce2fca3390f3416e6a82a"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_with_minimal_app_frames.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_with_minimal_app_frames.pysnap
index 387f9f8eab77b1..9b19bc93505ffe 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_with_minimal_app_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/stacktrace_with_minimal_app_frames.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:29.204416Z'
+created: '2024-12-17T22:46:45.891811+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (less than 10% of frames are in-app)
@@ -71,6 +72,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "3aa7e7dacc3a98cf8316a226c4485053"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
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 17f86b18cf6c9a..cf948a7c673220 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,10 +1,11 @@
 ---
-created: '2024-12-03T22:09:00.262494+00:00'
+created: '2024-12-17T22:46:45.940564+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "1f5bdebe3c9f414c7dbb4296a8353245"
+  contributing component: template
   component:
     default*
       template*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/threads_compute_hashes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/threads_compute_hashes.pysnap
index 7be432e373373b..6d09017d33276a 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/threads_compute_hashes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/threads_compute_hashes.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-02-15T10:11:48.993265Z'
+created: '2024-12-17T22:46:45.985236+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (threads of system take precedence)
       threads (ignored because hash matches system variant)
@@ -19,6 +20,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "39db5b4edf187e89cec12245e5c9fb3c"
+  contributing component: threads
   component:
     system*
       threads*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/threads_no_hash.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/threads_no_hash.pysnap
index 7644e77594f14d..5c0977f081c5bf 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/threads_no_hash.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/threads_no_hash.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:29.249031Z'
+created: '2024-12-17T22:46:46.031220+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app
       threads (ignored because contains 2 threads)
@@ -14,6 +15,7 @@ fallback:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: null
   component:
     system
       threads (ignored because contains 2 threads)
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/unity.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/unity.pysnap
index 221e2d6a0e5c9c..c0709f7b4e8bd8 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/unity.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/unity.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-11-08T21:03:06.179453Z'
+created: '2024-12-17T22:46:46.077627+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "ca611011ce2c949c4371754b1754bba9"
+  contributing component: exception
   component:
     app*
       exception*
@@ -72,6 +73,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "48fa46727e0f07477677a70d1e921f3f"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/actix.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/actix.pysnap
index 01fa02a925091b..e0501557fb35c8 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/actix.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/actix.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-11-12T10:57:14.117983Z'
+created: '2024-12-17T22:46:46.162069+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "703d3dd9cb763e3f5037f659d27da947"
+  contributing component: exception
   component:
     app*
       exception*
@@ -397,6 +398,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "1df163ce3be65319df4fcc9cb34b60c1"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/android_anr.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/android_anr.pysnap
index 63face21c32000..49a15816813af0 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/android_anr.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/android_anr.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:44.625605+00:00'
+created: '2024-12-17T22:46:46.222069+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -788,6 +789,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "2e41d71bc38b212d73f8d68415389f45"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/aspnetcore.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/aspnetcore.pysnap
index a50b2e3cb93b63..4f70c7bda3d986 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/aspnetcore.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/aspnetcore.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-08-25T09:17:19.194245Z'
+created: '2024-12-17T22:46:46.278839+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "228c649a3aa0901622c0a0e66ab0522c"
+  contributing component: exception
   component:
     app*
       exception*
@@ -173,6 +174,7 @@ app:
 --------------------------------------------------------------------------
 default:
   hash: null
+  contributing component: null
   component:
     default (exception of app/system takes precedence)
       message (exception of app/system takes precedence)
@@ -180,6 +182,7 @@ default:
 --------------------------------------------------------------------------
 system:
   hash: "4ccd0f1953483581ba360c7518f90332"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/block_invoke.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/block_invoke.pysnap
index 598aa9643f3c89..757220b22dcdfd 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/block_invoke.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/block_invoke.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-03-22T11:57:30.833871+00:00'
+created: '2024-12-17T22:46:46.327695+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "ff6c4ee7c54f118a9647ee86f0c2b0b0"
+  contributing component: threads
   component:
     app*
       threads*
@@ -21,6 +22,7 @@ app:
 --------------------------------------------------------------------------
 default:
   hash: null
+  contributing component: null
   component:
     default (threads of app/system take precedence)
       message (threads of app/system take precedence)
@@ -28,6 +30,7 @@ default:
 --------------------------------------------------------------------------
 system:
   hash: "cff360e554b4acecd9fd2534d9051870"
+  contributing component: threads
   component:
     system*
       threads*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/bugly.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/bugly.pysnap
index 0ccc983dbf2d5b..8e560c0d492282 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/bugly.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/bugly.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:44.771569+00:00'
+created: '2024-12-17T22:46:46.373031+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -30,6 +31,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "d9c9b0f9ba46e32fddd7cd1512fad235"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/built_in_fingerprint_chunkload_error.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/built_in_fingerprint_chunkload_error.pysnap
index d8fcf08e30cf9b..17eebf5b2aa2f8 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/built_in_fingerprint_chunkload_error.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/built_in_fingerprint_chunkload_error.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:44.865151+00:00'
+created: '2024-12-17T22:46:46.465771+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -23,6 +24,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "925057f3a51f4b7bf154e59a63eb3f86"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/built_in_fingerprint_chunkload_error_hybrid_fingerprint.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/built_in_fingerprint_chunkload_error_hybrid_fingerprint.pysnap
index 4f80f437925127..45ccdefe301f41 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/built_in_fingerprint_chunkload_error_hybrid_fingerprint.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/built_in_fingerprint_chunkload_error_hybrid_fingerprint.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:44.819980+00:00'
+created: '2024-12-17T22:46:46.421711+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -25,6 +26,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "8cce12f1da956a1fd4e7c6078bc311fb"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/callee_guaranteed.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/callee_guaranteed.pysnap
index 60a6a11e15b43a..415e7b1b6989c9 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/callee_guaranteed.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/callee_guaranteed.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-07-07T14:32:29.938309Z'
+created: '2024-12-17T22:46:46.521412+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "e2ea2eb86d26407f06b59beb3a444c91"
+  contributing component: exception
   component:
     app*
       exception*
@@ -128,6 +129,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "d23d0dfeac5f1349ceb624b330670b25"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/checksum_no_regex_match.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/checksum_no_regex_match.pysnap
index e373309f0884e7..305e8b1bba09d9 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/checksum_no_regex_match.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/checksum_no_regex_match.pysnap
@@ -1,12 +1,8 @@
 ---
-created: '2024-11-08T18:04:40.113591+00:00'
+created: '2024-12-16T06:50:35.294699+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
-checksum:
-  hash: "not a legit checksum"
-  checksum: "not a legit checksum"
---------------------------------------------------------------------------
 hashed_checksum:
   hash: "de46d023e69b171b90ccf3ebca7aede4"
   checksum: "de46d023e69b171b90ccf3ebca7aede4"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/checksum_no_regex_match_long.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/checksum_no_regex_match_long.pysnap
deleted file mode 100644
index 7b42b26f9874b7..00000000000000
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/checksum_no_regex_match_long.pysnap
+++ /dev/null
@@ -1,9 +0,0 @@
----
-created: '2024-11-08T18:04:39.458827+00:00'
-creator: sentry
-source: tests/sentry/grouping/test_variants.py
----
-hashed_checksum:
-  hash: "2c2e85a6e73109222f131228ed06a7af"
-  checksum: "2c2e85a6e73109222f131228ed06a7af"
-  raw_checksum: "not a legit checksum and also too long a string"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/cocoa_dispatch_client_callout.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/cocoa_dispatch_client_callout.pysnap
index 17b28963a92d7e..d61ddda9be8823 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/cocoa_dispatch_client_callout.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/cocoa_dispatch_client_callout.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-03-22T11:57:34.754351+00:00'
+created: '2024-12-17T22:46:46.662151+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "7b230a2bb8a040d3e337c6205147e990"
+  contributing component: threads
   component:
     app*
       threads*
@@ -57,6 +58,7 @@ app:
 --------------------------------------------------------------------------
 default:
   hash: null
+  contributing component: null
   component:
     default (threads of app/system take precedence)
       message (threads of app/system take precedence)
@@ -64,6 +66,7 @@ default:
 --------------------------------------------------------------------------
 system:
   hash: "96df2174dd7e0ad3c31948a9de020fba"
+  contributing component: threads
   component:
     system*
       threads*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/connection_error.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/connection_error.pysnap
index 81a0208f657e09..efdb5c0e8130dd 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/connection_error.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/connection_error.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-08-25T09:17:20.100596Z'
+created: '2024-12-17T22:46:46.713009+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "6b059b9febc815ac18ac4d2082e38a9b"
+  contributing component: exception
   component:
     app*
       exception*
@@ -115,6 +116,7 @@ app:
 --------------------------------------------------------------------------
 default:
   hash: null
+  contributing component: null
   component:
     default (exception of app/system takes precedence)
       message (exception of app/system takes precedence)
@@ -122,6 +124,7 @@ default:
 --------------------------------------------------------------------------
 system:
   hash: "013d3477a774fe20c468dc8accd516f1"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/csp.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/csp.pysnap
index cab2c5fe570547..91588ef37174c5 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/csp.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/csp.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:37.468314Z'
+created: '2024-12-17T22:46:47.083922+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "666766514295bb52812324097cdaf53e"
+  contributing component: csp
   component:
     default*
       csp*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/csp_img_src.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/csp_img_src.pysnap
index 2f4a7963840212..316685d7ab8cd4 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/csp_img_src.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/csp_img_src.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:37.480874Z'
+created: '2024-12-17T22:46:46.760211+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "1742101e08eb1608f569751dfedd0062"
+  contributing component: csp
   component:
     default*
       csp*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/csp_no_blocked_uri.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/csp_no_blocked_uri.pysnap
index 920fb6699fa4f7..0b6f63cde86bb7 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/csp_no_blocked_uri.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/csp_no_blocked_uri.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:37.494031Z'
+created: '2024-12-17T22:46:46.804031+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "efddf1cde918097259aa7d4904fb1942"
+  contributing component: csp
   component:
     default*
       csp*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/csp_script_data_uri.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/csp_script_data_uri.pysnap
index 0431f051817e63..3cd92d0b73acb4 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/csp_script_data_uri.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/csp_script_data_uri.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:37.510732Z'
+created: '2024-12-17T22:46:46.852391+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "4e6f2bce9d121aa89f4dc5e5da08afb5"
+  contributing component: csp
   component:
     default*
       csp*
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
index 01e01ecf7279cd..8c6243f7366353 100644
--- 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
@@ -1,10 +1,11 @@
 ---
-created: '2024-12-02T21:59:39.975587+00:00'
+created: '2024-12-17T22:46:46.897368+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "56c6520f35bce2f89ed2c4e725ccef65"
+  contributing component: csp
   component:
     default*
       csp*
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
index d99cbc26406bc7..c7db6814e22537 100644
--- 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
@@ -1,10 +1,11 @@
 ---
-created: '2024-12-02T21:59:40.046341+00:00'
+created: '2024-12-17T22:46:46.940665+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "d346ee37d19a2be6587e609075ca2d57"
+  contributing component: csp
   component:
     default*
       csp*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/csp_script_src_uri.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/csp_script_src_uri.pysnap
index a3e3be0347549d..d17e4df39bc04c 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/csp_script_src_uri.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/csp_script_src_uri.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:37.529024Z'
+created: '2024-12-17T22:46:46.982294+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "223cdacfe5b4b830dc700b5c18cc21b4"
+  contributing component: csp
   component:
     default*
       csp*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/csp_style_src_elem.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/csp_style_src_elem.pysnap
index 1f20c5121e302a..b4d42c5ac9f04e 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/csp_style_src_elem.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/csp_style_src_elem.pysnap
@@ -1,8 +1,11 @@
 ---
+created: '2024-12-17T22:46:47.035190+00:00'
+creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "537a973f594c364842893e9a72af62a5"
+  contributing component: csp
   component:
     default*
       csp*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/custom_fingerprint_client.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/custom_fingerprint_client.pysnap
index e39632daba3bc5..6ff22aafe03df0 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/custom_fingerprint_client.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/custom_fingerprint_client.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-11-08T18:04:41.360269+00:00'
+created: '2024-12-17T22:46:47.192317+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: exception
   component:
     app (custom fingerprint takes precedence)
       exception*
@@ -174,6 +175,7 @@ custom_fingerprint:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: exception
   component:
     system (custom fingerprint takes precedence)
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/custom_fingerprint_client_and_server_rule.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/custom_fingerprint_client_and_server_rule.pysnap
index f2ea1122fc45ef..197711500d7f10 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/custom_fingerprint_client_and_server_rule.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/custom_fingerprint_client_and_server_rule.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-11-08T18:04:41.229650+00:00'
+created: '2024-12-17T22:46:47.139694+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: exception
   component:
     app (custom fingerprint takes precedence)
       exception*
@@ -174,6 +175,7 @@ custom_fingerprint:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: exception
   component:
     system (custom fingerprint takes precedence)
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/custom_fingerprint_server_rule.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/custom_fingerprint_server_rule.pysnap
index 5900303d1dc528..7d301017311643 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/custom_fingerprint_server_rule.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/custom_fingerprint_server_rule.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-11-08T18:04:41.463025+00:00'
+created: '2024-12-17T22:46:47.238208+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: exception
   component:
     app (custom fingerprint takes precedence)
       exception*
@@ -174,6 +175,7 @@ custom_fingerprint:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: exception
   component:
     system (custom fingerprint takes precedence)
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_cocoa_nserror.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_cocoa_nserror.pysnap
index d5d03e2318cf27..96a41fab317c12 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_cocoa_nserror.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_cocoa_nserror.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-15T23:12:19.141419+00:00'
+created: '2024-12-17T22:46:47.340523+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "029f3b967068b1539f96957b7c0451d7"
+  contributing component: exception
   component:
     app*
       exception*
@@ -89,6 +90,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: null
   component:
     system (exception of app takes precedence)
       threads (exception of app takes precedence)
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 b23b11d5fa1e31..a34ea319e1f1e3 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,10 +1,11 @@
 ---
-created: '2024-12-03T22:09:00.459963+00:00'
+created: '2024-12-17T22:46:47.481011+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "b23ee1963904c2ca87b145febf94b66c"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_compute_hashes_2.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_compute_hashes_2.pysnap
index e676809d73bd0f..76157914cc8a1f 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_compute_hashes_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_compute_hashes_2.pysnap
@@ -1,13 +1,14 @@
 ---
-created: '2021-02-15T10:11:51.448335Z'
+created: '2024-12-17T22:46:47.385024+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
-  hash: null
+  hash: "9509e122c6175606d52862fa4f64853c"
+  contributing component: exception
   component:
-    app (exception of system takes precedence)
-      exception (ignored because hash matches system variant)
+    app*
+      exception*
         stacktrace*
           frame*
             filename*
@@ -18,10 +19,11 @@ app:
           "hello world"
 --------------------------------------------------------------------------
 system:
-  hash: "9509e122c6175606d52862fa4f64853c"
+  hash: null
+  contributing component: null
   component:
-    system*
-      exception*
+    system (exception of app takes precedence)
+      exception (ignored because hash matches app variant)
         stacktrace*
           frame*
             filename*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_compute_hashes_3.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_compute_hashes_3.pysnap
index e7811ae82bf1be..9b978e460f9fae 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_compute_hashes_3.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_compute_hashes_3.pysnap
@@ -1,13 +1,14 @@
 ---
-created: '2021-02-15T10:11:51.105902Z'
+created: '2024-12-17T22:46:47.432793+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
-  hash: null
+  hash: "669cb6664e0f5fed38665da04e464f7e"
+  contributing component: chained-exception
   component:
-    app (exception of system takes precedence)
-      chained-exception (ignored because hash matches system variant)
+    app*
+      chained-exception*
         exception*
           stacktrace*
             frame*
@@ -28,10 +29,11 @@ app:
             "hello world"
 --------------------------------------------------------------------------
 system:
-  hash: "669cb6664e0f5fed38665da04e464f7e"
+  hash: null
+  contributing component: null
   component:
-    system*
-      chained-exception*
+    system (exception of app takes precedence)
+      chained-exception (ignored because hash matches app variant)
         exception*
           stacktrace*
             frame*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_bad_duplicate_id.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_bad_duplicate_id.pysnap
index fd99440cf4a25e..1d897c8148066b 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_bad_duplicate_id.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_bad_duplicate_id.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-16T04:46:13.601320Z'
+created: '2024-12-17T22:46:47.535452+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "e2bf1e0628b7b1824a9b63dec7a079a3"
+  contributing component: chained-exception
   component:
     app*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_bad_missing_parent.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_bad_missing_parent.pysnap
index 8eabc0eb629650..8ed2ef51edef99 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_bad_missing_parent.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_bad_missing_parent.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-16T04:47:01.745042Z'
+created: '2024-12-17T22:46:47.581681+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "a4f16891fa438620699cb2d9af5cc827"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_bad_out_of_sequence.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_bad_out_of_sequence.pysnap
index cdc65f7d991dfc..0216374013ec37 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_bad_out_of_sequence.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_bad_out_of_sequence.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-16T04:46:25.199338Z'
+created: '2024-12-17T22:46:47.633796+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "f0078a82f351095ba595daa7d493aa3c"
+  contributing component: chained-exception
   component:
     app*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_bad_parent_with_parent.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_bad_parent_with_parent.pysnap
index 882929361abd94..ac7074a7d0a8bf 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_bad_parent_with_parent.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_bad_parent_with_parent.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-16T04:47:02.566841Z'
+created: '2024-12-17T22:46:47.690678+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "0809098f9f613b63467605dd1739cc9b"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_bad_with_cycle.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_bad_with_cycle.pysnap
index fead9e13d14e99..691c6f73c02fd1 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_bad_with_cycle.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_bad_with_cycle.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-16T04:47:10.467599Z'
+created: '2024-12-17T22:46:47.743381+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "0809098f9f613b63467605dd1739cc9b"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_one_exception.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_one_exception.pysnap
index 399e7693d45469..f8fc376bf0a3ac 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_one_exception.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_one_exception.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-04T06:18:44.222149Z'
+created: '2024-12-17T22:46:47.791926+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "a4f16891fa438620699cb2d9af5cc827"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_one_type_under_nested_groups.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_one_type_under_nested_groups.pysnap
index f4c67b2c939c74..9daaf1b4a102db 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_one_type_under_nested_groups.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_one_type_under_nested_groups.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-04T05:13:36.607396Z'
+created: '2024-12-17T22:46:47.838324+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "a4f16891fa438620699cb2d9af5cc827"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_one_type_with_different_values.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_one_type_with_different_values.pysnap
index f3e1bd8142b679..8f0ee6acaf556d 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_one_type_with_different_values.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_one_type_with_different_values.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-04T20:21:22.496734Z'
+created: '2024-12-17T22:46:47.888112+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "17022e0561e9b6e6351723a08aa81b18"
+  contributing component: chained-exception
   component:
     app*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_one_type_with_similar_values.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_one_type_with_similar_values.pysnap
index 19150d37c1f7b2..1cd73d21fcf4e5 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_one_type_with_similar_values.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_one_type_with_similar_values.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-04T00:43:37.188227Z'
+created: '2024-12-17T22:46:47.976860+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "a4f16891fa438620699cb2d9af5cc827"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_one_type_with_similar_values_and_children.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_one_type_with_similar_values_and_children.pysnap
index 6ab54ba821fa85..a150eae7ad9554 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_one_type_with_similar_values_and_children.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_one_type_with_similar_values_and_children.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-04T01:23:18.754575Z'
+created: '2024-12-17T22:46:47.934334+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "f0078a82f351095ba595daa7d493aa3c"
+  contributing component: chained-exception
   component:
     app*
       chained-exception*
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
index 80e614d1b72475..e8b2e0720ad230 100644
--- 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
@@ -1,10 +1,11 @@
 ---
-created: '2024-11-19T00:26:29.960931+00:00'
+created: '2024-12-17T22:46:48.032921+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "d505dfb9059ac63c11955233323a9100"
+  contributing component: chained-exception
   component:
     app*
       chained-exception*
@@ -48,6 +49,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "4f9cc6a81f4eb34f9e917374f281b9dc"
+  contributing component: chained-exception
   component:
     system*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_two_types.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_two_types.pysnap
index 4e787b58398e46..4a09ea4263ad5b 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_two_types.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_two_types.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-04T05:13:35.411590Z'
+created: '2024-12-17T22:46:48.136859+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "bca604b98cb4637167eb6190a92e8933"
+  contributing component: chained-exception
   component:
     app*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_two_types_under_nested_groups.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_two_types_under_nested_groups.pysnap
index 1c86b9b859d586..b38e9a0b67f915 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_two_types_under_nested_groups.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_two_types_under_nested_groups.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-04T06:07:44.875962Z'
+created: '2024-12-17T22:46:48.085765+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "fca0fd23f09e8da4481304ef2a531100"
+  contributing component: chained-exception
   component:
     app*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_javascript_no_in_app.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_javascript_no_in_app.pysnap
index 3dbe40e9e64ee9..12d7579759f796 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_javascript_no_in_app.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_javascript_no_in_app.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:46.827152+00:00'
+created: '2024-12-17T22:46:48.189226+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -32,6 +33,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "26552f86ca2368e708afa1df6effc1c5"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_without_type.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_without_type.pysnap
index a8843b61820e81..91518252f65f90 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_without_type.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_without_type.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-02-12T22:47:10.164106Z'
+created: '2024-12-17T22:46:48.249983+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "5eb63bbbe01eeed093cb22bb8f5acdc3"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_without_value.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_without_value.pysnap
index de686a23f43f09..450654475a0a31 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_without_value.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_without_value.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-02-12T22:47:11.200438Z'
+created: '2024-12-17T22:46:48.359939+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "5a2cfd89b7b171fd7b4794b08023d04f"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/expectct.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/expectct.pysnap
index 9fe4d40ad22eaf..5da88dfcb7f152 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/expectct.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/expectct.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:37.726616Z'
+created: '2024-12-17T22:46:48.428863+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "3d2933f4b5ec459ec8d569a398fd328c"
+  contributing component: expect-ct
   component:
     default*
       expect-ct*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/fallback_prefix_level_1.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/fallback_prefix_level_1.pysnap
index 0d680b8b37691a..944fa444c89895 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/fallback_prefix_level_1.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/fallback_prefix_level_1.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:47.066832+00:00'
+created: '2024-12-17T22:46:48.483275+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -32,6 +33,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "b85897bf204fd8e90ff495b47502f281"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_compute_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
index c682db502fd948..ddbcd20f91575a 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_compute_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,10 +1,11 @@
 ---
-created: '2024-12-03T22:09:00.505586+00:00'
+created: '2024-12-17T22:46:48.544562+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "526b64456c48836a46ec1a89544fd412"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_empty_list.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_empty_list.pysnap
index dee4b2b9a53765..06d71a3a850306 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_empty_list.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_empty_list.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:47.170014+00:00'
+created: '2024-12-17T22:46:48.597570+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app
       stacktrace (ignored because it contains no frames)
@@ -14,6 +15,7 @@ fallback:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: null
   component:
     system
       stacktrace (ignored because it contains no frames)
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_ENHANCED_enhancer_by_classes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_ENHANCED_enhancer_by_classes.pysnap
index b10cd6c7bd19f5..3e6b79d081b788 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_ENHANCED_enhancer_by_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_ENHANCED_enhancer_by_classes.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:47.228494+00:00'
+created: '2024-12-17T22:46:48.657291+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "d8f406c2efb312db2231282f94647b1d"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_ENHANCED_fast_class_by_classes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_ENHANCED_fast_class_by_classes.pysnap
index da720b63dcd8c5..555cabd856c571 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_ENHANCED_fast_class_by_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_ENHANCED_fast_class_by_classes.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:47.283008+00:00'
+created: '2024-12-17T22:46:48.732299+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "91f42e615037e91a3c6f8a6fcf04056b"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_ENHANCED_spring_classes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_ENHANCED_spring_classes.pysnap
index 47905726cb4322..271c58ede59371 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_ENHANCED_spring_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_ENHANCED_spring_classes.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:47.334512+00:00'
+created: '2024-12-17T22:46:48.809341+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "45c0b0a8c777e7a7040d7c39233a08a5"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_dartlang_sdk.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_dartlang_sdk.pysnap
index 457e6f403cafe6..b0b0ef4bbfdd5e 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_dartlang_sdk.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_dartlang_sdk.pysnap
@@ -1,13 +1,14 @@
 ---
-created: '2021-08-23T14:18:12.669833Z'
+created: '2024-12-17T22:46:48.968013+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
-  hash: null
+  hash: "82639bcdd4eca16551e8cd3448f48ed4"
+  contributing component: stacktrace
   component:
-    app (stacktrace of system takes precedence)
-      stacktrace (ignored because hash matches system variant)
+    app*
+      stacktrace*
         frame*
           filename*
             "async_patch.dart"
@@ -15,10 +16,11 @@ app:
             "_asyncStartSync"
 --------------------------------------------------------------------------
 system:
-  hash: "82639bcdd4eca16551e8cd3448f48ed4"
+  hash: null
+  contributing component: null
   component:
-    system*
-      stacktrace*
+    system (stacktrace of app takes precedence)
+      stacktrace (ignored because hash matches app variant)
         frame*
           filename*
             "async_patch.dart"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_extra_ENHANCED_clojure_classes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_extra_ENHANCED_clojure_classes.pysnap
index 89a755a3e48353..d891f5af4bf855 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_extra_ENHANCED_clojure_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_extra_ENHANCED_clojure_classes.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:47.430850+00:00'
+created: '2024-12-17T22:46:49.056355+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "353e05904b48bd3ae4fa9623934a70d0"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_extra_ENHANCED_enhancer_by_classes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_extra_ENHANCED_enhancer_by_classes.pysnap
index d763d771facc29..74d0137c4fe918 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_extra_ENHANCED_enhancer_by_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_extra_ENHANCED_enhancer_by_classes.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:47.486368+00:00'
+created: '2024-12-17T22:46:49.114245+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "f771960161f86b1f8eec4edc3016e1c0"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_extra_ENHANCED_spring_classes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_extra_ENHANCED_spring_classes.pysnap
index 21b74d3db47ebd..8836045a74217e 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_extra_ENHANCED_spring_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_extra_ENHANCED_spring_classes.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:47.535650+00:00'
+created: '2024-12-17T22:46:49.176142+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "be15ca3d511b96918e087c4f42503ca2"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_filename_from_url_origin_corner_cases.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_filename_from_url_origin_corner_cases.pysnap
index a5415c47c5c37d..a209840cf6f927 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_filename_from_url_origin_corner_cases.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_filename_from_url_origin_corner_cases.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:47.586991+00:00'
+created: '2024-12-17T22:46:49.238074+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -30,6 +31,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "bd8c868a3914eeb4f48e7ef46f19a0df"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_filename_if_abs_path_is_http.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_filename_if_abs_path_is_http.pysnap
index 572e998b6b1633..8e8b3a29e2879e 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_filename_if_abs_path_is_http.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_filename_if_abs_path_is_http.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:47.634203+00:00'
+created: '2024-12-17T22:46:49.299104+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "098f6bcd4621d373cade4e832627b4f6"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_filename_if_blob.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_filename_if_blob.pysnap
index 1d8c9a5afcf4fe..ab88628238214c 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_filename_if_blob.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_filename_if_blob.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:47.679869+00:00'
+created: '2024-12-17T22:46:49.354373+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app
       stacktrace (ignored because it contains no in-app frames)
@@ -17,6 +18,7 @@ fallback:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: null
   component:
     system
       stacktrace (ignored because it contains no contributing frames)
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_filename_if_http.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_filename_if_http.pysnap
index f5fc0a9cf86319..d5103f25c7dcc6 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_filename_if_http.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_filename_if_http.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:47.724150+00:00'
+created: '2024-12-17T22:46:49.415628+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -18,6 +19,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "098f6bcd4621d373cade4e832627b4f6"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_filename_if_https.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_filename_if_https.pysnap
index 912c17e57757ba..ce13382162451b 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_filename_if_https.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_filename_if_https.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:47.767444+00:00'
+created: '2024-12-17T22:46:49.473377+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -18,6 +19,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "098f6bcd4621d373cade4e832627b4f6"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_flutter_sdk.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_flutter_sdk.pysnap
index b4741f75a20d21..81fa96db0036af 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_flutter_sdk.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_flutter_sdk.pysnap
@@ -1,13 +1,14 @@
 ---
-created: '2021-09-20T12:35:57.972681Z'
+created: '2024-12-17T22:46:49.523847+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
-  hash: null
+  hash: "e0e7c4713e9092dc77635d5a0d5db31d"
+  contributing component: stacktrace
   component:
-    app (stacktrace of system takes precedence)
-      stacktrace (ignored because hash matches system variant)
+    app*
+      stacktrace*
         frame*
           module*
             "opt/hostedtoolcache/flutter/2.5.0-stable/x64/packages/flutter/lib/src/gestures/binding"
@@ -17,10 +18,11 @@ app:
             "_flushPointerEventQueue"
 --------------------------------------------------------------------------
 system:
-  hash: "e0e7c4713e9092dc77635d5a0d5db31d"
+  hash: null
+  contributing component: null
   component:
-    system*
-      stacktrace*
+    system (stacktrace of app takes precedence)
+      stacktrace (ignored because hash matches app variant)
         frame*
           module*
             "opt/hostedtoolcache/flutter/2.5.0-stable/x64/packages/flutter/lib/src/gestures/binding"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_hibernate_classes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_hibernate_classes.pysnap
index 63d790b22d8c98..ea1f88abc6b79a 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_hibernate_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_hibernate_classes.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:47.857304+00:00'
+created: '2024-12-17T22:46:49.579422+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "a01e3a60f8863fd9dfc5697fae1eed46"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_java8_lambda_function.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_java8_lambda_function.pysnap
index 3689959ac2e4ae..d143bf87d3a1da 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_java8_lambda_function.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_java8_lambda_function.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:47.904907+00:00'
+created: '2024-12-17T22:46:49.621148+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "be7f1b8b4014de623c533a8218dba5bd"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_java8_lambda_module.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_java8_lambda_module.pysnap
index 93486d8832237d..5692e1ee32be5b 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_java8_lambda_module.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_java8_lambda_module.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:47.950604+00:00'
+created: '2024-12-17T22:46:49.666275+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "53b9e9679a8ea25880376080b76f98ad"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_javassist.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_javassist.pysnap
index e0aaef119098e2..3059c82fc3c2b7 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_javassist.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_javassist.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:48.141596+00:00'
+created: '2024-12-17T22:46:49.811467+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "538bdfd8d7bb2495d0d6429c3689a420"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_javassist_2.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_javassist_2.pysnap
index e89915ab32321f..199177dab2a473 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_javassist_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_javassist_2.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:47.997466+00:00'
+created: '2024-12-17T22:46:49.713004+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "538bdfd8d7bb2495d0d6429c3689a420"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_javassist_3.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_javassist_3.pysnap
index e300b75ed114bb..530f6627c2beb0 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_javassist_3.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_javassist_3.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:48.094009+00:00'
+created: '2024-12-17T22:46:49.761595+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "dc3d511120ce04996b1eef3496516e5c"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_module_if_page_url.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_module_if_page_url.pysnap
index 308d1ef60e8008..99a57ec32f7009 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_module_if_page_url.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_module_if_page_url.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:48.300081+00:00'
+created: '2024-12-17T22:46:49.906015+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app
       stacktrace (ignored because it contains no in-app frames)
@@ -19,6 +20,7 @@ fallback:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: null
   component:
     system
       stacktrace (ignored because it contains no contributing frames)
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_module_if_page_url_2.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_module_if_page_url_2.pysnap
index 2dbfdd2816b52c..0ac2ba4491dc2c 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_module_if_page_url_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_module_if_page_url_2.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:48.251464+00:00'
+created: '2024-12-17T22:46:49.859566+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -18,6 +19,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "0cc175b9c0f1b6a831c399e269772661"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_safari_native_code.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_safari_native_code.pysnap
index fa76e3eb15ef65..05ad474ca9c8c2 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_safari_native_code.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_safari_native_code.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:48.362142+00:00'
+created: '2024-12-17T22:46:49.955828+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "30eb5001914d29dd8461898b5b8094fe"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_sentry_dart_packages.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_sentry_dart_packages.pysnap
index 8b42689aca385a..d8d10d1feb350b 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_sentry_dart_packages.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_sentry_dart_packages.pysnap
@@ -1,13 +1,14 @@
 ---
-created: '2024-06-05T14:22:36.817822+00:00'
+created: '2024-12-17T22:46:50.010205+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
-  hash: null
+  hash: "278cdd35be92e2ffde1d0a40524e7786"
+  contributing component: stacktrace
   component:
-    app (stacktrace of system takes precedence)
-      stacktrace (ignored because hash matches system variant)
+    app*
+      stacktrace*
         frame*
           filename*
             "sentry_logging.dart"
@@ -45,10 +46,11 @@ app:
             "SentryDrift.drift"
 --------------------------------------------------------------------------
 system:
-  hash: "278cdd35be92e2ffde1d0a40524e7786"
+  hash: null
+  contributing component: null
   component:
-    system*
-      stacktrace*
+    system (stacktrace of app takes precedence)
+      stacktrace (ignored because hash matches app variant)
         frame*
           filename*
             "sentry_logging.dart"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_sentry_dart_sdk.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_sentry_dart_sdk.pysnap
index 344f84bfd7566a..5a378e18424830 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_sentry_dart_sdk.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_sentry_dart_sdk.pysnap
@@ -1,13 +1,14 @@
 ---
-created: '2024-05-28T08:21:40.346389+00:00'
+created: '2024-12-17T22:46:50.056815+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
-  hash: null
+  hash: "d1fe4234d1bddc3823d08dcc529fb161"
+  contributing component: stacktrace
   component:
-    app (stacktrace of system takes precedence)
-      stacktrace (ignored because hash matches system variant)
+    app*
+      stacktrace*
         frame*
           filename*
             "sentry_exception_factory.dart"
@@ -15,10 +16,11 @@ app:
             "SentryExceptionFactory.getSentryException"
 --------------------------------------------------------------------------
 system:
-  hash: "d1fe4234d1bddc3823d08dcc529fb161"
+  hash: null
+  contributing component: null
   component:
-    system*
-      stacktrace*
+    system (stacktrace of app takes precedence)
+      stacktrace (ignored because hash matches app variant)
         frame*
           filename*
             "sentry_exception_factory.dart"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_sentry_flutter_sdk.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_sentry_flutter_sdk.pysnap
index d9a3119547c3e6..ee089d36bbb7cf 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_sentry_flutter_sdk.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_sentry_flutter_sdk.pysnap
@@ -1,13 +1,14 @@
 ---
-created: '2024-05-28T08:13:50.258870+00:00'
+created: '2024-12-17T22:46:50.103260+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
-  hash: null
+  hash: "d1fe4234d1bddc3823d08dcc529fb161"
+  contributing component: stacktrace
   component:
-    app (stacktrace of system takes precedence)
-      stacktrace (ignored because hash matches system variant)
+    app*
+      stacktrace*
         frame*
           filename*
             "sentry_exception_factory.dart"
@@ -15,10 +16,11 @@ app:
             "SentryExceptionFactory.getSentryException"
 --------------------------------------------------------------------------
 system:
-  hash: "d1fe4234d1bddc3823d08dcc529fb161"
+  hash: null
+  contributing component: null
   component:
-    system*
-      stacktrace*
+    system (stacktrace of app takes precedence)
+      stacktrace (ignored because hash matches app variant)
         frame*
           filename*
             "sentry_exception_factory.dart"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_sun_java_generated_constructors.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_sun_java_generated_constructors.pysnap
index 10ca53d52a6558..afd7fd32f6066e 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_sun_java_generated_constructors.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_sun_java_generated_constructors.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:48.627109+00:00'
+created: '2024-12-17T22:46:50.208946+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "07d1a8e5728b3c4c7aa8b8273fd0e753"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_sun_java_generated_constructors_2.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_sun_java_generated_constructors_2.pysnap
index bf95950596595f..3707d150a9c20d 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_sun_java_generated_constructors_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_sun_java_generated_constructors_2.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:48.576441+00:00'
+created: '2024-12-17T22:46:50.155564+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "09e0efcab18f545166318118ed4e0292"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_sun_java_generated_methods.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_sun_java_generated_methods.pysnap
index 78cdf5c051c43a..76c8aa840ea815 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_sun_java_generated_methods.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_ignores_sun_java_generated_methods.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:48.679059+00:00'
+created: '2024-12-17T22:46:50.256113+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -21,6 +22,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "9bc326575875422d0d4ced3c35d9f916"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_sanitizes_block_functions.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_sanitizes_block_functions.pysnap
index 41ccf63e13e471..0404da33e15cd1 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_sanitizes_block_functions.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_sanitizes_block_functions.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:48.740377+00:00'
+created: '2024-12-17T22:46:50.306191+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "27eed4125fc13d42163ddb0b8f357b48"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_sanitizes_erb_templates.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_sanitizes_erb_templates.pysnap
index 01f13b556b3447..50da6b87087272 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_sanitizes_erb_templates.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_sanitizes_erb_templates.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:48.798972+00:00'
+created: '2024-12-17T22:46:50.353315+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "4067a71d7098866f87c746a57a77b2bb"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_sanitizes_versioned_filenames.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_sanitizes_versioned_filenames.pysnap
index 5a2a13efc13822..2e742fd62928d6 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_sanitizes_versioned_filenames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_sanitizes_versioned_filenames.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:48.895464+00:00'
+created: '2024-12-17T22:46:50.448347+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -14,6 +15,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "2f908c015ad77a50595512fcf65d344c"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_sanitizes_versioned_filenames_2.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_sanitizes_versioned_filenames_2.pysnap
index 37a731c15e1a78..c513c7b7e1cc34 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_sanitizes_versioned_filenames_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_sanitizes_versioned_filenames_2.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:48.849079+00:00'
+created: '2024-12-17T22:46:50.397944+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -14,6 +15,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "2f908c015ad77a50595512fcf65d344c"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_skips_symbol_if_unknown.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_skips_symbol_if_unknown.pysnap
index 340a6bc931ec84..675376f3ba067a 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_skips_symbol_if_unknown.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_skips_symbol_if_unknown.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:48.946926+00:00'
+created: '2024-12-17T22:46:50.494940+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "a972f399399f5566f39b14a7afdd24ff"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_uses_context_line_over_function.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_uses_context_line_over_function.pysnap
index d2a80d4c798b28..953e5fa09013e8 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_uses_context_line_over_function.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_uses_context_line_over_function.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:48.994771+00:00'
+created: '2024-12-17T22:46:50.543559+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "fb73cb54ced59b1c0c60d9bb40b7336b"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_uses_function_over_lineno.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_uses_function_over_lineno.pysnap
index 99e464a9070b05..f2f0bdcd1ddb4a 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_uses_function_over_lineno.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_uses_function_over_lineno.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:49.045473+00:00'
+created: '2024-12-17T22:46:50.592522+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "fb73cb54ced59b1c0c60d9bb40b7336b"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_uses_module_over_filename.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_uses_module_over_filename.pysnap
index c5b8db831622d9..705152b94b9307 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_uses_module_over_filename.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_uses_module_over_filename.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:49.094620+00:00'
+created: '2024-12-17T22:46:50.639559+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "acbd18db4cc2f85cedef654fccc4a4d8"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_uses_symbol_instead_of_function.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_uses_symbol_instead_of_function.pysnap
index 76ed238369122a..164980f5b231c2 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_uses_symbol_instead_of_function.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_uses_symbol_instead_of_function.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:49.177935+00:00'
+created: '2024-12-17T22:46:50.687294+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "23db4a9e73800923f345d2b868993345"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_with_only_required_vars.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_with_only_required_vars.pysnap
index 4e1e3c695a0d9f..72031bb2d3a5e2 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_with_only_required_vars.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_with_only_required_vars.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:49.218521+00:00'
+created: '2024-12-17T22:46:50.734396+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -14,6 +15,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "1effb24729ae4c43efa36b460511136a"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/go_pkg_mod.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/go_pkg_mod.pysnap
index 4c10c857b234ff..2ae51024fbefcf 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/go_pkg_mod.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/go_pkg_mod.pysnap
@@ -1,8 +1,11 @@
 ---
+created: '2024-12-17T22:46:50.782425+00:00'
+creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "4b8bbc500bd2cabfcadc1f1be867e0bb"
+  contributing component: exception
   component:
     app*
       exception*
@@ -28,6 +31,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "348fc4026c9fa11ffba8fbfa80a134c9"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_125_event_126.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_125_event_126.pysnap
index 3fb8573e157df2..d82548b6300f85 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_125_event_126.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_125_event_126.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:49.323580+00:00'
+created: '2024-12-17T22:46:50.879553+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -144,6 +145,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "725b26e5c390004cd0eca6018a7ad200"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_200_event_200.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_200_event_200.pysnap
index a1cb4052705db8..e7e072f1254f33 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_200_event_200.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_200_event_200.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:49.378779+00:00'
+created: '2024-12-17T22:46:50.920534+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -88,6 +89,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "48a275d290e688b23878080257c9adc3"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_275_event_275.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_275_event_275.pysnap
index b57d87cb66950f..91d4e88f17186e 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_275_event_275.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_275_event_275.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:49.435066+00:00'
+created: '2024-12-17T22:46:50.964851+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -104,6 +105,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "07fb068d9b0e76878c72b462ea20cab3"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_289_event_312.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_289_event_312.pysnap
index 40b6ded05e75f1..a0e6cd17f8dfb2 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_289_event_312.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_289_event_312.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:49.499654+00:00'
+created: '2024-12-17T22:46:51.013198+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -96,6 +97,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "94d5c188bc82790c397f7f97d5239ee0"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_294_event_294.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_294_event_294.pysnap
index e23781fd68f0c8..d96f823fadc290 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_294_event_294.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_294_event_294.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:49.562266+00:00'
+created: '2024-12-17T22:46:51.070728+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -145,6 +146,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "b77a07388ce12082423da4abee4415fc"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_294_event_329.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_294_event_329.pysnap
index 03b8130874b818..9db3823f040a06 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_294_event_329.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_294_event_329.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:49.626196+00:00'
+created: '2024-12-17T22:46:51.137934+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -160,6 +161,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "76e54b047bb34b5d0ec6d210fcd8d995"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_307_event_307.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_307_event_307.pysnap
index 03aa68fb80c593..d67b64323f9019 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_307_event_307.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_307_event_307.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:49.671390+00:00'
+created: '2024-12-17T22:46:51.250430+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -64,6 +65,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "b7c6253ad69f02d33e770f3050d72c88"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_307_event_657.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_307_event_657.pysnap
index e01a403a428a25..c02eb69e81cebf 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_307_event_657.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_307_event_657.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:49.728829+00:00'
+created: '2024-12-17T22:46:51.317825+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -59,6 +60,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "12c4b5346b5242ec65d3153bb45937b0"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_313_event_313.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_313_event_313.pysnap
index b772ec901b3662..473d6a26d4465b 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_313_event_313.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_313_event_313.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:49.795050+00:00'
+created: '2024-12-17T22:46:51.391372+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -193,6 +194,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "57d5f9c178ebe1364226ed6c90d30174"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_313_event_333.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_313_event_333.pysnap
index 57df7159f4e134..fd3688795b5a8e 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_313_event_333.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_313_event_333.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:49.850861+00:00'
+created: '2024-12-17T22:46:51.455554+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -198,6 +199,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "51856c096282b824c59e92b79dda4eec"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_319_event_321.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_319_event_321.pysnap
index 9739962b9db3f7..10f92fed3150f0 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_319_event_321.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_319_event_321.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:49.913480+00:00'
+created: '2024-12-17T22:46:51.514597+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -196,6 +197,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "e4714f9479fea40111888ca143e02d8f"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_389_event_389.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_389_event_389.pysnap
index ea5c56e97672ab..82c3f9c493966a 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_389_event_389.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_389_event_389.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:49.962085+00:00'
+created: '2024-12-17T22:46:51.581742+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -46,6 +47,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "ba5ff7b8a3adc9b87681ff0f8275a72e"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_432_event_432.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_432_event_432.pysnap
index 39f8aed6d49e3c..77a916b595214e 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_432_event_432.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_432_event_432.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:50.019896+00:00'
+created: '2024-12-17T22:46:51.638152+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -130,6 +131,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "aeefa28dbbcc272df254d59c98aad03c"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_432_event_453.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_432_event_453.pysnap
index c2b6512d19a2f8..e82d4829ceb37c 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_432_event_453.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_432_event_453.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:50.079646+00:00'
+created: '2024-12-17T22:46:51.695589+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -130,6 +131,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "50325a901e2db771dca1291283d8b54e"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_445_event_445.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_445_event_445.pysnap
index cea1d461008fb1..214090ee487d06 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_445_event_445.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/group_445_event_445.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:50.140412+00:00'
+created: '2024-12-17T22:46:51.754636+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -151,6 +152,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "2fa6bd4588d2ae97b62ef1f8db5b12bf"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/hpkp.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/hpkp.pysnap
index bb1dd98b1a5705..c586f0c592a920 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/hpkp.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/hpkp.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:38.270973Z'
+created: '2024-12-17T22:46:51.872580+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "1e37a374cb33572622d02ff7a6237c44"
+  contributing component: hpkp
   component:
     default*
       hpkp*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/hybrid_fingerprint_base.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/hybrid_fingerprint_base.pysnap
index 358554f7309635..adb75c66214fd9 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/hybrid_fingerprint_base.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/hybrid_fingerprint_base.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-15T17:23:41.868667+00:00'
+created: '2024-12-17T22:46:51.940303+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "e3d593b4335190212ca7c18b8e967fb1"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/hybrid_fingerprint_custom_client_hybrid_server.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/hybrid_fingerprint_custom_client_hybrid_server.pysnap
index 1f67c0f226ef0b..9ca170fa7c66ff 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/hybrid_fingerprint_custom_client_hybrid_server.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/hybrid_fingerprint_custom_client_hybrid_server.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-16T19:27:07.939679+00:00'
+created: '2024-12-17T22:46:51.998316+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "19163f3ca34f5995c69d85351ce3d697"
+  contributing component: exception
   component:
     app*
       exception*
@@ -171,6 +172,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "847950eb44d280e6758d136c763d6ddc"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/hybrid_fingerprint_hybrid_client_custom_server.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/hybrid_fingerprint_hybrid_client_custom_server.pysnap
index a006d874b11486..3476b6907fab89 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/hybrid_fingerprint_hybrid_client_custom_server.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/hybrid_fingerprint_hybrid_client_custom_server.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-11-08T18:04:49.033909+00:00'
+created: '2024-12-17T22:46:52.050999+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: exception
   component:
     app (custom fingerprint takes precedence)
       exception*
@@ -174,6 +175,7 @@ custom_fingerprint:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: exception
   component:
     system (custom fingerprint takes precedence)
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/hybrid_fingerprint_same_default_different_extra.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/hybrid_fingerprint_same_default_different_extra.pysnap
index b58b28a7a0f9d2..db7618605b05de 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/hybrid_fingerprint_same_default_different_extra.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/hybrid_fingerprint_same_default_different_extra.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-15T17:23:42.052274+00:00'
+created: '2024-12-17T22:46:52.096968+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "5b5ad5a0fbb4deb5e3fc631ce42681ae"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/hybrid_fingerprint_same_extra_different_default.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/hybrid_fingerprint_same_extra_different_default.pysnap
index 9b0f65bc0f45f6..5cc0df7ab59b91 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/hybrid_fingerprint_same_extra_different_default.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/hybrid_fingerprint_same_extra_different_default.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-15T17:23:42.119710+00:00'
+created: '2024-12-17T22:46:52.139216+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "c5578778212497f1ff3435405e2a4a98"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/in_app_in_ui.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/in_app_in_ui.pysnap
index 3a63c32e0f25b0..b22963d2b5d971 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/in_app_in_ui.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/in_app_in_ui.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-07-26T19:38:22.762009Z'
+created: '2024-12-17T22:46:52.194486+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "9b037f38798ea127aac3e8b8e1e1024a"
+  contributing component: exception
   component:
     app*
       exception*
@@ -150,6 +151,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "fe8b15fe322c91ede2fc48363fe43587"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/java_chained.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/java_chained.pysnap
index e7367833ef42ee..143d5abe592312 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/java_chained.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/java_chained.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:50.570082+00:00'
+created: '2024-12-17T22:46:52.248614+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "750486b8d8c51500fa0dfbb6f1577af0"
+  contributing component: chained-exception
   component:
     app*
       chained-exception*
@@ -393,6 +394,7 @@ app:
 --------------------------------------------------------------------------
 default:
   hash: null
+  contributing component: null
   component:
     default (exception of app/system takes precedence)
       message (exception of app/system takes precedence)
@@ -400,6 +402,7 @@ default:
 --------------------------------------------------------------------------
 system:
   hash: "8924849495809d42431719c2b9ab65c8"
+  contributing component: chained-exception
   component:
     system*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/java_minimal.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/java_minimal.pysnap
index 9cce1dc6064be8..9ecba9b65bb99a 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/java_minimal.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/java_minimal.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:50.776441+00:00'
+created: '2024-12-17T22:46:52.311966+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -401,6 +402,7 @@ app:
 --------------------------------------------------------------------------
 default:
   hash: null
+  contributing component: null
   component:
     default (exception of system takes precedence)
       message (exception of system takes precedence)
@@ -408,6 +410,7 @@ default:
 --------------------------------------------------------------------------
 system:
   hash: "ec87dd10e4f7512ecccb4a068c5774ae"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_exception_fallback_to_message.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_exception_fallback_to_message.pysnap
index ac4bbd1c6cad21..283446b611ef47 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_exception_fallback_to_message.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_exception_fallback_to_message.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-02-12T22:47:10.083801Z'
+created: '2024-12-17T22:46:52.397712+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "10dfd81e2df31e96fae451b9e205ad81"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_exception_fallback_to_message_whistles.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_exception_fallback_to_message_whistles.pysnap
index 6a07116848fcdb..ce5a38980be7fe 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_exception_fallback_to_message_whistles.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_exception_fallback_to_message_whistles.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-02-12T22:47:11.346645Z'
+created: '2024-12-17T22:46:52.355060+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "b8e2a347e75266ca7bb565e2b3c0722e"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_exception_no_in_app.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_exception_no_in_app.pysnap
index 37c357d1767dae..0a704b87cfb513 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_exception_no_in_app.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_exception_no_in_app.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:50.950702+00:00'
+created: '2024-12-17T22:46:52.447381+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -76,6 +77,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "c0f3f7d6deb17aec9d07259ac684fad0"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_message.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_message.pysnap
index d5488c438a46b0..1a01fcee28f913 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_message.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_message.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:38.576076Z'
+created: '2024-12-17T22:46:52.563138+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "4119639092e62c55ea8be348e4d9260d"
+  contributing component: message
   component:
     default*
       message*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_message_parameterization.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_message_parameterization.pysnap
index 7c6be977579ea5..89e1b6e0e51805 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_message_parameterization.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_message_parameterization.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-15T17:12:30.123086+00:00'
+created: '2024-12-17T22:46:52.507337+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "f9e47f16e3b9770b440157179c47bf7a"
+  contributing component: message
   component:
     default*
       message* (stripped event-specific values)
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_polyfills.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_polyfills.pysnap
index 9a30a4c97feb45..72d86cd2ec9ed5 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_polyfills.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_polyfills.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:51.093603+00:00'
+created: '2024-12-17T22:46:52.620387+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -31,6 +32,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "838d9553ed824c45d9125f42ec408472"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_unpkg.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_unpkg.pysnap
index 75b64ad4929cc5..6c254d6d367d29 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_unpkg.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_unpkg.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:51.142135+00:00'
+created: '2024-12-17T22:46:52.676417+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -38,6 +39,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "6ab78545e13144405fb21dadb9045b91"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_chrome.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_chrome.pysnap
index 213583c46c67af..13920748a20d3d 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_chrome.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_chrome.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:51.190216+00:00'
+created: '2024-12-17T22:46:52.731247+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -62,6 +63,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "c63e8727af1a8fe75872b6a762797113"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_edge.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_edge.pysnap
index ed48eebd89ac3b..25e58f1eefe9b6 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_edge.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_edge.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:51.238927+00:00'
+created: '2024-12-17T22:46:52.778127+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -66,6 +67,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "c63e8727af1a8fe75872b6a762797113"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_firefox.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_firefox.pysnap
index 69427687747f29..122f4498f42a2d 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_firefox.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_firefox.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:51.288313+00:00'
+created: '2024-12-17T22:46:52.840625+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -59,6 +60,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "c63e8727af1a8fe75872b6a762797113"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_http_chrome.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_http_chrome.pysnap
index 598fda556a47f7..cbde4dd903aa28 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_http_chrome.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_http_chrome.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:51.339062+00:00'
+created: '2024-12-17T22:46:52.910651+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -80,6 +81,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "b2602ad455472dede8e4c340d8a7eaba"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_http_edge.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_http_edge.pysnap
index 5461fe5281671c..6a8c98b59ccc51 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_http_edge.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_http_edge.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:51.387623+00:00'
+created: '2024-12-17T22:46:52.967999+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -84,6 +85,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "b2602ad455472dede8e4c340d8a7eaba"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_http_firefox.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_http_firefox.pysnap
index 551fadd690eb33..c6286e34b6fe29 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_http_firefox.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_http_firefox.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:51.508293+00:00'
+created: '2024-12-17T22:46:53.031385+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -77,6 +78,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "b2602ad455472dede8e4c340d8a7eaba"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_http_safari.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_http_safari.pysnap
index 76a45ee2fce8d7..15879db20a4d68 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_http_safari.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_http_safari.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:51.561420+00:00'
+created: '2024-12-17T22:46:53.088860+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -83,6 +84,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "b2602ad455472dede8e4c340d8a7eaba"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_safari.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_safari.pysnap
index 0aef3d24977f0e..5babcb481d15f2 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_safari.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_safari.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:51.608365+00:00'
+created: '2024-12-17T22:46:53.142552+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -67,6 +68,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "c63e8727af1a8fe75872b6a762797113"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_sentryui_firefox.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_sentryui_firefox.pysnap
index e427c4ce1421ba..d701cb336902f8 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_sentryui_firefox.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_sentryui_firefox.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:38.858833Z'
+created: '2024-12-17T22:46:53.213658+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "4a3cf3893b6485428dd02da116c8370e"
+  contributing component: exception
   component:
     app*
       exception*
@@ -178,6 +179,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "d5456487ea8dccfe96c1968b19870978"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_sentryui_safari.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_sentryui_safari.pysnap
index c5869774326cf4..437f9512af0354 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_sentryui_safari.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_xbrowser_sentryui_safari.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:38.896175Z'
+created: '2024-12-17T22:46:53.275043+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "4a3cf3893b6485428dd02da116c8370e"
+  contributing component: exception
   component:
     app*
       exception*
@@ -147,6 +148,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "0b81da6ea3d7cc82b1d4825b7aac0b8d"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/laravel.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/laravel.pysnap
index c2f1544a034b70..bb26951462b26f 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/laravel.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/laravel.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:38.988317Z'
+created: '2024-12-17T22:46:53.388959+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "4665d486184740231357ab63f4543a8d"
+  contributing component: exception
   component:
     app*
       exception*
@@ -364,6 +365,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "107ed03036d901157372f260bc3df446"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/laravel_anonymous.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/laravel_anonymous.pysnap
index f9987355566708..a915c8d44a754a 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/laravel_anonymous.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/laravel_anonymous.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:39.018799Z'
+created: '2024-12-17T22:46:53.330340+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "a728cdf5d62c8e017c35c3fe04051b6e"
+  contributing component: exception
   component:
     app*
       exception*
@@ -35,6 +36,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "38f89a430b4a251a06a5a15b382638b5"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/logentry_prefers_message.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/logentry_prefers_message.pysnap
index 021fe952e81e45..3c3118eba28595 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/logentry_prefers_message.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/logentry_prefers_message.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:39.045636Z'
+created: '2024-12-17T22:46:53.429688+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "8ec8bbc71eb6e2af7fbe5076a8534f96"
+  contributing component: message
   component:
     default*
       message*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/logentry_uses_formatted.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/logentry_uses_formatted.pysnap
index af9953323a8f0a..ec71dfc0b8ec18 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/logentry_uses_formatted.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/logentry_uses_formatted.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:39.066462Z'
+created: '2024-12-17T22:46:53.475323+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "329b29efcf1f77067a063e34f56e7791"
+  contributing component: message
   component:
     default*
       message*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/macos_amd_driver.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/macos_amd_driver.pysnap
index c70cc215f14c06..c81aa6f11816be 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/macos_amd_driver.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/macos_amd_driver.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:51.999715+00:00'
+created: '2024-12-17T22:46:53.536256+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -159,6 +160,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "6188cd480f18f1ce368de0500be00733"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/macos_intel_driver.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/macos_intel_driver.pysnap
index ef36e1e5d98c43..60f51a7eb9e673 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/macos_intel_driver.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/macos_intel_driver.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:52.060030+00:00'
+created: '2024-12-17T22:46:53.648852+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -187,6 +188,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "ab793fe47359148c7fc95f684bc5308d"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/malloc_sentinel.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/malloc_sentinel.pysnap
index 91936534605cae..f69b2a6b77fb2a 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/malloc_sentinel.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/malloc_sentinel.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:52.115809+00:00'
+created: '2024-12-17T22:46:53.709955+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -100,6 +101,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "2f4ae73b88dbbc7e1cee4f86e270c4b4"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/message_prefers_message.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/message_prefers_message.pysnap
index f841d8a8d1d30d..595bc2e842e796 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/message_prefers_message.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/message_prefers_message.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:39.083505Z'
+created: '2024-12-17T22:46:53.756342+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "8ec8bbc71eb6e2af7fbe5076a8534f96"
+  contributing component: message
   component:
     default*
       message*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/message_uses_formatted.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/message_uses_formatted.pysnap
index b0f1044975eb29..3af268b72242e7 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/message_uses_formatted.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/message_uses_formatted.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:39.098534Z'
+created: '2024-12-17T22:46:53.805648+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "d3f5e52d24e9c1eae5abe6c866cced63"
+  contributing component: message
   component:
     default*
       message*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/message_with_key_pair_values.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/message_with_key_pair_values.pysnap
index 2c571f2ee3e8ee..8995f58c684a72 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/message_with_key_pair_values.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/message_with_key_pair_values.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-07-24T22:46:44.614750Z'
+created: '2024-12-17T22:46:53.855328+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "d2ab1028e9cb44352a824e878951f412"
+  contributing component: message
   component:
     default*
       message* (stripped event-specific values)
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/minified_javascript.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/minified_javascript.pysnap
index bfb730133980b1..963aa43b908c3d 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/minified_javascript.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/minified_javascript.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:52.302945+00:00'
+created: '2024-12-17T22:46:53.913540+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -212,6 +213,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "dcfcd48a02c100bbe4023cbc783054f0"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_complex_function_names.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_complex_function_names.pysnap
index 6c30eaa5227237..4aec1cece7b527 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_complex_function_names.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_complex_function_names.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:52.348809+00:00'
+created: '2024-12-17T22:46:53.964452+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -25,6 +26,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "61d21e6d53c0837718af047c20e5e7ea"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_driver_crash1.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_driver_crash1.pysnap
index 317ed743593edc..3bba1ebc968794 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_driver_crash1.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_driver_crash1.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:52.396928+00:00'
+created: '2024-12-17T22:46:54.154232+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -35,6 +36,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "a6befffdc310c28b165bbceb1c0f59a8"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_driver_crash2.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_driver_crash2.pysnap
index ad312ef2dabfbc..7fcde297d020a1 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_driver_crash2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_driver_crash2.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:52.442949+00:00'
+created: '2024-12-17T22:46:54.200267+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -30,6 +31,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "6fcc3bb4fac6aa6e81bb6d0faf40b0dd"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_driver_crash3.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_driver_crash3.pysnap
index 839b5ee13faaf8..03a9ef5e677792 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_driver_crash3.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_driver_crash3.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:52.492429+00:00'
+created: '2024-12-17T22:46:54.303834+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -36,6 +37,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "d69ad378fab4de58c7236a72ce3101ee"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_limit_frames.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_limit_frames.pysnap
index 5d63fb05f0bdce..b8aa6874eb4f38 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_limit_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_limit_frames.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:52.543416+00:00'
+created: '2024-12-17T22:46:54.353792+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -25,6 +26,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "9bb5de55b854491dacc677184c9b019a"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_malloc_chain.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_malloc_chain.pysnap
index cdf9baaf7723e8..ee9873bdcc7981 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_malloc_chain.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_malloc_chain.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:52.593514+00:00'
+created: '2024-12-17T22:46:54.405751+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -34,6 +35,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "69d066e455243e7c5762b7522b430ca9"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_no_filenames.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_no_filenames.pysnap
index c97868e9226578..a8b45aeac3d713 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_no_filenames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_no_filenames.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-11-12T10:57:15.413542Z'
+created: '2024-12-17T22:46:54.465350+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "418120a66f7031923031f5c52aca0724"
+  contributing component: exception
   component:
     app*
       exception*
@@ -58,6 +59,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "00719910980352c06ba93641057012e0"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_unlimited_frames.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_unlimited_frames.pysnap
index 21e2b7c345361f..6e790992eb6760 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_unlimited_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_unlimited_frames.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:52.704961+00:00'
+created: '2024-12-17T22:46:54.522676+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -25,6 +26,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "61d21e6d53c0837718af047c20e5e7ea"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_windows_anon_namespace.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_windows_anon_namespace.pysnap
index a7cba2988e5481..9a1a3408e3cf13 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_windows_anon_namespace.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_windows_anon_namespace.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:52.756722+00:00'
+created: '2024-12-17T22:46:54.583804+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -41,6 +42,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "15d397771f229af8dc42783542f81dd4"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_with_function_name.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_with_function_name.pysnap
index 94767cfa336e55..68cb933efd2e8e 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_with_function_name.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/native_with_function_name.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:52.804564+00:00'
+created: '2024-12-17T22:46:54.633600+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -37,6 +38,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "c29439027eafcf7642f641554ab0f0ef"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/node_exception_weird.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/node_exception_weird.pysnap
index 44609a6597a6d5..7493ecb22d62c3 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/node_exception_weird.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/node_exception_weird.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:39.605065Z'
+created: '2024-12-17T22:46:54.695046+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "a20509269752c9a1bea6078851e4d39c"
+  contributing component: exception
   component:
     app*
       exception*
@@ -102,6 +103,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "252dc79eb5653bf822e2684d90734cb8"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/node_low_level_async.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/node_low_level_async.pysnap
index e5dec140041699..1a56db1c422419 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/node_low_level_async.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/node_low_level_async.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:52.912333+00:00'
+created: '2024-12-17T22:46:54.747457+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -28,6 +29,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "b3d321fab1665166fb7cacfa975db4bb"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/python_exception_base.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/python_exception_base.pysnap
index d95c815860342f..55f9f8dad3ab7c 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/python_exception_base.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/python_exception_base.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:52.962304+00:00'
+created: '2024-12-17T22:46:54.810852+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "c52ebcc2d9d0780a23c7d99831678830"
+  contributing component: chained-exception
   component:
     app*
       chained-exception*
@@ -29,6 +30,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "669cb6664e0f5fed38665da04e464f7e"
+  contributing component: chained-exception
   component:
     system*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/python_grouping_enhancer_away_from_crash.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/python_grouping_enhancer_away_from_crash.pysnap
index 9ef9e63057397f..7109dafd3240b8 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/python_grouping_enhancer_away_from_crash.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/python_grouping_enhancer_away_from_crash.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-11-12T10:57:16.231446Z'
+created: '2024-12-17T22:46:54.863257+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "121caa876de75ec51bf72ed4c852cd75"
+  contributing component: exception
   component:
     app*
       exception*
@@ -106,6 +107,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "a5af2577d4caca8f983657c5d1919e14"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/python_grouping_enhancer_towards_crash.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/python_grouping_enhancer_towards_crash.pysnap
index 419397e24b7d4e..452c940cde29c5 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/python_grouping_enhancer_towards_crash.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/python_grouping_enhancer_towards_crash.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:53.069985+00:00'
+created: '2024-12-17T22:46:54.920293+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -106,6 +107,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "90888e813b09fa25061af2883c0fb9bd"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/python_http_error.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/python_http_error.pysnap
index 87a181877086c6..fb0ec97b55d5ae 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/python_http_error.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/python_http_error.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-08-25T09:17:20.134951Z'
+created: '2024-12-17T22:46:54.973338+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "d59239f5aad3304d60beb1fde3369b78"
+  contributing component: exception
   component:
     app*
       exception*
@@ -43,6 +44,7 @@ app:
 --------------------------------------------------------------------------
 default:
   hash: null
+  contributing component: null
   component:
     default (exception of app/system takes precedence)
       message (exception of app/system takes precedence)
@@ -50,6 +52,7 @@ default:
 --------------------------------------------------------------------------
 system:
   hash: "133db3f366b1327dab4e661f66dfb961"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/react_native.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/react_native.pysnap
index 281ceeba8f3eca..42d4e89d479b5a 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/react_native.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/react_native.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:39.764850Z'
+created: '2024-12-17T22:46:55.066263+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "73470e545e51eea9cff8a6c006f68f57"
+  contributing component: exception
   component:
     app*
       exception*
@@ -208,6 +209,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "ecd413627f0d90a5a25cb28d1ba9c39f"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_cocoa.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_cocoa.pysnap
index 09951bd9b72c71..e08c32452f70ac 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_cocoa.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_cocoa.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:39.793164Z'
+created: '2024-12-17T22:46:55.229398+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "eb416f98479efa56a77c524602dc9979"
+  contributing component: stacktrace
   component:
     app*
       stacktrace*
@@ -17,6 +18,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "1df786c8c266506e1acb6669c8df5154"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_collapse_recursion.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_collapse_recursion.pysnap
index f851416e60cb17..40ea568fe81564 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_collapse_recursion.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_collapse_recursion.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:53.265932+00:00'
+created: '2024-12-17T22:46:55.374330+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -60,6 +61,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "9bdadae4fa003cef6cf460ff1325e54b"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_compute_hashes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_compute_hashes.pysnap
index dbb83b81166213..0d5467822ec7fb 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_compute_hashes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_compute_hashes.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:39.841107Z'
+created: '2024-12-17T22:46:55.448302+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "1effb24729ae4c43efa36b460511136a"
+  contributing component: stacktrace
   component:
     app*
       stacktrace*
@@ -17,6 +18,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "659ad79e2e70c822d30a53d7d889529e"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_discards_seemingly_useless_stack.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_discards_seemingly_useless_stack.pysnap
index 988d0713b56211..74428ee85dd8c5 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_discards_seemingly_useless_stack.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_discards_seemingly_useless_stack.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:53.364822+00:00'
+created: '2024-12-17T22:46:55.498244+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app
       stacktrace (ignored because it contains no in-app frames)
@@ -17,6 +18,7 @@ fallback:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: null
   component:
     system
       stacktrace (ignored because it contains no contributing frames)
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_does_not_discard_non_urls.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_does_not_discard_non_urls.pysnap
index 53772cdc15cb8b..d2d874276b97da 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_does_not_discard_non_urls.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_does_not_discard_non_urls.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:53.413112+00:00'
+created: '2024-12-17T22:46:55.562458+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -14,6 +15,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "acbd18db4cc2f85cedef654fccc4a4d8"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_does_not_group_different_js_errors.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_does_not_group_different_js_errors.pysnap
index 6b262f8a69a286..f09377d3cb008b 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_does_not_group_different_js_errors.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_does_not_group_different_js_errors.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:53.459362+00:00'
+created: '2024-12-17T22:46:55.618771+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app
       stacktrace (ignored because it contains no in-app frames)
@@ -17,6 +18,7 @@ fallback:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: null
   component:
     system
       stacktrace (ignored because it contains no contributing frames)
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_enforce_min_frames.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_enforce_min_frames.pysnap
index ab5d45b0876727..2e19a989473b68 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_enforce_min_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_enforce_min_frames.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-11-16T12:41:52.565428Z'
+created: '2024-12-17T22:46:55.687269+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -37,6 +38,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "e0b4eea234ff891472cb927c00153bbe"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_excludes_single_frame_urls.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_excludes_single_frame_urls.pysnap
index 07c2510f776aa5..1d0583258ef996 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_excludes_single_frame_urls.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_excludes_single_frame_urls.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:53.558019+00:00'
+created: '2024-12-17T22:46:55.738335+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "cd2a9fd0cdaa8cd55ed22b101fc65882"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_hash_without_system_frames.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_hash_without_system_frames.pysnap
index e2e9ce00ef4e4f..eed5b92b2f859c 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_hash_without_system_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_hash_without_system_frames.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:40.032091Z'
+created: '2024-12-17T22:46:55.790588+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "1effb24729ae4c43efa36b460511136a"
+  contributing component: stacktrace
   component:
     app*
       stacktrace*
@@ -17,6 +18,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "659ad79e2e70c822d30a53d7d889529e"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_ignores_singular_anonymous_frame.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_ignores_singular_anonymous_frame.pysnap
index 7afe95a0aa29bf..35dca51769d17c 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_ignores_singular_anonymous_frame.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_ignores_singular_anonymous_frame.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:53.691793+00:00'
+created: '2024-12-17T22:46:55.840924+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -24,6 +25,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "c5da56c71b31f34c5880d734cbc8f5bb"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_negated_match.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_negated_match.pysnap
index 0adcf330f5e563..9160b31adc15c8 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_negated_match.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_negated_match.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:53.952144+00:00'
+created: '2024-12-17T22:46:55.892063+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -37,6 +38,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "eb87c1031dba55b67df86fb9fff59dc6"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_rust.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_rust.pysnap
index 3e626239d6de66..aad3de6f54fc61 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_rust.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_rust.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-11-12T10:57:15.230300Z'
+created: '2024-12-17T22:46:55.945374+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "eb87c1031dba55b67df86fb9fff59dc6"
+  contributing component: exception
   component:
     app*
       exception*
@@ -37,6 +38,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "e0b4eea234ff891472cb927c00153bbe"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_rust2.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_rust2.pysnap
index d45b5dd335c938..c4b152f3ed93fe 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_rust2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_rust2.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-11-12T10:57:15.984527Z'
+created: '2024-12-17T22:46:55.996609+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "eb87c1031dba55b67df86fb9fff59dc6"
+  contributing component: exception
   component:
     app*
       exception*
@@ -37,6 +38,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "9b33b65a645c66239cafcd276fcd0659"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_with_minimal_app_frames.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_with_minimal_app_frames.pysnap
index 7a368039a7d56b..b9b666fbcb80fd 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_with_minimal_app_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/stacktrace_with_minimal_app_frames.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:40.266253Z'
+created: '2024-12-17T22:46:56.060369+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "1effb24729ae4c43efa36b460511136a"
+  contributing component: stacktrace
   component:
     app*
       stacktrace*
@@ -47,6 +48,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "659ad79e2e70c822d30a53d7d889529e"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
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 83f3dc178c2314..edbfb3bcf6fd1e 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,10 +1,11 @@
 ---
-created: '2024-12-03T22:09:00.595077+00:00'
+created: '2024-12-17T22:46:56.107107+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "1f5bdebe3c9f414c7dbb4296a8353245"
+  contributing component: template
   component:
     default*
       template*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/threads_compute_hashes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/threads_compute_hashes.pysnap
index e9a4753d347260..ecd881fc3f3ad3 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/threads_compute_hashes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/threads_compute_hashes.pysnap
@@ -1,13 +1,14 @@
 ---
-created: '2021-02-15T10:11:52.576902Z'
+created: '2024-12-17T22:46:56.157175+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
-  hash: null
+  hash: "1a11687556cf74559f0ae90b1c87e2fd"
+  contributing component: threads
   component:
-    app (threads of system take precedence)
-      threads (ignored because hash matches system variant)
+    app*
+      threads*
         stacktrace*
           frame*
             filename*
@@ -16,10 +17,11 @@ app:
               "main"
 --------------------------------------------------------------------------
 system:
-  hash: "1a11687556cf74559f0ae90b1c87e2fd"
+  hash: null
+  contributing component: null
   component:
-    system*
-      threads*
+    system (threads of app take precedence)
+      threads (ignored because hash matches app variant)
         stacktrace*
           frame*
             filename*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/threads_no_hash.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/threads_no_hash.pysnap
index 20f3c3861cc225..6bef2292aa0664 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/threads_no_hash.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/threads_no_hash.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-04-22T14:32:48.263917Z'
+created: '2024-12-17T22:46:56.208300+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app
       threads (ignored because does not contain exactly one crashing, one current or just one thread, instead contains 2 threads)
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/unity.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/unity.pysnap
index 3a11267cdb4df4..de1e306a693734 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/unity.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/unity.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-11-08T21:03:21.457954Z'
+created: '2024-12-17T22:46:56.259517+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "a12d579fed7636c2a5d2fae110c95ce5"
+  contributing component: exception
   component:
     app*
       exception*
@@ -56,6 +57,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "c0dbeebf0430b3310ad1f7ceb48553a6"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/actix.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/actix.pysnap
index 7ef7589e72b77b..3053d627055dce 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/actix.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/actix.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-11-12T10:57:06.244577Z'
+created: '2024-12-17T22:46:56.337082+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "703d3dd9cb763e3f5037f659d27da947"
+  contributing component: exception
   component:
     app*
       exception*
@@ -397,6 +398,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "1df163ce3be65319df4fcc9cb34b60c1"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/android_anr.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/android_anr.pysnap
index ee45b9eeb35541..a1ba017d27eb62 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/android_anr.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/android_anr.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:33.833759+00:00'
+created: '2024-12-17T22:46:56.396249+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -788,6 +789,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "2e41d71bc38b212d73f8d68415389f45"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/aspnetcore.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/aspnetcore.pysnap
index a44619cfcb6ec9..be9e6066ae0ce8 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/aspnetcore.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/aspnetcore.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-08-25T09:17:15.093586Z'
+created: '2024-12-17T22:46:56.457061+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "228c649a3aa0901622c0a0e66ab0522c"
+  contributing component: exception
   component:
     app*
       exception*
@@ -173,6 +174,7 @@ app:
 --------------------------------------------------------------------------
 default:
   hash: null
+  contributing component: null
   component:
     default (exception of app/system takes precedence)
       message (exception of app/system takes precedence)
@@ -180,6 +182,7 @@ default:
 --------------------------------------------------------------------------
 system:
   hash: "4ccd0f1953483581ba360c7518f90332"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/block_invoke.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/block_invoke.pysnap
index 322ab9dac3e7b9..5e75a1b7abdc8c 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/block_invoke.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/block_invoke.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-03-22T11:57:39.089571+00:00'
+created: '2024-12-17T22:46:56.511747+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "ff6c4ee7c54f118a9647ee86f0c2b0b0"
+  contributing component: threads
   component:
     app*
       threads*
@@ -21,6 +22,7 @@ app:
 --------------------------------------------------------------------------
 default:
   hash: null
+  contributing component: null
   component:
     default (threads of app/system take precedence)
       message (threads of app/system take precedence)
@@ -28,6 +30,7 @@ default:
 --------------------------------------------------------------------------
 system:
   hash: "cff360e554b4acecd9fd2534d9051870"
+  contributing component: threads
   component:
     system*
       threads*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/bugly.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/bugly.pysnap
index 18c49f7a3afbd6..d703b3dc096c60 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/bugly.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/bugly.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:33.970745+00:00'
+created: '2024-12-17T22:46:56.574819+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -30,6 +31,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "d9c9b0f9ba46e32fddd7cd1512fad235"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/built_in_fingerprint_chunkload_error.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/built_in_fingerprint_chunkload_error.pysnap
index aaf450bb19974b..c1d3fddae7bc79 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/built_in_fingerprint_chunkload_error.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/built_in_fingerprint_chunkload_error.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:34.066699+00:00'
+created: '2024-12-17T22:46:56.673735+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -23,6 +24,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "925057f3a51f4b7bf154e59a63eb3f86"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/built_in_fingerprint_chunkload_error_hybrid_fingerprint.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/built_in_fingerprint_chunkload_error_hybrid_fingerprint.pysnap
index f6cd95f7f22395..0f1ee55fabc813 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/built_in_fingerprint_chunkload_error_hybrid_fingerprint.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/built_in_fingerprint_chunkload_error_hybrid_fingerprint.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:34.024531+00:00'
+created: '2024-12-17T22:46:56.622924+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -25,6 +26,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "8cce12f1da956a1fd4e7c6078bc311fb"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/callee_guaranteed.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/callee_guaranteed.pysnap
index 0c1abb5ec1c759..b054822a27597a 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/callee_guaranteed.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/callee_guaranteed.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-07-07T14:32:29.646100Z'
+created: '2024-12-17T22:46:56.805393+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "e2ea2eb86d26407f06b59beb3a444c91"
+  contributing component: exception
   component:
     app*
       exception*
@@ -128,6 +129,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "d23d0dfeac5f1349ceb624b330670b25"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/checksum_no_regex_match.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/checksum_no_regex_match.pysnap
index ae4e77afc418a4..ffcd18c7986b4f 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/checksum_no_regex_match.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/checksum_no_regex_match.pysnap
@@ -1,12 +1,8 @@
 ---
-created: '2024-11-08T18:04:55.679976+00:00'
+created: '2024-12-16T06:50:48.725342+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
-checksum:
-  hash: "not a legit checksum"
-  checksum: "not a legit checksum"
---------------------------------------------------------------------------
 hashed_checksum:
   hash: "de46d023e69b171b90ccf3ebca7aede4"
   checksum: "de46d023e69b171b90ccf3ebca7aede4"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/checksum_no_regex_match_long.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/checksum_no_regex_match_long.pysnap
deleted file mode 100644
index 8f99699ec2d1c7..00000000000000
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/checksum_no_regex_match_long.pysnap
+++ /dev/null
@@ -1,9 +0,0 @@
----
-created: '2024-11-08T18:04:55.536152+00:00'
-creator: sentry
-source: tests/sentry/grouping/test_variants.py
----
-hashed_checksum:
-  hash: "2c2e85a6e73109222f131228ed06a7af"
-  checksum: "2c2e85a6e73109222f131228ed06a7af"
-  raw_checksum: "not a legit checksum and also too long a string"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/cocoa_dispatch_client_callout.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/cocoa_dispatch_client_callout.pysnap
index 4001ed9e2fbbd1..da8e754893f426 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/cocoa_dispatch_client_callout.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/cocoa_dispatch_client_callout.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-03-22T11:57:42.810060+00:00'
+created: '2024-12-17T22:46:57.030690+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "7b230a2bb8a040d3e337c6205147e990"
+  contributing component: threads
   component:
     app*
       threads*
@@ -57,6 +58,7 @@ app:
 --------------------------------------------------------------------------
 default:
   hash: null
+  contributing component: null
   component:
     default (threads of app/system take precedence)
       message (threads of app/system take precedence)
@@ -64,6 +66,7 @@ default:
 --------------------------------------------------------------------------
 system:
   hash: "96df2174dd7e0ad3c31948a9de020fba"
+  contributing component: threads
   component:
     system*
       threads*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/connection_error.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/connection_error.pysnap
index 3aaaf8d04f3339..d61e43951ba801 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/connection_error.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/connection_error.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-08-25T09:17:16.087810Z'
+created: '2024-12-17T22:46:57.082092+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "6b059b9febc815ac18ac4d2082e38a9b"
+  contributing component: exception
   component:
     app*
       exception*
@@ -115,6 +116,7 @@ app:
 --------------------------------------------------------------------------
 default:
   hash: null
+  contributing component: null
   component:
     default (exception of app/system takes precedence)
       message (exception of app/system takes precedence)
@@ -122,6 +124,7 @@ default:
 --------------------------------------------------------------------------
 system:
   hash: "013d3477a774fe20c468dc8accd516f1"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/csp.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/csp.pysnap
index 7cfaf100b135fc..3a7ad93f782d58 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/csp.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/csp.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:40.951438Z'
+created: '2024-12-17T22:46:57.514200+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "666766514295bb52812324097cdaf53e"
+  contributing component: csp
   component:
     default*
       csp*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/csp_img_src.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/csp_img_src.pysnap
index b0928890d37516..19f45379c263ec 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/csp_img_src.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/csp_img_src.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:40.963396Z'
+created: '2024-12-17T22:46:57.140704+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "1742101e08eb1608f569751dfedd0062"
+  contributing component: csp
   component:
     default*
       csp*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/csp_no_blocked_uri.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/csp_no_blocked_uri.pysnap
index c0c088a6e60c93..7a00099a6a49be 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/csp_no_blocked_uri.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/csp_no_blocked_uri.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:40.976074Z'
+created: '2024-12-17T22:46:57.199755+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "efddf1cde918097259aa7d4904fb1942"
+  contributing component: csp
   component:
     default*
       csp*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/csp_script_data_uri.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/csp_script_data_uri.pysnap
index 6da4f61002387a..e6dee46fffcf61 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/csp_script_data_uri.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/csp_script_data_uri.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:40.985709Z'
+created: '2024-12-17T22:46:57.249877+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "4e6f2bce9d121aa89f4dc5e5da08afb5"
+  contributing component: csp
   component:
     default*
       csp*
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
index 1dc435ec55de9b..0c0db0dab5fe4a 100644
--- 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
@@ -1,10 +1,11 @@
 ---
-created: '2024-12-02T21:59:26.090063+00:00'
+created: '2024-12-17T22:46:57.310555+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "56c6520f35bce2f89ed2c4e725ccef65"
+  contributing component: csp
   component:
     default*
       csp*
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
index 14dcbae469e2bd..4289eab276016f 100644
--- 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
@@ -1,10 +1,11 @@
 ---
-created: '2024-12-02T21:59:26.141295+00:00'
+created: '2024-12-17T22:46:57.357773+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "d346ee37d19a2be6587e609075ca2d57"
+  contributing component: csp
   component:
     default*
       csp*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/csp_script_src_uri.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/csp_script_src_uri.pysnap
index 6c97e1ba08b25b..63719afbbc752c 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/csp_script_src_uri.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/csp_script_src_uri.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:40.998068Z'
+created: '2024-12-17T22:46:57.406627+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "223cdacfe5b4b830dc700b5c18cc21b4"
+  contributing component: csp
   component:
     default*
       csp*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/csp_style_src_elem.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/csp_style_src_elem.pysnap
index 1f20c5121e302a..412a15e45efe15 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/csp_style_src_elem.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/csp_style_src_elem.pysnap
@@ -1,8 +1,11 @@
 ---
+created: '2024-12-17T22:46:57.462225+00:00'
+creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "537a973f594c364842893e9a72af62a5"
+  contributing component: csp
   component:
     default*
       csp*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/custom_fingerprint_client.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/custom_fingerprint_client.pysnap
index e67bdc1b7251a5..c49751ecfd5014 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/custom_fingerprint_client.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/custom_fingerprint_client.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-11-08T18:04:56.469255+00:00'
+created: '2024-12-17T22:46:57.631452+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: exception
   component:
     app (custom fingerprint takes precedence)
       exception*
@@ -174,6 +175,7 @@ custom_fingerprint:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: exception
   component:
     system (custom fingerprint takes precedence)
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/custom_fingerprint_client_and_server_rule.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/custom_fingerprint_client_and_server_rule.pysnap
index 787f4c35fd4759..70db9615cc9687 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/custom_fingerprint_client_and_server_rule.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/custom_fingerprint_client_and_server_rule.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-11-08T18:04:56.395479+00:00'
+created: '2024-12-17T22:46:57.576905+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: exception
   component:
     app (custom fingerprint takes precedence)
       exception*
@@ -174,6 +175,7 @@ custom_fingerprint:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: exception
   component:
     system (custom fingerprint takes precedence)
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/custom_fingerprint_server_rule.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/custom_fingerprint_server_rule.pysnap
index 39de4332109994..4b90aba9e612a5 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/custom_fingerprint_server_rule.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/custom_fingerprint_server_rule.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-11-08T18:04:56.559938+00:00'
+created: '2024-12-17T22:46:57.680147+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: exception
   component:
     app (custom fingerprint takes precedence)
       exception*
@@ -174,6 +175,7 @@ custom_fingerprint:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: exception
   component:
     system (custom fingerprint takes precedence)
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_cocoa_nserror.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_cocoa_nserror.pysnap
index 9443c5cca85ad1..480299090048c1 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_cocoa_nserror.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_cocoa_nserror.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-15T23:12:43.125658+00:00'
+created: '2024-12-17T22:46:57.791347+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "029f3b967068b1539f96957b7c0451d7"
+  contributing component: exception
   component:
     app*
       exception*
@@ -89,6 +90,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: null
   component:
     system (exception of app takes precedence)
       threads (exception of app takes precedence)
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 771d2a0ef43ece..8a224a381450c9 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,10 +1,11 @@
 ---
-created: '2024-12-03T22:09:00.787678+00:00'
+created: '2024-12-17T22:46:57.937468+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "b23ee1963904c2ca87b145febf94b66c"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_compute_hashes_2.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_compute_hashes_2.pysnap
index d92fa3784fac64..180c6d32a97e36 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_compute_hashes_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_compute_hashes_2.pysnap
@@ -1,13 +1,14 @@
 ---
-created: '2021-02-15T10:11:55.005190Z'
+created: '2024-12-17T22:46:57.843860+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
-  hash: null
+  hash: "9509e122c6175606d52862fa4f64853c"
+  contributing component: exception
   component:
-    app (exception of system takes precedence)
-      exception (ignored because hash matches system variant)
+    app*
+      exception*
         stacktrace*
           frame*
             filename*
@@ -18,10 +19,11 @@ app:
           "hello world"
 --------------------------------------------------------------------------
 system:
-  hash: "9509e122c6175606d52862fa4f64853c"
+  hash: null
+  contributing component: null
   component:
-    system*
-      exception*
+    system (exception of app takes precedence)
+      exception (ignored because hash matches app variant)
         stacktrace*
           frame*
             filename*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_compute_hashes_3.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_compute_hashes_3.pysnap
index 4ad98c7f227147..b7700785217b44 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_compute_hashes_3.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_compute_hashes_3.pysnap
@@ -1,13 +1,14 @@
 ---
-created: '2021-02-15T10:11:54.704396Z'
+created: '2024-12-17T22:46:57.890733+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
-  hash: null
+  hash: "669cb6664e0f5fed38665da04e464f7e"
+  contributing component: chained-exception
   component:
-    app (exception of system takes precedence)
-      chained-exception (ignored because hash matches system variant)
+    app*
+      chained-exception*
         exception*
           stacktrace*
             frame*
@@ -28,10 +29,11 @@ app:
             "hello world"
 --------------------------------------------------------------------------
 system:
-  hash: "669cb6664e0f5fed38665da04e464f7e"
+  hash: null
+  contributing component: null
   component:
-    system*
-      chained-exception*
+    system (exception of app takes precedence)
+      chained-exception (ignored because hash matches app variant)
         exception*
           stacktrace*
             frame*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_bad_duplicate_id.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_bad_duplicate_id.pysnap
index ab618820290dfd..9b6502bba5d100 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_bad_duplicate_id.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_bad_duplicate_id.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-16T04:46:13.428951Z'
+created: '2024-12-17T22:46:57.991666+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "e2bf1e0628b7b1824a9b63dec7a079a3"
+  contributing component: chained-exception
   component:
     app*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_bad_missing_parent.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_bad_missing_parent.pysnap
index 83c721c5e9b8f3..5a88b682989782 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_bad_missing_parent.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_bad_missing_parent.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-16T04:46:15.786735Z'
+created: '2024-12-17T22:46:58.064963+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "a4f16891fa438620699cb2d9af5cc827"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_bad_out_of_sequence.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_bad_out_of_sequence.pysnap
index 579ca2abd10ab0..6ee84300afed12 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_bad_out_of_sequence.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_bad_out_of_sequence.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-16T04:47:06.090373Z'
+created: '2024-12-17T22:46:58.122408+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "f0078a82f351095ba595daa7d493aa3c"
+  contributing component: chained-exception
   component:
     app*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_bad_parent_with_parent.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_bad_parent_with_parent.pysnap
index 93bfd8fc41e7a3..4fe05dfc606218 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_bad_parent_with_parent.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_bad_parent_with_parent.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-16T04:47:01.755829Z'
+created: '2024-12-17T22:46:58.186567+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "0809098f9f613b63467605dd1739cc9b"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_bad_with_cycle.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_bad_with_cycle.pysnap
index 807d41fe31871e..1c78d7e615a730 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_bad_with_cycle.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_bad_with_cycle.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-16T04:46:13.473397Z'
+created: '2024-12-17T22:46:58.335111+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "0809098f9f613b63467605dd1739cc9b"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_one_exception.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_one_exception.pysnap
index 675acf5be1e6ef..fc40c1c224655c 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_one_exception.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_one_exception.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-04T06:18:46.623984Z'
+created: '2024-12-17T22:46:58.411529+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "a4f16891fa438620699cb2d9af5cc827"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_one_type_under_nested_groups.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_one_type_under_nested_groups.pysnap
index cb3a279d5035b7..6607d881455692 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_one_type_under_nested_groups.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_one_type_under_nested_groups.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-04T05:13:36.297914Z'
+created: '2024-12-17T22:46:58.464146+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "a4f16891fa438620699cb2d9af5cc827"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_one_type_with_different_values.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_one_type_with_different_values.pysnap
index bdc5d5eb7b3316..ee89878bae886a 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_one_type_with_different_values.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_one_type_with_different_values.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-04T20:21:22.180925Z'
+created: '2024-12-17T22:46:58.508637+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "17022e0561e9b6e6351723a08aa81b18"
+  contributing component: chained-exception
   component:
     app*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_one_type_with_similar_values.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_one_type_with_similar_values.pysnap
index fcd517ed4ea92b..8df50bc9258075 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_one_type_with_similar_values.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_one_type_with_similar_values.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-04T00:43:37.187850Z'
+created: '2024-12-17T22:46:58.614284+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "a4f16891fa438620699cb2d9af5cc827"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_one_type_with_similar_values_and_children.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_one_type_with_similar_values_and_children.pysnap
index 40f2342756aa60..d572b0c4fcc7a8 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_one_type_with_similar_values_and_children.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_one_type_with_similar_values_and_children.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-04T01:23:18.754551Z'
+created: '2024-12-17T22:46:58.561984+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "f0078a82f351095ba595daa7d493aa3c"
+  contributing component: chained-exception
   component:
     app*
       chained-exception*
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
index 76d3985ce6b9c7..7a677fc2a1ae63 100644
--- 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
@@ -1,10 +1,11 @@
 ---
-created: '2024-11-19T00:26:42.338897+00:00'
+created: '2024-12-17T22:46:58.683797+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "d505dfb9059ac63c11955233323a9100"
+  contributing component: chained-exception
   component:
     app*
       chained-exception*
@@ -48,6 +49,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "4f9cc6a81f4eb34f9e917374f281b9dc"
+  contributing component: chained-exception
   component:
     system*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_two_types.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_two_types.pysnap
index 91f75184ccf3aa..c33af91d37c5ad 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_two_types.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_two_types.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-04T05:13:36.689076Z'
+created: '2024-12-17T22:46:58.782954+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "bca604b98cb4637167eb6190a92e8933"
+  contributing component: chained-exception
   component:
     app*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_two_types_under_nested_groups.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_two_types_under_nested_groups.pysnap
index 5888b9cd2e6f23..f83d6871cbb981 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_two_types_under_nested_groups.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_two_types_under_nested_groups.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-04T06:07:44.633291Z'
+created: '2024-12-17T22:46:58.732241+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "fca0fd23f09e8da4481304ef2a531100"
+  contributing component: chained-exception
   component:
     app*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_javascript_no_in_app.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_javascript_no_in_app.pysnap
index c7e979394916a6..36e40fef6ecf63 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_javascript_no_in_app.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_javascript_no_in_app.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:35.925999+00:00'
+created: '2024-12-17T22:46:58.840888+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -32,6 +33,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "26552f86ca2368e708afa1df6effc1c5"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_without_type.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_without_type.pysnap
index 719d20a6ad0df2..bd5b047a42659c 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_without_type.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_without_type.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-02-12T22:47:12.699972Z'
+created: '2024-12-17T22:46:58.894961+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "5eb63bbbe01eeed093cb22bb8f5acdc3"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_without_value.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_without_value.pysnap
index 687c4510382b34..3df14353124948 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_without_value.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_without_value.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-02-12T22:47:13.689454Z'
+created: '2024-12-17T22:46:58.945587+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "5a2cfd89b7b171fd7b4794b08023d04f"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/expectct.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/expectct.pysnap
index edb90f94433726..05a2158a42f097 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/expectct.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/expectct.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:41.214688Z'
+created: '2024-12-17T22:46:59.008178+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "3d2933f4b5ec459ec8d569a398fd328c"
+  contributing component: expect-ct
   component:
     default*
       expect-ct*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/fallback_prefix_level_1.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/fallback_prefix_level_1.pysnap
index ba18e4a1661b7b..08aefede0097b0 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/fallback_prefix_level_1.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/fallback_prefix_level_1.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:36.109533+00:00'
+created: '2024-12-17T22:46:59.062508+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -32,6 +33,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "b85897bf204fd8e90ff495b47502f281"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_compute_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
index 4918a8733767cc..213a66fd9bfe0c 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_compute_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,10 +1,11 @@
 ---
-created: '2024-12-03T22:09:00.855839+00:00'
+created: '2024-12-17T22:46:59.127447+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "526b64456c48836a46ec1a89544fd412"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_empty_list.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_empty_list.pysnap
index f8f4573e72480e..50ab24d63aa7a1 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_empty_list.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_empty_list.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:36.198672+00:00'
+created: '2024-12-17T22:46:59.197130+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app
       stacktrace (ignored because it contains no frames)
@@ -14,6 +15,7 @@ fallback:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: null
   component:
     system
       stacktrace (ignored because it contains no frames)
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_ENHANCED_enhancer_by_classes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_ENHANCED_enhancer_by_classes.pysnap
index 68d2bb4d096fb2..2a3f5ddfb84bfa 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_ENHANCED_enhancer_by_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_ENHANCED_enhancer_by_classes.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:36.243813+00:00'
+created: '2024-12-17T22:46:59.258992+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "d8f406c2efb312db2231282f94647b1d"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_ENHANCED_fast_class_by_classes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_ENHANCED_fast_class_by_classes.pysnap
index 58e19652988df5..434aea54ba2a90 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_ENHANCED_fast_class_by_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_ENHANCED_fast_class_by_classes.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:36.286478+00:00'
+created: '2024-12-17T22:46:59.326130+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "91f42e615037e91a3c6f8a6fcf04056b"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_ENHANCED_spring_classes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_ENHANCED_spring_classes.pysnap
index 1efc10ec1afc89..4451923c7c7e01 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_ENHANCED_spring_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_ENHANCED_spring_classes.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:36.332986+00:00'
+created: '2024-12-17T22:46:59.395155+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "45c0b0a8c777e7a7040d7c39233a08a5"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_dartlang_sdk.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_dartlang_sdk.pysnap
index 1260d4174d7e3e..31d3b6a43effd3 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_dartlang_sdk.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_dartlang_sdk.pysnap
@@ -1,13 +1,14 @@
 ---
-created: '2021-08-23T14:18:12.940781Z'
+created: '2024-12-17T22:46:59.442360+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
-  hash: null
+  hash: "82639bcdd4eca16551e8cd3448f48ed4"
+  contributing component: stacktrace
   component:
-    app (stacktrace of system takes precedence)
-      stacktrace (ignored because hash matches system variant)
+    app*
+      stacktrace*
         frame*
           filename*
             "async_patch.dart"
@@ -15,10 +16,11 @@ app:
             "_asyncStartSync"
 --------------------------------------------------------------------------
 system:
-  hash: "82639bcdd4eca16551e8cd3448f48ed4"
+  hash: null
+  contributing component: null
   component:
-    system*
-      stacktrace*
+    system (stacktrace of app takes precedence)
+      stacktrace (ignored because hash matches app variant)
         frame*
           filename*
             "async_patch.dart"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_extra_ENHANCED_clojure_classes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_extra_ENHANCED_clojure_classes.pysnap
index 2f090668ab2b1c..159c2e93f8c0c3 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_extra_ENHANCED_clojure_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_extra_ENHANCED_clojure_classes.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:36.420756+00:00'
+created: '2024-12-17T22:46:59.489527+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "353e05904b48bd3ae4fa9623934a70d0"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_extra_ENHANCED_enhancer_by_classes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_extra_ENHANCED_enhancer_by_classes.pysnap
index 15dac24c89ac04..760e3fe2b96999 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_extra_ENHANCED_enhancer_by_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_extra_ENHANCED_enhancer_by_classes.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:36.463341+00:00'
+created: '2024-12-17T22:46:59.533469+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "f771960161f86b1f8eec4edc3016e1c0"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_extra_ENHANCED_spring_classes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_extra_ENHANCED_spring_classes.pysnap
index f5dc2c4e383a97..dda2a55b81782f 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_extra_ENHANCED_spring_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_extra_ENHANCED_spring_classes.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:36.507462+00:00'
+created: '2024-12-17T22:46:59.583444+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "be15ca3d511b96918e087c4f42503ca2"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_filename_from_url_origin_corner_cases.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_filename_from_url_origin_corner_cases.pysnap
index 9fdc30bd198abd..4fcd0a6df4d106 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_filename_from_url_origin_corner_cases.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_filename_from_url_origin_corner_cases.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:36.553913+00:00'
+created: '2024-12-17T22:46:59.638546+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -30,6 +31,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "e04dce7550635e05dbd7f656102cf304"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_filename_if_abs_path_is_http.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_filename_if_abs_path_is_http.pysnap
index ef6cd6d70f9311..c5b3cf6c7fdaf0 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_filename_if_abs_path_is_http.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_filename_if_abs_path_is_http.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:36.600400+00:00'
+created: '2024-12-17T22:46:59.707091+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "098f6bcd4621d373cade4e832627b4f6"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_filename_if_blob.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_filename_if_blob.pysnap
index 1044c78c9310f5..1b40cb74a903a1 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_filename_if_blob.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_filename_if_blob.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:36.645443+00:00'
+created: '2024-12-17T22:46:59.758357+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app
       stacktrace (ignored because it contains no in-app frames)
@@ -17,6 +18,7 @@ fallback:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: null
   component:
     system
       stacktrace (ignored because it contains no contributing frames)
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_filename_if_http.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_filename_if_http.pysnap
index 05e89984fef1b6..ce1614ec3e92da 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_filename_if_http.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_filename_if_http.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:36.689024+00:00'
+created: '2024-12-17T22:46:59.859026+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -18,6 +19,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "64a0e0a34d99dce03a8c5a4c237a4b5a"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_filename_if_https.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_filename_if_https.pysnap
index 251339ee41bad5..84c8bcfdd1e8cd 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_filename_if_https.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_filename_if_https.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:36.735459+00:00'
+created: '2024-12-17T22:46:59.915254+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -18,6 +19,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "64a0e0a34d99dce03a8c5a4c237a4b5a"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_flutter_sdk.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_flutter_sdk.pysnap
index 8ce4cd08141bb0..cd0e9c6d659289 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_flutter_sdk.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_flutter_sdk.pysnap
@@ -1,13 +1,14 @@
 ---
-created: '2021-09-20T12:35:59.674725Z'
+created: '2024-12-17T22:46:59.963706+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
-  hash: null
+  hash: "e0e7c4713e9092dc77635d5a0d5db31d"
+  contributing component: stacktrace
   component:
-    app (stacktrace of system takes precedence)
-      stacktrace (ignored because hash matches system variant)
+    app*
+      stacktrace*
         frame*
           module*
             "opt/hostedtoolcache/flutter/2.5.0-stable/x64/packages/flutter/lib/src/gestures/binding"
@@ -17,10 +18,11 @@ app:
             "_flushPointerEventQueue"
 --------------------------------------------------------------------------
 system:
-  hash: "e0e7c4713e9092dc77635d5a0d5db31d"
+  hash: null
+  contributing component: null
   component:
-    system*
-      stacktrace*
+    system (stacktrace of app takes precedence)
+      stacktrace (ignored because hash matches app variant)
         frame*
           module*
             "opt/hostedtoolcache/flutter/2.5.0-stable/x64/packages/flutter/lib/src/gestures/binding"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_hibernate_classes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_hibernate_classes.pysnap
index 0bf3c874b4088c..0942d933ef93a7 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_hibernate_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_hibernate_classes.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:36.837706+00:00'
+created: '2024-12-17T22:47:00.012337+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "a01e3a60f8863fd9dfc5697fae1eed46"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_java8_lambda_function.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_java8_lambda_function.pysnap
index 596542c76e881f..a52753151307dc 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_java8_lambda_function.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_java8_lambda_function.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:36.888259+00:00'
+created: '2024-12-17T22:47:00.158089+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "be7f1b8b4014de623c533a8218dba5bd"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_java8_lambda_module.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_java8_lambda_module.pysnap
index 4b994fd9bccac4..64e65a56fe2c14 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_java8_lambda_module.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_java8_lambda_module.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:36.953777+00:00'
+created: '2024-12-17T22:47:00.215938+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "53b9e9679a8ea25880376080b76f98ad"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_javassist.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_javassist.pysnap
index a3e485fb1b2862..4c3cd18abf5dd7 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_javassist.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_javassist.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:37.116660+00:00'
+created: '2024-12-17T22:47:00.376302+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "538bdfd8d7bb2495d0d6429c3689a420"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_javassist_2.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_javassist_2.pysnap
index 628a61e48d6cf9..62af117dcd3a85 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_javassist_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_javassist_2.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:37.007786+00:00'
+created: '2024-12-17T22:47:00.271017+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "538bdfd8d7bb2495d0d6429c3689a420"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_javassist_3.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_javassist_3.pysnap
index 3411177e0d6779..29e7edb9024e81 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_javassist_3.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_javassist_3.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:37.057065+00:00'
+created: '2024-12-17T22:47:00.328713+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "dc3d511120ce04996b1eef3496516e5c"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_module_if_page_url.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_module_if_page_url.pysnap
index 91fab662f006b9..6293281aa7267b 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_module_if_page_url.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_module_if_page_url.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:37.245158+00:00'
+created: '2024-12-17T22:47:00.496953+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app
       stacktrace (ignored because it contains no in-app frames)
@@ -19,6 +20,7 @@ fallback:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: null
   component:
     system
       stacktrace (ignored because it contains no contributing frames)
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_module_if_page_url_2.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_module_if_page_url_2.pysnap
index 85d45cdf65a0cf..ca7a1321f9c126 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_module_if_page_url_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_module_if_page_url_2.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:37.176376+00:00'
+created: '2024-12-17T22:47:00.438922+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -18,6 +19,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "0cc175b9c0f1b6a831c399e269772661"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_safari_native_code.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_safari_native_code.pysnap
index bf32f0f5c0c3f9..826195ebd1bbb4 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_safari_native_code.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_safari_native_code.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:37.300944+00:00'
+created: '2024-12-17T22:47:00.606196+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "30eb5001914d29dd8461898b5b8094fe"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_sentry_dart_packages.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_sentry_dart_packages.pysnap
index 5f331fa2418916..3b5dc9f45cf96d 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_sentry_dart_packages.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_sentry_dart_packages.pysnap
@@ -1,13 +1,14 @@
 ---
-created: '2024-06-05T14:22:38.794583+00:00'
+created: '2024-12-17T22:47:00.727362+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
-  hash: null
+  hash: "278cdd35be92e2ffde1d0a40524e7786"
+  contributing component: stacktrace
   component:
-    app (stacktrace of system takes precedence)
-      stacktrace (ignored because hash matches system variant)
+    app*
+      stacktrace*
         frame*
           filename*
             "sentry_logging.dart"
@@ -45,10 +46,11 @@ app:
             "SentryDrift.drift"
 --------------------------------------------------------------------------
 system:
-  hash: "278cdd35be92e2ffde1d0a40524e7786"
+  hash: null
+  contributing component: null
   component:
-    system*
-      stacktrace*
+    system (stacktrace of app takes precedence)
+      stacktrace (ignored because hash matches app variant)
         frame*
           filename*
             "sentry_logging.dart"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_sentry_dart_sdk.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_sentry_dart_sdk.pysnap
index 6ec81a84bfad01..a4e1a37ce0d977 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_sentry_dart_sdk.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_sentry_dart_sdk.pysnap
@@ -1,13 +1,14 @@
 ---
-created: '2024-05-28T08:21:42.682278+00:00'
+created: '2024-12-17T22:47:00.792328+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
-  hash: null
+  hash: "d1fe4234d1bddc3823d08dcc529fb161"
+  contributing component: stacktrace
   component:
-    app (stacktrace of system takes precedence)
-      stacktrace (ignored because hash matches system variant)
+    app*
+      stacktrace*
         frame*
           filename*
             "sentry_exception_factory.dart"
@@ -15,10 +16,11 @@ app:
             "SentryExceptionFactory.getSentryException"
 --------------------------------------------------------------------------
 system:
-  hash: "d1fe4234d1bddc3823d08dcc529fb161"
+  hash: null
+  contributing component: null
   component:
-    system*
-      stacktrace*
+    system (stacktrace of app takes precedence)
+      stacktrace (ignored because hash matches app variant)
         frame*
           filename*
             "sentry_exception_factory.dart"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_sentry_flutter_sdk.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_sentry_flutter_sdk.pysnap
index 7a6a7ee2c3324c..f7bab35b3f7ef9 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_sentry_flutter_sdk.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_sentry_flutter_sdk.pysnap
@@ -1,13 +1,14 @@
 ---
-created: '2024-05-28T08:13:52.924648+00:00'
+created: '2024-12-17T22:47:00.840544+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
-  hash: null
+  hash: "d1fe4234d1bddc3823d08dcc529fb161"
+  contributing component: stacktrace
   component:
-    app (stacktrace of system takes precedence)
-      stacktrace (ignored because hash matches system variant)
+    app*
+      stacktrace*
         frame*
           filename*
             "sentry_exception_factory.dart"
@@ -15,10 +16,11 @@ app:
             "SentryExceptionFactory.getSentryException"
 --------------------------------------------------------------------------
 system:
-  hash: "d1fe4234d1bddc3823d08dcc529fb161"
+  hash: null
+  contributing component: null
   component:
-    system*
-      stacktrace*
+    system (stacktrace of app takes precedence)
+      stacktrace (ignored because hash matches app variant)
         frame*
           filename*
             "sentry_exception_factory.dart"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_sun_java_generated_constructors.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_sun_java_generated_constructors.pysnap
index edd0fbdab6b857..06fb8cc108f47b 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_sun_java_generated_constructors.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_sun_java_generated_constructors.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:37.597758+00:00'
+created: '2024-12-17T22:47:00.953439+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "07d1a8e5728b3c4c7aa8b8273fd0e753"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_sun_java_generated_constructors_2.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_sun_java_generated_constructors_2.pysnap
index 247d0f9165a512..54abdb4b2680de 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_sun_java_generated_constructors_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_sun_java_generated_constructors_2.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:37.548719+00:00'
+created: '2024-12-17T22:47:00.895581+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "09e0efcab18f545166318118ed4e0292"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_sun_java_generated_methods.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_sun_java_generated_methods.pysnap
index ee52045775bfec..da72ea6a8c3915 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_sun_java_generated_methods.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_ignores_sun_java_generated_methods.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:37.635713+00:00'
+created: '2024-12-17T22:47:01.012915+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -21,6 +22,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "9bc326575875422d0d4ced3c35d9f916"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_sanitizes_block_functions.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_sanitizes_block_functions.pysnap
index 9d26c8dab3cb63..8e1232bbcb5862 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_sanitizes_block_functions.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_sanitizes_block_functions.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:37.676550+00:00'
+created: '2024-12-17T22:47:01.062137+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "27eed4125fc13d42163ddb0b8f357b48"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_sanitizes_erb_templates.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_sanitizes_erb_templates.pysnap
index aba7a8320a4c84..c633b427168c02 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_sanitizes_erb_templates.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_sanitizes_erb_templates.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:37.712878+00:00'
+created: '2024-12-17T22:47:01.127526+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "4067a71d7098866f87c746a57a77b2bb"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_sanitizes_versioned_filenames.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_sanitizes_versioned_filenames.pysnap
index 01cb34343c0542..7337af4f83e9d5 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_sanitizes_versioned_filenames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_sanitizes_versioned_filenames.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:37.814255+00:00'
+created: '2024-12-17T22:47:01.279415+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -14,6 +15,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "2f908c015ad77a50595512fcf65d344c"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_sanitizes_versioned_filenames_2.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_sanitizes_versioned_filenames_2.pysnap
index 9e76462e7f455a..12878ced7137ab 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_sanitizes_versioned_filenames_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_sanitizes_versioned_filenames_2.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:37.752310+00:00'
+created: '2024-12-17T22:47:01.193156+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -14,6 +15,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "2f908c015ad77a50595512fcf65d344c"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_skips_symbol_if_unknown.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_skips_symbol_if_unknown.pysnap
index b60964bae58b7a..126d58239487cf 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_skips_symbol_if_unknown.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_skips_symbol_if_unknown.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:37.875908+00:00'
+created: '2024-12-17T22:47:01.336506+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "a972f399399f5566f39b14a7afdd24ff"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_uses_context_line_over_function.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_uses_context_line_over_function.pysnap
index b7eaed51fe0f34..1d96497f5c4984 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_uses_context_line_over_function.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_uses_context_line_over_function.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:37.928768+00:00'
+created: '2024-12-17T22:47:01.394804+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "fb73cb54ced59b1c0c60d9bb40b7336b"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_uses_function_over_lineno.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_uses_function_over_lineno.pysnap
index c9042640856960..c7b10d6e39aca1 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_uses_function_over_lineno.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_uses_function_over_lineno.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:38.003589+00:00'
+created: '2024-12-17T22:47:01.453317+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "fb73cb54ced59b1c0c60d9bb40b7336b"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_uses_module_over_filename.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_uses_module_over_filename.pysnap
index 31374d3339212e..dd1cb8a24e85aa 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_uses_module_over_filename.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_uses_module_over_filename.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:38.057881+00:00'
+created: '2024-12-17T22:47:01.512516+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "acbd18db4cc2f85cedef654fccc4a4d8"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_uses_symbol_instead_of_function.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_uses_symbol_instead_of_function.pysnap
index a9e5e3a3fc385c..6678f1bd25e65e 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_uses_symbol_instead_of_function.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_uses_symbol_instead_of_function.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:38.116442+00:00'
+created: '2024-12-17T22:47:01.566936+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "23db4a9e73800923f345d2b868993345"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_with_only_required_vars.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_with_only_required_vars.pysnap
index 25d85d30011b2e..dc8e2c6be87581 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_with_only_required_vars.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_with_only_required_vars.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:38.169558+00:00'
+created: '2024-12-17T22:47:01.627832+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -14,6 +15,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "1effb24729ae4c43efa36b460511136a"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/go_pkg_mod.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/go_pkg_mod.pysnap
index 4c10c857b234ff..c06e882bf4982d 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/go_pkg_mod.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/go_pkg_mod.pysnap
@@ -1,8 +1,11 @@
 ---
+created: '2024-12-17T22:47:01.678196+00:00'
+creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "4b8bbc500bd2cabfcadc1f1be867e0bb"
+  contributing component: exception
   component:
     app*
       exception*
@@ -28,6 +31,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "348fc4026c9fa11ffba8fbfa80a134c9"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_125_event_126.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_125_event_126.pysnap
index 9275f4836be0d2..d2260581d2e6bc 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_125_event_126.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_125_event_126.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:38.299204+00:00'
+created: '2024-12-17T22:47:01.756997+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -144,6 +145,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "725b26e5c390004cd0eca6018a7ad200"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_200_event_200.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_200_event_200.pysnap
index 745b9aabd24e49..5d910a5ba2b075 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_200_event_200.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_200_event_200.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:38.367533+00:00'
+created: '2024-12-17T22:47:01.814566+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -88,6 +89,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "48a275d290e688b23878080257c9adc3"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_275_event_275.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_275_event_275.pysnap
index 9089f1867099c0..b9388199ce0495 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_275_event_275.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_275_event_275.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:38.436482+00:00'
+created: '2024-12-17T22:47:01.882420+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -104,6 +105,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "07fb068d9b0e76878c72b462ea20cab3"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_289_event_312.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_289_event_312.pysnap
index 86bd23cba279d9..e17db640fb0526 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_289_event_312.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_289_event_312.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:38.513976+00:00'
+created: '2024-12-17T22:47:01.948904+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -96,6 +97,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "94d5c188bc82790c397f7f97d5239ee0"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_294_event_294.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_294_event_294.pysnap
index 2fd511e373f9a1..6ce8303ff936e5 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_294_event_294.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_294_event_294.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:38.573957+00:00'
+created: '2024-12-17T22:47:02.013744+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -145,6 +146,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "b77a07388ce12082423da4abee4415fc"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_294_event_329.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_294_event_329.pysnap
index 3a54628b90eafc..4e757fd8366458 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_294_event_329.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_294_event_329.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:38.638191+00:00'
+created: '2024-12-17T22:47:02.075696+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -160,6 +161,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "76e54b047bb34b5d0ec6d210fcd8d995"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_307_event_307.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_307_event_307.pysnap
index e4b2b7a061f263..ead214ba51942d 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_307_event_307.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_307_event_307.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:38.704859+00:00'
+created: '2024-12-17T22:47:02.127487+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -64,6 +65,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "b7c6253ad69f02d33e770f3050d72c88"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_307_event_657.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_307_event_657.pysnap
index f80d720f3ea35d..c279b428aa186b 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_307_event_657.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_307_event_657.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:38.769640+00:00'
+created: '2024-12-17T22:47:02.184778+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -59,6 +60,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "12c4b5346b5242ec65d3153bb45937b0"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_313_event_313.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_313_event_313.pysnap
index 530ae08354706c..4a45f217503963 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_313_event_313.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_313_event_313.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:38.841053+00:00'
+created: '2024-12-17T22:47:02.243251+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -193,6 +194,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "57d5f9c178ebe1364226ed6c90d30174"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_313_event_333.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_313_event_333.pysnap
index 4196259f9756ef..e2d51478f8134d 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_313_event_333.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_313_event_333.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:38.907106+00:00'
+created: '2024-12-17T22:47:02.319717+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -198,6 +199,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "51856c096282b824c59e92b79dda4eec"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_319_event_321.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_319_event_321.pysnap
index 0d40d3df70e7f8..1fa47dc0fa0ca3 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_319_event_321.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_319_event_321.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:38.970695+00:00'
+created: '2024-12-17T22:47:02.390835+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -196,6 +197,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "e4714f9479fea40111888ca143e02d8f"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_389_event_389.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_389_event_389.pysnap
index 616cd0d98ec165..28984e11148513 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_389_event_389.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_389_event_389.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:39.024442+00:00'
+created: '2024-12-17T22:47:02.443165+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -46,6 +47,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "ba5ff7b8a3adc9b87681ff0f8275a72e"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_432_event_432.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_432_event_432.pysnap
index 113145bff96262..901660d2f1f69f 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_432_event_432.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_432_event_432.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:39.097323+00:00'
+created: '2024-12-17T22:47:02.514319+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -130,6 +131,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "aeefa28dbbcc272df254d59c98aad03c"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_432_event_453.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_432_event_453.pysnap
index 07ad2b17398650..002dd776ab7a6b 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_432_event_453.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_432_event_453.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:39.163825+00:00'
+created: '2024-12-17T22:47:02.584232+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -130,6 +131,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "50325a901e2db771dca1291283d8b54e"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_445_event_445.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_445_event_445.pysnap
index 72a0b39eb84ef5..a75baa447f6b0e 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_445_event_445.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/group_445_event_445.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:39.247413+00:00'
+created: '2024-12-17T22:47:02.659613+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -151,6 +152,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "2fa6bd4588d2ae97b62ef1f8db5b12bf"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/hpkp.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/hpkp.pysnap
index f07c2740f28ff1..1ffccb8df466cd 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/hpkp.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/hpkp.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:41.877137Z'
+created: '2024-12-17T22:47:02.770753+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "1e37a374cb33572622d02ff7a6237c44"
+  contributing component: hpkp
   component:
     default*
       hpkp*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/hybrid_fingerprint_base.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/hybrid_fingerprint_base.pysnap
index f381ca2a02ac2c..34988db823f5a8 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/hybrid_fingerprint_base.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/hybrid_fingerprint_base.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-15T17:23:55.207223+00:00'
+created: '2024-12-17T22:47:02.869762+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "e3d593b4335190212ca7c18b8e967fb1"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/hybrid_fingerprint_custom_client_hybrid_server.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/hybrid_fingerprint_custom_client_hybrid_server.pysnap
index 91219e38ca8a6c..e76bf7179ca780 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/hybrid_fingerprint_custom_client_hybrid_server.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/hybrid_fingerprint_custom_client_hybrid_server.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-16T19:27:00.095990+00:00'
+created: '2024-12-17T22:47:02.921802+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "19163f3ca34f5995c69d85351ce3d697"
+  contributing component: exception
   component:
     app*
       exception*
@@ -171,6 +172,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "847950eb44d280e6758d136c763d6ddc"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/hybrid_fingerprint_hybrid_client_custom_server.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/hybrid_fingerprint_hybrid_client_custom_server.pysnap
index b83b8b17667a33..af051dffd8b626 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/hybrid_fingerprint_hybrid_client_custom_server.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/hybrid_fingerprint_hybrid_client_custom_server.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-11-08T18:05:07.898530+00:00'
+created: '2024-12-17T22:47:02.970010+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: exception
   component:
     app (custom fingerprint takes precedence)
       exception*
@@ -174,6 +175,7 @@ custom_fingerprint:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: exception
   component:
     system (custom fingerprint takes precedence)
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/hybrid_fingerprint_same_default_different_extra.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/hybrid_fingerprint_same_default_different_extra.pysnap
index 2d5fcd801e16d7..e7782a710f753a 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/hybrid_fingerprint_same_default_different_extra.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/hybrid_fingerprint_same_default_different_extra.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-15T17:23:55.403205+00:00'
+created: '2024-12-17T22:47:03.012489+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "5b5ad5a0fbb4deb5e3fc631ce42681ae"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/hybrid_fingerprint_same_extra_different_default.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/hybrid_fingerprint_same_extra_different_default.pysnap
index d2c364b47cd328..0c7d68c410f01c 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/hybrid_fingerprint_same_extra_different_default.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/hybrid_fingerprint_same_extra_different_default.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-15T17:23:55.462604+00:00'
+created: '2024-12-17T22:47:03.055936+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "c5578778212497f1ff3435405e2a4a98"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/in_app_in_ui.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/in_app_in_ui.pysnap
index e813776b7ab95e..442b3af5b3b1d8 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/in_app_in_ui.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/in_app_in_ui.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-07-26T19:38:26.157177Z'
+created: '2024-12-17T22:47:03.111327+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "9b037f38798ea127aac3e8b8e1e1024a"
+  contributing component: exception
   component:
     app*
       exception*
@@ -150,6 +151,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "fe8b15fe322c91ede2fc48363fe43587"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/java_chained.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/java_chained.pysnap
index 79e0d91bbbb0ea..add0fdfee69455 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/java_chained.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/java_chained.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:39.688455+00:00'
+created: '2024-12-17T22:47:03.168568+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "750486b8d8c51500fa0dfbb6f1577af0"
+  contributing component: chained-exception
   component:
     app*
       chained-exception*
@@ -393,6 +394,7 @@ app:
 --------------------------------------------------------------------------
 default:
   hash: null
+  contributing component: null
   component:
     default (exception of app/system takes precedence)
       message (exception of app/system takes precedence)
@@ -400,6 +402,7 @@ default:
 --------------------------------------------------------------------------
 system:
   hash: "8924849495809d42431719c2b9ab65c8"
+  contributing component: chained-exception
   component:
     system*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/java_minimal.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/java_minimal.pysnap
index ac930da5216294..c0ee1465bcd64f 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/java_minimal.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/java_minimal.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:39.763252+00:00'
+created: '2024-12-17T22:47:03.222586+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -401,6 +402,7 @@ app:
 --------------------------------------------------------------------------
 default:
   hash: null
+  contributing component: null
   component:
     default (exception of system takes precedence)
       message (exception of system takes precedence)
@@ -408,6 +410,7 @@ default:
 --------------------------------------------------------------------------
 system:
   hash: "ec87dd10e4f7512ecccb4a068c5774ae"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_exception_fallback_to_message.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_exception_fallback_to_message.pysnap
index 5eeae0aaa3831c..855713a0271143 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_exception_fallback_to_message.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_exception_fallback_to_message.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-02-12T22:47:12.589376Z'
+created: '2024-12-17T22:47:03.314253+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "10dfd81e2df31e96fae451b9e205ad81"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_exception_fallback_to_message_whistles.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_exception_fallback_to_message_whistles.pysnap
index 324382790d325b..7c773add58a507 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_exception_fallback_to_message_whistles.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_exception_fallback_to_message_whistles.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-02-12T22:47:13.853730Z'
+created: '2024-12-17T22:47:03.263858+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "b8e2a347e75266ca7bb565e2b3c0722e"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_exception_no_in_app.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_exception_no_in_app.pysnap
index 63b0744ea67f89..88e333d71baf83 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_exception_no_in_app.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_exception_no_in_app.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:39.961798+00:00'
+created: '2024-12-17T22:47:03.367654+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -76,6 +77,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "c0f3f7d6deb17aec9d07259ac684fad0"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_message.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_message.pysnap
index 2f769f2d5254c6..e42ad0a1886f47 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_message.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_message.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:42.116127Z'
+created: '2024-12-17T22:47:03.461465+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "4119639092e62c55ea8be348e4d9260d"
+  contributing component: message
   component:
     default*
       message*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_message_parameterization.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_message_parameterization.pysnap
index b1e2933682dc62..5d737ab718e258 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_message_parameterization.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_message_parameterization.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-15T17:12:36.994501+00:00'
+created: '2024-12-17T22:47:03.412998+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "f9e47f16e3b9770b440157179c47bf7a"
+  contributing component: message
   component:
     default*
       message* (stripped event-specific values)
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_polyfills.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_polyfills.pysnap
index 32ab273f938cc5..d83a4f74ee2ef4 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_polyfills.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_polyfills.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:40.157138+00:00'
+created: '2024-12-17T22:47:03.508628+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -31,6 +32,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "838d9553ed824c45d9125f42ec408472"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_unpkg.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_unpkg.pysnap
index 43abd6842741b9..b5b340d77ba45e 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_unpkg.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_unpkg.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:40.238646+00:00'
+created: '2024-12-17T22:47:03.563459+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -38,6 +39,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "6ab78545e13144405fb21dadb9045b91"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_chrome.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_chrome.pysnap
index f57d0ecdd5ec54..e1368253178923 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_chrome.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_chrome.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:40.325734+00:00'
+created: '2024-12-17T22:47:03.626131+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -62,6 +63,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "c63e8727af1a8fe75872b6a762797113"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_edge.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_edge.pysnap
index 029e3876ee9b47..39cf4d0d9574d3 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_edge.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_edge.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:40.471305+00:00'
+created: '2024-12-17T22:47:03.676947+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -66,6 +67,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "c63e8727af1a8fe75872b6a762797113"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_firefox.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_firefox.pysnap
index d2792da319eb0e..f3467bd26832b2 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_firefox.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_firefox.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:40.568631+00:00'
+created: '2024-12-17T22:47:03.726439+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -59,6 +60,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "c63e8727af1a8fe75872b6a762797113"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_http_chrome.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_http_chrome.pysnap
index d35da77ce12905..900e154c1e3cf4 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_http_chrome.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_http_chrome.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:40.663439+00:00'
+created: '2024-12-17T22:47:03.775530+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -80,6 +81,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "b2602ad455472dede8e4c340d8a7eaba"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_http_edge.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_http_edge.pysnap
index 8b4f9c0f70ecf5..40b8a55db60bff 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_http_edge.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_http_edge.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:40.724033+00:00'
+created: '2024-12-17T22:47:03.826998+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -84,6 +85,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "b2602ad455472dede8e4c340d8a7eaba"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_http_firefox.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_http_firefox.pysnap
index 31d165d220c298..07d4c9e474b9a9 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_http_firefox.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_http_firefox.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:40.808684+00:00'
+created: '2024-12-17T22:47:03.886864+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -77,6 +78,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "b2602ad455472dede8e4c340d8a7eaba"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_http_safari.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_http_safari.pysnap
index 5d4390b1b5b540..ac0db063badfbc 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_http_safari.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_http_safari.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:40.867925+00:00'
+created: '2024-12-17T22:47:03.974852+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -83,6 +84,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "b2602ad455472dede8e4c340d8a7eaba"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_safari.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_safari.pysnap
index 5a7138097963e1..5982f8f8f69e93 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_safari.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_safari.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:40.945352+00:00'
+created: '2024-12-17T22:47:04.045753+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -67,6 +68,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "c63e8727af1a8fe75872b6a762797113"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_sentryui_firefox.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_sentryui_firefox.pysnap
index cbb82acbdd6c26..5fba0d16554f1b 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_sentryui_firefox.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_sentryui_firefox.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:42.402505Z'
+created: '2024-12-17T22:47:04.126121+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "4a3cf3893b6485428dd02da116c8370e"
+  contributing component: exception
   component:
     app*
       exception*
@@ -178,6 +179,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "d5456487ea8dccfe96c1968b19870978"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_sentryui_safari.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_sentryui_safari.pysnap
index ffc7bc37fd2a74..055e247eff692d 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_sentryui_safari.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_xbrowser_sentryui_safari.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:42.450770Z'
+created: '2024-12-17T22:47:04.199664+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "4a3cf3893b6485428dd02da116c8370e"
+  contributing component: exception
   component:
     app*
       exception*
@@ -147,6 +148,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "0b81da6ea3d7cc82b1d4825b7aac0b8d"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/laravel.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/laravel.pysnap
index 689ad747b6f37e..58c49fb3ccb286 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/laravel.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/laravel.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:42.520856Z'
+created: '2024-12-17T22:47:04.310113+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "4665d486184740231357ab63f4543a8d"
+  contributing component: exception
   component:
     app*
       exception*
@@ -364,6 +365,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "107ed03036d901157372f260bc3df446"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/laravel_anonymous.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/laravel_anonymous.pysnap
index 33d2e9c267d6d6..2a13dc98d18cd3 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/laravel_anonymous.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/laravel_anonymous.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:42.536997Z'
+created: '2024-12-17T22:47:04.245072+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "a728cdf5d62c8e017c35c3fe04051b6e"
+  contributing component: exception
   component:
     app*
       exception*
@@ -35,6 +36,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "63c67781779781d9b0a442a5b2bdb976"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/logentry_prefers_message.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/logentry_prefers_message.pysnap
index b7446294a05427..3f88d5f707105e 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/logentry_prefers_message.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/logentry_prefers_message.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:42.547671Z'
+created: '2024-12-17T22:47:04.572499+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "8ec8bbc71eb6e2af7fbe5076a8534f96"
+  contributing component: message
   component:
     default*
       message*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/logentry_uses_formatted.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/logentry_uses_formatted.pysnap
index 0461040c0a5bd5..660ac9d1aa4610 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/logentry_uses_formatted.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/logentry_uses_formatted.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:42.561617Z'
+created: '2024-12-17T22:47:04.749387+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "329b29efcf1f77067a063e34f56e7791"
+  contributing component: message
   component:
     default*
       message*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/macos_amd_driver.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/macos_amd_driver.pysnap
index b3b603c3bda58b..27ce0b8cc98d8f 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/macos_amd_driver.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/macos_amd_driver.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:42.020382+00:00'
+created: '2024-12-17T22:47:04.837015+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -159,6 +160,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "6188cd480f18f1ce368de0500be00733"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/macos_intel_driver.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/macos_intel_driver.pysnap
index ab66b687a58485..349bae8a57644c 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/macos_intel_driver.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/macos_intel_driver.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:42.106338+00:00'
+created: '2024-12-17T22:47:04.928345+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -187,6 +188,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "ab793fe47359148c7fc95f684bc5308d"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/malloc_sentinel.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/malloc_sentinel.pysnap
index af8385a03fabe7..f86bac11340ca0 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/malloc_sentinel.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/malloc_sentinel.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:42.200958+00:00'
+created: '2024-12-17T22:47:04.997471+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -100,6 +101,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "2f4ae73b88dbbc7e1cee4f86e270c4b4"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/message_prefers_message.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/message_prefers_message.pysnap
index acb989532fb20e..0805744062f36b 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/message_prefers_message.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/message_prefers_message.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:42.577694Z'
+created: '2024-12-17T22:47:05.064853+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "8ec8bbc71eb6e2af7fbe5076a8534f96"
+  contributing component: message
   component:
     default*
       message*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/message_uses_formatted.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/message_uses_formatted.pysnap
index 4ee850edcf42aa..ceeefb5f25ca3c 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/message_uses_formatted.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/message_uses_formatted.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:42.588028Z'
+created: '2024-12-17T22:47:05.124733+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "d3f5e52d24e9c1eae5abe6c866cced63"
+  contributing component: message
   component:
     default*
       message*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/message_with_key_pair_values.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/message_with_key_pair_values.pysnap
index 1d9dd383d35b2a..87dbe6851a3b77 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/message_with_key_pair_values.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/message_with_key_pair_values.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-07-24T22:46:55.422933Z'
+created: '2024-12-17T22:47:05.180894+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "d2ab1028e9cb44352a824e878951f412"
+  contributing component: message
   component:
     default*
       message* (stripped event-specific values)
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/minified_javascript.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/minified_javascript.pysnap
index 5e9467cc52cfde..5f24353ede92e2 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/minified_javascript.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/minified_javascript.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:42.557219+00:00'
+created: '2024-12-17T22:47:05.257258+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -212,6 +213,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "dcfcd48a02c100bbe4023cbc783054f0"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_complex_function_names.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_complex_function_names.pysnap
index c428bdf7eedcad..fd9e20dd5823f8 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_complex_function_names.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_complex_function_names.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:42.682302+00:00'
+created: '2024-12-17T22:47:05.381543+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -25,6 +26,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "61d21e6d53c0837718af047c20e5e7ea"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_driver_crash1.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_driver_crash1.pysnap
index ad5f40da1eb741..d06ee8f5df02bc 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_driver_crash1.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_driver_crash1.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:42.780582+00:00'
+created: '2024-12-17T22:47:05.428507+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -35,6 +36,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "a6befffdc310c28b165bbceb1c0f59a8"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_driver_crash2.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_driver_crash2.pysnap
index de5a74d98aa8b5..27e5283399abd9 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_driver_crash2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_driver_crash2.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:42.921094+00:00'
+created: '2024-12-17T22:47:05.489246+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -30,6 +31,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "6fcc3bb4fac6aa6e81bb6d0faf40b0dd"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_driver_crash3.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_driver_crash3.pysnap
index fd55c78b0ae8a2..4fa520e76f6c46 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_driver_crash3.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_driver_crash3.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:43.016429+00:00'
+created: '2024-12-17T22:47:05.572512+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -36,6 +37,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "d69ad378fab4de58c7236a72ce3101ee"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_limit_frames.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_limit_frames.pysnap
index b90042a1742128..ba7a302411b709 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_limit_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_limit_frames.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:43.094090+00:00'
+created: '2024-12-17T22:47:05.737416+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -25,6 +26,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "9bb5de55b854491dacc677184c9b019a"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_malloc_chain.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_malloc_chain.pysnap
index 9b5f0c5c7dc400..fce2fc87ff7d06 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_malloc_chain.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_malloc_chain.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:43.171111+00:00'
+created: '2024-12-17T22:47:05.799116+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -34,6 +35,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "69d066e455243e7c5762b7522b430ca9"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_no_filenames.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_no_filenames.pysnap
index 9fd4210d7f67d9..e1c5bd78dd37e2 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_no_filenames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_no_filenames.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-11-12T10:57:07.581917Z'
+created: '2024-12-17T22:47:05.886419+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "418120a66f7031923031f5c52aca0724"
+  contributing component: exception
   component:
     app*
       exception*
@@ -58,6 +59,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "00719910980352c06ba93641057012e0"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_unlimited_frames.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_unlimited_frames.pysnap
index 8487ad12cd702a..123bdaa4fb651c 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_unlimited_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_unlimited_frames.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:43.289627+00:00'
+created: '2024-12-17T22:47:05.935247+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -25,6 +26,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "61d21e6d53c0837718af047c20e5e7ea"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_windows_anon_namespace.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_windows_anon_namespace.pysnap
index d6598db05f9939..dcdfde88b992ca 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_windows_anon_namespace.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_windows_anon_namespace.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:43.351198+00:00'
+created: '2024-12-17T22:47:06.010257+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -41,6 +42,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "15d397771f229af8dc42783542f81dd4"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_with_function_name.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_with_function_name.pysnap
index 1a80c9eb50d49f..2e6af48dd192b8 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_with_function_name.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/native_with_function_name.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:43.406041+00:00'
+created: '2024-12-17T22:47:06.056940+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -37,6 +38,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "c29439027eafcf7642f641554ab0f0ef"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/node_exception_weird.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/node_exception_weird.pysnap
index df1b3764eae8cd..6be0b23f35ba2b 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/node_exception_weird.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/node_exception_weird.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:42.992896Z'
+created: '2024-12-17T22:47:06.138399+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "a20509269752c9a1bea6078851e4d39c"
+  contributing component: exception
   component:
     app*
       exception*
@@ -102,6 +103,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "252dc79eb5653bf822e2684d90734cb8"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/node_low_level_async.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/node_low_level_async.pysnap
index 55cdbefb645c8f..4035d22648ac4d 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/node_low_level_async.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/node_low_level_async.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:43.526313+00:00'
+created: '2024-12-17T22:47:06.197412+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -28,6 +29,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "b3d321fab1665166fb7cacfa975db4bb"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/python_exception_base.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/python_exception_base.pysnap
index c8dda14a5c4328..e1b7a171b0f411 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/python_exception_base.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/python_exception_base.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:43.579421+00:00'
+created: '2024-12-17T22:47:06.257047+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "c52ebcc2d9d0780a23c7d99831678830"
+  contributing component: chained-exception
   component:
     app*
       chained-exception*
@@ -29,6 +30,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "669cb6664e0f5fed38665da04e464f7e"
+  contributing component: chained-exception
   component:
     system*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/python_grouping_enhancer_away_from_crash.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/python_grouping_enhancer_away_from_crash.pysnap
index 70b37eba1f9948..2700742bce31cf 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/python_grouping_enhancer_away_from_crash.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/python_grouping_enhancer_away_from_crash.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-11-12T10:57:08.390423Z'
+created: '2024-12-17T22:47:06.347740+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "121caa876de75ec51bf72ed4c852cd75"
+  contributing component: exception
   component:
     app*
       exception*
@@ -106,6 +107,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "a5af2577d4caca8f983657c5d1919e14"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/python_grouping_enhancer_towards_crash.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/python_grouping_enhancer_towards_crash.pysnap
index 9b976313b5345b..628fc3bf38a5be 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/python_grouping_enhancer_towards_crash.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/python_grouping_enhancer_towards_crash.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:43.683886+00:00'
+created: '2024-12-17T22:47:06.399808+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -106,6 +107,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "90888e813b09fa25061af2883c0fb9bd"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/python_http_error.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/python_http_error.pysnap
index 62104878860e39..ac550b829db706 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/python_http_error.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/python_http_error.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-08-25T09:17:16.122350Z'
+created: '2024-12-17T22:47:06.467074+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "d59239f5aad3304d60beb1fde3369b78"
+  contributing component: exception
   component:
     app*
       exception*
@@ -43,6 +44,7 @@ app:
 --------------------------------------------------------------------------
 default:
   hash: null
+  contributing component: null
   component:
     default (exception of app/system takes precedence)
       message (exception of app/system takes precedence)
@@ -50,6 +52,7 @@ default:
 --------------------------------------------------------------------------
 system:
   hash: "133db3f366b1327dab4e661f66dfb961"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/react_native.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/react_native.pysnap
index fba241bf98713a..cbc8ef4c5b3e32 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/react_native.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/react_native.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:43.138153Z'
+created: '2024-12-17T22:47:06.617414+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "73470e545e51eea9cff8a6c006f68f57"
+  contributing component: exception
   component:
     app*
       exception*
@@ -208,6 +209,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "ecd413627f0d90a5a25cb28d1ba9c39f"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_cocoa.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_cocoa.pysnap
index 7ceb2666380fa2..55d04b29a3d5b6 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_cocoa.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_cocoa.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:43.168648Z'
+created: '2024-12-17T22:47:06.690204+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "eb416f98479efa56a77c524602dc9979"
+  contributing component: stacktrace
   component:
     app*
       stacktrace*
@@ -17,6 +18,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "1df786c8c266506e1acb6669c8df5154"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_collapse_recursion.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_collapse_recursion.pysnap
index d2529ed7610bd4..0475eba68ef0e4 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_collapse_recursion.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_collapse_recursion.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:43.877887+00:00'
+created: '2024-12-17T22:47:06.770506+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -60,6 +61,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "9bdadae4fa003cef6cf460ff1325e54b"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_compute_hashes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_compute_hashes.pysnap
index 066c72c89f97e9..53e0d1a46ef981 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_compute_hashes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_compute_hashes.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:43.209884Z'
+created: '2024-12-17T22:47:06.833850+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "1effb24729ae4c43efa36b460511136a"
+  contributing component: stacktrace
   component:
     app*
       stacktrace*
@@ -17,6 +18,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "659ad79e2e70c822d30a53d7d889529e"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_discards_seemingly_useless_stack.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_discards_seemingly_useless_stack.pysnap
index 1886f248902fbd..9956d1ded6d11d 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_discards_seemingly_useless_stack.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_discards_seemingly_useless_stack.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:43.956102+00:00'
+created: '2024-12-17T22:47:06.901126+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app
       stacktrace (ignored because it contains no in-app frames)
@@ -17,6 +18,7 @@ fallback:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: null
   component:
     system
       stacktrace (ignored because it contains no contributing frames)
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_does_not_discard_non_urls.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_does_not_discard_non_urls.pysnap
index b66b9b0534001f..b213c305fdad8d 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_does_not_discard_non_urls.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_does_not_discard_non_urls.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:43.994426+00:00'
+created: '2024-12-17T22:47:06.971970+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -14,6 +15,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "acbd18db4cc2f85cedef654fccc4a4d8"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_does_not_group_different_js_errors.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_does_not_group_different_js_errors.pysnap
index b43faba45337dc..181271b39161af 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_does_not_group_different_js_errors.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_does_not_group_different_js_errors.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:44.041763+00:00'
+created: '2024-12-17T22:47:07.043304+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app
       stacktrace (ignored because it contains no in-app frames)
@@ -17,6 +18,7 @@ fallback:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: null
   component:
     system
       stacktrace (ignored because it contains no contributing frames)
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_enforce_min_frames.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_enforce_min_frames.pysnap
index 85f699d7b51b53..6dd4b6cc71a720 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_enforce_min_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_enforce_min_frames.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-11-16T12:41:22.432252Z'
+created: '2024-12-17T22:47:07.119009+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -37,6 +38,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "e0b4eea234ff891472cb927c00153bbe"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_excludes_single_frame_urls.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_excludes_single_frame_urls.pysnap
index 3cc208fa7512f7..ee0638b36f12c4 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_excludes_single_frame_urls.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_excludes_single_frame_urls.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:44.134461+00:00'
+created: '2024-12-17T22:47:07.182375+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "cd2a9fd0cdaa8cd55ed22b101fc65882"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_hash_without_system_frames.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_hash_without_system_frames.pysnap
index 9263ca9e7c6475..ceb7e86927d413 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_hash_without_system_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_hash_without_system_frames.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:43.388071Z'
+created: '2024-12-17T22:47:07.268383+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "1effb24729ae4c43efa36b460511136a"
+  contributing component: stacktrace
   component:
     app*
       stacktrace*
@@ -17,6 +18,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "659ad79e2e70c822d30a53d7d889529e"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_ignores_singular_anonymous_frame.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_ignores_singular_anonymous_frame.pysnap
index 331948fe607c5b..5b9b6f6ae469b7 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_ignores_singular_anonymous_frame.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_ignores_singular_anonymous_frame.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:44.219355+00:00'
+created: '2024-12-17T22:47:07.331078+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -24,6 +25,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "c5da56c71b31f34c5880d734cbc8f5bb"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_negated_match.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_negated_match.pysnap
index 2c13c45218ab84..6a44ff98ce7995 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_negated_match.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_negated_match.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:44.263377+00:00'
+created: '2024-12-17T22:47:07.390046+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -37,6 +38,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "eb87c1031dba55b67df86fb9fff59dc6"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_rust.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_rust.pysnap
index f2871123e9fb07..93919c2b65976d 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_rust.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_rust.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-11-12T10:57:07.397736Z'
+created: '2024-12-17T22:47:07.602400+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "eb87c1031dba55b67df86fb9fff59dc6"
+  contributing component: exception
   component:
     app*
       exception*
@@ -37,6 +38,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "e0b4eea234ff891472cb927c00153bbe"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_rust2.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_rust2.pysnap
index e58851008f4a59..3d7dfab44447fa 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_rust2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_rust2.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-11-12T10:57:08.138564Z'
+created: '2024-12-17T22:47:07.649470+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "eb87c1031dba55b67df86fb9fff59dc6"
+  contributing component: exception
   component:
     app*
       exception*
@@ -37,6 +38,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "9b33b65a645c66239cafcd276fcd0659"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_with_minimal_app_frames.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_with_minimal_app_frames.pysnap
index ee50be430d030c..f5f8ca555394c3 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_with_minimal_app_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/stacktrace_with_minimal_app_frames.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-02-26T19:54:43.585864Z'
+created: '2024-12-17T22:47:07.687934+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "1effb24729ae4c43efa36b460511136a"
+  contributing component: stacktrace
   component:
     app*
       stacktrace*
@@ -47,6 +48,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "659ad79e2e70c822d30a53d7d889529e"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
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 2826ccbe8e025d..db5d9c9f7c65ba 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,10 +1,11 @@
 ---
-created: '2024-12-03T22:09:00.998242+00:00'
+created: '2024-12-17T22:47:07.768868+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "1f5bdebe3c9f414c7dbb4296a8353245"
+  contributing component: template
   component:
     default*
       template*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/threads_compute_hashes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/threads_compute_hashes.pysnap
index 5a15b9ada422b5..1c4cf59de452d3 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/threads_compute_hashes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/threads_compute_hashes.pysnap
@@ -1,13 +1,14 @@
 ---
-created: '2021-02-15T10:11:56.222183Z'
+created: '2024-12-17T22:47:07.816269+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
-  hash: null
+  hash: "1a11687556cf74559f0ae90b1c87e2fd"
+  contributing component: threads
   component:
-    app (threads of system take precedence)
-      threads (ignored because hash matches system variant)
+    app*
+      threads*
         stacktrace*
           frame*
             filename*
@@ -16,10 +17,11 @@ app:
               "main"
 --------------------------------------------------------------------------
 system:
-  hash: "1a11687556cf74559f0ae90b1c87e2fd"
+  hash: null
+  contributing component: null
   component:
-    system*
-      threads*
+    system (threads of app take precedence)
+      threads (ignored because hash matches app variant)
         stacktrace*
           frame*
             filename*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/threads_no_hash.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/threads_no_hash.pysnap
index a9868c108a8923..6dd5604f6eb1bc 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/threads_no_hash.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/threads_no_hash.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2021-04-22T14:32:52.011141Z'
+created: '2024-12-17T22:47:07.877300+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app
       threads (ignored because does not contain exactly one crashing, one current or just one thread, instead contains 2 threads)
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/unity.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/unity.pysnap
index 1e2783975f3556..590f3918025ee5 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/unity.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/unity.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2020-11-08T21:03:14.672603Z'
+created: '2024-12-17T22:47:07.931891+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "a12d579fed7636c2a5d2fae110c95ce5"
+  contributing component: exception
   component:
     app*
       exception*
@@ -56,6 +57,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "c0dbeebf0430b3310ad1f7ceb48553a6"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/actix.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/actix.pysnap
index b5e22e10b176f9..67db10603ee9f0 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/actix.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/actix.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-02-01T08:22:00.619240Z'
+created: '2024-12-17T22:47:08.048826+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "738e7d2503464bc264b4f791286f5122"
+  contributing component: exception
   component:
     app*
       exception*
@@ -397,6 +398,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "19a96e0438d28e48355653def82f887a"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/android_anr.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/android_anr.pysnap
index 8d493137d1fa2b..4615ed73cf03d4 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/android_anr.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/android_anr.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:16:43.547735+00:00'
+created: '2024-12-17T22:47:08.154516+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -788,6 +789,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "2552498cfe69a6ddf1dcdde5440ce9c3"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/aspnetcore.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/aspnetcore.pysnap
index 68668ac11748ff..6a69cbc44c0d71 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/aspnetcore.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/aspnetcore.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-01-11T11:41:26.553426Z'
+created: '2024-12-17T22:47:08.236519+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "228c649a3aa0901622c0a0e66ab0522c"
+  contributing component: exception
   component:
     app*
       exception*
@@ -173,6 +174,7 @@ app:
 --------------------------------------------------------------------------
 default:
   hash: null
+  contributing component: null
   component:
     default (exception of app/system takes precedence)
       message (exception of app/system takes precedence)
@@ -180,6 +182,7 @@ default:
 --------------------------------------------------------------------------
 system:
   hash: "4ccd0f1953483581ba360c7518f90332"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/block_invoke.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/block_invoke.pysnap
index eebadfbbc29cd6..c03e8c2350bccf 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/block_invoke.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/block_invoke.pysnap
@@ -1,13 +1,14 @@
 ---
-created: '2024-03-22T11:57:57.243126+00:00'
+created: '2024-12-17T22:47:08.303785+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
-  hash: null
+  hash: "ff6c4ee7c54f118a9647ee86f0c2b0b0"
+  contributing component: threads
   component:
-    app (threads of system take precedence)
-      threads (ignored because hash matches system variant)
+    app*
+      threads*
         stacktrace*
           frame* (marked in-app by stack trace rule (family:native package:**/Containers/Bundle/Application/** +app))
             function*
@@ -21,16 +22,18 @@ app:
 --------------------------------------------------------------------------
 default:
   hash: null
+  contributing component: null
   component:
-    default (threads of system take precedence)
-      message (threads of system take precedence)
+    default (threads of app take precedence)
+      message (threads of app take precedence)
         "Foo"
 --------------------------------------------------------------------------
 system:
-  hash: "ff6c4ee7c54f118a9647ee86f0c2b0b0"
+  hash: null
+  contributing component: null
   component:
-    system*
-      threads*
+    system (threads of app take precedence)
+      threads (ignored because hash matches app variant)
         stacktrace*
           frame* (marked in-app by stack trace rule (family:native package:**/Containers/Bundle/Application/** +app))
             function*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/bugly.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/bugly.pysnap
index aaeaa6821a8996..b92da48495a3ba 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/bugly.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/bugly.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:16:52.018184+00:00'
+created: '2024-12-17T22:47:08.420112+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -30,6 +31,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "d9c9b0f9ba46e32fddd7cd1512fad235"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/built_in_fingerprint_chunkload_error.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/built_in_fingerprint_chunkload_error.pysnap
index 317270a6c1e83b..55897ef41fcd88 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/built_in_fingerprint_chunkload_error.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/built_in_fingerprint_chunkload_error.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-11-08T18:05:13.933819+00:00'
+created: '2024-12-17T22:47:08.806109+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (custom fingerprint takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -28,6 +29,7 @@ built_in_fingerprint:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: exception
   component:
     system (custom fingerprint takes precedence)
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/built_in_fingerprint_chunkload_error_hybrid_fingerprint.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/built_in_fingerprint_chunkload_error_hybrid_fingerprint.pysnap
index 622f190c5678e7..c6420151c61889 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/built_in_fingerprint_chunkload_error_hybrid_fingerprint.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/built_in_fingerprint_chunkload_error_hybrid_fingerprint.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-11-08T18:05:13.851960+00:00'
+created: '2024-12-17T22:47:08.651461+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (custom fingerprint takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -28,6 +29,7 @@ built_in_fingerprint:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: exception
   component:
     system (custom fingerprint takes precedence)
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/callee_guaranteed.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/callee_guaranteed.pysnap
index c3d3f0bafeba85..1dc6bd7f1baa3a 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/callee_guaranteed.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/callee_guaranteed.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-12-13T13:53:31.871275Z'
+created: '2024-12-17T22:47:09.043918+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "4ef1fb44d656c3be2a146971f2a222dc"
+  contributing component: exception
   component:
     app*
       exception*
@@ -128,6 +129,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "47481871aa8d5ab5729cf2db78ce3032"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/checksum_no_regex_match.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/checksum_no_regex_match.pysnap
index eb9308d5336d55..6ac5c54886867d 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/checksum_no_regex_match.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/checksum_no_regex_match.pysnap
@@ -1,12 +1,8 @@
 ---
-created: '2024-11-08T18:05:14.314410+00:00'
+created: '2024-12-16T06:50:58.618483+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
-checksum:
-  hash: "not a legit checksum"
-  checksum: "not a legit checksum"
---------------------------------------------------------------------------
 hashed_checksum:
   hash: "de46d023e69b171b90ccf3ebca7aede4"
   checksum: "de46d023e69b171b90ccf3ebca7aede4"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/checksum_no_regex_match_long.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/checksum_no_regex_match_long.pysnap
deleted file mode 100644
index 2414d831471199..00000000000000
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/checksum_no_regex_match_long.pysnap
+++ /dev/null
@@ -1,9 +0,0 @@
----
-created: '2024-11-08T18:05:14.214708+00:00'
-creator: sentry
-source: tests/sentry/grouping/test_variants.py
----
-hashed_checksum:
-  hash: "2c2e85a6e73109222f131228ed06a7af"
-  checksum: "2c2e85a6e73109222f131228ed06a7af"
-  raw_checksum: "not a legit checksum and also too long a string"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/cocoa_dispatch_client_callout.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/cocoa_dispatch_client_callout.pysnap
index b294d7c502ac6a..73bf53e4c16ea9 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/cocoa_dispatch_client_callout.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/cocoa_dispatch_client_callout.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-03-22T11:58:02.240343+00:00'
+created: '2024-12-17T22:47:09.242928+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "7c8a196d16b94be382add324be2605ee"
+  contributing component: threads
   component:
     app*
       threads*
@@ -57,6 +58,7 @@ app:
 --------------------------------------------------------------------------
 default:
   hash: null
+  contributing component: null
   component:
     default (threads of app/system take precedence)
       message (threads of app/system take precedence)
@@ -64,6 +66,7 @@ default:
 --------------------------------------------------------------------------
 system:
   hash: "cd7f51d716fd57adc1a5ce1c112e538f"
+  contributing component: threads
   component:
     system*
       threads*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/connection_error.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/connection_error.pysnap
index b90ab1b7aeae26..0e7346a7890afb 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/connection_error.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/connection_error.pysnap
@@ -1,8 +1,11 @@
 ---
+created: '2024-12-17T22:47:09.303069+00:00'
+creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "6b059b9febc815ac18ac4d2082e38a9b"
+  contributing component: exception
   component:
     app*
       exception*
@@ -113,6 +116,7 @@ app:
 --------------------------------------------------------------------------
 default:
   hash: null
+  contributing component: null
   component:
     default (exception of app/system takes precedence)
       message (exception of app/system takes precedence)
@@ -120,6 +124,7 @@ default:
 --------------------------------------------------------------------------
 system:
   hash: "013d3477a774fe20c468dc8accd516f1"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/csp.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/csp.pysnap
index cc3dfe7003aa73..cd712f487e473d 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/csp.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/csp.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-01-11T11:41:27.791544Z'
+created: '2024-12-17T22:47:09.976338+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "666766514295bb52812324097cdaf53e"
+  contributing component: csp
   component:
     default*
       csp*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/csp_img_src.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/csp_img_src.pysnap
index 542c3861aeac77..20afac9af8d5d3 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/csp_img_src.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/csp_img_src.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-01-11T11:41:27.821272Z'
+created: '2024-12-17T22:47:09.407680+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "1742101e08eb1608f569751dfedd0062"
+  contributing component: csp
   component:
     default*
       csp*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/csp_no_blocked_uri.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/csp_no_blocked_uri.pysnap
index fab28c8b9f27bc..d297064b396411 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/csp_no_blocked_uri.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/csp_no_blocked_uri.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-01-11T11:41:27.883979Z'
+created: '2024-12-17T22:47:09.585767+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "efddf1cde918097259aa7d4904fb1942"
+  contributing component: csp
   component:
     default*
       csp*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/csp_script_data_uri.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/csp_script_data_uri.pysnap
index 5bbb760d942829..74f40338f57043 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/csp_script_data_uri.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/csp_script_data_uri.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-01-11T11:41:26.746122Z'
+created: '2024-12-17T22:47:09.675166+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "4e6f2bce9d121aa89f4dc5e5da08afb5"
+  contributing component: csp
   component:
     default*
       csp*
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
index 17a804916a98c3..5d23af7da486ff 100644
--- 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
@@ -1,10 +1,11 @@
 ---
-created: '2024-12-02T21:59:16.027178+00:00'
+created: '2024-12-17T22:47:09.745696+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "56c6520f35bce2f89ed2c4e725ccef65"
+  contributing component: csp
   component:
     default*
       csp*
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
index 28ff3ee3e43b84..2b3afc1ab0a642 100644
--- 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
@@ -1,10 +1,11 @@
 ---
-created: '2024-12-02T21:59:16.088248+00:00'
+created: '2024-12-17T22:47:09.815198+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "d346ee37d19a2be6587e609075ca2d57"
+  contributing component: csp
   component:
     default*
       csp*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/csp_script_src_uri.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/csp_script_src_uri.pysnap
index 0bfcb94707feb0..c21a10ce18cf78 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/csp_script_src_uri.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/csp_script_src_uri.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-01-11T11:41:30.150561Z'
+created: '2024-12-17T22:47:09.871501+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "223cdacfe5b4b830dc700b5c18cc21b4"
+  contributing component: csp
   component:
     default*
       csp*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/csp_style_src_elem.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/csp_style_src_elem.pysnap
index 1f20c5121e302a..f0ad08f11b2705 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/csp_style_src_elem.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/csp_style_src_elem.pysnap
@@ -1,8 +1,11 @@
 ---
+created: '2024-12-17T22:47:09.926990+00:00'
+creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "537a973f594c364842893e9a72af62a5"
+  contributing component: csp
   component:
     default*
       csp*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/custom_fingerprint_client.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/custom_fingerprint_client.pysnap
index 0afd922a29f0f4..54a3b6c1377946 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/custom_fingerprint_client.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/custom_fingerprint_client.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-11-08T18:05:15.262593+00:00'
+created: '2024-12-17T22:47:10.091140+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: exception
   component:
     app (custom fingerprint takes precedence)
       exception*
@@ -174,6 +175,7 @@ custom_fingerprint:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: exception
   component:
     system (custom fingerprint takes precedence)
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/custom_fingerprint_client_and_server_rule.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/custom_fingerprint_client_and_server_rule.pysnap
index e3d5602f00e9b0..2b8d466bdc8846 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/custom_fingerprint_client_and_server_rule.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/custom_fingerprint_client_and_server_rule.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-11-08T18:05:15.190694+00:00'
+created: '2024-12-17T22:47:10.032977+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: exception
   component:
     app (custom fingerprint takes precedence)
       exception*
@@ -174,6 +175,7 @@ custom_fingerprint:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: exception
   component:
     system (custom fingerprint takes precedence)
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/custom_fingerprint_server_rule.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/custom_fingerprint_server_rule.pysnap
index 32e3edf70a7044..ee5cb15de27dc9 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/custom_fingerprint_server_rule.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/custom_fingerprint_server_rule.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-11-08T18:05:15.337844+00:00'
+created: '2024-12-17T22:47:10.149842+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: exception
   component:
     app (custom fingerprint takes precedence)
       exception*
@@ -174,6 +175,7 @@ custom_fingerprint:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: exception
   component:
     system (custom fingerprint takes precedence)
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_cocoa_nserror.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_cocoa_nserror.pysnap
index 5a266434a245f0..c648b6b356b207 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_cocoa_nserror.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_cocoa_nserror.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-15T23:06:55.018299+00:00'
+created: '2024-12-17T22:47:10.249449+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "029f3b967068b1539f96957b7c0451d7"
+  contributing component: exception
   component:
     app*
       exception*
@@ -89,6 +90,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: null
   component:
     system (exception of app takes precedence)
       threads (exception of app takes precedence)
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 53dc267a7b9cd6..f44b08f518b030 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,10 +1,11 @@
 ---
-created: '2024-12-03T22:09:01.225889+00:00'
+created: '2024-12-17T22:47:10.395244+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "b23ee1963904c2ca87b145febf94b66c"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_compute_hashes_2.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_compute_hashes_2.pysnap
index 91209fecf64f95..a6e76b4f4fd54d 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_compute_hashes_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_compute_hashes_2.pysnap
@@ -1,13 +1,14 @@
 ---
-created: '2023-01-11T11:41:28.150918Z'
+created: '2024-12-17T22:47:10.296356+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
-  hash: null
+  hash: "9509e122c6175606d52862fa4f64853c"
+  contributing component: exception
   component:
-    app (exception of system takes precedence)
-      exception (ignored because hash matches system variant)
+    app*
+      exception*
         stacktrace*
           frame*
             filename*
@@ -18,10 +19,11 @@ app:
           "hello world"
 --------------------------------------------------------------------------
 system:
-  hash: "9509e122c6175606d52862fa4f64853c"
+  hash: null
+  contributing component: null
   component:
-    system*
-      exception*
+    system (exception of app takes precedence)
+      exception (ignored because hash matches app variant)
         stacktrace*
           frame*
             filename*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_compute_hashes_3.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_compute_hashes_3.pysnap
index 11c682ac2c4c0c..7945543aa4ab38 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_compute_hashes_3.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_compute_hashes_3.pysnap
@@ -1,13 +1,14 @@
 ---
-created: '2023-01-11T11:41:27.928557Z'
+created: '2024-12-17T22:47:10.349772+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
-  hash: null
+  hash: "669cb6664e0f5fed38665da04e464f7e"
+  contributing component: chained-exception
   component:
-    app (exception of system takes precedence)
-      chained-exception (ignored because hash matches system variant)
+    app*
+      chained-exception*
         exception*
           stacktrace*
             frame*
@@ -28,10 +29,11 @@ app:
             "hello world"
 --------------------------------------------------------------------------
 system:
-  hash: "669cb6664e0f5fed38665da04e464f7e"
+  hash: null
+  contributing component: null
   component:
-    system*
-      chained-exception*
+    system (exception of app takes precedence)
+      chained-exception (ignored because hash matches app variant)
         exception*
           stacktrace*
             frame*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_bad_duplicate_id.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_bad_duplicate_id.pysnap
index a1e071bed326ad..b70dce82a29b57 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_bad_duplicate_id.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_bad_duplicate_id.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-16T04:37:32.010859Z'
+created: '2024-12-17T22:47:10.442932+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "e2bf1e0628b7b1824a9b63dec7a079a3"
+  contributing component: chained-exception
   component:
     app*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_bad_missing_parent.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_bad_missing_parent.pysnap
index 8949aad0b5672e..e38c9d8e2c262b 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_bad_missing_parent.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_bad_missing_parent.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-16T04:37:32.352194Z'
+created: '2024-12-17T22:47:10.493459+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "a4f16891fa438620699cb2d9af5cc827"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_bad_out_of_sequence.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_bad_out_of_sequence.pysnap
index 51901de44be70d..e57cb89e7f9743 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_bad_out_of_sequence.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_bad_out_of_sequence.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-16T04:37:32.024833Z'
+created: '2024-12-17T22:47:10.546909+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "f0078a82f351095ba595daa7d493aa3c"
+  contributing component: chained-exception
   component:
     app*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_bad_parent_with_parent.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_bad_parent_with_parent.pysnap
index 8411f3c48254a9..53353fedce8ef2 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_bad_parent_with_parent.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_bad_parent_with_parent.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-16T04:37:32.016104Z'
+created: '2024-12-17T22:47:10.594413+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "0809098f9f613b63467605dd1739cc9b"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_bad_with_cycle.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_bad_with_cycle.pysnap
index 06a331de2f4b74..6cc74b3339b017 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_bad_with_cycle.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_bad_with_cycle.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-16T04:43:16.573431Z'
+created: '2024-12-17T22:47:10.640807+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "0809098f9f613b63467605dd1739cc9b"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_one_exception.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_one_exception.pysnap
index 51e017536b721a..dca435f7fa2322 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_one_exception.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_one_exception.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-04T06:18:44.884594Z'
+created: '2024-12-17T22:47:10.691743+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "a4f16891fa438620699cb2d9af5cc827"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_one_type_under_nested_groups.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_one_type_under_nested_groups.pysnap
index 8b991faee20226..dafa9260a6b9b6 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_one_type_under_nested_groups.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_one_type_under_nested_groups.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-04T05:13:36.604916Z'
+created: '2024-12-17T22:47:10.742275+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "a4f16891fa438620699cb2d9af5cc827"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_one_type_with_different_values.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_one_type_with_different_values.pysnap
index 5037f073e34b2c..92db81b71756cf 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_one_type_with_different_values.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_one_type_with_different_values.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-04T20:21:22.132827Z'
+created: '2024-12-17T22:47:10.785801+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "17022e0561e9b6e6351723a08aa81b18"
+  contributing component: chained-exception
   component:
     app*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_one_type_with_similar_values.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_one_type_with_similar_values.pysnap
index 0fbdfc31fe4b7d..e04d3c4b3adec9 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_one_type_with_similar_values.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_one_type_with_similar_values.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-04T00:40:08.958930Z'
+created: '2024-12-17T22:47:10.874065+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "a4f16891fa438620699cb2d9af5cc827"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_one_type_with_similar_values_and_children.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_one_type_with_similar_values_and_children.pysnap
index c590ae3b4f7148..ff3f257baeaa7e 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_one_type_with_similar_values_and_children.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_one_type_with_similar_values_and_children.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-04T01:23:18.164594Z'
+created: '2024-12-17T22:47:10.831367+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "f0078a82f351095ba595daa7d493aa3c"
+  contributing component: chained-exception
   component:
     app*
       chained-exception*
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
index bd7132b61655e6..f84f8ae14bf648 100644
--- 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
@@ -1,10 +1,11 @@
 ---
-created: '2024-11-19T00:26:51.630033+00:00'
+created: '2024-12-17T22:47:10.924364+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "d505dfb9059ac63c11955233323a9100"
+  contributing component: chained-exception
   component:
     app*
       chained-exception*
@@ -48,6 +49,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "4f9cc6a81f4eb34f9e917374f281b9dc"
+  contributing component: chained-exception
   component:
     system*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_two_types.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_two_types.pysnap
index 2d34e22cecb428..a65c36868855d4 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_two_types.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_two_types.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-04T05:13:35.443285Z'
+created: '2024-12-17T22:47:11.021483+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "bca604b98cb4637167eb6190a92e8933"
+  contributing component: chained-exception
   component:
     app*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_two_types_under_nested_groups.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_two_types_under_nested_groups.pysnap
index 89ca10d5fbbb86..337eb5826f6ef7 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_two_types_under_nested_groups.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_two_types_under_nested_groups.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-05-04T06:07:44.723852Z'
+created: '2024-12-17T22:47:10.970525+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "fca0fd23f09e8da4481304ef2a531100"
+  contributing component: chained-exception
   component:
     app*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_javascript_no_in_app.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_javascript_no_in_app.pysnap
index 5a0835fe575781..622d53e411869a 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_javascript_no_in_app.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_javascript_no_in_app.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:18:07.623162+00:00'
+created: '2024-12-17T22:47:11.072504+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -32,6 +33,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "26552f86ca2368e708afa1df6effc1c5"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_without_type.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_without_type.pysnap
index 22301ff020c317..245c941bd28d58 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_without_type.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_without_type.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-01-11T11:41:28.165020Z'
+created: '2024-12-17T22:47:11.122087+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "5eb63bbbe01eeed093cb22bb8f5acdc3"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_without_value.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_without_value.pysnap
index b52a40fb4d4476..c89b5bc3fb3e2b 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_without_value.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_without_value.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-01-11T11:41:29.927880Z'
+created: '2024-12-17T22:47:11.171155+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "5a2cfd89b7b171fd7b4794b08023d04f"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/expectct.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/expectct.pysnap
index 0c56bde6c7bf9f..496785b8995738 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/expectct.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/expectct.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-01-11T11:41:29.047501Z'
+created: '2024-12-17T22:47:11.227105+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "3d2933f4b5ec459ec8d569a398fd328c"
+  contributing component: expect-ct
   component:
     default*
       expect-ct*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/fallback_prefix_level_1.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/fallback_prefix_level_1.pysnap
index 4a8d3794b1ed00..e962a88fc9b385 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/fallback_prefix_level_1.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/fallback_prefix_level_1.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:18:18.413371+00:00'
+created: '2024-12-17T22:47:11.332812+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -32,6 +33,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "87497299851e09febfecf4e84e0d45ba"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_compute_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
index 55e3cb95e0e8a7..0718012262d70f 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_compute_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,10 +1,11 @@
 ---
-created: '2024-12-03T22:09:01.301429+00:00'
+created: '2024-12-17T22:47:11.393020+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "526b64456c48836a46ec1a89544fd412"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_empty_list.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_empty_list.pysnap
index f476701baa1bda..6bd23e6d1da25c 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_empty_list.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_empty_list.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:18:22.752355+00:00'
+created: '2024-12-17T22:47:11.444360+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app
       stacktrace (ignored because it contains no frames)
@@ -14,6 +15,7 @@ fallback:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: null
   component:
     system
       stacktrace (ignored because it contains no frames)
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_ENHANCED_enhancer_by_classes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_ENHANCED_enhancer_by_classes.pysnap
index f25d716528afe2..14d716d0d5a37a 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_ENHANCED_enhancer_by_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_ENHANCED_enhancer_by_classes.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:18:24.523926+00:00'
+created: '2024-12-17T22:47:11.492237+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "7d2cc7acbf90328200d960bf78a26234"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_ENHANCED_fast_class_by_classes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_ENHANCED_fast_class_by_classes.pysnap
index a8a54c0dfc303c..f9c94784edf03c 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_ENHANCED_fast_class_by_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_ENHANCED_fast_class_by_classes.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:18:26.372895+00:00'
+created: '2024-12-17T22:47:11.538650+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "465d672b2d322bf6a1b44499f6dabc1f"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_ENHANCED_spring_classes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_ENHANCED_spring_classes.pysnap
index 2c1bd0480aae1c..711ba87579c03d 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_ENHANCED_spring_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_ENHANCED_spring_classes.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:18:28.068231+00:00'
+created: '2024-12-17T22:47:11.582816+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "45c0b0a8c777e7a7040d7c39233a08a5"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_dartlang_sdk.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_dartlang_sdk.pysnap
index 0988a87652a779..feeb864775fcba 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_dartlang_sdk.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_dartlang_sdk.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:18:29.686779+00:00'
+created: '2024-12-17T22:47:11.627784+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app
       stacktrace (ignored because it contains no in-app frames)
@@ -19,6 +20,7 @@ fallback:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: null
   component:
     system
       stacktrace (ignored because it contains no contributing frames)
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_extra_ENHANCED_clojure_classes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_extra_ENHANCED_clojure_classes.pysnap
index 38154b28097780..a4add9bea4777a 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_extra_ENHANCED_clojure_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_extra_ENHANCED_clojure_classes.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:18:31.450868+00:00'
+created: '2024-12-17T22:47:11.676678+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "353e05904b48bd3ae4fa9623934a70d0"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_extra_ENHANCED_enhancer_by_classes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_extra_ENHANCED_enhancer_by_classes.pysnap
index e60d3fa0bac120..dc935e8657be18 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_extra_ENHANCED_enhancer_by_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_extra_ENHANCED_enhancer_by_classes.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:18:33.073763+00:00'
+created: '2024-12-17T22:47:11.743494+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "0094f39fc617031afb6c655419f4a9f2"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_extra_ENHANCED_spring_classes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_extra_ENHANCED_spring_classes.pysnap
index 61f588d6f2164f..3931b4013f134b 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_extra_ENHANCED_spring_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_extra_ENHANCED_spring_classes.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:18:34.744358+00:00'
+created: '2024-12-17T22:47:11.830568+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "be15ca3d511b96918e087c4f42503ca2"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_filename_from_url_origin_corner_cases.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_filename_from_url_origin_corner_cases.pysnap
index d5526f5b6ffdf2..6c2f5db59b1d3c 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_filename_from_url_origin_corner_cases.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_filename_from_url_origin_corner_cases.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:18:36.366819+00:00'
+created: '2024-12-17T22:47:11.887049+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -30,6 +31,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "e04dce7550635e05dbd7f656102cf304"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_filename_if_abs_path_is_http.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_filename_if_abs_path_is_http.pysnap
index 15167ef90eeb49..5d571dcdda9b93 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_filename_if_abs_path_is_http.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_filename_if_abs_path_is_http.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:18:38.222179+00:00'
+created: '2024-12-17T22:47:11.932427+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "098f6bcd4621d373cade4e832627b4f6"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_filename_if_blob.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_filename_if_blob.pysnap
index 054d01f760842b..a6cc96246c1e20 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_filename_if_blob.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_filename_if_blob.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:18:40.004180+00:00'
+created: '2024-12-17T22:47:12.008984+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app
       stacktrace (ignored because it contains no in-app frames)
@@ -17,6 +18,7 @@ fallback:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: null
   component:
     system
       stacktrace (ignored because it contains no contributing frames)
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_filename_if_http.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_filename_if_http.pysnap
index 170c2c0e54cee8..485080deb1a247 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_filename_if_http.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_filename_if_http.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:18:41.873921+00:00'
+created: '2024-12-17T22:47:12.058204+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -18,6 +19,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "64a0e0a34d99dce03a8c5a4c237a4b5a"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_filename_if_https.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_filename_if_https.pysnap
index f93cab2a656517..e17bd3677f34f2 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_filename_if_https.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_filename_if_https.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:18:43.664755+00:00'
+created: '2024-12-17T22:47:12.106213+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -18,6 +19,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "64a0e0a34d99dce03a8c5a4c237a4b5a"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_flutter_sdk.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_flutter_sdk.pysnap
index 9d5a4d76efdbc0..de2eff27c3ca9b 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_flutter_sdk.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_flutter_sdk.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:18:45.285371+00:00'
+created: '2024-12-17T22:47:12.149862+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -18,6 +19,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "e0e7c4713e9092dc77635d5a0d5db31d"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_hibernate_classes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_hibernate_classes.pysnap
index 74839d0e03bbcd..d7feee7a2423a8 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_hibernate_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_hibernate_classes.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:18:46.992203+00:00'
+created: '2024-12-17T22:47:12.194519+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "c32a94349d9e9b72d31a46610c6c9589"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_java8_lambda_function.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_java8_lambda_function.pysnap
index c430d591414930..8c57d3d1f2d472 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_java8_lambda_function.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_java8_lambda_function.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:18:48.716773+00:00'
+created: '2024-12-17T22:47:12.238346+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "be7f1b8b4014de623c533a8218dba5bd"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_java8_lambda_module.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_java8_lambda_module.pysnap
index 2328d1ade7a1ac..56bff6ae21e90a 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_java8_lambda_module.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_java8_lambda_module.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:18:50.500466+00:00'
+created: '2024-12-17T22:47:12.280239+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "53b9e9679a8ea25880376080b76f98ad"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_javassist.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_javassist.pysnap
index d0dc75b6bd4669..0df70762c682c7 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_javassist.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_javassist.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:18:56.048388+00:00'
+created: '2024-12-17T22:47:12.427765+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "538bdfd8d7bb2495d0d6429c3689a420"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_javassist_2.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_javassist_2.pysnap
index d6241e1f09c926..5e54cf11bc5c0d 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_javassist_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_javassist_2.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:18:52.150429+00:00'
+created: '2024-12-17T22:47:12.333885+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "538bdfd8d7bb2495d0d6429c3689a420"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_javassist_3.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_javassist_3.pysnap
index fa636b5bf86608..8fc3ce2633d060 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_javassist_3.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_javassist_3.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:18:54.012446+00:00'
+created: '2024-12-17T22:47:12.380625+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "dc3d511120ce04996b1eef3496516e5c"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_module_if_page_url.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_module_if_page_url.pysnap
index 9d9a0962216f0e..fcbc216ec81946 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_module_if_page_url.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_module_if_page_url.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:18:59.215288+00:00'
+created: '2024-12-17T22:47:12.545283+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app
       stacktrace (ignored because it contains no in-app frames)
@@ -19,6 +20,7 @@ fallback:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: null
   component:
     system
       stacktrace (ignored because it contains no contributing frames)
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_module_if_page_url_2.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_module_if_page_url_2.pysnap
index 141dc0776953df..abcf8283f8d614 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_module_if_page_url_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_module_if_page_url_2.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:18:57.587351+00:00'
+created: '2024-12-17T22:47:12.490795+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -18,6 +19,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "0cc175b9c0f1b6a831c399e269772661"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_safari_native_code.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_safari_native_code.pysnap
index 0b6052a1f9cd78..e2497c561c1053 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_safari_native_code.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_safari_native_code.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:19:00.992971+00:00'
+created: '2024-12-17T22:47:12.604576+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "30eb5001914d29dd8461898b5b8094fe"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_sentry_dart_packages.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_sentry_dart_packages.pysnap
index 2e96d4ae385043..3828bab27b48ae 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_sentry_dart_packages.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_sentry_dart_packages.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:19:02.687514+00:00'
+created: '2024-12-17T22:47:12.658226+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app
       stacktrace (ignored because it contains no in-app frames)
@@ -49,6 +50,7 @@ fallback:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: null
   component:
     system
       stacktrace (ignored because it contains no contributing frames)
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_sentry_dart_sdk.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_sentry_dart_sdk.pysnap
index 4877bc6eae03ae..8674f9a73453f9 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_sentry_dart_sdk.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_sentry_dart_sdk.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:19:04.313945+00:00'
+created: '2024-12-17T22:47:12.711238+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app
       stacktrace (ignored because it contains no in-app frames)
@@ -19,6 +20,7 @@ fallback:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: null
   component:
     system
       stacktrace (ignored because it contains no contributing frames)
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_sentry_flutter_sdk.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_sentry_flutter_sdk.pysnap
index 452e55b5ff28a4..c64af1f870ddb5 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_sentry_flutter_sdk.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_sentry_flutter_sdk.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:19:06.131971+00:00'
+created: '2024-12-17T22:47:12.761915+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app
       stacktrace (ignored because it contains no in-app frames)
@@ -19,6 +20,7 @@ fallback:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: null
   component:
     system
       stacktrace (ignored because it contains no contributing frames)
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_sun_java_generated_constructors.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_sun_java_generated_constructors.pysnap
index 29220004fc19ac..5dd2e601b8adb1 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_sun_java_generated_constructors.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_sun_java_generated_constructors.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:19:09.259608+00:00'
+created: '2024-12-17T22:47:12.864856+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "07d1a8e5728b3c4c7aa8b8273fd0e753"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_sun_java_generated_constructors_2.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_sun_java_generated_constructors_2.pysnap
index bde5078a8525c0..cab10bf3f1766d 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_sun_java_generated_constructors_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_sun_java_generated_constructors_2.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:19:07.714331+00:00'
+created: '2024-12-17T22:47:12.811786+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "09e0efcab18f545166318118ed4e0292"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_sun_java_generated_methods.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_sun_java_generated_methods.pysnap
index 3dd104c4471bfc..889b467ae64d57 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_sun_java_generated_methods.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_ignores_sun_java_generated_methods.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:19:11.212073+00:00'
+created: '2024-12-17T22:47:12.920891+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -21,6 +22,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "9bc326575875422d0d4ced3c35d9f916"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_sanitizes_block_functions.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_sanitizes_block_functions.pysnap
index 065cd28ce48b01..936f9e678f66d1 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_sanitizes_block_functions.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_sanitizes_block_functions.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:19:12.938605+00:00'
+created: '2024-12-17T22:47:12.976442+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "27eed4125fc13d42163ddb0b8f357b48"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_sanitizes_erb_templates.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_sanitizes_erb_templates.pysnap
index 98eae769486274..a24958315f2031 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_sanitizes_erb_templates.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_sanitizes_erb_templates.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:19:14.568116+00:00'
+created: '2024-12-17T22:47:13.018734+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "4067a71d7098866f87c746a57a77b2bb"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_sanitizes_versioned_filenames.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_sanitizes_versioned_filenames.pysnap
index 792039512c3060..1d0fbfe69dd77a 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_sanitizes_versioned_filenames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_sanitizes_versioned_filenames.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:19:18.273307+00:00'
+created: '2024-12-17T22:47:13.104174+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -14,6 +15,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "2f908c015ad77a50595512fcf65d344c"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_sanitizes_versioned_filenames_2.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_sanitizes_versioned_filenames_2.pysnap
index e756d377270682..24cd051b4dfcf0 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_sanitizes_versioned_filenames_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_sanitizes_versioned_filenames_2.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:19:16.511952+00:00'
+created: '2024-12-17T22:47:13.060242+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -14,6 +15,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "2f908c015ad77a50595512fcf65d344c"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_skips_symbol_if_unknown.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_skips_symbol_if_unknown.pysnap
index 151811c94ace0a..7dee3779595f1f 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_skips_symbol_if_unknown.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_skips_symbol_if_unknown.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:19:19.961076+00:00'
+created: '2024-12-17T22:47:13.151456+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "a972f399399f5566f39b14a7afdd24ff"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_uses_context_line_over_function.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_uses_context_line_over_function.pysnap
index 880f9cd6a7d554..f9d7ed9b7d349e 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_uses_context_line_over_function.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_uses_context_line_over_function.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:19:21.893315+00:00'
+created: '2024-12-17T22:47:13.197404+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "fb73cb54ced59b1c0c60d9bb40b7336b"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_uses_function_over_lineno.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_uses_function_over_lineno.pysnap
index ceb1a2ab61c0b5..873bb6c76ef79a 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_uses_function_over_lineno.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_uses_function_over_lineno.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:19:23.554917+00:00'
+created: '2024-12-17T22:47:13.242976+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "fb73cb54ced59b1c0c60d9bb40b7336b"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_uses_module_over_filename.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_uses_module_over_filename.pysnap
index 74d7f9b6e645b6..adaac8718f8f55 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_uses_module_over_filename.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_uses_module_over_filename.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:19:25.337468+00:00'
+created: '2024-12-17T22:47:13.355422+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "acbd18db4cc2f85cedef654fccc4a4d8"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_uses_symbol_instead_of_function.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_uses_symbol_instead_of_function.pysnap
index c75bbdcb5d3f8c..f57c7c19243887 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_uses_symbol_instead_of_function.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_uses_symbol_instead_of_function.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:19:26.915840+00:00'
+created: '2024-12-17T22:47:13.396519+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "23db4a9e73800923f345d2b868993345"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_with_only_required_vars.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_with_only_required_vars.pysnap
index 7b80573acccccd..1410daf9dc85db 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_with_only_required_vars.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_with_only_required_vars.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:19:29.196459+00:00'
+created: '2024-12-17T22:47:13.439929+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -14,6 +15,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "1effb24729ae4c43efa36b460511136a"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/go_pkg_mod.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/go_pkg_mod.pysnap
index df0d11588ae5d0..cfde01404f2ea0 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/go_pkg_mod.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/go_pkg_mod.pysnap
@@ -1,8 +1,11 @@
 ---
+created: '2024-12-17T22:47:13.485235+00:00'
+creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "4b8bbc500bd2cabfcadc1f1be867e0bb"
+  contributing component: exception
   component:
     app*
       exception*
@@ -28,6 +31,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "348fc4026c9fa11ffba8fbfa80a134c9"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_125_event_126.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_125_event_126.pysnap
index 44ba8eba7282fe..454f9e982734e7 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_125_event_126.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_125_event_126.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:19:33.047230+00:00'
+created: '2024-12-17T22:47:13.544732+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -144,6 +145,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "3da34e8c72dbcd4a490ac36eb7130638"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_200_event_200.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_200_event_200.pysnap
index e8abb42497a441..92a5f233c6b567 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_200_event_200.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_200_event_200.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:19:34.856344+00:00'
+created: '2024-12-17T22:47:13.599705+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -88,6 +89,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "ca733a48a19d237df8577d09449095d9"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_275_event_275.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_275_event_275.pysnap
index 6a5e2936c93c75..f36d616f3b7b77 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_275_event_275.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_275_event_275.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:19:37.942436+00:00'
+created: '2024-12-17T22:47:13.656262+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -104,6 +105,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "2c1bbd635b64d5adccdb64a620044075"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_289_event_312.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_289_event_312.pysnap
index 6d4546887c7a9d..cb4c6cd50999fa 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_289_event_312.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_289_event_312.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:19:41.120779+00:00'
+created: '2024-12-17T22:47:13.714453+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -96,6 +97,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "9c336f632f6764c0f082a6a66edbf22d"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_294_event_294.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_294_event_294.pysnap
index ec24dbe572adb2..d1af28159b2edf 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_294_event_294.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_294_event_294.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:19:43.254158+00:00'
+created: '2024-12-17T22:47:13.776238+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -145,6 +146,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "49b6f72b6635cb43190c57ee56b026b0"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_294_event_329.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_294_event_329.pysnap
index abbca4ecdf2b0f..0542a49c170a76 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_294_event_329.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_294_event_329.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:19:44.961372+00:00'
+created: '2024-12-17T22:47:13.841587+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -160,6 +161,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "49b6f72b6635cb43190c57ee56b026b0"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_307_event_307.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_307_event_307.pysnap
index 1d3a0b2462858b..4ab8fe5b890810 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_307_event_307.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_307_event_307.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:19:48.031572+00:00'
+created: '2024-12-17T22:47:13.892599+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -64,6 +65,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "aeed765d29d1a60cb094f66d2cd8efb2"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_307_event_657.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_307_event_657.pysnap
index 4d6c894760efc9..2dc2b42acdde88 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_307_event_657.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_307_event_657.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:19:51.968492+00:00'
+created: '2024-12-17T22:47:13.962182+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -59,6 +60,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "aeed765d29d1a60cb094f66d2cd8efb2"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_313_event_313.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_313_event_313.pysnap
index 752b57426570dd..15a2cbb7f9c4f6 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_313_event_313.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_313_event_313.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:19:54.964615+00:00'
+created: '2024-12-17T22:47:14.048020+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -193,6 +194,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "8be5979a334287a1b47457228f1d4612"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_313_event_333.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_313_event_333.pysnap
index 956ac43d6214fc..3310fb3bc208d4 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_313_event_333.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_313_event_333.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:19:58.332928+00:00'
+created: '2024-12-17T22:47:14.110450+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -198,6 +199,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "8be5979a334287a1b47457228f1d4612"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_319_event_321.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_319_event_321.pysnap
index 1c92fa92b73005..df0155db6372de 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_319_event_321.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_319_event_321.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:20:00.008644+00:00'
+created: '2024-12-17T22:47:14.170967+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -196,6 +197,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "7e64037e487c78ce0439f750a2ef503f"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_389_event_389.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_389_event_389.pysnap
index 21da12fdc3fbfb..0b0f1a8c9497bb 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_389_event_389.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_389_event_389.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:20:01.810693+00:00'
+created: '2024-12-17T22:47:14.218173+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -46,6 +47,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "aeed765d29d1a60cb094f66d2cd8efb2"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_432_event_432.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_432_event_432.pysnap
index 023cb73546f637..b7cfe8f4280c60 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_432_event_432.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_432_event_432.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:20:03.666963+00:00'
+created: '2024-12-17T22:47:14.288342+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -130,6 +131,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "6148c73af04344a8597354711f5951ea"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_432_event_453.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_432_event_453.pysnap
index 6a8868915e5888..93a3d56d9a6016 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_432_event_453.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_432_event_453.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:20:05.311947+00:00'
+created: '2024-12-17T22:47:14.340610+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -130,6 +131,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "1056f62d72ff8b4d0c3842d696dbb10a"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_445_event_445.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_445_event_445.pysnap
index 27125ccf157944..b3b669cd936fe2 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_445_event_445.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/group_445_event_445.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:20:07.125969+00:00'
+created: '2024-12-17T22:47:14.406993+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -151,6 +152,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "15526a7b64e9b5dc6d89e7ebec864260"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/hpkp.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/hpkp.pysnap
index 2e9101c7628741..fca3e5161bcecf 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/hpkp.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/hpkp.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-01-11T11:41:27.293993Z'
+created: '2024-12-17T22:47:14.452884+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "1e37a374cb33572622d02ff7a6237c44"
+  contributing component: hpkp
   component:
     default*
       hpkp*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/hybrid_fingerprint_base.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/hybrid_fingerprint_base.pysnap
index 2a618cdfe1af1a..5479a796b849eb 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/hybrid_fingerprint_base.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/hybrid_fingerprint_base.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-15T17:24:08.271543+00:00'
+created: '2024-12-17T22:47:14.523998+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "e3d593b4335190212ca7c18b8e967fb1"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/hybrid_fingerprint_custom_client_hybrid_server.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/hybrid_fingerprint_custom_client_hybrid_server.pysnap
index befdfb064e1f6c..762ec8a5d6de23 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/hybrid_fingerprint_custom_client_hybrid_server.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/hybrid_fingerprint_custom_client_hybrid_server.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-16T19:24:29.370529+00:00'
+created: '2024-12-17T22:47:14.595052+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "19163f3ca34f5995c69d85351ce3d697"
+  contributing component: exception
   component:
     app*
       exception*
@@ -171,6 +172,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "847950eb44d280e6758d136c763d6ddc"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/hybrid_fingerprint_hybrid_client_custom_server.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/hybrid_fingerprint_hybrid_client_custom_server.pysnap
index 0fa98d74a1f27f..cd7099ec4b915e 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/hybrid_fingerprint_hybrid_client_custom_server.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/hybrid_fingerprint_hybrid_client_custom_server.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-11-08T18:05:21.791163+00:00'
+created: '2024-12-17T22:47:14.646686+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: exception
   component:
     app (custom fingerprint takes precedence)
       exception*
@@ -174,6 +175,7 @@ custom_fingerprint:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: exception
   component:
     system (custom fingerprint takes precedence)
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/hybrid_fingerprint_same_default_different_extra.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/hybrid_fingerprint_same_default_different_extra.pysnap
index 47c9511ccd767c..904f553a64efc9 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/hybrid_fingerprint_same_default_different_extra.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/hybrid_fingerprint_same_default_different_extra.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-15T17:24:08.561627+00:00'
+created: '2024-12-17T22:47:14.707922+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "5b5ad5a0fbb4deb5e3fc631ce42681ae"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/hybrid_fingerprint_same_extra_different_default.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/hybrid_fingerprint_same_extra_different_default.pysnap
index cb92f05273e355..ad04623e221ccd 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/hybrid_fingerprint_same_extra_different_default.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/hybrid_fingerprint_same_extra_different_default.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-15T17:24:08.668746+00:00'
+created: '2024-12-17T22:47:14.818268+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "c5578778212497f1ff3435405e2a4a98"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/in_app_in_ui.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/in_app_in_ui.pysnap
index 3fdcae197aea71..c524790220b12e 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/in_app_in_ui.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/in_app_in_ui.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-12-12T13:53:15.232494Z'
+created: '2024-12-17T22:47:14.887007+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "5b032559156688c9eabe4e4bd5ae6bd4"
+  contributing component: exception
   component:
     app*
       exception*
@@ -150,6 +151,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "1921b991270e24c19ea1ed6863892d71"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/java_chained.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/java_chained.pysnap
index 5c18e069ee385d..1952d22617181d 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/java_chained.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/java_chained.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:20:20.681033+00:00'
+created: '2024-12-17T22:47:14.940694+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       chained-exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -393,6 +394,7 @@ app:
 --------------------------------------------------------------------------
 default:
   hash: null
+  contributing component: null
   component:
     default (exception of system takes precedence)
       message (exception of system takes precedence)
@@ -400,6 +402,7 @@ default:
 --------------------------------------------------------------------------
 system:
   hash: "1959b227a7cf6acf7f3fd401b5d9f09b"
+  contributing component: chained-exception
   component:
     system*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/java_minimal.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/java_minimal.pysnap
index 5a4cbc19406df5..064927fcd8c652 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/java_minimal.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/java_minimal.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:20:22.615944+00:00'
+created: '2024-12-17T22:47:15.009899+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -401,6 +402,7 @@ app:
 --------------------------------------------------------------------------
 default:
   hash: null
+  contributing component: null
   component:
     default (exception of system takes precedence)
       message (exception of system takes precedence)
@@ -408,6 +410,7 @@ default:
 --------------------------------------------------------------------------
 system:
   hash: "ef2555bf7958ada8eefafbfdaed1c409"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_exception_fallback_to_message.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_exception_fallback_to_message.pysnap
index 5cd9d0f7aaca34..638fa3b3ab0eaa 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_exception_fallback_to_message.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_exception_fallback_to_message.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-01-11T11:41:28.080479Z'
+created: '2024-12-17T22:47:15.111326+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "10dfd81e2df31e96fae451b9e205ad81"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_exception_fallback_to_message_whistles.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_exception_fallback_to_message_whistles.pysnap
index 40b480ebca2c23..b88468de1f2434 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_exception_fallback_to_message_whistles.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_exception_fallback_to_message_whistles.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-01-11T11:41:30.082996Z'
+created: '2024-12-17T22:47:15.057122+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "b8e2a347e75266ca7bb565e2b3c0722e"
+  contributing component: exception
   component:
     app*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_exception_no_in_app.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_exception_no_in_app.pysnap
index f933c8a92d084a..7b1cb4cef39610 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_exception_no_in_app.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_exception_no_in_app.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:20:28.174303+00:00'
+created: '2024-12-17T22:47:15.173981+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -76,6 +77,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "c0f3f7d6deb17aec9d07259ac684fad0"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_message.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_message.pysnap
index e440a1291dbe90..ed7c3af54daf48 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_message.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_message.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-01-11T11:41:28.247477Z'
+created: '2024-12-17T22:47:15.372837+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "4119639092e62c55ea8be348e4d9260d"
+  contributing component: message
   component:
     default*
       message*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_message_parameterization.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_message_parameterization.pysnap
index 8145c2eb0e32e6..816ed66f2a34a4 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_message_parameterization.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_message_parameterization.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-15T17:12:43.640189+00:00'
+created: '2024-12-17T22:47:15.236626+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "f9e47f16e3b9770b440157179c47bf7a"
+  contributing component: message
   component:
     default*
       message* (stripped event-specific values)
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_polyfills.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_polyfills.pysnap
index 88afecfdb4e62a..22ca826b29c8af 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_polyfills.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_polyfills.pysnap
@@ -1,13 +1,14 @@
 ---
-created: '2024-10-24T14:20:33.386709+00:00'
+created: '2024-12-17T22:47:15.459981+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
-  hash: null
+  hash: "be36642f41f047346396f018f62375d3"
+  contributing component: exception
   component:
-    app (exception of system takes precedence)
-      exception (ignored because hash matches system variant)
+    app*
+      exception*
         stacktrace (ignored because it contains no in-app frames)
           frame (marked out of app by stack trace rule (module:@babel/** -app -group))
             module*
@@ -30,10 +31,11 @@ app:
           "bad"
 --------------------------------------------------------------------------
 system:
-  hash: "be36642f41f047346396f018f62375d3"
+  hash: null
+  contributing component: null
   component:
-    system*
-      exception*
+    system (exception of app takes precedence)
+      exception (ignored because hash matches app variant)
         stacktrace (ignored because it contains no contributing frames)
           frame (ignored by stack trace rule (module:@babel/** -app -group))
             module*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_unpkg.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_unpkg.pysnap
index 8ac05ab546124b..ce97355795555f 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_unpkg.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_unpkg.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:20:35.288899+00:00'
+created: '2024-12-17T22:47:15.532309+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -38,6 +39,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "6ab78545e13144405fb21dadb9045b91"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_chrome.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_chrome.pysnap
index a0411649336308..df57a5b441fcbb 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_chrome.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_chrome.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:20:36.932461+00:00'
+created: '2024-12-17T22:47:15.588390+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -62,6 +63,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "c63e8727af1a8fe75872b6a762797113"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_edge.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_edge.pysnap
index df09f2189c99a0..fe7721bf5d82d2 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_edge.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_edge.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:20:38.621975+00:00'
+created: '2024-12-17T22:47:15.650778+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -66,6 +67,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "c63e8727af1a8fe75872b6a762797113"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_firefox.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_firefox.pysnap
index d448a64e9880e5..46a4dba1909098 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_firefox.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_firefox.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:20:42.048911+00:00'
+created: '2024-12-17T22:47:15.712905+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -59,6 +60,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "c63e8727af1a8fe75872b6a762797113"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_http_chrome.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_http_chrome.pysnap
index 6629513081bb96..f03e7ea19e30f5 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_http_chrome.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_http_chrome.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:20:43.963406+00:00'
+created: '2024-12-17T22:47:15.779854+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -80,6 +81,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "b2602ad455472dede8e4c340d8a7eaba"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_http_edge.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_http_edge.pysnap
index 4fefe9e69e55ae..b109a8bc0352c4 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_http_edge.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_http_edge.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:20:45.856109+00:00'
+created: '2024-12-17T22:47:15.839680+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -84,6 +85,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "b2602ad455472dede8e4c340d8a7eaba"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_http_firefox.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_http_firefox.pysnap
index 9221b56d56235f..8976ca5d1a6973 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_http_firefox.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_http_firefox.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:20:47.591432+00:00'
+created: '2024-12-17T22:47:15.893060+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -77,6 +78,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "b2602ad455472dede8e4c340d8a7eaba"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_http_safari.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_http_safari.pysnap
index b3bd4dd40a7712..44ab6bbae51113 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_http_safari.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_http_safari.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:20:49.349900+00:00'
+created: '2024-12-17T22:47:15.960305+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -83,6 +84,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "b2602ad455472dede8e4c340d8a7eaba"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_safari.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_safari.pysnap
index a555eb3d52f2a3..197ac930c783b8 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_safari.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_safari.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:20:51.319218+00:00'
+created: '2024-12-17T22:47:16.047428+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -67,6 +68,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "c63e8727af1a8fe75872b6a762797113"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_sentryui_firefox.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_sentryui_firefox.pysnap
index 44ea9ff2e8e635..320d565d98b8ec 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_sentryui_firefox.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_sentryui_firefox.pysnap
@@ -1,8 +1,11 @@
 ---
+created: '2024-12-17T22:47:16.102577+00:00'
+creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "4a3cf3893b6485428dd02da116c8370e"
+  contributing component: exception
   component:
     app*
       exception*
@@ -176,6 +179,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "d5456487ea8dccfe96c1968b19870978"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_sentryui_safari.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_sentryui_safari.pysnap
index 8d09f33c811282..3506e330c74992 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_sentryui_safari.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_xbrowser_sentryui_safari.pysnap
@@ -1,8 +1,11 @@
 ---
+created: '2024-12-17T22:47:16.146125+00:00'
+creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "4a3cf3893b6485428dd02da116c8370e"
+  contributing component: exception
   component:
     app*
       exception*
@@ -145,6 +148,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "0b81da6ea3d7cc82b1d4825b7aac0b8d"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/laravel.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/laravel.pysnap
index e752c008830cab..d3f98e2d92732a 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/laravel.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/laravel.pysnap
@@ -1,8 +1,11 @@
 ---
+created: '2024-12-17T22:47:16.258663+00:00'
+creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "4665d486184740231357ab63f4543a8d"
+  contributing component: exception
   component:
     app*
       exception*
@@ -362,6 +365,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "107ed03036d901157372f260bc3df446"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/laravel_anonymous.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/laravel_anonymous.pysnap
index 75d27e1b3a0726..cf7116370bf545 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/laravel_anonymous.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/laravel_anonymous.pysnap
@@ -1,8 +1,11 @@
 ---
+created: '2024-12-17T22:47:16.190870+00:00'
+creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "a728cdf5d62c8e017c35c3fe04051b6e"
+  contributing component: exception
   component:
     app*
       exception*
@@ -33,6 +36,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "63c67781779781d9b0a442a5b2bdb976"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/logentry_prefers_message.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/logentry_prefers_message.pysnap
index 0f184e48de565c..2bbd0d9203478e 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/logentry_prefers_message.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/logentry_prefers_message.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-01-11T11:41:29.340250Z'
+created: '2024-12-17T22:47:16.309956+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "8ec8bbc71eb6e2af7fbe5076a8534f96"
+  contributing component: message
   component:
     default*
       message*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/logentry_uses_formatted.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/logentry_uses_formatted.pysnap
index cc67715537e292..4f5bc0b74b6081 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/logentry_uses_formatted.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/logentry_uses_formatted.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-01-11T11:41:30.054746Z'
+created: '2024-12-17T22:47:16.370777+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "329b29efcf1f77067a063e34f56e7791"
+  contributing component: message
   component:
     default*
       message*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/macos_amd_driver.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/macos_amd_driver.pysnap
index 1c6a67241bb044..3e3b39f75e1205 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/macos_amd_driver.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/macos_amd_driver.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:21:07.393338+00:00'
+created: '2024-12-17T22:47:16.466801+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -159,6 +160,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "b8baf791d22ac902d5f59a7eedd844fd"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/macos_intel_driver.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/macos_intel_driver.pysnap
index e878c20ace97a6..5a48cd779763ab 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/macos_intel_driver.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/macos_intel_driver.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:21:09.339902+00:00'
+created: '2024-12-17T22:47:16.569216+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -187,6 +188,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "36be6e0b6123ef6ecfbef62f5cb88406"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/malloc_sentinel.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/malloc_sentinel.pysnap
index 1c4394e66a68bf..7609fd4032d7db 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/malloc_sentinel.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/malloc_sentinel.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:21:11.162184+00:00'
+created: '2024-12-17T22:47:16.681320+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -100,6 +101,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "70b7b816193e06eb5d6649989fbaf605"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/message_prefers_message.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/message_prefers_message.pysnap
index 8c852ab5289629..3806af7159c4e5 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/message_prefers_message.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/message_prefers_message.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-01-11T11:41:29.475873Z'
+created: '2024-12-17T22:47:16.765850+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "8ec8bbc71eb6e2af7fbe5076a8534f96"
+  contributing component: message
   component:
     default*
       message*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/message_uses_formatted.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/message_uses_formatted.pysnap
index 53eb1dbe049f01..a3d2c88cfd5e6d 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/message_uses_formatted.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/message_uses_formatted.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-01-11T11:41:26.673098Z'
+created: '2024-12-17T22:47:16.813552+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "d3f5e52d24e9c1eae5abe6c866cced63"
+  contributing component: message
   component:
     default*
       message*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/message_with_key_pair_values.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/message_with_key_pair_values.pysnap
index f5f5d9cae72a6a..488e69a5ab8fd8 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/message_with_key_pair_values.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/message_with_key_pair_values.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-07-24T22:47:22.571430Z'
+created: '2024-12-17T22:47:16.866274+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "d2ab1028e9cb44352a824e878951f412"
+  contributing component: message
   component:
     default*
       message* (stripped event-specific values)
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/minified_javascript.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/minified_javascript.pysnap
index cbe7c56eaea5e8..2729fd33fe20fe 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/minified_javascript.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/minified_javascript.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:21:20.105415+00:00'
+created: '2024-12-17T22:47:16.924713+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -212,6 +213,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "dcfcd48a02c100bbe4023cbc783054f0"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_complex_function_names.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_complex_function_names.pysnap
index 18fbcf8d9a453e..01909bfe47dcb4 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_complex_function_names.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_complex_function_names.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:21:22.066885+00:00'
+created: '2024-12-17T22:47:16.980268+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -25,6 +26,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "9b78cced1eefcd0c655a0a3d8ce2cdd2"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_driver_crash1.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_driver_crash1.pysnap
index 3b575e1872469a..08b2b97dbc78be 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_driver_crash1.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_driver_crash1.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:21:24.787277+00:00'
+created: '2024-12-17T22:47:17.088876+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -35,6 +36,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "2e0d26cae5986fcda5edf66612a78268"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_driver_crash2.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_driver_crash2.pysnap
index a0f9739d400db6..12644b6c4d8f1c 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_driver_crash2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_driver_crash2.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:21:27.604345+00:00'
+created: '2024-12-17T22:47:17.193233+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -30,6 +31,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "c85e23e804b52ea4b9f290ba838e77a0"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_driver_crash3.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_driver_crash3.pysnap
index 4a1d7400ec8b25..2b3b525d1035ad 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_driver_crash3.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_driver_crash3.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:21:31.037438+00:00'
+created: '2024-12-17T22:47:17.289299+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -36,6 +37,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "784442a33bd16c15013bb8f69f68e7d6"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_limit_frames.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_limit_frames.pysnap
index 5eddd244a8c70f..44d08ddb551686 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_limit_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_limit_frames.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:21:34.408864+00:00'
+created: '2024-12-17T22:47:17.350421+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -25,6 +26,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "8f4c7709e4af98d3c47ce3519690e6d9"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_malloc_chain.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_malloc_chain.pysnap
index 8c2a667f318018..2cb74d9929ba34 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_malloc_chain.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_malloc_chain.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:21:37.090199+00:00'
+created: '2024-12-17T22:47:17.403904+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -34,6 +35,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "3ff01ce959249abecc6bc8a8f1432b0b"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_no_filenames.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_no_filenames.pysnap
index 9b88be7d14927b..921c826c0bc79e 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_no_filenames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_no_filenames.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-02-01T08:22:05.394174Z'
+created: '2024-12-17T22:47:17.460985+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "418120a66f7031923031f5c52aca0724"
+  contributing component: exception
   component:
     app*
       exception*
@@ -58,6 +59,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "bbcdb2e1d8df09ffe0fffd30fb361d4b"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_unlimited_frames.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_unlimited_frames.pysnap
index cc65bf75e48b78..e4ea8c0f17d5d0 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_unlimited_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_unlimited_frames.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:21:43.538257+00:00'
+created: '2024-12-17T22:47:17.504033+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -25,6 +26,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "9b78cced1eefcd0c655a0a3d8ce2cdd2"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_windows_anon_namespace.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_windows_anon_namespace.pysnap
index c6b7832520ffda..8f290d944f324e 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_windows_anon_namespace.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_windows_anon_namespace.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:21:45.737100+00:00'
+created: '2024-12-17T22:47:17.554825+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -41,6 +42,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "46b84e4da51648cc9f9741abd2bdad51"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_with_function_name.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_with_function_name.pysnap
index 08aee7811d5c84..7c7d3e0fa03263 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_with_function_name.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/native_with_function_name.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:21:47.863209+00:00'
+created: '2024-12-17T22:47:17.648486+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -37,6 +38,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "c29439027eafcf7642f641554ab0f0ef"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/node_exception_weird.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/node_exception_weird.pysnap
index 0d76ff4a08488d..e0b7cd1669911d 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/node_exception_weird.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/node_exception_weird.pysnap
@@ -1,8 +1,11 @@
 ---
+created: '2024-12-17T22:47:17.708037+00:00'
+creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "a20509269752c9a1bea6078851e4d39c"
+  contributing component: exception
   component:
     app*
       exception*
@@ -100,6 +103,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "252dc79eb5653bf822e2684d90734cb8"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/node_low_level_async.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/node_low_level_async.pysnap
index 13528ffdb28f1d..cf58b925885215 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/node_low_level_async.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/node_low_level_async.pysnap
@@ -1,13 +1,14 @@
 ---
-created: '2024-10-24T14:21:52.204150+00:00'
+created: '2024-12-17T22:47:17.761024+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
-  hash: null
+  hash: "be36642f41f047346396f018f62375d3"
+  contributing component: exception
   component:
-    app (exception of system takes precedence)
-      exception (ignored because hash matches system variant)
+    app*
+      exception*
         stacktrace (ignored because it contains no in-app frames)
           frame (marked out of app by stack trace rule (function:processTicksAndRejections -app -group))
             module*
@@ -27,10 +28,11 @@ app:
           "bad"
 --------------------------------------------------------------------------
 system:
-  hash: "be36642f41f047346396f018f62375d3"
+  hash: null
+  contributing component: null
   component:
-    system*
-      exception*
+    system (exception of app takes precedence)
+      exception (ignored because hash matches app variant)
         stacktrace (ignored because it contains no contributing frames)
           frame (ignored by stack trace rule (function:processTicksAndRejections -app -group))
             module*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/python_exception_base.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/python_exception_base.pysnap
index f26a8759d82f13..5440fd2af5741c 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/python_exception_base.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/python_exception_base.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:21:54.035915+00:00'
+created: '2024-12-17T22:47:17.810944+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "c52ebcc2d9d0780a23c7d99831678830"
+  contributing component: chained-exception
   component:
     app*
       chained-exception*
@@ -29,6 +30,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "669cb6664e0f5fed38665da04e464f7e"
+  contributing component: chained-exception
   component:
     system*
       chained-exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/python_grouping_enhancer_away_from_crash.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/python_grouping_enhancer_away_from_crash.pysnap
index da86788ec4fbfc..36ff6c40bef1af 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/python_grouping_enhancer_away_from_crash.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/python_grouping_enhancer_away_from_crash.pysnap
@@ -1,8 +1,11 @@
 ---
+created: '2024-12-17T22:47:17.870095+00:00'
+creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "121caa876de75ec51bf72ed4c852cd75"
+  contributing component: exception
   component:
     app*
       exception*
@@ -104,6 +107,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "a5af2577d4caca8f983657c5d1919e14"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/python_grouping_enhancer_towards_crash.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/python_grouping_enhancer_towards_crash.pysnap
index b20ceef587dbaa..2a72c21e299ba5 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/python_grouping_enhancer_towards_crash.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/python_grouping_enhancer_towards_crash.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:21:57.991389+00:00'
+created: '2024-12-17T22:47:17.927985+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -106,6 +107,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "90888e813b09fa25061af2883c0fb9bd"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/python_http_error.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/python_http_error.pysnap
index f77a2c87777f62..986d30a8e2b891 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/python_http_error.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/python_http_error.pysnap
@@ -1,8 +1,11 @@
 ---
+created: '2024-12-17T22:47:17.991859+00:00'
+creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "d59239f5aad3304d60beb1fde3369b78"
+  contributing component: exception
   component:
     app*
       exception*
@@ -41,6 +44,7 @@ app:
 --------------------------------------------------------------------------
 default:
   hash: null
+  contributing component: null
   component:
     default (exception of app/system takes precedence)
       message (exception of app/system takes precedence)
@@ -48,6 +52,7 @@ default:
 --------------------------------------------------------------------------
 system:
   hash: "133db3f366b1327dab4e661f66dfb961"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/react_native.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/react_native.pysnap
index 5842144f017541..bc69189bed06e4 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/react_native.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/react_native.pysnap
@@ -1,8 +1,11 @@
 ---
+created: '2024-12-17T22:47:18.065833+00:00'
+creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "73470e545e51eea9cff8a6c006f68f57"
+  contributing component: exception
   component:
     app*
       exception*
@@ -206,6 +209,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "ecd413627f0d90a5a25cb28d1ba9c39f"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_cocoa.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_cocoa.pysnap
index a193c123175847..78928074cdfee0 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_cocoa.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_cocoa.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-01-11T11:41:26.571775Z'
+created: '2024-12-17T22:47:18.111860+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "eb416f98479efa56a77c524602dc9979"
+  contributing component: stacktrace
   component:
     app*
       stacktrace*
@@ -17,6 +18,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "1df786c8c266506e1acb6669c8df5154"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_collapse_recursion.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_collapse_recursion.pysnap
index 9977caeb810faf..1b57be73c0c64a 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_collapse_recursion.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_collapse_recursion.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:06.044305+00:00'
+created: '2024-12-17T22:47:18.167124+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -60,6 +61,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "9bdadae4fa003cef6cf460ff1325e54b"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_compute_hashes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_compute_hashes.pysnap
index e0c8971fb4e2a1..e9e808fbe141e2 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_compute_hashes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_compute_hashes.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-01-11T11:41:28.985644Z'
+created: '2024-12-17T22:47:18.220340+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "1effb24729ae4c43efa36b460511136a"
+  contributing component: stacktrace
   component:
     app*
       stacktrace*
@@ -17,6 +18,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "659ad79e2e70c822d30a53d7d889529e"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_discards_seemingly_useless_stack.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_discards_seemingly_useless_stack.pysnap
index db81688549f7d0..f1665f6abe8fd3 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_discards_seemingly_useless_stack.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_discards_seemingly_useless_stack.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:09.432897+00:00'
+created: '2024-12-17T22:47:18.279612+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app
       stacktrace (ignored because it contains no in-app frames)
@@ -17,6 +18,7 @@ fallback:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: null
   component:
     system
       stacktrace (ignored because it contains no contributing frames)
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_does_not_discard_non_urls.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_does_not_discard_non_urls.pysnap
index 90d43233490a22..ebadf1d68c66aa 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_does_not_discard_non_urls.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_does_not_discard_non_urls.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:11.127045+00:00'
+created: '2024-12-17T22:47:18.335738+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -14,6 +15,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "acbd18db4cc2f85cedef654fccc4a4d8"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_does_not_group_different_js_errors.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_does_not_group_different_js_errors.pysnap
index f53399c354fe9a..6f2021eb6274ce 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_does_not_group_different_js_errors.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_does_not_group_different_js_errors.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:12.770464+00:00'
+created: '2024-12-17T22:47:18.387663+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app
       stacktrace (ignored because it contains no in-app frames)
@@ -17,6 +18,7 @@ fallback:
 --------------------------------------------------------------------------
 system:
   hash: null
+  contributing component: null
   component:
     system
       stacktrace (ignored because it contains no contributing frames)
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_enforce_min_frames.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_enforce_min_frames.pysnap
index e015071faa15bb..8535afa123c2d6 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_enforce_min_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_enforce_min_frames.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-02-01T08:22:01.452226Z'
+created: '2024-12-17T22:47:18.445492+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -37,6 +38,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "cb57cfc73cc622c2ac1386c9ea531fb9"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_excludes_single_frame_urls.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_excludes_single_frame_urls.pysnap
index 95fbfe0ff566fc..65d32526f4ec68 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_excludes_single_frame_urls.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_excludes_single_frame_urls.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:16.290311+00:00'
+created: '2024-12-17T22:47:18.492868+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -16,6 +17,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "cd2a9fd0cdaa8cd55ed22b101fc65882"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_hash_without_system_frames.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_hash_without_system_frames.pysnap
index 27f32107c54534..65199bcf68f6e9 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_hash_without_system_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_hash_without_system_frames.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-01-11T11:41:29.739860Z'
+created: '2024-12-17T22:47:18.555984+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "1effb24729ae4c43efa36b460511136a"
+  contributing component: stacktrace
   component:
     app*
       stacktrace*
@@ -17,6 +18,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "659ad79e2e70c822d30a53d7d889529e"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_ignores_singular_anonymous_frame.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_ignores_singular_anonymous_frame.pysnap
index 765d3af802153b..9ebe96d6789f86 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_ignores_singular_anonymous_frame.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_ignores_singular_anonymous_frame.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:19.986729+00:00'
+created: '2024-12-17T22:47:18.615361+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because it contains no in-app frames)
@@ -24,6 +25,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "c5da56c71b31f34c5880d734cbc8f5bb"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_negated_match.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_negated_match.pysnap
index 7bb0e7d3ab7910..1b3076209aa03f 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_negated_match.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_negated_match.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2024-10-24T14:22:21.683897+00:00'
+created: '2024-12-17T22:47:18.681218+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app (exception of system takes precedence)
       exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
@@ -37,6 +38,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "eb87c1031dba55b67df86fb9fff59dc6"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_rust.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_rust.pysnap
index ee6dd53deb0617..e383efd8221d99 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_rust.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_rust.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-02-01T08:22:03.743111Z'
+created: '2024-12-17T22:47:18.740583+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "eb87c1031dba55b67df86fb9fff59dc6"
+  contributing component: exception
   component:
     app*
       exception*
@@ -37,6 +38,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "cb57cfc73cc622c2ac1386c9ea531fb9"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_rust2.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_rust2.pysnap
index 652a1c79fbdb55..58ae4a5a310663 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_rust2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_rust2.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-02-01T08:22:06.117061Z'
+created: '2024-12-17T22:47:18.788584+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "eb87c1031dba55b67df86fb9fff59dc6"
+  contributing component: exception
   component:
     app*
       exception*
@@ -37,6 +38,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "0817e4e604fbe88c4534eff166df1db9"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_with_minimal_app_frames.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_with_minimal_app_frames.pysnap
index aecd439bb3365c..3e90a631862c81 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_with_minimal_app_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/stacktrace_with_minimal_app_frames.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-01-11T11:41:29.448425Z'
+created: '2024-12-17T22:47:18.833763+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "1effb24729ae4c43efa36b460511136a"
+  contributing component: stacktrace
   component:
     app*
       stacktrace*
@@ -47,6 +48,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "659ad79e2e70c822d30a53d7d889529e"
+  contributing component: stacktrace
   component:
     system*
       stacktrace*
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 bbc9ca8179c1d9..8a012534c5ea5c 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,10 +1,11 @@
 ---
-created: '2024-10-16T17:53:20.195689+00:00'
+created: '2024-12-17T22:47:18.946973+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
   hash: "1f5bdebe3c9f414c7dbb4296a8353245"
+  contributing component: template
   component:
     default*
       template*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/threads_compute_hashes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/threads_compute_hashes.pysnap
index 921539f7727ed8..2929b53a7f40fd 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/threads_compute_hashes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/threads_compute_hashes.pysnap
@@ -1,13 +1,14 @@
 ---
-created: '2023-01-11T11:41:29.245137Z'
+created: '2024-12-17T22:47:19.084434+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
-  hash: null
+  hash: "1a11687556cf74559f0ae90b1c87e2fd"
+  contributing component: threads
   component:
-    app (threads of system take precedence)
-      threads (ignored because hash matches system variant)
+    app*
+      threads*
         stacktrace*
           frame*
             filename*
@@ -16,10 +17,11 @@ app:
               "main"
 --------------------------------------------------------------------------
 system:
-  hash: "1a11687556cf74559f0ae90b1c87e2fd"
+  hash: null
+  contributing component: null
   component:
-    system*
-      threads*
+    system (threads of app take precedence)
+      threads (ignored because hash matches app variant)
         stacktrace*
           frame*
             filename*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/threads_no_hash.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/threads_no_hash.pysnap
index 8dc77ed2d63a74..ad1a8623e6b8a9 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/threads_no_hash.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/threads_no_hash.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-01-11T11:41:30.068094Z'
+created: '2024-12-17T22:47:19.169758+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: null
+  contributing component: null
   component:
     app
       threads (ignored because does not contain exactly one crashing, one current or just one thread, instead contains 2 threads)
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/unity.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/unity.pysnap
index 14f0fd27df1237..b6e63a41ca6d85 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/unity.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/unity.pysnap
@@ -1,10 +1,11 @@
 ---
-created: '2023-01-11T11:41:26.977074Z'
+created: '2024-12-17T22:47:19.265209+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
   hash: "a12d579fed7636c2a5d2fae110c95ce5"
+  contributing component: exception
   component:
     app*
       exception*
@@ -56,6 +57,7 @@ app:
 --------------------------------------------------------------------------
 system:
   hash: "c0dbeebf0430b3310ad1f7ceb48553a6"
+  contributing component: exception
   component:
     system*
       exception*
diff --git a/tests/sentry/grouping/test_builtin_fingerprinting.py b/tests/sentry/grouping/test_builtin_fingerprinting.py
index 5eb684b66b4942..63c403e171ba41 100644
--- a/tests/sentry/grouping/test_builtin_fingerprinting.py
+++ b/tests/sentry/grouping/test_builtin_fingerprinting.py
@@ -7,6 +7,7 @@
 
 from sentry import eventstore
 from sentry.event_manager import EventManager, get_event_type, materialize_metadata
+from sentry.eventstore.models import Event
 from sentry.grouping.api import (
     apply_server_fingerprinting,
     get_default_grouping_config_dict,
@@ -527,7 +528,7 @@ def setUp(self):
             "tags": {"transaction": "/"},
         }
 
-    def _get_event_for_trace(self, stacktrace):
+    def _get_event_for_trace(self, stacktrace: dict[str, Any]) -> Event:
         mgr = EventManager(data=stacktrace, grouping_config=GROUPING_CONFIG)
         mgr.normalize()
         data = mgr.get_data()
@@ -538,7 +539,7 @@ def _get_event_for_trace(self, stacktrace):
         event_metadata = event_type.get_metadata(data)
         data.update(materialize_metadata(data, event_type, event_metadata))
 
-        return eventstore.backend.create_event(data=data)
+        return eventstore.backend.create_event(project_id=1, data=data)
 
     def test_built_in_chunkload_rules(self):
         """
@@ -610,8 +611,8 @@ def test_built_in_chunkload_rules_wrong_sdk(self):
 
     def test_built_in_hydration_rules_same_transactions(self):
         """
-        With the flag enabled, hydration errors with the same transaction should be grouped and
-        the built-in rules for hydration errors should be applied.
+        Hydration errors with the same transaction should be grouped and the built-in rules for
+        hydration errors should be applied.
         """
 
         event_message1 = self.store_event(data=self.hydration_error_trace, project_id=self.project)
@@ -650,8 +651,8 @@ def test_built_in_hydration_rules_same_transactions(self):
 
     def test_built_in_hydration_rules_different_transactions(self):
         """
-        With the flag enabled, hydration errors with different transactions should not be grouped and
-        the built-in rules for hydration errors should be applied.
+        Hydration errors with different transactions should not be grouped and the built-in rules
+        for hydration errors should be applied.
         """
 
         event_transaction_slash = self.store_event(
@@ -698,8 +699,8 @@ def test_built_in_hydration_rules_different_transactions(self):
 
     def test_built_in_hydration_rules_no_transactions(self):
         """
-        With the flag enabled, for hydration errors with no transactions
-        the built-in HydrationError rules should NOT be applied.
+        For hydration errors with no transactions the built-in HydrationError rules should NOT be
+        applied.
         """
 
         data_transaction_no_tx = self.hydration_error_trace
@@ -734,7 +735,7 @@ def test_hydration_rule_w_family_matcher(self):
         event_metadata = event_type.get_metadata(data)
         data.update(materialize_metadata(data, event_type, event_metadata))
 
-        event = eventstore.backend.create_event(data=data)
+        event = eventstore.backend.create_event(project_id=1, data=data)
 
         assert event.data.data["_fingerprint_info"]["matched_rule"] == {
             "attributes": {},
diff --git a/tests/sentry/grouping/test_components.py b/tests/sentry/grouping/test_components.py
index 3b8e9ae50b7245..589864eb887bc3 100644
--- a/tests/sentry/grouping/test_components.py
+++ b/tests/sentry/grouping/test_components.py
@@ -8,14 +8,14 @@
     ExceptionGroupingComponent,
     FunctionGroupingComponent,
     StacktraceGroupingComponent,
+    ThreadsGroupingComponent,
 )
 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:
+](parent_component: BaseGroupingComponent[Any], child_component_type: type[T]) -> T:
     """
     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.
@@ -23,8 +23,8 @@ def find_given_child_component[
     for child_component in parent_component.values:
         if isinstance(child_component, child_component_type):
             return child_component
-
-    return None
+    else:
+        raise AssertionError(f"component not found: {child_component_type}")
 
 
 class ComponentTest(TestCase):
@@ -93,12 +93,14 @@ def test_frame_components_record_in_app(self):
             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"]
+            found = []
+            for frame_component in frame_components:
+                child_component = find_given_child_component(
+                    frame_component, FunctionGroupingComponent
+                )
+                assert child_component is not None
+                found.append(child_component.values[0])
+            assert found == ["handleRequest", "playFetch"]
 
             assert [frame_component.in_app for frame_component in frame_components] == [False, True]
 
@@ -184,6 +186,36 @@ def test_exception_component_uses_stacktrace_frame_counts(self):
             )
             assert exception_component.frame_counts == stacktrace_component.frame_counts
 
+    def test_threads_component_uses_stacktrace_frame_counts(self):
+        self.event.data["threads"] = self.event.data.pop("exception")
+        self.event.data["threads"]["values"][0]["stacktrace"] = {
+            "frames": (
+                [self.non_contributing_system_frame] * 20
+                + [self.contributing_system_frame] * 12
+                + [self.non_contributing_in_app_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"]:
+            threads_component = variants[variant_name].component.values[0]
+            assert isinstance(threads_component, ThreadsGroupingComponent)
+            stacktrace_component = find_given_child_component(
+                threads_component, StacktraceGroupingComponent
+            )
+            assert stacktrace_component
+
+            assert stacktrace_component.frame_counts == Counter(
+                system_non_contributing_frames=20,
+                system_contributing_frames=12,
+                in_app_non_contributing_frames=20,
+                in_app_contributing_frames=13,
+            )
+            assert threads_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},
diff --git a/tests/sentry/grouping/test_grouphash_metadata.py b/tests/sentry/grouping/test_grouphash_metadata.py
index 6ea285b3702e19..49cdab776e3b9e 100644
--- a/tests/sentry/grouping/test_grouphash_metadata.py
+++ b/tests/sentry/grouping/test_grouphash_metadata.py
@@ -1,7 +1,6 @@
 from __future__ import annotations
 
-from typing import cast
-from unittest.mock import MagicMock, patch
+from unittest.mock import Mock, patch
 
 import pytest
 
@@ -17,6 +16,7 @@
 from sentry.models.grouphashmetadata import GroupHashMetadata, HashBasis
 from sentry.models.project import Project
 from sentry.projectoptions.defaults import DEFAULT_GROUPING_CONFIG
+from sentry.testutils.helpers.options import override_options
 from sentry.testutils.pytest.fixtures import InstaSnapshotter, django_db_all
 from tests.sentry.grouping import (
     GROUPING_INPUTS_DIR,
@@ -27,15 +27,11 @@
     with_grouping_inputs,
 )
 
-
-class DummyProject:
-    id: int = 11211231
-
-
-dummy_project = cast(Project, DummyProject())
+dummy_project = Mock(id=11211231)
 
 
 @with_grouping_inputs("grouping_input", GROUPING_INPUTS_DIR)
+@override_options({"grouping.experiments.parameterization.uniq_id": 0})
 @pytest.mark.parametrize(
     "config_name",
     set(CONFIGURATIONS.keys()) - {DEFAULT_GROUPING_CONFIG},
@@ -55,7 +51,7 @@ def test_hash_basis_with_legacy_configs(
     event = grouping_input.create_event(config_name, use_full_ingest_pipeline=False)
 
     # This ensures we won't try to touch the DB when getting event variants
-    event.project = None  # type: ignore[assignment]
+    event.project = dummy_project
 
     _assert_and_snapshot_results(event, config_name, grouping_input.filename, insta_snapshot)
 
@@ -120,7 +116,7 @@ def test_unknown_hash_basis(
     with patch.object(
         event,
         "get_grouping_variants",
-        new=MagicMock(return_value={"dogs": ComponentVariant(component, StrategyConfiguration())}),
+        return_value={"dogs": ComponentVariant(component, None, 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.
diff --git a/tests/sentry/grouping/test_normalize_message.py b/tests/sentry/grouping/test_normalize_message.py
deleted file mode 100644
index 72a318b8b46e89..00000000000000
--- a/tests/sentry/grouping/test_normalize_message.py
+++ /dev/null
@@ -1,220 +0,0 @@
-import pytest
-
-from sentry.eventstore.models import Event
-from sentry.grouping.strategies.message import normalize_message_for_grouping
-from sentry.testutils.helpers.options import override_options
-
-
-@pytest.mark.parametrize(
-    ("name", "input", "expected"),
-    [
-        ("email", """blah test@email.com had a problem""", """blah <email> had a problem"""),
-        ("url", """blah http://some.email.com had a problem""", """blah <url> had a problem"""),
-        (
-            "url - existing behavior",
-            """blah tcp://user:pass@email.com:10 had a problem""",
-            """blah tcp://user:<email>:<int> had a problem""",
-        ),
-        ("ip", """blah 0.0.0.0 had a problem""", """blah <ip> had a problem"""),
-        (
-            "UUID",
-            """blah 7c1811ed-e98f-4c9c-a9f9-58c757ff494f had a problem""",
-            """blah <uuid> had a problem""",
-        ),
-        (
-            "UUID",
-            """blah bea691f2-2e25-4bec-6838-e0c44b03d60a/7c1811ed-e98f-4c9c-a9f9-58c757ff494f had a problem""",
-            """blah <uuid>/<uuid> had a problem""",
-        ),
-        (
-            "SHA1",
-            """blah 5fc35719b9cf96ec602dbc748ff31c587a46961d had a problem""",
-            """blah <sha1> had a problem""",
-        ),
-        (
-            "MD5",
-            """blah 0751007cd28df267e8e051b51f918c60 had a problem""",
-            """blah <md5> had a problem""",
-        ),
-        (
-            "Date",
-            """blah 2024-02-20T22:16:36 had a problem""",
-            """blah <date> had a problem""",
-        ),
-        (
-            "Date RFC822",
-            """blah Mon, 02 Jan 06 15:04 MST had a problem""",
-            """blah <date> had a problem""",
-        ),
-        (
-            "Date RFC822Z",
-            """blah Mon, 02 Jan 06 15:04 -0700 had a problem""",
-            """blah <date> had a problem""",
-        ),
-        (
-            "Date RFC850",
-            """blah Monday, 02-Jan-06 15:04:05 MST had a problem""",
-            """blah <date> had a problem""",
-        ),
-        (
-            "Date RFC1123",
-            """blah Mon, 02 Jan 2006 15:04:05 MST had a problem""",
-            """blah <date> had a problem""",
-        ),
-        (
-            "Date RFC1123Z",
-            """blah Mon, 02 Jan 2006 15:04:05 -0700 had a problem""",
-            """blah <date> had a problem""",
-        ),
-        (
-            "Date RFC3339",
-            """blah 2006-01-02T15:04:05Z07:00 had a problem""",
-            """blah <date> had a problem""",
-        ),
-        (
-            "Date RFC3339Nano",
-            """blah 2006-01-02T15:04:05.999999999Z07:00 had a problem""",
-            """blah <date> had a problem""",
-        ),
-        ("Date - plain", """blah 2006-01-02 had a problem""", """blah <date> had a problem"""),
-        ("Date - long", """blah Jan 18, 2019 had a problem""", """blah <date> had a problem"""),
-        (
-            "Date - Datetime",
-            """blah 2006-01-02 15:04:05 had a problem""",
-            """blah <date> had a problem""",
-        ),
-        ("Date - Kitchen", """blah 3:04PM had a problem""", """blah <date> had a problem"""),
-        ("Date - Time", """blah 15:04:05 had a problem""", """blah <date> had a problem"""),
-        (
-            "Date - basic",
-            """blah Mon Jan 02, 1999 had a problem""",
-            """blah <date> had a problem""",
-        ),
-        (
-            "Datetime - compressed",
-            """blah 20240220 11:55:33.546593 had a problem""",
-            """blah <date> had a problem""",
-        ),
-        (
-            "Datetime - datestamp",
-            """blah 2024-02-23 02:13:53.418 had a problem""",
-            """blah <date> had a problem""",
-        ),
-        ("hex", """blah 0x9af8c3b had a problem""", """blah <hex> had a problem"""),
-        ("float", """blah 0.23 had a problem""", """blah <float> had a problem"""),
-        ("int", """blah 23 had a problem""", """blah <int> had a problem"""),
-        ("quoted str", """blah b="1" had a problem""", """blah b=<quoted_str> had a problem"""),
-        ("bool", """blah a=true had a problem""", """blah a=<bool> had a problem"""),
-        (
-            "Duration - ms",
-            """blah connection failed after 12345ms 1.899s 3s""",
-            """blah connection failed after <duration> <duration> <duration>""",
-        ),
-        (
-            "Hostname - 2 levels",
-            """Blocked 'connect' from 'gggggggdasdwefwewqqqfefwef.com'""",
-            """Blocked 'connect' from '<hostname>'""",
-        ),
-        (
-            "Hostname - 3 levels",
-            """Blocked 'font' from 'www.time.co'""",
-            """Blocked 'font' from '<hostname>'""",
-        ),
-        (
-            "Uniq ID - sql savepoint",
-            '''SQL: RELEASE SAVEPOINT "s140177518376768_x2"''',
-            """SQL: RELEASE SAVEPOINT <uniq_id>""",
-        ),
-        (
-            "Uniq ID - api gateway",
-            """API gateway VdLchF7iDo8sVkg= blah""",
-            """API gateway <uniq_id> blah""",
-        ),
-        (
-            "Uniq ID - fb trace",
-            """fbtrace_id Aba64NMEPMmBwi_cPLaGeeK AugPfq0jxGbto4u3kxn8u6p blah""",
-            """fbtrace_id <uniq_id> <uniq_id> blah""",
-        ),
-        (
-            "Uniq ID - word with numerical pre/suffix",
-            """1password python3 abc123 123abc""",
-            """1password python3 abc123 123abc""",
-        ),
-        (
-            "Uniq ID - cloudflare trace",
-            """cloudflare trace 230b030023ae2822-SJC 819cc532aex26akb-SNP blah""",
-            """cloudflare trace <uniq_id> <uniq_id> blah""",
-        ),
-        (
-            "Uniq ID - JWT",
-            """blah eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c""",
-            """blah <uniq_id>""",
-        ),
-        (
-            "Uniq ID - Nothing to replace",
-            """I am the test words 1password python3 abc123 123abc""",
-            """I am the test words 1password python3 abc123 123abc""",
-        ),
-        (
-            "Uniq ID - react element",
-            """Permission denied to access property "__reactFiber$b6c78e70asw" """,
-            """Permission denied to access property <uniq_id> """,
-        ),
-        (
-            "Uniq ID - no change variable name",
-            """TypeError: Cannot read property 'startRTM' of undefined""",
-            """TypeError: Cannot read property 'startRTM' of undefined""",
-        ),
-        (
-            "Uniq ID - json ignored properly",
-            """[401,""]""",
-            """[<int>,""]""",
-        ),
-        (
-            "Uniq ID - no change",
-            """Blocked 'script' from 'wasm-eval:'""",
-            """Blocked 'script' from 'wasm-eval:'""",
-        ),
-    ],
-)
-def test_normalize_message(name, input, expected):
-    event = Event(project_id=1, event_id="something")
-    with override_options(
-        {
-            "grouping.experiments.parameterization.uniq_id": 100,
-        }
-    ):
-        assert expected == normalize_message_for_grouping(input, event), f"Case {name} Failed"
-
-
-# These are test cases that we should fix
-@pytest.mark.xfail()
-@pytest.mark.parametrize(
-    ("name", "input", "expected"),
-    [
-        (
-            "URL - non-http protocol user/pass/port",
-            """blah tcp://user:pass@email.com:10 had a problem""",
-            """blah <url> had a problem""",
-        ),
-        ("URL - IP w/ port", """blah 0.0.0.0:10 had a problem""", """blah <ip> had a problem"""),
-        (
-            "Int - parens",
-            """Tb.Worker {"msg" => "(#239323) Received ...""",
-            """Tb.Worker {"msg" => "(#<int>) Received ...""",
-        ),
-        (
-            "Uniq ID - Snuba query",
-            """Error running query: SELECT (divide(plus(sumMergeIf((value AS _snuba_value), equals((arrayElement(tags.raw_value, indexOf(tags.key, 9223372036854776026)) AS `_snuba_tags_raw[9223372036854776026]`), 'satisfactory') AND equals((metric_id AS _snuba_metric_id), 9223372036854775936)), divide(sumMergeIf(_snuba_value, equals(`_snuba_tags_raw[9223372036854776026]`, 'tolerable') AND equals(_snuba_metric_id, 9223372036854775936)), 2)), sumMergeIf(_snuba_value, equals(_snuba_metric_id, 9223372036854775936))) AS `_snuba_c:transactions/on_demand@none`) FROM generic_metric_counters_aggregated_dist WHERE equals(granularity, 1) AND equals((org_id AS _snuba_org_id), 1383997) AND in((project_id AS _snuba_project_id), [6726638]) AND greaterOrEquals((timestamp AS _snuba_timestamp), toDateTime('2024-03-18T22:52:00', 'Universal')) AND less(_snuba_timestamp, toDateTime('2024-03-18T23:22:00', 'Universal')) AND equals((arrayElement(tags.raw_value, indexOf(tags.key, 9223372036854776069)) AS `_snuba_tags_raw[9223372036854776069]`), '2d896d92') AND in(_s...}""",
-            """Error running query: SELECT (divide(plus(sumMergeIf((value AS _snuba_value), equals((arrayElement(tags.raw_value, indexOf(tags.key, <int>)) AS `_snuba_tags_raw[<int>]`), 'satisfactory') AND equals((metric_id AS _snuba_metric_id), <int>)), divide(sumMergeIf(_snuba_value, equals(`_snuba_tags_raw[<int>]`, 'tolerable') AND equals(_snuba_metric_id, <int>)), 2)), sumMergeIf(_snuba_value, equals(_snuba_metric_id, <int>))) AS `_snuba_c:transactions/on_demand@none`) FROM generic_metric_counters_aggregated_dist WHERE equals(granularity, 1) AND equals((org_id AS _snuba_org_id), <int>) AND in((project_id AS _snuba_project_id), [<int>]) AND greaterOrEquals((timestamp AS _snuba_timestamp), toDateTime('2024-03-18T22:52:00', 'Universal')) AND less(_snuba_timestamp, toDateTime('<date>', 'Universal')) AND equals((arrayElement(tags.raw_value, indexOf(tags.key, <int>)) AS `_snuba_tags_raw[<int>]`), '<uniq_id>') AND in(_s...}""",
-        ),
-    ],
-)
-def test_fail_to_normalize_message(name, input, expected):
-    event = Event(project_id=1, event_id="something")
-    with override_options(
-        {
-            "grouping.experiments.parameterization.uniq_id": 100,
-        }
-    ):
-        assert expected == normalize_message_for_grouping(input, event), f"Case {name} Failed"
diff --git a/tests/sentry/grouping/test_parameterization.py b/tests/sentry/grouping/test_parameterization.py
index 8c8d094368a8fa..05b128439a58ed 100644
--- a/tests/sentry/grouping/test_parameterization.py
+++ b/tests/sentry/grouping/test_parameterization.py
@@ -241,8 +241,8 @@ def test_parameterize_regex_experiment():
         regex_pattern_keys=(),
         experiments=(FooExperiment,),
     )
-    input = "blah foobarbaz fooooo"
-    normalized = parameterizer.parameterize_all(input)
+    input_str = "blah foobarbaz fooooo"
+    normalized = parameterizer.parameterize_all(input_str)
     assert normalized == "blah <foo>barbaz <foo>ooo"
     assert len(parameterizer.get_successful_experiments()) == 1
     assert parameterizer.get_successful_experiments()[0] == FooExperiment
@@ -261,9 +261,9 @@ def test_parameterize_regex_experiment_cached_compiled():
             regex_pattern_keys=(),
             experiments=(FooExperiment,),
         )
-        input = "blah foobarbaz fooooo"
-        _ = parameterizer.parameterize_all(input)
-        _ = parameterizer.parameterize_all(input)
+        input_str = "blah foobarbaz fooooo"
+        _ = parameterizer.parameterize_all(input_str)
+        _ = parameterizer.parameterize_all(input_str)
 
     mocked_pattern.assert_called_once()
 
diff --git a/tests/sentry/grouping/test_variants.py b/tests/sentry/grouping/test_variants.py
index f62f691a3e4e20..7d6aa988697214 100644
--- a/tests/sentry/grouping/test_variants.py
+++ b/tests/sentry/grouping/test_variants.py
@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from typing import cast
+from unittest import mock
 
 import pytest
 
@@ -10,6 +11,7 @@
 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.helpers.options import override_options
 from sentry.testutils.pytest.fixtures import InstaSnapshotter, django_db_all
 from tests.sentry.grouping import (
     GROUPING_INPUTS_DIR,
@@ -21,6 +23,7 @@
 
 
 @with_grouping_inputs("grouping_input", GROUPING_INPUTS_DIR)
+@override_options({"grouping.experiments.parameterization.uniq_id": 0})
 @pytest.mark.parametrize(
     "config_name",
     set(CONFIGURATIONS.keys()) - {DEFAULT_GROUPING_CONFIG},
@@ -30,7 +33,7 @@ def test_variants_with_legacy_configs(
     config_name: str, grouping_input: GroupingInput, insta_snapshot: InstaSnapshotter
 ) -> None:
     """
-    Run the variant snapshot tests using an minimal (and much more performant) save process.
+    Run the variant snapshot tests using a minimal (and much more performant) save process.
 
     Because manually cherry-picking only certain parts of the save process to run makes us much more
     likely to fall out of sync with reality, for safety we only do this when testing legacy,
@@ -39,7 +42,7 @@ def test_variants_with_legacy_configs(
     event = grouping_input.create_event(config_name, use_full_ingest_pipeline=False)
 
     # This ensures we won't try to touch the DB when getting event variants
-    event.project = None  # type: ignore[assignment]
+    event.project = mock.Mock(id=11211231)
 
     _assert_and_snapshot_results(event, config_name, grouping_input.filename, insta_snapshot)
 
diff --git a/tests/sentry/hybridcloud/rpc/test_sig.py b/tests/sentry/hybridcloud/rpc/test_sig.py
index 9780d37dfbf0d5..4d70c6c346ac6d 100644
--- a/tests/sentry/hybridcloud/rpc/test_sig.py
+++ b/tests/sentry/hybridcloud/rpc/test_sig.py
@@ -11,7 +11,7 @@ class AnObject(pydantic.BaseModel):
             b: str
 
         def a_function(arg1: AnObject, arg2: AnObject) -> AnObject:
-            return AnObject(a=arg1.a + arg2.a, b=".".join((arg1.b, arg2.b)))
+            raise NotImplementedError
 
         sig = SerializableFunctionSignature(a_function)
         arg_values = dict(arg1=AnObject(a=1, b="foo"), arg2=AnObject(a=2, b="bar"))
diff --git a/tests/sentry/identity/test_oauth2.py b/tests/sentry/identity/test_oauth2.py
index 86beb3fa06e4a4..0b6b69243d8588 100644
--- a/tests/sentry/identity/test_oauth2.py
+++ b/tests/sentry/identity/test_oauth2.py
@@ -12,7 +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.asserts import assert_failure_metric, assert_slo_metric
 from sentry.testutils.cases import TestCase
 from sentry.testutils.silo import control_silo_test
 
@@ -68,10 +68,7 @@ def test_exchange_token_success(
             "redirect_uri": "http://testserver/extensions/default/setup/",
         }
 
-        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
+        assert_slo_metric(mock_record, EventLifecycleOutcome.SUCCESS)
 
     @responses.activate
     def test_exchange_token_success_customer_domains(self, mock_record, mock_integration_const):
@@ -96,10 +93,7 @@ def test_exchange_token_success_customer_domains(self, mock_record, mock_integra
             "redirect_uri": "http://testserver/extensions/default/setup/",
         }
 
-        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
+        assert_slo_metric(mock_record, EventLifecycleOutcome.SUCCESS)
 
     @responses.activate
     def test_exchange_token_ssl_error(self, mock_record, mock_integration_const):
diff --git a/tests/sentry/incidents/action_handlers/test_msteams.py b/tests/sentry/incidents/action_handlers/test_msteams.py
index 09aaba6ba9413e..612282123f0b8d 100644
--- a/tests/sentry/incidents/action_handlers/test_msteams.py
+++ b/tests/sentry/incidents/action_handlers/test_msteams.py
@@ -23,8 +23,10 @@
     TextBlock,
 )
 from sentry.integrations.msteams.spec import MsTeamsMessagingSpec
+from sentry.integrations.types import EventLifecycleOutcome
 from sentry.seer.anomaly_detection.types import StoreDataResponse
 from sentry.silo.base import SiloMode
+from sentry.testutils.asserts import assert_slo_metric
 from sentry.testutils.helpers.datetime import freeze_time
 from sentry.testutils.helpers.features import with_feature
 from sentry.testutils.silo import assume_test_silo_mode
@@ -70,7 +72,8 @@ def setUp(self):
         )
 
     @responses.activate
-    def run_test(self, incident, method):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def run_test(self, incident, method, mock_record):
         from sentry.integrations.msteams.card_builder.incident_attachment import (
             build_incident_attachment,
         )
@@ -92,6 +95,8 @@ def run_test(self, incident, method):
             incident, IncidentStatus(incident.status), metric_value
         )
 
+        assert_slo_metric(mock_record)
+
     @responses.activate
     def test_build_incident_attachment(self):
         from sentry.integrations.msteams.card_builder.incident_attachment import (
@@ -213,3 +218,25 @@ def test_rule_snoozed(self):
             handler.fire(metric_value, IncidentStatus(incident.status))
 
         assert len(responses.calls) == 0
+
+    @responses.activate
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_fire_metric_alert_failure(self, mock_record):
+        self.alert_rule = self.create_alert_rule()
+        incident = self.create_incident(
+            alert_rule=self.alert_rule, status=IncidentStatus.CLOSED.value
+        )
+
+        responses.add(
+            method=responses.POST,
+            url="https://smba.trafficmanager.net/amer/v3/conversations/d_s/activities",
+            status=500,
+            json={},
+        )
+
+        handler = MessagingActionHandler(self.action, incident, self.project, self.spec)
+        metric_value = 1000
+        with self.tasks():
+            getattr(handler, "fire")(metric_value, IncidentStatus(incident.status))
+
+        assert_slo_metric(mock_record, EventLifecycleOutcome.FAILURE)
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 edf682e7591127..0c0810830d7dcc 100644
--- a/tests/sentry/incidents/endpoints/test_organization_alert_rule_details.py
+++ b/tests/sentry/incidents/endpoints/test_organization_alert_rule_details.py
@@ -2,7 +2,6 @@
 
 from copy import deepcopy
 from functools import cached_property
-from typing import Any
 from unittest import mock
 from unittest.mock import patch
 
@@ -56,7 +55,6 @@
 from sentry.testutils.outbox import outbox_runner
 from sentry.testutils.silo import assume_test_silo_mode
 from sentry.testutils.skips import requires_snuba
-from sentry.utils import json
 from tests.sentry.incidents.endpoints.test_organization_alert_rule_index import AlertRuleBase
 
 pytestmark = [requires_snuba]
@@ -1132,20 +1130,6 @@ def test_change_name_of_existing_alert(self):
 class AlertRuleDetailsSlackPutEndpointTest(AlertRuleDetailsBase):
     method = "put"
 
-    def mock_conversations_list(self, channels):
-        return patch(
-            "slack_sdk.web.client.WebClient.conversations_list",
-            return_value=SlackResponse(
-                client=None,
-                http_verb="POST",
-                api_url="https://slack.com/api/conversations.list",
-                req_args={},
-                data={"ok": True, "channels": channels},
-                headers={},
-                status_code=200,
-            ),
-        )
-
     def mock_conversations_info(self, channel):
         return patch(
             "slack_sdk.web.client.WebClient.conversations_info",
@@ -1160,15 +1144,6 @@ def mock_conversations_info(self, channel):
             ),
         )
 
-    def _mock_slack_response(self, url: str, body: dict[str, Any], status: int = 200) -> None:
-        responses.add(
-            method=responses.GET,
-            url=url,
-            status=status,
-            content_type="application/json",
-            body=json.dumps(body),
-        )
-
     def _organization_alert_rule_api_call(
         self,
         channelName: str | None = None,
diff --git a/tests/sentry/incidents/endpoints/test_organization_combined_rule_index_endpoint.py b/tests/sentry/incidents/endpoints/test_organization_combined_rule_index_endpoint.py
index 7fce7aa1733317..8a7b2e6bbf5260 100644
--- a/tests/sentry/incidents/endpoints/test_organization_combined_rule_index_endpoint.py
+++ b/tests/sentry/incidents/endpoints/test_organization_combined_rule_index_endpoint.py
@@ -435,10 +435,7 @@ def test_filter_by_project(self):
             organization=self.org, projects=[self.project2]
         )
         proj_uptime_monitor = self.create_project_uptime_subscription(project=self.project)
-        proj2_uptime_monitor = self.create_project_uptime_subscription(
-            uptime_subscription=self.create_uptime_subscription(url="http://santry.io"),
-            project=self.project2,
-        )
+        proj2_uptime_monitor = self.create_project_uptime_subscription(project=self.project2)
 
         with self.feature(
             [
@@ -631,7 +628,6 @@ def test_team_filter(self):
         )
         unowned_uptime_monitor = self.create_project_uptime_subscription(
             name="Uptime unowned",
-            uptime_subscription=self.create_uptime_subscription(url="http://santry.io"),
         )
 
         with self.feature(
@@ -773,7 +769,6 @@ def test_name_filter(self):
         self.setup_project_and_rules()
         uptime_monitor = self.create_project_uptime_subscription(name="Uptime")
         another_uptime_monitor = self.create_project_uptime_subscription(
-            uptime_subscription=self.create_uptime_subscription(url="https://santry.io"),
             name="yet another Uptime",
         )
         with self.feature(
@@ -946,7 +941,6 @@ def test_status_and_date_triggered_sort_order(self):
         )
         uptime_monitor = self.create_project_uptime_subscription()
         failed_uptime_monitor = self.create_project_uptime_subscription(
-            uptime_subscription=self.create_uptime_subscription(url="https://santry.io"),
             uptime_status=UptimeStatus.FAILED,
         )
         with self.feature(
@@ -1033,12 +1027,10 @@ def test_uptime_feature(self):
         uptime_monitor = self.create_project_uptime_subscription(name="Uptime Monitor")
         other_uptime_monitor = self.create_project_uptime_subscription(
             name="Other Uptime Monitor",
-            uptime_subscription=self.create_uptime_subscription(url="https://santry.io"),
         )
         self.create_project_uptime_subscription(
             name="Onboarding Uptime monitor",
             mode=ProjectUptimeSubscriptionMode.AUTO_DETECTED_ONBOARDING,
-            uptime_subscription=self.create_uptime_subscription(url="https://santry-iz-kool.io"),
         )
 
         request_data = {"name": "Uptime", "project": [self.project.id]}
@@ -1057,12 +1049,10 @@ def test_uptime_feature_name_sort(self):
         self.create_project_uptime_subscription(name="Uptime Monitor")
         self.create_project_uptime_subscription(
             name="Other Uptime Monitor",
-            uptime_subscription=self.create_uptime_subscription(url="https://santry.io"),
         )
         self.create_project_uptime_subscription(
             name="Onboarding Uptime monitor",
             mode=ProjectUptimeSubscriptionMode.AUTO_DETECTED_ONBOARDING,
-            uptime_subscription=self.create_uptime_subscription(url="https://santry-iz-kool.io"),
         )
 
         request_data = {"project": [self.project.id], "sort": "name"}
diff --git a/tests/sentry/incidents/endpoints/test_serializers.py b/tests/sentry/incidents/endpoints/test_serializers.py
index 6af03ad18e3477..180bf1de3f9968 100644
--- a/tests/sentry/incidents/endpoints/test_serializers.py
+++ b/tests/sentry/incidents/endpoints/test_serializers.py
@@ -866,16 +866,6 @@ def other_project(self):
     def alert_rule(self):
         return self.create_alert_rule(projects=[self.project, self.other_project])
 
-    @cached_property
-    def valid_params(self):
-        return {
-            "label": "something",
-            "threshold_type": 0,
-            "resolve_threshold": 1,
-            "alert_threshold": 0,
-            "actions": [{"type": "email", "targetType": "team", "targetIdentifier": self.team.id}],
-        }
-
     @cached_property
     def access(self):
         return from_user(self.user, self.organization)
@@ -888,13 +878,6 @@ def context(self):
             "alert_rule": self.alert_rule,
         }
 
-    def run_fail_validation_test(self, params, errors):
-        base_params = self.valid_params.copy()
-        base_params.update(params)
-        serializer = AlertRuleTriggerSerializer(context=self.context, data=base_params)
-        assert not serializer.is_valid()
-        assert serializer.errors == errors
-
     def test_validation_no_params(self):
         serializer = AlertRuleTriggerSerializer(context=self.context, data={})
         assert not serializer.is_valid()
@@ -906,9 +889,6 @@ def test_validation_no_params(self):
 
 
 class TestAlertRuleTriggerActionSerializer(TestAlertRuleSerializerBase):
-    def mock_conversations_list(self, channels):
-        return mock_slack_response("conversations_list", body={"ok": True, "channels": channels})
-
     def mock_conversations_info(self, channel):
         return mock_slack_response(
             "conversations_info",
@@ -917,14 +897,11 @@ def mock_conversations_info(self, channel):
         )
 
     def patch_msg_schedule_response(self, channel_id, result_name="channel"):
-        if channel_id == "channel_not_found":
-            body = {"ok": False, "error": "channel_not_found"}
-        else:
-            body = {
-                "ok": True,
-                result_name: channel_id,
-                "scheduled_message_id": "Q1298393284",
-            }
+        body = {
+            "ok": True,
+            result_name: channel_id,
+            "scheduled_message_id": "Q1298393284",
+        }
         return mock_slack_response("chat_scheduleMessage", body)
 
     @cached_property
diff --git a/tests/sentry/incidents/test_logic.py b/tests/sentry/incidents/test_logic.py
index 5d6a2117555e85..c5e322d6d6c459 100644
--- a/tests/sentry/incidents/test_logic.py
+++ b/tests/sentry/incidents/test_logic.py
@@ -2372,12 +2372,6 @@ def patch_msg_schedule_response(self, channel_id, result_name="channel"):
         )
 
     def patch_msg_delete_scheduled_response(self, channel_id):
-        if channel_id == "channel_not_found":
-            bodydict = {"ok": False, "error": "channel_not_found"}
-        else:
-            bodydict = {
-                "ok": True,
-            }
         return patch(
             "slack_sdk.web.client.WebClient.chat_deleteScheduledMessage",
             return_value=SlackResponse(
@@ -2385,7 +2379,7 @@ def patch_msg_delete_scheduled_response(self, channel_id):
                 http_verb="POST",
                 api_url="https://slack.com/api/chat.deleteScheduleMessage",
                 req_args={},
-                data=bodydict,
+                data={"ok": True},
                 headers={},
                 status_code=200,
             ),
diff --git a/tests/sentry/incidents/test_subscription_processor.py b/tests/sentry/incidents/test_subscription_processor.py
index 24589e0a4692d9..d7ff092b15028b 100644
--- a/tests/sentry/incidents/test_subscription_processor.py
+++ b/tests/sentry/incidents/test_subscription_processor.py
@@ -13,6 +13,7 @@
 from urllib3.response import HTTPResponse
 
 from sentry.conf.server import SEER_ANOMALY_DETECTION_ENDPOINT_URL
+from sentry.incidents.grouptype import MetricAlertFire
 from sentry.incidents.logic import (
     CRITICAL_TRIGGER_LABEL,
     WARNING_TRIGGER_LABEL,
@@ -50,7 +51,10 @@
     partition,
     update_alert_rule_stats,
 )
-from sentry.incidents.utils.types import AlertRuleActivationConditionType
+from sentry.incidents.utils.types import (
+    DATA_SOURCE_SNUBA_QUERY_SUBSCRIPTION,
+    AlertRuleActivationConditionType,
+)
 from sentry.issues.grouptype import MetricIssuePOC
 from sentry.models.project import Project
 from sentry.seer.anomaly_detection.get_anomaly_data import get_anomaly_data_from_seer
@@ -61,11 +65,10 @@
 )
 from sentry.seer.anomaly_detection.utils import has_anomaly, translate_direction
 from sentry.sentry_metrics.configuration import UseCaseKey
-from sentry.sentry_metrics.indexer.postgres.models import MetricsKeyIndexer
 from sentry.sentry_metrics.utils import resolve_tag_key
 from sentry.snuba.dataset import Dataset
 from sentry.snuba.models import QuerySubscription, SnubaQuery, SnubaQueryEventType
-from sentry.testutils.cases import BaseMetricsTestCase, SnubaTestCase, TestCase
+from sentry.testutils.cases import BaseMetricsTestCase, SnubaTestCase, SpanTestCase, TestCase
 from sentry.testutils.factories import DEFAULT_EVENT_DATA
 from sentry.testutils.helpers.alert_rule import TemporaryAlertRuleTriggerActionRegistry
 from sentry.testutils.helpers.datetime import freeze_time
@@ -80,7 +83,7 @@
 
 
 @freeze_time()
-class ProcessUpdateBaseClass(TestCase, SnubaTestCase):
+class ProcessUpdateBaseClass(TestCase, SpanTestCase, SnubaTestCase):
     @pytest.fixture(autouse=True)
     def _setup_metrics_patch(self):
         with mock.patch("sentry.incidents.subscription_processor.metrics") as self.metrics:
@@ -2581,6 +2584,90 @@ def test_comparison_alert_above(self):
             incident, [self.action], [(150, IncidentStatus.CLOSED, mock.ANY)]
         )
 
+    def test_comparison_alert_eap(self):
+        rule = self.comparison_rule_above
+        rule.update(detection_type=AlertRuleDetectionType.PERCENT)
+        rule.snuba_query.update(
+            dataset=Dataset.EventsAnalyticsPlatform,
+            type=SnubaQuery.Type.PERFORMANCE.value,
+        )
+        self.trigger.update(alert_threshold=150)
+        comparison_delta = timedelta(seconds=rule.comparison_delta)
+        trigger = self.trigger
+        processor = self.send_update(
+            rule, trigger.alert_threshold + 1, timedelta(minutes=-10), subscription=self.sub
+        )
+        # Shouldn't trigger, since there should be no data in the comparison period
+        self.assert_trigger_counts(processor, trigger, 0, 0)
+        self.assert_no_active_incident(rule)
+        self.assert_trigger_does_not_exist(trigger)
+        self.assert_action_handler_called_with_actions(None, [])
+        self.metrics.incr.assert_has_calls(
+            [
+                call("incidents.alert_rules.skipping_update_comparison_value_invalid"),
+                call("incidents.alert_rules.skipping_update_invalid_aggregation_value"),
+            ]
+        )
+        comparison_date = timezone.now() - comparison_delta
+
+        spans = []
+        for i in range(4):
+            spans.append(
+                self.create_span(
+                    {
+                        "description": "foo",
+                        "sentry_tags": {"status": "success"},
+                        "tags": {"foo": "five"},
+                    },
+                    measurements={"foo": {"value": 5}},
+                    start_ts=(comparison_date - timedelta(minutes=30 + i)),
+                )
+            )
+
+        self.store_spans(spans, is_eap=True)
+
+        self.metrics.incr.reset_mock()
+        processor = self.send_update(rule, 2, timedelta(minutes=-9), subscription=self.sub)
+        # Shouldn't trigger, since there are 4 events in the comparison period, and 2/4 == 50%
+        self.assert_trigger_counts(processor, trigger, 0, 0)
+        self.assert_no_active_incident(rule)
+        self.assert_trigger_does_not_exist(trigger)
+        self.assert_action_handler_called_with_actions(None, [])
+        assert self.metrics.incr.call_count == 0
+
+        processor = self.send_update(rule, 4, timedelta(minutes=-8), subscription=self.sub)
+        # Shouldn't trigger, since there are 4 events in the comparison period, and 4/4 == 100%, so
+        # no change
+        self.assert_trigger_counts(processor, trigger, 0, 0)
+        self.assert_no_active_incident(rule)
+        self.assert_trigger_does_not_exist(trigger)
+        self.assert_action_handler_called_with_actions(None, [])
+
+        processor = self.send_update(rule, 6, timedelta(minutes=-7), subscription=self.sub)
+        # Shouldn't trigger, 6/4 == 150%, but we want > 150%
+        self.assert_trigger_counts(processor, trigger, 0, 0)
+        self.assert_no_active_incident(rule)
+        self.assert_trigger_does_not_exist(trigger)
+        self.assert_action_handler_called_with_actions(None, [])
+
+        processor = self.send_update(rule, 7, timedelta(minutes=-6), subscription=self.sub)
+        # Should trigger, 7/4 == 175% > 150%
+        self.assert_trigger_counts(processor, trigger, 0, 0)
+        incident = self.assert_active_incident(rule)
+        self.assert_trigger_exists_with_status(incident, trigger, TriggerStatus.ACTIVE)
+        self.assert_actions_fired_for_incident(
+            incident, [self.action], [(175.0, IncidentStatus.CRITICAL, mock.ANY)]
+        )
+
+        # Check we successfully resolve
+        processor = self.send_update(rule, 6, timedelta(minutes=-5), subscription=self.sub)
+        self.assert_trigger_counts(processor, self.trigger, 0, 0)
+        self.assert_no_active_incident(rule)
+        self.assert_trigger_exists_with_status(incident, trigger, TriggerStatus.RESOLVED)
+        self.assert_actions_resolved_for_incident(
+            incident, [self.action], [(150, IncidentStatus.CLOSED, mock.ANY)]
+        )
+
     def test_comparison_alert_below(self):
         rule = self.comparison_rule_below
         comparison_delta = timedelta(seconds=rule.comparison_delta)
@@ -2956,6 +3043,23 @@ def test_resolved_alert_updates_metric_issue(self, mock_produce_occurrence_to_ka
         assert status_change.new_status == GroupStatus.RESOLVED
         assert occurrence.fingerprint == status_change.fingerprint
 
+    @with_feature("organizations:workflow-engine-metric-alert-processing")
+    @mock.patch("sentry.incidents.subscription_processor.process_data_packets")
+    def test_process_data_packets_called(self, mock_process_data_packets):
+        rule = self.rule
+        detector = self.create_detector(name="hojicha", type=MetricAlertFire.slug)
+        data_source = self.create_data_source(query_id=self.sub.id)
+        data_source.detectors.set([detector])
+        self.send_update(rule, 10)
+        assert mock_process_data_packets.call_count == 1
+        assert (
+            mock_process_data_packets.call_args_list[0][0][1]
+            == DATA_SOURCE_SNUBA_QUERY_SUBSCRIPTION
+        )
+        data_packet_list = mock_process_data_packets.call_args_list[0][0][0]
+        assert data_packet_list[0].query_id == self.sub.id
+        assert data_packet_list[0].packet["values"] == {"data": [{"some_col_name": 10}]}
+
 
 class MetricsCrashRateAlertProcessUpdateTest(ProcessUpdateBaseClass, BaseMetricsTestCase):
     @pytest.fixture(autouse=True)
@@ -3334,7 +3438,8 @@ def test_crash_rate_alert_for_sessions_with_triggers_lower_than_resolve_threshol
         )
         self.assert_active_incident(rule)
 
-    def test_crash_rate_alert_for_sessions_with_no_sessions_data(self):
+    @patch("sentry.incidents.utils.process_update_helpers.metrics")
+    def test_crash_rate_alert_for_sessions_with_no_sessions_data(self, helper_metrics):
         """
         Test that ensures we skip the Crash Rate Alert processing if we have no sessions data
         """
@@ -3345,16 +3450,22 @@ def test_crash_rate_alert_for_sessions_with_no_sessions_data(self):
             value=None,
             subscription=rule.snuba_query.subscriptions.filter(project=self.project).get(),
         )
-        self.metrics.incr.assert_has_calls(
+        helper_metrics.incr.assert_has_calls(
             [
                 call("incidents.alert_rules.ignore_update_no_session_data"),
+            ]
+        )
+        self.metrics.incr.assert_has_calls(
+            [
                 call("incidents.alert_rules.skipping_update_invalid_aggregation_value"),
-            ],
-            any_order=True,
+            ]
         )
 
-    @patch("sentry.incidents.subscription_processor.CRASH_RATE_ALERT_MINIMUM_THRESHOLD", 30)
-    def test_crash_rate_alert_when_session_count_is_lower_than_minimum_threshold(self):
+    @patch("sentry.incidents.utils.process_update_helpers.CRASH_RATE_ALERT_MINIMUM_THRESHOLD", 30)
+    @patch("sentry.incidents.utils.process_update_helpers.metrics")
+    def test_crash_rate_alert_when_session_count_is_lower_than_minimum_threshold(
+        self, helper_metrics
+    ):
         rule = self.crash_rate_alert_rule
         trigger = self.crash_rate_alert_critical_trigger
 
@@ -3368,15 +3479,18 @@ def test_crash_rate_alert_when_session_count_is_lower_than_minimum_threshold(sel
             subscription=rule.snuba_query.subscriptions.filter(project=self.project).get(),
         )
         self.assert_no_active_incident(rule)
-        self.metrics.incr.assert_has_calls(
+        helper_metrics.incr.assert_has_calls(
             [
                 call("incidents.alert_rules.ignore_update_count_lower_than_min_threshold"),
+            ]
+        )
+        self.metrics.incr.assert_has_calls(
+            [
                 call("incidents.alert_rules.skipping_update_invalid_aggregation_value"),
-            ],
-            any_order=True,
+            ]
         )
 
-    @patch("sentry.incidents.subscription_processor.CRASH_RATE_ALERT_MINIMUM_THRESHOLD", 30)
+    @patch("sentry.incidents.utils.process_update_helpers.CRASH_RATE_ALERT_MINIMUM_THRESHOLD", 30)
     def test_crash_rate_alert_when_session_count_is_higher_than_minimum_threshold(self):
         rule = self.crash_rate_alert_rule
         trigger = self.crash_rate_alert_critical_trigger
@@ -3395,7 +3509,8 @@ def test_crash_rate_alert_when_session_count_is_higher_than_minimum_threshold(se
         self.assert_actions_fired_for_incident(incident, [action_critical], None)
         self.assert_trigger_exists_with_status(incident, trigger, TriggerStatus.ACTIVE)
 
-    def test_multiple_threshold_trigger_is_reset_when_no_sessions_data(self):
+    @patch("sentry.incidents.utils.process_update_helpers.metrics")
+    def test_multiple_threshold_trigger_is_reset_when_no_sessions_data(self, helper_metrics):
         rule = self.crash_rate_alert_rule
         rule.update(threshold_period=2)
 
@@ -3421,17 +3536,23 @@ def test_multiple_threshold_trigger_is_reset_when_no_sessions_data(self):
             time_delta=timedelta(minutes=-1),
             subscription=subscription,
         )
-        self.metrics.incr.assert_has_calls(
+        helper_metrics.incr.assert_has_calls(
             [
                 call("incidents.alert_rules.ignore_update_no_session_data"),
-                call("incidents.alert_rules.skipping_update_invalid_aggregation_value"),
             ],
-            any_order=True,
+        )
+        self.metrics.incr.assert_has_calls(
+            [
+                call("incidents.alert_rules.skipping_update_invalid_aggregation_value"),
+            ]
         )
         self.assert_trigger_counts(processor, trigger, 0, 0)
 
-    @patch("sentry.incidents.subscription_processor.CRASH_RATE_ALERT_MINIMUM_THRESHOLD", 30)
-    def test_multiple_threshold_trigger_is_reset_when_count_is_lower_than_min_threshold(self):
+    @patch("sentry.incidents.utils.process_update_helpers.CRASH_RATE_ALERT_MINIMUM_THRESHOLD", 30)
+    @patch("sentry.incidents.utils.process_update_helpers.metrics")
+    def test_multiple_threshold_trigger_is_reset_when_count_is_lower_than_min_threshold(
+        self, helper_metrics
+    ):
         rule = self.crash_rate_alert_rule
         rule.update(threshold_period=2)
 
@@ -3458,16 +3579,20 @@ def test_multiple_threshold_trigger_is_reset_when_count_is_lower_than_min_thresh
             time_delta=timedelta(minutes=-1),
             subscription=subscription,
         )
-        self.metrics.incr.assert_has_calls(
+        helper_metrics.incr.assert_has_calls(
             [
                 call("incidents.alert_rules.ignore_update_count_lower_than_min_threshold"),
+            ],
+        )
+        self.metrics.incr.assert_has_calls(
+            [
                 call("incidents.alert_rules.skipping_update_invalid_aggregation_value"),
             ],
-            any_order=True,
         )
         self.assert_trigger_counts(processor, trigger, 0, 0)
 
-    def test_multiple_threshold_resolve_is_reset_when_no_sessions_data(self):
+    @patch("sentry.incidents.utils.process_update_helpers.metrics")
+    def test_multiple_threshold_resolve_is_reset_when_no_sessions_data(self, helper_metrics):
         rule = self.crash_rate_alert_rule
         trigger = self.crash_rate_alert_critical_trigger
         action_critical = self.crash_rate_alert_critical_action
@@ -3510,20 +3635,26 @@ def test_multiple_threshold_resolve_is_reset_when_no_sessions_data(self):
             value=None,
             subscription=subscription,
         )
-        self.metrics.incr.assert_has_calls(
+        helper_metrics.incr.assert_has_calls(
             [
                 call("incidents.alert_rules.ignore_update_no_session_data"),
-                call("incidents.alert_rules.skipping_update_invalid_aggregation_value"),
             ],
-            any_order=True,
+        )
+        self.metrics.incr.assert_has_calls(
+            [
+                call("incidents.alert_rules.skipping_update_invalid_aggregation_value"),
+            ]
         )
         self.assert_trigger_counts(processor, trigger, 0, 0)
         self.assert_active_incident(rule)
         self.assert_trigger_exists_with_status(incident, trigger, TriggerStatus.ACTIVE)
         self.assert_action_handler_called_with_actions(incident, [])
 
-    @patch("sentry.incidents.subscription_processor.CRASH_RATE_ALERT_MINIMUM_THRESHOLD", 30)
-    def test_multiple_threshold_resolve_is_reset_when_count_is_lower_than_min_threshold(self):
+    @patch("sentry.incidents.utils.process_update_helpers.CRASH_RATE_ALERT_MINIMUM_THRESHOLD", 30)
+    @patch("sentry.incidents.utils.process_update_helpers.metrics")
+    def test_multiple_threshold_resolve_is_reset_when_count_is_lower_than_min_threshold(
+        self, helper_metrics
+    ):
         rule = self.crash_rate_alert_rule
         trigger = self.crash_rate_alert_critical_trigger
         action_critical = self.crash_rate_alert_critical_action
@@ -3564,20 +3695,25 @@ def test_multiple_threshold_resolve_is_reset_when_count_is_lower_than_min_thresh
             count=10,
             subscription=subscription,
         )
-        self.metrics.incr.assert_has_calls(
+        helper_metrics.incr.assert_has_calls(
             [
                 call("incidents.alert_rules.ignore_update_count_lower_than_min_threshold"),
-                call("incidents.alert_rules.skipping_update_invalid_aggregation_value"),
             ],
-            any_order=True,
+        )
+        self.metrics.incr.assert_has_calls(
+            [
+                call("incidents.alert_rules.skipping_update_invalid_aggregation_value"),
+            ]
         )
         self.assert_trigger_counts(processor, trigger, 0, 0)
         self.assert_active_incident(rule)
         self.assert_trigger_exists_with_status(incident, trigger, TriggerStatus.ACTIVE)
         self.assert_action_handler_called_with_actions(incident, [])
 
-    def test_ensure_case_when_no_metrics_index_not_found_is_handled_gracefully(self):
-        MetricsKeyIndexer.objects.all().delete()
+    @patch("sentry.incidents.utils.process_update_helpers.metrics")
+    def test_ensure_case_when_no_metrics_index_not_found_is_handled_gracefully(
+        self, helper_metrics
+    ):
         rule = self.crash_rate_alert_rule
         subscription = rule.snuba_query.subscriptions.filter(project=self.project).get()
         processor = SubscriptionProcessor(subscription)
@@ -3599,12 +3735,16 @@ def test_ensure_case_when_no_metrics_index_not_found_is_handled_gracefully(self)
             }
         )
         self.assert_no_active_incident(rule)
-        self.metrics.incr.assert_has_calls(
+        helper_metrics.incr.assert_has_calls(
             [
                 call("incidents.alert_rules.ignore_update_no_session_data"),
+            ]
+        )
+
+        self.metrics.incr.assert_has_calls(
+            [
                 call("incidents.alert_rules.skipping_update_invalid_aggregation_value"),
-            ],
-            any_order=True,
+            ]
         )
 
 
diff --git a/tests/sentry/ingest/ingest_consumer/test_ingest_consumer_kafka.py b/tests/sentry/ingest/ingest_consumer/test_ingest_consumer_kafka.py
index e795bf95b18a1a..c330efcf47aa20 100644
--- a/tests/sentry/ingest/ingest_consumer/test_ingest_consumer_kafka.py
+++ b/tests/sentry/ingest/ingest_consumer/test_ingest_consumer_kafka.py
@@ -49,7 +49,7 @@ def inner(type, project=default_project):
                 "event_id": event_id,
             }
         else:
-            raise ValueError(type)
+            raise AssertionError(type)
 
         em = EventManager(event, project=project)
         em.normalize()
diff --git a/tests/sentry/integrations/api/endpoints/test_user_organizationintegration.py b/tests/sentry/integrations/api/endpoints/test_user_organizationintegration.py
index d8168f289f7039..c2c58226bdc6a6 100644
--- a/tests/sentry/integrations/api/endpoints/test_user_organizationintegration.py
+++ b/tests/sentry/integrations/api/endpoints/test_user_organizationintegration.py
@@ -1,7 +1,41 @@
+from unittest.mock import patch
+
+import orjson
+
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.silo import control_silo_test
 
 
+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)
+
+
 @control_silo_test
 class UserOrganizationIntegationTest(APITestCase):
     endpoint = "sentry-api-0-user-organization-integrations"
@@ -20,3 +54,21 @@ def test_simple(self):
 
         response = self.get_success_response(self.user.id)
         assert response.data[0]["organizationId"] == self.organization.id
+
+    def test_billing_users_dont_see_integrations(self):
+        integration = self.create_provider_integration(provider="github")
+
+        self.create_organization_integration(
+            organization_id=self.organization.id, integration_id=integration.id
+        )
+
+        mock_org_roles = MockOrganizationRoles()
+        with patch("sentry.roles.organization_roles.get", mock_org_roles.get):
+            alice = self.create_user()
+            self.create_member(user=alice, organization=self.organization, role="alice")
+            self.login_as(alice)
+
+            response = self.get_success_response(alice.id)
+            assert response.status_code == 200
+            content = orjson.loads(response.content)
+            assert content == []
diff --git a/tests/sentry/integrations/bitbucket/test_repository.py b/tests/sentry/integrations/bitbucket/test_repository.py
index 0ef575bb54ea73..0e6f656573a9a5 100644
--- a/tests/sentry/integrations/bitbucket/test_repository.py
+++ b/tests/sentry/integrations/bitbucket/test_repository.py
@@ -135,7 +135,7 @@ def test_repository_external_slug(self):
     def test_get_repository_data_no_installation_id(self):
         with pytest.raises(IntegrationError) as e:
             self.provider.get_repository_data(self.organization, {})
-            assert "requires an integration id" in str(e)
+        assert "requires an integration id" in str(e.value)
 
 
 class BitbucketCreateRepositoryTestCase(IntegrationRepositoryTestCase):
diff --git a/tests/sentry/integrations/bitbucket_server/test_repository.py b/tests/sentry/integrations/bitbucket_server/test_repository.py
index fe6c7708da8206..525d12360f8b11 100644
--- a/tests/sentry/integrations/bitbucket_server/test_repository.py
+++ b/tests/sentry/integrations/bitbucket_server/test_repository.py
@@ -253,4 +253,4 @@ def test_repository_external_slug(self):
     def test_get_repository_data_no_installation_id(self):
         with pytest.raises(IntegrationError) as e:
             self.provider.get_repository_data(self.organization, {})
-            assert "requires an integration id" in str(e)
+        assert "requires an integration id" in str(e.value)
diff --git a/tests/sentry/integrations/bitbucket_server/test_webhook.py b/tests/sentry/integrations/bitbucket_server/test_webhook.py
index 55ba3291c17ec5..9de1837d6f9d13 100644
--- a/tests/sentry/integrations/bitbucket_server/test_webhook.py
+++ b/tests/sentry/integrations/bitbucket_server/test_webhook.py
@@ -3,7 +3,6 @@
 from unittest.mock import patch
 
 import orjson
-import pytest
 import responses
 from requests.exceptions import ConnectionError
 
@@ -141,14 +140,13 @@ def test_webhook_error_metric(self, mock_record, mock_event):
         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,
-            )
+        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)
 
@@ -234,5 +232,5 @@ def test_handle_unreachable_host(self):
             self.integration.id,
             raw_data=orjson.dumps(payload),
             extra_headers=dict(HTTP_X_EVENT_KEY="repo:refs_changed"),
-            status_code=409,
+            status_code=400,
         )
diff --git a/tests/sentry/integrations/discord/test_issue_alert.py b/tests/sentry/integrations/discord/test_issue_alert.py
index 4a8b3a809ce940..15feb511e8d5ef 100644
--- a/tests/sentry/integrations/discord/test_issue_alert.py
+++ b/tests/sentry/integrations/discord/test_issue_alert.py
@@ -16,10 +16,11 @@
     get_title_link,
 )
 from sentry.integrations.services.integration import integration_service
-from sentry.integrations.types import ExternalProviders
+from sentry.integrations.types import EventLifecycleOutcome, ExternalProviders
 from sentry.models.group import GroupStatus
 from sentry.models.release import Release
 from sentry.shared_integrations.exceptions import ApiTimeoutError
+from sentry.testutils.asserts import assert_slo_metric
 from sentry.testutils.cases import RuleTestCase, TestCase
 from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.skips import requires_snuba
@@ -67,6 +68,20 @@ def setUp(self):
             status=200,
         )
 
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def assert_lifecycle_metrics(self, mock_record_event):
+        notification_uuid = str(uuid4())
+        self.rule.after(self.event, notification_uuid=notification_uuid)
+
+        assert_slo_metric(mock_record_event)
+
+    @mock.patch(
+        "sentry.integrations.discord.client.DiscordClient.send_message", side_effect=Exception
+    )
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def assert_lifecycle_metrics_failure(self, mock_record_event, mock_send_message):
+        assert_slo_metric(mock_record_event, EventLifecycleOutcome.FAILURE)
+
     @responses.activate
     @mock.patch("sentry.analytics.record")
     def test_basic(self, mock_record):
diff --git a/tests/sentry/integrations/discord/test_uninstall.py b/tests/sentry/integrations/discord/test_uninstall.py
index 1ce4af5823b1ee..fa28cccc65973f 100644
--- a/tests/sentry/integrations/discord/test_uninstall.py
+++ b/tests/sentry/integrations/discord/test_uninstall.py
@@ -9,10 +9,9 @@
 from sentry.integrations.models.integration import Integration
 from sentry.integrations.models.organization_integration import OrganizationIntegration
 from sentry.models.organization import Organization
-from sentry.silo.base import SiloMode
 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.testutils.silo import control_silo_test
 from sentry.users.models.user import User
 from sentry.users.services.user.model import RpcUser
 
@@ -28,19 +27,14 @@ class DiscordUninstallTest(APITestCase):
     def setUp(self) -> None:
         self.integration = self.create_discord_integration(self.organization, self.user)
         self.login_as(self.user)
-        return
 
     def create_discord_integration(
         self,
         organization: Organization,
-        user: RpcUser | User | None,
+        user: RpcUser | User,
         guild_id: str = GUILD_ID,
         **kwargs: Any,
     ):
-        if user is None:
-            with assume_test_silo_mode(SiloMode.REGION):
-                user = organization.get_default_owner()
-
         integration = Factories.create_integration(
             provider="discord",
             name="Cool server",
diff --git a/tests/sentry/integrations/discord/webhooks/test_command.py b/tests/sentry/integrations/discord/webhooks/test_command.py
index 8388f06b0a4d54..e5061b6ef500d8 100644
--- a/tests/sentry/integrations/discord/webhooks/test_command.py
+++ b/tests/sentry/integrations/discord/webhooks/test_command.py
@@ -6,7 +6,7 @@
 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.asserts import assert_failure_metric, assert_slo_metric
 from sentry.testutils.cases import APITestCase
 
 WEBHOOK_URL = "/extensions/discord/interactions/"
@@ -48,9 +48,7 @@ def test_link_no_integration(self, mock_record):
             )
         assert resp.status_code == 200
 
-        start, failure = mock_record.mock_calls
-        assert start.args[0] == EventLifecycleOutcome.STARTED
-        assert failure.args[0] == EventLifecycleOutcome.FAILURE
+        assert_slo_metric(mock_record, EventLifecycleOutcome.FAILURE)
         assert_failure_metric(mock_record, MessageCommandFailureReason.MISSING_DATA.value)
 
     @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
@@ -79,9 +77,7 @@ def test_link_no_user_id(self, mock_record):
             )
         assert resp.status_code == 200
 
-        start, failure = mock_record.mock_calls
-        assert start.args[0] == EventLifecycleOutcome.STARTED
-        assert failure.args[0] == EventLifecycleOutcome.FAILURE
+        assert_slo_metric(mock_record, EventLifecycleOutcome.FAILURE)
         assert_failure_metric(mock_record, MessageCommandFailureReason.MISSING_DATA.value)
 
     @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
@@ -118,9 +114,7 @@ def test_link_guild(self, mock_record):
             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
+        assert_slo_metric(mock_record, EventLifecycleOutcome.SUCCESS)
 
     @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
     def test_link_dm(self, mock_record):
@@ -156,9 +150,7 @@ def test_link_dm(self, mock_record):
             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
+        assert_slo_metric(mock_record, EventLifecycleOutcome.SUCCESS)
 
     @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
     def test_link_already_linked(self, mock_record):
@@ -205,9 +197,7 @@ def test_link_already_linked(self, mock_record):
             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
+        assert_slo_metric(mock_record, EventLifecycleOutcome.SUCCESS)
 
     @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
     def test_unlink_no_identity(self, mock_record):
@@ -232,9 +222,7 @@ def test_unlink_no_identity(self, mock_record):
             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
+        assert_slo_metric(mock_record, EventLifecycleOutcome.SUCCESS)
 
     @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
     def test_unlink(self, mock_record):
@@ -282,9 +270,7 @@ def test_unlink(self, mock_record):
             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
+        assert_slo_metric(mock_record, EventLifecycleOutcome.SUCCESS)
 
     @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
     def test_help(self, mock_record):
@@ -309,7 +295,4 @@ def test_help(self, mock_record):
             assert data["data"]["flags"] == EPHEMERAL_FLAG
             assert response.status_code == 200
 
-        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
+        assert_slo_metric(mock_record, EventLifecycleOutcome.SUCCESS)
diff --git a/tests/sentry/integrations/discord/webhooks/test_message_component.py b/tests/sentry/integrations/discord/webhooks/test_message_component.py
index 56c5671bd6838c..702aa1e69138d1 100644
--- a/tests/sentry/integrations/discord/webhooks/test_message_component.py
+++ b/tests/sentry/integrations/discord/webhooks/test_message_component.py
@@ -27,6 +27,7 @@
 from sentry.integrations.types import EventLifecycleOutcome
 from sentry.models.release import Release
 from sentry.silo.base import SiloMode
+from sentry.testutils.asserts import assert_slo_metric
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.silo import assume_test_silo_mode
 
@@ -176,10 +177,7 @@ def test_assign(self, mock_record):
         assert response.status_code == 200
         assert self.get_message_content(response) == ASSIGNEE_UPDATED
 
-        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_slo_metric(mock_record, EventLifecycleOutcome.SUCCESS)
 
     def test_resolve_dialog(self):
         response = self.send_interaction(
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 7a051f481d3f72..5a9bb2abb5a17e 100644
--- a/tests/sentry/integrations/github/tasks/test_link_all_repos.py
+++ b/tests/sentry/integrations/github/tasks/test_link_all_repos.py
@@ -12,7 +12,7 @@
 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.asserts import assert_failure_metric, assert_halt_metric, assert_slo_metric
 from sentry.testutils.cases import IntegrationTestCase
 from sentry.testutils.silo import assume_test_silo_mode, control_silo_test
 
@@ -59,9 +59,7 @@ def test_link_all_repos_inactive_integration(self, mock_metrics, mock_record, _)
             "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_slo_metric(mock_record, EventLifecycleOutcome.FAILURE)
         assert_failure_metric(mock_record, LinkAllReposHaltReason.MISSING_INTEGRATION.value)
 
     @responses.activate
@@ -86,9 +84,7 @@ def test_link_all_repos(self, mock_record, _):
         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
+        assert_slo_metric(mock_record, EventLifecycleOutcome.SUCCESS)
 
     @responses.activate
     @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
@@ -127,9 +123,7 @@ def test_link_all_repos_api_response_keyerror(self, mock_record, _):
 
         assert repos[0].name == "getsentry/snuba"
 
-        start, halt = mock_record.mock_calls
-        assert start.args[0] == EventLifecycleOutcome.STARTED
-        assert halt.args[0] == EventLifecycleOutcome.SUCCESS
+        assert_slo_metric(mock_record, EventLifecycleOutcome.SUCCESS)
 
     @responses.activate
     @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
@@ -159,11 +153,7 @@ def test_link_all_repos_api_response_keyerror_single_repo(self, mock_record, _):
             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_slo_metric(mock_record, EventLifecycleOutcome.HALTED)
         assert_halt_metric(mock_record, LinkAllReposHaltReason.REPOSITORY_NOT_CREATED.value)
 
     @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
@@ -178,9 +168,7 @@ def test_link_all_repos_missing_integration(self, mock_metrics, mock_record, _):
             "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_slo_metric(mock_record, EventLifecycleOutcome.FAILURE)
         assert_failure_metric(mock_record, LinkAllReposHaltReason.MISSING_INTEGRATION.value)
 
     @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
@@ -195,9 +183,7 @@ def test_link_all_repos_missing_organization(self, mock_metrics, mock_record, _)
             "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_slo_metric(mock_record, EventLifecycleOutcome.FAILURE)
         assert_failure_metric(mock_record, LinkAllReposHaltReason.MISSING_ORGANIZATION.value)
 
     @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
@@ -219,9 +205,7 @@ def test_link_all_repos_api_error(self, mock_metrics, mock_record, _):
             )
         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
+        assert_slo_metric(mock_record, EventLifecycleOutcome.FAILURE)
 
     @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
     @patch("sentry.integrations.github.integration.metrics")
@@ -245,9 +229,7 @@ def test_link_all_repos_api_error_rate_limited(self, mock_metrics, mock_record,
         )
         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_slo_metric(mock_record, EventLifecycleOutcome.HALTED)
         assert_halt_metric(mock_record, LinkAllReposHaltReason.RATE_LIMITED.value)
 
     @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
@@ -267,9 +249,7 @@ def test_link_all_repos_repo_creation_error(self, mock_metrics, mock_repo, mock_
 
         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_slo_metric(mock_record, EventLifecycleOutcome.HALTED)
         assert_halt_metric(mock_record, LinkAllReposHaltReason.REPOSITORY_NOT_CREATED.value)
 
     @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
@@ -291,6 +271,4 @@ def test_link_all_repos_repo_creation_exception(
                 organization_id=self.organization.id,
             )
 
-        start, halt = mock_record.mock_calls
-        assert start.args[0] == EventLifecycleOutcome.STARTED
-        assert halt.args[0] == EventLifecycleOutcome.FAILURE
+        assert_slo_metric(mock_record, EventLifecycleOutcome.FAILURE)
diff --git a/tests/sentry/integrations/github/test_client.py b/tests/sentry/integrations/github/test_client.py
index b0f0e9e94963b6..a2f8e2cf0823c1 100644
--- a/tests/sentry/integrations/github/test_client.py
+++ b/tests/sentry/integrations/github/test_client.py
@@ -555,7 +555,7 @@ def assert_proxy_request(self, request, is_proxy=True):
                 if is_proxy:
                     assert request.headers[PROXY_OI_HEADER] is not None
 
-        expected_proxy_path = "repos/test-repo/issues"
+        expected_proxy_path = "repos/test-repo/issues/123"
         control_proxy_responses = add_control_silo_proxy_response(
             method=responses.GET,
             path=expected_proxy_path,
@@ -572,7 +572,7 @@ def assert_proxy_request(self, request, is_proxy=True):
 
         with override_settings(SILO_MODE=SiloMode.MONOLITH):
             client = GithubProxyTestClient(integration=self.integration)
-            client.get_issues("test-repo")
+            client.get_issue("test-repo", "123")
             request = responses.calls[0].request
 
             assert github_responses.call_count == 1
@@ -583,7 +583,7 @@ def assert_proxy_request(self, request, is_proxy=True):
         responses.calls.reset()
         with override_settings(SILO_MODE=SiloMode.CONTROL):
             client = GithubProxyTestClient(integration=self.integration)
-            client.get_issues("test-repo")
+            client.get_issue("test-repo", "123")
             request = responses.calls[0].request
 
             assert github_responses.call_count == 2
@@ -595,7 +595,7 @@ def assert_proxy_request(self, request, is_proxy=True):
         assert control_proxy_responses.call_count == 0
         with override_settings(SILO_MODE=SiloMode.REGION):
             client = GithubProxyTestClient(integration=self.integration)
-            client.get_issues("test-repo")
+            client.get_issue("test-repo", "123")
             request = responses.calls[0].request
 
             assert control_proxy_responses.call_count == 1
diff --git a/tests/sentry/integrations/github/test_issues.py b/tests/sentry/integrations/github/test_issues.py
index 935a9cfd95f49e..110a0d3202886a 100644
--- a/tests/sentry/integrations/github/test_issues.py
+++ b/tests/sentry/integrations/github/test_issues.py
@@ -282,26 +282,6 @@ def test_error_issues_content(self):
         title = self.install.get_group_title(event.group, event)
         assert title == event.title
 
-    @responses.activate
-    def test_get_repo_issues(self):
-        responses.add(
-            responses.GET,
-            "https://api.github.com/repos/getsentry/sentry/issues",
-            json=[{"number": 321, "title": "hello", "body": "This is the description"}],
-        )
-        assert self.install.get_repo_issues(self.repo) == ((321, "#321 hello"),)
-
-        if self.should_call_api_without_proxying():
-            assert len(responses.calls) == 2
-
-            request = responses.calls[0].request
-            assert request.headers["Authorization"] == "Bearer jwt_token_1"
-
-            request = responses.calls[1].request
-            assert request.headers["Authorization"] == "Bearer token_1"
-        else:
-            self._check_proxying()
-
     @responses.activate
     def test_link_issue(self):
         issue_id = "321"
diff --git a/tests/sentry/integrations/github/test_search.py b/tests/sentry/integrations/github/test_search.py
index 624e7c7f176b19..f8ff0cf59af746 100644
--- a/tests/sentry/integrations/github/test_search.py
+++ b/tests/sentry/integrations/github/test_search.py
@@ -7,7 +7,7 @@
 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.asserts import assert_halt_metric, assert_slo_metric
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.silo import control_silo_test
 from sentry.users.models.identity import Identity
@@ -237,10 +237,7 @@ def test_search_project_rate_limit(self, mock_record):
     def test_missing_field(self, mock_record):
         resp = self.client.get(self.url, data={"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_slo_metric(mock_record, EventLifecycleOutcome.HALTED)
         assert_halt_metric(mock_record, SourceCodeSearchEndpointHaltReason.SERIALIZER_ERRORS.value)
 
     @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
@@ -249,9 +246,7 @@ def test_missing_query(self, mock_record):
 
         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_slo_metric(mock_record, EventLifecycleOutcome.HALTED)
         assert_halt_metric(mock_record, SourceCodeSearchEndpointHaltReason.SERIALIZER_ERRORS.value)
 
     @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
@@ -259,10 +254,7 @@ 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_slo_metric(mock_record, EventLifecycleOutcome.HALTED)
         assert_halt_metric(
             mock_record, SourceCodeSearchEndpointHaltReason.MISSING_REPOSITORY_FIELD.value
         )
@@ -288,10 +280,7 @@ def test_missing_integration(self, mock_record):
         )
 
         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_slo_metric(mock_record, EventLifecycleOutcome.HALTED)
         assert_halt_metric(
             mock_record, SourceCodeSearchEndpointHaltReason.MISSING_INTEGRATION.value
         )
diff --git a/tests/sentry/integrations/github_enterprise/test_issues.py b/tests/sentry/integrations/github_enterprise/test_issues.py
index f09d28d9ea9f64..7f6e8df4ccf03a 100644
--- a/tests/sentry/integrations/github_enterprise/test_issues.py
+++ b/tests/sentry/integrations/github_enterprise/test_issues.py
@@ -165,34 +165,6 @@ def test_create_issue(self, mock_get_jwt):
         else:
             self._check_proxying()
 
-    @responses.activate
-    @patch("sentry.integrations.github_enterprise.client.get_jwt", return_value="jwt_token_1")
-    def test_get_repo_issues(self, mock_get_jwt):
-        responses.add(
-            responses.POST,
-            f"https://{self._IP_ADDRESS}/api/v3/app/installations/installation_id/access_tokens",
-            json={"token": "token_1", "expires_at": "2018-10-11T22:14:10Z"},
-        )
-
-        responses.add(
-            responses.GET,
-            f"https://{self._IP_ADDRESS}/api/v3/repos/getsentry/sentry/issues",
-            json=[{"number": 321, "title": "hello", "body": "This is the description"}],
-        )
-        repo = "getsentry/sentry"
-        assert self.install.get_repo_issues(repo) == ((321, "#321 hello"),)
-
-        if self.should_call_api_without_proxying():
-            assert len(responses.calls) == 2
-
-            request = responses.calls[0].request
-            assert request.headers["Authorization"] == "Bearer jwt_token_1"
-
-            request = responses.calls[1].request
-            assert request.headers["Authorization"] == "Bearer token_1"
-        else:
-            self._check_proxying()
-
     @responses.activate
     @patch("sentry.integrations.github_enterprise.client.get_jwt", return_value="jwt_token_1")
     def test_link_issue(self, mock_get_jwt):
diff --git a/tests/sentry/integrations/jira/test_integration.py b/tests/sentry/integrations/jira/test_integration.py
index d60d28185e54be..5525728fdad5e2 100644
--- a/tests/sentry/integrations/jira/test_integration.py
+++ b/tests/sentry/integrations/jira/test_integration.py
@@ -725,21 +725,6 @@ def test_sync_assignee_outbound_use_email_api(self):
 
 @control_silo_test
 class JiraIntegrationTest(APITestCase):
-    @cached_property
-    def integration(self):
-        integration = self.create_provider_integration(
-            provider="jira",
-            name="Jira Cloud",
-            metadata={
-                "oauth_client_id": "oauth-client-id",
-                "shared_secret": "a-super-secret-key-from-atlassian",
-                "base_url": "https://example.atlassian.net",
-                "domain_name": "example.atlassian.net",
-            },
-        )
-        integration.add_organization(self.organization, self.user)
-        return integration
-
     def setUp(self):
         super().setUp()
         self.min_ago = before_now(minutes=1)
diff --git a/tests/sentry/integrations/middleware/hybrid_cloud/test_base.py b/tests/sentry/integrations/middleware/hybrid_cloud/test_base.py
index 6c8cbf3579bed6..685c2a020b67c1 100644
--- a/tests/sentry/integrations/middleware/hybrid_cloud/test_base.py
+++ b/tests/sentry/integrations/middleware/hybrid_cloud/test_base.py
@@ -6,9 +6,11 @@
 from pytest import raises
 from rest_framework import status
 
+from sentry.constants import ObjectStatus
 from sentry.hybridcloud.models.webhookpayload import WebhookPayload
 from sentry.hybridcloud.outbox.category import WebhookProviderIdentifier
 from sentry.integrations.middleware.hybrid_cloud.parser import BaseRequestParser
+from sentry.integrations.models.organization_integration import OrganizationIntegration
 from sentry.silo.base import SiloLimit, SiloMode
 from sentry.testutils.cases import TestCase
 from sentry.types.region import Region, RegionCategory
@@ -106,3 +108,47 @@ class MockParser(BaseRequestParser):
             assert payload.mailbox_name == "slack:0"
             assert payload.request_path
             assert payload.request_method
+
+    @override_settings(SILO_MODE=SiloMode.CONTROL)
+    def test_get_organizations_from_integration_success(self):
+        integration = self.create_integration(
+            organization=self.organization,
+            provider="test_provider",
+            external_id="test_external_id",
+        )
+        # Create additional org integration to test multiple orgs
+        other_org = self.create_organization()
+        OrganizationIntegration.objects.create(
+            organization_id=other_org.id,
+            integration_id=integration.id,
+            status=ObjectStatus.ACTIVE,
+        )
+
+        parser = BaseRequestParser(self.request, self.response_handler)
+        organizations = parser.get_organizations_from_integration(integration)
+
+        assert len(organizations) == 2
+        org_ids = {org.id for org in organizations}
+        assert self.organization.id in org_ids
+        assert other_org.id in org_ids
+
+    @override_settings(SILO_MODE=SiloMode.CONTROL)
+    @patch("sentry.integrations.middleware.hybrid_cloud.parser.logger.info")
+    def test_get_organizations_from_integration_inactive_org(self, mock_log):
+        integration = self.create_integration(
+            organization=self.organization,
+            provider="test_provider",
+            external_id="test_external_id",
+        )
+
+        other_org = self.create_organization()
+        OrganizationIntegration.objects.create(
+            organization_id=other_org.id,
+            integration_id=integration.id,
+            status=ObjectStatus.DISABLED,
+        )
+
+        parser = BaseRequestParser(self.request, self.response_handler)
+        organizations = parser.get_organizations_from_integration(integration)
+        assert len(organizations) == 1
+        assert organizations[0].id == self.organization.id
diff --git a/tests/sentry/integrations/msteams/test_action_state_change.py b/tests/sentry/integrations/msteams/test_action_state_change.py
index 8ae118901b09f1..a30f2565fb7553 100644
--- a/tests/sentry/integrations/msteams/test_action_state_change.py
+++ b/tests/sentry/integrations/msteams/test_action_state_change.py
@@ -18,7 +18,7 @@
 from sentry.models.group import Group, GroupStatus
 from sentry.models.groupassignee import GroupAssignee
 from sentry.silo.base import SiloMode
-from sentry.testutils.asserts import assert_mock_called_once_with_partial
+from sentry.testutils.asserts import assert_mock_called_once_with_partial, assert_slo_metric
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.silo import assume_test_silo_mode
 from sentry.testutils.skips import requires_snuba
@@ -246,10 +246,7 @@ def test_assign_to_me(self, verify, mock_record):
             "integration": ActivityIntegration.MSTEAMS.value,
         }
 
-        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_slo_metric(mock_record, EventLifecycleOutcome.SUCCESS)
 
     @responses.activate
     @patch("sentry.integrations.msteams.webhook.verify_signature", return_value=True)
diff --git a/tests/sentry/integrations/msteams/test_notify_action.py b/tests/sentry/integrations/msteams/test_notify_action.py
index 01e08979f0de76..6b70fbcd40deed 100644
--- a/tests/sentry/integrations/msteams/test_notify_action.py
+++ b/tests/sentry/integrations/msteams/test_notify_action.py
@@ -1,12 +1,15 @@
 import re
 import time
 from unittest import mock
+from unittest.mock import patch
 
 import orjson
 import responses
 
 from sentry.integrations.models.integration import Integration
 from sentry.integrations.msteams import MsTeamsNotifyServiceAction
+from sentry.integrations.types import EventLifecycleOutcome
+from sentry.testutils.asserts import assert_slo_metric
 from sentry.testutils.cases import PerformanceIssueTestCase, RuleTestCase
 from sentry.testutils.helpers.notifications import TEST_ISSUE_OCCURRENCE, TEST_PERF_ISSUE_OCCURRENCE
 from sentry.testutils.silo import assume_test_silo_mode_of
@@ -40,8 +43,9 @@ def assert_form_valid(self, form, expected_channel_id, expected_channel):
         assert form.cleaned_data["channel"] == expected_channel
 
     @responses.activate
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
     @mock.patch("sentry.analytics.record")
-    def test_applies_correctly(self, mock_record):
+    def test_applies_correctly(self, mock_record, mock_record_event):
         event = self.get_event()
 
         rule = self.get_rule(
@@ -92,13 +96,72 @@ def test_applies_correctly(self, mock_record):
             alert_id=None,
         )
 
+        assert_slo_metric(mock_record_event)
+
     @responses.activate
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    @mock.patch("sentry.analytics.record")
+    def test_client_error(self, mock_record, mock_record_event):
+        event = self.get_event()
+
+        rule = self.get_rule(
+            data={"team": self.integration.id, "channel": "Naboo", "channel_id": "nb"}
+        )
+
+        notification_uuid = "123e4567-e89b-12d3-a456-426614174000"
+        results = list(rule.after(event=event, notification_uuid=notification_uuid))
+        assert len(results) == 1
+
+        responses.add(
+            method=responses.POST,
+            url="https://smba.trafficmanager.net/amer/v3/conversations/nb/activities",
+            status=500,
+            json={},
+        )
+
+        results[0].callback(event, futures=[])
+        data = orjson.loads(responses.calls[0].request.body)
+
+        assert "attachments" in data
+        attachments = data["attachments"]
+        assert len(attachments) == 1
+
+        # Wish there was a better way to do this, but we
+        # can't pass the title and title link separately
+        # with MS Teams cards.
+        title_card = attachments[0]["content"]["body"][0]
+        title_pattern = r"\[%s\](.*)" % event.title
+        assert re.match(title_pattern, title_card["text"])
+        mock_record.assert_called_with(
+            "alert.sent",
+            provider="msteams",
+            alert_id="",
+            alert_type="issue_alert",
+            organization_id=self.organization.id,
+            project_id=self.project.id,
+            external_id="nb",
+            notification_uuid=notification_uuid,
+        )
+        mock_record.assert_any_call(
+            "integrations.msteams.notification_sent",
+            category="issue_alert",
+            organization_id=self.organization.id,
+            project_id=self.project.id,
+            group_id=event.group_id,
+            notification_uuid=notification_uuid,
+            alert_id=None,
+        )
+
+        assert_slo_metric(mock_record_event, EventLifecycleOutcome.FAILURE)
+
+    @responses.activate
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
     @mock.patch(
         "sentry.eventstore.models.GroupEvent.occurrence",
         return_value=TEST_ISSUE_OCCURRENCE,
         new_callable=mock.PropertyMock,
     )
-    def test_applies_correctly_generic_issue(self, occurrence):
+    def test_applies_correctly_generic_issue(self, occurrence, mock_record_event):
         event = self.store_event(
             data={"message": "Hello world", "level": "error"}, project_id=self.project.id
         )
@@ -133,13 +196,16 @@ def test_applies_correctly_generic_issue(self, occurrence):
         )
         assert description["text"] == TEST_ISSUE_OCCURRENCE.evidence_display[0].value
 
+        assert_slo_metric(mock_record_event, EventLifecycleOutcome.SUCCESS)
+
     @responses.activate
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
     @mock.patch(
         "sentry.eventstore.models.GroupEvent.occurrence",
         return_value=TEST_PERF_ISSUE_OCCURRENCE,
         new_callable=mock.PropertyMock,
     )
-    def test_applies_correctly_performance_issue(self, occurrence):
+    def test_applies_correctly_performance_issue(self, occurrence, mock_record_event):
         event = self.create_performance_issue()
 
         rule = self.get_rule(
@@ -173,6 +239,8 @@ def test_applies_correctly_performance_issue(self, occurrence):
             == "db - SELECT `books\\_author`.`id`, `books\\_author`.`name` FROM `books\\_author` WHERE `books\\_author`.`id` = %s LIMIT 21"
         )
 
+        assert_slo_metric(mock_record_event, EventLifecycleOutcome.SUCCESS)
+
     def test_render_label(self):
         rule = self.get_rule(data={"team": self.integration.id, "channel": "Tatooine"})
 
diff --git a/tests/sentry/integrations/msteams/test_webhook.py b/tests/sentry/integrations/msteams/test_webhook.py
index af9034180411b1..981ae7c790cec3 100644
--- a/tests/sentry/integrations/msteams/test_webhook.py
+++ b/tests/sentry/integrations/msteams/test_webhook.py
@@ -12,6 +12,7 @@
 from sentry.integrations.msteams.utils import ACTION_TYPE
 from sentry.integrations.types import EventLifecycleOutcome
 from sentry.silo.base import SiloMode
+from sentry.testutils.asserts import assert_slo_metric
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.silo import assume_test_silo_mode
 from sentry.users.models.identity import Identity
@@ -397,9 +398,7 @@ def test_unlink_user(self, mock_time, mock_decode, mock_record):
         )
         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
+        assert_slo_metric(mock_record, EventLifecycleOutcome.SUCCESS)
 
     @responses.activate
     @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
@@ -435,10 +434,7 @@ def test_help_command(self, mock_time, mock_decode, mock_record):
         ].request.body.decode("utf-8")
         assert "Bearer my_token" in responses.calls[3].request.headers["Authorization"]
 
-        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
+        assert_slo_metric(mock_record, EventLifecycleOutcome.SUCCESS)
 
     @responses.activate
     @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
@@ -500,9 +496,7 @@ def test_link_command(self, mock_time, mock_decode, mock_record):
         ]
         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
+        assert_slo_metric(mock_record, EventLifecycleOutcome.SUCCESS)
 
     @responses.activate
     @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
@@ -544,9 +538,7 @@ def test_link_command_already_linked(self, mock_time, mock_decode, mock_record):
         )
         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
+        assert_slo_metric(mock_record, EventLifecycleOutcome.SUCCESS)
 
     @responses.activate
     @mock.patch("sentry.utils.jwt.decode")
diff --git a/tests/sentry/integrations/opsgenie/test_client.py b/tests/sentry/integrations/opsgenie/test_client.py
index 940b8b2671b38d..43334d5f9c3e01 100644
--- a/tests/sentry/integrations/opsgenie/test_client.py
+++ b/tests/sentry/integrations/opsgenie/test_client.py
@@ -6,6 +6,7 @@
 
 from sentry.integrations.types import EventLifecycleOutcome
 from sentry.models.rule import Rule
+from sentry.testutils.asserts import assert_slo_metric
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.skips import requires_snuba
 
@@ -98,7 +99,4 @@ def test_send_notification(self, mock_record):
             "message": "Hello world",
             "source": "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
+        assert_slo_metric(mock_record, EventLifecycleOutcome.SUCCESS)
diff --git a/tests/sentry/integrations/opsgenie/test_integration.py b/tests/sentry/integrations/opsgenie/test_integration.py
index e87609466d3829..f6d14bbed8bc92 100644
--- a/tests/sentry/integrations/opsgenie/test_integration.py
+++ b/tests/sentry/integrations/opsgenie/test_integration.py
@@ -15,6 +15,7 @@
 from sentry.integrations.types import EventLifecycleOutcome
 from sentry.models.rule import Rule
 from sentry.shared_integrations.exceptions import ApiRateLimitedError, ApiUnauthorized
+from sentry.testutils.asserts import assert_slo_metric
 from sentry.testutils.cases import APITestCase, IntegrationTestCase
 from sentry.testutils.silo import assume_test_silo_mode_of, control_silo_test
 from sentry_plugins.opsgenie.plugin import OpsGeniePlugin
@@ -325,10 +326,7 @@ def test_migrate_plugin(self, mock_record):
         assert plugin2.is_enabled(project2) is False
         assert plugin2.is_configured(self.project) is False
 
-        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_slo_metric(mock_record, EventLifecycleOutcome.SUCCESS)
 
     def test_no_duplicate_keys(self):
         """
diff --git a/tests/sentry/integrations/opsgenie/test_notify_action.py b/tests/sentry/integrations/opsgenie/test_notify_action.py
index fbf53153768d2b..e2d8658eb5065c 100644
--- a/tests/sentry/integrations/opsgenie/test_notify_action.py
+++ b/tests/sentry/integrations/opsgenie/test_notify_action.py
@@ -9,6 +9,7 @@
 from sentry.integrations.types import EventLifecycleOutcome
 from sentry.shared_integrations.exceptions import ApiError
 from sentry.silo.base import SiloMode
+from sentry.testutils.asserts import assert_slo_metric
 from sentry.testutils.cases import PerformanceIssueTestCase, RuleTestCase
 from sentry.testutils.silo import assume_test_silo_mode
 from sentry.testutils.skips import requires_snuba
@@ -270,7 +271,4 @@ def test_api_error(self, mock_record, mock_logger: MagicMock):
         with pytest.raises(ApiError):
             results[0].callback(event, futures=[])
         assert mock_logger.info.call_args.args[0] == "rule.fail.opsgenie_notification"
-        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_slo_metric(mock_record, EventLifecycleOutcome.FAILURE)
diff --git a/tests/sentry/integrations/pagerduty/test_client.py b/tests/sentry/integrations/pagerduty/test_client.py
index 6de2ecddeeaf66..1652bead447224 100644
--- a/tests/sentry/integrations/pagerduty/test_client.py
+++ b/tests/sentry/integrations/pagerduty/test_client.py
@@ -8,6 +8,7 @@
 from sentry.api.serializers import ExternalEventSerializer, serialize
 from sentry.integrations.pagerduty.utils import add_service
 from sentry.integrations.types import EventLifecycleOutcome
+from sentry.testutils.asserts import assert_slo_metric
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.factories import EventType
 from sentry.testutils.helpers.datetime import before_now
@@ -128,10 +129,7 @@ def test_send_trigger(self, mock_record):
             )
         ]
         assert self.metrics.incr.mock_calls == calls
-        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_slo_metric(mock_record, EventLifecycleOutcome.SUCCESS)
 
     @responses.activate
     def test_send_trigger_custom_severity(self):
diff --git a/tests/sentry/integrations/pagerduty/test_notify_action.py b/tests/sentry/integrations/pagerduty/test_notify_action.py
index 3d3fb60682fd18..f67f9ad70ba25e 100644
--- a/tests/sentry/integrations/pagerduty/test_notify_action.py
+++ b/tests/sentry/integrations/pagerduty/test_notify_action.py
@@ -9,7 +9,7 @@
 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.asserts import assert_halt_metric, assert_slo_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
@@ -172,6 +172,18 @@ def test_applies_correctly_generic_issue(self):
         assert data["payload"]["summary"] == group_event.occurrence.issue_title
         assert data["payload"]["custom_details"]["title"] == group_event.occurrence.issue_title
 
+    def test_render_label_without_severity(self):
+        rule_data = {
+            "account": self.integration.id,
+            "service": self.service["id"],
+        }
+        rule = self.get_rule(data=rule_data)
+
+        assert (
+            rule.render_label()
+            == "Send a notification to PagerDuty account Example and service Critical with default severity"
+        )
+
     def test_render_label(self):
         rule_data = {
             "account": self.integration.id,
@@ -182,17 +194,9 @@ def test_render_label(self):
 
         assert (
             rule.render_label()
-            == "Send a notification to PagerDuty account Example and service Critical"
+            == "Send a notification to PagerDuty account Example and service Critical with warning severity"
         )
 
-        with self.feature("organizations:integrations-custom-alert-priorities"):
-            # reinitialize rule to utilize flag
-            rule = self.get_rule(data=rule_data)
-            assert (
-                rule.render_label()
-                == "Send a notification to PagerDuty account Example and service Critical with warning severity"
-            )
-
     def test_render_label_without_integration(self):
         with assume_test_silo_mode(SiloMode.CONTROL):
             self.integration.delete()
@@ -206,17 +210,9 @@ def test_render_label_without_integration(self):
 
         assert (
             rule.render_label()
-            == "Send a notification to PagerDuty account [removed] and service [removed]"
+            == "Send a notification to PagerDuty account [removed] and service [removed] with default severity"
         )
 
-        with self.feature("organizations:integrations-custom-alert-priorities"):
-            # reinitialize rule to utilize flag
-            rule = self.get_rule(data=rule_data)
-            assert (
-                rule.render_label()
-                == "Send a notification to PagerDuty account [removed] and service [removed] with default severity"
-            )
-
     def test_valid_service_options(self):
         # create new org that has the same pd account but different a service added
         new_org = self.create_organization(name="New Org", owner=self.user)
@@ -329,8 +325,5 @@ def test_invalid_service_selected(self, mock_record):
         form = rule.get_form_instance()
         assert not form.is_valid()
         assert len(form.errors) == 1
-        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_slo_metric(mock_record, EventLifecycleOutcome.HALTED)
         assert_halt_metric(mock_record, OnCallIntegrationsHaltReason.INVALID_SERVICE.value)
diff --git a/tests/sentry/integrations/slack/service/test_slack_service.py b/tests/sentry/integrations/slack/service/test_slack_service.py
index 14493e427a4c16..55c2cda9da3815 100644
--- a/tests/sentry/integrations/slack/service/test_slack_service.py
+++ b/tests/sentry/integrations/slack/service/test_slack_service.py
@@ -9,11 +9,13 @@
 from sentry.integrations.repository.issue_alert import IssueAlertNotificationMessage
 from sentry.integrations.slack.sdk_client import SlackSdkClient
 from sentry.integrations.slack.service import RuleDataError, SlackService
+from sentry.integrations.types import EventLifecycleOutcome
 from sentry.models.activity import Activity
 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.asserts import assert_slo_metric
 from sentry.testutils.cases import TestCase
 from sentry.testutils.silo import assume_test_silo_mode
 from sentry.types.activity import ActivityType
@@ -157,8 +159,9 @@ def test_no_parent_notification(self, mock_handle):
         self.service.notify_all_threads_for_activity(activity=self.activity)
         assert not mock_handle.called
 
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
     @mock.patch("sentry.integrations.slack.service.SlackService._handle_parent_notification")
-    def test_calls_handle_parent_notification_sdk_client(self, mock_handle):
+    def test_calls_handle_parent_notification_sdk_client(self, mock_handle, mock_record):
         parent_notification = IssueAlertNotificationMessage.from_model(
             instance=self.parent_notification
         )
@@ -170,6 +173,8 @@ def test_calls_handle_parent_notification_sdk_client(self, mock_handle):
         # check client type
         assert isinstance(mock_handle.call_args.kwargs["client"], SlackSdkClient)
 
+        assert_slo_metric(mock_record, EventLifecycleOutcome.SUCCESS)
+
 
 class TestHandleParentNotification(TestCase):
     def setUp(self) -> None:
@@ -233,8 +238,9 @@ def setUp(self) -> None:
             rule_fire_history=self.slack_rule_fire_history,
         )
 
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
     @mock.patch("slack_sdk.web.client.WebClient._perform_urllib_http_request")
-    def test_handles_parent_notification_sdk(self, mock_api_call):
+    def test_handles_parent_notification_sdk(self, mock_api_call, mock_record):
         mock_api_call.return_value = {
             "body": orjson.dumps({"ok": True}).decode(),
             "headers": {},
@@ -246,8 +252,12 @@ def test_handles_parent_notification_sdk(self, mock_api_call):
             client=SlackSdkClient(integration_id=self.integration.id),
         )
 
+        assert_slo_metric(mock_record, EventLifecycleOutcome.SUCCESS)
+
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
     def test_handles_parent_notification_sdk_error(
         self,
+        mock_record,
     ) -> None:
         with pytest.raises(SlackApiError):
             self.service._handle_parent_notification(
@@ -256,6 +266,8 @@ def test_handles_parent_notification_sdk_error(
                 client=SlackSdkClient(integration_id=self.integration.id),
             )
 
+        assert_slo_metric(mock_record, EventLifecycleOutcome.FAILURE)
+
     def test_raises_exception_when_parent_notification_does_not_have_rule_fire_history_data(
         self,
     ) -> None:
@@ -347,13 +359,13 @@ def test_raises_exception_when_rule_action_does_not_have_channel_id(self) -> Non
             message_identifier="123abc",
         )
         parent_notification = IssueAlertNotificationMessage.from_model(parent_notification_message)
-        with pytest.raises(RuleDataError) as err:
+        with pytest.raises(RuleDataError) as excinfo:
             self.service._handle_parent_notification(
                 parent_notification=parent_notification,
                 notification_to_send="",
                 client=mock.MagicMock(),
             )
-            assert (
-                err.value
-                == f"failed to get channel_id for rule {self.rule.id} and rule action {parent_notification.rule_action_uuid}"
-            )
+        assert (
+            str(excinfo.value)
+            == f"failed to get channel_id for rule {self.rule.id} and rule action {parent_notification.rule_action_uuid}"
+        )
diff --git a/tests/sentry/integrations/slack/test_message_builder.py b/tests/sentry/integrations/slack/test_message_builder.py
index 3830b4ff4dc29e..bca19c7326e028 100644
--- a/tests/sentry/integrations/slack/test_message_builder.py
+++ b/tests/sentry/integrations/slack/test_message_builder.py
@@ -228,72 +228,6 @@ def build_test_message_blocks(
     }
 
 
-def build_test_message(
-    teams: set[Team],
-    users: set[User],
-    timestamp: datetime,
-    group: Group,
-    event: Event | None = None,
-    link_to_event: bool = False,
-) -> dict[str, Any]:
-    project = group.project
-
-    title = group.title
-    title_link = f"http://testserver/organizations/{project.organization.slug}/issues/{group.id}"
-    if event:
-        title = event.title
-        if link_to_event:
-            title_link += f"/events/{event.event_id}"
-    title_link += "/?referrer=slack"
-
-    return {
-        "text": "",
-        "color": "#E03E2F",  # red for error level
-        "actions": [
-            {"name": "status", "text": "Resolve", "type": "button", "value": "resolved"},
-            {
-                "name": "status",
-                "text": "Archive",
-                "type": "button",
-                "value": "archived",
-            },
-            {
-                "option_groups": [
-                    {
-                        "text": "Teams",
-                        "options": [
-                            {"text": f"#{team.slug}", "value": f"team:{team.id}"} for team in teams
-                        ],
-                    },
-                    {
-                        "text": "People",
-                        "options": [
-                            {
-                                "text": user.email,
-                                "value": f"user:{user.id}",
-                            }
-                            for user in users
-                        ],
-                    },
-                ],
-                "text": "Select Assignee...",
-                "selected_options": [],
-                "type": "select",
-                "name": "assign",
-            },
-        ],
-        "mrkdwn_in": ["text"],
-        "title": title,
-        "fields": [],
-        "footer": f"{project.slug.upper()}-1",
-        "ts": timestamp.timestamp(),
-        "title_link": title_link,
-        "callback_id": '{"issue":' + str(group.id) + "}",
-        "fallback": f"[{project.slug}] {title}",
-        "footer_icon": "http://testserver/_static/{version}/sentry/images/sentry-email-avatar.png",
-    }
-
-
 class BuildGroupAttachmentTest(TestCase, PerformanceIssueTestCase, OccurrenceTestMixin):
     def test_build_group_block(self):
         release = self.create_release(project=self.project)
diff --git a/tests/sentry/integrations/slack/test_notify_action.py b/tests/sentry/integrations/slack/test_notify_action.py
index 77784057b49c1a..96d235cf32642d 100644
--- a/tests/sentry/integrations/slack/test_notify_action.py
+++ b/tests/sentry/integrations/slack/test_notify_action.py
@@ -48,11 +48,7 @@ def mock_msg_schedule_response(self, channel_id, result_name="channel"):
         return mock_slack_response("chat_scheduleMessage", body)
 
     def mock_msg_delete_scheduled_response(self, channel_id, result_name="channel"):
-        if channel_id == "channel_not_found":
-            body = {"ok": False, "error": "channel_not_found"}
-        else:
-            body = {"ok": True}
-        return mock_slack_response("chat_deleteScheduledMessage", body)
+        return mock_slack_response("chat_deleteScheduledMessage", {"ok": True})
 
     def setUp(self):
         self.organization = self.get_event().project.organization
diff --git a/tests/sentry/integrations/slack/test_unfurl.py b/tests/sentry/integrations/slack/test_unfurl.py
index 84e1d6bad38b10..d8d23c1b4ec280 100644
--- a/tests/sentry/integrations/slack/test_unfurl.py
+++ b/tests/sentry/integrations/slack/test_unfurl.py
@@ -408,6 +408,7 @@ def test_unfurl_metric_alerts_chart_transaction(self, mock_generate_chart):
         assert chart_data["incidents"][0]["id"] == str(incident.id)
 
     @patch("sentry.charts.backend.generate_chart", return_value="chart-url")
+    @pytest.mark.xfail
     def test_unfurl_metric_alerts_chart_eap_spans(self, mock_generate_chart):
         # Using the EventsAnalyticsPlatform dataset
         alert_rule = self.create_alert_rule(
@@ -470,6 +471,7 @@ def test_unfurl_metric_alerts_chart_eap_spans(self, mock_generate_chart):
         "sentry.api.bases.organization_events.OrganizationEventsV2EndpointBase.get_event_stats_data",
     )
     @patch("sentry.charts.backend.generate_chart", return_value="chart-url")
+    @pytest.mark.xfail
     def test_unfurl_metric_alerts_chart_eap_spans_events_stats_call(
         self, mock_generate_chart, mock_get_event_stats_data
     ):
@@ -575,7 +577,7 @@ def test_unfurl_discover(self, mock_generate_chart, _):
         link_type, args = match_link(url)
 
         if not args or not link_type:
-            raise Exception("Missing link_type/args")
+            raise AssertionError("Missing link_type/args")
 
         links = [
             UnfurlableUrl(url=url, args=args),
@@ -612,7 +614,7 @@ def test_unfurl_discover_previous_period(self, mock_generate_chart, _):
         link_type, args = match_link(url)
 
         if not args or not link_type:
-            raise Exception("Missing link_type/args")
+            raise AssertionError("Missing link_type/args")
 
         links = [
             UnfurlableUrl(url=url, args=args),
@@ -658,7 +660,7 @@ def test_unfurl_discover_multi_y_axis(self, mock_generate_chart, _):
         link_type, args = match_link(url)
 
         if not args or not link_type:
-            raise Exception("Missing link_type/args")
+            raise AssertionError("Missing link_type/args")
 
         links = [
             UnfurlableUrl(url=url, args=args),
@@ -695,7 +697,7 @@ def test_unfurl_discover_html_escaped(self, mock_generate_chart, _):
         link_type, args = match_link(url)
 
         if not args or not link_type:
-            raise Exception("Missing link_type/args")
+            raise AssertionError("Missing link_type/args")
 
         links = [
             UnfurlableUrl(url=url, args=args),
@@ -756,7 +758,7 @@ def test_unfurl_discover_short_url(self, mock_generate_chart, _):
         link_type, args = match_link(url)
 
         if not args or not link_type:
-            raise Exception("Missing link_type/args")
+            raise AssertionError("Missing link_type/args")
 
         links = [
             UnfurlableUrl(url=url, args=args),
@@ -820,7 +822,7 @@ def test_unfurl_correct_y_axis_for_saved_query(self, mock_generate_chart, _):
         link_type, args = match_link(url)
 
         if not args or not link_type:
-            raise Exception("Missing link_type/args")
+            raise AssertionError("Missing link_type/args")
 
         links = [
             UnfurlableUrl(url=url, args=args),
@@ -872,7 +874,7 @@ def test_top_events_url_param(self, mock_generate_chart, _):
         link_type, args = match_link(url)
 
         if not args or not link_type:
-            raise Exception("Missing link_type/args")
+            raise AssertionError("Missing link_type/args")
 
         links = [
             UnfurlableUrl(url=url, args=args),
@@ -938,7 +940,7 @@ def test_top_daily_events_renders_bar_chart(self, mock_generate_chart, _):
         link_type, args = match_link(url)
 
         if not args or not link_type:
-            raise Exception("Missing link_type/args")
+            raise AssertionError("Missing link_type/args")
 
         links = [
             UnfurlableUrl(url=url, args=args),
@@ -997,7 +999,7 @@ def test_unfurl_discover_short_url_without_project_ids(self, mock_generate_chart
         link_type, args = match_link(url)
 
         if not args or not link_type:
-            raise Exception("Missing link_type/args")
+            raise AssertionError("Missing link_type/args")
 
         links = [
             UnfurlableUrl(url=url, args=args),
@@ -1041,7 +1043,7 @@ def test_unfurl_discover_without_project_ids(
         link_type, args = match_link(url)
 
         if not args or not link_type:
-            raise Exception("Missing link_type/args")
+            raise AssertionError("Missing link_type/args")
 
         links = [
             UnfurlableUrl(url=url, args=args),
@@ -1097,7 +1099,7 @@ def test_bar_chart_display_renders_bar_chart(self, mock_generate_chart, _):
         link_type, args = match_link(url)
 
         if not args or not link_type:
-            raise Exception("Missing link_type/args")
+            raise AssertionError("Missing link_type/args")
 
         links = [
             UnfurlableUrl(url=url, args=args),
@@ -1129,7 +1131,7 @@ def test_bar_chart_interval_with_absolute_date(self, mock_generate_chart, api_mo
         link_type, args = match_link(url)
 
         if not args or not link_type:
-            raise Exception("Missing link_type/args")
+            raise AssertionError("Missing link_type/args")
 
         links = [
             UnfurlableUrl(url=url, args=args),
@@ -1164,7 +1166,7 @@ def test_bar_chart_interval_with_periodic_date(self, mock_generate_chart, api_mo
         link_type, args = match_link(url)
 
         if not args or not link_type:
-            raise Exception("Missing link_type/args")
+            raise AssertionError("Missing link_type/args")
 
         links = [
             UnfurlableUrl(url=url, args=args),
@@ -1215,7 +1217,7 @@ def test_saved_query_with_interval(self, mock_generate_chart, api_mock):
         link_type, args = match_link(url)
 
         if not args or not link_type:
-            raise Exception("Missing link_type/args")
+            raise AssertionError("Missing link_type/args")
 
         links = [
             UnfurlableUrl(url=url, args=args),
@@ -1268,7 +1270,7 @@ def test_saved_query_with_dataset(self, mock_generate_chart, mock_get_event_stat
         link_type, args = match_link(url)
 
         if not args or not link_type:
-            raise Exception("Missing link_type/args")
+            raise AssertionError("Missing link_type/args")
 
         links = [
             UnfurlableUrl(url=url, args=args),
@@ -1310,7 +1312,7 @@ def test_unfurl_discover_homepage(self, mock_generate_chart, mock_get_event_stat
         link_type, args = match_link(url)
 
         if not args or not link_type:
-            raise Exception("Missing link_type/args")
+            raise AssertionError("Missing link_type/args")
 
         links = [
             UnfurlableUrl(url=url, args=args),
diff --git a/tests/sentry/integrations/slack/test_utils.py b/tests/sentry/integrations/slack/test_utils.py
index 4b94da61f43c55..67816a737db636 100644
--- a/tests/sentry/integrations/slack/test_utils.py
+++ b/tests/sentry/integrations/slack/test_utils.py
@@ -68,15 +68,7 @@ def patch_mock_list(self, list_type, channels, result_name="channels"):
             ),
         )
 
-    def patch_msg_response(self, channel_id, result_name="channel"):
-        if channel_id == "channel_not_found":
-            bodydict = {"ok": False, "error": "channel_not_found"}
-        else:
-            bodydict = {
-                "ok": True,
-                result_name: channel_id,
-                "scheduled_message_id": "Q1298393284",
-            }
+    def patch_msg_response_not_found(self):
         return patch(
             "slack_sdk.web.client.WebClient.chat_scheduleMessage",
             return_value=SlackResponse(
@@ -84,7 +76,7 @@ def patch_msg_response(self, channel_id, result_name="channel"):
                 http_verb="POST",
                 api_url="https://slack.com/api/chat.scheduleMessage",
                 req_args={},
-                data=bodydict,
+                data={"ok": False, "error": "channel_not_found"},
                 headers={},
                 status_code=200,
             ),
@@ -142,7 +134,7 @@ def test_valid_member_selected_sdk_client(self):
             {"name": "better_morty", "id": "bm", "profile": {"display_name": "Morty"}},
         ]
 
-        with self.patch_msg_response("channel_not_found"):
+        with self.patch_msg_response_not_found():
             with self.patch_mock_list("users", response_list, "members"):
                 self.run_valid_test("@first-morty", MEMBER_PREFIX, "m", False)
 
@@ -153,7 +145,7 @@ def test_valid_member_selected_display_name_sdk_client(self):
             {"name": "better_morty", "id": "bm", "profile": {"display_name": "Morty"}},
         ]
 
-        with self.patch_msg_response("channel_not_found"):
+        with self.patch_msg_response_not_found():
             with self.patch_mock_list("users", response_list, "members"):
                 self.run_valid_test("@Jimbob", MEMBER_PREFIX, "o-u", False)
 
@@ -164,13 +156,13 @@ def test_invalid_member_selected_display_name_sdk_client(self):
             {"name": "better_morty", "id": "bm", "profile": {"display_name": "Morty"}},
         ]
 
-        with self.patch_msg_response("channel_not_found"):
+        with self.patch_msg_response_not_found():
             with self.patch_mock_list("users", response_list, "members"):
                 with pytest.raises(DuplicateDisplayNameError):
                     get_channel_id(self.integration, "@Morty")
 
     def test_invalid_channel_selected_sdk_client(self):
-        with self.patch_msg_response("channel_not_found"):
+        with self.patch_msg_response_not_found():
             assert get_channel_id(self.integration, "#fake-channel").channel_id is None
             assert get_channel_id(self.integration, "@fake-user").channel_id is None
 
@@ -184,7 +176,7 @@ def test_rate_limiting_sdk_client(self, mock_api_call):
             "status": 429,
         }
 
-        with self.patch_msg_response("channel_not_found"):
+        with self.patch_msg_response_not_found():
             with pytest.raises(ApiRateLimitedError):
                 get_channel_id(self.integration, "@user")
 
diff --git a/tests/sentry/integrations/slack/webhooks/commands/__init__.py b/tests/sentry/integrations/slack/webhooks/commands/__init__.py
index 808a24873610b9..3a4d9b27dde0b7 100644
--- a/tests/sentry/integrations/slack/webhooks/commands/__init__.py
+++ b/tests/sentry/integrations/slack/webhooks/commands/__init__.py
@@ -19,9 +19,8 @@
 from sentry.models.team import Team
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import APITestCase, TestCase
-from sentry.testutils.helpers import find_identity, install_slack, link_team, link_user
+from sentry.testutils.helpers import install_slack, link_team, link_user
 from sentry.testutils.silo import assume_test_silo_mode
-from sentry.users.models.identity import Identity
 
 
 class SlackCommandsTest(APITestCase, TestCase):
@@ -58,9 +57,6 @@ def send_slack_message(self, command: str, **kwargs: Any) -> dict[str, str]:
         )
         return orjson.loads(response.content)
 
-    def find_identity(self) -> Identity | None:
-        return find_identity(idp=self.idp, user=self.user)
-
     def link_user(self) -> None:
         return link_user(user=self.user, idp=self.idp, slack_id=self.slack_id)
 
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 0dfabb61c78776..22dfc7a97bc90b 100644
--- a/tests/sentry/integrations/slack/webhooks/commands/test_link_team.py
+++ b/tests/sentry/integrations/slack/webhooks/commands/test_link_team.py
@@ -5,7 +5,6 @@
 from rest_framework import status
 
 from sentry.integrations.slack.webhooks.command import (
-    CHANNEL_ALREADY_LINKED_MESSAGE,
     INSUFFICIENT_ROLE_MESSAGE,
     LINK_FROM_CHANNEL_MESSAGE,
     LINK_USER_FIRST_MESSAGE,
@@ -13,8 +12,8 @@
 )
 from sentry.integrations.types import EventLifecycleOutcome
 from sentry.silo.base import SiloMode
+from sentry.testutils.asserts import assert_slo_metric
 from sentry.testutils.helpers import get_response_text, link_user
-from sentry.testutils.helpers.features import with_feature
 from sentry.testutils.silo import assume_test_silo_mode
 from tests.sentry.integrations.slack.webhooks.commands import SlackCommandsTest
 
@@ -52,33 +51,6 @@ def test_link_another_team_to_channel(self, mock_record):
         """
         self.link_team()
 
-        response = self.get_slack_response(
-            {
-                "text": "link team",
-                "team_id": self.external_id,
-                "user_id": self.slack_id,
-                "channel_name": self.channel_name,
-                "channel_id": self.channel_id,
-            }
-        )
-        data = orjson.loads(response.content)
-        assert CHANNEL_ALREADY_LINKED_MESSAGE in get_response_text(data)
-
-        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
-
-    @with_feature("organizations:slack-multiple-team-single-channel-linking")
-    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
-    @responses.activate
-    def test_link_another_team_to_channel_with_flag(self, mock_record):
-        """
-        Test that we block a user who tries to link a second team to a
-        channel that already has a team linked to it.
-        """
-        self.link_team()
-
         response = self.get_slack_response(
             {
                 "text": "link team",
@@ -91,10 +63,7 @@ def test_link_another_team_to_channel_with_flag(self, mock_record):
         data = orjson.loads(response.content)
         assert "Link your Sentry team to this Slack channel!" in get_response_text(data)
 
-        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
+        assert_slo_metric(mock_record, EventLifecycleOutcome.SUCCESS)
 
     @responses.activate
     @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
@@ -114,9 +83,7 @@ def test_link_team_from_dm(self, mock_record):
         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
+        assert_slo_metric(mock_record, EventLifecycleOutcome.HALTED)
 
     @responses.activate
     @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
@@ -130,9 +97,7 @@ def test_link_team_identity_does_not_exist(self, mock_record):
         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
+        assert_slo_metric(mock_record, EventLifecycleOutcome.HALTED)
 
     @responses.activate
     @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
@@ -151,9 +116,7 @@ def test_link_team_insufficient_role(self, mock_record):
         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
+        assert_slo_metric(mock_record, EventLifecycleOutcome.HALTED)
 
     @responses.activate
     @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
@@ -167,9 +130,7 @@ def test_link_team_as_team_admin(self, mock_record):
         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
+        assert_slo_metric(mock_record, EventLifecycleOutcome.SUCCESS)
 
 
 class SlackCommandsUnlinkTeamTest(SlackCommandsLinkTeamTestBase):
@@ -187,9 +148,7 @@ def test_unlink_team(self, mock_record):
         )
         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
+        assert_slo_metric(mock_record, EventLifecycleOutcome.SUCCESS)
 
     @responses.activate
     @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
@@ -207,9 +166,7 @@ def test_unlink_team_as_team_admin(self, mock_record):
         )
         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
+        assert_slo_metric(mock_record, EventLifecycleOutcome.SUCCESS)
 
     @responses.activate
     @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
@@ -225,9 +182,7 @@ def test_unlink_no_team(self, mock_record):
         )
         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
+        assert_slo_metric(mock_record, EventLifecycleOutcome.HALTED)
 
     @responses.activate
     @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
@@ -248,6 +203,4 @@ def test_unlink_multiple_orgs(self, mock_record):
         )
         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
+        assert_slo_metric(mock_record, 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 b2b989eb4ca282..c8559fb9665518 100644
--- a/tests/sentry/integrations/slack/webhooks/commands/test_link_user.py
+++ b/tests/sentry/integrations/slack/webhooks/commands/test_link_user.py
@@ -8,6 +8,7 @@
 )
 from sentry.integrations.slack.webhooks.base import NOT_LINKED_MESSAGE
 from sentry.integrations.types import EventLifecycleOutcome
+from sentry.testutils.asserts import assert_slo_metric
 from sentry.testutils.helpers import get_response_text
 from sentry.testutils.silo import control_silo_test
 from sentry.users.models.identity import Identity
@@ -39,9 +40,7 @@ def test_link_command(self, mock_record):
         data = self.send_slack_message("link")
         assert "Link your Slack identity" in get_response_text(data)
 
-        start, success = mock_record.mock_calls
-        assert start.args[0] == EventLifecycleOutcome.STARTED
-        assert success.args[0] == EventLifecycleOutcome.SUCCESS
+        assert_slo_metric(mock_record, EventLifecycleOutcome.SUCCESS)
 
     @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
     def test_link_command_already_linked(self, mock_record):
@@ -49,9 +48,7 @@ def test_link_command_already_linked(self, mock_record):
         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
+        assert_slo_metric(mock_record, EventLifecycleOutcome.SUCCESS)
 
 
 @control_silo_test
@@ -121,16 +118,11 @@ def test_unlink_command(self, mock_record):
         data = self.send_slack_message("unlink")
         assert "to unlink your identity" in get_response_text(data)
 
-        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
+        assert_slo_metric(mock_record, EventLifecycleOutcome.SUCCESS)
 
     @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
+        assert_slo_metric(mock_record, 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 cd1a8a143b6346..19c1ed2d6ab502 100644
--- a/tests/sentry/integrations/slack/webhooks/events/test_message_im.py
+++ b/tests/sentry/integrations/slack/webhooks/events/test_message_im.py
@@ -6,6 +6,7 @@
 
 from sentry.integrations.types import EventLifecycleOutcome
 from sentry.silo.base import SiloMode
+from sentry.testutils.asserts import assert_slo_metric
 from sentry.testutils.cases import IntegratedApiTestCase
 from sentry.testutils.helpers import get_response_text
 from sentry.testutils.silo import assume_test_silo_mode
@@ -107,10 +108,7 @@ def test_user_message_link(self, mock_record):
         data = self.mock_post.call_args[1]
         assert "Link your Slack identity" in get_response_text(data)
 
-        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
+        assert_slo_metric(mock_record, EventLifecycleOutcome.SUCCESS)
 
     def test_user_message_already_linked_sdk(self):
         """
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
index c1a20d02bfbb0e..0a582a0e5f5b4d 100644
--- a/tests/sentry/integrations/source_code_management/test_commit_context_slo.py
+++ b/tests/sentry/integrations/source_code_management/test_commit_context_slo.py
@@ -6,7 +6,7 @@
 )
 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.asserts import assert_failure_metric, assert_halt_metric, assert_slo_metric
 from sentry.testutils.cases import TestCase
 from sentry.users.models.identity import Identity
 
@@ -43,11 +43,7 @@ def test_get_blame_for_files_success(self, mock_record):
         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
+        assert_slo_metric(mock_record, EventLifecycleOutcome.SUCCESS)
 
     @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
     def test_get_blame_for_files_missing_identity(self, mock_record):
@@ -58,10 +54,7 @@ def test_get_blame_for_files_missing_identity(self, mock_record):
 
         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_slo_metric(mock_record, EventLifecycleOutcome.FAILURE)
         assert_failure_metric(mock_record, Identity.DoesNotExist())
 
     @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
@@ -74,11 +67,7 @@ def test_get_blame_for_files_invalid_identity(self, mock_record):
         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_slo_metric(mock_record, EventLifecycleOutcome.FAILURE)
         assert_failure_metric(mock_record, IdentityNotValid())
 
     @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
@@ -93,11 +82,7 @@ def test_get_blame_for_files_rate_limited(self, mock_record):
         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_slo_metric(mock_record, EventLifecycleOutcome.HALTED)
         assert_halt_metric(mock_record, ApiRateLimitedError(text="Rate limited"))
 
     @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
@@ -109,7 +94,4 @@ def test_get_commit_context_all_frames(self, mock_record):
 
         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
+        assert_slo_metric(mock_record, EventLifecycleOutcome.SUCCESS)
diff --git a/tests/sentry/integrations/test_base.py b/tests/sentry/integrations/test_base.py
index ae848b65fdd5f6..7b78eb23692f72 100644
--- a/tests/sentry/integrations/test_base.py
+++ b/tests/sentry/integrations/test_base.py
@@ -9,7 +9,7 @@ class TestIntegration(IntegrationInstallation):
     __test__ = False
 
     def get_client(self):
-        pass
+        raise NotImplementedError
 
 
 @all_silo_test
diff --git a/tests/sentry/integrations/test_client.py b/tests/sentry/integrations/test_client.py
index d14f6406f6628a..7c0ea22dc49cb3 100644
--- a/tests/sentry/integrations/test_client.py
+++ b/tests/sentry/integrations/test_client.py
@@ -10,7 +10,6 @@
 from urllib3.exceptions import InvalidChunkLength
 from urllib3.response import HTTPResponse
 
-from sentry.identity.oauth2 import OAuth2Provider
 from sentry.integrations.client import ApiClient
 from sentry.shared_integrations.exceptions import (
     ApiConnectionResetError,
@@ -320,17 +319,3 @@ def test_parameters_passed_correctly(self):
                 verify=False,
                 cert=None,
             )
-
-
-class OAuthProvider(OAuth2Provider):
-    key = "oauth"
-    name = "OAuth Provider"
-
-    def get_client_id(self):
-        return "client_id"
-
-    def get_client_secret(self):
-        return "client_secret"
-
-    def get_refresh_token_url(self):
-        return "https://example.com"
diff --git a/tests/sentry/integrations/test_issues.py b/tests/sentry/integrations/test_issues.py
index b729f02831b2af..cec6d7225bcf8d 100644
--- a/tests/sentry/integrations/test_issues.py
+++ b/tests/sentry/integrations/test_issues.py
@@ -187,6 +187,81 @@ def test_sync_status_resolve_in_next_release_with_releases(self):
                 "version": release2.version,
             }
 
+    def test_sync_status_does_not_override_existing_recent_group_resolution(self):
+        """
+        Test that the sync_status_inbound does not override the existing group resolution
+        if the group was recently resolved
+        """
+        release = Release.objects.create(organization_id=self.project.organization_id, version="a")
+        release2 = Release.objects.create(organization_id=self.project.organization_id, version="b")
+        release.add_project(self.project)
+        release2.add_project(self.project)
+        group = self.create_group(status=GroupStatus.UNRESOLVED)
+        # add releases in the reverse order
+        self.create_group_release(group=group, release=release2)
+        self.create_group_release(group=group, release=release)
+
+        assert group.status == GroupStatus.UNRESOLVED
+
+        # Resolve the group in old_release
+        group.update(status=GroupStatus.RESOLVED, substatus=None)
+        resolution = GroupResolution.objects.create(release=release, group=group)
+        assert resolution.current_release_version is None
+        assert resolution.release == release
+        activity = Activity.objects.create(
+            group=group,
+            project=group.project,
+            type=ActivityType.SET_RESOLVED_IN_RELEASE.value,
+            ident=resolution.id,
+            data={"version": release.version},
+        )
+
+        with assume_test_silo_mode(SiloMode.CONTROL):
+            integration = self.create_provider_integration(provider="example", external_id="123456")
+            integration.add_organization(group.organization, self.user)
+
+            for oi in OrganizationIntegration.objects.filter(
+                integration_id=integration.id, organization_id=group.organization.id
+            ):
+                oi.update(
+                    config={
+                        "sync_comments": True,
+                        "sync_status_outbound": True,
+                        "sync_status_inbound": True,
+                        "sync_assignee_outbound": True,
+                        "sync_assignee_inbound": True,
+                        "resolution_strategy": "resolve_next_release",
+                    }
+                )
+
+        external_issue = ExternalIssue.objects.create(
+            organization_id=group.organization.id, integration_id=integration.id, key="APP-123"
+        )
+
+        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,
+        )
+
+        installation = integration.get_installation(group.organization.id)
+        assert isinstance(installation, ExampleIntegration)
+
+        with self.feature("organizations:integrations-issue-sync"), self.tasks():
+            installation.sync_status_inbound(
+                external_issue.key,
+                {"project_id": "APP", "status": {"id": "12345", "category": "done"}},
+            )
+
+            assert Group.objects.get(id=group.id).status == GroupStatus.RESOLVED
+            resolution.refresh_from_db()
+            assert resolution.release == release
+            assert resolution.current_release_version is None
+            activity.refresh_from_db()
+            assert activity.data["version"] == release.version
+
     def test_sync_status_resolve_in_next_release_with_semver(self):
         release = Release.objects.create(
             organization_id=self.project.organization_id, version="app@1.2.4"
diff --git a/tests/sentry/integrations/test_metric_alerts.py b/tests/sentry/integrations/test_metric_alerts.py
index 04cebef46859e3..9f91e26f999722 100644
--- a/tests/sentry/integrations/test_metric_alerts.py
+++ b/tests/sentry/integrations/test_metric_alerts.py
@@ -9,6 +9,7 @@
 from sentry.incidents.models.incident import IncidentStatus, IncidentTrigger
 from sentry.integrations.metric_alerts import incident_attachment_info
 from sentry.snuba.dataset import Dataset
+from sentry.snuba.models import SnubaQuery
 from sentry.testutils.cases import BaseIncidentsTest, BaseMetricsTestCase, TestCase
 from sentry.testutils.helpers.datetime import freeze_time
 
@@ -155,6 +156,34 @@ def test_percent_change_alert(self):
             == "Events 123% higher in the last 10 minutes compared to the same time one hour ago"
         )
 
+    def test_percent_change_alert_rpc(self):
+        # 1 hour comparison_delta
+        alert_rule = self.create_alert_rule(
+            comparison_delta=60,
+            detection_type=AlertRuleDetectionType.PERCENT,
+            dataset=Dataset.EventsAnalyticsPlatform,
+            query_type=SnubaQuery.Type.PERFORMANCE,
+        )
+        date_started = self.now
+        incident = self.create_incident(
+            self.organization,
+            title="Incident #1",
+            projects=[self.project],
+            alert_rule=alert_rule,
+            status=IncidentStatus.CLOSED.value,
+            date_started=date_started,
+        )
+        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
+        )
+        metric_value = 123.12
+        data = incident_attachment_info(incident, IncidentStatus.CRITICAL, metric_value)
+        assert (
+            data["text"]
+            == "Events 123% higher in the last 10 minutes compared to the same time one hour ago"
+        )
+
     def test_percent_change_alert_custom_comparison_delta(self):
         # 12 hour comparison_delta
         alert_rule = self.create_alert_rule(
diff --git a/tests/sentry/integrations/test_pipeline.py b/tests/sentry/integrations/test_pipeline.py
index 199f47a98617d9..5fe86169824b21 100644
--- a/tests/sentry/integrations/test_pipeline.py
+++ b/tests/sentry/integrations/test_pipeline.py
@@ -6,9 +6,11 @@
 from sentry.integrations.gitlab.integration import GitlabIntegrationProvider
 from sentry.integrations.models.integration import Integration
 from sentry.integrations.models.organization_integration import OrganizationIntegration
+from sentry.integrations.pipeline import IntegrationPipeline
 from sentry.models.organizationmapping import OrganizationMapping
 from sentry.models.repository import Repository
 from sentry.organizations.absolute_url import generate_organization_url
+from sentry.organizations.services.organization.serial import serialize_rpc_organization
 from sentry.plugins.base import plugins
 from sentry.plugins.bases.issue2 import IssuePlugin2
 from sentry.signals import receivers_raise_on_send
@@ -16,7 +18,9 @@
 from sentry.silo.safety import unguarded_write
 from sentry.testutils.cases import IntegrationTestCase
 from sentry.testutils.outbox import outbox_runner
+from sentry.testutils.region import override_regions
 from sentry.testutils.silo import assume_test_silo_mode, control_silo_test
+from sentry.types.region import Region, RegionCategory
 from sentry.users.models.identity import Identity
 
 
@@ -44,6 +48,10 @@ def setUp(self):
         self.external_id = "dummy_id-123"
         self.provider.needs_default_identity = False
         self.provider.is_region_restricted = False
+        self.regions = [
+            Region("na", 0, "North America", RegionCategory.MULTI_TENANT),
+            Region("eu", 5, "Europe", RegionCategory.MULTI_TENANT),
+        ]
 
     def tearDown(self):
         super().tearDown()
@@ -146,7 +154,10 @@ def test_is_violating_region_restriction_success(self, *args):
             mapping.update(region_name="na")
 
         self.pipeline.state.data = {"external_id": self.external_id}
-        with patch("sentry.integrations.pipeline.IntegrationPipeline._dialog_response") as resp:
+        with (
+            override_regions(self.regions),
+            patch("sentry.integrations.pipeline.IntegrationPipeline._dialog_response") as resp,
+        ):
             self.pipeline.finish_pipeline()
             _data, success = resp.call_args[0]
             assert success
@@ -163,7 +174,10 @@ def test_is_violating_region_restriction_failure(self, *args):
             mapping.update(region_name="eu")
 
         self.pipeline.state.data = {"external_id": self.external_id}
-        with patch("sentry.integrations.pipeline.IntegrationPipeline._dialog_response") as resp:
+        with (
+            override_regions(self.regions),
+            patch("sentry.integrations.pipeline.IntegrationPipeline._dialog_response") as resp,
+        ):
             self.pipeline.finish_pipeline()
             data, success = resp.call_args[0]
             if SiloMode.get_current_mode() == SiloMode.MONOLITH:
@@ -435,6 +449,49 @@ def test_disabled_plugin_when_fully_migrated(self, run, *args):
 
         assert run.called
 
+    @patch("sentry.integrations.pipeline.logger")
+    def test_disallow_with_no_permission(self, mock_logger, *args):
+        member_user = self.create_user()
+        self.create_member(user=member_user, organization=self.organization, role="member")
+        self.login_as(member_user)
+
+        # partially copied from IntegrationTestCase.setUp()
+        # except the user is not an owner
+        with assume_test_silo_mode(SiloMode.REGION):
+            rpc_organization = serialize_rpc_organization(self.organization)
+
+        self.request = self.make_request(member_user)
+
+        self.pipeline = IntegrationPipeline(
+            request=self.request,
+            organization=rpc_organization,
+            provider_key=self.provider.key,
+        )
+        self.pipeline.initialize()
+        self.save_session()
+
+        data = {
+            "external_id": self.external_id,
+            "name": "Name",
+            "metadata": {"url": "https://example.com"},
+        }
+        self.pipeline.state.data = data
+
+        # attempt to finish pipeline with no 'org:integrations' scope
+        resp = self.pipeline.finish_pipeline()
+        assert (
+            "You must be an organization owner, manager or admin to install this integration."
+            in resp.content.decode()
+        )
+
+        extra = {
+            "error_message": "You must be an organization owner, manager or admin to install this integration.",
+            "organization_id": self.organization.id,
+            "user_id": member_user.id,
+            "provider_key": "example",
+        }
+        mock_logger.info.assert_called_with("build-integration.permission_error", extra=extra)
+
 
 @control_silo_test
 @patch(
diff --git a/tests/sentry/integrations/utils/test_sync.py b/tests/sentry/integrations/utils/test_sync.py
index 34b708cc912fe9..1a1044e8b986c8 100644
--- a/tests/sentry/integrations/utils/test_sync.py
+++ b/tests/sentry/integrations/utils/test_sync.py
@@ -39,22 +39,6 @@ def setUp(self):
                 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))
diff --git a/tests/sentry/integrations/vercel/test_uninstall.py b/tests/sentry/integrations/vercel/test_uninstall.py
index 88243290c1b39f..69f2e6e0b5586b 100644
--- a/tests/sentry/integrations/vercel/test_uninstall.py
+++ b/tests/sentry/integrations/vercel/test_uninstall.py
@@ -86,19 +86,6 @@ def setUp(self):
             metadata=metadata,
         )
 
-    def _get_delete_response(self):
-        # https://vercel.com/docs/integrations?query=event%20paylo#webhooks/events/integration-configuration-removed
-        return """{
-            "payload": {
-                "configuration": {
-                    "id": "my_config_id",
-                    "projects": ["project_id1"]
-                }
-            },
-            "teamId": "vercel_team_id",
-            "userId": "vercel_user_id"
-        }"""
-
     def test_uninstall(self):
         with override_options({"vercel.client-secret": SECRET}):
             response = self.client.post(
diff --git a/tests/sentry/integrations/vsts/test_issues.py b/tests/sentry/integrations/vsts/test_issues.py
index 7643a538f9a81a..c9c251faf80872 100644
--- a/tests/sentry/integrations/vsts/test_issues.py
+++ b/tests/sentry/integrations/vsts/test_issues.py
@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-from functools import cached_property
 from time import time
 from typing import Any
 from unittest.mock import patch
@@ -8,7 +7,7 @@
 import orjson
 import pytest
 import responses
-from django.test import RequestFactory, override_settings
+from django.test import override_settings
 from responses import matchers
 
 from fixtures.vsts import (
@@ -71,10 +70,6 @@ def assert_response_calls(expected_region_response, expected_non_region_response
 
 
 class VstsIssueBase(TestCase):
-    @cached_property
-    def request(self):
-        return RequestFactory()
-
     def setUp(self):
         with assume_test_silo_mode(SiloMode.CONTROL):
             model = self.create_provider_integration(
diff --git a/tests/sentry/integrations/vsts/test_repository.py b/tests/sentry/integrations/vsts/test_repository.py
index 534ffca9bc4bf5..a1f0f8d744fc6c 100644
--- a/tests/sentry/integrations/vsts/test_repository.py
+++ b/tests/sentry/integrations/vsts/test_repository.py
@@ -170,10 +170,6 @@ def setUp(self):
         }
         self.login_as(self.user)
 
-    @cached_property
-    def provider(self):
-        return VstsRepositoryProvider("integrations:vsts")
-
     def tearDown(self):
         super().tearDown()
         responses.reset()
diff --git a/tests/sentry/issues/endpoints/test_group_activities.py b/tests/sentry/issues/endpoints/test_group_activities.py
index 9e19c4d8f53d34..b8a45f59bfde9c 100644
--- a/tests/sentry/issues/endpoints/test_group_activities.py
+++ b/tests/sentry/issues/endpoints/test_group_activities.py
@@ -5,7 +5,7 @@
 
 
 class GroupActivitiesEndpointTest(APITestCase):
-    def test_endpoint_with_no_group_activities(self):
+    def test_endpoint_with_no_group_activities(self) -> None:
         group = self.create_group(status=GroupStatus.UNRESOLVED)
 
         self.login_as(user=self.user)
@@ -19,7 +19,7 @@ def test_endpoint_with_no_group_activities(self):
         assert "activity" in response.data
         assert len(response.data["activity"]) == 1
 
-    def test_endpoint_with_group_activities(self):
+    def test_endpoint_with_group_activities(self) -> None:
         group = self.create_group(status=GroupStatus.UNRESOLVED)
 
         for i in range(0, 4):
diff --git a/tests/sentry/issues/endpoints/test_group_details.py b/tests/sentry/issues/endpoints/test_group_details.py
index e202523f17a144..109e7f8bbbe3e6 100644
--- a/tests/sentry/issues/endpoints/test_group_details.py
+++ b/tests/sentry/issues/endpoints/test_group_details.py
@@ -46,7 +46,7 @@
 
 
 class GroupDetailsTest(APITestCase, SnubaTestCase):
-    def test_with_numerical_id(self):
+    def test_with_numerical_id(self) -> None:
         self.login_as(user=self.user)
 
         group = self.create_group()
@@ -63,7 +63,7 @@ def test_with_numerical_id(self):
         assert response.status_code == 200, response.content
         assert response.data["id"] == str(group.id)
 
-    def test_with_qualified_short_id(self):
+    def test_with_qualified_short_id(self) -> None:
         self.login_as(user=self.user)
 
         group = self.create_group()
@@ -80,7 +80,7 @@ def test_with_qualified_short_id(self):
 
         assert response.status_code == 404, response.content
 
-    def test_with_first_release(self):
+    def test_with_first_release(self) -> None:
         self.login_as(user=self.user)
 
         event = self.store_event(data={"release": "1.0"}, project_id=self.project.id)
@@ -95,7 +95,7 @@ def test_with_first_release(self):
         assert response.data["id"] == str(group.id)
         assert response.data["firstRelease"]["version"] == "1.0"
 
-    def test_no_releases(self):
+    def test_no_releases(self) -> None:
         self.login_as(user=self.user)
         event = self.store_event(data={}, project_id=self.project.id)
 
@@ -108,7 +108,7 @@ def test_no_releases(self):
         assert response.data["firstRelease"] is None
         assert response.data["lastRelease"] is None
 
-    def test_pending_delete_pending_merge_excluded(self):
+    def test_pending_delete_pending_merge_excluded(self) -> None:
         group1 = self.create_group(status=GroupStatus.PENDING_DELETION)
         group2 = self.create_group(status=GroupStatus.DELETION_IN_PROGRESS)
 
@@ -129,7 +129,7 @@ def test_pending_delete_pending_merge_excluded(self):
         response = self.client.get(url, format="json")
         assert response.status_code == 404
 
-    def test_environment(self):
+    def test_environment(self) -> None:
         group = self.create_group()
         self.login_as(user=self.user)
 
@@ -149,7 +149,7 @@ def test_environment(self):
         response = self.client.get(url, {"environment": "invalid"}, format="json")
         assert response.status_code == 404
 
-    def test_platform_external_issue_annotation(self):
+    def test_platform_external_issue_annotation(self) -> None:
         self.login_as(user=self.user)
 
         group = self.create_group()
@@ -166,7 +166,7 @@ def test_platform_external_issue_annotation(self):
             {"url": "https://example.com/issues/2", "displayName": "Issue#2"}
         ]
 
-    def test_plugin_external_issue_annotation(self):
+    def test_plugin_external_issue_annotation(self) -> None:
         group = self.create_group()
         GroupMeta.objects.create(group=group, key="trello:tid", value="134")
 
@@ -183,7 +183,7 @@ def test_plugin_external_issue_annotation(self):
             {"url": "https://trello.com/c/134", "displayName": "Trello-134"}
         ]
 
-    def test_integration_external_issue_annotation(self):
+    def test_integration_external_issue_annotation(self) -> None:
         group = self.create_group()
         integration = self.create_integration(
             organization=group.organization,
@@ -203,7 +203,7 @@ def test_integration_external_issue_annotation(self):
             {"url": "https://example.com/browse/api-123", "displayName": "api-123"}
         ]
 
-    def test_permalink_superuser(self):
+    def test_permalink_superuser(self) -> None:
         superuser = self.create_user(is_superuser=True)
         self.login_as(user=superuser, superuser=True)
 
@@ -215,7 +215,7 @@ def test_permalink_superuser(self):
         assert "http://" in result
         assert f"{group.organization.slug}/issues/{group.id}" in result
 
-    def test_permalink_sentry_app_installation_token(self):
+    def test_permalink_sentry_app_installation_token(self) -> None:
         project = self.create_project(organization=self.organization, teams=[self.team])
         internal_app = self.create_internal_integration(
             name="Internal app",
@@ -229,13 +229,13 @@ def test_permalink_sentry_app_installation_token(self):
 
         group = self.create_group(project=project)
         url = f"/api/0/issues/{group.id}/"
-        response = self.client.get(url, HTTP_AUTHORIZATION=f"Bearer {token}", format="json")
+        response = self.client.get(url, HTTP_AUTHORIZATION=f"Bearer {token.token}", format="json")
         result = response.data["permalink"]
         assert "http://" in result
         assert f"{group.organization.slug}/issues/{group.id}" in result
 
     @override_settings(SENTRY_SELF_HOSTED=False)
-    def test_ratelimit(self):
+    def test_ratelimit(self) -> None:
         self.login_as(user=self.user)
         group = self.create_group()
         url = f"/api/0/issues/{group.id}/"
@@ -245,7 +245,7 @@ def test_ratelimit(self):
             response = self.client.get(url, sort_by="date", limit=1)
             assert response.status_code == 429
 
-    def test_with_deleted_user_activity(self):
+    def test_with_deleted_user_activity(self) -> None:
         self.login_as(user=self.user)
         user = self.create_user("foo@example.com")
 
@@ -267,7 +267,7 @@ def test_with_deleted_user_activity(self):
 
         assert response.status_code == 200, response.content
 
-    def test_collapse_tags(self):
+    def test_collapse_tags(self) -> None:
         self.login_as(user=self.user)
         group = self.create_group()
         url = f"/api/0/issues/{group.id}/"
@@ -281,7 +281,7 @@ def test_collapse_tags(self):
         response = self.client.get(url, {"collapse": ["tags"]})
         assert "tags" not in response.data
 
-    def test_count_with_buffer(self):
+    def test_count_with_buffer(self) -> None:
         """Test that group count includes the count from the buffer."""
         self.login_as(user=self.user)
 
@@ -312,7 +312,7 @@ def test_count_with_buffer(self):
 
 
 class GroupUpdateTest(APITestCase):
-    def test_resolve(self):
+    def test_resolve(self) -> None:
         self.login_as(user=self.user)
 
         group = self.create_group()
@@ -329,7 +329,7 @@ def test_resolve(self):
             user_id=self.user.id, group=group, is_active=True
         ).exists()
 
-    def test_resolved_in_next_release_non_semver(self):
+    def test_resolved_in_next_release_non_semver(self) -> None:
         self.login_as(user=self.user)
         project = self.create_project_with_releases()
         group = self.create_group_with_no_release(project)
@@ -435,13 +435,13 @@ def resolved_in_next_release_helper(self, with_first_release: bool = True) -> No
         assert group.status == GroupStatus.UNRESOLVED
         assert group.substatus == GroupSubStatus.REGRESSED
 
-    def test_resolved_in_next_release_semver_no_first_release(self):
+    def test_resolved_in_next_release_semver_no_first_release(self) -> None:
         self.resolved_in_next_release_helper(with_first_release=False)
 
-    def test_resolved_in_next_release_semver_and_first_release(self):
+    def test_resolved_in_next_release_semver_and_first_release(self) -> None:
         self.resolved_in_next_release_helper(with_first_release=True)
 
-    def test_resolved_in_next_release_no_release(self):
+    def test_resolved_in_next_release_no_release(self) -> None:
         self.login_as(user=self.user)
         project = self.create_project_with_releases()
         group = self.create_group_with_no_release(project)
@@ -458,7 +458,7 @@ def test_resolved_in_next_release_no_release(self):
         assert not GroupResolution.objects.filter(group=group).exists()
         assert response.data["statusDetails"] == {}
 
-    def test_snooze_duration(self):
+    def test_snooze_duration(self) -> None:
         group = self.create_group(status=GroupStatus.RESOLVED)
 
         self.login_as(user=self.user)
@@ -486,7 +486,7 @@ def test_snooze_duration(self):
             user_id=self.user.id, group=group, is_active=True
         ).exists()
 
-    def test_bookmark(self):
+    def test_bookmark(self) -> None:
         self.login_as(user=self.user)
 
         group = self.create_group()
@@ -504,7 +504,7 @@ def test_bookmark(self):
             user_id=self.user.id, group=group, is_active=True
         ).exists()
 
-    def test_assign_username(self):
+    def test_assign_username(self) -> None:
         self.login_as(user=self.user)
 
         group = self.create_group()
@@ -540,7 +540,7 @@ def test_assign_username(self):
 
         assert not GroupAssignee.objects.filter(group=group, user_id=self.user.id).exists()
 
-    def test_assign_id(self):
+    def test_assign_id(self) -> None:
         self.login_as(user=self.user)
 
         group = self.create_group()
@@ -576,7 +576,7 @@ def test_assign_id(self):
 
         assert not GroupAssignee.objects.filter(group=group, user_id=self.user.id).exists()
 
-    def test_assign_id_via_api_key(self):
+    def test_assign_id_via_api_key(self) -> None:
         # XXX: This test is written to verify that using api keys works when
         # hitting an endpoint that uses `client.{get,put,post}` to redirect to
         # another endpoint. This catches a regression that happened when
@@ -597,7 +597,7 @@ def test_assign_id_via_api_key(self):
         assert response.status_code == 200, response.content
         assert GroupAssignee.objects.filter(group=group, user_id=self.user.id).exists()
 
-    def test_assign_team(self):
+    def test_assign_team(self) -> None:
         self.login_as(user=self.user)
 
         group = self.create_group()
@@ -626,7 +626,7 @@ def test_assign_team(self):
 
         assert not GroupAssignee.objects.filter(group=group, team=team).exists()
 
-    def test_assign_unavailable_team(self):
+    def test_assign_unavailable_team(self) -> None:
         self.login_as(user=self.user)
 
         group = self.create_group()
@@ -637,7 +637,7 @@ def test_assign_unavailable_team(self):
 
         assert response.status_code == 400, response.content
 
-    def test_mark_seen(self):
+    def test_mark_seen(self) -> None:
         self.login_as(user=self.user)
 
         group = self.create_group()
@@ -656,7 +656,7 @@ def test_mark_seen(self):
 
         assert not GroupSeen.objects.filter(group=group, user_id=self.user.id).exists()
 
-    def test_mark_seen_as_non_member(self):
+    def test_mark_seen_as_non_member(self) -> None:
         user = self.create_user("foo@example.com", is_superuser=True)
         self.login_as(user=user, superuser=True)
 
@@ -670,7 +670,7 @@ def test_mark_seen_as_non_member(self):
 
         assert not GroupSeen.objects.filter(group=group, user_id=self.user.id).exists()
 
-    def test_seen_by_deleted_user(self):
+    def test_seen_by_deleted_user(self) -> None:
         group = self.create_group()
         url = f"/api/0/issues/{group.id}/"
         self.login_as(user=self.user)
@@ -692,7 +692,7 @@ def test_seen_by_deleted_user(self):
         assert len(last_seen_data) == 1
         assert last_seen_data[0]["id"] == str(self.user.id)
 
-    def test_subscription(self):
+    def test_subscription(self) -> None:
         self.login_as(user=self.user)
         group = self.create_group()
 
@@ -711,7 +711,7 @@ def test_subscription(self):
         ).exists()
 
     @with_feature("organizations:team-workflow-notifications")
-    def test_team_subscription(self):
+    def test_team_subscription(self) -> None:
         group = self.create_group()
         team = self.create_team(organization=group.project.organization, members=[self.user])
 
@@ -752,7 +752,7 @@ def test_team_subscription(self):
         )  # user participants are processed first
         assert response.data["participants"][1]["type"] == "team"
 
-    def test_discard(self):
+    def test_discard(self) -> None:
         self.login_as(user=self.user)
         group = self.create_group()
 
@@ -775,7 +775,7 @@ def test_discard(self):
         assert tombstone.project == group.project
         assert tombstone.data == group.data
 
-    def test_discard_performance_issue(self):
+    def test_discard_performance_issue(self) -> None:
         self.login_as(user=self.user)
         group = self.create_group(type=PerformanceSlowDBQueryGroupType.type_id)
         GroupHash.objects.create(hash="x" * 32, project=group.project, group=group)
@@ -793,7 +793,7 @@ def test_discard_performance_issue(self):
         assert GroupHash.objects.filter(group_id=group.id).exists()
 
     @override_settings(SENTRY_SELF_HOSTED=False)
-    def test_ratelimit(self):
+    def test_ratelimit(self) -> None:
         self.login_as(user=self.user)
         group = self.create_group()
         url = f"/api/0/issues/{group.id}/"
@@ -805,7 +805,7 @@ def test_ratelimit(self):
 
 
 class GroupDeleteTest(APITestCase):
-    def test_delete_deferred(self):
+    def test_delete_deferred(self) -> None:
         self.login_as(user=self.user)
 
         group = self.create_group()
@@ -824,7 +824,7 @@ def test_delete_deferred(self):
 
         Group.objects.filter(id=group.id).update(status=GroupStatus.UNRESOLVED)
 
-    def test_delete_and_tasks_run(self):
+    def test_delete_and_tasks_run(self) -> None:
         self.login_as(user=self.user)
 
         group = self.create_group()
@@ -851,7 +851,7 @@ def test_delete_and_tasks_run(self):
                 == group.id
             )
 
-    def test_delete_performance_issue(self):
+    def test_delete_performance_issue(self) -> None:
         """Test that a performance issue cannot be deleted"""
         self.login_as(user=self.user)
 
@@ -868,7 +868,7 @@ def test_delete_performance_issue(self):
         assert GroupHash.objects.filter(group_id=group.id).exists()
 
     @override_settings(SENTRY_SELF_HOSTED=False)
-    def test_ratelimit(self):
+    def test_ratelimit(self) -> None:
         self.login_as(user=self.user)
         group = self.create_group()
         url = f"/api/0/issues/{group.id}/"
@@ -878,7 +878,7 @@ def test_ratelimit(self):
             response = self.client.delete(url, sort_by="date", limit=1)
             assert response.status_code == 429
 
-    def test_collapse_release(self):
+    def test_collapse_release(self) -> None:
         self.login_as(user=self.user)
         group = self.create_group()
         url = f"/api/0/issues/{group.id}/"
diff --git a/tests/sentry/issues/endpoints/test_group_event_details.py b/tests/sentry/issues/endpoints/test_group_event_details.py
index f39a938b354f83..72feb533cdefaa 100644
--- a/tests/sentry/issues/endpoints/test_group_event_details.py
+++ b/tests/sentry/issues/endpoints/test_group_event_details.py
@@ -10,7 +10,7 @@
 
 
 class GroupEventDetailsEndpointTestBase(APITestCase, SnubaTestCase):
-    def setUp(self):
+    def setUp(self) -> None:
         super().setUp()
 
         self.login_as(user=self.user)
@@ -55,7 +55,7 @@ def setUp(self):
 
 
 class GroupEventDetailsEndpointTest(GroupEventDetailsEndpointTestBase, APITestCase, SnubaTestCase):
-    def test_get_simple_latest(self):
+    def test_get_simple_latest(self) -> None:
         url = f"/api/0/issues/{self.event_a.group.id}/events/latest/"
         response = self.client.get(url, format="json")
 
@@ -64,7 +64,7 @@ def test_get_simple_latest(self):
         assert response.data["previousEventID"] == str(self.event_b.event_id)
         assert response.data["nextEventID"] is None
 
-    def test_get_simple_oldest(self):
+    def test_get_simple_oldest(self) -> None:
         url = f"/api/0/issues/{self.event_a.group.id}/events/oldest/"
         response = self.client.get(url, format="json")
 
@@ -73,7 +73,7 @@ def test_get_simple_oldest(self):
         assert response.data["previousEventID"] is None
         assert response.data["nextEventID"] == str(self.event_b.event_id)
 
-    def test_get_simple_event_id(self):
+    def test_get_simple_event_id(self) -> None:
         url = f"/api/0/issues/{self.event_b.group.id}/events/{self.event_b.event_id}/"
         response = self.client.get(url, format="json")
 
@@ -82,7 +82,7 @@ def test_get_simple_event_id(self):
         assert response.data["previousEventID"] == str(self.event_a.event_id)
         assert response.data["nextEventID"] == str(self.event_c.event_id)
 
-    def test_get_with_environment_latest(self):
+    def test_get_with_environment_latest(self) -> None:
         url = f"/api/0/issues/{self.event_a.group.id}/events/latest/"
         response = self.client.get(url, format="json", data={"environment": ["production"]})
 
@@ -91,7 +91,7 @@ def test_get_with_environment_latest(self):
         assert response.data["previousEventID"] is None
         assert response.data["nextEventID"] is None
 
-    def test_get_with_environment_oldest(self):
+    def test_get_with_environment_oldest(self) -> None:
         url = f"/api/0/issues/{self.event_a.group.id}/events/oldest/"
         response = self.client.get(url, format="json", data={"environment": ["production"]})
 
@@ -100,7 +100,7 @@ def test_get_with_environment_oldest(self):
         assert response.data["previousEventID"] is None
         assert response.data["nextEventID"] is None
 
-    def test_collapse_stacktrace_only(self):
+    def test_collapse_stacktrace_only(self) -> None:
         url = f"/api/0/issues/{self.event_a.group.id}/events/latest/"
         response = self.client.get(url, format="json", data={"collapse": ["stacktraceOnly"]})
 
@@ -109,7 +109,7 @@ def test_collapse_stacktrace_only(self):
         assert "previousEventID" not in response.data
         assert "nextEventID" not in response.data
 
-    def test_collapse_full_release(self):
+    def test_collapse_full_release(self) -> None:
         url = f"/api/0/issues/{self.event_a.group.id}/events/latest/"
         response_no_collapse = self.client.get(
             url, format="json", data={"environment": ["production"]}
@@ -138,7 +138,7 @@ def test_collapse_full_release(self):
 class GroupEventDetailsHelpfulEndpointTest(
     GroupEventDetailsEndpointTestBase, APITestCase, SnubaTestCase, OccurrenceTestMixin
 ):
-    def test_get_simple_helpful(self):
+    def test_get_simple_helpful(self) -> None:
         self.event_d = self.store_event(
             data={
                 "event_id": "d" * 32,
@@ -165,7 +165,7 @@ def test_get_simple_helpful(self):
         assert response.data["previousEventID"] == self.event_c.event_id
         assert response.data["nextEventID"] is None
 
-    def test_get_helpful_event_id(self):
+    def test_get_helpful_event_id(self) -> None:
         """
         When everything else is equal, the event_id should be used to break ties.
         """
@@ -201,7 +201,7 @@ def test_get_helpful_event_id(self):
         assert response.data["previousEventID"] == self.event_d.event_id
         assert response.data["nextEventID"] is None
 
-    def test_get_helpful_replay_id_order(self):
+    def test_get_helpful_replay_id_order(self) -> None:
         replay_id_1 = uuid.uuid4().hex
         replay_id_2 = uuid.uuid4().hex
         replay_id_1 = "b" + replay_id_1[1:]
@@ -249,7 +249,7 @@ def test_get_helpful_replay_id_order(self):
         assert response.data["previousEventID"] == str(self.event_d.event_id)
         assert response.data["nextEventID"] == str(self.event_f.event_id)
 
-    def test_with_empty_query(self):
+    def test_with_empty_query(self) -> None:
         url = f"/api/0/issues/{self.event_a.group.id}/events/recommended/"
         response = self.client.get(url, {"query": ""}, format="json")
 
@@ -258,7 +258,7 @@ def test_with_empty_query(self):
         assert response.data["previousEventID"] == str(self.event_b.event_id)
         assert response.data["nextEventID"] is None
 
-    def test_issue_filter_query_ignored(self):
+    def test_issue_filter_query_ignored(self) -> None:
         url = f"/api/0/issues/{self.event_a.group.id}/events/recommended/"
         response = self.client.get(url, {"query": "is:unresolved"}, format="json")
 
@@ -267,7 +267,7 @@ def test_issue_filter_query_ignored(self):
         assert response.data["previousEventID"] == str(self.event_b.event_id)
         assert response.data["nextEventID"] is None
 
-    def test_event_release_query(self):
+    def test_event_release_query(self) -> None:
         url = f"/api/0/issues/{self.event_a.group.id}/events/recommended/"
         response = self.client.get(url, {"query": f"release:{self.release_version}"}, format="json")
 
@@ -276,7 +276,7 @@ def test_event_release_query(self):
         assert response.data["previousEventID"] == str(self.event_b.event_id)
         assert response.data["nextEventID"] is None
 
-    def test_event_release_semver_query(self):
+    def test_event_release_semver_query(self) -> None:
         event_g = self.store_event(
             data={
                 "event_id": "1" * 32,
@@ -300,7 +300,7 @@ def test_event_release_semver_query(self):
         assert response.data["previousEventID"] is None
         assert response.data["nextEventID"] is None
 
-    def test_has_environment(self):
+    def test_has_environment(self) -> None:
         url = f"/api/0/issues/{self.event_a.group.id}/events/recommended/"
         response = self.client.get(url, {"query": "has:environment"}, format="json")
 
@@ -309,7 +309,7 @@ def test_has_environment(self):
         assert response.data["previousEventID"] == str(self.event_b.event_id)
         assert response.data["nextEventID"] is None
 
-    def test_skipped_snuba_fields_ignored(self):
+    def test_skipped_snuba_fields_ignored(self) -> None:
         event_e = self.store_event(
             data={
                 "event_id": "e" * 32,
@@ -352,7 +352,7 @@ def test_skipped_snuba_fields_ignored(self):
         assert response.data["previousEventID"] is None
         assert response.data["nextEventID"] == str(event_f.event_id)
 
-    def test_query_title(self):
+    def test_query_title(self) -> None:
         title = "four score and seven years ago"
         event_e = self.store_event(
             data={
@@ -373,11 +373,11 @@ def test_query_title(self):
         assert response.data["previousEventID"] is None
         assert response.data["nextEventID"] is None
 
-    def test_query_issue_platform_title(self):
+    def test_query_issue_platform_title(self) -> None:
         issue_title = "king of england"
         occurrence, group_info = self.process_occurrence(
             project_id=self.project.id,
-            title=issue_title,
+            issue_title=issue_title,
             event_data={"level": "info"},
         )
 
diff --git a/tests/sentry/issues/endpoints/test_group_events.py b/tests/sentry/issues/endpoints/test_group_events.py
index 7a6962efad9d79..ed6cc997366f50 100644
--- a/tests/sentry/issues/endpoints/test_group_events.py
+++ b/tests/sentry/issues/endpoints/test_group_events.py
@@ -1,6 +1,7 @@
 from datetime import timedelta
 
 from django.utils import timezone
+from rest_framework.response import Response
 
 from sentry.issues.grouptype import ProfileFileIOGroupType
 from sentry.testutils.cases import APITestCase, PerformanceIssueTestCase, SnubaTestCase
@@ -15,10 +16,10 @@ def setUp(self) -> None:
         self.min_ago = before_now(minutes=1)
         self.two_min_ago = before_now(minutes=2)
 
-    def do_request(self, url: str):
+    def do_request(self, url: str) -> Response:
         return self.client.get(url, format="json")
 
-    def _parse_links(self, header):
+    def _parse_links(self, header: str) -> dict[str | None, dict[str, str | None]]:
         # links come in {url: {...attrs}}, but we need {rel: {...attrs}}
         links = {}
         for url, attrs in parse_link_header(header).items():
diff --git a/tests/sentry/issues/endpoints/test_group_hashes.py b/tests/sentry/issues/endpoints/test_group_hashes.py
index 7d20d2774f8ce5..e6ef45c1830f46 100644
--- a/tests/sentry/issues/endpoints/test_group_hashes.py
+++ b/tests/sentry/issues/endpoints/test_group_hashes.py
@@ -8,7 +8,7 @@
 
 
 class GroupHashesTest(APITestCase, SnubaTestCase):
-    def test_only_return_latest_event(self):
+    def test_only_return_latest_event(self) -> None:
         self.login_as(user=self.user)
 
         min_ago = before_now(minutes=1).isoformat()
@@ -44,7 +44,7 @@ def test_only_return_latest_event(self):
         assert len(response.data) == 1
         assert response.data[0]["latestEvent"]["eventID"] == new_event_id
 
-    def test_return_multiple_hashes(self):
+    def test_return_multiple_hashes(self) -> None:
         self.login_as(user=self.user)
 
         min_ago = before_now(minutes=1).isoformat()
@@ -86,7 +86,7 @@ def test_return_multiple_hashes(self):
         primary_hashes = [hash["id"] for hash in response.data]
         assert primary_hashes == [event2.get_primary_hash(), event1.get_primary_hash()]
 
-    def test_unmerge(self):
+    def test_unmerge(self) -> None:
         self.login_as(user=self.user)
 
         group = self.create_group(
@@ -116,7 +116,7 @@ def test_unmerge(self):
                 tags={"platform": "javascript", "sdk": "sentry.javascript.nextjs"},
             )
 
-    def test_unmerge_put_member(self):
+    def test_unmerge_put_member(self) -> None:
         member_user = self.create_user(is_superuser=False)
         member = self.create_member(organization=self.organization, user=member_user, role="member")
         self.login_as(user=member)
@@ -148,7 +148,7 @@ def test_unmerge_put_member(self):
                 tags={"platform": "javascript", "sdk": "sentry.javascript.nextjs"},
             )
 
-    def test_unmerge_conflict(self):
+    def test_unmerge_conflict(self) -> None:
         self.login_as(user=self.user)
 
         group = self.create_group(platform="javascript")
diff --git a/tests/sentry/issues/endpoints/test_group_notes.py b/tests/sentry/issues/endpoints/test_group_notes.py
index 41dc6d6c1b0b3b..bf96220a8b512b 100644
--- a/tests/sentry/issues/endpoints/test_group_notes.py
+++ b/tests/sentry/issues/endpoints/test_group_notes.py
@@ -17,7 +17,7 @@
 
 
 class GroupNoteTest(APITestCase):
-    def test_simple(self):
+    def test_simple(self) -> None:
         group = self.group
 
         activity = Activity.objects.create(
@@ -36,7 +36,7 @@ def test_simple(self):
         assert len(response.data) == 1
         assert response.data[0]["id"] == str(activity.id)
 
-    def test_note_merge(self):
+    def test_note_merge(self) -> None:
         """Test that when 2 (or more) issues with comments are merged, the chronological order of the comments are preserved."""
         now = datetime.datetime.now(datetime.UTC)
 
@@ -104,7 +104,7 @@ def test_note_merge(self):
 
 
 class GroupNoteCreateTest(APITestCase):
-    def test_simple(self):
+    def test_simple(self) -> None:
         group = self.group
 
         self.login_as(user=self.user)
@@ -125,7 +125,7 @@ def test_simple(self):
         response = self.client.post(url, format="json", data={"text": "hello world"})
         assert response.status_code == 400, response.content
 
-    def test_with_mentions(self):
+    def test_with_mentions(self) -> None:
         user_not_on_team = self.create_user(email="hello@meow.com")
         user_on_team = self.create_user(email="hello@woof.com")
 
@@ -206,7 +206,7 @@ def test_with_mentions(self):
             reason=GroupSubscriptionReason.mentioned,
         ).exists()
 
-    def test_with_group_link(self):
+    def test_with_group_link(self) -> None:
         group = self.group
 
         integration = self.create_integration(
diff --git a/tests/sentry/issues/endpoints/test_group_notes_details.py b/tests/sentry/issues/endpoints/test_group_notes_details.py
index 4fc9aad57fa92f..c9edd470a46764 100644
--- a/tests/sentry/issues/endpoints/test_group_notes_details.py
+++ b/tests/sentry/issues/endpoints/test_group_notes_details.py
@@ -1,5 +1,5 @@
 from functools import cached_property
-from unittest.mock import patch
+from unittest.mock import MagicMock, patch
 
 import responses
 
@@ -16,7 +16,7 @@
 
 
 class GroupNotesDetailsTest(APITestCase):
-    def setUp(self):
+    def setUp(self) -> None:
         super().setUp()
         self.activity.data["external_id"] = "123"
         self.activity.save()
@@ -43,10 +43,10 @@ def setUp(self):
         )
 
     @cached_property
-    def url(self):
+    def url(self) -> str:
         return f"/api/0/issues/{self.group.id}/comments/{self.activity.id}/"
 
-    def test_delete(self):
+    def test_delete(self) -> None:
         self.login_as(user=self.user)
 
         url = self.url
@@ -59,7 +59,7 @@ def test_delete(self):
 
         assert Group.objects.get(id=self.group.id).num_comments == 0
 
-    def test_delete_comment_and_subscription(self):
+    def test_delete_comment_and_subscription(self) -> None:
         """Test that if a user deletes their comment on an issue, we delete the subscription too"""
         self.login_as(user=self.user)
         event = self.store_event(data={}, project_id=self.project.id)
@@ -91,7 +91,7 @@ def test_delete_comment_and_subscription(self):
             reason=GroupSubscriptionReason.comment,
         ).exists()
 
-    def test_delete_multiple_comments(self):
+    def test_delete_multiple_comments(self) -> None:
         """Test that if a user has commented multiple times on an issue and deletes one, we don't remove the subscription"""
         self.login_as(user=self.user)
         event = self.store_event(data={}, project_id=self.project.id)
@@ -130,7 +130,7 @@ def test_delete_multiple_comments(self):
 
     @patch("sentry.integrations.mixins.issues.IssueBasicIntegration.update_comment")
     @responses.activate
-    def test_put(self, mock_update_comment):
+    def test_put(self, mock_update_comment: MagicMock) -> None:
         self.login_as(user=self.user)
 
         url = self.url
@@ -154,7 +154,7 @@ def test_put(self, mock_update_comment):
         assert mock_update_comment.call_args[0][2] == activity
 
     @responses.activate
-    def test_put_ignore_mentions(self):
+    def test_put_ignore_mentions(self) -> None:
         GroupLink.objects.filter(group_id=self.group.id).delete()
         self.login_as(user=self.user)
 
@@ -179,7 +179,7 @@ def test_put_ignore_mentions(self):
         }
 
     @patch("sentry.integrations.mixins.issues.IssueBasicIntegration.update_comment")
-    def test_put_no_external_id(self, mock_update_comment):
+    def test_put_no_external_id(self, mock_update_comment: MagicMock) -> None:
         del self.activity.data["external_id"]
         self.activity.save()
         self.login_as(user=self.user)
diff --git a/tests/sentry/issues/endpoints/test_group_participants.py b/tests/sentry/issues/endpoints/test_group_participants.py
deleted file mode 100644
index ff72ea1569a313..00000000000000
--- a/tests/sentry/issues/endpoints/test_group_participants.py
+++ /dev/null
@@ -1,31 +0,0 @@
-from sentry.models.groupsubscription import GroupSubscription
-from sentry.testutils.cases import APITestCase
-
-
-class GroupParticipantsTest(APITestCase):
-    def setUp(self):
-        super().setUp()
-        self.login_as(self.user)
-
-    def _get_path_functions(self):
-        # The urls for group participants are supported both with an org slug and without.
-        # We test both as long as we support both.
-        # Because removing old urls takes time and consideration of the cost of breaking lingering references, a
-        # decision to permanently remove either path schema is a TODO.
-        return (
-            lambda group: f"/api/0/issues/{group.id}/participants/",
-            lambda group: f"/api/0/organizations/{self.organization.slug}/issues/{group.id}/participants/",
-        )
-
-    def test_simple(self):
-        group = self.create_group()
-        GroupSubscription.objects.create(
-            user_id=self.user.id, group=group, project=group.project, is_active=True
-        )
-
-        for path_func in self._get_path_functions():
-            path = path_func(group)
-
-            response = self.client.get(path)
-            assert len(response.data) == 1, response
-            assert response.data[0]["id"] == str(self.user.id)
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 0c6ee350588ea2..742b7f783736c5 100644
--- a/tests/sentry/issues/endpoints/test_group_similar_issues_embeddings.py
+++ b/tests/sentry/issues/endpoints/test_group_similar_issues_embeddings.py
@@ -17,7 +17,6 @@
 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
 
 EXPECTED_STACKTRACE_STRING = 'ZeroDivisionError: division by zero\n  File "python_onboarding.py", function divide_by_zero\n    divide = 1/0'
 
@@ -44,7 +43,7 @@
 
 
 class GroupSimilarIssuesEmbeddingsTest(APITestCase):
-    def setUp(self):
+    def setUp(self) -> None:
         super().setUp()
         self.login_as(self.user)
         self.org = self.create_organization(owner=self.user)
@@ -82,82 +81,6 @@ def setUp(self):
             data={"message": "Dogs are great!"}, project_id=self.project
         )
 
-    def create_exception(
-        self, exception_type_str="Exception", exception_value="it broke", frames=None
-    ):
-        frames = frames or []
-        return {
-            "id": "exception",
-            "name": "exception",
-            "contributes": True,
-            "hint": None,
-            "values": [
-                {
-                    "id": "stacktrace",
-                    "name": "stack-trace",
-                    "contributes": True,
-                    "hint": None,
-                    "values": frames,
-                },
-                {
-                    "id": "type",
-                    "name": None,
-                    "contributes": True,
-                    "hint": None,
-                    "values": [exception_type_str],
-                },
-                {
-                    "id": "value",
-                    "name": None,
-                    "contributes": False,
-                    "hint": None,
-                    "values": [exception_value],
-                },
-            ],
-        }
-
-    def create_frames(
-        self,
-        num_frames,
-        contributes=True,
-        start_index=1,
-        context_line_factory=lambda i: f"test = {i}!",
-    ):
-        frames = []
-        for i in range(start_index, start_index + num_frames):
-            frames.append(
-                {
-                    "id": "frame",
-                    "name": None,
-                    "contributes": contributes,
-                    "hint": None,
-                    "values": [
-                        {
-                            "id": "filename",
-                            "name": None,
-                            "contributes": contributes,
-                            "hint": None,
-                            "values": ["hello.py"],
-                        },
-                        {
-                            "id": "function",
-                            "name": None,
-                            "contributes": contributes,
-                            "hint": None,
-                            "values": ["hello_there"],
-                        },
-                        {
-                            "id": "context-line",
-                            "name": None,
-                            "contributes": contributes,
-                            "hint": None,
-                            "values": [context_line_factory(i)],
-                        },
-                    ],
-                }
-            )
-        return frames
-
     def get_expected_response(
         self,
         group_ids: Sequence[int],
@@ -180,19 +103,21 @@ def get_expected_response(
             )
         return response
 
-    def test_get_formatted_results(self):
+    def test_get_formatted_results(self) -> None:
         event_from_second_similar_group = save_new_event(
             {"message": "Adopt don't shop"}, self.project
         )
+        assert self.similar_event.group_id is not None
         similar_issue_data_1 = SeerSimilarIssueData(
-            parent_group_id=NonNone(self.similar_event.group_id),
-            parent_hash=NonNone(self.similar_event.get_primary_hash()),
+            parent_group_id=self.similar_event.group_id,
+            parent_hash=self.similar_event.get_primary_hash(),
             should_group=True,
             stacktrace_distance=0.00001,
         )
+        assert event_from_second_similar_group.group_id
         similar_issue_data_2 = SeerSimilarIssueData(
-            parent_group_id=NonNone(event_from_second_similar_group.group_id),
-            parent_hash=NonNone(event_from_second_similar_group.get_primary_hash()),
+            parent_group_id=event_from_second_similar_group.group_id,
+            parent_hash=event_from_second_similar_group.get_primary_hash(),
             should_group=False,
             stacktrace_distance=0.23,
         )
@@ -200,12 +125,12 @@ def test_get_formatted_results(self):
         formatted_results = group_similar_endpoint.get_formatted_results(
             similar_issues_data=[similar_issue_data_1, similar_issue_data_2],
             user=self.user,
-            group_id=self.group.id,
+            group=self.group,
         )
         assert formatted_results == self.get_expected_response(
             [
-                NonNone(self.similar_event.group_id),
-                NonNone(event_from_second_similar_group.group_id),
+                self.similar_event.group_id,
+                event_from_second_similar_group.group_id,
             ],
             [1.0000, 0.7700],
             ["Yes", "No"],
@@ -214,11 +139,16 @@ def test_get_formatted_results(self):
     @mock.patch("sentry.seer.similarity.similar_issues.metrics.incr")
     @mock.patch("sentry.seer.similarity.similar_issues.seer_grouping_connection_pool.urlopen")
     @mock.patch("sentry.issues.endpoints.group_similar_issues_embeddings.logger")
-    def test_simple(self, mock_logger, mock_seer_request, mock_metrics_incr):
+    def test_simple(
+        self,
+        mock_logger: mock.MagicMock,
+        mock_seer_request: mock.MagicMock,
+        mock_metrics_incr: mock.MagicMock,
+    ) -> None:
         seer_return_value: SimilarIssuesEmbeddingsResponse = {
             "responses": [
                 {
-                    "parent_hash": NonNone(self.similar_event.get_primary_hash()),
+                    "parent_hash": self.similar_event.get_primary_hash(),
                     "should_group": True,
                     "stacktrace_distance": 0.01,
                 }
@@ -231,14 +161,15 @@ def test_simple(self, mock_logger, mock_seer_request, mock_metrics_incr):
             data={"k": "1", "threshold": "0.01"},
         )
 
+        assert self.similar_event.group_id is not None
         assert response.data == self.get_expected_response(
-            [NonNone(self.similar_event.group_id)], [0.99], ["Yes"]
+            [self.similar_event.group_id], [0.99], ["Yes"]
         )
 
         expected_seer_request_params = {
             "threshold": 0.01,
             "event_id": self.group.get_latest_event().event_id,
-            "hash": NonNone(self.event.get_primary_hash()),
+            "hash": self.event.get_primary_hash(),
             "project_id": self.project.id,
             "stacktrace": EXPECTED_STACKTRACE_STRING,
             "exception_type": "ZeroDivisionError",
@@ -269,10 +200,10 @@ def test_simple(self, mock_logger, mock_seer_request, mock_metrics_incr):
         )
 
     @mock.patch("sentry.seer.similarity.similar_issues.seer_grouping_connection_pool.urlopen")
-    def test_simple_threads(self, mock_seer_request):
+    def test_simple_threads(self, mock_seer_request: mock.MagicMock) -> None:
         event = self.store_event(data=EVENT_WITH_THREADS_STACKTRACE, project_id=self.project)
         data = {
-            "parent_hash": NonNone(self.similar_event.get_primary_hash()),
+            "parent_hash": self.similar_event.get_primary_hash(),
             "should_group": True,
             "stacktrace_distance": 0.01,
         }
@@ -284,30 +215,31 @@ def test_simple_threads(self, mock_seer_request):
         path = f"/api/0/issues/{event.group.id}/similar-issues-embeddings/"
         response = self.client.get(path, data={"k": "1", "threshold": "0.01"})
 
+        assert self.similar_event.group_id is not None
         assert response.data == self.get_expected_response(
-            [NonNone(self.similar_event.group_id)], [0.99], ["Yes"]
+            [self.similar_event.group_id], [0.99], ["Yes"]
         )
 
     @mock.patch("sentry.analytics.record")
     @mock.patch("sentry.seer.similarity.similar_issues.seer_grouping_connection_pool.urlopen")
-    def test_multiple(self, mock_seer_request, mock_record):
+    def test_multiple(self, mock_seer_request: mock.MagicMock, mock_record: mock.MagicMock) -> None:
         over_threshold_group_event = save_new_event({"message": "Maisey is silly"}, self.project)
         under_threshold_group_event = save_new_event({"message": "Charlie is goofy"}, self.project)
 
         seer_return_value: SimilarIssuesEmbeddingsResponse = {
             "responses": [
                 {
-                    "parent_hash": NonNone(self.similar_event.get_primary_hash()),
+                    "parent_hash": self.similar_event.get_primary_hash(),
                     "should_group": True,
                     "stacktrace_distance": 0.002,  # Over threshold
                 },
                 {
-                    "parent_hash": NonNone(over_threshold_group_event.get_primary_hash()),
+                    "parent_hash": over_threshold_group_event.get_primary_hash(),
                     "should_group": True,
                     "stacktrace_distance": 0.002,  # Over threshold
                 },
                 {
-                    "parent_hash": NonNone(under_threshold_group_event.get_primary_hash()),
+                    "parent_hash": under_threshold_group_event.get_primary_hash(),
                     "should_group": False,
                     "stacktrace_distance": 0.05,  # Under threshold
                 },
@@ -320,11 +252,14 @@ def test_multiple(self, mock_seer_request, mock_record):
             data={"k": "1", "threshold": "0.01"},
         )
 
+        assert self.similar_event.group_id is not None
+        assert over_threshold_group_event.group_id is not None
+        assert under_threshold_group_event.group_id is not None
         assert response.data == self.get_expected_response(
             [
-                NonNone(self.similar_event.group_id),
-                NonNone(over_threshold_group_event.group_id),
-                NonNone(under_threshold_group_event.group_id),
+                self.similar_event.group_id,
+                over_threshold_group_event.group_id,
+                under_threshold_group_event.group_id,
             ],
             [0.998, 0.998, 0.95],
             ["Yes", "Yes", "No"],
@@ -335,13 +270,13 @@ def test_multiple(self, mock_seer_request, mock_record):
             organization_id=self.org.id,
             project_id=self.project.id,
             group_id=self.group.id,
-            hash=NonNone(self.event.get_primary_hash()),
+            hash=self.event.get_primary_hash(),
             count_over_threshold=2,
             user_id=self.user.id,
         )
 
     @mock.patch("sentry.seer.similarity.similar_issues.seer_grouping_connection_pool.urlopen")
-    def test_parent_hash_in_group_hashes(self, mock_seer_request):
+    def test_parent_hash_in_group_hashes(self, mock_seer_request: mock.MagicMock) -> None:
         """
         Test that the request group's hashes are filtered out of the returned similar parent hashes
         """
@@ -363,20 +298,26 @@ def test_parent_hash_in_group_hashes(self, mock_seer_request):
         mock_seer_request.return_value = HTTPResponse(orjson.dumps(seer_return_value), status=200)
         response = self.client.get(self.path)
 
+        assert self.similar_event.group_id is not None
         assert response.data == self.get_expected_response(
-            [NonNone(self.similar_event.group_id)], [0.99], ["Yes"]
+            [self.similar_event.group_id], [0.99], ["Yes"]
         )
 
     @mock.patch("sentry.seer.similarity.similar_issues.metrics.incr")
     @mock.patch("sentry.seer.similarity.similar_issues.logger")
     @mock.patch("sentry.seer.similarity.similar_issues.seer_grouping_connection_pool.urlopen")
-    def test_incomplete_return_data(self, mock_seer_request, mock_logger, mock_metrics_incr):
+    def test_incomplete_return_data(
+        self,
+        mock_seer_request: mock.MagicMock,
+        mock_logger: mock.MagicMock,
+        mock_metrics_incr: mock.MagicMock,
+    ) -> None:
         # Two suggested groups, one with valid data, one missing parent hash. We should log the
         # second and return the first.
         seer_return_value: Any = {
             "responses": [
                 {
-                    "parent_hash": NonNone(self.similar_event.get_primary_hash()),
+                    "parent_hash": self.similar_event.get_primary_hash(),
                     "should_group": True,
                     "stacktrace_distance": 0.01,
                 },
@@ -395,7 +336,7 @@ def test_incomplete_return_data(self, mock_seer_request, mock_logger, mock_metri
             extra={
                 "request_params": {
                     "event_id": self.group.get_latest_event().event_id,
-                    "hash": NonNone(self.event.get_primary_hash()),
+                    "hash": self.event.get_primary_hash(),
                     "project_id": self.project.id,
                     "stacktrace": EXPECTED_STACKTRACE_STRING,
                     "exception_type": "ZeroDivisionError",
@@ -420,8 +361,9 @@ def test_incomplete_return_data(self, mock_seer_request, mock_logger, mock_metri
             },
         )
 
+        assert self.similar_event.group_id is not None
         assert response.data == self.get_expected_response(
-            [NonNone(self.similar_event.group_id)], [0.99], ["Yes"]
+            [self.similar_event.group_id], [0.99], ["Yes"]
         )
 
     @mock.patch("sentry.seer.similarity.similar_issues.delete_seer_grouping_records_by_hash")
@@ -430,11 +372,11 @@ def test_incomplete_return_data(self, mock_seer_request, mock_logger, mock_metri
     @mock.patch("sentry.seer.similarity.similar_issues.seer_grouping_connection_pool.urlopen")
     def test_nonexistent_grouphash(
         self,
-        mock_seer_similarity_request,
-        mock_logger,
-        mock_metrics_incr,
-        mock_seer_deletion_request,
-    ):
+        mock_seer_similarity_request: mock.MagicMock,
+        mock_logger: mock.MagicMock,
+        mock_metrics_incr: mock.MagicMock,
+        mock_seer_deletion_request: mock.MagicMock,
+    ) -> None:
         """
         The seer API can return grouphashes that do not exist if their groups have been deleted/merged.
         Test info about these groups is not returned.
@@ -444,7 +386,7 @@ def test_nonexistent_grouphash(
             # We should log the second and return the first.
             "responses": [
                 {
-                    "parent_hash": NonNone(self.similar_event.get_primary_hash()),
+                    "parent_hash": self.similar_event.get_primary_hash(),
                     "should_group": True,
                     "stacktrace_distance": 0.01,
                 },
@@ -470,13 +412,14 @@ def test_nonexistent_grouphash(
                 "referrer": "similar_issues",
             },
         )
+        assert self.similar_event.group_id
         assert response.data == self.get_expected_response(
-            [NonNone(self.similar_event.group_id)], [0.99], ["Yes"]
+            [self.similar_event.group_id], [0.99], ["Yes"]
         )
         mock_logger.warning.assert_called_with(
             "get_similarity_data_from_seer.parent_hash_not_found",
             extra={
-                "hash": NonNone(self.event.get_primary_hash()),
+                "hash": self.event.get_primary_hash(),
                 "parent_hash": "not a real hash",
                 "project_id": self.project.id,
                 "event_id": self.event.event_id,
@@ -490,11 +433,11 @@ def test_nonexistent_grouphash(
     @mock.patch("sentry.seer.similarity.similar_issues.seer_grouping_connection_pool.urlopen")
     def test_grouphash_with_no_group(
         self,
-        mock_seer_similarity_request,
-        mock_logger,
-        mock_metrics_incr,
-        mock_seer_deletion_request,
-    ):
+        mock_seer_similarity_request: mock.MagicMock,
+        mock_logger: mock.MagicMock,
+        mock_metrics_incr: mock.MagicMock,
+        mock_seer_deletion_request: mock.MagicMock,
+    ) -> None:
         """
         The seer API can return groups that do not exist if they have been deleted/merged.
         Test that these groups are not returned.
@@ -531,7 +474,7 @@ def test_grouphash_with_no_group(
         mock_logger.warning.assert_called_with(
             "get_similarity_data_from_seer.parent_hash_missing_group",
             extra={
-                "hash": NonNone(self.event.get_primary_hash()),
+                "hash": self.event.get_primary_hash(),
                 "parent_hash": "dogs are great",
                 "project_id": self.project.id,
                 "event_id": self.event.event_id,
@@ -540,7 +483,9 @@ def test_grouphash_with_no_group(
 
     @mock.patch("sentry.analytics.record")
     @mock.patch("sentry.seer.similarity.similar_issues.seer_grouping_connection_pool.urlopen")
-    def test_empty_seer_return(self, mock_seer_request, mock_record):
+    def test_empty_seer_return(
+        self, mock_seer_request: mock.MagicMock, mock_record: mock.MagicMock
+    ) -> None:
         mock_seer_request.return_value = HTTPResponse([], status=200)
         response = self.client.get(self.path)
         assert response.data == []
@@ -550,12 +495,12 @@ def test_empty_seer_return(self, mock_seer_request, mock_record):
             organization_id=self.org.id,
             project_id=self.project.id,
             group_id=self.group.id,
-            hash=NonNone(self.event.get_primary_hash()),
+            hash=self.event.get_primary_hash(),
             count_over_threshold=0,
             user_id=self.user.id,
         )
 
-    def test_no_contributing_exception(self):
+    def test_no_contributing_exception(self) -> None:
         data_no_contributing_exception = {
             "fingerprint": ["message"],
             "message": "Message",
@@ -595,7 +540,7 @@ def test_no_contributing_exception(self):
 
         assert response.data == []
 
-    def test_no_exception(self):
+    def test_no_exception(self) -> None:
         event_no_exception = self.store_event(data={}, project_id=self.project)
         group_no_exception = event_no_exception.group
         assert group_no_exception
@@ -607,7 +552,7 @@ def test_no_exception(self):
         assert response.data == []
 
     @mock.patch("sentry.models.group.Group.get_latest_event")
-    def test_no_latest_event(self, mock_get_latest_event):
+    def test_no_latest_event(self, mock_get_latest_event: mock.MagicMock) -> None:
         mock_get_latest_event.return_value = None
 
         response = self.client.get(
@@ -618,7 +563,7 @@ def test_no_latest_event(self, mock_get_latest_event):
         assert response.data == []
 
     @mock.patch("sentry.issues.endpoints.group_similar_issues_embeddings.get_stacktrace_string")
-    def test_no_stacktrace_string(self, mock_get_stacktrace_string):
+    def test_no_stacktrace_string(self, mock_get_stacktrace_string: mock.MagicMock) -> None:
         mock_get_stacktrace_string.return_value = ""
 
         response = self.client.get(
@@ -629,14 +574,14 @@ def test_no_stacktrace_string(self, mock_get_stacktrace_string):
         assert response.data == []
 
     @mock.patch("sentry.seer.similarity.similar_issues.seer_grouping_connection_pool.urlopen")
-    def test_no_optional_params(self, mock_seer_request):
+    def test_no_optional_params(self, mock_seer_request: mock.MagicMock) -> None:
         """
         Test that optional parameters, k, threshold, and read_only can not be included.
         """
         seer_return_value: SimilarIssuesEmbeddingsResponse = {
             "responses": [
                 {
-                    "parent_hash": NonNone(self.similar_event.get_primary_hash()),
+                    "parent_hash": self.similar_event.get_primary_hash(),
                     "should_group": True,
                     "stacktrace_distance": 0.01,
                 }
@@ -650,8 +595,9 @@ def test_no_optional_params(self, mock_seer_request):
             self.path,
             # optional params would be here
         )
+        assert self.similar_event.group_id is not None
         assert response.data == self.get_expected_response(
-            [NonNone(self.similar_event.group_id)], [0.99], ["Yes"]
+            [self.similar_event.group_id], [0.99], ["Yes"]
         )
 
         mock_seer_request.assert_called_with(
@@ -661,7 +607,7 @@ def test_no_optional_params(self, mock_seer_request):
                 {
                     "threshold": 0.01,
                     "event_id": self.group.get_latest_event().event_id,
-                    "hash": NonNone(self.event.get_primary_hash()),
+                    "hash": self.event.get_primary_hash(),
                     "project_id": self.project.id,
                     "stacktrace": EXPECTED_STACKTRACE_STRING,
                     "exception_type": "ZeroDivisionError",
@@ -674,12 +620,10 @@ def test_no_optional_params(self, mock_seer_request):
         )
 
         # Include k
-        response = self.client.get(
-            self.path,
-            data={"k": 1},
-        )
+        response = self.client.get(self.path, data={"k": 1})
+        assert self.similar_event.group_id is not None
         assert response.data == self.get_expected_response(
-            [NonNone(self.similar_event.group_id)], [0.99], ["Yes"]
+            [self.similar_event.group_id], [0.99], ["Yes"]
         )
 
         mock_seer_request.assert_called_with(
@@ -689,7 +633,7 @@ def test_no_optional_params(self, mock_seer_request):
                 {
                     "threshold": 0.01,
                     "event_id": self.group.get_latest_event().event_id,
-                    "hash": NonNone(self.event.get_primary_hash()),
+                    "hash": self.event.get_primary_hash(),
                     "project_id": self.project.id,
                     "stacktrace": EXPECTED_STACKTRACE_STRING,
                     "exception_type": "ZeroDivisionError",
@@ -708,7 +652,7 @@ def test_no_optional_params(self, mock_seer_request):
             data={"threshold": "0.01"},
         )
         assert response.data == self.get_expected_response(
-            [NonNone(self.similar_event.group_id)], [0.99], ["Yes"]
+            [self.similar_event.group_id], [0.99], ["Yes"]
         )
 
         mock_seer_request.assert_called_with(
@@ -718,7 +662,7 @@ def test_no_optional_params(self, mock_seer_request):
                 {
                     "threshold": 0.01,
                     "event_id": self.group.get_latest_event().event_id,
-                    "hash": NonNone(self.event.get_primary_hash()),
+                    "hash": self.event.get_primary_hash(),
                     "project_id": self.project.id,
                     "stacktrace": EXPECTED_STACKTRACE_STRING,
                     "exception_type": "ZeroDivisionError",
@@ -731,7 +675,7 @@ def test_no_optional_params(self, mock_seer_request):
         )
 
     @mock.patch("sentry.seer.similarity.similar_issues.seer_grouping_connection_pool.urlopen")
-    def test_obeys_useReranking_query_param(self, mock_seer_request):
+    def test_obeys_useReranking_query_param(self, mock_seer_request: mock.MagicMock) -> None:
         for incoming_value, outgoing_value in [("true", True), ("false", False)]:
             self.client.get(self.path, data={"useReranking": incoming_value})
 
@@ -741,16 +685,16 @@ def test_obeys_useReranking_query_param(self, mock_seer_request):
 
             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}')"
+    def test_too_many_system_frames(self) -> None:
+        error_type = "FailedToFetchError"
+        error_value = "Charlie didn't bring the ball back"
+        context_line = f"raise {error_type}('{error_value}')"
         error_data = {
             "exception": {
                 "values": [
                     {
-                        "type": type,
-                        "value": value,
+                        "type": error_type,
+                        "value": error_value,
                         "stacktrace": {
                             "frames": [
                                 {
@@ -774,16 +718,16 @@ def test_too_many_system_frames(self):
         )
         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}')"
+    def test_no_filename_or_module(self) -> None:
+        error_type = "FailedToFetchError"
+        error_value = "Charlie didn't bring the ball back"
+        context_line = f"raise {error_type}('{error_value}')"
         error_data = {
             "exception": {
                 "values": [
                     {
-                        "type": type,
-                        "value": value,
+                        "type": error_type,
+                        "value": error_value,
                         "stacktrace": {
                             "frames": [
                                 {
diff --git a/tests/sentry/issues/endpoints/test_group_tombstone.py b/tests/sentry/issues/endpoints/test_group_tombstone.py
index a1fc31108ecad8..27ad487de164f8 100644
--- a/tests/sentry/issues/endpoints/test_group_tombstone.py
+++ b/tests/sentry/issues/endpoints/test_group_tombstone.py
@@ -6,7 +6,7 @@
 
 
 class GroupTombstoneTest(APITestCase):
-    def test_simple(self):
+    def test_simple(self) -> None:
         self.user = self.create_user("foo@example.com")
         self.org = self.create_organization(owner=self.user, name="Rowdy Tiger")
         self.team = self.create_team(organization=self.org, name="Mariachi Band")
diff --git a/tests/sentry/issues/endpoints/test_group_tombstone_details.py b/tests/sentry/issues/endpoints/test_group_tombstone_details.py
index e48ed07d57f126..906848afc0947c 100644
--- a/tests/sentry/issues/endpoints/test_group_tombstone_details.py
+++ b/tests/sentry/issues/endpoints/test_group_tombstone_details.py
@@ -6,7 +6,7 @@
 
 
 class GroupTombstoneDetailsTest(APITestCase):
-    def test_delete(self):
+    def test_delete(self) -> None:
         self.user = self.create_user("foo@example.com")
         self.org = self.create_organization(owner=self.user, name="Rowdy Tiger")
         self.team = self.create_team(organization=self.org, name="Mariachi Band")
@@ -39,7 +39,7 @@ def test_delete(self):
         assert response.status_code == 204, response
         assert not GroupHash.objects.filter(group_tombstone_id=tombstone.id).exists()
 
-    def test_dont_delete_from_other_proj(self):
+    def test_dont_delete_from_other_proj(self) -> None:
         self.user = self.create_user("foo@example.com")
         self.org = self.create_organization(owner=self.user, name="Rowdy Tiger")
         self.team = self.create_team(organization=self.org, name="Mariachi Band")
diff --git a/tests/sentry/issues/endpoints/test_organization_group_index.py b/tests/sentry/issues/endpoints/test_organization_group_index.py
index 166fb5bac8ba3d..e2109231b1c664 100644
--- a/tests/sentry/issues/endpoints/test_organization_group_index.py
+++ b/tests/sentry/issues/endpoints/test_organization_group_index.py
@@ -1,10 +1,9 @@
 import functools
-from datetime import UTC, datetime, timedelta
+from datetime import datetime, timedelta
 from time import sleep
 from unittest.mock import MagicMock, Mock, call, patch
 from uuid import uuid4
 
-from dateutil.parser import parse as parse_datetime
 from django.urls import reverse
 from django.utils import timezone
 
@@ -59,7 +58,7 @@
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import APITestCase, SnubaTestCase
 from sentry.testutils.helpers import parse_link_header
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.helpers.features import Feature, apply_feature_flag_on_cls, with_feature
 from sentry.testutils.helpers.options import override_options
 from sentry.testutils.silo import assume_test_silo_mode
@@ -84,7 +83,7 @@ def setUp(self) -> None:
         super().setUp()
         self.min_ago = before_now(minutes=1)
 
-    def _parse_links(self, header):
+    def _parse_links(self, header: str) -> dict[str | None, dict[str, str | None]]:
         # links come in {url: {...attrs}}, but we need {rel: {...attrs}}
         links = {}
         for url, attrs in parse_link_header(header).items():
@@ -102,7 +101,7 @@ def get_response(self, *args, **kwargs):
     def test_sort_by_date_with_tag(self, _: MagicMock) -> None:
         # XXX(dcramer): this tests a case where an ambiguous column name existed
         event = self.store_event(
-            data={"event_id": "a" * 32, "timestamp": iso_format(before_now(seconds=1))},
+            data={"event_id": "a" * 32, "timestamp": before_now(seconds=1).isoformat()},
             project_id=self.project.id,
         )
         group = event.group
@@ -114,7 +113,7 @@ def test_sort_by_date_with_tag(self, _: MagicMock) -> None:
 
     def test_query_for_archived(self, _: MagicMock) -> None:
         event = self.store_event(
-            data={"event_id": "a" * 32, "timestamp": iso_format(before_now(seconds=1))},
+            data={"event_id": "a" * 32, "timestamp": before_now(seconds=1).isoformat()},
             project_id=self.project.id,
         )
         group = event.group
@@ -130,21 +129,21 @@ def test_query_for_archived(self, _: MagicMock) -> None:
     def test_sort_by_trends(self, mock_query: MagicMock) -> None:
         group = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=10)),
+                "timestamp": before_now(seconds=10).isoformat(),
                 "fingerprint": ["group-1"],
             },
             project_id=self.project.id,
         ).group
         self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=10)),
+                "timestamp": before_now(seconds=10).isoformat(),
                 "fingerprint": ["group-1"],
             },
             project_id=self.project.id,
         )
         self.store_event(
             data={
-                "timestamp": iso_format(before_now(hours=13)),
+                "timestamp": before_now(hours=13).isoformat(),
                 "fingerprint": ["group-1"],
             },
             project_id=self.project.id,
@@ -152,21 +151,21 @@ def test_sort_by_trends(self, mock_query: MagicMock) -> None:
 
         group_2 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=5)),
+                "timestamp": before_now(seconds=5).isoformat(),
                 "fingerprint": ["group-2"],
             },
             project_id=self.project.id,
         ).group
         self.store_event(
             data={
-                "timestamp": iso_format(before_now(hours=13)),
+                "timestamp": before_now(hours=13).isoformat(),
                 "fingerprint": ["group-2"],
             },
             project_id=self.project.id,
         )
         self.login_as(user=self.user)
 
-        aggregate_kwargs: dict = {
+        aggregate_kwargs: dict[str, str] = {
             "log_level": "3",
             "has_stacktrace": "5",
             "relative_volume": "1",
@@ -180,8 +179,8 @@ def test_sort_by_trends(self, mock_query: MagicMock) -> None:
             sort="trends",
             query="is:unresolved",
             limit=25,
-            start=iso_format(before_now(days=1)),
-            end=iso_format(before_now(seconds=1)),
+            start=before_now(days=1).isoformat(),
+            end=before_now(seconds=1).isoformat(),
             **aggregate_kwargs,
         )
         assert len(response.data) == 2
@@ -192,7 +191,7 @@ def test_sort_by_inbox(self, _: MagicMock) -> None:
         group_1 = self.store_event(
             data={
                 "event_id": "a" * 32,
-                "timestamp": iso_format(before_now(seconds=1)),
+                "timestamp": before_now(seconds=1).isoformat(),
                 "fingerprint": ["group-1"],
             },
             project_id=self.project.id,
@@ -201,7 +200,7 @@ def test_sort_by_inbox(self, _: MagicMock) -> None:
         group_2 = self.store_event(
             data={
                 "event_id": "a" * 32,
-                "timestamp": iso_format(before_now(seconds=1)),
+                "timestamp": before_now(seconds=1).isoformat(),
                 "fingerprint": ["group-2"],
             },
             project_id=self.project.id,
@@ -227,7 +226,7 @@ def test_sort_by_inbox_me_or_none(self, _: MagicMock) -> None:
         group_1 = self.store_event(
             data={
                 "event_id": "a" * 32,
-                "timestamp": iso_format(before_now(seconds=1)),
+                "timestamp": before_now(seconds=1).isoformat(),
                 "fingerprint": ["group-1"],
             },
             project_id=self.project.id,
@@ -236,7 +235,7 @@ def test_sort_by_inbox_me_or_none(self, _: MagicMock) -> None:
         group_2 = self.store_event(
             data={
                 "event_id": "b" * 32,
-                "timestamp": iso_format(before_now(seconds=1)),
+                "timestamp": before_now(seconds=1).isoformat(),
                 "fingerprint": ["group-2"],
             },
             project_id=self.project.id,
@@ -253,7 +252,7 @@ def test_sort_by_inbox_me_or_none(self, _: MagicMock) -> None:
         owner_by_other = self.store_event(
             data={
                 "event_id": "c" * 32,
-                "timestamp": iso_format(before_now(seconds=1)),
+                "timestamp": before_now(seconds=1).isoformat(),
                 "fingerprint": ["group-3"],
             },
             project_id=self.project.id,
@@ -272,7 +271,7 @@ def test_sort_by_inbox_me_or_none(self, _: MagicMock) -> None:
         owned_me_assigned_to_other = self.store_event(
             data={
                 "event_id": "d" * 32,
-                "timestamp": iso_format(before_now(seconds=1)),
+                "timestamp": before_now(seconds=1).isoformat(),
                 "fingerprint": ["group-4"],
             },
             project_id=self.project.id,
@@ -291,7 +290,7 @@ def test_sort_by_inbox_me_or_none(self, _: MagicMock) -> None:
         unowned_assigned_to_other = self.store_event(
             data={
                 "event_id": "e" * 32,
-                "timestamp": iso_format(before_now(seconds=1)),
+                "timestamp": before_now(seconds=1).isoformat(),
                 "fingerprint": ["group-5"],
             },
             project_id=self.project.id,
@@ -312,7 +311,7 @@ def test_trace_search(self, _: MagicMock) -> None:
         event = self.store_event(
             data={
                 "event_id": "a" * 32,
-                "timestamp": iso_format(before_now(seconds=1)),
+                "timestamp": before_now(seconds=1).isoformat(),
                 "contexts": {
                     "trace": {
                         "parent_span_id": "8988cec7cc0779c1",
@@ -412,12 +411,12 @@ def test_invalid_sort_key(self, _: MagicMock) -> None:
 
     def test_simple_pagination(self, _: MagicMock) -> None:
         event1 = self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=2)), "fingerprint": ["group-1"]},
+            data={"timestamp": before_now(seconds=2).isoformat(), "fingerprint": ["group-1"]},
             project_id=self.project.id,
         )
         group1 = event1.group
         event2 = self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=1)), "fingerprint": ["group-2"]},
+            data={"timestamp": before_now(seconds=1).isoformat(), "fingerprint": ["group-2"]},
             project_id=self.project.id,
         )
         group2 = event2.group
@@ -430,6 +429,7 @@ def test_simple_pagination(self, _: MagicMock) -> None:
 
         assert links["previous"]["results"] == "false"
         assert links["next"]["results"] == "true"
+        assert links["next"]["href"] is not None
 
         response = self.client.get(links["next"]["href"], format="json")
         assert response.status_code == 200
@@ -460,7 +460,7 @@ def test_environment(self, _: MagicMock) -> None:
         self.store_event(
             data={
                 "fingerprint": ["put-me-in-group1"],
-                "timestamp": iso_format(self.min_ago),
+                "timestamp": self.min_ago.isoformat(),
                 "environment": "production",
             },
             project_id=self.project.id,
@@ -468,7 +468,7 @@ def test_environment(self, _: MagicMock) -> None:
         self.store_event(
             data={
                 "fingerprint": ["put-me-in-group2"],
-                "timestamp": iso_format(self.min_ago),
+                "timestamp": self.min_ago.isoformat(),
                 "environment": "staging",
             },
             project_id=self.project.id,
@@ -487,7 +487,7 @@ def test_project(self, _: MagicMock) -> None:
         self.store_event(
             data={
                 "fingerprint": ["put-me-in-group1"],
-                "timestamp": iso_format(self.min_ago),
+                "timestamp": self.min_ago.isoformat(),
                 "environment": "production",
             },
             project_id=self.project.id,
@@ -505,11 +505,11 @@ def test_auto_resolved(self, _: MagicMock) -> None:
         project = self.project
         project.update_option("sentry:resolve_age", 1)
         self.store_event(
-            data={"event_id": "a" * 32, "timestamp": iso_format(before_now(seconds=1))},
+            data={"event_id": "a" * 32, "timestamp": before_now(seconds=1).isoformat()},
             project_id=project.id,
         )
         event2 = self.store_event(
-            data={"event_id": "b" * 32, "timestamp": iso_format(before_now(seconds=1))},
+            data={"event_id": "b" * 32, "timestamp": before_now(seconds=1).isoformat()},
             project_id=project.id,
         )
         group2 = event2.group
@@ -537,7 +537,7 @@ def test_lookup_by_event_id(self, _: MagicMock) -> None:
         project.update_option("sentry:resolve_age", 1)
         event_id = "c" * 32
         event = self.store_event(
-            data={"event_id": event_id, "timestamp": iso_format(self.min_ago)},
+            data={"event_id": event_id, "timestamp": self.min_ago.isoformat()},
             project_id=self.project.id,
         )
 
@@ -551,12 +551,12 @@ def test_lookup_by_event_id(self, _: MagicMock) -> None:
 
     def test_lookup_by_event_id_incorrect_project_id(self, _: MagicMock) -> None:
         self.store_event(
-            data={"event_id": "a" * 32, "timestamp": iso_format(self.min_ago)},
+            data={"event_id": "a" * 32, "timestamp": self.min_ago.isoformat()},
             project_id=self.project.id,
         )
         event_id = "b" * 32
         event = self.store_event(
-            data={"event_id": event_id, "timestamp": iso_format(self.min_ago)},
+            data={"event_id": event_id, "timestamp": self.min_ago.isoformat()},
             project_id=self.project.id,
         )
 
@@ -577,7 +577,7 @@ def test_lookup_by_event_id_with_whitespace(self, _: MagicMock) -> None:
         project.update_option("sentry:resolve_age", 1)
         event_id = "c" * 32
         event = self.store_event(
-            data={"event_id": event_id, "timestamp": iso_format(self.min_ago)},
+            data={"event_id": event_id, "timestamp": self.min_ago.isoformat()},
             project_id=self.project.id,
         )
 
@@ -610,7 +610,7 @@ def test_lookup_by_short_id(self, _: MagicMock) -> None:
     def test_lookup_by_short_id_alias(self, _: MagicMock) -> None:
         event_id = "f" * 32
         group = self.store_event(
-            data={"event_id": event_id, "timestamp": iso_format(before_now(seconds=1))},
+            data={"event_id": event_id, "timestamp": before_now(seconds=1).isoformat()},
             project_id=self.project.id,
         ).group
         short_id = group.qualified_short_id
@@ -625,11 +625,11 @@ def test_lookup_by_multiple_short_id_alias(self, _: MagicMock) -> None:
         project = self.project
         project2 = self.create_project(name="baz", organization=project.organization)
         event = self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=2))},
+            data={"timestamp": before_now(seconds=2).isoformat()},
             project_id=project.id,
         )
         event2 = self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=1))},
+            data={"timestamp": before_now(seconds=1).isoformat()},
             project_id=project2.id,
         )
         with self.feature("organizations:global-views"):
@@ -708,11 +708,11 @@ def test_lookup_by_first_release(self, _: MagicMock) -> None:
         release.add_project(project)
         release.add_project(project2)
         event = self.store_event(
-            data={"release": release.version, "timestamp": iso_format(before_now(seconds=2))},
+            data={"release": release.version, "timestamp": before_now(seconds=2).isoformat()},
             project_id=project.id,
         )
         event2 = self.store_event(
-            data={"release": release.version, "timestamp": iso_format(before_now(seconds=1))},
+            data={"release": release.version, "timestamp": before_now(seconds=1).isoformat()},
             project_id=project2.id,
         )
 
@@ -741,7 +741,7 @@ def test_lookup_by_release(self, _: MagicMock) -> None:
         release.add_project(project)
         event = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=1)),
+                "timestamp": before_now(seconds=1).isoformat(),
                 "tags": {"sentry:release": release.version},
             },
             project_id=project.id,
@@ -765,7 +765,7 @@ def test_release_package_in(self, _: MagicMock) -> None:
         event1 = self.store_event(
             data={
                 "release": release1.version,
-                "timestamp": iso_format(before_now(seconds=3)),
+                "timestamp": before_now(seconds=3).isoformat(),
                 "fingerprint": ["1"],
             },
             project_id=project.id,
@@ -773,7 +773,7 @@ def test_release_package_in(self, _: MagicMock) -> None:
         event2 = self.store_event(
             data={
                 "release": release2.version,
-                "timestamp": iso_format(before_now(seconds=2)),
+                "timestamp": before_now(seconds=2).isoformat(),
                 "fingerprint": ["2"],
             },
             project_id=project.id,
@@ -781,7 +781,7 @@ def test_release_package_in(self, _: MagicMock) -> None:
         self.store_event(
             data={
                 "release": release3.version,
-                "timestamp": iso_format(before_now(seconds=2)),
+                "timestamp": before_now(seconds=2).isoformat(),
                 "fingerprint": ["3"],
             },
             project_id=project.id,
@@ -801,7 +801,7 @@ def test_lookup_by_release_wildcard(self, _: MagicMock) -> None:
         release.add_project(project)
         event = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=1)),
+                "timestamp": before_now(seconds=1).isoformat(),
                 "tags": {"sentry:release": release.version},
             },
             project_id=project.id,
@@ -818,7 +818,7 @@ def test_lookup_by_regressed_in_release(self, _: MagicMock) -> None:
         release = self.create_release()
         event = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=1)),
+                "timestamp": before_now(seconds=1).isoformat(),
                 "tags": {"sentry:release": release.version},
             },
             project_id=project.id,
@@ -836,7 +836,7 @@ def test_pending_delete_pending_merge_excluded(self, _: MagicMock) -> None:
                     data={
                         "event_id": i * 32,
                         "fingerprint": [i],
-                        "timestamp": iso_format(self.min_ago),
+                        "timestamp": self.min_ago.isoformat(),
                     },
                     project_id=self.project.id,
                 )
@@ -874,7 +874,7 @@ def test_token_auth(self, _: MagicMock) -> None:
     def test_date_range(self, _: MagicMock) -> None:
         with self.options({"system.event-retention-days": 2}):
             event = self.store_event(
-                data={"timestamp": iso_format(before_now(hours=5))}, project_id=self.project.id
+                data={"timestamp": before_now(hours=5).isoformat()}, project_id=self.project.id
             )
             group = event.group
 
@@ -931,7 +931,7 @@ def test_assigned_to_pagination(self, patched_params_update: MagicMock, _: Magic
             ]
             group = self.store_event(
                 data={
-                    "timestamp": iso_format(before_now(days=day)),
+                    "timestamp": before_now(days=day).isoformat(),
                     "fingerprint": [f"group-{day}"],
                 },
                 project_id=self.project.id,
@@ -980,7 +980,7 @@ def test_assigned_me_none(self, _: MagicMock) -> None:
         for i in range(5):
             group = self.store_event(
                 data={
-                    "timestamp": iso_format(before_now(minutes=10, days=i)),
+                    "timestamp": before_now(minutes=10, days=i).isoformat(),
                     "fingerprint": [f"group-{i}"],
                 },
                 project_id=self.project.id,
@@ -1005,7 +1005,7 @@ def test_assigned_me_none(self, _: MagicMock) -> None:
 
     def test_seen_stats(self, _: MagicMock) -> None:
         self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=500)), "fingerprint": ["group-1"]},
+            data={"timestamp": before_now(seconds=500).isoformat(), "fingerprint": ["group-1"]},
             project_id=self.project.id,
         )
         before_now_300_seconds = before_now(seconds=300).isoformat()
@@ -1018,7 +1018,7 @@ def test_seen_stats(self, _: MagicMock) -> None:
         group2.first_seen = datetime.fromisoformat(before_now_350_seconds)
         group2.times_seen = 55
         group2.save()
-        before_now_250_seconds = iso_format(before_now(seconds=250))
+        before_now_250_seconds = before_now(seconds=250).replace(microsecond=0).isoformat()
         self.store_event(
             data={
                 "timestamp": before_now_250_seconds,
@@ -1029,13 +1029,13 @@ def test_seen_stats(self, _: MagicMock) -> None:
         )
         self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=200)),
+                "timestamp": before_now(seconds=200).isoformat(),
                 "fingerprint": ["group-1"],
                 "tags": {"server": "example.com", "trace": "woof", "message": "foo"},
             },
             project_id=self.project.id,
         )
-        before_now_150_seconds = iso_format(before_now(seconds=150))
+        before_now_150_seconds = before_now(seconds=150).replace(microsecond=0).isoformat()
         self.store_event(
             data={
                 "timestamp": before_now_150_seconds,
@@ -1044,7 +1044,7 @@ def test_seen_stats(self, _: MagicMock) -> None:
             },
             project_id=self.project.id,
         )
-        before_now_100_seconds = iso_format(before_now(seconds=100))
+        before_now_100_seconds = before_now(seconds=100).replace(microsecond=0).isoformat()
         self.store_event(
             data={
                 "timestamp": before_now_100_seconds,
@@ -1066,21 +1066,21 @@ def test_seen_stats(self, _: MagicMock) -> None:
         assert response.data[0]["lifetime"]["stats"] is None
         assert response.data[0]["filtered"]["stats"] != response.data[0]["stats"]
 
-        assert response.data[0]["lifetime"]["firstSeen"] == parse_datetime(
+        assert response.data[0]["lifetime"]["firstSeen"] == datetime.fromisoformat(
             before_now_350_seconds  # Should match overridden value, not event value
-        ).replace(tzinfo=UTC)
-        assert response.data[0]["lifetime"]["lastSeen"] == parse_datetime(
+        )
+        assert response.data[0]["lifetime"]["lastSeen"] == datetime.fromisoformat(
             before_now_100_seconds
-        ).replace(tzinfo=UTC)
+        )
         assert response.data[0]["lifetime"]["count"] == "55"
 
         assert response.data[0]["filtered"]["count"] == "2"
-        assert response.data[0]["filtered"]["firstSeen"] == parse_datetime(
+        assert response.data[0]["filtered"]["firstSeen"] == datetime.fromisoformat(
             before_now_250_seconds
-        ).replace(tzinfo=UTC)
-        assert response.data[0]["filtered"]["lastSeen"] == parse_datetime(
+        )
+        assert response.data[0]["filtered"]["lastSeen"] == datetime.fromisoformat(
             before_now_150_seconds
-        ).replace(tzinfo=UTC)
+        )
 
         # Empty filter test:
         response = self.get_response(sort_by="date", limit=10, query="")
@@ -1092,12 +1092,12 @@ def test_seen_stats(self, _: MagicMock) -> None:
         assert response.data[0]["lifetime"]["stats"] is None
 
         assert response.data[0]["lifetime"]["count"] == "55"
-        assert response.data[0]["lifetime"]["firstSeen"] == parse_datetime(
+        assert response.data[0]["lifetime"]["firstSeen"] == datetime.fromisoformat(
             before_now_350_seconds  # Should match overridden value, not event value
-        ).replace(tzinfo=UTC)
-        assert response.data[0]["lifetime"]["lastSeen"] == parse_datetime(
+        )
+        assert response.data[0]["lifetime"]["lastSeen"] == datetime.fromisoformat(
             before_now_100_seconds
-        ).replace(tzinfo=UTC)
+        )
 
         # now with useGroupSnubaDataset = 1
         response = self.get_response(sort_by="date", limit=10, query="server:example.com")
@@ -1113,7 +1113,7 @@ def test_semver_seen_stats(self, _: MagicMock) -> None:
 
         release_1_e_1 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(minutes=5)),
+                "timestamp": before_now(minutes=5).replace(microsecond=0).isoformat(),
                 "fingerprint": ["group-1"],
                 "release": release_1.version,
             },
@@ -1123,7 +1123,7 @@ def test_semver_seen_stats(self, _: MagicMock) -> None:
 
         release_2_e_1 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(minutes=3)),
+                "timestamp": before_now(minutes=3).replace(microsecond=0).isoformat(),
                 "fingerprint": ["group-1"],
                 "release": release_2.version,
             },
@@ -1132,7 +1132,7 @@ def test_semver_seen_stats(self, _: MagicMock) -> None:
 
         release_3_e_1 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(minutes=1)),
+                "timestamp": before_now(minutes=1).replace(microsecond=0).isoformat(),
                 "fingerprint": ["group-1"],
                 "release": release_3.version,
             },
@@ -1181,7 +1181,7 @@ def test_semver_seen_stats(self, _: MagicMock) -> None:
     def test_inbox_search(self, _: MagicMock) -> None:
         self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=200)),
+                "timestamp": before_now(seconds=200).isoformat(),
                 "fingerprint": ["group-1"],
                 "tags": {"server": "example.com", "trace": "woof", "message": "foo"},
             },
@@ -1190,7 +1190,7 @@ def test_inbox_search(self, _: MagicMock) -> None:
 
         event = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=200)),
+                "timestamp": before_now(seconds=200).isoformat(),
                 "fingerprint": ["group-2"],
                 "tags": {"server": "example.com", "trace": "woof", "message": "foo"},
             },
@@ -1199,7 +1199,7 @@ def test_inbox_search(self, _: MagicMock) -> None:
 
         self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=200)),
+                "timestamp": before_now(seconds=200).isoformat(),
                 "fingerprint": ["group-3"],
                 "tags": {"server": "example.com", "trace": "woof", "message": "foo"},
             },
@@ -1226,8 +1226,8 @@ def test_inbox_search_outside_retention(self, _: MagicMock) -> None:
             query="is:unresolved is:for_review",
             collapse="stats",
             expand=["inbox", "owners"],
-            start=iso_format(before_now(days=20)),
-            end=iso_format(before_now(days=15)),
+            start=before_now(days=20).isoformat(),
+            end=before_now(days=15).isoformat(),
         )
         assert response.status_code == 200
         assert len(response.data) == 0
@@ -1236,7 +1236,7 @@ def test_inbox_search_outside_retention(self, _: MagicMock) -> None:
     def test_assigned_or_suggested_search(self, _: MagicMock) -> None:
         event = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=180)),
+                "timestamp": before_now(seconds=180).isoformat(),
                 "fingerprint": ["group-1"],
                 "tags": {"server": "example.com", "trace": "woof", "message": "foo"},
             },
@@ -1244,7 +1244,7 @@ def test_assigned_or_suggested_search(self, _: MagicMock) -> None:
         )
         event1 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=185)),
+                "timestamp": before_now(seconds=185).isoformat(),
                 "fingerprint": ["group-2"],
                 "tags": {"server": "example.com", "trace": "woof", "message": "foo"},
             },
@@ -1252,7 +1252,7 @@ def test_assigned_or_suggested_search(self, _: MagicMock) -> None:
         )
         event2 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=190)),
+                "timestamp": before_now(seconds=190).isoformat(),
                 "fingerprint": ["group-3"],
                 "tags": {"server": "example.com", "trace": "woof", "message": "foo"},
             },
@@ -1261,7 +1261,7 @@ def test_assigned_or_suggested_search(self, _: MagicMock) -> None:
 
         assigned_event = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=195)),
+                "timestamp": before_now(seconds=195).isoformat(),
                 "fingerprint": ["group-4"],
             },
             project_id=self.project.id,
@@ -1269,7 +1269,7 @@ def test_assigned_or_suggested_search(self, _: MagicMock) -> None:
 
         assigned_to_other_event = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=195)),
+                "timestamp": before_now(seconds=195).isoformat(),
                 "fingerprint": ["group-5"],
             },
             project_id=self.project.id,
@@ -1419,7 +1419,7 @@ def test_semver(self, _: MagicMock) -> None:
 
         release_1_g_1 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(minutes=1)),
+                "timestamp": before_now(minutes=1).isoformat(),
                 "fingerprint": ["group-1"],
                 "release": release_1.version,
             },
@@ -1427,7 +1427,7 @@ def test_semver(self, _: MagicMock) -> None:
         ).group.id
         release_1_g_2 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(minutes=2)),
+                "timestamp": before_now(minutes=2).isoformat(),
                 "fingerprint": ["group-2"],
                 "release": release_1.version,
             },
@@ -1435,7 +1435,7 @@ def test_semver(self, _: MagicMock) -> None:
         ).group.id
         release_2_g_1 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(minutes=3)),
+                "timestamp": before_now(minutes=3).isoformat(),
                 "fingerprint": ["group-3"],
                 "release": release_2.version,
             },
@@ -1443,7 +1443,7 @@ def test_semver(self, _: MagicMock) -> None:
         ).group.id
         release_2_g_2 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(minutes=4)),
+                "timestamp": before_now(minutes=4).isoformat(),
                 "fingerprint": ["group-4"],
                 "release": release_2.version,
             },
@@ -1451,7 +1451,7 @@ def test_semver(self, _: MagicMock) -> None:
         ).group.id
         release_3_g_1 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(minutes=5)),
+                "timestamp": before_now(minutes=5).isoformat(),
                 "fingerprint": ["group-5"],
                 "release": release_3.version,
             },
@@ -1459,7 +1459,7 @@ def test_semver(self, _: MagicMock) -> None:
         ).group.id
         release_3_g_2 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(minutes=6)),
+                "timestamp": before_now(minutes=6).isoformat(),
                 "fingerprint": ["group-6"],
                 "release": release_3.version,
             },
@@ -1519,7 +1519,7 @@ def test_release_stage(self, _: MagicMock) -> None:
 
         adopted_release_g_1 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(minutes=1)),
+                "timestamp": before_now(minutes=1).isoformat(),
                 "fingerprint": ["group-1"],
                 "release": adopted_release.version,
                 "environment": self.environment.name,
@@ -1528,7 +1528,7 @@ def test_release_stage(self, _: MagicMock) -> None:
         ).group.id
         adopted_release_g_2 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(minutes=2)),
+                "timestamp": before_now(minutes=2).isoformat(),
                 "fingerprint": ["group-2"],
                 "release": adopted_release.version,
                 "environment": self.environment.name,
@@ -1537,7 +1537,7 @@ def test_release_stage(self, _: MagicMock) -> None:
         ).group.id
         replaced_release_g_1 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(minutes=3)),
+                "timestamp": before_now(minutes=3).isoformat(),
                 "fingerprint": ["group-3"],
                 "release": replaced_release.version,
                 "environment": self.environment.name,
@@ -1546,7 +1546,7 @@ def test_release_stage(self, _: MagicMock) -> None:
         ).group.id
         replaced_release_g_2 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(minutes=4)),
+                "timestamp": before_now(minutes=4).isoformat(),
                 "fingerprint": ["group-4"],
                 "release": replaced_release.version,
                 "environment": self.environment.name,
@@ -1613,7 +1613,7 @@ def test_semver_package(self, _: MagicMock) -> None:
 
         release_1_g_1 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(minutes=1)),
+                "timestamp": before_now(minutes=1).isoformat(),
                 "fingerprint": ["group-1"],
                 "release": release_1.version,
             },
@@ -1621,7 +1621,7 @@ def test_semver_package(self, _: MagicMock) -> None:
         ).group.id
         release_1_g_2 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(minutes=2)),
+                "timestamp": before_now(minutes=2).isoformat(),
                 "fingerprint": ["group-2"],
                 "release": release_1.version,
             },
@@ -1629,7 +1629,7 @@ def test_semver_package(self, _: MagicMock) -> None:
         ).group.id
         release_2_g_1 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(minutes=3)),
+                "timestamp": before_now(minutes=3).isoformat(),
                 "fingerprint": ["group-3"],
                 "release": release_2.version,
             },
@@ -1657,7 +1657,7 @@ def test_semver_build(self, _: MagicMock) -> None:
 
         release_1_g_1 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(minutes=1)),
+                "timestamp": before_now(minutes=1).isoformat(),
                 "fingerprint": ["group-1"],
                 "release": release_1.version,
             },
@@ -1665,7 +1665,7 @@ def test_semver_build(self, _: MagicMock) -> None:
         ).group.id
         release_1_g_2 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(minutes=2)),
+                "timestamp": before_now(minutes=2).isoformat(),
                 "fingerprint": ["group-2"],
                 "release": release_1.version,
             },
@@ -1673,7 +1673,7 @@ def test_semver_build(self, _: MagicMock) -> None:
         ).group.id
         release_2_g_1 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(minutes=3)),
+                "timestamp": before_now(minutes=3).isoformat(),
                 "fingerprint": ["group-3"],
                 "release": release_2.version,
             },
@@ -1698,7 +1698,7 @@ def test_semver_build(self, _: MagicMock) -> None:
 
     def test_aggregate_stats_regression_test(self, _: MagicMock) -> None:
         self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=500)), "fingerprint": ["group-1"]},
+            data={"timestamp": before_now(seconds=500).isoformat(), "fingerprint": ["group-1"]},
             project_id=self.project.id,
         )
 
@@ -1712,12 +1712,12 @@ def test_aggregate_stats_regression_test(self, _: MagicMock) -> None:
 
     def test_skipped_fields(self, _: MagicMock) -> None:
         event = self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=500)), "fingerprint": ["group-1"]},
+            data={"timestamp": before_now(seconds=500).isoformat(), "fingerprint": ["group-1"]},
             project_id=self.project.id,
         )
         self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=200)),
+                "timestamp": before_now(seconds=200).isoformat(),
                 "fingerprint": ["group-1"],
                 "tags": {"server": "example.com", "trace": "woof", "message": "foo"},
             },
@@ -1726,7 +1726,7 @@ def test_skipped_fields(self, _: MagicMock) -> None:
 
         query = "server:example.com"
         query += " status:unresolved"
-        query += " first_seen:" + iso_format(before_now(seconds=500))
+        query += " first_seen:" + before_now(seconds=500).isoformat()
 
         self.login_as(user=self.user)
         response = self.get_response(sort_by="date", limit=10, query=query)
@@ -1739,7 +1739,7 @@ def test_skipped_fields(self, _: MagicMock) -> None:
 
     def test_inbox_fields(self, _: MagicMock) -> None:
         event = self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=500)), "fingerprint": ["group-1"]},
+            data={"timestamp": before_now(seconds=500).isoformat(), "fingerprint": ["group-1"]},
             project_id=self.project.id,
         )
         add_group_to_inbox(event.group, GroupInboxReason.NEW)
@@ -1773,7 +1773,7 @@ def test_inbox_fields(self, _: MagicMock) -> None:
 
     def test_inbox_fields_issue_states(self, _: MagicMock) -> None:
         event = self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=500)), "fingerprint": ["group-1"]},
+            data={"timestamp": before_now(seconds=500).isoformat(), "fingerprint": ["group-1"]},
             project_id=self.project.id,
         )
         add_group_to_inbox(event.group, GroupInboxReason.NEW)
@@ -1805,7 +1805,7 @@ def test_inbox_fields_issue_states(self, _: MagicMock) -> None:
 
     def test_expand_string(self, _: MagicMock) -> None:
         event = self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=500)), "fingerprint": ["group-1"]},
+            data={"timestamp": before_now(seconds=500).isoformat(), "fingerprint": ["group-1"]},
             project_id=self.project.id,
         )
         add_group_to_inbox(event.group, GroupInboxReason.NEW)
@@ -1821,7 +1821,7 @@ def test_expand_string(self, _: MagicMock) -> None:
 
     def test_expand_plugin_actions_and_issues(self, _: MagicMock) -> None:
         event = self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=500)), "fingerprint": ["group-1"]},
+            data={"timestamp": before_now(seconds=500).isoformat(), "fingerprint": ["group-1"]},
             project_id=self.project.id,
         )
         query = "status:unresolved"
@@ -1845,7 +1845,7 @@ def test_expand_plugin_actions_and_issues(self, _: MagicMock) -> None:
 
     def test_expand_integration_issues(self, _: MagicMock) -> None:
         event = self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=500)), "fingerprint": ["group-1"]},
+            data={"timestamp": before_now(seconds=500).isoformat(), "fingerprint": ["group-1"]},
             project_id=self.project.id,
         )
         query = "status:unresolved"
@@ -1896,7 +1896,7 @@ def test_expand_integration_issues(self, _: MagicMock) -> None:
 
     def test_expand_sentry_app_issues(self, _: MagicMock) -> None:
         event = self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=500)), "fingerprint": ["group-1"]},
+            data={"timestamp": before_now(seconds=500).isoformat(), "fingerprint": ["group-1"]},
             project_id=self.project.id,
         )
         query = "status:unresolved"
@@ -1951,7 +1951,7 @@ def test_expand_sentry_app_issues(self, _: MagicMock) -> None:
     @with_feature("organizations:event-attachments")
     def test_expand_latest_event_has_attachments(self, _: MagicMock) -> None:
         event = self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=500)), "fingerprint": ["group-1"]},
+            data={"timestamp": before_now(seconds=500).isoformat(), "fingerprint": ["group-1"]},
             project_id=self.project.id,
         )
         query = "status:unresolved"
@@ -1995,7 +1995,7 @@ def test_expand_no_latest_event_has_no_attachments(
         self, _: MagicMock, mock_latest_event: MagicMock
     ) -> None:
         self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=500)), "fingerprint": ["group-1"]},
+            data={"timestamp": before_now(seconds=500).isoformat(), "fingerprint": ["group-1"]},
             project_id=self.project.id,
         )
         query = "status:unresolved"
@@ -2010,7 +2010,7 @@ def test_expand_no_latest_event_has_no_attachments(
 
     def test_expand_owners(self, _: MagicMock) -> None:
         event = self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=500)), "fingerprint": ["group-1"]},
+            data={"timestamp": before_now(seconds=500).isoformat(), "fingerprint": ["group-1"]},
             project_id=self.project.id,
         )
         query = "status:unresolved"
@@ -2071,11 +2071,11 @@ def test_expand_owners(self, _: MagicMock) -> None:
 
     def test_default_search(self, _: MagicMock) -> None:
         event1 = self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=500)), "fingerprint": ["group-1"]},
+            data={"timestamp": before_now(seconds=500).isoformat(), "fingerprint": ["group-1"]},
             project_id=self.project.id,
         )
         event2 = self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=500)), "fingerprint": ["group-2"]},
+            data={"timestamp": before_now(seconds=500).isoformat(), "fingerprint": ["group-2"]},
             project_id=self.project.id,
         )
         event2.group.update(status=GroupStatus.RESOLVED, substatus=None)
@@ -2087,13 +2087,13 @@ def test_default_search(self, _: MagicMock) -> None:
 
     def test_default_search_with_priority(self, _: MagicMock) -> None:
         event1 = self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=500)), "fingerprint": ["group-1"]},
+            data={"timestamp": before_now(seconds=500).isoformat(), "fingerprint": ["group-1"]},
             project_id=self.project.id,
         )
         event1.group.priority = PriorityLevel.HIGH
         event1.group.save()
         event2 = self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=500)), "fingerprint": ["group-3"]},
+            data={"timestamp": before_now(seconds=500).isoformat(), "fingerprint": ["group-3"]},
             project_id=self.project.id,
         )
         event2.group.status = GroupStatus.RESOLVED
@@ -2102,7 +2102,7 @@ def test_default_search_with_priority(self, _: MagicMock) -> None:
         event2.group.save()
 
         event3 = self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=400)), "fingerprint": ["group-2"]},
+            data={"timestamp": before_now(seconds=400).isoformat(), "fingerprint": ["group-2"]},
             project_id=self.project.id,
         )
         event3.group.priority = PriorityLevel.LOW
@@ -2117,7 +2117,7 @@ def test_default_search_with_priority(self, _: MagicMock) -> None:
 
     def test_collapse_stats(self, _: MagicMock) -> None:
         event = self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=500)), "fingerprint": ["group-1"]},
+            data={"timestamp": before_now(seconds=500).isoformat(), "fingerprint": ["group-1"]},
             project_id=self.project.id,
         )
         self.login_as(user=self.user)
@@ -2137,7 +2137,7 @@ def test_collapse_stats(self, _: MagicMock) -> None:
 
     def test_collapse_lifetime(self, _: MagicMock) -> None:
         event = self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=500)), "fingerprint": ["group-1"]},
+            data={"timestamp": before_now(seconds=500).isoformat(), "fingerprint": ["group-1"]},
             project_id=self.project.id,
         )
         self.login_as(user=self.user)
@@ -2156,7 +2156,7 @@ def test_collapse_lifetime(self, _: MagicMock) -> None:
 
     def test_collapse_filtered(self, _: MagicMock) -> None:
         event = self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=500)), "fingerprint": ["group-1"]},
+            data={"timestamp": before_now(seconds=500).isoformat(), "fingerprint": ["group-1"]},
             project_id=self.project.id,
         )
         self.login_as(user=self.user)
@@ -2175,7 +2175,7 @@ def test_collapse_filtered(self, _: MagicMock) -> None:
 
     def test_collapse_lifetime_and_filtered(self, _: MagicMock) -> None:
         event = self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=500)), "fingerprint": ["group-1"]},
+            data={"timestamp": before_now(seconds=500).isoformat(), "fingerprint": ["group-1"]},
             project_id=self.project.id,
         )
         self.login_as(user=self.user)
@@ -2194,7 +2194,7 @@ def test_collapse_lifetime_and_filtered(self, _: MagicMock) -> None:
 
     def test_collapse_base(self, _: MagicMock) -> None:
         event = self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=500)), "fingerprint": ["group-1"]},
+            data={"timestamp": before_now(seconds=500).isoformat(), "fingerprint": ["group-1"]},
             project_id=self.project.id,
         )
         self.login_as(user=self.user)
@@ -2218,7 +2218,7 @@ def test_collapse_stats_group_snooze_bug(self, _: MagicMock) -> None:
         # There was a bug where we tried to access attributes on seen_stats if this feature is active
         # but seen_stats could be null when we collapse stats.
         event = self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=500)), "fingerprint": ["group-1"]},
+            data={"timestamp": before_now(seconds=500).isoformat(), "fingerprint": ["group-1"]},
             project_id=self.project.id,
         )
         GroupSnooze.objects.create(
@@ -2240,7 +2240,7 @@ def test_collapse_stats_group_snooze_bug(self, _: MagicMock) -> None:
     @with_feature("organizations:issue-stream-performance")
     def test_collapse_unhandled(self, _: MagicMock) -> None:
         event = self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=500)), "fingerprint": ["group-1"]},
+            data={"timestamp": before_now(seconds=500).isoformat(), "fingerprint": ["group-1"]},
             project_id=self.project.id,
         )
         self.login_as(user=self.user)
@@ -2261,7 +2261,7 @@ def test_selected_saved_search(self, _: MagicMock) -> None:
         )
         event = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=500)),
+                "timestamp": before_now(seconds=500).isoformat(),
                 "fingerprint": ["group-1"],
                 "message": "ZeroDivisionError",
             },
@@ -2270,7 +2270,7 @@ def test_selected_saved_search(self, _: MagicMock) -> None:
 
         self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=500)),
+                "timestamp": before_now(seconds=500).isoformat(),
                 "fingerprint": ["group-2"],
                 "message": "TypeError",
             },
@@ -2299,7 +2299,7 @@ def test_pinned_saved_search(self, _: MagicMock) -> None:
         )
         event = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=500)),
+                "timestamp": before_now(seconds=500).isoformat(),
                 "fingerprint": ["group-1"],
                 "message": "ZeroDivisionError",
             },
@@ -2308,7 +2308,7 @@ def test_pinned_saved_search(self, _: MagicMock) -> None:
 
         self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=500)),
+                "timestamp": before_now(seconds=500).isoformat(),
                 "fingerprint": ["group-2"],
                 "message": "TypeError",
             },
@@ -2336,7 +2336,7 @@ def test_pinned_saved_search_with_query(self, _: MagicMock) -> None:
         )
         event = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=500)),
+                "timestamp": before_now(seconds=500).isoformat(),
                 "fingerprint": ["group-1"],
                 "message": "ZeroDivisionError",
             },
@@ -2345,7 +2345,7 @@ def test_pinned_saved_search_with_query(self, _: MagicMock) -> None:
 
         self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=500)),
+                "timestamp": before_now(seconds=500).isoformat(),
                 "fingerprint": ["group-2"],
                 "message": "TypeError",
             },
@@ -2383,7 +2383,7 @@ def test_user_default_custom_view_query(self, _: MagicMock) -> None:
         )
         event = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=500)),
+                "timestamp": before_now(seconds=500).isoformat(),
                 "fingerprint": ["group-1"],
                 "message": "ZeroDivisionError",
             },
@@ -2392,7 +2392,7 @@ def test_user_default_custom_view_query(self, _: MagicMock) -> None:
 
         self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=500)),
+                "timestamp": before_now(seconds=500).isoformat(),
                 "fingerprint": ["group-2"],
                 "message": "TypeError",
             },
@@ -2432,7 +2432,7 @@ def test_non_default_custom_view_query(self, _: MagicMock) -> None:
 
         event = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=500)),
+                "timestamp": before_now(seconds=500).isoformat(),
                 "fingerprint": ["group-1"],
                 "message": "ZeroDivisionError",
             },
@@ -2455,7 +2455,7 @@ def test_non_default_custom_view_query(self, _: MagicMock) -> None:
     def test_global_default_custom_view_query(self, _: MagicMock) -> None:
         event = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=500)),
+                "timestamp": before_now(seconds=500).isoformat(),
                 "fingerprint": ["group-1"],
                 "message": "ZeroDivisionError",
             },
@@ -2475,7 +2475,7 @@ def test_global_default_custom_view_query(self, _: MagicMock) -> None:
 
     def test_query_status_and_substatus_overlapping(self, _: MagicMock) -> None:
         event = self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=500)), "fingerprint": ["group-1"]},
+            data={"timestamp": before_now(seconds=500).isoformat(), "fingerprint": ["group-1"]},
             project_id=self.project.id,
         )
         event.group.update(status=GroupStatus.UNRESOLVED, substatus=GroupSubStatus.ONGOING)
@@ -2529,7 +2529,7 @@ def test_query_status_and_substatus_overlapping(self, _: MagicMock) -> None:
 
     def test_query_status_and_substatus_nonoverlapping(self, _: MagicMock) -> None:
         event = self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=500)), "fingerprint": ["group-1"]},
+            data={"timestamp": before_now(seconds=500).isoformat(), "fingerprint": ["group-1"]},
             project_id=self.project.id,
         )
         event.group.update(status=GroupStatus.UNRESOLVED, substatus=GroupSubStatus.ONGOING)
@@ -2579,7 +2579,7 @@ def test_query_status_and_substatus_nonoverlapping(self, _: MagicMock) -> None:
 
     def test_use_group_snuba_dataset(self, mock_query: MagicMock) -> None:
         self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=500)), "fingerprint": ["group-1"]},
+            data={"timestamp": before_now(seconds=500).isoformat(), "fingerprint": ["group-1"]},
             project_id=self.project.id,
         )
         self.login_as(user=self.user)
@@ -2620,15 +2620,15 @@ def test_snuba_order_by_first_seen_of_issue(self, _: MagicMock) -> None:
 
     def test_snuba_order_by_freq(self, mock_query: MagicMock) -> None:
         event1 = self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=3)), "fingerprint": ["group-1"]},
+            data={"timestamp": before_now(seconds=3).isoformat(), "fingerprint": ["group-1"]},
             project_id=self.project.id,
         )
         self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=2)), "fingerprint": ["group-1"]},
+            data={"timestamp": before_now(seconds=2).isoformat(), "fingerprint": ["group-1"]},
             project_id=self.project.id,
         )
         event2 = self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=1)), "fingerprint": ["group-2"]},
+            data={"timestamp": before_now(seconds=1).isoformat(), "fingerprint": ["group-2"]},
             project_id=self.project.id,
         )
 
@@ -2658,7 +2658,7 @@ def test_snuba_order_by_user_count(self, mock_query: MagicMock) -> None:
         # 2 events, 2 users
         event1 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=6)),
+                "timestamp": before_now(seconds=6).isoformat(),
                 "fingerprint": ["group-1"],
                 "user": user2,
             },
@@ -2666,7 +2666,7 @@ def test_snuba_order_by_user_count(self, mock_query: MagicMock) -> None:
         )
         self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=5)),
+                "timestamp": before_now(seconds=5).isoformat(),
                 "fingerprint": ["group-1"],
                 "user": user3,
             },
@@ -2676,7 +2676,7 @@ def test_snuba_order_by_user_count(self, mock_query: MagicMock) -> None:
         # 3 events, 1 user for group 1
         event2 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=4)),
+                "timestamp": before_now(seconds=4).isoformat(),
                 "fingerprint": ["group-2"],
                 "user": user1,
             },
@@ -2684,7 +2684,7 @@ def test_snuba_order_by_user_count(self, mock_query: MagicMock) -> None:
         )
         self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=3)),
+                "timestamp": before_now(seconds=3).isoformat(),
                 "fingerprint": ["group-2"],
                 "user": user1,
             },
@@ -2692,7 +2692,7 @@ def test_snuba_order_by_user_count(self, mock_query: MagicMock) -> None:
         )
         self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=2)),
+                "timestamp": before_now(seconds=2).isoformat(),
                 "fingerprint": ["group-2"],
                 "user": user1,
             },
@@ -3158,7 +3158,7 @@ def test_snuba_perf_issue(self, mock_query: MagicMock) -> None:
             user={"email": "myemail@example.com"},
             event_data={
                 "type": "transaction",
-                "start_timestamp": iso_format(datetime.now() - timedelta(minutes=1)),
+                "start_timestamp": (datetime.now() - timedelta(minutes=1)).isoformat(),
                 "contexts": {"trace": {"trace_id": "b" * 32, "span_id": "c" * 16, "op": ""}},
             },
         )
@@ -3217,7 +3217,7 @@ def test_snuba_type_and_category(
             [f"{PerformanceRenderBlockingAssetSpanGroupType.type_id}-group1"],
             event_data={
                 "type": "transaction",
-                "start_timestamp": iso_format(datetime.now() - timedelta(minutes=1)),
+                "start_timestamp": (datetime.now() - timedelta(minutes=1)).isoformat(),
                 "contexts": {"trace": {"trace_id": "b" * 32, "span_id": "c" * 16, "op": ""}},
             },
             override_occurrence_data={
@@ -3233,7 +3233,7 @@ def test_snuba_type_and_category(
             [f"{PerformanceNPlusOneGroupType.type_id}-group2"],
             event_data={
                 "type": "transaction",
-                "start_timestamp": iso_format(datetime.now() - timedelta(minutes=1)),
+                "start_timestamp": (datetime.now() - timedelta(minutes=1)).isoformat(),
                 "contexts": {"trace": {"trace_id": "b" * 32, "span_id": "c" * 16, "op": ""}},
             },
             override_occurrence_data={
@@ -3330,7 +3330,7 @@ def test_pagination_and_x_hits_header(self, _: MagicMock) -> None:
         for i in range(30):
             self.store_event(
                 data={
-                    "timestamp": iso_format(before_now(seconds=i)),
+                    "timestamp": before_now(seconds=i).isoformat(),
                     "fingerprint": [f"group-{i}"],
                 },
                 project_id=self.project.id,
@@ -3385,7 +3385,7 @@ def test_find_error_by_message_with_snuba_only_search(self, _: MagicMock) -> Non
         # Simulate sending an event with Kafka enabled
         event = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=1)),
+                "timestamp": before_now(seconds=1).isoformat(),
                 "message": "OutOfMemoryError",
                 "tags": {"level": "error"},
             },
@@ -3394,7 +3394,7 @@ def test_find_error_by_message_with_snuba_only_search(self, _: MagicMock) -> Non
         # Simulate sending another event that matches the wildcard filter
         event2 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=1)),
+                "timestamp": before_now(seconds=1).isoformat(),
                 "message": "MemoryError",
                 "tags": {"level": "error"},
             },
@@ -3404,7 +3404,7 @@ def test_find_error_by_message_with_snuba_only_search(self, _: MagicMock) -> Non
         # Simulate sending another event that doesn't match the filter
         self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=1)),
+                "timestamp": before_now(seconds=1).isoformat(),
                 "message": "NullPointerException",
                 "tags": {"level": "error"},
             },
@@ -3439,7 +3439,7 @@ def test_first_seen_and_last_seen_filters(self, _: MagicMock) -> None:
         for i, (time1, time2) in enumerate(times):
             self.store_event(
                 data={
-                    "timestamp": iso_format(time1),
+                    "timestamp": time1.isoformat(),
                     "message": f"Error {i}",
                     "fingerprint": [f"group-{i}"],
                 },
@@ -3447,7 +3447,7 @@ def test_first_seen_and_last_seen_filters(self, _: MagicMock) -> None:
             )
             self.store_event(
                 data={
-                    "timestamp": iso_format(time2),
+                    "timestamp": time2.isoformat(),
                     "message": f"Error {i} - additional event",
                     "fingerprint": [f"group-{i}"],
                 },
@@ -3455,7 +3455,7 @@ def test_first_seen_and_last_seen_filters(self, _: MagicMock) -> None:
             )
 
         # Test firstSeen filter
-        twenty_four_hours_ago = iso_format(before_now(hours=24))
+        twenty_four_hours_ago = before_now(hours=24).isoformat()
         response = self.get_success_response(query=f"firstSeen:<{twenty_four_hours_ago}")
         assert len(response.data) == 0
         response = self.get_success_response(query="firstSeen:-24h")
@@ -3469,7 +3469,7 @@ def test_first_seen_and_last_seen_filters(self, _: MagicMock) -> None:
         assert len(response.data) == 4
 
         # Test lastSeen filter with an absolute date using before_now
-        absolute_date = iso_format(before_now(days=1))  # Assuming 365 days before now as an example
+        absolute_date = before_now(days=1).isoformat()  # Assuming 365 days before now as an example
         response = self.get_success_response(query=f"lastSeen:>{absolute_date}")
         assert len(response.data) == 4
         response = self.get_success_response(query=f"lastSeen:<{absolute_date}")
@@ -3483,7 +3483,7 @@ def test_filter_by_bookmarked_by(self, _: MagicMock) -> None:
         # Create two issues, one bookmarked by each user
         event1 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(minutes=1)),
+                "timestamp": before_now(minutes=1).isoformat(),
                 "message": "Error 1",
                 "fingerprint": ["group-1"],
             },
@@ -3494,7 +3494,7 @@ def test_filter_by_bookmarked_by(self, _: MagicMock) -> None:
 
         event2 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(minutes=1)),
+                "timestamp": before_now(minutes=1).isoformat(),
                 "message": "Error 2",
                 "fingerprint": ["group-2"],
             },
@@ -3520,7 +3520,7 @@ def test_filter_by_linked(self, _: MagicMock) -> None:
         # Create two issues, one linked and one not linked
         event1 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(minutes=1)),
+                "timestamp": before_now(minutes=1).isoformat(),
                 "message": "Error 1",
                 "fingerprint": ["group-1"],
             },
@@ -3535,7 +3535,7 @@ def test_filter_by_linked(self, _: MagicMock) -> None:
         )
         event2 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(minutes=1)),
+                "timestamp": before_now(minutes=1).isoformat(),
                 "message": "Error 2",
                 "fingerprint": ["group-2"],
             },
@@ -3560,7 +3560,7 @@ def test_filter_by_subscribed_by(self, _: MagicMock) -> None:
         # Create two issues, one subscribed by user1 and one not subscribed
         event1 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(minutes=1)),
+                "timestamp": before_now(minutes=1).isoformat(),
                 "message": "Error 1",
                 "fingerprint": ["group-1"],
             },
@@ -3575,7 +3575,7 @@ def test_filter_by_subscribed_by(self, _: MagicMock) -> None:
         )
         self.store_event(
             data={
-                "timestamp": iso_format(before_now(minutes=1)),
+                "timestamp": before_now(minutes=1).isoformat(),
                 "message": "Error 2",
                 "fingerprint": ["group-2"],
             },
@@ -3597,7 +3597,7 @@ def test_snuba_search_lookup_by_regressed_in_release(self, _: MagicMock) -> None
         release = self.create_release()
         event = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=1)),
+                "timestamp": before_now(seconds=1).isoformat(),
                 "tags": {"sentry:release": release.version},
             },
             project_id=project.id,
@@ -3618,7 +3618,7 @@ def test_lookup_by_release_build(self, _: MagicMock) -> None:
         release = self.create_release(version="steve@1.2.7+123")
         event = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=1)),
+                "timestamp": before_now(seconds=1).isoformat(),
                 "tags": {"sentry:release": release.version},
             },
             project_id=project.id,
@@ -3638,7 +3638,7 @@ def test_snuba_search_lookup_by_stack_filename(self, _: MagicMock) -> None:
         project = self.project
         event = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=1)),
+                "timestamp": before_now(seconds=1).isoformat(),
                 "fingerprint": ["unique-fingerprint-1"],
                 "exception": {
                     "values": [
@@ -3662,7 +3662,7 @@ def test_snuba_search_lookup_by_stack_filename(self, _: MagicMock) -> None:
         )
         self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=2)),
+                "timestamp": before_now(seconds=2).isoformat(),
                 "fingerprint": ["unique-fingerprint-2"],
                 "exception": {
                     "values": [
@@ -3699,7 +3699,7 @@ def test_error_main_thread_condition(self, _: MagicMock) -> None:
         # Simulate sending an event with main_thread set to true
         event1 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=1)),
+                "timestamp": before_now(seconds=1).isoformat(),
                 "message": "MainThreadError",
                 "exception": {
                     "values": [
@@ -3717,7 +3717,7 @@ def test_error_main_thread_condition(self, _: MagicMock) -> None:
         # Simulate sending an event with main_thread set to false
         event2 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=2)),
+                "timestamp": before_now(seconds=2).isoformat(),
                 "message": "WorkerThreadError",
                 "exception": {
                     "values": [
@@ -3747,7 +3747,7 @@ def test_error_main_thread_condition(self, _: MagicMock) -> None:
 
     def test_snuba_heavy_search_aggregate_stats_regression_test(self, _: MagicMock) -> None:
         self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=500)), "fingerprint": ["group-1"]},
+            data={"timestamp": before_now(seconds=500).isoformat(), "fingerprint": ["group-1"]},
             project_id=self.project.id,
         )
 
@@ -3764,7 +3764,7 @@ def test_snuba_heavy_search_aggregate_stats_regression_test(self, _: MagicMock)
     def test_snuba_heavy_search_inbox_search(self, _: MagicMock) -> None:
         self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=200)),
+                "timestamp": before_now(seconds=200).isoformat(),
                 "fingerprint": ["group-1"],
                 "tags": {"server": "example.com", "trace": "woof", "message": "foo"},
             },
@@ -3773,7 +3773,7 @@ def test_snuba_heavy_search_inbox_search(self, _: MagicMock) -> None:
 
         event = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=200)),
+                "timestamp": before_now(seconds=200).isoformat(),
                 "fingerprint": ["group-2"],
                 "tags": {"server": "example.com", "trace": "woof", "message": "foo"},
             },
@@ -3782,7 +3782,7 @@ def test_snuba_heavy_search_inbox_search(self, _: MagicMock) -> None:
 
         self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=200)),
+                "timestamp": before_now(seconds=200).isoformat(),
                 "fingerprint": ["group-3"],
                 "tags": {"server": "example.com", "trace": "woof", "message": "foo"},
             },
@@ -3805,7 +3805,7 @@ def test_snuba_heavy_search_inbox_search(self, _: MagicMock) -> None:
         assert response.data[0]["inbox"]["reason"] == GroupInboxReason.NEW.value
 
     @patch("sentry.analytics.record")
-    def test_snuba_heavy_advanced_search_errors(self, mock_record: MagicMock, _: MagicMock):
+    def test_snuba_heavy_advanced_search_errors(self, mock_record: MagicMock, _: MagicMock) -> None:
         self.login_as(user=self.user)
         response = self.get_response(sort_by="date", query="!has:user")
         assert response.status_code == 200, response.data
@@ -3830,7 +3830,7 @@ def test_snuba_heavy_advanced_search_errors(self, mock_record: MagicMock, _: Mag
 
     def test_snuba_heavy_filter_not_unresolved(self, _: MagicMock) -> None:
         event = self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=500)), "fingerprint": ["group-1"]},
+            data={"timestamp": before_now(seconds=500).isoformat(), "fingerprint": ["group-1"]},
             project_id=self.project.id,
         )
         event.group.update(status=GroupStatus.RESOLVED, substatus=None)
@@ -3849,7 +3849,7 @@ def test_snuba_heavy_sdk_name_with_negations_and_positive_checks(self, _: MagicM
         # Store an event with sdk.name as sentry.python
         event_python = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=500)),
+                "timestamp": before_now(seconds=500).isoformat(),
                 "fingerprint": ["group-1"],
                 "sdk": {"name": "sentry.python", "version": "0.13.19"},
             },
@@ -3859,7 +3859,7 @@ def test_snuba_heavy_sdk_name_with_negations_and_positive_checks(self, _: MagicM
         # Store another event with sdk.name as sentry.javascript
         event_javascript = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=400)),
+                "timestamp": before_now(seconds=400).isoformat(),
                 "fingerprint": ["group-2"],
                 "sdk": {"name": "sentry.javascript", "version": "2.1.1"},
             },
@@ -3903,7 +3903,7 @@ def test_snuba_heavy_error_handled_boolean(self, _: MagicMock) -> None:
         # Create an event with an unhandled exception
         unhandled_event = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=300)),
+                "timestamp": before_now(seconds=300).isoformat(),
                 "level": "error",
                 "fingerprint": ["unhandled-group"],
                 "exception": {
@@ -3922,7 +3922,7 @@ def test_snuba_heavy_error_handled_boolean(self, _: MagicMock) -> None:
         # Create an event with a handled exception
         handled_event = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=300)),
+                "timestamp": before_now(seconds=300).isoformat(),
                 "fingerprint": ["handled-group"],
                 "exception": {
                     "values": [
@@ -3962,7 +3962,7 @@ def test_snuba_heavy_error_handled_boolean(self, _: MagicMock) -> None:
         assert len(response_handled_0.data) == 1
         assert int(response_handled_0.data[0]["id"]) == handled_event.group.id
 
-    def run_feedback_filtered_by_default_test(self, use_group_snuba_dataset: bool):
+    def run_feedback_filtered_by_default_test(self, use_group_snuba_dataset: bool) -> None:
         with Feature(
             {
                 FeedbackGroup.build_visible_feature_name(): True,
@@ -3971,7 +3971,7 @@ def run_feedback_filtered_by_default_test(self, use_group_snuba_dataset: bool):
             }
         ):
             event = self.store_event(
-                data={"event_id": uuid4().hex, "timestamp": iso_format(before_now(seconds=1))},
+                data={"event_id": uuid4().hex, "timestamp": before_now(seconds=1).isoformat()},
                 project_id=self.project.id,
             )
             assert event.group is not None
@@ -3990,13 +3990,13 @@ def run_feedback_filtered_by_default_test(self, use_group_snuba_dataset: bool):
         assert int(issue["id"]) != feedback_group.id
         assert issue["issueCategory"] != "feedback"
 
-    def test_feedback_filtered_by_default_no_snuba_search(self, _):
+    def test_feedback_filtered_by_default_no_snuba_search(self, _: MagicMock) -> None:
         self.run_feedback_filtered_by_default_test(False)
 
-    def test_feedback_filtered_by_default_use_snuba_search(self, _):
+    def test_feedback_filtered_by_default_use_snuba_search(self, _: MagicMock) -> None:
         self.run_feedback_filtered_by_default_test(True)
 
-    def run_feedback_category_filter_test(self, use_group_snuba_dataset: bool):
+    def run_feedback_category_filter_test(self, use_group_snuba_dataset: bool) -> None:
         with Feature(
             {
                 FeedbackGroup.build_visible_feature_name(): True,
@@ -4005,7 +4005,7 @@ def run_feedback_category_filter_test(self, use_group_snuba_dataset: bool):
             }
         ):
             event = self.store_event(
-                data={"event_id": uuid4().hex, "timestamp": iso_format(before_now(seconds=1))},
+                data={"event_id": uuid4().hex, "timestamp": before_now(seconds=1).isoformat()},
                 project_id=self.project.id,
             )
             assert event.group is not None
@@ -4026,10 +4026,10 @@ def run_feedback_category_filter_test(self, use_group_snuba_dataset: bool):
         assert int(issue["id"]) == feedback_group.id
         assert issue["issueCategory"] == "feedback"
 
-    def test_feedback_category_filter_no_snuba_search(self, _):
+    def test_feedback_category_filter_no_snuba_search(self, _: MagicMock) -> None:
         self.run_feedback_category_filter_test(False)
 
-    def test_feedback_category_filter_use_snuba_search(self, _):
+    def test_feedback_category_filter_use_snuba_search(self, _: MagicMock) -> None:
         self.run_feedback_category_filter_test(True)
 
 
@@ -4156,7 +4156,7 @@ def test_bulk_resolve(self) -> None:
             self.store_event(
                 data={
                     "fingerprint": [i],
-                    "timestamp": iso_format(self.min_ago - timedelta(seconds=i)),
+                    "timestamp": (self.min_ago - timedelta(seconds=i)).isoformat(),
                 },
                 project_id=self.project.id,
             )
@@ -4180,7 +4180,7 @@ def test_resolve_with_integration(self, mock_sync_status_outbound: MagicMock) ->
             integration = self.create_provider_integration(provider="example", name="Example")
             integration.add_organization(org, self.user)
         event = self.store_event(
-            data={"timestamp": iso_format(self.min_ago)}, project_id=self.project.id
+            data={"timestamp": self.min_ago.isoformat()}, project_id=self.project.id
         )
         group = event.group
 
@@ -4354,7 +4354,7 @@ def test_in_semver_projects_group_resolution_stores_current_release_version(self
 
         self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=10)),
+                "timestamp": before_now(seconds=10).isoformat(),
                 "fingerprint": ["group-1"],
                 "release": release_21_1_1.version,
             },
@@ -4362,7 +4362,7 @@ def test_in_semver_projects_group_resolution_stores_current_release_version(self
         )
         group = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=12)),
+                "timestamp": before_now(seconds=12).isoformat(),
                 "fingerprint": ["group-1"],
                 "release": release_21_1_0.version,
             },
@@ -4420,7 +4420,7 @@ def test_in_non_semver_projects_group_resolution_stores_current_release_version(
 
         group = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=12)),
+                "timestamp": before_now(seconds=12).isoformat(),
                 "fingerprint": ["group-1"],
                 "release": release_1.version,
             },
@@ -4469,7 +4469,7 @@ def test_in_non_semver_projects_store_actual_current_release_version_not_cached_
 
         group = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=12)),
+                "timestamp": before_now(seconds=12).isoformat(),
                 "fingerprint": ["group-1"],
                 "release": release_1.version,
             },
@@ -4484,7 +4484,7 @@ def test_in_non_semver_projects_store_actual_current_release_version_not_cached_
 
         self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=0)),
+                "timestamp": before_now(seconds=0).isoformat(),
                 "fingerprint": ["group-1"],
                 "release": release_2.version,
             },
@@ -4527,7 +4527,7 @@ def test_in_non_semver_projects_resolved_in_next_release_is_equated_to_in_releas
 
         group = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=12)),
+                "timestamp": before_now(seconds=12).isoformat(),
                 "fingerprint": ["group-1"],
                 "release": release_1.version,
             },
@@ -4558,6 +4558,8 @@ def test_in_non_semver_projects_resolved_in_next_release_is_equated_to_in_releas
 
     def test_selective_status_update(self) -> None:
         group1 = self.create_group(status=GroupStatus.RESOLVED)
+        group1.resolved_at = timezone.now()
+        group1.save()
         group2 = self.create_group(status=GroupStatus.UNRESOLVED)
         group3 = self.create_group(status=GroupStatus.IGNORED)
         group4 = self.create_group(
@@ -4673,7 +4675,7 @@ def test_in_semver_projects_set_resolved_in_explicit_release(self) -> None:
 
         group = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=10)),
+                "timestamp": before_now(seconds=10).isoformat(),
                 "fingerprint": ["group-1"],
                 "release": release_1.version,
             },
@@ -5004,7 +5006,7 @@ def test_snooze_user_count(self) -> None:
                 data={
                     "fingerprint": ["put-me-in-group-1"],
                     "user": {"id": str(i)},
-                    "timestamp": iso_format(self.min_ago + timedelta(seconds=i)),
+                    "timestamp": (self.min_ago + timedelta(seconds=i)).isoformat(),
                 },
                 project_id=self.project.id,
             )
diff --git a/tests/sentry/issues/endpoints/test_organization_shortid.py b/tests/sentry/issues/endpoints/test_organization_shortid.py
index 7d412f44744849..06b6cf1571a8de 100644
--- a/tests/sentry/issues/endpoints/test_organization_shortid.py
+++ b/tests/sentry/issues/endpoints/test_organization_shortid.py
@@ -7,7 +7,7 @@
 
 
 class ShortIdLookupEndpointTest(APITestCase):
-    def test_simple(self):
+    def test_simple(self) -> None:
         org = self.create_organization(owner=self.user)
         project = self.create_project(organization=org)
         group = self.create_group(project=project, short_id=project.next_short_id())
diff --git a/tests/sentry/issues/endpoints/test_project_group_stats.py b/tests/sentry/issues/endpoints/test_project_group_stats.py
index 81ca9cfebe2111..a76c3ea4603fd7 100644
--- a/tests/sentry/issues/endpoints/test_project_group_stats.py
+++ b/tests/sentry/issues/endpoints/test_project_group_stats.py
@@ -7,7 +7,7 @@
 
 class ProjectGroupStatsTest(APITestCase):
     @freeze_time(before_now(days=1).replace(minute=10))
-    def test_simple(self):
+    def test_simple(self) -> None:
         self.login_as(user=self.user)
 
         group1 = self.store_event(
diff --git a/tests/sentry/issues/endpoints/test_shared_group_details.py b/tests/sentry/issues/endpoints/test_shared_group_details.py
index 759d939d38887a..28d60834eecc38 100644
--- a/tests/sentry/issues/endpoints/test_shared_group_details.py
+++ b/tests/sentry/issues/endpoints/test_shared_group_details.py
@@ -1,3 +1,5 @@
+from collections.abc import Callable
+
 from sentry.models.groupshare import GroupShare
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.helpers.datetime import before_now
@@ -7,7 +9,9 @@
 
 
 class SharedGroupDetailsTest(APITestCase):
-    def _get_path_functions(self):
+    def _get_path_functions(
+        self,
+    ) -> tuple[Callable[[str], str], Callable[[str], str], Callable[[str], str]]:
         # The urls for shared group details are supported both with an org slug and without.
         # We test both as long as we support both.
         # Because removing old urls takes time and consideration of the cost of breaking lingering references, a
@@ -18,7 +22,7 @@ def _get_path_functions(self):
             lambda share_id: f"/api/0/organizations/{self.organization.id}/shared/issues/{share_id}/",
         )
 
-    def test_simple(self):
+    def test_simple(self) -> None:
         self.login_as(user=self.user)
 
         min_ago = before_now(minutes=1).isoformat()
@@ -44,7 +48,7 @@ def test_simple(self):
             assert response.data["project"]["slug"] == group.project.slug
             assert response.data["project"]["organization"]["slug"] == group.organization.slug
 
-    def test_does_not_leak_assigned_to(self):
+    def test_does_not_leak_assigned_to(self) -> None:
         self.login_as(user=self.user)
 
         min_ago = before_now(minutes=1).isoformat()
@@ -71,7 +75,7 @@ def test_does_not_leak_assigned_to(self):
             assert response.data["project"]["organization"]["slug"] == group.organization.slug
             assert "assignedTo" not in response.data
 
-    def test_feature_disabled(self):
+    def test_feature_disabled(self) -> None:
         self.login_as(user=self.user)
 
         group = self.create_group()
@@ -93,7 +97,7 @@ def test_feature_disabled(self):
 
             assert response.status_code == 404
 
-    def test_permalink(self):
+    def test_permalink(self) -> None:
         group = self.create_group()
 
         share_id = group.get_share_id()
diff --git a/tests/sentry/issues/endpoints/test_team_groups_old.py b/tests/sentry/issues/endpoints/test_team_groups_old.py
index e750dea275cf4a..6a87ee28967c87 100644
--- a/tests/sentry/issues/endpoints/test_team_groups_old.py
+++ b/tests/sentry/issues/endpoints/test_team_groups_old.py
@@ -12,7 +12,7 @@
 class TeamGroupsOldTest(APITestCase):
     endpoint = "sentry-api-0-team-oldest-issues"
 
-    def test_simple(self):
+    def test_simple(self) -> None:
         project1 = self.create_project(teams=[self.team], slug="foo")
         project2 = self.create_project(teams=[self.team], slug="bar")
         group1 = self.create_group(
@@ -51,7 +51,7 @@ def test_simple(self):
         response = self.get_success_response(self.organization.slug, self.team.slug)
         assert [group["id"] for group in response.data] == [str(group2.id), str(group1.id)]
 
-    def test_filter_by_environment(self):
+    def test_filter_by_environment(self) -> None:
         project1 = self.create_project(teams=[self.team], slug="foo")
         environment = self.create_environment(name="prod", project=project1)
         self.create_environment(name="dev", project=project1)
diff --git a/tests/sentry/issues/test_attributes.py b/tests/sentry/issues/test_attributes.py
index 30015066e7bbbb..a1438db4d5f1fa 100644
--- a/tests/sentry/issues/test_attributes.py
+++ b/tests/sentry/issues/test_attributes.py
@@ -11,7 +11,6 @@
     Operation,
     _bulk_retrieve_group_values,
     _bulk_retrieve_snapshot_values,
-    _retrieve_group_values,
 )
 from sentry.models.group import Group, GroupStatus
 from sentry.models.groupassignee import GroupAssignee
@@ -24,19 +23,6 @@
 
 
 class GroupAttributesTest(TestCase):
-    def test_retrieve_group_values(self) -> None:
-        group = self.create_group()
-        assert _retrieve_group_values(group.id) == GroupValues(
-            id=group.id,
-            project_id=group.project_id,
-            status=group.status,
-            substatus=group.substatus,
-            first_seen=group.first_seen,
-            num_comments=group.num_comments,
-            priority=group.priority,
-            first_release_id=None,
-        )
-
     def test_bulk_retrieve_group_values(self) -> None:
         group = self.create_group()
         release = self.create_release(project=group.project)
diff --git a/tests/sentry/issues/test_escalating_issues_alg.py b/tests/sentry/issues/test_escalating_issues_alg.py
index 80087b5aaf12e0..800e293f758308 100644
--- a/tests/sentry/issues/test_escalating_issues_alg.py
+++ b/tests/sentry/issues/test_escalating_issues_alg.py
@@ -1,12 +1,10 @@
 from datetime import datetime
-from typing import Any
 
 from sentry.issues.escalating_issues_alg import generate_issue_forecast
-from sentry.tasks.weekly_escalating_forecast import GroupCount
 
-START_TIME = datetime.strptime("2022-07-27T00:00:00+00:00", "%Y-%m-%dT%H:%M:%S%f%z")
+START_TIME = datetime.fromisoformat("2022-07-27T00:00:00+00:00")
 
-SEVEN_DAY_INPUT_INTERVALS: list[Any] = [
+SEVEN_DAY_INPUT_INTERVALS = [
     "2022-07-20T00:00:00+00:00",
     "2022-07-20T01:00:00+00:00",
     "2022-07-20T02:00:00+00:00",
@@ -177,7 +175,7 @@
     "2022-07-26T23:00:00+00:00",
 ]
 
-SIX_DAY_INPUT_INTERVALS: list[Any] = [
+SIX_DAY_INPUT_INTERVALS = [
     "2022-07-21T00:00:00+00:00",
     "2022-07-21T01:00:00+00:00",
     "2022-07-21T02:00:00+00:00",
@@ -324,7 +322,7 @@
     "2022-07-26T23:00:00+00:00",
 ]
 
-SEVEN_DAY_ERROR_EVENTS: list[Any] = [
+SEVEN_DAY_ERROR_EVENTS = [
     74,
     532,
     670,
@@ -497,10 +495,10 @@
 
 
 def test_spike_case() -> None:
-    start_time = datetime.strptime("2022-07-27T00:00:00+00:00", "%Y-%m-%dT%H:%M:%S%f%z")
-    data: GroupCount = {"intervals": SEVEN_DAY_INPUT_INTERVALS, "data": SEVEN_DAY_ERROR_EVENTS}
-
-    ceilings_list = generate_issue_forecast(data, start_time)
+    start_time = datetime.fromisoformat("2022-07-27T00:00:00+00:00")
+    ceilings_list = generate_issue_forecast(
+        {"intervals": SEVEN_DAY_INPUT_INTERVALS, "data": SEVEN_DAY_ERROR_EVENTS}, start_time
+    )
     ceilings = [x["forecasted_value"] for x in ceilings_list]
 
     assert ceilings == [6987] * 14, "Ceilings are incorrect"
@@ -583,20 +581,18 @@ def test_bursty_case() -> None:
         7627,
     ] + [0] * 95
 
-    data: GroupCount = {"intervals": SEVEN_DAY_INPUT_INTERVALS, "data": error_events}
-
-    ceilings_list = generate_issue_forecast(data, START_TIME)
+    ceilings_list = generate_issue_forecast(
+        {"intervals": SEVEN_DAY_INPUT_INTERVALS, "data": error_events}, START_TIME
+    )
     ceilings = [x["forecasted_value"] for x in ceilings_list]
 
     assert ceilings == [16580] * 14, "Ceilings are incorrect"
 
 
 def test_empty_input() -> None:
-    error_events: list[int] = []
-
-    data: GroupCount = {"intervals": SEVEN_DAY_INPUT_INTERVALS, "data": error_events}
-
-    ceilings_list = generate_issue_forecast(data, START_TIME)
+    ceilings_list = generate_issue_forecast(
+        {"intervals": SEVEN_DAY_INPUT_INTERVALS, "data": []}, START_TIME
+    )
     ceilings = [x["forecasted_value"] for x in ceilings_list]
 
     assert ceilings == [], "Empty Input"
@@ -655,9 +651,9 @@ def test_less_than_week_data() -> None:
         7627,
     ] + [0] * 95
 
-    data: GroupCount = {"intervals": SIX_DAY_INPUT_INTERVALS, "data": error_events}
-
-    ceilings_list = generate_issue_forecast(data, START_TIME)
+    ceilings_list = generate_issue_forecast(
+        {"intervals": SIX_DAY_INPUT_INTERVALS, "data": error_events}, START_TIME
+    )
     ceilings = [x["forecasted_value"] for x in ceilings_list]
 
     assert ceilings == [82900] * 14, "Ceilings are incorrect"
@@ -666,18 +662,18 @@ def test_less_than_week_data() -> None:
 def test_low_freq_events() -> None:
     error_events = [6] * 168
 
-    data: GroupCount = {"intervals": SEVEN_DAY_INPUT_INTERVALS, "data": error_events}
-
-    ceilings_list = generate_issue_forecast(data, START_TIME)
+    ceilings_list = generate_issue_forecast(
+        {"intervals": SEVEN_DAY_INPUT_INTERVALS, "data": error_events}, START_TIME
+    )
     ceilings = [x["forecasted_value"] for x in ceilings_list]
 
     assert ceilings == [36] * 14, "Ceilings are incorrect"
 
 
 def test_output() -> None:
-    data: GroupCount = {"intervals": SEVEN_DAY_INPUT_INTERVALS, "data": SEVEN_DAY_ERROR_EVENTS}
-
-    ceilings_list = generate_issue_forecast(data, START_TIME)
+    ceilings_list = generate_issue_forecast(
+        {"intervals": SEVEN_DAY_INPUT_INTERVALS, "data": SEVEN_DAY_ERROR_EVENTS}, START_TIME
+    )
 
     assert ceilings_list == [
         {"forecasted_date": "2022-07-27", "forecasted_value": 6987},
diff --git a/tests/sentry/issues/test_group_attributes_dataset.py b/tests/sentry/issues/test_group_attributes_dataset.py
index 7a9d63f24f85e2..46f23d6eaff263 100644
--- a/tests/sentry/issues/test_group_attributes_dataset.py
+++ b/tests/sentry/issues/test_group_attributes_dataset.py
@@ -2,8 +2,8 @@
 from snuba_sdk.legacy import json_to_snql
 
 from sentry.issues.attributes import (
+    _bulk_retrieve_group_values,
     _bulk_retrieve_snapshot_values,
-    _retrieve_group_values,
     produce_snapshot_to_kafka,
 )
 from sentry.testutils.cases import SnubaTestCase, TestCase
@@ -36,7 +36,8 @@ def test_insert_then_query(self) -> None:
         project = self.create_project()
         group = self.create_group(project=project)
 
-        snapshot = _bulk_retrieve_snapshot_values([_retrieve_group_values(group.id)], False)
+        group_values = _bulk_retrieve_group_values([group.id])
+        snapshot = _bulk_retrieve_snapshot_values(group_values, False)
         self._send(snapshot[0])
 
         json_body = {
diff --git a/tests/sentry/issues/test_grouptype.py b/tests/sentry/issues/test_grouptype.py
index 1ede4aec72f0c8..596e60e0b38df4 100644
--- a/tests/sentry/issues/test_grouptype.py
+++ b/tests/sentry/issues/test_grouptype.py
@@ -126,7 +126,6 @@ class TestGroupType(PerformanceGroupTypeDefaults, GroupType):
             category = GroupCategory.PERFORMANCE.value
             released = True
 
-        assert TestGroupType.is_visible(self.organization)
         assert TestGroupType.allow_post_process_group(self.organization)
         assert TestGroupType.allow_ingest(self.organization)
 
@@ -139,7 +138,6 @@ class TestGroupType(PerformanceGroupTypeDefaults, GroupType):
             category = GroupCategory.PERFORMANCE.value
             released = False
 
-        assert not TestGroupType.is_visible(self.organization)
         assert not TestGroupType.allow_post_process_group(self.organization)
         assert not TestGroupType.allow_ingest(self.organization)
 
@@ -152,8 +150,6 @@ class TestGroupType(PerformanceGroupTypeDefaults, GroupType):
             category = GroupCategory.PERFORMANCE.value
             released = False
 
-        with self.feature(TestGroupType.build_visible_feature_name()):
-            assert TestGroupType.is_visible(self.organization)
         with self.feature(TestGroupType.build_post_process_group_feature_name()):
             assert TestGroupType.allow_post_process_group(self.organization)
         with self.feature(TestGroupType.build_ingest_feature_name()):
diff --git a/tests/sentry/issues/test_merge.py b/tests/sentry/issues/test_merge.py
index 6d2b915d898791..9918385f53ea1a 100644
--- a/tests/sentry/issues/test_merge.py
+++ b/tests/sentry/issues/test_merge.py
@@ -55,4 +55,4 @@ def test_handle_merge_performance_issues(self) -> None:
 
         with pytest.raises(rest_framework.exceptions.ValidationError) as e:
             handle_merge(self.groups, self.project_lookup, self.user)
-            assert e.match("Only error issues can be merged.")
+        assert e.match("Only error issues can be merged.")
diff --git a/tests/sentry/issues/test_status_change.py b/tests/sentry/issues/test_status_change.py
index 7445202729eb68..dec3b58abf86d6 100644
--- a/tests/sentry/issues/test_status_change.py
+++ b/tests/sentry/issues/test_status_change.py
@@ -106,7 +106,7 @@ def test_unresolve_ignored_issue(self, issue_unignored: Any) -> None:
             self.projects,
             self.project_lookup,
             acting_user=self.user,
-            is_bulk=True,
+            is_bulk=False,
             status_details={},
             new_status=GroupStatus.UNRESOLVED,
             new_substatus=GroupSubStatus.ONGOING,
@@ -131,7 +131,7 @@ def test_unresolve_resolved_issue(self, issue_unresolved: Any) -> None:
             acting_user=self.user,
             new_status=GroupStatus.UNRESOLVED,
             new_substatus=GroupSubStatus.ONGOING,
-            is_bulk=True,
+            is_bulk=False,
             status_details={},
             sender=self,
         )
@@ -154,7 +154,7 @@ def test_ignore_new_issue(self, issue_ignored: Any) -> None:
             acting_user=self.user,
             new_status=GroupStatus.IGNORED,
             new_substatus=None,
-            is_bulk=True,
+            is_bulk=False,
             status_details={"ignoreDuration": 30},
             sender=self,
         )
@@ -177,7 +177,7 @@ def test_ignore_until_escalating(self, issue_ignored: Any) -> None:
             acting_user=self.user,
             new_status=GroupStatus.IGNORED,
             new_substatus=None,
-            is_bulk=True,
+            is_bulk=False,
             status_details={"ignoreUntilEscalating": True},
             sender=self,
         )
diff --git a/tests/sentry/issues/test_utils.py b/tests/sentry/issues/test_utils.py
index 62a3df268c388b..d68b2a7d32b4ad 100644
--- a/tests/sentry/issues/test_utils.py
+++ b/tests/sentry/issues/test_utils.py
@@ -72,7 +72,7 @@ def build_occurrence(self, **overrides: Any) -> IssueOccurrence:
         return IssueOccurrence.from_dict(self.build_occurrence_data(**overrides))
 
     def process_occurrence(
-        self, event_data: dict[str, Any], **overrides
+        self, event_data: dict[str, Any], **overrides: Any
     ) -> tuple[IssueOccurrence, GroupInfo | None]:
         """
         Testutil to build and process occurrence data instead of going through Kafka.
diff --git a/tests/sentry/logging/test_handler.py b/tests/sentry/logging/test_handler.py
index 889e3547d0af0a..c37bfa77ada962 100644
--- a/tests/sentry/logging/test_handler.py
+++ b/tests/sentry/logging/test_handler.py
@@ -4,7 +4,7 @@
 
 import pytest
 
-from sentry.logging.handlers import JSONRenderer, StructLogHandler
+from sentry.logging.handlers import GKEStructLogHandler, JSONRenderer, StructLogHandler
 
 
 @pytest.fixture
@@ -119,3 +119,15 @@ def test_logging_raiseExcpetions_enabled_generic_logging(caplog, snafu):
 def test_logging_raiseExcpetions_disabled_generic_logging(caplog, snafu):
     logger = logging.getLogger(__name__)
     logger.log(logging.INFO, snafu)
+
+
+def test_gke_emit() -> None:
+    logger = mock.Mock()
+    GKEStructLogHandler().emit(make_logrecord(), logger=logger)
+    logger.log.assert_called_once_with(
+        name="name",
+        level=logging.INFO,
+        severity="INFO",
+        event="msg",
+        **{"logging.googleapis.com/labels": {"name": "name"}},
+    )
diff --git a/tests/sentry/middleware/integrations/parsers/test_bitbucket_server.py b/tests/sentry/middleware/integrations/parsers/test_bitbucket_server.py
index 6e0b86511ef6c4..7d0aa5fb315288 100644
--- a/tests/sentry/middleware/integrations/parsers/test_bitbucket_server.py
+++ b/tests/sentry/middleware/integrations/parsers/test_bitbucket_server.py
@@ -5,7 +5,6 @@
 from django.test import RequestFactory, override_settings
 from django.urls import reverse
 
-from sentry.integrations.models.integration import Integration
 from sentry.middleware.integrations.parsers.bitbucket_server import BitbucketServerRequestParser
 from sentry.models.organizationmapping import OrganizationMapping
 from sentry.silo.base import SiloMode
@@ -23,13 +22,6 @@ class BitbucketServerRequestParserTest(TestCase):
     region = Region("us", 1, "https://us.testserver", RegionCategory.MULTI_TENANT)
     region_config = (region,)
 
-    def get_integration(self) -> Integration:
-        return self.create_integration(
-            organization=self.organization,
-            external_id="bitbucketserver:1",
-            provider="bitbucket_server",
-        )
-
     @override_regions(region_config)
     @override_settings(SILO_MODE=SiloMode.CONTROL)
     def test_routing_webhook(self):
diff --git a/tests/sentry/middleware/integrations/parsers/test_slack.py b/tests/sentry/middleware/integrations/parsers/test_slack.py
index 260f2259a28928..3f039aa9d09845 100644
--- a/tests/sentry/middleware/integrations/parsers/test_slack.py
+++ b/tests/sentry/middleware/integrations/parsers/test_slack.py
@@ -97,7 +97,7 @@ def test_django_view(self):
         parser = SlackRequestParser(request, self.get_response)
         parser_integration = parser.get_integration_from_request()
         if not parser_integration:
-            raise ValueError("Parser could not identify an integration")
+            raise AssertionError("Parser could not identify an integration")
         assert parser_integration.id == self.integration.id
 
         # Passes through to control silo
diff --git a/tests/sentry/middleware/test_access_log_middleware.py b/tests/sentry/middleware/test_access_log_middleware.py
index c520bb1674d31f..46ec21299bde7c 100644
--- a/tests/sentry/middleware/test_access_log_middleware.py
+++ b/tests/sentry/middleware/test_access_log_middleware.py
@@ -47,7 +47,7 @@ class RateLimitedEndpoint(Endpoint):
     )
 
     def get(self, request):
-        return Response({"ok": True})
+        raise NotImplementedError
 
 
 class ConcurrentRateLimitedEndpoint(Endpoint):
diff --git a/tests/sentry/middleware/test_auth.py b/tests/sentry/middleware/test_auth.py
index ce6c3d6c16a736..5fd71dc65ecff3 100644
--- a/tests/sentry/middleware/test_auth.py
+++ b/tests/sentry/middleware/test_auth.py
@@ -23,13 +23,6 @@ class AuthenticationMiddlewareTestCase(TestCase):
     def assert_user_equals(self, request):
         assert request.user == user_service.get_user(user_id=self.user.id)
 
-    def setUp(self):
-        from django.core.cache import cache
-
-        cache.clear()
-        yield
-        cache.clear()
-
     @cached_property
     def request(self):
         rv = RequestFactory().get("/")
diff --git a/tests/sentry/middleware/test_ratelimit_middleware.py b/tests/sentry/middleware/test_ratelimit_middleware.py
index a4e396265a0d18..1941c9d1fc6680 100644
--- a/tests/sentry/middleware/test_ratelimit_middleware.py
+++ b/tests/sentry/middleware/test_ratelimit_middleware.py
@@ -33,13 +33,13 @@ class TestEndpoint(Endpoint):
         enforce_rate_limit = True
 
         def get(self):
-            return Response({"ok": True})
+            raise NotImplementedError
 
     class TestEndpointNoRateLimits(Endpoint):
         enforce_rate_limit = False
 
         def get(self):
-            return Response({"ok": True})
+            raise NotImplementedError
 
     _test_endpoint = TestEndpoint.as_view()
     _test_endpoint_no_rate_limits = TestEndpointNoRateLimits.as_view()
diff --git a/tests/sentry/middleware/test_stats.py b/tests/sentry/middleware/test_stats.py
index afd5766589081a..43ee0700eb1de5 100644
--- a/tests/sentry/middleware/test_stats.py
+++ b/tests/sentry/middleware/test_stats.py
@@ -3,7 +3,6 @@
 
 from django.test import RequestFactory, override_settings
 from rest_framework.permissions import AllowAny
-from rest_framework.response import Response
 
 from sentry.api.base import Endpoint
 from sentry.middleware.ratelimit import RatelimitMiddleware
@@ -19,7 +18,7 @@ class RateLimitedEndpoint(Endpoint):
     rate_limits = {"GET": {RateLimitCategory.IP: RateLimit(limit=0, window=10)}}
 
     def get(self):
-        return Response({"ok": True})
+        raise NotImplementedError
 
 
 class RequestTimingMiddlewareTest(TestCase):
diff --git a/tests/sentry/models/test_activity.py b/tests/sentry/models/test_activity.py
index 990238edd698ac..61527f1fb618d6 100644
--- a/tests/sentry/models/test_activity.py
+++ b/tests/sentry/models/test_activity.py
@@ -1,6 +1,8 @@
 import logging
+from unittest.mock import MagicMock, patch
 
 from sentry.event_manager import EventManager
+from sentry.issues.grouptype import MetricIssuePOC
 from sentry.models.activity import Activity
 from sentry.testutils.cases import TestCase
 from sentry.types.activity import ActivityType
@@ -319,3 +321,26 @@ def test_get_activities_for_group_flip_flop(self):
         for pair in chunked(act_for_group[:-1], 2):
             assert pair[0].type == ActivityType.SET_IGNORED.value
             assert pair[1].type == ActivityType.SET_UNRESOLVED.value
+
+    @patch("sentry.tasks.activity.send_activity_notifications.delay")
+    def test_skips_status_change_notifications_if_disabled(
+        self, mock_send_activity_notifications: MagicMock
+    ):
+        project = self.create_project(name="test_activities_group")
+        group = self.create_group(project)
+
+        # Create an activity that would normally trigger a notification
+        activity = Activity.objects.create_group_activity(
+            group=group, type=ActivityType.SET_UNRESOLVED, data=None, send_notification=True
+        )
+
+        mock_send_activity_notifications.assert_called_once_with(activity.id)
+        mock_send_activity_notifications.reset_mock()
+
+        group.type = MetricIssuePOC.type_id
+        group.save()
+        _ = Activity.objects.create_group_activity(
+            group=group, type=ActivityType.SET_RESOLVED, data=None, send_notification=True
+        )
+
+        mock_send_activity_notifications.assert_not_called()
diff --git a/tests/sentry/models/test_apiapplication.py b/tests/sentry/models/test_apiapplication.py
index 3957592641251e..b236c638e40656 100644
--- a/tests/sentry/models/test_apiapplication.py
+++ b/tests/sentry/models/test_apiapplication.py
@@ -12,12 +12,15 @@ def test_is_valid_redirect_uri(self):
 
         assert app.is_valid_redirect_uri("http://example.com/")
         assert app.is_valid_redirect_uri("http://example.com")
+        assert app.is_valid_redirect_uri("http://example.com/.")
+        assert app.is_valid_redirect_uri("http://example.com//")
         assert app.is_valid_redirect_uri("http://example.com/biz/baz")
         assert not app.is_valid_redirect_uri("https://example.com/")
         assert not app.is_valid_redirect_uri("http://foo.com")
         assert not app.is_valid_redirect_uri("http://example.com.foo.com")
 
         assert app.is_valid_redirect_uri("http://sub.example.com/path")
+        assert app.is_valid_redirect_uri("http://sub.example.com/path/")
         assert app.is_valid_redirect_uri("http://sub.example.com/path/bar")
         assert not app.is_valid_redirect_uri("http://sub.example.com")
         assert not app.is_valid_redirect_uri("http://sub.example.com/path/../baz")
@@ -92,3 +95,11 @@ def test_get_redirect_uris_newline_separated(self):
             "http://example2.com",
             "http://example.io",
         ]
+
+    def test_default_string_serialization(self):
+        app = ApiApplication.objects.create(
+            name="origins_test",
+            redirect_uris="http://example.com\nhttp://example2.com\nhttp://example.io",
+        )
+
+        assert f"{app} is cool" == f"{app.name} is cool"
diff --git a/tests/sentry/models/test_apigrant.py b/tests/sentry/models/test_apigrant.py
new file mode 100644
index 00000000000000..fdcd2cc1fdd030
--- /dev/null
+++ b/tests/sentry/models/test_apigrant.py
@@ -0,0 +1,20 @@
+from sentry.models.apiapplication import ApiApplication
+from sentry.models.apigrant import ApiGrant
+from sentry.testutils.cases import TestCase
+from sentry.testutils.silo import control_silo_test
+
+
+@control_silo_test
+class ApiGrantTest(TestCase):
+    def setUp(self) -> None:
+        self.user = self.create_user()
+        self.application = ApiApplication.objects.create(
+            owner=self.user, redirect_uris="https://example.com"
+        )
+        self.grant = ApiGrant.objects.create(
+            user=self.user, application=self.application, redirect_uri="https://example.com"
+        )
+
+    def test_default_string_serialization(self):
+        default_msg = f"api_grant_id={self.grant.id}, user_id={self.user.id}, application_id={self.application.id} is cool"
+        assert f"{self.grant} is cool" == default_msg
diff --git a/tests/sentry/models/test_apikey.py b/tests/sentry/models/test_apikey.py
index 767fe4ad6e9e04..8ef4b8b723e5af 100644
--- a/tests/sentry/models/test_apikey.py
+++ b/tests/sentry/models/test_apikey.py
@@ -6,7 +6,7 @@
 
 
 @control_silo_test
-class ApiTokenTest(TestCase):
+class ApiKeyTest(TestCase):
     def test_enforces_scope_hierarchy(self):
         org = self.create_organization()
         # Ensure hierarchy is enforced for all tokens
@@ -16,3 +16,17 @@ def test_enforces_scope_hierarchy(self):
             with assume_test_silo_mode(SiloMode.REGION):
                 replica = ApiKeyReplica.objects.get(apikey_id=token.id)
                 assert replica.get_scopes() == token.get_scopes()
+
+    def test_default_string_serialization(self):
+        org = self.create_organization()
+        key = self.create_api_key(organization=org)
+
+        assert f"{key} is cool" == f"api_key_id={key.id}, status={key.status} is cool"
+
+    def test_apikeyreplica_string_serialization(self):
+        org = self.create_organization()
+        key = self.create_api_key(organization=org)
+        with assume_test_silo_mode(SiloMode.REGION):
+            replica = ApiKeyReplica.objects.get(apikey_id=key.id)
+
+        assert f"{replica} is cool" == f"replica_id={replica.id}, status={replica.status} is cool"
diff --git a/tests/sentry/models/test_apitoken.py b/tests/sentry/models/test_apitoken.py
index 5cc25a6c6e0d30..434395b31ba611 100644
--- a/tests/sentry/models/test_apitoken.py
+++ b/tests/sentry/models/test_apitoken.py
@@ -134,6 +134,22 @@ def test_hash_updated_when_calling_update(self):
         assert token.token_last_characters == "1234"
         assert token.hashed_token == new_token_expected_hash
 
+    def test_default_string_serialization(self):
+        user = self.create_user()
+        token = ApiToken.objects.create(user_id=user.id)
+
+        assert f"{token} is cool" == f"token_id={token.id} is cool"
+
+    def test_replica_string_serialization(self):
+        user = self.create_user()
+        token = ApiToken.objects.create(user_id=user.id)
+        with assume_test_silo_mode(SiloMode.REGION):
+            replica = ApiTokenReplica.objects.get(apitoken_id=token.id)
+            assert (
+                f"{replica} is swug"
+                == f"replica_token_id={replica.id}, token_id={token.id} is swug"
+            )
+
 
 @control_silo_test
 class ApiTokenInternalIntegrationTest(TestCase):
diff --git a/tests/sentry/models/test_groupassignee.py b/tests/sentry/models/test_groupassignee.py
index 1fc593299565f6..442f0049047a31 100644
--- a/tests/sentry/models/test_groupassignee.py
+++ b/tests/sentry/models/test_groupassignee.py
@@ -270,7 +270,7 @@ def test_assignee_sync_outbound_unassign(self, mock_sync_assignee_outbound):
 
         with self.feature({"organizations:integrations-issue-sync": True}):
             with self.tasks():
-                GroupAssignee.objects.deassign(self.group)
+                GroupAssignee.objects.deassign(self.group, self.user)
                 mock_sync_assignee_outbound.assert_called_with(
                     external_issue, None, assign=False, assignment_source=None
                 )
diff --git a/tests/sentry/models/test_organizationslugreservation.py b/tests/sentry/models/test_organizationslugreservation.py
index aacefe2443edf1..6a32739db62d52 100644
--- a/tests/sentry/models/test_organizationslugreservation.py
+++ b/tests/sentry/models/test_organizationslugreservation.py
@@ -69,7 +69,7 @@ def assert_all_replicas_match_slug_reservations(self):
             or len(slug_reservations_missing_replicas) > 0
             or len(extraneous_replicas) > 0
         ):
-            raise Exception(
+            raise AssertionError(
                 "One or more org slug replicas did not match\n"
                 + f"mismatched replicas: {mismatched_slug_res_replicas}\n"
                 + f"extraneous replicas: {extraneous_replicas}\n"
diff --git a/tests/sentry/models/test_project.py b/tests/sentry/models/test_project.py
index 21431776a8dd27..307310ef5b881c 100644
--- a/tests/sentry/models/test_project.py
+++ b/tests/sentry/models/test_project.py
@@ -530,23 +530,6 @@ def assert_settings_copied(self, project):
         for rule, other_rule in zip(rules, self.rules):
             assert rule.label == other_rule.label
 
-    def assert_settings_not_copied(self, project, teams=()):
-        for key in self.options_dict.keys():
-            assert project.get_option(key) is None
-
-        project_teams = ProjectTeam.objects.filter(project_id=project.id, team__in=teams)
-        assert len(project_teams) == len(teams)
-
-        project_envs = EnvironmentProject.objects.filter(project_id=project.id)
-        assert len(project_envs) == 0
-
-        assert not ProjectOwnership.objects.filter(project_id=project.id).exists()
-
-        # default rule
-        rules = Rule.objects.filter(project_id=project.id)
-        assert len(rules) == 1
-        assert rules[0].label == "Send a notification for new issues"
-
     def test_simple(self):
         project = self.create_project(fire_project_created=True)
 
diff --git a/tests/sentry/models/test_projectownership.py b/tests/sentry/models/test_projectownership.py
index 067f297cd0fefe..f01d67368fb6e7 100644
--- a/tests/sentry/models/test_projectownership.py
+++ b/tests/sentry/models/test_projectownership.py
@@ -653,7 +653,7 @@ def test_force_handle_auto_assignment(self):
         assert assignee.team_id == self.team.id
 
         # Unassign the auto-assigned user
-        GroupAssignee.objects.deassign(self.event.group)
+        GroupAssignee.objects.deassign(self.event.group, self.user)
         assert len(GroupAssignee.objects.all()) == 0
 
         # Manually assign the group to someone else
diff --git a/tests/sentry/monitors/consumers/test_incident_occurrence_consumer.py b/tests/sentry/monitors/consumers/test_incident_occurrence_consumer.py
index 49034336913d38..b43e421c754bd8 100644
--- a/tests/sentry/monitors/consumers/test_incident_occurrence_consumer.py
+++ b/tests/sentry/monitors/consumers/test_incident_occurrence_consumer.py
@@ -173,7 +173,7 @@ def test_delayed_decision_dispatch(
         # 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
+        assert mock_send_incident_occurrence.call_count == 0
 
         # Tick decision resolves to OK
         mock_memoized_tick_decision.return_value = TickAnomalyDecision.NORMAL
diff --git a/tests/sentry/monitors/endpoints/test_organization_monitor_index.py b/tests/sentry/monitors/endpoints/test_organization_monitor_index.py
index 16c9607143d44a..a6fccb730dbc64 100644
--- a/tests/sentry/monitors/endpoints/test_organization_monitor_index.py
+++ b/tests/sentry/monitors/endpoints/test_organization_monitor_index.py
@@ -668,3 +668,28 @@ def test_enable_no_quota(self, check_assign_monitor_seats):
         monitor_two.refresh_from_db()
         assert monitor_one.status == ObjectStatus.DISABLED
         assert monitor_two.status == ObjectStatus.DISABLED
+
+    def test_disallow_when_no_open_membership(self):
+        monitor = self._create_monitor()
+
+        # disable Open Membership
+        self.organization.flags.allow_joinleave = False
+        self.organization.save()
+
+        # 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)
+
+        data = {
+            "ids": [monitor.guid],
+            "isMuted": True,
+        }
+        response = self.get_success_response(self.organization.slug, **data)
+        assert response.status_code == 200
+        assert response.data == {"updated": [], "errored": []}
+
+        monitor.refresh_from_db()
+        assert not monitor.is_muted
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 fd4b1f5490a829..58110b0b600d55 100644
--- a/tests/sentry/monitors/endpoints/test_organization_monitor_index_stats.py
+++ b/tests/sentry/monitors/endpoints/test_organization_monitor_index_stats.py
@@ -213,3 +213,29 @@ def test_custom_resolution(self):
             1647849540,
             {},
         ]
+
+    def test_disallow_stats_when_no_project_access(self):
+        # disable Open Membership
+        self.organization.flags.allow_joinleave = False
+        self.organization.save()
+
+        # 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)
+
+        resp = self.get_success_response(
+            self.organization.slug,
+            **{
+                "monitor": [
+                    str(self.monitor1.guid),
+                ],
+                "since": self.since.timestamp(),
+                "until": self.until.timestamp(),
+                "resolution": "1h",
+            },
+        )
+        assert resp.status_code == 200
+        assert resp.data == {}
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 d861f8c5ce875d..368a7ab6fe473b 100644
--- a/tests/sentry/monitors/tasks/test_detect_broken_monitor_envs.py
+++ b/tests/sentry/monitors/tasks/test_detect_broken_monitor_envs.py
@@ -130,7 +130,7 @@ def test_does_not_create_broken_detection_insufficient_duration(self):
             grouphash=hash_from_values([uuid.uuid4()]),
         )
 
-        for i in range(4):
+        for _ in range(4):
             MonitorCheckIn.objects.create(
                 monitor=monitor,
                 monitor_environment=monitor_environment,
diff --git a/tests/sentry/notifications/test_helpers.py b/tests/sentry/notifications/test_helpers.py
index 8e556abfb0aea6..33075e138c3fe1 100644
--- a/tests/sentry/notifications/test_helpers.py
+++ b/tests/sentry/notifications/test_helpers.py
@@ -1,4 +1,3 @@
-import types
 from urllib.parse import parse_qs, urlparse
 
 from sentry.integrations.models.external_actor import ExternalActor
@@ -24,10 +23,6 @@
 from sentry.types.actor import Actor
 
 
-def mock_event(*, transaction, data=None):
-    return types.SimpleNamespace(data=data or {}, transaction=transaction)
-
-
 class NotificationHelpersTest(TestCase):
     def setUp(self):
         super().setUp()
diff --git a/tests/sentry/notifications/test_notifications.py b/tests/sentry/notifications/test_notifications.py
index 902f15941e5fe3..9c53c02de08d65 100644
--- a/tests/sentry/notifications/test_notifications.py
+++ b/tests/sentry/notifications/test_notifications.py
@@ -59,35 +59,6 @@ def get_attachment():
     return attachments[0], data["text"][0]
 
 
-def get_blocks():
-    assert len(responses.calls) >= 1
-    data = parse_qs(responses.calls[0].request.body)
-    assert "text" in data
-    assert "blocks" in data
-
-    blocks = json.loads(data["blocks"][0])
-
-    # title with link, text, footer
-    if blocks[1]["type"] == "context":
-        title_block = blocks[1]["elements"][0]["text"]
-    else:
-        title_block = blocks[1]["text"]["text"]
-
-    url_block = blocks[-1].get("elements")
-    if url_block:
-        url_block = url_block[0].get("url")
-
-    # assume the divider is the last element
-    footer = blocks[-2].get("elements")
-    if footer:
-        footer = footer[0].get("text")
-    # otherwise try to get footer from the last element
-    if not footer:
-        footer = blocks[-1]["elements"][0]["text"]
-
-    return title_block, data["text"][0], footer, url_block
-
-
 def get_notification_uuid(url: str):
     query_params = parse_qs(urlparse(url).query)
     notification_uuid = query_params["notification_uuid"][0].split("|")[0]
diff --git a/tests/sentry/organizations/test_absolute_url.py b/tests/sentry/organizations/test_absolute_url.py
index cdc2177d379522..2fb5d12af7fab1 100644
--- a/tests/sentry/organizations/test_absolute_url.py
+++ b/tests/sentry/organizations/test_absolute_url.py
@@ -18,7 +18,7 @@
             "/settings/acme/developer-settings/release-bot/",
             "/settings/developer-settings/release-bot/",
         ),
-        # Settings views for orgs with acccount/billing in their slugs.
+        # Settings views for orgs with account/billing in their slugs.
         ("/settings/account-on/", "/settings/organization/"),
         ("/settings/billing-co/", "/settings/organization/"),
         ("/settings/account-on/integrations/", "/settings/integrations/"),
diff --git a/tests/sentry/plugins/sentry_webhooks/test_plugin.py b/tests/sentry/plugins/sentry_webhooks/test_plugin.py
index 4eaaaf50548ff4..7d17165b037ea4 100644
--- a/tests/sentry/plugins/sentry_webhooks/test_plugin.py
+++ b/tests/sentry/plugins/sentry_webhooks/test_plugin.py
@@ -52,10 +52,7 @@ def test_unsupported_text_response(self):
             content_type="application/json",
         )
 
-        try:
-            self.plugin.notify(self.notification)
-        except Exception as exc:
-            assert False, f"'self.plugin.notify' raised an exception {exc}"
+        self.plugin.notify(self.notification)  # does not raise!
 
         assert len(responses.calls) == 1
         assert responses.calls[0].response.status_code == 200
@@ -67,10 +64,7 @@ def test_unsupported_null_response(self):
             responses.POST, "http://example.com", body="null", content_type="application/json"
         )
 
-        try:
-            self.plugin.notify(self.notification)
-        except Exception as exc:
-            assert False, f"'self.plugin.notify' raised an exception {exc}"
+        self.plugin.notify(self.notification)  # does not raise!
 
         assert len(responses.calls) == 1
         assert responses.calls[0].response.status_code == 200
@@ -82,10 +76,7 @@ def test_unsupported_int_response(self):
             responses.POST, "http://example.com", body="1", content_type="application/json"
         )
 
-        try:
-            self.plugin.notify(self.notification)
-        except Exception as exc:
-            assert False, f"'self.plugin.notify' raised an exception {exc}"
+        self.plugin.notify(self.notification)  # does not raise!
 
         assert len(responses.calls) == 1
         assert responses.calls[0].response.status_code == 200
@@ -106,10 +97,7 @@ def test_moved_permanently(self):
 
         responses.add(responses.POST, "http://example.com", body="<moved permanently", status=301)
 
-        try:
-            self.plugin.notify(self.notification)
-        except Exception:
-            assert False, "ValueError: Received unexpected plaintext response for code 301"
+        self.plugin.notify(self.notification)  # does not raise!
 
         assert len(responses.calls) == 1
         assert responses.calls[0].response.status_code == 301
diff --git a/tests/sentry/processing/backpressure/test_redis.py b/tests/sentry/processing/backpressure/test_redis.py
index 5c111c4e0f68f6..a327aa48cc96ca 100644
--- a/tests/sentry/processing/backpressure/test_redis.py
+++ b/tests/sentry/processing/backpressure/test_redis.py
@@ -21,6 +21,8 @@ def test_rb_cluster_returns_some_usage() -> None:
     assert memory.used > 0
     assert memory.available > 0
     assert 0.0 < memory.percentage < 1.0
+    assert memory.host == "localhost"
+    assert memory.port == 6379
 
 
 @use_redis_cluster()
@@ -35,6 +37,8 @@ def test_redis_cluster_cluster_returns_some_usage() -> None:
     assert memory.used > 0
     assert memory.available > 0
     assert 0.0 < memory.percentage < 1.0
+    assert memory.host == "127.0.0.1"
+    assert memory.port in {7000, 7001, 7002, 7003, 7004, 7005}
 
 
 @use_redis_cluster(high_watermark=100)
@@ -47,6 +51,14 @@ def test_redis_health():
     assert isinstance(redis_services, list)
     assert len(redis_services) == 0
 
+    usage = list(iter_cluster_memory_usage(services["redis"].cluster))
+    for memory in usage:
+        assert memory.used >= 0
+        assert memory.available > 0
+        assert 0.0 < memory.percentage <= 1.0
+        assert memory.host == "127.0.0.1"
+        assert memory.port in {7000, 7001, 7002, 7003, 7004, 7005}
+
 
 @use_redis_cluster(high_watermark=0)
 def test_redis_unhealthy_state():
@@ -57,3 +69,15 @@ def test_redis_unhealthy_state():
     redis_services = unhealthy_services.get("redis")
     assert isinstance(redis_services, list)
     assert len(redis_services) == 6
+
+    usage = list(iter_cluster_memory_usage(services["redis"].cluster))
+    for memory in usage:
+        assert memory.used >= 0
+        assert memory.available > 0
+        assert 0.0 < memory.percentage <= 1.0
+        assert memory.host == "127.0.0.1"
+        assert memory.port in {7000, 7001, 7002, 7003, 7004, 7005}
+
+    for memory in redis_services:
+        assert memory.host == "127.0.0.1"
+        assert memory.port in {7000, 7001, 7002, 7003, 7004, 7005}
diff --git a/tests/sentry/profiles/test_device.py b/tests/sentry/profiles/test_device.py
deleted file mode 100644
index 0da02b9e5a7f07..00000000000000
--- a/tests/sentry/profiles/test_device.py
+++ /dev/null
@@ -1,31 +0,0 @@
-import pytest
-
-from sentry.profiles.device import GIB, DeviceClass, classify_device
-
-
-@pytest.mark.parametrize(
-    "device_model,device_os_name,device_is_emulator,device_cpu_frequencies,device_memory,expected",
-    [
-        ("iPhone14,3", "iOS", False, None, None, DeviceClass.HIGH_END),
-        ("iPhone14,3", "iOS", True, None, None, DeviceClass.UNCLASSIFIED),
-        ("Pixel 6 Pro", "android", False, None, None, DeviceClass.UNCLASSIFIED),
-        ("Pixel 6 Pro", "android", False, [8000] * 8, 8 * GIB, DeviceClass.HIGH_END),
-        ("Pixel 6 Pro", "android", True, None, None, DeviceClass.UNCLASSIFIED),
-        ("SentryPhone", "SentryOS", False, None, None, DeviceClass.UNCLASSIFIED),
-        ("SentryPhone", "SentryOS", True, None, None, DeviceClass.UNCLASSIFIED),
-    ],
-)
-def test_classify_device(
-    device_model,
-    device_os_name,
-    device_is_emulator,
-    device_cpu_frequencies,
-    device_memory,
-    expected,
-):
-    assert (
-        classify_device(
-            device_model, device_os_name, device_is_emulator, device_cpu_frequencies, device_memory
-        )
-        == expected
-    )
diff --git a/tests/sentry/profiles/test_task.py b/tests/sentry/profiles/test_task.py
index 73f1536149f205..b97385f266901c 100644
--- a/tests/sentry/profiles/test_task.py
+++ b/tests/sentry/profiles/test_task.py
@@ -3,7 +3,6 @@
 import zipfile
 from io import BytesIO
 from os.path import join
-from tempfile import TemporaryFile
 from typing import Any
 from unittest.mock import patch
 
@@ -15,7 +14,6 @@
 from sentry.lang.javascript.processing import _handles_frame as is_valid_javascript_frame
 from sentry.models.files.file import File
 from sentry.models.project import Project
-from sentry.models.projectkey import ProjectKey, UseCase
 from sentry.models.release import Release
 from sentry.models.releasefile import ReleaseFile
 from sentry.profiles.task import (
@@ -26,7 +24,6 @@
     _process_symbolicator_results_for_sample,
     _set_frames_platform,
     _symbolicate_profile,
-    get_metrics_dsn,
     process_profile_task,
 )
 from sentry.profiles.utils import Profile
@@ -88,26 +85,6 @@ def load_profile(name):
         return json.loads(f.read())
 
 
-def load_proguard(project, proguard_uuid, proguard_source):
-    with TemporaryFile() as tf:
-        tf.write(proguard_source)
-        tf.seek(0)
-        file = Factories.create_file(
-            name=proguard_uuid,
-            type="project.dif",
-            headers={"Content-Type": "proguard"},
-        )
-        file.putfile(tf)
-
-    return Factories.create_dif_file(
-        project,
-        file=file,
-        debug_id=proguard_uuid,
-        object_name="proguard-mapping",
-        data={"features": ["mapping"]},
-    )
-
-
 @pytest.fixture
 def owner():
     return Factories.create_user()
@@ -290,35 +267,38 @@ def sample_v2_profile():
     )
 
 
-@pytest.fixture
-def proguard_file_basic(project):
-    return load_proguard(project, PROGUARD_UUID, PROGUARD_SOURCE)
-
+@django_db_all
+def test_normalize_sample_v1_profile(organization, sample_v1_profile):
+    sample_v1_profile["transaction_tags"] = {"device.class": "1"}
 
-@pytest.fixture
-def proguard_file_inline(project):
-    return load_proguard(project, PROGUARD_INLINE_UUID, PROGUARD_INLINE_SOURCE)
+    _normalize(profile=sample_v1_profile, organization=organization)
 
-
-@pytest.fixture
-def proguard_file_bug(project):
-    return load_proguard(project, PROGUARD_BUG_UUID, PROGUARD_BUG_SOURCE)
+    assert sample_v1_profile.get("os", {}).get("build_number")
+    assert sample_v1_profile.get("device", {}).get("classification")
+    assert sample_v1_profile["device"]["classification"] == "low"
 
 
 @django_db_all
 def test_normalize_ios_profile(organization, ios_profile):
+    ios_profile["transaction_tags"] = {"device.class": "1"}
+
     _normalize(profile=ios_profile, organization=organization)
     for k in ["device_os_build_number", "device_classification"]:
         assert k in ios_profile
 
+    assert ios_profile["device_classification"] == "low"
+
 
 @django_db_all
 def test_normalize_android_profile(organization, android_profile):
+    android_profile["transaction_tags"] = {"device.class": "1"}
+
     _normalize(profile=android_profile, organization=organization)
     for k in ["android_api_level", "device_classification"]:
         assert k in android_profile
 
     assert isinstance(android_profile["android_api_level"], int)
+    assert android_profile["device_classification"] == "low"
 
 
 def test_process_symbolicator_results_for_sample():
@@ -825,14 +805,6 @@ def test_set_frames_platform_android():
     assert platforms == ["android", "android"]
 
 
-@django_db_all
-def test_get_metrics_dsn(default_project):
-    key1 = ProjectKey.objects.create(project=default_project, use_case=UseCase.PROFILING.value)
-    ProjectKey.objects.create(project_id=default_project.id, use_case=UseCase.PROFILING.value)
-
-    assert get_metrics_dsn(default_project.id) == key1.get_dsn(public=True)
-
-
 @patch("sentry.profiles.task._track_outcome")
 @patch("sentry.profiles.task._track_duration_outcome")
 @patch("sentry.profiles.task._symbolicate_profile")
diff --git a/tests/sentry/queue/test_routers.py b/tests/sentry/queue/test_routers.py
index 24e07ced6c67b8..b5e4f4f10aa191 100644
--- a/tests/sentry/queue/test_routers.py
+++ b/tests/sentry/queue/test_routers.py
@@ -1,4 +1,3 @@
-import itertools
 from collections.abc import Mapping, Sequence
 
 import pytest
@@ -110,35 +109,6 @@ def test_task_no_split() -> None:
     }
 
 
-@django_db_all
-def test_split_router_legacy() -> None:
-    queues = [
-        "post_process_transactions_1",
-        "post_process_transactions_2",
-        "post_process_transactions_3",
-    ]
-    queues_gen = itertools.cycle(queues)
-    with override_settings(
-        SENTRY_POST_PROCESS_QUEUE_SPLIT_ROUTER={
-            "post_process_transactions": lambda: next(queues_gen),
-        },
-        CELERY_SPLIT_QUEUE_ROUTES={},
-    ):
-        router = SplitQueueRouter()
-        assert router.route_for_queue("save_event") == "save_event"
-        assert router.route_for_queue("post_process_transactions") == "post_process_transactions_1"
-        assert router.route_for_queue("post_process_transactions") == "post_process_transactions_2"
-        assert router.route_for_queue("post_process_transactions") == "post_process_transactions_3"
-
-        with override_options({"celery_split_queue_legacy_mode": []}):
-            # Disabled legacy mode. As the split queue config is not there
-            # split queue does not happen/
-            router = SplitQueueRouter()
-            assert (
-                router.route_for_queue("post_process_transactions") == "post_process_transactions"
-            )
-
-
 CELERY_SPLIT_QUEUE_ROUTES: Mapping[str, SplitQueueSize] = {
     "post_process_transactions": {"total": 5, "in_use": 3},
     "post_process_errors": {"total": 5, "in_use": 1},
diff --git a/tests/sentry/quotas/test_redis.py b/tests/sentry/quotas/test_redis.py
index 47764a17aca3ea..e1fc83fc601f48 100644
--- a/tests/sentry/quotas/test_redis.py
+++ b/tests/sentry/quotas/test_redis.py
@@ -116,6 +116,7 @@ def test_abuse_quotas(self):
 
         self.organization.update_option("project-abuse-quota.transaction-limit", 600)
         self.organization.update_option("project-abuse-quota.attachment-limit", 601)
+        self.organization.update_option("project-abuse-quota.attachment-item-limit", 6010)
         self.organization.update_option("project-abuse-quota.session-limit", 602)
         self.organization.update_option("organization-abuse-quota.metric-bucket-limit", 603)
         self.organization.update_option("organization-abuse-quota.custom-metric-bucket-limit", 604)
@@ -145,22 +146,30 @@ def test_abuse_quotas(self):
         assert quotas[2].window == 10
         assert quotas[2].reason_code == "project_abuse_limit"
 
-        assert quotas[3].id == "pas"
+        assert quotas[3].id == "paai"
         assert quotas[3].scope == QuotaScope.PROJECT
         assert quotas[3].scope_id is None
-        assert quotas[3].categories == {DataCategory.SESSION}
-        assert quotas[3].limit == 6020
+        assert quotas[3].categories == {DataCategory.ATTACHMENT_ITEM}
+        assert quotas[3].limit == 60100
         assert quotas[3].window == 10
         assert quotas[3].reason_code == "project_abuse_limit"
 
-        assert quotas[4].id == "paspi"
+        assert quotas[4].id == "pas"
         assert quotas[4].scope == QuotaScope.PROJECT
         assert quotas[4].scope_id is None
-        assert quotas[4].categories == {DataCategory.SPAN_INDEXED}
-        assert quotas[4].limit == 6050
+        assert quotas[4].categories == {DataCategory.SESSION}
+        assert quotas[4].limit == 6020
         assert quotas[4].window == 10
         assert quotas[4].reason_code == "project_abuse_limit"
 
+        assert quotas[5].id == "paspi"
+        assert quotas[5].scope == QuotaScope.PROJECT
+        assert quotas[5].scope_id is None
+        assert quotas[5].categories == {DataCategory.SPAN_INDEXED}
+        assert quotas[5].limit == 6050
+        assert quotas[5].window == 10
+        assert quotas[5].reason_code == "project_abuse_limit"
+
         expected_quotas: dict[tuple[QuotaScope, UseCaseID | None], str] = dict()
         for scope, prefix in [
             (QuotaScope.PROJECT, "p"),
diff --git a/tests/sentry/ratelimits/test_redis.py b/tests/sentry/ratelimits/test_redis.py
index ab7fbc522f1312..0597de72f2bcf1 100644
--- a/tests/sentry/ratelimits/test_redis.py
+++ b/tests/sentry/ratelimits/test_redis.py
@@ -64,3 +64,10 @@ def test_is_limited_with_value(self):
             assert not limited
             assert value == 1
             assert reset_time == expected_reset_time + 5
+
+    def test_reset(self):
+        with freeze_time("2000-01-01"):
+            assert not self.backend.is_limited("foo", 1, self.project)
+            assert self.backend.is_limited("foo", 1, self.project)
+            self.backend.reset("foo", self.project)
+            assert not self.backend.is_limited("foo", 1, self.project)
diff --git a/tests/sentry/ratelimits/utils/test_get_ratelimit_key.py b/tests/sentry/ratelimits/utils/test_get_ratelimit_key.py
index 38f61e52a38a84..a6b25c7d8d039f 100644
--- a/tests/sentry/ratelimits/utils/test_get_ratelimit_key.py
+++ b/tests/sentry/ratelimits/utils/test_get_ratelimit_key.py
@@ -2,7 +2,6 @@
 from django.contrib.sessions.backends.base import SessionBase
 from django.test import RequestFactory
 from rest_framework.permissions import AllowAny
-from rest_framework.response import Response
 
 from sentry.api.base import Endpoint
 from sentry.auth.services.auth import AuthenticatedToken
@@ -35,7 +34,7 @@ class APITestEndpoint(Endpoint):
     )
 
     def get(self, request):
-        return Response({"ok": True})
+        raise NotImplementedError
 
 
 @all_silo_test
diff --git a/tests/sentry/receivers/test_onboarding.py b/tests/sentry/receivers/test_onboarding.py
index 8bd7f5dbc51942..b893890bef22f0 100644
--- a/tests/sentry/receivers/test_onboarding.py
+++ b/tests/sentry/receivers/test_onboarding.py
@@ -27,6 +27,7 @@
     member_joined,
     plugin_enabled,
     project_created,
+    transaction_processed,
 )
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import TestCase
@@ -981,3 +982,473 @@ def test_release_received_through_transaction_event(self):
             status=OnboardingTaskStatus.COMPLETE,
         )
         assert task is not None
+
+    def test_issue_alert_received_through_project_creation(self):
+        with self.feature("organizations:quick-start-updates"):
+            now = timezone.now()
+
+            first_organization = self.create_organization(owner=self.user, slug="first-org")
+            first_project = self.create_project(first_event=now, organization=first_organization)
+            # By default, the project creation will create a default rule
+            project_created.send(project=first_project, user=self.user, sender=type(first_project))
+            assert OrganizationOnboardingTask.objects.filter(
+                organization=first_project.organization,
+                task=OnboardingTask.ALERT_RULE,
+                status=OnboardingTaskStatus.COMPLETE,
+            ).exists()
+
+            second_organization = self.create_organization(owner=self.user, slug="second-org")
+            second_project = self.create_project(first_event=now, organization=second_organization)
+            # When creating a project, a user can opt out of creating a default rule
+            project_created.send(
+                project=second_project,
+                user=self.user,
+                sender=type(second_project),
+                default_rules=False,
+            )
+            assert not OrganizationOnboardingTask.objects.filter(
+                organization=second_project.organization,
+                task=OnboardingTask.ALERT_RULE,
+                status=OnboardingTaskStatus.COMPLETE,
+            ).exists()
+
+    # New quick start
+    @patch("sentry.analytics.record")
+    def test_new_onboarding_complete(self, record_analytics):
+        """
+        Test the new quick start happy path (without source maps)
+        """
+        with self.feature("organizations:quick-start-updates"):
+            # Create first project
+            project = self.create_project(platform="python")
+            project_created.send(
+                project=project, user=self.user, default_rules=False, sender=type(project)
+            )
+            assert (
+                OrganizationOnboardingTask.objects.get(
+                    organization=self.organization,
+                    task=OnboardingTask.FIRST_PROJECT,
+                    status=OnboardingTaskStatus.COMPLETE,
+                )
+                is not None
+            )
+            record_analytics.assert_called_with(
+                "project.created",
+                user_id=self.user.id,
+                default_user_id=self.organization.default_owner_id,
+                organization_id=self.organization.id,
+                project_id=project.id,
+                platform=project.platform,
+                updated_empty_state=False,
+            )
+
+            # Set up tracing
+            transaction_event = load_data("transaction")
+            transaction_event.update({"user": None})
+            event = self.store_event(data=transaction_event, project_id=project.id)
+            transaction_processed.send(project=project, event=event, sender=type(project))
+            assert (
+                OrganizationOnboardingTask.objects.get(
+                    organization=self.organization,
+                    task=OnboardingTask.FIRST_TRANSACTION,
+                    status=OnboardingTaskStatus.COMPLETE,
+                )
+                is not None
+            )
+            record_analytics.assert_called_with(
+                "first_transaction.sent",
+                default_user_id=self.organization.default_owner_id,
+                organization_id=self.organization.id,
+                project_id=project.id,
+                platform=project.platform,
+            )
+
+            #  Capture first error
+            error_event = self.store_event(
+                data={
+                    "event_id": "c" * 32,
+                    "message": "this is bad.",
+                    "timestamp": timezone.now().isoformat(),
+                    "type": "error",
+                },
+                project_id=project.id,
+            )
+            event_processed.send(project=project, event=error_event, sender=type(project))
+            assert (
+                OrganizationOnboardingTask.objects.get(
+                    organization=self.organization,
+                    task=OnboardingTask.FIRST_EVENT,
+                    status=OnboardingTaskStatus.COMPLETE,
+                )
+                is not None
+            )
+            record_analytics.assert_called_with(
+                "first_event.sent",
+                user_id=self.user.id,
+                organization_id=project.organization_id,
+                project_id=project.id,
+                platform=error_event.platform,
+                project_platform=project.platform,
+            )
+
+            # Configure an issue alert
+            alert_rule_created.send(
+                rule_id=Rule(id=1).id,
+                project=project,
+                user=self.user,
+                rule_type="issue",
+                sender=type(Rule),
+                is_api_token=False,
+            )
+            assert (
+                OrganizationOnboardingTask.objects.get(
+                    organization=self.organization,
+                    task=OnboardingTask.ALERT_RULE,
+                    status=OnboardingTaskStatus.COMPLETE,
+                )
+                is not None
+            )
+            record_analytics.assert_called_with(
+                "alert.created",
+                user_id=self.user.id,
+                default_user_id=self.organization.default_owner_id,
+                organization_id=self.organization.id,
+                project_id=project.id,
+                rule_id=Rule(id=1).id,
+                rule_type="issue",
+                referrer=None,
+                session_id=None,
+                is_api_token=False,
+                alert_rule_ui_component=None,
+                duplicate_rule=None,
+                wizard_v3=None,
+                query_type=None,
+            )
+
+            # Track releases
+            transaction_event = load_data("transaction")
+            transaction_event.update({"release": "my-first-release", "tags": []})
+            event = self.store_event(data=transaction_event, project_id=project.id)
+            transaction_processed.send(project=project, event=event, sender=type(project))
+            assert (
+                OrganizationOnboardingTask.objects.get(
+                    organization=self.organization,
+                    task=OnboardingTask.RELEASE_TRACKING,
+                    status=OnboardingTaskStatus.COMPLETE,
+                )
+                is not None
+            )
+            record_analytics.call_args_list[
+                len(record_analytics.call_args_list) - 2
+            ].assert_called_with(
+                "first_release_tag.sent",
+                user_id=self.user.id,
+                project_id=project.id,
+                organization_id=self.organization.id,
+            )
+
+            # Link Sentry to source code
+            github_integration = self.create_integration("github", 1234)
+            integration_added.send(
+                integration_id=github_integration.id,
+                organization_id=self.organization.id,
+                user_id=self.user.id,
+                sender=None,
+            )
+            assert (
+                OrganizationOnboardingTask.objects.get(
+                    organization=self.organization,
+                    task=OnboardingTask.LINK_SENTRY_TO_SOURCE_CODE,
+                    status=OnboardingTaskStatus.COMPLETE,
+                )
+                is not None
+            )
+            record_analytics.assert_called_with(
+                "integration.added",
+                user_id=self.user.id,
+                default_user_id=self.organization.default_owner_id,
+                organization_id=self.organization.id,
+                provider=github_integration.provider,
+                id=github_integration.id,
+            )
+
+            # Invite your team
+            user = self.create_user(email="test@example.org")
+            member = self.create_member(
+                organization=self.organization, teams=[self.team], email=user.email
+            )
+            member_invited.send(member=member, user=user, sender=type(member))
+            assert (
+                OrganizationOnboardingTask.objects.get(
+                    organization=self.organization,
+                    task=OnboardingTask.INVITE_MEMBER,
+                    status=OnboardingTaskStatus.PENDING,
+                )
+                is not None
+            )
+            record_analytics.assert_called_with(
+                "member.invited",
+                invited_member_id=member.id,
+                inviter_user_id=user.id,
+                organization_id=self.organization.id,
+                referrer=None,
+            )
+
+            # Member accepted the invite
+            member_joined.send(
+                organization_member_id=member.id,
+                organization_id=self.organization.id,
+                user_id=member.user_id,
+                sender=None,
+            )
+            assert (
+                OrganizationOnboardingTask.objects.get(
+                    organization=self.organization,
+                    task=OnboardingTask.INVITE_MEMBER,
+                    status=OnboardingTaskStatus.COMPLETE,
+                )
+                is not None
+            )
+            record_analytics.assert_called_with(
+                "organization.joined",
+                user_id=None,
+                organization_id=self.organization.id,
+            )
+
+            # The first group is complete but the beyond the basics is not
+            assert (
+                OrganizationOption.objects.filter(
+                    organization=self.organization, key="onboarding:complete"
+                ).count()
+                == 0
+            )
+
+            # Set up session replay
+            first_replay_received.send(project=project, sender=type(project))
+            assert (
+                OrganizationOnboardingTask.objects.get(
+                    organization=self.organization,
+                    task=OnboardingTask.SESSION_REPLAY,
+                    status=OnboardingTaskStatus.COMPLETE,
+                )
+                is not None
+            )
+            record_analytics.assert_called_with(
+                "first_replay.sent",
+                user_id=self.user.id,
+                organization_id=project.organization_id,
+                project_id=project.id,
+                platform=project.platform,
+            )
+
+            # Get real time notifications
+            slack_integration = self.create_integration("slack", 4321)
+            integration_added.send(
+                integration_id=slack_integration.id,
+                organization_id=self.organization.id,
+                user_id=self.user.id,
+                sender=None,
+            )
+            assert (
+                OrganizationOnboardingTask.objects.get(
+                    organization=self.organization,
+                    task=OnboardingTask.REAL_TIME_NOTIFICATIONS,
+                    status=OnboardingTaskStatus.COMPLETE,
+                )
+                is not None
+            )
+            record_analytics.assert_called_with(
+                "integration.added",
+                user_id=self.user.id,
+                default_user_id=self.organization.default_owner_id,
+                organization_id=self.organization.id,
+                provider=slack_integration.provider,
+                id=slack_integration.id,
+            )
+
+            # Add Sentry to other parts app
+            second_project = self.create_project(
+                first_event=timezone.now(), organization=self.organization
+            )
+            project_created.send(
+                project=second_project,
+                user=self.user,
+                sender=type(second_project),
+                default_rules=False,
+            )
+            assert (
+                OrganizationOnboardingTask.objects.get(
+                    organization=self.organization,
+                    task=OnboardingTask.SECOND_PLATFORM,
+                    status=OnboardingTaskStatus.COMPLETE,
+                )
+                is not None
+            )
+            record_analytics.call_args_list[
+                len(record_analytics.call_args_list) - 2
+            ].assert_called_with(
+                "second_platform.added",
+                user_id=self.user.id,
+                organization_id=self.organization.id,
+                project_id=second_project.id,
+            )
+
+            # Onboarding is complete
+            assert (
+                OrganizationOption.objects.filter(
+                    organization=self.organization, key="onboarding:complete"
+                ).count()
+                == 1
+            )
+            record_analytics.assert_called_with(
+                "onboarding.complete",
+                user_id=self.user.id,
+                organization_id=self.organization.id,
+                referrer="onboarding_tasks",
+            )
+
+    @patch("sentry.analytics.record")
+    def test_source_maps_as_required_task(self, record_analytics):
+        """
+        Test the new quick start happy path (with source maps)
+        """
+        with self.feature("organizations:quick-start-updates"):
+            # Create a project that can have source maps + create an issue alert
+            project = self.create_project(platform="javascript")
+            project_created.send(project=project, user=self.user, sender=type(project))
+
+            # Capture first transaction + release
+            transaction_event = load_data("transaction")
+            transaction_event.update({"release": "my-first-release", "tags": []})
+            event = self.store_event(data=transaction_event, project_id=project.id)
+            transaction_processed.send(project=project, event=event, sender=type(project))
+
+            #  Capture first error
+            error_event = self.store_event(
+                data={
+                    "event_id": "c" * 32,
+                    "message": "this is bad.",
+                    "timestamp": timezone.now().isoformat(),
+                    "type": "error",
+                    "release": "my-first-release",
+                },
+                project_id=project.id,
+            )
+            event_processed.send(project=project, event=error_event, sender=type(project))
+
+            # Invite your team
+            user = self.create_user(email="test@example.org")
+            member = self.create_member(
+                organization=self.organization, teams=[self.team], email=user.email
+            )
+            member_invited.send(member=member, user=user, sender=type(member))
+
+            # Member accepted the invite
+            member_joined.send(
+                organization_member_id=member.id,
+                organization_id=self.organization.id,
+                user_id=member.user_id,
+                sender=None,
+            )
+
+            # Link Sentry to source code
+            github_integration = self.create_integration("github", 1234)
+            integration_added.send(
+                integration_id=github_integration.id,
+                organization_id=self.organization.id,
+                user_id=self.user.id,
+                sender=None,
+            )
+
+            # Set up session replay
+            first_replay_received.send(project=project, sender=type(project))
+
+            # Get real time notifications
+            slack_integration = self.create_integration("slack", 4321)
+            integration_added.send(
+                integration_id=slack_integration.id,
+                organization_id=self.organization.id,
+                user_id=self.user.id,
+                sender=None,
+            )
+
+            # Add Sentry to other parts app
+            second_project = self.create_project(
+                first_event=timezone.now(), organization=self.organization
+            )
+            project_created.send(
+                project=second_project,
+                user=self.user,
+                sender=type(second_project),
+                default_rules=False,
+            )
+
+            # Onboarding is NOT yet complete
+            assert (
+                OrganizationOption.objects.filter(
+                    organization=self.organization, key="onboarding:complete"
+                ).count()
+                == 0
+            )
+
+            # Unminify your code
+            # Send event with source map
+            data = load_data("javascript")
+            data["exception"] = {
+                "values": [
+                    {
+                        "stacktrace": {
+                            "frames": [
+                                {
+                                    "data": {
+                                        "sourcemap": "https://media.sentry.io/_static/29e365f8b0d923bc123e8afa38d890c3/sentry/dist/vendor.js.map"
+                                    }
+                                }
+                            ]
+                        },
+                        "type": "TypeError",
+                    }
+                ]
+            }
+
+            event_with_sourcemap = self.store_event(
+                project_id=project.id,
+                data=data,
+            )
+            event_processed.send(project=project, event=event_with_sourcemap, sender=type(project))
+            assert (
+                OrganizationOnboardingTask.objects.get(
+                    organization=self.organization,
+                    task=OnboardingTask.SOURCEMAPS,
+                    status=OnboardingTaskStatus.COMPLETE,
+                )
+                is not None
+            )
+            record_analytics.call_args_list[
+                len(record_analytics.call_args_list) - 2
+            ].assert_called_with(
+                "first_sourcemaps.sent",
+                user_id=self.user.id,
+                organization_id=self.organization.id,
+                project_id=project.id,
+                platform=event_with_sourcemap.platform,
+                project_platform=project.platform,
+                url=dict(event_with_sourcemap.tags).get("url", None),
+            )
+            record_analytics.assert_called_with(
+                "first_sourcemaps_for_project.sent",
+                user_id=self.user.id,
+                organization_id=self.organization.id,
+                project_id=project.id,
+                platform=event_with_sourcemap.platform,
+                project_platform=project.platform,
+                url=dict(event_with_sourcemap.tags).get("url", None),
+            )
+
+            # Onboarding is NOW complete
+            assert (
+                OrganizationOption.objects.filter(
+                    organization=self.organization, key="onboarding:complete"
+                ).count()
+                == 1
+            )
diff --git a/tests/sentry/release_health/test_metrics_sessions_v2.py b/tests/sentry/release_health/test_metrics_sessions_v2.py
index 0f68ae568ac9d9..1f12fd253cf56d 100644
--- a/tests/sentry/release_health/test_metrics_sessions_v2.py
+++ b/tests/sentry/release_health/test_metrics_sessions_v2.py
@@ -1,7 +1,6 @@
 from datetime import timedelta
 
 import pytest
-from django.urls import reverse
 from django.utils import timezone
 from snuba_sdk import Column, Condition, Function, Op
 
@@ -10,8 +9,6 @@
     SessionStatus,
     _extract_status_filter_from_conditions,
 )
-from sentry.testutils.cases import APITestCase, SnubaTestCase
-from sentry.testutils.helpers.datetime import freeze_time
 
 pytestmark = pytest.mark.sentry_metrics
 
@@ -19,49 +16,6 @@
 MOCK_DATETIME = ONE_DAY_AGO.replace(hour=10, minute=0, second=0, microsecond=0)
 
 
-@freeze_time(MOCK_DATETIME)
-class MetricsSessionsV2Test(APITestCase, SnubaTestCase):
-    def setUp(self):
-        super().setUp()
-        self.setup_fixture()
-
-    def setup_fixture(self):
-        self.organization1 = self.organization
-        self.project1 = self.project
-        self.project2 = self.create_project(
-            name="teletubbies", slug="teletubbies", teams=[self.team], fire_project_created=True
-        )
-
-        self.release1 = self.create_release(project=self.project1, version="hello")
-        self.release2 = self.create_release(project=self.project1, version="hola")
-        self.release3 = self.create_release(project=self.project2, version="hallo")
-
-        self.environment1 = self.create_environment(self.project1, name="development")
-        self.environment2 = self.create_environment(self.project1, name="production")
-        self.environment3 = self.create_environment(self.project2, name="testing")
-
-    def do_request(self, query, user=None, org=None):
-        self.login_as(user=user or self.user)
-        url = reverse(
-            "sentry-api-0-organization-sessions",
-            kwargs={"organization_id_or_slug": (org or self.organization1).slug},
-        )
-        return self.client.get(url, query, format="json")
-
-    def get_sessions_data(self, groupby: list[str], interval):
-        response = self.do_request(
-            {
-                "organization_id_or_slug": [self.organization1],
-                "project": [self.project1.id],
-                "field": ["sum(session)"],
-                "groupBy": groupby,
-                "interval": interval,
-            }
-        )
-        assert response.status_code == 200
-        return response.data
-
-
 @pytest.mark.parametrize(
     "input, expected_output, expected_status_filter",
     [
diff --git a/tests/sentry/replays/consumers/test_recording.py b/tests/sentry/replays/consumers/test_recording.py
index a685e7ba656d68..b54dbc86deacbd 100644
--- a/tests/sentry/replays/consumers/test_recording.py
+++ b/tests/sentry/replays/consumers/test_recording.py
@@ -37,7 +37,7 @@ def test_multiprocessing_strategy():
     )
 
     def _commit(offsets: Mapping[Partition, int], force: bool = False) -> None:
-        return None
+        raise NotImplementedError
 
     # Assert the multi-processing step does not fail to initialize.
     task = factory.create_with_partitions(_commit, {})
diff --git a/tests/sentry/replays/test_organization_replay_index.py b/tests/sentry/replays/test_organization_replay_index.py
index 37efe646b1c925..cbd913a5f8d869 100644
--- a/tests/sentry/replays/test_organization_replay_index.py
+++ b/tests/sentry/replays/test_organization_replay_index.py
@@ -584,7 +584,9 @@ def test_get_replays_user_filters(self):
             self.mock_event_links(seq1_timestamp, project.id, "debug", replay1_id, uuid.uuid4().hex)
         )
         self.store_replays(
-            mock_replay_viewed(seq1_timestamp.timestamp(), project.id, replay1_id, viewed_by_id=1)
+            mock_replay_viewed(
+                seq1_timestamp.timestamp(), project.id, replay1_id, viewed_by_id=self.user.id
+            )
         )
 
         with self.feature(self.features):
@@ -610,8 +612,6 @@ def test_get_replays_user_filters(self):
                 "duration:<18s",
                 "duration:>=17s",
                 "duration:<=17s",
-                # "duration:[16s,17s]",  # TODO: need to add duration_in_filters in event_search.py
-                # "!duration:[16s,18s]",
                 "duration:17000ms",  # If duration value is not equal to a whole number of seconds, the endpoint fails.
                 "duration:<1m",
                 "duration:<1min",
@@ -682,12 +682,14 @@ def test_get_replays_user_filters(self):
                 "count_infos:2",
                 "count_infos:>1",
                 "count_infos:<3",
-                "viewed_by_id:1",
-                "!viewed_by_id:2",
-                "viewed_by_id:[1,2]",
-                "seen_by_id:1",
-                "!seen_by_id:2",
-                "seen_by_id:[1,2]",
+                f"viewed_by_id:{self.user.id}",
+                f"!viewed_by_id:{self.user.id+1}",
+                f"viewed_by_id:[{self.user.id+3},{self.user.id}]",
+                f"seen_by_id:{self.user.id}",
+                f"!seen_by_id:{self.user.id + 1}",
+                f"seen_by_id:[{self.user.id + 3},{self.user.id}]",
+                "viewed_by_me:true",
+                "seen_by_me:true",
             ]
 
             for query in queries:
@@ -736,8 +738,10 @@ def test_get_replays_user_filters(self):
                 "!c:*st",
                 "!activity:8",
                 "activity:<2",
-                "viewed_by_id:2",
-                "seen_by_id:2",
+                f"viewed_by_id:{self.user.id+1}",
+                f"seen_by_id:{self.user.id+1}",
+                "viewed_by_me:false",
+                "seen_by_me:false",
                 "user.email:[user2@example.com]",
                 "!user.email:[username@example.com, user2@example.com]",
             ]
@@ -938,7 +942,7 @@ def test_get_replays_filter_bad_operator(self):
         with self.feature(self.features):
             for query in queries:
                 response = self.client.get(self.url + f"?field=id&query={query}")
-                assert response.status_code == 400
+                assert response.status_code == 400, query
 
     def test_get_replays_filter_bad_value(self):
         """Test replays conform to the interchange format."""
@@ -956,20 +960,28 @@ def test_get_replays_filter_bad_value(self):
         with self.feature(self.features):
             for query in queries:
                 response = self.client.get(self.url + f"?query={query}")
-                assert response.status_code == 400
-                field = query.split(":")[0]
-                assert field.encode() in response.content
+                assert response.status_code == 400, query
 
-    # No such thing as a bad field with the tag filtering behavior.
-    #
-    # def test_get_replays_filter_bad_field(self):
-    #     """Test replays conform to the interchange format."""
-    #     self.create_project(teams=[self.team])
+    def test_get_replays_filter_bad_duration_error_messages(self):
+        # TODO: remove once we support ms timestamps
+        self.create_project(teams=[self.team])
+        queries = [
+            "duration:1004ms",
+            "duration:7.3s",
+            "duration:1.33min",
+        ]
 
-    #     with self.feature(self.features):
-    #         response = self.client.get(self.url + "?query=xyz:a")
-    #         assert response.status_code == 400
-    #         assert b"xyz" in response.content
+        with self.feature(self.features):
+            for query in queries:
+                response = self.client.get(self.url + f"?query={query}")
+                assert response.status_code == 400, query
+                assert (
+                    b"Replays only supports second-resolution timestamps at this time"
+                    in response.content
+                ), query
+                assert b"duration" in response.content, query
+
+    # Note: there's no such thing as a bad field with the tag filtering behavior.
 
     def test_get_replays_unknown_field(self):
         """Test replays unknown fields raise a 400 error."""
diff --git a/tests/sentry/runner/commands/test_workstations.py b/tests/sentry/runner/commands/test_workstations.py
index 0fb80ac841f9f4..f6f41251c36d65 100644
--- a/tests/sentry/runner/commands/test_workstations.py
+++ b/tests/sentry/runner/commands/test_workstations.py
@@ -1,4 +1,3 @@
-import subprocess
 from dataclasses import dataclass
 from unittest.mock import MagicMock, Mock, patch
 
@@ -26,18 +25,6 @@ def __init__(self, cmd, *args, **kwargs):
         self.stderr = ""
 
 
-class FakePopenFactory:
-    pass
-
-
-def raise_error(*args, **kwargs):
-    raise subprocess.CalledProcessError(returncode=123, cmd="foo")
-
-
-def raise_timeout(*args, **kwargs):
-    raise subprocess.TimeoutExpired("Fake gcloud timeout", timeout=123)
-
-
 class WorkstationsTestCase(CliTestCase):
     command = workstations
 
diff --git a/tests/sentry/search/eap/test_spans.py b/tests/sentry/search/eap/test_spans.py
index e793689306285c..a6a357d1bc5227 100644
--- a/tests/sentry/search/eap/test_spans.py
+++ b/tests/sentry/search/eap/test_spans.py
@@ -28,7 +28,7 @@ def setUp(self):
         self.resolver = SearchResolver(params=SnubaParams(), config=SearchResolverConfig())
 
     def test_simple_query(self):
-        query = self.resolver.resolve_query("span.description:foo")
+        query, _ = self.resolver.resolve_query("span.description:foo")
         assert query == TraceItemFilter(
             comparison_filter=ComparisonFilter(
                 key=AttributeKey(name="sentry.name", type=AttributeKey.Type.TYPE_STRING),
@@ -38,7 +38,7 @@ def test_simple_query(self):
         )
 
     def test_negation(self):
-        query = self.resolver.resolve_query("!span.description:foo")
+        query, _ = self.resolver.resolve_query("!span.description:foo")
         assert query == TraceItemFilter(
             comparison_filter=ComparisonFilter(
                 key=AttributeKey(name="sentry.name", type=AttributeKey.Type.TYPE_STRING),
@@ -48,7 +48,7 @@ def test_negation(self):
         )
 
     def test_numeric_query(self):
-        query = self.resolver.resolve_query("ai.total_tokens.used:123")
+        query, _ = self.resolver.resolve_query("ai.total_tokens.used:123")
         assert query == TraceItemFilter(
             comparison_filter=ComparisonFilter(
                 key=AttributeKey(name="ai_total_tokens_used", type=AttributeKey.Type.TYPE_INT),
@@ -58,7 +58,7 @@ def test_numeric_query(self):
         )
 
     def test_in_filter(self):
-        query = self.resolver.resolve_query("span.description:[foo,bar,baz]")
+        query, _ = self.resolver.resolve_query("span.description:[foo,bar,baz]")
         assert query == TraceItemFilter(
             comparison_filter=ComparisonFilter(
                 key=AttributeKey(name="sentry.name", type=AttributeKey.Type.TYPE_STRING),
@@ -68,7 +68,7 @@ def test_in_filter(self):
         )
 
     def test_uuid_validation(self):
-        query = self.resolver.resolve_query(f"id:{'f'*16}")
+        query, _ = self.resolver.resolve_query(f"id:{'f'*16}")
         assert query == TraceItemFilter(
             comparison_filter=ComparisonFilter(
                 key=AttributeKey(name="sentry.span_id", type=AttributeKey.Type.TYPE_STRING),
@@ -82,7 +82,7 @@ def test_invalid_uuid_validation(self):
             self.resolver.resolve_query("id:hello")
 
     def test_not_in_filter(self):
-        query = self.resolver.resolve_query("!span.description:[foo,bar,baz]")
+        query, _ = self.resolver.resolve_query("!span.description:[foo,bar,baz]")
         assert query == TraceItemFilter(
             comparison_filter=ComparisonFilter(
                 key=AttributeKey(name="sentry.name", type=AttributeKey.Type.TYPE_STRING),
@@ -92,7 +92,7 @@ def test_not_in_filter(self):
         )
 
     def test_in_numeric_filter(self):
-        query = self.resolver.resolve_query("ai.total_tokens.used:[123,456,789]")
+        query, _ = self.resolver.resolve_query("ai.total_tokens.used:[123,456,789]")
         assert query == TraceItemFilter(
             comparison_filter=ComparisonFilter(
                 key=AttributeKey(name="ai_total_tokens_used", type=AttributeKey.Type.TYPE_INT),
@@ -102,7 +102,7 @@ def test_in_numeric_filter(self):
         )
 
     def test_greater_than_numeric_filter(self):
-        query = self.resolver.resolve_query("ai.total_tokens.used:>123")
+        query, _ = self.resolver.resolve_query("ai.total_tokens.used:>123")
         assert query == TraceItemFilter(
             comparison_filter=ComparisonFilter(
                 key=AttributeKey(name="ai_total_tokens_used", type=AttributeKey.Type.TYPE_INT),
@@ -112,7 +112,7 @@ def test_greater_than_numeric_filter(self):
         )
 
     def test_query_with_and(self):
-        query = self.resolver.resolve_query("span.description:foo span.op:bar")
+        query, _ = self.resolver.resolve_query("span.description:foo span.op:bar")
         assert query == TraceItemFilter(
             and_filter=AndFilter(
                 filters=[
@@ -137,7 +137,7 @@ def test_query_with_and(self):
         )
 
     def test_query_with_or(self):
-        query = self.resolver.resolve_query("span.description:foo or span.op:bar")
+        query, _ = self.resolver.resolve_query("span.description:foo or span.op:bar")
         assert query == TraceItemFilter(
             or_filter=OrFilter(
                 filters=[
@@ -162,7 +162,7 @@ def test_query_with_or(self):
         )
 
     def test_query_with_or_and_brackets(self):
-        query = self.resolver.resolve_query(
+        query, _ = self.resolver.resolve_query(
             "(span.description:123 and span.op:345) or (span.description:foo and span.op:bar)"
         )
         assert query == TraceItemFilter(
@@ -221,8 +221,10 @@ def test_query_with_or_and_brackets(self):
         )
 
     def test_empty_query(self):
-        assert self.resolver.resolve_query("") is None
-        assert self.resolver.resolve_query(None) is None
+        query, _ = self.resolver.resolve_query("")
+        assert query is None
+        query, _ = self.resolver.resolve_query(None)
+        assert query is None
 
 
 class SearchResolverColumnTest(TestCase):
diff --git a/tests/sentry/search/events/builder/test_metrics.py b/tests/sentry/search/events/builder/test_metrics.py
index 9073ae47dc5778..26b3b5752bbcb3 100644
--- a/tests/sentry/search/events/builder/test_metrics.py
+++ b/tests/sentry/search/events/builder/test_metrics.py
@@ -1208,7 +1208,7 @@ def test_multiple_entity_orderby_fails(self):
 
     def test_multiple_entity_query_fails(self):
         with pytest.raises(IncompatibleMetricsQuery):
-            query = MetricsQueryBuilder(
+            MetricsQueryBuilder(
                 self.params,
                 query="p95(transaction.duration):>5s AND count_unique(user):>0",
                 dataset=Dataset.PerformanceMetrics,
@@ -1222,11 +1222,10 @@ def test_multiple_entity_query_fails(self):
                     use_aggregate_conditions=True,
                 ),
             )
-            query.run_query("test_query")
 
     def test_query_entity_does_not_match_orderby(self):
         with pytest.raises(IncompatibleMetricsQuery):
-            query = MetricsQueryBuilder(
+            MetricsQueryBuilder(
                 self.params,
                 query="count_unique(user):>0",
                 dataset=Dataset.PerformanceMetrics,
@@ -1241,7 +1240,6 @@ def test_query_entity_does_not_match_orderby(self):
                     use_aggregate_conditions=True,
                 ),
             )
-            query.run_query("test_query")
 
     def test_aggregate_query_with_multiple_entities_without_orderby(self):
         self.store_transaction_metric(
diff --git a/tests/sentry/search/events/test_filter.py b/tests/sentry/search/events/test_filter.py
index 9519e222129815..8ca88fba347d65 100644
--- a/tests/sentry/search/events/test_filter.py
+++ b/tests/sentry/search/events/test_filter.py
@@ -28,53 +28,6 @@
 from sentry.search.events.types import ParamsType, QueryBuilderConfig
 from sentry.snuba.dataset import Dataset
 from sentry.testutils.cases import TestCase
-from sentry.utils.snuba import OPERATOR_TO_FUNCTION
-
-
-# Helper functions to make reading the expected output from the boolean tests easier to read. #
-# a:b
-def _eq(xy):
-    return ["equals", [["ifNull", [xy[0], "''"]], xy[1]]]
-
-
-# a:b but using operators instead of functions
-def _oeq(xy):
-    return [["ifNull", [xy[0], "''"]], "=", xy[1]]
-
-
-# !a:b using operators instead of functions
-def _noeq(xy):
-    return [["ifNull", [xy[0], "''"]], "!=", xy[1]]
-
-
-# message ("foo bar baz")
-def _m(x):
-    return ["notEquals", [["positionCaseInsensitive", ["message", f"'{x}'"]], 0]]
-
-
-# message ("foo bar baz") using operators instead of functions
-def _om(x):
-    return [["positionCaseInsensitive", ["message", f"'{x}'"]], "!=", 0]
-
-
-# x OR y
-def _or(x, y):
-    return ["or", [x, y]]
-
-
-# x AND y
-def _and(x, y):
-    return ["and", [x, y]]
-
-
-# count():>1
-def _c(op, val):
-    return [OPERATOR_TO_FUNCTION[op], ["count", val]]
-
-
-# count():>1 using operators instead of functions
-def _oc(op, val):
-    return ["count", op, val]
 
 
 def with_type(type, argument):
diff --git a/tests/sentry/seer/similarity/test_similar_issues.py b/tests/sentry/seer/similarity/test_similar_issues.py
index f88f4ce8c8c713..d5f30d9404e510 100644
--- a/tests/sentry/seer/similarity/test_similar_issues.py
+++ b/tests/sentry/seer/similarity/test_similar_issues.py
@@ -20,13 +20,12 @@
 from sentry.testutils.cases import TestCase
 from sentry.testutils.helpers.eventprocessing import save_new_event
 from sentry.utils import json
-from sentry.utils.types import NonNone
 
 
 class GetSimilarityDataFromSeerTest(TestCase):
     def setUp(self):
         self.similar_event = save_new_event({"message": "Dogs are great!"}, self.project)
-        self.similar_event_hash = NonNone(self.similar_event.get_primary_hash())
+        self.similar_event_hash = self.similar_event.get_primary_hash()
         self.request_params: SimilarIssuesEmbeddingsRequest = {
             "event_id": "12312012041520130908201311212012",
             "hash": "11212012123120120415201309082013",
@@ -270,7 +269,7 @@ def test_returns_sorted_results(self, mock_seer_request: MagicMock):
             "stacktrace_distance": 0.01,
         }
         raw_less_similar_issue_data: RawSeerSimilarIssueData = {
-            "parent_hash": NonNone(less_similar_event.get_primary_hash()),
+            "parent_hash": less_similar_event.get_primary_hash(),
             "should_group": False,
             "stacktrace_distance": 0.05,
         }
diff --git a/tests/sentry/seer/similarity/test_types.py b/tests/sentry/seer/similarity/test_types.py
index 4b4f00ca57de00..bcc2d5cd378b22 100644
--- a/tests/sentry/seer/similarity/test_types.py
+++ b/tests/sentry/seer/similarity/test_types.py
@@ -12,14 +12,13 @@
 )
 from sentry.testutils.cases import TestCase
 from sentry.testutils.helpers.eventprocessing import save_new_event
-from sentry.utils.types import NonNone
 
 
 class SeerSimilarIssueDataTest(TestCase):
     def test_from_raw_simple(self):
         similar_event = save_new_event({"message": "Dogs are great!"}, self.project)
         raw_similar_issue_data: RawSeerSimilarIssueData = {
-            "parent_hash": NonNone(similar_event.get_primary_hash()),
+            "parent_hash": similar_event.get_primary_hash(),
             "should_group": True,
             "stacktrace_distance": 0.01,
         }
@@ -38,17 +37,17 @@ def test_from_raw_simple(self):
     def test_from_raw_unexpected_data(self):
         similar_event = save_new_event({"message": "Dogs are great!"}, self.project)
         raw_similar_issue_data = {
-            "parent_hash": NonNone(similar_event.get_primary_hash()),
+            "parent_hash": similar_event.get_primary_hash(),
             "should_group": True,
             "stacktrace_distance": 0.01,
             "something": "unexpected",
         }
 
         expected_similar_issue_data = {
-            "parent_hash": NonNone(similar_event.get_primary_hash()),
+            "parent_hash": similar_event.get_primary_hash(),
             "should_group": True,
             "stacktrace_distance": 0.01,
-            "parent_group_id": NonNone(similar_event.group_id),
+            "parent_group_id": similar_event.group_id,
         }
 
         # Everything worked fine, in spite of the extra data
@@ -78,7 +77,7 @@ def test_from_raw_missing_data(self):
             match="Seer similar issues response entry missing key 'stacktrace_distance'",
         ):
             raw_similar_issue_data = {
-                "parent_hash": NonNone(similar_event.get_primary_hash()),
+                "parent_hash": similar_event.get_primary_hash(),
                 "should_group": True,
                 # missing `stacktrace_distance`
             }
diff --git a/tests/sentry/seer/similarity/test_utils.py b/tests/sentry/seer/similarity/test_utils.py
index 434488b1c64fbd..21fe2ec54426d4 100644
--- a/tests/sentry/seer/similarity/test_utils.py
+++ b/tests/sentry/seer/similarity/test_utils.py
@@ -2,23 +2,22 @@
 from collections.abc import Callable
 from typing import Any, Literal, cast
 from unittest.mock import patch
-from uuid import uuid1
 
 import pytest
 
-from sentry import options
 from sentry.eventstore.models import Event
+from sentry.grouping.api import get_contributing_variant_and_component
+from sentry.grouping.variants import CustomFingerprintVariant
 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,
+    has_too_many_contributing_frames,
 )
 from sentry.testutils.cases import TestCase
 
@@ -537,7 +536,7 @@ def test_chained(self):
         )
         assert stacktrace_str == expected_stacktrace_str
 
-    def test_chained_too_many_frames(self):
+    def test_chained_stacktrace_truncation(self):
         data_chained_exception = copy.deepcopy(self.CHAINED_APP_DATA)
         data_chained_exception["app"]["component"]["values"][0]["values"] = [
             self.create_exception(
@@ -562,7 +561,7 @@ def test_chained_too_many_frames(self):
                 ),
             ),
         ]
-        stacktrace_str = get_stacktrace_string(data_chained_exception)
+        stacktrace_str = get_stacktrace_string(data_chained_exception, platform="javascript")
 
         # The stacktrace string should be:
         #    25 frames from OuterExcepton (with lines counting up from 1 to 25), followed by
@@ -583,7 +582,7 @@ def test_chained_too_many_frames(self):
         )
         assert stacktrace_str == expected
 
-    def test_chained_too_many_frames_all_minified_js(self):
+    def test_chained_stacktrace_truncation_all_minified_js(self):
         data_chained_exception = copy.deepcopy(self.CHAINED_APP_DATA)
         data_chained_exception["app"]["component"]["values"][0]["values"] = [
             self.create_exception(
@@ -614,7 +613,7 @@ def test_chained_too_many_frames_all_minified_js(self):
                 ),
             ),
         ]
-        stacktrace_str = get_stacktrace_string(data_chained_exception)
+        stacktrace_str = get_stacktrace_string(data_chained_exception, platform="javascript")
 
         # The stacktrace string should be:
         #    15 frames from OuterExcepton (with lines counting up from 1 to 15), followed by
@@ -635,7 +634,7 @@ def test_chained_too_many_frames_all_minified_js(self):
         )
         assert stacktrace_str == expected
 
-    def test_chained_too_many_frames_minified_js_frame_limit(self):
+    def test_chained_stacktrace_truncation_minified_js_frame_limit_is_lower(self):
         """Test that we restrict fully-minified stacktraces to 20 frames, and all other stacktraces to 30 frames."""
         for minified_frames, expected_frame_count in [("all", 20), ("some", 30), ("none", 30)]:
             data_chained_exception = copy.deepcopy(self.CHAINED_APP_DATA)
@@ -668,7 +667,7 @@ def test_chained_too_many_frames_minified_js_frame_limit(self):
                     ),
                 ),
             ]
-            stacktrace_str = get_stacktrace_string(data_chained_exception)
+            stacktrace_str = get_stacktrace_string(data_chained_exception, platform="javascript")
 
             assert (
                 stacktrace_str.count("outer line")
@@ -677,7 +676,7 @@ def test_chained_too_many_frames_minified_js_frame_limit(self):
                 == expected_frame_count
             )
 
-    def test_chained_too_many_exceptions(self):
+    def test_chained_exception_limit(self):
         """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"] = [
@@ -688,7 +687,7 @@ def test_chained_too_many_exceptions(self):
             )
             for i in range(1, MAX_FRAME_COUNT + 2)
         ]
-        stacktrace_str = get_stacktrace_string(data_chained_exception)
+        stacktrace_str = get_stacktrace_string(data_chained_exception, platform="javascript")
         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
@@ -718,7 +717,7 @@ def test_no_app_no_system(self):
         stacktrace_str = get_stacktrace_string(data)
         assert stacktrace_str == ""
 
-    def test_too_many_system_frames_single_exception(self):
+    def test_stacktrace_length_filter_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][
@@ -728,7 +727,7 @@ def test_too_many_system_frames_single_exception(self):
         with pytest.raises(TooManyOnlySystemFramesException):
             get_stacktrace_string(data_system, platform="java")
 
-    def test_too_many_system_frames_single_exception_invalid_platform(self):
+    def test_stacktrace_length_filter_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][
@@ -738,7 +737,7 @@ def test_too_many_system_frames_single_exception_invalid_platform(self):
         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):
+    def test_stacktrace_length_filter_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
@@ -752,7 +751,7 @@ def test_too_many_system_frames_chained_exception(self):
         with pytest.raises(TooManyOnlySystemFramesException):
             get_stacktrace_string(data_system, platform="java")
 
-    def test_too_many_system_frames_chained_exception_invalid_platform(self):
+    def test_stacktrace_length_filter_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
@@ -766,7 +765,7 @@ def test_too_many_system_frames_chained_exception_invalid_platform(self):
         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):
+    def test_stacktrace_truncation_uses_in_app_contributing_frames(self):
         """
         Check that when there are over MAX_FRAME_COUNT contributing frames, the last MAX_FRAME_COUNT
         is included.
@@ -784,7 +783,7 @@ def test_too_many_in_app_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, "java")
+        stacktrace_str = get_stacktrace_string(data_frames, platform="javascript")
 
         num_frames = 0
         for i in range(1, 11):
@@ -799,7 +798,7 @@ def test_too_many_in_app_contributing_frames(self):
             assert ("test = " + str(i) + "!") in stacktrace_str
         assert num_frames == MAX_FRAME_COUNT
 
-    def test_too_many_frames_minified_js_frame_limit(self):
+    def test_stacktrace_truncation_minified_js_frame_limit_is_lower(self):
         """Test that we restrict fully-minified stacktraces to 20 frames, and all other stacktraces to 30 frames."""
         for minified_frames, expected_frame_count in [("all", 20), ("some", 30), ("none", 30)]:
             data_frames = copy.deepcopy(self.BASE_APP_DATA)
@@ -812,7 +811,7 @@ def test_too_many_frames_minified_js_frame_limit(self):
                     ),
                 ),
             ]
-            stacktrace_str = get_stacktrace_string(data_frames)
+            stacktrace_str = get_stacktrace_string(data_frames, platform="javascript")
 
             assert stacktrace_str.count("context line") == expected_frame_count
 
@@ -873,79 +872,221 @@ def test_no_header_one_frame_no_filename(self, mock_metrics):
         exception["app"]["component"]["values"][0]["values"][0]["values"][0]["values"][1][
             "values"
         ] = []
-        get_stacktrace_string(exception)
-        sample_rate = options.get("seer.similarity.metrics_sample_rate")
-        mock_metrics.incr.assert_called_with(
-            "seer.grouping.no_header_one_frame_no_filename", sample_rate=sample_rate
-        )
+        assert get_stacktrace_string(exception) == ""
 
 
-class EventContentIsSeerEligibleTest(TestCase):
-    def get_eligible_event_data(self) -> dict[str, Any]:
-        return {
-            "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",
-        }
+class SeerUtilsTest(TestCase):
+    def test_filter_null_from_string(self):
+        string_with_null = 'String with null \x00, "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" is null'
+        assert filter_null_from_string(string_with_null) == 'String with null , "" is null'
 
-    def test_no_stacktrace(self):
-        good_event_data = self.get_eligible_event_data()
-        good_event = Event(
-            project_id=self.project.id,
-            event_id=uuid1().hex,
-            data=good_event_data,
-        )
 
-        bad_event_data = self.get_eligible_event_data()
-        del bad_event_data["exception"]
-        bad_event = Event(
+class HasTooManyFramesTest(TestCase):
+    def setUp(self):
+        # The `in_app` and `contributes` values of these frames will be determined by the project
+        # stacktrace rules we'll add below
+        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,
-            event_id=uuid1().hex,
-            data=bad_event_data,
+            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",
+                ]
+            ),
         )
 
-        assert event_content_is_seer_eligible(good_event) is True
-        assert event_content_is_seer_eligible(bad_event) is False
+    def test_single_exception_simple(self):
+        for stacktrace_length, expected_result in [
+            (MAX_FRAME_COUNT - 1, False),
+            (MAX_FRAME_COUNT + 1, True),
+        ]:
+            self.event.data["platform"] = "java"
+            self.event.data["exception"]["values"][0]["stacktrace"] = {
+                "frames": [self.contributing_in_app_frame] * stacktrace_length
+            }
 
-    def test_platform_filter(self):
-        good_event_data = self.get_eligible_event_data()
-        good_event = Event(
-            project_id=self.project.id,
-            event_id=uuid1().hex,
-            data=good_event_data,
+            # `normalize_stacktraces=True` forces the custom stacktrace enhancements to run
+            variants = self.event.get_grouping_variants(normalize_stacktraces=True)
+
+            assert (
+                has_too_many_contributing_frames(self.event, variants, ReferrerOptions.INGEST)
+                is expected_result
+            )
+
+    def test_single_exception_bypassed_platform(self):
+        # Regardless of the number of frames, we never flag it as being too long
+        for stacktrace_length, expected_result in [
+            (MAX_FRAME_COUNT - 1, False),
+            (MAX_FRAME_COUNT + 1, False),
+        ]:
+            self.event.data["platform"] = "python"
+            self.event.data["exception"]["values"][0]["stacktrace"] = {
+                "frames": [self.contributing_in_app_frame] * stacktrace_length
+            }
+
+            # `normalize_stacktraces=True` forces the custom stacktrace enhancements to run
+            variants = self.event.get_grouping_variants(normalize_stacktraces=True)
+
+            assert (
+                has_too_many_contributing_frames(self.event, variants, ReferrerOptions.INGEST)
+                is expected_result
+            )
+
+    def test_chained_exception_simple(self):
+        for total_frames, expected_result in [
+            (MAX_FRAME_COUNT - 2, False),
+            (MAX_FRAME_COUNT + 2, True),
+        ]:
+            self.event.data["platform"] = "java"
+            self.event.data["exception"]["values"] = [
+                {**self.exception_value},
+                {**self.exception_value},
+            ]
+            self.event.data["exception"]["values"][0]["stacktrace"] = {
+                "frames": [self.contributing_in_app_frame] * (total_frames // 2)
+            }
+            self.event.data["exception"]["values"][1]["stacktrace"] = {
+                "frames": [self.contributing_in_app_frame] * (total_frames // 2)
+            }
+
+            # `normalize_stacktraces=True` forces the custom stacktrace enhancements to run
+            variants = self.event.get_grouping_variants(normalize_stacktraces=True)
+
+            assert (
+                has_too_many_contributing_frames(self.event, variants, ReferrerOptions.INGEST)
+                is expected_result
+            )
+
+    def test_chained_exception_bypassed_platform(self):
+        # Regardless of the number of frames, we never flag it as being too long
+        for total_frames, expected_result in [
+            (MAX_FRAME_COUNT - 2, False),
+            (MAX_FRAME_COUNT + 2, False),
+        ]:
+            self.event.data["platform"] = "python"
+            self.event.data["exception"]["values"] = [
+                {**self.exception_value},
+                {**self.exception_value},
+            ]
+            self.event.data["exception"]["values"][0]["stacktrace"] = {
+                "frames": [self.contributing_in_app_frame] * (total_frames // 2)
+            }
+            self.event.data["exception"]["values"][1]["stacktrace"] = {
+                "frames": [self.contributing_in_app_frame] * (total_frames // 2)
+            }
+
+            # `normalize_stacktraces=True` forces the custom stacktrace enhancements to run
+            variants = self.event.get_grouping_variants(normalize_stacktraces=True)
+
+            assert (
+                has_too_many_contributing_frames(self.event, variants, ReferrerOptions.INGEST)
+                is expected_result
+            )
+
+    def test_ignores_non_contributing_frames(self):
+        self.event.data["platform"] = "java"
+        self.event.data["exception"]["values"][0]["stacktrace"] = {
+            "frames": (
+                # Taken together, there are too many frames
+                [self.contributing_in_app_frame] * (MAX_FRAME_COUNT - 1)
+                + [self.non_contributing_in_app_frame] * 2
+            )
+        }
+
+        # `normalize_stacktraces=True` forces the custom stacktrace enhancements to run
+        variants = self.event.get_grouping_variants(normalize_stacktraces=True)
+
+        assert (
+            has_too_many_contributing_frames(self.event, variants, ReferrerOptions.INGEST)
+            is False  # Not flagged as too many because only contributing frames are counted
         )
 
-        bad_event_data = self.get_eligible_event_data()
-        bad_event_data["platform"] = "other"
-        bad_event = Event(
-            project_id=self.project.id,
-            event_id=uuid1().hex,
-            data=bad_event_data,
+    def test_prefers_app_frames(self):
+        self.event.data["platform"] = "java"
+        self.event.data["exception"]["values"][0]["stacktrace"] = {
+            "frames": (
+                [self.contributing_in_app_frame] * (MAX_FRAME_COUNT - 1)  # Under the limit
+                + [self.contributing_system_frame] * (MAX_FRAME_COUNT + 1)  # Over the limit
+            )
+        }
+
+        # `normalize_stacktraces=True` forces the custom stacktrace enhancements to run
+        variants = self.event.get_grouping_variants(normalize_stacktraces=True)
+
+        assert (
+            has_too_many_contributing_frames(self.event, variants, ReferrerOptions.INGEST)
+            is False  # Not flagged as too many because only in-app frames are counted
         )
 
-        assert good_event_data["platform"] in SEER_ELIGIBLE_PLATFORMS
-        assert bad_event_data["platform"] not in SEER_ELIGIBLE_PLATFORMS
-        assert event_content_is_seer_eligible(good_event) is True
-        assert event_content_is_seer_eligible(bad_event) is False
+    @pytest.mark.skip(reason="wonky behavior with -app +group rules")
+    def test_uses_app_or_system_variants(self):
+        for frame, expected_variant_name in [
+            (self.contributing_in_app_frame, "app"),
+            (self.contributing_system_frame, "system"),
+        ]:
+            self.event.data["platform"] = "java"
+            self.event.data["exception"]["values"][0]["stacktrace"] = {
+                "frames": [frame] * (MAX_FRAME_COUNT + 1)
+            }
 
+            # `normalize_stacktraces=True` forces the custom stacktrace enhancements to run
+            variants = self.event.get_grouping_variants(normalize_stacktraces=True)
 
-class SeerUtilsTest(TestCase):
-    def test_filter_null_from_string(self):
-        string_with_null = 'String with null \x00, "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" is null'
-        assert filter_null_from_string(string_with_null) == 'String with null , "" is null'
+            contributing_variant, _ = get_contributing_variant_and_component(variants)
+            assert contributing_variant.variant_name == expected_variant_name
+
+            assert (
+                has_too_many_contributing_frames(self.event, variants, ReferrerOptions.INGEST)
+                is True
+            )
+
+    def test_ignores_events_not_grouped_on_stacktrace(self):
+        self.event.data["platform"] = "java"
+        self.event.data["exception"]["values"][0]["stacktrace"] = {
+            "frames": ([self.contributing_system_frame] * (MAX_FRAME_COUNT + 1))  # Over the limit
+        }
+        self.event.data["fingerprint"] = ["dogs_are_great"]
+
+        # `normalize_stacktraces=True` forces the custom stacktrace enhancements to run
+        variants = self.event.get_grouping_variants(normalize_stacktraces=True)
+        contributing_variant, _ = get_contributing_variant_and_component(variants)
+        assert isinstance(contributing_variant, CustomFingerprintVariant)
+
+        assert (
+            has_too_many_contributing_frames(self.event, variants, ReferrerOptions.INGEST)
+            is False  # Not flagged as too many because it's grouped by fingerprint
+        )
diff --git a/tests/sentry/sentry_apps/services/test_model.py b/tests/sentry/sentry_apps/services/test_model.py
new file mode 100644
index 00000000000000..e4e8a9138509cb
--- /dev/null
+++ b/tests/sentry/sentry_apps/services/test_model.py
@@ -0,0 +1,42 @@
+from sentry.sentry_apps.services.app.serial import serialize_sentry_app_installation
+from sentry.sentry_apps.services.app.service import app_service
+from sentry.testutils.cases import TestCase
+from sentry.testutils.silo import region_silo_test
+
+
+@region_silo_test
+class TestRpcApiApplication(TestCase):
+    def setUp(self):
+        super().setUp()
+
+        self.user = self.create_user(name="foo")
+        self.org = self.create_organization(owner=self.user)
+        self.project = self.create_project(slug="boop", organization=self.org)
+
+        self.sentry_app = self.create_sentry_app(
+            name="foo", organization=self.org, webhook_url="https://example.com", scopes=()
+        )
+
+        self.install = self.create_sentry_app_installation(
+            slug="foo", organization=self.org, user=self.user
+        )
+
+    def test_serializes_correct_fields_helper(self):
+        install = serialize_sentry_app_installation(self.install, self.install.sentry_app)
+
+        assert (
+            f"this {install.sentry_app.application} is so skibidi"
+            == f"this id={install.sentry_app.application_id} is so skibidi"
+        )
+        assert f"this {install.sentry_app} is so skibidi".lower().find("client_id") == -1
+        assert f"this {install.sentry_app} is so toilet".lower().find("client_secret") == -1
+
+    def test_serializes_correct_fields_(self):
+        install = app_service.get_many(filter=dict(installation_ids=[self.install.id]))[0]
+
+        assert (
+            f"this {install.sentry_app.application} is so skibidi"
+            == f"this id={install.sentry_app.application_id} is so skibidi"
+        )
+        assert f"this {install.sentry_app} is so skibidi".lower().find("client_id") == -1
+        assert f"this {install.sentry_app} is so toilet".lower().find("client_secret") == -1
diff --git a/tests/sentry/sentry_metrics/consumers/test_slicing_router.py b/tests/sentry/sentry_metrics/consumers/test_slicing_router.py
index 380dcda84b6c68..3d8c7a59b2c6f6 100644
--- a/tests/sentry/sentry_metrics/consumers/test_slicing_router.py
+++ b/tests/sentry/sentry_metrics/consumers/test_slicing_router.py
@@ -169,10 +169,7 @@ def test_validate_slicing_consumer_config(monkeypatch) -> None:
         {"bootstrap.servers": "127.0.0.1:9092"},
     )
 
-    try:
-        _validate_slicing_consumer_config("generic_metrics")
-    except SlicingConfigurationException as e:
-        assert False, f"Should not raise exception: {e}"
+    _validate_slicing_consumer_config("generic_metrics")  # should not raise
 
 
 def test_validate_slicing_config(monkeypatch) -> None:
diff --git a/tests/sentry/sentry_metrics/test_batch.py b/tests/sentry/sentry_metrics/test_batch.py
index 8a62738e2b2948..6c7039e4e1b790 100644
--- a/tests/sentry/sentry_metrics/test_batch.py
+++ b/tests/sentry/sentry_metrics/test_batch.py
@@ -1954,115 +1954,6 @@ def test_one_org_limited(caplog, settings):
     ]
 
 
-@pytest.mark.django_db
-def test_cardinality_limiter(caplog, settings):
-    """
-    Test functionality of the indexer batch related to cardinality-limiting. More concretely, assert that `IndexerBatch.filter_messages`:
-
-    1. removes the messages from the outgoing batch
-    2. prevents strings from filtered messages from being extracted & indexed
-    3. does not crash when strings from filtered messages are not passed into reconstruct_messages
-    4. still extracts strings that exist both in filtered and unfiltered messages (eg "environment")
-    """
-    settings.SENTRY_METRICS_INDEXER_DEBUG_LOG_SAMPLE_RATE = 1.0
-
-    outer_message = _construct_outer_message(
-        [
-            (counter_payload, counter_headers),
-            (distribution_payload, distribution_headers),
-            (set_payload, set_headers),
-        ]
-    )
-
-    batch = IndexerBatch(
-        outer_message,
-        True,
-        False,
-        tags_validator=ReleaseHealthTagsValidator().is_allowed,
-        schema_validator=MetricsSchemaValidator(
-            INGEST_CODEC, RELEASE_HEALTH_SCHEMA_VALIDATION_RULES_OPTION_NAME
-        ).validate,
-    )
-    keys_to_remove = list(batch.parsed_payloads_by_meta)[:2]
-    # the messages come in a certain order, and Python dictionaries preserve
-    # their insertion order. So we can hardcode offsets here.
-    assert keys_to_remove == [
-        BrokerMeta(partition=Partition(Topic("topic"), 0), offset=0),
-        BrokerMeta(partition=Partition(Topic("topic"), 0), offset=1),
-    ]
-    batch.filter_messages(keys_to_remove)
-    assert batch.extract_strings() == {
-        UseCaseID.SESSIONS: {
-            1: {
-                "environment",
-                "errored",
-                "production",
-                # Note, we only extracted one MRI, of the one metric that we didn't
-                # drop
-                "s:sessions/error@none",
-                "session.status",
-            },
-        }
-    }
-    assert not batch.invalid_msg_meta
-
-    snuba_payloads = batch.reconstruct_messages(
-        {
-            UseCaseID.SESSIONS: {
-                1: {
-                    "environment": 1,
-                    "errored": 2,
-                    "production": 3,
-                    "s:sessions/error@none": 4,
-                    "session.status": 5,
-                },
-            }
-        },
-        {
-            UseCaseID.SESSIONS: {
-                1: {
-                    "environment": Metadata(id=1, fetch_type=FetchType.CACHE_HIT),
-                    "errored": Metadata(id=2, fetch_type=FetchType.CACHE_HIT),
-                    "production": Metadata(id=3, fetch_type=FetchType.CACHE_HIT),
-                    "s:sessions/error@none": Metadata(id=4, fetch_type=FetchType.CACHE_HIT),
-                    "session.status": Metadata(id=5, fetch_type=FetchType.CACHE_HIT),
-                }
-            }
-        },
-    ).data
-
-    assert _deconstruct_messages(snuba_payloads) == [
-        (
-            {
-                "mapping_meta": {
-                    "c": {
-                        "1": "environment",
-                        "2": "errored",
-                        "3": "production",
-                        "4": "s:sessions/error@none",
-                        "5": "session.status",
-                    },
-                },
-                "metric_id": 4,
-                "org_id": 1,
-                "project_id": 3,
-                "retention_days": 90,
-                "tags": {"1": 3, "5": 2},
-                "timestamp": ts,
-                "type": "s",
-                "use_case_id": "sessions",
-                "value": [3],
-                "sentry_received_timestamp": BROKER_TIMESTAMP.timestamp(),
-            },
-            [
-                *set_headers,
-                ("mapping_sources", b"c"),
-                ("metric_type", "s"),
-            ],
-        )
-    ]
-
-
 def test_aggregation_options():
 
     with override_options(
diff --git a/tests/sentry/sentry_metrics/test_extraction_rules.py b/tests/sentry/sentry_metrics/test_extraction_rules.py
deleted file mode 100644
index 68a423f581315e..00000000000000
--- a/tests/sentry/sentry_metrics/test_extraction_rules.py
+++ /dev/null
@@ -1,39 +0,0 @@
-import uuid
-
-import pytest
-
-from sentry.sentry_metrics.extraction_rules import MetricsExtractionRule
-
-
-def _new_id():
-    return str(uuid.uuid4())
-
-
-def test_generate_mri():
-    rule = MetricsExtractionRule("count_clicks", "c", "none", {"tag_1", "tag_2"}, "", 12378)
-    mri = rule.generate_mri()
-    assert mri == "c:custom/span_attribute_12378@none"
-
-
-def test_type_validation():
-    rules = [
-        MetricsExtractionRule("count_clicks", "c", "none", {"tag_1", "tag_2"}, "", 7423),
-        MetricsExtractionRule(
-            "process_latency", "d", "none", {"tag_3"}, "first:value second:value", 239478
-        ),
-        MetricsExtractionRule("unique_ids", "s", "none", set(), "foo:bar", 278934),
-    ]
-
-    mris = [rule.generate_mri() for rule in rules]
-    assert mris == [
-        "c:custom/span_attribute_7423@none",
-        "d:custom/span_attribute_239478@none",
-        "s:custom/span_attribute_278934@none",
-    ]
-
-    with pytest.raises(ValueError):
-        MetricsExtractionRule("count_clicks", "f", "none", {"tag_1", "tag_2"}, "", 128903)
-    with pytest.raises(ValueError):
-        MetricsExtractionRule(
-            "count_clicks", "distribution", "none", {"tag_1", "tag_2"}, "", 123678
-        )
diff --git a/tests/sentry/sentry_metrics/test_id_generator.py b/tests/sentry/sentry_metrics/test_id_generator.py
deleted file mode 100644
index 60e40cb9a7688f..00000000000000
--- a/tests/sentry/sentry_metrics/test_id_generator.py
+++ /dev/null
@@ -1,37 +0,0 @@
-import time
-from unittest.mock import patch
-
-from sentry.sentry_metrics.indexer.id_generator import _INDEXER_EPOCH_START, get_id
-
-
-def test_get_id() -> None:
-    # Function returns a different ID each time it's called
-    assert get_id() != get_id()
-
-    # IDs fit in 63 bits (leading bit must be a zero)
-    assert get_id() < pow(2, 63)
-
-    # Starts with 0100 (leading zero + version)
-    id_binary_string = bin(get_id())[2:].zfill(64)
-    assert id_binary_string.startswith("0100")
-
-
-def test_get_id_time_since() -> None:
-    """
-    This verifies that the middle 32bits are the correct time since.
-
-    (4bits)              (32bits)                        (28bits)
-    version |         time since (s)           |          random            |
-
-    0100    | 00000001001000101000000111100011 | 1110100001100010100101011111
-
-    """
-    hardcoded_time = time.time()
-
-    with patch("time.time") as mock_time:
-        mock_time.return_value = hardcoded_time
-
-        id_string = bin(get_id())[2:].zfill(64)
-        original_time = int(id_string[3:36], 2) + _INDEXER_EPOCH_START
-
-        assert original_time == int(hardcoded_time)
diff --git a/tests/sentry/sentry_metrics/test_kafka.py b/tests/sentry/sentry_metrics/test_kafka.py
index 35cbce5ad49350..7fd8521c072a9e 100644
--- a/tests/sentry/sentry_metrics/test_kafka.py
+++ b/tests/sentry/sentry_metrics/test_kafka.py
@@ -6,7 +6,7 @@
 from arroyo.backends.local.backend import LocalBroker, LocalProducer
 from arroyo.backends.local.storages.memory import MemoryMessageStorage
 from arroyo.types import Partition, Topic
-from arroyo.utils.clock import TestingClock as Clock
+from arroyo.utils.clock import MockedClock as Clock
 
 from sentry.sentry_metrics.client.kafka import KafkaMetricsBackend
 from sentry.testutils.metrics_backend import GenericMetricsTestMixIn
diff --git a/tests/sentry/sentry_metrics/test_postgres_indexer.py b/tests/sentry/sentry_metrics/test_postgres_indexer.py
index 91b2f29df9d4a2..6bd5807b73aa88 100644
--- a/tests/sentry/sentry_metrics/test_postgres_indexer.py
+++ b/tests/sentry/sentry_metrics/test_postgres_indexer.py
@@ -1,7 +1,5 @@
-from collections.abc import Mapping
-
 from sentry.sentry_metrics.configuration import UseCaseKey
-from sentry.sentry_metrics.indexer.base import FetchType, Metadata, UseCaseKeyCollection
+from sentry.sentry_metrics.indexer.base import UseCaseKeyCollection
 from sentry.sentry_metrics.indexer.cache import CachingIndexer
 from sentry.sentry_metrics.indexer.postgres.postgres_v2 import PGStringIndexerV2, indexer_cache
 from sentry.sentry_metrics.use_case_id_registry import UseCaseID
@@ -9,12 +7,6 @@
 from sentry.utils.cache import cache
 
 
-def assert_fetch_type_for_tag_string_set(
-    meta: Mapping[str, Metadata], fetch_type: FetchType, str_set: set[str]
-):
-    assert all([meta[string].fetch_type == fetch_type for string in str_set])
-
-
 class PostgresIndexerV2Test(TestCase):
     def setUp(self) -> None:
         self.strings = {"hello", "hey", "hi"}
diff --git a/tests/sentry/sentry_metrics/test_snuba.py b/tests/sentry/sentry_metrics/test_snuba.py
index 6a1a8b76a3beba..3bbd6d87b89b10 100644
--- a/tests/sentry/sentry_metrics/test_snuba.py
+++ b/tests/sentry/sentry_metrics/test_snuba.py
@@ -23,10 +23,6 @@ class SnubaMetricsInterfaceTest(MetricsInterfaceTestCase):
     This test is also very similar to those in the Metrics Layer.
     """
 
-    @property
-    def now(self):
-        return BaseMetricsLayerTestCase.MOCK_DATETIME
-
     def test_count_query(self):
         generic_metrics_backend.distribution(
             self.use_case_id,
diff --git a/tests/sentry/sentry_metrics/test_strings.py b/tests/sentry/sentry_metrics/test_strings.py
index ed8e81a9323e81..86e83614ac9009 100644
--- a/tests/sentry/sentry_metrics/test_strings.py
+++ b/tests/sentry/sentry_metrics/test_strings.py
@@ -107,18 +107,15 @@ def test_reverse_resolve_reindexed():
 def test_shared_mri_string_range(mri, id):
     parsed_mri = parse_mri(mri)
     assert parsed_mri is not None, mri
-    try:
-        start, end = {
-            "sessions": (1, 99),
-            "transactions": (100, 199),
-            "spans": (400, 499),
-            "escalating_issues": (500, 599),
-            "profiles": (600, 699),
-            "bundle_analysis": (700, 799),
-            "metric_stats": (800, 899),
-        }[parsed_mri.namespace]
-    except KeyError:
-        raise Exception(f"Unknown namespace: {parsed_mri.namespace}")
+    start, end = {
+        "sessions": (1, 99),
+        "transactions": (100, 199),
+        "spans": (400, 499),
+        "escalating_issues": (500, 599),
+        "profiles": (600, 699),
+        "bundle_analysis": (700, 799),
+        "metric_stats": (800, 899),
+    }[parsed_mri.namespace]
 
     start += PREFIX
     end += PREFIX
diff --git a/tests/sentry/silo/test_client.py b/tests/sentry/silo/test_client.py
index bc017ad352b56d..41b427f6fe7564 100644
--- a/tests/sentry/silo/test_client.py
+++ b/tests/sentry/silo/test_client.py
@@ -305,33 +305,32 @@ def test_client_proxy_request(self):
             assert response.get(PROXY_SIGNATURE_HEADER) is None
             assert response[PROXY_DIRECT_LOCATION_HEADER] == path
 
-    @responses.activate
     @override_settings(SILO_MODE=SiloMode.CONTROL)
     def test_invalid_region_silo_ip_address(self):
-        internal_region_address = "http://172.31.255.31:9000"
-        region = Region("eu", 1, internal_region_address, RegionCategory.MULTI_TENANT)
-        region_config = (region,)
+        region = Region("eu", 1, "http://172.31.255.31:9000", RegionCategory.MULTI_TENANT)
 
         # Disallow any region silo ip address by default.
         with (
-            override_regions(region_config),
+            override_regions((region,)),
             patch("sentry_sdk.capture_exception") as mock_capture_exception,
             raises(ApiHostError),
         ):
             assert mock_capture_exception.call_count == 0
 
             client = RegionSiloClient(region)
-            path = f"{internal_region_address}/api/0/imaginary-public-endpoint/"
-            request = self.factory.get(path, HTTP_HOST="https://control.sentry.io")
+            client.base_url = "http://172.31.255.255:9000"
+            request = self.factory.get(
+                "/api/0/imaginary-public-endpoint/", HTTP_HOST="https://control.sentry.io"
+            )
             client.proxy_request(request)
 
-            assert mock_capture_exception.call_count == 1
-            err = mock_capture_exception.call_args.args[0]
-            assert isinstance(err, RegionResolutionError)
-            assert err.args == ("Disallowed Region Silo IP address: 172.31.255.31",)
+        assert mock_capture_exception.call_count == 1
+        err = mock_capture_exception.call_args.args[0]
+        assert isinstance(err, RegionResolutionError)
+        assert err.args == ("Disallowed Region Silo IP address: 172.31.255.255",)
 
         with (
-            override_regions(region_config),
+            override_regions((region,)),
             patch("sentry_sdk.capture_exception") as mock_capture_exception,
             override_allowed_region_silo_ip_addresses("172.31.255.255"),
             raises(ApiHostError),
@@ -339,14 +338,15 @@ def test_invalid_region_silo_ip_address(self):
             assert mock_capture_exception.call_count == 0
 
             client = RegionSiloClient(region)
-            path = f"{internal_region_address}/api/0/imaginary-public-endpoint/"
-            request = self.factory.get(path, HTTP_HOST="https://control.sentry.io")
+            request = self.factory.get(
+                "/api/0/imaginary-public-endpoint/", HTTP_HOST="https://control.sentry.io"
+            )
             client.proxy_request(request)
 
-            assert mock_capture_exception.call_count == 1
-            err = mock_capture_exception.call_args.args[0]
-            assert isinstance(err, RegionResolutionError)
-            assert err.args == ("Disallowed Region Silo IP address: 172.31.255.31",)
+        assert mock_capture_exception.call_count == 1
+        err = mock_capture_exception.call_args.args[0]
+        assert isinstance(err, RegionResolutionError)
+        assert err.args == ("Disallowed Region Silo IP address: 172.31.255.31",)
 
     @override_settings(SILO_MODE=SiloMode.CONTROL)
     @override_allowed_region_silo_ip_addresses("172.31.255.255")
@@ -379,7 +379,7 @@ def test_validate_region_ip_address(ip):
             assert mock_validate_region_ip_address.call_count == 0
             with raises(BailOut):
                 client.proxy_request(request)
-                assert mock_validate_region_ip_address.call_count == 1
+            assert mock_validate_region_ip_address.call_count == 1
 
 
 def test_validate_region_ip_address():
diff --git a/tests/sentry/snuba/metrics/test_datasource.py b/tests/sentry/snuba/metrics/test_datasource.py
index 8b6f90c8f0da77..3dd801f1d95ba8 100644
--- a/tests/sentry/snuba/metrics/test_datasource.py
+++ b/tests/sentry/snuba/metrics/test_datasource.py
@@ -1,10 +1,7 @@
-import time
-
 import pytest
 
 from sentry.sentry_metrics.use_case_id_registry import UseCaseID
 from sentry.snuba.metrics import get_tag_values
-from sentry.snuba.metrics.datasource import get_stored_metrics_of_projects
 from sentry.snuba.metrics.naming_layer import TransactionMetricKey, TransactionMRI
 from sentry.testutils.cases import BaseMetricsLayerTestCase, TestCase
 from sentry.testutils.helpers.datetime import freeze_time
@@ -20,63 +17,6 @@ class DatasourceTestCase(BaseMetricsLayerTestCase, TestCase):
     def now(self):
         return BaseMetricsLayerTestCase.MOCK_DATETIME
 
-    def test_get_stored_mris(self):
-        self.store_performance_metric(
-            name=TransactionMRI.DURATION.value,
-            tags={"release": "1.0"},
-            value=1,
-        )
-
-        self.store_session(
-            self.build_session(
-                distinct_id="39887d89-13b2-4c84-8c23-5d13d2102666",
-                session_id="5d52fd05-fcc9-4bf3-9dc9-267783670341",
-                status="exited",
-                release="foo@1.0.0",
-                environment="prod",
-                started=time.time() // 60 * 60,
-                received=time.time(),
-            )
-        )
-
-        custom_mri = "d:custom/PageLoad.2@millisecond"
-        self.store_metric(
-            self.project.organization.id,
-            self.project.id,
-            custom_mri,
-            {},
-            int(self.now.timestamp()),
-            10,
-        )
-
-        mris = get_stored_metrics_of_projects([self.project], [UseCaseID.TRANSACTIONS])
-        assert mris == {
-            "d:transactions/duration@millisecond": [self.project.id],
-        }
-
-        mris = get_stored_metrics_of_projects([self.project], [UseCaseID.SESSIONS])
-        assert mris == {
-            "d:sessions/duration@second": [self.project.id],
-            "c:sessions/session@none": [self.project.id],
-            "s:sessions/user@none": [self.project.id],
-        }
-
-        mris = get_stored_metrics_of_projects([self.project], [UseCaseID.CUSTOM])
-        assert mris == {
-            custom_mri: [self.project.id],
-        }
-
-        mris = get_stored_metrics_of_projects(
-            [self.project], [UseCaseID.TRANSACTIONS, UseCaseID.SESSIONS, UseCaseID.CUSTOM]
-        )
-        assert mris == {
-            "d:transactions/duration@millisecond": [self.project.id],
-            "d:sessions/duration@second": [self.project.id],
-            "c:sessions/session@none": [self.project.id],
-            "s:sessions/user@none": [self.project.id],
-            custom_mri: [self.project.id],
-        }
-
     def test_get_tag_values_with_mri(self):
         releases = ["1.0", "2.0"]
         for release in ("1.0", "2.0"):
diff --git a/tests/sentry/snuba/metrics/test_extraction.py b/tests/sentry/snuba/metrics/test_extraction.py
index 8a07c98d26c7a4..d8a562697e7887 100644
--- a/tests/sentry/snuba/metrics/test_extraction.py
+++ b/tests/sentry/snuba/metrics/test_extraction.py
@@ -738,15 +738,6 @@ def test_spec_apdex_without_condition(_get_satisfactory_metric, default_project)
     assert spec.tags_conditions(default_project) == apdex_tag_spec(default_project, ["10"])
 
 
-@django_db_all
-def test_spec_is_dependent_on_project(default_project) -> None:
-    spec = OnDemandMetricSpec("apdex(10)", "")
-    assert spec.is_project_dependent() is True
-
-    spec = OnDemandMetricSpec("failure_rate()", "")
-    assert spec.is_project_dependent() is False
-
-
 def test_spec_custom_tag() -> None:
     custom_tag_spec = OnDemandMetricSpec("count()", "foo:bar")
 
diff --git a/tests/sentry/snuba/metrics/test_metrics_layer/test_metrics_enhanced_performance.py b/tests/sentry/snuba/metrics/test_metrics_layer/test_metrics_enhanced_performance.py
index 16bf4c81ec37a8..5a597b78fb3c0b 100644
--- a/tests/sentry/snuba/metrics/test_metrics_layer/test_metrics_enhanced_performance.py
+++ b/tests/sentry/snuba/metrics/test_metrics_layer/test_metrics_enhanced_performance.py
@@ -530,7 +530,7 @@ def test_query_with_order_by_str_field_not_in_group_by(self):
             )
 
         with pytest.raises(InvalidParams):
-            metrics_query = self.build_metrics_query(
+            self.build_metrics_query(
                 before_now="1h",
                 granularity="1h",
                 select=[
@@ -550,12 +550,6 @@ def test_query_with_order_by_str_field_not_in_group_by(self):
                 offset=Offset(offset=0),
                 include_series=False,
             )
-            get_series(
-                [self.project],
-                metrics_query=metrics_query,
-                include_meta=True,
-                use_case_id=UseCaseID.TRANSACTIONS,
-            )
 
     def test_query_with_sum_if_column(self):
         for value, transaction in ((10, "/foo"), (20, "/bar"), (30, "/lorem")):
diff --git a/tests/sentry/snuba/metrics/test_utils.py b/tests/sentry/snuba/metrics/test_utils.py
index da08e55e25f176..c5db48a7f9cccd 100644
--- a/tests/sentry/snuba/metrics/test_utils.py
+++ b/tests/sentry/snuba/metrics/test_utils.py
@@ -162,11 +162,7 @@
     ids=[x[5] for x in test_get_num_intervals_cases],
 )
 def test_get_num_intervals(start, end, granularity, interval, expected, test_message):
-    if start is not None:
-        start_date = datetime.fromisoformat(start)
-    else:
-        start_date = None
-
+    start_date = datetime.fromisoformat(start)
     end_date = datetime.fromisoformat(end)
 
     actual = get_num_intervals(
diff --git a/tests/sentry/snuba/test_discover_query.py b/tests/sentry/snuba/test_discover_query.py
index bec9522663f07f..a4970721a9a38a 100644
--- a/tests/sentry/snuba/test_discover_query.py
+++ b/tests/sentry/snuba/test_discover_query.py
@@ -24,7 +24,7 @@
 from sentry.search.events.types import SnubaParams
 from sentry.snuba import discover
 from sentry.testutils.cases import SnubaTestCase, TestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.utils.samples import load_data
 
 ARRAY_COLUMNS = ["measurements", "span_op_breakdowns"]
@@ -383,8 +383,8 @@ def test_timestamp_rounding_fields(self):
 
         hour = self.event_time.replace(minute=0, second=0, microsecond=0)
         day = hour.replace(hour=0)
-        assert [item["timestamp.to_hour"] for item in data] == [f"{iso_format(hour)}+00:00"]
-        assert [item["timestamp.to_day"] for item in data] == [f"{iso_format(day)}+00:00"]
+        assert [item["timestamp.to_hour"] for item in data] == [hour.isoformat()]
+        assert [item["timestamp.to_day"] for item in data] == [day.isoformat()]
 
     def test_timestamp_rounding_filters(self):
         one_day_ago = before_now(days=1)
@@ -406,7 +406,7 @@ def test_timestamp_rounding_filters(self):
 
         result = discover.query(
             selected_columns=["timestamp.to_hour", "timestamp.to_day"],
-            query=f"timestamp.to_hour:<{iso_format(one_day_ago)} timestamp.to_day:<{iso_format(one_day_ago)}",
+            query=f"timestamp.to_hour:<{one_day_ago.isoformat()} timestamp.to_day:<{one_day_ago.isoformat()}",
             snuba_params=self.params,
             referrer="test_discover_query",
         )
@@ -415,8 +415,8 @@ def test_timestamp_rounding_filters(self):
 
         hour = two_day_ago.replace(minute=0, second=0, microsecond=0)
         day = hour.replace(hour=0)
-        assert [item["timestamp.to_hour"] for item in data] == [f"{iso_format(hour)}+00:00"]
-        assert [item["timestamp.to_day"] for item in data] == [f"{iso_format(day)}+00:00"]
+        assert [item["timestamp.to_hour"] for item in data] == [hour.isoformat()]
+        assert [item["timestamp.to_day"] for item in data] == [day.isoformat()]
 
     def test_user_display(self):
         # `user.display` should give `username`
@@ -2254,8 +2254,8 @@ def test_field_aliasing_in_selected_columns(self):
         assert data[0]["user"] == "id:99"
         assert data[0]["release"] == "first-release"
 
-        event_hour = self.event_time.replace(minute=0, second=0)
-        assert data[0]["timestamp.to_hour"] == iso_format(event_hour) + "+00:00"
+        event_hour = self.event_time.replace(minute=0, second=0, microsecond=0)
+        assert data[0]["timestamp.to_hour"] == event_hour.isoformat()
 
         assert len(result["meta"]["fields"]) == 4
         assert result["meta"]["fields"] == {
@@ -2849,8 +2849,8 @@ def test_conditions_with_timestamps(self):
         results = discover.query(
             selected_columns=["transaction", "count()"],
             query="event.type:transaction AND (timestamp:<{} OR timestamp:>{})".format(
-                iso_format(self.now - timedelta(seconds=5)),
-                iso_format(self.now - timedelta(seconds=3)),
+                (self.now - timedelta(seconds=5)).isoformat(),
+                (self.now - timedelta(seconds=3)).isoformat(),
             ),
             snuba_params=SnubaParams(
                 projects=[self.project],
@@ -2873,7 +2873,7 @@ def test_timestamp_rollup_filter(self):
         event_hour = self.event_time.replace(minute=0, second=0)
         result = discover.query(
             selected_columns=["project.id", "user", "release"],
-            query="timestamp.to_hour:" + iso_format(event_hour),
+            query="timestamp.to_hour:" + event_hour.isoformat(),
             snuba_params=self.params,
             referrer="discover",
         )
@@ -3149,8 +3149,8 @@ def setUp(self):
         event_data = load_data("transaction")
         # Half of duration so we don't get weird rounding differences when comparing the results
         event_data["breakdowns"]["span_ops"]["ops.http"]["value"] = 1500
-        event_data["start_timestamp"] = iso_format(self.day_ago + timedelta(minutes=30))
-        event_data["timestamp"] = iso_format(self.day_ago + timedelta(minutes=30, seconds=3))
+        event_data["start_timestamp"] = (self.day_ago + timedelta(minutes=30)).isoformat()
+        event_data["timestamp"] = (self.day_ago + timedelta(minutes=30, seconds=3)).isoformat()
         self.store_event(data=event_data, project_id=self.project.id)
         self.params = SnubaParams(
             projects=[self.project],
@@ -3251,8 +3251,8 @@ def test_orderby_equation(self):
             event_data = load_data("transaction")
             # Half of duration so we don't get weird rounding differences when comparing the results
             event_data["breakdowns"]["span_ops"]["ops.http"]["value"] = 300 * i
-            event_data["start_timestamp"] = iso_format(self.day_ago + timedelta(minutes=30))
-            event_data["timestamp"] = iso_format(self.day_ago + timedelta(minutes=30, seconds=3))
+            event_data["start_timestamp"] = (self.day_ago + timedelta(minutes=30)).isoformat()
+            event_data["timestamp"] = (self.day_ago + timedelta(minutes=30, seconds=3)).isoformat()
             self.store_event(data=event_data, project_id=self.project.id)
         results = discover.query(
             selected_columns=[
@@ -3401,8 +3401,8 @@ def test_nan_equation_results(self):
             event_data = load_data("transaction")
             # Half of duration so we don't get weird rounding differences when comparing the results
             event_data["breakdowns"]["span_ops"]["ops.http"]["value"] = 0
-            event_data["start_timestamp"] = iso_format(self.day_ago + timedelta(minutes=30))
-            event_data["timestamp"] = iso_format(self.day_ago + timedelta(minutes=30, seconds=3))
+            event_data["start_timestamp"] = (self.day_ago + timedelta(minutes=30)).isoformat()
+            event_data["timestamp"] = (self.day_ago + timedelta(minutes=30, seconds=3)).isoformat()
             self.store_event(data=event_data, project_id=self.project.id)
         results = discover.query(
             selected_columns=[
diff --git a/tests/sentry/snuba/test_discover_timeseries_query.py b/tests/sentry/snuba/test_discover_timeseries_query.py
index 119bc1f4a57470..c074e22ad0c107 100644
--- a/tests/sentry/snuba/test_discover_timeseries_query.py
+++ b/tests/sentry/snuba/test_discover_timeseries_query.py
@@ -9,7 +9,7 @@
 from sentry.snuba import discover
 from sentry.snuba.dataset import Dataset
 from sentry.testutils.cases import SnubaTestCase, TestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.utils.samples import load_data
 
 ARRAY_COLUMNS = ["measurements", "span_op_breakdowns"]
@@ -26,7 +26,7 @@ def setUp(self):
             data={
                 "event_id": "a" * 32,
                 "message": "very bad",
-                "timestamp": iso_format(self.day_ago + timedelta(hours=1)),
+                "timestamp": (self.day_ago + timedelta(hours=1)).isoformat(),
                 "fingerprint": ["group1"],
                 "tags": {"important": "yes"},
                 "user": {"id": 1},
@@ -37,7 +37,7 @@ def setUp(self):
             data={
                 "event_id": "b" * 32,
                 "message": "oh my",
-                "timestamp": iso_format(self.day_ago + timedelta(hours=1, minutes=1)),
+                "timestamp": (self.day_ago + timedelta(hours=1, minutes=1)).isoformat(),
                 "fingerprint": ["group2"],
                 "tags": {"important": "no"},
             },
@@ -47,7 +47,7 @@ def setUp(self):
             data={
                 "event_id": "c" * 32,
                 "message": "very bad",
-                "timestamp": iso_format(self.day_ago + timedelta(hours=2, minutes=1)),
+                "timestamp": (self.day_ago + timedelta(hours=2, minutes=1)).isoformat(),
                 "fingerprint": ["group2"],
                 "tags": {"important": "yes"},
             },
@@ -167,7 +167,7 @@ def test_comparison_aggregate_function_invalid(self):
     def test_comparison_aggregate_function(self):
         self.store_event(
             data={
-                "timestamp": iso_format(self.day_ago + timedelta(hours=1)),
+                "timestamp": (self.day_ago + timedelta(hours=1)).isoformat(),
                 "user": {"id": 1},
             },
             project_id=self.project.id,
@@ -191,21 +191,21 @@ def test_comparison_aggregate_function(self):
 
         self.store_event(
             data={
-                "timestamp": iso_format(self.day_ago + timedelta(days=-1, hours=1)),
+                "timestamp": (self.day_ago + timedelta(days=-1, hours=1)).isoformat(),
                 "user": {"id": 1},
             },
             project_id=self.project.id,
         )
         self.store_event(
             data={
-                "timestamp": iso_format(self.day_ago + timedelta(days=-1, hours=1, minutes=2)),
+                "timestamp": (self.day_ago + timedelta(days=-1, hours=1, minutes=2)).isoformat(),
                 "user": {"id": 2},
             },
             project_id=self.project.id,
         )
         self.store_event(
             data={
-                "timestamp": iso_format(self.day_ago + timedelta(days=-1, hours=2, minutes=1)),
+                "timestamp": (self.day_ago + timedelta(days=-1, hours=2, minutes=1)).isoformat(),
             },
             project_id=self.project.id,
         )
@@ -253,8 +253,8 @@ def test_count_miserable(self):
         event_data = load_data("transaction")
         # Half of duration so we don't get weird rounding differences when comparing the results
         event_data["breakdowns"]["span_ops"]["ops.http"]["value"] = 300
-        event_data["start_timestamp"] = iso_format(self.day_ago + timedelta(minutes=30))
-        event_data["timestamp"] = iso_format(self.day_ago + timedelta(minutes=30, seconds=3))
+        event_data["start_timestamp"] = (self.day_ago + timedelta(minutes=30)).isoformat()
+        event_data["timestamp"] = (self.day_ago + timedelta(minutes=30, seconds=3)).isoformat()
         self.store_event(data=event_data, project_id=self.project.id)
         ProjectTransactionThreshold.objects.create(
             project=self.project,
@@ -294,8 +294,8 @@ def test_count_miserable_with_arithmetic(self):
         event_data = load_data("transaction")
         # Half of duration so we don't get weird rounding differences when comparing the results
         event_data["breakdowns"]["span_ops"]["ops.http"]["value"] = 300
-        event_data["start_timestamp"] = iso_format(self.day_ago + timedelta(minutes=30))
-        event_data["timestamp"] = iso_format(self.day_ago + timedelta(minutes=30, seconds=3))
+        event_data["start_timestamp"] = (self.day_ago + timedelta(minutes=30)).isoformat()
+        event_data["timestamp"] = (self.day_ago + timedelta(minutes=30, seconds=3)).isoformat()
         self.store_event(data=event_data, project_id=self.project.id)
         ProjectTransactionThreshold.objects.create(
             project=self.project,
diff --git a/tests/sentry/snuba/test_errors.py b/tests/sentry/snuba/test_errors.py
index bd639ce7da06ce..378411769b9f33 100644
--- a/tests/sentry/snuba/test_errors.py
+++ b/tests/sentry/snuba/test_errors.py
@@ -16,7 +16,7 @@
 from sentry.search.events.types import SnubaParams
 from sentry.snuba import errors
 from sentry.testutils.cases import SnubaTestCase, TestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.utils.samples import load_data
 
 ARRAY_COLUMNS = ["measurements", "span_op_breakdowns"]
@@ -296,8 +296,8 @@ def test_timestamp_rounding_fields(self):
 
         hour = self.event_time.replace(minute=0, second=0, microsecond=0)
         day = hour.replace(hour=0)
-        assert [item["timestamp.to_hour"] for item in data] == [f"{iso_format(hour)}+00:00"]
-        assert [item["timestamp.to_day"] for item in data] == [f"{iso_format(day)}+00:00"]
+        assert [item["timestamp.to_hour"] for item in data] == [hour.isoformat()]
+        assert [item["timestamp.to_day"] for item in data] == [day.isoformat()]
 
     def test_timestamp_rounding_filters(self):
         one_day_ago = before_now(days=1)
@@ -319,7 +319,7 @@ def test_timestamp_rounding_filters(self):
 
         result = errors.query(
             selected_columns=["timestamp.to_hour", "timestamp.to_day"],
-            query=f"timestamp.to_hour:<{iso_format(one_day_ago)} timestamp.to_day:<{iso_format(one_day_ago)}",
+            query=f"timestamp.to_hour:<{one_day_ago.isoformat()} timestamp.to_day:<{one_day_ago.isoformat()}",
             snuba_params=self.snuba_params,
             referrer="test_discover_query",
         )
@@ -328,8 +328,8 @@ def test_timestamp_rounding_filters(self):
 
         hour = two_day_ago.replace(minute=0, second=0, microsecond=0)
         day = hour.replace(hour=0)
-        assert [item["timestamp.to_hour"] for item in data] == [f"{iso_format(hour)}+00:00"]
-        assert [item["timestamp.to_day"] for item in data] == [f"{iso_format(day)}+00:00"]
+        assert [item["timestamp.to_hour"] for item in data] == [hour.isoformat()]
+        assert [item["timestamp.to_day"] for item in data] == [day.isoformat()]
 
     def test_user_display(self):
         # `user.display` should give `username`
@@ -1033,8 +1033,8 @@ def test_field_aliasing_in_selected_columns(self):
         assert data[0]["user"] == "id:99"
         assert data[0]["release"] == "first-release"
 
-        event_hour = self.event_time.replace(minute=0, second=0)
-        assert data[0]["timestamp.to_hour"] == iso_format(event_hour) + "+00:00"
+        event_hour = self.event_time.replace(minute=0, second=0, microsecond=0)
+        assert data[0]["timestamp.to_hour"] == event_hour.isoformat()
 
         assert len(result["meta"]["fields"]) == 4
         assert result["meta"]["fields"] == {
@@ -1596,8 +1596,8 @@ def test_conditions_with_timestamps(self):
         results = errors.query(
             selected_columns=["transaction", "count()"],
             query="event.type:error AND (timestamp:<{} OR timestamp:>{})".format(
-                iso_format(self.now - timedelta(seconds=5)),
-                iso_format(self.now - timedelta(seconds=3)),
+                (self.now - timedelta(seconds=5)).isoformat(),
+                (self.now - timedelta(seconds=3)).isoformat(),
             ),
             snuba_params=SnubaParams(
                 projects=[self.project],
@@ -1620,7 +1620,7 @@ def test_timestamp_rollup_filter(self):
         event_hour = self.event_time.replace(minute=0, second=0)
         result = errors.query(
             selected_columns=["project.id", "user", "release"],
-            query="timestamp.to_hour:" + iso_format(event_hour),
+            query="timestamp.to_hour:" + event_hour.isoformat(),
             snuba_params=self.snuba_params,
             referrer="discover",
         )
@@ -1757,7 +1757,7 @@ def setUp(self):
         self.day_ago = before_now(days=1).replace(hour=10, minute=0, second=0, microsecond=0)
         self.now = before_now()
         event_data = load_data("javascript")
-        event_data["timestamp"] = iso_format(self.day_ago + timedelta(minutes=30, seconds=3))
+        event_data["timestamp"] = (self.day_ago + timedelta(minutes=30, seconds=3)).isoformat()
         self.store_event(data=event_data, project_id=self.project.id)
         self.snuba_params = SnubaParams(
             projects=[self.project],
diff --git a/tests/sentry/snuba/test_transactions.py b/tests/sentry/snuba/test_transactions.py
index 600e4a3de378e1..67592362bf0916 100644
--- a/tests/sentry/snuba/test_transactions.py
+++ b/tests/sentry/snuba/test_transactions.py
@@ -24,7 +24,7 @@
 from sentry.search.events.types import SnubaParams
 from sentry.snuba import discover, transactions
 from sentry.testutils.cases import SnubaTestCase, TestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.utils.samples import load_data
 
 ARRAY_COLUMNS = ["measurements", "span_op_breakdowns"]
@@ -288,8 +288,8 @@ def test_field_aliasing_in_selected_columns(self):
         assert data[0]["user"] == "id:99"
         assert data[0]["release"] == "first-release"
 
-        event_hour = self.event_time.replace(minute=0, second=0)
-        assert data[0]["timestamp.to_hour"] == iso_format(event_hour) + "+00:00"
+        event_hour = self.event_time.replace(minute=0, second=0, microsecond=0)
+        assert data[0]["timestamp.to_hour"] == event_hour.isoformat()
 
         assert len(result["meta"]["fields"]) == 4
         assert result["meta"]["fields"] == {
@@ -991,8 +991,8 @@ def test_timestamp_rounding_fields(self):
 
         hour = self.event_time.replace(minute=0, second=0, microsecond=0)
         day = hour.replace(hour=0)
-        assert [item["timestamp.to_hour"] for item in data] == [f"{iso_format(hour)}+00:00"]
-        assert [item["timestamp.to_day"] for item in data] == [f"{iso_format(day)}+00:00"]
+        assert [item["timestamp.to_hour"] for item in data] == [hour.isoformat()]
+        assert [item["timestamp.to_day"] for item in data] == [day.isoformat()]
 
     def test_timestamp_rounding_filters(self):
         one_day_ago = before_now(days=1)
@@ -1005,7 +1005,7 @@ def test_timestamp_rounding_filters(self):
 
         result = transactions.query(
             selected_columns=["timestamp.to_hour", "timestamp.to_day"],
-            query=f"timestamp.to_hour:<{iso_format(one_day_ago)} timestamp.to_day:<{iso_format(one_day_ago)}",
+            query=f"timestamp.to_hour:<{one_day_ago.isoformat()} timestamp.to_day:<{one_day_ago.isoformat()}",
             snuba_params=self.snuba_params,
             referrer="test_discover_query",
         )
@@ -1014,8 +1014,8 @@ def test_timestamp_rounding_filters(self):
 
         hour = two_day_ago.replace(minute=0, second=0, microsecond=0)
         day = hour.replace(hour=0)
-        assert [item["timestamp.to_hour"] for item in data] == [f"{iso_format(hour)}+00:00"]
-        assert [item["timestamp.to_day"] for item in data] == [f"{iso_format(day)}+00:00"]
+        assert [item["timestamp.to_hour"] for item in data] == [hour.isoformat()]
+        assert [item["timestamp.to_day"] for item in data] == [day.isoformat()]
 
     def test_user_display(self):
         # `user.display` should give `username`
@@ -2678,8 +2678,8 @@ def test_conditions_with_timestamps(self):
         results = transactions.query(
             selected_columns=["transaction", "count()"],
             query="event.type:transaction AND (timestamp:<{} OR timestamp:>{})".format(
-                iso_format(self.now - timedelta(seconds=5)),
-                iso_format(self.now - timedelta(seconds=3)),
+                (self.now - timedelta(seconds=5)).isoformat(),
+                (self.now - timedelta(seconds=3)).isoformat(),
             ),
             snuba_params=SnubaParams(
                 start=self.two_min_ago,
@@ -2704,7 +2704,7 @@ def test_timestamp_rollup_filter(self):
         event_hour = self.event_time.replace(minute=0, second=0)
         result = transactions.query(
             selected_columns=["project.id", "user", "release"],
-            query="timestamp.to_hour:" + iso_format(event_hour),
+            query="timestamp.to_hour:" + event_hour.isoformat(),
             snuba_params=self.snuba_params,
             referrer="discover",
         )
@@ -2865,8 +2865,8 @@ def setUp(self):
         event_data = load_data("transaction")
         # Half of duration so we don't get weird rounding differences when comparing the results
         event_data["breakdowns"]["span_ops"]["ops.http"]["value"] = 1500
-        event_data["start_timestamp"] = iso_format(self.day_ago + timedelta(minutes=30))
-        event_data["timestamp"] = iso_format(self.day_ago + timedelta(minutes=30, seconds=3))
+        event_data["start_timestamp"] = (self.day_ago + timedelta(minutes=30)).isoformat()
+        event_data["timestamp"] = (self.day_ago + timedelta(minutes=30, seconds=3)).isoformat()
         self.store_event(data=event_data, project_id=self.project.id)
         self.snuba_params = SnubaParams(
             projects=[self.project],
@@ -2967,8 +2967,8 @@ def test_orderby_equation(self):
             event_data = load_data("transaction")
             # Half of duration so we don't get weird rounding differences when comparing the results
             event_data["breakdowns"]["span_ops"]["ops.http"]["value"] = 300 * i
-            event_data["start_timestamp"] = iso_format(self.day_ago + timedelta(minutes=30))
-            event_data["timestamp"] = iso_format(self.day_ago + timedelta(minutes=30, seconds=3))
+            event_data["start_timestamp"] = (self.day_ago + timedelta(minutes=30)).isoformat()
+            event_data["timestamp"] = (self.day_ago + timedelta(minutes=30, seconds=3)).isoformat()
             self.store_event(data=event_data, project_id=self.project.id)
         results = transactions.query(
             selected_columns=[
@@ -3117,8 +3117,8 @@ def test_nan_equation_results(self):
             event_data = load_data("transaction")
             # Half of duration so we don't get weird rounding differences when comparing the results
             event_data["breakdowns"]["span_ops"]["ops.http"]["value"] = 0
-            event_data["start_timestamp"] = iso_format(self.day_ago + timedelta(minutes=30))
-            event_data["timestamp"] = iso_format(self.day_ago + timedelta(minutes=30, seconds=3))
+            event_data["start_timestamp"] = (self.day_ago + timedelta(minutes=30)).isoformat()
+            event_data["timestamp"] = (self.day_ago + timedelta(minutes=30, seconds=3)).isoformat()
             self.store_event(data=event_data, project_id=self.project.id)
         results = transactions.query(
             selected_columns=[
diff --git a/tests/sentry/snuba/test_transactions_timeseries_query.py b/tests/sentry/snuba/test_transactions_timeseries_query.py
index 696dc34bf5e643..5a4700c8a3228a 100644
--- a/tests/sentry/snuba/test_transactions_timeseries_query.py
+++ b/tests/sentry/snuba/test_transactions_timeseries_query.py
@@ -9,7 +9,7 @@
 from sentry.snuba import transactions
 from sentry.snuba.dataset import Dataset
 from sentry.testutils.cases import SnubaTestCase, TestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.utils.samples import load_data
 
 ARRAY_COLUMNS = ["measurements", "span_op_breakdowns"]
@@ -245,8 +245,8 @@ def test_count_miserable(self):
         event_data["transaction"] = "api/foo/"
         # Half of duration so we don't get weird rounding differences when comparing the results
         event_data["breakdowns"]["span_ops"]["ops.http"]["value"] = 300
-        event_data["start_timestamp"] = iso_format(self.day_ago + timedelta(minutes=30))
-        event_data["timestamp"] = iso_format(self.day_ago + timedelta(minutes=30, seconds=3))
+        event_data["start_timestamp"] = (self.day_ago + timedelta(minutes=30)).isoformat()
+        event_data["timestamp"] = (self.day_ago + timedelta(minutes=30, seconds=3)).isoformat()
         self.store_event(data=event_data, project_id=self.project.id)
         ProjectTransactionThreshold.objects.create(
             project=self.project,
@@ -287,8 +287,8 @@ def test_count_miserable_with_arithmetic(self):
         event_data["transaction"] = "api/foo/"
         # Half of duration so we don't get weird rounding differences when comparing the results
         event_data["breakdowns"]["span_ops"]["ops.http"]["value"] = 300
-        event_data["start_timestamp"] = iso_format(self.day_ago + timedelta(minutes=30))
-        event_data["timestamp"] = iso_format(self.day_ago + timedelta(minutes=30, seconds=3))
+        event_data["start_timestamp"] = (self.day_ago + timedelta(minutes=30)).isoformat()
+        event_data["timestamp"] = (self.day_ago + timedelta(minutes=30, seconds=3)).isoformat()
         self.store_event(data=event_data, project_id=self.project.id)
         ProjectTransactionThreshold.objects.create(
             project=self.project,
diff --git a/tests/sentry/tasks/test_backfill_seer_grouping_records.py b/tests/sentry/tasks/test_backfill_seer_grouping_records.py
index 2617e03f7482db..389dadbe8a0364 100644
--- a/tests/sentry/tasks/test_backfill_seer_grouping_records.py
+++ b/tests/sentry/tasks/test_backfill_seer_grouping_records.py
@@ -10,17 +10,17 @@
 import pytest
 from django.db.models import Q
 from django.test import override_settings
-from google.api_core.exceptions import DeadlineExceeded, ServiceUnavailable
+from google.api_core.exceptions import ServiceUnavailable
 from snuba_sdk import Column, Condition, Entity, Limit, Op, Query, Request
 from urllib3.response import HTTPResponse
 
 from sentry import options
 from sentry.api.exceptions import ResourceDoesNotExist
 from sentry.conf.server import SEER_SIMILARITY_MODEL_VERSION
+from sentry.db.models.manager.base_query_set import BaseQuerySet
 from sentry.eventstore.models import Event
 from sentry.grouping.api import GroupingConfigNotFound
 from sentry.grouping.enhancer.exceptions import InvalidEnhancerConfig
-from sentry.issues.occurrence_consumer import EventLookupError
 from sentry.models.group import Group, GroupStatus
 from sentry.models.grouphash import GroupHash
 from sentry.models.project import Project
@@ -37,12 +37,9 @@
     _make_postgres_call_with_filter,
     get_data_from_snuba,
     get_events_from_nodestore,
-    lookup_event,
-    lookup_group_data_stacktrace_bulk,
 )
 from sentry.testutils.cases import SnubaTestCase, TestCase
 from sentry.testutils.helpers.datetime import before_now
-from sentry.testutils.helpers.features import with_feature
 from sentry.testutils.helpers.options import override_options
 from sentry.testutils.helpers.task_runner import TaskRunner
 from sentry.testutils.pytest.fixtures import django_db_all
@@ -160,10 +157,9 @@ def create_group_event_rows(self, num: int) -> Mapping[str, Any]:
                 "timestamp": before_now(seconds=10).isoformat(),
                 "title": "title",
             }
-            event = self.store_event(data=data, project_id=self.project.id, assert_no_errors=False)
+            event = self.create_event(self.project.id, data, times_seen=5)
+            assert event.group is not None
             events.append(event)
-            event.group.times_seen = 5
-            event.group.save()
             rows.append(
                 {
                     "event_id": event.event_id,
@@ -179,46 +175,60 @@ def create_group_event_rows(self, num: int) -> Mapping[str, Any]:
 
         return {"rows": rows, "events": events}
 
-    def setUp(self):
-        super().setUp()
-        # Make the project seer eligible
-        self.project.platform = "python"
-        self.project.save()
-        bulk_data = self.create_group_event_rows(5)
-        self.bulk_rows, self.bulk_events = (
-            bulk_data["rows"],
-            bulk_data["events"],
-        )
-        self.event = self.store_event(
-            data={
+    def create_event(
+        self, project_id: int, data: Mapping[str, Any] | None = None, times_seen: int = 1
+    ) -> Event:
+        _data = (
+            {
                 "exception": EXCEPTION,
                 "title": "title",
                 "timestamp": before_now(seconds=10).isoformat(),
-            },
-            project_id=self.project.id,
+            }
+            if data is None
+            else data
+        )
+        event = self.store_event(
+            data=_data,
+            project_id=project_id,
             assert_no_errors=False,
         )
-        self.event.group.times_seen = 5
-        self.event.group.save()
+        assert event.group is not None
+        if times_seen > 1:
+            event.group.times_seen = times_seen
+            event.group.save()
+        return event
 
-        self.wait_for_event_count(self.project.id, 6)
+    def assert_groups_metadata_updated(self, groups: BaseQuerySet[Group, Group]) -> None:
+        for group in groups:
+            hashes = self.group_hashes.get(group.id)
+            if not hashes:
+                hashes = GroupHash.objects.get(group_id=group.id).hash
+            self.assert_group_metadata_updated(group, hashes)
 
-        group_hashes = GroupHash.objects.all().distinct("group_id")
-        self.group_hashes = {group_hash.group_id: group_hash.hash for group_hash in group_hashes}
+    def assert_group_metadata_updated(self, group: Group, hashes: str) -> None:
+        assert group.data["metadata"].get("seer_similarity") == {
+            "similarity_model_version": SEER_SIMILARITY_MODEL_VERSION,
+            "request_hash": hashes,
+        }
 
-    def tearDown(self):
-        super().tearDown()
+    def assert_groups_metadata_not_updated(self, groups: BaseQuerySet[Group, Group]) -> None:
+        for group in groups:
+            self.assert_group_metadata_not_updated(group)
 
-    def test_lookup_event_success(self):
-        """Test single event lookup is successful"""
-        found_event = lookup_event(self.project.id, self.event.event_id, self.event.group_id)
+    def assert_group_metadata_not_updated(self, group: Group) -> None:
+        assert group.data["metadata"].get("seer_similarity") is None
 
-        assert self.event.event_id == found_event.event_id
+    def setUp(self):
+        super().setUp()
+        # Make the project seer eligible
+        self.project.platform = "python"
+        self.project.save()
+        bulk_data = self.create_group_event_rows(5)
+        self.event = bulk_data["events"][0]
+        self.bulk_rows, self.bulk_events = (bulk_data["rows"], bulk_data["events"])
 
-    def test_lookup_event_event_lookup_error(self):
-        """Test that EventLookupError is raised when an event does not exist"""
-        with pytest.raises(EventLookupError):
-            lookup_event(self.project.id, "1000000", 1000000)
+        group_hashes = GroupHash.objects.all().distinct("group_id")
+        self.group_hashes = {group_hash.group_id: group_hash.hash for group_hash in group_hashes}
 
     @patch("sentry.tasks.embeddings_grouping.utils.metrics")
     def test_lookup_group_data_stacktrace_bulk_success(self, mock_metrics):
@@ -275,36 +285,6 @@ def test_lookup_group_data_stacktrace_bulk_success_multithread(self, mock_metric
             "backfill_grouping_records._lookup_event_bulk.hit_ratio", 100, sample_rate=1.0
         )
 
-    @patch("time.sleep", return_value=None)
-    @patch("sentry.tasks.embeddings_grouping.utils.logger")
-    @patch("sentry.nodestore.backend.get_multi")
-    def test_lookup_group_data_stacktrace_bulk_exceptions(
-        self, mock_get_multi, mock_logger, mock_sleep
-    ):
-        """
-        Test cases where ServiceUnavailable or DeadlineExceeded exceptions occur in bulk data
-        lookup, that the backfill stops
-        """
-        exceptions = [
-            ServiceUnavailable(message="Service Unavailable"),
-            DeadlineExceeded(message="Deadline Exceeded"),
-        ]
-        rows = self.bulk_rows
-
-        for exception in exceptions:
-            mock_get_multi.side_effect = exception
-            with pytest.raises(Exception):
-                lookup_group_data_stacktrace_bulk(self.project, rows)
-            mock_logger.exception.assert_called_with(
-                "tasks.backfill_seer_grouping_records.bulk_event_lookup_exception",
-                extra={
-                    "organization_id": self.project.organization.id,
-                    "project_id": self.project.id,
-                    "node_keys": ANY,
-                    "error": exception.message,
-                },
-            )
-
     def test_lookup_group_data_stacktrace_bulk_not_stacktrace_grouping(self):
         """
         Test that if a group does not use the stacktrace for grouping, its data is not included in
@@ -313,11 +293,11 @@ def test_lookup_group_data_stacktrace_bulk_not_stacktrace_grouping(self):
         # Use 2 events
         rows, events, hashes = self.bulk_rows[:2], self.bulk_events[:2], {}
         # Add one event where the stacktrace is not used for grouping
-        event = self.store_event(
+        event = self.create_event(
+            self.project.id,
             data={"exception": EXCEPTION, "title": "title", "fingerprint": ["2"]},
-            project_id=self.project.id,
-            assert_no_errors=False,
         )
+        assert event.group is not None
         group_ids = [row["group_id"] for row in rows]
         for group_id in group_ids:
             hashes.update({group_id: self.group_hashes[group_id]})
@@ -354,7 +334,8 @@ def test_lookup_group_data_stacktrace_bulk_no_stacktrace_exception(self):
         for group_id in group_ids:
             hashes.update({group_id: self.group_hashes[group_id]})
         # Create one event where the stacktrace has no exception
-        event = self.store_event(data={}, project_id=self.project.id, assert_no_errors=False)
+        event = self.create_event(self.project.id, data={})
+        assert event.group is not None
         rows.append({"event_id": event.event_id, "group_id": event.group_id})
         hashes.update({event.group_id: GroupHash.objects.get(group_id=event.group.id).hash})
 
@@ -378,7 +359,7 @@ def test_lookup_group_data_stacktrace_bulk_no_stacktrace_exception(self):
     @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
+        Test that if a group has over MAX_FRAME_COUNT frames, its data is not included in
         the bulk lookup result
         """
         # Use 2 events
@@ -386,7 +367,7 @@ def test_lookup_group_data_stacktrace_bulk_invalid_stacktrace_exception(self, mo
         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
+        # Create one event where the stacktrace has over MAX_FRAME_COUNT frames
         exception = copy.deepcopy(EXCEPTION)
         exception["values"][0]["stacktrace"]["frames"] = [
             {
@@ -399,16 +380,16 @@ def test_lookup_group_data_stacktrace_bulk_invalid_stacktrace_exception(self, mo
             }
             for i in range(MAX_FRAME_COUNT + 1)
         ]
-        event = self.store_event(
+        event = self.create_event(
+            self.project.id,
             data={
                 "platform": "java",
                 "exception": exception,
                 "title": "title",
                 "timestamp": before_now(seconds=10).isoformat(),
             },
-            project_id=self.project.id,
-            assert_no_errors=False,
         )
+        assert event.group is not None
         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
@@ -433,9 +414,14 @@ def test_lookup_group_data_stacktrace_bulk_invalid_stacktrace_exception(self, mo
 
         sample_rate = options.get("seer.similarity.metrics_sample_rate")
         mock_metrics.incr.assert_called_with(
-            "grouping.similarity.over_threshold_only_system_frames",
+            "grouping.similarity.frame_count_filter",
             sample_rate=sample_rate,
-            tags={"platform": "java", "referrer": "backfill"},
+            tags={
+                "platform": "java",
+                "referrer": "backfill",
+                "stacktrace_type": "system",
+                "outcome": "block",
+            },
         )
 
     def test_lookup_group_data_stacktrace_bulk_with_fallback_success(self):
@@ -602,7 +588,6 @@ def test_get_data_from_snuba_too_many_simultaneous_exception(
             },
         )
 
-    @with_feature("projects:similarity-embeddings-backfill")
     @patch("sentry.tasks.embeddings_grouping.utils.post_bulk_grouping_records")
     def test_backfill_seer_grouping_records_success_simple(self, mock_post_bulk_grouping_records):
         """
@@ -614,20 +599,14 @@ def test_backfill_seer_grouping_records_success_simple(self, mock_post_bulk_grou
             backfill_seer_grouping_records_for_project(self.project.id)
 
         groups = Group.objects.filter(project_id=self.project.id)
-        for group in groups:
-            assert group.data["metadata"].get("seer_similarity") == {
-                "similarity_model_version": SEER_SIMILARITY_MODEL_VERSION,
-                "request_hash": self.group_hashes[group.id],
-            }
+        self.assert_groups_metadata_updated(groups)
 
-    @with_feature("projects:similarity-embeddings-backfill")
-    @patch("sentry.tasks.embeddings_grouping.backfill_seer_grouping_records_for_project.logger")
     @patch("sentry.tasks.embeddings_grouping.utils.post_bulk_grouping_records")
     @override_options(
         {"similarity.backfill_seer_threads": 2, "similarity.backfill_seer_chunk_size": 10}
     )
     def test_backfill_seer_grouping_records_success_cohorts_simple(
-        self, mock_post_bulk_grouping_records, mock_logger
+        self, mock_post_bulk_grouping_records
     ):
         """
         Test that the metadata is set for all groups showing that the record has been created.
@@ -635,17 +614,7 @@ def test_backfill_seer_grouping_records_success_cohorts_simple(
         mock_post_bulk_grouping_records.return_value = {"success": True, "groups_with_neighbor": {}}
 
         project2 = self.create_project(organization=self.organization)
-        event2 = self.store_event(
-            data={
-                "exception": EXCEPTION,
-                "title": "title",
-                "timestamp": before_now(seconds=10).isoformat(),
-            },
-            project_id=project2.id,
-            assert_no_errors=False,
-        )
-        event2.group.times_seen = 5
-        event2.group.save()
+        self.create_event(project2.id, times_seen=5)
         group_hashes = GroupHash.objects.all().distinct("group_id")
         self.group_hashes = {group_hash.group_id: group_hash.hash for group_hash in group_hashes}
 
@@ -657,89 +626,14 @@ def test_backfill_seer_grouping_records_success_cohorts_simple(
             )
 
         groups = Group.objects.filter(project_id__in=[self.project.id, project2.id])
-        for group in groups:
-            assert group.data["metadata"].get("seer_similarity") == {
-                "similarity_model_version": SEER_SIMILARITY_MODEL_VERSION,
-                "request_hash": self.group_hashes[group.id],
-            }
+        self.assert_groups_metadata_updated(groups)
 
-        project_group_ids = sorted(
-            [group.id for group in Group.objects.filter(project_id=self.project.id)]
-        )
-        project2_group_ids = sorted(
-            [group.id for group in Group.objects.filter(project_id=project2.id)]
-        )
-        expected_call_args_list = [
-            call(
-                "backfill_seer_grouping_records",
-                extra={
-                    "current_project_id": self.project.id,
-                    "last_processed_group_id": None,
-                    "cohort": [self.project.id, project2.id],
-                    "last_processed_project_index": 0,
-                    "only_delete": False,
-                    "skip_processed_projects": True,
-                    "skip_project_ids": None,
-                    "worker_number": None,
-                },
-            ),
-            call(
-                "backfill_seer_grouping_records",
-                extra={
-                    "current_project_id": self.project.id,
-                    "last_processed_group_id": project_group_ids[0],
-                    "cohort": [self.project.id, project2.id],
-                    "last_processed_project_index": 0,
-                    "only_delete": False,
-                    "skip_processed_projects": True,
-                    "skip_project_ids": None,
-                    "worker_number": None,
-                },
-            ),
-            call(
-                "backfill_seer_grouping_records",
-                extra={
-                    "current_project_id": project2.id,
-                    "last_processed_group_id": None,
-                    "cohort": [self.project.id, project2.id],
-                    "last_processed_project_index": 1,
-                    "only_delete": False,
-                    "skip_processed_projects": True,
-                    "skip_project_ids": None,
-                    "worker_number": None,
-                },
-            ),
-            call(
-                "backfill_seer_grouping_records",
-                extra={
-                    "current_project_id": project2.id,
-                    "last_processed_group_id": project2_group_ids[0],
-                    "cohort": [self.project.id, project2.id],
-                    "last_processed_project_index": 1,
-                    "only_delete": False,
-                    "skip_processed_projects": True,
-                    "skip_project_ids": None,
-                    "worker_number": None,
-                },
-            ),
-            call(
-                "reached the end of the project list",
-                extra={
-                    "cohort_name": [self.project.id, project2.id],
-                    "last_processed_project_index": None,
-                },
-            ),
-        ]
-        assert mock_logger.info.call_args_list == expected_call_args_list
-
-    @with_feature("projects:similarity-embeddings-backfill")
-    @patch("sentry.tasks.embeddings_grouping.backfill_seer_grouping_records_for_project.logger")
     @patch("sentry.tasks.embeddings_grouping.utils.post_bulk_grouping_records")
     @override_options(
         {"similarity.backfill_seer_threads": 2, "similarity.backfill_seer_chunk_size": 10}
     )
     def test_backfill_seer_grouping_records_success_cohorts_project_does_not_exist(
-        self, mock_post_bulk_grouping_records, mock_logger
+        self, mock_post_bulk_grouping_records
     ):
         """
         Test that the metadata is set for all groups showing that the record has been created.
@@ -753,69 +647,12 @@ def test_backfill_seer_grouping_records_success_cohorts_project_does_not_exist(
                 last_processed_project_index_input=0,
             )
 
-        last_processed_group_id = sorted(
-            [group.id for group in Group.objects.filter(project_id=self.project.id)]
-        )[0]
-
-        expected_call_args_list = [
-            call(
-                "backfill_seer_grouping_records",
-                extra={
-                    "current_project_id": 99999999999999,
-                    "last_processed_group_id": None,
-                    "cohort": [99999999999999, self.project.id],
-                    "last_processed_project_index": 0,
-                    "only_delete": False,
-                    "skip_processed_projects": True,
-                    "skip_project_ids": None,
-                    "worker_number": None,
-                },
-            ),
-            call(
-                "backfill_seer_grouping_records.project_does_not_exist",
-                extra={"current_project_id": 99999999999999},
-            ),
-            call(
-                "backfill_seer_grouping_records",
-                extra={
-                    "current_project_id": self.project.id,
-                    "last_processed_group_id": None,
-                    "cohort": [99999999999999, self.project.id],
-                    "last_processed_project_index": 1,
-                    "only_delete": False,
-                    "skip_processed_projects": True,
-                    "skip_project_ids": None,
-                    "worker_number": None,
-                },
-            ),
-            call(
-                "backfill_seer_grouping_records",
-                extra={
-                    "current_project_id": self.project.id,
-                    "last_processed_group_id": last_processed_group_id,
-                    "cohort": [99999999999999, self.project.id],
-                    "last_processed_project_index": 1,
-                    "only_delete": False,
-                    "skip_processed_projects": True,
-                    "skip_project_ids": None,
-                    "worker_number": None,
-                },
-            ),
-            call(
-                "reached the end of the project list",
-                extra={
-                    "cohort_name": [99999999999999, self.project.id],
-                    "last_processed_project_index": None,
-                },
-            ),
-        ]
-        assert mock_logger.info.call_args_list == expected_call_args_list
+        groups = Group.objects.filter(project_id__in=[99999999999999, self.project.id])
+        self.assert_groups_metadata_updated(groups)
 
-    @with_feature("projects:similarity-embeddings-backfill")
-    @patch("sentry.tasks.embeddings_grouping.backfill_seer_grouping_records_for_project.logger")
     @patch("sentry.tasks.embeddings_grouping.utils.post_bulk_grouping_records")
     def test_backfill_seer_grouping_records_success_cohorts_setting_defined(
-        self, mock_post_bulk_grouping_records, mock_logger
+        self, mock_post_bulk_grouping_records
     ):
         """
         Test that the metadata is set for all groups showing that the record has been created.
@@ -823,17 +660,7 @@ def test_backfill_seer_grouping_records_success_cohorts_setting_defined(
         mock_post_bulk_grouping_records.return_value = {"success": True, "groups_with_neighbor": {}}
 
         project2 = self.create_project(organization=self.organization)
-        event2 = self.store_event(
-            data={
-                "exception": EXCEPTION,
-                "title": "title",
-                "timestamp": before_now(seconds=10).isoformat(),
-            },
-            project_id=project2.id,
-            assert_no_errors=False,
-        )
-        event2.group.times_seen = 5
-        event2.group.save()
+        self.create_event(project2.id, times_seen=5)
         group_hashes = GroupHash.objects.all().distinct("group_id")
         self.group_hashes = {group_hash.group_id: group_hash.hash for group_hash in group_hashes}
 
@@ -850,115 +677,23 @@ def test_backfill_seer_grouping_records_success_cohorts_setting_defined(
             )
 
         groups = Group.objects.filter(project_id__in=[self.project.id, project2.id])
-        for group in groups:
-            assert group.data["metadata"].get("seer_similarity") == {
-                "similarity_model_version": SEER_SIMILARITY_MODEL_VERSION,
-                "request_hash": self.group_hashes[group.id],
-            }
-
-        project_group_ids = sorted(
-            [group.id for group in Group.objects.filter(project_id=self.project.id)]
-        )
-        project2_group_ids = sorted(
-            [group.id for group in Group.objects.filter(project_id=project2.id)]
-        )
-        expected_call_args_list = [
-            call(
-                "backfill_seer_grouping_records",
-                extra={
-                    "current_project_id": self.project.id,
-                    "last_processed_group_id": None,
-                    "cohort": "test",
-                    "last_processed_project_index": 0,
-                    "only_delete": False,
-                    "skip_processed_projects": True,
-                    "skip_project_ids": None,
-                    "worker_number": None,
-                },
-            ),
-            call(
-                "backfill_seer_grouping_records",
-                extra={
-                    "current_project_id": self.project.id,
-                    "last_processed_group_id": project_group_ids[0],
-                    "cohort": "test",
-                    "last_processed_project_index": 0,
-                    "only_delete": False,
-                    "skip_processed_projects": True,
-                    "skip_project_ids": None,
-                    "worker_number": None,
-                },
-            ),
-            call(
-                "backfill_seer_grouping_records",
-                extra={
-                    "current_project_id": project2.id,
-                    "last_processed_group_id": None,
-                    "cohort": "test",
-                    "last_processed_project_index": 1,
-                    "only_delete": False,
-                    "skip_processed_projects": True,
-                    "skip_project_ids": None,
-                    "worker_number": None,
-                },
-            ),
-            call(
-                "backfill_seer_grouping_records",
-                extra={
-                    "current_project_id": project2.id,
-                    "last_processed_group_id": project2_group_ids[0],
-                    "cohort": "test",
-                    "last_processed_project_index": 1,
-                    "only_delete": False,
-                    "skip_processed_projects": True,
-                    "skip_project_ids": None,
-                    "worker_number": None,
-                },
-            ),
-            call(
-                "reached the end of the project list",
-                extra={
-                    "cohort_name": "test",
-                    "last_processed_project_index": None,
-                },
-            ),
-        ]
-        assert mock_logger.info.call_args_list == expected_call_args_list
+        self.assert_groups_metadata_updated(groups)
 
     @patch("time.sleep", return_value=None)
     @patch(
         "sentry.nodestore.backend.get_multi",
         side_effect=ServiceUnavailable(message="Service Unavailable"),
     )
-    @patch(
-        "sentry.tasks.embeddings_grouping.utils.lookup_event",
-        side_effect=ServiceUnavailable(message="Service Unavailable"),
-    )
-    def test_backfill_seer_grouping_records_failure(
-        self, mock_lookup_event, mock_get_multi, mock_sleep
-    ):
+    def test_backfill_seer_grouping_records_failure(self, mock_get_multi, mock_sleep):
         """
         Test that the group metadata isn't updated on a failure.
         """
         with TaskRunner():
             backfill_seer_grouping_records_for_project(self.project.id)
 
-        for group in Group.objects.filter(project_id=self.project.id):
-            assert not group.data["metadata"].get("seer_similarity")
-
-    def test_backfill_seer_grouping_records_no_feature(self):
-        """
-        Test that the function does not create records when there is no feature flag
-        """
-        project = self.create_project(organization=self.organization)
-
-        with TaskRunner():
-            backfill_seer_grouping_records_for_project(project, None)
-
-        for group in Group.objects.filter(project_id=self.project.id):
-            assert not group.data["metadata"].get("seer_similarity")
+        groups = Group.objects.filter(project_id=self.project.id)
+        self.assert_groups_metadata_not_updated(groups)
 
-    @with_feature("projects:similarity-embeddings-backfill")
     @patch("sentry.tasks.embeddings_grouping.utils.post_bulk_grouping_records")
     def test_backfill_seer_grouping_records_groups_1_times_seen(
         self, mock_post_bulk_grouping_records
@@ -971,7 +706,6 @@ def test_backfill_seer_grouping_records_groups_1_times_seen(
         function_names = [f"new_function_{str(i)}" for i in range(5)]
         type_names = [f"NewError{str(i)}" for i in range(5)]
         value_names = ["error with value" for _ in range(5)]
-        groups_seen_once = []
         for i in range(5):
             data = {
                 "exception": self.create_exception_values(
@@ -980,94 +714,16 @@ def test_backfill_seer_grouping_records_groups_1_times_seen(
                 "title": "title",
                 "timestamp": before_now(seconds=10).isoformat(),
             }
-            event = self.store_event(data=data, project_id=self.project.id, assert_no_errors=False)
-            groups_seen_once.append(event.group)
-
-        with TaskRunner():
-            backfill_seer_grouping_records_for_project(self.project.id)
-
-        groups = Group.objects.filter(project_id=self.project.id)
-        for group in groups:
-            if group not in groups_seen_once:
-                assert group.data["metadata"].get("seer_similarity") == {
-                    "similarity_model_version": SEER_SIMILARITY_MODEL_VERSION,
-                    "request_hash": self.group_hashes[group.id],
-                }
-            else:
-                assert group.data["metadata"].get("seer_similarity") is None
-
-    @pytest.mark.skip(
-        "this test is flakey in production; trying to replicate locally and skipping it for now"
-    )
-    @with_feature("projects:similarity-embeddings-backfill")
-    @patch("sentry.tasks.embeddings_grouping.utils.post_bulk_grouping_records")
-    def test_backfill_seer_grouping_records_groups_have_neighbor(
-        self, mock_post_bulk_grouping_records
-    ):
-        """
-        Test that groups that have nearest neighbors, do not get records created for them in
-        grouping_records.
-        Test that the metadata of groups that have nearest neighbors and those that have records
-        created are different.
-        """
-        # Create groups with 1 < times_seen < 5
-        # The groups that will be similar to these groups, have times_seen = 5
-        function_names = [f"another_function_{str(i)}" for i in range(5)]
-        type_names = [f"AnotherError{str(i)}" for i in range(5)]
-        value_names = ["error with value" for _ in range(5)]
-        groups_with_neighbor = {}
-        for i in range(5):
-            data = {
-                "exception": self.create_exception_values(
-                    function_names[i], type_names[i], value_names[i]
-                ),
-                "title": "title",
-                "timestamp": before_now(seconds=10),
-            }
-            event = self.store_event(data=data, project_id=self.project.id, assert_no_errors=False)
-            event.group.times_seen = 2
-            event.group.save()
-            # Arbitrarily choose a parent group's hash that has times_seen = 5
-            parent_group = Group.objects.get(times_seen__gt=2)
-            parent_group_hash = GroupHash.objects.get(group_id=parent_group.id)
-            groups_with_neighbor[str(event.group.id)] = RawSeerSimilarIssueData(
-                stacktrace_distance=0.01,
-                should_group=True,
-                parent_hash=parent_group_hash.hash,
-            )
-
-        mock_post_bulk_grouping_records.return_value = {
-            "success": True,
-            "groups_with_neighbor": groups_with_neighbor,
-        }
+            self.create_event(self.project.id, data)
 
         with TaskRunner():
             backfill_seer_grouping_records_for_project(self.project.id)
 
         groups = Group.objects.filter(project_id=self.project.id, times_seen__gt=1)
-        for group in groups:
-            if str(group.id) not in groups_with_neighbor:
-                assert group.data["metadata"].get("seer_similarity") == {
-                    "similarity_model_version": SEER_SIMILARITY_MODEL_VERSION,
-                    "request_hash": self.group_hashes[group.id],
-                }
-            else:
-                request_hash = GroupHash.objects.get(group_id=group.id).hash
-                parent_group_id = Group.objects.get(times_seen__gt=2).id
-                assert group.data["metadata"].get("seer_similarity") == {
-                    "similarity_model_version": SEER_SIMILARITY_MODEL_VERSION,
-                    "request_hash": request_hash,
-                    "results": [
-                        {
-                            "stacktrace_distance": 0.01,
-                            "should_group": True,
-                            "parent_hash": groups_with_neighbor[str(group.id)]["parent_hash"],
-                            "parent_group_id": parent_group_id,
-                        }
-                    ],
-                }
+        self.assert_groups_metadata_updated(groups)
+        groups_seen_once = Group.objects.filter(project_id=self.project.id, times_seen=1)
+        self.assert_groups_metadata_not_updated(groups_seen_once)
 
-    @with_feature("projects:similarity-embeddings-backfill")
     @patch("sentry.tasks.embeddings_grouping.utils.delete_seer_grouping_records_by_hash")
     @patch("sentry.tasks.embeddings_grouping.utils.logger")
     @patch("sentry.tasks.embeddings_grouping.utils.post_bulk_grouping_records")
@@ -1087,9 +743,9 @@ def test_backfill_seer_grouping_records_groups_has_invalid_neighbor(
             "title": "title",
             "timestamp": before_now(seconds=10).isoformat(),
         }
-        event = self.store_event(data=data, project_id=self.project.id, assert_no_errors=False)
-        event.group.times_seen = 2
-        event.group.save()
+        event = self.create_event(self.project.id, data, times_seen=2)
+        assert event.group is not None
+
         # Make the similar group a hash that does not exist
         group_with_neighbor[str(event.group.id)] = RawSeerSimilarIssueData(
             stacktrace_distance=0.01,
@@ -1108,12 +764,9 @@ def test_backfill_seer_grouping_records_groups_has_invalid_neighbor(
         groups = Group.objects.filter(project_id=self.project.id, times_seen__gt=1)
         for group in groups:
             if str(group.id) not in group_with_neighbor:
-                assert group.data["metadata"].get("seer_similarity") == {
-                    "similarity_model_version": SEER_SIMILARITY_MODEL_VERSION,
-                    "request_hash": self.group_hashes[group.id],
-                }
+                self.assert_group_metadata_updated(group, self.group_hashes[group.id])
             else:
-                assert group.data["metadata"].get("seer_similarity") is None
+                self.assert_group_metadata_not_updated(group)
                 mock_logger.exception.assert_called_with(
                     "tasks.backfill_seer_grouping_records.invalid_parent_group",
                     extra={
@@ -1126,7 +779,6 @@ def test_backfill_seer_grouping_records_groups_has_invalid_neighbor(
                     self.project.id, ["00000000000000000000000000000000"]
                 )
 
-    @with_feature("projects:similarity-embeddings-backfill")
     @patch("sentry.tasks.embeddings_grouping.utils.logger")
     @patch("sentry.tasks.embeddings_grouping.backfill_seer_grouping_records_for_project.logger")
     @patch("sentry.tasks.embeddings_grouping.utils.post_bulk_grouping_records")
@@ -1148,9 +800,7 @@ def test_backfill_seer_grouping_records_multiple_batches(
                 "title": "title",
                 "timestamp": before_now(seconds=10).isoformat(),
             }
-            event = self.store_event(data=data, project_id=self.project.id, assert_no_errors=False)
-            event.group.times_seen = 2
-            event.group.save()
+            self.create_event(self.project.id, data, times_seen=2)
 
         mock_post_bulk_grouping_records.return_value = {"success": True, "groups_with_neighbor": {}}
 
@@ -1162,8 +812,7 @@ def test_backfill_seer_grouping_records_multiple_batches(
             )
 
         groups = Group.objects.filter(project_id=self.project.id)
-        for group in groups:
-            assert group.data["metadata"].get("seer_similarity") is not None
+        self.assert_groups_metadata_updated(groups)
 
         batch_size = options.get("embeddings-grouping.seer.backfill-batch-size")
         project_group_ids = sorted([group.id for group in groups], reverse=True)
@@ -1239,13 +888,13 @@ def test_backfill_seer_grouping_records_multiple_batches(
                 "backfill_seer_grouping_records.batch",
                 extra={
                     "project_id": self.project.id,
-                    "batch_len": 6,
+                    "batch_len": 5,
                     "last_processed_group_id": project_group_ids[-1],
                 },
             ),
             call(
                 "backfill_seer_grouping_records.bulk_update",
-                extra={"project_id": self.project.id, "num_updated": 6},
+                extra={"project_id": self.project.id, "num_updated": 5},
             ),
             call(
                 "backfill_seer_grouping_records.start",
@@ -1269,7 +918,6 @@ def test_backfill_seer_grouping_records_multiple_batches(
         ]
         assert mock_utils_logger.info.call_args_list == expected_utils_call_args_list
 
-    @with_feature("projects:similarity-embeddings-backfill")
     @patch("sentry.tasks.embeddings_grouping.utils.delete_project_grouping_records")
     def test_backfill_seer_grouping_records_only_delete(self, mock_project_delete_grouping_records):
         """
@@ -1290,8 +938,8 @@ def test_backfill_seer_grouping_records_only_delete(self, mock_project_delete_gr
                 "title": "title",
                 "timestamp": before_now(seconds=10).isoformat(),
             }
-            event = self.store_event(data=data, project_id=self.project.id, assert_no_errors=False)
-            event.group.times_seen = 2
+            event = self.create_event(self.project.id, data, times_seen=2)
+            assert event.group is not None
             event.group.data["metadata"] = copy.deepcopy(default_metadata)
             if i < 3:
                 event.group.data["metadata"].update(
@@ -1308,17 +956,15 @@ def test_backfill_seer_grouping_records_only_delete(self, mock_project_delete_gr
         for group in groups:
             assert group.data["metadata"] == default_metadata
 
-    @with_feature("projects:similarity-embeddings-backfill")
     @patch("sentry.tasks.embeddings_grouping.utils.delete_project_grouping_records")
-    @patch("sentry.tasks.embeddings_grouping.backfill_seer_grouping_records_for_project.logger")
+    @patch("sentry.tasks.embeddings_grouping.utils.post_bulk_grouping_records")
     def test_backfill_seer_grouping_records_cohort_only_delete(
-        self, mock_logger, mock_delete_grouping_records
+        self, mock_post_bulk_grouping_records, mock_delete_grouping_records
     ):
         """
         Test that when the only_delete flag is on, seer_similarity is deleted from the metadata
         if it exists
         """
-
         project2 = self.create_project(organization=self.organization)
         event2 = self.store_event(
             data={
@@ -1333,62 +979,34 @@ def test_backfill_seer_grouping_records_cohort_only_delete(
         event2.group.save()
         group_hashes = GroupHash.objects.all().distinct("group_id")
         self.group_hashes = {group_hash.group_id: group_hash.hash for group_hash in group_hashes}
+        projects = [self.project.id, project2.id]
+
+        # First generate all data - not using only_delete
+        mock_post_bulk_grouping_records.return_value = {"success": True, "groups_with_neighbor": {}}
+        with TaskRunner():
+            backfill_seer_grouping_records_for_project(
+                current_project_id=self.project.id,
+                cohort=projects,
+                last_processed_project_index_input=0,
+            )
+        groups = Group.objects.filter(project_id__in=projects)
+        self.assert_groups_metadata_updated(groups)
 
+        # Now delete the data
         mock_delete_grouping_records.return_value = True
         with TaskRunner():
             backfill_seer_grouping_records_for_project(
                 current_project_id=self.project.id,
-                cohort=[self.project.id, project2.id],
+                cohort=projects,
                 last_processed_project_index_input=0,
                 only_delete=True,
             )
-        assert mock_logger.info.call_args_list == [
-            call(
-                "backfill_seer_grouping_records",
-                extra={
-                    "current_project_id": self.project.id,
-                    "last_processed_group_id": None,
-                    "cohort": [self.project.id, project2.id],
-                    "last_processed_project_index": 0,
-                    "only_delete": True,
-                    "skip_processed_projects": True,
-                    "skip_project_ids": None,
-                    "worker_number": None,
-                },
-            ),
-            call(
-                "backfill_seer_grouping_records.deleted_all_records",
-                extra={"current_project_id": self.project.id},
-            ),
-            call(
-                "backfill_seer_grouping_records",
-                extra={
-                    "current_project_id": project2.id,
-                    "last_processed_group_id": None,
-                    "cohort": [self.project.id, project2.id],
-                    "last_processed_project_index": 1,
-                    "only_delete": True,
-                    "skip_processed_projects": True,
-                    "skip_project_ids": None,
-                    "worker_number": None,
-                },
-            ),
-            call(
-                "backfill_seer_grouping_records.deleted_all_records",
-                extra={"current_project_id": project2.id},
-            ),
-            call(
-                "reached the end of the project list",
-                extra={
-                    "cohort_name": [self.project.id, project2.id],
-                    "last_processed_project_index": None,
-                },
-            ),
-        ]
 
-    @with_feature("projects:similarity-embeddings-backfill")
+        groups = Group.objects.filter(project_id__in=projects)
+        self.assert_groups_metadata_not_updated(groups)
+
     @patch("sentry.tasks.embeddings_grouping.utils.post_bulk_grouping_records")
-    def test_backfill_seer_grouping_records_exclude_deleted_groups(
+    def test_backfill_seer_grouping_records_exclude_groups_pending_deletion(
         self, mock_post_bulk_grouping_records
     ):
         """
@@ -1426,17 +1044,10 @@ def test_backfill_seer_grouping_records_exclude_deleted_groups(
             backfill_seer_grouping_records_for_project(self.project.id)
 
         groups = Group.objects.filter(project_id=self.project.id).exclude(id__in=deleted_group_ids)
-        for group in groups:
-            assert group.data["metadata"].get("seer_similarity") == {
-                "similarity_model_version": SEER_SIMILARITY_MODEL_VERSION,
-                "request_hash": self.group_hashes[group.id],
-            }
-
-        # Assert metadata was not set for groups that will be deleted
-        for group in Group.objects.filter(project_id=self.project.id, id__in=deleted_group_ids):
-            assert group.data["metadata"].get("seer_similarity") is None
+        self.assert_groups_metadata_updated(groups)
+        groups = Group.objects.filter(project_id=self.project.id, id__in=deleted_group_ids)
+        self.assert_groups_metadata_not_updated(groups)
 
-    @with_feature("projects:similarity-embeddings-backfill")
     @patch("sentry.tasks.embeddings_grouping.utils.logger")
     @patch("sentry.tasks.embeddings_grouping.utils.bulk_snuba_queries")
     @patch("sentry.tasks.embeddings_grouping.utils.post_bulk_grouping_records")
@@ -1514,7 +1125,6 @@ def test_backfill_seer_grouping_records_no_events(
             in mock_logger.info.call_args_list
         )
 
-    @with_feature("projects:similarity-embeddings-backfill")
     @patch("sentry.tasks.embeddings_grouping.utils.post_bulk_grouping_records")
     def test_backfill_seer_grouping_records_exclude_90_day_old_groups(
         self, mock_post_bulk_grouping_records
@@ -1550,7 +1160,6 @@ def test_backfill_seer_grouping_records_exclude_90_day_old_groups(
         old_group = Group.objects.get(project_id=self.project.id, id=old_group_id)
         assert old_group.data["metadata"].get("seer_similarity") is None
 
-    @with_feature("projects:similarity-embeddings-backfill")
     @patch("sentry.tasks.embeddings_grouping.utils.logger")
     @patch("sentry.tasks.embeddings_grouping.utils.lookup_group_data_stacktrace_bulk")
     @patch(
@@ -1587,17 +1196,12 @@ def test_backfill_seer_grouping_records_empty_nodestore(
             worker_number=None,
         )
 
-    @with_feature("projects:similarity-embeddings-backfill")
-    @patch("sentry.tasks.embeddings_grouping.utils.logger")
     @patch("sentry.tasks.embeddings_grouping.utils.lookup_group_data_stacktrace_bulk")
     @patch(
         "sentry.tasks.embeddings_grouping.backfill_seer_grouping_records_for_project.call_next_backfill"
     )
     def test_backfill_seer_grouping_records_nodestore_grouping_config_not_found(
-        self,
-        mock_call_next_backfill,
-        mock_lookup_group_data_stacktrace_bulk,
-        mock_logger,
+        self, mock_call_next_backfill, mock_lookup_group_data_stacktrace_bulk
     ):
         exceptions = (GroupingConfigNotFound(), ResourceDoesNotExist(), InvalidEnhancerConfig())
 
@@ -1620,7 +1224,6 @@ def test_backfill_seer_grouping_records_nodestore_grouping_config_not_found(
                 worker_number=None,
             )
 
-    @with_feature("projects:similarity-embeddings-backfill")
     @patch("sentry.tasks.embeddings_grouping.utils.logger")
     @patch("sentry.tasks.embeddings_grouping.utils.post_bulk_grouping_records")
     def test_backfill_seer_grouping_records_exclude_invalid_groups(
@@ -1650,7 +1253,6 @@ def test_backfill_seer_grouping_records_exclude_invalid_groups(
         group_no_grouping_stacktrace = Group.objects.get(id=event.group.id)
         assert group_no_grouping_stacktrace.data["metadata"].get("seer_similarity") is None
 
-    @with_feature("projects:similarity-embeddings-backfill")
     @override_options({"seer.similarity-backfill-killswitch.enabled": True})
     @patch("sentry.tasks.embeddings_grouping.backfill_seer_grouping_records_for_project.logger")
     def test_backfill_seer_grouping_records_killswitch_enabled(self, mock_logger):
@@ -1667,7 +1269,6 @@ def test_backfill_seer_grouping_records_killswitch_enabled(self, mock_logger):
             "backfill_seer_grouping_records.killswitch_enabled",
         )
 
-    @with_feature("projects:similarity-embeddings-backfill")
     @patch("sentry.tasks.embeddings_grouping.utils.logger")
     @patch("sentry.tasks.embeddings_grouping.utils.post_bulk_grouping_records")
     def test_backfill_seer_grouping_records_enable_ingestion(
@@ -1695,7 +1296,6 @@ def test_backfill_seer_grouping_records_enable_ingestion(
         )
         assert self.project.get_option(PROJECT_BACKFILL_COMPLETED) is not None
 
-    @with_feature("projects:similarity-embeddings-backfill")
     @patch("sentry.tasks.embeddings_grouping.utils.post_bulk_grouping_records")
     def test_backfill_seer_grouping_records_no_enable_ingestion(
         self, mock_post_bulk_grouping_records
@@ -1717,7 +1317,6 @@ def test_backfill_seer_grouping_records_no_enable_ingestion(
 
         assert self.project.get_option(PROJECT_BACKFILL_COMPLETED) is None
 
-    @with_feature("projects:similarity-embeddings-backfill")
     @patch("sentry.tasks.embeddings_grouping.backfill_seer_grouping_records_for_project.logger")
     def test_backfill_seer_grouping_records_skip_project_already_processed(self, mock_logger):
         """
@@ -1753,7 +1352,6 @@ def test_backfill_seer_grouping_records_skip_project_already_processed(self, moc
         ]
         assert mock_logger.info.call_args_list == expected_call_args_list
 
-    @with_feature("projects:similarity-embeddings-backfill")
     @override_options({"similarity.backfill_total_worker_count": 1})
     @override_options({"similarity.new_project_seer_grouping.enabled": True})
     @patch("sentry.tasks.embeddings_grouping.backfill_seer_grouping_records_for_project.logger")
@@ -1820,7 +1418,6 @@ def test_backfill_seer_grouping_records_typical_backfill_request(
         assert self.project.get_option(PROJECT_BACKFILL_COMPLETED) is not None
         assert project3.get_option(PROJECT_BACKFILL_COMPLETED) is not None
 
-    @with_feature("projects:similarity-embeddings-backfill")
     @patch("sentry.tasks.embeddings_grouping.backfill_seer_grouping_records_for_project.logger")
     def test_backfill_seer_grouping_records_manually_skip_project(self, mock_logger):
         """
@@ -1857,7 +1454,6 @@ def test_backfill_seer_grouping_records_manually_skip_project(self, mock_logger)
         ]
         assert mock_logger.info.call_args_list == expected_call_args_list
 
-    @with_feature("projects:similarity-embeddings-backfill")
     @patch("sentry.tasks.embeddings_grouping.utils.logger")
     @patch("sentry.tasks.embeddings_grouping.utils.post_bulk_grouping_records")
     def test_backfill_seer_grouping_records_empty_batch(
@@ -2004,7 +1600,6 @@ def test_make_postgres_call_with_filter_invalid(self):
         assert batch_end_group_id == deleted_group.id
         assert backfill_batch_raw_length == 1
 
-    @with_feature("projects:similarity-embeddings-backfill")
     @patch("sentry.tasks.embeddings_grouping.backfill_seer_grouping_records_for_project.logger")
     @patch("sentry.seer.similarity.grouping_records.seer_grouping_connection_pool.urlopen")
     def test_backfill_seer_grouping_records_gateway_timeout(self, mock_seer_request, mock_logger):
@@ -2063,7 +1658,6 @@ def test_backfill_seer_grouping_records_gateway_timeout(self, mock_seer_request,
 
         assert mock_logger.info.call_args_list == expected_call_args_list
 
-    @with_feature("projects:similarity-embeddings-backfill")
     @patch("sentry.tasks.embeddings_grouping.backfill_seer_grouping_records_for_project.logger")
     @patch("sentry.seer.similarity.grouping_records.seer_grouping_connection_pool.urlopen")
     def test_backfill_seer_grouping_records_internal_error(self, mock_seer_request, mock_logger):
@@ -2106,7 +1700,6 @@ def test_backfill_seer_grouping_records_internal_error(self, mock_seer_request,
         assert mock_logger.info.call_args_list == expected_call_args_list
 
     @override_options({"similarity.new_project_seer_grouping.enabled": True})
-    @with_feature("projects:similarity-embeddings-backfill")
     @patch("sentry.tasks.embeddings_grouping.backfill_seer_grouping_records_for_project.logger")
     @patch("sentry.tasks.embeddings_grouping.utils.post_bulk_grouping_records")
     def test_backfill_seer_grouping_records_cohort_creation(
@@ -2214,7 +1807,6 @@ def test_backfill_seer_grouping_records_cohort_creation(
         assert mock_logger.info.call_args_list == expected_call_args_list
 
     @override_options({"similarity.new_project_seer_grouping.enabled": True})
-    @with_feature("projects:similarity-embeddings-backfill")
     @patch("sentry.tasks.embeddings_grouping.backfill_seer_grouping_records_for_project.logger")
     @patch("sentry.tasks.embeddings_grouping.utils.post_bulk_grouping_records")
     def test_backfill_seer_grouping_records_cohort_creation_not_seer_eligible(
@@ -2231,19 +1823,9 @@ def test_backfill_seer_grouping_records_cohort_creation_not_seer_eligible(
         project_same_cohort_not_eligible = self.create_project(
             organization=self.organization, id=self.project.id + thread_number
         )
-        project_same_cohort_not_eligible.platform = "not_eligible_platform"
+        project_same_cohort_not_eligible.platform = "other"  # Not currently eligible
         project_same_cohort_not_eligible.save()
-        event_same_cohort = self.store_event(
-            data={
-                "exception": EXCEPTION,
-                "title": "title",
-                "timestamp": before_now(seconds=10).isoformat(),
-            },
-            project_id=project_same_cohort_not_eligible.id,
-            assert_no_errors=False,
-        )
-        event_same_cohort.group.times_seen = 5
-        event_same_cohort.group.save()
+        self.create_event(project_same_cohort_not_eligible.id, times_seen=5)
 
         # Create one project where project_id % thread_number != worker_number
         self.create_project(organization=self.organization, id=self.project.id + 1)
@@ -2313,7 +1895,6 @@ def test_backfill_seer_grouping_records_cohort_creation_not_seer_eligible(
 
     @override_options({"similarity.new_project_seer_grouping.enabled": True})
     @override_options({"similarity.backfill_project_cohort_size": 1})
-    @with_feature("projects:similarity-embeddings-backfill")
     @patch("sentry.tasks.embeddings_grouping.backfill_seer_grouping_records_for_project.logger")
     @patch("sentry.tasks.embeddings_grouping.utils.post_bulk_grouping_records")
     def test_backfill_seer_grouping_records_cohort_creation_multiple_batches(
@@ -2419,7 +2000,6 @@ def test_backfill_seer_grouping_records_cohort_creation_multiple_batches(
 
         assert mock_logger.info.call_args_list == expected_call_args_list
 
-    @with_feature("projects:similarity-embeddings-backfill")
     @patch("sentry.tasks.embeddings_grouping.utils.post_bulk_grouping_records")
     def test_backfill_for_project_with_only_stacktrace(self, mock_post_bulk_grouping_records):
         project = self.create_project(organization=self.organization)
@@ -2440,7 +2020,6 @@ def test_backfill_for_project_with_only_stacktrace(self, mock_post_bulk_grouping
             "request_hash": ANY,
         }
 
-    @with_feature("projects:similarity-embeddings-backfill")
     @patch("sentry.tasks.embeddings_grouping.utils.post_bulk_grouping_records")
     def test_backfill_for_project_with_threads_stacktrace(self, mock_post_bulk_grouping_records):
         project = self.create_project(organization=self.organization)
diff --git a/tests/sentry/tasks/test_on_demand_metrics.py b/tests/sentry/tasks/test_on_demand_metrics.py
index d51bf6a63b3d75..1c252e94dc5e3f 100644
--- a/tests/sentry/tasks/test_on_demand_metrics.py
+++ b/tests/sentry/tasks/test_on_demand_metrics.py
@@ -454,7 +454,6 @@ def test_schedule_on_demand_check(
         ),  # Only 2 widgets are on-demand
     ],
 )
-@mock.patch("sentry.tasks.on_demand_metrics._set_cardinality_cache")
 @mock.patch("sentry.search.events.builder.base.raw_snql_query")
 @pytest.mark.parametrize(
     "widget_type", [DashboardWidgetTypes.DISCOVER, DashboardWidgetTypes.TRANSACTION_LIKE]
@@ -462,7 +461,6 @@ def test_schedule_on_demand_check(
 @django_db_all
 def test_process_widget_specs(
     raw_snql_query: Any,
-    _set_cardinality_cache: Any,
     feature_flags: dict[str, bool],
     option_enable: bool,
     widget_query_ids: Sequence[int],
diff --git a/tests/sentry/tasks/test_relay.py b/tests/sentry/tasks/test_relay.py
index 15534c5f74308b..6948b794235633 100644
--- a/tests/sentry/tasks/test_relay.py
+++ b/tests/sentry/tasks/test_relay.py
@@ -7,7 +7,6 @@
 
 from sentry.db.postgres.transactions import in_test_hide_transaction_boundary
 from sentry.models.options.project_option import ProjectOption
-from sentry.models.project import Project
 from sentry.models.projectkey import ProjectKey, ProjectKeyStatus
 from sentry.relay.projectconfig_cache.redis import RedisProjectConfigCache
 from sentry.relay.projectconfig_debounce_cache.redis import RedisProjectConfigDebounceCache
@@ -28,15 +27,6 @@ def _cache_keys_for_project(project):
         yield key.public_key
 
 
-def _cache_keys_for_org(org):
-    # The `ProjectKey` model doesn't have any attribute we can use to filter by
-    # org, and the `Project` model doesn't have a project key exposed. So using
-    # the org we fetch the project, and then the project key.
-    for proj in Project.objects.filter(organization_id=org.id):
-        for key in ProjectKey.objects.filter(project_id=proj.id):
-            yield key.public_key
-
-
 @pytest.fixture(autouse=True)
 def disable_auto_on_commit():
     simulated_transaction_watermarks.state["default"] = -1
diff --git a/tests/sentry/tasks/test_relocation.py b/tests/sentry/tasks/test_relocation.py
index 1304e4c71238a1..f2b47af09bb1f8 100644
--- a/tests/sentry/tasks/test_relocation.py
+++ b/tests/sentry/tasks/test_relocation.py
@@ -2192,7 +2192,7 @@ def setUp(self):
 
     @staticmethod
     def noop_relocated_signal_receiver(sender, **kwargs) -> None:
-        pass
+        raise NotImplementedError
 
     def test_success(
         self,
diff --git a/tests/sentry/tasks/test_reprocessing2.py b/tests/sentry/tasks/test_reprocessing2.py
index 3b59699a829bc9..fab5254166873c 100644
--- a/tests/sentry/tasks/test_reprocessing2.py
+++ b/tests/sentry/tasks/test_reprocessing2.py
@@ -351,7 +351,7 @@ def event_preprocessor(data):
                     != group_id
                 )
             else:
-                raise ValueError(remaining_events)
+                raise AssertionError(remaining_events)
         else:
             assert event is not None
             assert event.group_id != group_id
@@ -367,7 +367,7 @@ def event_preprocessor(data):
         assert event.group is not None
         assert event.group.times_seen == 5
     else:
-        raise ValueError(remaining_events)
+        raise AssertionError(remaining_events)
 
     assert is_group_finished(group_id)
 
diff --git a/tests/sentry/tasks/test_statistical_detectors.py b/tests/sentry/tasks/test_statistical_detectors.py
index 0f72a08aa41f24..f093662c80b4b4 100644
--- a/tests/sentry/tasks/test_statistical_detectors.py
+++ b/tests/sentry/tasks/test_statistical_detectors.py
@@ -274,6 +274,10 @@ def test_detect_function_trends_query_timerange(functions_query, timestamp, proj
     assert params.end == datetime(2023, 8, 1, 11, 1, tzinfo=UTC)
 
 
+@pytest.mark.parametrize(
+    ["count", "should_emit"],
+    [(100, True), (10, False)],
+)
 @mock.patch("sentry.tasks.statistical_detectors.query_transactions")
 @mock.patch("sentry.tasks.statistical_detectors.detect_transaction_change_points")
 @django_db_all
@@ -282,6 +286,8 @@ def test_detect_transaction_trends(
     query_transactions,
     timestamp,
     project,
+    count,
+    should_emit,
 ):
     n = 50
     timestamps = [timestamp - timedelta(hours=n - i) for i in range(n)]
@@ -292,7 +298,7 @@ def test_detect_transaction_trends(
                 project_id=project.id,
                 group="/123",
                 fingerprint="/123",
-                count=100,
+                count=count,
                 value=100 if i < n / 2 else 300,
                 timestamp=ts,
             ),
@@ -307,7 +313,11 @@ def test_detect_transaction_trends(
     with override_options(options):
         for ts in timestamps:
             detect_transaction_trends([project.organization.id], [project.id], ts)
-    assert detect_transaction_change_points.apply_async.called
+
+    if should_emit:
+        assert detect_transaction_change_points.apply_async.called
+    else:
+        assert not detect_transaction_change_points.apply_async.called
 
 
 @mock.patch("sentry.issues.status_change_message.uuid4", return_value=uuid.UUID(int=0))
@@ -725,6 +735,10 @@ def mock_regressions():
         assert regressions == []
 
 
+@pytest.mark.parametrize(
+    ["count", "should_emit"],
+    [(100, True), (10, False)],
+)
 @mock.patch("sentry.tasks.statistical_detectors.query_functions")
 @mock.patch("sentry.tasks.statistical_detectors.detect_function_change_points")
 @django_db_all
@@ -733,6 +747,8 @@ def test_detect_function_trends(
     query_functions,
     timestamp,
     project,
+    count,
+    should_emit,
 ):
     n = 50
     timestamps = [timestamp - timedelta(hours=n - i) for i in range(n)]
@@ -743,7 +759,7 @@ def test_detect_function_trends(
                 project_id=project.id,
                 group=123,
                 fingerprint=f"{123:x}",
-                count=100,
+                count=count,
                 value=100 if i < n / 2 else 300,
                 timestamp=ts,
             ),
@@ -758,7 +774,11 @@ def test_detect_function_trends(
     with override_options(options):
         for ts in timestamps:
             detect_function_trends([project.id], ts)
-    assert detect_function_change_points.apply_async.called
+
+    if should_emit:
+        assert detect_function_change_points.apply_async.called
+    else:
+        assert not detect_function_change_points.apply_async.called
 
 
 @mock.patch("sentry.tasks.statistical_detectors.functions.query")
diff --git a/tests/sentry/tasks/test_store.py b/tests/sentry/tasks/test_store.py
index 48544658436c94..4d434c1ba947e2 100644
--- a/tests/sentry/tasks/test_store.py
+++ b/tests/sentry/tasks/test_store.py
@@ -87,12 +87,6 @@ def mock_refund():
         yield m
 
 
-@pytest.fixture
-def mock_metrics_timing():
-    with mock.patch("sentry.tasks.store.metrics.timing") as m:
-        yield m
-
-
 @django_db_all
 def test_move_to_process_event(
     default_project, mock_process_event, mock_save_event, mock_symbolicate_event, register_plugin
@@ -242,7 +236,7 @@ def options_model(request, default_organization, default_project):
     elif request.param == "project":
         return default_project
     else:
-        raise ValueError(request.param)
+        raise AssertionError(request.param)
 
 
 @django_db_all
@@ -278,7 +272,7 @@ def is_enabled(self, project=None):
             "sentry:relay_pii_config", '{"applications": {"extra.ooo": ["@anything:replace"]}}'
         )
     else:
-        raise ValueError(setting_method)
+        raise AssertionError(setting_method)
 
     data = {
         "project": default_project.id,
diff --git a/tests/sentry/tasks/test_symbolication.py b/tests/sentry/tasks/test_symbolication.py
index db2f395858b7c8..96cc42805c0a96 100644
--- a/tests/sentry/tasks/test_symbolication.py
+++ b/tests/sentry/tasks/test_symbolication.py
@@ -3,7 +3,7 @@
 import pytest
 
 from sentry.tasks.store import preprocess_event
-from sentry.tasks.symbolication import submit_symbolicate, symbolicate_event
+from sentry.tasks.symbolication import symbolicate_event
 from sentry.testutils.pytest.fixtures import django_db_all
 
 EVENT_ID = "cc3e6c2bb6b6498097f336d1e6979f4b"
@@ -39,12 +39,6 @@ def mock_event_processing_store():
         yield m
 
 
-@pytest.fixture
-def mock_submit_symbolicate():
-    with mock.patch("sentry.tasks.symbolication.submit_symbolicate", wraps=submit_symbolicate) as m:
-        yield m
-
-
 @django_db_all
 def test_move_to_symbolicate_event(
     default_project, mock_process_event, mock_save_event, mock_symbolicate_event
diff --git a/tests/sentry/taskworker/test_client.py b/tests/sentry/taskworker/test_client.py
index ed2dae3240aedd..182d27b0940018 100644
--- a/tests/sentry/taskworker/test_client.py
+++ b/tests/sentry/taskworker/test_client.py
@@ -8,6 +8,7 @@
 from google.protobuf.message import Message
 from sentry_protos.sentry.v1.taskworker_pb2 import (
     TASK_ACTIVATION_STATUS_RETRY,
+    FetchNextTask,
     GetTaskResponse,
     SetTaskStatusResponse,
     TaskActivation,
@@ -97,6 +98,31 @@ def test_get_task_ok():
         assert result.namespace == "testing"
 
 
+def test_get_task_with_namespace():
+    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(namespace="testing")
+
+        assert result
+        assert result.id
+        assert result.namespace == "testing"
+
+
 def test_get_task_not_found():
     channel = MockChannel()
     channel.add_response(
@@ -142,11 +168,39 @@ def test_update_task_ok_with_next():
     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)
+        result = client.update_task(
+            "abc123", TASK_ACTIVATION_STATUS_RETRY, FetchNextTask(namespace=None)
+        )
         assert result
         assert result.id == "abc123"
 
 
+def test_update_task_ok_with_next_namespace():
+    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, FetchNextTask(namespace="testing")
+        )
+        assert result
+        assert result.id == "abc123"
+        assert result.namespace == "testing"
+
+
 def test_update_task_ok_no_next():
     channel = MockChannel()
     channel.add_response(
@@ -155,7 +209,9 @@ def test_update_task_ok_no_next():
     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)
+        result = client.update_task(
+            "abc123", TASK_ACTIVATION_STATUS_RETRY, FetchNextTask(namespace=None)
+        )
         assert result is None
 
 
@@ -168,5 +224,7 @@ def test_update_task_not_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)
+        result = client.update_task(
+            "abc123", TASK_ACTIVATION_STATUS_RETRY, FetchNextTask(namespace=None)
+        )
         assert result is None
diff --git a/tests/sentry/taskworker/test_registry.py b/tests/sentry/taskworker/test_registry.py
index 6a0e8bbd3dc061..d100441492b87e 100644
--- a/tests/sentry/taskworker/test_registry.py
+++ b/tests/sentry/taskworker/test_registry.py
@@ -1,4 +1,3 @@
-import logging
 from unittest.mock import patch
 
 import pytest
@@ -19,7 +18,7 @@ def test_namespace_register_task() -> None:
 
     @namespace.register(name="tests.simple_task")
     def simple_task():
-        logging.info("simple_task")
+        raise NotImplementedError
 
     assert namespace.default_retry is None
     assert namespace.contains("tests.simple_task")
@@ -39,20 +38,20 @@ def test_namespace_register_inherits_default_retry() -> None:
 
     @namespace.register(name="test.no_retry_param")
     def no_retry_param() -> None:
-        pass
+        raise NotImplementedError
 
     retry = Retry(times=2, times_exceeded=LastAction.Deadletter)
 
     @namespace.register(name="test.with_retry_param", retry=retry)
     def with_retry_param() -> None:
-        pass
+        raise NotImplementedError
 
     with_retry = namespace.get("test.with_retry_param")
     assert with_retry.retry == retry
 
     @namespace.register(name="test.retry_none", retry=None)
     def retry_none_param() -> None:
-        pass
+        raise NotImplementedError
 
     with_retry = namespace.get("test.retry_none")
     assert with_retry.retry == namespace.default_retry
@@ -69,11 +68,11 @@ def test_register_inherits_default_expires_processing_deadline() -> None:
 
     @namespace.register(name="test.no_expires")
     def no_expires() -> None:
-        pass
+        raise NotImplementedError
 
     @namespace.register(name="test.with_expires", expires=30 * 60, processing_deadline_duration=10)
     def with_expires() -> None:
-        pass
+        raise NotImplementedError
 
     no_expires_task = namespace.get("test.no_expires")
     activation = no_expires_task.create_activation()
@@ -107,7 +106,7 @@ def test_namespace_send_task_no_retry() -> None:
 
     @namespace.register(name="test.simpletask")
     def simple_task() -> None:
-        pass
+        raise NotImplementedError
 
     activation = simple_task.create_activation()
     assert activation.retry_state.attempts == 0
@@ -136,7 +135,7 @@ def test_namespace_send_task_with_retry() -> None:
         name="test.simpletask", retry=Retry(times=3, times_exceeded=LastAction.Deadletter)
     )
     def simple_task() -> None:
-        pass
+        raise NotImplementedError
 
     activation = simple_task.create_activation()
     assert activation.retry_state.attempts == 0
@@ -161,7 +160,7 @@ def test_namespace_with_retry_send_task() -> None:
 
     @namespace.register(name="test.simpletask")
     def simple_task() -> None:
-        pass
+        raise NotImplementedError
 
     activation = simple_task.create_activation()
     assert activation.retry_state.attempts == 0
@@ -201,7 +200,7 @@ def test_registry_get_task() -> None:
 
     @ns.register(name="test.simpletask")
     def simple_task() -> None:
-        pass
+        raise NotImplementedError
 
     task = registry.get_task(ns.name, "test.simpletask")
     assert isinstance(task, Task)
diff --git a/tests/sentry/taskworker/test_task.py b/tests/sentry/taskworker/test_task.py
index 374d0221cf2814..1d4d9aeac8be86 100644
--- a/tests/sentry/taskworker/test_task.py
+++ b/tests/sentry/taskworker/test_task.py
@@ -1,7 +1,7 @@
 import datetime
-import logging
 
 import pytest
+import sentry_sdk
 
 from sentry.conf.types.kafka_definition import Topic
 from sentry.taskworker.registry import TaskNamespace
@@ -12,7 +12,7 @@
 
 
 def do_things() -> None:
-    logging.info("Ran do_things")
+    raise NotImplementedError
 
 
 @pytest.fixture
@@ -167,10 +167,23 @@ def test_create_activation(task_namespace: TaskNamespace) -> None:
 def test_create_activation_parameters(task_namespace: TaskNamespace) -> None:
     @task_namespace.register(name="test.parameters")
     def with_parameters(one: str, two: int, org_id: int) -> None:
-        pass
+        raise NotImplementedError
 
     activation = with_parameters.create_activation("one", 22, org_id=99)
     params = json.loads(activation.parameters)
     assert params["args"]
     assert params["args"] == ["one", 22]
     assert params["kwargs"] == {"org_id": 99}
+
+
+def test_create_activation_tracing(task_namespace: TaskNamespace) -> None:
+    @task_namespace.register(name="test.parameters")
+    def with_parameters(one: str, two: int, org_id: int) -> None:
+        raise NotImplementedError
+
+    with sentry_sdk.start_transaction(op="test.task"):
+        activation = with_parameters.create_activation("one", 22, org_id=99)
+
+    headers = activation.headers
+    assert headers["sentry-trace"]
+    assert "baggage" in headers
diff --git a/tests/sentry/taskworker/test_worker.py b/tests/sentry/taskworker/test_worker.py
index e7d9c11eeeddfc..5d174958e6c1de 100644
--- a/tests/sentry/taskworker/test_worker.py
+++ b/tests/sentry/taskworker/test_worker.py
@@ -1,66 +1,39 @@
 from unittest import mock
 
-from django.test import override_settings
 from sentry_protos.sentry.v1.taskworker_pb2 import (
     TASK_ACTIVATION_STATUS_COMPLETE,
     TASK_ACTIVATION_STATUS_FAILURE,
     TASK_ACTIVATION_STATUS_RETRY,
+    FetchNextTask,
     TaskActivation,
 )
 
-from sentry.taskworker.registry import taskregistry
-from sentry.taskworker.retry import Retry, RetryError
+import sentry.taskworker.tasks.examples as example_tasks
 from sentry.taskworker.worker import TaskWorker
 from sentry.testutils.cases import TestCase
 
-test_namespace = taskregistry.create_namespace(
-    name="tests",
-    retry=Retry(times=2),
-)
-
-
-@test_namespace.register(name="test.simple_task")
-def simple_task():
-    pass
-
-
-@test_namespace.register(name="test.retry_task")
-def retry_task():
-    raise RetryError
-
-
-@test_namespace.register(name="test.fail_task")
-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",
-    namespace="tests",
+    taskname="examples.simple_task",
+    namespace="examples",
     parameters='{"args": [], "kwargs": {}}',
-    processing_deadline_duration=1,
+    processing_deadline_duration=2,
 )
 
 RETRY_TASK = TaskActivation(
     id="222",
-    taskname="test.retry_task",
-    namespace="tests",
+    taskname="examples.retry_task",
+    namespace="examples",
     parameters='{"args": [], "kwargs": {}}',
-    processing_deadline_duration=1,
+    processing_deadline_duration=2,
 )
 
 FAIL_TASK = TaskActivation(
     id="333",
-    taskname="test.fail_task",
-    namespace="tests",
+    taskname="examples.fail_task",
+    namespace="examples",
     parameters='{"args": [], "kwargs": {}}',
-    processing_deadline_duration=1,
+    processing_deadline_duration=2,
 )
 
 UNDEFINED_TASK = TaskActivation(
@@ -68,20 +41,24 @@ def at_most_once_task():
     taskname="total.rubbish",
     namespace="lolnope",
     parameters='{"args": [], "kwargs": {}}',
-    processing_deadline_duration=1,
+    processing_deadline_duration=2,
 )
 
 AT_MOST_ONCE_TASK = TaskActivation(
     id="555",
-    taskname="test.at_most_once",
-    namespace="tests",
+    taskname="examples.at_most_once",
+    namespace="examples",
     parameters='{"args": [], "kwargs": {}}',
-    processing_deadline_duration=1,
+    processing_deadline_duration=2,
 )
 
 
-@override_settings(TASKWORKER_IMPORTS=("tests.sentry.taskworker.test_worker",))
 class TestTaskWorker(TestCase):
+    def test_tasks_exist(self) -> None:
+        assert example_tasks.simple_task
+        assert example_tasks.retry_task
+        assert example_tasks.at_most_once_task
+
     def test_fetch_task(self) -> None:
         taskworker = TaskWorker(rpc_host="127.0.0.1:50051", max_task_count=100)
         with mock.patch.object(taskworker.client, "get_task") as mock_get:
@@ -110,7 +87,9 @@ def test_process_task_complete(self) -> None:
             result = taskworker.process_task(SIMPLE_TASK)
 
             mock_update.assert_called_with(
-                task_id=SIMPLE_TASK.id, status=TASK_ACTIVATION_STATUS_COMPLETE
+                task_id=SIMPLE_TASK.id,
+                status=TASK_ACTIVATION_STATUS_COMPLETE,
+                fetch_next_task=FetchNextTask(namespace=None),
             )
 
             assert result
@@ -123,7 +102,9 @@ def test_process_task_retry(self) -> None:
             result = taskworker.process_task(RETRY_TASK)
 
             mock_update.assert_called_with(
-                task_id=RETRY_TASK.id, status=TASK_ACTIVATION_STATUS_RETRY
+                task_id=RETRY_TASK.id,
+                status=TASK_ACTIVATION_STATUS_RETRY,
+                fetch_next_task=FetchNextTask(namespace=None),
             )
 
             assert result
@@ -136,7 +117,9 @@ def test_process_task_failure(self) -> None:
             result = taskworker.process_task(FAIL_TASK)
 
             mock_update.assert_called_with(
-                task_id=FAIL_TASK.id, status=TASK_ACTIVATION_STATUS_FAILURE
+                task_id=FAIL_TASK.id,
+                status=TASK_ACTIVATION_STATUS_FAILURE,
+                fetch_next_task=FetchNextTask(namespace=None),
             )
             assert result
             assert result.id == SIMPLE_TASK.id
@@ -148,7 +131,9 @@ def test_process_task_at_most_once(self) -> None:
             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
+                task_id=AT_MOST_ONCE_TASK.id,
+                status=TASK_ACTIVATION_STATUS_COMPLETE,
+                fetch_next_task=FetchNextTask(namespace=None),
             )
         assert taskworker.process_task(AT_MOST_ONCE_TASK) is None
         assert result
@@ -169,7 +154,9 @@ def test_start_max_task_count(self) -> None:
             assert result == 0
             assert mock_client.get_task.called
             mock_client.update_task.assert_called_with(
-                task_id=SIMPLE_TASK.id, status=TASK_ACTIVATION_STATUS_COMPLETE
+                task_id=SIMPLE_TASK.id,
+                status=TASK_ACTIVATION_STATUS_COMPLETE,
+                fetch_next_task=FetchNextTask(namespace=None),
             )
 
     def test_start_loop(self) -> None:
@@ -188,10 +175,14 @@ def test_start_loop(self) -> None:
             assert mock_client.update_task.call_count == 2
 
             mock_client.update_task.assert_any_call(
-                task_id=SIMPLE_TASK.id, status=TASK_ACTIVATION_STATUS_COMPLETE
+                task_id=SIMPLE_TASK.id,
+                status=TASK_ACTIVATION_STATUS_COMPLETE,
+                fetch_next_task=FetchNextTask(namespace=None),
             )
             mock_client.update_task.assert_any_call(
-                task_id=RETRY_TASK.id, status=TASK_ACTIVATION_STATUS_RETRY
+                task_id=RETRY_TASK.id,
+                status=TASK_ACTIVATION_STATUS_RETRY,
+                fetch_next_task=FetchNextTask(namespace=None),
             )
 
     def test_start_keyboard_interrupt(self) -> None:
@@ -210,5 +201,7 @@ def test_start_unknown_task(self) -> None:
             result = taskworker.start()
             assert result == 0, "Exit zero, all tasks complete"
             mock_client.update_task.assert_any_call(
-                task_id=UNDEFINED_TASK.id, status=TASK_ACTIVATION_STATUS_FAILURE
+                task_id=UNDEFINED_TASK.id,
+                status=TASK_ACTIVATION_STATUS_FAILURE,
+                fetch_next_task=FetchNextTask(namespace=None),
             )
diff --git a/tests/sentry/tempest/endpoints/test_tempest_credentials.py b/tests/sentry/tempest/endpoints/test_tempest_credentials.py
new file mode 100644
index 00000000000000..d193702d52a225
--- /dev/null
+++ b/tests/sentry/tempest/endpoints/test_tempest_credentials.py
@@ -0,0 +1,131 @@
+from sentry.tempest.models import TempestCredentials
+from sentry.testutils.cases import APITestCase
+from sentry.testutils.helpers.features import Feature
+
+
+class TestTempestCredentials(APITestCase):
+    endpoint = "sentry-api-0-project-tempest-credentials"
+
+    valid_credentials_data = {"clientId": "test", "clientSecret": "test"}
+
+    def test_get_tempest_credentials(self):
+        with Feature({"organizations:tempest-access": True}):
+            credentials = [self.create_tempest_credentials(self.project) for _ in range(5)]
+
+            other_project = self.create_project(organization=self.organization)
+            # credentials connected to other project which should not be included in the response
+            for _ in range(5):
+                self.create_tempest_credentials(other_project)
+
+            self.login_as(self.user)
+            response = self.get_success_response(self.project.organization.slug, self.project.slug)
+
+            assert len(response.data) == 5
+            assert {cred.id for cred in credentials} == {item["id"] for item in response.data}
+
+    def test_endpoint_returns_404_if_feature_flag_is_disabled(self):
+        self.login_as(self.user)
+        response = self.get_response(self.project.organization.slug, self.project.slug)
+        assert response.status_code == 404
+
+    def test_client_secret_is_obfuscated(self):
+        with Feature({"organizations:tempest-access": True}):
+            credentials = self.create_tempest_credentials(self.project)
+            self.login_as(self.user)
+            response = self.get_success_response(self.project.organization.slug, self.project.slug)
+            assert response.data[0]["clientSecret"] == "*" * len(credentials.client_secret)
+
+    def test_unauthenticated_user_cant_access_endpoint(self):
+        self.get_error_response(self.project.organization.slug, self.project.slug)
+
+    def test_create_tempest_credentials(self):
+        with Feature({"organizations:tempest-access": True}):
+            self.login_as(self.user)
+            response = self.get_success_response(
+                self.project.organization.slug,
+                self.project.slug,
+                method="POST",
+                **self.valid_credentials_data,
+            )
+            assert response.status_code == 201
+            creds_obj = TempestCredentials.objects.get(project=self.project)
+            assert creds_obj.client_id == self.valid_credentials_data["clientId"]
+            assert creds_obj.client_secret == self.valid_credentials_data["clientSecret"]
+            assert creds_obj.project == self.project
+            assert creds_obj.created_by_id == self.user.id
+
+    def test_create_tempest_credentials_without_feature_flag(self):
+        self.login_as(self.user)
+        response = self.get_error_response(
+            self.project.organization.slug,
+            self.project.slug,
+            method="POST",
+            **self.valid_credentials_data,
+        )
+        assert response.status_code == 404
+
+    def test_create_tempest_credentials_as_unauthenticated_user(self):
+        response = self.get_error_response(
+            self.project.organization.slug,
+            self.project.slug,
+            method="POST",
+            **self.valid_credentials_data,
+        )
+        assert response.status_code == 401
+
+    def test_non_admin_cant_create_tempest_credentials(self):
+        non_admin_user = self.create_user()
+        self.create_member(
+            user=non_admin_user, organization=self.project.organization, role="member"
+        )
+        with Feature({"organizations:tempest-access": True}):
+            self.login_as(non_admin_user)
+            response = self.get_error_response(
+                self.project.organization.slug,
+                self.project.slug,
+                method="POST",
+                **self.valid_credentials_data,
+            )
+            assert response.status_code == 403
+
+    def test_create_tempest_credentials_with_invalid_data(self):
+        with Feature({"organizations:tempest-access": True}):
+            self.login_as(self.user)
+            response = self.get_error_response(
+                self.project.organization.slug,
+                self.project.slug,
+                method="POST",
+                **{"clientId": "test"},
+            )
+            assert response.status_code == 400
+
+            response2 = self.get_error_response(
+                self.project.organization.slug,
+                self.project.slug,
+                method="POST",
+                **{"clientSecret": "test"},
+            )
+            assert response2.status_code == 400
+
+    def test_cant_create_tempest_credentials_with_duplicate_client_id(self):
+        with Feature({"organizations:tempest-access": True}):
+            self.login_as(self.user)
+            self.create_tempest_credentials(
+                self.project, client_id=self.valid_credentials_data["clientId"]
+            )
+            response = self.get_error_response(
+                self.project.organization.slug,
+                self.project.slug,
+                method="POST",
+                **self.valid_credentials_data,
+            )
+            # database constraint violation
+            assert response.status_code == 400
+            assert response.data["detail"] == "A credential with this client ID already exists."
+
+    def test_user_email_in_response(self):
+        with Feature({"organizations:tempest-access": True}):
+            self.login_as(self.user)
+            self.create_tempest_credentials(self.project, created_by=self.user)
+            response = self.get_success_response(self.project.organization.slug, self.project.slug)
+            assert response.data[0]["createdByEmail"] == self.user.email
diff --git a/tests/sentry/tempest/endpoints/test_tempest_credentials_details.py b/tests/sentry/tempest/endpoints/test_tempest_credentials_details.py
new file mode 100644
index 00000000000000..953c8e445b379b
--- /dev/null
+++ b/tests/sentry/tempest/endpoints/test_tempest_credentials_details.py
@@ -0,0 +1,60 @@
+from sentry.tempest.models import TempestCredentials
+from sentry.testutils.cases import APITestCase
+from sentry.testutils.helpers.features import Feature
+
+
+class TestTempestCredentialsDetails(APITestCase):
+    endpoint = "sentry-api-0-project-tempest-credentials-details"
+
+    def setUp(self):
+        super().setUp()
+        self.tempest_credentials = self.create_tempest_credentials(self.project)
+
+    def test_cant_access_endpoint_if_feature_flag_is_disabled(self):
+        self.login_as(self.user)
+        response = self.get_response(
+            self.project.organization.slug,
+            self.project.slug,
+            self.tempest_credentials.id,
+            method="DELETE",
+        )
+        assert response.status_code == 404
+
+    def test_cant_access_endpoint_if_user_is_not_authenticated(self):
+        response = self.get_response(
+            self.project.organization.slug,
+            self.project.slug,
+            self.tempest_credentials.id,
+            method="DELETE",
+        )
+        assert response.status_code == 401
+
+    def test_delete_tempest_credentials_as_org_admin(self):
+        with Feature({"organizations:tempest-access": True}):
+            self.login_as(self.user)
+            response = self.get_response(
+                self.project.organization.slug,
+                self.project.slug,
+                self.tempest_credentials.id,
+                method="DELETE",
+            )
+
+        assert response.status_code == 204
+        assert not TempestCredentials.objects.filter(id=self.tempest_credentials.id).exists()
+
+    def test_non_admin_cant_delete_credentials(self):
+        non_admin_user = self.create_user()
+        self.create_member(
+            user=non_admin_user, organization=self.project.organization, role="member"
+        )
+        with Feature({"organizations:tempest-access": True}):
+            self.login_as(non_admin_user)
+            response = self.get_response(
+                self.project.organization.slug,
+                self.project.slug,
+                self.tempest_credentials.id,
+                method="DELETE",
+            )
+
+        assert response.status_code == 403
+        assert TempestCredentials.objects.filter(id=self.tempest_credentials.id).exists()
diff --git a/tests/sentry/testutils/pytest/mocking/animals/__init__.py b/tests/sentry/testutils/pytest/mocking/animals/__init__.py
index 447e3a91618d2d..c5ed42be2b0aba 100644
--- a/tests/sentry/testutils/pytest/mocking/animals/__init__.py
+++ b/tests/sentry/testutils/pytest/mocking/animals/__init__.py
@@ -24,4 +24,4 @@ def a_function_that_calls_erroring_get_dog():
     except TypeError:
         return "Well, we tried."
 
-    return "We shouldn't ever get here"
+    raise AssertionError("We shouldn't ever get here")
diff --git a/tests/sentry/toolbar/views/test_login_success_view.py b/tests/sentry/toolbar/views/test_login_success_view.py
index 738b8952ad9f37..00fc647ca4a1bb 100644
--- a/tests/sentry/toolbar/views/test_login_success_view.py
+++ b/tests/sentry/toolbar/views/test_login_success_view.py
@@ -14,10 +14,7 @@ def setUp(self):
         # Note no login
 
     def test_get_requires_auth(self):
-        """
-        Unauthenticated requests should redirect to /auth/login.
-        Similar to self.assertRequiresAuthentication, which is outdated.
-        """
+        """Unauthenticated requests should redirect to /auth/login."""
         res = self.client.get(self.url)
         assert res.status_code == 302
         assert reverse("sentry-login") in res["Location"]
diff --git a/tests/sentry/uptime/consumers/test_results_consumers.py b/tests/sentry/uptime/consumers/test_results_consumer.py
similarity index 74%
rename from tests/sentry/uptime/consumers/test_results_consumers.py
rename to tests/sentry/uptime/consumers/test_results_consumer.py
index b498603d3468ac..16379544e33d85 100644
--- a/tests/sentry/uptime/consumers/test_results_consumers.py
+++ b/tests/sentry/uptime/consumers/test_results_consumer.py
@@ -7,7 +7,9 @@
 import pytest
 from arroyo import Message
 from arroyo.backends.kafka import KafkaPayload
+from arroyo.processing.strategies import ProcessingStrategy
 from arroyo.types import BrokerValue, Partition, Topic
+from django.test import override_settings
 from sentry_kafka_schemas.schema_types.uptime_results_v1 import (
     CHECKSTATUS_FAILURE,
     CHECKSTATUS_MISSED_WINDOW,
@@ -17,6 +19,8 @@
 )
 
 from sentry.conf.types import kafka_definition
+from sentry.conf.types.kafka_definition import Topic as KafkaTopic
+from sentry.conf.types.uptime import UptimeRegionConfig
 from sentry.issues.grouptype import UptimeDomainCheckFailure
 from sentry.models.group import Group, GroupStatus
 from sentry.testutils.helpers.options import override_options
@@ -50,7 +54,9 @@ def setUp(self):
             owner=self.user,
         )
 
-    def send_result(self, result: CheckResult):
+    def send_result(
+        self, result: CheckResult, consumer: ProcessingStrategy[KafkaPayload] | None = None
+    ):
         codec = kafka_definition.get_topic_codec(kafka_definition.Topic.UPTIME_RESULTS)
         message = Message(
             BrokerValue(
@@ -61,10 +67,11 @@ def send_result(self, result: CheckResult):
             )
         )
         with self.feature(UptimeDomainCheckFailure.build_ingest_feature_name()):
-            factory = UptimeResultsStrategyFactory()
-            commit = mock.Mock()
+            if consumer is None:
+                factory = UptimeResultsStrategyFactory()
+                commit = mock.Mock()
+                consumer = factory.create_with_partitions(commit, {self.partition: 0})
 
-            consumer = factory.create_with_partitions(commit, {self.partition: 0})
             consumer.submit(message)
 
     def test(self):
@@ -375,7 +382,7 @@ def test_no_subscription(self):
             metrics.incr.assert_has_calls(
                 [call("uptime.result_processor.subscription_not_found", sample_rate=1.0)]
             )
-            self.assert_producer_calls(subscription_id)
+            self.assert_producer_calls((subscription_id, kafka_definition.Topic.UPTIME_CONFIGS))
 
     def test_skip_already_processed(self):
         result = self.create_uptime_result(self.subscription.subscription_id)
@@ -607,3 +614,194 @@ def test_onboarding_success_graduate(self):
             AUTO_DETECTED_ACTIVE_SUBSCRIPTION_INTERVAL.total_seconds()
         )
         assert uptime_subscription.url == new_uptime_subscription.url
+
+    def test_parallel(self) -> None:
+        """
+        Validates that the consumer in parallel mode correctly groups check-ins
+        into groups by their monitor slug / environment
+        """
+
+        factory = UptimeResultsStrategyFactory(mode="parallel", max_batch_size=3, max_workers=1)
+        consumer = factory.create_with_partitions(mock.Mock(), {self.partition: 0})
+        with mock.patch.object(type(factory.result_processor), "__call__") as mock_processor_call:
+            subscription_2 = self.create_uptime_subscription(
+                subscription_id=uuid.uuid4().hex, interval_seconds=300, url="http://santry.io"
+            )
+
+            result_1 = self.create_uptime_result(
+                self.subscription.subscription_id,
+                scheduled_check_time=datetime.now() - timedelta(minutes=5),
+            )
+
+            self.send_result(result_1, consumer=consumer)
+            result_2 = self.create_uptime_result(
+                self.subscription.subscription_id,
+                scheduled_check_time=datetime.now() - timedelta(minutes=4),
+            )
+
+            self.send_result(result_2, consumer=consumer)
+            # This will fill the batch
+            result_3 = self.create_uptime_result(
+                subscription_2.subscription_id,
+                scheduled_check_time=datetime.now() - timedelta(minutes=4),
+            )
+            self.send_result(result_3, consumer=consumer)
+            # Should be no calls yet, since we didn't send the batch
+            assert mock_processor_call.call_count == 0
+            # One more causes the previous batch to send
+            self.send_result(
+                self.create_uptime_result(
+                    subscription_2.subscription_id,
+                    scheduled_check_time=datetime.now() - timedelta(minutes=3),
+                ),
+                consumer=consumer,
+            )
+
+            assert mock_processor_call.call_count == 3
+            mock_processor_call.assert_has_calls([call(result_1), call(result_2), call(result_3)])
+
+    @mock.patch(
+        "sentry.remote_subscriptions.consumers.result_consumer.ResultsStrategyFactory.process_group"
+    )
+    def test_parallel_grouping(self, mock_process_group) -> None:
+        """
+        Validates that the consumer in parallel mode correctly groups check-ins
+        into groups by their monitor slug / environment
+        """
+
+        factory = UptimeResultsStrategyFactory(mode="parallel", max_batch_size=3, max_workers=1)
+        consumer = factory.create_with_partitions(mock.Mock(), {self.partition: 0})
+        subscription_2 = self.create_uptime_subscription(
+            subscription_id=uuid.uuid4().hex, interval_seconds=300, url="http://santry.io"
+        )
+
+        result_1 = self.create_uptime_result(
+            self.subscription.subscription_id,
+            scheduled_check_time=datetime.now() - timedelta(minutes=5),
+        )
+
+        self.send_result(result_1, consumer=consumer)
+        result_2 = self.create_uptime_result(
+            self.subscription.subscription_id,
+            scheduled_check_time=datetime.now() - timedelta(minutes=4),
+        )
+
+        self.send_result(result_2, consumer=consumer)
+        # This will fill the batch
+        result_3 = self.create_uptime_result(
+            subscription_2.subscription_id,
+            scheduled_check_time=datetime.now() - timedelta(minutes=4),
+        )
+        self.send_result(result_3, consumer=consumer)
+        # Should be no calls yet, since we didn't send the batch
+        assert mock_process_group.call_count == 0
+        # One more causes the previous batch to send
+        self.send_result(result_3, consumer=consumer)
+        assert mock_process_group.call_count == 2
+        group_1 = mock_process_group.mock_calls[0].args[0]
+        group_2 = mock_process_group.mock_calls[1].args[0]
+        assert group_1 == [result_1, result_2]
+        assert group_2 == [result_3]
+
+    @mock.patch("random.random")
+    def test_check_and_update_regions(self, mock_random):
+        # Force the check to run
+        mock_random.return_value = 0
+
+        regions = [
+            UptimeRegionConfig(
+                slug="region1",
+                name="Region 1",
+                config_topic=KafkaTopic.UPTIME_CONFIGS,
+                enabled=True,
+            ),
+            UptimeRegionConfig(
+                slug="region2",
+                name="Region 2",
+                config_topic=KafkaTopic.UPTIME_RESULTS,
+                enabled=True,
+            ),
+        ]
+
+        with override_settings(UPTIME_REGIONS=regions), self.tasks():
+            # Create subscription with only one region
+            sub = self.create_uptime_subscription(
+                subscription_id=uuid.uuid4().hex,
+                region_slugs=["region1"],
+            )
+            result = self.create_uptime_result(
+                sub.subscription_id,
+                scheduled_check_time=datetime.now() - timedelta(minutes=1),
+            )
+            assert {r.region_slug for r in sub.regions.all()} == {"region1"}
+            self.send_result(result)
+            sub.refresh_from_db()
+            assert {r.region_slug for r in sub.regions.all()} == {"region1", "region2"}
+            self.assert_producer_calls(
+                (sub, kafka_definition.Topic.UPTIME_CONFIGS),
+                (sub, kafka_definition.Topic.UPTIME_RESULTS),
+            )
+            assert sub.status == UptimeSubscription.Status.ACTIVE.value
+
+    @mock.patch("random.random")
+    def test_check_and_update_regions_removes_disabled(self, mock_random):
+        mock_random.return_value = 0
+        sub = self.create_uptime_subscription(
+            subscription_id=uuid.uuid4().hex, region_slugs=["region1", "region2"]
+        )
+        regions = [
+            UptimeRegionConfig(
+                slug="region1",
+                name="Region 1",
+                config_topic=KafkaTopic.UPTIME_CONFIGS,
+                enabled=True,
+            ),
+            UptimeRegionConfig(
+                slug="region2",
+                name="Region 2",
+                config_topic=KafkaTopic.UPTIME_RESULTS,
+                enabled=False,
+            ),
+        ]
+
+        with override_settings(UPTIME_REGIONS=regions), self.tasks():
+            result = self.create_uptime_result(
+                sub.subscription_id,
+                scheduled_check_time=datetime.now() - timedelta(minutes=1),
+            )
+            assert {r.region_slug for r in sub.regions.all()} == {"region1", "region2"}
+            self.send_result(result)
+            sub.refresh_from_db()
+            assert {r.region_slug for r in sub.regions.all()} == {"region1"}
+            assert sub.subscription_id
+            self.assert_producer_calls(
+                (sub.subscription_id, kafka_definition.Topic.UPTIME_RESULTS),
+                (sub, kafka_definition.Topic.UPTIME_CONFIGS),
+            )
+            assert sub.status == UptimeSubscription.Status.ACTIVE.value
+
+    @mock.patch("random.random")
+    def test_check_and_update_regions_random_skip(self, mock_random):
+        # Force the check to NOT run
+        mock_random.return_value = 1
+
+        regions = [
+            UptimeRegionConfig(
+                slug="region1",
+                name="Region 1",
+                config_topic=KafkaTopic.UPTIME_CONFIGS,
+                enabled=True,
+            ),
+        ]
+
+        with override_settings(UPTIME_REGIONS=regions), self.tasks():
+            sub = self.create_uptime_subscription(subscription_id=uuid.uuid4().hex, region_slugs=[])
+            result = self.create_uptime_result(
+                sub.subscription_id,
+                scheduled_check_time=datetime.now() - timedelta(minutes=1),
+            )
+            assert {r.region_slug for r in sub.regions.all()} == set()
+            self.send_result(result)
+            sub.refresh_from_db()
+            assert {r.region_slug for r in sub.regions.all()} == set()
+            self.assert_producer_calls()
diff --git a/tests/sentry/uptime/endpoints/test_organization_uptime_alert_index.py b/tests/sentry/uptime/endpoints/test_organization_uptime_alert_index.py
new file mode 100644
index 00000000000000..240e1e9fa28711
--- /dev/null
+++ b/tests/sentry/uptime/endpoints/test_organization_uptime_alert_index.py
@@ -0,0 +1,81 @@
+from sentry.api.serializers import serialize
+from tests.sentry.uptime.endpoints import UptimeAlertBaseEndpointTest
+
+
+class OrganizationUptimeAlertIndexBaseEndpointTest(UptimeAlertBaseEndpointTest):
+    endpoint = "sentry-api-0-organization-uptime-alert-index"
+
+
+class OrganizationUptimeAlertIndexEndpointTest(OrganizationUptimeAlertIndexBaseEndpointTest):
+    method = "get"
+
+    def check_valid_response(self, response, expected_alerts):
+        assert [serialize(uptime_alert) for uptime_alert in expected_alerts] == response.data
+
+    def test(self):
+        alert_1 = self.create_project_uptime_subscription(name="test1")
+        alert_2 = self.create_project_uptime_subscription(name="test2")
+        resp = self.get_success_response(self.organization.slug)
+        self.check_valid_response(resp, [alert_1, alert_2])
+
+    def test_search_by_url(self):
+        self.create_project_uptime_subscription()
+        santry_monitor = self.create_project_uptime_subscription(
+            uptime_subscription=self.create_uptime_subscription(url="https://santry.com")
+        )
+
+        response = self.get_success_response(self.organization.slug, query="santry")
+        self.check_valid_response(response, [santry_monitor])
+
+    def test_environment_filter(self):
+        env = self.create_environment()
+        self.create_project_uptime_subscription()
+        env_monitor = self.create_project_uptime_subscription(env=env)
+
+        response = self.get_success_response(self.organization.slug, environment=[env.name])
+        self.check_valid_response(response, [env_monitor])
+
+    def test_owner_filter(self):
+        user_1 = self.create_user()
+        user_2 = self.create_user()
+        team_1 = self.create_team()
+        team_2 = self.create_team()
+        self.create_team_membership(team_2, user=self.user)
+
+        uptime_a = self.create_project_uptime_subscription(owner=user_1)
+        uptime_b = self.create_project_uptime_subscription(owner=user_2)
+        uptime_c = self.create_project_uptime_subscription(owner=team_1)
+        uptime_d = self.create_project_uptime_subscription(owner=team_2)
+        uptime_e = self.create_project_uptime_subscription(owner=None)
+
+        # Monitor by user
+        response = self.get_success_response(self.organization.slug, owner=[f"user:{user_1.id}"])
+        self.check_valid_response(response, [uptime_a])
+
+        # Monitors by users and teams
+        response = self.get_success_response(
+            self.organization.slug,
+            owner=[f"user:{user_1.id}", f"user:{user_2.id}", f"team:{team_1.id}"],
+        )
+        self.check_valid_response(response, [uptime_a, uptime_b, uptime_c])
+
+        # myteams
+        response = self.get_success_response(
+            self.organization.slug,
+            owner=["myteams"],
+        )
+        self.check_valid_response(response, [uptime_d])
+
+        # unassigned monitors
+        response = self.get_success_response(
+            self.organization.slug,
+            owner=["unassigned", f"user:{user_1.id}"],
+        )
+        self.check_valid_response(response, [uptime_a, uptime_e])
+
+        # Invalid user ID
+        response = self.get_success_response(
+            self.organization.slug,
+            owner=["user:12345"],
+        )
+        self.check_valid_response(response, [])
diff --git a/tests/sentry/uptime/subscriptions/test_regions.py b/tests/sentry/uptime/subscriptions/test_regions.py
new file mode 100644
index 00000000000000..e4581e5630e453
--- /dev/null
+++ b/tests/sentry/uptime/subscriptions/test_regions.py
@@ -0,0 +1,53 @@
+from django.test import TestCase, override_settings
+
+from sentry.conf.types.kafka_definition import Topic
+from sentry.conf.types.uptime import UptimeRegionConfig
+from sentry.uptime.subscriptions.regions import get_active_region_configs, get_region_config
+
+
+class TestBase(TestCase):
+    def setUp(self):
+        self.test_regions = [
+            UptimeRegionConfig(
+                slug="us",
+                name="United States",
+                config_topic=Topic("uptime-results"),
+                enabled=True,
+            ),
+            UptimeRegionConfig(
+                slug="eu",
+                name="Europe",
+                config_topic=Topic("uptime-configs"),
+                enabled=False,
+            ),
+            UptimeRegionConfig(
+                slug="ap",
+                name="Asia Pacific",
+                config_topic=Topic("monitors-clock-tasks"),
+                enabled=True,
+            ),
+        ]
+
+
+class GetActiveRegionConfigsTest(TestBase):
+    def test_returns_only_enabled_regions(self):
+        with override_settings(UPTIME_REGIONS=self.test_regions):
+            active_regions = get_active_region_configs()
+            assert len(active_regions) == 2
+            assert all(region.enabled for region in active_regions)
+            assert {region.slug for region in active_regions} == {"us", "ap"}
+
+
+class GetRegionConfigTest(TestBase):
+    def test_returns_existing_region(self):
+        with override_settings(UPTIME_REGIONS=self.test_regions):
+            region = get_region_config("us")
+            assert region is not None
+            assert region.slug == "us"
+            assert region.name == "United States"
+
+    def test_returns_first_active_region_for_invalid_slug(self):
+        with override_settings(UPTIME_REGIONS=self.test_regions):
+            region = get_region_config("invalid")
+            assert region is not None
+            assert region.slug == "us"  # First active region
diff --git a/tests/sentry/uptime/subscriptions/test_subscriptions.py b/tests/sentry/uptime/subscriptions/test_subscriptions.py
index 5a63570b65a42d..125991633eec4a 100644
--- a/tests/sentry/uptime/subscriptions/test_subscriptions.py
+++ b/tests/sentry/uptime/subscriptions/test_subscriptions.py
@@ -1,7 +1,10 @@
 from unittest import mock
 
 import pytest
+from django.test import override_settings
 
+from sentry.conf.types.kafka_definition import Topic
+from sentry.conf.types.uptime import UptimeRegionConfig
 from sentry.testutils.cases import UptimeTestCase
 from sentry.testutils.skips import requires_kafka
 from sentry.types.actor import Actor
@@ -93,7 +96,6 @@ def test_deleting_status(self):
         assert uptime_sub.id == new_sub.id
         assert new_sub.status == UptimeSubscription.Status.ACTIVE.value
         assert new_sub.subscription_id is not None
-        assert new_sub.subscription_id != uptime_sub.subscription_id
 
     def test_without_task(self):
         url = "https://sentry.io"
@@ -227,6 +229,48 @@ def test_max_proj_subs(self):
                     mode=ProjectUptimeSubscriptionMode.MANUAL,
                 )[1]
 
+    def test_auto_associates_active_regions(self):
+        regions = [
+            UptimeRegionConfig(
+                slug="region1",
+                name="Region 1",
+                config_topic=Topic.UPTIME_CONFIGS,
+                enabled=True,
+            ),
+            UptimeRegionConfig(
+                slug="region2",
+                name="Region 2",
+                config_topic=Topic.UPTIME_RESULTS,
+                enabled=True,
+            ),
+            UptimeRegionConfig(
+                slug="region3",
+                name="Region 3",
+                config_topic=Topic.MONITORS_CLOCK_TASKS,
+                enabled=False,  # This one shouldn't be associated
+            ),
+        ]
+        with override_settings(UPTIME_REGIONS=regions):
+            subscription = get_or_create_uptime_subscription(
+                url="https://example.com",
+                interval_seconds=60,
+                timeout_ms=1000,
+            )
+
+            # Should only have the enabled regions
+            subscription_regions = {r.region_slug for r in subscription.regions.all()}
+            assert subscription_regions == {"region1", "region2"}
+
+            # Creating again should return same subscription with same regions
+            subscription2 = get_or_create_uptime_subscription(
+                url="https://example.com",
+                interval_seconds=60,
+                timeout_ms=1000,
+            )
+            assert subscription2.id == subscription.id
+            subscription_regions = {r.region_slug for r in subscription2.regions.all()}
+            assert subscription_regions == {"region1", "region2"}
+
 
 class UpdateProjectUptimeSubscriptionTest(UptimeTestCase):
     def test(self):
@@ -563,8 +607,7 @@ class IsUrlMonitoredForProjectTest(UptimeTestCase):
     def test_not_monitored(self):
         assert not is_url_auto_monitored_for_project(self.project, "https://sentry.io")
         subscription = self.create_project_uptime_subscription(
-            uptime_subscription=self.create_uptime_subscription(),
-            mode=ProjectUptimeSubscriptionMode.MANUAL,
+            mode=ProjectUptimeSubscriptionMode.MANUAL
         )
         assert not is_url_auto_monitored_for_project(
             self.project, subscription.uptime_subscription.url
@@ -572,15 +615,13 @@ def test_not_monitored(self):
 
     def test_monitored(self):
         subscription = self.create_project_uptime_subscription(
-            uptime_subscription=self.create_uptime_subscription(),
-            mode=ProjectUptimeSubscriptionMode.AUTO_DETECTED_ACTIVE,
+            mode=ProjectUptimeSubscriptionMode.AUTO_DETECTED_ACTIVE
         )
         assert is_url_auto_monitored_for_project(self.project, subscription.uptime_subscription.url)
 
     def test_monitored_other_project(self):
         other_project = self.create_project()
         subscription = self.create_project_uptime_subscription(
-            uptime_subscription=self.create_uptime_subscription(),
             project=self.project,
             mode=ProjectUptimeSubscriptionMode.AUTO_DETECTED_ACTIVE,
         )
@@ -596,18 +637,13 @@ def test_empty(self):
 
     def test(self):
         subscription = self.create_project_uptime_subscription(
-            uptime_subscription=self.create_uptime_subscription(),
-            mode=ProjectUptimeSubscriptionMode.AUTO_DETECTED_ACTIVE,
+            mode=ProjectUptimeSubscriptionMode.AUTO_DETECTED_ACTIVE
         )
         assert get_auto_monitored_subscriptions_for_project(self.project) == [subscription]
         other_subscription = self.create_project_uptime_subscription(
-            uptime_subscription=self.create_uptime_subscription(url="https://santry.io"),
-            mode=ProjectUptimeSubscriptionMode.AUTO_DETECTED_ONBOARDING,
-        )
-        self.create_project_uptime_subscription(
-            uptime_subscription=self.create_uptime_subscription(url="https://sintry.io"),
-            mode=ProjectUptimeSubscriptionMode.MANUAL,
+            mode=ProjectUptimeSubscriptionMode.AUTO_DETECTED_ONBOARDING
         )
+        self.create_project_uptime_subscription(mode=ProjectUptimeSubscriptionMode.MANUAL)
         assert set(get_auto_monitored_subscriptions_for_project(self.project)) == {
             subscription,
             other_subscription,
@@ -616,7 +652,6 @@ def test(self):
     def test_other_project(self):
         other_project = self.create_project()
         self.create_project_uptime_subscription(
-            uptime_subscription=self.create_uptime_subscription(),
-            mode=ProjectUptimeSubscriptionMode.AUTO_DETECTED_ACTIVE,
+            mode=ProjectUptimeSubscriptionMode.AUTO_DETECTED_ACTIVE
         )
         assert get_auto_monitored_subscriptions_for_project(other_project) == []
diff --git a/tests/sentry/uptime/subscriptions/test_tasks.py b/tests/sentry/uptime/subscriptions/test_tasks.py
index 7d4d3f753e7906..6a8e4ae028f7a6 100644
--- a/tests/sentry/uptime/subscriptions/test_tasks.py
+++ b/tests/sentry/uptime/subscriptions/test_tasks.py
@@ -5,21 +5,28 @@
 from uuid import UUID, uuid4
 
 import pytest
+from arroyo import Topic as ArroyoTopic
+from django.test import override_settings
 from django.utils import timezone
 
+from sentry.conf.types.kafka_definition import Topic
+from sentry.conf.types.uptime import UptimeRegionConfig
 from sentry.testutils.abstract import Abstract
 from sentry.testutils.cases import UptimeTestCase
 from sentry.testutils.skips import requires_kafka
 from sentry.uptime.config_producer import UPTIME_CONFIGS_CODEC
 from sentry.uptime.models import UptimeSubscription
+from sentry.uptime.subscriptions.regions import get_active_region_configs
 from sentry.uptime.subscriptions.tasks import (
     SUBSCRIPTION_STATUS_MAX_AGE,
     create_remote_uptime_subscription,
     delete_remote_uptime_subscription,
     send_uptime_config_deletion,
     subscription_checker,
+    update_remote_uptime_subscription,
     uptime_subscription_to_check_config,
 )
+from sentry.utils.kafka_config import get_topic_definition
 
 pytestmark = [requires_kafka]
 
@@ -33,25 +40,31 @@ def _setup_producer(self):
             self.producer = producer
             yield
 
-    def assert_producer_calls(self, *args: UptimeSubscription | str):
-        expected_payloads = [
-            (
+    def assert_producer_calls(self, *args: tuple[UptimeSubscription | str, Topic]):
+        # Verify the number of calls matches what we expect
+        assert len(self.producer.produce.call_args_list) == len(args)
+
+        for (arg, expected_topic), producer_call in zip(args, self.producer.produce.call_args_list):
+            # Check topic
+            assert producer_call[0][0] == ArroyoTopic(
+                get_topic_definition(expected_topic)["real_topic_name"]
+            )
+
+            # Check message ID
+            expected_message_id = UUID(
+                arg.subscription_id if isinstance(arg, UptimeSubscription) else arg
+            ).bytes
+            assert producer_call[0][1].key == expected_message_id
+
+            # Check payload
+            expected_payload = (
                 UPTIME_CONFIGS_CODEC.encode(
                     uptime_subscription_to_check_config(arg, str(arg.subscription_id))
                 )
                 if isinstance(arg, UptimeSubscription)
                 else None
             )
-            for arg in args
-        ]
-        expected_message_ids = [
-            UUID(arg.subscription_id if isinstance(arg, UptimeSubscription) else arg).bytes
-            for arg in args
-        ]
-        passed_message_ids = [ca[0][1].key for ca in self.producer.produce.call_args_list]
-        assert expected_message_ids == passed_message_ids
-        passed_payloads = [ca[0][1].value for ca in self.producer.produce.call_args_list]
-        assert expected_payloads == passed_payloads
+            assert producer_call[0][1].value == expected_payload
 
 
 class BaseUptimeSubscriptionTaskTest(ProducerTestMixin, metaclass=abc.ABCMeta):
@@ -59,6 +72,7 @@ class BaseUptimeSubscriptionTaskTest(ProducerTestMixin, metaclass=abc.ABCMeta):
 
     status_translations = {
         UptimeSubscription.Status.CREATING: "create",
+        UptimeSubscription.Status.UPDATING: "update",
         UptimeSubscription.Status.DELETING: "delete",
     }
 
@@ -76,11 +90,8 @@ def task(self, uptime_subscription_id: int) -> None:
         pass
 
     def create_subscription(
-        self, status: UptimeSubscription.Status | None = None, subscription_id: str | None = None
+        self, status: UptimeSubscription.Status, subscription_id: str | None = None
     ):
-        if status is None:
-            status = self.expected_status
-
         return UptimeSubscription.objects.create(
             status=status.value,
             type="something",
@@ -122,7 +133,69 @@ def test(self):
         sub.refresh_from_db()
         assert sub.status == UptimeSubscription.Status.ACTIVE.value
         assert sub.subscription_id is not None
-        self.assert_producer_calls(sub)
+        self.assert_producer_calls((sub, Topic.UPTIME_CONFIGS))
+
+    def test_with_regions(self):
+        sub = self.create_uptime_subscription(
+            status=UptimeSubscription.Status.CREATING, region_slugs=["default"]
+        )
+        create_remote_uptime_subscription(sub.id)
+        sub.refresh_from_db()
+        assert sub.status == UptimeSubscription.Status.ACTIVE.value
+        assert sub.subscription_id is not None
+        self.assert_producer_calls((sub, Topic.UPTIME_CONFIGS))
+
+    def test_without_regions_uses_default(self):
+        sub = self.create_uptime_subscription(status=UptimeSubscription.Status.CREATING)
+        create_remote_uptime_subscription(sub.id)
+        sub.refresh_from_db()
+        assert sub.status == UptimeSubscription.Status.ACTIVE.value
+        assert sub.subscription_id is not None
+        self.assert_producer_calls((sub, get_active_region_configs()[0].config_topic))
+
+    def test_multi_overlapping_regions(self):
+        regions = [
+            UptimeRegionConfig(
+                slug="region1",
+                name="Region 1",
+                config_topic=Topic.UPTIME_CONFIGS,
+                enabled=True,
+            ),
+            UptimeRegionConfig(
+                slug="region2",
+                name="Region 2",
+                config_topic=Topic.UPTIME_RESULTS,  # Using a different topic
+                enabled=True,
+            ),
+            UptimeRegionConfig(
+                slug="region3",
+                name="Region 3",
+                config_topic=Topic.MONITORS_CLOCK_TASKS,  # Another different topic
+                enabled=True,
+            ),
+        ]
+        with override_settings(UPTIME_REGIONS=regions):
+            # First subscription with regions 1 and 2
+            sub1 = self.create_uptime_subscription(
+                status=UptimeSubscription.Status.CREATING, region_slugs=["region1", "region2"]
+            )
+            create_remote_uptime_subscription(sub1.id)
+            sub1.refresh_from_db()
+
+            # Second subscription with regions 2 and 3
+            sub2 = self.create_uptime_subscription(
+                status=UptimeSubscription.Status.CREATING, region_slugs=["region2", "region3"]
+            )
+            create_remote_uptime_subscription(sub2.id)
+            sub2.refresh_from_db()
+
+            # Verify that each subscription was sent to the correct topics for its regions
+            self.assert_producer_calls(
+                (sub1, Topic.UPTIME_CONFIGS),
+                (sub1, Topic.UPTIME_RESULTS),
+                (sub2, Topic.UPTIME_RESULTS),
+                (sub2, Topic.MONITORS_CLOCK_TASKS),
+            )
 
 
 class DeleteUptimeSubscriptionTaskTest(BaseUptimeSubscriptionTaskTest):
@@ -136,7 +209,7 @@ def test(self):
         )
         delete_remote_uptime_subscription(sub.id)
         assert not UptimeSubscription.objects.filter(id=sub.id).exists()
-        self.assert_producer_calls(subscription_id)
+        self.assert_producer_calls((subscription_id, Topic.UPTIME_CONFIGS))
 
     def test_no_subscription_id(self):
         sub = self.create_subscription(UptimeSubscription.Status.DELETING)
@@ -145,10 +218,33 @@ def test_no_subscription_id(self):
         assert not UptimeSubscription.objects.filter(id=sub.id).exists()
         self.assert_producer_calls()
 
+    def test_delete_with_regions(self):
+        sub = self.create_uptime_subscription(
+            status=UptimeSubscription.Status.DELETING,
+            subscription_id=uuid4().hex,
+            region_slugs=["default"],
+        )
+        delete_remote_uptime_subscription(sub.id)
+        assert sub.subscription_id is not None
+        self.assert_producer_calls((sub.subscription_id, Topic.UPTIME_CONFIGS))
+        with pytest.raises(UptimeSubscription.DoesNotExist):
+            sub.refresh_from_db()
+
+    def test_delete_without_regions_uses_default(self):
+        sub = self.create_uptime_subscription(
+            status=UptimeSubscription.Status.DELETING, subscription_id=uuid4().hex
+        )
+        delete_remote_uptime_subscription(sub.id)
+        assert sub.subscription_id is not None
+        self.assert_producer_calls((sub.subscription_id, Topic.UPTIME_CONFIGS))
+        with pytest.raises(UptimeSubscription.DoesNotExist):
+            sub.refresh_from_db()
+
 
 class UptimeSubscriptionToCheckConfigTest(UptimeTestCase):
-    def test(self):
-        sub = self.create_uptime_subscription()
+    def test_basic(self):
+        sub = self.create_uptime_subscription(region_slugs=["default"])
+
         subscription_id = uuid4().hex
         assert uptime_subscription_to_check_config(sub, subscription_id) == {
             "subscription_id": subscription_id,
@@ -158,6 +254,8 @@ def test(self):
             "request_method": "GET",
             "request_headers": [],
             "trace_sampling": False,
+            "active_regions": ["default"],
+            "region_schedule_mode": "round_robin",
         }
 
     def test_request_fields(self):
@@ -165,9 +263,14 @@ def test_request_fields(self):
         body = "some request body"
         method = "POST"
         sub = self.create_uptime_subscription(
-            method=method, headers=headers, body=body, trace_sampling=True
+            method=method,
+            headers=headers,
+            body=body,
+            trace_sampling=True,
+            region_slugs=["default"],
         )
         sub.refresh_from_db()
+
         subscription_id = uuid4().hex
         assert uptime_subscription_to_check_config(sub, subscription_id) == {
             "subscription_id": subscription_id,
@@ -178,12 +281,15 @@ def test_request_fields(self):
             "request_headers": headers,
             "request_body": body,
             "trace_sampling": True,
+            "active_regions": ["default"],
+            "region_schedule_mode": "round_robin",
         }
 
     def test_header_translation(self):
         headers = {"hi": "bye"}
-        sub = self.create_uptime_subscription(headers=headers)
+        sub = self.create_uptime_subscription(headers=headers, region_slugs=["default"])
         sub.refresh_from_db()
+
         subscription_id = uuid4().hex
         assert uptime_subscription_to_check_config(sub, subscription_id) == {
             "subscription_id": subscription_id,
@@ -193,18 +299,36 @@ def test_header_translation(self):
             "request_method": "GET",
             "request_headers": [["hi", "bye"]],
             "trace_sampling": False,
+            "active_regions": ["default"],
+            "region_schedule_mode": "round_robin",
+        }
+
+    def test_no_regions(self):
+        sub = self.create_uptime_subscription()
+        subscription_id = uuid4().hex
+        assert uptime_subscription_to_check_config(sub, subscription_id) == {
+            "subscription_id": subscription_id,
+            "url": sub.url,
+            "interval_seconds": sub.interval_seconds,
+            "timeout_ms": sub.timeout_ms,
+            "request_method": "GET",
+            "request_headers": [],
+            "trace_sampling": False,
+            "active_regions": [],
+            "region_schedule_mode": "round_robin",
         }
 
 
 class SendUptimeConfigDeletionTest(ProducerTestMixin):
-    def test(self):
+    def test_with_region(self):
         subscription_id = uuid4().hex
-        send_uptime_config_deletion(subscription_id)
-        self.assert_producer_calls(subscription_id)
+        region_slug = "default"
+        send_uptime_config_deletion(region_slug, subscription_id)
+        self.assert_producer_calls((subscription_id, Topic.UPTIME_CONFIGS))
 
 
 class SubscriptionCheckerTest(UptimeTestCase):
-    def test_create_delete(self):
+    def test_create_update_delete(self):
         for status in (
             UptimeSubscription.Status.CREATING,
             UptimeSubscription.Status.DELETING,
@@ -232,3 +356,34 @@ def test_create_delete(self):
                 sub_new.refresh_from_db()
                 assert sub_new.status == status.value
                 assert sub_new.subscription_id is None
+
+
+class UpdateUptimeSubscriptionTaskTest(BaseUptimeSubscriptionTaskTest):
+    task = update_remote_uptime_subscription
+    expected_status = UptimeSubscription.Status.UPDATING
+
+    def test_update(self):
+        sub = self.create_uptime_subscription(
+            status=UptimeSubscription.Status.UPDATING, region_slugs=["default"]
+        )
+        update_remote_uptime_subscription(sub.id)
+
+        sub.refresh_from_db()
+        assert sub.status == UptimeSubscription.Status.ACTIVE.value
+
+        # Verify config was sent to the region
+        self.assert_producer_calls((sub, Topic.UPTIME_CONFIGS))
+
+    def test_without_regions_uses_default(self):
+        sub = self.create_uptime_subscription(
+            status=UptimeSubscription.Status.UPDATING,
+        )
+        get_active_region_configs()[0].slug
+
+        update_remote_uptime_subscription(sub.id)
+
+        sub.refresh_from_db()
+        assert sub.status == UptimeSubscription.Status.ACTIVE.value
+
+        # Verify config was sent to default region
+        self.assert_producer_calls((sub, Topic.UPTIME_CONFIGS))
diff --git a/tests/sentry/uptime/test_issue_platform.py b/tests/sentry/uptime/test_issue_platform.py
index 757b909368eb99..e234dc2c22b904 100644
--- a/tests/sentry/uptime/test_issue_platform.py
+++ b/tests/sentry/uptime/test_issue_platform.py
@@ -60,7 +60,7 @@ def test(self, mock_uuid):
                 IssueEvidence(
                     name="Failure reason", value="timeout - it timed out", important=True
                 ),
-                IssueEvidence(name="Duration", value="100", important=False),
+                IssueEvidence(name="Duration", value="100ms", important=False),
                 IssueEvidence(name="Method", value="HEAD", important=False),
                 IssueEvidence(name="Status Code", value="500", important=False),
             ],
diff --git a/tests/sentry/users/api/endpoints/test_user_authenticator_enroll.py b/tests/sentry/users/api/endpoints/test_user_authenticator_enroll.py
index 1a8a4a7bae9947..c104eec403331b 100644
--- a/tests/sentry/users/api/endpoints/test_user_authenticator_enroll.py
+++ b/tests/sentry/users/api/endpoints/test_user_authenticator_enroll.py
@@ -84,6 +84,47 @@ def test_totp_can_enroll(self, validate_otp):
         assert interface.secret == "secret56"
         assert interface.config == {"secret": "secret56"}
 
+    @mock.patch("sentry.auth.authenticators.TotpInterface.validate_otp", return_value=True)
+    def test_totp_no_verified_primary_email(self, validate_otp):
+        from urllib.parse import quote
+
+        user = self.create_user()
+        UserEmail.objects.filter(user=user, email=user.email).update(is_verified=False)
+        self.login_as(user)
+
+        # XXX: Pretend an unbound function exists.
+        validate_otp.__func__ = None
+
+        with mock.patch(
+            "sentry.auth.authenticators.base.generate_secret_key", return_value="Z" * 32
+        ):
+            resp = self.get_success_response("me", "totp")
+
+        assert resp.data["secret"] == "Z" * 32
+        assert (
+            resp.data["qrcode"]
+            == f"otpauth://totp/{quote(user.email)}?issuer=Sentry&secret=ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+        )
+        assert resp.data["form"]
+        assert resp.data["secret"]
+
+        # try to enroll
+        with self.tasks():
+            resp = self.get_error_response(
+                "me",
+                "totp",
+                method="post",
+                status_code=401,
+                **{"secret": "secret12", "otp": "1234"},
+            )
+            assert resp.data == {
+                "detail": {
+                    "code": "primary-email-verification-required",
+                    "message": "Primary email verification required.",
+                    "extra": {"username": user.email},
+                }
+            }
+
     @override_options({"totp.disallow-new-enrollment": True})
     def test_totp_disallow_new_enrollment(self):
         self.get_error_response(
@@ -188,8 +229,8 @@ def test_sms_no_verified_email(self):
         )
         assert resp.data == {
             "detail": {
-                "code": "email-verification-required",
-                "message": "Email verification required.",
+                "code": "primary-email-verification-required",
+                "message": "Primary email verification required.",
                 "extra": {"username": user.email},
             }
         }
diff --git a/tests/sentry/users/api/endpoints/test_user_regions.py b/tests/sentry/users/api/endpoints/test_user_regions.py
index cef5e74d706bbe..ec1bffa6e3eb88 100644
--- a/tests/sentry/users/api/endpoints/test_user_regions.py
+++ b/tests/sentry/users/api/endpoints/test_user_regions.py
@@ -85,7 +85,7 @@ def test_get_for_user_with_auth_token(self):
         self.create_organization(region="de", owner=self.user)
         auth_token = self.create_user_auth_token(user=self.user, scope_list=["org:read"])
         response = self.get_success_response(
-            "me", extra_headers={"HTTP_AUTHORIZATION": f"Bearer {auth_token}"}
+            "me", extra_headers={"HTTP_AUTHORIZATION": f"Bearer {auth_token.token}"}
         )
         assert "regions" in response.data
         assert response.data["regions"] == [de.api_serialize(), us.api_serialize()]
@@ -99,7 +99,7 @@ def test_get_other_user_with_auth_token_error(self):
         auth_token = self.create_user_auth_token(user=self.user, scope_list=["org:read"])
         self.get_error_response(
             other_user.id,
-            extra_headers={"HTTP_AUTHORIZATION": f"Bearer {auth_token}"},
+            extra_headers={"HTTP_AUTHORIZATION": f"Bearer {auth_token.token}"},
             status_code=403,
         )
 
@@ -110,7 +110,9 @@ def test_get_for_user_with_wrong_scopes_error(self):
 
         auth_token = self.create_user_auth_token(user=self.user, scope_list=["project:read"])
         self.get_error_response(
-            "me", extra_headers={"HTTP_AUTHORIZATION": f"Bearer {auth_token}"}, status_code=403
+            "me",
+            extra_headers={"HTTP_AUTHORIZATION": f"Bearer {auth_token.token}"},
+            status_code=403,
         )
 
     @override_regions(region_config)
diff --git a/tests/sentry/utils/kvstore/test_common.py b/tests/sentry/utils/kvstore/test_common.py
index 99e31b394380c6..553b0f85f33ffd 100644
--- a/tests/sentry/utils/kvstore/test_common.py
+++ b/tests/sentry/utils/kvstore/test_common.py
@@ -42,7 +42,7 @@ def properties(request) -> Properties:
         if backend_label == "default":
             from sentry.cache import default_cache as cache
         else:
-            raise ValueError("unknown cache backend label")
+            raise AssertionError("unknown cache backend label")
 
         return Properties(
             CacheKVStorage(cache),
@@ -77,7 +77,7 @@ def properties(request) -> Properties:
             values=itertools.count(),
         )
     else:
-        raise ValueError("unknown kvstore label")
+        raise AssertionError("unknown kvstore label")
 
 
 def test_single_key_operations(properties: Properties) -> None:
diff --git a/tests/sentry/utils/locking/backends/test_migration.py b/tests/sentry/utils/locking/backends/test_migration.py
index b60d01104b9ce0..536de7f72ffd78 100644
--- a/tests/sentry/utils/locking/backends/test_migration.py
+++ b/tests/sentry/utils/locking/backends/test_migration.py
@@ -15,7 +15,7 @@ def __init__(self):
 
     def acquire(self, key: str, duration: int, routing_key: str | None = None) -> None:
         if self.locked(key=key, routing_key=routing_key):
-            raise Exception(f"Could not acquire ({key}, {routing_key})")
+            raise AssertionError(f"Could not acquire ({key}, {routing_key})")
         self._locks[(key, routing_key)] = duration
 
     def release(self, key, routing_key=None):
@@ -61,13 +61,13 @@ def test_lock_check_both_backends(self):
         backend.backend_old.acquire(lk, 10)
         assert backend.locked(lk)
 
-        def selector_always_old(key, routing_key, backend_new, backend_old):
-            return backend_old
+        def selector_plzno_call(key, routing_key, backend_new, backend_old):
+            raise AssertionError("should not be called!")
 
         backend = MigrationLockBackend(
             backend_new_config={"path": DummyLockBackend.path},
             backend_old_config={"path": DummyLockBackend.path},
-            selector_func_path=selector_always_old,
+            selector_func_path=selector_plzno_call,
         )
         backend.backend_new.acquire(lk, 10)
         assert backend.locked(lk)
diff --git a/tests/sentry/utils/locking/backends/test_redis.py b/tests/sentry/utils/locking/backends/test_redis.py
index 2be02ad6627012..dfe1a74df4f7e3 100644
--- a/tests/sentry/utils/locking/backends/test_redis.py
+++ b/tests/sentry/utils/locking/backends/test_redis.py
@@ -18,7 +18,7 @@ class RedisBackendTestCaseBase:
 
     @property
     def cluster(self):
-        return clusters.get("default")
+        raise NotImplementedError
 
     @property
     def backend(self):
diff --git a/tests/sentry/utils/sdk_crashes/conftest.py b/tests/sentry/utils/sdk_crashes/conftest.py
index c8ded8cf181c45..03872ff702250f 100644
--- a/tests/sentry/utils/sdk_crashes/conftest.py
+++ b/tests/sentry/utils/sdk_crashes/conftest.py
@@ -25,6 +25,8 @@ def empty_cocoa_config() -> SDKCrashDetectionConfig:
         organization_allowlist=[],
         sdk_names={},
         report_fatal_errors=False,
+        ignore_mechanism_type=set(),
+        allow_mechanism_type=set(),
         system_library_path_patterns=set(),
         sdk_frame_config=SDKFrameConfig(
             function_patterns=set(),
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 c25d055863d760..892990c4803d82 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,12 @@
 
 import pytest
 
-from fixtures.sdk_crash_detection.crash_event_android import get_apex_crash_event, get_crash_event
+from fixtures.sdk_crash_detection.crash_event_android import (
+    get_apex_crash_event,
+    get_crash_event,
+    get_exception,
+    get_frames,
+)
 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
@@ -148,31 +153,31 @@ def test_sdk_crash_is_reported_with_android_paths(
     [
         (
             "pthread_getcpuclockid",
-            "/apex/com.android.art/lib64/bionic/libc.so",
+            "/apex/com.android.runtime/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.runtime/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.runtime/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.runtime/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.runtime/lib64/bionic/libc.s",
             "/apex/com.android.art/lib64/libart.so",
             False,
         ),
@@ -337,3 +342,59 @@ def test_native_sdk_version_too_low_not_detected(
     )
 
     assert mock_sdk_crash_reporter.report.call_count == 0
+
+
+@decorators
+def test_anr_detected(mock_sdk_crash_reporter, mock_random, store_event, configs):
+    event_data = get_crash_event(
+        exception={
+            "values": [
+                get_exception(
+                    frames=get_frames(
+                        sdk_frame_module="io.sentry.Hub",
+                        system_frame_module="java.lang.reflect.Method",
+                    ),
+                    mechanism={"type": "ANR", "handled": True},
+                ),
+            ]
+        }
+    )
+
+    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_appexitinfo_detected(mock_sdk_crash_reporter, mock_random, store_event, configs):
+    event_data = get_crash_event(
+        exception={
+            "values": [
+                get_exception(
+                    frames=get_frames(
+                        sdk_frame_module="io.sentry.Hub",
+                        system_frame_module="java.lang.reflect.Method",
+                    ),
+                    mechanism={"type": "AppExitInfo"},
+                ),
+            ]
+        }
+    )
+
+    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
diff --git a/tests/sentry/utils/sdk_crashes/test_sdk_crash_detection_react_native.py b/tests/sentry/utils/sdk_crashes/test_sdk_crash_detection_react_native.py
index fe0d068d26b97f..8f5f80ee73cadb 100644
--- a/tests/sentry/utils/sdk_crashes/test_sdk_crash_detection_react_native.py
+++ b/tests/sentry/utils/sdk_crashes/test_sdk_crash_detection_react_native.py
@@ -4,7 +4,11 @@
 
 import pytest
 
-from fixtures.sdk_crash_detection.crash_event_react_native import get_crash_event
+from fixtures.sdk_crash_detection.crash_event_react_native import (
+    get_crash_event,
+    get_exception,
+    get_frames,
+)
 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
@@ -254,3 +258,85 @@ def test_organization_empty_allowlist_not_detected(
     )
 
     assert mock_sdk_crash_reporter.report.call_count == 0
+
+
+@decorators
+def test_console_mechanism_not_detected(mock_sdk_crash_reporter, mock_random, store_event, configs):
+    event_data = get_crash_event(
+        exception={
+            "values": [
+                get_exception(
+                    frames=get_frames(
+                        filename="/Users/user/repos/node_modules/@sentry/core/captureconsole.ts"
+                    ),
+                    mechanism_type="onerror",
+                ),
+                get_exception(
+                    frames=get_frames(
+                        filename="/Users/user/repos/node_modules/@sentry/core/captureconsole.ts"
+                    ),
+                    mechanism_type="console",
+                ),
+            ]
+        }
+    )
+
+    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
+
+
+@decorators
+def test_console_mechanism_detected(mock_sdk_crash_reporter, mock_random, store_event, configs):
+    event_data = get_crash_event(
+        exception={
+            "values": [
+                get_exception(
+                    frames=get_frames(
+                        filename="/Users/user/repos/node_modules/@sentry/core/captureconsole.ts"
+                    ),
+                    mechanism_type="console",
+                ),
+                get_exception(
+                    frames=get_frames(
+                        filename="/Users/user/repos/node_modules/@sentry/core/captureconsole.ts"
+                    ),
+                    mechanism_type="onerror",
+                ),
+            ]
+        }
+    )
+
+    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_missing_exception_not_detected(mock_sdk_crash_reporter, mock_random, store_event, configs):
+    event_data = get_crash_event(exception={"values": []})
+
+    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_auth.py b/tests/sentry/utils/test_auth.py
index 2115b70bd24b68..e121227cceb0aa 100644
--- a/tests/sentry/utils/test_auth.py
+++ b/tests/sentry/utils/test_auth.py
@@ -135,13 +135,11 @@ def test_no_value_uses_default(self):
 
 @control_silo_test
 class LoginTest(TestCase):
-    def _make_request(self, next=None):
+    def _make_request(self):
         request = HttpRequest()
         request.META["REMOTE_ADDR"] = "127.0.0.1"
         request.session = self.session
         request.user = AnonymousUser()
-        if next:
-            request.session["_next"] = next
         return request
 
     def test_simple(self):
diff --git a/tests/sentry/utils/test_circuit_breaker2.py b/tests/sentry/utils/test_circuit_breaker2.py
index d0e16a0c50ada2..1b351605dfe87c 100644
--- a/tests/sentry/utils/test_circuit_breaker2.py
+++ b/tests/sentry/utils/test_circuit_breaker2.py
@@ -106,112 +106,6 @@ def _add_quota_usage(
             window_end_time,
         )
 
-    def _clear_quota(self, quota: Quota, window_end: int | None = None) -> list[int]:
-        """
-        Clear usage of the given quota up until the end of the given time window. If no window end
-        is given, clear the quota up to the present.
-
-        Returns the list of granule values which were cleared.
-        """
-        now = int(time.time())
-        window_end_time = window_end or now
-        granule_end_times = self._get_granule_end_times(quota, window_end_time)
-        num_granules = len(granule_end_times)
-        previous_granule_values = [0] * num_granules
-
-        current_total_quota_used = quota.limit - self._get_remaining_error_quota(
-            quota, window_end_time
-        )
-        if current_total_quota_used != 0:
-            # Empty the granules one by one, starting with the oldest.
-            #
-            # To empty each granule, we need to add negative quota usage, which means we need to
-            # know how much usage is currently in each granule. Unfortunately, the limiter will only
-            # report quota usage at the window level, not the granule level. To get around this, we
-            # start with a window ending with the oldest granule. Any granules before it will have
-            # expired, so the window usage will equal the granule usage.ending in that granule will
-            # have a total usage equal to that of the granule.
-            #
-            # Once we zero-out the granule, we can move the window one granule forward. It will now
-            # consist of expired granules, the granule we just set to 0, and the granule we care
-            # about. Thus the window usage will again match the granule usage, which we can use to
-            # empty the granule. We then just repeat the pattern until we've reached the end of the
-            # window we want to clear.
-            for i, granule_end_time in enumerate(granule_end_times):
-                granule_quota_used = quota.limit - self._get_remaining_error_quota(
-                    quota, granule_end_time
-                )
-                previous_granule_values[i] = granule_quota_used
-                self._add_quota_usage(quota, -granule_quota_used, granule_end_time)
-
-            new_total_quota_used = quota.limit - self._get_remaining_error_quota(
-                quota, window_end_time
-            )
-            assert new_total_quota_used == 0
-
-        return previous_granule_values
-
-    def _get_granule_end_times(
-        self, quota: Quota, window_end: int, newest_first: bool = False
-    ) -> list[int]:
-        """
-        Given a quota and the end of the time window it's covering, return the timestamps
-        corresponding to the end of each granule.
-        """
-        window_duration = quota.window_seconds
-        granule_duration = quota.granularity_seconds
-        num_granules = window_duration // granule_duration
-
-        # Walk backwards through the granules
-        end_times_newest_first = [
-            window_end - num_granules_ago * granule_duration
-            for num_granules_ago in range(num_granules)
-        ]
-
-        return end_times_newest_first if newest_first else list(reversed(end_times_newest_first))
-
-    def _set_granule_values(
-        self,
-        quota: Quota,
-        values: list[int | None],
-        window_end: int | None = None,
-    ) -> None:
-        """
-        Set the usage in each granule of the given quota, for the time window ending at the given
-        time.
-
-        If no ending time is given, the current time is used.
-
-        The list of values should be ordered from oldest to newest and must contain the same number
-        of elements as the window has granules. To only change some of the values, pass `None` in
-        the spot of any value which should remain unchanged. (For example, in a two-granule window,
-        to only change the older granule, pass `[3, None]`.)
-        """
-        window_duration = quota.window_seconds
-        granule_duration = quota.granularity_seconds
-        num_granules = window_duration // granule_duration
-
-        if len(values) != num_granules:
-            raise Exception(
-                f"Exactly {num_granules} granule values must be provided. "
-                + "To leave an existing value as is, include `None` in its spot."
-            )
-
-        now = int(time.time())
-        window_end_time = window_end or now
-
-        previous_values = self._clear_quota(quota, window_end_time)
-
-        for i, granule_end_time, value in zip(
-            range(num_granules), self._get_granule_end_times(quota, window_end_time), values
-        ):
-            # When we cleared the quota above, we set each granule's value to 0, so here "adding"
-            # usage is actually setting usage
-            if value is not None:
-                self._add_quota_usage(quota, value, granule_end_time)
-            else:
-                self._add_quota_usage(quota, previous_values[i], granule_end_time)
-
     def _delete_from_redis(self, keys: list[str]) -> Any:
         for key in keys:
             self.redis_pipeline.delete(key)
diff --git a/tests/sentry/utils/test_committers.py b/tests/sentry/utils/test_committers.py
index 3d6969c5976cd8..f90ca1f9fac1bf 100644
--- a/tests/sentry/utils/test_committers.py
+++ b/tests/sentry/utils/test_committers.py
@@ -10,7 +10,6 @@
 from sentry.integrations.github.integration import GitHubIntegration
 from sentry.integrations.models.integration import Integration
 from sentry.models.commit import Commit
-from sentry.models.commitauthor import CommitAuthor
 from sentry.models.commitfilechange import CommitFileChange
 from sentry.models.groupowner import GroupOwner, GroupOwnerType
 from sentry.models.grouprelease import GroupRelease
@@ -49,20 +48,6 @@ def create_commit(self, author=None):
             author=author,
         )
 
-    def create_commit_with_author(self, user=None, commit=None):
-        if not user:
-            user = self.create_user(name="Sentry", email="sentry@sentry.io")
-
-        author = CommitAuthor.objects.create(
-            organization_id=self.organization.id,
-            name=user.name,
-            email=user.email,
-            external_id=user.id,
-        )
-        if not commit:
-            commit = self.create_commit(author)
-        return commit
-
     def create_commitfilechange(self, commit=None, filename=None, type=None):
         return CommitFileChange.objects.create(
             organization_id=self.organization.id,
diff --git a/tests/sentry/utils/test_concurrent.py b/tests/sentry/utils/test_concurrent.py
index fd69c28c1a8326..c4017df107f4ff 100644
--- a/tests/sentry/utils/test_concurrent.py
+++ b/tests/sentry/utils/test_concurrent.py
@@ -78,10 +78,7 @@ def test_future_broken_callback():
 
     callback = mock.Mock(side_effect=Exception("Boom!"))
 
-    try:
-        future_set.add_done_callback(callback)
-    except Exception:
-        assert False, "should not raise"
+    future_set.add_done_callback(callback)  # should not raise
 
     assert callback.call_count == 1
     assert callback.call_args == mock.call(future_set)
@@ -191,16 +188,15 @@ def test_synchronous_executor():
 
     assert executor.submit(lambda: mock.sentinel.RESULT).result() is mock.sentinel.RESULT
 
+    class SentinelException(ValueError):
+        pass
+
     def callable():
-        raise Exception(mock.sentinel.EXCEPTION)
+        raise SentinelException
 
     future = executor.submit(callable)
-    try:
+    with pytest.raises(SentinelException):
         future.result()
-    except Exception as e:
-        assert e.args[0] == mock.sentinel.EXCEPTION
-    else:
-        assert False, "expected future to raise"
 
 
 def test_threaded_same_priority_Tasks():
diff --git a/tests/sentry/utils/test_glob.py b/tests/sentry/utils/test_glob.py
index a00b9516c0ec11..060decd54c3deb 100644
--- a/tests/sentry/utils/test_glob.py
+++ b/tests/sentry/utils/test_glob.py
@@ -1,43 +1,50 @@
+from typing import NamedTuple, Self
+
 import pytest
 
 from sentry.utils.glob import glob_match
 
 
-class GlobInput:
-    def __init__(self, value, pat, **kwargs):
-        self.value = value
-        self.pat = pat
-        self.kwargs = kwargs
+class GlobInput(NamedTuple):
+    value: str | None
+    pat: str
+    kwargs: dict[str, bool]
+
+    @classmethod
+    def make(cls, value: str | None, pat: str, **kwargs: bool) -> Self:
+        return cls(value=value, pat=pat, kwargs=kwargs)
 
     def __call__(self):
         return glob_match(self.value, self.pat, **self.kwargs)
 
-    def __repr__(self):
-        return f"<GlobInput {self.__dict__!r}>"
-
 
 @pytest.mark.parametrize(
     "glob_input,expect",
     [
-        [GlobInput("hello.py", "*.py"), True],
-        [GlobInput("hello.py", "*.js"), False],
-        [GlobInput(None, "*.js"), False],
-        [GlobInput(None, "*"), True],
-        [GlobInput("foo/hello.py", "*.py"), True],
-        [GlobInput("foo/hello.py", "*.py", doublestar=True), False],
-        [GlobInput("foo/hello.py", "**/*.py", doublestar=True), True],
-        [GlobInput("foo/hello.PY", "**/*.py"), False],
-        [GlobInput("foo/hello.PY", "**/*.py", doublestar=True), False],
-        [GlobInput("foo/hello.PY", "**/*.py", ignorecase=True), True],
-        [GlobInput("foo/hello.PY", "**/*.py", doublestar=True, ignorecase=True), True],
-        [GlobInput("root\\foo\\hello.PY", "root/**/*.py", ignorecase=True), False],
-        [GlobInput("root\\foo\\hello.PY", "root/**/*.py", doublestar=True, ignorecase=True), False],
+        [GlobInput.make("hello.py", "*.py"), True],
+        [GlobInput.make("hello.py", "*.js"), False],
+        [GlobInput.make(None, "*.js"), False],
+        [GlobInput.make(None, "*"), True],
+        [GlobInput.make("foo/hello.py", "*.py"), True],
+        [GlobInput.make("foo/hello.py", "*.py", doublestar=True), False],
+        [GlobInput.make("foo/hello.py", "**/*.py", doublestar=True), True],
+        [GlobInput.make("foo/hello.PY", "**/*.py"), False],
+        [GlobInput.make("foo/hello.PY", "**/*.py", doublestar=True), False],
+        [GlobInput.make("foo/hello.PY", "**/*.py", ignorecase=True), True],
+        [GlobInput.make("foo/hello.PY", "**/*.py", doublestar=True, ignorecase=True), True],
+        [GlobInput.make("root\\foo\\hello.PY", "root/**/*.py", ignorecase=True), False],
         [
-            GlobInput("root\\foo\\hello.PY", "root/**/*.py", ignorecase=True, path_normalize=True),
+            GlobInput.make("root\\foo\\hello.PY", "root/**/*.py", doublestar=True, ignorecase=True),
+            False,
+        ],
+        [
+            GlobInput.make(
+                "root\\foo\\hello.PY", "root/**/*.py", ignorecase=True, path_normalize=True
+            ),
             True,
         ],
         [
-            GlobInput(
+            GlobInput.make(
                 "root\\foo\\hello.PY",
                 "root/**/*.py",
                 doublestar=True,
@@ -46,8 +53,8 @@ def __repr__(self):
             ),
             True,
         ],
-        [GlobInput("foo:\nbar", "foo:*"), True],
-        [GlobInput("foo:\nbar", "foo:*", allow_newline=False), False],
+        [GlobInput.make("foo:\nbar", "foo:*"), True],
+        [GlobInput.make("foo:\nbar", "foo:*", allow_newline=False), False],
     ],
 )
 def test_glob_match(glob_input, expect):
diff --git a/tests/sentry/utils/test_math.py b/tests/sentry/utils/test_math.py
index b6f409350f37fb..1a1f04ec17cb9c 100644
--- a/tests/sentry/utils/test_math.py
+++ b/tests/sentry/utils/test_math.py
@@ -3,15 +3,6 @@
 from sentry.utils.math import ExponentialMovingAverage, nice_int
 
 
-def linspace(start, stop, n):
-    if n == 1:
-        yield stop
-    else:
-        h = (stop - start) / (n - 1)
-        for i in range(n):
-            yield start + h * i
-
-
 @pytest.mark.parametrize(
     "start,stop,expected",
     [
diff --git a/tests/sentry/utils/test_registry.py b/tests/sentry/utils/test_registry.py
index 2f3415c288fd04..a85a075901051a 100644
--- a/tests/sentry/utils/test_registry.py
+++ b/tests/sentry/utils/test_registry.py
@@ -12,10 +12,10 @@ def test(self):
 
         @test_registry.register("something")
         def registered_func():
-            pass
+            raise NotImplementedError
 
         def unregistered_func():
-            pass
+            raise NotImplementedError
 
         assert test_registry.get("something") == registered_func
         with pytest.raises(NoRegistrationExistsError):
@@ -33,3 +33,23 @@ def unregistered_func():
 
         test_registry.register("something else")(unregistered_func)
         assert test_registry.get("something else") == unregistered_func
+
+    def test_allow_duplicate_values(self):
+        test_registry = Registry[str](enable_reverse_lookup=False)
+
+        @test_registry.register("something")
+        @test_registry.register("something 2")
+        def registered_func():
+            raise NotImplementedError
+
+        assert test_registry.get("something") == registered_func
+        assert test_registry.get("something 2") == registered_func
+
+        with pytest.raises(NoRegistrationExistsError):
+            test_registry.get("something else")
+
+        with pytest.raises(NotImplementedError):
+            test_registry.get_key(registered_func)
+
+        test_registry.register("something else")(registered_func)
+        assert test_registry.get("something else") == registered_func
diff --git a/tests/sentry/utils/test_retries.py b/tests/sentry/utils/test_retries.py
index 503774df060a82..7240ba6c62f335 100644
--- a/tests/sentry/utils/test_retries.py
+++ b/tests/sentry/utils/test_retries.py
@@ -69,12 +69,9 @@ def test_policy_failure(self):
         retry.clock.sleep = mock.MagicMock()
         retry.clock.time = mock.MagicMock(side_effect=[0, 0.15, 0.25])
 
-        try:
+        with pytest.raises(RetryException) as excinfo:
             retry(callable)
-        except RetryException as exception:
-            assert exception.exception is bomb
-        else:
-            self.fail(f"Expected {RetryException!r}!")
+        assert excinfo.value.exception is bomb
 
         assert callable.call_count == 2
 
diff --git a/tests/sentry/web/frontend/test_auth_oauth2.py b/tests/sentry/web/frontend/test_auth_oauth2.py
index 2b3b80070f7f1f..b9df4100211143 100644
--- a/tests/sentry/web/frontend/test_auth_oauth2.py
+++ b/tests/sentry/web/frontend/test_auth_oauth2.py
@@ -40,7 +40,7 @@ def get_refresh_token_url(self) -> str:
         raise NotImplementedError
 
     def build_config(self, state):
-        pass
+        raise NotImplementedError
 
     def get_auth_pipeline(self):
         return [DummyOAuth2Login(), DummyOAuth2Callback()]
diff --git a/tests/sentry/web/frontend/test_group_tag_export.py b/tests/sentry/web/frontend/test_group_tag_export.py
index 95ce98be0fadb9..c7b612cdd77b49 100644
--- a/tests/sentry/web/frontend/test_group_tag_export.py
+++ b/tests/sentry/web/frontend/test_group_tag_export.py
@@ -3,7 +3,7 @@
 from django.urls import reverse
 
 from sentry.testutils.cases import SnubaTestCase, TestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.silo import create_test_regions, region_silo_test
 
 
@@ -16,7 +16,7 @@ def setUp(self):
         self.value = "b\xe4r"
         self.project = self.create_project()
 
-        event_timestamp = iso_format(before_now(seconds=1))
+        event_timestamp = before_now(seconds=1).replace(microsecond=0).isoformat()
 
         self.event = self.store_event(
             data={
@@ -30,9 +30,7 @@ def setUp(self):
 
         self.group = self.event.group
 
-        self.first_seen = datetime.strptime(event_timestamp, "%Y-%m-%dT%H:%M:%S").strftime(
-            "%Y-%m-%dT%H:%M:%S.%fZ"
-        )
+        self.first_seen = datetime.fromisoformat(event_timestamp).strftime("%Y-%m-%dT%H:%M:%S.%fZ")
         self.last_seen = self.first_seen
         self.login_as(user=self.user)
 
diff --git a/tests/sentry/web/frontend/test_organization_auth_settings.py b/tests/sentry/web/frontend/test_organization_auth_settings.py
index 0d590d362d81e6..1e42537a0cbc21 100644
--- a/tests/sentry/web/frontend/test_organization_auth_settings.py
+++ b/tests/sentry/web/frontend/test_organization_auth_settings.py
@@ -726,12 +726,6 @@ def test_edit_sso_settings(self):
 class DummyGenericSAML2Provider(GenericSAML2Provider):
     name = "saml2_generic_dummy"
 
-    def get_saml_setup_pipeline(self):
-        return []
-
-    def build_config(self, state):
-        return dummy_provider_config
-
 
 @control_silo_test
 class OrganizationAuthSettingsGenericSAML2Test(AuthProviderTestCase):
diff --git a/tests/sentry/web/frontend/test_react_page.py b/tests/sentry/web/frontend/test_react_page.py
index d9f25f12b561e9..bd294f459075e1 100644
--- a/tests/sentry/web/frontend/test_react_page.py
+++ b/tests/sentry/web/frontend/test_react_page.py
@@ -296,14 +296,11 @@ 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/frontend/test_twofactor.py b/tests/sentry/web/frontend/test_twofactor.py
index 6de362dde020ff..cce5211da38488 100644
--- a/tests/sentry/web/frontend/test_twofactor.py
+++ b/tests/sentry/web/frontend/test_twofactor.py
@@ -83,6 +83,9 @@ def test_otp_submit_success(self, mock_validate):
     @mock.patch("time.sleep")
     def test_rate_limit(self, mock_validate, mock_sleep):
         user = self.create_user()
+        user.set_password("helloworld!")
+        user.save()
+
         interface = TotpInterface()
         interface.enroll(user)
 
@@ -105,3 +108,19 @@ def test_rate_limit(self, mock_validate, mock_sleep):
         url = absolute_uri(reverse("sentry-account-settings-security"))
         assert url in msg.body
         assert "IP address: 127.0.0.1" in msg.body
+
+        with freeze_time("2000-01-01"):
+            # 2FA rate limiter is reset after updating the password
+            url = absolute_uri(reverse("sentry-api-0-user-password", args=[user.id]))
+            self.client.put(
+                url,
+                content_type="application/json",
+                data={
+                    "password": "helloworld!",
+                    "passwordNew": "testpassword",
+                    "passwordVerify": "testpassword",
+                },
+            )
+
+            resp = self.client.post("/auth/2fa/", data={"otp": "123456"}, follow=False)
+            assert resp.status_code != 429
diff --git a/tests/sentry/web/test_api.py b/tests/sentry/web/test_api.py
index f1285d02730fdb..3b14b44003b357 100644
--- a/tests/sentry/web/test_api.py
+++ b/tests/sentry/web/test_api.py
@@ -8,7 +8,6 @@
 from sentry import options
 from sentry.api.utils import generate_region_url
 from sentry.auth import superuser
-from sentry.conf.types.sentry_config import SentryMode
 from sentry.deletions.models.scheduleddeletion import RegionScheduledDeletion
 from sentry.deletions.tasks.scheduled import run_deletion
 from sentry.models.apitoken import ApiToken
@@ -78,61 +77,10 @@ class RobotsTxtTest(TestCase):
     def path(self):
         return reverse("sentry-robots-txt")
 
-    def test_robots_self_hosted(self):
-        with override_settings(SENTRY_MODE=SentryMode.SELF_HOSTED):
-            resp = self.client.get(self.path)
-            assert resp.status_code == 200
-            assert resp["Content-Type"] == "text/plain"
-            assert (
-                resp.content
-                == b"""\
-User-agent: *
-Disallow: /
-"""
-            )
-
-    def test_robots_saas(self):
-        with override_settings(SENTRY_MODE=SentryMode.SAAS):
-            resp = self.client.get(self.path)
-            assert resp.status_code == 200
-            assert resp["Content-Type"] == "text/plain"
-            # This is sentry.io/robots.txt.
-            assert (
-                resp.content
-                == b"""\
-User-agent: *
-Disallow: /api/
-Allow: /api/*/store/
-Allow: /
-
-Sitemap: https://sentry.io/sitemap-index.xml
-"""
-            )
-
-            # SaaS customer domains should disallow all.
-            resp = self.client.get(self.path, HTTP_HOST="foo.testserver")
-            assert resp.status_code == 200
-            assert resp["Content-Type"] == "text/plain"
-            assert (
-                resp.content
-                == b"""\
-User-agent: *
-Disallow: /
-"""
-            )
-
-    def test_robots_single_tenant(self):
-        with override_settings(SENTRY_MODE=SentryMode.SINGLE_TENANT):
-            resp = self.client.get(self.path)
-            assert resp.status_code == 200
-            assert resp["Content-Type"] == "text/plain"
-            assert (
-                resp.content
-                == b"""\
-User-agent: *
-Disallow: /
-"""
-            )
+    def test_robots(self):
+        resp = self.client.get(self.path)
+        assert resp.status_code == 200
+        assert resp["Content-Type"] == "text/plain"
 
 
 @region_silo_test(regions=create_test_regions("us", "eu"), include_monolith_run=True)
@@ -301,13 +249,11 @@ 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
index 17f029136d0115..a76306169d5244 100644
--- a/tests/sentry/workflow_engine/endpoints/test_project_detector_index.py
+++ b/tests/sentry/workflow_engine/endpoints/test_project_detector_index.py
@@ -13,6 +13,7 @@
 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.models.data_condition import Condition
 from sentry.workflow_engine.registry import data_source_type_registry
 from sentry.workflow_engine.types import DetectorPriorityLevel
 
@@ -69,7 +70,7 @@ def setUp(self):
             },
             "data_conditions": [
                 {
-                    "condition": "gt",
+                    "type": Condition.GREATER,
                     "comparison": 100,
                     "result": DetectorPriorityLevel.HIGH,
                 }
@@ -153,7 +154,7 @@ def test_valid_creation(self, mock_audit):
         conditions = list(DataCondition.objects.filter(condition_group=condition_group))
         assert len(conditions) == 1
         condition = conditions[0]
-        assert condition.condition == "gt"
+        assert condition.type == Condition.GREATER
         assert condition.comparison == 100
         assert condition.condition_result == DetectorPriorityLevel.HIGH
 
diff --git a/tests/sentry/workflow_engine/endpoints/test_serializers.py b/tests/sentry/workflow_engine/endpoints/test_serializers.py
index fa86e15f0df6dc..ebf741e748dda6 100644
--- a/tests/sentry/workflow_engine/endpoints/test_serializers.py
+++ b/tests/sentry/workflow_engine/endpoints/test_serializers.py
@@ -8,6 +8,7 @@
 from sentry.snuba.subscriptions import create_snuba_query, create_snuba_subscription
 from sentry.testutils.cases import TestCase
 from sentry.workflow_engine.models import DataCondition, DataConditionGroup, DataSource, Detector
+from sentry.workflow_engine.models.data_condition import Condition
 from sentry.workflow_engine.registry import data_source_type_registry
 from sentry.workflow_engine.types import DetectorPriorityLevel
 
@@ -40,7 +41,7 @@ def test_serialize_full(self):
         )
         condition = DataCondition.objects.create(
             condition_group=condition_group,
-            condition="gt",
+            type=Condition.GREATER,
             comparison=100,
             condition_result=DetectorPriorityLevel.HIGH,
         )
@@ -107,7 +108,7 @@ def test_serialize_full(self):
                 "conditions": [
                     {
                         "id": str(condition.id),
-                        "condition": "gt",
+                        "condition": Condition.GREATER,
                         "comparison": 100,
                         "result": DetectorPriorityLevel.HIGH,
                     }
@@ -198,7 +199,7 @@ def test_serialize_with_conditions(self):
         )
         condition = DataCondition.objects.create(
             condition_group=condition_group,
-            condition="gt",
+            type=Condition.GREATER,
             comparison=100,
             condition_result=DetectorPriorityLevel.HIGH,
         )
diff --git a/tests/sentry/workflow_engine/endpoints/test_validators.py b/tests/sentry/workflow_engine/endpoints/test_validators.py
index 9084f5ab556023..1770dd01fd34da 100644
--- a/tests/sentry/workflow_engine/endpoints/test_validators.py
+++ b/tests/sentry/workflow_engine/endpoints/test_validators.py
@@ -54,15 +54,15 @@ def supported_results(self):
 
     def test_validate_condition_valid(self):
         validator = self.validator_class()
-        assert validator.validate_condition("gt") == Condition.GREATER
+        assert validator.validate_type("gt") == Condition.GREATER
 
     def test_validate_condition_invalid(self):
         validator = self.validator_class()
         with pytest.raises(
             ValidationError,
-            match="[ErrorDetail(string='Unsupported condition invalid_condition', code='invalid')]",
+            match="[ErrorDetail(string='Unsupported type invalid_condition', code='invalid')]",
         ):
-            validator.validate_condition("invalid_condition")
+            validator.validate_type("invalid_condition")
 
     def test_validate_result_valid(self):
         validator = self.validator_class()
@@ -82,17 +82,7 @@ def setUp(self):
         super().setUp()
         self.project = self.create_project()
 
-        # Create a concrete implementation for testing
-        class ConcreteGroupTypeValidator(BaseGroupTypeDetectorValidator):
-            @property
-            def data_source(self):
-                return mock.Mock()
-
-            @property
-            def data_conditions(self):
-                return mock.Mock()
-
-        self.validator_class = ConcreteGroupTypeValidator
+        self.validator_class = BaseGroupTypeDetectorValidator
 
     def test_validate_group_type_valid(self):
         with mock.patch.object(grouptype.registry, "get_by_slug") as mock_get_by_slug:
@@ -135,29 +125,32 @@ def test_validate_group_type_incompatible(self):
 class MetricAlertComparisonConditionValidatorTest(TestCase):
     def test(self):
         validator = MetricAlertComparisonConditionValidator(
-            data={"condition": "gt", "comparison": 100, "result": DetectorPriorityLevel.HIGH}
+            data={
+                "type": Condition.GREATER,
+                "comparison": 100,
+                "result": DetectorPriorityLevel.HIGH,
+            }
         )
         assert validator.is_valid()
         assert validator.validated_data == {
             "comparison": 100.0,
-            "condition": Condition.GREATER,
             "result": DetectorPriorityLevel.HIGH,
-            "type": "metric_alert",
+            "type": Condition.GREATER,
         }
 
     def test_invalid_condition(self):
         validator = MetricAlertComparisonConditionValidator(
-            data={"condition": "invalid", "comparison": 100, "result": DetectorPriorityLevel.HIGH}
+            data={"type": "invalid", "comparison": 100, "result": DetectorPriorityLevel.HIGH}
         )
         assert not validator.is_valid()
-        assert validator.errors.get("condition") == [
-            ErrorDetail(string="Unsupported condition invalid", code="invalid")
+        assert validator.errors.get("type") == [
+            ErrorDetail(string="Unsupported type invalid", code="invalid")
         ]
 
     def test_invalid_comparison(self):
         validator = MetricAlertComparisonConditionValidator(
             data={
-                "condition": "gt",
+                "type": Condition.GREATER,
                 "comparison": "not_a_number",
                 "result": DetectorPriorityLevel.HIGH,
             }
@@ -169,7 +162,7 @@ def test_invalid_comparison(self):
 
     def test_invalid_result(self):
         validator = MetricAlertComparisonConditionValidator(
-            data={"condition": "gt", "comparison": 100, "result": 25}
+            data={"type": Condition.GREATER, "comparison": 100, "result": 25}
         )
         assert not validator.is_valid()
         assert validator.errors.get("result") == [
@@ -195,7 +188,7 @@ def setUp(self):
             },
             "data_conditions": [
                 {
-                    "condition": "gte",
+                    "type": Condition.GREATER_OR_EQUAL,
                     "comparison": 100,
                     "result": DetectorPriorityLevel.HIGH,
                 }
@@ -230,7 +223,7 @@ def test_create_with_mock_validator(self, mock_audit):
         conditions = list(DataCondition.objects.filter(condition_group=condition_group))
         assert len(conditions) == 1
         condition = conditions[0]
-        assert condition.condition == "gte"
+        assert condition.type == "gte"
         assert condition.comparison == 100
         assert condition.condition_result == DetectorPriorityLevel.HIGH
 
@@ -287,7 +280,7 @@ def setUp(self):
             },
             "data_conditions": [
                 {
-                    "condition": "gt",
+                    "type": Condition.GREATER,
                     "comparison": 100,
                     "result": DetectorPriorityLevel.HIGH,
                 }
@@ -342,7 +335,7 @@ def test_create_with_valid_data(self, mock_audit):
         conditions = list(DataCondition.objects.filter(condition_group=condition_group))
         assert len(conditions) == 1
         condition = conditions[0]
-        assert condition.condition == "gt"
+        assert condition.type == Condition.GREATER
         assert condition.comparison == 100
         assert condition.condition_result == DetectorPriorityLevel.HIGH
 
@@ -367,9 +360,21 @@ def test_too_many_conditions(self):
         data = {
             **self.valid_data,
             "data_conditions": [
-                {"condition": "gt", "comparison": 100, "result": DetectorPriorityLevel.HIGH},
-                {"condition": "gt", "comparison": 200, "result": DetectorPriorityLevel.HIGH},
-                {"condition": "gt", "comparison": 300, "result": DetectorPriorityLevel.HIGH},
+                {
+                    "type": Condition.GREATER,
+                    "comparison": 100,
+                    "result": DetectorPriorityLevel.HIGH,
+                },
+                {
+                    "type": Condition.GREATER,
+                    "comparison": 200,
+                    "result": DetectorPriorityLevel.HIGH,
+                },
+                {
+                    "type": Condition.GREATER,
+                    "comparison": 300,
+                    "result": DetectorPriorityLevel.HIGH,
+                },
             ],
         }
         validator = MetricAlertsDetectorValidator(data=data, context=self.context)
@@ -406,10 +411,6 @@ class MockDataSourceValidator(BaseDataSourceValidator[MockModel]):
     field2 = serializers.IntegerField()
     data_source_type_handler = QuerySubscriptionDataSourceHandler
 
-    @property
-    def model_class(self) -> type[MockModel]:
-        return MockModel
-
     def create_source(self, validated_data) -> MockModel:
         return MockModel.objects.create()
 
@@ -433,7 +434,6 @@ def test_validate_adds_creator_and_type(self):
 class MockDataConditionValidator(NumericComparisonConditionValidator):
     supported_conditions = frozenset([Condition.GREATER_OR_EQUAL, Condition.LESS_OR_EQUAL])
     supported_results = frozenset([DetectorPriorityLevel.HIGH, DetectorPriorityLevel.LOW])
-    type = "test"
 
 
 class MockDetectorValidator(BaseGroupTypeDetectorValidator):
diff --git a/tests/sentry/workflow_engine/handlers/condition/__init__.py b/tests/sentry/workflow_engine/handlers/condition/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/tests/sentry/workflow_engine/handlers/condition/test_base.py b/tests/sentry/workflow_engine/handlers/condition/test_base.py
new file mode 100644
index 00000000000000..51e56bbcf46624
--- /dev/null
+++ b/tests/sentry/workflow_engine/handlers/condition/test_base.py
@@ -0,0 +1,42 @@
+from typing import Any
+
+from sentry.rules.base import RuleBase
+from sentry.workflow_engine.migration_helpers.issue_alert_conditions import (
+    translate_to_data_condition as dual_write_condition,
+)
+from sentry.workflow_engine.models.data_condition import Condition, DataCondition
+from sentry.workflow_engine.models.data_condition_group import DataConditionGroup
+from sentry.workflow_engine.types import WorkflowJob
+from tests.sentry.workflow_engine.test_base import BaseWorkflowTest
+
+
+class ConditionTestCase(BaseWorkflowTest):
+    def setUp(self):
+        self.group, self.event, self.group_event = self.create_group_event()
+
+    @property
+    def condition(self) -> Condition:
+        raise NotImplementedError
+
+    @property
+    def rule_cls(self) -> type[RuleBase]:
+        # for mapping purposes, can delete later
+        raise NotImplementedError
+
+    @property
+    def payload(self) -> dict[str, Any]:
+        # for dual write, can delete later
+        raise NotImplementedError
+
+    def translate_to_data_condition(
+        self, data: dict[str, Any], dcg: DataConditionGroup
+    ) -> DataCondition:
+        return dual_write_condition(data, dcg)
+
+    def assert_passes(self, data_condition: DataCondition, job: WorkflowJob) -> None:
+        assert data_condition.evaluate_value(job) == data_condition.get_condition_result()
+
+    def assert_does_not_pass(self, data_condition: DataCondition, job: WorkflowJob) -> None:
+        assert data_condition.evaluate_value(job) != data_condition.get_condition_result()
+
+    # TODO: activity
diff --git a/tests/sentry/workflow_engine/handlers/condition/test_event_attribute_handler.py b/tests/sentry/workflow_engine/handlers/condition/test_event_attribute_handler.py
new file mode 100644
index 00000000000000..a9824b24f2349d
--- /dev/null
+++ b/tests/sentry/workflow_engine/handlers/condition/test_event_attribute_handler.py
@@ -0,0 +1,966 @@
+from unittest.mock import patch
+
+import pytest
+
+from sentry.eventstream.base import GroupState
+from sentry.rules.conditions.event_attribute import EventAttributeCondition, attribute_registry
+from sentry.rules.match import MatchType
+from sentry.utils.registry import NoRegistrationExistsError
+from sentry.workflow_engine.models.data_condition import Condition
+from sentry.workflow_engine.types import WorkflowJob
+from tests.sentry.workflow_engine.handlers.condition.test_base import ConditionTestCase
+
+
+class TestEventAttributeCondition(ConditionTestCase):
+    condition = Condition.EVENT_ATTRIBUTE
+    rule_cls = EventAttributeCondition
+    payload = {
+        "id": EventAttributeCondition.id,
+        "match": MatchType.EQUAL,
+        "value": "php",
+        "attribute": "platform",
+    }
+
+    def get_event(self, **kwargs):
+        data = {
+            "message": "hello world",
+            "request": {"method": "GET", "url": "http://example.com/"},
+            "user": {
+                "id": "1",
+                "ip_address": "127.0.0.1",
+                "email": "foo@example.com",
+                "username": "foo",
+            },
+            "exception": {
+                "values": [
+                    {
+                        "type": "SyntaxError",
+                        "value": "hello world",
+                        "stacktrace": {
+                            "frames": [
+                                {
+                                    "filename": "example.php",
+                                    "module": "example",
+                                    "context_line": 'echo "hello";',
+                                    "abs_path": "path/to/example.php",
+                                }
+                            ]
+                        },
+                        "thread_id": 1,
+                    }
+                ]
+            },
+            "tags": [("environment", "production")],
+            "extra": {"foo": {"bar": "baz"}, "biz": ["baz"], "bar": "foo"},
+            "platform": "php",
+            "sdk": {"name": "sentry.javascript.react", "version": "6.16.1"},
+            "contexts": {
+                "response": {
+                    "type": "response",
+                    "status_code": 500,
+                },
+                "device": {
+                    "screen_width_pixels": 1920,
+                    "screen_height_pixels": 1080,
+                    "screen_dpi": 123,
+                    "screen_density": 2.5,
+                },
+                "app": {
+                    "in_foreground": True,
+                },
+                "unreal": {
+                    "crash_type": "crash",
+                },
+                "os": {"distribution_name": "ubuntu", "distribution_version": "22.04"},
+            },
+            "threads": {
+                "values": [
+                    {
+                        "id": 1,
+                        "main": True,
+                    },
+                ],
+            },
+        }
+        data.update(kwargs)
+        event = self.store_event(data, project_id=self.project.id)
+        return event
+
+    def setup_group_and_job(self):
+        self.group = self.create_group(project=self.project)
+        self.group_event = self.event.for_group(self.group)
+        self.job = WorkflowJob(
+            {
+                "event": self.group_event,
+                "group_state": GroupState(
+                    {
+                        "id": 1,
+                        "is_regression": False,
+                        "is_new": False,
+                        "is_new_group_environment": False,
+                    }
+                ),
+            }
+        )
+
+    def error_setup(self):
+        self.event = self.get_event(
+            exception={
+                "values": [
+                    {
+                        "type": "Generic",
+                        "value": "hello world",
+                        "mechanism": {"type": "UncaughtExceptionHandler", "handled": False},
+                    }
+                ],
+            }
+        )
+        self.setup_group_and_job()
+
+    def setUp(self):
+        self.event = self.get_event()
+        self.setup_group_and_job()
+        self.dc = self.create_data_condition(
+            type=self.condition,
+            comparison={"match": MatchType.EQUAL, "attribute": "platform", "value": "php"},
+            condition_result=True,
+        )
+
+    def test_dual_write(self):
+        dcg = self.create_data_condition_group()
+        dc = self.translate_to_data_condition(self.payload, dcg)
+
+        assert dc.type == self.condition
+        assert dc.comparison == {
+            "match": MatchType.EQUAL,
+            "value": "php",
+            "attribute": "platform",
+        }
+        assert dc.condition_result is True
+        assert dc.condition_group == dcg
+
+    def test_not_in_registry(self):
+        with pytest.raises(NoRegistrationExistsError):
+            attribute_registry.get("transaction")
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "transaction",
+            "value": "asdf",
+        }
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_equals(self):
+        self.dc.comparison = {"match": MatchType.EQUAL, "attribute": "platform", "value": "php"}
+        self.assert_passes(self.dc, self.job)
+
+        self.dc.comparison = {"match": MatchType.EQUAL, "attribute": "platform", "value": "python"}
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_not_equals(self):
+        self.dc.comparison = {"match": MatchType.NOT_EQUAL, "attribute": "platform", "value": "php"}
+        self.assert_does_not_pass(self.dc, self.job)
+
+        self.dc.comparison = {
+            "match": MatchType.NOT_EQUAL,
+            "attribute": "platform",
+            "value": "python",
+        }
+        self.assert_passes(self.dc, self.job)
+
+    def test_starts_with(self):
+        self.dc.comparison = {
+            "match": MatchType.STARTS_WITH,
+            "attribute": "platform",
+            "value": "ph",
+        }
+        self.assert_passes(self.dc, self.job)
+
+        self.dc.comparison = {
+            "match": MatchType.STARTS_WITH,
+            "attribute": "platform",
+            "value": "py",
+        }
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_does_not_start_with(self):
+        self.dc.comparison = {
+            "match": MatchType.NOT_STARTS_WITH,
+            "attribute": "platform",
+            "value": "ph",
+        }
+        self.assert_does_not_pass(self.dc, self.job)
+
+        self.dc.comparison = {
+            "match": MatchType.NOT_STARTS_WITH,
+            "attribute": "platform",
+            "value": "py",
+        }
+        self.assert_passes(self.dc, self.job)
+
+    def test_ends_with(self):
+        self.dc.comparison = {"match": MatchType.ENDS_WITH, "attribute": "platform", "value": "hp"}
+        self.assert_passes(self.dc, self.job)
+
+        self.dc.comparison = {
+            "match": MatchType.ENDS_WITH,
+            "attribute": "platform",
+            "value": "thon",
+        }
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_does_not_end_with(self):
+        self.dc.comparison = {
+            "match": MatchType.NOT_ENDS_WITH,
+            "attribute": "platform",
+            "value": "hp",
+        }
+        self.assert_does_not_pass(self.dc, self.job)
+
+        self.dc.comparison = {
+            "match": MatchType.NOT_ENDS_WITH,
+            "attribute": "platform",
+            "value": "thon",
+        }
+        self.assert_passes(self.dc, self.job)
+
+    def test_contains(self):
+        self.dc.comparison = {"match": MatchType.CONTAINS, "attribute": "platform", "value": "p"}
+        self.assert_passes(self.dc, self.job)
+
+        self.dc.comparison = {"match": MatchType.CONTAINS, "attribute": "platform", "value": "z"}
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_contains_message(self):
+        self.dc.comparison = {"match": MatchType.CONTAINS, "attribute": "message", "value": "hello"}
+        self.assert_passes(self.dc, self.job)
+
+        # Validate that this searches message in the same way that snuba does
+        self.event = self.get_event(message="")
+        self.setup_group_and_job()
+        # This should still pass, even though the message is now empty
+        self.dc.comparison = {"match": MatchType.CONTAINS, "attribute": "message", "value": "hello"}
+        self.assert_passes(self.dc, self.job)
+
+        # The search should also include info from the exception if present
+        self.dc.comparison = {
+            "match": MatchType.CONTAINS,
+            "attribute": "message",
+            "value": "SyntaxError",
+        }
+        self.assert_passes(self.dc, self.job)
+
+        self.dc.comparison = {
+            "match": MatchType.CONTAINS,
+            "attribute": "message",
+            "value": "not present",
+        }
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_does_not_contain(self):
+        self.dc.comparison = {
+            "match": MatchType.NOT_CONTAINS,
+            "attribute": "platform",
+            "value": "p",
+        }
+        self.assert_does_not_pass(self.dc, self.job)
+
+        self.dc.comparison = {
+            "match": MatchType.NOT_CONTAINS,
+            "attribute": "platform",
+            "value": "z",
+        }
+        self.assert_passes(self.dc, self.job)
+
+    def test_message(self):
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "message",
+            "value": "hello world",
+        }
+        self.assert_passes(self.dc, self.job)
+
+        self.dc.comparison = {"match": MatchType.EQUAL, "attribute": "message", "value": "php"}
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_environment(self):
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "environment",
+            "value": "production",
+        }
+        self.assert_passes(self.dc, self.job)
+
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "environment",
+            "value": "staging",
+        }
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_compares_case_insensitive(self):
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "environment",
+            "value": "PRODUCTION",
+        }
+        self.assert_passes(self.dc, self.job)
+
+    def test_compare_int_value(self):
+        self.event.data["extra"]["number"] = 1
+        self.setup_group_and_job()
+        self.dc.comparison = {"match": MatchType.EQUAL, "attribute": "extra.number", "value": "1"}
+        self.assert_passes(self.dc, self.job)
+
+    def test_http_method(self):
+        self.dc.comparison = {"match": MatchType.EQUAL, "attribute": "http.method", "value": "GET"}
+        self.assert_passes(self.dc, self.job)
+
+        self.dc.comparison = {"match": MatchType.EQUAL, "attribute": "http.method", "value": "POST"}
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_http_url(self):
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "http.url",
+            "value": "http://example.com/",
+        }
+        self.assert_passes(self.dc, self.job)
+
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "http.url",
+            "value": "http://foo.com/",
+        }
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_http_status_code(self):
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "http.status_code",
+            "value": "500",
+        }
+        self.assert_passes(self.dc, self.job)
+
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "http.status_code",
+            "value": "400",
+        }
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_user_id(self):
+        self.dc.comparison = {"match": MatchType.EQUAL, "attribute": "user.id", "value": "1"}
+        self.assert_passes(self.dc, self.job)
+
+        self.dc.comparison = {"match": MatchType.EQUAL, "attribute": "user.id", "value": "2"}
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_user_ip_address(self):
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "user.ip_address",
+            "value": "127.0.0.1",
+        }
+        self.assert_passes(self.dc, self.job)
+
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "user.ip_address",
+            "value": "2",
+        }
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_user_email(self):
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "user.email",
+            "value": "foo@example.com",
+        }
+        self.assert_passes(self.dc, self.job)
+
+        self.dc.comparison = {"match": MatchType.EQUAL, "attribute": "user.email", "value": "2"}
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_user_username(self):
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "user.username",
+            "value": "foo",
+        }
+        self.assert_passes(self.dc, self.job)
+
+        self.dc.comparison = {"match": MatchType.EQUAL, "attribute": "user.username", "value": "2"}
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_exception_type(self):
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "exception.type",
+            "value": "SyntaxError",
+        }
+        self.assert_passes(self.dc, self.job)
+
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "exception.type",
+            "value": "TypeError",
+        }
+        self.assert_does_not_pass(self.dc, self.job)
+
+    @patch("sentry.eventstore.models.get_interfaces", return_value={})
+    def test_exception_type_keyerror(self, mock_get_interfaces):
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "exception.type",
+            "value": "SyntaxError",
+        }
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_error_handled(self):
+        self.error_setup()
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "error.handled",
+            "value": "False",
+        }
+        self.assert_passes(self.dc, self.job)
+
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "error.handled",
+            "value": "True",
+        }
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_error_handled_not_defined(self):
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "error.handled",
+            "value": "True",
+        }
+        self.assert_does_not_pass(self.dc, self.job)
+
+    @patch("sentry.eventstore.models.get_interfaces", return_value={})
+    def test_error_handled_keyerror(self, mock_get_interfaces):
+        self.error_setup()
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "error.handled",
+            "value": "False",
+        }
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_error_unhandled(self):
+        self.error_setup()
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "error.unhandled",
+            "value": "True",
+        }
+        self.assert_passes(self.dc, self.job)
+
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "error.unhandled",
+            "value": "False",
+        }
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_exception_value(self):
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "exception.value",
+            "value": "hello world",
+        }
+        self.assert_passes(self.dc, self.job)
+
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "exception.value",
+            "value": "foo bar",
+        }
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_sdk_name(self):
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "sdk.name",
+            "value": "sentry.javascript.react",
+        }
+        self.assert_passes(self.dc, self.job)
+
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "sdk.name",
+            "value": "sentry.python",
+        }
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_stacktrace_filename(self):
+        """Stacktrace.filename should match frames anywhere in the stack."""
+
+        self.event = self.get_event(
+            exception={
+                "values": [
+                    {
+                        "type": "SyntaxError",
+                        "value": "hello world",
+                        "stacktrace": {
+                            "frames": [
+                                {"filename": "example.php", "module": "example"},
+                                {"filename": "somecode.php", "module": "somecode"},
+                                {"filename": "othercode.php", "module": "othercode"},
+                            ]
+                        },
+                    }
+                ]
+            }
+        )
+        self.setup_group_and_job()
+
+        # correctly matching filenames, at various locations in the stacktrace
+        for value in ["example.php", "somecode.php", "othercode.php"]:
+            self.dc.comparison = {
+                "match": MatchType.EQUAL,
+                "attribute": "stacktrace.filename",
+                "value": value,
+            }
+            self.assert_passes(self.dc, self.job)
+
+        # non-matching filename
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "stacktrace.filename",
+            "value": "foo.php",
+        }
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_stacktrace_attributeerror(self):
+        self.event = self.get_event(
+            exception={
+                "values": [
+                    {
+                        "type": "SyntaxError",
+                        "value": "hello world",
+                    }
+                ]
+            }
+        )
+        # hack to trigger attributeerror
+        self.event.interfaces["exception"]._data["values"][0] = None
+        self.setup_group_and_job()
+
+        for value in ["example.php", "somecode.php", "othercode.php"]:
+            self.dc.comparison = {
+                "match": MatchType.EQUAL,
+                "attribute": "stacktrace.filename",
+                "value": value,
+            }
+            self.assert_does_not_pass(self.dc, self.job)
+
+    def test_stacktrace_module(self):
+        """Stacktrace.module should match frames anywhere in the stack."""
+
+        self.event = self.get_event(
+            exception={
+                "values": [
+                    {
+                        "type": "SyntaxError",
+                        "value": "hello world",
+                        "stacktrace": {
+                            "frames": [
+                                {"filename": "example.php", "module": "example"},
+                                {"filename": "somecode.php", "module": "somecode"},
+                                {"filename": "othercode.php", "module": "othercode"},
+                            ]
+                        },
+                    }
+                ]
+            }
+        )
+        self.setup_group_and_job()
+
+        # correctly matching modules, at various locations in the stacktrace
+        for value in ["example", "somecode", "othercode"]:
+            self.dc.comparison = {
+                "match": MatchType.EQUAL,
+                "attribute": "stacktrace.module",
+                "value": value,
+            }
+            self.assert_passes(self.dc, self.job)
+
+        # non-matching module
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "stacktrace.module",
+            "value": "foo",
+        }
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_stacktrace_code(self):
+        """Stacktrace.code should match frames anywhere in the stack."""
+
+        self.event = self.get_event(
+            exception={
+                "values": [
+                    {
+                        "type": "NameError",
+                        "value": "name 'hi' is not defined",
+                        "stacktrace": {
+                            "frames": [
+                                {
+                                    "filename": "example.py",
+                                    "module": "example",
+                                    "function": "foo",
+                                    "context_line": "somecode.bar()",
+                                },
+                                {
+                                    "filename": "somecode.py",
+                                    "module": "somecode",
+                                    "function": "bar",
+                                    "context_line": "othercode.baz()",
+                                },
+                                {
+                                    "filename": "othercode.py",
+                                    "module": "othercode",
+                                    "function": "baz",
+                                    "context_line": "hi()",
+                                },
+                            ]
+                        },
+                    }
+                ]
+            }
+        )
+        self.setup_group_and_job()
+
+        # correctly matching code, at various locations in the stacktrace
+        for value in ["somecode.bar()", "othercode.baz()", "hi()"]:
+            self.dc.comparison = {
+                "match": MatchType.EQUAL,
+                "attribute": "stacktrace.code",
+                "value": value,
+            }
+            self.assert_passes(self.dc, self.job)
+
+        # non-matching code
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "stacktrace.code",
+            "value": "foo",
+        }
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_stacktrace_abs_path(self):
+        """Stacktrace.abs_path should match frames anywhere in the stack."""
+
+        self.event = self.get_event(
+            exception={
+                "values": [
+                    {
+                        "type": "SyntaxError",
+                        "value": "hello world",
+                        "stacktrace": {
+                            "frames": [
+                                {
+                                    "filename": "example.php",
+                                    "module": "example",
+                                    "abs_path": "path/to/example.php",
+                                },
+                                {
+                                    "filename": "somecode.php",
+                                    "module": "somecode",
+                                    "abs_path": "path/to/somecode.php",
+                                },
+                                {
+                                    "filename": "othercode.php",
+                                    "module": "othercode",
+                                    "abs_path": "path/to/othercode.php",
+                                },
+                            ]
+                        },
+                    }
+                ]
+            }
+        )
+        self.setup_group_and_job()
+
+        # correctly matching abs_paths, at various locations in the stacktrace
+        for value in ["path/to/example.php", "path/to/somecode.php", "path/to/othercode.php"]:
+            self.dc.comparison = {
+                "match": MatchType.EQUAL,
+                "attribute": "stacktrace.abs_path",
+                "value": value,
+            }
+            self.assert_passes(self.dc, self.job)
+
+        # non-matching abs_path
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "stacktrace.abs_path",
+            "value": "path/to/foo.php",
+        }
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_stacktrace_package(self):
+        """Stacktrace.package should match frames anywhere in the stack."""
+
+        self.event = self.get_event(
+            exception={
+                "values": [
+                    {
+                        "type": "SyntaxError",
+                        "value": "hello world",
+                        "stacktrace": {
+                            "frames": [
+                                {"filename": "example.php", "package": "package/example.lib"},
+                                {
+                                    "filename": "somecode.php",
+                                    "package": "package/otherpackage.lib",
+                                },
+                                {
+                                    "filename": "othercode.php",
+                                    "package": "package/somepackage.lib",
+                                },
+                            ]
+                        },
+                    }
+                ]
+            }
+        )
+        self.setup_group_and_job()
+
+        # correctly matching filenames, at various locations in the stacktrace
+        for value in ["package/example.lib", "package/otherpackage.lib", "package/somepackage.lib"]:
+            self.dc.comparison = {
+                "match": MatchType.EQUAL,
+                "attribute": "stacktrace.package",
+                "value": value,
+            }
+            self.assert_passes(self.dc, self.job)
+
+        # non-matching filename
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "stacktrace.package",
+            "value": "package/otherotherpackage.lib",
+        }
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_extra_simple_value(self):
+        self.dc.comparison = {"match": MatchType.EQUAL, "attribute": "extra.bar", "value": "foo"}
+        self.assert_passes(self.dc, self.job)
+
+        self.dc.comparison = {"match": MatchType.EQUAL, "attribute": "extra.bar", "value": "bar"}
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_extra_nested_value(self):
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "extra.foo.bar",
+            "value": "baz",
+        }
+        self.assert_passes(self.dc, self.job)
+
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "extra.foo.bar",
+            "value": "bar",
+        }
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_extra_nested_list(self):
+        self.dc.comparison = {"match": MatchType.EQUAL, "attribute": "extra.biz", "value": "baz"}
+        self.assert_passes(self.dc, self.job)
+
+        self.dc.comparison = {"match": MatchType.EQUAL, "attribute": "extra.biz", "value": "bar"}
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_event_type(self):
+        self.event.data["type"] = "error"
+        self.setup_group_and_job()
+        self.dc.comparison = {"match": MatchType.EQUAL, "attribute": "type", "value": "error"}
+        self.assert_passes(self.dc, self.job)
+
+        self.dc.comparison = {"match": MatchType.EQUAL, "attribute": "type", "value": "csp"}
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_device_screen_width_pixels(self):
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "device.screen_width_pixels",
+            "value": "1920",
+        }
+        self.assert_passes(self.dc, self.job)
+
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "device.screen_width_pixels",
+            "value": "400",
+        }
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_device_screen_height_pixels(self):
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "device.screen_height_pixels",
+            "value": "1080",
+        }
+        self.assert_passes(self.dc, self.job)
+
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "device.screen_height_pixels",
+            "value": "400",
+        }
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_device_screen_dpi(self):
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "device.screen_dpi",
+            "value": "123",
+        }
+        self.assert_passes(self.dc, self.job)
+
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "device.screen_dpi",
+            "value": "400",
+        }
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_device_screen_density(self):
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "device.screen_density",
+            "value": "2.5",
+        }
+        self.assert_passes(self.dc, self.job)
+
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "device.screen_density",
+            "value": "400",
+        }
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_app_in_foreground(self):
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "app.in_foreground",
+            "value": "True",
+        }
+        self.assert_passes(self.dc, self.job)
+
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "app.in_foreground",
+            "value": "False",
+        }
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_os_distribution_name_and_version(self):
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "os.distribution_name",
+            "value": "ubuntu",
+        }
+        self.assert_passes(self.dc, self.job)
+
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "os.distribution_name",
+            "value": "slackware",
+        }
+        self.assert_does_not_pass(self.dc, self.job)
+
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "os.distribution_version",
+            "value": "22.04",
+        }
+        self.assert_passes(self.dc, self.job)
+
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "os.distribution_version",
+            "value": "20.04",
+        }
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_unreal_crash_type(self):
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "unreal.crash_type",
+            "value": "Crash",
+        }
+        self.assert_passes(self.dc, self.job)
+
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "unreal.crash_type",
+            "value": "NoCrash",
+        }
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_does_not_error_with_none(self):
+        self.event = self.get_event(
+            exception={
+                "values": [
+                    None,
+                    {
+                        "type": "SyntaxError",
+                        "value": "hello world",
+                        "stacktrace": {
+                            "frames": [
+                                {
+                                    "filename": "example.php",
+                                    "module": "example",
+                                    "context_line": 'echo "hello";',
+                                    "abs_path": "path/to/example.php",
+                                }
+                            ]
+                        },
+                        "thread_id": 1,
+                    },
+                ]
+            }
+        )
+        self.setup_group_and_job()
+        self.dc.comparison = {
+            "match": MatchType.EQUAL,
+            "attribute": "exception.type",
+            "value": "SyntaxError",
+        }
+        self.assert_passes(self.dc, self.job)
+
+    def test_attr_is_in(self):
+        self.dc.comparison = {
+            "match": MatchType.IS_IN,
+            "attribute": "platform",
+            "value": "php, python",
+        }
+        self.assert_passes(self.dc, self.job)
+
+        self.dc.comparison = {
+            "match": MatchType.IS_IN,
+            "attribute": "platform",
+            "value": "python, ruby",
+        }
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_attr_not_in(self):
+        self.dc.comparison = {
+            "match": MatchType.NOT_IN,
+            "attribute": "platform",
+            "value": "php, python",
+        }
+        self.assert_does_not_pass(self.dc, self.job)
+
+        self.dc.comparison = {
+            "match": MatchType.NOT_IN,
+            "attribute": "platform",
+            "value": "python, ruby",
+        }
+        self.assert_passes(self.dc, self.job)
diff --git a/tests/sentry/workflow_engine/handlers/condition/test_group_event_handlers.py b/tests/sentry/workflow_engine/handlers/condition/test_group_event_handlers.py
new file mode 100644
index 00000000000000..d7e050daa56145
--- /dev/null
+++ b/tests/sentry/workflow_engine/handlers/condition/test_group_event_handlers.py
@@ -0,0 +1,42 @@
+from sentry.eventstream.base import GroupState
+from sentry.rules.conditions.every_event import EveryEventCondition
+from sentry.workflow_engine.models.data_condition import Condition
+from sentry.workflow_engine.types import WorkflowJob
+from tests.sentry.workflow_engine.handlers.condition.test_base import ConditionTestCase
+
+
+class TestEveryEventCondition(ConditionTestCase):
+    condition = Condition.EVERY_EVENT
+    rule_cls = EveryEventCondition
+    payload = {"id": EveryEventCondition.id}
+
+    def test(self):
+        job = WorkflowJob(
+            {
+                "event": self.group_event,
+                "group_state": GroupState(
+                    {
+                        "id": 1,
+                        "is_regression": False,
+                        "is_new": False,
+                        "is_new_group_environment": False,
+                    }
+                ),
+            }
+        )
+        dc = self.create_data_condition(
+            type=self.condition,
+            comparison=True,
+            condition_result=True,
+        )
+
+        self.assert_passes(dc, job)
+
+    def test_dual_write(self):
+        dcg = self.create_data_condition_group()
+        dc = self.translate_to_data_condition(self.payload, dcg)
+
+        assert dc.type == self.condition
+        assert dc.comparison is True
+        assert dc.condition_result is True
+        assert dc.condition_group == dcg
diff --git a/tests/sentry/workflow_engine/handlers/condition/test_group_state_handlers.py b/tests/sentry/workflow_engine/handlers/condition/test_group_state_handlers.py
new file mode 100644
index 00000000000000..422bac062f62f6
--- /dev/null
+++ b/tests/sentry/workflow_engine/handlers/condition/test_group_state_handlers.py
@@ -0,0 +1,288 @@
+from sentry.eventstream.base import GroupState
+from sentry.rules.conditions.existing_high_priority_issue import ExistingHighPriorityIssueCondition
+from sentry.rules.conditions.first_seen_event import FirstSeenEventCondition
+from sentry.rules.conditions.new_high_priority_issue import NewHighPriorityIssueCondition
+from sentry.rules.conditions.reappeared_event import ReappearedEventCondition
+from sentry.rules.conditions.regression_event import RegressionEventCondition
+from sentry.types.group import PriorityLevel
+from sentry.workflow_engine.models.data_condition import Condition
+from sentry.workflow_engine.models.workflow import Workflow
+from sentry.workflow_engine.types import WorkflowJob
+from tests.sentry.workflow_engine.handlers.condition.test_base import ConditionTestCase
+
+
+class TestReappearedEventCondition(ConditionTestCase):
+    condition = Condition.REAPPEARED_EVENT
+    rule_cls = ReappearedEventCondition
+    payload = {"id": ReappearedEventCondition.id}
+
+    def test(self):
+        job = WorkflowJob(
+            {
+                "event": self.group_event,
+                "has_reappeared": True,
+            }
+        )
+        dc = self.create_data_condition(
+            type=self.condition,
+            comparison=True,
+            condition_result=True,
+        )
+
+        self.assert_passes(dc, job)
+
+        job["has_reappeared"] = False
+        self.assert_does_not_pass(dc, job)
+
+    def test_dual_write(self):
+        dcg = self.create_data_condition_group()
+        dc = self.translate_to_data_condition(self.payload, dcg)
+
+        assert dc.type == self.condition
+        assert dc.comparison is True
+        assert dc.condition_result is True
+        assert dc.condition_group == dcg
+
+
+class TestRegressionEventCondition(ConditionTestCase):
+    condition = Condition.REGRESSION_EVENT
+    rule_cls = RegressionEventCondition
+    payload = {"id": RegressionEventCondition.id}
+
+    def test(self):
+        job = WorkflowJob(
+            {
+                "event": self.group_event,
+                "group_state": GroupState(
+                    {
+                        "id": 1,
+                        "is_regression": True,
+                        "is_new": False,
+                        "is_new_group_environment": False,
+                    }
+                ),
+            }
+        )
+        dc = self.create_data_condition(
+            type=self.condition,
+            comparison=True,
+            condition_result=True,
+        )
+
+        self.assert_passes(dc, job)
+
+        job["group_state"]["is_regression"] = False
+        self.assert_does_not_pass(dc, job)
+
+    def test_dual_write(self):
+        dcg = self.create_data_condition_group()
+        dc = self.translate_to_data_condition(self.payload, dcg)
+
+        assert dc.type == self.condition
+        assert dc.comparison is True
+        assert dc.condition_result is True
+        assert dc.condition_group == dcg
+
+
+class TestExistingHighPriorityIssueCondition(ConditionTestCase):
+    condition = Condition.EXISTING_HIGH_PRIORITY_ISSUE
+    rule_cls = ExistingHighPriorityIssueCondition
+    payload = {"id": ExistingHighPriorityIssueCondition.id}
+
+    def setUp(self):
+        super().setUp()
+        self.job = WorkflowJob(
+            {
+                "event": self.group_event,
+                "group_state": GroupState(
+                    {
+                        "id": 1,
+                        "is_regression": True,
+                        "is_new": False,
+                        "is_new_group_environment": False,
+                    }
+                ),
+                "has_reappeared": True,
+                "has_escalated": True,
+            }
+        )
+        self.dc = self.create_data_condition(
+            type=self.condition,
+            comparison=True,
+            condition_result=True,
+        )
+        self.group_event.group.priority = PriorityLevel.HIGH
+
+    def test(self):
+        self.assert_passes(self.dc, self.job)
+
+    def test_group_state_is_new(self):
+        self.job["group_state"]["is_new"] = True
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_is_escalating(self):
+        self.job["has_reappeared"] = False
+        self.job["has_escalated"] = True
+        self.assert_passes(self.dc, self.job)
+
+        self.job["has_reappeared"] = True
+        self.job["has_escalated"] = False
+        self.assert_passes(self.dc, self.job)
+
+        self.job["has_reappeared"] = False
+        self.job["has_escalated"] = False
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_priority(self):
+        self.group_event.group.priority = PriorityLevel.LOW
+        self.assert_does_not_pass(self.dc, self.job)
+
+        self.group_event.group.priority = PriorityLevel.MEDIUM
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_dual_write(self):
+        dcg = self.create_data_condition_group()
+        dc = self.translate_to_data_condition(self.payload, dcg)
+
+        assert dc.type == self.condition
+        assert dc.comparison is True
+        assert dc.condition_result is True
+        assert dc.condition_group == dcg
+
+
+class TestFirstSeenEventCondition(ConditionTestCase):
+    condition = Condition.FIRST_SEEN_EVENT
+    rule_cls = FirstSeenEventCondition
+    payload = {"id": FirstSeenEventCondition.id}
+
+    def setUp(self):
+        super().setUp()
+        self.job = WorkflowJob(
+            {
+                "event": self.group_event,
+                "group_state": GroupState(
+                    {
+                        "id": 1,
+                        "is_regression": True,
+                        "is_new": True,
+                        "is_new_group_environment": True,
+                    }
+                ),
+                "workflow": Workflow(environment_id=None),
+            }
+        )
+        self.dc = self.create_data_condition(
+            type=self.condition,
+            comparison=True,
+            condition_result=True,
+        )
+
+    def test(self):
+        self.assert_passes(self.dc, self.job)
+
+        self.job["group_state"]["is_new"] = False
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_with_environment(self):
+        self.job["workflow"] = Workflow(environment_id=1)
+
+        self.assert_passes(self.dc, self.job)
+
+        self.job["group_state"]["is_new"] = False
+        self.job["group_state"]["is_new_group_environment"] = True
+        self.assert_passes(self.dc, self.job)
+
+        self.job["group_state"]["is_new"] = True
+        self.job["group_state"]["is_new_group_environment"] = False
+        self.assert_does_not_pass(self.dc, self.job)
+
+        self.job["group_state"]["is_new"] = False
+        self.job["group_state"]["is_new_group_environment"] = False
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_dual_write(self):
+        dcg = self.create_data_condition_group()
+        dc = self.translate_to_data_condition(self.payload, dcg)
+
+        assert dc.type == self.condition
+        assert dc.comparison is True
+        assert dc.condition_result is True
+        assert dc.condition_group == dcg
+
+
+class TestNewHighPriorityIssueCondition(ConditionTestCase):
+    condition = Condition.NEW_HIGH_PRIORITY_ISSUE
+    rule_cls = NewHighPriorityIssueCondition
+    payload = {"id": NewHighPriorityIssueCondition.id}
+
+    def setUp(self):
+        super().setUp()
+        self.job = WorkflowJob(
+            {
+                "event": self.group_event,
+                "group_state": GroupState(
+                    {
+                        "id": 1,
+                        "is_regression": True,
+                        "is_new": True,
+                        "is_new_group_environment": True,
+                    }
+                ),
+                "workflow": Workflow(environment_id=1),
+            }
+        )
+        self.dc = self.create_data_condition(
+            type=self.condition,
+            comparison=True,
+            condition_result=True,
+        )
+
+    def test_with_high_priority_alerts(self):
+        self.project.flags.has_high_priority_alerts = True
+        self.project.save()
+
+        # This will only pass for new issues
+        self.group_event.group.update(priority=PriorityLevel.HIGH)
+        self.job["group_state"]["is_new_group_environment"] = True
+        self.assert_passes(self.dc, self.job)
+
+        # These will never pass
+        self.job["group_state"]["is_new_group_environment"] = False
+        self.assert_does_not_pass(self.dc, self.job)
+
+        self.group_event.group.update(priority=PriorityLevel.MEDIUM)
+        self.assert_does_not_pass(self.dc, self.job)
+
+        self.group_event.group.update(priority=PriorityLevel.LOW)
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_without_high_priority_alerts(self):
+        self.project.flags.has_high_priority_alerts = False
+        self.project.save()
+
+        self.group_event.group.update(priority=PriorityLevel.HIGH)
+        self.job["group_state"]["is_new_group_environment"] = True
+        self.assert_passes(self.dc, self.job)
+        self.job["group_state"]["is_new_group_environment"] = False
+        self.assert_does_not_pass(self.dc, self.job)
+
+        self.group_event.group.update(priority=PriorityLevel.MEDIUM)
+        self.job["group_state"]["is_new_group_environment"] = True
+        self.assert_passes(self.dc, self.job)
+        self.job["group_state"]["is_new_group_environment"] = False
+        self.assert_does_not_pass(self.dc, self.job)
+
+        self.group_event.group.update(priority=PriorityLevel.LOW)
+        self.job["group_state"]["is_new_group_environment"] = True
+        self.assert_passes(self.dc, self.job)
+        self.job["group_state"]["is_new_group_environment"] = False
+        self.assert_does_not_pass(self.dc, self.job)
+
+    def test_dual_write(self):
+        dcg = self.create_data_condition_group()
+        dc = self.translate_to_data_condition(self.payload, dcg)
+
+        assert dc.type == self.condition
+        assert dc.comparison is True
+        assert dc.condition_result is True
+        assert dc.condition_group == dcg
diff --git a/tests/sentry/workflow_engine/handlers/detector/test_base.py b/tests/sentry/workflow_engine/handlers/detector/test_base.py
index 127e7c780c4a6e..40b33707d32ee8 100644
--- a/tests/sentry/workflow_engine/handlers/detector/test_base.py
+++ b/tests/sentry/workflow_engine/handlers/detector/test_base.py
@@ -10,6 +10,7 @@
 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.models.data_condition import Condition
 from sentry.workflow_engine.types import DetectorGroupKey, DetectorPriorityLevel
 from tests.sentry.issues.test_grouptype import BaseGroupTypeTest
 
@@ -64,7 +65,7 @@ class MockDetectorStateHandler(StatefulDetectorHandler[dict]):
     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]:
+    def get_group_key_values(self, data_packet: DataPacket[dict]) -> dict[str | None, int]:
         return data_packet.packet.get("group_vals", {})
 
     def build_occurrence_and_event_data(
@@ -127,7 +128,7 @@ def create_detector_and_conditions(self, type: str | None = None):
             type=type,
         )
         self.create_data_condition(
-            condition="gt",
+            type=Condition.GREATER,
             comparison=5,
             condition_result=DetectorPriorityLevel.HIGH,
             condition_group=detector.workflow_condition_group,
diff --git a/tests/sentry/workflow_engine/migration_helpers/test_migrate_alert_rule.py b/tests/sentry/workflow_engine/migration_helpers/test_migrate_alert_rule.py
new file mode 100644
index 00000000000000..28509c1c63a679
--- /dev/null
+++ b/tests/sentry/workflow_engine/migration_helpers/test_migrate_alert_rule.py
@@ -0,0 +1,83 @@
+from sentry.incidents.grouptype import MetricAlertFire
+from sentry.snuba.models import QuerySubscription
+from sentry.testutils.cases import APITestCase
+from sentry.users.services.user.service import user_service
+from sentry.workflow_engine.migration_helpers.alert_rule import migrate_alert_rule
+from sentry.workflow_engine.models import (
+    AlertRuleDetector,
+    AlertRuleWorkflow,
+    DataSource,
+    DataSourceDetector,
+    Detector,
+    DetectorState,
+    DetectorWorkflow,
+    Workflow,
+    WorkflowDataConditionGroup,
+)
+from sentry.workflow_engine.types import DetectorPriorityLevel
+
+
+class AlertRuleMigrationHelpersTest(APITestCase):
+    def setUp(self):
+        self.metric_alert = self.create_alert_rule()
+        self.rpc_user = user_service.get_user(user_id=self.user.id)
+
+    def test_create_metric_alert(self):
+        """
+        Test that when we call the helper methods we create all the ACI models correctly for an alert rule
+        """
+        migrate_alert_rule(self.metric_alert, self.rpc_user)
+
+        alert_rule_workflow = AlertRuleWorkflow.objects.get(alert_rule=self.metric_alert)
+        alert_rule_detector = AlertRuleDetector.objects.get(alert_rule=self.metric_alert)
+
+        workflow = Workflow.objects.get(id=alert_rule_workflow.workflow.id)
+        assert workflow.name == self.metric_alert.name
+        assert self.metric_alert.organization
+        assert workflow.organization_id == self.metric_alert.organization.id
+        detector = Detector.objects.get(id=alert_rule_detector.detector.id)
+        assert detector.name == self.metric_alert.name
+        assert detector.project_id == self.project.id
+        assert detector.enabled is True
+        assert detector.description == self.metric_alert.description
+        assert detector.owner_user_id == self.metric_alert.user_id
+        assert detector.owner_team == self.metric_alert.team
+        assert detector.type == MetricAlertFire.slug
+        assert detector.config == {
+            "threshold_period": self.metric_alert.threshold_period,
+            "sensitivity": None,
+            "seasonality": None,
+            "comparison_delta": None,
+        }
+
+        detector_workflow = DetectorWorkflow.objects.get(detector=detector)
+        assert detector_workflow.workflow == workflow
+
+        workflow_data_condition_group = WorkflowDataConditionGroup.objects.get(workflow=workflow)
+        assert workflow_data_condition_group.condition_group == workflow.when_condition_group
+
+        assert self.metric_alert.snuba_query
+        query_subscription = QuerySubscription.objects.get(
+            snuba_query=self.metric_alert.snuba_query.id
+        )
+        data_source = DataSource.objects.get(
+            organization_id=self.metric_alert.organization_id, query_id=query_subscription.id
+        )
+        assert data_source.type == "snuba_query_subscription"
+        detector_state = DetectorState.objects.get(detector=detector)
+        assert detector_state.active is False
+        assert detector_state.state == str(DetectorPriorityLevel.OK.value)
+
+        data_source_detector = DataSourceDetector.objects.get(data_source=data_source)
+        assert data_source_detector.detector == detector
+
+    def test_create_metric_alert_no_data_source(self):
+        """
+        Test that when we return None and don't create any ACI models if the data source can't be created
+        """
+        self.metric_alert.update(snuba_query=None)
+        migrated = migrate_alert_rule(self.metric_alert, self.rpc_user)
+        assert migrated is None
+        assert len(DataSource.objects.all()) == 0
+        assert not AlertRuleWorkflow.objects.filter(alert_rule=self.metric_alert).exists()
+        assert not AlertRuleDetector.objects.filter(alert_rule=self.metric_alert).exists()
diff --git a/tests/sentry/workflow_engine/models/test_action.py b/tests/sentry/workflow_engine/models/test_action.py
index 32251b47c2937a..9f8983c75ad642 100644
--- a/tests/sentry/workflow_engine/models/test_action.py
+++ b/tests/sentry/workflow_engine/models/test_action.py
@@ -13,7 +13,7 @@ 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)
+        self.action = Action(type=Action.Type.SLACK)
 
     def test_get_handler_notification_type(self):
         with patch("sentry.workflow_engine.registry.action_handler_registry.get") as mock_get:
@@ -22,7 +22,7 @@ def test_get_handler_notification_type(self):
 
             handler = self.action.get_handler()
 
-            mock_get.assert_called_once_with(Action.Type.NOTIFICATION)
+            mock_get.assert_called_once_with(Action.Type.SLACK)
             assert handler == mock_handler
 
     def test_get_handler_webhook_type(self):
@@ -49,7 +49,7 @@ def test_get_handler_unregistered_type(self):
                 self.action.get_handler()
 
             # Verify the registry was queried with the correct action type
-            mock_get.assert_called_once_with(Action.Type.NOTIFICATION)
+            mock_get.assert_called_once_with(Action.Type.SLACK)
 
     def test_trigger_calls_handler_execute(self):
         mock_handler = Mock(spec=ActionHandler)
diff --git a/tests/sentry/workflow_engine/models/test_data_condition.py b/tests/sentry/workflow_engine/models/test_data_condition.py
index 0c91a76b0fe285..5dfba293b05c13 100644
--- a/tests/sentry/workflow_engine/models/test_data_condition.py
+++ b/tests/sentry/workflow_engine/models/test_data_condition.py
@@ -3,6 +3,7 @@
 import pytest
 
 from sentry.testutils.cases import TestCase
+from sentry.workflow_engine.models.data_condition import Condition
 from sentry.workflow_engine.types import DetectorPriorityLevel
 
 
@@ -39,29 +40,32 @@ def test_boolean(self):
 class EvaluateValueTest(TestCase):
     def test(self):
         dc = self.create_data_condition(
-            condition="gt", comparison=1.0, condition_result=DetectorPriorityLevel.HIGH
+            type=Condition.GREATER, comparison=1.0, condition_result=DetectorPriorityLevel.HIGH
         )
         assert dc.evaluate_value(2) == DetectorPriorityLevel.HIGH
         assert dc.evaluate_value(1) is None
 
     def test_bad_condition(self):
+
         dc = self.create_data_condition(
-            condition="invalid", comparison=1.0, condition_result=DetectorPriorityLevel.HIGH
+            type="invalid", comparison=1.0, condition_result=DetectorPriorityLevel.HIGH
         )
-        with pytest.raises(ValueError):
-            dc.evaluate_value(2)
+
+        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 type"
 
     def test_bad_comparison(self):
         dc = self.create_data_condition(
-            condition="gt", comparison="hi", condition_result=DetectorPriorityLevel.HIGH
+            type=Condition.GREATER, comparison="hi", condition_result=DetectorPriorityLevel.HIGH
         )
 
         # 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")
-        with mock.patch("sentry.workflow_engine.models.data_condition.logger") as mock_logger:
-            assert dc.evaluate_value(2) is None
-            assert mock_logger.error.call_args[0][0] == "Invalid condition result"
+    def test_condition_result_comparison_fails(self):
+        dc = self.create_data_condition(
+            type=Condition.GREATER, comparison=1.0, condition_result="wrong"
+        )
+        assert dc.evaluate_value(2) is None
diff --git a/tests/sentry/workflow_engine/models/test_data_source.py b/tests/sentry/workflow_engine/models/test_data_source.py
new file mode 100644
index 00000000000000..f55c2b4f81b1de
--- /dev/null
+++ b/tests/sentry/workflow_engine/models/test_data_source.py
@@ -0,0 +1,20 @@
+from unittest import mock
+
+import pytest
+
+from sentry.workflow_engine.registry import data_source_type_registry
+from tests.sentry.workflow_engine.test_base import BaseWorkflowTest
+
+
+class DataSourceTest(BaseWorkflowTest):
+    def test_invalid_data_source_type(self):
+        with pytest.raises(ValueError):
+            self.create_data_source(type="invalid_type")
+
+    def test_data_source_valid_type(self):
+        # Make sure the mock was registered in test_base
+        assert isinstance(data_source_type_registry.get("test"), mock.Mock)
+
+        data_source = self.create_data_source(type="test")
+        assert data_source is not None
+        assert data_source.type == "test"
diff --git a/tests/sentry/workflow_engine/models/test_json_config_base.py b/tests/sentry/workflow_engine/models/test_json_config_base.py
new file mode 100644
index 00000000000000..89ae844c263ab5
--- /dev/null
+++ b/tests/sentry/workflow_engine/models/test_json_config_base.py
@@ -0,0 +1,74 @@
+from dataclasses import dataclass
+
+import pytest
+from jsonschema import ValidationError
+
+from sentry.issues.grouptype import GroupCategory, GroupType
+from tests.sentry.issues.test_grouptype import BaseGroupTypeTest
+
+
+class TestJsonConfigBase(BaseGroupTypeTest):
+    def setUp(self):
+        super().setUp()
+        self.correct_config = {
+            "username": "user123",
+            "email": "user@example.com",
+            "fullName": "John Doe",
+            "age": 30,
+            "location": "Cityville",
+            "interests": ["Travel", "Technology"],
+        }
+        self.example_schema = {
+            "$id": "https://example.com/user-profile.schema.json",
+            "$schema": "https://json-schema.org/draft/2020-12/schema",
+            "description": "A representation of a user profile",
+            "type": "object",
+            "required": ["username", "email"],
+            "properties": {
+                "username": {"type": "string"},
+                "email": {"type": "string", "format": "email"},
+                "fullName": {"type": "string"},
+                "age": {"type": "integer", "minimum": 0},
+                "location": {"type": "string"},
+                "interests": {"type": "array", "items": {"type": "string"}},
+            },
+        }
+
+        @dataclass(frozen=True)
+        class TestGroupType(GroupType):
+            type_id = 1
+            slug = "test"
+            description = "Test"
+            category = GroupCategory.ERROR.value
+            detector_config_schema = self.example_schema
+
+
+class TestDetectorConfig(TestJsonConfigBase):
+    def test_detector_no_registration(self):
+        with pytest.raises(ValueError):
+            self.create_detector(name="test_detector", type="no_registration")
+
+    def test_detector_mismatched_schema(self):
+        with pytest.raises(ValidationError):
+            self.create_detector(name="test_detector", type="test", config={"hi": "there"})
+
+    def test_detector_correct_schema(self):
+        self.create_detector(name="test_detector", type="test", config=self.correct_config)
+
+
+class TestWorkflowConfig(TestJsonConfigBase):
+    def test_workflow_mismatched_schema(self):
+        with pytest.raises(ValidationError):
+            self.create_workflow(
+                organization=self.organization, name="test_workflow", config={"hi": "there"}
+            )
+        with pytest.raises(ValidationError):
+            self.create_workflow(
+                organization=self.organization, name="test_workflow", config={"frequency": "-1"}
+            )
+
+    def test_workflow_correct_schema(self):
+        self.create_workflow(organization=self.organization, name="test_workflow", config={})
+        self.create_workflow(
+            organization=self.organization, name="test_workflow2", config={"frequency": 5}
+        )
diff --git a/tests/sentry/workflow_engine/models/test_workflow.py b/tests/sentry/workflow_engine/models/test_workflow.py
index 9ae2d31e233130..8a9d1e841a4b9c 100644
--- a/tests/sentry/workflow_engine/models/test_workflow.py
+++ b/tests/sentry/workflow_engine/models/test_workflow.py
@@ -1,29 +1,30 @@
-from sentry.workflow_engine.types import DetectorType
+from sentry.workflow_engine.types import WorkflowJob
 from tests.sentry.workflow_engine.test_base import BaseWorkflowTest
 
 
 class WorkflowTest(BaseWorkflowTest):
     def setUp(self):
         self.workflow, self.detector, self.detector_workflow, self.data_condition_group = (
-            self.create_detector_and_workflow(detector_type=DetectorType.ERROR)
+            self.create_detector_and_workflow()
         )
         self.data_condition = self.data_condition_group.conditions.first()
         self.group, self.event, self.group_event = self.create_group_event()
+        self.job = WorkflowJob({"event": self.group_event})
 
     def test_evaluate_trigger_conditions__condition_new_event__True(self):
-        evaluation = self.workflow.evaluate_trigger_conditions(self.group_event)
+        evaluation = self.workflow.evaluate_trigger_conditions(self.job)
         assert evaluation is True
 
     def test_evaluate_trigger_conditions__condition_new_event__False(self):
         # Update event to have been seen before
         self.group_event.group.times_seen = 5
 
-        evaluation = self.workflow.evaluate_trigger_conditions(self.group_event)
+        evaluation = self.workflow.evaluate_trigger_conditions(self.job)
         assert evaluation is False
 
     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)
+        evaluation = self.workflow.evaluate_trigger_conditions(self.job)
         assert evaluation is True
diff --git a/tests/sentry/workflow_engine/processors/test_action.py b/tests/sentry/workflow_engine/processors/test_action.py
index 097890ab8fc535..72534ccad5fedb 100644
--- a/tests/sentry/workflow_engine/processors/test_action.py
+++ b/tests/sentry/workflow_engine/processors/test_action.py
@@ -1,5 +1,6 @@
 from sentry.workflow_engine.models.data_condition import Condition
 from sentry.workflow_engine.processors.action import evaluate_workflow_action_filters
+from sentry.workflow_engine.types import WorkflowJob
 from tests.sentry.workflow_engine.test_base import BaseWorkflowTest
 
 
@@ -15,33 +16,32 @@ def setUp(self):
         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})
+            occurrence=self.build_occurrence(evidence_data={"detector_id": self.detector.id})
         )
+        self.job = WorkflowJob({"event": self.group_event})
 
     def test_basic__no_filter(self):
-        triggered_actions = evaluate_workflow_action_filters({self.workflow}, self.group_event)
+        triggered_actions = evaluate_workflow_action_filters({self.workflow}, self.job)
         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",
+            type=Condition.EVENT_SEEN_COUNT,
             comparison=1,
             condition_result=True,
         )
 
-        triggered_actions = evaluate_workflow_action_filters({self.workflow}, self.group_event)
+        triggered_actions = evaluate_workflow_action_filters({self.workflow}, self.job)
         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",
+            type=Condition.EVENT_CREATED_BY_DETECTOR,
             comparison=self.detector.id + 1,
         )
 
-        triggered_actions = evaluate_workflow_action_filters({self.workflow}, self.group_event)
+        triggered_actions = evaluate_workflow_action_filters({self.workflow}, self.job)
         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
index f01cae51903246..c4629bbec753bb 100644
--- a/tests/sentry/workflow_engine/processors/test_data_condition_group.py
+++ b/tests/sentry/workflow_engine/processors/test_data_condition_group.py
@@ -2,6 +2,7 @@
 
 from sentry.testutils.cases import TestCase
 from sentry.workflow_engine.models import DataConditionGroup
+from sentry.workflow_engine.models.data_condition import Condition
 from sentry.workflow_engine.processors.data_condition_group import (
     evaluate_condition_group,
     get_data_conditions_for_group,
@@ -31,7 +32,7 @@ def test_process_data_condition_group(self):
     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
+            condition_group=data_condition_group, type=Condition.GREATER, comparison=5
         )
 
         assert process_data_condition_group(data_condition_group.id, 1) == (False, [])
@@ -40,7 +41,7 @@ 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",
+            type=Condition.GREATER,
             comparison=5,
             condition_result=DetectorPriorityLevel.HIGH,
         )
@@ -57,14 +58,14 @@ def setUp(self):
         )
 
         self.data_condition = self.create_data_condition(
-            condition="gt",
+            type=Condition.GREATER,
             comparison=5,
             condition_result=DetectorPriorityLevel.HIGH,
             condition_group=self.data_condition_group,
         )
 
         self.data_condition_two = self.create_data_condition(
-            condition="gt",
+            type=Condition.GREATER,
             comparison=3,
             condition_result=DetectorPriorityLevel.LOW,
             condition_group=self.data_condition_group,
@@ -116,15 +117,15 @@ def setUp(self):
         )
 
         self.data_condition = self.create_data_condition(
-            condition="gt",
             comparison=5,
+            type=Condition.GREATER,
             condition_result=True,
             condition_group=self.data_condition_group,
         )
 
         self.data_condition_two = self.create_data_condition(
-            condition="gt",
             comparison=3,
+            type=Condition.GREATER,
             condition_result=True,
             condition_group=self.data_condition_group,
         )
@@ -169,15 +170,15 @@ def setUp(self):
         )
 
         self.data_condition = self.create_data_condition(
-            condition="gt",
             comparison=5,
+            type=Condition.GREATER,
             condition_result=DetectorPriorityLevel.HIGH,
             condition_group=self.data_condition_group,
         )
 
         self.data_condition_two = self.create_data_condition(
-            condition="gt",
             comparison=3,
+            type=Condition.GREATER,
             condition_result=DetectorPriorityLevel.LOW,
             condition_group=self.data_condition_group,
         )
@@ -219,15 +220,15 @@ def setUp(self):
         )
 
         self.data_condition = self.create_data_condition(
-            condition="gt",
             comparison=5,
+            type=Condition.GREATER,
             condition_result=DetectorPriorityLevel.HIGH,
             condition_group=self.data_condition_group,
         )
 
         self.data_condition_two = self.create_data_condition(
-            condition="gt",
             comparison=3,
+            type=Condition.GREATER,
             condition_result=DetectorPriorityLevel.LOW,
             condition_group=self.data_condition_group,
         )
diff --git a/tests/sentry/workflow_engine/processors/test_data_packet.py b/tests/sentry/workflow_engine/processors/test_data_packet.py
new file mode 100644
index 00000000000000..2b4b74f8cd6d2b
--- /dev/null
+++ b/tests/sentry/workflow_engine/processors/test_data_packet.py
@@ -0,0 +1,22 @@
+from sentry.incidents.utils.types import DATA_SOURCE_SNUBA_QUERY_SUBSCRIPTION
+from sentry.workflow_engine.processors.data_packet import process_data_packets
+from sentry.workflow_engine.types import DetectorPriorityLevel
+from tests.sentry.workflow_engine.test_base import BaseWorkflowTest
+
+
+class TestProcessDataPacket(BaseWorkflowTest):
+    def setUp(self):
+        self.snuba_query = self.create_snuba_query()
+
+        (self.workflow, self.detector, self.detector_workflow, self.workflow_triggers) = (
+            self.create_detector_and_workflow()
+        )
+
+        self.data_source, self.data_packet = self.create_test_query_data_source(self.detector)
+
+    def test_single_data_packet(self):
+        results = process_data_packets([self.data_packet], DATA_SOURCE_SNUBA_QUERY_SUBSCRIPTION)
+        assert len(results) == 1
+
+        detector, detector_evaluation_result = results[0]
+        assert detector_evaluation_result[None].priority == DetectorPriorityLevel.HIGH
diff --git a/tests/sentry/workflow_engine/processors/test_data_sources.py b/tests/sentry/workflow_engine/processors/test_data_sources.py
index 2e655b67007085..f57274f87a7f8d 100644
--- a/tests/sentry/workflow_engine/processors/test_data_sources.py
+++ b/tests/sentry/workflow_engine/processors/test_data_sources.py
@@ -1,7 +1,10 @@
+from unittest import mock
+
 from sentry.snuba.models import SnubaQuery
 from sentry.testutils.cases import TestCase
 from sentry.workflow_engine.models import DataPacket
 from sentry.workflow_engine.processors import process_data_sources
+from sentry.workflow_engine.registry import data_source_type_registry
 
 
 class TestProcessDataSources(TestCase):
@@ -16,6 +19,9 @@ def create_snuba_query(self, **kwargs):
         )
 
     def setUp(self):
+        # check that test_base registers the data_source_type_registry
+        assert isinstance(data_source_type_registry.get("test"), mock.Mock)
+
         self.query = self.create_snuba_query()
         self.query_two = self.create_snuba_query()
 
diff --git a/tests/sentry/workflow_engine/processors/test_detector.py b/tests/sentry/workflow_engine/processors/test_detector.py
index 72ab028b74a6ae..28f78180c52502 100644
--- a/tests/sentry/workflow_engine/processors/test_detector.py
+++ b/tests/sentry/workflow_engine/processors/test_detector.py
@@ -121,9 +121,16 @@ def test_state_results_multi_group(self, mock_produce_occurrence_to_kafka):
         )
 
     def test_no_issue_type(self):
-        detector = self.create_detector(type="invalid slug")
+        detector = self.create_detector(type=self.handler_state_type.slug)
         data_packet = self.build_data_packet()
-        with mock.patch("sentry.workflow_engine.models.detector.logger") as mock_logger:
+        with (
+            mock.patch("sentry.workflow_engine.models.detector.logger") as mock_logger,
+            mock.patch(
+                "sentry.workflow_engine.models.Detector.group_type",
+                return_value=None,
+                new_callable=mock.PropertyMock,
+            ),
+        ):
             results = process_detectors(data_packet, [detector])
             assert mock_logger.error.call_args[0][0] == "No registered grouptype for detector"
         assert results == []
@@ -326,7 +333,7 @@ def test_above_below_threshold(self):
         }
 
     def test_no_condition_group(self):
-        detector = self.create_detector()
+        detector = self.create_detector(type=self.handler_type.slug)
         handler = MockDetectorStateHandler(detector)
         with mock.patch(
             "sentry.workflow_engine.handlers.detector.stateful.metrics"
diff --git a/tests/sentry/workflow_engine/processors/test_workflow.py b/tests/sentry/workflow_engine/processors/test_workflow.py
index 8286157cc19db8..a41c976a022598 100644
--- a/tests/sentry/workflow_engine/processors/test_workflow.py
+++ b/tests/sentry/workflow_engine/processors/test_workflow.py
@@ -1,9 +1,11 @@
 from unittest import mock
 
+from sentry.eventstream.base import GroupState
+from sentry.issues.grouptype import ErrorGroupType
 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 sentry.workflow_engine.types import WorkflowJob
 from tests.sentry.workflow_engine.test_base import BaseWorkflowTest
 
 
@@ -20,29 +22,55 @@ def setUp(self):
             self.create_detector_and_workflow(
                 name_prefix="error",
                 workflow_triggers=self.create_data_condition_group(),
-                detector_type=DetectorType.ERROR,
+                detector_type=ErrorGroupType.slug,
             )
         )
 
         self.group, self.event, self.group_event = self.create_group_event()
+        self.job = WorkflowJob(
+            {
+                "event": self.group_event,
+                "group_state": GroupState(
+                    id=1, is_new=False, is_regression=True, is_new_group_environment=False
+                ),
+            }
+        )
 
     def test_error_event(self):
-        triggered_workflows = process_workflows(self.group_event)
+        triggered_workflows = process_workflows(self.job)
         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)
+        triggered_workflows = process_workflows(self.job)
         assert triggered_workflows == {self.workflow}
 
+    def test_regressed_event(self):
+        dcg = self.create_data_condition_group()
+        self.create_data_condition(
+            type=Condition.REGRESSION_EVENT,
+            comparison=True,
+            condition_result=True,
+            condition_group=dcg,
+        )
+
+        workflow = self.create_workflow(when_condition_group=dcg)
+        self.create_detector_workflow(
+            detector=self.error_detector,
+            workflow=workflow,
+        )
+
+        triggered_workflows = process_workflows(self.job)
+        assert triggered_workflows == {self.error_workflow, 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)
+                triggered_workflows = process_workflows(self.job)
 
                 assert not triggered_workflows
 
@@ -62,17 +90,18 @@ def setUp(self):
             self.workflow_triggers,
         ) = self.create_detector_and_workflow()
 
-        occurrence = self.build_occurrence_data(evidence_data={"detector_id": self.detector.id})
+        occurrence = self.build_occurrence(evidence_data={"detector_id": self.detector.id})
         self.group, self.event, self.group_event = self.create_group_event(
             occurrence=occurrence,
         )
+        self.job = WorkflowJob({"event": self.group_event})
 
     def test_workflow_trigger(self):
-        triggered_workflows = evaluate_workflow_triggers({self.workflow}, self.group_event)
+        triggered_workflows = evaluate_workflow_triggers({self.workflow}, self.job)
         assert triggered_workflows == {self.workflow}
 
     def test_no_workflow_trigger(self):
-        triggered_workflows = evaluate_workflow_triggers(set(), self.group_event)
+        triggered_workflows = evaluate_workflow_triggers(set(), self.job)
         assert not triggered_workflows
 
     def test_workflow_many_filters(self):
@@ -81,13 +110,12 @@ def test_workflow_many_filters(self):
 
         self.create_data_condition(
             condition_group=self.workflow.when_condition_group,
-            type=Condition.GROUP_EVENT_ATTR_COMPARISON,
-            condition="occurrence.evidence_data.detector_id",
+            type=Condition.EVENT_CREATED_BY_DETECTOR,
             comparison=self.detector.id,
             condition_result=75,
         )
 
-        triggered_workflows = evaluate_workflow_triggers({self.workflow}, self.group_event)
+        triggered_workflows = evaluate_workflow_triggers({self.workflow}, self.job)
         assert triggered_workflows == {self.workflow}
 
     def test_workflow_filterd_out(self):
@@ -96,18 +124,15 @@ def test_workflow_filterd_out(self):
 
         self.create_data_condition(
             condition_group=self.workflow.when_condition_group,
-            type=Condition.GROUP_EVENT_ATTR_COMPARISON,
-            condition="occurrence.evidence_data.detector_id",
+            type=Condition.EVENT_CREATED_BY_DETECTOR,
             comparison=self.detector.id + 1,
         )
 
-        triggered_workflows = evaluate_workflow_triggers({self.workflow}, self.group_event)
+        triggered_workflows = evaluate_workflow_triggers({self.workflow}, self.job)
         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
-        )
+        triggered_workflows = evaluate_workflow_triggers({self.workflow, workflow_two}, self.job)
 
         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
index 0109d3c051ac45..ff4545fb8ab9d9 100644
--- a/tests/sentry/workflow_engine/test_base.py
+++ b/tests/sentry/workflow_engine/test_base.py
@@ -1,22 +1,38 @@
-from datetime import datetime
+from datetime import UTC, datetime
+from unittest import mock
 from uuid import uuid4
 
 from sentry.eventstore.models import Event, GroupEvent
+from sentry.incidents.grouptype import MetricAlertFire
+from sentry.incidents.utils.types import QuerySubscriptionUpdate
+from sentry.issues.issue_occurrence import IssueOccurrence
 from sentry.models.group import Group
+from sentry.models.project import Project
 from sentry.snuba.models import SnubaQuery
 from sentry.testutils.cases import TestCase
 from sentry.testutils.factories import EventType
+from sentry.utils.registry import AlreadyRegisteredError
 from sentry.workflow_engine.models import (
     Action,
     DataConditionGroup,
+    DataPacket,
+    DataSource,
     Detector,
     DetectorWorkflow,
     Workflow,
 )
 from sentry.workflow_engine.models.data_condition import Condition
-from sentry.workflow_engine.types import DetectorType
+from sentry.workflow_engine.registry import data_source_type_registry
+from sentry.workflow_engine.types import DetectorPriorityLevel
 from tests.sentry.issues.test_utils import OccurrenceTestMixin
 
+try:
+    type_mock = mock.Mock()
+    data_source_type_registry.register("test")(type_mock)
+except AlreadyRegisteredError:
+    # Ensure "test" is mocked for tests, but don't fail if already registered here.
+    pass
+
 
 class BaseWorkflowTest(TestCase, OccurrenceTestMixin):
     def create_snuba_query(self, **kwargs):
@@ -64,19 +80,22 @@ def create_event(
 
     def create_detector_and_workflow(
         self,
-        name_prefix="test",
+        name_prefix: str = "test",
         workflow_triggers: DataConditionGroup | None = None,
-        detector_type: DetectorType | str = "TestDetector",
+        detector_type: str = MetricAlertFire.slug,
         **kwargs,
     ) -> tuple[Workflow, Detector, DetectorWorkflow, DataConditionGroup]:
+        """
+        Create a Worfkllow, Detector, DetectorWorkflow, and DataConditionGroup for testing.
+        These models are configured to work together to test the workflow engine.
+        """
         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",
+                type=Condition.EVENT_SEEN_COUNT,
                 comparison=1,
                 condition_result=True,
             )
@@ -100,6 +119,46 @@ def create_detector_and_workflow(
 
         return workflow, detector, detector_workflow, workflow_triggers
 
+    def create_test_query_data_source(self, detector: Detector) -> tuple[DataSource, DataPacket]:
+        """
+        Create a DataSource and DataPacket for testing; this will create a fake QuerySubscriptionUpdate and link it to a data_source.
+
+        A detector is required to create this test data, so we can ensure that the detector
+        has a condition to evaluate for the data_packet that evalutes to true.
+        """
+        subscription_update: QuerySubscriptionUpdate = {
+            "subscription_id": "123",
+            "values": {"foo": 1},
+            "timestamp": datetime.now(UTC),
+            "entity": "test-entity",
+        }
+
+        data_source = self.create_data_source(
+            query_id=subscription_update["subscription_id"],
+            organization=self.organization,
+        )
+
+        data_source.detectors.add(detector)
+
+        if detector.workflow_condition_group is None:
+            detector.workflow_condition_group = self.create_data_condition_group(logic_type="any")
+            detector.save()
+
+            self.create_data_condition(
+                condition_group=detector.workflow_condition_group,
+                type=Condition.EQUAL,
+                condition_result=DetectorPriorityLevel.HIGH,
+                comparison=1,
+            )
+
+        # Create a data_packet from the update for testing
+        data_packet = DataPacket[QuerySubscriptionUpdate](
+            query_id=subscription_update["subscription_id"],
+            packet=subscription_update,
+        )
+
+        return data_source, data_packet
+
     def create_workflow_action(
         self,
         workflow: Workflow,
@@ -108,7 +167,7 @@ def create_workflow_action(
         action_group = self.create_data_condition_group(logic_type="any-short")
 
         action = self.create_action(
-            type=Action.Type.NOTIFICATION,
+            type=Action.Type.SLACK,
             data={"message": "test"},
             **kwargs,
         )
@@ -123,15 +182,23 @@ def create_workflow_action(
 
         return action_group, action
 
-    def create_group_event(self, project=None, occurrence=None) -> tuple[Group, Event, GroupEvent]:
+    def create_group_event(
+        self,
+        project: Project | None = None,
+        event: Event | None = None,
+        occurrence: IssueOccurrence | None = None,
+        fingerprint="test_fingerprint",
+    ) -> tuple[Group, Event, GroupEvent]:
         project = project or self.project
-        group = self.create_group(project)
-        event = self.create_event(
+        event = event or self.create_event(
             project.id,
             datetime.now(),
-            "test_fingerprint",
+            fingerprint,
         )
 
+        group = self.create_group(project=project)
+        event.for_group(group)
+
         group_event = GroupEvent(
             self.project.id,
             event.event_id,
diff --git a/tests/sentry/workflow_engine/test_integration.py b/tests/sentry/workflow_engine/test_integration.py
new file mode 100644
index 00000000000000..8f85963cc74d0c
--- /dev/null
+++ b/tests/sentry/workflow_engine/test_integration.py
@@ -0,0 +1,180 @@
+from datetime import datetime
+from unittest import mock
+
+from sentry.eventstream.types import EventStreamEventType
+from sentry.incidents.grouptype import MetricAlertFire
+from sentry.incidents.utils.types import DATA_SOURCE_SNUBA_QUERY_SUBSCRIPTION
+from sentry.issues.grouptype import ErrorGroupType
+from sentry.issues.ingest import save_issue_occurrence
+from sentry.models.group import Group
+from sentry.tasks.post_process import post_process_group
+from sentry.testutils.helpers.features import with_feature
+from sentry.workflow_engine.models.data_condition import Condition
+from sentry.workflow_engine.processors import process_data_sources, process_detectors
+from sentry.workflow_engine.types import DetectorPriorityLevel
+from tests.sentry.workflow_engine.test_base import BaseWorkflowTest
+
+
+class BaseWorkflowIntegrationTest(BaseWorkflowTest):
+    def setUp(self):
+        (
+            self.workflow,
+            self.detector,
+            self.detector_workflow,
+            self.workflow_triggers,
+        ) = self.create_detector_and_workflow(
+            name_prefix="e2e-test",
+            detector_type="metric_alert_fire",
+        )
+
+        detector_conditions = self.create_data_condition_group()
+        self.create_data_condition(
+            condition_group=detector_conditions,
+            type=Condition.EQUAL,
+            condition_result=DetectorPriorityLevel.HIGH,
+            comparison=1,
+        )
+        self.detector.workflow_condition_group = detector_conditions
+        self.detector.save()
+
+        self.action_group, self.action = self.create_workflow_action(workflow=self.workflow)
+        self.event = self.store_event(data={}, project_id=self.project.id)
+
+        occurrence_data = self.build_occurrence_data(
+            event_id=self.event.event_id,
+            project_id=self.project.id,
+            fingerprint=[f"detector-{self.detector.id}"],
+            evidence_data={"detector_id": self.detector.id},
+            type=MetricAlertFire.type_id,
+        )
+
+        self.occurrence, group_info = save_issue_occurrence(occurrence_data, self.event)
+        assert group_info is not None
+
+        self.group = Group.objects.get(grouphash__hash=self.occurrence.fingerprint[0])
+        assert self.group.type == MetricAlertFire.type_id
+
+    def call_post_process_group(
+        self,
+        group_id,
+        is_new=False,
+        is_regression=False,
+        is_new_group_environment=True,
+        cache_key=None,
+    ):
+        post_process_group(
+            is_new=is_new,
+            is_regression=is_regression,
+            is_new_group_environment=is_new_group_environment,
+            cache_key=cache_key,
+            group_id=group_id,
+            occurrence_id=self.occurrence.id,
+            project_id=self.project.id,
+            eventstream_type=EventStreamEventType.Generic,
+        )
+
+        return cache_key
+
+
+class TestWorkflowEngineIntegrationToIssuePlatform(BaseWorkflowIntegrationTest):
+    @with_feature("organizations:workflow-engine-metric-alert-processing")
+    def test_workflow_engine__data_source__to_metric_issue_workflow(self):
+        """
+        This test ensures that a data_source can create the correct event in Issue Platform
+        """
+        self.data_source, self.data_packet = self.create_test_query_data_source(self.detector)
+
+        with mock.patch(
+            "sentry.workflow_engine.processors.detector.produce_occurrence_to_kafka"
+        ) as mock_producer:
+            processed_packets = process_data_sources(
+                [self.data_packet], DATA_SOURCE_SNUBA_QUERY_SUBSCRIPTION
+            )
+
+            for packet, detectors in processed_packets:
+                results = process_detectors(packet, detectors)
+                assert len(results) == 1
+
+            mock_producer.assert_called_once()
+
+    @with_feature("organizations:workflow-engine-metric-alert-processing")
+    def test_workflow_engine__data_source__different_type(self):
+        self.data_source, self.data_packet = self.create_test_query_data_source(self.detector)
+
+        with mock.patch(
+            "sentry.workflow_engine.processors.detector.produce_occurrence_to_kafka"
+        ) as mock_producer:
+            # Change the type to mismatch from the packet. This should not find any detectors and return.
+            processed_packets = process_data_sources([self.data_packet], "snuba_query")
+
+            assert processed_packets == []
+            mock_producer.assert_not_called()
+
+    @with_feature("organizations:workflow-engine-metric-alert-processing")
+    def test_workflow_engine__data_source__no_detectors(self):
+        self.data_source, self.data_packet = self.create_test_query_data_source(self.detector)
+        self.detector.delete()
+
+        with mock.patch(
+            "sentry.workflow_engine.processors.detector.produce_occurrence_to_kafka"
+        ) as mock_producer:
+            processed_packets = process_data_sources(
+                [self.data_packet], DATA_SOURCE_SNUBA_QUERY_SUBSCRIPTION
+            )
+
+            assert processed_packets == []
+            mock_producer.assert_not_called()
+
+
+class TestWorkflowEngineIntegrationFromIssuePlatform(BaseWorkflowIntegrationTest):
+    @with_feature("organizations:workflow-engine-metric-alert-processing")
+    def test_workflow_engine__workflows(self):
+        """
+        This test ensures that the workflow engine is correctly hooked up to tasks/post_process.py.
+        """
+        self.create_event(self.project.id, datetime.utcnow(), str(self.detector.id))
+
+        with mock.patch(
+            "sentry.workflow_engine.processors.workflow.process_workflows"
+        ) as mock_process_workflow:
+            self.call_post_process_group(self.group.id)
+            mock_process_workflow.assert_called_once()
+
+    @with_feature("organizations:workflow-engine-metric-alert-processing")
+    def test_workflow_engine__workflows__other_events(self):
+        """
+        Ensure that the workflow engine only supports MetricAlertFire events for now.
+        """
+        error_event = self.store_event(data={}, project_id=self.project.id)
+
+        occurrence_data = self.build_occurrence_data(
+            event_id=error_event.event_id,
+            project_id=self.project.id,
+            fingerprint=[f"detector-{self.detector.id}"],
+            evidence_data={},
+            type=ErrorGroupType.type_id,
+        )
+
+        self.occurrence, group_info = save_issue_occurrence(occurrence_data, error_event)
+        self.group = Group.objects.get(grouphash__hash=self.occurrence.fingerprint[0])
+
+        with mock.patch(
+            "sentry.workflow_engine.processors.workflow.process_workflows"
+        ) as mock_process_workflow:
+            self.call_post_process_group(error_event.group_id)
+
+            # We currently don't have a detector for this issue type, so it should not call workflow_engine.
+            mock_process_workflow.assert_not_called()
+
+    def test_workflow_engine__workflows__no_flag(self):
+        self.create_event(self.project.id, datetime.utcnow(), str(self.detector.id))
+
+        assert self.group
+
+        with mock.patch(
+            "sentry.workflow_engine.processors.workflow.process_workflows"
+        ) as mock_process_workflow:
+            self.call_post_process_group(self.group.id)
+
+            # While this is the same test as the first one, it doesn't invoke the workflow engine because the feature flag is off.
+            mock_process_workflow.assert_not_called()
diff --git a/tests/sentry_plugins/phabricator/test_plugin.py b/tests/sentry_plugins/phabricator/test_plugin.py
index 5f44e9cbc5401a..4d89ba5632bbc9 100644
--- a/tests/sentry_plugins/phabricator/test_plugin.py
+++ b/tests/sentry_plugins/phabricator/test_plugin.py
@@ -1,7 +1,6 @@
 from functools import cached_property
 
 import responses
-from django.test import RequestFactory
 from pytest import raises
 
 from sentry.exceptions import PluginError
@@ -15,10 +14,6 @@ class PhabricatorPluginTest(PluginTestCase):
     def plugin(self):
         return PhabricatorPlugin()
 
-    @cached_property
-    def request(self):
-        return RequestFactory()
-
     def test_conf_key(self):
         assert self.plugin.conf_key == "phabricator"
 
diff --git a/tests/sentry_plugins/trello/test_plugin.py b/tests/sentry_plugins/trello/test_plugin.py
index f35a6f62bde25b..b3fa257253ab1f 100644
--- a/tests/sentry_plugins/trello/test_plugin.py
+++ b/tests/sentry_plugins/trello/test_plugin.py
@@ -3,7 +3,6 @@
 
 import orjson
 import responses
-from django.test import RequestFactory
 
 from sentry.testutils.cases import PluginTestCase
 from sentry_plugins.trello.plugin import TrelloPlugin
@@ -14,10 +13,6 @@ class TrelloPluginTestBase(PluginTestCase):
     def plugin(self):
         return TrelloPlugin()
 
-    @cached_property
-    def request(self):
-        return RequestFactory()
-
 
 class TrelloPluginTest(TrelloPluginTestBase):
     def test_conf_key(self):
diff --git a/tests/snuba/api/endpoints/test_organization_event_details.py b/tests/snuba/api/endpoints/test_organization_event_details.py
index aa983b470c65a6..09d6a7bfa07e4e 100644
--- a/tests/snuba/api/endpoints/test_organization_event_details.py
+++ b/tests/snuba/api/endpoints/test_organization_event_details.py
@@ -6,7 +6,7 @@
 from sentry.models.group import Group
 from sentry.search.events import constants
 from sentry.testutils.cases import APITestCase, MetricsEnhancedPerformanceTestCase, SnubaTestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.helpers.options import override_options
 from sentry.utils.samples import load_data
 from tests.sentry.issues.test_utils import OccurrenceTestMixin
@@ -14,10 +14,6 @@
 pytestmark = pytest.mark.sentry_metrics
 
 
-def format_project_event(project_id_or_slug, event_id):
-    return f"{project_id_or_slug}:{event_id}"
-
-
 class OrganizationEventDetailsEndpointTest(APITestCase, SnubaTestCase, OccurrenceTestMixin):
     def setUp(self):
         super().setUp()
@@ -214,7 +210,7 @@ def test_long_trace_description(self):
         data = load_data("transaction")
         data["event_id"] = "d" * 32
         data["timestamp"] = before_now(minutes=1).isoformat()
-        data["start_timestamp"] = iso_format(before_now(minutes=1) - timedelta(seconds=5))
+        data["start_timestamp"] = (before_now(minutes=1) - timedelta(seconds=5)).isoformat()
         data["contexts"]["trace"]["description"] = "b" * 512
         self.store_event(data=data, project_id=self.project.id)
 
@@ -381,7 +377,7 @@ def test_get_multiple_columns(self):
                             "avg(span.self_time)": 1.0,
                             "avg(span.duration)": 2.0,
                         }
-                    if span["op"] == "django.middlewares":
+                    if span["op"] == "django.middleware":
                         assert self.RESULT_COLUMN not in span
 
     def test_nan_column(self):
@@ -397,7 +393,7 @@ def test_nan_column(self):
                 for span in entry["data"]:
                     if span["op"] == "db":
                         assert span[self.RESULT_COLUMN] == {"avg(span.self_time)": 1.0}
-                    if span["op"] == "django.middlewares":
+                    if span["op"] == "django.middleware":
                         assert self.RESULT_COLUMN not in span
 
     def test_invalid_column(self):
diff --git a/tests/snuba/api/endpoints/test_organization_events.py b/tests/snuba/api/endpoints/test_organization_events.py
index 56f73b7b8e3d57..8eb9c68151b429 100644
--- a/tests/snuba/api/endpoints/test_organization_events.py
+++ b/tests/snuba/api/endpoints/test_organization_events.py
@@ -36,9 +36,8 @@
     SpanTestCase,
 )
 from sentry.testutils.helpers import parse_link_header
-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.helpers.discover import user_misery_formula
-from sentry.testutils.skips import requires_not_arm64
 from sentry.types.group import GroupSubStatus
 from sentry.utils import json
 from sentry.utils.samples import load_data
@@ -57,7 +56,7 @@ def setUp(self):
         super().setUp()
         self.nine_mins_ago = before_now(minutes=9)
         self.ten_mins_ago = before_now(minutes=10)
-        self.ten_mins_ago_iso = iso_format(self.ten_mins_ago)
+        self.ten_mins_ago_iso = self.ten_mins_ago.replace(microsecond=0).isoformat()
         self.eleven_mins_ago = before_now(minutes=11)
         self.eleven_mins_ago_iso = self.eleven_mins_ago.isoformat()
         self.transaction_data = load_data("transaction", timestamp=self.ten_mins_ago)
@@ -3042,9 +3041,13 @@ def test_any_field_alias(self):
         result = {r["any(user.display)"] for r in data}
         assert result == {"cathy@example.com"}
         result = {r["any(timestamp.to_day)"][:19] for r in data}
-        assert result == {iso_format(day_ago.replace(hour=0, minute=0, second=0, microsecond=0))}
+        assert result == {
+            day_ago.replace(hour=0, minute=0, second=0, microsecond=0, tzinfo=None).isoformat()
+        }
         result = {r["any(timestamp.to_hour)"][:19] for r in data}
-        assert result == {iso_format(day_ago.replace(minute=0, second=0, microsecond=0))}
+        assert result == {
+            day_ago.replace(minute=0, second=0, microsecond=0, tzinfo=None).isoformat()
+        }
 
     def test_field_aliases_in_conflicting_functions(self):
         self.store_event(
@@ -3335,7 +3338,7 @@ def test_all_aggregates_in_columns(self):
         assert response.status_code == 200, response.content
         data = response.data["data"]
         assert len(data) == 1
-        assert self.ten_mins_ago_iso[:-5] in data[0]["last_seen()"]
+        assert self.ten_mins_ago_iso == data[0]["last_seen()"]
         assert data[0]["latest_event()"] == event.event_id
 
         query = {
@@ -3373,7 +3376,6 @@ def test_all_aggregates_in_columns(self):
         assert data[0]["linear_regression(transaction.duration, transaction.duration)"] == [0, 0]
         assert data[0]["sum(transaction.duration)"] == 10000
 
-    @requires_not_arm64
     def test_null_user_misery_returns_zero(self):
         self.transaction_data["user"] = None
         self.transaction_data["transaction"] = "/no_users/1"
@@ -3393,7 +3395,6 @@ def test_null_user_misery_returns_zero(self):
             data = response.data["data"]
             assert data[0]["user_misery(300)"] == 0
 
-    @requires_not_arm64
     def test_null_user_misery_new_returns_zero(self):
         self.transaction_data["user"] = None
         self.transaction_data["transaction"] = "/no_users/1"
@@ -6626,35 +6627,6 @@ def test_performance_score(self):
             "performance_score(measurements.score.lcp)": 0.7923076923076923,
         }
 
-    def test_weighted_performance_score(self):
-        self.transaction_data["measurements"] = {
-            "score.lcp": {"value": 0.03},
-            "score.weight.lcp": {"value": 0.3},
-            "score.total": {"value": 0.03},
-        }
-        self.store_event(self.transaction_data, self.project.id)
-        self.transaction_data["measurements"] = {
-            "score.lcp": {"value": 1.0},
-            "score.weight.lcp": {"value": 1.0},
-            "score.total": {"value": 1.0},
-        }
-        self.store_event(self.transaction_data, self.project.id)
-        self.transaction_data["measurements"] = {
-            "score.total": {"value": 0.0},
-        }
-        self.store_event(self.transaction_data, self.project.id)
-        query = {
-            "field": [
-                "weighted_performance_score(measurements.score.lcp)",
-            ]
-        }
-        response = self.do_request(query)
-        assert response.status_code == 200, response.content
-        assert len(response.data["data"]) == 1
-        assert response.data["data"][0] == {
-            "weighted_performance_score(measurements.score.lcp)": 0.3433333333333333,
-        }
-
     def test_invalid_performance_score_column(self):
         self.transaction_data["measurements"] = {
             "score.total": {"value": 0.0},
@@ -6668,19 +6640,6 @@ def test_invalid_performance_score_column(self):
         response = self.do_request(query)
         assert response.status_code == 400, response.content
 
-    def test_invalid_weighted_performance_score_column(self):
-        self.transaction_data["measurements"] = {
-            "score.total": {"value": 0.0},
-        }
-        self.store_event(self.transaction_data, self.project.id)
-        query = {
-            "field": [
-                "weighted_performance_score(measurements.score.fp)",
-            ]
-        }
-        response = self.do_request(query)
-        assert response.status_code == 400, response.content
-
     def test_all_events_fields(self):
         user_data = {
             "id": self.user.id,
diff --git a/tests/snuba/api/endpoints/test_organization_events_facets_performance.py b/tests/snuba/api/endpoints/test_organization_events_facets_performance.py
index 00b5051a37ee72..55431088313d6c 100644
--- a/tests/snuba/api/endpoints/test_organization_events_facets_performance.py
+++ b/tests/snuba/api/endpoints/test_organization_events_facets_performance.py
@@ -3,7 +3,7 @@
 from django.urls import reverse
 
 from sentry.testutils.cases import APITestCase, SnubaTestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.utils.samples import load_data
 
 
@@ -60,10 +60,8 @@ def setUp(self):
         )
 
     def store_transaction(
-        self, name="exampleTransaction", duration=100, tags=None, project_id=None, lcp=None
+        self, name="exampleTransaction", duration=100, project_id=None, lcp=None, *, tags
     ):
-        if tags is None:
-            tags = []
         if project_id is None:
             project_id = self.project.id
         event = load_data("transaction")
@@ -72,7 +70,7 @@ def store_transaction(
             {
                 "transaction": name,
                 "event_id": f"{self._transaction_count:02x}".rjust(32, "0"),
-                "start_timestamp": iso_format(self.two_mins_ago - timedelta(seconds=duration)),
+                "start_timestamp": (self.two_mins_ago - timedelta(seconds=duration)).isoformat(),
                 "timestamp": self.two_mins_ago.isoformat(),
             }
         )
diff --git a/tests/snuba/api/endpoints/test_organization_events_facets_performance_histogram.py b/tests/snuba/api/endpoints/test_organization_events_facets_performance_histogram.py
index 4c61734ba33f19..a827ea458d4f31 100644
--- a/tests/snuba/api/endpoints/test_organization_events_facets_performance_histogram.py
+++ b/tests/snuba/api/endpoints/test_organization_events_facets_performance_histogram.py
@@ -2,7 +2,6 @@
 
 from django.urls import reverse
 
-from sentry.testutils.helpers.datetime import iso_format
 from sentry.utils.cursors import Cursor
 from sentry.utils.samples import load_data
 from tests.snuba.api.endpoints.test_organization_events_facets_performance import (
@@ -52,13 +51,12 @@ def store_transaction(
         self,
         name="exampleTransaction",
         duration=100,
-        tags=None,
         project_id=None,
         lcp=None,
         user_id=None,
+        *,
+        tags,
     ):
-        if tags is None:
-            tags = []
         if project_id is None:
             project_id = self.project.id
         event = load_data("transaction")
@@ -67,7 +65,7 @@ def store_transaction(
             {
                 "transaction": name,
                 "event_id": f"{self._transaction_count:02x}".rjust(32, "0"),
-                "start_timestamp": iso_format(self.two_mins_ago - timedelta(seconds=duration)),
+                "start_timestamp": (self.two_mins_ago - timedelta(seconds=duration)).isoformat(),
                 "timestamp": self.two_mins_ago.isoformat(),
             }
         )
diff --git a/tests/snuba/api/endpoints/test_organization_events_histogram.py b/tests/snuba/api/endpoints/test_organization_events_histogram.py
index 59529a36e3acd8..31a99c44b0c73b 100644
--- a/tests/snuba/api/endpoints/test_organization_events_histogram.py
+++ b/tests/snuba/api/endpoints/test_organization_events_histogram.py
@@ -11,7 +11,7 @@
 
 from sentry.sentry_metrics.aggregation_option_registry import AggregationOption
 from sentry.testutils.cases import APITestCase, MetricsEnhancedPerformanceTestCase, SnubaTestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.utils.samples import load_data
 from sentry.utils.snuba import get_array_column_alias
 
@@ -43,7 +43,7 @@ def populate_events(self, specs):
                     breakdown_name = f"ops.{suffix_key}"
 
                     data["timestamp"] = start.isoformat()
-                    data["start_timestamp"] = iso_format(start - timedelta(seconds=i))
+                    data["start_timestamp"] = (start - timedelta(seconds=i)).isoformat()
                     value = random.random() * (spec.end - spec.start) + spec.start
                     data["transaction"] = f"/measurement/{measurement_name}/value/{value}"
 
diff --git a/tests/snuba/api/endpoints/test_organization_events_mep.py b/tests/snuba/api/endpoints/test_organization_events_mep.py
index 4e77c88c21394f..5ea16a2954cacf 100644
--- a/tests/snuba/api/endpoints/test_organization_events_mep.py
+++ b/tests/snuba/api/endpoints/test_organization_events_mep.py
@@ -2815,87 +2815,6 @@ def test_performance_score_boundaries(self):
         assert meta["isMetricsData"]
         assert field_meta["performance_score(measurements.score.ttfb)"] == "number"
 
-    def test_weighted_performance_score(self):
-        self.store_transaction_metric(
-            0.03,
-            metric="measurements.score.ttfb",
-            tags={"transaction": "foo_transaction"},
-            timestamp=self.min_ago,
-        )
-        self.store_transaction_metric(
-            0.30,
-            metric="measurements.score.weight.ttfb",
-            tags={"transaction": "foo_transaction"},
-            timestamp=self.min_ago,
-        )
-        self.store_transaction_metric(
-            0.03,
-            metric="measurements.score.total",
-            tags={"transaction": "foo_transaction"},
-            timestamp=self.min_ago,
-        )
-
-        self.store_transaction_metric(
-            1.00,
-            metric="measurements.score.ttfb",
-            tags={"transaction": "foo_transaction"},
-            timestamp=self.min_ago,
-        )
-        self.store_transaction_metric(
-            1.00,
-            metric="measurements.score.weight.ttfb",
-            tags={"transaction": "foo_transaction"},
-            timestamp=self.min_ago,
-        )
-        self.store_transaction_metric(
-            1.00,
-            metric="measurements.score.total",
-            tags={"transaction": "foo_transaction"},
-            timestamp=self.min_ago,
-        )
-
-        self.store_transaction_metric(
-            0.80,
-            metric="measurements.score.inp",
-            tags={"transaction": "foo_transaction"},
-            timestamp=self.min_ago,
-        )
-        self.store_transaction_metric(
-            1.00,
-            metric="measurements.score.weight.inp",
-            tags={"transaction": "foo_transaction"},
-            timestamp=self.min_ago,
-        )
-        self.store_transaction_metric(
-            0.80,
-            metric="measurements.score.total",
-            tags={"transaction": "foo_transaction"},
-            timestamp=self.min_ago,
-        )
-
-        response = self.do_request(
-            {
-                "field": [
-                    "transaction",
-                    "weighted_performance_score(measurements.score.ttfb)",
-                    "weighted_performance_score(measurements.score.inp)",
-                ],
-                "query": "event.type:transaction",
-                "dataset": "metrics",
-                "per_page": 50,
-            }
-        )
-        assert response.status_code == 200, response.content
-        assert len(response.data["data"]) == 1
-        data = response.data["data"]
-        meta = response.data["meta"]
-        field_meta = meta["fields"]
-
-        assert data[0]["weighted_performance_score(measurements.score.ttfb)"] == 0.3433333333333333
-        assert data[0]["weighted_performance_score(measurements.score.inp)"] == 0.26666666666666666
-        assert meta["isMetricsData"]
-        assert field_meta["weighted_performance_score(measurements.score.ttfb)"] == "number"
-
     def test_invalid_performance_score_column(self):
         self.store_transaction_metric(
             0.03,
@@ -2917,56 +2836,6 @@ def test_invalid_performance_score_column(self):
         )
         assert response.status_code == 400, response.content
 
-    def test_invalid_weighted_performance_score_column(self):
-        self.store_transaction_metric(
-            0.03,
-            metric="measurements.score.total",
-            tags={"transaction": "foo_transaction"},
-            timestamp=self.min_ago,
-        )
-
-        response = self.do_request(
-            {
-                "field": [
-                    "transaction",
-                    "weighted_performance_score(measurements.score.fp)",
-                ],
-                "query": "event.type:transaction",
-                "dataset": "metrics",
-                "per_page": 50,
-            }
-        )
-        assert response.status_code == 400, response.content
-
-    def test_no_weighted_performance_score_column(self):
-        self.store_transaction_metric(
-            0.0,
-            metric="measurements.score.ttfb",
-            tags={"transaction": "foo_transaction"},
-            timestamp=self.min_ago,
-        )
-        response = self.do_request(
-            {
-                "field": [
-                    "transaction",
-                    "weighted_performance_score(measurements.score.ttfb)",
-                ],
-                "query": "event.type:transaction",
-                "dataset": "metrics",
-                "per_page": 50,
-            }
-        )
-
-        assert response.status_code == 200, response.content
-        assert len(response.data["data"]) == 1
-        data = response.data["data"]
-        meta = response.data["meta"]
-        field_meta = meta["fields"]
-
-        assert data[0]["weighted_performance_score(measurements.score.ttfb)"] == 0.0
-        assert meta["isMetricsData"]
-        assert field_meta["weighted_performance_score(measurements.score.ttfb)"] == "number"
-
     def test_opportunity_score(self):
         self.store_transaction_metric(
             0.03,
@@ -3231,6 +3100,50 @@ def test_total_performance_score(self):
         assert data[0]["performance_score(measurements.score.total)"] == 0.48
         assert meta["isMetricsData"]
 
+    def test_total_performance_score_with_missing_vitals(self):
+        self.store_transaction_metric(
+            0.03,
+            metric="measurements.score.lcp",
+            tags={"transaction": "foo_transaction", "transaction.op": "pageload"},
+            timestamp=self.min_ago,
+        )
+        self.store_transaction_metric(
+            0.30,
+            metric="measurements.score.weight.lcp",
+            tags={"transaction": "foo_transaction", "transaction.op": "pageload"},
+            timestamp=self.min_ago,
+        )
+        self.store_transaction_metric(
+            0.15,
+            metric="measurements.score.fcp",
+            tags={"transaction": "foo_transaction", "transaction.op": "pageload"},
+            timestamp=self.min_ago,
+        )
+        self.store_transaction_metric(
+            0.15,
+            metric="measurements.score.weight.fcp",
+            tags={"transaction": "foo_transaction", "transaction.op": "pageload"},
+            timestamp=self.min_ago,
+        )
+        with self.feature({"organizations:performance-vitals-handle-missing-webvitals": True}):
+            response = self.do_request(
+                {
+                    "field": [
+                        "transaction",
+                        "performance_score(measurements.score.total)",
+                    ],
+                    "query": "",
+                    "dataset": "metrics",
+                    "per_page": 50,
+                }
+            )
+            assert response.status_code == 200, response.content
+            assert len(response.data["data"]) == 1
+            data = response.data["data"]
+            meta = response.data["meta"]
+            assert data[0]["performance_score(measurements.score.total)"] == 0.4
+            assert meta["isMetricsData"]
+
     def test_count_scores(self):
         self.store_transaction_metric(
             0.1,
@@ -4162,21 +4075,13 @@ def test_total_performance_score(self):
         super().test_total_performance_score()
 
     @pytest.mark.xfail(reason="Not implemented")
-    def test_weighted_performance_score(self):
-        super().test_weighted_performance_score()
+    def test_total_performance_score_with_missing_vitals(self):
+        super().test_total_performance_score_with_missing_vitals()
 
     @pytest.mark.xfail(reason="Not implemented")
     def test_invalid_performance_score_column(self):
         super().test_invalid_performance_score_column()
 
-    @pytest.mark.xfail(reason="Not implemented")
-    def test_invalid_weighted_performance_score_column(self):
-        super().test_invalid_weighted_performance_score_column()
-
-    @pytest.mark.xfail(reason="Not implemented")
-    def test_no_weighted_performance_score_column(self):
-        super().test_invalid_weighted_performance_score_column()
-
     @pytest.mark.xfail(reason="Not implemented")
     def test_opportunity_score(self):
         super().test_opportunity_score()
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 d3d1a804e83377..e44b63e32c6372 100644
--- a/tests/snuba/api/endpoints/test_organization_events_span_indexed.py
+++ b/tests/snuba/api/endpoints/test_organization_events_span_indexed.py
@@ -261,6 +261,58 @@ def test_device_class_filter_unknown(self):
         assert data[0]["device.class"] == "Unknown"
         assert meta["dataset"] == self.dataset
 
+    def test_span_module(self):
+        self.store_spans(
+            [
+                self.create_span(
+                    {
+                        "sentry_tags": {
+                            "op": "http",
+                            "category": "http",
+                        }
+                    },
+                    start_ts=self.ten_mins_ago,
+                ),
+                self.create_span(
+                    {
+                        "sentry_tags": {
+                            "op": "alternative",
+                            "category": "other",
+                        }
+                    },
+                    start_ts=self.ten_mins_ago,
+                ),
+                self.create_span(
+                    {
+                        "sentry_tags": {
+                            "op": "alternative",
+                            "category": "other",
+                        }
+                    },
+                    start_ts=self.ten_mins_ago,
+                ),
+            ],
+            is_eap=self.is_eap,
+        )
+
+        response = self.do_request(
+            {
+                "field": ["span.module", "count()"],
+                "query": "",
+                "orderby": "-count()",
+                "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[0]["span.module"] == "other"
+        assert data[1]["span.module"] == "http"
+        assert meta["dataset"] == self.dataset
+
     def test_network_span(self):
         self.store_spans(
             [
@@ -287,7 +339,7 @@ def test_network_span(self):
         response = self.do_request(
             {
                 "field": ["span.op", "span.status_code"],
-                "query": "span.module:http span.status_code:200",
+                "query": "span.status_code:200",
                 "project": self.project.id,
                 "dataset": self.dataset,
             }
@@ -563,6 +615,7 @@ def test_query_for_missing_tag(self):
         assert response.status_code == 200, response.content
         assert response.data["data"] == [{"foo": "", "count()": 1}]
 
+    @pytest.mark.xfail
     def test_count_field_type(self):
         response = self.do_request(
             {
@@ -873,6 +926,50 @@ def test_handle_nans_from_snuba(self):
         )
         assert response.status_code == 200, response.content
 
+    def test_in_filter(self):
+        self.store_spans(
+            [
+                self.create_span(
+                    {"description": "foo", "sentry_tags": {"transaction": "bar"}},
+                    start_ts=self.ten_mins_ago,
+                ),
+                self.create_span(
+                    {"description": "foo", "sentry_tags": {"transaction": "baz"}},
+                    start_ts=self.ten_mins_ago,
+                ),
+                self.create_span(
+                    {"description": "foo", "sentry_tags": {"transaction": "bat"}},
+                    start_ts=self.ten_mins_ago,
+                ),
+            ],
+            is_eap=self.is_eap,
+        )
+        response = self.do_request(
+            {
+                "field": ["transaction", "count()"],
+                "query": "transaction:[bar, baz]",
+                "orderby": "transaction",
+                "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 == [
+            {
+                "transaction": "bar",
+                "count()": 1,
+            },
+            {
+                "transaction": "baz",
+                "count()": 1,
+            },
+        ]
+        assert meta["dataset"] == self.dataset
+
 
 class OrganizationEventsEAPSpanEndpointTest(OrganizationEventsSpanIndexedEndpointTest):
     is_eap = True
@@ -966,6 +1063,7 @@ def test_span_duration(self):
         ]
         assert meta["dataset"] == self.dataset
 
+    @pytest.mark.xfail
     def test_aggregate_numeric_attr(self):
         self.store_spans(
             [
@@ -1376,6 +1474,37 @@ def test_span_data_fields_http_resource(self):
             },
         }
 
+    def test_filtering_numeric_attr(self):
+        span_1 = self.create_span(
+            {"description": "foo"},
+            measurements={"foo": {"value": 30}},
+            start_ts=self.ten_mins_ago,
+        )
+        span_2 = self.create_span(
+            {"description": "foo"},
+            measurements={"foo": {"value": 10}},
+            start_ts=self.ten_mins_ago,
+        )
+        self.store_spans([span_1, span_2], is_eap=self.is_eap)
+
+        response = self.do_request(
+            {
+                "field": ["tags[foo,number]"],
+                "query": "span.duration:>=0 tags[foo,number]:>20",
+                "project": self.project.id,
+                "dataset": self.dataset,
+            }
+        )
+
+        assert response.status_code == 200, response.content
+        assert response.data["data"] == [
+            {
+                "id": span_1["span_id"],
+                "project.name": self.project.slug,
+                "tags[foo,number]": 30,
+            },
+        ]
+
 
 class OrganizationEventsEAPRPCSpanEndpointTest(OrganizationEventsEAPSpanEndpointTest):
     """These tests aren't fully passing yet, currently inheriting xfail from the eap tests"""
@@ -1470,7 +1599,6 @@ def test_span_duration(self):
         ]
         assert meta["dataset"] == self.dataset
 
-    @pytest.mark.xfail(reason="sampling_factor is not a queryable column yet")
     def test_average_sampling_rate(self):
         spans = []
         spans.append(
@@ -1518,6 +1646,7 @@ def test_average_sampling_rate(self):
         assert data[0]["count()"] == 11
         assert confidence[0]["count()"] == "low"
 
+    @pytest.mark.xfail
     def test_aggregate_numeric_attr(self):
         self.store_spans(
             [
@@ -1591,31 +1720,69 @@ def test_aggregate_numeric_attr(self):
             "max(tags[foo,number])": 5.0,
         }
 
-    @pytest.mark.xfail(reason="margin will not be moved to the RPC")
+    @pytest.mark.skip(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")
+    @pytest.mark.skip(reason="module not migrated over")
     def test_module_alias(self):
         super().test_module_alias()
 
-    @pytest.mark.xfail(reason="wip: not implemented yet")
+    @pytest.mark.xfail(
+        reason="wip: depends on rpc having a way to set a different default in virtual contexts"
+    )
+    def test_span_module(self):
+        super().test_span_module()
+
     def test_inp_span(self):
-        super().test_inp_span()
+        replay_id = uuid.uuid4().hex
+        self.store_spans(
+            [
+                self.create_span(
+                    {
+                        "sentry_tags": {
+                            "replay_id": replay_id,
+                            "browser.name": "Chrome",
+                            "transaction": "/pageloads/",
+                        }
+                    },
+                    start_ts=self.ten_mins_ago,
+                ),
+            ],
+            is_eap=self.is_eap,
+        )
+        response = self.do_request(
+            {
+                # Not moving origin.transaction to RPC, its equivalent to transaction and just represents the
+                # transaction that's related to the span
+                "field": ["replay.id", "browser.name", "transaction", "count()"],
+                "query": f"replay.id:{replay_id} AND browser.name:Chrome AND transaction:/pageloads/",
+                "orderby": "count()",
+                "project": self.project.id,
+                "dataset": self.dataset,
+            }
+        )
 
-    @pytest.mark.xfail(reason="wip: not implemented yet")
-    def test_network_span(self):
-        super().test_network_span()
+        assert response.status_code == 200, response.content
+        data = response.data["data"]
+        meta = response.data["meta"]
+        assert len(data) == 1
+        assert data[0]["replay.id"] == replay_id
+        assert data[0]["browser.name"] == "Chrome"
+        assert data[0]["transaction"] == "/pageloads/"
+        assert meta["dataset"] == self.dataset
 
-    @pytest.mark.xfail(reason="wip: not implemented yet")
+    @pytest.mark.xfail(
+        reason="wip: depends on rpc having a way to set a different default in virtual contexts"
+    )
+    # https://github.com/getsentry/projects/issues/215?issue=getsentry%7Cprojects%7C488
     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")
+    @pytest.mark.xfail(
+        reason="wip: not implemented yet, depends on rpc having a way to filter based on casing"
+    )
+    # https://github.com/getsentry/projects/issues/215?issue=getsentry%7Cprojects%7C489
     def test_span_op_casing(self):
         super().test_span_op_casing()
 
@@ -1651,6 +1818,6 @@ def test_tag_wildcards(self):
             assert response.status_code == 200, response.content
             assert response.data["data"] == [{"foo": "bar", "count()": 1}]
 
-    @pytest.mark.xfail(reason="rate not implemented yet")
+    @pytest.mark.xfail(reason="wip: rate not implemented yet")
     def test_spm(self):
         super().test_spm()
diff --git a/tests/snuba/api/endpoints/test_organization_events_span_metrics.py b/tests/snuba/api/endpoints/test_organization_events_span_metrics.py
index 56a7265493674c..a4c4606319551d 100644
--- a/tests/snuba/api/endpoints/test_organization_events_span_metrics.py
+++ b/tests/snuba/api/endpoints/test_organization_events_span_metrics.py
@@ -342,6 +342,56 @@ def test_avg(self):
         assert data[0]["avg()"] == 1
         assert meta["dataset"] == "spansMetrics"
 
+    def test_avg_on_http_response(self):
+        self.store_span_metric(
+            10,
+            internal_metric=constants.SPAN_METRICS_MAP["http.response_content_length"],
+            timestamp=self.min_ago,
+        )
+
+        self.store_span_metric(
+            15,
+            internal_metric=constants.SPAN_METRICS_MAP["http.response_transfer_size"],
+            timestamp=self.min_ago,
+        )
+
+        self.store_span_metric(
+            20,
+            internal_metric=constants.SPAN_METRICS_MAP["http.decoded_response_content_length"],
+            timestamp=self.min_ago,
+        )
+
+        response = self.do_request(
+            {
+                "field": [
+                    "avg(http.response_content_length)",
+                    "avg(http.response_transfer_size)",
+                    "avg(http.decoded_response_content_length)",
+                ],
+                "query": "",
+                "project": self.project.id,
+                "dataset": "spansMetrics",
+            }
+        )
+        assert response.status_code == 200, response.content
+
+        data = response.data["data"]
+        assert len(data) == 1
+        assert data[0]["avg(http.response_content_length)"] == 10
+        assert data[0]["avg(http.response_transfer_size)"] == 15
+        assert data[0]["avg(http.decoded_response_content_length)"] == 20
+
+        meta = response.data["meta"]
+        assert meta["fields"]["avg(http.response_content_length)"] == "size"
+        assert meta["fields"]["avg(http.response_transfer_size)"] == "size"
+        assert meta["fields"]["avg(http.decoded_response_content_length)"] == "size"
+
+        assert meta["units"]["avg(http.response_content_length)"] == "byte"
+        assert meta["units"]["avg(http.response_transfer_size)"] == "byte"
+        assert meta["units"]["avg(http.decoded_response_content_length)"] == "byte"
+
+        assert meta["dataset"] == "spansMetrics"
+
     def test_eps(self):
         for _ in range(6):
             self.store_span_metric(
@@ -1725,6 +1775,62 @@ def test_slow_frames_gauge_metric(self):
             }
         ]
 
+    def test_frames_delay_gauge_metric(self):
+        self.store_span_metric(
+            {
+                "min": 5,
+                "max": 5,
+                "sum": 5,
+                "count": 1,
+                "last": 5,
+            },
+            entity="metrics_gauges",
+            metric="mobile.frames_delay",
+            timestamp=self.six_min_ago,
+            tags={"release": "foo"},
+        )
+        self.store_span_metric(
+            {
+                "min": 10,
+                "max": 10,
+                "sum": 10,
+                "count": 1,
+                "last": 10,
+            },
+            entity="metrics_gauges",
+            metric="mobile.frames_delay",
+            timestamp=self.six_min_ago,
+            tags={"release": "bar"},
+        )
+
+        response = self.do_request(
+            {
+                "field": [
+                    "avg_if(mobile.frames_delay,release,foo)",
+                    "avg_if(mobile.frames_delay,release,bar)",
+                    "avg_compare(mobile.frames_delay,release,foo,bar)",
+                ],
+                "query": "",
+                "project": self.project.id,
+                "dataset": "spansMetrics",
+                "statsPeriod": "1h",
+            }
+        )
+
+        assert response.status_code == 200, response.content
+        data = response.data["data"]
+        meta = response.data["meta"]
+        assert data == [
+            {
+                "avg_compare(mobile.frames_delay,release,foo,bar)": 1.0,
+                "avg_if(mobile.frames_delay,release,foo)": 5.0,
+                "avg_if(mobile.frames_delay,release,bar)": 10.0,
+            }
+        ]
+        assert meta["units"]["avg_if(mobile.frames_delay,release,foo)"] == "second"
+        assert meta["units"]["avg_if(mobile.frames_delay,release,bar)"] == "second"
+        assert meta["units"]["avg_compare(mobile.frames_delay,release,foo,bar)"] is None
+
     def test_resolve_messaging_message_receive_latency_gauge(self):
         self.store_span_metric(
             {
diff --git a/tests/snuba/api/endpoints/test_organization_events_spans_histogram.py b/tests/snuba/api/endpoints/test_organization_events_spans_histogram.py
index 8953e8887533b8..0f7a9274f48189 100644
--- a/tests/snuba/api/endpoints/test_organization_events_spans_histogram.py
+++ b/tests/snuba/api/endpoints/test_organization_events_spans_histogram.py
@@ -4,7 +4,7 @@
 from rest_framework.exceptions import ErrorDetail
 
 from sentry.testutils.cases import APITestCase, SnubaTestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.utils.samples import load_data
 
 
@@ -32,8 +32,8 @@ def create_event(self, **kwargs):
                     "same_process_as_parent": True,
                     "parent_span_id": "a" * 16,
                     "span_id": x * 16,
-                    "start_timestamp": iso_format(self.min_ago + timedelta(seconds=1)),
-                    "timestamp": iso_format(self.min_ago + timedelta(seconds=4)),
+                    "start_timestamp": (self.min_ago + timedelta(seconds=1)).isoformat(),
+                    "timestamp": (self.min_ago + timedelta(seconds=4)).isoformat(),
                     "op": "django.middleware",
                     "description": "middleware span",
                     "exclusive_time": 3.0,
@@ -44,8 +44,8 @@ def create_event(self, **kwargs):
                     "same_process_as_parent": True,
                     "parent_span_id": "a" * 16,
                     "span_id": x * 16,
-                    "start_timestamp": iso_format(self.min_ago + timedelta(seconds=4)),
-                    "timestamp": iso_format(self.min_ago + timedelta(seconds=5)),
+                    "start_timestamp": (self.min_ago + timedelta(seconds=4)).isoformat(),
+                    "timestamp": (self.min_ago + timedelta(seconds=5)).isoformat(),
                     "op": "django.middleware",
                     "description": "middleware span",
                     "exclusive_time": 10.0,
@@ -335,8 +335,8 @@ def test_histogram_all_data_filter(self):
                 "same_process_as_parent": True,
                 "parent_span_id": "a" * 16,
                 "span_id": "e" * 16,
-                "start_timestamp": iso_format(self.min_ago + timedelta(seconds=1)),
-                "timestamp": iso_format(self.min_ago + timedelta(seconds=4)),
+                "start_timestamp": (self.min_ago + timedelta(seconds=1)).isoformat(),
+                "timestamp": (self.min_ago + timedelta(seconds=4)).isoformat(),
                 "op": "django.middleware",
                 "description": "middleware span",
                 "exclusive_time": 60.0,
@@ -364,8 +364,8 @@ def test_histogram_exclude_outliers_data_filter(self):
                 "same_process_as_parent": True,
                 "parent_span_id": "a" * 16,
                 "span_id": "e" * 16,
-                "start_timestamp": iso_format(self.min_ago + timedelta(seconds=1)),
-                "timestamp": iso_format(self.min_ago + timedelta(seconds=4)),
+                "start_timestamp": (self.min_ago + timedelta(seconds=1)).isoformat(),
+                "timestamp": (self.min_ago + timedelta(seconds=4)).isoformat(),
                 "op": "django.middleware",
                 "description": "middleware span",
                 "exclusive_time": 60.0,
diff --git a/tests/snuba/api/endpoints/test_organization_events_spans_performance.py b/tests/snuba/api/endpoints/test_organization_events_spans_performance.py
index c16ebc2c5e4044..ddb6077738b34f 100644
--- a/tests/snuba/api/endpoints/test_organization_events_spans_performance.py
+++ b/tests/snuba/api/endpoints/test_organization_events_spans_performance.py
@@ -1,4 +1,3 @@
-import time
 from datetime import timedelta
 from unittest.mock import patch
 
@@ -11,8 +10,7 @@
 
 from sentry.testutils.cases import APITestCase, SnubaTestCase
 from sentry.testutils.helpers import parse_link_header
-from sentry.testutils.helpers.datetime import before_now, iso_format
-from sentry.utils import json
+from sentry.testutils.helpers.datetime import before_now
 from sentry.utils.samples import load_data
 
 
@@ -34,26 +32,6 @@ def setUp(self):
         self.min_ago = before_now(minutes=1).replace(microsecond=0)
         self.day_ago = before_now(days=1).replace(hour=10, minute=0, second=0, microsecond=0)
 
-    def update_snuba_config_ensure(self, config, poll=60, wait=1):
-        self.snuba_update_config(config)
-
-        for i in range(poll):
-            updated = True
-
-            new_config = json.loads(self.snuba_get_config().decode("utf-8"))
-
-            for k, v in config.items():
-                if new_config.get(k) != v:
-                    updated = False
-                    break
-
-            if updated:
-                return
-
-            time.sleep(wait)
-
-        assert False, "snuba config not updated in time"
-
     def create_event(self, **kwargs):
         if "span_id" not in kwargs:
             kwargs["span_id"] = "a" * 16
@@ -80,8 +58,8 @@ def create_event(self, **kwargs):
                     "same_process_as_parent": True,
                     "parent_span_id": "a" * 16,
                     "span_id": x * 16,
-                    "start_timestamp": iso_format(self.min_ago + timedelta(seconds=1)),
-                    "timestamp": iso_format(self.min_ago + timedelta(seconds=4)),
+                    "start_timestamp": (self.min_ago + timedelta(seconds=1)).isoformat(),
+                    "timestamp": (self.min_ago + timedelta(seconds=4)).isoformat(),
                     "op": "django.middleware",
                     "description": "middleware span",
                     "hash": "2b9cbb96dbf59baa",
@@ -94,8 +72,8 @@ def create_event(self, **kwargs):
                     "same_process_as_parent": True,
                     "parent_span_id": "a" * 16,
                     "span_id": x * 16,
-                    "start_timestamp": iso_format(self.min_ago + timedelta(seconds=4)),
-                    "timestamp": iso_format(self.min_ago + timedelta(seconds=5)),
+                    "start_timestamp": (self.min_ago + timedelta(seconds=4)).isoformat(),
+                    "timestamp": (self.min_ago + timedelta(seconds=5)).isoformat(),
                     "op": "django.view",
                     "description": "view span",
                     "hash": "be5e3378d9f64175",
@@ -140,7 +118,7 @@ def suspect_span_examples_snuba_results(self, op, event):
                 }
             )
         else:
-            assert False, f"Unexpected Op: {op}"
+            raise AssertionError(f"Unexpected Op: {op}")
 
         return results
 
@@ -253,7 +231,7 @@ def suspect_span_group_snuba_results(self, op, event):
                 }
             )
         else:
-            assert False, f"Unexpected Op: {op}"
+            raise AssertionError(f"Unexpected Op: {op}")
 
         return results
 
@@ -347,7 +325,7 @@ def span_example_results(self, op, event):
             }
 
         else:
-            assert False, f"Unexpected Op: {op}"
+            raise AssertionError(f"Unexpected Op: {op}")
 
     def suspect_span_results(self, op, event):
         results = self.span_example_results(op, event)
@@ -403,7 +381,7 @@ def suspect_span_results(self, op, event):
             )
 
         else:
-            assert False, f"Unexpected Op: {op}"
+            raise AssertionError(f"Unexpected Op: {op}")
 
         return results
 
@@ -1266,8 +1244,8 @@ def test_span_filters(self):
                 "same_process_as_parent": True,
                 "parent_span_id": "a" * 16,
                 "span_id": "b" * 16,
-                "start_timestamp": iso_format(self.min_ago + timedelta(seconds=1)),
-                "timestamp": iso_format(self.min_ago + timedelta(seconds=4)),
+                "start_timestamp": (self.min_ago + timedelta(seconds=1)).isoformat(),
+                "timestamp": (self.min_ago + timedelta(seconds=4)).isoformat(),
                 "op": test_op,
                 "description": "middleware span",
                 "hash": "ab" * 8,
@@ -1278,8 +1256,8 @@ def test_span_filters(self):
                 "same_process_as_parent": True,
                 "parent_span_id": "a" * 16,
                 "span_id": "c" * 16,
-                "start_timestamp": iso_format(self.min_ago + timedelta(seconds=1)),
-                "timestamp": iso_format(self.min_ago + timedelta(seconds=4)),
+                "start_timestamp": (self.min_ago + timedelta(seconds=1)).isoformat(),
+                "timestamp": (self.min_ago + timedelta(seconds=4)).isoformat(),
                 "op": "django.view",
                 "description": "middleware span",
                 "hash": test_hash,
@@ -1306,8 +1284,8 @@ def test_span_filters_with_min_max(self):
                 "same_process_as_parent": True,
                 "parent_span_id": "a" * 16,
                 "span_id": "b" * 16,
-                "start_timestamp": iso_format(self.min_ago + timedelta(seconds=1)),
-                "timestamp": iso_format(self.min_ago + timedelta(seconds=4)),
+                "start_timestamp": (self.min_ago + timedelta(seconds=1)).isoformat(),
+                "timestamp": (self.min_ago + timedelta(seconds=4)).isoformat(),
                 "op": test_op,
                 "description": "middleware span",
                 "hash": "ab" * 8,
@@ -1317,8 +1295,8 @@ def test_span_filters_with_min_max(self):
                 "same_process_as_parent": True,
                 "parent_span_id": "a" * 16,
                 "span_id": "b" * 16,
-                "start_timestamp": iso_format(self.min_ago + timedelta(seconds=1)),
-                "timestamp": iso_format(self.min_ago + timedelta(seconds=4)),
+                "start_timestamp": (self.min_ago + timedelta(seconds=1)).isoformat(),
+                "timestamp": (self.min_ago + timedelta(seconds=4)).isoformat(),
                 "op": test_op,
                 "description": "middleware span",
                 "hash": "ab" * 8,
@@ -1328,8 +1306,8 @@ def test_span_filters_with_min_max(self):
                 "same_process_as_parent": True,
                 "parent_span_id": "a" * 16,
                 "span_id": "c" * 16,
-                "start_timestamp": iso_format(self.min_ago + timedelta(seconds=1)),
-                "timestamp": iso_format(self.min_ago + timedelta(seconds=4)),
+                "start_timestamp": (self.min_ago + timedelta(seconds=1)).isoformat(),
+                "timestamp": (self.min_ago + timedelta(seconds=4)).isoformat(),
                 "op": "django.view",
                 "description": "middleware span",
                 "hash": test_hash,
@@ -1381,8 +1359,8 @@ def test_one_span_with_min(self):
                 "same_process_as_parent": True,
                 "parent_span_id": "a" * 16,
                 "span_id": x * 16,
-                "start_timestamp": iso_format(self.min_ago + timedelta(seconds=1)),
-                "timestamp": iso_format(self.min_ago + timedelta(seconds=4)),
+                "start_timestamp": (self.min_ago + timedelta(seconds=1)).isoformat(),
+                "timestamp": (self.min_ago + timedelta(seconds=4)).isoformat(),
                 "op": "django.middleware",
                 "description": "middleware span",
                 "exclusive_time": 5.0,
@@ -1420,8 +1398,8 @@ def test_one_span_with_max(self):
                 "same_process_as_parent": True,
                 "parent_span_id": "a" * 16,
                 "span_id": x * 16,
-                "start_timestamp": iso_format(self.min_ago + timedelta(seconds=1)),
-                "timestamp": iso_format(self.min_ago + timedelta(seconds=4)),
+                "start_timestamp": (self.min_ago + timedelta(seconds=1)).isoformat(),
+                "timestamp": (self.min_ago + timedelta(seconds=4)).isoformat(),
                 "op": "django.middleware",
                 "description": "middleware span",
                 "hash": "cd" * 8,
@@ -1460,8 +1438,8 @@ def test_one_span_with_min_max(self):
                 "same_process_as_parent": True,
                 "parent_span_id": "a" * 16,
                 "span_id": x * 16,
-                "start_timestamp": iso_format(self.min_ago + timedelta(seconds=1)),
-                "timestamp": iso_format(self.min_ago + timedelta(seconds=4)),
+                "start_timestamp": (self.min_ago + timedelta(seconds=1)).isoformat(),
+                "timestamp": (self.min_ago + timedelta(seconds=4)).isoformat(),
                 "op": "django.middleware",
                 "description": "middleware span",
                 "exclusive_time": 5.0,
@@ -1472,8 +1450,8 @@ def test_one_span_with_min_max(self):
                 "same_process_as_parent": True,
                 "parent_span_id": "a" * 16,
                 "span_id": x * 16,
-                "start_timestamp": iso_format(self.min_ago + timedelta(seconds=4)),
-                "timestamp": iso_format(self.min_ago + timedelta(seconds=5)),
+                "start_timestamp": (self.min_ago + timedelta(seconds=4)).isoformat(),
+                "timestamp": (self.min_ago + timedelta(seconds=5)).isoformat(),
                 "op": "django.middleware",
                 "description": "middleware span",
                 "exclusive_time": 3.0,
@@ -1564,8 +1542,8 @@ def test_per_page_with_min(self):
                 "same_process_as_parent": True,
                 "parent_span_id": "a" * 16,
                 "span_id": x * 16,
-                "start_timestamp": iso_format(self.min_ago + timedelta(seconds=1)),
-                "timestamp": iso_format(self.min_ago + timedelta(seconds=4)),
+                "start_timestamp": (self.min_ago + timedelta(seconds=1)).isoformat(),
+                "timestamp": (self.min_ago + timedelta(seconds=4)).isoformat(),
                 "op": "django.middleware",
                 "description": "middleware span",
                 "exclusive_time": 5.0,
@@ -1576,8 +1554,8 @@ def test_per_page_with_min(self):
                 "same_process_as_parent": True,
                 "parent_span_id": "a" * 16,
                 "span_id": x * 16,
-                "start_timestamp": iso_format(self.min_ago + timedelta(seconds=4)),
-                "timestamp": iso_format(self.min_ago + timedelta(seconds=5)),
+                "start_timestamp": (self.min_ago + timedelta(seconds=4)).isoformat(),
+                "timestamp": (self.min_ago + timedelta(seconds=5)).isoformat(),
                 "op": "django.middleware",
                 "description": "middleware span",
                 "exclusive_time": 3.0,
@@ -1637,8 +1615,8 @@ def test_per_page_with_max(self):
                 "same_process_as_parent": True,
                 "parent_span_id": "a" * 16,
                 "span_id": x * 16,
-                "start_timestamp": iso_format(self.min_ago + timedelta(seconds=1)),
-                "timestamp": iso_format(self.min_ago + timedelta(seconds=4)),
+                "start_timestamp": (self.min_ago + timedelta(seconds=1)).isoformat(),
+                "timestamp": (self.min_ago + timedelta(seconds=4)).isoformat(),
                 "op": "django.middleware",
                 "description": "middleware span",
                 "exclusive_time": 5.0,
@@ -1649,8 +1627,8 @@ def test_per_page_with_max(self):
                 "same_process_as_parent": True,
                 "parent_span_id": "a" * 16,
                 "span_id": x * 16,
-                "start_timestamp": iso_format(self.min_ago + timedelta(seconds=4)),
-                "timestamp": iso_format(self.min_ago + timedelta(seconds=5)),
+                "start_timestamp": (self.min_ago + timedelta(seconds=4)).isoformat(),
+                "timestamp": (self.min_ago + timedelta(seconds=5)).isoformat(),
                 "op": "django.middleware",
                 "description": "middleware span",
                 "exclusive_time": 3.0,
@@ -1710,8 +1688,8 @@ def test_per_page_with_min_max(self):
                 "same_process_as_parent": True,
                 "parent_span_id": "a" * 16,
                 "span_id": x * 16,
-                "start_timestamp": iso_format(self.min_ago + timedelta(seconds=1)),
-                "timestamp": iso_format(self.min_ago + timedelta(seconds=4)),
+                "start_timestamp": (self.min_ago + timedelta(seconds=1)).isoformat(),
+                "timestamp": (self.min_ago + timedelta(seconds=4)).isoformat(),
                 "op": "django.middleware",
                 "description": "middleware span",
                 "hash": "2b9cbb96dbf59baa",
@@ -1723,8 +1701,8 @@ def test_per_page_with_min_max(self):
                 "same_process_as_parent": True,
                 "parent_span_id": "a" * 16,
                 "span_id": x * 16,
-                "start_timestamp": iso_format(self.min_ago + timedelta(seconds=4)),
-                "timestamp": iso_format(self.min_ago + timedelta(seconds=5)),
+                "start_timestamp": (self.min_ago + timedelta(seconds=4)).isoformat(),
+                "timestamp": (self.min_ago + timedelta(seconds=5)).isoformat(),
                 "op": "django.middleware",
                 "description": "middleware span",
                 "hash": "2b9cbb96dbf59baa",
diff --git a/tests/snuba/api/endpoints/test_organization_events_stats.py b/tests/snuba/api/endpoints/test_organization_events_stats.py
index 5187a3b8f867c2..050fb0b90ac7d7 100644
--- a/tests/snuba/api/endpoints/test_organization_events_stats.py
+++ b/tests/snuba/api/endpoints/test_organization_events_stats.py
@@ -20,7 +20,7 @@
 from sentry.models.transaction_threshold import ProjectTransactionThreshold, TransactionMetric
 from sentry.snuba.discover import OTHER_KEY
 from sentry.testutils.cases import APITestCase, ProfilesSnubaTestCase, SnubaTestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.utils.samples import load_data
 from tests.sentry.issues.test_utils import SearchIssueTestMixin
 
@@ -51,7 +51,7 @@ def setUp(self):
             data={
                 "event_id": "a" * 32,
                 "message": "very bad",
-                "timestamp": iso_format(self.day_ago + timedelta(minutes=1)),
+                "timestamp": (self.day_ago + timedelta(minutes=1)).isoformat(),
                 "fingerprint": ["group1"],
                 "tags": {"sentry:user": self.user.email},
             },
@@ -61,7 +61,7 @@ def setUp(self):
             data={
                 "event_id": "b" * 32,
                 "message": "oh my",
-                "timestamp": iso_format(self.day_ago + timedelta(hours=1, minutes=1)),
+                "timestamp": (self.day_ago + timedelta(hours=1, minutes=1)).isoformat(),
                 "fingerprint": ["group2"],
                 "tags": {"sentry:user": self.user2.email},
             },
@@ -71,7 +71,7 @@ def setUp(self):
             data={
                 "event_id": "c" * 32,
                 "message": "very bad",
-                "timestamp": iso_format(self.day_ago + timedelta(hours=1, minutes=2)),
+                "timestamp": (self.day_ago + timedelta(hours=1, minutes=2)).isoformat(),
                 "fingerprint": ["group2"],
                 "tags": {"sentry:user": self.user2.email},
             },
@@ -244,7 +244,7 @@ def test_user_count(self):
             data={
                 "event_id": "d" * 32,
                 "message": "something",
-                "timestamp": iso_format(self.day_ago + timedelta(minutes=2)),
+                "timestamp": (self.day_ago + timedelta(minutes=2)).isoformat(),
                 "tags": {"sentry:user": self.user2.email},
                 "fingerprint": ["group2"],
             },
@@ -713,7 +713,7 @@ def test_transaction_events(self):
             data = prototype.copy()
             data["event_id"] = fixture[0]
             data["timestamp"] = fixture[1].isoformat()
-            data["start_timestamp"] = iso_format(fixture[1] - timedelta(seconds=1))
+            data["start_timestamp"] = (fixture[1] - timedelta(seconds=1)).isoformat()
             self.store_event(data=data, project_id=self.project.id)
 
         for dataset in ["discover", "transactions"]:
@@ -894,7 +894,7 @@ def test_large_interval_no_drop_values(self):
             data={
                 "event_id": "d" * 32,
                 "message": "not good",
-                "timestamp": iso_format(self.day_ago - timedelta(minutes=10)),
+                "timestamp": (self.day_ago - timedelta(minutes=10)).isoformat(),
                 "fingerprint": ["group3"],
             },
             project_id=self.project.id,
@@ -1013,8 +1013,8 @@ def test_with_zerofill(self):
         ]
 
     def test_without_zerofill(self):
-        start = iso_format(self.day_ago)
-        end = iso_format(self.day_ago + timedelta(hours=2))
+        start = self.day_ago.isoformat()
+        end = (self.day_ago + timedelta(hours=2)).isoformat()
         response = self.do_request(
             data={
                 "start": start,
@@ -1039,19 +1039,19 @@ def test_without_zerofill(self):
     def test_comparison_error_dataset(self):
         self.store_event(
             data={
-                "timestamp": iso_format(self.day_ago + timedelta(days=-1, minutes=1)),
+                "timestamp": (self.day_ago + timedelta(days=-1, minutes=1)).isoformat(),
             },
             project_id=self.project.id,
         )
         self.store_event(
             data={
-                "timestamp": iso_format(self.day_ago + timedelta(days=-1, minutes=2)),
+                "timestamp": (self.day_ago + timedelta(days=-1, minutes=2)).isoformat(),
             },
             project_id=self.project.id,
         )
         self.store_event(
             data={
-                "timestamp": iso_format(self.day_ago + timedelta(days=-1, hours=1, minutes=1)),
+                "timestamp": (self.day_ago + timedelta(days=-1, hours=1, minutes=1)).isoformat(),
             },
             project_id=self.project2.id,
         )
@@ -1075,19 +1075,19 @@ def test_comparison_error_dataset(self):
     def test_comparison(self):
         self.store_event(
             data={
-                "timestamp": iso_format(self.day_ago + timedelta(days=-1, minutes=1)),
+                "timestamp": (self.day_ago + timedelta(days=-1, minutes=1)).isoformat(),
             },
             project_id=self.project.id,
         )
         self.store_event(
             data={
-                "timestamp": iso_format(self.day_ago + timedelta(days=-1, minutes=2)),
+                "timestamp": (self.day_ago + timedelta(days=-1, minutes=2)).isoformat(),
             },
             project_id=self.project.id,
         )
         self.store_event(
             data={
-                "timestamp": iso_format(self.day_ago + timedelta(days=-1, hours=1, minutes=1)),
+                "timestamp": (self.day_ago + timedelta(days=-1, hours=1, minutes=1)).isoformat(),
             },
             project_id=self.project2.id,
         )
@@ -1176,7 +1176,7 @@ def test_tag_with_conflicting_function_alias_simple(self):
         for _ in range(7):
             self.store_event(
                 data={
-                    "timestamp": iso_format(self.day_ago + timedelta(minutes=2)),
+                    "timestamp": (self.day_ago + timedelta(minutes=2)).isoformat(),
                     "tags": {"count": "9001"},
                 },
                 project_id=self.project2.id,
@@ -1211,7 +1211,7 @@ def test_group_id_tag_simple(self):
         event_data: _EventDataDict = {
             "data": {
                 "message": "poof",
-                "timestamp": iso_format(self.day_ago + timedelta(minutes=2)),
+                "timestamp": (self.day_ago + timedelta(minutes=2)).isoformat(),
                 "user": {"email": self.user.email},
                 "tags": {"group_id": "testing"},
                 "fingerprint": ["group1"],
@@ -1258,14 +1258,14 @@ def setUp(self):
         self.project2 = self.create_project()
         self.user2 = self.create_user()
         transaction_data = load_data("transaction")
-        transaction_data["start_timestamp"] = iso_format(self.day_ago + timedelta(minutes=2))
-        transaction_data["timestamp"] = iso_format(self.day_ago + timedelta(minutes=4))
+        transaction_data["start_timestamp"] = (self.day_ago + timedelta(minutes=2)).isoformat()
+        transaction_data["timestamp"] = (self.day_ago + timedelta(minutes=4)).isoformat()
         transaction_data["tags"] = {"shared-tag": "yup"}
         self.event_data: list[_EventDataDict] = [
             {
                 "data": {
                     "message": "poof",
-                    "timestamp": iso_format(self.day_ago + timedelta(minutes=2)),
+                    "timestamp": (self.day_ago + timedelta(minutes=2)).isoformat(),
                     "user": {"email": self.user.email},
                     "tags": {"shared-tag": "yup"},
                     "fingerprint": ["group1"],
@@ -1276,7 +1276,7 @@ def setUp(self):
             {
                 "data": {
                     "message": "voof",
-                    "timestamp": iso_format(self.day_ago + timedelta(hours=1, minutes=2)),
+                    "timestamp": (self.day_ago + timedelta(hours=1, minutes=2)).isoformat(),
                     "fingerprint": ["group2"],
                     "user": {"email": self.user2.email},
                     "tags": {"shared-tag": "yup"},
@@ -1287,7 +1287,7 @@ def setUp(self):
             {
                 "data": {
                     "message": "very bad",
-                    "timestamp": iso_format(self.day_ago + timedelta(minutes=2)),
+                    "timestamp": (self.day_ago + timedelta(minutes=2)).isoformat(),
                     "fingerprint": ["group3"],
                     "user": {"email": "foo@example.com"},
                     "tags": {"shared-tag": "yup"},
@@ -1298,7 +1298,7 @@ def setUp(self):
             {
                 "data": {
                     "message": "oh no",
-                    "timestamp": iso_format(self.day_ago + timedelta(minutes=2)),
+                    "timestamp": (self.day_ago + timedelta(minutes=2)).isoformat(),
                     "fingerprint": ["group4"],
                     "user": {"email": "bar@example.com"},
                     "tags": {"shared-tag": "yup"},
@@ -1311,7 +1311,7 @@ def setUp(self):
             {
                 "data": {
                     "message": "sorta bad",
-                    "timestamp": iso_format(self.day_ago + timedelta(minutes=2)),
+                    "timestamp": (self.day_ago + timedelta(minutes=2)).isoformat(),
                     "fingerprint": ["group5"],
                     "user": {"email": "bar@example.com"},
                     "tags": {"shared-tag": "yup"},
@@ -1322,7 +1322,7 @@ def setUp(self):
             {
                 "data": {
                     "message": "not so bad",
-                    "timestamp": iso_format(self.day_ago + timedelta(minutes=2)),
+                    "timestamp": (self.day_ago + timedelta(minutes=2)).isoformat(),
                     "fingerprint": ["group6"],
                     "user": {"email": "bar@example.com"},
                     "tags": {"shared-tag": "yup"},
@@ -1526,7 +1526,7 @@ def test_tag_with_conflicting_function_alias_simple(self):
         event_data: _EventDataDict = {
             "data": {
                 "message": "poof",
-                "timestamp": iso_format(self.day_ago + timedelta(minutes=2)),
+                "timestamp": (self.day_ago + timedelta(minutes=2)).isoformat(),
                 "user": {"email": self.user.email},
                 "tags": {"count": "9001"},
                 "fingerprint": ["group1"],
@@ -1622,7 +1622,7 @@ def test_tag_with_conflicting_function_alias_with_other_multiple_groupings(self)
             {
                 "data": {
                     "message": "abc",
-                    "timestamp": iso_format(self.day_ago + timedelta(minutes=2)),
+                    "timestamp": (self.day_ago + timedelta(minutes=2)).isoformat(),
                     "user": {"email": self.user.email},
                     "tags": {"count": "2"},
                     "fingerprint": ["group1"],
@@ -1633,7 +1633,7 @@ def test_tag_with_conflicting_function_alias_with_other_multiple_groupings(self)
             {
                 "data": {
                     "message": "def",
-                    "timestamp": iso_format(self.day_ago + timedelta(minutes=2)),
+                    "timestamp": (self.day_ago + timedelta(minutes=2)).isoformat(),
                     "user": {"email": self.user.email},
                     "tags": {"count": "9001"},
                     "fingerprint": ["group1"],
@@ -1669,7 +1669,7 @@ def test_group_id_tag_simple(self):
         event_data: _EventDataDict = {
             "data": {
                 "message": "poof",
-                "timestamp": iso_format(self.day_ago + timedelta(minutes=2)),
+                "timestamp": (self.day_ago + timedelta(minutes=2)).isoformat(),
                 "user": {"email": self.user.email},
                 "tags": {"group_id": "the tag"},
                 "fingerprint": ["group1"],
@@ -1925,8 +1925,8 @@ def test_top_events_with_functions(self):
     def test_top_events_with_functions_on_different_transactions(self):
         """Transaction2 has less events, but takes longer so order should be self.transaction then transaction2"""
         transaction_data = load_data("transaction")
-        transaction_data["start_timestamp"] = iso_format(self.day_ago + timedelta(minutes=2))
-        transaction_data["timestamp"] = iso_format(self.day_ago + timedelta(minutes=6))
+        transaction_data["start_timestamp"] = (self.day_ago + timedelta(minutes=2)).isoformat()
+        transaction_data["timestamp"] = (self.day_ago + timedelta(minutes=6)).isoformat()
         transaction_data["transaction"] = "/foo_bar/"
         transaction2 = self.store_event(transaction_data, project_id=self.project.id)
         with self.feature(self.enabled_features):
@@ -1959,8 +1959,8 @@ def test_top_events_with_functions_on_different_transactions(self):
 
     def test_top_events_with_query(self):
         transaction_data = load_data("transaction")
-        transaction_data["start_timestamp"] = iso_format(self.day_ago + timedelta(minutes=2))
-        transaction_data["timestamp"] = iso_format(self.day_ago + timedelta(minutes=6))
+        transaction_data["start_timestamp"] = (self.day_ago + timedelta(minutes=2)).isoformat()
+        transaction_data["timestamp"] = (self.day_ago + timedelta(minutes=6)).isoformat()
         transaction_data["transaction"] = "/foo_bar/"
         self.store_event(transaction_data, project_id=self.project.id)
         with self.feature(self.enabled_features):
@@ -2142,7 +2142,7 @@ def test_top_events_with_error_unhandled(self):
         prototype["logentry"] = {"formatted": "not handled"}
         prototype["exception"]["values"][0]["value"] = "not handled"
         prototype["exception"]["values"][0]["mechanism"]["handled"] = False
-        prototype["timestamp"] = iso_format(self.day_ago + timedelta(minutes=2))
+        prototype["timestamp"] = (self.day_ago + timedelta(minutes=2)).isoformat()
         self.store_event(data=prototype, project_id=project.id)
 
         with self.feature(self.enabled_features):
@@ -2654,7 +2654,7 @@ def test_top_events_timestamp_fields(self):
         timestamp_days = [timestamp.replace(hour=0, minute=0, second=0) for timestamp in timestamps]
 
         for ts, ts_hr, ts_day in zip(timestamps, timestamp_hours, timestamp_days):
-            key = f"{iso_format(ts)}+00:00,{iso_format(ts_day)}+00:00,{iso_format(ts_hr)}+00:00"
+            key = f"{ts.isoformat()},{ts_day.isoformat()},{ts_hr.isoformat()}"
             count = sum(e["count"] for e in self.event_data if e["data"]["timestamp"] == ts)
             results = data[key]
             assert [{"count": count}] in [attrs for time, attrs in results["data"]]
@@ -2693,8 +2693,8 @@ def test_top_events_other_with_matching_columns(self):
 
     def test_top_events_with_field_overlapping_other_key(self):
         transaction_data = load_data("transaction")
-        transaction_data["start_timestamp"] = iso_format(self.day_ago + timedelta(minutes=2))
-        transaction_data["timestamp"] = iso_format(self.day_ago + timedelta(minutes=6))
+        transaction_data["start_timestamp"] = (self.day_ago + timedelta(minutes=2)).isoformat()
+        transaction_data["timestamp"] = (self.day_ago + timedelta(minutes=6)).isoformat()
         transaction_data["transaction"] = OTHER_KEY
         for i in range(5):
             data = transaction_data.copy()
@@ -2990,7 +2990,7 @@ def setUp(self):
             {
                 "data": {
                     "message": "poof",
-                    "timestamp": iso_format(self.day_ago + timedelta(minutes=2)),
+                    "timestamp": (self.day_ago + timedelta(minutes=2)).isoformat(),
                     "user": {"email": self.user.email},
                     "tags": {"shared-tag": "yup"},
                     "fingerprint": ["group1"],
@@ -3001,7 +3001,7 @@ def setUp(self):
             {
                 "data": {
                     "message": "voof",
-                    "timestamp": iso_format(self.day_ago + timedelta(hours=1, minutes=2)),
+                    "timestamp": (self.day_ago + timedelta(hours=1, minutes=2)).isoformat(),
                     "fingerprint": ["group2"],
                     "user": {"email": self.user2.email},
                     "tags": {"shared-tag": "yup"},
@@ -3012,7 +3012,7 @@ def setUp(self):
             {
                 "data": {
                     "message": "very bad",
-                    "timestamp": iso_format(self.day_ago + timedelta(minutes=2)),
+                    "timestamp": (self.day_ago + timedelta(minutes=2)).isoformat(),
                     "fingerprint": ["group3"],
                     "user": {"email": "foo@example.com"},
                     "tags": {"shared-tag": "yup"},
@@ -3023,7 +3023,7 @@ def setUp(self):
             {
                 "data": {
                     "message": "oh no",
-                    "timestamp": iso_format(self.day_ago + timedelta(minutes=2)),
+                    "timestamp": (self.day_ago + timedelta(minutes=2)).isoformat(),
                     "fingerprint": ["group4"],
                     "user": {"email": "bar@example.com"},
                     "tags": {"shared-tag": "yup"},
@@ -3034,7 +3034,7 @@ def setUp(self):
             {
                 "data": {
                     "message": "kinda bad",
-                    "timestamp": iso_format(self.day_ago + timedelta(minutes=2)),
+                    "timestamp": (self.day_ago + timedelta(minutes=2)).isoformat(),
                     "user": {"email": self.user.email},
                     "tags": {"shared-tag": "yup"},
                     "fingerprint": ["group7"],
@@ -3046,7 +3046,7 @@ def setUp(self):
             {
                 "data": {
                     "message": "sorta bad",
-                    "timestamp": iso_format(self.day_ago + timedelta(minutes=2)),
+                    "timestamp": (self.day_ago + timedelta(minutes=2)).isoformat(),
                     "fingerprint": ["group5"],
                     "user": {"email": "bar@example.com"},
                     "tags": {"shared-tag": "yup"},
@@ -3057,7 +3057,7 @@ def setUp(self):
             {
                 "data": {
                     "message": "not so bad",
-                    "timestamp": iso_format(self.day_ago + timedelta(minutes=2)),
+                    "timestamp": (self.day_ago + timedelta(minutes=2)).isoformat(),
                     "fingerprint": ["group6"],
                     "user": {"email": "bar@example.com"},
                     "tags": {"shared-tag": "yup"},
@@ -3268,7 +3268,7 @@ def test_group_id_tag_simple(self):
         event_data: _EventDataDict = {
             "data": {
                 "message": "poof",
-                "timestamp": iso_format(self.day_ago + timedelta(minutes=2)),
+                "timestamp": (self.day_ago + timedelta(minutes=2)).isoformat(),
                 "user": {"email": self.user.email},
                 "tags": {"group_id": "the tag"},
                 "fingerprint": ["group1"],
@@ -3315,7 +3315,7 @@ def test_top_events_with_error_unhandled(self):
         prototype["logentry"] = {"formatted": "not handled"}
         prototype["exception"]["values"][0]["value"] = "not handled"
         prototype["exception"]["values"][0]["mechanism"]["handled"] = False
-        prototype["timestamp"] = iso_format(self.day_ago + timedelta(minutes=2))
+        prototype["timestamp"] = (self.day_ago + timedelta(minutes=2)).isoformat()
         self.store_event(data=prototype, project_id=project.id)
 
         with self.feature(self.enabled_features):
diff --git a/tests/snuba/api/endpoints/test_organization_events_stats_mep.py b/tests/snuba/api/endpoints/test_organization_events_stats_mep.py
index 573c7de7d5e492..128bf673654bdd 100644
--- a/tests/snuba/api/endpoints/test_organization_events_stats_mep.py
+++ b/tests/snuba/api/endpoints/test_organization_events_stats_mep.py
@@ -6,7 +6,6 @@
 
 import pytest
 from django.urls import reverse
-from rest_framework.response import Response
 
 from sentry.discover.models import DatasetSourcesTypes
 from sentry.models.dashboard_widget import DashboardWidget, DashboardWidgetTypes
@@ -14,7 +13,7 @@
 from sentry.sentry_metrics.use_case_id_registry import UseCaseID
 from sentry.snuba.metrics.extraction import MetricSpecType, OnDemandMetricSpec
 from sentry.testutils.cases import MetricsEnhancedPerformanceTestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.helpers.on_demand import create_widget
 from sentry.utils.samples import load_data
 
@@ -1283,17 +1282,6 @@ def setUp(self):
             "organizations:on-demand-metrics-extraction": True,
         }
 
-    def _make_on_demand_request(
-        self, params: dict[str, Any], extra_features: dict[str, bool] | None = None
-    ) -> Response:
-        """Ensures that the required parameters for an on-demand request are included."""
-        # Expected parameters for this helper function
-        params["dataset"] = "metricsEnhanced"
-        params["useOnDemandMetrics"] = "true"
-        params["onDemandType"] = "dynamic_query"
-        _features = {**self.features, **(extra_features or {})}
-        return self.do_request(params, features=_features)
-
     def test_top_events_wrong_on_demand_type(self):
         query = "transaction.duration:>=100"
         yAxis = ["count()", "count_web_vitals(measurements.lcp, good)"]
@@ -1585,8 +1573,8 @@ def test_top_events_with_transaction_on_demand_passing_widget_id_unsaved_error(
                 "event_id": "a" * 32,
                 "message": "very bad",
                 "type": "error",
-                "start_timestamp": iso_format(self.day_ago + timedelta(hours=1)),
-                "timestamp": iso_format(self.day_ago + timedelta(hours=1)),
+                "start_timestamp": (self.day_ago + timedelta(hours=1)).isoformat(),
+                "timestamp": (self.day_ago + timedelta(hours=1)).isoformat(),
                 "tags": {"customtag1": "error_value", "query.dataset": "foo"},
             },
             project_id=self.project.id,
@@ -1596,8 +1584,8 @@ def test_top_events_with_transaction_on_demand_passing_widget_id_unsaved_error(
                 "event_id": "b" * 32,
                 "message": "very bad 2",
                 "type": "error",
-                "start_timestamp": iso_format(self.day_ago + timedelta(hours=1)),
-                "timestamp": iso_format(self.day_ago + timedelta(hours=1)),
+                "start_timestamp": (self.day_ago + timedelta(hours=1)).isoformat(),
+                "timestamp": (self.day_ago + timedelta(hours=1)).isoformat(),
                 "tags": {"customtag1": "error_value2", "query.dataset": "foo"},
             },
             project_id=self.project.id,
@@ -1657,15 +1645,15 @@ def test_top_events_with_transaction_on_demand_passing_widget_id_unsaved_discove
                 "event_id": "a" * 32,
                 "message": "very bad",
                 "type": "error",
-                "timestamp": iso_format(self.day_ago + timedelta(hours=1)),
+                "timestamp": (self.day_ago + timedelta(hours=1)).isoformat(),
                 "tags": {"customtag1": "error_value", "query.dataset": "foo"},
             },
             project_id=self.project.id,
         )
 
         transaction = load_data("transaction")
-        transaction["timestamp"] = iso_format(self.day_ago + timedelta(hours=1))
-        transaction["start_timestamp"] = iso_format(self.day_ago + timedelta(hours=1))
+        transaction["timestamp"] = (self.day_ago + timedelta(hours=1)).isoformat()
+        transaction["start_timestamp"] = (self.day_ago + timedelta(hours=1)).isoformat()
         transaction["tags"] = {"customtag1": "transaction_value", "query.dataset": "foo"}
 
         self.store_event(
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 a68001ab90805b..b23105e52d2529 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
@@ -90,6 +90,61 @@ def test_handle_nans_from_snuba(self):
         )
         assert response.status_code == 200, response.content
 
+    def test_handle_nans_from_snuba_top_n(self):
+        self.store_spans(
+            [
+                self.create_span(
+                    {
+                        "description": "foo",
+                        "measurements": {"lcp": {"value": 1}},
+                    },
+                    start_ts=self.day_ago,
+                ),
+                self.create_span({"description": "foo"}, start_ts=self.day_ago),
+                self.create_span({"description": "foo"}, start_ts=self.two_days_ago),
+                self.create_span(
+                    {
+                        "description": "bar",
+                        "measurements": {"lcp": {"value": 2}},
+                    },
+                    start_ts=self.day_ago,
+                ),
+                self.create_span({"description": "bar"}, start_ts=self.day_ago),
+                self.create_span({"description": "bar"}, start_ts=self.two_days_ago),
+            ],
+            is_eap=self.is_eap,
+        )
+
+        response = self._do_request(
+            data={
+                "field": ["span.description", "p50(measurements.lcp)", "avg(measurements.lcp)"],
+                "yAxis": ["p50(measurements.lcp)", "avg(measurements.lcp)"],
+                "project": self.project.id,
+                "dataset": self.dataset,
+                "excludeOther": 0,
+                "topEvents": 1,
+                "partial": 1,
+                "per_page": 50,
+                "interval": "1d",
+                "statsPeriod": "7d",
+                "orderby": "-avg_measurements_lcp",
+                "sort": "-avg_measurements_lcp",
+            },
+        )
+        assert response.status_code == 200, response.content
+
+        # We cannot actually assert the value because the `spans_indexed` is
+        # producing the wrong result and treating missing values as 0s which
+        # skews the final aggregation.
+        # This is also the reason it never errored because snuba never returns
+        # nans in this situation.
+        #
+        # for k in response.data:
+        #     for agg in ["p50(measurements.lcp)", "avg(measurements.lcp)"]:
+        #         for row in response.data[k][agg]["data"]:
+        #             assert row[1][0]["count"] in {0, 1, 2}
+        # assert response.data["Other"]
+
     def test_count_unique(self):
         event_counts = [6, 0, 6, 3, 0, 3]
         for hour, count in enumerate(event_counts):
@@ -127,6 +182,7 @@ def test_count_unique(self):
         for test in zip(event_counts, rows):
             assert test[1][1][0]["count"] == test[0]
 
+    @pytest.mark.xfail
     def test_p95(self):
         event_durations = [6, 0, 6, 3, 0, 3]
         for hour, duration in enumerate(event_durations):
@@ -426,6 +482,48 @@ def test_top_events_empty_other(self):
                 assert result[1][0]["count"] == expected, key
         assert response.data["foo"]["meta"]["dataset"] == self.dataset
 
+    def test_top_events_multi_y_axis(self):
+        # Each of these denotes how many events to create in each minute
+        for transaction in ["foo", "bar", "baz"]:
+            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()", "p50(span.duration)"],
+                "field": ["transaction", "count()", "p50(span.duration)"],
+                "orderby": ["transaction"],
+                "project": self.project.id,
+                "dataset": self.dataset,
+                "excludeOther": 0,
+                "topEvents": 2,
+            },
+        )
+        assert response.status_code == 200, response.content
+
+        for key in ["Other", "bar", "baz"]:
+            assert key in response.data
+            for y_axis in ["count()", "p50(span.duration)"]:
+                assert y_axis in response.data[key]
+                assert response.data[key][y_axis]["meta"]["dataset"] == self.dataset
+            counts = response.data[key]["count()"]["data"][0:6]
+            for expected, result in zip([0, 1, 0, 0, 0, 0], counts):
+                assert result[1][0]["count"] == expected, key
+            p50s = response.data[key]["p50(span.duration)"]["data"][0:6]
+            for expected, result in zip([0, 2000, 0, 0, 0, 0], p50s):
+                assert result[1][0]["count"] == expected, key
+
     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()]
@@ -632,6 +730,7 @@ def test_extrapolation(self):
             else:
                 assert actual[1][0]["count"] is None
 
+    @pytest.mark.xfail
     def test_extrapolation_with_multiaxis(self):
         event_counts = [6, 0, 6, 3, 0, 3]
         for hour, count in enumerate(event_counts):
@@ -855,3 +954,7 @@ def test_invalid_intervals(self):
             },
         )
         assert response.status_code == 400, response.content
+
+    @pytest.mark.xfail(reason="division by 0 error in snuba")
+    def test_handle_nans_from_snuba_top_n(self):
+        super().test_handle_nans_from_snuba_top_n()
diff --git a/tests/snuba/api/endpoints/test_organization_events_trends.py b/tests/snuba/api/endpoints/test_organization_events_trends.py
index efab6966d6e538..2f340065089be3 100644
--- a/tests/snuba/api/endpoints/test_organization_events_trends.py
+++ b/tests/snuba/api/endpoints/test_organization_events_trends.py
@@ -4,7 +4,7 @@
 
 from sentry.testutils.cases import APITestCase, SnubaTestCase
 from sentry.testutils.helpers import parse_link_header
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.utils.samples import load_data
 
 
@@ -16,16 +16,18 @@ def setUp(self):
         self.day_ago = before_now(days=1).replace(hour=10, minute=0, second=0, microsecond=0)
         self.prototype = load_data("transaction")
         data = self.prototype.copy()
-        data["start_timestamp"] = iso_format(self.day_ago + timedelta(minutes=30))
+        data["start_timestamp"] = (self.day_ago + timedelta(minutes=30)).isoformat()
         data["user"] = {"email": "foo@example.com"}
-        data["timestamp"] = iso_format(self.day_ago + timedelta(minutes=30, seconds=2))
+        data["timestamp"] = (self.day_ago + timedelta(minutes=30, seconds=2)).isoformat()
         data["measurements"]["lcp"]["value"] = 2000
         self.store_event(data, project_id=self.project.id)
 
         second = [0, 2, 10]
         for i in range(3):
             data = self.prototype.copy()
-            data["start_timestamp"] = iso_format(self.day_ago + timedelta(hours=1, minutes=30 + i))
+            data["start_timestamp"] = (
+                self.day_ago + timedelta(hours=1, minutes=30 + i)
+            ).isoformat()
             data["timestamp"] = (
                 self.day_ago + timedelta(hours=1, minutes=30 + i, seconds=second[i])
             ).isoformat()
@@ -846,7 +848,7 @@ def setUp(self):
             for j in range(2):
                 data = self.prototype.copy()
                 data["user"] = {"email": "foo@example.com"}
-                data["start_timestamp"] = iso_format(self.day_ago + timedelta(minutes=30))
+                data["start_timestamp"] = (self.day_ago + timedelta(minutes=30)).isoformat()
                 data["timestamp"] = (
                     self.day_ago + timedelta(hours=j, minutes=30, seconds=2)
                 ).isoformat()
diff --git a/tests/snuba/api/endpoints/test_organization_group_index_stats.py b/tests/snuba/api/endpoints/test_organization_group_index_stats.py
index fbaeef4405188e..ebf82ecdfaf4d6 100644
--- a/tests/snuba/api/endpoints/test_organization_group_index_stats.py
+++ b/tests/snuba/api/endpoints/test_organization_group_index_stats.py
@@ -2,8 +2,8 @@
 
 from sentry.issues.grouptype import ProfileFileIOGroupType
 from sentry.testutils.cases import APITestCase, SnubaTestCase
-from sentry.testutils.helpers import parse_link_header, with_feature
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers import with_feature
+from sentry.testutils.helpers.datetime import before_now
 from tests.sentry.issues.test_utils import OccurrenceTestMixin
 
 
@@ -14,20 +14,8 @@ def setUp(self):
         super().setUp()
         self.min_ago = before_now(minutes=1)
 
-    def _parse_links(self, header):
-        # links come in {url: {...attrs}}, but we need {rel: {...attrs}}
-        links = {}
-        for url, attrs in parse_link_header(header).items():
-            links[attrs["rel"]] = attrs
-            attrs["href"] = url
-        return links
-
     def get_response(self, *args, **kwargs):
-        if not args:
-            org = self.project.organization.slug
-        else:
-            org = args[0]
-        return super().get_response(org, **kwargs)
+        return super().get_response(self.project.organization.slug, **kwargs)
 
     def test_simple(self):
         self.store_event(
@@ -221,7 +209,7 @@ def test_query_timestamp(self):
 
         self.login_as(user=self.user)
         response = self.get_response(
-            query=f"timestamp:>{before_now(seconds=3)} timestamp:<{iso_format(before_now(seconds=1))}",
+            query=f"timestamp:>{before_now(seconds=3)} timestamp:<{before_now(seconds=1).isoformat()}",
             groups=[group_a.id, group_c.id],
         )
 
diff --git a/tests/snuba/api/endpoints/test_organization_sessions.py b/tests/snuba/api/endpoints/test_organization_sessions.py
index cdd58ef258e068..5ee25ef8794f10 100644
--- a/tests/snuba/api/endpoints/test_organization_sessions.py
+++ b/tests/snuba/api/endpoints/test_organization_sessions.py
@@ -6,7 +6,6 @@
 from django.urls import reverse
 from django.utils import timezone
 
-from sentry import release_health
 from sentry.models.releaseprojectenvironment import ReleaseProjectEnvironment
 from sentry.release_health.metrics import MetricsReleaseHealthBackend
 from sentry.snuba.metrics import to_intervals
@@ -359,15 +358,10 @@ def test_10s_resolution(self):
             )
             assert response.status_code == 200, response.content
 
-            if release_health.backend.is_metrics_based():
-                # With the metrics backend, we should get exactly what we asked for,
-                # 6 intervals with 10 second length. However, since we add both the
-                # starting and ending interval we get 7 intervals.
-                assert len(response.data["intervals"]) == 7
-            else:
-                # With the sessions backend, the resolution will be 1m and will include starting and ending
-                # minute so 2 intervals
-                assert len(response.data["intervals"]) == 2
+            # With the metrics backend, we should get exactly what we asked for,
+            # 6 intervals with 10 second length. However, since we add both the
+            # starting and ending interval we get 7 intervals.
+            assert len(response.data["intervals"]) == 7
 
     @freeze_time(MOCK_DATETIME)
     def test_filter_projects(self):
@@ -400,36 +394,26 @@ def req(**kwargs):
         response = req()
         assert response.status_code == 200
 
-        if release_health.backend.is_metrics_based():
-            # Both these fields are supported by the metrics backend
-            assert response.data["groups"] == [
-                {
-                    "by": {},
-                    "totals": {"anr_rate()": 0.0, "crash_free_rate(user)": 1.0},
-                    "series": {"anr_rate()": [None, 0.0], "crash_free_rate(user)": [None, 1.0]},
-                }
-            ]
-        else:
-            # Both these fields are not supported by the sessions backend
-            assert response.data["groups"] == []
+        # Both these fields are supported by the metrics backend
+        assert response.data["groups"] == [
+            {
+                "by": {},
+                "totals": {"anr_rate()": 0.0, "crash_free_rate(user)": 1.0},
+                "series": {"anr_rate()": [None, 0.0], "crash_free_rate(user)": [None, 1.0]},
+            }
+        ]
 
         response = req(field=["anr_rate()", "sum(session)"])
         assert response.status_code == 200
 
-        if release_health.backend.is_metrics_based():
-            # Both these fields are supported by the metrics backend
-            assert response.data["groups"] == [
-                {
-                    "by": {},
-                    "totals": {"anr_rate()": 0.0, "sum(session)": 9},
-                    "series": {"anr_rate()": [None, 0.0], "sum(session)": [0, 9]},
-                }
-            ]
-        else:
-            # Only sum(session) is supported by the sessions backend
-            assert response.data["groups"] == [
-                {"by": {}, "totals": {"sum(session)": 9}, "series": {"sum(session)": [0, 9]}}
-            ]
+        # Both these fields are supported by the metrics backend
+        assert response.data["groups"] == [
+            {
+                "by": {},
+                "totals": {"anr_rate()": 0.0, "sum(session)": 9},
+                "series": {"anr_rate()": [None, 0.0], "sum(session)": [0, 9]},
+            }
+        ]
 
     @freeze_time(MOCK_DATETIME)
     def test_filter_environment(self):
diff --git a/tests/snuba/api/endpoints/test_organization_spans_trace.py b/tests/snuba/api/endpoints/test_organization_spans_trace.py
index 9b7deef95f23fb..125f33c70f8c7b 100644
--- a/tests/snuba/api/endpoints/test_organization_spans_trace.py
+++ b/tests/snuba/api/endpoints/test_organization_spans_trace.py
@@ -66,7 +66,6 @@ def assert_trace_data(self, root, gen2_no_children=True):
 
     def assert_performance_issues(self, root):
         """Broken in the non-spans endpoint, but we're not maintaining that anymore"""
-        pass
 
     def client_get(self, data, url=None):
         if url is None:
diff --git a/tests/snuba/api/endpoints/test_organization_tagkey_values.py b/tests/snuba/api/endpoints/test_organization_tagkey_values.py
index 5acbdb7710785f..d1573fc11c8ac0 100644
--- a/tests/snuba/api/endpoints/test_organization_tagkey_values.py
+++ b/tests/snuba/api/endpoints/test_organization_tagkey_values.py
@@ -9,7 +9,7 @@
 from sentry.search.events.constants import RELEASE_ALIAS, SEMVER_ALIAS
 from sentry.snuba.dataset import Dataset
 from sentry.testutils.cases import APITestCase, ReplaysSnubaTestCase, SnubaTestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.utils.samples import load_data
 from tests.sentry.issues.test_utils import OccurrenceTestMixin
 
@@ -38,27 +38,23 @@ def run_test(self, key, expected, **kwargs):
     def project(self):
         return self.create_project(organization=self.org, teams=[self.team])
 
-    @cached_property
-    def group(self):
-        return self.create_group(project=self.project)
-
 
 class OrganizationTagKeyValuesTest(OrganizationTagKeyTestCase):
     def test_simple(self):
         self.store_event(
-            data={"timestamp": iso_format(self.day_ago), "tags": {"fruit": "apple"}},
+            data={"timestamp": self.day_ago.isoformat(), "tags": {"fruit": "apple"}},
             project_id=self.project.id,
         )
         self.store_event(
-            data={"timestamp": iso_format(self.min_ago), "tags": {"fruit": "orange"}},
+            data={"timestamp": self.min_ago.isoformat(), "tags": {"fruit": "orange"}},
             project_id=self.project.id,
         )
         self.store_event(
-            data={"timestamp": iso_format(self.min_ago), "tags": {"some_tag": "some_value"}},
+            data={"timestamp": self.min_ago.isoformat(), "tags": {"some_tag": "some_value"}},
             project_id=self.project.id,
         )
         self.store_event(
-            data={"timestamp": iso_format(self.min_ago), "tags": {"fruit": "orange"}},
+            data={"timestamp": self.min_ago.isoformat(), "tags": {"fruit": "orange"}},
             project_id=self.project.id,
         )
 
@@ -73,12 +69,12 @@ def test_simple(self):
     def test_env(self):
         env2 = self.create_environment()
         self.store_event(
-            data={"timestamp": iso_format(self.day_ago), "tags": {"fruit": "apple"}},
+            data={"timestamp": self.day_ago.isoformat(), "tags": {"fruit": "apple"}},
             project_id=self.project.id,
         )
         self.store_event(
             data={
-                "timestamp": iso_format(self.day_ago),
+                "timestamp": self.day_ago.isoformat(),
                 "tags": {"fruit": "apple"},
                 "environment": self.environment.name,
             },
@@ -86,14 +82,14 @@ def test_env(self):
         )
         self.store_event(
             data={
-                "timestamp": iso_format(self.day_ago),
+                "timestamp": self.day_ago.isoformat(),
                 "tags": {"fruit": "apple"},
                 "environment": env2.name,
             },
             project_id=self.project.id,
         )
         self.store_event(
-            data={"timestamp": iso_format(self.min_ago), "tags": {"fruit": "orange"}},
+            data={"timestamp": self.min_ago.isoformat(), "tags": {"fruit": "orange"}},
             project_id=self.project.id,
         )
         self.run_test(
@@ -107,7 +103,7 @@ def test_env_with_order_by_count(self):
         for minute in range(1, 6):
             self.store_event(
                 data={
-                    "timestamp": iso_format(before_now(minutes=minute * 10)),
+                    "timestamp": before_now(minutes=minute * 10).isoformat(),
                     "tags": {"fruit": "apple"},
                     "environment": self.environment.name,
                 },
@@ -117,7 +113,7 @@ def test_env_with_order_by_count(self):
         for minute in range(1, 5):
             self.store_event(
                 data={
-                    "timestamp": iso_format(self.min_ago),
+                    "timestamp": self.min_ago.isoformat(),
                     "tags": {"fruit": "orange"},
                     "environment": self.environment.name,
                 },
@@ -140,7 +136,7 @@ def test_env_with_order_by_count(self):
 
     def test_invalid_sort_field(self):
         self.store_event(
-            data={"timestamp": iso_format(self.day_ago), "tags": {"fruit": "apple"}},
+            data={"timestamp": self.day_ago.isoformat(), "tags": {"fruit": "apple"}},
             project_id=self.project.id,
         )
         response = self.get_response("fruit", sort="invalid_field")
@@ -171,23 +167,23 @@ def test_bad_key(self):
 
     def test_snuba_column(self):
         self.store_event(
-            data={"timestamp": iso_format(self.day_ago), "user": {"email": "foo@example.com"}},
+            data={"timestamp": self.day_ago.isoformat(), "user": {"email": "foo@example.com"}},
             project_id=self.project.id,
         )
         self.store_event(
-            data={"timestamp": iso_format(self.min_ago), "user": {"email": "bar@example.com"}},
+            data={"timestamp": self.min_ago.isoformat(), "user": {"email": "bar@example.com"}},
             project_id=self.project.id,
         )
         self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=10)),
+                "timestamp": before_now(seconds=10).isoformat(),
                 "user": {"email": "baz@example.com"},
             },
             project_id=self.project.id,
         )
         self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=10)),
+                "timestamp": before_now(seconds=10).isoformat(),
                 "user": {"email": "baz@example.com"},
             },
             project_id=self.project.id,
@@ -199,20 +195,20 @@ def test_snuba_column(self):
 
     def test_release(self):
         self.store_event(
-            data={"timestamp": iso_format(self.day_ago), "tags": {"sentry:release": "3.1.2"}},
+            data={"timestamp": self.day_ago.isoformat(), "tags": {"sentry:release": "3.1.2"}},
             project_id=self.project.id,
         )
         self.store_event(
-            data={"timestamp": iso_format(self.min_ago), "tags": {"sentry:release": "4.1.2"}},
+            data={"timestamp": self.min_ago.isoformat(), "tags": {"sentry:release": "4.1.2"}},
             project_id=self.project.id,
         )
         self.store_event(
-            data={"timestamp": iso_format(self.day_ago), "tags": {"sentry:release": "3.1.2"}},
+            data={"timestamp": self.day_ago.isoformat(), "tags": {"sentry:release": "3.1.2"}},
             project_id=self.project.id,
         )
         self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=10)),
+                "timestamp": before_now(seconds=10).isoformat(),
                 "tags": {"sentry:release": "5.1.2"},
             },
             project_id=self.project.id,
@@ -221,11 +217,11 @@ def test_release(self):
 
     def test_user_tag(self):
         self.store_event(
-            data={"tags": {"sentry:user": "1"}, "timestamp": iso_format(self.day_ago)},
+            data={"tags": {"sentry:user": "1"}, "timestamp": self.day_ago.isoformat()},
             project_id=self.project.id,
         )
         self.store_event(
-            data={"tags": {"sentry:user": "2"}, "timestamp": iso_format(self.min_ago)},
+            data={"tags": {"sentry:user": "2"}, "timestamp": self.min_ago.isoformat()},
             project_id=self.project.id,
         )
         self.store_event(
@@ -317,7 +313,7 @@ def test_disabled_tag_keys(self):
     def test_group_id_tag(self):
         self.store_event(
             data={
-                "timestamp": iso_format(self.day_ago - timedelta(minutes=1)),
+                "timestamp": (self.day_ago - timedelta(minutes=1)).isoformat(),
                 "tags": {"group_id": "not-a-group-id-but-a-string"},
             },
             project_id=self.project.id,
@@ -327,21 +323,21 @@ def test_group_id_tag(self):
     def test_user_display(self):
         self.store_event(
             data={
-                "timestamp": iso_format(self.day_ago - timedelta(minutes=1)),
+                "timestamp": (self.day_ago - timedelta(minutes=1)).isoformat(),
                 "user": {"email": "foo@example.com", "ip_address": "127.0.0.1"},
             },
             project_id=self.project.id,
         )
         self.store_event(
             data={
-                "timestamp": iso_format(self.day_ago - timedelta(minutes=2)),
+                "timestamp": (self.day_ago - timedelta(minutes=2)).isoformat(),
                 "user": {"username": "bazz", "ip_address": "192.168.0.1"},
             },
             project_id=self.project.id,
         )
         self.store_event(
             data={
-                "timestamp": iso_format(self.day_ago - timedelta(minutes=3)),
+                "timestamp": (self.day_ago - timedelta(minutes=3)).isoformat(),
                 "user": {"ip_address": "127.0.0.1"},
             },
             project_id=self.project.id,
@@ -479,8 +475,8 @@ def setUp(self):
         self.transaction.update(
             {
                 "transaction": "/city_by_code/",
-                "timestamp": iso_format(before_now(seconds=30)),
-                "start_timestamp": iso_format(before_now(seconds=35)),
+                "timestamp": before_now(seconds=30).isoformat(),
+                "start_timestamp": before_now(seconds=35).isoformat(),
             }
         )
         self.transaction["contexts"]["trace"].update(
diff --git a/tests/snuba/api/endpoints/test_organization_tags.py b/tests/snuba/api/endpoints/test_organization_tags.py
index f3bce93ff3f786..3c66e2568253cc 100644
--- a/tests/snuba/api/endpoints/test_organization_tags.py
+++ b/tests/snuba/api/endpoints/test_organization_tags.py
@@ -6,7 +6,7 @@
 
 from sentry.replays.testutils import mock_replay
 from sentry.testutils.cases import APITestCase, ReplaysSnubaTestCase, SnubaTestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.utils.samples import load_data
 from tests.sentry.issues.test_utils import OccurrenceTestMixin
 
@@ -14,7 +14,7 @@
 class OrganizationTagsTest(APITestCase, OccurrenceTestMixin, SnubaTestCase):
     def setUp(self):
         super().setUp()
-        self.min_ago = iso_format(before_now(minutes=1))
+        self.min_ago = before_now(minutes=1).isoformat()
 
     def test_simple(self):
         user = self.create_user()
@@ -331,8 +331,8 @@ def test_different_times_caching(self, mock_snuba_query):
         self.login_as(user=user)
 
         with self.options({"snuba.tagstore.cache-tagkeys-rate": 1.0}):
-            start = iso_format(before_now(minutes=10))
-            end = iso_format(before_now(minutes=5))
+            start = before_now(minutes=10).isoformat()
+            end = before_now(minutes=5).isoformat()
             url = reverse(
                 "sentry-api-0-organization-tags", kwargs={"organization_id_or_slug": org.slug}
             )
@@ -343,8 +343,8 @@ def test_different_times_caching(self, mock_snuba_query):
             assert mock_snuba_query.call_count == 1
 
             # 5 minutes later, cache_key should be different
-            start = iso_format(before_now(minutes=5))
-            end = iso_format(before_now(minutes=0))
+            start = before_now(minutes=5).isoformat()
+            end = before_now(minutes=0).isoformat()
             response = self.client.get(
                 url, {"use_cache": "1", "start": start, "end": end}, format="json"
             )
@@ -359,9 +359,9 @@ def test_different_times_retrieves_cache(self):
         project = self.create_project(organization=org, teams=[team])
 
         with self.options({"snuba.tagstore.cache-tagkeys-rate": 1.0}):
-            start = iso_format(before_now(minutes=10))
-            middle = iso_format(before_now(minutes=5))
-            end = iso_format(before_now(minutes=0))
+            start = before_now(minutes=10).isoformat()
+            middle = before_now(minutes=5).isoformat()
+            end = before_now(minutes=0).isoformat()
             # Throw an event in the middle of the time window, since end might get rounded down a bit
             self.store_event(
                 data={"event_id": "a" * 32, "tags": {"fruit": "apple"}, "timestamp": middle},
diff --git a/tests/snuba/api/endpoints/test_project_event_details.py b/tests/snuba/api/endpoints/test_project_event_details.py
index fe9f54f365acb3..ecd46717e864de 100644
--- a/tests/snuba/api/endpoints/test_project_event_details.py
+++ b/tests/snuba/api/endpoints/test_project_event_details.py
@@ -1,7 +1,7 @@
 from django.urls import reverse
 
 from sentry.testutils.cases import APITestCase, PerformanceIssueTestCase, SnubaTestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.utils.samples import load_data
 from tests.sentry.issues.test_utils import OccurrenceTestMixin
 
@@ -321,7 +321,7 @@ def setUp(self):
         self.login_as(user=self.user)
         self.event_id = "c" * 32
         self.fingerprint = ["group_2"]
-        self.min_ago = iso_format(before_now(minutes=1))
+        self.min_ago = before_now(minutes=1).replace(microsecond=0).isoformat()
         self.event = self.store_event(
             data={
                 "event_id": self.event_id,
@@ -343,7 +343,7 @@ def setUp(self):
     def assert_event(self, data):
         assert data["event_id"] == self.event_id
         assert data["user"]["email"] == self.user.email
-        assert data["datetime"][:19] == self.min_ago
+        assert data["datetime"] == self.min_ago
         assert data["fingerprint"] == self.fingerprint
 
     def test_simple(self):
@@ -385,3 +385,68 @@ def test_project_not_associated_with_event(self):
         response = self.client.get(url, format="json")
         assert response.status_code == 404, response.content
         assert response.data == {"detail": "Event not found"}
+
+
+class ProjectEventDetailsTransactionTestScrubbed(APITestCase, SnubaTestCase):
+    def setUp(self):
+        super().setUp()
+        self.login_as(user=self.user)
+        data = load_data("transaction")
+        for span in data["spans"]:
+            span["sentry_tags"]["user.ip"] = "127.0.0.1"
+            span["sentry_tags"]["user"] = "ip:127.0.0.1"
+        self.event = self.store_event(data=data, project_id=self.project.id)
+
+    def url(self, event):
+        return reverse(
+            "sentry-api-0-event-json",
+            kwargs={
+                "organization_id_or_slug": self.organization.slug,
+                "project_id_or_slug": self.project.slug,
+                "event_id": event.event_id,
+            },
+        )
+
+    def test_no_scrubbed(self):
+        response = self.client.get(self.url(self.event), format="json")
+        assert response.status_code == 200, response.content
+        assert len(response.data["spans"]) > 0
+        for span in response.data["spans"]:
+            assert "user.ip" in span["sentry_tags"]
+            assert span["sentry_tags"]["user"] == "ip:127.0.0.1"
+
+    def test_scrubbed_project(self):
+        self.project.update_option("sentry:scrub_ip_address", True)
+
+        response = self.client.get(self.url(self.event), format="json")
+        assert response.status_code == 200, response.content
+        assert len(response.data["spans"]) > 0
+        for span in response.data["spans"]:
+            assert "user.ip" not in span["sentry_tags"]
+            assert span["sentry_tags"]["user"] == "ip:[ip]"
+
+    def test_scrubbed_organization(self):
+        self.organization.update_option("sentry:require_scrub_ip_address", True)
+
+        response = self.client.get(self.url(self.event), format="json")
+        assert response.status_code == 200, response.content
+        assert len(response.data["spans"]) > 0
+        for span in response.data["spans"]:
+            assert "user.ip" not in span["sentry_tags"]
+            assert span["sentry_tags"]["user"] == "ip:[ip]"
+
+    def test_scrubbed_organization_does_not_scrub_other_user_fields(self):
+        self.organization.update_option("sentry:require_scrub_ip_address", True)
+
+        data = load_data("transaction")
+        for span in data["spans"]:
+            span["sentry_tags"]["user.ip"] = "127.0.0.1"
+            span["sentry_tags"]["user"] = "username:foo"
+        event = self.store_event(data=data, project_id=self.project.id)
+
+        response = self.client.get(self.url(event), format="json")
+        assert response.status_code == 200, response.content
+        assert len(response.data["spans"]) > 0
+        for span in response.data["spans"]:
+            assert "user.ip" not in span["sentry_tags"]
+            assert span["sentry_tags"]["user"] == "username:foo"
diff --git a/tests/snuba/api/endpoints/test_project_group_index.py b/tests/snuba/api/endpoints/test_project_group_index.py
index b1c73243fc62d6..48c78569f0fd78 100644
--- a/tests/snuba/api/endpoints/test_project_group_index.py
+++ b/tests/snuba/api/endpoints/test_project_group_index.py
@@ -33,7 +33,7 @@
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import APITestCase, SnubaTestCase
 from sentry.testutils.helpers import Feature, parse_link_header, with_feature
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.silo import assume_test_silo_mode
 from sentry.types.activity import ActivityType
 from sentry.users.models.user_option import UserOption
@@ -79,14 +79,14 @@ def test_simple_pagination(self):
         event1 = self.store_event(
             data={
                 "fingerprint": ["put-me-in-group-1"],
-                "timestamp": iso_format(self.min_ago - timedelta(seconds=2)),
+                "timestamp": (self.min_ago - timedelta(seconds=2)).isoformat(),
             },
             project_id=self.project.id,
         )
         event2 = self.store_event(
             data={
                 "fingerprint": ["put-me-in-group-2"],
-                "timestamp": iso_format(self.min_ago - timedelta(seconds=1)),
+                "timestamp": (self.min_ago - timedelta(seconds=1)).isoformat(),
             },
             project_id=self.project.id,
         )
@@ -136,7 +136,7 @@ def test_environment(self):
         self.store_event(
             data={
                 "fingerprint": ["put-me-in-group1"],
-                "timestamp": iso_format(self.min_ago),
+                "timestamp": self.min_ago.isoformat(),
                 "environment": "production",
             },
             project_id=self.project.id,
@@ -144,7 +144,7 @@ def test_environment(self):
         self.store_event(
             data={
                 "fingerprint": ["put-me-in-group2"],
-                "timestamp": iso_format(self.min_ago),
+                "timestamp": self.min_ago.isoformat(),
                 "environment": "staging",
             },
             project_id=self.project.id,
@@ -177,7 +177,7 @@ def test_lookup_by_event_id(self):
         project.update_option("sentry:resolve_age", 1)
         event_id = "c" * 32
         event = self.store_event(
-            data={"event_id": event_id, "timestamp": iso_format(self.min_ago)},
+            data={"event_id": event_id, "timestamp": self.min_ago.isoformat()},
             project_id=self.project.id,
         )
         self.login_as(user=self.user)
@@ -194,7 +194,7 @@ def test_lookup_by_event_with_matching_environment(self):
         self.create_environment(name="test", project=project)
 
         event = self.store_event(
-            data={"environment": "test", "timestamp": iso_format(self.min_ago)},
+            data={"environment": "test", "timestamp": self.min_ago.isoformat()},
             project_id=self.project.id,
         )
 
@@ -213,7 +213,7 @@ def test_lookup_by_event_id_with_whitespace(self):
         project = self.project
         project.update_option("sentry:resolve_age", 1)
         event = self.store_event(
-            data={"event_id": "c" * 32, "timestamp": iso_format(self.min_ago)},
+            data={"event_id": "c" * 32, "timestamp": self.min_ago.isoformat()},
             project_id=self.project.id,
         )
         self.login_as(user=self.user)
@@ -271,11 +271,11 @@ def test_lookup_by_first_release(self):
         release.add_project(project)
         release.add_project(project2)
         group = self.store_event(
-            data={"release": release.version, "timestamp": iso_format(before_now(seconds=1))},
+            data={"release": release.version, "timestamp": before_now(seconds=1).isoformat()},
             project_id=project.id,
         ).group
         self.store_event(
-            data={"release": release.version, "timestamp": iso_format(before_now(seconds=1))},
+            data={"release": release.version, "timestamp": before_now(seconds=1).isoformat()},
             project_id=project2.id,
         )
         url = "{}?query={}".format(self.path, 'first-release:"%s"' % release.version)
@@ -347,7 +347,7 @@ def test_token_auth(self):
 
     def test_filter_not_unresolved(self):
         event = self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=500)), "fingerprint": ["group-1"]},
+            data={"timestamp": before_now(seconds=500).isoformat(), "fingerprint": ["group-1"]},
             project_id=self.project.id,
         )
         event.group.update(status=GroupStatus.RESOLVED, substatus=None)
@@ -358,7 +358,7 @@ def test_filter_not_unresolved(self):
 
     def test_single_group_by_hash(self):
         event = self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=500)), "fingerprint": ["group-1"]},
+            data={"timestamp": before_now(seconds=500).isoformat(), "fingerprint": ["group-1"]},
             project_id=self.project.id,
         )
 
@@ -371,12 +371,12 @@ def test_single_group_by_hash(self):
 
     def test_multiple_groups_by_hashes(self):
         event = self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=500)), "fingerprint": ["group-1"]},
+            data={"timestamp": before_now(seconds=500).isoformat(), "fingerprint": ["group-1"]},
             project_id=self.project.id,
         )
 
         event2 = self.store_event(
-            data={"timestamp": iso_format(before_now(seconds=400)), "fingerprint": ["group-2"]},
+            data={"timestamp": before_now(seconds=400).isoformat(), "fingerprint": ["group-2"]},
             project_id=self.project.id,
         )
         self.login_as(user=self.user)
@@ -652,6 +652,8 @@ def test_self_assign_issue_next_release(self):
 
     def test_selective_status_update(self):
         group1 = self.create_group(status=GroupStatus.RESOLVED)
+        group1.resolved_at = timezone.now()
+        group1.save()
         group2 = self.create_group(status=GroupStatus.UNRESOLVED)
         group3 = self.create_group(status=GroupStatus.IGNORED)
         group4 = self.create_group(
@@ -1134,7 +1136,7 @@ def test_snooze_user_count(self):
                 data={
                     "fingerprint": ["put-me-in-group-1"],
                     "user": {"id": str(i)},
-                    "timestamp": iso_format(self.min_ago + timedelta(seconds=i)),
+                    "timestamp": (self.min_ago + timedelta(seconds=i)).isoformat(),
                 },
                 project_id=self.project.id,
             )
@@ -1295,7 +1297,7 @@ def test_set_has_seen(self):
         assert not r4.exists()
 
     def test_inbox_fields(self):
-        group1 = self.create_group(status=GroupStatus.RESOLVED)
+        group1 = self.create_group(status=GroupStatus.UNRESOLVED)
         add_group_to_inbox(group1, GroupInboxReason.NEW)
         self.login_as(user=self.user)
         url = f"{self.path}?id={group1.id}"
@@ -1303,6 +1305,13 @@ def test_inbox_fields(self):
         assert "inbox" in response.data
         assert response.data["inbox"] is None
 
+        group2 = self.create_group(status=GroupStatus.RESOLVED)
+        add_group_to_inbox(group2, GroupInboxReason.NEW)
+        self.login_as(user=self.user)
+        url = f"{self.path}?id={group2.id}"
+        response = self.client.put(url, data={"status": "resolved"}, format="json")
+        assert "inbox" not in response.data
+
     @patch("sentry.issues.merge.uuid4")
     @patch("sentry.issues.merge.merge_groups")
     @patch("sentry.eventstream.backend")
diff --git a/tests/snuba/api/serializers/test_group.py b/tests/snuba/api/serializers/test_group.py
index a8b2a3e96c84b4..2934d1a7089ad5 100644
--- a/tests/snuba/api/serializers/test_group.py
+++ b/tests/snuba/api/serializers/test_group.py
@@ -17,7 +17,7 @@
 from sentry.notifications.types import NotificationSettingsOptionEnum
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import APITestCase, PerformanceIssueTestCase, SnubaTestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.silo import assume_test_silo_mode
 from sentry.types.group import PriorityLevel
 from sentry.users.models.user_option import UserOption
@@ -361,16 +361,16 @@ def test_seen_stats(self):
         events = []
 
         for event_id, env, user_id, timestamp in [
-            ("a" * 32, environment, 1, iso_format(self.min_ago)),
-            ("b" * 32, environment, 2, iso_format(self.min_ago)),
-            ("c" * 32, environment2, 3, iso_format(self.week_ago)),
+            ("a" * 32, environment, 1, self.min_ago),
+            ("b" * 32, environment, 2, self.min_ago),
+            ("c" * 32, environment2, 3, self.week_ago),
         ]:
             events.append(
                 self.store_event(
                     data={
                         "event_id": event_id,
                         "fingerprint": ["put-me-in-group1"],
-                        "timestamp": timestamp,
+                        "timestamp": timestamp.isoformat(),
                         "environment": env.name,
                         "user": {"id": user_id},
                     },
@@ -390,7 +390,7 @@ def test_seen_stats(self):
         # should use group columns when no environments arg passed
         result = serialize(group, serializer=GroupSerializerSnuba(environment_ids=[]))
         assert result["count"] == "3"
-        assert iso_format(result["lastSeen"]) == iso_format(self.min_ago)
+        assert result["lastSeen"] == self.min_ago.replace(microsecond=0)
         assert result["firstSeen"] == group.first_seen
 
         # update this to something different to make sure it's being used
@@ -406,8 +406,8 @@ def test_seen_stats(self):
         )
         assert result["count"] == "3"
         # result is rounded down to nearest second
-        assert iso_format(result["lastSeen"]) == iso_format(self.min_ago)
-        assert iso_format(result["firstSeen"]) == iso_format(group_env.first_seen)
+        assert result["lastSeen"] == self.min_ago.replace(microsecond=0)
+        assert result["firstSeen"] == group_env.first_seen
         assert group_env2.first_seen is not None
         assert group_env2.first_seen > group_env.first_seen
         assert result["userCount"] == 3
@@ -421,8 +421,8 @@ def test_seen_stats(self):
             ),
         )
         assert result["userCount"] == 1
-        assert iso_format(result["lastSeen"]) == iso_format(self.week_ago)
-        assert iso_format(result["firstSeen"]) == iso_format(self.week_ago)
+        assert result["lastSeen"] == self.week_ago.replace(microsecond=0)
+        assert result["firstSeen"] == self.week_ago.replace(microsecond=0)
         assert result["count"] == "1"
 
     def test_get_start_from_seen_stats(self):
@@ -439,7 +439,7 @@ def test_get_start_from_seen_stats(self):
                 }
             )
 
-            assert iso_format(start) == iso_format(before_now(days=expected))
+            assert start.replace(microsecond=0) == before_now(days=expected).replace(microsecond=0)
 
     def test_skipped_date_timestamp_filters(self):
         group = self.create_group()
@@ -481,7 +481,7 @@ def test_perf_seen_stats(self):
         proj = self.create_project()
 
         first_group_fingerprint = f"{PerformanceNPlusOneGroupType.type_id}-group1"
-        timestamp = timezone.now() - timedelta(days=5)
+        timestamp = (timezone.now() - timedelta(days=5)).replace(microsecond=0)
         times = 5
         for _ in range(0, times):
             event_data = load_data(
@@ -517,8 +517,8 @@ def test_perf_seen_stats(self):
         )
 
         assert result["userCount"] == 2
-        assert iso_format(result["lastSeen"]) == iso_format(timestamp + timedelta(minutes=2))
-        assert iso_format(result["firstSeen"]) == iso_format(timestamp + timedelta(minutes=1))
+        assert result["lastSeen"] == (timestamp + timedelta(minutes=2))
+        assert result["firstSeen"] == (timestamp + timedelta(minutes=1))
         assert result["count"] == str(times + 1)
 
 
@@ -532,7 +532,9 @@ def test_profiling_seen_stats(self):
         environment = self.create_environment(project=proj)
 
         first_group_fingerprint = f"{ProfileFileIOGroupType.type_id}-group1"
-        timestamp = (timezone.now() - timedelta(days=5)).replace(hour=0, minute=0, second=0)
+        timestamp = (timezone.now() - timedelta(days=5)).replace(
+            hour=0, minute=0, second=0, microsecond=0
+        )
         times = 5
         for incr in range(0, times):
             # for user_0 - user_4, first_group
@@ -566,6 +568,6 @@ def test_profiling_seen_stats(self):
         )
 
         assert result["userCount"] == 6
-        assert iso_format(result["lastSeen"]) == iso_format(timestamp + timedelta(minutes=5))
-        assert iso_format(result["firstSeen"]) == iso_format(timestamp)
+        assert result["lastSeen"] == (timestamp + timedelta(minutes=5))
+        assert result["firstSeen"] == timestamp
         assert result["count"] == str(times + 1)
diff --git a/tests/snuba/api/serializers/test_group_stream.py b/tests/snuba/api/serializers/test_group_stream.py
index 7b2864fae4249f..1e2501751a6cb4 100644
--- a/tests/snuba/api/serializers/test_group_stream.py
+++ b/tests/snuba/api/serializers/test_group_stream.py
@@ -11,7 +11,7 @@
 from sentry.api.serializers.models.group_stream import StreamGroupSerializerSnuba
 from sentry.models.environment import Environment
 from sentry.testutils.cases import APITestCase, BaseMetricsTestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.utils.cache import cache
 from sentry.utils.hashlib import hash_values
 
@@ -232,7 +232,7 @@ def test_session_count(self):
         )
         data = {
             "fingerprint": ["meow"],
-            "timestamp": iso_format(timezone.now()),
+            "timestamp": timezone.now().isoformat(),
             "type": "error",
             "exception": [{"type": "Foo"}],
         }
diff --git a/tests/snuba/incidents/test_tasks.py b/tests/snuba/incidents/test_tasks.py
index ab27ca4a0e1489..79ef90deea3129 100644
--- a/tests/snuba/incidents/test_tasks.py
+++ b/tests/snuba/incidents/test_tasks.py
@@ -1,6 +1,5 @@
 from copy import deepcopy
 from functools import cached_property
-from uuid import uuid4
 
 from arroyo.utils import metrics
 from confluent_kafka import Producer
@@ -105,10 +104,6 @@ def producer(self):
         }
         return Producer(conf)
 
-    @cached_property
-    def topic(self):
-        return uuid4().hex
-
     def run_test(self, consumer):
         # Full integration test to ensure that when a subscription receives an update
         # the `QuerySubscriptionConsumer` successfully retries the subscription and
diff --git a/tests/snuba/models/test_group.py b/tests/snuba/models/test_group.py
index 18f271badb49af..64de81d92312d0 100644
--- a/tests/snuba/models/test_group.py
+++ b/tests/snuba/models/test_group.py
@@ -2,13 +2,16 @@
 
 import uuid
 from collections.abc import Sequence
+from datetime import datetime
 from unittest.mock import patch
 
+from snuba_sdk import Column, Condition, Op
+
 from sentry.eventstore.models import GroupEvent
 from sentry.issues.grouptype import PerformanceNPlusOneGroupType, ProfileFileIOGroupType
 from sentry.models.group import Group
 from sentry.testutils.cases import PerformanceIssueTestCase, SnubaTestCase, TestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now, freeze_time
 from sentry.utils.samples import load_data
 from tests.sentry.issues.test_utils import OccurrenceTestMixin
 
@@ -34,14 +37,11 @@ def _get_oldest_non_null(g: Group, environments: Sequence[str] = ()) -> GroupEve
 class GroupTestSnuba(TestCase, SnubaTestCase, PerformanceIssueTestCase, OccurrenceTestMixin):
     def test_get_oldest_latest_for_environments(self):
         project = self.create_project()
-
-        min_ago = iso_format(before_now(minutes=1))
-
         self.store_event(
             data={
                 "event_id": "a" * 32,
                 "environment": "production",
-                "timestamp": min_ago,
+                "timestamp": before_now(minutes=3).isoformat(),
                 "fingerprint": ["group-1"],
             },
             project_id=project.id,
@@ -50,13 +50,17 @@ def test_get_oldest_latest_for_environments(self):
             data={
                 "event_id": "b" * 32,
                 "environment": "production",
-                "timestamp": min_ago,
+                "timestamp": before_now(minutes=2).isoformat(),
                 "fingerprint": ["group-1"],
             },
             project_id=project.id,
         )
         self.store_event(
-            data={"event_id": "c" * 32, "timestamp": min_ago, "fingerprint": ["group-1"]},
+            data={
+                "event_id": "c" * 32,
+                "timestamp": before_now(minutes=1).isoformat(),
+                "fingerprint": ["group-1"],
+            },
             project_id=project.id,
         )
 
@@ -69,42 +73,14 @@ def test_get_oldest_latest_for_environments(self):
         assert _get_oldest_non_null(group, ["staging", "production"]).event_id == "a" * 32
         assert group.get_oldest_event_for_environments(["staging"]) is None
 
-    def test_perf_issue(self):
-        group_fingerprint = f"{PerformanceNPlusOneGroupType.type_id}-group1"
-
-        event_data_1 = load_data("transaction-n-plus-one", fingerprint=[group_fingerprint])
-        event_data_1["timestamp"] = iso_format(before_now(seconds=10))
-        event_data_1["start_timestamp"] = iso_format(before_now(seconds=11))
-        event_data_1["event_id"] = "d" * 32
-        event_data_2 = load_data("transaction-n-plus-one", fingerprint=[group_fingerprint])
-        event_data_2["timestamp"] = iso_format(before_now(seconds=20))
-        event_data_2["start_timestamp"] = iso_format(before_now(seconds=21))
-        event_data_2["event_id"] = "f" * 32
-        event_data_3 = load_data("transaction-n-plus-one", fingerprint=[group_fingerprint])
-        event_data_3["timestamp"] = iso_format(before_now(seconds=30))
-        event_data_3["start_timestamp"] = iso_format(before_now(seconds=31))
-        event_data_3["event_id"] = "f" * 32
-
-        transaction_event_1 = self.create_performance_issue(
-            event_data=event_data_1, fingerprint=group_fingerprint
-        )
-        self.create_performance_issue(event_data=event_data_2, fingerprint=group_fingerprint)
-        self.create_performance_issue(event_data=event_data_3, fingerprint=group_fingerprint)
-
-        perf_group = transaction_event_1.group
-
-        assert _get_latest_non_null(perf_group).event_id == "d" * 32
-        assert _get_oldest_non_null(perf_group).event_id == "f" * 32
-
     def test_error_issue_get_helpful_for_environments(self):
         project = self.create_project()
-        min_ago = iso_format(before_now(minutes=1))
         replay_id = uuid.uuid4().hex
 
         event_all_helpful_params = self.store_event(
             data={
                 "event_id": "a" * 32,
-                "timestamp": min_ago,
+                "timestamp": before_now(minutes=3).isoformat(),
                 "fingerprint": ["group-1"],
                 "contexts": {
                     "replay": {"replay_id": replay_id},
@@ -122,7 +98,7 @@ def test_error_issue_get_helpful_for_environments(self):
         self.store_event(
             data={
                 "event_id": "b" * 32,
-                "timestamp": min_ago,
+                "timestamp": before_now(minutes=2).isoformat(),
                 "fingerprint": ["group-1"],
                 "contexts": {
                     "replay": {"replay_id": replay_id},
@@ -133,7 +109,11 @@ def test_error_issue_get_helpful_for_environments(self):
             assert_no_errors=False,
         )
         event_none_helpful_params = self.store_event(
-            data={"event_id": "c" * 32, "timestamp": min_ago, "fingerprint": ["group-1"]},
+            data={
+                "event_id": "c" * 32,
+                "timestamp": before_now(minutes=1).isoformat(),
+                "fingerprint": ["group-1"],
+            },
             project_id=project.id,
         )
 
@@ -142,56 +122,387 @@ def test_error_issue_get_helpful_for_environments(self):
         assert _get_latest_non_null(group).event_id == event_none_helpful_params.event_id
         assert _get_oldest_non_null(group).event_id == event_all_helpful_params.event_id
 
-    def test_perf_issue_helpful(self):
+    @patch("sentry.quotas.backend.get_event_retention")
+    def test_get_recommended_event_for_environments_retention_limit(self, mock_get_event_retention):
+        """
+        If last_seen is outside of the retention limit, falls back to the latest event behavior.
+        """
+        mock_get_event_retention.return_value = 90
+        project = self.create_project()
+        outside_retention_date = before_now(days=91)
+
+        event = self.store_event(
+            data={
+                "event_id": "a" * 32,
+                "timestamp": outside_retention_date.isoformat(),
+                "fingerprint": ["group-1"],
+                "contexts": {},
+                "errors": [],
+            },
+            project_id=project.id,
+            assert_no_errors=False,
+        )
+
+        group = Group.objects.get()
+        group.last_seen = before_now(days=91)
+        assert _get_recommended_non_null(group).event_id == event.event_id
+
+
+def _get_recommended(
+    g: Group,
+    conditions: Sequence[Condition] | None = None,
+    start: datetime | None = None,
+    end: datetime | None = None,
+) -> GroupEvent:
+    ret = g.get_recommended_event(conditions=conditions, start=start, end=end)
+    assert ret is not None
+    return ret
+
+
+def _get_latest(
+    g: Group,
+    conditions: Sequence[Condition] | None = None,
+    start: datetime | None = None,
+    end: datetime | None = None,
+) -> GroupEvent:
+    ret = g.get_latest_event(conditions=conditions, start=start, end=end)
+    assert ret is not None
+    return ret
+
+
+def _get_oldest(
+    g: Group,
+    conditions: Sequence[Condition] | None = None,
+    start: datetime | None = None,
+    end: datetime | None = None,
+) -> GroupEvent:
+    ret = g.get_oldest_event(conditions=conditions, start=start, end=end)
+    assert ret is not None
+    return ret
+
+
+@freeze_time()
+class GroupTestSnubaErrorIssue(TestCase, SnubaTestCase):
+    def setUp(self):
+        super().setUp()
+        self.project = self.create_project()
+        self.event_a = self.store_event(
+            data={
+                "event_id": "a" * 32,
+                "timestamp": before_now(minutes=1).isoformat(),
+                "environment": "staging",
+                "fingerprint": ["group-1"],
+                "message": "Error: Division by zero",
+            },
+            project_id=self.project.id,
+        )
+        self.event_b = self.store_event(
+            data={
+                "event_id": "b" * 32,
+                "timestamp": before_now(minutes=2).isoformat(),
+                "fingerprint": ["group-1"],
+                "environment": "production",
+                "contexts": {
+                    "replay": {"replay_id": uuid.uuid4().hex},
+                    "trace": {
+                        "sampled": True,
+                        "span_id": "babaae0d4b7512d9",
+                        "trace_id": "a7d67cf796774551a95be6543cacd459",
+                    },
+                },
+                "message": "Error: Division by zero",
+            },
+            project_id=self.project.id,
+        )
+        self.event_c = self.store_event(
+            data={
+                "event_id": "c" * 32,
+                "timestamp": before_now(minutes=3).isoformat(),
+                "fingerprint": ["group-1"],
+                "tags": {"organization.slug": "sentry"},
+                "environment": "staging",
+                "contexts": {
+                    "trace": {
+                        "sampled": True,
+                        "span_id": "babaae0d4b7512d9",
+                        "trace_id": "a7d67cf796774551a95be6543cacd459",
+                    },
+                },
+                "message": "Error: Division by zero",
+            },
+            project_id=self.project.id,
+        )
+
+        self.group: Group = Group.objects.get()
+        assert isinstance(self.group, Group)
+
+    def test_recommended_event(self):
+        # No filter
+        assert _get_recommended(self.group).event_id == self.event_b.event_id
+
+        # Filter by environment
+        conditions = [Condition(Column("environment"), Op.IN, ["staging"])]
+        assert _get_recommended(self.group, conditions=conditions).event_id == self.event_c.event_id
+        conditions = [Condition(Column("environment"), Op.IN, ["production"])]
+        assert _get_recommended(self.group, conditions=conditions).event_id == self.event_b.event_id
+        conditions = [Condition(Column("environment"), Op.IN, ["development"])]
+        assert self.group.get_recommended_event(conditions=conditions) is None
+
+        # Filter by query
+        conditions = [Condition(Column("tags[organization.slug]"), Op.EQ, "sentry")]
+        assert _get_recommended(self.group, conditions=conditions).event_id == self.event_c.event_id
+        conditions = [Condition(Column("trace_id"), Op.IS_NULL)]
+        assert _get_recommended(self.group, conditions=conditions).event_id == self.event_a.event_id
+
+        # Filter by date range
+        assert (
+            _get_recommended(
+                self.group, start=before_now(seconds=120), end=before_now(seconds=30)
+            ).event_id
+            == self.event_b.event_id
+        )
+        assert (
+            _get_recommended(
+                self.group, start=before_now(hours=1), end=before_now(seconds=90)
+            ).event_id
+            == self.event_b.event_id
+        )
+
+    def test_latest_event(self):
+        # No filter
+        assert _get_latest(self.group).event_id == self.event_a.event_id
+
+        # Filter by environment
+        conditions = [Condition(Column("environment"), Op.IN, ["staging"])]
+        assert _get_latest(self.group, conditions=conditions).event_id == self.event_a.event_id
+        conditions = [Condition(Column("environment"), Op.IN, ["production"])]
+        assert _get_latest(self.group, conditions=conditions).event_id == self.event_b.event_id
+        conditions = [Condition(Column("environment"), Op.IN, ["development"])]
+        assert self.group.get_latest_event(conditions=conditions) is None
+
+        # Filter by query
+        conditions = [Condition(Column("tags[organization.slug]"), Op.EQ, "sentry")]
+        assert _get_latest(self.group, conditions=conditions).event_id == self.event_c.event_id
+        conditions = [Condition(Column("trace_id"), Op.IS_NULL)]
+        assert _get_latest(self.group, conditions=conditions).event_id == self.event_a.event_id
+
+        # Filter by date range
+        assert (
+            _get_latest(
+                self.group, start=before_now(seconds=120), end=before_now(seconds=30)
+            ).event_id
+            == self.event_a.event_id
+        )
+        assert (
+            _get_latest(self.group, start=before_now(hours=1), end=before_now(seconds=90)).event_id
+            == self.event_b.event_id
+        )
+
+    def test_oldest_event(self):
+        # No filter
+        assert _get_oldest(self.group).event_id == self.event_c.event_id
+
+        # Filter by environment
+        conditions = [Condition(Column("environment"), Op.IN, ["staging"])]
+        assert _get_oldest(self.group, conditions=conditions).event_id == self.event_c.event_id
+        conditions = [Condition(Column("environment"), Op.IN, ["production"])]
+        assert _get_oldest(self.group, conditions=conditions).event_id == self.event_b.event_id
+        conditions = [Condition(Column("environment"), Op.IN, ["development"])]
+        assert self.group.get_oldest_event(conditions=conditions) is None
+
+        # Filter by query
+        conditions = [Condition(Column("tags[organization.slug]"), Op.EQ, "sentry")]
+        assert _get_oldest(self.group, conditions=conditions).event_id == self.event_c.event_id
+        conditions = [Condition(Column("trace_id"), Op.IS_NULL)]
+        assert _get_oldest(self.group, conditions=conditions).event_id == self.event_a.event_id
+
+        # Filter by date range
+        assert (
+            _get_oldest(
+                self.group, start=before_now(seconds=150), end=before_now(seconds=30)
+            ).event_id
+            == self.event_b.event_id
+        )
+        assert (
+            _get_oldest(self.group, start=before_now(hours=1), end=before_now(seconds=90)).event_id
+            == self.event_c.event_id
+        )
+
+
+@freeze_time()
+class GroupTestSnubaPerformanceIssue(TestCase, SnubaTestCase, PerformanceIssueTestCase):
+    def setUp(self):
+        super().setUp()
+        self.project = self.create_project()
         group_fingerprint = f"{PerformanceNPlusOneGroupType.type_id}-group1"
 
-        transaction_event_data_with_all_helpful = load_data(
-            "transaction-n-plus-one", fingerprint=[group_fingerprint]
+        event_data_a = load_data(
+            "transaction-n-plus-one",
+            fingerprint=[group_fingerprint],
+            timestamp=before_now(minutes=1),
+            start_timestamp=before_now(minutes=1, seconds=1),
+            event_id="a" * 32,
+        )
+        event_data_a["environment"] = "staging"
+
+        event_data_b = load_data(
+            "transaction-n-plus-one",
+            fingerprint=[group_fingerprint],
+            timestamp=before_now(minutes=2),
+            start_timestamp=before_now(minutes=2, seconds=1),
+            event_id="b" * 32,
+        )
+        event_data_b["environment"] = "production"
+        event_data_b["contexts"].update(
+            {
+                "replay": {"replay_id": uuid.uuid4().hex},
+                "profile": {"profile_id": uuid.uuid4().hex},
+            }
+        )
+
+        event_data_c = load_data(
+            "transaction-n-plus-one",
+            fingerprint=[group_fingerprint],
+            timestamp=before_now(minutes=3),
+            start_timestamp=before_now(minutes=3, seconds=1),
+            event_id="c" * 32,
+        )
+        event_data_c["environment"] = "staging"
+        event_data_c["contexts"].update({"profile": {"profile_id": uuid.uuid4().hex}})
+        event_data_c["tags"] = {"organization.slug": "sentry"}
+
+        self.event_a = self.create_performance_issue(
+            event_data=event_data_a, fingerprint=group_fingerprint
         )
-        transaction_event_data_with_all_helpful["timestamp"] = iso_format(before_now(seconds=10))
-        transaction_event_data_with_all_helpful["start_timestamp"] = iso_format(
-            before_now(seconds=11)
+        self.event_b = self.create_performance_issue(
+            event_data=event_data_b, fingerprint=group_fingerprint
         )
-        transaction_event_data_with_all_helpful["event_id"] = "d" * 32
-        transaction_event_data_with_all_helpful["contexts"].update(
-            {"profile": {"profile_id": uuid.uuid4().hex}}
+        self.event_c = self.create_performance_issue(
+            event_data=event_data_c, fingerprint=group_fingerprint
         )
-        transaction_event_data_with_all_helpful["contexts"].update(
-            {"replay": {"replay_id": uuid.uuid4().hex}}
+
+        self.group: Group = Group.objects.get()
+        assert isinstance(self.group, Group)
+
+    def test_recommended_event(self):
+        # No filter
+        assert _get_recommended(self.group).event_id == self.event_b.event_id
+
+        # Filter by environment
+        conditions = [Condition(Column("environment"), Op.IN, ["staging"])]
+        assert _get_recommended(self.group, conditions=conditions).event_id == self.event_c.event_id
+        conditions = [Condition(Column("environment"), Op.IN, ["production"])]
+        assert _get_recommended(self.group, conditions=conditions).event_id == self.event_b.event_id
+        conditions = [Condition(Column("environment"), Op.IN, ["development"])]
+        assert self.group.get_recommended_event(conditions=conditions) is None
+
+        # Filter by query
+        conditions = [Condition(Column("tags[organization.slug]"), Op.EQ, "sentry")]
+        assert _get_recommended(self.group, conditions=conditions).event_id == self.event_c.event_id
+        conditions = [Condition(Column("profile_id"), Op.IS_NULL)]
+        assert _get_recommended(self.group, conditions=conditions).event_id == self.event_a.event_id
+
+        # Filter by date range
+        assert (
+            _get_recommended(
+                self.group, start=before_now(seconds=120), end=before_now(seconds=30)
+            ).event_id
+            == self.event_b.event_id
+        )
+        assert (
+            _get_recommended(
+                self.group, start=before_now(hours=1), end=before_now(seconds=90)
+            ).event_id
+            == self.event_b.event_id
         )
-        transaction_event_data_with_all_helpful["contexts"]["trace"]["sampled"] = True
-        transaction_event_data_with_all_helpful["errors"] = []
 
-        transaction_event_data_with_none_helpful = load_data(
-            "transaction-n-plus-one", fingerprint=[group_fingerprint]
+    def test_latest_event(self):
+        # No filter
+        assert _get_latest(self.group).event_id == self.event_a.event_id
+
+        # Filter by environment
+        conditions = [Condition(Column("environment"), Op.IN, ["staging"])]
+        assert _get_latest(self.group, conditions=conditions).event_id == self.event_a.event_id
+        conditions = [Condition(Column("environment"), Op.IN, ["production"])]
+        assert _get_latest(self.group, conditions=conditions).event_id == self.event_b.event_id
+        conditions = [Condition(Column("environment"), Op.IN, ["development"])]
+        assert self.group.get_latest_event(conditions=conditions) is None
+
+        # Filter by query
+        conditions = [Condition(Column("tags[organization.slug]"), Op.EQ, "sentry")]
+        assert _get_latest(self.group, conditions=conditions).event_id == self.event_c.event_id
+        conditions = [Condition(Column("profile_id"), Op.IS_NULL)]
+        assert _get_latest(self.group, conditions=conditions).event_id == self.event_a.event_id
+
+        # Filter by date range
+        assert (
+            _get_latest(
+                self.group, start=before_now(seconds=120), end=before_now(seconds=30)
+            ).event_id
+            == self.event_a.event_id
         )
-        transaction_event_data_with_none_helpful["timestamp"] = iso_format(before_now(seconds=20))
-        transaction_event_data_with_none_helpful["start_timestamp"] = iso_format(
-            before_now(seconds=21)
+        assert (
+            _get_latest(self.group, start=before_now(hours=1), end=before_now(seconds=90)).event_id
+            == self.event_b.event_id
         )
-        transaction_event_data_with_none_helpful["event_id"] = "f" * 32
 
-        transaction_event_1 = self.create_performance_issue(
-            event_data=transaction_event_data_with_all_helpful, fingerprint=group_fingerprint
+    def test_oldest_event(self):
+        # No filter
+        assert _get_oldest(self.group).event_id == self.event_c.event_id
+
+        # Filter by environment
+        conditions = [Condition(Column("environment"), Op.IN, ["staging"])]
+        assert _get_oldest(self.group, conditions=conditions).event_id == self.event_c.event_id
+        conditions = [Condition(Column("environment"), Op.IN, ["production"])]
+        assert _get_oldest(self.group, conditions=conditions).event_id == self.event_b.event_id
+        conditions = [Condition(Column("environment"), Op.IN, ["development"])]
+        assert self.group.get_oldest_event(conditions=conditions) is None
+
+        # Filter by query
+        conditions = [Condition(Column("tags[organization.slug]"), Op.EQ, "sentry")]
+        assert _get_oldest(self.group, conditions=conditions).event_id == self.event_c.event_id
+        conditions = [Condition(Column("profile_id"), Op.IS_NULL)]
+        assert _get_oldest(self.group, conditions=conditions).event_id == self.event_a.event_id
+
+        # Filter by date range
+        assert (
+            _get_oldest(
+                self.group, start=before_now(seconds=150), end=before_now(seconds=30)
+            ).event_id
+            == self.event_b.event_id
         )
-        transaction_event_2 = self.create_performance_issue(
-            event_data=transaction_event_data_with_none_helpful, fingerprint=group_fingerprint
+        assert (
+            _get_oldest(self.group, start=before_now(hours=1), end=before_now(seconds=90)).event_id
+            == self.event_c.event_id
         )
 
-        perf_group = transaction_event_1.group
 
-        assert _get_recommended_non_null(perf_group).event_id == transaction_event_1.event_id
-        assert _get_latest_non_null(perf_group).event_id == transaction_event_1.event_id
-        assert _get_oldest_non_null(perf_group).event_id == transaction_event_2.event_id
+@freeze_time()
+class GroupTestSnubaOccurrenceIssue(TestCase, SnubaTestCase, OccurrenceTestMixin):
+    def setUp(self):
+        super().setUp()
+        self.project = self.create_project()
 
-    def test_profile_issue_helpful(self):
-        event_id_1 = uuid.uuid4().hex
-        occurrence, _ = self.process_occurrence(
-            event_id=event_id_1,
+        self.issue_occ_a, _ = self.process_occurrence(
             project_id=self.project.id,
+            event_id="a" * 32,
             event_data={
+                "timestamp": before_now(minutes=1).isoformat(),
                 "fingerprint": ["group-1"],
+                "environment": "staging",
+                "contexts": {
+                    "profile": {"profile_id": uuid.uuid4().hex},
+                },
+            },
+        )
+
+        self.issue_occ_b, _ = self.process_occurrence(
+            project_id=self.project.id,
+            event_id="b" * 32,
+            event_data={
                 "timestamp": before_now(minutes=2).isoformat(),
+                "fingerprint": ["group-1"],
+                "environment": "production",
                 "contexts": {
                     "profile": {"profile_id": uuid.uuid4().hex},
                     "replay": {"replay_id": uuid.uuid4().hex},
@@ -201,51 +512,129 @@ def test_profile_issue_helpful(self):
                         "trace_id": "a7d67cf796774551a95be6543cacd459",
                     },
                 },
-                "errors": [],
             },
         )
 
-        event_id_2 = uuid.uuid4().hex
-        occurrence_2, _ = self.process_occurrence(
-            event_id=event_id_2,
+        self.issue_occ_c, _ = self.process_occurrence(
             project_id=self.project.id,
+            event_id="c" * 32,
             event_data={
+                "timestamp": before_now(minutes=3).isoformat(),
                 "fingerprint": ["group-1"],
-                "timestamp": before_now(minutes=1).isoformat(),
+                "environment": "staging",
+                "tags": {"organization.slug": "sentry"},
+                "contexts": {
+                    "profile": {"profile_id": uuid.uuid4().hex},
+                    "replay": {"replay_id": uuid.uuid4().hex},
+                },
             },
         )
 
-        group = Group.objects.get()
-        group.update(type=ProfileFileIOGroupType.type_id)
+        self.group: Group = Group.objects.get()
+        self.group.update(type=ProfileFileIOGroupType.type_id)
+        assert isinstance(self.group, Group)
+        assert self.group.type == ProfileFileIOGroupType.type_id
 
-        group_event = _get_recommended_non_null(group)
-        assert group_event.event_id == occurrence.event_id
-        self.assert_occurrences_identical(group_event.occurrence, occurrence)
+    def test_recommended_event(self):
+        # No filter
+        self.assert_occurrences_identical(_get_recommended(self.group).occurrence, self.issue_occ_b)
 
-        assert _get_latest_non_null(group).event_id == occurrence_2.event_id
-        assert _get_oldest_non_null(group).event_id == occurrence.event_id
+        # Filter by environment
+        conditions = [Condition(Column("environment"), Op.IN, ["staging"])]
+        assert (
+            _get_recommended(self.group, conditions=conditions).event_id
+            == self.issue_occ_c.event_id
+        )
+        conditions = [Condition(Column("environment"), Op.IN, ["production"])]
+        assert (
+            _get_recommended(self.group, conditions=conditions).event_id
+            == self.issue_occ_b.event_id
+        )
+        conditions = [Condition(Column("environment"), Op.IN, ["development"])]
+        assert self.group.get_recommended_event(conditions=conditions) is None
+
+        # Filter by query
+        conditions = [Condition(Column("tags[organization.slug]"), Op.EQ, "sentry")]
+        assert (
+            _get_recommended(self.group, conditions=conditions).event_id
+            == self.issue_occ_c.event_id
+        )
+        conditions = [Condition(Column("replay_id"), Op.IS_NULL)]
+        assert (
+            _get_recommended(self.group, conditions=conditions).event_id
+            == self.issue_occ_a.event_id
+        )
 
-    @patch("sentry.quotas.backend.get_event_retention")
-    def test_get_recommended_event_for_environments_retention_limit(self, mock_get_event_retention):
-        """
-        If last_seen is outside of the retention limit, falls back to the latest event behavior.
-        """
-        mock_get_event_retention.return_value = 90
-        project = self.create_project()
-        outside_retention_date = before_now(days=91)
+        # Filter by date range
+        assert (
+            _get_recommended(
+                self.group, start=before_now(seconds=150), end=before_now(seconds=30)
+            ).event_id
+            == self.issue_occ_b.event_id
+        )
+        assert (
+            _get_recommended(
+                self.group, start=before_now(hours=1), end=before_now(seconds=90)
+            ).event_id
+            == self.issue_occ_b.event_id
+        )
 
-        event = self.store_event(
-            data={
-                "event_id": "a" * 32,
-                "timestamp": iso_format(outside_retention_date),
-                "fingerprint": ["group-1"],
-                "contexts": {},
-                "errors": [],
-            },
-            project_id=project.id,
-            assert_no_errors=False,
+    def test_latest_event(self):
+        # No filter
+        self.assert_occurrences_identical(_get_latest(self.group).occurrence, self.issue_occ_a)
+
+        # Filter by environment
+        conditions = [Condition(Column("environment"), Op.IN, ["staging"])]
+        assert _get_latest(self.group, conditions=conditions).event_id == self.issue_occ_a.event_id
+        conditions = [Condition(Column("environment"), Op.IN, ["production"])]
+        assert _get_latest(self.group, conditions=conditions).event_id == self.issue_occ_b.event_id
+        conditions = [Condition(Column("environment"), Op.IN, ["development"])]
+        assert self.group.get_latest_event(conditions=conditions) is None
+
+        # Filter by query
+        conditions = [Condition(Column("tags[organization.slug]"), Op.EQ, "sentry")]
+        assert _get_latest(self.group, conditions=conditions).event_id == self.issue_occ_c.event_id
+        conditions = [Condition(Column("replay_id"), Op.IS_NULL)]
+        assert _get_latest(self.group, conditions=conditions).event_id == self.issue_occ_a.event_id
+
+        # Filter by date range
+        assert (
+            _get_latest(
+                self.group, start=before_now(seconds=120), end=before_now(seconds=30)
+            ).event_id
+            == self.issue_occ_a.event_id
+        )
+        assert (
+            _get_latest(self.group, start=before_now(hours=1), end=before_now(seconds=90)).event_id
+            == self.issue_occ_b.event_id
         )
 
-        group = Group.objects.get()
-        group.last_seen = before_now(days=91)
-        assert _get_recommended_non_null(group).event_id == event.event_id
+    def test_oldest_event(self):
+        # No filter
+        self.assert_occurrences_identical(_get_oldest(self.group).occurrence, self.issue_occ_c)
+
+        # Filter by environment
+        conditions = [Condition(Column("environment"), Op.IN, ["staging"])]
+        assert _get_oldest(self.group, conditions=conditions).event_id == self.issue_occ_c.event_id
+        conditions = [Condition(Column("environment"), Op.IN, ["production"])]
+        assert _get_oldest(self.group, conditions=conditions).event_id == self.issue_occ_b.event_id
+        conditions = [Condition(Column("environment"), Op.IN, ["development"])]
+        assert self.group.get_oldest_event(conditions=conditions) is None
+
+        # Filter by query
+        conditions = [Condition(Column("tags[organization.slug]"), Op.EQ, "sentry")]
+        assert _get_oldest(self.group, conditions=conditions).event_id == self.issue_occ_c.event_id
+        conditions = [Condition(Column("replay_id"), Op.IS_NULL)]
+        assert _get_oldest(self.group, conditions=conditions).event_id == self.issue_occ_a.event_id
+
+        # Filter by date range
+        assert (
+            _get_oldest(
+                self.group, start=before_now(seconds=150), end=before_now(seconds=30)
+            ).event_id
+            == self.issue_occ_b.event_id
+        )
+        assert (
+            _get_oldest(self.group, start=before_now(hours=1), end=before_now(seconds=90)).event_id
+            == self.issue_occ_c.event_id
+        )
diff --git a/tests/snuba/rules/conditions/test_event_frequency.py b/tests/snuba/rules/conditions/test_event_frequency.py
index 2569149d220c79..5924802241fbcc 100644
--- a/tests/snuba/rules/conditions/test_event_frequency.py
+++ b/tests/snuba/rules/conditions/test_event_frequency.py
@@ -26,7 +26,7 @@
     RuleTestCase,
     SnubaTestCase,
 )
-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.helpers.features import apply_feature_flag_on_cls
 from sentry.testutils.skips import requires_snuba
 from sentry.utils.samples import load_data
@@ -72,7 +72,7 @@ def setUp(self):
             data={
                 "event_id": "a" * 32,
                 "environment": self.environment.name,
-                "timestamp": iso_format(before_now(seconds=30)),
+                "timestamp": before_now(seconds=30).isoformat(),
                 "fingerprint": ["group-1"],
                 "user": {"id": uuid4().hex},
             },
@@ -82,7 +82,7 @@ def setUp(self):
             data={
                 "event_id": "b" * 32,
                 "environment": self.environment.name,
-                "timestamp": iso_format(before_now(seconds=12)),
+                "timestamp": before_now(seconds=12).isoformat(),
                 "fingerprint": ["group-2"],
                 "user": {"id": uuid4().hex},
             },
@@ -93,7 +93,7 @@ def setUp(self):
             data={
                 "event_id": "c" * 32,
                 "environment": self.environment2.name,
-                "timestamp": iso_format(before_now(seconds=12)),
+                "timestamp": before_now(seconds=12).isoformat(),
                 "fingerprint": ["group-3"],
                 "user": {"id": uuid4().hex},
             },
@@ -248,7 +248,7 @@ def test_batch_query_percent_no_avg_sessions_in_interval(self):
 
 class ErrorEventMixin(SnubaTestCase):
     def add_event(self, data, project_id, timestamp):
-        data["timestamp"] = iso_format(timestamp)
+        data["timestamp"] = timestamp.isoformat()
         # Store an error event
         event = self.store_event(
             data=data,
@@ -278,7 +278,7 @@ def add_event(self, data, project_id, timestamp):
                 tag[1] = data.get("environment")
                 break
         else:
-            event_data["tags"].append(data.get("environment"))
+            raise AssertionError("expected `environment` tag")
 
         # Store a performance event
         event = self.create_performance_issue(
@@ -300,9 +300,6 @@ def increment(self, event, count, environment=None, timestamp=None):
         raise NotImplementedError
 
     def _run_test(self, minutes, data, passes, add_events=False):
-        if not self.environment:
-            self.environment = self.create_environment(name="prod")
-
         rule = self.get_rule(data=data, rule=Rule(environment_id=None))
         environment_rule = self.get_rule(data=data, rule=Rule(environment_id=self.environment.id))
 
@@ -661,8 +658,6 @@ def test_comparison_empty_comparison_period(self):
         self.assertDoesNotPass(rule, event, is_new=False)
 
     def _run_test(self, minutes, data, passes, add_events=False):
-        if not self.environment:
-            self.environment = self.create_environment(name="prod")
         data["filter_match"] = "all"
         data["conditions"] = data.get("conditions", [])
         rule = self.get_rule(
diff --git a/tests/snuba/search/test_backend.py b/tests/snuba/search/test_backend.py
index 339592dd61478b..a61df6090b611f 100644
--- a/tests/snuba/search/test_backend.py
+++ b/tests/snuba/search/test_backend.py
@@ -5,7 +5,6 @@
 from unittest import mock
 
 import pytest
-import urllib3
 from django.utils import timezone
 from sentry_kafka_schemas.schema_types.group_attributes_v1 import GroupAttributesSnapshot
 
@@ -34,8 +33,7 @@
 from sentry.snuba.dataset import Dataset
 from sentry.testutils.cases import SnubaTestCase, TestCase, TransactionTestCase
 from sentry.testutils.helpers import Feature, apply_feature_flag_on_cls
-from sentry.testutils.helpers.datetime import before_now, iso_format
-from sentry.testutils.skips import xfail_if_not_postgres
+from sentry.testutils.helpers.datetime import before_now
 from sentry.types.group import GroupSubStatus, PriorityLevel
 from sentry.utils import json
 from sentry.utils.snuba import SENTRY_SNUBA_MAP
@@ -114,14 +112,14 @@ def backend(self):
 
     def setUp(self):
         super().setUp()
-        self.base_datetime = before_now(days=3)
+        self.base_datetime = before_now(days=3).replace(microsecond=0)
 
-        event1_timestamp = iso_format(self.base_datetime - timedelta(days=21))
+        event1_timestamp = (self.base_datetime - timedelta(days=21)).isoformat()
         self.event1 = self.store_event(
             data={
                 "fingerprint": ["put-me-in-group1"],
                 "event_id": "a" * 32,
-                "message": "foo. Also, this message is intended to be greater than 256 characters so that we can put some unique string identifier after that point in the string. The purpose of this is in order to verify we are using snuba to search messages instead of Postgres (postgres truncates at 256 characters and clickhouse does not). santryrox.",
+                "message": "foo. Indeed, this message is intended to be greater than 256 characters such that we can put this unique string identifier after that point in the string. The purpose of this is in order to verify we are using snuba to search messages instead of Postgres (postgres truncates at 256 characters and clickhouse does not). santryrox.",
                 "environment": "production",
                 "tags": {"server": "example.com", "sentry:user": "event1@example.com"},
                 "timestamp": event1_timestamp,
@@ -137,7 +135,7 @@ def setUp(self):
                 "message": "group1",
                 "environment": "production",
                 "tags": {"server": "example.com", "sentry:user": "event3@example.com"},
-                "timestamp": iso_format(self.base_datetime),
+                "timestamp": self.base_datetime.isoformat(),
                 "stacktrace": {"frames": [{"module": "group1"}]},
                 "level": "fatal",
             },
@@ -163,7 +161,7 @@ def setUp(self):
             data={
                 "fingerprint": ["put-me-in-group2"],
                 "event_id": "b" * 32,
-                "timestamp": iso_format(self.base_datetime - timedelta(days=20)),
+                "timestamp": (self.base_datetime - timedelta(days=20)).isoformat(),
                 "message": "bar",
                 "stacktrace": {"frames": [{"module": "group2"}]},
                 "environment": "staging",
@@ -216,7 +214,7 @@ def set_up_multi_project(self):
             data={
                 "event_id": "a" * 32,
                 "fingerprint": ["put-me-in-groupP2"],
-                "timestamp": iso_format(self.base_datetime - timedelta(days=21)),
+                "timestamp": (self.base_datetime - timedelta(days=21)).isoformat(),
                 "message": "foo",
                 "stacktrace": {"frames": [{"module": "group_p2"}]},
                 "tags": {"server": "example.com"},
@@ -236,7 +234,7 @@ def create_group_with_integration_external_issue(self, environment="production")
             data={
                 "fingerprint": ["linked_group1"],
                 "event_id": uuid.uuid4().hex,
-                "timestamp": iso_format(self.base_datetime),
+                "timestamp": self.base_datetime.isoformat(),
                 "environment": environment,
             },
             project_id=self.project.id,
@@ -256,7 +254,7 @@ def create_group_with_platform_external_issue(self, environment="production"):
             data={
                 "fingerprint": ["linked_group2"],
                 "event_id": uuid.uuid4().hex,
-                "timestamp": iso_format(self.base_datetime),
+                "timestamp": self.base_datetime.isoformat(),
                 "environment": environment,
             },
             project_id=self.project.id,
@@ -350,7 +348,7 @@ def test_query_timestamp(self):
         results = self.make_query(
             [self.project],
             environments=[self.environments["production"]],
-            search_filter_query=f"timestamp:>{iso_format(self.event1.datetime)} timestamp:<{iso_format(self.event3.datetime)}",
+            search_filter_query=f"timestamp:>{self.event1.datetime.isoformat()} timestamp:<{self.event3.datetime.isoformat()}",
         )
 
         assert set(results) == {self.group1}
@@ -396,7 +394,7 @@ def test_sort_with_environment(self):
             self.store_event(
                 data={
                     "fingerprint": ["put-me-in-group2"],
-                    "timestamp": iso_format(dt),
+                    "timestamp": dt.isoformat(),
                     "stacktrace": {"frames": [{"module": "group2"}]},
                     "environment": "production",
                     "message": "group2",
@@ -429,7 +427,7 @@ def test_status(self):
             data={
                 "fingerprint": ["put-me-in-group3"],
                 "event_id": "c" * 32,
-                "timestamp": iso_format(self.base_datetime - timedelta(days=20)),
+                "timestamp": (self.base_datetime - timedelta(days=20)).isoformat(),
             },
             project_id=self.project.id,
         )
@@ -453,7 +451,7 @@ def test_category(self):
             data={
                 "fingerprint": ["put-me-in-group3"],
                 "event_id": "c" * 32,
-                "timestamp": iso_format(self.base_datetime - timedelta(days=20)),
+                "timestamp": (self.base_datetime - timedelta(days=20)).isoformat(),
             },
             project_id=self.project.id,
         )
@@ -483,7 +481,7 @@ def test_type(self):
             data={
                 "fingerprint": ["put-me-in-group3"],
                 "event_id": "c" * 32,
-                "timestamp": iso_format(self.base_datetime - timedelta(days=20)),
+                "timestamp": (self.base_datetime - timedelta(days=20)).isoformat(),
                 "type": PerformanceNPlusOneGroupType.type_id,
             },
             project_id=self.project.id,
@@ -500,7 +498,7 @@ def test_type(self):
             data={
                 "fingerprint": ["put-me-in-group4"],
                 "event_id": "d" * 32,
-                "timestamp": iso_format(self.base_datetime - timedelta(days=20)),
+                "timestamp": (self.base_datetime - timedelta(days=20)).isoformat(),
             },
             project_id=self.project.id,
         )
@@ -623,7 +621,7 @@ def test_search_filter_query_with_custom_trends_tag(self):
         self.store_event(
             data={
                 "fingerprint": ["put-me-in-group2"],
-                "timestamp": iso_format(self.group2.first_seen + timedelta(days=1)),
+                "timestamp": (self.group2.first_seen + timedelta(days=1)).isoformat(),
                 "stacktrace": {"frames": [{"module": "group2"}]},
                 "message": "group2",
                 "tags": {"trends": trends},
@@ -641,7 +639,7 @@ def test_search_filter_query_with_custom_trends_tag_and_trends_sort(self):
             self.store_event(
                 data={
                     "fingerprint": ["put-me-in-group1"],
-                    "timestamp": iso_format(self.group2.last_seen + timedelta(days=i)),
+                    "timestamp": (self.group2.last_seen + timedelta(days=i)).isoformat(),
                     "stacktrace": {"frames": [{"module": "group1"}]},
                     "message": "group1",
                     "tags": {"trends": trends},
@@ -651,7 +649,7 @@ def test_search_filter_query_with_custom_trends_tag_and_trends_sort(self):
         self.store_event(
             data={
                 "fingerprint": ["put-me-in-group2"],
-                "timestamp": iso_format(self.group2.last_seen + timedelta(days=2)),
+                "timestamp": (self.group2.last_seen + timedelta(days=2)).isoformat(),
                 "stacktrace": {"frames": [{"module": "group2"}]},
                 "message": "group2",
                 "tags": {"trends": trends},
@@ -667,7 +665,7 @@ def test_search_tag_overlapping_with_internal_fields(self):
         self.store_event(
             data={
                 "fingerprint": ["put-me-in-group2"],
-                "timestamp": iso_format(self.group2.first_seen + timedelta(days=1)),
+                "timestamp": (self.group2.first_seen + timedelta(days=1)).isoformat(),
                 "stacktrace": {"frames": [{"module": "group2"}]},
                 "message": "group2",
                 "tags": {"email": "tags@example.com"},
@@ -745,7 +743,7 @@ def test_pagination_with_environment(self):
             self.store_event(
                 data={
                     "fingerprint": ["put-me-in-group2"],
-                    "timestamp": iso_format(dt),
+                    "timestamp": dt.isoformat(),
                     "environment": "production",
                     "message": "group2",
                     "stacktrace": {"frames": [{"module": "group2"}]},
@@ -833,7 +831,7 @@ def test_age_filter_with_environment(self):
         self.store_event(
             data={
                 "fingerprint": ["put-me-in-group1"],
-                "timestamp": iso_format(group1_first_seen + timedelta(days=1)),
+                "timestamp": (group1_first_seen + timedelta(days=1)).isoformat(),
                 "message": "group1",
                 "stacktrace": {"frames": [{"module": "group1"}]},
                 "environment": "development",
@@ -900,7 +898,7 @@ def test_last_seen_filter_with_environment(self):
         self.store_event(
             data={
                 "fingerprint": ["put-me-in-group1"],
-                "timestamp": iso_format(self.group1.last_seen + timedelta(days=1)),
+                "timestamp": (self.group1.last_seen + timedelta(days=1)).isoformat(),
                 "message": "group1",
                 "stacktrace": {"frames": [{"module": "group1"}]},
                 "environment": "development",
@@ -1096,7 +1094,7 @@ def test_assigned_to_me_my_teams(self):
             data={
                 "fingerprint": ["put-me-in-group-my-teams"],
                 "event_id": "f" * 32,
-                "timestamp": iso_format(self.base_datetime - timedelta(days=20)),
+                "timestamp": (self.base_datetime - timedelta(days=20)).isoformat(),
                 "message": "baz",
                 "environment": "staging",
                 "tags": {
@@ -1132,7 +1130,7 @@ def test_assigned_to_me_my_teams_in_syntax(self):
             data={
                 "fingerprint": ["put-me-in-group-my-teams"],
                 "event_id": "f" * 32,
-                "timestamp": iso_format(self.base_datetime - timedelta(days=20)),
+                "timestamp": (self.base_datetime - timedelta(days=20)).isoformat(),
                 "message": "baz",
                 "environment": "staging",
                 "tags": {
@@ -1178,7 +1176,7 @@ def test_assigned_to_in_syntax(self):
             data={
                 "fingerprint": ["put-me-in-group3"],
                 "event_id": "c" * 32,
-                "timestamp": iso_format(self.base_datetime - timedelta(days=20)),
+                "timestamp": (self.base_datetime - timedelta(days=20)).isoformat(),
             },
             project_id=self.project.id,
         ).group
@@ -1230,21 +1228,21 @@ def test_assigned_or_suggested_in_syntax(self):
         Group.objects.all().delete()
         group = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=180)),
+                "timestamp": before_now(seconds=180).isoformat(),
                 "fingerprint": ["group-1"],
             },
             project_id=self.project.id,
         ).group
         group1 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=185)),
+                "timestamp": before_now(seconds=185).isoformat(),
                 "fingerprint": ["group-2"],
             },
             project_id=self.project.id,
         ).group
         group2 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=190)),
+                "timestamp": before_now(seconds=190).isoformat(),
                 "fingerprint": ["group-3"],
             },
             project_id=self.project.id,
@@ -1252,7 +1250,7 @@ def test_assigned_or_suggested_in_syntax(self):
 
         assigned_group = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=195)),
+                "timestamp": before_now(seconds=195).isoformat(),
                 "fingerprint": ["group-4"],
             },
             project_id=self.project.id,
@@ -1260,7 +1258,7 @@ def test_assigned_or_suggested_in_syntax(self):
 
         assigned_to_other_group = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=195)),
+                "timestamp": before_now(seconds=195).isoformat(),
                 "fingerprint": ["group-5"],
             },
             project_id=self.project.id,
@@ -1370,35 +1368,35 @@ def test_assigned_or_suggested_my_teams(self):
         Group.objects.all().delete()
         group = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=180)),
+                "timestamp": before_now(seconds=180).isoformat(),
                 "fingerprint": ["group-1"],
             },
             project_id=self.project.id,
         ).group
         group1 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=185)),
+                "timestamp": before_now(seconds=185).isoformat(),
                 "fingerprint": ["group-2"],
             },
             project_id=self.project.id,
         ).group
         group2 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=190)),
+                "timestamp": before_now(seconds=190).isoformat(),
                 "fingerprint": ["group-3"],
             },
             project_id=self.project.id,
         ).group
         assigned_group = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=195)),
+                "timestamp": before_now(seconds=195).isoformat(),
                 "fingerprint": ["group-4"],
             },
             project_id=self.project.id,
         ).group
         assigned_to_other_group = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=195)),
+                "timestamp": before_now(seconds=195).isoformat(),
                 "fingerprint": ["group-5"],
             },
             project_id=self.project.id,
@@ -1407,7 +1405,7 @@ def test_assigned_or_suggested_my_teams(self):
             data={
                 "fingerprint": ["put-me-in-group-my-teams"],
                 "event_id": "f" * 32,
-                "timestamp": iso_format(self.base_datetime - timedelta(days=20)),
+                "timestamp": (self.base_datetime - timedelta(days=20)).isoformat(),
                 "message": "baz",
                 "environment": "staging",
                 "tags": {
@@ -1524,35 +1522,35 @@ def test_assigned_or_suggested_my_teams_in_syntax(self):
         Group.objects.all().delete()
         group = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=180)),
+                "timestamp": before_now(seconds=180).isoformat(),
                 "fingerprint": ["group-1"],
             },
             project_id=self.project.id,
         ).group
         group1 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=185)),
+                "timestamp": before_now(seconds=185).isoformat(),
                 "fingerprint": ["group-2"],
             },
             project_id=self.project.id,
         ).group
         group2 = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=190)),
+                "timestamp": before_now(seconds=190).isoformat(),
                 "fingerprint": ["group-3"],
             },
             project_id=self.project.id,
         ).group
         assigned_group = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=195)),
+                "timestamp": before_now(seconds=195).isoformat(),
                 "fingerprint": ["group-4"],
             },
             project_id=self.project.id,
         ).group
         assigned_to_other_group = self.store_event(
             data={
-                "timestamp": iso_format(before_now(seconds=195)),
+                "timestamp": before_now(seconds=195).isoformat(),
                 "fingerprint": ["group-5"],
             },
             project_id=self.project.id,
@@ -1561,7 +1559,7 @@ def test_assigned_or_suggested_my_teams_in_syntax(self):
             data={
                 "fingerprint": ["put-me-in-group-my-teams"],
                 "event_id": "f" * 32,
-                "timestamp": iso_format(self.base_datetime - timedelta(days=20)),
+                "timestamp": (self.base_datetime - timedelta(days=20)).isoformat(),
                 "message": "baz",
                 "environment": "staging",
                 "tags": {
@@ -2120,7 +2118,6 @@ def test_query_enclosed_in_quotes(self):
         results = self.make_query(search_filter_query='"bar"')
         assert set(results) == {self.group2}
 
-    @xfail_if_not_postgres("Wildcard searching only supported in Postgres")
     def test_wildcard(self):
         escaped_event = self.store_event(
             data={
@@ -2129,7 +2126,7 @@ def test_wildcard(self):
                 "message": "somet[hing]",
                 "environment": "production",
                 "tags": {"server": "example.net"},
-                "timestamp": iso_format(self.base_datetime),
+                "timestamp": self.base_datetime.isoformat(),
                 "stacktrace": {"frames": [{"module": "group1"}]},
             },
             project_id=self.project.id,
@@ -2171,7 +2168,7 @@ def test_null_tags(self):
                 "message": "something",
                 "environment": "production",
                 "tags": {"server": "example.net"},
-                "timestamp": iso_format(self.base_datetime),
+                "timestamp": self.base_datetime.isoformat(),
                 "stacktrace": {"frames": [{"module": "group1"}]},
             },
             project_id=self.project.id,
@@ -2182,7 +2179,7 @@ def test_null_tags(self):
                 "event_id": "5" * 32,
                 "message": "something",
                 "environment": "production",
-                "timestamp": iso_format(self.base_datetime),
+                "timestamp": self.base_datetime.isoformat(),
                 "stacktrace": {"frames": [{"module": "group2"}]},
             },
             project_id=self.project.id,
@@ -2208,7 +2205,7 @@ def test_null_promoted_tags(self):
                 "message": "something",
                 "environment": "production",
                 "tags": {"logger": "csp"},
-                "timestamp": iso_format(self.base_datetime),
+                "timestamp": self.base_datetime.isoformat(),
                 "stacktrace": {"frames": [{"module": "group1"}]},
             },
             project_id=self.project.id,
@@ -2219,7 +2216,7 @@ def test_null_promoted_tags(self):
                 "event_id": "5" * 32,
                 "message": "something",
                 "environment": "production",
-                "timestamp": iso_format(self.base_datetime),
+                "timestamp": self.base_datetime.isoformat(),
                 "stacktrace": {"frames": [{"module": "group2"}]},
             },
             project_id=self.project.id,
@@ -2431,7 +2428,7 @@ def test_message_negation(self):
                 "fingerprint": ["put-me-in-group1"],
                 "event_id": "2" * 32,
                 "message": "something",
-                "timestamp": iso_format(self.base_datetime),
+                "timestamp": self.base_datetime.isoformat(),
             },
             project_id=self.project.id,
         )
@@ -2450,7 +2447,7 @@ def test_error_main_thread_true(self):
             data={
                 "event_id": "1" * 32,
                 "message": "something",
-                "timestamp": iso_format(self.base_datetime),
+                "timestamp": self.base_datetime.isoformat(),
                 "exception": {
                     "values": [
                         {
@@ -2491,7 +2488,7 @@ def test_error_main_thread_false(self):
             data={
                 "event_id": "2" * 32,
                 "message": "something",
-                "timestamp": iso_format(self.base_datetime),
+                "timestamp": self.base_datetime.isoformat(),
                 "exception": {
                     "values": [
                         {
@@ -2532,7 +2529,7 @@ def test_error_main_thread_no_results(self):
             data={
                 "event_id": "3" * 32,
                 "message": "something",
-                "timestamp": iso_format(self.base_datetime),
+                "timestamp": self.base_datetime.isoformat(),
                 "exception": {
                     "values": [
                         {
@@ -2569,25 +2566,18 @@ class EventsSnubaSearchTest(TestCase, EventsSnubaSearchTestCases):
 @apply_feature_flag_on_cls("organizations:issue-search-group-attributes-side-query")
 class EventsJoinedGroupAttributesSnubaSearchTest(TransactionTestCase, EventsSnubaSearchTestCases):
     def setUp(self):
-        def post_insert(snapshot: GroupAttributesSnapshot):
+        def post_insert(snapshot: GroupAttributesSnapshot) -> None:
             from sentry.utils import snuba
 
-            try:
-                resp = snuba._snuba_pool.urlopen(
-                    "POST",
-                    "/tests/entities/group_attributes/insert",
-                    body=json.dumps([snapshot]),
-                    headers={},
-                )
-                if resp.status != 200:
-                    raise snuba.SnubaError(
-                        f"HTTP {resp.status} response from Snuba! {json.loads(resp.data)}"
-                    )
-                return None
-            except urllib3.exceptions.HTTPError as err:
-                raise snuba.SnubaError(err)
-
-        with (mock.patch("sentry.issues.attributes.produce_snapshot_to_kafka", post_insert),):
+            resp = snuba._snuba_pool.urlopen(
+                "POST",
+                "/tests/entities/group_attributes/insert",
+                body=json.dumps([snapshot]),
+                headers={},
+            )
+            assert resp.status == 200
+
+        with mock.patch("sentry.issues.attributes.produce_snapshot_to_kafka", post_insert):
             super().setUp()
 
     @mock.patch("sentry.utils.metrics.timer")
@@ -2621,7 +2611,7 @@ def test_issue_priority(self):
             data={
                 "fingerprint": ["put-me-in-group3"],
                 "event_id": "c" * 32,
-                "timestamp": iso_format(self.base_datetime - timedelta(days=20)),
+                "timestamp": (self.base_datetime - timedelta(days=20)).isoformat(),
             },
             project_id=self.project.id,
         )
@@ -2654,7 +2644,7 @@ def test_trends_sort_old_and_new_events(self):
                 "message": "group1",
                 "environment": "production",
                 "tags": {"server": "example.com", "sentry:user": "event3@example.com"},
-                "timestamp": iso_format(base_datetime),
+                "timestamp": base_datetime.isoformat(),
                 "stacktrace": {"frames": [{"module": "group1"}]},
             },
             project_id=new_project.id,
@@ -2666,7 +2656,7 @@ def test_trends_sort_old_and_new_events(self):
                 "message": "foo. Also, this message is intended to be greater than 256 characters so that we can put some unique string identifier after that point in the string. The purpose of this is in order to verify we are using snuba to search messages instead of Postgres (postgres truncates at 256 characters and clickhouse does not). santryrox.",
                 "environment": "production",
                 "tags": {"server": "example.com", "sentry:user": "old_event@example.com"},
-                "timestamp": iso_format(base_datetime - timedelta(days=20)),
+                "timestamp": (base_datetime - timedelta(days=20)).isoformat(),
                 "stacktrace": {"frames": [{"module": "group1"}]},
             },
             project_id=new_project.id,
@@ -2704,7 +2694,7 @@ def test_trends_sort_v2(self):
                 "message": "group1",
                 "environment": "production",
                 "tags": {"server": "example.com", "sentry:user": "event3@example.com"},
-                "timestamp": iso_format(base_datetime),
+                "timestamp": base_datetime.isoformat(),
                 "stacktrace": {"frames": [{"module": "group1"}]},
             },
             project_id=new_project.id,
@@ -2716,7 +2706,7 @@ def test_trends_sort_v2(self):
                 "message": "foo. Also, this message is intended to be greater than 256 characters so that we can put some unique string identifier after that point in the string. The purpose of this is in order to verify we are using snuba to search messages instead of Postgres (postgres truncates at 256 characters and clickhouse does not). santryrox.",
                 "environment": "production",
                 "tags": {"server": "example.com", "sentry:user": "old_event@example.com"},
-                "timestamp": iso_format(base_datetime - timedelta(days=20)),
+                "timestamp": (base_datetime - timedelta(days=20)).isoformat(),
                 "stacktrace": {"frames": [{"module": "group1"}]},
             },
             project_id=new_project.id,
@@ -2749,7 +2739,7 @@ def test_trends_log_level_results(self):
             data={
                 "fingerprint": ["put-me-in-group1"],
                 "event_id": "c" * 32,
-                "timestamp": iso_format(base_datetime - timedelta(hours=1)),
+                "timestamp": (base_datetime - timedelta(hours=1)).isoformat(),
                 "message": "foo",
                 "stacktrace": {"frames": [{"module": "group1"}]},
                 "environment": "staging",
@@ -2761,7 +2751,7 @@ def test_trends_log_level_results(self):
             data={
                 "fingerprint": ["put-me-in-group2"],
                 "event_id": "d" * 32,
-                "timestamp": iso_format(base_datetime),
+                "timestamp": base_datetime.isoformat(),
                 "message": "bar",
                 "stacktrace": {"frames": [{"module": "group2"}]},
                 "environment": "staging",
@@ -2838,7 +2828,7 @@ def test_trends_has_stacktrace_results(self):
             data={
                 "event_id": "d" * 32,
                 "message": "oh no",
-                "timestamp": iso_format(base_datetime - timedelta(hours=1)),
+                "timestamp": (base_datetime - timedelta(hours=1)).isoformat(),
             },
             project_id=self.project.id,
         )
@@ -2862,7 +2852,7 @@ def test_trends_has_stacktrace_results(self):
                         }
                     ]
                 },
-                "timestamp": iso_format(base_datetime - timedelta(hours=1)),
+                "timestamp": (base_datetime - timedelta(hours=1)).isoformat(),
             },
             project_id=self.project.id,
         )
@@ -2907,7 +2897,7 @@ def test_trends_event_halflife_results(self):
             data={
                 "fingerprint": ["put-me-in-group1"],
                 "event_id": "a" * 32,
-                "timestamp": iso_format(base_datetime - timedelta(hours=1)),
+                "timestamp": (base_datetime - timedelta(hours=1)).isoformat(),
                 "message": "foo",
                 "stacktrace": {"frames": [{"module": "group1"}]},
                 "environment": "staging",
@@ -2919,7 +2909,7 @@ def test_trends_event_halflife_results(self):
             data={
                 "fingerprint": ["put-me-in-group2"],
                 "event_id": "b" * 32,
-                "timestamp": iso_format(base_datetime),
+                "timestamp": base_datetime.isoformat(),
                 "message": "bar",
                 "stacktrace": {"frames": [{"module": "group2"}]},
                 "environment": "staging",
@@ -2981,7 +2971,7 @@ def test_trends_mixed_group_types(self):
             data={
                 "fingerprint": ["put-me-in-group1"],
                 "event_id": "a" * 32,
-                "timestamp": iso_format(base_datetime - timedelta(hours=1)),
+                "timestamp": (base_datetime - timedelta(hours=1)).isoformat(),
                 "message": "foo",
                 "stacktrace": {"frames": [{"module": "group1"}]},
                 "environment": "staging",
@@ -3071,8 +3061,8 @@ def setUp(self):
                 data={
                     **transaction_event_data,
                     "event_id": "a" * 32,
-                    "timestamp": iso_format(before_now(minutes=1)),
-                    "start_timestamp": iso_format(before_now(minutes=1, seconds=5)),
+                    "timestamp": before_now(minutes=1).isoformat(),
+                    "start_timestamp": (before_now(minutes=1, seconds=5)).isoformat(),
                     "tags": {"my_tag": 1},
                     "fingerprint": [
                         f"{PerformanceRenderBlockingAssetSpanGroupType.type_id}-group1"
@@ -3086,8 +3076,8 @@ def setUp(self):
                 data={
                     **transaction_event_data,
                     "event_id": "a" * 32,
-                    "timestamp": iso_format(before_now(minutes=2)),
-                    "start_timestamp": iso_format(before_now(minutes=2, seconds=5)),
+                    "timestamp": before_now(minutes=2).isoformat(),
+                    "start_timestamp": before_now(minutes=2, seconds=5).isoformat(),
                     "tags": {"my_tag": 1},
                     "fingerprint": [
                         f"{PerformanceRenderBlockingAssetSpanGroupType.type_id}-group2"
@@ -3097,7 +3087,7 @@ def setUp(self):
             )
             self.perf_group_2 = mock_eventstream.call_args[0][2].group
         error_event_data = {
-            "timestamp": iso_format(self.base_datetime - timedelta(days=20)),
+            "timestamp": (self.base_datetime - timedelta(days=20)).isoformat(),
             "message": "bar",
             "environment": "staging",
             "tags": {
@@ -3267,8 +3257,8 @@ def test_perf_issue_search_message_term_queries_postgres(self):
                         f"{PerformanceRenderBlockingAssetSpanGroupType.type_id}-group12"
                     ],
                     "event_id": "e" * 32,
-                    "timestamp": iso_format(self.base_datetime),
-                    "start_timestamp": iso_format(self.base_datetime),
+                    "timestamp": self.base_datetime.isoformat(),
+                    "start_timestamp": self.base_datetime.isoformat(),
                     "type": "transaction",
                     "transaction": transaction_name,
                 },
@@ -3330,8 +3320,8 @@ def test_search_message_error_and_perf_issues(self):
                         f"{PerformanceRenderBlockingAssetSpanGroupType.type_id}-group12"
                     ],
                     "event_id": "e" * 32,
-                    "timestamp": iso_format(self.base_datetime),
-                    "start_timestamp": iso_format(self.base_datetime),
+                    "timestamp": self.base_datetime.isoformat(),
+                    "start_timestamp": self.base_datetime.isoformat(),
                     "type": "transaction",
                     "transaction": "/api/0/events",
                 },
@@ -3348,7 +3338,7 @@ def test_search_message_error_and_perf_issues(self):
                 "message": "Uncaught exception on api /api/0/events",
                 "environment": "production",
                 "tags": {"server": "example.com", "sentry:user": "event3@example.com"},
-                "timestamp": iso_format(self.base_datetime),
+                "timestamp": self.base_datetime.isoformat(),
                 "stacktrace": {"frames": [{"module": "group1"}]},
             },
             project_id=self.project.id,
@@ -3379,7 +3369,7 @@ def test_compound_message_negation(self):
                 "fingerprint": ["put-me-in-group1"],
                 "event_id": "2" * 32,
                 "message": "something",
-                "timestamp": iso_format(self.base_datetime),
+                "timestamp": self.base_datetime.isoformat(),
             },
             project_id=self.project.id,
         )
@@ -3391,8 +3381,8 @@ def test_compound_message_negation(self):
                 "contexts": {"trace": {"trace_id": "b" * 32, "span_id": "c" * 16, "op": ""}},
                 "fingerprint": [f"{PerformanceRenderBlockingAssetSpanGroupType.type_id}-group12"],
                 "event_id": "e" * 32,
-                "timestamp": iso_format(self.base_datetime),
-                "start_timestamp": iso_format(self.base_datetime),
+                "timestamp": self.base_datetime.isoformat(),
+                "start_timestamp": self.base_datetime.isoformat(),
                 "type": "transaction",
                 "transaction": "something",
             },
@@ -3464,7 +3454,7 @@ def setUp(self):
         )
 
         error_event_data = {
-            "timestamp": iso_format(self.base_datetime - timedelta(days=20)),
+            "timestamp": (self.base_datetime - timedelta(days=20)).isoformat(),
             "message": "bar",
             "environment": "staging",
             "tags": {
diff --git a/tests/snuba/sessions/test_sessions.py b/tests/snuba/sessions/test_sessions.py
index 3e32446872f4e2..a1563486369088 100644
--- a/tests/snuba/sessions/test_sessions.py
+++ b/tests/snuba/sessions/test_sessions.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import time
-from datetime import UTC, datetime, timedelta
+from datetime import datetime, timedelta
 from unittest import mock
 
 import pytest
@@ -9,7 +9,6 @@
 
 from sentry.release_health.base import OverviewStat
 from sentry.release_health.metrics import MetricsReleaseHealthBackend
-from sentry.snuba.sessions import _make_stats
 from sentry.testutils.cases import BaseMetricsTestCase, TestCase
 
 pytestmark = pytest.mark.sentry_metrics
@@ -21,17 +20,6 @@ def format_timestamp(dt):
     return dt.strftime("%Y-%m-%dT%H:%M:%S+00:00")
 
 
-def make_24h_stats(ts, adjust_start=False):
-    ret_val = _make_stats(datetime.fromtimestamp(ts, UTC), 3600, 24)
-
-    if adjust_start:
-        # HACK this adds another interval at the beginning in accordance with the new way of calculating intervals
-        # https://www.notion.so/sentry/Metrics-Layer-get_intervals-bug-dce140607d054201a5e6629b070cb969
-        ret_val.insert(0, [ret_val[0][0] - 3600, 0])
-
-    return ret_val
-
-
 class SnubaSessionsTest(TestCase, BaseMetricsTestCase):
     backend = MetricsReleaseHealthBackend()
 
@@ -1035,8 +1023,6 @@ def test_empty(self):
         )
 
     def test_with_other_metrics(self):
-        if not self.backend.is_metrics_based():
-            return
         assert isinstance(self, BaseMetricsTestCase)
 
         # Test no errors when no session data
diff --git a/tests/snuba/tagstore/test_tagstore_backend.py b/tests/snuba/tagstore/test_tagstore_backend.py
index 184a28533ec2cb..060133f74bd7fe 100644
--- a/tests/snuba/tagstore/test_tagstore_backend.py
+++ b/tests/snuba/tagstore/test_tagstore_backend.py
@@ -25,7 +25,7 @@
 from sentry.tagstore.types import GroupTagValue, TagValue
 from sentry.testutils.abstract import Abstract
 from sentry.testutils.cases import PerformanceIssueTestCase, SnubaTestCase, TestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.utils.eventuser import EventUser
 from sentry.utils.samples import load_data
 from tests.sentry.issues.test_utils import SearchIssueTestMixin
@@ -72,7 +72,7 @@ def setUp(self):
                 "platform": "python",
                 "environment": env1,
                 "fingerprint": ["group-1"],
-                "timestamp": iso_format(self.now - timedelta(seconds=1)),
+                "timestamp": (self.now - timedelta(seconds=1)).isoformat(),
                 "tags": {
                     "foo": "bar",
                     "baz": "quux",
@@ -92,7 +92,7 @@ def setUp(self):
                 "platform": "python",
                 "environment": env1,
                 "fingerprint": ["group-1"],
-                "timestamp": iso_format(self.now - timedelta(seconds=2)),
+                "timestamp": (self.now - timedelta(seconds=2)).isoformat(),
                 "tags": {
                     "foo": "bar",
                     "baz": "quux",
@@ -112,7 +112,7 @@ def setUp(self):
                 "platform": "python",
                 "environment": env1,
                 "fingerprint": ["group-2"],
-                "timestamp": iso_format(self.now - timedelta(seconds=2)),
+                "timestamp": (self.now - timedelta(seconds=2)).isoformat(),
                 "tags": {"browser": "chrome", "sentry:user": "id:user1"},
                 "user": {"id": "user1"},
             },
@@ -126,7 +126,7 @@ def setUp(self):
                 "platform": "python",
                 "environment": env2,
                 "fingerprint": ["group-1"],
-                "timestamp": iso_format(self.now - timedelta(seconds=2)),
+                "timestamp": (self.now - timedelta(seconds=2)).isoformat(),
                 "tags": {"foo": "bar"},
             },
             project_id=self.proj1.id,
@@ -147,8 +147,8 @@ def perf_group_and_env(self):
             event_data={
                 **event_data,
                 "event_id": "a" * 32,
-                "timestamp": iso_format(self.now - timedelta(seconds=1)),
-                "start_timestamp": iso_format(self.now - timedelta(seconds=1)),
+                "timestamp": (self.now - timedelta(seconds=1)).isoformat(),
+                "start_timestamp": (self.now - timedelta(seconds=1)).isoformat(),
                 "tags": {"foo": "bar", "biz": "baz"},
                 "release": "releaseme",
             }
@@ -157,8 +157,8 @@ def perf_group_and_env(self):
             event_data={
                 **event_data,
                 "event_id": "b" * 32,
-                "timestamp": iso_format(self.now - timedelta(seconds=2)),
-                "start_timestamp": iso_format(self.now - timedelta(seconds=2)),
+                "timestamp": (self.now - timedelta(seconds=2)).isoformat(),
+                "start_timestamp": (self.now - timedelta(seconds=2)).isoformat(),
                 "tags": {"foo": "quux"},
                 "release": "releaseme",
             }
@@ -675,7 +675,7 @@ def test_get_groups_user_counts_no_environments(self):
                 "message": "message 1",
                 "platform": "python",
                 "fingerprint": ["group-1"],
-                "timestamp": iso_format(self.now - timedelta(seconds=1)),
+                "timestamp": (self.now - timedelta(seconds=1)).isoformat(),
                 "tags": {
                     "foo": "bar",
                     "baz": "quux",
@@ -776,7 +776,7 @@ def test_get_release_tags_uses_release_project_environment(self):
                 "platform": "python",
                 "environment": None,
                 "fingerprint": ["group-1"],
-                "timestamp": iso_format(one_day_ago),
+                "timestamp": one_day_ago.isoformat(),
                 "tags": {
                     "sentry:release": 100,
                 },
@@ -799,7 +799,7 @@ def test_get_release_tags_uses_release_project_environment(self):
                 "platform": "python",
                 "environment": None,
                 "fingerprint": ["group-1"],
-                "timestamp": iso_format(two_days_ago),
+                "timestamp": two_days_ago.isoformat(),
                 "tags": {
                     "sentry:release": 100,
                 },
@@ -1148,7 +1148,7 @@ def test_get_group_tag_value_paginator_times_seen(self):
                 "platform": "python",
                 "environment": self.proj1env1.name,
                 "fingerprint": ["group-1"],
-                "timestamp": iso_format(self.now - timedelta(seconds=2)),
+                "timestamp": (self.now - timedelta(seconds=2)).isoformat(),
                 "tags": {
                     "foo": "bar",
                     "baz": "quux",
@@ -1199,8 +1199,8 @@ def test_get_group_tag_value_paginator_times_seen_perf(self):
             event_data={
                 **event_data,
                 "event_id": "a" * 32,
-                "timestamp": iso_format(self.now - timedelta(seconds=1)),
-                "start_timestamp": iso_format(self.now - timedelta(seconds=1)),
+                "timestamp": (self.now - timedelta(seconds=1)).isoformat(),
+                "start_timestamp": (self.now - timedelta(seconds=1)).isoformat(),
                 "tags": {"foo": "bar", "biz": "baz"},
                 "release": "releaseme",
                 "environment": env.name,
@@ -1256,7 +1256,7 @@ def test_get_group_tag_value_paginator_sort_by_last_seen(self):
                 "platform": "python",
                 "environment": "test",
                 "fingerprint": ["group-1"],
-                "timestamp": iso_format(self.now - timedelta(seconds=5)),
+                "timestamp": (self.now - timedelta(seconds=5)).isoformat(),
                 "tags": {
                     "foo": "quux",
                 },
@@ -1274,7 +1274,7 @@ def test_get_group_tag_value_paginator_sort_by_last_seen(self):
                 "platform": "python",
                 "environment": "test",
                 "fingerprint": ["group-1"],
-                "timestamp": iso_format(self.now),
+                "timestamp": self.now.isoformat(),
                 "tags": {
                     "foo": "quux",
                 },
diff --git a/tests/snuba/tasks/test_unmerge.py b/tests/snuba/tasks/test_unmerge.py
index 4a5a0864974f6b..a32531d6f7c10e 100644
--- a/tests/snuba/tasks/test_unmerge.py
+++ b/tests/snuba/tasks/test_unmerge.py
@@ -30,7 +30,7 @@
     unmerge,
 )
 from sentry.testutils.cases import SnubaTestCase, TestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.helpers.features import with_feature
 from sentry.tsdb.base import TSDBModel
 from sentry.utils import redis
@@ -69,7 +69,7 @@ def test_get_group_creation_attributes(self):
                 "type": "default",
                 "level": "info",
                 "tags": {"logger": "javascript"},
-                "timestamp": iso_format(now),
+                "timestamp": now.isoformat(),
             },
             project_id=self.project.id,
         )
@@ -81,7 +81,7 @@ def test_get_group_creation_attributes(self):
                 "type": "default",
                 "level": "error",
                 "tags": {"logger": "python"},
-                "timestamp": iso_format(now),
+                "timestamp": now.isoformat(),
             },
             project_id=self.project.id,
         )
@@ -93,7 +93,7 @@ def test_get_group_creation_attributes(self):
                 "type": "default",
                 "level": "debug",
                 "tags": {"logger": "java"},
-                "timestamp": iso_format(now),
+                "timestamp": now.isoformat(),
             },
             project_id=self.project.id,
         )
@@ -142,7 +142,7 @@ def test_get_group_backfill_attributes(self):
                     data={
                         "platform": "python",
                         "message": "Hello from Python",
-                        "timestamp": iso_format(now - timedelta(hours=1)),
+                        "timestamp": (now - timedelta(hours=1)).isoformat(),
                         "type": "default",
                         "level": "debug",
                         "tags": {"logger": "java"},
@@ -153,7 +153,7 @@ def test_get_group_backfill_attributes(self):
                     data={
                         "platform": "java",
                         "message": "Hello from Java",
-                        "timestamp": iso_format(now - timedelta(hours=2)),
+                        "timestamp": (now - timedelta(hours=2)).isoformat(),
                         "type": "default",
                         "level": "debug",
                         "tags": {"logger": "java"},
@@ -205,7 +205,7 @@ def create_message_event(
                     "user": next(user_values),
                     "tags": tags,
                     "fingerprint": [fingerprint],
-                    "timestamp": iso_format(now + timedelta(seconds=i)),
+                    "timestamp": (now + timedelta(seconds=i)).isoformat(),
                     "environment": environment,
                     "release": release,
                 },
@@ -511,8 +511,7 @@ def strip_zeroes(data):
         def collect_by_release(group, aggregate, event):
             aggregate = aggregate if aggregate is not None else {}
             release = event.get_tag("sentry:release")
-            if not release:
-                return aggregate
+            assert release
             release = GroupRelease.objects.get(
                 group_id=group.id,
                 environment=event.data["environment"],
diff --git a/tests/snuba/test_snuba.py b/tests/snuba/test_snuba.py
index 1fd52189349f3e..de1e122c540dc6 100644
--- a/tests/snuba/test_snuba.py
+++ b/tests/snuba/test_snuba.py
@@ -9,7 +9,7 @@
 from snuba_sdk.column import InvalidColumnError
 
 from sentry.testutils.cases import SnubaTestCase, TestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.utils import snuba
 
 
@@ -114,7 +114,7 @@ def test_organization_retention_larger_than_end_date(self) -> None:
 
 class BulkRawQueryTest(TestCase, SnubaTestCase):
     def test_simple(self) -> None:
-        one_min_ago = iso_format(before_now(minutes=1))
+        one_min_ago = before_now(minutes=1).isoformat()
         event_1 = self.store_event(
             data={"fingerprint": ["group-1"], "message": "hello", "timestamp": one_min_ago},
             project_id=self.project.id,
@@ -149,7 +149,7 @@ def test_simple(self) -> None:
 
     @mock.patch("sentry.utils.snuba._bulk_snuba_query", side_effect=snuba._bulk_snuba_query)
     def test_cache(self, _bulk_snuba_query):
-        one_min_ago = iso_format(before_now(minutes=1))
+        one_min_ago = before_now(minutes=1).isoformat()
         event_1 = self.store_event(
             data={"fingerprint": ["group-1"], "message": "hello", "timestamp": one_min_ago},
             project_id=self.project.id,
diff --git a/tests/snuba/tsdb/test_tsdb_backend.py b/tests/snuba/tsdb/test_tsdb_backend.py
index 2ebdd020637299..acecfd19e199aa 100644
--- a/tests/snuba/tsdb/test_tsdb_backend.py
+++ b/tests/snuba/tsdb/test_tsdb_backend.py
@@ -9,7 +9,7 @@
 from sentry.models.grouprelease import GroupRelease
 from sentry.models.release import Release
 from sentry.testutils.cases import SnubaTestCase, TestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.tsdb.base import TSDBModel
 from sentry.tsdb.snuba import SnubaTSDB
 from sentry.utils.dates import to_datetime
@@ -21,7 +21,7 @@ def timestamp(d):
     return t - (t % 3600)
 
 
-def has_shape(data, shape, allow_empty=False):
+def has_shape(data, shape):
     """
     Determine if a data object has the provided shape
 
@@ -33,18 +33,16 @@ def has_shape(data, shape, allow_empty=False):
     A tuple is the same shape if it has the same length as `shape` and all the
     values have the same shape as the corresponding value in `shape`
     Any other object simply has to have the same type.
-    If `allow_empty` is set, lists and dicts in `data` will pass even if they are empty.
     """
-    if not isinstance(data, type(shape)):
-        return False
+    assert isinstance(data, type(shape))
     if isinstance(data, dict):
         return (
-            (allow_empty or len(data) > 0)
+            len(data) > 0
             and all(has_shape(k, list(shape.keys())[0]) for k in data.keys())
             and all(has_shape(v, list(shape.values())[0]) for v in data.values())
         )
     elif isinstance(data, list):
-        return (allow_empty or len(data) > 0) and all(has_shape(v, shape[0]) for v in data)
+        return len(data) > 0 and all(has_shape(v, shape[0]) for v in data)
     elif isinstance(data, tuple):
         return len(data) == len(shape) and all(
             has_shape(data[i], shape[i]) for i in range(len(data))
@@ -85,7 +83,7 @@ def setUp(self):
                     "fingerprint": [["group-1"], ["group-2"]][
                         (r // 600) % 2
                     ],  # Switch every 10 mins
-                    "timestamp": iso_format(self.now + timedelta(seconds=r)),
+                    "timestamp": (self.now + timedelta(seconds=r)).isoformat(),
                     "tags": {
                         "foo": "bar",
                         "baz": "quux",
@@ -142,7 +140,7 @@ def test_range_single(self):
                     "message": "message 1",
                     "platform": "python",
                     "fingerprint": ["group-1"],
-                    "timestamp": iso_format(self.now + timedelta(seconds=r)),
+                    "timestamp": (self.now + timedelta(seconds=r)).isoformat(),
                     "tags": {
                         "foo": "bar",
                         "baz": "quux",
diff --git a/tools/mypy_helpers/plugin.py b/tools/mypy_helpers/plugin.py
index 9ee797a4541770..6fd334181d3112 100644
--- a/tools/mypy_helpers/plugin.py
+++ b/tools/mypy_helpers/plugin.py
@@ -122,7 +122,7 @@ def get_function_signature_hook(
 
     def get_base_class_hook(self, fullname: str) -> Callable[[ClassDefContext], None] | None:
         # XXX: this is a hack -- I don't know if there's a better callback to modify a class
-        if fullname == "io.BytesIO":
+        if fullname == "_io.BytesIO":
             return _adjust_http_request_members
         else:
             return None
diff --git a/tsconfig.json b/tsconfig.json
index baafd23372afc3..925ec005eddb29 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,7 +1,13 @@
 {
   "extends": "./config/tsconfig.base.json",
   "compilerOptions": {
-    "allowJs": true
+    "allowJs": true,
   },
-  "include": [".eslintrc.js", "static/app", "tests/js", "config", "scripts"]
+  "include": [
+    "eslint.config.mjs",
+    "static/app",
+    "tests/js",
+    "config",
+    "scripts"
+  ]
 }
diff --git a/yarn.lock b/yarn.lock
index 7f5e97950aaf7b..fa82a53d3c55e5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1559,36 +1559,69 @@
   integrity sha512-Arm+WgUFLUATuoxCJcahGuk6Yj9Pzxd6l11Zb/2aAuv5kWWvvfhLFo2fni4uSK5vzlUdCGZ/BdV5tH8klj8p8g==
 
 "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
-  integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz#d1145bf2c20132d6400495d6df4bf59362fd9d56"
+  integrity sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==
   dependencies:
-    eslint-visitor-keys "^3.3.0"
+    eslint-visitor-keys "^3.4.3"
 
-"@eslint-community/regexpp@^4.10.0", "@eslint-community/regexpp@^4.6.1":
-  version "4.10.1"
-  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.1.tgz#361461e5cb3845d874e61731c11cfedd664d83a0"
-  integrity sha512-Zm2NGpWELsQAD1xsJzGQpYfvICSsFkEpU0jxBjfdC6uNEWXcHnfs9hScFWtXVDVl+rBQJGrl4g1vcKIejpH9dA==
+"@eslint-community/regexpp@^4.10.0", "@eslint-community/regexpp@^4.12.1":
+  version "4.12.1"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.1.tgz#cfc6cffe39df390a3841cde2abccf92eaa7ae0e0"
+  integrity sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==
 
-"@eslint/eslintrc@^2.1.4":
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad"
-  integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==
+"@eslint/compat@^1.2.4":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@eslint/compat/-/compat-1.2.4.tgz#b69b0d76ce73fe66d7f8633c406acea151f5c559"
+  integrity sha512-S8ZdQj/N69YAtuqFt7653jwcvuUj131+6qGLUyDqfDg1OIoBQ66OCuXC473YQfO2AaxITTutiRQiDwoo7ZLYyg==
+
+"@eslint/config-array@^0.19.0":
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.19.1.tgz#734aaea2c40be22bbb1f2a9dac687c57a6a4c984"
+  integrity sha512-fo6Mtm5mWyKjA/Chy1BYTdn5mGJoDNjC7C64ug20ADsRDGrA85bN3uK3MaKbeRkRuuIEAR5N33Jr1pbm411/PA==
+  dependencies:
+    "@eslint/object-schema" "^2.1.5"
+    debug "^4.3.1"
+    minimatch "^3.1.2"
+
+"@eslint/core@^0.9.0":
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/@eslint/core/-/core-0.9.1.tgz#31763847308ef6b7084a4505573ac9402c51f9d1"
+  integrity sha512-GuUdqkyyzQI5RMIWkHhvTWLCyLo1jNK3vzkSyaExH5kHPDHcuL2VOpHjmMY+y3+NC69qAKToBqldTBgYeLSr9Q==
+  dependencies:
+    "@types/json-schema" "^7.0.15"
+
+"@eslint/eslintrc@^3.2.0":
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.2.0.tgz#57470ac4e2e283a6bf76044d63281196e370542c"
+  integrity sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
-    espree "^9.6.0"
-    globals "^13.19.0"
+    espree "^10.0.1"
+    globals "^14.0.0"
     ignore "^5.2.0"
     import-fresh "^3.2.1"
     js-yaml "^4.1.0"
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@8.57.1":
-  version "8.57.1"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.1.tgz#de633db3ec2ef6a3c89e2f19038063e8a122e2c2"
-  integrity sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==
+"@eslint/js@9.17.0", "@eslint/js@^9.17.0":
+  version "9.17.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.17.0.tgz#1523e586791f80376a6f8398a3964455ecc651ec"
+  integrity sha512-Sxc4hqcs1kTu0iID3kcZDW3JHq2a77HO9P8CP6YEA/FpH3Ll8UXE2r/86Rz9YJLKme39S9vU5OWNjC6Xl0Cr3w==
+
+"@eslint/object-schema@^2.1.5":
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-2.1.5.tgz#8670a8f6258a2be5b2c620ff314a1d984c23eb2e"
+  integrity sha512-o0bhxnL89h5Bae5T318nFoFzGy+YE5i/gGkoPAgkmTVdRKTiv3p8JHevPiPaMwoloKfEiiaHlawCqaZMqRm+XQ==
+
+"@eslint/plugin-kit@^0.2.3":
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/@eslint/plugin-kit/-/plugin-kit-0.2.4.tgz#2b78e7bb3755784bb13faa8932a1d994d6537792"
+  integrity sha512-zSkKow6H5Kdm0ZUQUB2kV5JIXqoG0+uH5YADhaEHswm664N9Db8dXSi0nMJpacpMf+MyyglF1vnZohpEg5yUtg==
+  dependencies:
+    levn "^0.4.1"
 
 "@fastify/busboy@^2.0.0":
   version "2.1.1"
@@ -1634,24 +1667,33 @@
   dependencies:
     tslib "^2.4.0"
 
-"@humanwhocodes/config-array@^0.13.0":
-  version "0.13.0"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.13.0.tgz#fb907624df3256d04b9aa2df50d7aa97ec648748"
-  integrity sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==
+"@humanfs/core@^0.19.1":
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/@humanfs/core/-/core-0.19.1.tgz#17c55ca7d426733fe3c561906b8173c336b40a77"
+  integrity sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==
+
+"@humanfs/node@^0.16.6":
+  version "0.16.6"
+  resolved "https://registry.yarnpkg.com/@humanfs/node/-/node-0.16.6.tgz#ee2a10eaabd1131987bf0488fd9b820174cd765e"
+  integrity sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==
   dependencies:
-    "@humanwhocodes/object-schema" "^2.0.3"
-    debug "^4.3.1"
-    minimatch "^3.0.5"
+    "@humanfs/core" "^0.19.1"
+    "@humanwhocodes/retry" "^0.3.0"
 
 "@humanwhocodes/module-importer@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
   integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
-"@humanwhocodes/object-schema@^2.0.3":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
-  integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
+"@humanwhocodes/retry@^0.3.0":
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.3.1.tgz#c72a5c76a9fbaf3488e231b13dc52c0da7bab42a"
+  integrity sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==
+
+"@humanwhocodes/retry@^0.4.1":
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.4.1.tgz#9a96ce501bc62df46c4031fbd970e3cc6b10f07b"
+  integrity sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==
 
 "@internationalized/date@^3.5.5":
   version "3.5.5"
@@ -1988,7 +2030,7 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
   integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
 
-"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
+"@nodelib/fs.walk@^1.2.3":
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
   integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
@@ -2105,17 +2147,10 @@
   dependencies:
     "@opentelemetry/api" "^1.0.0"
 
-"@opentelemetry/api-logs@0.53.0":
-  version "0.53.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/api-logs/-/api-logs-0.53.0.tgz#c478cbd8120ec2547b64edfa03a552cfe42170be"
-  integrity sha512-8HArjKx+RaAI8uEIgcORbZIPklyh1YLjPSBus8hjRmvLi6DeFzgOcdZ7KwPabKj8mXF8dX0hyfAyGfycz0DbFw==
-  dependencies:
-    "@opentelemetry/api" "^1.0.0"
-
-"@opentelemetry/api-logs@0.54.2":
-  version "0.54.2"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/api-logs/-/api-logs-0.54.2.tgz#bb8aa11cdc69b327b58d7e10cc2bc26bf540421f"
-  integrity sha512-4MTVwwmLgUh5QrJnZpYo6YRO5IBLAggf2h8gWDblwRagDStY13aEvt7gGk3jewrMaPlHiF83fENhIx0HO97/cQ==
+"@opentelemetry/api-logs@0.56.0":
+  version "0.56.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/api-logs/-/api-logs-0.56.0.tgz#68f8c51ca905c260b610c8a3c67d3f9fa3d59a45"
+  integrity sha512-Wr39+94UNNG3Ei9nv3pHd4AJ63gq5nSemMRpCd8fPwDL9rN3vK26lzxfH27mw16XzOSO+TpyQwBAMaLxaPWG0g==
   dependencies:
     "@opentelemetry/api" "^1.3.0"
 
@@ -2124,230 +2159,239 @@
   resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.9.0.tgz#d03eba68273dc0f7509e2a3d5cba21eae10379fe"
   integrity sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==
 
-"@opentelemetry/context-async-hooks@^1.25.1":
-  version "1.25.1"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/context-async-hooks/-/context-async-hooks-1.25.1.tgz#810bff2fcab84ec51f4684aff2d21f6c057d9e73"
-  integrity sha512-UW/ge9zjvAEmRWVapOP0qyCvPulWU6cQxGxDbWEFfGOj1VBBZAuOqTo3X6yWmDTD3Xe15ysCZChHncr2xFMIfQ==
+"@opentelemetry/context-async-hooks@^1.29.0":
+  version "1.29.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/context-async-hooks/-/context-async-hooks-1.29.0.tgz#3b3836c913834afa7720fdcf9687620f49b2cf37"
+  integrity sha512-TKT91jcFXgHyIDF1lgJF3BHGIakn6x0Xp7Tq3zoS3TMPzT9IlP0xEavWP8C1zGjU9UmZP2VR1tJhW9Az1A3w8Q==
 
-"@opentelemetry/core@1.26.0", "@opentelemetry/core@^1.1.0", "@opentelemetry/core@^1.25.1", "@opentelemetry/core@^1.8.0":
+"@opentelemetry/core@1.26.0", "@opentelemetry/core@^1.1.0", "@opentelemetry/core@^1.8.0":
   version "1.26.0"
   resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-1.26.0.tgz#7d84265aaa850ed0ca5813f97d831155be42b328"
   integrity sha512-1iKxXXE8415Cdv0yjG3G6hQnB5eVEsJce3QaawX8SjDn0mAS0ZM8fAbZZJD4ajvhC15cePvosSCut404KrIIvQ==
   dependencies:
     "@opentelemetry/semantic-conventions" "1.27.0"
 
-"@opentelemetry/instrumentation-amqplib@^0.43.0":
-  version "0.43.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-amqplib/-/instrumentation-amqplib-0.43.0.tgz#e18b7d763b69c605a7abf9869e1c278f9bfdc1eb"
-  integrity sha512-ALjfQC+0dnIEcvNYsbZl/VLh7D2P1HhFF4vicRKHhHFIUV3Shpg4kXgiek5PLhmeKSIPiUB25IYH5RIneclL4A==
+"@opentelemetry/core@1.29.0", "@opentelemetry/core@^1.26.0", "@opentelemetry/core@^1.29.0":
+  version "1.29.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-1.29.0.tgz#a9397dfd9a8b37b2435b5e44be16d39ec1c82bd9"
+  integrity sha512-gmT7vAreXl0DTHD2rVZcw3+l2g84+5XiHIqdBUxXbExymPCvSsGOpiwMmn8nkiJur28STV31wnhIDrzWDPzjfA==
+  dependencies:
+    "@opentelemetry/semantic-conventions" "1.28.0"
+
+"@opentelemetry/instrumentation-amqplib@^0.45.0":
+  version "0.45.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-amqplib/-/instrumentation-amqplib-0.45.0.tgz#747d72e38ff89266670e730ead90b85b6edc62d3"
+  integrity sha512-SlKLsOS65NGMIBG1Lh/hLrMDU9WzTUF25apnV6ZmWZB1bBmUwan7qrwwrTu1cL5LzJWCXOdZPuTaxP7pC9qxnQ==
   dependencies:
     "@opentelemetry/core" "^1.8.0"
-    "@opentelemetry/instrumentation" "^0.54.0"
+    "@opentelemetry/instrumentation" "^0.56.0"
     "@opentelemetry/semantic-conventions" "^1.27.0"
 
-"@opentelemetry/instrumentation-connect@0.40.0":
-  version "0.40.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-connect/-/instrumentation-connect-0.40.0.tgz#cb151b860ad8a711ebce4d7e025dcde95e4ba2c5"
-  integrity sha512-3aR/3YBQ160siitwwRLjwqrv2KBT16897+bo6yz8wIfel6nWOxTZBJudcbsK3p42pTC7qrbotJ9t/1wRLpv79Q==
+"@opentelemetry/instrumentation-connect@0.42.0":
+  version "0.42.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-connect/-/instrumentation-connect-0.42.0.tgz#daebedbe65068746c9db0eee6e3a636a0912d251"
+  integrity sha512-bOoYHBmbnq/jFaLHmXJ55VQ6jrH5fHDMAPjFM0d3JvR0dvIqW7anEoNC33QqYGFYUfVJ50S0d/eoyF61ALqQuA==
   dependencies:
     "@opentelemetry/core" "^1.8.0"
-    "@opentelemetry/instrumentation" "^0.54.0"
+    "@opentelemetry/instrumentation" "^0.56.0"
     "@opentelemetry/semantic-conventions" "^1.27.0"
     "@types/connect" "3.4.36"
 
-"@opentelemetry/instrumentation-dataloader@0.12.0":
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-dataloader/-/instrumentation-dataloader-0.12.0.tgz#de03a3948dec4f15fed80aa424d6bd5d6a8d10c7"
-  integrity sha512-pnPxatoFE0OXIZDQhL2okF//dmbiWFzcSc8pUg9TqofCLYZySSxDCgQc69CJBo5JnI3Gz1KP+mOjS4WAeRIH4g==
+"@opentelemetry/instrumentation-dataloader@0.15.0":
+  version "0.15.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-dataloader/-/instrumentation-dataloader-0.15.0.tgz#c3ac6f41672961a489080edd2c59aceebe412798"
+  integrity sha512-5fP35A2jUPk4SerVcduEkpbRAIoqa2PaP5rWumn01T1uSbavXNccAr3Xvx1N6xFtZxXpLJq4FYqGFnMgDWgVng==
   dependencies:
-    "@opentelemetry/instrumentation" "^0.53.0"
+    "@opentelemetry/instrumentation" "^0.56.0"
 
-"@opentelemetry/instrumentation-express@0.44.0":
-  version "0.44.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-express/-/instrumentation-express-0.44.0.tgz#51dc11e3152ffbee1c4e389298aac30231c8270a"
-  integrity sha512-GWgibp6Q0wxyFaaU8ERIgMMYgzcHmGrw3ILUtGchLtLncHNOKk0SNoWGqiylXWWT4HTn5XdV8MGawUgpZh80cA==
+"@opentelemetry/instrumentation-express@0.46.0":
+  version "0.46.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-express/-/instrumentation-express-0.46.0.tgz#8dfbc9dc567e2e864a00a6a7edfbec2dd8482056"
+  integrity sha512-BCEClDj/HPq/1xYRAlOr6z+OUnbp2eFp18DSrgyQz4IT9pkdYk8eWHnMi9oZSqlC6J5mQzkFmaW5RrKb1GLQhg==
   dependencies:
     "@opentelemetry/core" "^1.8.0"
-    "@opentelemetry/instrumentation" "^0.54.0"
+    "@opentelemetry/instrumentation" "^0.56.0"
     "@opentelemetry/semantic-conventions" "^1.27.0"
 
-"@opentelemetry/instrumentation-fastify@0.41.0":
-  version "0.41.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-fastify/-/instrumentation-fastify-0.41.0.tgz#5e1d00383756f3a8cc2ea4a9d15f9f7510cec571"
-  integrity sha512-pNRjFvf0mvqfJueaeL/qEkuGJwgtE5pgjIHGYwjc2rMViNCrtY9/Sf+Nu8ww6dDd/Oyk2fwZZP7i0XZfCnETrA==
+"@opentelemetry/instrumentation-fastify@0.43.0":
+  version "0.43.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-fastify/-/instrumentation-fastify-0.43.0.tgz#855e259733bd75e21cb54cc110a7910861b200a4"
+  integrity sha512-Lmdsg7tYiV+K3/NKVAQfnnLNGmakUOFdB0PhoTh2aXuSyCmyNnnDvhn2MsArAPTZ68wnD5Llh5HtmiuTkf+DyQ==
   dependencies:
     "@opentelemetry/core" "^1.8.0"
-    "@opentelemetry/instrumentation" "^0.54.0"
+    "@opentelemetry/instrumentation" "^0.56.0"
     "@opentelemetry/semantic-conventions" "^1.27.0"
 
-"@opentelemetry/instrumentation-fs@0.16.0":
-  version "0.16.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-fs/-/instrumentation-fs-0.16.0.tgz#aa1cc3aa81011ad9843a0156b200f06f31ffa03e"
-  integrity sha512-hMDRUxV38ln1R3lNz6osj3YjlO32ykbHqVrzG7gEhGXFQfu7LJUx8t9tEwE4r2h3CD4D0Rw4YGDU4yF4mP3ilg==
+"@opentelemetry/instrumentation-fs@0.18.0":
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-fs/-/instrumentation-fs-0.18.0.tgz#6ef0e58cda3212ce2cd17bddc4dd74f768fd74c0"
+  integrity sha512-kC40y6CEMONm8/MWwoF5GHWIC7gOdF+g3sgsjfwJaUkgD6bdWV+FgG0XApqSbTQndICKzw3RonVk8i7s6mHqhA==
   dependencies:
     "@opentelemetry/core" "^1.8.0"
-    "@opentelemetry/instrumentation" "^0.54.0"
+    "@opentelemetry/instrumentation" "^0.56.0"
 
-"@opentelemetry/instrumentation-generic-pool@0.39.0":
-  version "0.39.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-generic-pool/-/instrumentation-generic-pool-0.39.0.tgz#2b9af16ad82d5cbe67125c0125753cecd162a728"
-  integrity sha512-y4v8Y+tSfRB3NNBvHjbjrn7rX/7sdARG7FuK6zR8PGb28CTa0kHpEGCJqvL9L8xkTNvTXo+lM36ajFGUaK1aNw==
+"@opentelemetry/instrumentation-generic-pool@0.42.0":
+  version "0.42.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-generic-pool/-/instrumentation-generic-pool-0.42.0.tgz#6c6c6dcf2300e803acb22b2b914c6053acb80bf3"
+  integrity sha512-J4QxqiQ1imtB9ogzsOnHra0g3dmmLAx4JCeoK3o0rFes1OirljNHnO8Hsj4s1jAir8WmWvnEEQO1y8yk6j2tog==
   dependencies:
-    "@opentelemetry/instrumentation" "^0.53.0"
+    "@opentelemetry/instrumentation" "^0.56.0"
 
-"@opentelemetry/instrumentation-graphql@0.44.0":
-  version "0.44.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-graphql/-/instrumentation-graphql-0.44.0.tgz#6fce8e2f303d16810bf8a03148cad6e8e6119de1"
-  integrity sha512-FYXTe3Bv96aNpYktqm86BFUTpjglKD0kWI5T5bxYkLUPEPvFn38vWGMJTGrDMVou/i55E4jlWvcm6hFIqLsMbg==
+"@opentelemetry/instrumentation-graphql@0.46.0":
+  version "0.46.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-graphql/-/instrumentation-graphql-0.46.0.tgz#fbcf0844656c759294c03c30c471fc4862209a01"
+  integrity sha512-tplk0YWINSECcK89PGM7IVtOYenXyoOuhOQlN0X0YrcDUfMS4tZMKkVc0vyhNWYYrexnUHwNry2YNBNugSpjlQ==
   dependencies:
-    "@opentelemetry/instrumentation" "^0.54.0"
+    "@opentelemetry/instrumentation" "^0.56.0"
 
-"@opentelemetry/instrumentation-hapi@0.41.0":
-  version "0.41.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-hapi/-/instrumentation-hapi-0.41.0.tgz#de8711907256d8fae1b5faf71fc825cef4a7ddbb"
-  integrity sha512-jKDrxPNXDByPlYcMdZjNPYCvw0SQJjN+B1A+QH+sx+sAHsKSAf9hwFiJSrI6C4XdOls43V/f/fkp9ITkHhKFbQ==
+"@opentelemetry/instrumentation-hapi@0.44.0":
+  version "0.44.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-hapi/-/instrumentation-hapi-0.44.0.tgz#5b4524bef636209ba6cc95cfbb976b605c2946cd"
+  integrity sha512-4HdNIMNXWK1O6nsaQOrACo83QWEVoyNODTdVDbUqtqXiv2peDfD0RAPhSQlSGWLPw3S4d9UoOmrV7s2HYj6T2A==
   dependencies:
     "@opentelemetry/core" "^1.8.0"
-    "@opentelemetry/instrumentation" "^0.53.0"
+    "@opentelemetry/instrumentation" "^0.56.0"
     "@opentelemetry/semantic-conventions" "^1.27.0"
 
-"@opentelemetry/instrumentation-http@0.53.0":
-  version "0.53.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-http/-/instrumentation-http-0.53.0.tgz#0d806adf1b3aba036bc46e16162e3c0dbb8a6b60"
-  integrity sha512-H74ErMeDuZfj7KgYCTOFGWF5W9AfaPnqLQQxeFq85+D29wwV2yqHbz2IKLYpkOh7EI6QwDEl7rZCIxjJLyc/CQ==
+"@opentelemetry/instrumentation-http@0.56.0":
+  version "0.56.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-http/-/instrumentation-http-0.56.0.tgz#f7a9e1bb4126c0d918775c1368a42b8afd5a48a2"
+  integrity sha512-/bWHBUAq8VoATnH9iLk5w8CE9+gj+RgYSUphe7hry472n6fYl7+4PvuScoQMdmSUTprKq/gyr2kOWL6zrC7FkQ==
   dependencies:
-    "@opentelemetry/core" "1.26.0"
-    "@opentelemetry/instrumentation" "0.53.0"
-    "@opentelemetry/semantic-conventions" "1.27.0"
+    "@opentelemetry/core" "1.29.0"
+    "@opentelemetry/instrumentation" "0.56.0"
+    "@opentelemetry/semantic-conventions" "1.28.0"
+    forwarded-parse "2.1.2"
     semver "^7.5.2"
 
-"@opentelemetry/instrumentation-ioredis@0.43.0":
-  version "0.43.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-ioredis/-/instrumentation-ioredis-0.43.0.tgz#dbadabaeefc4cb47c406f878444f1bcac774fa89"
-  integrity sha512-i3Dke/LdhZbiUAEImmRG3i7Dimm/BD7t8pDDzwepSvIQ6s2X6FPia7561gw+64w+nx0+G9X14D7rEfaMEmmjig==
+"@opentelemetry/instrumentation-ioredis@0.46.0":
+  version "0.46.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-ioredis/-/instrumentation-ioredis-0.46.0.tgz#ec230466813f8ce82eb9ca9b23308ccfa460ce2b"
+  integrity sha512-sOdsq8oGi29V58p1AkefHvuB3l2ymP1IbxRIX3y4lZesQWKL8fLhBmy8xYjINSQ5gHzWul2yoz7pe7boxhZcqQ==
   dependencies:
-    "@opentelemetry/instrumentation" "^0.53.0"
+    "@opentelemetry/instrumentation" "^0.56.0"
     "@opentelemetry/redis-common" "^0.36.2"
     "@opentelemetry/semantic-conventions" "^1.27.0"
 
-"@opentelemetry/instrumentation-kafkajs@0.4.0":
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-kafkajs/-/instrumentation-kafkajs-0.4.0.tgz#c1fe0de45a65a66581be0d7422f6828cc806b3bb"
-  integrity sha512-I9VwDG314g7SDL4t8kD/7+1ytaDBRbZQjhVaQaVIDR8K+mlsoBhLsWH79yHxhHQKvwCSZwqXF+TiTOhoQVUt7A==
+"@opentelemetry/instrumentation-kafkajs@0.6.0":
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-kafkajs/-/instrumentation-kafkajs-0.6.0.tgz#5d1c6738da8e270acde9259521a9c6e0f421490c"
+  integrity sha512-MGQrzqEUAl0tacKJUFpuNHJesyTi51oUzSVizn7FdvJplkRIdS11FukyZBZJEscofSEdk7Ycmg+kNMLi5QHUFg==
   dependencies:
-    "@opentelemetry/instrumentation" "^0.54.0"
+    "@opentelemetry/instrumentation" "^0.56.0"
     "@opentelemetry/semantic-conventions" "^1.27.0"
 
-"@opentelemetry/instrumentation-knex@0.41.0":
-  version "0.41.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-knex/-/instrumentation-knex-0.41.0.tgz#74d611489e823003a825097bac019c6c2ad061a5"
-  integrity sha512-OhI1SlLv5qnsnm2dOVrian/x3431P75GngSpnR7c4fcVFv7prXGYu29Z6ILRWJf/NJt6fkbySmwdfUUnFnHCTg==
+"@opentelemetry/instrumentation-knex@0.43.0":
+  version "0.43.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-knex/-/instrumentation-knex-0.43.0.tgz#1f45cfea69212bd579e4fa95c6d5cccdd9626b8e"
+  integrity sha512-mOp0TRQNFFSBj5am0WF67fRO7UZMUmsF3/7HSDja9g3H4pnj+4YNvWWyZn4+q0rGrPtywminAXe0rxtgaGYIqg==
   dependencies:
-    "@opentelemetry/instrumentation" "^0.54.0"
+    "@opentelemetry/instrumentation" "^0.56.0"
     "@opentelemetry/semantic-conventions" "^1.27.0"
 
-"@opentelemetry/instrumentation-koa@0.43.0":
-  version "0.43.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-koa/-/instrumentation-koa-0.43.0.tgz#963fd192a1b5f6cbae5dabf4ec82e3105cbb23b1"
-  integrity sha512-lDAhSnmoTIN6ELKmLJBplXzT/Jqs5jGZehuG22EdSMaTwgjMpxMDI1YtlKEhiWPWkrz5LUsd0aOO0ZRc9vn3AQ==
+"@opentelemetry/instrumentation-koa@0.46.0":
+  version "0.46.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-koa/-/instrumentation-koa-0.46.0.tgz#bcdfb29f3b41be45355a9aa278fb231e19eb02e5"
+  integrity sha512-RcWXMQdJQANnPUaXbHY5G0Fg6gmleZ/ZtZeSsekWPaZmQq12FGk0L1UwodIgs31OlYfviAZ4yTeytoSUkgo5vQ==
   dependencies:
     "@opentelemetry/core" "^1.8.0"
-    "@opentelemetry/instrumentation" "^0.53.0"
+    "@opentelemetry/instrumentation" "^0.56.0"
     "@opentelemetry/semantic-conventions" "^1.27.0"
 
-"@opentelemetry/instrumentation-lru-memoizer@0.40.0":
-  version "0.40.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-lru-memoizer/-/instrumentation-lru-memoizer-0.40.0.tgz#dc60d7fdfd2a0c681cb23e7ed4f314d1506ccdc0"
-  integrity sha512-21xRwZsEdMPnROu/QsaOIODmzw59IYpGFmuC4aFWvMj6stA8+Ei1tX67nkarJttlNjoM94um0N4X26AD7ff54A==
+"@opentelemetry/instrumentation-lru-memoizer@0.43.0":
+  version "0.43.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-lru-memoizer/-/instrumentation-lru-memoizer-0.43.0.tgz#7d3f524a10715d9f681e8d4ee6bfe91be80c82cf"
+  integrity sha512-fZc+1eJUV+tFxaB3zkbupiA8SL3vhDUq89HbDNg1asweYrEb9OlHIB+Ot14ZiHUc1qCmmWmZHbPTwa56mVVwzg==
   dependencies:
-    "@opentelemetry/instrumentation" "^0.53.0"
+    "@opentelemetry/instrumentation" "^0.56.0"
 
-"@opentelemetry/instrumentation-mongodb@0.48.0":
-  version "0.48.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-mongodb/-/instrumentation-mongodb-0.48.0.tgz#40fb8c705cb4bf8d8c5bf8752c60c5a0aaaaf617"
-  integrity sha512-9YWvaGvrrcrydMsYGLu0w+RgmosLMKe3kv/UNlsPy8RLnCkN2z+bhhbjjjuxtUmvEuKZMCoXFluABVuBr1yhjw==
+"@opentelemetry/instrumentation-mongodb@0.50.0":
+  version "0.50.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-mongodb/-/instrumentation-mongodb-0.50.0.tgz#e5c60ad0bfbdd8ac3238c255a0662b7430083303"
+  integrity sha512-DtwJMjYFXFT5auAvv8aGrBj1h3ciA/dXQom11rxL7B1+Oy3FopSpanvwYxJ+z0qmBrQ1/iMuWELitYqU4LnlkQ==
   dependencies:
-    "@opentelemetry/instrumentation" "^0.54.0"
+    "@opentelemetry/instrumentation" "^0.56.0"
     "@opentelemetry/semantic-conventions" "^1.27.0"
 
-"@opentelemetry/instrumentation-mongoose@0.42.0":
-  version "0.42.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-mongoose/-/instrumentation-mongoose-0.42.0.tgz#375afd21adfcd897a8f521c1ffd2d91e6a428705"
-  integrity sha512-AnWv+RaR86uG3qNEMwt3plKX1ueRM7AspfszJYVkvkehiicC3bHQA6vWdb6Zvy5HAE14RyFbu9+2hUUjR2NSyg==
+"@opentelemetry/instrumentation-mongoose@0.45.0":
+  version "0.45.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-mongoose/-/instrumentation-mongoose-0.45.0.tgz#c8179827769fac8528b681da5888ae1779bd844b"
+  integrity sha512-zHgNh+A01C5baI2mb5dAGyMC7DWmUpOfwpV8axtC0Hd5Uzqv+oqKgKbVDIVhOaDkPxjgVJwYF9YQZl2pw2qxIA==
   dependencies:
     "@opentelemetry/core" "^1.8.0"
-    "@opentelemetry/instrumentation" "^0.53.0"
+    "@opentelemetry/instrumentation" "^0.56.0"
     "@opentelemetry/semantic-conventions" "^1.27.0"
 
-"@opentelemetry/instrumentation-mysql2@0.41.0":
-  version "0.41.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-mysql2/-/instrumentation-mysql2-0.41.0.tgz#6377b6e2d2487fd88e1d79aa03658db6c8d51651"
-  integrity sha512-REQB0x+IzVTpoNgVmy5b+UnH1/mDByrneimP6sbDHkp1j8QOl1HyWOrBH/6YWR0nrbU3l825Em5PlybjT3232g==
+"@opentelemetry/instrumentation-mysql2@0.44.0":
+  version "0.44.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-mysql2/-/instrumentation-mysql2-0.44.0.tgz#309d3fa452d4fcb632c4facb68ed7ea74b6738f9"
+  integrity sha512-e9QY4AGsjGFwmfHd6kBa4yPaQZjAq2FuxMb0BbKlXCAjG+jwqw+sr9xWdJGR60jMsTq52hx3mAlE3dUJ9BipxQ==
   dependencies:
-    "@opentelemetry/instrumentation" "^0.53.0"
+    "@opentelemetry/instrumentation" "^0.56.0"
     "@opentelemetry/semantic-conventions" "^1.27.0"
     "@opentelemetry/sql-common" "^0.40.1"
 
-"@opentelemetry/instrumentation-mysql@0.41.0":
-  version "0.41.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-mysql/-/instrumentation-mysql-0.41.0.tgz#2d50691ead5219774bd36d66c35d5b4681485dd7"
-  integrity sha512-jnvrV6BsQWyHS2qb2fkfbfSb1R/lmYwqEZITwufuRl37apTopswu9izc0b1CYRp/34tUG/4k/V39PND6eyiNvw==
+"@opentelemetry/instrumentation-mysql@0.44.0":
+  version "0.44.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-mysql/-/instrumentation-mysql-0.44.0.tgz#a29af4432d4289ed9d147d9c30038c57031d950c"
+  integrity sha512-al7jbXvT/uT1KV8gdNDzaWd5/WXf+mrjrsF0/NtbnqLa0UUFGgQnoK3cyborgny7I+KxWhL8h7YPTf6Zq4nKsg==
   dependencies:
-    "@opentelemetry/instrumentation" "^0.53.0"
+    "@opentelemetry/instrumentation" "^0.56.0"
     "@opentelemetry/semantic-conventions" "^1.27.0"
     "@types/mysql" "2.15.26"
 
-"@opentelemetry/instrumentation-nestjs-core@0.40.0":
-  version "0.40.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-nestjs-core/-/instrumentation-nestjs-core-0.40.0.tgz#2c0e6405b56caaec32747d55c57ff9a034668ea8"
-  integrity sha512-WF1hCUed07vKmf5BzEkL0wSPinqJgH7kGzOjjMAiTGacofNXjb/y4KQ8loj2sNsh5C/NN7s1zxQuCgbWbVTGKg==
+"@opentelemetry/instrumentation-nestjs-core@0.43.0":
+  version "0.43.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-nestjs-core/-/instrumentation-nestjs-core-0.43.0.tgz#c176409ab5ebfac862298e31a6a149126e278700"
+  integrity sha512-NEo4RU7HTjiaXk3curqXUvCb9alRiFWxQY//+hvDXwWLlADX2vB6QEmVCeEZrKO+6I/tBrI4vNdAnbCY9ldZVg==
   dependencies:
-    "@opentelemetry/instrumentation" "^0.53.0"
+    "@opentelemetry/instrumentation" "^0.56.0"
     "@opentelemetry/semantic-conventions" "^1.27.0"
 
-"@opentelemetry/instrumentation-pg@0.44.0":
-  version "0.44.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-pg/-/instrumentation-pg-0.44.0.tgz#1e97a0aeb2dca068ee23ce75884a0a0063a7ce3f"
-  integrity sha512-oTWVyzKqXud1BYEGX1loo2o4k4vaU1elr3vPO8NZolrBtFvQ34nx4HgUaexUDuEog00qQt+MLR5gws/p+JXMLQ==
+"@opentelemetry/instrumentation-pg@0.49.0":
+  version "0.49.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-pg/-/instrumentation-pg-0.49.0.tgz#47a6a461099fae8e1ffbb97b715a0c34f0aec0b6"
+  integrity sha512-3alvNNjPXVdAPdY1G7nGRVINbDxRK02+KAugDiEpzw0jFQfU8IzFkSWA4jyU4/GbMxKvHD+XIOEfSjpieSodKw==
   dependencies:
-    "@opentelemetry/instrumentation" "^0.53.0"
-    "@opentelemetry/semantic-conventions" "^1.27.0"
+    "@opentelemetry/core" "^1.26.0"
+    "@opentelemetry/instrumentation" "^0.56.0"
+    "@opentelemetry/semantic-conventions" "1.27.0"
     "@opentelemetry/sql-common" "^0.40.1"
     "@types/pg" "8.6.1"
     "@types/pg-pool" "2.0.6"
 
-"@opentelemetry/instrumentation-redis-4@0.42.0":
-  version "0.42.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-redis-4/-/instrumentation-redis-4-0.42.0.tgz#fc01104cfe884c7546385eaae03c57a47edd19d1"
-  integrity sha512-NaD+t2JNcOzX/Qa7kMy68JbmoVIV37fT/fJYzLKu2Wwd+0NCxt+K2OOsOakA8GVg8lSpFdbx4V/suzZZ2Pvdjg==
+"@opentelemetry/instrumentation-redis-4@0.45.0":
+  version "0.45.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-redis-4/-/instrumentation-redis-4-0.45.0.tgz#34115d39f7050b8576344d9e7f7cb8ceebf85067"
+  integrity sha512-Sjgym1xn3mdxPRH5CNZtoz+bFd3E3NlGIu7FoYr4YrQouCc9PbnmoBcmSkEdDy5LYgzNildPgsjx9l0EKNjKTQ==
   dependencies:
-    "@opentelemetry/instrumentation" "^0.53.0"
+    "@opentelemetry/instrumentation" "^0.56.0"
     "@opentelemetry/redis-common" "^0.36.2"
     "@opentelemetry/semantic-conventions" "^1.27.0"
 
-"@opentelemetry/instrumentation-tedious@0.15.0":
-  version "0.15.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-tedious/-/instrumentation-tedious-0.15.0.tgz#da82f4d153fb6ff7d1f85d39872ac40bf9db12ea"
-  integrity sha512-Kb7yo8Zsq2TUwBbmwYgTAMPK0VbhoS8ikJ6Bup9KrDtCx2JC01nCb+M0VJWXt7tl0+5jARUbKWh5jRSoImxdCw==
+"@opentelemetry/instrumentation-tedious@0.17.0":
+  version "0.17.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-tedious/-/instrumentation-tedious-0.17.0.tgz#689b7c87346f11b73488b3aa91661d15e8fa830c"
+  integrity sha512-yRBz2409an03uVd1Q2jWMt3SqwZqRFyKoWYYX3hBAtPDazJ4w5L+1VOij71TKwgZxZZNdDBXImTQjii+VeuzLg==
   dependencies:
-    "@opentelemetry/instrumentation" "^0.54.0"
+    "@opentelemetry/instrumentation" "^0.56.0"
     "@opentelemetry/semantic-conventions" "^1.27.0"
     "@types/tedious" "^4.0.14"
 
-"@opentelemetry/instrumentation-undici@0.6.0":
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-undici/-/instrumentation-undici-0.6.0.tgz#9436ee155c8dcb0b760b66947c0e0f347688a5ef"
-  integrity sha512-ABJBhm5OdhGmbh0S/fOTE4N69IZ00CsHC5ijMYfzbw3E5NwLgpQk5xsljaECrJ8wz1SfXbO03FiSuu5AyRAkvQ==
+"@opentelemetry/instrumentation-undici@0.9.0":
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-undici/-/instrumentation-undici-0.9.0.tgz#c0be1854a90a5002d2345f8bc939d659a9ad76b1"
+  integrity sha512-lxc3cpUZ28CqbrWcUHxGW/ObDpMOYbuxF/ZOzeFZq54P9uJ2Cpa8gcrC9F716mtuiMaekwk8D6n34vg/JtkkxQ==
   dependencies:
     "@opentelemetry/core" "^1.8.0"
-    "@opentelemetry/instrumentation" "^0.53.0"
+    "@opentelemetry/instrumentation" "^0.56.0"
 
-"@opentelemetry/instrumentation@0.53.0", "@opentelemetry/instrumentation@^0.53.0":
-  version "0.53.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation/-/instrumentation-0.53.0.tgz#e6369e4015eb5112468a4d45d38dcada7dad892d"
-  integrity sha512-DMwg0hy4wzf7K73JJtl95m/e0boSoWhH07rfvHvYzQtBD3Bmv0Wc1x733vyZBqmFm8OjJD0/pfiUg1W3JjFX0A==
+"@opentelemetry/instrumentation@0.56.0", "@opentelemetry/instrumentation@^0.56.0":
+  version "0.56.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation/-/instrumentation-0.56.0.tgz#3330ce16d9235a548efa1019a4a7f01414edd44a"
+  integrity sha512-2KkGBKE+FPXU1F0zKww+stnlUxUTlBvLCiWdP63Z9sqXYeNI/ziNzsxAp4LAdUcTQmXjw1IWgvm5CAb/BHy99w==
   dependencies:
-    "@opentelemetry/api-logs" "0.53.0"
+    "@opentelemetry/api-logs" "0.56.0"
     "@types/shimmer" "^1.2.0"
     import-in-the-middle "^1.8.1"
     require-in-the-middle "^7.1.1"
@@ -2366,24 +2410,12 @@
     semver "^7.5.2"
     shimmer "^1.2.1"
 
-"@opentelemetry/instrumentation@^0.54.0":
-  version "0.54.2"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation/-/instrumentation-0.54.2.tgz#29693a33bbaaf0156634ac5d9e774636b8f17f73"
-  integrity sha512-go6zpOVoZVztT9r1aPd79Fr3OWiD4N24bCPJsIKkBses8oyFo12F/Ew3UBTdIu6hsW4HC4MVEJygG6TEyJI/lg==
-  dependencies:
-    "@opentelemetry/api-logs" "0.54.2"
-    "@types/shimmer" "^1.2.0"
-    import-in-the-middle "^1.8.1"
-    require-in-the-middle "^7.1.1"
-    semver "^7.5.2"
-    shimmer "^1.2.1"
-
 "@opentelemetry/redis-common@^0.36.2":
   version "0.36.2"
   resolved "https://registry.yarnpkg.com/@opentelemetry/redis-common/-/redis-common-0.36.2.tgz#906ac8e4d804d4109f3ebd5c224ac988276fdc47"
   integrity sha512-faYX1N0gpLhej/6nyp6bgRjzAKXn5GOEMYY7YhciSfCoITAktLUtQ36d24QEWNA1/WA1y6qQunCe0OhHRkVl9g==
 
-"@opentelemetry/resources@1.26.0", "@opentelemetry/resources@^1.26.0":
+"@opentelemetry/resources@1.26.0":
   version "1.26.0"
   resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-1.26.0.tgz#da4c7366018bd8add1f3aa9c91c6ac59fd503cef"
   integrity sha512-CPNYchBE7MBecCSVy0HKpUISEeJOniWqcHaAHpmasZ3j9o6V3AyBzhRc90jdmemq0HOxDr6ylhUbDhBqqPpeNw==
@@ -2391,7 +2423,15 @@
     "@opentelemetry/core" "1.26.0"
     "@opentelemetry/semantic-conventions" "1.27.0"
 
-"@opentelemetry/sdk-trace-base@^1.22", "@opentelemetry/sdk-trace-base@^1.26.0":
+"@opentelemetry/resources@1.29.0", "@opentelemetry/resources@^1.29.0":
+  version "1.29.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-1.29.0.tgz#d170f39b2ac93d61b53d13dfcd96795181bdc372"
+  integrity sha512-s7mLXuHZE7RQr1wwweGcaRp3Q4UJJ0wazeGlc/N5/XSe6UyXfsh1UQGMADYeg7YwD+cEdMtU1yJAUXdnFzYzyQ==
+  dependencies:
+    "@opentelemetry/core" "1.29.0"
+    "@opentelemetry/semantic-conventions" "1.28.0"
+
+"@opentelemetry/sdk-trace-base@^1.22":
   version "1.26.0"
   resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.26.0.tgz#0c913bc6d2cfafd901de330e4540952269ae579c"
   integrity sha512-olWQldtvbK4v22ymrKLbIcBi9L2SpMO84sCPY54IVsJhP9fRsxJT194C/AVaAuJzLE30EdhhM1VmvVYR7az+cw==
@@ -2400,11 +2440,25 @@
     "@opentelemetry/resources" "1.26.0"
     "@opentelemetry/semantic-conventions" "1.27.0"
 
+"@opentelemetry/sdk-trace-base@^1.29.0":
+  version "1.29.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.29.0.tgz#f48d95dae0e58e601d0596bd2e482122d2688fb8"
+  integrity sha512-hEOpAYLKXF3wGJpXOtWsxEtqBgde0SCv+w+jvr3/UusR4ll3QrENEGnSl1WDCyRrpqOQ5NCNOvZch9UFVa7MnQ==
+  dependencies:
+    "@opentelemetry/core" "1.29.0"
+    "@opentelemetry/resources" "1.29.0"
+    "@opentelemetry/semantic-conventions" "1.28.0"
+
 "@opentelemetry/semantic-conventions@1.27.0", "@opentelemetry/semantic-conventions@^1.27.0":
   version "1.27.0"
   resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.27.0.tgz#1a857dcc95a5ab30122e04417148211e6f945e6c"
   integrity sha512-sAay1RrB+ONOem0OZanAR1ZI/k7yDpnOQSQmTMuGImUQb2y8EbSaCJ94FQluM74xoU03vlb2d2U90hZluL6nQg==
 
+"@opentelemetry/semantic-conventions@1.28.0", "@opentelemetry/semantic-conventions@^1.28.0":
+  version "1.28.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.28.0.tgz#337fb2bca0453d0726696e745f50064411f646d6"
+  integrity sha512-lp4qAiMTD4sNWW4DbKLBkfiMZ4jbAboJIGOQr5DvciMRI494OapieI9qiODpOt0XBr1LjIDy1xAGAnVs5supTA==
+
 "@opentelemetry/sql-common@^0.40.1":
   version "0.40.1"
   resolved "https://registry.yarnpkg.com/@opentelemetry/sql-common/-/sql-common-0.40.1.tgz#93fbc48d8017449f5b3c3274f2268a08af2b83b6"
@@ -3176,23 +3230,19 @@
   resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8"
   integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==
 
-"@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==
+"@sentry-internal/browser-utils@8.43.0":
+  version "8.43.0"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/browser-utils/-/browser-utils-8.43.0.tgz#b064908a537d1cc17d8ddaf0f4c5d712557cbf40"
+  integrity sha512-5WhJZ3SA5sZVDBwOsChDd5JCzYcwBX7sEqBqEcm3pFru6TUihEnFIJmDIbreIyrQMwUhs3dTxnfnidgjr5z1Ag==
   dependencies:
-    "@sentry/core" "8.39.0-beta.0"
-    "@sentry/types" "8.39.0-beta.0"
-    "@sentry/utils" "8.39.0-beta.0"
+    "@sentry/core" "8.43.0"
 
-"@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==
+"@sentry-internal/feedback@8.43.0":
+  version "8.43.0"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-8.43.0.tgz#9477b999c9bca62335eb944a6f7246a96beb0111"
+  integrity sha512-rcGR2kzFu4vLXBQbI9eGJwjyToyjl36O2q/UKbiZBNJ5IFtDvKRLke6jIHq/YqiHPfFGpVtq5M/lYduDfA/eaQ==
   dependencies:
-    "@sentry/core" "8.39.0-beta.0"
-    "@sentry/types" "8.39.0-beta.0"
-    "@sentry/utils" "8.39.0-beta.0"
+    "@sentry/core" "8.43.0"
 
 "@sentry-internal/global-search@^1.0.0":
   version "1.0.0"
@@ -3208,25 +3258,21 @@
     htmlparser2 "^4.1.0"
     title-case "^3.0.2"
 
-"@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==
+"@sentry-internal/replay-canvas@8.43.0":
+  version "8.43.0"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-8.43.0.tgz#f5672a08c9eb588afa0bf36f07b9f5c29b5c9920"
+  integrity sha512-rL8G7E1GtozH8VNalRrBQNjYDJ5ChWS/vpQI5hUG11PZfvQFXEVatLvT3uO2l0xIlHm4idTsHOSLTe/usxnogQ==
   dependencies:
-    "@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.43.0"
+    "@sentry/core" "8.43.0"
 
-"@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==
+"@sentry-internal/replay@8.43.0":
+  version "8.43.0"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/replay/-/replay-8.43.0.tgz#4e2e3844f52b47b16bf816d21857921bbfe85d62"
+  integrity sha512-geV5/zejLfGGwWHjylzrb1w8NI3U37GMG9/53nmv13FmTXUDF5XF2lh41KXFVYwvp7Ha4bd1FRQ9IU9YtBWskw==
   dependencies:
-    "@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/browser-utils" "8.43.0"
+    "@sentry/core" "8.43.0"
 
 "@sentry-internal/rrdom@2.26.0":
   version "2.26.0"
@@ -3275,18 +3321,16 @@
   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-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==
+"@sentry/browser@8.43.0":
+  version "8.43.0"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-8.43.0.tgz#4eec67bc6fb278727304045b612ac392674cade6"
+  integrity sha512-LGvLLnfmR8+AEgFmd7Q7KHiOTiV0P1Lvio2ENDELhEqJOIiICauttibVmig+AW02qg4kMeywvleMsUYaZv2RVA==
   dependencies:
-    "@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-internal/browser-utils" "8.43.0"
+    "@sentry-internal/feedback" "8.43.0"
+    "@sentry-internal/replay" "8.43.0"
+    "@sentry-internal/replay-canvas" "8.43.0"
+    "@sentry/core" "8.43.0"
 
 "@sentry/bundler-plugin-core@2.22.4":
   version "2.22.4"
@@ -3356,92 +3400,81 @@
     "@sentry/cli-win32-i686" "2.36.2"
     "@sentry/cli-win32-x64" "2.36.2"
 
-"@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-beta.0"
-    "@sentry/utils" "8.39.0-beta.0"
+"@sentry/core@8.43.0":
+  version "8.43.0"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-8.43.0.tgz#e96a489e87a9999199f5ac27d8860da37c1fa8b4"
+  integrity sha512-ktyovtjkTMNud+kC/XfqHVCoQKreIKgx/hgeRvzPwuPyd1t1KzYmRL3DBkbcWVnyOPpVTHn+RsEI1eRcVYHtvw==
 
 "@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-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==
+"@sentry/node@8.43.0":
+  version "8.43.0"
+  resolved "https://registry.yarnpkg.com/@sentry/node/-/node-8.43.0.tgz#e7417a6c262f9492f68b522934bb75201b84abe1"
+  integrity sha512-qCQU9vFxf03ejw1h+qWJXCf0erV56HBi5xgi262lHiBLcRtuwj1xjufMVKOWX0sQEvAxzqpMZmqRE64lXLY4Ig==
   dependencies:
     "@opentelemetry/api" "^1.9.0"
-    "@opentelemetry/context-async-hooks" "^1.25.1"
-    "@opentelemetry/core" "^1.25.1"
-    "@opentelemetry/instrumentation" "^0.54.0"
-    "@opentelemetry/instrumentation-amqplib" "^0.43.0"
-    "@opentelemetry/instrumentation-connect" "0.40.0"
-    "@opentelemetry/instrumentation-dataloader" "0.12.0"
-    "@opentelemetry/instrumentation-express" "0.44.0"
-    "@opentelemetry/instrumentation-fastify" "0.41.0"
-    "@opentelemetry/instrumentation-fs" "0.16.0"
-    "@opentelemetry/instrumentation-generic-pool" "0.39.0"
-    "@opentelemetry/instrumentation-graphql" "0.44.0"
-    "@opentelemetry/instrumentation-hapi" "0.41.0"
-    "@opentelemetry/instrumentation-http" "0.53.0"
-    "@opentelemetry/instrumentation-ioredis" "0.43.0"
-    "@opentelemetry/instrumentation-kafkajs" "0.4.0"
-    "@opentelemetry/instrumentation-knex" "0.41.0"
-    "@opentelemetry/instrumentation-koa" "0.43.0"
-    "@opentelemetry/instrumentation-lru-memoizer" "0.40.0"
-    "@opentelemetry/instrumentation-mongodb" "0.48.0"
-    "@opentelemetry/instrumentation-mongoose" "0.42.0"
-    "@opentelemetry/instrumentation-mysql" "0.41.0"
-    "@opentelemetry/instrumentation-mysql2" "0.41.0"
-    "@opentelemetry/instrumentation-nestjs-core" "0.40.0"
-    "@opentelemetry/instrumentation-pg" "0.44.0"
-    "@opentelemetry/instrumentation-redis-4" "0.42.0"
-    "@opentelemetry/instrumentation-tedious" "0.15.0"
-    "@opentelemetry/instrumentation-undici" "0.6.0"
-    "@opentelemetry/resources" "^1.26.0"
-    "@opentelemetry/sdk-trace-base" "^1.26.0"
-    "@opentelemetry/semantic-conventions" "^1.27.0"
+    "@opentelemetry/context-async-hooks" "^1.29.0"
+    "@opentelemetry/core" "^1.29.0"
+    "@opentelemetry/instrumentation" "^0.56.0"
+    "@opentelemetry/instrumentation-amqplib" "^0.45.0"
+    "@opentelemetry/instrumentation-connect" "0.42.0"
+    "@opentelemetry/instrumentation-dataloader" "0.15.0"
+    "@opentelemetry/instrumentation-express" "0.46.0"
+    "@opentelemetry/instrumentation-fastify" "0.43.0"
+    "@opentelemetry/instrumentation-fs" "0.18.0"
+    "@opentelemetry/instrumentation-generic-pool" "0.42.0"
+    "@opentelemetry/instrumentation-graphql" "0.46.0"
+    "@opentelemetry/instrumentation-hapi" "0.44.0"
+    "@opentelemetry/instrumentation-http" "0.56.0"
+    "@opentelemetry/instrumentation-ioredis" "0.46.0"
+    "@opentelemetry/instrumentation-kafkajs" "0.6.0"
+    "@opentelemetry/instrumentation-knex" "0.43.0"
+    "@opentelemetry/instrumentation-koa" "0.46.0"
+    "@opentelemetry/instrumentation-lru-memoizer" "0.43.0"
+    "@opentelemetry/instrumentation-mongodb" "0.50.0"
+    "@opentelemetry/instrumentation-mongoose" "0.45.0"
+    "@opentelemetry/instrumentation-mysql" "0.44.0"
+    "@opentelemetry/instrumentation-mysql2" "0.44.0"
+    "@opentelemetry/instrumentation-nestjs-core" "0.43.0"
+    "@opentelemetry/instrumentation-pg" "0.49.0"
+    "@opentelemetry/instrumentation-redis-4" "0.45.0"
+    "@opentelemetry/instrumentation-tedious" "0.17.0"
+    "@opentelemetry/instrumentation-undici" "0.9.0"
+    "@opentelemetry/resources" "^1.29.0"
+    "@opentelemetry/sdk-trace-base" "^1.29.0"
+    "@opentelemetry/semantic-conventions" "^1.28.0"
     "@prisma/instrumentation" "5.19.1"
-    "@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"
+    "@sentry/core" "8.43.0"
+    "@sentry/opentelemetry" "8.43.0"
     import-in-the-middle "^1.11.2"
 
-"@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==
+"@sentry/opentelemetry@8.43.0":
+  version "8.43.0"
+  resolved "https://registry.yarnpkg.com/@sentry/opentelemetry/-/opentelemetry-8.43.0.tgz#9823a3e4162bf464c12092149fe714ba5e5ba0b9"
+  integrity sha512-Ey+z1+JuMsb+LNY5MddJhjJpCnmkVwGZwoc5T/wWfh+5WKnvZ5RSNwaUl71Ho0lpVhhejwuUtaNxc4Ilk1KjhA==
   dependencies:
-    "@sentry/core" "8.39.0-beta.0"
-    "@sentry/types" "8.39.0-beta.0"
-    "@sentry/utils" "8.39.0-beta.0"
+    "@sentry/core" "8.43.0"
 
-"@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==
+"@sentry/profiling-node@8.43.0":
+  version "8.43.0"
+  resolved "https://registry.yarnpkg.com/@sentry/profiling-node/-/profiling-node-8.43.0.tgz#6461a15ed94a30ed7787dd254d800500a05509ec"
+  integrity sha512-WyPknmDWA1nChFHv22u1k+nC7zo0iGpNLf9JuhpFxD0tAbltiXz414DQE/ISZvtPkDng89dVzKy0FJEAaGg7Dg==
   dependencies:
-    "@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"
+    "@sentry/core" "8.43.0"
+    "@sentry/node" "8.43.0"
     detect-libc "^2.0.2"
     node-abi "^3.61.0"
 
-"@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==
+"@sentry/react@8.43.0":
+  version "8.43.0"
+  resolved "https://registry.yarnpkg.com/@sentry/react/-/react-8.43.0.tgz#ad49bd16b0b1897613ef5cbd2f0a49b2b41f98a9"
+  integrity sha512-PsTzLrYio/FOJU537Y5Gj9jJi7OMHEjdttsC9INUxy5062LOd8ObtHsjE0mopLaSYEwUfSROQOBZCwmISh8ByQ==
   dependencies:
-    "@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"
+    "@sentry/browser" "8.43.0"
+    "@sentry/core" "8.43.0"
     hoist-non-react-statics "^3.3.2"
 
 "@sentry/release-parser@^1.3.1":
@@ -3454,17 +3487,19 @@
   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-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/types@8.43.0":
+  version "8.43.0"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-8.43.0.tgz#abe8ad46e26563260fd66f715a1133c4696d1b8e"
+  integrity sha512-NdTfD3S+od4RTw7xn+4sVSO5n63N/9pUsNT5s0D1QiGGZw0DpENoIb3J/PiGfuWL5f02Bmv7l9vVW0ovWZDWPg==
+  dependencies:
+    "@sentry/core" "8.43.0"
 
-"@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==
+"@sentry/utils@8.43.0":
+  version "8.43.0"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-8.43.0.tgz#d9ec0ceeea59116bf573a006b2b34229f6420e90"
+  integrity sha512-z7wD8OgRSn7R9n0kSPo/TTBrPXyNmIivQMqMHhXGOOtA9VfHJ7advkn0eQ5Ohq9/euiDDYWG3AUo+nO4rh4nCA==
   dependencies:
-    "@sentry/types" "8.39.0-beta.0"
+    "@sentry/core" "8.43.0"
 
 "@sentry/webpack-plugin@^2.22.4":
   version "2.22.4"
@@ -3779,7 +3814,7 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
   integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
 
-"@types/estree@^1.0.5":
+"@types/estree@^1.0.5", "@types/estree@^1.0.6":
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50"
   integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==
@@ -3912,7 +3947,7 @@
     "@types/tough-cookie" "*"
     parse5 "^7.0.0"
 
-"@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+"@types/json-schema@^7.0.15", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.15"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
   integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
@@ -4215,16 +4250,16 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/eslint-plugin@^8.8.1":
-  version "8.8.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.8.1.tgz#9364b756d4d78bcbdf6fd3e9345e6924c68ad371"
-  integrity sha512-xfvdgA8AP/vxHgtgU310+WBnLB4uJQ9XdyP17RebG26rLtDrQJV3ZYrcopX91GrHmMoH8bdSwMRh2a//TiJ1jQ==
+"@typescript-eslint/eslint-plugin@8.18.2":
+  version "8.18.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.18.2.tgz#c78e363ab5fe3b21dd1c90d8be9581534417f78e"
+  integrity sha512-adig4SzPLjeQ0Tm+jvsozSGiCliI2ajeURDGHjZ2llnA+A67HihCQ+a3amtPhUakd1GlwHxSRvzOZktbEvhPPg==
   dependencies:
     "@eslint-community/regexpp" "^4.10.0"
-    "@typescript-eslint/scope-manager" "8.8.1"
-    "@typescript-eslint/type-utils" "8.8.1"
-    "@typescript-eslint/utils" "8.8.1"
-    "@typescript-eslint/visitor-keys" "8.8.1"
+    "@typescript-eslint/scope-manager" "8.18.2"
+    "@typescript-eslint/type-utils" "8.18.2"
+    "@typescript-eslint/utils" "8.18.2"
+    "@typescript-eslint/visitor-keys" "8.18.2"
     graphemer "^1.4.0"
     ignore "^5.3.1"
     natural-compare "^1.4.0"
@@ -4237,15 +4272,15 @@
   dependencies:
     "@typescript-eslint/utils" "5.62.0"
 
-"@typescript-eslint/parser@^8.8.1":
-  version "8.8.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.8.1.tgz#5952ba2a83bd52024b872f3fdc8ed2d3636073b8"
-  integrity sha512-hQUVn2Lij2NAxVFEdvIGxT9gP1tq2yM83m+by3whWFsWC+1y8pxxxHUFE1UqDu2VsGi2i6RLcv4QvouM84U+ow==
+"@typescript-eslint/parser@8.18.2":
+  version "8.18.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.18.2.tgz#0379a2e881d51d8fcf7ebdfa0dd18eee79182ce2"
+  integrity sha512-y7tcq4StgxQD4mDr9+Jb26dZ+HTZ/SkfqpXSiqeUXZHxOUyjWDKsmwKhJ0/tApR08DgOhrFAoAhyB80/p3ViuA==
   dependencies:
-    "@typescript-eslint/scope-manager" "8.8.1"
-    "@typescript-eslint/types" "8.8.1"
-    "@typescript-eslint/typescript-estree" "8.8.1"
-    "@typescript-eslint/visitor-keys" "8.8.1"
+    "@typescript-eslint/scope-manager" "8.18.2"
+    "@typescript-eslint/types" "8.18.2"
+    "@typescript-eslint/typescript-estree" "8.18.2"
+    "@typescript-eslint/visitor-keys" "8.18.2"
     debug "^4.3.4"
 
 "@typescript-eslint/scope-manager@5.62.0":
@@ -4256,29 +4291,21 @@
     "@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==
+"@typescript-eslint/scope-manager@8.18.2", "@typescript-eslint/scope-manager@^8.15.0":
+  version "8.18.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.18.2.tgz#d193c200d61eb0ddec5987c8e48c9d4e1c0510bd"
+  integrity sha512-YJFSfbd0CJjy14r/EvWapYgV4R5CHzptssoag2M7y3Ra7XNta6GPAJPPP5KGB9j14viYXyrzRO5GkX7CRfo8/g==
   dependencies:
-    "@typescript-eslint/types" "8.15.0"
-    "@typescript-eslint/visitor-keys" "8.15.0"
+    "@typescript-eslint/types" "8.18.2"
+    "@typescript-eslint/visitor-keys" "8.18.2"
 
-"@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"
-  integrity sha512-X4JdU+66Mazev/J0gfXlcC/dV6JI37h+93W9BRYXrSn0hrE64IoWgVkO9MSJgEzoWkxONgaQpICWg8vAN74wlA==
+"@typescript-eslint/type-utils@8.18.2":
+  version "8.18.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.18.2.tgz#5ad07e09002eee237591881df674c1c0c91ca52f"
+  integrity sha512-AB/Wr1Lz31bzHfGm/jgbFR0VB0SML/hd2P1yxzKDM48YmP7vbyJNHRExUE/wZsQj2wUCvbWH8poNHFuxLqCTnA==
   dependencies:
-    "@typescript-eslint/types" "8.8.1"
-    "@typescript-eslint/visitor-keys" "8.8.1"
-
-"@typescript-eslint/type-utils@8.8.1":
-  version "8.8.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.8.1.tgz#31f59ec46e93a02b409fb4d406a368a59fad306e"
-  integrity sha512-qSVnpcbLP8CALORf0za+vjLYj1Wp8HSoiI8zYU5tHxRVj30702Z1Yw4cLwfNKhTPWp5+P+k1pjmD5Zd1nhxiZA==
-  dependencies:
-    "@typescript-eslint/typescript-estree" "8.8.1"
-    "@typescript-eslint/utils" "8.8.1"
+    "@typescript-eslint/typescript-estree" "8.18.2"
+    "@typescript-eslint/utils" "8.18.2"
     debug "^4.3.4"
     ts-api-utils "^1.3.0"
 
@@ -4287,15 +4314,10 @@
   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"
-  integrity sha512-WCcTP4SDXzMd23N27u66zTKMuEevH4uzU8C9jf0RO4E04yVHgQgW+r+TeVTNnO1KIfrL8ebgVVYYMMO3+jC55Q==
+"@typescript-eslint/types@8.18.2":
+  version "8.18.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.18.2.tgz#5ebad5b384c8aa1c0f86cee1c61bcdbe7511f547"
+  integrity sha512-Z/zblEPp8cIvmEn6+tPDIHUbRu/0z5lqZ+NvolL5SvXWT5rQy7+Nch83M0++XzO0XrWRFWECgOAyE8bsJTl1GQ==
 
 "@typescript-eslint/typescript-estree@5.62.0":
   version "5.62.0"
@@ -4310,27 +4332,13 @@
     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"
-  integrity sha512-A5d1R9p+X+1js4JogdNilDuuq+EHZdsH9MjTVxXOdVFfTJXunKJR/v+fNNyO4TnoOn5HqobzfRlc70NC6HTcdg==
+"@typescript-eslint/typescript-estree@8.18.2":
+  version "8.18.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.18.2.tgz#fffb85527f8304e29bfbbdc712f4515da9f8b47c"
+  integrity sha512-WXAVt595HjpmlfH4crSdM/1bcsqh+1weFRWIa9XMTx/XHZ9TCKMcr725tLYqWOgzKdeDrqVHxFotrvWcEsk2Tg==
   dependencies:
-    "@typescript-eslint/types" "8.8.1"
-    "@typescript-eslint/visitor-keys" "8.8.1"
+    "@typescript-eslint/types" "8.18.2"
+    "@typescript-eslint/visitor-keys" "8.18.2"
     debug "^4.3.4"
     fast-glob "^3.3.2"
     is-glob "^4.0.3"
@@ -4338,7 +4346,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.62.0":
+"@typescript-eslint/utils@5.62.0", "@typescript-eslint/utils@^5.25.0":
   version "5.62.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86"
   integrity sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==
@@ -4352,25 +4360,15 @@
     eslint-scope "^5.1.1"
     semver "^7.3.7"
 
-"@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==
-  dependencies:
-    "@eslint-community/eslint-utils" "^4.4.0"
-    "@typescript-eslint/scope-manager" "8.8.1"
-    "@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==
+"@typescript-eslint/utils@8.18.2", "@typescript-eslint/utils@^6.0.0 || ^7.0.0 || ^8.0.0", "@typescript-eslint/utils@^8.15.0":
+  version "8.18.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.18.2.tgz#a2635f71904a84f9e47fe1b6f65a6d944ff1adf9"
+  integrity sha512-Cr4A0H7DtVIPkauj4sTSXVl+VBWewE9/o40KcF3TV9aqDEOWoXF3/+oRXNby3DYzZeCATvbdksYsGZzplwnK/Q==
   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/scope-manager" "8.18.2"
+    "@typescript-eslint/types" "8.18.2"
+    "@typescript-eslint/typescript-estree" "8.18.2"
 
 "@typescript-eslint/visitor-keys@5.62.0":
   version "5.62.0"
@@ -4380,27 +4378,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==
+"@typescript-eslint/visitor-keys@8.18.2":
+  version "8.18.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.18.2.tgz#b3e434b701f086b10a7c82416ebc56899d27ef2f"
+  integrity sha512-zORcwn4C3trOWiCqFQP1x6G3xTRyZ1LYydnj51cRnJ6hxBlr/cKPckk+PKPUw/fXmvfKTcw7bwY3w9izgx5jZw==
   dependencies:
-    "@typescript-eslint/types" "8.15.0"
+    "@typescript-eslint/types" "8.18.2"
     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"
-  integrity sha512-0/TdC3aeRAsW7MDvYRwEc1Uwm0TIBfzjPFgg60UU2Haj5qsCs9cc3zNgY71edqE3LbWfF/WoZQd3lJoDXFQpag==
-  dependencies:
-    "@typescript-eslint/types" "8.8.1"
-    eslint-visitor-keys "^3.4.3"
-
-"@ungap/structured-clone@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
-  integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
-
 "@vscode/emmet-helper@^2.9.2":
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/@vscode/emmet-helper/-/emmet-helper-2.10.0.tgz#a0add01dddce3e07b3f4169b559067096203263a"
@@ -4616,11 +4601,16 @@ acorn-walk@8.3.4, acorn-walk@^8.0.0, acorn-walk@^8.0.2, acorn-walk@^8.1.1:
   dependencies:
     acorn "^8.11.0"
 
-acorn@^8.0.4, acorn@^8.1.0, acorn@^8.10.0, acorn@^8.11.0, acorn@^8.12.1, acorn@^8.4.1, acorn@^8.7.1, acorn@^8.8.0, acorn@^8.8.1, acorn@^8.8.2, acorn@^8.9.0:
+acorn@^8.0.4, acorn@^8.1.0, acorn@^8.10.0, acorn@^8.11.0, acorn@^8.12.1, acorn@^8.4.1, acorn@^8.7.1, acorn@^8.8.0, acorn@^8.8.1, acorn@^8.8.2:
   version "8.13.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.13.0.tgz#2a30d670818ad16ddd6a35d3842dacec9e5d7ca3"
   integrity sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w==
 
+acorn@^8.14.0:
+  version "8.14.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.14.0.tgz#063e2c70cac5fb4f6467f0b11152e04c682795b0"
+  integrity sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==
+
 agent-base@6:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
@@ -4788,13 +4778,13 @@ aria-query@5.3.0, aria-query@^5.0.0:
   dependencies:
     dequal "^2.0.3"
 
-array-buffer-byte-length@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz#1e5583ec16763540a27ae52eed99ff899223568f"
-  integrity sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==
+array-buffer-byte-length@^1.0.1, array-buffer-byte-length@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz#384d12a37295aec3769ab022ad323a18a51ccf8b"
+  integrity sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==
   dependencies:
-    call-bind "^1.0.5"
-    is-array-buffer "^3.0.4"
+    call-bound "^1.0.3"
+    is-array-buffer "^3.0.5"
 
 array-flatten@1.1.1:
   version "1.1.1"
@@ -4843,24 +4833,24 @@ array.prototype.findlastindex@^1.2.5:
     es-shim-unscopables "^1.0.2"
 
 array.prototype.flat@^1.3.1, array.prototype.flat@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz#1476217df8cff17d72ee8f3ba06738db5b387d18"
-  integrity sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz#534aaf9e6e8dd79fb6b9a9917f839ef1ec63afe5"
+  integrity sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-    es-shim-unscopables "^1.0.0"
+    call-bind "^1.0.8"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.5"
+    es-shim-unscopables "^1.0.2"
 
-array.prototype.flatmap@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz#c9a7c6831db8e719d6ce639190146c24bbd3e527"
-  integrity sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==
+array.prototype.flatmap@^1.3.2, array.prototype.flatmap@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz#712cc792ae70370ae40586264629e33aab5dd38b"
+  integrity sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-    es-shim-unscopables "^1.0.0"
+    call-bind "^1.0.8"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.5"
+    es-shim-unscopables "^1.0.2"
 
 array.prototype.tosorted@^1.1.4:
   version "1.1.4"
@@ -4873,19 +4863,18 @@ array.prototype.tosorted@^1.1.4:
     es-errors "^1.3.0"
     es-shim-unscopables "^1.0.2"
 
-arraybuffer.prototype.slice@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz#097972f4255e41bc3425e37dc3f6421cf9aefde6"
-  integrity sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==
+arraybuffer.prototype.slice@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz#9d760d84dbdd06d0cbf92c8849615a1a7ab3183c"
+  integrity sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==
   dependencies:
     array-buffer-byte-length "^1.0.1"
-    call-bind "^1.0.5"
+    call-bind "^1.0.8"
     define-properties "^1.2.1"
-    es-abstract "^1.22.3"
-    es-errors "^1.2.1"
-    get-intrinsic "^1.2.3"
+    es-abstract "^1.23.5"
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.6"
     is-array-buffer "^3.0.4"
-    is-shared-array-buffer "^1.0.2"
 
 astral-regex@^2.0.0:
   version "2.0.0"
@@ -5138,7 +5127,7 @@ braces@^3.0.3, braces@~3.0.2:
   dependencies:
     fill-range "^7.1.1"
 
-browserslist@^4.0.0, browserslist@^4.18.1, browserslist@^4.21.10, browserslist@^4.22.2, browserslist@^4.23.3, browserslist@^4.24.0:
+browserslist@^4.0.0, browserslist@^4.21.10, browserslist@^4.22.2, browserslist@^4.23.3, browserslist@^4.24.0:
   version "4.24.2"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.2.tgz#f5845bc91069dbd55ee89faf9822e1d885d16580"
   integrity sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==
@@ -5185,7 +5174,15 @@ bytes@3.1.2:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
   integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
 
-call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.6, call-bind@^1.0.7:
+call-bind-apply-helpers@^1.0.0, call-bind-apply-helpers@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz#32e5892e6361b29b0b545ba6f7763378daca2840"
+  integrity sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==
+  dependencies:
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+
+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==
@@ -5196,6 +5193,24 @@ call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.6, call-bind@^1.0.7:
     get-intrinsic "^1.2.4"
     set-function-length "^1.2.1"
 
+call-bind@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.8.tgz#0736a9660f537e3388826f440d5ec45f744eaa4c"
+  integrity sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==
+  dependencies:
+    call-bind-apply-helpers "^1.0.0"
+    es-define-property "^1.0.0"
+    get-intrinsic "^1.2.4"
+    set-function-length "^1.2.2"
+
+call-bound@^1.0.2, call-bound@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/call-bound/-/call-bound-1.0.3.tgz#41cfd032b593e39176a71533ab4f384aa04fd681"
+  integrity sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==
+  dependencies:
+    call-bind-apply-helpers "^1.0.1"
+    get-intrinsic "^1.2.6"
+
 callsites@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
@@ -5234,11 +5249,6 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001669:
   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"
@@ -5651,7 +5661,7 @@ cross-fetch@^3.0.4:
   dependencies:
     node-fetch "^2.6.12"
 
-cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
+cross-spawn@^7.0.0, cross-spawn@^7.0.3, cross-spawn@^7.0.6:
   version "7.0.6"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
   integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
@@ -5854,30 +5864,30 @@ data-urls@^3.0.2:
     whatwg-mimetype "^3.0.0"
     whatwg-url "^11.0.0"
 
-data-view-buffer@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/data-view-buffer/-/data-view-buffer-1.0.1.tgz#8ea6326efec17a2e42620696e671d7d5a8bc66b2"
-  integrity sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==
+data-view-buffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/data-view-buffer/-/data-view-buffer-1.0.2.tgz#211a03ba95ecaf7798a8c7198d79536211f88570"
+  integrity sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==
   dependencies:
-    call-bind "^1.0.6"
+    call-bound "^1.0.3"
     es-errors "^1.3.0"
-    is-data-view "^1.0.1"
+    is-data-view "^1.0.2"
 
-data-view-byte-length@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz#90721ca95ff280677eb793749fce1011347669e2"
-  integrity sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==
+data-view-byte-length@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz#9e80f7ca52453ce3e93d25a35318767ea7704735"
+  integrity sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==
   dependencies:
-    call-bind "^1.0.7"
+    call-bound "^1.0.3"
     es-errors "^1.3.0"
-    is-data-view "^1.0.1"
+    is-data-view "^1.0.2"
 
-data-view-byte-offset@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz#5e0bbfb4828ed2d1b9b400cd8a7d119bca0ff18a"
-  integrity sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==
+data-view-byte-offset@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz#068307f9b71ab76dbbe10291389e020856606191"
+  integrity sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==
   dependencies:
-    call-bind "^1.0.6"
+    call-bound "^1.0.2"
     es-errors "^1.3.0"
     is-data-view "^1.0.1"
 
@@ -5903,7 +5913,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.7, 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.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==
@@ -5917,6 +5927,13 @@ debug@^3.2.6, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
+debug@^4.3.2, debug@^4.3.4:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a"
+  integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==
+  dependencies:
+    ms "^2.1.3"
+
 decimal.js@^10.4.1:
   version "10.4.2"
   resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.2.tgz#0341651d1d997d86065a2ce3a441fbd0d8e8b98e"
@@ -5981,7 +5998,7 @@ define-lazy-prop@^3.0.0:
   resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz#dbb19adfb746d7fc6d734a06b72f4a00d021255f"
   integrity sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==
 
-define-properties@^1.1.3, define-properties@^1.2.0, define-properties@^1.2.1:
+define-properties@^1.1.3, define-properties@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
   integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==
@@ -6076,13 +6093,6 @@ doctrine@^2.1.0:
   dependencies:
     esutils "^2.0.2"
 
-doctrine@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
-  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
-  dependencies:
-    esutils "^2.0.2"
-
 dom-accessibility-api@^0.5.9:
   version "0.5.16"
   resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz#5a7429e6066eb3664d911e33fb0e45de8eb08453"
@@ -6200,6 +6210,15 @@ downsample@1.4.0:
   resolved "https://registry.yarnpkg.com/downsample/-/downsample-1.4.0.tgz#f7500318efd5d979641d45fe49cd2dc8d7cb9397"
   integrity sha512-teYPhUPxqwtyICt47t1mP/LjhbRV/ghuKb/LmFDbcZ0CjqFD31tn6rVLZoeCEa1xr8+f2skW8UjRiLiGIKQE4w==
 
+dunder-proto@^1.0.0, dunder-proto@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a"
+  integrity sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==
+  dependencies:
+    call-bind-apply-helpers "^1.0.1"
+    es-errors "^1.3.0"
+    gopd "^1.2.0"
+
 duplexer@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
@@ -6320,7 +6339,15 @@ enhanced-resolve@5.12.0:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
-enhanced-resolve@^5.15.0, enhanced-resolve@^5.17.1:
+enhanced-resolve@^5.15.0:
+  version "5.18.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.18.0.tgz#91eb1db193896b9801251eeff1c6980278b1e404"
+  integrity sha512-0/r0MySGYG8YqlayBZ6MuCfECmHFdJ5qyPh8s8wa5Hnm6SaFLSK1VYCbj+NKp090Nm1caZhD+QTnmxO7esYGyQ==
+  dependencies:
+    graceful-fs "^4.2.4"
+    tapable "^2.2.0"
+
+enhanced-resolve@^5.17.1:
   version "5.17.1"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15"
   integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==
@@ -6369,57 +6396,58 @@ error-stack-parser@^2.0.6:
   dependencies:
     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.5"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.5.tgz#f4599a4946d57ed467515ed10e4f157289cd52fb"
-  integrity sha512-vlmniQ0WNPwXqA0BnmwV3Ng7HxiGlh6r5U6JcTMNx8OilcAGqVJBHJcPjqOMaczU9fRuRK5Px2BdVyPRnKMMVQ==
+es-abstract@^1.17.5, es-abstract@^1.23.2, es-abstract@^1.23.3, es-abstract@^1.23.5, es-abstract@^1.23.6:
+  version "1.23.7"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.7.tgz#36e3da46fdb0d2ae3b9df4235e3a3167c1605b36"
+  integrity sha512-OygGC8kIcDhXX+6yAZRGLqwi2CmEXCbLQixeGUgYeR+Qwlppqmo7DIDr8XibtEBZp+fJcoYpoatp5qwLMEdcqQ==
   dependencies:
-    array-buffer-byte-length "^1.0.1"
-    arraybuffer.prototype.slice "^1.0.3"
+    array-buffer-byte-length "^1.0.2"
+    arraybuffer.prototype.slice "^1.0.4"
     available-typed-arrays "^1.0.7"
-    call-bind "^1.0.7"
-    data-view-buffer "^1.0.1"
-    data-view-byte-length "^1.0.1"
-    data-view-byte-offset "^1.0.0"
-    es-define-property "^1.0.0"
+    call-bind "^1.0.8"
+    call-bound "^1.0.3"
+    data-view-buffer "^1.0.2"
+    data-view-byte-length "^1.0.2"
+    data-view-byte-offset "^1.0.1"
+    es-define-property "^1.0.1"
     es-errors "^1.3.0"
     es-object-atoms "^1.0.0"
     es-set-tostringtag "^2.0.3"
-    es-to-primitive "^1.2.1"
-    function.prototype.name "^1.1.6"
-    get-intrinsic "^1.2.4"
-    get-symbol-description "^1.0.2"
+    es-to-primitive "^1.3.0"
+    function.prototype.name "^1.1.8"
+    get-intrinsic "^1.2.6"
+    get-symbol-description "^1.1.0"
     globalthis "^1.0.4"
-    gopd "^1.0.1"
+    gopd "^1.2.0"
     has-property-descriptors "^1.0.2"
-    has-proto "^1.0.3"
-    has-symbols "^1.0.3"
+    has-proto "^1.2.0"
+    has-symbols "^1.1.0"
     hasown "^2.0.2"
-    internal-slot "^1.0.7"
-    is-array-buffer "^3.0.4"
+    internal-slot "^1.1.0"
+    is-array-buffer "^3.0.5"
     is-callable "^1.2.7"
-    is-data-view "^1.0.1"
-    is-negative-zero "^2.0.3"
-    is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.3"
-    is-string "^1.0.7"
-    is-typed-array "^1.1.13"
-    is-weakref "^1.0.2"
+    is-data-view "^1.0.2"
+    is-regex "^1.2.1"
+    is-shared-array-buffer "^1.0.4"
+    is-string "^1.1.1"
+    is-typed-array "^1.1.15"
+    is-weakref "^1.1.0"
+    math-intrinsics "^1.1.0"
     object-inspect "^1.13.3"
     object-keys "^1.1.1"
-    object.assign "^4.1.5"
+    object.assign "^4.1.7"
     regexp.prototype.flags "^1.5.3"
-    safe-array-concat "^1.1.2"
-    safe-regex-test "^1.0.3"
-    string.prototype.trim "^1.2.9"
-    string.prototype.trimend "^1.0.8"
+    safe-array-concat "^1.1.3"
+    safe-regex-test "^1.1.0"
+    string.prototype.trim "^1.2.10"
+    string.prototype.trimend "^1.0.9"
     string.prototype.trimstart "^1.0.8"
-    typed-array-buffer "^1.0.2"
-    typed-array-byte-length "^1.0.1"
-    typed-array-byte-offset "^1.0.2"
-    typed-array-length "^1.0.6"
-    unbox-primitive "^1.0.2"
-    which-typed-array "^1.1.15"
+    typed-array-buffer "^1.0.3"
+    typed-array-byte-length "^1.0.3"
+    typed-array-byte-offset "^1.0.4"
+    typed-array-length "^1.0.7"
+    unbox-primitive "^1.1.0"
+    which-typed-array "^1.1.18"
 
 es-define-property@^1.0.0:
   version "1.0.0"
@@ -6428,31 +6456,37 @@ es-define-property@^1.0.0:
   dependencies:
     get-intrinsic "^1.2.4"
 
-es-errors@^1.2.1, es-errors@^1.3.0:
+es-define-property@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa"
+  integrity sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==
+
+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==
 
-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==
+es-iterator-helpers@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.2.1.tgz#d1dd0f58129054c0ad922e6a9a1e65eef435fe75"
+  integrity sha512-uDn+FE1yrDzyC0pCo961B2IHbdM8y/ACZsKD4dG6WqrjV53BADjwa7D+1aom2rsNVfLyDgU/eigvlJGJ08OQ4w==
   dependencies:
-    call-bind "^1.0.7"
+    call-bind "^1.0.8"
+    call-bound "^1.0.3"
     define-properties "^1.2.1"
-    es-abstract "^1.23.3"
+    es-abstract "^1.23.6"
     es-errors "^1.3.0"
     es-set-tostringtag "^2.0.3"
     function-bind "^1.1.2"
-    get-intrinsic "^1.2.4"
+    get-intrinsic "^1.2.6"
     globalthis "^1.0.4"
-    gopd "^1.0.1"
+    gopd "^1.2.0"
     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.3"
-    safe-array-concat "^1.1.2"
+    has-proto "^1.2.0"
+    has-symbols "^1.1.0"
+    internal-slot "^1.1.0"
+    iterator.prototype "^1.1.4"
+    safe-array-concat "^1.1.3"
 
 es-module-lexer@^1.2.1:
   version "1.5.4"
@@ -6475,21 +6509,21 @@ es-set-tostringtag@^2.0.3:
     has-tostringtag "^1.0.2"
     hasown "^2.0.1"
 
-es-shim-unscopables@^1.0.0, es-shim-unscopables@^1.0.2:
+es-shim-unscopables@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz#1f6942e71ecc7835ed1c8a83006d8771a63a3763"
   integrity sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==
   dependencies:
     hasown "^2.0.0"
 
-es-to-primitive@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
-  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
+es-to-primitive@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.3.0.tgz#96c89c82cc49fd8794a24835ba3e1ff87f214e18"
+  integrity sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==
   dependencies:
-    is-callable "^1.1.4"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.2"
+    is-callable "^1.2.7"
+    is-date-object "^1.0.5"
+    is-symbol "^1.0.4"
 
 esbuild@^0.23.0:
   version "0.23.0"
@@ -6563,6 +6597,11 @@ escodegen@^2.0.0:
   optionalDependencies:
     source-map "~0.6.1"
 
+eslint-config-prettier@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz#31af3d94578645966c082fcb71a5846d3c94867f"
+  integrity sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==
+
 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"
@@ -6572,21 +6611,21 @@ eslint-import-resolver-node@^0.3.9:
     is-core-module "^2.13.0"
     resolve "^1.22.4"
 
-eslint-import-resolver-typescript@^3.6.3:
-  version "3.6.3"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.6.3.tgz#bb8e388f6afc0f940ce5d2c5fd4a3d147f038d9e"
-  integrity sha512-ud9aw4szY9cCT1EWWdGv1L1XR6hh2PaRWif0j2QjQ0pgTY/69iw+W0Z4qZv5wHahOl8isEr+k/JnyAqNQkLkIA==
+eslint-import-resolver-typescript@^3.7.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.7.0.tgz#e69925936a771a9cb2de418ccebc4cdf6c0818aa"
+  integrity sha512-Vrwyi8HHxY97K5ebydMtffsWAn1SCR9eol49eCd5fJS4O1WV7PaAjbcjmbfJJSMz/t4Mal212Uz/fQZrOB8mow==
   dependencies:
     "@nolyfill/is-core-module" "1.0.39"
-    debug "^4.3.5"
+    debug "^4.3.7"
     enhanced-resolve "^5.15.0"
-    eslint-module-utils "^2.8.1"
     fast-glob "^3.3.2"
     get-tsconfig "^4.7.5"
     is-bun-module "^1.0.2"
     is-glob "^4.0.3"
+    stable-hash "^0.0.4"
 
-eslint-module-utils@^2.12.0, eslint-module-utils@^2.8.1:
+eslint-module-utils@^2.12.0:
   version "2.12.0"
   resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz#fe4cfb948d61f49203d7b08871982b65b9af0b0b"
   integrity sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==
@@ -6618,7 +6657,7 @@ eslint-plugin-import@^2.31.0:
     string.prototype.trimend "^1.0.8"
     tsconfig-paths "^3.15.0"
 
-eslint-plugin-jest-dom@^5.4.0:
+eslint-plugin-jest-dom@^5.5.0:
   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==
@@ -6626,48 +6665,40 @@ eslint-plugin-jest-dom@^5.4.0:
     "@babel/runtime" "^7.16.3"
     requireindex "^1.2.0"
 
-eslint-plugin-jest@^28.8.3:
-  version "28.9.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-28.9.0.tgz#19168dfaed124339cd2252c4c4d1ac3688aeb243"
-  integrity sha512-rLu1s1Wf96TgUUxSw6loVIkNtUjq1Re7A9QdCCHSohnvXEBAjuL420h0T/fMmkQlNsQP2GhQzEUpYHPfxBkvYQ==
+eslint-plugin-jest@^28.10.0:
+  version "28.10.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-28.10.0.tgz#4b35b8abb0f7cfe699bff8d9060270a2ddd770ea"
+  integrity sha512-hyMWUxkBH99HpXT3p8hc7REbEZK3D+nk8vHXGgpB+XXsi0gO4PxMSP+pjfUzb67GnV9yawV9a53eUmcde1CCZA==
   dependencies:
     "@typescript-eslint/utils" "^6.0.0 || ^7.0.0 || ^8.0.0"
 
-eslint-plugin-no-lookahead-lookbehind-regexp@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-no-lookahead-lookbehind-regexp/-/eslint-plugin-no-lookahead-lookbehind-regexp-0.1.0.tgz#d1d920e152c57e9df5fd5623d5d64be9bfbc3622"
-  integrity sha512-1wWLRhw72doON551LRu3hfPuSzQ5FWr+s3zqsJRO3opvQbiQfJwst07SvGSukI1HhZ6+4o235Ry6V5AXJv8eNg==
-  dependencies:
-    browserslist "^4.18.1"
-    caniuse-lite "^1.0.30001283"
-
-eslint-plugin-react-hooks@^4.6.2:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz#c829eb06c0e6f484b3fbb85a97e57784f328c596"
-  integrity sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==
+eslint-plugin-react-hooks@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-5.0.0.tgz#72e2eefbac4b694f5324154619fee44f5f60f101"
+  integrity sha512-hIOwI+5hYGpJEc4uPRmz2ulCjAGD/N13Lukkh8cLV0i2IRk/bdZDYjgLVHj+U9Z704kLIdIO6iueGvxNur0sgw==
 
-eslint-plugin-react@^7.37.1:
-  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==
+eslint-plugin-react@^7.37.3:
+  version "7.37.3"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.37.3.tgz#567549e9251533975c4ea9706f986c3a64832031"
+  integrity sha512-DomWuTQPFYZwF/7c9W2fkKkStqZmBd3uugfqBYLdkZ3Hii23WzZuOLUskGxB8qkSKqftxEeGL1TB2kMhrce0jA==
   dependencies:
     array-includes "^3.1.8"
     array.prototype.findlast "^1.2.5"
-    array.prototype.flatmap "^1.3.2"
+    array.prototype.flatmap "^1.3.3"
     array.prototype.tosorted "^1.1.4"
     doctrine "^2.1.0"
-    es-iterator-helpers "^1.1.0"
+    es-iterator-helpers "^1.2.1"
     estraverse "^5.3.0"
     hasown "^2.0.2"
     jsx-ast-utils "^2.4.1 || ^3.0.0"
     minimatch "^3.1.2"
     object.entries "^1.1.8"
     object.fromentries "^2.0.8"
-    object.values "^1.2.0"
+    object.values "^1.2.1"
     prop-types "^15.8.1"
     resolve "^2.0.0-next.5"
     semver "^6.3.1"
-    string.prototype.matchall "^4.0.11"
+    string.prototype.matchall "^4.0.12"
     string.prototype.repeat "^1.0.0"
 
 eslint-plugin-sentry@^2.10.0:
@@ -6682,12 +6713,13 @@ eslint-plugin-simple-import-sort@^12.1.1:
   resolved "https://registry.yarnpkg.com/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-12.1.1.tgz#e64bfdaf91c5b98a298619aa634a9f7aa43b709e"
   integrity sha512-6nuzu4xwQtE3332Uz0to+TxDQYRLTKRESSc2hefVT48Zc8JthmN23Gx9lnYhu0FtkRSL1oxny3kJ2aveVhmOVA==
 
-eslint-plugin-testing-library@^6.3.0:
-  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==
+eslint-plugin-testing-library@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-testing-library/-/eslint-plugin-testing-library-7.1.1.tgz#df834e821e53fa81c1eb1fad5a0d9ba4c510f9ea"
+  integrity sha512-nszC833aZPwB6tik1nMkbFqmtgIXTT0sfJEYs0zMBKMlkQ4to2079yUV96SvmLh00ovSBJI4pgcBC1TiIP8mXg==
   dependencies:
-    "@typescript-eslint/utils" "^5.62.0"
+    "@typescript-eslint/scope-manager" "^8.15.0"
+    "@typescript-eslint/utils" "^8.15.0"
 
 eslint-plugin-typescript-sort-keys@^3.3.0:
   version "3.3.0"
@@ -6706,15 +6738,15 @@ eslint-scope@5.1.1, eslint-scope@^5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-scope@^7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
-  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
+eslint-scope@^8.2.0:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-8.2.0.tgz#377aa6f1cb5dc7592cfd0b7f892fd0cf352ce442"
+  integrity sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==
   dependencies:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
 
-eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.3:
   version "3.4.3"
   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==
@@ -6724,68 +6756,64 @@ eslint-visitor-keys@^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"
-  integrity sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==
+eslint@^9.17.0:
+  version "9.17.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.17.0.tgz#faa1facb5dd042172fdc520106984b5c2421bb0c"
+  integrity sha512-evtlNcpJg+cZLcnVKwsai8fExnqjGPicK7gnUtlNuzu+Fv9bI0aLpND5T44VLQtoMEnI57LoXO9XAkIXwohKrA==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
-    "@eslint-community/regexpp" "^4.6.1"
-    "@eslint/eslintrc" "^2.1.4"
-    "@eslint/js" "8.57.1"
-    "@humanwhocodes/config-array" "^0.13.0"
+    "@eslint-community/regexpp" "^4.12.1"
+    "@eslint/config-array" "^0.19.0"
+    "@eslint/core" "^0.9.0"
+    "@eslint/eslintrc" "^3.2.0"
+    "@eslint/js" "9.17.0"
+    "@eslint/plugin-kit" "^0.2.3"
+    "@humanfs/node" "^0.16.6"
     "@humanwhocodes/module-importer" "^1.0.1"
-    "@nodelib/fs.walk" "^1.2.8"
-    "@ungap/structured-clone" "^1.2.0"
+    "@humanwhocodes/retry" "^0.4.1"
+    "@types/estree" "^1.0.6"
+    "@types/json-schema" "^7.0.15"
     ajv "^6.12.4"
     chalk "^4.0.0"
-    cross-spawn "^7.0.2"
+    cross-spawn "^7.0.6"
     debug "^4.3.2"
-    doctrine "^3.0.0"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^7.2.2"
-    eslint-visitor-keys "^3.4.3"
-    espree "^9.6.1"
-    esquery "^1.4.2"
+    eslint-scope "^8.2.0"
+    eslint-visitor-keys "^4.2.0"
+    espree "^10.3.0"
+    esquery "^1.5.0"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
-    file-entry-cache "^6.0.1"
+    file-entry-cache "^8.0.0"
     find-up "^5.0.0"
     glob-parent "^6.0.2"
-    globals "^13.19.0"
-    graphemer "^1.4.0"
     ignore "^5.2.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
-    is-path-inside "^3.0.3"
-    js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.4.1"
     lodash.merge "^4.6.2"
     minimatch "^3.1.2"
     natural-compare "^1.4.0"
     optionator "^0.9.3"
-    strip-ansi "^6.0.1"
-    text-table "^0.2.0"
 
-espree@^9.6.0, espree@^9.6.1:
-  version "9.6.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
-  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
+espree@^10.0.1, espree@^10.3.0:
+  version "10.3.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-10.3.0.tgz#29267cf5b0cb98735b65e64ba07e0ed49d1eed8a"
+  integrity sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==
   dependencies:
-    acorn "^8.9.0"
+    acorn "^8.14.0"
     acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.4.1"
+    eslint-visitor-keys "^4.2.0"
 
 esprima@^4.0.0, esprima@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esquery@^1.4.2:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
-  integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
+esquery@^1.5.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.6.0.tgz#91419234f804d852a82dceec3e16cdc22cf9dae7"
+  integrity sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==
   dependencies:
     estraverse "^5.1.0"
 
@@ -6961,12 +6989,12 @@ fflate@^0.4.4:
   resolved "https://registry.yarnpkg.com/fflate/-/fflate-0.4.8.tgz#f90b82aefbd8ac174213abb338bd7ef848f0f5ae"
   integrity sha512-FJqqoDBR00Mdj9ppamLa/Y7vxm+PRmNWA67N846RvsoYVMKB4q3y/de5PA7gUmRMYK/8CMz2GDZQmCRN1wBcWA==
 
-file-entry-cache@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
-  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
+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==
   dependencies:
-    flat-cache "^3.0.4"
+    flat-cache "^4.0.0"
 
 file-entry-cache@^9.1.0:
   version "9.1.0"
@@ -7055,14 +7083,13 @@ find-up@^6.3.0:
     locate-path "^7.1.0"
     path-exists "^5.0.0"
 
-flat-cache@^3.0.4:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee"
-  integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==
+flat-cache@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-4.0.1.tgz#0ece39fcb14ee012f4b0410bd33dd9c1f011127c"
+  integrity sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==
   dependencies:
     flatted "^3.2.9"
-    keyv "^4.5.3"
-    rimraf "^3.0.2"
+    keyv "^4.5.4"
 
 flat-cache@^5.0.0:
   version "5.0.0"
@@ -7077,7 +7104,12 @@ flat@^5.0.2:
   resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
   integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
 
-flatted@^3.2.9, flatted@^3.3.1:
+flatted@^3.2.9:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.2.tgz#adba1448a9841bec72b42c532ea23dbbedef1a27"
+  integrity sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==
+
+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==
@@ -7136,6 +7168,11 @@ form-data@^4.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
+forwarded-parse@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/forwarded-parse/-/forwarded-parse-2.1.2.tgz#08511eddaaa2ddfd56ba11138eee7df117a09325"
+  integrity sha512-alTFZZQDKMporBH77856pXgzhEzaUVmLCDk+egLgIgHst3Tpndzz8MnKe+GzRJRfvVdn69HhpW7cmXzvtLvJAw==
+
 forwarded@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
@@ -7191,15 +7228,17 @@ 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.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==
+function.prototype.name@^1.1.6, function.prototype.name@^1.1.8:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.8.tgz#e68e1df7b259a5c949eeef95cdbde53edffabb78"
+  integrity sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
+    call-bind "^1.0.8"
+    call-bound "^1.0.3"
+    define-properties "^1.2.1"
     functions-have-names "^1.2.3"
+    hasown "^2.0.2"
+    is-callable "^1.2.7"
 
 functions-have-names@^1.2.3:
   version "1.2.3"
@@ -7221,7 +7260,7 @@ get-caller-file@^2.0.5:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4:
+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==
@@ -7232,6 +7271,22 @@ get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.3, get-intrinsic@
     has-symbols "^1.0.3"
     hasown "^2.0.0"
 
+get-intrinsic@^1.2.5, get-intrinsic@^1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.6.tgz#43dd3dd0e7b49b82b2dfcad10dc824bf7fc265d5"
+  integrity sha512-qxsEs+9A+u85HhllWJJFicJfPDhRmjzoYdl64aMWW9yRIJmSyxdn8IEkuIM530/7T+lv0TIHd8L6Q/ra0tEoeA==
+  dependencies:
+    call-bind-apply-helpers "^1.0.1"
+    dunder-proto "^1.0.0"
+    es-define-property "^1.0.1"
+    es-errors "^1.3.0"
+    es-object-atoms "^1.0.0"
+    function-bind "^1.1.2"
+    gopd "^1.2.0"
+    has-symbols "^1.1.0"
+    hasown "^2.0.2"
+    math-intrinsics "^1.0.0"
+
 get-package-type@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
@@ -7247,14 +7302,14 @@ get-stream@^6.0.0:
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
   integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
 
-get-symbol-description@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.2.tgz#533744d5aa20aca4e079c8e5daf7fd44202821f5"
-  integrity sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==
+get-symbol-description@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.1.0.tgz#7bdd54e0befe8ffc9f3b4e203220d9f1e881b6ee"
+  integrity sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==
   dependencies:
-    call-bind "^1.0.5"
+    call-bound "^1.0.3"
     es-errors "^1.3.0"
-    get-intrinsic "^1.2.4"
+    get-intrinsic "^1.2.6"
 
 get-tsconfig@^4.7.5:
   version "4.8.1"
@@ -7357,14 +7412,17 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globals@^13.19.0:
-  version "13.24.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171"
-  integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==
-  dependencies:
-    type-fest "^0.20.2"
+globals@^14.0.0:
+  version "14.0.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-14.0.0.tgz#898d7413c29babcf6bafe56fcadded858ada724e"
+  integrity sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==
+
+globals@^15.14.0:
+  version "15.14.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-15.14.0.tgz#b8fd3a8941ff3b4d38f3319d433b61bbb482e73f"
+  integrity sha512-OkToC372DtlQeje9/zHIo5CT8lRP/FUgEOKBEhU4e0abL7J7CD24fD9ohiLN5hagG/kWCYj4K5oaxxtj2Z0Dig==
 
-globalthis@^1.0.3, globalthis@^1.0.4:
+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==
@@ -7408,6 +7466,11 @@ gopd@^1.0.1:
   dependencies:
     get-intrinsic "^1.1.3"
 
+gopd@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1"
+  integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==
+
 graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
@@ -7430,10 +7493,10 @@ handle-thing@^2.0.0:
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
   integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==
 
-has-bigints@^1.0.1, has-bigints@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
-  integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==
+has-bigints@^1.0.2:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.1.0.tgz#28607e965ac967e03cd2a2c70a2636a1edad49fe"
+  integrity sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==
 
 has-flag@^3.0.0:
   version "3.0.0"
@@ -7452,16 +7515,28 @@ has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.2:
   dependencies:
     es-define-property "^1.0.0"
 
-has-proto@^1.0.1, has-proto@^1.0.3:
+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.2, has-symbols@^1.0.3:
+has-proto@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.2.0.tgz#5de5a6eabd95fdffd9818b43055e8065e39fe9d5"
+  integrity sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==
+  dependencies:
+    dunder-proto "^1.0.0"
+
+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-symbols@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338"
+  integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==
+
 has-tostringtag@^1.0.0, has-tostringtag@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc"
@@ -7666,11 +7741,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.1:
+ignore@^5.2.0, ignore@^5.2.4:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef"
   integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==
 
+ignore@^5.3.1:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
+  integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==
+
 ignore@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-6.0.2.tgz#77cccb72a55796af1b6d2f9eb14fa326d24f4283"
@@ -7740,14 +7820,14 @@ ini@^1.3.4, ini@^1.3.5:
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
-internal-slot@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.7.tgz#c06dcca3ed874249881007b0a5523b172a190802"
-  integrity sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==
+internal-slot@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.1.0.tgz#1eac91762947d2f7056bc838d93e13b2e9604961"
+  integrity sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==
   dependencies:
     es-errors "^1.3.0"
-    hasown "^2.0.0"
-    side-channel "^1.0.4"
+    hasown "^2.0.2"
+    side-channel "^1.1.0"
 
 interpret@^3.1.1:
   version "3.1.1"
@@ -7795,13 +7875,14 @@ ipaddr.js@^2.1.0:
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.2.0.tgz#d33fa7bac284f4de7af949638c9d68157c6b92e8"
   integrity sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==
 
-is-array-buffer@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.4.tgz#7a1f92b3d61edd2bc65d24f130530ea93d7fae98"
-  integrity sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==
+is-array-buffer@^3.0.4, is-array-buffer@^3.0.5:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.5.tgz#65742e1e687bd2cc666253068fd8707fe4d44280"
+  integrity sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==
   dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.2.1"
+    call-bind "^1.0.8"
+    call-bound "^1.0.3"
+    get-intrinsic "^1.2.6"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
@@ -7820,12 +7901,12 @@ is-async-function@^2.0.0:
   dependencies:
     has-tostringtag "^1.0.0"
 
-is-bigint@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
-  integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==
+is-bigint@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.1.0.tgz#dda7a3445df57a42583db4228682eba7c4170672"
+  integrity sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==
   dependencies:
-    has-bigints "^1.0.1"
+    has-bigints "^1.0.2"
 
 is-binary-path@~2.1.0:
   version "2.1.0"
@@ -7834,46 +7915,56 @@ is-binary-path@~2.1.0:
   dependencies:
     binary-extensions "^2.0.0"
 
-is-boolean-object@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719"
-  integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==
+is-boolean-object@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.2.1.tgz#c20d0c654be05da4fbc23c562635c019e93daf89"
+  integrity sha512-l9qO6eFlUETHtuihLcYOaLKByJ1f+N4kthcU9YjHy3N+B3hWv0y/2Nd0mu/7lTFnRQHTrSdXF50HQ3bl5fEnng==
   dependencies:
-    call-bind "^1.0.2"
-    has-tostringtag "^1.0.0"
+    call-bound "^1.0.2"
+    has-tostringtag "^1.0.2"
 
 is-bun-module@^1.0.2:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/is-bun-module/-/is-bun-module-1.2.1.tgz#495e706f42e29f086fd5fe1ac3c51f106062b9fc"
-  integrity sha512-AmidtEM6D6NmUiLOvvU7+IePxjEjOzra2h0pSrsfSAcXwl/83zLLXDByafUJy9k/rKK0pvXMLdwKwGHlX2Ke6Q==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/is-bun-module/-/is-bun-module-1.3.0.tgz#ea4d24fdebfcecc98e81bcbcb506827fee288760"
+  integrity sha512-DgXeu5UWI0IsMQundYb5UAOzm6G2eVnarJ0byP6Tm55iZNKceD59LNPA2L4VvsScTtHcw0yEkVwSf7PC+QoLSA==
   dependencies:
     semver "^7.6.3"
 
-is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
+is-callable@^1.1.3, is-callable@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
-is-core-module@^2.13.0, is-core-module@^2.15.1:
+is-core-module@^2.13.0:
   version "2.15.1"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.1.tgz#a7363a25bee942fefab0de13bf6aa372c82dcc37"
   integrity sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==
   dependencies:
     hasown "^2.0.2"
 
-is-data-view@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-data-view/-/is-data-view-1.0.1.tgz#4b4d3a511b70f3dc26d42c03ca9ca515d847759f"
-  integrity sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==
+is-core-module@^2.15.1, is-core-module@^2.16.0:
+  version "2.16.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.16.1.tgz#2a98801a849f43e2add644fbb6bc6229b19a4ef4"
+  integrity sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==
+  dependencies:
+    hasown "^2.0.2"
+
+is-data-view@^1.0.1, is-data-view@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-data-view/-/is-data-view-1.0.2.tgz#bae0a41b9688986c2188dda6657e56b8f9e63b8e"
+  integrity sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==
   dependencies:
+    call-bound "^1.0.2"
+    get-intrinsic "^1.2.6"
     is-typed-array "^1.1.13"
 
-is-date-object@^1.0.1, is-date-object@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
-  integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==
+is-date-object@^1.0.5, is-date-object@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.1.0.tgz#ad85541996fc7aa8b2729701d27b7319f95d82f7"
+  integrity sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==
   dependencies:
-    has-tostringtag "^1.0.0"
+    call-bound "^1.0.2"
+    has-tostringtag "^1.0.2"
 
 is-docker@^2.0.0, is-docker@^2.1.1:
   version "2.2.1"
@@ -7890,12 +7981,12 @@ is-extglob@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
-is-finalizationregistry@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz#c8749b65f17c133313e661b1289b95ad3dbd62e6"
-  integrity sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==
+is-finalizationregistry@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz#eefdcdc6c94ddd0674d9c85887bf93f944a97c90"
+  integrity sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==
   dependencies:
-    call-bind "^1.0.2"
+    call-bound "^1.0.3"
 
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
@@ -7933,33 +8024,24 @@ is-map@^2.0.3:
   resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.3.tgz#ede96b7fe1e270b3c4465e3a465658764926d62e"
   integrity sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==
 
-is-negative-zero@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.3.tgz#ced903a027aca6381b777a5743069d7376a49747"
-  integrity sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==
-
 is-network-error@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-network-error/-/is-network-error-1.1.0.tgz#d26a760e3770226d11c169052f266a4803d9c997"
   integrity sha512-tUdRRAnhT+OtCZR/LxZelH/C7QtjtFrTu5tXCA8pl55eTUElUHT+GPYV8MBMBvea/j+NxQqVt3LbWMRir7Gx9g==
 
-is-number-object@^1.0.4:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc"
-  integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==
+is-number-object@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.1.1.tgz#144b21e95a1bc148205dcc2814a9134ec41b2541"
+  integrity sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==
   dependencies:
-    has-tostringtag "^1.0.0"
+    call-bound "^1.0.3"
+    has-tostringtag "^1.0.2"
 
 is-number@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-is-path-inside@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
-  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
-
 is-plain-obj@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7"
@@ -7982,71 +8064,76 @@ is-potential-custom-element-name@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
   integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
 
-is-regex@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
-  integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
+is-regex@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.2.1.tgz#76d70a3ed10ef9be48eb577887d74205bf0cad22"
+  integrity sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==
   dependencies:
-    call-bind "^1.0.2"
-    has-tostringtag "^1.0.0"
+    call-bound "^1.0.2"
+    gopd "^1.2.0"
+    has-tostringtag "^1.0.2"
+    hasown "^2.0.2"
 
 is-set@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.3.tgz#8ab209ea424608141372ded6e0cb200ef1d9d01d"
   integrity sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==
 
-is-shared-array-buffer@^1.0.2, is-shared-array-buffer@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz#1237f1cba059cdb62431d378dcc37d9680181688"
-  integrity sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==
+is-shared-array-buffer@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz#9b67844bd9b7f246ba0708c3a93e34269c774f6f"
+  integrity sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==
   dependencies:
-    call-bind "^1.0.7"
+    call-bound "^1.0.3"
 
 is-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
   integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
 
-is-string@^1.0.5, is-string@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
-  integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
+is-string@^1.0.7, is-string@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.1.1.tgz#92ea3f3d5c5b6e039ca8677e5ac8d07ea773cbb9"
+  integrity sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==
   dependencies:
-    has-tostringtag "^1.0.0"
+    call-bound "^1.0.3"
+    has-tostringtag "^1.0.2"
 
-is-symbol@^1.0.2, is-symbol@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
-  integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
+is-symbol@^1.0.4, is-symbol@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.1.1.tgz#f47761279f532e2b05a7024a7506dbbedacd0634"
+  integrity sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==
   dependencies:
-    has-symbols "^1.0.2"
+    call-bound "^1.0.2"
+    has-symbols "^1.1.0"
+    safe-regex-test "^1.1.0"
 
-is-typed-array@^1.1.13:
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.13.tgz#d6c5ca56df62334959322d7d7dd1cca50debe229"
-  integrity sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==
+is-typed-array@^1.1.13, is-typed-array@^1.1.14, is-typed-array@^1.1.15:
+  version "1.1.15"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.15.tgz#4bfb4a45b61cee83a5a46fba778e4e8d59c0ce0b"
+  integrity sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==
   dependencies:
-    which-typed-array "^1.1.14"
+    which-typed-array "^1.1.16"
 
 is-weakmap@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.2.tgz#bf72615d649dfe5f699079c54b83e47d1ae19cfd"
   integrity sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==
 
-is-weakref@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
-  integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==
+is-weakref@^1.0.2, is-weakref@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.1.0.tgz#47e3472ae95a63fa9cf25660bcf0c181c39770ef"
+  integrity sha512-SXM8Nwyys6nT5WP6pltOwKytLV7FqQ4UiibxVmW+EIosHcmCqkkjViTb5SNssDlkCiEYRP1/pdWUKVvZBmsR2Q==
   dependencies:
-    call-bind "^1.0.2"
+    call-bound "^1.0.2"
 
 is-weakset@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.3.tgz#e801519df8c0c43e12ff2834eead84ec9e624007"
-  integrity sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.4.tgz#c9f5deb0bc1906c6d6f1027f284ddf459249daca"
+  integrity sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==
   dependencies:
-    call-bind "^1.0.7"
-    get-intrinsic "^1.2.4"
+    call-bound "^1.0.3"
+    get-intrinsic "^1.2.6"
 
 is-what@^3.12.0:
   version "3.14.1"
@@ -8140,16 +8227,17 @@ istanbul-reports@^3.1.3:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
 
-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==
+iterator.prototype@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/iterator.prototype/-/iterator.prototype-1.1.4.tgz#4ae6cf98b97fdc717b7e159d79dc25f8fc9482f1"
+  integrity sha512-x4WH0BWmrMmg4oHHl+duwubhrvczGlyuGAZu3nvrf0UXOfPu8IhZObFEr7DE/iv01YgVZrsOiRcqw2srkKEDIA==
   dependencies:
-    define-properties "^1.2.1"
-    get-intrinsic "^1.2.1"
-    has-symbols "^1.0.3"
-    reflect.getprototypeof "^1.0.4"
-    set-function-name "^2.0.1"
+    define-data-property "^1.1.4"
+    es-object-atoms "^1.0.0"
+    get-intrinsic "^1.2.6"
+    has-symbols "^1.1.0"
+    reflect.getprototypeof "^1.0.8"
+    set-function-name "^2.0.2"
 
 jackspeak@^2.3.5:
   version "2.3.6"
@@ -8731,7 +8819,7 @@ jsonrepair@^3.8.0:
     object.assign "^4.1.4"
     object.values "^1.1.6"
 
-keyv@^4.5.3, keyv@^4.5.4:
+keyv@^4.5.4:
   version "4.5.4"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
   integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
@@ -9053,6 +9141,11 @@ marked@6.0.0:
   resolved "https://registry.yarnpkg.com/marked/-/marked-6.0.0.tgz#80cd7f51145437cffe9f541a318b9882f75601df"
   integrity sha512-7E3m/xIlymrFL5gWswIT4CheIE3fDeh51NV09M4x8iOc7NDYlyERcQMLAIHcSlrvwliwbPQ4OGD+MpPSYiQcqw==
 
+math-intrinsics@^1.0.0, math-intrinsics@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9"
+  integrity sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==
+
 mathml-tag-names@^2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
@@ -9185,7 +9278,7 @@ minimatch@9.0.1:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
+minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -9301,9 +9394,9 @@ multicast-dns@^7.2.5:
     thunky "^1.0.2"
 
 nanoid@^3.3.7:
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
-  integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
+  version "3.3.8"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf"
+  integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==
 
 natural-compare-lite@^1.4.0:
   version "1.4.0"
@@ -9427,14 +9520,16 @@ object-keys@^1.1.1:
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object.assign@^4.1.4, object.assign@^4.1.5:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.5.tgz#3a833f9ab7fdb80fc9e8d2300c803d216d8fdbb0"
-  integrity sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==
+object.assign@^4.1.4, object.assign@^4.1.7:
+  version "4.1.7"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.7.tgz#8c14ca1a424c6a561b0bb2a22f66f5049a945d3d"
+  integrity sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==
   dependencies:
-    call-bind "^1.0.5"
+    call-bind "^1.0.8"
+    call-bound "^1.0.3"
     define-properties "^1.2.1"
-    has-symbols "^1.0.3"
+    es-object-atoms "^1.0.0"
+    has-symbols "^1.1.0"
     object-keys "^1.1.1"
 
 object.entries@^1.1.8:
@@ -9465,12 +9560,13 @@ object.groupby@^1.0.3:
     define-properties "^1.2.1"
     es-abstract "^1.23.2"
 
-object.values@^1.1.6, object.values@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.2.0.tgz#65405a9d92cee68ac2d303002e0b8470a4d9ab1b"
-  integrity sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==
+object.values@^1.1.6, object.values@^1.2.0, object.values@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.2.1.tgz#deed520a50809ff7f75a7cfd4bc64c7a038c6216"
+  integrity sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==
   dependencies:
-    call-bind "^1.0.7"
+    call-bind "^1.0.8"
+    call-bound "^1.0.3"
     define-properties "^1.2.1"
     es-object-atoms "^1.0.0"
 
@@ -10557,18 +10653,19 @@ redent@^3.0.0:
     indent-string "^4.0.0"
     strip-indent "^3.0.0"
 
-reflect.getprototypeof@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.6.tgz#3ab04c32a8390b770712b7a8633972702d278859"
-  integrity sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg==
+reflect.getprototypeof@^1.0.6, reflect.getprototypeof@^1.0.8, reflect.getprototypeof@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.9.tgz#c905f3386008de95a62315f3ea8630404be19e2f"
+  integrity sha512-r0Ay04Snci87djAsI4U+WNRcSw5S4pOH7qFjd/veA5gC7TbqESR3tcj28ia95L/fYUDw11JKP7uqUKUAfVvV5Q==
   dependencies:
-    call-bind "^1.0.7"
+    call-bind "^1.0.8"
     define-properties "^1.2.1"
-    es-abstract "^1.23.1"
+    dunder-proto "^1.0.1"
+    es-abstract "^1.23.6"
     es-errors "^1.3.0"
-    get-intrinsic "^1.2.4"
-    globalthis "^1.0.3"
-    which-builtin-type "^1.1.3"
+    get-intrinsic "^1.2.6"
+    gopd "^1.2.0"
+    which-builtin-type "^1.2.1"
 
 reflux-core@^0.3.0:
   version "0.3.0"
@@ -10609,7 +10706,7 @@ regenerator-transform@^0.15.2:
   dependencies:
     "@babel/runtime" "^7.8.4"
 
-regexp.prototype.flags@^1.5.2, regexp.prototype.flags@^1.5.3:
+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==
@@ -10715,7 +10812,7 @@ resolve.exports@^2.0.0:
   resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.0.tgz#c1a0028c2d166ec2fbf7d0644584927e76e7400e"
   integrity sha512-6K/gDlqgQscOlg9fSRpWstA8sYe8rbELsSTNpx+3kTrsVCzvSl0zIvRErM7fdl9ERWDsKnrLnwB+Ne89918XOg==
 
-resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.1, resolve@^1.22.4:
+resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.1:
   version "1.22.8"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
   integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
@@ -10724,6 +10821,15 @@ resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.1, resolve@^1.2
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
+resolve@^1.22.4:
+  version "1.22.10"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.10.tgz#b663e83ffb09bbf2386944736baae803029b8b39"
+  integrity sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==
+  dependencies:
+    is-core-module "^2.16.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
 resolve@^2.0.0-next.5:
   version "2.0.0-next.5"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.5.tgz#6b0ec3107e671e52b68cd068ef327173b90dc03c"
@@ -10743,13 +10849,6 @@ reusify@^1.0.4:
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
-rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
 rslog@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/rslog/-/rslog-1.2.3.tgz#9114d93056312fbe35c11b3fea3f2774a7debe56"
@@ -10765,14 +10864,15 @@ run-parallel@^1.1.9:
   resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"
   integrity sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==
 
-safe-array-concat@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.2.tgz#81d77ee0c4e8b863635227c721278dd524c20edb"
-  integrity sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==
+safe-array-concat@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.3.tgz#c9e54ec4f603b0bbb8e7e5007a5ee7aecd1538c3"
+  integrity sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==
   dependencies:
-    call-bind "^1.0.7"
-    get-intrinsic "^1.2.4"
-    has-symbols "^1.0.3"
+    call-bind "^1.0.8"
+    call-bound "^1.0.2"
+    get-intrinsic "^1.2.6"
+    has-symbols "^1.1.0"
     isarray "^2.0.5"
 
 safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
@@ -10785,14 +10885,14 @@ safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.1.0, safe-buffer@^5.1.1,
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
-safe-regex-test@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.3.tgz#a5b4c0f06e0ab50ea2c395c14d8371232924c377"
-  integrity sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==
+safe-regex-test@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.1.0.tgz#7f87dfb67a3150782eaaf18583ff5d1711ac10c1"
+  integrity sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==
   dependencies:
-    call-bind "^1.0.6"
+    call-bound "^1.0.2"
     es-errors "^1.3.0"
-    is-regex "^1.1.4"
+    is-regex "^1.2.1"
 
 "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0":
   version "2.1.2"
@@ -10926,7 +11026,7 @@ serve-static@1.16.2:
     parseurl "~1.3.3"
     send "0.19.0"
 
-set-function-length@^1.2.1:
+set-function-length@^1.2.1, set-function-length@^1.2.2:
   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==
@@ -10938,7 +11038,7 @@ set-function-length@^1.2.1:
     gopd "^1.0.1"
     has-property-descriptors "^1.0.2"
 
-set-function-name@^2.0.1, set-function-name@^2.0.2:
+set-function-name@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985"
   integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==
@@ -10992,7 +11092,36 @@ shimmer@^1.2.1:
   resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337"
   integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==
 
-side-channel@^1.0.4, side-channel@^1.0.6:
+side-channel-list@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.0.tgz#10cb5984263115d3b7a0e336591e290a830af8ad"
+  integrity sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==
+  dependencies:
+    es-errors "^1.3.0"
+    object-inspect "^1.13.3"
+
+side-channel-map@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/side-channel-map/-/side-channel-map-1.0.1.tgz#d6bb6b37902c6fef5174e5f533fab4c732a26f42"
+  integrity sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==
+  dependencies:
+    call-bound "^1.0.2"
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.5"
+    object-inspect "^1.13.3"
+
+side-channel-weakmap@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz#11dda19d5368e40ce9ec2bdc1fb0ecbc0790ecea"
+  integrity sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==
+  dependencies:
+    call-bound "^1.0.2"
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.5"
+    object-inspect "^1.13.3"
+    side-channel-map "^1.0.1"
+
+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==
@@ -11002,6 +11131,17 @@ side-channel@^1.0.4, side-channel@^1.0.6:
     get-intrinsic "^1.2.4"
     object-inspect "^1.13.1"
 
+side-channel@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.1.0.tgz#c3fcff9c4da932784873335ec9765fa94ff66bc9"
+  integrity sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==
+  dependencies:
+    es-errors "^1.3.0"
+    object-inspect "^1.13.3"
+    side-channel-list "^1.0.0"
+    side-channel-map "^1.0.1"
+    side-channel-weakmap "^1.0.2"
+
 signal-exit@^3.0.3, signal-exit@^3.0.7:
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
@@ -11169,6 +11309,11 @@ sprintf-js@1.0.3, sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
+stable-hash@^0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/stable-hash/-/stable-hash-0.0.4.tgz#55ae7dadc13e4b3faed13601587cec41859b42f7"
+  integrity sha512-LjdcbuBeLcdETCrPn9i8AYAZ1eCtu4ECAWtP7UleOiZ9LzVxRzzUZEoZ8zB24nhkQnDWyET0I+3sWokSDS3E7g==
+
 stack-utils@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.3.tgz#cd5f030126ff116b78ccb3c027fe302713b61277"
@@ -11231,23 +11376,24 @@ string-width@^5.0.1, string-width@^5.1.2:
     emoji-regex "^9.2.2"
     strip-ansi "^7.0.1"
 
-string.prototype.matchall@^4.0.11:
-  version "4.0.11"
-  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz#1092a72c59268d2abaad76582dccc687c0297e0a"
-  integrity sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==
+string.prototype.matchall@^4.0.12:
+  version "4.0.12"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.12.tgz#6c88740e49ad4956b1332a911e949583a275d4c0"
+  integrity sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==
   dependencies:
-    call-bind "^1.0.7"
+    call-bind "^1.0.8"
+    call-bound "^1.0.3"
     define-properties "^1.2.1"
-    es-abstract "^1.23.2"
+    es-abstract "^1.23.6"
     es-errors "^1.3.0"
     es-object-atoms "^1.0.0"
-    get-intrinsic "^1.2.4"
-    gopd "^1.0.1"
-    has-symbols "^1.0.3"
-    internal-slot "^1.0.7"
-    regexp.prototype.flags "^1.5.2"
+    get-intrinsic "^1.2.6"
+    gopd "^1.2.0"
+    has-symbols "^1.1.0"
+    internal-slot "^1.1.0"
+    regexp.prototype.flags "^1.5.3"
     set-function-name "^2.0.2"
-    side-channel "^1.0.6"
+    side-channel "^1.1.0"
 
 string.prototype.repeat@^1.0.0:
   version "1.0.0"
@@ -11257,22 +11403,26 @@ string.prototype.repeat@^1.0.0:
     define-properties "^1.1.3"
     es-abstract "^1.17.5"
 
-string.prototype.trim@^1.2.9:
-  version "1.2.9"
-  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz#b6fa326d72d2c78b6df02f7759c73f8f6274faa4"
-  integrity sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==
+string.prototype.trim@^1.2.10:
+  version "1.2.10"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz#40b2dd5ee94c959b4dcfb1d65ce72e90da480c81"
+  integrity sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==
   dependencies:
-    call-bind "^1.0.7"
+    call-bind "^1.0.8"
+    call-bound "^1.0.2"
+    define-data-property "^1.1.4"
     define-properties "^1.2.1"
-    es-abstract "^1.23.0"
+    es-abstract "^1.23.5"
     es-object-atoms "^1.0.0"
+    has-property-descriptors "^1.0.2"
 
-string.prototype.trimend@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz#3651b8513719e8a9f48de7f2f77640b26652b229"
-  integrity sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==
+string.prototype.trimend@^1.0.8, string.prototype.trimend@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz#62e2731272cd285041b36596054e9f66569b6942"
+  integrity sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==
   dependencies:
-    call-bind "^1.0.7"
+    call-bind "^1.0.8"
+    call-bound "^1.0.2"
     define-properties "^1.2.1"
     es-object-atoms "^1.0.0"
 
@@ -11530,11 +11680,6 @@ test-exclude@^6.0.0:
     glob "^7.1.4"
     minimatch "^3.0.4"
 
-text-table@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-  integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
-
 thingies@^1.20.0:
   version "1.21.0"
   resolved "https://registry.yarnpkg.com/thingies/-/thingies-1.21.0.tgz#e80fbe58fd6fdaaab8fad9b67bd0a5c943c445c1"
@@ -11602,9 +11747,9 @@ tree-dump@^1.0.1:
   integrity sha512-dpev9ABuLWdEubk+cIaI9cHwRNNDjkBBLXTwI4UCUFdQ5xXKqNXoK4FEciw/vxf+NQ7Cb7sGUyeUtORvHIdRXQ==
 
 ts-api-utils@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1"
-  integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.4.3.tgz#bfc2215fe6528fecab2b0fba570a2e8a4263b064"
+  integrity sha512-i3eMG77UTMD0hZhgRS562pv83RC6ukSAC2GMNWc+9dieh/+jDM5u5YG+NHX6VNDRHQcHwmsTHctP9LhbC3WxVw==
 
 ts-node@^10.9.2:
   version "10.9.2"
@@ -11695,11 +11840,6 @@ type-detect@^4.0.0:
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.1.0.tgz#deb2453e8f08dcae7ae98c626b13dddb0155906c"
   integrity sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==
 
-type-fest@^0.20.2:
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
-  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
-
 type-fest@^0.8.1:
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
@@ -11713,49 +11853,59 @@ type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
-typed-array-buffer@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz#1867c5d83b20fcb5ccf32649e5e2fc7424474ff3"
-  integrity sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==
+typed-array-buffer@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz#a72395450a4869ec033fd549371b47af3a2ee536"
+  integrity sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==
   dependencies:
-    call-bind "^1.0.7"
+    call-bound "^1.0.3"
     es-errors "^1.3.0"
-    is-typed-array "^1.1.13"
+    is-typed-array "^1.1.14"
 
-typed-array-byte-length@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz#d92972d3cff99a3fa2e765a28fcdc0f1d89dec67"
-  integrity sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==
+typed-array-byte-length@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz#8407a04f7d78684f3d252aa1a143d2b77b4160ce"
+  integrity sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==
   dependencies:
-    call-bind "^1.0.7"
+    call-bind "^1.0.8"
     for-each "^0.3.3"
-    gopd "^1.0.1"
-    has-proto "^1.0.3"
-    is-typed-array "^1.1.13"
+    gopd "^1.2.0"
+    has-proto "^1.2.0"
+    is-typed-array "^1.1.14"
 
-typed-array-byte-offset@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz#f9ec1acb9259f395093e4567eb3c28a580d02063"
-  integrity sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==
+typed-array-byte-offset@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz#ae3698b8ec91a8ab945016108aef00d5bff12355"
+  integrity sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==
   dependencies:
     available-typed-arrays "^1.0.7"
-    call-bind "^1.0.7"
+    call-bind "^1.0.8"
     for-each "^0.3.3"
-    gopd "^1.0.1"
-    has-proto "^1.0.3"
-    is-typed-array "^1.1.13"
+    gopd "^1.2.0"
+    has-proto "^1.2.0"
+    is-typed-array "^1.1.15"
+    reflect.getprototypeof "^1.0.9"
 
-typed-array-length@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.6.tgz#57155207c76e64a3457482dfdc1c9d1d3c4c73a3"
-  integrity sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==
+typed-array-length@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.7.tgz#ee4deff984b64be1e118b0de8c9c877d5ce73d3d"
+  integrity sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==
   dependencies:
     call-bind "^1.0.7"
     for-each "^0.3.3"
     gopd "^1.0.1"
-    has-proto "^1.0.3"
     is-typed-array "^1.1.13"
     possible-typed-array-names "^1.0.0"
+    reflect.getprototypeof "^1.0.6"
+
+typescript-eslint@^8.18.2:
+  version "8.18.2"
+  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.18.2.tgz#71334dcf843adc3fbb771dce5ade7876aa0d62b7"
+  integrity sha512-KuXezG6jHkvC3MvizeXgupZzaG5wjhU3yE8E7e6viOvAvD9xAWYp8/vy0WULTGe9DYDWcQu7aW03YIV3mSitrQ==
+  dependencies:
+    "@typescript-eslint/eslint-plugin" "8.18.2"
+    "@typescript-eslint/parser" "8.18.2"
+    "@typescript-eslint/utils" "8.18.2"
 
 typescript-template-language-service-decorator@^2.3.2:
   version "2.3.2"
@@ -11772,15 +11922,15 @@ u2f-api@1.0.10:
   resolved "https://registry.yarnpkg.com/u2f-api/-/u2f-api-1.0.10.tgz#38d898a72daa6362040b27e37c8286d96cb8d320"
   integrity sha512-0Zh+IqM2l6xaA/IUJDT9WwoEM6nwPx6ive4flVVYEfzzgXIrKFRaenieItsEkbXIgOZEw13nO3o3oLtSDOyesA==
 
-unbox-primitive@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
-  integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==
+unbox-primitive@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.1.0.tgz#8d9d2c9edeea8460c7f35033a88867944934d1e2"
+  integrity sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==
   dependencies:
-    call-bind "^1.0.2"
+    call-bound "^1.0.3"
     has-bigints "^1.0.2"
-    has-symbols "^1.0.3"
-    which-boxed-primitive "^1.0.2"
+    has-symbols "^1.1.0"
+    which-boxed-primitive "^1.1.1"
 
 undici-types@~6.19.8:
   version "6.19.8"
@@ -12192,34 +12342,35 @@ whatwg-url@^5.0.0:
     tr46 "~0.0.3"
     webidl-conversions "^3.0.0"
 
-which-boxed-primitive@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
-  integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
+which-boxed-primitive@^1.1.0, which-boxed-primitive@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz#d76ec27df7fa165f18d5808374a5fe23c29b176e"
+  integrity sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==
   dependencies:
-    is-bigint "^1.0.1"
-    is-boolean-object "^1.1.0"
-    is-number-object "^1.0.4"
-    is-string "^1.0.5"
-    is-symbol "^1.0.3"
+    is-bigint "^1.1.0"
+    is-boolean-object "^1.2.1"
+    is-number-object "^1.1.1"
+    is-string "^1.1.1"
+    is-symbol "^1.1.1"
 
-which-builtin-type@^1.1.3:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.1.4.tgz#592796260602fc3514a1b5ee7fa29319b72380c3"
-  integrity sha512-bppkmBSsHFmIMSl8BO9TbsyzsvGjVoppt8xUiGzwiu/bhDCGxnpOKCxgqj6GuyHE0mINMDecBFPlOm2hzY084w==
+which-builtin-type@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.2.1.tgz#89183da1b4907ab089a6b02029cc5d8d6574270e"
+  integrity sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==
   dependencies:
+    call-bound "^1.0.2"
     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"
+    is-date-object "^1.1.0"
+    is-finalizationregistry "^1.1.0"
     is-generator-function "^1.0.10"
-    is-regex "^1.1.4"
+    is-regex "^1.2.1"
     is-weakref "^1.0.2"
     isarray "^2.0.5"
-    which-boxed-primitive "^1.0.2"
+    which-boxed-primitive "^1.1.0"
     which-collection "^1.0.2"
-    which-typed-array "^1.1.15"
+    which-typed-array "^1.1.16"
 
 which-collection@^1.0.2:
   version "1.0.2"
@@ -12231,15 +12382,16 @@ which-collection@^1.0.2:
     is-weakmap "^2.0.2"
     is-weakset "^2.0.3"
 
-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==
+which-typed-array@^1.1.16, which-typed-array@^1.1.18:
+  version "1.1.18"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.18.tgz#df2389ebf3fbb246a71390e90730a9edb6ce17ad"
+  integrity sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA==
   dependencies:
     available-typed-arrays "^1.0.7"
-    call-bind "^1.0.7"
+    call-bind "^1.0.8"
+    call-bound "^1.0.3"
     for-each "^0.3.3"
-    gopd "^1.0.1"
+    gopd "^1.2.0"
     has-tostringtag "^1.0.2"
 
 which@^1.3.1: