Merge branch 'master' into isabella/remove-metric-alert-limit-flag

Author: isabellaenriquez

.github/CODEOWNERS

@@ -142,8 +142,8 @@ yarn.lock                                                @getsentry/owners-js-de
 
 ## Hybrid Cloud
 /src/sentry/silo/                                        @getsentry/hybrid-cloud
+/src/sentry/hybridcloud                                  @getsentry/hybrid-cloud
 /src/sentry/services/hybrid_cloud/                       @getsentry/hybrid-cloud
-/src/sentry/api_gateway/                                 @getsentry/hybrid-cloud
 /src/sentry/middleware/api_gateway.py                    @getsentry/hybrid-cloud
 /src/sentry/middleware/customer_domain.py                @getsentry/hybrid-cloud
 /src/sentry/middleware/subdomain.py                      @getsentry/hybrid-cloud
@@ -416,6 +416,8 @@ static/app/components/events/eventStatisticalDetector/                    @getse
 /src/sentry/models/release_threshold                                    @getsentry/enterprise
 /src/sentry/api/endpoints/release_threshold*.py                         @getsentry/enterprise
 /src/sentry/web/frontend/auth_login.py                                  @getsentry/enterprise
+src/sentry/api/endpoints/oauth_userinfo.py                              @getsentry/enterprise
+src/sentry/api/endpoints/user_social_identity*                          @getsentry/enterprise
 ## End of Enterprise
 
 
@@ -480,6 +482,7 @@ static/app/components/events/eventStatisticalDetector/                    @getse
 /static/app/types/metrics.tsx                                                    @getsentry/telemetry-experience
 /static/app/types/project.tsx                                                    @getsentry/telemetry-experience
 /static/app/utils/metrics/                                                       @getsentry/telemetry-experience
+/static/app/views/ddm/                                                           @getsentry/telemetry-experience
 /static/app/views/performance/landing/dynamicSamplingMetricsAccuracy.spec.tsx    @getsentry/telemetry-experience
 /static/app/views/performance/landing/dynamicSamplingMetricsAccuracyAlert.tsx    @getsentry/telemetry-experience
 /static/app/views/settings/project/dynamicSampling/                              @getsentry/telemetry-experience
@@ -510,3 +513,6 @@ static/app/components/events/eventStatisticalDetector/                    @getse
 /static/app/utils/analytics.tsx                                 @getsentry/issues
 /static/app/utils/routeAnalytics*                               @getsentry/issues
 ## End of Issues
+
+## Billing
+/src/sentry/api/endpoints/check_am2_compatibility.py    @getsentry/revenue

migrations_lockfile.txt

@@ -9,5 +9,5 @@ feedback: 0003_feedback_add_env
 hybridcloud: 0009_make_user_id_optional_for_slug_reservation_replica
 nodestore: 0002_nodestore_no_dictfield
 replays: 0003_add_size_to_recording_segment
-sentry: 0606_update_user_to_optional_organization_slug_reservation
+sentry: 0607_drop_externalactor_actorid
 social_auth: 0002_default_auto_field

package.json

@@ -137,7 +137,7 @@
     "papaparse": "^5.3.2",
     "pegjs": "^0.10.0",
     "pegjs-loader": "^0.5.6",
-    "platformicons": "^5.8.1",
+    "platformicons": "^5.8.2",
     "po-catalog-loader": "2.0.0",
     "prettier": "3.0.3",
     "prismjs": "^1.29.0",

pyproject.toml

@@ -258,7 +258,6 @@ module = [
     "sentry.api.endpoints.user_identity_config",
     "sentry.api.endpoints.user_index",
     "sentry.api.endpoints.user_notification_details",
-    "sentry.api.endpoints.user_notification_fine_tuning",
     "sentry.api.endpoints.user_permission_details",
     "sentry.api.endpoints.user_permissions",
     "sentry.api.endpoints.user_permissions_config",

requirements-base.txt

@@ -65,7 +65,7 @@ sentry-kafka-schemas>=0.1.33
 sentry-kafka-schemas>=0.1.34
 sentry-redis-tools>=0.1.7
 sentry-relay>=0.8.35
-sentry-sdk>=1.35.0
+sentry-sdk>=1.37.0
 snuba-sdk>=2.0.9
 simplejson>=3.17.6
 sqlparse>=0.4.4

requirements-dev-frozen.txt

@@ -176,7 +176,7 @@ sentry-forked-djangorestframework-stubs==3.14.4.post2
 sentry-kafka-schemas==0.1.34
 sentry-redis-tools==0.1.7
 sentry-relay==0.8.35
-sentry-sdk==1.35.0
+sentry-sdk==1.37.0
 sentry-usage-accountant==0.0.10
 simplejson==3.17.6
 six==1.16.0

requirements-frozen.txt

@@ -117,7 +117,7 @@ sentry-arroyo==2.14.21
 sentry-kafka-schemas==0.1.34
 sentry-redis-tools==0.1.7
 sentry-relay==0.8.35
-sentry-sdk==1.35.0
+sentry-sdk==1.37.0
 sentry-usage-accountant==0.0.10
 simplejson==3.17.6
 six==1.16.0

src/sentry/api/api_owners.py

@@ -7,6 +7,7 @@ class ApiOwner(Enum):
     Value should map to team's github group
     """
 
+    BILLING = "revenue"
     DISCOVER_N_DASHBOARDS = "discover-n-dashboards"
     TELEMETRY_EXPERIENCE = "telemetry-experience"
     ENTERPRISE = "enterprise"
@@ -23,4 +24,5 @@ class ApiOwner(Enum):
     WEB_FRONTEND_SDKS = "team-web-sdk-frontend"
     FEEDBACK = "feedback-backend"
     CRONS = "crons"
+    DATA = "data"
     UNOWNED = "unowned"

src/sentry/api/base.py

@@ -4,7 +4,7 @@
 import logging
 import time
 from datetime import datetime, timedelta, timezone
-from typing import Any, Callable, Iterable, Mapping, Optional, Tuple, Type
+from typing import Any, Callable, Iterable, Mapping, Tuple, Type
 from urllib.parse import quote as urlquote
 
 import sentry_sdk
@@ -30,7 +30,6 @@
 from sentry.ratelimits.config import DEFAULT_RATE_LIMIT_CONFIG, RateLimitConfig
 from sentry.silo import SiloLimit, SiloMode
 from sentry.types.ratelimit import RateLimit, RateLimitCategory
-from sentry.types.region import is_region_name
 from sentry.utils import json
 from sentry.utils.audit import create_audit_entry
 from sentry.utils.cursors import Cursor
@@ -581,15 +580,6 @@ def track_set_commits_local(self, request: Request, organization_id=None, projec
         )
 
 
-def resolve_region(request: HttpRequest) -> Optional[str]:
-    subdomain = getattr(request, "subdomain", None)
-    if subdomain is None:
-        return None
-    if is_region_name(subdomain):
-        return subdomain
-    return None
-
-
 class EndpointSiloLimit(SiloLimit):
     def modify_endpoint_class(self, decorated_class: Type[Endpoint]) -> type:
         dispatch_override = self.create_override(decorated_class.dispatch)

src/sentry/api/bases/organization.py

@@ -9,7 +9,7 @@
 from rest_framework.permissions import BasePermission
 from rest_framework.request import Request
 
-from sentry.api.base import Endpoint, resolve_region
+from sentry.api.base import Endpoint
 from sentry.api.exceptions import ResourceDoesNotExist
 from sentry.api.helpers.environments import get_environments
 from sentry.api.permissions import SentryPermission
@@ -31,6 +31,7 @@
     RpcUserOrganizationContext,
     organization_service,
 )
+from sentry.types.region import subdomain_is_region
 from sentry.utils import auth
 from sentry.utils.hashlib import hash_values
 from sentry.utils.numbers import format_grouped_length
@@ -208,7 +209,7 @@ class ControlSiloOrganizationEndpoint(Endpoint):
     def convert_args(
         self, request: Request, organization_slug: str | None = None, *args: Any, **kwargs: Any
     ) -> tuple[tuple[Any, ...], dict[str, Any]]:
-        if resolve_region(request) is None:
+        if not subdomain_is_region(request):
             subdomain = getattr(request, "subdomain", None)
             if subdomain is not None and subdomain != organization_slug:
                 raise ResourceDoesNotExist
@@ -451,7 +452,7 @@ def get_filter_params(
     def convert_args(
         self, request: Request, organization_slug: str | None = None, *args: Any, **kwargs: Any
     ) -> tuple[tuple[Any, ...], dict[str, Any]]:
-        if resolve_region(request) is None:
+        if not subdomain_is_region(request):
             subdomain = getattr(request, "subdomain", None)
             if subdomain is not None and subdomain != organization_slug:
                 raise ResourceDoesNotExist

src/sentry/api/endpoints/accept_organization_invite.py

@@ -3,6 +3,7 @@
 import logging
 from typing import Mapping, Optional
 
+from django.http import HttpRequest
 from django.urls import reverse
 from rest_framework import status
 from rest_framework.request import Request
@@ -33,6 +34,7 @@ def get_invite_state(
     member_id: int,
     organization_slug: Optional[str],
     user_id: int,
+    request: HttpRequest,
 ) -> Optional[RpcUserInviteContext]:
     if organization_slug is None:
         member_mapping: OrganizationMemberMapping | None = None
@@ -66,9 +68,8 @@ def get_invite_state(
             extra={
                 "member_id": member_id,
                 "org_id": member_mapping.organization_id,
-                "token_expired": invite_context.member.token_expired
-                if invite_context and invite_context.member
-                else -1,
+                "url": request.path,
+                "method": request.method,
             },
         )
     else:
@@ -103,7 +104,10 @@ def get(
         self, request: Request, member_id: int, token: str, organization_slug: Optional[str] = None
     ) -> Response:
         invite_context = get_invite_state(
-            member_id=int(member_id), organization_slug=organization_slug, user_id=request.user.id
+            member_id=int(member_id),
+            organization_slug=organization_slug,
+            user_id=request.user.id,
+            request=request,
         )
         if invite_context is None:
             return self.respond_invalid()
@@ -197,6 +201,7 @@ def post(
             member_id=int(member_id),
             organization_slug=organization_slug,
             user_id=request.user.id,
+            request=request,
         )
         if invite_context is None:
             return self.respond_invalid()

src/sentry/api/endpoints/api_application_rotate_secret.py

@@ -3,6 +3,7 @@
 from rest_framework.request import Request
 from rest_framework.response import Response
 
+from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import Endpoint, control_silo_endpoint
 from sentry.api.exceptions import ResourceDoesNotExist
@@ -15,6 +16,7 @@ class ApiApplicationRotateSecretEndpoint(Endpoint):
     publish_status = {
         "POST": ApiPublishStatus.UNKNOWN,
     }
+    owner = ApiOwner.ENTERPRISE
     authentication_classes = (SessionAuthentication,)
     permission_classes = (IsAuthenticated,)
 

src/sentry/api/endpoints/check_am2_compatibility.py

@@ -2,6 +2,7 @@
 from rest_framework.request import Request
 from rest_framework.response import Response
 
+from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import Endpoint, region_silo_endpoint
 from sentry.api.permissions import SuperuserPermission
@@ -16,6 +17,7 @@
 
 @region_silo_endpoint
 class CheckAM2CompatibilityEndpoint(Endpoint):
+    owner = ApiOwner.BILLING
     publish_status = {
         "GET": ApiPublishStatus.UNKNOWN,
     }

src/sentry/api/endpoints/codeowners/external_actor/team_details.py

@@ -5,6 +5,7 @@
 from rest_framework.request import Request
 from rest_framework.response import Response
 
+from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
 from sentry.api.bases.external_actor import ExternalActorEndpointMixin, ExternalTeamSerializer
@@ -22,6 +23,7 @@ class ExternalTeamDetailsEndpoint(TeamEndpoint, ExternalActorEndpointMixin):
         "DELETE": ApiPublishStatus.UNKNOWN,
         "PUT": ApiPublishStatus.UNKNOWN,
     }
+    owner = ApiOwner.ENTERPRISE
 
     def convert_args(
         self,

src/sentry/api/endpoints/codeowners/external_actor/team_index.py

@@ -4,6 +4,7 @@
 from rest_framework.request import Request
 from rest_framework.response import Response
 
+from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
 from sentry.api.bases.external_actor import ExternalActorEndpointMixin, ExternalTeamSerializer
@@ -19,6 +20,7 @@ class ExternalTeamEndpoint(TeamEndpoint, ExternalActorEndpointMixin):
     publish_status = {
         "POST": ApiPublishStatus.UNKNOWN,
     }
+    owner = ApiOwner.ENTERPRISE
 
     def post(self, request: Request, team: Team) -> Response:
         """

src/sentry/api/endpoints/codeowners/external_actor/user_details.py

@@ -7,6 +7,7 @@
 from rest_framework.request import Request
 from rest_framework.response import Response
 
+from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
 from sentry.api.bases.external_actor import ExternalActorEndpointMixin, ExternalUserSerializer
@@ -24,6 +25,7 @@ class ExternalUserDetailsEndpoint(OrganizationEndpoint, ExternalActorEndpointMix
         "DELETE": ApiPublishStatus.UNKNOWN,
         "PUT": ApiPublishStatus.UNKNOWN,
     }
+    owner = ApiOwner.ENTERPRISE
 
     def convert_args(  # type: ignore[override]
         self,

src/sentry/api/endpoints/codeowners/external_actor/user_index.py

@@ -4,6 +4,7 @@
 from rest_framework.request import Request
 from rest_framework.response import Response
 
+from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
 from sentry.api.bases import OrganizationEndpoint
@@ -19,6 +20,7 @@ class ExternalUserEndpoint(OrganizationEndpoint, ExternalActorEndpointMixin):
     publish_status = {
         "POST": ApiPublishStatus.UNKNOWN,
     }
+    owner = ApiOwner.ENTERPRISE
 
     def post(self, request: Request, organization: Organization) -> Response:
         """

src/sentry/api/endpoints/data_scrubbing_selector_suggestions.py

@@ -5,6 +5,7 @@
 from sentry_relay.processing import pii_selector_suggestions_from_event
 
 from sentry import nodestore
+from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
 from sentry.api.bases.organization import OrganizationEndpoint
@@ -16,6 +17,7 @@ class DataScrubbingSelectorSuggestionsEndpoint(OrganizationEndpoint):
     publish_status = {
         "GET": ApiPublishStatus.UNKNOWN,
     }
+    owner = ApiOwner.OWNERS_INGEST
 
     def get(self, request: Request, organization) -> Response:
         """

src/sentry/api/endpoints/oauth_userinfo.py

@@ -3,6 +3,7 @@
 from rest_framework.request import Request
 from rest_framework.response import Response
 
+from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import Endpoint, control_silo_endpoint
 from sentry.api.exceptions import ParameterValidationError, ResourceDoesNotExist, SentryAPIException
@@ -21,6 +22,7 @@ class OAuthUserInfoEndpoint(Endpoint):
     publish_status = {
         "GET": ApiPublishStatus.UNKNOWN,
     }
+    owner = ApiOwner.ENTERPRISE
     authentication_classes = ()
     permission_classes = ()
 

src/sentry/api/endpoints/organization_access_request_details.py

@@ -4,6 +4,7 @@
 from rest_framework.response import Response
 
 from sentry import audit_log
+from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
 from sentry.api.bases.organization import OrganizationEndpoint, OrganizationPermission
@@ -49,6 +50,7 @@ class OrganizationAccessRequestDetailsEndpoint(OrganizationEndpoint):
         "GET": ApiPublishStatus.UNKNOWN,
         "PUT": ApiPublishStatus.UNKNOWN,
     }
+    owner = ApiOwner.ENTERPRISE
     permission_classes = [AccessRequestPermission]
 
     # TODO(dcramer): this should go onto AccessRequestPermission

src/sentry/api/endpoints/organization_ddm.py

@@ -0,0 +1,39 @@
+from rest_framework.request import Request
+from rest_framework.response import Response
+
+from sentry.api.api_owners import ApiOwner
+from sentry.api.api_publish_status import ApiPublishStatus
+from sentry.api.base import region_silo_endpoint
+from sentry.api.bases.organization import OrganizationEndpoint
+from sentry.api.serializers import serialize
+from sentry.api.serializers.models.code_locations import CodeLocationsSerializer
+from sentry.api.utils import get_date_range_from_params
+from sentry.sentry_metrics.querying.metadata import get_code_locations
+
+
+@region_silo_endpoint
+class OrganizationDDMMetaEndpoint(OrganizationEndpoint):
+    owner = ApiOwner.TELEMETRY_EXPERIENCE
+
+    publish_status = {
+        "GET": ApiPublishStatus.PRIVATE,
+    }
+
+    """Get meta data for one or more metrics for a given set of projects in a time interval"""
+    # Returns only code locations for now
+
+    def get(self, request: Request, organization) -> Response:
+        start, end = get_date_range_from_params(request.GET)
+
+        code_locations = get_code_locations(
+            metric_mris=request.GET.getlist("metric", []),
+            start=start,
+            end=end,
+            organization=organization,
+            projects=self.get_projects(request, organization),
+        )
+
+        return Response(
+            {"codeLocations": serialize(code_locations, request.user, CodeLocationsSerializer())},
+            status=200,
+        )