Merge branch 'main' into dependabot/go_modules/github.com/elastic/apm…

…-aggregation-1.0.0

.github/workflows/add-to-docs-project.yml

@@ -3,6 +3,9 @@ on:
   issues:
     types:
       - labeled
+permissions:
+  contents: read
+
 jobs:
   add_to_project:
     runs-on: ubuntu-latest

.github/workflows/add-to-project.yml

@@ -6,12 +6,15 @@ on:
       - opened
       - transferred
 
+permissions:
+  contents: read
+
 jobs:
   add-to-project:
     name: Add issue to project
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/add-to-project@v0.5.0
+      - uses: actions/add-to-project@v0.6.1
         with:
           project-url: https://github.com/orgs/elastic/projects/1286
           github-token: ${{ secrets.APM_TECH_USER_TOKEN }}

.github/workflows/benchmarks.yml

@@ -28,6 +28,9 @@ env:
   BENCHMARK_RESULT: benchmark-result.txt
   WORKING_DIRECTORY: testing/benchmark
 
+permissions:
+  contents: read
+
 jobs:
   benchmarks:
     runs-on: ubuntu-latest
@@ -67,7 +70,7 @@ jobs:
             echo "BENCHMARK_RUN=${{ inputs.benchmarkRun }}" >> "$GITHUB_ENV"
           fi
 
-      - uses: hashicorp/vault-action@v2.8.0
+      - uses: hashicorp/vault-action@v3.0.0
         env:
           AWS_CREDENTIALS_PATH: secret/observability-team/ci/elastic-observability-aws-account-auth
           BENCHMARK_CLOUD_CREDENTIALS_PATH: secret/observability-team/ci/benchmark-cloud
@@ -106,7 +109,7 @@ jobs:
         run: make apmbench $SSH_KEY terraform.tfvars
 
       - name: Override docker committed version
-        if: ${{ !github.event.inputs.runOnStable }}
+        if: ${{ ! inputs.runOnStable }}
         run: make docker-override-committed-version
 
       - name: Spin up benchmark environment
@@ -118,11 +121,11 @@ jobs:
           echo "-> infra setup done"
 
       - name: Run benchmarks autotuned
-        if: ${{ github.event.inputs.benchmarkAgents == '' }}
+        if: ${{ inputs.benchmarkAgents == '' }}
         run: make run-benchmark-autotuned index-benchmark-results
 
       - name: Run benchmarks self tuned
-        if: ${{ github.event.inputs.benchmarkAgents != '' }}
+        if: ${{ inputs.benchmarkAgents != '' }}
         run: make run-benchmark index-benchmark-results
 
       - name: Download PNG

.github/workflows/check-docker-compose.yml

@@ -0,0 +1,61 @@
+name: check-docker-compose
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 15 * * 5'
+
+# limit the access of the generated GITHUB_TOKEN
+permissions:
+  contents: read
+
+jobs:
+  filter:
+    runs-on: ubuntu-latest
+    timeout-minutes: 1
+    outputs:
+      matrix: ${{ steps.generator.outputs.matrix }}
+    steps:
+      - id: generator
+        uses: elastic/apm-pipeline-library/.github/actions/elastic-stack-snapshot-branches@current
+
+  check-docker-compose:
+    needs:
+      - filter
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJson(needs.filter.outputs.matrix) }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ matrix.branch }}
+      - uses: actions/setup-go@v5
+        with:
+          go-version-file: go.mod
+          cache: true
+          cache-dependency-path: |
+            go.sum
+            tools/go.sum
+      - run: make check-docker-compose
+
+  all-check-docker-compose:
+    name: All check-docker-compose
+    if: always()
+    runs-on: ubuntu-latest
+    needs:
+      - check-docker-compose
+    steps:
+      - id: check
+        uses: elastic/apm-pipeline-library/.github/actions/check-dependent-jobs@current
+        with:
+          needs: ${{ toJSON(needs) }}
+      - run: ${{ steps.check.outputs.isSuccess }}
+      - if: failure()
+        uses: elastic/apm-pipeline-library/.github/actions/notify-build-status@current
+        with:
+          status: ${{ steps.check.outputs.status }}
+          vaultUrl: ${{ secrets.VAULT_ADDR }}
+          vaultRoleId: ${{ secrets.VAULT_ROLE_ID }}
+          vaultSecretId: ${{ secrets.VAULT_SECRET_ID }}
+          slackChannel: "#apm-server"

.github/workflows/setup-cluster-env/action.yml

@@ -31,7 +31,7 @@ runs:
         cache-dependency-path: |
           go.sum
           tools/go.sum
-    - uses: hashicorp/vault-action@v2.8.0
+    - uses: hashicorp/vault-action@v3.0.0
       with:
         url: ${{ inputs.vault-url }}
         roleId: ${{ inputs.vault-role-id }}

.github/workflows/terraform-fmt.yml

@@ -9,6 +9,9 @@ on:
       - '**.tf'
   merge_group:
 
+permissions:
+  contents: read
+
 jobs:
   terraform-fmt:
     runs-on: ubuntu-latest

.github/workflows/test-reporter.yml

@@ -7,6 +7,11 @@ on:
     types:
       - completed
 
+permissions:
+  contents: read
+  actions: read
+  checks: write
+
 jobs:
   system-test-results:
     runs-on: ubuntu-latest

.github/workflows/update-beats.yml

@@ -26,6 +26,8 @@ jobs:
       matrix: ${{ fromJson(needs.filter.outputs.matrix) }}
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ matrix.branch }}
       - uses: actions/setup-go@v5
         with:
           go-version-file: go.mod

.go-version

@@ -1 +1 @@
-1.21.6
+1.22.1

.mergify.yml

@@ -318,3 +318,17 @@ pull_request_rules:
         labels:
           - "backport"
         title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
+  - name: backport patches to 8.13 branch
+    conditions:
+      - merged
+      - base=main
+      - label=backport-8.13
+    actions:
+      backport:
+        assignees:
+          - "{{ author }}"
+        branches:
+          - "8.13"
+        labels:
+          - "backport"
+        title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"

CHANGELOG.asciidoc

@@ -1,21 +1,23 @@
 // tag::list[]
-* <<release-notes-8.12>>
-* <<release-notes-8.11>>
-* <<release-notes-8.10>>
-* <<release-notes-8.9>>
-* <<release-notes-8.8>>
-* <<release-notes-8.7>>
-* <<release-notes-8.6>>
-* <<release-notes-8.5>>
-* <<release-notes-8.4>>
-* <<release-notes-8.3>>
-* <<release-notes-8.2>>
-* <<release-notes-8.1>>
-* <<release-notes-8.0>>
+* <<apm-release-notes-8.13>>
+* <<apm-release-notes-8.12>>
+* <<apm-release-notes-8.11>>
+* <<apm-release-notes-8.10>>
+* <<apm-release-notes-8.9>>
+* <<apm-release-notes-8.8>>
+* <<apm-release-notes-8.7>>
+* <<apm-release-notes-8.6>>
+* <<apm-release-notes-8.5>>
+* <<apm-release-notes-8.4>>
+* <<apm-release-notes-8.3>>
+* <<apm-release-notes-8.2>>
+* <<apm-release-notes-8.1>>
+* <<apm-release-notes-8.0>>
 // end::list[]
 
 // tag::includes[]
 include::./changelogs/head.asciidoc[]
+include::./changelogs/8.13.asciidoc[]
 include::./changelogs/8.12.asciidoc[]
 include::./changelogs/8.11.asciidoc[]
 include::./changelogs/8.10.asciidoc[]

Makefile

@@ -95,7 +95,7 @@ clean:
 ##############################################################################
 
 .PHONY: check-full
-check-full: update check staticcheck check-docker-compose
+check-full: update check staticcheck
 
 .PHONY: check-approvals
 check-approvals: