From 6d3c1ce885ab8b359100e0e8ef4a8338deba6704 Mon Sep 17 00:00:00 2001 From: Michael Matloob Date: Wed, 31 Jan 2024 11:17:58 -0500 Subject: [PATCH] cmd: update golang.org/x/telemetry to 1cb064e and vendor it This brings in CL 559505 which adds a stub for counter.CountFlags so it can be depended on and still build on Go 1.18 and earlier. This will allow the go command to use counter.CountFlags and still be able to build as the bootstrap command with an earlier version of Go. For #58894 Change-Id: I31d5b96bd47eef2e407ef97e6146adece403f2c0 Cq-Include-Trybots: luci.golang.try:gotip-linux-amd64-longtest Reviewed-on: https://go-review.googlesource.com/c/go/+/559795 Reviewed-by: Bryan Mills LUCI-TryBot-Result: Go LUCI --- src/cmd/go.mod | 2 +- src/cmd/go.sum | 4 ++-- .../x/telemetry/counter/counter_go118.go | 14 +++++++++----- src/cmd/vendor/modules.txt | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/cmd/go.mod b/src/cmd/go.mod index 579ff73cd5..41194f39d9 100644 --- a/src/cmd/go.mod +++ b/src/cmd/go.mod @@ -9,7 +9,7 @@ require ( golang.org/x/mod v0.14.0 golang.org/x/sync v0.6.0 golang.org/x/sys v0.16.1-0.20240110015235-f69d32aa924f - golang.org/x/telemetry v0.0.0-20240130152304-a6426b6a1e6f + golang.org/x/telemetry v0.0.0-20240131160148-1cb064e7d4f2 golang.org/x/term v0.16.0 golang.org/x/tools v0.17.1-0.20240119231502-e1555a36d006 ) diff --git a/src/cmd/go.sum b/src/cmd/go.sum index c978e9ed12..86dd83bd8a 100644 --- a/src/cmd/go.sum +++ b/src/cmd/go.sum @@ -16,8 +16,8 @@ golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.16.1-0.20240110015235-f69d32aa924f h1:GvGFYRZ5kIldzXQj3UmUiUTMe5spPODuLKQvP38A+Qc= golang.org/x/sys v0.16.1-0.20240110015235-f69d32aa924f/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/telemetry v0.0.0-20240130152304-a6426b6a1e6f h1:W4/b7Y2Wq3rD7yh4tQ7CEviemZ5SZdAhiWDNTYz0QpQ= -golang.org/x/telemetry v0.0.0-20240130152304-a6426b6a1e6f/go.mod h1:ZthVHHkOi8rlMEsfFr3Ie42Ym1NonbFNNRKW3ci0UrU= +golang.org/x/telemetry v0.0.0-20240131160148-1cb064e7d4f2 h1:FXbfUwJ0hJkKMC/Cj47x49pH41jylMW5eMiIrJgmv2E= +golang.org/x/telemetry v0.0.0-20240131160148-1cb064e7d4f2/go.mod h1:ZthVHHkOi8rlMEsfFr3Ie42Ym1NonbFNNRKW3ci0UrU= golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE= golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= diff --git a/src/cmd/vendor/golang.org/x/telemetry/counter/counter_go118.go b/src/cmd/vendor/golang.org/x/telemetry/counter/counter_go118.go index af1bf13980..c073571549 100644 --- a/src/cmd/vendor/golang.org/x/telemetry/counter/counter_go118.go +++ b/src/cmd/vendor/golang.org/x/telemetry/counter/counter_go118.go @@ -6,11 +6,15 @@ package counter -import "fmt" - -func Add(string, int64) {} -func Inc(string) {} -func Open() {} +import ( + "flag" + "fmt" +) + +func Add(string, int64) {} +func Inc(string) {} +func Open() {} +func CountFlags(prefix string, fs flag.FlagSet) {} type Counter struct{ name string } diff --git a/src/cmd/vendor/modules.txt b/src/cmd/vendor/modules.txt index 6e094ef13a..f5ffc67a02 100644 --- a/src/cmd/vendor/modules.txt +++ b/src/cmd/vendor/modules.txt @@ -45,7 +45,7 @@ golang.org/x/sync/semaphore golang.org/x/sys/plan9 golang.org/x/sys/unix golang.org/x/sys/windows -# golang.org/x/telemetry v0.0.0-20240130152304-a6426b6a1e6f +# golang.org/x/telemetry v0.0.0-20240131160148-1cb064e7d4f2 ## explicit; go 1.20 golang.org/x/telemetry/counter golang.org/x/telemetry/internal/counter -- 2.48.1