From 824f5aa20aaaeaf99539dae8b10754ed812185e5 Mon Sep 17 00:00:00 2001 From: Ed Welch Date: Tue, 2 Apr 2024 16:42:50 -0400 Subject: [PATCH] chore: fix submodule for v3 (#12438) Signed-off-by: Edward Welch --- .../stages/structuredmetadata_test.go | 3 +- clients/pkg/promtail/client/client_test.go | 3 +- clients/pkg/promtail/promtail_wal_test.go | 3 +- go.mod | 4 +- .../loki_micro_services_delete_test.go | 3 +- pkg/chunkenc/memchunk_test.go | 3 +- pkg/distributor/distributor_test.go | 3 +- pkg/distributor/tee_test.go | 2 +- pkg/distributor/validator_test.go | 3 +- pkg/loghttp/push/otlp.go | 2 +- pkg/loghttp/push/otlp_test.go | 3 +- pkg/loghttp/push/push.go | 2 +- pkg/logproto/alias.go | 2 +- pkg/logproto/logproto.pb.go | 328 +++++++++--------- pkg/logproto/logproto.proto | 4 +- pkg/logqlmodel/logqlmodel.go | 2 +- pkg/push/go.mod | 2 +- pkg/push/push.pb.go | 69 ++-- pkg/push/push.proto | 2 +- pkg/querier/queryrange/queryrange.pb.go | 228 ++++++------ pkg/querier/queryrange/queryrange.proto | 2 +- pkg/querier/queryrange/volume_test.go | 3 +- pkg/storage/bloom/v1/bloom_tokenizer_test.go | 3 +- pkg/storage/store_test.go | 3 +- .../grafana/loki/{v3 => }/pkg/push/LICENSE | 0 .../grafana/loki/{v3 => }/pkg/push/push.pb.go | 69 ++-- .../grafana/loki/{v3 => }/pkg/push/push.proto | 2 +- .../loki/{v3 => }/pkg/push/timestamp.go | 0 .../grafana/loki/{v3 => }/pkg/push/types.go | 0 vendor/modules.txt | 6 +- 30 files changed, 384 insertions(+), 375 deletions(-) rename vendor/github.com/grafana/loki/{v3 => }/pkg/push/LICENSE (100%) rename vendor/github.com/grafana/loki/{v3 => }/pkg/push/push.pb.go (92%) rename vendor/github.com/grafana/loki/{v3 => }/pkg/push/push.proto (95%) rename vendor/github.com/grafana/loki/{v3 => }/pkg/push/timestamp.go (100%) rename vendor/github.com/grafana/loki/{v3 => }/pkg/push/types.go (100%) diff --git a/clients/pkg/logentry/stages/structuredmetadata_test.go b/clients/pkg/logentry/stages/structuredmetadata_test.go index 6bcb7a1ee9d25..2b48c641ef81d 100644 --- a/clients/pkg/logentry/stages/structuredmetadata_test.go +++ b/clients/pkg/logentry/stages/structuredmetadata_test.go @@ -8,7 +8,8 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/v3/pkg/push" + "github.com/grafana/loki/pkg/push" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) diff --git a/clients/pkg/promtail/client/client_test.go b/clients/pkg/promtail/client/client_test.go index b775bdb8eb8a8..ea3039879605b 100644 --- a/clients/pkg/promtail/client/client_test.go +++ b/clients/pkg/promtail/client/client_test.go @@ -22,8 +22,9 @@ import ( "github.com/grafana/loki/v3/clients/pkg/promtail/api" "github.com/grafana/loki/v3/clients/pkg/promtail/utils" + "github.com/grafana/loki/pkg/push" + "github.com/grafana/loki/v3/pkg/logproto" - "github.com/grafana/loki/v3/pkg/push" lokiflag "github.com/grafana/loki/v3/pkg/util/flagext" ) diff --git a/clients/pkg/promtail/promtail_wal_test.go b/clients/pkg/promtail/promtail_wal_test.go index f2013ca93e7b8..dfc7ce7273453 100644 --- a/clients/pkg/promtail/promtail_wal_test.go +++ b/clients/pkg/promtail/promtail_wal_test.go @@ -27,7 +27,8 @@ import ( "github.com/grafana/loki/v3/clients/pkg/promtail/utils" "github.com/grafana/loki/v3/clients/pkg/promtail/wal" - "github.com/grafana/loki/v3/pkg/push" + "github.com/grafana/loki/pkg/push" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) diff --git a/go.mod b/go.mod index 379a29274ff4f..0d0659a92220b 100644 --- a/go.mod +++ b/go.mod @@ -125,7 +125,7 @@ require ( github.com/fsnotify/fsnotify v1.7.0 github.com/gogo/googleapis v1.4.0 github.com/grafana/jsonparser v0.0.0-20240209175146-098958973a2d - github.com/grafana/loki/v3/pkg/push v0.0.0-20231124142027-e52380921608 + github.com/grafana/loki/pkg/push v0.0.0-20231124142027-e52380921608 github.com/heroku/x v0.0.61 github.com/influxdata/tdigest v0.0.2-0.20210216194612-fc98d27c9e8b github.com/prometheus/alertmanager v0.27.0 @@ -358,4 +358,4 @@ replace github.com/hashicorp/memberlist => github.com/grafana/memberlist v0.3.1- // Insist on the optimised version of grafana/regexp replace github.com/grafana/regexp => github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd -replace github.com/grafana/loki/v3/pkg/push => ./pkg/push +replace github.com/grafana/loki/pkg/push => ./pkg/push diff --git a/integration/loki_micro_services_delete_test.go b/integration/loki_micro_services_delete_test.go index 0ddce4aa11cbd..ce83cdb4d9f5a 100644 --- a/integration/loki_micro_services_delete_test.go +++ b/integration/loki_micro_services_delete_test.go @@ -16,9 +16,10 @@ import ( "github.com/grafana/loki/v3/integration/client" "github.com/grafana/loki/v3/integration/cluster" + "github.com/grafana/loki/pkg/push" + "github.com/grafana/loki/v3/pkg/logproto" "github.com/grafana/loki/v3/pkg/logql/syntax" - "github.com/grafana/loki/v3/pkg/push" "github.com/grafana/loki/v3/pkg/storage" ) diff --git a/pkg/chunkenc/memchunk_test.go b/pkg/chunkenc/memchunk_test.go index 06c137823ac46..8fc3eaab5ab34 100644 --- a/pkg/chunkenc/memchunk_test.go +++ b/pkg/chunkenc/memchunk_test.go @@ -18,13 +18,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/grafana/loki/pkg/push" + "github.com/grafana/loki/v3/pkg/chunkenc/testdata" "github.com/grafana/loki/v3/pkg/iter" "github.com/grafana/loki/v3/pkg/logproto" "github.com/grafana/loki/v3/pkg/logql/log" "github.com/grafana/loki/v3/pkg/logql/syntax" "github.com/grafana/loki/v3/pkg/logqlmodel/stats" - "github.com/grafana/loki/v3/pkg/push" "github.com/grafana/loki/v3/pkg/storage/chunk" "github.com/grafana/loki/v3/pkg/util/filter" ) diff --git a/pkg/distributor/distributor_test.go b/pkg/distributor/distributor_test.go index 09ee068c2d53d..b51c545166f25 100644 --- a/pkg/distributor/distributor_test.go +++ b/pkg/distributor/distributor_test.go @@ -30,12 +30,13 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/health/grpc_health_v1" + "github.com/grafana/loki/pkg/push" + "github.com/grafana/loki/v3/pkg/ingester" "github.com/grafana/loki/v3/pkg/ingester/client" loghttp_push "github.com/grafana/loki/v3/pkg/loghttp/push" "github.com/grafana/loki/v3/pkg/logproto" "github.com/grafana/loki/v3/pkg/logql/syntax" - "github.com/grafana/loki/v3/pkg/push" "github.com/grafana/loki/v3/pkg/runtime" "github.com/grafana/loki/v3/pkg/util/constants" fe "github.com/grafana/loki/v3/pkg/util/flagext" diff --git a/pkg/distributor/tee_test.go b/pkg/distributor/tee_test.go index ece0e97c1ce69..f953e09b75111 100644 --- a/pkg/distributor/tee_test.go +++ b/pkg/distributor/tee_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/mock" - "github.com/grafana/loki/v3/pkg/push" + "github.com/grafana/loki/pkg/push" ) type mockedTee struct { diff --git a/pkg/distributor/validator_test.go b/pkg/distributor/validator_test.go index 75fee909000cc..9e51099dfad38 100644 --- a/pkg/distributor/validator_test.go +++ b/pkg/distributor/validator_test.go @@ -11,9 +11,10 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/assert" + "github.com/grafana/loki/pkg/push" + "github.com/grafana/loki/v3/pkg/logproto" "github.com/grafana/loki/v3/pkg/logql/syntax" - "github.com/grafana/loki/v3/pkg/push" "github.com/grafana/loki/v3/pkg/validation" ) diff --git a/pkg/loghttp/push/otlp.go b/pkg/loghttp/push/otlp.go index 2fa645ff4581d..a361bbbf196de 100644 --- a/pkg/loghttp/push/otlp.go +++ b/pkg/loghttp/push/otlp.go @@ -18,7 +18,7 @@ import ( "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/plog/plogotlp" - "github.com/grafana/loki/v3/pkg/push" + "github.com/grafana/loki/pkg/push" "github.com/grafana/loki/v3/pkg/logproto" loki_util "github.com/grafana/loki/v3/pkg/util" diff --git a/pkg/loghttp/push/otlp_test.go b/pkg/loghttp/push/otlp_test.go index d9147e061db3a..bcdeb18d17069 100644 --- a/pkg/loghttp/push/otlp_test.go +++ b/pkg/loghttp/push/otlp_test.go @@ -13,8 +13,9 @@ import ( "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" + "github.com/grafana/loki/pkg/push" + "github.com/grafana/loki/v3/pkg/logproto" - "github.com/grafana/loki/v3/pkg/push" ) func TestOTLPToLokiPushRequest(t *testing.T) { diff --git a/pkg/loghttp/push/push.go b/pkg/loghttp/push/push.go index 74c8a20198f2c..c63b32c6111bb 100644 --- a/pkg/loghttp/push/push.go +++ b/pkg/loghttp/push/push.go @@ -12,7 +12,7 @@ import ( "github.com/go-kit/log/level" - "github.com/grafana/loki/v3/pkg/push" + "github.com/grafana/loki/pkg/push" "github.com/dustin/go-humanize" "github.com/go-kit/log" diff --git a/pkg/logproto/alias.go b/pkg/logproto/alias.go index 294b19e85dcad..ab378fcbd0e81 100644 --- a/pkg/logproto/alias.go +++ b/pkg/logproto/alias.go @@ -3,7 +3,7 @@ package logproto import ( "google.golang.org/grpc" - "github.com/grafana/loki/v3/pkg/push" + "github.com/grafana/loki/pkg/push" ) // Aliases to avoid renaming all the imports of logproto diff --git a/pkg/logproto/logproto.pb.go b/pkg/logproto/logproto.pb.go index 5058beebfaf24..3459fa836529b 100644 --- a/pkg/logproto/logproto.pb.go +++ b/pkg/logproto/logproto.pb.go @@ -12,10 +12,10 @@ import ( proto "github.com/gogo/protobuf/proto" _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" + _ "github.com/grafana/loki/pkg/push" + github_com_grafana_loki_pkg_push "github.com/grafana/loki/pkg/push" github_com_grafana_loki_v3_pkg_logql_syntax "github.com/grafana/loki/v3/pkg/logql/syntax" stats "github.com/grafana/loki/v3/pkg/logqlmodel/stats" - _ "github.com/grafana/loki/v3/pkg/push" - github_com_grafana_loki_v3_pkg_push "github.com/grafana/loki/v3/pkg/push" github_com_grafana_loki_v3_pkg_querier_plan "github.com/grafana/loki/v3/pkg/querier/plan" github_com_prometheus_common_model "github.com/prometheus/common/model" grpc "google.golang.org/grpc" @@ -490,8 +490,8 @@ func (m *Delete) GetEnd() int64 { } type QueryResponse struct { - Streams []github_com_grafana_loki_v3_pkg_push.Stream `protobuf:"bytes,1,rep,name=streams,proto3,customtype=github.com/grafana/loki/v3/pkg/push.Stream" json:"streams,omitempty"` - Stats stats.Ingester `protobuf:"bytes,2,opt,name=stats,proto3" json:"stats"` + Streams []github_com_grafana_loki_pkg_push.Stream `protobuf:"bytes,1,rep,name=streams,proto3,customtype=github.com/grafana/loki/pkg/push.Stream" json:"streams,omitempty"` + Stats stats.Ingester `protobuf:"bytes,2,opt,name=stats,proto3" json:"stats"` } func (m *QueryResponse) Reset() { *m = QueryResponse{} } @@ -935,8 +935,8 @@ func (m *TailRequest) GetStart() time.Time { } type TailResponse struct { - Stream *github_com_grafana_loki_v3_pkg_push.Stream `protobuf:"bytes,1,opt,name=stream,proto3,customtype=github.com/grafana/loki/v3/pkg/push.Stream" json:"stream,omitempty"` - DroppedStreams []*DroppedStream `protobuf:"bytes,2,rep,name=droppedStreams,proto3" json:"droppedStreams,omitempty"` + Stream *github_com_grafana_loki_pkg_push.Stream `protobuf:"bytes,1,opt,name=stream,proto3,customtype=github.com/grafana/loki/pkg/push.Stream" json:"stream,omitempty"` + DroppedStreams []*DroppedStream `protobuf:"bytes,2,rep,name=droppedStreams,proto3" json:"droppedStreams,omitempty"` } func (m *TailResponse) Reset() { *m = TailResponse{} } @@ -2901,162 +2901,162 @@ func init() { func init() { proto.RegisterFile("pkg/logproto/logproto.proto", fileDescriptor_c28a5f14f1f4c79a) } var fileDescriptor_c28a5f14f1f4c79a = []byte{ - // 2475 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x39, 0xcb, 0x8f, 0x13, 0xc9, - 0xf9, 0x6e, 0xbb, 0xfd, 0xfa, 0xec, 0x19, 0x86, 0x1a, 0x33, 0x58, 0x5e, 0xd6, 0x1e, 0x4a, 0xbf, - 0x85, 0xf9, 0x11, 0xd6, 0x5e, 0x86, 0x40, 0x76, 0x21, 0x64, 0x83, 0x67, 0x16, 0x76, 0x60, 0x78, - 0x6c, 0x0d, 0x21, 0x9b, 0x48, 0x08, 0x35, 0x76, 0x8d, 0xa7, 0x45, 0xbb, 0xdb, 0x74, 0x97, 0x01, - 0x4b, 0x39, 0xe4, 0x1f, 0x88, 0xb2, 0x52, 0x0e, 0x51, 0x2e, 0x91, 0xa2, 0x44, 0x4a, 0x94, 0x5c, - 0xa2, 0xfc, 0x01, 0xc9, 0x25, 0x07, 0x72, 0x63, 0x6f, 0x2b, 0x0e, 0x4e, 0x18, 0x2e, 0xd1, 0x9c, - 0x56, 0xca, 0x6d, 0x4f, 0x51, 0x3d, 0xfa, 0x39, 0x9e, 0xb0, 0x9e, 0x65, 0xb5, 0xe2, 0x62, 0x57, - 0x7d, 0xf5, 0xd5, 0x57, 0xf5, 0x3d, 0xea, 0x7b, 0x35, 0xbc, 0x31, 0xb8, 0xdf, 0x6b, 0x59, 0x4e, - 0x6f, 0xe0, 0x3a, 0xcc, 0x09, 0x06, 0x4d, 0xf1, 0x8b, 0x0a, 0xfe, 0xbc, 0x56, 0xe9, 0x39, 0x3d, - 0x47, 0xe2, 0xf0, 0x91, 0x5c, 0xaf, 0x35, 0x7a, 0x8e, 0xd3, 0xb3, 0x68, 0x4b, 0xcc, 0xee, 0x0d, - 0x37, 0x5b, 0xcc, 0xec, 0x53, 0x8f, 0x19, 0xfd, 0x81, 0x42, 0x58, 0x54, 0xd4, 0x1f, 0x58, 0x7d, - 0xa7, 0x4b, 0xad, 0x96, 0xc7, 0x0c, 0xe6, 0xc9, 0x5f, 0x85, 0x31, 0xcf, 0x31, 0x06, 0x43, 0x6f, - 0x4b, 0xfc, 0x48, 0x20, 0xae, 0x00, 0xda, 0x60, 0x2e, 0x35, 0xfa, 0xc4, 0x60, 0xd4, 0x23, 0xf4, - 0xc1, 0x90, 0x7a, 0x0c, 0x5f, 0x83, 0xf9, 0x18, 0xd4, 0x1b, 0x38, 0xb6, 0x47, 0xd1, 0x59, 0x28, - 0x79, 0x21, 0xb8, 0xaa, 0x2d, 0x66, 0x96, 0x4a, 0xcb, 0x95, 0x66, 0xc0, 0x4a, 0xb8, 0x87, 0x44, - 0x11, 0xf1, 0xaf, 0x35, 0x80, 0x70, 0x0d, 0xd5, 0x01, 0xe4, 0xea, 0x87, 0x86, 0xb7, 0x55, 0xd5, - 0x16, 0xb5, 0x25, 0x9d, 0x44, 0x20, 0xe8, 0x24, 0x1c, 0x0c, 0x67, 0xd7, 0x9d, 0x8d, 0x2d, 0xc3, - 0xed, 0x56, 0xd3, 0x02, 0x6d, 0xf7, 0x02, 0x42, 0xa0, 0xbb, 0x06, 0xa3, 0xd5, 0xcc, 0xa2, 0xb6, - 0x94, 0x21, 0x62, 0x8c, 0x16, 0x20, 0xc7, 0xa8, 0x6d, 0xd8, 0xac, 0xaa, 0x2f, 0x6a, 0x4b, 0x45, - 0xa2, 0x66, 0x1c, 0xce, 0x79, 0xa7, 0x5e, 0x35, 0xbb, 0xa8, 0x2d, 0xcd, 0x10, 0x35, 0xc3, 0x7f, - 0xcc, 0x40, 0xf9, 0xa3, 0x21, 0x75, 0x47, 0x4a, 0x00, 0xa8, 0x0e, 0x05, 0x8f, 0x5a, 0xb4, 0xc3, - 0x1c, 0x57, 0x5c, 0xb0, 0xd8, 0x4e, 0x57, 0x35, 0x12, 0xc0, 0x50, 0x05, 0xb2, 0x96, 0xd9, 0x37, - 0x99, 0xb8, 0xd6, 0x0c, 0x91, 0x13, 0x74, 0x0e, 0xb2, 0x1e, 0x33, 0x5c, 0x26, 0xee, 0x52, 0x5a, - 0xae, 0x35, 0xa5, 0xd2, 0x9a, 0xbe, 0xd2, 0x9a, 0xb7, 0x7c, 0xa5, 0xb5, 0x0b, 0x4f, 0xc6, 0x8d, - 0xd4, 0x27, 0xff, 0x6c, 0x68, 0x44, 0x6e, 0x41, 0x67, 0x21, 0x43, 0xed, 0xae, 0xb8, 0xef, 0x97, - 0xdd, 0xc9, 0x37, 0xa0, 0x53, 0x50, 0xec, 0x9a, 0x2e, 0xed, 0x30, 0xd3, 0xb1, 0x05, 0x57, 0xb3, - 0xcb, 0xf3, 0xa1, 0x46, 0x56, 0xfd, 0x25, 0x12, 0x62, 0xa1, 0x93, 0x90, 0xf3, 0xb8, 0xe8, 0xbc, - 0x6a, 0x7e, 0x31, 0xb3, 0x54, 0x6c, 0x57, 0x76, 0xc6, 0x8d, 0x39, 0x09, 0x39, 0xe9, 0xf4, 0x4d, - 0x46, 0xfb, 0x03, 0x36, 0x22, 0x0a, 0x07, 0x9d, 0x80, 0x7c, 0x97, 0x5a, 0x94, 0x2b, 0xbc, 0x20, - 0x14, 0x3e, 0x17, 0x21, 0x2f, 0x16, 0x88, 0x8f, 0x80, 0xee, 0x80, 0x3e, 0xb0, 0x0c, 0xbb, 0x5a, - 0x14, 0x5c, 0xcc, 0x86, 0x88, 0x37, 0x2d, 0xc3, 0x6e, 0xbf, 0xf7, 0x6c, 0xdc, 0x38, 0xd3, 0x33, - 0xd9, 0xd6, 0xf0, 0x5e, 0xb3, 0xe3, 0xf4, 0x5b, 0x3d, 0xd7, 0xd8, 0x34, 0x6c, 0xa3, 0x65, 0x39, - 0xf7, 0xcd, 0xd6, 0xc3, 0xd3, 0x2d, 0x6e, 0x9f, 0x0f, 0x86, 0xd4, 0x35, 0xa9, 0xdb, 0xe2, 0x64, - 0x9a, 0x42, 0x25, 0x7c, 0x2b, 0x11, 0x64, 0xaf, 0xe8, 0x85, 0xdc, 0x5c, 0x1e, 0x3f, 0x4f, 0x03, - 0xda, 0x30, 0xfa, 0x03, 0x8b, 0x4e, 0xa5, 0xb2, 0x40, 0x39, 0xe9, 0x7d, 0x2b, 0x27, 0x33, 0xad, - 0x72, 0x42, 0x49, 0xeb, 0xd3, 0x49, 0x3a, 0xfb, 0x65, 0x25, 0x9d, 0xfb, 0x5a, 0x24, 0x8d, 0xab, - 0xa0, 0xf3, 0x19, 0x9a, 0x83, 0x8c, 0x6b, 0x3c, 0x12, 0xf2, 0x2c, 0x13, 0x3e, 0xc4, 0xeb, 0x90, - 0x93, 0x77, 0x41, 0xb5, 0xa4, 0xc0, 0xe3, 0xef, 0x23, 0x14, 0x76, 0xc6, 0x17, 0xe3, 0x5c, 0x28, - 0xc6, 0x8c, 0x10, 0x10, 0xfe, 0xad, 0x06, 0x33, 0x4a, 0x8b, 0xca, 0xc7, 0x50, 0xc8, 0xcb, 0x37, - 0xee, 0xfb, 0x97, 0xc3, 0x49, 0xff, 0x72, 0xb1, 0x6b, 0x0c, 0x18, 0x75, 0xdb, 0xcb, 0x4f, 0xc6, - 0x0d, 0xed, 0xd9, 0xb8, 0x71, 0xe2, 0x25, 0x8c, 0x0a, 0x6f, 0xa7, 0xdc, 0x8f, 0x4f, 0x1b, 0x7d, - 0x4b, 0x5c, 0x90, 0x79, 0xca, 0x1a, 0x0e, 0x34, 0xa5, 0xa7, 0x5c, 0xb3, 0x7b, 0xd4, 0xe3, 0xc4, - 0x75, 0xae, 0x48, 0x22, 0x71, 0xf0, 0x4f, 0x60, 0x3e, 0x66, 0x70, 0xea, 0xaa, 0xef, 0x42, 0xce, - 0xe3, 0x32, 0xf4, 0x6f, 0x1a, 0x51, 0xd7, 0x86, 0x80, 0xb7, 0x67, 0xd5, 0x15, 0x73, 0x72, 0x4e, - 0x14, 0xfe, 0x74, 0xa7, 0xff, 0x5d, 0x83, 0xf2, 0xba, 0x71, 0x8f, 0x5a, 0xbe, 0xa5, 0x23, 0xd0, - 0x6d, 0xa3, 0x4f, 0x95, 0xd0, 0xc5, 0x98, 0x7b, 0xb6, 0x87, 0x86, 0x35, 0xa4, 0x92, 0x64, 0x81, - 0xa8, 0xd9, 0xb4, 0x2e, 0x49, 0xdb, 0xb7, 0x4b, 0xd2, 0x42, 0xab, 0xaf, 0x40, 0x96, 0x1b, 0xd7, - 0x48, 0xb8, 0xa3, 0x22, 0x91, 0x13, 0x7c, 0x1c, 0x66, 0x14, 0x17, 0x4a, 0x7c, 0xe1, 0x95, 0xb9, - 0xf8, 0x8a, 0xfe, 0x95, 0x71, 0x1f, 0x72, 0x52, 0xda, 0xe8, 0xff, 0xa0, 0x18, 0x84, 0x39, 0xc1, - 0x6d, 0xa6, 0x9d, 0xdb, 0x19, 0x37, 0xd2, 0xcc, 0x23, 0xe1, 0x02, 0x6a, 0x40, 0x56, 0xec, 0x14, - 0x9c, 0x6b, 0xed, 0xe2, 0xce, 0xb8, 0x21, 0x01, 0x44, 0xfe, 0xa1, 0x23, 0xa0, 0x6f, 0xf1, 0x48, - 0xc3, 0x45, 0xa0, 0xb7, 0x0b, 0x3b, 0xe3, 0x86, 0x98, 0x13, 0xf1, 0x8b, 0x2f, 0x43, 0x79, 0x9d, - 0xf6, 0x8c, 0xce, 0x48, 0x1d, 0x5a, 0xf1, 0xc9, 0xf1, 0x03, 0x35, 0x9f, 0xc6, 0x51, 0x28, 0x07, - 0x27, 0xde, 0xed, 0x7b, 0xca, 0xae, 0x4b, 0x01, 0xec, 0x9a, 0x87, 0x7f, 0xa5, 0x81, 0xd2, 0x33, - 0xc2, 0x90, 0xb3, 0x38, 0xaf, 0x9e, 0xf2, 0x44, 0xb0, 0x33, 0x6e, 0x28, 0x08, 0x51, 0xff, 0xe8, - 0x3c, 0xe4, 0x3d, 0x71, 0x22, 0x27, 0x96, 0x34, 0x1f, 0xb1, 0xd0, 0x3e, 0xc0, 0xcd, 0x60, 0x67, - 0xdc, 0xf0, 0x11, 0x89, 0x3f, 0x40, 0xcd, 0x58, 0x08, 0x95, 0x8c, 0xcd, 0xee, 0x8c, 0x1b, 0x11, - 0x68, 0x34, 0xa4, 0xe2, 0x2f, 0x34, 0x28, 0xdd, 0x32, 0xcc, 0xc0, 0x84, 0xaa, 0xbe, 0x8a, 0x42, - 0x4f, 0x29, 0x01, 0xfc, 0x55, 0x77, 0xa9, 0x65, 0x8c, 0x2e, 0x39, 0xae, 0xa0, 0x3b, 0x43, 0x82, - 0x79, 0x18, 0xf5, 0xf4, 0x89, 0x51, 0x2f, 0x3b, 0xbd, 0x63, 0xfd, 0x7a, 0xdd, 0xd8, 0x15, 0xbd, - 0x90, 0x9e, 0xcb, 0xe0, 0x3f, 0x6b, 0x50, 0x96, 0xcc, 0x2b, 0xcb, 0xbb, 0x0b, 0x39, 0x29, 0x1b, - 0xc1, 0xfe, 0xff, 0x70, 0x31, 0xcd, 0x29, 0xdd, 0x8b, 0x22, 0x8b, 0xde, 0x87, 0xd9, 0xae, 0xeb, - 0x0c, 0x06, 0xb4, 0xbb, 0xa1, 0x7c, 0x59, 0x3a, 0xe9, 0xcb, 0x56, 0xa3, 0xeb, 0x24, 0x81, 0x8e, - 0xff, 0xa1, 0xc1, 0x8c, 0xf2, 0x19, 0x4a, 0x63, 0x81, 0x94, 0xb5, 0x7d, 0x87, 0xaf, 0xf4, 0xb4, - 0xe1, 0x6b, 0x01, 0x72, 0x3d, 0xd7, 0x19, 0x0e, 0xbc, 0x6a, 0x46, 0xbe, 0x50, 0x39, 0x9b, 0x2e, - 0xac, 0xe1, 0x2b, 0x30, 0xeb, 0xb3, 0xb2, 0x87, 0xe3, 0xac, 0x25, 0x1d, 0xe7, 0x5a, 0x97, 0xda, - 0xcc, 0xdc, 0x34, 0x03, 0x57, 0xa8, 0xf0, 0xf1, 0xcf, 0x35, 0x98, 0x4b, 0xa2, 0xa0, 0xd5, 0xc8, - 0x6b, 0xe3, 0xe4, 0x8e, 0xed, 0x4d, 0xae, 0x29, 0x5c, 0x90, 0xf7, 0x81, 0xcd, 0xdc, 0x91, 0x4f, - 0x5a, 0xee, 0xad, 0x9d, 0x81, 0x52, 0x64, 0x91, 0xc7, 0xaa, 0xfb, 0x54, 0xbd, 0x0f, 0xc2, 0x87, - 0xa1, 0x63, 0x48, 0x4b, 0xb7, 0x26, 0x26, 0xf8, 0x97, 0x1a, 0xcc, 0xc4, 0x74, 0x89, 0xde, 0x05, - 0x7d, 0xd3, 0x75, 0xfa, 0x53, 0x29, 0x4a, 0xec, 0x40, 0xdf, 0x86, 0x34, 0x73, 0xa6, 0x52, 0x53, - 0x9a, 0x39, 0x5c, 0x4b, 0x8a, 0xfd, 0x8c, 0x4c, 0x76, 0xe5, 0x0c, 0x9f, 0x81, 0xa2, 0x60, 0xe8, - 0xa6, 0x61, 0xba, 0x13, 0x63, 0xc6, 0x64, 0x86, 0xce, 0xc3, 0x01, 0xe9, 0x0f, 0x27, 0x6f, 0x2e, - 0x4f, 0xda, 0x5c, 0xf6, 0x37, 0xbf, 0x01, 0xd9, 0x95, 0xad, 0xa1, 0x7d, 0x9f, 0x6f, 0xe9, 0x1a, - 0xcc, 0xf0, 0xb7, 0xf0, 0x31, 0x3e, 0x04, 0xf3, 0xfc, 0x19, 0x52, 0xd7, 0x5b, 0x71, 0x86, 0x36, - 0xf3, 0x8b, 0x8d, 0x93, 0x50, 0x89, 0x83, 0x95, 0x95, 0x54, 0x20, 0xdb, 0xe1, 0x00, 0x41, 0x63, - 0x86, 0xc8, 0x09, 0xfe, 0x9d, 0x06, 0xe8, 0x32, 0x65, 0xe2, 0x94, 0xb5, 0xd5, 0xe0, 0x79, 0xd4, - 0xa0, 0xd0, 0x37, 0x58, 0x67, 0x8b, 0xba, 0x9e, 0x9f, 0x8c, 0xf8, 0xf3, 0x6f, 0x22, 0xf3, 0xc3, - 0xa7, 0x60, 0x3e, 0x76, 0x4b, 0xc5, 0x53, 0x0d, 0x0a, 0x1d, 0x05, 0x53, 0x51, 0x2f, 0x98, 0xe3, - 0xbf, 0xa4, 0xa1, 0x20, 0x36, 0x10, 0xba, 0x89, 0x4e, 0x41, 0x69, 0xd3, 0xb4, 0x7b, 0xd4, 0x1d, - 0xb8, 0xa6, 0x12, 0x81, 0xde, 0x3e, 0xb0, 0x33, 0x6e, 0x44, 0xc1, 0x24, 0x3a, 0x41, 0x6f, 0x43, - 0x7e, 0xe8, 0x51, 0xf7, 0xae, 0x29, 0x5f, 0x7a, 0xb1, 0x5d, 0xd9, 0x1e, 0x37, 0x72, 0x3f, 0xf0, - 0xa8, 0xbb, 0xb6, 0xca, 0xe3, 0xcf, 0x50, 0x8c, 0x88, 0xfc, 0xef, 0xa2, 0xab, 0xca, 0x4c, 0x45, - 0x36, 0xd6, 0xfe, 0x0e, 0xbf, 0xfe, 0xb3, 0x71, 0xe3, 0x78, 0xc4, 0xdb, 0x0d, 0x5c, 0xa7, 0x4f, - 0xd9, 0x16, 0x1d, 0x7a, 0xad, 0x8e, 0xd3, 0xef, 0x3b, 0x76, 0x4b, 0x94, 0x96, 0x82, 0x69, 0x1e, - 0x44, 0xf9, 0x76, 0x65, 0xb9, 0xb7, 0x20, 0xcf, 0xb6, 0x5c, 0x67, 0xd8, 0xdb, 0x12, 0xb1, 0x21, - 0xd3, 0x3e, 0x37, 0x3d, 0x3d, 0x9f, 0x02, 0xf1, 0x07, 0xe8, 0x28, 0x97, 0x16, 0xed, 0xdc, 0xf7, - 0x86, 0x7d, 0x59, 0xb0, 0xb5, 0xb3, 0x3b, 0xe3, 0x86, 0xf6, 0x36, 0x09, 0xc0, 0xf8, 0x67, 0x69, - 0x68, 0x08, 0x43, 0xbd, 0x2d, 0x92, 0x87, 0x4b, 0x8e, 0x7b, 0x8d, 0x32, 0xd7, 0xec, 0x5c, 0x37, - 0xfa, 0xd4, 0xb7, 0x8d, 0x06, 0x94, 0xfa, 0x02, 0x78, 0x37, 0xf2, 0x04, 0xa0, 0x1f, 0xe0, 0xa1, - 0x37, 0x01, 0xc4, 0x9b, 0x91, 0xeb, 0xf2, 0x35, 0x14, 0x05, 0x44, 0x2c, 0xaf, 0xc4, 0x24, 0xd5, - 0x9a, 0x92, 0x33, 0x25, 0xa1, 0xb5, 0xa4, 0x84, 0xa6, 0xa6, 0x13, 0x88, 0x25, 0x6a, 0xeb, 0xd9, - 0xb8, 0xad, 0xe3, 0x4f, 0x35, 0xa8, 0xaf, 0xfb, 0x37, 0xdf, 0xa7, 0x38, 0x7c, 0x7e, 0xd3, 0xaf, - 0x88, 0xdf, 0xcc, 0x57, 0xe3, 0x17, 0xd7, 0x01, 0xd6, 0x4d, 0x9b, 0x5e, 0x32, 0x2d, 0x46, 0xdd, - 0x09, 0x25, 0xc9, 0x2f, 0x32, 0xa1, 0x4b, 0x20, 0x74, 0xd3, 0xe7, 0x73, 0x25, 0xe2, 0x87, 0x5f, - 0x05, 0x1b, 0xe9, 0x57, 0xa8, 0xb6, 0x4c, 0xc2, 0x45, 0xd9, 0x90, 0xdf, 0x14, 0xec, 0xc9, 0x90, - 0x1a, 0xeb, 0xaa, 0x84, 0xbc, 0xb7, 0xbf, 0xa7, 0x0e, 0x3f, 0xfb, 0x92, 0x9c, 0x44, 0xf4, 0x81, - 0x5a, 0xde, 0xc8, 0x66, 0xc6, 0xe3, 0xc8, 0x7e, 0xe2, 0x1f, 0x82, 0x0c, 0x95, 0x77, 0x65, 0x27, - 0xe6, 0x5d, 0x17, 0xd4, 0x31, 0x5f, 0xa9, 0x84, 0xbc, 0x10, 0x7a, 0x40, 0xa1, 0x14, 0xe5, 0x01, - 0x8f, 0x81, 0xee, 0xd2, 0x4d, 0x3f, 0x54, 0xa3, 0xf0, 0xe4, 0x00, 0x53, 0xac, 0xe3, 0xbf, 0x6a, - 0x30, 0x77, 0x99, 0xb2, 0x78, 0x12, 0xf4, 0x1a, 0xa9, 0x14, 0x7f, 0x08, 0x07, 0x23, 0xf7, 0x57, - 0xdc, 0x9f, 0x4e, 0x64, 0x3e, 0x87, 0x42, 0xfe, 0xd7, 0xec, 0x2e, 0x7d, 0xac, 0xea, 0xc6, 0x78, - 0xd2, 0x73, 0x13, 0x4a, 0x91, 0x45, 0x74, 0x31, 0x91, 0xee, 0x44, 0xda, 0x3d, 0x41, 0xc8, 0x6e, - 0x57, 0x14, 0x4f, 0xb2, 0x72, 0x54, 0xf9, 0x6c, 0x90, 0x1a, 0x6c, 0x00, 0x12, 0xea, 0x12, 0x64, - 0xa3, 0xc1, 0x49, 0x40, 0xaf, 0x06, 0x79, 0x4f, 0x30, 0x47, 0x47, 0x41, 0x77, 0x9d, 0x47, 0x7e, - 0x1e, 0x3b, 0x13, 0x1e, 0x49, 0x9c, 0x47, 0x44, 0x2c, 0xe1, 0xf3, 0x90, 0x21, 0xce, 0x23, 0x54, - 0x07, 0x70, 0x0d, 0xbb, 0x47, 0x6f, 0x07, 0x45, 0x54, 0x99, 0x44, 0x20, 0x7b, 0x24, 0x0e, 0x2b, - 0x70, 0x30, 0x7a, 0x23, 0xa9, 0xee, 0x26, 0xe4, 0x3f, 0x1a, 0x46, 0xc5, 0x55, 0x49, 0x88, 0x4b, - 0xd6, 0xe3, 0x3e, 0x12, 0xb7, 0x19, 0x08, 0xe1, 0xe8, 0x08, 0x14, 0x99, 0x71, 0xcf, 0xa2, 0xd7, - 0x43, 0x37, 0x17, 0x02, 0xf8, 0x2a, 0xaf, 0xff, 0x6e, 0x47, 0x32, 0xa0, 0x10, 0x80, 0x4e, 0xc0, - 0x5c, 0x78, 0xe7, 0x9b, 0x2e, 0xdd, 0x34, 0x1f, 0x0b, 0x0d, 0x97, 0xc9, 0x2e, 0x38, 0x5a, 0x82, - 0x03, 0x21, 0x6c, 0x43, 0x64, 0x1a, 0xba, 0x40, 0x4d, 0x82, 0xb9, 0x6c, 0x04, 0xbb, 0x1f, 0x3c, - 0x18, 0x1a, 0x96, 0x78, 0x7c, 0x65, 0x12, 0x81, 0xe0, 0xbf, 0x69, 0x70, 0x50, 0xaa, 0x9a, 0x57, - 0xfe, 0xaf, 0xa3, 0xd5, 0xff, 0x5e, 0x03, 0x14, 0xe5, 0x40, 0x99, 0xd6, 0x5b, 0xd1, 0xae, 0x0e, - 0x4f, 0x65, 0x4a, 0xa2, 0xac, 0x95, 0xa0, 0xb0, 0x2b, 0x83, 0x21, 0x27, 0xd2, 0x21, 0x59, 0x5f, - 0xeb, 0xb2, 0x6e, 0x96, 0x10, 0xa2, 0xfe, 0x79, 0xb9, 0x7f, 0x6f, 0xc4, 0xa8, 0xa7, 0xaa, 0x5e, - 0x51, 0xee, 0x0b, 0x00, 0x91, 0x7f, 0xfc, 0x2c, 0x6a, 0x33, 0x61, 0x35, 0x7a, 0x78, 0x96, 0x02, - 0x11, 0x7f, 0x80, 0xff, 0x94, 0x86, 0x99, 0xdb, 0x8e, 0x35, 0x0c, 0x03, 0xe3, 0xeb, 0x14, 0x30, - 0x62, 0xa5, 0x78, 0xd6, 0x2f, 0xc5, 0x11, 0xe8, 0x1e, 0xa3, 0x03, 0x61, 0x59, 0x19, 0x22, 0xc6, - 0x08, 0x43, 0x99, 0x19, 0x6e, 0x8f, 0x32, 0x59, 0xdd, 0x54, 0x73, 0x22, 0xed, 0x8c, 0xc1, 0xd0, - 0x22, 0x94, 0x8c, 0x5e, 0xcf, 0xa5, 0x3d, 0x83, 0xd1, 0xf6, 0xa8, 0x9a, 0x17, 0x87, 0x45, 0x41, - 0xf8, 0x63, 0x98, 0xf5, 0x85, 0xa5, 0x54, 0xfa, 0x0e, 0xe4, 0x1f, 0x0a, 0xc8, 0x84, 0xf6, 0x97, - 0x44, 0x55, 0x6e, 0xcc, 0x47, 0x8b, 0x37, 0xcd, 0xfd, 0x3b, 0xe3, 0x2b, 0x90, 0x93, 0xe8, 0xe8, - 0x48, 0xb4, 0x46, 0x91, 0x7d, 0x1a, 0x3e, 0x57, 0x05, 0x07, 0x86, 0x9c, 0x24, 0xa4, 0x14, 0x2f, - 0x6c, 0x43, 0x42, 0x88, 0xfa, 0xc7, 0xff, 0xd1, 0xe0, 0xd0, 0x2a, 0x65, 0xb4, 0xc3, 0x68, 0xf7, - 0x92, 0x49, 0xad, 0xee, 0x37, 0x5a, 0x3e, 0x07, 0x7d, 0xb0, 0x4c, 0xa4, 0x0f, 0xc6, 0xfd, 0x8e, - 0x65, 0xda, 0x74, 0x3d, 0xd2, 0x48, 0x09, 0x01, 0xdc, 0x43, 0x6c, 0xf2, 0x8b, 0xcb, 0x65, 0xf9, - 0x95, 0x22, 0x02, 0x09, 0x34, 0x9c, 0x0b, 0x35, 0x8c, 0xd7, 0x60, 0x21, 0xc9, 0xb4, 0xd2, 0x51, - 0x0b, 0x72, 0x62, 0xef, 0x84, 0x5e, 0x6a, 0x6c, 0x07, 0x51, 0x68, 0xd8, 0x85, 0x99, 0xd8, 0x82, - 0xd0, 0x19, 0xb7, 0x11, 0xe5, 0x3f, 0xe5, 0x04, 0xfd, 0x3f, 0xe8, 0x6c, 0x34, 0x50, 0x6e, 0xb3, - 0x7d, 0xe8, 0x8b, 0x71, 0xe3, 0x60, 0x6c, 0xdb, 0xad, 0xd1, 0x80, 0x12, 0x81, 0xc2, 0x4d, 0xab, - 0x63, 0xb8, 0x5d, 0xd3, 0x36, 0x2c, 0x93, 0x49, 0x51, 0xe8, 0x24, 0x0a, 0xc2, 0xbf, 0x89, 0x28, - 0x4d, 0xda, 0xe3, 0x3e, 0x95, 0xa6, 0xed, 0x5b, 0x69, 0xda, 0x4b, 0x94, 0x86, 0x7f, 0x14, 0x8a, - 0xd8, 0xbf, 0xa2, 0x12, 0xf1, 0xfb, 0x30, 0xdb, 0x8d, 0xad, 0xec, 0x2d, 0x6a, 0xd9, 0xfe, 0x4c, - 0xa0, 0xe3, 0xb7, 0x42, 0x91, 0x0b, 0xc8, 0x64, 0x91, 0x9f, 0x38, 0x06, 0xc5, 0xe0, 0x63, 0x0e, - 0x2a, 0x41, 0xfe, 0xd2, 0x0d, 0xf2, 0xc3, 0x8b, 0x64, 0x75, 0x2e, 0x85, 0xca, 0x50, 0x68, 0x5f, - 0x5c, 0xb9, 0x2a, 0x66, 0xda, 0xf2, 0xa7, 0x59, 0x3f, 0x68, 0xba, 0xe8, 0xbb, 0x90, 0x95, 0x91, - 0x70, 0x21, 0xbc, 0x4c, 0xf4, 0x9b, 0x49, 0xed, 0xf0, 0x2e, 0xb8, 0xe4, 0x0a, 0xa7, 0xde, 0xd1, - 0xd0, 0x75, 0x28, 0x09, 0xa0, 0xea, 0x8b, 0x1e, 0x49, 0xb6, 0x27, 0x63, 0x94, 0xde, 0xdc, 0x63, - 0x35, 0x42, 0xef, 0x1c, 0x64, 0x25, 0x83, 0x0b, 0x89, 0x84, 0x65, 0xc2, 0x6d, 0x62, 0x9d, 0x62, - 0x9c, 0x42, 0xef, 0x81, 0x7e, 0xcb, 0x30, 0x2d, 0x14, 0xc9, 0x97, 0x22, 0xed, 0xcc, 0xda, 0x42, - 0x12, 0x1c, 0x39, 0xf6, 0x42, 0xd0, 0x95, 0x3d, 0x9c, 0xec, 0x0b, 0xf9, 0xdb, 0xab, 0xbb, 0x17, - 0x82, 0x93, 0x6f, 0xc8, 0xde, 0xa1, 0xdf, 0x9d, 0x40, 0x6f, 0xc6, 0x8f, 0x4a, 0x34, 0x33, 0x6a, - 0xf5, 0xbd, 0x96, 0x03, 0x82, 0xeb, 0x50, 0x8a, 0x74, 0x06, 0xa2, 0x62, 0xdd, 0xdd, 0xd6, 0x88, - 0x8a, 0x75, 0x42, 0x3b, 0x01, 0xa7, 0xd0, 0x65, 0x28, 0xf0, 0x2c, 0x93, 0x07, 0x5b, 0xf4, 0x46, - 0x32, 0x99, 0x8c, 0x24, 0x11, 0xb5, 0x23, 0x93, 0x17, 0x03, 0x42, 0xdf, 0x87, 0xe2, 0x65, 0xca, - 0x94, 0x27, 0x3e, 0x9c, 0x74, 0xe5, 0x13, 0x24, 0x15, 0x0f, 0x07, 0x38, 0x85, 0x3e, 0x16, 0x09, - 0x6f, 0xdc, 0x13, 0xa1, 0xc6, 0x1e, 0x1e, 0x27, 0xb8, 0xd7, 0xe2, 0xde, 0x08, 0x3e, 0xe5, 0xe5, - 0x3b, 0xfe, 0xe7, 0xe3, 0x55, 0x83, 0x19, 0xe8, 0x06, 0xcc, 0x0a, 0x96, 0x83, 0xef, 0xcb, 0x31, - 0xd3, 0xdc, 0xf5, 0x31, 0x3b, 0x66, 0x9a, 0xbb, 0x3f, 0x6a, 0xe3, 0x54, 0xfb, 0xce, 0xd3, 0xe7, - 0xf5, 0xd4, 0x67, 0xcf, 0xeb, 0xa9, 0xcf, 0x9f, 0xd7, 0xb5, 0x9f, 0x6e, 0xd7, 0xb5, 0x3f, 0x6c, - 0xd7, 0xb5, 0x27, 0xdb, 0x75, 0xed, 0xe9, 0x76, 0x5d, 0xfb, 0xd7, 0x76, 0x5d, 0xfb, 0xf7, 0x76, - 0x3d, 0xf5, 0xf9, 0x76, 0x5d, 0xfb, 0xe4, 0x45, 0x3d, 0xf5, 0xf4, 0x45, 0x3d, 0xf5, 0xd9, 0x8b, - 0x7a, 0xea, 0xc7, 0xc7, 0x5f, 0x5e, 0x83, 0x49, 0x6f, 0x93, 0x13, 0x7f, 0xa7, 0xff, 0x1b, 0x00, - 0x00, 0xff, 0xff, 0x55, 0x29, 0x90, 0x4c, 0x00, 0x20, 0x00, 0x00, + // 2472 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x39, 0xcb, 0x6f, 0x1b, 0xc7, + 0xf9, 0x5c, 0x72, 0xf9, 0xfa, 0x48, 0xc9, 0xf2, 0x88, 0x96, 0x09, 0xc6, 0x21, 0xe5, 0xc1, 0x2f, + 0xb6, 0x7e, 0x8e, 0x23, 0xc6, 0x76, 0xed, 0x26, 0x76, 0xdd, 0xd4, 0x94, 0x62, 0x47, 0xb6, 0xfc, + 0xc8, 0xc8, 0x75, 0xd3, 0xa2, 0x86, 0xb1, 0x22, 0x47, 0xd4, 0xc2, 0xe4, 0x2e, 0xbd, 0x3b, 0xb4, + 0x2d, 0xa0, 0x87, 0xfe, 0x03, 0x45, 0x03, 0xf4, 0x50, 0xf4, 0x52, 0xb4, 0x40, 0x81, 0x16, 0x2d, + 0x7a, 0xe9, 0x1f, 0xd0, 0x5e, 0x7a, 0x70, 0x6f, 0xce, 0x2d, 0xc8, 0x81, 0xad, 0xe5, 0x4b, 0xa1, + 0x53, 0x80, 0xde, 0x72, 0x2a, 0xe6, 0xb5, 0x2f, 0x51, 0x75, 0xa8, 0x38, 0x08, 0x7c, 0x21, 0x67, + 0xbe, 0xf9, 0xe6, 0x9b, 0xf9, 0x1e, 0xf3, 0xbd, 0x16, 0x5e, 0x1b, 0xdc, 0xef, 0x36, 0x7b, 0x6e, + 0x77, 0xe0, 0xb9, 0xcc, 0x0d, 0x06, 0x8b, 0xe2, 0x17, 0x15, 0xf4, 0xbc, 0x56, 0xe9, 0xba, 0x5d, + 0x57, 0xe2, 0xf0, 0x91, 0x5c, 0xaf, 0x35, 0xba, 0xae, 0xdb, 0xed, 0xd1, 0xa6, 0x98, 0xad, 0x0f, + 0x37, 0x9a, 0xcc, 0xee, 0x53, 0x9f, 0x59, 0xfd, 0x81, 0x42, 0x98, 0x57, 0xd4, 0x1f, 0xf4, 0xfa, + 0x6e, 0x87, 0xf6, 0x9a, 0x3e, 0xb3, 0x98, 0x2f, 0x7f, 0x15, 0xc6, 0x2c, 0xc7, 0x18, 0x0c, 0xfd, + 0x4d, 0xf1, 0x23, 0x81, 0xb8, 0x02, 0x68, 0x8d, 0x79, 0xd4, 0xea, 0x13, 0x8b, 0x51, 0x9f, 0xd0, + 0x07, 0x43, 0xea, 0x33, 0x7c, 0x1d, 0x66, 0x63, 0x50, 0x7f, 0xe0, 0x3a, 0x3e, 0x45, 0xe7, 0xa0, + 0xe4, 0x87, 0xe0, 0xaa, 0x31, 0x9f, 0x59, 0x28, 0x9d, 0xae, 0x2c, 0x06, 0xac, 0x84, 0x7b, 0x48, + 0x14, 0x11, 0xff, 0xda, 0x00, 0x08, 0xd7, 0x50, 0x1d, 0x40, 0xae, 0x7e, 0x60, 0xf9, 0x9b, 0x55, + 0x63, 0xde, 0x58, 0x30, 0x49, 0x04, 0x82, 0x4e, 0xc2, 0xc1, 0x70, 0x76, 0xc3, 0x5d, 0xdb, 0xb4, + 0xbc, 0x4e, 0x35, 0x2d, 0xd0, 0x76, 0x2f, 0x20, 0x04, 0xa6, 0x67, 0x31, 0x5a, 0xcd, 0xcc, 0x1b, + 0x0b, 0x19, 0x22, 0xc6, 0x68, 0x0e, 0x72, 0x8c, 0x3a, 0x96, 0xc3, 0xaa, 0xe6, 0xbc, 0xb1, 0x50, + 0x24, 0x6a, 0xc6, 0xe1, 0x9c, 0x77, 0xea, 0x57, 0xb3, 0xf3, 0xc6, 0xc2, 0x14, 0x51, 0x33, 0xfc, + 0xc7, 0x0c, 0x94, 0x3f, 0x1c, 0x52, 0x6f, 0x4b, 0x09, 0x00, 0xd5, 0xa1, 0xe0, 0xd3, 0x1e, 0x6d, + 0x33, 0xd7, 0x13, 0x17, 0x2c, 0xb6, 0xd2, 0x55, 0x83, 0x04, 0x30, 0x54, 0x81, 0x6c, 0xcf, 0xee, + 0xdb, 0x4c, 0x5c, 0x6b, 0x8a, 0xc8, 0x09, 0x3a, 0x0f, 0x59, 0x9f, 0x59, 0x1e, 0x13, 0x77, 0x29, + 0x9d, 0xae, 0x2d, 0x4a, 0xa5, 0x2d, 0x6a, 0xa5, 0x2d, 0xde, 0xd6, 0x4a, 0x6b, 0x15, 0x9e, 0x8c, + 0x1a, 0xa9, 0x8f, 0xff, 0xd9, 0x30, 0x88, 0xdc, 0x82, 0xce, 0x41, 0x86, 0x3a, 0x1d, 0x71, 0xdf, + 0x2f, 0xbb, 0x93, 0x6f, 0x40, 0xa7, 0xa0, 0xd8, 0xb1, 0x3d, 0xda, 0x66, 0xb6, 0xeb, 0x08, 0xae, + 0xa6, 0x4f, 0xcf, 0x86, 0x1a, 0x59, 0xd6, 0x4b, 0x24, 0xc4, 0x42, 0x27, 0x21, 0xe7, 0x73, 0xd1, + 0xf9, 0xd5, 0xfc, 0x7c, 0x66, 0xa1, 0xd8, 0xaa, 0xec, 0x8c, 0x1a, 0x33, 0x12, 0x72, 0xd2, 0xed, + 0xdb, 0x8c, 0xf6, 0x07, 0x6c, 0x8b, 0x28, 0x1c, 0x74, 0x02, 0xf2, 0x1d, 0xda, 0xa3, 0x5c, 0xe1, + 0x05, 0xa1, 0xf0, 0x99, 0x08, 0x79, 0xb1, 0x40, 0x34, 0x02, 0xba, 0x0b, 0xe6, 0xa0, 0x67, 0x39, + 0xd5, 0xa2, 0xe0, 0x62, 0x3a, 0x44, 0xbc, 0xd5, 0xb3, 0x9c, 0xd6, 0xbb, 0x9f, 0x8d, 0x1a, 0x67, + 0xbb, 0x36, 0xdb, 0x1c, 0xae, 0x2f, 0xb6, 0xdd, 0x7e, 0xb3, 0xeb, 0x59, 0x1b, 0x96, 0x63, 0x35, + 0x7b, 0xee, 0x7d, 0xbb, 0xf9, 0xf0, 0x4c, 0x93, 0xdb, 0xe7, 0x83, 0x21, 0xf5, 0x6c, 0xea, 0x35, + 0x39, 0x99, 0x45, 0xa1, 0x12, 0xbe, 0x95, 0x08, 0xb2, 0x57, 0xcd, 0x42, 0x6e, 0x26, 0x8f, 0x9f, + 0xa5, 0x01, 0xad, 0x59, 0xfd, 0x41, 0x8f, 0x4e, 0xa4, 0xb2, 0x40, 0x39, 0xe9, 0x7d, 0x2b, 0x27, + 0x33, 0xa9, 0x72, 0x42, 0x49, 0x9b, 0x93, 0x49, 0x3a, 0xfb, 0x65, 0x25, 0x9d, 0xfb, 0x5a, 0x24, + 0x8d, 0xab, 0x60, 0xf2, 0x19, 0x9a, 0x81, 0x8c, 0x67, 0x3d, 0x12, 0xf2, 0x2c, 0x13, 0x3e, 0xc4, + 0xab, 0x90, 0x93, 0x77, 0x41, 0xb5, 0xa4, 0xc0, 0xe3, 0xef, 0x23, 0x14, 0x76, 0x46, 0x8b, 0x71, + 0x26, 0x14, 0x63, 0x46, 0x08, 0x08, 0xff, 0xc6, 0x80, 0x29, 0xa5, 0x45, 0xe5, 0x63, 0xd6, 0x21, + 0x2f, 0xdf, 0xb8, 0xf6, 0x2f, 0x87, 0x93, 0xfe, 0xe5, 0x52, 0xc7, 0x1a, 0x30, 0xea, 0xb5, 0x9a, + 0x4f, 0x46, 0x0d, 0xe3, 0xb3, 0x51, 0xe3, 0xf8, 0x5e, 0x8c, 0x6a, 0x7f, 0xa7, 0xfd, 0x92, 0x26, + 0x8c, 0xde, 0x14, 0xb7, 0x63, 0xbe, 0x32, 0x85, 0x03, 0x8b, 0xd2, 0x4d, 0xae, 0x38, 0x5d, 0xea, + 0x73, 0xca, 0x26, 0xd7, 0x22, 0x91, 0x38, 0xf8, 0x27, 0x30, 0x1b, 0xb3, 0x36, 0x75, 0xcf, 0x77, + 0x20, 0xe7, 0x73, 0x01, 0xea, 0x6b, 0x46, 0x74, 0xb5, 0x26, 0xe0, 0xad, 0x69, 0x75, 0xbf, 0x9c, + 0x9c, 0x13, 0x85, 0x3f, 0xd9, 0xe9, 0x7f, 0x37, 0xa0, 0xbc, 0x6a, 0xad, 0xd3, 0x9e, 0x36, 0x73, + 0x04, 0xa6, 0x63, 0xf5, 0xa9, 0x92, 0xb8, 0x18, 0x73, 0xb7, 0xf6, 0xd0, 0xea, 0x0d, 0xa9, 0x24, + 0x59, 0x20, 0x6a, 0x36, 0xa9, 0x3f, 0x32, 0xf6, 0xed, 0x8f, 0x8c, 0xd0, 0xe4, 0x2b, 0x90, 0xe5, + 0x96, 0xb5, 0x25, 0x7c, 0x51, 0x91, 0xc8, 0x09, 0x3e, 0x0e, 0x53, 0x8a, 0x0b, 0x25, 0xbe, 0xf0, + 0xca, 0x5c, 0x7c, 0x45, 0x7d, 0x65, 0xdc, 0x87, 0x9c, 0x94, 0x36, 0xfa, 0x3f, 0x28, 0x06, 0x31, + 0x4e, 0x70, 0x9b, 0x69, 0xe5, 0x76, 0x46, 0x8d, 0x34, 0xf3, 0x49, 0xb8, 0x80, 0x1a, 0x90, 0x15, + 0x3b, 0x05, 0xe7, 0x46, 0xab, 0xb8, 0x33, 0x6a, 0x48, 0x00, 0x91, 0x7f, 0xe8, 0x08, 0x98, 0x9b, + 0x3c, 0xcc, 0x70, 0x11, 0x98, 0xad, 0xc2, 0xce, 0xa8, 0x21, 0xe6, 0x44, 0xfc, 0xe2, 0x2b, 0x50, + 0x5e, 0xa5, 0x5d, 0xab, 0xbd, 0xa5, 0x0e, 0xad, 0x68, 0x72, 0xfc, 0x40, 0x43, 0xd3, 0x38, 0x0a, + 0xe5, 0xe0, 0xc4, 0x7b, 0x7d, 0x5f, 0x19, 0x75, 0x29, 0x80, 0x5d, 0xf7, 0xf1, 0xaf, 0x0c, 0x50, + 0x7a, 0x46, 0x18, 0x72, 0x3d, 0xce, 0xab, 0xaf, 0xdc, 0x10, 0xec, 0x8c, 0x1a, 0x0a, 0x42, 0xd4, + 0x3f, 0xba, 0x00, 0x79, 0x5f, 0x9c, 0xc8, 0x89, 0x25, 0xcd, 0x47, 0x2c, 0xb4, 0x0e, 0x70, 0x33, + 0xd8, 0x19, 0x35, 0x34, 0x22, 0xd1, 0x03, 0xb4, 0x18, 0x8b, 0x9f, 0x92, 0xb1, 0xe9, 0x9d, 0x51, + 0x23, 0x02, 0x8d, 0xc6, 0x53, 0xfc, 0x85, 0x01, 0xa5, 0xdb, 0x96, 0x1d, 0x98, 0x50, 0x55, 0xab, + 0x28, 0x74, 0x93, 0x12, 0xc0, 0x9f, 0x74, 0x87, 0xf6, 0xac, 0xad, 0xcb, 0xae, 0x27, 0xe8, 0x4e, + 0x91, 0x60, 0x1e, 0x86, 0x3c, 0x73, 0x6c, 0xc8, 0xcb, 0x4e, 0xee, 0x55, 0xbf, 0x5e, 0x1f, 0x76, + 0xd5, 0x2c, 0xa4, 0x67, 0x32, 0xf8, 0xcf, 0x06, 0x94, 0x25, 0xf3, 0xca, 0xf2, 0x7e, 0x0c, 0x39, + 0x29, 0x1b, 0xc1, 0xfe, 0xff, 0xf0, 0x2f, 0x6f, 0x4e, 0xe2, 0x5b, 0x14, 0x4d, 0xf4, 0x1e, 0x4c, + 0x77, 0x3c, 0x77, 0x30, 0xa0, 0x9d, 0x35, 0xe5, 0xc5, 0xd2, 0x49, 0x2f, 0xb6, 0x1c, 0x5d, 0x27, + 0x09, 0x74, 0xfc, 0x0f, 0x03, 0xa6, 0x94, 0xc3, 0x50, 0xea, 0x0a, 0x44, 0x6c, 0xec, 0x3b, 0x70, + 0xa5, 0x27, 0x0d, 0x5c, 0x73, 0x90, 0xeb, 0x7a, 0xee, 0x70, 0xe0, 0x57, 0x33, 0xf2, 0x79, 0xca, + 0xd9, 0x64, 0x01, 0x0d, 0x5f, 0x85, 0x69, 0xcd, 0xca, 0x1e, 0x5e, 0xb3, 0x96, 0xf4, 0x9a, 0x2b, + 0x1d, 0xea, 0x30, 0x7b, 0xc3, 0x0e, 0xfc, 0xa0, 0xc2, 0xc7, 0x3f, 0x37, 0x60, 0x26, 0x89, 0x82, + 0x96, 0x23, 0x4f, 0x8d, 0x93, 0x3b, 0xb6, 0x37, 0xb9, 0x45, 0xe1, 0x7f, 0xfc, 0xf7, 0x1d, 0xe6, + 0x6d, 0x69, 0xd2, 0x72, 0x6f, 0xed, 0x2c, 0x94, 0x22, 0x8b, 0x3c, 0x4a, 0xdd, 0xa7, 0xea, 0x71, + 0x10, 0x3e, 0x0c, 0xbd, 0x42, 0x5a, 0xfa, 0x34, 0x31, 0xc1, 0xbf, 0x34, 0x60, 0x2a, 0xa6, 0x4b, + 0xf4, 0x0e, 0x98, 0x1b, 0x9e, 0xdb, 0x9f, 0x48, 0x51, 0x62, 0x07, 0xfa, 0x16, 0xa4, 0x99, 0x3b, + 0x91, 0x9a, 0xd2, 0xcc, 0xe5, 0x5a, 0x52, 0xec, 0x67, 0x64, 0x9a, 0x2b, 0x67, 0xf8, 0x2c, 0x14, + 0x05, 0x43, 0xb7, 0x2c, 0xdb, 0x1b, 0x1b, 0x30, 0xc6, 0x33, 0x74, 0x01, 0x0e, 0x48, 0x67, 0x38, + 0x7e, 0x73, 0x79, 0xdc, 0xe6, 0xb2, 0xde, 0xfc, 0x1a, 0x64, 0x97, 0x36, 0x87, 0xce, 0x7d, 0xbe, + 0xa5, 0x63, 0x31, 0x4b, 0x6f, 0xe1, 0x63, 0x7c, 0x08, 0x66, 0xf9, 0x1b, 0xa4, 0x9e, 0xbf, 0xe4, + 0x0e, 0x1d, 0xa6, 0xcb, 0x8c, 0x93, 0x50, 0x89, 0x83, 0x95, 0x95, 0x54, 0x20, 0xdb, 0xe6, 0x00, + 0x41, 0x63, 0x8a, 0xc8, 0x09, 0xfe, 0x9d, 0x01, 0xe8, 0x0a, 0x65, 0xe2, 0x94, 0x95, 0xe5, 0xe0, + 0x79, 0xd4, 0xa0, 0xd0, 0xb7, 0x58, 0x7b, 0x93, 0x7a, 0xbe, 0x4e, 0x43, 0xf4, 0xfc, 0x9b, 0xc8, + 0xf9, 0xf0, 0x29, 0x98, 0x8d, 0xdd, 0x52, 0xf1, 0x54, 0x83, 0x42, 0x5b, 0xc1, 0x54, 0xc8, 0x0b, + 0xe6, 0xf8, 0x2f, 0x69, 0x28, 0x88, 0x0d, 0x84, 0x6e, 0xa0, 0x53, 0x50, 0xda, 0xb0, 0x9d, 0x2e, + 0xf5, 0x06, 0x9e, 0xad, 0x44, 0x60, 0xb6, 0x0e, 0xec, 0x8c, 0x1a, 0x51, 0x30, 0x89, 0x4e, 0xd0, + 0x5b, 0x90, 0x1f, 0xfa, 0xd4, 0xbb, 0x67, 0xcb, 0x97, 0x5e, 0x6c, 0x55, 0xb6, 0x47, 0x8d, 0xdc, + 0xf7, 0x7d, 0xea, 0xad, 0x2c, 0xf3, 0xe0, 0x33, 0x14, 0x23, 0x22, 0xff, 0x3b, 0xe8, 0x9a, 0x32, + 0x53, 0x91, 0x87, 0xb5, 0xbe, 0xcd, 0xaf, 0x9f, 0x70, 0x75, 0x03, 0xcf, 0xed, 0x53, 0xb6, 0x49, + 0x87, 0x7e, 0xb3, 0xed, 0xf6, 0xfb, 0xae, 0xd3, 0x14, 0x45, 0xa5, 0x60, 0x9a, 0x47, 0x50, 0xbe, + 0x5d, 0x59, 0xee, 0x6d, 0xc8, 0xb3, 0x4d, 0xcf, 0x1d, 0x76, 0x37, 0x45, 0x60, 0xc8, 0xb4, 0xce, + 0x4f, 0x4e, 0x4f, 0x53, 0x20, 0x7a, 0x80, 0x8e, 0x72, 0x69, 0xd1, 0xf6, 0x7d, 0x7f, 0xd8, 0x97, + 0xa5, 0x5a, 0x2b, 0xbb, 0x33, 0x6a, 0x18, 0x6f, 0x91, 0x00, 0x8c, 0x7f, 0x96, 0x86, 0x86, 0x30, + 0xd4, 0x3b, 0x22, 0x73, 0xb8, 0xec, 0x7a, 0xd7, 0x29, 0xf3, 0xec, 0xf6, 0x0d, 0xab, 0x4f, 0xb5, + 0x6d, 0x34, 0xa0, 0xd4, 0x17, 0xc0, 0x7b, 0x91, 0x27, 0x00, 0xfd, 0x00, 0x0f, 0xbd, 0x0e, 0x20, + 0xde, 0x8c, 0x5c, 0x97, 0xaf, 0xa1, 0x28, 0x20, 0x62, 0x79, 0x29, 0x26, 0xa9, 0xe6, 0x84, 0x9c, + 0x29, 0x09, 0xad, 0x24, 0x25, 0x34, 0x31, 0x9d, 0x40, 0x2c, 0x51, 0x5b, 0xcf, 0xc6, 0x6d, 0x1d, + 0x7f, 0x62, 0x40, 0x7d, 0x55, 0xdf, 0x7c, 0x9f, 0xe2, 0xd0, 0xfc, 0xa6, 0x5f, 0x12, 0xbf, 0x99, + 0xaf, 0xc6, 0x2f, 0xae, 0x03, 0xac, 0xda, 0x0e, 0xbd, 0x6c, 0xf7, 0x18, 0xf5, 0xc6, 0x14, 0x23, + 0xbf, 0xc8, 0x84, 0x2e, 0x81, 0xd0, 0x0d, 0xcd, 0xe7, 0x52, 0xc4, 0x0f, 0xbf, 0x0c, 0x36, 0xd2, + 0x2f, 0x51, 0x6d, 0x99, 0x84, 0x8b, 0x72, 0x20, 0xbf, 0x21, 0xd8, 0x93, 0x21, 0x35, 0xd6, 0x4f, + 0x09, 0x79, 0x6f, 0x7d, 0x57, 0x1d, 0x7e, 0xee, 0x05, 0x19, 0x91, 0xe8, 0x00, 0x35, 0xfd, 0x2d, + 0x87, 0x59, 0x8f, 0x23, 0xfb, 0x89, 0x3e, 0x04, 0x59, 0x2a, 0xe9, 0xca, 0x8e, 0x4d, 0xba, 0x2e, + 0xaa, 0x63, 0xbe, 0x52, 0xf1, 0x78, 0x31, 0xf4, 0x80, 0x42, 0x29, 0xca, 0x03, 0x1e, 0x03, 0xd3, + 0xa3, 0x1b, 0x3a, 0x54, 0xa3, 0xf0, 0xe4, 0x00, 0x53, 0xac, 0xe3, 0xbf, 0x1a, 0x30, 0x73, 0x85, + 0xb2, 0x78, 0x12, 0xf4, 0x0a, 0xa9, 0x14, 0x7f, 0x00, 0x07, 0x23, 0xf7, 0x57, 0xdc, 0x9f, 0x49, + 0x64, 0x3e, 0x87, 0x42, 0xfe, 0x57, 0x9c, 0x0e, 0x7d, 0xac, 0x8a, 0xc6, 0x78, 0xd2, 0x73, 0x0b, + 0x4a, 0x91, 0x45, 0x74, 0x29, 0x91, 0xee, 0x44, 0x1a, 0x3d, 0x41, 0xc8, 0x6e, 0x55, 0x14, 0x4f, + 0xb2, 0x6c, 0x54, 0xc9, 0x6c, 0x90, 0x1a, 0xac, 0x01, 0x12, 0xea, 0x12, 0x64, 0xa3, 0xc1, 0x49, + 0x40, 0xaf, 0x05, 0x79, 0x4f, 0x30, 0x47, 0x47, 0xc1, 0xf4, 0xdc, 0x47, 0x3a, 0x8f, 0x9d, 0x0a, + 0x8f, 0x24, 0xee, 0x23, 0x22, 0x96, 0xf0, 0x05, 0xc8, 0x10, 0xf7, 0x11, 0xaa, 0x03, 0x78, 0x96, + 0xd3, 0xa5, 0x77, 0x82, 0x0a, 0xaa, 0x4c, 0x22, 0x90, 0x3d, 0x12, 0x87, 0x25, 0x38, 0x18, 0xbd, + 0x91, 0x54, 0xf7, 0x22, 0xe4, 0x3f, 0x1c, 0x46, 0xc5, 0x55, 0x49, 0x88, 0x4b, 0x16, 0xe3, 0x1a, + 0x89, 0xdb, 0x0c, 0x84, 0x70, 0x74, 0x04, 0x8a, 0xcc, 0x5a, 0xef, 0xd1, 0x1b, 0xa1, 0x9b, 0x0b, + 0x01, 0x7c, 0x95, 0x17, 0x7f, 0x77, 0x22, 0x19, 0x50, 0x08, 0x40, 0x27, 0x60, 0x26, 0xbc, 0xf3, + 0x2d, 0x8f, 0x6e, 0xd8, 0x8f, 0x85, 0x86, 0xcb, 0x64, 0x17, 0x1c, 0x2d, 0xc0, 0x81, 0x10, 0xb6, + 0x26, 0x32, 0x0d, 0x53, 0xa0, 0x26, 0xc1, 0x5c, 0x36, 0x82, 0xdd, 0xf7, 0x1f, 0x0c, 0xad, 0x9e, + 0x78, 0x7c, 0x65, 0x12, 0x81, 0xe0, 0xbf, 0x19, 0x70, 0x50, 0xaa, 0x9a, 0x97, 0xfd, 0xaf, 0xa2, + 0xd5, 0xff, 0xde, 0x00, 0x14, 0xe5, 0x40, 0x99, 0xd6, 0x1b, 0xd1, 0x7e, 0x0e, 0x4f, 0x65, 0x4a, + 0xa2, 0xa6, 0x95, 0xa0, 0xb0, 0x25, 0x83, 0x21, 0x27, 0xd2, 0x21, 0x59, 0x5c, 0x9b, 0xb2, 0x68, + 0x96, 0x10, 0xa2, 0xfe, 0x79, 0xad, 0xbf, 0xbe, 0xc5, 0xa8, 0xaf, 0x4a, 0x5e, 0x51, 0xeb, 0x0b, + 0x00, 0x91, 0x7f, 0xfc, 0x2c, 0xea, 0x30, 0x61, 0x35, 0x66, 0x78, 0x96, 0x02, 0x11, 0x3d, 0xc0, + 0x7f, 0x4a, 0xc3, 0xd4, 0x1d, 0xb7, 0x37, 0x0c, 0x03, 0xe3, 0xab, 0x14, 0x30, 0x62, 0x75, 0x78, + 0x56, 0xd7, 0xe1, 0x08, 0x4c, 0x9f, 0xd1, 0x81, 0xb0, 0xac, 0x0c, 0x11, 0x63, 0x84, 0xa1, 0xcc, + 0x2c, 0xaf, 0x4b, 0x99, 0xac, 0x6e, 0xaa, 0x39, 0x91, 0x76, 0xc6, 0x60, 0x68, 0x1e, 0x4a, 0x56, + 0xb7, 0xeb, 0xd1, 0xae, 0xc5, 0x68, 0x6b, 0xab, 0x9a, 0x17, 0x87, 0x45, 0x41, 0xf8, 0x23, 0x98, + 0xd6, 0xc2, 0x52, 0x2a, 0x7d, 0x1b, 0xf2, 0x0f, 0x05, 0x64, 0x4c, 0xef, 0x4b, 0xa2, 0x2a, 0x37, + 0xa6, 0xd1, 0xe2, 0xed, 0x72, 0x7d, 0x67, 0x7c, 0x15, 0x72, 0x12, 0x1d, 0x1d, 0x89, 0xd6, 0x28, + 0xb2, 0x49, 0xc3, 0xe7, 0xaa, 0xe0, 0xc0, 0x90, 0x93, 0x84, 0x94, 0xe2, 0x85, 0x6d, 0x48, 0x08, + 0x51, 0xff, 0xf8, 0x3f, 0x06, 0x1c, 0x5a, 0xa6, 0x8c, 0xb6, 0x19, 0xed, 0x5c, 0xb6, 0x69, 0xaf, + 0xf3, 0x8d, 0x96, 0xcf, 0x41, 0x13, 0x2c, 0x13, 0x69, 0x82, 0x71, 0xbf, 0xd3, 0xb3, 0x1d, 0xba, + 0x1a, 0xe9, 0xa2, 0x84, 0x00, 0xee, 0x21, 0x36, 0xf8, 0xc5, 0xe5, 0xb2, 0xfc, 0x3e, 0x11, 0x81, + 0x04, 0x1a, 0xce, 0x85, 0x1a, 0xc6, 0x2b, 0x30, 0x97, 0x64, 0x5a, 0xe9, 0xa8, 0x09, 0x39, 0xb1, + 0x77, 0x4c, 0x17, 0x35, 0xb6, 0x83, 0x28, 0x34, 0xec, 0xc1, 0x54, 0x6c, 0x41, 0xe8, 0x8c, 0xdb, + 0x88, 0xf2, 0x9f, 0x72, 0x82, 0xfe, 0x1f, 0x4c, 0xb6, 0x35, 0x50, 0x6e, 0xb3, 0x75, 0xe8, 0x8b, + 0x51, 0xe3, 0x60, 0x6c, 0xdb, 0xed, 0xad, 0x01, 0x25, 0x02, 0x85, 0x9b, 0x56, 0xdb, 0xf2, 0x3a, + 0xb6, 0x63, 0xf5, 0x6c, 0x26, 0x45, 0x61, 0x92, 0x28, 0x08, 0xff, 0x36, 0xa2, 0x34, 0x69, 0x8f, + 0xfb, 0x54, 0x9a, 0xb1, 0x6f, 0xa5, 0x19, 0x2f, 0x50, 0x1a, 0xfe, 0x61, 0x28, 0x62, 0x7d, 0x45, + 0x25, 0xe2, 0xf7, 0x60, 0xba, 0x13, 0x5b, 0xd9, 0x5b, 0xd4, 0xb2, 0xf7, 0x99, 0x40, 0xc7, 0x6f, + 0x84, 0x22, 0x17, 0x90, 0xf1, 0x22, 0x3f, 0x71, 0x0c, 0x8a, 0xc1, 0x67, 0x1c, 0x54, 0x82, 0xfc, + 0xe5, 0x9b, 0xe4, 0x07, 0x97, 0xc8, 0xf2, 0x4c, 0x0a, 0x95, 0xa1, 0xd0, 0xba, 0xb4, 0x74, 0x4d, + 0xcc, 0x8c, 0xd3, 0x9f, 0x64, 0x75, 0xd0, 0xf4, 0xd0, 0x77, 0x20, 0x2b, 0x23, 0xe1, 0x5c, 0x78, + 0x99, 0xe8, 0xd7, 0x92, 0xda, 0xe1, 0x5d, 0x70, 0xc9, 0x15, 0x4e, 0xbd, 0x6d, 0xa0, 0x1b, 0x50, + 0x12, 0x40, 0xd5, 0x14, 0x3d, 0x92, 0xec, 0x4d, 0xc6, 0x28, 0xbd, 0xbe, 0xc7, 0x6a, 0x84, 0xde, + 0x79, 0xc8, 0x4a, 0x06, 0xe7, 0x12, 0x09, 0xcb, 0x98, 0xdb, 0xc4, 0xda, 0xc4, 0x38, 0x85, 0xde, + 0x05, 0xf3, 0xb6, 0x65, 0xf7, 0x50, 0x24, 0x5f, 0x8a, 0xf4, 0x32, 0x6b, 0x73, 0x49, 0x70, 0xe4, + 0xd8, 0x8b, 0x41, 0x4b, 0xf6, 0x70, 0xb2, 0x2f, 0xa4, 0xb7, 0x57, 0x77, 0x2f, 0x04, 0x27, 0xdf, + 0x94, 0x8d, 0x43, 0xdd, 0x9d, 0x40, 0xaf, 0xc7, 0x8f, 0x4a, 0x34, 0x33, 0x6a, 0xf5, 0xbd, 0x96, + 0x03, 0x82, 0xab, 0x50, 0x8a, 0x74, 0x06, 0xa2, 0x62, 0xdd, 0xdd, 0xd6, 0x88, 0x8a, 0x75, 0x4c, + 0x3b, 0x01, 0xa7, 0xd0, 0x15, 0x28, 0xf0, 0x2c, 0x93, 0x07, 0x5b, 0xf4, 0x5a, 0x32, 0x99, 0x8c, + 0x24, 0x11, 0xb5, 0x23, 0xe3, 0x17, 0x03, 0x42, 0xdf, 0x83, 0xe2, 0x15, 0xca, 0x94, 0x27, 0x3e, + 0x9c, 0x74, 0xe5, 0x63, 0x24, 0x15, 0x0f, 0x07, 0x38, 0x85, 0x3e, 0x12, 0x09, 0x6f, 0xdc, 0x13, + 0xa1, 0xc6, 0x1e, 0x1e, 0x27, 0xb8, 0xd7, 0xfc, 0xde, 0x08, 0x9a, 0xf2, 0xe9, 0xbb, 0xfa, 0xc3, + 0xf1, 0xb2, 0xc5, 0x2c, 0x74, 0x13, 0xa6, 0x05, 0xcb, 0xc1, 0x97, 0xe5, 0x98, 0x69, 0xee, 0xfa, + 0x8c, 0x1d, 0x33, 0xcd, 0xdd, 0x9f, 0xb3, 0x71, 0xaa, 0x75, 0xf7, 0xe9, 0xb3, 0x7a, 0xea, 0xd3, + 0x67, 0xf5, 0xd4, 0xe7, 0xcf, 0xea, 0xc6, 0x4f, 0xb7, 0xeb, 0xc6, 0x1f, 0xb6, 0xeb, 0xc6, 0x93, + 0xed, 0xba, 0xf1, 0x74, 0xbb, 0x6e, 0xfc, 0x6b, 0xbb, 0x6e, 0xfc, 0x7b, 0xbb, 0x9e, 0xfa, 0x7c, + 0xbb, 0x6e, 0x7c, 0xfc, 0xbc, 0x9e, 0x7a, 0xfa, 0xbc, 0x9e, 0xfa, 0xf4, 0x79, 0x3d, 0xf5, 0xa3, + 0xe3, 0x2f, 0xae, 0xc1, 0xa4, 0xb7, 0xc9, 0x89, 0xbf, 0x33, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, + 0x05, 0xeb, 0x00, 0x3f, 0xfa, 0x1f, 0x00, 0x00, } func (x Direction) String() string { @@ -11035,7 +11035,7 @@ func (m *QueryResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Streams = append(m.Streams, github_com_grafana_loki_v3_pkg_push.Stream{}) + m.Streams = append(m.Streams, github_com_grafana_loki_pkg_push.Stream{}) if err := m.Streams[len(m.Streams)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -12085,7 +12085,7 @@ func (m *TailResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Stream == nil { - m.Stream = &github_com_grafana_loki_v3_pkg_push.Stream{} + m.Stream = &github_com_grafana_loki_pkg_push.Stream{} } if err := m.Stream.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err diff --git a/pkg/logproto/logproto.proto b/pkg/logproto/logproto.proto index 39d64c30d8185..892e0f599ebae 100644 --- a/pkg/logproto/logproto.proto +++ b/pkg/logproto/logproto.proto @@ -98,7 +98,7 @@ message Delete { message QueryResponse { repeated StreamAdapter streams = 1 [ - (gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/push.Stream", + (gogoproto.customtype) = "github.com/grafana/loki/pkg/push.Stream", (gogoproto.nullable) = true ]; stats.Ingester stats = 2 [(gogoproto.nullable) = false]; @@ -169,7 +169,7 @@ message TailRequest { } message TailResponse { - StreamAdapter stream = 1 [(gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/push.Stream"]; + StreamAdapter stream = 1 [(gogoproto.customtype) = "github.com/grafana/loki/pkg/push.Stream"]; repeated DroppedStream droppedStreams = 2; } diff --git a/pkg/logqlmodel/logqlmodel.go b/pkg/logqlmodel/logqlmodel.go index 9de0d5be9f756..8da990f0e74bb 100644 --- a/pkg/logqlmodel/logqlmodel.go +++ b/pkg/logqlmodel/logqlmodel.go @@ -5,7 +5,7 @@ import ( "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase/definitions" - "github.com/grafana/loki/v3/pkg/push" + "github.com/grafana/loki/pkg/push" "github.com/grafana/loki/v3/pkg/logqlmodel/stats" ) diff --git a/pkg/push/go.mod b/pkg/push/go.mod index f35acdfd50762..067ca8f02c80c 100644 --- a/pkg/push/go.mod +++ b/pkg/push/go.mod @@ -1,4 +1,4 @@ -module github.com/grafana/loki/v3/pkg/push +module github.com/grafana/loki/pkg/push go 1.19 diff --git a/pkg/push/push.pb.go b/pkg/push/push.pb.go index 7979872929611..3b07d850ff162 100644 --- a/pkg/push/push.pb.go +++ b/pkg/push/push.pb.go @@ -296,41 +296,40 @@ func init() { func init() { proto.RegisterFile("pkg/push/push.proto", fileDescriptor_35ec442956852c9e) } var fileDescriptor_35ec442956852c9e = []byte{ - // 532 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x53, 0xc1, 0x6e, 0xd3, 0x4c, - 0x10, 0xf6, 0x26, 0x6e, 0xda, 0x6e, 0xfa, 0xf7, 0xaf, 0x96, 0xb6, 0x18, 0xab, 0x5a, 0x57, 0x86, - 0x43, 0x0e, 0x60, 0x4b, 0xe9, 0x81, 0x0b, 0x97, 0x58, 0x42, 0xea, 0xa1, 0x48, 0x95, 0x41, 0x42, - 0x70, 0xdb, 0x34, 0x5b, 0xdb, 0xaa, 0xed, 0x35, 0xbb, 0xeb, 0x4a, 0xbd, 0xf1, 0x08, 0xe5, 0x2d, - 0x78, 0x02, 0x9e, 0xa1, 0xc7, 0x1c, 0x2b, 0x0e, 0x86, 0x38, 0x17, 0x94, 0x53, 0x1f, 0x01, 0x79, - 0x6d, 0x93, 0x50, 0x90, 0xb8, 0x6c, 0xbe, 0x99, 0x9d, 0xf9, 0xbe, 0x2f, 0xb3, 0x63, 0xf8, 0x20, - 0xbb, 0x08, 0xdc, 0x2c, 0x17, 0xa1, 0x3a, 0x9c, 0x8c, 0x33, 0xc9, 0xd0, 0x46, 0xcc, 0x02, 0x85, - 0xcc, 0xdd, 0x80, 0x05, 0x4c, 0x41, 0xb7, 0x42, 0xf5, 0xbd, 0x69, 0x05, 0x8c, 0x05, 0x31, 0x75, - 0x55, 0x34, 0xce, 0xcf, 0x5d, 0x19, 0x25, 0x54, 0x48, 0x92, 0x64, 0x75, 0x81, 0xfd, 0x16, 0xf6, - 0x4f, 0x73, 0x11, 0xfa, 0xf4, 0x43, 0x4e, 0x85, 0x44, 0xc7, 0x70, 0x5d, 0x48, 0x4e, 0x49, 0x22, - 0x0c, 0x70, 0xd8, 0x1d, 0xf4, 0x87, 0x0f, 0x9d, 0x56, 0xc1, 0x79, 0xad, 0x2e, 0x46, 0x13, 0x92, - 0x49, 0xca, 0xbd, 0xbd, 0xaf, 0x85, 0xd5, 0xab, 0x53, 0x8b, 0xc2, 0x6a, 0xbb, 0xfc, 0x16, 0xd8, - 0xdb, 0x70, 0xab, 0x26, 0x16, 0x19, 0x4b, 0x05, 0xb5, 0x3f, 0x01, 0xf8, 0xdf, 0x6f, 0x0c, 0xc8, - 0x86, 0xbd, 0x98, 0x8c, 0x69, 0x5c, 0x49, 0x81, 0xc1, 0xa6, 0x07, 0x17, 0x85, 0xd5, 0x64, 0xfc, - 0xe6, 0x17, 0x8d, 0xe0, 0x3a, 0x4d, 0x25, 0x8f, 0xa8, 0x30, 0x3a, 0xca, 0xcf, 0xfe, 0xd2, 0xcf, - 0xcb, 0x54, 0xf2, 0xab, 0xd6, 0xce, 0xff, 0x37, 0x85, 0xa5, 0x55, 0x46, 0x9a, 0x72, 0xbf, 0x05, - 0xe8, 0x11, 0xd4, 0x43, 0x22, 0x42, 0xa3, 0x7b, 0x08, 0x06, 0xba, 0xb7, 0xb6, 0x28, 0x2c, 0xf0, - 0xcc, 0x57, 0x29, 0xfb, 0x05, 0xdc, 0x39, 0xa9, 0x74, 0x4e, 0x49, 0xc4, 0x5b, 0x57, 0x08, 0xea, - 0x29, 0x49, 0x68, 0xed, 0xc9, 0x57, 0x18, 0xed, 0xc2, 0xb5, 0x4b, 0x12, 0xe7, 0xd4, 0xe8, 0xa8, - 0x64, 0x1d, 0xd8, 0x5f, 0x3a, 0x70, 0x6b, 0xd5, 0x03, 0x3a, 0x86, 0x9b, 0xbf, 0xc6, 0xab, 0xfa, - 0xfb, 0x43, 0xd3, 0xa9, 0x1f, 0xc0, 0x69, 0x1f, 0xc0, 0x79, 0xd3, 0x56, 0x78, 0xdb, 0x8d, 0xe5, - 0x8e, 0x14, 0xd7, 0xdf, 0x2c, 0xe0, 0x2f, 0x9b, 0xd1, 0x01, 0xd4, 0xe3, 0x28, 0x6d, 0xf4, 0xbc, - 0x8d, 0x45, 0x61, 0xa9, 0xd8, 0x57, 0x27, 0xca, 0x20, 0x12, 0x92, 0xe7, 0x67, 0x32, 0xe7, 0x74, - 0xf2, 0x8a, 0x4a, 0x32, 0x21, 0x92, 0x18, 0x5d, 0x35, 0x1f, 0x73, 0x39, 0x9f, 0xfb, 0x7f, 0xcd, - 0x7b, 0xd2, 0x08, 0x1e, 0xfc, 0xd9, 0xfd, 0x94, 0x25, 0x91, 0xa4, 0x49, 0x26, 0xaf, 0xfc, 0xbf, - 0x70, 0xa3, 0x13, 0xd8, 0xcb, 0x08, 0x17, 0x74, 0x62, 0xe8, 0xff, 0x54, 0x31, 0x1a, 0x95, 0x9d, - 0xba, 0x63, 0x85, 0xb9, 0xe1, 0x18, 0x8e, 0x60, 0xaf, 0x5a, 0x0d, 0xca, 0xd1, 0x73, 0xa8, 0x57, - 0x08, 0xed, 0x2d, 0xf9, 0x56, 0xb6, 0xd1, 0xdc, 0xbf, 0x9f, 0x6e, 0x76, 0x49, 0xf3, 0xde, 0x4d, - 0x67, 0x58, 0xbb, 0x9d, 0x61, 0xed, 0x6e, 0x86, 0xc1, 0xc7, 0x12, 0x83, 0xcf, 0x25, 0x06, 0x37, - 0x25, 0x06, 0xd3, 0x12, 0x83, 0xef, 0x25, 0x06, 0x3f, 0x4a, 0xac, 0xdd, 0x95, 0x18, 0x5c, 0xcf, - 0xb1, 0x36, 0x9d, 0x63, 0xed, 0x76, 0x8e, 0xb5, 0xf7, 0x8f, 0x83, 0x48, 0x86, 0xf9, 0xd8, 0x39, - 0x63, 0x89, 0x1b, 0x70, 0x72, 0x4e, 0x52, 0xe2, 0xc6, 0xec, 0x22, 0x72, 0x2f, 0x8f, 0xdc, 0xf6, - 0xeb, 0x1a, 0xf7, 0x94, 0xe0, 0xd1, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x51, 0xe6, 0x29, 0x58, - 0x70, 0x03, 0x00, 0x00, + // 527 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x53, 0xc1, 0x6e, 0xd3, 0x40, + 0x10, 0xf5, 0x26, 0x6e, 0xda, 0x6e, 0x4a, 0xa9, 0x96, 0xb6, 0x18, 0xab, 0x5a, 0x47, 0x16, 0x87, + 0x1c, 0xc0, 0x96, 0xc2, 0x81, 0x0b, 0x97, 0x58, 0x42, 0xea, 0xa1, 0x48, 0x95, 0x41, 0x20, 0x71, + 0xdb, 0x34, 0x5b, 0xdb, 0xaa, 0xed, 0x35, 0xbb, 0x6b, 0xa4, 0xde, 0xf8, 0x84, 0xf2, 0x17, 0x7c, + 0x01, 0xdf, 0xd0, 0x63, 0x8e, 0x15, 0x07, 0x43, 0x9c, 0x0b, 0xca, 0xa9, 0x9f, 0x80, 0xbc, 0xb6, + 0x49, 0x28, 0x48, 0x5c, 0x36, 0x6f, 0x66, 0x67, 0xde, 0x7b, 0x99, 0x1d, 0xc3, 0x07, 0xd9, 0x45, + 0xe0, 0x66, 0xb9, 0x08, 0xd5, 0xe1, 0x64, 0x9c, 0x49, 0x86, 0xb6, 0x62, 0x16, 0x28, 0x64, 0xee, + 0x07, 0x2c, 0x60, 0x0a, 0xba, 0x15, 0xaa, 0xef, 0x4d, 0x2b, 0x60, 0x2c, 0x88, 0xa9, 0xab, 0xa2, + 0x49, 0x7e, 0xee, 0xca, 0x28, 0xa1, 0x42, 0x92, 0x24, 0xab, 0x0b, 0xec, 0x77, 0xb0, 0x7f, 0x9a, + 0x8b, 0xd0, 0xa7, 0x1f, 0x72, 0x2a, 0x24, 0x3a, 0x86, 0x9b, 0x42, 0x72, 0x4a, 0x12, 0x61, 0x80, + 0x41, 0x77, 0xd8, 0x1f, 0x3d, 0x74, 0x5a, 0x05, 0xe7, 0xb5, 0xba, 0x18, 0x4f, 0x49, 0x26, 0x29, + 0xf7, 0x0e, 0xbe, 0x15, 0x56, 0xaf, 0x4e, 0x2d, 0x0b, 0xab, 0xed, 0xf2, 0x5b, 0x60, 0xef, 0xc2, + 0x9d, 0x9a, 0x58, 0x64, 0x2c, 0x15, 0xd4, 0xfe, 0x0c, 0xe0, 0xbd, 0x3f, 0x18, 0x90, 0x0d, 0x7b, + 0x31, 0x99, 0xd0, 0xb8, 0x92, 0x02, 0xc3, 0x6d, 0x0f, 0x2e, 0x0b, 0xab, 0xc9, 0xf8, 0xcd, 0x2f, + 0x1a, 0xc3, 0x4d, 0x9a, 0x4a, 0x1e, 0x51, 0x61, 0x74, 0x94, 0x9f, 0xc3, 0x95, 0x9f, 0x97, 0xa9, + 0xe4, 0x97, 0xad, 0x9d, 0xfb, 0xd7, 0x85, 0xa5, 0x55, 0x46, 0x9a, 0x72, 0xbf, 0x05, 0xe8, 0x11, + 0xd4, 0x43, 0x22, 0x42, 0xa3, 0x3b, 0x00, 0x43, 0xdd, 0xdb, 0x58, 0x16, 0x16, 0x78, 0xea, 0xab, + 0x94, 0xfd, 0x02, 0xee, 0x9d, 0x54, 0x3a, 0xa7, 0x24, 0xe2, 0xad, 0x2b, 0x04, 0xf5, 0x94, 0x24, + 0xb4, 0xf6, 0xe4, 0x2b, 0x8c, 0xf6, 0xe1, 0xc6, 0x47, 0x12, 0xe7, 0xd4, 0xe8, 0xa8, 0x64, 0x1d, + 0xd8, 0x5f, 0x3b, 0x70, 0x67, 0xdd, 0x03, 0x3a, 0x86, 0xdb, 0xbf, 0xc7, 0xab, 0xfa, 0xfb, 0x23, + 0xd3, 0xa9, 0x1f, 0xc0, 0x69, 0x1f, 0xc0, 0x79, 0xd3, 0x56, 0x78, 0xbb, 0x8d, 0xe5, 0x8e, 0x14, + 0x57, 0xdf, 0x2d, 0xe0, 0xaf, 0x9a, 0xd1, 0x11, 0xd4, 0xe3, 0x28, 0x6d, 0xf4, 0xbc, 0xad, 0x65, + 0x61, 0xa9, 0xd8, 0x57, 0x27, 0xca, 0x20, 0x12, 0x92, 0xe7, 0x67, 0x32, 0xe7, 0x74, 0xfa, 0x8a, + 0x4a, 0x32, 0x25, 0x92, 0x18, 0x5d, 0x35, 0x1f, 0x73, 0x35, 0x9f, 0xbb, 0x7f, 0xcd, 0x7b, 0xdc, + 0x08, 0x1e, 0xfd, 0xdd, 0xfd, 0x84, 0x25, 0x91, 0xa4, 0x49, 0x26, 0x2f, 0xfd, 0x7f, 0x70, 0xa3, + 0x13, 0xd8, 0xcb, 0x08, 0x17, 0x74, 0x6a, 0xe8, 0xff, 0x55, 0x31, 0x1a, 0x95, 0xbd, 0xba, 0x63, + 0x8d, 0xb9, 0xe1, 0x18, 0x8d, 0x61, 0xaf, 0x5a, 0x0d, 0xca, 0xd1, 0x73, 0xa8, 0x57, 0x08, 0x1d, + 0xac, 0xf8, 0xd6, 0xb6, 0xd1, 0x3c, 0xbc, 0x9b, 0x6e, 0x76, 0x49, 0xf3, 0xde, 0xce, 0xe6, 0x58, + 0xbb, 0x99, 0x63, 0xed, 0x76, 0x8e, 0xc1, 0xa7, 0x12, 0x83, 0x2f, 0x25, 0x06, 0xd7, 0x25, 0x06, + 0xb3, 0x12, 0x83, 0x1f, 0x25, 0x06, 0x3f, 0x4b, 0xac, 0xdd, 0x96, 0x18, 0x5c, 0x2d, 0xb0, 0x36, + 0x5b, 0x60, 0xed, 0x66, 0x81, 0xb5, 0xf7, 0x83, 0x20, 0x92, 0x61, 0x3e, 0x71, 0xce, 0x58, 0xe2, + 0x06, 0x9c, 0x9c, 0x93, 0x94, 0xb8, 0x31, 0xbb, 0x88, 0xdc, 0xf6, 0xd3, 0x9a, 0xf4, 0x94, 0xda, + 0xb3, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x7e, 0xaa, 0x57, 0xd3, 0x6d, 0x03, 0x00, 0x00, } func (this *PushRequest) Equal(that interface{}) bool { diff --git a/pkg/push/push.proto b/pkg/push/push.proto index e538c66903eae..3bf8ad06a8a83 100644 --- a/pkg/push/push.proto +++ b/pkg/push/push.proto @@ -5,7 +5,7 @@ package logproto; import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/grafana/loki/v3/pkg/push"; +option go_package = "github.com/grafana/loki/pkg/push"; service Pusher { rpc Push(PushRequest) returns (PushResponse) {} diff --git a/pkg/querier/queryrange/queryrange.pb.go b/pkg/querier/queryrange/queryrange.pb.go index a78b9efbaee74..a602dcafcd802 100644 --- a/pkg/querier/queryrange/queryrange.pb.go +++ b/pkg/querier/queryrange/queryrange.pb.go @@ -12,11 +12,11 @@ import ( github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" + _ "github.com/grafana/loki/pkg/push" + github_com_grafana_loki_pkg_push "github.com/grafana/loki/pkg/push" github_com_grafana_loki_v3_pkg_logproto "github.com/grafana/loki/v3/pkg/logproto" logproto "github.com/grafana/loki/v3/pkg/logproto" stats "github.com/grafana/loki/v3/pkg/logqlmodel/stats" - _ "github.com/grafana/loki/v3/pkg/push" - github_com_grafana_loki_v3_pkg_push "github.com/grafana/loki/v3/pkg/push" github_com_grafana_loki_v3_pkg_querier_plan "github.com/grafana/loki/v3/pkg/querier/plan" queryrangebase "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" _ "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase/definitions" @@ -588,8 +588,8 @@ func (m *LokiLabelNamesResponse) GetStatistics() stats.Result { } type LokiData struct { - ResultType string `protobuf:"bytes,1,opt,name=ResultType,proto3" json:"resultType"` - Result []github_com_grafana_loki_v3_pkg_push.Stream `protobuf:"bytes,2,rep,name=Result,proto3,customtype=github.com/grafana/loki/v3/pkg/push.Stream" json:"result"` + ResultType string `protobuf:"bytes,1,opt,name=ResultType,proto3" json:"resultType"` + Result []github_com_grafana_loki_pkg_push.Stream `protobuf:"bytes,2,rep,name=Result,proto3,customtype=github.com/grafana/loki/pkg/push.Stream" json:"result"` } func (m *LokiData) Reset() { *m = LokiData{} } @@ -1363,115 +1363,115 @@ func init() { } var fileDescriptor_51b9d53b40d11902 = []byte{ - // 1717 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x58, 0x4b, 0x6f, 0xdb, 0xc6, - 0x16, 0x16, 0xf5, 0xb4, 0xc6, 0x8f, 0xeb, 0x3b, 0x36, 0x1c, 0x5e, 0x27, 0x11, 0x05, 0x01, 0x37, - 0xd7, 0x37, 0x68, 0xa5, 0x46, 0x4e, 0xdc, 0xd4, 0x35, 0x82, 0x84, 0x75, 0x02, 0x19, 0x4d, 0x8a, - 0x84, 0x36, 0xba, 0xe8, 0xa6, 0x18, 0x4b, 0x63, 0x89, 0x30, 0x45, 0xd2, 0xe4, 0xc8, 0x89, 0x81, - 0x2e, 0xf2, 0x07, 0x8a, 0x06, 0xe8, 0x9f, 0x68, 0x37, 0x2d, 0x5a, 0x74, 0xd5, 0x55, 0xbb, 0x33, - 0x0a, 0x14, 0xc8, 0x32, 0x10, 0x50, 0xb5, 0x71, 0x36, 0x85, 0x57, 0x01, 0xfa, 0x07, 0x8a, 0x79, - 0x90, 0x1a, 0x8a, 0x72, 0x2d, 0xa5, 0xe8, 0xc2, 0x45, 0x37, 0xd2, 0x3c, 0xce, 0x77, 0x38, 0xfc, - 0xce, 0x77, 0x86, 0x67, 0x06, 0xfc, 0xcf, 0xdd, 0x6d, 0x56, 0xf6, 0x3a, 0xd8, 0x33, 0xb1, 0xc7, - 0xfe, 0x0f, 0x3c, 0x64, 0x37, 0xb1, 0xd4, 0x2c, 0xbb, 0x9e, 0x43, 0x1c, 0x08, 0xfa, 0x23, 0x8b, - 0xd5, 0xa6, 0x49, 0x5a, 0x9d, 0xed, 0x72, 0xdd, 0x69, 0x57, 0x9a, 0x4e, 0xd3, 0xa9, 0x34, 0x1d, - 0xa7, 0x69, 0x61, 0xe4, 0x9a, 0xbe, 0x68, 0x56, 0x3c, 0xb7, 0x5e, 0xf1, 0x09, 0x22, 0x1d, 0x9f, - 0xe3, 0x17, 0xe7, 0xa9, 0x21, 0x6b, 0x32, 0x88, 0x18, 0xd5, 0x84, 0x39, 0xeb, 0x6d, 0x77, 0x76, - 0x2a, 0xc4, 0x6c, 0x63, 0x9f, 0xa0, 0xb6, 0x1b, 0x18, 0xd0, 0xf5, 0x59, 0x4e, 0x93, 0x23, 0x4d, - 0xbb, 0x81, 0x1f, 0x35, 0x11, 0xc1, 0x0f, 0xd1, 0x81, 0x30, 0x38, 0x1f, 0x31, 0x08, 0x1a, 0x62, - 0xf2, 0x3f, 0x91, 0x49, 0x7f, 0x17, 0x93, 0x7a, 0x4b, 0x4c, 0x15, 0xc5, 0xd4, 0x9e, 0xd5, 0x76, - 0x1a, 0xd8, 0x62, 0x8b, 0xf5, 0xf9, 0xaf, 0xb0, 0x98, 0xa3, 0x16, 0x6e, 0xc7, 0x6f, 0xb1, 0x1f, - 0x31, 0xf8, 0xce, 0xa9, 0x7c, 0x6d, 0x23, 0x1f, 0x57, 0x1a, 0x78, 0xc7, 0xb4, 0x4d, 0x62, 0x3a, - 0xb6, 0x2f, 0xb7, 0x85, 0x93, 0x95, 0xd1, 0x9c, 0x0c, 0xc6, 0xa0, 0xf4, 0x55, 0x0a, 0x4c, 0xde, - 0x75, 0x76, 0x4d, 0x03, 0xef, 0x75, 0xb0, 0x4f, 0xe0, 0x3c, 0xc8, 0x30, 0x1b, 0x55, 0x29, 0x2a, - 0x4b, 0x79, 0x83, 0x77, 0xe8, 0xa8, 0x65, 0xb6, 0x4d, 0xa2, 0x26, 0x8b, 0xca, 0xd2, 0xb4, 0xc1, - 0x3b, 0x10, 0x82, 0xb4, 0x4f, 0xb0, 0xab, 0xa6, 0x8a, 0xca, 0x52, 0xca, 0x60, 0x6d, 0xb8, 0x08, - 0x26, 0x4c, 0x9b, 0x60, 0x6f, 0x1f, 0x59, 0x6a, 0x9e, 0x8d, 0x87, 0x7d, 0x78, 0x03, 0xe4, 0x7c, - 0x82, 0x3c, 0xb2, 0xe5, 0xab, 0xe9, 0xa2, 0xb2, 0x34, 0x59, 0x5d, 0x2c, 0xf3, 0x58, 0x95, 0x83, - 0x58, 0x95, 0xb7, 0x82, 0x58, 0xe9, 0x13, 0x87, 0x3d, 0x2d, 0xf1, 0xe4, 0x67, 0x4d, 0x31, 0x02, - 0x10, 0x5c, 0x05, 0x19, 0x6c, 0x37, 0xb6, 0x7c, 0x35, 0x33, 0x06, 0x9a, 0x43, 0xe0, 0x15, 0x90, - 0x6f, 0x98, 0x1e, 0xae, 0x53, 0xce, 0xd4, 0x6c, 0x51, 0x59, 0x9a, 0xa9, 0xce, 0x95, 0xc3, 0xd0, - 0xae, 0x07, 0x53, 0x46, 0xdf, 0x8a, 0xbe, 0x9e, 0x8b, 0x48, 0x4b, 0xcd, 0x31, 0x26, 0x58, 0x1b, - 0x96, 0x40, 0xd6, 0x6f, 0x21, 0xaf, 0xe1, 0xab, 0x13, 0xc5, 0xd4, 0x52, 0x5e, 0x07, 0xc7, 0x3d, - 0x4d, 0x8c, 0x18, 0xe2, 0x1f, 0x7e, 0x08, 0xd2, 0xae, 0x85, 0x6c, 0x15, 0xb0, 0x55, 0xce, 0x96, - 0x25, 0xce, 0xef, 0x5b, 0xc8, 0xd6, 0xdf, 0xea, 0xf6, 0xb4, 0x6b, 0xb2, 0xdc, 0x3d, 0xb4, 0x83, - 0x6c, 0x54, 0xb1, 0x9c, 0x5d, 0xb3, 0xb2, 0xbf, 0x5c, 0x91, 0x23, 0x49, 0x1d, 0x95, 0x1f, 0x50, - 0x07, 0x14, 0x6a, 0x30, 0xc7, 0xa5, 0x1f, 0x92, 0x00, 0xd2, 0x98, 0x6d, 0xd8, 0x3e, 0x41, 0x36, - 0x79, 0x95, 0xd0, 0xad, 0x81, 0x2c, 0x4d, 0x8b, 0x2d, 0x9f, 0x05, 0x6f, 0x54, 0x2e, 0x05, 0x26, - 0x4a, 0x66, 0x7a, 0x2c, 0x32, 0x33, 0x43, 0xc9, 0xcc, 0x9e, 0x4a, 0x66, 0xee, 0xaf, 0x22, 0x53, - 0x05, 0x69, 0xda, 0x83, 0xb3, 0x20, 0xe5, 0xa1, 0x87, 0x8c, 0xbb, 0x29, 0x83, 0x36, 0x4b, 0x5f, - 0xa4, 0xc1, 0x14, 0x4f, 0x0d, 0xdf, 0x75, 0x6c, 0x1f, 0xd3, 0xf5, 0x6e, 0xb2, 0xfd, 0x87, 0x33, - 0x2c, 0xd6, 0xcb, 0x46, 0x0c, 0x31, 0x03, 0x6f, 0x82, 0xf4, 0x3a, 0x22, 0x88, 0xb1, 0x3d, 0x59, - 0x9d, 0x97, 0xd7, 0x4b, 0x7d, 0xd1, 0x39, 0x7d, 0x81, 0x12, 0x7a, 0xdc, 0xd3, 0x66, 0x1a, 0x88, - 0xa0, 0xd7, 0x9c, 0xb6, 0x49, 0x70, 0xdb, 0x25, 0x07, 0x06, 0x43, 0xc2, 0x6b, 0x20, 0x7f, 0xdb, - 0xf3, 0x1c, 0x6f, 0xeb, 0xc0, 0xc5, 0x2c, 0x3a, 0x79, 0xfd, 0xdc, 0x71, 0x4f, 0x9b, 0xc3, 0xc1, - 0xa0, 0x84, 0xe8, 0x5b, 0xc2, 0xff, 0x83, 0x0c, 0xeb, 0xb0, 0x78, 0xe4, 0xf5, 0xb9, 0xe3, 0x9e, - 0xf6, 0x2f, 0x06, 0x91, 0xcc, 0xb9, 0x45, 0x34, 0x7c, 0x99, 0x91, 0xc2, 0x17, 0xaa, 0x28, 0x2b, - 0xab, 0x48, 0x05, 0xb9, 0x7d, 0xec, 0xf9, 0xd4, 0x4d, 0x8e, 0x8d, 0x07, 0x5d, 0x78, 0x0b, 0x00, - 0x4a, 0x8c, 0xe9, 0x13, 0xb3, 0x4e, 0x73, 0x85, 0x92, 0x31, 0x5d, 0xe6, 0x5b, 0xa1, 0x81, 0xfd, - 0x8e, 0x45, 0x74, 0x28, 0x58, 0x90, 0x0c, 0x0d, 0xa9, 0x0d, 0xbf, 0x54, 0x40, 0xae, 0x86, 0x51, - 0x03, 0x7b, 0xbe, 0x9a, 0x2f, 0xa6, 0x96, 0x26, 0xab, 0xff, 0x2d, 0xcb, 0xfb, 0xde, 0x7d, 0xcf, - 0x69, 0x63, 0xd2, 0xc2, 0x1d, 0x3f, 0x08, 0x10, 0xb7, 0xd6, 0xed, 0x6e, 0x4f, 0xc3, 0x23, 0x4a, - 0x62, 0xa4, 0xed, 0xf6, 0xc4, 0x47, 0x1d, 0xf7, 0x34, 0xe5, 0x75, 0x23, 0x58, 0x65, 0xe9, 0x27, - 0x05, 0xfc, 0x9b, 0x06, 0x79, 0x93, 0xfa, 0xf6, 0xa5, 0xb4, 0x6c, 0x23, 0x52, 0x6f, 0xa9, 0x0a, - 0x15, 0xb9, 0xc1, 0x3b, 0xf2, 0x5e, 0x98, 0xfc, 0x53, 0x7b, 0x61, 0x6a, 0xfc, 0xbd, 0x30, 0xc8, - 0xc5, 0xf4, 0xd0, 0x5c, 0xcc, 0x9c, 0x94, 0x8b, 0xa5, 0x4f, 0x52, 0x7c, 0xdf, 0x09, 0xde, 0x6f, - 0x8c, 0xb4, 0xb8, 0x13, 0xa6, 0x45, 0x8a, 0xad, 0x36, 0x54, 0x1b, 0xf7, 0xb5, 0xd1, 0xc0, 0x36, - 0x31, 0x77, 0x4c, 0xec, 0x9d, 0x92, 0x1c, 0x92, 0xe2, 0x52, 0x51, 0xc5, 0xc9, 0x72, 0x49, 0x9f, - 0x05, 0xb9, 0x0c, 0xe4, 0x48, 0xe6, 0x15, 0x72, 0xa4, 0xf4, 0x5b, 0x12, 0x2c, 0xd0, 0x88, 0xdc, - 0x45, 0xdb, 0xd8, 0x7a, 0x0f, 0xb5, 0xc7, 0x8c, 0xca, 0x25, 0x29, 0x2a, 0x79, 0x1d, 0xfe, 0xc3, - 0xfa, 0x68, 0xac, 0x7f, 0xae, 0x80, 0x89, 0x60, 0x33, 0x87, 0x65, 0x00, 0x38, 0x8c, 0xed, 0xd7, - 0x9c, 0xeb, 0x19, 0x0a, 0xf6, 0xc2, 0x51, 0x43, 0xb2, 0x80, 0x6d, 0x90, 0xe5, 0x3d, 0x91, 0x0b, - 0xe7, 0xa4, 0x5c, 0x20, 0x1e, 0x46, 0xed, 0x5b, 0x0d, 0xe4, 0x12, 0xec, 0xe9, 0x6b, 0x74, 0x15, - 0xdd, 0x9e, 0x76, 0xf9, 0x14, 0x96, 0x58, 0x25, 0xc9, 0xa1, 0x34, 0xc4, 0xfc, 0xb1, 0x86, 0x78, - 0x48, 0xe9, 0x63, 0x05, 0xcc, 0xd2, 0xb5, 0x52, 0x76, 0x42, 0x6d, 0xac, 0x83, 0x09, 0x4f, 0xb4, - 0xd9, 0x8a, 0x27, 0xab, 0xa5, 0x72, 0x94, 0xd9, 0x21, 0x6c, 0xea, 0xe9, 0xc3, 0x9e, 0xa6, 0x18, - 0x21, 0x12, 0x2e, 0x47, 0x98, 0x4c, 0x0e, 0x63, 0x92, 0x42, 0x12, 0x11, 0xee, 0xbe, 0x4b, 0x02, - 0xb8, 0x41, 0x4b, 0x6e, 0x2a, 0xc1, 0xbe, 0x5a, 0x1f, 0xc5, 0x56, 0x74, 0xa1, 0xcf, 0x4b, 0xdc, - 0x5e, 0xbf, 0xd1, 0xed, 0x69, 0xab, 0xa7, 0x10, 0xf3, 0x07, 0x78, 0xe9, 0x2d, 0x64, 0x05, 0x27, - 0xcf, 0xc4, 0x67, 0xe6, 0x9b, 0x24, 0x98, 0x79, 0xdf, 0xb1, 0x3a, 0x6d, 0x1c, 0xd2, 0xe7, 0xc6, - 0xe8, 0x53, 0xfb, 0xf4, 0x45, 0x6d, 0xf5, 0xd5, 0x6e, 0x4f, 0x5b, 0x19, 0x95, 0xba, 0x28, 0xf6, - 0x4c, 0xd3, 0xf6, 0x75, 0x12, 0xcc, 0x6f, 0x39, 0xee, 0xbb, 0x9b, 0xec, 0xc8, 0x26, 0xed, 0x94, - 0xad, 0x18, 0x79, 0xf3, 0x7d, 0xf2, 0x28, 0xe2, 0x1e, 0x22, 0x9e, 0xf9, 0x48, 0x5f, 0xe9, 0xf6, - 0xb4, 0xea, 0xa8, 0xc4, 0xf5, 0x71, 0x67, 0x9a, 0xb4, 0xc3, 0x24, 0x58, 0x78, 0xd0, 0x41, 0x36, - 0x31, 0x2d, 0xcc, 0x89, 0x0b, 0x69, 0xfb, 0x28, 0x46, 0x5b, 0xa1, 0x4f, 0x5b, 0x14, 0x23, 0x08, - 0xbc, 0xd9, 0xed, 0x69, 0x6b, 0xa3, 0x12, 0x38, 0xcc, 0xc3, 0x99, 0xa6, 0xf2, 0xdb, 0x24, 0x98, - 0xd9, 0xe4, 0x05, 0x55, 0xf0, 0x12, 0xfb, 0x43, 0x28, 0x94, 0xef, 0x23, 0xdc, 0xed, 0x72, 0x14, - 0x31, 0x5e, 0xf2, 0x46, 0xb1, 0x67, 0x9a, 0xbc, 0x1f, 0x93, 0x60, 0x61, 0x1d, 0x13, 0x5c, 0x27, - 0xb8, 0x71, 0xc7, 0xc4, 0x96, 0x44, 0xe2, 0x63, 0x25, 0xc6, 0x62, 0x51, 0x3a, 0xcd, 0x0c, 0x05, - 0xe9, 0x7a, 0xb7, 0xa7, 0xdd, 0x18, 0x95, 0xc7, 0xe1, 0x3e, 0xfe, 0x36, 0x7c, 0xb2, 0xe2, 0x71, - 0x5c, 0x3e, 0xa3, 0xa0, 0x57, 0xe3, 0x33, 0xea, 0xe3, 0x4c, 0xf3, 0xf9, 0x69, 0x16, 0x4c, 0xb3, - 0x9b, 0x85, 0x90, 0xc6, 0xcb, 0x40, 0x54, 0xdb, 0x82, 0x43, 0x18, 0x9c, 0xd0, 0x3c, 0xb7, 0x5e, - 0xde, 0x14, 0x75, 0x38, 0xb7, 0x80, 0xd7, 0x41, 0xd6, 0x67, 0xe7, 0x20, 0x51, 0x45, 0x15, 0x06, - 0xaf, 0x0d, 0xa2, 0x27, 0xae, 0x5a, 0xc2, 0x10, 0xf6, 0x70, 0x0d, 0x64, 0x2d, 0xc6, 0xa2, 0x38, - 0x07, 0x96, 0x06, 0x91, 0xf1, 0x93, 0x01, 0x45, 0x73, 0x0c, 0x5c, 0x01, 0x19, 0x56, 0xae, 0x89, - 0xeb, 0xb8, 0xc8, 0x63, 0xe3, 0x45, 0x53, 0x2d, 0x61, 0x70, 0x73, 0x58, 0x05, 0x69, 0xd7, 0x73, - 0xda, 0xa2, 0x7a, 0xbe, 0x30, 0xf8, 0x4c, 0xb9, 0xd6, 0xac, 0x25, 0x0c, 0x66, 0x0b, 0xaf, 0xd2, - 0x03, 0x2f, 0x2d, 0x52, 0x7d, 0x76, 0x87, 0x40, 0x2b, 0x94, 0x01, 0x98, 0x04, 0x09, 0x4c, 0xe1, - 0x55, 0x90, 0xdd, 0x67, 0x25, 0x88, 0xb8, 0x00, 0x5a, 0x94, 0x41, 0xd1, 0xe2, 0x84, 0xbe, 0x17, - 0xb7, 0x85, 0x77, 0xc0, 0x14, 0x71, 0xdc, 0xdd, 0xe0, 0x4b, 0x2f, 0xee, 0x1f, 0x8a, 0x32, 0x76, - 0x58, 0x25, 0x50, 0x4b, 0x18, 0x11, 0x1c, 0xbc, 0x0f, 0x66, 0xf7, 0x22, 0x9f, 0x21, 0xec, 0xb3, - 0x4b, 0xcd, 0x01, 0x9e, 0x87, 0x7f, 0x20, 0x6b, 0x09, 0x23, 0x86, 0x86, 0xeb, 0x60, 0xc6, 0x8f, - 0xec, 0xca, 0xe2, 0x96, 0x30, 0xf2, 0x5e, 0xd1, 0x7d, 0xbb, 0x96, 0x30, 0x06, 0x30, 0xf0, 0x2e, - 0x98, 0x69, 0x44, 0xf6, 0x24, 0x75, 0x32, 0xbe, 0xaa, 0xe1, 0xbb, 0x16, 0xf5, 0x16, 0xc5, 0xca, - 0xde, 0x78, 0x46, 0xaa, 0x53, 0x27, 0x7b, 0x8b, 0xe6, 0xac, 0xec, 0x8d, 0xcf, 0xe8, 0xa0, 0xbf, - 0x7b, 0x94, 0xbe, 0xcf, 0x80, 0x29, 0x91, 0x15, 0xfc, 0x2e, 0xe4, 0xcd, 0x50, 0xe8, 0x3c, 0x29, - 0x2e, 0x9e, 0x24, 0x74, 0x66, 0x2e, 0xe9, 0xfc, 0x8d, 0x50, 0xe7, 0x3c, 0x43, 0x16, 0xfa, 0x3b, - 0x12, 0x7b, 0xae, 0x84, 0x10, 0xda, 0x5e, 0x0e, 0xb4, 0xcd, 0x13, 0xe3, 0xfc, 0xf0, 0xe3, 0x44, - 0x80, 0x12, 0xc2, 0x5e, 0x05, 0x39, 0x93, 0x5f, 0xaa, 0x0e, 0x4b, 0x89, 0xf8, 0x9d, 0x2b, 0x95, - 0xaa, 0x00, 0xc0, 0xe5, 0xbe, 0xc0, 0x79, 0x5e, 0x9c, 0x8b, 0x0b, 0x3c, 0x04, 0x05, 0xfa, 0xbe, - 0x12, 0xea, 0x3b, 0x2b, 0x30, 0xb1, 0xd2, 0x3b, 0x7c, 0x31, 0x21, 0xee, 0xdb, 0x60, 0x3a, 0x90, - 0x03, 0x9b, 0x12, 0xea, 0xbe, 0x78, 0x52, 0xe5, 0x10, 0xe0, 0xa3, 0x28, 0xb8, 0x11, 0xd3, 0x10, - 0x57, 0xb6, 0x76, 0xf2, 0xb7, 0x33, 0xf0, 0x34, 0x28, 0xa0, 0x8d, 0x98, 0x80, 0xc0, 0x49, 0xae, - 0x02, 0xf9, 0xc4, 0x5c, 0xf1, 0x09, 0x58, 0x03, 0x13, 0x6d, 0x4c, 0x50, 0x03, 0x11, 0xa4, 0xe6, - 0xd8, 0xce, 0x7f, 0x29, 0x9a, 0x69, 0x7d, 0x31, 0x95, 0xef, 0x09, 0xc3, 0xdb, 0x36, 0xf1, 0x0e, - 0xc4, 0x51, 0x33, 0x44, 0x2f, 0xbe, 0x0d, 0xa6, 0x23, 0x06, 0x70, 0x16, 0xa4, 0x76, 0x71, 0x70, - 0x39, 0x4e, 0x9b, 0x70, 0x1e, 0x64, 0xf6, 0x91, 0xd5, 0xc1, 0x4c, 0x53, 0x79, 0x83, 0x77, 0x56, - 0x93, 0xd7, 0x15, 0x3d, 0x0f, 0x72, 0x1e, 0x7f, 0x8a, 0xde, 0x7c, 0xfa, 0xbc, 0x90, 0x78, 0xf6, - 0xbc, 0x90, 0x78, 0xf9, 0xbc, 0xa0, 0x3c, 0x3e, 0x2a, 0x28, 0x9f, 0x1d, 0x15, 0x94, 0xc3, 0xa3, - 0x82, 0xf2, 0xf4, 0xa8, 0xa0, 0xfc, 0x72, 0x54, 0x50, 0x7e, 0x3d, 0x2a, 0x24, 0x5e, 0x1e, 0x15, - 0x94, 0x27, 0x2f, 0x0a, 0x89, 0xa7, 0x2f, 0x0a, 0x89, 0x67, 0x2f, 0x0a, 0x89, 0x0f, 0xae, 0x8c, - 0xfd, 0x11, 0xda, 0xce, 0x32, 0xa6, 0x96, 0x7f, 0x0f, 0x00, 0x00, 0xff, 0xff, 0xb7, 0x5a, 0x6d, - 0x97, 0x3f, 0x1b, 0x00, 0x00, + // 1720 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x58, 0x4d, 0x6f, 0xdb, 0x46, + 0x1a, 0x16, 0xf5, 0x69, 0x8d, 0x3f, 0xd6, 0x3b, 0x36, 0x1c, 0xae, 0x93, 0x88, 0x82, 0x80, 0x4d, + 0xbc, 0x8b, 0x5d, 0x69, 0x23, 0x27, 0xde, 0xc4, 0x1b, 0x04, 0x09, 0xd7, 0x09, 0x64, 0x6c, 0xb2, + 0x48, 0x68, 0xa3, 0x87, 0x5e, 0x8a, 0xb1, 0x34, 0x96, 0x58, 0x53, 0x24, 0x4d, 0x8e, 0x9c, 0x18, + 0xe8, 0x21, 0x7f, 0xa0, 0x68, 0x80, 0xfe, 0x87, 0xa2, 0xa7, 0x16, 0x2d, 0x7a, 0xea, 0xa9, 0xbd, + 0x19, 0x05, 0x0a, 0xe4, 0x18, 0x08, 0xa8, 0xda, 0x38, 0x97, 0xc2, 0xa7, 0x00, 0xfd, 0x03, 0xc5, + 0x7c, 0x90, 0x1a, 0x8a, 0x52, 0x2d, 0xa5, 0xe8, 0xc1, 0x45, 0x2f, 0xd2, 0x7c, 0xbc, 0xcf, 0xcb, + 0xe1, 0xf3, 0x3e, 0xef, 0xf0, 0x9d, 0x01, 0x97, 0xdd, 0xbd, 0x66, 0x65, 0xbf, 0x83, 0x3d, 0x13, + 0x7b, 0xec, 0xff, 0xd0, 0x43, 0x76, 0x13, 0x4b, 0xcd, 0xb2, 0xeb, 0x39, 0xc4, 0x81, 0xa0, 0x3f, + 0xb2, 0x5c, 0x6d, 0x9a, 0xa4, 0xd5, 0xd9, 0x29, 0xd7, 0x9d, 0x76, 0xa5, 0xe9, 0x34, 0x9d, 0x4a, + 0xd3, 0x71, 0x9a, 0x16, 0x46, 0xae, 0xe9, 0x8b, 0x66, 0xc5, 0x73, 0xeb, 0x15, 0x9f, 0x20, 0xd2, + 0xf1, 0x39, 0x7e, 0x79, 0x91, 0x1a, 0xb2, 0x26, 0x83, 0x88, 0x51, 0x4d, 0x98, 0xb3, 0xde, 0x4e, + 0x67, 0xb7, 0x42, 0xcc, 0x36, 0xf6, 0x09, 0x6a, 0xbb, 0x81, 0x01, 0x5d, 0x9f, 0xe5, 0x34, 0x39, + 0xd2, 0xb4, 0x1b, 0xf8, 0x49, 0x13, 0x11, 0xfc, 0x18, 0x1d, 0x0a, 0x83, 0xf3, 0x11, 0x83, 0xa0, + 0x21, 0x26, 0xff, 0x12, 0x99, 0xf4, 0xf7, 0x30, 0xa9, 0xb7, 0xc4, 0x54, 0x51, 0x4c, 0xed, 0x5b, + 0x6d, 0xa7, 0x81, 0x2d, 0xb6, 0x58, 0x9f, 0xff, 0x0a, 0x8b, 0x05, 0x6a, 0xe1, 0x76, 0xfc, 0x16, + 0xfb, 0x11, 0x83, 0xff, 0x3d, 0x95, 0xaf, 0x1d, 0xe4, 0xe3, 0x4a, 0x03, 0xef, 0x9a, 0xb6, 0x49, + 0x4c, 0xc7, 0xf6, 0xe5, 0xb6, 0x70, 0xb2, 0x36, 0x9e, 0x93, 0xc1, 0x18, 0x94, 0x3e, 0x4b, 0x81, + 0xe9, 0xfb, 0xce, 0x9e, 0x69, 0xe0, 0xfd, 0x0e, 0xf6, 0x09, 0x5c, 0x04, 0x19, 0x66, 0xa3, 0x2a, + 0x45, 0x65, 0x25, 0x6f, 0xf0, 0x0e, 0x1d, 0xb5, 0xcc, 0xb6, 0x49, 0xd4, 0x64, 0x51, 0x59, 0x99, + 0x35, 0x78, 0x07, 0x42, 0x90, 0xf6, 0x09, 0x76, 0xd5, 0x54, 0x51, 0x59, 0x49, 0x19, 0xac, 0x0d, + 0x97, 0xc1, 0x94, 0x69, 0x13, 0xec, 0x1d, 0x20, 0x4b, 0xcd, 0xb3, 0xf1, 0xb0, 0x0f, 0x6f, 0x81, + 0x9c, 0x4f, 0x90, 0x47, 0xb6, 0x7d, 0x35, 0x5d, 0x54, 0x56, 0xa6, 0xab, 0xcb, 0x65, 0x1e, 0xab, + 0x72, 0x10, 0xab, 0xf2, 0x76, 0x10, 0x2b, 0x7d, 0xea, 0xa8, 0xa7, 0x25, 0x9e, 0x7d, 0xaf, 0x29, + 0x46, 0x00, 0x82, 0xeb, 0x20, 0x83, 0xed, 0xc6, 0xb6, 0xaf, 0x66, 0x26, 0x40, 0x73, 0x08, 0xbc, + 0x02, 0xf2, 0x0d, 0xd3, 0xc3, 0x75, 0xca, 0x99, 0x9a, 0x2d, 0x2a, 0x2b, 0x73, 0xd5, 0x85, 0x72, + 0x18, 0xda, 0x8d, 0x60, 0xca, 0xe8, 0x5b, 0xd1, 0xd7, 0x73, 0x11, 0x69, 0xa9, 0x39, 0xc6, 0x04, + 0x6b, 0xc3, 0x12, 0xc8, 0xfa, 0x2d, 0xe4, 0x35, 0x7c, 0x75, 0xaa, 0x98, 0x5a, 0xc9, 0xeb, 0xe0, + 0xa4, 0xa7, 0x89, 0x11, 0x43, 0xfc, 0xc3, 0x77, 0x40, 0xda, 0xb5, 0x90, 0xad, 0x02, 0xb6, 0xca, + 0xf9, 0xb2, 0xc4, 0xf9, 0x43, 0x0b, 0xd9, 0xfa, 0x8d, 0x6e, 0x4f, 0xbb, 0x26, 0xcb, 0xdd, 0x43, + 0xbb, 0xc8, 0x46, 0x15, 0xcb, 0xd9, 0x33, 0x2b, 0x07, 0xab, 0x15, 0x39, 0x92, 0xd4, 0x51, 0xf9, + 0x11, 0x75, 0x40, 0xa1, 0x06, 0x73, 0x5c, 0xfa, 0x26, 0x09, 0x20, 0x8d, 0xd9, 0xa6, 0xed, 0x13, + 0x64, 0x93, 0x37, 0x09, 0xdd, 0x4d, 0x90, 0xa5, 0x69, 0xb1, 0xed, 0xb3, 0xe0, 0x8d, 0xcb, 0xa5, + 0xc0, 0x44, 0xc9, 0x4c, 0x4f, 0x44, 0x66, 0x66, 0x28, 0x99, 0xd9, 0x53, 0xc9, 0xcc, 0xfd, 0x56, + 0x64, 0xaa, 0x20, 0x4d, 0x7b, 0x70, 0x1e, 0xa4, 0x3c, 0xf4, 0x98, 0x71, 0x37, 0x63, 0xd0, 0x66, + 0xe9, 0x93, 0x34, 0x98, 0xe1, 0xa9, 0xe1, 0xbb, 0x8e, 0xed, 0x63, 0xba, 0xde, 0x2d, 0xb6, 0xff, + 0x70, 0x86, 0xc5, 0x7a, 0xd9, 0x88, 0x21, 0x66, 0xe0, 0x6d, 0x90, 0xde, 0x40, 0x04, 0x31, 0xb6, + 0xa7, 0xab, 0x8b, 0xf2, 0x7a, 0xa9, 0x2f, 0x3a, 0xa7, 0x2f, 0x51, 0x42, 0x4f, 0x7a, 0xda, 0x5c, + 0x03, 0x11, 0xf4, 0x0f, 0xa7, 0x6d, 0x12, 0xdc, 0x76, 0xc9, 0xa1, 0xc1, 0x90, 0xf0, 0x1a, 0xc8, + 0xdf, 0xf5, 0x3c, 0xc7, 0xdb, 0x3e, 0x74, 0x31, 0x8b, 0x4e, 0x5e, 0x3f, 0x77, 0xd2, 0xd3, 0x16, + 0x70, 0x30, 0x28, 0x21, 0xfa, 0x96, 0xf0, 0x6f, 0x20, 0xc3, 0x3a, 0x2c, 0x1e, 0x79, 0x7d, 0xe1, + 0xa4, 0xa7, 0xfd, 0x89, 0x41, 0x24, 0x73, 0x6e, 0x11, 0x0d, 0x5f, 0x66, 0xac, 0xf0, 0x85, 0x2a, + 0xca, 0xca, 0x2a, 0x52, 0x41, 0xee, 0x00, 0x7b, 0x3e, 0x75, 0x93, 0x63, 0xe3, 0x41, 0x17, 0xde, + 0x01, 0x80, 0x12, 0x63, 0xfa, 0xc4, 0xac, 0xd3, 0x5c, 0xa1, 0x64, 0xcc, 0x96, 0xf9, 0x56, 0x68, + 0x60, 0xbf, 0x63, 0x11, 0x1d, 0x0a, 0x16, 0x24, 0x43, 0x43, 0x6a, 0xc3, 0x4f, 0x15, 0x90, 0xab, + 0x61, 0xd4, 0xc0, 0x9e, 0xaf, 0xe6, 0x8b, 0xa9, 0x95, 0xe9, 0xea, 0x5f, 0xcb, 0xf2, 0xbe, 0xf7, + 0xd0, 0x73, 0xda, 0x98, 0xb4, 0x70, 0xc7, 0x0f, 0x02, 0xc4, 0xad, 0x75, 0xbb, 0xdb, 0xd3, 0xf0, + 0x98, 0x92, 0x18, 0x6b, 0xbb, 0x1d, 0xf9, 0xa8, 0x93, 0x9e, 0xa6, 0xfc, 0xd3, 0x08, 0x56, 0x59, + 0xfa, 0x4e, 0x01, 0x7f, 0xa6, 0x41, 0xde, 0xa2, 0xbe, 0x7d, 0x29, 0x2d, 0xdb, 0x88, 0xd4, 0x5b, + 0xaa, 0x42, 0x45, 0x6e, 0xf0, 0x8e, 0xbc, 0x17, 0x26, 0x7f, 0xd5, 0x5e, 0x98, 0x9a, 0x7c, 0x2f, + 0x0c, 0x72, 0x31, 0x3d, 0x34, 0x17, 0x33, 0xa3, 0x72, 0xb1, 0xf4, 0x41, 0x8a, 0xef, 0x3b, 0xc1, + 0xfb, 0x4d, 0x90, 0x16, 0xf7, 0xc2, 0xb4, 0x48, 0xb1, 0xd5, 0x86, 0x6a, 0xe3, 0xbe, 0x36, 0x1b, + 0xd8, 0x26, 0xe6, 0xae, 0x89, 0xbd, 0x53, 0x92, 0x43, 0x52, 0x5c, 0x2a, 0xaa, 0x38, 0x59, 0x2e, + 0xe9, 0xb3, 0x20, 0x97, 0x81, 0x1c, 0xc9, 0xbc, 0x41, 0x8e, 0x94, 0x7e, 0x4a, 0x82, 0x25, 0x1a, + 0x91, 0xfb, 0x68, 0x07, 0x5b, 0xff, 0x47, 0xed, 0x09, 0xa3, 0x72, 0x49, 0x8a, 0x4a, 0x5e, 0x87, + 0x7f, 0xb0, 0x3e, 0x1e, 0xeb, 0x1f, 0x29, 0x60, 0x2a, 0xd8, 0xcc, 0x61, 0x19, 0x00, 0x0e, 0x63, + 0xfb, 0x35, 0xe7, 0x7a, 0x8e, 0x82, 0xbd, 0x70, 0xd4, 0x90, 0x2c, 0xe0, 0xbb, 0x20, 0xcb, 0x7b, + 0x22, 0x17, 0xce, 0x49, 0xb9, 0x40, 0x3c, 0x8c, 0xda, 0x77, 0x1a, 0xc8, 0x25, 0xd8, 0xd3, 0x6f, + 0xd0, 0x55, 0x74, 0x7b, 0xda, 0xe5, 0x51, 0x2c, 0x05, 0xb5, 0xa4, 0xc0, 0xd1, 0xf8, 0xf2, 0x67, + 0x1a, 0xe2, 0x09, 0xa5, 0xf7, 0x15, 0x30, 0x4f, 0x17, 0x4a, 0xa9, 0x09, 0x85, 0xb1, 0x01, 0xa6, + 0x3c, 0xd1, 0x66, 0xcb, 0x9d, 0xae, 0x96, 0xca, 0x51, 0x5a, 0x87, 0x50, 0xa9, 0xa7, 0x8f, 0x7a, + 0x9a, 0x62, 0x84, 0x48, 0xb8, 0x1a, 0xa1, 0x31, 0x39, 0x8c, 0x46, 0x0a, 0x49, 0x44, 0x88, 0xfb, + 0x2a, 0x09, 0xe0, 0x26, 0xad, 0xb7, 0xa9, 0xfe, 0xfa, 0x52, 0x7d, 0x12, 0x5b, 0xd1, 0x85, 0x3e, + 0x29, 0x71, 0x7b, 0xfd, 0x56, 0xb7, 0xa7, 0xad, 0x9f, 0xa2, 0x9d, 0x5f, 0xc0, 0x4b, 0x6f, 0x21, + 0xcb, 0x37, 0x79, 0x26, 0xbe, 0x31, 0x5f, 0x24, 0xc1, 0xdc, 0x5b, 0x8e, 0xd5, 0x69, 0xe3, 0x90, + 0x3e, 0x37, 0x46, 0x9f, 0xda, 0xa7, 0x2f, 0x6a, 0xab, 0xaf, 0x77, 0x7b, 0xda, 0xda, 0xb8, 0xd4, + 0x45, 0xb1, 0x67, 0x9a, 0xb6, 0xcf, 0x93, 0x60, 0x71, 0xdb, 0x71, 0xff, 0xb7, 0xc5, 0xce, 0x6b, + 0xd2, 0x36, 0xd9, 0x8a, 0x91, 0xb7, 0xd8, 0x27, 0x8f, 0x22, 0x1e, 0x20, 0xe2, 0x99, 0x4f, 0xf4, + 0xb5, 0x6e, 0x4f, 0xab, 0x8e, 0x4b, 0x5c, 0x1f, 0x77, 0xa6, 0x49, 0x3b, 0x4a, 0x82, 0xa5, 0x47, + 0x1d, 0x64, 0x13, 0xd3, 0xc2, 0x9c, 0xb8, 0x90, 0xb6, 0xf7, 0x62, 0xb4, 0x15, 0xfa, 0xb4, 0x45, + 0x31, 0x82, 0xc0, 0xdb, 0xdd, 0x9e, 0x76, 0x73, 0x5c, 0x02, 0x87, 0x79, 0x38, 0xd3, 0x54, 0x7e, + 0x99, 0x04, 0x73, 0x5b, 0xbc, 0x9a, 0x0a, 0x5e, 0xe2, 0x60, 0x08, 0x85, 0xf2, 0x65, 0x84, 0xbb, + 0x53, 0x8e, 0x22, 0x26, 0x4b, 0xde, 0x28, 0xf6, 0x4c, 0x93, 0xf7, 0x6d, 0x12, 0x2c, 0x6d, 0x60, + 0x82, 0xeb, 0x04, 0x37, 0xee, 0x99, 0xd8, 0x92, 0x48, 0x7c, 0xaa, 0xc4, 0x58, 0x2c, 0x4a, 0x47, + 0x99, 0xa1, 0x20, 0x5d, 0xef, 0xf6, 0xb4, 0x5b, 0xe3, 0xf2, 0x38, 0xdc, 0xc7, 0xef, 0x86, 0x4f, + 0x56, 0x39, 0x4e, 0xca, 0x67, 0x14, 0xf4, 0x66, 0x7c, 0x46, 0x7d, 0x9c, 0x69, 0x3e, 0x3f, 0xcc, + 0x82, 0x59, 0x76, 0xad, 0x10, 0xd2, 0xf8, 0x77, 0x20, 0x4a, 0x6d, 0xc1, 0x21, 0x0c, 0x8e, 0x67, + 0x9e, 0x5b, 0x2f, 0x6f, 0x89, 0x22, 0x9c, 0x5b, 0xc0, 0xeb, 0x20, 0xeb, 0xb3, 0x43, 0x90, 0xa8, + 0xa2, 0x0a, 0x83, 0x77, 0x06, 0xd1, 0xe3, 0x56, 0x2d, 0x61, 0x08, 0x7b, 0x78, 0x13, 0x64, 0x2d, + 0xc6, 0xa2, 0x38, 0x04, 0x96, 0x06, 0x91, 0xf1, 0x63, 0x01, 0x45, 0x73, 0x0c, 0x5c, 0x03, 0x19, + 0x56, 0xae, 0x89, 0xbb, 0xb8, 0xc8, 0x63, 0xe3, 0x45, 0x53, 0x2d, 0x61, 0x70, 0x73, 0x58, 0x05, + 0x69, 0xd7, 0x73, 0xda, 0xa2, 0x74, 0xbe, 0x30, 0xf8, 0x4c, 0xb9, 0xd6, 0xac, 0x25, 0x0c, 0x66, + 0x0b, 0xaf, 0xd2, 0xd3, 0x2e, 0x2d, 0x52, 0x7d, 0x76, 0x81, 0x40, 0x2b, 0x94, 0x01, 0x98, 0x04, + 0x09, 0x4c, 0xe1, 0x55, 0x90, 0x3d, 0x60, 0x25, 0x88, 0xb8, 0xfd, 0x59, 0x96, 0x41, 0xd1, 0xe2, + 0x84, 0xbe, 0x17, 0xb7, 0x85, 0xf7, 0xc0, 0x0c, 0x71, 0xdc, 0xbd, 0xe0, 0x4b, 0x2f, 0x2e, 0x1f, + 0x8a, 0x32, 0x76, 0x58, 0x25, 0x50, 0x4b, 0x18, 0x11, 0x1c, 0x7c, 0x08, 0xe6, 0xf7, 0x23, 0x9f, + 0x21, 0xec, 0xb3, 0x1b, 0xcd, 0x01, 0x9e, 0x87, 0x7f, 0x20, 0x6b, 0x09, 0x23, 0x86, 0x86, 0x1b, + 0x60, 0xce, 0x8f, 0xec, 0xca, 0xe2, 0x8a, 0x30, 0xf2, 0x5e, 0xd1, 0x7d, 0xbb, 0x96, 0x30, 0x06, + 0x30, 0xf0, 0x3e, 0x98, 0x6b, 0x44, 0xf6, 0x24, 0x75, 0x3a, 0xbe, 0xaa, 0xe1, 0xbb, 0x16, 0xf5, + 0x16, 0xc5, 0xca, 0xde, 0x78, 0x46, 0xaa, 0x33, 0xa3, 0xbd, 0x45, 0x73, 0x56, 0xf6, 0xc6, 0x67, + 0x74, 0xd0, 0xdf, 0x3d, 0x4a, 0x5f, 0x67, 0xc0, 0x8c, 0xc8, 0x0a, 0x7e, 0x11, 0xf2, 0xef, 0x50, + 0xe8, 0x3c, 0x29, 0x2e, 0x8e, 0x12, 0x3a, 0x33, 0x97, 0x74, 0xfe, 0xaf, 0x50, 0xe7, 0x3c, 0x43, + 0x96, 0xfa, 0x3b, 0x12, 0x7b, 0xae, 0x84, 0x10, 0xda, 0x5e, 0x0d, 0xb4, 0xcd, 0x13, 0xe3, 0xfc, + 0xf0, 0xe3, 0x44, 0x80, 0x12, 0xc2, 0x5e, 0x07, 0x39, 0x93, 0xdf, 0xa8, 0x0e, 0x4b, 0x89, 0xf8, + 0x85, 0x2b, 0x95, 0xaa, 0x00, 0xc0, 0xd5, 0xbe, 0xc0, 0x79, 0x5e, 0x9c, 0x8b, 0x0b, 0x3c, 0x04, + 0x05, 0xfa, 0xbe, 0x12, 0xea, 0x3b, 0x2b, 0x30, 0xb1, 0xd2, 0x3b, 0x7c, 0x31, 0x21, 0xee, 0xbb, + 0x60, 0x36, 0x90, 0x03, 0x9b, 0x12, 0xea, 0xbe, 0x38, 0xaa, 0x72, 0x08, 0xf0, 0x51, 0x14, 0xdc, + 0x8c, 0x69, 0x88, 0x2b, 0x5b, 0x1b, 0xfd, 0xed, 0x0c, 0x3c, 0x0d, 0x0a, 0x68, 0x33, 0x26, 0x20, + 0x30, 0xca, 0x55, 0x20, 0x9f, 0x98, 0x2b, 0x3e, 0x01, 0x6b, 0x60, 0xaa, 0x8d, 0x09, 0x6a, 0x20, + 0x82, 0xd4, 0x1c, 0xdb, 0xf9, 0x2f, 0x45, 0x33, 0xad, 0x2f, 0xa6, 0xf2, 0x03, 0x61, 0x78, 0xd7, + 0x26, 0xde, 0xa1, 0x38, 0x6a, 0x86, 0xe8, 0xe5, 0xff, 0x80, 0xd9, 0x88, 0x01, 0x9c, 0x07, 0xa9, + 0x3d, 0x1c, 0xdc, 0x8c, 0xd3, 0x26, 0x5c, 0x04, 0x99, 0x03, 0x64, 0x75, 0x30, 0xd3, 0x54, 0xde, + 0xe0, 0x9d, 0xf5, 0xe4, 0x75, 0x45, 0xcf, 0x83, 0x9c, 0xc7, 0x9f, 0xa2, 0x37, 0x9f, 0xbf, 0x2c, + 0x24, 0x5e, 0xbc, 0x2c, 0x24, 0x5e, 0xbf, 0x2c, 0x28, 0x4f, 0x8f, 0x0b, 0xca, 0xc7, 0xc7, 0x05, + 0xe5, 0xe8, 0xb8, 0xa0, 0x3c, 0x3f, 0x2e, 0x28, 0x3f, 0x1c, 0x17, 0x94, 0x1f, 0x8f, 0x0b, 0x89, + 0xd7, 0xc7, 0x05, 0xe5, 0xd9, 0xab, 0x42, 0xe2, 0xf9, 0xab, 0x42, 0xe2, 0xc5, 0xab, 0x42, 0xe2, + 0xed, 0x2b, 0x13, 0x7f, 0x84, 0x76, 0xb2, 0x8c, 0xa9, 0xd5, 0x9f, 0x03, 0x00, 0x00, 0xff, 0xff, + 0x84, 0x24, 0xe9, 0xad, 0x3c, 0x1b, 0x00, 0x00, } func (this *LokiRequest) Equal(that interface{}) bool { @@ -7326,7 +7326,7 @@ func (m *LokiData) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Result = append(m.Result, github_com_grafana_loki_v3_pkg_push.Stream{}) + m.Result = append(m.Result, github_com_grafana_loki_pkg_push.Stream{}) if err := m.Result[len(m.Result)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/pkg/querier/queryrange/queryrange.proto b/pkg/querier/queryrange/queryrange.proto index c0c746a3fc945..01f48298521c1 100644 --- a/pkg/querier/queryrange/queryrange.proto +++ b/pkg/querier/queryrange/queryrange.proto @@ -125,7 +125,7 @@ message LokiData { repeated logproto.StreamAdapter Result = 2 [ (gogoproto.nullable) = false, (gogoproto.jsontag) = "result", - (gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/push.Stream" + (gogoproto.customtype) = "github.com/grafana/loki/pkg/push.Stream" ]; } diff --git a/pkg/querier/queryrange/volume_test.go b/pkg/querier/queryrange/volume_test.go index 62956dd17eab0..7327a58e15d9e 100644 --- a/pkg/querier/queryrange/volume_test.go +++ b/pkg/querier/queryrange/volume_test.go @@ -9,9 +9,10 @@ import ( "github.com/grafana/dskit/user" + "github.com/grafana/loki/pkg/push" + "github.com/grafana/loki/v3/pkg/loghttp" "github.com/grafana/loki/v3/pkg/logproto" - "github.com/grafana/loki/v3/pkg/push" "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" "github.com/grafana/loki/v3/pkg/storage/stores/index/seriesvolume" ) diff --git a/pkg/storage/bloom/v1/bloom_tokenizer_test.go b/pkg/storage/bloom/v1/bloom_tokenizer_test.go index 3f721974c2309..048c972d44c68 100644 --- a/pkg/storage/bloom/v1/bloom_tokenizer_test.go +++ b/pkg/storage/bloom/v1/bloom_tokenizer_test.go @@ -9,10 +9,11 @@ import ( "github.com/prometheus/prometheus/model/labels" + "github.com/grafana/loki/pkg/push" + "github.com/grafana/loki/v3/pkg/chunkenc" "github.com/grafana/loki/v3/pkg/logproto" "github.com/grafana/loki/v3/pkg/logql/log" - "github.com/grafana/loki/v3/pkg/push" "github.com/prometheus/common/model" "github.com/stretchr/testify/require" diff --git a/pkg/storage/store_test.go b/pkg/storage/store_test.go index c59df5aba7bc1..3be136d411dea 100644 --- a/pkg/storage/store_test.go +++ b/pkg/storage/store_test.go @@ -23,6 +23,8 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" + "github.com/grafana/loki/pkg/push" + "github.com/grafana/loki/v3/pkg/chunkenc" "github.com/grafana/loki/v3/pkg/ingester/client" "github.com/grafana/loki/v3/pkg/iter" @@ -31,7 +33,6 @@ import ( lokilog "github.com/grafana/loki/v3/pkg/logql/log" "github.com/grafana/loki/v3/pkg/logql/syntax" "github.com/grafana/loki/v3/pkg/logqlmodel/stats" - "github.com/grafana/loki/v3/pkg/push" "github.com/grafana/loki/v3/pkg/querier/astmapper" "github.com/grafana/loki/v3/pkg/querier/plan" "github.com/grafana/loki/v3/pkg/storage/chunk" diff --git a/vendor/github.com/grafana/loki/v3/pkg/push/LICENSE b/vendor/github.com/grafana/loki/pkg/push/LICENSE similarity index 100% rename from vendor/github.com/grafana/loki/v3/pkg/push/LICENSE rename to vendor/github.com/grafana/loki/pkg/push/LICENSE diff --git a/vendor/github.com/grafana/loki/v3/pkg/push/push.pb.go b/vendor/github.com/grafana/loki/pkg/push/push.pb.go similarity index 92% rename from vendor/github.com/grafana/loki/v3/pkg/push/push.pb.go rename to vendor/github.com/grafana/loki/pkg/push/push.pb.go index 7979872929611..3b07d850ff162 100644 --- a/vendor/github.com/grafana/loki/v3/pkg/push/push.pb.go +++ b/vendor/github.com/grafana/loki/pkg/push/push.pb.go @@ -296,41 +296,40 @@ func init() { func init() { proto.RegisterFile("pkg/push/push.proto", fileDescriptor_35ec442956852c9e) } var fileDescriptor_35ec442956852c9e = []byte{ - // 532 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x53, 0xc1, 0x6e, 0xd3, 0x4c, - 0x10, 0xf6, 0x26, 0x6e, 0xda, 0x6e, 0xfa, 0xf7, 0xaf, 0x96, 0xb6, 0x18, 0xab, 0x5a, 0x57, 0x86, - 0x43, 0x0e, 0x60, 0x4b, 0xe9, 0x81, 0x0b, 0x97, 0x58, 0x42, 0xea, 0xa1, 0x48, 0x95, 0x41, 0x42, - 0x70, 0xdb, 0x34, 0x5b, 0xdb, 0xaa, 0xed, 0x35, 0xbb, 0xeb, 0x4a, 0xbd, 0xf1, 0x08, 0xe5, 0x2d, - 0x78, 0x02, 0x9e, 0xa1, 0xc7, 0x1c, 0x2b, 0x0e, 0x86, 0x38, 0x17, 0x94, 0x53, 0x1f, 0x01, 0x79, - 0x6d, 0x93, 0x50, 0x90, 0xb8, 0x6c, 0xbe, 0x99, 0x9d, 0xf9, 0xbe, 0x2f, 0xb3, 0x63, 0xf8, 0x20, - 0xbb, 0x08, 0xdc, 0x2c, 0x17, 0xa1, 0x3a, 0x9c, 0x8c, 0x33, 0xc9, 0xd0, 0x46, 0xcc, 0x02, 0x85, - 0xcc, 0xdd, 0x80, 0x05, 0x4c, 0x41, 0xb7, 0x42, 0xf5, 0xbd, 0x69, 0x05, 0x8c, 0x05, 0x31, 0x75, - 0x55, 0x34, 0xce, 0xcf, 0x5d, 0x19, 0x25, 0x54, 0x48, 0x92, 0x64, 0x75, 0x81, 0xfd, 0x16, 0xf6, - 0x4f, 0x73, 0x11, 0xfa, 0xf4, 0x43, 0x4e, 0x85, 0x44, 0xc7, 0x70, 0x5d, 0x48, 0x4e, 0x49, 0x22, - 0x0c, 0x70, 0xd8, 0x1d, 0xf4, 0x87, 0x0f, 0x9d, 0x56, 0xc1, 0x79, 0xad, 0x2e, 0x46, 0x13, 0x92, - 0x49, 0xca, 0xbd, 0xbd, 0xaf, 0x85, 0xd5, 0xab, 0x53, 0x8b, 0xc2, 0x6a, 0xbb, 0xfc, 0x16, 0xd8, - 0xdb, 0x70, 0xab, 0x26, 0x16, 0x19, 0x4b, 0x05, 0xb5, 0x3f, 0x01, 0xf8, 0xdf, 0x6f, 0x0c, 0xc8, - 0x86, 0xbd, 0x98, 0x8c, 0x69, 0x5c, 0x49, 0x81, 0xc1, 0xa6, 0x07, 0x17, 0x85, 0xd5, 0x64, 0xfc, - 0xe6, 0x17, 0x8d, 0xe0, 0x3a, 0x4d, 0x25, 0x8f, 0xa8, 0x30, 0x3a, 0xca, 0xcf, 0xfe, 0xd2, 0xcf, - 0xcb, 0x54, 0xf2, 0xab, 0xd6, 0xce, 0xff, 0x37, 0x85, 0xa5, 0x55, 0x46, 0x9a, 0x72, 0xbf, 0x05, - 0xe8, 0x11, 0xd4, 0x43, 0x22, 0x42, 0xa3, 0x7b, 0x08, 0x06, 0xba, 0xb7, 0xb6, 0x28, 0x2c, 0xf0, - 0xcc, 0x57, 0x29, 0xfb, 0x05, 0xdc, 0x39, 0xa9, 0x74, 0x4e, 0x49, 0xc4, 0x5b, 0x57, 0x08, 0xea, - 0x29, 0x49, 0x68, 0xed, 0xc9, 0x57, 0x18, 0xed, 0xc2, 0xb5, 0x4b, 0x12, 0xe7, 0xd4, 0xe8, 0xa8, - 0x64, 0x1d, 0xd8, 0x5f, 0x3a, 0x70, 0x6b, 0xd5, 0x03, 0x3a, 0x86, 0x9b, 0xbf, 0xc6, 0xab, 0xfa, - 0xfb, 0x43, 0xd3, 0xa9, 0x1f, 0xc0, 0x69, 0x1f, 0xc0, 0x79, 0xd3, 0x56, 0x78, 0xdb, 0x8d, 0xe5, - 0x8e, 0x14, 0xd7, 0xdf, 0x2c, 0xe0, 0x2f, 0x9b, 0xd1, 0x01, 0xd4, 0xe3, 0x28, 0x6d, 0xf4, 0xbc, - 0x8d, 0x45, 0x61, 0xa9, 0xd8, 0x57, 0x27, 0xca, 0x20, 0x12, 0x92, 0xe7, 0x67, 0x32, 0xe7, 0x74, - 0xf2, 0x8a, 0x4a, 0x32, 0x21, 0x92, 0x18, 0x5d, 0x35, 0x1f, 0x73, 0x39, 0x9f, 0xfb, 0x7f, 0xcd, - 0x7b, 0xd2, 0x08, 0x1e, 0xfc, 0xd9, 0xfd, 0x94, 0x25, 0x91, 0xa4, 0x49, 0x26, 0xaf, 0xfc, 0xbf, - 0x70, 0xa3, 0x13, 0xd8, 0xcb, 0x08, 0x17, 0x74, 0x62, 0xe8, 0xff, 0x54, 0x31, 0x1a, 0x95, 0x9d, - 0xba, 0x63, 0x85, 0xb9, 0xe1, 0x18, 0x8e, 0x60, 0xaf, 0x5a, 0x0d, 0xca, 0xd1, 0x73, 0xa8, 0x57, - 0x08, 0xed, 0x2d, 0xf9, 0x56, 0xb6, 0xd1, 0xdc, 0xbf, 0x9f, 0x6e, 0x76, 0x49, 0xf3, 0xde, 0x4d, - 0x67, 0x58, 0xbb, 0x9d, 0x61, 0xed, 0x6e, 0x86, 0xc1, 0xc7, 0x12, 0x83, 0xcf, 0x25, 0x06, 0x37, - 0x25, 0x06, 0xd3, 0x12, 0x83, 0xef, 0x25, 0x06, 0x3f, 0x4a, 0xac, 0xdd, 0x95, 0x18, 0x5c, 0xcf, - 0xb1, 0x36, 0x9d, 0x63, 0xed, 0x76, 0x8e, 0xb5, 0xf7, 0x8f, 0x83, 0x48, 0x86, 0xf9, 0xd8, 0x39, - 0x63, 0x89, 0x1b, 0x70, 0x72, 0x4e, 0x52, 0xe2, 0xc6, 0xec, 0x22, 0x72, 0x2f, 0x8f, 0xdc, 0xf6, - 0xeb, 0x1a, 0xf7, 0x94, 0xe0, 0xd1, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x51, 0xe6, 0x29, 0x58, - 0x70, 0x03, 0x00, 0x00, + // 527 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x53, 0xc1, 0x6e, 0xd3, 0x40, + 0x10, 0xf5, 0x26, 0x6e, 0xda, 0x6e, 0x4a, 0xa9, 0x96, 0xb6, 0x18, 0xab, 0x5a, 0x47, 0x16, 0x87, + 0x1c, 0xc0, 0x96, 0xc2, 0x81, 0x0b, 0x97, 0x58, 0x42, 0xea, 0xa1, 0x48, 0x95, 0x41, 0x20, 0x71, + 0xdb, 0x34, 0x5b, 0xdb, 0xaa, 0xed, 0x35, 0xbb, 0x6b, 0xa4, 0xde, 0xf8, 0x84, 0xf2, 0x17, 0x7c, + 0x01, 0xdf, 0xd0, 0x63, 0x8e, 0x15, 0x07, 0x43, 0x9c, 0x0b, 0xca, 0xa9, 0x9f, 0x80, 0xbc, 0xb6, + 0x49, 0x28, 0x48, 0x5c, 0x36, 0x6f, 0x66, 0x67, 0xde, 0x7b, 0x99, 0x1d, 0xc3, 0x07, 0xd9, 0x45, + 0xe0, 0x66, 0xb9, 0x08, 0xd5, 0xe1, 0x64, 0x9c, 0x49, 0x86, 0xb6, 0x62, 0x16, 0x28, 0x64, 0xee, + 0x07, 0x2c, 0x60, 0x0a, 0xba, 0x15, 0xaa, 0xef, 0x4d, 0x2b, 0x60, 0x2c, 0x88, 0xa9, 0xab, 0xa2, + 0x49, 0x7e, 0xee, 0xca, 0x28, 0xa1, 0x42, 0x92, 0x24, 0xab, 0x0b, 0xec, 0x77, 0xb0, 0x7f, 0x9a, + 0x8b, 0xd0, 0xa7, 0x1f, 0x72, 0x2a, 0x24, 0x3a, 0x86, 0x9b, 0x42, 0x72, 0x4a, 0x12, 0x61, 0x80, + 0x41, 0x77, 0xd8, 0x1f, 0x3d, 0x74, 0x5a, 0x05, 0xe7, 0xb5, 0xba, 0x18, 0x4f, 0x49, 0x26, 0x29, + 0xf7, 0x0e, 0xbe, 0x15, 0x56, 0xaf, 0x4e, 0x2d, 0x0b, 0xab, 0xed, 0xf2, 0x5b, 0x60, 0xef, 0xc2, + 0x9d, 0x9a, 0x58, 0x64, 0x2c, 0x15, 0xd4, 0xfe, 0x0c, 0xe0, 0xbd, 0x3f, 0x18, 0x90, 0x0d, 0x7b, + 0x31, 0x99, 0xd0, 0xb8, 0x92, 0x02, 0xc3, 0x6d, 0x0f, 0x2e, 0x0b, 0xab, 0xc9, 0xf8, 0xcd, 0x2f, + 0x1a, 0xc3, 0x4d, 0x9a, 0x4a, 0x1e, 0x51, 0x61, 0x74, 0x94, 0x9f, 0xc3, 0x95, 0x9f, 0x97, 0xa9, + 0xe4, 0x97, 0xad, 0x9d, 0xfb, 0xd7, 0x85, 0xa5, 0x55, 0x46, 0x9a, 0x72, 0xbf, 0x05, 0xe8, 0x11, + 0xd4, 0x43, 0x22, 0x42, 0xa3, 0x3b, 0x00, 0x43, 0xdd, 0xdb, 0x58, 0x16, 0x16, 0x78, 0xea, 0xab, + 0x94, 0xfd, 0x02, 0xee, 0x9d, 0x54, 0x3a, 0xa7, 0x24, 0xe2, 0xad, 0x2b, 0x04, 0xf5, 0x94, 0x24, + 0xb4, 0xf6, 0xe4, 0x2b, 0x8c, 0xf6, 0xe1, 0xc6, 0x47, 0x12, 0xe7, 0xd4, 0xe8, 0xa8, 0x64, 0x1d, + 0xd8, 0x5f, 0x3b, 0x70, 0x67, 0xdd, 0x03, 0x3a, 0x86, 0xdb, 0xbf, 0xc7, 0xab, 0xfa, 0xfb, 0x23, + 0xd3, 0xa9, 0x1f, 0xc0, 0x69, 0x1f, 0xc0, 0x79, 0xd3, 0x56, 0x78, 0xbb, 0x8d, 0xe5, 0x8e, 0x14, + 0x57, 0xdf, 0x2d, 0xe0, 0xaf, 0x9a, 0xd1, 0x11, 0xd4, 0xe3, 0x28, 0x6d, 0xf4, 0xbc, 0xad, 0x65, + 0x61, 0xa9, 0xd8, 0x57, 0x27, 0xca, 0x20, 0x12, 0x92, 0xe7, 0x67, 0x32, 0xe7, 0x74, 0xfa, 0x8a, + 0x4a, 0x32, 0x25, 0x92, 0x18, 0x5d, 0x35, 0x1f, 0x73, 0x35, 0x9f, 0xbb, 0x7f, 0xcd, 0x7b, 0xdc, + 0x08, 0x1e, 0xfd, 0xdd, 0xfd, 0x84, 0x25, 0x91, 0xa4, 0x49, 0x26, 0x2f, 0xfd, 0x7f, 0x70, 0xa3, + 0x13, 0xd8, 0xcb, 0x08, 0x17, 0x74, 0x6a, 0xe8, 0xff, 0x55, 0x31, 0x1a, 0x95, 0xbd, 0xba, 0x63, + 0x8d, 0xb9, 0xe1, 0x18, 0x8d, 0x61, 0xaf, 0x5a, 0x0d, 0xca, 0xd1, 0x73, 0xa8, 0x57, 0x08, 0x1d, + 0xac, 0xf8, 0xd6, 0xb6, 0xd1, 0x3c, 0xbc, 0x9b, 0x6e, 0x76, 0x49, 0xf3, 0xde, 0xce, 0xe6, 0x58, + 0xbb, 0x99, 0x63, 0xed, 0x76, 0x8e, 0xc1, 0xa7, 0x12, 0x83, 0x2f, 0x25, 0x06, 0xd7, 0x25, 0x06, + 0xb3, 0x12, 0x83, 0x1f, 0x25, 0x06, 0x3f, 0x4b, 0xac, 0xdd, 0x96, 0x18, 0x5c, 0x2d, 0xb0, 0x36, + 0x5b, 0x60, 0xed, 0x66, 0x81, 0xb5, 0xf7, 0x83, 0x20, 0x92, 0x61, 0x3e, 0x71, 0xce, 0x58, 0xe2, + 0x06, 0x9c, 0x9c, 0x93, 0x94, 0xb8, 0x31, 0xbb, 0x88, 0xdc, 0xf6, 0xd3, 0x9a, 0xf4, 0x94, 0xda, + 0xb3, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x7e, 0xaa, 0x57, 0xd3, 0x6d, 0x03, 0x00, 0x00, } func (this *PushRequest) Equal(that interface{}) bool { diff --git a/vendor/github.com/grafana/loki/v3/pkg/push/push.proto b/vendor/github.com/grafana/loki/pkg/push/push.proto similarity index 95% rename from vendor/github.com/grafana/loki/v3/pkg/push/push.proto rename to vendor/github.com/grafana/loki/pkg/push/push.proto index e538c66903eae..3bf8ad06a8a83 100644 --- a/vendor/github.com/grafana/loki/v3/pkg/push/push.proto +++ b/vendor/github.com/grafana/loki/pkg/push/push.proto @@ -5,7 +5,7 @@ package logproto; import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/grafana/loki/v3/pkg/push"; +option go_package = "github.com/grafana/loki/pkg/push"; service Pusher { rpc Push(PushRequest) returns (PushResponse) {} diff --git a/vendor/github.com/grafana/loki/v3/pkg/push/timestamp.go b/vendor/github.com/grafana/loki/pkg/push/timestamp.go similarity index 100% rename from vendor/github.com/grafana/loki/v3/pkg/push/timestamp.go rename to vendor/github.com/grafana/loki/pkg/push/timestamp.go diff --git a/vendor/github.com/grafana/loki/v3/pkg/push/types.go b/vendor/github.com/grafana/loki/pkg/push/types.go similarity index 100% rename from vendor/github.com/grafana/loki/v3/pkg/push/types.go rename to vendor/github.com/grafana/loki/pkg/push/types.go diff --git a/vendor/modules.txt b/vendor/modules.txt index 10293601308e8..9bbf3e0af8662 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -935,9 +935,9 @@ github.com/grafana/gomemcache/memcache # github.com/grafana/jsonparser v0.0.0-20240209175146-098958973a2d ## explicit; go 1.13 github.com/grafana/jsonparser -# github.com/grafana/loki/v3/pkg/push v0.0.0-20231124142027-e52380921608 => ./pkg/push +# github.com/grafana/loki/pkg/push v0.0.0-20231124142027-e52380921608 => ./pkg/push ## explicit; go 1.19 -github.com/grafana/loki/v3/pkg/push +github.com/grafana/loki/pkg/push # github.com/grafana/pyroscope-go/godeltaprof v0.1.6 ## explicit; go 1.16 github.com/grafana/pyroscope-go/godeltaprof @@ -2266,4 +2266,4 @@ sigs.k8s.io/yaml # github.com/gocql/gocql => github.com/grafana/gocql v0.0.0-20200605141915-ba5dc39ece85 # github.com/hashicorp/memberlist => github.com/grafana/memberlist v0.3.1-0.20220714140823-09ffed8adbbe # github.com/grafana/regexp => github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd -# github.com/grafana/loki/v3/pkg/push => ./pkg/push +# github.com/grafana/loki/pkg/push => ./pkg/push