Merge remote-tracking branch 'origin/main' into fips-ech

Author: michel-laterman

.buildkite/bk.integration.pipeline.yml

@@ -28,6 +28,65 @@ steps:
       image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:0.5"
       useCustomGlobalHooks: true
 
+  - group: "Extended runtime leak tests"
+    key: extended-integration-tests
+    depends_on:
+      - integration-ess
+    steps:
+      - label: "Windows:2022:amd64:sudo"
+        depends_on:
+          - packaging-windows
+        env:
+          TEST_LONG_RUNNING: "true"
+        command: |
+          buildkite-agent artifact download build/distributions/** . --step 'packaging-windows'
+          .buildkite/scripts/integration-tests.ps1 fleet true TestLongRunningAgentForLeaks
+        artifact_paths:
+          - build/**
+          - build/diagnostics/**
+        agents:
+          provider: "gcp"
+          machineType: "n1-standard-8"
+          image: "${IMAGE_WIN_2022}"
+        retry:
+          automatic:
+            limit: 1
+      - label: "Windows:2025:amd64:sudo"
+        depends_on:
+          - packaging-windows
+        env:
+          TEST_LONG_RUNNING: "true"
+        command: |
+          buildkite-agent artifact download build/distributions/** . --step 'packaging-windows'
+          .buildkite/scripts/integration-tests.ps1 fleet true TestLongRunningAgentForLeaks
+        artifact_paths:
+          - build/**
+          - build/diagnostics/**
+        retry:
+          automatic:
+            limit: 1
+        agents:
+          provider: "gcp"
+          machineType: "n1-standard-8"
+          image: "${IMAGE_WIN_2025}"
+      - label: "Ubuntu:2404:amd64:sudo"
+        depends_on: packaging-ubuntu-x86-64
+        env:
+          TEST_LONG_RUNNING: "true"
+        command: |
+          buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-x86-64'
+          .buildkite/scripts/steps/integration_tests_tf.sh fleet true TestLongRunningAgentForLeaks
+        artifact_paths:
+          - build/**
+          - build/diagnostics/**
+        retry:
+          automatic:
+            limit: 1
+        agents:
+          provider: "gcp"
+          machineType: "n1-standard-8"
+          image: "${IMAGE_UBUNTU_2404_X86_64}"
+
   - group: "Stateful: Windows"
     key: integration-tests-win
     depends_on:
@@ -362,6 +421,7 @@ steps:
       - integration-tests-win
       - integration-tests-rhel8
       - integration-tests-kubernetes
+      - extended-integration-tests
     allow_dependency_failure: true
     command: |
       buildkite-agent artifact download "test_infra/ess/**" . --step "integration-ess"

.buildkite/integration.pipeline.yml

@@ -173,30 +173,6 @@ steps:
       - github_commit_status:
           context: "buildkite/elastic-agent-extended-testing - Serverless integration test"
 
-  - label: "Extended runtime leak tests"
-    key: "extended-integration-tests"
-    depends_on:
-      - int-packaging
-    concurrency_group: elastic-agent-extended-testing/leak-tests
-    concurrency: 8
-    env:
-      TEST_INTEG_AUTH_GCP_DATACENTER: "us-central1-b"
-    command: |
-      buildkite-agent artifact download "build/distributions/**" . $BUILDKITE_BUILD_ID
-      .buildkite/scripts/steps/integration_tests.sh stateful integration:TestForResourceLeaks
-    artifact_paths:
-      - "build/TEST-**"
-      - "build/diagnostics/*"
-    agents:
-      provider: "gcp"
-      machineType: "n2-standard-8"
-    retry:
-      automatic:
-        limit: 1
-    notify:
-      - github_commit_status:
-          context: "buildkite/elastic-agent-extended-testing - Extended runtime leak tests"
-
   - label: "Triggering Integration tests"
     depends_on:
       - int-packaging

.buildkite/scripts/buildkite-integration-tests.sh

@@ -3,6 +3,7 @@
 
 GROUP_NAME=$1
 TEST_SUDO=$2
+TEST_NAME_PATTERN=${3:-""}
 
 if [ -z "$GROUP_NAME" ]; then
   echo "Error: Specify the group name: sudo-integration-tests.sh [group_name]" >&2
@@ -51,19 +52,15 @@ outputXML="build/${fully_qualified_group_name}.integration.xml"
 outputJSON="build/${fully_qualified_group_name}.integration.out.json"
 
 echo "~~~ Integration tests: ${GROUP_NAME}"
+GOTEST_ARGS=(-tags integration -test.shuffle on -test.timeout 2h0m0s)
+if [ -n "$TEST_NAME_PATTERN" ]; then
+  GOTEST_ARGS+=(-run="${TEST_NAME_PATTERN}")
+fi
+GOTEST_ARGS+=("github.com/elastic/elastic-agent/testing/integration" -v -args "-integration.groups=${GROUP_NAME}" "-integration.sudo=${TEST_SUDO}" "-integration.fips=${FIPS:-false}")
 
 set +e
 TEST_BINARY_NAME="elastic-agent" AGENT_VERSION="${AGENT_VERSION}" SNAPSHOT=true \
-  gotestsum --no-color -f standard-quiet \
-  --junitfile-hide-skipped-tests \
-  --junitfile "${outputXML}" \
-  --jsonfile "${outputJSON}" \
-  -- \
-    -tags integration -test.shuffle on -test.timeout 2h0m0s \
-    github.com/elastic/elastic-agent/testing/integration \
-    -v \
-    -args -integration.groups="${GROUP_NAME}" -integration.sudo="${TEST_SUDO}" -integration.fips="${FIPS:-false}"
-
+  gotestsum --no-color -f standard-quiet --junitfile-hide-skipped-tests --junitfile "${outputXML}" --jsonfile "${outputJSON}" -- "${GOTEST_ARGS[@]}"
 TESTS_EXIT_STATUS=$?
 set -e
 

.buildkite/scripts/integration-tests.ps1

@@ -1,6 +1,7 @@
 param (
     [string]$GROUP_NAME,
-    [string]$TEST_SUDO
+    [string]$TEST_SUDO,
+    [string]$TEST_NAME_PATTERN = ""
 )
 
 echo "~~~ Preparing environment"
@@ -45,7 +46,12 @@ $TestsExitCode = 0
 try {
     Get-Ess-Stack -StackVersion $PACKAGE_VERSION
     Write-Output "~~~ Running integration test group: $GROUP_NAME as user: $env:USERNAME"
-    & gotestsum --no-color -f standard-quiet --junitfile-hide-skipped-tests --junitfile "${outputXML}" --jsonfile "${outputJSON}" -- -tags=integration -shuffle=on -timeout=2h0m0s "github.com/elastic/elastic-agent/testing/integration" -v -args "-integration.groups=$GROUP_NAME" "-integration.sudo=$TEST_SUDO"
+    $gotestArgs = @("-tags=integration", "-shuffle=on", "-timeout=2h0m0s")
+    if ($TEST_NAME_PATTERN -ne "") {
+        $gotestArgs += "-run=${TEST_NAME_PATTERN}"
+    }
+    $gotestArgs += @("github.com/elastic/elastic-agent/testing/integration", "-v", "-args", "-integration.groups=$GROUP_NAME", "-integration.sudo=$TEST_SUDO")
+    & gotestsum --no-color -f standard-quiet --junitfile-hide-skipped-tests --junitfile "${outputXML}" --jsonfile "${outputJSON}" -- @gotestArgs
     $TestsExitCode = $LASTEXITCODE
 } finally {
     ess_down

.buildkite/scripts/steps/integration_tests_tf.sh

@@ -11,6 +11,9 @@ asdf install
 
 GROUP_NAME=$1
 TEST_SUDO=$2
+# NOTE: This argument is not used in this script, but is declared to show that it can be set
+# and passed down to downstream scripts where it may be used.
+TEST_NAME_PATTERN=${3:-""}
 if [ -z "$GROUP_NAME" ]; then
   echo "Error: Specify the group name: integration_tests_tf.sh [group_name]" >&2
   exit 1

.ci/scripts/otel-update.sh

@@ -35,8 +35,6 @@ sed -i.bak "s/\(go\.opentelemetry\.io\/collector.*\) $current_stable_core/\1 $ne
 sed -i.bak "s/\(github\.com\/open-telemetry\/opentelemetry\-collector\-contrib\/.*\) $current_contrib/\1 $next_contrib/" go.mod
 rm go.mod.bak
 
-echo "=> Running go mod tidy"
-go mod tidy
 echo "=> Running mage notice"
 mage notice
 echo "=> Running mage otel:readme"

README.md

@@ -258,6 +258,12 @@ rules implemented on our `Makefile` as well as CI will use the
 locally before submitting any PRs to have a quicker feedback instead
 of waiting for a CI failure.
 
+### Keeping Go module files tidy
+The Elastic Agent repository includes additional Go modules (e.g. `wrapper/windows/archive-proxy`) that import the main `elastic-agent` module. This requires keeping all `go.mod` files in sync whenever dependencies change. There is a dedicated `mage tidy` target that recursively runs `go mod tidy` across the entire repo. This is now handled automatically in the following targets:
+- `mage check`
+- `mage notice`
+- `mage update`
+
 ### Generating the `NOTICE.txt` and `NOTICE-fips.txt` when updating/adding dependencies
 To do so, just run `mage notice`, this is also part of the `make
 check-ci` and is the same check our CI will do.

dev-tools/mage/target/common/check.go

@@ -23,6 +23,7 @@ func Check() {
 	deps := make([]interface{}, 0, len(checkDeps)+2)
 	deps = append(deps, devtools.Format)
 	deps = append(deps, checkDeps...)
+	deps = append(deps, Tidy)
 	deps = append(deps, devtools.Check)
 	mg.SerialDeps(deps...)
 }

dev-tools/mage/target/common/notice.go

@@ -44,10 +44,13 @@ func Notice() (err error) {
 // generateNotice generates a generateNotice file with the name outputFilename.
 // see getDependentModules for use of additionalTags.
 func generateNotice(outputFilename string, additionalTags ...string) error {
-	fmt.Printf("Generating %s...\n", outputFilename)
-	if err := runCommand("go", "mod", "tidy"); err != nil {
+	// NOTE: this is not invoked through mg.Deps because
+	// we want to always invoke it and guarantee that it runs
+	// as mg.Deps does memoization
+	if err := Tidy(); err != nil {
 		return err
 	}
+	fmt.Printf("Generating %s...\n", outputFilename)
 	if err := runCommand("go", "mod", "download"); err != nil {
 		return err
 	}

dev-tools/mage/target/common/tidy.go

@@ -0,0 +1,42 @@
+// Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+// or more contributor license agreements. Licensed under the Elastic License 2.0;
+// you may not use this file except in compliance with the Elastic License 2.0.
+
+package common
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+
+	"github.com/magefile/mage/mg"
+
+	devtools "github.com/elastic/elastic-agent/dev-tools/mage"
+)
+
+// Tidy runs go mod tidy on all go.mod recursively inside the elastic-agent repository.
+func Tidy() error {
+	goModFiles, err := devtools.FindFilesRecursive(func(path string, _ os.FileInfo) bool {
+		return filepath.Base(path) == "go.mod"
+	})
+	if err != nil {
+		return err
+	}
+	for _, file := range goModFiles {
+		dir, err := filepath.Abs(filepath.Dir(file))
+		if err != nil {
+			return fmt.Errorf("tidy: error getting absolute dir: %w", err)
+		}
+		fmt.Printf(">> tidy: Running go mod tidy inside %s\n", dir)
+		cmd := exec.Command(mg.GoCmd(), "mod", "tidy", "-v") // #nosec G204 -- Need to pass in name of package
+		cmd.Dir = dir
+		cmd.Stdout = os.Stdout
+		cmd.Stderr = os.Stderr
+		err = cmd.Run()
+		if err != nil {
+			return fmt.Errorf("tidy: error running go mod tidy: %w", err)
+		}
+	}
+	return nil
+}