From bf108da447701d0fc1dad05bec6145378bb745f4 Mon Sep 17 00:00:00 2001 From: Joshua Powers Date: Fri, 3 Feb 2023 01:47:02 -0700 Subject: [PATCH] chore: Update to go1.20 (#12593) --- .circleci/config.yml | 2 +- Makefile | 4 ++-- internal/internal_test.go | 2 +- plugins/inputs/chrony/chrony_test.go | 4 ++++ scripts/ci.docker | 2 +- scripts/installgo_linux.sh | 4 ++-- scripts/installgo_mac.sh | 6 +++--- scripts/installgo_windows.sh | 2 +- 8 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8a908e401..d765795e5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ executors: working_directory: '/go/src/github.com/influxdata/telegraf' resource_class: large docker: - - image: 'quay.io/influxdb/telegraf-ci:1.19.5' + - image: 'quay.io/influxdb/telegraf-ci:1.20' environment: GOFLAGS: -p=4 mac: diff --git a/Makefile b/Makefile index d5a00b51e..7474aef1b 100644 --- a/Makefile +++ b/Makefile @@ -242,8 +242,8 @@ plugins/parsers/influx/machine.go: plugins/parsers/influx/machine.go.rl .PHONY: ci ci: - docker build -t quay.io/influxdb/telegraf-ci:1.19.5 - < scripts/ci.docker - docker push quay.io/influxdb/telegraf-ci:1.19.5 + docker build -t quay.io/influxdb/telegraf-ci:1.20 - < scripts/ci.docker + docker push quay.io/influxdb/telegraf-ci:1.20 .PHONY: install install: $(buildbin) diff --git a/internal/internal_test.go b/internal/internal_test.go index 0335e717e..239645a81 100644 --- a/internal/internal_test.go +++ b/internal/internal_test.go @@ -708,7 +708,7 @@ func TestParseTimestampInvalid(t *testing.T) { name: "layout not matching time", format: "rfc3339", timestamp: "09.07.2019 00:11:00", - expected: "cannot parse \"7.2019 00:11:00\" as \"2006\"", + expected: "cannot parse \"09.07.2019 00:11:00\" as \"2006\"", }, { name: "unix wrong type", diff --git a/plugins/inputs/chrony/chrony_test.go b/plugins/inputs/chrony/chrony_test.go index f6f0d116d..6e9b185b2 100644 --- a/plugins/inputs/chrony/chrony_test.go +++ b/plugins/inputs/chrony/chrony_test.go @@ -40,6 +40,10 @@ func TestGather(t *testing.T) { "update_interval": 507.2, } + // tests on linux with go1.20 will add a warning about code coverage + // due to the code coverage dir not being set + delete(acc.Metrics[0].Tags, "warning") + acc.AssertContainsTaggedFields(t, "chrony", fields, tags) // test with dns lookup diff --git a/scripts/ci.docker b/scripts/ci.docker index 458d245d7..0c700664e 100644 --- a/scripts/ci.docker +++ b/scripts/ci.docker @@ -1,4 +1,4 @@ -FROM golang:1.19.5 +FROM golang:1.20 RUN chmod -R 755 "$GOPATH" diff --git a/scripts/installgo_linux.sh b/scripts/installgo_linux.sh index ad492f316..0d1479128 100644 --- a/scripts/installgo_linux.sh +++ b/scripts/installgo_linux.sh @@ -2,10 +2,10 @@ set -eux -GO_VERSION="1.19.5" +GO_VERSION="1.20" GO_ARCH="linux-amd64" # from https://golang.org/dl -GO_VERSION_SHA="36519702ae2fd573c9869461990ae550c8c0d955cd28d2827a6b159fda81ff95" +GO_VERSION_SHA="5a9ebcc65c1cce56e0d2dc616aff4c4cedcfbda8cc6f0288cc08cda3b18dcbf1" # Download Go and verify Go tarball setup_go () { diff --git a/scripts/installgo_mac.sh b/scripts/installgo_mac.sh index af0d25d59..c55645eee 100644 --- a/scripts/installgo_mac.sh +++ b/scripts/installgo_mac.sh @@ -3,9 +3,9 @@ set -eux ARCH=$(uname -m) -GO_VERSION="1.19.5" -GO_VERSION_SHA_arm64="4a67f2bf0601afe2177eb58f825adf83509511d77ab79174db0712dc9efa16c8" # from https://golang.org/dl -GO_VERSION_SHA_amd64="23d22bb6571bbd60197bee8aaa10e702f9802786c2e2ddce5c84527e86b66aa0" # from https://golang.org/dl +GO_VERSION="1.20" +GO_VERSION_SHA_arm64="32864d6fe888714ca7b421b5997269c7f6349d7e2675c3a399133e521787608b" # from https://golang.org/dl +GO_VERSION_SHA_amd64="777025500f62d14bb5a4923072cd97431887961d24de08433a60c2fe1120531d" # from https://golang.org/dl if [ "$ARCH" = 'arm64' ]; then GO_ARCH="darwin-arm64" diff --git a/scripts/installgo_windows.sh b/scripts/installgo_windows.sh index 6c02d55d5..798374ad3 100644 --- a/scripts/installgo_windows.sh +++ b/scripts/installgo_windows.sh @@ -2,7 +2,7 @@ set -eux -GO_VERSION="1.19.5" +GO_VERSION="1.20" setup_go () { choco upgrade golang --allow-downgrade --version=${GO_VERSION}