Merge branch 'master' into ryan953/rm-nonbadges

Author: ryan953

.github/actions/collect-test-data/action.yml

@@ -0,0 +1,35 @@
+name: 'Collect Test Data'
+description: 'Collects test data and uploads it to our internal test data collection service.'
+
+inputs:
+  artifact_path:
+    description: 'Path to test data output artifact to upload to our internal test data collection service'
+    required: true
+  gcs_bucket:
+    description: 'The GCS bucket to upload the test data to'
+    required: true
+  gcp_project_id:
+    description: 'The GCP project ID to use for uploading the test data'
+    required: true
+  workload_identity_provider:
+    description: 'The workload identity provider to use for uploading the test data'
+    required: true
+  service_account_email:
+    description: 'The service account email to use for uploading the test data'
+    required: true
+  matrix_instance_number:
+    description: 'The instance number of the matrix job'
+    required: false
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Collect test data
+      uses: getsentry/action-collect-test-data@c0a2fd3f79d3867e2c8b486ccb1c4bf925477742 # v0.3.0
+      with:
+        path: ${{ inputs.artifact_path }}
+        gcs_path: ${{ inputs.gcs_bucket }}/pytest/${{ github.repository }}/${{ github.workflow }}/${{ github.job }}${{ inputs.matrix_instance_number != '' && '/instance' || '' }}${{ inputs.matrix_instance_number != '' && inputs.matrix_instance_number || '' }}/${{ github.repository_id }}/${{ github.run_id }}/${{ github.run_attempt }}
+        gcp_project_id: ${{ inputs.gcp_project_id }}
+        workload_identity_provider: ${{ inputs.workload_identity_provider }}
+        service_account_email: ${{ inputs.service_account_email }}
+      continue-on-error: true

.github/workflows/acceptance.yml

@@ -46,6 +46,9 @@ jobs:
     name: acceptance
     runs-on: ubuntu-22.04
     timeout-minutes: 30
+    permissions:
+      contents: read
+      id-token: write
     strategy:
       # This helps not having to run multiple jobs because one fails, thus, reducing resource usage
       # and reducing the risk that one of many runs would turn red again (read: intermittent tests)
@@ -113,6 +116,17 @@ jobs:
       - name: Run acceptance tests (#${{ steps.setup.outputs.matrix-instance-number }} of ${{ steps.setup.outputs.matrix-instance-total }})
         run: make run-acceptance
 
+      - name: Collect test data
+        uses: ./.github/actions/collect-test-data
+        if: ${{ !cancelled() && needs.files-changed.outputs.backend_all == 'true' }}
+        with:
+          artifact_path: .artifacts/pytest.acceptance.json
+          gcs_bucket: ${{ secrets.COLLECT_TEST_DATA_GCS_BUCKET }}
+          gcp_project_id: ${{ secrets.COLLECT_TEST_DATA_GCP_PROJECT_ID }}
+          workload_identity_provider: ${{ secrets.SENTRY_GCP_DEV_WORKLOAD_IDENTITY_POOL }}
+          service_account_email: ${{ secrets.COLLECT_TEST_DATA_SERVICE_ACCOUNT_EMAIL }}
+          matrix_instance_number: ${{ steps.setup.outputs.matrix-instance-number }}
+
       # This job runs when FE or BE changes happen, however, we only upload coverage data for
       # BE changes since it conflicts with codecov's carry forward functionality
       # Upload coverage data even if running the tests step fails since

.github/workflows/backend.yml

@@ -67,6 +67,9 @@ jobs:
     name: backend test
     runs-on: ubuntu-22.04
     timeout-minutes: 60
+    permissions:
+      contents: read
+      id-token: write
     strategy:
       # This helps not having to run multiple jobs because one fails, thus, reducing resource usage
       # and reducing the risk that one of many runs would turn red again (read: intermittent tests)
@@ -106,6 +109,17 @@ jobs:
         run: |
           make test-python-ci
 
+      - name: Collect test data
+        uses: ./.github/actions/collect-test-data
+        if: ${{ !cancelled() }}
+        with:
+          artifact_path: .artifacts/pytest.json
+          gcs_bucket: ${{ secrets.COLLECT_TEST_DATA_GCS_BUCKET }}
+          gcp_project_id: ${{ secrets.COLLECT_TEST_DATA_GCP_PROJECT_ID }}
+          workload_identity_provider: ${{ secrets.SENTRY_GCP_DEV_WORKLOAD_IDENTITY_POOL }}
+          service_account_email: ${{ secrets.COLLECT_TEST_DATA_SERVICE_ACCOUNT_EMAIL }}
+          matrix_instance_number: ${{ steps.setup.outputs.matrix-instance-number }}
+
       # Upload coverage data even if running the tests step fails since
       # it reduces large coverage fluctuations
       - name: Handle artifacts
@@ -245,6 +259,9 @@ jobs:
     name: monolith-dbs test
     runs-on: ubuntu-22.04
     timeout-minutes: 20
+    permissions:
+      contents: read
+      id-token: write
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
@@ -260,6 +277,16 @@ jobs:
         run: |
           make test-monolith-dbs
 
+      - name: Collect test data
+        uses: ./.github/actions/collect-test-data
+        if: ${{ !cancelled() }}
+        with:
+          artifact_path: .artifacts/pytest.monolith-dbs.json
+          gcs_bucket: ${{ secrets.COLLECT_TEST_DATA_GCS_BUCKET }}
+          gcp_project_id: ${{ secrets.COLLECT_TEST_DATA_GCP_PROJECT_ID }}
+          workload_identity_provider: ${{ secrets.SENTRY_GCP_DEV_WORKLOAD_IDENTITY_POOL }}
+          service_account_email: ${{ secrets.COLLECT_TEST_DATA_SERVICE_ACCOUNT_EMAIL }}
+
       # Upload coverage data even if running the tests step fails since
       # it reduces large coverage fluctuations
       - name: Handle artifacts

Makefile

@@ -91,7 +91,7 @@ fetch-release-registry:
 
 run-acceptance:
 	@echo "--> Running acceptance tests"
-	pytest tests/acceptance --cov . --cov-report="xml:.artifacts/acceptance.coverage.xml" --json-report --json-report-file=".artifact/pytest.acceptance.json" --json-report-omit=log
+	pytest tests/acceptance --cov . --cov-report="xml:.artifacts/acceptance.coverage.xml" --json-report --json-report-file=".artifacts/pytest.acceptance.json" --json-report-omit=log
 	@echo ""
 
 test-cli: create-db

fixtures/backup/model_dependencies/detailed.json

@@ -1748,11 +1748,6 @@
         "kind": "FlexibleForeignKey",
         "model": "sentry.docintegration",
         "nullable": false
-      },
-      "file_id": {
-        "kind": "ImplicitForeignKey",
-        "model": "sentry.file",
-        "nullable": true
       }
     },
     "model": "sentry.docintegrationavatar",
@@ -1766,9 +1761,6 @@
       [
         "control_file_id"
       ],
-      [
-        "file_id"
-      ],
       [
         "ident"
       ]
@@ -5538,11 +5530,6 @@
         "model": "sentry.controlfile",
         "nullable": true
       },
-      "file_id": {
-        "kind": "ImplicitForeignKey",
-        "model": "sentry.file",
-        "nullable": true
-      },
       "sentry_app": {
         "kind": "FlexibleForeignKey",
         "model": "sentry.sentryapp",
@@ -5560,9 +5547,6 @@
       [
         "control_file_id"
       ],
-      [
-        "file_id"
-      ],
       [
         "ident"
       ]
@@ -5986,11 +5970,6 @@
         "model": "sentry.controlfile",
         "nullable": true
       },
-      "file_id": {
-        "kind": "ImplicitForeignKey",
-        "model": "sentry.file",
-        "nullable": true
-      },
       "user": {
         "kind": "FlexibleForeignKey",
         "model": "sentry.user",
@@ -6008,9 +5987,6 @@
       [
         "control_file_id"
       ],
-      [
-        "file_id"
-      ],
       [
         "ident"
       ],

fixtures/backup/model_dependencies/flat.json

@@ -240,8 +240,7 @@
   "sentry.docintegration": [],
   "sentry.docintegrationavatar": [
     "sentry.controlfile",
-    "sentry.docintegration",
-    "sentry.file"
+    "sentry.docintegration"
   ],
   "sentry.email": [],
   "sentry.environment": [
@@ -763,7 +762,6 @@
   ],
   "sentry.sentryappavatar": [
     "sentry.controlfile",
-    "sentry.file",
     "sentry.sentryapp"
   ],
   "sentry.sentryappcomponent": [
@@ -823,7 +821,6 @@
   "sentry.user": [],
   "sentry.useravatar": [
     "sentry.controlfile",
-    "sentry.file",
     "sentry.user"
   ],
   "sentry.useremail": [

fixtures/backup/model_dependencies/sorted.json

@@ -14,6 +14,7 @@
   "sentry.controltombstone",
   "sentry.deletedorganization",
   "sentry.docintegration",
+  "sentry.docintegrationavatar",
   "sentry.fileblob",
   "sentry.identityprovider",
   "sentry.integration",
@@ -51,6 +52,7 @@
   "sentry.team",
   "sentry.teamreplica",
   "sentry.user",
+  "sentry.useravatar",
   "sentry.userip",
   "sentry.useroption",
   "sentry.userpermission",
@@ -92,7 +94,6 @@
   "sentry.eventattachment",
   "sentry.environment",
   "sentry.email",
-  "sentry.docintegrationavatar",
   "sentry.distribution",
   "sentry.discoversavedquery",
   "sentry.deploy",
@@ -124,7 +125,6 @@
   "feedback.feedback",
   "sentry.userreport",
   "sentry.useremail",
-  "sentry.useravatar",
   "sentry.teamkeytransaction",
   "sentry.snubaquery",
   "sentry.sentryapp",

fixtures/backup/model_dependencies/truncate.json

@@ -14,6 +14,7 @@
   "sentry_controltombstone",
   "sentry_deletedorganization",
   "sentry_docintegration",
+  "sentry_docintegrationavatar",
   "sentry_fileblob",
   "sentry_identityprovider",
   "sentry_integration",
@@ -51,6 +52,7 @@
   "sentry_team",
   "sentry_teamreplica",
   "auth_user",
+  "sentry_useravatar",
   "sentry_userip",
   "sentry_useroption",
   "sentry_userpermission",
@@ -92,7 +94,6 @@
   "sentry_eventattachment",
   "sentry_environment",
   "sentry_email",
-  "sentry_docintegrationavatar",
   "sentry_distribution",
   "sentry_discoversavedquery",
   "sentry_deploy",
@@ -124,7 +125,6 @@
   "feedback_feedback",
   "sentry_userreport",
   "sentry_useremail",
-  "sentry_useravatar",
   "sentry_performanceteamkeytransaction",
   "sentry_snubaquery",
   "sentry_sentryapp",

fixtures/js-stubs/monitor.tsx

@@ -5,8 +5,8 @@ import {
   ScheduleType,
 } from 'sentry/views/monitors/types';
 
+import {ActorFixture} from './actor';
 import {ProjectFixture} from './project';
-import {UserFixture} from './user';
 
 export function MonitorFixture(params: Partial<Monitor> = {}): Monitor {
   return {
@@ -16,7 +16,7 @@ export function MonitorFixture(params: Partial<Monitor> = {}): Monitor {
     project: ProjectFixture(),
     slug: 'my-monitor',
     status: 'active',
-    owner: `user:${UserFixture().id}`,
+    owner: ActorFixture(),
     type: MonitorType.CRON_JOB,
     config: {
       checkin_margin: 5,

migrations_lockfile.txt

@@ -9,5 +9,5 @@ feedback: 0004_index_together
 hybridcloud: 0016_add_control_cacheversion
 nodestore: 0002_nodestore_no_dictfield
 replays: 0004_index_together
-sentry: 0697_remove_monitor_owner_actor_id_db
+sentry: 0698_remove_file_id_from_control_avatars
 social_auth: 0002_default_auto_field

requirements-base.txt

@@ -66,7 +66,7 @@ sentry-arroyo>=2.16.5
 sentry-kafka-schemas>=0.1.68
 sentry-ophio==0.2.7
 sentry-redis-tools>=0.1.7
-sentry-relay>=0.8.56
+sentry-relay>=0.8.57
 sentry-sdk==2.0.0rc3
 snuba-sdk>=2.0.32
 simplejson>=3.17.6

requirements-dev-frozen.txt

@@ -183,7 +183,7 @@ sentry-forked-djangorestframework-stubs==3.14.5.post1
 sentry-kafka-schemas==0.1.68
 sentry-ophio==0.2.7
 sentry-redis-tools==0.1.7
-sentry-relay==0.8.56
+sentry-relay==0.8.57
 sentry-sdk==2.0.0rc3
 sentry-usage-accountant==0.0.10
 simplejson==3.17.6

requirements-frozen.txt

@@ -123,7 +123,7 @@ sentry-arroyo==2.16.5
 sentry-kafka-schemas==0.1.68
 sentry-ophio==0.2.7
 sentry-redis-tools==0.1.7
-sentry-relay==0.8.56
+sentry-relay==0.8.57
 sentry-sdk==2.0.0rc3
 sentry-usage-accountant==0.0.10
 simplejson==3.17.6

src/sentry/api/endpoints/event_owners.py

@@ -8,9 +8,9 @@
 from sentry.api.bases.project import ProjectEndpoint
 from sentry.api.serializers import serialize
 from sentry.api.serializers.models.actor import ActorSerializer
-from sentry.models.actor import ActorTuple
 from sentry.models.projectownership import ProjectOwnership
 from sentry.models.team import Team
+from sentry.utils.actor import ActorTuple
 
 
 @region_silo_endpoint

src/sentry/api/fields/actor.py

@@ -4,10 +4,10 @@
 from drf_spectacular.utils import extend_schema_field
 from rest_framework import serializers
 
-from sentry.models.actor import ActorTuple
 from sentry.models.organizationmember import OrganizationMember
 from sentry.models.team import Team
 from sentry.models.user import User
+from sentry.utils.actor import ActorTuple
 
 
 @extend_schema_field(field=OpenApiTypes.STR)

src/sentry/api/helpers/group_index/update.py

@@ -27,7 +27,7 @@
 from sentry.issues.status_change import handle_status_update
 from sentry.issues.update_inbox import update_inbox
 from sentry.models.activity import Activity, ActivityIntegration
-from sentry.models.actor import Actor, ActorTuple
+from sentry.models.actor import Actor
 from sentry.models.group import STATUS_UPDATE_CHOICES, Group, GroupStatus
 from sentry.models.groupassignee import GroupAssignee
 from sentry.models.groupbookmark import GroupBookmark
@@ -56,6 +56,7 @@
 from sentry.types.activity import ActivityType
 from sentry.types.group import SUBSTATUS_UPDATE_CHOICES, GroupSubStatus, PriorityLevel
 from sentry.utils import metrics
+from sentry.utils.actor import ActorTuple
 
 from . import ACTIVITIES_COUNT, BULK_MUTATION_LIMIT, SearchFunction, delete_group_list
 from .validators import GroupValidator, ValidationError

src/sentry/api/serializers/models/project.py

@@ -1046,9 +1046,11 @@ def format_options(self, attrs: dict[str, Any]) -> dict[str, Any]:
                 self.get_value_with_default(attrs, "sentry:feedback_user_report_notifications")
             ),
             "sentry:feedback_ai_spam_detection": bool(
-                options.get("sentry:feedback_ai_spam_detection")
+                self.get_value_with_default(attrs, "sentry:feedback_ai_spam_detection")
+            ),
+            "sentry:replay_rage_click_issues": self.get_value_with_default(
+                attrs, "sentry:replay_rage_click_issues"
             ),
-            "sentry:replay_rage_click_issues": options.get("sentry:replay_rage_click_issues"),
             "quotas:spike-protection-disabled": options.get("quotas:spike-protection-disabled"),
         }