From e1c6e14c478bd9eca340e8581452e86ba70c34a6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Mar 2025 02:10:00 +0000
Subject: [PATCH 1/3] build(deps): bump golang.org/x/net from 0.35.0 to 0.36.0
in /testing
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.35.0 to 0.36.0.
- [Commits](https://github.com/golang/net/compare/v0.35.0...v0.36.0)
---
updated-dependencies:
- dependency-name: golang.org/x/net
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
---
testing/go.mod | 4 ++--
testing/go.sum | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/testing/go.mod b/testing/go.mod
index 994a4ca02..0b8b9a0c3 100644
--- a/testing/go.mod
+++ b/testing/go.mod
@@ -66,9 +66,9 @@ require (
go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/metric v1.28.0 // indirect
go.opentelemetry.io/otel/trace v1.28.0 // indirect
- golang.org/x/crypto v0.33.0 // indirect
+ golang.org/x/crypto v0.35.0 // indirect
golang.org/x/mod v0.23.0 // indirect
- golang.org/x/net v0.35.0 // indirect
+ golang.org/x/net v0.36.0 // indirect
golang.org/x/sync v0.11.0 // indirect
golang.org/x/sys v0.30.0 // indirect
golang.org/x/text v0.22.0 // indirect
diff --git a/testing/go.sum b/testing/go.sum
index 4976de43d..eaccb6aaa 100644
--- a/testing/go.sum
+++ b/testing/go.sum
@@ -184,8 +184,8 @@ go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
-golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
+golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
+golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
@@ -194,8 +194,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
-golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
+golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=
+golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
From 9597de3197419e1af083968d017d8ec2ee2f397a Mon Sep 17 00:00:00 2001
From: michel-laterman <michel.laterman@elastic.co>
Date: Thu, 13 Mar 2025 11:13:25 -0700
Subject: [PATCH 2/3] Update x/net in root go.mod
---
NOTICE.txt | 8 ++++----
go.mod | 4 ++--
go.sum | 8 ++++----
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/NOTICE.txt b/NOTICE.txt
index 98e5d9c25..ccdd21674 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -20077,11 +20077,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------
Dependency : golang.org/x/crypto
-Version: v0.33.0
+Version: v0.35.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------
-Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.33.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.35.0/LICENSE:
Copyright 2009 The Go Authors.
@@ -20151,11 +20151,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------
Dependency : golang.org/x/net
-Version: v0.35.0
+Version: v0.36.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------
-Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.35.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.36.0/LICENSE:
Copyright 2009 The Go Authors.
diff --git a/go.mod b/go.mod
index 4fc3ca206..4472460ed 100644
--- a/go.mod
+++ b/go.mod
@@ -89,9 +89,9 @@ require (
go.opentelemetry.io/otel/metric v1.28.0 // indirect
go.opentelemetry.io/otel/trace v1.28.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
- golang.org/x/crypto v0.33.0 // indirect
+ golang.org/x/crypto v0.35.0 // indirect
golang.org/x/mod v0.23.0 // indirect
- golang.org/x/net v0.35.0 // indirect
+ golang.org/x/net v0.36.0 // indirect
golang.org/x/sys v0.30.0 // indirect
golang.org/x/text v0.22.0 // indirect
golang.org/x/tools v0.30.0 // indirect
diff --git a/go.sum b/go.sum
index a9a686dc0..9c9f70b7f 100644
--- a/go.sum
+++ b/go.sum
@@ -216,8 +216,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
-golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
-golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
+golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
+golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
@@ -228,8 +228,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
-golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
-golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
+golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=
+golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
From 494f021f21ae8b1389ec1ee22cf4974edd0cc2b4 Mon Sep 17 00:00:00 2001
From: Andrzej Stencel <andrzej.stencel@elastic.co>
Date: Mon, 24 Mar 2025 11:07:30 +0100
Subject: [PATCH 3/3] merge main (#4623)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* [updatecli] update elastic stack version for testing 9.1.0-80bdca58-SNAPSHOT (#4569)
* chore: Update snapshot.yml
Made with ❤️️ by updatecli
* chore: Update snapshot.yml
Made with ❤️️ by updatecli
* chore: Update snapshot.yml
Made with ❤️️ by updatecli
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* build(deps): bump github.com/elastic/elastic-agent-libs from 0.18.8 to 0.18.10 (#4565)
* build(deps): bump github.com/elastic/elastic-agent-libs
Bumps [github.com/elastic/elastic-agent-libs](https://github.com/elastic/elastic-agent-libs) from 0.18.8 to 0.18.10.
- [Release notes](https://github.com/elastic/elastic-agent-libs/releases)
- [Commits](https://github.com/elastic/elastic-agent-libs/compare/v0.18.8...v0.18.10)
---
updated-dependencies:
- dependency-name: github.com/elastic/elastic-agent-libs
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
* Post dependabot file modifications
---------
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
* chore: Update snapshot.yml (#4588)
Made with ❤️️ by updatecli
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* build(deps): bump github.com/elastic/elastic-agent-libs from 0.18.10 to 0.18.11 (#4591)
* build(deps): bump github.com/elastic/elastic-agent-libs
Bumps [github.com/elastic/elastic-agent-libs](https://github.com/elastic/elastic-agent-libs) from 0.18.10 to 0.18.11.
- [Release notes](https://github.com/elastic/elastic-agent-libs/releases)
- [Commits](https://github.com/elastic/elastic-agent-libs/compare/v0.18.10...v0.18.11)
---
updated-dependencies:
- dependency-name: github.com/elastic/elastic-agent-libs
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
* Post dependabot file modifications
---------
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
* chore: Update snapshot.yml (#4596)
Made with ❤️️ by updatecli
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* build(deps): bump the elastic-apm group with 6 updates (#4590)
* build(deps): bump the elastic-apm group with 6 updates
Bumps the elastic-apm group with 6 updates:
| Package | From | To |
| --- | --- | --- |
| [go.elastic.co/apm/module/apmchiv5/v2](https://github.com/elastic/apm-agent-go) | `2.6.3` | `2.7.0` |
| [go.elastic.co/apm/module/apmelasticsearch/v2](https://github.com/elastic/apm-agent-go) | `2.6.3` | `2.7.0` |
| [go.elastic.co/apm/module/apmhttp/v2](https://github.com/elastic/apm-agent-go) | `2.6.3` | `2.7.0` |
| [go.elastic.co/apm/module/apmprometheus/v2](https://github.com/elastic/apm-agent-go) | `2.6.3` | `2.7.0` |
| [go.elastic.co/apm/module/apmzerolog/v2](https://github.com/elastic/apm-agent-go) | `2.6.3` | `2.7.0` |
| [go.elastic.co/apm/v2](https://github.com/elastic/apm-agent-go) | `2.6.3` | `2.7.0` |
Updates `go.elastic.co/apm/module/apmchiv5/v2` from 2.6.3 to 2.7.0
- [Release notes](https://github.com/elastic/apm-agent-go/releases)
- [Changelog](https://github.com/elastic/apm-agent-go/blob/v2.7.0/CHANGELOG.asciidoc)
- [Commits](https://github.com/elastic/apm-agent-go/compare/v2.6.3...v2.7.0)
Updates `go.elastic.co/apm/module/apmelasticsearch/v2` from 2.6.3 to 2.7.0
- [Release notes](https://github.com/elastic/apm-agent-go/releases)
- [Changelog](https://github.com/elastic/apm-agent-go/blob/v2.7.0/CHANGELOG.asciidoc)
- [Commits](https://github.com/elastic/apm-agent-go/compare/v2.6.3...v2.7.0)
Updates `go.elastic.co/apm/module/apmhttp/v2` from 2.6.3 to 2.7.0
- [Release notes](https://github.com/elastic/apm-agent-go/releases)
- [Changelog](https://github.com/elastic/apm-agent-go/blob/v2.7.0/CHANGELOG.asciidoc)
- [Commits](https://github.com/elastic/apm-agent-go/compare/v2.6.3...v2.7.0)
Updates `go.elastic.co/apm/module/apmprometheus/v2` from 2.6.3 to 2.7.0
- [Release notes](https://github.com/elastic/apm-agent-go/releases)
- [Changelog](https://github.com/elastic/apm-agent-go/blob/v2.7.0/CHANGELOG.asciidoc)
- [Commits](https://github.com/elastic/apm-agent-go/compare/v2.6.3...v2.7.0)
Updates `go.elastic.co/apm/module/apmzerolog/v2` from 2.6.3 to 2.7.0
- [Release notes](https://github.com/elastic/apm-agent-go/releases)
- [Changelog](https://github.com/elastic/apm-agent-go/blob/v2.7.0/CHANGELOG.asciidoc)
- [Commits](https://github.com/elastic/apm-agent-go/compare/v2.6.3...v2.7.0)
Updates `go.elastic.co/apm/v2` from 2.6.3 to 2.7.0
- [Release notes](https://github.com/elastic/apm-agent-go/releases)
- [Changelog](https://github.com/elastic/apm-agent-go/blob/v2.7.0/CHANGELOG.asciidoc)
- [Commits](https://github.com/elastic/apm-agent-go/compare/v2.6.3...v2.7.0)
---
updated-dependencies:
- dependency-name: go.elastic.co/apm/module/apmchiv5/v2
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: elastic-apm
- dependency-name: go.elastic.co/apm/module/apmelasticsearch/v2
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: elastic-apm
- dependency-name: go.elastic.co/apm/module/apmhttp/v2
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: elastic-apm
- dependency-name: go.elastic.co/apm/module/apmprometheus/v2
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: elastic-apm
- dependency-name: go.elastic.co/apm/module/apmzerolog/v2
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: elastic-apm
- dependency-name: go.elastic.co/apm/v2
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: elastic-apm
...
Signed-off-by: dependabot[bot] <support@github.com>
* Post dependabot file modifications
---------
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
* Remove WithUsrPwd (#4600)
* build(deps): bump github.com/containerd/containerd in /testing (#4599)
Bumps [github.com/containerd/containerd](https://github.com/containerd/containerd) from 1.7.15 to 1.7.27.
- [Release notes](https://github.com/containerd/containerd/releases)
- [Changelog](https://github.com/containerd/containerd/blob/main/RELEASES.md)
- [Commits](https://github.com/containerd/containerd/compare/v1.7.15...v1.7.27)
---
updated-dependencies:
- dependency-name: github.com/containerd/containerd
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Add go1.24 GODEBUG=fips140=only test (#4581)
Add a new target that uses GODEBUG=fips140=only to run unit tests.
This target should use the FIPS=true flag in order to pass -tags=requirefips.
* [Automation] Bump Golang version to 1.24.1 (#4611)
* chore: Update .go-version
Made with ❤️️ by updatecli
* chore: Update .golangci.yml
Made with ❤️️ by updatecli
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* Update golangci-lint.yml (#4615)
Pinning action to a full length commit SHA [see](https://docs.github.com/en/actions/security-for-github-actions/security-guides/security-hardening-for-github-actions#using-third-party-actions)
* build(deps): bump github.com/elastic/elastic-agent-system-metrics from 0.11.9 to 0.11.10 (#4621)
* build(deps): bump github.com/elastic/elastic-agent-system-metrics
Bumps [github.com/elastic/elastic-agent-system-metrics](https://github.com/elastic/elastic-agent-system-metrics) from 0.11.9 to 0.11.10.
- [Release notes](https://github.com/elastic/elastic-agent-system-metrics/releases)
- [Commits](https://github.com/elastic/elastic-agent-system-metrics/compare/v0.11.9...v0.11.10)
---
updated-dependencies:
- dependency-name: github.com/elastic/elastic-agent-system-metrics
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
* Post dependabot file modifications
---------
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
---------
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
Co-authored-by: Blake Rouse <blake.rouse@elastic.co>
Co-authored-by: Michel Laterman <82832767+michel-laterman@users.noreply.github.com>
Co-authored-by: Paul McCann <paul.mccann@elastic.co>
---
.buildkite/pipeline.yml | 11 +++++++
.buildkite/scripts/unit_test.sh | 6 +++-
.github/workflows/golangci-lint.yml | 2 +-
.go-version | 2 +-
.golangci.yml | 2 +-
Makefile | 9 +++++-
NOTICE.txt | 32 +++++++++---------
dev-tools/integration/.env | 2 +-
go.mod | 16 ++++-----
go.sum | 32 +++++++++---------
internal/pkg/bulk/setup_test.go | 7 +++-
internal/pkg/es/client.go | 9 ------
testing/go.mod | 19 ++++++-----
testing/go.sum | 50 ++++++++++++++---------------
14 files changed, 107 insertions(+), 92 deletions(-)
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 22b0ca38f..d5598128c 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -87,6 +87,17 @@ steps:
- build/*.xml
- build/coverage*.out
+ - label: ":smartbear-testexecute: Run FIPS unit tests"
+ key: unit-test-fips
+ command: ".buildkite/scripts/unit_test.sh"
+ env:
+ FIPS: "true"
+ agents:
+ provider: "gcp"
+ artifact_paths:
+ - build/*.xml
+ - build/coverage*.out
+
- label: ":smartbear-testexecute: Run unit tests: MacOS 13"
key: unit-test-macos-13
command: ".buildkite/scripts/unit_test.sh"
diff --git a/.buildkite/scripts/unit_test.sh b/.buildkite/scripts/unit_test.sh
index 5a2eb87ae..a60877730 100755
--- a/.buildkite/scripts/unit_test.sh
+++ b/.buildkite/scripts/unit_test.sh
@@ -9,4 +9,8 @@ add_bin_path
with_go
echo "Starting the unit tests..."
-make test-unit junit-report
+if [[ ${FIPS:-} == "true" ]]; then
+ make test-unit-fips junit-report
+else
+ make test-unit junit-report
+fi
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index eb43acd6f..bb1543d5f 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -36,7 +36,7 @@ jobs:
- name: golangci-lint
env:
GOOS: ${{ matrix.GOOS }}
- uses: golangci/golangci-lint-action@v6
+ uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 # v6.5.0
with:
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
version: v1.64.5
diff --git a/.go-version b/.go-version
index 53cc1a6f9..f9e8384bb 100644
--- a/.go-version
+++ b/.go-version
@@ -1 +1 @@
-1.24.0
+1.24.1
diff --git a/.golangci.yml b/.golangci.yml
index 9de6d8cbe..0626c4948 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -4,7 +4,7 @@ run:
timeout: 1m
build-tags:
- integration
- go: "1.24.0"
+ go: "1.24.1"
issues:
# Maximum count of issues with the same text.
diff --git a/Makefile b/Makefile
index 58d883ac2..688f6d1fc 100644
--- a/Makefile
+++ b/Makefile
@@ -221,9 +221,16 @@ test: prepare-test-context ## - Run all tests
test-release: ## - Check that all release binaries are created
./.buildkite/scripts/test-release.sh $(DEFAULT_VERSION)
+# If FIPS=true unit tests need microsoft/go + OpenSSL with FIPS
.PHONY: test-unit
test-unit: prepare-test-context ## - Run unit tests only
- set -o pipefail; go test ${GO_TEST_FLAG} -tags=$(GOBUILDTAGS) -v -race -coverprofile=build/coverage-${OS_NAME}.out ./... | tee build/test-unit-${OS_NAME}.out
+ set -o pipefail; ${GOFIPSEXPERIMENT} go test ${GO_TEST_FLAG} -tags=$(GOBUILDTAGS) -v -race -coverprofile=build/coverage-${OS_NAME}.out ./... | tee build/test-unit-${OS_NAME}.out
+
+# FIPS unit tests are meant to use go v1.24 to check FIPS compliance.
+# This check is very strict, and should be thought of as a static-code analysis tool.
+.PHONY: test-unit-fips
+test-unit-fips: prepare-test-context ## - Run unit tests with go 1.24's fips140=only for testing
+ set -o pipefail; GOFIPS140=latest GODEBUG=fips140=only go test ${GO_TEST_FLAG} -tags=$(GOBUILDTAGS) -v -race -coverprofile=build/coverage-${OS_NAME}.out ./... | tee build/test-unit-fips-${OS_NAME}.out
.PHONY: benchmark
benchmark: prepare-test-context install-benchstat ## - Run benchmark tests only
diff --git a/NOTICE.txt b/NOTICE.txt
index ccdd21674..86e138a2e 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -691,11 +691,11 @@ SOFTWARE
--------------------------------------------------------------------------------
Dependency : github.com/elastic/elastic-agent-libs
-Version: v0.18.8
+Version: v0.18.11
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------
-Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.18.8/LICENSE:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.18.11/LICENSE:
Apache License
Version 2.0, January 2004
@@ -902,11 +902,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-l
--------------------------------------------------------------------------------
Dependency : github.com/elastic/elastic-agent-system-metrics
-Version: v0.11.9
+Version: v0.11.10
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------
-Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.11.9/LICENSE.txt:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.11.10/LICENSE.txt:
Apache License
Version 2.0, January 2004
@@ -3558,11 +3558,11 @@ SOFTWARE.
--------------------------------------------------------------------------------
Dependency : go.elastic.co/apm/module/apmchiv5/v2
-Version: v2.6.3
+Version: v2.7.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------
-Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmchiv5/v2@v2.6.3/LICENSE:
+Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmchiv5/v2@v2.7.0/LICENSE:
Apache License
Version 2.0, January 2004
@@ -3769,11 +3769,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmchiv5/
--------------------------------------------------------------------------------
Dependency : go.elastic.co/apm/module/apmelasticsearch/v2
-Version: v2.6.3
+Version: v2.7.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------
-Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasticsearch/v2@v2.6.3/LICENSE:
+Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasticsearch/v2@v2.7.0/LICENSE:
Apache License
Version 2.0, January 2004
@@ -3980,11 +3980,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasti
--------------------------------------------------------------------------------
Dependency : go.elastic.co/apm/module/apmhttp/v2
-Version: v2.6.3
+Version: v2.7.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------
-Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v2@v2.6.3/LICENSE:
+Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v2@v2.7.0/LICENSE:
Apache License
Version 2.0, January 2004
@@ -4191,11 +4191,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v
--------------------------------------------------------------------------------
Dependency : go.elastic.co/apm/module/apmprometheus/v2
-Version: v2.6.3
+Version: v2.7.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------
-Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmprometheus/v2@v2.6.3/LICENSE:
+Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmprometheus/v2@v2.7.0/LICENSE:
Apache License
Version 2.0, January 2004
@@ -4402,11 +4402,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmpromet
--------------------------------------------------------------------------------
Dependency : go.elastic.co/apm/module/apmzerolog/v2
-Version: v2.6.3
+Version: v2.7.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------
-Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmzerolog/v2@v2.6.3/LICENSE:
+Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmzerolog/v2@v2.7.0/LICENSE:
Apache License
Version 2.0, January 2004
@@ -4613,11 +4613,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmzerolo
--------------------------------------------------------------------------------
Dependency : go.elastic.co/apm/v2
-Version: v2.6.3
+Version: v2.7.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------
-Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/v2@v2.6.3/LICENSE:
+Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/v2@v2.7.0/LICENSE:
Apache License
Version 2.0, January 2004
diff --git a/dev-tools/integration/.env b/dev-tools/integration/.env
index 56876efc2..2d26001a4 100644
--- a/dev-tools/integration/.env
+++ b/dev-tools/integration/.env
@@ -1,6 +1,6 @@
# If you use change this version without a pinned one, please update
# .ci/bump-elastic-stack-snapshot.yml or .github/workflows/bump-golang.yml
-ELASTICSEARCH_VERSION=9.1.0-7fa66b89-SNAPSHOT
+ELASTICSEARCH_VERSION=9.1.0-4ca00eaf-SNAPSHOT
ELASTICSEARCH_USERNAME=elastic
ELASTICSEARCH_PASSWORD=changeme
TEST_ELASTICSEARCH_HOSTS=localhost:9200
diff --git a/go.mod b/go.mod
index 4472460ed..9c97b026a 100644
--- a/go.mod
+++ b/go.mod
@@ -8,8 +8,8 @@ require (
github.com/dgraph-io/ristretto v0.2.0
github.com/docker/go-units v0.5.0
github.com/elastic/elastic-agent-client/v7 v7.17.1
- github.com/elastic/elastic-agent-libs v0.18.8
- github.com/elastic/elastic-agent-system-metrics v0.11.9
+ github.com/elastic/elastic-agent-libs v0.18.11
+ github.com/elastic/elastic-agent-system-metrics v0.11.10
github.com/elastic/go-elasticsearch/v8 v8.17.1
github.com/elastic/go-ucfg v0.8.8
github.com/fxamacker/cbor/v2 v2.6.0
@@ -28,12 +28,12 @@ require (
github.com/rs/zerolog v1.32.0
github.com/spf13/cobra v1.8.0
github.com/stretchr/testify v1.10.0
- go.elastic.co/apm/module/apmchiv5/v2 v2.6.3
- go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.3
- go.elastic.co/apm/module/apmhttp/v2 v2.6.3
- go.elastic.co/apm/module/apmprometheus/v2 v2.6.3
- go.elastic.co/apm/module/apmzerolog/v2 v2.6.3
- go.elastic.co/apm/v2 v2.6.3
+ go.elastic.co/apm/module/apmchiv5/v2 v2.7.0
+ go.elastic.co/apm/module/apmelasticsearch/v2 v2.7.0
+ go.elastic.co/apm/module/apmhttp/v2 v2.7.0
+ go.elastic.co/apm/module/apmprometheus/v2 v2.7.0
+ go.elastic.co/apm/module/apmzerolog/v2 v2.7.0
+ go.elastic.co/apm/v2 v2.7.0
go.elastic.co/ecszerolog v0.2.0
go.uber.org/zap v1.27.0
golang.org/x/sync v0.11.0
diff --git a/go.sum b/go.sum
index 9c9f70b7f..bdb1a029b 100644
--- a/go.sum
+++ b/go.sum
@@ -35,10 +35,10 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
github.com/elastic/elastic-agent-client/v7 v7.17.1 h1:ORCDXzFs1JyhI5neWbTAPWCwaFi+BtKojSLiCpaAbf0=
github.com/elastic/elastic-agent-client/v7 v7.17.1/go.mod h1:jzDEz8agLzinQEbEgLOuVM3wl6SoMybHnarQBTN1wYM=
-github.com/elastic/elastic-agent-libs v0.18.8 h1:YCokiu33g0A5Glz+iizexgrv86ftItK7ono4RfNRdRw=
-github.com/elastic/elastic-agent-libs v0.18.8/go.mod h1:Repx7BMzE1v/gTipPogNIQeEnSGwOWGBC63h7h9c5aM=
-github.com/elastic/elastic-agent-system-metrics v0.11.9 h1:UDgT4ygXKGRwyNyUDzBKbDW7bYphZNg1GOLtDFqZ4Wg=
-github.com/elastic/elastic-agent-system-metrics v0.11.9/go.mod h1:FgtshyeVEAxNqRoFkdL0MpCW0rHxQGFNEKjIsxfcrag=
+github.com/elastic/elastic-agent-libs v0.18.11 h1:3R/JsYUHSohfJA37d4A2EUxbiv83UVMY4sepoX6/DoI=
+github.com/elastic/elastic-agent-libs v0.18.11/go.mod h1:Repx7BMzE1v/gTipPogNIQeEnSGwOWGBC63h7h9c5aM=
+github.com/elastic/elastic-agent-system-metrics v0.11.10 h1:51u6roLaI0WhX1wbU4hPaervODegOxNFLcLouDAAi8A=
+github.com/elastic/elastic-agent-system-metrics v0.11.10/go.mod h1:BlS6Fm/l/umAa9xKy7GxsSYtCfu/iqg551PULKSeCQM=
github.com/elastic/elastic-transport-go/v8 v8.6.1 h1:h2jQRqH6eLGiBSN4eZbQnJLtL4bC5b4lfVFRjw2R4e4=
github.com/elastic/elastic-transport-go/v8 v8.6.1/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
github.com/elastic/go-elasticsearch/v8 v8.17.1 h1:bOXChDoCMB4TIwwGqKd031U8OXssmWLT3UrAr9EGs3Q=
@@ -178,18 +178,18 @@ github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcY
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
-go.elastic.co/apm/module/apmchiv5/v2 v2.6.3 h1:1BiQVsJLnP/L0L7CfsHN5GgVFXFkdJajIsrKUOqXmcg=
-go.elastic.co/apm/module/apmchiv5/v2 v2.6.3/go.mod h1:C50/8lsoq0l6HNwyCSqiimSTkdyEGRYvrVpr0eDJba8=
-go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.3 h1:5CuemBg1oZnXI6jz+jkLqM95Np1XHasdy0CCelX62Ec=
-go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.3/go.mod h1:MVK2TIrvMGQaL7bnO4dbnJ+jpDNqmkj+BukDRBYTI60=
-go.elastic.co/apm/module/apmhttp/v2 v2.6.3 h1:jwFovJZkccySKCyy2oE9ZKvUry/a4gdQHF/MtZUQVtE=
-go.elastic.co/apm/module/apmhttp/v2 v2.6.3/go.mod h1:w94Gkk6uzI/K+eJYKDLB66tvWC5uK0fSHyWcyX2jPlQ=
-go.elastic.co/apm/module/apmprometheus/v2 v2.6.3 h1:4HMrW/u+HFSe/XxlWMikVlqKu77PL7euGFBZ1wtVR2Y=
-go.elastic.co/apm/module/apmprometheus/v2 v2.6.3/go.mod h1:rKbOroM9YDOeqpR0SvR4Lawy/gUmZTmyWRbGKoGFn3s=
-go.elastic.co/apm/module/apmzerolog/v2 v2.6.3 h1:aCgY9dqrhI71dELPfFTgud53KH6WMslCTU8LaGuV/+I=
-go.elastic.co/apm/module/apmzerolog/v2 v2.6.3/go.mod h1:7XstrBgue34PSqEaGq0Cr5cr17ckivIh9AfQRgSwwps=
-go.elastic.co/apm/v2 v2.6.3 h1:yVKFPLnmHOxpzLMGd3aexcik20ziXmRHqgcn9NZn/VU=
-go.elastic.co/apm/v2 v2.6.3/go.mod h1:33rOXgtHwbgZcDgi6I/GtCSMZQqgxkHC0IQT3gudKvo=
+go.elastic.co/apm/module/apmchiv5/v2 v2.7.0 h1:J9LF/Y8hDm9oz3rTxWctJks550X37CPNMy18eFPTVb4=
+go.elastic.co/apm/module/apmchiv5/v2 v2.7.0/go.mod h1:3YwbwkDFnXg4t4n/1LWzceyIMbKhkOwIaxiATlzkn/0=
+go.elastic.co/apm/module/apmelasticsearch/v2 v2.7.0 h1:KcyCfcS8EZoqO7J5g1zbei1T042r9DgSXrsRb1RbTY4=
+go.elastic.co/apm/module/apmelasticsearch/v2 v2.7.0/go.mod h1:3Od+hOvsXvOJ5y6XTVT8XjkwI+4lP2q3aKQSLXqZLmM=
+go.elastic.co/apm/module/apmhttp/v2 v2.7.0 h1:qSZ5aVT1K+OwFy3JmylgJntgAhVl4GmHPzUsA2JgV4g=
+go.elastic.co/apm/module/apmhttp/v2 v2.7.0/go.mod h1:cdBNYMOe0uXcyS/IqhXfKt8isl1DX1nM3nFJm+beY4w=
+go.elastic.co/apm/module/apmprometheus/v2 v2.7.0 h1:MiFtjLrG7VCzdrAigZfp4azDy9J9UVmKfasKg3C8gqY=
+go.elastic.co/apm/module/apmprometheus/v2 v2.7.0/go.mod h1:1Zj/uyIh7l/23J+lIWQmJtdtAXPuwPFMYv5nYVVU0UE=
+go.elastic.co/apm/module/apmzerolog/v2 v2.7.0 h1:lo0uuL4T1wjnzxe+hwKW/IMTZ8lsl2ip+WxzWaaFxTM=
+go.elastic.co/apm/module/apmzerolog/v2 v2.7.0/go.mod h1:OfwvnS2eQ35Ey1lEFuRTmoZS2unsLit3NW2xs3Q75TQ=
+go.elastic.co/apm/v2 v2.7.0 h1:fbsy3BmTTedIbj7+1Ay9Zpdfuztd8RUk7Dm0JvxRW/M=
+go.elastic.co/apm/v2 v2.7.0/go.mod h1:f1Sr3rVJju5winTjsJtKzofdU32L7+Mw/c23cVcn3Io=
go.elastic.co/ecszap v1.0.3 h1:RQtagS3uSftE8mPZ3msqb6mVI67jgcDuy1PUqiMv8ow=
go.elastic.co/ecszap v1.0.3/go.mod h1:fM1RLWDU25TB/L48RUJgz5Le2AnoCeY/g0zf2op8gDU=
go.elastic.co/ecszerolog v0.2.0 h1:nbX4dQ08jb3+vsvACfmzAqGDoBh8F2HQDUgpqwAVTg0=
diff --git a/internal/pkg/bulk/setup_test.go b/internal/pkg/bulk/setup_test.go
index 1919fdbf7..6791a1e5f 100644
--- a/internal/pkg/bulk/setup_test.go
+++ b/internal/pkg/bulk/setup_test.go
@@ -15,6 +15,7 @@ import (
"time"
"github.com/Pallinder/go-randomdata"
+ "github.com/elastic/go-elasticsearch/v8"
"github.com/elastic/go-ucfg/yaml"
"github.com/rs/xid"
@@ -133,7 +134,11 @@ func SetupBulk(ctx context.Context, t testing.TB, opts ...BulkOpt) Bulk {
// Set up the client with username and password since this test is generic for any index and uses it's own index/mapping
e := getEnvironment()
- cli, err := es.NewClient(ctx, &defaultCfg, false, es.WithUsrPwd(e.Username, e.Password))
+ cli, err := es.NewClient(ctx, &defaultCfg, false, func(config *elasticsearch.Config) {
+ config.ServiceToken = "" // reset service token
+ config.Username = e.Username
+ config.Password = e.Password
+ })
if err != nil {
t.Fatal(err)
}
diff --git a/internal/pkg/es/client.go b/internal/pkg/es/client.go
index 6d5feab2e..d808cb9cc 100644
--- a/internal/pkg/es/client.go
+++ b/internal/pkg/es/client.go
@@ -100,15 +100,6 @@ func WithUserAgent(name string, bi build.Info) ConfigOption {
}
}
-// WithUsrPwd is intended to be used by integration tests ONLY!
-func WithUsrPwd(usr, pwd string) ConfigOption {
- return func(config *elasticsearch.Config) {
- config.ServiceToken = "" // reset service token
- config.Username = usr
- config.Password = pwd
- }
-}
-
func InstrumentRoundTripper() ConfigOption {
return func(config *elasticsearch.Config) {
config.Transport = apmelasticsearch.WrapRoundTripper(
diff --git a/testing/go.mod b/testing/go.mod
index 0b8b9a0c3..f2d3d8ef6 100644
--- a/testing/go.mod
+++ b/testing/go.mod
@@ -22,18 +22,19 @@ require (
require (
dario.cat/mergo v1.0.0 // indirect
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
- github.com/Microsoft/go-winio v0.6.1 // indirect
- github.com/Microsoft/hcsshim v0.11.4 // indirect
+ github.com/Microsoft/go-winio v0.6.2 // indirect
+ github.com/Microsoft/hcsshim v0.11.7 // indirect
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
- github.com/containerd/containerd v1.7.15 // indirect
+ github.com/containerd/containerd v1.7.27 // indirect
github.com/containerd/log v0.1.0 // indirect
+ github.com/containerd/platforms v0.2.1 // indirect
github.com/cpuguy83/dockercfg v0.3.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
- github.com/distribution/reference v0.5.0 // indirect
+ github.com/distribution/reference v0.6.0 // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
- github.com/elastic/elastic-agent-libs v0.18.8 // indirect
+ github.com/elastic/elastic-agent-libs v0.18.11 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
@@ -47,7 +48,8 @@ require (
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/patternmatcher v0.6.0 // indirect
github.com/moby/sys/sequential v0.5.0 // indirect
- github.com/moby/sys/user v0.1.0 // indirect
+ github.com/moby/sys/user v0.3.0 // indirect
+ github.com/moby/sys/userns v0.1.0 // indirect
github.com/moby/term v0.5.0 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/oapi-codegen/runtime v1.1.1 // indirect
@@ -67,14 +69,11 @@ require (
go.opentelemetry.io/otel/metric v1.28.0 // indirect
go.opentelemetry.io/otel/trace v1.28.0 // indirect
golang.org/x/crypto v0.35.0 // indirect
- golang.org/x/mod v0.23.0 // indirect
golang.org/x/net v0.36.0 // indirect
- golang.org/x/sync v0.11.0 // indirect
golang.org/x/sys v0.30.0 // indirect
golang.org/x/text v0.22.0 // indirect
- golang.org/x/tools v0.30.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect
google.golang.org/grpc v1.63.2 // indirect
- google.golang.org/protobuf v1.33.0 // indirect
+ google.golang.org/protobuf v1.35.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
diff --git a/testing/go.sum b/testing/go.sum
index eaccb6aaa..63063ab39 100644
--- a/testing/go.sum
+++ b/testing/go.sum
@@ -4,10 +4,10 @@ github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
-github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
-github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
-github.com/Microsoft/hcsshim v0.11.4 h1:68vKo2VN8DE9AdN4tnkWnmdhqdbpUFM8OF3Airm7fz8=
-github.com/Microsoft/hcsshim v0.11.4/go.mod h1:smjE4dvqPX9Zldna+t5FG3rnoHhaB7QYxPRqGcpAD9w=
+github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
+github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
+github.com/Microsoft/hcsshim v0.11.7 h1:vl/nj3Bar/CvJSYo7gIQPyRWc9f3c6IeSNavBTSZNZQ=
+github.com/Microsoft/hcsshim v0.11.7/go.mod h1:MV8xMfmECjl5HdO7U/3/hFVnkmSBjAjmA09d4bExKcU=
github.com/RaveNoX/go-jsoncommentstrip v1.0.0/go.mod h1:78ihd09MekBnJnxpICcwzCMzGrKSKYe4AqU6PDYYpjk=
github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc=
github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
@@ -18,10 +18,12 @@ github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgI
github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w=
github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
-github.com/containerd/containerd v1.7.15 h1:afEHXdil9iAm03BmhjzKyXnnEBtjaLJefdU7DV0IFes=
-github.com/containerd/containerd v1.7.15/go.mod h1:ISzRRTMF8EXNpJlTzyr2XMhN+j9K302C21/+cr3kUnY=
+github.com/containerd/containerd v1.7.27 h1:yFyEyojddO3MIGVER2xJLWoCIn+Up4GaHFquP7hsFII=
+github.com/containerd/containerd v1.7.27/go.mod h1:xZmPnl75Vc+BLGt4MIfu6bp+fy03gdHAn9bz+FreFR0=
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
+github.com/containerd/platforms v0.2.1 h1:zvwtM3rz2YHPQsF2CHYM8+KtB5dvhISiXh5ZpSBQv6A=
+github.com/containerd/platforms v0.2.1/go.mod h1:XHCb+2/hzowdiut9rkudds9bE5yJ7npe7dG/wG+uFPw=
github.com/cpuguy83/dockercfg v0.3.1 h1:/FpZ+JaygUR/lZP2NlFI2DVfrOEMAIKP5wWEJdoYe9E=
github.com/cpuguy83/dockercfg v0.3.1/go.mod h1:sugsbF4//dDlL/i+S+rtpIWp+5h0BHJHfjj5/jFyUJc=
github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
@@ -29,8 +31,8 @@ github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0=
-github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
+github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
+github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
github.com/docker/docker v26.1.5+incompatible h1:NEAxTwEjxV6VbBMBoGG3zPqbiJosIApZjxlbrG9q3/g=
github.com/docker/docker v26.1.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
@@ -39,8 +41,8 @@ github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4
github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
github.com/elastic/elastic-agent-client/v7 v7.17.1 h1:ORCDXzFs1JyhI5neWbTAPWCwaFi+BtKojSLiCpaAbf0=
github.com/elastic/elastic-agent-client/v7 v7.17.1/go.mod h1:jzDEz8agLzinQEbEgLOuVM3wl6SoMybHnarQBTN1wYM=
-github.com/elastic/elastic-agent-libs v0.18.8 h1:YCokiu33g0A5Glz+iizexgrv86ftItK7ono4RfNRdRw=
-github.com/elastic/elastic-agent-libs v0.18.8/go.mod h1:Repx7BMzE1v/gTipPogNIQeEnSGwOWGBC63h7h9c5aM=
+github.com/elastic/elastic-agent-libs v0.18.11 h1:3R/JsYUHSohfJA37d4A2EUxbiv83UVMY4sepoX6/DoI=
+github.com/elastic/elastic-agent-libs v0.18.11/go.mod h1:Repx7BMzE1v/gTipPogNIQeEnSGwOWGBC63h7h9c5aM=
github.com/elastic/go-sysinfo v1.15.1 h1:zBmTnFEXxIQ3iwcQuk7MzaUotmKRp3OabbbWM8TdzIQ=
github.com/elastic/go-sysinfo v1.15.1/go.mod h1:jPSuTgXG+dhhh0GKIyI2Cso+w5lPJ5PvVqKlL8LV/Hk=
github.com/elastic/go-ucfg v0.8.8 h1:54KIF/2zFKfl0MzsSOCGOsZ3O2bnjFQJ0nDJcLhviyk=
@@ -101,8 +103,10 @@ github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkV
github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc=
github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWKGRYaaV5ZZlo=
-github.com/moby/sys/user v0.1.0 h1:WmZ93f5Ux6het5iituh9x2zAG7NFY9Aqi49jjE1PaQg=
-github.com/moby/sys/user v0.1.0/go.mod h1:fKJhFOnsCN6xZ5gSfbM6zaHGgDJMrqt9/reuj4T7MmU=
+github.com/moby/sys/user v0.3.0 h1:9ni5DlcW5an3SvRSx4MouotOygvzaXbaSrc/wGDFWPo=
+github.com/moby/sys/user v0.3.0/go.mod h1:bG+tYYYJgaMtRKgEmuueC0hJEAZWwtIbZTB+85uoHjs=
+github.com/moby/sys/userns v0.1.0 h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g=
+github.com/moby/sys/userns v0.1.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28=
github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=
github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
@@ -153,10 +157,10 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
-go.elastic.co/apm/module/apmhttp/v2 v2.6.3 h1:jwFovJZkccySKCyy2oE9ZKvUry/a4gdQHF/MtZUQVtE=
-go.elastic.co/apm/module/apmhttp/v2 v2.6.3/go.mod h1:w94Gkk6uzI/K+eJYKDLB66tvWC5uK0fSHyWcyX2jPlQ=
-go.elastic.co/apm/v2 v2.6.3 h1:yVKFPLnmHOxpzLMGd3aexcik20ziXmRHqgcn9NZn/VU=
-go.elastic.co/apm/v2 v2.6.3/go.mod h1:33rOXgtHwbgZcDgi6I/GtCSMZQqgxkHC0IQT3gudKvo=
+go.elastic.co/apm/module/apmhttp/v2 v2.7.0 h1:qSZ5aVT1K+OwFy3JmylgJntgAhVl4GmHPzUsA2JgV4g=
+go.elastic.co/apm/module/apmhttp/v2 v2.7.0/go.mod h1:cdBNYMOe0uXcyS/IqhXfKt8isl1DX1nM3nFJm+beY4w=
+go.elastic.co/apm/v2 v2.7.0 h1:fbsy3BmTTedIbj7+1Ay9Zpdfuztd8RUk7Dm0JvxRW/M=
+go.elastic.co/apm/v2 v2.7.0/go.mod h1:f1Sr3rVJju5winTjsJtKzofdU32L7+Mw/c23cVcn3Io=
go.elastic.co/ecszap v1.0.3 h1:RQtagS3uSftE8mPZ3msqb6mVI67jgcDuy1PUqiMv8ow=
go.elastic.co/ecszap v1.0.3/go.mod h1:fM1RLWDU25TB/L48RUJgz5Le2AnoCeY/g0zf2op8gDU=
go.elastic.co/fastjson v1.5.0 h1:XAQ7wrNObNnDiXC8qQKblkmLwh0vJjX3Z/jEj6/08SI=
@@ -171,8 +175,8 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 h1:IeMey
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0/go.mod h1:oVdCUtjq9MK9BlS7TtucsQwUcXcymNiEDjgDD2jMtZU=
go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q=
go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s=
-go.opentelemetry.io/otel/sdk v1.19.0 h1:6USY6zH+L8uMH8L3t1enZPR3WFEmSTADlqldyHtJi3o=
-go.opentelemetry.io/otel/sdk v1.19.0/go.mod h1:NedEbbS4w3C6zElbLdPJKOpJQOrGUJ+GfzpjUvI0v1A=
+go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8=
+go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E=
go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g=
go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI=
go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I=
@@ -188,8 +192,6 @@ golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
-golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -199,8 +201,6 @@ golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
-golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -226,8 +226,6 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY=
-golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -239,8 +237,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be h1:
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM=
google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
-google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
-google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
+google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=