Skip to content

Commit c6f8485

Browse files
committed
cmd/govulncheck: record scan mode telemetry
Add the new `govulncheck/mode:{source,binary,convert,query,extract}` counter, and collect the crash report `crash/crash`. Change-Id: I53dfa5640bc38ae2a0d55302a3bd637c57a984e9 Reviewed-on: https://go-review.googlesource.com/c/vuln/+/588255 LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Zvonimir Pavlinovic <zpavlinovic@google.com>
1 parent 486fd23 commit c6f8485

File tree

4 files changed

+15
-1
lines changed

4 files changed

+15
-1
lines changed

cmd/govulncheck/main.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,13 @@ import (
99
"fmt"
1010
"os"
1111

12+
"golang.org/x/telemetry"
1213
"golang.org/x/vuln/scan"
1314
)
1415

1516
func main() {
17+
telemetry.Start(telemetry.Config{ReportCrashes: true})
18+
1619
ctx := context.Background()
1720

1821
cmd := scan.Command(ctx, os.Args[1:]...)

go.mod

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@ require (
77
github.com/google/go-cmp v0.6.0
88
golang.org/x/mod v0.17.0
99
golang.org/x/sync v0.7.0
10+
golang.org/x/telemetry v0.0.0-20240522233618-39ace7a40ae7
1011
golang.org/x/tools v0.21.1-0.20240514024235-59d9797072e7
1112
)
1213

13-
require github.com/google/renameio v0.1.0 // indirect
14+
require (
15+
github.com/google/renameio v0.1.0 // indirect
16+
golang.org/x/sys v0.20.0 // indirect
17+
)

go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,9 @@ golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
99
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
1010
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
1111
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
12+
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
13+
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
14+
golang.org/x/telemetry v0.0.0-20240522233618-39ace7a40ae7 h1:FemxDzfMUcK2f3YY4H+05K9CDzbSVr2+q/JKN45pey0=
15+
golang.org/x/telemetry v0.0.0-20240522233618-39ace7a40ae7/go.mod h1:pRgIJT+bRLFKnoM1ldnzKoxTIn14Yxz928LQRYYgIN0=
1216
golang.org/x/tools v0.21.1-0.20240514024235-59d9797072e7 h1:DnP3aRQn/r68glNGB8/7+3iE77jA+YZZCxpfIXx2MdA=
1317
golang.org/x/tools v0.21.1-0.20240514024235-59d9797072e7/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=

internal/scan/run.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"strings"
1616
"time"
1717

18+
"golang.org/x/telemetry/counter"
1819
"golang.org/x/vuln/internal/client"
1920
"golang.org/x/vuln/internal/govulncheck"
2021
"golang.org/x/vuln/internal/sarif"
@@ -51,6 +52,8 @@ func RunGovulncheck(ctx context.Context, env []string, r io.Reader, stdout io.Wr
5152
return err
5253
}
5354

55+
counter.Inc(fmt.Sprintf("govulncheck/mode:%s", cfg.ScanMode))
56+
5457
switch cfg.ScanMode {
5558
case govulncheck.ScanModeSource:
5659
dir := filepath.FromSlash(cfg.dir)

0 commit comments

Comments
 (0)