Merge branch 'master' into tony/flusher-logger-tool

Author: lvthanh03

.envrc

@@ -16,12 +16,7 @@ if [ "$(uname -s)" == "Darwin" ] && [ ! -f "/Library/Developer/CommandLineTools/
     return 1
 fi
 
-SENTRY_ROOT="$(
-    cd "$(dirname "${BASH_SOURCE[0]}")"
-    pwd -P
-)"
-
-source "${SENTRY_ROOT}/scripts/lib.sh"
+source "scripts/lib.sh"
 
 bold="$(tput bold)"
 red="$(tput setaf 1)"
@@ -106,9 +101,9 @@ export SENTRY_UI_HOT_RELOAD=1
 
 ### You can override the exported variables with a .env file
 # All exports should happen before here unless they're safeguarded (see devenv error reporting below)
-if [ -f "${SENTRY_ROOT}/.env" ]; then
-    info "Loading variables from ${SENTRY_ROOT}/.env"
-    dotenv "${SENTRY_ROOT}/.env"
+if [ -f ".env" ]; then
+    info "Loading variables from .env"
+    dotenv
 fi
 
 ## Notify of reporting to Sentry
@@ -125,24 +120,19 @@ else
     export SENTRY_DEVSERVICES_DSN=https://23670f54c6254bfd9b7de106637808e9@o1.ingest.sentry.io/1492057
 fi
 
+# for deduplicating
+PATH_rm "/opt/homebrew/bin"
 
-### System ###
-
-for pkg in \
-    make \
-    docker \
-    chromedriver \
-    openssl; do
-    if ! require "$pkg"; then
-        die "You seem to be missing the system dependency: ${pkg}
-Please install homebrew, and run brew bundle."
-    fi
-done
+# homebrew must not be searched first, we need venv and devenv to take precedence
+PATH_add "/opt/homebrew/bin"
 
 ### Python ###
 
-if [ -f .venv/bin/devenv ]; then
-    DEVENV=.venv/bin/devenv
+export VIRTUAL_ENV="${PWD}/.venv"
+PATH_add "${VIRTUAL_ENV}/bin"
+
+if [ -f "${VIRTUAL_ENV}/bin/devenv" ]; then
+    DEVENV="${VIRTUAL_ENV}/bin/devenv"
 else
     DEVENV=devenv
 fi
@@ -156,9 +146,6 @@ https://github.com/getsentry/devenv#install
 '
 fi
 
-PATH_add .venv/bin
-export VIRTUAL_ENV="$PWD/.venv"
-
 if ! require sentry; then
     warn "Your virtualenv is activated, but sentry doesn't seem to be installed."
     commands_to_run+=("devenv sync")
@@ -177,25 +164,23 @@ if ! require pre-commit; then
 fi
 
 ### dotagents ###
-if [ -f "${SENTRY_ROOT}/agents.toml" ] && [ ! -d "${SENTRY_ROOT}/.agents/skills/commit" ]; then
+
+if [ -f "agents.toml" ] && [ ! -d ".agents/skills/commit" ]; then
     warn "Agent skills not installed."
     commands_to_run+=("devenv sync")
 fi
 
-python3 -m tools.docker_memory_check
-
 ### Node ###
 
-# not needed for getsentry
-if [ "${PWD##*/}" = "sentry" ]; then
+if [ -f ".node-version" ]; then
     debug "Checking node..."
 
     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
 
-        read -r node_version < .node-version
+        read -r node_version < ".node-version"
         if [ "v${node_version}" != "$(node --version)" ]; then
             die "Unexpected $(command -v node) version. Please run devenv sync."
         fi

.github/CODEOWNERS

@@ -512,18 +512,21 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py          @get
 /src/sentry/tasks/ai_agent_monitoring.py                                         @getsentry/telemetry-experience
 /tests/sentry/tasks/test_ai_agent_monitoring.py                                  @getsentry/telemetry-experience
 /static/app/actionCreators/metrics.tsx                                           @getsentry/telemetry-experience
-/static/app/data/platformCategories.tsx                                          @getsentry/telemetry-experience
-/static/app/data/platformPickerCategories.tsx                                    @getsentry/telemetry-experience
-/static/app/data/platforms.tsx                                                   @getsentry/telemetry-experience
-/static/app/gettingStartedDocs/                                                  @getsentry/telemetry-experience
-/static/app/types/project.tsx                                                    @getsentry/telemetry-experience
 /static/app/views/settings/dynamicSampling/                                      @getsentry/telemetry-experience
 /static/app/views/insights/pages/agents/                                         @getsentry/telemetry-experience
 /static/app/views/insights/pages/mcp/                                            @getsentry/telemetry-experience
 /static/app/views/insights/pages/platform/                                       @getsentry/telemetry-experience
 /static/app/views/insights/pages/conversations/                                  @getsentry/telemetry-experience
 ## End of Telemetry Experience
 
+## Value Discovery
+/static/app/data/platformCategories.tsx                                          @getsentry/value-discovery
+/static/app/data/platformPickerCategories.tsx                                    @getsentry/value-discovery
+/static/app/data/platforms.tsx                                                   @getsentry/value-discovery
+/static/app/gettingStartedDocs/                                                  @getsentry/value-discovery
+/static/app/types/project.tsx                                                    @getsentry/value-discovery
+## End of Value Discovery
+
 ## ML & AI
 /static/app/components/events/autofix/                      @getsentry/machine-learning-ai
 /static/app/views/seerExplorer/                             @getsentry/machine-learning-ai
@@ -626,6 +629,13 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py          @get
 /tests/snuba/search/                                        @getsentry/issue-workflow
 ## End of Issues
 
+## Onboarding (Value Discovery)
+# These must come after /src/sentry/api/endpoints/ catch-all above
+/src/sentry/api/endpoints/organization_onboarding_tasks.py                       @getsentry/value-discovery
+/src/sentry/api/endpoints/organization_onboarding_continuation_email.py          @getsentry/value-discovery
+/src/sentry/api/endpoints/project_create_sample.py                               @getsentry/value-discovery
+## End of Onboarding
+
 ## AI Conversations (Telemetry Experience)
 # These must come after /src/sentry/api/endpoints/ catch-all above
 /src/sentry/api/endpoints/organization_ai_conversation*.py                       @getsentry/telemetry-experience

.github/workflows/backend-with-coverage.yml

@@ -7,6 +7,9 @@ on:
   schedule:
     - cron: '0,30 * * * *'
 
+env:
+  SENTRY_SKIP_SELENIUM_PLUGIN: '1'
+
 jobs:
   # Skip generating coverage if already exists in GCS
   check-existing-coverage:

.github/workflows/backend.yml

@@ -18,6 +18,7 @@ concurrency:
 env:
   SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3
   SNUBA_NO_WORKERS: 1
+  SENTRY_SKIP_SELENIUM_PLUGIN: '1'
 
 jobs:
   files-changed:

.github/workflows/getsentry-dispatch.yml

@@ -56,23 +56,25 @@ jobs:
           private_key: ${{ secrets.SENTRY_INTERNAL_APP_PRIVATE_KEY }}
 
       - name: Wait for PR merge commit
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         id: mergecommit
         with:
           github-token: ${{ steps.getsentry.outputs.token }}
           script: |
-            require(`${process.env.GITHUB_WORKSPACE}/.github/workflows/scripts/wait-for-merge-commit`).waitForMergeCommit({
+            const { waitForMergeCommit } = await import(`${process.env.GITHUB_WORKSPACE}/.github/workflows/scripts/wait-for-merge-commit.js`);
+            await waitForMergeCommit({
               github,
               context,
               core,
             });
 
       - name: Dispatch getsentry tests
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           github-token: ${{ steps.getsentry.outputs.token }}
           script: |
-            require(`${process.env.GITHUB_WORKSPACE}/.github/workflows/scripts/getsentry-dispatch`).dispatch({
+            const { dispatch } = await import(`${process.env.GITHUB_WORKSPACE}/.github/workflows/scripts/getsentry-dispatch.js`);
+            await dispatch({
               github,
               context,
               core,

.github/workflows/meta-deploys-detect-change-type.yml

@@ -23,10 +23,11 @@ jobs:
           filters: .github/file-filters.yml
 
       - name: Create GitHub job
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           script: |
-            require(`${process.env.GITHUB_WORKSPACE}/.github/workflows/scripts/deploy`).updateChangeType({
+            const { updateChangeType } = await import(`${process.env.GITHUB_WORKSPACE}/.github/workflows/scripts/deploy.js`);
+            await updateChangeType({
               github,
               context,
               fileChanges: ${{ toJson(steps.changes.outputs) }}

.github/workflows/sentry-pull-request-bot.yml

@@ -23,7 +23,7 @@ jobs:
     steps:
       - name: Check getsentry membership
         id: org
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           script: |
             try {
@@ -45,24 +45,25 @@ jobs:
           private_key: ${{ secrets.SENTRY_INTERNAL_APP_PRIVATE_KEY }}
 
       - name: Wait for PR merge commit
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         id: mergecommit
         with:
           github-token: ${{ steps.getsentry.outputs.token }}
           script: |
-            require(`${process.env.GITHUB_WORKSPACE}/.github/workflows/scripts/wait-for-merge-commit`).waitForMergeCommit({
+            const { waitForMergeCommit } = await import(`${process.env.GITHUB_WORKSPACE}/.github/workflows/scripts/wait-for-merge-commit.js`);
+            await waitForMergeCommit({
               github,
               context,
               core,
             });
 
       - name: Dispatch getsentry tests
         if: steps.org.outputs.result == 'true'
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           github-token: ${{ steps.getsentry.outputs.token }}
           script: |
-            github.rest.actions.createWorkflowDispatch({
+            await github.rest.actions.createWorkflowDispatch({
               owner: 'getsentry',
               repo: 'getsentry',
               workflow_id: 'acceptance.yml',

.github/workflows/sync-labels.yml

@@ -42,13 +42,13 @@ jobs:
             2>&1 | tee sync-report.txt
 
       - name: Read sync output into variable
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         if: github.event_name == 'pull_request'
         id: github-label-sync
         with:
           script: |
-            const fs = require('fs');
-            return fs.readFileSync('sync-report.txt','utf8').toString();
+            const { readFileSync } = await import('node:fs');
+            return readFileSync('sync-report.txt', 'utf8');
           result-encoding: string
 
       - name: Find previous dry-run comment

.github/workflows/warden.yml

@@ -13,6 +13,7 @@ jobs:
     env:
       WARDEN_ANTHROPIC_API_KEY: ${{ secrets.WARDEN_ANTHROPIC_API_KEY }}
       WARDEN_MODEL: ${{ secrets.WARDEN_MODEL }}
+      WARDEN_SENTRY_DSN: ${{ secrets.WARDEN_SENTRY_DSN }}
     steps:
       - uses: actions/checkout@v4
 

.gitignore

@@ -64,6 +64,7 @@ package-lock.json
 yarn.lock
 .claude/settings.local.json
 .claude/plans
+.claude/worktrees
 .warden/
 # Auto-updated agent skill dependencies — ignore to avoid dirty state
 .agents/.gitignore