Skip to content

Commit cb0d82f

Browse files
authored
Merge branch 'master' into scttcper/new-stack-trace-trace-drawer
2 parents 1634a8d + af27c1d commit cb0d82f

File tree

897 files changed

+28281
-17209
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

897 files changed

+28281
-17209
lines changed

.github/CODEOWNERS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,8 @@ pnpm-lock.yaml @getsentry/owners-js-de
276276
/src/sentry/api/endpoints/organization_measurements_meta.py @getsentry/data-browsing
277277
src/sentry/api/endpoints/organization_attribute_mappings.py @getsentry/data-browsing
278278

279+
/src/sentry/integrations/slack/unfurl/explore.py @getsentry/data-browsing
280+
279281
/tests/snuba/api/endpoints/* @getsentry/data-browsing
280282
/tests/snuba/api/endpoints/test_organization_tags.py @getsentry/data-browsing
281283
/tests/snuba/api/endpoints/test_organization_events_histogram.py @getsentry/data-browsing
@@ -439,6 +441,9 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py @get
439441
/static/app/components/loading/ @getsentry/app-frontend
440442
/static/app/components/events/interfaces/ @getsentry/app-frontend
441443
/static/app/components/forms/ @getsentry/app-frontend
444+
/static/app/components/featureShowcase.mdx @getsentry/app-frontend
445+
/static/app/components/featureShowcase.spec.tsx @getsentry/app-frontend
446+
/static/app/components/featureShowcase.tsx @getsentry/app-frontend
442447
/static/app/components/markdownTextArea.tsx @getsentry/app-frontend
443448
/static/app/locale.tsx @getsentry/app-frontend
444449
## End of Frontend
@@ -832,6 +837,7 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py @get
832837
/static/app/components/core/ @getsentry/design-engineering
833838
/static/app/components/dnd/ @getsentry/design-engineering
834839
/static/app/components/pageFilters/ @getsentry/design-engineering
840+
/static/app/components/backendJsonFormAdapter/ @getsentry/design-engineering
835841
/static/app/icons/ @getsentry/design-engineering
836842
/static/app/stories/ @getsentry/design-engineering
837843
/static/app/components/commandPalette/ @getsentry/design-engineering

.github/workflows/migrations-drift.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
run: make apply-migrations
5252

5353
- name: capture database schema before
54-
run: docker exec postgres-postgres-1 bash -c 'pg_dumpall -U postgres -s' > schema-before
54+
run: docker exec postgres-postgres-1 bash -c 'pg_dumpall -U postgres -s --restrict-key=driftcheck' > schema-before
5555

5656
- name: clear db
5757
run: make drop-db create-db
@@ -65,7 +65,7 @@ jobs:
6565
run: make drop-db apply-migrations
6666

6767
- name: capture database schema after
68-
run: docker exec postgres-postgres-1 bash -c 'pg_dumpall -U postgres -s' > schema-after
68+
run: docker exec postgres-postgres-1 bash -c 'pg_dumpall -U postgres -s --restrict-key=driftcheck' > schema-after
6969

7070
- name: compare schema
7171
run: python3 -um tools.migrations.compare --color schema-before schema-after

bin/seer/trigger-night-shift

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#!/usr/bin/env python
2+
3+
from sentry.runner import configure
4+
5+
configure()
6+
7+
import argparse
8+
import sys
9+
10+
from sentry.tasks.seer.night_shift.cron import run_night_shift_for_org
11+
12+
13+
def main(org_id: int) -> None:
14+
sys.stdout.write(f"> Running night shift for organization {org_id}...\n")
15+
run_night_shift_for_org(org_id)
16+
sys.stdout.write("> Done.\n")
17+
18+
19+
if __name__ == "__main__":
20+
parser = argparse.ArgumentParser(description="Trigger night shift for an organization.")
21+
parser.add_argument(
22+
"org_id", nargs="?", default=1, type=int, help="Organization ID (default: 1)"
23+
)
24+
args = parser.parse_args()
25+
main(args.org_id)

eslint.config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -609,6 +609,7 @@ export default typescript.config([
609609
'@typescript-eslint/no-for-in-array': 'error',
610610
'@typescript-eslint/no-unnecessary-template-expression': 'error',
611611
'@typescript-eslint/no-unnecessary-type-assertion': 'error',
612+
'@typescript-eslint/no-unnecessary-type-parameters': 'error',
612613
'@typescript-eslint/switch-exhaustiveness-check': [
613614
'error',
614615
{considerDefaultExhaustiveForUnions: true},

fixtures/vsts.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,11 @@ def _stub_vsts(self):
137137
"id": self.repo_id,
138138
"name": self.repo_name,
139139
"project": {"name": self.project_a["name"]},
140+
"_links": {
141+
"web": {
142+
"href": f"https://{self.vsts_account_name.lower()}.visualstudio.com/_git/{self.repo_name}"
143+
}
144+
},
140145
}
141146
]
142147
},

knip.config.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,16 @@ const config: KnipConfig = {
6767
// ignore eslint plugins in production
6868
'!static/eslint/**/*.ts!',
6969
],
70+
ignore: [
71+
// api-docs has its own package.json with its own dependencies
72+
'api-docs/**',
73+
],
7074
ignoreExportsUsedInFile: isProductionMode,
7175
ignoreDependencies: [
7276
'core-js',
7377
'tslib', // subdependency of many packages, declare the latest version
7478
'jest-environment-jsdom', // used as testEnvironment in jest config
79+
'jsdom', // knip thinks we need this because of jest-environment jsdom
7580
'swc-plugin-component-annotate', // used in rspack config, needs better knip plugin
7681
'@swc/plugin-emotion', // used in rspack config, needs better knip plugin
7782
'buffer', // rspack.ProvidePlugin, needs better knip plugin
@@ -85,7 +90,6 @@ const config: KnipConfig = {
8590
rules: {
8691
binaries: 'off',
8792
enumMembers: 'off',
88-
unlisted: 'off',
8993
},
9094
include: ['nsExports', 'nsTypes'],
9195
mdx: {

migrations_lockfile.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ releases: 0004_cleanup_failed_safe_deletes
2929

3030
replays: 0007_organizationmember_replay_access
3131

32-
seer: 0005_delete_seerorganizationsettings
32+
seer: 0006_add_night_shift_models
3333

34-
sentry: 1064_eventattachment_date_expires_now
34+
sentry: 1066_add_export_format_in_data_export_obj
3535

3636
social_auth: 0003_social_auth_json_field
3737

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,8 @@
235235
"@emotion/server": "^11.11.0",
236236
"@eslint/js": "9.32.0",
237237
"@figma/code-connect": "^1.3.13",
238+
"@jest/environment": "30.3.0",
239+
"@jest/types": "30.3.0",
238240
"@mdx-js/language-service": "^0.7.3",
239241
"@sentry-internal/rrweb-types": "2.41.0",
240242
"@sentry/jest-environment": "6.1.0",
@@ -277,7 +279,7 @@
277279
"jest-environment-jsdom": "30.3.0",
278280
"jest-fail-on-console": "3.3.4",
279281
"jest-junit": "16.0.0",
280-
"knip": "6.0.1",
282+
"knip": "6.3.1",
281283
"odiff-bin": "^4.3.2",
282284
"oxfmt": "^0.41.0",
283285
"playwright": "^1.58.2",
@@ -286,6 +288,7 @@
286288
"stylelint": "16.10.0",
287289
"stylelint-config-recommended": "^14.0.1",
288290
"terser": "5.40.0",
291+
"tinyglobby": "0.2.16",
289292
"typescript": "6.0.2",
290293
"typescript-eslint": "8.58.0"
291294
},

0 commit comments

Comments
 (0)