diff options
Diffstat (limited to 'src/cmd/go/main.go')
| -rw-r--r-- | src/cmd/go/main.go | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/cmd/go/main.go b/src/cmd/go/main.go index 73fe612e75..03395b87f9 100644 --- a/src/cmd/go/main.go +++ b/src/cmd/go/main.go @@ -3,12 +3,10 @@ // license that can be found in the LICENSE file. //go:generate go test cmd/go -v -run=^TestDocsUpToDate$ -fixdocs -//go:generate go test cmd/go -v -run=^TestCounterNamesUpToDate$ -update package main import ( - "cmd/internal/telemetry" "context" "flag" "fmt" @@ -36,6 +34,7 @@ import ( "cmd/go/internal/modget" "cmd/go/internal/modload" "cmd/go/internal/run" + "cmd/go/internal/telemetrycmd" "cmd/go/internal/test" "cmd/go/internal/tool" "cmd/go/internal/toolchain" @@ -44,6 +43,7 @@ import ( "cmd/go/internal/vet" "cmd/go/internal/work" "cmd/go/internal/workcmd" + "cmd/internal/telemetry" ) func init() { @@ -62,6 +62,7 @@ func init() { modcmd.CmdMod, workcmd.CmdWork, run.CmdRun, + telemetrycmd.CmdTelemetry, test.CmdTest, tool.CmdTool, version.CmdVersion, @@ -89,16 +90,18 @@ func init() { var _ = go11tag -var counterErrorsGOPATHEntryRelative = base.NewCounter("go/errors:gopath-entry-relative") +var counterErrorsGOPATHEntryRelative = telemetry.NewCounter("go/errors:gopath-entry-relative") func main() { log.SetFlags(0) - telemetry.StartWithUpload() // Open the telemetry counter file so counters can be written to it. + telemetry.Start() // 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. flag.Usage = base.Usage flag.Parse() + telemetry.Inc("go/invocations") telemetry.CountFlags("go/flag:", *flag.CommandLine) args := flag.Args() @@ -253,7 +256,9 @@ func invoke(cmd *base.Command, args []string) { } else { base.SetFromGOFLAGS(&cmd.Flag) cmd.Flag.Parse(args[1:]) - telemetry.CountFlags("go/flag:"+strings.ReplaceAll(cfg.CmdName, " ", "-")+"-", cmd.Flag) + flagCounterPrefix := "go/" + strings.ReplaceAll(cfg.CmdName, " ", "-") + "/flag" + telemetry.CountFlags(flagCounterPrefix+":", cmd.Flag) + telemetry.CountFlagValue(flagCounterPrefix+"/", cmd.Flag, "buildmode") args = cmd.Flag.Args() } |