diff options
| author | Michael Matloob <matloob@golang.org> | 2024-04-01 15:56:03 -0400 |
|---|---|---|
| committer | Michael Matloob <matloob@golang.org> | 2024-04-01 20:28:41 +0000 |
| commit | cd294f55ca1a419ce21242731591b4f946f9a679 (patch) | |
| tree | 2e25a35f5071606eeade3454d9ee55bdd9a8fb96 /src | |
| parent | dfb17c126cdfddc57ba929e50354b6b025779117 (diff) | |
| download | go-cd294f55ca1a419ce21242731591b4f946f9a679.tar.xz | |
cmd: update and vendor golang.org/x/telemetry@3640ba5
Commands run:
go get golang.org/x/telemetry@3640ba5
go mod vendor
go mod tidy
This pulls in golang.org/cl/574815, fixing #66344
Fixes #66344
Change-Id: Ib5a0c4fc1e0bd44dbc13453ec1dade89a8d96f70
Reviewed-on: https://go-review.googlesource.com/c/go/+/575575
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Sam Thanawalla <samthanawalla@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/go.mod | 2 | ||||
| -rw-r--r-- | src/cmd/go.sum | 4 | ||||
| -rw-r--r-- | src/cmd/vendor/golang.org/x/telemetry/start.go | 6 | ||||
| -rw-r--r-- | src/cmd/vendor/modules.txt | 2 |
4 files changed, 9 insertions, 5 deletions
diff --git a/src/cmd/go.mod b/src/cmd/go.mod index 00ad03ccb1..f2332cba39 100644 --- a/src/cmd/go.mod +++ b/src/cmd/go.mod @@ -9,7 +9,7 @@ require ( golang.org/x/mod v0.16.0 golang.org/x/sync v0.6.0 golang.org/x/sys v0.18.0 - golang.org/x/telemetry v0.0.0-20240314204428-abedc375dc97 + golang.org/x/telemetry v0.0.0-20240401194020-3640ba572dd1 golang.org/x/term v0.18.0 golang.org/x/tools v0.18.0 ) diff --git a/src/cmd/go.sum b/src/cmd/go.sum index 3b5545f7de..0433811101 100644 --- a/src/cmd/go.sum +++ b/src/cmd/go.sum @@ -32,8 +32,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.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/telemetry v0.0.0-20240314204428-abedc375dc97 h1:8xsFCUjK82nH2OGdUR3elXWEngFLc2SM/IplvhGHFjk= -golang.org/x/telemetry v0.0.0-20240314204428-abedc375dc97/go.mod h1:wQS78u8AjB4H3mN7DPniFYwsXnV9lPziq+He/eA7JIw= +golang.org/x/telemetry v0.0.0-20240401194020-3640ba572dd1 h1:x0E096pmZoLhjEfcM4q2gJ3eZvnTpZiYDSPDYtm4wME= +golang.org/x/telemetry v0.0.0-20240401194020-3640ba572dd1/go.mod h1:wQS78u8AjB4H3mN7DPniFYwsXnV9lPziq+He/eA7JIw= golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= diff --git a/src/cmd/vendor/golang.org/x/telemetry/start.go b/src/cmd/vendor/golang.org/x/telemetry/start.go index 661c912542..6c88992f97 100644 --- a/src/cmd/vendor/golang.org/x/telemetry/start.go +++ b/src/cmd/vendor/golang.org/x/telemetry/start.go @@ -112,7 +112,11 @@ func parent(config Config) { // Fork+exec the telemetry child. exe, err := os.Executable() if err != nil { - log.Fatal(err) + // There was an error getting os.Executable. It's possible + // for this to happen on AIX if os.Args[0] is not an absolute + // path and we can't find os.Args[0] in PATH. + log.Printf("failed to start telemetry sidecar: os.Executable: %v", err) + return } cmd := exec.Command(exe, "** telemetry **") // this unused arg is just for ps(1) daemonize(cmd) diff --git a/src/cmd/vendor/modules.txt b/src/cmd/vendor/modules.txt index 549a3fdc7f..81e93e5044 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-20240314204428-abedc375dc97 +# golang.org/x/telemetry v0.0.0-20240401194020-3640ba572dd1 ## explicit; go 1.20 golang.org/x/telemetry golang.org/x/telemetry/counter |