From aa66baec978cd5c24702c19494784cf33bf8b513 Mon Sep 17 00:00:00 2001 From: Robert Fratto Date: Thu, 28 Aug 2025 08:55:25 -0400 Subject: [PATCH] chore(logqlmodel/stats): print new engine summary in metrics.go (#19052) --- pkg/engine/engine.go | 2 + pkg/logqlmodel/stats/context.go | 35 +++ pkg/logqlmodel/stats/stats.pb.go | 263 +++++++++++++--------- pkg/logqlmodel/stats/stats.proto | 2 + pkg/querier/queryrange/codec_test.go | 2 + pkg/querier/queryrange/prometheus_test.go | 2 + pkg/util/marshal/legacy/marshal_test.go | 4 +- pkg/util/marshal/marshal_test.go | 2 + 8 files changed, 204 insertions(+), 108 deletions(-) diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index a6536ed219..02398b5978 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -102,6 +102,8 @@ func (e *QueryEngine) Execute(ctx context.Context, params logql.Params) (logqlmo statsCtx, ctx := stats.NewContext(ctx) metadataCtx, ctx := metadata.NewContext(ctx) + statsCtx.SetQueryUsedV2Engine() + logger := utillog.WithContext(ctx, e.logger) logger = log.With(logger, "query", params.QueryString(), "shard", strings.Join(params.Shards(), ","), "engine", "v2") diff --git a/pkg/logqlmodel/stats/context.go b/pkg/logqlmodel/stats/context.go index 66b8d2d044..eff06e25d9 100644 --- a/pkg/logqlmodel/stats/context.go +++ b/pkg/logqlmodel/stats/context.go @@ -237,6 +237,9 @@ func (s *Store) Merge(m Store) { if m.QueryReferencedStructured { s.QueryReferencedStructured = true } + if m.QueryUsedV2Engine { + s.QueryUsedV2Engine = true + } } func (s *Store) ChunksDownloadDuration() time.Duration { @@ -361,6 +364,10 @@ func (r Result) QueryReferencedStructuredMetadata() bool { return r.Querier.Store.QueryReferencedStructured || r.Ingester.Store.QueryReferencedStructured } +func (r Result) QueryUsedV2Engine() bool { + return r.Querier.Store.QueryUsedV2Engine +} + func (c *Context) AddIngesterBatch(size int64) { atomic.AddInt64(&c.ingester.TotalBatches, 1) atomic.AddInt64(&c.ingester.TotalLinesSent, size) @@ -582,6 +589,10 @@ func (c *Context) SetQueryReferencedStructuredMetadata() { c.store.QueryReferencedStructured = true } +func (c *Context) SetQueryUsedV2Engine() { + c.store.QueryUsedV2Engine = true +} + func (c *Context) getCacheStatsByType(t CacheType) *Cache { var stats *Cache switch t { @@ -641,6 +652,12 @@ func (r Result) KVList() []any { "Querier.CompressedBytes", humanize.Bytes(uint64(r.Querier.Store.Chunk.CompressedBytes)), "Querier.TotalDuplicates", r.Querier.Store.Chunk.TotalDuplicates, "Querier.QueryReferencedStructuredMetadata", r.Querier.Store.QueryReferencedStructured, + "Querier.QueryUsedV2Engine", r.Querier.Store.QueryUsedV2Engine, + } + + if r.QueryUsedV2Engine() { + // Specifying prefix in case r.Ingester.Store ever uses the new engine. + result = append(result, r.Querier.Store.Dataobj.kvList("Querier.")...) } result = append(result, r.Caches.kvList()...) @@ -715,3 +732,21 @@ func (c Caches) kvList() []any { "Cache.InstantMetricResult.DownloadTime", c.InstantMetricResult.CacheDownloadTime(), } } + +func (d Dataobj) kvList(prefix string) []any { + return []any{ + prefix + "Dataobj.PrePredicateDecompressedRows", d.PrePredicateDecompressedRows, + prefix + "Dataobj.PrePredicateDecompressedBytes", humanize.Bytes(uint64(d.PrePredicateDecompressedBytes)), + prefix + "Dataobj.PrePredicateDecompressedStructuredMetadataBytes", humanize.Bytes(uint64(d.PrePredicateDecompressedStructuredMetadataBytes)), + prefix + "Dataobj.PostPredicateRows", d.PostPredicateRows, + prefix + "Dataobj.PostPredicateDecompressedBytes", humanize.Bytes(uint64(d.PostPredicateDecompressedBytes)), + prefix + "Dataobj.PostPredicateStructuredMetadataBytes", humanize.Bytes(uint64(d.PostPredicateStructuredMetadataBytes)), + prefix + "Dataobj.PostFilterRows", d.PostFilterRows, + prefix + "Dataobj.PagesScanned", d.PagesScanned, + prefix + "Dataobj.PagesDownloaded", d.PagesDownloaded, + prefix + "Dataobj.PagesDownloadedBytes", humanize.Bytes(uint64(d.PagesDownloadedBytes)), + prefix + "Dataobj.PageBatches", d.PageBatches, + prefix + "Dataobj.TotalRowsAvailable", d.TotalRowsAvailable, + prefix + "Dataobj.TotalPageDownloadTime", time.Duration(d.TotalPageDownloadTime), + } +} diff --git a/pkg/logqlmodel/stats/stats.pb.go b/pkg/logqlmodel/stats/stats.pb.go index e64fa36d70..a59b9b80ac 100644 --- a/pkg/logqlmodel/stats/stats.pb.go +++ b/pkg/logqlmodel/stats/stats.pb.go @@ -554,8 +554,10 @@ type Store struct { // Time spent fetching chunks in nanoseconds. ChunksDownloadTime int64 `protobuf:"varint,3,opt,name=chunksDownloadTime,proto3" json:"chunksDownloadTime"` // Whether the query referenced structured metadata - QueryReferencedStructured bool `protobuf:"varint,13,opt,name=queryReferencedStructured,proto3" json:"queryReferencedStructuredMetadata"` - Chunk Chunk `protobuf:"bytes,4,opt,name=chunk,proto3" json:"chunk"` + QueryReferencedStructured bool `protobuf:"varint,13,opt,name=queryReferencedStructured,proto3" json:"queryReferencedStructuredMetadata"` + // Whether the V2 engine was used for some or all of the query. + QueryUsedV2Engine bool `protobuf:"varint,14,opt,name=queryUsedV2Engine,proto3" json:"queryUsedV2Engine"` + Chunk Chunk `protobuf:"bytes,4,opt,name=chunk,proto3" json:"chunk"` // Time spent fetching chunk refs from index. ChunkRefsFetchTime int64 `protobuf:"varint,5,opt,name=chunkRefsFetchTime,proto3" json:"chunkRefsFetchTime"` // Time spent being blocked on congestion control. @@ -625,6 +627,13 @@ func (m *Store) GetQueryReferencedStructured() bool { return false } +func (m *Store) GetQueryUsedV2Engine() bool { + if m != nil { + return m.QueryUsedV2Engine + } + return false +} + func (m *Store) GetChunk() Chunk { if m != nil { return m.Chunk @@ -1043,110 +1052,112 @@ func init() { func init() { proto.RegisterFile("pkg/logqlmodel/stats/stats.proto", fileDescriptor_6cdfe5d2aea33ebb) } var fileDescriptor_6cdfe5d2aea33ebb = []byte{ - // 1646 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x58, 0xcd, 0x6f, 0xdc, 0x44, - 0x14, 0xcf, 0x66, 0xeb, 0x4d, 0x3a, 0xf9, 0x6a, 0x27, 0x29, 0xdd, 0xd2, 0xb2, 0x4e, 0x97, 0x56, - 0x14, 0x21, 0x65, 0x55, 0x8a, 0x84, 0x40, 0x54, 0x02, 0x27, 0x44, 0xaa, 0x94, 0x8a, 0xf0, 0x02, - 0x02, 0xc1, 0xc9, 0xb1, 0x27, 0x1b, 0xb7, 0x5e, 0x7b, 0x63, 0x8f, 0xd3, 0x46, 0x42, 0x82, 0x3f, - 0x81, 0x3b, 0xe2, 0x8a, 0xb8, 0x70, 0xe2, 0x80, 0x38, 0x73, 0xe9, 0xb1, 0xc7, 0x9e, 0x2c, 0x9a, - 0x5e, 0x90, 0x4f, 0x15, 0x47, 0x4e, 0x68, 0xde, 0xcc, 0xfa, 0x7b, 0x37, 0xdb, 0x4b, 0xd6, 0xef, - 0xf7, 0x7e, 0xef, 0x8d, 0xfd, 0xfc, 0xbe, 0x1c, 0xb2, 0x3e, 0x7c, 0xd8, 0xef, 0xb9, 0x7e, 0xff, - 0xc8, 0x1d, 0xf8, 0x36, 0x73, 0x7b, 0x21, 0x37, 0x79, 0x28, 0xff, 0x6e, 0x0c, 0x03, 0x9f, 0xfb, - 0x54, 0x43, 0xe1, 0xf5, 0xb5, 0xbe, 0xdf, 0xf7, 0x11, 0xe9, 0x89, 0x2b, 0xa9, 0xec, 0xfe, 0x32, - 0x4b, 0x5a, 0xc0, 0xc2, 0xc8, 0xe5, 0xf4, 0x03, 0x32, 0x17, 0x46, 0x83, 0x81, 0x19, 0x9c, 0xb4, - 0x1b, 0xeb, 0x8d, 0x5b, 0x0b, 0xef, 0x2e, 0x6f, 0x48, 0x37, 0x7b, 0x12, 0x35, 0x56, 0x9e, 0xc4, - 0xfa, 0x4c, 0x12, 0xeb, 0x23, 0x1a, 0x8c, 0x2e, 0x84, 0xe9, 0x51, 0xc4, 0x02, 0x87, 0x05, 0xed, - 0xd9, 0x82, 0xe9, 0xe7, 0x12, 0xcd, 0x4c, 0x15, 0x0d, 0x46, 0x17, 0xf4, 0x2e, 0x99, 0x77, 0xbc, - 0x3e, 0x0b, 0x39, 0x0b, 0xda, 0x4d, 0xb4, 0x5d, 0x51, 0xb6, 0xf7, 0x14, 0x6c, 0x5c, 0x50, 0xc6, - 0x29, 0x11, 0xd2, 0x2b, 0xfa, 0x1e, 0x69, 0x59, 0xa6, 0x75, 0xc8, 0xc2, 0xf6, 0x39, 0x34, 0x5e, - 0x52, 0xc6, 0x9b, 0x08, 0x1a, 0x4b, 0xca, 0x54, 0x43, 0x12, 0x28, 0x2e, 0xbd, 0x4d, 0x34, 0xc7, - 0xb3, 0xd9, 0xe3, 0xb6, 0x86, 0x46, 0x8b, 0xe9, 0x89, 0x36, 0x7b, 0x9c, 0xd9, 0x20, 0x05, 0xe4, - 0x4f, 0xf7, 0xa7, 0x73, 0xa4, 0xb5, 0x99, 0x5a, 0x5b, 0x87, 0x91, 0xf7, 0x50, 0x85, 0x69, 0x31, - 0x7f, 0x64, 0xee, 0x44, 0x41, 0x01, 0xf9, 0x93, 0x1d, 0x38, 0x3b, 0xc9, 0x24, 0x7f, 0xa0, 0x78, - 0xb2, 0x00, 0x5f, 0x8c, 0x0a, 0x4b, 0xd1, 0x66, 0x59, 0xd9, 0x28, 0x0e, 0xa8, 0x5f, 0xba, 0x49, - 0x16, 0x90, 0x26, 0xdf, 0xa9, 0x0a, 0x4a, 0xd1, 0x74, 0x55, 0x99, 0xe6, 0x89, 0x90, 0x17, 0xe8, - 0x36, 0x59, 0x3c, 0xf6, 0xdd, 0x68, 0xc0, 0x94, 0x17, 0xad, 0xc6, 0xcb, 0x9a, 0xf2, 0x52, 0x60, - 0x42, 0x41, 0x12, 0x7e, 0x42, 0xf1, 0x96, 0x47, 0x77, 0xd3, 0x9a, 0xe4, 0x27, 0xcf, 0x84, 0x82, - 0x24, 0x1e, 0xca, 0x35, 0xf7, 0x99, 0xab, 0xdc, 0xcc, 0x4d, 0x7a, 0xa8, 0x1c, 0x11, 0xf2, 0x02, - 0xfd, 0x96, 0xac, 0x3a, 0x5e, 0xc8, 0x4d, 0x8f, 0xdf, 0x67, 0x3c, 0x70, 0x2c, 0xe5, 0x6c, 0xbe, - 0xc6, 0xd9, 0x55, 0xe5, 0xac, 0xce, 0x00, 0xea, 0xc0, 0xee, 0x9f, 0x2d, 0x32, 0xa7, 0xca, 0x84, - 0x7e, 0x49, 0x2e, 0xef, 0x9f, 0x70, 0x16, 0xee, 0x06, 0xbe, 0xc5, 0xc2, 0x90, 0xd9, 0xbb, 0x2c, - 0xd8, 0x63, 0x96, 0xef, 0xd9, 0x98, 0x30, 0x4d, 0xe3, 0x6a, 0x12, 0xeb, 0xe3, 0x28, 0x30, 0x4e, - 0x21, 0xdc, 0xba, 0x8e, 0x57, 0xeb, 0x76, 0x36, 0x73, 0x3b, 0x86, 0x02, 0xe3, 0x14, 0xf4, 0x1e, - 0x59, 0xe5, 0x3e, 0x37, 0x5d, 0xa3, 0x70, 0x2c, 0xe6, 0x5c, 0xd3, 0xb8, 0x2c, 0x82, 0x50, 0xa3, - 0x86, 0x3a, 0x30, 0x75, 0xb5, 0x53, 0x38, 0x0a, 0x73, 0x30, 0xef, 0xaa, 0xa8, 0x86, 0x3a, 0x90, - 0xde, 0x22, 0xf3, 0xec, 0x31, 0xb3, 0xbe, 0x70, 0x06, 0x0c, 0xb3, 0xaf, 0x61, 0x2c, 0x8a, 0x06, - 0x30, 0xc2, 0x20, 0xbd, 0xa2, 0xef, 0x90, 0xf3, 0x47, 0x11, 0x8b, 0x18, 0x52, 0x5b, 0x48, 0x5d, - 0x4a, 0x62, 0x3d, 0x03, 0x21, 0xbb, 0xa4, 0x1b, 0x84, 0x84, 0xd1, 0xbe, 0x6c, 0x3d, 0x21, 0xe6, - 0x51, 0xd3, 0x58, 0x4e, 0x62, 0x3d, 0x87, 0x42, 0xee, 0x9a, 0xee, 0x90, 0x35, 0xbc, 0xbb, 0x4f, - 0x3d, 0x2e, 0xd3, 0x91, 0x47, 0x81, 0xc7, 0x6c, 0x4c, 0x9a, 0xa6, 0xd1, 0x4e, 0x62, 0xbd, 0x56, - 0x0f, 0xb5, 0x28, 0xed, 0x92, 0x56, 0x38, 0x74, 0x1d, 0x1e, 0xb6, 0xcf, 0xa3, 0x3d, 0x11, 0xf5, - 0x2b, 0x11, 0x50, 0xbf, 0xc8, 0x39, 0x34, 0x03, 0x3b, 0x6c, 0x93, 0x1c, 0x07, 0x11, 0x50, 0xbf, - 0xe9, 0x5d, 0xed, 0xfa, 0x21, 0xdf, 0x76, 0x5c, 0xce, 0x02, 0x8c, 0x5e, 0x7b, 0xa1, 0x74, 0x57, - 0x25, 0x3d, 0xd4, 0xa2, 0xf4, 0x7b, 0x72, 0x13, 0xf1, 0x3d, 0x1e, 0x44, 0x16, 0x8f, 0x02, 0x66, - 0xdf, 0x67, 0xdc, 0xb4, 0x4d, 0x6e, 0x96, 0x52, 0x62, 0x11, 0xdd, 0xbf, 0x9d, 0xc4, 0xfa, 0x74, - 0x06, 0x30, 0x1d, 0xad, 0xfb, 0x5f, 0x83, 0x68, 0xd8, 0x79, 0xe9, 0x6d, 0xb2, 0x80, 0x26, 0x9b, - 0xa2, 0x67, 0x86, 0xaa, 0x5a, 0x56, 0x44, 0x55, 0xe7, 0x60, 0xc8, 0x0b, 0xf4, 0x63, 0x72, 0x61, - 0x98, 0x3e, 0x90, 0xb2, 0x93, 0xe5, 0xb0, 0x96, 0xc4, 0x7a, 0x45, 0x07, 0x15, 0x84, 0x7e, 0x48, - 0x96, 0x65, 0x5c, 0xb7, 0xa2, 0xc0, 0xe4, 0x8e, 0xef, 0xa9, 0xdc, 0xa7, 0x49, 0xac, 0x97, 0x34, - 0x50, 0x92, 0xc5, 0xe9, 0x51, 0xc8, 0x6c, 0xc3, 0xf5, 0xfd, 0x81, 0x74, 0x2a, 0xe7, 0xd0, 0xbc, - 0x3c, 0xbd, 0xac, 0x83, 0x0a, 0xd2, 0xfd, 0x88, 0xcc, 0xa9, 0x19, 0x29, 0x66, 0x44, 0xc8, 0xfd, - 0x80, 0x95, 0xc6, 0xca, 0x9e, 0xc0, 0xb2, 0x19, 0x81, 0x14, 0x90, 0x3f, 0xdd, 0xdf, 0x66, 0xc9, - 0xfc, 0xbd, 0x6c, 0x14, 0x2e, 0x62, 0x64, 0x80, 0x89, 0x26, 0x26, 0x9b, 0x8d, 0x66, 0x5c, 0x10, - 0xbd, 0x35, 0x8f, 0x43, 0x41, 0xa2, 0xdb, 0x84, 0xe6, 0xe2, 0x79, 0xdf, 0xe4, 0x68, 0x2b, 0x43, - 0xf8, 0x5a, 0x12, 0xeb, 0x35, 0x5a, 0xa8, 0xc1, 0xd2, 0xd3, 0x0d, 0x94, 0x43, 0x15, 0xc4, 0xec, - 0x74, 0x85, 0x43, 0x41, 0x12, 0xc1, 0xcf, 0xca, 0x7f, 0x8f, 0x79, 0x5c, 0x75, 0x0b, 0x0c, 0x7e, - 0x51, 0x03, 0x25, 0x39, 0x8b, 0x97, 0x36, 0x75, 0xbc, 0xfe, 0xd0, 0x88, 0x86, 0xfa, 0xf4, 0x60, - 0x95, 0x16, 0xec, 0x40, 0x65, 0x5b, 0x76, 0x70, 0xaa, 0x81, 0x92, 0x4c, 0x3f, 0x23, 0x97, 0x72, - 0xc8, 0x96, 0xff, 0xc8, 0x73, 0x7d, 0xd3, 0x4e, 0xa3, 0x76, 0x25, 0x89, 0xf5, 0x7a, 0x02, 0xd4, - 0xc3, 0xe2, 0x1d, 0x58, 0x05, 0x0c, 0x9b, 0x59, 0x33, 0x7b, 0x07, 0x55, 0x2d, 0xd4, 0x60, 0xd4, - 0x22, 0x57, 0x44, 0xe7, 0x3a, 0x01, 0x76, 0xc0, 0x02, 0xe6, 0x59, 0xcc, 0xce, 0x8a, 0xaf, 0xbd, - 0x84, 0x79, 0x79, 0x33, 0x89, 0xf5, 0xeb, 0x63, 0x49, 0xa3, 0x0a, 0x85, 0xf1, 0x7e, 0xb2, 0xed, - 0xa7, 0xb4, 0x5b, 0x08, 0x6c, 0xcc, 0xf6, 0x33, 0x7a, 0x3e, 0x60, 0x07, 0xe1, 0x36, 0xe3, 0xd6, - 0x61, 0xda, 0xd7, 0xf3, 0xcf, 0x57, 0xd0, 0x42, 0x0d, 0x46, 0xbf, 0x26, 0x6d, 0xcb, 0xc7, 0x74, - 0x77, 0x7c, 0x6f, 0xd3, 0xf7, 0x78, 0xe0, 0xbb, 0x3b, 0x26, 0x67, 0x9e, 0x75, 0x82, 0xad, 0xbf, - 0x69, 0x5c, 0x4b, 0x62, 0x7d, 0x2c, 0x07, 0xc6, 0x6a, 0xa8, 0x4d, 0xae, 0x0d, 0x9d, 0x21, 0x13, - 0x43, 0xf2, 0xab, 0xc0, 0x1c, 0x0e, 0x59, 0x20, 0x0b, 0x94, 0xd9, 0xb2, 0xb5, 0xca, 0x51, 0xb1, - 0x9e, 0xc4, 0xfa, 0x44, 0x1e, 0x4c, 0xd4, 0x8a, 0x35, 0x59, 0x44, 0xd7, 0xdf, 0x7f, 0xa0, 0xd6, - 0x8e, 0xd1, 0x9a, 0xbc, 0x25, 0xd1, 0x6c, 0x4d, 0x56, 0x34, 0x18, 0x5d, 0x74, 0xff, 0x9d, 0x27, - 0x73, 0x8a, 0x85, 0x37, 0x1b, 0xb0, 0xdd, 0x80, 0xd9, 0x8e, 0x65, 0x72, 0xb6, 0xc5, 0x2c, 0x7f, - 0x30, 0x0c, 0x64, 0xcf, 0xf5, 0x1f, 0x8d, 0xfa, 0xa6, 0xbc, 0xd9, 0x09, 0x3c, 0x98, 0xa8, 0xa5, - 0x7d, 0xf2, 0xc6, 0x38, 0x3d, 0x36, 0x70, 0x95, 0xed, 0xd7, 0x93, 0x58, 0x9f, 0x4c, 0x84, 0xc9, - 0x6a, 0xfa, 0x73, 0x83, 0xf4, 0xc6, 0x31, 0xc6, 0x0c, 0x0f, 0x55, 0x1b, 0x77, 0x92, 0x58, 0x7f, - 0x55, 0x53, 0x78, 0x55, 0x03, 0xba, 0x49, 0x2e, 0x8a, 0xa1, 0x91, 0xda, 0x60, 0x8c, 0x65, 0x9b, - 0xba, 0x94, 0xc4, 0x7a, 0x55, 0x09, 0x55, 0x88, 0x3e, 0x20, 0x9d, 0x02, 0x58, 0x0d, 0xa7, 0x2c, - 0x87, 0x6e, 0x12, 0xeb, 0x67, 0x30, 0xe1, 0x0c, 0x3d, 0xfd, 0x8e, 0xdc, 0x28, 0x30, 0xc6, 0x05, - 0x51, 0x96, 0xcc, 0xad, 0x24, 0xd6, 0xa7, 0xe2, 0xc3, 0x54, 0x2c, 0xd1, 0x59, 0xb3, 0x19, 0x8b, - 0xb1, 0x9a, 0xcb, 0x3a, 0x6b, 0x51, 0x03, 0x25, 0x59, 0x0c, 0x91, 0xa1, 0xd9, 0x67, 0xe1, 0x9e, - 0x65, 0x7a, 0xd9, 0x9e, 0x85, 0x43, 0x24, 0x8f, 0x43, 0x41, 0xa2, 0x77, 0xc9, 0x0a, 0xca, 0xb9, - 0x4e, 0x2c, 0x17, 0xac, 0xd5, 0x24, 0xd6, 0xcb, 0x2a, 0x28, 0x03, 0x62, 0x9d, 0x2a, 0x41, 0x32, - 0x3c, 0x24, 0x5b, 0xa7, 0xea, 0xf4, 0x50, 0x8b, 0x8a, 0x1d, 0x46, 0xe0, 0xa3, 0x31, 0xb8, 0x90, - 0xed, 0x30, 0x39, 0x18, 0xf2, 0x42, 0x3a, 0x82, 0x45, 0x08, 0x3e, 0x39, 0x36, 0x1d, 0xd7, 0xdc, - 0x77, 0x99, 0x5a, 0xb7, 0xb2, 0x11, 0x5c, 0xd0, 0x42, 0x0d, 0x96, 0xce, 0xa5, 0x5d, 0xb3, 0xcf, - 0x0a, 0x93, 0x64, 0xa9, 0x34, 0x97, 0xca, 0x04, 0xa8, 0x87, 0xbb, 0xbf, 0x6b, 0x44, 0xc3, 0xbe, - 0x2e, 0x5e, 0xea, 0x21, 0x33, 0x6d, 0xd9, 0xe4, 0x31, 0x3a, 0xb9, 0x39, 0x5d, 0xd4, 0x40, 0x49, - 0x2e, 0xd8, 0xca, 0x6e, 0xaa, 0xd5, 0xd8, 0xca, 0xfe, 0x59, 0x92, 0x45, 0xed, 0xd9, 0x95, 0x4a, - 0x69, 0x65, 0xb5, 0x57, 0x51, 0x42, 0x15, 0x2a, 0x3b, 0xc9, 0x77, 0xf4, 0x8a, 0x13, 0x79, 0x1b, - 0x55, 0x48, 0x24, 0x59, 0xf9, 0x3e, 0xe6, 0xb3, 0x24, 0x2b, 0xdf, 0x45, 0x19, 0x10, 0xe6, 0x18, - 0xe3, 0xad, 0x68, 0xe8, 0x62, 0xf9, 0x84, 0xf9, 0x1c, 0x2d, 0xa9, 0xa0, 0x0c, 0x60, 0x8a, 0x97, - 0xb6, 0x7d, 0x92, 0x4b, 0xf1, 0xd2, 0xa2, 0x5f, 0x06, 0xe8, 0x90, 0xac, 0xa7, 0x81, 0x1d, 0xd7, - 0x0d, 0x64, 0xa6, 0xde, 0x48, 0x62, 0xfd, 0x4c, 0x2e, 0x9c, 0xc9, 0xa0, 0x27, 0xe4, 0x4d, 0x7b, - 0x8a, 0x3e, 0x2e, 0x93, 0xfc, 0xad, 0x24, 0xd6, 0xa7, 0xa1, 0xc3, 0x34, 0xa4, 0xee, 0x5f, 0x4d, - 0xa2, 0xe1, 0x77, 0xbc, 0x68, 0x27, 0x4c, 0x7e, 0x83, 0x6d, 0xfb, 0x91, 0x57, 0xd8, 0x88, 0xf3, - 0x38, 0x14, 0x24, 0xb1, 0xd4, 0xb3, 0xd1, 0x97, 0xdb, 0x51, 0x24, 0x76, 0x6b, 0xb9, 0xd9, 0x69, - 0x72, 0xa9, 0x2f, 0xeb, 0xa0, 0x82, 0xd0, 0xf7, 0xc9, 0x92, 0xc2, 0x70, 0xd9, 0x94, 0x5f, 0xd3, - 0x9a, 0x71, 0x31, 0x89, 0xf5, 0xa2, 0x02, 0x8a, 0xa2, 0x30, 0xc4, 0xcf, 0x7f, 0x60, 0x16, 0x73, - 0x8e, 0xd3, 0x6f, 0x67, 0x34, 0x2c, 0x28, 0xa0, 0x28, 0x8a, 0xaf, 0x60, 0x04, 0x70, 0x85, 0x96, - 0xe5, 0x85, 0x5f, 0xc1, 0x29, 0x08, 0xd9, 0xa5, 0xf8, 0xb8, 0x0e, 0xe4, 0xbd, 0xca, 0x5a, 0xd2, - 0xe4, 0xc7, 0xf5, 0x08, 0x83, 0xf4, 0x4a, 0x04, 0xd0, 0xce, 0x37, 0x92, 0xb9, 0xac, 0x1f, 0xe7, - 0x71, 0x28, 0x48, 0xa2, 0xde, 0x70, 0x7d, 0xdc, 0x61, 0x5e, 0x9f, 0x1f, 0xee, 0xb1, 0xe0, 0x38, - 0x6d, 0xe5, 0x58, 0x6f, 0x15, 0x25, 0x54, 0x21, 0x83, 0x3d, 0x7d, 0xde, 0x99, 0x79, 0xf6, 0xbc, - 0x33, 0xf3, 0xf2, 0x79, 0xa7, 0xf1, 0xc3, 0x69, 0xa7, 0xf1, 0xeb, 0x69, 0xa7, 0xf1, 0xe4, 0xb4, - 0xd3, 0x78, 0x7a, 0xda, 0x69, 0xfc, 0x7d, 0xda, 0x69, 0xfc, 0x73, 0xda, 0x99, 0x79, 0x79, 0xda, - 0x69, 0xfc, 0xf8, 0xa2, 0x33, 0xf3, 0xf4, 0x45, 0x67, 0xe6, 0xd9, 0x8b, 0xce, 0xcc, 0x37, 0xbd, - 0xbe, 0xc3, 0x0f, 0xa3, 0xfd, 0x0d, 0xcb, 0x1f, 0xf4, 0xfa, 0x81, 0x79, 0x60, 0x7a, 0x66, 0xcf, - 0xf5, 0x1f, 0x3a, 0xbd, 0xe3, 0x3b, 0xbd, 0xba, 0x7f, 0x94, 0xee, 0xb7, 0xf0, 0xdf, 0xa0, 0x77, - 0xfe, 0x0f, 0x00, 0x00, 0xff, 0xff, 0x61, 0x8c, 0x00, 0x50, 0x47, 0x15, 0x00, 0x00, + // 1676 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x58, 0xbd, 0x6f, 0xdc, 0x46, + 0x16, 0xd7, 0x6a, 0xcd, 0x95, 0x3c, 0xfa, 0xb2, 0x47, 0xf2, 0x79, 0x7d, 0xf6, 0x2d, 0xe5, 0x3d, + 0x1b, 0xe7, 0xc3, 0x01, 0x5a, 0xd8, 0x3e, 0x20, 0x48, 0x10, 0x03, 0x09, 0x25, 0x0b, 0x30, 0x20, + 0x23, 0xca, 0x53, 0x9c, 0x04, 0x49, 0x45, 0x91, 0xa3, 0x15, 0x6d, 0x2e, 0xb9, 0xe2, 0x87, 0x6c, + 0x01, 0x01, 0x92, 0x3f, 0x21, 0x7d, 0x90, 0x36, 0x48, 0x93, 0x2a, 0x55, 0xea, 0x34, 0x2e, 0x5d, + 0xba, 0x22, 0x62, 0xb9, 0x09, 0x58, 0x19, 0x29, 0x83, 0x14, 0xc1, 0xbc, 0x99, 0x25, 0x87, 0x1f, + 0xbb, 0x5a, 0x37, 0x22, 0xdf, 0xef, 0xfd, 0xde, 0x9b, 0xd1, 0xe3, 0xbc, 0x8f, 0x59, 0xb2, 0x3e, + 0x7c, 0xd2, 0xef, 0xb9, 0x7e, 0xff, 0xc8, 0x1d, 0xf8, 0x36, 0x73, 0x7b, 0x61, 0x64, 0x46, 0xa1, + 0xf8, 0xbb, 0x31, 0x0c, 0xfc, 0xc8, 0xa7, 0x1a, 0x0a, 0xff, 0x5c, 0xeb, 0xfb, 0x7d, 0x1f, 0x91, + 0x1e, 0x7f, 0x13, 0xca, 0xee, 0x0f, 0xb3, 0xa4, 0x05, 0x2c, 0x8c, 0xdd, 0x88, 0xbe, 0x4b, 0xe6, + 0xc2, 0x78, 0x30, 0x30, 0x83, 0x93, 0x76, 0x63, 0xbd, 0x71, 0x6b, 0xe1, 0xce, 0xf2, 0x86, 0x70, + 0xb3, 0x27, 0x50, 0x63, 0xe5, 0x79, 0xa2, 0xcf, 0xa4, 0x89, 0x3e, 0xa2, 0xc1, 0xe8, 0x85, 0x9b, + 0x1e, 0xc5, 0x2c, 0x70, 0x58, 0xd0, 0x9e, 0x2d, 0x98, 0x7e, 0x2c, 0xd0, 0xdc, 0x54, 0xd2, 0x60, + 0xf4, 0x42, 0xef, 0x91, 0x79, 0xc7, 0xeb, 0xb3, 0x30, 0x62, 0x41, 0xbb, 0x89, 0xb6, 0x2b, 0xd2, + 0xf6, 0x81, 0x84, 0x8d, 0x0b, 0xd2, 0x38, 0x23, 0x42, 0xf6, 0x46, 0xff, 0x4f, 0x5a, 0x96, 0x69, + 0x1d, 0xb2, 0xb0, 0x7d, 0x0e, 0x8d, 0x97, 0xa4, 0xf1, 0x26, 0x82, 0xc6, 0x92, 0x34, 0xd5, 0x90, + 0x04, 0x92, 0x4b, 0x6f, 0x13, 0xcd, 0xf1, 0x6c, 0xf6, 0xac, 0xad, 0xa1, 0xd1, 0x62, 0xb6, 0xa2, + 0xcd, 0x9e, 0xe5, 0x36, 0x48, 0x01, 0xf1, 0xe8, 0x7e, 0x77, 0x8e, 0xb4, 0x36, 0x33, 0x6b, 0xeb, + 0x30, 0xf6, 0x9e, 0xc8, 0x30, 0x2d, 0xaa, 0x4b, 0x2a, 0x2b, 0x72, 0x0a, 0x88, 0x47, 0xbe, 0xe0, + 0xec, 0x24, 0x13, 0x75, 0x41, 0xfe, 0x9f, 0x05, 0xf8, 0x61, 0x64, 0x58, 0x8a, 0x36, 0xcb, 0xd2, + 0x46, 0x72, 0x40, 0x3e, 0xe9, 0x26, 0x59, 0x40, 0x9a, 0xf8, 0xa6, 0x32, 0x28, 0x45, 0xd3, 0x55, + 0x69, 0xaa, 0x12, 0x41, 0x15, 0xe8, 0x36, 0x59, 0x3c, 0xf6, 0xdd, 0x78, 0xc0, 0xa4, 0x17, 0xad, + 0xc6, 0xcb, 0x9a, 0xf4, 0x52, 0x60, 0x42, 0x41, 0xe2, 0x7e, 0x42, 0xfe, 0x95, 0x47, 0xbb, 0x69, + 0x4d, 0xf2, 0xa3, 0x32, 0xa1, 0x20, 0xf1, 0x7f, 0xca, 0x35, 0xf7, 0x99, 0x2b, 0xdd, 0xcc, 0x4d, + 0xfa, 0xa7, 0x14, 0x22, 0xa8, 0x02, 0xfd, 0x92, 0xac, 0x3a, 0x5e, 0x18, 0x99, 0x5e, 0xf4, 0x90, + 0x45, 0x81, 0x63, 0x49, 0x67, 0xf3, 0x35, 0xce, 0xae, 0x4a, 0x67, 0x75, 0x06, 0x50, 0x07, 0x76, + 0x7f, 0x69, 0x91, 0x39, 0x99, 0x26, 0xf4, 0x11, 0xb9, 0xbc, 0x7f, 0x12, 0xb1, 0x70, 0x37, 0xf0, + 0x2d, 0x16, 0x86, 0xcc, 0xde, 0x65, 0xc1, 0x1e, 0xb3, 0x7c, 0xcf, 0xc6, 0x03, 0xd3, 0x34, 0xae, + 0xa6, 0x89, 0x3e, 0x8e, 0x02, 0xe3, 0x14, 0xdc, 0xad, 0xeb, 0x78, 0xb5, 0x6e, 0x67, 0x73, 0xb7, + 0x63, 0x28, 0x30, 0x4e, 0x41, 0x1f, 0x90, 0xd5, 0xc8, 0x8f, 0x4c, 0xd7, 0x28, 0x2c, 0x8b, 0x67, + 0xae, 0x69, 0x5c, 0xe6, 0x41, 0xa8, 0x51, 0x43, 0x1d, 0x98, 0xb9, 0xda, 0x29, 0x2c, 0x85, 0x67, + 0x50, 0x75, 0x55, 0x54, 0x43, 0x1d, 0x48, 0x6f, 0x91, 0x79, 0xf6, 0x8c, 0x59, 0x9f, 0x38, 0x03, + 0x86, 0xa7, 0xaf, 0x61, 0x2c, 0xf2, 0x02, 0x30, 0xc2, 0x20, 0x7b, 0xa3, 0xff, 0x23, 0xe7, 0x8f, + 0x62, 0x16, 0x33, 0xa4, 0xb6, 0x90, 0xba, 0x94, 0x26, 0x7a, 0x0e, 0x42, 0xfe, 0x4a, 0x37, 0x08, + 0x09, 0xe3, 0x7d, 0x51, 0x7a, 0x42, 0x3c, 0x47, 0x4d, 0x63, 0x39, 0x4d, 0x74, 0x05, 0x05, 0xe5, + 0x9d, 0xee, 0x90, 0x35, 0xdc, 0xdd, 0x7d, 0x2f, 0x12, 0xc7, 0x31, 0x8a, 0x03, 0x8f, 0xd9, 0x78, + 0x68, 0x9a, 0x46, 0x3b, 0x4d, 0xf4, 0x5a, 0x3d, 0xd4, 0xa2, 0xb4, 0x4b, 0x5a, 0xe1, 0xd0, 0x75, + 0xa2, 0xb0, 0x7d, 0x1e, 0xed, 0x09, 0xcf, 0x5f, 0x81, 0x80, 0x7c, 0x22, 0xe7, 0xd0, 0x0c, 0xec, + 0xb0, 0x4d, 0x14, 0x0e, 0x22, 0x20, 0x9f, 0xd9, 0xae, 0x76, 0xfd, 0x30, 0xda, 0x76, 0xdc, 0x88, + 0x05, 0x18, 0xbd, 0xf6, 0x42, 0x69, 0x57, 0x25, 0x3d, 0xd4, 0xa2, 0xf4, 0x6b, 0x72, 0x13, 0xf1, + 0xbd, 0x28, 0x88, 0xad, 0x28, 0x0e, 0x98, 0xfd, 0x90, 0x45, 0xa6, 0x6d, 0x46, 0x66, 0xe9, 0x48, + 0x2c, 0xa2, 0xfb, 0xff, 0xa6, 0x89, 0x3e, 0x9d, 0x01, 0x4c, 0x47, 0xeb, 0xfe, 0xd9, 0x20, 0x1a, + 0x56, 0x5e, 0x7a, 0x9b, 0x2c, 0xa0, 0xc9, 0x26, 0xaf, 0x99, 0xa1, 0xcc, 0x96, 0x15, 0x9e, 0xd5, + 0x0a, 0x0c, 0xaa, 0x40, 0x3f, 0x20, 0x17, 0x86, 0xd9, 0x3f, 0x24, 0xed, 0x44, 0x3a, 0xac, 0xa5, + 0x89, 0x5e, 0xd1, 0x41, 0x05, 0xa1, 0xef, 0x91, 0x65, 0x11, 0xd7, 0xad, 0x38, 0x30, 0x23, 0xc7, + 0xf7, 0xe4, 0xd9, 0xa7, 0x69, 0xa2, 0x97, 0x34, 0x50, 0x92, 0xf9, 0xea, 0x71, 0xc8, 0x6c, 0xc3, + 0xf5, 0xfd, 0x81, 0x70, 0x2a, 0xfa, 0xd0, 0xbc, 0x58, 0xbd, 0xac, 0x83, 0x0a, 0xd2, 0x7d, 0x9f, + 0xcc, 0xc9, 0x1e, 0xc9, 0x7b, 0x44, 0x18, 0xf9, 0x01, 0x2b, 0xb5, 0x95, 0x3d, 0x8e, 0xe5, 0x3d, + 0x02, 0x29, 0x20, 0x1e, 0xdd, 0x9f, 0x66, 0xc9, 0xfc, 0x83, 0xbc, 0x15, 0x2e, 0x62, 0x64, 0x80, + 0xf1, 0x22, 0x26, 0x8a, 0x8d, 0x66, 0x5c, 0xe0, 0xb5, 0x55, 0xc5, 0xa1, 0x20, 0xd1, 0x6d, 0x42, + 0x95, 0x78, 0x3e, 0x34, 0x23, 0xb4, 0x15, 0x21, 0xfc, 0x47, 0x9a, 0xe8, 0x35, 0x5a, 0xa8, 0xc1, + 0xb2, 0xd5, 0x0d, 0x94, 0x43, 0x19, 0xc4, 0x7c, 0x75, 0x89, 0x43, 0x41, 0xe2, 0xc1, 0xcf, 0xd3, + 0x7f, 0x8f, 0x79, 0x91, 0xac, 0x16, 0x18, 0xfc, 0xa2, 0x06, 0x4a, 0x72, 0x1e, 0x2f, 0x6d, 0xea, + 0x78, 0xfd, 0xa5, 0x11, 0x0d, 0xf5, 0xd9, 0xc2, 0xf2, 0x58, 0xb0, 0x03, 0x79, 0xda, 0xf2, 0x85, + 0x33, 0x0d, 0x94, 0x64, 0xfa, 0x11, 0xb9, 0xa4, 0x20, 0x5b, 0xfe, 0x53, 0xcf, 0xf5, 0x4d, 0x3b, + 0x8b, 0xda, 0x95, 0x34, 0xd1, 0xeb, 0x09, 0x50, 0x0f, 0xf3, 0x6f, 0x60, 0x15, 0x30, 0x2c, 0x66, + 0xcd, 0xfc, 0x1b, 0x54, 0xb5, 0x50, 0x83, 0x51, 0x8b, 0x5c, 0xe1, 0x95, 0xeb, 0x04, 0xd8, 0x01, + 0x0b, 0x98, 0x67, 0x31, 0x3b, 0x4f, 0xbe, 0xf6, 0x12, 0x9e, 0xcb, 0x9b, 0x69, 0xa2, 0x5f, 0x1f, + 0x4b, 0x1a, 0x65, 0x28, 0x8c, 0xf7, 0x43, 0x37, 0xc9, 0x45, 0x54, 0x3e, 0x0a, 0x99, 0xfd, 0xe9, + 0x9d, 0xfb, 0x5e, 0xdf, 0xf1, 0x58, 0x7b, 0x19, 0x9d, 0x5f, 0x4a, 0x13, 0xbd, 0xaa, 0x84, 0x2a, + 0x94, 0x8f, 0x50, 0xa5, 0x01, 0x85, 0x63, 0x63, 0x46, 0xa8, 0x51, 0x90, 0x80, 0x1d, 0x84, 0xdb, + 0x2c, 0xb2, 0x0e, 0xb3, 0xe6, 0xa0, 0x06, 0xa9, 0xa0, 0x85, 0x1a, 0x8c, 0x7e, 0x4e, 0xda, 0x96, + 0x8f, 0x39, 0xe3, 0xf8, 0xde, 0xa6, 0xef, 0x45, 0x81, 0xef, 0xee, 0x98, 0x11, 0xf3, 0xac, 0x13, + 0xec, 0x1f, 0x4d, 0xe3, 0x5a, 0x9a, 0xe8, 0x63, 0x39, 0x30, 0x56, 0x43, 0x6d, 0x72, 0x6d, 0xe8, + 0x0c, 0x19, 0xef, 0xb4, 0x9f, 0x05, 0xe6, 0x70, 0xc8, 0x02, 0x91, 0xe5, 0xcc, 0x16, 0xf5, 0x59, + 0xf4, 0x9b, 0xf5, 0x34, 0xd1, 0x27, 0xf2, 0x60, 0xa2, 0x96, 0xcf, 0xda, 0xfc, 0x13, 0xf9, 0xfb, + 0x8f, 0xe5, 0xec, 0x32, 0x9a, 0xb5, 0xb7, 0x04, 0x9a, 0xcf, 0xda, 0x92, 0x06, 0xa3, 0x97, 0xee, + 0x1f, 0xf3, 0x64, 0x4e, 0xb2, 0x70, 0xb3, 0x01, 0xdb, 0x0d, 0x98, 0xed, 0x58, 0x66, 0xc4, 0xb6, + 0x98, 0xe5, 0x0f, 0x86, 0x81, 0x28, 0xdc, 0xfe, 0xd3, 0x51, 0xf1, 0x15, 0x9b, 0x9d, 0xc0, 0x83, + 0x89, 0x5a, 0xda, 0x27, 0xff, 0x1a, 0xa7, 0xc7, 0x2e, 0x20, 0x53, 0xe6, 0x7a, 0x9a, 0xe8, 0x93, + 0x89, 0x30, 0x59, 0x4d, 0xbf, 0x6f, 0x90, 0xde, 0x38, 0xc6, 0x98, 0x0e, 0x24, 0x13, 0xec, 0x6e, + 0x9a, 0xe8, 0x6f, 0x6b, 0x0a, 0x6f, 0x6b, 0xc0, 0xb3, 0x86, 0x77, 0x9e, 0xcc, 0x06, 0x63, 0x2c, + 0x6a, 0x1d, 0x66, 0x4d, 0x45, 0x09, 0x55, 0x88, 0x3e, 0x26, 0x9d, 0x02, 0x58, 0x0d, 0xa7, 0x48, + 0x87, 0x6e, 0x9a, 0xe8, 0x67, 0x30, 0xe1, 0x0c, 0x3d, 0xfd, 0x8a, 0xdc, 0x28, 0x30, 0xc6, 0x05, + 0x51, 0xa4, 0xcc, 0xad, 0x34, 0xd1, 0xa7, 0xe2, 0xc3, 0x54, 0x2c, 0x5e, 0x9e, 0xf3, 0x46, 0x8d, + 0xb1, 0x9a, 0xcb, 0xcb, 0x73, 0x51, 0x03, 0x25, 0x99, 0x77, 0xa2, 0xa1, 0xd9, 0x67, 0xe1, 0x9e, + 0x65, 0x7a, 0xf9, 0xb0, 0x86, 0x9d, 0x48, 0xc5, 0xa1, 0x20, 0xd1, 0x7b, 0x64, 0x05, 0x65, 0xa5, + 0x9c, 0x8b, 0x29, 0x6d, 0x35, 0x4d, 0xf4, 0xb2, 0x0a, 0xca, 0x00, 0x9f, 0xc9, 0x4a, 0x90, 0x08, + 0x0f, 0xc9, 0x67, 0xb2, 0x3a, 0x3d, 0xd4, 0xa2, 0x7c, 0x10, 0xe2, 0xf8, 0xa8, 0x97, 0x2e, 0xe4, + 0x83, 0x90, 0x02, 0x83, 0x2a, 0x64, 0x7d, 0x9c, 0x87, 0xe0, 0xc3, 0x63, 0xd3, 0x71, 0xcd, 0x7d, + 0x97, 0xc9, 0x99, 0x2d, 0xef, 0xe3, 0x05, 0x2d, 0xd4, 0x60, 0x59, 0x73, 0xdb, 0x35, 0xfb, 0xac, + 0xd0, 0x8e, 0x96, 0x4a, 0xcd, 0xad, 0x4c, 0x80, 0x7a, 0xb8, 0xfb, 0xb3, 0x46, 0x34, 0xac, 0xeb, + 0xfc, 0xa3, 0x1e, 0x32, 0xd3, 0x16, 0x45, 0x1e, 0xa3, 0xa3, 0x34, 0xfb, 0xa2, 0x06, 0x4a, 0x72, + 0xc1, 0x56, 0x54, 0x53, 0xad, 0xc6, 0x56, 0xd4, 0xcf, 0x92, 0xcc, 0x73, 0xcf, 0xae, 0x64, 0x4a, + 0x2b, 0xcf, 0xbd, 0x8a, 0x12, 0xaa, 0x50, 0xd9, 0x89, 0x5a, 0xd1, 0x2b, 0x4e, 0xc4, 0x36, 0xaa, + 0x10, 0x3f, 0x64, 0xe5, 0x7d, 0xcc, 0xe7, 0x87, 0xac, 0xbc, 0x8b, 0x32, 0xc0, 0xcd, 0x31, 0xc6, + 0x5b, 0xf1, 0xd0, 0xc5, 0xf4, 0x09, 0xd5, 0x33, 0x5a, 0x52, 0x41, 0x19, 0xc0, 0x23, 0x5e, 0xba, + 0x32, 0x10, 0xe5, 0x88, 0x97, 0x6e, 0x0b, 0x65, 0x80, 0x0e, 0xc9, 0x7a, 0x16, 0xd8, 0x71, 0xd5, + 0x40, 0x9c, 0xd4, 0x1b, 0x69, 0xa2, 0x9f, 0xc9, 0x85, 0x33, 0x19, 0xf4, 0x84, 0xfc, 0xdb, 0x9e, + 0xa2, 0x8e, 0x8b, 0x43, 0xfe, 0x9f, 0x34, 0xd1, 0xa7, 0xa1, 0xc3, 0x34, 0xa4, 0xee, 0xaf, 0x4d, + 0xa2, 0xe1, 0x8f, 0x01, 0xbc, 0x9c, 0x30, 0x71, 0x91, 0xdb, 0xf6, 0x63, 0xaf, 0x30, 0x56, 0xab, + 0x38, 0x14, 0x24, 0x7e, 0x33, 0x60, 0xa3, 0xeb, 0xdf, 0x51, 0xcc, 0x07, 0x74, 0x31, 0x1e, 0x6a, + 0xe2, 0x66, 0x50, 0xd6, 0x41, 0x05, 0xa1, 0xef, 0x90, 0x25, 0x89, 0xe1, 0xc4, 0x2a, 0xae, 0xe4, + 0x9a, 0x71, 0x31, 0x4d, 0xf4, 0xa2, 0x02, 0x8a, 0x22, 0x37, 0xc4, 0xdf, 0x10, 0x80, 0x59, 0xcc, + 0x39, 0xce, 0x2e, 0xe0, 0x68, 0x58, 0x50, 0x40, 0x51, 0xe4, 0x57, 0x69, 0x04, 0x70, 0x0e, 0x17, + 0xe9, 0x85, 0x57, 0xe9, 0x0c, 0x84, 0xfc, 0x95, 0xdf, 0xd0, 0x03, 0xb1, 0x57, 0x91, 0x4b, 0x9a, + 0xb8, 0xa1, 0x8f, 0x30, 0xc8, 0xde, 0x78, 0x00, 0x6d, 0xb5, 0x90, 0xcc, 0xe5, 0xf5, 0x58, 0xc5, + 0xa1, 0x20, 0x65, 0x63, 0xe6, 0x0e, 0xf3, 0xfa, 0xd1, 0xe1, 0x1e, 0x0b, 0x8e, 0xb3, 0x52, 0x9e, + 0x8f, 0x99, 0xaa, 0x12, 0xaa, 0x90, 0xc1, 0x5e, 0xbc, 0xea, 0xcc, 0xbc, 0x7c, 0xd5, 0x99, 0x79, + 0xf3, 0xaa, 0xd3, 0xf8, 0xe6, 0xb4, 0xd3, 0xf8, 0xf1, 0xb4, 0xd3, 0x78, 0x7e, 0xda, 0x69, 0xbc, + 0x38, 0xed, 0x34, 0x7e, 0x3b, 0xed, 0x34, 0x7e, 0x3f, 0xed, 0xcc, 0xbc, 0x39, 0xed, 0x34, 0xbe, + 0x7d, 0xdd, 0x99, 0x79, 0xf1, 0xba, 0x33, 0xf3, 0xf2, 0x75, 0x67, 0xe6, 0x8b, 0x5e, 0xdf, 0x89, + 0x0e, 0xe3, 0xfd, 0x0d, 0xcb, 0x1f, 0xf4, 0xfa, 0x81, 0x79, 0x60, 0x7a, 0x66, 0xcf, 0xf5, 0x9f, + 0x38, 0xbd, 0xe3, 0xbb, 0xbd, 0xba, 0x5f, 0x5b, 0xf7, 0x5b, 0xf8, 0x5b, 0xea, 0xdd, 0xbf, 0x03, + 0x00, 0x00, 0xff, 0xff, 0x8e, 0xd9, 0x59, 0xdf, 0x8c, 0x15, 0x00, 0x00, } func (this *Result) Equal(that interface{}) bool { @@ -1411,6 +1422,9 @@ func (this *Store) Equal(that interface{}) bool { if this.QueryReferencedStructured != that1.QueryReferencedStructured { return false } + if this.QueryUsedV2Engine != that1.QueryUsedV2Engine { + return false + } if !this.Chunk.Equal(&that1.Chunk) { return false } @@ -1674,12 +1688,13 @@ func (this *Store) GoString() string { if this == nil { return "nil" } - s := make([]string, 0, 13) + s := make([]string, 0, 14) s = append(s, "&stats.Store{") s = append(s, "TotalChunksRef: "+fmt.Sprintf("%#v", this.TotalChunksRef)+",\n") s = append(s, "TotalChunksDownloaded: "+fmt.Sprintf("%#v", this.TotalChunksDownloaded)+",\n") s = append(s, "ChunksDownloadTime: "+fmt.Sprintf("%#v", this.ChunksDownloadTime)+",\n") s = append(s, "QueryReferencedStructured: "+fmt.Sprintf("%#v", this.QueryReferencedStructured)+",\n") + s = append(s, "QueryUsedV2Engine: "+fmt.Sprintf("%#v", this.QueryUsedV2Engine)+",\n") s = append(s, "Chunk: "+strings.Replace(this.Chunk.GoString(), `&`, ``, 1)+",\n") s = append(s, "ChunkRefsFetchTime: "+fmt.Sprintf("%#v", this.ChunkRefsFetchTime)+",\n") s = append(s, "CongestionControlLatency: "+fmt.Sprintf("%#v", this.CongestionControlLatency)+",\n") @@ -2168,6 +2183,16 @@ func (m *Store) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.QueryUsedV2Engine { + i-- + if m.QueryUsedV2Engine { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x70 + } if m.QueryReferencedStructured { i-- if m.QueryReferencedStructured { @@ -2636,6 +2661,9 @@ func (m *Store) Size() (n int) { if m.QueryReferencedStructured { n += 2 } + if m.QueryUsedV2Engine { + n += 2 + } return n } @@ -2865,6 +2893,7 @@ func (this *Store) String() string { `PipelineWrapperFilteredLines:` + fmt.Sprintf("%v", this.PipelineWrapperFilteredLines) + `,`, `Dataobj:` + strings.Replace(strings.Replace(this.Dataobj.String(), "Dataobj", "Dataobj", 1), `&`, ``, 1) + `,`, `QueryReferencedStructured:` + fmt.Sprintf("%v", this.QueryReferencedStructured) + `,`, + `QueryUsedV2Engine:` + fmt.Sprintf("%v", this.QueryUsedV2Engine) + `,`, `}`, }, "") return s @@ -4341,6 +4370,26 @@ func (m *Store) Unmarshal(dAtA []byte) error { } } m.QueryReferencedStructured = bool(v != 0) + case 14: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field QueryUsedV2Engine", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowStats + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.QueryUsedV2Engine = bool(v != 0) default: iNdEx = preIndex skippy, err := skipStats(dAtA[iNdEx:]) diff --git a/pkg/logqlmodel/stats/stats.proto b/pkg/logqlmodel/stats/stats.proto index e86a911ba8..241f671a59 100644 --- a/pkg/logqlmodel/stats/stats.proto +++ b/pkg/logqlmodel/stats/stats.proto @@ -146,6 +146,8 @@ message Store { int64 chunksDownloadTime = 3 [(gogoproto.jsontag) = "chunksDownloadTime"]; // Whether the query referenced structured metadata bool queryReferencedStructured = 13 [(gogoproto.jsontag) = "queryReferencedStructuredMetadata"]; + // Whether the V2 engine was used for some or all of the query. + bool queryUsedV2Engine = 14 [(gogoproto.jsontag) = "queryUsedV2Engine"]; Chunk chunk = 4 [ (gogoproto.nullable) = false, diff --git a/pkg/querier/queryrange/codec_test.go b/pkg/querier/queryrange/codec_test.go index bf34ae80db..f7ed837d5b 100644 --- a/pkg/querier/queryrange/codec_test.go +++ b/pkg/querier/queryrange/codec_test.go @@ -1946,6 +1946,7 @@ var ( "totalChunksDownloaded": 0, "chunkRefsFetchTime": 0, "queryReferencedStructuredMetadata": false, + "queryUsedV2Engine": false, "pipelineWrapperFilteredLines": 2 }, "totalBatches": 6, @@ -1987,6 +1988,7 @@ var ( "totalChunksDownloaded": 18, "chunkRefsFetchTime": 19, "queryReferencedStructuredMetadata": true, + "queryUsedV2Engine": false, "pipelineWrapperFilteredLines": 4 } }, diff --git a/pkg/querier/queryrange/prometheus_test.go b/pkg/querier/queryrange/prometheus_test.go index ba5b7701ef..99167d71af 100644 --- a/pkg/querier/queryrange/prometheus_test.go +++ b/pkg/querier/queryrange/prometheus_test.go @@ -27,6 +27,7 @@ var emptyStats = `"stats": { "totalChunksDownloaded": 0, "chunkRefsFetchTime": 0, "queryReferencedStructuredMetadata": false, + "queryUsedV2Engine": false, "pipelineWrapperFilteredLines": 0, "chunk" :{ "compressedBytes": 0, @@ -68,6 +69,7 @@ var emptyStats = `"stats": { "totalChunksDownloaded": 0, "chunkRefsFetchTime": 0, "queryReferencedStructuredMetadata": false, + "queryUsedV2Engine": false, "pipelineWrapperFilteredLines": 0, "chunk" :{ "compressedBytes": 0, diff --git a/pkg/util/marshal/legacy/marshal_test.go b/pkg/util/marshal/legacy/marshal_test.go index 6f486e8a0b..aae49eaef2 100644 --- a/pkg/util/marshal/legacy/marshal_test.go +++ b/pkg/util/marshal/legacy/marshal_test.go @@ -70,6 +70,7 @@ var queryTests = []struct { "totalChunksDownloaded": 0, "chunkRefsFetchTime": 0, "queryReferencedStructuredMetadata": false, + "queryUsedV2Engine": false, "pipelineWrapperFilteredLines": 0, "chunk" :{ "compressedBytes": 0, @@ -111,7 +112,8 @@ var queryTests = []struct { "totalChunksDownloaded": 0, "chunkRefsFetchTime": 0, "queryReferencedStructuredMetadata": false, - "pipelineWrapperFilteredLines": 0, + "queryUsedV2Engine": false, + "pipelineWrapperFilteredLines": 0, "chunk" :{ "compressedBytes": 0, "decompressedBytes": 0, diff --git a/pkg/util/marshal/marshal_test.go b/pkg/util/marshal/marshal_test.go index 5b577dbc54..365564e6c3 100644 --- a/pkg/util/marshal/marshal_test.go +++ b/pkg/util/marshal/marshal_test.go @@ -41,6 +41,7 @@ const emptyStats = `{ "totalChunksDownloaded": 0, "chunkRefsFetchTime": 0, "queryReferencedStructuredMetadata": false, + "queryUsedV2Engine": false, "pipelineWrapperFilteredLines": 0, "chunk" :{ "compressedBytes": 0, @@ -82,6 +83,7 @@ const emptyStats = `{ "totalChunksDownloaded": 0, "chunkRefsFetchTime": 0, "queryReferencedStructuredMetadata": false, + "queryUsedV2Engine": false, "pipelineWrapperFilteredLines": 0, "chunk" :{ "compressedBytes": 0,