Merge branch 'master' into ref/theme/migrate-shadows

Author: natemoo-re

.github/workflows/frontend-optional.yml

@@ -90,6 +90,17 @@ jobs:
 
       - uses: ./.github/actions/setup-node-pnpm
 
+      - name: jest transform cache
+        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+        with:
+          path: |
+            .cache/jest
+            ~/.cache/swc
+          key: jest-cache-${{ runner.os }}-${{ hashFiles('pnpm-lock.yaml', 'jest.config.ts') }}-${{ matrix.instance }}
+          restore-keys: |
+            jest-cache-${{ runner.os }}-${{ hashFiles('pnpm-lock.yaml', 'jest.config.ts') }}-
+            jest-cache-${{ runner.os }}-
+
       - name: Download jest-balance.json
         id: download-artifact
         uses: dawidd6/action-download-artifact@ac66b43f0e6a346234dd65d4d0c8fbb31cb316e5 # v11

CHANGES

@@ -90,6 +90,7 @@ dependencies = [
   "sentry-protos>=0.8.12",
   "sentry-redis-tools>=0.5.0",
   "sentry-relay>=0.9.27",
+  "sentry-scm>=0.1.7",
   "sentry-sdk[http2]>=2.47.0",
   "sentry-usage-accountant>=0.0.10",
   # remove once there are no unmarked transitive dependencies on setuptools

pyproject.toml

@@ -1,6 +1,6 @@
 [metadata]
 name = sentry
-version = 26.4.0.dev0
+version = 26.5.0.dev0
 description = A realtime logging and aggregation server.
 long_description = file: README.md
 long_description_content_type = text/markdown

setup.cfg

@@ -36,14 +36,14 @@
 from sentry.utils import snuba_rpc
 
 
-def as_tag_key(name: str, type: Literal["string", "number", "boolean"]):
-    key, _, _ = translate_internal_to_public_alias(name, type, SupportedTraceItemType.SPANS)
+def as_tag_key(name: str, search_type: Literal["string", "number", "boolean"]):
+    key, _, _ = translate_internal_to_public_alias(name, search_type, SupportedTraceItemType.SPANS)
 
     if key is not None:
         name = key
-    elif type == "number":
+    elif search_type == "number":
         key = f"tags[{name},number]"
-    elif type == "boolean":
+    elif search_type == "boolean":
         key = f"tags[{name},boolean]"
     else:
         key = name

src/sentry/api/endpoints/organization_spans_fields.py

@@ -47,4 +47,5 @@ def serialize(self, obj, attrs, user, **kwargs):
             "status": obj.status,
             "checksum": checksum,
             "fileName": file_name,
+            "export_format": obj.export_format,
         }

src/sentry/api/serializers/models/exporteddata.py

@@ -11,6 +11,8 @@
 from sentry.api.serializers import Serializer, register
 from sentry.constants import ObjectStatus
 from sentry.db.models.manager.base_query_set import BaseQuerySet
+from sentry.integrations.services.integration.model import RpcIntegration
+from sentry.integrations.services.integration.service import integration_service
 from sentry.models.environment import Environment
 from sentry.models.project import Project
 from sentry.models.rule import NeglectedRule, Rule, RuleActivity, RuleActivityType
@@ -591,6 +593,22 @@ def get_attrs(self, item_list: Sequence[Workflow], user, **kwargs):
             )
         actions_by_dcg = self._fetch_actions_by_dcg(all_dcg_ids)
 
+        # Batch-fetch integrations for all actions to avoid per-action RPC calls in render_label
+        all_integration_ids: set[int] = set()
+        for action_list in actions_by_dcg.values():
+            for action in action_list:
+                if action.integration_id is not None:
+                    all_integration_ids.add(action.integration_id)
+
+        integration_cache: dict[int, RpcIntegration] = {}
+        if all_integration_ids and item_list:
+            integrations = integration_service.get_integrations(
+                integration_ids=list(all_integration_ids),
+                organization_id=item_list[0].organization_id,
+                status=ObjectStatus.ACTIVE,
+            )
+            integration_cache = {i.id: i for i in integrations}
+
         last_triggered_lookup: dict[int, datetime] = {}
         if "lastTriggered" in self.expand:
             last_triggered_lookup = self._fetch_workflow_last_triggered(item_list)
@@ -667,7 +685,7 @@ def get_attrs(self, item_list: Sequence[Workflow], user, **kwargs):
                     continue
 
                 action_data["name"] = action_to_handler[action].render_label(
-                    workflow.organization_id, action_data
+                    workflow.organization_id, action_data, integration_cache=integration_cache
                 )
                 installation_uuid = action_data.get("sentryAppInstallationUuid")
                 install_context = None

src/sentry/api/serializers/models/rule.py

@@ -3617,7 +3617,7 @@ def create_group_urls(name_prefix: str) -> list[URLPattern | URLResolver]:
         name="sentry-api-0-rpc-service",
     ),
     re_path(
-        r"^scm-rpc/(?P<method_name>\w+)/$",
+        r"^scm-rpc/$",
         ScmRpcServiceEndpoint.as_view(),
         name="sentry-api-0-scm-rpc-service",
     ),

src/sentry/api/urls.py

@@ -2240,7 +2240,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 = "26.3.1"
+SELF_HOSTED_STABLE_VERSION = "26.4.0"
 
 # Whether we should look at X-Forwarded-For header or not
 # when checking REMOTE_ADDR ip addresses

src/sentry/conf/server.py

@@ -29,16 +29,19 @@ class ExportQueryType:
     ISSUES_BY_TAG = 0
     DISCOVER = 1
     EXPLORE = 2
+    TRACE_ITEM_FULL_EXPORT = 3
     ISSUES_BY_TAG_STR = "Issues-by-Tag"
     DISCOVER_STR = "Discover"
     EXPLORE_STR = "Explore"
+    TRACE_ITEM_FULL_EXPORT_STR = "trace_item_full_export"
 
     @classmethod
     def as_choices(cls) -> tuple[tuple[int, str], ...]:
         return (
             (cls.ISSUES_BY_TAG, str(cls.ISSUES_BY_TAG_STR)),
             (cls.DISCOVER, str(cls.DISCOVER_STR)),
             (cls.EXPLORE, str(cls.EXPLORE_STR)),
+            (cls.TRACE_ITEM_FULL_EXPORT, str(cls.TRACE_ITEM_FULL_EXPORT_STR)),
         )
 
     @classmethod
@@ -47,6 +50,7 @@ def as_str_choices(cls) -> tuple[tuple[str, str], ...]:
             (cls.ISSUES_BY_TAG_STR, cls.ISSUES_BY_TAG_STR),
             (cls.DISCOVER_STR, cls.DISCOVER_STR),
             (cls.EXPLORE_STR, cls.EXPLORE_STR),
+            (cls.TRACE_ITEM_FULL_EXPORT_STR, cls.TRACE_ITEM_FULL_EXPORT_STR),
         )
 
     @classmethod
@@ -57,6 +61,8 @@ def as_str(cls, integer: int) -> str:
             return cls.DISCOVER_STR
         elif integer == cls.EXPLORE:
             return cls.EXPLORE_STR
+        elif integer == cls.TRACE_ITEM_FULL_EXPORT:
+            return cls.TRACE_ITEM_FULL_EXPORT_STR
         raise ValueError(f"Invalid ExportQueryType: {integer}")
 
     @classmethod
@@ -67,4 +73,6 @@ def from_str(cls, string: str) -> int:
             return cls.DISCOVER
         elif string == cls.EXPLORE_STR:
             return cls.EXPLORE
+        elif string == cls.TRACE_ITEM_FULL_EXPORT_STR:
+            return cls.TRACE_ITEM_FULL_EXPORT
         raise ValueError(f"Invalid ExportQueryType: {string}")