Use peter-evans/create-pull-request action instead of gh pr create

Author: fr4nc1sc0-r4m0n

.github/workflows/merge-upstream-test.yaml

@@ -28,13 +28,16 @@ jobs:
           ref: main
           fetch-depth: 0
           token: ${{ steps.get_token.outputs.token }}
+      
+      - name: Configure git user
+        uses: elastic/oblt-actions/git/setup@v1
+        with:
+          github-token: ${{ steps.get_token.outputs.token }}
 
       - name: Fetch upstream
         run: |
           git remote add upstream https://github.com/open-telemetry/opentelemetry-demo.git
           git fetch upstream main
-        env:
-          GITHUB_TOKEN: ${{ steps.get_token.outputs.token }}
 
       - name: Check for upstream changes
         id: check
@@ -54,46 +57,86 @@ jobs:
 
       - name: Create Pull Request
         if: steps.check.outputs.commits_behind != '0'
-        id: create_pr
-        env:
-          GH_TOKEN: ${{ steps.get_token.outputs.token }}
-        run: |
-          PR_URL=$(gh pr create \
-            --title "chore: merge with upstream opentelemetry-demo" \
-            --body "## Automated upstream merge
+        id: cpr
+        uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725 # v8.0.0
+        with:
+          token: ${{ steps.get_token.outputs.token }}
+          branch: "${{ steps.branch.outputs.branch_name }}"
+          base: main
+          title: "chore: Merge with upstream opentelemetry-demo"
+          body: |
+            ## Automated upstream merge
+          
+            This PR merges with the upstream opentelemetry-demo repository.
+            
+            ### Changes from upstream
+            - ${{ steps.check.outputs.commits_behind }} new commits
+            
+            ### If there are conflicts
+            Check out this branch and resolve them:
+            \`\`\`bash
+            git fetch origin ${{ steps.branch.outputs.branch_name }}
+            git checkout ${{ steps.branch.outputs.branch_name }}
+            git merge main
+            # resolve conflicts
+            git push
+            \`\`\`
+            
+            **Note:** If \`src/payment/package.json\` conflicts, take upstream version and add:
+            \`\`\`json
+            \"@elastic/opentelemetry-node\": \"1.5.0\"
+            \`\`\`
+            And update the start script to:
+            \`\`\`json
+            \"start\": \"OTEL_EXPORTER_OTLP_PROTOCOL=grpc node --require @elastic/opentelemetry-node index.js\"
+            \`\`\`
+            
+            ---
+            *This PR was automatically created.*
+          delete-branch: true
+
+      # - name: Create Pull Request
+      #   if: steps.check.outputs.commits_behind != '0'
+      #   id: create_pr
+      #   env:
+      #     GH_TOKEN: ${{ github.token }}
+      #   run: |
+      #     PR_URL=$(gh pr create \
+      #       --title "chore: merge with upstream opentelemetry-demo" \
+      #       --body "## Automated upstream merge
 
-          This PR merges with the upstream opentelemetry-demo repository.
+      #     This PR merges with the upstream opentelemetry-demo repository.
 
-          ### Changes from upstream
-          - ${{ steps.check.outputs.commits_behind }} new commits
+      #     ### Changes from upstream
+      #     - ${{ steps.check.outputs.commits_behind }} new commits
 
-          ### If there are conflicts
-          Check out this branch and resolve them:
-          \`\`\`bash
-          git fetch origin ${{ steps.branch.outputs.branch_name }}
-          git checkout ${{ steps.branch.outputs.branch_name }}
-          git merge main
-          # resolve conflicts
-          git push
-          \`\`\`
+      #     ### If there are conflicts
+      #     Check out this branch and resolve them:
+      #     \`\`\`bash
+      #     git fetch origin ${{ steps.branch.outputs.branch_name }}
+      #     git checkout ${{ steps.branch.outputs.branch_name }}
+      #     git merge main
+      #     # resolve conflicts
+      #     git push
+      #     \`\`\`
 
-          **Note:** If \`src/payment/package.json\` conflicts, take upstream version and add:
-          \`\`\`json
-          \"@elastic/opentelemetry-node\": \"1.5.0\"
-          \`\`\`
-          And update the start script to:
-          \`\`\`json
-          \"start\": \"OTEL_EXPORTER_OTLP_PROTOCOL=grpc node --require @elastic/opentelemetry-node index.js\"
-          \`\`\`
+      #     **Note:** If \`src/payment/package.json\` conflicts, take upstream version and add:
+      #     \`\`\`json
+      #     \"@elastic/opentelemetry-node\": \"1.5.0\"
+      #     \`\`\`
+      #     And update the start script to:
+      #     \`\`\`json
+      #     \"start\": \"OTEL_EXPORTER_OTLP_PROTOCOL=grpc node --require @elastic/opentelemetry-node index.js\"
+      #     \`\`\`
 
-          ---
-          *This PR was automatically created.*" \
-            --base main \
-            --head ${{ steps.branch.outputs.branch_name }})
+      #     ---
+      #     *This PR was automatically created.*" \
+      #       --base main \
+      #       --head ${{ steps.branch.outputs.branch_name }})
 
-          echo "pr_url=${PR_URL}" >> $GITHUB_OUTPUT
-          PR_NUMBER=$(echo "$PR_URL" | grep -oE '[0-9]+$')
-          echo "pr_number=${PR_NUMBER}" >> $GITHUB_OUTPUT
+      #     echo "pr_url=${PR_URL}" >> $GITHUB_OUTPUT
+      #     PR_NUMBER=$(echo "$PR_URL" | grep -oE '[0-9]+$')
+      #     echo "pr_number=${PR_NUMBER}" >> $GITHUB_OUTPUT
 
       # - name: Enable auto-merge
       #   if: steps.create_pr.outputs.pr_number != ''