Merge branch 'master' into constantinius/ref/analytics/tet-825

Author: constantinius

.github/file-filters.yml

@@ -31,7 +31,7 @@ typecheckable_rules_changed: &typecheckable_rules_changed
 # Trigger to apply the 'Scope: Frontend' label to PRs
 frontend_all: &frontend_all
   - added|modified: '**/*.{ts,tsx,js,jsx,mjs}'
-  - added|modified: 'static/**/*.{less,json,yml,md}'
+  - added|modified: 'static/**/*.{less,json,yml,md,mdx}'
   - added|modified: '{.volta,vercel,tsconfig,biome,package}.json'
 
 # Also used in `getsentry-dispatch.yml` to dispatch backend tests on getsentry

README.md

@@ -35,12 +35,13 @@ Sentry is a developer-first error tracking and performance monitoring platform t
 - [Objective-C/Swift](https://github.com/getsentry/sentry-cocoa)
 - [C\#/F\#](https://github.com/getsentry/sentry-dotnet)
 - [C/C++](https://github.com/getsentry/sentry-native)
-- [Dart](https://github.com/getsentry/sentry-dart)
+- [Dart/Flutter](https://github.com/getsentry/sentry-dart)
 - [Perl](https://github.com/getsentry/perl-raven)
 - [Clojure](https://github.com/getsentry/sentry-clj/)
 - [Elixir](https://github.com/getsentry/sentry-elixir)
 - [Unity](https://github.com/getsentry/sentry-unity)
 - [Unreal Engine](https://github.com/getsentry/sentry-unreal)
+- [Godot Engine](https://github.com/getsentry/sentry-godot)
 - [PowerShell](https://github.com/getsentry/sentry-powershell)
 
 # Resources

knip.config.ts

@@ -81,6 +81,7 @@ const config: KnipConfig = {
     enumMembers: 'off',
     unlisted: 'off',
   },
+  include: ['nsExports', 'nsTypes'],
 };
 
 export default config;

migrations_lockfile.txt

@@ -5,9 +5,9 @@ ahead of you.
 To resolve this, rebase against latest master and regenerate your migration. This file
 will then be regenerated, and you should be able to merge without conflicts.
 
-discover: 0001_move_discover_models
+discover: 0002_link_migrated_explore_query_in_discover
 
-explore: 0005_explore_django_json_field
+explore: 0006_add_changed_reason_field_explore
 
 feedback: 0001_squashed_0004_index_together
 
@@ -27,7 +27,7 @@ preprod: 0010_actual_drop_preprod_artifact_analysis_file_id_col
 
 replays: 0006_add_bulk_delete_job
 
-sentry: 0945_move_discover_models
+sentry: 0946_add_has_mcp_insights_flag
 
 social_auth: 0003_social_auth_json_field
 

pyproject.toml

@@ -88,7 +88,6 @@ module = [
     "confluent_kafka.*",
     "cssselect.*",
     "django_zero_downtime_migrations.backends.postgres.schema.*",
-    "docker.*",
     "fido2.*",
     "google.auth.*",
     "google.cloud.*",

requirements-dev-frozen.txt

@@ -217,6 +217,7 @@ trio==0.25.0
 trio-websocket==0.11.1
 types-beautifulsoup4==4.11.6
 types-cachetools==5.3.0.5
+types-docker==7.1.0.20250705
 types-jsonschema==4.16.1
 types-oauthlib==3.2.0.8
 types-parsimonious==0.10.0.8

requirements-dev.txt

@@ -46,6 +46,7 @@ msgpack-types>=0.2.0
 mypy>=1.15
 types-beautifulsoup4
 types-cachetools
+types-docker
 types-jsonschema
 types-oauthlib
 types-parsimonious

rspack.config.ts

@@ -534,7 +534,19 @@ const appConfig: Configuration = {
     // This only runs in production mode
     minimizer: [
       new rspack.LightningCssMinimizerRspackPlugin(),
-      new rspack.SwcJsMinimizerRspackPlugin(),
+      new rspack.SwcJsMinimizerRspackPlugin({
+        minimizerOptions: {
+          compress: {
+            // We are turning off these 3 minifier options because it has caused
+            // unexpected behaviour. See the following issues for more details.
+            // - https://github.com/swc-project/swc/issues/10822
+            // - https://github.com/swc-project/swc/issues/10824
+            reduce_vars: false,
+            inline: 0,
+            collapse_vars: false,
+          },
+        },
+      }),
     ],
   },
   devtool: IS_PRODUCTION ? 'source-map' : 'eval-cheap-module-source-map',
@@ -767,9 +779,8 @@ if (IS_UI_DEV_ONLY) {
       rewrites: [{from: /^\/.*$/, to: '/_assets/index.html'}],
     },
   };
-  appConfig.optimization = {
-    runtimeChunk: 'single',
-  };
+  // Hot reloading breaks if we aren't using a single runtime chunk
+  appConfig.optimization!.runtimeChunk = 'single';
 }
 
 if (IS_UI_DEV_ONLY || SENTRY_EXPERIMENTAL_SPA) {

src/sentry/api/endpoints/organization_events_meta.py

@@ -23,7 +23,7 @@
 from sentry.models.organization import Organization
 from sentry.search.eap.types import SearchResolverConfig
 from sentry.search.events.types import SnubaParams
-from sentry.snuba import spans_indexed, spans_metrics, spans_rpc
+from sentry.snuba import ourlogs, spans_indexed, spans_metrics, spans_rpc
 from sentry.snuba.query_sources import QuerySource
 from sentry.snuba.referrer import Referrer
 
@@ -97,6 +97,17 @@ def get(self, request: Request, organization) -> Response:
                     sampling_mode=None,
                 )
 
+                return Response({"count": result["data"][0]["count()"]})
+            elif dataset == ourlogs:
+                result = ourlogs.query(
+                    selected_columns=["count()"],
+                    snuba_params=snuba_params,
+                    query=request.query_params.get("query"),
+                    orderby=None,
+                    offset=0,
+                    limit=1,
+                    referrer=Referrer.API_ORGANIZATION_EVENTS_META,
+                )
                 return Response({"count": result["data"][0]["count()"]})
             else:
                 result = dataset.query(

src/sentry/api/endpoints/project_details.py

@@ -36,11 +36,7 @@
 from sentry.deletions.models.scheduleddeletion import RegionScheduledDeletion
 from sentry.dynamic_sampling import get_supported_biases_ids, get_user_biases
 from sentry.dynamic_sampling.types import DynamicSamplingMode
-from sentry.dynamic_sampling.utils import (
-    has_custom_dynamic_sampling,
-    has_dynamic_sampling,
-    has_dynamic_sampling_minimum_sample_rate,
-)
+from sentry.dynamic_sampling.utils import has_custom_dynamic_sampling, has_dynamic_sampling
 from sentry.grouping.enhancer import Enhancements
 from sentry.grouping.enhancer.exceptions import InvalidEnhancerConfig
 from sentry.grouping.fingerprinting import FingerprintingRules, InvalidFingerprintingConfig
@@ -99,6 +95,33 @@ class ProjectMemberSerializer(serializers.Serializer):
         help_text="Enables starring the project within the projects tab. Can be updated with **`project:read`** permission.",
         required=False,
     )
+    autofixAutomationTuning = serializers.ChoiceField(
+        choices=[item.value for item in AutofixAutomationTuningSettings],
+        required=False,
+    )
+    seerScannerAutomation = serializers.BooleanField(required=False)
+
+    def validate_autofixAutomationTuning(self, value):
+        organization = self.context["project"].organization
+        actor = self.context["request"].user
+        if not features.has(
+            "organizations:trigger-autofix-on-issue-summary", organization, actor=actor
+        ):
+            raise serializers.ValidationError(
+                "Organization does not have the trigger-autofix-on-issue-summary feature enabled."
+            )
+        return value
+
+    def validate_seerScannerAutomation(self, value):
+        organization = self.context["project"].organization
+        actor = self.context["request"].user
+        if not features.has(
+            "organizations:trigger-autofix-on-issue-summary", organization, actor=actor
+        ):
+            raise serializers.ValidationError(
+                "Organization does not have the trigger-autofix-on-issue-summary feature enabled."
+            )
+        return value
 
 
 @extend_schema_serializer(
@@ -131,7 +154,6 @@ class ProjectMemberSerializer(serializers.Serializer):
         "copy_from_project",
         "targetSampleRate",
         "dynamicSamplingBiases",
-        "dynamicSamplingMinimumSampleRate",
         "tempestFetchScreenshots",
         "tempestFetchDumps",
         "autofixAutomationTuning",
@@ -225,13 +247,8 @@ class ProjectAdminSerializer(ProjectMemberSerializer):
     copy_from_project = serializers.IntegerField(required=False)
     targetSampleRate = serializers.FloatField(required=False, min_value=0, max_value=1)
     dynamicSamplingBiases = DynamicSamplingBiasSerializer(required=False, many=True)
-    dynamicSamplingMinimumSampleRate = serializers.BooleanField(required=False)
     tempestFetchScreenshots = serializers.BooleanField(required=False)
     tempestFetchDumps = serializers.BooleanField(required=False)
-    autofixAutomationTuning = serializers.ChoiceField(
-        choices=[item.value for item in AutofixAutomationTuningSettings], required=False
-    )
-    seerScannerAutomation = serializers.BooleanField(required=False)
 
     # DO NOT ADD MORE TO OPTIONS
     # Each param should be a field in the serializer like above.
@@ -434,15 +451,6 @@ def validate_targetSampleRate(self, value):
 
         return value
 
-    def validate_dynamicSamplingMinimumSampleRate(self, value):
-        organization = self.context["project"].organization
-        actor = self.context["request"].user
-        if not has_dynamic_sampling_minimum_sample_rate(organization, actor=actor):
-            raise serializers.ValidationError(
-                "Organization does not have the dynamic sampling minimum sample rate feature enabled."
-            )
-        return value
-
     def validate_tempestFetchScreenshots(self, value):
         organization = self.context["project"].organization
         actor = self.context["request"].user
@@ -461,28 +469,6 @@ def validate_tempestFetchDumps(self, value):
             )
         return value
 
-    def validate_autofixAutomationTuning(self, value):
-        organization = self.context["project"].organization
-        actor = self.context["request"].user
-        if not features.has(
-            "organizations:trigger-autofix-on-issue-summary", organization, actor=actor
-        ):
-            raise serializers.ValidationError(
-                "Organization does not have the trigger-autofix-on-issue-summary feature enabled."
-            )
-        return value
-
-    def validate_seerScannerAutomation(self, value):
-        organization = self.context["project"].organization
-        actor = self.context["request"].user
-        if not features.has(
-            "organizations:trigger-autofix-on-issue-summary", organization, actor=actor
-        ):
-            raise serializers.ValidationError(
-                "Organization does not have the trigger-autofix-on-issue-summary feature enabled."
-            )
-        return value
-
 
 class RelaxedProjectPermission(ProjectPermission):
     scope_map = {
@@ -581,7 +567,7 @@ def put(self, request: Request, project) -> Response:
         Update various attributes and configurable settings for the given project.
 
         Note that solely having the **`project:read`** scope restricts updatable settings to
-        `isBookmarked`.
+        `isBookmarked`, `autofixAutomationTuning`, and `seerScannerAutomation`.
         """
         if not request.user.is_authenticated:
             return Response(status=status.HTTP_400_BAD_REQUEST)
@@ -773,14 +759,6 @@ def put(self, request: Request, project) -> Response:
                 changed_proj_settings["sentry:dynamic_sampling_biases"] = result[
                     "dynamicSamplingBiases"
                 ]
-        if result.get("dynamicSamplingMinimumSampleRate") is not None:
-            if project.update_option(
-                "sentry:dynamic_sampling_minimum_sample_rate",
-                result["dynamicSamplingMinimumSampleRate"],
-            ):
-                changed_proj_settings["sentry:dynamic_sampling_minimum_sample_rate"] = result[
-                    "dynamicSamplingMinimumSampleRate"
-                ]
 
         if result.get("autofixAutomationTuning") is not None:
             if project.update_option(