Merge branch 'master' into fix/trace-indicator-label-visibility-at-edges

Author: buenaflor

.agents/skills/analytics/SKILL.md

@@ -115,9 +115,10 @@ Every `trackAnalytics` call flows through the GetSentry override in `static/gsAp
 
 ## Non-Negotiable Constraints
 
-1. **All events must be type-safe.** Every event key must exist in a `*EventParameters` type and be registered in the domain's event map.
-2. **All events flow through `trackAnalytics()`.** Never call `window.analytics`, `Amplitude.track()`, or any other analytics SDK directly.
-3. **Organization context is automatic.** Pass `organization` to `trackAnalytics` — the override system handles the rest.
-4. **Reuse over create.** Always search for existing events before defining new ones.
-5. **One event per interaction.** Do not fire multiple events for the same user action.
-6. **No PII in event parameters.** Never include user emails, IP addresses, full names, or other personally identifiable information. Use opaque IDs (org ID, user ID) when identity context is needed.
+1. **`trackAnalytics()` calls must be type-safe.** Every event key passed to `trackAnalytics()` must exist in a `*EventParameters` type and be registered in the domain's event map. This enforces that `organization` is always passed and that call sites sharing the same event key use consistent parameters. Declarative helpers — button `analyticsEventKey`/`analyticsParams` props and `useRouteAnalyticsParams` — are exempt because each instance is a one-off: two buttons labeled "Save" are inherently different (different forms, different contexts), so there are no shared call sites and less value in centralized types.
+2. **Prefer declarative helpers.** Use button analytics props and route analytics hooks when they fit. Fall back to `trackAnalytics()` only for interactions those helpers don't cover.
+3. **All events flow through `trackAnalytics()` or built-in helpers.** Never call `window.analytics`, `Amplitude.track()`, or any other analytics SDK directly.
+4. **Organization context is automatic.** Pass `organization` to `trackAnalytics` — the override system handles the rest.
+5. **Reuse over create.** Always search for existing events before defining new ones.
+6. **One event per interaction.** Do not fire multiple events for the same user action.
+7. **No PII in event parameters.** Never include user emails, IP addresses, full names, or other personally identifiable information. Use opaque IDs (org ID, user ID) when identity context is needed.

.agents/skills/analytics/references/tracking-patterns.md

@@ -49,7 +49,7 @@ useRouteAnalyticsParams({
 
 ## Button Click Tracking
 
-Use built-in button analytics props for simple click tracking. No event definition required for Reload-only tracking.
+Use built-in button analytics props for simple click tracking. These are the preferred approach when a `<Button>` already exists — no event definition or type registration required.
 
 ```tsx
 <Button
@@ -72,7 +72,7 @@ Use built-in button analytics props for simple click tracking. No event definiti
 **Rules:**
 
 - Prefer button props over a manual `trackAnalytics` call in an `onClick` handler.
-- If you need the event to be type-safe and appear in the typed event registry, also define it in the domain event file. Button props work without registration but lose type safety.
+- Button props do not require registration in the typed event registry. Each button instance is inherently a one-off — even two "Save" buttons are different buttons tied to different forms — so there are no shared call sites that would benefit from centralized types.
 - The tracking fires via `TrackingContext` — the GetSentry override wires it to Reload/Amplitude.
 
 ## Manual `trackAnalytics()` Calls

devservices/config.yml

@@ -199,7 +199,7 @@ x-sentry-service-config:
       [snuba, postgres, relay, taskbroker, spotlight, taskworker, taskworker-scheduler]
     backend-ci:
       [snuba, postgres, redis, bigtable, redis-cluster, symbolicator, objectstore]
-    symbolicator: [postgres, snuba, symbolicator, spotlight]
+    symbolicator: [postgres, snuba, symbolicator, spotlight, objectstore]
     memcached: [postgres, snuba, memcached, spotlight]
     tracing:
       [

fixtures/seer/webhooks.py

@@ -1,4 +1,4 @@
-from sentry.sentry_apps.metrics import SentryAppEventType
+from sentry.sentry_apps.event_types import SentryAppEventType
 
 MOCK_RUN_ID = 123
 MOCK_GROUP_ID = 456

pnpm-lock.yaml

@@ -91,8 +91,8 @@ dependencies = [
   "sentry-kafka-schemas>=2.1.37",
   "sentry-ophio>=1.1.3",
   # sentry-options is only used in getsentry for now
-  "sentry-options>=1.1.1",
-  "sentry-protos>=0.34.2",
+  "sentry-options>=1.1.2",
+  "sentry-protos>=0.37.1",
   "sentry-redis-tools>=0.5.0",
   "sentry-relay>=0.9.27",
   "sentry-scm==0.30.0",
@@ -107,7 +107,7 @@ dependencies = [
   "statsd>=3.3.0",
   "structlog>=22.1.0",
   "symbolic>=13.1.1",
-  "taskbroker-client>=0.20.7",
+  "taskbroker-client>=0.20.8",
   "tiktoken>=0.8.0",
   "tokenizers>=0.22.0",
   "tldextract>=5.1.2",
@@ -974,7 +974,6 @@ module = [
     "sentry.issues.endpoints.group_attachments",
     "sentry.issues.endpoints.group_current_release",
     "sentry.issues.endpoints.group_first_last_release",
-    "sentry.issues.endpoints.group_integration_details",
     "sentry.issues.endpoints.group_integrations",
     "sentry.issues.endpoints.group_reprocessing",
     "sentry.issues.endpoints.group_stats",

pyproject.toml

@@ -184,6 +184,17 @@ for (const locale of supportedLocales) {
   };
 }
 
+const DEFINED_ENV_VARS = {
+  'process.env.IS_ACCEPTANCE_TEST': JSON.stringify(IS_ACCEPTANCE_TEST),
+  'process.env.NODE_ENV': JSON.stringify(env.NODE_ENV),
+  'process.env.DEPLOY_PREVIEW_CONFIG': JSON.stringify(DEPLOY_PREVIEW_CONFIG),
+  'process.env.EXPERIMENTAL_SPA': JSON.stringify(SENTRY_EXPERIMENTAL_SPA),
+  'process.env.SPA_DSN': JSON.stringify(SENTRY_SPA_DSN),
+  'process.env.SENTRY_RELEASE_VERSION': JSON.stringify(SENTRY_RELEASE_VERSION),
+  'process.env.USE_TANSTACK_DEVTOOL': JSON.stringify(USE_TANSTACK_DEVTOOL),
+  'process.env.ENABLE_SENTRY_TOOLBAR': JSON.stringify(ENABLE_SENTRY_TOOLBAR),
+};
+
 const swcReactLoaderConfig: SwcLoaderOptions = {
   env: {
     mode: 'usage',
@@ -246,6 +257,7 @@ const swcReactLoaderConfig: SwcLoaderOptions = {
  */
 
 const appConfig: Configuration = {
+  name: 'app',
   mode: WEBPACK_MODE,
   target: 'browserslist',
   // Fail on first error instead of continuing to build
@@ -433,16 +445,7 @@ const appConfig: Configuration = {
     /**
      * Defines environment specific flags.
      */
-    new rspack.DefinePlugin({
-      'process.env.IS_ACCEPTANCE_TEST': JSON.stringify(IS_ACCEPTANCE_TEST),
-      'process.env.NODE_ENV': JSON.stringify(env.NODE_ENV),
-      'process.env.DEPLOY_PREVIEW_CONFIG': JSON.stringify(DEPLOY_PREVIEW_CONFIG),
-      'process.env.EXPERIMENTAL_SPA': JSON.stringify(SENTRY_EXPERIMENTAL_SPA),
-      'process.env.SPA_DSN': JSON.stringify(SENTRY_SPA_DSN),
-      'process.env.SENTRY_RELEASE_VERSION': JSON.stringify(SENTRY_RELEASE_VERSION),
-      'process.env.USE_TANSTACK_DEVTOOL': JSON.stringify(USE_TANSTACK_DEVTOOL),
-      'process.env.ENABLE_SENTRY_TOOLBAR': JSON.stringify(ENABLE_SENTRY_TOOLBAR),
-    }),
+    new rspack.DefinePlugin(DEFINED_ENV_VARS),
 
     ...(SHOULD_FORK_TS
       ? [
@@ -461,6 +464,7 @@ const appConfig: Configuration = {
                   '**/*.spec.*',
                   '**/*.snapshots.*',
                   'static/eslint/**/*',
+                  'static/app/serviceWorker/worker/**/*',
                   'scripts/**/*',
                 ],
               },
@@ -554,7 +558,11 @@ const appConfig: Configuration = {
   },
   output: {
     crossOriginLoading: 'anonymous',
-    clean: true, // Clean the output directory before emit.
+    // Clean the output dir before emit, but keep the service-worker assets
+    // emitted by the separate `workerConfig` compiler below. Both compilers
+    // write to this same `dist` path and run in parallel, so without `keep`
+    // app's clean would race and delete the worker's output.
+    clean: {keep: /(entrypoints|sourcemaps)\/service-worker/},
     path: distPath,
     publicPath: '',
     filename: 'entrypoints/[name].js',
@@ -584,6 +592,44 @@ const appConfig: Configuration = {
   devtool: IS_PRODUCTION ? 'source-map' : 'eval-cheap-module-source-map',
 };
 
+/**
+ * Separate config for the service-worker entry point.
+ */
+const workerConfig: Configuration = {
+  name: 'service-worker',
+  mode: appConfig.mode,
+  target: 'webworker',
+  bail: appConfig.bail,
+  entry: {
+    'service-worker': 'sentry/serviceWorker/worker/worker',
+  },
+  context: staticPrefix,
+  experiments: appConfig.experiments,
+  lazyCompilation: appConfig.lazyCompilation,
+  module: appConfig.module,
+  plugins: [
+    /**
+     * Without this, webpack will chunk the locales but attempt to load them all
+     * eagerly.
+     */
+    new rspack.IgnorePlugin({
+      contextRegExp: /moment$/,
+      resourceRegExp: /^\.\/locale$/,
+    }),
+
+    /**
+     * Defines environment specific flags.
+     */
+    new rspack.DefinePlugin(DEFINED_ENV_VARS),
+  ],
+  resolveLoader: {},
+  resolve: appConfig.resolve,
+  // Don't clean: app's compiler owns cleaning `dist` (see its `clean.keep`).
+  output: {...appConfig.output, clean: false},
+  optimization: appConfig.optimization,
+  devtool: appConfig.devtool,
+};
+
 if (IS_TEST) {
   (appConfig.resolve!.alias! as Record<string, string>)['sentry-fixture'] = path.join(
     import.meta.dirname,
@@ -594,6 +640,7 @@ if (IS_TEST) {
 
 if (IS_ACCEPTANCE_TEST) {
   appConfig.plugins?.push(new LastBuiltPlugin({basePath: import.meta.dirname}));
+  workerConfig.plugins?.push(new LastBuiltPlugin({basePath: import.meta.dirname}));
 }
 
 // Dev only! Hot module reloading
@@ -882,6 +929,12 @@ if (IS_PRODUCTION) {
         test: /\.(js|map|css|svg|html|txt|ico|eot|ttf)$/,
       })
     );
+    workerConfig.plugins?.push(
+      new CompressionPlugin({
+        algorithm: 'gzip',
+        test: /\.(js|map|css|svg|html|txt|ico|eot|ttf)$/,
+      })
+    );
   }
 
   // Enable sentry-webpack-plugin for production builds
@@ -922,4 +975,5 @@ if (env.WEBPACK_CACHE_PATH) {
   };
 }
 
-export default appConfig;
+const configs = [appConfig, workerConfig];
+export default configs;

rspack.config.ts

@@ -247,6 +247,34 @@ analytics.record(
 )
 ```
 
+### Tracing / Spans
+
+Use the wrappers in `sentry.utils.tracing` instead of calling the SDK directly. This is required while we dogfood the streaming trace lifecycle (Span First rollout).
+
+| Instead of                       | Use                                              |
+| -------------------------------- | ------------------------------------------------ |
+| `sentry_sdk.start_span()`        | `start_span(name=..., op=...)`                   |
+| `sentry_sdk.start_transaction()` | `start_span(name=..., op=..., transaction=True)` |
+| `span.set_tag(key, value)`       | `set_span_tag(span, key, value)`                 |
+| `span.set_data(key, value)`      | `set_span_data(span, key, value)`                |
+
+```python
+from sentry.utils.tracing import start_span, set_span_tag, set_span_data
+
+# Child span — no need to capture the span when you don't set tags/data
+with start_span(name="event_manager.save", op="save"):
+    do_work()
+
+# Child span with tags/data — capture via `as span`
+with start_span(name="event_manager.save", op="save") as span:
+    set_span_tag(span, "platform", platform)
+    set_span_data(span, "rows_count", len(rows))
+
+# Transaction root (replaces sentry_sdk.start_transaction)
+with start_span(name="monitors.consumer", op="process", transaction=True):
+    process_batch()
+```
+
 ### Metrics Tags
 
 Every distinct tag-value combination is a separate time series, so keep tags **low-cardinality, meaningful, and minimal**:

src/AGENTS.md

@@ -534,7 +534,8 @@ def get(
             config=SearchResolverConfig(),
             definitions=column_definitions,
         )
-        query_filter, _, _ = resolver.resolve_query(query_string)
+        with handle_query_errors():
+            query_filter, _, _ = resolver.resolve_query(query_string)
         meta = resolver.resolve_meta(referrer=referrer.value)
         meta.trace_item_type = constants.SUPPORTED_TRACE_ITEM_TYPE_MAP.get(
             trace_item_type, ProtoTraceItemType.TRACE_ITEM_TYPE_SPAN

src/sentry/api/endpoints/organization_trace_item_attributes.py

@@ -259,8 +259,9 @@ def query_attribute_distributions(
                 else f"({query_1}) AND {function_parameter}:<={function_value}"
             )
 
-    cohort_1, _, _ = resolver.resolve_query(query_1)
-    cohort_2, _, _ = resolver.resolve_query(query_2)
+    with handle_query_errors():
+        cohort_1, _, _ = resolver.resolve_query(query_1)
+        cohort_2, _, _ = resolver.resolve_query(query_2)
 
     # Fetch attribute names for parallelization
     adjusted_start_date, adjusted_end_date = adjust_start_end_window(