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

feat: bump go to 1.20 #12031

Merged
merged 7 commits into from
Nov 10, 2023
Merged

feat: bump go to 1.20 #12031

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7684d5c
feat: bump go to 1.20
kruskall Nov 9, 2023
0dc9387
feat: bump go to 1.20
kruskall Nov 9, 2023
f10a95e
lint: fix linter issues
kruskall Nov 9, 2023
94ea084
lint: bump staticcheck
kruskall Nov 9, 2023
b700593
fix: update python assertions for output format changes in go tests
kruskall Nov 10, 2023
d59a13f
lint: revert time format layout
kruskall Nov 10, 2023
d48013c
Revert "lint: revert time format layout"
kruskall Nov 10, 2023
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
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.19.12
1.20.10
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.19.12
FROM golang:1.20.10

RUN set -x && \
apt-get update && \
Expand Down
2 changes: 1 addition & 1 deletion approvaltest/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/elastic/apm-server/approvaltest

go 1.19
go 1.20

require (
github.com/google/go-cmp v0.5.2
Expand Down
2 changes: 1 addition & 1 deletion cmd/apikey.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ func getAPIKey(client es.Client, id, name *string, validOnly, asJSON bool) error
if validOnly && (apikey.Invalidated || expiry == "expired") {
continue
}
creation := time.Unix(apikey.Creation/1000, 0).Format("2006-02-01 15:04")
creation := time.Unix(apikey.Creation/1000, 0).Format("2006-01-02 15:04")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this isn't a functional change right?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is in the sense it's change the log message (date format is different) but the old format is wrong and reported by the linter.

I guess we can keep it to move this PR forward.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nevermind, it's reported by go vet which does not have an ignore mechanism

printText("Username ....... %s", apikey.Username)
printText("Api Key Name ... %s", apikey.Name)
printText("Id ............. %s", apikey.ID)
Expand Down
2 changes: 1 addition & 1 deletion docs/version.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// doc-branch can be: master, 8.0, 8.1, etc.
:doc-branch: 7.x
:go-version: 1.19.12
:go-version: 1.20.10
:python: 3.7
:docker: 1.12
:docker-compose: 1.11
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/elastic/apm-server

go 1.19
go 1.20

require (
github.com/DataDog/zstd v1.4.4 // indirect
Expand Down
2 changes: 1 addition & 1 deletion internal/glog/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module github.com/golang/glog

go 1.19
go 1.20
2 changes: 1 addition & 1 deletion systemtest/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/elastic/apm-server/systemtest

go 1.19
go 1.20

require (
github.com/docker/distribution v2.7.1+incompatible // indirect
Expand Down
2 changes: 1 addition & 1 deletion tests/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.19.12
FROM golang:1.20.10
MAINTAINER Nicolas Ruflin <[email protected]>

RUN apt-get update
Expand Down
2 changes: 1 addition & 1 deletion tests/system/apmserver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ def wait_until_started(self):
self.command_output = log[:pos]
for trimmed in log[pos:].strip().splitlines():
# ensure only skipping expected lines
assert trimmed.split(None, 1)[0] in ("PASS", "coverage:"), trimmed
assert trimmed.split(None, 2)[1] in ("PASS", "coverage:"), trimmed

def stop_proc(self):
return
Expand Down
24 changes: 12 additions & 12 deletions tools/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
module github.com/elastic/apm-server/tools

go 1.19
go 1.20

require (
github.com/elastic/elastic-package v0.23.0
github.com/elastic/go-licenser v0.4.0
github.com/reviewdog/reviewdog v0.13.1-0.20211107024453-1ccbebf6b175
github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c
go.elastic.co/go-licence-detector v0.5.0
honnef.co/go/tools v0.3.3
honnef.co/go/tools v0.4.6
)

require (
Expand All @@ -17,7 +17,7 @@ require (
cloud.google.com/go/datastore v1.8.0 // indirect
github.com/AlecAivazis/survey/v2 v2.3.5 // indirect
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/BurntSushi/toml v1.2.0 // indirect
github.com/BurntSushi/toml v1.2.1 // indirect
github.com/MakeNowJust/heredoc v1.0.0 // indirect
github.com/Masterminds/semver v1.5.0 // indirect
github.com/Masterminds/semver/v3 v3.1.1 // indirect
Expand Down Expand Up @@ -128,17 +128,17 @@ require (
go.opencensus.io v0.23.0 // indirect
go.starlark.net v0.0.0-20220817180228-f738f5508c12 // indirect
golang.org/x/build v0.0.0-20220908145327-656fd833c864 // indirect
golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 // indirect
golang.org/x/exp/typeparams v0.0.0-20220907003533-145caa8ea1d0 // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
golang.org/x/net v0.0.0-20220907135653-1e95f45603a7 // indirect
golang.org/x/crypto v0.12.0 // indirect
golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/net v0.14.0 // indirect
golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 // indirect
golang.org/x/sync v0.0.0-20220907140024-f12130a52804 // indirect
golang.org/x/sys v0.0.0-20220908164124-27713097b956 // indirect
golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.11.0 // indirect
golang.org/x/term v0.11.0 // indirect
golang.org/x/text v0.12.0 // indirect
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
golang.org/x/tools v0.1.12 // indirect
golang.org/x/tools v0.12.1-0.20230825192346-2191a27a6dc5 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/api v0.95.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
Expand Down
1,682 changes: 22 additions & 1,660 deletions tools/go.sum
View file
Open in desktop

Large diffs are not rendered by default.

Loading