diff --git a/Makefile b/Makefile index 8b8c8f03553..9654d6edaab 100644 --- a/Makefile +++ b/Makefile @@ -534,7 +534,7 @@ proto: init-submodules proto-prepare-otel # prevents panic of two equal proto types. rm -rf $(PROTO_INTERMEDIATE_DIR)/* cp -R idl/opentelemetry-proto/* $(PROTO_INTERMEDIATE_DIR) - find $(PROTO_INTERMEDIATE_DIR) -name "*.proto" | xargs -L 1 sed -i 's+github.com/open-telemetry/opentelemetry-proto/gen/go+github.com/jaegertracing/jaeger/proto-gen/otel+g' + find $(PROTO_INTERMEDIATE_DIR) -name "*.proto" | xargs -L 1 sed -i 's+go.opentelemetry.io/proto/otlp+github.com/jaegertracing/jaeger/proto-gen/otel+g' $(PROTOC) \ $(PROTO_INCLUDES) \ --gogo_out=plugins=grpc,$(PROTO_GOGO_MAPPINGS):$(PWD)/proto-gen/api_v3 \ diff --git a/go.mod b/go.mod index e9cd5744c93..055d1055fcf 100644 --- a/go.mod +++ b/go.mod @@ -45,6 +45,7 @@ require ( github.com/uber/jaeger-lib v2.4.1+incompatible github.com/xdg-go/scram v1.1.0 go.opentelemetry.io/collector/model v0.44.0 + go.opentelemetry.io/proto/otlp v0.7.0 go.uber.org/atomic v1.9.0 go.uber.org/automaxprocs v1.4.0 go.uber.org/zap v1.21.0 diff --git a/go.sum b/go.sum index dab50dfe3cc..6721fe3d2af 100644 --- a/go.sum +++ b/go.sum @@ -838,6 +838,7 @@ go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/collector/model v0.44.0 h1:I+M6X2NANYChOGYrpbxCoEYJah3eHdMvumKjothIAtA= go.opentelemetry.io/collector/model v0.44.0/go.mod h1:4jo1R8uBDspLCxUGhQ0k3v/EFXFbW7s0AIy3LuGLbcU= +go.opentelemetry.io/proto/otlp v0.7.0 h1:rwOQPCuKAKmwGKq2aVNnYIibI6wnV7EvzgfTCzcdGg8= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/idl b/idl index b9acaab7b20..05fe64e9c30 160000 --- a/idl +++ b/idl @@ -1 +1 @@ -Subproject commit b9acaab7b20fd4f984225657ffe272799ebdfefb +Subproject commit 05fe64e9c305526901f70ff692030b388787e388 diff --git a/otel_proto_patch.sed b/otel_proto_patch.sed index ad77fcfc8a1..ade5733c92a 100644 --- a/otel_proto_patch.sed +++ b/otel_proto_patch.sed @@ -1,4 +1,4 @@ -s+github.com/open-telemetry/opentelemetry-proto/gen/go+github.com/jaegertracing/jaeger/proto-gen/otel+g +s+go.opentelemetry.io/proto/otlp+github.com/jaegertracing/jaeger/proto-gen/otel+g s+ opentelemetry.proto+ jaeger+g s+import "opentelemetry/proto/+import "+g diff --git a/proto-gen/api_v2/sampling.pb.go b/proto-gen/api_v2/sampling.pb.go index 5571add49bf..f2d01ad2e80 100644 --- a/proto-gen/api_v2/sampling.pb.go +++ b/proto-gen/api_v2/sampling.pb.go @@ -29,6 +29,7 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package +// See description of the SamplingStrategyResponse.strategyType field. type SamplingStrategyType int32 const ( @@ -54,7 +55,9 @@ func (SamplingStrategyType) EnumDescriptor() ([]byte, []int) { return fileDescriptor_79c798842d009798, []int{0} } +// ProbabilisticSamplingStrategy samples traces with a fixed probability. type ProbabilisticSamplingStrategy struct { + // samplingRate is the sampling probability in the range [0.0, 1.0]. SamplingRate float64 `protobuf:"fixed64,1,opt,name=samplingRate,proto3" json:"samplingRate,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -101,7 +104,10 @@ func (m *ProbabilisticSamplingStrategy) GetSamplingRate() float64 { return 0 } +// RateLimitingSamplingStrategy samples a fixed number of traces per time interval. +// The typical implementations use the leaky bucket algorithm. type RateLimitingSamplingStrategy struct { + // TODO this field type should be changed to double, to support rates like 1 per minute. MaxTracesPerSecond int32 `protobuf:"varint,1,opt,name=maxTracesPerSecond,proto3" json:"maxTracesPerSecond,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -148,6 +154,8 @@ func (m *RateLimitingSamplingStrategy) GetMaxTracesPerSecond() int32 { return 0 } +// OperationSamplingStrategy is a sampling strategy for a given operation +// (aka endpoint, span name). Only probabilistic sampling is currently supported. type OperationSamplingStrategy struct { Operation string `protobuf:"bytes,1,opt,name=operation,proto3" json:"operation,omitempty"` ProbabilisticSampling *ProbabilisticSamplingStrategy `protobuf:"bytes,2,opt,name=probabilisticSampling,proto3" json:"probabilisticSampling,omitempty"` @@ -203,14 +211,30 @@ func (m *OperationSamplingStrategy) GetProbabilisticSampling() *ProbabilisticSam return nil } +// PerOperationSamplingStrategies is a combination of strategies for different endpoints +// as well as some service-wide defaults. It is particularly useful for services whose +// endpoints receive vastly different traffic, so that any single rate of sampling would +// result in either too much data for some endpoints or almost no data for other endpoints. type PerOperationSamplingStrategies struct { - DefaultSamplingProbability float64 `protobuf:"fixed64,1,opt,name=defaultSamplingProbability,proto3" json:"defaultSamplingProbability,omitempty"` - DefaultLowerBoundTracesPerSecond float64 `protobuf:"fixed64,2,opt,name=defaultLowerBoundTracesPerSecond,proto3" json:"defaultLowerBoundTracesPerSecond,omitempty"` - PerOperationStrategies []*OperationSamplingStrategy `protobuf:"bytes,3,rep,name=perOperationStrategies,proto3" json:"perOperationStrategies,omitempty"` - DefaultUpperBoundTracesPerSecond float64 `protobuf:"fixed64,4,opt,name=defaultUpperBoundTracesPerSecond,proto3" json:"defaultUpperBoundTracesPerSecond,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + // defaultSamplingProbability is the sampling probability for spans that do not match + // any of the perOperationStrategies. + DefaultSamplingProbability float64 `protobuf:"fixed64,1,opt,name=defaultSamplingProbability,proto3" json:"defaultSamplingProbability,omitempty"` + // defaultLowerBoundTracesPerSecond defines a lower-bound rate limit used to ensure that + // there is some minimal amount of traces sampled for an endpoint that might otherwise + // be never sampled via probabilistic strategies. The limit is local to a service instance, + // so if a service is deployed with many (N) instances, the effective minimum rate of sampling + // will be N times higher. This setting applies to ALL operations, whether or not they match + // one of the perOperationStrategies. + DefaultLowerBoundTracesPerSecond float64 `protobuf:"fixed64,2,opt,name=defaultLowerBoundTracesPerSecond,proto3" json:"defaultLowerBoundTracesPerSecond,omitempty"` + // perOperationStrategies describes sampling strategiesf for individual operations within + // a given service. + PerOperationStrategies []*OperationSamplingStrategy `protobuf:"bytes,3,rep,name=perOperationStrategies,proto3" json:"perOperationStrategies,omitempty"` + // defaultUpperBoundTracesPerSecond defines an upper bound rate limit. + // However, almost no Jaeger SDKs support this parameter. + DefaultUpperBoundTracesPerSecond float64 `protobuf:"fixed64,4,opt,name=defaultUpperBoundTracesPerSecond,proto3" json:"defaultUpperBoundTracesPerSecond,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *PerOperationSamplingStrategies) Reset() { *m = PerOperationSamplingStrategies{} } @@ -274,7 +298,17 @@ func (m *PerOperationSamplingStrategies) GetDefaultUpperBoundTracesPerSecond() f return 0 } +// SamplingStrategyResponse contains an overall sampling strategy for a given service. +// This type should be treated as a union where only one of the strategy field is present. type SamplingStrategyResponse struct { + // Legacy field that was meant to indicate which one of the strategy fields + // below is present. This enum was not extended when per-operation strategy + // was introduced, because extending enum has backwards compatiblity issues. + // The recommended approach for consumers is to ignore this field and instead + // checks the other fields being not null (starting with operationSampling). + // For producers, it is recommended to set this field correctly for probabilistic + // and rate-limiting strategies, but if per-operation strategy is returned, + // the enum can be set to 0 (probabilistic). StrategyType SamplingStrategyType `protobuf:"varint,1,opt,name=strategyType,proto3,enum=jaeger.api_v2.SamplingStrategyType" json:"strategyType,omitempty"` ProbabilisticSampling *ProbabilisticSamplingStrategy `protobuf:"bytes,2,opt,name=probabilisticSampling,proto3" json:"probabilisticSampling,omitempty"` RateLimitingSampling *RateLimitingSamplingStrategy `protobuf:"bytes,3,opt,name=rateLimitingSampling,proto3" json:"rateLimitingSampling,omitempty"` @@ -345,7 +379,9 @@ func (m *SamplingStrategyResponse) GetOperationSampling() *PerOperationSamplingS return nil } +// SamplingStrategyParameters defines request parameters for remote sampler. type SamplingStrategyParameters struct { + // serviceName is a required argument. ServiceName string `protobuf:"bytes,1,opt,name=serviceName,proto3" json:"serviceName,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` diff --git a/proto-gen/otel/common/v1/common.pb.go b/proto-gen/otel/common/v1/common.pb.go index dbe00c4dfbb..a7696be26f8 100644 --- a/proto-gen/otel/common/v1/common.pb.go +++ b/proto-gen/otel/common/v1/common.pb.go @@ -25,7 +25,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // object containing arrays, key-value lists and primitives. type AnyValue struct { // The value is one of the listed fields. It is valid for all values to be unspecified - // in which case this AnyValue is considered to be "null". + // in which case this AnyValue is considered to be "empty". // // Types that are valid to be assigned to Value: // *AnyValue_StringValue @@ -217,6 +217,8 @@ func (m *ArrayValue) GetValues() []*AnyValue { type KeyValueList struct { // A collection of key/value pairs of key-value pairs. The list may be empty (may // contain 0 elements). + // The keys MUST be unique (it is not allowed to have more than one + // value with the same key). Values []*KeyValue `protobuf:"bytes,1,rep,name=values,proto3" json:"values,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -302,56 +304,6 @@ func (m *KeyValue) GetValue() *AnyValue { return nil } -// StringKeyValue is a pair of key/value strings. This is the simpler (and faster) version -// of KeyValue that only supports string values. -// -// Deprecated: Do not use. -type StringKeyValue struct { - Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` - Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *StringKeyValue) Reset() { *m = StringKeyValue{} } -func (m *StringKeyValue) String() string { return proto.CompactTextString(m) } -func (*StringKeyValue) ProtoMessage() {} -func (*StringKeyValue) Descriptor() ([]byte, []int) { - return fileDescriptor_92d5df4519b8f2e3, []int{4} -} -func (m *StringKeyValue) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_StringKeyValue.Unmarshal(m, b) -} -func (m *StringKeyValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_StringKeyValue.Marshal(b, m, deterministic) -} -func (m *StringKeyValue) XXX_Merge(src proto.Message) { - xxx_messageInfo_StringKeyValue.Merge(m, src) -} -func (m *StringKeyValue) XXX_Size() int { - return xxx_messageInfo_StringKeyValue.Size(m) -} -func (m *StringKeyValue) XXX_DiscardUnknown() { - xxx_messageInfo_StringKeyValue.DiscardUnknown(m) -} - -var xxx_messageInfo_StringKeyValue proto.InternalMessageInfo - -func (m *StringKeyValue) GetKey() string { - if m != nil { - return m.Key - } - return "" -} - -func (m *StringKeyValue) GetValue() string { - if m != nil { - return m.Value - } - return "" -} - // InstrumentationLibrary is a message representing the instrumentation library information // such as the fully qualified name and version. type InstrumentationLibrary struct { @@ -367,7 +319,7 @@ func (m *InstrumentationLibrary) Reset() { *m = InstrumentationLibrary{} func (m *InstrumentationLibrary) String() string { return proto.CompactTextString(m) } func (*InstrumentationLibrary) ProtoMessage() {} func (*InstrumentationLibrary) Descriptor() ([]byte, []int) { - return fileDescriptor_92d5df4519b8f2e3, []int{5} + return fileDescriptor_92d5df4519b8f2e3, []int{4} } func (m *InstrumentationLibrary) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InstrumentationLibrary.Unmarshal(m, b) @@ -406,40 +358,38 @@ func init() { proto.RegisterType((*ArrayValue)(nil), "jaeger.common.v1.ArrayValue") proto.RegisterType((*KeyValueList)(nil), "jaeger.common.v1.KeyValueList") proto.RegisterType((*KeyValue)(nil), "jaeger.common.v1.KeyValue") - proto.RegisterType((*StringKeyValue)(nil), "jaeger.common.v1.StringKeyValue") proto.RegisterType((*InstrumentationLibrary)(nil), "jaeger.common.v1.InstrumentationLibrary") } func init() { proto.RegisterFile("common/v1/common.proto", fileDescriptor_92d5df4519b8f2e3) } var fileDescriptor_92d5df4519b8f2e3 = []byte{ - // 437 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xdb, 0x8b, 0xd4, 0x30, - 0x14, 0xc6, 0x27, 0x33, 0xbb, 0x73, 0x39, 0x1d, 0x64, 0x09, 0xb2, 0x14, 0xf1, 0x12, 0xeb, 0x4b, - 0x5f, 0x6c, 0xdd, 0xf1, 0x45, 0x44, 0xd0, 0xed, 0x82, 0x54, 0x5c, 0x64, 0xa9, 0xe0, 0x83, 0x2f, - 0x92, 0xae, 0xa1, 0xc6, 0x69, 0x93, 0x25, 0x4d, 0x0b, 0xfd, 0x07, 0xfd, 0xbb, 0x24, 0x97, 0x76, - 0x17, 0x95, 0xc1, 0xb7, 0x73, 0xbe, 0xfc, 0xce, 0x97, 0x2f, 0x4d, 0x0a, 0xa7, 0xd7, 0xb2, 0x69, - 0xa4, 0x48, 0xfb, 0xb3, 0xd4, 0x55, 0xc9, 0x8d, 0x92, 0x5a, 0xe2, 0x93, 0x9f, 0x94, 0x55, 0x4c, - 0x25, 0x5e, 0xec, 0xcf, 0xa2, 0x5f, 0x73, 0x58, 0x9f, 0x8b, 0xe1, 0x0b, 0xad, 0x3b, 0x86, 0x9f, - 0xc1, 0xb6, 0xd5, 0x8a, 0x8b, 0xea, 0x5b, 0x6f, 0xfa, 0x10, 0x11, 0x14, 0x6f, 0xf2, 0x59, 0x11, - 0x38, 0xd5, 0x41, 0x4f, 0x00, 0x4a, 0x29, 0x6b, 0x8f, 0xcc, 0x09, 0x8a, 0xd7, 0xf9, 0xac, 0xd8, - 0x18, 0xcd, 0x01, 0x8f, 0x60, 0xc3, 0x85, 0xf6, 0xeb, 0x0b, 0x82, 0xe2, 0x45, 0x3e, 0x2b, 0xd6, - 0x5c, 0xe8, 0x69, 0x93, 0xef, 0xb2, 0x2b, 0x6b, 0xe6, 0x89, 0x23, 0x82, 0x62, 0x64, 0x36, 0x71, - 0xaa, 0x83, 0xde, 0x42, 0x40, 0x95, 0xa2, 0x83, 0x67, 0x8e, 0x09, 0x8a, 0x83, 0xdd, 0xc3, 0xe4, - 0xcf, 0xf8, 0xc9, 0xb9, 0x81, 0xec, 0x48, 0x3e, 0x2b, 0x80, 0x4e, 0x1d, 0xbe, 0x80, 0xed, 0xbe, - 0xaf, 0x79, 0x3b, 0xe6, 0x58, 0x5a, 0x87, 0xc7, 0x7f, 0x3b, 0x7c, 0x64, 0x6e, 0xe2, 0x92, 0xb7, - 0xda, 0xa4, 0x70, 0x53, 0xce, 0xe4, 0x29, 0x04, 0xe5, 0xa0, 0x59, 0xeb, 0x3d, 0x56, 0x04, 0xc5, - 0x5b, 0xb3, 0x8f, 0x15, 0x2d, 0x92, 0xad, 0xe0, 0xd8, 0x2e, 0x46, 0xef, 0x00, 0x6e, 0xc3, 0xe0, - 0x1d, 0x2c, 0xad, 0xdc, 0x86, 0x88, 0x2c, 0xe2, 0x60, 0xf7, 0xe0, 0x1f, 0xd1, 0xfd, 0x57, 0x2f, - 0x3c, 0x19, 0x65, 0xb0, 0xbd, 0x1b, 0xe6, 0x7f, 0x3c, 0x46, 0x7e, 0xf2, 0xf8, 0x04, 0xeb, 0x51, - 0xc3, 0x27, 0xb0, 0xd8, 0xb3, 0xc1, 0x5d, 0x62, 0x61, 0x4a, 0xfc, 0xc2, 0x87, 0xb5, 0xb7, 0x76, - 0x38, 0x94, 0x3f, 0xd5, 0x1b, 0xb8, 0xf7, 0xd9, 0xde, 0xfd, 0x01, 0xd7, 0xfb, 0x77, 0x5d, 0x37, - 0x7e, 0xf2, 0xf5, 0x3c, 0x44, 0xd1, 0x7b, 0x38, 0xfd, 0x20, 0x5a, 0xad, 0xba, 0x86, 0x09, 0x4d, - 0x35, 0x97, 0xe2, 0x92, 0x97, 0x8a, 0xaa, 0x01, 0x63, 0x38, 0x12, 0xb4, 0xf1, 0x2f, 0xac, 0xb0, - 0x35, 0x0e, 0x61, 0xd5, 0x33, 0xd5, 0x72, 0x29, 0xbc, 0xd3, 0xd8, 0x66, 0x7b, 0x20, 0x5c, 0x26, - 0xf2, 0x86, 0x09, 0xcd, 0x6a, 0xd6, 0x30, 0xad, 0x06, 0xf7, 0xa0, 0x6f, 0x93, 0x67, 0xc1, 0x85, - 0x2d, 0xaf, 0x8c, 0x7c, 0x85, 0xbe, 0xbe, 0xaa, 0xb8, 0xfe, 0xd1, 0x95, 0x06, 0x48, 0xdd, 0x29, - 0xb5, 0xa2, 0xd7, 0x5c, 0x54, 0xbe, 0x4b, 0xed, 0xfc, 0xf3, 0x8a, 0x89, 0x54, 0x6a, 0x56, 0xa7, - 0xd3, 0x0f, 0x53, 0x2e, 0xed, 0xca, 0xcb, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x8a, 0xc0, 0x73, - 0x55, 0x44, 0x03, 0x00, 0x00, + // 418 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0x4f, 0x6f, 0xd4, 0x30, + 0x10, 0xc5, 0xd7, 0xdd, 0x76, 0x77, 0x33, 0xc9, 0xa1, 0xf2, 0xa1, 0x5a, 0x21, 0xfe, 0x98, 0xe5, + 0x92, 0x0b, 0x09, 0x5d, 0x2e, 0xdc, 0xa0, 0xa9, 0x84, 0x82, 0xa8, 0x50, 0xe5, 0x03, 0x07, 0x2e, + 0xc8, 0x29, 0x56, 0x30, 0x9b, 0xd8, 0x95, 0xe3, 0x44, 0xca, 0x17, 0xe4, 0x73, 0x21, 0xff, 0x49, + 0x16, 0x01, 0x42, 0xbd, 0xcd, 0x3c, 0xff, 0xe6, 0xcd, 0x4b, 0x6c, 0xb8, 0xb8, 0x53, 0x6d, 0xab, + 0x64, 0x3e, 0x5c, 0xe6, 0xbe, 0xca, 0xee, 0xb5, 0x32, 0x0a, 0x9f, 0xff, 0x60, 0xbc, 0xe6, 0x3a, + 0x0b, 0xe2, 0x70, 0xb9, 0xfb, 0x79, 0x02, 0x9b, 0x2b, 0x39, 0x7e, 0x66, 0x4d, 0xcf, 0xf1, 0x0b, + 0x48, 0x3a, 0xa3, 0x85, 0xac, 0xbf, 0x0e, 0xb6, 0xdf, 0x22, 0x82, 0xd2, 0xa8, 0x5c, 0xd0, 0xd8, + 0xab, 0x1e, 0x7a, 0x06, 0x50, 0x29, 0xd5, 0x04, 0xe4, 0x84, 0xa0, 0x74, 0x53, 0x2e, 0x68, 0x64, + 0x35, 0x0f, 0x3c, 0x81, 0x48, 0x48, 0x13, 0xce, 0x97, 0x04, 0xa5, 0xcb, 0x72, 0x41, 0x37, 0x42, + 0x9a, 0x79, 0xc9, 0x37, 0xd5, 0x57, 0x0d, 0x0f, 0xc4, 0x29, 0x41, 0x29, 0xb2, 0x4b, 0xbc, 0xea, + 0xa1, 0xb7, 0x10, 0x33, 0xad, 0xd9, 0x18, 0x98, 0x33, 0x82, 0xd2, 0x78, 0xff, 0x38, 0xfb, 0x33, + 0x7e, 0x76, 0x65, 0x21, 0x37, 0x52, 0x2e, 0x28, 0xb0, 0xb9, 0xc3, 0xd7, 0x90, 0x1c, 0x86, 0x46, + 0x74, 0x53, 0x8e, 0x95, 0x73, 0x78, 0xfa, 0xb7, 0xc3, 0x47, 0xee, 0x27, 0x6e, 0x44, 0x67, 0x6c, + 0x0a, 0x3f, 0xe5, 0x4d, 0x9e, 0x43, 0x5c, 0x8d, 0x86, 0x77, 0xc1, 0x63, 0x4d, 0x50, 0x9a, 0xd8, + 0x3d, 0x4e, 0x74, 0x48, 0xb1, 0x86, 0x33, 0x77, 0xb8, 0x7b, 0x07, 0x70, 0x0c, 0x83, 0xf7, 0xb0, + 0x72, 0x72, 0xb7, 0x45, 0x64, 0x99, 0xc6, 0xfb, 0x47, 0xff, 0x88, 0x1e, 0xfe, 0x3a, 0x0d, 0xe4, + 0xae, 0x80, 0xe4, 0xf7, 0x30, 0x0f, 0xf1, 0x98, 0xf8, 0xd9, 0xe3, 0x13, 0x6c, 0x26, 0x0d, 0x9f, + 0xc3, 0xf2, 0xc0, 0x47, 0x7f, 0x89, 0xd4, 0x96, 0xf8, 0x55, 0x08, 0xeb, 0x6e, 0xed, 0xff, 0xa1, + 0xc2, 0x57, 0xbd, 0x87, 0x8b, 0x0f, 0xb2, 0x33, 0xba, 0x6f, 0xb9, 0x34, 0xcc, 0x08, 0x25, 0x6f, + 0x44, 0xa5, 0x99, 0x1e, 0x31, 0x86, 0x53, 0xc9, 0xda, 0xf0, 0x46, 0xa8, 0xab, 0xf1, 0x16, 0xd6, + 0x03, 0xd7, 0x9d, 0x50, 0xd2, 0x6d, 0x88, 0xe8, 0xd4, 0x16, 0x07, 0x20, 0x42, 0x65, 0xea, 0x9e, + 0x4b, 0xc3, 0x1b, 0xde, 0x72, 0xa3, 0x47, 0xff, 0x24, 0x8f, 0xbb, 0x8b, 0xf8, 0xda, 0x95, 0xb7, + 0x56, 0xbe, 0x45, 0x5f, 0xde, 0xd4, 0xc2, 0x7c, 0xef, 0x2b, 0x0b, 0xe4, 0x3e, 0xa7, 0xd1, 0xec, + 0x4e, 0xc8, 0x3a, 0x74, 0xb9, 0x9b, 0x7f, 0x59, 0x73, 0x99, 0x2b, 0xc3, 0x9b, 0x7c, 0x7e, 0xf2, + 0xd5, 0xca, 0x9d, 0xbc, 0xfe, 0x15, 0x00, 0x00, 0xff, 0xff, 0x70, 0x1d, 0x25, 0xcc, 0x06, 0x03, + 0x00, 0x00, } diff --git a/proto-gen/otel/resource/v1/resource.pb.go b/proto-gen/otel/resource/v1/resource.pb.go index 8e6a742c4a4..956dd9b8384 100644 --- a/proto-gen/otel/resource/v1/resource.pb.go +++ b/proto-gen/otel/resource/v1/resource.pb.go @@ -23,7 +23,9 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // Resource information. type Resource struct { - // Set of labels that describe the resource. + // Set of attributes that describe the resource. + // Attribute keys MUST be unique (it is not allowed to have more than one + // attribute with the same key). Attributes []*v1.KeyValue `protobuf:"bytes,1,rep,name=attributes,proto3" json:"attributes,omitempty"` // dropped_attributes_count is the number of dropped attributes. If the value is 0, then // no attributes were dropped. diff --git a/proto-gen/otel/trace/v1/trace.pb.go b/proto-gen/otel/trace/v1/trace.pb.go index 29d6b05cb2b..9b8ea6259fb 100644 --- a/proto-gen/otel/trace/v1/trace.pb.go +++ b/proto-gen/otel/trace/v1/trace.pb.go @@ -72,76 +72,6 @@ func (x Span_SpanKind) String() string { } func (Span_SpanKind) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_a52825641200f25e, []int{2, 0} -} - -type Status_DeprecatedStatusCode int32 - -const ( - Status_DEPRECATED_STATUS_CODE_OK Status_DeprecatedStatusCode = 0 - Status_DEPRECATED_STATUS_CODE_CANCELLED Status_DeprecatedStatusCode = 1 - Status_DEPRECATED_STATUS_CODE_UNKNOWN_ERROR Status_DeprecatedStatusCode = 2 - Status_DEPRECATED_STATUS_CODE_INVALID_ARGUMENT Status_DeprecatedStatusCode = 3 - Status_DEPRECATED_STATUS_CODE_DEADLINE_EXCEEDED Status_DeprecatedStatusCode = 4 - Status_DEPRECATED_STATUS_CODE_NOT_FOUND Status_DeprecatedStatusCode = 5 - Status_DEPRECATED_STATUS_CODE_ALREADY_EXISTS Status_DeprecatedStatusCode = 6 - Status_DEPRECATED_STATUS_CODE_PERMISSION_DENIED Status_DeprecatedStatusCode = 7 - Status_DEPRECATED_STATUS_CODE_RESOURCE_EXHAUSTED Status_DeprecatedStatusCode = 8 - Status_DEPRECATED_STATUS_CODE_FAILED_PRECONDITION Status_DeprecatedStatusCode = 9 - Status_DEPRECATED_STATUS_CODE_ABORTED Status_DeprecatedStatusCode = 10 - Status_DEPRECATED_STATUS_CODE_OUT_OF_RANGE Status_DeprecatedStatusCode = 11 - Status_DEPRECATED_STATUS_CODE_UNIMPLEMENTED Status_DeprecatedStatusCode = 12 - Status_DEPRECATED_STATUS_CODE_INTERNAL_ERROR Status_DeprecatedStatusCode = 13 - Status_DEPRECATED_STATUS_CODE_UNAVAILABLE Status_DeprecatedStatusCode = 14 - Status_DEPRECATED_STATUS_CODE_DATA_LOSS Status_DeprecatedStatusCode = 15 - Status_DEPRECATED_STATUS_CODE_UNAUTHENTICATED Status_DeprecatedStatusCode = 16 -) - -var Status_DeprecatedStatusCode_name = map[int32]string{ - 0: "DEPRECATED_STATUS_CODE_OK", - 1: "DEPRECATED_STATUS_CODE_CANCELLED", - 2: "DEPRECATED_STATUS_CODE_UNKNOWN_ERROR", - 3: "DEPRECATED_STATUS_CODE_INVALID_ARGUMENT", - 4: "DEPRECATED_STATUS_CODE_DEADLINE_EXCEEDED", - 5: "DEPRECATED_STATUS_CODE_NOT_FOUND", - 6: "DEPRECATED_STATUS_CODE_ALREADY_EXISTS", - 7: "DEPRECATED_STATUS_CODE_PERMISSION_DENIED", - 8: "DEPRECATED_STATUS_CODE_RESOURCE_EXHAUSTED", - 9: "DEPRECATED_STATUS_CODE_FAILED_PRECONDITION", - 10: "DEPRECATED_STATUS_CODE_ABORTED", - 11: "DEPRECATED_STATUS_CODE_OUT_OF_RANGE", - 12: "DEPRECATED_STATUS_CODE_UNIMPLEMENTED", - 13: "DEPRECATED_STATUS_CODE_INTERNAL_ERROR", - 14: "DEPRECATED_STATUS_CODE_UNAVAILABLE", - 15: "DEPRECATED_STATUS_CODE_DATA_LOSS", - 16: "DEPRECATED_STATUS_CODE_UNAUTHENTICATED", -} - -var Status_DeprecatedStatusCode_value = map[string]int32{ - "DEPRECATED_STATUS_CODE_OK": 0, - "DEPRECATED_STATUS_CODE_CANCELLED": 1, - "DEPRECATED_STATUS_CODE_UNKNOWN_ERROR": 2, - "DEPRECATED_STATUS_CODE_INVALID_ARGUMENT": 3, - "DEPRECATED_STATUS_CODE_DEADLINE_EXCEEDED": 4, - "DEPRECATED_STATUS_CODE_NOT_FOUND": 5, - "DEPRECATED_STATUS_CODE_ALREADY_EXISTS": 6, - "DEPRECATED_STATUS_CODE_PERMISSION_DENIED": 7, - "DEPRECATED_STATUS_CODE_RESOURCE_EXHAUSTED": 8, - "DEPRECATED_STATUS_CODE_FAILED_PRECONDITION": 9, - "DEPRECATED_STATUS_CODE_ABORTED": 10, - "DEPRECATED_STATUS_CODE_OUT_OF_RANGE": 11, - "DEPRECATED_STATUS_CODE_UNIMPLEMENTED": 12, - "DEPRECATED_STATUS_CODE_INTERNAL_ERROR": 13, - "DEPRECATED_STATUS_CODE_UNAVAILABLE": 14, - "DEPRECATED_STATUS_CODE_DATA_LOSS": 15, - "DEPRECATED_STATUS_CODE_UNAUTHENTICATED": 16, -} - -func (x Status_DeprecatedStatusCode) String() string { - return proto.EnumName(Status_DeprecatedStatusCode_name, int32(x)) -} - -func (Status_DeprecatedStatusCode) EnumDescriptor() ([]byte, []int) { return fileDescriptor_a52825641200f25e, []int{3, 0} } @@ -176,7 +106,60 @@ func (x Status_StatusCode) String() string { } func (Status_StatusCode) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_a52825641200f25e, []int{3, 1} + return fileDescriptor_a52825641200f25e, []int{4, 0} +} + +// TracesData represents the traces data that can be stored in a persistent storage, +// OR can be embedded by other protocols that transfer OTLP traces data but do +// not implement the OTLP protocol. +// +// The main difference between this message and collector protocol is that +// in this message there will not be any "control" or "metadata" specific to +// OTLP protocol. +// +// When new fields are added into this message, the OTLP request MUST be updated +// as well. +type TracesData struct { + // An array of ResourceSpans. + // For data coming from a single resource this array will typically contain + // one element. Intermediary nodes that receive data from multiple origins + // typically batch the data before forwarding further and in that case this + // array will contain multiple elements. + ResourceSpans []*ResourceSpans `protobuf:"bytes,1,rep,name=resource_spans,json=resourceSpans,proto3" json:"resource_spans,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *TracesData) Reset() { *m = TracesData{} } +func (m *TracesData) String() string { return proto.CompactTextString(m) } +func (*TracesData) ProtoMessage() {} +func (*TracesData) Descriptor() ([]byte, []int) { + return fileDescriptor_a52825641200f25e, []int{0} +} +func (m *TracesData) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_TracesData.Unmarshal(m, b) +} +func (m *TracesData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_TracesData.Marshal(b, m, deterministic) +} +func (m *TracesData) XXX_Merge(src proto.Message) { + xxx_messageInfo_TracesData.Merge(m, src) +} +func (m *TracesData) XXX_Size() int { + return xxx_messageInfo_TracesData.Size(m) +} +func (m *TracesData) XXX_DiscardUnknown() { + xxx_messageInfo_TracesData.DiscardUnknown(m) +} + +var xxx_messageInfo_TracesData proto.InternalMessageInfo + +func (m *TracesData) GetResourceSpans() []*ResourceSpans { + if m != nil { + return m.ResourceSpans + } + return nil } // A collection of InstrumentationLibrarySpans from a Resource. @@ -199,7 +182,7 @@ func (m *ResourceSpans) Reset() { *m = ResourceSpans{} } func (m *ResourceSpans) String() string { return proto.CompactTextString(m) } func (*ResourceSpans) ProtoMessage() {} func (*ResourceSpans) Descriptor() ([]byte, []int) { - return fileDescriptor_a52825641200f25e, []int{0} + return fileDescriptor_a52825641200f25e, []int{1} } func (m *ResourceSpans) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ResourceSpans.Unmarshal(m, b) @@ -259,7 +242,7 @@ func (m *InstrumentationLibrarySpans) Reset() { *m = InstrumentationLibr func (m *InstrumentationLibrarySpans) String() string { return proto.CompactTextString(m) } func (*InstrumentationLibrarySpans) ProtoMessage() {} func (*InstrumentationLibrarySpans) Descriptor() ([]byte, []int) { - return fileDescriptor_a52825641200f25e, []int{1} + return fileDescriptor_a52825641200f25e, []int{2} } func (m *InstrumentationLibrarySpans) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InstrumentationLibrarySpans.Unmarshal(m, b) @@ -343,9 +326,7 @@ type Span struct { // This makes it easier to correlate spans in different traces. // // This field is semantically required to be set to non-empty string. - // When null or empty string received - receiver may use string "name" - // as a replacement. There might be smarted algorithms implemented by - // receiver to fix the empty span name. + // Empty value is equivalent to an unknown span name. // // This field is required. Name string `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"` @@ -367,14 +348,18 @@ type Span struct { // // This field is semantically required and it is expected that end_time >= start_time. EndTimeUnixNano uint64 `protobuf:"fixed64,8,opt,name=end_time_unix_nano,json=endTimeUnixNano,proto3" json:"end_time_unix_nano,omitempty"` - // attributes is a collection of key/value pairs. The value can be a string, - // an integer, a double or the Boolean values `true` or `false`. Note, global attributes + // attributes is a collection of key/value pairs. Note, global attributes // like server name can be set using the resource API. Examples of attributes: // // "/http/user_agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36" // "/http/server_latency": 300 // "abc.com/myattribute": true // "abc.com/score": 10.239 + // + // The OpenTelemetry API specification further restricts the allowed value types: + // https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/common/common.md#attributes + // Attribute keys MUST be unique (it is not allowed to have more than one + // attribute with the same key). Attributes []*v11.KeyValue `protobuf:"bytes,9,rep,name=attributes,proto3" json:"attributes,omitempty"` // dropped_attributes_count is the number of attributes that were discarded. Attributes // can be discarded because their keys are too long or because there are too many @@ -403,7 +388,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_a52825641200f25e, []int{2} + return fileDescriptor_a52825641200f25e, []int{3} } func (m *Span) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Span.Unmarshal(m, b) @@ -537,6 +522,8 @@ type Span_Event struct { // This field is semantically required to be set to non-empty string. Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` // attributes is a collection of attribute key/value pairs on the event. + // Attribute keys MUST be unique (it is not allowed to have more than one + // attribute with the same key). Attributes []*v11.KeyValue `protobuf:"bytes,3,rep,name=attributes,proto3" json:"attributes,omitempty"` // dropped_attributes_count is the number of dropped attributes. If the value is 0, // then no attributes were dropped. @@ -550,7 +537,7 @@ func (m *Span_Event) Reset() { *m = Span_Event{} } func (m *Span_Event) String() string { return proto.CompactTextString(m) } func (*Span_Event) ProtoMessage() {} func (*Span_Event) Descriptor() ([]byte, []int) { - return fileDescriptor_a52825641200f25e, []int{2, 0} + return fileDescriptor_a52825641200f25e, []int{3, 0} } func (m *Span_Event) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Span_Event.Unmarshal(m, b) @@ -611,6 +598,8 @@ type Span_Link struct { // The trace_state associated with the link. TraceState string `protobuf:"bytes,3,opt,name=trace_state,json=traceState,proto3" json:"trace_state,omitempty"` // attributes is a collection of attribute key/value pairs on the link. + // Attribute keys MUST be unique (it is not allowed to have more than one + // attribute with the same key). Attributes []*v11.KeyValue `protobuf:"bytes,4,rep,name=attributes,proto3" json:"attributes,omitempty"` // dropped_attributes_count is the number of dropped attributes. If the value is 0, // then no attributes were dropped. @@ -624,7 +613,7 @@ func (m *Span_Link) Reset() { *m = Span_Link{} } func (m *Span_Link) String() string { return proto.CompactTextString(m) } func (*Span_Link) ProtoMessage() {} func (*Span_Link) Descriptor() ([]byte, []int) { - return fileDescriptor_a52825641200f25e, []int{2, 1} + return fileDescriptor_a52825641200f25e, []int{3, 1} } func (m *Span_Link) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Span_Link.Unmarshal(m, b) @@ -682,13 +671,6 @@ func (m *Span_Link) GetDroppedAttributesCount() uint32 { // The Status type defines a logical error model that is suitable for different // programming environments, including REST APIs and RPC APIs. type Status struct { - // The deprecated status code. This is an optional field. - // - // This field is deprecated and is replaced by the `code` field below. See backward - // compatibility notes below. According to our stability guarantees this field - // will be removed in 12 months, on Oct 22, 2021. All usage of old senders and - // receivers that do not understand the `code` field MUST be phased out by then. - DeprecatedCode Status_DeprecatedStatusCode `protobuf:"varint,1,opt,name=deprecated_code,json=deprecatedCode,proto3,enum=jaeger.trace.v1.Status_DeprecatedStatusCode" json:"deprecated_code,omitempty"` // Deprecated: Do not use. // A developer-facing human readable error message. Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"` // The status code. @@ -702,7 +684,7 @@ func (m *Status) Reset() { *m = Status{} } func (m *Status) String() string { return proto.CompactTextString(m) } func (*Status) ProtoMessage() {} func (*Status) Descriptor() ([]byte, []int) { - return fileDescriptor_a52825641200f25e, []int{3} + return fileDescriptor_a52825641200f25e, []int{4} } func (m *Status) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Status.Unmarshal(m, b) @@ -722,14 +704,6 @@ func (m *Status) XXX_DiscardUnknown() { var xxx_messageInfo_Status proto.InternalMessageInfo -// Deprecated: Do not use. -func (m *Status) GetDeprecatedCode() Status_DeprecatedStatusCode { - if m != nil { - return m.DeprecatedCode - } - return Status_DEPRECATED_STATUS_CODE_OK -} - func (m *Status) GetMessage() string { if m != nil { return m.Message @@ -746,8 +720,8 @@ func (m *Status) GetCode() Status_StatusCode { func init() { proto.RegisterEnum("jaeger.trace.v1.Span_SpanKind", Span_SpanKind_name, Span_SpanKind_value) - proto.RegisterEnum("jaeger.trace.v1.Status_DeprecatedStatusCode", Status_DeprecatedStatusCode_name, Status_DeprecatedStatusCode_value) proto.RegisterEnum("jaeger.trace.v1.Status_StatusCode", Status_StatusCode_name, Status_StatusCode_value) + proto.RegisterType((*TracesData)(nil), "jaeger.trace.v1.TracesData") proto.RegisterType((*ResourceSpans)(nil), "jaeger.trace.v1.ResourceSpans") proto.RegisterType((*InstrumentationLibrarySpans)(nil), "jaeger.trace.v1.InstrumentationLibrarySpans") proto.RegisterType((*Span)(nil), "jaeger.trace.v1.Span") @@ -759,77 +733,60 @@ func init() { func init() { proto.RegisterFile("trace/v1/trace.proto", fileDescriptor_a52825641200f25e) } var fileDescriptor_a52825641200f25e = []byte{ - // 1144 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x4f, 0x53, 0xdb, 0xd6, - 0x17, 0x8d, 0xc0, 0x7f, 0xe0, 0x02, 0x46, 0x79, 0x3f, 0x42, 0x14, 0xe7, 0x97, 0xc4, 0xe3, 0xa6, - 0x89, 0xf3, 0xcf, 0x4e, 0xc8, 0x4c, 0x9b, 0xe9, 0x4e, 0x48, 0x8f, 0x44, 0x83, 0x90, 0x3c, 0x4f, - 0x12, 0x4d, 0xba, 0x79, 0x23, 0xac, 0x37, 0x44, 0xc5, 0x96, 0x3c, 0x92, 0xcc, 0x84, 0x8f, 0xd2, - 0x4f, 0xd2, 0x75, 0xf7, 0xdd, 0x74, 0x9b, 0x65, 0x3f, 0x49, 0xe7, 0x3d, 0x49, 0x80, 0x01, 0xb9, - 0x9b, 0x74, 0xc3, 0x3c, 0x9d, 0x73, 0xee, 0x3d, 0xf7, 0xea, 0xde, 0x87, 0x05, 0x5b, 0x59, 0xe2, - 0x8f, 0xd8, 0xe0, 0xf4, 0xcd, 0x40, 0x1c, 0xfa, 0xd3, 0x24, 0xce, 0x62, 0xb4, 0xf9, 0xab, 0xcf, - 0x8e, 0x59, 0xd2, 0xcf, 0xb1, 0xd3, 0x37, 0xed, 0xed, 0x51, 0x3c, 0x99, 0xc4, 0x11, 0xd7, 0xe5, - 0xa7, 0x5c, 0xd8, 0x6e, 0x27, 0x2c, 0x8d, 0x67, 0x49, 0x9e, 0xa1, 0x3c, 0xe7, 0x5c, 0xf7, 0xab, - 0x04, 0x1b, 0xa4, 0x80, 0x9c, 0xa9, 0x1f, 0xa5, 0xe8, 0x1d, 0xac, 0x94, 0x1a, 0x45, 0xea, 0x48, - 0xbd, 0xb5, 0x9d, 0xff, 0xf7, 0x0b, 0xa7, 0xf3, 0xd8, 0xd3, 0x37, 0xfd, 0x32, 0x88, 0x9c, 0xab, - 0xd1, 0x14, 0x1e, 0x84, 0x51, 0x9a, 0x25, 0xb3, 0x09, 0x8b, 0x32, 0x3f, 0x0b, 0xe3, 0x88, 0x8e, - 0xc3, 0xa3, 0xc4, 0x4f, 0xce, 0x68, 0xca, 0x53, 0x2b, 0x4b, 0x9d, 0xe5, 0xde, 0xda, 0xce, 0xcb, - 0xfe, 0x95, 0xc2, 0xfb, 0xc6, 0x7c, 0x94, 0x99, 0x07, 0x89, 0x72, 0xc8, 0xfd, 0xb0, 0x9a, 0x44, - 0x0f, 0x00, 0xd2, 0xd1, 0x67, 0x36, 0xf1, 0xe9, 0x2c, 0x19, 0x2b, 0xcb, 0x1d, 0xa9, 0xb7, 0x4a, - 0x56, 0x73, 0xc4, 0x4b, 0xc6, 0xdd, 0x3f, 0x25, 0xb8, 0xbf, 0x20, 0x37, 0xf2, 0xe1, 0x6e, 0x45, - 0xc1, 0x45, 0xe7, 0xbd, 0xb2, 0xd4, 0xe2, 0x7d, 0x56, 0xd6, 0x4a, 0xb6, 0x6f, 0x2e, 0x13, 0xbd, - 0x80, 0xfa, 0xe5, 0xde, 0xef, 0x5c, 0xeb, 0x9d, 0x57, 0x42, 0x72, 0xcd, 0xbf, 0xb5, 0xf3, 0xc7, - 0x2a, 0xd4, 0xb8, 0x1c, 0xdd, 0x83, 0x15, 0x11, 0x4f, 0xc3, 0x40, 0x14, 0xba, 0x4e, 0x9a, 0xe2, - 0xd9, 0x08, 0xd0, 0x5d, 0x68, 0xf2, 0x5c, 0x9c, 0x59, 0x12, 0x4c, 0x83, 0x3f, 0x1a, 0x01, 0x7a, - 0x04, 0x6b, 0x79, 0x4c, 0x9a, 0xf9, 0x19, 0x2b, 0x92, 0x83, 0x80, 0x1c, 0x8e, 0xa0, 0xc7, 0xd0, - 0x9a, 0xfa, 0x09, 0x8b, 0x32, 0x5a, 0x26, 0xa8, 0x89, 0x04, 0xeb, 0x39, 0xea, 0xe4, 0x69, 0x10, - 0xd4, 0x22, 0x7f, 0xc2, 0x94, 0xba, 0x88, 0x17, 0x67, 0xb4, 0x03, 0xb5, 0x93, 0x30, 0x0a, 0x94, - 0x46, 0x47, 0xea, 0xb5, 0x76, 0x1e, 0xde, 0xd8, 0xa2, 0xf8, 0xb3, 0x1f, 0x46, 0x01, 0x11, 0x5a, - 0x34, 0x80, 0xad, 0x34, 0xf3, 0x93, 0x8c, 0x66, 0xe1, 0x84, 0xd1, 0x59, 0x14, 0x7e, 0xa1, 0x91, - 0x1f, 0xc5, 0x4a, 0xb3, 0x23, 0xf5, 0x1a, 0xe4, 0xb6, 0xe0, 0xdc, 0x70, 0xc2, 0xbc, 0x28, 0xfc, - 0x62, 0xf9, 0x51, 0x8c, 0x5e, 0x00, 0x62, 0x51, 0x70, 0x55, 0xbe, 0x22, 0xe4, 0x9b, 0x2c, 0x0a, - 0xe6, 0xc4, 0x3f, 0x01, 0xf8, 0x59, 0x96, 0x84, 0x47, 0xb3, 0x8c, 0xa5, 0xca, 0xaa, 0x78, 0xf5, - 0xed, 0xeb, 0xb3, 0xdc, 0x67, 0x67, 0x87, 0xfe, 0x78, 0xc6, 0xc8, 0x25, 0x35, 0x7a, 0x07, 0x4a, - 0x90, 0xc4, 0xd3, 0x29, 0x0b, 0xe8, 0x05, 0x4a, 0x47, 0xf1, 0x2c, 0xca, 0x14, 0xe8, 0x48, 0xbd, - 0x0d, 0xb2, 0x5d, 0xf0, 0xea, 0x39, 0xad, 0x71, 0x16, 0xbd, 0x85, 0x06, 0x3b, 0x65, 0x51, 0x96, - 0x2a, 0x6b, 0xc2, 0xf1, 0xfe, 0xcd, 0x6f, 0x02, 0x73, 0x0d, 0x29, 0xa4, 0xe8, 0x35, 0x6c, 0x95, - 0x76, 0x39, 0x52, 0x58, 0xad, 0x0b, 0x2b, 0x54, 0x70, 0x22, 0xa6, 0xb0, 0x79, 0x0d, 0xf5, 0x71, - 0x18, 0x9d, 0xa4, 0xca, 0xc6, 0x7c, 0x5f, 0xf3, 0x2e, 0x66, 0x18, 0x9d, 0x90, 0x5c, 0x88, 0xfa, - 0xf0, 0xbf, 0xd2, 0x43, 0x00, 0x85, 0x45, 0x4b, 0x58, 0xdc, 0x2e, 0x28, 0x1e, 0x50, 0x38, 0x0c, - 0xa0, 0xc1, 0xb7, 0x64, 0x96, 0x2a, 0x9b, 0xe2, 0x1a, 0xdc, 0xbd, 0x6e, 0x21, 0x68, 0x52, 0xc8, - 0xda, 0xbf, 0x4b, 0x50, 0x17, 0x25, 0xf2, 0x2d, 0xba, 0x32, 0x22, 0x49, 0x8c, 0x68, 0x3d, 0xbb, - 0x3c, 0x9f, 0x72, 0x8b, 0x96, 0x2e, 0x6d, 0xd1, 0xfc, 0xcc, 0x96, 0xbf, 0xd9, 0xcc, 0x6a, 0x8b, - 0x66, 0xd6, 0xfe, 0x4b, 0x82, 0x1a, 0xef, 0xfc, 0xbf, 0xb9, 0x53, 0xf3, 0x3d, 0xd5, 0xbe, 0x59, - 0x4f, 0xf5, 0x45, 0x3d, 0x75, 0x7f, 0x93, 0x60, 0xa5, 0xbc, 0x6e, 0xe8, 0x1e, 0xdc, 0x71, 0x86, - 0xaa, 0x45, 0xf7, 0x0d, 0x4b, 0xa7, 0x9e, 0xe5, 0x0c, 0xb1, 0x66, 0xec, 0x19, 0x58, 0x97, 0x6f, - 0xa1, 0x6d, 0x40, 0x17, 0x94, 0x61, 0xb9, 0x98, 0x58, 0xaa, 0x29, 0x4b, 0x68, 0x0b, 0xe4, 0x0b, - 0xdc, 0xc1, 0xe4, 0x10, 0x13, 0x79, 0x69, 0x1e, 0xd5, 0x4c, 0x03, 0x5b, 0xae, 0xbc, 0x3c, 0x9f, - 0x63, 0x48, 0x6c, 0xdd, 0xd3, 0x30, 0x91, 0x6b, 0xf3, 0xb8, 0x66, 0x5b, 0x8e, 0x77, 0x80, 0x89, - 0x5c, 0xef, 0xfe, 0xdd, 0x84, 0x46, 0xbe, 0x3c, 0xe8, 0x13, 0x6c, 0x06, 0x6c, 0x9a, 0xb0, 0x91, - 0x9f, 0xb1, 0x80, 0x8e, 0xe2, 0x20, 0xff, 0xbd, 0x69, 0xdd, 0xf0, 0x03, 0x91, 0x47, 0xf4, 0xf5, - 0x73, 0x79, 0x0e, 0x68, 0x71, 0xc0, 0x76, 0x97, 0x14, 0x89, 0xb4, 0x2e, 0x12, 0x71, 0x0c, 0x29, - 0xd0, 0x9c, 0xb0, 0x34, 0xf5, 0x8f, 0xcb, 0x15, 0x2b, 0x1f, 0xd1, 0x0f, 0x50, 0x13, 0x4e, 0xcb, - 0xc2, 0xa9, 0x5b, 0xe5, 0x74, 0x91, 0x9f, 0x08, 0x7d, 0xf7, 0x6b, 0x1d, 0xb6, 0x6e, 0xb2, 0x47, - 0x0f, 0xe0, 0x9e, 0x8e, 0x87, 0x04, 0x6b, 0xaa, 0x8b, 0x75, 0xea, 0xb8, 0xaa, 0xeb, 0x39, 0x54, - 0xb3, 0x75, 0x4c, 0xed, 0x7d, 0xf9, 0x16, 0x7a, 0x0c, 0x9d, 0x0a, 0x5a, 0x53, 0x2d, 0x0d, 0x9b, - 0x26, 0xd6, 0x65, 0x09, 0xf5, 0xe0, 0x71, 0x85, 0xca, 0xb3, 0xf6, 0x2d, 0xfb, 0x67, 0x8b, 0x62, - 0x42, 0x6c, 0x3e, 0x85, 0x17, 0xf0, 0xb4, 0x42, 0x69, 0x58, 0x87, 0xaa, 0x69, 0xe8, 0x54, 0x25, - 0xef, 0xbd, 0x83, 0x7c, 0x38, 0x2f, 0xa1, 0x57, 0x21, 0xd6, 0xb1, 0xaa, 0x9b, 0x86, 0x85, 0x29, - 0xfe, 0xa8, 0x61, 0xac, 0x63, 0x5d, 0xae, 0x2d, 0x28, 0xd5, 0xb2, 0x5d, 0xba, 0x67, 0x7b, 0x96, - 0x2e, 0xd7, 0xd1, 0x33, 0xf8, 0xbe, 0x42, 0xa5, 0x9a, 0x04, 0xab, 0xfa, 0x27, 0x8a, 0x3f, 0x1a, - 0x8e, 0xeb, 0xc8, 0x8d, 0x05, 0xf6, 0x43, 0x4c, 0x0e, 0x0c, 0xc7, 0x31, 0x6c, 0x8b, 0xea, 0xd8, - 0xe2, 0xdb, 0xd8, 0x44, 0xaf, 0xe0, 0x59, 0x85, 0x9a, 0x60, 0xc7, 0xf6, 0x88, 0xc6, 0x8b, 0xfd, - 0xa0, 0x7a, 0x8e, 0x8b, 0x75, 0x79, 0x05, 0xf5, 0xe1, 0x79, 0x85, 0x7c, 0x4f, 0x35, 0x4c, 0xcc, - 0x97, 0x11, 0x6b, 0xb6, 0xa5, 0x1b, 0xae, 0x61, 0x5b, 0xf2, 0x2a, 0xea, 0xc2, 0xc3, 0xaa, 0xba, - 0x77, 0x6d, 0xc2, 0x73, 0x02, 0x7a, 0x0a, 0xdf, 0x55, 0xcd, 0xd2, 0x73, 0xa9, 0xbd, 0x47, 0x89, - 0x6a, 0xbd, 0xc7, 0xf2, 0xda, 0xc2, 0x79, 0x19, 0x07, 0x43, 0x13, 0xf3, 0x01, 0x60, 0x5d, 0x5e, - 0x5f, 0xf0, 0xba, 0xca, 0x0b, 0x57, 0x8c, 0x76, 0x03, 0x3d, 0x81, 0x6e, 0x65, 0x52, 0xf5, 0x50, - 0x35, 0x4c, 0x75, 0xd7, 0xc4, 0x72, 0x6b, 0xc1, 0x9c, 0x74, 0xd5, 0x55, 0xa9, 0x69, 0x3b, 0x8e, - 0xbc, 0x89, 0x9e, 0xc3, 0x93, 0xea, 0x6c, 0x9e, 0xfb, 0x01, 0x5b, 0xae, 0x21, 0x38, 0x59, 0xee, - 0x5a, 0x00, 0x97, 0x36, 0xfa, 0x0e, 0xdc, 0x9e, 0x97, 0x3b, 0xd8, 0x95, 0x6f, 0x21, 0x04, 0xad, - 0x2b, 0xdb, 0x2d, 0x5d, 0x95, 0x16, 0x4b, 0xba, 0xfb, 0x19, 0x1e, 0x85, 0x71, 0x3f, 0x9e, 0xb2, - 0x28, 0x63, 0x63, 0x36, 0x61, 0x59, 0x72, 0x96, 0x7f, 0x6e, 0x9e, 0xdf, 0xb3, 0x5d, 0x70, 0xf9, - 0x69, 0xc8, 0xc1, 0xa1, 0xf4, 0xcb, 0x8f, 0xc7, 0x61, 0xf6, 0x79, 0x76, 0xc4, 0xff, 0x25, 0x0e, - 0xf2, 0x1b, 0xc9, 0x85, 0x61, 0x74, 0x5c, 0x3c, 0x0d, 0x44, 0xf4, 0xab, 0x63, 0x16, 0x0d, 0xe2, - 0x8c, 0x8d, 0x07, 0xe5, 0xf7, 0xf0, 0x51, 0x43, 0x10, 0x6f, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, - 0xe8, 0x34, 0x06, 0x1c, 0x22, 0x0b, 0x00, 0x00, + // 874 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x4d, 0x6f, 0xe3, 0x36, + 0x10, 0x5d, 0x3a, 0xb2, 0xe3, 0x4c, 0x12, 0x47, 0x61, 0xf3, 0xa1, 0x75, 0xba, 0x5d, 0xc3, 0xe8, + 0xc1, 0xc0, 0xb6, 0xf6, 0x6e, 0x16, 0x68, 0x17, 0xbd, 0x65, 0x6d, 0x15, 0x70, 0x93, 0xca, 0x06, + 0x65, 0xef, 0xa1, 0x17, 0x81, 0xb1, 0x08, 0x87, 0x8d, 0x45, 0x19, 0x12, 0x15, 0x6c, 0x7e, 0x4a, + 0xff, 0x45, 0x6f, 0x3d, 0xf7, 0xde, 0x4b, 0xaf, 0xfd, 0x35, 0x05, 0x49, 0x29, 0xb1, 0xf2, 0xd5, + 0x4b, 0x7a, 0x49, 0xc8, 0xf7, 0xde, 0xcc, 0xbc, 0xd1, 0x8c, 0x20, 0xc3, 0x9e, 0x4c, 0xe8, 0x8c, + 0xf5, 0xae, 0xde, 0xf5, 0xf4, 0xa1, 0xbb, 0x4c, 0x62, 0x19, 0xe3, 0x9d, 0x5f, 0x29, 0x9b, 0xb3, + 0xa4, 0x6b, 0xb0, 0xab, 0x77, 0xcd, 0x83, 0x59, 0x1c, 0x45, 0xb1, 0x50, 0x3a, 0x73, 0x32, 0xc2, + 0x66, 0x33, 0x61, 0x69, 0x9c, 0x25, 0x26, 0x43, 0x71, 0x36, 0x5c, 0xdb, 0x07, 0x98, 0xa8, 0xf8, + 0x74, 0x40, 0x25, 0xc5, 0x2e, 0x34, 0x0a, 0x3e, 0x48, 0x97, 0x54, 0xa4, 0x0e, 0x6a, 0xad, 0x75, + 0x36, 0x8f, 0xbf, 0xea, 0xde, 0xa9, 0xd5, 0x25, 0xb9, 0xcc, 0x57, 0x2a, 0xb2, 0x9d, 0xac, 0x5e, + 0xdb, 0xff, 0x20, 0xd8, 0x2e, 0x09, 0xf0, 0x07, 0xa8, 0x17, 0x12, 0x07, 0xb5, 0x50, 0x67, 0xf3, + 0xf8, 0xcb, 0x22, 0xe5, 0x8d, 0xa1, 0x95, 0xac, 0xe4, 0x46, 0x8d, 0x97, 0xf0, 0x8a, 0x8b, 0x54, + 0x26, 0x59, 0xc4, 0x84, 0xa4, 0x92, 0xc7, 0x22, 0x58, 0xf0, 0xf3, 0x84, 0x26, 0xd7, 0xb9, 0xc3, + 0x8a, 0x76, 0xf8, 0xcd, 0x3d, 0x87, 0xc3, 0x72, 0xd4, 0x99, 0x09, 0x32, 0x7e, 0x8f, 0xf8, 0xe3, + 0x24, 0x7e, 0x05, 0x90, 0xce, 0x2e, 0x58, 0x44, 0x83, 0x2c, 0x59, 0x38, 0x6b, 0x2d, 0xd4, 0xd9, + 0x20, 0x1b, 0x06, 0x99, 0x26, 0x8b, 0xf6, 0x5f, 0x08, 0x8e, 0x9e, 0xc8, 0x8d, 0x29, 0x1c, 0x3e, + 0x62, 0x38, 0xef, 0xbc, 0x53, 0x58, 0xcd, 0x87, 0xf4, 0xa8, 0x57, 0x72, 0xf0, 0xb0, 0x4d, 0xfc, + 0x06, 0xaa, 0xab, 0xbd, 0xef, 0xdf, 0xeb, 0x5d, 0x39, 0x21, 0x46, 0xf3, 0x5f, 0xed, 0xfc, 0xb9, + 0x01, 0x96, 0x92, 0xe3, 0x97, 0x50, 0xd7, 0xf1, 0x01, 0x0f, 0xb5, 0xd1, 0x2d, 0xb2, 0xae, 0xef, + 0xc3, 0x10, 0x1f, 0xc2, 0xba, 0xca, 0xa5, 0x98, 0x8a, 0x66, 0x6a, 0xea, 0x3a, 0x0c, 0xf1, 0x6b, + 0xd8, 0x34, 0x31, 0xa9, 0xa4, 0x92, 0xe5, 0xc9, 0x41, 0x43, 0xbe, 0x42, 0xf0, 0xd7, 0xd0, 0x58, + 0xd2, 0x84, 0x09, 0x19, 0x14, 0x09, 0x2c, 0x9d, 0x60, 0xcb, 0xa0, 0xbe, 0x49, 0x83, 0xc1, 0x12, + 0x34, 0x62, 0x4e, 0x55, 0xc7, 0xeb, 0x33, 0x3e, 0x06, 0xeb, 0x92, 0x8b, 0xd0, 0xa9, 0xb5, 0x50, + 0xa7, 0xf1, 0xc0, 0x02, 0xaa, 0x50, 0xfd, 0xe7, 0x94, 0x8b, 0x90, 0x68, 0x2d, 0xee, 0xc1, 0x5e, + 0x2a, 0x69, 0x22, 0x03, 0xc9, 0x23, 0x16, 0x64, 0x82, 0x7f, 0x0e, 0x04, 0x15, 0xb1, 0xb3, 0xde, + 0x42, 0x9d, 0x1a, 0xd9, 0xd5, 0xdc, 0x84, 0x47, 0x6c, 0x2a, 0xf8, 0x67, 0x8f, 0x8a, 0x18, 0xbf, + 0x01, 0xcc, 0x44, 0x78, 0x57, 0x5e, 0xd7, 0xf2, 0x1d, 0x26, 0xc2, 0x92, 0xf8, 0x07, 0x00, 0x2a, + 0x65, 0xc2, 0xcf, 0x33, 0xc9, 0x52, 0x67, 0x43, 0x3f, 0xfa, 0xe6, 0xfd, 0x59, 0x9e, 0xb2, 0xeb, + 0x4f, 0x74, 0x91, 0x31, 0xb2, 0xa2, 0xc6, 0x1f, 0xc0, 0x09, 0x93, 0x78, 0xb9, 0x64, 0x61, 0x70, + 0x8b, 0x06, 0xb3, 0x38, 0x13, 0xd2, 0x81, 0x16, 0xea, 0x6c, 0x93, 0x83, 0x9c, 0x3f, 0xb9, 0xa1, + 0xfb, 0x8a, 0xc5, 0xef, 0xa1, 0xc6, 0xae, 0x98, 0x90, 0xa9, 0xb3, 0xa9, 0x2b, 0x1e, 0x3d, 0xfc, + 0x24, 0x5c, 0xa5, 0x21, 0xb9, 0x14, 0xbf, 0x85, 0xbd, 0xa2, 0x9c, 0x41, 0xf2, 0x52, 0x5b, 0xba, + 0x14, 0xce, 0x39, 0x1d, 0x93, 0x97, 0x79, 0x0b, 0xd5, 0x05, 0x17, 0x97, 0xa9, 0xb3, 0x5d, 0xee, + 0xab, 0x5c, 0xe5, 0x8c, 0x8b, 0x4b, 0x62, 0x84, 0xb8, 0x0b, 0x5f, 0x14, 0x35, 0x34, 0x90, 0x97, + 0x68, 0xe8, 0x12, 0xbb, 0x39, 0xa5, 0x02, 0xf2, 0x0a, 0x3d, 0xa8, 0xa9, 0x2d, 0xc9, 0x52, 0x67, + 0x47, 0xbf, 0x06, 0x87, 0xf7, 0x4b, 0x68, 0x9a, 0xe4, 0xb2, 0xe6, 0x1f, 0x08, 0xaa, 0xda, 0xa2, + 0xda, 0xa2, 0x3b, 0x23, 0x42, 0x7a, 0x44, 0x5b, 0x72, 0x75, 0x3e, 0xc5, 0x16, 0x55, 0x56, 0xb6, + 0xa8, 0x3c, 0xb3, 0xb5, 0x67, 0x9b, 0x99, 0xf5, 0xd4, 0xcc, 0x9a, 0x7f, 0x23, 0xb0, 0x54, 0xe7, + 0xff, 0xcf, 0x3b, 0x55, 0xee, 0xc9, 0x7a, 0xb6, 0x9e, 0xaa, 0x4f, 0xf5, 0xd4, 0xfe, 0x0d, 0x41, + 0xbd, 0x78, 0xdd, 0xf0, 0x4b, 0xd8, 0xf7, 0xc7, 0x27, 0x5e, 0x70, 0x3a, 0xf4, 0x06, 0xc1, 0xd4, + 0xf3, 0xc7, 0x6e, 0x7f, 0xf8, 0xe3, 0xd0, 0x1d, 0xd8, 0x2f, 0xf0, 0x01, 0xe0, 0x5b, 0x6a, 0xe8, + 0x4d, 0x5c, 0xe2, 0x9d, 0x9c, 0xd9, 0x08, 0xef, 0x81, 0x7d, 0x8b, 0xfb, 0x2e, 0xf9, 0xe4, 0x12, + 0xbb, 0x52, 0x46, 0xfb, 0x67, 0x43, 0xd7, 0x9b, 0xd8, 0x6b, 0xe5, 0x1c, 0x63, 0x32, 0x1a, 0x4c, + 0xfb, 0x2e, 0xb1, 0xad, 0x32, 0xde, 0x1f, 0x79, 0xfe, 0xf4, 0x67, 0x97, 0xd8, 0xd5, 0xf6, 0xef, + 0x08, 0x6a, 0x66, 0x79, 0xb0, 0x03, 0xeb, 0x11, 0x4b, 0x53, 0x3a, 0x2f, 0xf6, 0xa0, 0xb8, 0xe2, + 0xef, 0xc0, 0x9a, 0xc5, 0xa1, 0x79, 0xa0, 0x8d, 0xe3, 0xf6, 0x23, 0xdb, 0x97, 0xff, 0xeb, 0xc7, + 0x21, 0x23, 0x5a, 0xdf, 0xf6, 0x00, 0x6e, 0x31, 0xbc, 0x0f, 0xbb, 0xfe, 0xe4, 0x64, 0x32, 0xf5, + 0x83, 0xfe, 0x68, 0xe0, 0xaa, 0xde, 0xdd, 0x89, 0xfd, 0x02, 0x63, 0x68, 0xac, 0xc2, 0xa3, 0x53, + 0x1b, 0xdd, 0x95, 0xba, 0x84, 0x8c, 0x88, 0x5d, 0xf9, 0xc9, 0xaa, 0x23, 0xbb, 0xf2, 0xf1, 0x02, + 0x5e, 0xf3, 0xb8, 0x1b, 0x2f, 0x99, 0x90, 0x6c, 0xc1, 0x22, 0x26, 0x93, 0x6b, 0xf3, 0x45, 0xbe, + 0x31, 0xf4, 0xd1, 0x7c, 0x98, 0xc7, 0x0a, 0x1c, 0xa3, 0x5f, 0xbe, 0x9f, 0x73, 0x79, 0x91, 0x9d, + 0xab, 0x01, 0xf7, 0x8c, 0x75, 0x25, 0xe4, 0x62, 0x9e, 0xdf, 0x7a, 0x3a, 0xfa, 0xdb, 0x39, 0x13, + 0xbd, 0x58, 0xb2, 0x45, 0xaf, 0xf8, 0xc9, 0x70, 0x5e, 0xd3, 0xc4, 0xfb, 0x7f, 0x03, 0x00, 0x00, + 0xff, 0xff, 0x27, 0xd9, 0xff, 0x6c, 0x45, 0x08, 0x00, 0x00, }