diff --git a/prompb/io/prometheus/write/v2/custom.go b/prompb/io/prometheus/write/v2/custom.go index 70b3761284..1c92bd3058 100644 --- a/prompb/io/prometheus/write/v2/custom.go +++ b/prompb/io/prometheus/write/v2/custom.go @@ -61,7 +61,7 @@ func (m *Request) OptimizedMarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x12 + dAtA[i] = 0x2a } } if len(m.Symbols) > 0 { @@ -70,7 +70,7 @@ func (m *Request) OptimizedMarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], m.Symbols[iNdEx]) i = encodeVarintTypes(dAtA, i, uint64(len(m.Symbols[iNdEx]))) i-- - dAtA[i] = 0xa + dAtA[i] = 0x22 } } return len(dAtA) - i, nil diff --git a/prompb/io/prometheus/write/v2/types.pb.go b/prompb/io/prometheus/write/v2/types.pb.go index 28df6a7c7d..d6ea8398f7 100644 --- a/prompb/io/prometheus/write/v2/types.pb.go +++ b/prompb/io/prometheus/write/v2/types.pb.go @@ -117,9 +117,9 @@ type Request struct { // To decode each of the symbolized strings, referenced, by "ref(s)" suffix, you // need to lookup the actual string by index from symbols array. The order of // strings is up to the sender. The receiver should not assume any particular encoding. - Symbols []string `protobuf:"bytes,1,rep,name=symbols,proto3" json:"symbols,omitempty"` + Symbols []string `protobuf:"bytes,4,rep,name=symbols,proto3" json:"symbols,omitempty"` // timeseries represents an array of distinct series with 0 or more samples. - Timeseries []TimeSeries `protobuf:"bytes,2,rep,name=timeseries,proto3" json:"timeseries"` + Timeseries []TimeSeries `protobuf:"bytes,5,rep,name=timeseries,proto3" json:"timeseries"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -865,65 +865,65 @@ func init() { } var fileDescriptor_f139519efd9fa8d7 = []byte{ - // 915 bytes of a gzipped FileDescriptorProto + // 926 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0x5d, 0x6f, 0xe3, 0x44, - 0x14, 0xed, 0xc4, 0x69, 0x3e, 0x6e, 0x9b, 0xac, 0x3b, 0xb4, 0x5d, 0x6f, 0x81, 0x6c, 0xd6, 0x08, - 0x88, 0x58, 0x29, 0x91, 0xc2, 0xeb, 0x0a, 0xd4, 0xb4, 0x6e, 0x13, 0xa4, 0x24, 0xab, 0x89, 0x8b, - 0x54, 0x5e, 0x2c, 0x37, 0x99, 0x24, 0x16, 0xfe, 0xc2, 0x33, 0x09, 0x94, 0xdf, 0xc7, 0xc3, 0x3e, - 0xf2, 0x07, 0x40, 0xd0, 0x77, 0xfe, 0x03, 0x9a, 0xf1, 0x67, 0x0b, 0xed, 0x6a, 0xdf, 0x66, 0xce, - 0x3d, 0xe7, 0xde, 0x93, 0xeb, 0x7b, 0x27, 0xa0, 0x3b, 0x41, 0x2f, 0x8c, 0x02, 0x8f, 0xf2, 0x35, - 0xdd, 0xb0, 0xde, 0xcf, 0x91, 0xc3, 0x69, 0x6f, 0xdb, 0xef, 0xf1, 0xdb, 0x90, 0xb2, 0x6e, 0x18, - 0x05, 0x3c, 0xc0, 0xc7, 0x4e, 0xd0, 0xcd, 0x39, 0x5d, 0xc9, 0xe9, 0x6e, 0xfb, 0x27, 0x87, 0xab, - 0x60, 0x15, 0x48, 0x4a, 0x4f, 0x9c, 0x62, 0xb6, 0xee, 0x41, 0x95, 0xd0, 0x9f, 0x36, 0x94, 0x71, - 0xac, 0x41, 0x95, 0xdd, 0x7a, 0x37, 0x81, 0xcb, 0x34, 0xd4, 0x56, 0x3a, 0x75, 0x92, 0x5e, 0xf1, - 0x10, 0x80, 0x3b, 0x1e, 0x65, 0x34, 0x72, 0x28, 0xd3, 0x4a, 0x6d, 0xa5, 0xb3, 0xd7, 0xd7, 0xbb, - 0xff, 0x5f, 0xa7, 0x6b, 0x3a, 0x1e, 0x9d, 0x49, 0xe6, 0xa0, 0xfc, 0xee, 0xcf, 0x97, 0x3b, 0xa4, - 0xa0, 0xd5, 0xff, 0x29, 0x01, 0xe4, 0x04, 0xfc, 0x12, 0xf6, 0x5c, 0xfb, 0x86, 0xba, 0xcc, 0x8a, - 0xe8, 0x32, 0x2e, 0xdb, 0x20, 0x10, 0x43, 0x84, 0x2e, 0x19, 0xfe, 0x06, 0xaa, 0xcc, 0xf6, 0x42, - 0x37, 0x2b, 0xdb, 0x7a, 0xac, 0xec, 0x4c, 0xd2, 0x92, 0x92, 0xa9, 0x08, 0x5f, 0x02, 0xac, 0x1d, - 0xc6, 0x83, 0x55, 0x64, 0x7b, 0x4c, 0x53, 0x64, 0x8a, 0x57, 0x8f, 0xa5, 0x18, 0xa6, 0xcc, 0xd4, - 0x78, 0x2e, 0xc5, 0xe7, 0x50, 0xa7, 0xbf, 0x50, 0x2f, 0x74, 0xed, 0x88, 0x69, 0x65, 0x99, 0xa7, - 0xfd, 0x58, 0x1e, 0x23, 0x21, 0x26, 0x69, 0x72, 0x21, 0x1e, 0x40, 0xcd, 0xa3, 0xdc, 0x5e, 0xd8, - 0xdc, 0xd6, 0x76, 0xdb, 0xe8, 0xa9, 0x24, 0xe3, 0x84, 0x97, 0x24, 0xc9, 0x74, 0xf8, 0x35, 0x1c, - 0xcc, 0x23, 0x6a, 0x73, 0xba, 0xb0, 0x64, 0x63, 0xb9, 0xed, 0x85, 0x5a, 0xa5, 0x8d, 0x3a, 0x0a, - 0x51, 0x93, 0x80, 0x99, 0xe2, 0xba, 0x05, 0xb5, 0xd4, 0xcd, 0xfb, 0x9b, 0x7d, 0x08, 0xbb, 0x5b, - 0xdb, 0xdd, 0x50, 0xad, 0xd4, 0x46, 0x1d, 0x44, 0xe2, 0x0b, 0xfe, 0x04, 0xea, 0x79, 0x1d, 0x45, - 0xd6, 0xc9, 0x01, 0xfd, 0x0d, 0x54, 0xe2, 0xce, 0xe7, 0x6a, 0xf4, 0xa8, 0xba, 0xf4, 0x50, 0xfd, - 0x77, 0x09, 0x6a, 0xe9, 0x0f, 0xc5, 0xdf, 0x42, 0x59, 0xcc, 0xb1, 0xd4, 0x37, 0xfb, 0xaf, 0xdf, - 0xd7, 0x18, 0x71, 0x88, 0x9c, 0xb9, 0x79, 0x1b, 0x52, 0x22, 0x85, 0xf8, 0x05, 0xd4, 0xd6, 0xd4, - 0x0d, 0xc5, 0xcf, 0x93, 0x46, 0x1b, 0xa4, 0x2a, 0xee, 0x84, 0x2e, 0x45, 0x68, 0xe3, 0x3b, 0x5c, - 0x86, 0xca, 0x71, 0x48, 0xdc, 0x09, 0x5d, 0xea, 0x7f, 0x20, 0x80, 0x3c, 0x15, 0xfe, 0x18, 0x9e, - 0x8f, 0x0d, 0x93, 0x8c, 0xce, 0x2c, 0xf3, 0xfa, 0xad, 0x61, 0x5d, 0x4d, 0x66, 0x6f, 0x8d, 0xb3, - 0xd1, 0xc5, 0xc8, 0x38, 0x57, 0x77, 0xf0, 0x73, 0xf8, 0xa8, 0x18, 0x3c, 0x9b, 0x5e, 0x4d, 0x4c, - 0x83, 0xa8, 0x08, 0x1f, 0xc1, 0x41, 0x31, 0x70, 0x79, 0x7a, 0x75, 0x69, 0xa8, 0x25, 0xfc, 0x02, - 0x8e, 0x8a, 0xf0, 0x70, 0x34, 0x33, 0xa7, 0x97, 0xe4, 0x74, 0xac, 0x2a, 0xb8, 0x05, 0x27, 0xff, - 0x51, 0xe4, 0xf1, 0xf2, 0xc3, 0x52, 0xb3, 0xab, 0xf1, 0xf8, 0x94, 0x5c, 0xab, 0xbb, 0xf8, 0x10, - 0xd4, 0x62, 0x60, 0x34, 0xb9, 0x98, 0xaa, 0x15, 0xac, 0xc1, 0xe1, 0x3d, 0xba, 0x79, 0x6a, 0x1a, - 0x33, 0xc3, 0x54, 0xab, 0xfa, 0x6f, 0x15, 0xa8, 0x67, 0x93, 0x8d, 0x3f, 0x85, 0xfa, 0x3c, 0xd8, - 0xf8, 0xdc, 0x72, 0x7c, 0x2e, 0x3b, 0x5d, 0x1e, 0xee, 0x90, 0x9a, 0x84, 0x46, 0x3e, 0xc7, 0xaf, - 0x60, 0x2f, 0x0e, 0x2f, 0xdd, 0xc0, 0xe6, 0xf1, 0x20, 0x0c, 0x77, 0x08, 0x48, 0xf0, 0x42, 0x60, - 0x58, 0x05, 0x85, 0x6d, 0x3c, 0xd9, 0x60, 0x44, 0xc4, 0x11, 0x1f, 0x43, 0x85, 0xcd, 0xd7, 0xd4, - 0xb3, 0x65, 0x6b, 0x0f, 0x48, 0x72, 0xc3, 0x9f, 0x43, 0xf3, 0x57, 0x1a, 0x05, 0x16, 0x5f, 0x47, - 0x94, 0xad, 0x03, 0x77, 0x21, 0x67, 0x1e, 0x91, 0x86, 0x40, 0xcd, 0x14, 0xc4, 0x5f, 0x24, 0xb4, - 0xdc, 0x57, 0x45, 0xfa, 0x42, 0x64, 0x5f, 0xe0, 0x67, 0xa9, 0xb7, 0xaf, 0x40, 0x2d, 0xf0, 0x62, - 0x83, 0x55, 0x69, 0x10, 0x91, 0x66, 0xc6, 0x8c, 0x4d, 0x4e, 0xa1, 0xe9, 0xd3, 0x95, 0xcd, 0x9d, - 0x2d, 0xb5, 0x58, 0x68, 0xfb, 0x4c, 0xab, 0x3d, 0xfd, 0x6a, 0x0d, 0x36, 0xf3, 0x1f, 0x29, 0x9f, - 0x85, 0xb6, 0x9f, 0x2c, 0x5c, 0x23, 0xd5, 0x0b, 0x8c, 0xe1, 0x2f, 0xe1, 0x59, 0x96, 0x70, 0x41, - 0x5d, 0x6e, 0x33, 0xad, 0xde, 0x56, 0x3a, 0x98, 0x64, 0x75, 0xce, 0x25, 0x7a, 0x8f, 0x28, 0x9d, - 0x32, 0x0d, 0xda, 0x4a, 0x07, 0xe5, 0x44, 0x69, 0x93, 0x09, 0x8b, 0x61, 0xc0, 0x9c, 0x82, 0xc5, - 0xbd, 0x0f, 0xb5, 0x98, 0xea, 0x33, 0x8b, 0x59, 0xc2, 0xc4, 0xe2, 0x7e, 0x6c, 0x31, 0x85, 0x73, - 0x8b, 0x19, 0x31, 0xb1, 0xd8, 0x88, 0x2d, 0xa6, 0x70, 0x62, 0xf1, 0x3b, 0x80, 0x88, 0x32, 0xca, - 0xad, 0xb5, 0xf8, 0x2a, 0xcd, 0xa7, 0xf7, 0x32, 0x9b, 0xb1, 0x2e, 0x11, 0x9a, 0xa1, 0xe3, 0x73, - 0x52, 0x8f, 0xd2, 0xe3, 0xfd, 0x87, 0xe0, 0xd9, 0x83, 0x87, 0x00, 0x7f, 0x06, 0x8d, 0xf9, 0x86, - 0xf1, 0xc0, 0xb3, 0xe4, 0xb3, 0xc1, 0x34, 0x55, 0x1a, 0xda, 0x8f, 0xc1, 0xef, 0x25, 0xa6, 0x2f, - 0xa0, 0x9e, 0xa5, 0xc6, 0x27, 0x70, 0x4c, 0xc4, 0x84, 0x5b, 0xc3, 0xd1, 0xc4, 0x7c, 0xb0, 0xa6, - 0x18, 0x9a, 0x85, 0xd8, 0xb5, 0x31, 0x53, 0x11, 0x3e, 0x80, 0x46, 0x01, 0x9b, 0x4c, 0xd5, 0x92, - 0xd8, 0xa4, 0x02, 0x14, 0xef, 0xac, 0x32, 0xa8, 0xc2, 0xae, 0x6c, 0xca, 0x60, 0x1f, 0x20, 0x9f, - 0x37, 0xfd, 0x0d, 0x40, 0xfe, 0x01, 0xc4, 0xc8, 0x07, 0xcb, 0x25, 0xa3, 0xf1, 0x0e, 0x1d, 0x90, - 0xe4, 0x26, 0x70, 0x97, 0xfa, 0x2b, 0xbe, 0x96, 0xab, 0xd3, 0x20, 0xc9, 0x6d, 0x70, 0xf4, 0xee, - 0xae, 0x85, 0x7e, 0xbf, 0x6b, 0xa1, 0xbf, 0xee, 0x5a, 0xe8, 0x87, 0xaa, 0x6c, 0xda, 0xb6, 0x7f, - 0x53, 0x91, 0x7f, 0xc2, 0x5f, 0xff, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x14, 0x33, 0x22, 0x66, 0xd8, - 0x07, 0x00, 0x00, + 0x14, 0xed, 0xc4, 0x69, 0x3e, 0x6e, 0x9a, 0xac, 0x33, 0xb4, 0x5d, 0x6f, 0x81, 0x6c, 0xd6, 0x08, + 0x88, 0x58, 0x29, 0x91, 0xc2, 0xeb, 0x0a, 0xd4, 0xb4, 0x6e, 0x93, 0x95, 0x92, 0xac, 0x26, 0x2e, + 0x52, 0x79, 0xb1, 0xdc, 0x64, 0x92, 0x58, 0xd8, 0xb1, 0xf1, 0x4c, 0x02, 0xe5, 0xf7, 0xf1, 0xb0, + 0x8f, 0xfc, 0x01, 0x10, 0xf4, 0x9d, 0xff, 0x80, 0x66, 0xfc, 0xd9, 0x42, 0xbb, 0xe2, 0x6d, 0xe6, + 0xdc, 0x73, 0xee, 0x3d, 0xb9, 0xbe, 0x77, 0x02, 0xba, 0xe3, 0xf7, 0x82, 0xd0, 0xf7, 0x28, 0x5f, + 0xd3, 0x2d, 0xeb, 0xfd, 0x14, 0x3a, 0x9c, 0xf6, 0x76, 0xfd, 0x1e, 0xbf, 0x0d, 0x28, 0xeb, 0x06, + 0xa1, 0xcf, 0x7d, 0x7c, 0xec, 0xf8, 0xdd, 0x8c, 0xd3, 0x95, 0x9c, 0xee, 0xae, 0x7f, 0x72, 0xb8, + 0xf2, 0x57, 0xbe, 0xa4, 0xf4, 0xc4, 0x29, 0x62, 0xeb, 0x0c, 0xca, 0x84, 0xfe, 0xb8, 0xa5, 0x8c, + 0x63, 0x0d, 0xca, 0xec, 0xd6, 0xbb, 0xf1, 0x5d, 0xa6, 0x15, 0xdb, 0x4a, 0xa7, 0x4a, 0x92, 0x2b, + 0x1e, 0x02, 0x70, 0xc7, 0xa3, 0x8c, 0x86, 0x0e, 0x65, 0xda, 0x7e, 0x5b, 0xe9, 0xd4, 0xfa, 0x7a, + 0xf7, 0xbf, 0xeb, 0x74, 0x4d, 0xc7, 0xa3, 0x33, 0xc9, 0x1c, 0x14, 0xdf, 0xff, 0xf1, 0x72, 0x8f, + 0xe4, 0xb4, 0x6f, 0x8b, 0x15, 0xa4, 0x16, 0xf5, 0xbf, 0x0b, 0x00, 0x19, 0x0d, 0xbf, 0x84, 0x9a, + 0x6b, 0xdf, 0x50, 0x97, 0x59, 0x21, 0x5d, 0x32, 0x0d, 0xb5, 0x95, 0x4e, 0x9d, 0x40, 0x04, 0x11, + 0xba, 0x64, 0xf8, 0x1b, 0x28, 0x33, 0xdb, 0x0b, 0x5c, 0xca, 0xb4, 0x82, 0x2c, 0xde, 0x7a, 0xac, + 0xf8, 0x4c, 0xd2, 0xe2, 0xc2, 0x89, 0x08, 0x5f, 0x02, 0xac, 0x1d, 0xc6, 0xfd, 0x55, 0x68, 0x7b, + 0x4c, 0x53, 0x64, 0x8a, 0x57, 0x8f, 0xa5, 0x18, 0x26, 0xcc, 0xc4, 0x7e, 0x26, 0xc5, 0xe7, 0x50, + 0xa5, 0x3f, 0x53, 0x2f, 0x70, 0xed, 0x30, 0x6a, 0x52, 0xad, 0xdf, 0x7e, 0x2c, 0x8f, 0x11, 0x13, + 0xe3, 0x34, 0x99, 0x10, 0x0f, 0xa0, 0xe2, 0x51, 0x6e, 0x2f, 0x6c, 0x6e, 0x6b, 0xfb, 0x6d, 0xf4, + 0x54, 0x92, 0x71, 0xcc, 0x8b, 0x93, 0xa4, 0x3a, 0xfc, 0x1a, 0x9a, 0xf3, 0x90, 0xda, 0x9c, 0x2e, + 0x2c, 0xd9, 0x5e, 0x6e, 0x7b, 0x81, 0x56, 0x6a, 0xa3, 0x8e, 0x42, 0xd4, 0x38, 0x60, 0x26, 0xb8, + 0x6e, 0x41, 0x25, 0x71, 0xf3, 0xe1, 0x66, 0x1f, 0xc2, 0xfe, 0xce, 0x76, 0xb7, 0x54, 0x2b, 0xb4, + 0x51, 0x07, 0x91, 0xe8, 0x82, 0x3f, 0x81, 0x6a, 0x56, 0x47, 0x91, 0x75, 0x32, 0x40, 0x7f, 0x03, + 0xa5, 0xa8, 0xf3, 0x99, 0x1a, 0x3d, 0xaa, 0x2e, 0x3c, 0x54, 0xff, 0x55, 0x80, 0x4a, 0xf2, 0x43, + 0xf1, 0xb7, 0x50, 0x14, 0xd3, 0x2c, 0xf5, 0x8d, 0xfe, 0xeb, 0x0f, 0x35, 0x46, 0x1c, 0x42, 0x67, + 0x6e, 0xde, 0x06, 0x94, 0x48, 0x21, 0x7e, 0x01, 0x95, 0x35, 0x75, 0x03, 0xf1, 0xf3, 0xa4, 0xd1, + 0x3a, 0x29, 0x8b, 0x3b, 0xa1, 0x4b, 0x11, 0xda, 0x6e, 0x1c, 0x2e, 0x43, 0xc5, 0x28, 0x24, 0xee, + 0x84, 0x2e, 0xf5, 0xdf, 0x11, 0x40, 0x96, 0x0a, 0x7f, 0x0c, 0xcf, 0xc7, 0x86, 0x49, 0x46, 0x67, + 0x96, 0x79, 0xfd, 0xce, 0xb0, 0xae, 0x26, 0xb3, 0x77, 0xc6, 0xd9, 0xe8, 0x62, 0x64, 0x9c, 0xab, + 0x7b, 0xf8, 0x39, 0x7c, 0x94, 0x0f, 0x9e, 0x4d, 0xaf, 0x26, 0xa6, 0x41, 0x54, 0x84, 0x8f, 0xa0, + 0x99, 0x0f, 0x5c, 0x9e, 0x5e, 0x5d, 0x1a, 0x6a, 0x01, 0xbf, 0x80, 0xa3, 0x3c, 0x3c, 0x1c, 0xcd, + 0xcc, 0xe9, 0x25, 0x39, 0x1d, 0xab, 0x0a, 0x6e, 0xc1, 0xc9, 0xbf, 0x14, 0x59, 0xbc, 0xf8, 0xb0, + 0xd4, 0xec, 0x6a, 0x3c, 0x3e, 0x25, 0xd7, 0xea, 0x3e, 0x3e, 0x04, 0x35, 0x1f, 0x18, 0x4d, 0x2e, + 0xa6, 0x6a, 0x09, 0x6b, 0x70, 0x78, 0x8f, 0x6e, 0x9e, 0x9a, 0xc6, 0xcc, 0x30, 0xd5, 0xb2, 0xfe, + 0x6b, 0x09, 0xaa, 0xe9, 0x64, 0xe3, 0x4f, 0xa1, 0x3a, 0xf7, 0xb7, 0x1b, 0x6e, 0x39, 0x1b, 0x2e, + 0x3b, 0x5d, 0x1c, 0xee, 0x91, 0x8a, 0x84, 0x46, 0x1b, 0x8e, 0x5f, 0x41, 0x2d, 0x0a, 0x2f, 0x5d, + 0xdf, 0xe6, 0xd1, 0x20, 0x0c, 0xf7, 0x08, 0x48, 0xf0, 0x42, 0x60, 0x58, 0x05, 0x85, 0x6d, 0x3d, + 0xd9, 0x60, 0x44, 0xc4, 0x11, 0x1f, 0x43, 0x89, 0xcd, 0xd7, 0xd4, 0xb3, 0x65, 0x6b, 0x9b, 0x24, + 0xbe, 0xe1, 0xcf, 0xa1, 0xf1, 0x0b, 0x0d, 0x7d, 0x8b, 0xaf, 0x43, 0xca, 0xd6, 0xbe, 0xbb, 0x90, + 0x33, 0x8f, 0x48, 0x5d, 0xa0, 0x66, 0x02, 0xe2, 0x2f, 0x62, 0x5a, 0xe6, 0xab, 0x24, 0x7d, 0x21, + 0x72, 0x20, 0xf0, 0xb3, 0xc4, 0xdb, 0x57, 0xa0, 0xe6, 0x78, 0x91, 0xc1, 0xb2, 0x34, 0x88, 0x48, + 0x23, 0x65, 0x46, 0x26, 0xa7, 0xd0, 0xd8, 0xd0, 0x95, 0xcd, 0x9d, 0x1d, 0xb5, 0x58, 0x60, 0x6f, + 0x98, 0x56, 0x79, 0xfa, 0xed, 0x1a, 0x6c, 0xe7, 0x3f, 0x50, 0x3e, 0x0b, 0xec, 0x4d, 0xbc, 0x70, + 0xf5, 0x44, 0x2f, 0x30, 0x86, 0xbf, 0x84, 0x67, 0x69, 0xc2, 0x05, 0x75, 0xb9, 0xcd, 0xb4, 0x6a, + 0x5b, 0xe9, 0x60, 0x92, 0xd6, 0x39, 0x97, 0xe8, 0x3d, 0xa2, 0x74, 0xca, 0x34, 0x68, 0x2b, 0x1d, + 0x94, 0x11, 0xa5, 0x4d, 0x26, 0x2c, 0x06, 0x3e, 0x73, 0x72, 0x16, 0x6b, 0xff, 0xd7, 0x62, 0xa2, + 0x4f, 0x2d, 0xa6, 0x09, 0x63, 0x8b, 0x07, 0x91, 0xc5, 0x04, 0xce, 0x2c, 0xa6, 0xc4, 0xd8, 0x62, + 0x3d, 0xb2, 0x98, 0xc0, 0xb1, 0xc5, 0xb7, 0x00, 0x21, 0x65, 0x94, 0x5b, 0x6b, 0xf1, 0x55, 0x1a, + 0x4f, 0xef, 0x65, 0x3a, 0x63, 0x5d, 0x22, 0x34, 0x43, 0x67, 0xc3, 0x49, 0x35, 0x4c, 0x8e, 0xf7, + 0x1f, 0x82, 0x67, 0x0f, 0x1e, 0x02, 0xfc, 0x19, 0xd4, 0xe7, 0x5b, 0xc6, 0x7d, 0xcf, 0x92, 0xcf, + 0x06, 0xd3, 0x54, 0x69, 0xe8, 0x20, 0x02, 0xbf, 0x93, 0x98, 0xbe, 0x80, 0x6a, 0x9a, 0x1a, 0x9f, + 0xc0, 0x31, 0x11, 0x13, 0x6e, 0x0d, 0x47, 0x13, 0xf3, 0xc1, 0x9a, 0x62, 0x68, 0xe4, 0x62, 0xd7, + 0xc6, 0x4c, 0x45, 0xb8, 0x09, 0xf5, 0x1c, 0x36, 0x99, 0xaa, 0x05, 0xb1, 0x49, 0x39, 0x28, 0xda, + 0x59, 0x65, 0x50, 0x86, 0x7d, 0xd9, 0x94, 0xc1, 0x01, 0x40, 0x36, 0x6f, 0xfa, 0x1b, 0x80, 0xec, + 0x03, 0x88, 0x91, 0xf7, 0x97, 0x4b, 0x46, 0xa3, 0x1d, 0x6a, 0x92, 0xf8, 0x26, 0x70, 0x97, 0x6e, + 0x56, 0x7c, 0x2d, 0x57, 0xa7, 0x4e, 0xe2, 0xdb, 0xe0, 0xe8, 0xfd, 0x5d, 0x0b, 0xfd, 0x76, 0xd7, + 0x42, 0x7f, 0xde, 0xb5, 0xd0, 0xf7, 0x65, 0xd9, 0xb4, 0x5d, 0xff, 0xa6, 0x24, 0xff, 0x8a, 0xbf, + 0xfe, 0x27, 0x00, 0x00, 0xff, 0xff, 0x3e, 0xfc, 0x93, 0x1c, 0xde, 0x07, 0x00, 0x00, } func (m *Request) Marshal() (dAtA []byte, err error) { @@ -961,7 +961,7 @@ func (m *Request) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x12 + dAtA[i] = 0x2a } } if len(m.Symbols) > 0 { @@ -970,7 +970,7 @@ func (m *Request) MarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], m.Symbols[iNdEx]) i = encodeVarintTypes(dAtA, i, uint64(len(m.Symbols[iNdEx]))) i-- - dAtA[i] = 0xa + dAtA[i] = 0x22 } } return len(dAtA) - i, nil @@ -1769,7 +1769,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { return fmt.Errorf("proto: Request: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { - case 1: + case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Symbols", wireType) } @@ -1801,7 +1801,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { } m.Symbols = append(m.Symbols, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex - case 2: + case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Timeseries", wireType) } diff --git a/prompb/io/prometheus/write/v2/types.proto b/prompb/io/prometheus/write/v2/types.proto index fcb184ee8b..0cc7b8bc4a 100644 --- a/prompb/io/prometheus/write/v2/types.proto +++ b/prompb/io/prometheus/write/v2/types.proto @@ -31,6 +31,13 @@ import "gogoproto/gogo.proto"; // are not part of the spec proto (they only modify the generated Go code, not // the serialized message). See: https://github.com/prometheus/prometheus/issues/11908 message Request { + // Since Request supersedes 1.0 spec's prometheus.WriteRequest, we reserve the top-down message + // for the deterministic interop between those two, see types_test.go for details. + // Generally it's not needed, because Receivers must use the Content-Type header, but we want to + // be sympathetic to adopters with mistaken implementations and have deterministic error (empty + // message if you use the wrong proto schema). + reserved 1 to 3; + // symbols contains a de-duplicated array of string elements used for various // items in a Request message, like labels and metadata items. For the sender's convenience // around empty values for optional fields like unit_ref, symbols array MUST start with @@ -39,9 +46,9 @@ message Request { // To decode each of the symbolized strings, referenced, by "ref(s)" suffix, you // need to lookup the actual string by index from symbols array. The order of // strings is up to the sender. The receiver should not assume any particular encoding. - repeated string symbols = 1; + repeated string symbols = 4; // timeseries represents an array of distinct series with 0 or more samples. - repeated TimeSeries timeseries = 2 [(gogoproto.nullable) = false]; + repeated TimeSeries timeseries = 5 [(gogoproto.nullable) = false]; } // TimeSeries represents a single series. diff --git a/prompb/io/prometheus/write/v2/types_test.go b/prompb/io/prometheus/write/v2/types_test.go new file mode 100644 index 0000000000..5b7622fc2f --- /dev/null +++ b/prompb/io/prometheus/write/v2/types_test.go @@ -0,0 +1,97 @@ +// Copyright 2024 Prometheus Team +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package writev2 + +import ( + "testing" + "time" + + "github.com/gogo/protobuf/proto" + "github.com/stretchr/testify/require" + + "github.com/prometheus/prometheus/prompb" +) + +func TestInteropV2UnmarshalWithV1_DeterministicEmpty(t *testing.T) { + expectedV1Empty := &prompb.WriteRequest{} + for _, tc := range []struct{ incoming *Request }{ + { + incoming: &Request{}, // Technically wrong, should be at least empty string in symbol. + }, + { + incoming: &Request{ + Symbols: []string{""}, + }, // NOTE: Without reserved fields, failed with "corrupted" ghost TimeSeries element. + }, + { + incoming: &Request{ + Symbols: []string{"", "__name__", "metric1"}, + Timeseries: []TimeSeries{ + {LabelsRefs: []uint32{1, 2}}, + {Samples: []Sample{{Value: 21.4, Timestamp: time.Now().UnixMilli()}}}, + }, // NOTE: Without reserved fields, proto: illegal wireType 7 + }, + }, + } { + t.Run("", func(t *testing.T) { + in, err := proto.Marshal(tc.incoming) + require.NoError(t, err) + + // Test accidental unmarshal of v2 payload with v1 proto. + out := &prompb.WriteRequest{} + require.NoError(t, proto.Unmarshal(in, out)) + + // Drop unknowns, we expect them when incoming payload had some fields. + // This field & method will be likely gone after gogo removal. + out.XXX_unrecognized = nil // NOTE: out.XXX_DiscardUnknown() does not work with nullables. + + require.Equal(t, expectedV1Empty, out) + }) + } +} + +func TestInteropV1UnmarshalWithV2_DeterministicEmpty(t *testing.T) { + expectedV2Empty := &Request{} + for _, tc := range []struct{ incoming *prompb.WriteRequest }{ + { + incoming: &prompb.WriteRequest{}, + }, + { + incoming: &prompb.WriteRequest{ + Timeseries: []prompb.TimeSeries{ + { + Labels: []prompb.Label{{Name: "__name__", Value: "metric1"}}, + Samples: []prompb.Sample{{Value: 21.4, Timestamp: time.Now().UnixMilli()}}, + }, + }, + }, + // NOTE: Without reserved fields, results in corrupted v2.Request.Symbols. + }, + } { + t.Run("", func(t *testing.T) { + in, err := proto.Marshal(tc.incoming) + require.NoError(t, err) + + // Test accidental unmarshal of v1 payload with v2 proto. + out := &Request{} + require.NoError(t, proto.Unmarshal(in, out)) + + // Drop unknowns, we expect them when incoming payload had some fields. + // This field & method will be likely gone after gogo removal. + out.XXX_unrecognized = nil // NOTE: out.XXX_DiscardUnknown() does not work with nullables. + + require.Equal(t, expectedV2Empty, out) + }) + } +}