Skip to content

Commit

Permalink
Merge branch 'master' into feat/ds-health-trailing-slash
Browse files Browse the repository at this point in the history
* master: (219 commits)
  fix: flatten searchable os distribution fields (#81297)
  chore(profiling): Remvoe unused profile functions metrics hook (#81396)
  fix(prompts): Properly return false instead of undefined when prompt data is null (#81404)
  fix(insights): broken screen rendering doc link (#81257)
  fix(rpc): Only groupby when needed (#81403)
  feat(grouping): Tally frame types while building exception grouping components (#81341)
  fix(similarity): Limit > 30 system frame check to Java (#81385)
  feat(alerts): Adds EAP spans results consumer configs (#81365)
  ref(insights): simplify domain view header by using tab links (#81324)
  fix(issues): Add projectId for flag onboarding on click (#81387)
  chore(flamegraphs): Remove unused legacy flamegraph code path (#81381)
  fix(performance): No table overflow + glitchy behaviour (#81378)
  feat(widget-builder): Add feature flag for redesign (#81377)
  feat(profiling): Clean up continuous profiling ui and compat flags (#81260)
  feat(visibility): Clamp date range for `TagStore` queries (#81363)
  test(taskbroker): Add CLI command for sending taskbroker tasks (#81319)
  feat(dashboards): Add ff for favouriting dashboards (#81368)
  fix(trace) match event_id by error (#81370)
  fix(insights): add missing slash on performance moving banner (#81364)
  ref(models): Include event id in `Event` repr (#81345)
  ...
  • Loading branch information
jan-auer committed Nov 28, 2024
2 parents 47b350d + 6d8d341 commit 6724b03
Show file tree
Hide file tree
Showing 1,496 changed files with 25,128 additions and 12,648 deletions.
73 changes: 5 additions & 68 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,44 +12,15 @@ const baseRules = {
/**
* Variables
*/
// https://eslint.org/docs/rules/no-shadow
'no-shadow': ['error'],

// https://eslint.org/docs/rules/no-shadow-restricted-names
'no-shadow-restricted-names': ['error'],

// https://eslint.org/docs/rules/no-undef
'no-undef': ['error'],

// https://eslint.org/docs/rules/no-unused-vars
'no-unused-vars': [
'error',
{
vars: 'all',
args: '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: '^_',
},
],

// https://eslint.org/docs/rules/no-use-before-define
'no-use-before-define': ['error', {functions: false}],

/**
* Possible errors
*/
// https://eslint.org/docs/rules/no-cond-assign
'no-cond-assign': ['error', 'always'],

// https://eslint.org/docs/rules/no-console
'no-console': ['warn'],

// https://eslint.org/docs/rules/no-alert
'no-alert': ['error'],

Expand Down Expand Up @@ -272,14 +243,6 @@ const reactReactRules = {
// https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/no-deprecated.md
'react/no-deprecated': ['error'],

// https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/no-is-mounted.md
'react/no-is-mounted': ['warn'],

// https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/no-find-dom-node.md
// Recommended to use callback refs instead
// TODO: Upgrade sentry to use callback refs
'react/no-find-dom-node': ['warn'],

// 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
Expand Down Expand Up @@ -311,10 +274,6 @@ const reactReactRules = {
// https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/no-typos.md
'react/no-typos': ['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': ['warn'],

// 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'],
Expand Down Expand Up @@ -416,16 +375,6 @@ const reactImportRules = {
},
],

// Enforce a convention in module import order
// https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/order.md
'import/order': [
'error',
{
groups: ['builtin', 'external', 'internal', ['parent', 'sibling', 'index']],
'newlines-between': 'always',
},
],

// 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'],
Expand Down Expand Up @@ -499,7 +448,6 @@ const reactImportRules = {
};

const reactJestRules = {
'jest/no-large-snapshots': ['warn', {maxSize: 2000}],
'jest/no-disabled-tests': 'error',
};

Expand Down Expand Up @@ -540,22 +488,6 @@ const reactRules = {
'asc',
{caseSensitive: true, natural: false, requiredFirst: true},
],

// Disallow importing `import React from 'react'`. This is not needed since
// React 17. We prefer the named imports for potential tree-shaking gains
// in the future.
'no-restricted-imports': [
'error',
{
paths: [
{
name: 'react',
importNames: ['default'],
message: 'Prefer named React imports (React types DO NOT need imported!)',
},
],
},
],
};

const appRules = {
Expand All @@ -572,19 +504,22 @@ const appRules = {
// 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',
Expand All @@ -606,6 +541,7 @@ const appRules = {
},
],

// 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'],
Expand Down Expand Up @@ -787,6 +723,7 @@ const appRules = {
};

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
Expand Down
2 changes: 0 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -228,8 +228,6 @@ yarn.lock @getsentry/owners-js-de
/tests/snuba/api/endpoints/test_organization_events_vitals.py @getsentry/visibility
/tests/snuba/api/endpoints/test_organization_tagkey_values.py @getsentry/visibility

/src/sentry/api/endpoints/organization_transaction_anomaly_detection.py @getsentry/data

/src/sentry/spans/ @getsentry/visibility
/tests/sentry/spans/ @getsentry/visibility

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_docker_compose_acceptance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
name: test-docker-compose-acceptance
on:
schedule:
- cron: '0 * * * *'
- cron: '0 0 * * *'

# Cancel in progress workflows on pull_requests.
# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_docker_compose_backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: test-docker-compose-backend

on:
schedule:
- cron: '0 * * * *'
- cron: '0 0 * * *'

# Cancel in progress workflows on pull_requests.
# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
Expand Down
32 changes: 32 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,35 @@
24.11.1
-------

### Various fixes & improvements

- feat(toolbar): Make the login-success page have styles that blend with the login flow (#81230) by @ryan953
- fix(issues): Revert to app external issue name (#81277) by @scttcper
- Revert "chore(similarity): Do not send > 30 system frames to seer (#81259)" (104352cb) by @getsentry-bot
- :wrench: chore(slos): Update Halt to Success for Bot Commands (#81271) by @iamrajjoshi
- fix(auth): Adding scoping_organization_id to replica (#81213) by @sentaur-athena
- chore(similarity): Do not send > 30 system frames to seer (#81259) by @jangjodi
- fix(issues): Animate dropdown chevrons, button sizes (#81262) by @scttcper
- feat(eap): Add missing profile.id column to EAP (#81263) by @Zylphrex
- ref(dashboards): Modify how permissions are handled for editing/deleting dashboards (#80684) by @harshithadurai
- feat(explore): Format numeric tags nicely in explore (#81255) by @Zylphrex
- fix(explore): Preserve sort when adding group by (#81258) by @Zylphrex
- ref(insights): remove insights-domain-view flag part 1 (#81241) by @DominikB2014
- chore(alerts): Drop included and excluded projects (#81250) by @ceorourke
- ref: fix flaky digests test (#81256) by @asottile-sentry
- chore(sentryapps) Remove option for sentryapp RPC transition (#81245) by @markstory
- fix(grouping): Only collect metadata timing metric when actually getting metadata (#81252) by @lobsterkatie
- chore(performance): Remove old anomaly detection backend (#80696) by @gggritso
- Revert "chore(similarity): Add logging for over 30 system frames (#81130)" (7b7e7955) by @getsentry-bot
- ♻️ chore(slo): SLOs for CommitContextIntegration (#81225) by @iamrajjoshi
- chore(widget-builder): Remove organization props (#81248) by @narsaynorath
- chore(integrations): SourceCodeSearchEndpoint metrics (#80956) by @mifu67
- chore(vsts): vsts installation step metrics (#80789) by @cathteng
- Remove excluded_projects & include_all_projects columns (#81204) by @ceorourke
- fix(issues): Wrap solutions in error boundary (#81244) by @scttcper

_Plus 338 more_

24.11.0
-------

Expand Down
2 changes: 2 additions & 0 deletions devservices/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,12 @@ services:
- 127.0.0.1:5432:5432
extra_hosts:
- host.docker.internal:host-gateway
restart: unless-stopped

networks:
devservices:
name: devservices
external: true

volumes:
postgres-data:
95 changes: 37 additions & 58 deletions fixtures/backup/model_dependencies/detailed.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,11 @@
"model": "sentry.organization",
"nullable": true
},
"scoping_organization_id": {
"kind": "HybridCloudForeignKey",
"model": "sentry.organization",
"nullable": true
},
"user_id": {
"kind": "HybridCloudForeignKey",
"model": "sentry.user",
Expand Down Expand Up @@ -481,34 +486,6 @@
"table_name": "sentry_alertruleactivity",
"uniques": []
},
"sentry.alertruleexcludedprojects": {
"dangling": false,
"foreign_keys": {
"alert_rule": {
"kind": "FlexibleForeignKey",
"model": "sentry.alertrule",
"nullable": false
},
"project": {
"kind": "FlexibleForeignKey",
"model": "sentry.project",
"nullable": false
}
},
"model": "sentry.alertruleexcludedprojects",
"relocation_dependencies": [],
"relocation_scope": "Organization",
"silos": [
"Region"
],
"table_name": "sentry_alertruleexcludedprojects",
"uniques": [
[
"alert_rule",
"project"
]
]
},
"sentry.alertruleprojects": {
"dangling": false,
"foreign_keys": {
Expand Down Expand Up @@ -588,34 +565,6 @@
"table_name": "sentry_alertruletriggeraction",
"uniques": []
},
"sentry.alertruletriggerexclusion": {
"dangling": false,
"foreign_keys": {
"alert_rule_trigger": {
"kind": "FlexibleForeignKey",
"model": "sentry.alertruletrigger",
"nullable": false
},
"query_subscription": {
"kind": "FlexibleForeignKey",
"model": "sentry.querysubscription",
"nullable": false
}
},
"model": "sentry.alertruletriggerexclusion",
"relocation_dependencies": [],
"relocation_scope": "Organization",
"silos": [
"Region"
],
"table_name": "sentry_alertruletriggerexclusion",
"uniques": [
[
"alert_rule_trigger",
"query_subscription"
]
]
},
"sentry.apiapplication": {
"dangling": false,
"foreign_keys": {
Expand Down Expand Up @@ -6505,12 +6454,17 @@
]
},
"workflow_engine.detector": {
"dangling": false,
"dangling": true,
"foreign_keys": {
"created_by_id": {
"kind": "HybridCloudForeignKey",
"model": "sentry.user",
"nullable": true
},
"organization": {
"kind": "FlexibleForeignKey",
"model": "sentry.organization",
"nullable": false
"nullable": true
},
"owner_team": {
"kind": "FlexibleForeignKey",
Expand All @@ -6522,6 +6476,11 @@
"model": "sentry.user",
"nullable": true
},
"project": {
"kind": "FlexibleForeignKey",
"model": "sentry.project",
"nullable": true
},
"workflow_condition_group": {
"kind": "FlexibleForeignKey",
"model": "workflow_engine.dataconditiongroup",
Expand Down Expand Up @@ -6591,11 +6550,31 @@
"workflow_engine.workflow": {
"dangling": false,
"foreign_keys": {
"created_by_id": {
"kind": "HybridCloudForeignKey",
"model": "sentry.user",
"nullable": true
},
"environment": {
"kind": "FlexibleForeignKey",
"model": "sentry.environment",
"nullable": true
},
"organization": {
"kind": "FlexibleForeignKey",
"model": "sentry.organization",
"nullable": false
},
"owner_team": {
"kind": "FlexibleForeignKey",
"model": "sentry.team",
"nullable": true
},
"owner_user_id": {
"kind": "HybridCloudForeignKey",
"model": "sentry.user",
"nullable": true
},
"when_condition_group": {
"kind": "FlexibleForeignKey",
"model": "workflow_engine.dataconditiongroup",
Expand Down
Loading

0 comments on commit 6724b03

Please sign in to comment.