Merge branch 'master' into raj/refactor-slack-metric-alerts

Author: iamrajjoshi

.github/CODEOWNERS

@@ -171,6 +171,8 @@ yarn.lock                                                @getsentry/owners-js-de
 /static/app/views/alerts/                                 @getsentry/alerts-notifications
 /static/app/views/alerts/rules/uptime                     @getsentry/crons
 /static/app/views/releases/                               @getsentry/alerts-notifications
+/static/app/views/releases/drawer/                        @getsentry/replay-frontend
+/static/app/views/releases/releaseBubbles/                @getsentry/replay-frontend
 /src/sentry/rules/processing/delayed_processing.py        @getsentry/alerts-notifications
 
 /static/app/views/settings/account/notifications/         @getsentry/alerts-notifications
@@ -329,11 +331,11 @@ tests/sentry/api/endpoints/test_organization_dashboard_widget_details.py     @ge
 
 
 ## Replays
-/static/app/components/replays/   @getsentry/replay-frontend
-/static/app/utils/replays/        @getsentry/replay-frontend
-/static/app/views/replays/        @getsentry/replay-frontend
-/src/sentry/replays/              @getsentry/replay-backend
-/tests/sentry/replays/            @getsentry/replay-backend
+/static/app/components/replays/                             @getsentry/replay-frontend
+/static/app/utils/replays/                                  @getsentry/replay-frontend
+/static/app/views/replays/                                  @getsentry/replay-frontend
+/src/sentry/replays/                                        @getsentry/replay-backend
+/tests/sentry/replays/                                      @getsentry/replay-backend
 ## End of Replays
 
 

devservices/config.yml

@@ -60,17 +60,19 @@ x-sentry-service-config:
       description: Messaging and streaming broker
     memcached:
       description: Memcached used for caching
+    spotlight:
+      description: Spotlight server for local debugging
 
   modes:
-    default: [snuba, postgres, relay]
+    default: [snuba, postgres, relay, spotlight]
     migrations: [postgres, redis]
     acceptance-ci: [postgres, snuba, chartcuterie]
-    taskbroker: [snuba, postgres, relay, taskbroker]
+    taskbroker: [snuba, postgres, relay, taskbroker, spotlight]
     backend-ci: [snuba, postgres, redis, bigtable, redis-cluster, symbolicator]
-    rabbitmq: [postgres, snuba, rabbitmq]
-    symbolicator: [postgres, snuba, symbolicator]
-    memcached: [postgres, snuba, memcached]
-    profiling: [postgres, snuba, vroom]
+    rabbitmq: [postgres, snuba, rabbitmq, spotlight]
+    symbolicator: [postgres, snuba, symbolicator, spotlight]
+    memcached: [postgres, snuba, memcached, spotlight]
+    profiling: [postgres, snuba, vroom, spotlight]
     minimal: [postgres, snuba]
     full:
       [
@@ -83,6 +85,7 @@ x-sentry-service-config:
         taskbroker,
         rabbitmq,
         vroom,
+        spotlight,
       ]
 
 services:
@@ -159,6 +162,15 @@ services:
       - devservices
     extra_hosts:
       - host.docker.internal:host-gateway
+  spotlight:
+    image: ghcr.io/getsentry/spotlight:latest
+    restart: unless-stopped
+    ports:
+      - '127.0.0.1:8969:8969/tcp'
+    networks:
+      - devservices
+    labels:
+      - orchestrator=devservices
 
 networks:
   devservices:

requirements-dev-frozen.txt

@@ -128,7 +128,7 @@ pillow==11.0.0
 pip-tools==7.1.0
 platformdirs==4.2.0
 pluggy==1.5.0
-pre-commit==4.0.0
+pre-commit==4.2.0
 progressbar2==3.41.0
 prompt-toolkit==3.0.41
 proto-plus==1.25.0

requirements-dev.txt

@@ -24,7 +24,7 @@ selenium>=4.16.0
 sentry-cli>=2.16.0
 
 # pre-commit dependencies
-pre-commit>=4
+pre-commit>=4.2
 black>=24.10.0
 flake8>=7
 flake8-bugbear>=22.10

src/sentry/api/endpoints/api_tokens.py

@@ -13,7 +13,6 @@
 from sentry.api.authentication import SessionNoAuthTokenAuthentication
 from sentry.api.base import Endpoint, control_silo_endpoint
 from sentry.api.exceptions import ResourceDoesNotExist
-from sentry.api.fields import MultipleChoiceField
 from sentry.api.permissions import SentryIsAuthenticated
 from sentry.api.serializers import serialize
 from sentry.auth.elevated_mode import has_elevated_mode
@@ -27,7 +26,7 @@
 
 class ApiTokenSerializer(serializers.Serializer):
     name = CharField(max_length=255, allow_blank=True, required=False)
-    scopes = MultipleChoiceField(required=True, choices=settings.SENTRY_SCOPES)
+    scopes = serializers.MultipleChoiceField(required=True, choices=list(settings.SENTRY_SCOPES))
 
 
 def get_appropriate_user_id(request: Request) -> int: