From a70e68862b2353a3bcc9ffa1b812cb4b5cfb9c32 Mon Sep 17 00:00:00 2001 From: Cyril Tovena Date: Fri, 22 Jan 2021 18:01:06 +0100 Subject: [PATCH] Rename checkpoint proto package to avoid conflict with cortex. (#3217) This will fix the warning in all our binaries. ``` 2021-01-21 16:09:11.947264 I | proto: duplicate proto type registered: ingester.Series ``` Signed-off-by: Cyril Tovena --- pkg/ingester/checkpoint.pb.go | 66 +++++++++++++++++------------------ pkg/ingester/checkpoint.proto | 2 +- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/pkg/ingester/checkpoint.pb.go b/pkg/ingester/checkpoint.pb.go index 08bb8e77da6d..a44fd84b544d 100644 --- a/pkg/ingester/checkpoint.pb.go +++ b/pkg/ingester/checkpoint.pb.go @@ -197,44 +197,44 @@ func (m *Series) GetChunks() []Chunk { } func init() { - proto.RegisterType((*Chunk)(nil), "ingester.Chunk") - proto.RegisterType((*Series)(nil), "ingester.Series") + proto.RegisterType((*Chunk)(nil), "loki_ingester.Chunk") + proto.RegisterType((*Series)(nil), "loki_ingester.Series") } func init() { proto.RegisterFile("pkg/ingester/checkpoint.proto", fileDescriptor_00f4b7152db9bdb5) } var fileDescriptor_00f4b7152db9bdb5 = []byte{ - // 467 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x53, 0xb1, 0x8e, 0xd3, 0x40, - 0x10, 0xf5, 0x26, 0x3e, 0x93, 0xdb, 0x20, 0x21, 0xb6, 0x40, 0xab, 0x48, 0x6c, 0xac, 0xab, 0xd2, - 0x9c, 0x2d, 0x1d, 0x14, 0x54, 0x88, 0x33, 0x08, 0x81, 0x44, 0x81, 0x0c, 0x34, 0x74, 0x8e, 0x3d, - 0xb1, 0x4d, 0x1c, 0xaf, 0xb5, 0xbb, 0x96, 0xa0, 0xe3, 0x13, 0xee, 0x33, 0xf8, 0x94, 0x2b, 0x53, - 0x9e, 0x40, 0x3a, 0x88, 0x23, 0x21, 0xca, 0xfb, 0x04, 0xb4, 0x6b, 0x9b, 0x84, 0x32, 0xd7, 0xcd, - 0x7b, 0xfb, 0xde, 0xcc, 0x78, 0x66, 0x8c, 0x1f, 0x56, 0xcb, 0xd4, 0xcf, 0xcb, 0x14, 0xa4, 0x02, - 0xe1, 0xc7, 0x19, 0xc4, 0xcb, 0x8a, 0xe7, 0xa5, 0xf2, 0x2a, 0xc1, 0x15, 0x27, 0xa3, 0xfe, 0x69, - 0x32, 0x4d, 0x39, 0x4f, 0x0b, 0xf0, 0x0d, 0x3f, 0xaf, 0x17, 0xbe, 0xca, 0x57, 0x20, 0x55, 0xb4, - 0xaa, 0x5a, 0xe9, 0xe4, 0x34, 0xcd, 0x55, 0x56, 0xcf, 0xbd, 0x98, 0xaf, 0xfc, 0x94, 0xa7, 0x7c, - 0xa7, 0xd4, 0xc8, 0x00, 0x13, 0x75, 0xf2, 0x67, 0x7b, 0xf2, 0x98, 0x0b, 0x05, 0x9f, 0x2b, 0xc1, - 0x3f, 0x41, 0xac, 0x3a, 0xe4, 0xff, 0xdf, 0x58, 0x91, 0x43, 0xd9, 0x3f, 0xb5, 0x19, 0x4e, 0x7e, - 0x0c, 0xf0, 0xd1, 0xf3, 0xac, 0x2e, 0x97, 0xe4, 0x09, 0xb6, 0x17, 0x82, 0xaf, 0x28, 0x72, 0xd1, - 0x6c, 0x7c, 0x36, 0xf1, 0xda, 0x56, 0xbd, 0xbe, 0x01, 0xef, 0x7d, 0xdf, 0x6a, 0x30, 0xba, 0xbc, - 0x9e, 0x5a, 0x17, 0x3f, 0xa7, 0x28, 0x34, 0x0e, 0xf2, 0x18, 0x0f, 0x14, 0xa7, 0x83, 0x03, 0x7c, - 0x03, 0xc5, 0x49, 0x80, 0x8f, 0x17, 0x45, 0x2d, 0x33, 0x48, 0xce, 0x15, 0x1d, 0x1e, 0x60, 0xde, - 0xd9, 0xc8, 0x4b, 0x3c, 0x2e, 0x22, 0xa9, 0x3e, 0x54, 0x49, 0xa4, 0x20, 0xa1, 0xf6, 0x01, 0x59, - 0xf6, 0x8d, 0xe4, 0x01, 0x76, 0xe2, 0x82, 0x4b, 0x48, 0xe8, 0x91, 0x8b, 0x66, 0xa3, 0xb0, 0x43, - 0x9a, 0x97, 0x5f, 0xca, 0x18, 0x12, 0xea, 0xb4, 0x7c, 0x8b, 0x08, 0xc1, 0x76, 0x12, 0xa9, 0x88, - 0xde, 0x71, 0xd1, 0xec, 0x6e, 0x68, 0x62, 0xcd, 0x65, 0x10, 0x25, 0x74, 0xd4, 0x72, 0x3a, 0x3e, - 0xf9, 0x8d, 0xb0, 0xf3, 0x0e, 0x44, 0x0e, 0x52, 0xa7, 0xaa, 0x25, 0x88, 0xd7, 0x2f, 0xcc, 0x80, - 0x8f, 0xc3, 0x0e, 0x11, 0x17, 0x8f, 0x17, 0x7a, 0x43, 0xa2, 0x12, 0x79, 0xa9, 0xcc, 0x14, 0xed, - 0x70, 0x9f, 0x22, 0x12, 0x3b, 0x45, 0x34, 0x87, 0x42, 0xd2, 0xa1, 0x3b, 0x9c, 0x8d, 0xcf, 0xee, - 0x7b, 0xdd, 0x06, 0xdf, 0x68, 0xf6, 0x6d, 0x94, 0x8b, 0xe0, 0x95, 0xfe, 0xac, 0xef, 0xd7, 0xd3, - 0xdb, 0xdc, 0x43, 0x9b, 0xe6, 0x3c, 0x89, 0x2a, 0x05, 0x22, 0xec, 0x4a, 0x91, 0x53, 0xec, 0xc4, - 0xfa, 0x2c, 0x24, 0xb5, 0x4d, 0xd1, 0x7b, 0x5e, 0x6f, 0xf3, 0xcc, 0xb9, 0x04, 0xb6, 0x2e, 0x19, - 0x76, 0xa2, 0xe0, 0xe9, 0x7a, 0xc3, 0xac, 0xab, 0x0d, 0xb3, 0x6e, 0x36, 0x0c, 0x7d, 0x6d, 0x18, - 0xfa, 0xd6, 0x30, 0x74, 0xd9, 0x30, 0xb4, 0x6e, 0x18, 0xfa, 0xd5, 0x30, 0xf4, 0xa7, 0x61, 0xd6, - 0x4d, 0xc3, 0xd0, 0xc5, 0x96, 0x59, 0xeb, 0x2d, 0xb3, 0xae, 0xb6, 0xcc, 0xfa, 0xf8, 0xef, 0xc7, - 0x98, 0x3b, 0x66, 0x57, 0x8f, 0xfe, 0x06, 0x00, 0x00, 0xff, 0xff, 0x69, 0x98, 0x4e, 0xed, 0x4a, - 0x03, 0x00, 0x00, + // 473 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x52, 0xb1, 0x8e, 0xd3, 0x40, + 0x10, 0xf5, 0x26, 0x3e, 0x93, 0xdb, 0x40, 0xc1, 0x0a, 0xa1, 0x55, 0x24, 0x36, 0xd6, 0x55, 0x69, + 0xb0, 0xa5, 0x40, 0x41, 0x85, 0x38, 0x83, 0x10, 0x48, 0x14, 0xc8, 0x40, 0x43, 0x83, 0x1c, 0x7b, + 0x62, 0x9b, 0x38, 0x5e, 0x6b, 0x77, 0x2d, 0x41, 0xc7, 0x27, 0xdc, 0x67, 0xf0, 0x29, 0x57, 0xa6, + 0x3c, 0x81, 0x74, 0x10, 0xa7, 0x41, 0xa2, 0xb9, 0x4f, 0x40, 0xbb, 0xb6, 0x75, 0xb9, 0x32, 0x74, + 0xf3, 0xde, 0xcc, 0x7b, 0x33, 0xbb, 0x33, 0xf8, 0x41, 0xb5, 0x4a, 0xfd, 0xbc, 0x4c, 0x41, 0x2a, + 0x10, 0x7e, 0x9c, 0x41, 0xbc, 0xaa, 0x78, 0x5e, 0x2a, 0xaf, 0x12, 0x5c, 0x71, 0x72, 0xa7, 0xe0, + 0xab, 0xfc, 0x53, 0x9f, 0x9f, 0x4c, 0x53, 0xce, 0xd3, 0x02, 0x7c, 0x93, 0x5c, 0xd4, 0x4b, 0x5f, + 0xe5, 0x6b, 0x90, 0x2a, 0x5a, 0x57, 0x6d, 0xfd, 0xe4, 0x61, 0x9a, 0xab, 0xac, 0x5e, 0x78, 0x31, + 0x5f, 0xfb, 0x29, 0x4f, 0xf9, 0x75, 0xa5, 0x46, 0x06, 0x98, 0xa8, 0x2b, 0x7f, 0xb6, 0x57, 0x1e, + 0x73, 0xa1, 0xe0, 0x4b, 0x25, 0xf8, 0x67, 0x88, 0x55, 0x87, 0xfc, 0x9b, 0xd3, 0x15, 0x39, 0x94, + 0x7d, 0xaa, 0x75, 0x38, 0xf9, 0x39, 0xc0, 0x47, 0xcf, 0xb3, 0xba, 0x5c, 0x91, 0x27, 0xd8, 0x5e, + 0x0a, 0xbe, 0xa6, 0xc8, 0x45, 0xb3, 0xf1, 0x7c, 0xe2, 0xb5, 0xa3, 0x7a, 0xfd, 0x00, 0xde, 0xfb, + 0x7e, 0xd4, 0x60, 0x74, 0x7e, 0x39, 0xb5, 0xce, 0x7e, 0x4d, 0x51, 0x68, 0x14, 0xe4, 0x31, 0x1e, + 0x28, 0x4e, 0x07, 0x07, 0xe8, 0x06, 0x8a, 0x93, 0x00, 0x1f, 0x2f, 0x8b, 0x5a, 0x66, 0x90, 0x9c, + 0x2a, 0x3a, 0x3c, 0x40, 0x7c, 0x2d, 0x23, 0x2f, 0xf1, 0xb8, 0x88, 0xa4, 0xfa, 0x50, 0x25, 0x91, + 0x82, 0x84, 0xda, 0x07, 0xb8, 0xec, 0x0b, 0xc9, 0x7d, 0xec, 0xc4, 0x05, 0x97, 0x90, 0xd0, 0x23, + 0x17, 0xcd, 0x46, 0x61, 0x87, 0x34, 0x2f, 0xbf, 0x96, 0x31, 0x24, 0xd4, 0x69, 0xf9, 0x16, 0x11, + 0x82, 0xed, 0x24, 0x52, 0x11, 0xbd, 0xe5, 0xa2, 0xd9, 0xed, 0xd0, 0xc4, 0x9a, 0xcb, 0x20, 0x4a, + 0xe8, 0xa8, 0xe5, 0x74, 0x7c, 0xf2, 0x17, 0x61, 0xe7, 0x1d, 0x88, 0x1c, 0xa4, 0xb6, 0xaa, 0x25, + 0x88, 0xd7, 0x2f, 0xcc, 0x07, 0x1f, 0x87, 0x1d, 0x22, 0x2e, 0x1e, 0x2f, 0xf5, 0x86, 0x44, 0x25, + 0xf2, 0x52, 0x99, 0x5f, 0xb4, 0xc3, 0x7d, 0x8a, 0x48, 0xec, 0x14, 0xd1, 0x02, 0x0a, 0x49, 0x87, + 0xee, 0x70, 0x36, 0x9e, 0xdf, 0xf5, 0xba, 0x0d, 0xbe, 0xd1, 0xec, 0xdb, 0x28, 0x17, 0xc1, 0x2b, + 0xfd, 0xac, 0x1f, 0x97, 0xd3, 0xff, 0xb9, 0x87, 0xd6, 0xe6, 0x34, 0x89, 0x2a, 0x05, 0x22, 0xec, + 0x5a, 0x91, 0x39, 0x76, 0x62, 0x7d, 0x16, 0x92, 0xda, 0xa6, 0xe9, 0x3d, 0xef, 0xc6, 0x25, 0x7b, + 0xe6, 0x66, 0x02, 0x5b, 0xf7, 0x0d, 0xbb, 0xca, 0xe0, 0xe9, 0x66, 0xcb, 0xac, 0x8b, 0x2d, 0xb3, + 0xae, 0xb6, 0x0c, 0x7d, 0x6b, 0x18, 0xfa, 0xde, 0x30, 0x74, 0xde, 0x30, 0xb4, 0x69, 0x18, 0xfa, + 0xdd, 0x30, 0xf4, 0xa7, 0x61, 0xd6, 0x55, 0xc3, 0xd0, 0xd9, 0x8e, 0x59, 0x9b, 0x1d, 0xb3, 0x2e, + 0x76, 0xcc, 0xfa, 0x38, 0xea, 0x3d, 0x17, 0x8e, 0x59, 0xd8, 0xa3, 0x7f, 0x01, 0x00, 0x00, 0xff, + 0xff, 0xba, 0x57, 0x6a, 0x42, 0x54, 0x03, 0x00, 0x00, } func (this *Chunk) Equal(that interface{}) bool { diff --git a/pkg/ingester/checkpoint.proto b/pkg/ingester/checkpoint.proto index 692ec7c50a44..46553d1df36c 100644 --- a/pkg/ingester/checkpoint.proto +++ b/pkg/ingester/checkpoint.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package ingester; +package loki_ingester; option go_package = "ingester";