Skip to content

Commit 6d3c1ce

Browse files
committed
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 <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]>
1 parent ac08c05 commit 6d3c1ce

File tree

4 files changed

+13
-9
lines changed

4 files changed

+13
-9
lines changed

src/cmd/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
golang.org/x/mod v0.14.0
1010
golang.org/x/sync v0.6.0
1111
golang.org/x/sys v0.16.1-0.20240110015235-f69d32aa924f
12-
golang.org/x/telemetry v0.0.0-20240130152304-a6426b6a1e6f
12+
golang.org/x/telemetry v0.0.0-20240131160148-1cb064e7d4f2
1313
golang.org/x/term v0.16.0
1414
golang.org/x/tools v0.17.1-0.20240119231502-e1555a36d006
1515
)

src/cmd/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
1616
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
1717
golang.org/x/sys v0.16.1-0.20240110015235-f69d32aa924f h1:GvGFYRZ5kIldzXQj3UmUiUTMe5spPODuLKQvP38A+Qc=
1818
golang.org/x/sys v0.16.1-0.20240110015235-f69d32aa924f/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
19-
golang.org/x/telemetry v0.0.0-20240130152304-a6426b6a1e6f h1:W4/b7Y2Wq3rD7yh4tQ7CEviemZ5SZdAhiWDNTYz0QpQ=
20-
golang.org/x/telemetry v0.0.0-20240130152304-a6426b6a1e6f/go.mod h1:ZthVHHkOi8rlMEsfFr3Ie42Ym1NonbFNNRKW3ci0UrU=
19+
golang.org/x/telemetry v0.0.0-20240131160148-1cb064e7d4f2 h1:FXbfUwJ0hJkKMC/Cj47x49pH41jylMW5eMiIrJgmv2E=
20+
golang.org/x/telemetry v0.0.0-20240131160148-1cb064e7d4f2/go.mod h1:ZthVHHkOi8rlMEsfFr3Ie42Ym1NonbFNNRKW3ci0UrU=
2121
golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE=
2222
golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
2323
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=

src/cmd/vendor/golang.org/x/telemetry/counter/counter_go118.go

Lines changed: 9 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/cmd/vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ golang.org/x/sync/semaphore
4545
golang.org/x/sys/plan9
4646
golang.org/x/sys/unix
4747
golang.org/x/sys/windows
48-
# golang.org/x/telemetry v0.0.0-20240130152304-a6426b6a1e6f
48+
# golang.org/x/telemetry v0.0.0-20240131160148-1cb064e7d4f2
4949
## explicit; go 1.20
5050
golang.org/x/telemetry/counter
5151
golang.org/x/telemetry/internal/counter

0 commit comments

Comments
 (0)