Merge branch 'master' into jb/lodash/omit

.envrc

@@ -193,8 +193,8 @@ venv_name=".venv"
 
 # Use requirements-dev.txt to decide when to cut over to `devenv` tooling.
 # This also provides us with a clean-cut rollback procedure.
-if [ -n "$SENTRY_DEVENV_BETA" ] || grep -Eq "^devenv($|>)" "${SENTRY_ROOT}/requirements-dev.txt"; then
-    # The new hotness. (but not ready yet)
+if grep -Eq "^devenv($|>)" "${SENTRY_ROOT}/requirements-dev.txt"; then
+    # The new hotness.
     echo "Using devenv."
     export SENTRY_DEVENV_HOME="${SENTRY_DEVENV_HOME:-$XDG_DATA_HOME/sentry-devenv}"
     PATH_add "${SENTRY_DEVENV_HOME}/bin"

.github/CODEOWNERS

@@ -411,8 +411,11 @@ static/app/components/events/eventStatisticalDetector/                    @getse
 /src/sentry/models/release_threshold                                    @getsentry/enterprise
 /src/sentry/api/endpoints/release_threshold*.py                         @getsentry/enterprise
 /src/sentry/web/frontend/auth_login.py                                  @getsentry/enterprise
-src/sentry/api/endpoints/oauth_userinfo.py                              @getsentry/enterprise
-src/sentry/api/endpoints/user_social_identity*                          @getsentry/enterprise
+/src/sentry/api/endpoints/oauth_userinfo.py                             @getsentry/enterprise
+/src/sentry/api/endpoints/user_social_identity*                         @getsentry/enterprise
+/src/sentry/tasks/integrations/github/                                  @getsentry/enterprise
+/tests/sentry/tasks/integrations/github/                                @getsentry/enterprise
+/static/app/views/releases/thresholdsList/                              @getsentry/enterprise
 ## End of Enterprise
 
 

.github/dependabot.yml

@@ -28,7 +28,6 @@ updates:
       # - dependency-name: "@sentry/react"
       - dependency-name: '@sentry/node'
       - dependency-name: '@sentry/utils'
-      - dependency-name: '@sentry/tracing'
       - dependency-name: '@sentry/integrations'
       - dependency-name: '@sentry/rrweb'
 

.github/workflows/dependency-review.yml

@@ -11,9 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout Repository'
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Dependency Review
-        uses: actions/dependency-review-action@c090f4e553673e6e505ea70d6a95362ee12adb94 # v3.0.3
+        uses: actions/dependency-review-action@c74b580d73376b7750d3d2a50bfb8adc2c937507 # v3.1.5
         with:
           # Possible values: "critical", "high", "moderate", "low"
           fail-on-severity: high

.github/workflows/development-environment.yml

@@ -26,82 +26,7 @@ env:
   SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3
 
 jobs:
-  # This workflow is optimized to test the dev env with dev services as fast as possible
-  # The bootstrap workflow (see last workflow) tests the experience of first time engineers
-  docker-setup:
-    name: Docker set up
-    runs-on: macos-13
-    timeout-minutes: 40
-    env:
-      # Make the environment more similar to what Mac defaults to
-      SHELL: /bin/zsh
-
-    steps:
-      - name: Checkout sentry
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
-
-      - name: Set up
-        id: info
-        run: |
-          echo "yarn-cache-dir=$(yarn cache dir)" >> "$GITHUB_OUTPUT"
-
-      # Trick for unattended Docker installations
-      # https://github.com/docker/for-mac/issues/2359#issuecomment-943131345
-      # NOTE: This can sometimes take up to 10 minutes
-      - name: Install Docker
-        run: |
-          # d4m 4.11+ never starts: https://github.com/docker/for-mac/issues/6450
-          curl -o /tmp/docker.rb https://raw.githubusercontent.com/Homebrew/homebrew-cask/fe866ec0765de141599745f03e215452db7f511b/Casks/docker.rb
-          HOMEBREW_NO_AUTO_UPDATE=1 brew install -v --HEAD -s /tmp/docker.rb
-          sudo /Applications/Docker.app/Contents/MacOS/Docker --unattended --install-privileged-components
-          open -a /Applications/Docker.app --args --unattended --accept-license
-
-      - uses: getsentry/action-setup-volta@c52be2ea13cfdc084edb806e81958c13e445941e # v1.2.0
-
-      # This handles Python's cache
-      - uses: getsentry/action-setup-venv@9e3bbae3836b1b6f129955bf55a19e1d99a61c67 # v1.0.5
-        with:
-          python-version: 3.10.13
-          cache-dependency-path: requirements-dev-frozen.txt
-
-      # This tests starting up the dev services, loading mocks and pre-commit installation
-      # This can take over 15 minutes
-      - name: make bootstrap
-        # GHA pythons are miscompiled and report macos 10.16
-        env:
-          SYSTEM_VERSION_COMPAT: 0
-        run: make bootstrap
-
-  # The pyenv set up takes long, thus, separating it into its own
-  pyenv-setup:
-    name: pyenv set up
-    runs-on: macos-13
-    timeout-minutes: 25
-    env:
-      # This is to support this code https://github.com/getsentry/sentry/blob/47b837a69c38e190a7555de81e6d7d216498b854/scripts/pyenv_setup.sh#L17-L40
-      SHELL: /bin/zsh
-
-    steps:
-      - name: Checkout sentry
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
-
-      - name: Install pyenv
-        run: |
-          HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install pyenv
-
-      # Only after we source ~/.zprofile that the right Python will be selected
-      - name: Set up pyenv
-        run: |
-          make setup-pyenv
-          [[ $(which python) != "${HOME}/.pyenv/shims/python" ]]
-          source ~/.zprofile
-          [[ $(which python) == "${HOME}/.pyenv/shims/python" ]]
-          [[ $(python -V) == "Python $(cat .python-version)" ]]
-          python -m venv .venv
-          source .venv/bin/activate
-          [[ $(python -V) == "Python $(cat .python-version)" ]]
-
-  tools-tests:
+  test:
     runs-on: ubuntu-22.04
     timeout-minutes: 5
     steps:
@@ -113,9 +38,24 @@ jobs:
             requirements-dev.txt
             requirements-dev-frozen.txt
           install-cmd: python3 -m tools.hack_pip && pip install -r requirements-dev.txt -c requirements-dev-frozen.txt
-      - name: run tests
+      - name: test-tools
         run: make test-tools
       - name: Handle artifacts
         uses: ./.github/actions/artifacts
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
+  devenv:
+    runs-on: ubuntu-22.04
+    timeout-minutes: 5
+    steps:
+      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
+      - uses: getsentry/action-setup-venv@9e3bbae3836b1b6f129955bf55a19e1d99a61c67 # v1.0.5
+        with:
+          python-version: 3.10.13
+          cache-dependency-path: |
+            requirements-dev.txt
+            requirements-dev-frozen.txt
+          install-cmd: python3 -m tools.hack_pip && pip install -r requirements-dev.txt -c requirements-dev-frozen.txt
+      - name: devenv sync
+        run: |
+          devenv --nocoderoot sync

.volta.json

@@ -1,6 +1,6 @@
 {
   "volta": {
-    "node": "20.10.0",
+    "node": "20.11.0",
     "yarn": "1.22.5"
   }
 }

Brewfile

@@ -22,7 +22,5 @@ brew 'watchman'
 # If it's installed in the early steps of the setup process, it just leads to confusion.
 # brew 'direnv'
 
-tap 'homebrew/cask'
-
 # required for acceptance testing
 cask 'chromedriver'

CHANGES

@@ -1,3 +1,35 @@
+24.1.0
+------
+
+### Various fixes & improvements
+
+- feat(ddm-onboarding): Add dotnet instructions (#63194) by @ArthurKnaus
+- fix(hybridcloud) Add org slug route for prompts-activity (#63122) by @markstory
+- Fix typo in symx metrics (#63201) by @Swatinem
+- chore(app-start): Add screen total referrer (#63192) by @narsaynorath
+- ref(metrics_extraction): Metric spec versioning preparation (#63114) by @armenzg
+- feat(ds): Only show Get Samples if org is dynamically sampled (#63193) by @matejminar
+- feat(ddm-onboarding): Add js server instructions (#63189) by @ArthurKnaus
+- chore(ddm): remove addWidgets functionality (#63188) by @obostjancic
+- feat(ddm): new query default (#63187) by @obostjancic
+- feat(ddm-onboarding): Add electron instructions (#63186) by @ArthurKnaus
+- ref(ddm): Disable DDM via env var (#63178) by @jan-auer
+- profiling(ref): specify int type for profiling.flamegraph.profile-set.size option (#63175) by @viglia
+- feat(ddm): Move settings out of metrics selector (#63104) by @matejminar
+- fix(flutter-web): hide unactionable missing source context errors (#62998) by @buenaflor
+- ref(profiling): add option to handle the size of the profiles set to compute the flamegraph (#63112) by @viglia
+- fix(self-hosted): Superuser can set options in self-hosted (#63068) by @hubertdeng123
+- feat(partnerships): adding org slug to agreement component (#63156) by @sentaur-athena
+- feat: apitoken last characters option (#62972) by @mdtro
+- fix: remove lodash/find usages (#63150) by @anonrig
+- fix(performance): simplify `extractSpanURLString` method (#63153) by @anonrig
+- ref(escalating issues): Remove backend feature flag references (#63036) by @ceorourke
+- fix: remove lodash/flatmap usages (#63149) by @anonrig
+- fix(events): remove lodash/assign usage (#63148) by @anonrig
+- fix(webVitals): remove lodash/toUpper usage (#63146) by @anonrig
+
+_Plus 677 more_
+
 23.12.1
 -------
 

api-docs/package.json

@@ -21,7 +21,7 @@
     "@types/json-diff": "^0.7.0"
   },
   "volta": {
-    "node": "20.10.0",
+    "node": "20.11.0",
     "yarn": "1.22.5"
   }
 }

api-docs/paths/events/project-issues.json

@@ -294,7 +294,7 @@
     },
     "security": [
       {
-        "auth_token": ["project:write"]
+        "auth_token": ["event:write"]
       }
     ]
   },
@@ -343,7 +343,7 @@
     },
     "security": [
       {
-        "auth_token": ["project:admin"]
+        "auth_token": ["event:admin"]
       }
     ]
   }