Merge branch 'master' into aci/nm/monitor-settings

Author: natemoo-re

migrations_lockfile.txt

@@ -21,7 +21,7 @@ remote_subscriptions: 0003_drop_remote_subscription
 
 replays: 0005_drop_replay_index
 
-sentry: 0895_relocation_provenance_smallint
+sentry: 0896_org_level_access_not_null
 
 social_auth: 0002_default_auto_field
 

src/sentry/migrations/0896_org_level_access_not_null.py

@@ -0,0 +1,35 @@
+# Generated by Django 5.2.1 on 2025-05-14 18:49
+
+from sentry.new_migrations.migrations import CheckedMigration
+from sentry.new_migrations.monkey.special import SafeRunSQL
+
+
+class Migration(CheckedMigration):
+    # This flag is used to mark that a migration shouldn't be automatically run in production.
+    # This should only be used for operations where it's safe to run the migration after your
+    # code has deployed. So this should not be used for most operations that alter the schema
+    # of a table.
+    # Here are some things that make sense to mark as post deployment:
+    # - Large data migrations. Typically we want these to be run manually so that they can be
+    #   monitored and not block the deploy for a long period of time while they run.
+    # - Adding indexes to large tables. Since this can take a long time, we'd generally prefer to
+    #   run this outside deployments so that we don't block them. Note that while adding an index
+    #   is a schema change, it's completely safe to run the operation after the code has deployed.
+    # Once deployed, run these manually via: https://develop.sentry.dev/database-migrations/#migration-deployment
+
+    is_post_deployment = False
+
+    dependencies = [
+        ("sentry", "0895_relocation_provenance_smallint"),
+    ]
+
+    operations = [
+        SafeRunSQL(
+            """
+            ALTER TABLE sentry_apiapplication
+            ALTER COLUMN requires_org_level_access SET NOT NULL
+            """,
+            reverse_sql="",
+            hints={"tables": ["sentry_apiapplication"]},
+        ),
+    ]

src/sentry/models/eventattachment.py

@@ -34,13 +34,7 @@ def get_crashreport_key(group_id: int) -> str:
 def event_attachment_screenshot_filter(
     queryset: BaseQuerySet[EventAttachment],
 ) -> BaseQuerySet[EventAttachment]:
-    # Intentionally a hardcoded list instead of a regex since current usecases do not have more 3 screenshots
-    return queryset.filter(
-        name__in=[
-            *[f"screenshot{f'-{i}' if i > 0 else ''}.jpg" for i in range(4)],
-            *[f"screenshot{f'-{i}' if i > 0 else ''}.png" for i in range(4)],
-        ]
-    )
+    return queryset.filter(models.Q(name__icontains="screenshot"))
 
 
 @dataclass(frozen=True)

src/sentry/monitors/serializers.py

@@ -275,7 +275,10 @@ class MonitorCheckInSerializerResponse(MonitorCheckInSerializerResponseOptional)
     environment: str
     status: str
     duration: int
+    # TODO(epurkhiser): Should be replaced with the actual date_created, right
+    # now this is the same as dateAdded
     dateCreated: datetime
+    dateAdded: datetime
     expectedTime: datetime
     monitorConfig: MonitorConfigSerializerResponse
 
@@ -342,6 +345,7 @@ def serialize(self, obj, attrs, user, **kwargs) -> MonitorCheckInSerializerRespo
             "status": obj.get_status_display(),
             "duration": obj.duration,
             "dateCreated": obj.date_added,
+            "dateAdded": obj.date_added,
             "expectedTime": obj.expected_time,
             "monitorConfig": cast(MonitorConfigSerializerResponse, config),
         }

src/sentry/receivers/onboarding.py

@@ -57,6 +57,14 @@
 START_DATE_TRACKING_FIRST_SOURCEMAP_PER_PROJ = datetime(2023, 11, 16, tzinfo=timezone.utc)
 
 
+def get_owner_id(project: Project, user: RpcUser | None = None) -> int | None:
+    if user and user.is_authenticated:
+        return user.id
+
+    # this is either the organizations owners user id or None
+    return Organization.objects.get_from_cache(id=project.organization_id).default_owner_id
+
+
 @project_created.connect(weak=False, dispatch_uid="record_new_project")
 def record_new_project(project, user=None, user_id=None, origin=None, **kwargs):
 
@@ -69,11 +77,8 @@ def record_new_project(project, user=None, user_id=None, origin=None, **kwargs):
     elif user.is_authenticated:
         user_id = default_user_id = user.id
     else:
-        user_id = None
-        try:
-            default_user = Organization.objects.get(id=project.organization_id).get_default_owner()
-            default_user_id = default_user.id
-        except IndexError:
+        user_id = default_user_id = get_owner_id(project, user)
+        if user_id is None:
             logger.warning(
                 "Cannot initiate onboarding for organization (%s) due to missing owners",
                 project.organization_id,
@@ -125,11 +130,7 @@ def record_new_project(project, user=None, user_id=None, origin=None, **kwargs):
 
 @first_event_received.connect(weak=False, dispatch_uid="onboarding.record_first_event")
 def record_first_event(project, event, **kwargs):
-    try:
-        user: RpcUser = Organization.objects.get_from_cache(
-            id=project.organization_id
-        ).get_default_owner()
-    except IndexError:
+    if (owner_id := get_owner_id(project)) is None:
         logger.warning(
             "Cannot record first event for organization (%s) due to missing owners",
             project.organization_id,
@@ -138,7 +139,7 @@ def record_first_event(project, event, **kwargs):
 
     analytics.record(
         "first_event_for_project.sent",
-        user_id=user.id if user else None,
+        user_id=owner_id,
         organization_id=project.organization_id,
         project_id=project.id,
         platform=event.platform,
@@ -170,7 +171,7 @@ def record_first_event(project, event, **kwargs):
     if created:
         analytics.record(
             "first_event.sent",
-            user_id=user.id if user else None,
+            user_id=owner_id,
             organization_id=project.organization_id,
             project_id=project.id,
             platform=event.platform,
@@ -196,14 +197,9 @@ def record_first_transaction(project, datetime, **kwargs):
         date_completed=datetime,
     )
 
-    try:
-        default_user_id = project.organization.get_default_owner().id
-    except IndexError:
-        default_user_id = None
-
     analytics.record(
         "first_transaction.sent",
-        default_user_id=default_user_id,
+        default_user_id=get_owner_id(project),
         organization_id=project.organization_id,
         project_id=project.id,
         platform=project.platform,
@@ -216,7 +212,7 @@ def record_first_profile(project, **kwargs):
 
     analytics.record(
         "first_profile.sent",
-        user_id=project.organization.default_owner_id,
+        user_id=get_owner_id(project),
         organization_id=project.organization_id,
         project_id=project.id,
         platform=project.platform,
@@ -240,7 +236,7 @@ def record_first_replay(project, **kwargs):
         logger.info("record_first_replay_analytics_start")
         analytics.record(
             "first_replay.sent",
-            user_id=project.organization.default_owner_id,
+            user_id=get_owner_id(project),
             organization_id=project.organization_id,
             project_id=project.id,
             platform=project.platform,
@@ -266,7 +262,7 @@ def record_first_feedback(project, **kwargs):
 
     analytics.record(
         "first_feedback.sent",
-        user_id=project.organization.default_owner_id,
+        user_id=get_owner_id(project),
         organization_id=project.organization_id,
         project_id=project.id,
         platform=project.platform,
@@ -281,7 +277,7 @@ def record_first_new_feedback(project, **kwargs):
 
     analytics.record(
         "first_new_feedback.sent",
-        user_id=project.organization.default_owner_id,
+        user_id=get_owner_id(project),
         organization_id=project.organization_id,
         project_id=project.id,
         platform=project.platform,
@@ -295,7 +291,7 @@ def record_first_cron_monitor(project, user, from_upsert, **kwargs):
     if updated:
         analytics.record(
             "first_cron_monitor.created",
-            user_id=user.id if user else project.organization.default_owner_id,
+            user_id=get_owner_id(project, user),
             organization_id=project.organization_id,
             project_id=project.id,
             from_upsert=from_upsert,
@@ -306,7 +302,7 @@ def record_first_cron_monitor(project, user, from_upsert, **kwargs):
 def record_cron_monitor_created(project, user, from_upsert, **kwargs):
     analytics.record(
         "cron_monitor.created",
-        user_id=user.id if user else project.organization.default_owner_id,
+        user_id=get_owner_id(project, user),
         organization_id=project.organization_id,
         project_id=project.id,
         from_upsert=from_upsert,
@@ -321,7 +317,7 @@ def record_first_cron_checkin(project, monitor_id, **kwargs):
 
     analytics.record(
         "first_cron_checkin.sent",
-        user_id=project.organization.default_owner_id,
+        user_id=get_owner_id(project),
         organization_id=project.organization_id,
         project_id=project.id,
         monitor_id=monitor_id,
@@ -354,7 +350,7 @@ def record_first_insight_span(project, module, **kwargs):
 
     analytics.record(
         "first_insight_span.sent",
-        user_id=project.organization.default_owner_id,
+        user_id=get_owner_id(project),
         organization_id=project.organization_id,
         project_id=project.id,
         platform=project.platform,
@@ -400,10 +396,7 @@ def record_release_received(project, release, **kwargs):
         project_id=project.id,
     )
     if success:
-        organization = Organization.objects.get_from_cache(id=project.organization_id)
-        try:
-            owner: RpcUser = organization.get_default_owner()
-        except IndexError:
+        if (owner_id := get_owner_id(project)) is None:
             logger.warning(
                 "Cannot record release received for organization (%s) due to missing owners",
                 project.organization_id,
@@ -412,7 +405,7 @@ def record_release_received(project, release, **kwargs):
 
         analytics.record(
             "first_release_tag.sent",
-            user_id=owner.id,
+            user_id=owner_id,
             project_id=project.id,
             organization_id=project.organization_id,
         )
@@ -426,9 +419,7 @@ def record_release_received(project, release, **kwargs):
     weak=False, dispatch_uid="onboarding.record_event_with_first_minified_stack_trace_for_project"
 )
 def record_event_with_first_minified_stack_trace_for_project(project, event, **kwargs):
-    organization = Organization.objects.get_from_cache(id=project.organization_id)
-    owner_id = organization.default_owner_id
-    if not owner_id:
+    if (owner_id := get_owner_id(project)) is None:
         logger.warning(
             "Cannot record first event for organization (%s) due to missing owners",
             project.organization_id,
@@ -471,18 +462,15 @@ def record_sourcemaps_received(project, event, **kwargs):
         project_id=project.id,
     )
     if success:
-        organization = Organization.objects.get_from_cache(id=project.organization_id)
-        try:
-            owner: RpcUser = organization.get_default_owner()
-        except IndexError:
+        if (owner_id := get_owner_id(project)) is None:
             logger.warning(
                 "Cannot record sourcemaps received for organization (%s) due to missing owners",
                 project.organization_id,
             )
             return
         analytics.record(
             "first_sourcemaps.sent",
-            user_id=owner.id,
+            user_id=owner_id,
             organization_id=project.organization_id,
             project_id=project.id,
             platform=event.platform,
@@ -498,9 +486,7 @@ def record_sourcemaps_received_for_project(project, event, **kwargs):
     if not has_sourcemap(event):
         return
 
-    organization = Organization.objects.get_from_cache(id=project.organization_id)
-    owner_id = organization.default_owner_id
-    if not owner_id:
+    if (owner_id := get_owner_id(project)) is None:
         logger.warning(
             "Cannot record sourcemaps received for organization (%s) due to missing owners",
             project.organization_id,

src/sentry/utils/auth.py

@@ -402,7 +402,7 @@ def is_user_signed_request(request: Request) -> bool:
 
 def set_active_org(request: HttpRequest, org_slug: str) -> None:
     if options.get("demo-mode.disable-sandbox-redirect"):
-        if org_slug == "sandbox":
+        if org_slug in ("sandbox", "telemetry-experience"):
             return
     # even if the value being set is the same this will trigger a session
     # modification and reset the users expiry, so check if they are different first.

static/app/bootstrap/initializeSdk.tsx

@@ -6,7 +6,6 @@ import {SENTRY_RELEASE_VERSION, SPA_DSN} from 'sentry/constants';
 import type {Config} from 'sentry/types/system';
 import {addExtraMeasurements, addUIElementTag} from 'sentry/utils/performanceForSentry';
 import normalizeUrl from 'sentry/utils/url/normalizeUrl';
-import {getErrorDebugIds} from 'sentry/utils/getErrorDebugIds';
 import {
   createRoutesFromChildren,
   matchRoutes,
@@ -192,38 +191,6 @@ export function initializeSdk(config: Config) {
     },
   });
 
-  // Event processor to fill the debug_meta field with debug IDs based on the
-  // files the error touched. (files inside the stacktrace)
-  const debugIdPolyfillEventProcessor = async (event: Event, hint: Sentry.EventHint) => {
-    if (!(hint.originalException instanceof Error)) {
-      return event;
-    }
-
-    try {
-      const debugIdMap = await getErrorDebugIds(hint.originalException);
-
-      // Fill debug_meta information
-      event.debug_meta = {};
-      event.debug_meta.images = [];
-      const images = event.debug_meta.images;
-      Object.keys(debugIdMap).forEach(filename => {
-        images.push({
-          type: 'sourcemap',
-          code_file: filename,
-          debug_id: debugIdMap[filename]!,
-        });
-      });
-    } catch (e) {
-      event.extra = event.extra || {};
-      event.extra.debug_id_fetch_error = String(e);
-    }
-
-    return event;
-  };
-  debugIdPolyfillEventProcessor.id = 'debugIdPolyfillEventProcessor';
-
-  Sentry.addEventProcessor(debugIdPolyfillEventProcessor);
-
   // Track timeOrigin Selection by the SDK to see if it improves transaction durations
   Sentry.addEventProcessor((event: Sentry.Event, _hint?: Sentry.EventHint) => {
     event.tags = event.tags || {};

static/app/components/core/button/linkButton.tsx

@@ -29,14 +29,15 @@ interface BaseLinkButtonProps extends DO_NOT_USE_CommonButtonProps, LinkElementP
 }
 
 interface LinkButtonPropsWithHref extends BaseLinkButtonProps {
+  href: string;
   /**
    * Determines if the link is external and should open in a new tab.
    */
   external?: boolean;
-  href?: string;
 }
 
 interface LinkButtonPropsWithTo extends BaseLinkButtonProps {
+  to: string | LocationDescriptor;
   /**
    * If true, the link will not reset the scroll position of the page when clicked.
    */
@@ -45,7 +46,6 @@ interface LinkButtonPropsWithTo extends BaseLinkButtonProps {
    * Determines if the link should replace the current history entry.
    */
   replace?: boolean;
-  to?: string | LocationDescriptor;
 }
 
 export type LinkButtonProps = LinkButtonPropsWithHref | LinkButtonPropsWithTo;
@@ -68,7 +68,9 @@ export function LinkButton({
         aria-disabled={disabled}
         size={size}
         {...props}
+        // @ts-expect-error set href as undefined to force "disabled" state.
         href={disabled ? undefined : 'href' in props ? props.href : undefined}
+        // @ts-expect-error set to as undefined to force "disabled" state
         to={disabled ? undefined : 'to' in props ? props.to : undefined}
         onClick={handleClick}
       >