remove collector mode support

We need to update yang config collector mode (split into config and
state). before that, let's remove the feature itself to see if there
is any user of it.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>

11 files changed, 96 insertions, 156 deletions

diff --git a/api/gobgp.pb.go b/api/gobgp.pb.go
index a8641158..0182000d 100644
--- a/api/gobgp.pb.go
+++ b/api/gobgp.pb.go
@@ -1383,7 +1383,6 @@ type Global struct {
 	Families        []uint32 `protobuf:"varint,5,rep,name=families" json:"families,omitempty"`
 	MplsLabelMin    uint32   `protobuf:"varint,6,opt,name=mpls_label_min,json=mplsLabelMin" json:"mpls_label_min,omitempty"`
 	MplsLabelMax    uint32   `protobuf:"varint,7,opt,name=mpls_label_max,json=mplsLabelMax" json:"mpls_label_max,omitempty"`
-	Collector       bool     `protobuf:"varint,8,opt,name=collector" json:"collector,omitempty"`
 }
 
 func (m *Global) Reset()                    { *m = Global{} }
@@ -3051,13 +3050,13 @@ var _GobgpApi_serviceDesc = grpc.ServiceDesc{
 }
 
 var fileDescriptor0 = []byte{
-	// 4284 bytes of a gzipped FileDescriptorProto
+	// 4272 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xd4, 0x7b, 0xcd, 0x73, 0x1b, 0x47,
 	0x76, 0xb8, 0x41, 0x7c, 0x10, 0x78, 0x00, 0x48, 0x70, 0x44, 0xc9, 0x14, 0xd7, 0xeb, 0xf5, 0x6f,
 	0x7e, 0x6b, 0xaf, 0xc5, 0xb5, 0x2d, 0x5b, 0xb6, 0xe9, 0x8d, 0xd6, 0xbb, 0x09, 0x04, 0x42, 0x12,
 	0xd6, 0x24, 0x01, 0x35, 0x21, 0xc5, 0xce, 0x65, 0x32, 0x04, 0x06, 0xe4, 0x94, 0x00, 0xcc, 0x78,
-	0x66, 0xa0, 0x8f, 0x54, 0x25, 0x87, 0xcd, 0x21, 0x87, 0x54, 0xfe, 0x80, 0x54, 0x6d, 0x6e, 0x39,
-	0xe5, 0x1f, 0x48, 0xe5, 0x9e, 0x54, 0xe5, 0x98, 0x6b, 0x2e, 0xc9, 0x21, 0x95, 0x3f, 0x21, 0x55,
+	0x66, 0xa0, 0x8f, 0x54, 0x25, 0x87, 0xcd, 0x31, 0x95, 0x3f, 0x20, 0x55, 0x9b, 0x5b, 0x4e, 0xf9,
+	0x07, 0x52, 0xb9, 0x27, 0x55, 0x39, 0xe6, 0x9a, 0x4b, 0x72, 0x48, 0xe5, 0x90, 0x3f, 0x20, 0x55,
 	0x39, 0xe6, 0xbd, 0xd7, 0x3d, 0x33, 0x3d, 0xc0, 0x88, 0xa2, 0x96, 0x5b, 0xa9, 0xca, 0x85, 0x98,
 	0x7e, 0x5f, 0xfd, 0xba, 0xfb, 0x7d, 0xf5, 0x07, 0xa1, 0x7e, 0xe6, 0x9d, 0x9e, 0xf9, 0x9f, 0xf8,
 	0x81, 0x17, 0x79, 0x46, 0x95, 0x1b, 0xb6, 0xef, 0x9a, 0x53, 0x28, 0x77, 0x83, 0xc0, 0x0b, 0x8c,
@@ -3068,7 +3067,7 @@ var fileDescriptor0 = []byte{
 	0x9e, 0x41, 0xad, 0x1d, 0x9c, 0x2d, 0x66, 0xce, 0x3c, 0x0a, 0x8d, 0x4f, 0xa0, 0x1a, 0x38, 0xa1,
 	0xb7, 0x08, 0x46, 0x71, 0xaf, 0x46, 0xda, 0xab, 0x50, 0x18, 0x91, 0xd0, 0x18, 0x37, 0xa0, 0x32,
 	0xb1, 0x67, 0xee, 0xf4, 0x25, 0xf7, 0xda, 0x14, 0xaa, 0x65, 0x18, 0x50, 0x9a, 0xdb, 0x33, 0x67,
-	0xa7, 0xc8, 0xba, 0xf0, 0xb7, 0xf9, 0xaf, 0x05, 0x68, 0x1d, 0x79, 0xe3, 0x81, 0x1d, 0x9d, 0xa7,
+	0xa7, 0xc8, 0xba, 0xf0, 0xb7, 0xf9, 0x2f, 0x05, 0x68, 0x1d, 0x79, 0xe3, 0x81, 0x1d, 0x9d, 0xa7,
 	0x1d, 0x7e, 0x06, 0x35, 0xcf, 0x77, 0x02, 0x3b, 0x72, 0xbd, 0xb9, 0xea, 0xf1, 0x5a, 0xda, 0x63,
 	0x3f, 0x46, 0x89, 0x94, 0x2a, 0xa3, 0xe3, 0xda, 0x25, 0x74, 0xcc, 0xd1, 0xc5, 0x30, 0xa1, 0xe4,
 	0xa3, 0x1e, 0x3b, 0x25, 0x84, 0xd5, 0xef, 0x6c, 0xa4, 0xfc, 0xa4, 0x9d, 0x60, 0x1c, 0xf1, 0x2d,
@@ -3077,17 +3076,17 @@ var fileDescriptor0 = []byte{
 	0xd8, 0x52, 0x64, 0xe1, 0x6f, 0x3f, 0xe7, 0xf1, 0x78, 0xd6, 0xb4, 0xf1, 0xfc, 0x18, 0xca, 0xa4,
 	0x73, 0x88, 0x83, 0x2c, 0xe6, 0x0c, 0x48, 0x22, 0xcd, 0x19, 0x6c, 0x63, 0xf7, 0xc7, 0x8e, 0x7b,
 	0x76, 0x7e, 0xea, 0x05, 0x57, 0x5a, 0x04, 0x9a, 0x40, 0xc7, 0x09, 0x58, 0x89, 0x6c, 0x7f, 0x08,
-	0x15, 0x8c, 0x33, 0xff, 0xa6, 0x00, 0x8d, 0xa3, 0x20, 0xfa, 0xdd, 0x5b, 0xd7, 0x2e, 0x54, 0xdd,
+	0x15, 0x8c, 0x33, 0xff, 0xba, 0x00, 0x8d, 0xa3, 0x20, 0xfa, 0xdd, 0x5b, 0xd7, 0x2e, 0x54, 0xdd,
 	0x79, 0xe4, 0x04, 0xcf, 0xec, 0x29, 0xaf, 0x6a, 0x49, 0x24, 0x6d, 0xe3, 0x16, 0xb4, 0xe6, 0x6a,
 	0x80, 0x96, 0x3d, 0x1e, 0xa3, 0xac, 0x90, 0x57, 0xb9, 0x26, 0x36, 0x63, 0x78, 0x5b, 0x82, 0xcd,
-	0xbf, 0x2e, 0xf0, 0xaa, 0x65, 0x54, 0xfc, 0x2d, 0xa6, 0xe2, 0x07, 0x50, 0x1b, 0x2f, 0x66, 0xbe,
+	0xbf, 0x2a, 0xf0, 0xaa, 0x65, 0x54, 0xfc, 0x2d, 0xa6, 0xe2, 0x07, 0x50, 0x1b, 0x2f, 0x66, 0xbe,
 	0x15, 0xbd, 0xf4, 0xe5, 0xa2, 0x94, 0x45, 0x95, 0x00, 0x43, 0x6c, 0x93, 0xaa, 0x13, 0x77, 0xea,
-	0x68, 0x06, 0x98, 0xb4, 0x33, 0xc3, 0x28, 0x65, 0x87, 0x61, 0xfe, 0x87, 0xd4, 0xed, 0xde, 0xcc,
+	0x68, 0x06, 0x98, 0xb4, 0x33, 0xc3, 0x28, 0x65, 0x87, 0x61, 0xfe, 0xbb, 0xd4, 0xed, 0xde, 0xcc,
 	0xbf, 0x92, 0x6e, 0x3b, 0xb0, 0x1e, 0x4f, 0x82, 0x34, 0x97, 0xb8, 0x49, 0x56, 0xe4, 0x7b, 0x41,
 	0xc4, 0x4a, 0x35, 0x05, 0x7f, 0x1b, 0xbf, 0x84, 0x12, 0x0f, 0xa2, 0xc4, 0xb2, 0xf7, 0x52, 0xd9,
 	0x4b, 0x9a, 0x60, 0x7b, 0xee, 0x46, 0x5e, 0xe0, 0xce, 0xcf, 0x06, 0xde, 0xd4, 0x1d, 0xbd, 0x14,
 	0xcc, 0x67, 0xde, 0x26, 0x07, 0xcf, 0x62, 0x8c, 0x75, 0x28, 0x0e, 0x44, 0x57, 0x46, 0x9c, 0x41,
-	0xff, 0x64, 0xd8, 0x2a, 0xd0, 0xd7, 0xbd, 0xfe, 0xf0, 0x61, 0x6b, 0xcd, 0xfc, 0x07, 0x19, 0x12,
+	0xff, 0x64, 0xd8, 0x2a, 0xd0, 0xd7, 0xbd, 0xfe, 0xf0, 0x61, 0x6b, 0xcd, 0xfc, 0x7b, 0x19, 0x12,
 	0x84, 0xff, 0xd4, 0xbd, 0xd2, 0x30, 0x31, 0xf2, 0xd9, 0xe1, 0x5c, 0x59, 0x09, 0x7d, 0xea, 0x03,
 	0x2f, 0xe6, 0x0f, 0xbc, 0xa4, 0x0d, 0x1c, 0x57, 0x62, 0xea, 0x4e, 0x9c, 0xc8, 0xc5, 0x55, 0x22,
 	0x77, 0x2f, 0x8a, 0xa4, 0x4d, 0x46, 0xe8, 0x07, 0xce, 0xc4, 0x7d, 0xc1, 0x2e, 0x5f, 0x13, 0xaa,
@@ -3095,12 +3094,12 @@ var fileDescriptor0 = []byte{
 	0x46, 0xcd, 0x94, 0x18, 0xe5, 0x0a, 0xc2, 0x98, 0x21, 0xdc, 0xc0, 0x6e, 0x0e, 0xb0, 0xcb, 0xb9,
 	0x33, 0x3e, 0x71, 0xae, 0x66, 0xaa, 0x1f, 0x40, 0x31, 0x74, 0x22, 0xd5, 0xdb, 0x76, 0x4a, 0x9c,
 	0x8a, 0x17, 0x44, 0x80, 0x71, 0xea, 0x3a, 0x76, 0x7a, 0x12, 0xd9, 0x91, 0x43, 0x7d, 0x5d, 0xa9,
-	0x4f, 0x64, 0x09, 0x63, 0x41, 0xaa, 0x67, 0x8d, 0x25, 0xe9, 0x43, 0xa4, 0x54, 0xe6, 0xbf, 0x15,
+	0x4f, 0x64, 0x09, 0x63, 0x41, 0xaa, 0x67, 0x8d, 0x25, 0xe9, 0x43, 0xa4, 0x54, 0xe6, 0xbf, 0x16,
 	0xc0, 0xa0, 0x38, 0xc9, 0x16, 0x74, 0xa5, 0xce, 0x3f, 0xc4, 0xc5, 0x63, 0x29, 0xaa, 0xe7, 0x96,
 	0x16, 0xa8, 0xa4, 0xe5, 0x2a, 0xbc, 0x71, 0x17, 0x6e, 0xe2, 0xba, 0x3a, 0x81, 0xe5, 0xbc, 0x70,
 	0xc3, 0x08, 0xed, 0xd7, 0x4a, 0xf4, 0x91, 0x26, 0x54, 0x15, 0x6f, 0x33, 0x41, 0x57, 0xe1, 0x13,
 	0xcd, 0x43, 0xe3, 0x36, 0x5c, 0x43, 0xa3, 0x08, 0xd1, 0x73, 0x1d, 0x9d, 0xab, 0xc4, 0x5c, 0x46,
-	0x8c, 0x4a, 0x19, 0xcc, 0xbf, 0x2a, 0xc0, 0x3b, 0xe9, 0x00, 0xc3, 0xd0, 0x3d, 0x9b, 0x5f, 0x79,
+	0x8c, 0x4a, 0x19, 0xcc, 0xbf, 0x2c, 0xc0, 0x3b, 0xe9, 0x00, 0xc3, 0xd0, 0x3d, 0x9b, 0x5f, 0x79,
 	0x9e, 0xef, 0x02, 0xd8, 0x89, 0x24, 0x35, 0xdc, 0xdd, 0xe5, 0xe1, 0xa6, 0x7d, 0x09, 0x8d, 0xda,
 	0x7c, 0x0e, 0x3b, 0xa8, 0xce, 0x83, 0xa9, 0x77, 0x6a, 0x4f, 0x3b, 0xde, 0x7c, 0xe2, 0x9e, 0x5d,
 	0x75, 0xd6, 0xcf, 0x58, 0xd6, 0xea, 0xac, 0xcb, 0x3e, 0x84, 0xc2, 0x9b, 0xbf, 0x29, 0x62, 0x54,
@@ -3118,10 +3117,10 @@ var fileDescriptor0 = []byte{
 	0xd2, 0xf5, 0x77, 0x36, 0xb8, 0x6b, 0x88, 0x41, 0x3d, 0xdf, 0x8c, 0xa0, 0x7e, 0xe0, 0x90, 0xb5,
 	0xcb, 0x19, 0x49, 0x43, 0x61, 0x41, 0x0f, 0x85, 0x69, 0xf5, 0xb1, 0x76, 0x41, 0xf5, 0x61, 0xfc,
 	0x04, 0x36, 0xa7, 0xde, 0xfc, 0x0c, 0x5d, 0x4c, 0xb2, 0x39, 0xb1, 0x5f, 0x6d, 0x48, 0xf0, 0x40,
-	0x41, 0xcd, 0xbf, 0x2f, 0x40, 0x79, 0x68, 0x9f, 0xe2, 0x50, 0x3e, 0x50, 0x09, 0xe9, 0xd5, 0xc5,
+	0x41, 0xcd, 0xbf, 0x2b, 0x40, 0x79, 0x68, 0x9f, 0xe2, 0x50, 0x3e, 0x50, 0x09, 0xe9, 0xd5, 0xc5,
 	0x02, 0xe3, 0x73, 0x4b, 0xa2, 0x74, 0x31, 0x8a, 0x99, 0xc5, 0xf8, 0x3d, 0x68, 0x8c, 0xd3, 0x31,
 	0x91, 0x97, 0x92, 0xce, 0xd7, 0xf5, 0x60, 0x98, 0x60, 0x45, 0x86, 0x94, 0xe6, 0xcb, 0xf7, 0xc2,
-	0xc8, 0x52, 0x21, 0x45, 0x99, 0x14, 0x81, 0xa4, 0x77, 0x99, 0xff, 0x48, 0xe6, 0x8c, 0xa5, 0x0f,
+	0xc8, 0x52, 0x21, 0x45, 0x99, 0x14, 0x81, 0xa4, 0x77, 0x99, 0xff, 0x40, 0xe6, 0x8c, 0xa5, 0x0f,
 	0xaf, 0x1a, 0x75, 0xe7, 0x3a, 0x72, 0x52, 0x9a, 0x22, 0x69, 0x1b, 0x3f, 0x83, 0x86, 0xed, 0xfb,
 	0xd3, 0x97, 0xb1, 0x98, 0x22, 0xfb, 0x88, 0xa6, 0x40, 0x9b, 0xb0, 0x2a, 0x3c, 0xd5, 0xed, 0xb4,
 	0x41, 0xd3, 0x31, 0x42, 0xef, 0xe4, 0x8e, 0xeb, 0xfa, 0x74, 0x50, 0x9f, 0xe4, 0xb7, 0x82, 0xf1,
@@ -3132,7 +3131,7 @@ var fileDescriptor0 = []byte{
 	0xb1, 0xbd, 0x66, 0xa2, 0x3d, 0xe9, 0xc9, 0x61, 0x50, 0x30, 0x01, 0x05, 0x0a, 0xca, 0xb1, 0xe8,
 	0xe1, 0x8d, 0xe5, 0x40, 0x31, 0x64, 0xb8, 0x50, 0x78, 0x8a, 0x42, 0x51, 0x60, 0xcf, 0x43, 0x4e,
 	0xdd, 0xcd, 0x65, 0xb9, 0xc3, 0x18, 0x25, 0x52, 0x2a, 0x9a, 0x67, 0x39, 0x10, 0x8e, 0xbe, 0xc1,
-	0xce, 0xe6, 0xf2, 0x3c, 0xf3, 0x28, 0x4e, 0x18, 0x29, 0xea, 0x41, 0xda, 0x30, 0xff, 0xb9, 0x00,
+	0xce, 0xe6, 0xf2, 0x3c, 0xf3, 0x28, 0x4e, 0x18, 0x29, 0xea, 0x41, 0xda, 0x30, 0xff, 0xa9, 0x00,
 	0x75, 0x6d, 0x11, 0x8c, 0xaf, 0xa0, 0xe6, 0xce, 0xe3, 0xe5, 0x2a, 0xbc, 0x36, 0xb2, 0x62, 0x15,
 	0xa7, 0x18, 0x7f, 0x1f, 0x17, 0xe2, 0x05, 0x29, 0x63, 0x65, 0xb2, 0xd0, 0x45, 0xcc, 0x0d, 0xc9,
 	0x90, 0x0a, 0xc0, 0x00, 0xa4, 0x09, 0x28, 0xbe, 0x5e, 0x80, 0x64, 0x50, 0x16, 0xf9, 0x67, 0x50,
@@ -3158,7 +3157,7 @@ var fileDescriptor0 = []byte{
 	0x22, 0x6e, 0xb2, 0xe9, 0x29, 0x2a, 0x2b, 0x8a, 0xa6, 0x89, 0xe9, 0x29, 0xd8, 0x30, 0x9a, 0x9a,
 	0x7f, 0x5e, 0x80, 0x8d, 0x6c, 0xc8, 0x21, 0x6b, 0x5c, 0x8a, 0x52, 0xd6, 0x08, 0xa3, 0x2b, 0x56,
 	0x3e, 0x52, 0xfc, 0x76, 0x36, 0x24, 0x75, 0x18, 0x87, 0x81, 0x71, 0x77, 0x95, 0x6b, 0x11, 0x62,
-	0x3a, 0xa4, 0xd4, 0x2b, 0x7b, 0x7e, 0x7b, 0x99, 0x93, 0xf1, 0xbd, 0xb1, 0xf9, 0x9f, 0x65, 0xa8,
+	0x3a, 0xa4, 0xd4, 0x2b, 0x7b, 0x7e, 0x7b, 0x99, 0x93, 0xf1, 0xbd, 0xb1, 0xf9, 0x1f, 0x65, 0xa8,
 	0x25, 0x01, 0xec, 0x7f, 0xc1, 0x96, 0x71, 0xb7, 0x3c, 0x43, 0x43, 0xc5, 0xfa, 0x26, 0x54, 0xe7,
 	0x14, 0x5a, 0xc4, 0x3f, 0x52, 0x18, 0x91, 0xd0, 0xe4, 0xda, 0x7e, 0xf9, 0xb5, 0xb6, 0x5f, 0xb9,
 	0xc0, 0xf6, 0xd7, 0x2f, 0xb4, 0xfd, 0xea, 0x92, 0xed, 0x63, 0x30, 0xff, 0x7e, 0xe1, 0x2c, 0x50,
@@ -3173,7 +3172,7 @@ var fileDescriptor0 = []byte{
 	0x18, 0xab, 0x41, 0x8c, 0x6b, 0x50, 0xc6, 0xb9, 0xb2, 0xbe, 0xdf, 0xd9, 0x96, 0xdb, 0x5e, 0x6c,
 	0x3c, 0xa2, 0xfa, 0x71, 0x32, 0xf5, 0xfc, 0x70, 0xe7, 0x3a, 0x03, 0x65, 0xc3, 0xfc, 0x63, 0xa8,
 	0xc6, 0xd6, 0x65, 0x7c, 0xac, 0xa9, 0x23, 0x13, 0xdf, 0xd6, 0x8a, 0x0d, 0x6a, 0x1a, 0xbe, 0x0f,
-	0xa5, 0x30, 0xdd, 0x7d, 0xe4, 0x90, 0x32, 0xda, 0xfc, 0xa7, 0x02, 0xac, 0x2b, 0x88, 0x61, 0x42,
+	0xa5, 0x30, 0xdd, 0x7d, 0xe4, 0x90, 0x32, 0xda, 0xfc, 0xc7, 0x02, 0xac, 0x2b, 0x88, 0x61, 0x42,
 	0xe3, 0xb8, 0x3f, 0xec, 0xdd, 0xef, 0x75, 0xda, 0xc3, 0x5e, 0xff, 0x98, 0x7b, 0x29, 0x89, 0xc6,
 	0x5c, 0x83, 0x51, 0xd6, 0x7a, 0x3c, 0x38, 0x68, 0x0f, 0xbb, 0x2c, 0xb8, 0x24, 0x2a, 0x0b, 0x6e,
 	0x51, 0xd9, 0xd7, 0x1f, 0x74, 0x8f, 0xd5, 0x19, 0x50, 0xc9, 0xc3, 0x6f, 0xe3, 0x1d, 0xa8, 0x7d,
@@ -3189,7 +3188,7 @@ var fileDescriptor0 = []byte{
 	0x3b, 0x1f, 0x86, 0xc8, 0xf9, 0xae, 0x12, 0x80, 0x24, 0xa1, 0x3d, 0x18, 0x4f, 0x1d, 0xc7, 0xc7,
 	0x4d, 0x12, 0x3a, 0xef, 0xd2, 0x19, 0xdc, 0x56, 0x82, 0xe9, 0xc5, 0x87, 0x71, 0x07, 0xf0, 0x2e,
 	0x5a, 0xb6, 0x3b, 0x5b, 0xcc, 0xac, 0xc4, 0x16, 0xa9, 0x48, 0xb1, 0x96, 0xce, 0xbd, 0xde, 0x51,
-	0x54, 0x6d, 0x9d, 0x28, 0x96, 0x62, 0xfe, 0xdd, 0x1a, 0xd4, 0xb5, 0xe1, 0xfd, 0x1f, 0x1d, 0x06,
+	0x54, 0x6d, 0x9d, 0x28, 0x96, 0x62, 0xfe, 0xed, 0x1a, 0xd4, 0xb5, 0xe1, 0xfd, 0x1f, 0x1d, 0x06,
 	0xef, 0x27, 0x9d, 0x33, 0x2f, 0x72, 0x6d, 0x0a, 0x28, 0xa9, 0x72, 0xd2, 0x10, 0x8d, 0x14, 0xf7,
 	0x30, 0x56, 0x13, 0xed, 0x67, 0xe1, 0x33, 0x4d, 0x45, 0xd9, 0x3d, 0xb7, 0x28, 0x10, 0x50, 0xa1,
 	0xc5, 0x18, 0x69, 0x90, 0x49, 0xdb, 0xfc, 0xef, 0x02, 0xd4, 0x92, 0x72, 0x98, 0xa6, 0x4a, 0xa5,
@@ -3224,7 +3223,7 @@ var fileDescriptor0 = []byte{
 	0x1c, 0x1f, 0xeb, 0x41, 0x25, 0x55, 0x5d, 0x1e, 0x14, 0xd2, 0xcb, 0x03, 0xb4, 0x3c, 0xa2, 0xb0,
 	0x93, 0xbc, 0x2d, 0x5b, 0x58, 0xab, 0x34, 0x17, 0xa1, 0x83, 0x8b, 0x3f, 0x89, 0x30, 0xca, 0x85,
 	0x91, 0x8a, 0x84, 0x75, 0x04, 0x1e, 0x22, 0xec, 0x08, 0x41, 0xe6, 0x2d, 0x68, 0x1e, 0xe3, 0x6c,
-	0xe2, 0xce, 0x45, 0x89, 0xd7, 0x6e, 0x22, 0x0a, 0x99, 0x9b, 0x08, 0xf3, 0x5f, 0xd6, 0x60, 0x5d,
+	0xe2, 0xce, 0x45, 0x89, 0xd7, 0x6e, 0x22, 0x0a, 0x99, 0x9b, 0x08, 0xf3, 0x9f, 0xd7, 0x60, 0x5d,
 	0x12, 0x85, 0xe9, 0x61, 0x85, 0x3d, 0xd2, 0x0e, 0x5a, 0x97, 0x0f, 0x2b, 0x24, 0xb5, 0x3a, 0xac,
 	0x50, 0xf2, 0xbf, 0x82, 0x5a, 0x5a, 0xed, 0x4a, 0x4b, 0xbe, 0xf9, 0xca, 0xb9, 0x17, 0x29, 0x2d,
 	0xc6, 0xe3, 0xe2, 0x0c, 0xcb, 0xba, 0xe2, 0xf2, 0x61, 0x4a, 0x32, 0x99, 0x82, 0xf0, 0xa8, 0x19,
@@ -3234,7 +3233,7 @@ var fileDescriptor0 = []byte{
 	0x92, 0x73, 0xf6, 0x24, 0x2a, 0x15, 0xb4, 0x00, 0xf9, 0x05, 0xc0, 0x28, 0x09, 0x1e, 0xab, 0x37,
 	0x21, 0x69, 0x60, 0x11, 0x1a, 0x1d, 0x5a, 0xde, 0xba, 0x5c, 0x98, 0x50, 0xcd, 0x97, 0x56, 0xdb,
 	0xaa, 0x25, 0x14, 0x31, 0x85, 0xf9, 0x08, 0x13, 0x89, 0x3c, 0xbe, 0xc9, 0x53, 0xe0, 0x73, 0x00,
-	0xed, 0x8e, 0x40, 0x9e, 0x98, 0xe6, 0x5e, 0x88, 0x68, 0x64, 0xe6, 0xbf, 0x17, 0xa0, 0xb5, 0x7c,
+	0xed, 0x8e, 0x40, 0x9e, 0x98, 0xe6, 0x5e, 0x88, 0x68, 0x64, 0xe6, 0xbf, 0x15, 0xa0, 0xb5, 0x7c,
 	0xd2, 0x83, 0x1b, 0x2e, 0xdd, 0x1d, 0xb6, 0x97, 0xcf, 0x84, 0x34, 0x5f, 0xf8, 0x5d, 0x5c, 0x99,
 	0x53, 0x16, 0x21, 0xb9, 0x6e, 0x6e, 0x16, 0x91, 0xa7, 0x95, 0x09, 0x85, 0x71, 0x1b, 0xd6, 0xc7,
 	0xce, 0xc4, 0xa6, 0xe0, 0x51, 0xbe, 0xc8, 0x94, 0x63, 0x2a, 0xf3, 0x3d, 0x80, 0xa3, 0x20, 0x8a,
@@ -3255,69 +3254,68 @@ var fileDescriptor0 = []byte{
 	0x05, 0x15, 0xaa, 0x2d, 0x46, 0xd6, 0x25, 0xec, 0x11, 0x81, 0xe4, 0x52, 0xa0, 0x22, 0x8a, 0x62,
 	0x4b, 0x2a, 0xc8, 0x20, 0x26, 0x30, 0xbf, 0x83, 0x12, 0x59, 0x47, 0x72, 0xd6, 0xbe, 0x52, 0x50,
 	0xc4, 0x36, 0xa8, 0xce, 0xda, 0x6f, 0x65, 0x77, 0x64, 0xd7, 0xb2, 0x84, 0x99, 0xfd, 0xd8, 0x5f,
-	0x16, 0xa0, 0x28, 0xfa, 0x6d, 0xb2, 0x1f, 0x3b, 0x54, 0xf9, 0x06, 0xbf, 0x68, 0xeb, 0x29, 0x57,
+	0x14, 0xa0, 0x28, 0xfa, 0x6d, 0xb2, 0x1f, 0x3b, 0x54, 0xf9, 0x06, 0xbf, 0x68, 0xeb, 0x29, 0x57,
 	0x12, 0xab, 0x8a, 0xb8, 0xfc, 0x4e, 0x00, 0xb4, 0xb2, 0x58, 0x3b, 0x12, 0x4a, 0xdd, 0x63, 0xc8,
 	0x96, 0x76, 0x19, 0x53, 0xca, 0x5c, 0xc6, 0xbc, 0xf2, 0x92, 0x20, 0xab, 0xb8, 0x39, 0x82, 0xe2,
 	0x93, 0x60, 0x92, 0x1b, 0xa2, 0x50, 0xc1, 0x40, 0x1e, 0x87, 0x35, 0x04, 0x7e, 0x71, 0x3d, 0x2c,
 	0x4f, 0xa1, 0x03, 0x59, 0x59, 0x36, 0xb0, 0x1e, 0x66, 0x80, 0x88, 0x08, 0xa9, 0xce, 0xb8, 0xf9,
-	0x52, 0x9d, 0x91, 0x12, 0x20, 0x22, 0xf3, 0x2f, 0xd6, 0xa0, 0x22, 0xaf, 0xfc, 0x56, 0x46, 0x8d,
-	0x7c, 0x9c, 0xc6, 0x92, 0xa3, 0x37, 0x2c, 0xb2, 0x25, 0xa0, 0x37, 0xa6, 0x65, 0xa2, 0xd2, 0xd5,
-	0x99, 0x5b, 0xc9, 0x23, 0x05, 0xac, 0x3f, 0x24, 0x88, 0x37, 0x01, 0xb7, 0xa0, 0xa5, 0x08, 0x94,
-	0xe3, 0xab, 0xa8, 0x54, 0x13, 0x9b, 0x12, 0xde, 0x8e, 0xc1, 0x99, 0xbb, 0x98, 0xf2, 0xd2, 0x5d,
-	0xcc, 0x8f, 0x61, 0x63, 0xe6, 0x4f, 0x43, 0x6b, 0x6a, 0x9f, 0x3a, 0x53, 0xae, 0xe5, 0xa5, 0xef,
-	0x35, 0x08, 0x7a, 0x48, 0x40, 0x2a, 0xe5, 0x97, 0xa8, 0xb0, 0x92, 0x5f, 0x5f, 0xa6, 0xb2, 0x5f,
-	0xd0, 0x32, 0x8e, 0xbc, 0xa9, 0xba, 0x32, 0xa9, 0x72, 0x74, 0x48, 0x01, 0x7b, 0x1d, 0x8c, 0x5e,
-	0x71, 0x78, 0x05, 0x9c, 0x94, 0xc3, 0xfe, 0xbd, 0xf6, 0x61, 0xeb, 0x2d, 0xa3, 0x06, 0xe5, 0xc3,
-	0x7e, 0x07, 0x3f, 0x0b, 0x04, 0x6e, 0x1f, 0xfc, 0xca, 0xea, 0x1d, 0xb7, 0xd6, 0xe8, 0xb1, 0x16,
-	0x7d, 0xf7, 0x1f, 0x0f, 0x5b, 0x45, 0x7a, 0x43, 0xf1, 0x44, 0xdc, 0x6f, 0x95, 0xf6, 0xfe, 0x04,
-	0x6a, 0xc9, 0x85, 0x2b, 0x41, 0xdb, 0x07, 0x07, 0x28, 0x02, 0x3f, 0x0e, 0xba, 0x24, 0x00, 0x99,
-	0xf0, 0xc3, 0x6a, 0x1f, 0x1e, 0x4a, 0x09, 0xa2, 0x3b, 0x38, 0x6c, 0x77, 0xba, 0x28, 0x01, 0x45,
-	0x77, 0x8f, 0xdb, 0xf7, 0x0e, 0xbb, 0xad, 0x12, 0x53, 0xf5, 0x4e, 0xb8, 0x51, 0xa6, 0xee, 0x45,
-	0xf7, 0xa4, 0x3b, 0x6c, 0x55, 0x8c, 0x26, 0xa6, 0xce, 0xfe, 0xfd, 0xa1, 0x6c, 0xae, 0xe3, 0x7a,
-	0x41, 0xef, 0xb8, 0x37, 0xec, 0xb5, 0x0f, 0x7b, 0x7f, 0xd4, 0x6d, 0x55, 0xf7, 0x2c, 0xba, 0x0b,
-	0x4c, 0xb6, 0x20, 0x24, 0x71, 0x20, 0xba, 0xf7, 0x7b, 0xdf, 0xa2, 0x02, 0x0d, 0xa8, 0x1e, 0x77,
-	0x7b, 0x0f, 0x1e, 0xde, 0xeb, 0x0b, 0xd4, 0x02, 0xd5, 0x19, 0xb6, 0x1f, 0xa8, 0x31, 0x9c, 0x58,
-	0x83, 0xf6, 0xf0, 0x21, 0x6a, 0x80, 0xd2, 0x3b, 0xfd, 0xa3, 0xa3, 0xc7, 0x28, 0xf2, 0x3b, 0x54,
-	0x62, 0x0b, 0x9a, 0xdd, 0x6f, 0x87, 0x56, 0x0a, 0x2a, 0xef, 0xdd, 0xc2, 0x52, 0x2f, 0xde, 0x56,
-	0xf0, 0xe0, 0x8e, 0xbf, 0x93, 0x83, 0xa3, 0xf1, 0xf0, 0xec, 0xf4, 0x8e, 0x9f, 0x74, 0xc5, 0xb0,
-	0xb5, 0xb6, 0xb7, 0x07, 0xad, 0xe5, 0x4d, 0x83, 0x51, 0x81, 0xb5, 0xee, 0x23, 0x64, 0xc0, 0xdf,
-	0x07, 0x5d, 0xa4, 0xc7, 0x5f, 0x1c, 0xe1, 0xda, 0xde, 0x6d, 0xb5, 0x2b, 0x54, 0xe5, 0x52, 0x15,
-	0x4a, 0xc7, 0xfd, 0x63, 0x7a, 0x90, 0x42, 0xd3, 0xdd, 0xe9, 0x74, 0x07, 0x43, 0x29, 0x5c, 0x74,
-	0x7f, 0xd5, 0xed, 0x90, 0xf0, 0xc7, 0x70, 0x2d, 0xa7, 0x62, 0x25, 0x8d, 0x13, 0x6d, 0x2d, 0x39,
-	0xf1, 0xdb, 0xd0, 0x4a, 0x41, 0xa2, 0x7b, 0xd4, 0x7f, 0x42, 0x1d, 0x5f, 0x87, 0x2d, 0x1d, 0x2a,
-	0x97, 0x60, 0x6d, 0xef, 0x63, 0x68, 0x66, 0xca, 0x54, 0x9a, 0x9e, 0xa3, 0xee, 0x81, 0x75, 0xd4,
-	0x27, 0x51, 0x9b, 0x50, 0xa7, 0x46, 0x4c, 0x5e, 0xd8, 0xfb, 0x08, 0x20, 0x4d, 0xe3, 0x34, 0x18,
-	0x34, 0x0b, 0xd6, 0xb9, 0x77, 0x34, 0xe8, 0x0b, 0xa5, 0x73, 0xf7, 0x5b, 0xfe, 0x5e, 0xbb, 0xf3,
-	0xb7, 0x5b, 0x50, 0x7d, 0x40, 0x8e, 0xde, 0xf6, 0x5d, 0xe3, 0x2e, 0x6c, 0x3e, 0x70, 0x22, 0xfd,
-	0x36, 0xdf, 0xd0, 0xc2, 0x52, 0x72, 0xb3, 0xbf, 0xbb, 0x72, 0x2d, 0x6f, 0xbe, 0x65, 0x3c, 0xe4,
-	0x57, 0x2d, 0x19, 0x5e, 0x33, 0xf3, 0x0e, 0x28, 0xf7, 0x91, 0xc0, 0xee, 0xe6, 0xd2, 0xdb, 0x44,
-	0x94, 0xf4, 0x15, 0x34, 0x50, 0x8b, 0xf8, 0xb1, 0x59, 0x98, 0xaf, 0xc2, 0xd2, 0xc3, 0x31, 0xf3,
-	0xad, 0x4f, 0x0b, 0x58, 0xa1, 0xd5, 0x35, 0xc6, 0x4b, 0xf2, 0x19, 0x7f, 0x80, 0x13, 0x98, 0xbe,
-	0x6d, 0x33, 0xde, 0xcd, 0x28, 0xbd, 0xf2, 0xe4, 0x2d, 0x4f, 0xe1, 0x8f, 0xd0, 0x2b, 0x71, 0x2f,
-	0xe4, 0x9e, 0x1a, 0x1a, 0x92, 0xef, 0xa1, 0x77, 0x97, 0x01, 0x48, 0x7d, 0x1b, 0x1d, 0x87, 0x33,
-	0x5a, 0xae, 0x7e, 0x39, 0xe2, 0x3f, 0x47, 0xf7, 0xf2, 0x26, 0xd1, 0x9b, 0x31, 0x7d, 0x09, 0xf5,
-	0x84, 0xa9, 0x37, 0xbf, 0x34, 0xdb, 0x3e, 0x34, 0x12, 0xb6, 0xfe, 0xe2, 0xf2, 0xdd, 0xdd, 0x81,
-	0xea, 0x89, 0xba, 0xc5, 0xbb, 0x34, 0xcf, 0xa7, 0x68, 0x86, 0x7c, 0x95, 0x73, 0x69, 0x0e, 0xac,
-	0xeb, 0x0f, 0xdc, 0xf0, 0x8d, 0x58, 0xee, 0xa1, 0xaf, 0xc8, 0x87, 0x93, 0xc6, 0x6e, 0x66, 0x65,
-	0x33, 0xaf, 0x49, 0x77, 0x6f, 0xae, 0xe0, 0xe2, 0x8a, 0x02, 0x65, 0x7c, 0x0d, 0xd5, 0xf8, 0xf1,
-	0xa5, 0xf1, 0x83, 0x15, 0xc2, 0xf0, 0xa2, 0xfe, 0x3f, 0x2c, 0xd0, 0x36, 0x48, 0xbd, 0x6d, 0xcb,
-	0xb5, 0x90, 0xfc, 0xf7, 0x03, 0x6c, 0xcf, 0x07, 0xf4, 0x98, 0x89, 0x39, 0xef, 0x21, 0xa6, 0x73,
-	0x6e, 0xcf, 0xcf, 0xe8, 0x40, 0x3e, 0x6f, 0xe4, 0x17, 0x48, 0xf9, 0x79, 0xf2, 0xb6, 0x2e, 0xbd,
-	0x83, 0xba, 0xb4, 0x4b, 0xdd, 0x65, 0xd3, 0xc6, 0xfa, 0xda, 0xd0, 0xce, 0x2a, 0xf4, 0x77, 0x8f,
-	0xbb, 0xdb, 0x19, 0xb8, 0x2a, 0xc3, 0x99, 0x77, 0x1f, 0x2a, 0xf2, 0x91, 0xa4, 0x91, 0x9d, 0xdd,
-	0x0c, 0x7b, 0xae, 0x0d, 0x56, 0xe4, 0xb3, 0xc1, 0x25, 0x3e, 0xfd, 0x21, 0x61, 0xbe, 0x0d, 0xae,
-	0x93, 0x1b, 0x52, 0x0d, 0xf6, 0xba, 0xf1, 0x11, 0x11, 0xeb, 0xf8, 0x33, 0x36, 0x0f, 0xe6, 0xc9,
-	0x9a, 0x47, 0xe6, 0x65, 0xe1, 0x2b, 0xac, 0x97, 0x7a, 0xc3, 0xaa, 0x2c, 0xb7, 0x33, 0xed, 0x45,
-	0x1e, 0xd2, 0x70, 0x5f, 0x9f, 0xb1, 0x7e, 0x58, 0x3a, 0x85, 0xaf, 0x65, 0x41, 0x22, 0x6d, 0x0a,
-	0xa9, 0xda, 0xca, 0x4e, 0x85, 0xfe, 0x78, 0x30, 0x4f, 0xb9, 0x5f, 0x40, 0x13, 0xbb, 0xd2, 0x0e,
-	0x07, 0x73, 0x9f, 0xec, 0xed, 0xe6, 0x42, 0x39, 0x24, 0x6e, 0x64, 0xd8, 0xc3, 0x37, 0xe3, 0x67,
-	0xd3, 0x6d, 0x66, 0x1e, 0x1f, 0x1a, 0xef, 0x65, 0xf4, 0xcf, 0x79, 0x95, 0x98, 0x37, 0x8c, 0xbb,
-	0x9c, 0x09, 0xd2, 0x6d, 0x79, 0xde, 0x6e, 0x77, 0x37, 0x0f, 0x98, 0x4c, 0x81, 0xf6, 0xd6, 0xee,
-	0x0d, 0x98, 0x71, 0x00, 0xf7, 0xa0, 0xa1, 0x3f, 0x64, 0x34, 0x7e, 0x94, 0xd1, 0x7f, 0xf5, 0x81,
-	0x63, 0x7e, 0xb8, 0xaa, 0xa1, 0x0a, 0x6a, 0x47, 0xbf, 0xb2, 0xe7, 0xdd, 0x5d, 0x81, 0xc8, 0xb0,
-	0x1d, 0xb3, 0x50, 0x95, 0x79, 0x29, 0x26, 0xd4, 0xf6, 0x6b, 0xac, 0x80, 0xe2, 0x57, 0x81, 0xc6,
-	0x3b, 0xd9, 0x10, 0x95, 0x7d, 0x0b, 0x99, 0xa7, 0x67, 0x1f, 0xae, 0x25, 0x7a, 0x6a, 0xa7, 0x04,
-	0x17, 0xbc, 0x15, 0xd9, 0xbd, 0x00, 0x87, 0x02, 0x07, 0x70, 0x2d, 0xe7, 0x91, 0xa2, 0xf1, 0x41,
-	0x9e, 0x62, 0xab, 0x6f, 0x18, 0x73, 0x54, 0x3c, 0xad, 0xf0, 0xbf, 0x3a, 0x7c, 0xfe, 0x3f, 0x01,
-	0x00, 0x00, 0xff, 0xff, 0x68, 0x50, 0xca, 0x12, 0xf9, 0x30, 0x00, 0x00,
+	0x52, 0x9d, 0x91, 0x12, 0x20, 0x22, 0xf3, 0x3f, 0x0b, 0x50, 0x91, 0x57, 0x7e, 0x2b, 0xa3, 0x46,
+	0x3e, 0x4e, 0x63, 0xc9, 0xd1, 0x1b, 0x16, 0xd9, 0x12, 0xd0, 0x1b, 0xd3, 0x32, 0x51, 0xe9, 0xea,
+	0xcc, 0xad, 0xe4, 0x91, 0x02, 0xd6, 0x1f, 0x12, 0xc4, 0x9b, 0x80, 0x5b, 0xd0, 0x52, 0x04, 0xca,
+	0xf1, 0x55, 0x54, 0xaa, 0x89, 0x4d, 0x09, 0x6f, 0xc7, 0xe0, 0xcc, 0x5d, 0x4c, 0x79, 0xe9, 0x2e,
+	0xe6, 0xc7, 0xb0, 0x31, 0xf3, 0xa7, 0xa1, 0x35, 0xb5, 0x4f, 0x9d, 0x29, 0xd7, 0xf2, 0xd2, 0xf7,
+	0x1a, 0x04, 0x3d, 0x24, 0x20, 0x95, 0xf2, 0x4b, 0x54, 0x58, 0xc9, 0xaf, 0x2f, 0x53, 0xd9, 0x2f,
+	0xf6, 0x3a, 0x18, 0x9f, 0xe2, 0x00, 0x0a, 0x38, 0xec, 0xc3, 0xfe, 0xbd, 0xf6, 0x61, 0xeb, 0x2d,
+	0xa3, 0x06, 0xe5, 0xc3, 0x7e, 0x07, 0x3f, 0x0b, 0x04, 0x6e, 0x1f, 0xfc, 0xca, 0xea, 0x1d, 0xb7,
+	0xd6, 0xe8, 0x39, 0x16, 0x7d, 0xf7, 0x1f, 0x0f, 0x5b, 0x45, 0x7a, 0x25, 0xf1, 0x44, 0xdc, 0x6f,
+	0x95, 0xf6, 0xfe, 0x04, 0x6a, 0xc9, 0x95, 0x2a, 0x41, 0xdb, 0x07, 0x07, 0x28, 0x02, 0x3f, 0x0e,
+	0xba, 0x24, 0x00, 0x99, 0xf0, 0xc3, 0x6a, 0x1f, 0x1e, 0x4a, 0x09, 0xa2, 0x3b, 0x38, 0x6c, 0x77,
+	0xba, 0x28, 0x01, 0x45, 0x77, 0x8f, 0xdb, 0xf7, 0x0e, 0xbb, 0xad, 0x12, 0x53, 0xf5, 0x4e, 0xb8,
+	0x51, 0xa6, 0xee, 0x45, 0xf7, 0xa4, 0x3b, 0x6c, 0x55, 0x8c, 0x26, 0x26, 0xc7, 0xfe, 0xfd, 0xa1,
+	0x6c, 0xae, 0xe3, 0x8a, 0x40, 0xef, 0xb8, 0x37, 0xec, 0xb5, 0x0f, 0x7b, 0x7f, 0xd4, 0x6d, 0x55,
+	0xf7, 0x2c, 0xba, 0xed, 0x4b, 0x36, 0x19, 0x24, 0x71, 0x20, 0xba, 0xf7, 0x7b, 0xdf, 0xa2, 0x02,
+	0x0d, 0xa8, 0x1e, 0x77, 0x7b, 0x0f, 0x1e, 0xde, 0xeb, 0x0b, 0xd4, 0x02, 0xd5, 0x19, 0xb6, 0x1f,
+	0xa8, 0x31, 0x9c, 0x58, 0x83, 0xf6, 0xf0, 0x21, 0x6a, 0x80, 0xd2, 0x3b, 0xfd, 0xa3, 0xa3, 0xc7,
+	0x28, 0xf2, 0x3b, 0x54, 0x62, 0x0b, 0x9a, 0xdd, 0x6f, 0x87, 0x56, 0x0a, 0x2a, 0xef, 0xdd, 0xc2,
+	0x62, 0x2e, 0xde, 0x38, 0xf0, 0xe0, 0x8e, 0xbf, 0x93, 0x83, 0xa3, 0xf1, 0xf0, 0xec, 0xf4, 0x8e,
+	0x9f, 0x74, 0xc5, 0xb0, 0xb5, 0xb6, 0xb7, 0x07, 0xad, 0xe5, 0x6d, 0x81, 0x51, 0x81, 0xb5, 0xee,
+	0x23, 0x64, 0xc0, 0xdf, 0x07, 0x5d, 0xa4, 0xc7, 0x5f, 0x1c, 0xe1, 0xda, 0xde, 0x6d, 0xb5, 0xef,
+	0x53, 0x05, 0x51, 0x15, 0x4a, 0xc7, 0xfd, 0x63, 0x7a, 0x72, 0x42, 0xd3, 0xdd, 0xe9, 0x74, 0x07,
+	0x43, 0x29, 0x5c, 0x74, 0x7f, 0xd5, 0xed, 0x90, 0xf0, 0xc7, 0x70, 0x2d, 0xa7, 0x26, 0x25, 0x8d,
+	0x13, 0x6d, 0x2d, 0x39, 0xf1, 0xdb, 0xd0, 0x4a, 0x41, 0xa2, 0x7b, 0xd4, 0x7f, 0x42, 0x1d, 0x5f,
+	0x87, 0x2d, 0x1d, 0x2a, 0x97, 0x60, 0x6d, 0xef, 0x63, 0x68, 0x66, 0x0a, 0x51, 0x9a, 0x9e, 0xa3,
+	0xee, 0x81, 0x75, 0xd4, 0x27, 0x51, 0x9b, 0x50, 0xa7, 0x46, 0x4c, 0x5e, 0xd8, 0xfb, 0x08, 0x20,
+	0x4d, 0xd4, 0x34, 0x18, 0x34, 0x0b, 0xd6, 0xb9, 0x77, 0x34, 0xe8, 0x0b, 0xa5, 0x73, 0xf7, 0x5b,
+	0xfe, 0x5e, 0xbb, 0xf3, 0x37, 0x5b, 0x50, 0x7d, 0x40, 0xae, 0xdc, 0xf6, 0x5d, 0xe3, 0x2e, 0x6c,
+	0x3e, 0x70, 0x22, 0xfd, 0xbe, 0xde, 0xd0, 0x02, 0x4f, 0x72, 0x77, 0xbf, 0xbb, 0x72, 0xf1, 0x6e,
+	0xbe, 0x65, 0x3c, 0xe4, 0x77, 0x2b, 0x19, 0x5e, 0x33, 0xf3, 0xd2, 0x27, 0xf7, 0x19, 0xc0, 0xee,
+	0xe6, 0xd2, 0xeb, 0x43, 0x94, 0xf4, 0x15, 0x34, 0x50, 0x8b, 0xf8, 0x39, 0x59, 0x98, 0xaf, 0xc2,
+	0xd2, 0xd3, 0x30, 0xf3, 0xad, 0x4f, 0x0b, 0x58, 0x83, 0xd5, 0x35, 0xc6, 0x4b, 0xf2, 0x19, 0x7f,
+	0x80, 0x13, 0x98, 0xbe, 0x5e, 0x33, 0xde, 0xcd, 0x28, 0xbd, 0xf2, 0xa8, 0x2d, 0x4f, 0xe1, 0x8f,
+	0xd0, 0x2b, 0x71, 0xb7, 0xe3, 0x9e, 0x1a, 0x1a, 0x92, 0x6f, 0x9a, 0x77, 0x97, 0x01, 0x48, 0x7d,
+	0x1b, 0x1d, 0x87, 0x73, 0x56, 0xae, 0x7e, 0x39, 0xe2, 0x3f, 0x47, 0xf7, 0xf2, 0x26, 0xd1, 0x9b,
+	0x31, 0x7d, 0x09, 0xf5, 0x84, 0xa9, 0x37, 0xbf, 0x34, 0xdb, 0x3e, 0x34, 0x12, 0xb6, 0xfe, 0xe2,
+	0xf2, 0xdd, 0xdd, 0x81, 0xea, 0x89, 0xba, 0xa7, 0xbb, 0x34, 0xcf, 0xa7, 0x68, 0x86, 0x7c, 0x59,
+	0x73, 0x69, 0x0e, 0xac, 0xdc, 0x0f, 0xdc, 0xf0, 0x8d, 0x58, 0xee, 0xa1, 0xaf, 0xc8, 0xa7, 0x91,
+	0xc6, 0x6e, 0x66, 0x65, 0x33, 0xef, 0x45, 0x77, 0x6f, 0xae, 0xe0, 0xe2, 0x9a, 0x01, 0x65, 0x7c,
+	0x0d, 0xd5, 0xf8, 0x79, 0xa5, 0xf1, 0x83, 0x15, 0xc2, 0xf0, 0xa2, 0xfe, 0x3f, 0x2c, 0xd0, 0x46,
+	0x47, 0xbd, 0x5e, 0xcb, 0xb5, 0x90, 0xfc, 0x17, 0x02, 0x6c, 0xcf, 0x07, 0xf4, 0x5c, 0x89, 0x39,
+	0xef, 0x21, 0xa6, 0x73, 0x6e, 0xcf, 0xcf, 0xe8, 0xc8, 0x3d, 0x6f, 0xe4, 0x17, 0x48, 0xf9, 0x79,
+	0xf2, 0x7a, 0x2e, 0xbd, 0x65, 0xba, 0xb4, 0x4b, 0xdd, 0x65, 0xd3, 0xc6, 0x0a, 0xda, 0xd0, 0x4e,
+	0x23, 0xf4, 0x97, 0x8d, 0xbb, 0xdb, 0x19, 0xb8, 0x2a, 0xb4, 0x99, 0x77, 0x1f, 0x2a, 0xf2, 0x19,
+	0xa4, 0x91, 0x9d, 0xdd, 0x0c, 0x7b, 0xae, 0x0d, 0x56, 0xe4, 0xc3, 0xc0, 0x25, 0x3e, 0xfd, 0xa9,
+	0x60, 0xbe, 0x0d, 0xae, 0x93, 0x1b, 0x52, 0x95, 0xf5, 0xba, 0xf1, 0x11, 0x11, 0xeb, 0xf8, 0x33,
+	0x36, 0x0f, 0xe6, 0xc9, 0x9a, 0x47, 0xe6, 0xed, 0xe0, 0x2b, 0xac, 0x97, 0x7a, 0xc3, 0xba, 0x2b,
+	0xb7, 0x33, 0xed, 0xcd, 0x1d, 0xd2, 0x70, 0x5f, 0x9f, 0xb1, 0x7e, 0x58, 0x1c, 0x85, 0xaf, 0x65,
+	0x41, 0x22, 0x6d, 0x0a, 0xa9, 0x9e, 0xca, 0x4e, 0x85, 0xfe, 0x3c, 0x30, 0x4f, 0xb9, 0x5f, 0x40,
+	0x13, 0xbb, 0xd2, 0x8e, 0xff, 0x72, 0x1f, 0xe5, 0xed, 0xe6, 0x42, 0x39, 0x24, 0x6e, 0x64, 0xd8,
+	0xc3, 0x37, 0xe3, 0x67, 0xd3, 0x6d, 0x66, 0x9e, 0x17, 0x1a, 0xef, 0x65, 0xf4, 0xcf, 0x79, 0x77,
+	0x98, 0x37, 0x8c, 0xbb, 0x9c, 0x09, 0xd2, 0x8d, 0x77, 0xde, 0x7e, 0x76, 0x37, 0x0f, 0x98, 0x4c,
+	0x81, 0xf6, 0x9a, 0xee, 0x0d, 0x98, 0x71, 0x00, 0xf7, 0xa0, 0xa1, 0x3f, 0x55, 0x34, 0x7e, 0x94,
+	0xd1, 0x7f, 0xf5, 0x09, 0x63, 0x7e, 0xb8, 0xaa, 0xa1, 0x0a, 0x6a, 0xcf, 0xbe, 0xb2, 0xab, 0xdd,
+	0x5d, 0x81, 0xc8, 0xb0, 0x1d, 0xb3, 0x50, 0x1d, 0x79, 0x29, 0x26, 0xd4, 0xf6, 0x6b, 0xac, 0x80,
+	0xe2, 0x77, 0x7f, 0xc6, 0x3b, 0xd9, 0x10, 0x95, 0x7d, 0xed, 0x98, 0xa7, 0x67, 0x1f, 0xae, 0x25,
+	0x7a, 0x6a, 0xe7, 0x00, 0x17, 0xbc, 0x06, 0xd9, 0xbd, 0x00, 0x87, 0x02, 0x07, 0x70, 0x2d, 0xe7,
+	0x19, 0xa2, 0xf1, 0x41, 0x9e, 0x62, 0xab, 0xaf, 0x14, 0x73, 0x54, 0x3c, 0xad, 0xf0, 0x3f, 0x33,
+	0x7c, 0xfe, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x85, 0xf7, 0xed, 0x86, 0xdb, 0x30, 0x00, 0x00,
 }
diff --git a/api/gobgp.proto b/api/gobgp.proto
index e17aebf9..cbae4af0 100644
--- a/api/gobgp.proto
+++ b/api/gobgp.proto
@@ -537,5 +537,4 @@ message Global {
     repeated uint32 families = 5;
     uint32 mpls_label_min = 6;
     uint32 mpls_label_max = 7;
-    bool collector = 8;
 }
diff --git a/config/bgp_configs.go b/config/bgp_configs.go
index e6a3dbad..5edaad2e 100644
--- a/config/bgp_configs.go
+++ b/config/bgp_configs.go
@@ -2561,23 +2561,6 @@ func (lhs *Zebra) Equal(rhs *Zebra) bool {
 	return true
 }
 
-//struct for container gobgp:collector
-type Collector struct {
-	// original -> gobgp:enabled
-	//gobgp:enabled's original type is boolean
-	Enabled bool `mapstructure:"enabled"`
-}
-
-func (lhs *Collector) Equal(rhs *Collector) bool {
-	if lhs == nil || rhs == nil {
-		return false
-	}
-	if lhs.Enabled != rhs.Enabled {
-		return false
-	}
-	return true
-}
-
 //struct for container gobgp:route-target-membership
 type RouteTargetMembership struct {
 	// original -> gobgp:deferral-time
@@ -3932,8 +3915,6 @@ type Global struct {
 	AfiSafis []AfiSafi `mapstructure:"afi-safis"`
 	// original -> rpol:apply-policy
 	ApplyPolicy ApplyPolicy `mapstructure:"apply-policy"`
-	// original -> gobgp:collector
-	Collector Collector `mapstructure:"collector"`
 	// original -> gobgp:zebra
 	Zebra Zebra `mapstructure:"zebra"`
 	// original -> gobgp:mpls-label-range
@@ -3986,9 +3967,6 @@ func (lhs *Global) Equal(rhs *Global) bool {
 	if !lhs.ApplyPolicy.Equal(&(rhs.ApplyPolicy)) {
 		return false
 	}
-	if !lhs.Collector.Equal(&(rhs.Collector)) {
-		return false
-	}
 	if !lhs.Zebra.Equal(&(rhs.Zebra)) {
 		return false
 	}
diff --git a/docs/sources/cli-command-syntax.md b/docs/sources/cli-command-syntax.md
index 011209e3..fec354d5 100644
--- a/docs/sources/cli-command-syntax.md
+++ b/docs/sources/cli-command-syntax.md
@@ -21,7 +21,7 @@ gobgp has six subcommands.
 #### syntax
 ```shell
 # configure global setting and start acting as bgp daemon
-% gobgp global as <VALUE> router-id <VALUE> [listen-port <VALUE>] [listen-addresses <VALUE>...] [mpls-label-min <VALUE>] [mpls-label-max <VALUE>] [collector]
+% gobgp global as <VALUE> router-id <VALUE> [listen-port <VALUE>] [listen-addresses <VALUE>...] [mpls-label-min <VALUE>] [mpls-label-max <VALUE>]
 # delete global setting and stop acting as bgp daemon (all peer sessions will be closed)
 % gobgp global del all
 # show global setting
diff --git a/docs/sources/configuration.md b/docs/sources/configuration.md
index c210b58b..c082d56b 100644
--- a/docs/sources/configuration.md
+++ b/docs/sources/configuration.md
@@ -24,8 +24,6 @@
 
         # listen address list (by default "0.0.0.0" and "::")
         local-address-list = ["192.168.10.1", "2001:db8::1"]
-    [global.collector]
-        enabled = true
 
 [[rpki-servers]]
     [rpki-servers.config]
diff --git a/gobgp/cmd/global.go b/gobgp/cmd/global.go
index d13e8d21..4a1dee08 100644
--- a/gobgp/cmd/global.go
+++ b/gobgp/cmd/global.go
@@ -821,18 +821,15 @@ func showGlobalConfig(args []string) error {
 		fmt.Printf("Listening Port: %d, Addresses: %s\n", g.ListenPort, strings.Join(g.ListenAddresses, ", "))
 	}
 	fmt.Printf("MPLS Label Range: %d..%d\n", g.MplsLabelMin, g.MplsLabelMax)
-	if g.Collector {
-		fmt.Println("Running in Collector Mode")
-	}
 	return nil
 }
 
 func modGlobalConfig(args []string) error {
 	m := extractReserved(args, []string{"as", "router-id", "listen-port",
-		"listen-addresses", "mpls-label-min", "mpls-label-max", "collector"})
+		"listen-addresses", "mpls-label-min", "mpls-label-max"})
 
 	if len(m["as"]) != 1 || len(m["router-id"]) != 1 {
-		return fmt.Errorf("usage: gobgp global as <VALUE> router-id <VALUE> [listen-port <VALUE>] [listen-addresses <VALUE>...] [mpls-label-min <VALUE>] [mpls-label-max <VALUE>] [collector]")
+		return fmt.Errorf("usage: gobgp global as <VALUE> router-id <VALUE> [listen-port <VALUE>] [listen-addresses <VALUE>...] [mpls-label-min <VALUE>] [mpls-label-max <VALUE>]")
 	}
 	asn, err := strconv.Atoi(m["as"][0])
 	if err != nil {
@@ -862,7 +859,6 @@ func modGlobalConfig(args []string) error {
 			return err
 		}
 	}
-	_, collector := m["collector"]
 	_, err = client.ModGlobalConfig(context.Background(), &api.ModGlobalConfigArguments{
 		Operation: api.Operation_ADD,
 		Global: &api.Global{
@@ -872,7 +868,6 @@ func modGlobalConfig(args []string) error {
 			ListenAddresses: m["listen-addresses"],
 			MplsLabelMin:    uint32(min),
 			MplsLabelMax:    uint32(max),
-			Collector:       collector,
 		},
 	})
 	return err
diff --git a/server/peer.go b/server/peer.go
index 0d0eb490..d191e734 100644
--- a/server/peer.go
+++ b/server/peer.go
@@ -58,8 +58,8 @@ func NewPeer(g *config.Global, conf *config.Neighbor, loc *table.TableManager, p
 		peer.tableId = table.GLOBAL_RIB_NAME
 	}
 	rfs, _ := config.AfiSafis(conf.AfiSafis).ToRfList()
-	peer.adjRibIn = table.NewAdjRib(peer.ID(), rfs, g.Collector.Enabled)
-	peer.adjRibOut = table.NewAdjRib(peer.ID(), rfs, g.Collector.Enabled)
+	peer.adjRibIn = table.NewAdjRib(peer.ID(), rfs)
+	peer.adjRibOut = table.NewAdjRib(peer.ID(), rfs)
 	return peer
 }
 
@@ -136,19 +136,13 @@ func (peer *Peer) getBestFromLocal(rfList []bgp.RouteFamily) ([]*table.Path, []*
 	options := &table.PolicyOptions{
 		Neighbor: peer.fsm.peerInfo.Address,
 	}
-	var source []*table.Path
-	if peer.fsm.gConf.Collector.Enabled {
-		source = peer.localRib.GetPathList(peer.TableID(), rfList)
-	} else {
-		source = peer.localRib.GetBestPathList(peer.TableID(), rfList)
-	}
-	for _, path := range source {
+	for _, path := range peer.localRib.GetBestPathList(peer.TableID(), rfList) {
 		p := peer.policy.ApplyPolicy(peer.TableID(), table.POLICY_DIRECTION_EXPORT, filterpath(peer, path), options)
 		if p == nil {
 			filtered = append(filtered, path)
 			continue
 		}
-		if !peer.fsm.gConf.Collector.Enabled && !peer.isRouteServerClient() {
+		if !peer.isRouteServerClient() {
 			p = p.Clone(p.IsWithdraw)
 			p.UpdatePathAttrs(peer.fsm.gConf, peer.fsm.pConf)
 		}
@@ -189,7 +183,7 @@ func (peer *Peer) processOutgoingPaths(paths, withdrawals []*table.Path) []*tabl
 		if path == nil {
 			continue
 		}
-		if !peer.isRouteServerClient() && !peer.fsm.gConf.Collector.Enabled {
+		if !peer.isRouteServerClient() {
 			path = path.Clone(path.IsWithdraw)
 			path.UpdatePathAttrs(peer.fsm.gConf, peer.fsm.pConf)
 		}
diff --git a/server/server.go b/server/server.go
index a021dd84..37c43447 100644
--- a/server/server.go
+++ b/server/server.go
@@ -474,7 +474,7 @@ func (server *BgpServer) dropPeerAllRoutes(peer *Peer, families []bgp.RouteFamil
 	for _, rf := range families {
 		best, _ := server.globalRib.DeletePathsByPeer(ids, peer.fsm.peerInfo, rf)
 
-		if !peer.isRouteServerClient() && !server.bgpConfig.Global.Collector.Enabled {
+		if !peer.isRouteServerClient() {
 			server.broadcastBests(best[table.GLOBAL_RIB_NAME])
 		}
 
@@ -692,9 +692,7 @@ func (server *BgpServer) propagateUpdate(peer *Peer, pathList []*table.Path) ([]
 		if len(best[table.GLOBAL_RIB_NAME]) == 0 {
 			return nil, alteredPathList
 		}
-		if !server.bgpConfig.Global.Collector.Enabled {
-			server.broadcastBests(best[table.GLOBAL_RIB_NAME])
-		}
+		server.broadcastBests(best[table.GLOBAL_RIB_NAME])
 	}
 
 	for _, targetPeer := range server.neighborMap {
@@ -1604,9 +1602,6 @@ func (server *BgpServer) handleModConfig(grpcReq *GrpcRequest) error {
 						MaxLabel: g.MplsLabelMax,
 					},
 					AfiSafis: families,
-					Collector: config.Collector{
-						Enabled: g.Collector,
-					},
 				},
 			}
 			if err := config.SetDefaultConfigValues(nil, b); err != nil {
@@ -1742,7 +1737,6 @@ func (server *BgpServer) handleGrpc(grpcReq *GrpcRequest) []*SenderMsg {
 				ListenAddresses: g.ListenConfig.LocalAddressList,
 				MplsLabelMin:    g.MplsLabelRange.MinLabel,
 				MplsLabelMax:    g.MplsLabelRange.MaxLabel,
-				Collector:       g.Collector.Enabled,
 			},
 		}
 		grpcReq.ResponseCh <- result
diff --git a/table/adj.go b/table/adj.go
index a58f87aa..8d298be4 100644
--- a/table/adj.go
+++ b/table/adj.go
@@ -21,22 +21,20 @@ import (
 )
 
 type AdjRib struct {
-	id          string
-	accepted    map[bgp.RouteFamily]int
-	table       map[bgp.RouteFamily]map[string]*Path
-	isCollector bool
+	id       string
+	accepted map[bgp.RouteFamily]int
+	table    map[bgp.RouteFamily]map[string]*Path
 }
 
-func NewAdjRib(id string, rfList []bgp.RouteFamily, isCollector bool) *AdjRib {
+func NewAdjRib(id string, rfList []bgp.RouteFamily) *AdjRib {
 	table := make(map[bgp.RouteFamily]map[string]*Path)
 	for _, rf := range rfList {
 		table[rf] = make(map[string]*Path)
 	}
 	return &AdjRib{
-		id:          id,
-		table:       table,
-		accepted:    make(map[bgp.RouteFamily]int),
-		isCollector: isCollector,
+		id:       id,
+		table:    table,
+		accepted: make(map[bgp.RouteFamily]int),
 	}
 }
 
@@ -47,9 +45,6 @@ func (adj *AdjRib) Update(pathList []*Path) {
 		}
 		rf := path.GetRouteFamily()
 		key := path.getPrefix()
-		if adj.isCollector {
-			key += path.GetSource().Address.String()
-		}
 
 		old, found := adj.table[rf][key]
 		if path.IsWithdraw {
diff --git a/table/table_manager_test.go b/table/table_manager_test.go
index 8b072c44..193890f3 100644
--- a/table/table_manager_test.go
+++ b/table/table_manager_test.go
@@ -2127,7 +2127,7 @@ func TestProcessBGPUpdate_Timestamp(t *testing.T) {
 
 	nlri := []*bgp.IPAddrPrefix{bgp.NewIPAddrPrefix(24, "10.10.10.0")}
 
-	adjRib := NewAdjRib("test", []bgp.RouteFamily{bgp.RF_IPv4_UC, bgp.RF_IPv6_UC}, false)
+	adjRib := NewAdjRib("test", []bgp.RouteFamily{bgp.RF_IPv4_UC, bgp.RF_IPv6_UC})
 	m1 := bgp.NewBGPUpdateMessage(nil, pathAttributes, nlri)
 	peer := peerR1()
 	pList1 := ProcessMessage(m1, peer, time.Now())
diff --git a/tools/pyang_plugins/gobgp.yang b/tools/pyang_plugins/gobgp.yang
index 30cc9d30..bba39762 100644
--- a/tools/pyang_plugins/gobgp.yang
+++ b/tools/pyang_plugins/gobgp.yang
@@ -721,17 +721,6 @@ module gobgp {
     uses gobgp-rpki-servers;
   }
 
-  augment "/bgp:bgp/bgp:global" {
-    description "route collector mode";
-    container collector {
-      leaf enabled {
-        type boolean;
-         description
-          "Configure enabling route-collector mode.";
-      }
-    }
-  }
-
   augment "/bgp:bgp" {
     description "additional bmp configuration";
     uses gobgp-bmp-servers;