[8.17] (backport #16788) ci: use manual caching with actions/cache (#16789)

* ci: use manual caching with actions/cache (#16788)

* ci: use manual caching with actions/cache

use os agnostic cache key
only cache pkg mod cache

* ci: enable enableCrossOsArchive

by default cache won't be shared across os

enable it so we can reuse the go module cache

(cherry picked from commit bac9fec)

# Conflicts:
#	.github/workflows/ci.yml

* Update ci.yml

* Update ci.yml

* feat: bump elastic-agent-client lib to fix race condition

---------

Co-authored-by: kruskall <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

Author: mergify[bot]

.github/workflows/ci.yml

@@ -31,10 +31,14 @@ jobs:
       - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
         with:
           go-version-file: go.mod
-          cache: true
-          cache-dependency-path: |
-            go.sum
-            tools/go.sum
+          cache: false
+      - uses: actions/[email protected]
+        with:
+          path: |
+            ~/go/pkg/mod/cache
+          key: go-${{ hashFiles('go.mod') }}
+          restore-keys: |
+            go-
       - run: make check-full
       - name: Ensure .go-version is up to date
         run: make update-go-version
@@ -50,10 +54,16 @@ jobs:
       - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
         with:
           go-version-file: go.mod
-          cache: true
-      - env:
-          CGO_ENABLED: "0"
-        run: go test -v ./...
+          cache: false
+      - uses: actions/[email protected]
+        with:
+          enableCrossOsArchive: true
+          path: |
+            ~/go/pkg/mod/cache
+          key: go-${{ hashFiles('go.mod') }}
+          restore-keys: |
+            go-
+      - run: go test -v -race ./...
 
   system-test:
     runs-on: ubuntu-latest
@@ -62,22 +72,19 @@ jobs:
       - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
         with:
           go-version-file: systemtest/go.mod
-          cache: true
+          cache: false
       - run: docker compose up -d
+      - uses: actions/[email protected]
+        with:
+          path: |
+            ~/go/pkg/mod/cache
+          key: systemtest-go-${{ hashFiles('systemtest/go.mod', 'go.mod') }}
+          restore-keys: |
+            systemtest-go-
       - env:
-          GOTESTFLAGS: "-v -json"
-          OUTPUT_JSON_FILE: "build/TEST-go-system_tests.out.json"
-          OUTPUT_JUNIT_FILE: "build/TEST-go-system_tests.xml"
+          GOTESTFLAGS: "-v"
           GH_TOKEN: ${{ github.token }}
-        run: |
-          go run -modfile=tools/go.mod gotest.tools/gotestsum \
-          --no-color -f standard-quiet --jsonfile "$OUTPUT_JSON_FILE" --junitfile "$OUTPUT_JUNIT_FILE" \
-          --raw-command -- make system-test
-      - uses: actions/upload-artifact@v4  # upload test results
-        if: ${{ always() }} # run this step even if previous step failed
-        with:
-          name: test-results
-          path: 'build/*.xml'
+        run: make system-test
 
   test-package:
     runs-on: ubuntu-latest

NOTICE.txt

@@ -596,11 +596,11 @@ License Version 2.0.
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/elastic-agent-client/v7
-Version: v7.16.0
+Version: v7.17.2
 Licence type (autodetected): Elastic
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-client/v7@v7.16.0/LICENSE.txt:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-client/v7@v7.17.2/LICENSE.txt:
 
 ELASTIC LICENSE AGREEMENT
 

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/elastic/apm-aggregation v1.1.0
 	github.com/elastic/apm-data v1.14.1
 	github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250502181748-53ce29a905b4
-	github.com/elastic/elastic-agent-client/v7 v7.16.0
+	github.com/elastic/elastic-agent-client/v7 v7.17.2
 	github.com/elastic/elastic-agent-libs v0.18.9
 	github.com/elastic/elastic-agent-system-metrics v0.11.11
 	github.com/elastic/gmux v0.3.2

go.sum

@@ -136,8 +136,8 @@ github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250502181748-53ce29a905b4 h1:lVX0Q
 github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250502181748-53ce29a905b4/go.mod h1:xEACB/kX8UTJ18Gdtdzs069UmGQ+Qeg8zxAG8swT7+Y=
 github.com/elastic/elastic-agent-autodiscover v0.9.0 h1:+iWIKh0u3e8I+CJa3FfWe9h0JojNasPgYIA47gpuuns=
 github.com/elastic/elastic-agent-autodiscover v0.9.0/go.mod h1:5iUxLHhVdaGSWYTveSwfJEY4RqPXTG13LPiFoxcpFd4=
-github.com/elastic/elastic-agent-client/v7 v7.16.0 h1:yKGq2+CxAuW8Kh0EoNl202tqAyQKfBcPRawVKs2Jve0=
-github.com/elastic/elastic-agent-client/v7 v7.16.0/go.mod h1:6h+f9QdIr3GO2ODC0Y8+aEXRwzbA5W4eV4dd/67z7nI=
+github.com/elastic/elastic-agent-client/v7 v7.17.2 h1:Cl2TeABqWZgW40t5fchGWT/sRk4MDDLWA0d8iHHOxLA=
+github.com/elastic/elastic-agent-client/v7 v7.17.2/go.mod h1:5irRFqp6HLqtu1S+OeY0jg8x7K6PLL+DW+PwVk1vJnk=
 github.com/elastic/elastic-agent-libs v0.18.9 h1:NQbBK6uMd/t4S0Fe7iOpT5mE7RXMWVaOLBSEXHRBzWI=
 github.com/elastic/elastic-agent-libs v0.18.9/go.mod h1:Repx7BMzE1v/gTipPogNIQeEnSGwOWGBC63h7h9c5aM=
 github.com/elastic/elastic-agent-system-metrics v0.11.11 h1:Qjh3Zef23PfGlG91AF+9ciNLNQf/8cDJ4CalnLZtV3g=