Skip to content

Commit 38eecc4

Browse files
committed
Merge branch 'master' into ryan953/seer-overview
2 parents 605aa60 + bef2044 commit 38eecc4

File tree

352 files changed

+16196
-4964
lines changed

Some content is hidden

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

352 files changed

+16196
-4964
lines changed

.agents/skills/cell-architecture/SKILL.md

Lines changed: 267 additions & 0 deletions
Large diffs are not rendered by default.

.agents/skills/design-system/SKILL.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ import {Container} from '@sentry/scraps/layout';
5151

5252
// ❌ Don't create styled components
5353
const Component = styled('div')`
54-
padding: ${space(2)};
54+
padding: ${p => p.theme.space.md};
5555
border: 1px solid ${p => p.theme.tokens.border.primary};
5656
`;
5757

@@ -119,7 +119,7 @@ import {Grid} from '@sentry/scraps/layout';
119119
const Component = styled('div')`
120120
display: grid;
121121
grid-template-columns: repeat(3, 1fr);
122-
gap: ${space(2)};
122+
gap: ${p => p.theme.space.md};
123123
`;
124124

125125
// ✅ Use Grid primitive
@@ -147,7 +147,7 @@ import {Stack} from '@sentry/scraps/layout';
147147
const Component = styled('div')`
148148
display: flex;
149149
flex-direction: column;
150-
gap: ${space(2)};
150+
gap: ${p => p.theme.space.md};
151151
`;
152152

153153
// ✅ Use Stack primitive (automatically column direction)
@@ -204,7 +204,7 @@ import {Text} from '@sentry/scraps/text';
204204
// ❌ Don't create styled text components
205205
const Label = styled('span')`
206206
color: ${p => p.theme.tokens.content.secondary};
207-
font-size: ${p => p.theme.fontSizes.small};
207+
font-size: ${p => p.theme.font.size.sm};
208208
`;
209209

210210
// ❌ Don't use raw elements
@@ -242,7 +242,7 @@ import {Heading} from '@sentry/scraps/text';
242242

243243
// ❌ Don't style heading elements
244244
const Title = styled('h2')`
245-
font-size: ${p => p.theme.fontSize.md};
245+
font-size: ${p => p.theme.font.size.md};
246246
font-weight: bold;
247247
`;
248248

@@ -401,7 +401,7 @@ Container supports `margin` props but they are deprecated. Use `gap` on parent c
401401
```tsx
402402
// ❌ Don't use margin between children
403403
const Child = styled('div')`
404-
margin-right: ${p => p.theme.spacing.lg};
404+
margin-right: ${p => p.theme.space.lg};
405405
`;
406406

407407
// ✅ Use gap on parent container
@@ -421,7 +421,7 @@ const Component = styled('div')`
421421
display: flex;
422422
flex-direction: column;
423423
color: ${p => p.theme.tokens.content.secondary};
424-
font-size: ${p => p.theme.fontSize.lg};
424+
font-size: ${p => p.theme.font.size.lg};
425425
`;
426426

427427
// ✅ Split into layout and typography primitives

.github/CODEOWNERS

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ pnpm-lock.yaml @getsentry/owners-js-de
221221
/src/sentry/organizations/ @getsentry/hybrid-cloud
222222
/tests/sentry/hybridcloud/ @getsentry/hybrid-cloud
223223
/tests/sentry/silo/ @getsentry/hybrid-cloud
224+
/tests/sentry/models/test_projectkeymapping.py @getsentry/hybrid-cloud
224225
/.agents/skills/hybrid-cloud-* @getsentry/hybrid-cloud
225226
## End of Hybrid Cloud
226227

@@ -570,7 +571,9 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py @get
570571
/src/sentry/dynamic_sampling/ @getsentry/telemetry-experience
571572
/tests/sentry/dynamic_sampling/ @getsentry/telemetry-experience
572573
/src/sentry/release_health/metrics_sessions_v2.py @getsentry/telemetry-experience
574+
/src/sentry/release_health/eap_sessions_rollout.py @getsentry/telemetry-experience
573575
/tests/sentry/release_health/test_metrics_sessions_v2.py @getsentry/telemetry-experience
576+
/tests/sentry/release_health/test_eap_sessions_rollout.py @getsentry/telemetry-experience
574577
/src/sentry/utils/platform_categories.py @getsentry/telemetry-experience
575578
/src/sentry/sentry_metrics/querying/ @getsentry/telemetry-experience
576579
/tests/sentry/sentry_metrics/querying/ @getsentry/telemetry-experience
@@ -595,6 +598,7 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py @get
595598
/tests/js/fixtures/detectedPlatform.ts @getsentry/value-discovery
596599
/static/app/views/projectInstall/ @getsentry/value-discovery
597600
/src/sentry/onboarding_tasks/ @getsentry/value-discovery
601+
/static/app/components/pipeline/ @getsentry/value-discovery
598602
## End of Value Discovery
599603

600604
## ML & AI
@@ -792,19 +796,24 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py @get
792796
/src/sentry/preprod/ @getsentry/emerge-tools
793797
/static/app/views/preprod/ @getsentry/emerge-tools
794798
/tests/sentry/preprod/ @getsentry/emerge-tools
799+
/static/app/components/events/eventInsightDiff.tsx @getsentry/emerge-tools
800+
/bin/preprod/ @getsentry/emerge-tools
795801
# End of preprod
796802

797803
## Frontend Platform (keep last as we want highest specificity)
798804
/static/app/utils/theme/ @getsentry/design-engineering
805+
/static/app/components/commandPalette/ @getsentry/design-engineering
799806
/static/app/components/core/ @getsentry/design-engineering
800807
/static/app/components/pageFilters/ @getsentry/design-engineering
801808
/static/app/icons/ @getsentry/design-engineering
802809
/static/app/stories/ @getsentry/design-engineering
810+
/static/app/components/commandPalette/ @getsentry/design-engineering
803811
/static/app/views/navigation/ @getsentry/design-engineering
804812
/static/less/ @getsentry/design-engineering
805813
/static/app/views/settings/ @getsentry/design-engineering
806814
/static/app/views/nav/ @getsentry/design-engineering
807815
/static/app/bootstrap/ @getsentry/design-engineering
816+
/static/app/components/commandPalette/ @getsentry/design-engineering
808817
# Config files
809818
/figma.config.json @getsentry/design-engineering
810819
/knip.config.ts @getsentry/design-engineering
@@ -854,15 +863,24 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py @get
854863
/tests/sentry/integrations/vsts/ @getsentry/ecosystem @getsentry/scm
855864
/tests/sentry/integrations/vsts_extension/ @getsentry/ecosystem @getsentry/scm
856865
/tests/sentry/integrations/perforce/ @getsentry/ecosystem @getsentry/scm
866+
/tests/sentry/scm/ @getsentry/scm
857867
## End of SCM
858868

869+
## SCM Frontend
870+
/static/app/components/repositories @getsentry/coding-workflows-sentry-frontend @getsentry/scm
871+
## End of SCM Frontend
872+
859873
# End of Coding Workflows
860874

861875
# Conduit
862876
/src/sentry/conduit/ @getsentry/sre-infrastructure-engineering
863877
/tests/sentry/conduit/ @getsentry/sre-infrastructure-engineering
864878
# End of Conduit
865879

880+
# Cell architecture
881+
/.agents/skills/cell-architecture @getsentry/sre-infrastructure-engineering
882+
# End of cell architecture
883+
866884
# Foundational Storage
867885
/src/sentry/objectstore/ @getsentry/foundational-storage
868886
/tests/sentry/objectstore/ @getsentry/foundational-storage

.github/actions/setup-sentry/action.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ inputs:
1919
description: 'Skip bringing up devservices'
2020
required: false
2121
default: 'false'
22+
devservices-timeout-minutes:
23+
description: 'Maximum minutes for devservices up'
24+
required: false
25+
default: '10'
2226

2327
outputs:
2428
matrix-instance-number:
@@ -131,13 +135,15 @@ runs:
131135
env:
132136
WORKDIR: ${{ inputs.workdir }}
133137
ENABLE_AUTORUN_MIGRATION_SEARCH_ISSUES: '1'
138+
DEVSERVICES_TIMEOUT: ${{ inputs.devservices-timeout-minutes }}
139+
DEVSERVICES_MODE: ${{ inputs.mode }}
134140
run: |
135141
sentry init
136142
137143
# This is necessary to bring up devservices with appropriate sentry config
138144
cd "$WORKDIR"
139145
140-
devservices up --mode ${{ inputs.mode }}
146+
timeout "${DEVSERVICES_TIMEOUT}m" devservices up --mode "$DEVSERVICES_MODE"
141147
142148
# have tests listen on the docker gateway ip so loopback can occur
143149
echo "DJANGO_LIVE_TEST_SERVER_ADDRESS=$(docker network inspect bridge --format='{{(index .IPAM.Config 0).Gateway}}')" >> "$GITHUB_ENV"

.github/codeowners-coverage-baseline.txt

Lines changed: 4 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ bin/load-integration-data
4646
bin/load-mocks
4747
bin/merge-catalogs
4848
bin/model-dependency-graphviz
49-
bin/preprod/test_pr_details
50-
bin/preprod/trigger_pr_comment
51-
bin/preprod/trigger_size_status_check
52-
bin/preprod/trigger_snapshot_status_check
5349
bin/run-model-tests
5450
bin/save-integration-data
5551
bin/send_metrics.py
@@ -481,21 +477,6 @@ static/app/components/collapsible.stories.tsx
481477
static/app/components/collapsible.tsx
482478
static/app/components/commandLine.spec.tsx
483479
static/app/components/commandLine.tsx
484-
static/app/components/commandPalette/__stories__/components.tsx
485-
static/app/components/commandPalette/context.tsx
486-
static/app/components/commandPalette/makeCommandPaletteAction.tsx
487-
static/app/components/commandPalette/types.tsx
488-
static/app/components/commandPalette/ui/constants.tsx
489-
static/app/components/commandPalette/ui/content.spec.tsx
490-
static/app/components/commandPalette/ui/content.tsx
491-
static/app/components/commandPalette/ui/list.tsx
492-
static/app/components/commandPalette/ui/modal.tsx
493-
static/app/components/commandPalette/ui/useCommandPaletteState.tsx
494-
static/app/components/commandPalette/useCommandPaletteActions.mdx
495-
static/app/components/commandPalette/useCommandPaletteActions.tsx
496-
static/app/components/commandPalette/useDsnLookupActions.spec.tsx
497-
static/app/components/commandPalette/useDsnLookupActions.tsx
498-
static/app/components/commandPalette/useGlobalCommandPaletteActions.tsx
499480
static/app/components/commitLink.tsx
500481
static/app/components/commitRow.spec.tsx
501482
static/app/components/commitRow.tsx
@@ -771,8 +752,6 @@ static/app/components/hook.spec.tsx
771752
static/app/components/hook.tsx
772753
static/app/components/hookOrDefault.spec.tsx
773754
static/app/components/hookOrDefault.tsx
774-
static/app/components/hotkeysLabel.spec.tsx
775-
static/app/components/hotkeysLabel.tsx
776755
static/app/components/hovercard.spec.tsx
777756
static/app/components/hovercard.tsx
778757
static/app/components/iconCircledNumber.tsx
@@ -1249,6 +1228,8 @@ static/app/debug/notifications/previews/slackPreview.tsx
12491228
static/app/debug/notifications/previews/teamsPreview.tsx
12501229
static/app/debug/notifications/types.ts
12511230
static/app/debug/notifications/views/index.tsx
1231+
static/app/endpoints/organizations/organizationsConfigIntegrationsQueryOptions.ts
1232+
static/app/endpoints/organizations/organizationsIntegrationsQueryOptions.ts
12521233
static/app/index.tsx
12531234
static/app/locale.spec.tsx
12541235
static/app/main.tsx
@@ -1520,6 +1501,8 @@ static/gsAdmin/components/addGiftBudgetAction.tsx
15201501
static/gsAdmin/components/addGiftEventsAction.spec.tsx
15211502
static/gsAdmin/components/addGiftEventsAction.tsx
15221503
static/gsAdmin/components/addOrRemoveOrgModal.tsx
1504+
static/gsAdmin/components/addToStartupProgramAction.spec.tsx
1505+
static/gsAdmin/components/addToStartupProgramAction.tsx
15231506
static/gsAdmin/components/adminConfirmationModal.spec.tsx
15241507
static/gsAdmin/components/adminConfirmationModal.tsx
15251508
static/gsAdmin/components/beacons/beaconCheckins.tsx
@@ -1936,10 +1919,6 @@ tests/sentry/billing/platform/services/usage/test_service.py
19361919
tests/sentry/buffer/__init__.py
19371920
tests/sentry/buffer/test_base.py
19381921
tests/sentry/buffer/test_redis.py
1939-
tests/sentry/cache/__init__.py
1940-
tests/sentry/cache/test_cache.py
1941-
tests/sentry/cache/test_django.py
1942-
tests/sentry/cache/test_redis.py
19431922
tests/sentry/charts/__init__.py
19441923
tests/sentry/charts/test_chartcuterie.py
19451924
tests/sentry/conf/__init__.py
@@ -2345,20 +2324,6 @@ tests/sentry/runner/commands/test_run.py
23452324
tests/sentry/runner/commands/unsetsync.yaml
23462325
tests/sentry/runner/commands/valid_patch.yaml
23472326
tests/sentry/runner/test_initializer.py
2348-
tests/sentry/scm/endpoints/test_scm_rpc.py
2349-
tests/sentry/scm/integration/test_github_provider_integration.py
2350-
tests/sentry/scm/integration/test_helpers_integration.py
2351-
tests/sentry/scm/integration/test_ipc_integration.py
2352-
tests/sentry/scm/integration/test_scm_actions_integration.py
2353-
tests/sentry/scm/test_fixtures.py
2354-
tests/sentry/scm/unit/private/test_ipc.py
2355-
tests/sentry/scm/unit/test_github_provider.py
2356-
tests/sentry/scm/unit/test_gitlab_provider.py
2357-
tests/sentry/scm/unit/test_helpers.py
2358-
tests/sentry/scm/unit/test_scm_actions.py
2359-
tests/sentry/scm/unit/test_scm_utils.py
2360-
tests/sentry/scm/unit/test_stream.py
2361-
tests/sentry/scm/unit/test_stream_producer.py
23622327
tests/sentry/security/__init__.py
23632328
tests/sentry/security/test_csp.py
23642329
tests/sentry/security/test_utils.py

.github/workflows/frontend-snapshots.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969

7070
- name: Install sentry-cli
7171
if: ${{ !cancelled() }}
72-
run: curl -sL https://sentry.io/get-cli/ | SENTRY_CLI_VERSION=3.3.4-snapshot.20260325.06cbbda sh
72+
run: curl -sL https://sentry.io/get-cli/ | SENTRY_CLI_VERSION=3.3.4 sh
7373

7474
- name: Upload snapshots
7575
id: upload

bin/preprod/upload_snapshots

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
#!/bin/bash
2+
set -euo pipefail
3+
4+
SENTRY_URL="http://127.0.0.1:8000"
5+
AUTH_TOKEN="${AUTH_TOKEN:?AUTH_TOKEN environment variable is required}"
6+
ORG_SLUG="sentry"
7+
PROJECT_SLUG="internal"
8+
APP_ID="test-app"
9+
10+
BEFORE_DIR="${BEFORE_DIR:-$HOME/Downloads/base_snapshots_export_small}"
11+
AFTER_DIR="${AFTER_DIR:-$HOME/Downloads/head_snapshots_export_small}"
12+
13+
TOP_ARGS=(
14+
--auth-token "$AUTH_TOKEN"
15+
--url "$SENTRY_URL"
16+
)
17+
18+
SUB_ARGS=(
19+
-o "$ORG_SLUG"
20+
-p "$PROJECT_SLUG"
21+
--app-id "$APP_ID"
22+
--no-git-metadata
23+
--vcs-provider github
24+
--head-repo-name "testing-repo"
25+
)
26+
27+
echo "=== Uploading: Baseline (main) ==="
28+
sentry-cli "${TOP_ARGS[@]}" build snapshots "$BEFORE_DIR" \
29+
"${SUB_ARGS[@]}" \
30+
--head-sha "1111111111111111111111111111111111111111" \
31+
--head-ref main
32+
33+
echo ""
34+
echo "=== Uploading: PR Branch (testing-branch) ==="
35+
sentry-cli "${TOP_ARGS[@]}" build snapshots "$AFTER_DIR" \
36+
"${SUB_ARGS[@]}" \
37+
--head-sha "2222222222222222222222222222222222222222" \
38+
--base-sha "1111111111111111111111111111111111111111" \
39+
--base-repo-name "testing-repo" \
40+
--head-ref "testing-branch" \
41+
--base-ref main \
42+
--pr-number 1

knip.config.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ const productionEntryPoints = [
1919
'static/app/icons/**/*.{js,ts,tsx}',
2020
// todo find out how chartcuterie works
2121
'static/app/chartcuterie/**/*.{js,ts,tsx}',
22+
// TODO: Remove when used
23+
'static/app/components/pipeline/**/*.{js,ts,tsx}',
2224
];
2325

2426
const testingEntryPoints = [

migrations_lockfile.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ replays: 0007_organizationmember_replay_access
3131

3232
seer: 0005_delete_seerorganizationsettings
3333

34-
sentry: 1056_add_explorer_autofix_fields
34+
sentry: 1057_drop_legacy_alert_rule_tables
3535

3636
social_auth: 0003_social_auth_json_field
3737

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ dependencies = [
8686
"sentry-forked-email-reply-parser>=0.5.12.post1",
8787
"sentry-kafka-schemas>=2.1.27",
8888
"sentry-ophio>=1.1.3",
89-
"sentry-protos>=0.8.7",
89+
"sentry-protos>=0.8.8",
9090
"sentry-redis-tools>=0.5.0",
9191
"sentry-relay>=0.9.25",
9292
"sentry-sdk[http2]>=2.47.0",

0 commit comments

Comments
 (0)