aboutsummaryrefslogtreecommitdiff
path: root/src/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'src/cmd')
-rw-r--r--src/cmd/addr2line/main.go2
-rw-r--r--src/cmd/asm/main.go2
-rw-r--r--src/cmd/buildid/buildid.go2
-rw-r--r--src/cmd/cgo/main.go2
-rw-r--r--src/cmd/compile/internal/gc/main.go2
-rw-r--r--src/cmd/covdata/covdata.go2
-rw-r--r--src/cmd/cover/cover.go2
-rw-r--r--src/cmd/distpack/pack.go2
-rw-r--r--src/cmd/doc/main.go2
-rw-r--r--src/cmd/fix/main.go2
-rw-r--r--src/cmd/go/main.go5
-rw-r--r--src/cmd/gofmt/gofmt.go2
-rw-r--r--src/cmd/internal/telemetry/telemetry.go32
-rw-r--r--src/cmd/internal/telemetry/telemetry_bootstrap.go5
-rw-r--r--src/cmd/link/internal/ld/main.go2
-rw-r--r--src/cmd/nm/nm.go2
-rw-r--r--src/cmd/objdump/main.go2
-rw-r--r--src/cmd/pack/pack.go2
-rw-r--r--src/cmd/pprof/pprof.go2
-rw-r--r--src/cmd/preprofile/main.go2
-rw-r--r--src/cmd/test2json/main.go2
-rw-r--r--src/cmd/trace/main.go2
-rw-r--r--src/cmd/vet/main.go2
23 files changed, 51 insertions, 31 deletions
diff --git a/src/cmd/addr2line/main.go b/src/cmd/addr2line/main.go
index e77785f156..b1ec4e0278 100644
--- a/src/cmd/addr2line/main.go
+++ b/src/cmd/addr2line/main.go
@@ -46,7 +46,7 @@ func usage() {
func main() {
log.SetFlags(0)
log.SetPrefix("addr2line: ")
- telemetry.Start()
+ telemetry.OpenCounters()
// pprof expects this behavior when checking for addr2line
if len(os.Args) > 1 && os.Args[1] == "--help" {
diff --git a/src/cmd/asm/main.go b/src/cmd/asm/main.go
index 82a2fa80e0..ca4e25d047 100644
--- a/src/cmd/asm/main.go
+++ b/src/cmd/asm/main.go
@@ -26,7 +26,7 @@ import (
func main() {
log.SetFlags(0)
log.SetPrefix("asm: ")
- telemetry.Start()
+ telemetry.OpenCounters()
buildcfg.Check()
GOARCH := buildcfg.GOARCH
diff --git a/src/cmd/buildid/buildid.go b/src/cmd/buildid/buildid.go
index 7abc37283f..a008122a0a 100644
--- a/src/cmd/buildid/buildid.go
+++ b/src/cmd/buildid/buildid.go
@@ -26,7 +26,7 @@ var wflag = flag.Bool("w", false, "write build ID")
func main() {
log.SetPrefix("buildid: ")
log.SetFlags(0)
- telemetry.Start()
+ telemetry.OpenCounters()
flag.Usage = usage
flag.Parse()
telemetry.Inc("buildid/invocations")
diff --git a/src/cmd/cgo/main.go b/src/cmd/cgo/main.go
index c258985fee..bf879be814 100644
--- a/src/cmd/cgo/main.go
+++ b/src/cmd/cgo/main.go
@@ -258,7 +258,7 @@ var goarch, goos, gomips, gomips64 string
var gccBaseCmd []string
func main() {
- telemetry.Start()
+ telemetry.OpenCounters()
objabi.AddVersionFlag() // -V
objabi.Flagparse(usage)
telemetry.Inc("cgo/invocations")
diff --git a/src/cmd/compile/internal/gc/main.go b/src/cmd/compile/internal/gc/main.go
index 41f5e43ec6..3887d4156d 100644
--- a/src/cmd/compile/internal/gc/main.go
+++ b/src/cmd/compile/internal/gc/main.go
@@ -59,7 +59,7 @@ func handlePanic() {
// code, and finally writes the compiled package definition to disk.
func Main(archInit func(*ssagen.ArchInfo)) {
base.Timer.Start("fe", "init")
- telemetry.Start()
+ telemetry.OpenCounters()
telemetry.Inc("compile/invocations")
defer handlePanic()
diff --git a/src/cmd/covdata/covdata.go b/src/cmd/covdata/covdata.go
index b280203f0c..48d7b9ed08 100644
--- a/src/cmd/covdata/covdata.go
+++ b/src/cmd/covdata/covdata.go
@@ -109,7 +109,7 @@ const (
)
func main() {
- telemetry.Start()
+ telemetry.OpenCounters()
// First argument should be mode/subcommand.
if len(os.Args) < 2 {
diff --git a/src/cmd/cover/cover.go b/src/cmd/cover/cover.go
index 912f7cafb5..47eebaadd3 100644
--- a/src/cmd/cover/cover.go
+++ b/src/cmd/cover/cover.go
@@ -87,7 +87,7 @@ const (
)
func main() {
- telemetry.Start()
+ telemetry.OpenCounters()
objabi.AddVersionFlag()
flag.Usage = usage
diff --git a/src/cmd/distpack/pack.go b/src/cmd/distpack/pack.go
index 0faab5c0b8..9ad33ee589 100644
--- a/src/cmd/distpack/pack.go
+++ b/src/cmd/distpack/pack.go
@@ -69,7 +69,7 @@ var (
func main() {
log.SetPrefix("distpack: ")
log.SetFlags(0)
- telemetry.Start()
+ telemetry.OpenCounters()
flag.Usage = usage
flag.Parse()
telemetry.Inc("distpack/invocations")
diff --git a/src/cmd/doc/main.go b/src/cmd/doc/main.go
index d02bf65c40..4dbddcb79f 100644
--- a/src/cmd/doc/main.go
+++ b/src/cmd/doc/main.go
@@ -87,7 +87,7 @@ func usage() {
func main() {
log.SetFlags(0)
log.SetPrefix("doc: ")
- telemetry.Start()
+ telemetry.OpenCounters()
dirsInit()
err := do(os.Stdout, flag.CommandLine, os.Args[1:])
if err != nil {
diff --git a/src/cmd/fix/main.go b/src/cmd/fix/main.go
index b0aabae889..d915ece4ce 100644
--- a/src/cmd/fix/main.go
+++ b/src/cmd/fix/main.go
@@ -65,7 +65,7 @@ func usage() {
}
func main() {
- telemetry.Start()
+ telemetry.OpenCounters()
flag.Usage = usage
flag.Parse()
telemetry.Inc("fix/invocations")
diff --git a/src/cmd/go/main.go b/src/cmd/go/main.go
index 9d140de215..eb33df1ad4 100644
--- a/src/cmd/go/main.go
+++ b/src/cmd/go/main.go
@@ -95,11 +95,12 @@ var counterErrorsGOPATHEntryRelative = telemetry.NewCounter("go/errors:gopath-en
func main() {
log.SetFlags(0)
- telemetry.Start() // Open the telemetry counter file so counters can be written to it.
+ telemetry.MaybeChild() // Run in child mode if this is the telemetry sidecar child process.
+ telemetry.OpenCounters() // Open the telemetry counter file so counters can be written to it.
handleChdirFlag()
toolchain.Select()
- telemetry.StartWithUpload() // Run the upload process. Opening the counter file is idempotent.
+ telemetry.MaybeParent() // Run the upload process. Opening the counter file is idempotent.
flag.Usage = base.Usage
flag.Parse()
telemetry.Inc("go/invocations")
diff --git a/src/cmd/gofmt/gofmt.go b/src/cmd/gofmt/gofmt.go
index 03f7bef89c..d6721f9327 100644
--- a/src/cmd/gofmt/gofmt.go
+++ b/src/cmd/gofmt/gofmt.go
@@ -374,7 +374,7 @@ func main() {
}
func gofmtMain(s *sequencer) {
- telemetry.Start()
+ telemetry.OpenCounters()
flag.Usage = usage
flag.Parse()
telemetry.Inc("gofmt/invocations")
diff --git a/src/cmd/internal/telemetry/telemetry.go b/src/cmd/internal/telemetry/telemetry.go
index f11d80d19f..b0c864a1a9 100644
--- a/src/cmd/internal/telemetry/telemetry.go
+++ b/src/cmd/internal/telemetry/telemetry.go
@@ -19,25 +19,43 @@ import (
"golang.org/x/telemetry/counter"
)
-// Start opens the counter files for writing if telemetry is supported
+var openCountersCalled, maybeChildCalled bool
+
+// OpenCounters opens the counter files for writing if telemetry is supported
// on the current platform (and does nothing otherwise).
-func Start() {
+func OpenCounters() {
+ openCountersCalled = true
telemetry.Start(telemetry.Config{
TelemetryDir: os.Getenv("TEST_TELEMETRY_DIR"),
})
}
-// StartWithUpload opens the counter files for writing if telemetry
-// is supported on the current platform and also enables a once a day
-// check to see if the weekly reports are ready to be uploaded.
-// It should only be called by cmd/go
-func StartWithUpload() {
+// MaybeParent does a once a day check to see if the weekly reports are
+// ready to be processed or uploaded, and if so, starts the telemetry child to
+// do so. It should only be called by cmd/go, and only after OpenCounters and MaybeChild
+// have already been called.
+func MaybeParent() {
+ if !openCountersCalled || !maybeChildCalled {
+ panic("MaybeParent must be called after OpenCounters and MaybeChild")
+ }
telemetry.Start(telemetry.Config{
Upload: true,
TelemetryDir: os.Getenv("TEST_TELEMETRY_DIR"),
})
}
+// MaybeChild executes the telemetry child logic if the calling program is
+// the telemetry child process, and does nothing otherwise. It is meant to be
+// called as the first thing in a program that uses telemetry.OpenCounters but cannot
+// call telemetry.OpenCounters immediately when it starts.
+func MaybeChild() {
+ maybeChildCalled = true
+ telemetry.MaybeChild(telemetry.Config{
+ Upload: true,
+ TelemetryDir: os.Getenv("TEST_TELEMETRY_DIR"),
+ })
+}
+
// Inc increments the counter with the given name.
func Inc(name string) {
counter.Inc(name)
diff --git a/src/cmd/internal/telemetry/telemetry_bootstrap.go b/src/cmd/internal/telemetry/telemetry_bootstrap.go
index 1740bdb701..05c0ee1c56 100644
--- a/src/cmd/internal/telemetry/telemetry_bootstrap.go
+++ b/src/cmd/internal/telemetry/telemetry_bootstrap.go
@@ -12,8 +12,9 @@ type dummyCounter struct{}
func (dc dummyCounter) Inc() {}
-func Start() {}
-func StartWithUpload() {}
+func OpenCounters() {}
+func MaybeParent() {}
+func MaybeChild() {}
func Inc(name string) {}
func NewCounter(name string) dummyCounter { return dummyCounter{} }
func NewStackCounter(name string, depth int) dummyCounter { return dummyCounter{} }
diff --git a/src/cmd/link/internal/ld/main.go b/src/cmd/link/internal/ld/main.go
index 9f50ad183a..3183e1a13e 100644
--- a/src/cmd/link/internal/ld/main.go
+++ b/src/cmd/link/internal/ld/main.go
@@ -157,7 +157,7 @@ func (t *ternaryFlag) IsBoolFlag() bool { return true } // parse like a boolean
func Main(arch *sys.Arch, theArch Arch) {
log.SetPrefix("link: ")
log.SetFlags(0)
- telemetry.Start()
+ telemetry.OpenCounters()
telemetry.Inc("link/invocations")
thearch = theArch
diff --git a/src/cmd/nm/nm.go b/src/cmd/nm/nm.go
index 62cf155362..e0d98d5f6c 100644
--- a/src/cmd/nm/nm.go
+++ b/src/cmd/nm/nm.go
@@ -68,7 +68,7 @@ func (nflag) String() string {
func main() {
log.SetFlags(0)
- telemetry.Start()
+ telemetry.OpenCounters()
flag.Usage = usage
flag.Parse()
telemetry.Inc("nm/invocations")
diff --git a/src/cmd/objdump/main.go b/src/cmd/objdump/main.go
index bd1762636d..7554b5500c 100644
--- a/src/cmd/objdump/main.go
+++ b/src/cmd/objdump/main.go
@@ -58,7 +58,7 @@ func usage() {
func main() {
log.SetFlags(0)
log.SetPrefix("objdump: ")
- telemetry.Start()
+ telemetry.OpenCounters()
flag.Usage = usage
flag.Parse()
diff --git a/src/cmd/pack/pack.go b/src/cmd/pack/pack.go
index 6d7eaf7e5b..28f217ace1 100644
--- a/src/cmd/pack/pack.go
+++ b/src/cmd/pack/pack.go
@@ -31,7 +31,7 @@ func usage() {
func main() {
log.SetFlags(0)
log.SetPrefix("pack: ")
- telemetry.Start()
+ telemetry.OpenCounters()
// need "pack op archive" at least.
if len(os.Args) < 3 {
log.Print("not enough arguments")
diff --git a/src/cmd/pprof/pprof.go b/src/cmd/pprof/pprof.go
index 69d3201cdb..722b745287 100644
--- a/src/cmd/pprof/pprof.go
+++ b/src/cmd/pprof/pprof.go
@@ -32,7 +32,7 @@ import (
)
func main() {
- telemetry.Start()
+ telemetry.OpenCounters()
telemetry.Inc("pprof/invocations")
options := &driver.Options{
Fetch: new(fetcher),
diff --git a/src/cmd/preprofile/main.go b/src/cmd/preprofile/main.go
index 78063c1463..1260eed104 100644
--- a/src/cmd/preprofile/main.go
+++ b/src/cmd/preprofile/main.go
@@ -73,7 +73,7 @@ func main() {
log.SetFlags(0)
log.SetPrefix("preprofile: ")
- telemetry.Start()
+ telemetry.OpenCounters()
flag.Usage = usage
flag.Parse()
diff --git a/src/cmd/test2json/main.go b/src/cmd/test2json/main.go
index 36e7cf90b5..844ee5aa6c 100644
--- a/src/cmd/test2json/main.go
+++ b/src/cmd/test2json/main.go
@@ -116,7 +116,7 @@ func ignoreSignals() {
}
func main() {
- telemetry.Start()
+ telemetry.OpenCounters()
flag.Usage = usage
flag.Parse()
diff --git a/src/cmd/trace/main.go b/src/cmd/trace/main.go
index 16721ef842..e48048b9f2 100644
--- a/src/cmd/trace/main.go
+++ b/src/cmd/trace/main.go
@@ -64,7 +64,7 @@ var (
)
func main() {
- telemetry.Start()
+ telemetry.OpenCounters()
flag.Usage = func() {
fmt.Fprint(os.Stderr, usageMessage)
os.Exit(2)
diff --git a/src/cmd/vet/main.go b/src/cmd/vet/main.go
index eff82dcc71..84821d43fc 100644
--- a/src/cmd/vet/main.go
+++ b/src/cmd/vet/main.go
@@ -47,7 +47,7 @@ import (
)
func main() {
- telemetry.Start()
+ telemetry.OpenCounters()
objabi.AddVersionFlag()
telemetry.Inc("vet/invocations")
generated by cgit v1.3 (git 2.53.0) at 2026-04-15 16:41:20 +0000