reset

Author: iamrajjoshi

.github/CODEOWNERS

@@ -495,9 +495,6 @@ static/app/components/events/eventStatisticalDetector/                    @getse
 /src/sentry/tasks/post_process.py                           @getsentry/issues
 /src/sentry/tasks/unmerge.py                                @getsentry/issues
 /src/sentry/search/snuba/                                   @getsentry/issues
-/static/app/components/events/contexts/                     @getsentry/issues
-/static/app/components/events/eventTags/                    @getsentry/issues
-/static/app/components/events/highlights/                   @getsentry/issues
 /static/app/views/issueList                                 @getsentry/issues
 /static/app/views/issueDetails/                             @getsentry/issues
 /static/app/views/organizationStats/teamInsights/           @getsentry/issues

babel.config.ts

@@ -15,7 +15,7 @@ const config: TransformOptions = {
       '@babel/preset-env',
       {
         useBuiltIns: 'usage',
-        corejs: '3.37',
+        corejs: '3.27',
       },
     ],
     // TODO: Remove allowDeclareFields when we upgrade to Babel 8

package.json

@@ -9,14 +9,14 @@
   },
   "dependencies": {
     "@acemarke/react-prod-sourcemaps": "^0.2.1",
-    "@babel/core": "~7.24.5",
-    "@babel/plugin-transform-react-jsx": "^7.23.4",
-    "@babel/plugin-transform-react-jsx-source": "^7.24.1",
-    "@babel/plugin-transform-runtime": "~7.24.3",
-    "@babel/preset-env": "~7.24.5",
-    "@babel/preset-react": "^7.24.1",
-    "@babel/preset-typescript": "^7.24.1",
-    "@babel/runtime": "~7.24.5",
+    "@babel/core": "~7.23.2",
+    "@babel/plugin-transform-react-jsx": "^7.22.15",
+    "@babel/plugin-transform-react-jsx-source": "^7.22.5",
+    "@babel/plugin-transform-runtime": "~7.23.2",
+    "@babel/preset-env": "~7.23.2",
+    "@babel/preset-react": "^7.22.15",
+    "@babel/preset-typescript": "^7.23.2",
+    "@babel/runtime": "~7.23.2",
     "@dnd-kit/core": "^3.1.1",
     "@dnd-kit/sortable": "^4.0.0",
     "@emotion/babel-plugin": "^11.11.0",
@@ -56,7 +56,7 @@
     "@sentry-internal/rrweb": "2.12.0",
     "@sentry-internal/rrweb-player": "2.12.0",
     "@sentry-internal/rrweb-snapshot": "2.12.0",
-    "@sentry/babel-plugin-component-annotate": "^2.16.1",
+    "@sentry/babel-plugin-component-annotate": "^2.16.0",
     "@sentry/core": "^8.0.0-beta.6",
     "@sentry/node": "^8.0.0-beta.6",
     "@sentry/react": "^8.0.0-beta.6",
@@ -93,7 +93,7 @@
     "@types/scroll-to-element": "^2.0.2",
     "@types/webpack-env": "^1.18.4",
     "ansi-to-react": "^6.1.6",
-    "babel-loader": "^9.1.3",
+    "babel-loader": "^9.1.2",
     "babel-plugin-add-react-displayname": "^0.0.5",
     "browserslist": "^4.22.2",
     "buffer": "^6.0.3",
@@ -102,7 +102,7 @@
     "color": "^4.2.3",
     "compression-webpack-plugin": "11.1.0",
     "copy-webpack-plugin": "^12.0.2",
-    "core-js": "^3.37.0",
+    "core-js": "^3.33.0",
     "cronstrue": "^2.26.0",
     "css-loader": "^7.1.1",
     "css-minimizer-webpack-plugin": "^6.0.0",

pyproject.toml

@@ -604,8 +604,6 @@ module = [
     "sentry.utils.locking.backends.redis",
     "sentry.utils.migrations",
     "sentry.utils.otp",
-    "sentry.utils.performance_issues.detectors.*",
-    "sentry.utils.performance_issues.performance_detection",
     "sentry.utils.redis",
     "sentry.utils.redis_metrics",
     "sentry.utils.sms",

requirements-base.txt

@@ -67,8 +67,8 @@ sentry-kafka-schemas>=0.1.79
 sentry-ophio==0.2.7
 sentry-redis-tools>=0.1.7
 sentry-relay>=0.8.60
-sentry-sdk==2.1.1
-snuba-sdk>=2.0.33
+sentry-sdk==2.0.0
+snuba-sdk>=2.0.32
 simplejson>=3.17.6
 sqlparse>=0.4.4
 statsd>=3.3

requirements-dev-frozen.txt

@@ -184,12 +184,12 @@ sentry-kafka-schemas==0.1.79
 sentry-ophio==0.2.7
 sentry-redis-tools==0.1.7
 sentry-relay==0.8.60
-sentry-sdk==2.1.1
+sentry-sdk==2.0.0
 sentry-usage-accountant==0.0.10
 simplejson==3.17.6
 six==1.16.0
 sniffio==1.2.0
-snuba-sdk==2.0.33
+snuba-sdk==2.0.32
 sortedcontainers==2.4.0
 soupsieve==2.3.2.post1
 sqlparse==0.4.4

requirements-frozen.txt

@@ -124,12 +124,12 @@ sentry-kafka-schemas==0.1.79
 sentry-ophio==0.2.7
 sentry-redis-tools==0.1.7
 sentry-relay==0.8.60
-sentry-sdk==2.1.1
+sentry-sdk==2.0.0
 sentry-usage-accountant==0.0.10
 simplejson==3.17.6
 six==1.16.0
 sniffio==1.3.0
-snuba-sdk==2.0.33
+snuba-sdk==2.0.32
 soupsieve==2.3.2.post1
 sqlparse==0.4.4
 statsd==3.3.0

src/flagpole/evaluation_context.py

@@ -76,9 +76,7 @@ def add_context_transformer(
         self.context_transformers.append(context_transformer)
         return self
 
-    def add_exception_handler(
-        self, exception_handler: Callable[[Exception], None]
-    ) -> ContextBuilder:
+    def add_exception_handler(self, exception_handler: Callable[[Exception], None]):
         """
         Add a custom exception handler to the context builder if you need custom handling
         if any of the transformer functions raise an exception. This is useful for swallowing
@@ -90,7 +88,6 @@ def add_exception_handler(
             raise Exception("Exception handler is already defined")
 
         self.exception_handler = exception_handler
-        return self
 
     def build(self, data: dict[str, Any] | None = None) -> EvaluationContext:
         builder_data: dict[str, Any] = data or dict()

src/flagpole/sentry_flagpole_context.py

@@ -78,10 +78,10 @@ def user_context_transformer(data: dict[str, Any]) -> EvaluationContextDict:
     return context_data
 
 
-def get_sentry_flagpole_context_builder() -> ContextBuilder:
+def get_sentry_flagpole_context_builder():
     """
     Creates and returns a new sentry flagpole context builder with Organization,
-     User, and Project transformers appended to it.
+     User, Team, and Project transformers appended to it.
     :return:
     """
     return (

src/sentry/api/bases/group.py

@@ -40,7 +40,9 @@ class GroupEndpoint(Endpoint):
     owner = ApiOwner.ISSUES
     permission_classes = (GroupPermission,)
 
-    def convert_args(self, request: Request, issue_id, organization_slug=None, *args, **kwargs):
+    def convert_args(
+        self, request: Request, issue_id, organization_id_or_slug=None, *args, **kwargs
+    ):
         # TODO(tkaemming): Ideally, this would return a 302 response, rather
         # than just returning the data that is bound to the new group. (It
         # technically shouldn't be a 301, since the response could change again
@@ -51,17 +53,17 @@ def convert_args(self, request: Request, issue_id, organization_slug=None, *args
         # string replacement, or making the endpoint aware of the URL pattern
         # that caused it to be dispatched, and reversing it with the correct
         # `issue_id` keyword argument.
-        if organization_slug:
+        if organization_id_or_slug:
             try:
                 if (
                     id_or_slug_path_params_enabled(
-                        self.convert_args.__qualname__, str(organization_slug)
+                        self.convert_args.__qualname__, str(organization_id_or_slug)
                     )
-                    and str(organization_slug).isdecimal()
+                    and str(organization_id_or_slug).isdecimal()
                 ):
-                    organization = Organization.objects.get_from_cache(id=organization_slug)
+                    organization = Organization.objects.get_from_cache(id=organization_id_or_slug)
                 else:
-                    organization = Organization.objects.get_from_cache(slug=organization_slug)
+                    organization = Organization.objects.get_from_cache(slug=organization_id_or_slug)
             except Organization.DoesNotExist:
                 raise ResourceDoesNotExist
 

src/sentry/api/bases/organization.py

@@ -242,30 +242,42 @@ class ControlSiloOrganizationEndpoint(Endpoint):
     def convert_args(
         self,
         request: Request,
-        organization_slug: str | int | None = None,
         *args: Any,
         **kwargs: Any,
     ) -> tuple[tuple[Any, ...], dict[str, Any]]:
+        organization_id_or_slug: int | str | None = None
+        if args and args[0] is not None:
+            organization_id_or_slug = args[0]
+            # Required so it behaves like the original convert_args, where organization_id_or_slug was another parameter
+            # TODO: Remove this once we remove the old `organization_slug` parameter from getsentry
+            args = args[1:]
+        else:
+            organization_id_or_slug = kwargs.pop("organization_id_or_slug", None) or kwargs.pop(
+                "organization_slug", None
+            )
+
         if not subdomain_is_region(request):
             subdomain = getattr(request, "subdomain", None)
-            if subdomain is not None and subdomain != organization_slug:
+            if subdomain is not None and subdomain != organization_id_or_slug:
                 raise ResourceDoesNotExist
 
-        if not organization_slug:
+        if not organization_id_or_slug:
             raise ResourceDoesNotExist
 
         if (
-            id_or_slug_path_params_enabled(self.convert_args.__qualname__, str(organization_slug))
-            and str(organization_slug).isdecimal()
+            id_or_slug_path_params_enabled(
+                self.convert_args.__qualname__, str(organization_id_or_slug)
+            )
+            and str(organization_id_or_slug).isdecimal()
         ):
             # It is ok that `get_organization_by_id` doesn't check for visibility as we
             # don't check the visibility in `get_organization_by_slug` either (only_active=False).
             organization_context = organization_service.get_organization_by_id(
-                id=int(organization_slug), user_id=request.user.id
+                id=int(organization_id_or_slug), user_id=request.user.id
             )
         else:
             organization_context = organization_service.get_organization_by_slug(
-                slug=str(organization_slug), only_visible=False, user_id=request.user.id
+                slug=str(organization_id_or_slug), only_visible=False, user_id=request.user.id
             )
         if organization_context is None:
             raise ResourceDoesNotExist
@@ -536,32 +548,42 @@ def get_filter_params(
     def convert_args(
         self,
         request: Request,
-        organization_slug: str | int | None = None,
         *args: Any,
         **kwargs: Any,
     ) -> tuple[tuple[Any, ...], dict[str, Any]]:
         """
-        We temporarily allow the organization_slug to be an integer as it actually can be both slug or id
+        We temporarily allow the organization_id_or_slug to be an integer as it actually can be both slug or id
         Eventually, we will rename this method to organization_id_or_slug
         """
+        organization_id_or_slug: int | str | None = None
+        if args and args[0] is not None:
+            organization_id_or_slug = args[0]
+            # Required so it behaves like the original convert_args, where organization_id_or_slug was another parameter
+            # TODO: Remove this once we remove the old `organization_slug` parameter from getsentry
+            args = args[1:]
+        else:
+            organization_id_or_slug = kwargs.pop("organization_id_or_slug", None) or kwargs.pop(
+                "organization_slug", None
+            )
+
         if not subdomain_is_region(request):
             subdomain = getattr(request, "subdomain", None)
-            if subdomain is not None and subdomain != organization_slug:
+            if subdomain is not None and subdomain != organization_id_or_slug:
                 raise ResourceDoesNotExist
 
-        if not organization_slug:
+        if not organization_id_or_slug:
             raise ResourceDoesNotExist
 
         try:
             if (
                 id_or_slug_path_params_enabled(
-                    self.convert_args.__qualname__, str(organization_slug)
+                    self.convert_args.__qualname__, str(organization_id_or_slug)
                 )
-                and str(organization_slug).isdecimal()
+                and str(organization_id_or_slug).isdecimal()
             ):
-                organization = Organization.objects.get_from_cache(id=organization_slug)
+                organization = Organization.objects.get_from_cache(id=organization_id_or_slug)
             else:
-                organization = Organization.objects.get_from_cache(slug=organization_slug)
+                organization = Organization.objects.get_from_cache(slug=organization_id_or_slug)
         except Organization.DoesNotExist:
             raise ResourceDoesNotExist
 

src/sentry/api/bases/organization_integrations.py

@@ -75,12 +75,12 @@ class RegionOrganizationIntegrationBaseEndpoint(RegionIntegrationEndpoint):
     def convert_args(
         self,
         request: Request,
-        organization_slug: str | int | None = None,
+        organization_id_or_slug: int | str | None = None,
         integration_id: str | None = None,
         *args: Any,
         **kwargs: Any,
     ) -> tuple[tuple[Any, ...], dict[str, Any]]:
-        args, kwargs = super().convert_args(request, organization_slug, *args, **kwargs)
+        args, kwargs = super().convert_args(request, organization_id_or_slug, *args, **kwargs)
 
         kwargs["integration_id"] = self.validate_integration_id(integration_id or "")
         return args, kwargs

src/sentry/api/bases/organizationmember.py

@@ -53,12 +53,12 @@ class OrganizationMemberEndpoint(OrganizationEndpoint):
     def convert_args(
         self,
         request: Request,
-        organization_slug: int | str | None = None,
+        organization_id_or_slug: str | int | None = None,
         member_id: str = "me",
         *args: Any,
         **kwargs: Any,
     ) -> tuple[tuple[Any, ...], dict[str, Any]]:
-        args, kwargs = super().convert_args(request, organization_slug, *args, **kwargs)
+        args, kwargs = super().convert_args(request, organization_id_or_slug, *args, **kwargs)
 
         serializer = MemberSerializer(data={"id": member_id})
         if serializer.is_valid():

src/sentry/api/bases/project.py

@@ -111,10 +111,19 @@ class ProjectEndpoint(Endpoint):
     def convert_args(
         self,
         request: Request,
-        organization_slug: str | int,
         *args,
         **kwargs,
     ):
+        if args and args[0] is not None:
+            organization_id_or_slug: int | str = args[0]
+            # Required so it behaves like the original convert_args, where organization_id_or_slug was another parameter
+            # TODO: Remove this once we remove the old `organization_slug` parameter from getsentry
+            args = args[1:]
+        else:
+            organization_id_or_slug = kwargs.pop("organization_id_or_slug", None) or kwargs.pop(
+                "organization_slug"
+            )
+
         if args and args[0] is not None:
             project_id_or_slug: int | str = args[0]
             # Required so it behaves like the original convert_args, where project_id_or_slug was another parameter
@@ -125,11 +134,11 @@ def convert_args(
             )
         try:
             if id_or_slug_path_params_enabled(
-                self.convert_args.__qualname__, str(organization_slug)
+                self.convert_args.__qualname__, str(organization_id_or_slug)
             ):
                 project = (
                     Project.objects.filter(
-                        organization__slug__id_or_slug=organization_slug,
+                        organization__slug__id_or_slug=organization_id_or_slug,
                         slug__id_or_slug=project_id_or_slug,
                     )
                     .select_related("organization")
@@ -139,7 +148,7 @@ def convert_args(
             else:
                 project = (
                     Project.objects.filter(
-                        organization__slug=organization_slug, slug=project_id_or_slug
+                        organization__slug=organization_id_or_slug, slug=project_id_or_slug
                     )
                     .select_related("organization")
                     .prefetch_related("teams")
@@ -151,24 +160,24 @@ def convert_args(
                 # This will only happen if the passed in project_id_or_slug is a slug and not an id
                 redirect = ProjectRedirect.objects.select_related("project")
                 if id_or_slug_path_params_enabled(
-                    self.convert_args.__qualname__, str(organization_slug)
+                    self.convert_args.__qualname__, str(organization_id_or_slug)
                 ):
                     redirect = redirect.get(
-                        organization__slug__id_or_slug=organization_slug,
+                        organization__slug__id_or_slug=organization_id_or_slug,
                         redirect_slug=project_id_or_slug,
                     )
                 else:
                     redirect = redirect.get(
-                        organization__slug=organization_slug, redirect_slug=project_id_or_slug
+                        organization__slug=organization_id_or_slug, redirect_slug=project_id_or_slug
                     )
                 # Without object permissions don't reveal the rename
                 self.check_object_permissions(request, redirect.project)
 
                 # get full path so that we keep query strings
                 requested_url = request.get_full_path()
                 new_url = requested_url.replace(
-                    f"projects/{organization_slug}/{project_id_or_slug}/",
-                    f"projects/{organization_slug}/{redirect.project.slug}/",
+                    f"projects/{organization_id_or_slug}/{project_id_or_slug}/",
+                    f"projects/{organization_id_or_slug}/{redirect.project.slug}/",
                 )
 
                 # Resource was moved/renamed if the requested url is different than the new url