Merge remote-tracking branch 'origin/master' into silo-mode-test-decorators

Author: lynnagara

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

@@ -51,7 +51,7 @@ import {Container} from '@sentry/scraps/layout';
 
 // ❌ Don't create styled components
 const Component = styled('div')`
-  padding: ${space(2)};
+  padding: ${p => p.theme.space.md};
   border: 1px solid ${p => p.theme.tokens.border.primary};
 `;
 
@@ -119,7 +119,7 @@ import {Grid} from '@sentry/scraps/layout';
 const Component = styled('div')`
   display: grid;
   grid-template-columns: repeat(3, 1fr);
-  gap: ${space(2)};
+  gap: ${p => p.theme.space.md};
 `;
 
 // ✅ Use Grid primitive
@@ -147,7 +147,7 @@ import {Stack} from '@sentry/scraps/layout';
 const Component = styled('div')`
   display: flex;
   flex-direction: column;
-  gap: ${space(2)};
+  gap: ${p => p.theme.space.md};
 `;
 
 // ✅ Use Stack primitive (automatically column direction)
@@ -204,7 +204,7 @@ import {Text} from '@sentry/scraps/text';
 // ❌ Don't create styled text components
 const Label = styled('span')`
   color: ${p => p.theme.tokens.content.secondary};
-  font-size: ${p => p.theme.fontSizes.small};
+  font-size: ${p => p.theme.font.size.sm};
 `;
 
 // ❌ Don't use raw elements
@@ -242,7 +242,7 @@ import {Heading} from '@sentry/scraps/text';
 
 // ❌ Don't style heading elements
 const Title = styled('h2')`
-  font-size: ${p => p.theme.fontSize.md};
+  font-size: ${p => p.theme.font.size.md};
   font-weight: bold;
 `;
 
@@ -401,7 +401,7 @@ Container supports `margin` props but they are deprecated. Use `gap` on parent c
 ```tsx
 // ❌ Don't use margin between children
 const Child = styled('div')`
-  margin-right: ${p => p.theme.spacing.lg};
+  margin-right: ${p => p.theme.space.lg};
 `;
 
 // ✅ Use gap on parent container
@@ -421,7 +421,7 @@ const Component = styled('div')`
   display: flex;
   flex-direction: column;
   color: ${p => p.theme.tokens.content.secondary};
-  font-size: ${p => p.theme.fontSize.lg};
+  font-size: ${p => p.theme.font.size.lg};
 `;
 
 // ✅ Split into layout and typography primitives

.github/CODEOWNERS

@@ -221,6 +221,7 @@ pnpm-lock.yaml                                           @getsentry/owners-js-de
 /src/sentry/organizations/                               @getsentry/hybrid-cloud
 /tests/sentry/hybridcloud/                               @getsentry/hybrid-cloud
 /tests/sentry/silo/                                      @getsentry/hybrid-cloud
+/tests/sentry/models/test_projectkeymapping.py           @getsentry/hybrid-cloud
 /.agents/skills/hybrid-cloud-*                           @getsentry/hybrid-cloud
 ## End of Hybrid Cloud
 
@@ -570,7 +571,9 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py          @get
 /src/sentry/dynamic_sampling/                                                    @getsentry/telemetry-experience
 /tests/sentry/dynamic_sampling/                                                  @getsentry/telemetry-experience
 /src/sentry/release_health/metrics_sessions_v2.py                                @getsentry/telemetry-experience
+/src/sentry/release_health/eap_sessions_rollout.py                               @getsentry/telemetry-experience
 /tests/sentry/release_health/test_metrics_sessions_v2.py                         @getsentry/telemetry-experience
+/tests/sentry/release_health/test_eap_sessions_rollout.py                        @getsentry/telemetry-experience
 /src/sentry/utils/platform_categories.py                                         @getsentry/telemetry-experience
 /src/sentry/sentry_metrics/querying/                                             @getsentry/telemetry-experience
 /tests/sentry/sentry_metrics/querying/                                           @getsentry/telemetry-experience
@@ -793,6 +796,8 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py          @get
 /src/sentry/preprod/                                   @getsentry/emerge-tools
 /static/app/views/preprod/                             @getsentry/emerge-tools
 /tests/sentry/preprod/                                 @getsentry/emerge-tools
+/static/app/components/events/eventInsightDiff.tsx     @getsentry/emerge-tools
+/bin/preprod/                                          @getsentry/emerge-tools
 # End of preprod
 
 ## Frontend Platform (keep last as we want highest specificity)
@@ -858,6 +863,7 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py          @get
 /tests/sentry/integrations/vsts/                                        @getsentry/ecosystem @getsentry/scm
 /tests/sentry/integrations/vsts_extension/                              @getsentry/ecosystem @getsentry/scm
 /tests/sentry/integrations/perforce/                                    @getsentry/ecosystem @getsentry/scm
+/tests/sentry/scm/                                                      @getsentry/scm
 ## End of SCM
 
 # End of Coding Workflows

.github/codeowners-coverage-baseline.txt

@@ -46,10 +46,6 @@ bin/load-integration-data
 bin/load-mocks
 bin/merge-catalogs
 bin/model-dependency-graphviz
-bin/preprod/test_pr_details
-bin/preprod/trigger_pr_comment
-bin/preprod/trigger_size_status_check
-bin/preprod/trigger_snapshot_status_check
 bin/run-model-tests
 bin/save-integration-data
 bin/send_metrics.py
@@ -1507,6 +1503,8 @@ static/gsAdmin/components/addGiftBudgetAction.tsx
 static/gsAdmin/components/addGiftEventsAction.spec.tsx
 static/gsAdmin/components/addGiftEventsAction.tsx
 static/gsAdmin/components/addOrRemoveOrgModal.tsx
+static/gsAdmin/components/addToStartupProgramAction.spec.tsx
+static/gsAdmin/components/addToStartupProgramAction.tsx
 static/gsAdmin/components/adminConfirmationModal.spec.tsx
 static/gsAdmin/components/adminConfirmationModal.tsx
 static/gsAdmin/components/beacons/beaconCheckins.tsx
@@ -2328,20 +2326,6 @@ tests/sentry/runner/commands/test_run.py
 tests/sentry/runner/commands/unsetsync.yaml
 tests/sentry/runner/commands/valid_patch.yaml
 tests/sentry/runner/test_initializer.py
-tests/sentry/scm/endpoints/test_scm_rpc.py
-tests/sentry/scm/integration/test_github_provider_integration.py
-tests/sentry/scm/integration/test_helpers_integration.py
-tests/sentry/scm/integration/test_ipc_integration.py
-tests/sentry/scm/integration/test_scm_actions_integration.py
-tests/sentry/scm/test_fixtures.py
-tests/sentry/scm/unit/private/test_ipc.py
-tests/sentry/scm/unit/test_github_provider.py
-tests/sentry/scm/unit/test_gitlab_provider.py
-tests/sentry/scm/unit/test_helpers.py
-tests/sentry/scm/unit/test_scm_actions.py
-tests/sentry/scm/unit/test_scm_utils.py
-tests/sentry/scm/unit/test_stream.py
-tests/sentry/scm/unit/test_stream_producer.py
 tests/sentry/security/__init__.py
 tests/sentry/security/test_csp.py
 tests/sentry/security/test_utils.py

.github/workflows/frontend-snapshots.yml

@@ -69,7 +69,7 @@ jobs:
 
       - name: Install sentry-cli
         if: ${{ !cancelled() }}
-        run: curl -sL https://sentry.io/get-cli/ | SENTRY_CLI_VERSION=3.3.3 sh
+        run: curl -sL https://sentry.io/get-cli/ | SENTRY_CLI_VERSION=3.3.4 sh
 
       - name: Upload snapshots
         id: upload

bin/preprod/upload_snapshots

@@ -0,0 +1,42 @@
+#!/bin/bash
+set -euo pipefail
+
+SENTRY_URL="http://127.0.0.1:8000"
+AUTH_TOKEN="${AUTH_TOKEN:?AUTH_TOKEN environment variable is required}"
+ORG_SLUG="sentry"
+PROJECT_SLUG="internal"
+APP_ID="test-app"
+
+BEFORE_DIR="${BEFORE_DIR:-$HOME/Downloads/base_snapshots_export_small}"
+AFTER_DIR="${AFTER_DIR:-$HOME/Downloads/head_snapshots_export_small}"
+
+TOP_ARGS=(
+  --auth-token "$AUTH_TOKEN"
+  --url "$SENTRY_URL"
+)
+
+SUB_ARGS=(
+  -o "$ORG_SLUG"
+  -p "$PROJECT_SLUG"
+  --app-id "$APP_ID"
+  --no-git-metadata
+  --vcs-provider github
+  --head-repo-name "testing-repo"
+)
+
+echo "=== Uploading: Baseline (main) ==="
+sentry-cli "${TOP_ARGS[@]}" build snapshots "$BEFORE_DIR" \
+  "${SUB_ARGS[@]}" \
+  --head-sha "1111111111111111111111111111111111111111" \
+  --head-ref main
+
+echo ""
+echo "=== Uploading: PR Branch (testing-branch) ==="
+sentry-cli "${TOP_ARGS[@]}" build snapshots "$AFTER_DIR" \
+  "${SUB_ARGS[@]}" \
+  --head-sha "2222222222222222222222222222222222222222" \
+  --base-sha "1111111111111111111111111111111111111111" \
+  --base-repo-name "testing-repo" \
+  --head-ref "testing-branch" \
+  --base-ref main \
+  --pr-number 1

migrations_lockfile.txt

@@ -31,7 +31,7 @@ replays: 0007_organizationmember_replay_access
 
 seer: 0005_delete_seerorganizationsettings
 
-sentry: 1056_add_explorer_autofix_fields
+sentry: 1057_drop_legacy_alert_rule_tables
 
 social_auth: 0003_social_auth_json_field
 

pyproject.toml

@@ -86,7 +86,7 @@ dependencies = [
   "sentry-forked-email-reply-parser>=0.5.12.post1",
   "sentry-kafka-schemas>=2.1.27",
   "sentry-ophio>=1.1.3",
-  "sentry-protos>=0.8.7",
+  "sentry-protos>=0.8.8",
   "sentry-redis-tools>=0.5.0",
   "sentry-relay>=0.9.25",
   "sentry-sdk[http2]>=2.47.0",

setup.cfg

@@ -88,8 +88,6 @@ sentry =
 # All other linting (E, W, F, B, LOG, I) is handled by ruff.
 # See [tool.ruff] in pyproject.toml for the main linting configuration.
 select = S
-# S016 is temporarily disabled until the ThreadPoolExecutor migration is complete.
-extend-ignore = S016
 per-file-ignores =
     # these scripts must have minimal dependencies so opt out of the usual sentry rules
     .github/*: S

src/sentry/api/bases/organization_events.py

@@ -831,6 +831,7 @@ def get_additional_queries(self, request: Request) -> AdditionalQueries:
             span=request.GET.getlist("spanQuery"),
             log=request.GET.getlist("logQuery"),
             metric=request.GET.getlist("metricQuery"),
+            occurrences=request.GET.getlist("occurrencesQuery"),
         )
 
 

src/sentry/api/endpoints/organization_ai_conversations.py

@@ -365,7 +365,7 @@ def _build_enrichment_query(
     ) -> TableQuery:
         return TableQuery(
             name="enrichment",
-            query_string=f"gen_ai.conversation.id:[{','.join(conversation_ids)}]",
+            query_string=f"gen_ai.conversation.id:[{','.join(conversation_ids)}] has:gen_ai.operation.type",
             selected_columns=[
                 "gen_ai.conversation.id",
                 "gen_ai.operation.type",