From 51314c65ee6b7ed9504c517bcb76e5ad4556d9e6 Mon Sep 17 00:00:00 2001 From: Joel Cooklin Date: Thu, 30 Jun 2016 07:55:53 -0700 Subject: [PATCH] Renames CollectMetricsReply in controlproxy avoiding duplicate registration --- control/control_grpc_server.go | 8 +- control/plugin/rpc/plugin.pb.go | 180 ++++++++++----------- grpc/common/common.pb.go | 149 +++++++++-------- grpc/controlproxy/controlproxy_test.go | 8 +- grpc/controlproxy/rpc/control.pb.go | 213 ++++++++++++------------- grpc/controlproxy/rpc/control.proto | 4 +- 6 files changed, 272 insertions(+), 290 deletions(-) diff --git a/control/control_grpc_server.go b/control/control_grpc_server.go index 6d47a1926..ef0bb4ec7 100644 --- a/control/control_grpc_server.go +++ b/control/control_grpc_server.go @@ -70,7 +70,7 @@ func (pc *ControlGRPCServer) ProcessMetrics(ctx context.Context, r *rpc.PubProcM return reply, nil } -func (pc *ControlGRPCServer) CollectMetrics(ctx context.Context, r *rpc.CollectMetricsRequest) (*rpc.CollectMetricsReply, error) { +func (pc *ControlGRPCServer) CollectMetrics(ctx context.Context, r *rpc.CollectMetricsRequest) (*rpc.CollectMetricsResponse, error) { metrics := common.ToCoreMetrics(r.Metrics) deadline := time.Unix(r.Deadline.Sec, r.Deadline.Nsec) var AllTags map[string]map[string]string @@ -81,13 +81,13 @@ func (pc *ControlGRPCServer) CollectMetrics(ctx context.Context, r *rpc.CollectM } } mts, errs := pc.control.CollectMetrics(metrics, deadline, r.TaskID, AllTags) - var reply *rpc.CollectMetricsReply + var reply *rpc.CollectMetricsResponse if mts == nil { - reply = &rpc.CollectMetricsReply{ + reply = &rpc.CollectMetricsResponse{ Errors: errorsToStrings(errs), } } else { - reply = &rpc.CollectMetricsReply{ + reply = &rpc.CollectMetricsResponse{ Metrics: common.NewMetrics(mts), Errors: errorsToStrings(errs), } diff --git a/control/plugin/rpc/plugin.pb.go b/control/plugin/rpc/plugin.pb.go index d8f4e339e..b9ecc76f0 100644 --- a/control/plugin/rpc/plugin.pb.go +++ b/control/plugin/rpc/plugin.pb.go @@ -75,9 +75,9 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type ProcessArg struct { - ContentType string `protobuf:"bytes,1,opt,name=ContentType,json=contentType" json:"ContentType,omitempty"` - Content []byte `protobuf:"bytes,2,opt,name=Content,json=content,proto3" json:"Content,omitempty"` - Config *common.ConfigMap `protobuf:"bytes,3,opt,name=Config,json=config" json:"Config,omitempty"` + ContentType string `protobuf:"bytes,1,opt,name=ContentType" json:"ContentType,omitempty"` + Content []byte `protobuf:"bytes,2,opt,name=Content,proto3" json:"Content,omitempty"` + Config *common.ConfigMap `protobuf:"bytes,3,opt,name=Config" json:"Config,omitempty"` } func (m *ProcessArg) Reset() { *m = ProcessArg{} } @@ -93,9 +93,9 @@ func (m *ProcessArg) GetConfig() *common.ConfigMap { } type ProcessReply struct { - ContentType string `protobuf:"bytes,1,opt,name=ContentType,json=contentType" json:"ContentType,omitempty"` - Content []byte `protobuf:"bytes,2,opt,name=Content,json=content,proto3" json:"Content,omitempty"` - Error string `protobuf:"bytes,3,opt,name=Error,json=error" json:"Error,omitempty"` + ContentType string `protobuf:"bytes,1,opt,name=ContentType" json:"ContentType,omitempty"` + Content []byte `protobuf:"bytes,2,opt,name=Content,proto3" json:"Content,omitempty"` + Error string `protobuf:"bytes,3,opt,name=Error" json:"Error,omitempty"` } func (m *ProcessReply) Reset() { *m = ProcessReply{} } @@ -104,9 +104,9 @@ func (*ProcessReply) ProtoMessage() {} func (*ProcessReply) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} } type PublishArg struct { - ContentType string `protobuf:"bytes,1,opt,name=ContentType,json=contentType" json:"ContentType,omitempty"` - Content []byte `protobuf:"bytes,2,opt,name=Content,json=content,proto3" json:"Content,omitempty"` - Config *common.ConfigMap `protobuf:"bytes,3,opt,name=Config,json=config" json:"Config,omitempty"` + ContentType string `protobuf:"bytes,1,opt,name=ContentType" json:"ContentType,omitempty"` + Content []byte `protobuf:"bytes,2,opt,name=Content,proto3" json:"Content,omitempty"` + Config *common.ConfigMap `protobuf:"bytes,3,opt,name=Config" json:"Config,omitempty"` } func (m *PublishArg) Reset() { *m = PublishArg{} } @@ -122,18 +122,18 @@ func (m *PublishArg) GetConfig() *common.ConfigMap { } type Rule struct { - RuleType string `protobuf:"bytes,1,opt,name=rule_type,json=ruleType" json:"rule_type,omitempty"` + RuleType string `protobuf:"bytes,1,opt,name=rule_type" json:"rule_type,omitempty"` Key string `protobuf:"bytes,2,opt,name=key" json:"key,omitempty"` Required bool `protobuf:"varint,3,opt,name=required" json:"required,omitempty"` Eescription string `protobuf:"bytes,4,opt,name=eescription" json:"eescription,omitempty"` - BoolDefault bool `protobuf:"varint,5,opt,name=bool_default,json=boolDefault" json:"bool_default,omitempty"` - FloatDefault float64 `protobuf:"fixed64,6,opt,name=float_default,json=floatDefault" json:"float_default,omitempty"` - FloatMinimum float64 `protobuf:"fixed64,7,opt,name=float_minimum,json=floatMinimum" json:"float_minimum,omitempty"` - FloatMaximum float64 `protobuf:"fixed64,8,opt,name=float_maximum,json=floatMaximum" json:"float_maximum,omitempty"` - IntDefault int64 `protobuf:"varint,9,opt,name=int_default,json=intDefault" json:"int_default,omitempty"` - IntMinimum int64 `protobuf:"varint,10,opt,name=int_minimum,json=intMinimum" json:"int_minimum,omitempty"` - IntMaximum int64 `protobuf:"varint,11,opt,name=int_maximum,json=intMaximum" json:"int_maximum,omitempty"` - StringDefault string `protobuf:"bytes,12,opt,name=string_default,json=stringDefault" json:"string_default,omitempty"` + BoolDefault bool `protobuf:"varint,5,opt,name=bool_default" json:"bool_default,omitempty"` + FloatDefault float64 `protobuf:"fixed64,6,opt,name=float_default" json:"float_default,omitempty"` + FloatMinimum float64 `protobuf:"fixed64,7,opt,name=float_minimum" json:"float_minimum,omitempty"` + FloatMaximum float64 `protobuf:"fixed64,8,opt,name=float_maximum" json:"float_maximum,omitempty"` + IntDefault int64 `protobuf:"varint,9,opt,name=int_default" json:"int_default,omitempty"` + IntMinimum int64 `protobuf:"varint,10,opt,name=int_minimum" json:"int_minimum,omitempty"` + IntMaximum int64 `protobuf:"varint,11,opt,name=int_maximum" json:"int_maximum,omitempty"` + StringDefault string `protobuf:"bytes,12,opt,name=string_default" json:"string_default,omitempty"` } func (m *Rule) Reset() { *m = Rule{} } @@ -169,7 +169,7 @@ func (*PingReply) ProtoMessage() {} func (*PingReply) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} } type KillRequest struct { - Reason string `protobuf:"bytes,1,opt,name=Reason,json=reason" json:"Reason,omitempty"` + Reason string `protobuf:"bytes,1,opt,name=Reason" json:"Reason,omitempty"` } func (m *KillRequest) Reset() { *m = KillRequest{} } @@ -188,10 +188,10 @@ func (*KillReply) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8 type GetConfigPolicyReply struct { Error string `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"` - BoolPolicy map[string]*BoolPolicy `protobuf:"bytes,2,rep,name=bool_policy,json=boolPolicy" json:"bool_policy,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` - FloatPolicy map[string]*FloatPolicy `protobuf:"bytes,3,rep,name=float_policy,json=floatPolicy" json:"float_policy,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` - IntegerPolicy map[string]*IntegerPolicy `protobuf:"bytes,4,rep,name=integer_policy,json=integerPolicy" json:"integer_policy,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` - StringPolicy map[string]*StringPolicy `protobuf:"bytes,5,rep,name=string_policy,json=stringPolicy" json:"string_policy,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + BoolPolicy map[string]*BoolPolicy `protobuf:"bytes,2,rep,name=bool_policy" json:"bool_policy,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + FloatPolicy map[string]*FloatPolicy `protobuf:"bytes,3,rep,name=float_policy" json:"float_policy,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + IntegerPolicy map[string]*IntegerPolicy `protobuf:"bytes,4,rep,name=integer_policy" json:"integer_policy,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + StringPolicy map[string]*StringPolicy `protobuf:"bytes,5,rep,name=string_policy" json:"string_policy,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` } func (m *GetConfigPolicyReply) Reset() { *m = GetConfigPolicyReply{} } @@ -1057,75 +1057,67 @@ func init() { } var fileDescriptor0 = []byte{ - // 1113 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xdc, 0x57, 0xdd, 0x8e, 0xdb, 0x44, - 0x14, 0xae, 0xe3, 0x24, 0x1b, 0x1f, 0x27, 0xd9, 0xcd, 0x50, 0x55, 0xc1, 0xa5, 0xa2, 0xcd, 0xb2, - 0x74, 0xfb, 0x43, 0x02, 0xd9, 0x1b, 0x54, 0xa9, 0x08, 0xda, 0x2e, 0xa5, 0xad, 0x16, 0x45, 0xde, - 0x72, 0xbd, 0x24, 0xde, 0xd9, 0xd4, 0xc2, 0xb1, 0x8d, 0x7f, 0xa0, 0x79, 0x02, 0x24, 0x24, 0x04, - 0xcf, 0xc3, 0x9b, 0xf0, 0x2a, 0x5c, 0x20, 0x66, 0xce, 0x8c, 0xed, 0x71, 0xe2, 0xec, 0xb6, 0x02, - 0xf5, 0x62, 0xaf, 0x92, 0x39, 0xf3, 0xcd, 0x77, 0xe6, 0x7c, 0x73, 0xe6, 0xcc, 0x31, 0x3c, 0x98, - 0xbb, 0xc9, 0xab, 0x74, 0x36, 0x74, 0x82, 0xc5, 0xc8, 0xf5, 0x13, 0xea, 0xc5, 0xa7, 0xee, 0x27, - 0xaf, 0x47, 0xb1, 0x3f, 0x0d, 0x47, 0x4e, 0xe0, 0x27, 0x51, 0xe0, 0x8d, 0x42, 0x2f, 0x9d, 0xbb, - 0xfe, 0x28, 0x0a, 0x1d, 0xf9, 0x77, 0x18, 0x46, 0x41, 0x12, 0x10, 0x9d, 0x59, 0xac, 0x83, 0x73, - 0x08, 0xe6, 0x7c, 0x09, 0x9b, 0x58, 0x04, 0xbe, 0xfc, 0x11, 0x2b, 0x07, 0x31, 0xc0, 0x24, 0x0a, - 0x1c, 0x1a, 0xc7, 0x5f, 0x45, 0x73, 0x72, 0x13, 0xcc, 0xc7, 0xcc, 0x15, 0xf5, 0x93, 0x97, 0xcb, - 0x90, 0xf6, 0xb5, 0x9b, 0xda, 0xbe, 0x61, 0x9b, 0x4e, 0x61, 0x22, 0x7d, 0xd8, 0x92, 0x88, 0x7e, - 0x8d, 0xcd, 0xb6, 0xed, 0x2d, 0x39, 0x4b, 0xee, 0x40, 0x93, 0xcd, 0x9c, 0xb9, 0xf3, 0xbe, 0xce, - 0x26, 0xcc, 0x71, 0x6f, 0x28, 0x1d, 0x09, 0xeb, 0xd1, 0x34, 0xb4, 0x9b, 0x0e, 0xfe, 0x1d, 0x7c, - 0x0f, 0x6d, 0xe9, 0xd4, 0xa6, 0xa1, 0xb7, 0xfc, 0x4f, 0x6e, 0xaf, 0x42, 0xe3, 0x30, 0x8a, 0x82, - 0x08, 0xbd, 0x1a, 0x76, 0x83, 0xf2, 0x01, 0x86, 0x95, 0xce, 0x3c, 0x37, 0x7e, 0xf5, 0x0e, 0xc3, - 0xfa, 0x5d, 0x87, 0xba, 0x9d, 0x7a, 0x94, 0x5c, 0x07, 0x23, 0x62, 0xbf, 0x27, 0x49, 0xe1, 0xad, - 0xc5, 0x0d, 0xe8, 0x6a, 0x07, 0xf4, 0x1f, 0xe8, 0x12, 0xdd, 0x18, 0x36, 0xff, 0x4b, 0x2c, 0x68, - 0x45, 0xf4, 0xc7, 0xd4, 0x8d, 0xe8, 0x29, 0x3a, 0x69, 0xd9, 0xf9, 0x98, 0x6f, 0x9d, 0xd2, 0xd8, - 0x89, 0xdc, 0x30, 0x71, 0x03, 0xbf, 0x5f, 0x17, 0x5b, 0x57, 0x4c, 0xe4, 0x16, 0xb4, 0x67, 0x41, - 0xe0, 0x9d, 0x9c, 0xd2, 0xb3, 0x69, 0xea, 0x25, 0xfd, 0x06, 0x32, 0x98, 0xdc, 0xf6, 0x44, 0x98, - 0xc8, 0x2e, 0x74, 0xce, 0xbc, 0x60, 0x9a, 0xe4, 0x98, 0x26, 0xc3, 0x68, 0x76, 0x1b, 0x8d, 0x6b, - 0xa0, 0x85, 0xeb, 0xbb, 0x8b, 0x74, 0xd1, 0xdf, 0x52, 0x40, 0x47, 0xc2, 0xa6, 0x80, 0xa6, 0xaf, - 0x11, 0xd4, 0x52, 0x41, 0xc2, 0x46, 0x3e, 0x04, 0x93, 0xe5, 0x5f, 0xee, 0xcc, 0x60, 0x10, 0xdd, - 0x06, 0x66, 0xca, 0x5c, 0x49, 0x40, 0xe6, 0x08, 0x72, 0x40, 0xe6, 0x26, 0x03, 0x48, 0x27, 0x66, - 0x01, 0x90, 0x2e, 0xf6, 0xa0, 0x1b, 0x27, 0x91, 0xeb, 0xcf, 0x73, 0x2f, 0x6d, 0x54, 0xa6, 0x23, - 0xac, 0xd2, 0xd1, 0xe0, 0x06, 0x18, 0xc7, 0x34, 0x79, 0x41, 0x97, 0x3c, 0x0b, 0xa4, 0xf0, 0x1a, - 0x9e, 0x2f, 0xff, 0x3b, 0xd8, 0x05, 0x53, 0x4c, 0x8b, 0x34, 0x64, 0xa9, 0x84, 0xd9, 0x23, 0x8f, - 0x4c, 0xa6, 0xd2, 0x2d, 0x30, 0x26, 0x8c, 0xf2, 0x3c, 0xc8, 0x1e, 0x98, 0x2f, 0x5c, 0xcf, 0xb3, - 0xd9, 0xa1, 0xd1, 0x38, 0x21, 0xd7, 0xa0, 0x69, 0xd3, 0x69, 0xcc, 0x8e, 0x4b, 0xa0, 0x9a, 0x11, - 0x8e, 0x38, 0x93, 0x80, 0x6d, 0x66, 0xfa, 0xb3, 0x01, 0x57, 0x9f, 0xd2, 0x44, 0xe4, 0xd6, 0x24, - 0xf0, 0x5c, 0xe7, 0xbc, 0xbd, 0x91, 0xe7, 0x80, 0xe7, 0x7c, 0x12, 0x22, 0x92, 0xe5, 0x94, 0xce, - 0x32, 0xf4, 0xce, 0x90, 0x5d, 0xf6, 0x61, 0x15, 0xcb, 0xf0, 0x11, 0x03, 0x8b, 0xf1, 0x21, 0x2b, - 0x28, 0x4b, 0x1b, 0x66, 0xb9, 0x81, 0x1c, 0x81, 0x38, 0xc5, 0x8c, 0x4c, 0x47, 0xb2, 0xbb, 0x9b, - 0xc9, 0xbe, 0xe6, 0x68, 0x95, 0xcd, 0x3c, 0x2b, 0x2c, 0xe4, 0x18, 0xba, 0xbc, 0x08, 0xcd, 0x69, - 0x94, 0x11, 0xd6, 0x91, 0xf0, 0xfe, 0x66, 0xc2, 0x67, 0x02, 0xaf, 0x52, 0x76, 0x5c, 0xd5, 0x46, - 0x26, 0x20, 0x0f, 0x38, 0xe3, 0x6c, 0x20, 0xe7, 0xbd, 0xcd, 0x9c, 0xc7, 0x08, 0x57, 0x29, 0xdb, - 0xb1, 0x62, 0xb2, 0xbe, 0x85, 0xed, 0x15, 0x51, 0xd4, 0x3c, 0x91, 0x17, 0x74, 0x0f, 0x1a, 0x3f, - 0x4d, 0xbd, 0x94, 0xe2, 0xa5, 0x35, 0xc7, 0xdb, 0xe8, 0xae, 0x58, 0x66, 0x8b, 0xd9, 0x07, 0xb5, - 0xcf, 0x35, 0x6b, 0x02, 0x3b, 0xab, 0xba, 0x54, 0x10, 0x7e, 0x5c, 0x26, 0xdc, 0x41, 0x42, 0x65, - 0x9d, 0xca, 0xf8, 0x12, 0xc8, 0xba, 0x30, 0x15, 0x9c, 0xfb, 0x65, 0x4e, 0x82, 0x9c, 0xa5, 0x95, - 0x2a, 0xab, 0x0d, 0xbd, 0x35, 0x69, 0x2a, 0x48, 0x6f, 0x97, 0x49, 0x7b, 0x48, 0xaa, 0x2e, 0x54, - 0x38, 0x07, 0x5f, 0x42, 0x8b, 0x8b, 0x82, 0x25, 0x50, 0xad, 0x69, 0xda, 0x4a, 0x4d, 0x63, 0xc5, - 0x36, 0xbb, 0xb5, 0x35, 0x9c, 0xca, 0x86, 0x83, 0x5f, 0x34, 0x80, 0x42, 0x57, 0xf2, 0x29, 0x34, - 0x78, 0xd9, 0x8c, 0x19, 0x03, 0x3f, 0x66, 0x6b, 0x45, 0xf7, 0x21, 0xf7, 0x14, 0x8b, 0x53, 0x15, - 0x40, 0xeb, 0x29, 0x40, 0x61, 0xac, 0x88, 0x67, 0xb7, 0x1c, 0x4f, 0x27, 0x67, 0xe4, 0xab, 0xd4, - 0x58, 0x52, 0x30, 0xf0, 0x3c, 0xde, 0x24, 0x98, 0xac, 0x8e, 0xd5, 0xb0, 0x16, 0x66, 0x43, 0x9c, - 0x91, 0x05, 0x4c, 0x97, 0x33, 0xb2, 0x7a, 0x29, 0x02, 0xd4, 0xc5, 0x4c, 0x26, 0xc0, 0xaf, 0x1a, - 0x98, 0x4a, 0x1e, 0x90, 0xcf, 0xca, 0x0a, 0x5c, 0x5f, 0x4d, 0x94, 0x0a, 0x09, 0xbe, 0xb9, 0x40, - 0x82, 0x8f, 0xca, 0x12, 0x74, 0x0b, 0xca, 0x55, 0x0d, 0x7e, 0x06, 0x53, 0xe6, 0xcf, 0xdb, 0xaa, - 0xa0, 0x6f, 0x54, 0x41, 0xdf, 0xa8, 0x82, 0x5e, 0xa8, 0xf0, 0x87, 0x06, 0x9d, 0x52, 0xe6, 0x92, - 0x83, 0xb2, 0x0e, 0x37, 0xd6, 0x93, 0xbb, 0x42, 0x89, 0xe7, 0x17, 0x28, 0x51, 0x79, 0x0b, 0x95, - 0x88, 0x55, 0x2d, 0x1e, 0x01, 0x88, 0xb4, 0x7f, 0xdb, 0xec, 0x36, 0x8a, 0xb0, 0x7e, 0xd3, 0xa0, - 0xad, 0xde, 0x1d, 0x32, 0x2e, 0x47, 0xf5, 0xc1, 0xda, 0xed, 0xaa, 0x08, 0xea, 0xd9, 0x05, 0x41, - 0x55, 0xd6, 0xaa, 0x62, 0xeb, 0x6a, 0x4c, 0x0f, 0xa1, 0xf7, 0x38, 0xf0, 0x3c, 0xea, 0x24, 0x47, - 0x94, 0x01, 0x1c, 0x6c, 0x01, 0xf7, 0xd9, 0x79, 0x89, 0x91, 0xdc, 0x55, 0x37, 0x6b, 0x78, 0x04, - 0xc8, 0xce, 0xa6, 0x07, 0xdf, 0xc1, 0x7b, 0xe5, 0xe5, 0xe2, 0xa5, 0x7a, 0x63, 0x82, 0xe2, 0x4d, - 0xab, 0xa9, 0x4f, 0xe0, 0x17, 0xd0, 0x63, 0x95, 0x5c, 0x60, 0x79, 0xc3, 0x84, 0xbb, 0x62, 0x5d, - 0x98, 0x68, 0xb2, 0x30, 0xd4, 0x73, 0xbb, 0x30, 0xb6, 0xad, 0xf2, 0xfa, 0xff, 0x65, 0x5b, 0xe3, - 0xbf, 0x6a, 0x60, 0xc8, 0x70, 0xd9, 0xc3, 0xfb, 0x04, 0xba, 0xe5, 0xd8, 0xc9, 0x35, 0x14, 0x7a, - 0x4d, 0x4f, 0xab, 0x5f, 0x61, 0xc7, 0x1d, 0x0d, 0xae, 0x70, 0x96, 0xf2, 0x56, 0x25, 0xcb, 0x5a, - 0xfc, 0x92, 0xa5, 0x22, 0x2e, 0xc6, 0x72, 0x1f, 0x9a, 0xa2, 0x8b, 0x21, 0xe2, 0x2e, 0xe7, 0x1d, - 0x8f, 0xb5, 0xa3, 0x8c, 0x33, 0xf4, 0x6d, 0xa8, 0xf3, 0x76, 0x86, 0x74, 0xb2, 0xf0, 0x0f, 0x17, - 0x61, 0xb2, 0xb4, 0xc4, 0xd2, 0xbc, 0xd1, 0x61, 0xc0, 0xbb, 0x50, 0xe7, 0xdd, 0x0a, 0x11, 0x24, - 0x4a, 0x7f, 0x23, 0xb1, 0x79, 0x2b, 0xc3, 0xb0, 0x0f, 0x61, 0x7b, 0xe5, 0xf5, 0x5d, 0xe5, 0x7f, - 0x7f, 0xe3, 0x13, 0x3d, 0xb8, 0x32, 0xfe, 0x47, 0x63, 0x3d, 0x96, 0xf8, 0x20, 0x60, 0xda, 0x8e, - 0x60, 0x4b, 0x0e, 0x88, 0xc8, 0xde, 0xe2, 0x03, 0xc5, 0xea, 0xa9, 0x86, 0xcb, 0x23, 0xc0, 0xdf, - 0x5c, 0x00, 0xf1, 0xbd, 0x42, 0x23, 0x72, 0x8f, 0x09, 0x20, 0x06, 0x99, 0x00, 0xf9, 0xa7, 0x8c, - 0x55, 0x66, 0xbd, 0x0c, 0xc1, 0xcf, 0x9a, 0xf8, 0x25, 0x7a, 0xf0, 0x6f, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x20, 0x7e, 0x29, 0xc5, 0x01, 0x0f, 0x00, 0x00, + // 986 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xdc, 0x97, 0xdf, 0x73, 0xdb, 0x44, + 0x10, 0xc7, 0xab, 0xc8, 0x76, 0xac, 0x95, 0xed, 0xc4, 0xd7, 0xd2, 0x31, 0x22, 0xa1, 0xad, 0x5e, + 0xa0, 0x69, 0x6a, 0xcf, 0xa4, 0x0c, 0xc3, 0x14, 0xda, 0x81, 0xa4, 0x29, 0x30, 0x9d, 0xce, 0x64, + 0x5c, 0x78, 0xee, 0xd8, 0xca, 0xc5, 0xd5, 0x20, 0x4b, 0x42, 0x92, 0xa1, 0x66, 0x86, 0x3f, 0x91, + 0x3f, 0x80, 0x7f, 0x85, 0x07, 0x60, 0x6f, 0xef, 0xf4, 0xe3, 0x6c, 0x09, 0x32, 0x0c, 0x4f, 0x7d, + 0x72, 0x6e, 0xb5, 0xfb, 0xd1, 0x7e, 0x77, 0xef, 0x6e, 0x15, 0x78, 0xbc, 0xf0, 0xb3, 0x37, 0xab, + 0xf9, 0xd8, 0x8b, 0x96, 0x13, 0x3f, 0xcc, 0x78, 0x90, 0x5e, 0xfa, 0x0f, 0xdf, 0x4e, 0xd2, 0x70, + 0x16, 0x4f, 0xbc, 0x28, 0xcc, 0x92, 0x28, 0x98, 0xc4, 0xc1, 0x6a, 0xe1, 0x87, 0x93, 0x24, 0xf6, + 0xd4, 0x9f, 0xe3, 0x38, 0x89, 0xb2, 0x88, 0x99, 0x68, 0x71, 0x1e, 0xfd, 0x03, 0x60, 0x21, 0x42, + 0xf0, 0xc1, 0x32, 0x0a, 0xd5, 0x8f, 0x8c, 0x74, 0xbf, 0x07, 0xb8, 0x48, 0x22, 0x8f, 0xa7, 0xe9, + 0x57, 0xc9, 0x82, 0xdd, 0x04, 0xfb, 0x0c, 0x5f, 0xc5, 0xc3, 0xec, 0xbb, 0x75, 0xcc, 0x47, 0xc6, + 0x5d, 0xe3, 0x63, 0x8b, 0xed, 0xc1, 0xae, 0x32, 0x8e, 0x76, 0xd0, 0xd0, 0x63, 0xf7, 0xa0, 0x83, + 0x86, 0x2b, 0x7f, 0x31, 0x32, 0x71, 0x6d, 0x9f, 0x0c, 0xc7, 0x0a, 0x29, 0xad, 0x2f, 0x67, 0xb1, + 0x7b, 0x06, 0x3d, 0x85, 0x9d, 0xf2, 0x38, 0x58, 0x5f, 0x13, 0xdc, 0x87, 0xf6, 0x79, 0x92, 0x44, + 0x09, 0x71, 0x2d, 0xca, 0x6d, 0x35, 0x0f, 0xfc, 0xf4, 0xcd, 0xff, 0x9a, 0xdb, 0x5f, 0x06, 0xb4, + 0xa6, 0xab, 0x80, 0xb3, 0x21, 0x58, 0x09, 0xfe, 0xbe, 0xce, 0x4a, 0x9e, 0x0d, 0xe6, 0x0f, 0x7c, + 0x4d, 0x2c, 0x8b, 0xed, 0x43, 0x37, 0xe1, 0x3f, 0xae, 0xfc, 0x84, 0x5f, 0x12, 0xad, 0x2b, 0x72, + 0xe0, 0x3c, 0xf5, 0x12, 0x3f, 0xce, 0xfc, 0x28, 0x1c, 0xb5, 0xc8, 0xed, 0x16, 0xf4, 0xe6, 0x51, + 0x14, 0xbc, 0xbe, 0xe4, 0x57, 0xb3, 0x55, 0x90, 0x8d, 0xda, 0xe4, 0xfa, 0x1e, 0xf4, 0xaf, 0x82, + 0x68, 0x96, 0x15, 0xe6, 0x0e, 0x9a, 0x8d, 0xd2, 0xbc, 0xf4, 0x43, 0x7f, 0xb9, 0x5a, 0x8e, 0x76, + 0x37, 0xcc, 0xb3, 0xb7, 0x64, 0xee, 0x92, 0x19, 0xdf, 0x87, 0x9d, 0x2c, 0x10, 0x16, 0x1a, 0xcd, + 0xdc, 0x98, 0x03, 0x40, 0x33, 0xaa, 0x70, 0x9b, 0x8c, 0xb7, 0x61, 0x90, 0x66, 0x89, 0x1f, 0x2e, + 0x0a, 0x42, 0x8f, 0x0a, 0x3b, 0x02, 0xeb, 0x15, 0xcf, 0x5e, 0xf0, 0xb5, 0xa8, 0xab, 0x92, 0x2c, + 0xf4, 0xf7, 0xdc, 0x03, 0xb0, 0xe5, 0x13, 0xd9, 0x36, 0x6c, 0x08, 0xa7, 0x86, 0x50, 0x75, 0x5c, + 0x07, 0xac, 0x0b, 0xa4, 0xd5, 0x3e, 0x3b, 0x04, 0xfb, 0x85, 0x1f, 0x04, 0x53, 0x2c, 0x18, 0x4f, + 0x33, 0x36, 0x80, 0xce, 0x94, 0xcf, 0x52, 0x2c, 0x52, 0x11, 0x2a, 0x1f, 0xd7, 0x84, 0xfe, 0xd6, + 0x82, 0x5b, 0x5f, 0xf3, 0x4c, 0x76, 0xe8, 0x22, 0x0a, 0x7c, 0xaf, 0xf6, 0xf5, 0xec, 0x29, 0xd8, + 0x54, 0xe8, 0x98, 0x5c, 0xb0, 0x49, 0x26, 0x36, 0xf8, 0xfe, 0x18, 0xb7, 0xf6, 0xb8, 0x2e, 0x7c, + 0x7c, 0x8a, 0xce, 0x72, 0x7d, 0x8e, 0xc7, 0x67, 0xcd, 0xbe, 0x84, 0x9e, 0x2c, 0xb2, 0x02, 0x98, + 0x04, 0x38, 0x6a, 0x06, 0x3c, 0x17, 0xde, 0x55, 0xc2, 0x33, 0x18, 0x88, 0x93, 0xb5, 0xe0, 0x49, + 0xce, 0x68, 0x11, 0xe3, 0xb8, 0x99, 0xf1, 0xad, 0xf4, 0xaf, 0x52, 0x4e, 0xa1, 0xaf, 0xda, 0xa2, + 0x20, 0x6d, 0x82, 0x3c, 0x68, 0x86, 0xbc, 0x22, 0xf7, 0x0a, 0xc3, 0x39, 0x85, 0xbd, 0x4d, 0x79, + 0x95, 0x46, 0x5a, 0xec, 0x43, 0x68, 0xff, 0x34, 0x0b, 0x56, 0x9c, 0xb6, 0xb2, 0x7d, 0xb2, 0x47, + 0xec, 0x32, 0xe2, 0xf1, 0xce, 0x67, 0x86, 0xf3, 0x0c, 0xf6, 0xb7, 0x14, 0x6a, 0x90, 0x3b, 0x3a, + 0x64, 0x9f, 0x20, 0x95, 0x10, 0xa2, 0x7c, 0x03, 0xac, 0x46, 0xa3, 0xc6, 0xb9, 0xa7, 0x73, 0x18, + 0x71, 0xb4, 0x20, 0x22, 0x3d, 0x87, 0xe1, 0x96, 0x50, 0x1d, 0x74, 0x57, 0x07, 0x0d, 0x09, 0x54, + 0x8d, 0x11, 0x1c, 0xf7, 0x21, 0x74, 0x85, 0x52, 0x3a, 0xe3, 0xd5, 0x33, 0x6c, 0xd0, 0xc1, 0xc4, + 0x2b, 0x23, 0x3f, 0x0d, 0x82, 0xd2, 0x75, 0x33, 0x80, 0xb2, 0x30, 0xec, 0x3e, 0xb4, 0xc5, 0xa5, + 0x90, 0xa2, 0xb7, 0x68, 0x8a, 0xb3, 0x51, 0xb8, 0xb1, 0xa0, 0xa6, 0xb2, 0x07, 0x9f, 0x03, 0x94, + 0x2b, 0x3d, 0xd1, 0x03, 0x3d, 0xd1, 0x7e, 0x41, 0x11, 0x01, 0x94, 0xe4, 0x05, 0x58, 0x54, 0xc9, + 0xe6, 0x2c, 0xf3, 0x03, 0xbe, 0x43, 0x57, 0x81, 0x30, 0xa8, 0xc3, 0x6d, 0xe6, 0x86, 0x5c, 0x87, + 0xb8, 0x87, 0x0c, 0xf7, 0x67, 0xb0, 0x2b, 0xbd, 0x61, 0x47, 0xba, 0x90, 0x0f, 0x36, 0x9b, 0x57, + 0x55, 0xf2, 0x45, 0xb3, 0x92, 0x43, 0x5d, 0xc9, 0xa0, 0xc4, 0x14, 0x52, 0xa6, 0x60, 0xab, 0x66, + 0x5e, 0x4f, 0x8c, 0xb9, 0x29, 0xc6, 0xdc, 0x14, 0x63, 0xba, 0xbf, 0x42, 0x5f, 0xdb, 0x20, 0xec, + 0x58, 0x97, 0x73, 0xb8, 0xbd, 0x87, 0xaa, 0x82, 0x9e, 0x36, 0x0b, 0xaa, 0xdd, 0xd4, 0x95, 0xfc, + 0x49, 0xd2, 0x04, 0x40, 0x6e, 0xab, 0xeb, 0x6d, 0x22, 0xcb, 0xfd, 0x05, 0x7a, 0xd5, 0x7d, 0xc8, + 0x1e, 0xe8, 0xe9, 0x1e, 0x6c, 0xed, 0xd4, 0x6a, 0xb6, 0x4f, 0x9a, 0xb3, 0xad, 0x3d, 0xc7, 0x65, + 0x6a, 0x94, 0xec, 0x27, 0x30, 0x3c, 0x8b, 0x82, 0x80, 0x7b, 0xd9, 0x4b, 0x8e, 0x4f, 0x3c, 0x1a, + 0xe5, 0x77, 0xb0, 0xc4, 0x72, 0xa5, 0x52, 0x18, 0xe4, 0x93, 0x50, 0x3a, 0xb9, 0xe7, 0x70, 0x53, + 0x8f, 0x92, 0x77, 0xee, 0xbf, 0xc5, 0x95, 0x97, 0xb2, 0x14, 0xfe, 0x29, 0x0c, 0xf1, 0xca, 0x92, + 0xcf, 0xc4, 0x60, 0xa6, 0x97, 0xe3, 0x14, 0xf6, 0xe4, 0x14, 0x36, 0x9a, 0xa6, 0x30, 0xbe, 0x5e, + 0x8f, 0xfb, 0x4f, 0xaf, 0x3f, 0xf9, 0x7d, 0x07, 0x2c, 0x25, 0x23, 0x4a, 0xc4, 0xfd, 0xac, 0x6b, + 0x62, 0xb7, 0xa9, 0x60, 0x5b, 0xe5, 0x71, 0x46, 0x35, 0x76, 0xca, 0xc0, 0xbd, 0x21, 0x28, 0x7a, + 0x6a, 0x8a, 0xb2, 0xa5, 0x53, 0x51, 0x6a, 0x74, 0x20, 0xe5, 0x18, 0x3a, 0x72, 0x94, 0x32, 0x79, + 0x66, 0x8a, 0x89, 0xeb, 0xec, 0x57, 0xd6, 0xb9, 0xf7, 0x47, 0xd0, 0x12, 0xa3, 0x95, 0xf5, 0x73, + 0xb9, 0xe7, 0xcb, 0x38, 0x5b, 0x3b, 0x32, 0xb4, 0x18, 0xba, 0xe8, 0x78, 0x04, 0x2d, 0x31, 0x48, + 0x99, 0x84, 0x54, 0x46, 0xae, 0xf2, 0x2d, 0xa6, 0x2c, 0xfa, 0x3e, 0x81, 0xbd, 0x8d, 0x71, 0xb2, + 0xc9, 0x7f, 0xbf, 0x71, 0xe6, 0xb8, 0x37, 0x4e, 0xfe, 0x34, 0x70, 0xde, 0xcb, 0xaf, 0x38, 0xac, + 0xed, 0x04, 0x76, 0xd5, 0x82, 0xc9, 0x5d, 0x58, 0x7e, 0x37, 0x3a, 0xc3, 0xaa, 0xe1, 0xdd, 0x29, + 0xc0, 0x1f, 0xa2, 0x00, 0xf2, 0x0b, 0x94, 0x27, 0x78, 0xa4, 0x77, 0xd5, 0x22, 0x2f, 0x40, 0xf1, + 0x71, 0xea, 0xe8, 0xd4, 0x77, 0x41, 0xfc, 0xbc, 0x43, 0xff, 0x20, 0x3c, 0xfa, 0x3b, 0x00, 0x00, + 0xff, 0xff, 0xd7, 0x48, 0xcc, 0xfe, 0x98, 0x0c, 0x00, 0x00, } diff --git a/grpc/common/common.pb.go b/grpc/common/common.pb.go index ffd3a7358..57e413bc5 100644 --- a/grpc/common/common.pb.go +++ b/grpc/common/common.pb.go @@ -74,8 +74,8 @@ func (*Empty) ProtoMessage() {} func (*Empty) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} } type SnapError struct { - ErrorString string `protobuf:"bytes,1,opt,name=error_string,json=errorString" json:"error_string,omitempty"` - ErrorFields map[string]string `protobuf:"bytes,2,rep,name=error_fields,json=errorFields" json:"error_fields,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + ErrorString string `protobuf:"bytes,1,opt,name=error_string" json:"error_string,omitempty"` + ErrorFields map[string]string `protobuf:"bytes,2,rep,name=error_fields" json:"error_fields,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` } func (m *SnapError) Reset() { *m = SnapError{} } @@ -102,14 +102,14 @@ func (*Label) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} } // core.Metric type Metric struct { - Namespace []*NamespaceElement `protobuf:"bytes,1,rep,name=Namespace,json=namespace" json:"Namespace,omitempty"` - Version int64 `protobuf:"varint,2,opt,name=Version,json=version" json:"Version,omitempty"` - Config *ConfigMap `protobuf:"bytes,3,opt,name=Config,json=config" json:"Config,omitempty"` - LastAdvertisedTime *Time `protobuf:"bytes,4,opt,name=LastAdvertisedTime,json=lastAdvertisedTime" json:"LastAdvertisedTime,omitempty"` - Tags map[string]string `protobuf:"bytes,5,rep,name=Tags,json=tags" json:"Tags,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` - Timestamp *Time `protobuf:"bytes,6,opt,name=Timestamp,json=timestamp" json:"Timestamp,omitempty"` - Unit string `protobuf:"bytes,7,opt,name=Unit,json=unit" json:"Unit,omitempty"` - Description string `protobuf:"bytes,8,opt,name=Description,json=description" json:"Description,omitempty"` + Namespace []*NamespaceElement `protobuf:"bytes,1,rep,name=Namespace" json:"Namespace,omitempty"` + Version int64 `protobuf:"varint,2,opt,name=Version" json:"Version,omitempty"` + Config *ConfigMap `protobuf:"bytes,3,opt,name=Config" json:"Config,omitempty"` + LastAdvertisedTime *Time `protobuf:"bytes,4,opt,name=LastAdvertisedTime" json:"LastAdvertisedTime,omitempty"` + Tags map[string]string `protobuf:"bytes,5,rep,name=Tags" json:"Tags,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + Timestamp *Time `protobuf:"bytes,6,opt,name=Timestamp" json:"Timestamp,omitempty"` + Unit string `protobuf:"bytes,7,opt,name=Unit" json:"Unit,omitempty"` + Description string `protobuf:"bytes,8,opt,name=Description" json:"Description,omitempty"` // Types that are valid to be assigned to Data: // *Metric_StringData // *Metric_Float32Data @@ -130,22 +130,22 @@ type isMetric_Data interface { } type Metric_StringData struct { - StringData string `protobuf:"bytes,9,opt,name=string_data,json=stringData,oneof"` + StringData string `protobuf:"bytes,9,opt,name=string_data,oneof"` } type Metric_Float32Data struct { - Float32Data float32 `protobuf:"fixed32,10,opt,name=float32_data,json=float32Data,oneof"` + Float32Data float32 `protobuf:"fixed32,10,opt,name=float32_data,oneof"` } type Metric_Float64Data struct { - Float64Data float64 `protobuf:"fixed64,11,opt,name=float64_data,json=float64Data,oneof"` + Float64Data float64 `protobuf:"fixed64,11,opt,name=float64_data,oneof"` } type Metric_Int32Data struct { - Int32Data int32 `protobuf:"varint,12,opt,name=int32_data,json=int32Data,oneof"` + Int32Data int32 `protobuf:"varint,12,opt,name=int32_data,oneof"` } type Metric_Int64Data struct { - Int64Data int64 `protobuf:"varint,13,opt,name=int64_data,json=int64Data,oneof"` + Int64Data int64 `protobuf:"varint,13,opt,name=int64_data,oneof"` } type Metric_BytesData struct { - BytesData []byte `protobuf:"bytes,14,opt,name=bytes_data,json=bytesData,proto3,oneof"` + BytesData []byte `protobuf:"bytes,14,opt,name=bytes_data,proto3,oneof"` } func (*Metric_StringData) isMetric_Data() {} @@ -362,9 +362,9 @@ func _Metric_OneofSizer(msg proto.Message) (n int) { } type NamespaceElement struct { - Value string `protobuf:"bytes,1,opt,name=Value,json=value" json:"Value,omitempty"` - Description string `protobuf:"bytes,2,opt,name=Description,json=description" json:"Description,omitempty"` - Name string `protobuf:"bytes,3,opt,name=Name,json=name" json:"Name,omitempty"` + Value string `protobuf:"bytes,1,opt,name=Value" json:"Value,omitempty"` + Description string `protobuf:"bytes,2,opt,name=Description" json:"Description,omitempty"` + Name string `protobuf:"bytes,3,opt,name=Name" json:"Name,omitempty"` } func (m *NamespaceElement) Reset() { *m = NamespaceElement{} } @@ -374,10 +374,10 @@ func (*NamespaceElement) Descriptor() ([]byte, []int) { return fileDescriptor0, // core.SubscribedPlugin type SubscribedPlugin struct { - TypeName string `protobuf:"bytes,1,opt,name=TypeName,json=typeName" json:"TypeName,omitempty"` - Name string `protobuf:"bytes,2,opt,name=Name,json=name" json:"Name,omitempty"` - Version int64 `protobuf:"varint,3,opt,name=Version,json=version" json:"Version,omitempty"` - Config *ConfigMap `protobuf:"bytes,4,opt,name=Config,json=config" json:"Config,omitempty"` + TypeName string `protobuf:"bytes,1,opt,name=TypeName" json:"TypeName,omitempty"` + Name string `protobuf:"bytes,2,opt,name=Name" json:"Name,omitempty"` + Version int64 `protobuf:"varint,3,opt,name=Version" json:"Version,omitempty"` + Config *ConfigMap `protobuf:"bytes,4,opt,name=Config" json:"Config,omitempty"` } func (m *SubscribedPlugin) Reset() { *m = SubscribedPlugin{} } @@ -393,11 +393,11 @@ func (m *SubscribedPlugin) GetConfig() *ConfigMap { } type ConfigMap struct { - IntMap map[string]int64 `protobuf:"bytes,1,rep,name=IntMap,json=intMap" json:"IntMap,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"` - StringMap map[string]string `protobuf:"bytes,2,rep,name=StringMap,json=stringMap" json:"StringMap,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + IntMap map[string]int64 `protobuf:"bytes,1,rep,name=IntMap" json:"IntMap,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"` + StringMap map[string]string `protobuf:"bytes,2,rep,name=StringMap" json:"StringMap,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` // double is float64 - FloatMap map[string]float64 `protobuf:"bytes,3,rep,name=FloatMap,json=floatMap" json:"FloatMap,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"` - BoolMap map[string]bool `protobuf:"bytes,4,rep,name=BoolMap,json=boolMap" json:"BoolMap,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"` + FloatMap map[string]float64 `protobuf:"bytes,3,rep,name=FloatMap" json:"FloatMap,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"` + BoolMap map[string]bool `protobuf:"bytes,4,rep,name=BoolMap" json:"BoolMap,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"` } func (m *ConfigMap) Reset() { *m = ConfigMap{} } @@ -435,9 +435,9 @@ func (m *ConfigMap) GetBoolMap() map[string]bool { // core.Plugin type Plugin struct { - TypeName string `protobuf:"bytes,1,opt,name=TypeName,json=typeName" json:"TypeName,omitempty"` - Name string `protobuf:"bytes,2,opt,name=Name,json=name" json:"Name,omitempty"` - Version int64 `protobuf:"varint,3,opt,name=Version,json=version" json:"Version,omitempty"` + TypeName string `protobuf:"bytes,1,opt,name=TypeName" json:"TypeName,omitempty"` + Name string `protobuf:"bytes,2,opt,name=Name" json:"Name,omitempty"` + Version int64 `protobuf:"varint,3,opt,name=Version" json:"Version,omitempty"` } func (m *Plugin) Reset() { *m = Plugin{} } @@ -462,52 +462,45 @@ func init() { } var fileDescriptor0 = []byte{ - // 738 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x55, 0xdd, 0x6e, 0xd3, 0x4c, - 0x10, 0xfd, 0x1c, 0x3b, 0x4e, 0x3c, 0x4e, 0xab, 0x7c, 0x2b, 0x2e, 0xac, 0x48, 0xd0, 0x62, 0x6e, - 0x0a, 0x82, 0x44, 0xb4, 0xa5, 0x94, 0xb6, 0xaa, 0x44, 0x69, 0x2a, 0x90, 0x5a, 0x84, 0xdc, 0xd2, - 0x4b, 0x2a, 0x27, 0xde, 0x84, 0x15, 0xf6, 0xda, 0xf2, 0x6e, 0xaa, 0xe6, 0x09, 0x78, 0x22, 0xde, - 0x88, 0x3b, 0x5e, 0x82, 0xfd, 0xb1, 0x53, 0xa7, 0x01, 0x45, 0x95, 0xb8, 0x69, 0x67, 0xce, 0x9e, - 0x33, 0xbb, 0x33, 0x7b, 0xbc, 0x81, 0xad, 0x31, 0xe1, 0x5f, 0x27, 0x83, 0xee, 0x30, 0x4d, 0x7a, - 0x84, 0x72, 0x1c, 0xb3, 0x88, 0xbc, 0xb8, 0xe9, 0x31, 0x1a, 0x66, 0xbd, 0x71, 0x9e, 0x0d, 0x7b, - 0x62, 0x21, 0x49, 0x69, 0xf1, 0xaf, 0x9b, 0xe5, 0x29, 0x4f, 0x91, 0xad, 0x33, 0xff, 0x39, 0x58, - 0x17, 0x24, 0xc1, 0xa8, 0x0d, 0x26, 0xc3, 0x43, 0xcf, 0x58, 0x37, 0x36, 0xcc, 0x40, 0x86, 0x08, - 0x81, 0x45, 0x25, 0x54, 0x53, 0x90, 0x8a, 0xfd, 0x06, 0xd4, 0xfb, 0x49, 0xc6, 0xa7, 0xfe, 0x0f, - 0x03, 0x9c, 0x73, 0xb1, 0x41, 0x3f, 0xcf, 0xd3, 0x1c, 0x3d, 0x86, 0x16, 0x96, 0xc1, 0x15, 0xe3, - 0x39, 0xa1, 0x63, 0x55, 0xc5, 0x09, 0x5c, 0x85, 0x9d, 0x2b, 0x08, 0xf5, 0x4b, 0xca, 0x88, 0xe0, - 0x38, 0x62, 0xa2, 0xaa, 0xb9, 0xe1, 0x6e, 0xfa, 0xdd, 0xe2, 0x50, 0xb3, 0x5a, 0x5d, 0xf5, 0xf7, - 0x44, 0x91, 0xfa, 0x94, 0xe7, 0xd3, 0xa2, 0x8c, 0x46, 0x3a, 0x87, 0xd0, 0xbe, 0x4b, 0x90, 0x47, - 0xff, 0x86, 0xa7, 0xc5, 0xa6, 0x32, 0x44, 0x0f, 0xa0, 0x7e, 0x1d, 0xc6, 0x13, 0xac, 0xce, 0xee, - 0x04, 0x3a, 0xd9, 0xab, 0xed, 0x1a, 0xfe, 0x4b, 0xa8, 0x9f, 0x86, 0x03, 0x1c, 0x4b, 0x0a, 0xa1, - 0x11, 0xbe, 0x51, 0x32, 0x2b, 0xd0, 0x89, 0xea, 0x39, 0x4c, 0x4a, 0x9d, 0x8a, 0xfd, 0x9f, 0x16, - 0xd8, 0x67, 0x58, 0x74, 0x31, 0x44, 0x3b, 0xe0, 0x7c, 0x14, 0x10, 0xcb, 0xc2, 0x21, 0x16, 0x42, - 0xd9, 0x81, 0x57, 0x76, 0x30, 0x5b, 0xe8, 0xc7, 0x38, 0xc1, 0x94, 0x07, 0x0e, 0x2d, 0x11, 0xe4, - 0x41, 0xe3, 0x12, 0xe7, 0x8c, 0xa4, 0xb4, 0x98, 0x66, 0xe3, 0x5a, 0xa7, 0xe8, 0x29, 0xd8, 0xef, - 0x52, 0x3a, 0x22, 0x63, 0xcf, 0x14, 0x0b, 0xee, 0xe6, 0xff, 0x65, 0x39, 0x8d, 0x9e, 0x85, 0x59, - 0x20, 0x6e, 0x4a, 0x86, 0xe8, 0x00, 0xd0, 0x69, 0xc8, 0xf8, 0xdb, 0x48, 0x68, 0x39, 0x61, 0x38, - 0x92, 0xf7, 0xe6, 0x59, 0x4a, 0xd6, 0x2a, 0x65, 0x12, 0x0b, 0x50, 0xbc, 0xc0, 0x43, 0xf2, 0x9e, - 0xc3, 0x31, 0xf3, 0xea, 0xf3, 0xa7, 0xd6, 0x8d, 0x75, 0xe5, 0x92, 0x9e, 0xb6, 0xc5, 0x45, 0x88, - 0x9e, 0x81, 0x23, 0x55, 0x8c, 0x87, 0x49, 0xe6, 0xd9, 0x7f, 0xd8, 0xc2, 0xe1, 0xe5, 0xb2, 0x9c, - 0xd9, 0x67, 0x4a, 0xb8, 0xd7, 0xd0, 0x33, 0x9b, 0x88, 0x18, 0xad, 0x83, 0x7b, 0x8c, 0xd9, 0x30, - 0x27, 0x19, 0x97, 0x4d, 0x37, 0xb5, 0x1f, 0xa2, 0x5b, 0x48, 0x58, 0xc6, 0xd5, 0x66, 0xb9, 0x8a, - 0x42, 0x1e, 0x7a, 0x8e, 0x64, 0xbc, 0xff, 0x2f, 0x00, 0x0d, 0x1e, 0x0b, 0x0c, 0x3d, 0x81, 0xd6, - 0x28, 0x4e, 0x43, 0xbe, 0xb5, 0xa9, 0x39, 0x20, 0x38, 0x35, 0xc1, 0x71, 0x0b, 0x74, 0x8e, 0xb4, - 0xb3, 0xad, 0x49, 0xae, 0x20, 0x19, 0x33, 0xd2, 0xce, 0xb6, 0x22, 0xad, 0x01, 0x88, 0x0f, 0xa3, - 0xac, 0xd3, 0x12, 0x94, 0xba, 0xa0, 0x38, 0x0a, 0xab, 0x10, 0xca, 0x1a, 0x2b, 0xf2, 0x8e, 0x0a, - 0xc2, 0x6d, 0x85, 0xc1, 0x94, 0x63, 0xa6, 0x09, 0xab, 0x82, 0xd0, 0x92, 0x04, 0x85, 0x49, 0x42, - 0xe7, 0xb5, 0x98, 0x58, 0x39, 0xc4, 0xfb, 0x38, 0xf2, 0xc8, 0x06, 0x4b, 0xd6, 0xf4, 0xbf, 0x40, - 0xfb, 0xae, 0x85, 0xa4, 0xea, 0x52, 0xa9, 0x8c, 0x8a, 0xea, 0xee, 0x70, 0x6b, 0x8b, 0xc3, 0x15, - 0x57, 0x22, 0x6b, 0x29, 0x4f, 0x95, 0x36, 0xfe, 0x6e, 0x40, 0xfb, 0x7c, 0x32, 0x90, 0xa4, 0x01, - 0x8e, 0x3e, 0xc5, 0x93, 0x31, 0xa1, 0xa8, 0x03, 0xcd, 0x8b, 0x69, 0x86, 0x15, 0x59, 0xef, 0xd1, - 0xe4, 0x45, 0x3e, 0x2b, 0x52, 0xf9, 0x16, 0xaa, 0x46, 0x36, 0xff, 0x66, 0x64, 0x6b, 0x89, 0x91, - 0xfd, 0x5f, 0x26, 0x38, 0x33, 0x14, 0xbd, 0x02, 0xfb, 0x03, 0xe5, 0x22, 0x2a, 0x3e, 0xa8, 0x87, - 0x0b, 0xc2, 0xae, 0x5e, 0xd7, 0xfe, 0xb4, 0x89, 0x4a, 0xd0, 0xa1, 0x78, 0x7f, 0x94, 0x55, 0xa4, - 0x52, 0x3f, 0x26, 0xeb, 0x8b, 0xca, 0x19, 0x45, 0x8b, 0x1d, 0x56, 0xe6, 0x68, 0x1f, 0x9a, 0x27, - 0xd2, 0x21, 0x52, 0x6e, 0x2a, 0xf9, 0xda, 0xa2, 0xbc, 0x64, 0x68, 0x75, 0x73, 0x54, 0xa4, 0x68, - 0x17, 0x1a, 0x47, 0x69, 0x1a, 0x4b, 0xad, 0xa5, 0xb4, 0x8f, 0x16, 0xb5, 0x05, 0x41, 0x4b, 0x1b, - 0x03, 0x9d, 0x75, 0xde, 0x80, 0x5b, 0xe9, 0x66, 0x99, 0x51, 0xcc, 0x8a, 0x51, 0x3a, 0x07, 0xb0, - 0x3a, 0xdf, 0xce, 0x7d, 0x6c, 0xd6, 0xd9, 0x87, 0x95, 0xb9, 0x6e, 0x96, 0x89, 0x8d, 0xaa, 0x78, - 0x0f, 0x5a, 0xd5, 0x76, 0x96, 0x69, 0x9b, 0xd5, 0x17, 0x37, 0x00, 0xfb, 0x5f, 0x9b, 0x6d, 0x60, - 0xab, 0xdf, 0xb0, 0xad, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xfa, 0xc3, 0x4f, 0x62, 0xfa, 0x06, - 0x00, 0x00, + // 630 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x54, 0xef, 0x4f, 0xd3, 0x40, + 0x18, 0xa6, 0xb4, 0xeb, 0xd6, 0xb7, 0x05, 0xe7, 0x89, 0xa6, 0x59, 0xa2, 0x40, 0x63, 0x0c, 0x89, + 0xa1, 0xd3, 0xcd, 0x18, 0xf4, 0x9b, 0xc8, 0x08, 0x26, 0x60, 0x4c, 0x40, 0xbe, 0x92, 0xdb, 0x7a, + 0x9b, 0x17, 0xdb, 0x6b, 0xd3, 0xbb, 0x11, 0xf6, 0x57, 0xf8, 0xc9, 0x3f, 0xc7, 0xff, 0xcd, 0xfb, + 0xd1, 0x8e, 0xc1, 0x40, 0x12, 0xbf, 0x40, 0xef, 0x79, 0x9f, 0xe7, 0xdd, 0x73, 0xef, 0xf3, 0xb6, + 0xd0, 0x9f, 0x50, 0xf1, 0x63, 0x3a, 0x8c, 0x47, 0x79, 0xd6, 0xa5, 0x4c, 0x90, 0x94, 0x27, 0x74, + 0xf7, 0xaa, 0xcb, 0x19, 0x2e, 0xba, 0x93, 0xb2, 0x18, 0x75, 0x65, 0x21, 0xcb, 0x59, 0xf5, 0x2f, + 0x2e, 0xca, 0x5c, 0xe4, 0xc8, 0x35, 0xa7, 0x68, 0x1b, 0x9c, 0x33, 0x9a, 0x11, 0xe4, 0x83, 0xcd, + 0xc9, 0x28, 0xb4, 0xb6, 0xac, 0x1d, 0x1b, 0x05, 0xe0, 0x30, 0x75, 0x5a, 0x55, 0xa7, 0xa8, 0x09, + 0x8d, 0x41, 0x56, 0x88, 0x59, 0xf4, 0xcb, 0x02, 0xef, 0x54, 0x76, 0x1d, 0x94, 0x65, 0x5e, 0xa2, + 0x0d, 0x08, 0x88, 0x7a, 0xb8, 0xe0, 0xa2, 0xa4, 0x6c, 0xa2, 0xa5, 0x1e, 0xda, 0xab, 0xd1, 0x31, + 0x25, 0x69, 0xc2, 0x65, 0x0b, 0x7b, 0xc7, 0xef, 0x45, 0x71, 0xf5, 0xe3, 0x73, 0x79, 0xac, 0xff, + 0x1e, 0x6a, 0xd2, 0x80, 0x89, 0x72, 0xd6, 0xe9, 0x41, 0xfb, 0x36, 0xa6, 0x5c, 0xfd, 0x24, 0xb3, + 0xaa, 0xf5, 0x1a, 0x34, 0x2e, 0x71, 0x3a, 0x25, 0xda, 0x96, 0xf7, 0x71, 0x75, 0xcf, 0x8a, 0x5e, + 0x42, 0xe3, 0x18, 0x0f, 0x49, 0xaa, 0x6a, 0x94, 0x25, 0xe4, 0x4a, 0x53, 0x1d, 0x7d, 0x01, 0x9c, + 0x55, 0xcc, 0xe8, 0x8f, 0x0d, 0xee, 0x09, 0x91, 0x2e, 0x47, 0xe8, 0x35, 0x78, 0x5f, 0x65, 0x81, + 0x17, 0x78, 0x44, 0x24, 0x57, 0x79, 0x0b, 0x6b, 0x6f, 0xf3, 0xc2, 0x20, 0x25, 0x19, 0x61, 0x02, + 0x3d, 0x82, 0xe6, 0x39, 0x29, 0x39, 0xcd, 0x99, 0x99, 0x04, 0xda, 0x06, 0xf7, 0x73, 0xce, 0xc6, + 0x74, 0x12, 0xda, 0xf2, 0xec, 0xf7, 0x1e, 0xd7, 0x52, 0x83, 0x9e, 0xe0, 0x02, 0xed, 0x00, 0x3a, + 0xc6, 0x5c, 0x7c, 0x4a, 0x2e, 0x49, 0x29, 0x28, 0x27, 0x89, 0x9a, 0x6e, 0xe8, 0x68, 0x7a, 0x50, + 0xd3, 0xf5, 0xc4, 0x5f, 0xc9, 0xc9, 0xe3, 0x09, 0x0f, 0x1b, 0x37, 0x5d, 0x18, 0xa3, 0xb1, 0x2a, + 0x99, 0x19, 0x6c, 0x82, 0xa7, 0xf8, 0x5c, 0xe0, 0xac, 0x08, 0xdd, 0x3b, 0x1a, 0xc9, 0xcb, 0x7e, + 0x67, 0x54, 0x84, 0x4d, 0x3d, 0xa5, 0x27, 0xe0, 0x1f, 0x10, 0x3e, 0x2a, 0x69, 0x21, 0x94, 0xf1, + 0x96, 0x06, 0x9f, 0x82, 0x6f, 0x52, 0xba, 0x48, 0xb0, 0xc0, 0xa1, 0xa7, 0xc0, 0xa3, 0x15, 0xf4, + 0x0c, 0x82, 0x71, 0x9a, 0x63, 0xd1, 0xef, 0x19, 0x1c, 0x24, 0xbe, 0xba, 0x80, 0xbf, 0x7f, 0x67, + 0x70, 0x5f, 0xe2, 0x96, 0xc4, 0x37, 0x00, 0xe4, 0x82, 0xd5, 0xec, 0x40, 0xa2, 0x8d, 0x39, 0x5a, + 0x73, 0xd7, 0xd4, 0xa4, 0x0c, 0x3a, 0x9c, 0x09, 0xc2, 0x0d, 0xba, 0x2e, 0xd1, 0xe0, 0x68, 0xa5, + 0x23, 0xe7, 0x7f, 0x7d, 0xb3, 0x07, 0xd2, 0xdd, 0x77, 0xc1, 0x51, 0xe2, 0xe8, 0x00, 0xda, 0x4b, + 0xd9, 0x48, 0xfa, 0xb9, 0xa6, 0x5b, 0x77, 0xdd, 0x5a, 0xf7, 0x50, 0x83, 0x51, 0x3a, 0x1d, 0x96, + 0x17, 0x8d, 0xa1, 0x7d, 0x3a, 0x1d, 0x2a, 0xce, 0x90, 0x24, 0xdf, 0xd2, 0xe9, 0x84, 0x32, 0xd4, + 0x86, 0xd6, 0xd9, 0xac, 0x20, 0x9a, 0x65, 0xdd, 0xd0, 0x98, 0x0e, 0x0b, 0x1b, 0x60, 0xdf, 0xda, + 0x00, 0xe7, 0x9e, 0x0d, 0x88, 0x7e, 0xdb, 0xe0, 0x5d, 0xef, 0xc3, 0x2e, 0xb8, 0x5f, 0x98, 0x90, + 0x4f, 0xd5, 0xb6, 0x3d, 0x5f, 0x12, 0xc4, 0xa6, 0x6e, 0x46, 0xd2, 0x97, 0x6f, 0x98, 0x0e, 0x4a, + 0x29, 0xcc, 0xbb, 0xb3, 0xb5, 0xac, 0x98, 0x53, 0x8c, 0xe8, 0x2d, 0xb4, 0x0e, 0x55, 0x5c, 0x4a, + 0x63, 0x6b, 0xcd, 0xe6, 0xb2, 0xa6, 0x66, 0x18, 0x49, 0x17, 0x9a, 0xfb, 0x79, 0x9e, 0x2a, 0x85, + 0xa3, 0x15, 0x2f, 0x96, 0x15, 0x15, 0xc1, 0xbc, 0x9d, 0xbb, 0xe0, 0x2f, 0xfa, 0xbc, 0x3f, 0x3a, + 0x5b, 0x45, 0xd7, 0x79, 0x03, 0xeb, 0xb7, 0x4c, 0x3e, 0x10, 0x76, 0xa7, 0x0b, 0x6b, 0x37, 0x2d, + 0xde, 0x2f, 0xb0, 0xb4, 0x20, 0x86, 0x60, 0xd1, 0xe1, 0x3f, 0xf8, 0x2d, 0xfd, 0xad, 0xf8, 0x00, + 0xee, 0x7f, 0xa6, 0x3e, 0x74, 0xf5, 0x37, 0xb3, 0xff, 0x37, 0x00, 0x00, 0xff, 0xff, 0xa7, 0x86, + 0x01, 0x7e, 0x6a, 0x05, 0x00, 0x00, } diff --git a/grpc/controlproxy/controlproxy_test.go b/grpc/controlproxy/controlproxy_test.go index 74de12cdf..dab382839 100644 --- a/grpc/controlproxy/controlproxy_test.go +++ b/grpc/controlproxy/controlproxy_test.go @@ -43,7 +43,7 @@ type mockClient struct { ExpandReply *rpc.ExpandWildcardsReply PublishReply *rpc.ErrorReply ProcessReply *rpc.ProcessMetricsReply - CollectReply *rpc.CollectMetricsReply + CollectReply *rpc.CollectMetricsResponse ContentTypeReply *rpc.GetPluginContentTypesReply ValidateReply *rpc.ValidateDepsReply SubscribeReply *rpc.SubscribeDepsReply @@ -71,7 +71,7 @@ func (mc mockClient) ExpandWildcards(ctx context.Context, in *rpc.ExpandWildcard } return mc.ExpandReply, nil } -func (mc mockClient) CollectMetrics(ctx context.Context, in *rpc.CollectMetricsRequest, opts ...grpc.CallOption) (*rpc.CollectMetricsReply, error) { +func (mc mockClient) CollectMetrics(ctx context.Context, in *rpc.CollectMetricsRequest, opts ...grpc.CallOption) (*rpc.CollectMetricsResponse, error) { if mc.RpcErr { return nil, rpcErr } @@ -276,7 +276,7 @@ func TestCollectMetrics(t *testing.T) { }) Convey("Control.CollectMetrics returns an error", t, func() { - reply := &rpc.CollectMetricsReply{ + reply := &rpc.CollectMetricsResponse{ Metrics: nil, Errors: []string{"error in collect"}, } @@ -294,7 +294,7 @@ func TestCollectMetrics(t *testing.T) { }) Convey("Control.CollectMetrics returns sucessfully", t, func() { - reply := &rpc.CollectMetricsReply{ + reply := &rpc.CollectMetricsResponse{ Metrics: []*common.Metric{&common.Metric{ Namespace: common.ToNamespace(core.NewNamespace("testing", "this")), Version: 6, diff --git a/grpc/controlproxy/rpc/control.pb.go b/grpc/controlproxy/rpc/control.pb.go index ec62d54e2..c52c82ac4 100644 --- a/grpc/controlproxy/rpc/control.pb.go +++ b/grpc/controlproxy/rpc/control.pb.go @@ -41,7 +41,7 @@ It has these top-level messages: Map MapEntry CollectMetricsRequest - CollectMetricsReply + CollectMetricsResponse ExpandWildcardsRequest ArrString ExpandWildcardsReply @@ -79,12 +79,12 @@ func (*SerrorReply) ProtoMessage() {} func (*SerrorReply) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } type PubProcMetricsRequest struct { - ContentType string `protobuf:"bytes,1,opt,name=ContentType,json=contentType" json:"ContentType,omitempty"` - Content []byte `protobuf:"bytes,2,opt,name=Content,json=content,proto3" json:"Content,omitempty"` - PluginName string `protobuf:"bytes,3,opt,name=PluginName,json=pluginName" json:"PluginName,omitempty"` - PluginVersion int64 `protobuf:"varint,4,opt,name=PluginVersion,json=pluginVersion" json:"PluginVersion,omitempty"` - Config *common.ConfigMap `protobuf:"bytes,5,opt,name=Config,json=config" json:"Config,omitempty"` - TaskId string `protobuf:"bytes,6,opt,name=TaskId,json=taskId" json:"TaskId,omitempty"` + ContentType string `protobuf:"bytes,1,opt,name=ContentType" json:"ContentType,omitempty"` + Content []byte `protobuf:"bytes,2,opt,name=Content,proto3" json:"Content,omitempty"` + PluginName string `protobuf:"bytes,3,opt,name=PluginName" json:"PluginName,omitempty"` + PluginVersion int64 `protobuf:"varint,4,opt,name=PluginVersion" json:"PluginVersion,omitempty"` + Config *common.ConfigMap `protobuf:"bytes,5,opt,name=Config" json:"Config,omitempty"` + TaskId string `protobuf:"bytes,6,opt,name=TaskId" json:"TaskId,omitempty"` } func (m *PubProcMetricsRequest) Reset() { *m = PubProcMetricsRequest{} } @@ -100,7 +100,7 @@ func (m *PubProcMetricsRequest) GetConfig() *common.ConfigMap { } type ErrorReply struct { - Errors []string `protobuf:"bytes,1,rep,name=Errors,json=errors" json:"Errors,omitempty"` + Errors []string `protobuf:"bytes,1,rep,name=Errors" json:"Errors,omitempty"` } func (m *ErrorReply) Reset() { *m = ErrorReply{} } @@ -109,9 +109,9 @@ func (*ErrorReply) ProtoMessage() {} func (*ErrorReply) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} } type ProcessMetricsReply struct { - ContentType string `protobuf:"bytes,1,opt,name=ContentType,json=contentType" json:"ContentType,omitempty"` - Content []byte `protobuf:"bytes,2,opt,name=Content,json=content,proto3" json:"Content,omitempty"` - Errors []string `protobuf:"bytes,3,rep,name=Errors,json=errors" json:"Errors,omitempty"` + ContentType string `protobuf:"bytes,1,opt,name=ContentType" json:"ContentType,omitempty"` + Content []byte `protobuf:"bytes,2,opt,name=Content,proto3" json:"Content,omitempty"` + Errors []string `protobuf:"bytes,3,rep,name=Errors" json:"Errors,omitempty"` } func (m *ProcessMetricsReply) Reset() { *m = ProcessMetricsReply{} } @@ -120,9 +120,9 @@ func (*ProcessMetricsReply) ProtoMessage() {} func (*ProcessMetricsReply) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} } type GetPluginContentTypesRequest struct { - Name string `protobuf:"bytes,1,opt,name=Name,json=name" json:"Name,omitempty"` - PluginType int32 `protobuf:"varint,2,opt,name=PluginType,json=pluginType" json:"PluginType,omitempty"` - Version int32 `protobuf:"varint,3,opt,name=Version,json=version" json:"Version,omitempty"` + Name string `protobuf:"bytes,1,opt,name=Name" json:"Name,omitempty"` + PluginType int32 `protobuf:"varint,2,opt,name=PluginType" json:"PluginType,omitempty"` + Version int32 `protobuf:"varint,3,opt,name=Version" json:"Version,omitempty"` } func (m *GetPluginContentTypesRequest) Reset() { *m = GetPluginContentTypesRequest{} } @@ -131,9 +131,9 @@ func (*GetPluginContentTypesRequest) ProtoMessage() {} func (*GetPluginContentTypesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} } type GetPluginContentTypesReply struct { - AcceptedTypes []string `protobuf:"bytes,1,rep,name=AcceptedTypes,json=acceptedTypes" json:"AcceptedTypes,omitempty"` - ReturnedTypes []string `protobuf:"bytes,2,rep,name=ReturnedTypes,json=returnedTypes" json:"ReturnedTypes,omitempty"` - Error string `protobuf:"bytes,3,opt,name=Error,json=error" json:"Error,omitempty"` + AcceptedTypes []string `protobuf:"bytes,1,rep,name=AcceptedTypes" json:"AcceptedTypes,omitempty"` + ReturnedTypes []string `protobuf:"bytes,2,rep,name=ReturnedTypes" json:"ReturnedTypes,omitempty"` + Error string `protobuf:"bytes,3,opt,name=Error" json:"Error,omitempty"` } func (m *GetPluginContentTypesReply) Reset() { *m = GetPluginContentTypesReply{} } @@ -142,8 +142,8 @@ func (*GetPluginContentTypesReply) ProtoMessage() {} func (*GetPluginContentTypesReply) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} } type ValidateDepsRequest struct { - Metrics []*common.Metric `protobuf:"bytes,1,rep,name=Metrics,json=metrics" json:"Metrics,omitempty"` - Plugins []*common.SubscribedPlugin `protobuf:"bytes,2,rep,name=Plugins,json=plugins" json:"Plugins,omitempty"` + Metrics []*common.Metric `protobuf:"bytes,1,rep,name=Metrics" json:"Metrics,omitempty"` + Plugins []*common.SubscribedPlugin `protobuf:"bytes,2,rep,name=Plugins" json:"Plugins,omitempty"` } func (m *ValidateDepsRequest) Reset() { *m = ValidateDepsRequest{} } @@ -166,7 +166,7 @@ func (m *ValidateDepsRequest) GetPlugins() []*common.SubscribedPlugin { } type ValidateDepsReply struct { - Errors []*common.SnapError `protobuf:"bytes,1,rep,name=Errors,json=errors" json:"Errors,omitempty"` + Errors []*common.SnapError `protobuf:"bytes,1,rep,name=Errors" json:"Errors,omitempty"` } func (m *ValidateDepsReply) Reset() { *m = ValidateDepsReply{} } @@ -182,9 +182,9 @@ func (m *ValidateDepsReply) GetErrors() []*common.SnapError { } type SubscribeDepsRequest struct { - Metrics []*common.Metric `protobuf:"bytes,1,rep,name=Metrics,json=metrics" json:"Metrics,omitempty"` - Plugins []*common.Plugin `protobuf:"bytes,2,rep,name=Plugins,json=plugins" json:"Plugins,omitempty"` - TaskId string `protobuf:"bytes,3,opt,name=TaskId,json=taskId" json:"TaskId,omitempty"` + Metrics []*common.Metric `protobuf:"bytes,1,rep,name=Metrics" json:"Metrics,omitempty"` + Plugins []*common.Plugin `protobuf:"bytes,2,rep,name=Plugins" json:"Plugins,omitempty"` + TaskId string `protobuf:"bytes,3,opt,name=TaskId" json:"TaskId,omitempty"` } func (m *SubscribeDepsRequest) Reset() { *m = SubscribeDepsRequest{} } @@ -207,7 +207,7 @@ func (m *SubscribeDepsRequest) GetPlugins() []*common.Plugin { } type SubscribeDepsReply struct { - Errors []*common.SnapError `protobuf:"bytes,1,rep,name=Errors,json=errors" json:"Errors,omitempty"` + Errors []*common.SnapError `protobuf:"bytes,1,rep,name=Errors" json:"Errors,omitempty"` } func (m *SubscribeDepsReply) Reset() { *m = SubscribeDepsReply{} } @@ -223,7 +223,7 @@ func (m *SubscribeDepsReply) GetErrors() []*common.SnapError { } type Map struct { - Entries []*MapEntry `protobuf:"bytes,1,rep,name=Entries,json=entries" json:"Entries,omitempty"` + Entries []*MapEntry `protobuf:"bytes,1,rep,name=Entries" json:"Entries,omitempty"` } func (m *Map) Reset() { *m = Map{} } @@ -239,8 +239,8 @@ func (m *Map) GetEntries() []*MapEntry { } type MapEntry struct { - Key string `protobuf:"bytes,1,opt,name=Key,json=key" json:"Key,omitempty"` - Value string `protobuf:"bytes,2,opt,name=Value,json=value" json:"Value,omitempty"` + Key string `protobuf:"bytes,1,opt,name=Key" json:"Key,omitempty"` + Value string `protobuf:"bytes,2,opt,name=Value" json:"Value,omitempty"` } func (m *MapEntry) Reset() { *m = MapEntry{} } @@ -249,10 +249,10 @@ func (*MapEntry) ProtoMessage() {} func (*MapEntry) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} } type CollectMetricsRequest struct { - TaskID string `protobuf:"bytes,1,opt,name=TaskID,json=taskID" json:"TaskID,omitempty"` - Metrics []*common.Metric `protobuf:"bytes,2,rep,name=Metrics,json=metrics" json:"Metrics,omitempty"` - Deadline *common.Time `protobuf:"bytes,3,opt,name=Deadline,json=deadline" json:"Deadline,omitempty"` - AllTags map[string]*Map `protobuf:"bytes,4,rep,name=AllTags,json=allTags" json:"AllTags,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + TaskID string `protobuf:"bytes,1,opt,name=TaskID" json:"TaskID,omitempty"` + Metrics []*common.Metric `protobuf:"bytes,2,rep,name=Metrics" json:"Metrics,omitempty"` + Deadline *common.Time `protobuf:"bytes,3,opt,name=Deadline" json:"Deadline,omitempty"` + AllTags map[string]*Map `protobuf:"bytes,4,rep,name=AllTags" json:"AllTags,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` } func (m *CollectMetricsRequest) Reset() { *m = CollectMetricsRequest{} } @@ -281,17 +281,17 @@ func (m *CollectMetricsRequest) GetAllTags() map[string]*Map { return nil } -type CollectMetricsReply struct { - Metrics []*common.Metric `protobuf:"bytes,1,rep,name=Metrics,json=metrics" json:"Metrics,omitempty"` - Errors []string `protobuf:"bytes,2,rep,name=Errors,json=errors" json:"Errors,omitempty"` +type CollectMetricsResponse struct { + Metrics []*common.Metric `protobuf:"bytes,1,rep,name=Metrics" json:"Metrics,omitempty"` + Errors []string `protobuf:"bytes,2,rep,name=Errors" json:"Errors,omitempty"` } -func (m *CollectMetricsReply) Reset() { *m = CollectMetricsReply{} } -func (m *CollectMetricsReply) String() string { return proto.CompactTextString(m) } -func (*CollectMetricsReply) ProtoMessage() {} -func (*CollectMetricsReply) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} } +func (m *CollectMetricsResponse) Reset() { *m = CollectMetricsResponse{} } +func (m *CollectMetricsResponse) String() string { return proto.CompactTextString(m) } +func (*CollectMetricsResponse) ProtoMessage() {} +func (*CollectMetricsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} } -func (m *CollectMetricsReply) GetMetrics() []*common.Metric { +func (m *CollectMetricsResponse) GetMetrics() []*common.Metric { if m != nil { return m.Metrics } @@ -299,7 +299,7 @@ func (m *CollectMetricsReply) GetMetrics() []*common.Metric { } type ExpandWildcardsRequest struct { - Namespace []*common.NamespaceElement `protobuf:"bytes,1,rep,name=Namespace,json=namespace" json:"Namespace,omitempty"` + Namespace []*common.NamespaceElement `protobuf:"bytes,1,rep,name=Namespace" json:"Namespace,omitempty"` } func (m *ExpandWildcardsRequest) Reset() { *m = ExpandWildcardsRequest{} } @@ -315,7 +315,7 @@ func (m *ExpandWildcardsRequest) GetNamespace() []*common.NamespaceElement { } type ArrString struct { - S []*common.NamespaceElement `protobuf:"bytes,1,rep,name=S,json=s" json:"S,omitempty"` + S []*common.NamespaceElement `protobuf:"bytes,1,rep,name=S" json:"S,omitempty"` } func (m *ArrString) Reset() { *m = ArrString{} } @@ -331,8 +331,8 @@ func (m *ArrString) GetS() []*common.NamespaceElement { } type ExpandWildcardsReply struct { - NSS []*ArrString `protobuf:"bytes,1,rep,name=NSS,json=nSS" json:"NSS,omitempty"` - Error *common.SnapError `protobuf:"bytes,2,opt,name=Error,json=error" json:"Error,omitempty"` + NSS []*ArrString `protobuf:"bytes,1,rep,name=NSS" json:"NSS,omitempty"` + Error *common.SnapError `protobuf:"bytes,2,opt,name=Error" json:"Error,omitempty"` } func (m *ExpandWildcardsReply) Reset() { *m = ExpandWildcardsReply{} } @@ -355,7 +355,7 @@ func (m *ExpandWildcardsReply) GetError() *common.SnapError { } type GetAutodiscoverPathsReply struct { - Paths []string `protobuf:"bytes,1,rep,name=Paths,json=paths" json:"Paths,omitempty"` + Paths []string `protobuf:"bytes,1,rep,name=Paths" json:"Paths,omitempty"` } func (m *GetAutodiscoverPathsReply) Reset() { *m = GetAutodiscoverPathsReply{} } @@ -377,7 +377,7 @@ func init() { proto.RegisterType((*Map)(nil), "rpc.Map") proto.RegisterType((*MapEntry)(nil), "rpc.MapEntry") proto.RegisterType((*CollectMetricsRequest)(nil), "rpc.CollectMetricsRequest") - proto.RegisterType((*CollectMetricsReply)(nil), "rpc.CollectMetricsReply") + proto.RegisterType((*CollectMetricsResponse)(nil), "rpc.CollectMetricsResponse") proto.RegisterType((*ExpandWildcardsRequest)(nil), "rpc.ExpandWildcardsRequest") proto.RegisterType((*ArrString)(nil), "rpc.ArrString") proto.RegisterType((*ExpandWildcardsReply)(nil), "rpc.ExpandWildcardsReply") @@ -398,7 +398,7 @@ type MetricManagerClient interface { // managesMetrics from scheduler GetPluginContentTypes(ctx context.Context, in *GetPluginContentTypesRequest, opts ...grpc.CallOption) (*GetPluginContentTypesReply, error) ExpandWildcards(ctx context.Context, in *ExpandWildcardsRequest, opts ...grpc.CallOption) (*ExpandWildcardsReply, error) - CollectMetrics(ctx context.Context, in *CollectMetricsRequest, opts ...grpc.CallOption) (*CollectMetricsReply, error) + CollectMetrics(ctx context.Context, in *CollectMetricsRequest, opts ...grpc.CallOption) (*CollectMetricsResponse, error) PublishMetrics(ctx context.Context, in *PubProcMetricsRequest, opts ...grpc.CallOption) (*ErrorReply, error) ProcessMetrics(ctx context.Context, in *PubProcMetricsRequest, opts ...grpc.CallOption) (*ProcessMetricsReply, error) ValidateDeps(ctx context.Context, in *ValidateDepsRequest, opts ...grpc.CallOption) (*ValidateDepsReply, error) @@ -434,8 +434,8 @@ func (c *metricManagerClient) ExpandWildcards(ctx context.Context, in *ExpandWil return out, nil } -func (c *metricManagerClient) CollectMetrics(ctx context.Context, in *CollectMetricsRequest, opts ...grpc.CallOption) (*CollectMetricsReply, error) { - out := new(CollectMetricsReply) +func (c *metricManagerClient) CollectMetrics(ctx context.Context, in *CollectMetricsRequest, opts ...grpc.CallOption) (*CollectMetricsResponse, error) { + out := new(CollectMetricsResponse) err := grpc.Invoke(ctx, "/rpc.MetricManager/CollectMetrics", in, out, c.cc, opts...) if err != nil { return nil, err @@ -512,7 +512,7 @@ type MetricManagerServer interface { // managesMetrics from scheduler GetPluginContentTypes(context.Context, *GetPluginContentTypesRequest) (*GetPluginContentTypesReply, error) ExpandWildcards(context.Context, *ExpandWildcardsRequest) (*ExpandWildcardsReply, error) - CollectMetrics(context.Context, *CollectMetricsRequest) (*CollectMetricsReply, error) + CollectMetrics(context.Context, *CollectMetricsRequest) (*CollectMetricsResponse, error) PublishMetrics(context.Context, *PubProcMetricsRequest) (*ErrorReply, error) ProcessMetrics(context.Context, *PubProcMetricsRequest) (*ProcessMetricsReply, error) ValidateDeps(context.Context, *ValidateDepsRequest) (*ValidateDepsReply, error) @@ -759,63 +759,60 @@ func init() { } var fileDescriptor0 = []byte{ - // 923 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x56, 0x5f, 0x73, 0xdb, 0x44, - 0x10, 0xc7, 0x56, 0x6c, 0x25, 0xeb, 0x38, 0xa1, 0x97, 0x3f, 0x08, 0xc1, 0x94, 0xa2, 0xe9, 0xd0, - 0xf4, 0x01, 0x7b, 0x46, 0x99, 0x61, 0x18, 0x1e, 0xda, 0x09, 0xb5, 0xa7, 0x30, 0x9d, 0x74, 0x8c, - 0x64, 0xda, 0x27, 0x1e, 0xce, 0xd2, 0xe1, 0x68, 0x22, 0x9f, 0xc4, 0x9d, 0xd4, 0x89, 0x5f, 0x78, - 0xe0, 0x99, 0x0f, 0xc4, 0x87, 0xe1, 0xc3, 0x70, 0x7f, 0x24, 0x59, 0x32, 0x6a, 0x02, 0x84, 0xa7, - 0xe4, 0x76, 0xf7, 0x76, 0xf7, 0xf7, 0xdb, 0xd5, 0xef, 0x0c, 0xcf, 0x96, 0x51, 0x76, 0x95, 0x2f, - 0x46, 0x41, 0xb2, 0x1a, 0x47, 0x34, 0x23, 0x31, 0x0f, 0xa3, 0x2f, 0x6f, 0xc6, 0x9c, 0xe2, 0x74, - 0xbc, 0x64, 0x69, 0x30, 0x0e, 0x12, 0x9a, 0xb1, 0x24, 0x4e, 0x59, 0x72, 0xb3, 0x1e, 0xd7, 0x0c, - 0x23, 0x61, 0xc9, 0x12, 0x64, 0x08, 0x93, 0x7d, 0x7e, 0x77, 0x92, 0xd5, 0x2a, 0xa1, 0xc5, 0x1f, - 0x7d, 0xd3, 0x19, 0xc2, 0xc0, 0x27, 0x8c, 0x25, 0xcc, 0x23, 0x69, 0xbc, 0x76, 0xfe, 0xec, 0xc0, - 0xc9, 0x2c, 0x5f, 0xcc, 0x58, 0x12, 0x5c, 0x92, 0x8c, 0x45, 0x01, 0xf7, 0xc8, 0x2f, 0x39, 0xe1, - 0x19, 0x7a, 0x04, 0x83, 0x17, 0xa2, 0x26, 0xa1, 0xd9, 0x7c, 0x9d, 0x12, 0xab, 0xf3, 0xa8, 0x73, - 0xb6, 0xe7, 0x0d, 0x82, 0x8d, 0x09, 0x59, 0x60, 0x16, 0x11, 0x56, 0x57, 0x78, 0xf7, 0x3d, 0xb3, - 0xf0, 0xa2, 0x87, 0x00, 0xb3, 0x38, 0x5f, 0x46, 0xf4, 0x35, 0x5e, 0x11, 0xcb, 0x50, 0x57, 0x21, - 0xad, 0x2c, 0xe8, 0x31, 0x0c, 0xb5, 0xff, 0x0d, 0x61, 0x3c, 0x4a, 0xa8, 0xb5, 0x23, 0x42, 0x0c, - 0x6f, 0x98, 0xd6, 0x8d, 0xe8, 0x29, 0xf4, 0x45, 0xfe, 0x9f, 0xa3, 0xa5, 0xd5, 0x13, 0xee, 0x81, - 0xfb, 0x60, 0x54, 0x20, 0xd1, 0xd6, 0x4b, 0x9c, 0x7a, 0xfd, 0x40, 0xfd, 0x8b, 0x4e, 0xa1, 0x3f, - 0xc7, 0xfc, 0xfa, 0xfb, 0xd0, 0xea, 0xab, 0x62, 0xfd, 0x4c, 0x9d, 0x9c, 0xc7, 0x00, 0xd3, 0x0a, - 0xac, 0x8c, 0x52, 0x27, 0x2e, 0xd0, 0x18, 0x32, 0x4a, 0x11, 0xc1, 0x9d, 0x08, 0x8e, 0x24, 0x01, - 0x84, 0xf3, 0x8a, 0x03, 0x19, 0x7e, 0x1f, 0x06, 0x36, 0xa5, 0x8c, 0x46, 0xa9, 0x18, 0x3e, 0x7d, - 0x49, 0x32, 0x0d, 0xbe, 0x96, 0xbc, 0x62, 0x1d, 0xc1, 0x8e, 0xe2, 0x4c, 0x17, 0xdb, 0xa1, 0x92, - 0xad, 0x8a, 0x4d, 0xd5, 0x86, 0x2c, 0xd4, 0x2b, 0xd9, 0x2c, 0xbb, 0x28, 0x79, 0x34, 0x94, 0xd3, - 0x7c, 0xa7, 0x8f, 0xce, 0xaf, 0x60, 0xbf, 0xa7, 0x9a, 0xc4, 0x27, 0xa6, 0x70, 0x11, 0x04, 0x24, - 0xcd, 0x48, 0xa8, 0xac, 0x05, 0x2b, 0x43, 0x5c, 0x37, 0xca, 0x28, 0x8f, 0x64, 0x39, 0xa3, 0x65, - 0x54, 0x57, 0x47, 0xb1, 0xba, 0x11, 0x1d, 0x43, 0x4f, 0xe1, 0x2d, 0x86, 0xdd, 0x53, 0x70, 0x1d, - 0x0e, 0x47, 0x6f, 0x70, 0x1c, 0x85, 0x38, 0x23, 0x13, 0x92, 0x56, 0x20, 0xcf, 0xc0, 0x2c, 0x88, - 0x56, 0x25, 0x07, 0xee, 0x41, 0x39, 0x59, 0x6d, 0xf6, 0xcc, 0x95, 0x76, 0x23, 0x17, 0x4c, 0xdd, - 0xbd, 0x2e, 0x3b, 0x70, 0xad, 0x32, 0xd2, 0xcf, 0x17, 0x3c, 0x60, 0xd1, 0x82, 0x84, 0x3a, 0xc0, - 0x33, 0x35, 0x23, 0xdc, 0x79, 0x06, 0x0f, 0x9a, 0x45, 0x25, 0xd6, 0xa7, 0x8d, 0xd1, 0xd7, 0x76, - 0xc9, 0x17, 0x5f, 0x8b, 0x5e, 0x91, 0x72, 0x44, 0xbf, 0x75, 0xe0, 0xb8, 0xca, 0xfe, 0xdf, 0xda, - 0x3e, 0xdb, 0x6e, 0xbb, 0x8a, 0xdc, 0x6a, 0xb6, 0xb6, 0xb8, 0x46, 0x63, 0x71, 0x9f, 0x03, 0xda, - 0xea, 0xe1, 0x5f, 0xa2, 0x18, 0x81, 0x21, 0x3e, 0x10, 0xf4, 0x04, 0xcc, 0xa9, 0x10, 0x8e, 0x88, - 0x94, 0x57, 0x86, 0x23, 0xa1, 0x0c, 0x23, 0xe1, 0x92, 0xe6, 0xb5, 0x67, 0x12, 0xed, 0x75, 0x5c, - 0xd8, 0x2d, 0x8d, 0xe8, 0x43, 0x30, 0x5e, 0x91, 0x75, 0xb1, 0x83, 0xc6, 0x35, 0x59, 0xcb, 0xf1, - 0x0a, 0x4e, 0x73, 0xbd, 0x7d, 0x62, 0xbc, 0xef, 0xe4, 0xc1, 0xf9, 0xbd, 0x0b, 0x27, 0x2f, 0x92, - 0x38, 0x26, 0x41, 0xb6, 0x25, 0x1e, 0x25, 0xac, 0x49, 0x91, 0x44, 0xc3, 0x9a, 0xd4, 0x29, 0xec, - 0xde, 0x45, 0xe1, 0xee, 0x84, 0xe0, 0x30, 0x8e, 0xa8, 0x16, 0x90, 0x81, 0xbb, 0x5f, 0x86, 0xce, - 0xa3, 0x15, 0xf1, 0x76, 0xc3, 0xc2, 0x8b, 0x2e, 0xc0, 0xbc, 0x88, 0xe3, 0x39, 0x5e, 0x72, 0x21, - 0x23, 0x32, 0xe7, 0x13, 0x05, 0xb1, 0xb5, 0xb1, 0x51, 0x11, 0x59, 0x80, 0xc7, 0xfa, 0x64, 0x4f, - 0x60, 0xbf, 0xee, 0x90, 0x04, 0x5c, 0x37, 0x09, 0x78, 0x08, 0x1a, 0xb3, 0x22, 0x60, 0xe0, 0xee, - 0x96, 0x2c, 0x16, 0x54, 0x7c, 0xd3, 0xfd, 0xba, 0xe3, 0xbc, 0x85, 0xa3, 0xed, 0xa2, 0x72, 0x68, - 0xff, 0x7c, 0x6d, 0x36, 0xa2, 0xd1, 0x6d, 0x88, 0xc6, 0x0c, 0x4e, 0xa7, 0x37, 0x29, 0xa6, 0xe1, - 0xdb, 0x28, 0x0e, 0x03, 0xcc, 0xc2, 0x8a, 0xe7, 0xaf, 0x60, 0x4f, 0xca, 0x05, 0x4f, 0x71, 0x40, - 0x8a, 0xec, 0xd5, 0x17, 0x52, 0x39, 0xa6, 0x31, 0x59, 0x89, 0x31, 0x7b, 0x7b, 0xb4, 0xb4, 0x38, - 0xe7, 0xb0, 0x77, 0xc1, 0x98, 0x2f, 0xca, 0xd2, 0x25, 0xfa, 0x02, 0x3a, 0xfe, 0x9d, 0x97, 0x3b, - 0xdc, 0xc1, 0x70, 0xfc, 0xb7, 0x36, 0xb4, 0x4e, 0x1a, 0xaf, 0x7d, 0xbf, 0x02, 0x27, 0x99, 0xa9, - 0x92, 0x7b, 0x06, 0xf5, 0x7d, 0xb1, 0x85, 0x85, 0x3a, 0x74, 0x9b, 0x42, 0xbe, 0x59, 0x5b, 0x2d, - 0x18, 0xee, 0x1f, 0x3d, 0x18, 0x6a, 0x56, 0x2e, 0x31, 0xc5, 0x4b, 0xc2, 0xd0, 0x4f, 0x70, 0xd2, - 0x2a, 0x61, 0xe8, 0x73, 0x55, 0xe8, 0x36, 0x31, 0xb5, 0x3f, 0xbb, 0x2d, 0x44, 0xbe, 0x7e, 0x1f, - 0xa0, 0x57, 0x70, 0xb8, 0x85, 0x09, 0x7d, 0xa2, 0x6e, 0xb5, 0x13, 0x6e, 0x7f, 0xdc, 0xee, 0xd4, - 0xc9, 0xbe, 0x83, 0x83, 0xe6, 0x02, 0x20, 0xfb, 0xfd, 0xab, 0x68, 0x5b, 0xad, 0x3e, 0x9d, 0xe9, - 0x39, 0x1c, 0x88, 0x57, 0x39, 0x8e, 0xf8, 0x55, 0x33, 0x53, 0xeb, 0x53, 0x6d, 0x1f, 0xea, 0xa6, - 0x36, 0xaf, 0xba, 0x6a, 0xa5, 0xf9, 0xa4, 0xdd, 0x9a, 0x40, 0xb7, 0xd2, 0xf2, 0x06, 0x8a, 0x4c, - 0xdf, 0xc2, 0x7e, 0x5d, 0x4e, 0x91, 0x8e, 0x6d, 0x91, 0x75, 0xfb, 0xb4, 0xc5, 0xa3, 0x73, 0x4c, - 0x61, 0xd8, 0x50, 0x33, 0xa4, 0x69, 0x6c, 0x53, 0x59, 0xfb, 0xa3, 0x36, 0x97, 0x4e, 0xf3, 0x12, - 0x0e, 0x7f, 0xa4, 0xfc, 0x7f, 0x48, 0xe4, 0xc1, 0xe9, 0x25, 0xce, 0x82, 0xab, 0x1f, 0x72, 0xc2, - 0xd6, 0xf3, 0xa4, 0x5a, 0xf6, 0x7b, 0x0c, 0x7f, 0xd1, 0x57, 0xbf, 0xaf, 0xce, 0xff, 0x0a, 0x00, - 0x00, 0xff, 0xff, 0x43, 0xcf, 0x95, 0x03, 0xdb, 0x09, 0x00, 0x00, + // 879 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x56, 0xdb, 0x6e, 0xdb, 0x46, + 0x10, 0xb5, 0xc4, 0x48, 0xb2, 0x87, 0xba, 0x20, 0x6b, 0x5b, 0x61, 0xe8, 0xc0, 0x8e, 0x59, 0xf4, + 0x8e, 0x4a, 0x85, 0x02, 0xb4, 0x46, 0x1f, 0x5a, 0xa8, 0xb1, 0xe0, 0x06, 0x86, 0x02, 0x45, 0x52, + 0x52, 0xf4, 0xa1, 0x0f, 0x2b, 0x72, 0x2b, 0x11, 0xa1, 0x48, 0x76, 0x77, 0x19, 0x58, 0xef, 0xfd, + 0x8b, 0xfe, 0x5a, 0x3f, 0xa6, 0x7b, 0x21, 0xa9, 0x4b, 0x18, 0xdb, 0x45, 0xf3, 0x64, 0x73, 0x66, + 0xf6, 0xec, 0x99, 0xcb, 0x99, 0x15, 0xfc, 0x38, 0xf7, 0xf9, 0x22, 0x99, 0x75, 0xdc, 0x68, 0xd9, + 0xf5, 0x43, 0x4e, 0x02, 0xe6, 0xf9, 0xdf, 0xdc, 0x74, 0x59, 0x88, 0xe3, 0xee, 0x9c, 0xc6, 0x6e, + 0xd7, 0x8d, 0x42, 0x4e, 0xa3, 0x20, 0xa6, 0xd1, 0xcd, 0xaa, 0xbb, 0x61, 0xe8, 0x08, 0x0b, 0x8f, + 0x90, 0x21, 0x4c, 0xf6, 0xb3, 0xbb, 0x41, 0x96, 0xcb, 0x28, 0x4c, 0xff, 0xe8, 0x93, 0x4e, 0x03, + 0xcc, 0x09, 0xa1, 0x34, 0xa2, 0x63, 0x12, 0x07, 0x2b, 0xe7, 0xef, 0x12, 0x1c, 0x8f, 0x92, 0xd9, + 0x88, 0x46, 0xee, 0x90, 0x70, 0xea, 0xbb, 0x6c, 0x4c, 0xfe, 0x4c, 0x08, 0xe3, 0xe8, 0x10, 0xcc, + 0xe7, 0xe2, 0x4e, 0x12, 0xf2, 0xe9, 0x2a, 0x26, 0x56, 0xe9, 0x69, 0xe9, 0x8b, 0x03, 0xd4, 0x82, + 0x5a, 0x6a, 0xb4, 0xca, 0xc2, 0x50, 0x47, 0x08, 0x60, 0x14, 0x24, 0x73, 0x3f, 0x7c, 0x89, 0x97, + 0xc4, 0x32, 0x54, 0xd0, 0x31, 0x34, 0xb4, 0xed, 0x0d, 0xa1, 0xcc, 0x8f, 0x42, 0xeb, 0x81, 0x30, + 0x1b, 0xe8, 0x1c, 0xaa, 0xe2, 0xec, 0x1f, 0xfe, 0xdc, 0xaa, 0x88, 0x6f, 0xb3, 0xf7, 0xb0, 0x93, + 0x12, 0xd3, 0xd6, 0x21, 0x8e, 0x51, 0x13, 0xaa, 0x53, 0xcc, 0xde, 0xbe, 0xf0, 0xac, 0xaa, 0x44, + 0x72, 0x9e, 0x00, 0x0c, 0x72, 0xae, 0xd2, 0xab, 0xbe, 0x98, 0x20, 0x63, 0x08, 0xef, 0x35, 0x1c, + 0x4a, 0xde, 0x84, 0xb1, 0x9c, 0xba, 0x0c, 0xbb, 0x1f, 0xf1, 0x35, 0x98, 0xa1, 0xc0, 0x5e, 0xc1, + 0x93, 0x2b, 0xc2, 0x35, 0xef, 0x8d, 0xe3, 0x79, 0x39, 0xea, 0xf0, 0x40, 0xa5, 0xa8, 0xe1, 0xf2, + 0xb4, 0xd5, 0x15, 0x12, 0xb1, 0x22, 0xaf, 0xc8, 0x12, 0x96, 0x75, 0xa8, 0x38, 0xbf, 0x81, 0xfd, + 0x01, 0x48, 0x49, 0x53, 0x54, 0xa9, 0xef, 0xba, 0x24, 0xe6, 0xc4, 0x53, 0x56, 0x9d, 0x94, 0x34, + 0x8f, 0x09, 0x4f, 0x68, 0x98, 0x99, 0xcb, 0xca, 0xdc, 0x80, 0x8a, 0xa2, 0xab, 0x4b, 0xec, 0x60, + 0x38, 0x7c, 0x83, 0x03, 0xdf, 0xc3, 0x9c, 0x5c, 0x92, 0x38, 0x27, 0x79, 0x06, 0xb5, 0xb4, 0x14, + 0x0a, 0xcd, 0xec, 0x35, 0xb3, 0x1a, 0x6b, 0x33, 0xfa, 0x12, 0x6a, 0x9a, 0x8f, 0xc6, 0x35, 0x7b, + 0x56, 0x16, 0x30, 0x49, 0x66, 0xcc, 0xa5, 0xfe, 0x8c, 0x78, 0x3a, 0xc0, 0xf9, 0x0e, 0x1e, 0x6e, + 0x5f, 0x21, 0x49, 0x9f, 0x6f, 0xb5, 0x60, 0xa3, 0x87, 0x13, 0x31, 0x74, 0xca, 0xe3, 0x2c, 0xe0, + 0x28, 0xc7, 0xfa, 0x4f, 0xdc, 0xce, 0x76, 0xb9, 0xe5, 0x01, 0xda, 0xbc, 0x31, 0x1d, 0xba, 0x08, + 0xdf, 0x03, 0xda, 0xb9, 0xe9, 0x9e, 0x14, 0x3f, 0x05, 0x43, 0x4e, 0xdb, 0x29, 0xd4, 0x06, 0x42, + 0x54, 0x3e, 0xc9, 0x42, 0x1b, 0x1d, 0xa1, 0x9a, 0x8e, 0x70, 0x49, 0xf3, 0xca, 0xf9, 0x0c, 0xf6, + 0xb3, 0xff, 0x91, 0x09, 0xc6, 0x35, 0x59, 0xa5, 0xdd, 0x17, 0xcd, 0x10, 0xa5, 0x49, 0x74, 0xe3, + 0x0f, 0x9c, 0x7f, 0x84, 0x86, 0x9e, 0x47, 0x41, 0x40, 0x5c, 0xbe, 0xa3, 0xa1, 0x8c, 0xf1, 0x65, + 0x7a, 0x70, 0xa3, 0x06, 0xe5, 0xc2, 0x1a, 0x9c, 0xc2, 0xfe, 0x25, 0xc1, 0x5e, 0xe0, 0x87, 0x5a, + 0x4c, 0x66, 0xaf, 0x9e, 0x45, 0x4c, 0xfd, 0x25, 0x41, 0x17, 0x50, 0xeb, 0x07, 0xc1, 0x14, 0xcf, + 0x99, 0x10, 0x95, 0x04, 0xf8, 0x5c, 0x51, 0x2e, 0xbc, 0xbd, 0x93, 0x46, 0xaa, 0x04, 0xec, 0x0b, + 0xa8, 0x6f, 0x7e, 0xcb, 0x84, 0xde, 0xe6, 0x09, 0x3d, 0x82, 0xca, 0xbb, 0x3c, 0x21, 0xb3, 0xb7, + 0x9f, 0xd5, 0xe1, 0x87, 0xf2, 0x45, 0xc9, 0x79, 0x01, 0xed, 0x5d, 0x7c, 0x16, 0x47, 0x21, 0x23, + 0x77, 0xb7, 0x74, 0x2d, 0x32, 0x35, 0xc5, 0xce, 0x00, 0xda, 0x83, 0x9b, 0x18, 0x87, 0xde, 0xaf, + 0x7e, 0xe0, 0xb9, 0x98, 0x7a, 0x79, 0xa5, 0xbe, 0x86, 0x03, 0x29, 0x2f, 0x16, 0x63, 0x97, 0xa4, + 0x60, 0xf9, 0x68, 0xe6, 0x8e, 0x41, 0x40, 0x96, 0x42, 0x44, 0xce, 0xb7, 0x70, 0xd0, 0xa7, 0x74, + 0x22, 0xae, 0x08, 0xe7, 0xe8, 0x13, 0x28, 0x4d, 0xee, 0x3c, 0xf1, 0x1a, 0x8e, 0xde, 0xbb, 0x58, + 0x0e, 0xcb, 0x09, 0x18, 0x2f, 0x27, 0x93, 0x9c, 0xbd, 0x4c, 0x7b, 0x8d, 0xfc, 0x34, 0xd3, 0x5c, + 0x79, 0x7b, 0x5f, 0xad, 0x07, 0xe9, 0x2b, 0x78, 0x2c, 0x14, 0xde, 0x4f, 0x78, 0xe4, 0xf9, 0xcc, + 0x8d, 0xde, 0x11, 0x3a, 0xc2, 0x7c, 0x91, 0x62, 0x8b, 0x29, 0x51, 0x5f, 0x5a, 0xd8, 0xbd, 0xbf, + 0xaa, 0xd0, 0xd0, 0x65, 0x19, 0xe2, 0x10, 0xcf, 0x09, 0x45, 0xbf, 0xc3, 0x71, 0xe1, 0x7e, 0x40, + 0xe7, 0x8a, 0xc8, 0x6d, 0xeb, 0xc8, 0x3e, 0xbb, 0x2d, 0x44, 0x2e, 0xf6, 0x3d, 0x74, 0x0d, 0xad, + 0x9d, 0x9c, 0xd1, 0x89, 0x3a, 0x55, 0xdc, 0x02, 0xfb, 0x71, 0xb1, 0x33, 0x03, 0x6b, 0x6e, 0x0f, + 0x01, 0xb2, 0x3f, 0x3c, 0x79, 0xf6, 0x49, 0xa1, 0x4f, 0x4f, 0x8d, 0x00, 0xfb, 0x09, 0x9a, 0xe2, + 0xcd, 0x09, 0x7c, 0xb6, 0xd8, 0x06, 0x2b, 0x7c, 0x88, 0xec, 0x96, 0xe6, 0xb5, 0x7e, 0xb3, 0xf6, + 0xd0, 0x2f, 0x02, 0x60, 0x6b, 0xf3, 0xdf, 0x0a, 0x60, 0x69, 0xdf, 0xfb, 0x4f, 0x85, 0x40, 0xfa, + 0x19, 0xea, 0x9b, 0x5b, 0x0e, 0xe9, 0xd8, 0x82, 0xdd, 0x6a, 0xb7, 0x0b, 0x3c, 0x1a, 0x63, 0x00, + 0x8d, 0xad, 0x3d, 0x84, 0x74, 0x25, 0x8b, 0xb6, 0xa0, 0xfd, 0xa8, 0xc8, 0xa5, 0x61, 0xae, 0xa0, + 0xf5, 0x3a, 0x64, 0x1f, 0x01, 0x68, 0x0c, 0xed, 0x21, 0xe6, 0xee, 0xe2, 0x55, 0x42, 0xe8, 0x6a, + 0x1a, 0xe5, 0x62, 0xf8, 0x3f, 0xfd, 0xbf, 0x82, 0xa3, 0xa2, 0x49, 0x47, 0x8d, 0x4c, 0x14, 0x83, + 0x65, 0xcc, 0x57, 0xf6, 0x69, 0x36, 0x96, 0xc5, 0x9a, 0x70, 0xf6, 0x66, 0x55, 0xf5, 0x33, 0xe4, + 0xd9, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x88, 0x96, 0x25, 0x04, 0x02, 0x09, 0x00, 0x00, } diff --git a/grpc/controlproxy/rpc/control.proto b/grpc/controlproxy/rpc/control.proto index c41790865..285aac680 100644 --- a/grpc/controlproxy/rpc/control.proto +++ b/grpc/controlproxy/rpc/control.proto @@ -26,7 +26,7 @@ service MetricManager { // managesMetrics from scheduler rpc GetPluginContentTypes(GetPluginContentTypesRequest) returns (GetPluginContentTypesReply) {} rpc ExpandWildcards(ExpandWildcardsRequest) returns (ExpandWildcardsReply) {} - rpc CollectMetrics(CollectMetricsRequest) returns (CollectMetricsReply) {} + rpc CollectMetrics(CollectMetricsRequest) returns (CollectMetricsResponse) {} rpc PublishMetrics(PubProcMetricsRequest) returns (ErrorReply) {} rpc ProcessMetrics(PubProcMetricsRequest) returns (ProcessMetricsReply) {} rpc ValidateDeps(ValidateDepsRequest) returns (ValidateDepsReply) {} @@ -105,7 +105,7 @@ message CollectMetricsRequest { map AllTags = 4; } -message CollectMetricsReply { +message CollectMetricsResponse { repeated common.Metric Metrics = 1; repeated string Errors = 2; }