diff --git a/pkg/telemetry/report.go b/pkg/telemetry/report.go index 440ceae827..1d3af67294 100644 --- a/pkg/telemetry/report.go +++ b/pkg/telemetry/report.go @@ -45,9 +45,12 @@ func TiUPMeta() *TiUPInfo { return &TiUPInfo{ TiUPVersion: os.Getenv(localdata.EnvNameTiUPVersion), ComponentVersion: version.NewTiUPVersion().SemVer(), - GitCommit: version.NewTiUPBuildInfo().GitHash, + GitRef: version.GitRef, + GitCommit: version.GitHash, + VerName: version.TiUPVerName, Os: runtime.GOOS, Arch: runtime.GOARCH, + Go: runtime.Version(), } } diff --git a/pkg/telemetry/report.pb.go b/pkg/telemetry/report.pb.go index 157cc82ae6..f188ae04c8 100644 --- a/pkg/telemetry/report.pb.go +++ b/pkg/telemetry/report.pb.go @@ -391,9 +391,12 @@ func (m *PlaygroundReport) GetExitCode() int32 { type TiUPInfo struct { TiUPVersion string `protobuf:"bytes,1,opt,name=TiUPVersion,proto3" json:"TiUPVersion,omitempty"` ComponentVersion string `protobuf:"bytes,2,opt,name=ComponentVersion,proto3" json:"ComponentVersion,omitempty"` - GitCommit string `protobuf:"bytes,3,opt,name=GitCommit,proto3" json:"GitCommit,omitempty"` - Os string `protobuf:"bytes,4,opt,name=os,proto3" json:"os,omitempty"` - Arch string `protobuf:"bytes,5,opt,name=arch,proto3" json:"arch,omitempty"` + GitRef string `protobuf:"bytes,3,opt,name=GitRef,proto3" json:"GitRef,omitempty"` + GitCommit string `protobuf:"bytes,4,opt,name=GitCommit,proto3" json:"GitCommit,omitempty"` + VerName string `protobuf:"bytes,5,opt,name=VerName,proto3" json:"VerName,omitempty"` + Os string `protobuf:"bytes,6,opt,name=os,proto3" json:"os,omitempty"` + Arch string `protobuf:"bytes,7,opt,name=arch,proto3" json:"arch,omitempty"` + Go string `protobuf:"bytes,8,opt,name=go,proto3" json:"go,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -446,6 +449,13 @@ func (m *TiUPInfo) GetComponentVersion() string { return "" } +func (m *TiUPInfo) GetGitRef() string { + if m != nil { + return m.GitRef + } + return "" +} + func (m *TiUPInfo) GetGitCommit() string { if m != nil { return m.GitCommit @@ -453,6 +463,13 @@ func (m *TiUPInfo) GetGitCommit() string { return "" } +func (m *TiUPInfo) GetVerName() string { + if m != nil { + return m.VerName + } + return "" +} + func (m *TiUPInfo) GetOs() string { if m != nil { return m.Os @@ -467,6 +484,13 @@ func (m *TiUPInfo) GetArch() string { return "" } +func (m *TiUPInfo) GetGo() string { + if m != nil { + return m.Go + } + return "" +} + type NodeInfo struct { NodeId string `protobuf:"bytes,1,opt,name=node_id,json=nodeId,proto3" json:"node_id,omitempty"` Hardware HardwareInfo `protobuf:"bytes,6,opt,name=hardware,proto3" json:"hardware"` @@ -822,58 +846,60 @@ func init() { func init() { proto.RegisterFile("report.proto", fileDescriptor_3eedb623aa6ca98c) } var fileDescriptor_3eedb623aa6ca98c = []byte{ - // 809 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xcb, 0x8e, 0x1b, 0x45, - 0x14, 0x9d, 0x6e, 0x3f, 0xfb, 0xc6, 0x19, 0x39, 0xc5, 0x40, 0x5a, 0x09, 0x32, 0x56, 0x23, 0xc1, - 0x90, 0x88, 0xe1, 0xbd, 0x60, 0x91, 0xcd, 0x38, 0x12, 0xf1, 0x62, 0x60, 0x54, 0xc4, 0xd9, 0x5a, - 0x95, 0xee, 0xb2, 0xa7, 0x94, 0xaa, 0xae, 0x56, 0x75, 0xb5, 0xf1, 0xe4, 0x07, 0xf8, 0x02, 0x24, - 0xc4, 0x0f, 0xb0, 0xe1, 0x43, 0x22, 0x56, 0x7c, 0x01, 0x42, 0x83, 0xf8, 0x0f, 0x54, 0x8f, 0x6e, - 0xb7, 0x1d, 0x16, 0x2c, 0xb2, 0xab, 0x73, 0xea, 0xdc, 0xea, 0x7b, 0x4f, 0xdd, 0x5b, 0x0d, 0x23, - 0x45, 0x0b, 0xa9, 0xf4, 0x59, 0xa1, 0xa4, 0x96, 0x28, 0xd2, 0x94, 0x53, 0x41, 0xb5, 0xba, 0xbe, - 0x77, 0xb2, 0x96, 0x6b, 0x69, 0xd9, 0x4f, 0xcc, 0xca, 0x09, 0x92, 0x7f, 0x42, 0xe8, 0x63, 0x1b, - 0x81, 0x1e, 0xc0, 0x98, 0xe5, 0xa5, 0x26, 0x9c, 0x13, 0xcd, 0x64, 0xbe, 0x58, 0xcc, 0x1f, 0xc7, - 0xc1, 0x34, 0x38, 0x8d, 0xf0, 0x6b, 0x3c, 0x7a, 0x17, 0x22, 0xba, 0xa1, 0xb9, 0xb6, 0xa2, 0xd0, - 0x8a, 0x76, 0x04, 0xfa, 0x14, 0x4e, 0x2c, 0x58, 0x56, 0x39, 0xdb, 0x2e, 0x35, 0x13, 0xb4, 0xd4, - 0x44, 0x14, 0x71, 0x67, 0x1a, 0x9c, 0x76, 0x30, 0x72, 0xc2, 0x9c, 0x6d, 0x9f, 0xd6, 0x3b, 0xe8, - 0x63, 0x18, 0x6c, 0xa8, 0x2a, 0x99, 0xcc, 0xe3, 0xee, 0x34, 0x38, 0xbd, 0xf5, 0xf9, 0x5b, 0x67, - 0x4d, 0xe6, 0x67, 0x4f, 0xd9, 0xe2, 0x72, 0x9e, 0xaf, 0x24, 0xae, 0x35, 0xe8, 0x21, 0x74, 0x35, - 0xab, 0x8a, 0xb8, 0x67, 0xb5, 0x6f, 0x1f, 0x68, 0x5d, 0x3d, 0x4f, 0x8e, 0xb0, 0x15, 0xa1, 0x2f, - 0x61, 0x90, 0xf2, 0xaa, 0xd4, 0x54, 0xc5, 0x7d, 0xab, 0x8f, 0x5b, 0xfa, 0x99, 0xdb, 0x69, 0x42, - 0x6a, 0x29, 0x7a, 0x04, 0x50, 0x70, 0x72, 0xbd, 0x56, 0xb2, 0xca, 0xb3, 0x78, 0x60, 0x03, 0xef, - 0xb7, 0x02, 0x2f, 0x9b, 0xcd, 0x26, 0xb6, 0x15, 0x70, 0x7e, 0x0c, 0x23, 0x67, 0x41, 0x46, 0x35, - 0x61, 0x3c, 0xf9, 0x35, 0x00, 0xd8, 0xe5, 0x86, 0x62, 0x18, 0xa4, 0x52, 0x08, 0x92, 0x67, 0xde, - 0xe2, 0x1a, 0xa2, 0x31, 0x74, 0x34, 0x59, 0x7b, 0x4f, 0xcd, 0x12, 0x3d, 0x84, 0x3b, 0x9a, 0xbc, - 0xa0, 0x4b, 0xc1, 0x38, 0x67, 0x25, 0x4d, 0x65, 0x9e, 0x95, 0xd6, 0xca, 0x2e, 0x1e, 0x9b, 0x8d, - 0x8b, 0x16, 0x8f, 0xee, 0x43, 0x44, 0xb7, 0x4c, 0x2f, 0x53, 0x99, 0x51, 0x6b, 0x65, 0x0f, 0x0f, - 0x0d, 0x31, 0x93, 0x19, 0x45, 0xef, 0xc3, 0xed, 0xb4, 0x2a, 0xb5, 0x14, 0x4b, 0xc1, 0x94, 0x92, - 0xca, 0xfa, 0x37, 0xc4, 0x23, 0x47, 0x5e, 0x58, 0x2e, 0xf9, 0x3d, 0x80, 0xdb, 0x7b, 0xae, 0xa0, - 0x63, 0x08, 0x9b, 0x56, 0x08, 0xe7, 0x8f, 0xdb, 0xc9, 0x87, 0xfb, 0xc9, 0xbf, 0xb9, 0x54, 0xef, - 0xc1, 0x50, 0xcb, 0x42, 0x72, 0xb9, 0xbe, 0xb6, 0x59, 0x46, 0xb8, 0xc1, 0xe8, 0x23, 0xe8, 0xe5, - 0x32, 0xa3, 0x65, 0xdc, 0x9f, 0x76, 0x0e, 0x5a, 0xe5, 0x5b, 0x99, 0x51, 0xdb, 0x2a, 0x4e, 0x91, - 0x6c, 0x61, 0x7c, 0x78, 0x51, 0x7b, 0x47, 0x07, 0x07, 0x47, 0xff, 0x67, 0x01, 0xe1, 0xff, 0x29, - 0xa0, 0xb3, 0x5f, 0x40, 0xf2, 0x4b, 0x00, 0xc3, 0xba, 0x71, 0xd1, 0x14, 0x6e, 0x99, 0xf5, 0x33, - 0xdf, 0xe2, 0xee, 0xab, 0x6d, 0xca, 0x0c, 0xdf, 0x4c, 0x8a, 0x42, 0xe6, 0x34, 0xd7, 0xb5, 0xcc, - 0x99, 0xfb, 0x1a, 0x6f, 0x86, 0xef, 0x1b, 0xf3, 0x15, 0x21, 0x98, 0xb6, 0xdf, 0x8d, 0xf0, 0x8e, - 0x30, 0xb7, 0x25, 0x4b, 0xeb, 0x67, 0x84, 0x43, 0x59, 0x22, 0x04, 0x5d, 0xa2, 0xd2, 0x2b, 0xef, - 0xa2, 0x5d, 0x27, 0x3f, 0x06, 0x30, 0xac, 0xad, 0x42, 0x77, 0x61, 0x60, 0xcc, 0x5a, 0xb2, 0xba, - 0x17, 0xfb, 0x06, 0xce, 0x33, 0xf4, 0x35, 0x0c, 0xaf, 0x88, 0xca, 0x7e, 0x20, 0x8a, 0xfa, 0xc9, - 0xb9, 0xdb, 0xb2, 0xfa, 0x89, 0xdf, 0x32, 0x67, 0x9c, 0x77, 0x5f, 0xfd, 0xf9, 0xde, 0x11, 0x6e, - 0xe4, 0xe8, 0x43, 0x9b, 0x84, 0x9b, 0x9a, 0x3b, 0xad, 0xa0, 0xef, 0xbe, 0x6f, 0xc9, 0x43, 0x59, - 0x26, 0x3f, 0x05, 0x30, 0x98, 0x5d, 0x2e, 0x6c, 0x22, 0xef, 0x40, 0x3f, 0xaf, 0x44, 0x5a, 0x54, - 0x36, 0x8f, 0x1e, 0xf6, 0xc8, 0xf4, 0x5b, 0x29, 0xd3, 0x17, 0x54, 0xbb, 0xab, 0xe8, 0xe1, 0x1a, - 0xa2, 0x13, 0xe8, 0xa5, 0x52, 0xd1, 0xd2, 0xbb, 0xef, 0x80, 0x61, 0x85, 0xcc, 0x28, 0xf7, 0x26, - 0x38, 0x60, 0x06, 0x4b, 0x5c, 0xbd, 0xb4, 0x36, 0x84, 0xd8, 0x2c, 0x4d, 0x23, 0xac, 0x28, 0xd1, - 0x95, 0xf2, 0xad, 0x14, 0xe1, 0x06, 0x27, 0xbf, 0x05, 0x30, 0x6a, 0x57, 0x88, 0x3e, 0x80, 0xe3, - 0x0d, 0x53, 0xba, 0x22, 0x9c, 0xbd, 0xb4, 0xef, 0xa0, 0x37, 0xeb, 0x80, 0x45, 0x0f, 0xa0, 0x63, - 0x2a, 0x08, 0x6d, 0xe9, 0xa8, 0xfd, 0xd2, 0xb8, 0x2a, 0x7d, 0xed, 0x46, 0x64, 0xb4, 0x82, 0x0a, - 0x9b, 0xfc, 0xbe, 0xf6, 0x82, 0x8a, 0xb6, 0x56, 0x50, 0x61, 0x2e, 0x9d, 0x4b, 0x92, 0x91, 0xcd, - 0xfa, 0xb3, 0xaf, 0x6c, 0x61, 0x21, 0xde, 0x11, 0xc9, 0x33, 0xe8, 0x3b, 0x6b, 0x8d, 0x89, 0x2b, - 0x22, 0x18, 0xaf, 0x7b, 0xdb, 0x23, 0x53, 0x6c, 0xc1, 0x89, 0x5e, 0x49, 0x25, 0x7c, 0x63, 0x35, - 0xd8, 0x18, 0x5c, 0xbf, 0xbe, 0xae, 0x9d, 0x6a, 0x98, 0x3c, 0x82, 0x81, 0xcf, 0xc5, 0xb8, 0xaa, - 0xa5, 0x26, 0xdc, 0x9e, 0xdb, 0xc5, 0x0e, 0x98, 0xb4, 0xc8, 0x86, 0x30, 0x4e, 0x9e, 0x73, 0xea, - 0x07, 0x65, 0x47, 0x9c, 0x8f, 0x5f, 0xdd, 0x4c, 0x82, 0x3f, 0x6e, 0x26, 0xc1, 0x5f, 0x37, 0x93, - 0xe0, 0xe7, 0xbf, 0x27, 0x47, 0xcf, 0xfb, 0xf6, 0xb7, 0xf3, 0xc5, 0xbf, 0x01, 0x00, 0x00, 0xff, - 0xff, 0x13, 0xb7, 0x04, 0x8e, 0xa7, 0x06, 0x00, 0x00, + // 842 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xcd, 0x6e, 0xdc, 0x36, + 0x10, 0xb6, 0xb4, 0xbf, 0x9a, 0x38, 0xc6, 0x86, 0x75, 0x13, 0x21, 0x29, 0xdc, 0x85, 0x0a, 0xb4, + 0x6e, 0x82, 0xba, 0xff, 0x87, 0x1e, 0x72, 0xb1, 0x03, 0x24, 0x3e, 0x38, 0x35, 0xd8, 0xd8, 0xd7, + 0x05, 0x23, 0x71, 0xd7, 0x44, 0x44, 0x8d, 0x40, 0x51, 0xdb, 0x75, 0x5e, 0xa0, 0x4f, 0x50, 0xa0, + 0x6f, 0xd0, 0x4b, 0x1f, 0x24, 0xe8, 0xa9, 0x0f, 0x50, 0x14, 0x85, 0x8b, 0xbe, 0x47, 0xc1, 0x1f, + 0x69, 0xb5, 0x9b, 0x1e, 0x7a, 0xe8, 0x8d, 0xdf, 0xc7, 0x6f, 0xa8, 0x99, 0x8f, 0x33, 0x14, 0xec, + 0x2a, 0x5e, 0xa2, 0xd2, 0x47, 0xa5, 0x42, 0x8d, 0x24, 0xd2, 0x3c, 0xe7, 0x92, 0x6b, 0x75, 0x7d, + 0x7f, 0x7f, 0x81, 0x0b, 0xb4, 0xec, 0xa7, 0x66, 0xe5, 0x04, 0xc9, 0xdf, 0x21, 0x0c, 0xa9, 0x8d, + 0x20, 0x0f, 0x61, 0x22, 0x8a, 0x4a, 0xb3, 0x3c, 0x67, 0x5a, 0x60, 0x71, 0x71, 0x71, 0xfa, 0x24, + 0x0e, 0xa6, 0xc1, 0x61, 0x44, 0xdf, 0xe2, 0xc9, 0x7b, 0x10, 0xf1, 0x25, 0x2f, 0xb4, 0x15, 0x85, + 0x56, 0xb4, 0x26, 0xc8, 0x67, 0xb0, 0x6f, 0xc1, 0xac, 0x2e, 0xc4, 0x6a, 0xa6, 0x85, 0xe4, 0x95, + 0x66, 0xb2, 0x8c, 0x7b, 0xd3, 0xe0, 0xb0, 0x47, 0x89, 0x13, 0x16, 0x62, 0xf5, 0xa2, 0xd9, 0x21, + 0x9f, 0xc0, 0x68, 0xc9, 0x55, 0x25, 0xb0, 0x88, 0xfb, 0xd3, 0xe0, 0xf0, 0xd6, 0x17, 0xef, 0x1c, + 0xb5, 0x99, 0x1f, 0xbd, 0x10, 0x17, 0xe7, 0xa7, 0xc5, 0x1c, 0x69, 0xa3, 0x21, 0x8f, 0xa0, 0xaf, + 0x45, 0x5d, 0xc6, 0x03, 0xab, 0x7d, 0x77, 0x4b, 0xeb, 0xea, 0x79, 0xb6, 0x43, 0xad, 0x88, 0x7c, + 0x05, 0xa3, 0x34, 0xaf, 0x2b, 0xcd, 0x55, 0x3c, 0xb4, 0xfa, 0xb8, 0xa3, 0x3f, 0x71, 0x3b, 0x6d, + 0x48, 0x23, 0x25, 0x8f, 0x01, 0xca, 0x9c, 0x5d, 0x2f, 0x14, 0xd6, 0x45, 0x16, 0x8f, 0x6c, 0xe0, + 0x83, 0x4e, 0xe0, 0x79, 0xbb, 0xd9, 0xc6, 0x76, 0x02, 0x8e, 0xf7, 0x60, 0xd7, 0x59, 0x90, 0x71, + 0xcd, 0x44, 0x9e, 0xfc, 0x1c, 0x00, 0xac, 0x73, 0x23, 0x31, 0x8c, 0x52, 0x94, 0x92, 0x15, 0x99, + 0xb7, 0xb8, 0x81, 0x64, 0x02, 0x3d, 0xcd, 0x16, 0xde, 0x53, 0xb3, 0x24, 0x8f, 0xe0, 0x8e, 0x66, + 0xaf, 0xf8, 0x4c, 0x8a, 0x3c, 0x17, 0x15, 0x4f, 0xb1, 0xc8, 0x2a, 0x6b, 0x65, 0x9f, 0x4e, 0xcc, + 0xc6, 0x59, 0x87, 0x27, 0x0f, 0x20, 0xe2, 0x2b, 0xa1, 0x67, 0x29, 0x66, 0xdc, 0x5a, 0x39, 0xa0, + 0x63, 0x43, 0x9c, 0x60, 0xc6, 0xc9, 0x07, 0x70, 0x3b, 0xad, 0x2b, 0x8d, 0x72, 0x26, 0x85, 0x52, + 0xa8, 0xac, 0x7f, 0x63, 0xba, 0xeb, 0xc8, 0x33, 0xcb, 0x25, 0xbf, 0x06, 0x70, 0x7b, 0xc3, 0x15, + 0xb2, 0x07, 0x61, 0xdb, 0x0a, 0xe1, 0xe9, 0x93, 0x6e, 0xf2, 0xe1, 0x66, 0xf2, 0xff, 0x5f, 0xaa, + 0xf7, 0x61, 0xac, 0xb1, 0xc4, 0x1c, 0x17, 0xd7, 0x36, 0xcb, 0x88, 0xb6, 0x98, 0x7c, 0x0c, 0x83, + 0x02, 0x33, 0x5e, 0xc5, 0xc3, 0x69, 0x6f, 0xab, 0x55, 0x9e, 0x63, 0xc6, 0x6d, 0xab, 0x38, 0x45, + 0xb2, 0x82, 0xc9, 0xf6, 0x45, 0x6d, 0x1c, 0x1d, 0x6c, 0x1d, 0xfd, 0xaf, 0x05, 0x84, 0xff, 0xa5, + 0x80, 0xde, 0x66, 0x01, 0xc9, 0xef, 0x01, 0x8c, 0x9b, 0xc6, 0x25, 0x53, 0xb8, 0x65, 0xd6, 0x97, + 0xbe, 0xc5, 0xdd, 0x57, 0xbb, 0x94, 0x19, 0xbe, 0x13, 0x94, 0x25, 0x16, 0xbc, 0xd0, 0x8d, 0xcc, + 0x99, 0xfb, 0x16, 0x4f, 0xee, 0xc2, 0xf0, 0xa9, 0xd0, 0x94, 0xcf, 0xed, 0x47, 0x23, 0xea, 0x91, + 0x19, 0xca, 0xa7, 0xe6, 0xeb, 0x52, 0x0a, 0x6d, 0x0d, 0x8d, 0xe8, 0x9a, 0x30, 0xb7, 0x76, 0xc9, + 0xd5, 0x73, 0x26, 0xb9, 0x37, 0xb4, 0x81, 0xe6, 0x7e, 0xb1, 0xb2, 0xb3, 0x11, 0xd1, 0x10, 0x2b, + 0x42, 0xa0, 0xcf, 0x54, 0x7a, 0x65, 0x9b, 0x3e, 0xa2, 0x76, 0x6d, 0x34, 0x0b, 0x8c, 0xc7, 0x4e, + 0xb3, 0xc0, 0xe4, 0x87, 0x00, 0xc6, 0x8d, 0xd9, 0xe4, 0x1e, 0x8c, 0x8c, 0xdd, 0x33, 0xd1, 0x74, + 0xf3, 0xd0, 0xc0, 0xd3, 0x8c, 0x7c, 0x03, 0xe3, 0x2b, 0xa6, 0xb2, 0xef, 0x99, 0xe2, 0x7e, 0xf6, + 0xee, 0x75, 0x2e, 0xeb, 0x99, 0xdf, 0x32, 0x67, 0x1c, 0xf7, 0xdf, 0xfc, 0xf1, 0xfe, 0x0e, 0x6d, + 0xe5, 0xe4, 0x23, 0x9b, 0x94, 0x9b, 0xbb, 0x3b, 0x9d, 0xa0, 0x6f, 0xbf, 0xeb, 0xc8, 0x43, 0xac, + 0x92, 0x1f, 0x03, 0x18, 0x9d, 0x9c, 0x5f, 0xd8, 0x44, 0xee, 0xc2, 0xb0, 0xa8, 0x65, 0x5a, 0xd6, + 0x36, 0x8f, 0x01, 0xf5, 0xc8, 0xd4, 0x5e, 0x61, 0xfa, 0x8a, 0x6b, 0x77, 0x99, 0x03, 0xda, 0x40, + 0xb2, 0x0f, 0x83, 0x14, 0x15, 0xaf, 0xfc, 0xfd, 0x39, 0x60, 0x58, 0x89, 0x19, 0xcf, 0xbd, 0x8b, + 0x0e, 0x98, 0xd1, 0x94, 0x57, 0xaf, 0xad, 0x7b, 0x21, 0x35, 0x4b, 0xd3, 0x4a, 0x73, 0xce, 0x74, + 0xad, 0x7c, 0x33, 0x46, 0xb4, 0xc5, 0xc9, 0x2f, 0x01, 0xec, 0x76, 0x2b, 0x24, 0x1f, 0xc2, 0xde, + 0x52, 0x28, 0x5d, 0xb3, 0x5c, 0xbc, 0xb6, 0x2f, 0xa9, 0x37, 0x6b, 0x8b, 0x25, 0x0f, 0xa1, 0x67, + 0x2a, 0x08, 0x6d, 0xe9, 0xa4, 0xfb, 0x56, 0xb9, 0x2a, 0x7d, 0xed, 0x46, 0x64, 0xb4, 0x92, 0x4b, + 0x9b, 0xfc, 0xa6, 0xf6, 0x8c, 0xcb, 0xae, 0x56, 0x72, 0x69, 0xda, 0x23, 0x47, 0x96, 0xb1, 0xe5, + 0xe2, 0xf3, 0xaf, 0x6d, 0x61, 0x21, 0x5d, 0x13, 0xc9, 0x25, 0x0c, 0x9d, 0xb5, 0xc6, 0xc4, 0x39, + 0x93, 0x22, 0x6f, 0xa6, 0xc3, 0x23, 0x53, 0x6c, 0x99, 0x33, 0x3d, 0x47, 0x25, 0x7d, 0x6b, 0xb6, + 0xd8, 0x18, 0xdc, 0xbc, 0xdf, 0xae, 0x27, 0x1b, 0x98, 0x3c, 0x86, 0x91, 0xcf, 0xc5, 0xb8, 0xaa, + 0x51, 0xb3, 0xdc, 0x9e, 0xdb, 0xa7, 0x0e, 0x98, 0xb4, 0xd8, 0x92, 0x89, 0x9c, 0xbd, 0xcc, 0xb9, + 0x1f, 0xb5, 0x35, 0x71, 0x3c, 0x79, 0x73, 0x73, 0x10, 0xfc, 0x76, 0x73, 0x10, 0xfc, 0x79, 0x73, + 0x10, 0xfc, 0xf4, 0xd7, 0xc1, 0xce, 0xcb, 0xa1, 0xfd, 0x71, 0x7d, 0xf9, 0x4f, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x73, 0x63, 0x75, 0xc2, 0xe9, 0x06, 0x00, 0x00, } func (m *Report) Marshal() (dAtA []byte, err error) { @@ -1207,25 +1233,46 @@ func (m *TiUPInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + if len(m.Go) > 0 { + i -= len(m.Go) + copy(dAtA[i:], m.Go) + i = encodeVarintReport(dAtA, i, uint64(len(m.Go))) + i-- + dAtA[i] = 0x42 + } if len(m.Arch) > 0 { i -= len(m.Arch) copy(dAtA[i:], m.Arch) i = encodeVarintReport(dAtA, i, uint64(len(m.Arch))) i-- - dAtA[i] = 0x2a + dAtA[i] = 0x3a } if len(m.Os) > 0 { i -= len(m.Os) copy(dAtA[i:], m.Os) i = encodeVarintReport(dAtA, i, uint64(len(m.Os))) i-- - dAtA[i] = 0x22 + dAtA[i] = 0x32 + } + if len(m.VerName) > 0 { + i -= len(m.VerName) + copy(dAtA[i:], m.VerName) + i = encodeVarintReport(dAtA, i, uint64(len(m.VerName))) + i-- + dAtA[i] = 0x2a } if len(m.GitCommit) > 0 { i -= len(m.GitCommit) copy(dAtA[i:], m.GitCommit) i = encodeVarintReport(dAtA, i, uint64(len(m.GitCommit))) i-- + dAtA[i] = 0x22 + } + if len(m.GitRef) > 0 { + i -= len(m.GitRef) + copy(dAtA[i:], m.GitRef) + i = encodeVarintReport(dAtA, i, uint64(len(m.GitRef))) + i-- dAtA[i] = 0x1a } if len(m.ComponentVersion) > 0 { @@ -1686,10 +1733,18 @@ func (m *TiUPInfo) Size() (n int) { if l > 0 { n += 1 + l + sovReport(uint64(l)) } + l = len(m.GitRef) + if l > 0 { + n += 1 + l + sovReport(uint64(l)) + } l = len(m.GitCommit) if l > 0 { n += 1 + l + sovReport(uint64(l)) } + l = len(m.VerName) + if l > 0 { + n += 1 + l + sovReport(uint64(l)) + } l = len(m.Os) if l > 0 { n += 1 + l + sovReport(uint64(l)) @@ -1698,6 +1753,10 @@ func (m *TiUPInfo) Size() (n int) { if l > 0 { n += 1 + l + sovReport(uint64(l)) } + l = len(m.Go) + if l > 0 { + n += 1 + l + sovReport(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -2711,6 +2770,38 @@ func (m *TiUPInfo) Unmarshal(dAtA []byte) error { m.ComponentVersion = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field GitRef", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowReport + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthReport + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthReport + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.GitRef = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field GitCommit", wireType) } @@ -2742,7 +2833,39 @@ func (m *TiUPInfo) Unmarshal(dAtA []byte) error { } m.GitCommit = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 4: + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field VerName", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowReport + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthReport + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthReport + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.VerName = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 6: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Os", wireType) } @@ -2774,7 +2897,7 @@ func (m *TiUPInfo) Unmarshal(dAtA []byte) error { } m.Os = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 5: + case 7: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Arch", wireType) } @@ -2806,6 +2929,38 @@ func (m *TiUPInfo) Unmarshal(dAtA []byte) error { } m.Arch = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 8: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Go", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowReport + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthReport + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthReport + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Go = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipReport(dAtA[iNdEx:]) diff --git a/pkg/telemetry/report.proto b/pkg/telemetry/report.proto index d1ee66b4a1..03c79af949 100644 --- a/pkg/telemetry/report.proto +++ b/pkg/telemetry/report.proto @@ -44,9 +44,12 @@ message PlaygroundReport { message TiUPInfo { string TiUPVersion = 1; string ComponentVersion = 2; - string GitCommit = 3; - string os = 4; - string arch = 5; + string GitRef = 3; + string GitCommit = 4; + string VerName = 5; + string os = 6; + string arch = 7; + string go = 8; } message NodeInfo {