Skip to content

Commit

Permalink
Merge branch 'master' into feat/sdk-crash-monitoring
Browse files Browse the repository at this point in the history
  • Loading branch information
philipphofmann authored Jun 5, 2023
2 parents ed415e4 + 75833f6 commit 95d93cc
Show file tree
Hide file tree
Showing 537 changed files with 13,660 additions and 7,531 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,7 @@ yarn.lock @getsentry/owners-js-de
/static/app/components @getsentry/issues
/static/app/views/issueList @getsentry/issues
/static/app/views/organizationGroupDetails @getsentry/issues
/src/sentry/api/endpoints/source_map_debug.py @getsentry/issues
## End of Issues


Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ repos:
files: ^src/
types: [ python ]
require_serial: true
additional_dependencies: [ "pyright@1.1.186" ]
args: [ '--project', 'pyrightconfig-commithook.json' ]
additional_dependencies: [ "pyright@1.1.311" ]
args: [ '--project', 'config/pyrightconfig-commithook.json' ]

- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.21.0
Expand Down
42 changes: 42 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,45 @@
23.5.2
------

### Escalating Issues V1 (ongoing)

This will allow marking an issue as archived until escalating.

By: @scttcper (#50020), @armenzg (#49907)

### Issue States and Filters (ongoing)

By: @scttcper (#49642, #49626, #49517, #49587, #49582)

### Various fixes & improvements

- feat(replay): Change min version in replay onboarding (#50072) by @billyvg
- bug(replays): Fix Replay Search box overflow/wrapping (#50074) by @ryan953
- feat(replays): add replay clicks field to replay index endpoint (#49873) by @JoshFerge
- fix(analytics): Change actor_id to user_id in slack status analytic (#49966) by @jangjodi
- dep(relay): Upgrade librelay to 0.8.25 (#50063) by @iker-barriocanal
- chore(HC): Remove org mapping write paths in preparation of organization mapping updates (#50015) by @GabeVillalobos
- feat(escalating-issues): Define analytic for escalating feedback (#50000) by @jangjodi
- chore(profiling): Add referrers to profiling queries frontend (#49923) by @Zylphrex
- feat(starfish) Hook up span view filter selectors to production data (#49987) by @gggritso
- fix(hybridcloud) Fix serialization errors in RPC responses (#49922) by @markstory
- feat(dashboar-widget-description) Added description field to Widget model (#49992) by @Abdkhan14
- fix(starfish) Small fixes to spans table (#50001) by @gggritso
- chore(profiling) Add referrers to profiling queries backend (#49924) by @Zylphrex
- Revert "ref(project_creation): Add project deletion to the go back button (#49844)" (fda9548a) by @getsentry-bot
- ref(sessionstorage): use wrapper (#50051) by @JonasBa
- ref(project_creation): Add project deletion to the go back button (#49844) by @priscilawebdev
- feat: Return how an artifact was resolved (#49959) by @loewenheim
- fix(clusterer): Fix clusterer datasource in test endpoint (#50040) by @iker-barriocanal
- ref(spans): Sample all discovered rules (#49970) by @iker-barriocanal
- ref(js): Remove unnecessary AsyncComponent props (#50034) by @evanpurkhiser
- ref(js): Remove unnecessary extends AsyncComponentProps (#50031) by @evanpurkhiser
- fix(dynamic-sampling): Fix logging with missing parameter (#50038) by @iambriccardo
- fix(js): Avoid anchor nesting in monitor edit page (#50026) by @evanpurkhiser
- ref(js): Add IGNORED_SPANS_BY_DESCRIPTION in initializeSdk (#50025) by @evanpurkhiser

_Plus 268 more_

23.5.1
------

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Additional Use Grant: You may make use of the Licensed Work, provided that you d
error-reporting or application monitoring features of the
Licensed Work.

Change Date: 2026-05-23
Change Date: 2026-05-31

Change License: Apache License, Version 2.0

Expand Down
4 changes: 0 additions & 4 deletions bin/load-mocks
Original file line number Diff line number Diff line change
Expand Up @@ -1284,10 +1284,6 @@ if __name__ == "__main__":
load_performance_issues=options.load_performance_issues,
slow=options.slow,
)

from sentry.issues.producer import get_occurrence_producer

get_occurrence_producer().close()
except Exception:
# Avoid reporting any issues recursively back into Sentry
import sys
Expand Down
12 changes: 6 additions & 6 deletions bin/split-silo-database
Original file line number Diff line number Diff line change
Expand Up @@ -63,20 +63,20 @@ def main(database: str, reset: bool, verbose: bool):
This operation will not modify the original source database.
"""
region_models = []
control_models = []
region_tables = ["django_migrations"]
control_tables = ["django_migrations"]
for model in apps.get_models():
silo_limit = getattr(model._meta, "silo_limit", None)
if not silo_limit:
click.echo(f"> Could not find silo assignment for {model._meta.db_table}")
continue
if SiloMode.CONTROL in silo_limit.modes:
control_models.append(model._meta.db_table)
control_tables.append(model._meta.db_table)
if SiloMode.REGION in silo_limit.modes:
region_models.append(model._meta.db_table)
region_tables.append(model._meta.db_table)

split_database(control_models, database, "control", reset=reset, verbose=verbose)
split_database(region_models, database, "region", reset=reset, verbose=verbose)
split_database(control_tables, database, "control", reset=reset, verbose=verbose)
split_database(region_tables, database, "region", reset=reset, verbose=verbose)


if __name__ == "__main__":
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
".volta/**"
],

"stubPath": "fixtures/stubs-for-mypy",
"typeCheckingMode": "off",
"reportMissingImports": "none",
"reportUndefinedVariable": "none",
Expand Down
2 changes: 1 addition & 1 deletion config/tsconfig.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
"plugins": [
// The styled plugin provides language server autocompletion for styled
// component template strings
{"name": "typescript-styled-plugin"}
{"name": "@styled/typescript-styled-plugin"}
]
},
"include": ["../static/app", "../tests/js", "../fixtures/js-stubs"],
Expand Down
Loading

0 comments on commit 95d93cc

Please sign in to comment.