From ecfcdd64e0833791ed06bf8300f8cc7f4d4e9d80 Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Wed, 3 May 2023 20:15:36 +0000 Subject: [PATCH 01/31] Add proto for new API span-summary Signed-off-by: Zach Leslie --- pkg/tempopb/tempo.pb.go | 1031 +++++++++++++++++++++++++++++++++++---- pkg/tempopb/tempo.proto | 20 +- 2 files changed, 952 insertions(+), 99 deletions(-) diff --git a/pkg/tempopb/tempo.pb.go b/pkg/tempopb/tempo.pb.go index 9e3dd548c19..399c43ff497 100644 --- a/pkg/tempopb/tempo.pb.go +++ b/pkg/tempopb/tempo.pb.go @@ -5,6 +5,7 @@ package tempopb import ( context "context" + encoding_binary "encoding/binary" fmt "fmt" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" @@ -1393,6 +1394,171 @@ func (m *LinkSlice) GetLinks() []*v11.Span_Link { return nil } +type SpanSummaryRequest struct { + // tagFilter is a list of tags to filter on in the form of a traceql query, ie: tag=value + TagFilter []string `protobuf:"bytes,1,rep,name=tagFilter,proto3" json:"tagFilter,omitempty"` + GroupBy string `protobuf:"bytes,2,opt,name=groupBy,proto3" json:"groupBy,omitempty"` +} + +func (m *SpanSummaryRequest) Reset() { *m = SpanSummaryRequest{} } +func (m *SpanSummaryRequest) String() string { return proto.CompactTextString(m) } +func (*SpanSummaryRequest) ProtoMessage() {} +func (*SpanSummaryRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_f22805646f4f62b6, []int{24} +} +func (m *SpanSummaryRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *SpanSummaryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_SpanSummaryRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *SpanSummaryRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SpanSummaryRequest.Merge(m, src) +} +func (m *SpanSummaryRequest) XXX_Size() int { + return m.Size() +} +func (m *SpanSummaryRequest) XXX_DiscardUnknown() { + xxx_messageInfo_SpanSummaryRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_SpanSummaryRequest proto.InternalMessageInfo + +func (m *SpanSummaryRequest) GetTagFilter() []string { + if m != nil { + return m.TagFilter + } + return nil +} + +func (m *SpanSummaryRequest) GetGroupBy() string { + if m != nil { + return m.GroupBy + } + return "" +} + +type SpanSummaryResponse struct { + Stats []*SpanSummaryGroup `protobuf:"bytes,1,rep,name=stats,proto3" json:"stats,omitempty"` +} + +func (m *SpanSummaryResponse) Reset() { *m = SpanSummaryResponse{} } +func (m *SpanSummaryResponse) String() string { return proto.CompactTextString(m) } +func (*SpanSummaryResponse) ProtoMessage() {} +func (*SpanSummaryResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_f22805646f4f62b6, []int{25} +} +func (m *SpanSummaryResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *SpanSummaryResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_SpanSummaryResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *SpanSummaryResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_SpanSummaryResponse.Merge(m, src) +} +func (m *SpanSummaryResponse) XXX_Size() int { + return m.Size() +} +func (m *SpanSummaryResponse) XXX_DiscardUnknown() { + xxx_messageInfo_SpanSummaryResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_SpanSummaryResponse proto.InternalMessageInfo + +func (m *SpanSummaryResponse) GetStats() []*SpanSummaryGroup { + if m != nil { + return m.Stats + } + return nil +} + +type SpanSummaryGroup struct { + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + SpanCount int64 `protobuf:"varint,2,opt,name=spanCount,proto3" json:"spanCount,omitempty"` + ErrorSpanCount int64 `protobuf:"varint,3,opt,name=errorSpanCount,proto3" json:"errorSpanCount,omitempty"` + Latencies map[string]float64 `protobuf:"bytes,4,rep,name=latencies,proto3" json:"latencies,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"fixed64,2,opt,name=value,proto3"` +} + +func (m *SpanSummaryGroup) Reset() { *m = SpanSummaryGroup{} } +func (m *SpanSummaryGroup) String() string { return proto.CompactTextString(m) } +func (*SpanSummaryGroup) ProtoMessage() {} +func (*SpanSummaryGroup) Descriptor() ([]byte, []int) { + return fileDescriptor_f22805646f4f62b6, []int{26} +} +func (m *SpanSummaryGroup) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *SpanSummaryGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_SpanSummaryGroup.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *SpanSummaryGroup) XXX_Merge(src proto.Message) { + xxx_messageInfo_SpanSummaryGroup.Merge(m, src) +} +func (m *SpanSummaryGroup) XXX_Size() int { + return m.Size() +} +func (m *SpanSummaryGroup) XXX_DiscardUnknown() { + xxx_messageInfo_SpanSummaryGroup.DiscardUnknown(m) +} + +var xxx_messageInfo_SpanSummaryGroup proto.InternalMessageInfo + +func (m *SpanSummaryGroup) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *SpanSummaryGroup) GetSpanCount() int64 { + if m != nil { + return m.SpanCount + } + return 0 +} + +func (m *SpanSummaryGroup) GetErrorSpanCount() int64 { + if m != nil { + return m.ErrorSpanCount + } + return 0 +} + +func (m *SpanSummaryGroup) GetLatencies() map[string]float64 { + if m != nil { + return m.Latencies + } + return nil +} + func init() { proto.RegisterType((*TraceByIDRequest)(nil), "tempopb.TraceByIDRequest") proto.RegisterType((*TraceByIDResponse)(nil), "tempopb.TraceByIDResponse") @@ -1419,101 +1585,115 @@ func init() { proto.RegisterType((*PushSpansRequest)(nil), "tempopb.PushSpansRequest") proto.RegisterType((*TraceBytes)(nil), "tempopb.TraceBytes") proto.RegisterType((*LinkSlice)(nil), "tempopb.LinkSlice") + proto.RegisterType((*SpanSummaryRequest)(nil), "tempopb.SpanSummaryRequest") + proto.RegisterType((*SpanSummaryResponse)(nil), "tempopb.SpanSummaryResponse") + proto.RegisterType((*SpanSummaryGroup)(nil), "tempopb.SpanSummaryGroup") + proto.RegisterMapType((map[string]float64)(nil), "tempopb.SpanSummaryGroup.LatenciesEntry") } func init() { proto.RegisterFile("pkg/tempopb/tempo.proto", fileDescriptor_f22805646f4f62b6) } var fileDescriptor_f22805646f4f62b6 = []byte{ - // 1420 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x57, 0x4f, 0x6f, 0x1b, 0x45, - 0x14, 0xcf, 0x26, 0x8e, 0x1d, 0x3f, 0x27, 0x69, 0x32, 0xb4, 0xa9, 0xeb, 0x14, 0xc7, 0x5a, 0x22, - 0x08, 0x88, 0x3a, 0x8d, 0x5b, 0x54, 0x68, 0x25, 0x10, 0x56, 0x42, 0xff, 0xa6, 0x94, 0x75, 0xc8, - 0x81, 0xdb, 0x7a, 0x3d, 0x75, 0x57, 0xb1, 0x77, 0xdc, 0xdd, 0x71, 0x14, 0x73, 0xe2, 0xc4, 0x89, - 0x03, 0x5f, 0x01, 0x09, 0x89, 0x0f, 0xc2, 0xa5, 0xc7, 0x1e, 0x11, 0x87, 0x0a, 0xb5, 0x9f, 0x80, - 0x23, 0x37, 0xf4, 0xde, 0xcc, 0xec, 0xbf, 0x38, 0x41, 0xc0, 0xc9, 0xf3, 0x7e, 0xf3, 0x9b, 0x37, - 0x6f, 0x7e, 0xf3, 0xde, 0xdb, 0x31, 0x5c, 0x1e, 0x1d, 0xf5, 0xb7, 0x25, 0x1f, 0x8e, 0xc4, 0xa8, - 0xab, 0x7e, 0x9b, 0xa3, 0x50, 0x48, 0xc1, 0x4a, 0x1a, 0xac, 0x5d, 0x94, 0xa1, 0xeb, 0xf1, 0xed, - 0xe3, 0x9d, 0x6d, 0x1a, 0xa8, 0xe9, 0xda, 0x9a, 0x27, 0x86, 0x43, 0x11, 0x20, 0xac, 0x46, 0x1a, - 0xbf, 0xd6, 0xf7, 0xe5, 0xb3, 0x71, 0xb7, 0xe9, 0x89, 0xe1, 0x76, 0x5f, 0xf4, 0xc5, 0x36, 0xc1, - 0xdd, 0xf1, 0x53, 0xb2, 0xc8, 0xa0, 0x91, 0xa2, 0xdb, 0xdf, 0x5b, 0xb0, 0x72, 0x80, 0x6e, 0xdb, - 0x93, 0xfb, 0xbb, 0x0e, 0x7f, 0x3e, 0xe6, 0x91, 0x64, 0x55, 0x28, 0xd1, 0x56, 0xf7, 0x77, 0xab, - 0x56, 0xc3, 0xda, 0x5a, 0x74, 0x8c, 0xc9, 0xea, 0x00, 0xdd, 0x81, 0xf0, 0x8e, 0x3a, 0xd2, 0x0d, - 0x65, 0x75, 0xb6, 0x61, 0x6d, 0x95, 0x9d, 0x14, 0xc2, 0x6a, 0xb0, 0x40, 0xd6, 0x5e, 0xd0, 0xab, - 0xce, 0xd1, 0x6c, 0x6c, 0xb3, 0xab, 0x50, 0x7e, 0x3e, 0xe6, 0xe1, 0x64, 0x5f, 0xf4, 0x78, 0x75, - 0x9e, 0x26, 0x13, 0xc0, 0x0e, 0x60, 0x35, 0x15, 0x47, 0x34, 0x12, 0x41, 0xc4, 0xd9, 0x26, 0xcc, - 0xd3, 0xce, 0x14, 0x46, 0xa5, 0xb5, 0xdc, 0xd4, 0x9a, 0x34, 0x89, 0xea, 0xa8, 0x49, 0x76, 0x03, - 0x4a, 0x43, 0x2e, 0x43, 0xdf, 0x8b, 0x28, 0xa2, 0x4a, 0xeb, 0x4a, 0x96, 0x87, 0x2e, 0xf7, 0x15, - 0xc1, 0x31, 0x4c, 0x9b, 0xa5, 0xce, 0xad, 0x27, 0xed, 0x9f, 0x67, 0x61, 0xa9, 0xc3, 0xdd, 0xd0, - 0x7b, 0x66, 0x94, 0xb8, 0x0d, 0x85, 0x03, 0xb7, 0x1f, 0x55, 0xad, 0xc6, 0xdc, 0x56, 0xa5, 0xd5, - 0x88, 0xfd, 0x66, 0x58, 0x4d, 0xa4, 0xec, 0x05, 0x32, 0x9c, 0xb4, 0x0b, 0x2f, 0x5e, 0x6d, 0xcc, - 0x38, 0xb4, 0x86, 0x6d, 0xc2, 0xd2, 0xbe, 0x1f, 0xec, 0x8e, 0x43, 0x57, 0xfa, 0x22, 0xd8, 0x57, - 0xc1, 0x2d, 0x39, 0x59, 0x90, 0x58, 0xee, 0x49, 0x8a, 0x35, 0xa7, 0x59, 0x69, 0x90, 0x5d, 0x84, - 0xf9, 0x47, 0xfe, 0xd0, 0x97, 0xd5, 0x02, 0xcd, 0x2a, 0x03, 0xd1, 0x88, 0x2e, 0x62, 0x5e, 0xa1, - 0x64, 0xb0, 0x15, 0x98, 0xe3, 0x41, 0xaf, 0x5a, 0x24, 0x0c, 0x87, 0xc8, 0xfb, 0x0a, 0x85, 0xae, - 0x2e, 0x90, 0xea, 0xca, 0xa8, 0xdd, 0x82, 0x72, 0x1c, 0x38, 0x2e, 0x3a, 0xe2, 0x13, 0xd2, 0xb9, - 0xec, 0xe0, 0x10, 0x17, 0x1d, 0xbb, 0x83, 0x31, 0xd7, 0xb7, 0xac, 0x8c, 0xdb, 0xb3, 0x1f, 0x5b, - 0xf6, 0x77, 0x73, 0xc0, 0x94, 0x00, 0x6d, 0xbc, 0x5b, 0xa3, 0xd5, 0x4d, 0x28, 0x47, 0x46, 0x16, - 0x7d, 0x61, 0x6b, 0xd3, 0x05, 0x73, 0x12, 0x22, 0xe6, 0x1a, 0x65, 0xc8, 0xfd, 0x5d, 0xbd, 0x91, - 0x31, 0x31, 0x5f, 0xe8, 0x40, 0x4f, 0xdc, 0x3e, 0xd7, 0xaa, 0x24, 0x00, 0xea, 0x36, 0x72, 0xfb, - 0x3c, 0x3a, 0x10, 0xca, 0xb5, 0x56, 0x26, 0x0b, 0x62, 0x3e, 0xf2, 0xc0, 0x13, 0x3d, 0x3f, 0xe8, - 0xeb, 0x94, 0x8b, 0x6d, 0xf4, 0xe0, 0x07, 0x3d, 0x7e, 0x82, 0xee, 0x3a, 0xfe, 0xb7, 0x5c, 0x2b, - 0x96, 0x05, 0x99, 0x0d, 0x8b, 0x52, 0x48, 0x77, 0xe0, 0x70, 0x4f, 0x84, 0xbd, 0xa8, 0x5a, 0x22, - 0x52, 0x06, 0x43, 0x4e, 0xcf, 0x95, 0xee, 0x9e, 0xd9, 0x49, 0xc9, 0x9c, 0xc1, 0xf0, 0x9c, 0xc7, - 0x3c, 0x8c, 0x7c, 0x11, 0x54, 0xcb, 0xea, 0x9c, 0xda, 0x64, 0x0c, 0x0a, 0x11, 0x6e, 0x0f, 0x0d, - 0x6b, 0xab, 0xe0, 0xd0, 0x18, 0xeb, 0xec, 0xa9, 0x10, 0x92, 0x87, 0x14, 0x58, 0x85, 0xf6, 0x4c, - 0x21, 0xf6, 0x09, 0x2c, 0x1b, 0x45, 0x75, 0xa9, 0xdc, 0x84, 0x22, 0x55, 0x83, 0xc9, 0xd5, 0xab, - 0xd9, 0x1a, 0x50, 0xec, 0x7d, 0x2e, 0x5d, 0x8c, 0xca, 0xd1, 0x5c, 0x76, 0x3d, 0x5f, 0x3a, 0xf9, - 0x1b, 0x3b, 0x55, 0x37, 0x7f, 0x59, 0xf0, 0xd6, 0x14, 0x8f, 0xf9, 0x9e, 0x51, 0x4e, 0x7a, 0xc6, - 0x16, 0x5c, 0x08, 0x85, 0x90, 0x1d, 0x1e, 0x1e, 0xfb, 0x1e, 0x7f, 0xec, 0x0e, 0x4d, 0x4a, 0xe5, - 0x61, 0xbc, 0x11, 0x84, 0xc8, 0x3d, 0xf1, 0x54, 0x0b, 0xc9, 0x82, 0xec, 0x43, 0x58, 0xa5, 0x34, - 0x38, 0xf0, 0x87, 0xfc, 0xeb, 0xc0, 0x3f, 0x79, 0xec, 0x06, 0x82, 0x6e, 0xbf, 0xe0, 0x9c, 0x9e, - 0x40, 0x25, 0x7b, 0x49, 0x71, 0xa9, 0x42, 0x49, 0x21, 0xec, 0x03, 0x28, 0x45, 0x23, 0x37, 0xe8, - 0x70, 0x49, 0xf7, 0x5f, 0x69, 0xad, 0x24, 0x0a, 0x28, 0xdc, 0x31, 0x04, 0xfb, 0x1e, 0x94, 0x34, - 0xc6, 0xde, 0x81, 0x79, 0x44, 0x8d, 0xda, 0x4b, 0x99, 0x45, 0x8e, 0x9a, 0x43, 0x4d, 0x86, 0xae, - 0xf4, 0x9e, 0xf1, 0x9e, 0xae, 0x7d, 0x63, 0xda, 0xbf, 0x5a, 0x50, 0x40, 0x26, 0x5b, 0x83, 0x22, - 0x72, 0x63, 0xd5, 0xb4, 0x85, 0x49, 0x11, 0x24, 0x4a, 0xd1, 0x78, 0xfa, 0xc1, 0xe7, 0xce, 0x3a, - 0xf8, 0x26, 0x2c, 0x99, 0x63, 0xa2, 0x1d, 0x69, 0x89, 0xb2, 0x20, 0xbb, 0x03, 0xe0, 0x4a, 0x19, - 0xfa, 0xdd, 0xb1, 0xe4, 0x28, 0x0f, 0x1e, 0x66, 0x3d, 0x3e, 0x8c, 0xfe, 0xb2, 0x1c, 0xef, 0x34, - 0x1f, 0xf2, 0xc9, 0x21, 0x36, 0x00, 0x27, 0x45, 0xb7, 0xff, 0xb4, 0x4c, 0xbf, 0xd4, 0x69, 0x82, - 0x77, 0xed, 0x07, 0xd1, 0x88, 0x7b, 0x92, 0xf7, 0x0e, 0x4c, 0x3a, 0xe2, 0xc9, 0xf3, 0x30, 0x7b, - 0x17, 0x96, 0x63, 0xa8, 0x3d, 0xc1, 0xcd, 0x67, 0x29, 0xbe, 0x1c, 0xca, 0x1a, 0x50, 0xa1, 0x5a, - 0xa3, 0x56, 0x63, 0xba, 0x63, 0x1a, 0xc2, 0x83, 0x7a, 0x62, 0x38, 0x1a, 0x70, 0xc9, 0x7b, 0x0f, - 0x44, 0x37, 0x32, 0x9d, 0x20, 0x03, 0x62, 0x37, 0xa1, 0x45, 0xc4, 0x50, 0x69, 0x90, 0x00, 0x18, - 0x77, 0xe2, 0x52, 0x85, 0x53, 0xa4, 0x70, 0xf2, 0xb0, 0xfd, 0x3e, 0xac, 0xaa, 0x23, 0x63, 0xef, - 0x34, 0xad, 0x0f, 0x1b, 0xb1, 0x27, 0x46, 0x5c, 0x5f, 0xa2, 0x32, 0xec, 0xeb, 0xa6, 0x4d, 0x2a, - 0xaa, 0x2e, 0xd4, 0x1a, 0x2c, 0x48, 0xb7, 0x8f, 0x99, 0xac, 0x92, 0xa7, 0xec, 0xc4, 0xb6, 0xfd, - 0x00, 0x2e, 0x26, 0x2b, 0x0e, 0x5b, 0xf1, 0x9a, 0x16, 0x14, 0xc9, 0xa5, 0x49, 0xb7, 0x5a, 0xae, - 0x4a, 0x15, 0xbd, 0x83, 0x14, 0x47, 0x33, 0xed, 0x3b, 0xe9, 0x40, 0xf5, 0x64, 0x9c, 0x56, 0x56, - 0x2a, 0xad, 0x18, 0x14, 0x24, 0x7e, 0xe3, 0x66, 0x29, 0x18, 0x1a, 0xdb, 0xf7, 0x60, 0x2d, 0x5e, - 0x4c, 0xf7, 0x1e, 0xa5, 0xdf, 0x06, 0x2a, 0xdc, 0xb8, 0xce, 0x95, 0x89, 0x22, 0xd0, 0xe7, 0xdc, - 0x7c, 0x30, 0xc8, 0xb0, 0x6f, 0xc1, 0xe5, 0x53, 0x9e, 0xf4, 0xa9, 0xf0, 0x4a, 0x0c, 0xa8, 0xa5, - 0x48, 0x00, 0xfb, 0x26, 0x2c, 0x98, 0x25, 0x14, 0xe2, 0x24, 0x96, 0x97, 0xc6, 0xd3, 0xbf, 0x4f, - 0xf6, 0x23, 0xb8, 0x92, 0xdb, 0x2e, 0x25, 0xe3, 0x76, 0x7e, 0xc3, 0x4a, 0x6b, 0x35, 0x69, 0x93, - 0x7a, 0x26, 0x1d, 0x43, 0x1b, 0xe6, 0x29, 0x5d, 0xd9, 0x27, 0x50, 0xea, 0x52, 0xe9, 0x9a, 0x75, - 0x1b, 0xf1, 0x3a, 0xf5, 0x28, 0x3b, 0xde, 0x69, 0x3a, 0x3c, 0x12, 0xe3, 0xd0, 0xe3, 0x58, 0xd7, - 0x91, 0x63, 0xf8, 0xf6, 0x32, 0x2c, 0x3e, 0x19, 0x47, 0x71, 0xa3, 0xb6, 0x7f, 0xb2, 0x60, 0x05, - 0x01, 0x4a, 0x27, 0xa3, 0xea, 0xb5, 0xb8, 0x7b, 0xe3, 0x2d, 0x2c, 0xb6, 0x2f, 0xe1, 0x3b, 0xe2, - 0xf7, 0x57, 0x1b, 0x4b, 0x4f, 0x42, 0xee, 0x0e, 0x06, 0xc2, 0x53, 0x6c, 0xd3, 0xb6, 0xdf, 0x83, - 0x39, 0xbf, 0x87, 0xc5, 0x70, 0x0e, 0x17, 0x19, 0xec, 0x23, 0x00, 0xf5, 0xa9, 0xdd, 0x75, 0xa5, - 0x5b, 0x2d, 0x9c, 0xc7, 0x4f, 0x11, 0xed, 0x7d, 0x15, 0xa2, 0x3a, 0x89, 0x0e, 0xf1, 0x7f, 0x48, - 0xb0, 0x09, 0xa0, 0xdf, 0x5a, 0x58, 0xd1, 0x6b, 0x99, 0x2f, 0xd5, 0xa2, 0x39, 0x94, 0xfd, 0x29, - 0x94, 0x1f, 0xf9, 0xc1, 0x51, 0x67, 0xe0, 0x7b, 0x9c, 0xed, 0xc0, 0xfc, 0xc0, 0x0f, 0x8e, 0xcc, - 0x5e, 0xeb, 0xa7, 0xf7, 0xc2, 0x3d, 0x9a, 0xb8, 0xc0, 0x51, 0xcc, 0xd6, 0x0f, 0x16, 0x14, 0x31, - 0x6a, 0x1e, 0xb2, 0xcf, 0xa0, 0x1c, 0x4b, 0xcc, 0x92, 0xd7, 0x60, 0x5e, 0xf6, 0xda, 0xa5, 0xcc, - 0x54, 0x7c, 0x45, 0x33, 0xec, 0x73, 0xa8, 0xc4, 0xe4, 0xc3, 0xd6, 0x7f, 0x71, 0xd1, 0xea, 0xc0, - 0x8a, 0xee, 0x8a, 0x77, 0x79, 0xc0, 0x43, 0x57, 0x8a, 0x38, 0x2e, 0x92, 0x27, 0xe7, 0x34, 0xad, - 0xf5, 0xd9, 0x4e, 0x7f, 0x29, 0x40, 0x09, 0x5f, 0x6f, 0x3e, 0x0f, 0xd9, 0x3d, 0x58, 0xfa, 0xc2, - 0x0f, 0x7a, 0xf1, 0x2b, 0x96, 0x4d, 0x79, 0xf6, 0x1a, 0x87, 0xb5, 0x69, 0x53, 0xa9, 0xd3, 0x2e, - 0x9a, 0xd7, 0x84, 0xc7, 0x03, 0xc9, 0xce, 0x78, 0xb6, 0xd5, 0x2e, 0x9f, 0xc2, 0x63, 0x17, 0x7b, - 0x50, 0x49, 0x3d, 0x09, 0xd9, 0x7a, 0x8e, 0x99, 0x7e, 0x28, 0x9e, 0xe7, 0xe6, 0x2e, 0x40, 0xd2, - 0xb4, 0xd8, 0xb4, 0x36, 0x67, 0x9c, 0xac, 0x4f, 0x9d, 0x8b, 0x1d, 0x3d, 0x34, 0x47, 0x52, 0xdd, - 0xef, 0x5c, 0x57, 0x6f, 0x4f, 0xed, 0xa6, 0x29, 0x67, 0x87, 0x70, 0x21, 0xd7, 0x54, 0xd8, 0xc6, - 0xe9, 0x35, 0x99, 0x3e, 0x59, 0x6b, 0x9c, 0x4d, 0x88, 0xfd, 0x7e, 0x93, 0x6a, 0xd1, 0xa6, 0x59, - 0xfd, 0xb3, 0x67, 0xfb, 0x2c, 0x42, 0x3a, 0xe6, 0xd6, 0x97, 0xb0, 0xd2, 0x91, 0x21, 0x77, 0x87, - 0x7e, 0xd0, 0x37, 0x19, 0x73, 0x07, 0x8a, 0xfa, 0x5d, 0xfc, 0x6f, 0x6f, 0xf8, 0xba, 0xd5, 0xae, - 0xbe, 0x78, 0x5d, 0xb7, 0x5e, 0xbe, 0xae, 0x5b, 0x7f, 0xbc, 0xae, 0x5b, 0x3f, 0xbe, 0xa9, 0xcf, - 0xbc, 0x7c, 0x53, 0x9f, 0xf9, 0xed, 0x4d, 0x7d, 0xa6, 0x5b, 0xa4, 0xbf, 0x92, 0x37, 0xfe, 0x0e, - 0x00, 0x00, 0xff, 0xff, 0xab, 0xa2, 0x10, 0x06, 0xcb, 0x0e, 0x00, 0x00, + // 1574 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0xcd, 0x6e, 0x1b, 0x47, + 0x12, 0xd6, 0x88, 0x14, 0x29, 0x16, 0x25, 0x59, 0x6a, 0xdb, 0x32, 0x4d, 0x79, 0x25, 0x61, 0x56, + 0xd8, 0xd5, 0x2e, 0xd6, 0x94, 0x45, 0x7b, 0xe1, 0x5d, 0x7b, 0xb1, 0x8b, 0x65, 0x24, 0xf9, 0x4f, + 0x72, 0x9c, 0xa1, 0xa2, 0x43, 0x6e, 0xc3, 0x61, 0x9b, 0x1e, 0x88, 0x9c, 0xa6, 0x67, 0x9a, 0x82, + 0x98, 0x53, 0x4e, 0x39, 0xe5, 0x90, 0x37, 0x08, 0x02, 0x04, 0xc8, 0x83, 0xe4, 0xe2, 0xa3, 0x8f, + 0x41, 0x0e, 0x46, 0x60, 0x3f, 0x41, 0x72, 0xcb, 0x2d, 0xa8, 0xea, 0xee, 0xf9, 0x13, 0x25, 0x23, + 0xc9, 0x49, 0x53, 0x5f, 0x7f, 0x5d, 0x5d, 0x55, 0x5d, 0x3f, 0x4d, 0xc1, 0xb5, 0xe1, 0x71, 0x6f, + 0x4b, 0xf2, 0xc1, 0x50, 0x0c, 0x3b, 0xea, 0x6f, 0x63, 0x18, 0x0a, 0x29, 0x58, 0x59, 0x83, 0xf5, + 0x2b, 0x32, 0x74, 0x3d, 0xbe, 0x75, 0xb2, 0xbd, 0x45, 0x1f, 0x6a, 0xb9, 0xbe, 0xec, 0x89, 0xc1, + 0x40, 0x04, 0x08, 0xab, 0x2f, 0x8d, 0xdf, 0xec, 0xf9, 0xf2, 0xc5, 0xa8, 0xd3, 0xf0, 0xc4, 0x60, + 0xab, 0x27, 0x7a, 0x62, 0x8b, 0xe0, 0xce, 0xe8, 0x39, 0x49, 0x24, 0xd0, 0x97, 0xa2, 0xdb, 0x9f, + 0x5b, 0xb0, 0x78, 0x88, 0x6a, 0x5b, 0xe3, 0x47, 0x3b, 0x0e, 0x7f, 0x39, 0xe2, 0x91, 0x64, 0x35, + 0x28, 0xd3, 0x51, 0x8f, 0x76, 0x6a, 0xd6, 0xba, 0xb5, 0x39, 0xe7, 0x18, 0x91, 0xad, 0x02, 0x74, + 0xfa, 0xc2, 0x3b, 0x6e, 0x4b, 0x37, 0x94, 0xb5, 0xe9, 0x75, 0x6b, 0xb3, 0xe2, 0xa4, 0x10, 0x56, + 0x87, 0x59, 0x92, 0x76, 0x83, 0x6e, 0xad, 0x40, 0xab, 0xb1, 0xcc, 0x6e, 0x40, 0xe5, 0xe5, 0x88, + 0x87, 0xe3, 0x03, 0xd1, 0xe5, 0xb5, 0x19, 0x5a, 0x4c, 0x00, 0x3b, 0x80, 0xa5, 0x94, 0x1d, 0xd1, + 0x50, 0x04, 0x11, 0x67, 0x1b, 0x30, 0x43, 0x27, 0x93, 0x19, 0xd5, 0xe6, 0x42, 0x43, 0xc7, 0xa4, + 0x41, 0x54, 0x47, 0x2d, 0xb2, 0xdb, 0x50, 0x1e, 0x70, 0x19, 0xfa, 0x5e, 0x44, 0x16, 0x55, 0x9b, + 0xd7, 0xb3, 0x3c, 0x54, 0x79, 0xa0, 0x08, 0x8e, 0x61, 0xda, 0x2c, 0xe5, 0xb7, 0x5e, 0xb4, 0xbf, + 0x99, 0x86, 0xf9, 0x36, 0x77, 0x43, 0xef, 0x85, 0x89, 0xc4, 0x3d, 0x28, 0x1e, 0xba, 0xbd, 0xa8, + 0x66, 0xad, 0x17, 0x36, 0xab, 0xcd, 0xf5, 0x58, 0x6f, 0x86, 0xd5, 0x40, 0xca, 0x6e, 0x20, 0xc3, + 0x71, 0xab, 0xf8, 0xea, 0xcd, 0xda, 0x94, 0x43, 0x7b, 0xd8, 0x06, 0xcc, 0x1f, 0xf8, 0xc1, 0xce, + 0x28, 0x74, 0xa5, 0x2f, 0x82, 0x03, 0x65, 0xdc, 0xbc, 0x93, 0x05, 0x89, 0xe5, 0x9e, 0xa6, 0x58, + 0x05, 0xcd, 0x4a, 0x83, 0xec, 0x0a, 0xcc, 0xec, 0xfb, 0x03, 0x5f, 0xd6, 0x8a, 0xb4, 0xaa, 0x04, + 0x44, 0x23, 0xba, 0x88, 0x19, 0x85, 0x92, 0xc0, 0x16, 0xa1, 0xc0, 0x83, 0x6e, 0xad, 0x44, 0x18, + 0x7e, 0x22, 0xef, 0x23, 0x0c, 0x74, 0x6d, 0x96, 0xa2, 0xae, 0x84, 0xfa, 0x5d, 0xa8, 0xc4, 0x86, + 0xe3, 0xa6, 0x63, 0x3e, 0xa6, 0x38, 0x57, 0x1c, 0xfc, 0xc4, 0x4d, 0x27, 0x6e, 0x7f, 0xc4, 0xf5, + 0x2d, 0x2b, 0xe1, 0xde, 0xf4, 0xbf, 0x2c, 0xfb, 0xb3, 0x02, 0x30, 0x15, 0x80, 0x16, 0xde, 0xad, + 0x89, 0xd5, 0x1d, 0xa8, 0x44, 0x26, 0x2c, 0xfa, 0xc2, 0x96, 0x27, 0x07, 0xcc, 0x49, 0x88, 0x98, + 0x6b, 0x94, 0x21, 0x8f, 0x76, 0xf4, 0x41, 0x46, 0xc4, 0x7c, 0x21, 0x87, 0x9e, 0xb9, 0x3d, 0xae, + 0xa3, 0x92, 0x00, 0x18, 0xb7, 0xa1, 0xdb, 0xe3, 0xd1, 0xa1, 0x50, 0xaa, 0x75, 0x64, 0xb2, 0x20, + 0xe6, 0x23, 0x0f, 0x3c, 0xd1, 0xf5, 0x83, 0x9e, 0x4e, 0xb9, 0x58, 0x46, 0x0d, 0x7e, 0xd0, 0xe5, + 0xa7, 0xa8, 0xae, 0xed, 0x7f, 0xca, 0x75, 0xc4, 0xb2, 0x20, 0xb3, 0x61, 0x4e, 0x0a, 0xe9, 0xf6, + 0x1d, 0xee, 0x89, 0xb0, 0x1b, 0xd5, 0xca, 0x44, 0xca, 0x60, 0xc8, 0xe9, 0xba, 0xd2, 0xdd, 0x35, + 0x27, 0xa9, 0x30, 0x67, 0x30, 0xf4, 0xf3, 0x84, 0x87, 0x91, 0x2f, 0x82, 0x5a, 0x45, 0xf9, 0xa9, + 0x45, 0xc6, 0xa0, 0x18, 0xe1, 0xf1, 0xb0, 0x6e, 0x6d, 0x16, 0x1d, 0xfa, 0xc6, 0x3a, 0x7b, 0x2e, + 0x84, 0xe4, 0x21, 0x19, 0x56, 0xa5, 0x33, 0x53, 0x88, 0x7d, 0x0a, 0x0b, 0x26, 0xa2, 0xba, 0x54, + 0xee, 0x40, 0x89, 0xaa, 0xc1, 0xe4, 0xea, 0x8d, 0x6c, 0x0d, 0x28, 0xf6, 0x01, 0x97, 0x2e, 0x5a, + 0xe5, 0x68, 0x2e, 0xbb, 0x95, 0x2f, 0x9d, 0xfc, 0x8d, 0x9d, 0xa9, 0x9b, 0x5f, 0x2c, 0xb8, 0x3c, + 0x41, 0x63, 0xbe, 0x67, 0x54, 0x92, 0x9e, 0xb1, 0x09, 0x97, 0x42, 0x21, 0x64, 0x9b, 0x87, 0x27, + 0xbe, 0xc7, 0x9f, 0xba, 0x03, 0x93, 0x52, 0x79, 0x18, 0x6f, 0x04, 0x21, 0x52, 0x4f, 0x3c, 0xd5, + 0x42, 0xb2, 0x20, 0xfb, 0x07, 0x2c, 0x51, 0x1a, 0x1c, 0xfa, 0x03, 0xfe, 0x71, 0xe0, 0x9f, 0x3e, + 0x75, 0x03, 0x41, 0xb7, 0x5f, 0x74, 0xce, 0x2e, 0x60, 0x24, 0xbb, 0x49, 0x71, 0xa9, 0x42, 0x49, + 0x21, 0xec, 0xef, 0x50, 0x8e, 0x86, 0x6e, 0xd0, 0xe6, 0x92, 0xee, 0xbf, 0xda, 0x5c, 0x4c, 0x22, + 0xa0, 0x70, 0xc7, 0x10, 0xec, 0x87, 0x50, 0xd6, 0x18, 0xfb, 0x33, 0xcc, 0x20, 0x6a, 0xa2, 0x3d, + 0x9f, 0xd9, 0xe4, 0xa8, 0x35, 0x8c, 0xc9, 0xc0, 0x95, 0xde, 0x0b, 0xde, 0xd5, 0xb5, 0x6f, 0x44, + 0xfb, 0x3b, 0x0b, 0x8a, 0xc8, 0x64, 0xcb, 0x50, 0x42, 0x6e, 0x1c, 0x35, 0x2d, 0x61, 0x52, 0x04, + 0x49, 0xa4, 0xe8, 0x7b, 0xb2, 0xe3, 0x85, 0xf3, 0x1c, 0xdf, 0x80, 0x79, 0xe3, 0x26, 0xca, 0x91, + 0x0e, 0x51, 0x16, 0x64, 0xf7, 0x01, 0x5c, 0x29, 0x43, 0xbf, 0x33, 0x92, 0x1c, 0xc3, 0x83, 0xce, + 0xac, 0xc4, 0xce, 0xe8, 0xc9, 0x72, 0xb2, 0xdd, 0x78, 0xc2, 0xc7, 0x47, 0xd8, 0x00, 0x9c, 0x14, + 0xdd, 0xfe, 0xc9, 0x32, 0xfd, 0x52, 0xa7, 0x09, 0xde, 0xb5, 0x1f, 0x44, 0x43, 0xee, 0x49, 0xde, + 0x3d, 0x34, 0xe9, 0x88, 0x9e, 0xe7, 0x61, 0xf6, 0x17, 0x58, 0x88, 0xa1, 0xd6, 0x18, 0x0f, 0x9f, + 0x26, 0xfb, 0x72, 0x28, 0x5b, 0x87, 0x2a, 0xd5, 0x1a, 0xb5, 0x1a, 0xd3, 0x1d, 0xd3, 0x10, 0x3a, + 0xea, 0x89, 0xc1, 0xb0, 0xcf, 0x25, 0xef, 0x3e, 0x16, 0x9d, 0xc8, 0x74, 0x82, 0x0c, 0x88, 0xdd, + 0x84, 0x36, 0x11, 0x43, 0xa5, 0x41, 0x02, 0xa0, 0xdd, 0x89, 0x4a, 0x65, 0x4e, 0x89, 0xcc, 0xc9, + 0xc3, 0xf6, 0xdf, 0x60, 0x49, 0xb9, 0x8c, 0xbd, 0xd3, 0xb4, 0x3e, 0x6c, 0xc4, 0x9e, 0x18, 0x72, + 0x7d, 0x89, 0x4a, 0xb0, 0x6f, 0x99, 0x36, 0xa9, 0xa8, 0xba, 0x50, 0xeb, 0x30, 0x2b, 0xdd, 0x1e, + 0x66, 0xb2, 0x4a, 0x9e, 0x8a, 0x13, 0xcb, 0xf6, 0x63, 0xb8, 0x92, 0xec, 0x38, 0x6a, 0xc6, 0x7b, + 0x9a, 0x50, 0x22, 0x95, 0x26, 0xdd, 0xea, 0xb9, 0x2a, 0x55, 0xf4, 0x36, 0x52, 0x1c, 0xcd, 0xb4, + 0xef, 0xa7, 0x0d, 0xd5, 0x8b, 0x71, 0x5a, 0x59, 0xa9, 0xb4, 0x62, 0x50, 0x94, 0x38, 0xe3, 0xa6, + 0xc9, 0x18, 0xfa, 0xb6, 0x1f, 0xc2, 0x72, 0xbc, 0x99, 0xee, 0x3d, 0x4a, 0xbf, 0x0d, 0x94, 0xb9, + 0x71, 0x9d, 0x2b, 0x11, 0x83, 0x40, 0xe3, 0xdc, 0x0c, 0x0c, 0x12, 0xec, 0xbb, 0x70, 0xed, 0x8c, + 0x26, 0xed, 0x15, 0x5e, 0x89, 0x01, 0x75, 0x28, 0x12, 0xc0, 0xbe, 0x03, 0xb3, 0x66, 0x0b, 0x99, + 0x38, 0x8e, 0xc3, 0x4b, 0xdf, 0x93, 0xe7, 0x93, 0xbd, 0x0f, 0xd7, 0x73, 0xc7, 0xa5, 0xc2, 0xb8, + 0x95, 0x3f, 0xb0, 0xda, 0x5c, 0x4a, 0xda, 0xa4, 0x5e, 0x49, 0xdb, 0xd0, 0x82, 0x19, 0x4a, 0x57, + 0xf6, 0x6f, 0x28, 0x77, 0xa8, 0x74, 0xcd, 0xbe, 0xb5, 0x78, 0x9f, 0x7a, 0x94, 0x9d, 0x6c, 0x37, + 0x1c, 0x1e, 0x89, 0x51, 0xe8, 0x71, 0xac, 0xeb, 0xc8, 0x31, 0x7c, 0x7b, 0x01, 0xe6, 0x9e, 0x8d, + 0xa2, 0xb8, 0x51, 0xdb, 0x5f, 0x5b, 0xb0, 0x88, 0x00, 0xa5, 0x93, 0x89, 0xea, 0xcd, 0xb8, 0x7b, + 0xe3, 0x2d, 0xcc, 0xb5, 0xae, 0xe2, 0x3b, 0xe2, 0x87, 0x37, 0x6b, 0xf3, 0xcf, 0x42, 0xee, 0xf6, + 0xfb, 0xc2, 0x53, 0x6c, 0xd3, 0xb6, 0xff, 0x0a, 0x05, 0xbf, 0x8b, 0xc5, 0x70, 0x01, 0x17, 0x19, + 0xec, 0x9f, 0x00, 0x6a, 0xd4, 0xee, 0xb8, 0xd2, 0xad, 0x15, 0x2f, 0xe2, 0xa7, 0x88, 0xf6, 0x81, + 0x32, 0x51, 0x79, 0xa2, 0x4d, 0xfc, 0x03, 0x21, 0xd8, 0x00, 0xd0, 0x6f, 0x2d, 0xac, 0xe8, 0xe5, + 0xcc, 0xa4, 0x9a, 0x33, 0x4e, 0xd9, 0xff, 0x85, 0xca, 0xbe, 0x1f, 0x1c, 0xb7, 0xfb, 0xbe, 0xc7, + 0xd9, 0x36, 0xcc, 0xf4, 0xfd, 0xe0, 0xd8, 0x9c, 0xb5, 0x72, 0xf6, 0x2c, 0x3c, 0xa3, 0x81, 0x1b, + 0x1c, 0xc5, 0xb4, 0xf7, 0x81, 0x51, 0x77, 0x1e, 0x0d, 0x06, 0x6e, 0x38, 0x36, 0x66, 0xab, 0x24, + 0xdb, 0xf3, 0xfb, 0x92, 0x87, 0xa9, 0x24, 0x53, 0x00, 0x66, 0x73, 0x2f, 0x14, 0xa3, 0x61, 0xcb, + 0x64, 0xad, 0x11, 0xed, 0x3d, 0xb8, 0x9c, 0xd1, 0x16, 0xa7, 0x10, 0xbe, 0xb2, 0xa4, 0xb1, 0xeb, + 0x7a, 0x76, 0x58, 0x28, 0xf2, 0x03, 0x54, 0xe1, 0x28, 0x9e, 0xfd, 0xb3, 0x05, 0x8b, 0xf9, 0xb5, + 0x89, 0x65, 0x88, 0xcf, 0x9d, 0xa1, 0x1b, 0x7c, 0x20, 0x46, 0x81, 0x7a, 0x59, 0x17, 0x9c, 0x04, + 0xc0, 0x76, 0xc9, 0xc3, 0x50, 0x84, 0xed, 0x98, 0x52, 0x20, 0x4a, 0x0e, 0x65, 0x7b, 0x50, 0xe9, + 0xbb, 0x92, 0x07, 0x9e, 0xcf, 0x23, 0xba, 0xef, 0x6a, 0x73, 0xf3, 0x5c, 0x1b, 0x1b, 0xfb, 0x86, + 0x4a, 0x8f, 0x40, 0x27, 0xd9, 0x5a, 0xff, 0x0f, 0x2c, 0x64, 0x17, 0xdf, 0xf7, 0x42, 0xb4, 0x52, + 0x2f, 0xc4, 0xe6, 0x17, 0x16, 0x94, 0x30, 0x81, 0x78, 0xc8, 0xfe, 0x07, 0x95, 0x38, 0xdb, 0x59, + 0x12, 0xae, 0x7c, 0x05, 0xd4, 0xaf, 0x66, 0x96, 0xe2, 0x6a, 0x99, 0x62, 0xff, 0x87, 0x6a, 0x4c, + 0x3e, 0x6a, 0xfe, 0x1e, 0x15, 0xcd, 0xaf, 0x2c, 0x58, 0xd4, 0x13, 0xea, 0x01, 0x0f, 0x78, 0xe8, + 0x4a, 0x11, 0x1b, 0x46, 0xa9, 0x9a, 0xd3, 0x9a, 0xce, 0xfb, 0xf3, 0x0d, 0x7b, 0x0c, 0xd5, 0x54, + 0x40, 0xd9, 0xca, 0xa4, 0x30, 0x1b, 0x25, 0x37, 0x26, 0x2f, 0xc6, 0x16, 0x7e, 0x5b, 0x84, 0x32, + 0xbe, 0xca, 0x7d, 0x1e, 0xb2, 0x87, 0x30, 0xbf, 0xe7, 0x07, 0xdd, 0xf8, 0xd7, 0x09, 0x9b, 0xf0, + 0x73, 0xc6, 0xe8, 0xad, 0x4f, 0x5a, 0x4a, 0x85, 0x6e, 0xce, 0xbc, 0x12, 0x3d, 0x1e, 0x48, 0x76, + 0xce, 0x73, 0xbc, 0x7e, 0xed, 0x0c, 0x1e, 0xab, 0xd8, 0x85, 0x6a, 0xea, 0xa9, 0x9f, 0x76, 0xf2, + 0xcc, 0x0f, 0x80, 0x8b, 0xd4, 0x3c, 0x00, 0x48, 0x86, 0x11, 0x9b, 0x34, 0xbe, 0x8c, 0x92, 0x95, + 0x89, 0x6b, 0xb1, 0xa2, 0x27, 0xc6, 0x25, 0x35, 0xd5, 0x2e, 0x54, 0xf5, 0xa7, 0x89, 0x53, 0x32, + 0xa5, 0xec, 0x08, 0x2e, 0xe5, 0x86, 0x05, 0x5b, 0x3b, 0xbb, 0x27, 0x33, 0xff, 0xea, 0xeb, 0xe7, + 0x13, 0x62, 0xbd, 0x9f, 0xa4, 0x46, 0xaf, 0x19, 0x42, 0xef, 0xd7, 0x6c, 0x9f, 0x47, 0x48, 0xdb, + 0xdc, 0xfc, 0x10, 0x16, 0xdb, 0x32, 0xe4, 0xee, 0xc0, 0x0f, 0x7a, 0x26, 0x63, 0xee, 0x43, 0x49, + 0xff, 0xde, 0xf9, 0xad, 0x37, 0x7c, 0xcb, 0x6a, 0xd5, 0x5e, 0xbd, 0x5d, 0xb5, 0x5e, 0xbf, 0x5d, + 0xb5, 0x7e, 0x7c, 0xbb, 0x6a, 0x7d, 0xf9, 0x6e, 0x75, 0xea, 0xf5, 0xbb, 0xd5, 0xa9, 0xef, 0xdf, + 0xad, 0x4e, 0x75, 0x4a, 0xf4, 0x2f, 0x82, 0xdb, 0xbf, 0x06, 0x00, 0x00, 0xff, 0xff, 0xfc, 0x62, + 0x50, 0xf3, 0xa3, 0x10, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1639,6 +1819,7 @@ var _Pusher_serviceDesc = grpc.ServiceDesc{ // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type MetricsGeneratorClient interface { PushSpans(ctx context.Context, in *PushSpansRequest, opts ...grpc.CallOption) (*PushResponse, error) + SpanSummary(ctx context.Context, in *SpanSummaryRequest, opts ...grpc.CallOption) (*SpanSummaryResponse, error) } type metricsGeneratorClient struct { @@ -1658,9 +1839,19 @@ func (c *metricsGeneratorClient) PushSpans(ctx context.Context, in *PushSpansReq return out, nil } +func (c *metricsGeneratorClient) SpanSummary(ctx context.Context, in *SpanSummaryRequest, opts ...grpc.CallOption) (*SpanSummaryResponse, error) { + out := new(SpanSummaryResponse) + err := c.cc.Invoke(ctx, "/tempopb.MetricsGenerator/SpanSummary", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // MetricsGeneratorServer is the server API for MetricsGenerator service. type MetricsGeneratorServer interface { PushSpans(context.Context, *PushSpansRequest) (*PushResponse, error) + SpanSummary(context.Context, *SpanSummaryRequest) (*SpanSummaryResponse, error) } // UnimplementedMetricsGeneratorServer can be embedded to have forward compatible implementations. @@ -1670,6 +1861,9 @@ type UnimplementedMetricsGeneratorServer struct { func (*UnimplementedMetricsGeneratorServer) PushSpans(ctx context.Context, req *PushSpansRequest) (*PushResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method PushSpans not implemented") } +func (*UnimplementedMetricsGeneratorServer) SpanSummary(ctx context.Context, req *SpanSummaryRequest) (*SpanSummaryResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method SpanSummary not implemented") +} func RegisterMetricsGeneratorServer(s *grpc.Server, srv MetricsGeneratorServer) { s.RegisterService(&_MetricsGenerator_serviceDesc, srv) @@ -1693,6 +1887,24 @@ func _MetricsGenerator_PushSpans_Handler(srv interface{}, ctx context.Context, d return interceptor(ctx, in, info, handler) } +func _MetricsGenerator_SpanSummary_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(SpanSummaryRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MetricsGeneratorServer).SpanSummary(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/tempopb.MetricsGenerator/SpanSummary", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MetricsGeneratorServer).SpanSummary(ctx, req.(*SpanSummaryRequest)) + } + return interceptor(ctx, in, info, handler) +} + var _MetricsGenerator_serviceDesc = grpc.ServiceDesc{ ServiceName: "tempopb.MetricsGenerator", HandlerType: (*MetricsGeneratorServer)(nil), @@ -1701,6 +1913,10 @@ var _MetricsGenerator_serviceDesc = grpc.ServiceDesc{ MethodName: "PushSpans", Handler: _MetricsGenerator_PushSpans_Handler, }, + { + MethodName: "SpanSummary", + Handler: _MetricsGenerator_SpanSummary_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "pkg/tempopb/tempo.proto", @@ -3164,6 +3380,140 @@ func (m *LinkSlice) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *SpanSummaryRequest) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *SpanSummaryRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SpanSummaryRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.GroupBy) > 0 { + i -= len(m.GroupBy) + copy(dAtA[i:], m.GroupBy) + i = encodeVarintTempo(dAtA, i, uint64(len(m.GroupBy))) + i-- + dAtA[i] = 0x12 + } + if len(m.TagFilter) > 0 { + for iNdEx := len(m.TagFilter) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.TagFilter[iNdEx]) + copy(dAtA[i:], m.TagFilter[iNdEx]) + i = encodeVarintTempo(dAtA, i, uint64(len(m.TagFilter[iNdEx]))) + i-- + dAtA[i] = 0xa + } + } + return len(dAtA) - i, nil +} + +func (m *SpanSummaryResponse) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *SpanSummaryResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SpanSummaryResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Stats) > 0 { + for iNdEx := len(m.Stats) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Stats[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTempo(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + } + return len(dAtA) - i, nil +} + +func (m *SpanSummaryGroup) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *SpanSummaryGroup) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SpanSummaryGroup) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Latencies) > 0 { + for k := range m.Latencies { + v := m.Latencies[k] + baseI := i + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(v)))) + i-- + dAtA[i] = 0x11 + i -= len(k) + copy(dAtA[i:], k) + i = encodeVarintTempo(dAtA, i, uint64(len(k))) + i-- + dAtA[i] = 0xa + i = encodeVarintTempo(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x22 + } + } + if m.ErrorSpanCount != 0 { + i = encodeVarintTempo(dAtA, i, uint64(m.ErrorSpanCount)) + i-- + dAtA[i] = 0x18 + } + if m.SpanCount != 0 { + i = encodeVarintTempo(dAtA, i, uint64(m.SpanCount)) + i-- + dAtA[i] = 0x10 + } + if len(m.Name) > 0 { + i -= len(m.Name) + copy(dAtA[i:], m.Name) + i = encodeVarintTempo(dAtA, i, uint64(len(m.Name))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func encodeVarintTempo(dAtA []byte, offset int, v uint64) int { offset -= sovTempo(v) base := offset @@ -3655,16 +4005,77 @@ func (m *LinkSlice) Size() (n int) { return n } -func sovTempo(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 +func (m *SpanSummaryRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.TagFilter) > 0 { + for _, s := range m.TagFilter { + l = len(s) + n += 1 + l + sovTempo(uint64(l)) + } + } + l = len(m.GroupBy) + if l > 0 { + n += 1 + l + sovTempo(uint64(l)) + } + return n } -func sozTempo(x uint64) (n int) { - return sovTempo(uint64((x << 1) ^ uint64((int64(x) >> 63)))) + +func (m *SpanSummaryResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.Stats) > 0 { + for _, e := range m.Stats { + l = e.Size() + n += 1 + l + sovTempo(uint64(l)) + } + } + return n } -func (m *TraceByIDRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { + +func (m *SpanSummaryGroup) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Name) + if l > 0 { + n += 1 + l + sovTempo(uint64(l)) + } + if m.SpanCount != 0 { + n += 1 + sovTempo(uint64(m.SpanCount)) + } + if m.ErrorSpanCount != 0 { + n += 1 + sovTempo(uint64(m.ErrorSpanCount)) + } + if len(m.Latencies) > 0 { + for k, v := range m.Latencies { + _ = k + _ = v + mapEntrySize := 1 + len(k) + sovTempo(uint64(len(k))) + 1 + 8 + n += mapEntrySize + 1 + sovTempo(uint64(mapEntrySize)) + } + } + return n +} + +func sovTempo(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 +} +func sozTempo(x uint64) (n int) { + return sovTempo(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (m *TraceByIDRequest) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { preIndex := iNdEx var wire uint64 for shift := uint(0); ; shift += 7 { @@ -6733,6 +7144,430 @@ func (m *LinkSlice) Unmarshal(dAtA []byte) error { } return nil } +func (m *SpanSummaryRequest) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTempo + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: SpanSummaryRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: SpanSummaryRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TagFilter", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTempo + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTempo + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTempo + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.TagFilter = append(m.TagFilter, string(dAtA[iNdEx:postIndex])) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field GroupBy", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTempo + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTempo + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTempo + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.GroupBy = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTempo(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTempo + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *SpanSummaryResponse) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTempo + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: SpanSummaryResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: SpanSummaryResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Stats", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTempo + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTempo + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTempo + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Stats = append(m.Stats, &SpanSummaryGroup{}) + if err := m.Stats[len(m.Stats)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTempo(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTempo + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *SpanSummaryGroup) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTempo + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: SpanSummaryGroup: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: SpanSummaryGroup: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTempo + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTempo + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTempo + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Name = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field SpanCount", wireType) + } + m.SpanCount = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTempo + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.SpanCount |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 3: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ErrorSpanCount", wireType) + } + m.ErrorSpanCount = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTempo + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ErrorSpanCount |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Latencies", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTempo + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTempo + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTempo + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Latencies == nil { + m.Latencies = make(map[string]float64) + } + var mapkey string + var mapvalue float64 + for iNdEx < postIndex { + entryPreIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTempo + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + if fieldNum == 1 { + var stringLenmapkey uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTempo + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLenmapkey |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLenmapkey := int(stringLenmapkey) + if intStringLenmapkey < 0 { + return ErrInvalidLengthTempo + } + postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthTempo + } + if postStringIndexmapkey > l { + return io.ErrUnexpectedEOF + } + mapkey = string(dAtA[iNdEx:postStringIndexmapkey]) + iNdEx = postStringIndexmapkey + } else if fieldNum == 2 { + var mapvaluetemp uint64 + if (iNdEx + 8) > l { + return io.ErrUnexpectedEOF + } + mapvaluetemp = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:])) + iNdEx += 8 + mapvalue = math.Float64frombits(mapvaluetemp) + } else { + iNdEx = entryPreIndex + skippy, err := skipTempo(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTempo + } + if (iNdEx + skippy) > postIndex { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + m.Latencies[mapkey] = mapvalue + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTempo(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTempo + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipTempo(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/pkg/tempopb/tempo.proto b/pkg/tempopb/tempo.proto index 2445942fd29..29cd177b5ff 100644 --- a/pkg/tempopb/tempo.proto +++ b/pkg/tempopb/tempo.proto @@ -14,6 +14,7 @@ service Pusher { service MetricsGenerator { rpc PushSpans(PushSpansRequest) returns (PushResponse) {}; + rpc SpanSummary(SpanSummaryRequest) returns (SpanSummaryResponse) {}; } service Querier { @@ -180,4 +181,21 @@ message TraceBytes { // the required marshalling/unmarshalling functions. message LinkSlice { repeated tempopb.trace.v1.Span.Link links = 1; -} \ No newline at end of file +} + +message SpanSummaryRequest { + // tagFilter is a list of tags to filter on in the form of a traceql query, ie: tag=value + repeated string tagFilter = 1; + string groupBy = 2; +} + +message SpanSummaryResponse { + repeated SpanSummaryGroup stats = 1; +} + +message SpanSummaryGroup { + string name = 1; + int64 spanCount = 2; + int64 errorSpanCount = 3; + map latencies = 4; +} From c26bc472d1de08cfd9ad449877d89a94f928f43c Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Wed, 3 May 2023 20:16:50 +0000 Subject: [PATCH 02/31] Add breadcumbs for HTTP Signed-off-by: Zach Leslie --- pkg/api/http.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkg/api/http.go b/pkg/api/http.go index 2d4d35b86dc..1e35e51dee8 100644 --- a/pkg/api/http.go +++ b/pkg/api/http.go @@ -54,7 +54,8 @@ const ( HeaderAcceptProtobuf = "application/protobuf" HeaderAcceptJSON = "application/json" - PathPrefixQuerier = "/querier" + PathPrefixQuerier = "/querier" + PathPrefixGenerator = "/generator" PathTraces = "/api/traces/{traceID}" PathSearch = "/api/search" @@ -62,6 +63,7 @@ const ( PathSearchTagValues = "/api/search/tag/{" + muxVarTagName + "}/values" PathEcho = "/api/echo" PathUsageStats = "/status/usage-stats" + PathSpanSummary = "/api/span-summary" PathSearchTagValuesV2 = "/api/v2/search/tag/{" + muxVarTagName + "}/values" PathSearchTagsV2 = "/api/v2/search/tags" @@ -313,6 +315,10 @@ func ParseSearchBlockRequest(r *http.Request) (*tempopb.SearchBlockRequest, erro return req, nil } +func ParseSummaryRequest(r *http.Request) (*tempopb.SpanSummaryRequest, error) { + return nil, nil // TODO: (zalegrala) +} + // BuildSearchRequest takes a tempopb.SearchRequest and populates the passed http.Request // with the appropriate params. If no http.Request is provided a new one is created. func BuildSearchRequest(req *http.Request, searchReq *tempopb.SearchRequest) (*http.Request, error) { From 15cd408e174fc8eabfc1315e52a9665ae5437e54 Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Wed, 3 May 2023 20:17:55 +0000 Subject: [PATCH 03/31] Breadcrumbs for generator to serve a span summary Signed-off-by: Zach Leslie --- modules/generator/config.go | 1 + modules/generator/generator.go | 14 +++++++++++ modules/generator/http.go | 43 ++++++++++++++++++++++++++++++++++ modules/generator/instance.go | 16 +++++++++++++ 4 files changed, 74 insertions(+) create mode 100644 modules/generator/http.go diff --git a/modules/generator/config.go b/modules/generator/config.go index 4829be7bfef..3bdce271328 100644 --- a/modules/generator/config.go +++ b/modules/generator/config.go @@ -33,6 +33,7 @@ type Config struct { // MetricsIngestionSlack is the max amount of time passed since a span's start time // for the span to be considered in metrics generation MetricsIngestionSlack time.Duration `yaml:"metrics_ingestion_time_range_slack"` + SummaryTimeout time.Duration `yaml:"summary_timeout"` } // RegisterFlagsAndApplyDefaults registers the flags. diff --git a/modules/generator/generator.go b/modules/generator/generator.go index d5fa8923dca..269b7693afb 100644 --- a/modules/generator/generator.go +++ b/modules/generator/generator.go @@ -322,3 +322,17 @@ func (g *Generator) OnRingInstanceStopping(lifecycler *ring.BasicLifecycler) { // OnRingInstanceHeartbeat implements ring.BasicLifecyclerDelegate func (g *Generator) OnRingInstanceHeartbeat(lifecycler *ring.BasicLifecycler, ringDesc *ring.Desc, instanceDesc *ring.InstanceDesc) { } + +func (q *Generator) SpanSummary(ctx context.Context, req *tempopb.SpanSummaryRequest) (*tempopb.SpanSummaryResponse, error) { + instanceID, err := user.ExtractOrgID(ctx) + if err != nil { + return nil, err + } + + instance, err := q.getOrCreateInstance(instanceID) + if err != nil { + return nil, err + } + + return instance.spanSummary(ctx, req) +} diff --git a/modules/generator/http.go b/modules/generator/http.go new file mode 100644 index 00000000000..bd27ec182ba --- /dev/null +++ b/modules/generator/http.go @@ -0,0 +1,43 @@ +package generator + +import ( + "context" + "net/http" + "time" + + "github.com/gogo/protobuf/jsonpb" + "github.com/grafana/tempo/pkg/api" + "github.com/grafana/tempo/pkg/tempopb" + "github.com/opentracing/opentracing-go" +) + +func (g *Generator) SpanSummaryHandler(w http.ResponseWriter, r *http.Request) { + ctx, cancel := context.WithDeadline(r.Context(), time.Now().Add(g.cfg.SummaryTimeout)) + defer cancel() + + span, ctx := opentracing.StartSpanFromContext(ctx, "Generator.SpanSummaryHandler") + defer span.Finish() + + span.SetTag("requestURI", r.RequestURI) + + req, err := api.ParseSummaryRequest(r) + if err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + + var resp *tempopb.SpanSummaryResponse + resp, err = g.SpanSummary(ctx, req) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + } + + marshaller := &jsonpb.Marshaler{} + + err = marshaller.Marshal(w, resp) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + w.Header().Set(api.HeaderContentType, api.HeaderAcceptJSON) +} diff --git a/modules/generator/instance.go b/modules/generator/instance.go index 85d07bb1498..a3f19791046 100644 --- a/modules/generator/instance.go +++ b/modules/generator/instance.go @@ -364,6 +364,22 @@ func (i *instance) preprocessSpans(req *tempopb.PushSpansRequest) { i.updatePushMetrics(size, spanCount, expiredSpanCount) } +func (i *instance) spanSummary(ctx context.Context, req *tempopb.SpanSummaryRequest) (resp *tempopb.SpanSummaryResponse, err error) { + select { + case <-ctx.Done(): + return nil, nil + // case i.spanSummaryCh <- req: + default: + // for _, processor := range i.processors { + // switch p := processor.(type) { + // case *localblocks.Processor: + // processor.GetMetrics(ctx, req) + // } + // } + return nil, fmt.Errorf("not implemented yet") + } +} + func (i *instance) updatePushMetrics(bytesIngested int, spanCount int, expiredSpanCount int) { metricBytesIngested.WithLabelValues(i.instanceID).Add(float64(bytesIngested)) metricSpansIngested.WithLabelValues(i.instanceID).Add(float64(spanCount)) From f6b664ca3abc35e7a180615baac9e38cc22994c4 Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Wed, 3 May 2023 20:49:44 +0000 Subject: [PATCH 04/31] Convert the HTTP request into a tempopb request Signed-off-by: Zach Leslie --- pkg/api/http.go | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkg/api/http.go b/pkg/api/http.go index 1e35e51dee8..847506a11fd 100644 --- a/pkg/api/http.go +++ b/pkg/api/http.go @@ -49,6 +49,9 @@ const ( // search tags urlParamScope = "scope" + // generator summary + urlParamGroupBy = "groupBy" + HeaderAccept = "Accept" HeaderContentType = "Content-Type" HeaderAcceptProtobuf = "application/protobuf" @@ -316,7 +319,15 @@ func ParseSearchBlockRequest(r *http.Request) (*tempopb.SearchBlockRequest, erro } func ParseSummaryRequest(r *http.Request) (*tempopb.SpanSummaryRequest, error) { - return nil, nil // TODO: (zalegrala) + req := &tempopb.SpanSummaryRequest{} + + groupBy := r.URL.Query().Get(urlParamGroupBy) + req.GroupBy = groupBy + + query := r.URL.Query().Get(urlParamQuery) + req.TagFilter = []string{query} + + return req, nil } // BuildSearchRequest takes a tempopb.SearchRequest and populates the passed http.Request From a9f7e632f154e8b53f08daee5c947bea5541d0bb Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Wed, 3 May 2023 20:58:02 +0000 Subject: [PATCH 05/31] Whitespace Signed-off-by: Zach Leslie --- modules/generator/http.go | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/generator/http.go b/modules/generator/http.go index bd27ec182ba..11773664234 100644 --- a/modules/generator/http.go +++ b/modules/generator/http.go @@ -33,7 +33,6 @@ func (g *Generator) SpanSummaryHandler(w http.ResponseWriter, r *http.Request) { } marshaller := &jsonpb.Marshaler{} - err = marshaller.Marshal(w, resp) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) From 7c6040df7ff9c5b6eb24178f2c986cb8614e719e Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Wed, 3 May 2023 21:10:12 +0000 Subject: [PATCH 06/31] Fix variable reference Signed-off-by: Zach Leslie --- modules/generator/generator.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/generator/generator.go b/modules/generator/generator.go index 269b7693afb..49d920bed7a 100644 --- a/modules/generator/generator.go +++ b/modules/generator/generator.go @@ -323,13 +323,13 @@ func (g *Generator) OnRingInstanceStopping(lifecycler *ring.BasicLifecycler) { func (g *Generator) OnRingInstanceHeartbeat(lifecycler *ring.BasicLifecycler, ringDesc *ring.Desc, instanceDesc *ring.InstanceDesc) { } -func (q *Generator) SpanSummary(ctx context.Context, req *tempopb.SpanSummaryRequest) (*tempopb.SpanSummaryResponse, error) { +func (g *Generator) SpanSummary(ctx context.Context, req *tempopb.SpanSummaryRequest) (*tempopb.SpanSummaryResponse, error) { instanceID, err := user.ExtractOrgID(ctx) if err != nil { return nil, err } - instance, err := q.getOrCreateInstance(instanceID) + instance, err := g.getOrCreateInstance(instanceID) if err != nil { return nil, err } From 32d4e883517710e52db991c2a7dd7068ea9fc1ce Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Thu, 4 May 2023 20:22:44 +0000 Subject: [PATCH 07/31] Update proto for generator specific API, final results to be handled by the querier Signed-off-by: Zach Leslie --- pkg/tempopb/tempo.pb.go | 719 +++++++++++++++++++++++----------------- pkg/tempopb/tempo.proto | 24 +- 2 files changed, 425 insertions(+), 318 deletions(-) diff --git a/pkg/tempopb/tempo.pb.go b/pkg/tempopb/tempo.pb.go index 399c43ff497..2254e6831d7 100644 --- a/pkg/tempopb/tempo.pb.go +++ b/pkg/tempopb/tempo.pb.go @@ -5,7 +5,6 @@ package tempopb import ( context "context" - encoding_binary "encoding/binary" fmt "fmt" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" @@ -1394,24 +1393,23 @@ func (m *LinkSlice) GetLinks() []*v11.Span_Link { return nil } -type SpanSummaryRequest struct { - // tagFilter is a list of tags to filter on in the form of a traceql query, ie: tag=value - TagFilter []string `protobuf:"bytes,1,rep,name=tagFilter,proto3" json:"tagFilter,omitempty"` - GroupBy string `protobuf:"bytes,2,opt,name=groupBy,proto3" json:"groupBy,omitempty"` +type SpanMetricsRequest struct { + Query string `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"` + GroupBy string `protobuf:"bytes,2,opt,name=groupBy,proto3" json:"groupBy,omitempty"` } -func (m *SpanSummaryRequest) Reset() { *m = SpanSummaryRequest{} } -func (m *SpanSummaryRequest) String() string { return proto.CompactTextString(m) } -func (*SpanSummaryRequest) ProtoMessage() {} -func (*SpanSummaryRequest) Descriptor() ([]byte, []int) { +func (m *SpanMetricsRequest) Reset() { *m = SpanMetricsRequest{} } +func (m *SpanMetricsRequest) String() string { return proto.CompactTextString(m) } +func (*SpanMetricsRequest) ProtoMessage() {} +func (*SpanMetricsRequest) Descriptor() ([]byte, []int) { return fileDescriptor_f22805646f4f62b6, []int{24} } -func (m *SpanSummaryRequest) XXX_Unmarshal(b []byte) error { +func (m *SpanMetricsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *SpanSummaryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *SpanMetricsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_SpanSummaryRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_SpanMetricsRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1421,48 +1419,48 @@ func (m *SpanSummaryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } -func (m *SpanSummaryRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_SpanSummaryRequest.Merge(m, src) +func (m *SpanMetricsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SpanMetricsRequest.Merge(m, src) } -func (m *SpanSummaryRequest) XXX_Size() int { +func (m *SpanMetricsRequest) XXX_Size() int { return m.Size() } -func (m *SpanSummaryRequest) XXX_DiscardUnknown() { - xxx_messageInfo_SpanSummaryRequest.DiscardUnknown(m) +func (m *SpanMetricsRequest) XXX_DiscardUnknown() { + xxx_messageInfo_SpanMetricsRequest.DiscardUnknown(m) } -var xxx_messageInfo_SpanSummaryRequest proto.InternalMessageInfo +var xxx_messageInfo_SpanMetricsRequest proto.InternalMessageInfo -func (m *SpanSummaryRequest) GetTagFilter() []string { +func (m *SpanMetricsRequest) GetQuery() string { if m != nil { - return m.TagFilter + return m.Query } - return nil + return "" } -func (m *SpanSummaryRequest) GetGroupBy() string { +func (m *SpanMetricsRequest) GetGroupBy() string { if m != nil { return m.GroupBy } return "" } -type SpanSummaryResponse struct { - Stats []*SpanSummaryGroup `protobuf:"bytes,1,rep,name=stats,proto3" json:"stats,omitempty"` +type SpanMetricsResponse struct { + Stats []*SpanMetricsGroup `protobuf:"bytes,1,rep,name=stats,proto3" json:"stats,omitempty"` } -func (m *SpanSummaryResponse) Reset() { *m = SpanSummaryResponse{} } -func (m *SpanSummaryResponse) String() string { return proto.CompactTextString(m) } -func (*SpanSummaryResponse) ProtoMessage() {} -func (*SpanSummaryResponse) Descriptor() ([]byte, []int) { +func (m *SpanMetricsResponse) Reset() { *m = SpanMetricsResponse{} } +func (m *SpanMetricsResponse) String() string { return proto.CompactTextString(m) } +func (*SpanMetricsResponse) ProtoMessage() {} +func (*SpanMetricsResponse) Descriptor() ([]byte, []int) { return fileDescriptor_f22805646f4f62b6, []int{25} } -func (m *SpanSummaryResponse) XXX_Unmarshal(b []byte) error { +func (m *SpanMetricsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *SpanSummaryResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *SpanMetricsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_SpanSummaryResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_SpanMetricsResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1472,44 +1470,44 @@ func (m *SpanSummaryResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } -func (m *SpanSummaryResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_SpanSummaryResponse.Merge(m, src) +func (m *SpanMetricsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_SpanMetricsResponse.Merge(m, src) } -func (m *SpanSummaryResponse) XXX_Size() int { +func (m *SpanMetricsResponse) XXX_Size() int { return m.Size() } -func (m *SpanSummaryResponse) XXX_DiscardUnknown() { - xxx_messageInfo_SpanSummaryResponse.DiscardUnknown(m) +func (m *SpanMetricsResponse) XXX_DiscardUnknown() { + xxx_messageInfo_SpanMetricsResponse.DiscardUnknown(m) } -var xxx_messageInfo_SpanSummaryResponse proto.InternalMessageInfo +var xxx_messageInfo_SpanMetricsResponse proto.InternalMessageInfo -func (m *SpanSummaryResponse) GetStats() []*SpanSummaryGroup { +func (m *SpanMetricsResponse) GetStats() []*SpanMetricsGroup { if m != nil { return m.Stats } return nil } -type SpanSummaryGroup struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - SpanCount int64 `protobuf:"varint,2,opt,name=spanCount,proto3" json:"spanCount,omitempty"` - ErrorSpanCount int64 `protobuf:"varint,3,opt,name=errorSpanCount,proto3" json:"errorSpanCount,omitempty"` - Latencies map[string]float64 `protobuf:"bytes,4,rep,name=latencies,proto3" json:"latencies,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"fixed64,2,opt,name=value,proto3"` +type SpanMetricsGroup struct { + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + SpanCount uint64 `protobuf:"varint,2,opt,name=spanCount,proto3" json:"spanCount,omitempty"` + ErrorSpanCount uint64 `protobuf:"varint,3,opt,name=errorSpanCount,proto3" json:"errorSpanCount,omitempty"` + Latencies []*RawHistogram `protobuf:"bytes,4,rep,name=latencies,proto3" json:"latencies,omitempty"` } -func (m *SpanSummaryGroup) Reset() { *m = SpanSummaryGroup{} } -func (m *SpanSummaryGroup) String() string { return proto.CompactTextString(m) } -func (*SpanSummaryGroup) ProtoMessage() {} -func (*SpanSummaryGroup) Descriptor() ([]byte, []int) { +func (m *SpanMetricsGroup) Reset() { *m = SpanMetricsGroup{} } +func (m *SpanMetricsGroup) String() string { return proto.CompactTextString(m) } +func (*SpanMetricsGroup) ProtoMessage() {} +func (*SpanMetricsGroup) Descriptor() ([]byte, []int) { return fileDescriptor_f22805646f4f62b6, []int{26} } -func (m *SpanSummaryGroup) XXX_Unmarshal(b []byte) error { +func (m *SpanMetricsGroup) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *SpanSummaryGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *SpanMetricsGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_SpanSummaryGroup.Marshal(b, m, deterministic) + return xxx_messageInfo_SpanMetricsGroup.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1519,46 +1517,98 @@ func (m *SpanSummaryGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, er return b[:n], nil } } -func (m *SpanSummaryGroup) XXX_Merge(src proto.Message) { - xxx_messageInfo_SpanSummaryGroup.Merge(m, src) +func (m *SpanMetricsGroup) XXX_Merge(src proto.Message) { + xxx_messageInfo_SpanMetricsGroup.Merge(m, src) } -func (m *SpanSummaryGroup) XXX_Size() int { +func (m *SpanMetricsGroup) XXX_Size() int { return m.Size() } -func (m *SpanSummaryGroup) XXX_DiscardUnknown() { - xxx_messageInfo_SpanSummaryGroup.DiscardUnknown(m) +func (m *SpanMetricsGroup) XXX_DiscardUnknown() { + xxx_messageInfo_SpanMetricsGroup.DiscardUnknown(m) } -var xxx_messageInfo_SpanSummaryGroup proto.InternalMessageInfo +var xxx_messageInfo_SpanMetricsGroup proto.InternalMessageInfo -func (m *SpanSummaryGroup) GetName() string { +func (m *SpanMetricsGroup) GetName() string { if m != nil { return m.Name } return "" } -func (m *SpanSummaryGroup) GetSpanCount() int64 { +func (m *SpanMetricsGroup) GetSpanCount() uint64 { if m != nil { return m.SpanCount } return 0 } -func (m *SpanSummaryGroup) GetErrorSpanCount() int64 { +func (m *SpanMetricsGroup) GetErrorSpanCount() uint64 { if m != nil { return m.ErrorSpanCount } return 0 } -func (m *SpanSummaryGroup) GetLatencies() map[string]float64 { +func (m *SpanMetricsGroup) GetLatencies() []*RawHistogram { if m != nil { return m.Latencies } return nil } +type RawHistogram struct { + Bucket uint64 `protobuf:"varint,1,opt,name=bucket,proto3" json:"bucket,omitempty"` + Count uint64 `protobuf:"varint,2,opt,name=count,proto3" json:"count,omitempty"` +} + +func (m *RawHistogram) Reset() { *m = RawHistogram{} } +func (m *RawHistogram) String() string { return proto.CompactTextString(m) } +func (*RawHistogram) ProtoMessage() {} +func (*RawHistogram) Descriptor() ([]byte, []int) { + return fileDescriptor_f22805646f4f62b6, []int{27} +} +func (m *RawHistogram) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *RawHistogram) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_RawHistogram.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *RawHistogram) XXX_Merge(src proto.Message) { + xxx_messageInfo_RawHistogram.Merge(m, src) +} +func (m *RawHistogram) XXX_Size() int { + return m.Size() +} +func (m *RawHistogram) XXX_DiscardUnknown() { + xxx_messageInfo_RawHistogram.DiscardUnknown(m) +} + +var xxx_messageInfo_RawHistogram proto.InternalMessageInfo + +func (m *RawHistogram) GetBucket() uint64 { + if m != nil { + return m.Bucket + } + return 0 +} + +func (m *RawHistogram) GetCount() uint64 { + if m != nil { + return m.Count + } + return 0 +} + func init() { proto.RegisterType((*TraceByIDRequest)(nil), "tempopb.TraceByIDRequest") proto.RegisterType((*TraceByIDResponse)(nil), "tempopb.TraceByIDResponse") @@ -1585,115 +1635,114 @@ func init() { proto.RegisterType((*PushSpansRequest)(nil), "tempopb.PushSpansRequest") proto.RegisterType((*TraceBytes)(nil), "tempopb.TraceBytes") proto.RegisterType((*LinkSlice)(nil), "tempopb.LinkSlice") - proto.RegisterType((*SpanSummaryRequest)(nil), "tempopb.SpanSummaryRequest") - proto.RegisterType((*SpanSummaryResponse)(nil), "tempopb.SpanSummaryResponse") - proto.RegisterType((*SpanSummaryGroup)(nil), "tempopb.SpanSummaryGroup") - proto.RegisterMapType((map[string]float64)(nil), "tempopb.SpanSummaryGroup.LatenciesEntry") + proto.RegisterType((*SpanMetricsRequest)(nil), "tempopb.SpanMetricsRequest") + proto.RegisterType((*SpanMetricsResponse)(nil), "tempopb.SpanMetricsResponse") + proto.RegisterType((*SpanMetricsGroup)(nil), "tempopb.SpanMetricsGroup") + proto.RegisterType((*RawHistogram)(nil), "tempopb.RawHistogram") } func init() { proto.RegisterFile("pkg/tempopb/tempo.proto", fileDescriptor_f22805646f4f62b6) } var fileDescriptor_f22805646f4f62b6 = []byte{ - // 1574 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0xcd, 0x6e, 0x1b, 0x47, - 0x12, 0xd6, 0x88, 0x14, 0x29, 0x16, 0x25, 0x59, 0x6a, 0xdb, 0x32, 0x4d, 0x79, 0x25, 0x61, 0x56, - 0xd8, 0xd5, 0x2e, 0xd6, 0x94, 0x45, 0x7b, 0xe1, 0x5d, 0x7b, 0xb1, 0x8b, 0x65, 0x24, 0xf9, 0x4f, - 0x72, 0x9c, 0xa1, 0xa2, 0x43, 0x6e, 0xc3, 0x61, 0x9b, 0x1e, 0x88, 0x9c, 0xa6, 0x67, 0x9a, 0x82, - 0x98, 0x53, 0x4e, 0x39, 0xe5, 0x90, 0x37, 0x08, 0x02, 0x04, 0xc8, 0x83, 0xe4, 0xe2, 0xa3, 0x8f, - 0x41, 0x0e, 0x46, 0x60, 0x3f, 0x41, 0x72, 0xcb, 0x2d, 0xa8, 0xea, 0xee, 0xf9, 0x13, 0x25, 0x23, - 0xc9, 0x49, 0x53, 0x5f, 0x7f, 0x5d, 0x5d, 0x55, 0x5d, 0x3f, 0x4d, 0xc1, 0xb5, 0xe1, 0x71, 0x6f, - 0x4b, 0xf2, 0xc1, 0x50, 0x0c, 0x3b, 0xea, 0x6f, 0x63, 0x18, 0x0a, 0x29, 0x58, 0x59, 0x83, 0xf5, - 0x2b, 0x32, 0x74, 0x3d, 0xbe, 0x75, 0xb2, 0xbd, 0x45, 0x1f, 0x6a, 0xb9, 0xbe, 0xec, 0x89, 0xc1, - 0x40, 0x04, 0x08, 0xab, 0x2f, 0x8d, 0xdf, 0xec, 0xf9, 0xf2, 0xc5, 0xa8, 0xd3, 0xf0, 0xc4, 0x60, - 0xab, 0x27, 0x7a, 0x62, 0x8b, 0xe0, 0xce, 0xe8, 0x39, 0x49, 0x24, 0xd0, 0x97, 0xa2, 0xdb, 0x9f, - 0x5b, 0xb0, 0x78, 0x88, 0x6a, 0x5b, 0xe3, 0x47, 0x3b, 0x0e, 0x7f, 0x39, 0xe2, 0x91, 0x64, 0x35, - 0x28, 0xd3, 0x51, 0x8f, 0x76, 0x6a, 0xd6, 0xba, 0xb5, 0x39, 0xe7, 0x18, 0x91, 0xad, 0x02, 0x74, - 0xfa, 0xc2, 0x3b, 0x6e, 0x4b, 0x37, 0x94, 0xb5, 0xe9, 0x75, 0x6b, 0xb3, 0xe2, 0xa4, 0x10, 0x56, - 0x87, 0x59, 0x92, 0x76, 0x83, 0x6e, 0xad, 0x40, 0xab, 0xb1, 0xcc, 0x6e, 0x40, 0xe5, 0xe5, 0x88, - 0x87, 0xe3, 0x03, 0xd1, 0xe5, 0xb5, 0x19, 0x5a, 0x4c, 0x00, 0x3b, 0x80, 0xa5, 0x94, 0x1d, 0xd1, - 0x50, 0x04, 0x11, 0x67, 0x1b, 0x30, 0x43, 0x27, 0x93, 0x19, 0xd5, 0xe6, 0x42, 0x43, 0xc7, 0xa4, - 0x41, 0x54, 0x47, 0x2d, 0xb2, 0xdb, 0x50, 0x1e, 0x70, 0x19, 0xfa, 0x5e, 0x44, 0x16, 0x55, 0x9b, - 0xd7, 0xb3, 0x3c, 0x54, 0x79, 0xa0, 0x08, 0x8e, 0x61, 0xda, 0x2c, 0xe5, 0xb7, 0x5e, 0xb4, 0xbf, - 0x99, 0x86, 0xf9, 0x36, 0x77, 0x43, 0xef, 0x85, 0x89, 0xc4, 0x3d, 0x28, 0x1e, 0xba, 0xbd, 0xa8, - 0x66, 0xad, 0x17, 0x36, 0xab, 0xcd, 0xf5, 0x58, 0x6f, 0x86, 0xd5, 0x40, 0xca, 0x6e, 0x20, 0xc3, - 0x71, 0xab, 0xf8, 0xea, 0xcd, 0xda, 0x94, 0x43, 0x7b, 0xd8, 0x06, 0xcc, 0x1f, 0xf8, 0xc1, 0xce, - 0x28, 0x74, 0xa5, 0x2f, 0x82, 0x03, 0x65, 0xdc, 0xbc, 0x93, 0x05, 0x89, 0xe5, 0x9e, 0xa6, 0x58, - 0x05, 0xcd, 0x4a, 0x83, 0xec, 0x0a, 0xcc, 0xec, 0xfb, 0x03, 0x5f, 0xd6, 0x8a, 0xb4, 0xaa, 0x04, - 0x44, 0x23, 0xba, 0x88, 0x19, 0x85, 0x92, 0xc0, 0x16, 0xa1, 0xc0, 0x83, 0x6e, 0xad, 0x44, 0x18, - 0x7e, 0x22, 0xef, 0x23, 0x0c, 0x74, 0x6d, 0x96, 0xa2, 0xae, 0x84, 0xfa, 0x5d, 0xa8, 0xc4, 0x86, - 0xe3, 0xa6, 0x63, 0x3e, 0xa6, 0x38, 0x57, 0x1c, 0xfc, 0xc4, 0x4d, 0x27, 0x6e, 0x7f, 0xc4, 0xf5, - 0x2d, 0x2b, 0xe1, 0xde, 0xf4, 0xbf, 0x2c, 0xfb, 0xb3, 0x02, 0x30, 0x15, 0x80, 0x16, 0xde, 0xad, - 0x89, 0xd5, 0x1d, 0xa8, 0x44, 0x26, 0x2c, 0xfa, 0xc2, 0x96, 0x27, 0x07, 0xcc, 0x49, 0x88, 0x98, - 0x6b, 0x94, 0x21, 0x8f, 0x76, 0xf4, 0x41, 0x46, 0xc4, 0x7c, 0x21, 0x87, 0x9e, 0xb9, 0x3d, 0xae, - 0xa3, 0x92, 0x00, 0x18, 0xb7, 0xa1, 0xdb, 0xe3, 0xd1, 0xa1, 0x50, 0xaa, 0x75, 0x64, 0xb2, 0x20, - 0xe6, 0x23, 0x0f, 0x3c, 0xd1, 0xf5, 0x83, 0x9e, 0x4e, 0xb9, 0x58, 0x46, 0x0d, 0x7e, 0xd0, 0xe5, - 0xa7, 0xa8, 0xae, 0xed, 0x7f, 0xca, 0x75, 0xc4, 0xb2, 0x20, 0xb3, 0x61, 0x4e, 0x0a, 0xe9, 0xf6, - 0x1d, 0xee, 0x89, 0xb0, 0x1b, 0xd5, 0xca, 0x44, 0xca, 0x60, 0xc8, 0xe9, 0xba, 0xd2, 0xdd, 0x35, - 0x27, 0xa9, 0x30, 0x67, 0x30, 0xf4, 0xf3, 0x84, 0x87, 0x91, 0x2f, 0x82, 0x5a, 0x45, 0xf9, 0xa9, - 0x45, 0xc6, 0xa0, 0x18, 0xe1, 0xf1, 0xb0, 0x6e, 0x6d, 0x16, 0x1d, 0xfa, 0xc6, 0x3a, 0x7b, 0x2e, - 0x84, 0xe4, 0x21, 0x19, 0x56, 0xa5, 0x33, 0x53, 0x88, 0x7d, 0x0a, 0x0b, 0x26, 0xa2, 0xba, 0x54, - 0xee, 0x40, 0x89, 0xaa, 0xc1, 0xe4, 0xea, 0x8d, 0x6c, 0x0d, 0x28, 0xf6, 0x01, 0x97, 0x2e, 0x5a, - 0xe5, 0x68, 0x2e, 0xbb, 0x95, 0x2f, 0x9d, 0xfc, 0x8d, 0x9d, 0xa9, 0x9b, 0x5f, 0x2c, 0xb8, 0x3c, - 0x41, 0x63, 0xbe, 0x67, 0x54, 0x92, 0x9e, 0xb1, 0x09, 0x97, 0x42, 0x21, 0x64, 0x9b, 0x87, 0x27, - 0xbe, 0xc7, 0x9f, 0xba, 0x03, 0x93, 0x52, 0x79, 0x18, 0x6f, 0x04, 0x21, 0x52, 0x4f, 0x3c, 0xd5, - 0x42, 0xb2, 0x20, 0xfb, 0x07, 0x2c, 0x51, 0x1a, 0x1c, 0xfa, 0x03, 0xfe, 0x71, 0xe0, 0x9f, 0x3e, - 0x75, 0x03, 0x41, 0xb7, 0x5f, 0x74, 0xce, 0x2e, 0x60, 0x24, 0xbb, 0x49, 0x71, 0xa9, 0x42, 0x49, - 0x21, 0xec, 0xef, 0x50, 0x8e, 0x86, 0x6e, 0xd0, 0xe6, 0x92, 0xee, 0xbf, 0xda, 0x5c, 0x4c, 0x22, - 0xa0, 0x70, 0xc7, 0x10, 0xec, 0x87, 0x50, 0xd6, 0x18, 0xfb, 0x33, 0xcc, 0x20, 0x6a, 0xa2, 0x3d, - 0x9f, 0xd9, 0xe4, 0xa8, 0x35, 0x8c, 0xc9, 0xc0, 0x95, 0xde, 0x0b, 0xde, 0xd5, 0xb5, 0x6f, 0x44, - 0xfb, 0x3b, 0x0b, 0x8a, 0xc8, 0x64, 0xcb, 0x50, 0x42, 0x6e, 0x1c, 0x35, 0x2d, 0x61, 0x52, 0x04, - 0x49, 0xa4, 0xe8, 0x7b, 0xb2, 0xe3, 0x85, 0xf3, 0x1c, 0xdf, 0x80, 0x79, 0xe3, 0x26, 0xca, 0x91, - 0x0e, 0x51, 0x16, 0x64, 0xf7, 0x01, 0x5c, 0x29, 0x43, 0xbf, 0x33, 0x92, 0x1c, 0xc3, 0x83, 0xce, - 0xac, 0xc4, 0xce, 0xe8, 0xc9, 0x72, 0xb2, 0xdd, 0x78, 0xc2, 0xc7, 0x47, 0xd8, 0x00, 0x9c, 0x14, - 0xdd, 0xfe, 0xc9, 0x32, 0xfd, 0x52, 0xa7, 0x09, 0xde, 0xb5, 0x1f, 0x44, 0x43, 0xee, 0x49, 0xde, - 0x3d, 0x34, 0xe9, 0x88, 0x9e, 0xe7, 0x61, 0xf6, 0x17, 0x58, 0x88, 0xa1, 0xd6, 0x18, 0x0f, 0x9f, - 0x26, 0xfb, 0x72, 0x28, 0x5b, 0x87, 0x2a, 0xd5, 0x1a, 0xb5, 0x1a, 0xd3, 0x1d, 0xd3, 0x10, 0x3a, - 0xea, 0x89, 0xc1, 0xb0, 0xcf, 0x25, 0xef, 0x3e, 0x16, 0x9d, 0xc8, 0x74, 0x82, 0x0c, 0x88, 0xdd, - 0x84, 0x36, 0x11, 0x43, 0xa5, 0x41, 0x02, 0xa0, 0xdd, 0x89, 0x4a, 0x65, 0x4e, 0x89, 0xcc, 0xc9, - 0xc3, 0xf6, 0xdf, 0x60, 0x49, 0xb9, 0x8c, 0xbd, 0xd3, 0xb4, 0x3e, 0x6c, 0xc4, 0x9e, 0x18, 0x72, - 0x7d, 0x89, 0x4a, 0xb0, 0x6f, 0x99, 0x36, 0xa9, 0xa8, 0xba, 0x50, 0xeb, 0x30, 0x2b, 0xdd, 0x1e, - 0x66, 0xb2, 0x4a, 0x9e, 0x8a, 0x13, 0xcb, 0xf6, 0x63, 0xb8, 0x92, 0xec, 0x38, 0x6a, 0xc6, 0x7b, - 0x9a, 0x50, 0x22, 0x95, 0x26, 0xdd, 0xea, 0xb9, 0x2a, 0x55, 0xf4, 0x36, 0x52, 0x1c, 0xcd, 0xb4, - 0xef, 0xa7, 0x0d, 0xd5, 0x8b, 0x71, 0x5a, 0x59, 0xa9, 0xb4, 0x62, 0x50, 0x94, 0x38, 0xe3, 0xa6, - 0xc9, 0x18, 0xfa, 0xb6, 0x1f, 0xc2, 0x72, 0xbc, 0x99, 0xee, 0x3d, 0x4a, 0xbf, 0x0d, 0x94, 0xb9, - 0x71, 0x9d, 0x2b, 0x11, 0x83, 0x40, 0xe3, 0xdc, 0x0c, 0x0c, 0x12, 0xec, 0xbb, 0x70, 0xed, 0x8c, - 0x26, 0xed, 0x15, 0x5e, 0x89, 0x01, 0x75, 0x28, 0x12, 0xc0, 0xbe, 0x03, 0xb3, 0x66, 0x0b, 0x99, - 0x38, 0x8e, 0xc3, 0x4b, 0xdf, 0x93, 0xe7, 0x93, 0xbd, 0x0f, 0xd7, 0x73, 0xc7, 0xa5, 0xc2, 0xb8, - 0x95, 0x3f, 0xb0, 0xda, 0x5c, 0x4a, 0xda, 0xa4, 0x5e, 0x49, 0xdb, 0xd0, 0x82, 0x19, 0x4a, 0x57, - 0xf6, 0x6f, 0x28, 0x77, 0xa8, 0x74, 0xcd, 0xbe, 0xb5, 0x78, 0x9f, 0x7a, 0x94, 0x9d, 0x6c, 0x37, - 0x1c, 0x1e, 0x89, 0x51, 0xe8, 0x71, 0xac, 0xeb, 0xc8, 0x31, 0x7c, 0x7b, 0x01, 0xe6, 0x9e, 0x8d, - 0xa2, 0xb8, 0x51, 0xdb, 0x5f, 0x5b, 0xb0, 0x88, 0x00, 0xa5, 0x93, 0x89, 0xea, 0xcd, 0xb8, 0x7b, - 0xe3, 0x2d, 0xcc, 0xb5, 0xae, 0xe2, 0x3b, 0xe2, 0x87, 0x37, 0x6b, 0xf3, 0xcf, 0x42, 0xee, 0xf6, - 0xfb, 0xc2, 0x53, 0x6c, 0xd3, 0xb6, 0xff, 0x0a, 0x05, 0xbf, 0x8b, 0xc5, 0x70, 0x01, 0x17, 0x19, - 0xec, 0x9f, 0x00, 0x6a, 0xd4, 0xee, 0xb8, 0xd2, 0xad, 0x15, 0x2f, 0xe2, 0xa7, 0x88, 0xf6, 0x81, - 0x32, 0x51, 0x79, 0xa2, 0x4d, 0xfc, 0x03, 0x21, 0xd8, 0x00, 0xd0, 0x6f, 0x2d, 0xac, 0xe8, 0xe5, - 0xcc, 0xa4, 0x9a, 0x33, 0x4e, 0xd9, 0xff, 0x85, 0xca, 0xbe, 0x1f, 0x1c, 0xb7, 0xfb, 0xbe, 0xc7, - 0xd9, 0x36, 0xcc, 0xf4, 0xfd, 0xe0, 0xd8, 0x9c, 0xb5, 0x72, 0xf6, 0x2c, 0x3c, 0xa3, 0x81, 0x1b, - 0x1c, 0xc5, 0xb4, 0xf7, 0x81, 0x51, 0x77, 0x1e, 0x0d, 0x06, 0x6e, 0x38, 0x36, 0x66, 0xab, 0x24, - 0xdb, 0xf3, 0xfb, 0x92, 0x87, 0xa9, 0x24, 0x53, 0x00, 0x66, 0x73, 0x2f, 0x14, 0xa3, 0x61, 0xcb, - 0x64, 0xad, 0x11, 0xed, 0x3d, 0xb8, 0x9c, 0xd1, 0x16, 0xa7, 0x10, 0xbe, 0xb2, 0xa4, 0xb1, 0xeb, - 0x7a, 0x76, 0x58, 0x28, 0xf2, 0x03, 0x54, 0xe1, 0x28, 0x9e, 0xfd, 0xb3, 0x05, 0x8b, 0xf9, 0xb5, - 0x89, 0x65, 0x88, 0xcf, 0x9d, 0xa1, 0x1b, 0x7c, 0x20, 0x46, 0x81, 0x7a, 0x59, 0x17, 0x9c, 0x04, - 0xc0, 0x76, 0xc9, 0xc3, 0x50, 0x84, 0xed, 0x98, 0x52, 0x20, 0x4a, 0x0e, 0x65, 0x7b, 0x50, 0xe9, - 0xbb, 0x92, 0x07, 0x9e, 0xcf, 0x23, 0xba, 0xef, 0x6a, 0x73, 0xf3, 0x5c, 0x1b, 0x1b, 0xfb, 0x86, - 0x4a, 0x8f, 0x40, 0x27, 0xd9, 0x5a, 0xff, 0x0f, 0x2c, 0x64, 0x17, 0xdf, 0xf7, 0x42, 0xb4, 0x52, - 0x2f, 0xc4, 0xe6, 0x17, 0x16, 0x94, 0x30, 0x81, 0x78, 0xc8, 0xfe, 0x07, 0x95, 0x38, 0xdb, 0x59, - 0x12, 0xae, 0x7c, 0x05, 0xd4, 0xaf, 0x66, 0x96, 0xe2, 0x6a, 0x99, 0x62, 0xff, 0x87, 0x6a, 0x4c, - 0x3e, 0x6a, 0xfe, 0x1e, 0x15, 0xcd, 0xaf, 0x2c, 0x58, 0xd4, 0x13, 0xea, 0x01, 0x0f, 0x78, 0xe8, - 0x4a, 0x11, 0x1b, 0x46, 0xa9, 0x9a, 0xd3, 0x9a, 0xce, 0xfb, 0xf3, 0x0d, 0x7b, 0x0c, 0xd5, 0x54, - 0x40, 0xd9, 0xca, 0xa4, 0x30, 0x1b, 0x25, 0x37, 0x26, 0x2f, 0xc6, 0x16, 0x7e, 0x5b, 0x84, 0x32, - 0xbe, 0xca, 0x7d, 0x1e, 0xb2, 0x87, 0x30, 0xbf, 0xe7, 0x07, 0xdd, 0xf8, 0xd7, 0x09, 0x9b, 0xf0, - 0x73, 0xc6, 0xe8, 0xad, 0x4f, 0x5a, 0x4a, 0x85, 0x6e, 0xce, 0xbc, 0x12, 0x3d, 0x1e, 0x48, 0x76, - 0xce, 0x73, 0xbc, 0x7e, 0xed, 0x0c, 0x1e, 0xab, 0xd8, 0x85, 0x6a, 0xea, 0xa9, 0x9f, 0x76, 0xf2, - 0xcc, 0x0f, 0x80, 0x8b, 0xd4, 0x3c, 0x00, 0x48, 0x86, 0x11, 0x9b, 0x34, 0xbe, 0x8c, 0x92, 0x95, - 0x89, 0x6b, 0xb1, 0xa2, 0x27, 0xc6, 0x25, 0x35, 0xd5, 0x2e, 0x54, 0xf5, 0xa7, 0x89, 0x53, 0x32, - 0xa5, 0xec, 0x08, 0x2e, 0xe5, 0x86, 0x05, 0x5b, 0x3b, 0xbb, 0x27, 0x33, 0xff, 0xea, 0xeb, 0xe7, - 0x13, 0x62, 0xbd, 0x9f, 0xa4, 0x46, 0xaf, 0x19, 0x42, 0xef, 0xd7, 0x6c, 0x9f, 0x47, 0x48, 0xdb, - 0xdc, 0xfc, 0x10, 0x16, 0xdb, 0x32, 0xe4, 0xee, 0xc0, 0x0f, 0x7a, 0x26, 0x63, 0xee, 0x43, 0x49, - 0xff, 0xde, 0xf9, 0xad, 0x37, 0x7c, 0xcb, 0x6a, 0xd5, 0x5e, 0xbd, 0x5d, 0xb5, 0x5e, 0xbf, 0x5d, - 0xb5, 0x7e, 0x7c, 0xbb, 0x6a, 0x7d, 0xf9, 0x6e, 0x75, 0xea, 0xf5, 0xbb, 0xd5, 0xa9, 0xef, 0xdf, - 0xad, 0x4e, 0x75, 0x4a, 0xf4, 0x2f, 0x82, 0xdb, 0xbf, 0x06, 0x00, 0x00, 0xff, 0xff, 0xfc, 0x62, - 0x50, 0xf3, 0xa3, 0x10, 0x00, 0x00, + // 1568 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0x4f, 0x6f, 0x1b, 0x45, + 0x14, 0xcf, 0x26, 0x8e, 0x1d, 0x3f, 0x27, 0x69, 0x32, 0x6d, 0x53, 0xd7, 0x29, 0x49, 0xb4, 0x44, + 0x10, 0x10, 0x75, 0x1a, 0xb7, 0xa8, 0xd0, 0x22, 0x10, 0x26, 0x69, 0xd3, 0x3f, 0x29, 0x65, 0x1d, + 0x72, 0xe0, 0xb6, 0x5e, 0x4f, 0xdd, 0x55, 0xec, 0x1d, 0x77, 0x77, 0x1c, 0x12, 0x4e, 0x9c, 0x38, + 0x71, 0xe0, 0x1b, 0x20, 0x24, 0x24, 0x3e, 0x08, 0x97, 0x1e, 0x7b, 0x44, 0x1c, 0x2a, 0xd4, 0x7e, + 0x02, 0x8e, 0xdc, 0xd0, 0x7b, 0x33, 0xb3, 0xff, 0xec, 0x04, 0x01, 0xa7, 0xec, 0xfb, 0xcd, 0x6f, + 0xde, 0xbc, 0xff, 0x33, 0x0e, 0x5c, 0x1a, 0x1c, 0x76, 0x37, 0x25, 0xef, 0x0f, 0xc4, 0xa0, 0xad, + 0xfe, 0xd6, 0x07, 0xa1, 0x90, 0x82, 0x95, 0x34, 0x58, 0xbb, 0x20, 0x43, 0xd7, 0xe3, 0x9b, 0x47, + 0x5b, 0x9b, 0xf4, 0xa1, 0x96, 0x6b, 0x4b, 0x9e, 0xe8, 0xf7, 0x45, 0x80, 0xb0, 0xfa, 0xd2, 0xf8, + 0xd5, 0xae, 0x2f, 0x9f, 0x0e, 0xdb, 0x75, 0x4f, 0xf4, 0x37, 0xbb, 0xa2, 0x2b, 0x36, 0x09, 0x6e, + 0x0f, 0x9f, 0x90, 0x44, 0x02, 0x7d, 0x29, 0xba, 0xfd, 0x9d, 0x05, 0x0b, 0xfb, 0xa8, 0xb6, 0x79, + 0x72, 0x6f, 0xdb, 0xe1, 0xcf, 0x86, 0x3c, 0x92, 0xac, 0x0a, 0x25, 0x3a, 0xea, 0xde, 0x76, 0xd5, + 0x5a, 0xb3, 0x36, 0x66, 0x1d, 0x23, 0xb2, 0x15, 0x80, 0x76, 0x4f, 0x78, 0x87, 0x2d, 0xe9, 0x86, + 0xb2, 0x3a, 0xb9, 0x66, 0x6d, 0x94, 0x9d, 0x14, 0xc2, 0x6a, 0x30, 0x43, 0xd2, 0x4e, 0xd0, 0xa9, + 0x4e, 0xd1, 0x6a, 0x2c, 0xb3, 0x2b, 0x50, 0x7e, 0x36, 0xe4, 0xe1, 0xc9, 0x9e, 0xe8, 0xf0, 0xea, + 0x34, 0x2d, 0x26, 0x80, 0x1d, 0xc0, 0x62, 0xca, 0x8e, 0x68, 0x20, 0x82, 0x88, 0xb3, 0x75, 0x98, + 0xa6, 0x93, 0xc9, 0x8c, 0x4a, 0x63, 0xbe, 0xae, 0x63, 0x52, 0x27, 0xaa, 0xa3, 0x16, 0xd9, 0x75, + 0x28, 0xf5, 0xb9, 0x0c, 0x7d, 0x2f, 0x22, 0x8b, 0x2a, 0x8d, 0xcb, 0x59, 0x1e, 0xaa, 0xdc, 0x53, + 0x04, 0xc7, 0x30, 0x6d, 0x96, 0xf2, 0x5b, 0x2f, 0xda, 0x3f, 0x4f, 0xc2, 0x5c, 0x8b, 0xbb, 0xa1, + 0xf7, 0xd4, 0x44, 0xe2, 0x16, 0x14, 0xf6, 0xdd, 0x6e, 0x54, 0xb5, 0xd6, 0xa6, 0x36, 0x2a, 0x8d, + 0xb5, 0x58, 0x6f, 0x86, 0x55, 0x47, 0xca, 0x4e, 0x20, 0xc3, 0x93, 0x66, 0xe1, 0xf9, 0xcb, 0xd5, + 0x09, 0x87, 0xf6, 0xb0, 0x75, 0x98, 0xdb, 0xf3, 0x83, 0xed, 0x61, 0xe8, 0x4a, 0x5f, 0x04, 0x7b, + 0xca, 0xb8, 0x39, 0x27, 0x0b, 0x12, 0xcb, 0x3d, 0x4e, 0xb1, 0xa6, 0x34, 0x2b, 0x0d, 0xb2, 0x0b, + 0x30, 0xfd, 0xd0, 0xef, 0xfb, 0xb2, 0x5a, 0xa0, 0x55, 0x25, 0x20, 0x1a, 0x51, 0x22, 0xa6, 0x15, + 0x4a, 0x02, 0x5b, 0x80, 0x29, 0x1e, 0x74, 0xaa, 0x45, 0xc2, 0xf0, 0x13, 0x79, 0x5f, 0x60, 0xa0, + 0xab, 0x33, 0x14, 0x75, 0x25, 0xd4, 0x6e, 0x42, 0x39, 0x36, 0x1c, 0x37, 0x1d, 0xf2, 0x13, 0x8a, + 0x73, 0xd9, 0xc1, 0x4f, 0xdc, 0x74, 0xe4, 0xf6, 0x86, 0x5c, 0x67, 0x59, 0x09, 0xb7, 0x26, 0x3f, + 0xb0, 0xec, 0x6f, 0xa7, 0x80, 0xa9, 0x00, 0x34, 0x31, 0xb7, 0x26, 0x56, 0x37, 0xa0, 0x1c, 0x99, + 0xb0, 0xe8, 0x84, 0x2d, 0x8d, 0x0f, 0x98, 0x93, 0x10, 0xb1, 0xd6, 0xa8, 0x42, 0xee, 0x6d, 0xeb, + 0x83, 0x8c, 0x88, 0xf5, 0x42, 0x0e, 0x3d, 0x76, 0xbb, 0x5c, 0x47, 0x25, 0x01, 0x30, 0x6e, 0x03, + 0xb7, 0xcb, 0xa3, 0x7d, 0xa1, 0x54, 0xeb, 0xc8, 0x64, 0x41, 0xac, 0x47, 0x1e, 0x78, 0xa2, 0xe3, + 0x07, 0x5d, 0x5d, 0x72, 0xb1, 0x8c, 0x1a, 0xfc, 0xa0, 0xc3, 0x8f, 0x51, 0x5d, 0xcb, 0xff, 0x86, + 0xeb, 0x88, 0x65, 0x41, 0x66, 0xc3, 0xac, 0x14, 0xd2, 0xed, 0x39, 0xdc, 0x13, 0x61, 0x27, 0xaa, + 0x96, 0x88, 0x94, 0xc1, 0x90, 0xd3, 0x71, 0xa5, 0xbb, 0x63, 0x4e, 0x52, 0x61, 0xce, 0x60, 0xe8, + 0xe7, 0x11, 0x0f, 0x23, 0x5f, 0x04, 0xd5, 0xb2, 0xf2, 0x53, 0x8b, 0x8c, 0x41, 0x21, 0xc2, 0xe3, + 0x61, 0xcd, 0xda, 0x28, 0x38, 0xf4, 0x8d, 0x7d, 0xf6, 0x44, 0x08, 0xc9, 0x43, 0x32, 0xac, 0x42, + 0x67, 0xa6, 0x10, 0xfb, 0x18, 0xe6, 0x4d, 0x44, 0x75, 0xab, 0xdc, 0x80, 0x22, 0x75, 0x83, 0xa9, + 0xd5, 0x2b, 0xd9, 0x1e, 0x50, 0xec, 0x3d, 0x2e, 0x5d, 0xb4, 0xca, 0xd1, 0x5c, 0x76, 0x2d, 0xdf, + 0x3a, 0xf9, 0x8c, 0x8d, 0xf4, 0xcd, 0x5f, 0x16, 0x9c, 0x1f, 0xa3, 0x31, 0x3f, 0x33, 0xca, 0xc9, + 0xcc, 0xd8, 0x80, 0x73, 0xa1, 0x10, 0xb2, 0xc5, 0xc3, 0x23, 0xdf, 0xe3, 0x8f, 0xdc, 0xbe, 0x29, + 0xa9, 0x3c, 0x8c, 0x19, 0x41, 0x88, 0xd4, 0x13, 0x4f, 0x8d, 0x90, 0x2c, 0xc8, 0xde, 0x83, 0x45, + 0x2a, 0x83, 0x7d, 0xbf, 0xcf, 0xbf, 0x0c, 0xfc, 0xe3, 0x47, 0x6e, 0x20, 0x28, 0xfb, 0x05, 0x67, + 0x74, 0x01, 0x23, 0xd9, 0x49, 0x9a, 0x4b, 0x35, 0x4a, 0x0a, 0x61, 0xef, 0x42, 0x29, 0x1a, 0xb8, + 0x41, 0x8b, 0x4b, 0xca, 0x7f, 0xa5, 0xb1, 0x90, 0x44, 0x40, 0xe1, 0x8e, 0x21, 0xd8, 0xbb, 0x50, + 0xd2, 0x18, 0x7b, 0x13, 0xa6, 0x11, 0x35, 0xd1, 0x9e, 0xcb, 0x6c, 0x72, 0xd4, 0x1a, 0xc6, 0xa4, + 0xef, 0x4a, 0xef, 0x29, 0xef, 0xe8, 0xde, 0x37, 0xa2, 0xfd, 0xab, 0x05, 0x05, 0x64, 0xb2, 0x25, + 0x28, 0x22, 0x37, 0x8e, 0x9a, 0x96, 0xb0, 0x28, 0x82, 0x24, 0x52, 0xf4, 0x3d, 0xde, 0xf1, 0xa9, + 0xd3, 0x1c, 0x5f, 0x87, 0x39, 0xe3, 0x26, 0xca, 0x91, 0x0e, 0x51, 0x16, 0x64, 0xb7, 0x01, 0x5c, + 0x29, 0x43, 0xbf, 0x3d, 0x94, 0x1c, 0xc3, 0x83, 0xce, 0x2c, 0xc7, 0xce, 0xe8, 0x9b, 0xe5, 0x68, + 0xab, 0xfe, 0x80, 0x9f, 0x1c, 0xe0, 0x00, 0x70, 0x52, 0x74, 0xfb, 0x4f, 0xcb, 0xcc, 0x4b, 0x5d, + 0x26, 0x98, 0x6b, 0x3f, 0x88, 0x06, 0xdc, 0x93, 0xbc, 0xb3, 0x6f, 0xca, 0x11, 0x3d, 0xcf, 0xc3, + 0xec, 0x2d, 0x98, 0x8f, 0xa1, 0xe6, 0x09, 0x1e, 0x3e, 0x49, 0xf6, 0xe5, 0x50, 0xb6, 0x06, 0x15, + 0xea, 0x35, 0x1a, 0x35, 0x66, 0x3a, 0xa6, 0x21, 0x74, 0xd4, 0x13, 0xfd, 0x41, 0x8f, 0x4b, 0xde, + 0xb9, 0x2f, 0xda, 0x91, 0x99, 0x04, 0x19, 0x10, 0xa7, 0x09, 0x6d, 0x22, 0x86, 0x2a, 0x83, 0x04, + 0x40, 0xbb, 0x13, 0x95, 0xca, 0x9c, 0x22, 0x99, 0x93, 0x87, 0xed, 0x77, 0x60, 0x51, 0xb9, 0x8c, + 0xb3, 0xd3, 0x8c, 0x3e, 0x1c, 0xc4, 0x9e, 0x18, 0x70, 0x9d, 0x44, 0x25, 0xd8, 0xd7, 0xcc, 0x98, + 0x54, 0x54, 0xdd, 0xa8, 0x35, 0x98, 0x91, 0x6e, 0x17, 0x2b, 0x59, 0x15, 0x4f, 0xd9, 0x89, 0x65, + 0xfb, 0x3e, 0x5c, 0x48, 0x76, 0x1c, 0x34, 0xe2, 0x3d, 0x0d, 0x28, 0x92, 0x4a, 0x53, 0x6e, 0xb5, + 0x5c, 0x97, 0x2a, 0x7a, 0x0b, 0x29, 0x8e, 0x66, 0xda, 0xb7, 0xd3, 0x86, 0xea, 0xc5, 0xb8, 0xac, + 0xac, 0x54, 0x59, 0x31, 0x28, 0x48, 0xbc, 0xe3, 0x26, 0xc9, 0x18, 0xfa, 0xb6, 0x77, 0x61, 0x29, + 0xde, 0x4c, 0x79, 0x8f, 0xd2, 0x6f, 0x03, 0x65, 0x6e, 0xdc, 0xe7, 0x4a, 0xc4, 0x20, 0xd0, 0x75, + 0x6e, 0x2e, 0x0c, 0x12, 0xec, 0x9b, 0x70, 0x69, 0x44, 0x93, 0xf6, 0x0a, 0x53, 0x62, 0x40, 0x1d, + 0x8a, 0x04, 0xb0, 0x6f, 0xc0, 0x8c, 0xd9, 0x42, 0x26, 0x9e, 0xc4, 0xe1, 0xa5, 0xef, 0xf1, 0xf7, + 0x93, 0xfd, 0x10, 0x2e, 0xe7, 0x8e, 0x4b, 0x85, 0x71, 0x33, 0x7f, 0x60, 0xa5, 0xb1, 0x98, 0x8c, + 0x49, 0xbd, 0x92, 0xb6, 0xa1, 0x09, 0xd3, 0x54, 0xae, 0xec, 0x43, 0x28, 0xb5, 0xa9, 0x75, 0xcd, + 0xbe, 0xd5, 0x78, 0x9f, 0x7a, 0x94, 0x1d, 0x6d, 0xd5, 0x1d, 0x1e, 0x89, 0x61, 0xe8, 0x71, 0xec, + 0xeb, 0xc8, 0x31, 0x7c, 0x7b, 0x1e, 0x66, 0x1f, 0x0f, 0xa3, 0x78, 0x50, 0xdb, 0x3f, 0x59, 0xb0, + 0x80, 0x00, 0x95, 0x93, 0x89, 0xea, 0xd5, 0x78, 0x7a, 0x63, 0x16, 0x66, 0x9b, 0x17, 0xf1, 0x1d, + 0xf1, 0xfb, 0xcb, 0xd5, 0xb9, 0xc7, 0x21, 0x77, 0x7b, 0x3d, 0xe1, 0x29, 0xb6, 0x19, 0xdb, 0x6f, + 0xc3, 0x94, 0xdf, 0xc1, 0x66, 0x38, 0x83, 0x8b, 0x0c, 0xf6, 0x3e, 0x80, 0xba, 0x6a, 0xb7, 0x5d, + 0xe9, 0x56, 0x0b, 0x67, 0xf1, 0x53, 0x44, 0x7b, 0x4f, 0x99, 0xa8, 0x3c, 0xd1, 0x26, 0xfe, 0x8f, + 0x10, 0xac, 0x03, 0xe8, 0xb7, 0x16, 0x76, 0xf4, 0x52, 0xe6, 0xa6, 0x9a, 0x35, 0x4e, 0xd9, 0x1f, + 0x43, 0xf9, 0xa1, 0x1f, 0x1c, 0xb6, 0x7a, 0xbe, 0xc7, 0xd9, 0x16, 0x4c, 0xf7, 0xfc, 0xe0, 0xd0, + 0x9c, 0xb5, 0x3c, 0x7a, 0x16, 0x9e, 0x51, 0xc7, 0x0d, 0x8e, 0x62, 0xda, 0xdb, 0xc0, 0x10, 0x33, + 0x37, 0x56, 0xd2, 0x9a, 0xaa, 0x2a, 0xad, 0x54, 0x55, 0x62, 0x15, 0x77, 0x43, 0x31, 0x1c, 0x34, + 0x4d, 0xb5, 0x1a, 0xd1, 0xbe, 0x03, 0xe7, 0x33, 0x5a, 0xe2, 0xd2, 0xc1, 0xd7, 0x95, 0x34, 0xf6, + 0x5c, 0xce, 0xcc, 0x7b, 0x4d, 0xbe, 0x8b, 0x2a, 0x1c, 0xc5, 0xa3, 0x34, 0xe7, 0xd7, 0xc6, 0xb6, + 0x1f, 0x3e, 0x73, 0x06, 0x6e, 0xf0, 0x99, 0x18, 0x06, 0x52, 0xcf, 0xc0, 0x04, 0xc0, 0x31, 0xc9, + 0xc3, 0x50, 0x84, 0xad, 0x98, 0xa2, 0x06, 0x7e, 0x0e, 0x65, 0xd7, 0xa1, 0xdc, 0x73, 0x25, 0x0f, + 0x3c, 0x9f, 0x47, 0x94, 0xe7, 0x4a, 0xe3, 0x62, 0x6c, 0xa3, 0xe3, 0x7e, 0xbd, 0xeb, 0x47, 0x52, + 0x74, 0x43, 0xb7, 0xef, 0x24, 0x3c, 0xfb, 0x23, 0x98, 0x4d, 0x2f, 0x61, 0x66, 0xda, 0x43, 0xef, + 0x90, 0x4b, 0x32, 0xb0, 0xe0, 0x68, 0x09, 0x63, 0xe8, 0xa5, 0xcc, 0x53, 0x42, 0xe3, 0x7b, 0x0b, + 0x8a, 0x58, 0x25, 0x3c, 0x64, 0x9f, 0x40, 0x39, 0x2e, 0x69, 0x96, 0xc4, 0x26, 0x5f, 0xe6, 0xb5, + 0x8b, 0x99, 0xa5, 0xb8, 0x25, 0x26, 0xd8, 0xa7, 0x50, 0x89, 0xc9, 0x07, 0x8d, 0xff, 0xa2, 0xa2, + 0xf1, 0xa3, 0x05, 0x0b, 0x26, 0xd8, 0x3c, 0xe0, 0xa1, 0x2b, 0x45, 0x6c, 0x18, 0xd5, 0x63, 0x4e, + 0x6b, 0xba, 0xb8, 0x4f, 0x37, 0xec, 0x3e, 0x54, 0x52, 0x59, 0x64, 0xcb, 0xe3, 0xf2, 0x6e, 0x94, + 0x5c, 0x19, 0xbf, 0x18, 0x5b, 0xf8, 0x4b, 0x01, 0x4a, 0xf8, 0xf4, 0xf6, 0x79, 0xc8, 0x76, 0x61, + 0xee, 0x8e, 0x1f, 0x74, 0xe2, 0x9f, 0x20, 0x6c, 0xcc, 0x6f, 0x16, 0xa3, 0xb7, 0x36, 0x6e, 0x29, + 0x15, 0xba, 0x59, 0xf3, 0x14, 0xf4, 0x78, 0x20, 0xd9, 0x29, 0x6f, 0xee, 0xda, 0xa5, 0x11, 0x3c, + 0x56, 0xb1, 0x03, 0x95, 0xd4, 0x7b, 0x3e, 0xed, 0xe4, 0xc8, 0x2b, 0xff, 0x2c, 0x35, 0x77, 0x01, + 0x92, 0x1b, 0x87, 0x8d, 0xbb, 0xa3, 0x8c, 0x92, 0xe5, 0xb1, 0x6b, 0xb1, 0xa2, 0x07, 0xc6, 0x25, + 0x75, 0x75, 0x9d, 0xa9, 0xea, 0x8d, 0xb1, 0x57, 0x61, 0x4a, 0xd9, 0x01, 0x9c, 0xcb, 0xdd, 0x08, + 0x6c, 0x75, 0x74, 0x4f, 0xe6, 0x92, 0xab, 0xad, 0x9d, 0x4e, 0x88, 0xf5, 0x7e, 0x95, 0xba, 0x5f, + 0xcd, 0x4d, 0xf3, 0xcf, 0x9a, 0xed, 0xd3, 0x08, 0x69, 0x9b, 0x1b, 0x9f, 0xc3, 0x42, 0x4b, 0x86, + 0xdc, 0xed, 0xfb, 0x41, 0xd7, 0x54, 0xcc, 0x6d, 0x28, 0xea, 0x1f, 0x35, 0xff, 0x36, 0xc3, 0xd7, + 0xac, 0x66, 0xf5, 0xf9, 0xab, 0x15, 0xeb, 0xc5, 0xab, 0x15, 0xeb, 0x8f, 0x57, 0x2b, 0xd6, 0x0f, + 0xaf, 0x57, 0x26, 0x5e, 0xbc, 0x5e, 0x99, 0xf8, 0xed, 0xf5, 0xca, 0x44, 0xbb, 0x48, 0xff, 0x07, + 0xb8, 0xfe, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0xac, 0xb8, 0x40, 0x4b, 0x88, 0x10, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1819,7 +1868,7 @@ var _Pusher_serviceDesc = grpc.ServiceDesc{ // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type MetricsGeneratorClient interface { PushSpans(ctx context.Context, in *PushSpansRequest, opts ...grpc.CallOption) (*PushResponse, error) - SpanSummary(ctx context.Context, in *SpanSummaryRequest, opts ...grpc.CallOption) (*SpanSummaryResponse, error) + SpanMetrics(ctx context.Context, in *SpanMetricsRequest, opts ...grpc.CallOption) (*SpanMetricsResponse, error) } type metricsGeneratorClient struct { @@ -1839,9 +1888,9 @@ func (c *metricsGeneratorClient) PushSpans(ctx context.Context, in *PushSpansReq return out, nil } -func (c *metricsGeneratorClient) SpanSummary(ctx context.Context, in *SpanSummaryRequest, opts ...grpc.CallOption) (*SpanSummaryResponse, error) { - out := new(SpanSummaryResponse) - err := c.cc.Invoke(ctx, "/tempopb.MetricsGenerator/SpanSummary", in, out, opts...) +func (c *metricsGeneratorClient) SpanMetrics(ctx context.Context, in *SpanMetricsRequest, opts ...grpc.CallOption) (*SpanMetricsResponse, error) { + out := new(SpanMetricsResponse) + err := c.cc.Invoke(ctx, "/tempopb.MetricsGenerator/SpanMetrics", in, out, opts...) if err != nil { return nil, err } @@ -1851,7 +1900,7 @@ func (c *metricsGeneratorClient) SpanSummary(ctx context.Context, in *SpanSummar // MetricsGeneratorServer is the server API for MetricsGenerator service. type MetricsGeneratorServer interface { PushSpans(context.Context, *PushSpansRequest) (*PushResponse, error) - SpanSummary(context.Context, *SpanSummaryRequest) (*SpanSummaryResponse, error) + SpanMetrics(context.Context, *SpanMetricsRequest) (*SpanMetricsResponse, error) } // UnimplementedMetricsGeneratorServer can be embedded to have forward compatible implementations. @@ -1861,8 +1910,8 @@ type UnimplementedMetricsGeneratorServer struct { func (*UnimplementedMetricsGeneratorServer) PushSpans(ctx context.Context, req *PushSpansRequest) (*PushResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method PushSpans not implemented") } -func (*UnimplementedMetricsGeneratorServer) SpanSummary(ctx context.Context, req *SpanSummaryRequest) (*SpanSummaryResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method SpanSummary not implemented") +func (*UnimplementedMetricsGeneratorServer) SpanMetrics(ctx context.Context, req *SpanMetricsRequest) (*SpanMetricsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method SpanMetrics not implemented") } func RegisterMetricsGeneratorServer(s *grpc.Server, srv MetricsGeneratorServer) { @@ -1887,20 +1936,20 @@ func _MetricsGenerator_PushSpans_Handler(srv interface{}, ctx context.Context, d return interceptor(ctx, in, info, handler) } -func _MetricsGenerator_SpanSummary_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(SpanSummaryRequest) +func _MetricsGenerator_SpanMetrics_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(SpanMetricsRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(MetricsGeneratorServer).SpanSummary(ctx, in) + return srv.(MetricsGeneratorServer).SpanMetrics(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tempopb.MetricsGenerator/SpanSummary", + FullMethod: "/tempopb.MetricsGenerator/SpanMetrics", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MetricsGeneratorServer).SpanSummary(ctx, req.(*SpanSummaryRequest)) + return srv.(MetricsGeneratorServer).SpanMetrics(ctx, req.(*SpanMetricsRequest)) } return interceptor(ctx, in, info, handler) } @@ -1914,8 +1963,8 @@ var _MetricsGenerator_serviceDesc = grpc.ServiceDesc{ Handler: _MetricsGenerator_PushSpans_Handler, }, { - MethodName: "SpanSummary", - Handler: _MetricsGenerator_SpanSummary_Handler, + MethodName: "SpanMetrics", + Handler: _MetricsGenerator_SpanMetrics_Handler, }, }, Streams: []grpc.StreamDesc{}, @@ -3380,7 +3429,7 @@ func (m *LinkSlice) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *SpanSummaryRequest) Marshal() (dAtA []byte, err error) { +func (m *SpanMetricsRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3390,12 +3439,12 @@ func (m *SpanSummaryRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *SpanSummaryRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *SpanMetricsRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *SpanSummaryRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *SpanMetricsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -3407,19 +3456,17 @@ func (m *SpanSummaryRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x12 } - if len(m.TagFilter) > 0 { - for iNdEx := len(m.TagFilter) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.TagFilter[iNdEx]) - copy(dAtA[i:], m.TagFilter[iNdEx]) - i = encodeVarintTempo(dAtA, i, uint64(len(m.TagFilter[iNdEx]))) - i-- - dAtA[i] = 0xa - } + if len(m.Query) > 0 { + i -= len(m.Query) + copy(dAtA[i:], m.Query) + i = encodeVarintTempo(dAtA, i, uint64(len(m.Query))) + i-- + dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *SpanSummaryResponse) Marshal() (dAtA []byte, err error) { +func (m *SpanMetricsResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3429,12 +3476,12 @@ func (m *SpanSummaryResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *SpanSummaryResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *SpanMetricsResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *SpanSummaryResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *SpanMetricsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -3456,7 +3503,7 @@ func (m *SpanSummaryResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *SpanSummaryGroup) Marshal() (dAtA []byte, err error) { +func (m *SpanMetricsGroup) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3466,30 +3513,26 @@ func (m *SpanSummaryGroup) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *SpanSummaryGroup) MarshalTo(dAtA []byte) (int, error) { +func (m *SpanMetricsGroup) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *SpanSummaryGroup) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *SpanMetricsGroup) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l if len(m.Latencies) > 0 { - for k := range m.Latencies { - v := m.Latencies[k] - baseI := i - i -= 8 - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(v)))) - i-- - dAtA[i] = 0x11 - i -= len(k) - copy(dAtA[i:], k) - i = encodeVarintTempo(dAtA, i, uint64(len(k))) - i-- - dAtA[i] = 0xa - i = encodeVarintTempo(dAtA, i, uint64(baseI-i)) + for iNdEx := len(m.Latencies) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Latencies[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTempo(dAtA, i, uint64(size)) + } i-- dAtA[i] = 0x22 } @@ -3514,6 +3557,39 @@ func (m *SpanSummaryGroup) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *RawHistogram) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *RawHistogram) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *RawHistogram) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Count != 0 { + i = encodeVarintTempo(dAtA, i, uint64(m.Count)) + i-- + dAtA[i] = 0x10 + } + if m.Bucket != 0 { + i = encodeVarintTempo(dAtA, i, uint64(m.Bucket)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + func encodeVarintTempo(dAtA []byte, offset int, v uint64) int { offset -= sovTempo(v) base := offset @@ -4005,17 +4081,15 @@ func (m *LinkSlice) Size() (n int) { return n } -func (m *SpanSummaryRequest) Size() (n int) { +func (m *SpanMetricsRequest) Size() (n int) { if m == nil { return 0 } var l int _ = l - if len(m.TagFilter) > 0 { - for _, s := range m.TagFilter { - l = len(s) - n += 1 + l + sovTempo(uint64(l)) - } + l = len(m.Query) + if l > 0 { + n += 1 + l + sovTempo(uint64(l)) } l = len(m.GroupBy) if l > 0 { @@ -4024,7 +4098,7 @@ func (m *SpanSummaryRequest) Size() (n int) { return n } -func (m *SpanSummaryResponse) Size() (n int) { +func (m *SpanMetricsResponse) Size() (n int) { if m == nil { return 0 } @@ -4039,7 +4113,7 @@ func (m *SpanSummaryResponse) Size() (n int) { return n } -func (m *SpanSummaryGroup) Size() (n int) { +func (m *SpanMetricsGroup) Size() (n int) { if m == nil { return 0 } @@ -4056,16 +4130,29 @@ func (m *SpanSummaryGroup) Size() (n int) { n += 1 + sovTempo(uint64(m.ErrorSpanCount)) } if len(m.Latencies) > 0 { - for k, v := range m.Latencies { - _ = k - _ = v - mapEntrySize := 1 + len(k) + sovTempo(uint64(len(k))) + 1 + 8 - n += mapEntrySize + 1 + sovTempo(uint64(mapEntrySize)) + for _, e := range m.Latencies { + l = e.Size() + n += 1 + l + sovTempo(uint64(l)) } } return n } +func (m *RawHistogram) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Bucket != 0 { + n += 1 + sovTempo(uint64(m.Bucket)) + } + if m.Count != 0 { + n += 1 + sovTempo(uint64(m.Count)) + } + return n +} + func sovTempo(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -7144,7 +7231,7 @@ func (m *LinkSlice) Unmarshal(dAtA []byte) error { } return nil } -func (m *SpanSummaryRequest) Unmarshal(dAtA []byte) error { +func (m *SpanMetricsRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -7167,15 +7254,15 @@ func (m *SpanSummaryRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: SpanSummaryRequest: wiretype end group for non-group") + return fmt.Errorf("proto: SpanMetricsRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: SpanSummaryRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: SpanMetricsRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TagFilter", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Query", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -7203,7 +7290,7 @@ func (m *SpanSummaryRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.TagFilter = append(m.TagFilter, string(dAtA[iNdEx:postIndex])) + m.Query = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { @@ -7258,7 +7345,7 @@ func (m *SpanSummaryRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *SpanSummaryResponse) Unmarshal(dAtA []byte) error { +func (m *SpanMetricsResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -7281,10 +7368,10 @@ func (m *SpanSummaryResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: SpanSummaryResponse: wiretype end group for non-group") + return fmt.Errorf("proto: SpanMetricsResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: SpanSummaryResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: SpanMetricsResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -7316,7 +7403,7 @@ func (m *SpanSummaryResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Stats = append(m.Stats, &SpanSummaryGroup{}) + m.Stats = append(m.Stats, &SpanMetricsGroup{}) if err := m.Stats[len(m.Stats)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -7342,7 +7429,7 @@ func (m *SpanSummaryResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *SpanSummaryGroup) Unmarshal(dAtA []byte) error { +func (m *SpanMetricsGroup) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -7365,10 +7452,10 @@ func (m *SpanSummaryGroup) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: SpanSummaryGroup: wiretype end group for non-group") + return fmt.Errorf("proto: SpanMetricsGroup: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: SpanSummaryGroup: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: SpanMetricsGroup: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -7417,7 +7504,7 @@ func (m *SpanSummaryGroup) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.SpanCount |= int64(b&0x7F) << shift + m.SpanCount |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7436,7 +7523,7 @@ func (m *SpanSummaryGroup) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.ErrorSpanCount |= int64(b&0x7F) << shift + m.ErrorSpanCount |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7470,83 +7557,99 @@ func (m *SpanSummaryGroup) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Latencies == nil { - m.Latencies = make(map[string]float64) + m.Latencies = append(m.Latencies, &RawHistogram{}) + if err := m.Latencies[len(m.Latencies)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err } - var mapkey string - var mapvalue float64 - for iNdEx < postIndex { - entryPreIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTempo - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTempo(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTempo + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *RawHistogram) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTempo + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: RawHistogram: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: RawHistogram: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Bucket", wireType) + } + m.Bucket = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTempo } - fieldNum := int32(wire >> 3) - if fieldNum == 1 { - var stringLenmapkey uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTempo - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLenmapkey |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLenmapkey := int(stringLenmapkey) - if intStringLenmapkey < 0 { - return ErrInvalidLengthTempo - } - postStringIndexmapkey := iNdEx + intStringLenmapkey - if postStringIndexmapkey < 0 { - return ErrInvalidLengthTempo - } - if postStringIndexmapkey > l { - return io.ErrUnexpectedEOF - } - mapkey = string(dAtA[iNdEx:postStringIndexmapkey]) - iNdEx = postStringIndexmapkey - } else if fieldNum == 2 { - var mapvaluetemp uint64 - if (iNdEx + 8) > l { - return io.ErrUnexpectedEOF - } - mapvaluetemp = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:])) - iNdEx += 8 - mapvalue = math.Float64frombits(mapvaluetemp) - } else { - iNdEx = entryPreIndex - skippy, err := skipTempo(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTempo - } - if (iNdEx + skippy) > postIndex { - return io.ErrUnexpectedEOF - } - iNdEx += skippy + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Bucket |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Count", wireType) + } + m.Count = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTempo + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Count |= uint64(b&0x7F) << shift + if b < 0x80 { + break } } - m.Latencies[mapkey] = mapvalue - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTempo(dAtA[iNdEx:]) diff --git a/pkg/tempopb/tempo.proto b/pkg/tempopb/tempo.proto index 29cd177b5ff..c0a0a914b38 100644 --- a/pkg/tempopb/tempo.proto +++ b/pkg/tempopb/tempo.proto @@ -14,7 +14,7 @@ service Pusher { service MetricsGenerator { rpc PushSpans(PushSpansRequest) returns (PushResponse) {}; - rpc SpanSummary(SpanSummaryRequest) returns (SpanSummaryResponse) {}; + rpc SpanMetrics(SpanMetricsRequest) returns (SpanMetricsResponse) {}; } service Querier { @@ -183,19 +183,23 @@ message LinkSlice { repeated tempopb.trace.v1.Span.Link links = 1; } -message SpanSummaryRequest { - // tagFilter is a list of tags to filter on in the form of a traceql query, ie: tag=value - repeated string tagFilter = 1; +message SpanMetricsRequest { + string query = 1; string groupBy = 2; } -message SpanSummaryResponse { - repeated SpanSummaryGroup stats = 1; +message SpanMetricsResponse { + repeated SpanMetricsGroup stats = 1; } -message SpanSummaryGroup { +message SpanMetricsGroup { string name = 1; - int64 spanCount = 2; - int64 errorSpanCount = 3; - map latencies = 4; + uint64 spanCount = 2; + uint64 errorSpanCount = 3; + repeated RawHistogram latencies = 4; +} + +message RawHistogram { + uint64 bucket = 1; + uint64 count = 2; } From 7e2e99cf79dbb7629bb43db124d4c20cbfa8ee2c Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Thu, 4 May 2023 20:53:18 +0000 Subject: [PATCH 08/31] Update http api for proto Signed-off-by: Zach Leslie --- pkg/api/http.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/api/http.go b/pkg/api/http.go index 847506a11fd..fd8fc93b99e 100644 --- a/pkg/api/http.go +++ b/pkg/api/http.go @@ -318,14 +318,14 @@ func ParseSearchBlockRequest(r *http.Request) (*tempopb.SearchBlockRequest, erro return req, nil } -func ParseSummaryRequest(r *http.Request) (*tempopb.SpanSummaryRequest, error) { - req := &tempopb.SpanSummaryRequest{} +func ParseSummaryRequest(r *http.Request) (*tempopb.SpanMetricsRequest, error) { + req := &tempopb.SpanMetricsRequest{} groupBy := r.URL.Query().Get(urlParamGroupBy) req.GroupBy = groupBy query := r.URL.Query().Get(urlParamQuery) - req.TagFilter = []string{query} + req.Query = query return req, nil } From 68c7d6c7263f7ef50420cb3df6b49bc937417eb6 Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Tue, 9 May 2023 21:09:01 +0000 Subject: [PATCH 09/31] Breadcumbs and a rename --- modules/generator/generator.go | 4 ++-- modules/generator/http.go | 4 ++-- modules/generator/instance.go | 23 ++++++++----------- .../processor/localblocks/processor.go | 21 +++++++++++++++++ 4 files changed, 35 insertions(+), 17 deletions(-) diff --git a/modules/generator/generator.go b/modules/generator/generator.go index 49d920bed7a..dfbba2b2f4f 100644 --- a/modules/generator/generator.go +++ b/modules/generator/generator.go @@ -323,7 +323,7 @@ func (g *Generator) OnRingInstanceStopping(lifecycler *ring.BasicLifecycler) { func (g *Generator) OnRingInstanceHeartbeat(lifecycler *ring.BasicLifecycler, ringDesc *ring.Desc, instanceDesc *ring.InstanceDesc) { } -func (g *Generator) SpanSummary(ctx context.Context, req *tempopb.SpanSummaryRequest) (*tempopb.SpanSummaryResponse, error) { +func (g *Generator) SpanMetrics(ctx context.Context, req *tempopb.SpanMetricsRequest) (*tempopb.SpanMetricsResponse, error) { instanceID, err := user.ExtractOrgID(ctx) if err != nil { return nil, err @@ -334,5 +334,5 @@ func (g *Generator) SpanSummary(ctx context.Context, req *tempopb.SpanSummaryReq return nil, err } - return instance.spanSummary(ctx, req) + return instance.spanMetrics(ctx, req) } diff --git a/modules/generator/http.go b/modules/generator/http.go index 11773664234..83663901997 100644 --- a/modules/generator/http.go +++ b/modules/generator/http.go @@ -26,8 +26,8 @@ func (g *Generator) SpanSummaryHandler(w http.ResponseWriter, r *http.Request) { return } - var resp *tempopb.SpanSummaryResponse - resp, err = g.SpanSummary(ctx, req) + var resp *tempopb.SpanMetricsResponse + resp, err = g.SpanMetrics(ctx, req) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) } diff --git a/modules/generator/instance.go b/modules/generator/instance.go index a3f19791046..8bac7921cae 100644 --- a/modules/generator/instance.go +++ b/modules/generator/instance.go @@ -364,20 +364,17 @@ func (i *instance) preprocessSpans(req *tempopb.PushSpansRequest) { i.updatePushMetrics(size, spanCount, expiredSpanCount) } -func (i *instance) spanSummary(ctx context.Context, req *tempopb.SpanSummaryRequest) (resp *tempopb.SpanSummaryResponse, err error) { - select { - case <-ctx.Done(): - return nil, nil - // case i.spanSummaryCh <- req: - default: - // for _, processor := range i.processors { - // switch p := processor.(type) { - // case *localblocks.Processor: - // processor.GetMetrics(ctx, req) - // } - // } - return nil, fmt.Errorf("not implemented yet") +func (i *instance) spanMetrics(ctx context.Context, req *tempopb.SpanMetricsRequest) (resp *tempopb.SpanMetricsResponse, err error) { + + for _, processor := range i.processors { + switch p := processor.(type) { + case *localblocks.Processor: + return p.GetMetrics(ctx, req) + default: + } } + + return nil, fmt.Errorf("localblocks processor not found") } func (i *instance) updatePushMetrics(bytesIngested int, spanCount int, expiredSpanCount int) { diff --git a/modules/generator/processor/localblocks/processor.go b/modules/generator/processor/localblocks/processor.go index 8a02afa5897..d1ad7a4959a 100644 --- a/modules/generator/processor/localblocks/processor.go +++ b/modules/generator/processor/localblocks/processor.go @@ -14,6 +14,8 @@ import ( "github.com/grafana/tempo/pkg/model" "github.com/grafana/tempo/pkg/tempopb" v1 "github.com/grafana/tempo/pkg/tempopb/trace/v1" + "github.com/grafana/tempo/pkg/traceql" + "github.com/grafana/tempo/pkg/traceqlmetrics" "github.com/grafana/tempo/pkg/util/log" "github.com/grafana/tempo/tempodb/backend" "github.com/grafana/tempo/tempodb/encoding" @@ -242,6 +244,25 @@ func (p *Processor) completeBlock() error { return nil } +func (p *Processor) GetMetrics(ctx context.Context, req *tempopb.SpanMetricsRequest) (*tempopb.SpanMetricsResponse, error) { + + fetcher := traceql.NewSpansetFetcherWrapper(func(ctx context.Context, req traceql.FetchSpansRequest) (traceql.FetchSpansResponse, error) { + return p.headBlock.Fetch(ctx, req, common.DefaultSearchOptions()) + }) + + m, err := traceqlmetrics.GetMetrics(ctx, req.Query, req.GroupBy, int(req.Limit), fetcher) + if err != nil { + return nil, errors.Wrap(err, "failed to get metrics") + } + + return &tempopb.SpanMetricsResponse{ + // Series: m.Series, + // Errors: m.Errors, + SpanCount: uint64(m.SpanCount), + Estimated: m.Estimated, + }, nil +} + func (p *Processor) deleteOldBlocks() (err error) { p.blocksMtx.Lock() defer p.blocksMtx.Unlock() From c43b357bbac63308e8b4115b78dfd639f095af96 Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Wed, 10 May 2023 15:50:20 +0000 Subject: [PATCH 10/31] Enable API --- cmd/tempo/app/modules.go | 3 + modules/generator/generator.go | 2 +- modules/generator/instance.go | 3 +- .../processor/localblocks/processor.go | 3 + pkg/api/http.go | 2 +- pkg/tempopb/tempo.pb.go | 885 ++++++++++++------ pkg/tempopb/tempo.proto | 26 +- 7 files changed, 621 insertions(+), 303 deletions(-) diff --git a/cmd/tempo/app/modules.go b/cmd/tempo/app/modules.go index 40097a14955..b883d1c0993 100644 --- a/cmd/tempo/app/modules.go +++ b/cmd/tempo/app/modules.go @@ -212,6 +212,9 @@ func (t *App) initGenerator() (services.Service, error) { } t.generator = genSvc + spanStatsHandler := t.HTTPAuthMiddleware.Wrap(http.HandlerFunc(t.generator.SpanSummaryHandler)) + t.Server.HTTP.Handle(path.Join(api.PathPrefixGenerator, addHTTPAPIPrefix(&t.cfg, api.PathSpanMetrics)), spanStatsHandler) + tempopb.RegisterMetricsGeneratorServer(t.Server.GRPC, t.generator) return t.generator, nil diff --git a/modules/generator/generator.go b/modules/generator/generator.go index dfbba2b2f4f..fe6abb1ab43 100644 --- a/modules/generator/generator.go +++ b/modules/generator/generator.go @@ -334,5 +334,5 @@ func (g *Generator) SpanMetrics(ctx context.Context, req *tempopb.SpanMetricsReq return nil, err } - return instance.spanMetrics(ctx, req) + return instance.spanMetricsFromLocalBlocks(ctx, req) } diff --git a/modules/generator/instance.go b/modules/generator/instance.go index 8bac7921cae..6c04c675f0d 100644 --- a/modules/generator/instance.go +++ b/modules/generator/instance.go @@ -364,8 +364,7 @@ func (i *instance) preprocessSpans(req *tempopb.PushSpansRequest) { i.updatePushMetrics(size, spanCount, expiredSpanCount) } -func (i *instance) spanMetrics(ctx context.Context, req *tempopb.SpanMetricsRequest) (resp *tempopb.SpanMetricsResponse, err error) { - +func (i *instance) spanMetricsFromLocalBlocks(ctx context.Context, req *tempopb.SpanMetricsRequest) (resp *tempopb.SpanMetricsResponse, err error) { for _, processor := range i.processors { switch p := processor.(type) { case *localblocks.Processor: diff --git a/modules/generator/processor/localblocks/processor.go b/modules/generator/processor/localblocks/processor.go index d1ad7a4959a..de098da6204 100644 --- a/modules/generator/processor/localblocks/processor.go +++ b/modules/generator/processor/localblocks/processor.go @@ -247,6 +247,9 @@ func (p *Processor) completeBlock() error { func (p *Processor) GetMetrics(ctx context.Context, req *tempopb.SpanMetricsRequest) (*tempopb.SpanMetricsResponse, error) { fetcher := traceql.NewSpansetFetcherWrapper(func(ctx context.Context, req traceql.FetchSpansRequest) (traceql.FetchSpansResponse, error) { + if p.headBlock == nil { + return traceql.FetchSpansResponse{}, fmt.Errorf("head block is nil") + } return p.headBlock.Fetch(ctx, req, common.DefaultSearchOptions()) }) diff --git a/pkg/api/http.go b/pkg/api/http.go index fd8fc93b99e..218c6c0a167 100644 --- a/pkg/api/http.go +++ b/pkg/api/http.go @@ -66,7 +66,7 @@ const ( PathSearchTagValues = "/api/search/tag/{" + muxVarTagName + "}/values" PathEcho = "/api/echo" PathUsageStats = "/status/usage-stats" - PathSpanSummary = "/api/span-summary" + PathSpanMetrics = "/api/span-metrics" PathSearchTagValuesV2 = "/api/v2/search/tag/{" + muxVarTagName + "}/values" PathSearchTagsV2 = "/api/v2/search/tags" diff --git a/pkg/tempopb/tempo.pb.go b/pkg/tempopb/tempo.pb.go index 2254e6831d7..0c107e76289 100644 --- a/pkg/tempopb/tempo.pb.go +++ b/pkg/tempopb/tempo.pb.go @@ -1396,6 +1396,7 @@ func (m *LinkSlice) GetLinks() []*v11.Span_Link { type SpanMetricsRequest struct { Query string `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"` GroupBy string `protobuf:"bytes,2,opt,name=groupBy,proto3" json:"groupBy,omitempty"` + Limit uint64 `protobuf:"varint,3,opt,name=limit,proto3" json:"limit,omitempty"` } func (m *SpanMetricsRequest) Reset() { *m = SpanMetricsRequest{} } @@ -1445,8 +1446,16 @@ func (m *SpanMetricsRequest) GetGroupBy() string { return "" } +func (m *SpanMetricsRequest) GetLimit() uint64 { + if m != nil { + return m.Limit + } + return 0 +} + type SpanMetricsResponse struct { - Stats []*SpanMetricsGroup `protobuf:"bytes,1,rep,name=stats,proto3" json:"stats,omitempty"` + Estimated bool `protobuf:"varint,1,opt,name=estimated,proto3" json:"estimated,omitempty"` + SpanCount uint64 `protobuf:"varint,2,opt,name=spanCount,proto3" json:"spanCount,omitempty"` } func (m *SpanMetricsResponse) Reset() { *m = SpanMetricsResponse{} } @@ -1482,32 +1491,37 @@ func (m *SpanMetricsResponse) XXX_DiscardUnknown() { var xxx_messageInfo_SpanMetricsResponse proto.InternalMessageInfo -func (m *SpanMetricsResponse) GetStats() []*SpanMetricsGroup { +func (m *SpanMetricsResponse) GetEstimated() bool { if m != nil { - return m.Stats + return m.Estimated } - return nil + return false } -type SpanMetricsGroup struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - SpanCount uint64 `protobuf:"varint,2,opt,name=spanCount,proto3" json:"spanCount,omitempty"` - ErrorSpanCount uint64 `protobuf:"varint,3,opt,name=errorSpanCount,proto3" json:"errorSpanCount,omitempty"` - Latencies []*RawHistogram `protobuf:"bytes,4,rep,name=latencies,proto3" json:"latencies,omitempty"` +func (m *SpanMetricsResponse) GetSpanCount() uint64 { + if m != nil { + return m.SpanCount + } + return 0 +} + +type RawHistogram struct { + Bucket uint64 `protobuf:"varint,1,opt,name=bucket,proto3" json:"bucket,omitempty"` + Count uint64 `protobuf:"varint,2,opt,name=count,proto3" json:"count,omitempty"` } -func (m *SpanMetricsGroup) Reset() { *m = SpanMetricsGroup{} } -func (m *SpanMetricsGroup) String() string { return proto.CompactTextString(m) } -func (*SpanMetricsGroup) ProtoMessage() {} -func (*SpanMetricsGroup) Descriptor() ([]byte, []int) { +func (m *RawHistogram) Reset() { *m = RawHistogram{} } +func (m *RawHistogram) String() string { return proto.CompactTextString(m) } +func (*RawHistogram) ProtoMessage() {} +func (*RawHistogram) Descriptor() ([]byte, []int) { return fileDescriptor_f22805646f4f62b6, []int{26} } -func (m *SpanMetricsGroup) XXX_Unmarshal(b []byte) error { +func (m *RawHistogram) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *SpanMetricsGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *RawHistogram) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_SpanMetricsGroup.Marshal(b, m, deterministic) + return xxx_messageInfo_RawHistogram.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1517,63 +1531,105 @@ func (m *SpanMetricsGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, er return b[:n], nil } } -func (m *SpanMetricsGroup) XXX_Merge(src proto.Message) { - xxx_messageInfo_SpanMetricsGroup.Merge(m, src) +func (m *RawHistogram) XXX_Merge(src proto.Message) { + xxx_messageInfo_RawHistogram.Merge(m, src) } -func (m *SpanMetricsGroup) XXX_Size() int { +func (m *RawHistogram) XXX_Size() int { return m.Size() } -func (m *SpanMetricsGroup) XXX_DiscardUnknown() { - xxx_messageInfo_SpanMetricsGroup.DiscardUnknown(m) +func (m *RawHistogram) XXX_DiscardUnknown() { + xxx_messageInfo_RawHistogram.DiscardUnknown(m) } -var xxx_messageInfo_SpanMetricsGroup proto.InternalMessageInfo +var xxx_messageInfo_RawHistogram proto.InternalMessageInfo -func (m *SpanMetricsGroup) GetName() string { +func (m *RawHistogram) GetBucket() uint64 { if m != nil { - return m.Name + return m.Bucket } - return "" + return 0 } -func (m *SpanMetricsGroup) GetSpanCount() uint64 { +func (m *RawHistogram) GetCount() uint64 { if m != nil { - return m.SpanCount + return m.Count } return 0 } -func (m *SpanMetricsGroup) GetErrorSpanCount() uint64 { +type SpanMetricsSummaryRequest struct { + Query string `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"` + GroupBy string `protobuf:"bytes,2,opt,name=groupBy,proto3" json:"groupBy,omitempty"` +} + +func (m *SpanMetricsSummaryRequest) Reset() { *m = SpanMetricsSummaryRequest{} } +func (m *SpanMetricsSummaryRequest) String() string { return proto.CompactTextString(m) } +func (*SpanMetricsSummaryRequest) ProtoMessage() {} +func (*SpanMetricsSummaryRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_f22805646f4f62b6, []int{27} +} +func (m *SpanMetricsSummaryRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *SpanMetricsSummaryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_SpanMetricsSummaryRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *SpanMetricsSummaryRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SpanMetricsSummaryRequest.Merge(m, src) +} +func (m *SpanMetricsSummaryRequest) XXX_Size() int { + return m.Size() +} +func (m *SpanMetricsSummaryRequest) XXX_DiscardUnknown() { + xxx_messageInfo_SpanMetricsSummaryRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_SpanMetricsSummaryRequest proto.InternalMessageInfo + +func (m *SpanMetricsSummaryRequest) GetQuery() string { if m != nil { - return m.ErrorSpanCount + return m.Query } - return 0 + return "" } -func (m *SpanMetricsGroup) GetLatencies() []*RawHistogram { +func (m *SpanMetricsSummaryRequest) GetGroupBy() string { if m != nil { - return m.Latencies + return m.GroupBy } - return nil + return "" } -type RawHistogram struct { - Bucket uint64 `protobuf:"varint,1,opt,name=bucket,proto3" json:"bucket,omitempty"` - Count uint64 `protobuf:"varint,2,opt,name=count,proto3" json:"count,omitempty"` +type SpanMetricsSummaryResponse struct { + SpanCount int64 `protobuf:"varint,2,opt,name=spanCount,proto3" json:"spanCount,omitempty"` + ErrorSpanCount int64 `protobuf:"varint,3,opt,name=errorSpanCount,proto3" json:"errorSpanCount,omitempty"` + P99 uint64 `protobuf:"varint,4,opt,name=p99,proto3" json:"p99,omitempty"` + P95 uint64 `protobuf:"varint,5,opt,name=p95,proto3" json:"p95,omitempty"` + P90 uint64 `protobuf:"varint,6,opt,name=p90,proto3" json:"p90,omitempty"` + P50 uint64 `protobuf:"varint,7,opt,name=p50,proto3" json:"p50,omitempty"` } -func (m *RawHistogram) Reset() { *m = RawHistogram{} } -func (m *RawHistogram) String() string { return proto.CompactTextString(m) } -func (*RawHistogram) ProtoMessage() {} -func (*RawHistogram) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{27} +func (m *SpanMetricsSummaryResponse) Reset() { *m = SpanMetricsSummaryResponse{} } +func (m *SpanMetricsSummaryResponse) String() string { return proto.CompactTextString(m) } +func (*SpanMetricsSummaryResponse) ProtoMessage() {} +func (*SpanMetricsSummaryResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_f22805646f4f62b6, []int{28} } -func (m *RawHistogram) XXX_Unmarshal(b []byte) error { +func (m *SpanMetricsSummaryResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *RawHistogram) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *SpanMetricsSummaryResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_RawHistogram.Marshal(b, m, deterministic) + return xxx_messageInfo_SpanMetricsSummaryResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1583,28 +1639,56 @@ func (m *RawHistogram) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) return b[:n], nil } } -func (m *RawHistogram) XXX_Merge(src proto.Message) { - xxx_messageInfo_RawHistogram.Merge(m, src) +func (m *SpanMetricsSummaryResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_SpanMetricsSummaryResponse.Merge(m, src) } -func (m *RawHistogram) XXX_Size() int { +func (m *SpanMetricsSummaryResponse) XXX_Size() int { return m.Size() } -func (m *RawHistogram) XXX_DiscardUnknown() { - xxx_messageInfo_RawHistogram.DiscardUnknown(m) +func (m *SpanMetricsSummaryResponse) XXX_DiscardUnknown() { + xxx_messageInfo_SpanMetricsSummaryResponse.DiscardUnknown(m) } -var xxx_messageInfo_RawHistogram proto.InternalMessageInfo +var xxx_messageInfo_SpanMetricsSummaryResponse proto.InternalMessageInfo -func (m *RawHistogram) GetBucket() uint64 { +func (m *SpanMetricsSummaryResponse) GetSpanCount() int64 { if m != nil { - return m.Bucket + return m.SpanCount } return 0 } -func (m *RawHistogram) GetCount() uint64 { +func (m *SpanMetricsSummaryResponse) GetErrorSpanCount() int64 { if m != nil { - return m.Count + return m.ErrorSpanCount + } + return 0 +} + +func (m *SpanMetricsSummaryResponse) GetP99() uint64 { + if m != nil { + return m.P99 + } + return 0 +} + +func (m *SpanMetricsSummaryResponse) GetP95() uint64 { + if m != nil { + return m.P95 + } + return 0 +} + +func (m *SpanMetricsSummaryResponse) GetP90() uint64 { + if m != nil { + return m.P90 + } + return 0 +} + +func (m *SpanMetricsSummaryResponse) GetP50() uint64 { + if m != nil { + return m.P50 } return 0 } @@ -1637,112 +1721,117 @@ func init() { proto.RegisterType((*LinkSlice)(nil), "tempopb.LinkSlice") proto.RegisterType((*SpanMetricsRequest)(nil), "tempopb.SpanMetricsRequest") proto.RegisterType((*SpanMetricsResponse)(nil), "tempopb.SpanMetricsResponse") - proto.RegisterType((*SpanMetricsGroup)(nil), "tempopb.SpanMetricsGroup") proto.RegisterType((*RawHistogram)(nil), "tempopb.RawHistogram") + proto.RegisterType((*SpanMetricsSummaryRequest)(nil), "tempopb.SpanMetricsSummaryRequest") + proto.RegisterType((*SpanMetricsSummaryResponse)(nil), "tempopb.SpanMetricsSummaryResponse") } func init() { proto.RegisterFile("pkg/tempopb/tempo.proto", fileDescriptor_f22805646f4f62b6) } var fileDescriptor_f22805646f4f62b6 = []byte{ - // 1568 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0x4f, 0x6f, 0x1b, 0x45, - 0x14, 0xcf, 0x26, 0x8e, 0x1d, 0x3f, 0x27, 0x69, 0x32, 0x6d, 0x53, 0xd7, 0x29, 0x49, 0xb4, 0x44, - 0x10, 0x10, 0x75, 0x1a, 0xb7, 0xa8, 0xd0, 0x22, 0x10, 0x26, 0x69, 0xd3, 0x3f, 0x29, 0x65, 0x1d, - 0x72, 0xe0, 0xb6, 0x5e, 0x4f, 0xdd, 0x55, 0xec, 0x1d, 0x77, 0x77, 0x1c, 0x12, 0x4e, 0x9c, 0x38, - 0x71, 0xe0, 0x1b, 0x20, 0x24, 0x24, 0x3e, 0x08, 0x97, 0x1e, 0x7b, 0x44, 0x1c, 0x2a, 0xd4, 0x7e, - 0x02, 0x8e, 0xdc, 0xd0, 0x7b, 0x33, 0xb3, 0xff, 0xec, 0x04, 0x01, 0xa7, 0xec, 0xfb, 0xcd, 0x6f, - 0xde, 0xbc, 0xff, 0x33, 0x0e, 0x5c, 0x1a, 0x1c, 0x76, 0x37, 0x25, 0xef, 0x0f, 0xc4, 0xa0, 0xad, - 0xfe, 0xd6, 0x07, 0xa1, 0x90, 0x82, 0x95, 0x34, 0x58, 0xbb, 0x20, 0x43, 0xd7, 0xe3, 0x9b, 0x47, - 0x5b, 0x9b, 0xf4, 0xa1, 0x96, 0x6b, 0x4b, 0x9e, 0xe8, 0xf7, 0x45, 0x80, 0xb0, 0xfa, 0xd2, 0xf8, - 0xd5, 0xae, 0x2f, 0x9f, 0x0e, 0xdb, 0x75, 0x4f, 0xf4, 0x37, 0xbb, 0xa2, 0x2b, 0x36, 0x09, 0x6e, - 0x0f, 0x9f, 0x90, 0x44, 0x02, 0x7d, 0x29, 0xba, 0xfd, 0x9d, 0x05, 0x0b, 0xfb, 0xa8, 0xb6, 0x79, - 0x72, 0x6f, 0xdb, 0xe1, 0xcf, 0x86, 0x3c, 0x92, 0xac, 0x0a, 0x25, 0x3a, 0xea, 0xde, 0x76, 0xd5, - 0x5a, 0xb3, 0x36, 0x66, 0x1d, 0x23, 0xb2, 0x15, 0x80, 0x76, 0x4f, 0x78, 0x87, 0x2d, 0xe9, 0x86, - 0xb2, 0x3a, 0xb9, 0x66, 0x6d, 0x94, 0x9d, 0x14, 0xc2, 0x6a, 0x30, 0x43, 0xd2, 0x4e, 0xd0, 0xa9, - 0x4e, 0xd1, 0x6a, 0x2c, 0xb3, 0x2b, 0x50, 0x7e, 0x36, 0xe4, 0xe1, 0xc9, 0x9e, 0xe8, 0xf0, 0xea, - 0x34, 0x2d, 0x26, 0x80, 0x1d, 0xc0, 0x62, 0xca, 0x8e, 0x68, 0x20, 0x82, 0x88, 0xb3, 0x75, 0x98, - 0xa6, 0x93, 0xc9, 0x8c, 0x4a, 0x63, 0xbe, 0xae, 0x63, 0x52, 0x27, 0xaa, 0xa3, 0x16, 0xd9, 0x75, - 0x28, 0xf5, 0xb9, 0x0c, 0x7d, 0x2f, 0x22, 0x8b, 0x2a, 0x8d, 0xcb, 0x59, 0x1e, 0xaa, 0xdc, 0x53, - 0x04, 0xc7, 0x30, 0x6d, 0x96, 0xf2, 0x5b, 0x2f, 0xda, 0x3f, 0x4f, 0xc2, 0x5c, 0x8b, 0xbb, 0xa1, - 0xf7, 0xd4, 0x44, 0xe2, 0x16, 0x14, 0xf6, 0xdd, 0x6e, 0x54, 0xb5, 0xd6, 0xa6, 0x36, 0x2a, 0x8d, - 0xb5, 0x58, 0x6f, 0x86, 0x55, 0x47, 0xca, 0x4e, 0x20, 0xc3, 0x93, 0x66, 0xe1, 0xf9, 0xcb, 0xd5, - 0x09, 0x87, 0xf6, 0xb0, 0x75, 0x98, 0xdb, 0xf3, 0x83, 0xed, 0x61, 0xe8, 0x4a, 0x5f, 0x04, 0x7b, - 0xca, 0xb8, 0x39, 0x27, 0x0b, 0x12, 0xcb, 0x3d, 0x4e, 0xb1, 0xa6, 0x34, 0x2b, 0x0d, 0xb2, 0x0b, - 0x30, 0xfd, 0xd0, 0xef, 0xfb, 0xb2, 0x5a, 0xa0, 0x55, 0x25, 0x20, 0x1a, 0x51, 0x22, 0xa6, 0x15, - 0x4a, 0x02, 0x5b, 0x80, 0x29, 0x1e, 0x74, 0xaa, 0x45, 0xc2, 0xf0, 0x13, 0x79, 0x5f, 0x60, 0xa0, - 0xab, 0x33, 0x14, 0x75, 0x25, 0xd4, 0x6e, 0x42, 0x39, 0x36, 0x1c, 0x37, 0x1d, 0xf2, 0x13, 0x8a, - 0x73, 0xd9, 0xc1, 0x4f, 0xdc, 0x74, 0xe4, 0xf6, 0x86, 0x5c, 0x67, 0x59, 0x09, 0xb7, 0x26, 0x3f, - 0xb0, 0xec, 0x6f, 0xa7, 0x80, 0xa9, 0x00, 0x34, 0x31, 0xb7, 0x26, 0x56, 0x37, 0xa0, 0x1c, 0x99, - 0xb0, 0xe8, 0x84, 0x2d, 0x8d, 0x0f, 0x98, 0x93, 0x10, 0xb1, 0xd6, 0xa8, 0x42, 0xee, 0x6d, 0xeb, - 0x83, 0x8c, 0x88, 0xf5, 0x42, 0x0e, 0x3d, 0x76, 0xbb, 0x5c, 0x47, 0x25, 0x01, 0x30, 0x6e, 0x03, - 0xb7, 0xcb, 0xa3, 0x7d, 0xa1, 0x54, 0xeb, 0xc8, 0x64, 0x41, 0xac, 0x47, 0x1e, 0x78, 0xa2, 0xe3, - 0x07, 0x5d, 0x5d, 0x72, 0xb1, 0x8c, 0x1a, 0xfc, 0xa0, 0xc3, 0x8f, 0x51, 0x5d, 0xcb, 0xff, 0x86, - 0xeb, 0x88, 0x65, 0x41, 0x66, 0xc3, 0xac, 0x14, 0xd2, 0xed, 0x39, 0xdc, 0x13, 0x61, 0x27, 0xaa, - 0x96, 0x88, 0x94, 0xc1, 0x90, 0xd3, 0x71, 0xa5, 0xbb, 0x63, 0x4e, 0x52, 0x61, 0xce, 0x60, 0xe8, - 0xe7, 0x11, 0x0f, 0x23, 0x5f, 0x04, 0xd5, 0xb2, 0xf2, 0x53, 0x8b, 0x8c, 0x41, 0x21, 0xc2, 0xe3, - 0x61, 0xcd, 0xda, 0x28, 0x38, 0xf4, 0x8d, 0x7d, 0xf6, 0x44, 0x08, 0xc9, 0x43, 0x32, 0xac, 0x42, - 0x67, 0xa6, 0x10, 0xfb, 0x18, 0xe6, 0x4d, 0x44, 0x75, 0xab, 0xdc, 0x80, 0x22, 0x75, 0x83, 0xa9, - 0xd5, 0x2b, 0xd9, 0x1e, 0x50, 0xec, 0x3d, 0x2e, 0x5d, 0xb4, 0xca, 0xd1, 0x5c, 0x76, 0x2d, 0xdf, - 0x3a, 0xf9, 0x8c, 0x8d, 0xf4, 0xcd, 0x5f, 0x16, 0x9c, 0x1f, 0xa3, 0x31, 0x3f, 0x33, 0xca, 0xc9, - 0xcc, 0xd8, 0x80, 0x73, 0xa1, 0x10, 0xb2, 0xc5, 0xc3, 0x23, 0xdf, 0xe3, 0x8f, 0xdc, 0xbe, 0x29, - 0xa9, 0x3c, 0x8c, 0x19, 0x41, 0x88, 0xd4, 0x13, 0x4f, 0x8d, 0x90, 0x2c, 0xc8, 0xde, 0x83, 0x45, - 0x2a, 0x83, 0x7d, 0xbf, 0xcf, 0xbf, 0x0c, 0xfc, 0xe3, 0x47, 0x6e, 0x20, 0x28, 0xfb, 0x05, 0x67, - 0x74, 0x01, 0x23, 0xd9, 0x49, 0x9a, 0x4b, 0x35, 0x4a, 0x0a, 0x61, 0xef, 0x42, 0x29, 0x1a, 0xb8, - 0x41, 0x8b, 0x4b, 0xca, 0x7f, 0xa5, 0xb1, 0x90, 0x44, 0x40, 0xe1, 0x8e, 0x21, 0xd8, 0xbb, 0x50, - 0xd2, 0x18, 0x7b, 0x13, 0xa6, 0x11, 0x35, 0xd1, 0x9e, 0xcb, 0x6c, 0x72, 0xd4, 0x1a, 0xc6, 0xa4, - 0xef, 0x4a, 0xef, 0x29, 0xef, 0xe8, 0xde, 0x37, 0xa2, 0xfd, 0xab, 0x05, 0x05, 0x64, 0xb2, 0x25, - 0x28, 0x22, 0x37, 0x8e, 0x9a, 0x96, 0xb0, 0x28, 0x82, 0x24, 0x52, 0xf4, 0x3d, 0xde, 0xf1, 0xa9, - 0xd3, 0x1c, 0x5f, 0x87, 0x39, 0xe3, 0x26, 0xca, 0x91, 0x0e, 0x51, 0x16, 0x64, 0xb7, 0x01, 0x5c, - 0x29, 0x43, 0xbf, 0x3d, 0x94, 0x1c, 0xc3, 0x83, 0xce, 0x2c, 0xc7, 0xce, 0xe8, 0x9b, 0xe5, 0x68, - 0xab, 0xfe, 0x80, 0x9f, 0x1c, 0xe0, 0x00, 0x70, 0x52, 0x74, 0xfb, 0x4f, 0xcb, 0xcc, 0x4b, 0x5d, - 0x26, 0x98, 0x6b, 0x3f, 0x88, 0x06, 0xdc, 0x93, 0xbc, 0xb3, 0x6f, 0xca, 0x11, 0x3d, 0xcf, 0xc3, - 0xec, 0x2d, 0x98, 0x8f, 0xa1, 0xe6, 0x09, 0x1e, 0x3e, 0x49, 0xf6, 0xe5, 0x50, 0xb6, 0x06, 0x15, - 0xea, 0x35, 0x1a, 0x35, 0x66, 0x3a, 0xa6, 0x21, 0x74, 0xd4, 0x13, 0xfd, 0x41, 0x8f, 0x4b, 0xde, - 0xb9, 0x2f, 0xda, 0x91, 0x99, 0x04, 0x19, 0x10, 0xa7, 0x09, 0x6d, 0x22, 0x86, 0x2a, 0x83, 0x04, - 0x40, 0xbb, 0x13, 0x95, 0xca, 0x9c, 0x22, 0x99, 0x93, 0x87, 0xed, 0x77, 0x60, 0x51, 0xb9, 0x8c, - 0xb3, 0xd3, 0x8c, 0x3e, 0x1c, 0xc4, 0x9e, 0x18, 0x70, 0x9d, 0x44, 0x25, 0xd8, 0xd7, 0xcc, 0x98, - 0x54, 0x54, 0xdd, 0xa8, 0x35, 0x98, 0x91, 0x6e, 0x17, 0x2b, 0x59, 0x15, 0x4f, 0xd9, 0x89, 0x65, - 0xfb, 0x3e, 0x5c, 0x48, 0x76, 0x1c, 0x34, 0xe2, 0x3d, 0x0d, 0x28, 0x92, 0x4a, 0x53, 0x6e, 0xb5, - 0x5c, 0x97, 0x2a, 0x7a, 0x0b, 0x29, 0x8e, 0x66, 0xda, 0xb7, 0xd3, 0x86, 0xea, 0xc5, 0xb8, 0xac, - 0xac, 0x54, 0x59, 0x31, 0x28, 0x48, 0xbc, 0xe3, 0x26, 0xc9, 0x18, 0xfa, 0xb6, 0x77, 0x61, 0x29, - 0xde, 0x4c, 0x79, 0x8f, 0xd2, 0x6f, 0x03, 0x65, 0x6e, 0xdc, 0xe7, 0x4a, 0xc4, 0x20, 0xd0, 0x75, - 0x6e, 0x2e, 0x0c, 0x12, 0xec, 0x9b, 0x70, 0x69, 0x44, 0x93, 0xf6, 0x0a, 0x53, 0x62, 0x40, 0x1d, - 0x8a, 0x04, 0xb0, 0x6f, 0xc0, 0x8c, 0xd9, 0x42, 0x26, 0x9e, 0xc4, 0xe1, 0xa5, 0xef, 0xf1, 0xf7, - 0x93, 0xfd, 0x10, 0x2e, 0xe7, 0x8e, 0x4b, 0x85, 0x71, 0x33, 0x7f, 0x60, 0xa5, 0xb1, 0x98, 0x8c, - 0x49, 0xbd, 0x92, 0xb6, 0xa1, 0x09, 0xd3, 0x54, 0xae, 0xec, 0x43, 0x28, 0xb5, 0xa9, 0x75, 0xcd, - 0xbe, 0xd5, 0x78, 0x9f, 0x7a, 0x94, 0x1d, 0x6d, 0xd5, 0x1d, 0x1e, 0x89, 0x61, 0xe8, 0x71, 0xec, - 0xeb, 0xc8, 0x31, 0x7c, 0x7b, 0x1e, 0x66, 0x1f, 0x0f, 0xa3, 0x78, 0x50, 0xdb, 0x3f, 0x59, 0xb0, - 0x80, 0x00, 0x95, 0x93, 0x89, 0xea, 0xd5, 0x78, 0x7a, 0x63, 0x16, 0x66, 0x9b, 0x17, 0xf1, 0x1d, - 0xf1, 0xfb, 0xcb, 0xd5, 0xb9, 0xc7, 0x21, 0x77, 0x7b, 0x3d, 0xe1, 0x29, 0xb6, 0x19, 0xdb, 0x6f, - 0xc3, 0x94, 0xdf, 0xc1, 0x66, 0x38, 0x83, 0x8b, 0x0c, 0xf6, 0x3e, 0x80, 0xba, 0x6a, 0xb7, 0x5d, - 0xe9, 0x56, 0x0b, 0x67, 0xf1, 0x53, 0x44, 0x7b, 0x4f, 0x99, 0xa8, 0x3c, 0xd1, 0x26, 0xfe, 0x8f, - 0x10, 0xac, 0x03, 0xe8, 0xb7, 0x16, 0x76, 0xf4, 0x52, 0xe6, 0xa6, 0x9a, 0x35, 0x4e, 0xd9, 0x1f, - 0x43, 0xf9, 0xa1, 0x1f, 0x1c, 0xb6, 0x7a, 0xbe, 0xc7, 0xd9, 0x16, 0x4c, 0xf7, 0xfc, 0xe0, 0xd0, - 0x9c, 0xb5, 0x3c, 0x7a, 0x16, 0x9e, 0x51, 0xc7, 0x0d, 0x8e, 0x62, 0xda, 0xdb, 0xc0, 0x10, 0x33, - 0x37, 0x56, 0xd2, 0x9a, 0xaa, 0x2a, 0xad, 0x54, 0x55, 0x62, 0x15, 0x77, 0x43, 0x31, 0x1c, 0x34, - 0x4d, 0xb5, 0x1a, 0xd1, 0xbe, 0x03, 0xe7, 0x33, 0x5a, 0xe2, 0xd2, 0xc1, 0xd7, 0x95, 0x34, 0xf6, - 0x5c, 0xce, 0xcc, 0x7b, 0x4d, 0xbe, 0x8b, 0x2a, 0x1c, 0xc5, 0xa3, 0x34, 0xe7, 0xd7, 0xc6, 0xb6, - 0x1f, 0x3e, 0x73, 0x06, 0x6e, 0xf0, 0x99, 0x18, 0x06, 0x52, 0xcf, 0xc0, 0x04, 0xc0, 0x31, 0xc9, - 0xc3, 0x50, 0x84, 0xad, 0x98, 0xa2, 0x06, 0x7e, 0x0e, 0x65, 0xd7, 0xa1, 0xdc, 0x73, 0x25, 0x0f, - 0x3c, 0x9f, 0x47, 0x94, 0xe7, 0x4a, 0xe3, 0x62, 0x6c, 0xa3, 0xe3, 0x7e, 0xbd, 0xeb, 0x47, 0x52, - 0x74, 0x43, 0xb7, 0xef, 0x24, 0x3c, 0xfb, 0x23, 0x98, 0x4d, 0x2f, 0x61, 0x66, 0xda, 0x43, 0xef, - 0x90, 0x4b, 0x32, 0xb0, 0xe0, 0x68, 0x09, 0x63, 0xe8, 0xa5, 0xcc, 0x53, 0x42, 0xe3, 0x7b, 0x0b, - 0x8a, 0x58, 0x25, 0x3c, 0x64, 0x9f, 0x40, 0x39, 0x2e, 0x69, 0x96, 0xc4, 0x26, 0x5f, 0xe6, 0xb5, - 0x8b, 0x99, 0xa5, 0xb8, 0x25, 0x26, 0xd8, 0xa7, 0x50, 0x89, 0xc9, 0x07, 0x8d, 0xff, 0xa2, 0xa2, - 0xf1, 0xa3, 0x05, 0x0b, 0x26, 0xd8, 0x3c, 0xe0, 0xa1, 0x2b, 0x45, 0x6c, 0x18, 0xd5, 0x63, 0x4e, - 0x6b, 0xba, 0xb8, 0x4f, 0x37, 0xec, 0x3e, 0x54, 0x52, 0x59, 0x64, 0xcb, 0xe3, 0xf2, 0x6e, 0x94, - 0x5c, 0x19, 0xbf, 0x18, 0x5b, 0xf8, 0x4b, 0x01, 0x4a, 0xf8, 0xf4, 0xf6, 0x79, 0xc8, 0x76, 0x61, - 0xee, 0x8e, 0x1f, 0x74, 0xe2, 0x9f, 0x20, 0x6c, 0xcc, 0x6f, 0x16, 0xa3, 0xb7, 0x36, 0x6e, 0x29, - 0x15, 0xba, 0x59, 0xf3, 0x14, 0xf4, 0x78, 0x20, 0xd9, 0x29, 0x6f, 0xee, 0xda, 0xa5, 0x11, 0x3c, - 0x56, 0xb1, 0x03, 0x95, 0xd4, 0x7b, 0x3e, 0xed, 0xe4, 0xc8, 0x2b, 0xff, 0x2c, 0x35, 0x77, 0x01, - 0x92, 0x1b, 0x87, 0x8d, 0xbb, 0xa3, 0x8c, 0x92, 0xe5, 0xb1, 0x6b, 0xb1, 0xa2, 0x07, 0xc6, 0x25, - 0x75, 0x75, 0x9d, 0xa9, 0xea, 0x8d, 0xb1, 0x57, 0x61, 0x4a, 0xd9, 0x01, 0x9c, 0xcb, 0xdd, 0x08, - 0x6c, 0x75, 0x74, 0x4f, 0xe6, 0x92, 0xab, 0xad, 0x9d, 0x4e, 0x88, 0xf5, 0x7e, 0x95, 0xba, 0x5f, - 0xcd, 0x4d, 0xf3, 0xcf, 0x9a, 0xed, 0xd3, 0x08, 0x69, 0x9b, 0x1b, 0x9f, 0xc3, 0x42, 0x4b, 0x86, - 0xdc, 0xed, 0xfb, 0x41, 0xd7, 0x54, 0xcc, 0x6d, 0x28, 0xea, 0x1f, 0x35, 0xff, 0x36, 0xc3, 0xd7, - 0xac, 0x66, 0xf5, 0xf9, 0xab, 0x15, 0xeb, 0xc5, 0xab, 0x15, 0xeb, 0x8f, 0x57, 0x2b, 0xd6, 0x0f, - 0xaf, 0x57, 0x26, 0x5e, 0xbc, 0x5e, 0x99, 0xf8, 0xed, 0xf5, 0xca, 0x44, 0xbb, 0x48, 0xff, 0x07, - 0xb8, 0xfe, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0xac, 0xb8, 0x40, 0x4b, 0x88, 0x10, 0x00, 0x00, + // 1617 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0xcd, 0x6e, 0x1b, 0x47, + 0x12, 0xd6, 0x88, 0x14, 0x29, 0x16, 0x25, 0x59, 0x6a, 0xdb, 0x32, 0x4d, 0x79, 0x25, 0x61, 0x56, + 0xd8, 0xd5, 0x2e, 0xd6, 0x94, 0x44, 0x5b, 0xf0, 0xda, 0x5e, 0x6c, 0x10, 0x46, 0x8a, 0xe5, 0x1f, + 0x39, 0xf6, 0x50, 0xd1, 0xc1, 0xb7, 0xe1, 0xb0, 0x4d, 0x0f, 0x44, 0x4e, 0xd3, 0x33, 0x4d, 0x45, + 0xcc, 0x29, 0xa7, 0x9c, 0x72, 0xc8, 0x1b, 0x04, 0x01, 0x02, 0x04, 0xc8, 0x6b, 0xe4, 0xe2, 0xa3, + 0x8f, 0x41, 0x0e, 0x46, 0x60, 0x3f, 0x41, 0x8e, 0xb9, 0x05, 0x55, 0xdd, 0x3d, 0x3f, 0x14, 0xa5, + 0x20, 0xce, 0x89, 0x5d, 0x5f, 0x7f, 0x5d, 0x5d, 0x55, 0x5d, 0x55, 0xdd, 0x43, 0xb8, 0xd2, 0x3f, + 0xea, 0x6c, 0x48, 0xde, 0xeb, 0x8b, 0x7e, 0x4b, 0xfd, 0xd6, 0xfa, 0xa1, 0x90, 0x82, 0x15, 0x35, + 0x58, 0xbd, 0x24, 0x43, 0xd7, 0xe3, 0x1b, 0xc7, 0x5b, 0x1b, 0x34, 0x50, 0xd3, 0xd5, 0x45, 0x4f, + 0xf4, 0x7a, 0x22, 0x40, 0x58, 0x8d, 0x34, 0x7e, 0xbd, 0xe3, 0xcb, 0x17, 0x83, 0x56, 0xcd, 0x13, + 0xbd, 0x8d, 0x8e, 0xe8, 0x88, 0x0d, 0x82, 0x5b, 0x83, 0xe7, 0x24, 0x91, 0x40, 0x23, 0x45, 0xb7, + 0xbf, 0xb4, 0x60, 0xfe, 0x00, 0xd5, 0x36, 0x86, 0xf7, 0x77, 0x1c, 0xfe, 0x72, 0xc0, 0x23, 0xc9, + 0x2a, 0x50, 0xa4, 0xad, 0xee, 0xef, 0x54, 0xac, 0x55, 0x6b, 0x7d, 0xc6, 0x31, 0x22, 0x5b, 0x06, + 0x68, 0x75, 0x85, 0x77, 0xd4, 0x94, 0x6e, 0x28, 0x2b, 0x93, 0xab, 0xd6, 0x7a, 0xc9, 0x49, 0x21, + 0xac, 0x0a, 0xd3, 0x24, 0xed, 0x06, 0xed, 0x4a, 0x8e, 0x66, 0x63, 0x99, 0x5d, 0x83, 0xd2, 0xcb, + 0x01, 0x0f, 0x87, 0xfb, 0xa2, 0xcd, 0x2b, 0x53, 0x34, 0x99, 0x00, 0x76, 0x00, 0x0b, 0x29, 0x3b, + 0xa2, 0xbe, 0x08, 0x22, 0xce, 0xd6, 0x60, 0x8a, 0x76, 0x26, 0x33, 0xca, 0xf5, 0xb9, 0x9a, 0x8e, + 0x49, 0x8d, 0xa8, 0x8e, 0x9a, 0x64, 0x37, 0xa0, 0xd8, 0xe3, 0x32, 0xf4, 0xbd, 0x88, 0x2c, 0x2a, + 0xd7, 0xaf, 0x66, 0x79, 0xa8, 0x72, 0x5f, 0x11, 0x1c, 0xc3, 0xb4, 0x59, 0xca, 0x6f, 0x3d, 0x69, + 0x7f, 0x37, 0x09, 0xb3, 0x4d, 0xee, 0x86, 0xde, 0x0b, 0x13, 0x89, 0x3b, 0x90, 0x3f, 0x70, 0x3b, + 0x51, 0xc5, 0x5a, 0xcd, 0xad, 0x97, 0xeb, 0xab, 0xb1, 0xde, 0x0c, 0xab, 0x86, 0x94, 0xdd, 0x40, + 0x86, 0xc3, 0x46, 0xfe, 0xd5, 0x9b, 0x95, 0x09, 0x87, 0xd6, 0xb0, 0x35, 0x98, 0xdd, 0xf7, 0x83, + 0x9d, 0x41, 0xe8, 0x4a, 0x5f, 0x04, 0xfb, 0xca, 0xb8, 0x59, 0x27, 0x0b, 0x12, 0xcb, 0x3d, 0x49, + 0xb1, 0x72, 0x9a, 0x95, 0x06, 0xd9, 0x25, 0x98, 0x7a, 0xe4, 0xf7, 0x7c, 0x59, 0xc9, 0xd3, 0xac, + 0x12, 0x10, 0x8d, 0xe8, 0x20, 0xa6, 0x14, 0x4a, 0x02, 0x9b, 0x87, 0x1c, 0x0f, 0xda, 0x95, 0x02, + 0x61, 0x38, 0x44, 0xde, 0x53, 0x0c, 0x74, 0x65, 0x9a, 0xa2, 0xae, 0x84, 0xea, 0x2d, 0x28, 0xc5, + 0x86, 0xe3, 0xa2, 0x23, 0x3e, 0xa4, 0x38, 0x97, 0x1c, 0x1c, 0xe2, 0xa2, 0x63, 0xb7, 0x3b, 0xe0, + 0xfa, 0x94, 0x95, 0x70, 0x67, 0xf2, 0xbf, 0x96, 0xfd, 0x45, 0x0e, 0x98, 0x0a, 0x40, 0x03, 0xcf, + 0xd6, 0xc4, 0xea, 0x26, 0x94, 0x22, 0x13, 0x16, 0x7d, 0x60, 0x8b, 0xe3, 0x03, 0xe6, 0x24, 0x44, + 0xcc, 0x35, 0xca, 0x90, 0xfb, 0x3b, 0x7a, 0x23, 0x23, 0x62, 0xbe, 0x90, 0x43, 0x4f, 0xdc, 0x0e, + 0xd7, 0x51, 0x49, 0x00, 0x8c, 0x5b, 0xdf, 0xed, 0xf0, 0xe8, 0x40, 0x28, 0xd5, 0x3a, 0x32, 0x59, + 0x10, 0xf3, 0x91, 0x07, 0x9e, 0x68, 0xfb, 0x41, 0x47, 0xa7, 0x5c, 0x2c, 0xa3, 0x06, 0x3f, 0x68, + 0xf3, 0x13, 0x54, 0xd7, 0xf4, 0x3f, 0xe7, 0x3a, 0x62, 0x59, 0x90, 0xd9, 0x30, 0x23, 0x85, 0x74, + 0xbb, 0x0e, 0xf7, 0x44, 0xd8, 0x8e, 0x2a, 0x45, 0x22, 0x65, 0x30, 0xe4, 0xb4, 0x5d, 0xe9, 0xee, + 0x9a, 0x9d, 0x54, 0x98, 0x33, 0x18, 0xfa, 0x79, 0xcc, 0xc3, 0xc8, 0x17, 0x41, 0xa5, 0xa4, 0xfc, + 0xd4, 0x22, 0x63, 0x90, 0x8f, 0x70, 0x7b, 0x58, 0xb5, 0xd6, 0xf3, 0x0e, 0x8d, 0xb1, 0xce, 0x9e, + 0x0b, 0x21, 0x79, 0x48, 0x86, 0x95, 0x69, 0xcf, 0x14, 0x62, 0x9f, 0xc0, 0x9c, 0x89, 0xa8, 0x2e, + 0x95, 0x9b, 0x50, 0xa0, 0x6a, 0x30, 0xb9, 0x7a, 0x2d, 0x5b, 0x03, 0x8a, 0xbd, 0xcf, 0xa5, 0x8b, + 0x56, 0x39, 0x9a, 0xcb, 0x36, 0x47, 0x4b, 0x67, 0xf4, 0xc4, 0x4e, 0xd5, 0xcd, 0x6f, 0x16, 0x5c, + 0x1c, 0xa3, 0x71, 0xb4, 0x67, 0x94, 0x92, 0x9e, 0xb1, 0x0e, 0x17, 0x42, 0x21, 0x64, 0x93, 0x87, + 0xc7, 0xbe, 0xc7, 0x1f, 0xbb, 0x3d, 0x93, 0x52, 0xa3, 0x30, 0x9e, 0x08, 0x42, 0xa4, 0x9e, 0x78, + 0xaa, 0x85, 0x64, 0x41, 0xf6, 0x1f, 0x58, 0xa0, 0x34, 0x38, 0xf0, 0x7b, 0xfc, 0xd3, 0xc0, 0x3f, + 0x79, 0xec, 0x06, 0x82, 0x4e, 0x3f, 0xef, 0x9c, 0x9e, 0xc0, 0x48, 0xb6, 0x93, 0xe2, 0x52, 0x85, + 0x92, 0x42, 0xd8, 0xbf, 0xa1, 0x18, 0xf5, 0xdd, 0xa0, 0xc9, 0x25, 0x9d, 0x7f, 0xb9, 0x3e, 0x9f, + 0x44, 0x40, 0xe1, 0x8e, 0x21, 0xd8, 0x7b, 0x50, 0xd4, 0x18, 0xfb, 0x3b, 0x4c, 0x21, 0x6a, 0xa2, + 0x3d, 0x9b, 0x59, 0xe4, 0xa8, 0x39, 0x8c, 0x49, 0xcf, 0x95, 0xde, 0x0b, 0xde, 0xd6, 0xb5, 0x6f, + 0x44, 0xfb, 0x47, 0x0b, 0xf2, 0xc8, 0x64, 0x8b, 0x50, 0x40, 0x6e, 0x1c, 0x35, 0x2d, 0x61, 0x52, + 0x04, 0x49, 0xa4, 0x68, 0x3c, 0xde, 0xf1, 0xdc, 0x59, 0x8e, 0xaf, 0xc1, 0xac, 0x71, 0x13, 0xe5, + 0x48, 0x87, 0x28, 0x0b, 0xb2, 0xbb, 0x00, 0xae, 0x94, 0xa1, 0xdf, 0x1a, 0x48, 0x8e, 0xe1, 0x41, + 0x67, 0x96, 0x62, 0x67, 0xf4, 0xcd, 0x72, 0xbc, 0x55, 0x7b, 0xc8, 0x87, 0x87, 0xd8, 0x00, 0x9c, + 0x14, 0xdd, 0xfe, 0xd5, 0x32, 0xfd, 0x52, 0xa7, 0x09, 0x9e, 0xb5, 0x1f, 0x44, 0x7d, 0xee, 0x49, + 0xde, 0x3e, 0x30, 0xe9, 0x88, 0x9e, 0x8f, 0xc2, 0xec, 0x1f, 0x30, 0x17, 0x43, 0x8d, 0x21, 0x6e, + 0x3e, 0x49, 0xf6, 0x8d, 0xa0, 0x6c, 0x15, 0xca, 0x54, 0x6b, 0xd4, 0x6a, 0x4c, 0x77, 0x4c, 0x43, + 0xe8, 0xa8, 0x27, 0x7a, 0xfd, 0x2e, 0x97, 0xbc, 0xfd, 0x40, 0xb4, 0x22, 0xd3, 0x09, 0x32, 0x20, + 0x76, 0x13, 0x5a, 0x44, 0x0c, 0x95, 0x06, 0x09, 0x80, 0x76, 0x27, 0x2a, 0x95, 0x39, 0x05, 0x32, + 0x67, 0x14, 0xb6, 0xff, 0x05, 0x0b, 0xca, 0x65, 0xec, 0x9d, 0xa6, 0xf5, 0x61, 0x23, 0xf6, 0x44, + 0x9f, 0xeb, 0x43, 0x54, 0x82, 0xbd, 0x69, 0xda, 0xa4, 0xa2, 0xea, 0x42, 0xad, 0xc2, 0xb4, 0x74, + 0x3b, 0x98, 0xc9, 0x2a, 0x79, 0x4a, 0x4e, 0x2c, 0xdb, 0x0f, 0xe0, 0x52, 0xb2, 0xe2, 0xb0, 0x1e, + 0xaf, 0xa9, 0x43, 0x81, 0x54, 0x9a, 0x74, 0xab, 0x8e, 0x54, 0xa9, 0xa2, 0x37, 0x91, 0xe2, 0x68, + 0xa6, 0x7d, 0x37, 0x6d, 0xa8, 0x9e, 0x8c, 0xd3, 0xca, 0x4a, 0xa5, 0x15, 0x83, 0xbc, 0xc4, 0x3b, + 0x6e, 0x92, 0x8c, 0xa1, 0xb1, 0xbd, 0x07, 0x8b, 0xf1, 0x62, 0x3a, 0xf7, 0x28, 0xfd, 0x36, 0x50, + 0xe6, 0xc6, 0x75, 0xae, 0x44, 0x0c, 0x02, 0x5d, 0xe7, 0xe6, 0xc2, 0x20, 0xc1, 0xbe, 0x05, 0x57, + 0x4e, 0x69, 0xd2, 0x5e, 0xe1, 0x91, 0x18, 0x50, 0x87, 0x22, 0x01, 0xec, 0x9b, 0x30, 0x6d, 0x96, + 0x90, 0x89, 0xc3, 0x38, 0xbc, 0x34, 0x1e, 0x7f, 0x3f, 0xd9, 0x8f, 0xe0, 0xea, 0xc8, 0x76, 0xa9, + 0x30, 0x6e, 0x8c, 0x6e, 0x58, 0xae, 0x2f, 0x24, 0x6d, 0x52, 0xcf, 0xa4, 0x6d, 0x68, 0xc0, 0x14, + 0xa5, 0x2b, 0xbb, 0x0d, 0xc5, 0x16, 0x95, 0xae, 0x59, 0xb7, 0x12, 0xaf, 0x53, 0x8f, 0xb2, 0xe3, + 0xad, 0x9a, 0xc3, 0x23, 0x31, 0x08, 0x3d, 0x8e, 0x75, 0x1d, 0x39, 0x86, 0x6f, 0xcf, 0xc1, 0xcc, + 0x93, 0x41, 0x14, 0x37, 0x6a, 0xfb, 0x5b, 0x0b, 0xe6, 0x11, 0xa0, 0x74, 0x32, 0x51, 0xbd, 0x1e, + 0x77, 0x6f, 0x3c, 0x85, 0x99, 0xc6, 0x65, 0x7c, 0x47, 0xfc, 0xfc, 0x66, 0x65, 0xf6, 0x49, 0xc8, + 0xdd, 0x6e, 0x57, 0x78, 0x8a, 0x6d, 0xda, 0xf6, 0x3f, 0x21, 0xe7, 0xb7, 0xb1, 0x18, 0xce, 0xe1, + 0x22, 0x83, 0x6d, 0x03, 0xa8, 0xab, 0x76, 0xc7, 0x95, 0x6e, 0x25, 0x7f, 0x1e, 0x3f, 0x45, 0xb4, + 0xf7, 0x95, 0x89, 0xca, 0x13, 0x6d, 0xe2, 0x5f, 0x08, 0xc1, 0x1a, 0x80, 0x7e, 0x6b, 0x61, 0x45, + 0x2f, 0x66, 0x6e, 0xaa, 0x19, 0xe3, 0x94, 0xfd, 0x7f, 0x28, 0x3d, 0xf2, 0x83, 0xa3, 0x66, 0xd7, + 0xf7, 0x38, 0xdb, 0x82, 0xa9, 0xae, 0x1f, 0x1c, 0x99, 0xbd, 0x96, 0x4e, 0xef, 0x85, 0x7b, 0xd4, + 0x70, 0x81, 0xa3, 0x98, 0xf6, 0x33, 0x60, 0x88, 0x99, 0x1b, 0x2b, 0x29, 0x4d, 0x95, 0x95, 0x56, + 0x2a, 0x2b, 0x31, 0x8b, 0x3b, 0xa1, 0x18, 0xf4, 0x1b, 0x26, 0x5b, 0x8d, 0x88, 0xfc, 0x2e, 0xbd, + 0xb4, 0x54, 0x63, 0x55, 0x82, 0xfd, 0x14, 0x2e, 0x66, 0x74, 0x27, 0x19, 0xcc, 0x23, 0xe9, 0xf7, + 0x5c, 0xc9, 0xdb, 0xb4, 0xc1, 0xb4, 0x93, 0x00, 0xf4, 0x80, 0xe9, 0xbb, 0xc1, 0x47, 0x62, 0x10, + 0x48, 0xdd, 0xdd, 0x12, 0xc0, 0xfe, 0x1f, 0xcc, 0x38, 0xee, 0x67, 0x7b, 0x7e, 0x24, 0x45, 0x27, + 0x74, 0x7b, 0x18, 0x96, 0xd6, 0xc0, 0x3b, 0xe2, 0x92, 0x14, 0xe5, 0x1d, 0x2d, 0xa1, 0x41, 0x5e, + 0x4a, 0x83, 0x12, 0xec, 0x87, 0x70, 0x35, 0x65, 0x50, 0x73, 0xd0, 0xeb, 0xb9, 0xe1, 0xf0, 0x3d, + 0x7d, 0xb6, 0x7f, 0xb0, 0xa0, 0x3a, 0x4e, 0x5b, 0xe2, 0x65, 0xd6, 0x8f, 0x5c, 0xca, 0x0f, 0x6c, + 0xe4, 0x3c, 0x0c, 0x45, 0xd8, 0x8c, 0x29, 0x39, 0xa2, 0x8c, 0xa0, 0xf8, 0xc2, 0xec, 0xdf, 0xbe, + 0xad, 0x6f, 0x21, 0x1c, 0x2a, 0x64, 0x9b, 0x9a, 0x31, 0x21, 0xdb, 0x0a, 0xd9, 0xd4, 0xad, 0x17, + 0x87, 0x84, 0x6c, 0x6f, 0xd2, 0xab, 0x0b, 0x91, 0xed, 0xcd, 0xfa, 0x57, 0x16, 0x14, 0x30, 0x39, + 0x79, 0xc8, 0x3e, 0x80, 0x52, 0x5c, 0x49, 0x2c, 0x79, 0xf4, 0x8f, 0x56, 0x57, 0xf5, 0x72, 0x66, + 0x2a, 0xae, 0xc4, 0x09, 0xf6, 0x21, 0x94, 0x63, 0xf2, 0x61, 0xfd, 0x7d, 0x54, 0xd4, 0xbf, 0xb1, + 0x60, 0x5e, 0xc7, 0xed, 0x1e, 0x0f, 0x78, 0xe8, 0x4a, 0x11, 0x1b, 0x46, 0x65, 0x30, 0xa2, 0x35, + 0x5d, 0x53, 0x67, 0x1b, 0xf6, 0x00, 0xca, 0xa9, 0x03, 0x61, 0x4b, 0x99, 0xe7, 0x45, 0x36, 0xc3, + 0xab, 0xd7, 0xc6, 0x4f, 0xc6, 0x16, 0x7e, 0x9f, 0x87, 0x22, 0xbe, 0xf8, 0x7d, 0x1e, 0xb2, 0x3d, + 0x98, 0xfd, 0xd8, 0x0f, 0xda, 0xf1, 0x97, 0x0f, 0x1b, 0xf3, 0xa9, 0x64, 0xf4, 0x56, 0xc7, 0x4d, + 0xa5, 0x42, 0x37, 0x63, 0x5e, 0xa0, 0x1e, 0x0f, 0x24, 0x3b, 0xe3, 0xa9, 0x5f, 0xbd, 0x72, 0x0a, + 0x8f, 0x55, 0xec, 0x42, 0x39, 0xf5, 0x19, 0x91, 0x76, 0xf2, 0xd4, 0xc7, 0xc5, 0x79, 0x6a, 0xee, + 0x01, 0x24, 0x17, 0x1d, 0x1b, 0x77, 0x35, 0x1a, 0x25, 0x4b, 0x63, 0xe7, 0x62, 0x45, 0x0f, 0x8d, + 0x4b, 0xea, 0xc6, 0x3c, 0x57, 0xd5, 0xdf, 0xc6, 0xde, 0xc0, 0x29, 0x65, 0x87, 0x70, 0x61, 0xe4, + 0x22, 0x62, 0x2b, 0xa7, 0xd7, 0x64, 0xee, 0xd6, 0xea, 0xea, 0xd9, 0x84, 0x58, 0xef, 0xb3, 0xd4, + 0xb5, 0x6e, 0x2e, 0xb8, 0x3f, 0xd6, 0x6c, 0x9f, 0x45, 0x48, 0xdb, 0x5c, 0xff, 0x04, 0xe6, 0x9b, + 0x32, 0xe4, 0x6e, 0xcf, 0x0f, 0x3a, 0x26, 0x63, 0xee, 0x42, 0x41, 0x7f, 0x4b, 0xfd, 0xd9, 0x13, + 0xde, 0xb4, 0x1a, 0x95, 0x57, 0x6f, 0x97, 0xad, 0xd7, 0x6f, 0x97, 0xad, 0x5f, 0xde, 0x2e, 0x5b, + 0x5f, 0xbf, 0x5b, 0x9e, 0x78, 0xfd, 0x6e, 0x79, 0xe2, 0xa7, 0x77, 0xcb, 0x13, 0xad, 0x02, 0xfd, + 0xfd, 0x70, 0xe3, 0xf7, 0x00, 0x00, 0x00, 0xff, 0xff, 0x05, 0x02, 0x8f, 0x6c, 0xff, 0x10, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3449,6 +3538,11 @@ func (m *SpanMetricsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.Limit != 0 { + i = encodeVarintTempo(dAtA, i, uint64(m.Limit)) + i-- + dAtA[i] = 0x18 + } if len(m.GroupBy) > 0 { i -= len(m.GroupBy) copy(dAtA[i:], m.GroupBy) @@ -3486,24 +3580,25 @@ func (m *SpanMetricsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.Stats) > 0 { - for iNdEx := len(m.Stats) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Stats[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTempo(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa + if m.SpanCount != 0 { + i = encodeVarintTempo(dAtA, i, uint64(m.SpanCount)) + i-- + dAtA[i] = 0x10 + } + if m.Estimated { + i-- + if m.Estimated { + dAtA[i] = 1 + } else { + dAtA[i] = 0 } + i-- + dAtA[i] = 0x8 } return len(dAtA) - i, nil } -func (m *SpanMetricsGroup) Marshal() (dAtA []byte, err error) { +func (m *RawHistogram) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3513,51 +3608,67 @@ func (m *SpanMetricsGroup) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *SpanMetricsGroup) MarshalTo(dAtA []byte) (int, error) { +func (m *RawHistogram) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *SpanMetricsGroup) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *RawHistogram) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if len(m.Latencies) > 0 { - for iNdEx := len(m.Latencies) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Latencies[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTempo(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x22 - } + if m.Count != 0 { + i = encodeVarintTempo(dAtA, i, uint64(m.Count)) + i-- + dAtA[i] = 0x10 } - if m.ErrorSpanCount != 0 { - i = encodeVarintTempo(dAtA, i, uint64(m.ErrorSpanCount)) + if m.Bucket != 0 { + i = encodeVarintTempo(dAtA, i, uint64(m.Bucket)) i-- - dAtA[i] = 0x18 + dAtA[i] = 0x8 } - if m.SpanCount != 0 { - i = encodeVarintTempo(dAtA, i, uint64(m.SpanCount)) + return len(dAtA) - i, nil +} + +func (m *SpanMetricsSummaryRequest) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *SpanMetricsSummaryRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SpanMetricsSummaryRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.GroupBy) > 0 { + i -= len(m.GroupBy) + copy(dAtA[i:], m.GroupBy) + i = encodeVarintTempo(dAtA, i, uint64(len(m.GroupBy))) i-- - dAtA[i] = 0x10 + dAtA[i] = 0x12 } - if len(m.Name) > 0 { - i -= len(m.Name) - copy(dAtA[i:], m.Name) - i = encodeVarintTempo(dAtA, i, uint64(len(m.Name))) + if len(m.Query) > 0 { + i -= len(m.Query) + copy(dAtA[i:], m.Query) + i = encodeVarintTempo(dAtA, i, uint64(len(m.Query))) i-- dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *RawHistogram) Marshal() (dAtA []byte, err error) { +func (m *SpanMetricsSummaryResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3567,25 +3678,45 @@ func (m *RawHistogram) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *RawHistogram) MarshalTo(dAtA []byte) (int, error) { +func (m *SpanMetricsSummaryResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *RawHistogram) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *SpanMetricsSummaryResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.Count != 0 { - i = encodeVarintTempo(dAtA, i, uint64(m.Count)) + if m.P50 != 0 { + i = encodeVarintTempo(dAtA, i, uint64(m.P50)) i-- - dAtA[i] = 0x10 + dAtA[i] = 0x38 } - if m.Bucket != 0 { - i = encodeVarintTempo(dAtA, i, uint64(m.Bucket)) + if m.P90 != 0 { + i = encodeVarintTempo(dAtA, i, uint64(m.P90)) i-- - dAtA[i] = 0x8 + dAtA[i] = 0x30 + } + if m.P95 != 0 { + i = encodeVarintTempo(dAtA, i, uint64(m.P95)) + i-- + dAtA[i] = 0x28 + } + if m.P99 != 0 { + i = encodeVarintTempo(dAtA, i, uint64(m.P99)) + i-- + dAtA[i] = 0x20 + } + if m.ErrorSpanCount != 0 { + i = encodeVarintTempo(dAtA, i, uint64(m.ErrorSpanCount)) + i-- + dAtA[i] = 0x18 + } + if m.SpanCount != 0 { + i = encodeVarintTempo(dAtA, i, uint64(m.SpanCount)) + i-- + dAtA[i] = 0x10 } return len(dAtA) - i, nil } @@ -4095,6 +4226,9 @@ func (m *SpanMetricsRequest) Size() (n int) { if l > 0 { n += 1 + l + sovTempo(uint64(l)) } + if m.Limit != 0 { + n += 1 + sovTempo(uint64(m.Limit)) + } return n } @@ -4104,51 +4238,70 @@ func (m *SpanMetricsResponse) Size() (n int) { } var l int _ = l - if len(m.Stats) > 0 { - for _, e := range m.Stats { - l = e.Size() - n += 1 + l + sovTempo(uint64(l)) - } + if m.Estimated { + n += 2 + } + if m.SpanCount != 0 { + n += 1 + sovTempo(uint64(m.SpanCount)) } return n } -func (m *SpanMetricsGroup) Size() (n int) { +func (m *RawHistogram) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = len(m.Name) - if l > 0 { - n += 1 + l + sovTempo(uint64(l)) + if m.Bucket != 0 { + n += 1 + sovTempo(uint64(m.Bucket)) } - if m.SpanCount != 0 { - n += 1 + sovTempo(uint64(m.SpanCount)) + if m.Count != 0 { + n += 1 + sovTempo(uint64(m.Count)) } - if m.ErrorSpanCount != 0 { - n += 1 + sovTempo(uint64(m.ErrorSpanCount)) + return n +} + +func (m *SpanMetricsSummaryRequest) Size() (n int) { + if m == nil { + return 0 } - if len(m.Latencies) > 0 { - for _, e := range m.Latencies { - l = e.Size() - n += 1 + l + sovTempo(uint64(l)) - } + var l int + _ = l + l = len(m.Query) + if l > 0 { + n += 1 + l + sovTempo(uint64(l)) + } + l = len(m.GroupBy) + if l > 0 { + n += 1 + l + sovTempo(uint64(l)) } return n } -func (m *RawHistogram) Size() (n int) { +func (m *SpanMetricsSummaryResponse) Size() (n int) { if m == nil { return 0 } - var l int - _ = l - if m.Bucket != 0 { - n += 1 + sovTempo(uint64(m.Bucket)) + var l int + _ = l + if m.SpanCount != 0 { + n += 1 + sovTempo(uint64(m.SpanCount)) + } + if m.ErrorSpanCount != 0 { + n += 1 + sovTempo(uint64(m.ErrorSpanCount)) } - if m.Count != 0 { - n += 1 + sovTempo(uint64(m.Count)) + if m.P99 != 0 { + n += 1 + sovTempo(uint64(m.P99)) + } + if m.P95 != 0 { + n += 1 + sovTempo(uint64(m.P95)) + } + if m.P90 != 0 { + n += 1 + sovTempo(uint64(m.P90)) + } + if m.P50 != 0 { + n += 1 + sovTempo(uint64(m.P50)) } return n } @@ -7324,6 +7477,25 @@ func (m *SpanMetricsRequest) Unmarshal(dAtA []byte) error { } m.GroupBy = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 3: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Limit", wireType) + } + m.Limit = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTempo + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Limit |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipTempo(dAtA[iNdEx:]) @@ -7375,10 +7547,10 @@ func (m *SpanMetricsResponse) Unmarshal(dAtA []byte) error { } switch fieldNum { case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Stats", wireType) + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Estimated", wireType) } - var msglen int + var v int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTempo @@ -7388,26 +7560,31 @@ func (m *SpanMetricsResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { - return ErrInvalidLengthTempo - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTempo - } - if postIndex > l { - return io.ErrUnexpectedEOF + m.Estimated = bool(v != 0) + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field SpanCount", wireType) } - m.Stats = append(m.Stats, &SpanMetricsGroup{}) - if err := m.Stats[len(m.Stats)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err + m.SpanCount = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTempo + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.SpanCount |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } } - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTempo(dAtA[iNdEx:]) @@ -7429,7 +7606,7 @@ func (m *SpanMetricsResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *SpanMetricsGroup) Unmarshal(dAtA []byte) error { +func (m *RawHistogram) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -7452,17 +7629,17 @@ func (m *SpanMetricsGroup) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: SpanMetricsGroup: wiretype end group for non-group") + return fmt.Errorf("proto: RawHistogram: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: SpanMetricsGroup: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: RawHistogram: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Bucket", wireType) } - var stringLen uint64 + m.Bucket = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTempo @@ -7472,29 +7649,16 @@ func (m *SpanMetricsGroup) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + m.Bucket |= uint64(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTempo - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTempo - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Name = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex case 2: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field SpanCount", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Count", wireType) } - m.SpanCount = 0 + m.Count = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTempo @@ -7504,16 +7668,66 @@ func (m *SpanMetricsGroup) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.SpanCount |= uint64(b&0x7F) << shift + m.Count |= uint64(b&0x7F) << shift if b < 0x80 { break } } - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ErrorSpanCount", wireType) + default: + iNdEx = preIndex + skippy, err := skipTempo(dAtA[iNdEx:]) + if err != nil { + return err } - m.ErrorSpanCount = 0 + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTempo + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *SpanMetricsSummaryRequest) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTempo + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: SpanMetricsSummaryRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: SpanMetricsSummaryRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Query", wireType) + } + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTempo @@ -7523,16 +7737,29 @@ func (m *SpanMetricsGroup) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.ErrorSpanCount |= uint64(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - case 4: + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTempo + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTempo + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Query = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Latencies", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field GroupBy", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTempo @@ -7542,25 +7769,23 @@ func (m *SpanMetricsGroup) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthTempo } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthTempo } if postIndex > l { return io.ErrUnexpectedEOF } - m.Latencies = append(m.Latencies, &RawHistogram{}) - if err := m.Latencies[len(m.Latencies)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.GroupBy = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -7583,7 +7808,7 @@ func (m *SpanMetricsGroup) Unmarshal(dAtA []byte) error { } return nil } -func (m *RawHistogram) Unmarshal(dAtA []byte) error { +func (m *SpanMetricsSummaryResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -7606,17 +7831,17 @@ func (m *RawHistogram) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: RawHistogram: wiretype end group for non-group") + return fmt.Errorf("proto: SpanMetricsSummaryResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: RawHistogram: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: SpanMetricsSummaryResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { - case 1: + case 2: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Bucket", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field SpanCount", wireType) } - m.Bucket = 0 + m.SpanCount = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTempo @@ -7626,16 +7851,16 @@ func (m *RawHistogram) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Bucket |= uint64(b&0x7F) << shift + m.SpanCount |= int64(b&0x7F) << shift if b < 0x80 { break } } - case 2: + case 3: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Count", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ErrorSpanCount", wireType) } - m.Count = 0 + m.ErrorSpanCount = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTempo @@ -7645,7 +7870,83 @@ func (m *RawHistogram) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Count |= uint64(b&0x7F) << shift + m.ErrorSpanCount |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 4: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field P99", wireType) + } + m.P99 = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTempo + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.P99 |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 5: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field P95", wireType) + } + m.P95 = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTempo + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.P95 |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 6: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field P90", wireType) + } + m.P90 = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTempo + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.P90 |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 7: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field P50", wireType) + } + m.P50 = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTempo + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.P50 |= uint64(b&0x7F) << shift if b < 0x80 { break } diff --git a/pkg/tempopb/tempo.proto b/pkg/tempopb/tempo.proto index c0a0a914b38..d18da831d4f 100644 --- a/pkg/tempopb/tempo.proto +++ b/pkg/tempopb/tempo.proto @@ -25,6 +25,7 @@ service Querier { rpc SearchTagsV2(SearchTagsRequest) returns (SearchTagsV2Response) {}; rpc SearchTagValues(SearchTagValuesRequest) returns (SearchTagValuesResponse) {}; rpc SearchTagValuesV2(SearchTagValuesRequest) returns (SearchTagValuesV2Response) {}; + // rpc SpanMetricsSummary(SpanMetricsSummaryRequest) returns (SpanMetricsSummaryResponse) {}; } service StreamingQuerier { @@ -186,20 +187,31 @@ message LinkSlice { message SpanMetricsRequest { string query = 1; string groupBy = 2; + uint64 limit = 3; } message SpanMetricsResponse { - repeated SpanMetricsGroup stats = 1; -} - -message SpanMetricsGroup { - string name = 1; + bool estimated = 1; uint64 spanCount = 2; - uint64 errorSpanCount = 3; - repeated RawHistogram latencies = 4; + // uint64 errorSpanCount = 3; +// repeated RawHistogram latencies = 4; } message RawHistogram { uint64 bucket = 1; uint64 count = 2; } + +message SpanMetricsSummaryRequest { + string query = 1; + string groupBy = 2; +} + +message SpanMetricsSummaryResponse { + int64 spanCount = 2; + int64 errorSpanCount = 3; + uint64 p99 = 4; + uint64 p95 = 5; + uint64 p90 = 6; + uint64 p50 = 7; +} From 02ef5fc78991c4e1acc47fc2fe3098903a380004 Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Wed, 10 May 2023 16:06:16 +0000 Subject: [PATCH 11/31] Return on http error --- modules/generator/http.go | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/generator/http.go b/modules/generator/http.go index 83663901997..c044cd5b12b 100644 --- a/modules/generator/http.go +++ b/modules/generator/http.go @@ -30,6 +30,7 @@ func (g *Generator) SpanSummaryHandler(w http.ResponseWriter, r *http.Request) { resp, err = g.SpanMetrics(ctx, req) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) + return } marshaller := &jsonpb.Marshaler{} From 15878424b8a5b0b30e912db5344fe0b2e1e439e5 Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Wed, 10 May 2023 18:26:03 +0000 Subject: [PATCH 12/31] Update proto --- pkg/tempopb/tempo.pb.go | 987 +++++++++++++++++++++++++++++++++++----- pkg/tempopb/tempo.proto | 21 +- 2 files changed, 893 insertions(+), 115 deletions(-) diff --git a/pkg/tempopb/tempo.pb.go b/pkg/tempopb/tempo.pb.go index 0c107e76289..d0573346958 100644 --- a/pkg/tempopb/tempo.pb.go +++ b/pkg/tempopb/tempo.pb.go @@ -5,6 +5,7 @@ package tempopb import ( context "context" + encoding_binary "encoding/binary" fmt "fmt" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" @@ -1454,8 +1455,9 @@ func (m *SpanMetricsRequest) GetLimit() uint64 { } type SpanMetricsResponse struct { - Estimated bool `protobuf:"varint,1,opt,name=estimated,proto3" json:"estimated,omitempty"` - SpanCount uint64 `protobuf:"varint,2,opt,name=spanCount,proto3" json:"spanCount,omitempty"` + Estimated bool `protobuf:"varint,1,opt,name=estimated,proto3" json:"estimated,omitempty"` + SpanCount uint64 `protobuf:"varint,2,opt,name=spanCount,proto3" json:"spanCount,omitempty"` + Metrics []*SpanMetrics `protobuf:"bytes,3,rep,name=metrics,proto3" json:"metrics,omitempty"` } func (m *SpanMetricsResponse) Reset() { *m = SpanMetricsResponse{} } @@ -1505,6 +1507,13 @@ func (m *SpanMetricsResponse) GetSpanCount() uint64 { return 0 } +func (m *SpanMetricsResponse) GetMetrics() []*SpanMetrics { + if m != nil { + return m.Metrics + } + return nil +} + type RawHistogram struct { Bucket uint64 `protobuf:"varint,1,opt,name=bucket,proto3" json:"bucket,omitempty"` Count uint64 `protobuf:"varint,2,opt,name=count,proto3" json:"count,omitempty"` @@ -1557,6 +1566,66 @@ func (m *RawHistogram) GetCount() uint64 { return 0 } +type SpanMetrics struct { + LatencyHistogram []*RawHistogram `protobuf:"bytes,1,rep,name=latency_histogram,json=latencyHistogram,proto3" json:"latency_histogram,omitempty"` + Static *TraceQLStatic `protobuf:"bytes,2,opt,name=static,proto3" json:"static,omitempty"` + Errors uint64 `protobuf:"varint,3,opt,name=errors,proto3" json:"errors,omitempty"` +} + +func (m *SpanMetrics) Reset() { *m = SpanMetrics{} } +func (m *SpanMetrics) String() string { return proto.CompactTextString(m) } +func (*SpanMetrics) ProtoMessage() {} +func (*SpanMetrics) Descriptor() ([]byte, []int) { + return fileDescriptor_f22805646f4f62b6, []int{27} +} +func (m *SpanMetrics) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *SpanMetrics) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_SpanMetrics.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *SpanMetrics) XXX_Merge(src proto.Message) { + xxx_messageInfo_SpanMetrics.Merge(m, src) +} +func (m *SpanMetrics) XXX_Size() int { + return m.Size() +} +func (m *SpanMetrics) XXX_DiscardUnknown() { + xxx_messageInfo_SpanMetrics.DiscardUnknown(m) +} + +var xxx_messageInfo_SpanMetrics proto.InternalMessageInfo + +func (m *SpanMetrics) GetLatencyHistogram() []*RawHistogram { + if m != nil { + return m.LatencyHistogram + } + return nil +} + +func (m *SpanMetrics) GetStatic() *TraceQLStatic { + if m != nil { + return m.Static + } + return nil +} + +func (m *SpanMetrics) GetErrors() uint64 { + if m != nil { + return m.Errors + } + return 0 +} + type SpanMetricsSummaryRequest struct { Query string `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"` GroupBy string `protobuf:"bytes,2,opt,name=groupBy,proto3" json:"groupBy,omitempty"` @@ -1566,7 +1635,7 @@ func (m *SpanMetricsSummaryRequest) Reset() { *m = SpanMetricsSummaryReq func (m *SpanMetricsSummaryRequest) String() string { return proto.CompactTextString(m) } func (*SpanMetricsSummaryRequest) ProtoMessage() {} func (*SpanMetricsSummaryRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{27} + return fileDescriptor_f22805646f4f62b6, []int{28} } func (m *SpanMetricsSummaryRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1622,7 +1691,7 @@ func (m *SpanMetricsSummaryResponse) Reset() { *m = SpanMetricsSummaryRe func (m *SpanMetricsSummaryResponse) String() string { return proto.CompactTextString(m) } func (*SpanMetricsSummaryResponse) ProtoMessage() {} func (*SpanMetricsSummaryResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{28} + return fileDescriptor_f22805646f4f62b6, []int{29} } func (m *SpanMetricsSummaryResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1693,6 +1762,106 @@ func (m *SpanMetricsSummaryResponse) GetP50() uint64 { return 0 } +type TraceQLStatic struct { + Type int64 `protobuf:"varint,1,opt,name=type,proto3" json:"type,omitempty"` + N int64 `protobuf:"varint,2,opt,name=n,proto3" json:"n,omitempty"` + F float64 `protobuf:"fixed64,3,opt,name=f,proto3" json:"f,omitempty"` + S string `protobuf:"bytes,4,opt,name=s,proto3" json:"s,omitempty"` + B bool `protobuf:"varint,5,opt,name=b,proto3" json:"b,omitempty"` + D uint32 `protobuf:"varint,6,opt,name=d,proto3" json:"d,omitempty"` + Status int64 `protobuf:"varint,7,opt,name=status,proto3" json:"status,omitempty"` + Kind int64 `protobuf:"varint,8,opt,name=kind,proto3" json:"kind,omitempty"` +} + +func (m *TraceQLStatic) Reset() { *m = TraceQLStatic{} } +func (m *TraceQLStatic) String() string { return proto.CompactTextString(m) } +func (*TraceQLStatic) ProtoMessage() {} +func (*TraceQLStatic) Descriptor() ([]byte, []int) { + return fileDescriptor_f22805646f4f62b6, []int{30} +} +func (m *TraceQLStatic) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *TraceQLStatic) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_TraceQLStatic.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *TraceQLStatic) XXX_Merge(src proto.Message) { + xxx_messageInfo_TraceQLStatic.Merge(m, src) +} +func (m *TraceQLStatic) XXX_Size() int { + return m.Size() +} +func (m *TraceQLStatic) XXX_DiscardUnknown() { + xxx_messageInfo_TraceQLStatic.DiscardUnknown(m) +} + +var xxx_messageInfo_TraceQLStatic proto.InternalMessageInfo + +func (m *TraceQLStatic) GetType() int64 { + if m != nil { + return m.Type + } + return 0 +} + +func (m *TraceQLStatic) GetN() int64 { + if m != nil { + return m.N + } + return 0 +} + +func (m *TraceQLStatic) GetF() float64 { + if m != nil { + return m.F + } + return 0 +} + +func (m *TraceQLStatic) GetS() string { + if m != nil { + return m.S + } + return "" +} + +func (m *TraceQLStatic) GetB() bool { + if m != nil { + return m.B + } + return false +} + +func (m *TraceQLStatic) GetD() uint32 { + if m != nil { + return m.D + } + return 0 +} + +func (m *TraceQLStatic) GetStatus() int64 { + if m != nil { + return m.Status + } + return 0 +} + +func (m *TraceQLStatic) GetKind() int64 { + if m != nil { + return m.Kind + } + return 0 +} + func init() { proto.RegisterType((*TraceByIDRequest)(nil), "tempopb.TraceByIDRequest") proto.RegisterType((*TraceByIDResponse)(nil), "tempopb.TraceByIDResponse") @@ -1722,116 +1891,126 @@ func init() { proto.RegisterType((*SpanMetricsRequest)(nil), "tempopb.SpanMetricsRequest") proto.RegisterType((*SpanMetricsResponse)(nil), "tempopb.SpanMetricsResponse") proto.RegisterType((*RawHistogram)(nil), "tempopb.RawHistogram") + proto.RegisterType((*SpanMetrics)(nil), "tempopb.SpanMetrics") proto.RegisterType((*SpanMetricsSummaryRequest)(nil), "tempopb.SpanMetricsSummaryRequest") proto.RegisterType((*SpanMetricsSummaryResponse)(nil), "tempopb.SpanMetricsSummaryResponse") + proto.RegisterType((*TraceQLStatic)(nil), "tempopb.TraceQLStatic") } func init() { proto.RegisterFile("pkg/tempopb/tempo.proto", fileDescriptor_f22805646f4f62b6) } var fileDescriptor_f22805646f4f62b6 = []byte{ - // 1617 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0xcd, 0x6e, 0x1b, 0x47, - 0x12, 0xd6, 0x88, 0x14, 0x29, 0x16, 0x25, 0x59, 0x6a, 0xdb, 0x32, 0x4d, 0x79, 0x25, 0x61, 0x56, - 0xd8, 0xd5, 0x2e, 0xd6, 0x94, 0x44, 0x5b, 0xf0, 0xda, 0x5e, 0x6c, 0x10, 0x46, 0x8a, 0xe5, 0x1f, - 0x39, 0xf6, 0x50, 0xd1, 0xc1, 0xb7, 0xe1, 0xb0, 0x4d, 0x0f, 0x44, 0x4e, 0xd3, 0x33, 0x4d, 0x45, - 0xcc, 0x29, 0xa7, 0x9c, 0x72, 0xc8, 0x1b, 0x04, 0x01, 0x02, 0x04, 0xc8, 0x6b, 0xe4, 0xe2, 0xa3, - 0x8f, 0x41, 0x0e, 0x46, 0x60, 0x3f, 0x41, 0x8e, 0xb9, 0x05, 0x55, 0xdd, 0x3d, 0x3f, 0x14, 0xa5, - 0x20, 0xce, 0x89, 0x5d, 0x5f, 0x7f, 0x5d, 0x5d, 0x55, 0x5d, 0x55, 0xdd, 0x43, 0xb8, 0xd2, 0x3f, - 0xea, 0x6c, 0x48, 0xde, 0xeb, 0x8b, 0x7e, 0x4b, 0xfd, 0xd6, 0xfa, 0xa1, 0x90, 0x82, 0x15, 0x35, - 0x58, 0xbd, 0x24, 0x43, 0xd7, 0xe3, 0x1b, 0xc7, 0x5b, 0x1b, 0x34, 0x50, 0xd3, 0xd5, 0x45, 0x4f, - 0xf4, 0x7a, 0x22, 0x40, 0x58, 0x8d, 0x34, 0x7e, 0xbd, 0xe3, 0xcb, 0x17, 0x83, 0x56, 0xcd, 0x13, - 0xbd, 0x8d, 0x8e, 0xe8, 0x88, 0x0d, 0x82, 0x5b, 0x83, 0xe7, 0x24, 0x91, 0x40, 0x23, 0x45, 0xb7, - 0xbf, 0xb4, 0x60, 0xfe, 0x00, 0xd5, 0x36, 0x86, 0xf7, 0x77, 0x1c, 0xfe, 0x72, 0xc0, 0x23, 0xc9, - 0x2a, 0x50, 0xa4, 0xad, 0xee, 0xef, 0x54, 0xac, 0x55, 0x6b, 0x7d, 0xc6, 0x31, 0x22, 0x5b, 0x06, - 0x68, 0x75, 0x85, 0x77, 0xd4, 0x94, 0x6e, 0x28, 0x2b, 0x93, 0xab, 0xd6, 0x7a, 0xc9, 0x49, 0x21, - 0xac, 0x0a, 0xd3, 0x24, 0xed, 0x06, 0xed, 0x4a, 0x8e, 0x66, 0x63, 0x99, 0x5d, 0x83, 0xd2, 0xcb, - 0x01, 0x0f, 0x87, 0xfb, 0xa2, 0xcd, 0x2b, 0x53, 0x34, 0x99, 0x00, 0x76, 0x00, 0x0b, 0x29, 0x3b, - 0xa2, 0xbe, 0x08, 0x22, 0xce, 0xd6, 0x60, 0x8a, 0x76, 0x26, 0x33, 0xca, 0xf5, 0xb9, 0x9a, 0x8e, - 0x49, 0x8d, 0xa8, 0x8e, 0x9a, 0x64, 0x37, 0xa0, 0xd8, 0xe3, 0x32, 0xf4, 0xbd, 0x88, 0x2c, 0x2a, - 0xd7, 0xaf, 0x66, 0x79, 0xa8, 0x72, 0x5f, 0x11, 0x1c, 0xc3, 0xb4, 0x59, 0xca, 0x6f, 0x3d, 0x69, - 0x7f, 0x37, 0x09, 0xb3, 0x4d, 0xee, 0x86, 0xde, 0x0b, 0x13, 0x89, 0x3b, 0x90, 0x3f, 0x70, 0x3b, - 0x51, 0xc5, 0x5a, 0xcd, 0xad, 0x97, 0xeb, 0xab, 0xb1, 0xde, 0x0c, 0xab, 0x86, 0x94, 0xdd, 0x40, - 0x86, 0xc3, 0x46, 0xfe, 0xd5, 0x9b, 0x95, 0x09, 0x87, 0xd6, 0xb0, 0x35, 0x98, 0xdd, 0xf7, 0x83, - 0x9d, 0x41, 0xe8, 0x4a, 0x5f, 0x04, 0xfb, 0xca, 0xb8, 0x59, 0x27, 0x0b, 0x12, 0xcb, 0x3d, 0x49, - 0xb1, 0x72, 0x9a, 0x95, 0x06, 0xd9, 0x25, 0x98, 0x7a, 0xe4, 0xf7, 0x7c, 0x59, 0xc9, 0xd3, 0xac, - 0x12, 0x10, 0x8d, 0xe8, 0x20, 0xa6, 0x14, 0x4a, 0x02, 0x9b, 0x87, 0x1c, 0x0f, 0xda, 0x95, 0x02, - 0x61, 0x38, 0x44, 0xde, 0x53, 0x0c, 0x74, 0x65, 0x9a, 0xa2, 0xae, 0x84, 0xea, 0x2d, 0x28, 0xc5, - 0x86, 0xe3, 0xa2, 0x23, 0x3e, 0xa4, 0x38, 0x97, 0x1c, 0x1c, 0xe2, 0xa2, 0x63, 0xb7, 0x3b, 0xe0, - 0xfa, 0x94, 0x95, 0x70, 0x67, 0xf2, 0xbf, 0x96, 0xfd, 0x45, 0x0e, 0x98, 0x0a, 0x40, 0x03, 0xcf, - 0xd6, 0xc4, 0xea, 0x26, 0x94, 0x22, 0x13, 0x16, 0x7d, 0x60, 0x8b, 0xe3, 0x03, 0xe6, 0x24, 0x44, - 0xcc, 0x35, 0xca, 0x90, 0xfb, 0x3b, 0x7a, 0x23, 0x23, 0x62, 0xbe, 0x90, 0x43, 0x4f, 0xdc, 0x0e, - 0xd7, 0x51, 0x49, 0x00, 0x8c, 0x5b, 0xdf, 0xed, 0xf0, 0xe8, 0x40, 0x28, 0xd5, 0x3a, 0x32, 0x59, - 0x10, 0xf3, 0x91, 0x07, 0x9e, 0x68, 0xfb, 0x41, 0x47, 0xa7, 0x5c, 0x2c, 0xa3, 0x06, 0x3f, 0x68, - 0xf3, 0x13, 0x54, 0xd7, 0xf4, 0x3f, 0xe7, 0x3a, 0x62, 0x59, 0x90, 0xd9, 0x30, 0x23, 0x85, 0x74, - 0xbb, 0x0e, 0xf7, 0x44, 0xd8, 0x8e, 0x2a, 0x45, 0x22, 0x65, 0x30, 0xe4, 0xb4, 0x5d, 0xe9, 0xee, - 0x9a, 0x9d, 0x54, 0x98, 0x33, 0x18, 0xfa, 0x79, 0xcc, 0xc3, 0xc8, 0x17, 0x41, 0xa5, 0xa4, 0xfc, - 0xd4, 0x22, 0x63, 0x90, 0x8f, 0x70, 0x7b, 0x58, 0xb5, 0xd6, 0xf3, 0x0e, 0x8d, 0xb1, 0xce, 0x9e, - 0x0b, 0x21, 0x79, 0x48, 0x86, 0x95, 0x69, 0xcf, 0x14, 0x62, 0x9f, 0xc0, 0x9c, 0x89, 0xa8, 0x2e, - 0x95, 0x9b, 0x50, 0xa0, 0x6a, 0x30, 0xb9, 0x7a, 0x2d, 0x5b, 0x03, 0x8a, 0xbd, 0xcf, 0xa5, 0x8b, - 0x56, 0x39, 0x9a, 0xcb, 0x36, 0x47, 0x4b, 0x67, 0xf4, 0xc4, 0x4e, 0xd5, 0xcd, 0x6f, 0x16, 0x5c, - 0x1c, 0xa3, 0x71, 0xb4, 0x67, 0x94, 0x92, 0x9e, 0xb1, 0x0e, 0x17, 0x42, 0x21, 0x64, 0x93, 0x87, - 0xc7, 0xbe, 0xc7, 0x1f, 0xbb, 0x3d, 0x93, 0x52, 0xa3, 0x30, 0x9e, 0x08, 0x42, 0xa4, 0x9e, 0x78, - 0xaa, 0x85, 0x64, 0x41, 0xf6, 0x1f, 0x58, 0xa0, 0x34, 0x38, 0xf0, 0x7b, 0xfc, 0xd3, 0xc0, 0x3f, - 0x79, 0xec, 0x06, 0x82, 0x4e, 0x3f, 0xef, 0x9c, 0x9e, 0xc0, 0x48, 0xb6, 0x93, 0xe2, 0x52, 0x85, - 0x92, 0x42, 0xd8, 0xbf, 0xa1, 0x18, 0xf5, 0xdd, 0xa0, 0xc9, 0x25, 0x9d, 0x7f, 0xb9, 0x3e, 0x9f, - 0x44, 0x40, 0xe1, 0x8e, 0x21, 0xd8, 0x7b, 0x50, 0xd4, 0x18, 0xfb, 0x3b, 0x4c, 0x21, 0x6a, 0xa2, - 0x3d, 0x9b, 0x59, 0xe4, 0xa8, 0x39, 0x8c, 0x49, 0xcf, 0x95, 0xde, 0x0b, 0xde, 0xd6, 0xb5, 0x6f, - 0x44, 0xfb, 0x47, 0x0b, 0xf2, 0xc8, 0x64, 0x8b, 0x50, 0x40, 0x6e, 0x1c, 0x35, 0x2d, 0x61, 0x52, - 0x04, 0x49, 0xa4, 0x68, 0x3c, 0xde, 0xf1, 0xdc, 0x59, 0x8e, 0xaf, 0xc1, 0xac, 0x71, 0x13, 0xe5, - 0x48, 0x87, 0x28, 0x0b, 0xb2, 0xbb, 0x00, 0xae, 0x94, 0xa1, 0xdf, 0x1a, 0x48, 0x8e, 0xe1, 0x41, - 0x67, 0x96, 0x62, 0x67, 0xf4, 0xcd, 0x72, 0xbc, 0x55, 0x7b, 0xc8, 0x87, 0x87, 0xd8, 0x00, 0x9c, - 0x14, 0xdd, 0xfe, 0xd5, 0x32, 0xfd, 0x52, 0xa7, 0x09, 0x9e, 0xb5, 0x1f, 0x44, 0x7d, 0xee, 0x49, - 0xde, 0x3e, 0x30, 0xe9, 0x88, 0x9e, 0x8f, 0xc2, 0xec, 0x1f, 0x30, 0x17, 0x43, 0x8d, 0x21, 0x6e, - 0x3e, 0x49, 0xf6, 0x8d, 0xa0, 0x6c, 0x15, 0xca, 0x54, 0x6b, 0xd4, 0x6a, 0x4c, 0x77, 0x4c, 0x43, - 0xe8, 0xa8, 0x27, 0x7a, 0xfd, 0x2e, 0x97, 0xbc, 0xfd, 0x40, 0xb4, 0x22, 0xd3, 0x09, 0x32, 0x20, - 0x76, 0x13, 0x5a, 0x44, 0x0c, 0x95, 0x06, 0x09, 0x80, 0x76, 0x27, 0x2a, 0x95, 0x39, 0x05, 0x32, - 0x67, 0x14, 0xb6, 0xff, 0x05, 0x0b, 0xca, 0x65, 0xec, 0x9d, 0xa6, 0xf5, 0x61, 0x23, 0xf6, 0x44, - 0x9f, 0xeb, 0x43, 0x54, 0x82, 0xbd, 0x69, 0xda, 0xa4, 0xa2, 0xea, 0x42, 0xad, 0xc2, 0xb4, 0x74, - 0x3b, 0x98, 0xc9, 0x2a, 0x79, 0x4a, 0x4e, 0x2c, 0xdb, 0x0f, 0xe0, 0x52, 0xb2, 0xe2, 0xb0, 0x1e, - 0xaf, 0xa9, 0x43, 0x81, 0x54, 0x9a, 0x74, 0xab, 0x8e, 0x54, 0xa9, 0xa2, 0x37, 0x91, 0xe2, 0x68, - 0xa6, 0x7d, 0x37, 0x6d, 0xa8, 0x9e, 0x8c, 0xd3, 0xca, 0x4a, 0xa5, 0x15, 0x83, 0xbc, 0xc4, 0x3b, - 0x6e, 0x92, 0x8c, 0xa1, 0xb1, 0xbd, 0x07, 0x8b, 0xf1, 0x62, 0x3a, 0xf7, 0x28, 0xfd, 0x36, 0x50, - 0xe6, 0xc6, 0x75, 0xae, 0x44, 0x0c, 0x02, 0x5d, 0xe7, 0xe6, 0xc2, 0x20, 0xc1, 0xbe, 0x05, 0x57, - 0x4e, 0x69, 0xd2, 0x5e, 0xe1, 0x91, 0x18, 0x50, 0x87, 0x22, 0x01, 0xec, 0x9b, 0x30, 0x6d, 0x96, - 0x90, 0x89, 0xc3, 0x38, 0xbc, 0x34, 0x1e, 0x7f, 0x3f, 0xd9, 0x8f, 0xe0, 0xea, 0xc8, 0x76, 0xa9, - 0x30, 0x6e, 0x8c, 0x6e, 0x58, 0xae, 0x2f, 0x24, 0x6d, 0x52, 0xcf, 0xa4, 0x6d, 0x68, 0xc0, 0x14, - 0xa5, 0x2b, 0xbb, 0x0d, 0xc5, 0x16, 0x95, 0xae, 0x59, 0xb7, 0x12, 0xaf, 0x53, 0x8f, 0xb2, 0xe3, - 0xad, 0x9a, 0xc3, 0x23, 0x31, 0x08, 0x3d, 0x8e, 0x75, 0x1d, 0x39, 0x86, 0x6f, 0xcf, 0xc1, 0xcc, - 0x93, 0x41, 0x14, 0x37, 0x6a, 0xfb, 0x5b, 0x0b, 0xe6, 0x11, 0xa0, 0x74, 0x32, 0x51, 0xbd, 0x1e, - 0x77, 0x6f, 0x3c, 0x85, 0x99, 0xc6, 0x65, 0x7c, 0x47, 0xfc, 0xfc, 0x66, 0x65, 0xf6, 0x49, 0xc8, - 0xdd, 0x6e, 0x57, 0x78, 0x8a, 0x6d, 0xda, 0xf6, 0x3f, 0x21, 0xe7, 0xb7, 0xb1, 0x18, 0xce, 0xe1, - 0x22, 0x83, 0x6d, 0x03, 0xa8, 0xab, 0x76, 0xc7, 0x95, 0x6e, 0x25, 0x7f, 0x1e, 0x3f, 0x45, 0xb4, - 0xf7, 0x95, 0x89, 0xca, 0x13, 0x6d, 0xe2, 0x5f, 0x08, 0xc1, 0x1a, 0x80, 0x7e, 0x6b, 0x61, 0x45, - 0x2f, 0x66, 0x6e, 0xaa, 0x19, 0xe3, 0x94, 0xfd, 0x7f, 0x28, 0x3d, 0xf2, 0x83, 0xa3, 0x66, 0xd7, - 0xf7, 0x38, 0xdb, 0x82, 0xa9, 0xae, 0x1f, 0x1c, 0x99, 0xbd, 0x96, 0x4e, 0xef, 0x85, 0x7b, 0xd4, - 0x70, 0x81, 0xa3, 0x98, 0xf6, 0x33, 0x60, 0x88, 0x99, 0x1b, 0x2b, 0x29, 0x4d, 0x95, 0x95, 0x56, - 0x2a, 0x2b, 0x31, 0x8b, 0x3b, 0xa1, 0x18, 0xf4, 0x1b, 0x26, 0x5b, 0x8d, 0x88, 0xfc, 0x2e, 0xbd, - 0xb4, 0x54, 0x63, 0x55, 0x82, 0xfd, 0x14, 0x2e, 0x66, 0x74, 0x27, 0x19, 0xcc, 0x23, 0xe9, 0xf7, - 0x5c, 0xc9, 0xdb, 0xb4, 0xc1, 0xb4, 0x93, 0x00, 0xf4, 0x80, 0xe9, 0xbb, 0xc1, 0x47, 0x62, 0x10, - 0x48, 0xdd, 0xdd, 0x12, 0xc0, 0xfe, 0x1f, 0xcc, 0x38, 0xee, 0x67, 0x7b, 0x7e, 0x24, 0x45, 0x27, - 0x74, 0x7b, 0x18, 0x96, 0xd6, 0xc0, 0x3b, 0xe2, 0x92, 0x14, 0xe5, 0x1d, 0x2d, 0xa1, 0x41, 0x5e, - 0x4a, 0x83, 0x12, 0xec, 0x87, 0x70, 0x35, 0x65, 0x50, 0x73, 0xd0, 0xeb, 0xb9, 0xe1, 0xf0, 0x3d, - 0x7d, 0xb6, 0x7f, 0xb0, 0xa0, 0x3a, 0x4e, 0x5b, 0xe2, 0x65, 0xd6, 0x8f, 0x5c, 0xca, 0x0f, 0x6c, - 0xe4, 0x3c, 0x0c, 0x45, 0xd8, 0x8c, 0x29, 0x39, 0xa2, 0x8c, 0xa0, 0xf8, 0xc2, 0xec, 0xdf, 0xbe, - 0xad, 0x6f, 0x21, 0x1c, 0x2a, 0x64, 0x9b, 0x9a, 0x31, 0x21, 0xdb, 0x0a, 0xd9, 0xd4, 0xad, 0x17, - 0x87, 0x84, 0x6c, 0x6f, 0xd2, 0xab, 0x0b, 0x91, 0xed, 0xcd, 0xfa, 0x57, 0x16, 0x14, 0x30, 0x39, - 0x79, 0xc8, 0x3e, 0x80, 0x52, 0x5c, 0x49, 0x2c, 0x79, 0xf4, 0x8f, 0x56, 0x57, 0xf5, 0x72, 0x66, - 0x2a, 0xae, 0xc4, 0x09, 0xf6, 0x21, 0x94, 0x63, 0xf2, 0x61, 0xfd, 0x7d, 0x54, 0xd4, 0xbf, 0xb1, - 0x60, 0x5e, 0xc7, 0xed, 0x1e, 0x0f, 0x78, 0xe8, 0x4a, 0x11, 0x1b, 0x46, 0x65, 0x30, 0xa2, 0x35, - 0x5d, 0x53, 0x67, 0x1b, 0xf6, 0x00, 0xca, 0xa9, 0x03, 0x61, 0x4b, 0x99, 0xe7, 0x45, 0x36, 0xc3, - 0xab, 0xd7, 0xc6, 0x4f, 0xc6, 0x16, 0x7e, 0x9f, 0x87, 0x22, 0xbe, 0xf8, 0x7d, 0x1e, 0xb2, 0x3d, - 0x98, 0xfd, 0xd8, 0x0f, 0xda, 0xf1, 0x97, 0x0f, 0x1b, 0xf3, 0xa9, 0x64, 0xf4, 0x56, 0xc7, 0x4d, - 0xa5, 0x42, 0x37, 0x63, 0x5e, 0xa0, 0x1e, 0x0f, 0x24, 0x3b, 0xe3, 0xa9, 0x5f, 0xbd, 0x72, 0x0a, - 0x8f, 0x55, 0xec, 0x42, 0x39, 0xf5, 0x19, 0x91, 0x76, 0xf2, 0xd4, 0xc7, 0xc5, 0x79, 0x6a, 0xee, - 0x01, 0x24, 0x17, 0x1d, 0x1b, 0x77, 0x35, 0x1a, 0x25, 0x4b, 0x63, 0xe7, 0x62, 0x45, 0x0f, 0x8d, - 0x4b, 0xea, 0xc6, 0x3c, 0x57, 0xd5, 0xdf, 0xc6, 0xde, 0xc0, 0x29, 0x65, 0x87, 0x70, 0x61, 0xe4, - 0x22, 0x62, 0x2b, 0xa7, 0xd7, 0x64, 0xee, 0xd6, 0xea, 0xea, 0xd9, 0x84, 0x58, 0xef, 0xb3, 0xd4, - 0xb5, 0x6e, 0x2e, 0xb8, 0x3f, 0xd6, 0x6c, 0x9f, 0x45, 0x48, 0xdb, 0x5c, 0xff, 0x04, 0xe6, 0x9b, - 0x32, 0xe4, 0x6e, 0xcf, 0x0f, 0x3a, 0x26, 0x63, 0xee, 0x42, 0x41, 0x7f, 0x4b, 0xfd, 0xd9, 0x13, - 0xde, 0xb4, 0x1a, 0x95, 0x57, 0x6f, 0x97, 0xad, 0xd7, 0x6f, 0x97, 0xad, 0x5f, 0xde, 0x2e, 0x5b, - 0x5f, 0xbf, 0x5b, 0x9e, 0x78, 0xfd, 0x6e, 0x79, 0xe2, 0xa7, 0x77, 0xcb, 0x13, 0xad, 0x02, 0xfd, - 0xfd, 0x70, 0xe3, 0xf7, 0x00, 0x00, 0x00, 0xff, 0xff, 0x05, 0x02, 0x8f, 0x6c, 0xff, 0x10, 0x00, - 0x00, + // 1758 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0x4f, 0x6f, 0x23, 0x49, + 0x15, 0x4f, 0xc7, 0x8e, 0x1d, 0x3f, 0xdb, 0xd9, 0xa4, 0x76, 0x26, 0xe3, 0xf1, 0x0c, 0x99, 0xa8, + 0x19, 0x2d, 0x01, 0xb1, 0x4e, 0xc6, 0x3b, 0xd1, 0x32, 0x3b, 0x08, 0x84, 0xc9, 0xb0, 0xf3, 0x2f, + 0xcb, 0x6c, 0x3b, 0xcc, 0x61, 0x2f, 0xa8, 0xdc, 0x5d, 0x71, 0x5a, 0xb1, 0xbb, 0xbc, 0xdd, 0xe5, + 0x10, 0x73, 0x82, 0x0b, 0x27, 0x0e, 0x5c, 0x38, 0x70, 0x42, 0x48, 0x48, 0x48, 0x7c, 0x0d, 0x2e, + 0x7b, 0xdc, 0x23, 0xe2, 0xb0, 0x42, 0x33, 0x9f, 0x80, 0x23, 0x37, 0xf4, 0x5e, 0x55, 0xf5, 0x1f, + 0xdb, 0x09, 0x62, 0x39, 0xb9, 0xde, 0xaf, 0x7e, 0xf5, 0xea, 0xd5, 0xab, 0xf7, 0x5e, 0xbd, 0x36, + 0xdc, 0x9a, 0x9c, 0x0f, 0xf7, 0x95, 0x18, 0x4f, 0xe4, 0x64, 0xa0, 0x7f, 0x3b, 0x93, 0x58, 0x2a, + 0xc9, 0xaa, 0x06, 0x6c, 0xdf, 0x50, 0x31, 0xf7, 0xc5, 0xfe, 0xc5, 0x83, 0x7d, 0x1a, 0xe8, 0xe9, + 0xf6, 0xb6, 0x2f, 0xc7, 0x63, 0x19, 0x21, 0xac, 0x47, 0x06, 0x7f, 0x7f, 0x18, 0xaa, 0xb3, 0xe9, + 0xa0, 0xe3, 0xcb, 0xf1, 0xfe, 0x50, 0x0e, 0xe5, 0x3e, 0xc1, 0x83, 0xe9, 0x29, 0x49, 0x24, 0xd0, + 0x48, 0xd3, 0xdd, 0xdf, 0x38, 0xb0, 0x79, 0x82, 0x6a, 0x7b, 0xb3, 0x67, 0x47, 0x9e, 0xf8, 0x7c, + 0x2a, 0x12, 0xc5, 0x5a, 0x50, 0xa5, 0xad, 0x9e, 0x1d, 0xb5, 0x9c, 0x5d, 0x67, 0xaf, 0xe1, 0x59, + 0x91, 0xed, 0x00, 0x0c, 0x46, 0xd2, 0x3f, 0xef, 0x2b, 0x1e, 0xab, 0xd6, 0xea, 0xae, 0xb3, 0x57, + 0xf3, 0x72, 0x08, 0x6b, 0xc3, 0x3a, 0x49, 0x4f, 0xa2, 0xa0, 0x55, 0xa2, 0xd9, 0x54, 0x66, 0x77, + 0xa1, 0xf6, 0xf9, 0x54, 0xc4, 0xb3, 0x63, 0x19, 0x88, 0xd6, 0x1a, 0x4d, 0x66, 0x80, 0x1b, 0xc1, + 0x56, 0xce, 0x8e, 0x64, 0x22, 0xa3, 0x44, 0xb0, 0xfb, 0xb0, 0x46, 0x3b, 0x93, 0x19, 0xf5, 0xee, + 0x46, 0xc7, 0xf8, 0xa4, 0x43, 0x54, 0x4f, 0x4f, 0xb2, 0x0f, 0xa0, 0x3a, 0x16, 0x2a, 0x0e, 0xfd, + 0x84, 0x2c, 0xaa, 0x77, 0x6f, 0x17, 0x79, 0xa8, 0xf2, 0x58, 0x13, 0x3c, 0xcb, 0x74, 0x59, 0xee, + 0xdc, 0x66, 0xd2, 0xfd, 0xf3, 0x2a, 0x34, 0xfb, 0x82, 0xc7, 0xfe, 0x99, 0xf5, 0xc4, 0x47, 0x50, + 0x3e, 0xe1, 0xc3, 0xa4, 0xe5, 0xec, 0x96, 0xf6, 0xea, 0xdd, 0xdd, 0x54, 0x6f, 0x81, 0xd5, 0x41, + 0xca, 0x93, 0x48, 0xc5, 0xb3, 0x5e, 0xf9, 0x8b, 0xaf, 0xee, 0xad, 0x78, 0xb4, 0x86, 0xdd, 0x87, + 0xe6, 0x71, 0x18, 0x1d, 0x4d, 0x63, 0xae, 0x42, 0x19, 0x1d, 0x6b, 0xe3, 0x9a, 0x5e, 0x11, 0x24, + 0x16, 0xbf, 0xcc, 0xb1, 0x4a, 0x86, 0x95, 0x07, 0xd9, 0x0d, 0x58, 0x7b, 0x19, 0x8e, 0x43, 0xd5, + 0x2a, 0xd3, 0xac, 0x16, 0x10, 0x4d, 0xe8, 0x22, 0xd6, 0x34, 0x4a, 0x02, 0xdb, 0x84, 0x92, 0x88, + 0x82, 0x56, 0x85, 0x30, 0x1c, 0x22, 0xef, 0x53, 0x74, 0x74, 0x6b, 0x9d, 0xbc, 0xae, 0x85, 0xf6, + 0x87, 0x50, 0x4b, 0x0d, 0xc7, 0x45, 0xe7, 0x62, 0x46, 0x7e, 0xae, 0x79, 0x38, 0xc4, 0x45, 0x17, + 0x7c, 0x34, 0x15, 0xe6, 0x96, 0xb5, 0xf0, 0xd1, 0xea, 0xf7, 0x1c, 0xf7, 0x57, 0x25, 0x60, 0xda, + 0x01, 0x3d, 0xbc, 0x5b, 0xeb, 0xab, 0x87, 0x50, 0x4b, 0xac, 0x5b, 0xcc, 0x85, 0x6d, 0x2f, 0x77, + 0x98, 0x97, 0x11, 0x31, 0xd6, 0x28, 0x42, 0x9e, 0x1d, 0x99, 0x8d, 0xac, 0x88, 0xf1, 0x42, 0x07, + 0x7a, 0xc5, 0x87, 0xc2, 0x78, 0x25, 0x03, 0xd0, 0x6f, 0x13, 0x3e, 0x14, 0xc9, 0x89, 0xd4, 0xaa, + 0x8d, 0x67, 0x8a, 0x20, 0xc6, 0xa3, 0x88, 0x7c, 0x19, 0x84, 0xd1, 0xd0, 0x84, 0x5c, 0x2a, 0xa3, + 0x86, 0x30, 0x0a, 0xc4, 0x25, 0xaa, 0xeb, 0x87, 0xbf, 0x14, 0xc6, 0x63, 0x45, 0x90, 0xb9, 0xd0, + 0x50, 0x52, 0xf1, 0x91, 0x27, 0x7c, 0x19, 0x07, 0x49, 0xab, 0x4a, 0xa4, 0x02, 0x86, 0x9c, 0x80, + 0x2b, 0xfe, 0xc4, 0xee, 0xa4, 0xdd, 0x5c, 0xc0, 0xf0, 0x9c, 0x17, 0x22, 0x4e, 0x42, 0x19, 0xb5, + 0x6a, 0xfa, 0x9c, 0x46, 0x64, 0x0c, 0xca, 0x09, 0x6e, 0x0f, 0xbb, 0xce, 0x5e, 0xd9, 0xa3, 0x31, + 0xe6, 0xd9, 0xa9, 0x94, 0x4a, 0xc4, 0x64, 0x58, 0x9d, 0xf6, 0xcc, 0x21, 0xee, 0x25, 0x6c, 0x58, + 0x8f, 0x9a, 0x54, 0x79, 0x08, 0x15, 0xca, 0x06, 0x1b, 0xab, 0x77, 0x8b, 0x39, 0xa0, 0xd9, 0xc7, + 0x42, 0x71, 0xb4, 0xca, 0x33, 0x5c, 0x76, 0x30, 0x9f, 0x3a, 0xf3, 0x37, 0xb6, 0x90, 0x37, 0xff, + 0x76, 0xe0, 0xdd, 0x25, 0x1a, 0xe7, 0x6b, 0x46, 0x2d, 0xab, 0x19, 0x7b, 0xf0, 0x4e, 0x2c, 0xa5, + 0xea, 0x8b, 0xf8, 0x22, 0xf4, 0xc5, 0x27, 0x7c, 0x6c, 0x43, 0x6a, 0x1e, 0xc6, 0x1b, 0x41, 0x88, + 0xd4, 0x13, 0x4f, 0x97, 0x90, 0x22, 0xc8, 0xbe, 0x0b, 0x5b, 0x14, 0x06, 0x27, 0xe1, 0x58, 0xfc, + 0x2c, 0x0a, 0x2f, 0x3f, 0xe1, 0x91, 0xa4, 0xdb, 0x2f, 0x7b, 0x8b, 0x13, 0xe8, 0xc9, 0x20, 0x4b, + 0x2e, 0x9d, 0x28, 0x39, 0x84, 0x7d, 0x07, 0xaa, 0xc9, 0x84, 0x47, 0x7d, 0xa1, 0xe8, 0xfe, 0xeb, + 0xdd, 0xcd, 0xcc, 0x03, 0x1a, 0xf7, 0x2c, 0xc1, 0x7d, 0x0a, 0x55, 0x83, 0xb1, 0x6f, 0xc2, 0x1a, + 0xa2, 0xd6, 0xdb, 0xcd, 0xc2, 0x22, 0x4f, 0xcf, 0xa1, 0x4f, 0xc6, 0x5c, 0xf9, 0x67, 0x22, 0x30, + 0xb9, 0x6f, 0x45, 0xf7, 0x6f, 0x0e, 0x94, 0x91, 0xc9, 0xb6, 0xa1, 0x82, 0xdc, 0xd4, 0x6b, 0x46, + 0xc2, 0xa0, 0x88, 0x32, 0x4f, 0xd1, 0x78, 0xf9, 0xc1, 0x4b, 0x57, 0x1d, 0xfc, 0x3e, 0x34, 0xed, + 0x31, 0x51, 0x4e, 0x8c, 0x8b, 0x8a, 0x20, 0x7b, 0x0c, 0xc0, 0x95, 0x8a, 0xc3, 0xc1, 0x54, 0x09, + 0x74, 0x0f, 0x1e, 0xe6, 0x4e, 0x7a, 0x18, 0xf3, 0xb2, 0x5c, 0x3c, 0xe8, 0xbc, 0x10, 0xb3, 0xd7, + 0x58, 0x00, 0xbc, 0x1c, 0xdd, 0xfd, 0x97, 0x63, 0xeb, 0xa5, 0x09, 0x13, 0xbc, 0xeb, 0x30, 0x4a, + 0x26, 0xc2, 0x57, 0x22, 0x38, 0xb1, 0xe1, 0x88, 0x27, 0x9f, 0x87, 0xd9, 0x7b, 0xb0, 0x91, 0x42, + 0xbd, 0x19, 0x6e, 0xbe, 0x4a, 0xf6, 0xcd, 0xa1, 0x6c, 0x17, 0xea, 0x94, 0x6b, 0x54, 0x6a, 0x6c, + 0x75, 0xcc, 0x43, 0x78, 0x50, 0x5f, 0x8e, 0x27, 0x23, 0xa1, 0x44, 0xf0, 0x5c, 0x0e, 0x12, 0x5b, + 0x09, 0x0a, 0x20, 0x56, 0x13, 0x5a, 0x44, 0x0c, 0x1d, 0x06, 0x19, 0x80, 0x76, 0x67, 0x2a, 0xb5, + 0x39, 0x15, 0x32, 0x67, 0x1e, 0x76, 0xbf, 0x0d, 0x5b, 0xfa, 0xc8, 0x58, 0x3b, 0x6d, 0xe9, 0xc3, + 0x42, 0xec, 0xcb, 0x89, 0x30, 0x97, 0xa8, 0x05, 0xf7, 0xc0, 0x96, 0x49, 0x4d, 0x35, 0x89, 0xda, + 0x86, 0x75, 0xc5, 0x87, 0x18, 0xc9, 0x3a, 0x78, 0x6a, 0x5e, 0x2a, 0xbb, 0xcf, 0xe1, 0x46, 0xb6, + 0xe2, 0x75, 0x37, 0x5d, 0xd3, 0x85, 0x0a, 0xa9, 0xb4, 0xe1, 0xd6, 0x9e, 0xcb, 0x52, 0x4d, 0xef, + 0x23, 0xc5, 0x33, 0x4c, 0xf7, 0x71, 0xde, 0x50, 0x33, 0x99, 0x86, 0x95, 0x93, 0x0b, 0x2b, 0x06, + 0x65, 0x85, 0x6f, 0xdc, 0x2a, 0x19, 0x43, 0x63, 0xf7, 0x29, 0x6c, 0xa7, 0x8b, 0xe9, 0xde, 0x93, + 0x7c, 0x6f, 0xa0, 0xcd, 0x4d, 0xf3, 0x5c, 0x8b, 0xe8, 0x04, 0x7a, 0xce, 0xed, 0x83, 0x41, 0x82, + 0xfb, 0x21, 0xdc, 0x5a, 0xd0, 0x64, 0x4e, 0x85, 0x57, 0x62, 0x41, 0xe3, 0x8a, 0x0c, 0x70, 0x1f, + 0xc2, 0xba, 0x5d, 0x42, 0x26, 0xce, 0x52, 0xf7, 0xd2, 0x78, 0xf9, 0xfb, 0xe4, 0xbe, 0x84, 0xdb, + 0x73, 0xdb, 0xe5, 0xdc, 0xb8, 0x3f, 0xbf, 0x61, 0xbd, 0xbb, 0x95, 0x95, 0x49, 0x33, 0x93, 0xb7, + 0xa1, 0x07, 0x6b, 0x14, 0xae, 0xec, 0x11, 0x54, 0x07, 0x94, 0xba, 0x76, 0xdd, 0xbd, 0x74, 0x9d, + 0x6e, 0xca, 0x2e, 0x1e, 0x74, 0x3c, 0x91, 0xc8, 0x69, 0xec, 0x0b, 0xcc, 0xeb, 0xc4, 0xb3, 0x7c, + 0x77, 0x03, 0x1a, 0xaf, 0xa6, 0x49, 0x5a, 0xa8, 0xdd, 0x3f, 0x39, 0xb0, 0x89, 0x00, 0x85, 0x93, + 0xf5, 0xea, 0xfb, 0x69, 0xf5, 0xc6, 0x5b, 0x68, 0xf4, 0x6e, 0x62, 0x1f, 0xf1, 0x8f, 0xaf, 0xee, + 0x35, 0x5f, 0xc5, 0x82, 0x8f, 0x46, 0xd2, 0xd7, 0x6c, 0x5b, 0xb6, 0xbf, 0x05, 0xa5, 0x30, 0xc0, + 0x64, 0xb8, 0x86, 0x8b, 0x0c, 0x76, 0x08, 0xa0, 0x9f, 0xda, 0x23, 0xae, 0x78, 0xab, 0x7c, 0x1d, + 0x3f, 0x47, 0x74, 0x8f, 0xb5, 0x89, 0xfa, 0x24, 0xc6, 0xc4, 0xff, 0xc3, 0x05, 0xf7, 0x01, 0x4c, + 0xaf, 0x85, 0x19, 0xbd, 0x5d, 0x78, 0xa9, 0x1a, 0xf6, 0x50, 0xee, 0x0f, 0xa0, 0xf6, 0x32, 0x8c, + 0xce, 0xfb, 0xa3, 0xd0, 0x17, 0xec, 0x01, 0xac, 0x8d, 0xc2, 0xe8, 0xdc, 0xee, 0x75, 0x67, 0x71, + 0x2f, 0xdc, 0xa3, 0x83, 0x0b, 0x3c, 0xcd, 0x74, 0x3f, 0x03, 0x86, 0x98, 0x7d, 0xb1, 0xb2, 0xd4, + 0xd4, 0x51, 0xe9, 0xe4, 0xa2, 0x12, 0xa3, 0x78, 0x18, 0xcb, 0xe9, 0xa4, 0x67, 0xa3, 0xd5, 0x8a, + 0xc8, 0x1f, 0x51, 0xa7, 0xa5, 0x0b, 0xab, 0x16, 0xdc, 0x5f, 0x3b, 0xf0, 0x6e, 0x41, 0x79, 0x16, + 0xc2, 0x22, 0x51, 0xe1, 0x98, 0x2b, 0x11, 0xd0, 0x0e, 0xeb, 0x5e, 0x06, 0x50, 0x07, 0x33, 0xe1, + 0xd1, 0x8f, 0xe5, 0x34, 0x52, 0xa6, 0xbc, 0x65, 0x00, 0xeb, 0x64, 0x6f, 0x6f, 0x89, 0x0e, 0x79, + 0xa3, 0xf0, 0x88, 0x2c, 0xbc, 0xbc, 0xdf, 0x87, 0x86, 0xc7, 0x7f, 0xf1, 0x34, 0x4c, 0x94, 0x1c, + 0xc6, 0x7c, 0x8c, 0x7e, 0x1c, 0x4c, 0xfd, 0x73, 0xa1, 0x68, 0xe3, 0xb2, 0x67, 0x24, 0x3c, 0x81, + 0x9f, 0xdb, 0x51, 0x0b, 0xee, 0x1f, 0x1c, 0xa8, 0xe7, 0xd4, 0xb2, 0x1e, 0x6c, 0x8d, 0xb8, 0x12, + 0x91, 0x3f, 0xfb, 0xf9, 0x99, 0x55, 0x69, 0x9c, 0x7d, 0x33, 0xb5, 0x23, 0xbf, 0x9f, 0xb7, 0x69, + 0xf8, 0x99, 0x05, 0x1d, 0xa8, 0x24, 0x8a, 0xab, 0xd0, 0x5f, 0x68, 0x1e, 0xe8, 0xba, 0x3f, 0x7d, + 0xd9, 0xa7, 0x59, 0xcf, 0xb0, 0xd0, 0x62, 0x11, 0xc7, 0x32, 0x4e, 0x8c, 0x73, 0x8d, 0xe4, 0xbe, + 0x80, 0xdb, 0x39, 0xd3, 0xfa, 0xd3, 0xf1, 0x98, 0xc7, 0xb3, 0xaf, 0x79, 0x81, 0xee, 0x5f, 0x1d, + 0x68, 0x2f, 0xd3, 0x96, 0xdd, 0x58, 0xf1, 0x4e, 0x4a, 0xf9, 0x3b, 0x79, 0x0f, 0x36, 0xc8, 0xa6, + 0x7e, 0x4a, 0x29, 0x11, 0x65, 0x0e, 0xc5, 0x76, 0x79, 0xf2, 0xe8, 0x91, 0x79, 0x52, 0x71, 0xa8, + 0x91, 0x43, 0x7a, 0x59, 0x08, 0x39, 0xd4, 0xc8, 0x81, 0x79, 0x47, 0x70, 0x48, 0xc8, 0xe1, 0x01, + 0xb5, 0x90, 0x88, 0x1c, 0x1e, 0xb8, 0xbf, 0x77, 0xa0, 0x59, 0xf0, 0x55, 0xa1, 0xd4, 0x95, 0x4c, + 0xa9, 0x6b, 0x80, 0x13, 0x19, 0x5b, 0x9d, 0x08, 0xa5, 0x53, 0x32, 0xcb, 0xf1, 0x9c, 0x53, 0x94, + 0xf4, 0x8b, 0x57, 0xf3, 0x9c, 0x04, 0xa5, 0x01, 0xd9, 0xb0, 0xee, 0x39, 0x03, 0x94, 0xec, 0x77, + 0x80, 0x13, 0x50, 0xab, 0xa1, 0xb8, 0x9a, 0xea, 0x1e, 0xb6, 0xe4, 0x19, 0x09, 0x77, 0x3c, 0x0f, + 0xa3, 0x80, 0xba, 0xd6, 0x92, 0x47, 0xe3, 0xee, 0x6f, 0x1d, 0xa8, 0x60, 0x05, 0x10, 0x31, 0xfb, + 0x21, 0xd4, 0xd2, 0x72, 0xc5, 0xb2, 0x2f, 0xab, 0xf9, 0x12, 0xd6, 0xbe, 0x59, 0x98, 0x4a, 0xcb, + 0xdd, 0x0a, 0xfb, 0x11, 0xd4, 0x53, 0xf2, 0xeb, 0xee, 0xd7, 0x51, 0xd1, 0xfd, 0xa3, 0x03, 0x9b, + 0xe6, 0x3e, 0x3f, 0x16, 0x91, 0x88, 0xb9, 0x92, 0xa9, 0x61, 0x54, 0x6b, 0xe6, 0xb4, 0xe6, 0x0b, + 0xd7, 0xd5, 0x86, 0x3d, 0x2f, 0x66, 0xc4, 0x9d, 0xa5, 0xe9, 0x67, 0x94, 0xdc, 0x5d, 0x3e, 0x99, + 0x5a, 0xf8, 0x97, 0x32, 0x54, 0xf1, 0xb3, 0x2a, 0x14, 0x31, 0x7b, 0x0a, 0xcd, 0x9f, 0x84, 0x51, + 0x90, 0x7e, 0x5e, 0xb2, 0x25, 0xdf, 0xa3, 0x56, 0x6f, 0x7b, 0xd9, 0x54, 0xce, 0x75, 0x0d, 0xdb, + 0xe6, 0xfb, 0x22, 0x52, 0xec, 0x8a, 0xef, 0xa9, 0xf6, 0xad, 0x05, 0x3c, 0x55, 0xf1, 0x04, 0xea, + 0xb9, 0x6f, 0xb5, 0xfc, 0x21, 0x17, 0xbe, 0xe0, 0xae, 0x53, 0xf3, 0x31, 0x40, 0xd6, 0x4d, 0xb0, + 0x65, 0xfd, 0x87, 0x55, 0x72, 0x67, 0xe9, 0x5c, 0xaa, 0xe8, 0x85, 0x3d, 0x92, 0x6e, 0x4b, 0xae, + 0x55, 0xf5, 0x8d, 0xa5, 0x6d, 0x4e, 0x4e, 0xd9, 0x6b, 0x78, 0x67, 0xee, 0xb5, 0x67, 0xf7, 0x16, + 0xd7, 0x14, 0x1a, 0x98, 0xf6, 0xee, 0xd5, 0x84, 0x54, 0xef, 0x67, 0xb9, 0xde, 0xc9, 0x76, 0x11, + 0xff, 0x5d, 0xb3, 0x7b, 0x15, 0x21, 0x6f, 0x73, 0xf7, 0xa7, 0xb0, 0xd9, 0x57, 0xb1, 0xe0, 0xe3, + 0x30, 0x1a, 0xda, 0x88, 0x79, 0x0c, 0x15, 0xf3, 0xc1, 0xfa, 0xbf, 0xde, 0xf0, 0x81, 0xd3, 0x6b, + 0x7d, 0xf1, 0x66, 0xc7, 0xf9, 0xf2, 0xcd, 0x8e, 0xf3, 0xcf, 0x37, 0x3b, 0xce, 0xef, 0xde, 0xee, + 0xac, 0x7c, 0xf9, 0x76, 0x67, 0xe5, 0xef, 0x6f, 0x77, 0x56, 0x06, 0x15, 0xfa, 0x8f, 0xe7, 0x83, + 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x62, 0x17, 0x9a, 0xf7, 0x64, 0x12, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3580,6 +3759,20 @@ func (m *SpanMetricsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.Metrics) > 0 { + for iNdEx := len(m.Metrics) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Metrics[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTempo(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + } + } if m.SpanCount != 0 { i = encodeVarintTempo(dAtA, i, uint64(m.SpanCount)) i-- @@ -3631,6 +3824,60 @@ func (m *RawHistogram) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *SpanMetrics) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *SpanMetrics) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SpanMetrics) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Errors != 0 { + i = encodeVarintTempo(dAtA, i, uint64(m.Errors)) + i-- + dAtA[i] = 0x18 + } + if m.Static != nil { + { + size, err := m.Static.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTempo(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + if len(m.LatencyHistogram) > 0 { + for iNdEx := len(m.LatencyHistogram) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.LatencyHistogram[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTempo(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + } + return len(dAtA) - i, nil +} + func (m *SpanMetricsSummaryRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -3721,6 +3968,77 @@ func (m *SpanMetricsSummaryResponse) MarshalToSizedBuffer(dAtA []byte) (int, err return len(dAtA) - i, nil } +func (m *TraceQLStatic) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *TraceQLStatic) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *TraceQLStatic) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Kind != 0 { + i = encodeVarintTempo(dAtA, i, uint64(m.Kind)) + i-- + dAtA[i] = 0x40 + } + if m.Status != 0 { + i = encodeVarintTempo(dAtA, i, uint64(m.Status)) + i-- + dAtA[i] = 0x38 + } + if m.D != 0 { + i = encodeVarintTempo(dAtA, i, uint64(m.D)) + i-- + dAtA[i] = 0x30 + } + if m.B { + i-- + if m.B { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x28 + } + if len(m.S) > 0 { + i -= len(m.S) + copy(dAtA[i:], m.S) + i = encodeVarintTempo(dAtA, i, uint64(len(m.S))) + i-- + dAtA[i] = 0x22 + } + if m.F != 0 { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.F)))) + i-- + dAtA[i] = 0x19 + } + if m.N != 0 { + i = encodeVarintTempo(dAtA, i, uint64(m.N)) + i-- + dAtA[i] = 0x10 + } + if m.Type != 0 { + i = encodeVarintTempo(dAtA, i, uint64(m.Type)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + func encodeVarintTempo(dAtA []byte, offset int, v uint64) int { offset -= sovTempo(v) base := offset @@ -4244,6 +4562,12 @@ func (m *SpanMetricsResponse) Size() (n int) { if m.SpanCount != 0 { n += 1 + sovTempo(uint64(m.SpanCount)) } + if len(m.Metrics) > 0 { + for _, e := range m.Metrics { + l = e.Size() + n += 1 + l + sovTempo(uint64(l)) + } + } return n } @@ -4262,6 +4586,28 @@ func (m *RawHistogram) Size() (n int) { return n } +func (m *SpanMetrics) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.LatencyHistogram) > 0 { + for _, e := range m.LatencyHistogram { + l = e.Size() + n += 1 + l + sovTempo(uint64(l)) + } + } + if m.Static != nil { + l = m.Static.Size() + n += 1 + l + sovTempo(uint64(l)) + } + if m.Errors != 0 { + n += 1 + sovTempo(uint64(m.Errors)) + } + return n +} + func (m *SpanMetricsSummaryRequest) Size() (n int) { if m == nil { return 0 @@ -4306,6 +4652,40 @@ func (m *SpanMetricsSummaryResponse) Size() (n int) { return n } +func (m *TraceQLStatic) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Type != 0 { + n += 1 + sovTempo(uint64(m.Type)) + } + if m.N != 0 { + n += 1 + sovTempo(uint64(m.N)) + } + if m.F != 0 { + n += 9 + } + l = len(m.S) + if l > 0 { + n += 1 + l + sovTempo(uint64(l)) + } + if m.B { + n += 2 + } + if m.D != 0 { + n += 1 + sovTempo(uint64(m.D)) + } + if m.Status != 0 { + n += 1 + sovTempo(uint64(m.Status)) + } + if m.Kind != 0 { + n += 1 + sovTempo(uint64(m.Kind)) + } + return n +} + func sovTempo(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -7585,13 +7965,47 @@ func (m *SpanMetricsResponse) Unmarshal(dAtA []byte) error { break } } - default: - iNdEx = preIndex - skippy, err := skipTempo(dAtA[iNdEx:]) - if err != nil { - return err + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Metrics", wireType) } - if (skippy < 0) || (iNdEx+skippy) < 0 { + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTempo + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTempo + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTempo + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Metrics = append(m.Metrics, &SpanMetrics{}) + if err := m.Metrics[len(m.Metrics)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTempo(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTempo } if (iNdEx + skippy) > l { @@ -7694,6 +8108,145 @@ func (m *RawHistogram) Unmarshal(dAtA []byte) error { } return nil } +func (m *SpanMetrics) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTempo + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: SpanMetrics: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: SpanMetrics: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field LatencyHistogram", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTempo + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTempo + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTempo + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.LatencyHistogram = append(m.LatencyHistogram, &RawHistogram{}) + if err := m.LatencyHistogram[len(m.LatencyHistogram)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Static", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTempo + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTempo + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTempo + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Static == nil { + m.Static = &TraceQLStatic{} + } + if err := m.Static.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Errors", wireType) + } + m.Errors = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTempo + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Errors |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + default: + iNdEx = preIndex + skippy, err := skipTempo(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTempo + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *SpanMetricsSummaryRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -7972,6 +8525,214 @@ func (m *SpanMetricsSummaryResponse) Unmarshal(dAtA []byte) error { } return nil } +func (m *TraceQLStatic) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTempo + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: TraceQLStatic: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: TraceQLStatic: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Type", wireType) + } + m.Type = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTempo + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Type |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field N", wireType) + } + m.N = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTempo + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.N |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 3: + if wireType != 1 { + return fmt.Errorf("proto: wrong wireType = %d for field F", wireType) + } + var v uint64 + if (iNdEx + 8) > l { + return io.ErrUnexpectedEOF + } + v = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:])) + iNdEx += 8 + m.F = float64(math.Float64frombits(v)) + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field S", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTempo + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTempo + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTempo + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.S = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 5: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field B", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTempo + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.B = bool(v != 0) + case 6: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field D", wireType) + } + m.D = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTempo + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.D |= uint32(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 7: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Status", wireType) + } + m.Status = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTempo + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Status |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 8: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Kind", wireType) + } + m.Kind = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTempo + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Kind |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + default: + iNdEx = preIndex + skippy, err := skipTempo(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTempo + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipTempo(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/pkg/tempopb/tempo.proto b/pkg/tempopb/tempo.proto index d18da831d4f..630858c4c09 100644 --- a/pkg/tempopb/tempo.proto +++ b/pkg/tempopb/tempo.proto @@ -193,8 +193,7 @@ message SpanMetricsRequest { message SpanMetricsResponse { bool estimated = 1; uint64 spanCount = 2; - // uint64 errorSpanCount = 3; -// repeated RawHistogram latencies = 4; + repeated SpanMetrics metrics = 3; } message RawHistogram { @@ -202,6 +201,12 @@ message RawHistogram { uint64 count = 2; } +message SpanMetrics { + repeated RawHistogram latency_histogram = 1; + TraceQLStatic static = 2; + uint64 errors = 3; +} + message SpanMetricsSummaryRequest { string query = 1; string groupBy = 2; @@ -215,3 +220,15 @@ message SpanMetricsSummaryResponse { uint64 p90 = 6; uint64 p50 = 7; } + +message TraceQLStatic { + int64 type = 1; + int64 n = 2; + double f = 3; + string s = 4; + bool b = 5; + uint32 d = 6; + int64 status = 7; + int64 kind = 8; + } + From b73536decec90a5af418bee65b70b2df2f1fde91 Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Wed, 10 May 2023 18:26:27 +0000 Subject: [PATCH 13/31] Begin handling series in API --- .../processor/localblocks/processor.go | 44 +++++++++++++++++-- pkg/traceqlmetrics/metrics.go | 4 ++ 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/modules/generator/processor/localblocks/processor.go b/modules/generator/processor/localblocks/processor.go index de098da6204..7d56ab61204 100644 --- a/modules/generator/processor/localblocks/processor.go +++ b/modules/generator/processor/localblocks/processor.go @@ -258,12 +258,35 @@ func (p *Processor) GetMetrics(ctx context.Context, req *tempopb.SpanMetricsRequ return nil, errors.Wrap(err, "failed to get metrics") } - return &tempopb.SpanMetricsResponse{ - // Series: m.Series, - // Errors: m.Errors, + resp := &tempopb.SpanMetricsResponse{ SpanCount: uint64(m.SpanCount), Estimated: m.Estimated, - }, nil + Metrics: make([]*tempopb.SpanMetrics, 0, len(m.Series)), + } + + for static, series := range m.Series { + toStaticProto(static) + + h := []*tempopb.RawHistogram{} + + for bucket, count := range series.Buckets() { + histo := &tempopb.RawHistogram{ + Bucket: uint64(bucket), + Count: uint64(count), + } + + h = append(h, histo) + } + + xxx := &tempopb.SpanMetrics{ + LatencyHistogram: h, + Static: toStaticProto(static), + } + + resp.Metrics = append(resp.Metrics, xxx) + } + + return resp, nil } func (p *Processor) deleteOldBlocks() (err error) { @@ -514,3 +537,16 @@ func filterBatch(batch *v1.ResourceSpans) *v1.ResourceSpans { return nil } + +func toStaticProto(static traceql.Static) *tempopb.TraceQLStatic { + return &tempopb.TraceQLStatic{ + Type: int64(static.Type), + N: int64(static.N), + F: static.F, + S: static.S, + B: static.B, + D: uint32(static.D), + Status: int64(static.Status), + Kind: int64(static.Kind), + } +} diff --git a/pkg/traceqlmetrics/metrics.go b/pkg/traceqlmetrics/metrics.go index 839d2d86b3d..babab1698d3 100644 --- a/pkg/traceqlmetrics/metrics.go +++ b/pkg/traceqlmetrics/metrics.go @@ -70,6 +70,10 @@ func (m *latencyHistogram) Percentile(p float32) uint64 { return uint64(dur) } +func (m *latencyHistogram) Buckets() [64]int { + return m.buckets +} + type MetricsResults struct { Estimated bool SpanCount int From e2c872c7e4c086d4178aa9358843166089ce7f0e Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Wed, 10 May 2023 20:15:24 +0000 Subject: [PATCH 14/31] Update proto and avoid empty buckets --- modules/generator/config.go | 1 - modules/generator/http.go | 7 +------ modules/generator/processor/localblocks/processor.go | 12 +++++++----- pkg/tempopb/tempo.proto | 8 ++++---- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/modules/generator/config.go b/modules/generator/config.go index 3bdce271328..4829be7bfef 100644 --- a/modules/generator/config.go +++ b/modules/generator/config.go @@ -33,7 +33,6 @@ type Config struct { // MetricsIngestionSlack is the max amount of time passed since a span's start time // for the span to be considered in metrics generation MetricsIngestionSlack time.Duration `yaml:"metrics_ingestion_time_range_slack"` - SummaryTimeout time.Duration `yaml:"summary_timeout"` } // RegisterFlagsAndApplyDefaults registers the flags. diff --git a/modules/generator/http.go b/modules/generator/http.go index c044cd5b12b..c3761f399b3 100644 --- a/modules/generator/http.go +++ b/modules/generator/http.go @@ -1,9 +1,7 @@ package generator import ( - "context" "net/http" - "time" "github.com/gogo/protobuf/jsonpb" "github.com/grafana/tempo/pkg/api" @@ -12,10 +10,7 @@ import ( ) func (g *Generator) SpanSummaryHandler(w http.ResponseWriter, r *http.Request) { - ctx, cancel := context.WithDeadline(r.Context(), time.Now().Add(g.cfg.SummaryTimeout)) - defer cancel() - - span, ctx := opentracing.StartSpanFromContext(ctx, "Generator.SpanSummaryHandler") + span, ctx := opentracing.StartSpanFromContext(r.Context(), "Generator.SpanSummaryHandler") defer span.Finish() span.SetTag("requestURI", r.RequestURI) diff --git a/modules/generator/processor/localblocks/processor.go b/modules/generator/processor/localblocks/processor.go index 7d56ab61204..a03c3ce01f9 100644 --- a/modules/generator/processor/localblocks/processor.go +++ b/modules/generator/processor/localblocks/processor.go @@ -270,12 +270,14 @@ func (p *Processor) GetMetrics(ctx context.Context, req *tempopb.SpanMetricsRequ h := []*tempopb.RawHistogram{} for bucket, count := range series.Buckets() { - histo := &tempopb.RawHistogram{ - Bucket: uint64(bucket), - Count: uint64(count), - } + if count != 0 { + histo := &tempopb.RawHistogram{ + Bucket: uint64(bucket), + Count: uint64(count), + } - h = append(h, histo) + h = append(h, histo) + } } xxx := &tempopb.SpanMetrics{ diff --git a/pkg/tempopb/tempo.proto b/pkg/tempopb/tempo.proto index 630858c4c09..c9b7fadb11b 100644 --- a/pkg/tempopb/tempo.proto +++ b/pkg/tempopb/tempo.proto @@ -222,13 +222,13 @@ message SpanMetricsSummaryResponse { } message TraceQLStatic { - int64 type = 1; + int8 type = 1; int64 n = 2; double f = 3; string s = 4; bool b = 5; - uint32 d = 6; - int64 status = 7; - int64 kind = 8; + uint64 d = 6; + int8 status = 7; + int8 kind = 8; } From e1e3b6df83e351ab75ab0f25a5bc482cb83fc07d Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Wed, 10 May 2023 22:11:17 +0000 Subject: [PATCH 15/31] Adhere to spanlimit only when non zero --- pkg/traceqlmetrics/metrics.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/traceqlmetrics/metrics.go b/pkg/traceqlmetrics/metrics.go index babab1698d3..8b6c37819fa 100644 --- a/pkg/traceqlmetrics/metrics.go +++ b/pkg/traceqlmetrics/metrics.go @@ -181,7 +181,7 @@ func GetMetrics(ctx context.Context, query string, groupBy string, spanLimit int series.Record(group, s.DurationNanos(), err) spanCount++ - if spanCount >= spanLimit { + if spanLimit > 0 && spanCount >= spanLimit { return nil, io.EOF } } From b7042bf35770c1a96058b253796bfc9d08f3f892 Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Wed, 10 May 2023 22:16:02 +0000 Subject: [PATCH 16/31] Accept the limit param --- pkg/api/http.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkg/api/http.go b/pkg/api/http.go index 218c6c0a167..b4d7577441b 100644 --- a/pkg/api/http.go +++ b/pkg/api/http.go @@ -327,6 +327,15 @@ func ParseSummaryRequest(r *http.Request) (*tempopb.SpanMetricsRequest, error) { query := r.URL.Query().Get(urlParamQuery) req.Query = query + l := r.URL.Query().Get(urlParamLimit) + if l != "" { + limit, err := strconv.Atoi(l) + if err != nil { + return nil, fmt.Errorf("invalid limit: %w", err) + } + req.Limit = uint64(limit) + } + return req, nil } From 5ad71fadf97e4416b1c94d70beddcd3facaa2dd5 Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Wed, 10 May 2023 22:16:16 +0000 Subject: [PATCH 17/31] Whitespace --- pkg/tempopb/tempo.proto | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkg/tempopb/tempo.proto b/pkg/tempopb/tempo.proto index c9b7fadb11b..97954f8fdf4 100644 --- a/pkg/tempopb/tempo.proto +++ b/pkg/tempopb/tempo.proto @@ -222,13 +222,13 @@ message SpanMetricsSummaryResponse { } message TraceQLStatic { - int8 type = 1; - int64 n = 2; - double f = 3; - string s = 4; - bool b = 5; - uint64 d = 6; - int8 status = 7; - int8 kind = 8; - } + int8 type = 1; + int64 n = 2; + double f = 3; + string s = 4; + bool b = 5; + uint64 d = 6; + int8 status = 7; + int8 kind = 8; +} From 8c9c4c58e3254ddf714b268d7466c7496deccef4 Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Wed, 10 May 2023 22:29:50 +0000 Subject: [PATCH 18/31] Allocate early --- modules/generator/processor/localblocks/processor.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/generator/processor/localblocks/processor.go b/modules/generator/processor/localblocks/processor.go index a03c3ce01f9..bfb38e38a85 100644 --- a/modules/generator/processor/localblocks/processor.go +++ b/modules/generator/processor/localblocks/processor.go @@ -264,6 +264,7 @@ func (p *Processor) GetMetrics(ctx context.Context, req *tempopb.SpanMetricsRequ Metrics: make([]*tempopb.SpanMetrics, 0, len(m.Series)), } + var rawHistorgram *tempopb.RawHistogram for static, series := range m.Series { toStaticProto(static) @@ -271,12 +272,12 @@ func (p *Processor) GetMetrics(ctx context.Context, req *tempopb.SpanMetricsRequ for bucket, count := range series.Buckets() { if count != 0 { - histo := &tempopb.RawHistogram{ + rawHistorgram = &tempopb.RawHistogram{ Bucket: uint64(bucket), Count: uint64(count), } - h = append(h, histo) + h = append(h, rawHistorgram) } } From c21a4e61eb90e81cffab9cb2f50061f7946843bb Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Wed, 10 May 2023 22:32:06 +0000 Subject: [PATCH 19/31] Avoid wishful data types Signed-off-by: Zach Leslie --- .../processor/localblocks/processor.go | 8 +- pkg/tempopb/tempo.pb.go | 244 +++++++++--------- pkg/tempopb/tempo.proto | 6 +- 3 files changed, 129 insertions(+), 129 deletions(-) diff --git a/modules/generator/processor/localblocks/processor.go b/modules/generator/processor/localblocks/processor.go index bfb38e38a85..c06d5dcc8f1 100644 --- a/modules/generator/processor/localblocks/processor.go +++ b/modules/generator/processor/localblocks/processor.go @@ -543,13 +543,13 @@ func filterBatch(batch *v1.ResourceSpans) *v1.ResourceSpans { func toStaticProto(static traceql.Static) *tempopb.TraceQLStatic { return &tempopb.TraceQLStatic{ - Type: int64(static.Type), + Type: int32(static.Type), N: int64(static.N), F: static.F, S: static.S, B: static.B, - D: uint32(static.D), - Status: int64(static.Status), - Kind: int64(static.Kind), + D: uint64(static.D), + Status: int32(static.Status), + Kind: int32(static.Kind), } } diff --git a/pkg/tempopb/tempo.pb.go b/pkg/tempopb/tempo.pb.go index d0573346958..89a0b5dd6ea 100644 --- a/pkg/tempopb/tempo.pb.go +++ b/pkg/tempopb/tempo.pb.go @@ -1763,14 +1763,14 @@ func (m *SpanMetricsSummaryResponse) GetP50() uint64 { } type TraceQLStatic struct { - Type int64 `protobuf:"varint,1,opt,name=type,proto3" json:"type,omitempty"` + Type int32 `protobuf:"varint,1,opt,name=type,proto3" json:"type,omitempty"` N int64 `protobuf:"varint,2,opt,name=n,proto3" json:"n,omitempty"` F float64 `protobuf:"fixed64,3,opt,name=f,proto3" json:"f,omitempty"` S string `protobuf:"bytes,4,opt,name=s,proto3" json:"s,omitempty"` B bool `protobuf:"varint,5,opt,name=b,proto3" json:"b,omitempty"` - D uint32 `protobuf:"varint,6,opt,name=d,proto3" json:"d,omitempty"` - Status int64 `protobuf:"varint,7,opt,name=status,proto3" json:"status,omitempty"` - Kind int64 `protobuf:"varint,8,opt,name=kind,proto3" json:"kind,omitempty"` + D uint64 `protobuf:"varint,6,opt,name=d,proto3" json:"d,omitempty"` + Status int32 `protobuf:"varint,7,opt,name=status,proto3" json:"status,omitempty"` + Kind int32 `protobuf:"varint,8,opt,name=kind,proto3" json:"kind,omitempty"` } func (m *TraceQLStatic) Reset() { *m = TraceQLStatic{} } @@ -1806,7 +1806,7 @@ func (m *TraceQLStatic) XXX_DiscardUnknown() { var xxx_messageInfo_TraceQLStatic proto.InternalMessageInfo -func (m *TraceQLStatic) GetType() int64 { +func (m *TraceQLStatic) GetType() int32 { if m != nil { return m.Type } @@ -1841,21 +1841,21 @@ func (m *TraceQLStatic) GetB() bool { return false } -func (m *TraceQLStatic) GetD() uint32 { +func (m *TraceQLStatic) GetD() uint64 { if m != nil { return m.D } return 0 } -func (m *TraceQLStatic) GetStatus() int64 { +func (m *TraceQLStatic) GetStatus() int32 { if m != nil { return m.Status } return 0 } -func (m *TraceQLStatic) GetKind() int64 { +func (m *TraceQLStatic) GetKind() int32 { if m != nil { return m.Kind } @@ -1901,116 +1901,116 @@ func init() { proto.RegisterFile("pkg/tempopb/tempo.proto", fileDescriptor_f2280 var fileDescriptor_f22805646f4f62b6 = []byte{ // 1758 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0x4f, 0x6f, 0x23, 0x49, - 0x15, 0x4f, 0xc7, 0x8e, 0x1d, 0x3f, 0xdb, 0xd9, 0xa4, 0x76, 0x26, 0xe3, 0xf1, 0x0c, 0x99, 0xa8, - 0x19, 0x2d, 0x01, 0xb1, 0x4e, 0xc6, 0x3b, 0xd1, 0x32, 0x3b, 0x08, 0x84, 0xc9, 0xb0, 0xf3, 0x2f, - 0xcb, 0x6c, 0x3b, 0xcc, 0x61, 0x2f, 0xa8, 0xdc, 0x5d, 0x71, 0x5a, 0xb1, 0xbb, 0xbc, 0xdd, 0xe5, - 0x10, 0x73, 0x82, 0x0b, 0x27, 0x0e, 0x5c, 0x38, 0x70, 0x42, 0x48, 0x48, 0x48, 0x7c, 0x0d, 0x2e, - 0x7b, 0xdc, 0x23, 0xe2, 0xb0, 0x42, 0x33, 0x9f, 0x80, 0x23, 0x37, 0xf4, 0x5e, 0x55, 0xf5, 0x1f, - 0xdb, 0x09, 0x62, 0x39, 0xb9, 0xde, 0xaf, 0x7e, 0xf5, 0xea, 0xd5, 0xab, 0xf7, 0x5e, 0xbd, 0x36, - 0xdc, 0x9a, 0x9c, 0x0f, 0xf7, 0x95, 0x18, 0x4f, 0xe4, 0x64, 0xa0, 0x7f, 0x3b, 0x93, 0x58, 0x2a, - 0xc9, 0xaa, 0x06, 0x6c, 0xdf, 0x50, 0x31, 0xf7, 0xc5, 0xfe, 0xc5, 0x83, 0x7d, 0x1a, 0xe8, 0xe9, - 0xf6, 0xb6, 0x2f, 0xc7, 0x63, 0x19, 0x21, 0xac, 0x47, 0x06, 0x7f, 0x7f, 0x18, 0xaa, 0xb3, 0xe9, - 0xa0, 0xe3, 0xcb, 0xf1, 0xfe, 0x50, 0x0e, 0xe5, 0x3e, 0xc1, 0x83, 0xe9, 0x29, 0x49, 0x24, 0xd0, - 0x48, 0xd3, 0xdd, 0xdf, 0x38, 0xb0, 0x79, 0x82, 0x6a, 0x7b, 0xb3, 0x67, 0x47, 0x9e, 0xf8, 0x7c, - 0x2a, 0x12, 0xc5, 0x5a, 0x50, 0xa5, 0xad, 0x9e, 0x1d, 0xb5, 0x9c, 0x5d, 0x67, 0xaf, 0xe1, 0x59, - 0x91, 0xed, 0x00, 0x0c, 0x46, 0xd2, 0x3f, 0xef, 0x2b, 0x1e, 0xab, 0xd6, 0xea, 0xae, 0xb3, 0x57, - 0xf3, 0x72, 0x08, 0x6b, 0xc3, 0x3a, 0x49, 0x4f, 0xa2, 0xa0, 0x55, 0xa2, 0xd9, 0x54, 0x66, 0x77, - 0xa1, 0xf6, 0xf9, 0x54, 0xc4, 0xb3, 0x63, 0x19, 0x88, 0xd6, 0x1a, 0x4d, 0x66, 0x80, 0x1b, 0xc1, - 0x56, 0xce, 0x8e, 0x64, 0x22, 0xa3, 0x44, 0xb0, 0xfb, 0xb0, 0x46, 0x3b, 0x93, 0x19, 0xf5, 0xee, - 0x46, 0xc7, 0xf8, 0xa4, 0x43, 0x54, 0x4f, 0x4f, 0xb2, 0x0f, 0xa0, 0x3a, 0x16, 0x2a, 0x0e, 0xfd, - 0x84, 0x2c, 0xaa, 0x77, 0x6f, 0x17, 0x79, 0xa8, 0xf2, 0x58, 0x13, 0x3c, 0xcb, 0x74, 0x59, 0xee, - 0xdc, 0x66, 0xd2, 0xfd, 0xf3, 0x2a, 0x34, 0xfb, 0x82, 0xc7, 0xfe, 0x99, 0xf5, 0xc4, 0x47, 0x50, - 0x3e, 0xe1, 0xc3, 0xa4, 0xe5, 0xec, 0x96, 0xf6, 0xea, 0xdd, 0xdd, 0x54, 0x6f, 0x81, 0xd5, 0x41, - 0xca, 0x93, 0x48, 0xc5, 0xb3, 0x5e, 0xf9, 0x8b, 0xaf, 0xee, 0xad, 0x78, 0xb4, 0x86, 0xdd, 0x87, - 0xe6, 0x71, 0x18, 0x1d, 0x4d, 0x63, 0xae, 0x42, 0x19, 0x1d, 0x6b, 0xe3, 0x9a, 0x5e, 0x11, 0x24, - 0x16, 0xbf, 0xcc, 0xb1, 0x4a, 0x86, 0x95, 0x07, 0xd9, 0x0d, 0x58, 0x7b, 0x19, 0x8e, 0x43, 0xd5, - 0x2a, 0xd3, 0xac, 0x16, 0x10, 0x4d, 0xe8, 0x22, 0xd6, 0x34, 0x4a, 0x02, 0xdb, 0x84, 0x92, 0x88, - 0x82, 0x56, 0x85, 0x30, 0x1c, 0x22, 0xef, 0x53, 0x74, 0x74, 0x6b, 0x9d, 0xbc, 0xae, 0x85, 0xf6, - 0x87, 0x50, 0x4b, 0x0d, 0xc7, 0x45, 0xe7, 0x62, 0x46, 0x7e, 0xae, 0x79, 0x38, 0xc4, 0x45, 0x17, - 0x7c, 0x34, 0x15, 0xe6, 0x96, 0xb5, 0xf0, 0xd1, 0xea, 0xf7, 0x1c, 0xf7, 0x57, 0x25, 0x60, 0xda, - 0x01, 0x3d, 0xbc, 0x5b, 0xeb, 0xab, 0x87, 0x50, 0x4b, 0xac, 0x5b, 0xcc, 0x85, 0x6d, 0x2f, 0x77, - 0x98, 0x97, 0x11, 0x31, 0xd6, 0x28, 0x42, 0x9e, 0x1d, 0x99, 0x8d, 0xac, 0x88, 0xf1, 0x42, 0x07, - 0x7a, 0xc5, 0x87, 0xc2, 0x78, 0x25, 0x03, 0xd0, 0x6f, 0x13, 0x3e, 0x14, 0xc9, 0x89, 0xd4, 0xaa, - 0x8d, 0x67, 0x8a, 0x20, 0xc6, 0xa3, 0x88, 0x7c, 0x19, 0x84, 0xd1, 0xd0, 0x84, 0x5c, 0x2a, 0xa3, - 0x86, 0x30, 0x0a, 0xc4, 0x25, 0xaa, 0xeb, 0x87, 0xbf, 0x14, 0xc6, 0x63, 0x45, 0x90, 0xb9, 0xd0, - 0x50, 0x52, 0xf1, 0x91, 0x27, 0x7c, 0x19, 0x07, 0x49, 0xab, 0x4a, 0xa4, 0x02, 0x86, 0x9c, 0x80, - 0x2b, 0xfe, 0xc4, 0xee, 0xa4, 0xdd, 0x5c, 0xc0, 0xf0, 0x9c, 0x17, 0x22, 0x4e, 0x42, 0x19, 0xb5, - 0x6a, 0xfa, 0x9c, 0x46, 0x64, 0x0c, 0xca, 0x09, 0x6e, 0x0f, 0xbb, 0xce, 0x5e, 0xd9, 0xa3, 0x31, - 0xe6, 0xd9, 0xa9, 0x94, 0x4a, 0xc4, 0x64, 0x58, 0x9d, 0xf6, 0xcc, 0x21, 0xee, 0x25, 0x6c, 0x58, - 0x8f, 0x9a, 0x54, 0x79, 0x08, 0x15, 0xca, 0x06, 0x1b, 0xab, 0x77, 0x8b, 0x39, 0xa0, 0xd9, 0xc7, - 0x42, 0x71, 0xb4, 0xca, 0x33, 0x5c, 0x76, 0x30, 0x9f, 0x3a, 0xf3, 0x37, 0xb6, 0x90, 0x37, 0xff, - 0x76, 0xe0, 0xdd, 0x25, 0x1a, 0xe7, 0x6b, 0x46, 0x2d, 0xab, 0x19, 0x7b, 0xf0, 0x4e, 0x2c, 0xa5, - 0xea, 0x8b, 0xf8, 0x22, 0xf4, 0xc5, 0x27, 0x7c, 0x6c, 0x43, 0x6a, 0x1e, 0xc6, 0x1b, 0x41, 0x88, - 0xd4, 0x13, 0x4f, 0x97, 0x90, 0x22, 0xc8, 0xbe, 0x0b, 0x5b, 0x14, 0x06, 0x27, 0xe1, 0x58, 0xfc, - 0x2c, 0x0a, 0x2f, 0x3f, 0xe1, 0x91, 0xa4, 0xdb, 0x2f, 0x7b, 0x8b, 0x13, 0xe8, 0xc9, 0x20, 0x4b, - 0x2e, 0x9d, 0x28, 0x39, 0x84, 0x7d, 0x07, 0xaa, 0xc9, 0x84, 0x47, 0x7d, 0xa1, 0xe8, 0xfe, 0xeb, - 0xdd, 0xcd, 0xcc, 0x03, 0x1a, 0xf7, 0x2c, 0xc1, 0x7d, 0x0a, 0x55, 0x83, 0xb1, 0x6f, 0xc2, 0x1a, - 0xa2, 0xd6, 0xdb, 0xcd, 0xc2, 0x22, 0x4f, 0xcf, 0xa1, 0x4f, 0xc6, 0x5c, 0xf9, 0x67, 0x22, 0x30, - 0xb9, 0x6f, 0x45, 0xf7, 0x6f, 0x0e, 0x94, 0x91, 0xc9, 0xb6, 0xa1, 0x82, 0xdc, 0xd4, 0x6b, 0x46, - 0xc2, 0xa0, 0x88, 0x32, 0x4f, 0xd1, 0x78, 0xf9, 0xc1, 0x4b, 0x57, 0x1d, 0xfc, 0x3e, 0x34, 0xed, - 0x31, 0x51, 0x4e, 0x8c, 0x8b, 0x8a, 0x20, 0x7b, 0x0c, 0xc0, 0x95, 0x8a, 0xc3, 0xc1, 0x54, 0x09, - 0x74, 0x0f, 0x1e, 0xe6, 0x4e, 0x7a, 0x18, 0xf3, 0xb2, 0x5c, 0x3c, 0xe8, 0xbc, 0x10, 0xb3, 0xd7, - 0x58, 0x00, 0xbc, 0x1c, 0xdd, 0xfd, 0x97, 0x63, 0xeb, 0xa5, 0x09, 0x13, 0xbc, 0xeb, 0x30, 0x4a, - 0x26, 0xc2, 0x57, 0x22, 0x38, 0xb1, 0xe1, 0x88, 0x27, 0x9f, 0x87, 0xd9, 0x7b, 0xb0, 0x91, 0x42, - 0xbd, 0x19, 0x6e, 0xbe, 0x4a, 0xf6, 0xcd, 0xa1, 0x6c, 0x17, 0xea, 0x94, 0x6b, 0x54, 0x6a, 0x6c, - 0x75, 0xcc, 0x43, 0x78, 0x50, 0x5f, 0x8e, 0x27, 0x23, 0xa1, 0x44, 0xf0, 0x5c, 0x0e, 0x12, 0x5b, - 0x09, 0x0a, 0x20, 0x56, 0x13, 0x5a, 0x44, 0x0c, 0x1d, 0x06, 0x19, 0x80, 0x76, 0x67, 0x2a, 0xb5, - 0x39, 0x15, 0x32, 0x67, 0x1e, 0x76, 0xbf, 0x0d, 0x5b, 0xfa, 0xc8, 0x58, 0x3b, 0x6d, 0xe9, 0xc3, - 0x42, 0xec, 0xcb, 0x89, 0x30, 0x97, 0xa8, 0x05, 0xf7, 0xc0, 0x96, 0x49, 0x4d, 0x35, 0x89, 0xda, - 0x86, 0x75, 0xc5, 0x87, 0x18, 0xc9, 0x3a, 0x78, 0x6a, 0x5e, 0x2a, 0xbb, 0xcf, 0xe1, 0x46, 0xb6, - 0xe2, 0x75, 0x37, 0x5d, 0xd3, 0x85, 0x0a, 0xa9, 0xb4, 0xe1, 0xd6, 0x9e, 0xcb, 0x52, 0x4d, 0xef, - 0x23, 0xc5, 0x33, 0x4c, 0xf7, 0x71, 0xde, 0x50, 0x33, 0x99, 0x86, 0x95, 0x93, 0x0b, 0x2b, 0x06, - 0x65, 0x85, 0x6f, 0xdc, 0x2a, 0x19, 0x43, 0x63, 0xf7, 0x29, 0x6c, 0xa7, 0x8b, 0xe9, 0xde, 0x93, - 0x7c, 0x6f, 0xa0, 0xcd, 0x4d, 0xf3, 0x5c, 0x8b, 0xe8, 0x04, 0x7a, 0xce, 0xed, 0x83, 0x41, 0x82, - 0xfb, 0x21, 0xdc, 0x5a, 0xd0, 0x64, 0x4e, 0x85, 0x57, 0x62, 0x41, 0xe3, 0x8a, 0x0c, 0x70, 0x1f, - 0xc2, 0xba, 0x5d, 0x42, 0x26, 0xce, 0x52, 0xf7, 0xd2, 0x78, 0xf9, 0xfb, 0xe4, 0xbe, 0x84, 0xdb, - 0x73, 0xdb, 0xe5, 0xdc, 0xb8, 0x3f, 0xbf, 0x61, 0xbd, 0xbb, 0x95, 0x95, 0x49, 0x33, 0x93, 0xb7, - 0xa1, 0x07, 0x6b, 0x14, 0xae, 0xec, 0x11, 0x54, 0x07, 0x94, 0xba, 0x76, 0xdd, 0xbd, 0x74, 0x9d, - 0x6e, 0xca, 0x2e, 0x1e, 0x74, 0x3c, 0x91, 0xc8, 0x69, 0xec, 0x0b, 0xcc, 0xeb, 0xc4, 0xb3, 0x7c, - 0x77, 0x03, 0x1a, 0xaf, 0xa6, 0x49, 0x5a, 0xa8, 0xdd, 0x3f, 0x39, 0xb0, 0x89, 0x00, 0x85, 0x93, - 0xf5, 0xea, 0xfb, 0x69, 0xf5, 0xc6, 0x5b, 0x68, 0xf4, 0x6e, 0x62, 0x1f, 0xf1, 0x8f, 0xaf, 0xee, - 0x35, 0x5f, 0xc5, 0x82, 0x8f, 0x46, 0xd2, 0xd7, 0x6c, 0x5b, 0xb6, 0xbf, 0x05, 0xa5, 0x30, 0xc0, - 0x64, 0xb8, 0x86, 0x8b, 0x0c, 0x76, 0x08, 0xa0, 0x9f, 0xda, 0x23, 0xae, 0x78, 0xab, 0x7c, 0x1d, - 0x3f, 0x47, 0x74, 0x8f, 0xb5, 0x89, 0xfa, 0x24, 0xc6, 0xc4, 0xff, 0xc3, 0x05, 0xf7, 0x01, 0x4c, - 0xaf, 0x85, 0x19, 0xbd, 0x5d, 0x78, 0xa9, 0x1a, 0xf6, 0x50, 0xee, 0x0f, 0xa0, 0xf6, 0x32, 0x8c, - 0xce, 0xfb, 0xa3, 0xd0, 0x17, 0xec, 0x01, 0xac, 0x8d, 0xc2, 0xe8, 0xdc, 0xee, 0x75, 0x67, 0x71, - 0x2f, 0xdc, 0xa3, 0x83, 0x0b, 0x3c, 0xcd, 0x74, 0x3f, 0x03, 0x86, 0x98, 0x7d, 0xb1, 0xb2, 0xd4, - 0xd4, 0x51, 0xe9, 0xe4, 0xa2, 0x12, 0xa3, 0x78, 0x18, 0xcb, 0xe9, 0xa4, 0x67, 0xa3, 0xd5, 0x8a, - 0xc8, 0x1f, 0x51, 0xa7, 0xa5, 0x0b, 0xab, 0x16, 0xdc, 0x5f, 0x3b, 0xf0, 0x6e, 0x41, 0x79, 0x16, - 0xc2, 0x22, 0x51, 0xe1, 0x98, 0x2b, 0x11, 0xd0, 0x0e, 0xeb, 0x5e, 0x06, 0x50, 0x07, 0x33, 0xe1, - 0xd1, 0x8f, 0xe5, 0x34, 0x52, 0xa6, 0xbc, 0x65, 0x00, 0xeb, 0x64, 0x6f, 0x6f, 0x89, 0x0e, 0x79, - 0xa3, 0xf0, 0x88, 0x2c, 0xbc, 0xbc, 0xdf, 0x87, 0x86, 0xc7, 0x7f, 0xf1, 0x34, 0x4c, 0x94, 0x1c, - 0xc6, 0x7c, 0x8c, 0x7e, 0x1c, 0x4c, 0xfd, 0x73, 0xa1, 0x68, 0xe3, 0xb2, 0x67, 0x24, 0x3c, 0x81, - 0x9f, 0xdb, 0x51, 0x0b, 0xee, 0x1f, 0x1c, 0xa8, 0xe7, 0xd4, 0xb2, 0x1e, 0x6c, 0x8d, 0xb8, 0x12, - 0x91, 0x3f, 0xfb, 0xf9, 0x99, 0x55, 0x69, 0x9c, 0x7d, 0x33, 0xb5, 0x23, 0xbf, 0x9f, 0xb7, 0x69, - 0xf8, 0x99, 0x05, 0x1d, 0xa8, 0x24, 0x8a, 0xab, 0xd0, 0x5f, 0x68, 0x1e, 0xe8, 0xba, 0x3f, 0x7d, - 0xd9, 0xa7, 0x59, 0xcf, 0xb0, 0xd0, 0x62, 0x11, 0xc7, 0x32, 0x4e, 0x8c, 0x73, 0x8d, 0xe4, 0xbe, - 0x80, 0xdb, 0x39, 0xd3, 0xfa, 0xd3, 0xf1, 0x98, 0xc7, 0xb3, 0xaf, 0x79, 0x81, 0xee, 0x5f, 0x1d, - 0x68, 0x2f, 0xd3, 0x96, 0xdd, 0x58, 0xf1, 0x4e, 0x4a, 0xf9, 0x3b, 0x79, 0x0f, 0x36, 0xc8, 0xa6, - 0x7e, 0x4a, 0x29, 0x11, 0x65, 0x0e, 0xc5, 0x76, 0x79, 0xf2, 0xe8, 0x91, 0x79, 0x52, 0x71, 0xa8, - 0x91, 0x43, 0x7a, 0x59, 0x08, 0x39, 0xd4, 0xc8, 0x81, 0x79, 0x47, 0x70, 0x48, 0xc8, 0xe1, 0x01, - 0xb5, 0x90, 0x88, 0x1c, 0x1e, 0xb8, 0xbf, 0x77, 0xa0, 0x59, 0xf0, 0x55, 0xa1, 0xd4, 0x95, 0x4c, - 0xa9, 0x6b, 0x80, 0x13, 0x19, 0x5b, 0x9d, 0x08, 0xa5, 0x53, 0x32, 0xcb, 0xf1, 0x9c, 0x53, 0x94, - 0xf4, 0x8b, 0x57, 0xf3, 0x9c, 0x04, 0xa5, 0x01, 0xd9, 0xb0, 0xee, 0x39, 0x03, 0x94, 0xec, 0x77, - 0x80, 0x13, 0x50, 0xab, 0xa1, 0xb8, 0x9a, 0xea, 0x1e, 0xb6, 0xe4, 0x19, 0x09, 0x77, 0x3c, 0x0f, - 0xa3, 0x80, 0xba, 0xd6, 0x92, 0x47, 0xe3, 0xee, 0x6f, 0x1d, 0xa8, 0x60, 0x05, 0x10, 0x31, 0xfb, - 0x21, 0xd4, 0xd2, 0x72, 0xc5, 0xb2, 0x2f, 0xab, 0xf9, 0x12, 0xd6, 0xbe, 0x59, 0x98, 0x4a, 0xcb, - 0xdd, 0x0a, 0xfb, 0x11, 0xd4, 0x53, 0xf2, 0xeb, 0xee, 0xd7, 0x51, 0xd1, 0xfd, 0xa3, 0x03, 0x9b, - 0xe6, 0x3e, 0x3f, 0x16, 0x91, 0x88, 0xb9, 0x92, 0xa9, 0x61, 0x54, 0x6b, 0xe6, 0xb4, 0xe6, 0x0b, - 0xd7, 0xd5, 0x86, 0x3d, 0x2f, 0x66, 0xc4, 0x9d, 0xa5, 0xe9, 0x67, 0x94, 0xdc, 0x5d, 0x3e, 0x99, - 0x5a, 0xf8, 0x97, 0x32, 0x54, 0xf1, 0xb3, 0x2a, 0x14, 0x31, 0x7b, 0x0a, 0xcd, 0x9f, 0x84, 0x51, - 0x90, 0x7e, 0x5e, 0xb2, 0x25, 0xdf, 0xa3, 0x56, 0x6f, 0x7b, 0xd9, 0x54, 0xce, 0x75, 0x0d, 0xdb, - 0xe6, 0xfb, 0x22, 0x52, 0xec, 0x8a, 0xef, 0xa9, 0xf6, 0xad, 0x05, 0x3c, 0x55, 0xf1, 0x04, 0xea, - 0xb9, 0x6f, 0xb5, 0xfc, 0x21, 0x17, 0xbe, 0xe0, 0xae, 0x53, 0xf3, 0x31, 0x40, 0xd6, 0x4d, 0xb0, - 0x65, 0xfd, 0x87, 0x55, 0x72, 0x67, 0xe9, 0x5c, 0xaa, 0xe8, 0x85, 0x3d, 0x92, 0x6e, 0x4b, 0xae, - 0x55, 0xf5, 0x8d, 0xa5, 0x6d, 0x4e, 0x4e, 0xd9, 0x6b, 0x78, 0x67, 0xee, 0xb5, 0x67, 0xf7, 0x16, - 0xd7, 0x14, 0x1a, 0x98, 0xf6, 0xee, 0xd5, 0x84, 0x54, 0xef, 0x67, 0xb9, 0xde, 0xc9, 0x76, 0x11, - 0xff, 0x5d, 0xb3, 0x7b, 0x15, 0x21, 0x6f, 0x73, 0xf7, 0xa7, 0xb0, 0xd9, 0x57, 0xb1, 0xe0, 0xe3, - 0x30, 0x1a, 0xda, 0x88, 0x79, 0x0c, 0x15, 0xf3, 0xc1, 0xfa, 0xbf, 0xde, 0xf0, 0x81, 0xd3, 0x6b, - 0x7d, 0xf1, 0x66, 0xc7, 0xf9, 0xf2, 0xcd, 0x8e, 0xf3, 0xcf, 0x37, 0x3b, 0xce, 0xef, 0xde, 0xee, - 0xac, 0x7c, 0xf9, 0x76, 0x67, 0xe5, 0xef, 0x6f, 0x77, 0x56, 0x06, 0x15, 0xfa, 0x8f, 0xe7, 0x83, - 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x62, 0x17, 0x9a, 0xf7, 0x64, 0x12, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0xcd, 0x73, 0x1b, 0x49, + 0x15, 0xf7, 0x58, 0x5f, 0xd6, 0x93, 0xe4, 0xb5, 0x7b, 0x13, 0x47, 0x51, 0x82, 0xe3, 0x1a, 0x52, + 0x8b, 0xa1, 0x58, 0xd9, 0xd1, 0xc6, 0xb5, 0x64, 0x43, 0x41, 0x21, 0x1c, 0x36, 0x5f, 0x5e, 0xb2, + 0x23, 0x93, 0xc3, 0x5e, 0xa8, 0xd6, 0x4c, 0x47, 0x99, 0xb2, 0x34, 0xad, 0x9d, 0x69, 0x19, 0x8b, + 0x13, 0x5c, 0x38, 0x71, 0xe0, 0xc2, 0x81, 0x13, 0x45, 0x15, 0x55, 0x54, 0xf1, 0x6f, 0x70, 0xd9, + 0xe3, 0x1e, 0x29, 0x0e, 0x5b, 0x54, 0xf2, 0x17, 0x70, 0xe4, 0x46, 0xbd, 0xd7, 0xdd, 0xf3, 0x21, + 0xc9, 0xa6, 0x58, 0x4e, 0xea, 0xf7, 0xeb, 0x5f, 0xbf, 0x7e, 0xfd, 0xfa, 0xbd, 0xd7, 0x6f, 0x04, + 0x37, 0xa6, 0x67, 0xa3, 0x03, 0x25, 0x26, 0x53, 0x39, 0x1d, 0xea, 0xdf, 0xee, 0x34, 0x96, 0x4a, + 0xb2, 0x9a, 0x01, 0x3b, 0xd7, 0x54, 0xcc, 0x7d, 0x71, 0x70, 0x7e, 0xef, 0x80, 0x06, 0x7a, 0xba, + 0xb3, 0xe3, 0xcb, 0xc9, 0x44, 0x46, 0x08, 0xeb, 0x91, 0xc1, 0xdf, 0x1f, 0x85, 0xea, 0xf5, 0x6c, + 0xd8, 0xf5, 0xe5, 0xe4, 0x60, 0x24, 0x47, 0xf2, 0x80, 0xe0, 0xe1, 0xec, 0x15, 0x49, 0x24, 0xd0, + 0x48, 0xd3, 0xdd, 0xdf, 0x38, 0xb0, 0x75, 0x8a, 0x6a, 0xfb, 0xf3, 0x27, 0xc7, 0x9e, 0xf8, 0x7c, + 0x26, 0x12, 0xc5, 0xda, 0x50, 0xa3, 0xad, 0x9e, 0x1c, 0xb7, 0x9d, 0x3d, 0x67, 0xbf, 0xe9, 0x59, + 0x91, 0xed, 0x02, 0x0c, 0xc7, 0xd2, 0x3f, 0x1b, 0x28, 0x1e, 0xab, 0xf6, 0xfa, 0x9e, 0xb3, 0x5f, + 0xf7, 0x72, 0x08, 0xeb, 0xc0, 0x06, 0x49, 0x8f, 0xa2, 0xa0, 0x5d, 0xa2, 0xd9, 0x54, 0x66, 0xb7, + 0xa1, 0xfe, 0xf9, 0x4c, 0xc4, 0xf3, 0x13, 0x19, 0x88, 0x76, 0x85, 0x26, 0x33, 0xc0, 0x8d, 0x60, + 0x3b, 0x67, 0x47, 0x32, 0x95, 0x51, 0x22, 0xd8, 0x5d, 0xa8, 0xd0, 0xce, 0x64, 0x46, 0xa3, 0xb7, + 0xd9, 0x35, 0x3e, 0xe9, 0x12, 0xd5, 0xd3, 0x93, 0xec, 0x03, 0xa8, 0x4d, 0x84, 0x8a, 0x43, 0x3f, + 0x21, 0x8b, 0x1a, 0xbd, 0x9b, 0x45, 0x1e, 0xaa, 0x3c, 0xd1, 0x04, 0xcf, 0x32, 0x5d, 0x96, 0x3b, + 0xb7, 0x99, 0x74, 0xff, 0xbc, 0x0e, 0xad, 0x81, 0xe0, 0xb1, 0xff, 0xda, 0x7a, 0xe2, 0x23, 0x28, + 0x9f, 0xf2, 0x51, 0xd2, 0x76, 0xf6, 0x4a, 0xfb, 0x8d, 0xde, 0x5e, 0xaa, 0xb7, 0xc0, 0xea, 0x22, + 0xe5, 0x51, 0xa4, 0xe2, 0x79, 0xbf, 0xfc, 0xc5, 0x57, 0x77, 0xd6, 0x3c, 0x5a, 0xc3, 0xee, 0x42, + 0xeb, 0x24, 0x8c, 0x8e, 0x67, 0x31, 0x57, 0xa1, 0x8c, 0x4e, 0xb4, 0x71, 0x2d, 0xaf, 0x08, 0x12, + 0x8b, 0x5f, 0xe4, 0x58, 0x25, 0xc3, 0xca, 0x83, 0xec, 0x1a, 0x54, 0x9e, 0x87, 0x93, 0x50, 0xb5, + 0xcb, 0x34, 0xab, 0x05, 0x44, 0x13, 0xba, 0x88, 0x8a, 0x46, 0x49, 0x60, 0x5b, 0x50, 0x12, 0x51, + 0xd0, 0xae, 0x12, 0x86, 0x43, 0xe4, 0x7d, 0x8a, 0x8e, 0x6e, 0x6f, 0x90, 0xd7, 0xb5, 0xd0, 0xf9, + 0x10, 0xea, 0xa9, 0xe1, 0xb8, 0xe8, 0x4c, 0xcc, 0xc9, 0xcf, 0x75, 0x0f, 0x87, 0xb8, 0xe8, 0x9c, + 0x8f, 0x67, 0xc2, 0xdc, 0xb2, 0x16, 0x3e, 0x5a, 0xff, 0x9e, 0xe3, 0xfe, 0xaa, 0x04, 0x4c, 0x3b, + 0xa0, 0x8f, 0x77, 0x6b, 0x7d, 0x75, 0x1f, 0xea, 0x89, 0x75, 0x8b, 0xb9, 0xb0, 0x9d, 0xd5, 0x0e, + 0xf3, 0x32, 0x22, 0xc6, 0x1a, 0x45, 0xc8, 0x93, 0x63, 0xb3, 0x91, 0x15, 0x31, 0x5e, 0xe8, 0x40, + 0x2f, 0xf8, 0x48, 0x18, 0xaf, 0x64, 0x00, 0xfa, 0x6d, 0xca, 0x47, 0x22, 0x39, 0x95, 0x5a, 0xb5, + 0xf1, 0x4c, 0x11, 0xc4, 0x78, 0x14, 0x91, 0x2f, 0x83, 0x30, 0x1a, 0x99, 0x90, 0x4b, 0x65, 0xd4, + 0x10, 0x46, 0x81, 0xb8, 0x40, 0x75, 0x83, 0xf0, 0x97, 0xc2, 0x78, 0xac, 0x08, 0x32, 0x17, 0x9a, + 0x4a, 0x2a, 0x3e, 0xf6, 0x84, 0x2f, 0xe3, 0x20, 0x69, 0xd7, 0x88, 0x54, 0xc0, 0x90, 0x13, 0x70, + 0xc5, 0x1f, 0xd9, 0x9d, 0xb4, 0x9b, 0x0b, 0x18, 0x9e, 0xf3, 0x5c, 0xc4, 0x49, 0x28, 0xa3, 0x76, + 0x5d, 0x9f, 0xd3, 0x88, 0x8c, 0x41, 0x39, 0xc1, 0xed, 0x61, 0xcf, 0xd9, 0x2f, 0x7b, 0x34, 0xc6, + 0x3c, 0x7b, 0x25, 0xa5, 0x12, 0x31, 0x19, 0xd6, 0xa0, 0x3d, 0x73, 0x88, 0x7b, 0x01, 0x9b, 0xd6, + 0xa3, 0x26, 0x55, 0xee, 0x43, 0x95, 0xb2, 0xc1, 0xc6, 0xea, 0xed, 0x62, 0x0e, 0x68, 0xf6, 0x89, + 0x50, 0x1c, 0xad, 0xf2, 0x0c, 0x97, 0x1d, 0x2e, 0xa6, 0xce, 0xe2, 0x8d, 0x2d, 0xe5, 0xcd, 0xbf, + 0x1d, 0x78, 0x77, 0x85, 0xc6, 0xc5, 0x9a, 0x51, 0xcf, 0x6a, 0xc6, 0x3e, 0xbc, 0x13, 0x4b, 0xa9, + 0x06, 0x22, 0x3e, 0x0f, 0x7d, 0xf1, 0x09, 0x9f, 0xd8, 0x90, 0x5a, 0x84, 0xf1, 0x46, 0x10, 0x22, + 0xf5, 0xc4, 0xd3, 0x25, 0xa4, 0x08, 0xb2, 0xef, 0xc2, 0x36, 0x85, 0xc1, 0x69, 0x38, 0x11, 0x3f, + 0x8b, 0xc2, 0x8b, 0x4f, 0x78, 0x24, 0xe9, 0xf6, 0xcb, 0xde, 0xf2, 0x04, 0x7a, 0x32, 0xc8, 0x92, + 0x4b, 0x27, 0x4a, 0x0e, 0x61, 0xdf, 0x81, 0x5a, 0x32, 0xe5, 0xd1, 0x40, 0x28, 0xba, 0xff, 0x46, + 0x6f, 0x2b, 0xf3, 0x80, 0xc6, 0x3d, 0x4b, 0x70, 0x1f, 0x43, 0xcd, 0x60, 0xec, 0x9b, 0x50, 0x41, + 0xd4, 0x7a, 0xbb, 0x55, 0x58, 0xe4, 0xe9, 0x39, 0xf4, 0xc9, 0x84, 0x2b, 0xff, 0xb5, 0x08, 0x4c, + 0xee, 0x5b, 0xd1, 0xfd, 0x9b, 0x03, 0x65, 0x64, 0xb2, 0x1d, 0xa8, 0x22, 0x37, 0xf5, 0x9a, 0x91, + 0x30, 0x28, 0xa2, 0xcc, 0x53, 0x34, 0x5e, 0x7d, 0xf0, 0xd2, 0x65, 0x07, 0xbf, 0x0b, 0x2d, 0x7b, + 0x4c, 0x94, 0x13, 0xe3, 0xa2, 0x22, 0xc8, 0x1e, 0x02, 0x70, 0xa5, 0xe2, 0x70, 0x38, 0x53, 0x02, + 0xdd, 0x83, 0x87, 0xb9, 0x95, 0x1e, 0xc6, 0xbc, 0x2c, 0xe7, 0xf7, 0xba, 0xcf, 0xc4, 0xfc, 0x25, + 0x16, 0x00, 0x2f, 0x47, 0x77, 0xff, 0xe5, 0xd8, 0x7a, 0x69, 0xc2, 0x04, 0xef, 0x3a, 0x8c, 0x92, + 0xa9, 0xf0, 0x95, 0x08, 0x4e, 0x6d, 0x38, 0xe2, 0xc9, 0x17, 0x61, 0xf6, 0x1e, 0x6c, 0xa6, 0x50, + 0x7f, 0x8e, 0x9b, 0xaf, 0x93, 0x7d, 0x0b, 0x28, 0xdb, 0x83, 0x06, 0xe5, 0x1a, 0x95, 0x1a, 0x5b, + 0x1d, 0xf3, 0x10, 0x1e, 0xd4, 0x97, 0x93, 0xe9, 0x58, 0x28, 0x11, 0x3c, 0x95, 0xc3, 0xc4, 0x56, + 0x82, 0x02, 0x88, 0xd5, 0x84, 0x16, 0x11, 0x43, 0x87, 0x41, 0x06, 0xa0, 0xdd, 0x99, 0x4a, 0x6d, + 0x4e, 0x95, 0xcc, 0x59, 0x84, 0xdd, 0x6f, 0xc3, 0xb6, 0x3e, 0x32, 0xd6, 0x4e, 0x5b, 0xfa, 0xb0, + 0x10, 0xfb, 0x72, 0x2a, 0xcc, 0x25, 0x6a, 0xc1, 0x3d, 0xb4, 0x65, 0x52, 0x53, 0x4d, 0xa2, 0x76, + 0x60, 0x43, 0xf1, 0x11, 0x46, 0xb2, 0x0e, 0x9e, 0xba, 0x97, 0xca, 0xee, 0x53, 0xb8, 0x96, 0xad, + 0x78, 0xd9, 0x4b, 0xd7, 0xf4, 0xa0, 0x4a, 0x2a, 0x6d, 0xb8, 0x75, 0x16, 0xb2, 0x54, 0xd3, 0x07, + 0x48, 0xf1, 0x0c, 0xd3, 0x7d, 0x98, 0x37, 0xd4, 0x4c, 0xa6, 0x61, 0xe5, 0xe4, 0xc2, 0x8a, 0x41, + 0x59, 0xe1, 0x1b, 0xb7, 0x4e, 0xc6, 0xd0, 0xd8, 0x7d, 0x0c, 0x3b, 0xe9, 0x62, 0xba, 0xf7, 0x24, + 0xdf, 0x1b, 0x68, 0x73, 0xd3, 0x3c, 0xd7, 0x22, 0x3a, 0x81, 0x9e, 0x73, 0xfb, 0x60, 0x90, 0xe0, + 0x7e, 0x08, 0x37, 0x96, 0x34, 0x99, 0x53, 0xe1, 0x95, 0x58, 0xd0, 0xb8, 0x22, 0x03, 0xdc, 0xfb, + 0xb0, 0x61, 0x97, 0x90, 0x89, 0xf3, 0xd4, 0xbd, 0x34, 0x5e, 0xfd, 0x3e, 0xb9, 0xcf, 0xe1, 0xe6, + 0xc2, 0x76, 0x39, 0x37, 0x1e, 0x2c, 0x6e, 0xd8, 0xe8, 0x6d, 0x67, 0x65, 0xd2, 0xcc, 0xe4, 0x6d, + 0xe8, 0x43, 0x85, 0xc2, 0x95, 0x3d, 0x80, 0xda, 0x90, 0x52, 0xd7, 0xae, 0xbb, 0x93, 0xae, 0xd3, + 0x4d, 0xd9, 0xf9, 0xbd, 0xae, 0x27, 0x12, 0x39, 0x8b, 0x7d, 0x81, 0x79, 0x9d, 0x78, 0x96, 0xef, + 0x6e, 0x42, 0xf3, 0xc5, 0x2c, 0x49, 0x0b, 0xb5, 0xfb, 0x27, 0x07, 0xb6, 0x10, 0xa0, 0x70, 0xb2, + 0x5e, 0x7d, 0x3f, 0xad, 0xde, 0x78, 0x0b, 0xcd, 0xfe, 0x75, 0xec, 0x23, 0xfe, 0xf1, 0xd5, 0x9d, + 0xd6, 0x8b, 0x58, 0xf0, 0xf1, 0x58, 0xfa, 0x9a, 0x6d, 0xcb, 0xf6, 0xb7, 0xa0, 0x14, 0x06, 0x98, + 0x0c, 0x57, 0x70, 0x91, 0xc1, 0x8e, 0x00, 0xf4, 0x53, 0x7b, 0xcc, 0x15, 0x6f, 0x97, 0xaf, 0xe2, + 0xe7, 0x88, 0xee, 0x89, 0x36, 0x51, 0x9f, 0xc4, 0x98, 0xf8, 0x7f, 0xb8, 0xe0, 0x2e, 0x80, 0xe9, + 0xb5, 0x30, 0xa3, 0x77, 0x0a, 0x2f, 0x55, 0xd3, 0x1e, 0xca, 0xfd, 0x01, 0xd4, 0x9f, 0x87, 0xd1, + 0xd9, 0x60, 0x1c, 0xfa, 0x82, 0xdd, 0x83, 0xca, 0x38, 0x8c, 0xce, 0xec, 0x5e, 0xb7, 0x96, 0xf7, + 0xc2, 0x3d, 0xba, 0xb8, 0xc0, 0xd3, 0x4c, 0xf7, 0x33, 0x60, 0x88, 0xd9, 0x17, 0x2b, 0x4b, 0x4d, + 0x1d, 0x95, 0x4e, 0x2e, 0x2a, 0x31, 0x8a, 0x47, 0xb1, 0x9c, 0x4d, 0xfb, 0x36, 0x5a, 0xad, 0x88, + 0xfc, 0x31, 0x75, 0x5a, 0xba, 0xb0, 0x6a, 0xc1, 0xfd, 0xb5, 0x03, 0xef, 0x16, 0x94, 0x67, 0x21, + 0x2c, 0x12, 0x15, 0x4e, 0xb8, 0x12, 0x01, 0xed, 0xb0, 0xe1, 0x65, 0x00, 0x75, 0x30, 0x53, 0x1e, + 0xfd, 0x58, 0xce, 0x22, 0x65, 0xca, 0x5b, 0x06, 0xb0, 0x6e, 0xf6, 0xf6, 0x96, 0xe8, 0x90, 0xd7, + 0x0a, 0x8f, 0xc8, 0xd2, 0xcb, 0xfb, 0x7d, 0x68, 0x7a, 0xfc, 0x17, 0x8f, 0xc3, 0x44, 0xc9, 0x51, + 0xcc, 0x27, 0xe8, 0xc7, 0xe1, 0xcc, 0x3f, 0x13, 0x8a, 0x36, 0x2e, 0x7b, 0x46, 0xc2, 0x13, 0xf8, + 0xb9, 0x1d, 0xb5, 0xe0, 0xfe, 0xc1, 0x81, 0x46, 0x4e, 0x2d, 0xeb, 0xc3, 0xf6, 0x98, 0x2b, 0x11, + 0xf9, 0xf3, 0x9f, 0xbf, 0xb6, 0x2a, 0x8d, 0xb3, 0xaf, 0xa7, 0x76, 0xe4, 0xf7, 0xf3, 0xb6, 0x0c, + 0x3f, 0xb3, 0xa0, 0x0b, 0xd5, 0x44, 0x71, 0x15, 0xfa, 0x4b, 0xcd, 0x03, 0x5d, 0xf7, 0xa7, 0xcf, + 0x07, 0x34, 0xeb, 0x19, 0x16, 0x5a, 0x2c, 0xe2, 0x58, 0xc6, 0x89, 0x71, 0xae, 0x91, 0xdc, 0x67, + 0x70, 0x33, 0x67, 0xda, 0x60, 0x36, 0x99, 0xf0, 0x78, 0xfe, 0x35, 0x2f, 0xd0, 0xfd, 0xab, 0x03, + 0x9d, 0x55, 0xda, 0xb2, 0x1b, 0x2b, 0xde, 0x49, 0x29, 0x7f, 0x27, 0xef, 0xc1, 0x26, 0xd9, 0x34, + 0x48, 0x29, 0x25, 0xa2, 0x2c, 0xa0, 0xd8, 0x2e, 0x4f, 0x1f, 0x3c, 0x30, 0x4f, 0x2a, 0x0e, 0x35, + 0x72, 0x44, 0x2f, 0x0b, 0x21, 0x47, 0x1a, 0x39, 0x34, 0xef, 0x08, 0x0e, 0x09, 0x39, 0x3a, 0xa4, + 0x16, 0x12, 0x91, 0xa3, 0x43, 0xf7, 0xf7, 0x0e, 0xb4, 0x0a, 0xbe, 0x2a, 0x94, 0xba, 0x8a, 0x29, + 0x75, 0x4d, 0x70, 0x22, 0x63, 0xab, 0x13, 0xa1, 0xf4, 0x8a, 0xcc, 0x72, 0x3c, 0xe7, 0x15, 0x4a, + 0xfa, 0xc5, 0xab, 0x7b, 0x4e, 0x82, 0xd2, 0x90, 0x6c, 0xd8, 0xf0, 0x9c, 0x21, 0x4a, 0x81, 0xd9, + 0xdf, 0x09, 0xa8, 0xd5, 0x50, 0x5c, 0xcd, 0x74, 0x0f, 0x5b, 0xf1, 0x8c, 0x84, 0x3b, 0x9e, 0x85, + 0x51, 0x40, 0x5d, 0x6b, 0xc5, 0xa3, 0x71, 0xef, 0xb7, 0x0e, 0x54, 0xb1, 0x02, 0x88, 0x98, 0xfd, + 0x10, 0xea, 0x69, 0xb9, 0x62, 0xd9, 0x97, 0xd5, 0x62, 0x09, 0xeb, 0x5c, 0x2f, 0x4c, 0xa5, 0xe5, + 0x6e, 0x8d, 0xfd, 0x08, 0x1a, 0x29, 0xf9, 0x65, 0xef, 0xeb, 0xa8, 0xe8, 0xfd, 0xd1, 0x81, 0x2d, + 0x73, 0x9f, 0x1f, 0x8b, 0x48, 0xc4, 0x5c, 0xc9, 0xd4, 0x30, 0xaa, 0x35, 0x0b, 0x5a, 0xf3, 0x85, + 0xeb, 0x72, 0xc3, 0x9e, 0x16, 0x33, 0xe2, 0xd6, 0xca, 0xf4, 0x33, 0x4a, 0x6e, 0xaf, 0x9e, 0x4c, + 0x2d, 0xfc, 0x4b, 0x19, 0x6a, 0xf8, 0x59, 0x15, 0x8a, 0x98, 0x3d, 0x86, 0xd6, 0x4f, 0xc2, 0x28, + 0x48, 0x3f, 0x2f, 0xd9, 0x8a, 0xef, 0x51, 0xab, 0xb7, 0xb3, 0x6a, 0x2a, 0xe7, 0xba, 0xa6, 0x6d, + 0xf3, 0x7d, 0x11, 0x29, 0x76, 0xc9, 0xf7, 0x54, 0xe7, 0xc6, 0x12, 0x9e, 0xaa, 0x78, 0x04, 0x8d, + 0xdc, 0xb7, 0x5a, 0xfe, 0x90, 0x4b, 0x5f, 0x70, 0x57, 0xa9, 0xf9, 0x18, 0x20, 0xeb, 0x26, 0xd8, + 0xaa, 0xfe, 0xc3, 0x2a, 0xb9, 0xb5, 0x72, 0x2e, 0x55, 0xf4, 0xcc, 0x1e, 0x49, 0xb7, 0x25, 0x57, + 0xaa, 0xfa, 0xc6, 0xca, 0x36, 0x27, 0xa7, 0xec, 0x25, 0xbc, 0xb3, 0xf0, 0xda, 0xb3, 0x3b, 0xcb, + 0x6b, 0x0a, 0x0d, 0x4c, 0x67, 0xef, 0x72, 0x42, 0xaa, 0xf7, 0xb3, 0x5c, 0xef, 0x64, 0xbb, 0x88, + 0xff, 0xae, 0xd9, 0xbd, 0x8c, 0x90, 0xb7, 0xb9, 0xf7, 0x53, 0xd8, 0x1a, 0xa8, 0x58, 0xf0, 0x49, + 0x18, 0x8d, 0x6c, 0xc4, 0x3c, 0x84, 0xaa, 0xf9, 0x60, 0xfd, 0x5f, 0x6f, 0xf8, 0xd0, 0xe9, 0xb7, + 0xbf, 0x78, 0xb3, 0xeb, 0x7c, 0xf9, 0x66, 0xd7, 0xf9, 0xe7, 0x9b, 0x5d, 0xe7, 0x77, 0x6f, 0x77, + 0xd7, 0xbe, 0x7c, 0xbb, 0xbb, 0xf6, 0xf7, 0xb7, 0xbb, 0x6b, 0xc3, 0x2a, 0xfd, 0xc7, 0xf3, 0xc1, + 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xf1, 0x66, 0x93, 0xaa, 0x64, 0x12, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -8568,7 +8568,7 @@ func (m *TraceQLStatic) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Type |= int64(b&0x7F) << shift + m.Type |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -8669,7 +8669,7 @@ func (m *TraceQLStatic) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.D |= uint32(b&0x7F) << shift + m.D |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -8688,7 +8688,7 @@ func (m *TraceQLStatic) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Status |= int64(b&0x7F) << shift + m.Status |= int32(b&0x7F) << shift if b < 0x80 { break } @@ -8707,7 +8707,7 @@ func (m *TraceQLStatic) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Kind |= int64(b&0x7F) << shift + m.Kind |= int32(b&0x7F) << shift if b < 0x80 { break } diff --git a/pkg/tempopb/tempo.proto b/pkg/tempopb/tempo.proto index 97954f8fdf4..301fa18408f 100644 --- a/pkg/tempopb/tempo.proto +++ b/pkg/tempopb/tempo.proto @@ -222,13 +222,13 @@ message SpanMetricsSummaryResponse { } message TraceQLStatic { - int8 type = 1; + int32 type = 1; int64 n = 2; double f = 3; string s = 4; bool b = 5; uint64 d = 6; - int8 status = 7; - int8 kind = 8; + int32 status = 7; + int32 kind = 8; } From 90d44ab32ca5d17974515c4df1411ea457740a4e Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Thu, 11 May 2023 16:26:24 +0000 Subject: [PATCH 20/31] Adjust estimated for spanlimit unset --- pkg/traceqlmetrics/metrics.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/traceqlmetrics/metrics.go b/pkg/traceqlmetrics/metrics.go index 8b6c37819fa..84f718d508b 100644 --- a/pkg/traceqlmetrics/metrics.go +++ b/pkg/traceqlmetrics/metrics.go @@ -210,8 +210,8 @@ func GetMetrics(ctx context.Context, query string, groupBy string, spanLimit int } } - // The results are estimated if we bailed early due to limit being reached. - series.Estimated = spanCount >= spanLimit + // The results are estimated if we bailed early due to limit being reached, but only if spanLimit has been set. + series.Estimated = spanCount >= spanLimit && spanLimit > 0 series.SpanCount = spanCount return series, nil } From b6fbaafb8fcb5a45c4165ea9da7c545be771bd7f Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Thu, 11 May 2023 20:11:52 +0000 Subject: [PATCH 21/31] Add error count to metrics --- .../generator/processor/localblocks/processor.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/modules/generator/processor/localblocks/processor.go b/modules/generator/processor/localblocks/processor.go index c06d5dcc8f1..d304c484c9b 100644 --- a/modules/generator/processor/localblocks/processor.go +++ b/modules/generator/processor/localblocks/processor.go @@ -265,9 +265,8 @@ func (p *Processor) GetMetrics(ctx context.Context, req *tempopb.SpanMetricsRequ } var rawHistorgram *tempopb.RawHistogram + var errCount int for static, series := range m.Series { - toStaticProto(static) - h := []*tempopb.RawHistogram{} for bucket, count := range series.Buckets() { @@ -281,12 +280,16 @@ func (p *Processor) GetMetrics(ctx context.Context, req *tempopb.SpanMetricsRequ } } - xxx := &tempopb.SpanMetrics{ - LatencyHistogram: h, - Static: toStaticProto(static), + errCount = 0 + if errs, ok := m.Errors[static]; ok { + errCount = errs } - resp.Metrics = append(resp.Metrics, xxx) + resp.Metrics = append(resp.Metrics, &tempopb.SpanMetrics{ + LatencyHistogram: h, + Static: toStaticProto(static), + Errors: uint64(errCount), + }) } return resp, nil From 0801ca756453c17af2162824fa9ab9666e1944fb Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Thu, 11 May 2023 20:18:15 +0000 Subject: [PATCH 22/31] Include doc --- pkg/traceqlmetrics/metrics.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/traceqlmetrics/metrics.go b/pkg/traceqlmetrics/metrics.go index 84f718d508b..fe7596e3be3 100644 --- a/pkg/traceqlmetrics/metrics.go +++ b/pkg/traceqlmetrics/metrics.go @@ -70,6 +70,7 @@ func (m *latencyHistogram) Percentile(p float32) uint64 { return uint64(dur) } +// Buckets returns the bucket counts for each power of 2. func (m *latencyHistogram) Buckets() [64]int { return m.buckets } From e6de31f918c51f8a8264d2a81b572551b79d635f Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Thu, 11 May 2023 20:25:40 +0000 Subject: [PATCH 23/31] Avoid creating a generator instance --- modules/generator/generator.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/generator/generator.go b/modules/generator/generator.go index fe6abb1ab43..a7700261dd1 100644 --- a/modules/generator/generator.go +++ b/modules/generator/generator.go @@ -198,9 +198,10 @@ func (g *Generator) PushSpans(ctx context.Context, req *tempopb.PushSpansRequest } span.SetTag("instanceID", instanceID) - instance, err := g.getOrCreateInstance(instanceID) - if err != nil { - return nil, err + // return empty if we don't have an instance + instance, ok := g.getInstanceByID(instanceID) + if !ok || instance == nil { + return &tempopb.PushResponse{}, nil } instance.pushSpans(ctx, req) From 9946301ad9e025d5018a751eaecc9a70c0faa8fb Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Thu, 11 May 2023 20:37:01 +0000 Subject: [PATCH 24/31] Reintroduce query timeout --- modules/generator/config.go | 2 ++ modules/generator/http.go | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/generator/config.go b/modules/generator/config.go index 4829be7bfef..6d2754a7b44 100644 --- a/modules/generator/config.go +++ b/modules/generator/config.go @@ -33,6 +33,7 @@ type Config struct { // MetricsIngestionSlack is the max amount of time passed since a span's start time // for the span to be considered in metrics generation MetricsIngestionSlack time.Duration `yaml:"metrics_ingestion_time_range_slack"` + QueryTimeout time.Duration `yaml:"query_timeout"` } // RegisterFlagsAndApplyDefaults registers the flags. @@ -45,6 +46,7 @@ func (cfg *Config) RegisterFlagsAndApplyDefaults(prefix string, f *flag.FlagSet) // setting default for max span age before discarding to 30s cfg.MetricsIngestionSlack = 30 * time.Second + cfg.QueryTimeout = 30 * time.Second } type ProcessorConfig struct { diff --git a/modules/generator/http.go b/modules/generator/http.go index c3761f399b3..e8b1349c2ae 100644 --- a/modules/generator/http.go +++ b/modules/generator/http.go @@ -1,7 +1,9 @@ package generator import ( + "context" "net/http" + "time" "github.com/gogo/protobuf/jsonpb" "github.com/grafana/tempo/pkg/api" @@ -10,7 +12,10 @@ import ( ) func (g *Generator) SpanSummaryHandler(w http.ResponseWriter, r *http.Request) { - span, ctx := opentracing.StartSpanFromContext(r.Context(), "Generator.SpanSummaryHandler") + ctx, cancel := context.WithDeadline(r.Context(), time.Now().Add(g.cfg.QueryTimeout)) + defer cancel() + + span, ctx := opentracing.StartSpanFromContext(ctx, "Generator.SpanSummaryHandler") defer span.Finish() span.SetTag("requestURI", r.RequestURI) From 9c036cb2eb48c54667b50af8f8c7e0d41e36172f Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Fri, 12 May 2023 15:40:38 +0000 Subject: [PATCH 25/31] Fix instance creation --- modules/generator/generator.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/generator/generator.go b/modules/generator/generator.go index a7700261dd1..3fcb557fb19 100644 --- a/modules/generator/generator.go +++ b/modules/generator/generator.go @@ -198,9 +198,8 @@ func (g *Generator) PushSpans(ctx context.Context, req *tempopb.PushSpansRequest } span.SetTag("instanceID", instanceID) - // return empty if we don't have an instance - instance, ok := g.getInstanceByID(instanceID) - if !ok || instance == nil { + instance, err := g.getOrCreateInstance(instanceID) + if err != nil { return &tempopb.PushResponse{}, nil } @@ -330,8 +329,9 @@ func (g *Generator) SpanMetrics(ctx context.Context, req *tempopb.SpanMetricsReq return nil, err } - instance, err := g.getOrCreateInstance(instanceID) - if err != nil { + // return empty if we don't have an instance + instance, ok := g.getInstanceByID(instanceID) + if !ok || instance == nil { return nil, err } From 07a5a1b131ad500c7a52f3451fd25377d65f535a Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Fri, 12 May 2023 15:42:22 +0000 Subject: [PATCH 26/31] Adjust API path --- pkg/api/http.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/api/http.go b/pkg/api/http.go index b4d7577441b..77884091c01 100644 --- a/pkg/api/http.go +++ b/pkg/api/http.go @@ -66,7 +66,7 @@ const ( PathSearchTagValues = "/api/search/tag/{" + muxVarTagName + "}/values" PathEcho = "/api/echo" PathUsageStats = "/status/usage-stats" - PathSpanMetrics = "/api/span-metrics" + PathSpanMetrics = "/api/metrics" PathSearchTagValuesV2 = "/api/v2/search/tag/{" + muxVarTagName + "}/values" PathSearchTagsV2 = "/api/v2/search/tags" From 1a34efa2eb5552c9d530ffac5927ea6a92dcf238 Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Fri, 12 May 2023 15:44:20 +0000 Subject: [PATCH 27/31] Rename handler --- cmd/tempo/app/modules.go | 2 +- modules/generator/http.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/tempo/app/modules.go b/cmd/tempo/app/modules.go index b883d1c0993..e8e891a7965 100644 --- a/cmd/tempo/app/modules.go +++ b/cmd/tempo/app/modules.go @@ -212,7 +212,7 @@ func (t *App) initGenerator() (services.Service, error) { } t.generator = genSvc - spanStatsHandler := t.HTTPAuthMiddleware.Wrap(http.HandlerFunc(t.generator.SpanSummaryHandler)) + spanStatsHandler := t.HTTPAuthMiddleware.Wrap(http.HandlerFunc(t.generator.SpanMetricsHandler)) t.Server.HTTP.Handle(path.Join(api.PathPrefixGenerator, addHTTPAPIPrefix(&t.cfg, api.PathSpanMetrics)), spanStatsHandler) tempopb.RegisterMetricsGeneratorServer(t.Server.GRPC, t.generator) diff --git a/modules/generator/http.go b/modules/generator/http.go index e8b1349c2ae..67694cfbade 100644 --- a/modules/generator/http.go +++ b/modules/generator/http.go @@ -11,11 +11,11 @@ import ( "github.com/opentracing/opentracing-go" ) -func (g *Generator) SpanSummaryHandler(w http.ResponseWriter, r *http.Request) { +func (g *Generator) SpanMetricsHandler(w http.ResponseWriter, r *http.Request) { ctx, cancel := context.WithDeadline(r.Context(), time.Now().Add(g.cfg.QueryTimeout)) defer cancel() - span, ctx := opentracing.StartSpanFromContext(ctx, "Generator.SpanSummaryHandler") + span, ctx := opentracing.StartSpanFromContext(ctx, "Generator.SpanMetricsHandler") defer span.Finish() span.SetTag("requestURI", r.RequestURI) From 9fb409a4853c7b50d4fcdd575abe6241e5f9365e Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Fri, 12 May 2023 15:47:41 +0000 Subject: [PATCH 28/31] Align function names --- modules/generator/generator.go | 4 ++-- modules/generator/http.go | 2 +- modules/generator/instance.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/generator/generator.go b/modules/generator/generator.go index 3fcb557fb19..61862cd0c11 100644 --- a/modules/generator/generator.go +++ b/modules/generator/generator.go @@ -323,7 +323,7 @@ func (g *Generator) OnRingInstanceStopping(lifecycler *ring.BasicLifecycler) { func (g *Generator) OnRingInstanceHeartbeat(lifecycler *ring.BasicLifecycler, ringDesc *ring.Desc, instanceDesc *ring.InstanceDesc) { } -func (g *Generator) SpanMetrics(ctx context.Context, req *tempopb.SpanMetricsRequest) (*tempopb.SpanMetricsResponse, error) { +func (g *Generator) GetMetrics(ctx context.Context, req *tempopb.SpanMetricsRequest) (*tempopb.SpanMetricsResponse, error) { instanceID, err := user.ExtractOrgID(ctx) if err != nil { return nil, err @@ -335,5 +335,5 @@ func (g *Generator) SpanMetrics(ctx context.Context, req *tempopb.SpanMetricsReq return nil, err } - return instance.spanMetricsFromLocalBlocks(ctx, req) + return instance.GetMetrics(ctx, req) } diff --git a/modules/generator/http.go b/modules/generator/http.go index 67694cfbade..6b4a5609736 100644 --- a/modules/generator/http.go +++ b/modules/generator/http.go @@ -27,7 +27,7 @@ func (g *Generator) SpanMetricsHandler(w http.ResponseWriter, r *http.Request) { } var resp *tempopb.SpanMetricsResponse - resp, err = g.SpanMetrics(ctx, req) + resp, err = g.GetMetrics(ctx, req) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return diff --git a/modules/generator/instance.go b/modules/generator/instance.go index 6c04c675f0d..f964b941e38 100644 --- a/modules/generator/instance.go +++ b/modules/generator/instance.go @@ -364,7 +364,7 @@ func (i *instance) preprocessSpans(req *tempopb.PushSpansRequest) { i.updatePushMetrics(size, spanCount, expiredSpanCount) } -func (i *instance) spanMetricsFromLocalBlocks(ctx context.Context, req *tempopb.SpanMetricsRequest) (resp *tempopb.SpanMetricsResponse, err error) { +func (i *instance) GetMetrics(ctx context.Context, req *tempopb.SpanMetricsRequest) (resp *tempopb.SpanMetricsResponse, err error) { for _, processor := range i.processors { switch p := processor.(type) { case *localblocks.Processor: From 1e4a3bd5b22a751f0aaa595a786377c62a266ebd Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Fri, 12 May 2023 15:49:28 +0000 Subject: [PATCH 29/31] Update proto for interface rename --- pkg/tempopb/tempo.pb.go | 247 ++++++++++++++++++++-------------------- pkg/tempopb/tempo.proto | 2 +- 2 files changed, 125 insertions(+), 124 deletions(-) diff --git a/pkg/tempopb/tempo.pb.go b/pkg/tempopb/tempo.pb.go index 89a0b5dd6ea..53f56e6693b 100644 --- a/pkg/tempopb/tempo.pb.go +++ b/pkg/tempopb/tempo.pb.go @@ -1900,117 +1900,118 @@ func init() { func init() { proto.RegisterFile("pkg/tempopb/tempo.proto", fileDescriptor_f22805646f4f62b6) } var fileDescriptor_f22805646f4f62b6 = []byte{ - // 1758 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0xcd, 0x73, 0x1b, 0x49, - 0x15, 0xf7, 0x58, 0x5f, 0xd6, 0x93, 0xe4, 0xb5, 0x7b, 0x13, 0x47, 0x51, 0x82, 0xe3, 0x1a, 0x52, - 0x8b, 0xa1, 0x58, 0xd9, 0xd1, 0xc6, 0xb5, 0x64, 0x43, 0x41, 0x21, 0x1c, 0x36, 0x5f, 0x5e, 0xb2, - 0x23, 0x93, 0xc3, 0x5e, 0xa8, 0xd6, 0x4c, 0x47, 0x99, 0xb2, 0x34, 0xad, 0x9d, 0x69, 0x19, 0x8b, - 0x13, 0x5c, 0x38, 0x71, 0xe0, 0xc2, 0x81, 0x13, 0x45, 0x15, 0x55, 0x54, 0xf1, 0x6f, 0x70, 0xd9, - 0xe3, 0x1e, 0x29, 0x0e, 0x5b, 0x54, 0xf2, 0x17, 0x70, 0xe4, 0x46, 0xbd, 0xd7, 0xdd, 0xf3, 0x21, - 0xc9, 0xa6, 0x58, 0x4e, 0xea, 0xf7, 0xeb, 0x5f, 0xbf, 0x7e, 0xfd, 0xfa, 0xbd, 0xd7, 0x6f, 0x04, - 0x37, 0xa6, 0x67, 0xa3, 0x03, 0x25, 0x26, 0x53, 0x39, 0x1d, 0xea, 0xdf, 0xee, 0x34, 0x96, 0x4a, - 0xb2, 0x9a, 0x01, 0x3b, 0xd7, 0x54, 0xcc, 0x7d, 0x71, 0x70, 0x7e, 0xef, 0x80, 0x06, 0x7a, 0xba, - 0xb3, 0xe3, 0xcb, 0xc9, 0x44, 0x46, 0x08, 0xeb, 0x91, 0xc1, 0xdf, 0x1f, 0x85, 0xea, 0xf5, 0x6c, - 0xd8, 0xf5, 0xe5, 0xe4, 0x60, 0x24, 0x47, 0xf2, 0x80, 0xe0, 0xe1, 0xec, 0x15, 0x49, 0x24, 0xd0, - 0x48, 0xd3, 0xdd, 0xdf, 0x38, 0xb0, 0x75, 0x8a, 0x6a, 0xfb, 0xf3, 0x27, 0xc7, 0x9e, 0xf8, 0x7c, - 0x26, 0x12, 0xc5, 0xda, 0x50, 0xa3, 0xad, 0x9e, 0x1c, 0xb7, 0x9d, 0x3d, 0x67, 0xbf, 0xe9, 0x59, - 0x91, 0xed, 0x02, 0x0c, 0xc7, 0xd2, 0x3f, 0x1b, 0x28, 0x1e, 0xab, 0xf6, 0xfa, 0x9e, 0xb3, 0x5f, - 0xf7, 0x72, 0x08, 0xeb, 0xc0, 0x06, 0x49, 0x8f, 0xa2, 0xa0, 0x5d, 0xa2, 0xd9, 0x54, 0x66, 0xb7, - 0xa1, 0xfe, 0xf9, 0x4c, 0xc4, 0xf3, 0x13, 0x19, 0x88, 0x76, 0x85, 0x26, 0x33, 0xc0, 0x8d, 0x60, - 0x3b, 0x67, 0x47, 0x32, 0x95, 0x51, 0x22, 0xd8, 0x5d, 0xa8, 0xd0, 0xce, 0x64, 0x46, 0xa3, 0xb7, - 0xd9, 0x35, 0x3e, 0xe9, 0x12, 0xd5, 0xd3, 0x93, 0xec, 0x03, 0xa8, 0x4d, 0x84, 0x8a, 0x43, 0x3f, - 0x21, 0x8b, 0x1a, 0xbd, 0x9b, 0x45, 0x1e, 0xaa, 0x3c, 0xd1, 0x04, 0xcf, 0x32, 0x5d, 0x96, 0x3b, - 0xb7, 0x99, 0x74, 0xff, 0xbc, 0x0e, 0xad, 0x81, 0xe0, 0xb1, 0xff, 0xda, 0x7a, 0xe2, 0x23, 0x28, - 0x9f, 0xf2, 0x51, 0xd2, 0x76, 0xf6, 0x4a, 0xfb, 0x8d, 0xde, 0x5e, 0xaa, 0xb7, 0xc0, 0xea, 0x22, - 0xe5, 0x51, 0xa4, 0xe2, 0x79, 0xbf, 0xfc, 0xc5, 0x57, 0x77, 0xd6, 0x3c, 0x5a, 0xc3, 0xee, 0x42, - 0xeb, 0x24, 0x8c, 0x8e, 0x67, 0x31, 0x57, 0xa1, 0x8c, 0x4e, 0xb4, 0x71, 0x2d, 0xaf, 0x08, 0x12, - 0x8b, 0x5f, 0xe4, 0x58, 0x25, 0xc3, 0xca, 0x83, 0xec, 0x1a, 0x54, 0x9e, 0x87, 0x93, 0x50, 0xb5, - 0xcb, 0x34, 0xab, 0x05, 0x44, 0x13, 0xba, 0x88, 0x8a, 0x46, 0x49, 0x60, 0x5b, 0x50, 0x12, 0x51, - 0xd0, 0xae, 0x12, 0x86, 0x43, 0xe4, 0x7d, 0x8a, 0x8e, 0x6e, 0x6f, 0x90, 0xd7, 0xb5, 0xd0, 0xf9, - 0x10, 0xea, 0xa9, 0xe1, 0xb8, 0xe8, 0x4c, 0xcc, 0xc9, 0xcf, 0x75, 0x0f, 0x87, 0xb8, 0xe8, 0x9c, - 0x8f, 0x67, 0xc2, 0xdc, 0xb2, 0x16, 0x3e, 0x5a, 0xff, 0x9e, 0xe3, 0xfe, 0xaa, 0x04, 0x4c, 0x3b, - 0xa0, 0x8f, 0x77, 0x6b, 0x7d, 0x75, 0x1f, 0xea, 0x89, 0x75, 0x8b, 0xb9, 0xb0, 0x9d, 0xd5, 0x0e, - 0xf3, 0x32, 0x22, 0xc6, 0x1a, 0x45, 0xc8, 0x93, 0x63, 0xb3, 0x91, 0x15, 0x31, 0x5e, 0xe8, 0x40, - 0x2f, 0xf8, 0x48, 0x18, 0xaf, 0x64, 0x00, 0xfa, 0x6d, 0xca, 0x47, 0x22, 0x39, 0x95, 0x5a, 0xb5, - 0xf1, 0x4c, 0x11, 0xc4, 0x78, 0x14, 0x91, 0x2f, 0x83, 0x30, 0x1a, 0x99, 0x90, 0x4b, 0x65, 0xd4, - 0x10, 0x46, 0x81, 0xb8, 0x40, 0x75, 0x83, 0xf0, 0x97, 0xc2, 0x78, 0xac, 0x08, 0x32, 0x17, 0x9a, - 0x4a, 0x2a, 0x3e, 0xf6, 0x84, 0x2f, 0xe3, 0x20, 0x69, 0xd7, 0x88, 0x54, 0xc0, 0x90, 0x13, 0x70, - 0xc5, 0x1f, 0xd9, 0x9d, 0xb4, 0x9b, 0x0b, 0x18, 0x9e, 0xf3, 0x5c, 0xc4, 0x49, 0x28, 0xa3, 0x76, - 0x5d, 0x9f, 0xd3, 0x88, 0x8c, 0x41, 0x39, 0xc1, 0xed, 0x61, 0xcf, 0xd9, 0x2f, 0x7b, 0x34, 0xc6, - 0x3c, 0x7b, 0x25, 0xa5, 0x12, 0x31, 0x19, 0xd6, 0xa0, 0x3d, 0x73, 0x88, 0x7b, 0x01, 0x9b, 0xd6, - 0xa3, 0x26, 0x55, 0xee, 0x43, 0x95, 0xb2, 0xc1, 0xc6, 0xea, 0xed, 0x62, 0x0e, 0x68, 0xf6, 0x89, - 0x50, 0x1c, 0xad, 0xf2, 0x0c, 0x97, 0x1d, 0x2e, 0xa6, 0xce, 0xe2, 0x8d, 0x2d, 0xe5, 0xcd, 0xbf, - 0x1d, 0x78, 0x77, 0x85, 0xc6, 0xc5, 0x9a, 0x51, 0xcf, 0x6a, 0xc6, 0x3e, 0xbc, 0x13, 0x4b, 0xa9, - 0x06, 0x22, 0x3e, 0x0f, 0x7d, 0xf1, 0x09, 0x9f, 0xd8, 0x90, 0x5a, 0x84, 0xf1, 0x46, 0x10, 0x22, - 0xf5, 0xc4, 0xd3, 0x25, 0xa4, 0x08, 0xb2, 0xef, 0xc2, 0x36, 0x85, 0xc1, 0x69, 0x38, 0x11, 0x3f, - 0x8b, 0xc2, 0x8b, 0x4f, 0x78, 0x24, 0xe9, 0xf6, 0xcb, 0xde, 0xf2, 0x04, 0x7a, 0x32, 0xc8, 0x92, - 0x4b, 0x27, 0x4a, 0x0e, 0x61, 0xdf, 0x81, 0x5a, 0x32, 0xe5, 0xd1, 0x40, 0x28, 0xba, 0xff, 0x46, - 0x6f, 0x2b, 0xf3, 0x80, 0xc6, 0x3d, 0x4b, 0x70, 0x1f, 0x43, 0xcd, 0x60, 0xec, 0x9b, 0x50, 0x41, - 0xd4, 0x7a, 0xbb, 0x55, 0x58, 0xe4, 0xe9, 0x39, 0xf4, 0xc9, 0x84, 0x2b, 0xff, 0xb5, 0x08, 0x4c, - 0xee, 0x5b, 0xd1, 0xfd, 0x9b, 0x03, 0x65, 0x64, 0xb2, 0x1d, 0xa8, 0x22, 0x37, 0xf5, 0x9a, 0x91, - 0x30, 0x28, 0xa2, 0xcc, 0x53, 0x34, 0x5e, 0x7d, 0xf0, 0xd2, 0x65, 0x07, 0xbf, 0x0b, 0x2d, 0x7b, - 0x4c, 0x94, 0x13, 0xe3, 0xa2, 0x22, 0xc8, 0x1e, 0x02, 0x70, 0xa5, 0xe2, 0x70, 0x38, 0x53, 0x02, - 0xdd, 0x83, 0x87, 0xb9, 0x95, 0x1e, 0xc6, 0xbc, 0x2c, 0xe7, 0xf7, 0xba, 0xcf, 0xc4, 0xfc, 0x25, - 0x16, 0x00, 0x2f, 0x47, 0x77, 0xff, 0xe5, 0xd8, 0x7a, 0x69, 0xc2, 0x04, 0xef, 0x3a, 0x8c, 0x92, - 0xa9, 0xf0, 0x95, 0x08, 0x4e, 0x6d, 0x38, 0xe2, 0xc9, 0x17, 0x61, 0xf6, 0x1e, 0x6c, 0xa6, 0x50, - 0x7f, 0x8e, 0x9b, 0xaf, 0x93, 0x7d, 0x0b, 0x28, 0xdb, 0x83, 0x06, 0xe5, 0x1a, 0x95, 0x1a, 0x5b, - 0x1d, 0xf3, 0x10, 0x1e, 0xd4, 0x97, 0x93, 0xe9, 0x58, 0x28, 0x11, 0x3c, 0x95, 0xc3, 0xc4, 0x56, - 0x82, 0x02, 0x88, 0xd5, 0x84, 0x16, 0x11, 0x43, 0x87, 0x41, 0x06, 0xa0, 0xdd, 0x99, 0x4a, 0x6d, - 0x4e, 0x95, 0xcc, 0x59, 0x84, 0xdd, 0x6f, 0xc3, 0xb6, 0x3e, 0x32, 0xd6, 0x4e, 0x5b, 0xfa, 0xb0, - 0x10, 0xfb, 0x72, 0x2a, 0xcc, 0x25, 0x6a, 0xc1, 0x3d, 0xb4, 0x65, 0x52, 0x53, 0x4d, 0xa2, 0x76, - 0x60, 0x43, 0xf1, 0x11, 0x46, 0xb2, 0x0e, 0x9e, 0xba, 0x97, 0xca, 0xee, 0x53, 0xb8, 0x96, 0xad, - 0x78, 0xd9, 0x4b, 0xd7, 0xf4, 0xa0, 0x4a, 0x2a, 0x6d, 0xb8, 0x75, 0x16, 0xb2, 0x54, 0xd3, 0x07, - 0x48, 0xf1, 0x0c, 0xd3, 0x7d, 0x98, 0x37, 0xd4, 0x4c, 0xa6, 0x61, 0xe5, 0xe4, 0xc2, 0x8a, 0x41, - 0x59, 0xe1, 0x1b, 0xb7, 0x4e, 0xc6, 0xd0, 0xd8, 0x7d, 0x0c, 0x3b, 0xe9, 0x62, 0xba, 0xf7, 0x24, - 0xdf, 0x1b, 0x68, 0x73, 0xd3, 0x3c, 0xd7, 0x22, 0x3a, 0x81, 0x9e, 0x73, 0xfb, 0x60, 0x90, 0xe0, - 0x7e, 0x08, 0x37, 0x96, 0x34, 0x99, 0x53, 0xe1, 0x95, 0x58, 0xd0, 0xb8, 0x22, 0x03, 0xdc, 0xfb, - 0xb0, 0x61, 0x97, 0x90, 0x89, 0xf3, 0xd4, 0xbd, 0x34, 0x5e, 0xfd, 0x3e, 0xb9, 0xcf, 0xe1, 0xe6, - 0xc2, 0x76, 0x39, 0x37, 0x1e, 0x2c, 0x6e, 0xd8, 0xe8, 0x6d, 0x67, 0x65, 0xd2, 0xcc, 0xe4, 0x6d, - 0xe8, 0x43, 0x85, 0xc2, 0x95, 0x3d, 0x80, 0xda, 0x90, 0x52, 0xd7, 0xae, 0xbb, 0x93, 0xae, 0xd3, - 0x4d, 0xd9, 0xf9, 0xbd, 0xae, 0x27, 0x12, 0x39, 0x8b, 0x7d, 0x81, 0x79, 0x9d, 0x78, 0x96, 0xef, - 0x6e, 0x42, 0xf3, 0xc5, 0x2c, 0x49, 0x0b, 0xb5, 0xfb, 0x27, 0x07, 0xb6, 0x10, 0xa0, 0x70, 0xb2, - 0x5e, 0x7d, 0x3f, 0xad, 0xde, 0x78, 0x0b, 0xcd, 0xfe, 0x75, 0xec, 0x23, 0xfe, 0xf1, 0xd5, 0x9d, - 0xd6, 0x8b, 0x58, 0xf0, 0xf1, 0x58, 0xfa, 0x9a, 0x6d, 0xcb, 0xf6, 0xb7, 0xa0, 0x14, 0x06, 0x98, - 0x0c, 0x57, 0x70, 0x91, 0xc1, 0x8e, 0x00, 0xf4, 0x53, 0x7b, 0xcc, 0x15, 0x6f, 0x97, 0xaf, 0xe2, - 0xe7, 0x88, 0xee, 0x89, 0x36, 0x51, 0x9f, 0xc4, 0x98, 0xf8, 0x7f, 0xb8, 0xe0, 0x2e, 0x80, 0xe9, - 0xb5, 0x30, 0xa3, 0x77, 0x0a, 0x2f, 0x55, 0xd3, 0x1e, 0xca, 0xfd, 0x01, 0xd4, 0x9f, 0x87, 0xd1, - 0xd9, 0x60, 0x1c, 0xfa, 0x82, 0xdd, 0x83, 0xca, 0x38, 0x8c, 0xce, 0xec, 0x5e, 0xb7, 0x96, 0xf7, - 0xc2, 0x3d, 0xba, 0xb8, 0xc0, 0xd3, 0x4c, 0xf7, 0x33, 0x60, 0x88, 0xd9, 0x17, 0x2b, 0x4b, 0x4d, - 0x1d, 0x95, 0x4e, 0x2e, 0x2a, 0x31, 0x8a, 0x47, 0xb1, 0x9c, 0x4d, 0xfb, 0x36, 0x5a, 0xad, 0x88, - 0xfc, 0x31, 0x75, 0x5a, 0xba, 0xb0, 0x6a, 0xc1, 0xfd, 0xb5, 0x03, 0xef, 0x16, 0x94, 0x67, 0x21, - 0x2c, 0x12, 0x15, 0x4e, 0xb8, 0x12, 0x01, 0xed, 0xb0, 0xe1, 0x65, 0x00, 0x75, 0x30, 0x53, 0x1e, - 0xfd, 0x58, 0xce, 0x22, 0x65, 0xca, 0x5b, 0x06, 0xb0, 0x6e, 0xf6, 0xf6, 0x96, 0xe8, 0x90, 0xd7, - 0x0a, 0x8f, 0xc8, 0xd2, 0xcb, 0xfb, 0x7d, 0x68, 0x7a, 0xfc, 0x17, 0x8f, 0xc3, 0x44, 0xc9, 0x51, - 0xcc, 0x27, 0xe8, 0xc7, 0xe1, 0xcc, 0x3f, 0x13, 0x8a, 0x36, 0x2e, 0x7b, 0x46, 0xc2, 0x13, 0xf8, - 0xb9, 0x1d, 0xb5, 0xe0, 0xfe, 0xc1, 0x81, 0x46, 0x4e, 0x2d, 0xeb, 0xc3, 0xf6, 0x98, 0x2b, 0x11, - 0xf9, 0xf3, 0x9f, 0xbf, 0xb6, 0x2a, 0x8d, 0xb3, 0xaf, 0xa7, 0x76, 0xe4, 0xf7, 0xf3, 0xb6, 0x0c, - 0x3f, 0xb3, 0xa0, 0x0b, 0xd5, 0x44, 0x71, 0x15, 0xfa, 0x4b, 0xcd, 0x03, 0x5d, 0xf7, 0xa7, 0xcf, - 0x07, 0x34, 0xeb, 0x19, 0x16, 0x5a, 0x2c, 0xe2, 0x58, 0xc6, 0x89, 0x71, 0xae, 0x91, 0xdc, 0x67, - 0x70, 0x33, 0x67, 0xda, 0x60, 0x36, 0x99, 0xf0, 0x78, 0xfe, 0x35, 0x2f, 0xd0, 0xfd, 0xab, 0x03, - 0x9d, 0x55, 0xda, 0xb2, 0x1b, 0x2b, 0xde, 0x49, 0x29, 0x7f, 0x27, 0xef, 0xc1, 0x26, 0xd9, 0x34, - 0x48, 0x29, 0x25, 0xa2, 0x2c, 0xa0, 0xd8, 0x2e, 0x4f, 0x1f, 0x3c, 0x30, 0x4f, 0x2a, 0x0e, 0x35, - 0x72, 0x44, 0x2f, 0x0b, 0x21, 0x47, 0x1a, 0x39, 0x34, 0xef, 0x08, 0x0e, 0x09, 0x39, 0x3a, 0xa4, - 0x16, 0x12, 0x91, 0xa3, 0x43, 0xf7, 0xf7, 0x0e, 0xb4, 0x0a, 0xbe, 0x2a, 0x94, 0xba, 0x8a, 0x29, - 0x75, 0x4d, 0x70, 0x22, 0x63, 0xab, 0x13, 0xa1, 0xf4, 0x8a, 0xcc, 0x72, 0x3c, 0xe7, 0x15, 0x4a, - 0xfa, 0xc5, 0xab, 0x7b, 0x4e, 0x82, 0xd2, 0x90, 0x6c, 0xd8, 0xf0, 0x9c, 0x21, 0x4a, 0x81, 0xd9, - 0xdf, 0x09, 0xa8, 0xd5, 0x50, 0x5c, 0xcd, 0x74, 0x0f, 0x5b, 0xf1, 0x8c, 0x84, 0x3b, 0x9e, 0x85, - 0x51, 0x40, 0x5d, 0x6b, 0xc5, 0xa3, 0x71, 0xef, 0xb7, 0x0e, 0x54, 0xb1, 0x02, 0x88, 0x98, 0xfd, - 0x10, 0xea, 0x69, 0xb9, 0x62, 0xd9, 0x97, 0xd5, 0x62, 0x09, 0xeb, 0x5c, 0x2f, 0x4c, 0xa5, 0xe5, - 0x6e, 0x8d, 0xfd, 0x08, 0x1a, 0x29, 0xf9, 0x65, 0xef, 0xeb, 0xa8, 0xe8, 0xfd, 0xd1, 0x81, 0x2d, - 0x73, 0x9f, 0x1f, 0x8b, 0x48, 0xc4, 0x5c, 0xc9, 0xd4, 0x30, 0xaa, 0x35, 0x0b, 0x5a, 0xf3, 0x85, - 0xeb, 0x72, 0xc3, 0x9e, 0x16, 0x33, 0xe2, 0xd6, 0xca, 0xf4, 0x33, 0x4a, 0x6e, 0xaf, 0x9e, 0x4c, - 0x2d, 0xfc, 0x4b, 0x19, 0x6a, 0xf8, 0x59, 0x15, 0x8a, 0x98, 0x3d, 0x86, 0xd6, 0x4f, 0xc2, 0x28, - 0x48, 0x3f, 0x2f, 0xd9, 0x8a, 0xef, 0x51, 0xab, 0xb7, 0xb3, 0x6a, 0x2a, 0xe7, 0xba, 0xa6, 0x6d, - 0xf3, 0x7d, 0x11, 0x29, 0x76, 0xc9, 0xf7, 0x54, 0xe7, 0xc6, 0x12, 0x9e, 0xaa, 0x78, 0x04, 0x8d, - 0xdc, 0xb7, 0x5a, 0xfe, 0x90, 0x4b, 0x5f, 0x70, 0x57, 0xa9, 0xf9, 0x18, 0x20, 0xeb, 0x26, 0xd8, - 0xaa, 0xfe, 0xc3, 0x2a, 0xb9, 0xb5, 0x72, 0x2e, 0x55, 0xf4, 0xcc, 0x1e, 0x49, 0xb7, 0x25, 0x57, - 0xaa, 0xfa, 0xc6, 0xca, 0x36, 0x27, 0xa7, 0xec, 0x25, 0xbc, 0xb3, 0xf0, 0xda, 0xb3, 0x3b, 0xcb, - 0x6b, 0x0a, 0x0d, 0x4c, 0x67, 0xef, 0x72, 0x42, 0xaa, 0xf7, 0xb3, 0x5c, 0xef, 0x64, 0xbb, 0x88, - 0xff, 0xae, 0xd9, 0xbd, 0x8c, 0x90, 0xb7, 0xb9, 0xf7, 0x53, 0xd8, 0x1a, 0xa8, 0x58, 0xf0, 0x49, - 0x18, 0x8d, 0x6c, 0xc4, 0x3c, 0x84, 0xaa, 0xf9, 0x60, 0xfd, 0x5f, 0x6f, 0xf8, 0xd0, 0xe9, 0xb7, - 0xbf, 0x78, 0xb3, 0xeb, 0x7c, 0xf9, 0x66, 0xd7, 0xf9, 0xe7, 0x9b, 0x5d, 0xe7, 0x77, 0x6f, 0x77, - 0xd7, 0xbe, 0x7c, 0xbb, 0xbb, 0xf6, 0xf7, 0xb7, 0xbb, 0x6b, 0xc3, 0x2a, 0xfd, 0xc7, 0xf3, 0xc1, - 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xf1, 0x66, 0x93, 0xaa, 0x64, 0x12, 0x00, 0x00, + // 1762 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0x4f, 0x73, 0x1b, 0x49, + 0x15, 0xf7, 0x58, 0xff, 0xac, 0x27, 0xc9, 0x6b, 0xf7, 0x26, 0x8e, 0xa2, 0x04, 0xc7, 0x35, 0xa4, + 0x16, 0x43, 0xb1, 0xb2, 0xa3, 0x8d, 0x6b, 0xc9, 0x86, 0x82, 0x42, 0x38, 0x24, 0xd9, 0xc4, 0x4b, + 0x76, 0x64, 0x72, 0xd8, 0x0b, 0xd5, 0x9a, 0xe9, 0x28, 0x53, 0x96, 0xa6, 0xb5, 0x33, 0x2d, 0x63, + 0x71, 0x82, 0x0b, 0x27, 0x0e, 0x5c, 0x38, 0x70, 0xa1, 0x8a, 0x2a, 0xaa, 0xa8, 0xe2, 0x6b, 0x70, + 0xd9, 0xe3, 0x1e, 0x29, 0x0e, 0x5b, 0x54, 0xf2, 0x09, 0x38, 0x72, 0xa3, 0xde, 0xeb, 0xee, 0xf9, + 0x23, 0xc9, 0xa6, 0x58, 0x4e, 0xea, 0xf7, 0xeb, 0x5f, 0xbf, 0x7e, 0xfd, 0xfa, 0xbd, 0xd7, 0x6f, + 0x04, 0x37, 0xa6, 0x67, 0xa3, 0x03, 0x25, 0x26, 0x53, 0x39, 0x1d, 0xea, 0xdf, 0xee, 0x34, 0x96, + 0x4a, 0xb2, 0x9a, 0x01, 0x3b, 0xd7, 0x54, 0xcc, 0x7d, 0x71, 0x70, 0x7e, 0xef, 0x80, 0x06, 0x7a, + 0xba, 0xb3, 0xe3, 0xcb, 0xc9, 0x44, 0x46, 0x08, 0xeb, 0x91, 0xc1, 0xdf, 0x1f, 0x85, 0xea, 0xf5, + 0x6c, 0xd8, 0xf5, 0xe5, 0xe4, 0x60, 0x24, 0x47, 0xf2, 0x80, 0xe0, 0xe1, 0xec, 0x15, 0x49, 0x24, + 0xd0, 0x48, 0xd3, 0xdd, 0xdf, 0x38, 0xb0, 0x75, 0x8a, 0x6a, 0xfb, 0xf3, 0xa7, 0xc7, 0x9e, 0xf8, + 0x7c, 0x26, 0x12, 0xc5, 0xda, 0x50, 0xa3, 0xad, 0x9e, 0x1e, 0xb7, 0x9d, 0x3d, 0x67, 0xbf, 0xe9, + 0x59, 0x91, 0xed, 0x02, 0x0c, 0xc7, 0xd2, 0x3f, 0x1b, 0x28, 0x1e, 0xab, 0xf6, 0xfa, 0x9e, 0xb3, + 0x5f, 0xf7, 0x72, 0x08, 0xeb, 0xc0, 0x06, 0x49, 0x8f, 0xa2, 0xa0, 0x5d, 0xa2, 0xd9, 0x54, 0x66, + 0xb7, 0xa1, 0xfe, 0xf9, 0x4c, 0xc4, 0xf3, 0x13, 0x19, 0x88, 0x76, 0x85, 0x26, 0x33, 0xc0, 0x8d, + 0x60, 0x3b, 0x67, 0x47, 0x32, 0x95, 0x51, 0x22, 0xd8, 0x5d, 0xa8, 0xd0, 0xce, 0x64, 0x46, 0xa3, + 0xb7, 0xd9, 0x35, 0x3e, 0xe9, 0x12, 0xd5, 0xd3, 0x93, 0xec, 0x03, 0xa8, 0x4d, 0x84, 0x8a, 0x43, + 0x3f, 0x21, 0x8b, 0x1a, 0xbd, 0x9b, 0x45, 0x1e, 0xaa, 0x3c, 0xd1, 0x04, 0xcf, 0x32, 0x5d, 0x96, + 0x3b, 0xb7, 0x99, 0x74, 0xff, 0xbc, 0x0e, 0xad, 0x81, 0xe0, 0xb1, 0xff, 0xda, 0x7a, 0xe2, 0x23, + 0x28, 0x9f, 0xf2, 0x51, 0xd2, 0x76, 0xf6, 0x4a, 0xfb, 0x8d, 0xde, 0x5e, 0xaa, 0xb7, 0xc0, 0xea, + 0x22, 0xe5, 0x51, 0xa4, 0xe2, 0x79, 0xbf, 0xfc, 0xc5, 0x57, 0x77, 0xd6, 0x3c, 0x5a, 0xc3, 0xee, + 0x42, 0xeb, 0x24, 0x8c, 0x8e, 0x67, 0x31, 0x57, 0xa1, 0x8c, 0x4e, 0xb4, 0x71, 0x2d, 0xaf, 0x08, + 0x12, 0x8b, 0x5f, 0xe4, 0x58, 0x25, 0xc3, 0xca, 0x83, 0xec, 0x1a, 0x54, 0x9e, 0x87, 0x93, 0x50, + 0xb5, 0xcb, 0x34, 0xab, 0x05, 0x44, 0x13, 0xba, 0x88, 0x8a, 0x46, 0x49, 0x60, 0x5b, 0x50, 0x12, + 0x51, 0xd0, 0xae, 0x12, 0x86, 0x43, 0xe4, 0x7d, 0x8a, 0x8e, 0x6e, 0x6f, 0x90, 0xd7, 0xb5, 0xd0, + 0xf9, 0x10, 0xea, 0xa9, 0xe1, 0xb8, 0xe8, 0x4c, 0xcc, 0xc9, 0xcf, 0x75, 0x0f, 0x87, 0xb8, 0xe8, + 0x9c, 0x8f, 0x67, 0xc2, 0xdc, 0xb2, 0x16, 0x3e, 0x5a, 0xff, 0x9e, 0xe3, 0xfe, 0xaa, 0x04, 0x4c, + 0x3b, 0xa0, 0x8f, 0x77, 0x6b, 0x7d, 0x75, 0x1f, 0xea, 0x89, 0x75, 0x8b, 0xb9, 0xb0, 0x9d, 0xd5, + 0x0e, 0xf3, 0x32, 0x22, 0xc6, 0x1a, 0x45, 0xc8, 0xd3, 0x63, 0xb3, 0x91, 0x15, 0x31, 0x5e, 0xe8, + 0x40, 0x2f, 0xf8, 0x48, 0x18, 0xaf, 0x64, 0x00, 0xfa, 0x6d, 0xca, 0x47, 0x22, 0x39, 0x95, 0x5a, + 0xb5, 0xf1, 0x4c, 0x11, 0xc4, 0x78, 0x14, 0x91, 0x2f, 0x83, 0x30, 0x1a, 0x99, 0x90, 0x4b, 0x65, + 0xd4, 0x10, 0x46, 0x81, 0xb8, 0x40, 0x75, 0x83, 0xf0, 0x97, 0xc2, 0x78, 0xac, 0x08, 0x32, 0x17, + 0x9a, 0x4a, 0x2a, 0x3e, 0xf6, 0x84, 0x2f, 0xe3, 0x20, 0x69, 0xd7, 0x88, 0x54, 0xc0, 0x90, 0x13, + 0x70, 0xc5, 0x1f, 0xd9, 0x9d, 0xb4, 0x9b, 0x0b, 0x18, 0x9e, 0xf3, 0x5c, 0xc4, 0x49, 0x28, 0xa3, + 0x76, 0x5d, 0x9f, 0xd3, 0x88, 0x8c, 0x41, 0x39, 0xc1, 0xed, 0x61, 0xcf, 0xd9, 0x2f, 0x7b, 0x34, + 0xc6, 0x3c, 0x7b, 0x25, 0xa5, 0x12, 0x31, 0x19, 0xd6, 0xa0, 0x3d, 0x73, 0x88, 0x7b, 0x01, 0x9b, + 0xd6, 0xa3, 0x26, 0x55, 0xee, 0x43, 0x95, 0xb2, 0xc1, 0xc6, 0xea, 0xed, 0x62, 0x0e, 0x68, 0xf6, + 0x89, 0x50, 0x1c, 0xad, 0xf2, 0x0c, 0x97, 0x1d, 0x2e, 0xa6, 0xce, 0xe2, 0x8d, 0x2d, 0xe5, 0xcd, + 0xbf, 0x1d, 0x78, 0x77, 0x85, 0xc6, 0xc5, 0x9a, 0x51, 0xcf, 0x6a, 0xc6, 0x3e, 0xbc, 0x13, 0x4b, + 0xa9, 0x06, 0x22, 0x3e, 0x0f, 0x7d, 0xf1, 0x09, 0x9f, 0xd8, 0x90, 0x5a, 0x84, 0xf1, 0x46, 0x10, + 0x22, 0xf5, 0xc4, 0xd3, 0x25, 0xa4, 0x08, 0xb2, 0xef, 0xc2, 0x36, 0x85, 0xc1, 0x69, 0x38, 0x11, + 0x3f, 0x8b, 0xc2, 0x8b, 0x4f, 0x78, 0x24, 0xe9, 0xf6, 0xcb, 0xde, 0xf2, 0x04, 0x7a, 0x32, 0xc8, + 0x92, 0x4b, 0x27, 0x4a, 0x0e, 0x61, 0xdf, 0x81, 0x5a, 0x32, 0xe5, 0xd1, 0x40, 0x28, 0xba, 0xff, + 0x46, 0x6f, 0x2b, 0xf3, 0x80, 0xc6, 0x3d, 0x4b, 0x70, 0x9f, 0x40, 0xcd, 0x60, 0xec, 0x9b, 0x50, + 0x41, 0xd4, 0x7a, 0xbb, 0x55, 0x58, 0xe4, 0xe9, 0x39, 0xf4, 0xc9, 0x84, 0x2b, 0xff, 0xb5, 0x08, + 0x4c, 0xee, 0x5b, 0xd1, 0xfd, 0x9b, 0x03, 0x65, 0x64, 0xb2, 0x1d, 0xa8, 0x22, 0x37, 0xf5, 0x9a, + 0x91, 0x30, 0x28, 0xa2, 0xcc, 0x53, 0x34, 0x5e, 0x7d, 0xf0, 0xd2, 0x65, 0x07, 0xbf, 0x0b, 0x2d, + 0x7b, 0x4c, 0x94, 0x13, 0xe3, 0xa2, 0x22, 0xc8, 0x1e, 0x02, 0x70, 0xa5, 0xe2, 0x70, 0x38, 0x53, + 0x02, 0xdd, 0x83, 0x87, 0xb9, 0x95, 0x1e, 0xc6, 0xbc, 0x2c, 0xe7, 0xf7, 0xba, 0xcf, 0xc4, 0xfc, + 0x25, 0x16, 0x00, 0x2f, 0x47, 0x77, 0xff, 0xe5, 0xd8, 0x7a, 0x69, 0xc2, 0x04, 0xef, 0x3a, 0x8c, + 0x92, 0xa9, 0xf0, 0x95, 0x08, 0x4e, 0x6d, 0x38, 0xe2, 0xc9, 0x17, 0x61, 0xf6, 0x1e, 0x6c, 0xa6, + 0x50, 0x7f, 0x8e, 0x9b, 0xaf, 0x93, 0x7d, 0x0b, 0x28, 0xdb, 0x83, 0x06, 0xe5, 0x1a, 0x95, 0x1a, + 0x5b, 0x1d, 0xf3, 0x10, 0x1e, 0xd4, 0x97, 0x93, 0xe9, 0x58, 0x28, 0x11, 0x7c, 0x2c, 0x87, 0x89, + 0xad, 0x04, 0x05, 0x10, 0xab, 0x09, 0x2d, 0x22, 0x86, 0x0e, 0x83, 0x0c, 0x40, 0xbb, 0x33, 0x95, + 0xda, 0x9c, 0x2a, 0x99, 0xb3, 0x08, 0xbb, 0xdf, 0x86, 0x6d, 0x7d, 0x64, 0xac, 0x9d, 0xb6, 0xf4, + 0x61, 0x21, 0xf6, 0xe5, 0x54, 0x98, 0x4b, 0xd4, 0x82, 0x7b, 0x68, 0xcb, 0xa4, 0xa6, 0x9a, 0x44, + 0xed, 0xc0, 0x86, 0xe2, 0x23, 0x8c, 0x64, 0x1d, 0x3c, 0x75, 0x2f, 0x95, 0xdd, 0x8f, 0xe1, 0x5a, + 0xb6, 0xe2, 0x65, 0x2f, 0x5d, 0xd3, 0x83, 0x2a, 0xa9, 0xb4, 0xe1, 0xd6, 0x59, 0xc8, 0x52, 0x4d, + 0x1f, 0x20, 0xc5, 0x33, 0x4c, 0xf7, 0x61, 0xde, 0x50, 0x33, 0x99, 0x86, 0x95, 0x93, 0x0b, 0x2b, + 0x06, 0x65, 0x85, 0x6f, 0xdc, 0x3a, 0x19, 0x43, 0x63, 0xf7, 0x09, 0xec, 0xa4, 0x8b, 0xe9, 0xde, + 0x93, 0x7c, 0x6f, 0xa0, 0xcd, 0x4d, 0xf3, 0x5c, 0x8b, 0xe8, 0x04, 0x7a, 0xce, 0xed, 0x83, 0x41, + 0x82, 0xfb, 0x21, 0xdc, 0x58, 0xd2, 0x64, 0x4e, 0x85, 0x57, 0x62, 0x41, 0xe3, 0x8a, 0x0c, 0x70, + 0xef, 0xc3, 0x86, 0x5d, 0x42, 0x26, 0xce, 0x53, 0xf7, 0xd2, 0x78, 0xf5, 0xfb, 0xe4, 0x3e, 0x87, + 0x9b, 0x0b, 0xdb, 0xe5, 0xdc, 0x78, 0xb0, 0xb8, 0x61, 0xa3, 0xb7, 0x9d, 0x95, 0x49, 0x33, 0x93, + 0xb7, 0xa1, 0x0f, 0x15, 0x0a, 0x57, 0xf6, 0x00, 0x6a, 0x43, 0x4a, 0x5d, 0xbb, 0xee, 0x4e, 0xba, + 0x4e, 0x37, 0x65, 0xe7, 0xf7, 0xba, 0x9e, 0x48, 0xe4, 0x2c, 0xf6, 0x05, 0xe6, 0x75, 0xe2, 0x59, + 0xbe, 0xbb, 0x09, 0xcd, 0x17, 0xb3, 0x24, 0x2d, 0xd4, 0xee, 0x9f, 0x1c, 0xd8, 0x42, 0x80, 0xc2, + 0xc9, 0x7a, 0xf5, 0xfd, 0xb4, 0x7a, 0xe3, 0x2d, 0x34, 0xfb, 0xd7, 0xb1, 0x8f, 0xf8, 0xc7, 0x57, + 0x77, 0x5a, 0x2f, 0x62, 0xc1, 0xc7, 0x63, 0xe9, 0x6b, 0xb6, 0x2d, 0xdb, 0xdf, 0x82, 0x52, 0x18, + 0x60, 0x32, 0x5c, 0xc1, 0x45, 0x06, 0x3b, 0x02, 0xd0, 0x4f, 0xed, 0x31, 0x57, 0xbc, 0x5d, 0xbe, + 0x8a, 0x9f, 0x23, 0xba, 0x27, 0xda, 0x44, 0x7d, 0x12, 0x63, 0xe2, 0xff, 0xe1, 0x82, 0xbb, 0x00, + 0xa6, 0xd7, 0xc2, 0x8c, 0xde, 0x29, 0xbc, 0x54, 0x4d, 0x7b, 0x28, 0xf7, 0x07, 0x50, 0x7f, 0x1e, + 0x46, 0x67, 0x83, 0x71, 0xe8, 0x0b, 0x76, 0x0f, 0x2a, 0xe3, 0x30, 0x3a, 0xb3, 0x7b, 0xdd, 0x5a, + 0xde, 0x0b, 0xf7, 0xe8, 0xe2, 0x02, 0x4f, 0x33, 0xdd, 0xcf, 0x80, 0x21, 0x66, 0x5f, 0xac, 0x2c, + 0x35, 0x75, 0x54, 0x3a, 0xb9, 0xa8, 0xc4, 0x28, 0x1e, 0xc5, 0x72, 0x36, 0xed, 0xdb, 0x68, 0xb5, + 0x22, 0xf2, 0xc7, 0xd4, 0x69, 0xe9, 0xc2, 0xaa, 0x05, 0xf7, 0xd7, 0x0e, 0xbc, 0x5b, 0x50, 0x9e, + 0x85, 0xb0, 0x48, 0x54, 0x38, 0xe1, 0x4a, 0x04, 0xb4, 0xc3, 0x86, 0x97, 0x01, 0xd4, 0xc1, 0x4c, + 0x79, 0xf4, 0x63, 0x39, 0x8b, 0x94, 0x29, 0x6f, 0x19, 0xc0, 0xba, 0xd9, 0xdb, 0x5b, 0xa2, 0x43, + 0x5e, 0x2b, 0x3c, 0x22, 0x4b, 0x2f, 0xef, 0xf7, 0xa1, 0xe9, 0xf1, 0x5f, 0x3c, 0x09, 0x13, 0x25, + 0x47, 0x31, 0x9f, 0xa0, 0x1f, 0x87, 0x33, 0xff, 0x4c, 0x28, 0xda, 0xb8, 0xec, 0x19, 0x09, 0x4f, + 0xe0, 0xe7, 0x76, 0xd4, 0x82, 0xfb, 0x07, 0x07, 0x1a, 0x39, 0xb5, 0xac, 0x0f, 0xdb, 0x63, 0xae, + 0x44, 0xe4, 0xcf, 0x7f, 0xfe, 0xda, 0xaa, 0x34, 0xce, 0xbe, 0x9e, 0xda, 0x91, 0xdf, 0xcf, 0xdb, + 0x32, 0xfc, 0xcc, 0x82, 0x2e, 0x54, 0x13, 0xc5, 0x55, 0xe8, 0x2f, 0x35, 0x0f, 0x74, 0xdd, 0x9f, + 0x3e, 0x1f, 0xd0, 0xac, 0x67, 0x58, 0x68, 0xb1, 0x88, 0x63, 0x19, 0x27, 0xc6, 0xb9, 0x46, 0x72, + 0x9f, 0xc1, 0xcd, 0x9c, 0x69, 0x83, 0xd9, 0x64, 0xc2, 0xe3, 0xf9, 0xd7, 0xbc, 0x40, 0xf7, 0xaf, + 0x0e, 0x74, 0x56, 0x69, 0xcb, 0x6e, 0xac, 0x78, 0x27, 0xa5, 0xfc, 0x9d, 0xbc, 0x07, 0x9b, 0x64, + 0xd3, 0x20, 0xa5, 0x94, 0x88, 0xb2, 0x80, 0x62, 0xbb, 0x3c, 0x7d, 0xf0, 0xc0, 0x3c, 0xa9, 0x38, + 0xd4, 0xc8, 0x11, 0xbd, 0x2c, 0x84, 0x1c, 0x69, 0xe4, 0xd0, 0xbc, 0x23, 0x38, 0x24, 0xe4, 0xe8, + 0x90, 0x5a, 0x48, 0x44, 0x8e, 0x0e, 0xdd, 0xdf, 0x3b, 0xd0, 0x2a, 0xf8, 0xaa, 0x50, 0xea, 0x2a, + 0xa6, 0xd4, 0x35, 0xc1, 0x89, 0x8c, 0xad, 0x4e, 0x84, 0xd2, 0x2b, 0x32, 0xcb, 0xf1, 0x9c, 0x57, + 0x28, 0xe9, 0x17, 0xaf, 0xee, 0x39, 0x09, 0x4a, 0x43, 0xb2, 0x61, 0xc3, 0x73, 0x86, 0x28, 0x05, + 0x66, 0x7f, 0x27, 0xa0, 0x56, 0x43, 0x71, 0x35, 0xd3, 0x3d, 0x6c, 0xc5, 0x33, 0x12, 0xee, 0x78, + 0x16, 0x46, 0x01, 0x75, 0xad, 0x15, 0x8f, 0xc6, 0xbd, 0xdf, 0x3a, 0x50, 0xc5, 0x0a, 0x20, 0x62, + 0xf6, 0x43, 0xa8, 0xa7, 0xe5, 0x8a, 0x65, 0x5f, 0x56, 0x8b, 0x25, 0xac, 0x73, 0xbd, 0x30, 0x95, + 0x96, 0xbb, 0x35, 0xf6, 0x23, 0x68, 0xa4, 0xe4, 0x97, 0xbd, 0xaf, 0xa3, 0xa2, 0xf7, 0x47, 0x07, + 0xb6, 0xcc, 0x7d, 0x3e, 0x16, 0x91, 0x88, 0xb9, 0x92, 0xa9, 0x61, 0x54, 0x6b, 0x16, 0xb4, 0xe6, + 0x0b, 0xd7, 0xe5, 0x86, 0x3d, 0x05, 0x78, 0x2c, 0x94, 0x4d, 0x88, 0x5b, 0x2b, 0xb3, 0xcf, 0xe8, + 0xb8, 0xbd, 0x7a, 0x32, 0x35, 0xf0, 0x2f, 0x65, 0xa8, 0xe1, 0x57, 0x55, 0x28, 0x62, 0xf6, 0x04, + 0x5a, 0x3f, 0x09, 0xa3, 0x20, 0xfd, 0xba, 0x64, 0x2b, 0x3e, 0x47, 0xad, 0xde, 0xce, 0xaa, 0xa9, + 0x9c, 0xe7, 0x9a, 0xb6, 0xcb, 0xf7, 0x45, 0xa4, 0xd8, 0x25, 0x9f, 0x53, 0x9d, 0x1b, 0x4b, 0x78, + 0xaa, 0xe2, 0x11, 0x34, 0x72, 0x9f, 0x6a, 0xf9, 0x43, 0x2e, 0x7d, 0xc0, 0x5d, 0xa5, 0xe6, 0x31, + 0x40, 0xd6, 0x4c, 0xb0, 0x55, 0xed, 0x87, 0x55, 0x72, 0x6b, 0xe5, 0x5c, 0xaa, 0xe8, 0x99, 0x3d, + 0x92, 0xee, 0x4a, 0xae, 0x54, 0xf5, 0x8d, 0x95, 0x5d, 0x4e, 0x4e, 0xd9, 0x4b, 0x78, 0x67, 0xe1, + 0xb1, 0x67, 0x77, 0x96, 0xd7, 0x14, 0xfa, 0x97, 0xce, 0xde, 0xe5, 0x84, 0x54, 0xef, 0x67, 0xb9, + 0xd6, 0xc9, 0x36, 0x11, 0xff, 0x5d, 0xb3, 0x7b, 0x19, 0x21, 0x6f, 0x73, 0xef, 0xa7, 0xb0, 0x35, + 0x50, 0xb1, 0xe0, 0x93, 0x30, 0x1a, 0xd9, 0x88, 0x79, 0x08, 0x55, 0xf3, 0xbd, 0xfa, 0xbf, 0xde, + 0xf0, 0xa1, 0xd3, 0x6f, 0x7f, 0xf1, 0x66, 0xd7, 0xf9, 0xf2, 0xcd, 0xae, 0xf3, 0xcf, 0x37, 0xbb, + 0xce, 0xef, 0xde, 0xee, 0xae, 0x7d, 0xf9, 0x76, 0x77, 0xed, 0xef, 0x6f, 0x77, 0xd7, 0x86, 0x55, + 0xfa, 0x8b, 0xe7, 0x83, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x0f, 0x30, 0x1b, 0x0f, 0x63, 0x12, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2136,7 +2137,7 @@ var _Pusher_serviceDesc = grpc.ServiceDesc{ // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type MetricsGeneratorClient interface { PushSpans(ctx context.Context, in *PushSpansRequest, opts ...grpc.CallOption) (*PushResponse, error) - SpanMetrics(ctx context.Context, in *SpanMetricsRequest, opts ...grpc.CallOption) (*SpanMetricsResponse, error) + GetMetrics(ctx context.Context, in *SpanMetricsRequest, opts ...grpc.CallOption) (*SpanMetricsResponse, error) } type metricsGeneratorClient struct { @@ -2156,9 +2157,9 @@ func (c *metricsGeneratorClient) PushSpans(ctx context.Context, in *PushSpansReq return out, nil } -func (c *metricsGeneratorClient) SpanMetrics(ctx context.Context, in *SpanMetricsRequest, opts ...grpc.CallOption) (*SpanMetricsResponse, error) { +func (c *metricsGeneratorClient) GetMetrics(ctx context.Context, in *SpanMetricsRequest, opts ...grpc.CallOption) (*SpanMetricsResponse, error) { out := new(SpanMetricsResponse) - err := c.cc.Invoke(ctx, "/tempopb.MetricsGenerator/SpanMetrics", in, out, opts...) + err := c.cc.Invoke(ctx, "/tempopb.MetricsGenerator/GetMetrics", in, out, opts...) if err != nil { return nil, err } @@ -2168,7 +2169,7 @@ func (c *metricsGeneratorClient) SpanMetrics(ctx context.Context, in *SpanMetric // MetricsGeneratorServer is the server API for MetricsGenerator service. type MetricsGeneratorServer interface { PushSpans(context.Context, *PushSpansRequest) (*PushResponse, error) - SpanMetrics(context.Context, *SpanMetricsRequest) (*SpanMetricsResponse, error) + GetMetrics(context.Context, *SpanMetricsRequest) (*SpanMetricsResponse, error) } // UnimplementedMetricsGeneratorServer can be embedded to have forward compatible implementations. @@ -2178,8 +2179,8 @@ type UnimplementedMetricsGeneratorServer struct { func (*UnimplementedMetricsGeneratorServer) PushSpans(ctx context.Context, req *PushSpansRequest) (*PushResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method PushSpans not implemented") } -func (*UnimplementedMetricsGeneratorServer) SpanMetrics(ctx context.Context, req *SpanMetricsRequest) (*SpanMetricsResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method SpanMetrics not implemented") +func (*UnimplementedMetricsGeneratorServer) GetMetrics(ctx context.Context, req *SpanMetricsRequest) (*SpanMetricsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetMetrics not implemented") } func RegisterMetricsGeneratorServer(s *grpc.Server, srv MetricsGeneratorServer) { @@ -2204,20 +2205,20 @@ func _MetricsGenerator_PushSpans_Handler(srv interface{}, ctx context.Context, d return interceptor(ctx, in, info, handler) } -func _MetricsGenerator_SpanMetrics_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _MetricsGenerator_GetMetrics_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(SpanMetricsRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(MetricsGeneratorServer).SpanMetrics(ctx, in) + return srv.(MetricsGeneratorServer).GetMetrics(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tempopb.MetricsGenerator/SpanMetrics", + FullMethod: "/tempopb.MetricsGenerator/GetMetrics", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MetricsGeneratorServer).SpanMetrics(ctx, req.(*SpanMetricsRequest)) + return srv.(MetricsGeneratorServer).GetMetrics(ctx, req.(*SpanMetricsRequest)) } return interceptor(ctx, in, info, handler) } @@ -2231,8 +2232,8 @@ var _MetricsGenerator_serviceDesc = grpc.ServiceDesc{ Handler: _MetricsGenerator_PushSpans_Handler, }, { - MethodName: "SpanMetrics", - Handler: _MetricsGenerator_SpanMetrics_Handler, + MethodName: "GetMetrics", + Handler: _MetricsGenerator_GetMetrics_Handler, }, }, Streams: []grpc.StreamDesc{}, diff --git a/pkg/tempopb/tempo.proto b/pkg/tempopb/tempo.proto index 301fa18408f..45b7491594b 100644 --- a/pkg/tempopb/tempo.proto +++ b/pkg/tempopb/tempo.proto @@ -14,7 +14,7 @@ service Pusher { service MetricsGenerator { rpc PushSpans(PushSpansRequest) returns (PushResponse) {}; - rpc SpanMetrics(SpanMetricsRequest) returns (SpanMetricsResponse) {}; + rpc GetMetrics(SpanMetricsRequest) returns (SpanMetricsResponse) {}; } service Querier { From 48f6420a05cdd88a2bc12538b604f183974967b0 Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Fri, 12 May 2023 15:52:27 +0000 Subject: [PATCH 30/31] Align function names --- modules/generator/http.go | 2 +- pkg/api/http.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/generator/http.go b/modules/generator/http.go index 6b4a5609736..0879fa700fc 100644 --- a/modules/generator/http.go +++ b/modules/generator/http.go @@ -20,7 +20,7 @@ func (g *Generator) SpanMetricsHandler(w http.ResponseWriter, r *http.Request) { span.SetTag("requestURI", r.RequestURI) - req, err := api.ParseSummaryRequest(r) + req, err := api.ParseSpanMetricsRequest(r) if err != nil { http.Error(w, err.Error(), http.StatusBadRequest) return diff --git a/pkg/api/http.go b/pkg/api/http.go index 77884091c01..13ba221496f 100644 --- a/pkg/api/http.go +++ b/pkg/api/http.go @@ -318,7 +318,7 @@ func ParseSearchBlockRequest(r *http.Request) (*tempopb.SearchBlockRequest, erro return req, nil } -func ParseSummaryRequest(r *http.Request) (*tempopb.SpanMetricsRequest, error) { +func ParseSpanMetricsRequest(r *http.Request) (*tempopb.SpanMetricsRequest, error) { req := &tempopb.SpanMetricsRequest{} groupBy := r.URL.Query().Get(urlParamGroupBy) From 76a606ff27d4c36d359170b7423449de51d41cbd Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Fri, 12 May 2023 15:54:24 +0000 Subject: [PATCH 31/31] Fix instance creation return values --- modules/generator/generator.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/generator/generator.go b/modules/generator/generator.go index 61862cd0c11..81cd4c604b9 100644 --- a/modules/generator/generator.go +++ b/modules/generator/generator.go @@ -200,7 +200,7 @@ func (g *Generator) PushSpans(ctx context.Context, req *tempopb.PushSpansRequest instance, err := g.getOrCreateInstance(instanceID) if err != nil { - return &tempopb.PushResponse{}, nil + return nil, err } instance.pushSpans(ctx, req) @@ -332,7 +332,7 @@ func (g *Generator) GetMetrics(ctx context.Context, req *tempopb.SpanMetricsRequ // return empty if we don't have an instance instance, ok := g.getInstanceByID(instanceID) if !ok || instance == nil { - return nil, err + return &tempopb.SpanMetricsResponse{}, nil } return instance.GetMetrics(ctx, req)