Merge branch 'master' into jodi/embeddings-grouping-thread-stacktrace

Author: jangjodi

.github/CODEOWNERS

@@ -480,24 +480,24 @@ static/app/components/events/eventStatisticalDetector/                    @getse
 
 
 ## Issues
+**/issues/**                                        @getsentry/issues
+/src/sentry/api/helpers/source_map_helper.py        @getsentry/issues
+/src/sentry/api/helpers/actionable_items_helper.py  @getsentry/issues
 /src/sentry/event_manager.py                        @getsentry/issues
 /src/sentry/grouping/                               @getsentry/issues
-/src/sentry/issues/                                 @getsentry/issues
 /src/sentry/tasks/post_process.py                   @getsentry/issues
 /src/sentry/tasks/unmerge.py                        @getsentry/issues
+/src/sentry/search/snuba/                           @getsentry/issues
 /tests/sentry/event_manager/                        @getsentry/issues
 /tests/sentry/grouping/                             @getsentry/issues
-/tests/sentry/issues/                               @getsentry/issues
 /tests/sentry/search/                               @getsentry/issues
 /tests/sentry/tasks/test_post_process.py            @getsentry/issues
 /tests/snuba/search/                                @getsentry/issues
-/src/sentry/search/snuba/                           @getsentry/issues
-/static/app/views/issueList                                  @getsentry/issues
-/src/sentry/api/helpers/source_map_helper.py                  @getsentry/issues
-/src/sentry/api/helpers/actionable_items_helper.py                  @getsentry/issues
+/static/app/views/issueList                         @getsentry/issues
+/static/app/views/issueList                         @getsentry/issues
 /static/app/components/events/interfaces/crashContent/exception/actionableItems.tsx   @getsentry/issues
-/static/app/utils/analytics.tsx                                 @getsentry/issues
-/static/app/utils/routeAnalytics/                               @getsentry/issues
+/static/app/utils/analytics.tsx                     @getsentry/issues
+/static/app/utils/routeAnalytics/                   @getsentry/issues
 ## End of Issues
 
 ## Billing

.github/CONTRIBUTING.md

@@ -1,7 +1,8 @@
 ## Feedback, Advice, and General Help
 
 If you're looking to provide general feedback, or get help or advice, please
-utilize our [community forum](https://forum.sentry.io/) rather than GitHub Issues.
+utilize [GitHub Discussions](https://github.com/getsentry/sentry/discussions)
+rather than GitHub Issues.
 
 ## Contributing to Sentry
 

.pre-commit-config.yaml

@@ -94,6 +94,7 @@ repos:
     rev: v1.10.0
     hooks:
       - id: python-use-type-annotations
+      - id: python-check-blanket-type-ignore
 
   - repo: https://github.com/python-jsonschema/check-jsonschema
     rev: 0.24.1

README.md

@@ -45,7 +45,7 @@ Sentry is a developer-first error tracking and performance monitoring platform t
 # Resources
 
 - [Documentation](https://docs.sentry.io/)
-- [Community](https://forum.sentry.io/) (Bugs, feature requests,
+- [Discussions](https://github.com/getsentry/sentry/discussions) (Bugs, feature requests,
   general questions)
 - [Discord](https://discord.gg/PXa5Apfe7K)
 - [Contributing](https://docs.sentry.io/internal/contributing/)

build-utils/sentry-instrumentation.ts

@@ -1,6 +1,6 @@
 /* eslint-env node */
-import type Sentry from '@sentry/node';
-import type {Transaction} from '@sentry/types';
+import type * as Sentry from '@sentry/node';
+import type {Span} from '@sentry/types';
 import crypto from 'node:crypto';
 import https from 'node:https';
 import os from 'node:os';
@@ -33,7 +33,7 @@ class SentryInstrumentation {
 
   Sentry?: typeof Sentry;
 
-  transaction?: Transaction;
+  span?: Span;
 
   constructor() {
     // Only run if SENTRY_INSTRUMENTATION` is set or when in ci,
@@ -42,14 +42,14 @@ class SentryInstrumentation {
       return;
     }
 
-    const sentry = require('@sentry/node');
-    const {ProfilingIntegration} = require('@sentry/profiling-node');
+    const sentry = require('@sentry/node') as typeof Sentry;
+    const {nodeProfilingIntegration} = require('@sentry/profiling-node');
 
     sentry.init({
       dsn: 'https://3d282d186d924374800aa47006227ce9@sentry.io/2053674',
       environment: IS_CI ? 'ci' : 'local',
       tracesSampleRate: 1.0,
-      integrations: [new ProfilingIntegration()],
+      integrations: [nodeProfilingIntegration()],
       profilesSampler: ({transactionContext}) => {
         if (transactionContext.name === INCREMENTAL_BUILD_TXN) {
           return 0;
@@ -76,11 +76,9 @@ class SentryInstrumentation {
 
     this.Sentry = sentry;
 
-    this.transaction = sentry.startTransaction({
+    this.span = sentry.startInactiveSpan({
       op: 'webpack-build',
-      name: !this.hasInitializedBuild ? INITIAL_BUILD_TXN : INCREMENTAL_BUILD_TXN,
-      description: 'webpack build times',
-      trimEnd: true,
+      name: INITIAL_BUILD_TXN,
     });
   }
 
@@ -132,21 +130,20 @@ class SentryInstrumentation {
     if (!this.Sentry) {
       return;
     }
-    if (this.hasInitializedBuild) {
-      this.transaction = this.Sentry.startTransaction({
-        op: 'webpack-build',
-        name: !this.hasInitializedBuild ? 'initial-build' : 'incremental-build',
-        description: 'webpack build times',
-        startTimestamp: startTime,
-        trimEnd: true,
-      });
-    }
 
-    this.transaction
+    const span = !this.hasInitializedBuild
+      ? this.span
+      : this.Sentry.startInactiveSpan({
+          op: 'webpack-build',
+          name: INCREMENTAL_BUILD_TXN,
+          startTime,
+        });
+
+    span
       ?.startChild({
         op: 'build',
-        description: 'webpack build',
-        data: {
+        name: 'webpack build',
+        attributes: {
           os: `${os.platform()} ${os.arch()} v${os.release()}`,
           memory: os.freemem()
             ? `${os.freemem() / GB_BYTE} / ${os.totalmem() / GB_BYTE} GB (${
@@ -157,8 +154,9 @@ class SentryInstrumentation {
         },
         startTimestamp: startTime,
       })
-      .finish(endTime);
-    this.transaction?.finish();
+      .end(endTime);
+
+    span?.end();
   }
 
   apply(compiler: webpack.Compiler) {

devenv/sync.py

@@ -5,7 +5,7 @@
 import subprocess
 
 from devenv import constants
-from devenv.lib import venv  # type: ignore
+from devenv.lib import venv  # type: ignore[attr-defined]
 from devenv.lib import colima, config, limactl, proc, volta
 
 

fixtures/js-stubs/config.tsx

@@ -13,6 +13,7 @@ export function ConfigFixture(params: Partial<Config> = {}): Config {
     superUserCookieDomain: '.sentry.io',
     validateSUForm: true,
     features: new Set(),
+    shouldPreloadData: true,
     singleOrganization: false,
     enableAnalytics: true,
     urlPrefix: 'https://sentry-jest-tests.example.com/',

fixtures/js-stubs/organization.tsx

@@ -62,6 +62,7 @@ export function OrganizationFixture(
     isDefault: false,
     isDynamicallySampled: true,
     isEarlyAdopter: false,
+    genAIConsent: false,
     openMembership: false,
     pendingAccessRequests: 0,
     quota: {
@@ -75,6 +76,7 @@ export function OrganizationFixture(
     safeFields: [],
     scrubIPAddresses: false,
     sensitiveFields: [],
+    aggregatedDataConsent: false,
     storeCrashReports: 0,
     trustedRelays: [],
     teams: [],

migrations_lockfile.txt

@@ -9,5 +9,5 @@ feedback: 0004_index_together
 hybridcloud: 0015_apitokenreplica_hashed_token_index
 nodestore: 0002_nodestore_no_dictfield
 replays: 0004_index_together
-sentry: 0679_add_query_sub_fk_to_aar_activations
+sentry: 0681_unpickle_authenticator_again
 social_auth: 0002_default_auto_field

package.json

@@ -51,17 +51,17 @@
     "@rsdoctor/webpack-plugin": "^0.1.0",
     "@sentry-internal/global-search": "^0.5.7",
     "@sentry-internal/react-inspector": "6.0.1-4",
-    "@sentry-internal/rrweb": "2.9.0",
-    "@sentry-internal/rrweb-player": "2.9.0",
-    "@sentry-internal/rrweb-snapshot": "2.9.0",
-    "@sentry/babel-plugin-component-annotate": "^2.14.0",
-    "@sentry/core": "^7.105.0",
-    "@sentry/integrations": "^7.105.0",
-    "@sentry/node": "^7.105.0",
-    "@sentry/react": "^7.105.0",
+    "@sentry-internal/rrweb": "2.11.0",
+    "@sentry-internal/rrweb-player": "2.11.0",
+    "@sentry-internal/rrweb-snapshot": "2.11.0",
+    "@sentry/babel-plugin-component-annotate": "^2.16.0",
+    "@sentry/core": "^7.108.0",
+    "@sentry/integrations": "^7.108.0",
+    "@sentry/node": "^7.108.0",
+    "@sentry/react": "^7.108.0",
     "@sentry/release-parser": "^1.3.1",
-    "@sentry/types": "^7.105.0",
-    "@sentry/utils": "^7.105.0",
+    "@sentry/types": "^7.108.0",
+    "@sentry/utils": "^7.108.0",
     "@spotlightjs/spotlight": "^1.2.13",
     "@tanstack/react-query": "^4.29.7",
     "@types/color": "^3.0.3",
@@ -178,7 +178,7 @@
     "@codecov/webpack-plugin": "^0.0.1-beta.4",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
     "@sentry/jest-environment": "^4.0.0",
-    "@sentry/profiling-node": "^1.3.5",
+    "@sentry/profiling-node": "^7.108.0",
     "@styled/typescript-styled-plugin": "^1.0.1",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.1.2",

pyproject.toml

@@ -64,6 +64,7 @@ warn_unreachable = true
 warn_unused_configs = true
 warn_unused_ignores = true
 warn_redundant_casts = true
+enable_error_code = ["ignore-without-code"]
 
 [tool.django-stubs]
 django_settings_module = "sentry.conf.server_mypy"
@@ -384,7 +385,6 @@ module = [
     "sentry.monitors.endpoints.monitor_ingest_checkin_attachment",
     "sentry.monitors.endpoints.monitor_ingest_checkin_details",
     "sentry.monitors.endpoints.organization_monitor_index",
-    "sentry.monkey.pickle",
     "sentry.net.http",
     "sentry.net.socket",
     "sentry.notifications.additional_attachment_manager",
@@ -619,9 +619,11 @@ disable_error_code = [
 # beginning: stronger typing
 [[tool.mypy.overrides]]
 module = [
+    "sentry.api.endpoints.issues.*",
     "sentry.buffer.base",
     "sentry.buffer.redis",
     "sentry.eventstore.reprocessing.redis",
+    "sentry.issues.related.*",
     "sentry.utils.redis",
     "sentry.utils.redis_metrics",
     "sentry.utils.locking.backends.redis",
@@ -636,6 +638,7 @@ module = [
     "sentry.relay.config.metric_extraction",
     "sentry.snuba.metrics.extraction",
     "sentry.tasks.reprocessing2",
+    "tests.sentry.api.endpoints.issues.*",
     "tests.sentry.tasks.test_on_demand_metrics",
     "tests.sentry.relay.config.test_metric_extraction",
 ]

requirements-base.txt

@@ -63,7 +63,7 @@ rfc3986-validator>=0.1.1
 # [end] jsonschema format validators
 sentry-arroyo>=2.16.2
 sentry-kafka-schemas>=0.1.64
-sentry-ophio==0.2.3
+sentry-ophio==0.2.5
 sentry-redis-tools>=0.1.7
 sentry-relay>=0.8.55
 sentry-sdk>=1.40.6
@@ -73,6 +73,7 @@ sqlparse>=0.4.4
 statsd>=3.3
 structlog>=22
 symbolic==12.8.0
+tiktoken>=0.6.0
 toronado>=0.1.0
 typing-extensions>=4.9.0
 ua-parser>=0.10.0

requirements-dev-frozen.txt

@@ -178,7 +178,7 @@ sentry-devenv==1.2.3
 sentry-forked-django-stubs==4.2.7.post3
 sentry-forked-djangorestframework-stubs==3.14.5.post1
 sentry-kafka-schemas==0.1.64
-sentry-ophio==0.2.3
+sentry-ophio==0.2.5
 sentry-redis-tools==0.1.7
 sentry-relay==0.8.55
 sentry-sdk==1.40.6
@@ -194,6 +194,7 @@ statsd==3.3.0
 stripe==3.1.0
 structlog==22.1.0
 symbolic==12.8.0
+tiktoken==0.6.0
 time-machine==2.13.0
 tokenize-rt==5.2.0
 tomli==2.0.1

requirements-frozen.txt

@@ -120,7 +120,7 @@ rsa==4.8
 s3transfer==0.10.0
 sentry-arroyo==2.16.2
 sentry-kafka-schemas==0.1.64
-sentry-ophio==0.2.3
+sentry-ophio==0.2.5
 sentry-redis-tools==0.1.7
 sentry-relay==0.8.55
 sentry-sdk==1.40.6
@@ -135,6 +135,7 @@ statsd==3.3.0
 stripe==3.1.0
 structlog==22.1.0
 symbolic==12.8.0
+tiktoken==0.6.0
 toronado==0.1.0
 tqdm==4.64.1
 typing-extensions==4.9.0

scripts/lib.sh

@@ -169,7 +169,7 @@ develop() {
 }
 
 init-config() {
-    sentry init --dev
+    sentry init --dev --no-clobber
 }
 
 run-dependent-services() {

src/sentry/analytics/events/rule_snooze.py

@@ -15,7 +15,7 @@ class RuleSnoozeAction(analytics.Event):
 
 class RuleSnoozed(RuleSnoozeAction):
     type = "rule.snoozed"
-    attributes = RuleSnoozeAction.attributes + (analytics.Attribute("until", required=False),)  # type: ignore
+    attributes = RuleSnoozeAction.attributes + (analytics.Attribute("until", required=False),)  # type: ignore[assignment]
 
 
 class RuleUnSnoozed(RuleSnoozeAction):