Merge branch 'master' into tkdodo/ref/decouple-button-tracking

Author: TkDodo

migrations_lockfile.txt

@@ -5,6 +5,8 @@ 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
+
 explore: 0005_explore_django_json_field
 
 feedback: 0001_squashed_0004_index_together
@@ -25,7 +27,7 @@ preprod: 0010_actual_drop_preprod_artifact_analysis_file_id_col
 
 replays: 0006_add_bulk_delete_job
 
-sentry: 0943_create_data_access_grant
+sentry: 0945_move_discover_models
 
 social_auth: 0003_social_auth_json_field
 

package.json

@@ -27,6 +27,7 @@
     "@mdx-js/loader": "^3.1.0",
     "@mdx-js/mdx": "^3.1.0",
     "@popperjs/core": "^2.11.5",
+    "@r4ai/remark-callout": "^0.6.2",
     "@react-aria/button": "^3.13.1",
     "@react-aria/combobox": "^3.12.3",
     "@react-aria/focus": "^3.20.3",
@@ -163,6 +164,10 @@
     "react-textarea-autosize": "8.5.7",
     "react-virtualized": "^9.22.6",
     "reflux": "0.4.1",
+    "rehype-expressive-code": "^0.41.2",
+    "remark-frontmatter": "^5.0.0",
+    "remark-gfm": "^4.0.1",
+    "remark-mdx-frontmatter": "^5.2.0",
     "screenfull": "^6.0.2",
     "scroll-to-element": "^2.0.0",
     "sprintf-js": "1.0.3",

pnpm-lock.yaml

@@ -427,7 +427,6 @@ module = [
     "sentry.utils.math",
     "sentry.utils.memory",
     "sentry.utils.metrics",
-    "sentry.utils.migrations",
     "sentry.utils.numbers",
     "sentry.utils.otp",
     "sentry.utils.projectflags",

pyproject.toml

@@ -66,7 +66,7 @@ rfc3986-validator>=0.1.1
 sentry-arroyo>=2.26.0
 sentry-kafka-schemas>=1.3.14
 sentry-ophio>=1.1.3
-sentry-protos==0.2.1
+sentry-protos==0.3.1
 sentry-redis-tools>=0.5.0
 sentry-relay>=0.9.10
 sentry-sdk[http2]>=2.29.1

requirements-base.txt

@@ -188,7 +188,7 @@ sentry-forked-djangorestframework-stubs==3.16.0.post1
 sentry-forked-email-reply-parser==0.5.12.post1
 sentry-kafka-schemas==1.3.14
 sentry-ophio==1.1.3
-sentry-protos==0.2.1
+sentry-protos==0.3.1
 sentry-redis-tools==0.5.0
 sentry-relay==0.9.10
 sentry-sdk==2.29.1

requirements-dev-frozen.txt

@@ -125,7 +125,7 @@ sentry-arroyo==2.26.0
 sentry-forked-email-reply-parser==0.5.12.post1
 sentry-kafka-schemas==1.3.14
 sentry-ophio==1.1.3
-sentry-protos==0.2.1
+sentry-protos==0.3.1
 sentry-redis-tools==0.5.0
 sentry-relay==0.9.10
 sentry-sdk==2.29.1

requirements-frozen.txt

@@ -1,6 +1,6 @@
 /* eslint-env node */
 /* eslint import/no-nodejs-modules:0 */
-
+import remarkCallout from '@r4ai/remark-callout';
 import {RsdoctorRspackPlugin} from '@rsdoctor/rspack-plugin';
 import type {
   Configuration,
@@ -16,6 +16,10 @@ import HtmlWebpackPlugin from 'html-webpack-plugin';
 import fs from 'node:fs';
 import {createRequire} from 'node:module';
 import path from 'node:path';
+import rehypeExpressiveCode from 'rehype-expressive-code';
+import remarkFrontmatter from 'remark-frontmatter';
+import remarkGfm from 'remark-gfm';
+import remarkMdxFrontmatter from 'remark-mdx-frontmatter';
 import {TsCheckerRspackPlugin} from 'ts-checker-rspack-plugin';
 
 // @ts-expect-error: ts(5097) importing `.ts` extension is required for resolution, but not enabled until `allowImportingTsExtensions` is added to tsconfig
@@ -290,6 +294,22 @@ const appConfig: Configuration = {
           },
           {
             loader: '@mdx-js/loader',
+            options: {
+              remarkPlugins: [
+                remarkFrontmatter,
+                remarkMdxFrontmatter,
+                remarkGfm,
+                remarkCallout,
+              ],
+              rehypePlugins: [
+                [
+                  rehypeExpressiveCode,
+                  {
+                    useDarkModeMediaQuery: false,
+                  },
+                ],
+              ],
+            },
           },
         ],
       },

rspack.config.ts

@@ -3,13 +3,14 @@
 
 from .attribute import Attribute
 from .base import Analytics
-from .event import Event
+from .event import Event, eventclass
 from .event_manager import default_manager
 from .map import Map
 
 __all__ = (
     "Analytics",
     "Attribute",
+    "eventclass",
     "Event",
     "Map",
     "record",

src/sentry/analytics/__init__.py

@@ -1,30 +1,58 @@
 from __future__ import annotations
 
-__all__ = ("Analytics",)
-
 import abc
-from typing import Any
+from typing import Any, overload
+from warnings import deprecated
 
 from sentry.analytics.event import Event
 from sentry.utils.services import Service
 
 from .event_manager import default_manager
 
+__all__ = ("Analytics",)
+
 
 class Analytics(Service, abc.ABC):
     __all__ = ("record", "validate")
 
     event_manager = default_manager
 
-    def record(
-        self, event_or_event_type: str | Event | Any, instance: Any | None = None, **kwargs: Any
-    ) -> None:
-        if isinstance(event_or_event_type, str):
-            event = self.event_manager.get(event_or_event_type).from_instance(instance, **kwargs)
-        elif isinstance(event_or_event_type, Event):
-            event = event_or_event_type.from_instance(instance, **kwargs)
+    @overload
+    def record(self, event_or_type: Event) -> None:
+        """
+        Record an event. Must be an instance of a subclass of `Event`.
+
+        >>> analytics.record(
+        ...     MyEvent(
+        ...         some_id=123,
+        ...         some_prop="abc"
+        ...     )
+        ... )
+        """
+        ...
+
+    @overload
+    @deprecated("Use the `record` method with an event class instead.")
+    def record(self, event_or_type: str, instance: Any | None = None, **kwargs: Any) -> None:
+        """
+        Record an event, using its `type` name and kwargs. Deprecated, the version of this function
+        where an event is directly passed is preferred, as it is more type-safe.
+
+        >>> analytics.record(
+        ...     "my-event",
+        ...     some_id=123,
+        ...     some_prop="abc"
+        ... )
+        """
+        ...
+
+    def record(self, event_or_type: Event | str, instance: Any = None, **kwargs: Any) -> None:
+        if isinstance(event_or_type, str):
+            event_cls = self.event_manager.get(event_or_type)
+            event = event_cls.from_instance(instance, **kwargs)
         else:
-            return
+            event = event_or_type
+
         self.record_event(event)
 
     def record_event(self, event: Event) -> None: