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

Jump to bottom

[8.10] build: bump go version to 1.21.3 (backport #11821) #11823

Closed
wants to merge 1 commit into from
Closed

[8.10] build: bump go version to 1.21.3 (backport #11821) #11823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions .go-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
<<<<<<< HEAD
1.20.7
=======
1.21.3
>>>>>>> d41192417 (build: bump go version to 1.21.3 (#11821))
40 changes: 24 additions & 16 deletions NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1279,11 +1279,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-s

--------------------------------------------------------------------------------
Dependency : github.com/elastic/gmux
Version: v0.2.0
Version: v0.3.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/gmux@v0.2.0/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/elastic/gmux@v0.3.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -6426,11 +6426,11 @@ THE SOFTWARE.

--------------------------------------------------------------------------------
Dependency : golang.org/x/net
Version: v0.14.0
Version: v0.17.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.14.0/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.17.0/LICENSE:

Copyright (c) 2009 The Go Authors. All rights reserved.

Expand Down Expand Up @@ -6463,11 +6463,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : golang.org/x/sync
Version: v0.3.0
Version: v0.4.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/sync@v0.3.0/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/sync@v0.4.0/LICENSE:

Copyright (c) 2009 The Go Authors. All rights reserved.

Expand Down Expand Up @@ -6500,11 +6500,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : golang.org/x/term
Version: v0.11.0
Version: v0.13.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.11.0/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.13.0/LICENSE:

Copyright (c) 2009 The Go Authors. All rights reserved.

Expand Down Expand Up @@ -6574,11 +6574,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : google.golang.org/grpc
Version: v1.56.1
Version: v1.58.2
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/google.golang.org/grpc@v1.56.1/LICENSE:
Contents of probable licence file $GOMODCACHE/google.golang.org/grpc@v1.58.2/LICENSE:


Apache License
Expand Down Expand Up @@ -18031,11 +18031,11 @@ THE SOFTWARE.

--------------------------------------------------------------------------------
Dependency : golang.org/x/crypto
Version: v0.12.0
Version: v0.14.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.12.0/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.14.0/LICENSE:

Copyright (c) 2009 The Go Authors. All rights reserved.

Expand Down Expand Up @@ -18105,11 +18105,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : golang.org/x/sys
<<<<<<< HEAD
Version: v0.11.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.11.0/LICENSE:
=======
Version: v0.13.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.13.0/LICENSE:
>>>>>>> d41192417 (build: bump go version to 1.21.3 (#11821))

Copyright (c) 2009 The Go Authors. All rights reserved.

Expand Down Expand Up @@ -18142,11 +18150,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : golang.org/x/text
Version: v0.12.0
Version: v0.13.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.12.0/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.13.0/LICENSE:

Copyright (c) 2009 The Go Authors. All rights reserved.

Expand Down Expand Up @@ -18179,11 +18187,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : google.golang.org/genproto/googleapis/rpc
Version: v0.0.0-20230530153820-e85fd2cbaebc
Version: v0.0.0-20231002182017-d307bd883b97
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/google.golang.org/genproto/googleapis/rpc@v0.0.0-20230530153820-e85fd2cbaebc/LICENSE:
Contents of probable licence file $GOMODCACHE/google.golang.org/genproto/googleapis/rpc@v0.0.0-20231002182017-d307bd883b97/LICENSE:


Apache License
Expand Down
6 changes: 6 additions & 0 deletions cmd/intake-receiver/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
module github.com/elastic/apm-server/cmd/intake-receiver

<<<<<<< HEAD
go 1.20
=======
go 1.21

toolchain go1.21.3
>>>>>>> d41192417 (build: bump go version to 1.21.3 (#11821))

require (
github.com/stretchr/testify v1.6.1
Expand Down
4 changes: 4 additions & 0 deletions docs/version.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
// doc-branch can be: master, 8.0, 8.1, etc.
:doc-branch: master
<<<<<<< HEAD
:go-version: 1.20.7
=======
:go-version: 1.21.3
>>>>>>> d41192417 (build: bump go version to 1.21.3 (#11821))
:python: 3.7
:docker: 1.12
:docker-compose: 1.11
Expand Down
35 changes: 28 additions & 7 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
module github.com/elastic/apm-server

<<<<<<< HEAD
go 1.20
=======
go 1.21

toolchain go1.21.3
>>>>>>> d41192417 (build: bump go version to 1.21.3 (#11821))

require (
github.com/axiomhq/hyperloglog v0.0.0-20230201085229-3ddf4bad03dc
github.com/cespare/xxhash/v2 v2.2.0
github.com/dgraph-io/badger/v2 v2.2007.3-0.20201012072640-f5a7e0a1c83b
github.com/dustin/go-humanize v1.0.1
github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6
<<<<<<< HEAD
github.com/elastic/apm-data v0.1.1-0.20230814023104-48e4b20579f6
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231010145216-332917dbd4c8
github.com/elastic/elastic-agent-client/v7 v7.3.0
Expand All @@ -17,6 +24,16 @@ require (
github.com/elastic/go-docappender v0.2.1-0.20230724080315-b714d6181871
github.com/elastic/go-elasticsearch/v8 v8.9.0
github.com/elastic/go-hdrhistogram v0.1.0
=======
github.com/elastic/apm-data v0.1.1-0.20230928144734-40b63726f3b7
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231010125927-56195b1561a7
github.com/elastic/elastic-agent-client/v7 v7.4.0
github.com/elastic/elastic-agent-libs v0.3.15-0.20230913212237-dbdaf18c898b
github.com/elastic/elastic-agent-system-metrics v0.7.0
github.com/elastic/gmux v0.3.0
github.com/elastic/go-docappender v0.2.1-0.20230829163624-c69a1cf8ce35
github.com/elastic/go-elasticsearch/v8 v8.10.0
>>>>>>> d41192417 (build: bump go version to 1.21.3 (#11821))
github.com/elastic/go-sysinfo v1.11.1
github.com/elastic/go-ucfg v0.8.6
github.com/go-sourcemap/sourcemap v2.1.3+incompatible
Expand Down Expand Up @@ -50,11 +67,11 @@ require (
go.opentelemetry.io/otel/sdk/metric v0.39.0
go.uber.org/automaxprocs v1.5.2
go.uber.org/zap v1.25.0
golang.org/x/net v0.14.0
golang.org/x/sync v0.3.0
golang.org/x/term v0.11.0
golang.org/x/net v0.17.0
golang.org/x/sync v0.4.0
golang.org/x/term v0.13.0
golang.org/x/time v0.3.0
google.golang.org/grpc v1.56.1
google.golang.org/grpc v1.58.2
google.golang.org/protobuf v1.31.0
gopkg.in/yaml.v3 v3.0.1
)
Expand Down Expand Up @@ -87,7 +104,6 @@ require (
github.com/eapache/queue v1.1.0 // indirect
github.com/elastic/elastic-agent-shipper-client v0.5.1-0.20230228231646-f04347b666f3 // indirect
github.com/elastic/elastic-transport-go/v8 v8.3.0 // indirect
github.com/elastic/go-licenser v0.4.1 // indirect
github.com/elastic/go-lumber v0.1.2-0.20220819171948-335fde24ea0f // indirect
github.com/elastic/go-structform v0.0.10 // indirect
github.com/elastic/go-windows v1.0.1 // indirect
Expand Down Expand Up @@ -156,13 +172,18 @@ require (
go.opentelemetry.io/otel/trace v1.16.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.12.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect
golang.org/x/mod v0.12.0 // indirect
<<<<<<< HEAD
golang.org/x/sys v0.11.0 // indirect
golang.org/x/text v0.12.0 // indirect
=======
golang.org/x/sys v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
>>>>>>> d41192417 (build: bump go version to 1.21.3 (#11821))
golang.org/x/tools v0.12.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect
gopkg.in/jcmturner/aescts.v1 v1.0.1 // indirect
gopkg.in/jcmturner/dnsutils.v1 v1.0.1 // indirect
gopkg.in/jcmturner/goidentity.v3 v3.0.0 // indirect
Expand Down
Loading
Loading