Merge branch 'master' into sessions-discover

Author: lynnagara

.eslintignore

@@ -5,3 +5,5 @@
 *.d.ts
 config/chartcuterie/config.js
 fixtures/profiles/embedded.js
+fixtures/artifact_bundle_debug_ids/**/*
+fixtures/artifact_bundle_duplicated_debug_ids/**/*

.github/workflows/acceptance.yml

@@ -29,6 +29,7 @@ jobs:
     outputs:
       acceptance: ${{ steps.changes.outputs.acceptance }}
       backend_all: ${{ steps.changes.outputs.backend_all }}
+      frontend_all: ${{ steps.changes.outputs.frontend_all }}
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
@@ -92,6 +93,8 @@ jobs:
           # this is fine to not have for forks, it shouldn't fail
           SENTRY_WEBPACK_WEBHOOK_SECRET: ${{ secrets.SENTRY_WEBPACK_WEBHOOK_SECRET }}
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+          # should set value either as `true` or `false`
+          CODECOV_ENABLE_BA: ${{ needs.files-changed.outputs.frontend_all == 'true'}}
         run: |
           yarn build-acceptance
 

.pre-commit-config.yaml

@@ -31,7 +31,7 @@ repos:
         name: black
         entry: black
         language: system
-        types: [python]
+        types_or: [python, pyi]
         require_serial: true
       # Configuration for isort exists in pyproject.toml,
       # but we let pre-commit take care of the file filtering.

.prettierignore

@@ -1,3 +1,7 @@
+.devenv/bin/**/*
+**/*.min.js
 **/tests/**/fixtures/**/*
-fixtures/**/*
+fixtures/profiles/embedded.js
+fixtures/artifact_bundle_debug_ids/**/*
+fixtures/artifact_bundle_duplicated_debug_ids/**/*
 tests/relay_integration/**/*

devenv/sync.py

@@ -69,6 +69,10 @@ def main(context: dict[str, str]) -> int:
     repo = context["repo"]
     reporoot = context["reporoot"]
 
+    FRONTEND_ONLY = os.environ.get("SENTRY_DEVENV_FRONTEND_ONLY") is not None
+
+    # venv's still needed for frontend because repo-local devenv and pre-commit
+    # exist inside it
     venv_dir, python_version, requirements, editable_paths, bins = venv.get(reporoot, repo)
     url, sha256 = config.get_python(reporoot, python_version)
     print(f"ensuring {repo} venv at {venv_dir}...")
@@ -113,6 +117,8 @@ def main(context: dict[str, str]) -> int:
         venv_dir,
         (
             ("javascript dependencies", ("make", "install-js-dev")),
+            # could opt out of syncing python if FRONTEND_ONLY but only if repo-local devenv
+            # and pre-commit were moved to inside devenv and not the sentry venv
             ("python dependencies", ("make", "install-py-dev")),
         ),
     ):
@@ -125,7 +131,7 @@ def main(context: dict[str, str]) -> int:
         (
             (
                 "git and precommit",
-                # this can't be done in paralell with python dependencies
+                # this can't be done in parallel with python dependencies
                 # as multiple pips cannot act on the same venv
                 ("make", "setup-git"),
             ),
@@ -138,6 +144,12 @@ def main(context: dict[str, str]) -> int:
     ):
         proc.run((f"{venv_dir}/bin/sentry", "init", "--dev"))
 
+    # Frontend engineers don't necessarily always have devservices running and
+    # can configure to skip them to save on local resources
+    if FRONTEND_ONLY:
+        print("Skipping python migrations since SENTRY_DEVENV_FRONTEND_ONLY is set.")
+        return 0
+
     # TODO: check healthchecks for redis and postgres to short circuit this
     proc.run(
         (

fixtures/backup/model_dependencies/detailed.json

@@ -3222,6 +3222,11 @@
         "model": "sentry.organization",
         "nullable": false
       },
+      "owner_user_id": {
+        "kind": "HybridCloudForeignKey",
+        "model": "sentry.user",
+        "nullable": true
+      },
       "project_id": {
         "kind": "ImplicitForeignKey",
         "model": "sentry.project",

fixtures/backup/model_dependencies/flat.json

@@ -446,7 +446,8 @@
   "sentry.metricskeyindexer": [],
   "sentry.monitor": [
     "sentry.organization",
-    "sentry.project"
+    "sentry.project",
+    "sentry.user"
   ],
   "sentry.monitorcheckin": [
     "sentry.monitor",

fixtures/stubs-for-mypy/amqp/__init__.pyi

@@ -1,4 +1,4 @@
 from amqp.channel import Channel
 from amqp.connection import Connection
 
-__all__ = ('Channel', 'Connection')
+__all__ = ("Channel", "Connection")

fixtures/stubs-for-mypy/brotli.pyi

@@ -12,11 +12,11 @@ MODE_TEXT = _Mode._MODE_TEXT
 MODE_FONT = _Mode._MODE_FONT
 
 class Compressor: ...
-
 class Decompressor: ...
 
-def compress(string: bytes, mode: _Mode = ..., quality: int = ..., lgwin: int = ..., lgblock: int = ...) -> bytes: ...
-
+def compress(
+    string: bytes, mode: _Mode = ..., quality: int = ..., lgwin: int = ..., lgblock: int = ...
+) -> bytes: ...
 def decompress(string: bytes) -> bytes: ...
 
 class error(Exception): ...

fixtures/stubs-for-mypy/csp/middleware.pyi

@@ -4,5 +4,7 @@ from django.utils.deprecation import MiddlewareMixin
 
 class CSPMiddleware(MiddlewareMixin):
     def process_request(self, request: HttpRequest) -> None: ...
-    def process_response(self, request: HttpRequest, response: HttpResponseBase) -> HttpResponseBase: ...
+    def process_response(
+        self, request: HttpRequest, response: HttpResponseBase
+    ) -> HttpResponseBase: ...
     def build_policy(self, request: HttpRequest, response: HttpResponseBase) -> str: ...

fixtures/stubs-for-mypy/google_crc32c/__init__.pyi

@@ -0,0 +1,2 @@
+# TODO: can remove this after https://github.com/googleapis/python-crc32c/pull/211
+def value(bts: bytes, /) -> int: ...

fixtures/stubs-for-mypy/isodate/duration.pyi

@@ -8,19 +8,17 @@ class Duration:
     tdelta: datetime.timedelta
 
     def __init__(
-            self,
-            days: int,
-            seconds: int,
-            microseconds: int,
-            milliseconds: int,
-            minutes: int,
-            hours: int,
-            weeks: int,
-            months: int | decimal.Decimal,
-            years: int | decimal.Decimal,
-    ) -> None:
-        ...
-
+        self,
+        days: int,
+        seconds: int,
+        microseconds: int,
+        milliseconds: int,
+        minutes: int,
+        hours: int,
+        weeks: int,
+        months: int | decimal.Decimal,
+        years: int | decimal.Decimal,
+    ) -> None: ...
     @overload
     def __add__(self, other: datetime.datetime) -> datetime.datetime: ...
     @overload

fixtures/stubs-for-mypy/progressbar/__init__.pyi

@@ -0,0 +1,2 @@
+from .widgets import Percentage as Percentage, Bar as Bar, ETA as ETA
+from .bar import ProgressBar as ProgressBar

fixtures/stubs-for-mypy/progressbar/bar.pyi

@@ -0,0 +1,14 @@
+from typing import Sequence
+
+from .widgets import WidgetBase
+
+class ProgressBar:
+    def __init__(
+        self,
+        widgets: Sequence[str | WidgetBase] = ...,
+        max_value: int = ...,
+        min_poll_interval: float = ...,
+    ) -> None: ...
+    def start(self) -> None: ...
+    def update(self, value: int) -> None: ...
+    def finish(self) -> None: ...

fixtures/stubs-for-mypy/progressbar/widgets.pyi

@@ -0,0 +1,4 @@
+class WidgetBase: ...
+class Percentage(WidgetBase): ...
+class Bar(WidgetBase): ...
+class ETA(WidgetBase): ...

fixtures/stubs-for-mypy/rapidjson.pyi

@@ -1,5 +1,6 @@
 from typing import Any
 
 class JSONDecodeError(ValueError): ...
+
 def dumps(o: object) -> str: ...
 def loads(s: str | bytes) -> Any: ...

fixtures/stubs-for-mypy/rediscluster/__init__.pyi

@@ -1,3 +1,3 @@
 from .client import RedisCluster
 
-__all__ = ('RedisCluster',)
+__all__ = ("RedisCluster",)

migrations_lockfile.txt

@@ -9,5 +9,5 @@ feedback: 0004_index_together
 hybridcloud: 0016_add_control_cacheversion
 nodestore: 0002_nodestore_no_dictfield
 replays: 0004_index_together
-sentry: 0693_add_monitors_ownership_actor_id
+sentry: 0695_add_monitors_ownership_owner_user_id_team_id
 social_auth: 0002_default_auto_field

package.json

@@ -178,7 +178,7 @@
   },
   "devDependencies": {
     "@biomejs/biome": "^1.6.0",
-    "@codecov/webpack-plugin": "^0.0.1-beta.4",
+    "@codecov/webpack-plugin": "^0.0.1-beta.6",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
     "@sentry/jest-environment": "^4.0.0",
     "@sentry/profiling-node": "^7.109.0",

pyproject.toml

@@ -96,14 +96,12 @@ module = [
     "google.cloud.*",
     "google.resumable_media.common.*",
     "google.rpc.status_pb2.*",
-    "google_crc32c.*",
     "kombu.*",
     "mistune.*",
     "onelogin.saml2.auth.*",
     "onelogin.saml2.constants.*",
     "onelogin.saml2.idp_metadata_parser.*",
     "phabricator.*",
-    "progressbar.*",
     "rb.*",
     "requests_oauthlib.*",
     "sqlparse.*",
@@ -538,22 +536,9 @@ module = [
     "sentry.web.frontend.shared_group_details",
     "sentry.web.frontend.twofactor",
     "sentry_plugins.bitbucket.client",
-    "sentry_plugins.bitbucket.endpoints.webhook",
     "sentry_plugins.bitbucket.mixins",
-    "sentry_plugins.client",
-    "sentry_plugins.github.client",
     "sentry_plugins.github.plugin",
-    "sentry_plugins.github.webhooks.base",
-    "sentry_plugins.github.webhooks.integration",
-    "sentry_plugins.heroku.plugin",
-    "sentry_plugins.jira.client",
     "sentry_plugins.jira.plugin",
-    "sentry_plugins.pivotal.plugin",
-    "sentry_plugins.redmine.forms",
-    "sentry_plugins.redmine.plugin",
-    "sentry_plugins.splunk.plugin",
-    "sentry_plugins.trello.plugin",
-    "sentry_plugins.twilio.plugin",
     "tests.sentry.api.bases.test_organization",
     "tests.sentry.api.bases.test_project",
     "tests.sentry.api.bases.test_sentryapps",
@@ -620,7 +605,9 @@ module = [
     "sentry.relay.config.metric_extraction",
     "sentry.reprocessing2",
     "sentry.runner.*",
+    "sentry.search.events.datasets.*",
     "sentry.snuba.metrics.extraction",
+    "sentry.tasks.commit_context",
     "sentry.tasks.on_demand_metrics",
     "sentry.tasks.reprocessing2",
     "sentry.utils.iterators",

requirements-base.txt

@@ -84,6 +84,7 @@ brotli>=1.0.9
 pyuwsgi==2.0.23
 zstandard>=0.18.0
 sentry-usage-accountant==0.0.10
+orjson>=3.10.0
 
 msgpack>=1.0.7
 cryptography>=38.0.3

requirements-dev-frozen.txt

@@ -108,6 +108,7 @@ openai==1.3.5
 openapi-core==0.18.2
 openapi-schema-validator==0.6.2
 openapi-spec-validator==0.7.1
+orjson==3.10.0
 outcome==1.2.0
 packaging==21.3
 parse==1.19.0

requirements-frozen.txt

@@ -76,6 +76,7 @@ mmh3==4.0.0
 msgpack==1.0.7
 oauthlib==3.1.0
 openai==1.3.5
+orjson==3.10.0
 packaging==21.3
 parsimonious==0.10.0
 petname==2.6

src/sentry/api/endpoints/organization_events.py

@@ -90,7 +90,6 @@
     Referrer.API_STARFISH_MOBILE_STARTUP_SPAN_TABLE.value,
     Referrer.API_STARFISH_MOBILE_STARTUP_LOADED_LIBRARIES.value,
     Referrer.API_STARFISH_MOBILE_STARTUP_TOTALS.value,
-    Referrer.API_TRACE_EXPLORER_TABLE.value,
 }
 
 API_TOKEN_REFERRER = Referrer.API_AUTH_TOKEN_EVENTS.value