Merge branch 'master' into seer/use-billing-endpoints

Author: roaga

.github/workflows/acceptance.yml

@@ -84,7 +84,7 @@ jobs:
         uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           path: ${{ steps.config.outputs.webpack-path }}
-          key: ${{ runner.os }}-v2-webpack-cache-${{ hashFiles('webpack.config.ts') }}
+          key: ${{ runner.os }}-v2-webpack-cache-${{ hashFiles('rspack.config.ts', 'yarn.lock', 'package.json') }}
 
       - name: node_modules cache
         uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0

fixtures/stubs-for-mypy/progressbar/__init__.pyi

@@ -21,12 +21,12 @@ remote_subscriptions: 0003_drop_remote_subscription
 
 replays: 0005_drop_replay_index
 
-sentry: 0903_missing_indexes_in_state
+sentry: 0904_onboarding_task_project_id_idx
 
 social_auth: 0002_default_auto_field
 
 tempest: 0002_make_message_type_nullable
 
 uptime: 0042_extra_uptime_indexes
 
-workflow_engine: 0062_workflow_engine_missing_indexes
+workflow_engine: 0065_add_status_to_detector_and_workflow

fixtures/stubs-for-mypy/progressbar/bar.pyi

@@ -267,7 +267,8 @@
     "deref-api-docs": "ts-node api-docs/index.ts tests/apidocs/openapi-spectacular.json tests/apidocs/openapi-derefed.json",
     "build-chartcuterie-config": "node --experimental-strip-types config/build-chartcuterie.ts",
     "build-acceptance-rspack": "CODECOV_ENABLE_BA=false IS_ACCEPTANCE_TEST=1 NODE_ENV=production rspack",
-    "build-acceptance": "CODECOV_ENABLE_BA=false IS_ACCEPTANCE_TEST=1 NODE_ENV=production webpack",
+    "build-acceptance-webpack": "CODECOV_ENABLE_BA=false IS_ACCEPTANCE_TEST=1 NODE_ENV=production webpack",
+    "build-acceptance": "yarn build-acceptance-rspack",
     "build-production": "NODE_ENV=production webpack --mode production",
     "build-production-rspack": "NODE_ENV=production rspack --mode production",
     "build": "NODE_OPTIONS=--max-old-space-size=4096 webpack",

fixtures/stubs-for-mypy/progressbar/widgets.pyi

@@ -42,15 +42,14 @@ parsimonious>=0.10.0
 petname>=2.6
 phonenumberslite>=8.12.32
 Pillow>=11.0.0
-progressbar2>=3.41.0
 protobuf>=5.27.3
 proto-plus>=1.25.0
 python-rapidjson>=1.4
 psutil>=5.9.2
 psycopg2-binary>=2.9.10
 PyJWT>=2.4.0
 pydantic>=1.10.20,<2
-python-dateutil>=2.9.0
+python-dateutil>=2.9.0.post0
 pymemcache
 python-u2flib-server>=5.0.0
 fido2>=0.9.2
@@ -71,7 +70,7 @@ sentry-ophio>=1.1.3
 sentry-protos==0.2.0
 sentry-redis-tools>=0.5.0
 sentry-relay>=0.9.9
-sentry-sdk[http2]>=2.25.1
+sentry-sdk[http2]>=2.29.1
 slack-sdk>=3.27.2
 snuba-sdk>=3.0.43
 simplejson>=3.17.6

migrations_lockfile.txt

@@ -44,7 +44,7 @@ django==5.2.1
 django-crispy-forms==1.14.0
 django-csp==3.8
 django-pg-zero-downtime-migrations==0.18
-django-stubs-ext==5.1.3
+django-stubs-ext==5.2.0
 djangorestframework==3.16.0
 docker==7.1.0
 drf-spectacular==0.27.2
@@ -129,8 +129,7 @@ pip-tools==7.1.0
 platformdirs==4.2.0
 pluggy==1.5.0
 pre-commit==4.2.0
-progressbar2==3.41.0
-prompt-toolkit==3.0.41
+prompt-toolkit==3.0.51
 proto-plus==1.25.0
 protobuf==5.27.3
 psutil==5.9.7
@@ -155,10 +154,9 @@ pytest-rerunfailures==15.0
 pytest-sentry==0.3.0
 pytest-workaround-12888==1.0.0
 pytest-xdist==3.0.2
-python-dateutil==2.9.0
+python-dateutil==2.9.0.post0
 python-rapidjson==1.8
 python-u2flib-server==5.0.0
-python-utils==3.3.3
 python3-saml==1.15.0
 pyupgrade==3.19.1
 pyuwsgi==2.0.28.post1
@@ -184,18 +182,18 @@ sentry-arroyo==2.21.0
 sentry-cli==2.16.0
 sentry-covdefaults-disable-branch-coverage==1.0.2
 sentry-devenv==1.20.0
-sentry-forked-django-stubs==5.1.3.post2
-sentry-forked-djangorestframework-stubs==3.15.3.post1
+sentry-forked-django-stubs==5.2.0.post3
+sentry-forked-djangorestframework-stubs==3.16.0.post1
 sentry-forked-email-reply-parser==0.5.12.post1
 sentry-kafka-schemas==1.3.2
 sentry-ophio==1.1.3
 sentry-protos==0.2.0
 sentry-redis-tools==0.5.0
 sentry-relay==0.9.9
-sentry-sdk==2.27.0
+sentry-sdk==2.29.1
 sentry-usage-accountant==0.0.10
 simplejson==3.17.6
-six==1.16.0
+six==1.17.0
 slack-sdk==3.27.2
 sniffio==1.3.1
 snuba-sdk==3.0.43
@@ -234,15 +232,15 @@ types-setuptools==69.0.0.0
 types-simplejson==3.17.7.2
 types-unidiff==0.7.0.20240505
 typing-extensions==4.12.0
-tzdata==2023.3
+tzdata==2025.2
 ua-parser==0.10.0
 unidiff==0.7.4
 uritemplate==4.1.1
 urllib3==2.2.2
 vine==5.1.0
 virtualenv==20.26.6
 vroomrs==0.1.4
-wcwidth==0.2.10
+wcwidth==0.2.13
 werkzeug==3.0.6
 wheel==0.38.4
 wrapt==1.17.0

package.json

@@ -38,8 +38,8 @@ pip-tools>=7.1.0
 packaging>=21.3
 
 # for type checking
-sentry-forked-django-stubs>=5.1.3.post2
-sentry-forked-djangorestframework-stubs>=3.15.3.post1
+sentry-forked-django-stubs>=5.2.0.post3
+sentry-forked-djangorestframework-stubs>=3.16.0.post1
 lxml-stubs
 msgpack-types>=0.2.0
 mypy>=1.15

requirements-base.txt

@@ -88,8 +88,7 @@ parsimonious==0.10.0
 petname==2.6
 phonenumberslite==8.12.55
 pillow==11.0.0
-progressbar2==3.41.0
-prompt-toolkit==3.0.41
+prompt-toolkit==3.0.51
 proto-plus==1.25.0
 protobuf==5.27.3
 psutil==5.9.7
@@ -101,10 +100,9 @@ pycparser==2.21
 pydantic==1.10.20
 pyjwt==2.4.0
 pymemcache==4.0.0
-python-dateutil==2.9.0
+python-dateutil==2.9.0.post0
 python-rapidjson==1.8
 python-u2flib-server==5.0.0
-python-utils==3.3.3
 python3-saml==1.15.0
 pyuwsgi==2.0.28.post1
 pyvat==1.3.15
@@ -130,10 +128,10 @@ sentry-ophio==1.1.3
 sentry-protos==0.2.0
 sentry-redis-tools==0.5.0
 sentry-relay==0.9.9
-sentry-sdk==2.27.0
+sentry-sdk==2.29.1
 sentry-usage-accountant==0.0.10
 simplejson==3.17.6
-six==1.16.0
+six==1.17.0
 slack-sdk==3.27.2
 sniffio==1.3.1
 snuba-sdk==3.0.43
@@ -148,14 +146,14 @@ tldextract==5.1.2
 toronado==0.1.0
 tqdm==4.66.4
 typing-extensions==4.12.0
-tzdata==2023.3
+tzdata==2025.2
 ua-parser==0.10.0
 unidiff==0.7.4
 uritemplate==4.1.1
 urllib3==2.2.2
 vine==5.1.0
 vroomrs==0.1.4
-wcwidth==0.2.10
+wcwidth==0.2.13
 xmlsec==1.3.14
 zstandard==0.18.0
 

requirements-dev-frozen.txt

@@ -768,7 +768,7 @@ if (env.WEBPACK_CACHE_PATH) {
     // https://rspack.dev/config/experiments#cachestorage
     storage: {
       type: 'filesystem',
-      directory: env.WEBPACK_CACHE_PATH,
+      directory: path.join(__dirname, env.WEBPACK_CACHE_PATH),
     },
   };
 }

requirements-dev.txt

@@ -37,7 +37,7 @@
 from sentry.utils import auth
 from sentry.utils.hashlib import hash_values
 from sentry.utils.numbers import format_grouped_length
-from sentry.utils.sdk import bind_organization_context, set_measurement
+from sentry.utils.sdk import bind_organization_context, set_span_data
 
 
 class NoProjects(Exception):
@@ -566,7 +566,7 @@ def get_filter_params(
         len_projects = len(projects)
         sentry_sdk.set_tag("query.num_projects", len_projects)
         sentry_sdk.set_tag("query.num_projects.grouped", format_grouped_length(len_projects))
-        set_measurement("query.num_projects", len_projects)
+        set_span_data("query.num_projects", len_projects)
 
         params: FilterParams = {
             "start": start,

requirements-frozen.txt

@@ -28,7 +28,7 @@
 
 
 def handle_empty_organization_id_or_slug(
-    member_id: int, user_id: int, request: HttpRequest
+    member_id: int, user_id: int | None, request: HttpRequest
 ) -> RpcUserInviteContext | None:
     member_mapping: OrganizationMemberMapping | None = None
     member_mappings: Mapping[int, OrganizationMemberMapping] = {
@@ -70,7 +70,7 @@ def handle_empty_organization_id_or_slug(
 def get_invite_state(
     member_id: int,
     organization_id_or_slug: int | str | None,
-    user_id: int,
+    user_id: int | None,
     request: HttpRequest,
 ) -> RpcUserInviteContext | None:
 

rspack.config.ts

@@ -19,6 +19,7 @@
 from sentry.models.organization import Organization
 from sentry.models.project import Project
 from sentry.signals import project_transferred
+from sentry.users.models.user import User
 from sentry.utils import metrics
 from sentry.utils.signing import unsign
 
@@ -36,7 +37,7 @@ class AcceptProjectTransferEndpoint(Endpoint):
     authentication_classes = (SessionAuthentication,)
     permission_classes = (SentryIsAuthenticated,)
 
-    def get_validated_data(self, data, user):
+    def get_validated_data(self, data, user: User):
         try:
             data = unsign(force_str(data), salt=SALT)
         except SignatureExpired:
@@ -64,6 +65,9 @@ def get_validated_data(self, data, user):
 
     @sudo_required
     def get(self, request: Request) -> Response:
+        if not request.user.is_authenticated:
+            return Response(status=400)
+
         try:
             data = request.GET["data"]
         except KeyError:
@@ -92,6 +96,9 @@ def get(self, request: Request) -> Response:
 
     @sudo_required
     def post(self, request: Request) -> Response:
+        if not request.user.is_authenticated:
+            return Response(status=400)
+
         try:
             data = request.data["data"]
         except KeyError:

src/sentry/api/bases/organization.py

@@ -27,6 +27,9 @@ class ApiAuthorizationsEndpoint(Endpoint):
     permission_classes = (SentryIsAuthenticated,)
 
     def get(self, request: Request) -> Response:
+        if not request.user.is_authenticated:
+            return Response(status=400)
+
         queryset = ApiAuthorization.objects.filter(
             user_id=request.user.id, application__status=ApiApplicationStatus.active
         ).select_related("application")
@@ -40,6 +43,9 @@ def get(self, request: Request) -> Response:
         )
 
     def delete(self, request: Request) -> Response:
+        if not request.user.is_authenticated:
+            return Response(status=400)
+
         authorization = request.data.get("authorization")
         if not authorization:
             return Response({"authorization": ""}, status=400)

src/sentry/api/endpoints/accept_organization_invite.py

@@ -39,6 +39,8 @@ def get_appropriate_user_id(request: Request) -> int:
     For GET endpoints, the GET dict is used.
     For all others, the DATA dict is used.
     """
+    assert request.user.is_authenticated
+
     # Get the user id for the user that made the current request as a baseline default
     user_id = request.user.id
     if has_elevated_mode(request):

src/sentry/api/endpoints/accept_project_transfer.py

@@ -65,6 +65,9 @@ class AssistantEndpoint(Endpoint):
 
     def get(self, request: Request) -> Response:
         """Return all the guides with a 'seen' attribute if it has been 'viewed' or 'dismissed'."""
+        if not request.user.is_authenticated:
+            return Response(status=400)
+
         seen_ids = set(
             AssistantActivity.objects.filter(user_id=request.user.id).values_list(
                 "guide_id", flat=True
@@ -85,6 +88,9 @@ def put(self, request: Request):
             'useful' (optional): true / false,
         }
         """
+        if not request.user.is_authenticated:
+            return Response(status=400)
+
         serializer = AssistantSerializer(data=request.data)
 
         if not serializer.is_valid():

src/sentry/api/endpoints/api_authorizations.py

@@ -60,6 +60,9 @@ def get(self, request: Request, broadcast_id) -> Response:
         return self._serialize_response(request, broadcast)
 
     def put(self, request: Request, broadcast_id) -> Response:
+        if not request.user.is_authenticated:
+            return Response(status=400)
+
         broadcast = self._get_broadcast(request, broadcast_id)
         validator = self._get_validator(request)(data=request.data, partial=True)
         if not validator.is_valid():

src/sentry/api/endpoints/api_tokens.py

@@ -132,7 +132,10 @@ def get(
             paginator_cls=paginator_cls,
         )
 
-    def put(self, request: Request):
+    def put(self, request: Request) -> Response:
+        if not request.user.is_authenticated:
+            return Response(status=401)
+
         validator = BroadcastValidator(data=request.data, partial=True)
         if not validator.is_valid():
             return self.respond(validator.errors, status=400)
@@ -146,9 +149,6 @@ def put(self, request: Request):
             queryset = queryset.filter(id__in=ids)
 
         if result.get("hasSeen"):
-            if not request.user.is_authenticated:
-                return self.respond(status=401)
-
             if ids:
                 unseen_queryset = queryset
             else:
@@ -166,6 +166,8 @@ def put(self, request: Request):
         return self.respond(result)
 
     def post(self, request: Request) -> Response:
+        if not request.user.is_authenticated:
+            return Response(status=400)
         if not request.access.has_permission("broadcasts.admin"):
             return self.respond(status=401)
 

src/sentry/api/endpoints/assistant.py

@@ -100,6 +100,9 @@ def get(self, request: Request, group: Group) -> Response:
         """
         Checks if we are able to run Autofix on the given group.
         """
+        if not request.user.is_authenticated:
+            return Response(status=400)
+
         org: Organization = request.organization
 
         integration_check = None