internal/telemetry: use go/version.IsValid instead of checking for "X:"

This simplification is viable as the module requires Go 1.23.0 by now.

Also add a test case for Go development versions after CL 668015.

For golang/go#68579.

Change-Id: I8e78d3cce927437537622e1cc06d64157c46b056
Reviewed-on: https://go-review.googlesource.com/c/telemetry/+/669396
LUCI-TryBot-Result: Go LUCI <[email protected]>
Reviewed-by: Dmitri Shuralyov <[email protected]>
Reviewed-by: Cherry Mui <[email protected]>
Auto-Submit: Dmitri Shuralyov <[email protected]>
Reviewed-by: Michael Matloob <[email protected]>

Author: dmitshur

go.mod

@@ -2,9 +2,8 @@ module golang.org/x/telemetry
 
 go 1.23.0
 
-require golang.org/x/mod v0.24.0
-
 require (
+	golang.org/x/mod v0.24.0
 	golang.org/x/sync v0.14.0
 	golang.org/x/sys v0.33.0
 )

internal/telemetry/proginfo.go

@@ -5,6 +5,7 @@
 package telemetry
 
 import (
+	"go/version"
 	"os"
 	"path/filepath"
 	"runtime/debug"
@@ -26,9 +27,7 @@ func IsToolchainProgram(progPath string) bool {
 // special characters.
 func ProgramInfo(info *debug.BuildInfo) (goVers, progPath, progVers string) {
 	goVers = info.GoVersion
-	// TODO(matloob): Use go/version.IsValid instead of checking for X: once the telemetry
-	// module can be upgraded to require Go 1.22.
-	if strings.Contains(goVers, "devel") || strings.Contains(goVers, "-") || strings.Contains(goVers, "X:") {
+	if strings.Contains(goVers, "devel") || strings.Contains(goVers, "-") || !version.IsValid(goVers) {
 		goVers = "devel"
 	}
 

internal/telemetry/proginfo_test.go

@@ -83,6 +83,10 @@ func TestProgramInfo_GoVersion(t *testing.T) {
 			"go1.23.0",
 			"go1.23.0",
 		},
+		{
+			"go1.25-devel_9ce47e66e8 Wed Mar 26 03:48:50 2025 -0700",
+			"devel",
+		},
 		{
 			"devel go1.24-0d6bb68f48 Thu Jul 25 23:27:41 2024 -0600",
 			"devel",