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

Author: TkDodo

.craft.yml

@@ -8,16 +8,17 @@ statusProvider:
     contexts:
       - 'self-hosted-ubuntu-24.04-amd64'
       - 'self-hosted-ubuntu-24.04-arm-arm64'
+      - 'assemble'
 artifactProvider:
   name: none
 targets:
   - id: release
     name: docker
-    source: ghcr.io/getsentry/sentry-self-hosted
+    source: ghcr.io/getsentry/sentry
     target: getsentry/sentry
   - id: latest
     name: docker
-    source: ghcr.io/getsentry/sentry-self-hosted
+    source: ghcr.io/getsentry/sentry
     target: getsentry/sentry
     targetFormat: '{{{target}}}:latest'
   - name: github

.envrc

@@ -4,7 +4,7 @@
 # initialization (e.g. activating the venv) or giving recommendations on how to reach the desired state.
 # It also sets useful environment variables.
 # If you'd like to override or set any custom environment variables, this .envrc will read a .env file at the end.
-set -e
+set -eu
 
 # Upgrading Mac can uninstall the Command Line Tools, thus, removing our access to git
 # The message talks about xcrun, however, we can use the lack of git as a way to know that we need this
@@ -121,7 +121,7 @@ if [ -n "${SENTRY_DEVENV_NO_REPORT+x}" ]; then
 else
     # Since direnv traps the EXIT signal we place the temp file under /tmp for the odd time
     # the script will use the EXIT path
-    _SENTRY_LOG_FILE=$(mktemp /tmp/sentry.envrc.$$.out || mktemp /tmp/sentry.envrc.XXXXXXXX.out)
+    _SENTRY_LOG_FILE=$(mktemp /tmp/sentry.envrc.out.$$.XXXXXX)
     exec > >(tee "$_SENTRY_LOG_FILE")
     exec 2>&1
     debug "Development errors will be reported to Sentry.io. If you wish to opt-out, set SENTRY_DEVENV_NO_REPORT as an env variable."
@@ -188,7 +188,7 @@ python3 -m tools.docker_memory_check
 if [ "${PWD##*/}" = "sentry" ]; then
     debug "Checking node..."
 
-    if [ "${SENTRY_DEVENV_SKIP_FRONTEND}" != "1" ]; then
+    if [ "${SENTRY_DEVENV_SKIP_FRONTEND:-}" != "1" ]; then
         if ! require node; then
             die "You don't seem to have node installed. Please run devenv sync."
         fi

.github/CODEOWNERS

@@ -48,6 +48,7 @@ repos:
         language: system
         types: [python]
         log_file: '.artifacts/flake8.pycodestyle.log'
+        require_serial: true
       - id: mypy
         name: mypy
         entry: bash -c 'if [ -n "${SENTRY_MYPY_PRE_PUSH:-}" ]; then exec mypy "$@"; fi' --
@@ -124,7 +125,7 @@ repos:
         name: prettier
         language: system
         types_or: [yaml, ts, tsx, javascript, jsx, css, mdx, markdown]
-        entry: ./node_modules/.bin/prettier --log-level=error --write
+        entry: ./node_modules/.bin/prettier --log-level=error --write --experimental-cli --no-cache
         # https://pre-commit.com/#regular-expressions
         exclude: |
           (?x)^($^

.pre-commit-config.yaml

@@ -1,3 +1,67 @@
+25.6.2
+------
+
+### Various fixes & improvements
+
+- feat(feedback): enable feedback category option for org stats page (#94649) by @aliu39
+- fix(anomaly detection): turn processing back on for dynamic rules (#94652) by @mifu67
+- chore(sentry apps): Add SLO for updating servicehooks (#94489) by @Christinarlong
+- feat(prevent): Initial RepoTokenTable (#94381) by @ajay-sentry
+- feat(aci): automation edit scaffolding (#94595) by @ameliahsu
+- feat(replay): add feedback to LLM context (#94315) by @michellewzhang
+- chore(opsgenie): instrument opsgenie installation slos (#94587) by @Christinarlong
+- chore(detectors): Add google API filtering for Consecutive HTTP detector  (#94634) by @roggenkemper
+- chore(launchpad): add dev check to skip ff logic on artifact upload path (#94638) by @NicoHinderling
+- profiling: allow session expanding (#94633) by @JonasBa
+- feat(aci): Add uptime detector form (#94617) by @malwilley
+- feat(preprod) Add file id for install file (#94642) by @noahsmartin
+- fix(ui): Silence additional AbortErrors (#94644) by @scttcper
+- fix(reports): Significantly increase the schedule_organizations deadline (#94596) by @kcons
+- feat(aci): add subfilters list to remaining frequency conditions (#94621) by @ameliahsu
+- :wrench: chore: add ecosystem to codeowners for sentry apps utils (#94620) by @iamrajjoshi
+- fix(ui): Throw error if response is undefined in api client (#94631) by @scttcper
+- :wrench: chore: fix and add a couple open pr comment logs (#94614) by @iamrajjoshi
+- :wrench: chore: sample sentry app client error slo logs (#94618) by @iamrajjoshi
+- feat(launchpad): Create size analysis upload (assemble) endpoint (#94353) by @NicoHinderling
+- fix(billing): update conditions for orgStatsBanner to appear (#94493) by @brendanhsentry
+- docs(replay): Iterate on bulk delete blueprint (#94494) by @ryan953
+- ref(issues): add rate limits to tagkey details (#94626) by @JoshFerge
+- feat(simpleTable): Allow `<SimpleTable>` to accept any Div props (#94619) by @ryan953
+
+_Plus 519 more_
+
+25.6.1
+------
+
+### Various fixes & improvements
+
+- feat(issues): Add hex parameterization experiment (#93970) by @mrduncan
+- feat(feedback): Split feedback tags into tags+context with collapsable sections (#93397) by @ryan953
+- ref(grouping): Small changes to grouping tests (#93960) by @lobsterkatie
+- ref(replay): adjust timestamps in replay ai summary UI (#93992) by @michellewzhang
+- fix(replay): Add handling for null max_segment_id (#93989) by @cmanallen
+- chore(issues): Remove traceparent experiment (#93942) by @mrduncan
+- ref(trace-items): Pull useGetTraceItemAttributeKeys into hook (#93739) by @Zylphrex
+- ref(explore): Visualize should only have 1 y axis (#93938) by @Zylphrex
+- feat(preprod): Add analytics to the assemble endpoint (#93871) by @trevor-e
+- feat(trace-eap-waterfall): Hiding some attrs (#93964) by @Abdkhan14
+- fix(aci): Fix accidental over-logging (#93971) by @kcons
+- feat(detectors): Add noise config to DB Query Injection Issue Type (#93943) by @roggenkemper
+- ref(dashboards): add a new table widget visualization component (#93902) by @lzhao-sentry
+- ref(issues): Remove redundant Type row from Event Grouping Information table (#93892) by @nora-shap
+- fix(taskworker) Extend deadlines for check_auth (#93961) by @markstory
+- flex: cleanup Flex* custom styling in favor of Flex primitive (#93809) by @JonasBa
+- ✨ feat(scm): add environment infomation to suspect commit prs (#93025) by @iamrajjoshi
+- ref(feedback): better summarization prompt (#93962) by @vishnupsatish
+- ref(replay): include error context in breadcrumb summary (#93669) by @michellewzhang
+- chore(issues): Remove regex parameterization experiment (#93958) by @mrduncan
+- fix(aci): Ensure slow conditions are consistent (#93895) by @kcons
+- feat(feedback): frontend to display summary (#93567) by @vishnupsatish
+- feat(devservices): Add tracing mode (#93759) by @hubertdeng123
+- ref(profiling): Move flamegraphFrameFilter types around for tsgo (#93948) by @scttcper
+
+_Plus 105 more_
+
 25.6.0
 ------
 

CHANGES

@@ -14,6 +14,7 @@ Sentry is a developer-first error tracking and performance monitoring platform.
 - **Task Queue**: Celery 5.5+
 - **Databases**: PostgreSQL (primary), Redis, ClickHouse (via Snuba)
 - **Message Queue**: Kafka, RabbitMQ
+- **Stream Processing**: Arroyo (Kafka consumer/producer framework)
 - **Cloud Services**: Google Cloud Platform (Bigtable, Pub/Sub, Storage, KMS)
 
 ### Frontend
@@ -320,6 +321,7 @@ def send_email(user_id: int, subject: str, body: str) -> None:
 - Mock external services
 - Test database isolation with transactions
 - Use factories for test data
+- For Kafka/Arroyo components: Use `LocalProducer` with `MemoryMessageStorage` instead of mocks
 
 ### JavaScript Tests
 
@@ -404,6 +406,35 @@ analytics.record(
 )
 ```
 
+### Arroyo Stream Processing
+
+```python
+# Using Arroyo for Kafka producers with dependency injection for testing
+from arroyo.backends.abstract import Producer
+from arroyo.backends.kafka import KafkaProducer, KafkaPayload
+from arroyo.backends.local.backend import LocalBroker
+from arroyo.backends.local.storages.memory import MemoryMessageStorage
+
+# Production producer
+def create_kafka_producer(config):
+    return KafkaProducer(build_kafka_configuration(default_config=config))
+
+# Test producer using Arroyo's LocalProducer
+def create_test_producer_factory():
+    storage = MemoryMessageStorage()
+    broker = LocalBroker(storage)
+    return lambda config: broker.get_producer(), storage
+
+# Dependency injection pattern for testable Kafka producers
+class MultiProducer:
+    def __init__(self, topic: Topic, producer_factory: Callable[[Mapping[str, object]], Producer[KafkaPayload]] | None = None):
+        self.producer_factory = producer_factory or self._default_producer_factory
+        # ... setup code
+
+    def _default_producer_factory(self, config) -> KafkaProducer:
+        return KafkaProducer(build_kafka_configuration(default_config=config))
+```
+
 ## Architecture Rules
 
 ### Silo Mode
@@ -445,6 +476,17 @@ for org in organizations:
 
 # RIGHT: Use prefetch_related
 organizations.prefetch_related('projects')
+
+# WRONG: Use hasattr() for unions
+x: str | None = "hello"
+if hasattr(x, "replace"):
+    x = x.replace("e", "a")
+
+# RIGHT: Use isinstance()
+x: str | None = "hello"
+if isinstance(x, str):
+    x = x.replace("e", "a")
+
 ```
 
 ### Frontend

CLAUDE.md

@@ -114,10 +114,6 @@
             },
             "task": {
               "type": "integer"
-            },
-            "user": {
-              "type": "string",
-              "nullable": true
             }
           }
         }

api-docs/components/schemas/organization-details.json

@@ -94,21 +94,9 @@
     }
   ],
   "paths": {
-    "/api/0/teams/{organization_id_or_slug}/{team_id_or_slug}/stats/": {
-      "$ref": "paths/teams/stats.json"
-    },
-    "/api/0/organizations/{organization_id_or_slug}/eventids/{event_id}/": {
-      "$ref": "paths/organizations/event-id-lookup.json"
-    },
     "/api/0/organizations/{organization_id_or_slug}/repos/": {
       "$ref": "paths/organizations/repos.json"
     },
-    "/api/0/organizations/{organization_id_or_slug}/repos/{repo_id}/commits/": {
-      "$ref": "paths/organizations/repo-commits.json"
-    },
-    "/api/0/organizations/{organization_id_or_slug}/shortids/{issue_id}/": {
-      "$ref": "paths/organizations/shortid.json"
-    },
     "/api/0/projects/": {
       "$ref": "paths/projects/index.json"
     },
@@ -172,9 +160,6 @@
     "/api/0/organizations/{organization_id_or_slug}/releases/{version}/commitfiles/": {
       "$ref": "paths/releases/organization-release-commit-files.json"
     },
-    "/api/0/organizations/{organization_id_or_slug}/releases/{version}/deploys/": {
-      "$ref": "paths/releases/deploys.json"
-    },
     "/api/0/organizations/{organization_id_or_slug}/sentry-app-installations/": {
       "$ref": "paths/integration-platform/sentry-app-installations.json"
     },

api-docs/openapi.json

@@ -2,6 +2,7 @@
   "name": "@sentry-internal/api-docs",
   "version": "1.0.0",
   "private": true,
+  "type": "module",
   "description": "Sentry API docs",
   "main": "index.js",
   "scripts": {