cmd/go: change the naming of flag counters

We're making the following changes:
 * From cmd/go/flag-<flagname> to cmd/go/flag:<flagname>
 * From cmd/go/<subcommand-name>:flag-<flagname> to
       cmd/go/flag:<subcommand-name>-<flagname>
 * From cmd/go:subcommand-<subcommand-name> to
       cmd/go/subcommand:<subcommand-name>

Change-Id: Id682840bb4330fceeb070fc69203d0bfb03f3a29
Reviewed-on: https://go-review.googlesource.com/c/go/+/564857
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Bryan Mills <bcmills@google.com>
Reviewed-by: Hyang-Ah Hana Kim <hyangah@gmail.com>
Reviewed-by: Robert Findley <rfindley@google.com>

diff --git a/src/cmd/go/main.go b/src/cmd/go/main.go
index f62477a8392492eea561207d2589f434143754bf..0f6305f89c7d3e82b34393c72b44b586139fb480 100644 (file)
--- a/src/cmd/go/main.go
+++ b/src/cmd/go/main.go
@@ -97,7 +97,7 @@ func main() {
 
        flag.Usage = base.Usage
        flag.Parse()
-       counter.CountFlags("cmd/go:flag-", *flag.CommandLine)
+       counter.CountFlags("cmd/go/flag:", *flag.CommandLine)
 
        args := flag.Args()
        if len(args) < 1 {
@@ -153,7 +153,7 @@ func main() {
 
        cmd, used := lookupCmd(args)
        cfg.CmdName = strings.Join(args[:used], " ")
-       counter.Inc("cmd/go:subcommand-" + strings.ReplaceAll(cfg.CmdName, " ", "-"))
+       counter.Inc("cmd/go/subcommand:" + strings.ReplaceAll(cfg.CmdName, " ", "-"))
        if len(cmd.Commands) > 0 {
                if used >= len(args) {
                        help.PrintUsage(os.Stderr, cmd)
@@ -241,7 +241,7 @@ func invoke(cmd *base.Command, args []string) {
        } else {
                base.SetFromGOFLAGS(&cmd.Flag)
                cmd.Flag.Parse(args[1:])
-               counter.CountFlags("cmd/go/"+cmd.Name()+":flag-", cmd.Flag)
+               counter.CountFlags("cmd/go/flag:"+cmd.Name()+"-", cmd.Flag)
                args = cmd.Flag.Args()
        }