Merge branch 'master' into andrii/implement-cronjob-to-fetch-orgs-projects

Author: Andrii Soldatenko

.github/workflows/bump-version.yml

@@ -0,0 +1,47 @@
+on:
+  workflow_dispatch:
+    inputs:
+      package:
+        required: true
+        type: string
+        description: package name such as `sentry-arroyo`
+      version:
+        required: true
+        type: string
+        description: desired version such as `1.2.3`
+
+# disable all permissions -- we use the PAT's permissions instead
+permissions: {}
+
+jobs:
+  bump-version:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8  # v3.1.0
+      with:
+        token: ${{ secrets.BUMP_SENTRY_TOKEN }}
+    - run: |
+        set -euxo pipefail
+
+        git checkout -b "bot/bump-version/$PACKAGE/$VERSION"
+
+        re="$(sed 's/[_-]/[_-]/g' <<< "$PACKAGE")"
+        sed -i "s/^$re==.*/$PACKAGE==$VERSION/g" -- requirements*.txt
+
+        git \
+            -c user.name=getsentry-bot \
+            -c user.email='[email protected]' \
+            commit \
+            --all \
+            --message "ref: bump $PACKAGE to $VERSION" \
+            --message "Co-Authored-By: $SENDER <[email protected]>"
+
+        git push origin HEAD --quiet
+
+        gh pr create --fill
+      env:
+        GH_TOKEN: ${{ secrets.BUMP_SENTRY_TOKEN }}
+        PACKAGE: ${{ inputs.package }}
+        VERSION: ${{ inputs.version }}
+        SENDER: ${{ github.event.sender.login }}
+        SENDER_ID: ${{ github.event.sender.id }}

.pre-commit-config.yaml

@@ -63,10 +63,11 @@ repos:
       args: [ '--project', 'pyrightconfig-commithook.json' ]
 
 -   repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.16.0
+    rev: 0.21.0
     hooks:
     - id: check-github-actions
     - id: check-github-workflows
+      args: [--verbose]
 
 -   repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.3.0

src/sentry/conf/server.py

@@ -1140,6 +1140,8 @@ def SOCIAL_AUTH_DEFAULT_USERNAME():
     "organizations:dashboards-edit": True,
     # Enable metrics enhanced performance in dashboards
     "organizations:dashboards-mep": False,
+    # Enable the dynamic sampling "Transaction Name" priority in the UI
+    "organizations:dynamic-sampling-transaction-name-priority": False,
     # Enable minimap in the widget viewer modal in dashboards
     "organizations:widget-viewer-modal-minimap": False,
     # Enable experimental performance improvements.

src/sentry/features/__init__.py

@@ -196,6 +196,7 @@
 default_manager.add("organizations:discover-basic", OrganizationFeature)
 default_manager.add("organizations:discover-query", OrganizationFeature)
 default_manager.add("organizations:dynamic-sampling", OrganizationFeature)
+default_manager.add("organizations:dynamic-sampling-transaction-name-priority", OrganizationFeature, True)
 default_manager.add("organizations:event-attachments", OrganizationFeature)
 default_manager.add("organizations:global-views", OrganizationFeature)
 default_manager.add("organizations:incidents", OrganizationFeature)