Merge branch 'main' into split-binary-ci

Author: mowies

.github/workflows/scripts/bump-versions.sh

@@ -180,9 +180,6 @@ if [ "$commit_changes" = false ]; then
   exit 0
 fi
 
-git config --global user.name "github-actions[bot]"
-git config --global user.email "github-actions[bot]@users.noreply.github.com"
-
 commit_changes() {
   local current_version=$1
   local next_version=$2
@@ -203,7 +200,7 @@ create_pr() {
 
   gh pr create --title "[chore] Prepare release $next_version" \
     --body "This PR updates the version from $current_version to $next_version" \
-    --base main --head "$branch_name" --draft
+    --base main --head "$branch_name"
 }
 
 # TODO: Once Collector 1.0 is released, we can consider removing the

.github/workflows/update-version.yaml

@@ -26,8 +26,31 @@ jobs:
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
+      - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
+        id: otelbot-token
+        with:
+          app-id: ${{ vars.OTELBOT_APP_ID }}
+          private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
+
+      # The next 2 steps are taken from # from https://github.com/actions/create-github-app-token#create-a-git-committer-string-for-an-app-installation
+      - name: Get GitHub App User ID
+        id: get-user-id
+        run: echo "user-id=$(gh api "/users/${{ steps.otelbot-token.outputs.app-slug }}[bot]" --jq .id)" >> "$GITHUB_OUTPUT"
+        env:
+          GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}
+
+      - name: Set up commit author name and email
+        id: committer
+        run: |
+          echo "name=${{ steps.otelbot-token.outputs.app-slug }}[bot]"  >> "$GITHUB_OUTPUT"
+          echo "email=${{ steps.get-user-id.outputs.user-id }}+${{ steps.otelbot-token.outputs.app-slug }}[bot]@users.noreply.github.com>"  >> "$GITHUB_OUTPUT"
+          git config --global user.name "$name"
+          git config --global user.email "$email"
+
       - name: Checkout repository
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          token: ${{ steps.otelbot-token.outputs.token }}
 
       - name: Run bump-versions.sh
         run: |