From 307e30772b130e97e07b4341b6c10fa7f9f9fcaa Mon Sep 17 00:00:00 2001 From: Chun-Hung Tseng Date: Wed, 14 Aug 2024 23:57:06 +0200 Subject: [PATCH 1/2] Bump go toolchain to 1.22.6 Reference: - https://github.com/etcd-io/etcd/issues/18443 Signed-off-by: Chun-Hung Tseng --- .go-version | 2 +- functional/scripts/docker-local-agent.sh | 2 +- functional/scripts/docker-local-tester.sh | 2 +- go.mod | 4 ++-- tools/mod/go.mod | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.go-version b/.go-version index 0c5bf37cae7..013173af5e9 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.21.13 +1.22.6 diff --git a/functional/scripts/docker-local-agent.sh b/functional/scripts/docker-local-agent.sh index dbcded83bf5..729083684b3 100755 --- a/functional/scripts/docker-local-agent.sh +++ b/functional/scripts/docker-local-agent.sh @@ -13,7 +13,7 @@ if ! [[ "${0}" =~ "scripts/docker-local-agent.sh" ]]; then fi if [[ -z "${GO_VERSION}" ]]; then - GO_VERSION=1.21.13 + GO_VERSION=1.22.6 fi echo "Running with GO_VERSION:" ${GO_VERSION} diff --git a/functional/scripts/docker-local-tester.sh b/functional/scripts/docker-local-tester.sh index cf3889da5ac..cfba9c65a19 100755 --- a/functional/scripts/docker-local-tester.sh +++ b/functional/scripts/docker-local-tester.sh @@ -6,7 +6,7 @@ if ! [[ "${0}" =~ "scripts/docker-local-tester.sh" ]]; then fi if [[ -z "${GO_VERSION}" ]]; then - GO_VERSION=1.21.13 + GO_VERSION=1.22.6 fi echo "Running with GO_VERSION:" ${GO_VERSION} diff --git a/go.mod b/go.mod index b1e7643a67b..f061818745b 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module go.etcd.io/etcd -go 1.21 +go 1.22 -toolchain go1.21.13 +toolchain go1.22.6 require ( github.com/bgentry/speakeasy v0.1.0 diff --git a/tools/mod/go.mod b/tools/mod/go.mod index d8b7c0cfead..0a94f5f1a1c 100644 --- a/tools/mod/go.mod +++ b/tools/mod/go.mod @@ -1,8 +1,8 @@ module go.etcd.io/etcd/tools/v3 -go 1.21 +go 1.22 -toolchain go1.21.13 +toolchain go1.22.6 require ( github.com/gogo/protobuf v1.3.2 From 24194255c452219a9809a40e772f4e78e293f894 Mon Sep 17 00:00:00 2001 From: Chun-Hung Tseng Date: Fri, 16 Aug 2024 17:20:26 +0200 Subject: [PATCH 2/2] Fix minute endpoint trailing space issue Reference: - https://github.com/etcd-io/etcd/pull/18445#issuecomment-2290739111 Signed-off-by: Chun-Hung Tseng Signed-off-by: Ivan Valdes --- pkg/debugutil/pprof.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/debugutil/pprof.go b/pkg/debugutil/pprof.go index 8d5544a3dca..22c2e1ee5d5 100644 --- a/pkg/debugutil/pprof.go +++ b/pkg/debugutil/pprof.go @@ -36,7 +36,7 @@ func PProfHandlers() map[string]http.Handler { m[HTTPPrefixPProf+"/profile"] = http.HandlerFunc(pprof.Profile) m[HTTPPrefixPProf+"/symbol"] = http.HandlerFunc(pprof.Symbol) m[HTTPPrefixPProf+"/cmdline"] = http.HandlerFunc(pprof.Cmdline) - m[HTTPPrefixPProf+"/trace "] = http.HandlerFunc(pprof.Trace) + m[HTTPPrefixPProf+"/trace"] = http.HandlerFunc(pprof.Trace) m[HTTPPrefixPProf+"/heap"] = pprof.Handler("heap") m[HTTPPrefixPProf+"/goroutine"] = pprof.Handler("goroutine") m[HTTPPrefixPProf+"/threadcreate"] = pprof.Handler("threadcreate")