diff --git a/prompb/types.pb.go b/prompb/types.pb.go index 06faef157c..31dc6567c1 100644 --- a/prompb/types.pb.go +++ b/prompb/types.pb.go @@ -776,7 +776,7 @@ type TimeSeries struct { Samples []Sample `protobuf:"bytes,2,rep,name=samples,proto3" json:"samples"` Exemplars []Exemplar `protobuf:"bytes,3,rep,name=exemplars,proto3" json:"exemplars"` Histograms []Histogram `protobuf:"bytes,4,rep,name=histograms,proto3" json:"histograms"` - Metadatas []Metadata `protobuf:"bytes,5,rep,name=metadatas,proto3" json:"metadatas"` + Metadata Metadata `protobuf:"bytes,5,opt,name=metadata,proto3" json:"metadata"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -843,11 +843,11 @@ func (m *TimeSeries) GetHistograms() []Histogram { return nil } -func (m *TimeSeries) GetMetadatas() []Metadata { +func (m *TimeSeries) GetMetadata() Metadata { if m != nil { - return m.Metadatas + return m.Metadata } - return nil + return Metadata{} } type Label struct { @@ -1266,78 +1266,78 @@ func init() { func init() { proto.RegisterFile("types.proto", fileDescriptor_d938547f84707355) } var fileDescriptor_d938547f84707355 = []byte{ - // 1126 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0xdd, 0x6e, 0x1b, 0x45, - 0x14, 0xce, 0xee, 0xda, 0x6b, 0xef, 0xf1, 0x4f, 0x36, 0x43, 0x5a, 0x96, 0x88, 0xa6, 0x61, 0xa5, - 0x82, 0x85, 0x90, 0xa3, 0xa6, 0x5c, 0x50, 0x51, 0x21, 0x25, 0xa9, 0xf3, 0x23, 0xb2, 0xb6, 0x3a, - 0x76, 0x04, 0xe5, 0xc6, 0x9a, 0xd8, 0x13, 0x7b, 0xd5, 0xfd, 0x63, 0x67, 0x5c, 0xc5, 0xbc, 0x07, - 0x77, 0x5c, 0xf1, 0x06, 0xbc, 0x45, 0x25, 0x6e, 0xe0, 0x05, 0x10, 0xca, 0x93, 0xa0, 0x99, 0xfd, - 0x75, 0xdc, 0x4a, 0x94, 0x2b, 0xee, 0xf6, 0x9c, 0xf3, 0x9d, 0x39, 0xdf, 0x9c, 0x39, 0x3f, 0x0b, - 0x0d, 0xbe, 0x8c, 0x28, 0xeb, 0x46, 0x71, 0xc8, 0x43, 0x04, 0x51, 0x1c, 0xfa, 0x94, 0xcf, 0xe9, - 0x82, 0xed, 0x6c, 0xcf, 0xc2, 0x59, 0x28, 0xd5, 0xfb, 0xe2, 0x2b, 0x41, 0xd8, 0xbf, 0xa8, 0xd0, - 0x76, 0x28, 0x8f, 0xdd, 0x89, 0x43, 0x39, 0x99, 0x12, 0x4e, 0xd0, 0x53, 0xa8, 0x88, 0x33, 0x2c, - 0x65, 0x4f, 0xe9, 0xb4, 0x0f, 0x1e, 0x75, 0x8b, 0x33, 0xba, 0xab, 0xc8, 0x54, 0x1c, 0x2d, 0x23, - 0x8a, 0xa5, 0x0b, 0xfa, 0x02, 0x90, 0x2f, 0x75, 0xe3, 0x6b, 0xe2, 0xbb, 0xde, 0x72, 0x1c, 0x10, - 0x9f, 0x5a, 0xea, 0x9e, 0xd2, 0x31, 0xb0, 0x99, 0x58, 0x4e, 0xa4, 0xa1, 0x4f, 0x7c, 0x8a, 0x10, - 0x54, 0xe6, 0xd4, 0x8b, 0xac, 0x8a, 0xb4, 0xcb, 0x6f, 0xa1, 0x5b, 0x04, 0x2e, 0xb7, 0xaa, 0x89, - 0x4e, 0x7c, 0xdb, 0x4b, 0x80, 0x22, 0x12, 0x6a, 0x40, 0xed, 0xb2, 0xff, 0x6d, 0x7f, 0xf0, 0x5d, - 0xdf, 0xdc, 0x10, 0xc2, 0xf1, 0xe0, 0xb2, 0x3f, 0xea, 0x61, 0x53, 0x41, 0x06, 0x54, 0x4f, 0x0f, - 0x2f, 0x4f, 0x7b, 0xa6, 0x8a, 0x5a, 0x60, 0x9c, 0x9d, 0x0f, 0x47, 0x83, 0x53, 0x7c, 0xe8, 0x98, - 0x1a, 0x42, 0xd0, 0x96, 0x96, 0x42, 0x57, 0x11, 0xae, 0xc3, 0x4b, 0xc7, 0x39, 0xc4, 0x2f, 0xcd, - 0x2a, 0xaa, 0x43, 0xe5, 0xbc, 0x7f, 0x32, 0x30, 0x75, 0xd4, 0x84, 0xfa, 0x70, 0x74, 0x38, 0xea, - 0x0d, 0x7b, 0x23, 0xb3, 0x66, 0xdf, 0x2a, 0x50, 0xcf, 0x13, 0xf3, 0x64, 0x25, 0x31, 0x0f, 0xef, - 0x24, 0xe6, 0x1d, 0x29, 0xc9, 0x2e, 0xa9, 0xbe, 0xe5, 0x92, 0xda, 0xff, 0xe3, 0x92, 0xcf, 0x40, - 0x1f, 0x12, 0x3f, 0xf2, 0x28, 0xda, 0x86, 0xea, 0x6b, 0xe2, 0x2d, 0x92, 0x2b, 0x2a, 0x38, 0x11, - 0xd0, 0xc7, 0x60, 0x70, 0xd7, 0xa7, 0x8c, 0x13, 0x3f, 0xb9, 0x87, 0x86, 0x0b, 0x85, 0x1d, 0x42, - 0xbd, 0x77, 0x43, 0xfd, 0xc8, 0x23, 0x31, 0xda, 0x07, 0xdd, 0x23, 0x57, 0xd4, 0x63, 0x96, 0xb2, - 0xa7, 0x75, 0x1a, 0x07, 0x5b, 0xe5, 0x1c, 0x5d, 0x08, 0xcb, 0x51, 0xe5, 0xcd, 0x5f, 0x0f, 0x37, - 0x70, 0x0a, 0x2b, 0x02, 0xaa, 0xef, 0x0c, 0xa8, 0xdd, 0x0d, 0xf8, 0x7b, 0x15, 0x8c, 0x33, 0x97, - 0xf1, 0x70, 0x16, 0x13, 0x1f, 0x3d, 0x00, 0x63, 0x12, 0x2e, 0x02, 0x3e, 0x76, 0x03, 0x2e, 0x69, - 0x57, 0xce, 0x36, 0x70, 0x5d, 0xaa, 0xce, 0x03, 0x8e, 0x3e, 0x81, 0x46, 0x62, 0xbe, 0xf6, 0x42, - 0xc2, 0x93, 0x30, 0x67, 0x1b, 0x18, 0xa4, 0xf2, 0x44, 0xe8, 0x90, 0x09, 0x1a, 0x5b, 0xf8, 0x32, - 0x8e, 0x82, 0xc5, 0x27, 0xba, 0x0f, 0x3a, 0x9b, 0xcc, 0xa9, 0x4f, 0x64, 0x69, 0x6e, 0xe1, 0x54, - 0x42, 0x8f, 0xa0, 0xfd, 0x13, 0x8d, 0xc3, 0x31, 0x9f, 0xc7, 0x94, 0xcd, 0x43, 0x6f, 0x2a, 0xcb, - 0x54, 0xc1, 0x2d, 0xa1, 0x1d, 0x65, 0x4a, 0xf4, 0x69, 0x0a, 0x2b, 0x78, 0xe9, 0x92, 0x97, 0x82, - 0x9b, 0x42, 0x7f, 0x9c, 0x71, 0xfb, 0x1c, 0xcc, 0x12, 0x2e, 0x21, 0x58, 0x93, 0x04, 0x15, 0xdc, - 0xce, 0x91, 0x09, 0xc9, 0x63, 0x68, 0x07, 0x74, 0x46, 0xb8, 0xfb, 0x9a, 0x8e, 0x59, 0x44, 0x02, - 0x66, 0xd5, 0x65, 0x86, 0xef, 0x97, 0x33, 0x7c, 0xb4, 0x98, 0xbc, 0xa2, 0x7c, 0x18, 0x91, 0x20, - 0x4d, 0x73, 0x2b, 0xf3, 0x11, 0x3a, 0x86, 0x3e, 0x83, 0xcd, 0xfc, 0x90, 0x29, 0xf5, 0x38, 0x61, - 0x96, 0xb1, 0xa7, 0x75, 0x10, 0xce, 0xcf, 0x7e, 0x2e, 0xb5, 0x2b, 0x40, 0xc9, 0x8e, 0x59, 0xb0, - 0xa7, 0x75, 0x94, 0x02, 0x28, 0xa9, 0x31, 0x41, 0x2b, 0x0a, 0x99, 0x5b, 0xa2, 0xd5, 0xf8, 0x37, - 0xb4, 0x32, 0x9f, 0x9c, 0x56, 0x7e, 0x48, 0x4a, 0xab, 0x99, 0xd0, 0xca, 0xd4, 0x05, 0xad, 0x1c, - 0x98, 0xd2, 0x6a, 0x25, 0xb4, 0x32, 0x75, 0x4a, 0xeb, 0x1b, 0x80, 0x98, 0x32, 0xca, 0xc7, 0x73, - 0x91, 0xfd, 0xf6, 0x7a, 0xbf, 0xe6, 0xf5, 0xd3, 0xc5, 0x02, 0x77, 0xe6, 0x06, 0x1c, 0x1b, 0x71, - 0xf6, 0xb9, 0x5a, 0x80, 0x9b, 0x77, 0x0b, 0xf0, 0x4b, 0x30, 0x72, 0xaf, 0xd5, 0x4e, 0xad, 0x81, - 0xf6, 0xb2, 0x37, 0x34, 0x15, 0xa4, 0x83, 0xda, 0x1f, 0x98, 0x6a, 0xd1, 0xad, 0xda, 0x51, 0x0d, - 0xaa, 0x92, 0xf3, 0x51, 0x13, 0xa0, 0x78, 0x76, 0xfb, 0x19, 0x40, 0x91, 0x1f, 0x51, 0x79, 0xe1, - 0xf5, 0x35, 0xa3, 0x49, 0x29, 0x6f, 0xe1, 0x54, 0x12, 0x7a, 0x8f, 0x06, 0x33, 0x3e, 0x97, 0x15, - 0xdc, 0xc2, 0xa9, 0x64, 0xff, 0xaa, 0x02, 0x8c, 0x5c, 0x9f, 0x0e, 0x69, 0xec, 0x52, 0xf6, 0xfe, - 0xfd, 0x77, 0x00, 0x35, 0x26, 0x5b, 0x9f, 0x59, 0xaa, 0xf4, 0x40, 0x65, 0x8f, 0x64, 0x2a, 0xa4, - 0x2e, 0x19, 0x10, 0x7d, 0x05, 0x06, 0x4d, 0x1b, 0x9e, 0x59, 0x9a, 0xf4, 0xda, 0x2e, 0x7b, 0x65, - 0xd3, 0x20, 0xf5, 0x2b, 0xc0, 0xe8, 0x6b, 0x80, 0x79, 0x96, 0x78, 0x66, 0x55, 0xa4, 0xeb, 0xbd, - 0xb7, 0x3e, 0x4b, 0xea, 0x5b, 0x82, 0x8b, 0xb0, 0x7e, 0x3a, 0x65, 0x99, 0x55, 0x5d, 0x0f, 0x9b, - 0x8d, 0xe0, 0x2c, 0x6c, 0x0e, 0xb6, 0x1f, 0x43, 0x55, 0xde, 0x5d, 0xcc, 0x5d, 0xb9, 0x90, 0x94, - 0x64, 0xee, 0x8a, 0xef, 0xd5, 0x09, 0x64, 0xa4, 0x13, 0xc8, 0x7e, 0x0a, 0xfa, 0x45, 0x92, 0xa1, - 0xf7, 0x4d, 0xa9, 0xfd, 0xb3, 0x02, 0x4d, 0xa9, 0x77, 0x08, 0x9f, 0xcc, 0x69, 0x8c, 0x1e, 0xaf, - 0xac, 0x8d, 0x07, 0x6b, 0xfe, 0x29, 0xae, 0xbb, 0xba, 0x34, 0x4a, 0x9b, 0xf3, 0x0e, 0x51, 0xad, - 0x4c, 0xb4, 0x03, 0x15, 0xb9, 0x30, 0x74, 0x50, 0x7b, 0x2f, 0x92, 0x0a, 0xec, 0xf7, 0x5e, 0x24, - 0x15, 0x88, 0xc5, 0x92, 0x10, 0x0a, 0xdc, 0x33, 0x35, 0xfb, 0x37, 0x45, 0x94, 0x2d, 0x99, 0x8a, - 0xaa, 0x65, 0xe8, 0x43, 0xa8, 0x31, 0x4e, 0xa3, 0xb1, 0xcf, 0x24, 0x2f, 0x0d, 0xeb, 0x42, 0x74, - 0x98, 0x08, 0x7d, 0xbd, 0x08, 0x26, 0x59, 0x68, 0xf1, 0x8d, 0x3e, 0x82, 0x3a, 0xe3, 0x24, 0xe6, - 0x02, 0x9d, 0x8c, 0xe3, 0x9a, 0x94, 0x1d, 0x86, 0xee, 0x81, 0x4e, 0x83, 0xe9, 0x58, 0x3e, 0xa7, - 0x30, 0x54, 0x69, 0x30, 0x75, 0x18, 0xda, 0x81, 0xfa, 0x2c, 0x0e, 0x17, 0x91, 0x1b, 0xcc, 0xe4, - 0x5b, 0x19, 0x38, 0x97, 0x51, 0x1b, 0xd4, 0xab, 0xa5, 0x1c, 0x89, 0x75, 0xac, 0x5e, 0x2d, 0xc5, - 0xe9, 0x31, 0x09, 0x66, 0x54, 0x1c, 0x52, 0x4b, 0x4e, 0x97, 0xb2, 0xc3, 0xec, 0x3f, 0x15, 0xa8, - 0x1e, 0xcf, 0x17, 0xc1, 0x2b, 0xb4, 0x0b, 0x0d, 0xdf, 0x0d, 0xc6, 0xa2, 0x09, 0x0b, 0xce, 0x86, - 0xef, 0x06, 0xa2, 0xfa, 0x1d, 0x26, 0xed, 0xe4, 0x26, 0xb7, 0xa7, 0x5b, 0xca, 0x27, 0x37, 0xa9, - 0xbd, 0x9b, 0x3e, 0x82, 0x26, 0x1f, 0x61, 0xa7, 0xfc, 0x08, 0x32, 0x40, 0xb7, 0x17, 0x4c, 0xc2, - 0xa9, 0x1b, 0xcc, 0x8a, 0x17, 0x10, 0xc5, 0x23, 0x6f, 0xd5, 0xc4, 0xf2, 0xdb, 0x7e, 0x0e, 0xf5, - 0x0c, 0xb5, 0xd6, 0xf6, 0xdf, 0x0f, 0xc4, 0x72, 0x5e, 0xd9, 0xc8, 0x2a, 0xfa, 0x00, 0x36, 0x4f, - 0x2e, 0x06, 0x87, 0xa3, 0x71, 0x69, 0x4d, 0xdb, 0x3f, 0x42, 0x4b, 0x46, 0xa4, 0xd3, 0xff, 0xda, - 0xb4, 0xfb, 0xa0, 0x4f, 0xc4, 0x09, 0x59, 0xcf, 0x6e, 0xad, 0xdd, 0x26, 0x73, 0x48, 0x60, 0x47, - 0xdb, 0x6f, 0x6e, 0x77, 0x95, 0x3f, 0x6e, 0x77, 0x95, 0xbf, 0x6f, 0x77, 0x95, 0x1f, 0x74, 0x81, - 0x8e, 0xae, 0xae, 0x74, 0xf9, 0x07, 0xf8, 0xe4, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc6, 0xb0, - 0xf6, 0x08, 0x32, 0x0a, 0x00, 0x00, + // 1130 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0xdb, 0x6e, 0xdb, 0x46, + 0x13, 0x36, 0x49, 0x89, 0x12, 0x47, 0x07, 0xd3, 0xfb, 0x3b, 0xf9, 0x59, 0xa3, 0x71, 0x54, 0x02, + 0x69, 0x85, 0xa2, 0x90, 0x11, 0xa7, 0x28, 0x1a, 0x34, 0x28, 0x60, 0x3b, 0xf2, 0x01, 0x35, 0x25, + 0x64, 0x25, 0xa3, 0x4d, 0x6f, 0x84, 0xb5, 0xb4, 0x96, 0x88, 0xf0, 0x54, 0xee, 0x2a, 0xb0, 0xfa, + 0x1e, 0xbd, 0xeb, 0x45, 0x5f, 0xa1, 0x6f, 0x11, 0xa0, 0x37, 0xed, 0x0b, 0x14, 0x85, 0x9f, 0xa4, + 0xd8, 0xe5, 0x51, 0x76, 0x02, 0x34, 0xbd, 0xea, 0xdd, 0xce, 0xcc, 0x37, 0x3b, 0xdf, 0x0e, 0xe7, + 0x40, 0x68, 0xf0, 0x55, 0x44, 0x59, 0x2f, 0x8a, 0x43, 0x1e, 0x22, 0x88, 0xe2, 0xd0, 0xa7, 0x7c, + 0x41, 0x97, 0x6c, 0x67, 0x7b, 0x1e, 0xce, 0x43, 0xa9, 0xde, 0x13, 0xa7, 0x04, 0x61, 0xff, 0xac, + 0x42, 0xdb, 0xa1, 0x3c, 0x76, 0xa7, 0x0e, 0xe5, 0x64, 0x46, 0x38, 0x41, 0x4f, 0xa1, 0x22, 0xee, + 0xb0, 0x94, 0x8e, 0xd2, 0x6d, 0xef, 0x3f, 0xea, 0x15, 0x77, 0xf4, 0xd6, 0x91, 0xa9, 0x38, 0x5e, + 0x45, 0x14, 0x4b, 0x17, 0xf4, 0x19, 0x20, 0x5f, 0xea, 0x26, 0x57, 0xc4, 0x77, 0xbd, 0xd5, 0x24, + 0x20, 0x3e, 0xb5, 0xd4, 0x8e, 0xd2, 0x35, 0xb0, 0x99, 0x58, 0x8e, 0xa5, 0x61, 0x40, 0x7c, 0x8a, + 0x10, 0x54, 0x16, 0xd4, 0x8b, 0xac, 0x8a, 0xb4, 0xcb, 0xb3, 0xd0, 0x2d, 0x03, 0x97, 0x5b, 0xd5, + 0x44, 0x27, 0xce, 0xf6, 0x0a, 0xa0, 0x88, 0x84, 0x1a, 0x50, 0xbb, 0x18, 0x7c, 0x33, 0x18, 0x7e, + 0x3b, 0x30, 0x37, 0x84, 0x70, 0x34, 0xbc, 0x18, 0x8c, 0xfb, 0xd8, 0x54, 0x90, 0x01, 0xd5, 0x93, + 0x83, 0x8b, 0x93, 0xbe, 0xa9, 0xa2, 0x16, 0x18, 0xa7, 0x67, 0xa3, 0xf1, 0xf0, 0x04, 0x1f, 0x38, + 0xa6, 0x86, 0x10, 0xb4, 0xa5, 0xa5, 0xd0, 0x55, 0x84, 0xeb, 0xe8, 0xc2, 0x71, 0x0e, 0xf0, 0x4b, + 0xb3, 0x8a, 0xea, 0x50, 0x39, 0x1b, 0x1c, 0x0f, 0x4d, 0x1d, 0x35, 0xa1, 0x3e, 0x1a, 0x1f, 0x8c, + 0xfb, 0xa3, 0xfe, 0xd8, 0xac, 0xd9, 0x37, 0x0a, 0xd4, 0xf3, 0xc4, 0x3c, 0x59, 0x4b, 0xcc, 0xc3, + 0x5b, 0x89, 0x79, 0x47, 0x4a, 0xb2, 0x47, 0xaa, 0x6f, 0x79, 0xa4, 0xf6, 0xdf, 0x78, 0xe4, 0x33, + 0xd0, 0x47, 0xc4, 0x8f, 0x3c, 0x8a, 0xb6, 0xa1, 0xfa, 0x9a, 0x78, 0xcb, 0xe4, 0x89, 0x0a, 0x4e, + 0x04, 0xf4, 0x21, 0x18, 0xdc, 0xf5, 0x29, 0xe3, 0xc4, 0x4f, 0xde, 0xa1, 0xe1, 0x42, 0x61, 0x87, + 0x50, 0xef, 0x5f, 0x53, 0x3f, 0xf2, 0x48, 0x8c, 0xf6, 0x40, 0xf7, 0xc8, 0x25, 0xf5, 0x98, 0xa5, + 0x74, 0xb4, 0x6e, 0x63, 0x7f, 0xab, 0x9c, 0xa3, 0x73, 0x61, 0x39, 0xac, 0xbc, 0xf9, 0xf3, 0xe1, + 0x06, 0x4e, 0x61, 0x45, 0x40, 0xf5, 0x9d, 0x01, 0xb5, 0xdb, 0x01, 0x7f, 0xab, 0x82, 0x71, 0xea, + 0x32, 0x1e, 0xce, 0x63, 0xe2, 0xa3, 0x07, 0x60, 0x4c, 0xc3, 0x65, 0xc0, 0x27, 0x6e, 0xc0, 0x25, + 0xed, 0xca, 0xe9, 0x06, 0xae, 0x4b, 0xd5, 0x59, 0xc0, 0xd1, 0x47, 0xd0, 0x48, 0xcc, 0x57, 0x5e, + 0x48, 0x78, 0x12, 0xe6, 0x74, 0x03, 0x83, 0x54, 0x1e, 0x0b, 0x1d, 0x32, 0x41, 0x63, 0x4b, 0x5f, + 0xc6, 0x51, 0xb0, 0x38, 0xa2, 0xfb, 0xa0, 0xb3, 0xe9, 0x82, 0xfa, 0x44, 0x96, 0xe6, 0x16, 0x4e, + 0x25, 0xf4, 0x08, 0xda, 0x3f, 0xd2, 0x38, 0x9c, 0xf0, 0x45, 0x4c, 0xd9, 0x22, 0xf4, 0x66, 0xb2, + 0x4c, 0x15, 0xdc, 0x12, 0xda, 0x71, 0xa6, 0x44, 0x1f, 0xa7, 0xb0, 0x82, 0x97, 0x2e, 0x79, 0x29, + 0xb8, 0x29, 0xf4, 0x47, 0x19, 0xb7, 0x4f, 0xc1, 0x2c, 0xe1, 0x12, 0x82, 0x35, 0x49, 0x50, 0xc1, + 0xed, 0x1c, 0x99, 0x90, 0x3c, 0x82, 0x76, 0x40, 0xe7, 0x84, 0xbb, 0xaf, 0xe9, 0x84, 0x45, 0x24, + 0x60, 0x56, 0x5d, 0x66, 0xf8, 0x7e, 0x39, 0xc3, 0x87, 0xcb, 0xe9, 0x2b, 0xca, 0x47, 0x11, 0x09, + 0xd2, 0x34, 0xb7, 0x32, 0x1f, 0xa1, 0x63, 0xe8, 0x13, 0xd8, 0xcc, 0x2f, 0x99, 0x51, 0x8f, 0x13, + 0x66, 0x19, 0x1d, 0xad, 0x8b, 0x70, 0x7e, 0xf7, 0x73, 0xa9, 0x5d, 0x03, 0x4a, 0x76, 0xcc, 0x82, + 0x8e, 0xd6, 0x55, 0x0a, 0xa0, 0xa4, 0xc6, 0x04, 0xad, 0x28, 0x64, 0x6e, 0x89, 0x56, 0xe3, 0x9f, + 0xd0, 0xca, 0x7c, 0x72, 0x5a, 0xf9, 0x25, 0x29, 0xad, 0x66, 0x42, 0x2b, 0x53, 0x17, 0xb4, 0x72, + 0x60, 0x4a, 0xab, 0x95, 0xd0, 0xca, 0xd4, 0x29, 0xad, 0xaf, 0x01, 0x62, 0xca, 0x28, 0x9f, 0x2c, + 0x44, 0xf6, 0xdb, 0x77, 0xfb, 0x35, 0xaf, 0x9f, 0x1e, 0x16, 0xb8, 0x53, 0x37, 0xe0, 0xd8, 0x88, + 0xb3, 0xe3, 0x7a, 0x01, 0x6e, 0xde, 0x2e, 0xc0, 0xcf, 0xc1, 0xc8, 0xbd, 0xd6, 0x3b, 0xb5, 0x06, + 0xda, 0xcb, 0xfe, 0xc8, 0x54, 0x90, 0x0e, 0xea, 0x60, 0x68, 0xaa, 0x45, 0xb7, 0x6a, 0x87, 0x35, + 0xa8, 0x4a, 0xce, 0x87, 0x4d, 0x80, 0xe2, 0xb3, 0xdb, 0xcf, 0x00, 0x8a, 0xfc, 0x88, 0xca, 0x0b, + 0xaf, 0xae, 0x18, 0x4d, 0x4a, 0x79, 0x0b, 0xa7, 0x92, 0xd0, 0x7b, 0x34, 0x98, 0xf3, 0x85, 0xac, + 0xe0, 0x16, 0x4e, 0x25, 0xfb, 0x17, 0x15, 0x60, 0xec, 0xfa, 0x74, 0x44, 0x63, 0x97, 0xb2, 0xf7, + 0xef, 0xbf, 0x7d, 0xa8, 0x31, 0xd9, 0xfa, 0xcc, 0x52, 0xa5, 0x07, 0x2a, 0x7b, 0x24, 0x53, 0x21, + 0x75, 0xc9, 0x80, 0xe8, 0x4b, 0x30, 0x68, 0xda, 0xf0, 0xcc, 0xd2, 0xa4, 0xd7, 0x76, 0xd9, 0x2b, + 0x9b, 0x06, 0xa9, 0x5f, 0x01, 0x46, 0x5f, 0x01, 0x2c, 0xb2, 0xc4, 0x33, 0xab, 0x22, 0x5d, 0xef, + 0xbd, 0xf5, 0xb3, 0xa4, 0xbe, 0x25, 0x38, 0xfa, 0x02, 0xea, 0x7e, 0x3a, 0x65, 0x65, 0xdb, 0xdd, + 0x8a, 0x9a, 0x4d, 0xe0, 0xd4, 0x33, 0xc7, 0xda, 0x8f, 0xa1, 0x2a, 0x5f, 0x2e, 0xa6, 0xae, 0x5c, + 0x47, 0x4a, 0x32, 0x75, 0xc5, 0x79, 0x7d, 0xfe, 0x18, 0xe9, 0xfc, 0xb1, 0x9f, 0x82, 0x7e, 0x9e, + 0xe4, 0xe7, 0x7d, 0x13, 0x6a, 0xff, 0xa4, 0x40, 0x53, 0xea, 0x1d, 0xc2, 0xa7, 0x0b, 0x1a, 0xa3, + 0xc7, 0x6b, 0x4b, 0xe3, 0xc1, 0x1d, 0xff, 0x14, 0xd7, 0x5b, 0x5f, 0x19, 0xa5, 0xbd, 0x79, 0x8b, + 0xa8, 0x56, 0x26, 0xda, 0x85, 0x8a, 0x5c, 0x17, 0x3a, 0xa8, 0xfd, 0x17, 0x49, 0xfd, 0x0d, 0xfa, + 0x2f, 0x92, 0xfa, 0xc3, 0x62, 0x45, 0x08, 0x05, 0xee, 0x9b, 0x9a, 0xfd, 0xab, 0x22, 0x8a, 0x96, + 0xcc, 0x44, 0xcd, 0x32, 0xf4, 0x7f, 0xa8, 0x31, 0x4e, 0xa3, 0x89, 0xcf, 0x24, 0x2f, 0x0d, 0xeb, + 0x42, 0x74, 0x98, 0x08, 0x7d, 0xb5, 0x0c, 0xa6, 0x59, 0x68, 0x71, 0x46, 0x1f, 0x40, 0x9d, 0x71, + 0x12, 0x73, 0x81, 0x4e, 0x86, 0x71, 0x4d, 0xca, 0x0e, 0x43, 0xf7, 0x40, 0xa7, 0xc1, 0x6c, 0x22, + 0x3f, 0xa6, 0x30, 0x54, 0x69, 0x30, 0x73, 0x18, 0xda, 0x81, 0xfa, 0x3c, 0x0e, 0x97, 0x91, 0x1b, + 0xcc, 0xad, 0x6a, 0x47, 0xeb, 0x1a, 0x38, 0x97, 0x51, 0x1b, 0xd4, 0xcb, 0x95, 0x1c, 0x88, 0x75, + 0xac, 0x5e, 0xae, 0xc4, 0xed, 0x31, 0x09, 0xe6, 0x54, 0x5c, 0x52, 0x4b, 0x6e, 0x97, 0xb2, 0xc3, + 0xec, 0x3f, 0x14, 0xa8, 0x1e, 0x2d, 0x96, 0xc1, 0x2b, 0xb4, 0x0b, 0x0d, 0xdf, 0x0d, 0x26, 0xa2, + 0x05, 0x0b, 0xce, 0x86, 0xef, 0x06, 0xa2, 0xf6, 0x1d, 0x26, 0xed, 0xe4, 0x3a, 0xb7, 0xa7, 0x3b, + 0xca, 0x27, 0xd7, 0xa9, 0xbd, 0x97, 0x7e, 0x04, 0x4d, 0x7e, 0x84, 0x9d, 0xf2, 0x47, 0x90, 0x01, + 0x7a, 0xfd, 0x60, 0x1a, 0xce, 0xdc, 0x60, 0x5e, 0x7c, 0x01, 0x59, 0x67, 0xe2, 0x55, 0x4d, 0x2c, + 0xcf, 0xf6, 0x73, 0xa8, 0x67, 0xa8, 0x3b, 0x4d, 0xff, 0xdd, 0x50, 0xac, 0xe6, 0xb5, 0x7d, 0xac, + 0xa2, 0xff, 0xc1, 0xe6, 0xf1, 0xf9, 0xf0, 0x60, 0x3c, 0x29, 0x2d, 0x69, 0xfb, 0x07, 0x68, 0xc9, + 0x88, 0x74, 0xf6, 0x6f, 0x5b, 0x76, 0x0f, 0xf4, 0xa9, 0xb8, 0x21, 0xeb, 0xd8, 0xad, 0x3b, 0xaf, + 0xc9, 0x1c, 0x12, 0xd8, 0xe1, 0xf6, 0x9b, 0x9b, 0x5d, 0xe5, 0xf7, 0x9b, 0x5d, 0xe5, 0xaf, 0x9b, + 0x5d, 0xe5, 0x7b, 0x5d, 0xa0, 0xa3, 0xcb, 0x4b, 0x5d, 0xfe, 0xff, 0x3d, 0xf9, 0x3b, 0x00, 0x00, + 0xff, 0xff, 0xbd, 0xa4, 0x41, 0x7d, 0x30, 0x0a, 0x00, 0x00, } func (m *MetricMetadata) Marshal() (dAtA []byte, err error) { @@ -1798,20 +1798,16 @@ func (m *TimeSeries) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - if len(m.Metadatas) > 0 { - for iNdEx := len(m.Metadatas) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Metadatas[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x2a + { + size, err := m.Metadata.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0x2a if len(m.Histograms) > 0 { for iNdEx := len(m.Histograms) - 1; iNdEx >= 0; iNdEx-- { { @@ -2428,12 +2424,8 @@ func (m *TimeSeries) Size() (n int) { n += 1 + l + sovTypes(uint64(l)) } } - if len(m.Metadatas) > 0 { - for _, e := range m.Metadatas { - l = e.Size() - n += 1 + l + sovTypes(uint64(l)) - } - } + l = m.Metadata.Size() + n += 1 + l + sovTypes(uint64(l)) if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -3873,7 +3865,7 @@ func (m *TimeSeries) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 5: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Metadatas", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Metadata", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -3900,8 +3892,7 @@ func (m *TimeSeries) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Metadatas = append(m.Metadatas, Metadata{}) - if err := m.Metadatas[len(m.Metadatas)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Metadata.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/prompb/types.proto b/prompb/types.proto index c0cd78e877..1b5e513c21 100644 --- a/prompb/types.proto +++ b/prompb/types.proto @@ -147,7 +147,7 @@ message TimeSeries { repeated Sample samples = 2 [(gogoproto.nullable) = false]; repeated Exemplar exemplars = 3 [(gogoproto.nullable) = false]; repeated Histogram histograms = 4 [(gogoproto.nullable) = false]; - repeated Metadata metadatas = 5 [(gogoproto.nullable) = false]; + Metadata metadata = 5 [(gogoproto.nullable) = false]; } message Label { diff --git a/storage/remote/codec_test.go b/storage/remote/codec_test.go index 436752d3f1..252eb66bdf 100644 --- a/storage/remote/codec_test.go +++ b/storage/remote/codec_test.go @@ -57,7 +57,7 @@ var writeRequestFixture = &prompb.WriteRequest{ Samples: []prompb.Sample{{Value: 1, Timestamp: 0}}, Exemplars: []prompb.Exemplar{{Labels: []prompb.Label{{Name: "f", Value: "g"}}, Value: 1, Timestamp: 0}}, Histograms: []prompb.Histogram{HistogramToHistogramProto(0, &testHistogram), FloatHistogramToHistogramProto(1, testHistogram.ToFloat())}, - Metadatas: []prompb.Metadata{{Type: prompb.Metadata_COUNTER, Help: "help text 1", Unit: "unit text 1"}}, + Metadata: prompb.Metadata{Type: prompb.Metadata_COUNTER, Help: "help text 1", Unit: "unit text 1"}, }, { Labels: []prompb.Label{ @@ -70,7 +70,7 @@ var writeRequestFixture = &prompb.WriteRequest{ Samples: []prompb.Sample{{Value: 2, Timestamp: 1}}, Exemplars: []prompb.Exemplar{{Labels: []prompb.Label{{Name: "h", Value: "i"}}, Value: 2, Timestamp: 1}}, Histograms: []prompb.Histogram{HistogramToHistogramProto(2, &testHistogram), FloatHistogramToHistogramProto(3, testHistogram.ToFloat())}, - Metadatas: []prompb.Metadata{{Type: prompb.Metadata_GAUGE, Help: "help text 2", Unit: "unit text 2"}}, + Metadata: prompb.Metadata{Type: prompb.Metadata_GAUGE, Help: "help text 2", Unit: "unit text 2"}, }, }, } diff --git a/storage/remote/queue_manager.go b/storage/remote/queue_manager.go index d5feb03e92..355366c5fd 100644 --- a/storage/remote/queue_manager.go +++ b/storage/remote/queue_manager.go @@ -1505,7 +1505,7 @@ func (s *shards) populateTimeSeries(batch []timeSeries, pendingData []prompb.Tim pendingData[nPending].Histograms = pendingData[nPending].Histograms[:0] } if s.qm.sendMetadata { - pendingData[nPending].Metadatas = pendingData[nPending].Metadatas[:0] + pendingData[nPending].Metadata = prompb.Metadata{} } // Number of pending samples is limited by the fact that sendSamples (via sendSamplesWithBackoff) @@ -1533,20 +1533,20 @@ func (s *shards) populateTimeSeries(batch []timeSeries, pendingData []prompb.Tim pendingData[nPending].Histograms = append(pendingData[nPending].Histograms, FloatHistogramToHistogramProto(d.timestamp, d.floatHistogram)) nPendingHistograms++ case tMetadata: - pendingData[nPending].Metadatas = append(pendingData[nPending].Metadatas, prompb.Metadata{ + pendingData[nPending].Metadata = prompb.Metadata{ Type: metricTypeToProtoEquivalent(d.metadata.Type), Help: d.metadata.Help, Unit: d.metadata.Unit, - }) + } nPendingMetadata++ } } return nPendingSamples, nPendingExemplars, nPendingHistograms, nPendingMetadata } -func (s *shards) sendSamples(ctx context.Context, samples []prompb.TimeSeries, sampleCount, exemplarCount, histogramCount, metadataCount int, pBuf *proto.Buffer, buf *[]byte) { +func (s *shards) sendSamples(ctx context.Context, series []prompb.TimeSeries, sampleCount, exemplarCount, histogramCount, metadataCount int, pBuf *proto.Buffer, buf *[]byte) { begin := time.Now() - err := s.sendSamplesWithBackoff(ctx, samples, sampleCount, exemplarCount, histogramCount, metadataCount, pBuf, buf) + err := s.sendSamplesWithBackoff(ctx, series, sampleCount, exemplarCount, histogramCount, metadataCount, pBuf, buf) if err != nil { level.Error(s.qm.logger).Log("msg", "non-recoverable error", "count", sampleCount, "exemplarCount", exemplarCount, "err", err) s.qm.metrics.failedSamplesTotal.Add(float64(sampleCount)) @@ -1557,7 +1557,7 @@ func (s *shards) sendSamples(ctx context.Context, samples []prompb.TimeSeries, s // These counters are used to calculate the dynamic sharding, and as such // should be maintained irrespective of success or failure. - s.qm.dataOut.incr(int64(len(samples))) + s.qm.dataOut.incr(int64(len(series))) s.qm.dataOutDuration.incr(int64(time.Since(begin))) s.qm.lastSendTimestamp.Store(time.Now().Unix()) // Pending samples/exemplars/histograms also should be subtracted, as an error means @@ -1572,10 +1572,10 @@ func (s *shards) sendSamples(ctx context.Context, samples []prompb.TimeSeries, s s.enqueuedMetadata.Sub(int64(metadataCount)) } -// sendSamples to the remote storage with backoff for recoverable errors. -func (s *shards) sendSamplesWithBackoff(ctx context.Context, samples []prompb.TimeSeries, sampleCount, exemplarCount, histogramCount, metadataCount int, pBuf *proto.Buffer, buf *[]byte) error { - // Build the WriteRequest with no metadata. - req, highest, err := buildWriteRequest(samples, nil, pBuf, *buf) +// sendSamplesWithBackoff to the remote storage with backoff for recoverable errors. +func (s *shards) sendSamplesWithBackoff(ctx context.Context, series []prompb.TimeSeries, sampleCount, exemplarCount, histogramCount, metadataCount int, pBuf *proto.Buffer, buf *[]byte) error { + // Build the WriteRequest with no separate metadata struct. + req, highest, err := buildWriteRequest(series, nil, pBuf, *buf) if err != nil { // Failing to build the write request is non-recoverable, since it will // only error if marshaling the proto to bytes fails. diff --git a/storage/remote/queue_manager_test.go b/storage/remote/queue_manager_test.go index 39117dbd68..a7dca776e6 100644 --- a/storage/remote/queue_manager_test.go +++ b/storage/remote/queue_manager_test.go @@ -861,6 +861,8 @@ func (c *TestWriteClient) waitForExpectedData(tb testing.TB) { } } +var emptyMetadata prompb.Metadata + func (c *TestWriteClient) Store(_ context.Context, req []byte) error { c.mtx.Lock() defer c.mtx.Unlock() @@ -900,9 +902,10 @@ func (c *TestWriteClient) Store(_ context.Context, req []byte) error { c.receivedHistograms[seriesName] = append(c.receivedHistograms[seriesName], histogram) } } - for _, metadata := range ts.Metadatas { + + if ts.Metadata.String() != "" { // only count non-empty metadata + c.receivedTsMetadata[seriesName] = append(c.receivedTsMetadata[seriesName], ts.Metadata) count++ - c.receivedTsMetadata[seriesName] = append(c.receivedTsMetadata[seriesName], metadata) } } if c.withWaitGroup { diff --git a/storage/remote/write_handler.go b/storage/remote/write_handler.go index 253589bb9b..de9631b7d6 100644 --- a/storage/remote/write_handler.go +++ b/storage/remote/write_handler.go @@ -146,13 +146,12 @@ func (h *writeHandler) write(ctx context.Context, req *prompb.WriteRequest) (err } } - for _, mp := range ts.Metadatas { - m := metadataProtoToMetadata(mp) - _, err := app.UpdateMetadata(0, labels, m) - if err != nil { - level.Debug(h.logger).Log("msg", "error while updating metadata from remote write", "err", err) - } + m := metadataProtoToMetadata(ts.Metadata) + _, err := app.UpdateMetadata(0, labels, m) + if err != nil { + level.Debug(h.logger).Log("msg", "error while updating metadata from remote write", "err", err) } + } if outOfOrderExemplarErrs > 0 { diff --git a/storage/remote/write_handler_test.go b/storage/remote/write_handler_test.go index a2b1a9b148..fd62f2a990 100644 --- a/storage/remote/write_handler_test.go +++ b/storage/remote/write_handler_test.go @@ -80,10 +80,10 @@ func TestRemoteWriteHandler(t *testing.T) { k++ } - for _, m := range ts.Metadatas { - require.Equal(t, mockMetadata{labels, int32(m.Type), m.Unit, m.Help}, appendable.metadata[l]) - l++ - } + m := ts.Metadata + require.Equal(t, mockMetadata{labels, int32(m.Type), m.Unit, m.Help}, appendable.metadata[l]) + l++ + } }