Merge branch 'main' of https://github.com/elastic/apm-server into feature/use-plain-command

* 'main' of https://github.com/elastic/apm-server: (76 commits)
  changelog: Add 9.0.4 release notes (elastic#17586)
  Remove 9.1 from 9.2 lazy rollover exception (elastic#17754)
  Fix wrong usage of inputs (elastic#17751)
  iserver-test: Add 9.2 test and some improvements (elastic#17709)
  refactor: replace pkg/errors with stdlib (elastic#17697)
  docs: update release manager docs (elastic#17450)
  build(deps): bump github.com/spf13/pflag from 1.0.6 to 1.0.7 in the spf13 group (elastic#17729)
  build(deps): bump github.com/elastic/apm-data from 1.19.2 to 1.19.3 (elastic#17731)
  chore: Remove stale comment about reloader multierror (elastic#17711)
  [updatecli] Update to elastic/beats@58f44bb27b80 (elastic#17660)
  chore: deps(updatecli/policy): bump "ghcr.io/updatecli/policies/autod... (elastic#17704)
  Add temporary fix for Fleet policy issue (elastic#17682)
  chore: update test plan template (elastic#17497)
  refactor: remove unused apm tracer (elastic#17658)
  Add previously missing ignored logs (elastic#17655)
  ci: update mergify windows check (elastic#17657)
  build(deps): bump github.com/elastic/go-docappender/v2 from 2.10.0 to 2.11.0 (elastic#17570)
  build(deps): bump the dependencies group in /systemtest with 4 updates (elastic#17654)
  build(deps): bump go.opentelemetry.io/collector/pdata from 1.35.0 to 1.36.0 in the otel group (elastic#17653)
  build(deps): bump ubi9/ubi-micro in /packaging/docker (elastic#17651)
  ...

Author: v1v

.ci/updatecli/values.d/ironbank.yml

@@ -1,2 +1,7 @@
 config:
   - path: packaging/ironbank
+
+pull_request:
+  labels:
+    - dependencies
+    - backport-active-all

.github/CODEOWNERS

@@ -1 +1,5 @@
+# Default owner
 * @elastic/obs-ds-intake-services
+
+# Sub-directories/files ownership
+/.github/workflows @elastic/obs-ds-intake-services @elastic/observablt-ci

.github/ISSUE_TEMPLATE/test-plan.md

@@ -2,27 +2,41 @@
 name: Test Plan
 about: Create a new manual test plan meta issue
 labels: "test-plan"
-
 ---
 
 # Manual Test Plan
 
-When picking up a test case, please add your name to this overview beforehand and tick the checkbox when finished.
-Testing can be started when the first build candidate (BC) is available in the CFT region.
+- When picking up a test case, please add your name to this overview beforehand and tick the checkbox when finished.
+- Testing can be started when the first build candidate (BC) is available in the CFT region.
+- For each repository, update the compare version range to get the list of commits to review.
+
+## ES apm-data plugin
+
+<!-- Add any issues / PRs which were worked on during the milestone release https://github.com/elastic/elasticsearch/tree/main/x-pack/plugin/apm-data-->
 
-## Smoke Testing ESS setup
+## apm-aggregation
 
-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**
+<!-- Add any issues / PRs which were worked on during the milestone release https://github.com/elastic/apm-aggregation/pulls-->
 
-## go-docappender library
+List of changes: https://github.com/elastic/apm-aggregation/compare/v1.2.0...v1.3.0
+
+## go-docappender
 
 <!-- Add any issues / PRs which were worked on during the milestone release https://github.com/elastic/go-docappender/pulls-->
 
-## apm-data library
+List of changes: https://github.com/elastic/go-docappender/compare/v2.4.0...v2.10.0
+
+## apm-data
 
 <!-- Add any issues / PRs which were worked on during the milestone release https://github.com/elastic/apm-data/pulls-->
 
+List of changes: https://github.com/elastic/apm-data/compare/v1.16.0...v1.19.2
+
+## apm-server
+
+<!-- Add any issues / PRs which were worked on during the milestone release https://github.com/elastic/apm-server/pulls-->
+
+List of changes: https://github.com/elastic/apm-server/compare/v9.0.0...main
 
 ## Test cases from the GitHub board
 
@@ -31,7 +45,3 @@ Thanks to https://github.com/elastic/apm-server/issues/8303 further smoke tests
 <!-- [apm-server MAJOR.MINOR test-plan](https://github.com/elastic/apm-server/issues?q=is%3Aissue+label%3Atest-plan+-label%3Atest-plan-ok+is%3Aclosed+label%3AvMAJOR.MINOR.0) -->
 
 Add yourself as _assignee_ on the PR before you start testing.
-
-## Regressions
-
-<!-- Link any regressions to this issue. -->

.github/dependabot.yml

@@ -42,8 +42,6 @@ updates:
     directories:
       - "/"
       - "/.github/workflows/*"
-    reviewers:
-      - "elastic/observablt-ci"
     schedule:
       interval: "weekly"
       day: "sunday"

.github/workflows/ci.yml

@@ -45,7 +45,7 @@ jobs:
   test:
     strategy:
       matrix:
-        os: ['macos-latest', 'ubuntu-latest', 'windows-latest']
+        os: ['macos-latest', 'ubuntu-latest', 'windows-2025']
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4

.github/workflows/docs-build.yml

@@ -16,4 +16,4 @@ jobs:
       deployments: write
       id-token: write
       contents: read
-      pull-requests: read
+      pull-requests: write

.github/workflows/generate-bc-upgrade-paths/action.yml

@@ -0,0 +1,20 @@
+---
+
+name: generate-bc-upgrade-paths
+description: Generate BC upgrade paths
+
+outputs:
+  upgrade_paths:
+    description: "List of BC upgrade paths"
+    value: ${{ steps.generate.outputs.upgrade_paths }}
+
+runs:
+  using: "composite"
+  steps:
+    - uses: actions/checkout@v4
+    - id: generate
+      name: Generate BC upgrade paths
+      run: |
+        echo "upgrade_paths=$(./bc.sh)" >> "${GITHUB_OUTPUT}"
+      shell: 'bash'
+      working-directory: ./.github/workflows/generate-bc-upgrade-paths

.github/workflows/generate-bc-upgrade-paths/bc.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+set -eo pipefail
+
+bcs=$(curl -s https://artifacts.elastic.co/releases/TfEVhiaBGqR64ie0g0r0uUwNAbEQMu1Z/future-releases/stack.json |
+          jq '.releases[] |
+              del(.snapshots) | del(.responsible) | select((.build_candidates | length) > 0) | .version')
+
+declare -a upgrade_paths=()
+for bc in ${bcs}; do
+    bc=$(echo "${bc}" | tr -d '"')
+    major=$(echo "${bc}" | cut -d '.' -f1 )
+    minor=$(echo "${bc}" | cut -d '.' -f2 )
+    # Versions less than 8 are skipped.
+    if [[ ${major} -lt 8 ]]; then
+        continue
+    fi
+    # Specifically for 9.0, we set the upgrade path to be from 8.18, since
+    # 8.19 cannot upgrade to 9.0 due to ES chronological upgrade policy.
+    # See issue: https://elasticco.atlassian.net/browse/CP-10254.
+    if [[ "${major}.${minor}" == "9.0" ]]; then
+        upgrade_paths+=("8.18, ${bc}")
+        continue
+    fi
+    # If minor is 0 i.e. brand new major version, upgrade from previous major.
+    # Otherwise, upgrade from previous minor.
+    if [[ ${minor} -eq 0 ]]; then
+        upgrade_paths+=("$(( major - 1 )), ${bc}")
+    else
+        upgrade_paths+=("${major}.$(( minor - 1 )), ${bc}")
+    fi
+done
+
+jq -c -n '$ARGS.positional' --args "${upgrade_paths[@]}"

.github/workflows/integration-server-test.yml

@@ -3,7 +3,23 @@ name: integration-server-test
 run-name: Integration Server Test
 
 on:
-  workflow_dispatch: ~
+  workflow_dispatch:
+    inputs:
+      run-upgrade-tests:
+        description: 'Run upgrade tests (SNAPSHOT)'
+        required: false
+        type: boolean
+        default: true
+      run-upgrade-bc-tests:
+        description: 'Run upgrade tests (BC)'
+        required: false
+        type: boolean
+        default: true
+      run-standalone-tests:
+        description: 'Run standalone-to-managed tests'
+        required: false
+        type: boolean
+        default: true
   schedule:
     - cron: '0 2 * * 1-5'
 
@@ -19,19 +35,62 @@ env:
   TERRAFORM_VERSION: 1.10.2
 
 jobs:
+  prepare:
+    name: Prepare tests
+    runs-on: ubuntu-latest
+    outputs:
+      upgrade_paths: ${{ steps.generate.outputs.upgrade_paths }}
+    steps:
+      - uses: actions/checkout@v4
+      - id: generate
+        name: Generate BC upgrade paths
+        uses: ./.github/workflows/generate-bc-upgrade-paths
+
   run-upgrade:
-    name: Upgrade tests
+    if: ${{ !contains(inputs.run-upgrade-tests, 'false') }}
+    name: Upgrade tests (SNAPSHOT)
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         upgrade-path:
-          # Latest 8.15 cannot upgrade to latest 8.17, it can only go to 8.17.3.
-          # With our current setup (only latest patch), we have to upgrade to intermediate latest 8.16 instead.
-          # TODO: Maybe add support for upgrading to latest upgradable instead of absolute latest?
-          - '8.15, 8.16, 8.17'
-          - '8.17, 8.18, 9.0'
-          - '8.17, 8.19, 9.1'
+          - '8.15, 8.16, 8.17, 8.18'
+          - '8.18, 8.19, 9.2'
+          - '8.18, 9.0, 9.2'
+          - '8.19, 9.1, 9.2'
+        scenario:
+          - 'Default'
+          - 'Reroute'
+    steps:
+      - uses: actions/checkout@v4
+      - uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3.1.2
+        with:
+          terraform_version: "${{ env.TERRAFORM_VERSION }}"
+      - uses: actions/setup-go@v5
+        with:
+          go-version-file: 'integrationservertest/go.mod'
+          cache: false
+      - uses: elastic/oblt-actions/google/auth@v1
+      - uses: google-github-actions/get-secretmanager-secrets@a8440875e1c2892062aef9061228d4f1af8f919b # v2.2.3
+        with:
+          export_to_environment: true
+          secrets: |-
+            EC_API_KEY:elastic-observability/elastic-cloud-observability-team-pro-api-key
+      - name: "Run upgrade tests"
+        working-directory: ${{ github.workspace }}
+        run: |
+          export TF_VAR_CREATED_DATE=$(date +%s)
+          SCENARIO="${{ matrix.scenario }}" UPGRADE_PATH="${{ matrix.upgrade-path }}" SNAPSHOT=true make integration-server-test/upgrade
+
+  run-upgrade-bc:
+    if: ${{ !contains(inputs.run-upgrade-bc-tests, 'false') }}
+    name: Upgrade tests (BC)
+    runs-on: ubuntu-latest
+    needs: prepare
+    strategy:
+      fail-fast: false
+      matrix:
+        upgrade-path: ${{ fromJSON(needs.prepare.outputs.upgrade_paths) }}
         scenario:
           - 'Default'
           - 'Reroute'
@@ -54,9 +113,10 @@ jobs:
         working-directory: ${{ github.workspace }}
         run: |
           export TF_VAR_CREATED_DATE=$(date +%s)
-          SCENARIO="${{ matrix.scenario }}" UPGRADE_PATH="${{ matrix.upgrade-path }}" make integration-server-upgrade-test
+          SCENARIO="${{ matrix.scenario }}" UPGRADE_PATH="${{ matrix.upgrade-path }}" make integration-server-test/upgrade
 
   run-standalone:
+    if: ${{ !contains(inputs.run-standalone-tests, 'false') }}
     name: Standalone-to-managed tests
     runs-on: ubuntu-latest
     strategy:
@@ -85,13 +145,15 @@ jobs:
         working-directory: ${{ github.workspace }}
         run: |
           export TF_VAR_CREATED_DATE=$(date +%s)
-          SCENARIO="${{ matrix.scenario }}" make integration-server-standalone-test
+          SCENARIO="${{ matrix.scenario }}" make integration-server-test/standalone
 
   notify:
-    if: github.ref == 'refs/heads/main'
+    name: Notify
+    if: always() && github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     needs:
       - run-upgrade
+      - run-upgrade-bc
       - run-standalone
     steps:
       - id: check

.github/workflows/smoke-tests-os-sched.yml

@@ -48,7 +48,7 @@ jobs:
 
   notify:
     name: Notify
-    if: github.ref == 'refs/heads/main'
+    if: always() && github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     needs:
       - smoke-tests-os