cmd/go: remove checks that all counters incremented are in counters.txt

This change removes cmd/go/testdata/counters.txt. It also removes the
code that prepares it and checks that it contains all registered
counters as well as counters for all flags and subcommands. It removes
the counter registration mechanism, and uses telemetry.NewCounter to
create new counters instead. It keeps the tests that check that at least
one counter is incremented if the go command is invoked in a script test.

Change-Id: Ic6bda5c64e90f0dd7e221968fce0e375e84d6e17
Cq-Include-Trybots: luci.golang.try:gotip-windows-amd64-longtest,gotip-linux-amd64-longtest
Reviewed-on: https://go-review.googlesource.com/c/go/+/582715
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Sam Thanawalla <samthanawalla@google.com>

Author: matloob

src/cmd/go/counters_test.go

@@ -7,15 +7,13 @@
 package base
 
 import (
-	"cmd/internal/telemetry"
 	"context"
 	"flag"
 	"fmt"
 	"log"
 	"os"
 	"os/exec"
 	"reflect"
-	"sort"
 	"strings"
 	"sync"
 
@@ -223,28 +221,3 @@ func RunStdin(cmdline []string) {
 // Usage is the usage-reporting function, filled in by package main
 // but here for reference by other packages.
 var Usage func()
-
-var counterNames = map[string]bool{}
-
-type Counter interface {
-	Inc()
-}
-
-// NewCounter registers a new counter. It must be called from an init function
-// or global variable initializer.
-func NewCounter(name string) Counter {
-	if counterNames[name] {
-		panic(fmt.Errorf("counter %q initialized twice", name))
-	}
-	counterNames[name] = true
-	return telemetry.NewCounter(name)
-}
-
-func RegisteredCounterNames() []string {
-	var names []string
-	for name := range counterNames {
-		names = append(names, name)
-	}
-	sort.Strings(names)
-	return names
-}

src/cmd/go/internal/base/base.go

@@ -16,9 +16,10 @@ import (
 	"unicode/utf8"
 
 	"cmd/go/internal/base"
+	"cmd/internal/telemetry"
 )
 
-var counterErrorsHelpUnknownTopic = base.NewCounter("go/errors:help-unknown-topic")
+var counterErrorsHelpUnknownTopic = telemetry.NewCounter("go/errors:help-unknown-topic")
 
 // Help implements the 'help' command.
 func Help(w io.Writer, args []string) {

src/cmd/go/internal/help/help.go

@@ -26,6 +26,7 @@ import (
 	"cmd/go/internal/modfetch/codehost"
 	"cmd/go/internal/par"
 	"cmd/go/internal/robustio"
+	"cmd/internal/telemetry"
 
 	"golang.org/x/mod/module"
 	"golang.org/x/mod/semver"
@@ -778,7 +779,7 @@ var (
 	statCacheOnce sync.Once
 	statCacheErr  error
 
-	counterErrorsGOMODCACHEEntryRelative = base.NewCounter("go/errors:gomodcache-entry-relative")
+	counterErrorsGOMODCACHEEntryRelative = telemetry.NewCounter("go/errors:gomodcache-entry-relative")
 )
 
 // checkCacheDir checks if the directory specified by GOMODCACHE exists. An

src/cmd/go/internal/modfetch/cache.go

@@ -26,6 +26,7 @@ import (
 	"cmd/go/internal/modload"
 	"cmd/go/internal/run"
 	"cmd/go/internal/work"
+	"cmd/internal/telemetry"
 
 	"golang.org/x/mod/module"
 )
@@ -81,7 +82,7 @@ func FilterEnv(env []string) []string {
 	return out
 }
 
-var counterErrorsInvalidToolchainInFile = base.NewCounter("go/errors:invalid-toolchain-in-file")
+var counterErrorsInvalidToolchainInFile = telemetry.NewCounter("go/errors:invalid-toolchain-in-file")
 
 // Select invokes a different Go toolchain if directed by
 // the GOTOOLCHAIN environment variable or the user's configuration
@@ -245,7 +246,7 @@ func Select() {
 	Exec(gotoolchain)
 }
 
-var counterSelectExec = base.NewCounter("go/toolchain/select-exec")
+var counterSelectExec = telemetry.NewCounter("go/toolchain/select-exec")
 
 // TestVersionSwitch is set in the test go binary to the value in $TESTGO_VERSION_SWITCH.
 // Valid settings are:

src/cmd/go/internal/toolchain/select.go

@@ -16,6 +16,7 @@ import (
 	"cmd/go/internal/cfg"
 	"cmd/go/internal/gover"
 	"cmd/go/internal/modfetch"
+	"cmd/internal/telemetry"
 )
 
 // A Switcher collects errors to be reported and then decides
@@ -103,7 +104,7 @@ func (s *Switcher) Switch(ctx context.Context) {
 	panic("unreachable")
 }
 
-var counterSwitchExec = base.NewCounter("go/toolchain/switch-exec")
+var counterSwitchExec = telemetry.NewCounter("go/toolchain/switch-exec")
 
 // SwitchOrFatal attempts a toolchain switch based on the information in err
 // and otherwise falls back to base.Fatal(err).

src/cmd/go/internal/toolchain/switch.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"
@@ -44,6 +42,7 @@ import (
 	"cmd/go/internal/vet"
 	"cmd/go/internal/work"
 	"cmd/go/internal/workcmd"
+	"cmd/internal/telemetry"
 )
 
 func init() {
@@ -89,7 +88,7 @@ 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)

src/cmd/go/main.go

@@ -22,7 +22,6 @@ import (
 	"path/filepath"
 	"runtime"
 	"strings"
-	"sync"
 	"testing"
 	"time"
 
@@ -395,32 +394,13 @@ func readCounters(t *testing.T, telemetryDir string) map[string]uint64 {
 	return totals
 }
 
-//go:embed testdata/counters.txt
-var countersTxt string
-
-var (
-	allowedCountersOnce sync.Once
-	allowedCounters     = map[string]bool{} // Set of allowed counters.
-)
-
 func checkCounters(t *testing.T, telemetryDir string) {
-	allowedCountersOnce.Do(func() {
-		for _, counter := range strings.Fields(countersTxt) {
-			allowedCounters[counter] = true
-		}
-	})
 	counters := readCounters(t, telemetryDir)
 	if _, ok := scriptGoInvoked.Load(testing.TB(t)); ok {
 		if !disabledOnPlatform && len(counters) == 0 {
 			t.Fatal("go was invoked but no counters were incremented")
 		}
 	}
-	for name := range counters {
-		if !allowedCounters[name] {
-			t.Fatalf("incremented counter %q is not in testdata/counters.txt. "+
-				"Please update counters_test.go to produce an entry for it.", name)
-		}
-	}
 }
 
 // Copied from https://go.googlesource.com/telemetry/+/5f08a0cbff3f/internal/telemetry/mode.go#122