Merge remote-tracking branch 'origin/master' into adrian/add-test-analytics-table

Author: adrianviquez

.github/actions/setup-sentry/action.yml

@@ -50,12 +50,7 @@ runs:
 
         ### pytest configuration ###
         echo "PY_COLORS=1" >> "$GITHUB_ENV"
-        # XXX(epurkihser): We've raised fail-slow from 60s to 120s since
-        # 2025-05, our migration dependency tree has grown too large and it
-        # takes these tests longer than 60 seconds to run. Once we've flattened
-        # our migrations we can bring this back down (asottile is working on
-        # this)
-        echo "PYTEST_ADDOPTS=--reruns=5 --durations=10 --fail-slow=120s" >> $GITHUB_ENV
+        echo "PYTEST_ADDOPTS=--reruns=5 --durations=10 --fail-slow=60s" >> $GITHUB_ENV
         echo "COVERAGE_CORE=sysmon" >> "$GITHUB_ENV"
 
         ### pytest-sentry configuration ###

migrations_lockfile.txt

@@ -13,7 +13,7 @@ hybridcloud: 0021_django_arrayfield_scope_list
 
 insights: 0001_add_starred_transactions_model
 
-monitors: 0004_record_date_in_progress_sql_only
+monitors: 0005_record_date_in_progress_state
 
 nodestore: 0002_nodestore_no_dictfield
 

package.json

@@ -64,7 +64,7 @@
     "@sentry/react": "9.16.1",
     "@sentry/release-parser": "^1.3.1",
     "@sentry/status-page-list": "^0.6.0",
-    "@sentry/webpack-plugin": "^3.1.1",
+    "@sentry/webpack-plugin": "^3.4.0",
     "@spotlightjs/spotlight": "^2.0.0-alpha.1",
     "@tanstack/query-async-storage-persister": "^5.72.1",
     "@tanstack/react-query": "^5.72.1",
@@ -166,6 +166,7 @@
     "sprintf-js": "1.0.3",
     "style-loader": "4.0.0",
     "terser-webpack-plugin": "5.3.14",
+    "ts-checker-rspack-plugin": "1.1.3",
     "ts-node": "^10.9.2",
     "tslib": "^2.8.1",
     "typescript": "^5.8.3",

pyproject.toml

@@ -290,10 +290,10 @@ module = [
     "sentry.issues.endpoints.related_issues",
     "sentry.issues.endpoints.shared_group_details",
     "sentry.issues.endpoints.team_groups_old",
-    "sentry.issues.escalating",
-    "sentry.issues.escalating_group_forecast",
-    "sentry.issues.escalating_issues_alg",
-    "sentry.issues.forecasts",
+    "sentry.issues.escalating.escalating",
+    "sentry.issues.escalating.escalating_group_forecast",
+    "sentry.issues.escalating.escalating_issues_alg",
+    "sentry.issues.escalating.forecasts",
     "sentry.issues.ignored",
     "sentry.issues.ingest",
     "sentry.issues.issue_occurrence",
@@ -480,16 +480,16 @@ module = [
     "tests.sentry.issues.endpoints.test_shared_group_details",
     "tests.sentry.issues.endpoints.test_source_map_debug",
     "tests.sentry.issues.endpoints.test_team_groups_old",
+    "tests.sentry.issues.escalating.test_escalating",
+    "tests.sentry.issues.escalating.test_escalating_issues_alg",
+    "tests.sentry.issues.escalating.test_issue_velocity",
     "tests.sentry.issues.ownership.*",
     "tests.sentry.issues.test_attributes",
-    "tests.sentry.issues.test_escalating",
-    "tests.sentry.issues.test_escalating_issues_alg",
     "tests.sentry.issues.test_group_attributes_dataset",
     "tests.sentry.issues.test_grouptype",
     "tests.sentry.issues.test_ignored",
     "tests.sentry.issues.test_ingest",
     "tests.sentry.issues.test_issue_occurrence",
-    "tests.sentry.issues.test_issue_velocity",
     "tests.sentry.issues.test_json_schemas",
     "tests.sentry.issues.test_merge",
     "tests.sentry.issues.test_occurrence_consumer",

rspack.config.ts

@@ -12,10 +12,10 @@ import rspack from '@rspack/core';
 import ReactRefreshRspackPlugin from '@rspack/plugin-react-refresh';
 import {sentryWebpackPlugin} from '@sentry/webpack-plugin';
 import CompressionPlugin from 'compression-webpack-plugin';
-import ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import fs from 'node:fs';
 import path from 'node:path';
+import {TsCheckerRspackPlugin} from 'ts-checker-rspack-plugin';
 
 import LastBuiltPlugin from './build-utils/last-built-plugin';
 
@@ -306,13 +306,9 @@ const appConfig: Configuration = {
 
     ...(SHOULD_FORK_TS
       ? [
-          new ForkTsCheckerWebpackPlugin({
+          new TsCheckerRspackPlugin({
             typescript: {
               configFile: path.resolve(__dirname, './config/tsconfig.build.json'),
-              configOverwrite: {
-                compilerOptions: {incremental: true},
-              },
-              memoryLimit: 4096,
             },
             devServer: false,
           }),

src/sentry/api/endpoints/organization_sdk_deprecations.py

@@ -2,19 +2,18 @@
 from typing import DefaultDict, TypedDict
 
 import sentry_sdk
-from packaging.version import InvalidVersion, Version
+from packaging.version import InvalidVersion
 from packaging.version import parse as parse_version
 from rest_framework import serializers
 from rest_framework.request import Request
 from rest_framework.response import Response
 
-from sentry import options
 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.models.project import Project
-from sentry.models.projectsdk import EventType, ProjectSDK
+from sentry.models.projectsdk import EventType, ProjectSDK, get_minimum_sdk_version
 
 
 class SDKDeprecationsSerializer(serializers.Serializer):
@@ -93,40 +92,18 @@ def get_event_types(raw_event_type: str) -> list[EventType]:
     raise ValueError(f"Unknown event type: {raw_event_type}")
 
 
-MINIMUM_SDK_VERSION_OPTIONS: dict[tuple[int, str], str] = {
-    (EventType.PROFILE_CHUNK.value, "sentry.cocoa"): "sdk-deprecation.profile-chunk.cocoa",
-    (EventType.PROFILE_CHUNK.value, "sentry.python"): "sdk-deprecation.profile-chunk.python",
-}
-
-
-def get_minimum_sdk_version(project_sdk: ProjectSDK) -> Version | None:
-    parts = project_sdk.sdk_name.split(".", 2)
-    if len(parts) < 2:
-        return None
-
-    sdk_name = ".".join(parts[:2])
-
-    sdk_version_option = MINIMUM_SDK_VERSION_OPTIONS.get((project_sdk.event_type, sdk_name))
-    if sdk_version_option is None:
-        return None
-
-    sdk_version = options.get(sdk_version_option)
-    if sdk_version:
-        try:
-            return parse_version(sdk_version)
-        except InvalidVersion as e:
-            sentry_sdk.capture_exception(e)
-    return None
-
-
 def get_deprecation_status(project_sdk: ProjectSDK) -> SDKDeprecation | None:
     try:
         sdk_version = parse_version(project_sdk.sdk_version)
     except InvalidVersion as e:
         sentry_sdk.capture_exception(e)
         return None
 
-    minimum_sdk_version = get_minimum_sdk_version(project_sdk)
+    minimum_sdk_version = get_minimum_sdk_version(
+        project_sdk.event_type,
+        project_sdk.sdk_name,
+        hard_limit=False,
+    )
 
     # no minimum sdk version was specified
     if minimum_sdk_version is None:

src/sentry/celery.py

@@ -33,12 +33,13 @@ def holds_bad_pickle_object(value, memo=None):
             bad_object = holds_bad_pickle_object(item, memo)
             if bad_object is not None:
                 return bad_object
+        return
     elif isinstance(value, dict):
         for item in value.values():
             bad_object = holds_bad_pickle_object(item, memo)
             if bad_object is not None:
                 return bad_object
-
+        return
     if isinstance(value, models.Model):
         return (
             value,
@@ -56,7 +57,7 @@ def holds_bad_pickle_object(value, memo=None):
         return None
     elif value is None:
         return None
-    elif not isinstance(value, (dict, list, str, float, int, bool, tuple, frozenset)):
+    elif not isinstance(value, (str, float, int, bool)):
         return value, "do not pickle stdlib classes"
     return None
 
@@ -69,9 +70,9 @@ def good_use_of_pickle_or_bad_use_of_pickle(task, args, kwargs):
         if bad is not None:
             bad_object, reason = bad
             raise TypeError(
-                "Task %r was invoked with an object that we do not want "
+                "Task %s was invoked with an object that we do not want "
                 "to pass via pickle (%r, reason is %s) in argument %s"
-                % (task, bad_object, reason, name)
+                % (task.name, bad_object, reason, name)
             )
 
 

src/sentry/conf/server.py

@@ -1435,7 +1435,7 @@ def SOCIAL_AUTH_DEFAULT_USERNAME() -> str:
     "sentry.integrations.tasks.update_comment",
     "sentry.integrations.vsts.tasks.kickoff_subscription_check",
     "sentry.integrations.vsts.tasks.subscription_check",
-    "sentry.issues.forecasts",
+    "sentry.issues.escalating.forecasts",
     "sentry.middleware.integrations.tasks",
     "sentry.monitors.tasks.clock_pulse",
     "sentry.monitors.tasks.detect_broken_monitor_envs",

src/sentry/features/temporary.py

@@ -273,6 +273,8 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("organizations:profiling-beta", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, api_expose=True)
     # Enables monitoring for latest profiling sdk used
     manager.add("organizations:profiling-sdks", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
+    # Enables dropping of deprecated profiling sdks used
+    manager.add("organizations:profiling-deprecate-sdks", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enables production profiling in sentry browser application
     manager.add("organizations:profiling-browser", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, api_expose=False)
     # Enables separate differential flamegraph page

src/sentry/grouping/enhancer/__init__.py

@@ -525,6 +525,71 @@ def apply_category_and_updated_in_app_to_frames(
                 ),
             )
 
+    def assemble_stacktrace_component_legacy(
+        self,
+        variant_name: str,
+        frame_components: list[FrameGroupingComponent],
+        frames: list[dict[str, Any]],
+        platform: str | None,
+        exception_data: dict[str, Any] | None = None,
+    ) -> StacktraceGroupingComponent:
+        """
+        This assembles a `stacktrace` grouping component out of the given
+        `frame` components and source frames.
+
+        This also handles cases where the entire stacktrace should be discarded.
+        """
+
+        match_frames: list[Any] = [create_match_frame(frame, platform) for frame in frames]
+        rust_frames = [RustFrame(contributes=c.contributes) for c in frame_components]
+        rust_exception_data = make_rust_exception_data(exception_data)
+
+        # Modify the rust frames by applying +group/-group rules and getting hints for both those
+        # changes and the `in_app` changes applied by earlier in the ingestion process by
+        # `apply_category_and_updated_in_app_to_frames`. Also, get `hint` and `contributes` values
+        # for the overall stacktrace (returned in `rust_results`).
+        rust_stacktrace_results = self.rust_enhancements.assemble_stacktrace_component(
+            match_frames, rust_exception_data, rust_frames
+        )
+
+        # Tally the number of each type of frame in the stacktrace. Later on, this will allow us to
+        # both collect metrics and use the information in decisions about whether to send the event
+        # to Seer
+        frame_counts: Counter[str] = Counter()
+
+        # Update frame components with results from rust
+        for frame, frame_component, rust_frame in zip(frames, frame_components, rust_frames):
+            rust_contributes = bool(rust_frame.contributes)  # bool-ing this for mypy's sake
+            rust_hint = rust_frame.hint
+            rust_hint_type = (
+                None
+                if rust_hint is None
+                else "in-app" if rust_hint.startswith("marked") else "contributes"
+            )
+
+            hint = get_hint_for_frame(variant_name, frame, frame_component, rust_frame)
+
+            if not (variant_name == "system" and rust_hint_type == "in-app"):
+                hint = rust_hint
+
+            frame_component.update(contributes=rust_contributes, hint=hint)
+
+            # Add this frame to our tally
+            key = f"{"in_app" if frame_component.in_app else "system"}_{"contributing" if frame_component.contributes else "non_contributing"}_frames"
+            frame_counts[key] += 1
+
+        stacktrace_contributes = rust_stacktrace_results.contributes
+        stacktrace_hint = rust_stacktrace_results.hint
+
+        stacktrace_component = StacktraceGroupingComponent(
+            values=frame_components,
+            hint=stacktrace_hint,
+            contributes=stacktrace_contributes,
+            frame_counts=frame_counts,
+        )
+
+        return stacktrace_component
+
     def assemble_stacktrace_component(
         self,
         variant_name: str,
@@ -611,21 +676,12 @@ def assemble_stacktrace_component(
             in_app_rust_frames,
             contributes_rust_frames,
         ):
-            frame_type = "in-app" if frame_component.in_app else "system"
-            rust_contributes = bool(rust_frame.contributes)  # bool-ing this for mypy's sake
-            rust_hint = rust_frame.hint
-            rust_hint_type = (
-                None
-                if rust_hint is None
-                else "in-app" if rust_hint.startswith("marked") else "contributes"
-            )
-
             # System frames should never contribute in the app variant, so if that's what we have,
             # force `contribtues=False`, regardless of the rust results
-            if variant_name == "app" and frame_type == "system":
+            if variant_name == "app" and not frame_component.in_app:
                 contributes = False
             else:
-                contributes = rust_contributes
+                contributes = rust_frame.contributes
 
             hint = get_hint_for_frame(variant_name, frame, frame_component, rust_frame)
             if self.run_split_enhancements:
@@ -640,15 +696,6 @@ def assemble_stacktrace_component(
                     variant_name, frame, frame_component, contributes_rust_frame, "contributes"
                 )
 
-            # TODO: Remove this workaround once we remove the legacy config. It's done this way (as
-            # a second pass at setting the values that undoes what the first pass did, rather than
-            # being incorporated into the first pass) so that we won't have to change any of the
-            # main logic when we remove it.
-            if self.bases and self.bases[0].startswith("legacy"):
-                contributes = rust_contributes
-                if not (variant_name == "system" and rust_hint_type == "in-app"):
-                    hint = rust_hint
-
             frame_component.update(contributes=contributes, hint=hint)
 
             # Add this frame to our tally
@@ -690,13 +737,7 @@ def assemble_stacktrace_component(
         # stacktrace to be wrong, too (if in the process of ignoring rust we turn a stacktrace with
         # at least one contributing frame into one without any). So we need to special-case here as
         # well.
-        #
-        # TODO: Remove the first condition once we get rid of the legacy config
-        if (
-            not (self.bases and self.bases[0].startswith("legacy"))
-            and variant_name == "app"
-            and frame_counts["in_app_contributing_frames"] == 0
-        ):
+        if variant_name == "app" and frame_counts["in_app_contributing_frames"] == 0:
             stacktrace_contributes = False
             stacktrace_hint = None
         else:

src/sentry/grouping/strategies/legacy.py

@@ -452,7 +452,7 @@ def stacktrace_legacy(
         frames_for_filtering.append(frame.get_raw_data())
         prev_frame = frame
 
-    stacktrace_component = context.config.enhancements.assemble_stacktrace_component(
+    stacktrace_component = context.config.enhancements.assemble_stacktrace_component_legacy(
         variant_name, frame_components, frames_for_filtering, event.platform
     )
     stacktrace_component.update(contributes=contributes, hint=hint)

src/sentry/incidents/logic.py

@@ -415,7 +415,7 @@ def get_metric_issue_aggregates(
                 "incidents.get_incident_aggregates.snql.query.error",
                 tags={
                     "dataset": params.snuba_query.dataset,
-                    "entity": EntityKey.EAPSpans.value,
+                    "entity": EntityKey.EAPItemsSpan.value,
                 },
             )
             raise