From 1f977c0e8e60813a7d784fd2af5fada43d27fd0c Mon Sep 17 00:00:00 2001 From: Brian Wolfe Date: Wed, 22 Jul 2020 16:44:33 -0700 Subject: [PATCH 1/3] tracing: add API for OpenCensus agent exporter This is based heavily on the existing Stackdriver configuration. Stackdriver and OpenCensus exporter will both use the OpenCensus tracer implementation. This will permit OpenCensus to export OpenCensus agent-formatted spans. OpenCensus-formatted spans are handled by the OpenTelemetry collector, providing a migration path from OpenCensus to OpenTelemetry when OpenTelemetry is more complete and integrated with Envoy. Change-Id: I566299c9291021d26ec1e839643871a380807bc3 Reviewed-on: https://gerrit.musta.ch/c/public/istio-api/+/551 Reviewed-by: Jungho Ahn --- mesh/v1alpha1/istio.mesh.v1alpha1.gen.json | 52 +- mesh/v1alpha1/istio.mesh.v1alpha1.pb.html | 45 +- mesh/v1alpha1/proxy.pb.go | 764 ++++++++++++++++---- mesh/v1alpha1/proxy.proto | 29 +- python/istio_api/mesh/v1alpha1/proxy_pb2.py | 163 +++-- 5 files changed, 877 insertions(+), 176 deletions(-) diff --git a/mesh/v1alpha1/istio.mesh.v1alpha1.gen.json b/mesh/v1alpha1/istio.mesh.v1alpha1.gen.json index e55b7d6eb0..162bc0953b 100644 --- a/mesh/v1alpha1/istio.mesh.v1alpha1.gen.json +++ b/mesh/v1alpha1/istio.mesh.v1alpha1.gen.json @@ -691,6 +691,16 @@ "$ref": "#/components/schemas/istio.mesh.v1alpha1.Tracing.Stackdriver" } } + }, + { + "required": [ + "openCensus" + ], + "properties": { + "openCensus": { + "$ref": "#/components/schemas/istio.mesh.v1alpha1.Tracing.OpenCensus" + } + } } ] } @@ -734,6 +744,16 @@ "$ref": "#/components/schemas/istio.mesh.v1alpha1.Tracing.Stackdriver" } } + }, + { + "required": [ + "openCensus" + ], + "properties": { + "openCensus": { + "$ref": "#/components/schemas/istio.mesh.v1alpha1.Tracing.OpenCensus" + } + } } ] }, @@ -848,7 +868,7 @@ } }, "istio.mesh.v1alpha1.Tracing.Stackdriver": { - "description": "Stackdriver defines configuration for a Stackdriver tracer. See [Opencensus trace config](https://github.com/census-instrumentation/opencensus-proto/blob/master/src/opencensus/proto/trace/v1/trace_config.proto) for details.", + "description": "Stackdriver defines configuration for a Stackdriver tracer. See [OpenCensus trace config](https://github.com/census-instrumentation/opencensus-proto/blob/master/src/opencensus/proto/trace/v1/trace_config.proto) for details.", "type": "object", "properties": { "debug": { @@ -872,6 +892,36 @@ } } }, + "istio.mesh.v1alpha1.Tracing.OpenCensus": { + "description": "OpenCensus defines configuration for an OpenCensus tracer. See [OpenCensus trace config](https://github.com/census-instrumentation/opencensus-proto/blob/master/src/opencensus/proto/trace/v1/trace_config.proto) for details.", + "type": "object", + "properties": { + "address": { + "description": "gRPC address for the OpenCensus Agent (e.g. dns://authority/host:port or unix:path). See [gRPC naming docs](https://github.com/grpc/grpc/blob/master/doc/naming.md) for details.", + "type": "string", + "format": "string" + }, + "debug": { + "description": "debug enables trace output to stdout $hide_from_docs", + "type": "boolean" + }, + "maxNumberOfAttributes": { + "description": "The global default max number of attributes per span. default is 200. $hide_from_docs", + "type": "integer", + "nullable": true + }, + "maxNumberOfAnnotations": { + "description": "The global default max number of annotation events per span. default is 200. $hide_from_docs", + "type": "integer", + "nullable": true + }, + "maxNumberOfMessageEvents": { + "description": "The global default max number of message events per span. default is 200. $hide_from_docs", + "type": "integer", + "nullable": true + } + } + }, "istio.mesh.v1alpha1.Tracing.Literal": { "description": "Literal type represents a static value. $hide_from_docs", "type": "object", diff --git a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html index 50beb5f346..bfcb1029ec 100644 --- a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html +++ b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html @@ -5,7 +5,7 @@ layout: protoc-gen-docs generator: protoc-gen-docs weight: 20 -number_of_entries: 25 +number_of_entries: 26 ---

Configuration affecting the service mesh as a whole.

@@ -62,6 +62,17 @@

Tracing

Use a Stackdriver tracer.

+ + +No + + + +openCensus +OpenCensus (oneof) + +

Use an OpenCensus tracer.

+ No @@ -589,7 +600,7 @@

Tracing.Datadog

Tracing.Stackdriver

Stackdriver defines configuration for a Stackdriver tracer. -See Opencensus trace config for details.

+See OpenCensus trace config for details.

@@ -604,6 +615,36 @@

Tracing.Stackdriver

+

Tracing.OpenCensus

+
+

OpenCensus defines configuration for an OpenCensus tracer. +See OpenCensus trace config for details.

+ + + + + + + + + + + + + + + + + + +
FieldTypeDescriptionRequired
addressstring +

gRPC address for the OpenCensus Agent (e.g. dns://authority/host:port or unix:path). +See gRPC naming docs for details.

+ +		 +No +
+

MeshConfig

MeshConfig defines mesh-wide variables shared by all Envoy instances in the diff --git a/mesh/v1alpha1/proxy.pb.go b/mesh/v1alpha1/proxy.pb.go index c9b7323e5a..272eb88604 100644 --- a/mesh/v1alpha1/proxy.pb.go +++ b/mesh/v1alpha1/proxy.pb.go @@ -155,6 +155,7 @@ type Tracing struct { // *Tracing_Lightstep_ // *Tracing_Datadog_ // *Tracing_Stackdriver_ + // *Tracing_OpenCensus_ Tracer isTracing_Tracer `protobuf_oneof:"tracer"` // Configures the custom tags to be added to active span by all proxies (i.e. sidecars // and gateways). @@ -238,11 +239,15 @@ type Tracing_Datadog_ struct { type Tracing_Stackdriver_ struct { Stackdriver *Tracing_Stackdriver `protobuf:"bytes,4,opt,name=stackdriver,proto3,oneof"` } +type Tracing_OpenCensus_ struct { + OpenCensus *Tracing_OpenCensus `protobuf:"bytes,9,opt,name=open_census,json=openCensus,proto3,oneof"` +} func (*Tracing_Zipkin_) isTracing_Tracer() {} func (*Tracing_Lightstep_) isTracing_Tracer() {} func (*Tracing_Datadog_) isTracing_Tracer() {} func (*Tracing_Stackdriver_) isTracing_Tracer() {} +func (*Tracing_OpenCensus_) isTracing_Tracer() {} func (m *Tracing) GetTracer() isTracing_Tracer { if m != nil { @@ -279,6 +284,13 @@ func (m *Tracing) GetStackdriver() *Tracing_Stackdriver { return nil } +func (m *Tracing) GetOpenCensus() *Tracing_OpenCensus { + if x, ok := m.GetTracer().(*Tracing_OpenCensus_); ok { + return x.OpenCensus + } + return nil +} + func (m *Tracing) GetCustomTags() map[string]*Tracing_CustomTag { if m != nil { return m.CustomTags @@ -314,6 +326,7 @@ func (*Tracing) XXX_OneofWrappers() []interface{} { (*Tracing_Lightstep_)(nil), (*Tracing_Datadog_)(nil), (*Tracing_Stackdriver_)(nil), + (*Tracing_OpenCensus_)(nil), } } @@ -474,7 +487,7 @@ func (m *Tracing_Datadog) GetAddress() string { } // Stackdriver defines configuration for a Stackdriver tracer. -// See [Opencensus trace config](https://github.com/census-instrumentation/opencensus-proto/blob/master/src/opencensus/proto/trace/v1/trace_config.proto) for details. +// See [OpenCensus trace config](https://github.com/census-instrumentation/opencensus-proto/blob/master/src/opencensus/proto/trace/v1/trace_config.proto) for details. type Tracing_Stackdriver struct { // debug enables trace output to stdout. // $hide_from_docs @@ -557,6 +570,100 @@ func (m *Tracing_Stackdriver) GetMaxNumberOfMessageEvents() *types.Int64Value { return nil } +// OpenCensus defines configuration for an OpenCensus tracer. +// See [OpenCensus trace config](https://github.com/census-instrumentation/opencensus-proto/blob/master/src/opencensus/proto/trace/v1/trace_config.proto) for details. +type Tracing_OpenCensus struct { + // gRPC address for the OpenCensus Agent (e.g. dns://authority/host:port or unix:path). + // See [gRPC naming docs](https://github.com/grpc/grpc/blob/master/doc/naming.md) for details. + Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` + // debug enables trace output to stdout + // $hide_from_docs + Debug bool `protobuf:"varint,2,opt,name=debug,proto3" json:"debug,omitempty"` + // The global default max number of attributes per span. + // default is 200. + // $hide_from_docs + MaxNumberOfAttributes *types.Int64Value `protobuf:"bytes,3,opt,name=max_number_of_attributes,json=maxNumberOfAttributes,proto3" json:"maxNumberOfAttributes,omitempty"` + // The global default max number of annotation events per span. + // default is 200. + // $hide_from_docs + MaxNumberOfAnnotations *types.Int64Value `protobuf:"bytes,4,opt,name=max_number_of_annotations,json=maxNumberOfAnnotations,proto3" json:"maxNumberOfAnnotations,omitempty"` + // The global default max number of message events per span. + // default is 200. + // $hide_from_docs + MaxNumberOfMessageEvents *types.Int64Value `protobuf:"bytes,5,opt,name=max_number_of_message_events,json=maxNumberOfMessageEvents,proto3" json:"maxNumberOfMessageEvents,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Tracing_OpenCensus) Reset() { *m = Tracing_OpenCensus{} } +func (m *Tracing_OpenCensus) String() string { return proto.CompactTextString(m) } +func (*Tracing_OpenCensus) ProtoMessage() {} +func (*Tracing_OpenCensus) Descriptor() ([]byte, []int) { + return fileDescriptor_5efecd978cf3d28d, []int{0, 4} +} +func (m *Tracing_OpenCensus) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Tracing_OpenCensus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Tracing_OpenCensus.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Tracing_OpenCensus) XXX_Merge(src proto.Message) { + xxx_messageInfo_Tracing_OpenCensus.Merge(m, src) +} +func (m *Tracing_OpenCensus) XXX_Size() int { + return m.Size() +} +func (m *Tracing_OpenCensus) XXX_DiscardUnknown() { + xxx_messageInfo_Tracing_OpenCensus.DiscardUnknown(m) +} + +var xxx_messageInfo_Tracing_OpenCensus proto.InternalMessageInfo + +func (m *Tracing_OpenCensus) GetAddress() string { + if m != nil { + return m.Address + } + return "" +} + +func (m *Tracing_OpenCensus) GetDebug() bool { + if m != nil { + return m.Debug + } + return false +} + +func (m *Tracing_OpenCensus) GetMaxNumberOfAttributes() *types.Int64Value { + if m != nil { + return m.MaxNumberOfAttributes + } + return nil +} + +func (m *Tracing_OpenCensus) GetMaxNumberOfAnnotations() *types.Int64Value { + if m != nil { + return m.MaxNumberOfAnnotations + } + return nil +} + +func (m *Tracing_OpenCensus) GetMaxNumberOfMessageEvents() *types.Int64Value { + if m != nil { + return m.MaxNumberOfMessageEvents + } + return nil +} + // Configure custom tags that will be added to any active span. // Tags can be generated via literals, environment variables or an incoming request header. // $hide_from_docs @@ -577,7 +684,7 @@ func (m *Tracing_CustomTag) Reset() { *m = Tracing_CustomTag{} } func (m *Tracing_CustomTag) String() string { return proto.CompactTextString(m) } func (*Tracing_CustomTag) ProtoMessage() {} func (*Tracing_CustomTag) Descriptor() ([]byte, []int) { - return fileDescriptor_5efecd978cf3d28d, []int{0, 4} + return fileDescriptor_5efecd978cf3d28d, []int{0, 5} } func (m *Tracing_CustomTag) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -677,7 +784,7 @@ func (m *Tracing_Literal) Reset() { *m = Tracing_Literal{} } func (m *Tracing_Literal) String() string { return proto.CompactTextString(m) } func (*Tracing_Literal) ProtoMessage() {} func (*Tracing_Literal) Descriptor() ([]byte, []int) { - return fileDescriptor_5efecd978cf3d28d, []int{0, 5} + return fileDescriptor_5efecd978cf3d28d, []int{0, 6} } func (m *Tracing_Literal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -731,7 +838,7 @@ func (m *Tracing_Environment) Reset() { *m = Tracing_Environment{} } func (m *Tracing_Environment) String() string { return proto.CompactTextString(m) } func (*Tracing_Environment) ProtoMessage() {} func (*Tracing_Environment) Descriptor() ([]byte, []int) { - return fileDescriptor_5efecd978cf3d28d, []int{0, 6} + return fileDescriptor_5efecd978cf3d28d, []int{0, 7} } func (m *Tracing_Environment) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -792,7 +899,7 @@ func (m *Tracing_RequestHeader) Reset() { *m = Tracing_RequestHeader{} } func (m *Tracing_RequestHeader) String() string { return proto.CompactTextString(m) } func (*Tracing_RequestHeader) ProtoMessage() {} func (*Tracing_RequestHeader) Descriptor() ([]byte, []int) { - return fileDescriptor_5efecd978cf3d28d, []int{0, 7} + return fileDescriptor_5efecd978cf3d28d, []int{0, 8} } func (m *Tracing_RequestHeader) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1401,6 +1508,7 @@ func init() { proto.RegisterType((*Tracing_Lightstep)(nil), "istio.mesh.v1alpha1.Tracing.Lightstep") proto.RegisterType((*Tracing_Datadog)(nil), "istio.mesh.v1alpha1.Tracing.Datadog") proto.RegisterType((*Tracing_Stackdriver)(nil), "istio.mesh.v1alpha1.Tracing.Stackdriver") + proto.RegisterType((*Tracing_OpenCensus)(nil), "istio.mesh.v1alpha1.Tracing.OpenCensus") proto.RegisterType((*Tracing_CustomTag)(nil), "istio.mesh.v1alpha1.Tracing.CustomTag") proto.RegisterType((*Tracing_Literal)(nil), "istio.mesh.v1alpha1.Tracing.Literal") proto.RegisterType((*Tracing_Environment)(nil), "istio.mesh.v1alpha1.Tracing.Environment") @@ -1415,122 +1523,126 @@ func init() { func init() { proto.RegisterFile("mesh/v1alpha1/proxy.proto", fileDescriptor_5efecd978cf3d28d) } var fileDescriptor_5efecd978cf3d28d = []byte{ - // 1829 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0xe1, 0x52, 0x1b, 0xc9, - 0x11, 0x46, 0x80, 0x25, 0xd4, 0x42, 0xb0, 0x0c, 0xc6, 0xac, 0x65, 0x9b, 0x23, 0xf8, 0x72, 0xe1, - 0x9c, 0x8b, 0xa8, 0x33, 0x29, 0x97, 0x2b, 0x95, 0x4b, 0x59, 0x20, 0x51, 0xc8, 0x01, 0x41, 0xad, - 0x84, 0x1d, 0x73, 0x3f, 0xa6, 0x46, 0xbb, 0x83, 0xb4, 0x61, 0x77, 0x66, 0x33, 0x3b, 0x2b, 0xd0, - 0x3d, 0x41, 0x9e, 0x26, 0x4f, 0x90, 0xfc, 0xcf, 0xcf, 0xbc, 0x41, 0x52, 0xfe, 0x95, 0x54, 0x5e, - 0x22, 0x35, 0x33, 0xbb, 0x42, 0x60, 0x21, 0x5f, 0xe5, 0xfe, 0x69, 0x7a, 0xbe, 0xef, 0xdb, 0x9e, - 0xde, 0xee, 0x9e, 0x5e, 0xc1, 0xe3, 0x90, 0xc6, 0xfd, 0x9d, 0xc1, 0xb7, 0x24, 0x88, 0xfa, 0xe4, - 0xdb, 0x9d, 0x48, 0xf0, 0xeb, 0x61, 0x35, 0x12, 0x5c, 0x72, 0xb4, 0xea, 0xc7, 0xd2, 0xe7, 0x55, - 0x05, 0xa8, 0x66, 0x80, 0xca, 0x46, 0x8f, 0xf3, 0x5e, 0x40, 0x77, 0x34, 0xa4, 0x9b, 0x5c, 0xec, - 0x78, 0x89, 0x20, 0xd2, 0xe7, 0xcc, 0x90, 0x3e, 0xdd, 0xbf, 0x12, 0x24, 0x8a, 0xa8, 0x88, 0xd3, - 0xfd, 0x17, 0x8c, 0xca, 0x2b, 0x2e, 0x2e, 0x7d, 0xd6, 0xcb, 0x9e, 0xba, 0xbb, 0xe3, 0xd1, 0x58, - 0xfa, 0x4c, 0xcb, 0x60, 0x91, 0x04, 0xd4, 0x60, 0xb7, 0xfe, 0x59, 0x82, 0x42, 0x47, 0x10, 0xd7, - 0x67, 0x3d, 0xf4, 0x1d, 0xe4, 0x7f, 0xf0, 0xa3, 0x4b, 0x9f, 0xd9, 0xb9, 0xcd, 0xdc, 0x76, 0xe9, - 0xe5, 0xf3, 0xea, 0x04, 0xef, 0xaa, 0x29, 0xba, 0x7a, 0xae, 0xa1, 0x87, 0x33, 0x4e, 0x4a, 0x42, - 0x07, 0x50, 0x0c, 0xfc, 0x5e, 0x5f, 0xc6, 0x92, 0x46, 0xf6, 0xac, 0x56, 0xf8, 0x6a, 0xaa, 0xc2, - 0x51, 0x86, 0x3e, 0x9c, 0x71, 0x6e, 0xa8, 0xe8, 0x0d, 0x14, 0x3c, 0x22, 0x89, 0xc7, 0x7b, 0xf6, - 0x9c, 0x56, 0xf9, 0x72, 0xaa, 0x4a, 0xdd, 0x60, 0x0f, 0x67, 0x9c, 0x8c, 0x86, 0x8e, 0xa0, 0x14, - 0x4b, 0xe2, 0x5e, 0x7a, 0xc2, 0x1f, 0x50, 0x61, 0xcf, 0x6b, 0x95, 0xed, 0xa9, 0x2a, 0xed, 0x1b, - 0xfc, 0xe1, 0x8c, 0x33, 0x4e, 0x47, 0xc7, 0x50, 0x72, 0x93, 0x58, 0xf2, 0x10, 0x4b, 0xd2, 0x8b, - 0xed, 0x07, 0x9b, 0x73, 0xdb, 0xa5, 0x97, 0xdf, 0x4c, 0x55, 0xdb, 0xd7, 0xf8, 0x0e, 0xe9, 0xc5, - 0x0d, 0x26, 0xc5, 0xd0, 0x01, 0x77, 0x64, 0x40, 0xbf, 0x82, 0xd5, 0x90, 0x5c, 0xe3, 0x88, 0xc8, - 0xbe, 0x12, 0xc4, 0x01, 0x65, 0x3d, 0xd9, 0xb7, 0xf3, 0x9b, 0xb9, 0xed, 0xb2, 0x63, 0x85, 0xe4, - 0xfa, 0x94, 0xc8, 0x7e, 0x87, 0xf4, 0x8e, 0xb4, 0x1d, 0x55, 0x60, 0x21, 0x26, 0x61, 0x14, 0xf8, - 0xac, 0x67, 0x17, 0x36, 0x73, 0xdb, 0x39, 0x67, 0xb4, 0x46, 0x27, 0xb0, 0x28, 0x83, 0x18, 0xc7, - 0x54, 0x4a, 0x9f, 0xf5, 0x62, 0x7b, 0x41, 0x1f, 0x34, 0x73, 0xed, 0x26, 0x0b, 0x32, 0x07, 0x77, - 0xab, 0xfb, 0x81, 0x4f, 0x99, 0xec, 0x1c, 0xb5, 0xdb, 0x29, 0xc7, 0x29, 0xc9, 0x20, 0xce, 0x16, - 0x95, 0x2d, 0xc8, 0x9b, 0xd7, 0x8a, 0x6c, 0x28, 0x10, 0xcf, 0x13, 0x34, 0x8e, 0x75, 0x32, 0x14, - 0x9d, 0x6c, 0x59, 0x39, 0x84, 0xe2, 0xe8, 0xc5, 0xdd, 0x0f, 0x43, 0x3f, 0x83, 0x45, 0xe2, 0xba, - 0x34, 0x8e, 0xb1, 0xe4, 0x97, 0x94, 0xe9, 0x84, 0x28, 0x3a, 0x25, 0x63, 0xeb, 0x28, 0x53, 0xe5, - 0x39, 0x14, 0xd2, 0x97, 0x37, 0xe5, 0x71, 0x7f, 0x99, 0x85, 0xd2, 0xd8, 0xcb, 0x41, 0x0f, 0xe1, - 0x81, 0x47, 0xbb, 0x49, 0x4f, 0xe3, 0x16, 0x1c, 0xb3, 0x40, 0x1d, 0xb0, 0x55, 0x50, 0x59, 0x12, - 0x76, 0xa9, 0xc0, 0xfc, 0x02, 0x13, 0x29, 0x85, 0xdf, 0x4d, 0x24, 0x8d, 0xd3, 0x54, 0x7c, 0x52, - 0x35, 0x55, 0x53, 0xcd, 0xaa, 0xa6, 0xda, 0x64, 0xf2, 0xd5, 0xaf, 0xdf, 0x91, 0x20, 0xa1, 0xce, - 0x5a, 0x48, 0xae, 0x5b, 0x9a, 0x7b, 0x72, 0x51, 0x1b, 0x31, 0xd1, 0x3b, 0x78, 0x7c, 0x47, 0x95, - 0x31, 0x2e, 0x75, 0x0d, 0xc5, 0x69, 0x6e, 0x4e, 0x95, 0x7d, 0x34, 0x2e, 0x7b, 0x43, 0x45, 0xdf, - 0xc3, 0xd3, 0xdb, 0xba, 0x21, 0x8d, 0x63, 0xd2, 0xa3, 0x98, 0x0e, 0x28, 0x93, 0x71, 0x9a, 0xb0, - 0x53, 0xa5, 0xed, 0x31, 0xe9, 0x63, 0xc3, 0x6e, 0x68, 0x72, 0xe5, 0x3f, 0x39, 0x28, 0x8e, 0xf2, - 0x4f, 0x15, 0x53, 0xe0, 0x4b, 0x2a, 0x48, 0x90, 0x16, 0xf5, 0x97, 0x9f, 0x29, 0x49, 0x8d, 0x55, - 0xc5, 0x94, 0xd2, 0x54, 0x31, 0x51, 0x36, 0xf0, 0x05, 0x67, 0x21, 0x65, 0x32, 0x8d, 0xe6, 0xf4, - 0x62, 0x6a, 0xdc, 0xe0, 0x55, 0x31, 0x8d, 0xd1, 0x51, 0x1d, 0xf2, 0x7d, 0x4a, 0x3c, 0x2a, 0xd2, - 0xf8, 0xbd, 0x98, 0x2a, 0xe4, 0xd0, 0x3f, 0x25, 0x34, 0x96, 0x87, 0x9a, 0xa1, 0x5a, 0x8d, 0xe1, - 0xee, 0xe5, 0x61, 0x5e, 0x0e, 0x23, 0x5a, 0xf9, 0x02, 0x0a, 0xa9, 0xc7, 0x2a, 0x2f, 0x06, 0x2a, - 0x32, 0x69, 0xfe, 0x98, 0x45, 0xe5, 0x00, 0x4a, 0x63, 0xce, 0x20, 0x04, 0xf3, 0x8c, 0x84, 0x19, - 0x46, 0xff, 0x46, 0xcf, 0xa1, 0xec, 0xd1, 0x0b, 0x92, 0x04, 0x12, 0x1b, 0x01, 0x93, 0xa9, 0x8b, - 0xa9, 0x51, 0x87, 0xbb, 0x72, 0x08, 0xe5, 0x5b, 0xbe, 0xfc, 0xff, 0x4a, 0x14, 0x96, 0xef, 0x74, - 0x07, 0x64, 0xc1, 0xdc, 0x25, 0x1d, 0xa6, 0x52, 0xea, 0x27, 0xfa, 0x6d, 0x76, 0x98, 0x1f, 0xd3, - 0x46, 0x47, 0x72, 0xe9, 0xa1, 0x7f, 0x33, 0xfb, 0x3a, 0xb7, 0xb7, 0x00, 0x79, 0x29, 0x88, 0x4b, - 0xc5, 0xd6, 0x01, 0xcc, 0xb5, 0xeb, 0x6d, 0x55, 0x61, 0x94, 0x91, 0x6e, 0x40, 0xbd, 0xb4, 0x72, - 0xb2, 0x25, 0xfa, 0x39, 0x2c, 0x5f, 0xbe, 0x8e, 0x71, 0x4c, 0xf0, 0x1f, 0xaf, 0xa4, 0xee, 0x4b, - 0x99, 0xe3, 0x97, 0xaf, 0xe3, 0x36, 0x79, 0x7b, 0x25, 0x55, 0x47, 0xda, 0xfa, 0xeb, 0x2c, 0x2c, - 0x74, 0x78, 0xc4, 0x03, 0xde, 0x1b, 0xa2, 0x2a, 0xac, 0xb2, 0x24, 0xc4, 0x52, 0x24, 0xb1, 0xa4, - 0x1e, 0x56, 0x57, 0x9a, 0x4f, 0x4d, 0xed, 0x96, 0x9d, 0x15, 0x96, 0x84, 0x1d, 0xb3, 0x73, 0x6a, - 0x36, 0x50, 0x02, 0x4f, 0x2e, 0xb8, 0xb8, 0x22, 0xc2, 0xc3, 0xae, 0x6e, 0x41, 0xd8, 0xa5, 0x42, - 0x62, 0x8f, 0x4a, 0xe2, 0x07, 0xa6, 0x44, 0x97, 0x5e, 0xbe, 0x9a, 0x7c, 0xcc, 0xf4, 0x99, 0xd5, - 0x03, 0x23, 0x60, 0x5a, 0xd8, 0x3e, 0x15, 0xb2, 0x6e, 0xd8, 0x8e, 0x7d, 0x71, 0xcf, 0xce, 0xd6, - 0x9f, 0x73, 0x60, 0xdf, 0x47, 0x43, 0x65, 0x28, 0x9e, 0xb5, 0xea, 0x8d, 0x83, 0x66, 0xab, 0x51, - 0xb7, 0x66, 0xd0, 0x22, 0x2c, 0xb4, 0x6b, 0xad, 0x66, 0xa7, 0x79, 0xde, 0xb0, 0x72, 0xc8, 0x82, - 0xc5, 0x83, 0x13, 0xe7, 0x7d, 0xcd, 0xa9, 0xe3, 0x93, 0xd6, 0xd1, 0x07, 0x6b, 0x16, 0x21, 0x58, - 0xaa, 0x9d, 0x9e, 0x36, 0x5a, 0x75, 0x9c, 0x6e, 0x58, 0x73, 0x0a, 0x95, 0x71, 0x70, 0xbb, 0xd1, - 0xb1, 0xe6, 0xd1, 0x3a, 0xac, 0xd6, 0x8e, 0xde, 0xd7, 0x3e, 0xb4, 0xf1, 0x2d, 0xfa, 0x83, 0xad, - 0xbf, 0x2d, 0x41, 0x49, 0x45, 0x63, 0xb8, 0xcf, 0xd9, 0x85, 0xdf, 0x43, 0x5f, 0x40, 0xc9, 0xd5, - 0xbf, 0x4c, 0xc4, 0xcd, 0xcb, 0x07, 0x63, 0x52, 0xf1, 0x56, 0x80, 0xae, 0xcf, 0x88, 0x18, 0x8e, - 0xbf, 0x12, 0x30, 0x26, 0x0d, 0xf8, 0x05, 0x2c, 0xc7, 0x54, 0x0c, 0x7c, 0x97, 0x62, 0x37, 0x50, - 0xd1, 0x36, 0x35, 0x55, 0x74, 0x96, 0x52, 0xf3, 0xbe, 0xb1, 0xa2, 0x37, 0xb0, 0xe4, 0x09, 0xe2, - 0x33, 0x9c, 0xcd, 0x11, 0x69, 0x83, 0x79, 0xfc, 0x49, 0x83, 0xa9, 0xa7, 0x00, 0xa7, 0xac, 0x09, - 0xd9, 0x12, 0xb5, 0xc1, 0x8e, 0x88, 0x50, 0xaf, 0x2d, 0xee, 0x27, 0xd2, 0xe3, 0x57, 0x63, 0x5a, - 0x0f, 0x3e, 0xa7, 0xf5, 0xc8, 0x50, 0xdb, 0x29, 0x73, 0x24, 0xfa, 0x4b, 0x58, 0xf1, 0xfc, 0xd8, - 0xe5, 0x03, 0x2a, 0x86, 0x38, 0xeb, 0xfe, 0x79, 0x7d, 0x02, 0x6b, 0xb4, 0x51, 0x4b, 0xaf, 0x93, - 0x33, 0x58, 0xbf, 0x01, 0x0b, 0x7a, 0x21, 0x68, 0xdc, 0xc7, 0x1e, 0x0d, 0xc8, 0x50, 0xdf, 0x8a, - 0xd3, 0x1c, 0xd8, 0x9b, 0xb5, 0x73, 0xce, 0xda, 0x88, 0xed, 0x18, 0x72, 0x5d, 0x71, 0xd1, 0xd7, - 0xb0, 0x64, 0xa6, 0x97, 0x91, 0x03, 0xea, 0x0e, 0x2d, 0x6a, 0x4a, 0xd9, 0xec, 0x64, 0x1e, 0x7c, - 0x03, 0x28, 0x96, 0x44, 0xc6, 0x1e, 0x4e, 0xbc, 0x68, 0x04, 0x07, 0xe3, 0xaf, 0xd9, 0x39, 0xf3, - 0xa2, 0x0c, 0xdd, 0x80, 0x67, 0x94, 0x0d, 0xf8, 0x10, 0x87, 0x54, 0x0a, 0xdf, 0x55, 0x97, 0xb4, - 0x79, 0x55, 0x19, 0xf1, 0xe1, 0xe8, 0x39, 0x15, 0x0d, 0x3c, 0x36, 0xb8, 0xb6, 0x81, 0x65, 0x32, - 0xdb, 0x60, 0xe9, 0x71, 0x11, 0x13, 0x2f, 0xf4, 0x19, 0x8e, 0xb8, 0x90, 0x76, 0x69, 0x33, 0xb7, - 0xfd, 0xc0, 0x59, 0xd2, 0xf6, 0x9a, 0x32, 0x9f, 0x72, 0x21, 0xd1, 0x0e, 0xac, 0x90, 0x01, 0xf1, - 0x03, 0xd2, 0xf5, 0x03, 0x5f, 0x0e, 0xf1, 0x0f, 0x9c, 0x51, 0x7b, 0x71, 0xf4, 0x10, 0x6b, 0x7c, - 0xf3, 0x9c, 0x33, 0x8a, 0x3c, 0x78, 0xec, 0x72, 0x26, 0x05, 0x0f, 0x70, 0x14, 0x10, 0x46, 0x31, - 0x49, 0x64, 0x1f, 0x47, 0x3c, 0xf0, 0xdd, 0xa1, 0x5d, 0xd6, 0x05, 0xf9, 0xf5, 0xc4, 0x82, 0xac, - 0x25, 0xb2, 0x4f, 0x99, 0xf4, 0x5d, 0x1d, 0xdd, 0x53, 0x4d, 0x70, 0x1e, 0xa5, 0x5a, 0xa7, 0x4a, - 0x4a, 0x21, 0x8c, 0x5d, 0x45, 0x2d, 0x1d, 0x9e, 0xd2, 0x6c, 0xbf, 0xf0, 0x03, 0x6a, 0x2f, 0x99, - 0xa8, 0x99, 0x1d, 0x53, 0x10, 0x07, 0x7e, 0x40, 0xd5, 0x71, 0x55, 0x24, 0xb1, 0x6a, 0xa7, 0xd9, - 0x60, 0xb4, 0x6c, 0x8e, 0xab, 0xec, 0x2d, 0x12, 0xd2, 0x74, 0x2c, 0xfa, 0x4e, 0x97, 0x8f, 0x9b, - 0x08, 0x41, 0x99, 0x3b, 0xb4, 0xad, 0xfb, 0x6f, 0xcc, 0xdd, 0x97, 0xe6, 0xc6, 0x1c, 0xc7, 0xa3, - 0x1a, 0x3c, 0x33, 0x71, 0xed, 0x72, 0x2e, 0x63, 0x29, 0x48, 0x84, 0x25, 0x0d, 0xa3, 0x80, 0x48, - 0x6a, 0xca, 0x6d, 0x45, 0x7b, 0x58, 0xd1, 0xa0, 0xbd, 0x0c, 0xd3, 0x49, 0x21, 0xba, 0xfc, 0x28, - 0xac, 0xf8, 0x4c, 0x52, 0xe1, 0xd2, 0x48, 0x0f, 0xd5, 0x21, 0xf7, 0xa8, 0x8d, 0x74, 0xdc, 0x5e, - 0x4f, 0x8c, 0xdb, 0x58, 0xf5, 0x57, 0x9b, 0xac, 0xcb, 0x13, 0xe6, 0x35, 0xc7, 0x04, 0x8e, 0xb9, - 0x47, 0x1d, 0xcb, 0xbf, 0x63, 0x41, 0xaf, 0xa0, 0x20, 0x4d, 0xa3, 0xb7, 0x57, 0xf5, 0x21, 0x9f, - 0x4e, 0xbb, 0x0c, 0x9c, 0x0c, 0x8c, 0x5e, 0xc0, 0x5c, 0xec, 0xc5, 0xf6, 0x9a, 0xe6, 0xd8, 0x13, - 0x39, 0xed, 0x7a, 0xdb, 0x51, 0x20, 0xf4, 0x3d, 0xd8, 0x26, 0x59, 0xd3, 0x89, 0x2d, 0xe0, 0xbd, - 0x2c, 0x5f, 0xed, 0x47, 0x5a, 0x60, 0x6b, 0xa2, 0x80, 0x43, 0x43, 0x2e, 0x69, 0x9a, 0xb2, 0xce, - 0x9a, 0xd6, 0xa8, 0x69, 0x89, 0x23, 0xde, 0x4b, 0xcd, 0xe8, 0x1d, 0xac, 0x4d, 0xac, 0x04, 0x7b, - 0xfd, 0x47, 0x2b, 0xaf, 0x4e, 0xa8, 0x10, 0x74, 0x0e, 0xa6, 0x04, 0x94, 0x2e, 0x51, 0x93, 0xbf, - 0x6d, 0xeb, 0xc9, 0x7c, 0xf7, 0xb3, 0xc1, 0xd7, 0xbf, 0x8f, 0x53, 0x96, 0x19, 0xd0, 0xcb, 0xd1, - 0xb8, 0x4d, 0xf5, 0x5e, 0x95, 0x6f, 0x49, 0x6c, 0x2a, 0xae, 0xa2, 0x53, 0x10, 0x8c, 0x49, 0x57, - 0xdb, 0x57, 0xb0, 0x4c, 0xaf, 0xa5, 0x20, 0x58, 0xa7, 0xab, 0xfe, 0x2e, 0x78, 0xb2, 0x39, 0xb7, - 0x5d, 0x74, 0xca, 0xda, 0xdc, 0x96, 0x44, 0xea, 0x61, 0xff, 0x10, 0xac, 0x1e, 0x91, 0xf4, 0x8a, - 0x0c, 0xb1, 0x4c, 0xef, 0x31, 0xfb, 0xa9, 0x3e, 0xf7, 0xb3, 0xa9, 0x97, 0x9d, 0xb3, 0x9c, 0xd2, - 0x46, 0x37, 0xee, 0x7b, 0xa8, 0x48, 0x2a, 0xc2, 0xec, 0x13, 0xee, 0x4e, 0x43, 0x7f, 0xf6, 0xb9, - 0x26, 0x6c, 0x8f, 0x91, 0xeb, 0xb7, 0x7a, 0xfb, 0x3a, 0x14, 0x94, 0x0f, 0xd8, 0xf7, 0xec, 0x0d, - 0x9d, 0xf4, 0x79, 0xb5, 0x6c, 0x7a, 0x95, 0x37, 0x80, 0x3e, 0x8d, 0xd4, 0x84, 0x61, 0xe5, 0xe1, - 0xf8, 0xb0, 0x52, 0x1c, 0x1b, 0x42, 0xb6, 0x76, 0x61, 0xfd, 0x9e, 0x44, 0x57, 0xb7, 0xad, 0xd3, - 0xa8, 0x37, 0x9d, 0xc6, 0x7e, 0xc7, 0x9a, 0x41, 0x00, 0xf9, 0xce, 0xa9, 0x73, 0xf2, 0x87, 0x0f, - 0x56, 0xee, 0xed, 0xfc, 0x42, 0xd1, 0x02, 0x67, 0xd9, 0xe5, 0x8c, 0x51, 0x57, 0x62, 0xe9, 0x87, - 0x94, 0x27, 0x72, 0xeb, 0xbf, 0x39, 0x35, 0x82, 0x8d, 0x65, 0xc5, 0x94, 0x6f, 0x8f, 0xbb, 0xdf, - 0x45, 0xb3, 0x3f, 0xf1, 0xbb, 0x08, 0x71, 0x28, 0x4b, 0x37, 0xc2, 0x97, 0x94, 0x46, 0x24, 0xf0, - 0x07, 0x34, 0x1d, 0x5e, 0xdf, 0x4e, 0x53, 0x34, 0xfe, 0xeb, 0x0e, 0xc9, 0x83, 0x4c, 0xa9, 0xda, - 0xd9, 0x3f, 0xbd, 0xf9, 0xed, 0x46, 0xbf, 0xcf, 0x14, 0x9d, 0x45, 0x39, 0xb6, 0x7a, 0xf1, 0x3b, - 0x78, 0x38, 0xa9, 0xcd, 0xa2, 0x05, 0x98, 0x6f, 0x9d, 0xb4, 0x1a, 0xd6, 0x0c, 0x5a, 0x02, 0x38, - 0x3e, 0xeb, 0x9c, 0xd5, 0x8e, 0x70, 0xe7, 0xa8, 0x6d, 0xe5, 0xd0, 0x22, 0x14, 0x9a, 0xad, 0xc3, - 0x86, 0xd3, 0xec, 0x58, 0xff, 0x2e, 0xec, 0x6d, 0xff, 0xfd, 0xe3, 0x46, 0xee, 0x1f, 0x1f, 0x37, - 0x72, 0xff, 0xfa, 0xb8, 0x91, 0x3b, 0xaf, 0x18, 0x37, 0x7d, 0xbe, 0x43, 0x22, 0x7f, 0xe7, 0xd6, - 0xbf, 0x11, 0xdd, 0xbc, 0xce, 0x95, 0xdd, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x93, 0x94, 0xa9, - 0x9c, 0xa5, 0x10, 0x00, 0x00, + // 1889 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xdd, 0x6e, 0x1b, 0xb9, + 0x15, 0xb6, 0xfc, 0xaf, 0x23, 0x4b, 0x9e, 0xd0, 0xf9, 0x99, 0x68, 0x93, 0xac, 0xeb, 0x6c, 0x77, + 0xbd, 0xe9, 0x56, 0xc6, 0xc6, 0x45, 0x10, 0x14, 0xdd, 0x22, 0x8a, 0x25, 0x43, 0x4a, 0x6d, 0xd9, + 0x18, 0x29, 0x49, 0x93, 0xbd, 0x20, 0xa8, 0x19, 0x5a, 0x9a, 0x7a, 0x86, 0x9c, 0x92, 0x1c, 0x39, + 0xda, 0x27, 0xe8, 0xd3, 0xf4, 0x09, 0xda, 0xeb, 0xf6, 0xb2, 0x8f, 0x50, 0xe4, 0xaa, 0x45, 0xaf, + 0x7b, 0x5f, 0x90, 0x9c, 0x91, 0x95, 0x44, 0x56, 0x82, 0x2e, 0xf6, 0x4e, 0x3c, 0xfc, 0xbe, 0x6f, + 0xc8, 0xc3, 0x73, 0x0e, 0x0f, 0x05, 0xb7, 0x63, 0x2a, 0x87, 0x7b, 0xa3, 0x6f, 0x49, 0x94, 0x0c, + 0xc9, 0xb7, 0x7b, 0x89, 0xe0, 0x6f, 0xc6, 0xb5, 0x44, 0x70, 0xc5, 0xd1, 0x56, 0x28, 0x55, 0xc8, + 0x6b, 0x1a, 0x50, 0xcb, 0x01, 0xd5, 0x7b, 0x03, 0xce, 0x07, 0x11, 0xdd, 0x33, 0x90, 0x7e, 0x7a, + 0xb6, 0x17, 0xa4, 0x82, 0xa8, 0x90, 0x33, 0x4b, 0xfa, 0x70, 0xfe, 0x42, 0x90, 0x24, 0xa1, 0x42, + 0x66, 0xf3, 0x0f, 0x18, 0x55, 0x17, 0x5c, 0x9c, 0x87, 0x6c, 0x90, 0x7f, 0x75, 0x7f, 0x2f, 0xa0, + 0x52, 0x85, 0xcc, 0xc8, 0x60, 0x91, 0x46, 0xd4, 0x62, 0x77, 0xfe, 0x5b, 0x81, 0xb5, 0x9e, 0x20, + 0x7e, 0xc8, 0x06, 0xe8, 0x3b, 0x58, 0xfd, 0x21, 0x4c, 0xce, 0x43, 0xe6, 0x16, 0xb6, 0x0b, 0xbb, + 0xa5, 0x87, 0xf7, 0x6b, 0x33, 0x56, 0x57, 0xcb, 0xd0, 0xb5, 0xd7, 0x06, 0xda, 0x5a, 0xf0, 0x32, + 0x12, 0x3a, 0x84, 0x62, 0x14, 0x0e, 0x86, 0x4a, 0x2a, 0x9a, 0xb8, 0x8b, 0x46, 0xe1, 0xcb, 0xb9, + 0x0a, 0x47, 0x39, 0xba, 0xb5, 0xe0, 0x5d, 0x52, 0xd1, 0x13, 0x58, 0x0b, 0x88, 0x22, 0x01, 0x1f, + 0xb8, 0x4b, 0x46, 0xe5, 0x8b, 0xb9, 0x2a, 0x0d, 0x8b, 0x6d, 0x2d, 0x78, 0x39, 0x0d, 0x1d, 0x41, + 0x49, 0x2a, 0xe2, 0x9f, 0x07, 0x22, 0x1c, 0x51, 0xe1, 0x2e, 0x1b, 0x95, 0xdd, 0xb9, 0x2a, 0xdd, + 0x4b, 0x7c, 0x6b, 0xc1, 0x9b, 0xa6, 0xa3, 0x67, 0x50, 0xe2, 0x09, 0x65, 0xd8, 0xa7, 0x4c, 0xa6, + 0xd2, 0x2d, 0x1a, 0xb5, 0xaf, 0xe6, 0xaa, 0x9d, 0x24, 0x94, 0x1d, 0x18, 0x78, 0x6b, 0xc1, 0x03, + 0x3e, 0x19, 0xa1, 0x63, 0x28, 0xf9, 0xa9, 0x54, 0x3c, 0xc6, 0x8a, 0x0c, 0xa4, 0xbb, 0xb2, 0xbd, + 0xb4, 0x5b, 0x7a, 0xf8, 0xcd, 0x5c, 0xad, 0x03, 0x83, 0xef, 0x91, 0x81, 0x6c, 0x32, 0x25, 0xc6, + 0x1e, 0xf8, 0x13, 0x03, 0xfa, 0x25, 0x6c, 0xc5, 0xe4, 0x0d, 0x4e, 0x88, 0x1a, 0x6a, 0x41, 0x1c, + 0x51, 0x36, 0x50, 0x43, 0x77, 0x75, 0xbb, 0xb0, 0x5b, 0xf6, 0x9c, 0x98, 0xbc, 0x39, 0x25, 0x6a, + 0xd8, 0x23, 0x83, 0x23, 0x63, 0x47, 0x55, 0x58, 0x97, 0x24, 0x4e, 0xa2, 0x90, 0x0d, 0xdc, 0xb5, + 0xed, 0xc2, 0x6e, 0xc1, 0x9b, 0x8c, 0xd1, 0x09, 0x6c, 0xa8, 0x48, 0x62, 0x49, 0x95, 0x0a, 0xd9, + 0x40, 0xba, 0xeb, 0x66, 0x9b, 0xf9, 0xd2, 0x2e, 0x23, 0x2a, 0x5f, 0xe0, 0x7e, 0xed, 0x20, 0x0a, + 0x29, 0x53, 0xbd, 0xa3, 0x6e, 0x37, 0xe3, 0x78, 0x25, 0x15, 0xc9, 0x7c, 0x50, 0xdd, 0x81, 0x55, + 0x1b, 0x22, 0xc8, 0x85, 0x35, 0x12, 0x04, 0x82, 0x4a, 0x69, 0x02, 0xab, 0xe8, 0xe5, 0xc3, 0x6a, + 0x0b, 0x8a, 0x93, 0x20, 0xb8, 0x1a, 0x86, 0x7e, 0x06, 0x1b, 0xc4, 0xf7, 0xa9, 0x94, 0x58, 0xf1, + 0x73, 0xca, 0x4c, 0x70, 0x15, 0xbd, 0x92, 0xb5, 0xf5, 0xb4, 0xa9, 0x7a, 0x1f, 0xd6, 0xb2, 0x40, + 0x98, 0xf3, 0xb9, 0x3f, 0x2f, 0x42, 0x69, 0xea, 0xa0, 0xd1, 0x75, 0x58, 0x09, 0x68, 0x3f, 0x1d, + 0x18, 0xdc, 0xba, 0x67, 0x07, 0xa8, 0x07, 0xae, 0x76, 0x2a, 0x4b, 0xe3, 0x3e, 0x15, 0x98, 0x9f, + 0x61, 0xa2, 0x94, 0x08, 0xfb, 0xa9, 0xa2, 0x32, 0x0b, 0xeb, 0xcf, 0x6a, 0x36, 0x03, 0x6b, 0x79, + 0x06, 0xd6, 0xda, 0x4c, 0x3d, 0xfa, 0xd5, 0x0b, 0x12, 0xa5, 0xd4, 0xbb, 0x11, 0x93, 0x37, 0x1d, + 0xc3, 0x3d, 0x39, 0xab, 0x4f, 0x98, 0xe8, 0x05, 0xdc, 0x7e, 0x4f, 0x95, 0x31, 0xae, 0x4c, 0x3e, + 0xca, 0x2c, 0xce, 0xe7, 0xca, 0xde, 0x9c, 0x96, 0xbd, 0xa4, 0xa2, 0xef, 0xe1, 0xce, 0xbb, 0xba, + 0x31, 0x95, 0x92, 0x0c, 0x28, 0xa6, 0x23, 0xca, 0x94, 0xcc, 0x82, 0x7f, 0xae, 0xb4, 0x3b, 0x25, + 0x7d, 0x6c, 0xd9, 0x4d, 0x43, 0xae, 0xfe, 0x6d, 0x11, 0xe0, 0x32, 0x96, 0xe7, 0x9c, 0xd0, 0xc4, + 0x93, 0x8b, 0x9f, 0xea, 0xc9, 0xa5, 0x9f, 0xc6, 0x93, 0xcb, 0x3f, 0x9d, 0x27, 0x57, 0x7e, 0x8c, + 0x27, 0xff, 0x5d, 0x80, 0xe2, 0x24, 0x93, 0x75, 0x89, 0x8b, 0x42, 0x45, 0x05, 0x89, 0xb2, 0x52, + 0xfb, 0xc5, 0x47, 0x0a, 0xa5, 0xc1, 0xea, 0x12, 0x97, 0xd1, 0x74, 0x89, 0xa3, 0x6c, 0x14, 0x0a, + 0xce, 0x62, 0xca, 0x54, 0x16, 0x97, 0xf3, 0x4b, 0x5c, 0xf3, 0x12, 0xaf, 0x4b, 0xdc, 0x14, 0x1d, + 0x35, 0x60, 0x75, 0x48, 0x49, 0x40, 0x45, 0x76, 0x2c, 0x0f, 0xe6, 0x0a, 0x79, 0xf4, 0x8f, 0x29, + 0x95, 0xaa, 0x65, 0x18, 0xfa, 0x02, 0xb0, 0xdc, 0xa7, 0xab, 0xb0, 0xac, 0xc6, 0x09, 0xad, 0x7e, + 0x0e, 0x6b, 0xd9, 0x8a, 0x75, 0x5c, 0x8c, 0xb4, 0x67, 0xb2, 0x78, 0xb1, 0x83, 0xea, 0x21, 0x94, + 0xa6, 0x16, 0x83, 0x10, 0x2c, 0x33, 0x12, 0xe7, 0x18, 0xf3, 0x1b, 0xdd, 0x87, 0x72, 0x40, 0xcf, + 0x48, 0x1a, 0x29, 0x6c, 0x05, 0x6c, 0xce, 0x6f, 0x64, 0x46, 0xe3, 0xee, 0x6a, 0x0b, 0xca, 0xef, + 0xac, 0xe5, 0xff, 0x57, 0xa2, 0xb0, 0xf9, 0x5e, 0x9d, 0x45, 0x0e, 0x2c, 0x9d, 0xd3, 0x71, 0x26, + 0xa5, 0x7f, 0xa2, 0xdf, 0xe4, 0x9b, 0xf9, 0x94, 0xcb, 0x6d, 0x22, 0x97, 0x6d, 0xfa, 0xd7, 0x8b, + 0x8f, 0x0b, 0x4f, 0xd7, 0x61, 0x55, 0x09, 0xe2, 0x53, 0xb1, 0x73, 0x08, 0x4b, 0xdd, 0x46, 0x57, + 0x67, 0x14, 0x65, 0xa4, 0x1f, 0xd1, 0x20, 0xab, 0x41, 0xf9, 0x10, 0xfd, 0x1c, 0x36, 0xcf, 0x1f, + 0x4b, 0x2c, 0x09, 0xfe, 0xc3, 0x85, 0x32, 0x15, 0x3e, 0x5f, 0xf8, 0xf9, 0x63, 0xd9, 0x25, 0xcf, + 0x2e, 0x94, 0xae, 0xed, 0x3b, 0x7f, 0x59, 0x84, 0xf5, 0x1e, 0x4f, 0x78, 0xc4, 0x07, 0x63, 0x54, + 0x83, 0x2d, 0x96, 0xc6, 0x58, 0x89, 0x54, 0x2a, 0x1a, 0x60, 0xdd, 0x68, 0x84, 0xd4, 0xe6, 0x6a, + 0xd9, 0xbb, 0xc6, 0xd2, 0xb8, 0x67, 0x67, 0x4e, 0xed, 0x04, 0x4a, 0xe1, 0xb3, 0x33, 0x2e, 0x2e, + 0x88, 0x08, 0xb0, 0x6f, 0x8a, 0x39, 0xf6, 0xa9, 0x50, 0x38, 0xa0, 0x8a, 0x84, 0x91, 0x2d, 0x76, + 0x95, 0x87, 0x8f, 0x66, 0x6f, 0x33, 0xfb, 0x66, 0xed, 0xd0, 0x0a, 0xd8, 0xcb, 0xe0, 0x80, 0x0a, + 0xd5, 0xb0, 0x6c, 0xcf, 0x3d, 0xbb, 0x62, 0x66, 0xe7, 0x4f, 0x05, 0x70, 0xaf, 0xa2, 0xa1, 0x32, + 0x14, 0x9f, 0x77, 0x1a, 0xcd, 0xc3, 0x76, 0xa7, 0xd9, 0x70, 0x16, 0xd0, 0x06, 0xac, 0x77, 0xeb, + 0x9d, 0x76, 0xaf, 0xfd, 0xba, 0xe9, 0x14, 0x90, 0x03, 0x1b, 0x87, 0x27, 0xde, 0xcb, 0xba, 0xd7, + 0xc0, 0x27, 0x9d, 0xa3, 0x57, 0xce, 0x22, 0x42, 0x50, 0xa9, 0x9f, 0x9e, 0x36, 0x3b, 0x0d, 0x9c, + 0x4d, 0x38, 0x4b, 0x1a, 0x95, 0x73, 0x70, 0xb7, 0xd9, 0x73, 0x96, 0xd1, 0x2d, 0xd8, 0xaa, 0x1f, + 0xbd, 0xac, 0xbf, 0xea, 0xe2, 0x77, 0xe8, 0x2b, 0x3b, 0x7f, 0xad, 0x40, 0x49, 0x7b, 0x63, 0x7c, + 0xc0, 0xd9, 0x59, 0x38, 0x40, 0x9f, 0x43, 0xc9, 0x37, 0xbf, 0xac, 0xc7, 0xed, 0xe1, 0x83, 0x35, + 0x69, 0x7f, 0x6b, 0x40, 0x3f, 0x64, 0x44, 0x8c, 0xa7, 0x8f, 0x04, 0xac, 0xc9, 0x00, 0xbe, 0x82, + 0x4d, 0x49, 0xc5, 0x28, 0xf4, 0x29, 0xf6, 0x23, 0xed, 0x6d, 0x9b, 0x53, 0x45, 0xaf, 0x92, 0x99, + 0x0f, 0xac, 0x15, 0x3d, 0x81, 0x4a, 0x20, 0x48, 0xc8, 0x70, 0xde, 0xdd, 0x65, 0xb5, 0xeb, 0xf6, + 0x07, 0x05, 0xa6, 0x91, 0x01, 0xbc, 0xb2, 0x21, 0xe4, 0x43, 0xd4, 0x05, 0x37, 0x21, 0x42, 0x1f, + 0x9b, 0x1c, 0xa6, 0x2a, 0xe0, 0x17, 0x53, 0x5a, 0x2b, 0x1f, 0xd3, 0xba, 0x69, 0xa9, 0xdd, 0x8c, + 0x39, 0x11, 0xfd, 0x05, 0x5c, 0x0b, 0x42, 0xe9, 0xf3, 0x11, 0x15, 0x63, 0x9c, 0x57, 0xfb, 0x55, + 0xb3, 0x03, 0x67, 0x32, 0x51, 0xcf, 0xca, 0xfe, 0x73, 0xb8, 0x75, 0x09, 0x16, 0xf4, 0x4c, 0x50, + 0x39, 0xc4, 0x01, 0x8d, 0xc8, 0xd8, 0xf4, 0x17, 0xf3, 0x16, 0xf0, 0x74, 0xd1, 0x2d, 0x78, 0x37, + 0x26, 0x6c, 0xcf, 0x92, 0x1b, 0x9a, 0x8b, 0xbe, 0x86, 0x8a, 0xed, 0x29, 0x27, 0x0b, 0xd0, 0xdd, + 0x48, 0xd1, 0x50, 0xca, 0x76, 0x26, 0x5f, 0xc1, 0x37, 0x80, 0xa4, 0x22, 0x4a, 0x06, 0x38, 0x0d, + 0x92, 0x09, 0x1c, 0xec, 0x7a, 0xed, 0xcc, 0xf3, 0x20, 0xc9, 0xd1, 0x4d, 0xb8, 0x4b, 0xd9, 0x88, + 0x8f, 0x71, 0x4c, 0x95, 0x08, 0x7d, 0xdd, 0xee, 0xd8, 0xa3, 0xca, 0x89, 0xd7, 0x27, 0xdf, 0xa9, + 0x1a, 0xe0, 0xb1, 0xc5, 0x75, 0x2d, 0x2c, 0x97, 0xd9, 0x05, 0xc7, 0x34, 0xf1, 0x98, 0x04, 0x71, + 0xc8, 0x70, 0xc2, 0x85, 0x72, 0x4b, 0xdb, 0x85, 0xdd, 0x15, 0xaf, 0x62, 0xec, 0x75, 0x6d, 0x3e, + 0xe5, 0x42, 0xa1, 0x3d, 0xb8, 0x46, 0x46, 0x24, 0x8c, 0x48, 0x3f, 0x8c, 0x42, 0x35, 0xc6, 0x3f, + 0x70, 0x46, 0xdd, 0x8d, 0xc9, 0x47, 0x9c, 0xe9, 0xc9, 0xd7, 0x9c, 0x51, 0x14, 0xc0, 0x6d, 0x9f, + 0x33, 0x25, 0x78, 0x84, 0x93, 0x88, 0x30, 0x8a, 0x49, 0xaa, 0x86, 0x38, 0xe1, 0x51, 0xe8, 0x8f, + 0xdd, 0xb2, 0x49, 0xc8, 0xaf, 0x67, 0x26, 0x64, 0x3d, 0x55, 0x43, 0xca, 0x54, 0xe8, 0x1b, 0xef, + 0x9e, 0x1a, 0x82, 0x77, 0x33, 0xd3, 0x3a, 0xd5, 0x52, 0x1a, 0x61, 0xed, 0xda, 0x6b, 0x59, 0x1b, + 0x9a, 0x45, 0xfb, 0x59, 0x18, 0x51, 0xb7, 0x62, 0xbd, 0x66, 0x67, 0x6c, 0x42, 0x1c, 0x86, 0x11, + 0xd5, 0xdb, 0xd5, 0x9e, 0xc4, 0xba, 0x9c, 0xe6, 0x2d, 0xe6, 0xa6, 0xdd, 0xae, 0xb6, 0x77, 0x48, + 0x4c, 0xb3, 0x06, 0xf3, 0x3b, 0x93, 0x3e, 0x7e, 0x2a, 0x04, 0x65, 0xfe, 0xd8, 0x75, 0xae, 0xbe, + 0x31, 0xf7, 0x1f, 0xda, 0x1b, 0x73, 0x1a, 0x8f, 0xea, 0x70, 0xd7, 0xfa, 0xb5, 0xcf, 0xb9, 0x92, + 0x4a, 0x90, 0x04, 0x2b, 0x1a, 0x27, 0x11, 0x51, 0xd4, 0xa6, 0xdb, 0x35, 0xb3, 0xc2, 0xaa, 0x01, + 0x3d, 0xcd, 0x31, 0xbd, 0x0c, 0x62, 0xd2, 0x8f, 0xc2, 0xb5, 0x90, 0x29, 0x2a, 0x7c, 0x9a, 0x98, + 0xa7, 0x4e, 0xcc, 0x03, 0xea, 0x22, 0xe3, 0xb7, 0xc7, 0x33, 0xfd, 0x36, 0x95, 0xfd, 0xb5, 0x36, + 0xeb, 0xf3, 0x94, 0x05, 0xed, 0x29, 0x81, 0x63, 0x1e, 0x50, 0xcf, 0x09, 0xdf, 0xb3, 0xa0, 0x47, + 0xb0, 0xa6, 0x6c, 0xa1, 0x77, 0xb7, 0xcc, 0x26, 0xef, 0xcc, 0xbb, 0x0c, 0xbc, 0x1c, 0x8c, 0x1e, + 0xc0, 0x92, 0x0c, 0xa4, 0x7b, 0xc3, 0x70, 0xdc, 0x99, 0x9c, 0x6e, 0xa3, 0xeb, 0x69, 0x10, 0xfa, + 0x1e, 0x5c, 0x1b, 0xac, 0x59, 0xef, 0x1b, 0xf1, 0x41, 0x1e, 0xaf, 0xee, 0x4d, 0x23, 0xb0, 0x33, + 0x53, 0xc0, 0xa3, 0x31, 0x57, 0x34, 0x0b, 0x59, 0xef, 0x86, 0xd1, 0xa8, 0x1b, 0x89, 0x23, 0x3e, + 0xc8, 0xcc, 0xe8, 0x05, 0xdc, 0x98, 0x99, 0x09, 0xee, 0xad, 0x4f, 0x56, 0xde, 0x9a, 0x91, 0x21, + 0xe8, 0x35, 0xd8, 0x14, 0xd0, 0xba, 0x44, 0xbf, 0xc7, 0x5c, 0xd7, 0xbc, 0x71, 0xf6, 0x3f, 0xea, + 0x7c, 0xf3, 0xfb, 0x38, 0x63, 0xd9, 0xa7, 0x4e, 0x39, 0x99, 0xb6, 0xe9, 0xda, 0xab, 0xe3, 0x2d, + 0x95, 0x36, 0xe3, 0xaa, 0x26, 0x04, 0xc1, 0x9a, 0x4c, 0xb6, 0x7d, 0x09, 0x9b, 0xf4, 0x8d, 0x12, + 0x04, 0x9b, 0x70, 0x35, 0x2f, 0xac, 0xcf, 0xb6, 0x97, 0x76, 0x8b, 0x5e, 0xd9, 0x98, 0xbb, 0x8a, + 0x28, 0xf3, 0x6c, 0x6a, 0x81, 0x33, 0x20, 0x8a, 0x5e, 0x90, 0x31, 0x56, 0xd9, 0x3d, 0xe6, 0xde, + 0x31, 0xfb, 0xbe, 0x3b, 0xf7, 0xb2, 0xf3, 0x36, 0x33, 0xda, 0xe4, 0xc6, 0x7d, 0x09, 0x55, 0x45, + 0x45, 0x9c, 0x3f, 0xac, 0xdf, 0x2b, 0xe8, 0x77, 0x3f, 0x56, 0x84, 0xdd, 0x29, 0x72, 0xe3, 0x9d, + 0xda, 0x7e, 0x0b, 0xd6, 0xf4, 0x1a, 0x70, 0x18, 0xb8, 0xf7, 0x4c, 0xd0, 0xaf, 0xea, 0x61, 0x3b, + 0xa8, 0x3e, 0x01, 0xf4, 0xa1, 0xa7, 0x66, 0x34, 0x2b, 0xd7, 0xa7, 0x9b, 0x95, 0xe2, 0x54, 0x13, + 0xb2, 0xb3, 0x0f, 0xb7, 0xae, 0x08, 0x74, 0x7d, 0xdb, 0x7a, 0xcd, 0x46, 0xdb, 0x6b, 0x1e, 0xf4, + 0x9c, 0x05, 0x04, 0xb0, 0xda, 0x3b, 0xf5, 0x4e, 0x7e, 0xff, 0xca, 0x29, 0x3c, 0x5b, 0x5e, 0x2f, + 0x3a, 0xe0, 0x6d, 0xfa, 0x9c, 0x31, 0xea, 0x2b, 0xac, 0xc2, 0x98, 0xf2, 0x54, 0xed, 0xfc, 0xa7, + 0xa0, 0x5b, 0xb0, 0xa9, 0xa8, 0x98, 0xf3, 0x46, 0x78, 0xff, 0x85, 0xb9, 0xf8, 0x23, 0x5f, 0x98, + 0x88, 0x43, 0x59, 0xf9, 0x09, 0x3e, 0xa7, 0x34, 0x21, 0x51, 0x38, 0xa2, 0x59, 0xf3, 0xfa, 0x6c, + 0x9e, 0xa2, 0x5d, 0xbf, 0xa9, 0x90, 0x3c, 0xca, 0x95, 0x6a, 0xbd, 0x83, 0xd3, 0xcb, 0xdf, 0x7e, + 0xf2, 0xbb, 0x5c, 0xd1, 0xdb, 0x50, 0x53, 0xa3, 0x07, 0xbf, 0x85, 0xeb, 0xb3, 0xca, 0x2c, 0x5a, + 0x87, 0xe5, 0xce, 0x49, 0xa7, 0xe9, 0x2c, 0xa0, 0x0a, 0xc0, 0xf1, 0xf3, 0xde, 0xf3, 0xfa, 0x11, + 0xee, 0x1d, 0x75, 0x9d, 0x02, 0xda, 0x80, 0xb5, 0x76, 0xa7, 0xd5, 0xf4, 0xda, 0x3d, 0xe7, 0x5f, + 0x6b, 0x4f, 0x77, 0xff, 0xfe, 0xf6, 0x5e, 0xe1, 0x1f, 0x6f, 0xef, 0x15, 0xfe, 0xf9, 0xf6, 0x5e, + 0xe1, 0x75, 0xd5, 0x2e, 0x33, 0xe4, 0x7b, 0x24, 0x09, 0xf7, 0xde, 0xf9, 0x8f, 0xa8, 0xbf, 0x6a, + 0x62, 0x65, 0xff, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x85, 0xb4, 0x45, 0xc2, 0x3b, 0x12, 0x00, + 0x00, } func (m *Tracing) Marshal() (dAtA []byte, err error) { @@ -1557,6 +1669,15 @@ func (m *Tracing) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + if m.Tracer != nil { + { + size := m.Tracer.Size() + i -= size + if _, err := m.Tracer.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + } + } if m.TlsSettings != nil { { size, err := m.TlsSettings.MarshalToSizedBuffer(dAtA[:i]) @@ -1606,15 +1727,6 @@ func (m *Tracing) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x2a } } - if m.Tracer != nil { - { - size := m.Tracer.Size() - i -= size - if _, err := m.Tracer.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - } - } return len(dAtA) - i, nil } @@ -1698,6 +1810,26 @@ func (m *Tracing_Stackdriver_) MarshalToSizedBuffer(dAtA []byte) (int, error) { } return len(dAtA) - i, nil } +func (m *Tracing_OpenCensus_) MarshalTo(dAtA []byte) (int, error) { + return m.MarshalToSizedBuffer(dAtA[:m.Size()]) +} + +func (m *Tracing_OpenCensus_) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + if m.OpenCensus != nil { + { + size, err := m.OpenCensus.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintProxy(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x4a + } + return len(dAtA) - i, nil +} func (m *Tracing_Zipkin) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -1880,6 +2012,86 @@ func (m *Tracing_Stackdriver) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *Tracing_OpenCensus) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *Tracing_OpenCensus) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Tracing_OpenCensus) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if m.MaxNumberOfMessageEvents != nil { + { + size, err := m.MaxNumberOfMessageEvents.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintProxy(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x2a + } + if m.MaxNumberOfAnnotations != nil { + { + size, err := m.MaxNumberOfAnnotations.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintProxy(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + } + if m.MaxNumberOfAttributes != nil { + { + size, err := m.MaxNumberOfAttributes.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintProxy(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + } + if m.Debug { + i-- + if m.Debug { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x10 + } + if len(m.Address) > 0 { + i -= len(m.Address) + copy(dAtA[i:], m.Address) + i = encodeVarintProxy(dAtA, i, uint64(len(m.Address))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func (m *Tracing_CustomTag) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -2633,6 +2845,18 @@ func (m *Tracing_Stackdriver_) Size() (n int) { } return n } +func (m *Tracing_OpenCensus_) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.OpenCensus != nil { + l = m.OpenCensus.Size() + n += 1 + l + sovProxy(uint64(l)) + } + return n +} func (m *Tracing_Zipkin) Size() (n int) { if m == nil { return 0 @@ -2712,6 +2936,37 @@ func (m *Tracing_Stackdriver) Size() (n int) { return n } +func (m *Tracing_OpenCensus) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Address) + if l > 0 { + n += 1 + l + sovProxy(uint64(l)) + } + if m.Debug { + n += 2 + } + if m.MaxNumberOfAttributes != nil { + l = m.MaxNumberOfAttributes.Size() + n += 1 + l + sovProxy(uint64(l)) + } + if m.MaxNumberOfAnnotations != nil { + l = m.MaxNumberOfAnnotations.Size() + n += 1 + l + sovProxy(uint64(l)) + } + if m.MaxNumberOfMessageEvents != nil { + l = m.MaxNumberOfMessageEvents.Size() + n += 1 + l + sovProxy(uint64(l)) + } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } + return n +} + func (m *Tracing_CustomTag) Size() (n int) { if m == nil { return 0 @@ -3375,6 +3630,41 @@ func (m *Tracing) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 9: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field OpenCensus", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowProxy + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthProxy + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthProxy + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + v := &Tracing_OpenCensus{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.Tracer = &Tracing_OpenCensus_{v} + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipProxy(dAtA[iNdEx:]) @@ -3872,6 +4162,220 @@ func (m *Tracing_Stackdriver) Unmarshal(dAtA []byte) error { } return nil } +func (m *Tracing_OpenCensus) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowProxy + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: OpenCensus: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: OpenCensus: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Address", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowProxy + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthProxy + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthProxy + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Address = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Debug", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowProxy + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.Debug = bool(v != 0) + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field MaxNumberOfAttributes", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowProxy + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthProxy + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthProxy + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.MaxNumberOfAttributes == nil { + m.MaxNumberOfAttributes = &types.Int64Value{} + } + if err := m.MaxNumberOfAttributes.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field MaxNumberOfAnnotations", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowProxy + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthProxy + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthProxy + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.MaxNumberOfAnnotations == nil { + m.MaxNumberOfAnnotations = &types.Int64Value{} + } + if err := m.MaxNumberOfAnnotations.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field MaxNumberOfMessageEvents", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowProxy + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthProxy + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthProxy + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.MaxNumberOfMessageEvents == nil { + m.MaxNumberOfMessageEvents = &types.Int64Value{} + } + if err := m.MaxNumberOfMessageEvents.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipProxy(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthProxy + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthProxy + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *Tracing_CustomTag) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/mesh/v1alpha1/proxy.proto b/mesh/v1alpha1/proxy.proto index ca7fadce4f..f4f55d2415 100644 --- a/mesh/v1alpha1/proxy.proto +++ b/mesh/v1alpha1/proxy.proto @@ -62,7 +62,7 @@ message Tracing { } // Stackdriver defines configuration for a Stackdriver tracer. - // See [Opencensus trace config](https://github.com/census-instrumentation/opencensus-proto/blob/master/src/opencensus/proto/trace/v1/trace_config.proto) for details. + // See [OpenCensus trace config](https://github.com/census-instrumentation/opencensus-proto/blob/master/src/opencensus/proto/trace/v1/trace_config.proto) for details. message Stackdriver { // debug enables trace output to stdout. // $hide_from_docs @@ -81,6 +81,29 @@ message Tracing { google.protobuf.Int64Value max_number_of_message_events = 4; } + // OpenCensus defines configuration for an OpenCensus tracer. + // See [OpenCensus trace config](https://github.com/census-instrumentation/opencensus-proto/blob/master/src/opencensus/proto/trace/v1/trace_config.proto) for details. + message OpenCensus { + // gRPC address for the OpenCensus Agent (e.g. dns://authority/host:port or unix:path). + // See [gRPC naming docs](https://github.com/grpc/grpc/blob/master/doc/naming.md) for details. + string address = 1; + // debug enables trace output to stdout + // $hide_from_docs + bool debug = 2; + // The global default max number of attributes per span. + // default is 200. + // $hide_from_docs + google.protobuf.Int64Value max_number_of_attributes = 3; + // The global default max number of annotation events per span. + // default is 200. + // $hide_from_docs + google.protobuf.Int64Value max_number_of_annotations = 4; + // The global default max number of message events per span. + // default is 200. + // $hide_from_docs + google.protobuf.Int64Value max_number_of_message_events = 5; + } + // The tracer implementation to be used by Envoy. oneof tracer { // Use a Zipkin tracer. @@ -91,6 +114,8 @@ message Tracing { Datadog datadog = 3; // Use a Stackdriver tracer. Stackdriver stackdriver = 4; + // Use an OpenCensus tracer. + OpenCensus open_census = 9; } // Configure custom tags that will be added to any active span. @@ -172,7 +197,7 @@ message Tracing { istio.networking.v1alpha3.ClientTLSSettings tls_settings = 8; // $hide_from_docs - // Next available field number: 9 + // Next available field number: 10 } diff --git a/python/istio_api/mesh/v1alpha1/proxy_pb2.py b/python/istio_api/mesh/v1alpha1/proxy_pb2.py index d9de385835..4c5ad287c1 100644 --- a/python/istio_api/mesh/v1alpha1/proxy_pb2.py +++ b/python/istio_api/mesh/v1alpha1/proxy_pb2.py @@ -24,7 +24,7 @@ package='istio.mesh.v1alpha1', syntax='proto3', serialized_options=_b('Z\032istio.io/api/mesh/v1alpha1'), - serialized_pb=_b('\n\x19mesh/v1alpha1/proxy.proto\x12\x13istio.mesh.v1alpha1\x1a\x1egoogle/protobuf/duration.proto\x1a\x1egoogle/protobuf/wrappers.proto\x1a*networking/v1alpha3/destination_rule.proto\"\xb0\t\n\x07Tracing\x12\x35\n\x06zipkin\x18\x01 \x01(\x0b\x32#.istio.mesh.v1alpha1.Tracing.ZipkinH\x00\x12;\n\tlightstep\x18\x02 \x01(\x0b\x32&.istio.mesh.v1alpha1.Tracing.LightstepH\x00\x12\x37\n\x07\x64\x61tadog\x18\x03 \x01(\x0b\x32$.istio.mesh.v1alpha1.Tracing.DatadogH\x00\x12?\n\x0bstackdriver\x18\x04 \x01(\x0b\x32(.istio.mesh.v1alpha1.Tracing.StackdriverH\x00\x12\x41\n\x0b\x63ustom_tags\x18\x05 \x03(\x0b\x32,.istio.mesh.v1alpha1.Tracing.CustomTagsEntry\x12\x1b\n\x13max_path_tag_length\x18\x06 \x01(\r\x12\x10\n\x08sampling\x18\x07 \x01(\x01\x12\x42\n\x0ctls_settings\x18\x08 \x01(\x0b\x32,.istio.networking.v1alpha3.ClientTLSSettings\x1a\x19\n\x06Zipkin\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x1a\x32\n\tLightstep\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x14\n\x0c\x61\x63\x63\x65ss_token\x18\x02 \x01(\t\x1a\x1a\n\x07\x44\x61tadog\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x1a\xde\x01\n\x0bStackdriver\x12\r\n\x05\x64\x65\x62ug\x18\x01 \x01(\x08\x12=\n\x18max_number_of_attributes\x18\x02 \x01(\x0b\x32\x1b.google.protobuf.Int64Value\x12>\n\x19max_number_of_annotations\x18\x03 \x01(\x0b\x32\x1b.google.protobuf.Int64Value\x12\x41\n\x1cmax_number_of_message_events\x18\x04 \x01(\x0b\x32\x1b.google.protobuf.Int64Value\x1a\xcb\x01\n\tCustomTag\x12\x37\n\x07literal\x18\x01 \x01(\x0b\x32$.istio.mesh.v1alpha1.Tracing.LiteralH\x00\x12?\n\x0b\x65nvironment\x18\x02 \x01(\x0b\x32(.istio.mesh.v1alpha1.Tracing.EnvironmentH\x00\x12<\n\x06header\x18\x03 \x01(\x0b\x32*.istio.mesh.v1alpha1.Tracing.RequestHeaderH\x00\x42\x06\n\x04type\x1a\x18\n\x07Literal\x12\r\n\x05value\x18\x01 \x01(\t\x1a\x32\n\x0b\x45nvironment\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x15\n\rdefault_value\x18\x02 \x01(\t\x1a\x34\n\rRequestHeader\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x15\n\rdefault_value\x18\x02 \x01(\t\x1aY\n\x0f\x43ustomTagsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x35\n\x05value\x18\x02 \x01(\x0b\x32&.istio.mesh.v1alpha1.Tracing.CustomTag:\x02\x38\x01\x42\x08\n\x06tracer\"/\n\x03SDS\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\x12\x17\n\x0fk8s_sa_jwt_path\x18\x02 \x01(\t\"\x8f\x02\n\x08Topology\x12\x1b\n\x13num_trusted_proxies\x18\x01 \x01(\r\x12[\n\x1b\x66orward_client_cert_details\x18\x02 \x01(\x0e\x32\x36.istio.mesh.v1alpha1.Topology.ForwardClientCertDetails\"\x88\x01\n\x18\x46orwardClientCertDetails\x12\r\n\tUNDEFINED\x10\x00\x12\x0c\n\x08SANITIZE\x10\x01\x12\x10\n\x0c\x46ORWARD_ONLY\x10\x02\x12\x12\n\x0e\x41PPEND_FORWARD\x10\x03\x12\x10\n\x0cSANITIZE_SET\x10\x04\x12\x17\n\x13\x41LWAYS_FORWARD_ONLY\x10\x05\"\xce\n\n\x0bProxyConfig\x12\x13\n\x0b\x63onfig_path\x18\x01 \x01(\t\x12\x13\n\x0b\x62inary_path\x18\x02 \x01(\t\x12\x17\n\x0fservice_cluster\x18\x03 \x01(\t\x12\x31\n\x0e\x64rain_duration\x18\x04 \x01(\x0b\x32\x19.google.protobuf.Duration\x12;\n\x18parent_shutdown_duration\x18\x05 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x19\n\x11\x64iscovery_address\x18\x06 \x01(\t\x12>\n\x17\x64iscovery_refresh_delay\x18\x07 \x01(\x0b\x32\x19.google.protobuf.DurationB\x02\x18\x01\x12\x1a\n\x0ezipkin_address\x18\x08 \x01(\tB\x02\x18\x01\x12\x1a\n\x12statsd_udp_address\x18\n \x01(\t\x12)\n\x1d\x65nvoy_metrics_service_address\x18\x14 \x01(\tB\x02\x18\x01\x12\x18\n\x10proxy_admin_port\x18\x0b \x01(\x05\x12\x1d\n\x11\x61vailability_zone\x18\x0c \x01(\tB\x02\x18\x01\x12L\n\x19\x63ontrol_plane_auth_policy\x18\r \x01(\x0e\x32).istio.mesh.v1alpha1.AuthenticationPolicy\x12\x1a\n\x12\x63ustom_config_file\x18\x0e \x01(\t\x12\x18\n\x10stat_name_length\x18\x0f \x01(\x05\x12\x30\n\x0b\x63oncurrency\x18\x10 \x01(\x0b\x32\x1b.google.protobuf.Int32Value\x12%\n\x1dproxy_bootstrap_template_path\x18\x11 \x01(\t\x12S\n\x11interception_mode\x18\x12 \x01(\x0e\x32\x38.istio.mesh.v1alpha1.ProxyConfig.InboundInterceptionMode\x12-\n\x07tracing\x18\x13 \x01(\x0b\x32\x1c.istio.mesh.v1alpha1.Tracing\x12%\n\x03sds\x18\x15 \x01(\x0b\x32\x18.istio.mesh.v1alpha1.SDS\x12\x44\n\x18\x65nvoy_access_log_service\x18\x16 \x01(\x0b\x32\".istio.mesh.v1alpha1.RemoteService\x12\x41\n\x15\x65nvoy_metrics_service\x18\x17 \x01(\x0b\x32\".istio.mesh.v1alpha1.RemoteService\x12K\n\x0eproxy_metadata\x18\x18 \x03(\x0b\x32\x33.istio.mesh.v1alpha1.ProxyConfig.ProxyMetadataEntry\x12\x13\n\x0bstatus_port\x18\x1a \x01(\x05\x12\x17\n\x0f\x65xtra_stat_tags\x18\x1b \x03(\t\x12\x37\n\x10gateway_topology\x18\x1c \x01(\x0b\x32\x1d.istio.mesh.v1alpha1.Topology\x12=\n\x1atermination_drain_duration\x18\x1d \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x0f\n\x07mesh_id\x18\x1e \x01(\t\x1a\x34\n\x12ProxyMetadataEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"3\n\x17InboundInterceptionMode\x12\x0c\n\x08REDIRECT\x10\x00\x12\n\n\x06TPROXY\x10\x01J\x04\x08\t\x10\nR\x0f\x63onnect_timeout\"\xc7\x01\n\rRemoteService\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x42\n\x0ctls_settings\x18\x02 \x01(\x0b\x32,.istio.networking.v1alpha3.ClientTLSSettings\x12\x61\n\rtcp_keepalive\x18\x03 \x01(\x0b\x32J.istio.networking.v1alpha3.ConnectionPoolSettings.TCPSettings.TcpKeepalive*>\n\x14\x41uthenticationPolicy\x12\x08\n\x04NONE\x10\x00\x12\x0e\n\nMUTUAL_TLS\x10\x01\x12\x0c\n\x07INHERIT\x10\xe8\x07\x42\x1cZ\x1aistio.io/api/mesh/v1alpha1b\x06proto3') + serialized_pb=_b('\n\x19mesh/v1alpha1/proxy.proto\x12\x13istio.mesh.v1alpha1\x1a\x1egoogle/protobuf/duration.proto\x1a\x1egoogle/protobuf/wrappers.proto\x1a*networking/v1alpha3/destination_rule.proto\"\xe1\x0b\n\x07Tracing\x12\x35\n\x06zipkin\x18\x01 \x01(\x0b\x32#.istio.mesh.v1alpha1.Tracing.ZipkinH\x00\x12;\n\tlightstep\x18\x02 \x01(\x0b\x32&.istio.mesh.v1alpha1.Tracing.LightstepH\x00\x12\x37\n\x07\x64\x61tadog\x18\x03 \x01(\x0b\x32$.istio.mesh.v1alpha1.Tracing.DatadogH\x00\x12?\n\x0bstackdriver\x18\x04 \x01(\x0b\x32(.istio.mesh.v1alpha1.Tracing.StackdriverH\x00\x12>\n\x0bopen_census\x18\t \x01(\x0b\x32\'.istio.mesh.v1alpha1.Tracing.OpenCensusH\x00\x12\x41\n\x0b\x63ustom_tags\x18\x05 \x03(\x0b\x32,.istio.mesh.v1alpha1.Tracing.CustomTagsEntry\x12\x1b\n\x13max_path_tag_length\x18\x06 \x01(\r\x12\x10\n\x08sampling\x18\x07 \x01(\x01\x12\x42\n\x0ctls_settings\x18\x08 \x01(\x0b\x32,.istio.networking.v1alpha3.ClientTLSSettings\x1a\x19\n\x06Zipkin\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x1a\x32\n\tLightstep\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x14\n\x0c\x61\x63\x63\x65ss_token\x18\x02 \x01(\t\x1a\x1a\n\x07\x44\x61tadog\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x1a\xde\x01\n\x0bStackdriver\x12\r\n\x05\x64\x65\x62ug\x18\x01 \x01(\x08\x12=\n\x18max_number_of_attributes\x18\x02 \x01(\x0b\x32\x1b.google.protobuf.Int64Value\x12>\n\x19max_number_of_annotations\x18\x03 \x01(\x0b\x32\x1b.google.protobuf.Int64Value\x12\x41\n\x1cmax_number_of_message_events\x18\x04 \x01(\x0b\x32\x1b.google.protobuf.Int64Value\x1a\xee\x01\n\nOpenCensus\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\r\n\x05\x64\x65\x62ug\x18\x02 \x01(\x08\x12=\n\x18max_number_of_attributes\x18\x03 \x01(\x0b\x32\x1b.google.protobuf.Int64Value\x12>\n\x19max_number_of_annotations\x18\x04 \x01(\x0b\x32\x1b.google.protobuf.Int64Value\x12\x41\n\x1cmax_number_of_message_events\x18\x05 \x01(\x0b\x32\x1b.google.protobuf.Int64Value\x1a\xcb\x01\n\tCustomTag\x12\x37\n\x07literal\x18\x01 \x01(\x0b\x32$.istio.mesh.v1alpha1.Tracing.LiteralH\x00\x12?\n\x0b\x65nvironment\x18\x02 \x01(\x0b\x32(.istio.mesh.v1alpha1.Tracing.EnvironmentH\x00\x12<\n\x06header\x18\x03 \x01(\x0b\x32*.istio.mesh.v1alpha1.Tracing.RequestHeaderH\x00\x42\x06\n\x04type\x1a\x18\n\x07Literal\x12\r\n\x05value\x18\x01 \x01(\t\x1a\x32\n\x0b\x45nvironment\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x15\n\rdefault_value\x18\x02 \x01(\t\x1a\x34\n\rRequestHeader\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x15\n\rdefault_value\x18\x02 \x01(\t\x1aY\n\x0f\x43ustomTagsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x35\n\x05value\x18\x02 \x01(\x0b\x32&.istio.mesh.v1alpha1.Tracing.CustomTag:\x02\x38\x01\x42\x08\n\x06tracer\"/\n\x03SDS\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\x12\x17\n\x0fk8s_sa_jwt_path\x18\x02 \x01(\t\"\x8f\x02\n\x08Topology\x12\x1b\n\x13num_trusted_proxies\x18\x01 \x01(\r\x12[\n\x1b\x66orward_client_cert_details\x18\x02 \x01(\x0e\x32\x36.istio.mesh.v1alpha1.Topology.ForwardClientCertDetails\"\x88\x01\n\x18\x46orwardClientCertDetails\x12\r\n\tUNDEFINED\x10\x00\x12\x0c\n\x08SANITIZE\x10\x01\x12\x10\n\x0c\x46ORWARD_ONLY\x10\x02\x12\x12\n\x0e\x41PPEND_FORWARD\x10\x03\x12\x10\n\x0cSANITIZE_SET\x10\x04\x12\x17\n\x13\x41LWAYS_FORWARD_ONLY\x10\x05\"\xce\n\n\x0bProxyConfig\x12\x13\n\x0b\x63onfig_path\x18\x01 \x01(\t\x12\x13\n\x0b\x62inary_path\x18\x02 \x01(\t\x12\x17\n\x0fservice_cluster\x18\x03 \x01(\t\x12\x31\n\x0e\x64rain_duration\x18\x04 \x01(\x0b\x32\x19.google.protobuf.Duration\x12;\n\x18parent_shutdown_duration\x18\x05 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x19\n\x11\x64iscovery_address\x18\x06 \x01(\t\x12>\n\x17\x64iscovery_refresh_delay\x18\x07 \x01(\x0b\x32\x19.google.protobuf.DurationB\x02\x18\x01\x12\x1a\n\x0ezipkin_address\x18\x08 \x01(\tB\x02\x18\x01\x12\x1a\n\x12statsd_udp_address\x18\n \x01(\t\x12)\n\x1d\x65nvoy_metrics_service_address\x18\x14 \x01(\tB\x02\x18\x01\x12\x18\n\x10proxy_admin_port\x18\x0b \x01(\x05\x12\x1d\n\x11\x61vailability_zone\x18\x0c \x01(\tB\x02\x18\x01\x12L\n\x19\x63ontrol_plane_auth_policy\x18\r \x01(\x0e\x32).istio.mesh.v1alpha1.AuthenticationPolicy\x12\x1a\n\x12\x63ustom_config_file\x18\x0e \x01(\t\x12\x18\n\x10stat_name_length\x18\x0f \x01(\x05\x12\x30\n\x0b\x63oncurrency\x18\x10 \x01(\x0b\x32\x1b.google.protobuf.Int32Value\x12%\n\x1dproxy_bootstrap_template_path\x18\x11 \x01(\t\x12S\n\x11interception_mode\x18\x12 \x01(\x0e\x32\x38.istio.mesh.v1alpha1.ProxyConfig.InboundInterceptionMode\x12-\n\x07tracing\x18\x13 \x01(\x0b\x32\x1c.istio.mesh.v1alpha1.Tracing\x12%\n\x03sds\x18\x15 \x01(\x0b\x32\x18.istio.mesh.v1alpha1.SDS\x12\x44\n\x18\x65nvoy_access_log_service\x18\x16 \x01(\x0b\x32\".istio.mesh.v1alpha1.RemoteService\x12\x41\n\x15\x65nvoy_metrics_service\x18\x17 \x01(\x0b\x32\".istio.mesh.v1alpha1.RemoteService\x12K\n\x0eproxy_metadata\x18\x18 \x03(\x0b\x32\x33.istio.mesh.v1alpha1.ProxyConfig.ProxyMetadataEntry\x12\x13\n\x0bstatus_port\x18\x1a \x01(\x05\x12\x17\n\x0f\x65xtra_stat_tags\x18\x1b \x03(\t\x12\x37\n\x10gateway_topology\x18\x1c \x01(\x0b\x32\x1d.istio.mesh.v1alpha1.Topology\x12=\n\x1atermination_drain_duration\x18\x1d \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x0f\n\x07mesh_id\x18\x1e \x01(\t\x1a\x34\n\x12ProxyMetadataEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"3\n\x17InboundInterceptionMode\x12\x0c\n\x08REDIRECT\x10\x00\x12\n\n\x06TPROXY\x10\x01J\x04\x08\t\x10\nR\x0f\x63onnect_timeout\"\xc7\x01\n\rRemoteService\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x42\n\x0ctls_settings\x18\x02 \x01(\x0b\x32,.istio.networking.v1alpha3.ClientTLSSettings\x12\x61\n\rtcp_keepalive\x18\x03 \x01(\x0b\x32J.istio.networking.v1alpha3.ConnectionPoolSettings.TCPSettings.TcpKeepalive*>\n\x14\x41uthenticationPolicy\x12\x08\n\x04NONE\x10\x00\x12\x0e\n\nMUTUAL_TLS\x10\x01\x12\x0c\n\x07INHERIT\x10\xe8\x07\x42\x1cZ\x1aistio.io/api/mesh/v1alpha1b\x06proto3') , dependencies=[google_dot_protobuf_dot_duration__pb2.DESCRIPTOR,google_dot_protobuf_dot_wrappers__pb2.DESCRIPTOR,networking_dot_v1alpha3_dot_destination__rule__pb2.DESCRIPTOR,]) @@ -49,8 +49,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=3247, - serialized_end=3309, + serialized_start=3552, + serialized_end=3614, ) _sym_db.RegisterEnumDescriptor(_AUTHENTICATIONPOLICY) @@ -93,8 +93,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=1546, - serialized_end=1682, + serialized_start=1851, + serialized_end=1987, ) _sym_db.RegisterEnumDescriptor(_TOPOLOGY_FORWARDCLIENTCERTDETAILS) @@ -115,8 +115,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=2969, - serialized_end=3020, + serialized_start=3274, + serialized_end=3325, ) _sym_db.RegisterEnumDescriptor(_PROXYCONFIG_INBOUNDINTERCEPTIONMODE) @@ -147,8 +147,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=590, - serialized_end=615, + serialized_start=654, + serialized_end=679, ) _TRACING_LIGHTSTEP = _descriptor.Descriptor( @@ -184,8 +184,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=617, - serialized_end=667, + serialized_start=681, + serialized_end=731, ) _TRACING_DATADOG = _descriptor.Descriptor( @@ -214,8 +214,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=669, - serialized_end=695, + serialized_start=733, + serialized_end=759, ) _TRACING_STACKDRIVER = _descriptor.Descriptor( @@ -265,8 +265,66 @@ extension_ranges=[], oneofs=[ ], - serialized_start=698, - serialized_end=920, + serialized_start=762, + serialized_end=984, +) + +_TRACING_OPENCENSUS = _descriptor.Descriptor( + name='OpenCensus', + full_name='istio.mesh.v1alpha1.Tracing.OpenCensus', + filename=None, + file=DESCRIPTOR, + containing_type=None, + fields=[ + _descriptor.FieldDescriptor( + name='address', full_name='istio.mesh.v1alpha1.Tracing.OpenCensus.address', index=0, + number=1, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=_b("").decode('utf-8'), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='debug', full_name='istio.mesh.v1alpha1.Tracing.OpenCensus.debug', index=1, + number=2, type=8, cpp_type=7, label=1, + has_default_value=False, default_value=False, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='max_number_of_attributes', full_name='istio.mesh.v1alpha1.Tracing.OpenCensus.max_number_of_attributes', index=2, + number=3, type=11, cpp_type=10, label=1, + has_default_value=False, default_value=None, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='max_number_of_annotations', full_name='istio.mesh.v1alpha1.Tracing.OpenCensus.max_number_of_annotations', index=3, + number=4, type=11, cpp_type=10, label=1, + has_default_value=False, default_value=None, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='max_number_of_message_events', full_name='istio.mesh.v1alpha1.Tracing.OpenCensus.max_number_of_message_events', index=4, + number=5, type=11, cpp_type=10, label=1, + has_default_value=False, default_value=None, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + ], + extensions=[ + ], + nested_types=[], + enum_types=[ + ], + serialized_options=None, + is_extendable=False, + syntax='proto3', + extension_ranges=[], + oneofs=[ + ], + serialized_start=987, + serialized_end=1225, ) _TRACING_CUSTOMTAG = _descriptor.Descriptor( @@ -312,8 +370,8 @@ name='type', full_name='istio.mesh.v1alpha1.Tracing.CustomTag.type', index=0, containing_type=None, fields=[]), ], - serialized_start=923, - serialized_end=1126, + serialized_start=1228, + serialized_end=1431, ) _TRACING_LITERAL = _descriptor.Descriptor( @@ -342,8 +400,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1128, - serialized_end=1152, + serialized_start=1433, + serialized_end=1457, ) _TRACING_ENVIRONMENT = _descriptor.Descriptor( @@ -379,8 +437,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1154, - serialized_end=1204, + serialized_start=1459, + serialized_end=1509, ) _TRACING_REQUESTHEADER = _descriptor.Descriptor( @@ -416,8 +474,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1206, - serialized_end=1258, + serialized_start=1511, + serialized_end=1563, ) _TRACING_CUSTOMTAGSENTRY = _descriptor.Descriptor( @@ -453,8 +511,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1260, - serialized_end=1349, + serialized_start=1565, + serialized_end=1654, ) _TRACING = _descriptor.Descriptor( @@ -493,28 +551,35 @@ is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='custom_tags', full_name='istio.mesh.v1alpha1.Tracing.custom_tags', index=4, + name='open_census', full_name='istio.mesh.v1alpha1.Tracing.open_census', index=4, + number=9, type=11, cpp_type=10, label=1, + has_default_value=False, default_value=None, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='custom_tags', full_name='istio.mesh.v1alpha1.Tracing.custom_tags', index=5, number=5, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='max_path_tag_length', full_name='istio.mesh.v1alpha1.Tracing.max_path_tag_length', index=5, + name='max_path_tag_length', full_name='istio.mesh.v1alpha1.Tracing.max_path_tag_length', index=6, number=6, type=13, cpp_type=3, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='sampling', full_name='istio.mesh.v1alpha1.Tracing.sampling', index=6, + name='sampling', full_name='istio.mesh.v1alpha1.Tracing.sampling', index=7, number=7, type=1, cpp_type=5, label=1, has_default_value=False, default_value=float(0), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='tls_settings', full_name='istio.mesh.v1alpha1.Tracing.tls_settings', index=7, + name='tls_settings', full_name='istio.mesh.v1alpha1.Tracing.tls_settings', index=8, number=8, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, @@ -523,7 +588,7 @@ ], extensions=[ ], - nested_types=[_TRACING_ZIPKIN, _TRACING_LIGHTSTEP, _TRACING_DATADOG, _TRACING_STACKDRIVER, _TRACING_CUSTOMTAG, _TRACING_LITERAL, _TRACING_ENVIRONMENT, _TRACING_REQUESTHEADER, _TRACING_CUSTOMTAGSENTRY, ], + nested_types=[_TRACING_ZIPKIN, _TRACING_LIGHTSTEP, _TRACING_DATADOG, _TRACING_STACKDRIVER, _TRACING_OPENCENSUS, _TRACING_CUSTOMTAG, _TRACING_LITERAL, _TRACING_ENVIRONMENT, _TRACING_REQUESTHEADER, _TRACING_CUSTOMTAGSENTRY, ], enum_types=[ ], serialized_options=None, @@ -536,7 +601,7 @@ index=0, containing_type=None, fields=[]), ], serialized_start=159, - serialized_end=1359, + serialized_end=1664, ) @@ -573,8 +638,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1361, - serialized_end=1408, + serialized_start=1666, + serialized_end=1713, ) @@ -612,8 +677,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1411, - serialized_end=1682, + serialized_start=1716, + serialized_end=1987, ) @@ -650,8 +715,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2915, - serialized_end=2967, + serialized_start=3220, + serialized_end=3272, ) _PROXYCONFIG = _descriptor.Descriptor( @@ -870,8 +935,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1685, - serialized_end=3043, + serialized_start=1990, + serialized_end=3348, ) @@ -915,8 +980,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3046, - serialized_end=3245, + serialized_start=3351, + serialized_end=3550, ) _TRACING_ZIPKIN.containing_type = _TRACING @@ -926,6 +991,10 @@ _TRACING_STACKDRIVER.fields_by_name['max_number_of_annotations'].message_type = google_dot_protobuf_dot_wrappers__pb2._INT64VALUE _TRACING_STACKDRIVER.fields_by_name['max_number_of_message_events'].message_type = google_dot_protobuf_dot_wrappers__pb2._INT64VALUE _TRACING_STACKDRIVER.containing_type = _TRACING +_TRACING_OPENCENSUS.fields_by_name['max_number_of_attributes'].message_type = google_dot_protobuf_dot_wrappers__pb2._INT64VALUE +_TRACING_OPENCENSUS.fields_by_name['max_number_of_annotations'].message_type = google_dot_protobuf_dot_wrappers__pb2._INT64VALUE +_TRACING_OPENCENSUS.fields_by_name['max_number_of_message_events'].message_type = google_dot_protobuf_dot_wrappers__pb2._INT64VALUE +_TRACING_OPENCENSUS.containing_type = _TRACING _TRACING_CUSTOMTAG.fields_by_name['literal'].message_type = _TRACING_LITERAL _TRACING_CUSTOMTAG.fields_by_name['environment'].message_type = _TRACING_ENVIRONMENT _TRACING_CUSTOMTAG.fields_by_name['header'].message_type = _TRACING_REQUESTHEADER @@ -948,6 +1017,7 @@ _TRACING.fields_by_name['lightstep'].message_type = _TRACING_LIGHTSTEP _TRACING.fields_by_name['datadog'].message_type = _TRACING_DATADOG _TRACING.fields_by_name['stackdriver'].message_type = _TRACING_STACKDRIVER +_TRACING.fields_by_name['open_census'].message_type = _TRACING_OPENCENSUS _TRACING.fields_by_name['custom_tags'].message_type = _TRACING_CUSTOMTAGSENTRY _TRACING.fields_by_name['tls_settings'].message_type = networking_dot_v1alpha3_dot_destination__rule__pb2._CLIENTTLSSETTINGS _TRACING.oneofs_by_name['tracer'].fields.append( @@ -962,6 +1032,9 @@ _TRACING.oneofs_by_name['tracer'].fields.append( _TRACING.fields_by_name['stackdriver']) _TRACING.fields_by_name['stackdriver'].containing_oneof = _TRACING.oneofs_by_name['tracer'] +_TRACING.oneofs_by_name['tracer'].fields.append( + _TRACING.fields_by_name['open_census']) +_TRACING.fields_by_name['open_census'].containing_oneof = _TRACING.oneofs_by_name['tracer'] _TOPOLOGY.fields_by_name['forward_client_cert_details'].enum_type = _TOPOLOGY_FORWARDCLIENTCERTDETAILS _TOPOLOGY_FORWARDCLIENTCERTDETAILS.containing_type = _TOPOLOGY _PROXYCONFIG_PROXYMETADATAENTRY.containing_type = _PROXYCONFIG @@ -1019,6 +1092,13 @@ }) , + 'OpenCensus' : _reflection.GeneratedProtocolMessageType('OpenCensus', (_message.Message,), { + 'DESCRIPTOR' : _TRACING_OPENCENSUS, + '__module__' : 'mesh.v1alpha1.proxy_pb2' + # @@protoc_insertion_point(class_scope:istio.mesh.v1alpha1.Tracing.OpenCensus) + }) + , + 'CustomTag' : _reflection.GeneratedProtocolMessageType('CustomTag', (_message.Message,), { 'DESCRIPTOR' : _TRACING_CUSTOMTAG, '__module__' : 'mesh.v1alpha1.proxy_pb2' @@ -1062,6 +1142,7 @@ _sym_db.RegisterMessage(Tracing.Lightstep) _sym_db.RegisterMessage(Tracing.Datadog) _sym_db.RegisterMessage(Tracing.Stackdriver) +_sym_db.RegisterMessage(Tracing.OpenCensus) _sym_db.RegisterMessage(Tracing.CustomTag) _sym_db.RegisterMessage(Tracing.Literal) _sym_db.RegisterMessage(Tracing.Environment) From e58896c5f9ffea78b4eeda76f4a6eb7274f221b8 Mon Sep 17 00:00:00 2001 From: Brian Wolfe Date: Tue, 4 Aug 2020 14:12:17 -0700 Subject: [PATCH 2/3] tracing: add TraceContext & use OpenCensusAgent Specify the set of trace headers to use for distributed trace context propagation with a new TraceContext enum in the OpenCensusAgent tracer. OpenCensus is the name of both the tracer implementation and the backend service. To disambiguate between the two terms, rename OpenCensus to OpenCensusAgent, since it is specific to the backend service. Both Stackdriver & OpenCensus will use the OpenCensus trace implementation under the hood. Change-Id: Id860fbf6bf6b1345c7276bb2c2b93de3f69a9d44 Reviewed-on: https://gerrit.musta.ch/c/public/istio-api/+/575 Reviewed-by: Jungho Ahn --- mesh/v1alpha1/istio.mesh.v1alpha1.gen.json | 36 +- mesh/v1alpha1/istio.mesh.v1alpha1.pb.html | 90 +++- mesh/v1alpha1/proxy.pb.go | 533 +++++++++++++------- mesh/v1alpha1/proxy.proto | 56 +- python/istio_api/mesh/v1alpha1/proxy_pb2.py | 170 ++++--- 5 files changed, 607 insertions(+), 278 deletions(-) diff --git a/mesh/v1alpha1/istio.mesh.v1alpha1.gen.json b/mesh/v1alpha1/istio.mesh.v1alpha1.gen.json index 162bc0953b..23c1fed088 100644 --- a/mesh/v1alpha1/istio.mesh.v1alpha1.gen.json +++ b/mesh/v1alpha1/istio.mesh.v1alpha1.gen.json @@ -694,11 +694,11 @@ }, { "required": [ - "openCensus" + "openCensusAgent" ], "properties": { - "openCensus": { - "$ref": "#/components/schemas/istio.mesh.v1alpha1.Tracing.OpenCensus" + "openCensusAgent": { + "$ref": "#/components/schemas/istio.mesh.v1alpha1.Tracing.OpenCensusAgent" } } } @@ -747,11 +747,11 @@ }, { "required": [ - "openCensus" + "openCensusAgent" ], "properties": { - "openCensus": { - "$ref": "#/components/schemas/istio.mesh.v1alpha1.Tracing.OpenCensus" + "openCensusAgent": { + "$ref": "#/components/schemas/istio.mesh.v1alpha1.Tracing.OpenCensusAgent" } } } @@ -892,12 +892,19 @@ } } }, - "istio.mesh.v1alpha1.Tracing.OpenCensus": { - "description": "OpenCensus defines configuration for an OpenCensus tracer. See [OpenCensus trace config](https://github.com/census-instrumentation/opencensus-proto/blob/master/src/opencensus/proto/trace/v1/trace_config.proto) for details.", + "istio.mesh.v1alpha1.Tracing.OpenCensusAgent": { + "description": "OpenCensusAgent defines configuration for an OpenCensus tracer writing to an OpenCensus agent backend. See [OpenCensus trace config](https://github.com/census-instrumentation/opencensus-proto/blob/master/src/opencensus/proto/trace/v1/trace_config.proto) for details.", "type": "object", "properties": { + "context": { + "description": "Specifies the set of context propagation headers used for distributed tracing. Default is `[\"W3C_TRACE_CONTEXT\"]`. If multiple values are specified, the proxy will attempt to read each header for each request and will write all headers.", + "type": "array", + "items": { + "$ref": "#/components/schemas/istio.mesh.v1alpha1.Tracing.OpenCensusAgent.TraceContext" + } + }, "address": { - "description": "gRPC address for the OpenCensus Agent (e.g. dns://authority/host:port or unix:path). See [gRPC naming docs](https://github.com/grpc/grpc/blob/master/doc/naming.md) for details.", + "description": "gRPC address for the OpenCensus agent (e.g. dns://authority/host:port or unix:path). See [gRPC naming docs](https://github.com/grpc/grpc/blob/master/doc/naming.md) for details.", "type": "string", "format": "string" }, @@ -922,6 +929,17 @@ } } }, + "istio.mesh.v1alpha1.Tracing.OpenCensusAgent.TraceContext": { + "description": "TraceContext selects the context propagation headers used for distributed tracing.", + "type": "string", + "enum": [ + "UNSPECIFIED", + "W3C_TRACE_CONTEXT", + "GRPC_BIN", + "CLOUD_TRACE_CONTEXT", + "B3" + ] + }, "istio.mesh.v1alpha1.Tracing.Literal": { "description": "Literal type represents a static value. $hide_from_docs", "type": "object", diff --git a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html index bfcb1029ec..13791befdb 100644 --- a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html +++ b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html @@ -5,7 +5,7 @@ layout: protoc-gen-docs generator: protoc-gen-docs weight: 20 -number_of_entries: 26 +number_of_entries: 27 ---

Configuration affecting the service mesh as a whole.

@@ -67,11 +67,11 @@

Tracing

No - -openCensus -OpenCensus (oneof) + +openCensusAgent +OpenCensusAgent (oneof) -

Use an OpenCensus tracer.

+

Use an OpenCensus tracer exporting to an OpenCensus agent.

@@ -615,10 +615,12 @@

Tracing.Stackdriver

-

Tracing.OpenCensus

+

Tracing.OpenCensusAgent

-

OpenCensus defines configuration for an OpenCensus tracer. -See OpenCensus trace config for details.

+

OpenCensusAgent defines configuration for an OpenCensus tracer writing to +an OpenCensus agent backend. See +OpenCensus trace config +for details.

@@ -630,12 +632,28 @@

Tracing.OpenCensus

- + + + + + + + + + +
address string -

gRPC address for the OpenCensus Agent (e.g. dns://authority/host:port or unix:path). -See gRPC naming docs for details.

+

gRPC address for the OpenCensus agent (e.g. dns://authority/host:port or +unix:path). See gRPC naming +docs for +details.

+ +		 +No +
contextTraceContext[] +

Specifies the set of context propagation headers used for distributed +tracing. Default is ["W3C_TRACE_CONTEXT"]. If multiple values are specified, +the proxy will attempt to read each header for each request and will +write all headers.

 @@ -1615,6 +1633,56 @@

Network.IstioNetworkGateway

 No +
+
+

Tracing.OpenCensusAgent.TraceContext

+
+

TraceContext selects the context propagation headers used for +distributed tracing.

+ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mesh/v1alpha1/proxy.pb.go b/mesh/v1alpha1/proxy.pb.go index 272eb88604..75afb1f9b2 100644 --- a/mesh/v1alpha1/proxy.pb.go +++ b/mesh/v1alpha1/proxy.pb.go @@ -60,6 +60,55 @@ func (AuthenticationPolicy) EnumDescriptor() ([]byte, []int) { return fileDescriptor_5efecd978cf3d28d, []int{0} } +// TraceContext selects the context propagation headers used for +// distributed tracing. +type Tracing_OpenCensusAgent_TraceContext int32 + +const ( + // $hide_from_docs + // Unspecified context. Should not be used for now, but added to reserve + // the 0 enum value if TraceContext is used outside of a repeated field. + Tracing_OpenCensusAgent_UNSPECIFIED Tracing_OpenCensusAgent_TraceContext = 0 + // Use W3C Trace Context propagation using the `traceparent` HTTP header. + // See the + // [Trace Context documentation](https://www.w3.org/TR/trace-context/) for details. + Tracing_OpenCensusAgent_W3C_TRACE_CONTEXT Tracing_OpenCensusAgent_TraceContext = 1 + // Use gRPC binary context propagation using the `grpc-trace-bin` http header. + Tracing_OpenCensusAgent_GRPC_BIN Tracing_OpenCensusAgent_TraceContext = 2 + // Use Cloud Trace context propagation using the + // `X-Cloud-Trace-Context` http header. + Tracing_OpenCensusAgent_CLOUD_TRACE_CONTEXT Tracing_OpenCensusAgent_TraceContext = 3 + // Use multi-header B3 context propagation using the `X-B3-TraceId`, + // `X-B3-SpanId`, and `X-B3-Sampled` HTTP headers. See + // [B3 header propagation README](https://github.com/openzipkin/b3-propagation) + // for details. + Tracing_OpenCensusAgent_B3 Tracing_OpenCensusAgent_TraceContext = 4 +) + +var Tracing_OpenCensusAgent_TraceContext_name = map[int32]string{ + 0: "UNSPECIFIED", + 1: "W3C_TRACE_CONTEXT", + 2: "GRPC_BIN", + 3: "CLOUD_TRACE_CONTEXT", + 4: "B3", +} + +var Tracing_OpenCensusAgent_TraceContext_value = map[string]int32{ + "UNSPECIFIED": 0, + "W3C_TRACE_CONTEXT": 1, + "GRPC_BIN": 2, + "CLOUD_TRACE_CONTEXT": 3, + "B3": 4, +} + +func (x Tracing_OpenCensusAgent_TraceContext) String() string { + return proto.EnumName(Tracing_OpenCensusAgent_TraceContext_name, int32(x)) +} + +func (Tracing_OpenCensusAgent_TraceContext) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_5efecd978cf3d28d, []int{0, 4, 0} +} + // $hide_from_docs // ForwardClientCertDetails controls how the x-forwarded-client-cert (XFCC) // header is handled by the gateway proxy. @@ -155,7 +204,7 @@ type Tracing struct { // *Tracing_Lightstep_ // *Tracing_Datadog_ // *Tracing_Stackdriver_ - // *Tracing_OpenCensus_ + // *Tracing_OpenCensusAgent_ Tracer isTracing_Tracer `protobuf_oneof:"tracer"` // Configures the custom tags to be added to active span by all proxies (i.e. sidecars // and gateways). @@ -239,15 +288,15 @@ type Tracing_Datadog_ struct { type Tracing_Stackdriver_ struct { Stackdriver *Tracing_Stackdriver `protobuf:"bytes,4,opt,name=stackdriver,proto3,oneof"` } -type Tracing_OpenCensus_ struct { - OpenCensus *Tracing_OpenCensus `protobuf:"bytes,9,opt,name=open_census,json=openCensus,proto3,oneof"` +type Tracing_OpenCensusAgent_ struct { + OpenCensusAgent *Tracing_OpenCensusAgent `protobuf:"bytes,9,opt,name=open_census_agent,json=openCensusAgent,proto3,oneof"` } -func (*Tracing_Zipkin_) isTracing_Tracer() {} -func (*Tracing_Lightstep_) isTracing_Tracer() {} -func (*Tracing_Datadog_) isTracing_Tracer() {} -func (*Tracing_Stackdriver_) isTracing_Tracer() {} -func (*Tracing_OpenCensus_) isTracing_Tracer() {} +func (*Tracing_Zipkin_) isTracing_Tracer() {} +func (*Tracing_Lightstep_) isTracing_Tracer() {} +func (*Tracing_Datadog_) isTracing_Tracer() {} +func (*Tracing_Stackdriver_) isTracing_Tracer() {} +func (*Tracing_OpenCensusAgent_) isTracing_Tracer() {} func (m *Tracing) GetTracer() isTracing_Tracer { if m != nil { @@ -284,9 +333,9 @@ func (m *Tracing) GetStackdriver() *Tracing_Stackdriver { return nil } -func (m *Tracing) GetOpenCensus() *Tracing_OpenCensus { - if x, ok := m.GetTracer().(*Tracing_OpenCensus_); ok { - return x.OpenCensus +func (m *Tracing) GetOpenCensusAgent() *Tracing_OpenCensusAgent { + if x, ok := m.GetTracer().(*Tracing_OpenCensusAgent_); ok { + return x.OpenCensusAgent } return nil } @@ -326,7 +375,7 @@ func (*Tracing) XXX_OneofWrappers() []interface{} { (*Tracing_Lightstep_)(nil), (*Tracing_Datadog_)(nil), (*Tracing_Stackdriver_)(nil), - (*Tracing_OpenCensus_)(nil), + (*Tracing_OpenCensusAgent_)(nil), } } @@ -570,44 +619,53 @@ func (m *Tracing_Stackdriver) GetMaxNumberOfMessageEvents() *types.Int64Value { return nil } -// OpenCensus defines configuration for an OpenCensus tracer. -// See [OpenCensus trace config](https://github.com/census-instrumentation/opencensus-proto/blob/master/src/opencensus/proto/trace/v1/trace_config.proto) for details. -type Tracing_OpenCensus struct { - // gRPC address for the OpenCensus Agent (e.g. dns://authority/host:port or unix:path). - // See [gRPC naming docs](https://github.com/grpc/grpc/blob/master/doc/naming.md) for details. +// OpenCensusAgent defines configuration for an OpenCensus tracer writing to +// an OpenCensus agent backend. See +// [OpenCensus trace config](https://github.com/census-instrumentation/opencensus-proto/blob/master/src/opencensus/proto/trace/v1/trace_config.proto) +// for details. +type Tracing_OpenCensusAgent struct { + // gRPC address for the OpenCensus agent (e.g. dns://authority/host:port or + // unix:path). See [gRPC naming + // docs](https://github.com/grpc/grpc/blob/master/doc/naming.md) for + // details. Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` + // Specifies the set of context propagation headers used for distributed + // tracing. Default is `["W3C_TRACE_CONTEXT"]`. If multiple values are specified, + // the proxy will attempt to read each header for each request and will + // write all headers. + Context []Tracing_OpenCensusAgent_TraceContext `protobuf:"varint,2,rep,packed,name=context,proto3,enum=istio.mesh.v1alpha1.Tracing_OpenCensusAgent_TraceContext" json:"context,omitempty"` // debug enables trace output to stdout // $hide_from_docs - Debug bool `protobuf:"varint,2,opt,name=debug,proto3" json:"debug,omitempty"` + Debug bool `protobuf:"varint,3,opt,name=debug,proto3" json:"debug,omitempty"` // The global default max number of attributes per span. // default is 200. // $hide_from_docs - MaxNumberOfAttributes *types.Int64Value `protobuf:"bytes,3,opt,name=max_number_of_attributes,json=maxNumberOfAttributes,proto3" json:"maxNumberOfAttributes,omitempty"` + MaxNumberOfAttributes *types.Int64Value `protobuf:"bytes,4,opt,name=max_number_of_attributes,json=maxNumberOfAttributes,proto3" json:"maxNumberOfAttributes,omitempty"` // The global default max number of annotation events per span. // default is 200. // $hide_from_docs - MaxNumberOfAnnotations *types.Int64Value `protobuf:"bytes,4,opt,name=max_number_of_annotations,json=maxNumberOfAnnotations,proto3" json:"maxNumberOfAnnotations,omitempty"` + MaxNumberOfAnnotations *types.Int64Value `protobuf:"bytes,5,opt,name=max_number_of_annotations,json=maxNumberOfAnnotations,proto3" json:"maxNumberOfAnnotations,omitempty"` // The global default max number of message events per span. // default is 200. // $hide_from_docs - MaxNumberOfMessageEvents *types.Int64Value `protobuf:"bytes,5,opt,name=max_number_of_message_events,json=maxNumberOfMessageEvents,proto3" json:"maxNumberOfMessageEvents,omitempty"` + MaxNumberOfMessageEvents *types.Int64Value `protobuf:"bytes,6,opt,name=max_number_of_message_events,json=maxNumberOfMessageEvents,proto3" json:"maxNumberOfMessageEvents,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` } -func (m *Tracing_OpenCensus) Reset() { *m = Tracing_OpenCensus{} } -func (m *Tracing_OpenCensus) String() string { return proto.CompactTextString(m) } -func (*Tracing_OpenCensus) ProtoMessage() {} -func (*Tracing_OpenCensus) Descriptor() ([]byte, []int) { +func (m *Tracing_OpenCensusAgent) Reset() { *m = Tracing_OpenCensusAgent{} } +func (m *Tracing_OpenCensusAgent) String() string { return proto.CompactTextString(m) } +func (*Tracing_OpenCensusAgent) ProtoMessage() {} +func (*Tracing_OpenCensusAgent) Descriptor() ([]byte, []int) { return fileDescriptor_5efecd978cf3d28d, []int{0, 4} } -func (m *Tracing_OpenCensus) XXX_Unmarshal(b []byte) error { +func (m *Tracing_OpenCensusAgent) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *Tracing_OpenCensus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *Tracing_OpenCensusAgent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_Tracing_OpenCensus.Marshal(b, m, deterministic) + return xxx_messageInfo_Tracing_OpenCensusAgent.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -617,47 +675,54 @@ func (m *Tracing_OpenCensus) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } -func (m *Tracing_OpenCensus) XXX_Merge(src proto.Message) { - xxx_messageInfo_Tracing_OpenCensus.Merge(m, src) +func (m *Tracing_OpenCensusAgent) XXX_Merge(src proto.Message) { + xxx_messageInfo_Tracing_OpenCensusAgent.Merge(m, src) } -func (m *Tracing_OpenCensus) XXX_Size() int { +func (m *Tracing_OpenCensusAgent) XXX_Size() int { return m.Size() } -func (m *Tracing_OpenCensus) XXX_DiscardUnknown() { - xxx_messageInfo_Tracing_OpenCensus.DiscardUnknown(m) +func (m *Tracing_OpenCensusAgent) XXX_DiscardUnknown() { + xxx_messageInfo_Tracing_OpenCensusAgent.DiscardUnknown(m) } -var xxx_messageInfo_Tracing_OpenCensus proto.InternalMessageInfo +var xxx_messageInfo_Tracing_OpenCensusAgent proto.InternalMessageInfo -func (m *Tracing_OpenCensus) GetAddress() string { +func (m *Tracing_OpenCensusAgent) GetAddress() string { if m != nil { return m.Address } return "" } -func (m *Tracing_OpenCensus) GetDebug() bool { +func (m *Tracing_OpenCensusAgent) GetContext() []Tracing_OpenCensusAgent_TraceContext { + if m != nil { + return m.Context + } + return nil +} + +func (m *Tracing_OpenCensusAgent) GetDebug() bool { if m != nil { return m.Debug } return false } -func (m *Tracing_OpenCensus) GetMaxNumberOfAttributes() *types.Int64Value { +func (m *Tracing_OpenCensusAgent) GetMaxNumberOfAttributes() *types.Int64Value { if m != nil { return m.MaxNumberOfAttributes } return nil } -func (m *Tracing_OpenCensus) GetMaxNumberOfAnnotations() *types.Int64Value { +func (m *Tracing_OpenCensusAgent) GetMaxNumberOfAnnotations() *types.Int64Value { if m != nil { return m.MaxNumberOfAnnotations } return nil } -func (m *Tracing_OpenCensus) GetMaxNumberOfMessageEvents() *types.Int64Value { +func (m *Tracing_OpenCensusAgent) GetMaxNumberOfMessageEvents() *types.Int64Value { if m != nil { return m.MaxNumberOfMessageEvents } @@ -1500,6 +1565,7 @@ func (m *RemoteService) GetTcpKeepalive() *v1alpha3.ConnectionPoolSettings_TCPSe func init() { proto.RegisterEnum("istio.mesh.v1alpha1.AuthenticationPolicy", AuthenticationPolicy_name, AuthenticationPolicy_value) + proto.RegisterEnum("istio.mesh.v1alpha1.Tracing_OpenCensusAgent_TraceContext", Tracing_OpenCensusAgent_TraceContext_name, Tracing_OpenCensusAgent_TraceContext_value) proto.RegisterEnum("istio.mesh.v1alpha1.Topology_ForwardClientCertDetails", Topology_ForwardClientCertDetails_name, Topology_ForwardClientCertDetails_value) proto.RegisterEnum("istio.mesh.v1alpha1.ProxyConfig_InboundInterceptionMode", ProxyConfig_InboundInterceptionMode_name, ProxyConfig_InboundInterceptionMode_value) proto.RegisterType((*Tracing)(nil), "istio.mesh.v1alpha1.Tracing") @@ -1508,7 +1574,7 @@ func init() { proto.RegisterType((*Tracing_Lightstep)(nil), "istio.mesh.v1alpha1.Tracing.Lightstep") proto.RegisterType((*Tracing_Datadog)(nil), "istio.mesh.v1alpha1.Tracing.Datadog") proto.RegisterType((*Tracing_Stackdriver)(nil), "istio.mesh.v1alpha1.Tracing.Stackdriver") - proto.RegisterType((*Tracing_OpenCensus)(nil), "istio.mesh.v1alpha1.Tracing.OpenCensus") + proto.RegisterType((*Tracing_OpenCensusAgent)(nil), "istio.mesh.v1alpha1.Tracing.OpenCensusAgent") proto.RegisterType((*Tracing_CustomTag)(nil), "istio.mesh.v1alpha1.Tracing.CustomTag") proto.RegisterType((*Tracing_Literal)(nil), "istio.mesh.v1alpha1.Tracing.Literal") proto.RegisterType((*Tracing_Environment)(nil), "istio.mesh.v1alpha1.Tracing.Environment") @@ -1523,126 +1589,131 @@ func init() { func init() { proto.RegisterFile("mesh/v1alpha1/proxy.proto", fileDescriptor_5efecd978cf3d28d) } var fileDescriptor_5efecd978cf3d28d = []byte{ - // 1889 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xdd, 0x6e, 0x1b, 0xb9, - 0x15, 0xb6, 0xfc, 0xaf, 0x23, 0x4b, 0x9e, 0xd0, 0xf9, 0x99, 0x68, 0x93, 0xac, 0xeb, 0x6c, 0x77, - 0xbd, 0xe9, 0x56, 0xc6, 0xc6, 0x45, 0x10, 0x14, 0xdd, 0x22, 0x8a, 0x25, 0x43, 0x4a, 0x6d, 0xd9, - 0x18, 0x29, 0x49, 0x93, 0xbd, 0x20, 0xa8, 0x19, 0x5a, 0x9a, 0x7a, 0x86, 0x9c, 0x92, 0x1c, 0x39, - 0xda, 0x27, 0xe8, 0xd3, 0xf4, 0x09, 0xda, 0xeb, 0xf6, 0xb2, 0x8f, 0x50, 0xe4, 0xaa, 0x45, 0xaf, - 0x7b, 0x5f, 0x90, 0x9c, 0x91, 0x95, 0x44, 0x56, 0x82, 0x2e, 0xf6, 0x4e, 0x3c, 0xfc, 0xbe, 0x6f, - 0xc8, 0xc3, 0x73, 0x0e, 0x0f, 0x05, 0xb7, 0x63, 0x2a, 0x87, 0x7b, 0xa3, 0x6f, 0x49, 0x94, 0x0c, - 0xc9, 0xb7, 0x7b, 0x89, 0xe0, 0x6f, 0xc6, 0xb5, 0x44, 0x70, 0xc5, 0xd1, 0x56, 0x28, 0x55, 0xc8, - 0x6b, 0x1a, 0x50, 0xcb, 0x01, 0xd5, 0x7b, 0x03, 0xce, 0x07, 0x11, 0xdd, 0x33, 0x90, 0x7e, 0x7a, - 0xb6, 0x17, 0xa4, 0x82, 0xa8, 0x90, 0x33, 0x4b, 0xfa, 0x70, 0xfe, 0x42, 0x90, 0x24, 0xa1, 0x42, - 0x66, 0xf3, 0x0f, 0x18, 0x55, 0x17, 0x5c, 0x9c, 0x87, 0x6c, 0x90, 0x7f, 0x75, 0x7f, 0x2f, 0xa0, - 0x52, 0x85, 0xcc, 0xc8, 0x60, 0x91, 0x46, 0xd4, 0x62, 0x77, 0xfe, 0x5b, 0x81, 0xb5, 0x9e, 0x20, - 0x7e, 0xc8, 0x06, 0xe8, 0x3b, 0x58, 0xfd, 0x21, 0x4c, 0xce, 0x43, 0xe6, 0x16, 0xb6, 0x0b, 0xbb, - 0xa5, 0x87, 0xf7, 0x6b, 0x33, 0x56, 0x57, 0xcb, 0xd0, 0xb5, 0xd7, 0x06, 0xda, 0x5a, 0xf0, 0x32, - 0x12, 0x3a, 0x84, 0x62, 0x14, 0x0e, 0x86, 0x4a, 0x2a, 0x9a, 0xb8, 0x8b, 0x46, 0xe1, 0xcb, 0xb9, - 0x0a, 0x47, 0x39, 0xba, 0xb5, 0xe0, 0x5d, 0x52, 0xd1, 0x13, 0x58, 0x0b, 0x88, 0x22, 0x01, 0x1f, - 0xb8, 0x4b, 0x46, 0xe5, 0x8b, 0xb9, 0x2a, 0x0d, 0x8b, 0x6d, 0x2d, 0x78, 0x39, 0x0d, 0x1d, 0x41, - 0x49, 0x2a, 0xe2, 0x9f, 0x07, 0x22, 0x1c, 0x51, 0xe1, 0x2e, 0x1b, 0x95, 0xdd, 0xb9, 0x2a, 0xdd, - 0x4b, 0x7c, 0x6b, 0xc1, 0x9b, 0xa6, 0xa3, 0x67, 0x50, 0xe2, 0x09, 0x65, 0xd8, 0xa7, 0x4c, 0xa6, - 0xd2, 0x2d, 0x1a, 0xb5, 0xaf, 0xe6, 0xaa, 0x9d, 0x24, 0x94, 0x1d, 0x18, 0x78, 0x6b, 0xc1, 0x03, - 0x3e, 0x19, 0xa1, 0x63, 0x28, 0xf9, 0xa9, 0x54, 0x3c, 0xc6, 0x8a, 0x0c, 0xa4, 0xbb, 0xb2, 0xbd, - 0xb4, 0x5b, 0x7a, 0xf8, 0xcd, 0x5c, 0xad, 0x03, 0x83, 0xef, 0x91, 0x81, 0x6c, 0x32, 0x25, 0xc6, - 0x1e, 0xf8, 0x13, 0x03, 0xfa, 0x25, 0x6c, 0xc5, 0xe4, 0x0d, 0x4e, 0x88, 0x1a, 0x6a, 0x41, 0x1c, - 0x51, 0x36, 0x50, 0x43, 0x77, 0x75, 0xbb, 0xb0, 0x5b, 0xf6, 0x9c, 0x98, 0xbc, 0x39, 0x25, 0x6a, - 0xd8, 0x23, 0x83, 0x23, 0x63, 0x47, 0x55, 0x58, 0x97, 0x24, 0x4e, 0xa2, 0x90, 0x0d, 0xdc, 0xb5, - 0xed, 0xc2, 0x6e, 0xc1, 0x9b, 0x8c, 0xd1, 0x09, 0x6c, 0xa8, 0x48, 0x62, 0x49, 0x95, 0x0a, 0xd9, - 0x40, 0xba, 0xeb, 0x66, 0x9b, 0xf9, 0xd2, 0x2e, 0x23, 0x2a, 0x5f, 0xe0, 0x7e, 0xed, 0x20, 0x0a, - 0x29, 0x53, 0xbd, 0xa3, 0x6e, 0x37, 0xe3, 0x78, 0x25, 0x15, 0xc9, 0x7c, 0x50, 0xdd, 0x81, 0x55, - 0x1b, 0x22, 0xc8, 0x85, 0x35, 0x12, 0x04, 0x82, 0x4a, 0x69, 0x02, 0xab, 0xe8, 0xe5, 0xc3, 0x6a, - 0x0b, 0x8a, 0x93, 0x20, 0xb8, 0x1a, 0x86, 0x7e, 0x06, 0x1b, 0xc4, 0xf7, 0xa9, 0x94, 0x58, 0xf1, - 0x73, 0xca, 0x4c, 0x70, 0x15, 0xbd, 0x92, 0xb5, 0xf5, 0xb4, 0xa9, 0x7a, 0x1f, 0xd6, 0xb2, 0x40, - 0x98, 0xf3, 0xb9, 0x3f, 0x2f, 0x42, 0x69, 0xea, 0xa0, 0xd1, 0x75, 0x58, 0x09, 0x68, 0x3f, 0x1d, - 0x18, 0xdc, 0xba, 0x67, 0x07, 0xa8, 0x07, 0xae, 0x76, 0x2a, 0x4b, 0xe3, 0x3e, 0x15, 0x98, 0x9f, - 0x61, 0xa2, 0x94, 0x08, 0xfb, 0xa9, 0xa2, 0x32, 0x0b, 0xeb, 0xcf, 0x6a, 0x36, 0x03, 0x6b, 0x79, - 0x06, 0xd6, 0xda, 0x4c, 0x3d, 0xfa, 0xd5, 0x0b, 0x12, 0xa5, 0xd4, 0xbb, 0x11, 0x93, 0x37, 0x1d, - 0xc3, 0x3d, 0x39, 0xab, 0x4f, 0x98, 0xe8, 0x05, 0xdc, 0x7e, 0x4f, 0x95, 0x31, 0xae, 0x4c, 0x3e, - 0xca, 0x2c, 0xce, 0xe7, 0xca, 0xde, 0x9c, 0x96, 0xbd, 0xa4, 0xa2, 0xef, 0xe1, 0xce, 0xbb, 0xba, - 0x31, 0x95, 0x92, 0x0c, 0x28, 0xa6, 0x23, 0xca, 0x94, 0xcc, 0x82, 0x7f, 0xae, 0xb4, 0x3b, 0x25, - 0x7d, 0x6c, 0xd9, 0x4d, 0x43, 0xae, 0xfe, 0x6d, 0x11, 0xe0, 0x32, 0x96, 0xe7, 0x9c, 0xd0, 0xc4, - 0x93, 0x8b, 0x9f, 0xea, 0xc9, 0xa5, 0x9f, 0xc6, 0x93, 0xcb, 0x3f, 0x9d, 0x27, 0x57, 0x7e, 0x8c, - 0x27, 0xff, 0x5d, 0x80, 0xe2, 0x24, 0x93, 0x75, 0x89, 0x8b, 0x42, 0x45, 0x05, 0x89, 0xb2, 0x52, - 0xfb, 0xc5, 0x47, 0x0a, 0xa5, 0xc1, 0xea, 0x12, 0x97, 0xd1, 0x74, 0x89, 0xa3, 0x6c, 0x14, 0x0a, - 0xce, 0x62, 0xca, 0x54, 0x16, 0x97, 0xf3, 0x4b, 0x5c, 0xf3, 0x12, 0xaf, 0x4b, 0xdc, 0x14, 0x1d, - 0x35, 0x60, 0x75, 0x48, 0x49, 0x40, 0x45, 0x76, 0x2c, 0x0f, 0xe6, 0x0a, 0x79, 0xf4, 0x8f, 0x29, - 0x95, 0xaa, 0x65, 0x18, 0xfa, 0x02, 0xb0, 0xdc, 0xa7, 0xab, 0xb0, 0xac, 0xc6, 0x09, 0xad, 0x7e, - 0x0e, 0x6b, 0xd9, 0x8a, 0x75, 0x5c, 0x8c, 0xb4, 0x67, 0xb2, 0x78, 0xb1, 0x83, 0xea, 0x21, 0x94, - 0xa6, 0x16, 0x83, 0x10, 0x2c, 0x33, 0x12, 0xe7, 0x18, 0xf3, 0x1b, 0xdd, 0x87, 0x72, 0x40, 0xcf, - 0x48, 0x1a, 0x29, 0x6c, 0x05, 0x6c, 0xce, 0x6f, 0x64, 0x46, 0xe3, 0xee, 0x6a, 0x0b, 0xca, 0xef, - 0xac, 0xe5, 0xff, 0x57, 0xa2, 0xb0, 0xf9, 0x5e, 0x9d, 0x45, 0x0e, 0x2c, 0x9d, 0xd3, 0x71, 0x26, - 0xa5, 0x7f, 0xa2, 0xdf, 0xe4, 0x9b, 0xf9, 0x94, 0xcb, 0x6d, 0x22, 0x97, 0x6d, 0xfa, 0xd7, 0x8b, - 0x8f, 0x0b, 0x4f, 0xd7, 0x61, 0x55, 0x09, 0xe2, 0x53, 0xb1, 0x73, 0x08, 0x4b, 0xdd, 0x46, 0x57, - 0x67, 0x14, 0x65, 0xa4, 0x1f, 0xd1, 0x20, 0xab, 0x41, 0xf9, 0x10, 0xfd, 0x1c, 0x36, 0xcf, 0x1f, - 0x4b, 0x2c, 0x09, 0xfe, 0xc3, 0x85, 0x32, 0x15, 0x3e, 0x5f, 0xf8, 0xf9, 0x63, 0xd9, 0x25, 0xcf, - 0x2e, 0x94, 0xae, 0xed, 0x3b, 0x7f, 0x59, 0x84, 0xf5, 0x1e, 0x4f, 0x78, 0xc4, 0x07, 0x63, 0x54, - 0x83, 0x2d, 0x96, 0xc6, 0x58, 0x89, 0x54, 0x2a, 0x1a, 0x60, 0xdd, 0x68, 0x84, 0xd4, 0xe6, 0x6a, - 0xd9, 0xbb, 0xc6, 0xd2, 0xb8, 0x67, 0x67, 0x4e, 0xed, 0x04, 0x4a, 0xe1, 0xb3, 0x33, 0x2e, 0x2e, - 0x88, 0x08, 0xb0, 0x6f, 0x8a, 0x39, 0xf6, 0xa9, 0x50, 0x38, 0xa0, 0x8a, 0x84, 0x91, 0x2d, 0x76, - 0x95, 0x87, 0x8f, 0x66, 0x6f, 0x33, 0xfb, 0x66, 0xed, 0xd0, 0x0a, 0xd8, 0xcb, 0xe0, 0x80, 0x0a, - 0xd5, 0xb0, 0x6c, 0xcf, 0x3d, 0xbb, 0x62, 0x66, 0xe7, 0x4f, 0x05, 0x70, 0xaf, 0xa2, 0xa1, 0x32, - 0x14, 0x9f, 0x77, 0x1a, 0xcd, 0xc3, 0x76, 0xa7, 0xd9, 0x70, 0x16, 0xd0, 0x06, 0xac, 0x77, 0xeb, - 0x9d, 0x76, 0xaf, 0xfd, 0xba, 0xe9, 0x14, 0x90, 0x03, 0x1b, 0x87, 0x27, 0xde, 0xcb, 0xba, 0xd7, - 0xc0, 0x27, 0x9d, 0xa3, 0x57, 0xce, 0x22, 0x42, 0x50, 0xa9, 0x9f, 0x9e, 0x36, 0x3b, 0x0d, 0x9c, - 0x4d, 0x38, 0x4b, 0x1a, 0x95, 0x73, 0x70, 0xb7, 0xd9, 0x73, 0x96, 0xd1, 0x2d, 0xd8, 0xaa, 0x1f, - 0xbd, 0xac, 0xbf, 0xea, 0xe2, 0x77, 0xe8, 0x2b, 0x3b, 0x7f, 0xad, 0x40, 0x49, 0x7b, 0x63, 0x7c, - 0xc0, 0xd9, 0x59, 0x38, 0x40, 0x9f, 0x43, 0xc9, 0x37, 0xbf, 0xac, 0xc7, 0xed, 0xe1, 0x83, 0x35, - 0x69, 0x7f, 0x6b, 0x40, 0x3f, 0x64, 0x44, 0x8c, 0xa7, 0x8f, 0x04, 0xac, 0xc9, 0x00, 0xbe, 0x82, - 0x4d, 0x49, 0xc5, 0x28, 0xf4, 0x29, 0xf6, 0x23, 0xed, 0x6d, 0x9b, 0x53, 0x45, 0xaf, 0x92, 0x99, - 0x0f, 0xac, 0x15, 0x3d, 0x81, 0x4a, 0x20, 0x48, 0xc8, 0x70, 0xde, 0xdd, 0x65, 0xb5, 0xeb, 0xf6, - 0x07, 0x05, 0xa6, 0x91, 0x01, 0xbc, 0xb2, 0x21, 0xe4, 0x43, 0xd4, 0x05, 0x37, 0x21, 0x42, 0x1f, - 0x9b, 0x1c, 0xa6, 0x2a, 0xe0, 0x17, 0x53, 0x5a, 0x2b, 0x1f, 0xd3, 0xba, 0x69, 0xa9, 0xdd, 0x8c, - 0x39, 0x11, 0xfd, 0x05, 0x5c, 0x0b, 0x42, 0xe9, 0xf3, 0x11, 0x15, 0x63, 0x9c, 0x57, 0xfb, 0x55, - 0xb3, 0x03, 0x67, 0x32, 0x51, 0xcf, 0xca, 0xfe, 0x73, 0xb8, 0x75, 0x09, 0x16, 0xf4, 0x4c, 0x50, - 0x39, 0xc4, 0x01, 0x8d, 0xc8, 0xd8, 0xf4, 0x17, 0xf3, 0x16, 0xf0, 0x74, 0xd1, 0x2d, 0x78, 0x37, - 0x26, 0x6c, 0xcf, 0x92, 0x1b, 0x9a, 0x8b, 0xbe, 0x86, 0x8a, 0xed, 0x29, 0x27, 0x0b, 0xd0, 0xdd, - 0x48, 0xd1, 0x50, 0xca, 0x76, 0x26, 0x5f, 0xc1, 0x37, 0x80, 0xa4, 0x22, 0x4a, 0x06, 0x38, 0x0d, - 0x92, 0x09, 0x1c, 0xec, 0x7a, 0xed, 0xcc, 0xf3, 0x20, 0xc9, 0xd1, 0x4d, 0xb8, 0x4b, 0xd9, 0x88, - 0x8f, 0x71, 0x4c, 0x95, 0x08, 0x7d, 0xdd, 0xee, 0xd8, 0xa3, 0xca, 0x89, 0xd7, 0x27, 0xdf, 0xa9, - 0x1a, 0xe0, 0xb1, 0xc5, 0x75, 0x2d, 0x2c, 0x97, 0xd9, 0x05, 0xc7, 0x34, 0xf1, 0x98, 0x04, 0x71, - 0xc8, 0x70, 0xc2, 0x85, 0x72, 0x4b, 0xdb, 0x85, 0xdd, 0x15, 0xaf, 0x62, 0xec, 0x75, 0x6d, 0x3e, - 0xe5, 0x42, 0xa1, 0x3d, 0xb8, 0x46, 0x46, 0x24, 0x8c, 0x48, 0x3f, 0x8c, 0x42, 0x35, 0xc6, 0x3f, - 0x70, 0x46, 0xdd, 0x8d, 0xc9, 0x47, 0x9c, 0xe9, 0xc9, 0xd7, 0x9c, 0x51, 0x14, 0xc0, 0x6d, 0x9f, - 0x33, 0x25, 0x78, 0x84, 0x93, 0x88, 0x30, 0x8a, 0x49, 0xaa, 0x86, 0x38, 0xe1, 0x51, 0xe8, 0x8f, - 0xdd, 0xb2, 0x49, 0xc8, 0xaf, 0x67, 0x26, 0x64, 0x3d, 0x55, 0x43, 0xca, 0x54, 0xe8, 0x1b, 0xef, - 0x9e, 0x1a, 0x82, 0x77, 0x33, 0xd3, 0x3a, 0xd5, 0x52, 0x1a, 0x61, 0xed, 0xda, 0x6b, 0x59, 0x1b, - 0x9a, 0x45, 0xfb, 0x59, 0x18, 0x51, 0xb7, 0x62, 0xbd, 0x66, 0x67, 0x6c, 0x42, 0x1c, 0x86, 0x11, - 0xd5, 0xdb, 0xd5, 0x9e, 0xc4, 0xba, 0x9c, 0xe6, 0x2d, 0xe6, 0xa6, 0xdd, 0xae, 0xb6, 0x77, 0x48, - 0x4c, 0xb3, 0x06, 0xf3, 0x3b, 0x93, 0x3e, 0x7e, 0x2a, 0x04, 0x65, 0xfe, 0xd8, 0x75, 0xae, 0xbe, - 0x31, 0xf7, 0x1f, 0xda, 0x1b, 0x73, 0x1a, 0x8f, 0xea, 0x70, 0xd7, 0xfa, 0xb5, 0xcf, 0xb9, 0x92, - 0x4a, 0x90, 0x04, 0x2b, 0x1a, 0x27, 0x11, 0x51, 0xd4, 0xa6, 0xdb, 0x35, 0xb3, 0xc2, 0xaa, 0x01, - 0x3d, 0xcd, 0x31, 0xbd, 0x0c, 0x62, 0xd2, 0x8f, 0xc2, 0xb5, 0x90, 0x29, 0x2a, 0x7c, 0x9a, 0x98, - 0xa7, 0x4e, 0xcc, 0x03, 0xea, 0x22, 0xe3, 0xb7, 0xc7, 0x33, 0xfd, 0x36, 0x95, 0xfd, 0xb5, 0x36, - 0xeb, 0xf3, 0x94, 0x05, 0xed, 0x29, 0x81, 0x63, 0x1e, 0x50, 0xcf, 0x09, 0xdf, 0xb3, 0xa0, 0x47, - 0xb0, 0xa6, 0x6c, 0xa1, 0x77, 0xb7, 0xcc, 0x26, 0xef, 0xcc, 0xbb, 0x0c, 0xbc, 0x1c, 0x8c, 0x1e, - 0xc0, 0x92, 0x0c, 0xa4, 0x7b, 0xc3, 0x70, 0xdc, 0x99, 0x9c, 0x6e, 0xa3, 0xeb, 0x69, 0x10, 0xfa, - 0x1e, 0x5c, 0x1b, 0xac, 0x59, 0xef, 0x1b, 0xf1, 0x41, 0x1e, 0xaf, 0xee, 0x4d, 0x23, 0xb0, 0x33, - 0x53, 0xc0, 0xa3, 0x31, 0x57, 0x34, 0x0b, 0x59, 0xef, 0x86, 0xd1, 0xa8, 0x1b, 0x89, 0x23, 0x3e, - 0xc8, 0xcc, 0xe8, 0x05, 0xdc, 0x98, 0x99, 0x09, 0xee, 0xad, 0x4f, 0x56, 0xde, 0x9a, 0x91, 0x21, - 0xe8, 0x35, 0xd8, 0x14, 0xd0, 0xba, 0x44, 0xbf, 0xc7, 0x5c, 0xd7, 0xbc, 0x71, 0xf6, 0x3f, 0xea, - 0x7c, 0xf3, 0xfb, 0x38, 0x63, 0xd9, 0xa7, 0x4e, 0x39, 0x99, 0xb6, 0xe9, 0xda, 0xab, 0xe3, 0x2d, - 0x95, 0x36, 0xe3, 0xaa, 0x26, 0x04, 0xc1, 0x9a, 0x4c, 0xb6, 0x7d, 0x09, 0x9b, 0xf4, 0x8d, 0x12, - 0x04, 0x9b, 0x70, 0x35, 0x2f, 0xac, 0xcf, 0xb6, 0x97, 0x76, 0x8b, 0x5e, 0xd9, 0x98, 0xbb, 0x8a, - 0x28, 0xf3, 0x6c, 0x6a, 0x81, 0x33, 0x20, 0x8a, 0x5e, 0x90, 0x31, 0x56, 0xd9, 0x3d, 0xe6, 0xde, - 0x31, 0xfb, 0xbe, 0x3b, 0xf7, 0xb2, 0xf3, 0x36, 0x33, 0xda, 0xe4, 0xc6, 0x7d, 0x09, 0x55, 0x45, - 0x45, 0x9c, 0x3f, 0xac, 0xdf, 0x2b, 0xe8, 0x77, 0x3f, 0x56, 0x84, 0xdd, 0x29, 0x72, 0xe3, 0x9d, - 0xda, 0x7e, 0x0b, 0xd6, 0xf4, 0x1a, 0x70, 0x18, 0xb8, 0xf7, 0x4c, 0xd0, 0xaf, 0xea, 0x61, 0x3b, - 0xa8, 0x3e, 0x01, 0xf4, 0xa1, 0xa7, 0x66, 0x34, 0x2b, 0xd7, 0xa7, 0x9b, 0x95, 0xe2, 0x54, 0x13, - 0xb2, 0xb3, 0x0f, 0xb7, 0xae, 0x08, 0x74, 0x7d, 0xdb, 0x7a, 0xcd, 0x46, 0xdb, 0x6b, 0x1e, 0xf4, - 0x9c, 0x05, 0x04, 0xb0, 0xda, 0x3b, 0xf5, 0x4e, 0x7e, 0xff, 0xca, 0x29, 0x3c, 0x5b, 0x5e, 0x2f, - 0x3a, 0xe0, 0x6d, 0xfa, 0x9c, 0x31, 0xea, 0x2b, 0xac, 0xc2, 0x98, 0xf2, 0x54, 0xed, 0xfc, 0xa7, - 0xa0, 0x5b, 0xb0, 0xa9, 0xa8, 0x98, 0xf3, 0x46, 0x78, 0xff, 0x85, 0xb9, 0xf8, 0x23, 0x5f, 0x98, - 0x88, 0x43, 0x59, 0xf9, 0x09, 0x3e, 0xa7, 0x34, 0x21, 0x51, 0x38, 0xa2, 0x59, 0xf3, 0xfa, 0x6c, - 0x9e, 0xa2, 0x5d, 0xbf, 0xa9, 0x90, 0x3c, 0xca, 0x95, 0x6a, 0xbd, 0x83, 0xd3, 0xcb, 0xdf, 0x7e, - 0xf2, 0xbb, 0x5c, 0xd1, 0xdb, 0x50, 0x53, 0xa3, 0x07, 0xbf, 0x85, 0xeb, 0xb3, 0xca, 0x2c, 0x5a, - 0x87, 0xe5, 0xce, 0x49, 0xa7, 0xe9, 0x2c, 0xa0, 0x0a, 0xc0, 0xf1, 0xf3, 0xde, 0xf3, 0xfa, 0x11, - 0xee, 0x1d, 0x75, 0x9d, 0x02, 0xda, 0x80, 0xb5, 0x76, 0xa7, 0xd5, 0xf4, 0xda, 0x3d, 0xe7, 0x5f, - 0x6b, 0x4f, 0x77, 0xff, 0xfe, 0xf6, 0x5e, 0xe1, 0x1f, 0x6f, 0xef, 0x15, 0xfe, 0xf9, 0xf6, 0x5e, - 0xe1, 0x75, 0xd5, 0x2e, 0x33, 0xe4, 0x7b, 0x24, 0x09, 0xf7, 0xde, 0xf9, 0x8f, 0xa8, 0xbf, 0x6a, - 0x62, 0x65, 0xff, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x85, 0xb4, 0x45, 0xc2, 0x3b, 0x12, 0x00, - 0x00, + // 1984 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xdd, 0x52, 0x1b, 0xc9, + 0xd9, 0x46, 0x02, 0x24, 0xf4, 0x0a, 0xc1, 0xd0, 0x18, 0x7b, 0x2c, 0xff, 0x2c, 0x1f, 0xde, 0x6f, + 0xc3, 0x3a, 0x1b, 0x51, 0x6b, 0x52, 0x2e, 0x27, 0x95, 0x4d, 0x59, 0x48, 0x22, 0xc8, 0x01, 0xa1, + 0x1a, 0x09, 0x7b, 0xcd, 0x1e, 0x74, 0x35, 0x33, 0x8d, 0x34, 0x61, 0xa6, 0x7b, 0x32, 0xdd, 0x03, + 0x68, 0xaf, 0x60, 0xaf, 0x26, 0x57, 0x90, 0x9c, 0xa6, 0x72, 0x98, 0x4b, 0x48, 0xf9, 0x28, 0xa9, + 0xdc, 0x44, 0xaa, 0xbb, 0x67, 0x84, 0xc0, 0x58, 0x76, 0xb2, 0xb5, 0x67, 0xea, 0xb7, 0x9f, 0xe7, + 0x99, 0xfe, 0x79, 0xff, 0x5a, 0x70, 0x3f, 0xa4, 0x62, 0xb8, 0x75, 0xfe, 0x35, 0x09, 0xa2, 0x21, + 0xf9, 0x7a, 0x2b, 0x8a, 0xf9, 0xe5, 0xa8, 0x16, 0xc5, 0x5c, 0x72, 0xb4, 0xea, 0x0b, 0xe9, 0xf3, + 0x9a, 0x02, 0xd4, 0x32, 0x40, 0xf5, 0xf1, 0x80, 0xf3, 0x41, 0x40, 0xb7, 0x34, 0xe4, 0x24, 0x39, + 0xdd, 0xf2, 0x92, 0x98, 0x48, 0x9f, 0x33, 0x43, 0x7a, 0x7f, 0xfe, 0x22, 0x26, 0x51, 0x44, 0x63, + 0x91, 0xce, 0x3f, 0x65, 0x54, 0x5e, 0xf0, 0xf8, 0xcc, 0x67, 0x83, 0xec, 0xab, 0xdb, 0x5b, 0x1e, + 0x15, 0xd2, 0x67, 0x5a, 0x06, 0xc7, 0x49, 0x40, 0x0d, 0x76, 0xe3, 0xaf, 0x16, 0x14, 0xfb, 0x31, + 0x71, 0x7d, 0x36, 0x40, 0xdf, 0x40, 0xe1, 0x7b, 0x3f, 0x3a, 0xf3, 0x99, 0x9d, 0x5b, 0xcf, 0x6d, + 0x96, 0x9f, 0x3d, 0xa9, 0xdd, 0xb2, 0xba, 0x5a, 0x8a, 0xae, 0x1d, 0x6b, 0xe8, 0xde, 0x8c, 0x93, + 0x92, 0xd0, 0x2e, 0x94, 0x02, 0x7f, 0x30, 0x94, 0x42, 0xd2, 0xc8, 0xce, 0x6b, 0x85, 0x2f, 0xa6, + 0x2a, 0xec, 0x67, 0xe8, 0xbd, 0x19, 0xe7, 0x8a, 0x8a, 0x5e, 0x42, 0xd1, 0x23, 0x92, 0x78, 0x7c, + 0x60, 0xcf, 0x6a, 0x95, 0xcf, 0xa7, 0xaa, 0x34, 0x0d, 0x76, 0x6f, 0xc6, 0xc9, 0x68, 0x68, 0x1f, + 0xca, 0x42, 0x12, 0xf7, 0xcc, 0x8b, 0xfd, 0x73, 0x1a, 0xdb, 0x73, 0x5a, 0x65, 0x73, 0xaa, 0x4a, + 0xef, 0x0a, 0xbf, 0x37, 0xe3, 0x4c, 0xd2, 0xd1, 0x31, 0xac, 0xf0, 0x88, 0x32, 0xec, 0x52, 0x26, + 0x12, 0x81, 0xc9, 0x80, 0x32, 0x69, 0x97, 0xb4, 0xe6, 0x57, 0x53, 0x35, 0x0f, 0x23, 0xca, 0x1a, + 0x9a, 0x54, 0x57, 0x9c, 0xbd, 0x19, 0x67, 0x99, 0x5f, 0x37, 0xa1, 0x03, 0x28, 0xbb, 0x89, 0x90, + 0x3c, 0xc4, 0x92, 0x0c, 0x84, 0x3d, 0xbf, 0x3e, 0xfb, 0x51, 0xd5, 0x86, 0xc6, 0xf7, 0xc9, 0x40, + 0xb4, 0x98, 0x8c, 0x47, 0x0e, 0xb8, 0x63, 0x03, 0xfa, 0x05, 0xac, 0x86, 0xe4, 0x12, 0x47, 0x44, + 0x0e, 0x95, 0x20, 0x0e, 0x28, 0x1b, 0xc8, 0xa1, 0x5d, 0x58, 0xcf, 0x6d, 0x56, 0x1c, 0x2b, 0x24, + 0x97, 0x5d, 0x22, 0x87, 0x7d, 0x32, 0xd8, 0xd7, 0x76, 0x54, 0x85, 0x05, 0x41, 0xc2, 0x28, 0xf0, + 0xd9, 0xc0, 0x2e, 0xae, 0xe7, 0x36, 0x73, 0xce, 0x78, 0x8c, 0x0e, 0x61, 0x51, 0x06, 0x02, 0x0b, + 0x2a, 0xa5, 0xcf, 0x06, 0xc2, 0x5e, 0xb8, 0xb6, 0xe1, 0x2b, 0x0f, 0xcb, 0x16, 0xb8, 0x5d, 0x6b, + 0x04, 0x3e, 0x65, 0xb2, 0xbf, 0xdf, 0xeb, 0xa5, 0x1c, 0xa7, 0x2c, 0x03, 0x91, 0x0d, 0xaa, 0x1b, + 0x50, 0x30, 0x2e, 0x83, 0x6c, 0x28, 0x12, 0xcf, 0x8b, 0xa9, 0x10, 0xda, 0xd1, 0x4a, 0x4e, 0x36, + 0xac, 0xee, 0x41, 0x69, 0xec, 0x14, 0x1f, 0x86, 0xa1, 0xff, 0x83, 0x45, 0xe2, 0xba, 0x54, 0x08, + 0x2c, 0xf9, 0x19, 0x65, 0xda, 0xd9, 0x4a, 0x4e, 0xd9, 0xd8, 0xfa, 0xca, 0x54, 0x7d, 0x02, 0xc5, + 0xd4, 0x31, 0xa6, 0x7c, 0xee, 0x4f, 0x79, 0x28, 0x4f, 0x5c, 0x3c, 0xba, 0x03, 0xf3, 0x1e, 0x3d, + 0x49, 0x06, 0x1a, 0xb7, 0xe0, 0x98, 0x01, 0xea, 0x83, 0xad, 0x0e, 0x95, 0x25, 0xe1, 0x09, 0x8d, + 0x31, 0x3f, 0xc5, 0x44, 0xca, 0xd8, 0x3f, 0x49, 0x24, 0x15, 0xa9, 0x9b, 0x3f, 0xa8, 0x99, 0x88, + 0xac, 0x65, 0x11, 0x59, 0x6b, 0x33, 0xf9, 0xfc, 0x97, 0xaf, 0x49, 0x90, 0x50, 0x67, 0x2d, 0x24, + 0x97, 0x1d, 0xcd, 0x3d, 0x3c, 0xad, 0x8f, 0x99, 0xe8, 0x35, 0xdc, 0xbf, 0xa1, 0xca, 0x18, 0x97, + 0x3a, 0x3e, 0x45, 0xea, 0xf7, 0x53, 0x65, 0xef, 0x4e, 0xca, 0x5e, 0x51, 0xd1, 0x77, 0xf0, 0xf0, + 0xba, 0x6e, 0x48, 0x85, 0x20, 0x03, 0x8a, 0xe9, 0x39, 0x65, 0x52, 0xa4, 0xc1, 0x30, 0x55, 0xda, + 0x9e, 0x90, 0x3e, 0x30, 0xec, 0x96, 0x26, 0x57, 0x7f, 0x98, 0x83, 0xe5, 0x1b, 0x5e, 0x3d, 0xe5, + 0x9a, 0x7a, 0x50, 0x74, 0x39, 0x93, 0xf4, 0x52, 0xda, 0xf9, 0xf5, 0xd9, 0xcd, 0xa5, 0x67, 0xbf, + 0xfa, 0x6f, 0xc2, 0x45, 0xdb, 0x69, 0xc3, 0x08, 0x38, 0x99, 0xd2, 0xd5, 0x1d, 0xcd, 0x7e, 0xea, + 0x1d, 0xcd, 0xfd, 0x34, 0x77, 0x34, 0xff, 0xd3, 0xdd, 0x51, 0xe1, 0x47, 0xdc, 0xd1, 0x06, 0x85, + 0xc5, 0xc9, 0x93, 0x43, 0xcb, 0x50, 0x3e, 0xea, 0xf4, 0xba, 0xad, 0x46, 0x7b, 0xb7, 0xdd, 0x6a, + 0x5a, 0x33, 0x68, 0x0d, 0x56, 0xde, 0x6c, 0x37, 0x70, 0xdf, 0xa9, 0x37, 0x5a, 0xb8, 0x71, 0xd8, + 0xe9, 0xb7, 0xbe, 0xed, 0x5b, 0x39, 0xb4, 0x08, 0x0b, 0xbf, 0x73, 0xba, 0x0d, 0xbc, 0xd3, 0xee, + 0x58, 0x79, 0x74, 0x0f, 0x56, 0x1b, 0xfb, 0x87, 0x47, 0xcd, 0x1b, 0xb0, 0x59, 0x54, 0x80, 0xfc, + 0xce, 0xb6, 0x35, 0x57, 0xfd, 0x57, 0x0e, 0x4a, 0xe3, 0x54, 0xa4, 0x72, 0x76, 0xe0, 0x4b, 0x1a, + 0x93, 0x20, 0xad, 0x1d, 0x9f, 0x7f, 0x24, 0xf3, 0x6b, 0xac, 0xca, 0xd9, 0x29, 0x4d, 0xe5, 0x6c, + 0xca, 0xce, 0xfd, 0x98, 0xb3, 0x50, 0xe5, 0xd7, 0xfc, 0x27, 0xe4, 0xec, 0xd6, 0x15, 0x5e, 0xe5, + 0xec, 0x09, 0x3a, 0x6a, 0x42, 0x61, 0x48, 0x89, 0x47, 0xe3, 0x34, 0x94, 0x9e, 0x4e, 0x15, 0x72, + 0xe8, 0x1f, 0x13, 0x2a, 0xe4, 0x9e, 0x66, 0xa8, 0x8a, 0x66, 0xb8, 0x3b, 0x05, 0x98, 0x93, 0xa3, + 0x88, 0x56, 0x3f, 0x83, 0x62, 0xba, 0x62, 0xe5, 0x7e, 0xe7, 0xea, 0x02, 0x52, 0x5f, 0x37, 0x83, + 0xea, 0x2e, 0x94, 0x27, 0x16, 0x83, 0x10, 0xcc, 0x31, 0x12, 0x66, 0x18, 0xfd, 0x1b, 0x3d, 0x81, + 0x8a, 0x47, 0x4f, 0x49, 0x12, 0x48, 0x6c, 0x04, 0x4c, 0xd2, 0x5a, 0x4c, 0x8d, 0xfa, 0x56, 0xab, + 0x7b, 0x50, 0xb9, 0xb6, 0x96, 0xff, 0x5d, 0x89, 0xc2, 0xf2, 0x8d, 0x42, 0x81, 0x2c, 0x98, 0x3d, + 0xa3, 0xa3, 0x54, 0x4a, 0xfd, 0x44, 0xbf, 0xc9, 0x36, 0xf3, 0x29, 0xd5, 0x7a, 0x2c, 0x97, 0x6e, + 0xfa, 0xd7, 0xf9, 0x17, 0xb9, 0x9d, 0x05, 0x28, 0x48, 0xe5, 0x6c, 0xf1, 0xc6, 0x2e, 0xcc, 0xf6, + 0x9a, 0x3d, 0x95, 0x0d, 0x28, 0x23, 0x27, 0x01, 0xf5, 0xd2, 0x24, 0x9a, 0x0d, 0xd1, 0xff, 0xc3, + 0xf2, 0xd9, 0x0b, 0x81, 0x05, 0xc1, 0x7f, 0xb8, 0x90, 0xba, 0x44, 0x65, 0x0b, 0x3f, 0x7b, 0x21, + 0x7a, 0xe4, 0xd5, 0x85, 0x54, 0xc5, 0x69, 0xe3, 0xcf, 0x79, 0x58, 0xe8, 0xf3, 0x88, 0x07, 0x7c, + 0x30, 0x42, 0x35, 0x58, 0x65, 0x49, 0x88, 0x65, 0x9c, 0x08, 0x49, 0x3d, 0xac, 0x3a, 0x27, 0x9f, + 0x9a, 0x3c, 0x53, 0x71, 0x56, 0x58, 0x12, 0xf6, 0xcd, 0x4c, 0xd7, 0x4c, 0xa0, 0x04, 0x1e, 0x9c, + 0xf2, 0xf8, 0x82, 0xc4, 0x1e, 0x76, 0x75, 0x35, 0xc2, 0x2e, 0x8d, 0x25, 0xf6, 0xa8, 0x24, 0x7e, + 0x60, 0xb2, 0xf5, 0xd2, 0xb3, 0xe7, 0xb7, 0x6f, 0x33, 0xfd, 0x66, 0x6d, 0xd7, 0x08, 0x98, 0x6a, + 0xd6, 0xa0, 0xb1, 0x6c, 0x1a, 0xb6, 0x63, 0x9f, 0x7e, 0x60, 0x66, 0xe3, 0x87, 0x1c, 0xd8, 0x1f, + 0xa2, 0xa1, 0x0a, 0x94, 0x8e, 0x3a, 0xcd, 0xd6, 0x6e, 0xbb, 0xa3, 0xa3, 0x6f, 0x11, 0x16, 0x7a, + 0xf5, 0x4e, 0xbb, 0xdf, 0x3e, 0x6e, 0x59, 0x39, 0x64, 0xc1, 0xe2, 0xee, 0xa1, 0xf3, 0xa6, 0xee, + 0x34, 0xf1, 0x61, 0x67, 0xff, 0xad, 0x95, 0x47, 0x08, 0x96, 0xea, 0xdd, 0x6e, 0xab, 0xd3, 0xc4, + 0xe9, 0x84, 0x35, 0xab, 0x50, 0x19, 0x07, 0xf7, 0x5a, 0x7d, 0x6b, 0x4e, 0x85, 0x67, 0x7d, 0xff, + 0x4d, 0xfd, 0x6d, 0x0f, 0x5f, 0xa3, 0xcf, 0x6f, 0xfc, 0x65, 0x09, 0xca, 0xea, 0x34, 0x46, 0x0d, + 0xce, 0x4e, 0xfd, 0x01, 0xfa, 0x0c, 0xca, 0xae, 0xfe, 0x65, 0x4e, 0xdc, 0x5c, 0x3e, 0x18, 0x93, + 0x3a, 0x6f, 0x05, 0x38, 0xf1, 0x19, 0x89, 0x47, 0x93, 0x57, 0x02, 0xc6, 0xa4, 0x01, 0x3f, 0x83, + 0x65, 0x41, 0xe3, 0x73, 0xdf, 0xa5, 0xd8, 0x0d, 0xd4, 0x69, 0x9b, 0x98, 0x2a, 0x39, 0x4b, 0xa9, + 0xb9, 0x61, 0xac, 0xe8, 0x25, 0x2c, 0x79, 0x31, 0xf1, 0x19, 0xce, 0xda, 0xd5, 0x34, 0xf3, 0xde, + 0x7f, 0x2f, 0x8f, 0x35, 0x53, 0x80, 0x53, 0xd1, 0x84, 0x6c, 0x88, 0x7a, 0x60, 0x47, 0x24, 0x56, + 0xd7, 0x26, 0x86, 0x89, 0xf4, 0xf8, 0xc5, 0x84, 0xd6, 0xfc, 0xc7, 0xb4, 0xee, 0x1a, 0x6a, 0x2f, + 0x65, 0x8e, 0x45, 0x7f, 0x0e, 0x2b, 0x9e, 0x2f, 0x5c, 0x7e, 0x4e, 0xe3, 0x11, 0xce, 0x2a, 0x55, + 0x41, 0xef, 0xc0, 0x1a, 0x4f, 0xd4, 0xd3, 0x92, 0x75, 0x04, 0xf7, 0xae, 0xc0, 0x31, 0x3d, 0x8d, + 0xa9, 0x18, 0x62, 0x8f, 0x06, 0x64, 0xa4, 0x1b, 0xa4, 0x69, 0x0b, 0xd8, 0xc9, 0xdb, 0x39, 0x67, + 0x6d, 0xcc, 0x76, 0x0c, 0xb9, 0xa9, 0xb8, 0xe8, 0x4b, 0x58, 0x32, 0x4d, 0xf2, 0x78, 0x01, 0xaa, + 0x9d, 0x2a, 0x69, 0x4a, 0xc5, 0xcc, 0x64, 0x2b, 0xf8, 0x0a, 0x90, 0x90, 0x44, 0x0a, 0x0f, 0x27, + 0x5e, 0x34, 0x86, 0x83, 0x59, 0xaf, 0x99, 0x39, 0xf2, 0xa2, 0x0c, 0xdd, 0x82, 0x47, 0x94, 0x9d, + 0xf3, 0x11, 0x0e, 0xa9, 0x8c, 0x7d, 0x57, 0xf5, 0x6b, 0xe6, 0xaa, 0x32, 0xe2, 0x9d, 0xf1, 0x77, + 0xaa, 0x1a, 0x78, 0x60, 0x70, 0x3d, 0x03, 0xcb, 0x64, 0x36, 0xc1, 0xd2, 0xaf, 0x12, 0x4c, 0xbc, + 0xd0, 0x67, 0x38, 0xe2, 0xb1, 0xb4, 0xcb, 0xeb, 0xb9, 0xcd, 0x79, 0x67, 0x49, 0xdb, 0xeb, 0xca, + 0xdc, 0xe5, 0xb1, 0x44, 0x5b, 0xb0, 0x42, 0xce, 0x89, 0x1f, 0x90, 0x13, 0x3f, 0xf0, 0xe5, 0x08, + 0x7f, 0xcf, 0x19, 0xb5, 0x17, 0xc7, 0x1f, 0xb1, 0x26, 0x27, 0x8f, 0x39, 0xa3, 0xc8, 0x83, 0xfb, + 0xaa, 0x74, 0xc7, 0x3c, 0xc0, 0x51, 0x40, 0x18, 0xc5, 0x24, 0x91, 0x43, 0x1c, 0xf1, 0xc0, 0x77, + 0x47, 0x76, 0x45, 0x07, 0xe4, 0x97, 0xb7, 0x06, 0x64, 0x3d, 0x91, 0x43, 0xca, 0xa4, 0xef, 0xea, + 0xd3, 0xed, 0x6a, 0x82, 0x73, 0x37, 0xd5, 0xea, 0x2a, 0x29, 0x85, 0x30, 0x76, 0x75, 0x6a, 0x69, + 0x1f, 0x9d, 0x7a, 0xfb, 0xa9, 0x1f, 0x50, 0x7b, 0xc9, 0x9c, 0x9a, 0x99, 0x31, 0x01, 0xb1, 0xeb, + 0x07, 0x54, 0x6d, 0x57, 0x9d, 0x24, 0x56, 0xe9, 0x34, 0xeb, 0x91, 0x97, 0xcd, 0x76, 0x95, 0xbd, + 0x43, 0x42, 0x9a, 0x76, 0xc8, 0xdf, 0xe8, 0xf0, 0x71, 0x93, 0x38, 0xa6, 0xcc, 0x1d, 0xd9, 0xd6, + 0x87, 0x0b, 0xf3, 0xf6, 0x33, 0x53, 0x98, 0x27, 0xf1, 0xa8, 0x0e, 0x8f, 0xcc, 0xb9, 0x9e, 0x70, + 0x2e, 0x85, 0x8c, 0x49, 0x84, 0x25, 0x0d, 0xa3, 0x80, 0x48, 0x6a, 0xc2, 0x6d, 0x45, 0xaf, 0xb0, + 0xaa, 0x41, 0x3b, 0x19, 0xa6, 0x9f, 0x42, 0x74, 0xf8, 0x51, 0x58, 0xf1, 0x99, 0xa4, 0xb1, 0x4b, + 0x23, 0xfd, 0x76, 0x0b, 0xb9, 0x47, 0x6d, 0xa4, 0xcf, 0xed, 0xc5, 0xad, 0xe7, 0x36, 0x11, 0xfd, + 0xb5, 0x36, 0x3b, 0xe1, 0x09, 0xf3, 0xda, 0x13, 0x02, 0x07, 0xdc, 0xa3, 0x8e, 0xe5, 0xdf, 0xb0, + 0xa0, 0xe7, 0x50, 0x94, 0x26, 0xd1, 0xdb, 0xab, 0x7a, 0x93, 0x0f, 0xa7, 0x15, 0x03, 0x27, 0x03, + 0xa3, 0xa7, 0x30, 0x2b, 0x3c, 0x61, 0xaf, 0x69, 0x8e, 0x7d, 0x2b, 0xa7, 0xd7, 0xec, 0x39, 0x0a, + 0x84, 0xbe, 0x03, 0xdb, 0x38, 0x6b, 0xda, 0xbc, 0x07, 0x7c, 0x90, 0xf9, 0xab, 0x7d, 0x57, 0x0b, + 0x6c, 0xdc, 0x2a, 0xe0, 0xd0, 0x90, 0x4b, 0x9a, 0xba, 0xac, 0xb3, 0xa6, 0x35, 0xea, 0x5a, 0x62, + 0x9f, 0x0f, 0x52, 0x33, 0x7a, 0x0d, 0x6b, 0xb7, 0x46, 0x82, 0x7d, 0xef, 0x93, 0x95, 0x57, 0x6f, + 0x89, 0x10, 0x74, 0x0c, 0x26, 0x04, 0x94, 0x2e, 0x51, 0x0f, 0x4c, 0xdb, 0xd6, 0x8f, 0xb4, 0xed, + 0x8f, 0x1e, 0xbe, 0xfe, 0x7d, 0x90, 0xb2, 0xcc, 0x5b, 0xad, 0x12, 0x4d, 0xda, 0x54, 0xee, 0x55, + 0xfe, 0x96, 0x08, 0x13, 0x71, 0x55, 0xed, 0x82, 0x60, 0x4c, 0x3a, 0xda, 0xbe, 0x80, 0x65, 0x7a, + 0x29, 0x63, 0x82, 0xb5, 0xbb, 0xea, 0x27, 0xe2, 0x83, 0xf5, 0xd9, 0xcd, 0x92, 0x53, 0xd1, 0xe6, + 0x9e, 0x24, 0x52, 0xbf, 0xfb, 0xf6, 0xc0, 0x1a, 0x10, 0x49, 0x2f, 0xc8, 0x08, 0xcb, 0xb4, 0x8e, + 0xd9, 0x0f, 0xf5, 0xbe, 0x1f, 0x4d, 0x2d, 0x76, 0xce, 0x72, 0x4a, 0x1b, 0x57, 0xdc, 0x37, 0x50, + 0x95, 0x34, 0x0e, 0xb3, 0x7f, 0x0a, 0x6e, 0x24, 0xf4, 0x47, 0x1f, 0x4b, 0xc2, 0xf6, 0x04, 0xb9, + 0x79, 0x2d, 0xb7, 0xdf, 0x83, 0xa2, 0x5a, 0x03, 0xf6, 0x3d, 0xfb, 0xb1, 0x76, 0xfa, 0x82, 0x1a, + 0xb6, 0xbd, 0xea, 0x4b, 0x40, 0xef, 0x9f, 0xd4, 0x2d, 0xcd, 0xca, 0x9d, 0xc9, 0x66, 0xa5, 0x34, + 0xd1, 0x84, 0x6c, 0x6c, 0xc3, 0xbd, 0x0f, 0x38, 0xba, 0xaa, 0xb6, 0x4e, 0xab, 0xd9, 0x76, 0x5a, + 0x8d, 0xbe, 0x35, 0x83, 0x00, 0x0a, 0xfd, 0xae, 0x73, 0xf8, 0xed, 0x5b, 0x2b, 0xf7, 0x6a, 0x6e, + 0xa1, 0x64, 0x81, 0xb3, 0xec, 0x72, 0xc6, 0xa8, 0x2b, 0xb1, 0xf4, 0x43, 0xca, 0x13, 0xb9, 0xf1, + 0xef, 0x9c, 0x6a, 0xc1, 0x26, 0xbc, 0x62, 0xca, 0xfb, 0xe6, 0xe6, 0x13, 0x39, 0xff, 0x23, 0x9f, + 0xc8, 0x88, 0x43, 0x45, 0xba, 0x11, 0x3e, 0xa3, 0x34, 0x22, 0x81, 0x7f, 0x4e, 0xd3, 0xe6, 0xf5, + 0xd5, 0x34, 0x45, 0xb3, 0x7e, 0x9d, 0x21, 0x79, 0x90, 0x29, 0xd5, 0xfa, 0x8d, 0xee, 0xd5, 0x6f, + 0x37, 0xfa, 0x7d, 0xa6, 0xe8, 0x2c, 0xca, 0x89, 0xd1, 0xd3, 0xdf, 0xc2, 0x9d, 0xdb, 0xd2, 0x2c, + 0x5a, 0x80, 0xb9, 0xce, 0x61, 0xa7, 0x65, 0xcd, 0xa0, 0x25, 0x80, 0x83, 0xa3, 0xfe, 0x51, 0x7d, + 0x1f, 0xf7, 0xf7, 0x7b, 0xfa, 0x95, 0x50, 0x6c, 0x77, 0xf6, 0x5a, 0x4e, 0xbb, 0x6f, 0xfd, 0xb3, + 0xb8, 0xb3, 0xf9, 0xb7, 0x77, 0x8f, 0x73, 0x7f, 0x7f, 0xf7, 0x38, 0xf7, 0x8f, 0x77, 0x8f, 0x73, + 0xc7, 0x55, 0xb3, 0x4c, 0x9f, 0x6f, 0x91, 0xc8, 0xdf, 0xba, 0xf6, 0xa7, 0xd7, 0x49, 0x41, 0xfb, + 0xca, 0xf6, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x25, 0x3c, 0x2a, 0xe3, 0x0c, 0x13, 0x00, 0x00, } func (m *Tracing) Marshal() (dAtA []byte, err error) { @@ -1810,15 +1881,15 @@ func (m *Tracing_Stackdriver_) MarshalToSizedBuffer(dAtA []byte) (int, error) { } return len(dAtA) - i, nil } -func (m *Tracing_OpenCensus_) MarshalTo(dAtA []byte) (int, error) { +func (m *Tracing_OpenCensusAgent_) MarshalTo(dAtA []byte) (int, error) { return m.MarshalToSizedBuffer(dAtA[:m.Size()]) } -func (m *Tracing_OpenCensus_) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *Tracing_OpenCensusAgent_) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) - if m.OpenCensus != nil { + if m.OpenCensusAgent != nil { { - size, err := m.OpenCensus.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.OpenCensusAgent.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -2012,7 +2083,7 @@ func (m *Tracing_Stackdriver) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *Tracing_OpenCensus) Marshal() (dAtA []byte, err error) { +func (m *Tracing_OpenCensusAgent) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2022,12 +2093,12 @@ func (m *Tracing_OpenCensus) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *Tracing_OpenCensus) MarshalTo(dAtA []byte) (int, error) { +func (m *Tracing_OpenCensusAgent) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *Tracing_OpenCensus) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *Tracing_OpenCensusAgent) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2046,7 +2117,7 @@ func (m *Tracing_OpenCensus) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintProxy(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x2a + dAtA[i] = 0x32 } if m.MaxNumberOfAnnotations != nil { { @@ -2058,7 +2129,7 @@ func (m *Tracing_OpenCensus) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintProxy(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x22 + dAtA[i] = 0x2a } if m.MaxNumberOfAttributes != nil { { @@ -2070,7 +2141,7 @@ func (m *Tracing_OpenCensus) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintProxy(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x1a + dAtA[i] = 0x22 } if m.Debug { i-- @@ -2080,7 +2151,25 @@ func (m *Tracing_OpenCensus) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0 } i-- - dAtA[i] = 0x10 + dAtA[i] = 0x18 + } + if len(m.Context) > 0 { + dAtA15 := make([]byte, len(m.Context)*10) + var j14 int + for _, num := range m.Context { + for num >= 1<<7 { + dAtA15[j14] = uint8(uint64(num)&0x7f | 0x80) + num >>= 7 + j14++ + } + dAtA15[j14] = uint8(num) + j14++ + } + i -= j14 + copy(dAtA[i:], dAtA15[:j14]) + i = encodeVarintProxy(dAtA, i, uint64(j14)) + i-- + dAtA[i] = 0x12 } if len(m.Address) > 0 { i -= len(m.Address) @@ -2845,14 +2934,14 @@ func (m *Tracing_Stackdriver_) Size() (n int) { } return n } -func (m *Tracing_OpenCensus_) Size() (n int) { +func (m *Tracing_OpenCensusAgent_) Size() (n int) { if m == nil { return 0 } var l int _ = l - if m.OpenCensus != nil { - l = m.OpenCensus.Size() + if m.OpenCensusAgent != nil { + l = m.OpenCensusAgent.Size() n += 1 + l + sovProxy(uint64(l)) } return n @@ -2936,7 +3025,7 @@ func (m *Tracing_Stackdriver) Size() (n int) { return n } -func (m *Tracing_OpenCensus) Size() (n int) { +func (m *Tracing_OpenCensusAgent) Size() (n int) { if m == nil { return 0 } @@ -2946,6 +3035,13 @@ func (m *Tracing_OpenCensus) Size() (n int) { if l > 0 { n += 1 + l + sovProxy(uint64(l)) } + if len(m.Context) > 0 { + l = 0 + for _, e := range m.Context { + l += sovProxy(uint64(e)) + } + n += 1 + sovProxy(uint64(l)) + l + } if m.Debug { n += 2 } @@ -3632,7 +3728,7 @@ func (m *Tracing) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 9: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field OpenCensus", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field OpenCensusAgent", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -3659,11 +3755,11 @@ func (m *Tracing) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - v := &Tracing_OpenCensus{} + v := &Tracing_OpenCensusAgent{} if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } - m.Tracer = &Tracing_OpenCensus_{v} + m.Tracer = &Tracing_OpenCensusAgent_{v} iNdEx = postIndex default: iNdEx = preIndex @@ -4162,7 +4258,7 @@ func (m *Tracing_Stackdriver) Unmarshal(dAtA []byte) error { } return nil } -func (m *Tracing_OpenCensus) Unmarshal(dAtA []byte) error { +func (m *Tracing_OpenCensusAgent) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4185,10 +4281,10 @@ func (m *Tracing_OpenCensus) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: OpenCensus: wiretype end group for non-group") + return fmt.Errorf("proto: OpenCensusAgent: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: OpenCensus: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: OpenCensusAgent: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -4224,6 +4320,75 @@ func (m *Tracing_OpenCensus) Unmarshal(dAtA []byte) error { m.Address = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: + if wireType == 0 { + var v Tracing_OpenCensusAgent_TraceContext + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowProxy + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= Tracing_OpenCensusAgent_TraceContext(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.Context = append(m.Context, v) + } else if wireType == 2 { + var packedLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowProxy + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + packedLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if packedLen < 0 { + return ErrInvalidLengthProxy + } + postIndex := iNdEx + packedLen + if postIndex < 0 { + return ErrInvalidLengthProxy + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + var elementCount int + if elementCount != 0 && len(m.Context) == 0 { + m.Context = make([]Tracing_OpenCensusAgent_TraceContext, 0, elementCount) + } + for iNdEx < postIndex { + var v Tracing_OpenCensusAgent_TraceContext + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowProxy + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= Tracing_OpenCensusAgent_TraceContext(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.Context = append(m.Context, v) + } + } else { + return fmt.Errorf("proto: wrong wireType = %d for field Context", wireType) + } + case 3: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Debug", wireType) } @@ -4243,7 +4408,7 @@ func (m *Tracing_OpenCensus) Unmarshal(dAtA []byte) error { } } m.Debug = bool(v != 0) - case 3: + case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field MaxNumberOfAttributes", wireType) } @@ -4279,7 +4444,7 @@ func (m *Tracing_OpenCensus) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 4: + case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field MaxNumberOfAnnotations", wireType) } @@ -4315,7 +4480,7 @@ func (m *Tracing_OpenCensus) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 5: + case 6: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field MaxNumberOfMessageEvents", wireType) } diff --git a/mesh/v1alpha1/proxy.proto b/mesh/v1alpha1/proxy.proto index f4f55d2415..e72e021736 100644 --- a/mesh/v1alpha1/proxy.proto +++ b/mesh/v1alpha1/proxy.proto @@ -81,27 +81,61 @@ message Tracing { google.protobuf.Int64Value max_number_of_message_events = 4; } - // OpenCensus defines configuration for an OpenCensus tracer. - // See [OpenCensus trace config](https://github.com/census-instrumentation/opencensus-proto/blob/master/src/opencensus/proto/trace/v1/trace_config.proto) for details. - message OpenCensus { - // gRPC address for the OpenCensus Agent (e.g. dns://authority/host:port or unix:path). - // See [gRPC naming docs](https://github.com/grpc/grpc/blob/master/doc/naming.md) for details. + // OpenCensusAgent defines configuration for an OpenCensus tracer writing to + // an OpenCensus agent backend. See + // [OpenCensus trace config](https://github.com/census-instrumentation/opencensus-proto/blob/master/src/opencensus/proto/trace/v1/trace_config.proto) + // for details. + message OpenCensusAgent { + // TraceContext selects the context propagation headers used for + // distributed tracing. + enum TraceContext { + // $hide_from_docs + // Unspecified context. Should not be used for now, but added to reserve + // the 0 enum value if TraceContext is used outside of a repeated field. + UNSPECIFIED = 0; + // Use W3C Trace Context propagation using the `traceparent` HTTP header. + // See the + // [Trace Context documentation](https://www.w3.org/TR/trace-context/) for details. + W3C_TRACE_CONTEXT = 1; + // Use gRPC binary context propagation using the `grpc-trace-bin` http header. + GRPC_BIN = 2; + // Use Cloud Trace context propagation using the + // `X-Cloud-Trace-Context` http header. + CLOUD_TRACE_CONTEXT = 3; + // Use multi-header B3 context propagation using the `X-B3-TraceId`, + // `X-B3-SpanId`, and `X-B3-Sampled` HTTP headers. See + // [B3 header propagation README](https://github.com/openzipkin/b3-propagation) + // for details. + B3 = 4; + } + + // gRPC address for the OpenCensus agent (e.g. dns://authority/host:port or + // unix:path). See [gRPC naming + // docs](https://github.com/grpc/grpc/blob/master/doc/naming.md) for + // details. string address = 1; + + // Specifies the set of context propagation headers used for distributed + // tracing. Default is `["W3C_TRACE_CONTEXT"]`. If multiple values are specified, + // the proxy will attempt to read each header for each request and will + // write all headers. + repeated TraceContext context = 2; + // debug enables trace output to stdout // $hide_from_docs - bool debug = 2; + bool debug = 3; // The global default max number of attributes per span. // default is 200. // $hide_from_docs - google.protobuf.Int64Value max_number_of_attributes = 3; + google.protobuf.Int64Value max_number_of_attributes = 4; // The global default max number of annotation events per span. // default is 200. // $hide_from_docs - google.protobuf.Int64Value max_number_of_annotations = 4; + google.protobuf.Int64Value max_number_of_annotations = 5; // The global default max number of message events per span. // default is 200. // $hide_from_docs - google.protobuf.Int64Value max_number_of_message_events = 5; + google.protobuf.Int64Value max_number_of_message_events = 6; } // The tracer implementation to be used by Envoy. @@ -114,8 +148,8 @@ message Tracing { Datadog datadog = 3; // Use a Stackdriver tracer. Stackdriver stackdriver = 4; - // Use an OpenCensus tracer. - OpenCensus open_census = 9; + // Use an OpenCensus tracer exporting to an OpenCensus agent. + OpenCensusAgent open_census_agent = 9; } // Configure custom tags that will be added to any active span. diff --git a/python/istio_api/mesh/v1alpha1/proxy_pb2.py b/python/istio_api/mesh/v1alpha1/proxy_pb2.py index 4c5ad287c1..646706a891 100644 --- a/python/istio_api/mesh/v1alpha1/proxy_pb2.py +++ b/python/istio_api/mesh/v1alpha1/proxy_pb2.py @@ -24,7 +24,7 @@ package='istio.mesh.v1alpha1', syntax='proto3', serialized_options=_b('Z\032istio.io/api/mesh/v1alpha1'), - serialized_pb=_b('\n\x19mesh/v1alpha1/proxy.proto\x12\x13istio.mesh.v1alpha1\x1a\x1egoogle/protobuf/duration.proto\x1a\x1egoogle/protobuf/wrappers.proto\x1a*networking/v1alpha3/destination_rule.proto\"\xe1\x0b\n\x07Tracing\x12\x35\n\x06zipkin\x18\x01 \x01(\x0b\x32#.istio.mesh.v1alpha1.Tracing.ZipkinH\x00\x12;\n\tlightstep\x18\x02 \x01(\x0b\x32&.istio.mesh.v1alpha1.Tracing.LightstepH\x00\x12\x37\n\x07\x64\x61tadog\x18\x03 \x01(\x0b\x32$.istio.mesh.v1alpha1.Tracing.DatadogH\x00\x12?\n\x0bstackdriver\x18\x04 \x01(\x0b\x32(.istio.mesh.v1alpha1.Tracing.StackdriverH\x00\x12>\n\x0bopen_census\x18\t \x01(\x0b\x32\'.istio.mesh.v1alpha1.Tracing.OpenCensusH\x00\x12\x41\n\x0b\x63ustom_tags\x18\x05 \x03(\x0b\x32,.istio.mesh.v1alpha1.Tracing.CustomTagsEntry\x12\x1b\n\x13max_path_tag_length\x18\x06 \x01(\r\x12\x10\n\x08sampling\x18\x07 \x01(\x01\x12\x42\n\x0ctls_settings\x18\x08 \x01(\x0b\x32,.istio.networking.v1alpha3.ClientTLSSettings\x1a\x19\n\x06Zipkin\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x1a\x32\n\tLightstep\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x14\n\x0c\x61\x63\x63\x65ss_token\x18\x02 \x01(\t\x1a\x1a\n\x07\x44\x61tadog\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x1a\xde\x01\n\x0bStackdriver\x12\r\n\x05\x64\x65\x62ug\x18\x01 \x01(\x08\x12=\n\x18max_number_of_attributes\x18\x02 \x01(\x0b\x32\x1b.google.protobuf.Int64Value\x12>\n\x19max_number_of_annotations\x18\x03 \x01(\x0b\x32\x1b.google.protobuf.Int64Value\x12\x41\n\x1cmax_number_of_message_events\x18\x04 \x01(\x0b\x32\x1b.google.protobuf.Int64Value\x1a\xee\x01\n\nOpenCensus\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\r\n\x05\x64\x65\x62ug\x18\x02 \x01(\x08\x12=\n\x18max_number_of_attributes\x18\x03 \x01(\x0b\x32\x1b.google.protobuf.Int64Value\x12>\n\x19max_number_of_annotations\x18\x04 \x01(\x0b\x32\x1b.google.protobuf.Int64Value\x12\x41\n\x1cmax_number_of_message_events\x18\x05 \x01(\x0b\x32\x1b.google.protobuf.Int64Value\x1a\xcb\x01\n\tCustomTag\x12\x37\n\x07literal\x18\x01 \x01(\x0b\x32$.istio.mesh.v1alpha1.Tracing.LiteralH\x00\x12?\n\x0b\x65nvironment\x18\x02 \x01(\x0b\x32(.istio.mesh.v1alpha1.Tracing.EnvironmentH\x00\x12<\n\x06header\x18\x03 \x01(\x0b\x32*.istio.mesh.v1alpha1.Tracing.RequestHeaderH\x00\x42\x06\n\x04type\x1a\x18\n\x07Literal\x12\r\n\x05value\x18\x01 \x01(\t\x1a\x32\n\x0b\x45nvironment\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x15\n\rdefault_value\x18\x02 \x01(\t\x1a\x34\n\rRequestHeader\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x15\n\rdefault_value\x18\x02 \x01(\t\x1aY\n\x0f\x43ustomTagsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x35\n\x05value\x18\x02 \x01(\x0b\x32&.istio.mesh.v1alpha1.Tracing.CustomTag:\x02\x38\x01\x42\x08\n\x06tracer\"/\n\x03SDS\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\x12\x17\n\x0fk8s_sa_jwt_path\x18\x02 \x01(\t\"\x8f\x02\n\x08Topology\x12\x1b\n\x13num_trusted_proxies\x18\x01 \x01(\r\x12[\n\x1b\x66orward_client_cert_details\x18\x02 \x01(\x0e\x32\x36.istio.mesh.v1alpha1.Topology.ForwardClientCertDetails\"\x88\x01\n\x18\x46orwardClientCertDetails\x12\r\n\tUNDEFINED\x10\x00\x12\x0c\n\x08SANITIZE\x10\x01\x12\x10\n\x0c\x46ORWARD_ONLY\x10\x02\x12\x12\n\x0e\x41PPEND_FORWARD\x10\x03\x12\x10\n\x0cSANITIZE_SET\x10\x04\x12\x17\n\x13\x41LWAYS_FORWARD_ONLY\x10\x05\"\xce\n\n\x0bProxyConfig\x12\x13\n\x0b\x63onfig_path\x18\x01 \x01(\t\x12\x13\n\x0b\x62inary_path\x18\x02 \x01(\t\x12\x17\n\x0fservice_cluster\x18\x03 \x01(\t\x12\x31\n\x0e\x64rain_duration\x18\x04 \x01(\x0b\x32\x19.google.protobuf.Duration\x12;\n\x18parent_shutdown_duration\x18\x05 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x19\n\x11\x64iscovery_address\x18\x06 \x01(\t\x12>\n\x17\x64iscovery_refresh_delay\x18\x07 \x01(\x0b\x32\x19.google.protobuf.DurationB\x02\x18\x01\x12\x1a\n\x0ezipkin_address\x18\x08 \x01(\tB\x02\x18\x01\x12\x1a\n\x12statsd_udp_address\x18\n \x01(\t\x12)\n\x1d\x65nvoy_metrics_service_address\x18\x14 \x01(\tB\x02\x18\x01\x12\x18\n\x10proxy_admin_port\x18\x0b \x01(\x05\x12\x1d\n\x11\x61vailability_zone\x18\x0c \x01(\tB\x02\x18\x01\x12L\n\x19\x63ontrol_plane_auth_policy\x18\r \x01(\x0e\x32).istio.mesh.v1alpha1.AuthenticationPolicy\x12\x1a\n\x12\x63ustom_config_file\x18\x0e \x01(\t\x12\x18\n\x10stat_name_length\x18\x0f \x01(\x05\x12\x30\n\x0b\x63oncurrency\x18\x10 \x01(\x0b\x32\x1b.google.protobuf.Int32Value\x12%\n\x1dproxy_bootstrap_template_path\x18\x11 \x01(\t\x12S\n\x11interception_mode\x18\x12 \x01(\x0e\x32\x38.istio.mesh.v1alpha1.ProxyConfig.InboundInterceptionMode\x12-\n\x07tracing\x18\x13 \x01(\x0b\x32\x1c.istio.mesh.v1alpha1.Tracing\x12%\n\x03sds\x18\x15 \x01(\x0b\x32\x18.istio.mesh.v1alpha1.SDS\x12\x44\n\x18\x65nvoy_access_log_service\x18\x16 \x01(\x0b\x32\".istio.mesh.v1alpha1.RemoteService\x12\x41\n\x15\x65nvoy_metrics_service\x18\x17 \x01(\x0b\x32\".istio.mesh.v1alpha1.RemoteService\x12K\n\x0eproxy_metadata\x18\x18 \x03(\x0b\x32\x33.istio.mesh.v1alpha1.ProxyConfig.ProxyMetadataEntry\x12\x13\n\x0bstatus_port\x18\x1a \x01(\x05\x12\x17\n\x0f\x65xtra_stat_tags\x18\x1b \x03(\t\x12\x37\n\x10gateway_topology\x18\x1c \x01(\x0b\x32\x1d.istio.mesh.v1alpha1.Topology\x12=\n\x1atermination_drain_duration\x18\x1d \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x0f\n\x07mesh_id\x18\x1e \x01(\t\x1a\x34\n\x12ProxyMetadataEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"3\n\x17InboundInterceptionMode\x12\x0c\n\x08REDIRECT\x10\x00\x12\n\n\x06TPROXY\x10\x01J\x04\x08\t\x10\nR\x0f\x63onnect_timeout\"\xc7\x01\n\rRemoteService\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x42\n\x0ctls_settings\x18\x02 \x01(\x0b\x32,.istio.networking.v1alpha3.ClientTLSSettings\x12\x61\n\rtcp_keepalive\x18\x03 \x01(\x0b\x32J.istio.networking.v1alpha3.ConnectionPoolSettings.TCPSettings.TcpKeepalive*>\n\x14\x41uthenticationPolicy\x12\x08\n\x04NONE\x10\x00\x12\x0e\n\nMUTUAL_TLS\x10\x01\x12\x0c\n\x07INHERIT\x10\xe8\x07\x42\x1cZ\x1aistio.io/api/mesh/v1alpha1b\x06proto3') + serialized_pb=_b('\n\x19mesh/v1alpha1/proxy.proto\x12\x13istio.mesh.v1alpha1\x1a\x1egoogle/protobuf/duration.proto\x1a\x1egoogle/protobuf/wrappers.proto\x1a*networking/v1alpha3/destination_rule.proto\"\xa4\r\n\x07Tracing\x12\x35\n\x06zipkin\x18\x01 \x01(\x0b\x32#.istio.mesh.v1alpha1.Tracing.ZipkinH\x00\x12;\n\tlightstep\x18\x02 \x01(\x0b\x32&.istio.mesh.v1alpha1.Tracing.LightstepH\x00\x12\x37\n\x07\x64\x61tadog\x18\x03 \x01(\x0b\x32$.istio.mesh.v1alpha1.Tracing.DatadogH\x00\x12?\n\x0bstackdriver\x18\x04 \x01(\x0b\x32(.istio.mesh.v1alpha1.Tracing.StackdriverH\x00\x12I\n\x11open_census_agent\x18\t \x01(\x0b\x32,.istio.mesh.v1alpha1.Tracing.OpenCensusAgentH\x00\x12\x41\n\x0b\x63ustom_tags\x18\x05 \x03(\x0b\x32,.istio.mesh.v1alpha1.Tracing.CustomTagsEntry\x12\x1b\n\x13max_path_tag_length\x18\x06 \x01(\r\x12\x10\n\x08sampling\x18\x07 \x01(\x01\x12\x42\n\x0ctls_settings\x18\x08 \x01(\x0b\x32,.istio.networking.v1alpha3.ClientTLSSettings\x1a\x19\n\x06Zipkin\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x1a\x32\n\tLightstep\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x14\n\x0c\x61\x63\x63\x65ss_token\x18\x02 \x01(\t\x1a\x1a\n\x07\x44\x61tadog\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x1a\xde\x01\n\x0bStackdriver\x12\r\n\x05\x64\x65\x62ug\x18\x01 \x01(\x08\x12=\n\x18max_number_of_attributes\x18\x02 \x01(\x0b\x32\x1b.google.protobuf.Int64Value\x12>\n\x19max_number_of_annotations\x18\x03 \x01(\x0b\x32\x1b.google.protobuf.Int64Value\x12\x41\n\x1cmax_number_of_message_events\x18\x04 \x01(\x0b\x32\x1b.google.protobuf.Int64Value\x1a\xa6\x03\n\x0fOpenCensusAgent\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12J\n\x07\x63ontext\x18\x02 \x03(\x0e\x32\x39.istio.mesh.v1alpha1.Tracing.OpenCensusAgent.TraceContext\x12\r\n\x05\x64\x65\x62ug\x18\x03 \x01(\x08\x12=\n\x18max_number_of_attributes\x18\x04 \x01(\x0b\x32\x1b.google.protobuf.Int64Value\x12>\n\x19max_number_of_annotations\x18\x05 \x01(\x0b\x32\x1b.google.protobuf.Int64Value\x12\x41\n\x1cmax_number_of_message_events\x18\x06 \x01(\x0b\x32\x1b.google.protobuf.Int64Value\"e\n\x0cTraceContext\x12\x0f\n\x0bUNSPECIFIED\x10\x00\x12\x15\n\x11W3C_TRACE_CONTEXT\x10\x01\x12\x0c\n\x08GRPC_BIN\x10\x02\x12\x17\n\x13\x43LOUD_TRACE_CONTEXT\x10\x03\x12\x06\n\x02\x42\x33\x10\x04\x1a\xcb\x01\n\tCustomTag\x12\x37\n\x07literal\x18\x01 \x01(\x0b\x32$.istio.mesh.v1alpha1.Tracing.LiteralH\x00\x12?\n\x0b\x65nvironment\x18\x02 \x01(\x0b\x32(.istio.mesh.v1alpha1.Tracing.EnvironmentH\x00\x12<\n\x06header\x18\x03 \x01(\x0b\x32*.istio.mesh.v1alpha1.Tracing.RequestHeaderH\x00\x42\x06\n\x04type\x1a\x18\n\x07Literal\x12\r\n\x05value\x18\x01 \x01(\t\x1a\x32\n\x0b\x45nvironment\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x15\n\rdefault_value\x18\x02 \x01(\t\x1a\x34\n\rRequestHeader\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x15\n\rdefault_value\x18\x02 \x01(\t\x1aY\n\x0f\x43ustomTagsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x35\n\x05value\x18\x02 \x01(\x0b\x32&.istio.mesh.v1alpha1.Tracing.CustomTag:\x02\x38\x01\x42\x08\n\x06tracer\"/\n\x03SDS\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\x12\x17\n\x0fk8s_sa_jwt_path\x18\x02 \x01(\t\"\x8f\x02\n\x08Topology\x12\x1b\n\x13num_trusted_proxies\x18\x01 \x01(\r\x12[\n\x1b\x66orward_client_cert_details\x18\x02 \x01(\x0e\x32\x36.istio.mesh.v1alpha1.Topology.ForwardClientCertDetails\"\x88\x01\n\x18\x46orwardClientCertDetails\x12\r\n\tUNDEFINED\x10\x00\x12\x0c\n\x08SANITIZE\x10\x01\x12\x10\n\x0c\x46ORWARD_ONLY\x10\x02\x12\x12\n\x0e\x41PPEND_FORWARD\x10\x03\x12\x10\n\x0cSANITIZE_SET\x10\x04\x12\x17\n\x13\x41LWAYS_FORWARD_ONLY\x10\x05\"\xce\n\n\x0bProxyConfig\x12\x13\n\x0b\x63onfig_path\x18\x01 \x01(\t\x12\x13\n\x0b\x62inary_path\x18\x02 \x01(\t\x12\x17\n\x0fservice_cluster\x18\x03 \x01(\t\x12\x31\n\x0e\x64rain_duration\x18\x04 \x01(\x0b\x32\x19.google.protobuf.Duration\x12;\n\x18parent_shutdown_duration\x18\x05 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x19\n\x11\x64iscovery_address\x18\x06 \x01(\t\x12>\n\x17\x64iscovery_refresh_delay\x18\x07 \x01(\x0b\x32\x19.google.protobuf.DurationB\x02\x18\x01\x12\x1a\n\x0ezipkin_address\x18\x08 \x01(\tB\x02\x18\x01\x12\x1a\n\x12statsd_udp_address\x18\n \x01(\t\x12)\n\x1d\x65nvoy_metrics_service_address\x18\x14 \x01(\tB\x02\x18\x01\x12\x18\n\x10proxy_admin_port\x18\x0b \x01(\x05\x12\x1d\n\x11\x61vailability_zone\x18\x0c \x01(\tB\x02\x18\x01\x12L\n\x19\x63ontrol_plane_auth_policy\x18\r \x01(\x0e\x32).istio.mesh.v1alpha1.AuthenticationPolicy\x12\x1a\n\x12\x63ustom_config_file\x18\x0e \x01(\t\x12\x18\n\x10stat_name_length\x18\x0f \x01(\x05\x12\x30\n\x0b\x63oncurrency\x18\x10 \x01(\x0b\x32\x1b.google.protobuf.Int32Value\x12%\n\x1dproxy_bootstrap_template_path\x18\x11 \x01(\t\x12S\n\x11interception_mode\x18\x12 \x01(\x0e\x32\x38.istio.mesh.v1alpha1.ProxyConfig.InboundInterceptionMode\x12-\n\x07tracing\x18\x13 \x01(\x0b\x32\x1c.istio.mesh.v1alpha1.Tracing\x12%\n\x03sds\x18\x15 \x01(\x0b\x32\x18.istio.mesh.v1alpha1.SDS\x12\x44\n\x18\x65nvoy_access_log_service\x18\x16 \x01(\x0b\x32\".istio.mesh.v1alpha1.RemoteService\x12\x41\n\x15\x65nvoy_metrics_service\x18\x17 \x01(\x0b\x32\".istio.mesh.v1alpha1.RemoteService\x12K\n\x0eproxy_metadata\x18\x18 \x03(\x0b\x32\x33.istio.mesh.v1alpha1.ProxyConfig.ProxyMetadataEntry\x12\x13\n\x0bstatus_port\x18\x1a \x01(\x05\x12\x17\n\x0f\x65xtra_stat_tags\x18\x1b \x03(\t\x12\x37\n\x10gateway_topology\x18\x1c \x01(\x0b\x32\x1d.istio.mesh.v1alpha1.Topology\x12=\n\x1atermination_drain_duration\x18\x1d \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x0f\n\x07mesh_id\x18\x1e \x01(\t\x1a\x34\n\x12ProxyMetadataEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"3\n\x17InboundInterceptionMode\x12\x0c\n\x08REDIRECT\x10\x00\x12\n\n\x06TPROXY\x10\x01J\x04\x08\t\x10\nR\x0f\x63onnect_timeout\"\xc7\x01\n\rRemoteService\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x42\n\x0ctls_settings\x18\x02 \x01(\x0b\x32,.istio.networking.v1alpha3.ClientTLSSettings\x12\x61\n\rtcp_keepalive\x18\x03 \x01(\x0b\x32J.istio.networking.v1alpha3.ConnectionPoolSettings.TCPSettings.TcpKeepalive*>\n\x14\x41uthenticationPolicy\x12\x08\n\x04NONE\x10\x00\x12\x0e\n\nMUTUAL_TLS\x10\x01\x12\x0c\n\x07INHERIT\x10\xe8\x07\x42\x1cZ\x1aistio.io/api/mesh/v1alpha1b\x06proto3') , dependencies=[google_dot_protobuf_dot_duration__pb2.DESCRIPTOR,google_dot_protobuf_dot_wrappers__pb2.DESCRIPTOR,networking_dot_v1alpha3_dot_destination__rule__pb2.DESCRIPTOR,]) @@ -49,8 +49,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=3552, - serialized_end=3614, + serialized_start=3747, + serialized_end=3809, ) _sym_db.RegisterEnumDescriptor(_AUTHENTICATIONPOLICY) @@ -60,6 +60,40 @@ INHERIT = 1000 +_TRACING_OPENCENSUSAGENT_TRACECONTEXT = _descriptor.EnumDescriptor( + name='TraceContext', + full_name='istio.mesh.v1alpha1.Tracing.OpenCensusAgent.TraceContext', + filename=None, + file=DESCRIPTOR, + values=[ + _descriptor.EnumValueDescriptor( + name='UNSPECIFIED', index=0, number=0, + serialized_options=None, + type=None), + _descriptor.EnumValueDescriptor( + name='W3C_TRACE_CONTEXT', index=1, number=1, + serialized_options=None, + type=None), + _descriptor.EnumValueDescriptor( + name='GRPC_BIN', index=2, number=2, + serialized_options=None, + type=None), + _descriptor.EnumValueDescriptor( + name='CLOUD_TRACE_CONTEXT', index=3, number=3, + serialized_options=None, + type=None), + _descriptor.EnumValueDescriptor( + name='B3', index=4, number=4, + serialized_options=None, + type=None), + ], + containing_type=None, + serialized_options=None, + serialized_start=1319, + serialized_end=1420, +) +_sym_db.RegisterEnumDescriptor(_TRACING_OPENCENSUSAGENT_TRACECONTEXT) + _TOPOLOGY_FORWARDCLIENTCERTDETAILS = _descriptor.EnumDescriptor( name='ForwardClientCertDetails', full_name='istio.mesh.v1alpha1.Topology.ForwardClientCertDetails', @@ -93,8 +127,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=1851, - serialized_end=1987, + serialized_start=2046, + serialized_end=2182, ) _sym_db.RegisterEnumDescriptor(_TOPOLOGY_FORWARDCLIENTCERTDETAILS) @@ -115,8 +149,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=3274, - serialized_end=3325, + serialized_start=3469, + serialized_end=3520, ) _sym_db.RegisterEnumDescriptor(_PROXYCONFIG_INBOUNDINTERCEPTIONMODE) @@ -147,8 +181,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=654, - serialized_end=679, + serialized_start=665, + serialized_end=690, ) _TRACING_LIGHTSTEP = _descriptor.Descriptor( @@ -184,8 +218,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=681, - serialized_end=731, + serialized_start=692, + serialized_end=742, ) _TRACING_DATADOG = _descriptor.Descriptor( @@ -214,8 +248,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=733, - serialized_end=759, + serialized_start=744, + serialized_end=770, ) _TRACING_STACKDRIVER = _descriptor.Descriptor( @@ -265,57 +299,65 @@ extension_ranges=[], oneofs=[ ], - serialized_start=762, - serialized_end=984, + serialized_start=773, + serialized_end=995, ) -_TRACING_OPENCENSUS = _descriptor.Descriptor( - name='OpenCensus', - full_name='istio.mesh.v1alpha1.Tracing.OpenCensus', +_TRACING_OPENCENSUSAGENT = _descriptor.Descriptor( + name='OpenCensusAgent', + full_name='istio.mesh.v1alpha1.Tracing.OpenCensusAgent', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='address', full_name='istio.mesh.v1alpha1.Tracing.OpenCensus.address', index=0, + name='address', full_name='istio.mesh.v1alpha1.Tracing.OpenCensusAgent.address', index=0, number=1, type=9, cpp_type=9, label=1, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='debug', full_name='istio.mesh.v1alpha1.Tracing.OpenCensus.debug', index=1, - number=2, type=8, cpp_type=7, label=1, - has_default_value=False, default_value=False, + name='context', full_name='istio.mesh.v1alpha1.Tracing.OpenCensusAgent.context', index=1, + number=2, type=14, cpp_type=8, label=3, + has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='max_number_of_attributes', full_name='istio.mesh.v1alpha1.Tracing.OpenCensus.max_number_of_attributes', index=2, - number=3, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, + name='debug', full_name='istio.mesh.v1alpha1.Tracing.OpenCensusAgent.debug', index=2, + number=3, type=8, cpp_type=7, label=1, + has_default_value=False, default_value=False, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='max_number_of_annotations', full_name='istio.mesh.v1alpha1.Tracing.OpenCensus.max_number_of_annotations', index=3, + name='max_number_of_attributes', full_name='istio.mesh.v1alpha1.Tracing.OpenCensusAgent.max_number_of_attributes', index=3, number=4, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='max_number_of_message_events', full_name='istio.mesh.v1alpha1.Tracing.OpenCensus.max_number_of_message_events', index=4, + name='max_number_of_annotations', full_name='istio.mesh.v1alpha1.Tracing.OpenCensusAgent.max_number_of_annotations', index=4, number=5, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='max_number_of_message_events', full_name='istio.mesh.v1alpha1.Tracing.OpenCensusAgent.max_number_of_message_events', index=5, + number=6, type=11, cpp_type=10, label=1, + has_default_value=False, default_value=None, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), ], extensions=[ ], nested_types=[], enum_types=[ + _TRACING_OPENCENSUSAGENT_TRACECONTEXT, ], serialized_options=None, is_extendable=False, @@ -323,8 +365,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=987, - serialized_end=1225, + serialized_start=998, + serialized_end=1420, ) _TRACING_CUSTOMTAG = _descriptor.Descriptor( @@ -370,8 +412,8 @@ name='type', full_name='istio.mesh.v1alpha1.Tracing.CustomTag.type', index=0, containing_type=None, fields=[]), ], - serialized_start=1228, - serialized_end=1431, + serialized_start=1423, + serialized_end=1626, ) _TRACING_LITERAL = _descriptor.Descriptor( @@ -400,8 +442,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1433, - serialized_end=1457, + serialized_start=1628, + serialized_end=1652, ) _TRACING_ENVIRONMENT = _descriptor.Descriptor( @@ -437,8 +479,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1459, - serialized_end=1509, + serialized_start=1654, + serialized_end=1704, ) _TRACING_REQUESTHEADER = _descriptor.Descriptor( @@ -474,8 +516,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1511, - serialized_end=1563, + serialized_start=1706, + serialized_end=1758, ) _TRACING_CUSTOMTAGSENTRY = _descriptor.Descriptor( @@ -511,8 +553,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1565, - serialized_end=1654, + serialized_start=1760, + serialized_end=1849, ) _TRACING = _descriptor.Descriptor( @@ -551,7 +593,7 @@ is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='open_census', full_name='istio.mesh.v1alpha1.Tracing.open_census', index=4, + name='open_census_agent', full_name='istio.mesh.v1alpha1.Tracing.open_census_agent', index=4, number=9, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, @@ -588,7 +630,7 @@ ], extensions=[ ], - nested_types=[_TRACING_ZIPKIN, _TRACING_LIGHTSTEP, _TRACING_DATADOG, _TRACING_STACKDRIVER, _TRACING_OPENCENSUS, _TRACING_CUSTOMTAG, _TRACING_LITERAL, _TRACING_ENVIRONMENT, _TRACING_REQUESTHEADER, _TRACING_CUSTOMTAGSENTRY, ], + nested_types=[_TRACING_ZIPKIN, _TRACING_LIGHTSTEP, _TRACING_DATADOG, _TRACING_STACKDRIVER, _TRACING_OPENCENSUSAGENT, _TRACING_CUSTOMTAG, _TRACING_LITERAL, _TRACING_ENVIRONMENT, _TRACING_REQUESTHEADER, _TRACING_CUSTOMTAGSENTRY, ], enum_types=[ ], serialized_options=None, @@ -601,7 +643,7 @@ index=0, containing_type=None, fields=[]), ], serialized_start=159, - serialized_end=1664, + serialized_end=1859, ) @@ -638,8 +680,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1666, - serialized_end=1713, + serialized_start=1861, + serialized_end=1908, ) @@ -677,8 +719,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1716, - serialized_end=1987, + serialized_start=1911, + serialized_end=2182, ) @@ -715,8 +757,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3220, - serialized_end=3272, + serialized_start=3415, + serialized_end=3467, ) _PROXYCONFIG = _descriptor.Descriptor( @@ -935,8 +977,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1990, - serialized_end=3348, + serialized_start=2185, + serialized_end=3543, ) @@ -980,8 +1022,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3351, - serialized_end=3550, + serialized_start=3546, + serialized_end=3745, ) _TRACING_ZIPKIN.containing_type = _TRACING @@ -991,10 +1033,12 @@ _TRACING_STACKDRIVER.fields_by_name['max_number_of_annotations'].message_type = google_dot_protobuf_dot_wrappers__pb2._INT64VALUE _TRACING_STACKDRIVER.fields_by_name['max_number_of_message_events'].message_type = google_dot_protobuf_dot_wrappers__pb2._INT64VALUE _TRACING_STACKDRIVER.containing_type = _TRACING -_TRACING_OPENCENSUS.fields_by_name['max_number_of_attributes'].message_type = google_dot_protobuf_dot_wrappers__pb2._INT64VALUE -_TRACING_OPENCENSUS.fields_by_name['max_number_of_annotations'].message_type = google_dot_protobuf_dot_wrappers__pb2._INT64VALUE -_TRACING_OPENCENSUS.fields_by_name['max_number_of_message_events'].message_type = google_dot_protobuf_dot_wrappers__pb2._INT64VALUE -_TRACING_OPENCENSUS.containing_type = _TRACING +_TRACING_OPENCENSUSAGENT.fields_by_name['context'].enum_type = _TRACING_OPENCENSUSAGENT_TRACECONTEXT +_TRACING_OPENCENSUSAGENT.fields_by_name['max_number_of_attributes'].message_type = google_dot_protobuf_dot_wrappers__pb2._INT64VALUE +_TRACING_OPENCENSUSAGENT.fields_by_name['max_number_of_annotations'].message_type = google_dot_protobuf_dot_wrappers__pb2._INT64VALUE +_TRACING_OPENCENSUSAGENT.fields_by_name['max_number_of_message_events'].message_type = google_dot_protobuf_dot_wrappers__pb2._INT64VALUE +_TRACING_OPENCENSUSAGENT.containing_type = _TRACING +_TRACING_OPENCENSUSAGENT_TRACECONTEXT.containing_type = _TRACING_OPENCENSUSAGENT _TRACING_CUSTOMTAG.fields_by_name['literal'].message_type = _TRACING_LITERAL _TRACING_CUSTOMTAG.fields_by_name['environment'].message_type = _TRACING_ENVIRONMENT _TRACING_CUSTOMTAG.fields_by_name['header'].message_type = _TRACING_REQUESTHEADER @@ -1017,7 +1061,7 @@ _TRACING.fields_by_name['lightstep'].message_type = _TRACING_LIGHTSTEP _TRACING.fields_by_name['datadog'].message_type = _TRACING_DATADOG _TRACING.fields_by_name['stackdriver'].message_type = _TRACING_STACKDRIVER -_TRACING.fields_by_name['open_census'].message_type = _TRACING_OPENCENSUS +_TRACING.fields_by_name['open_census_agent'].message_type = _TRACING_OPENCENSUSAGENT _TRACING.fields_by_name['custom_tags'].message_type = _TRACING_CUSTOMTAGSENTRY _TRACING.fields_by_name['tls_settings'].message_type = networking_dot_v1alpha3_dot_destination__rule__pb2._CLIENTTLSSETTINGS _TRACING.oneofs_by_name['tracer'].fields.append( @@ -1033,8 +1077,8 @@ _TRACING.fields_by_name['stackdriver']) _TRACING.fields_by_name['stackdriver'].containing_oneof = _TRACING.oneofs_by_name['tracer'] _TRACING.oneofs_by_name['tracer'].fields.append( - _TRACING.fields_by_name['open_census']) -_TRACING.fields_by_name['open_census'].containing_oneof = _TRACING.oneofs_by_name['tracer'] + _TRACING.fields_by_name['open_census_agent']) +_TRACING.fields_by_name['open_census_agent'].containing_oneof = _TRACING.oneofs_by_name['tracer'] _TOPOLOGY.fields_by_name['forward_client_cert_details'].enum_type = _TOPOLOGY_FORWARDCLIENTCERTDETAILS _TOPOLOGY_FORWARDCLIENTCERTDETAILS.containing_type = _TOPOLOGY _PROXYCONFIG_PROXYMETADATAENTRY.containing_type = _PROXYCONFIG @@ -1092,10 +1136,10 @@ }) , - 'OpenCensus' : _reflection.GeneratedProtocolMessageType('OpenCensus', (_message.Message,), { - 'DESCRIPTOR' : _TRACING_OPENCENSUS, + 'OpenCensusAgent' : _reflection.GeneratedProtocolMessageType('OpenCensusAgent', (_message.Message,), { + 'DESCRIPTOR' : _TRACING_OPENCENSUSAGENT, '__module__' : 'mesh.v1alpha1.proxy_pb2' - # @@protoc_insertion_point(class_scope:istio.mesh.v1alpha1.Tracing.OpenCensus) + # @@protoc_insertion_point(class_scope:istio.mesh.v1alpha1.Tracing.OpenCensusAgent) }) , @@ -1142,7 +1186,7 @@ _sym_db.RegisterMessage(Tracing.Lightstep) _sym_db.RegisterMessage(Tracing.Datadog) _sym_db.RegisterMessage(Tracing.Stackdriver) -_sym_db.RegisterMessage(Tracing.OpenCensus) +_sym_db.RegisterMessage(Tracing.OpenCensusAgent) _sym_db.RegisterMessage(Tracing.CustomTag) _sym_db.RegisterMessage(Tracing.Literal) _sym_db.RegisterMessage(Tracing.Environment) From c80e2983ca65c49a5a1f897050e85096d5430d7b Mon Sep 17 00:00:00 2001 From: Brian Wolfe Date: Tue, 4 Aug 2020 20:57:37 -0700 Subject: [PATCH 3/3] tracing: update docs to include envoy proto link The existing documentation for Stackdriver and OpenCensus reference the OpenCensus configuration. We should reference both the Envoy OpenCensus tracer configuration and the OpenCensus configuration. Change-Id: Ia3fcbc879e2e15f90a56959cf97fe30b57211782 Reviewed-on: https://gerrit.musta.ch/c/public/istio-api/+/582 Reviewed-by: Ying Zhu Reviewed-by: Jungho Ahn --- mesh/v1alpha1/istio.mesh.v1alpha1.gen.json | 4 ++-- mesh/v1alpha1/istio.mesh.v1alpha1.pb.html | 6 +++++- mesh/v1alpha1/proxy.pb.go | 6 +++++- mesh/v1alpha1/proxy.proto | 6 +++++- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/mesh/v1alpha1/istio.mesh.v1alpha1.gen.json b/mesh/v1alpha1/istio.mesh.v1alpha1.gen.json index 23c1fed088..926f521a9b 100644 --- a/mesh/v1alpha1/istio.mesh.v1alpha1.gen.json +++ b/mesh/v1alpha1/istio.mesh.v1alpha1.gen.json @@ -868,7 +868,7 @@ } }, "istio.mesh.v1alpha1.Tracing.Stackdriver": { - "description": "Stackdriver defines configuration for a Stackdriver tracer. See [OpenCensus trace config](https://github.com/census-instrumentation/opencensus-proto/blob/master/src/opencensus/proto/trace/v1/trace_config.proto) for details.", + "description": "Stackdriver defines configuration for a Stackdriver tracer. See [Envoy's OpenCensus trace configuration](https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/trace/v3/opencensus.proto) and [OpenCensus trace config](https://github.com/census-instrumentation/opencensus-proto/blob/master/src/opencensus/proto/trace/v1/trace_config.proto) for details.", "type": "object", "properties": { "debug": { @@ -893,7 +893,7 @@ } }, "istio.mesh.v1alpha1.Tracing.OpenCensusAgent": { - "description": "OpenCensusAgent defines configuration for an OpenCensus tracer writing to an OpenCensus agent backend. See [OpenCensus trace config](https://github.com/census-instrumentation/opencensus-proto/blob/master/src/opencensus/proto/trace/v1/trace_config.proto) for details.", + "description": "OpenCensusAgent defines configuration for an OpenCensus tracer writing to an OpenCensus agent backend. See [Envoy's OpenCensus trace configuration](https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/trace/v3/opencensus.proto) and [OpenCensus trace config](https://github.com/census-instrumentation/opencensus-proto/blob/master/src/opencensus/proto/trace/v1/trace_config.proto) for details.", "type": "object", "properties": { "context": { diff --git a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html index 13791befdb..15fd57650b 100644 --- a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html +++ b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html @@ -600,7 +600,9 @@

Tracing.Datadog

Tracing.Stackdriver

Stackdriver defines configuration for a Stackdriver tracer. -See OpenCensus trace config for details.

+See Envoy’s OpenCensus trace configuration +and +OpenCensus trace config for details.

NameDescription
W3C_TRACE_CONTEXT +

Use W3C Trace Context propagation using the traceparent HTTP header. +See the +Trace Context documentation for details.

+ +
GRPC_BIN +

Use gRPC binary context propagation using the grpc-trace-bin http header.

+ +
CLOUD_TRACE_CONTEXT +

Use Cloud Trace context propagation using the +X-Cloud-Trace-Context http header.

+ +
B3 +

Use multi-header B3 context propagation using the X-B3-TraceId, +X-B3-SpanId, and X-B3-Sampled HTTP headers. See +B3 header propagation README +for details.

+
@@ -619,6 +621,8 @@

Tracing.OpenCensusAgent

OpenCensusAgent defines configuration for an OpenCensus tracer writing to an OpenCensus agent backend. See +Envoy’s OpenCensus trace configuration +and OpenCensus trace config for details.

diff --git a/mesh/v1alpha1/proxy.pb.go b/mesh/v1alpha1/proxy.pb.go index 75afb1f9b2..3c9aef4aba 100644 --- a/mesh/v1alpha1/proxy.pb.go +++ b/mesh/v1alpha1/proxy.pb.go @@ -536,7 +536,9 @@ func (m *Tracing_Datadog) GetAddress() string { } // Stackdriver defines configuration for a Stackdriver tracer. -// See [OpenCensus trace config](https://github.com/census-instrumentation/opencensus-proto/blob/master/src/opencensus/proto/trace/v1/trace_config.proto) for details. +// See [Envoy's OpenCensus trace configuration](https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/trace/v3/opencensus.proto) +// and +// [OpenCensus trace config](https://github.com/census-instrumentation/opencensus-proto/blob/master/src/opencensus/proto/trace/v1/trace_config.proto) for details. type Tracing_Stackdriver struct { // debug enables trace output to stdout. // $hide_from_docs @@ -621,6 +623,8 @@ func (m *Tracing_Stackdriver) GetMaxNumberOfMessageEvents() *types.Int64Value { // OpenCensusAgent defines configuration for an OpenCensus tracer writing to // an OpenCensus agent backend. See +// [Envoy's OpenCensus trace configuration](https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/trace/v3/opencensus.proto) +// and // [OpenCensus trace config](https://github.com/census-instrumentation/opencensus-proto/blob/master/src/opencensus/proto/trace/v1/trace_config.proto) // for details. type Tracing_OpenCensusAgent struct { diff --git a/mesh/v1alpha1/proxy.proto b/mesh/v1alpha1/proxy.proto index e72e021736..9792e6de6f 100644 --- a/mesh/v1alpha1/proxy.proto +++ b/mesh/v1alpha1/proxy.proto @@ -62,7 +62,9 @@ message Tracing { } // Stackdriver defines configuration for a Stackdriver tracer. - // See [OpenCensus trace config](https://github.com/census-instrumentation/opencensus-proto/blob/master/src/opencensus/proto/trace/v1/trace_config.proto) for details. + // See [Envoy's OpenCensus trace configuration](https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/trace/v3/opencensus.proto) + // and + // [OpenCensus trace config](https://github.com/census-instrumentation/opencensus-proto/blob/master/src/opencensus/proto/trace/v1/trace_config.proto) for details. message Stackdriver { // debug enables trace output to stdout. // $hide_from_docs @@ -83,6 +85,8 @@ message Tracing { // OpenCensusAgent defines configuration for an OpenCensus tracer writing to // an OpenCensus agent backend. See + // [Envoy's OpenCensus trace configuration](https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/trace/v3/opencensus.proto) + // and // [OpenCensus trace config](https://github.com/census-instrumentation/opencensus-proto/blob/master/src/opencensus/proto/trace/v1/trace_config.proto) // for details. message OpenCensusAgent {