Skip to content

Commit 494f021

Browse files
andrzej-stencelgithub-actions[bot]dependabot[bot]blakerousemichel-laterman
authored
merge main (#4623)
* [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](elastic/elastic-agent-libs@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](elastic/elastic-agent-libs@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](elastic/apm-agent-go@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](elastic/apm-agent-go@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](elastic/apm-agent-go@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](elastic/apm-agent-go@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](elastic/apm-agent-go@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](elastic/apm-agent-go@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](containerd/containerd@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](elastic/elastic-agent-system-metrics@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>
1 parent 9597de3 commit 494f021

File tree

14 files changed

+107
-92
lines changed

14 files changed

+107
-92
lines changed

‎.buildkite/pipeline.yml

+11
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,17 @@ steps:
8787
- build/*.xml
8888
- build/coverage*.out
8989

90+
- label: ":smartbear-testexecute: Run FIPS unit tests"
91+
key: unit-test-fips
92+
command: ".buildkite/scripts/unit_test.sh"
93+
env:
94+
FIPS: "true"
95+
agents:
96+
provider: "gcp"
97+
artifact_paths:
98+
- build/*.xml
99+
- build/coverage*.out
100+
90101
- label: ":smartbear-testexecute: Run unit tests: MacOS 13"
91102
key: unit-test-macos-13
92103
command: ".buildkite/scripts/unit_test.sh"

‎.buildkite/scripts/unit_test.sh

+5-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,8 @@ add_bin_path
99
with_go
1010

1111
echo "Starting the unit tests..."
12-
make test-unit junit-report
12+
if [[ ${FIPS:-} == "true" ]]; then
13+
make test-unit-fips junit-report
14+
else
15+
make test-unit junit-report
16+
fi

‎.github/workflows/golangci-lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: golangci-lint
3737
env:
3838
GOOS: ${{ matrix.GOOS }}
39-
uses: golangci/golangci-lint-action@v6
39+
uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 # v6.5.0
4040
with:
4141
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
4242
version: v1.64.5

‎.go-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.24.0
1+
1.24.1

‎.golangci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ run:
44
timeout: 1m
55
build-tags:
66
- integration
7-
go: "1.24.0"
7+
go: "1.24.1"
88

99
issues:
1010
# Maximum count of issues with the same text.

‎Makefile

+8-1
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,16 @@ test: prepare-test-context ## - Run all tests
221221
test-release: ## - Check that all release binaries are created
222222
./.buildkite/scripts/test-release.sh $(DEFAULT_VERSION)
223223

224+
# If FIPS=true unit tests need microsoft/go + OpenSSL with FIPS
224225
.PHONY: test-unit
225226
test-unit: prepare-test-context ## - Run unit tests only
226-
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
227+
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
228+
229+
# FIPS unit tests are meant to use go v1.24 to check FIPS compliance.
230+
# This check is very strict, and should be thought of as a static-code analysis tool.
231+
.PHONY: test-unit-fips
232+
test-unit-fips: prepare-test-context ## - Run unit tests with go 1.24's fips140=only for testing
233+
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
227234

228235
.PHONY: benchmark
229236
benchmark: prepare-test-context install-benchstat ## - Run benchmark tests only

‎NOTICE.txt

+16-16
Original file line numberDiff line numberDiff line change
@@ -691,11 +691,11 @@ SOFTWARE
691691

692692
--------------------------------------------------------------------------------
693693
Dependency : github.com/elastic/elastic-agent-libs
694-
Version: v0.18.8
694+
Version: v0.18.11
695695
Licence type (autodetected): Apache-2.0
696696
--------------------------------------------------------------------------------
697697

698-
Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.18.8/LICENSE:
698+
Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.18.11/LICENSE:
699699

700700
Apache License
701701
Version 2.0, January 2004
@@ -902,11 +902,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-l
902902

903903
--------------------------------------------------------------------------------
904904
Dependency : github.com/elastic/elastic-agent-system-metrics
905-
Version: v0.11.9
905+
Version: v0.11.10
906906
Licence type (autodetected): Apache-2.0
907907
--------------------------------------------------------------------------------
908908

909-
Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.11.9/LICENSE.txt:
909+
Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.11.10/LICENSE.txt:
910910

911911
Apache License
912912
Version 2.0, January 2004
@@ -3558,11 +3558,11 @@ SOFTWARE.
35583558

35593559
--------------------------------------------------------------------------------
35603560
Dependency : go.elastic.co/apm/module/apmchiv5/v2
3561-
Version: v2.6.3
3561+
Version: v2.7.0
35623562
Licence type (autodetected): Apache-2.0
35633563
--------------------------------------------------------------------------------
35643564

3565-
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmchiv5/v2@v2.6.3/LICENSE:
3565+
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmchiv5/v2@v2.7.0/LICENSE:
35663566

35673567
Apache License
35683568
Version 2.0, January 2004
@@ -3769,11 +3769,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmchiv5/
37693769

37703770
--------------------------------------------------------------------------------
37713771
Dependency : go.elastic.co/apm/module/apmelasticsearch/v2
3772-
Version: v2.6.3
3772+
Version: v2.7.0
37733773
Licence type (autodetected): Apache-2.0
37743774
--------------------------------------------------------------------------------
37753775

3776-
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasticsearch/v2@v2.6.3/LICENSE:
3776+
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasticsearch/v2@v2.7.0/LICENSE:
37773777

37783778
Apache License
37793779
Version 2.0, January 2004
@@ -3980,11 +3980,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasti
39803980

39813981
--------------------------------------------------------------------------------
39823982
Dependency : go.elastic.co/apm/module/apmhttp/v2
3983-
Version: v2.6.3
3983+
Version: v2.7.0
39843984
Licence type (autodetected): Apache-2.0
39853985
--------------------------------------------------------------------------------
39863986

3987-
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v2@v2.6.3/LICENSE:
3987+
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v2@v2.7.0/LICENSE:
39883988

39893989
Apache License
39903990
Version 2.0, January 2004
@@ -4191,11 +4191,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v
41914191

41924192
--------------------------------------------------------------------------------
41934193
Dependency : go.elastic.co/apm/module/apmprometheus/v2
4194-
Version: v2.6.3
4194+
Version: v2.7.0
41954195
Licence type (autodetected): Apache-2.0
41964196
--------------------------------------------------------------------------------
41974197

4198-
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmprometheus/v2@v2.6.3/LICENSE:
4198+
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmprometheus/v2@v2.7.0/LICENSE:
41994199

42004200
Apache License
42014201
Version 2.0, January 2004
@@ -4402,11 +4402,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmpromet
44024402

44034403
--------------------------------------------------------------------------------
44044404
Dependency : go.elastic.co/apm/module/apmzerolog/v2
4405-
Version: v2.6.3
4405+
Version: v2.7.0
44064406
Licence type (autodetected): Apache-2.0
44074407
--------------------------------------------------------------------------------
44084408

4409-
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmzerolog/v2@v2.6.3/LICENSE:
4409+
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmzerolog/v2@v2.7.0/LICENSE:
44104410

44114411
Apache License
44124412
Version 2.0, January 2004
@@ -4613,11 +4613,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmzerolo
46134613

46144614
--------------------------------------------------------------------------------
46154615
Dependency : go.elastic.co/apm/v2
4616-
Version: v2.6.3
4616+
Version: v2.7.0
46174617
Licence type (autodetected): Apache-2.0
46184618
--------------------------------------------------------------------------------
46194619

4620-
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/v2@v2.6.3/LICENSE:
4620+
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/v2@v2.7.0/LICENSE:
46214621

46224622
Apache License
46234623
Version 2.0, January 2004

‎dev-tools/integration/.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# If you use change this version without a pinned one, please update
22
# .ci/bump-elastic-stack-snapshot.yml or .github/workflows/bump-golang.yml
3-
ELASTICSEARCH_VERSION=9.1.0-7fa66b89-SNAPSHOT
3+
ELASTICSEARCH_VERSION=9.1.0-4ca00eaf-SNAPSHOT
44
ELASTICSEARCH_USERNAME=elastic
55
ELASTICSEARCH_PASSWORD=changeme
66
TEST_ELASTICSEARCH_HOSTS=localhost:9200

‎go.mod

+8-8
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ require (
88
github.com/dgraph-io/ristretto v0.2.0
99
github.com/docker/go-units v0.5.0
1010
github.com/elastic/elastic-agent-client/v7 v7.17.1
11-
github.com/elastic/elastic-agent-libs v0.18.8
12-
github.com/elastic/elastic-agent-system-metrics v0.11.9
11+
github.com/elastic/elastic-agent-libs v0.18.11
12+
github.com/elastic/elastic-agent-system-metrics v0.11.10
1313
github.com/elastic/go-elasticsearch/v8 v8.17.1
1414
github.com/elastic/go-ucfg v0.8.8
1515
github.com/fxamacker/cbor/v2 v2.6.0
@@ -28,12 +28,12 @@ require (
2828
github.com/rs/zerolog v1.32.0
2929
github.com/spf13/cobra v1.8.0
3030
github.com/stretchr/testify v1.10.0
31-
go.elastic.co/apm/module/apmchiv5/v2 v2.6.3
32-
go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.3
33-
go.elastic.co/apm/module/apmhttp/v2 v2.6.3
34-
go.elastic.co/apm/module/apmprometheus/v2 v2.6.3
35-
go.elastic.co/apm/module/apmzerolog/v2 v2.6.3
36-
go.elastic.co/apm/v2 v2.6.3
31+
go.elastic.co/apm/module/apmchiv5/v2 v2.7.0
32+
go.elastic.co/apm/module/apmelasticsearch/v2 v2.7.0
33+
go.elastic.co/apm/module/apmhttp/v2 v2.7.0
34+
go.elastic.co/apm/module/apmprometheus/v2 v2.7.0
35+
go.elastic.co/apm/module/apmzerolog/v2 v2.7.0
36+
go.elastic.co/apm/v2 v2.7.0
3737
go.elastic.co/ecszerolog v0.2.0
3838
go.uber.org/zap v1.27.0
3939
golang.org/x/sync v0.11.0

‎go.sum

+16-16
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp
3535
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
3636
github.com/elastic/elastic-agent-client/v7 v7.17.1 h1:ORCDXzFs1JyhI5neWbTAPWCwaFi+BtKojSLiCpaAbf0=
3737
github.com/elastic/elastic-agent-client/v7 v7.17.1/go.mod h1:jzDEz8agLzinQEbEgLOuVM3wl6SoMybHnarQBTN1wYM=
38-
github.com/elastic/elastic-agent-libs v0.18.8 h1:YCokiu33g0A5Glz+iizexgrv86ftItK7ono4RfNRdRw=
39-
github.com/elastic/elastic-agent-libs v0.18.8/go.mod h1:Repx7BMzE1v/gTipPogNIQeEnSGwOWGBC63h7h9c5aM=
40-
github.com/elastic/elastic-agent-system-metrics v0.11.9 h1:UDgT4ygXKGRwyNyUDzBKbDW7bYphZNg1GOLtDFqZ4Wg=
41-
github.com/elastic/elastic-agent-system-metrics v0.11.9/go.mod h1:FgtshyeVEAxNqRoFkdL0MpCW0rHxQGFNEKjIsxfcrag=
38+
github.com/elastic/elastic-agent-libs v0.18.11 h1:3R/JsYUHSohfJA37d4A2EUxbiv83UVMY4sepoX6/DoI=
39+
github.com/elastic/elastic-agent-libs v0.18.11/go.mod h1:Repx7BMzE1v/gTipPogNIQeEnSGwOWGBC63h7h9c5aM=
40+
github.com/elastic/elastic-agent-system-metrics v0.11.10 h1:51u6roLaI0WhX1wbU4hPaervODegOxNFLcLouDAAi8A=
41+
github.com/elastic/elastic-agent-system-metrics v0.11.10/go.mod h1:BlS6Fm/l/umAa9xKy7GxsSYtCfu/iqg551PULKSeCQM=
4242
github.com/elastic/elastic-transport-go/v8 v8.6.1 h1:h2jQRqH6eLGiBSN4eZbQnJLtL4bC5b4lfVFRjw2R4e4=
4343
github.com/elastic/elastic-transport-go/v8 v8.6.1/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
4444
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
178178
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
179179
github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
180180
github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
181-
go.elastic.co/apm/module/apmchiv5/v2 v2.6.3 h1:1BiQVsJLnP/L0L7CfsHN5GgVFXFkdJajIsrKUOqXmcg=
182-
go.elastic.co/apm/module/apmchiv5/v2 v2.6.3/go.mod h1:C50/8lsoq0l6HNwyCSqiimSTkdyEGRYvrVpr0eDJba8=
183-
go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.3 h1:5CuemBg1oZnXI6jz+jkLqM95Np1XHasdy0CCelX62Ec=
184-
go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.3/go.mod h1:MVK2TIrvMGQaL7bnO4dbnJ+jpDNqmkj+BukDRBYTI60=
185-
go.elastic.co/apm/module/apmhttp/v2 v2.6.3 h1:jwFovJZkccySKCyy2oE9ZKvUry/a4gdQHF/MtZUQVtE=
186-
go.elastic.co/apm/module/apmhttp/v2 v2.6.3/go.mod h1:w94Gkk6uzI/K+eJYKDLB66tvWC5uK0fSHyWcyX2jPlQ=
187-
go.elastic.co/apm/module/apmprometheus/v2 v2.6.3 h1:4HMrW/u+HFSe/XxlWMikVlqKu77PL7euGFBZ1wtVR2Y=
188-
go.elastic.co/apm/module/apmprometheus/v2 v2.6.3/go.mod h1:rKbOroM9YDOeqpR0SvR4Lawy/gUmZTmyWRbGKoGFn3s=
189-
go.elastic.co/apm/module/apmzerolog/v2 v2.6.3 h1:aCgY9dqrhI71dELPfFTgud53KH6WMslCTU8LaGuV/+I=
190-
go.elastic.co/apm/module/apmzerolog/v2 v2.6.3/go.mod h1:7XstrBgue34PSqEaGq0Cr5cr17ckivIh9AfQRgSwwps=
191-
go.elastic.co/apm/v2 v2.6.3 h1:yVKFPLnmHOxpzLMGd3aexcik20ziXmRHqgcn9NZn/VU=
192-
go.elastic.co/apm/v2 v2.6.3/go.mod h1:33rOXgtHwbgZcDgi6I/GtCSMZQqgxkHC0IQT3gudKvo=
181+
go.elastic.co/apm/module/apmchiv5/v2 v2.7.0 h1:J9LF/Y8hDm9oz3rTxWctJks550X37CPNMy18eFPTVb4=
182+
go.elastic.co/apm/module/apmchiv5/v2 v2.7.0/go.mod h1:3YwbwkDFnXg4t4n/1LWzceyIMbKhkOwIaxiATlzkn/0=
183+
go.elastic.co/apm/module/apmelasticsearch/v2 v2.7.0 h1:KcyCfcS8EZoqO7J5g1zbei1T042r9DgSXrsRb1RbTY4=
184+
go.elastic.co/apm/module/apmelasticsearch/v2 v2.7.0/go.mod h1:3Od+hOvsXvOJ5y6XTVT8XjkwI+4lP2q3aKQSLXqZLmM=
185+
go.elastic.co/apm/module/apmhttp/v2 v2.7.0 h1:qSZ5aVT1K+OwFy3JmylgJntgAhVl4GmHPzUsA2JgV4g=
186+
go.elastic.co/apm/module/apmhttp/v2 v2.7.0/go.mod h1:cdBNYMOe0uXcyS/IqhXfKt8isl1DX1nM3nFJm+beY4w=
187+
go.elastic.co/apm/module/apmprometheus/v2 v2.7.0 h1:MiFtjLrG7VCzdrAigZfp4azDy9J9UVmKfasKg3C8gqY=
188+
go.elastic.co/apm/module/apmprometheus/v2 v2.7.0/go.mod h1:1Zj/uyIh7l/23J+lIWQmJtdtAXPuwPFMYv5nYVVU0UE=
189+
go.elastic.co/apm/module/apmzerolog/v2 v2.7.0 h1:lo0uuL4T1wjnzxe+hwKW/IMTZ8lsl2ip+WxzWaaFxTM=
190+
go.elastic.co/apm/module/apmzerolog/v2 v2.7.0/go.mod h1:OfwvnS2eQ35Ey1lEFuRTmoZS2unsLit3NW2xs3Q75TQ=
191+
go.elastic.co/apm/v2 v2.7.0 h1:fbsy3BmTTedIbj7+1Ay9Zpdfuztd8RUk7Dm0JvxRW/M=
192+
go.elastic.co/apm/v2 v2.7.0/go.mod h1:f1Sr3rVJju5winTjsJtKzofdU32L7+Mw/c23cVcn3Io=
193193
go.elastic.co/ecszap v1.0.3 h1:RQtagS3uSftE8mPZ3msqb6mVI67jgcDuy1PUqiMv8ow=
194194
go.elastic.co/ecszap v1.0.3/go.mod h1:fM1RLWDU25TB/L48RUJgz5Le2AnoCeY/g0zf2op8gDU=
195195
go.elastic.co/ecszerolog v0.2.0 h1:nbX4dQ08jb3+vsvACfmzAqGDoBh8F2HQDUgpqwAVTg0=

‎internal/pkg/bulk/setup_test.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"time"
1616

1717
"github.com/Pallinder/go-randomdata"
18+
"github.com/elastic/go-elasticsearch/v8"
1819
"github.com/elastic/go-ucfg/yaml"
1920
"github.com/rs/xid"
2021

@@ -133,7 +134,11 @@ func SetupBulk(ctx context.Context, t testing.TB, opts ...BulkOpt) Bulk {
133134

134135
// Set up the client with username and password since this test is generic for any index and uses it's own index/mapping
135136
e := getEnvironment()
136-
cli, err := es.NewClient(ctx, &defaultCfg, false, es.WithUsrPwd(e.Username, e.Password))
137+
cli, err := es.NewClient(ctx, &defaultCfg, false, func(config *elasticsearch.Config) {
138+
config.ServiceToken = "" // reset service token
139+
config.Username = e.Username
140+
config.Password = e.Password
141+
})
137142
if err != nil {
138143
t.Fatal(err)
139144
}

‎internal/pkg/es/client.go

-9
Original file line numberDiff line numberDiff line change
@@ -100,15 +100,6 @@ func WithUserAgent(name string, bi build.Info) ConfigOption {
100100
}
101101
}
102102

103-
// WithUsrPwd is intended to be used by integration tests ONLY!
104-
func WithUsrPwd(usr, pwd string) ConfigOption {
105-
return func(config *elasticsearch.Config) {
106-
config.ServiceToken = "" // reset service token
107-
config.Username = usr
108-
config.Password = pwd
109-
}
110-
}
111-
112103
func InstrumentRoundTripper() ConfigOption {
113104
return func(config *elasticsearch.Config) {
114105
config.Transport = apmelasticsearch.WrapRoundTripper(

‎testing/go.mod

+9-10
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,19 @@ require (
2222
require (
2323
dario.cat/mergo v1.0.0 // indirect
2424
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
25-
github.com/Microsoft/go-winio v0.6.1 // indirect
26-
github.com/Microsoft/hcsshim v0.11.4 // indirect
25+
github.com/Microsoft/go-winio v0.6.2 // indirect
26+
github.com/Microsoft/hcsshim v0.11.7 // indirect
2727
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
2828
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
29-
github.com/containerd/containerd v1.7.15 // indirect
29+
github.com/containerd/containerd v1.7.27 // indirect
3030
github.com/containerd/log v0.1.0 // indirect
31+
github.com/containerd/platforms v0.2.1 // indirect
3132
github.com/cpuguy83/dockercfg v0.3.1 // indirect
3233
github.com/davecgh/go-spew v1.1.1 // indirect
33-
github.com/distribution/reference v0.5.0 // indirect
34+
github.com/distribution/reference v0.6.0 // indirect
3435
github.com/docker/go-connections v0.5.0 // indirect
3536
github.com/docker/go-units v0.5.0 // indirect
36-
github.com/elastic/elastic-agent-libs v0.18.8 // indirect
37+
github.com/elastic/elastic-agent-libs v0.18.11 // indirect
3738
github.com/felixge/httpsnoop v1.0.4 // indirect
3839
github.com/go-logr/logr v1.4.2 // indirect
3940
github.com/go-logr/stdr v1.2.2 // indirect
@@ -47,7 +48,8 @@ require (
4748
github.com/moby/docker-image-spec v1.3.1 // indirect
4849
github.com/moby/patternmatcher v0.6.0 // indirect
4950
github.com/moby/sys/sequential v0.5.0 // indirect
50-
github.com/moby/sys/user v0.1.0 // indirect
51+
github.com/moby/sys/user v0.3.0 // indirect
52+
github.com/moby/sys/userns v0.1.0 // indirect
5153
github.com/moby/term v0.5.0 // indirect
5254
github.com/morikuni/aec v1.0.0 // indirect
5355
github.com/oapi-codegen/runtime v1.1.1 // indirect
@@ -67,14 +69,11 @@ require (
6769
go.opentelemetry.io/otel/metric v1.28.0 // indirect
6870
go.opentelemetry.io/otel/trace v1.28.0 // indirect
6971
golang.org/x/crypto v0.35.0 // indirect
70-
golang.org/x/mod v0.23.0 // indirect
7172
golang.org/x/net v0.36.0 // indirect
72-
golang.org/x/sync v0.11.0 // indirect
7373
golang.org/x/sys v0.30.0 // indirect
7474
golang.org/x/text v0.22.0 // indirect
75-
golang.org/x/tools v0.30.0 // indirect
7675
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect
7776
google.golang.org/grpc v1.63.2 // indirect
78-
google.golang.org/protobuf v1.33.0 // indirect
77+
google.golang.org/protobuf v1.35.2 // indirect
7978
gopkg.in/yaml.v3 v3.0.1 // indirect
8079
)

0 commit comments

Comments
 (0)