Merge branch 'master' into tkdodo/ref/knip-zero

Author: TkDodo

CHANGES

@@ -1,3 +1,35 @@
+25.5.1
+------
+
+### Various fixes & improvements
+
+- :wrench: chore(integrations): use `IntegrationProviderSlug` for Integration `key` (#91465) by @iamrajjoshi
+- ref: fix types for group_integration_details (#92026) by @asottile-sentry
+- Bump `devenv`/`devservices` to make Python SDK 3 compatible (#92028) by @antonpirker
+- build(ui): Remove react prod sourcemaps (#92006) by @scttcper
+- feat(spans): Produce items from process-segments (#91714) by @untitaker
+- feat(explore): Add attribute description throughout explore (#91829) by @Zylphrex
+- fix(symbolicator): check source credentials and not the credential token (#92024) by @Litarnus
+- feat(replay): Start bringing in new replay context wrappers to test (#91982) by @ryan953
+- feat(agents-insights): dashboard placeholder (#92021) by @obostjancic
+- ref: remove remote_subscriptions migrations (#92004) by @asottile-sentry
+- fix(apps): disallow Manager to rotate an app secret with org:admin scope (#92019) by @oioki
+- issues: remove custom save button styling (#91974) by @JonasBa
+- replay: replace colors for tokens on timeline (#91933) by @JonasBa
+- trace: fix buttons in chonk (#91878) by @JonasBa
+- tag: fix bad tag change and flickering text (#91927) by @JonasBa
+- chore(sdk): Use add_full_stack by default (#91939) by @armenzg
+- fix(codeowners): move demomode upwards in codewards to stop matching everything (#92020) by @shellmayr
+- fix(nextjs-insight): Filter spans without component type from tree view (#92017) by @ArthurKnaus
+- Add directory for preprod (#91961) by @chromy
+- fix(span-buffer): Fix crashing behavior in flusher (#91949) by @untitaker
+- feat(agents-insights): feature flag registration (#92014) by @obostjancic
+- fix(codeowners): add owner to demomode line (#92012) by @shellmayr
+- ref: add flags to migrations lockfile (#91991) by @asottile-sentry
+- feat(source-maps): Do not render source maps wizard if platform is react native (#91860) by @priscilawebdev
+
+_Plus 231 more_
+
 25.5.0
 ------
 

package.json

@@ -8,7 +8,6 @@
     "url": "git://github.com/getsentry/sentry.git"
   },
   "dependencies": {
-    "@acemarke/react-prod-sourcemaps": "^0.2.1",
     "@amplitude/analytics-browser": "^1.5.3",
     "@babel/core": "~7.26.10",
     "@babel/plugin-transform-runtime": "~7.26.10",

pyproject.toml

@@ -112,7 +112,6 @@ ignore_missing_imports = true
 # - python3 -m tools.mypy_helpers.find_easiest_modules
 [[tool.mypy.overrides]]
 module = [
-    "sentry.api.endpoints.group_integration_details",
     "sentry.api.endpoints.organization_events_meta",
     "sentry.api.endpoints.organization_events_spans_performance",
     "sentry.api.endpoints.organization_releases",

requirements-dev-frozen.txt

@@ -37,7 +37,7 @@ cryptography==44.0.1
 cssselect==1.0.3
 cssutils==2.9.0
 datadog==0.49.1
-devservices==1.1.5
+devservices==1.1.6
 distlib==0.3.8
 distro==1.8.0
 django==5.2.1
@@ -181,7 +181,7 @@ selenium==4.16.0
 sentry-arroyo==2.21.0
 sentry-cli==2.16.0
 sentry-covdefaults-disable-branch-coverage==1.0.2
-sentry-devenv==1.20.0
+sentry-devenv==1.21.0
 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

requirements-dev.txt

@@ -1,7 +1,7 @@
 --index-url https://pypi.devinfra.sentry.io/simple
 
-sentry-devenv>=1.20
-devservices>=1.1.5
+sentry-devenv>=1.21
+devservices>=1.1.6
 
 covdefaults>=2.3.0
 sentry-covdefaults-disable-branch-coverage>=1.0.2

src/sentry/api/endpoints/group_integration_details.py

@@ -1,6 +1,9 @@
+from __future__ import annotations
+
 from collections.abc import Mapping, MutableMapping
 from typing import Any
 
+from django.contrib.auth.models import AnonymousUser
 from django.db import IntegrityError, router, transaction
 from rest_framework.request import Request
 from rest_framework.response import Response
@@ -12,8 +15,10 @@
 from sentry.api.bases import GroupEndpoint
 from sentry.api.serializers import serialize
 from sentry.integrations.api.serializers.models.integration import IntegrationSerializer
-from sentry.integrations.base import IntegrationFeatures, IntegrationInstallation
+from sentry.integrations.base import IntegrationFeatures
+from sentry.integrations.mixins.issues import IssueBasicIntegration
 from sentry.integrations.models.external_issue import ExternalIssue
+from sentry.integrations.models.integration import Integration
 from sentry.integrations.project_management.metrics import (
     ProjectManagementActionType,
     ProjectManagementEvent,
@@ -30,6 +35,7 @@
 from sentry.signals import integration_issue_created, integration_issue_linked
 from sentry.types.activity import ActivityType
 from sentry.users.models.user import User
+from sentry.users.services.user.model import RpcUser
 
 MISSING_FEATURE_MESSAGE = "Your organization does not have access to this feature."
 
@@ -46,7 +52,11 @@ def __init__(
         self.config = config
 
     def serialize(
-        self, obj: RpcIntegration, attrs: Mapping[str, Any], user: User, **kwargs: Any
+        self,
+        obj: Integration | RpcIntegration,
+        attrs: Mapping[str, Any],
+        user: User | RpcUser | AnonymousUser,
+        **kwargs: Any,
     ) -> MutableMapping[str, Any]:
         data = super().serialize(obj, attrs, user)
 
@@ -68,7 +78,7 @@ class GroupIntegrationDetailsEndpoint(GroupEndpoint):
         "POST": ApiPublishStatus.UNKNOWN,
     }
 
-    def _has_issue_feature(self, organization, user):
+    def _has_issue_feature(self, organization, user) -> bool:
         has_issue_basic = features.has(
             "organizations:integrations-issue-basic", organization, actor=user
         )
@@ -79,16 +89,24 @@ def _has_issue_feature(self, organization, user):
 
         return has_issue_sync or has_issue_basic
 
-    def _has_issue_feature_on_integration(self, integration: RpcIntegration):
+    def _has_issue_feature_on_integration(self, integration: RpcIntegration) -> bool:
         return integration.has_feature(
             feature=IntegrationFeatures.ISSUE_BASIC
         ) or integration.has_feature(feature=IntegrationFeatures.ISSUE_SYNC)
 
+    def _get_installation(
+        self, integration: RpcIntegration, organization_id: int
+    ) -> IssueBasicIntegration:
+        installation = integration.get_installation(organization_id=organization_id)
+        if not isinstance(installation, IssueBasicIntegration):
+            raise ValueError(installation)
+        return installation
+
     def create_issue_activity(
         self,
         request: Request,
         group: Group,
-        installation: IntegrationInstallation,
+        installation: IssueBasicIntegration,
         external_issue: ExternalIssue,
         new: bool,
     ):
@@ -108,7 +126,9 @@ def create_issue_activity(
         )
 
     def get(self, request: Request, group, integration_id) -> Response:
-        if not self._has_issue_feature(group.organization, request.user):
+        if not request.user.is_authenticated:
+            return Response(status=400)
+        elif not self._has_issue_feature(group.organization, request.user):
             return Response({"detail": MISSING_FEATURE_MESSAGE}, status=400)
 
         # Keep link/create separate since create will likely require
@@ -132,16 +152,16 @@ def get(self, request: Request, group, integration_id) -> Response:
                 {"detail": "This feature is not supported for this integration."}, status=400
             )
 
-        installation = integration.get_installation(organization_id=organization_id)
-        config = None
+        installation = self._get_installation(integration, organization_id)
         try:
             if action == "link":
                 config = installation.get_link_issue_config(group, params=request.GET)
-
-            if action == "create":
+            elif action == "create":
                 config = installation.get_create_issue_config(
                     group, request.user, params=request.GET
                 )
+            else:
+                raise AssertionError("unreachable")
         except IntegrationError as e:
             return Response({"detail": str(e)}, status=400)
 
@@ -156,7 +176,9 @@ def get(self, request: Request, group, integration_id) -> Response:
 
     # was thinking put for link an existing issue, post for create new issue?
     def put(self, request: Request, group, integration_id) -> Response:
-        if not self._has_issue_feature(group.organization, request.user):
+        if not request.user.is_authenticated:
+            return Response(status=400)
+        elif not self._has_issue_feature(group.organization, request.user):
             return Response({"detail": MISSING_FEATURE_MESSAGE}, status=400)
 
         external_issue_id = request.data.get("externalIssue")
@@ -181,7 +203,7 @@ def put(self, request: Request, group, integration_id) -> Response:
                     {"detail": "This feature is not supported for this integration."}, status=400
                 )
 
-            installation = integration.get_installation(organization_id=organization_id)
+            installation = self._get_installation(integration, organization_id)
 
             try:
                 data = installation.get_issue(external_issue_id, data=request.data)
@@ -254,7 +276,9 @@ def put(self, request: Request, group, integration_id) -> Response:
         return Response(context, status=201)
 
     def post(self, request: Request, group, integration_id) -> Response:
-        if not self._has_issue_feature(group.organization, request.user):
+        if not request.user.is_authenticated:
+            return Response(status=400)
+        elif not self._has_issue_feature(group.organization, request.user):
             return Response({"detail": MISSING_FEATURE_MESSAGE}, status=400)
 
         organization_id = group.project.organization_id
@@ -271,7 +295,7 @@ def post(self, request: Request, group, integration_id) -> Response:
                 {"detail": "This feature is not supported for this integration."}, status=400
             )
 
-        installation = integration.get_installation(organization_id=organization_id)
+        installation = self._get_installation(integration, organization_id)
 
         with ProjectManagementEvent(
             action_type=ProjectManagementActionType.CREATE_EXTERNAL_ISSUE_VIA_ISSUE_DETAIL,

src/sentry/conf/server.py

@@ -2694,7 +2694,7 @@ def custom_parameter_sort(parameter: dict) -> tuple[str, int]:
 SENTRY_SELF_HOSTED_ERRORS_ONLY = False
 # only referenced in getsentry to provide the stable beacon version
 # updated with scripts/bump-version.sh
-SELF_HOSTED_STABLE_VERSION = "25.5.0"
+SELF_HOSTED_STABLE_VERSION = "25.5.1"
 
 # Whether we should look at X-Forwarded-For header or not
 # when checking REMOTE_ADDR ip addresses

src/sentry/grouping/strategies/base.py

@@ -228,16 +228,17 @@ def get_grouping_component(
         self, event: Event, context: GroupingContext, variant: str | None = None
     ) -> None | BaseGroupingComponent[Any] | ReturnedVariants:
         """Given a specific variant this calculates the grouping component."""
-        args = []
         iface = event.interfaces.get(self.interface_name)
+
         if iface is None:
             return None
-        args.append(iface)
+
         with context:
             # If a variant is passed put it into the context
             if variant is not None:
                 context["variant"] = variant
-            return self(event=event, context=context, *args)
+
+            return self(iface, event=event, context=context)
 
     def get_grouping_components(self, event: Event, context: GroupingContext) -> ReturnedVariants:
         """This returns a dictionary of all components by variant that this
@@ -325,7 +326,7 @@ def __repr__(self) -> str:
 
     def iter_strategies(self) -> Iterator[Strategy[Any]]:
         """Iterates over all strategies by highest score to lowest."""
-        return iter(sorted(self.strategies.values(), key=lambda x: x.score and -x.score or 0))
+        return iter(sorted(self.strategies.values(), key=lambda x: -x.score if x.score else 0))
 
     @classmethod
     def as_dict(cls) -> dict[str, Any]:

src/sentry/grouping/strategies/configurations.py

@@ -11,15 +11,19 @@
 # base is defined.
 BASE_STRATEGY = create_strategy_configuration(
     None,
+    # Strategy priority is enforced programaticaly via the `score` argument to the `@strategy`
+    # decorator (rather than by the order they're listed here), but they are nonetheless listed here
+    # from highest to lowest priority for documentation purposes. The first strategy to produce a
+    # result will become the winner.
     strategies=[
-        "expect-ct:v1",
-        "expect-staple:v1",
-        "hpkp:v1",
-        "csp:v1",
+        "chained-exception:v1",  # This handles single exceptions, too
         "threads:v1",
         "stacktrace:v1",
-        "chained-exception:v1",
         "template:v1",
+        "csp:v1",
+        "hpkp:v1",
+        "expect-staple:v1",
+        "expect-ct:v1",
         "message:v1",
     ],
     delegates=["frame:v1", "stacktrace:v1", "single-exception:v1"],

src/sentry/grouping/strategies/message.py

@@ -20,6 +20,41 @@
 if TYPE_CHECKING:
     from sentry.eventstore.models import Event
 
+REGEX_PATTERN_KEYS = (
+    "email",
+    "url",
+    "hostname",
+    "ip",
+    "uuid",
+    "sha1",
+    "md5",
+    "date",
+    "duration",
+    "hex",
+    "float",
+    "int",
+    "quoted_str",
+    "bool",
+)
+
+EXPERIMENT_PROJECTS = [  # Active internal Sentry projects
+    1,
+    11276,
+    54785,
+    155735,
+    162676,
+    221969,
+    300688,
+    1267915,
+    1269704,
+    1492057,
+    6424467,
+    6690737,
+    4503972821204992,
+    4505469596663808,
+    4506400311934976,
+]
+
 
 @metrics.wraps("grouping.normalize_message_for_grouping")
 def normalize_message_for_grouping(message: str, event: Event, share_analytics: bool = True) -> str:
@@ -37,23 +72,7 @@ def normalize_message_for_grouping(message: str, event: Event, share_analytics:
         trimmed += "..."
 
     parameterizer = Parameterizer(
-        regex_pattern_keys=(
-            "email",
-            "url",
-            "hostname",
-            "ip",
-            "uuid",
-            "sha1",
-            "md5",
-            "date",
-            "duration",
-            "hex",
-            "float",
-            "int",
-            "quoted_str",
-            "bool",
-        ),
-        experiments=(UniqueIdExperiment,),
+        regex_pattern_keys=REGEX_PATTERN_KEYS, experiments=(UniqueIdExperiment,)
     )
 
     def _shoudl_run_experiment(experiment_name: str) -> bool:
@@ -64,24 +83,7 @@ def _shoudl_run_experiment(experiment_name: str) -> bool:
                 in_rollout_group(
                     f"grouping.experiments.parameterization.{experiment_name}", event.project_id
                 )
-                or event.project_id
-                in [  # Active internal Sentry projects
-                    155735,
-                    4503972821204992,
-                    1267915,
-                    221969,
-                    11276,
-                    1269704,
-                    4505469596663808,
-                    1,
-                    54785,
-                    1492057,
-                    162676,
-                    6690737,
-                    300688,
-                    4506400311934976,
-                    6424467,
-                ]
+                or event.project_id in EXPERIMENT_PROJECTS
             )
         )