Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): bump golang.org/x/net from 0.35.0 to 0.36.0 #4575

Closed
wants to merge 3 commits into from
Closed

build(deps): bump golang.org/x/net from 0.35.0 to 0.36.0 #4575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1c6e14
build(deps): bump golang.org/x/net from 0.35.0 to 0.36.0 in /testing
dependabot[bot] Mar 13, 2025
9597de3
Update x/net in root go.mod
michel-laterman Mar 13, 2025
494f021
merge main (#4623)
andrzej-stencel Mar 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .buildkite/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 5 additions & 1 deletion .buildkite/scripts/unit_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/golangci-lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .go-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.24.0
1.24.1
2 changes: 1 addition & 1 deletion .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
9 changes: 8 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
40 changes: 20 additions & 20 deletions NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.

Expand Down Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion dev-tools/integration/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
20 changes: 10 additions & 10 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
40 changes: 20 additions & 20 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down Expand Up @@ -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=
Expand All @@ -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=
Expand All @@ -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=
Expand Down
7 changes: 6 additions & 1 deletion internal/pkg/bulk/setup_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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)
}
Expand Down
9 changes: 0 additions & 9 deletions internal/pkg/es/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Loading
Loading