Merge branch 'main' into endorama-patch-1

Author: endorama

.ci/bump-elastic-stack-snapshot.yml

@@ -20,13 +20,12 @@ scms:
   default:
     kind: github
     spec:
-      user: '{{ requiredEnv "GIT_USER" }}'
-      email: '{{ requiredEnv "GIT_EMAIL" }}'
+      user: '{{ requiredEnv "GITHUB_ACTOR" }}'
       owner: elastic
       repository: apm-server
       token: '{{ requiredEnv "GITHUB_TOKEN" }}'
-      username: '{{ requiredEnv "GIT_USER" }}'
       branch: '{{ requiredEnv "BRANCH" }}'
+      commitusingapi: true
 
 sources:
   latestVersion:

.ci/bump-golang.yml

@@ -23,13 +23,12 @@ scms:
   default:
     kind: github
     spec:
-      user: '{{ requiredEnv "GIT_USER" }}'
-      email: '{{ requiredEnv "GIT_EMAIL" }}'
+      user: '{{ requiredEnv "GITHUB_ACTOR" }}'
       owner: elastic
       repository: apm-server
       token: '{{ requiredEnv "GITHUB_TOKEN" }}'
-      username: '{{ requiredEnv "GIT_USER" }}'
       branch: main
+      commitusingapi: true
 
 sources:
   minor:

.ci/update-beats.yml

@@ -6,13 +6,12 @@ scms:
   default:
     kind: github
     spec:
-      user: '{{ requiredEnv "GIT_USER" }}'
-      email: '{{ requiredEnv "GIT_EMAIL" }}'
+      user: '{{ requiredEnv "GITHUB_ACTOR" }}'
       owner: elastic
       repository: apm-server
       token: '{{ requiredEnv "GITHUB_TOKEN" }}'
-      username: '{{ requiredEnv "GIT_USER" }}'
       branch: '{{ requiredEnv "BRANCH_NAME" }}'
+      commitusingapi: true
 
 actions:
   default:

.github/ISSUE_TEMPLATE/test-plan.md

@@ -15,17 +15,14 @@ Testing can be started when the first build candidate (BC) is available in the C
 Thanks to https://github.com/elastic/apm-server/issues/8303 further smoke tests are run automatically on ESS now.
 **Consider extending the smoke tests to include more test cases which we'd like to cover**
 
-## Go agent
+## go-docappender library
 
-<!-- Add any issues / PRs which were worked on during the milestone release https://github.com/elastic/apm-agent-go/pulls-->
+<!-- Add any issues / PRs which were worked on during the milestone release https://github.com/elastic/go-docappender/pulls-->
 
-## Lambda extension
+## apm-data library
 
-<!-- Add any issues / PRs which were worked on during the milestone release https://github.com/elastic/apm-aws-lambda/pulls-->
+<!-- Add any issues / PRs which were worked on during the milestone release https://github.com/elastic/apm-data/pulls-->
 
-## APM Kubernetes Attacher
-
-<!-- Add any issues / PRs which were worked on during the milestone release -->
 
 ## Test cases from the GitHub board
 
@@ -37,4 +34,4 @@ Add yourself as _assignee_ on the PR before you start testing.
 
 ## Regressions
 
-Link any regressions to this issue.
+<!-- Link any regressions to this issue. -->

.github/workflows/benchmarks.yml

@@ -53,7 +53,7 @@ jobs:
         with:
           go-version-file: 'go.mod'
 
-      - uses: rlespinasse/github-slug-action@55f5982579285ce3138ca118a20247ee994619ee
+      - uses: rlespinasse/github-slug-action@797d68864753cbceedc271349d402da4590e6302
 
       - name: Set up env
         run: |

.github/workflows/bump-elastic-stack.yml

@@ -36,5 +36,6 @@ jobs:
           vaultRoleId: ${{ secrets.VAULT_ROLE_ID }}
           vaultSecretId: ${{ secrets.VAULT_SECRET_ID }}
           pipeline: ./.ci/bump-elastic-stack-snapshot.yml
+          command: '--experimental apply'
         env:
           BRANCH: ${{ matrix.branch }}

.github/workflows/bump-golang.yml

@@ -21,3 +21,4 @@ jobs:
           vaultRoleId: ${{ secrets.VAULT_ROLE_ID }}
           vaultSecretId: ${{ secrets.VAULT_SECRET_ID }}
           pipeline: ./.ci/bump-golang.yml
+          command: '--experimental apply'

.github/workflows/run-minor-release.yml

@@ -71,10 +71,16 @@ jobs:
       - name: Configure git user
         uses: elastic/apm-pipeline-library/.github/actions/setup-git@current
         with:
-          username: ${{ env.GIT_USER }}
-          email: ${{ env.GIT_EMAIL }}
           token: ${{ env.GH_TOKEN }}
 
+      - name: Import GPG key
+        uses: crazy-max/ghaction-import-gpg@01dd5d3ca463c7f10f7f4f7b4f177225ac661ee4  # v6.1.0
+        with:
+          gpg_private_key: ${{ secrets.APM_SERVER_RELEASE_GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.APM_SERVER_RELEASE_PASSPHRASE }}
+          git_user_signingkey: true
+          git_commit_gpgsign: true
+
       - run: make minor-release
 
       - uses: elastic/apm-pipeline-library/.github/actions/slack-message@current

.github/workflows/run-patch-release.yml

@@ -62,10 +62,16 @@ jobs:
       - name: Configure git user
         uses: elastic/apm-pipeline-library/.github/actions/setup-git@current
         with:
-          username: ${{ env.GIT_USER }}
-          email: ${{ env.GIT_EMAIL }}
           token: ${{ env.GH_TOKEN }}
 
+      - name: Import GPG key
+        uses: crazy-max/ghaction-import-gpg@01dd5d3ca463c7f10f7f4f7b4f177225ac661ee4  # v6.1.0
+        with:
+          gpg_private_key: ${{ secrets.APM_SERVER_RELEASE_GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.APM_SERVER_RELEASE_PASSPHRASE }}
+          git_user_signingkey: true
+          git_commit_gpgsign: true
+
       - run: make patch-release
 
       - uses: elastic/apm-pipeline-library/.github/actions/slack-message@current

.github/workflows/update-beats.yml

@@ -39,6 +39,7 @@ jobs:
           vaultRoleId: ${{ secrets.VAULT_ROLE_ID }}
           vaultSecretId: ${{ secrets.VAULT_SECRET_ID }}
           pipeline: ./.ci/update-beats.yml
+          command: '--experimental apply'
       - if: failure()
         uses: elastic/apm-pipeline-library/.github/actions/notify-build-status@current
         with: