diff --git a/config/proto/config.pb.go b/config/proto/config.pb.go index 65d64688..0b75f812 100644 --- a/config/proto/config.pb.go +++ b/config/proto/config.pb.go @@ -3,15 +3,17 @@ package proto -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import proto1 "github.com/google/cloudprober/probes/proto" -import proto3 "github.com/google/cloudprober/servers/proto" -import proto2 "github.com/google/cloudprober/surfacers/proto" -import proto6 "github.com/google/cloudprober/targets/proto" -import proto4 "github.com/google/cloudprober/targets/rds/server/proto" -import proto5 "github.com/google/cloudprober/targets/rtc/rtcreporter/proto" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + proto1 "github.com/google/cloudprober/probes/proto" + proto3 "github.com/google/cloudprober/servers/proto" + proto2 "github.com/google/cloudprober/surfacers/proto" + proto6 "github.com/google/cloudprober/targets/proto" + proto4 "github.com/google/cloudprober/targets/rds/server/proto" + proto5 "github.com/google/cloudprober/targets/rtc/rtcreporter/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -22,7 +24,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type ProberConfig struct { // Probes to run. @@ -92,16 +94,17 @@ func (m *ProberConfig) Reset() { *m = ProberConfig{} } func (m *ProberConfig) String() string { return proto.CompactTextString(m) } func (*ProberConfig) ProtoMessage() {} func (*ProberConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_config_ca6e82066619ee99, []int{0} + return fileDescriptor_e33be1efa3c08d0b, []int{0} } + func (m *ProberConfig) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProberConfig.Unmarshal(m, b) } func (m *ProberConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ProberConfig.Marshal(b, m, deterministic) } -func (dst *ProberConfig) XXX_Merge(src proto.Message) { - xxx_messageInfo_ProberConfig.Merge(dst, src) +func (m *ProberConfig) XXX_Merge(src proto.Message) { + xxx_messageInfo_ProberConfig.Merge(m, src) } func (m *ProberConfig) XXX_Size() int { return xxx_messageInfo_ProberConfig.Size(m) @@ -219,10 +222,10 @@ func init() { } func init() { - proto.RegisterFile("github.com/google/cloudprober/config/proto/config.proto", fileDescriptor_config_ca6e82066619ee99) + proto.RegisterFile("github.com/google/cloudprober/config/proto/config.proto", fileDescriptor_e33be1efa3c08d0b) } -var fileDescriptor_config_ca6e82066619ee99 = []byte{ +var fileDescriptor_e33be1efa3c08d0b = []byte{ // 529 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xdd, 0x6f, 0xd3, 0x3c, 0x14, 0xc6, 0xd5, 0x77, 0xeb, 0xcb, 0xea, 0xb2, 0x0d, 0xcc, 0x87, 0xa2, 0x81, 0x50, 0x81, 0x9b, diff --git a/examples/extensions/myprober/myprobe/myprobe.pb.go b/examples/extensions/myprober/myprobe/myprobe.pb.go index f43ba227..675a1d90 100644 --- a/examples/extensions/myprober/myprobe/myprobe.pb.go +++ b/examples/extensions/myprober/myprobe/myprobe.pb.go @@ -3,10 +3,12 @@ package myprobe -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import proto1 "github.com/google/cloudprober/probes/proto" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + proto1 "github.com/google/cloudprober/probes/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -17,7 +19,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // Redis operation type ProbeConf_Op int32 @@ -33,6 +35,7 @@ var ProbeConf_Op_name = map[int32]string{ 1: "SET", 2: "DELETE", } + var ProbeConf_Op_value = map[string]int32{ "GET": 0, "SET": 1, @@ -44,9 +47,11 @@ func (x ProbeConf_Op) Enum() *ProbeConf_Op { *p = x return p } + func (x ProbeConf_Op) String() string { return proto.EnumName(ProbeConf_Op_name, int32(x)) } + func (x *ProbeConf_Op) UnmarshalJSON(data []byte) error { value, err := proto.UnmarshalJSONEnum(ProbeConf_Op_value, data, "ProbeConf_Op") if err != nil { @@ -55,8 +60,9 @@ func (x *ProbeConf_Op) UnmarshalJSON(data []byte) error { *x = ProbeConf_Op(value) return nil } + func (ProbeConf_Op) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_myprobe_d7e15d891b47d6e2, []int{0, 0} + return fileDescriptor_2b356579a2ec0dd9, []int{0, 0} } type ProbeConf struct { @@ -73,16 +79,17 @@ func (m *ProbeConf) Reset() { *m = ProbeConf{} } func (m *ProbeConf) String() string { return proto.CompactTextString(m) } func (*ProbeConf) ProtoMessage() {} func (*ProbeConf) Descriptor() ([]byte, []int) { - return fileDescriptor_myprobe_d7e15d891b47d6e2, []int{0} + return fileDescriptor_2b356579a2ec0dd9, []int{0} } + func (m *ProbeConf) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProbeConf.Unmarshal(m, b) } func (m *ProbeConf) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ProbeConf.Marshal(b, m, deterministic) } -func (dst *ProbeConf) XXX_Merge(src proto.Message) { - xxx_messageInfo_ProbeConf.Merge(dst, src) +func (m *ProbeConf) XXX_Merge(src proto.Message) { + xxx_messageInfo_ProbeConf.Merge(m, src) } func (m *ProbeConf) XXX_Size() int { return xxx_messageInfo_ProbeConf.Size(m) @@ -119,21 +126,21 @@ var E_RedisProbe = &proto.ExtensionDesc{ ExtensionType: (*ProbeConf)(nil), Field: 200, Name: "myprober.redis_probe", - Tag: "bytes,200,opt,name=redis_probe,json=redisProbe", + Tag: "bytes,200,opt,name=redis_probe", Filename: "github.com/google/cloudprober/examples/extensions/myprober/myprobe/myprobe.proto", } func init() { - proto.RegisterType((*ProbeConf)(nil), "myprober.ProbeConf") proto.RegisterEnum("myprober.ProbeConf_Op", ProbeConf_Op_name, ProbeConf_Op_value) + proto.RegisterType((*ProbeConf)(nil), "myprober.ProbeConf") proto.RegisterExtension(E_RedisProbe) } func init() { - proto.RegisterFile("github.com/google/cloudprober/examples/extensions/myprober/myprobe/myprobe.proto", fileDescriptor_myprobe_d7e15d891b47d6e2) + proto.RegisterFile("github.com/google/cloudprober/examples/extensions/myprober/myprobe/myprobe.proto", fileDescriptor_2b356579a2ec0dd9) } -var fileDescriptor_myprobe_d7e15d891b47d6e2 = []byte{ +var fileDescriptor_2b356579a2ec0dd9 = []byte{ // 258 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x8e, 0x4d, 0x4b, 0xc3, 0x40, 0x10, 0x86, 0xcd, 0x06, 0x3f, 0x32, 0x05, 0x09, 0xab, 0x48, 0x10, 0x0f, 0x21, 0x07, 0xc9, 0x69, diff --git a/message/proto/message.pb.go b/message/proto/message.pb.go index e3604e90..9c6d0c7e 100644 --- a/message/proto/message.pb.go +++ b/message/proto/message.pb.go @@ -3,9 +3,11 @@ package proto -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type DataNode_Type int32 @@ -31,6 +33,7 @@ var DataNode_Type_name = map[int32]string{ 1: "CLIENT", 2: "SERVER", } + var DataNode_Type_value = map[string]int32{ "UNKNOWN": 0, "CLIENT": 1, @@ -42,9 +45,11 @@ func (x DataNode_Type) Enum() *DataNode_Type { *p = x return p } + func (x DataNode_Type) String() string { return proto.EnumName(DataNode_Type_name, int32(x)) } + func (x *DataNode_Type) UnmarshalJSON(data []byte) error { value, err := proto.UnmarshalJSONEnum(DataNode_Type_value, data, "DataNode_Type") if err != nil { @@ -53,8 +58,9 @@ func (x *DataNode_Type) UnmarshalJSON(data []byte) error { *x = DataNode_Type(value) return nil } + func (DataNode_Type) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_message_d8a5391d8035e69c, []int{1, 0} + return fileDescriptor_fa2fcc833ce07832, []int{1, 0} } // Constants defines constants with default values. @@ -69,16 +75,17 @@ func (m *Constants) Reset() { *m = Constants{} } func (m *Constants) String() string { return proto.CompactTextString(m) } func (*Constants) ProtoMessage() {} func (*Constants) Descriptor() ([]byte, []int) { - return fileDescriptor_message_d8a5391d8035e69c, []int{0} + return fileDescriptor_fa2fcc833ce07832, []int{0} } + func (m *Constants) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Constants.Unmarshal(m, b) } func (m *Constants) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Constants.Marshal(b, m, deterministic) } -func (dst *Constants) XXX_Merge(src proto.Message) { - xxx_messageInfo_Constants.Merge(dst, src) +func (m *Constants) XXX_Merge(src proto.Message) { + xxx_messageInfo_Constants.Merge(m, src) } func (m *Constants) XXX_Size() int { return xxx_messageInfo_Constants.Size(m) @@ -114,16 +121,17 @@ func (m *DataNode) Reset() { *m = DataNode{} } func (m *DataNode) String() string { return proto.CompactTextString(m) } func (*DataNode) ProtoMessage() {} func (*DataNode) Descriptor() ([]byte, []int) { - return fileDescriptor_message_d8a5391d8035e69c, []int{1} + return fileDescriptor_fa2fcc833ce07832, []int{1} } + func (m *DataNode) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DataNode.Unmarshal(m, b) } func (m *DataNode) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_DataNode.Marshal(b, m, deterministic) } -func (dst *DataNode) XXX_Merge(src proto.Message) { - xxx_messageInfo_DataNode.Merge(dst, src) +func (m *DataNode) XXX_Merge(src proto.Message) { + xxx_messageInfo_DataNode.Merge(m, src) } func (m *DataNode) XXX_Size() int { return xxx_messageInfo_DataNode.Size(m) @@ -184,16 +192,17 @@ func (m *Msg) Reset() { *m = Msg{} } func (m *Msg) String() string { return proto.CompactTextString(m) } func (*Msg) ProtoMessage() {} func (*Msg) Descriptor() ([]byte, []int) { - return fileDescriptor_message_d8a5391d8035e69c, []int{2} + return fileDescriptor_fa2fcc833ce07832, []int{2} } + func (m *Msg) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Msg.Unmarshal(m, b) } func (m *Msg) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Msg.Marshal(b, m, deterministic) } -func (dst *Msg) XXX_Merge(src proto.Message) { - xxx_messageInfo_Msg.Merge(dst, src) +func (m *Msg) XXX_Merge(src proto.Message) { + xxx_messageInfo_Msg.Merge(m, src) } func (m *Msg) XXX_Size() int { return xxx_messageInfo_Msg.Size(m) @@ -247,17 +256,17 @@ func (m *Msg) GetPad() []byte { } func init() { + proto.RegisterEnum("message.DataNode_Type", DataNode_Type_name, DataNode_Type_value) proto.RegisterType((*Constants)(nil), "message.Constants") proto.RegisterType((*DataNode)(nil), "message.DataNode") proto.RegisterType((*Msg)(nil), "message.Msg") - proto.RegisterEnum("message.DataNode_Type", DataNode_Type_name, DataNode_Type_value) } func init() { - proto.RegisterFile("github.com/google/cloudprober/message/proto/message.proto", fileDescriptor_message_d8a5391d8035e69c) + proto.RegisterFile("github.com/google/cloudprober/message/proto/message.proto", fileDescriptor_fa2fcc833ce07832) } -var fileDescriptor_message_d8a5391d8035e69c = []byte{ +var fileDescriptor_fa2fcc833ce07832 = []byte{ // 335 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x4f, 0x41, 0x6b, 0xea, 0x40, 0x18, 0x7c, 0x6b, 0xa2, 0x3e, 0x3f, 0x7d, 0xbe, 0xbc, 0xe5, 0x51, 0x72, 0x0c, 0x29, 0x52, 0xa1, diff --git a/metrics/proto/dist.pb.go b/metrics/proto/dist.pb.go index e94cf339..941f42a2 100644 --- a/metrics/proto/dist.pb.go +++ b/metrics/proto/dist.pb.go @@ -3,9 +3,11 @@ package proto -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // Dist defines a Distribution data type. type Dist struct { @@ -33,16 +35,17 @@ func (m *Dist) Reset() { *m = Dist{} } func (m *Dist) String() string { return proto.CompactTextString(m) } func (*Dist) ProtoMessage() {} func (*Dist) Descriptor() ([]byte, []int) { - return fileDescriptor_dist_4ea0c9d5cb515dca, []int{0} + return fileDescriptor_4fce5835355ca2b5, []int{0} } + func (m *Dist) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Dist.Unmarshal(m, b) } func (m *Dist) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Dist.Marshal(b, m, deterministic) } -func (dst *Dist) XXX_Merge(src proto.Message) { - xxx_messageInfo_Dist.Merge(dst, src) +func (m *Dist) XXX_Merge(src proto.Message) { + xxx_messageInfo_Dist.Merge(m, src) } func (m *Dist) XXX_Size() int { return xxx_messageInfo_Dist.Size(m) @@ -90,76 +93,14 @@ func (m *Dist) GetExponentialBuckets() *ExponentialBuckets { return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*Dist) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _Dist_OneofMarshaler, _Dist_OneofUnmarshaler, _Dist_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*Dist) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*Dist_ExplicitBuckets)(nil), (*Dist_ExponentialBuckets)(nil), } } -func _Dist_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*Dist) - // buckets - switch x := m.Buckets.(type) { - case *Dist_ExplicitBuckets: - b.EncodeVarint(1<<3 | proto.WireBytes) - b.EncodeStringBytes(x.ExplicitBuckets) - case *Dist_ExponentialBuckets: - b.EncodeVarint(2<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.ExponentialBuckets); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("Dist.Buckets has unexpected type %T", x) - } - return nil -} - -func _Dist_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*Dist) - switch tag { - case 1: // buckets.explicit_buckets - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Buckets = &Dist_ExplicitBuckets{x} - return true, err - case 2: // buckets.exponential_buckets - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(ExponentialBuckets) - err := b.DecodeMessage(msg) - m.Buckets = &Dist_ExponentialBuckets{msg} - return true, err - default: - return false, nil - } -} - -func _Dist_OneofSizer(msg proto.Message) (n int) { - m := msg.(*Dist) - // buckets - switch x := m.Buckets.(type) { - case *Dist_ExplicitBuckets: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.ExplicitBuckets))) - n += len(x.ExplicitBuckets) - case *Dist_ExponentialBuckets: - s := proto.Size(x.ExponentialBuckets) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - // ExponentialBucket defines a set of num_buckets+2 buckets: // bucket[0] covers (−Inf, 0) // bucket[1] covers [0, scale_factor) @@ -182,16 +123,17 @@ func (m *ExponentialBuckets) Reset() { *m = ExponentialBuckets{} } func (m *ExponentialBuckets) String() string { return proto.CompactTextString(m) } func (*ExponentialBuckets) ProtoMessage() {} func (*ExponentialBuckets) Descriptor() ([]byte, []int) { - return fileDescriptor_dist_4ea0c9d5cb515dca, []int{1} + return fileDescriptor_4fce5835355ca2b5, []int{1} } + func (m *ExponentialBuckets) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExponentialBuckets.Unmarshal(m, b) } func (m *ExponentialBuckets) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExponentialBuckets.Marshal(b, m, deterministic) } -func (dst *ExponentialBuckets) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExponentialBuckets.Merge(dst, src) +func (m *ExponentialBuckets) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExponentialBuckets.Merge(m, src) } func (m *ExponentialBuckets) XXX_Size() int { return xxx_messageInfo_ExponentialBuckets.Size(m) @@ -233,10 +175,10 @@ func init() { } func init() { - proto.RegisterFile("github.com/google/cloudprober/metrics/proto/dist.proto", fileDescriptor_dist_4ea0c9d5cb515dca) + proto.RegisterFile("github.com/google/cloudprober/metrics/proto/dist.proto", fileDescriptor_4fce5835355ca2b5) } -var fileDescriptor_dist_4ea0c9d5cb515dca = []byte{ +var fileDescriptor_4fce5835355ca2b5 = []byte{ // 245 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x8e, 0xc1, 0x4b, 0xc3, 0x30, 0x18, 0xc5, 0x97, 0x3a, 0x90, 0x7d, 0x53, 0x94, 0x0c, 0xc1, 0x63, 0x99, 0x82, 0x05, 0x21, 0xd1, diff --git a/prober/proto/service.pb.go b/prober/proto/service.pb.go index ea32e996..7e23fa1d 100644 --- a/prober/proto/service.pb.go +++ b/prober/proto/service.pb.go @@ -3,14 +3,15 @@ package proto -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import proto1 "github.com/google/cloudprober/probes/proto" - import ( - context "golang.org/x/net/context" + context "context" + fmt "fmt" + proto "github.com/golang/protobuf/proto" + proto1 "github.com/google/cloudprober/probes/proto" grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. @@ -22,7 +23,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type AddProbeRequest struct { ProbeConfig *proto1.ProbeDef `protobuf:"bytes,1,opt,name=probe_config,json=probeConfig" json:"probe_config,omitempty"` @@ -35,16 +36,17 @@ func (m *AddProbeRequest) Reset() { *m = AddProbeRequest{} } func (m *AddProbeRequest) String() string { return proto.CompactTextString(m) } func (*AddProbeRequest) ProtoMessage() {} func (*AddProbeRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_service_67f7cd072003f550, []int{0} + return fileDescriptor_8f3b8b8b1a64dfb2, []int{0} } + func (m *AddProbeRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AddProbeRequest.Unmarshal(m, b) } func (m *AddProbeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_AddProbeRequest.Marshal(b, m, deterministic) } -func (dst *AddProbeRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_AddProbeRequest.Merge(dst, src) +func (m *AddProbeRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_AddProbeRequest.Merge(m, src) } func (m *AddProbeRequest) XXX_Size() int { return xxx_messageInfo_AddProbeRequest.Size(m) @@ -72,16 +74,17 @@ func (m *AddProbeResponse) Reset() { *m = AddProbeResponse{} } func (m *AddProbeResponse) String() string { return proto.CompactTextString(m) } func (*AddProbeResponse) ProtoMessage() {} func (*AddProbeResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_service_67f7cd072003f550, []int{1} + return fileDescriptor_8f3b8b8b1a64dfb2, []int{1} } + func (m *AddProbeResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AddProbeResponse.Unmarshal(m, b) } func (m *AddProbeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_AddProbeResponse.Marshal(b, m, deterministic) } -func (dst *AddProbeResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_AddProbeResponse.Merge(dst, src) +func (m *AddProbeResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_AddProbeResponse.Merge(m, src) } func (m *AddProbeResponse) XXX_Size() int { return xxx_messageInfo_AddProbeResponse.Size(m) @@ -103,16 +106,17 @@ func (m *RemoveProbeRequest) Reset() { *m = RemoveProbeRequest{} } func (m *RemoveProbeRequest) String() string { return proto.CompactTextString(m) } func (*RemoveProbeRequest) ProtoMessage() {} func (*RemoveProbeRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_service_67f7cd072003f550, []int{2} + return fileDescriptor_8f3b8b8b1a64dfb2, []int{2} } + func (m *RemoveProbeRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RemoveProbeRequest.Unmarshal(m, b) } func (m *RemoveProbeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RemoveProbeRequest.Marshal(b, m, deterministic) } -func (dst *RemoveProbeRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_RemoveProbeRequest.Merge(dst, src) +func (m *RemoveProbeRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_RemoveProbeRequest.Merge(m, src) } func (m *RemoveProbeRequest) XXX_Size() int { return xxx_messageInfo_RemoveProbeRequest.Size(m) @@ -140,16 +144,17 @@ func (m *RemoveProbeResponse) Reset() { *m = RemoveProbeResponse{} } func (m *RemoveProbeResponse) String() string { return proto.CompactTextString(m) } func (*RemoveProbeResponse) ProtoMessage() {} func (*RemoveProbeResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_service_67f7cd072003f550, []int{3} + return fileDescriptor_8f3b8b8b1a64dfb2, []int{3} } + func (m *RemoveProbeResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RemoveProbeResponse.Unmarshal(m, b) } func (m *RemoveProbeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RemoveProbeResponse.Marshal(b, m, deterministic) } -func (dst *RemoveProbeResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_RemoveProbeResponse.Merge(dst, src) +func (m *RemoveProbeResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_RemoveProbeResponse.Merge(m, src) } func (m *RemoveProbeResponse) XXX_Size() int { return xxx_messageInfo_RemoveProbeResponse.Size(m) @@ -170,16 +175,17 @@ func (m *ListProbesRequest) Reset() { *m = ListProbesRequest{} } func (m *ListProbesRequest) String() string { return proto.CompactTextString(m) } func (*ListProbesRequest) ProtoMessage() {} func (*ListProbesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_service_67f7cd072003f550, []int{4} + return fileDescriptor_8f3b8b8b1a64dfb2, []int{4} } + func (m *ListProbesRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListProbesRequest.Unmarshal(m, b) } func (m *ListProbesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ListProbesRequest.Marshal(b, m, deterministic) } -func (dst *ListProbesRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ListProbesRequest.Merge(dst, src) +func (m *ListProbesRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ListProbesRequest.Merge(m, src) } func (m *ListProbesRequest) XXX_Size() int { return xxx_messageInfo_ListProbesRequest.Size(m) @@ -202,16 +208,17 @@ func (m *Probe) Reset() { *m = Probe{} } func (m *Probe) String() string { return proto.CompactTextString(m) } func (*Probe) ProtoMessage() {} func (*Probe) Descriptor() ([]byte, []int) { - return fileDescriptor_service_67f7cd072003f550, []int{5} + return fileDescriptor_8f3b8b8b1a64dfb2, []int{5} } + func (m *Probe) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Probe.Unmarshal(m, b) } func (m *Probe) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Probe.Marshal(b, m, deterministic) } -func (dst *Probe) XXX_Merge(src proto.Message) { - xxx_messageInfo_Probe.Merge(dst, src) +func (m *Probe) XXX_Merge(src proto.Message) { + xxx_messageInfo_Probe.Merge(m, src) } func (m *Probe) XXX_Size() int { return xxx_messageInfo_Probe.Size(m) @@ -247,16 +254,17 @@ func (m *ListProbesResponse) Reset() { *m = ListProbesResponse{} } func (m *ListProbesResponse) String() string { return proto.CompactTextString(m) } func (*ListProbesResponse) ProtoMessage() {} func (*ListProbesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_service_67f7cd072003f550, []int{6} + return fileDescriptor_8f3b8b8b1a64dfb2, []int{6} } + func (m *ListProbesResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListProbesResponse.Unmarshal(m, b) } func (m *ListProbesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ListProbesResponse.Marshal(b, m, deterministic) } -func (dst *ListProbesResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ListProbesResponse.Merge(dst, src) +func (m *ListProbesResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ListProbesResponse.Merge(m, src) } func (m *ListProbesResponse) XXX_Size() int { return xxx_messageInfo_ListProbesResponse.Size(m) @@ -284,6 +292,34 @@ func init() { proto.RegisterType((*ListProbesResponse)(nil), "cloudprober.ListProbesResponse") } +func init() { + proto.RegisterFile("github.com/google/cloudprober/prober/proto/service.proto", fileDescriptor_8f3b8b8b1a64dfb2) +} + +var fileDescriptor_8f3b8b8b1a64dfb2 = []byte{ + // 316 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0xdf, 0x4b, 0xfb, 0x30, + 0x14, 0xc5, 0xbf, 0xfd, 0xea, 0xc4, 0xdd, 0x08, 0xea, 0x1d, 0xc2, 0x28, 0xce, 0x8d, 0x3c, 0xed, + 0xa9, 0x85, 0x29, 0xe8, 0x93, 0x22, 0xf3, 0x45, 0x10, 0x7f, 0xe4, 0x1f, 0x90, 0xad, 0xbd, 0xab, + 0x85, 0xb5, 0x99, 0x4d, 0xbb, 0xff, 0x5e, 0x10, 0x93, 0xcc, 0x36, 0x8e, 0xc2, 0x9e, 0xda, 0xde, + 0x7b, 0xce, 0xe7, 0x24, 0xa7, 0x70, 0x93, 0xa4, 0xe5, 0x47, 0x35, 0x0f, 0x22, 0x99, 0x85, 0x89, + 0x94, 0xc9, 0x92, 0xc2, 0x68, 0x29, 0xab, 0x78, 0x55, 0xc8, 0x39, 0x15, 0x61, 0xfd, 0x28, 0x65, + 0xa8, 0xa8, 0x58, 0xa7, 0x11, 0x05, 0xfa, 0x0b, 0x59, 0x43, 0xe7, 0x5f, 0xef, 0x80, 0x51, 0x16, + 0x13, 0xc9, 0x7c, 0x91, 0x26, 0x86, 0xc2, 0x05, 0x1c, 0xdf, 0xc7, 0xf1, 0xeb, 0xcf, 0x5e, 0xd0, + 0x67, 0x45, 0xaa, 0xc4, 0x3b, 0x38, 0xd2, 0xfa, 0x77, 0x23, 0xec, 0x7b, 0x23, 0x6f, 0xcc, 0x26, + 0xe7, 0x41, 0x03, 0x18, 0x18, 0x60, 0xa0, 0x7d, 0x0f, 0xb4, 0x10, 0x4c, 0x0f, 0xa6, 0xda, 0xc0, + 0x11, 0x4e, 0x6a, 0xa6, 0x5a, 0xc9, 0x5c, 0x11, 0xbf, 0x04, 0x14, 0x94, 0xc9, 0x35, 0x39, 0x51, + 0x03, 0x00, 0x13, 0x95, 0xcf, 0x32, 0xd2, 0x41, 0x5d, 0xd1, 0xd5, 0x93, 0xe7, 0x59, 0x46, 0xfc, + 0x0c, 0x7a, 0x8e, 0xc9, 0xb2, 0x7a, 0x70, 0xfa, 0x94, 0xaa, 0x52, 0x0f, 0x95, 0x45, 0xf1, 0x37, + 0xe8, 0xe8, 0x01, 0x22, 0xec, 0x37, 0x68, 0xfa, 0x1d, 0xaf, 0xe0, 0xc0, 0x5e, 0xe6, 0xff, 0x0e, + 0x97, 0xb1, 0x5a, 0x7e, 0x0b, 0xd8, 0xcc, 0x31, 0xe9, 0x38, 0x86, 0x8e, 0x36, 0xf4, 0xbd, 0xd1, + 0xde, 0x98, 0x4d, 0xd0, 0x41, 0x99, 0x83, 0x1a, 0xc1, 0xe4, 0xcb, 0x03, 0x36, 0xad, 0x97, 0xf8, + 0x08, 0x87, 0x9b, 0x5e, 0xd0, 0x3d, 0xc1, 0x9f, 0x5f, 0xe0, 0x0f, 0x5a, 0xb6, 0xb6, 0x80, 0x7f, + 0x28, 0x80, 0x35, 0x9a, 0xc1, 0xa1, 0xa3, 0xdf, 0x2e, 0xda, 0x1f, 0xb5, 0x0b, 0x7e, 0x99, 0x2f, + 0x00, 0xf5, 0x75, 0xf1, 0xc2, 0x71, 0x6c, 0xf5, 0xed, 0x0f, 0x5b, 0xf7, 0x1b, 0xe0, 0x77, 0x00, + 0x00, 0x00, 0xff, 0xff, 0x80, 0x21, 0x7a, 0xe2, 0xdc, 0x02, 0x00, 0x00, +} + // Reference imports to suppress errors if they are not otherwise used. var _ context.Context var _ grpc.ClientConn @@ -351,6 +387,20 @@ type CloudproberServer interface { ListProbes(context.Context, *ListProbesRequest) (*ListProbesResponse, error) } +// UnimplementedCloudproberServer can be embedded to have forward compatible implementations. +type UnimplementedCloudproberServer struct { +} + +func (*UnimplementedCloudproberServer) AddProbe(ctx context.Context, req *AddProbeRequest) (*AddProbeResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method AddProbe not implemented") +} +func (*UnimplementedCloudproberServer) RemoveProbe(ctx context.Context, req *RemoveProbeRequest) (*RemoveProbeResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method RemoveProbe not implemented") +} +func (*UnimplementedCloudproberServer) ListProbes(ctx context.Context, req *ListProbesRequest) (*ListProbesResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ListProbes not implemented") +} + func RegisterCloudproberServer(s *grpc.Server, srv CloudproberServer) { s.RegisterService(&_Cloudprober_serviceDesc, srv) } @@ -429,31 +479,3 @@ var _Cloudprober_serviceDesc = grpc.ServiceDesc{ Streams: []grpc.StreamDesc{}, Metadata: "github.com/google/cloudprober/prober/proto/service.proto", } - -func init() { - proto.RegisterFile("github.com/google/cloudprober/prober/proto/service.proto", fileDescriptor_service_67f7cd072003f550) -} - -var fileDescriptor_service_67f7cd072003f550 = []byte{ - // 316 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0xdf, 0x4b, 0xfb, 0x30, - 0x14, 0xc5, 0xbf, 0xfd, 0xea, 0xc4, 0xdd, 0x08, 0xea, 0x1d, 0xc2, 0x28, 0xce, 0x8d, 0x3c, 0xed, - 0xa9, 0x85, 0x29, 0xe8, 0x93, 0x22, 0xf3, 0x45, 0x10, 0x7f, 0xe4, 0x1f, 0x90, 0xad, 0xbd, 0xab, - 0x85, 0xb5, 0x99, 0x4d, 0xbb, 0xff, 0x5e, 0x10, 0x93, 0xcc, 0x36, 0x8e, 0xc2, 0x9e, 0xda, 0xde, - 0x7b, 0xce, 0xe7, 0x24, 0xa7, 0x70, 0x93, 0xa4, 0xe5, 0x47, 0x35, 0x0f, 0x22, 0x99, 0x85, 0x89, - 0x94, 0xc9, 0x92, 0xc2, 0x68, 0x29, 0xab, 0x78, 0x55, 0xc8, 0x39, 0x15, 0x61, 0xfd, 0x28, 0x65, - 0xa8, 0xa8, 0x58, 0xa7, 0x11, 0x05, 0xfa, 0x0b, 0x59, 0x43, 0xe7, 0x5f, 0xef, 0x80, 0x51, 0x16, - 0x13, 0xc9, 0x7c, 0x91, 0x26, 0x86, 0xc2, 0x05, 0x1c, 0xdf, 0xc7, 0xf1, 0xeb, 0xcf, 0x5e, 0xd0, - 0x67, 0x45, 0xaa, 0xc4, 0x3b, 0x38, 0xd2, 0xfa, 0x77, 0x23, 0xec, 0x7b, 0x23, 0x6f, 0xcc, 0x26, - 0xe7, 0x41, 0x03, 0x18, 0x18, 0x60, 0xa0, 0x7d, 0x0f, 0xb4, 0x10, 0x4c, 0x0f, 0xa6, 0xda, 0xc0, - 0x11, 0x4e, 0x6a, 0xa6, 0x5a, 0xc9, 0x5c, 0x11, 0xbf, 0x04, 0x14, 0x94, 0xc9, 0x35, 0x39, 0x51, - 0x03, 0x00, 0x13, 0x95, 0xcf, 0x32, 0xd2, 0x41, 0x5d, 0xd1, 0xd5, 0x93, 0xe7, 0x59, 0x46, 0xfc, - 0x0c, 0x7a, 0x8e, 0xc9, 0xb2, 0x7a, 0x70, 0xfa, 0x94, 0xaa, 0x52, 0x0f, 0x95, 0x45, 0xf1, 0x37, - 0xe8, 0xe8, 0x01, 0x22, 0xec, 0x37, 0x68, 0xfa, 0x1d, 0xaf, 0xe0, 0xc0, 0x5e, 0xe6, 0xff, 0x0e, - 0x97, 0xb1, 0x5a, 0x7e, 0x0b, 0xd8, 0xcc, 0x31, 0xe9, 0x38, 0x86, 0x8e, 0x36, 0xf4, 0xbd, 0xd1, - 0xde, 0x98, 0x4d, 0xd0, 0x41, 0x99, 0x83, 0x1a, 0xc1, 0xe4, 0xcb, 0x03, 0x36, 0xad, 0x97, 0xf8, - 0x08, 0x87, 0x9b, 0x5e, 0xd0, 0x3d, 0xc1, 0x9f, 0x5f, 0xe0, 0x0f, 0x5a, 0xb6, 0xb6, 0x80, 0x7f, - 0x28, 0x80, 0x35, 0x9a, 0xc1, 0xa1, 0xa3, 0xdf, 0x2e, 0xda, 0x1f, 0xb5, 0x0b, 0x7e, 0x99, 0x2f, - 0x00, 0xf5, 0x75, 0xf1, 0xc2, 0x71, 0x6c, 0xf5, 0xed, 0x0f, 0x5b, 0xf7, 0x1b, 0xe0, 0x77, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x80, 0x21, 0x7a, 0xe2, 0xdc, 0x02, 0x00, 0x00, -} diff --git a/probes/dns/proto/config.pb.go b/probes/dns/proto/config.pb.go index af31840e..8d589a9b 100644 --- a/probes/dns/proto/config.pb.go +++ b/probes/dns/proto/config.pb.go @@ -3,9 +3,11 @@ package proto -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // DNS query types from https://en.wikipedia.org/wiki/List_of_DNS_record_types type QueryType int32 @@ -106,6 +108,7 @@ var QueryType_name = map[int32]string{ 32768: "TA", 32769: "DLV", } + var QueryType_value = map[string]int32{ "NONE": 0, "A": 1, @@ -154,9 +157,11 @@ func (x QueryType) Enum() *QueryType { *p = x return p } + func (x QueryType) String() string { return proto.EnumName(QueryType_name, int32(x)) } + func (x *QueryType) UnmarshalJSON(data []byte) error { value, err := proto.UnmarshalJSONEnum(QueryType_value, data, "QueryType") if err != nil { @@ -165,23 +170,14 @@ func (x *QueryType) UnmarshalJSON(data []byte) error { *x = QueryType(value) return nil } + func (QueryType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_config_23fd2d1a23468186, []int{0} + return fileDescriptor_31f4b71243c9f9dc, []int{0} } type ProbeConf struct { // Domain to use when making DNS queries ResolvedDomain *string `protobuf:"bytes,1,opt,name=resolved_domain,json=resolvedDomain,def=www.google.com." json:"resolved_domain,omitempty"` - // Export stats after these many milliseconds - // NOTE: Setting stats export interval using this field doesn't work anymore. - // This field will be removed after the release v0.10.3. To set - // stats_export_interval, please modify the outer probe configuration. - // Example: probe { - // type: DNS - // stats_export_interval_msec: 10000 - // dns_probe {} - // } - StatsExportIntervalMsec *int32 `protobuf:"varint,2,opt,name=stats_export_interval_msec,json=statsExportIntervalMsec,def=10000" json:"stats_export_interval_msec,omitempty"` // DNS Query Type QueryType *QueryType `protobuf:"varint,3,opt,name=query_type,json=queryType,enum=cloudprober.probes.dns.QueryType,def=15" json:"query_type,omitempty"` // Minimum number of answers expected. Default behavior is to return success @@ -196,16 +192,17 @@ func (m *ProbeConf) Reset() { *m = ProbeConf{} } func (m *ProbeConf) String() string { return proto.CompactTextString(m) } func (*ProbeConf) ProtoMessage() {} func (*ProbeConf) Descriptor() ([]byte, []int) { - return fileDescriptor_config_23fd2d1a23468186, []int{0} + return fileDescriptor_31f4b71243c9f9dc, []int{0} } + func (m *ProbeConf) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProbeConf.Unmarshal(m, b) } func (m *ProbeConf) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ProbeConf.Marshal(b, m, deterministic) } -func (dst *ProbeConf) XXX_Merge(src proto.Message) { - xxx_messageInfo_ProbeConf.Merge(dst, src) +func (m *ProbeConf) XXX_Merge(src proto.Message) { + xxx_messageInfo_ProbeConf.Merge(m, src) } func (m *ProbeConf) XXX_Size() int { return xxx_messageInfo_ProbeConf.Size(m) @@ -217,7 +214,6 @@ func (m *ProbeConf) XXX_DiscardUnknown() { var xxx_messageInfo_ProbeConf proto.InternalMessageInfo const Default_ProbeConf_ResolvedDomain string = "www.google.com." -const Default_ProbeConf_StatsExportIntervalMsec int32 = 10000 const Default_ProbeConf_QueryType QueryType = QueryType_MX const Default_ProbeConf_MinAnswers uint32 = 0 @@ -228,13 +224,6 @@ func (m *ProbeConf) GetResolvedDomain() string { return Default_ProbeConf_ResolvedDomain } -func (m *ProbeConf) GetStatsExportIntervalMsec() int32 { - if m != nil && m.StatsExportIntervalMsec != nil { - return *m.StatsExportIntervalMsec - } - return Default_ProbeConf_StatsExportIntervalMsec -} - func (m *ProbeConf) GetQueryType() QueryType { if m != nil && m.QueryType != nil { return *m.QueryType @@ -250,48 +239,46 @@ func (m *ProbeConf) GetMinAnswers() uint32 { } func init() { - proto.RegisterType((*ProbeConf)(nil), "cloudprober.probes.dns.ProbeConf") proto.RegisterEnum("cloudprober.probes.dns.QueryType", QueryType_name, QueryType_value) + proto.RegisterType((*ProbeConf)(nil), "cloudprober.probes.dns.ProbeConf") } func init() { - proto.RegisterFile("github.com/google/cloudprober/probes/dns/proto/config.proto", fileDescriptor_config_23fd2d1a23468186) + proto.RegisterFile("github.com/google/cloudprober/probes/dns/proto/config.proto", fileDescriptor_31f4b71243c9f9dc) } -var fileDescriptor_config_23fd2d1a23468186 = []byte{ - // 544 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xc1, 0x53, 0xd3, 0x40, - 0x14, 0xc6, 0x4d, 0x4a, 0x81, 0x2c, 0x08, 0xcf, 0x3d, 0x68, 0x75, 0x74, 0xa6, 0xa0, 0x8e, 0x1d, - 0xd4, 0x24, 0x80, 0x33, 0x3a, 0x45, 0x0f, 0x4b, 0x12, 0x20, 0x43, 0x9b, 0xc6, 0xdd, 0xc8, 0xd4, - 0x53, 0xa6, 0xb4, 0x4b, 0xcd, 0x4c, 0x9b, 0x94, 0x24, 0x50, 0x7b, 0x2b, 0xff, 0x8b, 0xff, 0xa1, - 0x27, 0x3d, 0x39, 0x6f, 0x0b, 0x8e, 0x07, 0x4f, 0xf9, 0xde, 0x7b, 0xbf, 0xef, 0x7d, 0x2f, 0x4b, - 0x0e, 0x86, 0x49, 0xf9, 0xed, 0xea, 0xdc, 0xec, 0x67, 0x63, 0x6b, 0x98, 0x65, 0xc3, 0x91, 0xb4, - 0xfa, 0xa3, 0xec, 0x6a, 0x30, 0xc9, 0xb3, 0x73, 0x99, 0x5b, 0xea, 0x53, 0x58, 0x83, 0xb4, 0x40, - 0x59, 0x66, 0x56, 0x3f, 0x4b, 0x2f, 0x92, 0xa1, 0xa9, 0x0a, 0xfa, 0xf0, 0x1f, 0xd4, 0x5c, 0xa0, - 0xe6, 0x20, 0x2d, 0xb6, 0x7f, 0x6a, 0xc4, 0x08, 0xb1, 0x74, 0xb2, 0xf4, 0x82, 0x7e, 0x20, 0x9b, - 0xb9, 0x2c, 0xb2, 0xd1, 0xb5, 0x1c, 0xc4, 0x83, 0x6c, 0xdc, 0x4b, 0xd2, 0x9a, 0x56, 0xd7, 0x1a, - 0x46, 0x73, 0x73, 0x3a, 0x9d, 0x9a, 0x8b, 0x50, 0xcc, 0x37, 0xf9, 0xc6, 0x1d, 0xe7, 0x2a, 0x8c, - 0x1e, 0x92, 0x27, 0x45, 0xd9, 0x2b, 0x8b, 0x58, 0x7e, 0x9f, 0x64, 0x79, 0x19, 0x27, 0x69, 0x29, - 0xf3, 0xeb, 0xde, 0x28, 0x1e, 0x17, 0xb2, 0x5f, 0xd3, 0xeb, 0x5a, 0xa3, 0xda, 0xac, 0xee, 0xda, - 0xb6, 0x6d, 0xf3, 0x47, 0x0a, 0xf4, 0x14, 0xe7, 0xdf, 0x62, 0xed, 0x42, 0xf6, 0xa9, 0x4b, 0xc8, - 0xe5, 0x95, 0xcc, 0x67, 0x71, 0x39, 0x9b, 0xc8, 0x5a, 0xa5, 0xae, 0x35, 0x36, 0xf6, 0xb6, 0xcc, - 0xff, 0x1f, 0x6e, 0x7e, 0x46, 0x32, 0x9a, 0x4d, 0x64, 0x53, 0x6f, 0x77, 0xb9, 0x71, 0x79, 0x57, - 0xd2, 0x6d, 0xb2, 0x36, 0x4e, 0xd2, 0xb8, 0x97, 0x16, 0x53, 0x99, 0x17, 0xb5, 0xa5, 0xba, 0xd6, - 0xb8, 0xdf, 0xd4, 0x6c, 0x4e, 0xc6, 0x49, 0xca, 0x16, 0xcd, 0x9d, 0x1f, 0x15, 0x62, 0xfc, 0x5d, - 0x40, 0x57, 0xc9, 0x52, 0xd0, 0x09, 0x3c, 0xb8, 0x47, 0xab, 0x44, 0x63, 0xa0, 0xd1, 0x65, 0xa2, - 0x07, 0x02, 0x74, 0x6a, 0x90, 0xaa, 0x13, 0xb0, 0xb6, 0x07, 0x55, 0xba, 0x42, 0x2a, 0xa2, 0xc3, - 0x60, 0x19, 0x45, 0x18, 0x71, 0x58, 0x47, 0xa8, 0xdd, 0x85, 0x4d, 0x6c, 0x44, 0xdd, 0x08, 0x00, - 0x1b, 0x3c, 0x84, 0x07, 0xe8, 0x62, 0x47, 0xc2, 0x3d, 0x04, 0xaa, 0x5c, 0xfe, 0x31, 0xd4, 0x50, - 0x9c, 0x7a, 0x5f, 0xe1, 0x31, 0x66, 0x31, 0xc6, 0x18, 0x3c, 0xc5, 0x56, 0xab, 0xe3, 0xc0, 0x33, - 0x05, 0xf1, 0x33, 0xd8, 0x42, 0x63, 0xc0, 0x70, 0xf9, 0x73, 0xdc, 0x75, 0xda, 0x85, 0x17, 0x88, - 0x3b, 0x1e, 0x8f, 0xe0, 0x25, 0x0e, 0x5d, 0x75, 0xcb, 0x2b, 0x34, 0xb0, 0xb0, 0x05, 0x3b, 0x48, - 0xb9, 0x02, 0x5e, 0xe3, 0x4c, 0x88, 0x93, 0xa3, 0x10, 0xde, 0xd0, 0x75, 0xb2, 0xea, 0x87, 0xc2, - 0x73, 0x30, 0xed, 0x2d, 0x0e, 0x38, 0xc7, 0x0b, 0x4c, 0xf5, 0x93, 0xc2, 0x73, 0xc0, 0xa2, 0x84, - 0x2c, 0xbb, 0x81, 0x40, 0xc0, 0x56, 0x5b, 0x4f, 0x1c, 0xdf, 0x85, 0x5d, 0x95, 0x2e, 0x3c, 0x67, - 0x1f, 0xf6, 0xe8, 0x06, 0x21, 0x4a, 0x86, 0x8c, 0xb3, 0x36, 0xec, 0xa3, 0x37, 0x6a, 0x09, 0x06, - 0xef, 0x30, 0xfa, 0xc4, 0x0f, 0xe1, 0x3d, 0x0a, 0xc7, 0x15, 0x70, 0x40, 0xd7, 0xc8, 0x8a, 0x73, - 0xbb, 0xee, 0x23, 0x1a, 0x3b, 0xa1, 0x17, 0x84, 0xc7, 0x21, 0xd6, 0x9f, 0xa8, 0x41, 0x96, 0x22, - 0x54, 0xbf, 0x34, 0x25, 0xf1, 0x92, 0xdf, 0x1a, 0x5d, 0x25, 0x95, 0x2f, 0xdc, 0x87, 0xb9, 0x8e, - 0xca, 0x61, 0x0c, 0x6e, 0x50, 0xe9, 0x11, 0x83, 0xf9, 0x1c, 0x1f, 0xbd, 0xe2, 0xb6, 0xce, 0xe0, - 0x66, 0xae, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0x3a, 0x00, 0x3c, 0x6c, 0xf2, 0x02, 0x00, 0x00, +var fileDescriptor_31f4b71243c9f9dc = []byte{ + // 497 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xc1, 0x6f, 0x12, 0x4f, + 0x14, 0xc7, 0x7f, 0xbb, 0x14, 0xca, 0xbe, 0xf6, 0x07, 0xcf, 0x39, 0x18, 0x4c, 0x34, 0xa1, 0x55, + 0x23, 0xa9, 0xba, 0x5b, 0x5b, 0x13, 0x0d, 0xd5, 0xc3, 0x38, 0xbb, 0x2d, 0xa4, 0xb0, 0x8c, 0x33, + 0x6b, 0x83, 0x27, 0xd2, 0xc2, 0x16, 0x49, 0x60, 0x97, 0xb2, 0x20, 0xe1, 0x46, 0xff, 0x17, 0xef, + 0xfe, 0x7d, 0x7a, 0x32, 0x6f, 0xb0, 0xc6, 0x83, 0xa7, 0xfd, 0xbe, 0xf7, 0x3e, 0xdf, 0xf7, 0x7d, + 0x3b, 0x70, 0x32, 0x1c, 0xcd, 0xbf, 0x2c, 0xae, 0xdc, 0x7e, 0x3a, 0xf1, 0x86, 0x69, 0x3a, 0x1c, + 0xc7, 0x5e, 0x7f, 0x9c, 0x2e, 0x06, 0xd3, 0x59, 0x7a, 0x15, 0xcf, 0x3c, 0xf3, 0xc9, 0xbc, 0x41, + 0x92, 0x91, 0x9c, 0xa7, 0x5e, 0x3f, 0x4d, 0xae, 0x47, 0x43, 0xd7, 0x14, 0xec, 0xfe, 0x5f, 0xa8, + 0xbb, 0x41, 0xdd, 0x41, 0x92, 0xed, 0x7f, 0xb7, 0xc0, 0x91, 0x54, 0x8a, 0x34, 0xb9, 0x66, 0x6f, + 0xa1, 0x3c, 0x8b, 0xb3, 0x74, 0xfc, 0x35, 0x1e, 0xf4, 0x06, 0xe9, 0xe4, 0x72, 0x94, 0x54, 0xac, + 0xaa, 0x55, 0x73, 0xea, 0xe5, 0xe5, 0x72, 0xe9, 0x6e, 0x42, 0x29, 0xdf, 0x55, 0xa5, 0x3b, 0xce, + 0x37, 0x18, 0xf3, 0x01, 0x6e, 0x16, 0xf1, 0x6c, 0xd5, 0x9b, 0xaf, 0xa6, 0x71, 0x25, 0x57, 0xb5, + 0x6a, 0xa5, 0xa3, 0x3d, 0xf7, 0xdf, 0xa1, 0xee, 0x47, 0x22, 0xa3, 0xd5, 0x34, 0xae, 0xdb, 0xed, + 0xae, 0x72, 0x6e, 0xee, 0x4a, 0xb6, 0x0f, 0x3b, 0x93, 0x51, 0xd2, 0xbb, 0x4c, 0xb2, 0x65, 0x3c, + 0xcb, 0x2a, 0x5b, 0x55, 0xab, 0xf6, 0x7f, 0xdd, 0x3a, 0x54, 0x30, 0x19, 0x25, 0x7c, 0xd3, 0x3c, + 0xf8, 0x96, 0x03, 0xe7, 0xcf, 0x02, 0x56, 0x84, 0xad, 0xb0, 0x13, 0x06, 0xf8, 0x1f, 0xcb, 0x83, + 0xc5, 0xd1, 0x62, 0x05, 0xb0, 0x43, 0x8d, 0x36, 0x73, 0x20, 0x2f, 0x42, 0xde, 0x0e, 0x30, 0xcf, + 0xb6, 0x21, 0xa7, 0x3b, 0x1c, 0x0b, 0x24, 0x64, 0xa4, 0x70, 0x97, 0xa0, 0x76, 0x17, 0xcb, 0xd4, + 0x88, 0xba, 0x11, 0x22, 0x35, 0x94, 0xc4, 0x7b, 0xe4, 0xe2, 0xa7, 0xda, 0xff, 0x80, 0xcc, 0xb8, + 0x9a, 0x67, 0x58, 0x21, 0x71, 0x1e, 0x7c, 0xc6, 0x07, 0x94, 0xc5, 0x39, 0xe7, 0xf8, 0x90, 0x5a, + 0xad, 0x8e, 0xc0, 0x47, 0x06, 0x52, 0x17, 0xb8, 0x47, 0xc6, 0x90, 0xd3, 0xf2, 0xc7, 0xb4, 0xeb, + 0xbc, 0x8b, 0x4f, 0x08, 0x17, 0x81, 0x8a, 0xf0, 0x29, 0x0d, 0x7d, 0x73, 0xcb, 0x33, 0x32, 0x70, + 0xd9, 0xc2, 0x03, 0xa2, 0x7c, 0x8d, 0xcf, 0x69, 0xa6, 0x75, 0xe3, 0x54, 0xe2, 0x0b, 0xb6, 0x0b, + 0xc5, 0xa6, 0xd4, 0x81, 0xa0, 0xb4, 0x97, 0x34, 0x50, 0x8a, 0x2e, 0x70, 0xcd, 0x4f, 0xea, 0x40, + 0xa0, 0xc7, 0x00, 0x0a, 0x7e, 0xa8, 0x09, 0x38, 0x34, 0x5b, 0x1b, 0xa2, 0xe9, 0xe3, 0x2b, 0x93, + 0xae, 0x03, 0x71, 0x8c, 0x47, 0xac, 0x04, 0x60, 0xa4, 0xe4, 0x8a, 0xb7, 0xf1, 0x98, 0xbc, 0x51, + 0x4b, 0x73, 0x7c, 0x4d, 0xd1, 0x8d, 0xa6, 0xc4, 0x37, 0x24, 0x84, 0xaf, 0xf1, 0x84, 0xed, 0xc0, + 0xb6, 0xf8, 0xbd, 0xee, 0x1d, 0x19, 0x3b, 0x32, 0x08, 0xe5, 0x99, 0xa4, 0xfa, 0x3d, 0x73, 0x60, + 0x2b, 0x22, 0xf5, 0xc3, 0x32, 0x92, 0x2e, 0xf9, 0x69, 0xb1, 0x22, 0xe4, 0x3e, 0xa9, 0x26, 0xae, + 0x6d, 0x52, 0x82, 0x73, 0xbc, 0x25, 0x65, 0x47, 0x1c, 0xd7, 0x6b, 0x7a, 0xf4, 0x9c, 0xdf, 0xba, + 0xc0, 0xdb, 0xb5, 0xfd, 0x2b, 0x00, 0x00, 0xff, 0xff, 0x6c, 0x5d, 0x98, 0xae, 0xae, 0x02, 0x00, + 0x00, } diff --git a/probes/external/proto/config.pb.go b/probes/external/proto/config.pb.go index 9ea506e9..8a5339fc 100644 --- a/probes/external/proto/config.pb.go +++ b/probes/external/proto/config.pb.go @@ -3,10 +3,12 @@ package proto -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import proto1 "github.com/google/cloudprober/metrics/proto" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + proto1 "github.com/google/cloudprober/metrics/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -17,7 +19,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // External probes support two mode: ONCE and SERVER. In ONCE mode, external // command is re-executed for each probe run, while in SERVER mode, command @@ -33,6 +35,7 @@ var ProbeConf_Mode_name = map[int32]string{ 0: "ONCE", 1: "SERVER", } + var ProbeConf_Mode_value = map[string]int32{ "ONCE": 0, "SERVER": 1, @@ -43,9 +46,11 @@ func (x ProbeConf_Mode) Enum() *ProbeConf_Mode { *p = x return p } + func (x ProbeConf_Mode) String() string { return proto.EnumName(ProbeConf_Mode_name, int32(x)) } + func (x *ProbeConf_Mode) UnmarshalJSON(data []byte) error { value, err := proto.UnmarshalJSONEnum(ProbeConf_Mode_value, data, "ProbeConf_Mode") if err != nil { @@ -54,8 +59,9 @@ func (x *ProbeConf_Mode) UnmarshalJSON(data []byte) error { *x = ProbeConf_Mode(value) return nil } + func (ProbeConf_Mode) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_config_b14d8908ad6b6463, []int{0, 0} + return fileDescriptor_8f0ffe99a845b10e, []int{0, 0} } // MetricsKind specifies whether to treat output metrics as GAUGE or @@ -74,6 +80,7 @@ var OutputMetricsOptions_MetricsKind_name = map[int32]string{ 1: "GAUGE", 2: "CUMULATIVE", } + var OutputMetricsOptions_MetricsKind_value = map[string]int32{ "UNDEFINED": 0, "GAUGE": 1, @@ -85,9 +92,11 @@ func (x OutputMetricsOptions_MetricsKind) Enum() *OutputMetricsOptions_MetricsKi *p = x return p } + func (x OutputMetricsOptions_MetricsKind) String() string { return proto.EnumName(OutputMetricsOptions_MetricsKind_name, int32(x)) } + func (x *OutputMetricsOptions_MetricsKind) UnmarshalJSON(data []byte) error { value, err := proto.UnmarshalJSONEnum(OutputMetricsOptions_MetricsKind_value, data, "OutputMetricsOptions_MetricsKind") if err != nil { @@ -96,8 +105,9 @@ func (x *OutputMetricsOptions_MetricsKind) UnmarshalJSON(data []byte) error { *x = OutputMetricsOptions_MetricsKind(value) return nil } + func (OutputMetricsOptions_MetricsKind) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_config_b14d8908ad6b6463, []int{1, 0} + return fileDescriptor_8f0ffe99a845b10e, []int{1, 0} } type ProbeConf struct { @@ -139,16 +149,17 @@ func (m *ProbeConf) Reset() { *m = ProbeConf{} } func (m *ProbeConf) String() string { return proto.CompactTextString(m) } func (*ProbeConf) ProtoMessage() {} func (*ProbeConf) Descriptor() ([]byte, []int) { - return fileDescriptor_config_b14d8908ad6b6463, []int{0} + return fileDescriptor_8f0ffe99a845b10e, []int{0} } + func (m *ProbeConf) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProbeConf.Unmarshal(m, b) } func (m *ProbeConf) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ProbeConf.Marshal(b, m, deterministic) } -func (dst *ProbeConf) XXX_Merge(src proto.Message) { - xxx_messageInfo_ProbeConf.Merge(dst, src) +func (m *ProbeConf) XXX_Merge(src proto.Message) { + xxx_messageInfo_ProbeConf.Merge(m, src) } func (m *ProbeConf) XXX_Size() int { return xxx_messageInfo_ProbeConf.Size(m) @@ -220,16 +231,17 @@ func (m *ProbeConf_Option) Reset() { *m = ProbeConf_Option{} } func (m *ProbeConf_Option) String() string { return proto.CompactTextString(m) } func (*ProbeConf_Option) ProtoMessage() {} func (*ProbeConf_Option) Descriptor() ([]byte, []int) { - return fileDescriptor_config_b14d8908ad6b6463, []int{0, 0} + return fileDescriptor_8f0ffe99a845b10e, []int{0, 0} } + func (m *ProbeConf_Option) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProbeConf_Option.Unmarshal(m, b) } func (m *ProbeConf_Option) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ProbeConf_Option.Marshal(b, m, deterministic) } -func (dst *ProbeConf_Option) XXX_Merge(src proto.Message) { - xxx_messageInfo_ProbeConf_Option.Merge(dst, src) +func (m *ProbeConf_Option) XXX_Merge(src proto.Message) { + xxx_messageInfo_ProbeConf_Option.Merge(m, src) } func (m *ProbeConf_Option) XXX_Size() int { return xxx_messageInfo_ProbeConf_Option.Size(m) @@ -287,16 +299,17 @@ func (m *OutputMetricsOptions) Reset() { *m = OutputMetricsOptions{} } func (m *OutputMetricsOptions) String() string { return proto.CompactTextString(m) } func (*OutputMetricsOptions) ProtoMessage() {} func (*OutputMetricsOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_config_b14d8908ad6b6463, []int{1} + return fileDescriptor_8f0ffe99a845b10e, []int{1} } + func (m *OutputMetricsOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OutputMetricsOptions.Unmarshal(m, b) } func (m *OutputMetricsOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_OutputMetricsOptions.Marshal(b, m, deterministic) } -func (dst *OutputMetricsOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_OutputMetricsOptions.Merge(dst, src) +func (m *OutputMetricsOptions) XXX_Merge(src proto.Message) { + xxx_messageInfo_OutputMetricsOptions.Merge(m, src) } func (m *OutputMetricsOptions) XXX_Size() int { return xxx_messageInfo_OutputMetricsOptions.Size(m) @@ -338,19 +351,19 @@ func (m *OutputMetricsOptions) GetDistMetric() map[string]*proto1.Dist { } func init() { + proto.RegisterEnum("cloudprober.probes.external.ProbeConf_Mode", ProbeConf_Mode_name, ProbeConf_Mode_value) + proto.RegisterEnum("cloudprober.probes.external.OutputMetricsOptions_MetricsKind", OutputMetricsOptions_MetricsKind_name, OutputMetricsOptions_MetricsKind_value) proto.RegisterType((*ProbeConf)(nil), "cloudprober.probes.external.ProbeConf") proto.RegisterType((*ProbeConf_Option)(nil), "cloudprober.probes.external.ProbeConf.Option") proto.RegisterType((*OutputMetricsOptions)(nil), "cloudprober.probes.external.OutputMetricsOptions") proto.RegisterMapType((map[string]*proto1.Dist)(nil), "cloudprober.probes.external.OutputMetricsOptions.DistMetricEntry") - proto.RegisterEnum("cloudprober.probes.external.ProbeConf_Mode", ProbeConf_Mode_name, ProbeConf_Mode_value) - proto.RegisterEnum("cloudprober.probes.external.OutputMetricsOptions_MetricsKind", OutputMetricsOptions_MetricsKind_name, OutputMetricsOptions_MetricsKind_value) } func init() { - proto.RegisterFile("github.com/google/cloudprober/probes/external/proto/config.proto", fileDescriptor_config_b14d8908ad6b6463) + proto.RegisterFile("github.com/google/cloudprober/probes/external/proto/config.proto", fileDescriptor_8f0ffe99a845b10e) } -var fileDescriptor_config_b14d8908ad6b6463 = []byte{ +var fileDescriptor_8f0ffe99a845b10e = []byte{ // 540 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x52, 0xdb, 0x6e, 0xd3, 0x40, 0x10, 0xad, 0x63, 0xa7, 0xad, 0xc7, 0xd0, 0xba, 0xab, 0xaa, 0x32, 0x85, 0x07, 0x2b, 0x4f, 0x96, diff --git a/probes/external/proto/server.pb.go b/probes/external/proto/server.pb.go index c9049558..684edf1b 100644 --- a/probes/external/proto/server.pb.go +++ b/probes/external/proto/server.pb.go @@ -3,9 +3,11 @@ package proto -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // ProbeRequest is the message that cloudprober sends to the external probe // server. @@ -39,16 +41,17 @@ func (m *ProbeRequest) Reset() { *m = ProbeRequest{} } func (m *ProbeRequest) String() string { return proto.CompactTextString(m) } func (*ProbeRequest) ProtoMessage() {} func (*ProbeRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_server_5881812bd539f9a5, []int{0} + return fileDescriptor_2a01d47071a646f9, []int{0} } + func (m *ProbeRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProbeRequest.Unmarshal(m, b) } func (m *ProbeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ProbeRequest.Marshal(b, m, deterministic) } -func (dst *ProbeRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ProbeRequest.Merge(dst, src) +func (m *ProbeRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ProbeRequest.Merge(m, src) } func (m *ProbeRequest) XXX_Size() int { return xxx_messageInfo_ProbeRequest.Size(m) @@ -92,16 +95,17 @@ func (m *ProbeRequest_Option) Reset() { *m = ProbeRequest_Option{} } func (m *ProbeRequest_Option) String() string { return proto.CompactTextString(m) } func (*ProbeRequest_Option) ProtoMessage() {} func (*ProbeRequest_Option) Descriptor() ([]byte, []int) { - return fileDescriptor_server_5881812bd539f9a5, []int{0, 0} + return fileDescriptor_2a01d47071a646f9, []int{0, 0} } + func (m *ProbeRequest_Option) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProbeRequest_Option.Unmarshal(m, b) } func (m *ProbeRequest_Option) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ProbeRequest_Option.Marshal(b, m, deterministic) } -func (dst *ProbeRequest_Option) XXX_Merge(src proto.Message) { - xxx_messageInfo_ProbeRequest_Option.Merge(dst, src) +func (m *ProbeRequest_Option) XXX_Merge(src proto.Message) { + xxx_messageInfo_ProbeRequest_Option.Merge(m, src) } func (m *ProbeRequest_Option) XXX_Size() int { return xxx_messageInfo_ProbeRequest_Option.Size(m) @@ -149,16 +153,17 @@ func (m *ProbeReply) Reset() { *m = ProbeReply{} } func (m *ProbeReply) String() string { return proto.CompactTextString(m) } func (*ProbeReply) ProtoMessage() {} func (*ProbeReply) Descriptor() ([]byte, []int) { - return fileDescriptor_server_5881812bd539f9a5, []int{1} + return fileDescriptor_2a01d47071a646f9, []int{1} } + func (m *ProbeReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProbeReply.Unmarshal(m, b) } func (m *ProbeReply) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ProbeReply.Marshal(b, m, deterministic) } -func (dst *ProbeReply) XXX_Merge(src proto.Message) { - xxx_messageInfo_ProbeReply.Merge(dst, src) +func (m *ProbeReply) XXX_Merge(src proto.Message) { + xxx_messageInfo_ProbeReply.Merge(m, src) } func (m *ProbeReply) XXX_Size() int { return xxx_messageInfo_ProbeReply.Size(m) @@ -197,10 +202,10 @@ func init() { } func init() { - proto.RegisterFile("github.com/google/cloudprober/probes/external/proto/server.proto", fileDescriptor_server_5881812bd539f9a5) + proto.RegisterFile("github.com/google/cloudprober/probes/external/proto/server.proto", fileDescriptor_2a01d47071a646f9) } -var fileDescriptor_server_5881812bd539f9a5 = []byte{ +var fileDescriptor_2a01d47071a646f9 = []byte{ // 252 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x8e, 0x31, 0x6b, 0xc3, 0x30, 0x10, 0x85, 0x71, 0xdc, 0x34, 0xf8, 0x92, 0x2e, 0xa2, 0x83, 0x29, 0x14, 0x4c, 0xba, 0x78, 0xb2, diff --git a/probes/http/proto/config.pb.go b/probes/http/proto/config.pb.go index ccad53cd..c6fc4aee 100644 --- a/probes/http/proto/config.pb.go +++ b/probes/http/proto/config.pb.go @@ -3,9 +3,11 @@ package proto -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type ProbeConf_ProtocolType int32 @@ -29,6 +31,7 @@ var ProbeConf_ProtocolType_name = map[int32]string{ 0: "HTTP", 1: "HTTPS", } + var ProbeConf_ProtocolType_value = map[string]int32{ "HTTP": 0, "HTTPS": 1, @@ -39,9 +42,11 @@ func (x ProbeConf_ProtocolType) Enum() *ProbeConf_ProtocolType { *p = x return p } + func (x ProbeConf_ProtocolType) String() string { return proto.EnumName(ProbeConf_ProtocolType_name, int32(x)) } + func (x *ProbeConf_ProtocolType) UnmarshalJSON(data []byte) error { value, err := proto.UnmarshalJSONEnum(ProbeConf_ProtocolType_value, data, "ProbeConf_ProtocolType") if err != nil { @@ -50,8 +55,9 @@ func (x *ProbeConf_ProtocolType) UnmarshalJSON(data []byte) error { *x = ProbeConf_ProtocolType(value) return nil } + func (ProbeConf_ProtocolType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_config_cb526dec61b7dc02, []int{0, 0} + return fileDescriptor_4f0f7231b8fe2128, []int{0, 0} } type ProbeConf_Method int32 @@ -75,6 +81,7 @@ var ProbeConf_Method_name = map[int32]string{ 5: "PATCH", 6: "OPTIONS", } + var ProbeConf_Method_value = map[string]int32{ "GET": 0, "POST": 1, @@ -90,9 +97,11 @@ func (x ProbeConf_Method) Enum() *ProbeConf_Method { *p = x return p } + func (x ProbeConf_Method) String() string { return proto.EnumName(ProbeConf_Method_name, int32(x)) } + func (x *ProbeConf_Method) UnmarshalJSON(data []byte) error { value, err := proto.UnmarshalJSONEnum(ProbeConf_Method_value, data, "ProbeConf_Method") if err != nil { @@ -101,8 +110,9 @@ func (x *ProbeConf_Method) UnmarshalJSON(data []byte) error { *x = ProbeConf_Method(value) return nil } + func (ProbeConf_Method) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_config_cb526dec61b7dc02, []int{0, 1} + return fileDescriptor_4f0f7231b8fe2128, []int{0, 1} } // Next tag: 15 @@ -143,36 +153,27 @@ type ProbeConf struct { // How long to wait between two requests to the same target // NOTE: This field is now deprecated and will be removed after the v0.10.3 // releases. - RequestsIntervalMsec *int32 `protobuf:"varint,99,opt,name=requests_interval_msec,json=requestsIntervalMsec,def=25" json:"requests_interval_msec,omitempty"` - // Export stats after these many milliseconds - // NOTE: Setting stats export interval using this field doesn't work anymore. - // This field will be removed after the release v0.10.3. To set - // stats_export_interval, please modify the outer probe configuration. - // Example: probe { - // type: HTTP - // stats_export_interval_msec: 10000 - // http_probe {} - // } - StatsExportIntervalMsec *int32 `protobuf:"varint,100,opt,name=stats_export_interval_msec,json=statsExportIntervalMsec,def=10000" json:"stats_export_interval_msec,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + RequestsIntervalMsec *int32 `protobuf:"varint,99,opt,name=requests_interval_msec,json=requestsIntervalMsec,def=25" json:"requests_interval_msec,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ProbeConf) Reset() { *m = ProbeConf{} } func (m *ProbeConf) String() string { return proto.CompactTextString(m) } func (*ProbeConf) ProtoMessage() {} func (*ProbeConf) Descriptor() ([]byte, []int) { - return fileDescriptor_config_cb526dec61b7dc02, []int{0} + return fileDescriptor_4f0f7231b8fe2128, []int{0} } + func (m *ProbeConf) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProbeConf.Unmarshal(m, b) } func (m *ProbeConf) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ProbeConf.Marshal(b, m, deterministic) } -func (dst *ProbeConf) XXX_Merge(src proto.Message) { - xxx_messageInfo_ProbeConf.Merge(dst, src) +func (m *ProbeConf) XXX_Merge(src proto.Message) { + xxx_messageInfo_ProbeConf.Merge(m, src) } func (m *ProbeConf) XXX_Size() int { return xxx_messageInfo_ProbeConf.Size(m) @@ -189,7 +190,6 @@ const Default_ProbeConf_ExportResponseAsMetrics bool = false const Default_ProbeConf_Method ProbeConf_Method = ProbeConf_GET const Default_ProbeConf_RequestsPerProbe int32 = 1 const Default_ProbeConf_RequestsIntervalMsec int32 = 25 -const Default_ProbeConf_StatsExportIntervalMsec int32 = 10000 func (m *ProbeConf) GetProtocol() ProbeConf_ProtocolType { if m != nil && m.Protocol != nil { @@ -282,13 +282,6 @@ func (m *ProbeConf) GetRequestsIntervalMsec() int32 { return Default_ProbeConf_RequestsIntervalMsec } -func (m *ProbeConf) GetStatsExportIntervalMsec() int32 { - if m != nil && m.StatsExportIntervalMsec != nil { - return *m.StatsExportIntervalMsec - } - return Default_ProbeConf_StatsExportIntervalMsec -} - type ProbeConf_Header struct { Name *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` Value *string `protobuf:"bytes,2,opt,name=value" json:"value,omitempty"` @@ -301,16 +294,17 @@ func (m *ProbeConf_Header) Reset() { *m = ProbeConf_Header{} } func (m *ProbeConf_Header) String() string { return proto.CompactTextString(m) } func (*ProbeConf_Header) ProtoMessage() {} func (*ProbeConf_Header) Descriptor() ([]byte, []int) { - return fileDescriptor_config_cb526dec61b7dc02, []int{0, 0} + return fileDescriptor_4f0f7231b8fe2128, []int{0, 0} } + func (m *ProbeConf_Header) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProbeConf_Header.Unmarshal(m, b) } func (m *ProbeConf_Header) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ProbeConf_Header.Marshal(b, m, deterministic) } -func (dst *ProbeConf_Header) XXX_Merge(src proto.Message) { - xxx_messageInfo_ProbeConf_Header.Merge(dst, src) +func (m *ProbeConf_Header) XXX_Merge(src proto.Message) { + xxx_messageInfo_ProbeConf_Header.Merge(m, src) } func (m *ProbeConf_Header) XXX_Size() int { return xxx_messageInfo_ProbeConf_Header.Size(m) @@ -336,52 +330,51 @@ func (m *ProbeConf_Header) GetValue() string { } func init() { - proto.RegisterType((*ProbeConf)(nil), "cloudprober.probes.http.ProbeConf") - proto.RegisterType((*ProbeConf_Header)(nil), "cloudprober.probes.http.ProbeConf.Header") proto.RegisterEnum("cloudprober.probes.http.ProbeConf_ProtocolType", ProbeConf_ProtocolType_name, ProbeConf_ProtocolType_value) proto.RegisterEnum("cloudprober.probes.http.ProbeConf_Method", ProbeConf_Method_name, ProbeConf_Method_value) + proto.RegisterType((*ProbeConf)(nil), "cloudprober.probes.http.ProbeConf") + proto.RegisterType((*ProbeConf_Header)(nil), "cloudprober.probes.http.ProbeConf.Header") } func init() { - proto.RegisterFile("github.com/google/cloudprober/probes/http/proto/config.proto", fileDescriptor_config_cb526dec61b7dc02) -} - -var fileDescriptor_config_cb526dec61b7dc02 = []byte{ - // 571 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xcf, 0x6f, 0xda, 0x4a, - 0x10, 0x80, 0xe3, 0x80, 0xf9, 0x31, 0x21, 0x91, 0xb5, 0xca, 0x7b, 0xac, 0x22, 0x55, 0xa2, 0xc9, - 0x85, 0xf6, 0x80, 0x09, 0x52, 0xab, 0x0a, 0xf5, 0x42, 0x09, 0x29, 0x91, 0x9a, 0xc6, 0xdd, 0x38, - 0xbd, 0x5a, 0xc6, 0x1e, 0xc0, 0xea, 0xc2, 0xba, 0xbb, 0x0b, 0x6a, 0xfe, 0xf9, 0xaa, 0xda, 0xb5, - 0x41, 0xf4, 0x50, 0x29, 0x27, 0x8f, 0x67, 0xbe, 0x6f, 0xa4, 0xd9, 0x19, 0xf8, 0xb8, 0xc8, 0xf4, - 0x72, 0x33, 0xeb, 0x25, 0x62, 0xe5, 0x2f, 0x84, 0x58, 0x70, 0xf4, 0x13, 0x2e, 0x36, 0x69, 0x2e, - 0xc5, 0x0c, 0xa5, 0x6f, 0x3f, 0xca, 0x5f, 0x6a, 0x9d, 0x9b, 0x58, 0x0b, 0x3f, 0x11, 0xeb, 0x79, - 0xb6, 0xe8, 0xd9, 0x1f, 0xd2, 0x3e, 0x60, 0x7b, 0x05, 0xdb, 0x33, 0xec, 0xe5, 0xef, 0x1a, 0x34, - 0x03, 0xf3, 0x3f, 0x16, 0xeb, 0x39, 0xf9, 0x06, 0x0d, 0xcb, 0x27, 0x82, 0x53, 0xa7, 0xe3, 0x74, - 0xcf, 0x06, 0x7e, 0xef, 0x1f, 0x66, 0x6f, 0x6f, 0x99, 0xc8, 0x2a, 0xe1, 0x73, 0x8e, 0xc3, 0xea, - 0x34, 0x0c, 0x03, 0xb6, 0x6f, 0x43, 0x5e, 0x43, 0x4b, 0x22, 0x8f, 0x75, 0xb6, 0xc5, 0x68, 0x23, - 0x39, 0x3d, 0xee, 0x38, 0xdd, 0x26, 0x3b, 0xd9, 0xe5, 0x9e, 0x24, 0x27, 0x04, 0xaa, 0xb9, 0x90, - 0x9a, 0x56, 0x3a, 0x4e, 0xd7, 0x65, 0x36, 0x26, 0x6f, 0xe1, 0x54, 0xa2, 0x12, 0x7c, 0x8b, 0xd1, - 0x3c, 0x93, 0x4a, 0xd3, 0x6a, 0xc7, 0xe9, 0x36, 0x86, 0xee, 0x3c, 0xe6, 0x0a, 0x59, 0xab, 0xac, - 0xdd, 0x9a, 0x12, 0xf9, 0x04, 0x17, 0xf8, 0xcb, 0x58, 0x91, 0x44, 0x95, 0x8b, 0xb5, 0xc2, 0x28, - 0x56, 0xd1, 0x0a, 0xb5, 0xcc, 0x12, 0x45, 0xdd, 0x43, 0xb1, 0x5d, 0x80, 0xac, 0xe4, 0x46, 0xea, - 0xbe, 0xa0, 0xc8, 0x2d, 0xd4, 0x56, 0xa8, 0x97, 0x22, 0xa5, 0x75, 0x3b, 0xf7, 0x9b, 0x17, 0xcc, - 0x7d, 0x6f, 0x85, 0x61, 0xe5, 0xf3, 0x24, 0x64, 0xa5, 0x4d, 0xc6, 0x50, 0x5f, 0x62, 0x9c, 0xa2, - 0x54, 0xb4, 0xd1, 0xa9, 0x74, 0x4f, 0x5e, 0xd4, 0x68, 0x6a, 0x0d, 0xb6, 0x33, 0xcd, 0x83, 0xcc, - 0x44, 0xfa, 0x4c, 0x9b, 0xf6, 0xad, 0x6c, 0x4c, 0x5e, 0x01, 0xfc, 0x40, 0xcc, 0xa3, 0x98, 0x67, - 0x5b, 0xa4, 0x2d, 0x33, 0x14, 0x6b, 0x9a, 0xcc, 0xc8, 0x24, 0xc8, 0x15, 0x9c, 0xa6, 0x99, 0x8a, - 0x67, 0x1c, 0x23, 0xd3, 0x7c, 0x40, 0x4f, 0x2d, 0xd1, 0x2a, 0x93, 0x53, 0x93, 0x23, 0xef, 0xa1, - 0xbd, 0x83, 0x12, 0x94, 0x3a, 0xda, 0xc6, 0x3c, 0x4b, 0x63, 0x9d, 0x89, 0x35, 0x3d, 0xb3, 0xf8, - 0x7f, 0x65, 0x79, 0x8c, 0x52, 0x7f, 0xdf, 0x17, 0x89, 0x0f, 0x44, 0xe2, 0xcf, 0x0d, 0x2a, 0xad, - 0xa2, 0x1c, 0x65, 0x64, 0xa7, 0xa0, 0x33, 0xb3, 0xae, 0xa1, 0x73, 0xcd, 0xbc, 0x5d, 0x31, 0x40, - 0x69, 0x87, 0x22, 0x1f, 0xe0, 0xff, 0xbd, 0x90, 0xad, 0x35, 0xca, 0x6d, 0xcc, 0xa3, 0x95, 0xc2, - 0x84, 0x26, 0x56, 0x3a, 0x1e, 0xbc, 0x63, 0xe7, 0x3b, 0xe2, 0xae, 0x04, 0xee, 0x15, 0x26, 0x66, - 0x97, 0x4a, 0xc7, 0x5a, 0x45, 0xe5, 0x46, 0xff, 0xb6, 0x53, 0x6b, 0xbb, 0xd7, 0xfd, 0x7e, 0xbf, - 0xcf, 0xda, 0x16, 0x9c, 0x58, 0xee, 0xb0, 0xc7, 0xc5, 0x00, 0x6a, 0xc5, 0x8b, 0x9a, 0x87, 0x5c, - 0xc7, 0x2b, 0xb4, 0xb7, 0xdc, 0x64, 0x36, 0x26, 0xe7, 0xe0, 0x6e, 0x63, 0xbe, 0xc1, 0xf2, 0x12, - 0x8b, 0x9f, 0xcb, 0x2b, 0x68, 0x1d, 0x9e, 0x31, 0x69, 0x80, 0x3d, 0x64, 0xef, 0x88, 0x34, 0xc1, - 0x35, 0xd1, 0xa3, 0xe7, 0x5c, 0x32, 0xa8, 0x15, 0x3b, 0x27, 0x75, 0x30, 0x5b, 0xf7, 0x8e, 0x0c, - 0x17, 0x3c, 0x3c, 0x86, 0x9e, 0x63, 0x52, 0xc1, 0x53, 0xe8, 0x1d, 0x5b, 0x75, 0x32, 0xba, 0xf1, - 0x2a, 0x04, 0xa0, 0x76, 0x33, 0xf9, 0x32, 0x09, 0x27, 0x5e, 0xd5, 0xb4, 0x09, 0x46, 0xe1, 0x78, - 0xea, 0xb9, 0xe4, 0x04, 0xea, 0x0f, 0x41, 0x78, 0xf7, 0xf0, 0xf5, 0xd1, 0xab, 0xfd, 0x09, 0x00, - 0x00, 0xff, 0xff, 0x60, 0xaf, 0x76, 0x7e, 0xd8, 0x03, 0x00, 0x00, + proto.RegisterFile("github.com/google/cloudprober/probes/http/proto/config.proto", fileDescriptor_4f0f7231b8fe2128) +} + +var fileDescriptor_4f0f7231b8fe2128 = []byte{ + // 545 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0x5d, 0x6b, 0xdb, 0x3c, + 0x14, 0xc7, 0xeb, 0xe6, 0xfd, 0x34, 0x2d, 0x46, 0xf4, 0x79, 0x2a, 0x0a, 0x83, 0xac, 0xbd, 0xc9, + 0x76, 0x61, 0xb3, 0xc0, 0xc6, 0x08, 0xbb, 0xc9, 0xd2, 0x74, 0x29, 0xac, 0xab, 0xa7, 0xba, 0xbb, + 0x35, 0x8e, 0x7d, 0x92, 0x98, 0x29, 0x96, 0x27, 0x29, 0x66, 0xfd, 0x6a, 0xfb, 0x74, 0x43, 0xb2, + 0x13, 0x72, 0x33, 0xe8, 0x95, 0x8e, 0xfe, 0xe7, 0xf7, 0x3f, 0x70, 0x5e, 0xe0, 0xd3, 0x2a, 0xd3, + 0xeb, 0xed, 0xc2, 0x4b, 0xc4, 0xc6, 0x5f, 0x09, 0xb1, 0xe2, 0xe8, 0x27, 0x5c, 0x6c, 0xd3, 0x42, + 0x8a, 0x05, 0x4a, 0xdf, 0x3e, 0xca, 0x5f, 0x6b, 0x5d, 0x98, 0x58, 0x0b, 0x3f, 0x11, 0xf9, 0x32, + 0x5b, 0x79, 0xf6, 0x43, 0x2e, 0x0e, 0x58, 0xaf, 0x62, 0x3d, 0xc3, 0x5e, 0xfd, 0x69, 0x43, 0x2f, + 0x30, 0xff, 0xa9, 0xc8, 0x97, 0xe4, 0x3b, 0x74, 0x2d, 0x9f, 0x08, 0x4e, 0x9d, 0x81, 0x33, 0x3c, + 0x1b, 0xf9, 0xde, 0x3f, 0x9c, 0xde, 0xde, 0x65, 0x22, 0x6b, 0x09, 0x9f, 0x0b, 0x1c, 0x37, 0xe7, + 0x61, 0x18, 0xb0, 0x7d, 0x19, 0xf2, 0x1a, 0xfa, 0x12, 0x79, 0xac, 0xb3, 0x12, 0xa3, 0xad, 0xe4, + 0xf4, 0x78, 0xe0, 0x0c, 0x7b, 0xec, 0x64, 0xa7, 0x3d, 0x49, 0x4e, 0x08, 0x34, 0x0b, 0x21, 0x35, + 0x6d, 0x0c, 0x9c, 0x61, 0x8b, 0xd9, 0x98, 0xbc, 0x85, 0x53, 0x89, 0x4a, 0xf0, 0x12, 0xa3, 0x65, + 0x26, 0x95, 0xa6, 0xcd, 0x81, 0x33, 0xec, 0x8e, 0x5b, 0xcb, 0x98, 0x2b, 0x64, 0xfd, 0x3a, 0x77, + 0x6b, 0x52, 0xe4, 0x33, 0x5c, 0xe2, 0x6f, 0xe3, 0x8a, 0x24, 0xaa, 0x42, 0xe4, 0x0a, 0xa3, 0x58, + 0x45, 0x1b, 0xd4, 0x32, 0x4b, 0x14, 0x6d, 0x1d, 0x1a, 0x2f, 0x2a, 0x90, 0xd5, 0xdc, 0x44, 0xdd, + 0x57, 0x14, 0xb9, 0x85, 0xf6, 0x06, 0xf5, 0x5a, 0xa4, 0xb4, 0x63, 0xfb, 0x7e, 0xf3, 0x82, 0xbe, + 0xef, 0xad, 0x61, 0xdc, 0xf8, 0x32, 0x0b, 0x59, 0xed, 0x26, 0x53, 0xe8, 0xac, 0x31, 0x4e, 0x51, + 0x2a, 0xda, 0x1d, 0x34, 0x86, 0x27, 0x2f, 0x2a, 0x34, 0xb7, 0x0e, 0xb6, 0x73, 0x9a, 0x81, 0x2c, + 0x44, 0xfa, 0x4c, 0x7b, 0x76, 0x56, 0x36, 0x26, 0xaf, 0x00, 0x7e, 0x22, 0x16, 0x51, 0xcc, 0xb3, + 0x12, 0x69, 0xdf, 0x34, 0xc5, 0x7a, 0x46, 0x99, 0x18, 0x81, 0x5c, 0xc3, 0x69, 0x9a, 0xa9, 0x78, + 0xc1, 0x31, 0x32, 0xc5, 0x47, 0xf4, 0xd4, 0x12, 0xfd, 0x5a, 0x9c, 0x1b, 0x8d, 0x7c, 0x80, 0x8b, + 0x1d, 0x94, 0xa0, 0xd4, 0x51, 0x19, 0xf3, 0x2c, 0x8d, 0x75, 0x26, 0x72, 0x7a, 0x66, 0xf1, 0xff, + 0xea, 0xf4, 0x14, 0xa5, 0xfe, 0xb1, 0x4f, 0x12, 0x1f, 0x88, 0xc4, 0x5f, 0x5b, 0x54, 0x5a, 0x45, + 0x05, 0xca, 0xc8, 0x76, 0x41, 0x17, 0x66, 0x5d, 0x63, 0xe7, 0x1d, 0x73, 0x77, 0xc9, 0x00, 0xa5, + 0x6d, 0x8a, 0x7c, 0x84, 0xff, 0xf7, 0x86, 0x2c, 0xd7, 0x28, 0xcb, 0x98, 0x47, 0x1b, 0x85, 0x09, + 0x4d, 0xac, 0xe9, 0x78, 0xf4, 0x9e, 0x9d, 0xef, 0x88, 0xbb, 0x1a, 0xb8, 0x57, 0x98, 0x5c, 0x8e, + 0xa0, 0x5d, 0x4d, 0xc3, 0x0c, 0x21, 0x8f, 0x37, 0x68, 0xef, 0xb0, 0xc7, 0x6c, 0x4c, 0xce, 0xa1, + 0x55, 0xc6, 0x7c, 0x8b, 0xf5, 0x15, 0x55, 0x9f, 0xab, 0x6b, 0xe8, 0x1f, 0x9e, 0x20, 0xe9, 0x82, + 0x3d, 0x42, 0xf7, 0x88, 0xf4, 0xa0, 0x65, 0xa2, 0x47, 0xd7, 0xb9, 0x62, 0xd0, 0xae, 0xf6, 0x45, + 0x3a, 0x60, 0x36, 0xe6, 0x1e, 0x19, 0x2e, 0x78, 0x78, 0x0c, 0x5d, 0xc7, 0x48, 0xc1, 0x53, 0xe8, + 0x1e, 0x5b, 0xeb, 0x6c, 0x72, 0xe3, 0x36, 0x08, 0x40, 0xfb, 0x66, 0xf6, 0x75, 0x16, 0xce, 0xdc, + 0xa6, 0x29, 0x13, 0x4c, 0xc2, 0xe9, 0xdc, 0x6d, 0x91, 0x13, 0xe8, 0x3c, 0x04, 0xe1, 0xdd, 0xc3, + 0xb7, 0x47, 0xb7, 0xfd, 0x37, 0x00, 0x00, 0xff, 0xff, 0xe8, 0x4c, 0x07, 0x7a, 0x94, 0x03, 0x00, + 0x00, } diff --git a/probes/ping/proto/config.pb.go b/probes/ping/proto/config.pb.go index d5dd9ce6..c3a069fc 100644 --- a/probes/ping/proto/config.pb.go +++ b/probes/ping/proto/config.pb.go @@ -3,9 +3,11 @@ package proto -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // Next tag: 1 type ProbeConf struct { @@ -24,16 +26,6 @@ type ProbeConf struct { PacketsPerProbe *int32 `protobuf:"varint,6,opt,name=packets_per_probe,json=packetsPerProbe,def=2" json:"packets_per_probe,omitempty"` // How long to wait between two packets to the same target PacketsIntervalMsec *int32 `protobuf:"varint,7,opt,name=packets_interval_msec,json=packetsIntervalMsec,def=25" json:"packets_interval_msec,omitempty"` - // Export stats after these many probes. - // NOTE: Setting stats export interval using this field doesn't work anymore. - // This field will be removed after the release v0.10.3. To set - // stats_export_interval, please modify the outer probe configuration. - // Example: probe { - // type: PING - // stats_export_interval_msec: 10000 - // ping_probe {} - // } - StatsExportInterval *int32 `protobuf:"varint,8,opt,name=stats_export_interval,json=statsExportInterval,def=5" json:"stats_export_interval,omitempty"` // Resolve targets after these many probes ResolveTargetsInterval *int32 `protobuf:"varint,9,opt,name=resolve_targets_interval,json=resolveTargetsInterval,def=5" json:"resolve_targets_interval,omitempty"` // Ping payload size in bytes. It cannot be smaller than 8, number of bytes @@ -71,16 +63,17 @@ func (m *ProbeConf) Reset() { *m = ProbeConf{} } func (m *ProbeConf) String() string { return proto.CompactTextString(m) } func (*ProbeConf) ProtoMessage() {} func (*ProbeConf) Descriptor() ([]byte, []int) { - return fileDescriptor_config_4c6cf6fb9221606d, []int{0} + return fileDescriptor_07f3181ec59da86e, []int{0} } + func (m *ProbeConf) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProbeConf.Unmarshal(m, b) } func (m *ProbeConf) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ProbeConf.Marshal(b, m, deterministic) } -func (dst *ProbeConf) XXX_Merge(src proto.Message) { - xxx_messageInfo_ProbeConf.Merge(dst, src) +func (m *ProbeConf) XXX_Merge(src proto.Message) { + xxx_messageInfo_ProbeConf.Merge(m, src) } func (m *ProbeConf) XXX_Size() int { return xxx_messageInfo_ProbeConf.Size(m) @@ -93,7 +86,6 @@ var xxx_messageInfo_ProbeConf proto.InternalMessageInfo const Default_ProbeConf_PacketsPerProbe int32 = 2 const Default_ProbeConf_PacketsIntervalMsec int32 = 25 -const Default_ProbeConf_StatsExportInterval int32 = 5 const Default_ProbeConf_ResolveTargetsInterval int32 = 5 const Default_ProbeConf_PayloadSize int32 = 56 const Default_ProbeConf_UseDatagramSocket bool = true @@ -113,13 +105,6 @@ func (m *ProbeConf) GetPacketsIntervalMsec() int32 { return Default_ProbeConf_PacketsIntervalMsec } -func (m *ProbeConf) GetStatsExportInterval() int32 { - if m != nil && m.StatsExportInterval != nil { - return *m.StatsExportInterval - } - return Default_ProbeConf_StatsExportInterval -} - func (m *ProbeConf) GetResolveTargetsInterval() int32 { if m != nil && m.ResolveTargetsInterval != nil { return *m.ResolveTargetsInterval @@ -160,31 +145,29 @@ func init() { } func init() { - proto.RegisterFile("github.com/google/cloudprober/probes/ping/proto/config.proto", fileDescriptor_config_4c6cf6fb9221606d) -} - -var fileDescriptor_config_4c6cf6fb9221606d = []byte{ - // 342 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x8f, 0x41, 0x6b, 0x2a, 0x31, - 0x10, 0xc7, 0xf1, 0xbd, 0xe7, 0xab, 0x46, 0x4b, 0x31, 0x62, 0xcd, 0xa5, 0x20, 0x85, 0x82, 0x97, - 0xee, 0x82, 0x74, 0x3d, 0xd8, 0xf6, 0x64, 0x7b, 0xf0, 0x50, 0x90, 0xb5, 0xf4, 0x1a, 0x62, 0x76, - 0x8c, 0xc1, 0x75, 0x13, 0x92, 0xac, 0x54, 0xbf, 0x4d, 0xbf, 0x69, 0xd9, 0xec, 0xae, 0x78, 0x4a, - 0x66, 0xfe, 0xbf, 0x1f, 0x33, 0x83, 0x5e, 0x84, 0x74, 0xdb, 0x7c, 0x1d, 0x70, 0xb5, 0x0f, 0x85, - 0x52, 0x22, 0x85, 0x90, 0xa7, 0x2a, 0x4f, 0xb4, 0x51, 0x6b, 0x30, 0xa1, 0x7f, 0x6c, 0xa8, 0x65, - 0x26, 0x8a, 0xbf, 0x53, 0x21, 0x57, 0xd9, 0x46, 0x8a, 0xc0, 0x17, 0x78, 0x78, 0xc1, 0x06, 0x25, - 0x1b, 0x14, 0xec, 0xfd, 0xcf, 0x5f, 0xd4, 0x5e, 0x16, 0xf5, 0x5c, 0x65, 0x1b, 0xfc, 0x88, 0x7a, - 0x9a, 0xf1, 0x1d, 0x38, 0x4b, 0x35, 0x18, 0xea, 0x41, 0xf2, 0x7f, 0xd4, 0x18, 0x37, 0x67, 0x8d, - 0x49, 0x7c, 0x53, 0x65, 0x4b, 0x30, 0x5e, 0xc1, 0x53, 0x34, 0xa8, 0x71, 0x99, 0x39, 0x30, 0x07, - 0x96, 0xd2, 0xbd, 0x05, 0x4e, 0xae, 0xbc, 0xf2, 0x67, 0x12, 0xc5, 0xfd, 0x0a, 0x58, 0x54, 0xf9, - 0x87, 0x05, 0x8e, 0x23, 0x34, 0xb0, 0x8e, 0x39, 0x4b, 0xe1, 0x5b, 0x2b, 0xe3, 0xce, 0x32, 0x69, - 0x95, 0xa3, 0xa2, 0xb8, 0xef, 0xf3, 0x77, 0x1f, 0xd7, 0x2a, 0x7e, 0x46, 0xc4, 0x80, 0x55, 0xe9, - 0x01, 0xa8, 0x63, 0x46, 0x5c, 0x8e, 0x25, 0xed, 0xda, 0xbc, 0xad, 0x90, 0xcf, 0x92, 0x38, 0xcb, - 0x0f, 0xa8, 0xab, 0xd9, 0x31, 0x55, 0x2c, 0xa1, 0x56, 0x9e, 0x80, 0xa0, 0x72, 0xc5, 0x68, 0x1a, - 0x77, 0xaa, 0xfe, 0x4a, 0x9e, 0x00, 0xdf, 0x21, 0x24, 0x35, 0x3d, 0x80, 0xb1, 0x52, 0x65, 0xa4, - 0x53, 0x40, 0x71, 0x5b, 0xea, 0xaf, 0xb2, 0x81, 0x9f, 0x50, 0x3f, 0xb7, 0x40, 0x13, 0xe6, 0x98, - 0x30, 0x6c, 0x4f, 0xad, 0x2a, 0xae, 0x23, 0xdd, 0x51, 0x63, 0xdc, 0x9a, 0xfd, 0x73, 0x26, 0x87, - 0xb8, 0x97, 0x5b, 0x78, 0xab, 0xf2, 0x95, 0x8f, 0xf1, 0x2b, 0x1a, 0x26, 0xd2, 0xb2, 0x75, 0x0a, - 0x7e, 0x61, 0x61, 0xa4, 0x3b, 0x52, 0xbe, 0x05, 0xbe, 0x23, 0xd7, 0xde, 0x6c, 0x6e, 0x58, 0x6a, - 0x21, 0x1e, 0x54, 0xd4, 0xa2, 0x86, 0xe6, 0x05, 0xf3, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x18, 0xc6, - 0xc4, 0x64, 0xfb, 0x01, 0x00, 0x00, + proto.RegisterFile("github.com/google/cloudprober/probes/ping/proto/config.proto", fileDescriptor_07f3181ec59da86e) +} + +var fileDescriptor_07f3181ec59da86e = []byte{ + // 318 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0xce, 0x41, 0x6b, 0xf2, 0x30, + 0x18, 0x07, 0x70, 0x94, 0xd7, 0x77, 0x33, 0x3a, 0x86, 0x11, 0x67, 0x2e, 0x03, 0x19, 0x0c, 0xbc, + 0xac, 0x05, 0x99, 0x1e, 0xdc, 0x76, 0x72, 0x17, 0x0f, 0x03, 0xa9, 0x63, 0xd7, 0x10, 0xd3, 0xc7, + 0x18, 0x8c, 0x4d, 0x48, 0x52, 0x41, 0x3f, 0xf2, 0x3e, 0xc5, 0x68, 0x1a, 0xc1, 0x53, 0x9b, 0xfc, + 0x7f, 0xff, 0x3c, 0x0f, 0x7a, 0x17, 0xd2, 0xef, 0xca, 0x4d, 0xc2, 0xf5, 0x21, 0x15, 0x5a, 0x0b, + 0x05, 0x29, 0x57, 0xba, 0xcc, 0x8d, 0xd5, 0x1b, 0xb0, 0x69, 0xf8, 0xb8, 0xd4, 0xc8, 0x42, 0x54, + 0xff, 0x5e, 0xa7, 0x5c, 0x17, 0x5b, 0x29, 0x92, 0x70, 0xc0, 0xc3, 0x2b, 0x9b, 0xd4, 0x36, 0xa9, + 0xec, 0xd3, 0x6f, 0x13, 0xb5, 0x57, 0xd5, 0x79, 0xa1, 0x8b, 0x2d, 0x7e, 0x41, 0x3d, 0xc3, 0xf8, + 0x1e, 0xbc, 0xa3, 0x06, 0x2c, 0x0d, 0x90, 0xfc, 0x1f, 0x35, 0xc6, 0xad, 0x79, 0x63, 0x92, 0xdd, + 0xc7, 0x6c, 0x05, 0x36, 0x54, 0xf0, 0x0c, 0x0d, 0x2e, 0x5c, 0x16, 0x1e, 0xec, 0x91, 0x29, 0x7a, + 0x70, 0xc0, 0xc9, 0x4d, 0xa8, 0x34, 0x27, 0xd3, 0xac, 0x1f, 0xc1, 0x32, 0xe6, 0x5f, 0x0e, 0x38, + 0x7e, 0x43, 0xc4, 0x82, 0xd3, 0xea, 0x08, 0xd4, 0x33, 0x2b, 0xae, 0xfb, 0xa4, 0x5d, 0x4f, 0x9b, + 0x66, 0x0f, 0x91, 0x7c, 0xd7, 0xe2, 0xf2, 0x00, 0x7e, 0x46, 0x5d, 0xc3, 0x4e, 0x4a, 0xb3, 0x9c, + 0x3a, 0x79, 0x06, 0x82, 0xea, 0x59, 0xd3, 0x59, 0xd6, 0x89, 0xf7, 0x6b, 0x79, 0x06, 0xfc, 0x88, + 0x90, 0x34, 0xf4, 0x08, 0xd6, 0x49, 0x5d, 0x90, 0x4e, 0x85, 0xb2, 0xb6, 0x34, 0x3f, 0xf5, 0x05, + 0x7e, 0x45, 0xfd, 0xd2, 0x01, 0xcd, 0x99, 0x67, 0xc2, 0xb2, 0x03, 0x75, 0xba, 0x5a, 0x93, 0x74, + 0x47, 0x8d, 0xf1, 0xed, 0xfc, 0x9f, 0xb7, 0x25, 0x64, 0xbd, 0xd2, 0xc1, 0x67, 0xcc, 0xd7, 0x21, + 0xc6, 0x1f, 0x68, 0x98, 0x4b, 0xc7, 0x36, 0x0a, 0xc2, 0xc2, 0xc2, 0x4a, 0x7f, 0xa2, 0x7c, 0x07, + 0x7c, 0x4f, 0xee, 0x42, 0xb3, 0xb5, 0x65, 0xca, 0x41, 0x36, 0x88, 0x6a, 0x79, 0x41, 0x8b, 0xca, + 0xfc, 0x05, 0x00, 0x00, 0xff, 0xff, 0xca, 0xc2, 0xfa, 0x45, 0xc4, 0x01, 0x00, 0x00, } diff --git a/probes/proto/config.pb.go b/probes/proto/config.pb.go index 42988394..846ba252 100644 --- a/probes/proto/config.pb.go +++ b/probes/proto/config.pb.go @@ -3,18 +3,20 @@ package proto -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import proto2 "github.com/google/cloudprober/metrics/proto" -import proto6 "github.com/google/cloudprober/probes/dns/proto" -import proto7 "github.com/google/cloudprober/probes/external/proto" -import proto5 "github.com/google/cloudprober/probes/http/proto" -import proto4 "github.com/google/cloudprober/probes/ping/proto" -import proto8 "github.com/google/cloudprober/probes/udp/proto" -import proto9 "github.com/google/cloudprober/probes/udplistener/proto" -import proto1 "github.com/google/cloudprober/targets/proto" -import proto3 "github.com/google/cloudprober/validators/proto" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + proto2 "github.com/google/cloudprober/metrics/proto" + proto6 "github.com/google/cloudprober/probes/dns/proto" + proto7 "github.com/google/cloudprober/probes/external/proto" + proto5 "github.com/google/cloudprober/probes/http/proto" + proto4 "github.com/google/cloudprober/probes/ping/proto" + proto8 "github.com/google/cloudprober/probes/udp/proto" + proto9 "github.com/google/cloudprober/probes/udplistener/proto" + proto1 "github.com/google/cloudprober/targets/proto" + proto3 "github.com/google/cloudprober/validators/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -25,7 +27,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type ProbeDef_Type int32 @@ -56,6 +58,7 @@ var ProbeDef_Type_name = map[int32]string{ 98: "EXTENSION", 99: "USER_DEFINED", } + var ProbeDef_Type_value = map[string]int32{ "PING": 0, "HTTP": 1, @@ -72,9 +75,11 @@ func (x ProbeDef_Type) Enum() *ProbeDef_Type { *p = x return p } + func (x ProbeDef_Type) String() string { return proto.EnumName(ProbeDef_Type_name, int32(x)) } + func (x *ProbeDef_Type) UnmarshalJSON(data []byte) error { value, err := proto.UnmarshalJSONEnum(ProbeDef_Type_value, data, "ProbeDef_Type") if err != nil { @@ -83,8 +88,9 @@ func (x *ProbeDef_Type) UnmarshalJSON(data []byte) error { *x = ProbeDef_Type(value) return nil } + func (ProbeDef_Type) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_config_be8fa0af4204c62d, []int{0, 0} + return fileDescriptor_8261ee47d309caad, []int{0, 0} } // IP version to use for networking probes. If specified, this is used at the @@ -112,6 +118,7 @@ var ProbeDef_IPVersion_name = map[int32]string{ 1: "IPV4", 2: "IPV6", } + var ProbeDef_IPVersion_value = map[string]int32{ "IP_VERSION_UNSPECIFIED": 0, "IPV4": 1, @@ -123,9 +130,11 @@ func (x ProbeDef_IPVersion) Enum() *ProbeDef_IPVersion { *p = x return p } + func (x ProbeDef_IPVersion) String() string { return proto.EnumName(ProbeDef_IPVersion_name, int32(x)) } + func (x *ProbeDef_IPVersion) UnmarshalJSON(data []byte) error { value, err := proto.UnmarshalJSONEnum(ProbeDef_IPVersion_value, data, "ProbeDef_IPVersion") if err != nil { @@ -134,8 +143,9 @@ func (x *ProbeDef_IPVersion) UnmarshalJSON(data []byte) error { *x = ProbeDef_IPVersion(value) return nil } + func (ProbeDef_IPVersion) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_config_be8fa0af4204c62d, []int{0, 1} + return fileDescriptor_8261ee47d309caad, []int{0, 1} } type ProbeDef struct { @@ -197,7 +207,7 @@ func (m *ProbeDef) Reset() { *m = ProbeDef{} } func (m *ProbeDef) String() string { return proto.CompactTextString(m) } func (*ProbeDef) ProtoMessage() {} func (*ProbeDef) Descriptor() ([]byte, []int) { - return fileDescriptor_config_be8fa0af4204c62d, []int{0} + return fileDescriptor_8261ee47d309caad, []int{0} } var extRange_ProbeDef = []proto.ExtensionRange{ @@ -207,14 +217,15 @@ var extRange_ProbeDef = []proto.ExtensionRange{ func (*ProbeDef) ExtensionRangeArray() []proto.ExtensionRange { return extRange_ProbeDef } + func (m *ProbeDef) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProbeDef.Unmarshal(m, b) } func (m *ProbeDef) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ProbeDef.Marshal(b, m, deterministic) } -func (dst *ProbeDef) XXX_Merge(src proto.Message) { - xxx_messageInfo_ProbeDef.Merge(dst, src) +func (m *ProbeDef) XXX_Merge(src proto.Message) { + xxx_messageInfo_ProbeDef.Merge(m, src) } func (m *ProbeDef) XXX_Size() int { return xxx_messageInfo_ProbeDef.Size(m) @@ -452,9 +463,9 @@ func (m *ProbeDef) GetDebugOptions() *DebugOptions { return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*ProbeDef) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _ProbeDef_OneofMarshaler, _ProbeDef_OneofUnmarshaler, _ProbeDef_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*ProbeDef) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*ProbeDef_SourceIp)(nil), (*ProbeDef_SourceInterface)(nil), (*ProbeDef_PingProbe)(nil), @@ -467,198 +478,6 @@ func (*ProbeDef) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) erro } } -func _ProbeDef_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*ProbeDef) - // source_ip_config - switch x := m.SourceIpConfig.(type) { - case *ProbeDef_SourceIp: - b.EncodeVarint(10<<3 | proto.WireBytes) - b.EncodeStringBytes(x.SourceIp) - case *ProbeDef_SourceInterface: - b.EncodeVarint(11<<3 | proto.WireBytes) - b.EncodeStringBytes(x.SourceInterface) - case nil: - default: - return fmt.Errorf("ProbeDef.SourceIpConfig has unexpected type %T", x) - } - // probe - switch x := m.Probe.(type) { - case *ProbeDef_PingProbe: - b.EncodeVarint(20<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.PingProbe); err != nil { - return err - } - case *ProbeDef_HttpProbe: - b.EncodeVarint(21<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.HttpProbe); err != nil { - return err - } - case *ProbeDef_DnsProbe: - b.EncodeVarint(22<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.DnsProbe); err != nil { - return err - } - case *ProbeDef_ExternalProbe: - b.EncodeVarint(23<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.ExternalProbe); err != nil { - return err - } - case *ProbeDef_UdpProbe: - b.EncodeVarint(24<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.UdpProbe); err != nil { - return err - } - case *ProbeDef_UdpListenerProbe: - b.EncodeVarint(25<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.UdpListenerProbe); err != nil { - return err - } - case *ProbeDef_UserDefinedProbe: - b.EncodeVarint(99<<3 | proto.WireBytes) - b.EncodeStringBytes(x.UserDefinedProbe) - case nil: - default: - return fmt.Errorf("ProbeDef.Probe has unexpected type %T", x) - } - return nil -} - -func _ProbeDef_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*ProbeDef) - switch tag { - case 10: // source_ip_config.source_ip - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.SourceIpConfig = &ProbeDef_SourceIp{x} - return true, err - case 11: // source_ip_config.source_interface - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.SourceIpConfig = &ProbeDef_SourceInterface{x} - return true, err - case 20: // probe.ping_probe - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(proto4.ProbeConf) - err := b.DecodeMessage(msg) - m.Probe = &ProbeDef_PingProbe{msg} - return true, err - case 21: // probe.http_probe - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(proto5.ProbeConf) - err := b.DecodeMessage(msg) - m.Probe = &ProbeDef_HttpProbe{msg} - return true, err - case 22: // probe.dns_probe - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(proto6.ProbeConf) - err := b.DecodeMessage(msg) - m.Probe = &ProbeDef_DnsProbe{msg} - return true, err - case 23: // probe.external_probe - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(proto7.ProbeConf) - err := b.DecodeMessage(msg) - m.Probe = &ProbeDef_ExternalProbe{msg} - return true, err - case 24: // probe.udp_probe - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(proto8.ProbeConf) - err := b.DecodeMessage(msg) - m.Probe = &ProbeDef_UdpProbe{msg} - return true, err - case 25: // probe.udp_listener_probe - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(proto9.ProbeConf) - err := b.DecodeMessage(msg) - m.Probe = &ProbeDef_UdpListenerProbe{msg} - return true, err - case 99: // probe.user_defined_probe - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Probe = &ProbeDef_UserDefinedProbe{x} - return true, err - default: - return false, nil - } -} - -func _ProbeDef_OneofSizer(msg proto.Message) (n int) { - m := msg.(*ProbeDef) - // source_ip_config - switch x := m.SourceIpConfig.(type) { - case *ProbeDef_SourceIp: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.SourceIp))) - n += len(x.SourceIp) - case *ProbeDef_SourceInterface: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.SourceInterface))) - n += len(x.SourceInterface) - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - // probe - switch x := m.Probe.(type) { - case *ProbeDef_PingProbe: - s := proto.Size(x.PingProbe) - n += 2 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *ProbeDef_HttpProbe: - s := proto.Size(x.HttpProbe) - n += 2 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *ProbeDef_DnsProbe: - s := proto.Size(x.DnsProbe) - n += 2 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *ProbeDef_ExternalProbe: - s := proto.Size(x.ExternalProbe) - n += 2 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *ProbeDef_UdpProbe: - s := proto.Size(x.UdpProbe) - n += 2 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *ProbeDef_UdpListenerProbe: - s := proto.Size(x.UdpListenerProbe) - n += 2 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *ProbeDef_UserDefinedProbe: - n += 2 // tag and wire - n += proto.SizeVarint(uint64(len(x.UserDefinedProbe))) - n += len(x.UserDefinedProbe) - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - type DebugOptions struct { // Whether to log metrics or not. LogMetrics *bool `protobuf:"varint,1,opt,name=log_metrics,json=logMetrics" json:"log_metrics,omitempty"` @@ -671,16 +490,17 @@ func (m *DebugOptions) Reset() { *m = DebugOptions{} } func (m *DebugOptions) String() string { return proto.CompactTextString(m) } func (*DebugOptions) ProtoMessage() {} func (*DebugOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_config_be8fa0af4204c62d, []int{1} + return fileDescriptor_8261ee47d309caad, []int{1} } + func (m *DebugOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DebugOptions.Unmarshal(m, b) } func (m *DebugOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_DebugOptions.Marshal(b, m, deterministic) } -func (dst *DebugOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_DebugOptions.Merge(dst, src) +func (m *DebugOptions) XXX_Merge(src proto.Message) { + xxx_messageInfo_DebugOptions.Merge(m, src) } func (m *DebugOptions) XXX_Size() int { return xxx_messageInfo_DebugOptions.Size(m) @@ -699,17 +519,17 @@ func (m *DebugOptions) GetLogMetrics() bool { } func init() { - proto.RegisterType((*ProbeDef)(nil), "cloudprober.probes.ProbeDef") - proto.RegisterType((*DebugOptions)(nil), "cloudprober.probes.DebugOptions") proto.RegisterEnum("cloudprober.probes.ProbeDef_Type", ProbeDef_Type_name, ProbeDef_Type_value) proto.RegisterEnum("cloudprober.probes.ProbeDef_IPVersion", ProbeDef_IPVersion_name, ProbeDef_IPVersion_value) + proto.RegisterType((*ProbeDef)(nil), "cloudprober.probes.ProbeDef") + proto.RegisterType((*DebugOptions)(nil), "cloudprober.probes.DebugOptions") } func init() { - proto.RegisterFile("github.com/google/cloudprober/probes/proto/config.proto", fileDescriptor_config_be8fa0af4204c62d) + proto.RegisterFile("github.com/google/cloudprober/probes/proto/config.proto", fileDescriptor_8261ee47d309caad) } -var fileDescriptor_config_be8fa0af4204c62d = []byte{ +var fileDescriptor_8261ee47d309caad = []byte{ // 876 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0xdd, 0x6e, 0xdb, 0x36, 0x14, 0xc7, 0x2b, 0xc7, 0x6e, 0xac, 0x63, 0x3b, 0x13, 0xb8, 0x7e, 0xa8, 0x06, 0x86, 0x6a, 0x06, diff --git a/probes/testdata/testdata.pb.go b/probes/testdata/testdata.pb.go index fa68d31f..33b2f2de 100644 --- a/probes/testdata/testdata.pb.go +++ b/probes/testdata/testdata.pb.go @@ -3,10 +3,12 @@ package testdata -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import proto1 "github.com/google/cloudprober/probes/proto" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + proto1 "github.com/google/cloudprober/probes/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -17,7 +19,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type FancyProbe struct { Name *string `protobuf:"bytes,1,req,name=name" json:"name,omitempty"` @@ -30,16 +32,17 @@ func (m *FancyProbe) Reset() { *m = FancyProbe{} } func (m *FancyProbe) String() string { return proto.CompactTextString(m) } func (*FancyProbe) ProtoMessage() {} func (*FancyProbe) Descriptor() ([]byte, []int) { - return fileDescriptor_testdata_cc9d738d6f49fdf4, []int{0} + return fileDescriptor_2015bff03d7d7bfa, []int{0} } + func (m *FancyProbe) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FancyProbe.Unmarshal(m, b) } func (m *FancyProbe) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_FancyProbe.Marshal(b, m, deterministic) } -func (dst *FancyProbe) XXX_Merge(src proto.Message) { - xxx_messageInfo_FancyProbe.Merge(dst, src) +func (m *FancyProbe) XXX_Merge(src proto.Message) { + xxx_messageInfo_FancyProbe.Merge(m, src) } func (m *FancyProbe) XXX_Size() int { return xxx_messageInfo_FancyProbe.Size(m) @@ -62,7 +65,7 @@ var E_FancyProbe = &proto.ExtensionDesc{ ExtensionType: (*FancyProbe)(nil), Field: 200, Name: "cloudprober.probes.testdata.fancy_probe", - Tag: "bytes,200,opt,name=fancy_probe,json=fancyProbe", + Tag: "bytes,200,opt,name=fancy_probe", Filename: "github.com/google/cloudprober/probes/testdata/testdata.proto", } @@ -72,10 +75,10 @@ func init() { } func init() { - proto.RegisterFile("github.com/google/cloudprober/probes/testdata/testdata.proto", fileDescriptor_testdata_cc9d738d6f49fdf4) + proto.RegisterFile("github.com/google/cloudprober/probes/testdata/testdata.proto", fileDescriptor_2015bff03d7d7bfa) } -var fileDescriptor_testdata_cc9d738d6f49fdf4 = []byte{ +var fileDescriptor_2015bff03d7d7bfa = []byte{ // 171 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0x49, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xcf, 0xcf, 0x4f, 0xcf, 0x49, 0xd5, 0x4f, 0xce, diff --git a/probes/udp/proto/config.pb.go b/probes/udp/proto/config.pb.go index 00a52875..718f8431 100644 --- a/probes/udp/proto/config.pb.go +++ b/probes/udp/proto/config.pb.go @@ -3,9 +3,11 @@ package proto -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,22 +18,12 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type ProbeConf struct { - // Export stats after these many milliseconds - // NOTE: Setting stats export interval using this field doesn't work anymore. - // This field will be removed after the release v0.10.3. To set - // stats_export_interval, please modify the outer probe configuration. - // probe { - // type: UDP - // stats_export_interval_msec: 10000 - // udp_probe {} - // } - StatsExportIntervalMsec *int32 `protobuf:"varint,2,opt,name=stats_export_interval_msec,json=statsExportIntervalMsec,def=10000" json:"stats_export_interval_msec,omitempty"` - // Port to send UDP Ping to (UDP Echo). Should be same as + // Port to send UDP Ping to (UDP Echo). If running with the UDP server that + // comes with cloudprober, it should be same as // ProberConfig.udp_echo_server_port. - // TODO(_): Can we just read this from ProberConfig? Port *int32 `protobuf:"varint,3,opt,name=port,def=31122" json:"port,omitempty"` // Number of sending side ports to use. NumTxPorts *int32 `protobuf:"varint,4,opt,name=num_tx_ports,json=numTxPorts,def=16" json:"num_tx_ports,omitempty"` @@ -69,16 +61,17 @@ func (m *ProbeConf) Reset() { *m = ProbeConf{} } func (m *ProbeConf) String() string { return proto.CompactTextString(m) } func (*ProbeConf) ProtoMessage() {} func (*ProbeConf) Descriptor() ([]byte, []int) { - return fileDescriptor_config_f1551a718a2bffdc, []int{0} + return fileDescriptor_c34d5b2886f1258a, []int{0} } + func (m *ProbeConf) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProbeConf.Unmarshal(m, b) } func (m *ProbeConf) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ProbeConf.Marshal(b, m, deterministic) } -func (dst *ProbeConf) XXX_Merge(src proto.Message) { - xxx_messageInfo_ProbeConf.Merge(dst, src) +func (m *ProbeConf) XXX_Merge(src proto.Message) { + xxx_messageInfo_ProbeConf.Merge(m, src) } func (m *ProbeConf) XXX_Size() int { return xxx_messageInfo_ProbeConf.Size(m) @@ -89,20 +82,12 @@ func (m *ProbeConf) XXX_DiscardUnknown() { var xxx_messageInfo_ProbeConf proto.InternalMessageInfo -const Default_ProbeConf_StatsExportIntervalMsec int32 = 10000 const Default_ProbeConf_Port int32 = 31122 const Default_ProbeConf_NumTxPorts int32 = 16 const Default_ProbeConf_MaxLength int32 = 1300 const Default_ProbeConf_ExportMetricsByPort bool = false const Default_ProbeConf_UseAllTxPortsPerProbe bool = false -func (m *ProbeConf) GetStatsExportIntervalMsec() int32 { - if m != nil && m.StatsExportIntervalMsec != nil { - return *m.StatsExportIntervalMsec - } - return Default_ProbeConf_StatsExportIntervalMsec -} - func (m *ProbeConf) GetPort() int32 { if m != nil && m.Port != nil { return *m.Port @@ -150,29 +135,27 @@ func init() { } func init() { - proto.RegisterFile("github.com/google/cloudprober/probes/udp/proto/config.proto", fileDescriptor_config_f1551a718a2bffdc) -} - -var fileDescriptor_config_f1551a718a2bffdc = []byte{ - // 318 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0xd0, 0x4d, 0x6b, 0x22, 0x31, - 0x18, 0x07, 0x70, 0x74, 0x9d, 0x5d, 0x0d, 0x7b, 0xca, 0xb2, 0x36, 0x15, 0x0a, 0xd2, 0xf6, 0xe0, - 0x69, 0x5e, 0x14, 0x7a, 0xb0, 0x97, 0xd6, 0xd2, 0x43, 0xa1, 0x82, 0x0c, 0xa5, 0xd7, 0x30, 0x8e, - 0x8f, 0x63, 0x20, 0x6f, 0xe4, 0x45, 0xc6, 0xaf, 0xd9, 0x4f, 0x54, 0x92, 0x91, 0xe2, 0x69, 0xe6, - 0xf9, 0xf3, 0x0b, 0xf9, 0xe7, 0x41, 0x8f, 0x0d, 0x73, 0x07, 0xbf, 0x4d, 0x6b, 0x25, 0xb2, 0x46, - 0xa9, 0x86, 0x43, 0x56, 0x73, 0xe5, 0x77, 0xda, 0xa8, 0x2d, 0x98, 0x2c, 0x7e, 0x6c, 0xe6, 0x77, - 0x3a, 0xfc, 0x3a, 0x95, 0xd5, 0x4a, 0xee, 0x59, 0x93, 0xc6, 0x01, 0x8f, 0x2f, 0x68, 0xda, 0xd1, - 0xd4, 0xef, 0xf4, 0xed, 0x57, 0x1f, 0x8d, 0x36, 0x61, 0x7c, 0x51, 0x72, 0x8f, 0x57, 0x68, 0x62, - 0x5d, 0xe5, 0x2c, 0x85, 0x56, 0x2b, 0xe3, 0x28, 0x93, 0x0e, 0xcc, 0xb1, 0xe2, 0x54, 0x58, 0xa8, - 0x49, 0x7f, 0xda, 0x9b, 0x25, 0xcb, 0xa4, 0xc8, 0xf3, 0x3c, 0x2f, 0xaf, 0x22, 0x7c, 0x8d, 0xee, - 0xed, 0xcc, 0xd6, 0x16, 0x6a, 0x7c, 0x8d, 0x06, 0x21, 0x23, 0xbf, 0x3a, 0xbd, 0x28, 0x8a, 0xf9, - 0xbc, 0x8c, 0x11, 0xbe, 0x47, 0x7f, 0xa5, 0x17, 0xd4, 0xb5, 0x34, 0x8c, 0x96, 0x0c, 0x22, 0xe9, - 0x17, 0x0f, 0x25, 0x92, 0x5e, 0x7c, 0xb4, 0x9b, 0x90, 0xe2, 0x3b, 0x84, 0x44, 0xd5, 0x52, 0x0e, - 0xb2, 0x71, 0x07, 0x92, 0x44, 0x33, 0x28, 0x16, 0x79, 0x5e, 0x8e, 0x44, 0xd5, 0xbe, 0xc7, 0x18, - 0xdf, 0x20, 0xc4, 0x34, 0x3d, 0x82, 0xb1, 0x4c, 0x49, 0xf2, 0x3b, 0xa0, 0x72, 0xc4, 0xf4, 0x67, - 0x17, 0xe0, 0x25, 0x1a, 0x9f, 0x9f, 0x20, 0xc0, 0x19, 0x56, 0x5b, 0xba, 0x3d, 0xc5, 0x4b, 0xc9, - 0x9f, 0x69, 0x6f, 0x36, 0x5c, 0x26, 0xfb, 0x8a, 0x5b, 0x28, 0xff, 0x75, 0x68, 0xdd, 0x99, 0xd5, - 0x29, 0x14, 0xc0, 0x4f, 0x68, 0xe2, 0x2d, 0xd0, 0x8a, 0xf3, 0x9f, 0xa6, 0x54, 0x83, 0xa1, 0x71, - 0x6b, 0x64, 0x78, 0x79, 0xfe, 0xbf, 0xb7, 0xf0, 0xcc, 0xf9, 0xb9, 0xf9, 0x06, 0x4c, 0x5c, 0xe5, - 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x14, 0x17, 0xcd, 0xbf, 0xaa, 0x01, 0x00, 0x00, + proto.RegisterFile("github.com/google/cloudprober/probes/udp/proto/config.proto", fileDescriptor_c34d5b2886f1258a) +} + +var fileDescriptor_c34d5b2886f1258a = []byte{ + // 277 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x90, 0xcb, 0x4b, 0xc3, 0x30, + 0x1c, 0xc7, 0xd9, 0x6c, 0x75, 0x0d, 0x9e, 0x22, 0x8e, 0x28, 0x08, 0x43, 0x3d, 0xec, 0xd4, 0xae, + 0x1b, 0x78, 0xa8, 0x17, 0x1f, 0x57, 0x85, 0x52, 0xc4, 0x6b, 0xe8, 0x23, 0xed, 0x02, 0x79, 0x91, + 0x87, 0x74, 0xff, 0x84, 0x7f, 0xb3, 0x24, 0x95, 0xb1, 0x53, 0xf2, 0xfd, 0xf0, 0x09, 0xbf, 0x6f, + 0x7e, 0xe0, 0x79, 0xa0, 0x76, 0xef, 0x9a, 0xb4, 0x95, 0x3c, 0x1b, 0xa4, 0x1c, 0x18, 0xc9, 0x5a, + 0x26, 0x5d, 0xa7, 0xb4, 0x6c, 0x88, 0xce, 0xc2, 0x61, 0x32, 0xd7, 0x29, 0x7f, 0xb5, 0x32, 0x6b, + 0xa5, 0xe8, 0xe9, 0x90, 0x86, 0x00, 0x97, 0x27, 0x6a, 0x3a, 0xa9, 0xa9, 0xeb, 0xd4, 0xfd, 0xef, + 0x1c, 0x24, 0xa5, 0x8f, 0xef, 0x52, 0xf4, 0xf0, 0x06, 0x44, 0x4a, 0x6a, 0x8b, 0xce, 0x56, 0xb3, + 0x75, 0x5c, 0xc4, 0xbb, 0x3c, 0xdf, 0x6e, 0xab, 0x80, 0xe0, 0x23, 0xb8, 0x14, 0x8e, 0x63, 0x3b, + 0x62, 0x1f, 0x0d, 0x8a, 0x82, 0x32, 0xcf, 0x9f, 0x2a, 0x20, 0x1c, 0xff, 0x1a, 0x4b, 0x4f, 0xe1, + 0x03, 0x00, 0xbc, 0x1e, 0x31, 0x23, 0x62, 0xb0, 0x7b, 0x14, 0x07, 0x27, 0xca, 0x77, 0x9b, 0x4d, + 0x95, 0xf0, 0x7a, 0xfc, 0x08, 0x18, 0xde, 0x01, 0x40, 0x15, 0xfe, 0x21, 0xda, 0x50, 0x29, 0xd0, + 0xb9, 0x97, 0xaa, 0x84, 0xaa, 0xef, 0x09, 0xc0, 0x02, 0x2c, 0xc9, 0xe8, 0x87, 0x60, 0x4e, 0xac, + 0xa6, 0xad, 0xc1, 0xcd, 0x21, 0x0c, 0x45, 0x17, 0xab, 0xd9, 0x7a, 0x51, 0xc4, 0x7d, 0xcd, 0x0c, + 0xa9, 0xae, 0x26, 0xe9, 0x73, 0x72, 0xde, 0x0e, 0xbe, 0x00, 0x7c, 0x01, 0xb7, 0xce, 0x10, 0x5c, + 0x33, 0x76, 0x6c, 0x8a, 0x15, 0xd1, 0x38, 0xfc, 0x18, 0x2d, 0x4e, 0xdf, 0x5f, 0x3b, 0x43, 0x5e, + 0x19, 0xfb, 0x6f, 0x5e, 0x12, 0x1d, 0xd6, 0xf0, 0x17, 0x00, 0x00, 0xff, 0xff, 0xfe, 0xc2, 0x40, + 0x2e, 0x66, 0x01, 0x00, 0x00, } diff --git a/probes/udplistener/proto/config.pb.go b/probes/udplistener/proto/config.pb.go index 6dde9bd2..d7e24230 100644 --- a/probes/udplistener/proto/config.pb.go +++ b/probes/udplistener/proto/config.pb.go @@ -3,9 +3,11 @@ package proto -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // Probe response to an incoming packet: echo back or discard. type ProbeConf_Type int32 @@ -32,6 +34,7 @@ var ProbeConf_Type_name = map[int32]string{ 1: "ECHO", 2: "DISCARD", } + var ProbeConf_Type_value = map[string]int32{ "INVALID": 0, "ECHO": 1, @@ -43,9 +46,11 @@ func (x ProbeConf_Type) Enum() *ProbeConf_Type { *p = x return p } + func (x ProbeConf_Type) String() string { return proto.EnumName(ProbeConf_Type_name, int32(x)) } + func (x *ProbeConf_Type) UnmarshalJSON(data []byte) error { value, err := proto.UnmarshalJSONEnum(ProbeConf_Type_value, data, "ProbeConf_Type") if err != nil { @@ -54,21 +59,12 @@ func (x *ProbeConf_Type) UnmarshalJSON(data []byte) error { *x = ProbeConf_Type(value) return nil } + func (ProbeConf_Type) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_config_7f0ff503bb515283, []int{0, 0} + return fileDescriptor_0a7b637d799d3e08, []int{0, 0} } type ProbeConf struct { - // Export stats after these many milliseconds - // NOTE: Setting stats export interval using this field doesn't work anymore. - // This field will be removed after the release v0.10.3. To set - // stats_export_interval, please modify the outer probe configuration. - // probe { - // type: UDP_LISTENER - // stats_export_interval_msec: 10000 - // udplistener_probe {} - // } - StatsExportIntervalMsec *int32 `protobuf:"varint,2,opt,name=stats_export_interval_msec,json=statsExportIntervalMsec,def=10000" json:"stats_export_interval_msec,omitempty"` // Port to listen. Port *int32 `protobuf:"varint,3,opt,name=port,def=32212" json:"port,omitempty"` Type *ProbeConf_Type `protobuf:"varint,4,opt,name=type,enum=cloudprober.probes.udplistener.ProbeConf_Type" json:"type,omitempty"` @@ -83,16 +79,17 @@ func (m *ProbeConf) Reset() { *m = ProbeConf{} } func (m *ProbeConf) String() string { return proto.CompactTextString(m) } func (*ProbeConf) ProtoMessage() {} func (*ProbeConf) Descriptor() ([]byte, []int) { - return fileDescriptor_config_7f0ff503bb515283, []int{0} + return fileDescriptor_0a7b637d799d3e08, []int{0} } + func (m *ProbeConf) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProbeConf.Unmarshal(m, b) } func (m *ProbeConf) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ProbeConf.Marshal(b, m, deterministic) } -func (dst *ProbeConf) XXX_Merge(src proto.Message) { - xxx_messageInfo_ProbeConf.Merge(dst, src) +func (m *ProbeConf) XXX_Merge(src proto.Message) { + xxx_messageInfo_ProbeConf.Merge(m, src) } func (m *ProbeConf) XXX_Size() int { return xxx_messageInfo_ProbeConf.Size(m) @@ -103,17 +100,9 @@ func (m *ProbeConf) XXX_DiscardUnknown() { var xxx_messageInfo_ProbeConf proto.InternalMessageInfo -const Default_ProbeConf_StatsExportIntervalMsec int32 = 10000 const Default_ProbeConf_Port int32 = 32212 const Default_ProbeConf_PacketsPerProbe int32 = 1 -func (m *ProbeConf) GetStatsExportIntervalMsec() int32 { - if m != nil && m.StatsExportIntervalMsec != nil { - return *m.StatsExportIntervalMsec - } - return Default_ProbeConf_StatsExportIntervalMsec -} - func (m *ProbeConf) GetPort() int32 { if m != nil && m.Port != nil { return *m.Port @@ -136,32 +125,29 @@ func (m *ProbeConf) GetPacketsPerProbe() int32 { } func init() { - proto.RegisterType((*ProbeConf)(nil), "cloudprober.probes.udplistener.ProbeConf") proto.RegisterEnum("cloudprober.probes.udplistener.ProbeConf_Type", ProbeConf_Type_name, ProbeConf_Type_value) + proto.RegisterType((*ProbeConf)(nil), "cloudprober.probes.udplistener.ProbeConf") } func init() { - proto.RegisterFile("github.com/google/cloudprober/probes/udplistener/proto/config.proto", fileDescriptor_config_7f0ff503bb515283) -} - -var fileDescriptor_config_7f0ff503bb515283 = []byte{ - // 275 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x8e, 0x4f, 0x4b, 0xfb, 0x30, - 0x1c, 0x87, 0x7f, 0xed, 0xaf, 0x45, 0x8d, 0xa0, 0x35, 0x17, 0xab, 0x07, 0x19, 0x3b, 0x0d, 0xc1, - 0xf4, 0x8f, 0x37, 0x6f, 0x5b, 0x3b, 0xb0, 0xe0, 0x9f, 0x11, 0xc5, 0x6b, 0xe8, 0xb2, 0xef, 0x6a, - 0xb1, 0x6b, 0x42, 0x92, 0x8a, 0x7b, 0x09, 0xbe, 0x6b, 0x69, 0x3a, 0x64, 0x27, 0x4f, 0x21, 0x4f, - 0x9e, 0x87, 0x7c, 0x50, 0x56, 0xd5, 0xe6, 0xbd, 0x5b, 0x12, 0x2e, 0x36, 0x51, 0x25, 0x44, 0xd5, - 0x40, 0xc4, 0x1b, 0xd1, 0xad, 0xa4, 0x12, 0x4b, 0x50, 0x91, 0x3d, 0x74, 0xd4, 0xad, 0x64, 0x53, - 0x6b, 0x03, 0xed, 0x80, 0x8c, 0x88, 0xb8, 0x68, 0xd7, 0x75, 0x45, 0xec, 0x05, 0x5f, 0xed, 0x25, - 0x64, 0x48, 0xc8, 0x5e, 0x32, 0xfe, 0x76, 0xd1, 0xd1, 0xa2, 0xc7, 0x99, 0x68, 0xd7, 0x78, 0x86, - 0x2e, 0xb5, 0x29, 0x8d, 0x66, 0xf0, 0x25, 0x85, 0x32, 0xac, 0x6e, 0x0d, 0xa8, 0xcf, 0xb2, 0x61, - 0x1b, 0x0d, 0x3c, 0x74, 0x47, 0xce, 0xc4, 0xbf, 0xf3, 0x93, 0x38, 0x8e, 0x63, 0x7a, 0x6e, 0xc5, - 0xb9, 0xf5, 0x8a, 0x9d, 0xf6, 0xa8, 0x81, 0xe3, 0x0b, 0xe4, 0xf5, 0x2c, 0xfc, 0x3f, 0xd8, 0xb7, - 0x69, 0x9a, 0xa4, 0xd4, 0x22, 0x3c, 0x43, 0x9e, 0xd9, 0x4a, 0x08, 0xbd, 0x91, 0x33, 0x39, 0x49, - 0x09, 0xf9, 0x7b, 0x1b, 0xf9, 0xdd, 0x45, 0x5e, 0xb7, 0x12, 0xa8, 0x6d, 0xf1, 0x0d, 0x3a, 0x93, - 0x25, 0xff, 0x00, 0xa3, 0x99, 0x04, 0xc5, 0x6c, 0x16, 0xfa, 0xf6, 0x2f, 0x27, 0xa1, 0xa7, 0xbb, - 0xb7, 0x05, 0x28, 0x5b, 0x8f, 0xaf, 0x91, 0xd7, 0xc7, 0xf8, 0x18, 0x1d, 0x14, 0x4f, 0x6f, 0xd3, - 0x87, 0x22, 0x0f, 0xfe, 0xe1, 0x43, 0xe4, 0xcd, 0xb3, 0xfb, 0xe7, 0xc0, 0xe9, 0x71, 0x5e, 0xbc, - 0x64, 0x53, 0x9a, 0x07, 0xee, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe7, 0xde, 0x11, 0x3a, 0x71, - 0x01, 0x00, 0x00, + proto.RegisterFile("github.com/google/cloudprober/probes/udplistener/proto/config.proto", fileDescriptor_0a7b637d799d3e08) +} + +var fileDescriptor_0a7b637d799d3e08 = []byte{ + // 232 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0x4e, 0xcf, 0x2c, 0xc9, + 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xcf, 0xcf, 0x4f, 0xcf, 0x49, 0xd5, 0x4f, 0xce, + 0xc9, 0x2f, 0x4d, 0x29, 0x28, 0xca, 0x4f, 0x4a, 0x2d, 0xd2, 0x07, 0x53, 0xc5, 0xfa, 0xa5, 0x29, + 0x05, 0x39, 0x99, 0xc5, 0x25, 0xa9, 0x79, 0x10, 0xa1, 0x92, 0x7c, 0xfd, 0xe4, 0xfc, 0xbc, 0xb4, + 0xcc, 0x74, 0x3d, 0x30, 0x47, 0x48, 0x0e, 0x49, 0x8b, 0x1e, 0x44, 0x8b, 0x1e, 0x92, 0x16, 0xa5, + 0xa3, 0x8c, 0x5c, 0x9c, 0x01, 0x20, 0x61, 0xe7, 0xfc, 0xbc, 0x34, 0x21, 0x49, 0x2e, 0x96, 0x82, + 0xfc, 0xa2, 0x12, 0x09, 0x66, 0x05, 0x46, 0x0d, 0x56, 0x2b, 0x56, 0x63, 0x23, 0x23, 0x43, 0xa3, + 0x20, 0xb0, 0x90, 0x90, 0x13, 0x17, 0x4b, 0x49, 0x65, 0x41, 0xaa, 0x04, 0x8b, 0x02, 0xa3, 0x06, + 0x9f, 0x91, 0x9e, 0x1e, 0x7e, 0x73, 0xf5, 0xe0, 0x66, 0xea, 0x85, 0x54, 0x16, 0xa4, 0x06, 0x81, + 0xf5, 0x0a, 0xe9, 0x72, 0x09, 0x16, 0x24, 0x26, 0x67, 0xa7, 0x96, 0x14, 0xc7, 0x17, 0xa4, 0x16, + 0xc5, 0x83, 0xb5, 0x49, 0xb0, 0x82, 0xed, 0x62, 0x34, 0x0c, 0xe2, 0x87, 0xca, 0x05, 0xa4, 0x16, + 0x81, 0x75, 0x2b, 0x69, 0x71, 0xb1, 0x80, 0x34, 0x0b, 0x71, 0x73, 0xb1, 0x7b, 0xfa, 0x85, 0x39, + 0xfa, 0x78, 0xba, 0x08, 0x30, 0x08, 0x71, 0x70, 0xb1, 0xb8, 0x3a, 0x7b, 0xf8, 0x0b, 0x30, 0x82, + 0x84, 0x5d, 0x3c, 0x83, 0x9d, 0x1d, 0x83, 0x5c, 0x04, 0x98, 0x00, 0x01, 0x00, 0x00, 0xff, 0xff, + 0xdf, 0xfc, 0x8d, 0xff, 0x2d, 0x01, 0x00, 0x00, } diff --git a/servers/grpc/proto/config.pb.go b/servers/grpc/proto/config.pb.go index 00cf3770..b217576e 100644 --- a/servers/grpc/proto/config.pb.go +++ b/servers/grpc/proto/config.pb.go @@ -3,9 +3,11 @@ package proto -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type ServerConf struct { Port *int32 `protobuf:"varint,1,opt,name=port,def=3142" json:"port,omitempty"` @@ -36,16 +38,17 @@ func (m *ServerConf) Reset() { *m = ServerConf{} } func (m *ServerConf) String() string { return proto.CompactTextString(m) } func (*ServerConf) ProtoMessage() {} func (*ServerConf) Descriptor() ([]byte, []int) { - return fileDescriptor_config_f7622f48f3c6398f, []int{0} + return fileDescriptor_b033b1036a04c243, []int{0} } + func (m *ServerConf) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ServerConf.Unmarshal(m, b) } func (m *ServerConf) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ServerConf.Marshal(b, m, deterministic) } -func (dst *ServerConf) XXX_Merge(src proto.Message) { - xxx_messageInfo_ServerConf.Merge(dst, src) +func (m *ServerConf) XXX_Merge(src proto.Message) { + xxx_messageInfo_ServerConf.Merge(m, src) } func (m *ServerConf) XXX_Size() int { return xxx_messageInfo_ServerConf.Size(m) @@ -86,10 +89,10 @@ func init() { } func init() { - proto.RegisterFile("github.com/google/cloudprober/servers/grpc/proto/config.proto", fileDescriptor_config_f7622f48f3c6398f) + proto.RegisterFile("github.com/google/cloudprober/servers/grpc/proto/config.proto", fileDescriptor_b033b1036a04c243) } -var fileDescriptor_config_f7622f48f3c6398f = []byte{ +var fileDescriptor_b033b1036a04c243 = []byte{ // 200 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0xce, 0xb1, 0x4e, 0x04, 0x21, 0x10, 0x06, 0xe0, 0xa0, 0x7b, 0x89, 0xa1, 0x52, 0x62, 0x41, 0x79, 0xb1, 0xba, 0x0a, 0xe2, 0x69, diff --git a/servers/grpc/proto/grpcservice.pb.go b/servers/grpc/proto/grpcservice.pb.go index 9ea3665a..6ce04c5b 100644 --- a/servers/grpc/proto/grpcservice.pb.go +++ b/servers/grpc/proto/grpcservice.pb.go @@ -3,13 +3,14 @@ package proto -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" - import ( - context "golang.org/x/net/context" + context "context" + fmt "fmt" + proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. @@ -21,7 +22,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type EchoMessage struct { Blob []byte `protobuf:"bytes,1,opt,name=blob" json:"blob,omitempty"` @@ -34,16 +35,17 @@ func (m *EchoMessage) Reset() { *m = EchoMessage{} } func (m *EchoMessage) String() string { return proto.CompactTextString(m) } func (*EchoMessage) ProtoMessage() {} func (*EchoMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_grpcservice_f7cca979873043e0, []int{0} + return fileDescriptor_3ba4b0e85eb4edfe, []int{0} } + func (m *EchoMessage) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_EchoMessage.Unmarshal(m, b) } func (m *EchoMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_EchoMessage.Marshal(b, m, deterministic) } -func (dst *EchoMessage) XXX_Merge(src proto.Message) { - xxx_messageInfo_EchoMessage.Merge(dst, src) +func (m *EchoMessage) XXX_Merge(src proto.Message) { + xxx_messageInfo_EchoMessage.Merge(m, src) } func (m *EchoMessage) XXX_Size() int { return xxx_messageInfo_EchoMessage.Size(m) @@ -72,16 +74,17 @@ func (m *StatusRequest) Reset() { *m = StatusRequest{} } func (m *StatusRequest) String() string { return proto.CompactTextString(m) } func (*StatusRequest) ProtoMessage() {} func (*StatusRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_grpcservice_f7cca979873043e0, []int{1} + return fileDescriptor_3ba4b0e85eb4edfe, []int{1} } + func (m *StatusRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StatusRequest.Unmarshal(m, b) } func (m *StatusRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StatusRequest.Marshal(b, m, deterministic) } -func (dst *StatusRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_StatusRequest.Merge(dst, src) +func (m *StatusRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_StatusRequest.Merge(m, src) } func (m *StatusRequest) XXX_Size() int { return xxx_messageInfo_StatusRequest.Size(m) @@ -110,16 +113,17 @@ func (m *StatusResponse) Reset() { *m = StatusResponse{} } func (m *StatusResponse) String() string { return proto.CompactTextString(m) } func (*StatusResponse) ProtoMessage() {} func (*StatusResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_grpcservice_f7cca979873043e0, []int{2} + return fileDescriptor_3ba4b0e85eb4edfe, []int{2} } + func (m *StatusResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StatusResponse.Unmarshal(m, b) } func (m *StatusResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StatusResponse.Marshal(b, m, deterministic) } -func (dst *StatusResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_StatusResponse.Merge(dst, src) +func (m *StatusResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_StatusResponse.Merge(m, src) } func (m *StatusResponse) XXX_Size() int { return xxx_messageInfo_StatusResponse.Size(m) @@ -148,16 +152,17 @@ func (m *BlobReadRequest) Reset() { *m = BlobReadRequest{} } func (m *BlobReadRequest) String() string { return proto.CompactTextString(m) } func (*BlobReadRequest) ProtoMessage() {} func (*BlobReadRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_grpcservice_f7cca979873043e0, []int{3} + return fileDescriptor_3ba4b0e85eb4edfe, []int{3} } + func (m *BlobReadRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BlobReadRequest.Unmarshal(m, b) } func (m *BlobReadRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_BlobReadRequest.Marshal(b, m, deterministic) } -func (dst *BlobReadRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_BlobReadRequest.Merge(dst, src) +func (m *BlobReadRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_BlobReadRequest.Merge(m, src) } func (m *BlobReadRequest) XXX_Size() int { return xxx_messageInfo_BlobReadRequest.Size(m) @@ -186,16 +191,17 @@ func (m *BlobReadResponse) Reset() { *m = BlobReadResponse{} } func (m *BlobReadResponse) String() string { return proto.CompactTextString(m) } func (*BlobReadResponse) ProtoMessage() {} func (*BlobReadResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_grpcservice_f7cca979873043e0, []int{4} + return fileDescriptor_3ba4b0e85eb4edfe, []int{4} } + func (m *BlobReadResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BlobReadResponse.Unmarshal(m, b) } func (m *BlobReadResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_BlobReadResponse.Marshal(b, m, deterministic) } -func (dst *BlobReadResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_BlobReadResponse.Merge(dst, src) +func (m *BlobReadResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_BlobReadResponse.Merge(m, src) } func (m *BlobReadResponse) XXX_Size() int { return xxx_messageInfo_BlobReadResponse.Size(m) @@ -224,16 +230,17 @@ func (m *BlobWriteRequest) Reset() { *m = BlobWriteRequest{} } func (m *BlobWriteRequest) String() string { return proto.CompactTextString(m) } func (*BlobWriteRequest) ProtoMessage() {} func (*BlobWriteRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_grpcservice_f7cca979873043e0, []int{5} + return fileDescriptor_3ba4b0e85eb4edfe, []int{5} } + func (m *BlobWriteRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BlobWriteRequest.Unmarshal(m, b) } func (m *BlobWriteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_BlobWriteRequest.Marshal(b, m, deterministic) } -func (dst *BlobWriteRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_BlobWriteRequest.Merge(dst, src) +func (m *BlobWriteRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_BlobWriteRequest.Merge(m, src) } func (m *BlobWriteRequest) XXX_Size() int { return xxx_messageInfo_BlobWriteRequest.Size(m) @@ -262,16 +269,17 @@ func (m *BlobWriteResponse) Reset() { *m = BlobWriteResponse{} } func (m *BlobWriteResponse) String() string { return proto.CompactTextString(m) } func (*BlobWriteResponse) ProtoMessage() {} func (*BlobWriteResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_grpcservice_f7cca979873043e0, []int{6} + return fileDescriptor_3ba4b0e85eb4edfe, []int{6} } + func (m *BlobWriteResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BlobWriteResponse.Unmarshal(m, b) } func (m *BlobWriteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_BlobWriteResponse.Marshal(b, m, deterministic) } -func (dst *BlobWriteResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_BlobWriteResponse.Merge(dst, src) +func (m *BlobWriteResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_BlobWriteResponse.Merge(m, src) } func (m *BlobWriteResponse) XXX_Size() int { return xxx_messageInfo_BlobWriteResponse.Size(m) @@ -299,6 +307,35 @@ func init() { proto.RegisterType((*BlobWriteResponse)(nil), "cloudprober.servers.grpc.BlobWriteResponse") } +func init() { + proto.RegisterFile("github.com/google/cloudprober/servers/grpc/proto/grpcservice.proto", fileDescriptor_3ba4b0e85eb4edfe) +} + +var fileDescriptor_3ba4b0e85eb4edfe = []byte{ + // 330 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0xcd, 0x4e, 0xfa, 0x40, + 0x14, 0xc5, 0xff, 0x04, 0xfe, 0x06, 0x2e, 0xf8, 0x75, 0x57, 0xa4, 0x2e, 0xd4, 0x26, 0x08, 0x6a, + 0x6c, 0x8d, 0x8f, 0x40, 0xe2, 0x52, 0x63, 0x86, 0xa8, 0x4b, 0xd2, 0x0e, 0xd7, 0x32, 0x49, 0xcb, + 0xd4, 0xf9, 0x70, 0xe1, 0x63, 0xf8, 0xc4, 0x86, 0x29, 0x85, 0x8a, 0x12, 0xd8, 0xdd, 0xdc, 0xfc, + 0xce, 0x39, 0x33, 0xe7, 0xc2, 0x30, 0x11, 0x66, 0x6a, 0xe3, 0x80, 0xcb, 0x2c, 0x4c, 0xa4, 0x4c, + 0x52, 0x0a, 0x79, 0x2a, 0xed, 0x24, 0x57, 0x32, 0x26, 0x15, 0x6a, 0x52, 0x1f, 0xa4, 0x74, 0x98, + 0xa8, 0x9c, 0x87, 0xb9, 0x92, 0x46, 0xba, 0x71, 0xbe, 0x16, 0x9c, 0x02, 0xb7, 0xc1, 0x6e, 0x45, + 0x11, 0x2c, 0x14, 0xc1, 0x1c, 0xf3, 0xcf, 0xa1, 0x7d, 0xcf, 0xa7, 0xf2, 0x81, 0xb4, 0x8e, 0x12, + 0x42, 0x84, 0x46, 0x9c, 0xca, 0xb8, 0x5b, 0x3b, 0xab, 0x0d, 0x3a, 0xcc, 0xcd, 0xfe, 0x2d, 0xec, + 0x8f, 0x4c, 0x64, 0xac, 0x66, 0xf4, 0x6e, 0x49, 0x1b, 0x3c, 0x85, 0x36, 0x4f, 0x05, 0xcd, 0xcc, + 0x78, 0x16, 0x65, 0xe4, 0xd8, 0x16, 0x83, 0x62, 0xf5, 0x18, 0x65, 0xe4, 0xdf, 0xc0, 0x41, 0xa9, + 0xd0, 0xb9, 0x9c, 0x69, 0xc2, 0x13, 0x68, 0xd9, 0xdc, 0x88, 0x8c, 0xc6, 0x56, 0x3b, 0x41, 0x9d, + 0x35, 0x8b, 0xc5, 0xb3, 0xf6, 0x7b, 0x70, 0x38, 0x4c, 0x65, 0xcc, 0x28, 0x9a, 0x94, 0x11, 0x08, + 0x0d, 0x2d, 0x3e, 0x0b, 0xef, 0xff, 0xcc, 0xcd, 0xfe, 0x05, 0x1c, 0xad, 0xb0, 0x85, 0xef, 0x5f, + 0xef, 0x5d, 0x70, 0xaf, 0x4a, 0x18, 0xaa, 0xf8, 0xfd, 0xe2, 0xfa, 0x70, 0x5c, 0xe1, 0x56, 0x86, + 0xeb, 0xc1, 0x77, 0x5f, 0x75, 0xd8, 0x7b, 0x72, 0xdd, 0xe1, 0x0b, 0x34, 0xe6, 0x75, 0x61, 0x2f, + 0xd8, 0xd4, 0x68, 0x50, 0xa9, 0xd3, 0xdb, 0x0d, 0xf3, 0xff, 0x21, 0x87, 0x66, 0xf9, 0x37, 0xbc, + 0xdc, 0x2c, 0x5a, 0xab, 0xc9, 0xbb, 0xda, 0x05, 0x2d, 0x7e, 0xe6, 0x42, 0x3a, 0x23, 0x87, 0x14, + 0xc7, 0xc1, 0xfe, 0x66, 0xf5, 0x8f, 0x83, 0x7b, 0x83, 0xed, 0xe0, 0x32, 0xe4, 0x0d, 0x5a, 0xcb, + 0x56, 0x71, 0xcb, 0xfb, 0xaa, 0x27, 0xf2, 0xae, 0x77, 0x62, 0xcb, 0x9c, 0xef, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x9b, 0xd7, 0xce, 0x02, 0x17, 0x03, 0x00, 0x00, +} + // Reference imports to suppress errors if they are not otherwise used. var _ context.Context var _ grpc.ClientConn @@ -377,6 +414,23 @@ type ProberServer interface { BlobWrite(context.Context, *BlobWriteRequest) (*BlobWriteResponse, error) } +// UnimplementedProberServer can be embedded to have forward compatible implementations. +type UnimplementedProberServer struct { +} + +func (*UnimplementedProberServer) Echo(ctx context.Context, req *EchoMessage) (*EchoMessage, error) { + return nil, status.Errorf(codes.Unimplemented, "method Echo not implemented") +} +func (*UnimplementedProberServer) BlobRead(ctx context.Context, req *BlobReadRequest) (*BlobReadResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method BlobRead not implemented") +} +func (*UnimplementedProberServer) ServerStatus(ctx context.Context, req *StatusRequest) (*StatusResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ServerStatus not implemented") +} +func (*UnimplementedProberServer) BlobWrite(ctx context.Context, req *BlobWriteRequest) (*BlobWriteResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method BlobWrite not implemented") +} + func RegisterProberServer(s *grpc.Server, srv ProberServer) { s.RegisterService(&_Prober_serviceDesc, srv) } @@ -477,32 +531,3 @@ var _Prober_serviceDesc = grpc.ServiceDesc{ Streams: []grpc.StreamDesc{}, Metadata: "github.com/google/cloudprober/servers/grpc/proto/grpcservice.proto", } - -func init() { - proto.RegisterFile("github.com/google/cloudprober/servers/grpc/proto/grpcservice.proto", fileDescriptor_grpcservice_f7cca979873043e0) -} - -var fileDescriptor_grpcservice_f7cca979873043e0 = []byte{ - // 330 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0xcd, 0x4e, 0xfa, 0x40, - 0x14, 0xc5, 0xff, 0x04, 0xfe, 0x06, 0x2e, 0xf8, 0x75, 0x57, 0xa4, 0x2e, 0xd4, 0x26, 0x08, 0x6a, - 0x6c, 0x8d, 0x8f, 0x40, 0xe2, 0x52, 0x63, 0x86, 0xa8, 0x4b, 0xd2, 0x0e, 0xd7, 0x32, 0x49, 0xcb, - 0xd4, 0xf9, 0x70, 0xe1, 0x63, 0xf8, 0xc4, 0x86, 0x29, 0x85, 0x8a, 0x12, 0xd8, 0xdd, 0xdc, 0xfc, - 0xce, 0x39, 0x33, 0xe7, 0xc2, 0x30, 0x11, 0x66, 0x6a, 0xe3, 0x80, 0xcb, 0x2c, 0x4c, 0xa4, 0x4c, - 0x52, 0x0a, 0x79, 0x2a, 0xed, 0x24, 0x57, 0x32, 0x26, 0x15, 0x6a, 0x52, 0x1f, 0xa4, 0x74, 0x98, - 0xa8, 0x9c, 0x87, 0xb9, 0x92, 0x46, 0xba, 0x71, 0xbe, 0x16, 0x9c, 0x02, 0xb7, 0xc1, 0x6e, 0x45, - 0x11, 0x2c, 0x14, 0xc1, 0x1c, 0xf3, 0xcf, 0xa1, 0x7d, 0xcf, 0xa7, 0xf2, 0x81, 0xb4, 0x8e, 0x12, - 0x42, 0x84, 0x46, 0x9c, 0xca, 0xb8, 0x5b, 0x3b, 0xab, 0x0d, 0x3a, 0xcc, 0xcd, 0xfe, 0x2d, 0xec, - 0x8f, 0x4c, 0x64, 0xac, 0x66, 0xf4, 0x6e, 0x49, 0x1b, 0x3c, 0x85, 0x36, 0x4f, 0x05, 0xcd, 0xcc, - 0x78, 0x16, 0x65, 0xe4, 0xd8, 0x16, 0x83, 0x62, 0xf5, 0x18, 0x65, 0xe4, 0xdf, 0xc0, 0x41, 0xa9, - 0xd0, 0xb9, 0x9c, 0x69, 0xc2, 0x13, 0x68, 0xd9, 0xdc, 0x88, 0x8c, 0xc6, 0x56, 0x3b, 0x41, 0x9d, - 0x35, 0x8b, 0xc5, 0xb3, 0xf6, 0x7b, 0x70, 0x38, 0x4c, 0x65, 0xcc, 0x28, 0x9a, 0x94, 0x11, 0x08, - 0x0d, 0x2d, 0x3e, 0x0b, 0xef, 0xff, 0xcc, 0xcd, 0xfe, 0x05, 0x1c, 0xad, 0xb0, 0x85, 0xef, 0x5f, - 0xef, 0x5d, 0x70, 0xaf, 0x4a, 0x18, 0xaa, 0xf8, 0xfd, 0xe2, 0xfa, 0x70, 0x5c, 0xe1, 0x56, 0x86, - 0xeb, 0xc1, 0x77, 0x5f, 0x75, 0xd8, 0x7b, 0x72, 0xdd, 0xe1, 0x0b, 0x34, 0xe6, 0x75, 0x61, 0x2f, - 0xd8, 0xd4, 0x68, 0x50, 0xa9, 0xd3, 0xdb, 0x0d, 0xf3, 0xff, 0x21, 0x87, 0x66, 0xf9, 0x37, 0xbc, - 0xdc, 0x2c, 0x5a, 0xab, 0xc9, 0xbb, 0xda, 0x05, 0x2d, 0x7e, 0xe6, 0x42, 0x3a, 0x23, 0x87, 0x14, - 0xc7, 0xc1, 0xfe, 0x66, 0xf5, 0x8f, 0x83, 0x7b, 0x83, 0xed, 0xe0, 0x32, 0xe4, 0x0d, 0x5a, 0xcb, - 0x56, 0x71, 0xcb, 0xfb, 0xaa, 0x27, 0xf2, 0xae, 0x77, 0x62, 0xcb, 0x9c, 0xef, 0x00, 0x00, 0x00, - 0xff, 0xff, 0x9b, 0xd7, 0xce, 0x02, 0x17, 0x03, 0x00, 0x00, -} diff --git a/servers/http/proto/config.pb.go b/servers/http/proto/config.pb.go index 1106d694..10ed97a7 100644 --- a/servers/http/proto/config.pb.go +++ b/servers/http/proto/config.pb.go @@ -3,9 +3,11 @@ package proto -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // tls_cert_file and tls_key_file field should be set for HTTPS. type ServerConf_ProtocolType int32 @@ -30,6 +32,7 @@ var ServerConf_ProtocolType_name = map[int32]string{ 0: "HTTP", 1: "HTTPS", } + var ServerConf_ProtocolType_value = map[string]int32{ "HTTP": 0, "HTTPS": 1, @@ -40,9 +43,11 @@ func (x ServerConf_ProtocolType) Enum() *ServerConf_ProtocolType { *p = x return p } + func (x ServerConf_ProtocolType) String() string { return proto.EnumName(ServerConf_ProtocolType_name, int32(x)) } + func (x *ServerConf_ProtocolType) UnmarshalJSON(data []byte) error { value, err := proto.UnmarshalJSONEnum(ServerConf_ProtocolType_value, data, "ServerConf_ProtocolType") if err != nil { @@ -51,8 +56,9 @@ func (x *ServerConf_ProtocolType) UnmarshalJSON(data []byte) error { *x = ServerConf_ProtocolType(value) return nil } + func (ServerConf_ProtocolType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_config_2ca4621212345ce9, []int{0, 0} + return fileDescriptor_8ec3a7d747582598, []int{0, 0} } // Next available tag = 10 @@ -84,16 +90,17 @@ func (m *ServerConf) Reset() { *m = ServerConf{} } func (m *ServerConf) String() string { return proto.CompactTextString(m) } func (*ServerConf) ProtoMessage() {} func (*ServerConf) Descriptor() ([]byte, []int) { - return fileDescriptor_config_2ca4621212345ce9, []int{0} + return fileDescriptor_8ec3a7d747582598, []int{0} } + func (m *ServerConf) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ServerConf.Unmarshal(m, b) } func (m *ServerConf) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ServerConf.Marshal(b, m, deterministic) } -func (dst *ServerConf) XXX_Merge(src proto.Message) { - xxx_messageInfo_ServerConf.Merge(dst, src) +func (m *ServerConf) XXX_Merge(src proto.Message) { + xxx_messageInfo_ServerConf.Merge(m, src) } func (m *ServerConf) XXX_Size() int { return xxx_messageInfo_ServerConf.Size(m) @@ -188,16 +195,17 @@ func (m *ServerConf_PatternDataHandler) Reset() { *m = ServerConf_Patter func (m *ServerConf_PatternDataHandler) String() string { return proto.CompactTextString(m) } func (*ServerConf_PatternDataHandler) ProtoMessage() {} func (*ServerConf_PatternDataHandler) Descriptor() ([]byte, []int) { - return fileDescriptor_config_2ca4621212345ce9, []int{0, 0} + return fileDescriptor_8ec3a7d747582598, []int{0, 0} } + func (m *ServerConf_PatternDataHandler) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ServerConf_PatternDataHandler.Unmarshal(m, b) } func (m *ServerConf_PatternDataHandler) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ServerConf_PatternDataHandler.Marshal(b, m, deterministic) } -func (dst *ServerConf_PatternDataHandler) XXX_Merge(src proto.Message) { - xxx_messageInfo_ServerConf_PatternDataHandler.Merge(dst, src) +func (m *ServerConf_PatternDataHandler) XXX_Merge(src proto.Message) { + xxx_messageInfo_ServerConf_PatternDataHandler.Merge(m, src) } func (m *ServerConf_PatternDataHandler) XXX_Size() int { return xxx_messageInfo_ServerConf_PatternDataHandler.Size(m) @@ -225,16 +233,16 @@ func (m *ServerConf_PatternDataHandler) GetPattern() string { } func init() { + proto.RegisterEnum("cloudprober.servers.http.ServerConf_ProtocolType", ServerConf_ProtocolType_name, ServerConf_ProtocolType_value) proto.RegisterType((*ServerConf)(nil), "cloudprober.servers.http.ServerConf") proto.RegisterType((*ServerConf_PatternDataHandler)(nil), "cloudprober.servers.http.ServerConf.PatternDataHandler") - proto.RegisterEnum("cloudprober.servers.http.ServerConf_ProtocolType", ServerConf_ProtocolType_name, ServerConf_ProtocolType_value) } func init() { - proto.RegisterFile("github.com/google/cloudprober/servers/http/proto/config.proto", fileDescriptor_config_2ca4621212345ce9) + proto.RegisterFile("github.com/google/cloudprober/servers/http/proto/config.proto", fileDescriptor_8ec3a7d747582598) } -var fileDescriptor_config_2ca4621212345ce9 = []byte{ +var fileDescriptor_8ec3a7d747582598 = []byte{ // 414 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0x41, 0x8b, 0xd3, 0x40, 0x14, 0xc7, 0xcd, 0x6e, 0xe2, 0xb6, 0xaf, 0xed, 0x6e, 0x19, 0x3c, 0x0c, 0x9e, 0x42, 0x17, 0x21, diff --git a/servers/proto/config.pb.go b/servers/proto/config.pb.go index 2b213bde..8ca4f024 100644 --- a/servers/proto/config.pb.go +++ b/servers/proto/config.pb.go @@ -3,12 +3,14 @@ package proto -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import proto3 "github.com/google/cloudprober/servers/grpc/proto" -import proto1 "github.com/google/cloudprober/servers/http/proto" -import proto2 "github.com/google/cloudprober/servers/udp/proto" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + proto3 "github.com/google/cloudprober/servers/grpc/proto" + proto1 "github.com/google/cloudprober/servers/http/proto" + proto2 "github.com/google/cloudprober/servers/udp/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -19,7 +21,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type ServerDef_Type int32 @@ -34,6 +36,7 @@ var ServerDef_Type_name = map[int32]string{ 1: "UDP", 2: "GRPC", } + var ServerDef_Type_value = map[string]int32{ "HTTP": 0, "UDP": 1, @@ -45,9 +48,11 @@ func (x ServerDef_Type) Enum() *ServerDef_Type { *p = x return p } + func (x ServerDef_Type) String() string { return proto.EnumName(ServerDef_Type_name, int32(x)) } + func (x *ServerDef_Type) UnmarshalJSON(data []byte) error { value, err := proto.UnmarshalJSONEnum(ServerDef_Type_value, data, "ServerDef_Type") if err != nil { @@ -56,8 +61,9 @@ func (x *ServerDef_Type) UnmarshalJSON(data []byte) error { *x = ServerDef_Type(value) return nil } + func (ServerDef_Type) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_config_36c23f68c08b4300, []int{0, 0} + return fileDescriptor_d9d58d8fdcce2c0e, []int{0, 0} } type ServerDef struct { @@ -76,16 +82,17 @@ func (m *ServerDef) Reset() { *m = ServerDef{} } func (m *ServerDef) String() string { return proto.CompactTextString(m) } func (*ServerDef) ProtoMessage() {} func (*ServerDef) Descriptor() ([]byte, []int) { - return fileDescriptor_config_36c23f68c08b4300, []int{0} + return fileDescriptor_d9d58d8fdcce2c0e, []int{0} } + func (m *ServerDef) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ServerDef.Unmarshal(m, b) } func (m *ServerDef) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ServerDef.Marshal(b, m, deterministic) } -func (dst *ServerDef) XXX_Merge(src proto.Message) { - xxx_messageInfo_ServerDef.Merge(dst, src) +func (m *ServerDef) XXX_Merge(src proto.Message) { + xxx_messageInfo_ServerDef.Merge(m, src) } func (m *ServerDef) XXX_Size() int { return xxx_messageInfo_ServerDef.Size(m) @@ -153,109 +160,25 @@ func (m *ServerDef) GetGrpcServer() *proto3.ServerConf { return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*ServerDef) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _ServerDef_OneofMarshaler, _ServerDef_OneofUnmarshaler, _ServerDef_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*ServerDef) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*ServerDef_HttpServer)(nil), (*ServerDef_UdpServer)(nil), (*ServerDef_GrpcServer)(nil), } } -func _ServerDef_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*ServerDef) - // server - switch x := m.Server.(type) { - case *ServerDef_HttpServer: - b.EncodeVarint(2<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.HttpServer); err != nil { - return err - } - case *ServerDef_UdpServer: - b.EncodeVarint(3<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.UdpServer); err != nil { - return err - } - case *ServerDef_GrpcServer: - b.EncodeVarint(4<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.GrpcServer); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("ServerDef.Server has unexpected type %T", x) - } - return nil -} - -func _ServerDef_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*ServerDef) - switch tag { - case 2: // server.http_server - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(proto1.ServerConf) - err := b.DecodeMessage(msg) - m.Server = &ServerDef_HttpServer{msg} - return true, err - case 3: // server.udp_server - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(proto2.ServerConf) - err := b.DecodeMessage(msg) - m.Server = &ServerDef_UdpServer{msg} - return true, err - case 4: // server.grpc_server - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(proto3.ServerConf) - err := b.DecodeMessage(msg) - m.Server = &ServerDef_GrpcServer{msg} - return true, err - default: - return false, nil - } -} - -func _ServerDef_OneofSizer(msg proto.Message) (n int) { - m := msg.(*ServerDef) - // server - switch x := m.Server.(type) { - case *ServerDef_HttpServer: - s := proto.Size(x.HttpServer) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *ServerDef_UdpServer: - s := proto.Size(x.UdpServer) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *ServerDef_GrpcServer: - s := proto.Size(x.GrpcServer) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - func init() { - proto.RegisterType((*ServerDef)(nil), "cloudprober.servers.ServerDef") proto.RegisterEnum("cloudprober.servers.ServerDef_Type", ServerDef_Type_name, ServerDef_Type_value) + proto.RegisterType((*ServerDef)(nil), "cloudprober.servers.ServerDef") } func init() { - proto.RegisterFile("github.com/google/cloudprober/servers/proto/config.proto", fileDescriptor_config_36c23f68c08b4300) + proto.RegisterFile("github.com/google/cloudprober/servers/proto/config.proto", fileDescriptor_d9d58d8fdcce2c0e) } -var fileDescriptor_config_36c23f68c08b4300 = []byte{ +var fileDescriptor_d9d58d8fdcce2c0e = []byte{ // 267 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x90, 0x41, 0x6b, 0xc2, 0x30, 0x18, 0x86, 0x6d, 0x2d, 0x9b, 0x7e, 0x85, 0x51, 0xb2, 0x8b, 0xec, 0x24, 0xba, 0x83, 0xa7, 0x04, diff --git a/servers/udp/proto/config.pb.go b/servers/udp/proto/config.pb.go index aa14b3bd..00a7b720 100644 --- a/servers/udp/proto/config.pb.go +++ b/servers/udp/proto/config.pb.go @@ -3,9 +3,11 @@ package proto -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type ServerConf_Type int32 @@ -33,6 +35,7 @@ var ServerConf_Type_name = map[int32]string{ 0: "ECHO", 1: "DISCARD", } + var ServerConf_Type_value = map[string]int32{ "ECHO": 0, "DISCARD": 1, @@ -43,9 +46,11 @@ func (x ServerConf_Type) Enum() *ServerConf_Type { *p = x return p } + func (x ServerConf_Type) String() string { return proto.EnumName(ServerConf_Type_name, int32(x)) } + func (x *ServerConf_Type) UnmarshalJSON(data []byte) error { value, err := proto.UnmarshalJSONEnum(ServerConf_Type_value, data, "ServerConf_Type") if err != nil { @@ -54,8 +59,9 @@ func (x *ServerConf_Type) UnmarshalJSON(data []byte) error { *x = ServerConf_Type(value) return nil } + func (ServerConf_Type) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_config_942aeaff6e4c874a, []int{0, 0} + return fileDescriptor_9c8184138bd9149b, []int{0, 0} } type ServerConf struct { @@ -70,16 +76,17 @@ func (m *ServerConf) Reset() { *m = ServerConf{} } func (m *ServerConf) String() string { return proto.CompactTextString(m) } func (*ServerConf) ProtoMessage() {} func (*ServerConf) Descriptor() ([]byte, []int) { - return fileDescriptor_config_942aeaff6e4c874a, []int{0} + return fileDescriptor_9c8184138bd9149b, []int{0} } + func (m *ServerConf) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ServerConf.Unmarshal(m, b) } func (m *ServerConf) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ServerConf.Marshal(b, m, deterministic) } -func (dst *ServerConf) XXX_Merge(src proto.Message) { - xxx_messageInfo_ServerConf.Merge(dst, src) +func (m *ServerConf) XXX_Merge(src proto.Message) { + xxx_messageInfo_ServerConf.Merge(m, src) } func (m *ServerConf) XXX_Size() int { return xxx_messageInfo_ServerConf.Size(m) @@ -105,15 +112,15 @@ func (m *ServerConf) GetType() ServerConf_Type { } func init() { - proto.RegisterType((*ServerConf)(nil), "cloudprober.servers.udp.ServerConf") proto.RegisterEnum("cloudprober.servers.udp.ServerConf_Type", ServerConf_Type_name, ServerConf_Type_value) + proto.RegisterType((*ServerConf)(nil), "cloudprober.servers.udp.ServerConf") } func init() { - proto.RegisterFile("github.com/google/cloudprober/servers/udp/proto/config.proto", fileDescriptor_config_942aeaff6e4c874a) + proto.RegisterFile("github.com/google/cloudprober/servers/udp/proto/config.proto", fileDescriptor_9c8184138bd9149b) } -var fileDescriptor_config_942aeaff6e4c874a = []byte{ +var fileDescriptor_9c8184138bd9149b = []byte{ // 181 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0x49, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xcf, 0xcf, 0x4f, 0xcf, 0x49, 0xd5, 0x4f, 0xce, diff --git a/surfacers/file/proto/config.pb.go b/surfacers/file/proto/config.pb.go index 67f962b2..e7c509f0 100644 --- a/surfacers/file/proto/config.pb.go +++ b/surfacers/file/proto/config.pb.go @@ -3,9 +3,11 @@ package proto -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type SurfacerConf struct { // Where to write the results. If left unset, file surfacer writes to the @@ -34,16 +36,17 @@ func (m *SurfacerConf) Reset() { *m = SurfacerConf{} } func (m *SurfacerConf) String() string { return proto.CompactTextString(m) } func (*SurfacerConf) ProtoMessage() {} func (*SurfacerConf) Descriptor() ([]byte, []int) { - return fileDescriptor_config_da73a796d09f0ba3, []int{0} + return fileDescriptor_54e5d39956e5b03f, []int{0} } + func (m *SurfacerConf) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SurfacerConf.Unmarshal(m, b) } func (m *SurfacerConf) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SurfacerConf.Marshal(b, m, deterministic) } -func (dst *SurfacerConf) XXX_Merge(src proto.Message) { - xxx_messageInfo_SurfacerConf.Merge(dst, src) +func (m *SurfacerConf) XXX_Merge(src proto.Message) { + xxx_messageInfo_SurfacerConf.Merge(m, src) } func (m *SurfacerConf) XXX_Size() int { return xxx_messageInfo_SurfacerConf.Size(m) @@ -83,10 +86,10 @@ func init() { } func init() { - proto.RegisterFile("github.com/google/cloudprober/surfacers/file/proto/config.proto", fileDescriptor_config_da73a796d09f0ba3) + proto.RegisterFile("github.com/google/cloudprober/surfacers/file/proto/config.proto", fileDescriptor_54e5d39956e5b03f) } -var fileDescriptor_config_da73a796d09f0ba3 = []byte{ +var fileDescriptor_54e5d39956e5b03f = []byte{ // 193 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0xcc, 0xb1, 0x4e, 0xc5, 0x20, 0x14, 0xc6, 0xf1, 0xa0, 0xd1, 0xb4, 0xe8, 0x84, 0x4b, 0x8d, 0x4b, 0xa3, 0x4b, 0x27, 0xd8, 0x1c, diff --git a/surfacers/postgres/proto/config.pb.go b/surfacers/postgres/proto/config.pb.go index 42bb3f43..51a3db2a 100644 --- a/surfacers/postgres/proto/config.pb.go +++ b/surfacers/postgres/proto/config.pb.go @@ -3,9 +3,11 @@ package proto -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type SurfacerConf struct { ConnectionString *string `protobuf:"bytes,1,req,name=connection_string,json=connectionString" json:"connection_string,omitempty"` @@ -30,16 +32,17 @@ func (m *SurfacerConf) Reset() { *m = SurfacerConf{} } func (m *SurfacerConf) String() string { return proto.CompactTextString(m) } func (*SurfacerConf) ProtoMessage() {} func (*SurfacerConf) Descriptor() ([]byte, []int) { - return fileDescriptor_config_ca5f6a08327971c1, []int{0} + return fileDescriptor_e7de52d61e905e41, []int{0} } + func (m *SurfacerConf) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SurfacerConf.Unmarshal(m, b) } func (m *SurfacerConf) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SurfacerConf.Marshal(b, m, deterministic) } -func (dst *SurfacerConf) XXX_Merge(src proto.Message) { - xxx_messageInfo_SurfacerConf.Merge(dst, src) +func (m *SurfacerConf) XXX_Merge(src proto.Message) { + xxx_messageInfo_SurfacerConf.Merge(m, src) } func (m *SurfacerConf) XXX_Size() int { return xxx_messageInfo_SurfacerConf.Size(m) @@ -69,10 +72,10 @@ func init() { } func init() { - proto.RegisterFile("github.com/google/cloudprober/surfacers/postgres/proto/config.proto", fileDescriptor_config_ca5f6a08327971c1) + proto.RegisterFile("github.com/google/cloudprober/surfacers/postgres/proto/config.proto", fileDescriptor_e7de52d61e905e41) } -var fileDescriptor_config_ca5f6a08327971c1 = []byte{ +var fileDescriptor_e7de52d61e905e41 = []byte{ // 169 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x8b, 0xb1, 0x8e, 0xc2, 0x30, 0x10, 0x05, 0x75, 0xe9, 0xce, 0xba, 0xe2, 0xce, 0x55, 0x9a, 0x93, 0x10, 0x15, 0x12, 0xc8, 0xfe, diff --git a/surfacers/prometheus/proto/config.pb.go b/surfacers/prometheus/proto/config.pb.go index 7212fa9c..a772101f 100644 --- a/surfacers/prometheus/proto/config.pb.go +++ b/surfacers/prometheus/proto/config.pb.go @@ -3,9 +3,11 @@ package proto -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type SurfacerConf struct { // How many metrics entries (EventMetrics) to buffer. Incoming metrics @@ -46,16 +48,17 @@ func (m *SurfacerConf) Reset() { *m = SurfacerConf{} } func (m *SurfacerConf) String() string { return proto.CompactTextString(m) } func (*SurfacerConf) ProtoMessage() {} func (*SurfacerConf) Descriptor() ([]byte, []int) { - return fileDescriptor_config_90169bb62b1e6623, []int{0} + return fileDescriptor_c23443a82a936d49, []int{0} } + func (m *SurfacerConf) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SurfacerConf.Unmarshal(m, b) } func (m *SurfacerConf) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SurfacerConf.Marshal(b, m, deterministic) } -func (dst *SurfacerConf) XXX_Merge(src proto.Message) { - xxx_messageInfo_SurfacerConf.Merge(dst, src) +func (m *SurfacerConf) XXX_Merge(src proto.Message) { + xxx_messageInfo_SurfacerConf.Merge(m, src) } func (m *SurfacerConf) XXX_Size() int { return xxx_messageInfo_SurfacerConf.Size(m) @@ -103,10 +106,10 @@ func init() { } func init() { - proto.RegisterFile("github.com/google/cloudprober/surfacers/prometheus/proto/config.proto", fileDescriptor_config_90169bb62b1e6623) + proto.RegisterFile("github.com/google/cloudprober/surfacers/prometheus/proto/config.proto", fileDescriptor_c23443a82a936d49) } -var fileDescriptor_config_90169bb62b1e6623 = []byte{ +var fileDescriptor_c23443a82a936d49 = []byte{ // 235 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x8d, 0x4f, 0x4b, 0xc4, 0x30, 0x10, 0xc5, 0x89, 0xbb, 0xc2, 0x1a, 0xff, 0xe0, 0xc6, 0x4b, 0x6f, 0x16, 0x41, 0xa8, 0x97, 0xa6, diff --git a/surfacers/proto/config.pb.go b/surfacers/proto/config.pb.go index a781b92b..28ed8d19 100644 --- a/surfacers/proto/config.pb.go +++ b/surfacers/proto/config.pb.go @@ -3,13 +3,15 @@ package proto -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import proto3 "github.com/google/cloudprober/surfacers/file/proto" -import proto4 "github.com/google/cloudprober/surfacers/postgres/proto" -import proto1 "github.com/google/cloudprober/surfacers/prometheus/proto" -import proto2 "github.com/google/cloudprober/surfacers/stackdriver/proto" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + proto3 "github.com/google/cloudprober/surfacers/file/proto" + proto4 "github.com/google/cloudprober/surfacers/postgres/proto" + proto1 "github.com/google/cloudprober/surfacers/prometheus/proto" + proto2 "github.com/google/cloudprober/surfacers/stackdriver/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -20,7 +22,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // Enumeration for each type of surfacer we can parse and create type Type int32 @@ -42,6 +44,7 @@ var Type_name = map[int32]string{ 4: "POSTGRES", 99: "USER_DEFINED", } + var Type_value = map[string]int32{ "NONE": 0, "PROMETHEUS": 1, @@ -56,9 +59,11 @@ func (x Type) Enum() *Type { *p = x return p } + func (x Type) String() string { return proto.EnumName(Type_name, int32(x)) } + func (x *Type) UnmarshalJSON(data []byte) error { value, err := proto.UnmarshalJSONEnum(Type_value, data, "Type") if err != nil { @@ -67,8 +72,9 @@ func (x *Type) UnmarshalJSON(data []byte) error { *x = Type(value) return nil } + func (Type) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_config_dc94760276a55873, []int{0} + return fileDescriptor_7422849b62c25d1a, []int{0} } type SurfacerDef struct { @@ -96,16 +102,17 @@ func (m *SurfacerDef) Reset() { *m = SurfacerDef{} } func (m *SurfacerDef) String() string { return proto.CompactTextString(m) } func (*SurfacerDef) ProtoMessage() {} func (*SurfacerDef) Descriptor() ([]byte, []int) { - return fileDescriptor_config_dc94760276a55873, []int{0} + return fileDescriptor_7422849b62c25d1a, []int{0} } + func (m *SurfacerDef) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SurfacerDef.Unmarshal(m, b) } func (m *SurfacerDef) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SurfacerDef.Marshal(b, m, deterministic) } -func (dst *SurfacerDef) XXX_Merge(src proto.Message) { - xxx_messageInfo_SurfacerDef.Merge(dst, src) +func (m *SurfacerDef) XXX_Merge(src proto.Message) { + xxx_messageInfo_SurfacerDef.Merge(m, src) } func (m *SurfacerDef) XXX_Size() int { return xxx_messageInfo_SurfacerDef.Size(m) @@ -193,9 +200,9 @@ func (m *SurfacerDef) GetPostgresSurfacer() *proto4.SurfacerConf { return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*SurfacerDef) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _SurfacerDef_OneofMarshaler, _SurfacerDef_OneofUnmarshaler, _SurfacerDef_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*SurfacerDef) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*SurfacerDef_PrometheusSurfacer)(nil), (*SurfacerDef_StackdriverSurfacer)(nil), (*SurfacerDef_FileSurfacer)(nil), @@ -203,118 +210,16 @@ func (*SurfacerDef) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) e } } -func _SurfacerDef_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*SurfacerDef) - // surfacer - switch x := m.Surfacer.(type) { - case *SurfacerDef_PrometheusSurfacer: - b.EncodeVarint(10<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.PrometheusSurfacer); err != nil { - return err - } - case *SurfacerDef_StackdriverSurfacer: - b.EncodeVarint(11<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.StackdriverSurfacer); err != nil { - return err - } - case *SurfacerDef_FileSurfacer: - b.EncodeVarint(12<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.FileSurfacer); err != nil { - return err - } - case *SurfacerDef_PostgresSurfacer: - b.EncodeVarint(13<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.PostgresSurfacer); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("SurfacerDef.Surfacer has unexpected type %T", x) - } - return nil -} - -func _SurfacerDef_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*SurfacerDef) - switch tag { - case 10: // surfacer.prometheus_surfacer - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(proto1.SurfacerConf) - err := b.DecodeMessage(msg) - m.Surfacer = &SurfacerDef_PrometheusSurfacer{msg} - return true, err - case 11: // surfacer.stackdriver_surfacer - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(proto2.SurfacerConf) - err := b.DecodeMessage(msg) - m.Surfacer = &SurfacerDef_StackdriverSurfacer{msg} - return true, err - case 12: // surfacer.file_surfacer - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(proto3.SurfacerConf) - err := b.DecodeMessage(msg) - m.Surfacer = &SurfacerDef_FileSurfacer{msg} - return true, err - case 13: // surfacer.postgres_surfacer - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(proto4.SurfacerConf) - err := b.DecodeMessage(msg) - m.Surfacer = &SurfacerDef_PostgresSurfacer{msg} - return true, err - default: - return false, nil - } -} - -func _SurfacerDef_OneofSizer(msg proto.Message) (n int) { - m := msg.(*SurfacerDef) - // surfacer - switch x := m.Surfacer.(type) { - case *SurfacerDef_PrometheusSurfacer: - s := proto.Size(x.PrometheusSurfacer) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *SurfacerDef_StackdriverSurfacer: - s := proto.Size(x.StackdriverSurfacer) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *SurfacerDef_FileSurfacer: - s := proto.Size(x.FileSurfacer) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *SurfacerDef_PostgresSurfacer: - s := proto.Size(x.PostgresSurfacer) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - func init() { - proto.RegisterType((*SurfacerDef)(nil), "cloudprober.surfacer.SurfacerDef") proto.RegisterEnum("cloudprober.surfacer.Type", Type_name, Type_value) + proto.RegisterType((*SurfacerDef)(nil), "cloudprober.surfacer.SurfacerDef") } func init() { - proto.RegisterFile("github.com/google/cloudprober/surfacers/proto/config.proto", fileDescriptor_config_dc94760276a55873) + proto.RegisterFile("github.com/google/cloudprober/surfacers/proto/config.proto", fileDescriptor_7422849b62c25d1a) } -var fileDescriptor_config_dc94760276a55873 = []byte{ +var fileDescriptor_7422849b62c25d1a = []byte{ // 381 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x91, 0xc1, 0xcf, 0xd2, 0x30, 0x18, 0xc6, 0xbf, 0x7d, 0xdf, 0x0e, 0xf8, 0x6e, 0x60, 0x2d, 0x1c, 0x08, 0x27, 0xe2, 0x45, 0xa2, diff --git a/surfacers/stackdriver/proto/config.pb.go b/surfacers/stackdriver/proto/config.pb.go index 1f041734..864c63c5 100644 --- a/surfacers/stackdriver/proto/config.pb.go +++ b/surfacers/stackdriver/proto/config.pb.go @@ -3,9 +3,11 @@ package proto -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type SurfacerConf struct { // This field doesn't do anything anymore. Batching is always enabled. This @@ -48,16 +50,17 @@ func (m *SurfacerConf) Reset() { *m = SurfacerConf{} } func (m *SurfacerConf) String() string { return proto.CompactTextString(m) } func (*SurfacerConf) ProtoMessage() {} func (*SurfacerConf) Descriptor() ([]byte, []int) { - return fileDescriptor_config_7b0050a462f143bb, []int{0} + return fileDescriptor_447dc81d4918bb00, []int{0} } + func (m *SurfacerConf) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SurfacerConf.Unmarshal(m, b) } func (m *SurfacerConf) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SurfacerConf.Marshal(b, m, deterministic) } -func (dst *SurfacerConf) XXX_Merge(src proto.Message) { - xxx_messageInfo_SurfacerConf.Merge(dst, src) +func (m *SurfacerConf) XXX_Merge(src proto.Message) { + xxx_messageInfo_SurfacerConf.Merge(m, src) } func (m *SurfacerConf) XXX_Size() int { return xxx_messageInfo_SurfacerConf.Size(m) @@ -113,10 +116,10 @@ func init() { } func init() { - proto.RegisterFile("github.com/google/cloudprober/surfacers/stackdriver/proto/config.proto", fileDescriptor_config_7b0050a462f143bb) + proto.RegisterFile("github.com/google/cloudprober/surfacers/stackdriver/proto/config.proto", fileDescriptor_447dc81d4918bb00) } -var fileDescriptor_config_7b0050a462f143bb = []byte{ +var fileDescriptor_447dc81d4918bb00 = []byte{ // 269 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x90, 0xbf, 0x6b, 0xf3, 0x30, 0x10, 0x86, 0x71, 0x7e, 0xc0, 0x17, 0xf1, 0xa5, 0x05, 0x95, 0x82, 0xe9, 0x64, 0x32, 0x85, 0x0e, diff --git a/targets/gce/proto/config.pb.go b/targets/gce/proto/config.pb.go index effd7b34..dcc3d7d2 100644 --- a/targets/gce/proto/config.pb.go +++ b/targets/gce/proto/config.pb.go @@ -3,9 +3,11 @@ package proto -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type Instances_NetworkInterface_IPType int32 @@ -35,6 +37,7 @@ var Instances_NetworkInterface_IPType_name = map[int32]string{ 1: "PUBLIC", 2: "ALIAS", } + var Instances_NetworkInterface_IPType_value = map[string]int32{ "PRIVATE": 0, "PUBLIC": 1, @@ -46,9 +49,11 @@ func (x Instances_NetworkInterface_IPType) Enum() *Instances_NetworkInterface_IP *p = x return p } + func (x Instances_NetworkInterface_IPType) String() string { return proto.EnumName(Instances_NetworkInterface_IPType_name, int32(x)) } + func (x *Instances_NetworkInterface_IPType) UnmarshalJSON(data []byte) error { value, err := proto.UnmarshalJSONEnum(Instances_NetworkInterface_IPType_value, data, "Instances_NetworkInterface_IPType") if err != nil { @@ -57,8 +62,9 @@ func (x *Instances_NetworkInterface_IPType) UnmarshalJSON(data []byte) error { *x = Instances_NetworkInterface_IPType(value) return nil } + func (Instances_NetworkInterface_IPType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_config_5c091c05df188230, []int{1, 0, 0} + return fileDescriptor_14230fbadea14e0f, []int{1, 0, 0} } // TargetsConf represents GCE targets, e.g. instances, forwarding rules etc. @@ -80,16 +86,17 @@ func (m *TargetsConf) Reset() { *m = TargetsConf{} } func (m *TargetsConf) String() string { return proto.CompactTextString(m) } func (*TargetsConf) ProtoMessage() {} func (*TargetsConf) Descriptor() ([]byte, []int) { - return fileDescriptor_config_5c091c05df188230, []int{0} + return fileDescriptor_14230fbadea14e0f, []int{0} } + func (m *TargetsConf) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TargetsConf.Unmarshal(m, b) } func (m *TargetsConf) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_TargetsConf.Marshal(b, m, deterministic) } -func (dst *TargetsConf) XXX_Merge(src proto.Message) { - xxx_messageInfo_TargetsConf.Merge(dst, src) +func (m *TargetsConf) XXX_Merge(src proto.Message) { + xxx_messageInfo_TargetsConf.Merge(m, src) } func (m *TargetsConf) XXX_Size() int { return xxx_messageInfo_TargetsConf.Size(m) @@ -144,80 +151,14 @@ func (m *TargetsConf) GetForwardingRules() *ForwardingRules { return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*TargetsConf) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _TargetsConf_OneofMarshaler, _TargetsConf_OneofUnmarshaler, _TargetsConf_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*TargetsConf) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*TargetsConf_Instances)(nil), (*TargetsConf_ForwardingRules)(nil), } } -func _TargetsConf_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*TargetsConf) - // type - switch x := m.Type.(type) { - case *TargetsConf_Instances: - b.EncodeVarint(2<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.Instances); err != nil { - return err - } - case *TargetsConf_ForwardingRules: - b.EncodeVarint(3<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.ForwardingRules); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("TargetsConf.Type has unexpected type %T", x) - } - return nil -} - -func _TargetsConf_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*TargetsConf) - switch tag { - case 2: // type.instances - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(Instances) - err := b.DecodeMessage(msg) - m.Type = &TargetsConf_Instances{msg} - return true, err - case 3: // type.forwarding_rules - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(ForwardingRules) - err := b.DecodeMessage(msg) - m.Type = &TargetsConf_ForwardingRules{msg} - return true, err - default: - return false, nil - } -} - -func _TargetsConf_OneofSizer(msg proto.Message) (n int) { - m := msg.(*TargetsConf) - // type - switch x := m.Type.(type) { - case *TargetsConf_Instances: - s := proto.Size(x.Instances) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *TargetsConf_ForwardingRules: - s := proto.Size(x.ForwardingRules) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - // Represents GCE instances type Instances struct { // Use DNS to resolve target names (instances). If set to false (default), @@ -234,16 +175,17 @@ func (m *Instances) Reset() { *m = Instances{} } func (m *Instances) String() string { return proto.CompactTextString(m) } func (*Instances) ProtoMessage() {} func (*Instances) Descriptor() ([]byte, []int) { - return fileDescriptor_config_5c091c05df188230, []int{1} + return fileDescriptor_14230fbadea14e0f, []int{1} } + func (m *Instances) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Instances.Unmarshal(m, b) } func (m *Instances) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Instances.Marshal(b, m, deterministic) } -func (dst *Instances) XXX_Merge(src proto.Message) { - xxx_messageInfo_Instances.Merge(dst, src) +func (m *Instances) XXX_Merge(src proto.Message) { + xxx_messageInfo_Instances.Merge(m, src) } func (m *Instances) XXX_Size() int { return xxx_messageInfo_Instances.Size(m) @@ -283,16 +225,17 @@ func (m *Instances_NetworkInterface) Reset() { *m = Instances_NetworkInt func (m *Instances_NetworkInterface) String() string { return proto.CompactTextString(m) } func (*Instances_NetworkInterface) ProtoMessage() {} func (*Instances_NetworkInterface) Descriptor() ([]byte, []int) { - return fileDescriptor_config_5c091c05df188230, []int{1, 0} + return fileDescriptor_14230fbadea14e0f, []int{1, 0} } + func (m *Instances_NetworkInterface) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Instances_NetworkInterface.Unmarshal(m, b) } func (m *Instances_NetworkInterface) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Instances_NetworkInterface.Marshal(b, m, deterministic) } -func (dst *Instances_NetworkInterface) XXX_Merge(src proto.Message) { - xxx_messageInfo_Instances_NetworkInterface.Merge(dst, src) +func (m *Instances_NetworkInterface) XXX_Merge(src proto.Message) { + xxx_messageInfo_Instances_NetworkInterface.Merge(m, src) } func (m *Instances_NetworkInterface) XXX_Size() int { return xxx_messageInfo_Instances_NetworkInterface.Size(m) @@ -340,16 +283,17 @@ func (m *ForwardingRules) Reset() { *m = ForwardingRules{} } func (m *ForwardingRules) String() string { return proto.CompactTextString(m) } func (*ForwardingRules) ProtoMessage() {} func (*ForwardingRules) Descriptor() ([]byte, []int) { - return fileDescriptor_config_5c091c05df188230, []int{2} + return fileDescriptor_14230fbadea14e0f, []int{2} } + func (m *ForwardingRules) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ForwardingRules.Unmarshal(m, b) } func (m *ForwardingRules) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ForwardingRules.Marshal(b, m, deterministic) } -func (dst *ForwardingRules) XXX_Merge(src proto.Message) { - xxx_messageInfo_ForwardingRules.Merge(dst, src) +func (m *ForwardingRules) XXX_Merge(src proto.Message) { + xxx_messageInfo_ForwardingRules.Merge(m, src) } func (m *ForwardingRules) XXX_Size() int { return xxx_messageInfo_ForwardingRules.Size(m) @@ -383,16 +327,17 @@ func (m *GlobalOptions) Reset() { *m = GlobalOptions{} } func (m *GlobalOptions) String() string { return proto.CompactTextString(m) } func (*GlobalOptions) ProtoMessage() {} func (*GlobalOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_config_5c091c05df188230, []int{3} + return fileDescriptor_14230fbadea14e0f, []int{3} } + func (m *GlobalOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GlobalOptions.Unmarshal(m, b) } func (m *GlobalOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GlobalOptions.Marshal(b, m, deterministic) } -func (dst *GlobalOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_GlobalOptions.Merge(dst, src) +func (m *GlobalOptions) XXX_Merge(src proto.Message) { + xxx_messageInfo_GlobalOptions.Merge(m, src) } func (m *GlobalOptions) XXX_Size() int { return xxx_messageInfo_GlobalOptions.Size(m) @@ -421,19 +366,19 @@ func (m *GlobalOptions) GetApiVersion() string { } func init() { + proto.RegisterEnum("cloudprober.targets.gce.Instances_NetworkInterface_IPType", Instances_NetworkInterface_IPType_name, Instances_NetworkInterface_IPType_value) proto.RegisterType((*TargetsConf)(nil), "cloudprober.targets.gce.TargetsConf") proto.RegisterType((*Instances)(nil), "cloudprober.targets.gce.Instances") proto.RegisterType((*Instances_NetworkInterface)(nil), "cloudprober.targets.gce.Instances.NetworkInterface") proto.RegisterType((*ForwardingRules)(nil), "cloudprober.targets.gce.ForwardingRules") proto.RegisterType((*GlobalOptions)(nil), "cloudprober.targets.gce.GlobalOptions") - proto.RegisterEnum("cloudprober.targets.gce.Instances_NetworkInterface_IPType", Instances_NetworkInterface_IPType_name, Instances_NetworkInterface_IPType_value) } func init() { - proto.RegisterFile("github.com/google/cloudprober/targets/gce/proto/config.proto", fileDescriptor_config_5c091c05df188230) + proto.RegisterFile("github.com/google/cloudprober/targets/gce/proto/config.proto", fileDescriptor_14230fbadea14e0f) } -var fileDescriptor_config_5c091c05df188230 = []byte{ +var fileDescriptor_14230fbadea14e0f = []byte{ // 456 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x52, 0x51, 0x8f, 0xd2, 0x40, 0x18, 0xa4, 0x20, 0x60, 0x3f, 0xa2, 0xd4, 0x7d, 0xf0, 0x88, 0x4f, 0xa4, 0xbe, 0x60, 0x62, 0x5a, diff --git a/targets/lameduck/proto/config.pb.go b/targets/lameduck/proto/config.pb.go index 903a88bc..5c1e9d2d 100644 --- a/targets/lameduck/proto/config.pb.go +++ b/targets/lameduck/proto/config.pb.go @@ -3,9 +3,11 @@ package proto -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type Options struct { // How often to check for lame-ducked targets @@ -47,16 +49,17 @@ func (m *Options) Reset() { *m = Options{} } func (m *Options) String() string { return proto.CompactTextString(m) } func (*Options) ProtoMessage() {} func (*Options) Descriptor() ([]byte, []int) { - return fileDescriptor_config_0b9e4b76d3ac140e, []int{0} + return fileDescriptor_24d4cbeb973fddd0, []int{0} } + func (m *Options) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Options.Unmarshal(m, b) } func (m *Options) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Options.Marshal(b, m, deterministic) } -func (dst *Options) XXX_Merge(src proto.Message) { - xxx_messageInfo_Options.Merge(dst, src) +func (m *Options) XXX_Merge(src proto.Message) { + xxx_messageInfo_Options.Merge(m, src) } func (m *Options) XXX_Size() int { return xxx_messageInfo_Options.Size(m) @@ -119,10 +122,10 @@ func init() { } func init() { - proto.RegisterFile("github.com/google/cloudprober/targets/lameduck/proto/config.proto", fileDescriptor_config_0b9e4b76d3ac140e) + proto.RegisterFile("github.com/google/cloudprober/targets/lameduck/proto/config.proto", fileDescriptor_24d4cbeb973fddd0) } -var fileDescriptor_config_0b9e4b76d3ac140e = []byte{ +var fileDescriptor_24d4cbeb973fddd0 = []byte{ // 289 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0xce, 0xc1, 0x4f, 0xc2, 0x30, 0x14, 0xc7, 0xf1, 0x0c, 0x04, 0xa4, 0x06, 0x0c, 0x8d, 0xc6, 0x1d, 0x3c, 0x10, 0x4e, 0xc4, 0x84, diff --git a/targets/proto/targets.pb.go b/targets/proto/targets.pb.go index 6e074781..5d2ad9ff 100644 --- a/targets/proto/targets.pb.go +++ b/targets/proto/targets.pb.go @@ -3,13 +3,15 @@ package proto -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import proto1 "github.com/google/cloudprober/targets/gce/proto" -import proto4 "github.com/google/cloudprober/targets/lameduck/proto" -import proto2 "github.com/google/cloudprober/targets/rds/client/proto" -import proto3 "github.com/google/cloudprober/targets/rtc/proto" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + proto1 "github.com/google/cloudprober/targets/gce/proto" + proto4 "github.com/google/cloudprober/targets/lameduck/proto" + proto2 "github.com/google/cloudprober/targets/rds/client/proto" + proto3 "github.com/google/cloudprober/targets/rtc/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -20,7 +22,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type TargetsDef struct { // Types that are valid to be assigned to Type: @@ -52,7 +54,7 @@ func (m *TargetsDef) Reset() { *m = TargetsDef{} } func (m *TargetsDef) String() string { return proto.CompactTextString(m) } func (*TargetsDef) ProtoMessage() {} func (*TargetsDef) Descriptor() ([]byte, []int) { - return fileDescriptor_targets_d8fa4415f08434d8, []int{0} + return fileDescriptor_6a021db69203ab7b, []int{0} } var extRange_TargetsDef = []proto.ExtensionRange{ @@ -62,14 +64,15 @@ var extRange_TargetsDef = []proto.ExtensionRange{ func (*TargetsDef) ExtensionRangeArray() []proto.ExtensionRange { return extRange_TargetsDef } + func (m *TargetsDef) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TargetsDef.Unmarshal(m, b) } func (m *TargetsDef) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_TargetsDef.Marshal(b, m, deterministic) } -func (dst *TargetsDef) XXX_Merge(src proto.Message) { - xxx_messageInfo_TargetsDef.Merge(dst, src) +func (m *TargetsDef) XXX_Merge(src proto.Message) { + xxx_messageInfo_TargetsDef.Merge(m, src) } func (m *TargetsDef) XXX_Size() int { return xxx_messageInfo_TargetsDef.Size(m) @@ -180,9 +183,9 @@ func (m *TargetsDef) GetReEvalSec() int32 { return Default_TargetsDef_ReEvalSec } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*TargetsDef) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _TargetsDef_OneofMarshaler, _TargetsDef_OneofUnmarshaler, _TargetsDef_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*TargetsDef) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*TargetsDef_HostNames)(nil), (*TargetsDef_GceTargets)(nil), (*TargetsDef_RdsTargets)(nil), @@ -191,122 +194,6 @@ func (*TargetsDef) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) er } } -func _TargetsDef_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*TargetsDef) - // type - switch x := m.Type.(type) { - case *TargetsDef_HostNames: - b.EncodeVarint(1<<3 | proto.WireBytes) - b.EncodeStringBytes(x.HostNames) - case *TargetsDef_GceTargets: - b.EncodeVarint(2<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.GceTargets); err != nil { - return err - } - case *TargetsDef_RdsTargets: - b.EncodeVarint(3<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RdsTargets); err != nil { - return err - } - case *TargetsDef_RtcTargets: - b.EncodeVarint(4<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RtcTargets); err != nil { - return err - } - case *TargetsDef_DummyTargets: - b.EncodeVarint(20<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.DummyTargets); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("TargetsDef.Type has unexpected type %T", x) - } - return nil -} - -func _TargetsDef_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*TargetsDef) - switch tag { - case 1: // type.host_names - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Type = &TargetsDef_HostNames{x} - return true, err - case 2: // type.gce_targets - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(proto1.TargetsConf) - err := b.DecodeMessage(msg) - m.Type = &TargetsDef_GceTargets{msg} - return true, err - case 3: // type.rds_targets - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(proto2.ClientConf) - err := b.DecodeMessage(msg) - m.Type = &TargetsDef_RdsTargets{msg} - return true, err - case 4: // type.rtc_targets - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(proto3.TargetsConf) - err := b.DecodeMessage(msg) - m.Type = &TargetsDef_RtcTargets{msg} - return true, err - case 20: // type.dummy_targets - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(DummyTargets) - err := b.DecodeMessage(msg) - m.Type = &TargetsDef_DummyTargets{msg} - return true, err - default: - return false, nil - } -} - -func _TargetsDef_OneofSizer(msg proto.Message) (n int) { - m := msg.(*TargetsDef) - // type - switch x := m.Type.(type) { - case *TargetsDef_HostNames: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.HostNames))) - n += len(x.HostNames) - case *TargetsDef_GceTargets: - s := proto.Size(x.GceTargets) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *TargetsDef_RdsTargets: - s := proto.Size(x.RdsTargets) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *TargetsDef_RtcTargets: - s := proto.Size(x.RtcTargets) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *TargetsDef_DummyTargets: - s := proto.Size(x.DummyTargets) - n += 2 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - // DummyTargets represent empty targets, which are useful for external // probes that do not have any "proper" targets. Such as ilbprober. type DummyTargets struct { @@ -319,16 +206,17 @@ func (m *DummyTargets) Reset() { *m = DummyTargets{} } func (m *DummyTargets) String() string { return proto.CompactTextString(m) } func (*DummyTargets) ProtoMessage() {} func (*DummyTargets) Descriptor() ([]byte, []int) { - return fileDescriptor_targets_d8fa4415f08434d8, []int{1} + return fileDescriptor_6a021db69203ab7b, []int{1} } + func (m *DummyTargets) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DummyTargets.Unmarshal(m, b) } func (m *DummyTargets) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_DummyTargets.Marshal(b, m, deterministic) } -func (dst *DummyTargets) XXX_Merge(src proto.Message) { - xxx_messageInfo_DummyTargets.Merge(dst, src) +func (m *DummyTargets) XXX_Merge(src proto.Message) { + xxx_messageInfo_DummyTargets.Merge(m, src) } func (m *DummyTargets) XXX_Size() int { return xxx_messageInfo_DummyTargets.Size(m) @@ -360,16 +248,17 @@ func (m *GlobalTargetsOptions) Reset() { *m = GlobalTargetsOptions{} } func (m *GlobalTargetsOptions) String() string { return proto.CompactTextString(m) } func (*GlobalTargetsOptions) ProtoMessage() {} func (*GlobalTargetsOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_targets_d8fa4415f08434d8, []int{2} + return fileDescriptor_6a021db69203ab7b, []int{2} } + func (m *GlobalTargetsOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GlobalTargetsOptions.Unmarshal(m, b) } func (m *GlobalTargetsOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GlobalTargetsOptions.Marshal(b, m, deterministic) } -func (dst *GlobalTargetsOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_GlobalTargetsOptions.Merge(dst, src) +func (m *GlobalTargetsOptions) XXX_Merge(src proto.Message) { + xxx_messageInfo_GlobalTargetsOptions.Merge(m, src) } func (m *GlobalTargetsOptions) XXX_Size() int { return xxx_messageInfo_GlobalTargetsOptions.Size(m) @@ -401,10 +290,10 @@ func init() { } func init() { - proto.RegisterFile("github.com/google/cloudprober/targets/proto/targets.proto", fileDescriptor_targets_d8fa4415f08434d8) + proto.RegisterFile("github.com/google/cloudprober/targets/proto/targets.proto", fileDescriptor_6a021db69203ab7b) } -var fileDescriptor_targets_d8fa4415f08434d8 = []byte{ +var fileDescriptor_6a021db69203ab7b = []byte{ // 458 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x92, 0xcf, 0x6e, 0xd3, 0x40, 0x10, 0xc6, 0xe3, 0x36, 0x45, 0xcd, 0xb8, 0x40, 0x6b, 0x02, 0xb5, 0x72, 0x21, 0x0d, 0x7f, 0x14, diff --git a/targets/rds/client/proto/config.pb.go b/targets/rds/client/proto/config.pb.go index b06a59a7..e930de51 100644 --- a/targets/rds/client/proto/config.pb.go +++ b/targets/rds/client/proto/config.pb.go @@ -3,10 +3,12 @@ package proto -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import proto1 "github.com/google/cloudprober/targets/rds/proto" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + proto1 "github.com/google/cloudprober/targets/rds/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -17,7 +19,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // ClientConf represents resource discovery service (RDS) based targets. // Next tag: 5 @@ -42,16 +44,17 @@ func (m *ClientConf) Reset() { *m = ClientConf{} } func (m *ClientConf) String() string { return proto.CompactTextString(m) } func (*ClientConf) ProtoMessage() {} func (*ClientConf) Descriptor() ([]byte, []int) { - return fileDescriptor_config_7e7cf582f9f456e4, []int{0} + return fileDescriptor_828fd88c3bb7c21d, []int{0} } + func (m *ClientConf) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ClientConf.Unmarshal(m, b) } func (m *ClientConf) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ClientConf.Marshal(b, m, deterministic) } -func (dst *ClientConf) XXX_Merge(src proto.Message) { - xxx_messageInfo_ClientConf.Merge(dst, src) +func (m *ClientConf) XXX_Merge(src proto.Message) { + xxx_messageInfo_ClientConf.Merge(m, src) } func (m *ClientConf) XXX_Size() int { return xxx_messageInfo_ClientConf.Size(m) @@ -98,10 +101,10 @@ func init() { } func init() { - proto.RegisterFile("github.com/google/cloudprober/targets/rds/client/proto/config.proto", fileDescriptor_config_7e7cf582f9f456e4) + proto.RegisterFile("github.com/google/cloudprober/targets/rds/client/proto/config.proto", fileDescriptor_828fd88c3bb7c21d) } -var fileDescriptor_config_7e7cf582f9f456e4 = []byte{ +var fileDescriptor_828fd88c3bb7c21d = []byte{ // 257 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0xcf, 0xb1, 0x4a, 0xf4, 0x40, 0x10, 0xc0, 0x71, 0x72, 0xdf, 0x27, 0x72, 0x1b, 0xb4, 0x48, 0x63, 0xb0, 0x0a, 0xa9, 0xd2, 0xb8, diff --git a/targets/rds/proto/rds.pb.go b/targets/rds/proto/rds.pb.go index 6b6edf0e..33c4b406 100644 --- a/targets/rds/proto/rds.pb.go +++ b/targets/rds/proto/rds.pb.go @@ -3,13 +3,14 @@ package proto -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" - import ( - context "golang.org/x/net/context" + context "context" + fmt "fmt" + proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. @@ -21,7 +22,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type IPConfig_IPType int32 @@ -43,6 +44,7 @@ var IPConfig_IPType_name = map[int32]string{ 1: "PUBLIC", 2: "ALIAS", } + var IPConfig_IPType_value = map[string]int32{ "DEFAULT": 0, "PUBLIC": 1, @@ -54,9 +56,11 @@ func (x IPConfig_IPType) Enum() *IPConfig_IPType { *p = x return p } + func (x IPConfig_IPType) String() string { return proto.EnumName(IPConfig_IPType_name, int32(x)) } + func (x *IPConfig_IPType) UnmarshalJSON(data []byte) error { value, err := proto.UnmarshalJSONEnum(IPConfig_IPType_value, data, "IPConfig_IPType") if err != nil { @@ -65,8 +69,9 @@ func (x *IPConfig_IPType) UnmarshalJSON(data []byte) error { *x = IPConfig_IPType(value) return nil } + func (IPConfig_IPType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_rds_0538639bb1883142, []int{2, 0} + return fileDescriptor_df4e3c8c1fe12b66, []int{2, 0} } type ListResourcesRequest struct { @@ -90,16 +95,17 @@ func (m *ListResourcesRequest) Reset() { *m = ListResourcesRequest{} } func (m *ListResourcesRequest) String() string { return proto.CompactTextString(m) } func (*ListResourcesRequest) ProtoMessage() {} func (*ListResourcesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_rds_0538639bb1883142, []int{0} + return fileDescriptor_df4e3c8c1fe12b66, []int{0} } + func (m *ListResourcesRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListResourcesRequest.Unmarshal(m, b) } func (m *ListResourcesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ListResourcesRequest.Marshal(b, m, deterministic) } -func (dst *ListResourcesRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ListResourcesRequest.Merge(dst, src) +func (m *ListResourcesRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ListResourcesRequest.Merge(m, src) } func (m *ListResourcesRequest) XXX_Size() int { return xxx_messageInfo_ListResourcesRequest.Size(m) @@ -150,16 +156,17 @@ func (m *Filter) Reset() { *m = Filter{} } func (m *Filter) String() string { return proto.CompactTextString(m) } func (*Filter) ProtoMessage() {} func (*Filter) Descriptor() ([]byte, []int) { - return fileDescriptor_rds_0538639bb1883142, []int{1} + return fileDescriptor_df4e3c8c1fe12b66, []int{1} } + func (m *Filter) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Filter.Unmarshal(m, b) } func (m *Filter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Filter.Marshal(b, m, deterministic) } -func (dst *Filter) XXX_Merge(src proto.Message) { - xxx_messageInfo_Filter.Merge(dst, src) +func (m *Filter) XXX_Merge(src proto.Message) { + xxx_messageInfo_Filter.Merge(m, src) } func (m *Filter) XXX_Size() int { return xxx_messageInfo_Filter.Size(m) @@ -197,16 +204,17 @@ func (m *IPConfig) Reset() { *m = IPConfig{} } func (m *IPConfig) String() string { return proto.CompactTextString(m) } func (*IPConfig) ProtoMessage() {} func (*IPConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_rds_0538639bb1883142, []int{2} + return fileDescriptor_df4e3c8c1fe12b66, []int{2} } + func (m *IPConfig) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_IPConfig.Unmarshal(m, b) } func (m *IPConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_IPConfig.Marshal(b, m, deterministic) } -func (dst *IPConfig) XXX_Merge(src proto.Message) { - xxx_messageInfo_IPConfig.Merge(dst, src) +func (m *IPConfig) XXX_Merge(src proto.Message) { + xxx_messageInfo_IPConfig.Merge(m, src) } func (m *IPConfig) XXX_Size() int { return xxx_messageInfo_IPConfig.Size(m) @@ -252,16 +260,17 @@ func (m *Resource) Reset() { *m = Resource{} } func (m *Resource) String() string { return proto.CompactTextString(m) } func (*Resource) ProtoMessage() {} func (*Resource) Descriptor() ([]byte, []int) { - return fileDescriptor_rds_0538639bb1883142, []int{3} + return fileDescriptor_df4e3c8c1fe12b66, []int{3} } + func (m *Resource) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Resource.Unmarshal(m, b) } func (m *Resource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Resource.Marshal(b, m, deterministic) } -func (dst *Resource) XXX_Merge(src proto.Message) { - xxx_messageInfo_Resource.Merge(dst, src) +func (m *Resource) XXX_Merge(src proto.Message) { + xxx_messageInfo_Resource.Merge(m, src) } func (m *Resource) XXX_Size() int { return xxx_messageInfo_Resource.Size(m) @@ -311,16 +320,17 @@ func (m *ListResourcesResponse) Reset() { *m = ListResourcesResponse{} } func (m *ListResourcesResponse) String() string { return proto.CompactTextString(m) } func (*ListResourcesResponse) ProtoMessage() {} func (*ListResourcesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_rds_0538639bb1883142, []int{4} + return fileDescriptor_df4e3c8c1fe12b66, []int{4} } + func (m *ListResourcesResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListResourcesResponse.Unmarshal(m, b) } func (m *ListResourcesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ListResourcesResponse.Marshal(b, m, deterministic) } -func (dst *ListResourcesResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ListResourcesResponse.Merge(dst, src) +func (m *ListResourcesResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ListResourcesResponse.Merge(m, src) } func (m *ListResourcesResponse) XXX_Size() int { return xxx_messageInfo_ListResourcesResponse.Size(m) @@ -339,12 +349,49 @@ func (m *ListResourcesResponse) GetResources() []*Resource { } func init() { + proto.RegisterEnum("cloudprober.targets.rds.IPConfig_IPType", IPConfig_IPType_name, IPConfig_IPType_value) proto.RegisterType((*ListResourcesRequest)(nil), "cloudprober.targets.rds.ListResourcesRequest") proto.RegisterType((*Filter)(nil), "cloudprober.targets.rds.Filter") proto.RegisterType((*IPConfig)(nil), "cloudprober.targets.rds.IPConfig") proto.RegisterType((*Resource)(nil), "cloudprober.targets.rds.Resource") proto.RegisterType((*ListResourcesResponse)(nil), "cloudprober.targets.rds.ListResourcesResponse") - proto.RegisterEnum("cloudprober.targets.rds.IPConfig_IPType", IPConfig_IPType_name, IPConfig_IPType_value) +} + +func init() { + proto.RegisterFile("github.com/google/cloudprober/targets/rds/proto/rds.proto", fileDescriptor_df4e3c8c1fe12b66) +} + +var fileDescriptor_df4e3c8c1fe12b66 = []byte{ + // 453 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0xcd, 0x6e, 0xd3, 0x4c, + 0x14, 0xed, 0x38, 0x4d, 0x6a, 0xdf, 0xb4, 0x55, 0xbe, 0xab, 0x7e, 0xc2, 0xea, 0x02, 0x8c, 0xd9, + 0x78, 0x01, 0x76, 0x95, 0x0d, 0x82, 0x05, 0x28, 0xb4, 0x54, 0xb2, 0x94, 0x45, 0x34, 0xb4, 0x12, + 0xbb, 0xc8, 0xb5, 0x27, 0xce, 0x88, 0xd4, 0x33, 0xcc, 0x8c, 0x23, 0xf2, 0x00, 0x3c, 0x05, 0x2f, + 0xc5, 0x23, 0x21, 0x8f, 0x6d, 0xfe, 0x44, 0x04, 0x2b, 0x9f, 0x7b, 0x74, 0xce, 0xf5, 0x99, 0x39, + 0x03, 0x2f, 0x4a, 0x6e, 0xd6, 0xf5, 0x5d, 0x9c, 0x8b, 0xfb, 0xa4, 0x14, 0xa2, 0xdc, 0xb0, 0x24, + 0xdf, 0x88, 0xba, 0x90, 0x4a, 0xdc, 0x31, 0x95, 0x98, 0x4c, 0x95, 0xcc, 0xe8, 0x44, 0x15, 0x3a, + 0x91, 0x4a, 0x18, 0xd1, 0xa0, 0xd8, 0x22, 0x7c, 0xf0, 0x93, 0x30, 0xee, 0x84, 0xb1, 0x2a, 0x74, + 0xf8, 0x95, 0xc0, 0xd9, 0x9c, 0x6b, 0x43, 0x99, 0x16, 0xb5, 0xca, 0x99, 0xa6, 0xec, 0x63, 0xcd, + 0xb4, 0xc1, 0x73, 0x70, 0xa5, 0x12, 0x5b, 0x5e, 0x30, 0xe5, 0x93, 0xc0, 0x89, 0x3c, 0xfa, 0x7d, + 0xc6, 0x27, 0x70, 0xa2, 0x3a, 0xfd, 0x52, 0x66, 0x66, 0xed, 0x3b, 0x01, 0x89, 0x3c, 0x7a, 0xdc, + 0x93, 0x8b, 0xcc, 0xac, 0xf1, 0x39, 0x8c, 0x56, 0x7c, 0x63, 0x98, 0xf2, 0x07, 0xc1, 0x20, 0x1a, + 0x4f, 0x1f, 0xc5, 0x7b, 0x32, 0xc4, 0xd7, 0x56, 0x46, 0x3b, 0x39, 0xbe, 0x02, 0x8f, 0xcb, 0x65, + 0x2e, 0xaa, 0x15, 0x2f, 0xfd, 0xc3, 0x80, 0x44, 0xe3, 0xe9, 0xe3, 0xbd, 0xde, 0x74, 0x71, 0x69, + 0x85, 0xd4, 0xe5, 0xb2, 0x45, 0xe1, 0x05, 0x8c, 0xda, 0x8d, 0x38, 0x81, 0xc1, 0x07, 0xb6, 0xeb, + 0xe2, 0x37, 0x10, 0xcf, 0x60, 0xb8, 0xcd, 0x36, 0x35, 0xf3, 0x1d, 0xcb, 0xb5, 0x43, 0xf8, 0x85, + 0x80, 0xdb, 0x2f, 0xc2, 0x87, 0xe0, 0x55, 0x3c, 0x5f, 0xf2, 0xaa, 0x60, 0x9f, 0x7c, 0x12, 0x90, + 0x68, 0xf8, 0x92, 0x5c, 0x50, 0xb7, 0xe2, 0x79, 0xda, 0x50, 0x38, 0x83, 0x23, 0x2e, 0x97, 0x66, + 0x27, 0x99, 0x3f, 0x08, 0x48, 0x74, 0x3a, 0x8d, 0xfe, 0x1a, 0x2e, 0x4e, 0x17, 0x37, 0x3b, 0xc9, + 0xe8, 0x88, 0xcb, 0xe6, 0x1b, 0x3e, 0x85, 0x51, 0xcb, 0xe0, 0x18, 0x8e, 0xae, 0xde, 0x5e, 0xcf, + 0x6e, 0xe7, 0x37, 0x93, 0x03, 0x04, 0x18, 0x2d, 0x6e, 0xdf, 0xcc, 0xd3, 0xcb, 0x09, 0x41, 0x0f, + 0x86, 0xb3, 0x79, 0x3a, 0x7b, 0x37, 0x71, 0x42, 0x0a, 0x6e, 0xdf, 0x0e, 0x22, 0x1c, 0x56, 0xd9, + 0x3d, 0xeb, 0x8e, 0x64, 0x31, 0x9e, 0x82, 0xc3, 0x65, 0x57, 0x81, 0xc3, 0xa5, 0x9d, 0x0b, 0x9b, + 0xad, 0x99, 0x8b, 0xc6, 0xc3, 0xab, 0x95, 0xb0, 0x57, 0x79, 0x4c, 0x2d, 0x0e, 0xdf, 0xc3, 0xff, + 0xbf, 0xb5, 0xae, 0xa5, 0xa8, 0x34, 0xc3, 0xd7, 0xe0, 0xf5, 0x2d, 0x6a, 0x9f, 0xd8, 0xe2, 0xf6, + 0x5f, 0x7e, 0x6f, 0xa7, 0x3f, 0x3c, 0xd3, 0xcf, 0x04, 0xfe, 0xeb, 0xf9, 0x2b, 0xae, 0x73, 0xb1, + 0x65, 0x6a, 0x87, 0x12, 0x4e, 0x7e, 0xf9, 0x1f, 0x3e, 0xdb, 0xbb, 0xf4, 0x4f, 0xaf, 0xf1, 0x3c, + 0xfe, 0x57, 0x79, 0x7b, 0x8c, 0xf0, 0xe0, 0x5b, 0x00, 0x00, 0x00, 0xff, 0xff, 0x95, 0xbd, 0xf0, + 0xbb, 0x2d, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -388,6 +435,14 @@ type ResourceDiscoveryServer interface { ListResources(context.Context, *ListResourcesRequest) (*ListResourcesResponse, error) } +// UnimplementedResourceDiscoveryServer can be embedded to have forward compatible implementations. +type UnimplementedResourceDiscoveryServer struct { +} + +func (*UnimplementedResourceDiscoveryServer) ListResources(ctx context.Context, req *ListResourcesRequest) (*ListResourcesResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ListResources not implemented") +} + func RegisterResourceDiscoveryServer(s *grpc.Server, srv ResourceDiscoveryServer) { s.RegisterService(&_ResourceDiscovery_serviceDesc, srv) } @@ -422,40 +477,3 @@ var _ResourceDiscovery_serviceDesc = grpc.ServiceDesc{ Streams: []grpc.StreamDesc{}, Metadata: "github.com/google/cloudprober/targets/rds/proto/rds.proto", } - -func init() { - proto.RegisterFile("github.com/google/cloudprober/targets/rds/proto/rds.proto", fileDescriptor_rds_0538639bb1883142) -} - -var fileDescriptor_rds_0538639bb1883142 = []byte{ - // 453 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0xcd, 0x6e, 0xd3, 0x4c, - 0x14, 0xed, 0x38, 0x4d, 0x6a, 0xdf, 0xb4, 0x55, 0xbe, 0xab, 0x7e, 0xc2, 0xea, 0x02, 0x8c, 0xd9, - 0x78, 0x01, 0x76, 0x95, 0x0d, 0x82, 0x05, 0x28, 0xb4, 0x54, 0xb2, 0x94, 0x45, 0x34, 0xb4, 0x12, - 0xbb, 0xc8, 0xb5, 0x27, 0xce, 0x88, 0xd4, 0x33, 0xcc, 0x8c, 0x23, 0xf2, 0x00, 0x3c, 0x05, 0x2f, - 0xc5, 0x23, 0x21, 0x8f, 0x6d, 0xfe, 0x44, 0x04, 0x2b, 0x9f, 0x7b, 0x74, 0xce, 0xf5, 0x99, 0x39, - 0x03, 0x2f, 0x4a, 0x6e, 0xd6, 0xf5, 0x5d, 0x9c, 0x8b, 0xfb, 0xa4, 0x14, 0xa2, 0xdc, 0xb0, 0x24, - 0xdf, 0x88, 0xba, 0x90, 0x4a, 0xdc, 0x31, 0x95, 0x98, 0x4c, 0x95, 0xcc, 0xe8, 0x44, 0x15, 0x3a, - 0x91, 0x4a, 0x18, 0xd1, 0xa0, 0xd8, 0x22, 0x7c, 0xf0, 0x93, 0x30, 0xee, 0x84, 0xb1, 0x2a, 0x74, - 0xf8, 0x95, 0xc0, 0xd9, 0x9c, 0x6b, 0x43, 0x99, 0x16, 0xb5, 0xca, 0x99, 0xa6, 0xec, 0x63, 0xcd, - 0xb4, 0xc1, 0x73, 0x70, 0xa5, 0x12, 0x5b, 0x5e, 0x30, 0xe5, 0x93, 0xc0, 0x89, 0x3c, 0xfa, 0x7d, - 0xc6, 0x27, 0x70, 0xa2, 0x3a, 0xfd, 0x52, 0x66, 0x66, 0xed, 0x3b, 0x01, 0x89, 0x3c, 0x7a, 0xdc, - 0x93, 0x8b, 0xcc, 0xac, 0xf1, 0x39, 0x8c, 0x56, 0x7c, 0x63, 0x98, 0xf2, 0x07, 0xc1, 0x20, 0x1a, - 0x4f, 0x1f, 0xc5, 0x7b, 0x32, 0xc4, 0xd7, 0x56, 0x46, 0x3b, 0x39, 0xbe, 0x02, 0x8f, 0xcb, 0x65, - 0x2e, 0xaa, 0x15, 0x2f, 0xfd, 0xc3, 0x80, 0x44, 0xe3, 0xe9, 0xe3, 0xbd, 0xde, 0x74, 0x71, 0x69, - 0x85, 0xd4, 0xe5, 0xb2, 0x45, 0xe1, 0x05, 0x8c, 0xda, 0x8d, 0x38, 0x81, 0xc1, 0x07, 0xb6, 0xeb, - 0xe2, 0x37, 0x10, 0xcf, 0x60, 0xb8, 0xcd, 0x36, 0x35, 0xf3, 0x1d, 0xcb, 0xb5, 0x43, 0xf8, 0x85, - 0x80, 0xdb, 0x2f, 0xc2, 0x87, 0xe0, 0x55, 0x3c, 0x5f, 0xf2, 0xaa, 0x60, 0x9f, 0x7c, 0x12, 0x90, - 0x68, 0xf8, 0x92, 0x5c, 0x50, 0xb7, 0xe2, 0x79, 0xda, 0x50, 0x38, 0x83, 0x23, 0x2e, 0x97, 0x66, - 0x27, 0x99, 0x3f, 0x08, 0x48, 0x74, 0x3a, 0x8d, 0xfe, 0x1a, 0x2e, 0x4e, 0x17, 0x37, 0x3b, 0xc9, - 0xe8, 0x88, 0xcb, 0xe6, 0x1b, 0x3e, 0x85, 0x51, 0xcb, 0xe0, 0x18, 0x8e, 0xae, 0xde, 0x5e, 0xcf, - 0x6e, 0xe7, 0x37, 0x93, 0x03, 0x04, 0x18, 0x2d, 0x6e, 0xdf, 0xcc, 0xd3, 0xcb, 0x09, 0x41, 0x0f, - 0x86, 0xb3, 0x79, 0x3a, 0x7b, 0x37, 0x71, 0x42, 0x0a, 0x6e, 0xdf, 0x0e, 0x22, 0x1c, 0x56, 0xd9, - 0x3d, 0xeb, 0x8e, 0x64, 0x31, 0x9e, 0x82, 0xc3, 0x65, 0x57, 0x81, 0xc3, 0xa5, 0x9d, 0x0b, 0x9b, - 0xad, 0x99, 0x8b, 0xc6, 0xc3, 0xab, 0x95, 0xb0, 0x57, 0x79, 0x4c, 0x2d, 0x0e, 0xdf, 0xc3, 0xff, - 0xbf, 0xb5, 0xae, 0xa5, 0xa8, 0x34, 0xc3, 0xd7, 0xe0, 0xf5, 0x2d, 0x6a, 0x9f, 0xd8, 0xe2, 0xf6, - 0x5f, 0x7e, 0x6f, 0xa7, 0x3f, 0x3c, 0xd3, 0xcf, 0x04, 0xfe, 0xeb, 0xf9, 0x2b, 0xae, 0x73, 0xb1, - 0x65, 0x6a, 0x87, 0x12, 0x4e, 0x7e, 0xf9, 0x1f, 0x3e, 0xdb, 0xbb, 0xf4, 0x4f, 0xaf, 0xf1, 0x3c, - 0xfe, 0x57, 0x79, 0x7b, 0x8c, 0xf0, 0xe0, 0x5b, 0x00, 0x00, 0x00, 0xff, 0xff, 0x95, 0xbd, 0xf0, - 0xbb, 0x2d, 0x03, 0x00, 0x00, -} diff --git a/targets/rds/server/gcp/proto/config.pb.go b/targets/rds/server/gcp/proto/config.pb.go index 3d170ecf..4d8af153 100644 --- a/targets/rds/server/gcp/proto/config.pb.go +++ b/targets/rds/server/gcp/proto/config.pb.go @@ -3,9 +3,11 @@ package proto -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type GCEInstances struct { // Zone filter, e.g. zone_filter: "us-east1-*" for all zones in us-east1 @@ -33,16 +35,17 @@ func (m *GCEInstances) Reset() { *m = GCEInstances{} } func (m *GCEInstances) String() string { return proto.CompactTextString(m) } func (*GCEInstances) ProtoMessage() {} func (*GCEInstances) Descriptor() ([]byte, []int) { - return fileDescriptor_config_78533f985346d64e, []int{0} + return fileDescriptor_87b43a20d7761773, []int{0} } + func (m *GCEInstances) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GCEInstances.Unmarshal(m, b) } func (m *GCEInstances) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GCEInstances.Marshal(b, m, deterministic) } -func (dst *GCEInstances) XXX_Merge(src proto.Message) { - xxx_messageInfo_GCEInstances.Merge(dst, src) +func (m *GCEInstances) XXX_Merge(src proto.Message) { + xxx_messageInfo_GCEInstances.Merge(m, src) } func (m *GCEInstances) XXX_Size() int { return xxx_messageInfo_GCEInstances.Size(m) @@ -81,16 +84,17 @@ func (m *RegionalForwardingRules) Reset() { *m = RegionalForwardingRules func (m *RegionalForwardingRules) String() string { return proto.CompactTextString(m) } func (*RegionalForwardingRules) ProtoMessage() {} func (*RegionalForwardingRules) Descriptor() ([]byte, []int) { - return fileDescriptor_config_78533f985346d64e, []int{1} + return fileDescriptor_87b43a20d7761773, []int{1} } + func (m *RegionalForwardingRules) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RegionalForwardingRules.Unmarshal(m, b) } func (m *RegionalForwardingRules) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RegionalForwardingRules.Marshal(b, m, deterministic) } -func (dst *RegionalForwardingRules) XXX_Merge(src proto.Message) { - xxx_messageInfo_RegionalForwardingRules.Merge(dst, src) +func (m *RegionalForwardingRules) XXX_Merge(src proto.Message) { + xxx_messageInfo_RegionalForwardingRules.Merge(m, src) } func (m *RegionalForwardingRules) XXX_Size() int { return xxx_messageInfo_RegionalForwardingRules.Size(m) @@ -120,16 +124,17 @@ func (m *RTCVariables) Reset() { *m = RTCVariables{} } func (m *RTCVariables) String() string { return proto.CompactTextString(m) } func (*RTCVariables) ProtoMessage() {} func (*RTCVariables) Descriptor() ([]byte, []int) { - return fileDescriptor_config_78533f985346d64e, []int{2} + return fileDescriptor_87b43a20d7761773, []int{2} } + func (m *RTCVariables) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RTCVariables.Unmarshal(m, b) } func (m *RTCVariables) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RTCVariables.Marshal(b, m, deterministic) } -func (dst *RTCVariables) XXX_Merge(src proto.Message) { - xxx_messageInfo_RTCVariables.Merge(dst, src) +func (m *RTCVariables) XXX_Merge(src proto.Message) { + xxx_messageInfo_RTCVariables.Merge(m, src) } func (m *RTCVariables) XXX_Size() int { return xxx_messageInfo_RTCVariables.Size(m) @@ -160,16 +165,17 @@ func (m *RTCVariables_RTCConfig) Reset() { *m = RTCVariables_RTCConfig{} func (m *RTCVariables_RTCConfig) String() string { return proto.CompactTextString(m) } func (*RTCVariables_RTCConfig) ProtoMessage() {} func (*RTCVariables_RTCConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_config_78533f985346d64e, []int{2, 0} + return fileDescriptor_87b43a20d7761773, []int{2, 0} } + func (m *RTCVariables_RTCConfig) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RTCVariables_RTCConfig.Unmarshal(m, b) } func (m *RTCVariables_RTCConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RTCVariables_RTCConfig.Marshal(b, m, deterministic) } -func (dst *RTCVariables_RTCConfig) XXX_Merge(src proto.Message) { - xxx_messageInfo_RTCVariables_RTCConfig.Merge(dst, src) +func (m *RTCVariables_RTCConfig) XXX_Merge(src proto.Message) { + xxx_messageInfo_RTCVariables_RTCConfig.Merge(m, src) } func (m *RTCVariables_RTCConfig) XXX_Size() int { return xxx_messageInfo_RTCVariables_RTCConfig.Size(m) @@ -220,16 +226,17 @@ func (m *ProviderConfig) Reset() { *m = ProviderConfig{} } func (m *ProviderConfig) String() string { return proto.CompactTextString(m) } func (*ProviderConfig) ProtoMessage() {} func (*ProviderConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_config_78533f985346d64e, []int{3} + return fileDescriptor_87b43a20d7761773, []int{3} } + func (m *ProviderConfig) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProviderConfig.Unmarshal(m, b) } func (m *ProviderConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ProviderConfig.Marshal(b, m, deterministic) } -func (dst *ProviderConfig) XXX_Merge(src proto.Message) { - xxx_messageInfo_ProviderConfig.Merge(dst, src) +func (m *ProviderConfig) XXX_Merge(src proto.Message) { + xxx_messageInfo_ProviderConfig.Merge(m, src) } func (m *ProviderConfig) XXX_Size() int { return xxx_messageInfo_ProviderConfig.Size(m) @@ -286,10 +293,10 @@ func init() { } func init() { - proto.RegisterFile("github.com/google/cloudprober/targets/rds/server/gcp/proto/config.proto", fileDescriptor_config_78533f985346d64e) + proto.RegisterFile("github.com/google/cloudprober/targets/rds/server/gcp/proto/config.proto", fileDescriptor_87b43a20d7761773) } -var fileDescriptor_config_78533f985346d64e = []byte{ +var fileDescriptor_87b43a20d7761773 = []byte{ // 418 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0x3f, 0x6f, 0xdb, 0x30, 0x10, 0xc5, 0x21, 0x39, 0x45, 0xa1, 0x93, 0xdc, 0x41, 0x4b, 0xd4, 0x76, 0xa8, 0x61, 0x2f, 0xee, diff --git a/targets/rds/server/proto/config.pb.go b/targets/rds/server/proto/config.pb.go index 1f3bcf7b..dbeeec77 100644 --- a/targets/rds/server/proto/config.pb.go +++ b/targets/rds/server/proto/config.pb.go @@ -3,10 +3,12 @@ package proto -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import proto1 "github.com/google/cloudprober/targets/rds/server/gcp/proto" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + proto1 "github.com/google/cloudprober/targets/rds/server/gcp/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -17,7 +19,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type ServerConf struct { // List of providers that server supports. @@ -39,16 +41,17 @@ func (m *ServerConf) Reset() { *m = ServerConf{} } func (m *ServerConf) String() string { return proto.CompactTextString(m) } func (*ServerConf) ProtoMessage() {} func (*ServerConf) Descriptor() ([]byte, []int) { - return fileDescriptor_config_659de17abda0befa, []int{0} + return fileDescriptor_4a3234188f7c6305, []int{0} } + func (m *ServerConf) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ServerConf.Unmarshal(m, b) } func (m *ServerConf) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ServerConf.Marshal(b, m, deterministic) } -func (dst *ServerConf) XXX_Merge(src proto.Message) { - xxx_messageInfo_ServerConf.Merge(dst, src) +func (m *ServerConf) XXX_Merge(src proto.Message) { + xxx_messageInfo_ServerConf.Merge(m, src) } func (m *ServerConf) XXX_Size() int { return xxx_messageInfo_ServerConf.Size(m) @@ -89,16 +92,17 @@ func (m *Provider) Reset() { *m = Provider{} } func (m *Provider) String() string { return proto.CompactTextString(m) } func (*Provider) ProtoMessage() {} func (*Provider) Descriptor() ([]byte, []int) { - return fileDescriptor_config_659de17abda0befa, []int{1} + return fileDescriptor_4a3234188f7c6305, []int{1} } + func (m *Provider) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Provider.Unmarshal(m, b) } func (m *Provider) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Provider.Marshal(b, m, deterministic) } -func (dst *Provider) XXX_Merge(src proto.Message) { - xxx_messageInfo_Provider.Merge(dst, src) +func (m *Provider) XXX_Merge(src proto.Message) { + xxx_messageInfo_Provider.Merge(m, src) } func (m *Provider) XXX_Size() int { return xxx_messageInfo_Provider.Size(m) @@ -140,71 +144,23 @@ func (m *Provider) GetGcpConfig() *proto1.ProviderConfig { return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*Provider) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _Provider_OneofMarshaler, _Provider_OneofUnmarshaler, _Provider_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*Provider) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*Provider_GcpConfig)(nil), } } -func _Provider_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*Provider) - // config - switch x := m.Config.(type) { - case *Provider_GcpConfig: - b.EncodeVarint(2<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.GcpConfig); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("Provider.Config has unexpected type %T", x) - } - return nil -} - -func _Provider_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*Provider) - switch tag { - case 2: // config.gcp_config - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(proto1.ProviderConfig) - err := b.DecodeMessage(msg) - m.Config = &Provider_GcpConfig{msg} - return true, err - default: - return false, nil - } -} - -func _Provider_OneofSizer(msg proto.Message) (n int) { - m := msg.(*Provider) - // config - switch x := m.Config.(type) { - case *Provider_GcpConfig: - s := proto.Size(x.GcpConfig) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - func init() { proto.RegisterType((*ServerConf)(nil), "cloudprober.targets.rds.ServerConf") proto.RegisterType((*Provider)(nil), "cloudprober.targets.rds.Provider") } func init() { - proto.RegisterFile("github.com/google/cloudprober/targets/rds/server/proto/config.proto", fileDescriptor_config_659de17abda0befa) + proto.RegisterFile("github.com/google/cloudprober/targets/rds/server/proto/config.proto", fileDescriptor_4a3234188f7c6305) } -var fileDescriptor_config_659de17abda0befa = []byte{ +var fileDescriptor_4a3234188f7c6305 = []byte{ // 224 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x8e, 0x31, 0x4b, 0x03, 0x41, 0x10, 0x85, 0xbd, 0x53, 0xe4, 0x6e, 0x02, 0x16, 0xdb, 0x78, 0x58, 0x9d, 0xa9, 0x0e, 0x84, 0x5d, diff --git a/targets/rtc/proto/config.pb.go b/targets/rtc/proto/config.pb.go index d5752ebb..dced3317 100644 --- a/targets/rtc/proto/config.pb.go +++ b/targets/rtc/proto/config.pb.go @@ -3,9 +3,11 @@ package proto -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // TargetsConf represents listing targets from a key/val set stored in the RTC // API under a certain provided configuration. It always only lists the keys @@ -79,16 +81,17 @@ func (m *TargetsConf) Reset() { *m = TargetsConf{} } func (m *TargetsConf) String() string { return proto.CompactTextString(m) } func (*TargetsConf) ProtoMessage() {} func (*TargetsConf) Descriptor() ([]byte, []int) { - return fileDescriptor_config_740388aebedb8f5c, []int{0} + return fileDescriptor_d7eaeaf49ea19e21, []int{0} } + func (m *TargetsConf) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TargetsConf.Unmarshal(m, b) } func (m *TargetsConf) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_TargetsConf.Marshal(b, m, deterministic) } -func (dst *TargetsConf) XXX_Merge(src proto.Message) { - xxx_messageInfo_TargetsConf.Merge(dst, src) +func (m *TargetsConf) XXX_Merge(src proto.Message) { + xxx_messageInfo_TargetsConf.Merge(m, src) } func (m *TargetsConf) XXX_Size() int { return xxx_messageInfo_TargetsConf.Size(m) @@ -149,10 +152,10 @@ func init() { } func init() { - proto.RegisterFile("github.com/google/cloudprober/targets/rtc/proto/config.proto", fileDescriptor_config_740388aebedb8f5c) + proto.RegisterFile("github.com/google/cloudprober/targets/rtc/proto/config.proto", fileDescriptor_d7eaeaf49ea19e21) } -var fileDescriptor_config_740388aebedb8f5c = []byte{ +var fileDescriptor_d7eaeaf49ea19e21 = []byte{ // 236 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x8d, 0xbf, 0x4e, 0x84, 0x40, 0x10, 0xc6, 0x83, 0x78, 0x67, 0x18, 0x1a, 0xb3, 0x85, 0xd2, 0x18, 0xd1, 0xc2, 0x50, 0xb1, 0x24, diff --git a/targets/rtc/rtcreporter/proto/rtcreporter.pb.go b/targets/rtc/rtcreporter/proto/rtcreporter.pb.go index cca94882..2e6c7674 100644 --- a/targets/rtc/rtcreporter/proto/rtcreporter.pb.go +++ b/targets/rtc/rtcreporter/proto/rtcreporter.pb.go @@ -3,9 +3,11 @@ package proto -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type RtcReportOptions struct { // RTC configs which cloudprober should report itself to. @@ -40,16 +42,17 @@ func (m *RtcReportOptions) Reset() { *m = RtcReportOptions{} } func (m *RtcReportOptions) String() string { return proto.CompactTextString(m) } func (*RtcReportOptions) ProtoMessage() {} func (*RtcReportOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_rtcreporter_896c0fe1faa196e8, []int{0} + return fileDescriptor_48d94276d3250c04, []int{0} } + func (m *RtcReportOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RtcReportOptions.Unmarshal(m, b) } func (m *RtcReportOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RtcReportOptions.Marshal(b, m, deterministic) } -func (dst *RtcReportOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_RtcReportOptions.Merge(dst, src) +func (m *RtcReportOptions) XXX_Merge(src proto.Message) { + xxx_messageInfo_RtcReportOptions.Merge(m, src) } func (m *RtcReportOptions) XXX_Size() int { return xxx_messageInfo_RtcReportOptions.Size(m) @@ -114,16 +117,17 @@ func (m *RtcTargetInfo) Reset() { *m = RtcTargetInfo{} } func (m *RtcTargetInfo) String() string { return proto.CompactTextString(m) } func (*RtcTargetInfo) ProtoMessage() {} func (*RtcTargetInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_rtcreporter_896c0fe1faa196e8, []int{1} + return fileDescriptor_48d94276d3250c04, []int{1} } + func (m *RtcTargetInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RtcTargetInfo.Unmarshal(m, b) } func (m *RtcTargetInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RtcTargetInfo.Marshal(b, m, deterministic) } -func (dst *RtcTargetInfo) XXX_Merge(src proto.Message) { - xxx_messageInfo_RtcTargetInfo.Merge(dst, src) +func (m *RtcTargetInfo) XXX_Merge(src proto.Message) { + xxx_messageInfo_RtcTargetInfo.Merge(m, src) } func (m *RtcTargetInfo) XXX_Size() int { return xxx_messageInfo_RtcTargetInfo.Size(m) @@ -171,16 +175,17 @@ func (m *RtcTargetInfo_Address) Reset() { *m = RtcTargetInfo_Address{} } func (m *RtcTargetInfo_Address) String() string { return proto.CompactTextString(m) } func (*RtcTargetInfo_Address) ProtoMessage() {} func (*RtcTargetInfo_Address) Descriptor() ([]byte, []int) { - return fileDescriptor_rtcreporter_896c0fe1faa196e8, []int{1, 0} + return fileDescriptor_48d94276d3250c04, []int{1, 0} } + func (m *RtcTargetInfo_Address) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RtcTargetInfo_Address.Unmarshal(m, b) } func (m *RtcTargetInfo_Address) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RtcTargetInfo_Address.Marshal(b, m, deterministic) } -func (dst *RtcTargetInfo_Address) XXX_Merge(src proto.Message) { - xxx_messageInfo_RtcTargetInfo_Address.Merge(dst, src) +func (m *RtcTargetInfo_Address) XXX_Merge(src proto.Message) { + xxx_messageInfo_RtcTargetInfo_Address.Merge(m, src) } func (m *RtcTargetInfo_Address) XXX_Size() int { return xxx_messageInfo_RtcTargetInfo_Address.Size(m) @@ -212,10 +217,10 @@ func init() { } func init() { - proto.RegisterFile("github.com/google/cloudprober/targets/rtc/rtcreporter/proto/rtcreporter.proto", fileDescriptor_rtcreporter_896c0fe1faa196e8) + proto.RegisterFile("github.com/google/cloudprober/targets/rtc/rtcreporter/proto/rtcreporter.proto", fileDescriptor_48d94276d3250c04) } -var fileDescriptor_rtcreporter_896c0fe1faa196e8 = []byte{ +var fileDescriptor_48d94276d3250c04 = []byte{ // 294 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x50, 0xcd, 0x4a, 0x03, 0x31, 0x10, 0x66, 0xfb, 0x63, 0xd9, 0x68, 0xa1, 0xe4, 0x20, 0x41, 0x04, 0x4b, 0xbd, 0x14, 0x0f, 0xd9, diff --git a/targets/testdata/testdata.pb.go b/targets/testdata/testdata.pb.go index 011b4525..70a3222c 100644 --- a/targets/testdata/testdata.pb.go +++ b/targets/testdata/testdata.pb.go @@ -3,10 +3,12 @@ package testdata -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import proto1 "github.com/google/cloudprober/targets/proto" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + proto1 "github.com/google/cloudprober/targets/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -17,7 +19,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type FancyTargets struct { Name *string `protobuf:"bytes,1,req,name=name" json:"name,omitempty"` @@ -30,16 +32,17 @@ func (m *FancyTargets) Reset() { *m = FancyTargets{} } func (m *FancyTargets) String() string { return proto.CompactTextString(m) } func (*FancyTargets) ProtoMessage() {} func (*FancyTargets) Descriptor() ([]byte, []int) { - return fileDescriptor_testdata_8a68c779ec97969a, []int{0} + return fileDescriptor_0e98d900ab6368b0, []int{0} } + func (m *FancyTargets) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FancyTargets.Unmarshal(m, b) } func (m *FancyTargets) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_FancyTargets.Marshal(b, m, deterministic) } -func (dst *FancyTargets) XXX_Merge(src proto.Message) { - xxx_messageInfo_FancyTargets.Merge(dst, src) +func (m *FancyTargets) XXX_Merge(src proto.Message) { + xxx_messageInfo_FancyTargets.Merge(m, src) } func (m *FancyTargets) XXX_Size() int { return xxx_messageInfo_FancyTargets.Size(m) @@ -62,7 +65,7 @@ var E_FancyTargets = &proto.ExtensionDesc{ ExtensionType: (*FancyTargets)(nil), Field: 200, Name: "cloudprober.targets.testdata.fancy_targets", - Tag: "bytes,200,opt,name=fancy_targets,json=fancyTargets", + Tag: "bytes,200,opt,name=fancy_targets", Filename: "github.com/google/cloudprober/targets/testdata/testdata.proto", } @@ -72,10 +75,10 @@ func init() { } func init() { - proto.RegisterFile("github.com/google/cloudprober/targets/testdata/testdata.proto", fileDescriptor_testdata_8a68c779ec97969a) + proto.RegisterFile("github.com/google/cloudprober/targets/testdata/testdata.proto", fileDescriptor_0e98d900ab6368b0) } -var fileDescriptor_testdata_8a68c779ec97969a = []byte{ +var fileDescriptor_0e98d900ab6368b0 = []byte{ // 170 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0x4d, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xcf, 0xcf, 0x4f, 0xcf, 0x49, 0xd5, 0x4f, 0xce, diff --git a/validators/http/proto/config.pb.go b/validators/http/proto/config.pb.go index 3492e52d..699aa5c6 100644 --- a/validators/http/proto/config.pb.go +++ b/validators/http/proto/config.pb.go @@ -3,9 +3,11 @@ package proto -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type Validator struct { // Comma-separated list of success status codes and code ranges. @@ -35,16 +37,17 @@ func (m *Validator) Reset() { *m = Validator{} } func (m *Validator) String() string { return proto.CompactTextString(m) } func (*Validator) ProtoMessage() {} func (*Validator) Descriptor() ([]byte, []int) { - return fileDescriptor_config_2a8643270315a49d, []int{0} + return fileDescriptor_0e97305dfad91cfc, []int{0} } + func (m *Validator) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Validator.Unmarshal(m, b) } func (m *Validator) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Validator.Marshal(b, m, deterministic) } -func (dst *Validator) XXX_Merge(src proto.Message) { - xxx_messageInfo_Validator.Merge(dst, src) +func (m *Validator) XXX_Merge(src proto.Message) { + xxx_messageInfo_Validator.Merge(m, src) } func (m *Validator) XXX_Size() int { return xxx_messageInfo_Validator.Size(m) @@ -74,10 +77,10 @@ func init() { } func init() { - proto.RegisterFile("github.com/google/cloudprober/validators/http/proto/config.proto", fileDescriptor_config_2a8643270315a49d) + proto.RegisterFile("github.com/google/cloudprober/validators/http/proto/config.proto", fileDescriptor_0e97305dfad91cfc) } -var fileDescriptor_config_2a8643270315a49d = []byte{ +var fileDescriptor_0e97305dfad91cfc = []byte{ // 158 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x8b, 0xc1, 0xaa, 0xc2, 0x30, 0x10, 0x45, 0xe9, 0xdb, 0xb5, 0xcb, 0xf0, 0x16, 0x82, 0x1b, 0x71, 0xe5, 0x2a, 0xe3, 0x27, 0x08, diff --git a/validators/integrity/proto/config.pb.go b/validators/integrity/proto/config.pb.go index 0b07366b..6fe3a02b 100644 --- a/validators/integrity/proto/config.pb.go +++ b/validators/integrity/proto/config.pb.go @@ -3,9 +3,11 @@ package proto -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type Validator struct { // Validate the data integrity of the response using a pattern that is @@ -40,16 +42,17 @@ func (m *Validator) Reset() { *m = Validator{} } func (m *Validator) String() string { return proto.CompactTextString(m) } func (*Validator) ProtoMessage() {} func (*Validator) Descriptor() ([]byte, []int) { - return fileDescriptor_config_ee43a05c25c7af91, []int{0} + return fileDescriptor_40426890295335ca, []int{0} } + func (m *Validator) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Validator.Unmarshal(m, b) } func (m *Validator) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Validator.Marshal(b, m, deterministic) } -func (dst *Validator) XXX_Merge(src proto.Message) { - xxx_messageInfo_Validator.Merge(dst, src) +func (m *Validator) XXX_Merge(src proto.Message) { + xxx_messageInfo_Validator.Merge(m, src) } func (m *Validator) XXX_Size() int { return xxx_messageInfo_Validator.Size(m) @@ -97,80 +100,23 @@ func (m *Validator) GetPatternNumBytes() int32 { return 0 } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*Validator) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _Validator_OneofMarshaler, _Validator_OneofUnmarshaler, _Validator_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*Validator) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*Validator_PatternString)(nil), (*Validator_PatternNumBytes)(nil), } } -func _Validator_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*Validator) - // pattern - switch x := m.Pattern.(type) { - case *Validator_PatternString: - b.EncodeVarint(1<<3 | proto.WireBytes) - b.EncodeStringBytes(x.PatternString) - case *Validator_PatternNumBytes: - b.EncodeVarint(2<<3 | proto.WireVarint) - b.EncodeVarint(uint64(x.PatternNumBytes)) - case nil: - default: - return fmt.Errorf("Validator.Pattern has unexpected type %T", x) - } - return nil -} - -func _Validator_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*Validator) - switch tag { - case 1: // pattern.pattern_string - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Pattern = &Validator_PatternString{x} - return true, err - case 2: // pattern.pattern_num_bytes - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Pattern = &Validator_PatternNumBytes{int32(x)} - return true, err - default: - return false, nil - } -} - -func _Validator_OneofSizer(msg proto.Message) (n int) { - m := msg.(*Validator) - // pattern - switch x := m.Pattern.(type) { - case *Validator_PatternString: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.PatternString))) - n += len(x.PatternString) - case *Validator_PatternNumBytes: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.PatternNumBytes)) - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - func init() { proto.RegisterType((*Validator)(nil), "cloudprober.validators.integrity.Validator") } func init() { - proto.RegisterFile("github.com/google/cloudprober/validators/integrity/proto/config.proto", fileDescriptor_config_ee43a05c25c7af91) + proto.RegisterFile("github.com/google/cloudprober/validators/integrity/proto/config.proto", fileDescriptor_40426890295335ca) } -var fileDescriptor_config_ee43a05c25c7af91 = []byte{ +var fileDescriptor_40426890295335ca = []byte{ // 177 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0xcb, 0xcf, 0x0a, 0x82, 0x40, 0x10, 0xc7, 0x71, 0x0d, 0x22, 0x5c, 0xa8, 0xc8, 0x93, 0x47, 0xe9, 0x92, 0x87, 0xd8, 0x7d, 0x07, diff --git a/validators/proto/config.pb.go b/validators/proto/config.pb.go index d171b1f3..57f2c6a9 100644 --- a/validators/proto/config.pb.go +++ b/validators/proto/config.pb.go @@ -3,11 +3,13 @@ package proto -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import proto1 "github.com/google/cloudprober/validators/http/proto" -import proto2 "github.com/google/cloudprober/validators/integrity/proto" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + proto1 "github.com/google/cloudprober/validators/http/proto" + proto2 "github.com/google/cloudprober/validators/integrity/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -18,7 +20,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type Validator struct { Name *string `protobuf:"bytes,1,req,name=name" json:"name,omitempty"` @@ -36,16 +38,17 @@ func (m *Validator) Reset() { *m = Validator{} } func (m *Validator) String() string { return proto.CompactTextString(m) } func (*Validator) ProtoMessage() {} func (*Validator) Descriptor() ([]byte, []int) { - return fileDescriptor_config_d0dbe3c61f904a6d, []int{0} + return fileDescriptor_561cf35eb59e0a7f, []int{0} } + func (m *Validator) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Validator.Unmarshal(m, b) } func (m *Validator) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Validator.Marshal(b, m, deterministic) } -func (dst *Validator) XXX_Merge(src proto.Message) { - xxx_messageInfo_Validator.Merge(dst, src) +func (m *Validator) XXX_Merge(src proto.Message) { + xxx_messageInfo_Validator.Merge(m, src) } func (m *Validator) XXX_Size() int { return xxx_messageInfo_Validator.Size(m) @@ -113,104 +116,24 @@ func (m *Validator) GetRegex() string { return "" } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*Validator) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _Validator_OneofMarshaler, _Validator_OneofUnmarshaler, _Validator_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*Validator) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*Validator_HttpValidator)(nil), (*Validator_IntegrityValidator)(nil), (*Validator_Regex)(nil), } } -func _Validator_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*Validator) - // type - switch x := m.Type.(type) { - case *Validator_HttpValidator: - b.EncodeVarint(2<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.HttpValidator); err != nil { - return err - } - case *Validator_IntegrityValidator: - b.EncodeVarint(3<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.IntegrityValidator); err != nil { - return err - } - case *Validator_Regex: - b.EncodeVarint(4<<3 | proto.WireBytes) - b.EncodeStringBytes(x.Regex) - case nil: - default: - return fmt.Errorf("Validator.Type has unexpected type %T", x) - } - return nil -} - -func _Validator_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*Validator) - switch tag { - case 2: // type.http_validator - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(proto1.Validator) - err := b.DecodeMessage(msg) - m.Type = &Validator_HttpValidator{msg} - return true, err - case 3: // type.integrity_validator - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(proto2.Validator) - err := b.DecodeMessage(msg) - m.Type = &Validator_IntegrityValidator{msg} - return true, err - case 4: // type.regex - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Type = &Validator_Regex{x} - return true, err - default: - return false, nil - } -} - -func _Validator_OneofSizer(msg proto.Message) (n int) { - m := msg.(*Validator) - // type - switch x := m.Type.(type) { - case *Validator_HttpValidator: - s := proto.Size(x.HttpValidator) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *Validator_IntegrityValidator: - s := proto.Size(x.IntegrityValidator) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *Validator_Regex: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.Regex))) - n += len(x.Regex) - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - func init() { proto.RegisterType((*Validator)(nil), "cloudprober.validators.Validator") } func init() { - proto.RegisterFile("github.com/google/cloudprober/validators/proto/config.proto", fileDescriptor_config_d0dbe3c61f904a6d) + proto.RegisterFile("github.com/google/cloudprober/validators/proto/config.proto", fileDescriptor_561cf35eb59e0a7f) } -var fileDescriptor_config_d0dbe3c61f904a6d = []byte{ +var fileDescriptor_561cf35eb59e0a7f = []byte{ // 226 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0x4e, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xcf, 0xcf, 0x4f, 0xcf, 0x49, 0xd5, 0x4f, 0xce,