Skip to content

Commit 97abc5d

Browse files
h9jiangh9jiang
committed
internal/config: add vscode-go/tool/usage counter
The default padding is derived from gopls releases and does not suit vscgo. The vscgo follow versioning of vscode-go extension. Introduce a "module field" in config.txt, both vscgo and govulncheck's program path is not the same as module path. Command "go list -m --versions" will return empty when running against govulncheck and vscgo's program path. This fixes the issue where the upload config never get bumped for govulncheck. Luckily, the latest release of govulncheck is 1.1.4. For golang/go#73036 Change-Id: I2e2ab4990b8471a9edbbed46cecc2d6e5846c025 Reviewed-on: https://go-review.googlesource.com/c/telemetry/+/661055 Reviewed-by: Robert Findley <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]>
1 parent c00fa4d commit 97abc5d

File tree

6 files changed

+171
-188
lines changed

6 files changed

+171
-188
lines changed

‎config/config.json

+73-165
Original file line numberDiff line numberDiff line change
@@ -438,6 +438,70 @@
438438
}
439439
]
440440
},
441+
{
442+
"Name": "github.com/golang/vscode-go/vscgo",
443+
"Versions": [
444+
"v0.47.0",
445+
"v0.47.1",
446+
"v0.47.2",
447+
"v0.47.3",
448+
"v0.47.4",
449+
"v0.47.5",
450+
"v0.47.6",
451+
"v0.48.0",
452+
"v0.48.1",
453+
"v0.48.2",
454+
"v0.48.3",
455+
"v0.48.4",
456+
"v0.48.5",
457+
"v0.49.0",
458+
"v0.49.1",
459+
"v0.49.2",
460+
"v0.49.3",
461+
"v0.49.4",
462+
"v0.49.5",
463+
"v0.50.0",
464+
"v0.50.1",
465+
"v0.50.2",
466+
"v0.50.3",
467+
"v0.50.4",
468+
"v0.50.5",
469+
"v0.51.0",
470+
"v0.51.1",
471+
"v0.51.2",
472+
"v0.51.3",
473+
"v0.51.4",
474+
"v1.0.0",
475+
"v1.0.1",
476+
"v1.0.2",
477+
"v1.0.3",
478+
"v1.0.4",
479+
"v1.0.5",
480+
"v1.1.0",
481+
"v1.1.1",
482+
"v1.1.2",
483+
"v1.1.3",
484+
"v1.1.4",
485+
"v1.1.5",
486+
"v1.2.0",
487+
"v1.2.1",
488+
"v1.2.2",
489+
"v1.2.3",
490+
"v1.2.4",
491+
"v1.2.5",
492+
"v1.3.0",
493+
"v1.3.1",
494+
"v1.3.2",
495+
"v1.3.3",
496+
"v1.3.4"
497+
],
498+
"Counters": [
499+
{
500+
"Name": "vscode-go/tool/usage:{gotests,gomodifytags,goplay}",
501+
"Rate": 1
502+
}
503+
]
504+
},
441505
{
442506
"Name": "golang.org/x/tools/gopls",
443507
"Versions": [
@@ -721,186 +785,30 @@
721785
{
722786
"Name": "golang.org/x/vuln/cmd/govulncheck",
723787
"Versions": [
724-
"v0.0.1-pre.1",
725-
"v0.0.1-pre.2",
726-
"v0.0.1-pre.3",
727-
"v0.0.1-pre.4",
728-
"v0.0.1",
729-
"v0.0.2-pre.1",
730-
"v0.0.2-pre.2",
731-
"v0.0.2-pre.3",
732-
"v0.0.2-pre.4",
733-
"v0.0.2",
734-
"v0.0.3-pre.1",
735-
"v0.0.3-pre.2",
736-
"v0.0.3-pre.3",
737-
"v0.0.3-pre.4",
738-
"v0.0.3",
739-
"v0.0.4-pre.1",
740-
"v0.0.4-pre.2",
741-
"v0.0.4-pre.3",
742-
"v0.0.4-pre.4",
743-
"v0.0.4",
744-
"v0.0.5-pre.1",
745-
"v0.0.5-pre.2",
746-
"v0.0.5-pre.3",
747-
"v0.0.5-pre.4",
748-
"v0.0.5",
749-
"v0.0.6-pre.1",
750-
"v0.0.6-pre.2",
751-
"v0.0.6-pre.3",
752-
"v0.0.6-pre.4",
753-
"v0.0.6",
754-
"v0.1.0-pre.1",
755-
"v0.1.0-pre.2",
756-
"v0.1.0-pre.3",
757-
"v0.1.0-pre.4",
758788
"v0.1.0",
759-
"v0.1.1-pre.1",
760-
"v0.1.1-pre.2",
761-
"v0.1.1-pre.3",
762-
"v0.1.1-pre.4",
763-
"v0.1.1",
764-
"v0.1.2-pre.1",
765-
"v0.1.2-pre.2",
766-
"v0.1.2-pre.3",
767-
"v0.1.2-pre.4",
768-
"v0.1.2",
769-
"v0.1.3-pre.1",
770-
"v0.1.3-pre.2",
771-
"v0.1.3-pre.3",
772-
"v0.1.3-pre.4",
773-
"v0.1.3",
774-
"v0.1.4-pre.1",
775-
"v0.1.4-pre.2",
776-
"v0.1.4-pre.3",
777-
"v0.1.4-pre.4",
778-
"v0.1.4",
779-
"v0.1.5-pre.1",
780-
"v0.1.5-pre.2",
781-
"v0.1.5-pre.3",
782-
"v0.1.5-pre.4",
783-
"v0.1.5",
784-
"v0.2.0-pre.1",
785-
"v0.2.0-pre.2",
786-
"v0.2.0-pre.3",
787-
"v0.2.0-pre.4",
788789
"v0.2.0",
789-
"v0.2.1-pre.1",
790-
"v0.2.1-pre.2",
791-
"v0.2.1-pre.3",
792-
"v0.2.1-pre.4",
793-
"v0.2.1",
794-
"v0.2.2-pre.1",
795-
"v0.2.2-pre.2",
796-
"v0.2.2-pre.3",
797-
"v0.2.2-pre.4",
798-
"v0.2.2",
799-
"v0.2.3-pre.1",
800-
"v0.2.3-pre.2",
801-
"v0.2.3-pre.3",
802-
"v0.2.3-pre.4",
803-
"v0.2.3",
804-
"v0.2.4-pre.1",
805-
"v0.2.4-pre.2",
806-
"v0.2.4-pre.3",
807-
"v0.2.4-pre.4",
808-
"v0.2.4",
809-
"v0.3.0-pre.1",
810-
"v0.3.0-pre.2",
811-
"v0.3.0-pre.3",
812-
"v0.3.0-pre.4",
813-
"v0.3.0",
814-
"v0.3.1-pre.1",
815-
"v0.3.1-pre.2",
816-
"v0.3.1-pre.3",
817-
"v0.3.1-pre.4",
818-
"v0.3.1",
819-
"v0.3.2-pre.1",
820-
"v0.3.2-pre.2",
821-
"v0.3.2-pre.3",
822-
"v0.3.2-pre.4",
823-
"v0.3.2",
824-
"v0.3.3-pre.1",
825-
"v0.3.3-pre.2",
826-
"v0.3.3-pre.3",
827-
"v0.3.3-pre.4",
828-
"v0.3.3",
829-
"v1.0.0-pre.1",
830-
"v1.0.0-pre.2",
831-
"v1.0.0-pre.3",
832-
"v1.0.0-pre.4",
833790
"v1.0.0",
834-
"v1.0.1-pre.1",
835-
"v1.0.1-pre.2",
836-
"v1.0.1-pre.3",
837-
"v1.0.1-pre.4",
838791
"v1.0.1",
839-
"v1.0.2-pre.1",
840-
"v1.0.2-pre.2",
841-
"v1.0.2-pre.3",
842-
"v1.0.2-pre.4",
843792
"v1.0.2",
844-
"v1.0.3-pre.1",
845-
"v1.0.3-pre.2",
846-
"v1.0.3-pre.3",
847-
"v1.0.3-pre.4",
848793
"v1.0.3",
849-
"v1.0.4-pre.1",
850-
"v1.0.4-pre.2",
851-
"v1.0.4-pre.3",
852-
"v1.0.4-pre.4",
853794
"v1.0.4",
854-
"v1.0.5-pre.1",
855-
"v1.0.5-pre.2",
856-
"v1.0.5-pre.3",
857-
"v1.0.5-pre.4",
858-
"v1.0.5",
859-
"v1.1.0-pre.1",
860-
"v1.1.0-pre.2",
861-
"v1.1.0-pre.3",
862-
"v1.1.0-pre.4",
863795
"v1.1.0",
864-
"v1.1.1-pre.1",
865-
"v1.1.1-pre.2",
866-
"v1.1.1-pre.3",
867-
"v1.1.1-pre.4",
868796
"v1.1.1",
869-
"v1.1.2-pre.1",
870-
"v1.1.2-pre.2",
871-
"v1.1.2-pre.3",
872-
"v1.1.2-pre.4",
873797
"v1.1.2",
874-
"v1.1.3-pre.1",
875-
"v1.1.3-pre.2",
876-
"v1.1.3-pre.3",
877-
"v1.1.3-pre.4",
878798
"v1.1.3",
879-
"v1.1.4-pre.1",
880-
"v1.1.4-pre.2",
881-
"v1.1.4-pre.3",
882-
"v1.1.4-pre.4",
883799
"v1.1.4",
884-
"v1.2.0-pre.1",
885-
"v1.2.0-pre.2",
886-
"v1.2.0-pre.3",
887-
"v1.2.0-pre.4",
800+
"v1.1.5",
801+
"v1.1.6",
802+
"v1.1.7",
803+
"v1.1.8",
888804
"v1.2.0",
889-
"v1.2.1-pre.1",
890-
"v1.2.1-pre.2",
891-
"v1.2.1-pre.3",
892-
"v1.2.1-pre.4",
893805
"v1.2.1",
894-
"v1.2.2-pre.1",
895-
"v1.2.2-pre.2",
896-
"v1.2.2-pre.3",
897-
"v1.2.2-pre.4",
898806
"v1.2.2",
899-
"v1.2.3-pre.1",
900-
"v1.2.3-pre.2",
901-
"v1.2.3-pre.3",
902-
"v1.2.3-pre.4",
903-
"v1.2.3"
807+
"v1.2.3",
808+
"v2.0.0",
809+
"v2.0.1",
810+
"v2.0.2",
811+
"v2.0.3"
904812
],
905813
"Counters": [
906814
{

‎internal/chartconfig/chartconfig.go

+4
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
// Multiple issues may be provided by including additional 'issue:' lines.
3838
// - type: the chart type. Currently only partition and stack are supported.
3939
// - program: the package path of the program for which this chart applies.
40+
// - module: the module path of the program for version lookup.
4041
// - version: (optional) the first program version for which this chart
4142
// applies. Must be a valid semver value. If not provided, the chart
4243
// applies to all versions.
@@ -90,6 +91,7 @@
9091
// type: partition
9192
// issue: https://go.dev/issue/12345
9293
// program: golang.org/x/tools/gopls
94+
// module: golang.org/x/tools/gopls
9395
// version: v1.0.0
9496
//
9597
// ---
@@ -102,6 +104,7 @@
102104
// issue: https://go.dev/23456 # increase stack depth
103105
// type: stack
104106
// program: golang.org/x/tools/gopls
107+
// module: golang.org/x/tools/gopls
105108
// depth: 10
106109
//
107110
// [config.txt]: https://go.googlesource.com/telemetry/+/refs/heads/master/internal/chartconfig/config.txt
@@ -118,6 +121,7 @@ type ChartConfig struct {
118121
Issue []string
119122
Type string
120123
Program string
124+
Module string
121125
Counter string
122126
Depth int
123127
Error float64 // TODO(rfindley) is Error still useful?

0 commit comments

Comments
 (0)