From c33e5559c10d251458a9a8daf6b89e01b6fc1dd7 Mon Sep 17 00:00:00 2001 From: "Oleg V. Kozlyuk" Date: Wed, 7 Jan 2026 15:12:36 +0100 Subject: [PATCH] chore: Use Buf to generate go definitions (#6130) --- .github/workflows/ci.yml | 5 - Makefile | 33 +- buf/buf.gen-config.yaml | 8 + buf/buf.gen.backend.yaml | 7 + buf/buf.gen.frontend.yaml | 7 + buf/buf.gen.otel.yaml | 8 + buf/buf.gen.tempopb.yaml | 8 + buf/buf.yaml | 7 + .../frontend/v1/frontendv1pb/frontend.pb.go | 85 ++- pkg/.gitignore | 1 + pkg/buf.yaml | 7 + pkg/tempopb/backendwork.pb.go | 104 ++-- pkg/tempopb/common/v1/common.pb.go | 1 + pkg/tempopb/tempo.pb.go | 508 +++++++++--------- pkg/tempopb/trace/v1/trace.pb.go | 2 +- tempodb/backend/v1.pb.go | 116 ++-- 16 files changed, 479 insertions(+), 428 deletions(-) create mode 100644 buf/buf.gen-config.yaml create mode 100644 buf/buf.gen.backend.yaml create mode 100644 buf/buf.gen.frontend.yaml create mode 100644 buf/buf.gen.otel.yaml create mode 100644 buf/buf.gen.tempopb.yaml create mode 100644 buf/buf.yaml create mode 100644 pkg/.gitignore create mode 100644 pkg/buf.yaml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b8ce899da..29acca4ef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -213,11 +213,6 @@ jobs: with: go-version: '1.25.5' - - name: Install protoc - uses: taiki-e/install-action@0e76c5c569f13f7eb21e8e5b26fe710062b57b62 # v2 - with: - tool: protoc - - name: Check vendor run: make vendor-check diff --git a/Makefile b/Makefile index 66cfdb801..d513dafc4 100644 --- a/Makefile +++ b/Makefile @@ -18,8 +18,10 @@ GOPATH := $(shell go env GOPATH) GORELEASER := $(GOPATH)/bin/goreleaser # Build Images -DOCKER_PROTOBUF_IMAGE ?= otel/build-protobuf:0.25.0 -LOKI_BUILD_IMAGE ?= grafana/loki-build-image:0.34.9 +LOKI_BUILD_IMAGE ?= grafana/loki-build-image:0.34.6 +# https://hub.docker.com/repository/docker/grafana/tempo-ci-tools/ +# built by: .github/workflows/docker-ci-tools.yml +TEMPO_CI_TOOLS_IMAGE ?= grafana/tempo-ci-tools:main-c2aa3e8 DOCS_IMAGE ?= grafana/docs-base:latest # More exclusions can be added similar with: -not -path './testbed/*' @@ -266,12 +268,8 @@ endif ##@ Code Generation -PROTOC = docker run --rm -u ${shell id -u} -v${PWD}:${PWD} -w${PWD} ${DOCKER_PROTOBUF_IMAGE} --proto_path=${PWD} PROTO_INTERMEDIATE_DIR = pkg/.patched-proto -PROTO_INCLUDES = -I$(PROTO_INTERMEDIATE_DIR) -PROTO_GEN = $(PROTOC) $(PROTO_INCLUDES) --gogofaster_out=plugins=grpc,paths=source_relative,Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types:$(2) $(1) -PROTO_GEN_WITH_VENDOR = $(PROTOC) $(PROTO_INCLUDES) -Ivendor -Ivendor/github.com/gogo/protobuf --gogofaster_out=plugins=grpc,paths=source_relative:$(2) $(1) -PROTO_GEN_WITHOUT_RELATIVE = $(PROTOC) $(PROTO_INCLUDES) --gogofaster_out=plugins=grpc:$(2) $(1) +BUF = docker run --rm -u ${shell id -u} -v${PWD}:/tempo -w/tempo -e HOME=/tempo --entrypoint /usr/local/bin/buf ${TEMPO_CI_TOOLS_IMAGE} .PHONY: gen-proto gen-proto: ## Generate proto files @@ -309,13 +307,20 @@ gen-proto: ## Generate proto files @echo -- @echo -- Gen proto -- @echo -- - $(call PROTO_GEN,$(PROTO_INTERMEDIATE_DIR)/common/v1/common.proto,./pkg/tempopb/) - $(call PROTO_GEN,$(PROTO_INTERMEDIATE_DIR)/resource/v1/resource.proto,./pkg/tempopb/) - $(call PROTO_GEN,$(PROTO_INTERMEDIATE_DIR)/trace/v1/trace.proto,./pkg/tempopb/) - $(call PROTO_GEN,pkg/tempopb/tempo.proto,./) - $(call PROTO_GEN,pkg/tempopb/backendwork.proto,./) - $(call PROTO_GEN_WITHOUT_RELATIVE,tempodb/backend/v1/v1.proto,./) - $(call PROTO_GEN_WITH_VENDOR,modules/frontend/v1/frontendv1pb/frontend.proto,./) + @# Generate patched OpenTelemetry protos (output to pkg/tempopb/) + $(BUF) generate --config buf/buf.gen-config.yaml --template buf/buf.gen.otel.yaml --path $(PROTO_INTERMEDIATE_DIR)/common/v1/common.proto + $(BUF) generate --config buf/buf.gen-config.yaml --template buf/buf.gen.otel.yaml --path $(PROTO_INTERMEDIATE_DIR)/resource/v1/resource.proto + $(BUF) generate --config buf/buf.gen-config.yaml --template buf/buf.gen.otel.yaml --path $(PROTO_INTERMEDIATE_DIR)/trace/v1/trace.proto + + @# Generate Tempo protos + $(BUF) generate --config buf/buf.gen-config.yaml --template buf/buf.gen.tempopb.yaml --path pkg/tempopb/tempo.proto + $(BUF) generate --config buf/buf.gen-config.yaml --template buf/buf.gen.tempopb.yaml --path pkg/tempopb/backendwork.proto + + @# Generate backend proto (uses go_package for output path) + $(BUF) generate --config buf/buf.gen-config.yaml --template buf/buf.gen.backend.yaml --path tempodb/backend/v1/v1.proto + + @# Generate frontend proto + $(BUF) generate --config buf/buf.gen-config.yaml --template buf/buf.gen.frontend.yaml --path modules/frontend/v1/frontendv1pb/frontend.proto rm -rf $(PROTO_INTERMEDIATE_DIR) diff --git a/buf/buf.gen-config.yaml b/buf/buf.gen-config.yaml new file mode 100644 index 000000000..a3d19f09b --- /dev/null +++ b/buf/buf.gen-config.yaml @@ -0,0 +1,8 @@ +version: v2 +modules: + - path: pkg/.patched-proto + - path: pkg/tempopb + - path: vendor + - path: vendor/github.com/gogo/protobuf + - path: tempodb/backend + - path: modules/frontend/v1/frontendv1pb diff --git a/buf/buf.gen.backend.yaml b/buf/buf.gen.backend.yaml new file mode 100644 index 000000000..26525f4ff --- /dev/null +++ b/buf/buf.gen.backend.yaml @@ -0,0 +1,7 @@ +version: v2 +plugins: + - local: protoc-gen-gogofaster + out: . + opt: + - plugins=grpc + - Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types diff --git a/buf/buf.gen.frontend.yaml b/buf/buf.gen.frontend.yaml new file mode 100644 index 000000000..4b4a822a0 --- /dev/null +++ b/buf/buf.gen.frontend.yaml @@ -0,0 +1,7 @@ +version: v2 +plugins: + - local: protoc-gen-gogofaster + out: modules/frontend/v1/frontendv1pb + opt: + - plugins=grpc + - paths=source_relative diff --git a/buf/buf.gen.otel.yaml b/buf/buf.gen.otel.yaml new file mode 100644 index 000000000..5a508464b --- /dev/null +++ b/buf/buf.gen.otel.yaml @@ -0,0 +1,8 @@ +version: v2 +plugins: + - local: protoc-gen-gogofaster + out: pkg/tempopb + opt: + - plugins=grpc + - paths=source_relative + - Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types diff --git a/buf/buf.gen.tempopb.yaml b/buf/buf.gen.tempopb.yaml new file mode 100644 index 000000000..5a508464b --- /dev/null +++ b/buf/buf.gen.tempopb.yaml @@ -0,0 +1,8 @@ +version: v2 +plugins: + - local: protoc-gen-gogofaster + out: pkg/tempopb + opt: + - plugins=grpc + - paths=source_relative + - Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types diff --git a/buf/buf.yaml b/buf/buf.yaml new file mode 100644 index 000000000..48b949fe5 --- /dev/null +++ b/buf/buf.yaml @@ -0,0 +1,7 @@ +version: v2 +modules: + - path: . + excludes: + - vendor + - opentelemetry-proto + - pkg/.patched-proto diff --git a/modules/frontend/v1/frontendv1pb/frontend.pb.go b/modules/frontend/v1/frontendv1pb/frontend.pb.go index 195d1f210..b55ba5853 100644 --- a/modules/frontend/v1/frontendv1pb/frontend.pb.go +++ b/modules/frontend/v1/frontendv1pb/frontend.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: modules/frontend/v1/frontendv1pb/frontend.proto +// source: frontend.proto // Protobuf package should not be changed when moving around go packages // in order to not break backward compatibility. @@ -56,7 +56,7 @@ func (x Type) String() string { } func (Type) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_8e6c94795ed772cd, []int{0} + return fileDescriptor_eca3873955a29cfe, []int{0} } type Feature int32 @@ -81,7 +81,7 @@ func (x Feature) String() string { } func (Feature) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_8e6c94795ed772cd, []int{1} + return fileDescriptor_eca3873955a29cfe, []int{1} } type FrontendToClient struct { @@ -95,7 +95,7 @@ func (m *FrontendToClient) Reset() { *m = FrontendToClient{} } func (m *FrontendToClient) String() string { return proto.CompactTextString(m) } func (*FrontendToClient) ProtoMessage() {} func (*FrontendToClient) Descriptor() ([]byte, []int) { - return fileDescriptor_8e6c94795ed772cd, []int{0} + return fileDescriptor_eca3873955a29cfe, []int{0} } func (m *FrontendToClient) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -157,7 +157,7 @@ func (m *ClientToFrontend) Reset() { *m = ClientToFrontend{} } func (m *ClientToFrontend) String() string { return proto.CompactTextString(m) } func (*ClientToFrontend) ProtoMessage() {} func (*ClientToFrontend) Descriptor() ([]byte, []int) { - return fileDescriptor_8e6c94795ed772cd, []int{1} + return fileDescriptor_eca3873955a29cfe, []int{1} } func (m *ClientToFrontend) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -222,7 +222,7 @@ func (m *NotifyClientShutdownRequest) Reset() { *m = NotifyClientShutdow func (m *NotifyClientShutdownRequest) String() string { return proto.CompactTextString(m) } func (*NotifyClientShutdownRequest) ProtoMessage() {} func (*NotifyClientShutdownRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8e6c94795ed772cd, []int{2} + return fileDescriptor_eca3873955a29cfe, []int{2} } func (m *NotifyClientShutdownRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -265,7 +265,7 @@ func (m *NotifyClientShutdownResponse) Reset() { *m = NotifyClientShutdo func (m *NotifyClientShutdownResponse) String() string { return proto.CompactTextString(m) } func (*NotifyClientShutdownResponse) ProtoMessage() {} func (*NotifyClientShutdownResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8e6c94795ed772cd, []int{3} + return fileDescriptor_eca3873955a29cfe, []int{3} } func (m *NotifyClientShutdownResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -303,43 +303,40 @@ func init() { proto.RegisterType((*NotifyClientShutdownResponse)(nil), "frontend.NotifyClientShutdownResponse") } -func init() { - proto.RegisterFile("modules/frontend/v1/frontendv1pb/frontend.proto", fileDescriptor_8e6c94795ed772cd) -} +func init() { proto.RegisterFile("frontend.proto", fileDescriptor_eca3873955a29cfe) } -var fileDescriptor_8e6c94795ed772cd = []byte{ - // 483 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x53, 0xc1, 0x6e, 0xd3, 0x40, - 0x10, 0xf5, 0x96, 0xb4, 0x0d, 0xd3, 0xa8, 0x5a, 0x46, 0xa1, 0x8a, 0x0c, 0xb2, 0x22, 0x4b, 0x54, - 0xa1, 0x87, 0xb8, 0x0d, 0x07, 0x04, 0xe2, 0xd2, 0x36, 0x69, 0x9a, 0x4b, 0x28, 0xae, 0xb9, 0x70, - 0x89, 0x1c, 0x67, 0xe3, 0x44, 0xb4, 0x5e, 0x63, 0xaf, 0x8b, 0xf2, 0x17, 0x7c, 0x0b, 0x47, 0xbe, - 0x80, 0x03, 0x87, 0x1e, 0x39, 0xa2, 0xe4, 0x47, 0x90, 0xed, 0x64, 0xbb, 0x49, 0x1b, 0xb8, 0xcd, - 0xec, 0x7b, 0x6f, 0xe6, 0xed, 0xcc, 0x2e, 0x58, 0xd7, 0x7c, 0x90, 0x5c, 0xb1, 0xd8, 0x1a, 0x46, - 0x3c, 0x10, 0x2c, 0x18, 0x58, 0x37, 0x47, 0x32, 0xbe, 0x39, 0x0a, 0xfb, 0x32, 0xa9, 0x87, 0x11, - 0x17, 0x1c, 0x8b, 0x8b, 0x5c, 0x2f, 0xfb, 0xdc, 0xe7, 0xd9, 0xa1, 0x95, 0x46, 0x39, 0xae, 0x1f, - 0xfa, 0x63, 0x31, 0x4a, 0xfa, 0x75, 0x8f, 0x5f, 0x5b, 0x7e, 0xe4, 0x0e, 0xdd, 0xc0, 0xb5, 0x06, - 0xf1, 0xe7, 0xb1, 0xb0, 0x46, 0x42, 0x84, 0x7e, 0x14, 0x7a, 0x32, 0xc8, 0x15, 0xe6, 0x77, 0x02, - 0xf4, 0x6c, 0x5e, 0xd4, 0xe1, 0xa7, 0x57, 0x63, 0x16, 0x08, 0x7c, 0x0d, 0x3b, 0x29, 0xcd, 0x66, - 0x5f, 0x12, 0x16, 0x8b, 0x0a, 0xa9, 0x92, 0xda, 0x4e, 0xe3, 0x69, 0x5d, 0x4a, 0xcf, 0x1d, 0xe7, - 0x62, 0x0e, 0xda, 0x2a, 0x13, 0x4d, 0x28, 0x88, 0x49, 0xc8, 0x2a, 0x1b, 0x55, 0x52, 0xdb, 0x6d, - 0xec, 0xd6, 0xa5, 0x7d, 0x67, 0x12, 0x32, 0x3b, 0xc3, 0xf0, 0x18, 0xa8, 0x22, 0x39, 0x71, 0x85, - 0x37, 0xaa, 0x14, 0xaa, 0x8f, 0xd6, 0x77, 0xb8, 0x47, 0x37, 0x7f, 0x11, 0xa0, 0xb9, 0x55, 0x87, - 0x2f, 0xcc, 0xe3, 0x5b, 0x28, 0xe5, 0xc4, 0x38, 0xe4, 0x41, 0xcc, 0xe6, 0xae, 0xf7, 0x56, 0x6b, - 0xe6, 0xa8, 0xbd, 0xc4, 0x45, 0x1d, 0x8a, 0x5e, 0x56, 0xaf, 0xd3, 0xcc, 0xbc, 0x3f, 0xb6, 0x65, - 0x8e, 0x4d, 0x78, 0xa2, 0x72, 0x55, 0xc3, 0xeb, 0x8a, 0xdf, 0x17, 0xa4, 0x1d, 0x86, 0xcc, 0x15, - 0x49, 0xc4, 0xe2, 0xca, 0x66, 0x95, 0xd4, 0x36, 0x6d, 0x99, 0x9b, 0x6f, 0xe0, 0x59, 0x97, 0x8b, - 0xf1, 0x70, 0x92, 0xdf, 0xe9, 0x72, 0x94, 0x88, 0x01, 0xff, 0x1a, 0x2c, 0x86, 0xaa, 0x9a, 0x23, - 0xcb, 0xe6, 0x4c, 0x03, 0x9e, 0x3f, 0x2c, 0xcd, 0x7b, 0x1f, 0xbc, 0x83, 0x42, 0x3a, 0x7a, 0xa4, - 0x50, 0x4a, 0x1d, 0xf6, 0xec, 0xd6, 0x87, 0x8f, 0xad, 0x4b, 0x87, 0x6a, 0x08, 0xb0, 0xd5, 0x6e, - 0x39, 0xbd, 0x4e, 0x93, 0x12, 0xdc, 0x03, 0x54, 0xd1, 0xde, 0xc9, 0xb1, 0x73, 0x7a, 0x4e, 0x37, - 0x0e, 0x5e, 0xc2, 0xf6, 0x59, 0x6e, 0x12, 0x8b, 0x50, 0xe8, 0xbe, 0xef, 0xb6, 0xa8, 0x86, 0x65, - 0xa0, 0x4b, 0xbc, 0x4e, 0xb7, 0x4d, 0x49, 0xe3, 0x07, 0x81, 0xa2, 0x5c, 0x45, 0x1b, 0xb6, 0x2f, - 0x22, 0xee, 0xb1, 0x38, 0x46, 0xfd, 0xee, 0x0d, 0xac, 0x6e, 0x4c, 0x57, 0xb0, 0xd5, 0x27, 0x68, - 0x6a, 0x35, 0x72, 0x48, 0x90, 0x41, 0xf9, 0xa1, 0xeb, 0xe1, 0x8b, 0x3b, 0xe5, 0x3f, 0x26, 0xa7, - 0xef, 0xff, 0x8f, 0x36, 0xdf, 0xd0, 0xfe, 0xcf, 0xa9, 0x41, 0x6e, 0xa7, 0x06, 0xf9, 0x33, 0x35, - 0xc8, 0xb7, 0x99, 0xa1, 0xdd, 0xce, 0x0c, 0xed, 0xf7, 0xcc, 0xd0, 0x3e, 0x95, 0xd4, 0xdf, 0xd8, - 0xdf, 0xca, 0xfe, 0xcc, 0xab, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x94, 0x02, 0xa2, 0x13, 0xb8, - 0x03, 0x00, 0x00, +var fileDescriptor_eca3873955a29cfe = []byte{ + // 469 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x53, 0xcd, 0x6e, 0xd3, 0x40, + 0x10, 0xf6, 0x96, 0xb4, 0x0d, 0xd3, 0x28, 0x5a, 0x46, 0xa1, 0x8a, 0x0c, 0xb2, 0x22, 0x4b, 0x54, + 0xa1, 0x87, 0xa4, 0x84, 0x03, 0x02, 0x71, 0x69, 0x9b, 0x34, 0xcd, 0x25, 0x14, 0x77, 0xb9, 0x70, + 0x89, 0x1c, 0x67, 0xe3, 0x44, 0x80, 0xd7, 0xd8, 0x6b, 0x50, 0xde, 0x82, 0x67, 0xe1, 0xc8, 0x13, + 0x70, 0xe0, 0xd0, 0x23, 0x47, 0x94, 0xbc, 0x08, 0xb2, 0xd7, 0x76, 0x9d, 0xb4, 0x85, 0xdb, 0x8e, + 0xbf, 0x9f, 0xf9, 0x76, 0x66, 0x0d, 0xd5, 0x69, 0x20, 0x3c, 0xc9, 0xbd, 0x49, 0xcb, 0x0f, 0x84, + 0x14, 0x58, 0xce, 0x6a, 0xbd, 0xe6, 0x0a, 0x57, 0x24, 0x1f, 0xdb, 0xf1, 0x49, 0xe1, 0xfa, 0x91, + 0x3b, 0x97, 0xb3, 0x68, 0xdc, 0x72, 0xc4, 0xa7, 0xb6, 0x1b, 0xd8, 0x53, 0xdb, 0xb3, 0xdb, 0x93, + 0xf0, 0xc3, 0x5c, 0xb6, 0x67, 0x52, 0xfa, 0x6e, 0xe0, 0x3b, 0xf9, 0x41, 0x29, 0xcc, 0xef, 0x04, + 0xe8, 0x59, 0x6a, 0xca, 0xc4, 0xe9, 0xc7, 0x39, 0xf7, 0x24, 0xbe, 0x80, 0xbd, 0x98, 0x66, 0xf1, + 0xcf, 0x11, 0x0f, 0x65, 0x9d, 0x34, 0x48, 0x73, 0xaf, 0xf3, 0xb0, 0x95, 0x4b, 0xcf, 0x19, 0xbb, + 0x48, 0x41, 0xab, 0xc8, 0x44, 0x13, 0x4a, 0x72, 0xe1, 0xf3, 0xfa, 0x56, 0x83, 0x34, 0xab, 0x9d, + 0x6a, 0x2b, 0x8f, 0xcf, 0x16, 0x3e, 0xb7, 0x12, 0x0c, 0x8f, 0x81, 0x16, 0x24, 0x27, 0xb6, 0x74, + 0x66, 0xf5, 0x52, 0xe3, 0xde, 0xdd, 0x1d, 0x6e, 0xd0, 0xcd, 0x5f, 0x04, 0xa8, 0x8a, 0xca, 0x44, + 0x16, 0x1e, 0x5f, 0x41, 0x45, 0x11, 0x43, 0x5f, 0x78, 0x21, 0x4f, 0x53, 0xef, 0x6f, 0x7a, 0x2a, + 0xd4, 0x5a, 0xe3, 0xa2, 0x0e, 0x65, 0x27, 0xf1, 0x1b, 0x74, 0x93, 0xec, 0xf7, 0xad, 0xbc, 0xc6, + 0x2e, 0x3c, 0x28, 0x72, 0x8b, 0x81, 0xef, 0x32, 0xbf, 0x29, 0x88, 0x3b, 0x4c, 0xb9, 0x2d, 0xa3, + 0x80, 0x87, 0xf5, 0xed, 0x06, 0x69, 0x6e, 0x5b, 0x79, 0x6d, 0xbe, 0x84, 0x47, 0x43, 0x21, 0xe7, + 0xd3, 0x85, 0xba, 0xd3, 0xe5, 0x2c, 0x92, 0x13, 0xf1, 0xd5, 0xcb, 0x86, 0x5a, 0x0c, 0x47, 0xd6, + 0xc3, 0x99, 0x06, 0x3c, 0xbe, 0x5d, 0xaa, 0x7a, 0x1f, 0xbe, 0x86, 0x52, 0x3c, 0x7a, 0xa4, 0x50, + 0x89, 0x13, 0x8e, 0xac, 0xde, 0xdb, 0x77, 0xbd, 0x4b, 0x46, 0x35, 0x04, 0xd8, 0xe9, 0xf7, 0xd8, + 0x68, 0xd0, 0xa5, 0x04, 0xf7, 0x01, 0x8b, 0xe8, 0xe8, 0xe4, 0x98, 0x9d, 0x9e, 0xd3, 0xad, 0xc3, + 0xa7, 0xb0, 0x7b, 0xa6, 0x42, 0x62, 0x19, 0x4a, 0xc3, 0x37, 0xc3, 0x1e, 0xd5, 0xb0, 0x06, 0x74, + 0x8d, 0x37, 0x18, 0xf6, 0x29, 0xe9, 0xfc, 0x20, 0x50, 0xce, 0x57, 0xd1, 0x87, 0xdd, 0x8b, 0x40, + 0x38, 0x3c, 0x0c, 0x51, 0xbf, 0x7e, 0x03, 0x9b, 0x1b, 0xd3, 0x0b, 0xd8, 0xe6, 0x13, 0x34, 0xb5, + 0x26, 0x39, 0x22, 0xc8, 0xa1, 0x76, 0xdb, 0xf5, 0xf0, 0xc9, 0xb5, 0xf2, 0x1f, 0x93, 0xd3, 0x0f, + 0xfe, 0x47, 0x4b, 0x37, 0x74, 0xf0, 0x73, 0x69, 0x90, 0xab, 0xa5, 0x41, 0xfe, 0x2c, 0x0d, 0xf2, + 0x6d, 0x65, 0x68, 0x57, 0x2b, 0x43, 0xfb, 0xbd, 0x32, 0xb4, 0xf7, 0x95, 0xcc, 0xe0, 0xcb, 0x33, + 0x7f, 0x3c, 0xde, 0x49, 0xfe, 0x99, 0xe7, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xe4, 0x17, 0x16, + 0x1b, 0x97, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -494,7 +491,7 @@ var _Frontend_serviceDesc = grpc.ServiceDesc{ ClientStreams: true, }, }, - Metadata: "modules/frontend/v1/frontendv1pb/frontend.proto", + Metadata: "frontend.proto", } func (m *FrontendToClient) Marshal() (dAtA []byte, err error) { diff --git a/pkg/.gitignore b/pkg/.gitignore new file mode 100644 index 000000000..b14f1c67b --- /dev/null +++ b/pkg/.gitignore @@ -0,0 +1 @@ +.patched-proto diff --git a/pkg/buf.yaml b/pkg/buf.yaml new file mode 100644 index 000000000..ee89299b9 --- /dev/null +++ b/pkg/buf.yaml @@ -0,0 +1,7 @@ +version: v2 +modules: + - path: .patched-proto + - path: tempopb + - path: ../vendor +deps: + - buf.build/gogo/protobuf diff --git a/pkg/tempopb/backendwork.pb.go b/pkg/tempopb/backendwork.pb.go index 5c2e22d9a..094a1d552 100644 --- a/pkg/tempopb/backendwork.pb.go +++ b/pkg/tempopb/backendwork.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: pkg/tempopb/backendwork.proto +// source: backendwork.proto package tempopb @@ -52,7 +52,7 @@ func (x JobType) String() string { } func (JobType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_c3a9b767f7ac9e35, []int{0} + return fileDescriptor_1e9b87dd365f5504, []int{0} } type JobStatus int32 @@ -83,7 +83,7 @@ func (x JobStatus) String() string { } func (JobStatus) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_c3a9b767f7ac9e35, []int{1} + return fileDescriptor_1e9b87dd365f5504, []int{1} } // CompactionDetail contains fields specific to compaction jobs @@ -96,7 +96,7 @@ func (m *CompactionDetail) Reset() { *m = CompactionDetail{} } func (m *CompactionDetail) String() string { return proto.CompactTextString(m) } func (*CompactionDetail) ProtoMessage() {} func (*CompactionDetail) Descriptor() ([]byte, []int) { - return fileDescriptor_c3a9b767f7ac9e35, []int{0} + return fileDescriptor_1e9b87dd365f5504, []int{0} } func (m *CompactionDetail) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -146,7 +146,7 @@ func (m *RetentionDetail) Reset() { *m = RetentionDetail{} } func (m *RetentionDetail) String() string { return proto.CompactTextString(m) } func (*RetentionDetail) ProtoMessage() {} func (*RetentionDetail) Descriptor() ([]byte, []int) { - return fileDescriptor_c3a9b767f7ac9e35, []int{1} + return fileDescriptor_1e9b87dd365f5504, []int{1} } func (m *RetentionDetail) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -187,7 +187,7 @@ func (m *JobDetail) Reset() { *m = JobDetail{} } func (m *JobDetail) String() string { return proto.CompactTextString(m) } func (*JobDetail) ProtoMessage() {} func (*JobDetail) Descriptor() ([]byte, []int) { - return fileDescriptor_c3a9b767f7ac9e35, []int{2} + return fileDescriptor_1e9b87dd365f5504, []int{2} } func (m *JobDetail) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -245,7 +245,7 @@ func (m *NextJobRequest) Reset() { *m = NextJobRequest{} } func (m *NextJobRequest) String() string { return proto.CompactTextString(m) } func (*NextJobRequest) ProtoMessage() {} func (*NextJobRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_c3a9b767f7ac9e35, []int{3} + return fileDescriptor_1e9b87dd365f5504, []int{3} } func (m *NextJobRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -291,7 +291,7 @@ func (m *NextJobResponse) Reset() { *m = NextJobResponse{} } func (m *NextJobResponse) String() string { return proto.CompactTextString(m) } func (*NextJobResponse) ProtoMessage() {} func (*NextJobResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_c3a9b767f7ac9e35, []int{4} + return fileDescriptor_1e9b87dd365f5504, []int{4} } func (m *NextJobResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -352,7 +352,7 @@ func (m *UpdateJobStatusRequest) Reset() { *m = UpdateJobStatusRequest{} func (m *UpdateJobStatusRequest) String() string { return proto.CompactTextString(m) } func (*UpdateJobStatusRequest) ProtoMessage() {} func (*UpdateJobStatusRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_c3a9b767f7ac9e35, []int{5} + return fileDescriptor_1e9b87dd365f5504, []int{5} } func (m *UpdateJobStatusRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -417,7 +417,7 @@ func (m *UpdateJobStatusResponse) Reset() { *m = UpdateJobStatusResponse func (m *UpdateJobStatusResponse) String() string { return proto.CompactTextString(m) } func (*UpdateJobStatusResponse) ProtoMessage() {} func (*UpdateJobStatusResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_c3a9b767f7ac9e35, []int{6} + return fileDescriptor_1e9b87dd365f5504, []int{6} } func (m *UpdateJobStatusResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -465,49 +465,49 @@ func init() { proto.RegisterType((*UpdateJobStatusResponse)(nil), "tempopb.UpdateJobStatusResponse") } -func init() { proto.RegisterFile("pkg/tempopb/backendwork.proto", fileDescriptor_c3a9b767f7ac9e35) } +func init() { proto.RegisterFile("backendwork.proto", fileDescriptor_1e9b87dd365f5504) } -var fileDescriptor_c3a9b767f7ac9e35 = []byte{ - // 619 bytes of a gzipped FileDescriptorProto +var fileDescriptor_1e9b87dd365f5504 = []byte{ + // 612 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0xcf, 0x4e, 0xdb, 0x4e, - 0x10, 0xc7, 0xb3, 0x21, 0x04, 0x32, 0x3f, 0x09, 0xfc, 0xdb, 0x42, 0x70, 0x83, 0x9a, 0x20, 0xab, - 0x07, 0x84, 0x44, 0x52, 0x81, 0x54, 0xa9, 0xf4, 0x44, 0x1c, 0x53, 0xd9, 0x6a, 0x4d, 0x64, 0x3b, - 0x87, 0x9e, 0x90, 0xff, 0x6c, 0x43, 0xf8, 0xe3, 0x75, 0xed, 0xb5, 0x5a, 0x6e, 0x7d, 0x84, 0x3e, - 0x40, 0x0f, 0xe5, 0xde, 0x07, 0xe1, 0xc8, 0xb1, 0xa7, 0xaa, 0x82, 0x0b, 0x8f, 0x51, 0x79, 0xbd, - 0x71, 0x42, 0x28, 0x87, 0xde, 0x32, 0xf3, 0xfd, 0xee, 0xcc, 0x67, 0x67, 0x27, 0x86, 0x67, 0xd1, - 0xe9, 0xb0, 0xc3, 0xc8, 0x79, 0x44, 0x23, 0xaf, 0xe3, 0xb9, 0xfe, 0x29, 0x09, 0x83, 0x4f, 0x34, - 0x3e, 0x6d, 0x47, 0x31, 0x65, 0x14, 0x2f, 0x08, 0xa9, 0xb1, 0x3d, 0x1c, 0xb1, 0xe3, 0xd4, 0x6b, - 0xfb, 0xf4, 0xbc, 0x33, 0xa4, 0x43, 0xda, 0xe1, 0xba, 0x97, 0x7e, 0xe0, 0x11, 0x0f, 0xf8, 0xaf, - 0xfc, 0x9c, 0x62, 0x80, 0xa4, 0xd2, 0xf3, 0xc8, 0xf5, 0xd9, 0x88, 0x86, 0x3d, 0xc2, 0xdc, 0xd1, - 0x19, 0x5e, 0x81, 0xf9, 0x51, 0x18, 0xa5, 0x4c, 0x46, 0x1b, 0x73, 0x9b, 0x35, 0x2b, 0x0f, 0x70, - 0x1d, 0xaa, 0x34, 0x65, 0x59, 0xba, 0xcc, 0xd3, 0x22, 0xda, 0x5b, 0xbc, 0xfb, 0xde, 0x42, 0x77, - 0x97, 0x2d, 0xa4, 0xac, 0xc3, 0xb2, 0x45, 0x18, 0x09, 0x27, 0xa5, 0xa6, 0xc4, 0x6f, 0x08, 0x6a, - 0x06, 0xf5, 0x44, 0x8b, 0x3a, 0x54, 0x19, 0x09, 0xdd, 0x30, 0xeb, 0x81, 0xb2, 0x62, 0x79, 0x84, - 0x5f, 0x01, 0xf8, 0x05, 0x8e, 0x5c, 0xde, 0x40, 0x9b, 0xff, 0xed, 0x3c, 0x6d, 0x8b, 0xbb, 0xb5, - 0x67, 0x49, 0xad, 0x29, 0x33, 0x7e, 0x09, 0xb5, 0x78, 0xdc, 0x5d, 0x9e, 0xe3, 0x27, 0xe5, 0xe2, - 0xe4, 0x0c, 0x97, 0x35, 0xb1, 0xee, 0x55, 0x32, 0x44, 0x65, 0x1b, 0x96, 0x4c, 0xf2, 0x99, 0x19, - 0xd4, 0xb3, 0xc8, 0xc7, 0x94, 0x24, 0x0c, 0xaf, 0x43, 0x2d, 0x9b, 0x2f, 0x89, 0x8f, 0x46, 0x81, - 0xa0, 0x5c, 0xcc, 0x13, 0x7a, 0xa0, 0x7c, 0x41, 0xb0, 0x5c, 0xf8, 0x93, 0x88, 0x86, 0x09, 0xc1, - 0xab, 0x50, 0x3d, 0xa1, 0xde, 0xc4, 0x3d, 0x7f, 0x42, 0x3d, 0x3d, 0xc0, 0xcf, 0xa1, 0xc2, 0x2e, - 0x22, 0xc2, 0x2f, 0xb3, 0xb4, 0x23, 0x15, 0x48, 0x06, 0xf5, 0x9c, 0x8b, 0x88, 0x58, 0x5c, 0xc5, - 0x2f, 0xa0, 0x1a, 0x70, 0x34, 0x81, 0x8e, 0xa7, 0x7d, 0x39, 0x74, 0xb7, 0x72, 0xf5, 0xab, 0x55, - 0xb2, 0x84, 0x4f, 0xf9, 0x81, 0xa0, 0x3e, 0x88, 0x02, 0x97, 0x11, 0x83, 0x7a, 0x36, 0x73, 0x59, - 0x9a, 0x8c, 0xd1, 0x1f, 0x21, 0xd9, 0x82, 0x6a, 0xc2, 0x7d, 0x82, 0xe5, 0x5e, 0x0f, 0x51, 0x41, - 0x38, 0xb2, 0x1d, 0x20, 0x71, 0x4c, 0x63, 0x8e, 0x53, 0xb3, 0xf2, 0x60, 0xe6, 0x79, 0x2a, 0xff, - 0xf0, 0x3c, 0xca, 0x2e, 0xac, 0x3d, 0xa0, 0x15, 0x83, 0x93, 0x61, 0x21, 0x49, 0x7d, 0x9f, 0x24, - 0x09, 0xe7, 0x5d, 0xb4, 0xc6, 0xe1, 0x96, 0x03, 0x0b, 0x62, 0x4c, 0x58, 0x86, 0x15, 0xe3, 0xb0, - 0x7b, 0xe4, 0xbc, 0xef, 0x6b, 0x47, 0x03, 0xd3, 0xee, 0x6b, 0xaa, 0x7e, 0xa0, 0x6b, 0x3d, 0xa9, - 0x84, 0xd7, 0xe0, 0x49, 0xa1, 0xa8, 0x87, 0xef, 0xfa, 0xfb, 0xaa, 0xa3, 0x1f, 0x9a, 0x12, 0xc2, - 0x75, 0xc0, 0x85, 0x60, 0x69, 0x8e, 0x66, 0xf2, 0x7c, 0x79, 0x2b, 0xe2, 0x9b, 0x98, 0x43, 0xe0, - 0x06, 0xd4, 0x33, 0x93, 0xed, 0xec, 0x3b, 0x03, 0x7b, 0xa6, 0xb2, 0xe8, 0x29, 0x34, 0x7b, 0xa0, - 0xaa, 0x9a, 0xd6, 0xd3, 0x7a, 0x12, 0xc2, 0xab, 0xf0, 0xff, 0x94, 0x72, 0xb0, 0xaf, 0xbf, 0xd5, - 0x7a, 0x52, 0x79, 0xdc, 0x51, 0xa4, 0xad, 0x81, 0x69, 0xea, 0xe6, 0x1b, 0x69, 0x6e, 0xe7, 0x12, - 0x81, 0xd4, 0xcd, 0xff, 0xb3, 0xb6, 0x7f, 0x4c, 0x82, 0xf4, 0x8c, 0xc4, 0xf8, 0x35, 0x54, 0xb2, - 0x15, 0xc2, 0x6b, 0xc5, 0x00, 0xef, 0x6f, 0x60, 0x43, 0x7e, 0x28, 0xe4, 0x13, 0x53, 0x4a, 0xb8, - 0x0f, 0xb5, 0x62, 0x9c, 0xb8, 0x55, 0x18, 0xff, 0xbe, 0x10, 0x8d, 0x8d, 0xc7, 0x0d, 0xe3, 0x8a, - 0x5d, 0xf9, 0xea, 0xa6, 0x89, 0xae, 0x6f, 0x9a, 0xe8, 0xf7, 0x4d, 0x13, 0x7d, 0xbd, 0x6d, 0x96, - 0xae, 0x6f, 0x9b, 0xa5, 0x9f, 0xb7, 0xcd, 0x92, 0x57, 0xe5, 0x9f, 0x8a, 0xdd, 0x3f, 0x01, 0x00, - 0x00, 0xff, 0xff, 0xcc, 0xd4, 0xee, 0xfa, 0x83, 0x04, 0x00, 0x00, + 0x10, 0xc7, 0xb3, 0x21, 0x04, 0x32, 0x3f, 0x09, 0xcc, 0xfe, 0x20, 0xb8, 0x41, 0x72, 0x90, 0xd5, + 0x03, 0x42, 0x22, 0x54, 0x20, 0x55, 0x2a, 0x3d, 0x11, 0xc7, 0x54, 0xb6, 0x5a, 0x13, 0xd9, 0xce, + 0xa1, 0x27, 0xe4, 0x3f, 0x5b, 0x08, 0x7f, 0xbc, 0xae, 0xbd, 0x56, 0xcb, 0xad, 0x8f, 0xd0, 0x07, + 0xe8, 0xa1, 0xdc, 0xfb, 0x20, 0x1c, 0x39, 0xf6, 0x54, 0x55, 0x70, 0xe1, 0x31, 0x2a, 0xaf, 0x37, + 0x4e, 0x08, 0xe5, 0xd0, 0x5b, 0x66, 0xbe, 0xdf, 0x9d, 0xf9, 0xec, 0xec, 0xc4, 0xb0, 0xe4, 0x7b, + 0xc1, 0x19, 0x89, 0xc2, 0x4f, 0x34, 0x39, 0xeb, 0xc4, 0x09, 0x65, 0x14, 0xcf, 0x31, 0x72, 0x11, + 0xd3, 0xd8, 0x6f, 0x6d, 0x1d, 0x0f, 0xd9, 0x49, 0xe6, 0x77, 0x02, 0x7a, 0xb1, 0x7d, 0x4c, 0x8f, + 0xe9, 0x36, 0xd7, 0xfd, 0xec, 0x03, 0x8f, 0x78, 0xc0, 0x7f, 0x15, 0xe7, 0x54, 0x13, 0x24, 0x8d, + 0x5e, 0xc4, 0x5e, 0xc0, 0x86, 0x34, 0xea, 0x11, 0xe6, 0x0d, 0xcf, 0xf1, 0x32, 0xcc, 0x0e, 0xa3, + 0x38, 0x63, 0x32, 0x5a, 0x9f, 0xd9, 0x68, 0xd8, 0x45, 0x80, 0x9b, 0x50, 0xa7, 0x19, 0xcb, 0xd3, + 0x55, 0x9e, 0x16, 0xd1, 0xde, 0xfc, 0xfd, 0xf7, 0x36, 0xba, 0xbf, 0x6a, 0x23, 0x75, 0x0d, 0x16, + 0x6d, 0xc2, 0x48, 0x34, 0x2e, 0x35, 0x21, 0x7e, 0x43, 0xd0, 0x30, 0xa9, 0x2f, 0x5a, 0x34, 0xa1, + 0xce, 0x48, 0xe4, 0x45, 0x79, 0x0f, 0x94, 0x17, 0x2b, 0x22, 0xfc, 0x0a, 0x20, 0x28, 0x71, 0xe4, + 0xea, 0x3a, 0xda, 0xf8, 0x6f, 0xe7, 0x59, 0x47, 0xdc, 0xad, 0x33, 0x4d, 0x6a, 0x4f, 0x98, 0xf1, + 0x4b, 0x68, 0x24, 0xa3, 0xee, 0xf2, 0x0c, 0x3f, 0x29, 0x97, 0x27, 0xa7, 0xb8, 0xec, 0xb1, 0x75, + 0xaf, 0x96, 0x23, 0xaa, 0x5b, 0xb0, 0x60, 0x91, 0xcf, 0xcc, 0xa4, 0xbe, 0x4d, 0x3e, 0x66, 0x24, + 0x65, 0x78, 0x0d, 0x1a, 0xf9, 0x7c, 0x49, 0x72, 0x34, 0x0c, 0x05, 0xe5, 0x7c, 0x91, 0x30, 0x42, + 0xf5, 0x0b, 0x82, 0xc5, 0xd2, 0x9f, 0xc6, 0x34, 0x4a, 0x09, 0x5e, 0x81, 0xfa, 0x29, 0xf5, 0xc7, + 0xee, 0xd9, 0x53, 0xea, 0x1b, 0x21, 0x7e, 0x0e, 0x35, 0x76, 0x19, 0x13, 0x7e, 0x99, 0x85, 0x1d, + 0xa9, 0x44, 0x32, 0xa9, 0xef, 0x5e, 0xc6, 0xc4, 0xe6, 0x2a, 0x7e, 0x01, 0xf5, 0x90, 0xa3, 0x09, + 0x74, 0x3c, 0xe9, 0x2b, 0xa0, 0xbb, 0xb5, 0xeb, 0x5f, 0xed, 0x8a, 0x2d, 0x7c, 0xea, 0x0f, 0x04, + 0xcd, 0x41, 0x1c, 0x7a, 0x8c, 0x98, 0xd4, 0x77, 0x98, 0xc7, 0xb2, 0x74, 0x84, 0xfe, 0x04, 0xc9, + 0x26, 0xd4, 0x53, 0xee, 0x13, 0x2c, 0x0f, 0x7a, 0x88, 0x0a, 0xc2, 0x91, 0xef, 0x00, 0x49, 0x12, + 0x9a, 0x70, 0x9c, 0x86, 0x5d, 0x04, 0x53, 0xcf, 0x53, 0xfb, 0x87, 0xe7, 0x51, 0x77, 0x61, 0xf5, + 0x11, 0xad, 0x18, 0x9c, 0x0c, 0x73, 0x69, 0x16, 0x04, 0x24, 0x4d, 0x39, 0xef, 0xbc, 0x3d, 0x0a, + 0x37, 0x5d, 0x98, 0x13, 0x63, 0xc2, 0x32, 0x2c, 0x9b, 0x87, 0xdd, 0x23, 0xf7, 0x7d, 0x5f, 0x3f, + 0x1a, 0x58, 0x4e, 0x5f, 0xd7, 0x8c, 0x03, 0x43, 0xef, 0x49, 0x15, 0xbc, 0x0a, 0xff, 0x97, 0x8a, + 0x76, 0xf8, 0xae, 0xbf, 0xaf, 0xb9, 0xc6, 0xa1, 0x25, 0x21, 0xdc, 0x04, 0x5c, 0x0a, 0xb6, 0xee, + 0xea, 0x16, 0xcf, 0x57, 0x37, 0x63, 0xbe, 0x89, 0x05, 0x04, 0x6e, 0x41, 0x33, 0x37, 0x39, 0xee, + 0xbe, 0x3b, 0x70, 0xa6, 0x2a, 0x8b, 0x9e, 0x42, 0x73, 0x06, 0x9a, 0xa6, 0xeb, 0x3d, 0xbd, 0x27, + 0x21, 0xbc, 0x02, 0x4b, 0x13, 0xca, 0xc1, 0xbe, 0xf1, 0x56, 0xef, 0x49, 0xd5, 0x51, 0x47, 0x91, + 0xb6, 0x07, 0x96, 0x65, 0x58, 0x6f, 0xa4, 0x99, 0x9d, 0x2b, 0x04, 0x52, 0xb7, 0xf8, 0xcf, 0x3a, + 0xc1, 0x09, 0x09, 0xb3, 0x73, 0x92, 0xe0, 0xd7, 0x50, 0xcb, 0x57, 0x08, 0xaf, 0x96, 0x03, 0x7c, + 0xb8, 0x81, 0x2d, 0xf9, 0xb1, 0x50, 0x4c, 0x4c, 0xad, 0xe0, 0x3e, 0x34, 0xca, 0x71, 0xe2, 0x76, + 0x69, 0xfc, 0xfb, 0x42, 0xb4, 0xd6, 0x9f, 0x36, 0x8c, 0x2a, 0x76, 0xe5, 0xeb, 0x5b, 0x05, 0xdd, + 0xdc, 0x2a, 0xe8, 0xf7, 0xad, 0x82, 0xbe, 0xde, 0x29, 0x95, 0x9b, 0x3b, 0xa5, 0xf2, 0xf3, 0x4e, + 0xa9, 0xf8, 0x75, 0xfe, 0xa9, 0xd8, 0xfd, 0x13, 0x00, 0x00, 0xff, 0xff, 0x6b, 0x64, 0xd3, 0x62, + 0x77, 0x04, 0x00, 0x00, } func (this *CompactionDetail) Compare(that interface{}) int { @@ -798,7 +798,7 @@ var _BackendScheduler_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "pkg/tempopb/backendwork.proto", + Metadata: "backendwork.proto", } func (m *CompactionDetail) Marshal() (dAtA []byte, err error) { diff --git a/pkg/tempopb/common/v1/common.pb.go b/pkg/tempopb/common/v1/common.pb.go index 6afc43229..5125a78a6 100644 --- a/pkg/tempopb/common/v1/common.pb.go +++ b/pkg/tempopb/common/v1/common.pb.go @@ -31,6 +31,7 @@ type AnyValue struct { // in which case this AnyValue is considered to be "empty". // // Types that are valid to be assigned to Value: + // // *AnyValue_StringValue // *AnyValue_BoolValue // *AnyValue_IntValue diff --git a/pkg/tempopb/tempo.pb.go b/pkg/tempopb/tempo.pb.go index 097e1e921..b2821e765 100644 --- a/pkg/tempopb/tempo.pb.go +++ b/pkg/tempopb/tempo.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: pkg/tempopb/tempo.proto +// source: tempo.proto package tempopb @@ -62,7 +62,7 @@ func (x PushErrorReason) String() string { } func (PushErrorReason) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{0} + return fileDescriptor_b334b194b16825ec, []int{0} } type PartialStatus int32 @@ -87,7 +87,7 @@ func (x PartialStatus) String() string { } func (PartialStatus) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{1} + return fileDescriptor_b334b194b16825ec, []int{1} } type DedicatedColumn_Scope int32 @@ -112,7 +112,7 @@ func (x DedicatedColumn_Scope) String() string { } func (DedicatedColumn_Scope) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{5, 0} + return fileDescriptor_b334b194b16825ec, []int{5, 0} } type DedicatedColumn_Type int32 @@ -137,7 +137,7 @@ func (x DedicatedColumn_Type) String() string { } func (DedicatedColumn_Type) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{5, 1} + return fileDescriptor_b334b194b16825ec, []int{5, 1} } type DedicatedColumn_Option int32 @@ -162,7 +162,7 @@ func (x DedicatedColumn_Option) String() string { } func (DedicatedColumn_Option) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{5, 2} + return fileDescriptor_b334b194b16825ec, []int{5, 2} } // Read @@ -180,7 +180,7 @@ func (m *TraceByIDRequest) Reset() { *m = TraceByIDRequest{} } func (m *TraceByIDRequest) String() string { return proto.CompactTextString(m) } func (*TraceByIDRequest) ProtoMessage() {} func (*TraceByIDRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{0} + return fileDescriptor_b334b194b16825ec, []int{0} } func (m *TraceByIDRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -262,7 +262,7 @@ func (m *TraceByIDResponse) Reset() { *m = TraceByIDResponse{} } func (m *TraceByIDResponse) String() string { return proto.CompactTextString(m) } func (*TraceByIDResponse) ProtoMessage() {} func (*TraceByIDResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{1} + return fileDescriptor_b334b194b16825ec, []int{1} } func (m *TraceByIDResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -327,7 +327,7 @@ func (m *TraceByIDMetrics) Reset() { *m = TraceByIDMetrics{} } func (m *TraceByIDMetrics) String() string { return proto.CompactTextString(m) } func (*TraceByIDMetrics) ProtoMessage() {} func (*TraceByIDMetrics) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{2} + return fileDescriptor_b334b194b16825ec, []int{2} } func (m *TraceByIDMetrics) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -383,7 +383,7 @@ func (m *SearchRequest) Reset() { *m = SearchRequest{} } func (m *SearchRequest) String() string { return proto.CompactTextString(m) } func (*SearchRequest) ProtoMessage() {} func (*SearchRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{3} + return fileDescriptor_b334b194b16825ec, []int{3} } func (m *SearchRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -496,7 +496,7 @@ func (m *SearchBlockRequest) Reset() { *m = SearchBlockRequest{} } func (m *SearchBlockRequest) String() string { return proto.CompactTextString(m) } func (*SearchBlockRequest) ProtoMessage() {} func (*SearchBlockRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{4} + return fileDescriptor_b334b194b16825ec, []int{4} } func (m *SearchBlockRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -621,7 +621,7 @@ func (m *DedicatedColumn) Reset() { *m = DedicatedColumn{} } func (m *DedicatedColumn) String() string { return proto.CompactTextString(m) } func (*DedicatedColumn) ProtoMessage() {} func (*DedicatedColumn) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{5} + return fileDescriptor_b334b194b16825ec, []int{5} } func (m *DedicatedColumn) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -687,7 +687,7 @@ func (m *SearchResponse) Reset() { *m = SearchResponse{} } func (m *SearchResponse) String() string { return proto.CompactTextString(m) } func (*SearchResponse) ProtoMessage() {} func (*SearchResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{6} + return fileDescriptor_b334b194b16825ec, []int{6} } func (m *SearchResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -745,7 +745,7 @@ func (m *TraceSearchMetadata) Reset() { *m = TraceSearchMetadata{} } func (m *TraceSearchMetadata) String() string { return proto.CompactTextString(m) } func (*TraceSearchMetadata) ProtoMessage() {} func (*TraceSearchMetadata) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{7} + return fileDescriptor_b334b194b16825ec, []int{7} } func (m *TraceSearchMetadata) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -839,7 +839,7 @@ func (m *ServiceStats) Reset() { *m = ServiceStats{} } func (m *ServiceStats) String() string { return proto.CompactTextString(m) } func (*ServiceStats) ProtoMessage() {} func (*ServiceStats) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{8} + return fileDescriptor_b334b194b16825ec, []int{8} } func (m *ServiceStats) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -892,7 +892,7 @@ func (m *SpanSet) Reset() { *m = SpanSet{} } func (m *SpanSet) String() string { return proto.CompactTextString(m) } func (*SpanSet) ProtoMessage() {} func (*SpanSet) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{9} + return fileDescriptor_b334b194b16825ec, []int{9} } func (m *SpanSet) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -954,7 +954,7 @@ func (m *Span) Reset() { *m = Span{} } func (m *Span) String() string { return proto.CompactTextString(m) } func (*Span) ProtoMessage() {} func (*Span) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{10} + return fileDescriptor_b334b194b16825ec, []int{10} } func (m *Span) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1032,7 +1032,7 @@ func (m *SearchMetrics) Reset() { *m = SearchMetrics{} } func (m *SearchMetrics) String() string { return proto.CompactTextString(m) } func (*SearchMetrics) ProtoMessage() {} func (*SearchMetrics) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{11} + return fileDescriptor_b334b194b16825ec, []int{11} } func (m *SearchMetrics) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1125,7 +1125,7 @@ func (m *SearchTagsRequest) Reset() { *m = SearchTagsRequest{} } func (m *SearchTagsRequest) String() string { return proto.CompactTextString(m) } func (*SearchTagsRequest) ProtoMessage() {} func (*SearchTagsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{12} + return fileDescriptor_b334b194b16825ec, []int{12} } func (m *SearchTagsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1226,7 +1226,7 @@ func (m *SearchTagsBlockRequest) Reset() { *m = SearchTagsBlockRequest{} func (m *SearchTagsBlockRequest) String() string { return proto.CompactTextString(m) } func (*SearchTagsBlockRequest) ProtoMessage() {} func (*SearchTagsBlockRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{13} + return fileDescriptor_b334b194b16825ec, []int{13} } func (m *SearchTagsBlockRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1372,7 +1372,7 @@ func (m *SearchTagValuesBlockRequest) Reset() { *m = SearchTagValuesBloc func (m *SearchTagValuesBlockRequest) String() string { return proto.CompactTextString(m) } func (*SearchTagValuesBlockRequest) ProtoMessage() {} func (*SearchTagValuesBlockRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{14} + return fileDescriptor_b334b194b16825ec, []int{14} } func (m *SearchTagValuesBlockRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1494,7 +1494,7 @@ func (m *SearchTagsResponse) Reset() { *m = SearchTagsResponse{} } func (m *SearchTagsResponse) String() string { return proto.CompactTextString(m) } func (*SearchTagsResponse) ProtoMessage() {} func (*SearchTagsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{15} + return fileDescriptor_b334b194b16825ec, []int{15} } func (m *SearchTagsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1546,7 +1546,7 @@ func (m *SearchTagsV2Response) Reset() { *m = SearchTagsV2Response{} } func (m *SearchTagsV2Response) String() string { return proto.CompactTextString(m) } func (*SearchTagsV2Response) ProtoMessage() {} func (*SearchTagsV2Response) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{16} + return fileDescriptor_b334b194b16825ec, []int{16} } func (m *SearchTagsV2Response) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1598,7 +1598,7 @@ func (m *SearchTagsV2Scope) Reset() { *m = SearchTagsV2Scope{} } func (m *SearchTagsV2Scope) String() string { return proto.CompactTextString(m) } func (*SearchTagsV2Scope) ProtoMessage() {} func (*SearchTagsV2Scope) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{17} + return fileDescriptor_b334b194b16825ec, []int{17} } func (m *SearchTagsV2Scope) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1656,7 +1656,7 @@ func (m *SearchTagValuesRequest) Reset() { *m = SearchTagValuesRequest{} func (m *SearchTagValuesRequest) String() string { return proto.CompactTextString(m) } func (*SearchTagValuesRequest) ProtoMessage() {} func (*SearchTagValuesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{18} + return fileDescriptor_b334b194b16825ec, []int{18} } func (m *SearchTagValuesRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1743,7 +1743,7 @@ func (m *SearchTagValuesResponse) Reset() { *m = SearchTagValuesResponse func (m *SearchTagValuesResponse) String() string { return proto.CompactTextString(m) } func (*SearchTagValuesResponse) ProtoMessage() {} func (*SearchTagValuesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{19} + return fileDescriptor_b334b194b16825ec, []int{19} } func (m *SearchTagValuesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1795,7 +1795,7 @@ func (m *TagValue) Reset() { *m = TagValue{} } func (m *TagValue) String() string { return proto.CompactTextString(m) } func (*TagValue) ProtoMessage() {} func (*TagValue) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{20} + return fileDescriptor_b334b194b16825ec, []int{20} } func (m *TagValue) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1847,7 +1847,7 @@ func (m *SearchTagValuesV2Response) Reset() { *m = SearchTagValuesV2Resp func (m *SearchTagValuesV2Response) String() string { return proto.CompactTextString(m) } func (*SearchTagValuesV2Response) ProtoMessage() {} func (*SearchTagValuesV2Response) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{21} + return fileDescriptor_b334b194b16825ec, []int{21} } func (m *SearchTagValuesV2Response) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1902,7 +1902,7 @@ func (m *MetadataMetrics) Reset() { *m = MetadataMetrics{} } func (m *MetadataMetrics) String() string { return proto.CompactTextString(m) } func (*MetadataMetrics) ProtoMessage() {} func (*MetadataMetrics) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{22} + return fileDescriptor_b334b194b16825ec, []int{22} } func (m *MetadataMetrics) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1974,7 +1974,7 @@ func (m *Trace) Reset() { *m = Trace{} } func (m *Trace) String() string { return proto.CompactTextString(m) } func (*Trace) ProtoMessage() {} func (*Trace) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{23} + return fileDescriptor_b334b194b16825ec, []int{23} } func (m *Trace) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2019,7 +2019,7 @@ func (m *PushResponse) Reset() { *m = PushResponse{} } func (m *PushResponse) String() string { return proto.CompactTextString(m) } func (*PushResponse) ProtoMessage() {} func (*PushResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{24} + return fileDescriptor_b334b194b16825ec, []int{24} } func (m *PushResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2057,7 +2057,8 @@ func (m *PushResponse) GetErrorsByTrace() []PushErrorReason { // PushBytesRequest pushes slices of traces, ids and searchdata. Traces are // encoded using the -// current BatchDecoder in ./pkg/model +// +// current BatchDecoder in ./pkg/model type PushBytesRequest struct { // pre-marshalled Traces. length must match ids Traces []PreallocBytes `protobuf:"bytes,2,rep,name=traces,proto3,customtype=PreallocBytes" json:"traces"` @@ -2072,7 +2073,7 @@ func (m *PushBytesRequest) Reset() { *m = PushBytesRequest{} } func (m *PushBytesRequest) String() string { return proto.CompactTextString(m) } func (*PushBytesRequest) ProtoMessage() {} func (*PushBytesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{25} + return fileDescriptor_b334b194b16825ec, []int{25} } func (m *PushBytesRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2127,7 +2128,7 @@ func (m *PushSpansRequest) Reset() { *m = PushSpansRequest{} } func (m *PushSpansRequest) String() string { return proto.CompactTextString(m) } func (*PushSpansRequest) ProtoMessage() {} func (*PushSpansRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{26} + return fileDescriptor_b334b194b16825ec, []int{26} } func (m *PushSpansRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2179,7 +2180,7 @@ func (m *TraceBytes) Reset() { *m = TraceBytes{} } func (m *TraceBytes) String() string { return proto.CompactTextString(m) } func (*TraceBytes) ProtoMessage() {} func (*TraceBytes) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{27} + return fileDescriptor_b334b194b16825ec, []int{27} } func (m *TraceBytes) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2227,7 +2228,7 @@ func (m *LinkSlice) Reset() { *m = LinkSlice{} } func (m *LinkSlice) String() string { return proto.CompactTextString(m) } func (*LinkSlice) ProtoMessage() {} func (*LinkSlice) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{28} + return fileDescriptor_b334b194b16825ec, []int{28} } func (m *LinkSlice) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2275,7 +2276,7 @@ func (m *SpanMetricsRequest) Reset() { *m = SpanMetricsRequest{} } func (m *SpanMetricsRequest) String() string { return proto.CompactTextString(m) } func (*SpanMetricsRequest) ProtoMessage() {} func (*SpanMetricsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{29} + return fileDescriptor_b334b194b16825ec, []int{29} } func (m *SpanMetricsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2351,7 +2352,7 @@ func (m *SpanMetricsSummaryRequest) Reset() { *m = SpanMetricsSummaryReq func (m *SpanMetricsSummaryRequest) String() string { return proto.CompactTextString(m) } func (*SpanMetricsSummaryRequest) ProtoMessage() {} func (*SpanMetricsSummaryRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{30} + return fileDescriptor_b334b194b16825ec, []int{30} } func (m *SpanMetricsSummaryRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2426,7 +2427,7 @@ func (m *SpanMetricsResponse) Reset() { *m = SpanMetricsResponse{} } func (m *SpanMetricsResponse) String() string { return proto.CompactTextString(m) } func (*SpanMetricsResponse) ProtoMessage() {} func (*SpanMetricsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{31} + return fileDescriptor_b334b194b16825ec, []int{31} } func (m *SpanMetricsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2492,7 +2493,7 @@ func (m *RawHistogram) Reset() { *m = RawHistogram{} } func (m *RawHistogram) String() string { return proto.CompactTextString(m) } func (*RawHistogram) ProtoMessage() {} func (*RawHistogram) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{32} + return fileDescriptor_b334b194b16825ec, []int{32} } func (m *RawHistogram) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2544,7 +2545,7 @@ func (m *KeyValue) Reset() { *m = KeyValue{} } func (m *KeyValue) String() string { return proto.CompactTextString(m) } func (*KeyValue) ProtoMessage() {} func (*KeyValue) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{33} + return fileDescriptor_b334b194b16825ec, []int{33} } func (m *KeyValue) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2597,7 +2598,7 @@ func (m *SpanMetrics) Reset() { *m = SpanMetrics{} } func (m *SpanMetrics) String() string { return proto.CompactTextString(m) } func (*SpanMetrics) ProtoMessage() {} func (*SpanMetrics) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{34} + return fileDescriptor_b334b194b16825ec, []int{34} } func (m *SpanMetrics) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2661,7 +2662,7 @@ func (m *SpanMetricsSummary) Reset() { *m = SpanMetricsSummary{} } func (m *SpanMetricsSummary) String() string { return proto.CompactTextString(m) } func (*SpanMetricsSummary) ProtoMessage() {} func (*SpanMetricsSummary) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{35} + return fileDescriptor_b334b194b16825ec, []int{35} } func (m *SpanMetricsSummary) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2747,7 +2748,7 @@ func (m *SpanMetricsSummaryResponse) Reset() { *m = SpanMetricsSummaryRe func (m *SpanMetricsSummaryResponse) String() string { return proto.CompactTextString(m) } func (*SpanMetricsSummaryResponse) ProtoMessage() {} func (*SpanMetricsSummaryResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{36} + return fileDescriptor_b334b194b16825ec, []int{36} } func (m *SpanMetricsSummaryResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2798,7 +2799,7 @@ func (m *TraceQLStatic) Reset() { *m = TraceQLStatic{} } func (m *TraceQLStatic) String() string { return proto.CompactTextString(m) } func (*TraceQLStatic) ProtoMessage() {} func (*TraceQLStatic) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{37} + return fileDescriptor_b334b194b16825ec, []int{37} } func (m *TraceQLStatic) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2892,7 +2893,7 @@ func (m *SpanMetricsData) Reset() { *m = SpanMetricsData{} } func (m *SpanMetricsData) String() string { return proto.CompactTextString(m) } func (*SpanMetricsData) ProtoMessage() {} func (*SpanMetricsData) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{38} + return fileDescriptor_b334b194b16825ec, []int{38} } func (m *SpanMetricsData) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2945,7 +2946,7 @@ func (m *SpanMetricsResult) Reset() { *m = SpanMetricsResult{} } func (m *SpanMetricsResult) String() string { return proto.CompactTextString(m) } func (*SpanMetricsResult) ProtoMessage() {} func (*SpanMetricsResult) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{39} + return fileDescriptor_b334b194b16825ec, []int{39} } func (m *SpanMetricsResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3006,7 +3007,7 @@ func (m *SpanMetricsResultPoint) Reset() { *m = SpanMetricsResultPoint{} func (m *SpanMetricsResultPoint) String() string { return proto.CompactTextString(m) } func (*SpanMetricsResultPoint) ProtoMessage() {} func (*SpanMetricsResultPoint) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{40} + return fileDescriptor_b334b194b16825ec, []int{40} } func (m *SpanMetricsResultPoint) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3073,7 +3074,7 @@ func (m *QueryInstantRequest) Reset() { *m = QueryInstantRequest{} } func (m *QueryInstantRequest) String() string { return proto.CompactTextString(m) } func (*QueryInstantRequest) ProtoMessage() {} func (*QueryInstantRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{41} + return fileDescriptor_b334b194b16825ec, []int{41} } func (m *QueryInstantRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3134,7 +3135,7 @@ func (m *QueryInstantResponse) Reset() { *m = QueryInstantResponse{} } func (m *QueryInstantResponse) String() string { return proto.CompactTextString(m) } func (*QueryInstantResponse) ProtoMessage() {} func (*QueryInstantResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{42} + return fileDescriptor_b334b194b16825ec, []int{42} } func (m *QueryInstantResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3201,7 +3202,7 @@ func (m *InstantSeries) Reset() { *m = InstantSeries{} } func (m *InstantSeries) String() string { return proto.CompactTextString(m) } func (*InstantSeries) ProtoMessage() {} func (*InstantSeries) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{43} + return fileDescriptor_b334b194b16825ec, []int{43} } func (m *InstantSeries) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3249,8 +3250,8 @@ type QueryRangeRequest struct { Start uint64 `protobuf:"varint,2,opt,name=start,proto3" json:"start,omitempty"` End uint64 `protobuf:"varint,3,opt,name=end,proto3" json:"end,omitempty"` Step uint64 `protobuf:"varint,4,opt,name=step,proto3" json:"step,omitempty"` - //uint32 shardID = 5; // removed - //uint32 shardCount = 6; // removed + // uint32 shardID = 5; // removed + // uint32 shardCount = 6; // removed QueryMode string `protobuf:"bytes,7,opt,name=queryMode,proto3" json:"queryMode,omitempty"` // New RF1 fields BlockID string `protobuf:"bytes,8,opt,name=blockID,proto3" json:"blockID,omitempty"` @@ -3270,7 +3271,7 @@ func (m *QueryRangeRequest) Reset() { *m = QueryRangeRequest{} } func (m *QueryRangeRequest) String() string { return proto.CompactTextString(m) } func (*QueryRangeRequest) ProtoMessage() {} func (*QueryRangeRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{44} + return fileDescriptor_b334b194b16825ec, []int{44} } func (m *QueryRangeRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3415,7 +3416,7 @@ func (m *QueryRangeResponse) Reset() { *m = QueryRangeResponse{} } func (m *QueryRangeResponse) String() string { return proto.CompactTextString(m) } func (*QueryRangeResponse) ProtoMessage() {} func (*QueryRangeResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{45} + return fileDescriptor_b334b194b16825ec, []int{45} } func (m *QueryRangeResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3483,7 +3484,7 @@ func (m *Exemplar) Reset() { *m = Exemplar{} } func (m *Exemplar) String() string { return proto.CompactTextString(m) } func (*Exemplar) ProtoMessage() {} func (*Exemplar) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{46} + return fileDescriptor_b334b194b16825ec, []int{46} } func (m *Exemplar) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3543,7 +3544,7 @@ func (m *Sample) Reset() { *m = Sample{} } func (m *Sample) String() string { return proto.CompactTextString(m) } func (*Sample) ProtoMessage() {} func (*Sample) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{47} + return fileDescriptor_b334b194b16825ec, []int{47} } func (m *Sample) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3600,7 +3601,7 @@ func (m *TimeSeries) Reset() { *m = TimeSeries{} } func (m *TimeSeries) String() string { return proto.CompactTextString(m) } func (*TimeSeries) ProtoMessage() {} func (*TimeSeries) Descriptor() ([]byte, []int) { - return fileDescriptor_f22805646f4f62b6, []int{48} + return fileDescriptor_b334b194b16825ec, []int{48} } func (m *TimeSeries) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3709,204 +3710,203 @@ func init() { proto.RegisterType((*TimeSeries)(nil), "tempopb.TimeSeries") } -func init() { proto.RegisterFile("pkg/tempopb/tempo.proto", fileDescriptor_f22805646f4f62b6) } +func init() { proto.RegisterFile("tempo.proto", fileDescriptor_b334b194b16825ec) } -var fileDescriptor_f22805646f4f62b6 = []byte{ - // 3093 bytes of a gzipped FileDescriptorProto +var fileDescriptor_b334b194b16825ec = []byte{ + // 3087 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x3a, 0xcd, 0x6f, 0x63, 0x57, 0xf5, 0x79, 0xfe, 0xf6, 0xb1, 0x9d, 0x38, 0x37, 0x99, 0xd4, 0xe3, 0x4c, 0x93, 0xfc, 0x5e, 0x47, 0x55, 0x7e, 0xd3, 0xd6, 0xc9, 0xb8, 0x53, 0xd1, 0x69, 0xa1, 0x90, 0x4c, 0xdc, 0x69, 0xda, 0xc4, 0x49, 0xaf, 0xdd, 0xb4, 0xa0, 0x4a, 0xd1, 0x8b, 0x7d, 0xc7, 0xf3, 0x14, 0xfb, 0x3d, 0xf7, 0xbd, 0xeb, 0x34, 0x61, 0x51, 0x21, 0x10, 0x02, 0x24, 0x16, 0x5d, 0xc0, 0x82, 0x7f, 0x00, 0x04, 0x5b, 0x36, 0x6c, 0xd8, 0x80, 0x84, 0x8a, 0x50, 0xa5, 0x4a, 0x6c, 0x2a, 0x16, 0x05, 0xb5, 0x0b, 0xfe, - 0x03, 0xd6, 0xe8, 0x7e, 0xbd, 0x2f, 0x3f, 0x27, 0x33, 0xd3, 0x54, 0xcc, 0xa2, 0x2b, 0xdf, 0x7b, - 0xee, 0xb9, 0xe7, 0x9e, 0x7b, 0xbe, 0xcf, 0x7d, 0x86, 0x27, 0x86, 0xc7, 0xbd, 0x35, 0x4a, 0x06, - 0x43, 0x7b, 0x78, 0x24, 0x7e, 0x6b, 0x43, 0xc7, 0xa6, 0x36, 0xca, 0x4a, 0x60, 0x75, 0xa1, 0x63, - 0x0f, 0x06, 0xb6, 0xb5, 0x76, 0x72, 0x73, 0x4d, 0x8c, 0x04, 0x42, 0xf5, 0xb9, 0x9e, 0x49, 0xef, - 0x8f, 0x8e, 0x6a, 0x1d, 0x7b, 0xb0, 0xd6, 0xb3, 0x7b, 0xf6, 0x1a, 0x07, 0x1f, 0x8d, 0xee, 0xf1, - 0x19, 0x9f, 0xf0, 0x91, 0x44, 0x9f, 0xa7, 0x8e, 0xd1, 0x21, 0x8c, 0x0a, 0x1f, 0x48, 0xe8, 0x72, - 0xcf, 0xb6, 0x7b, 0x7d, 0xe2, 0xef, 0xa5, 0xe6, 0x80, 0xb8, 0xd4, 0x18, 0x0c, 0x05, 0x82, 0xfe, - 0x1f, 0x0d, 0xca, 0x6d, 0xb6, 0x61, 0xf3, 0x6c, 0x7b, 0x0b, 0x93, 0xf7, 0x46, 0xc4, 0xa5, 0xa8, - 0x02, 0x59, 0x4e, 0x64, 0x7b, 0xab, 0xa2, 0xad, 0x68, 0xab, 0x45, 0xac, 0xa6, 0x68, 0x09, 0xe0, - 0xa8, 0x6f, 0x77, 0x8e, 0x5b, 0xd4, 0x70, 0x68, 0x25, 0xb1, 0xa2, 0xad, 0xe6, 0x71, 0x00, 0x82, - 0xaa, 0x90, 0xe3, 0xb3, 0x86, 0xd5, 0xad, 0x24, 0xf9, 0xaa, 0x37, 0x47, 0xd7, 0x20, 0xff, 0xde, - 0x88, 0x38, 0x67, 0xbb, 0x76, 0x97, 0x54, 0xd2, 0x7c, 0xd1, 0x07, 0xa0, 0x67, 0x61, 0xd6, 0xe8, - 0xf7, 0xed, 0xf7, 0xf7, 0x0d, 0x87, 0x9a, 0x46, 0x9f, 0xf3, 0x54, 0xc9, 0xac, 0x68, 0xab, 0x39, - 0x3c, 0xbe, 0x80, 0xbe, 0x03, 0x39, 0xfc, 0xea, 0xcd, 0x8d, 0x7b, 0x94, 0x38, 0x95, 0xec, 0x8a, - 0xb6, 0x5a, 0xa8, 0x57, 0x6b, 0xe2, 0xaa, 0x35, 0x75, 0xd5, 0x5a, 0x5b, 0x5d, 0x75, 0x33, 0xf7, - 0xd1, 0x67, 0xcb, 0x53, 0x1f, 0xfe, 0x73, 0x59, 0xc3, 0xde, 0x2e, 0xfd, 0x0f, 0x1a, 0xcc, 0x06, - 0x2e, 0xee, 0x0e, 0x6d, 0xcb, 0x25, 0xe8, 0x3a, 0xa4, 0xf9, 0x55, 0xf9, 0xbd, 0x0b, 0xf5, 0xe9, - 0x9a, 0xd4, 0x52, 0x8d, 0xa3, 0x62, 0xb1, 0x88, 0x9e, 0x87, 0xec, 0x80, 0x50, 0xc7, 0xec, 0xb8, - 0x5c, 0x04, 0x85, 0xfa, 0xd5, 0x30, 0x1e, 0x23, 0xb9, 0x2b, 0x10, 0xb0, 0xc2, 0x44, 0x35, 0xc8, - 0xb8, 0xd4, 0xa0, 0x23, 0x97, 0x0b, 0x66, 0xba, 0xbe, 0xe0, 0xed, 0x91, 0x37, 0x6b, 0xf1, 0x55, - 0x2c, 0xb1, 0x98, 0x12, 0x06, 0xc4, 0x75, 0x8d, 0x1e, 0xa9, 0xa4, 0xb8, 0xb0, 0xd4, 0x54, 0x7f, - 0x29, 0xa0, 0x32, 0x79, 0x0c, 0x7a, 0x1a, 0xa6, 0x4d, 0xcb, 0x1d, 0x92, 0x0e, 0x25, 0xdd, 0xcd, - 0x33, 0x4a, 0x5c, 0x7e, 0x83, 0x14, 0x8e, 0x40, 0xf5, 0x0f, 0x93, 0x50, 0x6a, 0x11, 0xc3, 0xe9, - 0xdc, 0x57, 0xca, 0x7e, 0x09, 0x52, 0x6d, 0xa3, 0xc7, 0xf0, 0x93, 0xab, 0x85, 0xfa, 0x8a, 0xc7, - 0x55, 0x08, 0xab, 0xc6, 0x50, 0x1a, 0x16, 0x75, 0xce, 0x36, 0x53, 0x4c, 0x98, 0x98, 0xef, 0x41, - 0xd7, 0xa1, 0xb4, 0x6b, 0x5a, 0x5b, 0x23, 0xc7, 0xa0, 0xa6, 0x6d, 0xed, 0x0a, 0x71, 0x94, 0x70, - 0x18, 0xc8, 0xb1, 0x8c, 0xd3, 0x00, 0x56, 0x52, 0x62, 0x05, 0x81, 0x68, 0x1e, 0xd2, 0x3b, 0xe6, - 0xc0, 0xa4, 0xfc, 0xb6, 0x25, 0x2c, 0x26, 0x0c, 0xea, 0x72, 0x5b, 0x4b, 0x0b, 0x28, 0x9f, 0xa0, - 0x32, 0x24, 0x89, 0xd5, 0xe5, 0xe6, 0x51, 0xc2, 0x6c, 0xc8, 0xf0, 0xde, 0x64, 0xb6, 0x54, 0xc9, - 0x71, 0x59, 0x89, 0x09, 0x5a, 0x85, 0x99, 0xd6, 0xd0, 0xb0, 0xdc, 0x7d, 0xe2, 0xb0, 0xdf, 0x16, - 0xa1, 0x95, 0x3c, 0xdf, 0x13, 0x05, 0x87, 0x0c, 0x0a, 0x1e, 0xc5, 0xa0, 0xaa, 0xdf, 0x80, 0xbc, - 0x27, 0x24, 0xc6, 0xe0, 0x31, 0x39, 0xe3, 0x3a, 0xc8, 0x63, 0x36, 0x64, 0x0c, 0x9e, 0x18, 0xfd, - 0x11, 0x91, 0x4e, 0x23, 0x26, 0x2f, 0x25, 0x5e, 0xd4, 0xf4, 0xbf, 0x24, 0x01, 0x09, 0x61, 0x6f, - 0x32, 0x57, 0x51, 0x7a, 0xb9, 0x05, 0x79, 0x57, 0xa9, 0x40, 0x9a, 0xe3, 0x42, 0xbc, 0x72, 0xb0, - 0x8f, 0xc8, 0xac, 0x86, 0x3b, 0xdc, 0xf6, 0x96, 0x3c, 0x48, 0x4d, 0x99, 0xfb, 0x71, 0xe1, 0xed, - 0x33, 0x8b, 0x12, 0x1a, 0xf0, 0x01, 0x4c, 0x47, 0x43, 0xa3, 0x47, 0xdc, 0xb6, 0x2d, 0x48, 0x4b, - 0x2d, 0x84, 0x81, 0xcc, 0xbd, 0x89, 0xd5, 0xb1, 0xbb, 0xa6, 0xd5, 0x93, 0x1e, 0xec, 0xcd, 0x19, - 0x05, 0xd3, 0xea, 0x92, 0x53, 0x46, 0xae, 0x65, 0x7e, 0x9f, 0x48, 0xed, 0x84, 0x81, 0x48, 0x87, - 0x22, 0xb5, 0xa9, 0xd1, 0xc7, 0xa4, 0x63, 0x3b, 0x5d, 0x97, 0x3b, 0x6f, 0x09, 0x87, 0x60, 0x0c, - 0xa7, 0x6b, 0x50, 0xa3, 0xa1, 0x4e, 0x12, 0x2a, 0x0d, 0xc1, 0xd8, 0x3d, 0x4f, 0x88, 0xe3, 0x9a, - 0xb6, 0xc5, 0x35, 0x9a, 0xc7, 0x6a, 0x8a, 0x10, 0xa4, 0x5c, 0x76, 0x3c, 0x70, 0xfb, 0xe7, 0x63, - 0x16, 0xb6, 0xee, 0xd9, 0x36, 0x25, 0x0e, 0x67, 0xac, 0xc0, 0xcf, 0x0c, 0x40, 0xd0, 0x16, 0x94, - 0xbb, 0xa4, 0x6b, 0x76, 0x0c, 0x4a, 0xba, 0x77, 0xec, 0xfe, 0x68, 0x60, 0xb9, 0x95, 0x22, 0xf7, - 0x87, 0x8a, 0x27, 0xf2, 0xad, 0x30, 0x02, 0x1e, 0xdb, 0xa1, 0xff, 0x3a, 0x01, 0x33, 0x11, 0x2c, - 0x74, 0x0b, 0xd2, 0x6e, 0xc7, 0x1e, 0x12, 0xe9, 0xf4, 0x4b, 0x93, 0xc8, 0xd5, 0x5a, 0x0c, 0x0b, - 0x0b, 0x64, 0x76, 0x07, 0xcb, 0x18, 0x28, 0x5b, 0xe1, 0x63, 0x74, 0x13, 0x52, 0xf4, 0x6c, 0x28, - 0x22, 0xd3, 0x74, 0xfd, 0xc9, 0x89, 0x84, 0xda, 0x67, 0x43, 0x82, 0x39, 0x2a, 0xba, 0x0d, 0x59, - 0x7b, 0xc8, 0xdc, 0xcb, 0xe5, 0xea, 0x9c, 0xae, 0x2f, 0x4f, 0xdc, 0xb5, 0xc7, 0xf1, 0xb0, 0xc2, - 0xd7, 0x97, 0x21, 0xcd, 0x39, 0x42, 0x39, 0x48, 0xb5, 0xf6, 0x37, 0x9a, 0xe5, 0x29, 0x54, 0x84, - 0x1c, 0x6e, 0xb4, 0xf6, 0xde, 0xc2, 0x77, 0x1a, 0x65, 0x4d, 0x5f, 0x84, 0x14, 0x3b, 0x09, 0x01, - 0x64, 0x5a, 0x6d, 0xbc, 0xdd, 0xbc, 0x5b, 0x9e, 0x42, 0x59, 0x48, 0x6e, 0x37, 0xdb, 0x65, 0x4d, - 0x7f, 0x12, 0x32, 0x82, 0x20, 0xdb, 0xde, 0xdc, 0x6b, 0x36, 0xca, 0x53, 0x28, 0x0f, 0xe9, 0x0d, - 0x8c, 0x37, 0xbe, 0x5b, 0xd6, 0xf4, 0x53, 0x98, 0x56, 0x06, 0x2c, 0xe3, 0xee, 0x2d, 0xc8, 0xf0, - 0xd0, 0xaa, 0xc2, 0xd0, 0xb5, 0x70, 0x40, 0x15, 0xd8, 0xbb, 0x84, 0x1a, 0xcc, 0x08, 0xb0, 0xc4, - 0x45, 0xeb, 0xd1, 0x38, 0x1c, 0x75, 0x90, 0x68, 0x10, 0xd6, 0xff, 0x9e, 0x84, 0xb9, 0x18, 0x8a, - 0xd1, 0x8c, 0x97, 0xf7, 0x33, 0xde, 0x2a, 0xcc, 0x38, 0xb6, 0x4d, 0x5b, 0xc4, 0x39, 0x31, 0x3b, - 0xa4, 0xe9, 0x6b, 0x25, 0x0a, 0x66, 0x0e, 0xc0, 0x40, 0x9c, 0x3c, 0xc7, 0x13, 0x09, 0x30, 0x0c, - 0x64, 0x79, 0x8e, 0x7b, 0x1d, 0x0b, 0x26, 0x6f, 0x59, 0xe6, 0x69, 0xd3, 0xb0, 0x6c, 0xae, 0x9d, - 0x14, 0x1e, 0x5f, 0x60, 0x86, 0xdb, 0xf5, 0xe3, 0xa6, 0x88, 0x81, 0x01, 0x08, 0xba, 0x01, 0x59, - 0x57, 0x06, 0xb6, 0x0c, 0x97, 0x40, 0xd9, 0x97, 0x80, 0x80, 0x63, 0x85, 0x80, 0x9e, 0x85, 0x9c, - 0x1c, 0x32, 0xb7, 0x4b, 0xc6, 0x22, 0x7b, 0x18, 0x08, 0x43, 0xd1, 0x15, 0x97, 0x63, 0x79, 0xc9, - 0xad, 0xe4, 0xf8, 0x8e, 0xda, 0x79, 0x7a, 0xa9, 0xb5, 0x02, 0x1b, 0x78, 0x1c, 0xc4, 0x21, 0x1a, - 0xd5, 0x03, 0x98, 0x1d, 0x43, 0x89, 0x09, 0x95, 0xcf, 0x04, 0x43, 0x65, 0xa1, 0x7e, 0x25, 0xa0, - 0x54, 0x7f, 0x73, 0x30, 0x82, 0xee, 0x40, 0x31, 0xb8, 0xc4, 0x43, 0xdd, 0xd0, 0xb0, 0xee, 0xd8, - 0x23, 0x8b, 0x72, 0xc2, 0x2c, 0xd4, 0x29, 0x00, 0x93, 0x29, 0x71, 0x1c, 0xdb, 0x11, 0xcb, 0x22, - 0x63, 0x05, 0x20, 0xfa, 0x8f, 0x35, 0xc8, 0xaa, 0xb4, 0xf0, 0x14, 0xa4, 0xd9, 0x46, 0x65, 0x96, - 0xa5, 0x90, 0xc0, 0xb0, 0x58, 0xe3, 0x99, 0xda, 0xa0, 0x9d, 0xfb, 0xa4, 0x2b, 0xa9, 0xa9, 0x29, - 0x7a, 0x19, 0xc0, 0xa0, 0xd4, 0x31, 0x8f, 0x46, 0x2c, 0x23, 0x27, 0x39, 0x8d, 0x45, 0x8f, 0x86, - 0x2c, 0xf7, 0x4e, 0x6e, 0xd6, 0xde, 0x20, 0x67, 0x07, 0xec, 0x36, 0x38, 0x80, 0xae, 0xff, 0x59, - 0x83, 0x14, 0x3b, 0x06, 0x2d, 0x40, 0x86, 0x1d, 0xe4, 0xd9, 0xa6, 0x9c, 0xc5, 0x46, 0x89, 0x58, - 0xf3, 0x4a, 0x4e, 0x32, 0xaf, 0xeb, 0x50, 0x52, 0xc6, 0xc4, 0xe6, 0xae, 0x34, 0xc4, 0x30, 0x30, - 0x72, 0x8b, 0xf4, 0xc3, 0xdd, 0xe2, 0x57, 0x09, 0x55, 0x70, 0xa8, 0x52, 0x65, 0x15, 0x66, 0xbc, - 0xa2, 0xa4, 0xad, 0x9c, 0x9e, 0x27, 0xe5, 0x08, 0x38, 0xa6, 0xa8, 0x49, 0xc4, 0x15, 0x35, 0x68, - 0x05, 0x0a, 0x3c, 0x81, 0xf0, 0xfc, 0xa9, 0xca, 0x8b, 0x20, 0x88, 0x5d, 0xb4, 0x63, 0x0f, 0x86, - 0x7d, 0x42, 0x49, 0xf7, 0x75, 0xfb, 0xc8, 0x55, 0xe9, 0x2d, 0x04, 0x64, 0x76, 0xc3, 0x37, 0x71, - 0x0c, 0xe1, 0x6c, 0x3e, 0x80, 0xf1, 0xed, 0x93, 0x14, 0xec, 0x64, 0x38, 0x3b, 0x51, 0x70, 0x88, - 0x6f, 0x5e, 0x68, 0xf0, 0x34, 0x17, 0xe4, 0x9b, 0x43, 0xf5, 0x9f, 0x24, 0x98, 0x43, 0x30, 0xd9, - 0xb0, 0xca, 0x41, 0x25, 0xfe, 0x79, 0x95, 0x32, 0x84, 0xb6, 0x65, 0x4a, 0x98, 0x87, 0x34, 0x2f, - 0x96, 0x55, 0xfd, 0xc0, 0x27, 0x7e, 0x79, 0x94, 0x8c, 0x29, 0x8f, 0x52, 0x7e, 0x79, 0xb4, 0x0a, - 0x33, 0x03, 0xe3, 0x94, 0x9d, 0xc2, 0x6a, 0x1e, 0x4e, 0x5d, 0xdc, 0x2f, 0x0a, 0x46, 0x75, 0x98, - 0x77, 0xa9, 0xd1, 0x27, 0x5c, 0x93, 0x6e, 0xfb, 0xbe, 0x43, 0xdc, 0xfb, 0x76, 0x5f, 0xd5, 0x5a, - 0xb1, 0x6b, 0x97, 0x50, 0x8d, 0xff, 0x2e, 0x05, 0x0b, 0xbe, 0x24, 0x42, 0x75, 0xd0, 0x8b, 0xe3, - 0x75, 0x50, 0x35, 0x12, 0xe6, 0x03, 0xd2, 0xfb, 0xba, 0x16, 0x7a, 0x2c, 0x6a, 0xa1, 0x38, 0x83, - 0x2b, 0xc5, 0x1b, 0xdc, 0x3a, 0xcc, 0xf9, 0x46, 0xe5, 0xdb, 0xdb, 0x34, 0xc7, 0x8e, 0x5b, 0xd2, - 0x3f, 0x4d, 0xc2, 0xa2, 0xa7, 0x78, 0x61, 0x8b, 0x21, 0x8b, 0xf9, 0xd6, 0xb8, 0xc5, 0x2c, 0x8f, - 0x5b, 0x8c, 0xd8, 0xf8, 0xb5, 0xd9, 0x3c, 0x56, 0x25, 0x74, 0x57, 0xb5, 0x42, 0xc2, 0xa5, 0x65, - 0x75, 0x58, 0x85, 0x1c, 0x35, 0x7a, 0xac, 0x7c, 0x12, 0x89, 0x38, 0x8f, 0xbd, 0x39, 0xaa, 0x47, - 0x6b, 0x40, 0xff, 0x38, 0x55, 0x97, 0x8c, 0x55, 0x81, 0x1f, 0xc0, 0xbc, 0x7f, 0xca, 0x41, 0xdd, - 0x3b, 0xa7, 0x0e, 0x19, 0x1e, 0x6c, 0x55, 0xba, 0x8f, 0x8b, 0x33, 0x07, 0x75, 0x51, 0xa9, 0x4b, - 0xcc, 0x47, 0x3a, 0xff, 0xe5, 0x60, 0xd8, 0x97, 0x04, 0xbd, 0x6c, 0xae, 0x05, 0xb2, 0x39, 0x82, - 0x14, 0x65, 0xbd, 0x79, 0x82, 0x5f, 0x9a, 0x8f, 0xf5, 0x9f, 0x26, 0x02, 0xa1, 0x32, 0x64, 0xc4, - 0xbc, 0x8a, 0x15, 0x72, 0xf1, 0xaa, 0x58, 0x31, 0xbd, 0x28, 0x7b, 0xa4, 0x62, 0xb2, 0x47, 0xda, - 0xcf, 0x1e, 0x3a, 0x14, 0x85, 0xd7, 0x8a, 0xe3, 0xa4, 0x59, 0x86, 0x60, 0x93, 0xdc, 0x38, 0x3b, - 0xd1, 0x8d, 0x43, 0x59, 0x23, 0xf7, 0x48, 0x59, 0xe3, 0x18, 0x9e, 0x18, 0x93, 0x84, 0x54, 0x25, - 0x4b, 0xe5, 0x1e, 0xbf, 0xc2, 0x66, 0x7c, 0xc0, 0x23, 0x29, 0xed, 0x16, 0xe4, 0xd4, 0x31, 0x5c, - 0x2f, 0x67, 0x5e, 0x86, 0x16, 0xcd, 0x56, 0x6c, 0x83, 0xaf, 0xff, 0x40, 0x83, 0xab, 0x11, 0x1e, - 0x03, 0x06, 0xb7, 0x16, 0xe5, 0xb2, 0x50, 0x9f, 0xf5, 0x2b, 0x6c, 0xb9, 0xf2, 0x65, 0x19, 0xff, - 0xab, 0x06, 0x33, 0x91, 0xc5, 0x07, 0x7d, 0x2e, 0x0a, 0x57, 0x44, 0x89, 0x68, 0x45, 0x34, 0x56, - 0x55, 0x25, 0xe3, 0xaa, 0xaa, 0x48, 0x75, 0x96, 0x1a, 0xaf, 0xce, 0x62, 0x2a, 0xab, 0x74, 0x6c, - 0x65, 0xa5, 0x37, 0x21, 0x2d, 0x1e, 0x00, 0x1b, 0x50, 0x72, 0x88, 0x6b, 0x8f, 0x9c, 0x0e, 0x69, - 0x05, 0x0a, 0x74, 0x3f, 0xce, 0x8b, 0x57, 0xd0, 0x93, 0x9b, 0x35, 0x1c, 0x44, 0xc3, 0xe1, 0x5d, - 0x7a, 0x13, 0x8a, 0xfb, 0x23, 0xd7, 0xef, 0x43, 0x5f, 0x81, 0x12, 0xef, 0x04, 0xdc, 0xcd, 0xb3, - 0xb6, 0x7c, 0x07, 0x4c, 0xae, 0x4e, 0x07, 0xa4, 0xcc, 0xb0, 0x1b, 0x0c, 0x03, 0x13, 0xc3, 0xb5, - 0x2d, 0x1c, 0x46, 0xd7, 0x7f, 0xa6, 0x41, 0x99, 0xa1, 0x70, 0x6e, 0x95, 0x5b, 0x3e, 0xe7, 0x35, - 0xb7, 0xcc, 0x8f, 0x8b, 0x9b, 0x57, 0x98, 0x29, 0xff, 0xe3, 0xb3, 0xe5, 0xd2, 0xbe, 0x43, 0x8c, - 0x7e, 0xdf, 0xee, 0x08, 0x6c, 0xd5, 0xd5, 0x96, 0x21, 0x69, 0x76, 0x45, 0xb7, 0x50, 0xc4, 0x6c, - 0x88, 0x6e, 0xc1, 0x15, 0xf7, 0xd8, 0x1c, 0x4a, 0xe5, 0xdd, 0x25, 0x16, 0x11, 0xe5, 0x39, 0x97, - 0x52, 0x0e, 0xc7, 0x2f, 0xea, 0x3f, 0x92, 0xbc, 0x88, 0x8b, 0x4b, 0x5e, 0x6e, 0x43, 0xf6, 0x88, - 0x37, 0x27, 0x0f, 0x2c, 0x31, 0x85, 0x3f, 0x99, 0x8b, 0xc4, 0x79, 0x5c, 0x5c, 0x07, 0x90, 0x8f, - 0x95, 0xcc, 0x9e, 0x16, 0x42, 0x7d, 0x7e, 0x51, 0xdd, 0x59, 0x7f, 0x05, 0xf2, 0x3b, 0xa6, 0x75, - 0xdc, 0xea, 0x9b, 0x1d, 0x82, 0x6e, 0x42, 0xba, 0x6f, 0x5a, 0xc7, 0x8a, 0xc3, 0xc5, 0x71, 0x0e, - 0x19, 0x67, 0x35, 0xb6, 0x01, 0x0b, 0x4c, 0xfd, 0x87, 0x1a, 0x20, 0x06, 0x54, 0xc6, 0xef, 0x97, - 0xd2, 0x22, 0xec, 0x69, 0xc1, 0xb0, 0x57, 0x81, 0x6c, 0xcf, 0xb1, 0x47, 0xc3, 0x4d, 0x15, 0x0e, - 0xd5, 0x94, 0xe1, 0xf7, 0xf9, 0x1b, 0xa4, 0xe8, 0x98, 0xc4, 0xe4, 0x41, 0xc3, 0x24, 0x53, 0xfe, - 0xd5, 0x00, 0x13, 0xad, 0xd1, 0x60, 0x60, 0x38, 0x67, 0xff, 0x1b, 0x5e, 0x7e, 0xab, 0xc1, 0x5c, - 0x48, 0x20, 0x7e, 0x5c, 0x24, 0x2e, 0x35, 0x07, 0x2c, 0xe9, 0x72, 0x4e, 0x72, 0xd8, 0x07, 0x84, - 0x1b, 0x67, 0xd1, 0x6b, 0x05, 0x1a, 0xe7, 0xa7, 0x61, 0x9a, 0x5b, 0x7b, 0xcb, 0x43, 0x11, 0xac, - 0x45, 0xa0, 0xa8, 0xe6, 0x07, 0xa9, 0x14, 0xd7, 0xe0, 0x7c, 0xa8, 0x6d, 0x1e, 0x0b, 0x50, 0xdf, - 0x84, 0x22, 0x36, 0xde, 0x7f, 0xcd, 0x74, 0xa9, 0xdd, 0x73, 0x8c, 0x01, 0x33, 0x92, 0xa3, 0x51, - 0xe7, 0x98, 0x50, 0x19, 0x94, 0xe4, 0x8c, 0xdd, 0xbd, 0x13, 0xe0, 0x4c, 0x4c, 0xf4, 0xd7, 0x21, - 0xa7, 0x1a, 0xcf, 0x98, 0xb7, 0x84, 0x67, 0xc3, 0x6f, 0x09, 0x0b, 0xe1, 0xf7, 0x8b, 0x37, 0x77, - 0x5a, 0xd4, 0xa0, 0x66, 0x47, 0x45, 0xeb, 0x5f, 0x68, 0x50, 0x08, 0xb0, 0x88, 0x36, 0x61, 0xb6, - 0x6f, 0x50, 0x62, 0x75, 0xce, 0x0e, 0xef, 0x2b, 0xf6, 0xa4, 0x55, 0xfa, 0xaf, 0x12, 0x41, 0xde, - 0x71, 0x59, 0xe2, 0xfb, 0xb7, 0xf9, 0x7f, 0xc8, 0xb8, 0xc4, 0x31, 0xa5, 0xf7, 0x07, 0x03, 0xbc, - 0xd7, 0x2f, 0x4b, 0x04, 0x76, 0x71, 0x11, 0x4e, 0xa4, 0x60, 0xe5, 0x4c, 0xff, 0x38, 0x6c, 0xdd, - 0xd2, 0xb0, 0xc6, 0x9f, 0x39, 0x2e, 0xd0, 0x56, 0x22, 0x56, 0x5b, 0x3e, 0x7f, 0xc9, 0x8b, 0xf8, - 0x2b, 0x43, 0x72, 0x78, 0xfb, 0xb6, 0x7c, 0x24, 0x60, 0x43, 0x01, 0x79, 0x41, 0x46, 0x6b, 0x36, - 0x14, 0x90, 0x75, 0xd9, 0x19, 0xb3, 0x21, 0x87, 0xbc, 0xb0, 0x2e, 0x5b, 0x60, 0x36, 0xd4, 0xdf, - 0x86, 0x6a, 0x9c, 0x9f, 0x48, 0x13, 0xbd, 0x0d, 0x79, 0x97, 0x83, 0x4c, 0x32, 0x1e, 0x02, 0x62, - 0xf6, 0xf9, 0xd8, 0xfa, 0x2f, 0x35, 0x28, 0x85, 0x14, 0x1b, 0xca, 0xd4, 0x69, 0x99, 0xa9, 0x8b, - 0xa0, 0x89, 0xa0, 0x95, 0xc4, 0x9a, 0xc5, 0x66, 0xf7, 0xb8, 0xbc, 0x35, 0xac, 0xdd, 0x63, 0x33, - 0x57, 0x7e, 0x6f, 0xd1, 0x5c, 0x36, 0x3b, 0x92, 0x41, 0x56, 0x3b, 0x62, 0xb3, 0xae, 0xbc, 0x98, - 0xd6, 0xe5, 0xaf, 0x32, 0xe2, 0x7b, 0x4e, 0x96, 0xd3, 0x56, 0xdf, 0x6d, 0x10, 0xa4, 0x8e, 0x4d, - 0xab, 0xcb, 0x4b, 0x9a, 0x34, 0xe6, 0x63, 0x9d, 0x88, 0xef, 0x10, 0x92, 0xf1, 0x2d, 0x83, 0x1a, - 0xac, 0x9e, 0x76, 0x88, 0x3b, 0xea, 0xd3, 0xb6, 0x5f, 0x48, 0x04, 0x20, 0xac, 0x16, 0x15, 0x33, - 0x69, 0x36, 0xd5, 0x58, 0x1f, 0xe2, 0x18, 0x58, 0x62, 0xb2, 0x28, 0x38, 0x3b, 0xb6, 0xca, 0xcc, - 0xa4, 0x6f, 0x1c, 0x91, 0x7e, 0xa0, 0x2e, 0xf4, 0x01, 0x8c, 0x0f, 0x3e, 0x39, 0x08, 0xd4, 0x2e, - 0x01, 0x08, 0x5a, 0x83, 0x04, 0x55, 0xa6, 0xb1, 0x3c, 0x99, 0x87, 0x7d, 0xdb, 0xb4, 0x28, 0x4e, - 0x50, 0x97, 0xf9, 0xd0, 0x42, 0xfc, 0x32, 0x57, 0x86, 0x29, 0x99, 0x28, 0x61, 0x3e, 0x66, 0xd6, - 0x71, 0x62, 0xf4, 0xf9, 0xc1, 0x1a, 0x66, 0x43, 0x56, 0x0d, 0x90, 0x53, 0x32, 0x18, 0xf6, 0x0d, - 0xa7, 0x2d, 0xdf, 0x64, 0x93, 0xfc, 0x2b, 0x64, 0x14, 0x8c, 0x6e, 0x40, 0x59, 0x81, 0xd4, 0x87, - 0x24, 0x69, 0x9c, 0x63, 0x70, 0xbd, 0x05, 0x73, 0xfc, 0x9b, 0xd0, 0xb6, 0xe5, 0x52, 0xc3, 0xa2, - 0xe7, 0x47, 0x65, 0x2f, 0xca, 0xca, 0x48, 0x13, 0x8a, 0xb2, 0xc2, 0x37, 0x79, 0x94, 0xfd, 0x93, - 0x06, 0xf3, 0x61, 0xaa, 0xd2, 0x86, 0x6b, 0x9e, 0x53, 0x09, 0x03, 0xf6, 0xe3, 0x8e, 0xc4, 0x6c, - 0xf1, 0x55, 0xcf, 0xb3, 0x1e, 0xfa, 0x25, 0xfb, 0x12, 0x3f, 0x27, 0xba, 0x50, 0x0a, 0x31, 0x85, - 0x6e, 0x43, 0x86, 0x1b, 0xc0, 0xb8, 0xf7, 0x8d, 0xbf, 0xf5, 0xc9, 0xcf, 0x81, 0x72, 0x43, 0xb8, - 0x08, 0xd6, 0x64, 0x58, 0x7d, 0x3d, 0x95, 0x4b, 0x96, 0x53, 0xb8, 0x30, 0x74, 0xec, 0xc1, 0xa1, - 0x40, 0xd4, 0x3f, 0x4e, 0xc2, 0x2c, 0x97, 0x1c, 0x36, 0xac, 0x1e, 0xb9, 0x14, 0x6d, 0xf0, 0xb6, - 0x95, 0x92, 0xa1, 0x34, 0x01, 0x3e, 0x0e, 0x7f, 0x74, 0xce, 0x46, 0x3f, 0x3a, 0x07, 0x5a, 0xfd, - 0xdc, 0x39, 0xad, 0x7e, 0xfe, 0xc2, 0x56, 0x1f, 0xe2, 0x5a, 0xfd, 0x40, 0x83, 0x5d, 0x08, 0x37, - 0xd8, 0xc1, 0x47, 0x80, 0x62, 0xe4, 0x11, 0x40, 0x35, 0xdf, 0xa5, 0x89, 0xcd, 0xf7, 0xf4, 0x03, - 0x35, 0xdf, 0x33, 0x0f, 0xfd, 0x66, 0xc3, 0x6a, 0x03, 0xe9, 0x36, 0x6e, 0xa5, 0x2c, 0xee, 0xec, - 0x01, 0xd8, 0xea, 0xc0, 0x38, 0x15, 0x26, 0x52, 0x99, 0x15, 0xab, 0x1e, 0x40, 0xff, 0xa3, 0x06, - 0x28, 0xa8, 0x4f, 0xe9, 0x07, 0xcf, 0x44, 0xfc, 0x60, 0xce, 0xcf, 0xbf, 0xe6, 0x80, 0x3c, 0x46, - 0x4e, 0xf0, 0x01, 0xe4, 0x1a, 0xf2, 0xaa, 0x97, 0x6e, 0xff, 0xe8, 0xff, 0xa0, 0xe8, 0xfd, 0xef, - 0xe2, 0x70, 0x20, 0x98, 0x4d, 0xe2, 0x82, 0x07, 0xdb, 0x75, 0xf5, 0x0d, 0xc8, 0xb4, 0x0c, 0xd6, - 0x35, 0x8d, 0x21, 0x27, 0xc6, 0x90, 0xfd, 0x53, 0xb4, 0xc0, 0x29, 0x2c, 0x18, 0x81, 0x2f, 0xd5, - 0x2f, 0x73, 0x8b, 0x35, 0xc8, 0xba, 0x9c, 0x19, 0x55, 0xb3, 0xcc, 0xf8, 0x8a, 0xe0, 0x70, 0x89, - 0xaf, 0xb0, 0xd0, 0x0b, 0x41, 0xcb, 0x49, 0x45, 0xca, 0x08, 0x25, 0x57, 0xb9, 0xc9, 0xc7, 0x8c, - 0x89, 0x0b, 0x37, 0xde, 0x85, 0x99, 0x48, 0x8b, 0x85, 0x8a, 0x90, 0x6b, 0xee, 0x1d, 0x36, 0x30, - 0xde, 0xc3, 0xe5, 0x29, 0x34, 0x07, 0x33, 0xbb, 0x1b, 0xef, 0x1c, 0xee, 0x6c, 0x1f, 0x34, 0x0e, - 0xdb, 0x78, 0xe3, 0x4e, 0xa3, 0x55, 0xd6, 0x18, 0x90, 0x8f, 0x0f, 0xdb, 0x7b, 0x7b, 0x87, 0x3b, - 0x1b, 0xf8, 0x6e, 0xa3, 0x9c, 0x40, 0xb3, 0x50, 0x7a, 0xab, 0xf9, 0x46, 0x73, 0xef, 0xed, 0xa6, - 0xdc, 0x9c, 0xbc, 0x71, 0x03, 0x4a, 0x21, 0xc3, 0x60, 0xb4, 0xef, 0xec, 0xed, 0xee, 0xef, 0x34, - 0xda, 0x8d, 0xf2, 0x14, 0x2a, 0x40, 0x76, 0x7f, 0x03, 0xb7, 0xb7, 0x37, 0x76, 0xca, 0x5a, 0xfd, - 0xe7, 0x1a, 0x64, 0x18, 0x2b, 0xc4, 0x41, 0xdf, 0x86, 0xbc, 0xd7, 0xd4, 0xa1, 0xab, 0xa1, 0x5e, - 0x30, 0xd8, 0xe8, 0x55, 0xaf, 0x84, 0x96, 0x94, 0x13, 0xe8, 0x53, 0x68, 0x03, 0x0a, 0x1e, 0xf2, - 0x41, 0xfd, 0x51, 0x48, 0xd4, 0xff, 0xad, 0x41, 0x39, 0xdc, 0x5d, 0xd9, 0x1e, 0x63, 0xbc, 0x51, - 0x8b, 0x50, 0x0d, 0x76, 0x7d, 0x93, 0x19, 0xdb, 0x06, 0xb8, 0x4b, 0xa8, 0x2a, 0x77, 0x17, 0xe3, - 0xf3, 0xbb, 0xa0, 0x71, 0x6d, 0x42, 0xf2, 0x57, 0xa4, 0xee, 0x02, 0xf8, 0x01, 0x00, 0xf9, 0xe5, - 0xca, 0x58, 0x94, 0xaf, 0x2e, 0xc6, 0xae, 0x79, 0x37, 0xfd, 0x4d, 0x0a, 0xb2, 0x6c, 0xc1, 0x24, - 0x0e, 0x7a, 0x0d, 0x4a, 0xaf, 0x9a, 0x56, 0xd7, 0xfb, 0xbb, 0x0b, 0x8a, 0xf9, 0xa7, 0x8d, 0x22, - 0x5b, 0x8d, 0x5b, 0x0a, 0xa8, 0xa0, 0xa8, 0xbe, 0x39, 0x77, 0x88, 0x45, 0xd1, 0x84, 0xff, 0x52, - 0x54, 0x9f, 0x18, 0x83, 0x7b, 0x24, 0x1a, 0x50, 0x08, 0xfc, 0x4f, 0x23, 0x28, 0xad, 0xb1, 0x7f, - 0x6f, 0x9c, 0x47, 0xe6, 0x2e, 0x80, 0xff, 0xfa, 0x87, 0xce, 0xf9, 0x96, 0x51, 0x5d, 0x8c, 0x5d, - 0xf3, 0x08, 0xbd, 0xa1, 0xae, 0x24, 0x9e, 0x11, 0xcf, 0x25, 0xf5, 0x64, 0xec, 0x53, 0x66, 0x80, - 0xd8, 0x01, 0xcc, 0x44, 0xde, 0xa9, 0xd0, 0x45, 0x8f, 0xe6, 0xd5, 0x95, 0xc9, 0x08, 0x1e, 0xdd, - 0xef, 0x05, 0xde, 0x3a, 0xd5, 0xfb, 0xd7, 0xc5, 0x94, 0xf5, 0x49, 0x08, 0x41, 0x9e, 0xeb, 0x7f, - 0x4b, 0x41, 0xb9, 0x45, 0x1d, 0x62, 0x0c, 0x4c, 0xab, 0xa7, 0x4c, 0xe6, 0x65, 0xc8, 0xc8, 0xfc, - 0xfb, 0xb0, 0x2a, 0x5e, 0xd7, 0x98, 0x3f, 0x5c, 0x8a, 0x6e, 0xd6, 0x35, 0xb4, 0x7b, 0x89, 0xda, - 0x59, 0xd7, 0xd0, 0x3b, 0x5f, 0x8d, 0x7e, 0xd6, 0x35, 0xf4, 0xee, 0x57, 0xa7, 0xa1, 0x75, 0x0d, - 0xed, 0xc3, 0xac, 0x8c, 0x15, 0x97, 0x12, 0x1d, 0xd6, 0x35, 0x74, 0x00, 0x73, 0x41, 0x8a, 0xb2, - 0x76, 0x45, 0xd7, 0xc2, 0xfb, 0xc2, 0x75, 0x7e, 0x40, 0xc2, 0x71, 0xf5, 0x3a, 0xa3, 0x5b, 0xff, - 0xbd, 0x06, 0x59, 0x15, 0x09, 0x0f, 0x63, 0x1b, 0x6e, 0xfd, 0xbc, 0x36, 0x54, 0x1e, 0xf4, 0xd4, - 0xb9, 0x38, 0x97, 0x1e, 0x2d, 0x37, 0x2b, 0x1f, 0x7d, 0xbe, 0xa4, 0x7d, 0xf2, 0xf9, 0x92, 0xf6, - 0xaf, 0xcf, 0x97, 0xb4, 0x0f, 0xbf, 0x58, 0x9a, 0xfa, 0xe4, 0x8b, 0xa5, 0xa9, 0x4f, 0xbf, 0x58, - 0x9a, 0x3a, 0xca, 0xf0, 0x57, 0xf4, 0xe7, 0xff, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x0d, 0x00, 0x94, - 0xaa, 0x83, 0x2a, 0x00, 0x00, + 0x03, 0xd6, 0xe8, 0x7e, 0xbd, 0x2f, 0x3f, 0x27, 0x33, 0xd3, 0x54, 0xcc, 0xa2, 0x2b, 0xdf, 0x73, + 0xee, 0xb9, 0xe7, 0x9e, 0x7b, 0xcf, 0xf7, 0x7d, 0x86, 0x02, 0x25, 0x83, 0xa1, 0x5d, 0x1b, 0x3a, + 0x36, 0xb5, 0x51, 0x96, 0x03, 0xc3, 0xa3, 0xea, 0x42, 0xc7, 0x1e, 0x0c, 0x6c, 0x6b, 0xed, 0xe4, + 0xe6, 0x9a, 0x18, 0x09, 0x82, 0xea, 0x73, 0x3d, 0x93, 0xde, 0x1f, 0x1d, 0xd5, 0x3a, 0xf6, 0x60, + 0xad, 0x67, 0xf7, 0xec, 0x35, 0x8e, 0x3e, 0x1a, 0xdd, 0xe3, 0x10, 0x07, 0xf8, 0x48, 0x92, 0xcf, + 0x53, 0xc7, 0xe8, 0x10, 0xc6, 0x85, 0x0f, 0x24, 0x76, 0xb9, 0x67, 0xdb, 0xbd, 0x3e, 0xf1, 0xd7, + 0x52, 0x73, 0x40, 0x5c, 0x6a, 0x0c, 0x86, 0x82, 0x40, 0xff, 0x8f, 0x06, 0xe5, 0x36, 0x5b, 0xb0, + 0x79, 0xb6, 0xbd, 0x85, 0xc9, 0x7b, 0x23, 0xe2, 0x52, 0x54, 0x81, 0x2c, 0x67, 0xb2, 0xbd, 0x55, + 0xd1, 0x56, 0xb4, 0xd5, 0x22, 0x56, 0x20, 0x5a, 0x02, 0x38, 0xea, 0xdb, 0x9d, 0xe3, 0x16, 0x35, + 0x1c, 0x5a, 0x49, 0xac, 0x68, 0xab, 0x79, 0x1c, 0xc0, 0xa0, 0x2a, 0xe4, 0x38, 0xd4, 0xb0, 0xba, + 0x95, 0x24, 0x9f, 0xf5, 0x60, 0x74, 0x0d, 0xf2, 0xef, 0x8d, 0x88, 0x73, 0xb6, 0x6b, 0x77, 0x49, + 0x25, 0xcd, 0x27, 0x7d, 0x04, 0x7a, 0x16, 0x66, 0x8d, 0x7e, 0xdf, 0x7e, 0x7f, 0xdf, 0x70, 0xa8, + 0x69, 0xf4, 0xb9, 0x4c, 0x95, 0xcc, 0x8a, 0xb6, 0x9a, 0xc3, 0xe3, 0x13, 0xe8, 0x3b, 0x90, 0xc3, + 0xaf, 0xde, 0xdc, 0xb8, 0x47, 0x89, 0x53, 0xc9, 0xae, 0x68, 0xab, 0x85, 0x7a, 0xb5, 0x26, 0x8e, + 0x5a, 0x53, 0x47, 0xad, 0xb5, 0xd5, 0x51, 0x37, 0x73, 0x1f, 0x7d, 0xb6, 0x3c, 0xf5, 0xe1, 0x3f, + 0x97, 0x35, 0xec, 0xad, 0xd2, 0xff, 0xa0, 0xc1, 0x6c, 0xe0, 0xe0, 0xee, 0xd0, 0xb6, 0x5c, 0x82, + 0xae, 0x43, 0x9a, 0x1f, 0x95, 0x9f, 0xbb, 0x50, 0x9f, 0xae, 0x49, 0x2d, 0xd5, 0x38, 0x29, 0x16, + 0x93, 0xe8, 0x79, 0xc8, 0x0e, 0x08, 0x75, 0xcc, 0x8e, 0xcb, 0xaf, 0xa0, 0x50, 0xbf, 0x1a, 0xa6, + 0x63, 0x2c, 0x77, 0x05, 0x01, 0x56, 0x94, 0xa8, 0x06, 0x19, 0x97, 0x1a, 0x74, 0xe4, 0xf2, 0x8b, + 0x99, 0xae, 0x2f, 0x78, 0x6b, 0xe4, 0xc9, 0x5a, 0x7c, 0x16, 0x4b, 0x2a, 0xa6, 0x84, 0x01, 0x71, + 0x5d, 0xa3, 0x47, 0x2a, 0x29, 0x7e, 0x59, 0x0a, 0xd4, 0x5f, 0x0a, 0xa8, 0x4c, 0x6e, 0x83, 0x9e, + 0x86, 0x69, 0xd3, 0x72, 0x87, 0xa4, 0x43, 0x49, 0x77, 0xf3, 0x8c, 0x12, 0x97, 0x9f, 0x20, 0x85, + 0x23, 0x58, 0xfd, 0xc3, 0x24, 0x94, 0x5a, 0xc4, 0x70, 0x3a, 0xf7, 0x95, 0xb2, 0x5f, 0x82, 0x54, + 0xdb, 0xe8, 0x31, 0xfa, 0xe4, 0x6a, 0xa1, 0xbe, 0xe2, 0x49, 0x15, 0xa2, 0xaa, 0x31, 0x92, 0x86, + 0x45, 0x9d, 0xb3, 0xcd, 0x14, 0xbb, 0x4c, 0xcc, 0xd7, 0xa0, 0xeb, 0x50, 0xda, 0x35, 0xad, 0xad, + 0x91, 0x63, 0x50, 0xd3, 0xb6, 0x76, 0xc5, 0x75, 0x94, 0x70, 0x18, 0xc9, 0xa9, 0x8c, 0xd3, 0x00, + 0x55, 0x52, 0x52, 0x05, 0x91, 0x68, 0x1e, 0xd2, 0x3b, 0xe6, 0xc0, 0xa4, 0xfc, 0xb4, 0x25, 0x2c, + 0x00, 0x86, 0x75, 0xb9, 0xad, 0xa5, 0x05, 0x96, 0x03, 0xa8, 0x0c, 0x49, 0x62, 0x75, 0xb9, 0x79, + 0x94, 0x30, 0x1b, 0x32, 0xba, 0x37, 0x99, 0x2d, 0x55, 0x72, 0xfc, 0xae, 0x04, 0x80, 0x56, 0x61, + 0xa6, 0x35, 0x34, 0x2c, 0x77, 0x9f, 0x38, 0xec, 0xb7, 0x45, 0x68, 0x25, 0xcf, 0xd7, 0x44, 0xd1, + 0x21, 0x83, 0x82, 0x47, 0x31, 0xa8, 0xea, 0x37, 0x20, 0xef, 0x5d, 0x12, 0x13, 0xf0, 0x98, 0x9c, + 0x71, 0x1d, 0xe4, 0x31, 0x1b, 0x32, 0x01, 0x4f, 0x8c, 0xfe, 0x88, 0x48, 0xa7, 0x11, 0xc0, 0x4b, + 0x89, 0x17, 0x35, 0xfd, 0x2f, 0x49, 0x40, 0xe2, 0xb2, 0x37, 0x99, 0xab, 0x28, 0xbd, 0xdc, 0x82, + 0xbc, 0xab, 0x54, 0x20, 0xcd, 0x71, 0x21, 0x5e, 0x39, 0xd8, 0x27, 0x64, 0x56, 0xc3, 0x1d, 0x6e, + 0x7b, 0x4b, 0x6e, 0xa4, 0x40, 0xe6, 0x7e, 0xfc, 0xf2, 0xf6, 0x99, 0x45, 0x09, 0x0d, 0xf8, 0x08, + 0xa6, 0xa3, 0xa1, 0xd1, 0x23, 0x6e, 0xdb, 0x16, 0xac, 0xa5, 0x16, 0xc2, 0x48, 0xe6, 0xde, 0xc4, + 0xea, 0xd8, 0x5d, 0xd3, 0xea, 0x49, 0x0f, 0xf6, 0x60, 0xc6, 0xc1, 0xb4, 0xba, 0xe4, 0x94, 0xb1, + 0x6b, 0x99, 0xdf, 0x27, 0x52, 0x3b, 0x61, 0x24, 0xd2, 0xa1, 0x48, 0x6d, 0x6a, 0xf4, 0x31, 0xe9, + 0xd8, 0x4e, 0xd7, 0xe5, 0xce, 0x5b, 0xc2, 0x21, 0x1c, 0xa3, 0xe9, 0x1a, 0xd4, 0x68, 0xa8, 0x9d, + 0x84, 0x4a, 0x43, 0x38, 0x76, 0xce, 0x13, 0xe2, 0xb8, 0xa6, 0x6d, 0x71, 0x8d, 0xe6, 0xb1, 0x02, + 0x11, 0x82, 0x94, 0xcb, 0xb6, 0x07, 0x6e, 0xff, 0x7c, 0xcc, 0xc2, 0xd6, 0x3d, 0xdb, 0xa6, 0xc4, + 0xe1, 0x82, 0x15, 0xf8, 0x9e, 0x01, 0x0c, 0xda, 0x82, 0x72, 0x97, 0x74, 0xcd, 0x8e, 0x41, 0x49, + 0xf7, 0x8e, 0xdd, 0x1f, 0x0d, 0x2c, 0xb7, 0x52, 0xe4, 0xfe, 0x50, 0xf1, 0xae, 0x7c, 0x2b, 0x4c, + 0x80, 0xc7, 0x56, 0xe8, 0xbf, 0x4e, 0xc0, 0x4c, 0x84, 0x0a, 0xdd, 0x82, 0xb4, 0xdb, 0xb1, 0x87, + 0x44, 0x3a, 0xfd, 0xd2, 0x24, 0x76, 0xb5, 0x16, 0xa3, 0xc2, 0x82, 0x98, 0x9d, 0xc1, 0x32, 0x06, + 0xca, 0x56, 0xf8, 0x18, 0xdd, 0x84, 0x14, 0x3d, 0x1b, 0x8a, 0xc8, 0x34, 0x5d, 0x7f, 0x72, 0x22, + 0xa3, 0xf6, 0xd9, 0x90, 0x60, 0x4e, 0x8a, 0x6e, 0x43, 0xd6, 0x1e, 0x32, 0xf7, 0x72, 0xb9, 0x3a, + 0xa7, 0xeb, 0xcb, 0x13, 0x57, 0xed, 0x71, 0x3a, 0xac, 0xe8, 0xf5, 0x65, 0x48, 0x73, 0x89, 0x50, + 0x0e, 0x52, 0xad, 0xfd, 0x8d, 0x66, 0x79, 0x0a, 0x15, 0x21, 0x87, 0x1b, 0xad, 0xbd, 0xb7, 0xf0, + 0x9d, 0x46, 0x59, 0xd3, 0x17, 0x21, 0xc5, 0x76, 0x42, 0x00, 0x99, 0x56, 0x1b, 0x6f, 0x37, 0xef, + 0x96, 0xa7, 0x50, 0x16, 0x92, 0xdb, 0xcd, 0x76, 0x59, 0xd3, 0x9f, 0x84, 0x8c, 0x60, 0xc8, 0x96, + 0x37, 0xf7, 0x9a, 0x8d, 0xf2, 0x14, 0xca, 0x43, 0x7a, 0x03, 0xe3, 0x8d, 0xef, 0x96, 0x35, 0xfd, + 0x14, 0xa6, 0x95, 0x01, 0xcb, 0xb8, 0x7b, 0x0b, 0x32, 0x3c, 0xb4, 0xaa, 0x30, 0x74, 0x2d, 0x1c, + 0x50, 0x05, 0xf5, 0x2e, 0xa1, 0x06, 0x33, 0x02, 0x2c, 0x69, 0xd1, 0x7a, 0x34, 0x0e, 0x47, 0x1d, + 0x24, 0x1a, 0x84, 0xf5, 0xbf, 0x27, 0x61, 0x2e, 0x86, 0x63, 0x34, 0xe3, 0xe5, 0xfd, 0x8c, 0xb7, + 0x0a, 0x33, 0x8e, 0x6d, 0xd3, 0x16, 0x71, 0x4e, 0xcc, 0x0e, 0x69, 0xfa, 0x5a, 0x89, 0xa2, 0x99, + 0x03, 0x30, 0x14, 0x67, 0xcf, 0xe9, 0x44, 0x02, 0x0c, 0x23, 0x59, 0x9e, 0xe3, 0x5e, 0xc7, 0x82, + 0xc9, 0x5b, 0x96, 0x79, 0xda, 0x34, 0x2c, 0x9b, 0x6b, 0x27, 0x85, 0xc7, 0x27, 0x98, 0xe1, 0x76, + 0xfd, 0xb8, 0x29, 0x62, 0x60, 0x00, 0x83, 0x6e, 0x40, 0xd6, 0x95, 0x81, 0x2d, 0xc3, 0x6f, 0xa0, + 0xec, 0xdf, 0x80, 0xc0, 0x63, 0x45, 0x80, 0x9e, 0x85, 0x9c, 0x1c, 0x32, 0xb7, 0x4b, 0xc6, 0x12, + 0x7b, 0x14, 0x08, 0x43, 0xd1, 0x15, 0x87, 0x63, 0x79, 0xc9, 0xad, 0xe4, 0xf8, 0x8a, 0xda, 0x79, + 0x7a, 0xa9, 0xb5, 0x02, 0x0b, 0x78, 0x1c, 0xc4, 0x21, 0x1e, 0xd5, 0x03, 0x98, 0x1d, 0x23, 0x89, + 0x09, 0x95, 0xcf, 0x04, 0x43, 0x65, 0xa1, 0x7e, 0x25, 0xa0, 0x54, 0x7f, 0x71, 0x30, 0x82, 0xee, + 0x40, 0x31, 0x38, 0xc5, 0x43, 0xdd, 0xd0, 0xb0, 0xee, 0xd8, 0x23, 0x8b, 0x72, 0xc6, 0x2c, 0xd4, + 0x29, 0x04, 0xbb, 0x53, 0xe2, 0x38, 0xb6, 0x23, 0xa6, 0x45, 0xc6, 0x0a, 0x60, 0xf4, 0x1f, 0x6b, + 0x90, 0x55, 0x69, 0xe1, 0x29, 0x48, 0xb3, 0x85, 0xca, 0x2c, 0x4b, 0xa1, 0x0b, 0xc3, 0x62, 0x8e, + 0x67, 0x6a, 0x83, 0x76, 0xee, 0x93, 0xae, 0xe4, 0xa6, 0x40, 0xf4, 0x32, 0x80, 0x41, 0xa9, 0x63, + 0x1e, 0x8d, 0x58, 0x46, 0x4e, 0x72, 0x1e, 0x8b, 0x1e, 0x0f, 0x59, 0xee, 0x9d, 0xdc, 0xac, 0xbd, + 0x41, 0xce, 0x0e, 0xd8, 0x69, 0x70, 0x80, 0x5c, 0xff, 0xb3, 0x06, 0x29, 0xb6, 0x0d, 0x5a, 0x80, + 0x0c, 0xdb, 0xc8, 0xb3, 0x4d, 0x09, 0xc5, 0x46, 0x89, 0x58, 0xf3, 0x4a, 0x4e, 0x32, 0xaf, 0xeb, + 0x50, 0x52, 0xc6, 0xc4, 0x60, 0x57, 0x1a, 0x62, 0x18, 0x19, 0x39, 0x45, 0xfa, 0xe1, 0x4e, 0xf1, + 0xab, 0x84, 0x2a, 0x38, 0x54, 0xa9, 0xb2, 0x0a, 0x33, 0x5e, 0x51, 0xd2, 0x56, 0x4e, 0xcf, 0x93, + 0x72, 0x04, 0x1d, 0x53, 0xd4, 0x24, 0xe2, 0x8a, 0x1a, 0xb4, 0x02, 0x05, 0x9e, 0x40, 0x78, 0xfe, + 0x54, 0xe5, 0x45, 0x10, 0xc5, 0x0e, 0xda, 0xb1, 0x07, 0xc3, 0x3e, 0xa1, 0xa4, 0xfb, 0xba, 0x7d, + 0xe4, 0xaa, 0xf4, 0x16, 0x42, 0x32, 0xbb, 0xe1, 0x8b, 0x38, 0x85, 0x70, 0x36, 0x1f, 0xc1, 0xe4, + 0xf6, 0x59, 0x0a, 0x71, 0x32, 0x5c, 0x9c, 0x28, 0x3a, 0x24, 0x37, 0x2f, 0x34, 0x78, 0x9a, 0x0b, + 0xca, 0xcd, 0xb1, 0xfa, 0x4f, 0x12, 0xcc, 0x21, 0xd8, 0xdd, 0xb0, 0xca, 0x41, 0x25, 0xfe, 0x79, + 0x95, 0x32, 0x84, 0xb6, 0x65, 0x4a, 0x98, 0x87, 0x34, 0x2f, 0x96, 0x55, 0xfd, 0xc0, 0x01, 0xbf, + 0x3c, 0x4a, 0xc6, 0x94, 0x47, 0x29, 0xbf, 0x3c, 0x5a, 0x85, 0x99, 0x81, 0x71, 0xca, 0x76, 0x61, + 0x35, 0x0f, 0xe7, 0x2e, 0xce, 0x17, 0x45, 0xa3, 0x3a, 0xcc, 0xbb, 0xd4, 0xe8, 0x13, 0xae, 0x49, + 0xb7, 0x7d, 0xdf, 0x21, 0xee, 0x7d, 0xbb, 0xaf, 0x6a, 0xad, 0xd8, 0xb9, 0x4b, 0xa8, 0xc6, 0x7f, + 0x97, 0x82, 0x05, 0xff, 0x26, 0x42, 0x75, 0xd0, 0x8b, 0xe3, 0x75, 0x50, 0x35, 0x12, 0xe6, 0x03, + 0xb7, 0xf7, 0x75, 0x2d, 0xf4, 0x58, 0xd4, 0x42, 0x71, 0x06, 0x57, 0x8a, 0x37, 0xb8, 0x75, 0x98, + 0xf3, 0x8d, 0xca, 0xb7, 0xb7, 0x69, 0x4e, 0x1d, 0x37, 0xa5, 0x7f, 0x9a, 0x84, 0x45, 0x4f, 0xf1, + 0xc2, 0x16, 0x43, 0x16, 0xf3, 0xad, 0x71, 0x8b, 0x59, 0x1e, 0xb7, 0x18, 0xb1, 0xf0, 0x6b, 0xb3, + 0x79, 0xac, 0x4a, 0xe8, 0xae, 0x6a, 0x85, 0x84, 0x4b, 0xcb, 0xea, 0xb0, 0x0a, 0x39, 0x6a, 0xf4, + 0x58, 0xf9, 0x24, 0x12, 0x71, 0x1e, 0x7b, 0x30, 0xaa, 0x47, 0x6b, 0x40, 0x7f, 0x3b, 0x55, 0x97, + 0x8c, 0x55, 0x81, 0x1f, 0xc0, 0xbc, 0xbf, 0xcb, 0x41, 0xdd, 0xdb, 0xa7, 0x0e, 0x19, 0x1e, 0x6c, + 0x55, 0xba, 0x8f, 0x8b, 0x33, 0x07, 0x75, 0x51, 0xa9, 0x4b, 0xca, 0x47, 0xda, 0xff, 0xe5, 0x60, + 0xd8, 0x97, 0x0c, 0xbd, 0x6c, 0xae, 0x05, 0xb2, 0x39, 0x82, 0x14, 0x65, 0xbd, 0x79, 0x82, 0x1f, + 0x9a, 0x8f, 0xf5, 0x9f, 0x26, 0x02, 0xa1, 0x32, 0x64, 0xc4, 0xbc, 0x8a, 0x15, 0xf7, 0xe2, 0x55, + 0xb1, 0x02, 0xbc, 0x28, 0x7b, 0xa4, 0x62, 0xb2, 0x47, 0xda, 0xcf, 0x1e, 0x3a, 0x14, 0x85, 0xd7, + 0x8a, 0xed, 0xa4, 0x59, 0x86, 0x70, 0x93, 0xdc, 0x38, 0x3b, 0xd1, 0x8d, 0x43, 0x59, 0x23, 0xf7, + 0x48, 0x59, 0xe3, 0x18, 0x9e, 0x18, 0xbb, 0x09, 0xa9, 0x4a, 0x96, 0xca, 0x3d, 0x79, 0x85, 0xcd, + 0xf8, 0x88, 0x47, 0x52, 0xda, 0x2d, 0xc8, 0xa9, 0x6d, 0xb8, 0x5e, 0xce, 0xbc, 0x0c, 0x2d, 0x9a, + 0xad, 0xd8, 0x06, 0x5f, 0xff, 0x81, 0x06, 0x57, 0x23, 0x32, 0x06, 0x0c, 0x6e, 0x2d, 0x2a, 0x65, + 0xa1, 0x3e, 0xeb, 0x57, 0xd8, 0x72, 0xe6, 0xcb, 0x0a, 0xfe, 0x57, 0x0d, 0x66, 0x22, 0x93, 0x0f, + 0xfa, 0x5c, 0x14, 0xae, 0x88, 0x12, 0xd1, 0x8a, 0x68, 0xac, 0xaa, 0x4a, 0xc6, 0x55, 0x55, 0x91, + 0xea, 0x2c, 0x35, 0x5e, 0x9d, 0xc5, 0x54, 0x56, 0xe9, 0xd8, 0xca, 0x4a, 0x6f, 0x42, 0x5a, 0x3c, + 0x00, 0x36, 0xa0, 0xe4, 0x10, 0xd7, 0x1e, 0x39, 0x1d, 0xd2, 0x0a, 0x14, 0xe8, 0x7e, 0x9c, 0x17, + 0xaf, 0xa0, 0x27, 0x37, 0x6b, 0x38, 0x48, 0x86, 0xc3, 0xab, 0xf4, 0x26, 0x14, 0xf7, 0x47, 0xae, + 0xdf, 0x87, 0xbe, 0x02, 0x25, 0xde, 0x09, 0xb8, 0x9b, 0x67, 0x6d, 0xf9, 0x0e, 0x98, 0x5c, 0x9d, + 0x0e, 0xdc, 0x32, 0xa3, 0x6e, 0x30, 0x0a, 0x4c, 0x0c, 0xd7, 0xb6, 0x70, 0x98, 0x5c, 0xff, 0x99, + 0x06, 0x65, 0x46, 0xc2, 0xa5, 0x55, 0x6e, 0xf9, 0x9c, 0xd7, 0xdc, 0x32, 0x3f, 0x2e, 0x6e, 0x5e, + 0x61, 0xa6, 0xfc, 0x8f, 0xcf, 0x96, 0x4b, 0xfb, 0x0e, 0x31, 0xfa, 0x7d, 0xbb, 0x23, 0xa8, 0x55, + 0x57, 0x5b, 0x86, 0xa4, 0xd9, 0x15, 0xdd, 0x42, 0x11, 0xb3, 0x21, 0xba, 0x05, 0x57, 0xdc, 0x63, + 0x73, 0x28, 0x95, 0x77, 0x97, 0x58, 0x44, 0x94, 0xe7, 0xfc, 0x96, 0x72, 0x38, 0x7e, 0x52, 0xff, + 0x91, 0x94, 0x45, 0x1c, 0x5c, 0xca, 0x72, 0x1b, 0xb2, 0x47, 0xbc, 0x39, 0x79, 0xe0, 0x1b, 0x53, + 0xf4, 0x93, 0xa5, 0x48, 0x9c, 0x27, 0xc5, 0x75, 0x00, 0xf9, 0x58, 0xc9, 0xec, 0x69, 0x21, 0xd4, + 0xe7, 0x17, 0xd5, 0x99, 0xf5, 0x57, 0x20, 0xbf, 0x63, 0x5a, 0xc7, 0xad, 0xbe, 0xd9, 0x21, 0xe8, + 0x26, 0xa4, 0xfb, 0xa6, 0x75, 0xac, 0x24, 0x5c, 0x1c, 0x97, 0x90, 0x49, 0x56, 0x63, 0x0b, 0xb0, + 0xa0, 0xd4, 0x7f, 0xa8, 0x01, 0x62, 0x48, 0x65, 0xfc, 0x7e, 0x29, 0x2d, 0xc2, 0x9e, 0x16, 0x0c, + 0x7b, 0x15, 0xc8, 0xf6, 0x1c, 0x7b, 0x34, 0xdc, 0x54, 0xe1, 0x50, 0x81, 0x8c, 0xbe, 0xcf, 0xdf, + 0x20, 0x45, 0xc7, 0x24, 0x80, 0x07, 0x0d, 0x93, 0x4c, 0xf9, 0x57, 0x03, 0x42, 0xb4, 0x46, 0x83, + 0x81, 0xe1, 0x9c, 0xfd, 0x6f, 0x64, 0xf9, 0xad, 0x06, 0x73, 0xa1, 0x0b, 0xf1, 0xe3, 0x22, 0x71, + 0xa9, 0x39, 0x60, 0x49, 0x97, 0x4b, 0x92, 0xc3, 0x3e, 0x22, 0xdc, 0x38, 0x8b, 0x5e, 0x2b, 0xd0, + 0x38, 0x3f, 0x0d, 0xd3, 0xdc, 0xda, 0x5b, 0x1e, 0x89, 0x10, 0x2d, 0x82, 0x45, 0x35, 0x3f, 0x48, + 0xa5, 0xb8, 0x06, 0xe7, 0x43, 0x6d, 0xf3, 0x58, 0x80, 0xfa, 0x26, 0x14, 0xb1, 0xf1, 0xfe, 0x6b, + 0xa6, 0x4b, 0xed, 0x9e, 0x63, 0x0c, 0x98, 0x91, 0x1c, 0x8d, 0x3a, 0xc7, 0x84, 0xca, 0xa0, 0x24, + 0x21, 0x76, 0xf6, 0x4e, 0x40, 0x32, 0x01, 0xe8, 0xaf, 0x43, 0x4e, 0x35, 0x9e, 0x31, 0x6f, 0x09, + 0xcf, 0x86, 0xdf, 0x12, 0x16, 0xc2, 0xef, 0x17, 0x6f, 0xee, 0xb4, 0xa8, 0x41, 0xcd, 0x8e, 0x8a, + 0xd6, 0xbf, 0xd0, 0xa0, 0x10, 0x10, 0x11, 0x6d, 0xc2, 0x6c, 0xdf, 0xa0, 0xc4, 0xea, 0x9c, 0x1d, + 0xde, 0x57, 0xe2, 0x49, 0xab, 0xf4, 0x5f, 0x25, 0x82, 0xb2, 0xe3, 0xb2, 0xa4, 0xf7, 0x4f, 0xf3, + 0xff, 0x90, 0x71, 0x89, 0x63, 0x4a, 0xef, 0x0f, 0x06, 0x78, 0xaf, 0x5f, 0x96, 0x04, 0xec, 0xe0, + 0x22, 0x9c, 0xc8, 0x8b, 0x95, 0x90, 0xfe, 0x71, 0xd8, 0xba, 0xa5, 0x61, 0x8d, 0x3f, 0x73, 0x5c, + 0xa0, 0xad, 0x44, 0xac, 0xb6, 0x7c, 0xf9, 0x92, 0x17, 0xc9, 0x57, 0x86, 0xe4, 0xf0, 0xf6, 0x6d, + 0xf9, 0x48, 0xc0, 0x86, 0x02, 0xf3, 0x82, 0x8c, 0xd6, 0x6c, 0x28, 0x30, 0xeb, 0xb2, 0x33, 0x66, + 0x43, 0x8e, 0x79, 0x61, 0x5d, 0xb6, 0xc0, 0x6c, 0xa8, 0xbf, 0x0d, 0xd5, 0x38, 0x3f, 0x91, 0x26, + 0x7a, 0x1b, 0xf2, 0x2e, 0x47, 0x99, 0x64, 0x3c, 0x04, 0xc4, 0xac, 0xf3, 0xa9, 0xf5, 0x5f, 0x6a, + 0x50, 0x0a, 0x29, 0x36, 0x94, 0xa9, 0xd3, 0x32, 0x53, 0x17, 0x41, 0x13, 0x41, 0x2b, 0x89, 0x35, + 0x8b, 0x41, 0xf7, 0xf8, 0x7d, 0x6b, 0x58, 0xbb, 0xc7, 0x20, 0x57, 0x7e, 0x6f, 0xd1, 0x5c, 0x06, + 0x1d, 0xc9, 0x20, 0xab, 0x1d, 0x31, 0xa8, 0x2b, 0x0f, 0xa6, 0x75, 0xf9, 0xab, 0x8c, 0xf8, 0x9e, + 0x93, 0xe5, 0xbc, 0xd5, 0x77, 0x1b, 0x04, 0xa9, 0x63, 0xd3, 0xea, 0xf2, 0x92, 0x26, 0x8d, 0xf9, + 0x58, 0x27, 0xe2, 0x3b, 0x84, 0x14, 0x7c, 0xcb, 0xa0, 0x06, 0xab, 0xa7, 0x1d, 0xe2, 0x8e, 0xfa, + 0xb4, 0xed, 0x17, 0x12, 0x01, 0x0c, 0xab, 0x45, 0x05, 0x24, 0xcd, 0xa6, 0x1a, 0xeb, 0x43, 0x9c, + 0x02, 0x4b, 0x4a, 0x16, 0x05, 0x67, 0xc7, 0x66, 0x99, 0x99, 0xf4, 0x8d, 0x23, 0xd2, 0x0f, 0xd4, + 0x85, 0x3e, 0x82, 0xc9, 0xc1, 0x81, 0x83, 0x40, 0xed, 0x12, 0xc0, 0xa0, 0x35, 0x48, 0x50, 0x65, + 0x1a, 0xcb, 0x93, 0x65, 0xd8, 0xb7, 0x4d, 0x8b, 0xe2, 0x04, 0x75, 0x99, 0x0f, 0x2d, 0xc4, 0x4f, + 0x73, 0x65, 0x98, 0x52, 0x88, 0x12, 0xe6, 0x63, 0x66, 0x1d, 0x27, 0x46, 0x9f, 0x6f, 0xac, 0x61, + 0x36, 0x64, 0xd5, 0x00, 0x39, 0x25, 0x83, 0x61, 0xdf, 0x70, 0xda, 0xf2, 0x4d, 0x36, 0xc9, 0xbf, + 0x42, 0x46, 0xd1, 0xe8, 0x06, 0x94, 0x15, 0x4a, 0x7d, 0x48, 0x92, 0xc6, 0x39, 0x86, 0xd7, 0x5b, + 0x30, 0xc7, 0xbf, 0x09, 0x6d, 0x5b, 0x2e, 0x35, 0x2c, 0x7a, 0x7e, 0x54, 0xf6, 0xa2, 0xac, 0x8c, + 0x34, 0xa1, 0x28, 0x2b, 0x7c, 0x93, 0x47, 0xd9, 0x3f, 0x69, 0x30, 0x1f, 0xe6, 0x2a, 0x6d, 0xb8, + 0xe6, 0x39, 0x95, 0x30, 0x60, 0x3f, 0xee, 0x48, 0xca, 0x16, 0x9f, 0xf5, 0x3c, 0xeb, 0xa1, 0x5f, + 0xb2, 0x2f, 0xf1, 0x73, 0xa2, 0x0b, 0xa5, 0x90, 0x50, 0xe8, 0x36, 0x64, 0xb8, 0x01, 0x8c, 0x7b, + 0xdf, 0xf8, 0x5b, 0x9f, 0xfc, 0x1c, 0x28, 0x17, 0x84, 0x8b, 0x60, 0x4d, 0x86, 0xd5, 0xd7, 0x53, + 0xb9, 0x64, 0x39, 0x85, 0x0b, 0x43, 0xc7, 0x1e, 0x1c, 0x0a, 0x42, 0xfd, 0xe3, 0x24, 0xcc, 0xf2, + 0x9b, 0xc3, 0x86, 0xd5, 0x23, 0x97, 0xa2, 0x0d, 0xde, 0xb6, 0x52, 0x32, 0x94, 0x26, 0xc0, 0xc7, + 0xe1, 0x8f, 0xce, 0xd9, 0xe8, 0x47, 0xe7, 0x40, 0xab, 0x9f, 0x3b, 0xa7, 0xd5, 0xcf, 0x5f, 0xd8, + 0xea, 0x43, 0x5c, 0xab, 0x1f, 0x68, 0xb0, 0x0b, 0xe1, 0x06, 0x3b, 0xf8, 0x08, 0x50, 0x8c, 0x3c, + 0x02, 0xa8, 0xe6, 0xbb, 0x34, 0xb1, 0xf9, 0x9e, 0x7e, 0xa0, 0xe6, 0x7b, 0xe6, 0xa1, 0xdf, 0x6c, + 0x58, 0x6d, 0x20, 0xdd, 0xc6, 0xad, 0x94, 0xc5, 0x99, 0x3d, 0x04, 0x9b, 0x1d, 0x18, 0xa7, 0xc2, + 0x44, 0x2a, 0xb3, 0x62, 0xd6, 0x43, 0xe8, 0x7f, 0xd4, 0x00, 0x05, 0xf5, 0x29, 0xfd, 0xe0, 0x99, + 0x88, 0x1f, 0xcc, 0xf9, 0xf9, 0xd7, 0x1c, 0x90, 0xc7, 0xc8, 0x09, 0x3e, 0x80, 0x5c, 0x43, 0x1e, + 0xf5, 0xd2, 0xed, 0x1f, 0xfd, 0x1f, 0x14, 0xbd, 0xff, 0x5d, 0x1c, 0x0e, 0x84, 0xb0, 0x49, 0x5c, + 0xf0, 0x70, 0xbb, 0xae, 0xbe, 0x01, 0x99, 0x96, 0xc1, 0xba, 0xa6, 0x31, 0xe2, 0xc4, 0x18, 0xb1, + 0xbf, 0x8b, 0x16, 0xd8, 0x85, 0x05, 0x23, 0xf0, 0x6f, 0xf5, 0xcb, 0x9c, 0x62, 0x0d, 0xb2, 0x2e, + 0x17, 0x46, 0xd5, 0x2c, 0x33, 0xbe, 0x22, 0x38, 0x5e, 0xd2, 0x2b, 0x2a, 0xf4, 0x42, 0xd0, 0x72, + 0x52, 0x91, 0x32, 0x42, 0xdd, 0xab, 0x5c, 0xe4, 0x53, 0xc6, 0xc4, 0x85, 0x1b, 0xef, 0xc2, 0x4c, + 0xa4, 0xc5, 0x42, 0x45, 0xc8, 0x35, 0xf7, 0x0e, 0x1b, 0x18, 0xef, 0xe1, 0xf2, 0x14, 0x9a, 0x83, + 0x99, 0xdd, 0x8d, 0x77, 0x0e, 0x77, 0xb6, 0x0f, 0x1a, 0x87, 0x6d, 0xbc, 0x71, 0xa7, 0xd1, 0x2a, + 0x6b, 0x0c, 0xc9, 0xc7, 0x87, 0xed, 0xbd, 0xbd, 0xc3, 0x9d, 0x0d, 0x7c, 0xb7, 0x51, 0x4e, 0xa0, + 0x59, 0x28, 0xbd, 0xd5, 0x7c, 0xa3, 0xb9, 0xf7, 0x76, 0x53, 0x2e, 0x4e, 0xde, 0xb8, 0x01, 0xa5, + 0x90, 0x61, 0x30, 0xde, 0x77, 0xf6, 0x76, 0xf7, 0x77, 0x1a, 0xed, 0x46, 0x79, 0x0a, 0x15, 0x20, + 0xbb, 0xbf, 0x81, 0xdb, 0xdb, 0x1b, 0x3b, 0x65, 0xad, 0xfe, 0x73, 0x0d, 0x32, 0x4c, 0x14, 0xe2, + 0xa0, 0x6f, 0x43, 0xde, 0x6b, 0xea, 0xd0, 0xd5, 0x50, 0x2f, 0x18, 0x6c, 0xf4, 0xaa, 0x57, 0x42, + 0x53, 0xca, 0x09, 0xf4, 0x29, 0xb4, 0x01, 0x05, 0x8f, 0xf8, 0xa0, 0xfe, 0x28, 0x2c, 0xea, 0xff, + 0xd6, 0xa0, 0x1c, 0xee, 0xae, 0x6c, 0x4f, 0x30, 0xde, 0xa8, 0x45, 0xb8, 0x06, 0xbb, 0xbe, 0xc9, + 0x82, 0x6d, 0x03, 0xdc, 0x25, 0x54, 0x95, 0xbb, 0x8b, 0xf1, 0xf9, 0x5d, 0xf0, 0xb8, 0x36, 0x21, + 0xf9, 0x2b, 0x56, 0x77, 0x01, 0xfc, 0x00, 0x80, 0xfc, 0x72, 0x65, 0x2c, 0xca, 0x57, 0x17, 0x63, + 0xe7, 0xbc, 0x93, 0xfe, 0x26, 0x05, 0x59, 0x36, 0x61, 0x12, 0x07, 0xbd, 0x06, 0xa5, 0x57, 0x4d, + 0xab, 0xeb, 0xfd, 0xdd, 0x05, 0xc5, 0xfc, 0xd3, 0x46, 0xb1, 0xad, 0xc6, 0x4d, 0x05, 0x54, 0x50, + 0x54, 0xdf, 0x9c, 0x3b, 0xc4, 0xa2, 0x68, 0xc2, 0x7f, 0x29, 0xaa, 0x4f, 0x8c, 0xe1, 0x3d, 0x16, + 0x0d, 0x28, 0x04, 0xfe, 0xa7, 0x11, 0xbc, 0xad, 0xb1, 0x7f, 0x6f, 0x9c, 0xc7, 0xe6, 0x2e, 0x80, + 0xff, 0xfa, 0x87, 0xce, 0xf9, 0x96, 0x51, 0x5d, 0x8c, 0x9d, 0xf3, 0x18, 0xbd, 0xa1, 0x8e, 0x24, + 0x9e, 0x11, 0xcf, 0x65, 0xf5, 0x64, 0xec, 0x53, 0x66, 0x80, 0xd9, 0x01, 0xcc, 0x44, 0xde, 0xa9, + 0xd0, 0x45, 0x8f, 0xe6, 0xd5, 0x95, 0xc9, 0x04, 0x1e, 0xdf, 0xef, 0x05, 0xde, 0x3a, 0xd5, 0xfb, + 0xd7, 0xc5, 0x9c, 0xf5, 0x49, 0x04, 0x41, 0x99, 0xeb, 0x7f, 0x4b, 0x41, 0xb9, 0x45, 0x1d, 0x62, + 0x0c, 0x4c, 0xab, 0xa7, 0x4c, 0xe6, 0x65, 0xc8, 0xc8, 0xfc, 0xfb, 0xb0, 0x2a, 0x5e, 0xd7, 0x98, + 0x3f, 0x5c, 0x8a, 0x6e, 0xd6, 0x35, 0xb4, 0x7b, 0x89, 0xda, 0x59, 0xd7, 0xd0, 0x3b, 0x5f, 0x8d, + 0x7e, 0xd6, 0x35, 0xf4, 0xee, 0x57, 0xa7, 0xa1, 0x75, 0x0d, 0xed, 0xc3, 0xac, 0x8c, 0x15, 0x97, + 0x12, 0x1d, 0xd6, 0x35, 0x74, 0x00, 0x73, 0x41, 0x8e, 0xb2, 0x76, 0x45, 0xd7, 0xc2, 0xeb, 0xc2, + 0x75, 0x7e, 0xe0, 0x86, 0xe3, 0xea, 0x75, 0xc6, 0xb7, 0xfe, 0x7b, 0x0d, 0xb2, 0x2a, 0x12, 0x1e, + 0xc6, 0x36, 0xdc, 0xfa, 0x79, 0x6d, 0xa8, 0xdc, 0xe8, 0xa9, 0x73, 0x69, 0x2e, 0x3d, 0x5a, 0x6e, + 0x56, 0x3e, 0xfa, 0x7c, 0x49, 0xfb, 0xe4, 0xf3, 0x25, 0xed, 0x5f, 0x9f, 0x2f, 0x69, 0x1f, 0x7e, + 0xb1, 0x34, 0xf5, 0xc9, 0x17, 0x4b, 0x53, 0x9f, 0x7e, 0xb1, 0x34, 0x75, 0x94, 0xe1, 0xaf, 0xe8, + 0xcf, 0xff, 0x37, 0x00, 0x00, 0xff, 0xff, 0xd1, 0x13, 0x75, 0x27, 0x77, 0x2a, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -4026,7 +4026,7 @@ var _Pusher_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "pkg/tempopb/tempo.proto", + Metadata: "tempo.proto", } // MetricsGeneratorClient is the client API for MetricsGenerator service. @@ -4170,7 +4170,7 @@ var _MetricsGenerator_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "pkg/tempopb/tempo.proto", + Metadata: "tempo.proto", } // QuerierClient is the client API for Querier service. @@ -4458,7 +4458,7 @@ var _Querier_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "pkg/tempopb/tempo.proto", + Metadata: "tempo.proto", } // StreamingQuerierClient is the client API for StreamingQuerier service. @@ -4935,7 +4935,7 @@ var _StreamingQuerier_serviceDesc = grpc.ServiceDesc{ ServerStreams: true, }, }, - Metadata: "pkg/tempopb/tempo.proto", + Metadata: "tempo.proto", } // MetricsClient is the client API for Metrics service. @@ -5043,7 +5043,7 @@ var _Metrics_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "pkg/tempopb/tempo.proto", + Metadata: "tempo.proto", } func (m *TraceByIDRequest) Marshal() (dAtA []byte, err error) { diff --git a/pkg/tempopb/trace/v1/trace.pb.go b/pkg/tempopb/trace/v1/trace.pb.go index 661177601..527b902bf 100644 --- a/pkg/tempopb/trace/v1/trace.pb.go +++ b/pkg/tempopb/trace/v1/trace.pb.go @@ -31,7 +31,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // a bit-mask. To extract the bit-field, for example, use an // expression like: // -// (span.flags & SPAN_FLAGS_TRACE_FLAGS_MASK) +// (span.flags & SPAN_FLAGS_TRACE_FLAGS_MASK) // // See https://www.w3.org/TR/trace-context-2/#trace-flags for the flag definitions. // diff --git a/tempodb/backend/v1.pb.go b/tempodb/backend/v1.pb.go index a707ee362..cc6a2ab13 100644 --- a/tempodb/backend/v1.pb.go +++ b/tempodb/backend/v1.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tempodb/backend/v1/v1.proto +// source: v1/v1.proto package backend @@ -7,8 +7,8 @@ import ( fmt "fmt" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" + _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - _ "google.golang.org/protobuf/types/known/timestamppb" io "io" math "math" math_bits "math/bits" @@ -51,7 +51,7 @@ func (m *BlockMeta) Reset() { *m = BlockMeta{} } func (m *BlockMeta) String() string { return proto.CompactTextString(m) } func (*BlockMeta) ProtoMessage() {} func (*BlockMeta) Descriptor() ([]byte, []int) { - return fileDescriptor_6bc10ae735c1a340, []int{0} + return fileDescriptor_39a831d85a350775, []int{0} } func (m *BlockMeta) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -180,7 +180,7 @@ func (m *CompactedBlockMeta) Reset() { *m = CompactedBlockMeta{} } func (m *CompactedBlockMeta) String() string { return proto.CompactTextString(m) } func (*CompactedBlockMeta) ProtoMessage() {} func (*CompactedBlockMeta) Descriptor() ([]byte, []int) { - return fileDescriptor_6bc10ae735c1a340, []int{1} + return fileDescriptor_39a831d85a350775, []int{1} } func (m *CompactedBlockMeta) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -226,7 +226,7 @@ func (m *TenantIndex) Reset() { *m = TenantIndex{} } func (m *TenantIndex) String() string { return proto.CompactTextString(m) } func (*TenantIndex) ProtoMessage() {} func (*TenantIndex) Descriptor() ([]byte, []int) { - return fileDescriptor_6bc10ae735c1a340, []int{2} + return fileDescriptor_39a831d85a350775, []int{2} } func (m *TenantIndex) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -282,60 +282,60 @@ func init() { proto.RegisterType((*TenantIndex)(nil), "backend.v1.TenantIndex") } -func init() { proto.RegisterFile("tempodb/backend/v1/v1.proto", fileDescriptor_6bc10ae735c1a340) } +func init() { proto.RegisterFile("v1/v1.proto", fileDescriptor_39a831d85a350775) } -var fileDescriptor_6bc10ae735c1a340 = []byte{ - // 793 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x55, 0x5f, 0x8f, 0xdb, 0x44, - 0x10, 0x8f, 0xef, 0xc2, 0x25, 0xd9, 0x24, 0x97, 0x64, 0xab, 0x22, 0x93, 0x4a, 0xd9, 0x28, 0xe2, - 0x21, 0x48, 0xc5, 0xd1, 0xb5, 0x2a, 0x12, 0x42, 0x20, 0xe1, 0x3b, 0x90, 0x8a, 0xf8, 0x53, 0xdc, - 0xeb, 0x0b, 0x42, 0xb2, 0xd6, 0xde, 0x8d, 0x6b, 0x6a, 0x7b, 0x23, 0x7b, 0x13, 0x41, 0x3f, 0x45, - 0x3f, 0x0d, 0x9f, 0xa1, 0xe2, 0xe9, 0x1e, 0x11, 0x0f, 0x0b, 0xca, 0xbd, 0x99, 0x2f, 0x81, 0x76, - 0xec, 0xd8, 0x49, 0x2a, 0xda, 0x97, 0x68, 0x66, 0x7e, 0xf3, 0x9b, 0x99, 0xdf, 0xd8, 0xe3, 0xa0, - 0x7b, 0x92, 0xc7, 0x2b, 0xc1, 0xbc, 0x85, 0x47, 0xfd, 0x17, 0x3c, 0x61, 0x8b, 0xcd, 0xc5, 0x62, - 0x73, 0x61, 0xad, 0x52, 0x21, 0x05, 0x46, 0x65, 0xd0, 0xda, 0x5c, 0x8c, 0x49, 0x20, 0x44, 0x10, - 0xf1, 0x05, 0x20, 0xde, 0x7a, 0xb9, 0x90, 0x61, 0xcc, 0x33, 0x49, 0xe3, 0x55, 0x91, 0x3c, 0xfe, - 0x38, 0x08, 0xe5, 0xf3, 0xb5, 0x67, 0xf9, 0x22, 0x5e, 0x04, 0x22, 0x10, 0x75, 0xa6, 0xf6, 0xc0, - 0x01, 0xab, 0x48, 0x9f, 0xfd, 0xd1, 0x42, 0x1d, 0x3b, 0x12, 0xfe, 0x8b, 0xef, 0xb8, 0xa4, 0xf8, - 0x43, 0xd4, 0xda, 0xf0, 0x34, 0x0b, 0x45, 0x62, 0x1a, 0x53, 0x63, 0xde, 0xb1, 0x51, 0xae, 0xc8, - 0xd9, 0x52, 0xa4, 0x31, 0x95, 0xce, 0x0e, 0xc2, 0x9f, 0xa3, 0xb6, 0xa7, 0x29, 0x6e, 0xc8, 0xcc, - 0x93, 0xa9, 0x31, 0xef, 0xd9, 0xb3, 0xd7, 0x8a, 0x34, 0xfe, 0x52, 0xa4, 0xf9, 0xec, 0xd9, 0xe3, - 0xab, 0xad, 0x22, 0x2d, 0x28, 0xf9, 0xf8, 0x2a, 0x57, 0xa4, 0xe5, 0x15, 0xa6, 0x53, 0x1a, 0x0c, - 0x3f, 0x42, 0x1d, 0xc9, 0x13, 0x9a, 0x48, 0xcd, 0x7f, 0x0f, 0xda, 0x98, 0x5b, 0x45, 0xda, 0xd7, - 0x10, 0x04, 0x52, 0x5b, 0x96, 0xb6, 0xb3, 0xb3, 0x18, 0x7e, 0x82, 0x50, 0x26, 0x69, 0x2a, 0x5d, - 0xad, 0xd8, 0x3c, 0x9b, 0x1a, 0xf3, 0xee, 0x83, 0xb1, 0x55, 0xac, 0xc3, 0xda, 0x89, 0xb4, 0xae, - 0x77, 0xeb, 0xb0, 0xef, 0xea, 0x99, 0x72, 0x45, 0x3a, 0xc0, 0xd2, 0xf1, 0x57, 0x7f, 0x13, 0xc3, - 0xa9, 0x5d, 0xfc, 0x0d, 0x6a, 0xf3, 0x84, 0x15, 0xf5, 0x5a, 0xef, 0xac, 0x77, 0xa7, 0xac, 0xd7, - 0xe2, 0x09, 0xab, 0xaa, 0xed, 0x1c, 0xfc, 0x08, 0xf5, 0xa5, 0x90, 0x34, 0x72, 0x85, 0xf7, 0x0b, - 0xf7, 0x65, 0x66, 0xb6, 0xa7, 0xc6, 0xfc, 0xd4, 0x1e, 0xe6, 0x8a, 0xf4, 0x00, 0xf8, 0xa1, 0x88, - 0x3b, 0x07, 0x1e, 0xc6, 0xa8, 0x99, 0x85, 0x2f, 0xb9, 0xd9, 0x99, 0x1a, 0xf3, 0xa6, 0x03, 0x36, - 0xfe, 0x02, 0x0d, 0x7d, 0x11, 0xaf, 0xa8, 0x2f, 0x43, 0x91, 0xb8, 0x11, 0xdf, 0xf0, 0xc8, 0x44, - 0x53, 0x63, 0xde, 0xb7, 0xef, 0xe4, 0x8a, 0x0c, 0x6a, 0xec, 0x5b, 0x0d, 0x39, 0xc7, 0x01, 0x7c, - 0x5f, 0xcb, 0xf2, 0x05, 0x0b, 0x93, 0xc0, 0xec, 0xc2, 0xe3, 0x19, 0x96, 0x8f, 0xa7, 0xfd, 0x55, - 0x19, 0x77, 0xaa, 0x0c, 0xfc, 0x29, 0x1a, 0x84, 0x09, 0xe3, 0xbf, 0xba, 0x2b, 0x1a, 0x70, 0x17, - 0x86, 0xe9, 0x41, 0xb3, 0x51, 0xae, 0x48, 0x1f, 0xa0, 0x27, 0x34, 0xe0, 0x4f, 0xc3, 0x97, 0xdc, - 0x39, 0x74, 0x6b, 0xcd, 0x29, 0xf7, 0x45, 0xca, 0x32, 0xb3, 0x0f, 0xc4, 0x5a, 0xb3, 0x53, 0xc4, - 0x9d, 0x03, 0x4f, 0xd3, 0x18, 0x95, 0xd4, 0xad, 0x86, 0x3c, 0x87, 0x77, 0x00, 0x68, 0x1a, 0xa8, - 0x86, 0x3c, 0xf0, 0xf0, 0x67, 0x68, 0xe4, 0x45, 0x42, 0xc4, 0x6e, 0xf6, 0x9c, 0xa6, 0xcc, 0xf5, - 0xc5, 0x3a, 0x91, 0xe6, 0x00, 0x3a, 0x0e, 0x72, 0x45, 0xba, 0x00, 0x3e, 0xd5, 0x58, 0xe6, 0x0c, - 0x6a, 0xe7, 0x52, 0xe7, 0xe1, 0x05, 0xea, 0x2e, 0x85, 0x90, 0x3c, 0x2d, 0x14, 0x0e, 0x81, 0x76, - 0x9e, 0x2b, 0x82, 0x8a, 0x30, 0xc8, 0xdb, 0xb3, 0xb1, 0x8f, 0x46, 0x8c, 0xb3, 0xd0, 0xa7, 0x92, - 0xeb, 0x5e, 0xd1, 0x3a, 0x4e, 0x32, 0x73, 0x04, 0xdb, 0xfc, 0xa4, 0xdc, 0xe6, 0xf0, 0x6a, 0x97, - 0x70, 0x59, 0xe0, 0xb9, 0x22, 0x63, 0x76, 0x14, 0xbb, 0x2f, 0xe2, 0x50, 0xdf, 0xb6, 0xfc, 0xcd, - 0x19, 0x1e, 0x63, 0xf8, 0x7b, 0x84, 0x53, 0xbe, 0x8a, 0x74, 0x50, 0x3f, 0xea, 0x25, 0xf5, 0xa5, - 0x48, 0x4d, 0x0c, 0xc3, 0x91, 0x5c, 0x91, 0x7b, 0x7b, 0xe8, 0xd7, 0x00, 0xee, 0x95, 0x1b, 0xbd, - 0x01, 0xce, 0x7e, 0x37, 0x10, 0xbe, 0x2c, 0xde, 0x06, 0xce, 0xea, 0xab, 0xb6, 0x11, 0x2a, 0xee, - 0x35, 0xe6, 0x92, 0xc2, 0x61, 0x77, 0x1f, 0xdc, 0xb5, 0xea, 0x8f, 0x8a, 0x55, 0xa5, 0xda, 0x3d, - 0xad, 0xed, 0x46, 0x11, 0x23, 0x57, 0xa4, 0xe1, 0x74, 0xbc, 0xaa, 0xc6, 0xcf, 0xe8, 0xdc, 0xdf, - 0x55, 0x2e, 0x2e, 0xe6, 0xe4, 0x9d, 0x17, 0xf3, 0x41, 0x79, 0x31, 0xfd, 0x8a, 0x59, 0xdd, 0xcd, - 0x61, 0x68, 0xf6, 0xaf, 0x81, 0xba, 0xe5, 0xf9, 0xeb, 0x37, 0x0c, 0xff, 0x88, 0x90, 0x9f, 0x72, - 0xd8, 0x3d, 0x95, 0xe5, 0xc4, 0x6f, 0xeb, 0xf4, 0x7e, 0xd9, 0x69, 0x8f, 0x55, 0x1c, 0x7b, 0xe9, - 0x7f, 0x29, 0xf1, 0x43, 0xd4, 0x04, 0xf9, 0x27, 0xd3, 0xd3, 0xff, 0x97, 0xdf, 0xce, 0x15, 0x81, - 0x34, 0x07, 0x7e, 0xf1, 0xf5, 0xbe, 0x6a, 0xa0, 0x9f, 0x02, 0x7d, 0xb2, 0x4f, 0x7f, 0x73, 0xe3, - 0x76, 0x5f, 0x7f, 0x77, 0x2a, 0xe6, 0x9e, 0x5a, 0x40, 0x3f, 0x7a, 0xbd, 0x9d, 0x18, 0x37, 0xdb, - 0x89, 0xf1, 0xcf, 0x76, 0x62, 0xbc, 0xba, 0x9d, 0x34, 0x6e, 0x6e, 0x27, 0x8d, 0x3f, 0x6f, 0x27, - 0x8d, 0x9f, 0x06, 0x47, 0x7f, 0x03, 0xde, 0x19, 0x88, 0x7d, 0xf8, 0x5f, 0x00, 0x00, 0x00, 0xff, - 0xff, 0xaf, 0x58, 0xa6, 0xc0, 0x20, 0x06, 0x00, 0x00, +var fileDescriptor_39a831d85a350775 = []byte{ + // 788 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0xcd, 0x8e, 0xe3, 0x44, + 0x10, 0x8e, 0x67, 0xc2, 0x24, 0xe9, 0x24, 0x93, 0xa4, 0x57, 0x8b, 0x4c, 0x90, 0xd2, 0x51, 0xc4, + 0x21, 0x48, 0x8b, 0xa3, 0xd9, 0xd5, 0x22, 0x21, 0x04, 0x12, 0x9e, 0x01, 0x69, 0x11, 0x3f, 0x8b, + 0x77, 0xf6, 0x82, 0x90, 0xac, 0xb6, 0xbb, 0xe3, 0x35, 0x6b, 0xbb, 0x23, 0xbb, 0x13, 0xc1, 0x3e, + 0xc5, 0x3e, 0x0d, 0xcf, 0x30, 0xe2, 0x34, 0x47, 0xc4, 0xa1, 0x41, 0x99, 0x9b, 0x79, 0x09, 0xd4, + 0x65, 0xc7, 0x4e, 0x66, 0x04, 0x73, 0x89, 0xaa, 0xea, 0xab, 0xaf, 0xaa, 0xbe, 0x6a, 0x57, 0x50, + 0x77, 0x73, 0xb6, 0xd8, 0x9c, 0x59, 0xab, 0x54, 0x48, 0x81, 0x91, 0x47, 0xfd, 0xd7, 0x3c, 0x61, + 0xd6, 0xe6, 0x6c, 0x4c, 0x02, 0x21, 0x82, 0x88, 0x2f, 0x00, 0xf1, 0xd6, 0xcb, 0x85, 0x0c, 0x63, + 0x9e, 0x49, 0x1a, 0xaf, 0x8a, 0xe4, 0xf1, 0x47, 0x41, 0x28, 0x5f, 0xad, 0x3d, 0xcb, 0x17, 0xf1, + 0x22, 0x10, 0x81, 0xa8, 0x33, 0xb5, 0x07, 0x0e, 0x58, 0x45, 0xfa, 0xec, 0xf7, 0x16, 0xea, 0xd8, + 0x91, 0xf0, 0x5f, 0x7f, 0xcb, 0x25, 0xc5, 0x1f, 0xa0, 0xd6, 0x86, 0xa7, 0x59, 0x28, 0x12, 0xd3, + 0x98, 0x1a, 0xf3, 0x8e, 0x8d, 0x72, 0x45, 0x4e, 0x96, 0x22, 0x8d, 0xa9, 0x74, 0x76, 0x10, 0xfe, + 0x0c, 0xb5, 0x3d, 0x4d, 0x71, 0x43, 0x66, 0x1e, 0x4d, 0x8d, 0x79, 0xcf, 0x9e, 0x5d, 0x29, 0xd2, + 0xf8, 0x53, 0x91, 0xe6, 0xcb, 0x97, 0xcf, 0x2e, 0xb6, 0x8a, 0xb4, 0xa0, 0xe4, 0xb3, 0x8b, 0x5c, + 0x91, 0x96, 0x57, 0x98, 0x4e, 0x69, 0x30, 0xfc, 0x14, 0x75, 0x24, 0x4f, 0x68, 0x22, 0x35, 0xff, + 0x1d, 0x68, 0x63, 0x6e, 0x15, 0x69, 0x5f, 0x42, 0x10, 0x48, 0x6d, 0x59, 0xda, 0xce, 0xce, 0x62, + 0xf8, 0x39, 0x42, 0x99, 0xa4, 0xa9, 0x74, 0xb5, 0x62, 0xf3, 0x64, 0x6a, 0xcc, 0xbb, 0x8f, 0xc7, + 0x56, 0xb1, 0x0e, 0x6b, 0x27, 0xd2, 0xba, 0xdc, 0xad, 0xc3, 0x7e, 0xa8, 0x67, 0xca, 0x15, 0xe9, + 0x00, 0x4b, 0xc7, 0xdf, 0xfe, 0x45, 0x0c, 0xa7, 0x76, 0xf1, 0xd7, 0xa8, 0xcd, 0x13, 0x56, 0xd4, + 0x6b, 0xdd, 0x5b, 0xef, 0x41, 0x59, 0xaf, 0xc5, 0x13, 0x56, 0x55, 0xdb, 0x39, 0xf8, 0x29, 0xea, + 0x4b, 0x21, 0x69, 0xe4, 0x0a, 0xef, 0x67, 0xee, 0xcb, 0xcc, 0x6c, 0x4f, 0x8d, 0xf9, 0xb1, 0x3d, + 0xcc, 0x15, 0xe9, 0x01, 0xf0, 0x7d, 0x11, 0x77, 0x0e, 0x3c, 0x8c, 0x51, 0x33, 0x0b, 0xdf, 0x70, + 0xb3, 0x33, 0x35, 0xe6, 0x4d, 0x07, 0x6c, 0xfc, 0x39, 0x1a, 0xfa, 0x22, 0x5e, 0x51, 0x5f, 0x86, + 0x22, 0x71, 0x23, 0xbe, 0xe1, 0x91, 0x89, 0xa6, 0xc6, 0xbc, 0x6f, 0x3f, 0xc8, 0x15, 0x19, 0xd4, + 0xd8, 0x37, 0x1a, 0x72, 0x6e, 0x07, 0xf0, 0x23, 0x2d, 0xcb, 0x17, 0x2c, 0x4c, 0x02, 0xb3, 0x0b, + 0xcf, 0x33, 0x2c, 0x9f, 0xa7, 0xfd, 0x65, 0x19, 0x77, 0xaa, 0x0c, 0xfc, 0x09, 0x1a, 0x84, 0x09, + 0xe3, 0xbf, 0xb8, 0x2b, 0x1a, 0x70, 0x17, 0x86, 0xe9, 0x41, 0xb3, 0x51, 0xae, 0x48, 0x1f, 0xa0, + 0xe7, 0x34, 0xe0, 0x2f, 0xc2, 0x37, 0xdc, 0x39, 0x74, 0x6b, 0xcd, 0x29, 0xf7, 0x45, 0xca, 0x32, + 0xb3, 0x0f, 0xc4, 0x5a, 0xb3, 0x53, 0xc4, 0x9d, 0x03, 0x4f, 0xd3, 0x18, 0x95, 0xd4, 0xad, 0x86, + 0x3c, 0x85, 0x6f, 0x00, 0x68, 0x1a, 0xa8, 0x86, 0x3c, 0xf0, 0xf0, 0xa7, 0x68, 0xe4, 0x45, 0x42, + 0xc4, 0x6e, 0xf6, 0x8a, 0xa6, 0xcc, 0xf5, 0xc5, 0x3a, 0x91, 0xe6, 0x00, 0x3a, 0x0e, 0x72, 0x45, + 0xba, 0x00, 0xbe, 0xd0, 0x58, 0xe6, 0x0c, 0x6a, 0xe7, 0x5c, 0xe7, 0xe1, 0x05, 0xea, 0x2e, 0x85, + 0x90, 0x3c, 0x2d, 0x14, 0x0e, 0x81, 0x76, 0x9a, 0x2b, 0x82, 0x8a, 0x30, 0xc8, 0xdb, 0xb3, 0xb1, + 0x8f, 0x46, 0x8c, 0xb3, 0xd0, 0xa7, 0x92, 0xeb, 0x5e, 0xd1, 0x3a, 0x4e, 0x32, 0x73, 0x04, 0xdb, + 0xfc, 0xb8, 0xdc, 0xe6, 0xf0, 0x62, 0x97, 0x70, 0x5e, 0xe0, 0xb9, 0x22, 0x63, 0x76, 0x2b, 0xf6, + 0x48, 0xc4, 0xa1, 0xe4, 0xf1, 0x4a, 0xfe, 0xea, 0x0c, 0x6f, 0x63, 0xf8, 0x3b, 0x84, 0x53, 0xbe, + 0x8a, 0x74, 0x50, 0x3f, 0xf5, 0x92, 0xfa, 0x52, 0xa4, 0x26, 0x86, 0xe1, 0x48, 0xae, 0xc8, 0xfb, + 0x7b, 0xe8, 0x57, 0x00, 0xee, 0x95, 0x1b, 0xdd, 0x01, 0x67, 0xbf, 0x19, 0x08, 0x9f, 0x17, 0x5f, + 0x03, 0x67, 0xf5, 0x55, 0xdb, 0x08, 0x15, 0xf7, 0x1a, 0x73, 0x49, 0xe1, 0xb0, 0xbb, 0x8f, 0x1f, + 0x5a, 0xf5, 0x9f, 0x8a, 0x55, 0xa5, 0xda, 0x3d, 0xad, 0xed, 0x5a, 0x11, 0x23, 0x57, 0xa4, 0xe1, + 0x74, 0xbc, 0xaa, 0xc6, 0x4f, 0xe8, 0xd4, 0xdf, 0x55, 0x2e, 0x2e, 0xe6, 0xe8, 0xde, 0x8b, 0x79, + 0xaf, 0xbc, 0x98, 0x7e, 0xc5, 0xac, 0xee, 0xe6, 0x30, 0x34, 0xfb, 0xc7, 0x40, 0xdd, 0xf2, 0xfc, + 0xf5, 0x17, 0x86, 0x7f, 0x40, 0xc8, 0x4f, 0x39, 0xec, 0x9e, 0xca, 0x72, 0xe2, 0xff, 0xeb, 0xf4, + 0x6e, 0xd9, 0x69, 0x8f, 0x55, 0x1c, 0x7b, 0xe9, 0x7f, 0x21, 0xf1, 0x13, 0xd4, 0x04, 0xf9, 0x47, + 0xd3, 0xe3, 0xff, 0x96, 0xdf, 0xce, 0x15, 0x81, 0x34, 0x07, 0x7e, 0xf1, 0xe5, 0xbe, 0x6a, 0xa0, + 0x1f, 0x03, 0x7d, 0xb2, 0x4f, 0xbf, 0xbb, 0x71, 0xbb, 0xaf, 0xff, 0x77, 0x2a, 0xe6, 0x9e, 0x5a, + 0x40, 0x3f, 0xbc, 0xda, 0x4e, 0x8c, 0xeb, 0xed, 0xc4, 0xf8, 0x7b, 0x3b, 0x31, 0xde, 0xde, 0x4c, + 0x1a, 0xd7, 0x37, 0x93, 0xc6, 0x1f, 0x37, 0x93, 0xc6, 0x8f, 0x03, 0xfd, 0xb6, 0x82, 0x79, 0x8b, + 0xb2, 0xbc, 0x77, 0x02, 0x62, 0x9f, 0xfc, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x2e, 0xae, 0x67, 0xf2, + 0x10, 0x06, 0x00, 0x00, } func (m *BlockMeta) Marshal() (dAtA []byte, err error) {