diff --git a/CHANGELOG.md b/CHANGELOG.md
index 841ed03a39e..6c8988e455f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,7 +28,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
   - `EmptySpanContext` is removed.
 - Move the `go.opentelemetry.io/otel/api/trace/tracetest` package into `go.opentelemetry.io/otel/oteltest`. (#1229)
 - OTLP Exporter updates:
-  - supports OTLP v0.5.0 (#1230)
+  - supports OTLP v0.6.0 (#1230, #1354)
   - supports configurable aggregation temporality (default: Cumulative, optional: Stateless). (#1296)
 - The Sampler is now called on local child spans. (#1233)
 - The `Kind` type from the `go.opentelemetry.io/otel/api/metric` package was renamed to `InstrumentKind` to more specifically describe what it is and avoid semantic ambiguity. (#1240)
diff --git a/exporters/otlp/internal/opentelemetry-proto b/exporters/otlp/internal/opentelemetry-proto
index 313a868be25..59c488bfb8f 160000
--- a/exporters/otlp/internal/opentelemetry-proto
+++ b/exporters/otlp/internal/opentelemetry-proto
@@ -1 +1 @@
-Subproject commit 313a868be259dce6c6516dd417d3ad5fd3321acf
+Subproject commit 59c488bfb8fb6d0458ad6425758b70259ff4a2bd
diff --git a/exporters/otlp/internal/opentelemetry-proto-gen/collector/trace/v1/trace_config.pb.go b/exporters/otlp/internal/opentelemetry-proto-gen/collector/trace/v1/trace_config.pb.go
index da1bb875198..4b88106bf6e 100644
--- a/exporters/otlp/internal/opentelemetry-proto-gen/collector/trace/v1/trace_config.pb.go
+++ b/exporters/otlp/internal/opentelemetry-proto-gen/collector/trace/v1/trace_config.pb.go
@@ -62,7 +62,7 @@ type TraceConfig struct {
 	//
 	// Types that are valid to be assigned to Sampler:
 	//	*TraceConfig_ConstantSampler
-	//	*TraceConfig_ProbabilitySampler
+	//	*TraceConfig_TraceIdRatioBased
 	//	*TraceConfig_RateLimitingSampler
 	Sampler isTraceConfig_Sampler `protobuf_oneof:"sampler"`
 	// The global default max number of attributes per span.
@@ -122,15 +122,15 @@ type isTraceConfig_Sampler interface {
 type TraceConfig_ConstantSampler struct {
 	ConstantSampler *ConstantSampler `protobuf:"bytes,1,opt,name=constant_sampler,json=constantSampler,proto3,oneof" json:"constant_sampler,omitempty"`
 }
-type TraceConfig_ProbabilitySampler struct {
-	ProbabilitySampler *ProbabilitySampler `protobuf:"bytes,2,opt,name=probability_sampler,json=probabilitySampler,proto3,oneof" json:"probability_sampler,omitempty"`
+type TraceConfig_TraceIdRatioBased struct {
+	TraceIdRatioBased *TraceIdRatioBased `protobuf:"bytes,2,opt,name=trace_id_ratio_based,json=traceIdRatioBased,proto3,oneof" json:"trace_id_ratio_based,omitempty"`
 }
 type TraceConfig_RateLimitingSampler struct {
 	RateLimitingSampler *RateLimitingSampler `protobuf:"bytes,3,opt,name=rate_limiting_sampler,json=rateLimitingSampler,proto3,oneof" json:"rate_limiting_sampler,omitempty"`
 }
 
 func (*TraceConfig_ConstantSampler) isTraceConfig_Sampler()     {}
-func (*TraceConfig_ProbabilitySampler) isTraceConfig_Sampler()  {}
+func (*TraceConfig_TraceIdRatioBased) isTraceConfig_Sampler()   {}
 func (*TraceConfig_RateLimitingSampler) isTraceConfig_Sampler() {}
 
 func (m *TraceConfig) GetSampler() isTraceConfig_Sampler {
@@ -147,9 +147,9 @@ func (m *TraceConfig) GetConstantSampler() *ConstantSampler {
 	return nil
 }
 
-func (m *TraceConfig) GetProbabilitySampler() *ProbabilitySampler {
-	if x, ok := m.GetSampler().(*TraceConfig_ProbabilitySampler); ok {
-		return x.ProbabilitySampler
+func (m *TraceConfig) GetTraceIdRatioBased() *TraceIdRatioBased {
+	if x, ok := m.GetSampler().(*TraceConfig_TraceIdRatioBased); ok {
+		return x.TraceIdRatioBased
 	}
 	return nil
 }
@@ -200,7 +200,7 @@ func (m *TraceConfig) GetMaxNumberOfAttributesPerLink() int64 {
 func (*TraceConfig) XXX_OneofWrappers() []interface{} {
 	return []interface{}{
 		(*TraceConfig_ConstantSampler)(nil),
-		(*TraceConfig_ProbabilitySampler)(nil),
+		(*TraceConfig_TraceIdRatioBased)(nil),
 		(*TraceConfig_RateLimitingSampler)(nil),
 	}
 }
@@ -253,28 +253,28 @@ func (m *ConstantSampler) GetDecision() ConstantSampler_ConstantDecision {
 	return ConstantSampler_ALWAYS_OFF
 }
 
-// Sampler that tries to uniformly sample traces with a given probability.
-// The probability of sampling a trace is equal to that of the specified probability.
-type ProbabilitySampler struct {
-	// The desired probability of sampling. Must be within [0.0, 1.0].
-	SamplingProbability  float64  `protobuf:"fixed64,1,opt,name=samplingProbability,proto3" json:"samplingProbability,omitempty"`
+// Sampler that tries to uniformly sample traces with a given ratio.
+// The ratio of sampling a trace is equal to that of the specified ratio.
+type TraceIdRatioBased struct {
+	// The desired ratio of sampling. Must be within [0.0, 1.0].
+	SamplingRatio        float64  `protobuf:"fixed64,1,opt,name=samplingRatio,proto3" json:"samplingRatio,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ProbabilitySampler) Reset()         { *m = ProbabilitySampler{} }
-func (m *ProbabilitySampler) String() string { return proto.CompactTextString(m) }
-func (*ProbabilitySampler) ProtoMessage()    {}
-func (*ProbabilitySampler) Descriptor() ([]byte, []int) {
+func (m *TraceIdRatioBased) Reset()         { *m = TraceIdRatioBased{} }
+func (m *TraceIdRatioBased) String() string { return proto.CompactTextString(m) }
+func (*TraceIdRatioBased) ProtoMessage()    {}
+func (*TraceIdRatioBased) Descriptor() ([]byte, []int) {
 	return fileDescriptor_5936aa8fa6443e6f, []int{2}
 }
-func (m *ProbabilitySampler) XXX_Unmarshal(b []byte) error {
+func (m *TraceIdRatioBased) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *ProbabilitySampler) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *TraceIdRatioBased) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_ProbabilitySampler.Marshal(b, m, deterministic)
+		return xxx_messageInfo_TraceIdRatioBased.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -284,21 +284,21 @@ func (m *ProbabilitySampler) XXX_Marshal(b []byte, deterministic bool) ([]byte,
 		return b[:n], nil
 	}
 }
-func (m *ProbabilitySampler) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProbabilitySampler.Merge(m, src)
+func (m *TraceIdRatioBased) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TraceIdRatioBased.Merge(m, src)
 }
-func (m *ProbabilitySampler) XXX_Size() int {
+func (m *TraceIdRatioBased) XXX_Size() int {
 	return m.Size()
 }
-func (m *ProbabilitySampler) XXX_DiscardUnknown() {
-	xxx_messageInfo_ProbabilitySampler.DiscardUnknown(m)
+func (m *TraceIdRatioBased) XXX_DiscardUnknown() {
+	xxx_messageInfo_TraceIdRatioBased.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_ProbabilitySampler proto.InternalMessageInfo
+var xxx_messageInfo_TraceIdRatioBased proto.InternalMessageInfo
 
-func (m *ProbabilitySampler) GetSamplingProbability() float64 {
+func (m *TraceIdRatioBased) GetSamplingRatio() float64 {
 	if m != nil {
-		return m.SamplingProbability
+		return m.SamplingRatio
 	}
 	return 0
 }
@@ -356,7 +356,7 @@ func init() {
 	proto.RegisterEnum("opentelemetry.proto.trace.v1.ConstantSampler_ConstantDecision", ConstantSampler_ConstantDecision_name, ConstantSampler_ConstantDecision_value)
 	proto.RegisterType((*TraceConfig)(nil), "opentelemetry.proto.trace.v1.TraceConfig")
 	proto.RegisterType((*ConstantSampler)(nil), "opentelemetry.proto.trace.v1.ConstantSampler")
-	proto.RegisterType((*ProbabilitySampler)(nil), "opentelemetry.proto.trace.v1.ProbabilitySampler")
+	proto.RegisterType((*TraceIdRatioBased)(nil), "opentelemetry.proto.trace.v1.TraceIdRatioBased")
 	proto.RegisterType((*RateLimitingSampler)(nil), "opentelemetry.proto.trace.v1.RateLimitingSampler")
 }
 
@@ -365,41 +365,42 @@ func init() {
 }
 
 var fileDescriptor_5936aa8fa6443e6f = []byte{
-	// 538 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0xcd, 0x6e, 0xd3, 0x4e,
-	0x14, 0xc5, 0x3b, 0xcd, 0xbf, 0x5f, 0xb7, 0x6a, 0xeb, 0xff, 0x44, 0x45, 0x16, 0xaa, 0x42, 0xf1,
-	0x86, 0x6c, 0x12, 0x37, 0x65, 0x81, 0xc4, 0x02, 0x29, 0x69, 0x1b, 0x58, 0x44, 0x69, 0xe4, 0x46,
-	0x42, 0x84, 0x85, 0xe5, 0xb8, 0x37, 0xd6, 0x88, 0xf1, 0x8c, 0x19, 0x4f, 0xa3, 0xf4, 0x01, 0x78,
-	0x0d, 0x5e, 0x82, 0x97, 0x60, 0xc9, 0x23, 0xa0, 0x3c, 0x09, 0xf2, 0x24, 0x38, 0x9f, 0x8d, 0xc4,
-	0x6e, 0xee, 0x3d, 0x3e, 0xbf, 0x33, 0x63, 0x5f, 0x0f, 0xb8, 0x32, 0x41, 0xa1, 0x91, 0x63, 0x8c,
-	0x5a, 0x3d, 0xba, 0x89, 0x92, 0x5a, 0xba, 0x5a, 0x05, 0x21, 0xba, 0xc3, 0xda, 0x64, 0xe1, 0x87,
-	0x52, 0x0c, 0x58, 0x54, 0x35, 0x1a, 0x3d, 0x5b, 0x30, 0x4c, 0x9a, 0x55, 0xf3, 0x5c, 0x75, 0x58,
-	0x73, 0xbe, 0xed, 0xc0, 0x61, 0x37, 0x2b, 0xae, 0x8c, 0x87, 0xf6, 0xc0, 0x0a, 0xa5, 0x48, 0x75,
-	0x20, 0xb4, 0x9f, 0x06, 0x71, 0xc2, 0x51, 0xd9, 0xe4, 0x9c, 0x94, 0x0f, 0x2f, 0x2b, 0xd5, 0x4d,
-	0xa0, 0xea, 0xd5, 0xd4, 0x75, 0x37, 0x31, 0x7d, 0xd8, 0xf2, 0x4e, 0xc2, 0xc5, 0x16, 0x0d, 0xa1,
-	0x98, 0x28, 0xd9, 0x0f, 0xfa, 0x8c, 0x33, 0xfd, 0x98, 0xe3, 0xb7, 0x0d, 0xfe, 0x62, 0x33, 0xbe,
-	0x33, 0x33, 0xce, 0x12, 0x68, 0xb2, 0xd2, 0xa5, 0x11, 0x9c, 0xaa, 0x40, 0xa3, 0xcf, 0x59, 0xcc,
-	0x34, 0x13, 0x51, 0x1e, 0x53, 0x30, 0x31, 0xb5, 0xcd, 0x31, 0x5e, 0xa0, 0xb1, 0x35, 0x75, 0xce,
-	0x72, 0x8a, 0x6a, 0xb5, 0x4d, 0xdf, 0x80, 0x1d, 0x07, 0x23, 0x5f, 0x3c, 0xc4, 0x7d, 0x54, 0xbe,
-	0x1c, 0xf8, 0x81, 0xd6, 0x8a, 0xf5, 0x1f, 0x34, 0xa6, 0xf6, 0x7f, 0xe7, 0xa4, 0x5c, 0xf0, 0x4e,
-	0xe3, 0x60, 0xd4, 0x36, 0xf2, 0xed, 0xa0, 0x9e, 0x8b, 0xf4, 0x2d, 0x3c, 0x5f, 0x34, 0x6a, 0x16,
-	0xe3, 0xbd, 0x8f, 0x43, 0x14, 0x3a, 0xb5, 0x77, 0x8c, 0xf5, 0xd9, 0x9c, 0xb5, 0x9b, 0xc9, 0x37,
-	0x46, 0xa5, 0x5d, 0x28, 0x3f, 0x15, 0xea, 0x27, 0xa8, 0xe6, 0x51, 0xf6, 0xae, 0x21, 0x39, 0x6b,
-	0x37, 0xd1, 0x41, 0x35, 0xc3, 0xd2, 0x0a, 0x14, 0x17, 0xa9, 0x9c, 0x89, 0x2f, 0xa9, 0xbd, 0x67,
-	0x00, 0xd6, 0x1c, 0xa0, 0x95, 0xf5, 0xe9, 0x7b, 0x78, 0xb9, 0x71, 0x13, 0x99, 0xdb, 0xde, 0x37,
-	0xe6, 0xb3, 0xa7, 0xd2, 0x33, 0x52, 0xe3, 0x00, 0xf6, 0xa6, 0x5f, 0xc7, 0xf9, 0x41, 0xe0, 0x64,
-	0x69, 0x84, 0x68, 0x0f, 0xf6, 0xef, 0x31, 0x64, 0x29, 0x93, 0xc2, 0xcc, 0xe0, 0xf1, 0xe5, 0xbb,
-	0x7f, 0x9a, 0xc1, 0xbc, 0xbe, 0x9e, 0x52, 0xbc, 0x9c, 0xe7, 0x5c, 0x83, 0xb5, 0xac, 0xd2, 0x63,
-	0x80, 0x7a, 0xeb, 0x63, 0xfd, 0xd3, 0x9d, 0x7f, 0xdb, 0x6c, 0x5a, 0x5b, 0xf4, 0x08, 0x0e, 0xfe,
-	0xd6, 0x6d, 0x8b, 0xd0, 0xff, 0xe1, 0x68, 0x5a, 0x76, 0xea, 0xde, 0x4d, 0xbb, 0x6b, 0x6d, 0x3b,
-	0x4d, 0xa0, 0xab, 0x83, 0x49, 0x2f, 0xa0, 0x68, 0x8e, 0xc5, 0x44, 0x34, 0xa7, 0x9a, 0x23, 0x10,
-	0x6f, 0x9d, 0xe4, 0xbc, 0x82, 0xe2, 0x9a, 0xc9, 0xa3, 0x16, 0x14, 0xbe, 0x26, 0xa9, 0x31, 0x16,
-	0xbc, 0x6c, 0xd9, 0xf8, 0x4e, 0x7e, 0x8e, 0x4b, 0xe4, 0xd7, 0xb8, 0x44, 0x7e, 0x8f, 0x4b, 0x04,
-	0x5e, 0x30, 0xb9, 0xf1, 0x8d, 0x34, 0xac, 0xb9, 0x7f, 0xbb, 0x93, 0x49, 0x1d, 0xd2, 0xfb, 0x1c,
-	0x2d, 0x9b, 0x98, 0x74, 0xa5, 0x46, 0xee, 0xe2, 0x28, 0x91, 0x4a, 0xa3, 0x4a, 0x5d, 0xa9, 0x79,
-	0xe2, 0x32, 0xa1, 0x51, 0x89, 0x80, 0x2f, 0x5e, 0x39, 0x15, 0x13, 0x51, 0x89, 0x50, 0xb8, 0xa1,
-	0xe4, 0x1c, 0x43, 0x2d, 0x55, 0x7e, 0x01, 0xf5, 0x77, 0x8d, 0xfa, 0xfa, 0x4f, 0x00, 0x00, 0x00,
-	0xff, 0xff, 0x7f, 0x94, 0x6e, 0x93, 0xa7, 0x04, 0x00, 0x00,
+	// 548 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0xdf, 0x6e, 0x12, 0x41,
+	0x14, 0xc6, 0xbb, 0xc5, 0xfe, 0x3b, 0x4d, 0xdb, 0x65, 0xb0, 0x66, 0x63, 0x1a, 0xac, 0x1b, 0x13,
+	0xb9, 0x81, 0x0d, 0xf5, 0xc2, 0xe8, 0x85, 0x09, 0xf4, 0x8f, 0x35, 0x21, 0x94, 0x6c, 0x49, 0x8c,
+	0x78, 0x31, 0x19, 0x96, 0xc3, 0x66, 0xe2, 0xee, 0xcc, 0x3a, 0x3b, 0x25, 0x78, 0xef, 0x73, 0xf8,
+	0x12, 0xbe, 0x84, 0x97, 0x3e, 0x82, 0xe1, 0x49, 0xcc, 0x0e, 0x48, 0x59, 0xda, 0x92, 0x78, 0x37,
+	0xe7, 0xfb, 0xf8, 0x7d, 0xe7, 0x0c, 0x1c, 0x06, 0x3c, 0x99, 0xa0, 0xd0, 0x18, 0x61, 0x8c, 0x5a,
+	0x7d, 0xf3, 0x12, 0x25, 0xb5, 0xf4, 0xb4, 0x62, 0x01, 0x7a, 0xa3, 0xfa, 0xf4, 0x40, 0x03, 0x29,
+	0x86, 0x3c, 0xac, 0x19, 0x8f, 0x1c, 0xe5, 0x80, 0xa9, 0x58, 0x33, 0x9f, 0xab, 0x8d, 0xea, 0xee,
+	0xf7, 0x0d, 0xd8, 0xed, 0x66, 0xc5, 0xa9, 0x61, 0x48, 0x0f, 0xec, 0x40, 0x8a, 0x54, 0x33, 0xa1,
+	0x69, 0xca, 0xe2, 0x24, 0x42, 0xe5, 0x58, 0xc7, 0x56, 0x65, 0xf7, 0xa4, 0x5a, 0x5b, 0x15, 0x54,
+	0x3b, 0x9d, 0x51, 0xd7, 0x53, 0xe8, 0x72, 0xcd, 0x3f, 0x08, 0xf2, 0x12, 0xe9, 0xc3, 0xe3, 0xe9,
+	0x7c, 0x7c, 0x40, 0x15, 0xd3, 0x5c, 0xd2, 0x3e, 0x4b, 0x71, 0xe0, 0xac, 0x9b, 0x7c, 0x6f, 0x75,
+	0xbe, 0x19, 0xf2, 0xc3, 0xc0, 0xcf, 0xb8, 0x66, 0x86, 0x5d, 0xae, 0xf9, 0x45, 0xbd, 0x2c, 0x92,
+	0x10, 0x0e, 0x15, 0xd3, 0x48, 0x23, 0x1e, 0x73, 0xcd, 0x45, 0x38, 0xbf, 0x44, 0xc1, 0x34, 0xa9,
+	0xaf, 0x6e, 0xe2, 0x33, 0x8d, 0xad, 0x19, 0x79, 0x7b, 0x91, 0x92, 0xba, 0x2b, 0x93, 0xd7, 0xe0,
+	0xc4, 0x6c, 0x4c, 0xc5, 0x4d, 0xdc, 0x47, 0x45, 0xe5, 0x90, 0x32, 0xad, 0x15, 0xef, 0xdf, 0x68,
+	0x4c, 0x9d, 0x47, 0xc7, 0x56, 0xa5, 0xe0, 0x1f, 0xc6, 0x6c, 0xdc, 0x36, 0xf6, 0xd5, 0xb0, 0x31,
+	0x37, 0xc9, 0x5b, 0x78, 0x9a, 0x07, 0x35, 0x8f, 0x71, 0x40, 0x71, 0x84, 0x42, 0xa7, 0xce, 0x86,
+	0x41, 0x9f, 0x2c, 0xa0, 0xdd, 0xcc, 0x3e, 0x37, 0x2e, 0xe9, 0x42, 0xe5, 0xa1, 0xa6, 0x34, 0x41,
+	0xb5, 0x18, 0xe5, 0x6c, 0x9a, 0x24, 0xf7, 0xde, 0x21, 0x3a, 0xa8, 0x6e, 0x63, 0x49, 0x15, 0x4a,
+	0xf9, 0xd4, 0x88, 0x8b, 0x2f, 0xa9, 0xb3, 0x65, 0x02, 0xec, 0x85, 0x80, 0x56, 0xa6, 0x93, 0xf7,
+	0xf0, 0x7c, 0xe5, 0x10, 0x19, 0xed, 0x6c, 0x1b, 0xf8, 0xe8, 0xa1, 0xee, 0x59, 0x52, 0x73, 0x07,
+	0xb6, 0x66, 0xbf, 0x8e, 0xfb, 0xd3, 0x82, 0x83, 0xa5, 0x0d, 0x22, 0x3d, 0xd8, 0x1e, 0x60, 0xc0,
+	0x53, 0x2e, 0x85, 0x59, 0xc1, 0xfd, 0x93, 0x77, 0xff, 0xb5, 0x82, 0xf3, 0xfa, 0x6c, 0x96, 0xe2,
+	0xcf, 0xf3, 0xdc, 0x33, 0xb0, 0x97, 0x5d, 0xb2, 0x0f, 0xd0, 0x68, 0x7d, 0x6c, 0x7c, 0xba, 0xa6,
+	0x57, 0x17, 0x17, 0xf6, 0x1a, 0xd9, 0x83, 0x9d, 0x7f, 0x75, 0xdb, 0xb6, 0x48, 0x11, 0xf6, 0x66,
+	0x65, 0xa7, 0xe1, 0x9f, 0xb7, 0xbb, 0xf6, 0xba, 0xfb, 0x06, 0x8a, 0x77, 0xd6, 0x92, 0xbc, 0x80,
+	0x3d, 0x73, 0x2b, 0x2e, 0x42, 0xa3, 0x9a, 0xd9, 0x2d, 0x3f, 0x2f, 0xba, 0x2f, 0xa1, 0x74, 0xcf,
+	0xb2, 0x11, 0x1b, 0x0a, 0x5f, 0x93, 0xd4, 0x20, 0x05, 0x3f, 0x3b, 0x36, 0x7f, 0x58, 0xbf, 0x26,
+	0x65, 0xeb, 0xf7, 0xa4, 0x6c, 0xfd, 0x99, 0x94, 0x2d, 0x78, 0xc6, 0xe5, 0xca, 0x2f, 0xa1, 0x69,
+	0x2f, 0xfc, 0x9b, 0x3b, 0x99, 0xd5, 0xb1, 0x7a, 0x9f, 0xc3, 0x65, 0x88, 0x4b, 0x4f, 0x6a, 0x8c,
+	0x3c, 0x1c, 0x27, 0x52, 0x69, 0x54, 0xa9, 0x27, 0x75, 0x94, 0x78, 0x5c, 0x68, 0x54, 0x82, 0x45,
+	0xf9, 0x47, 0xa6, 0x6a, 0x5a, 0x54, 0x43, 0x14, 0x5e, 0x20, 0xa3, 0x08, 0x03, 0x2d, 0xd5, 0xfc,
+	0xc9, 0xe9, 0x6f, 0x1a, 0xf7, 0xd5, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x69, 0x02, 0x09, 0x0c,
+	0x99, 0x04, 0x00, 0x00,
 }
 
 func (m *TraceConfig) Marshal() (dAtA []byte, err error) {
@@ -484,16 +485,16 @@ func (m *TraceConfig_ConstantSampler) MarshalToSizedBuffer(dAtA []byte) (int, er
 	}
 	return len(dAtA) - i, nil
 }
-func (m *TraceConfig_ProbabilitySampler) MarshalTo(dAtA []byte) (int, error) {
+func (m *TraceConfig_TraceIdRatioBased) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *TraceConfig_ProbabilitySampler) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *TraceConfig_TraceIdRatioBased) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
-	if m.ProbabilitySampler != nil {
+	if m.TraceIdRatioBased != nil {
 		{
-			size, err := m.ProbabilitySampler.MarshalToSizedBuffer(dAtA[:i])
+			size, err := m.TraceIdRatioBased.MarshalToSizedBuffer(dAtA[:i])
 			if err != nil {
 				return 0, err
 			}
@@ -558,7 +559,7 @@ func (m *ConstantSampler) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	return len(dAtA) - i, nil
 }
 
-func (m *ProbabilitySampler) Marshal() (dAtA []byte, err error) {
+func (m *TraceIdRatioBased) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -568,12 +569,12 @@ func (m *ProbabilitySampler) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *ProbabilitySampler) MarshalTo(dAtA []byte) (int, error) {
+func (m *TraceIdRatioBased) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *ProbabilitySampler) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *TraceIdRatioBased) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -582,9 +583,9 @@ func (m *ProbabilitySampler) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i -= len(m.XXX_unrecognized)
 		copy(dAtA[i:], m.XXX_unrecognized)
 	}
-	if m.SamplingProbability != 0 {
+	if m.SamplingRatio != 0 {
 		i -= 8
-		encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.SamplingProbability))))
+		encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.SamplingRatio))))
 		i--
 		dAtA[i] = 0x9
 	}
@@ -676,14 +677,14 @@ func (m *TraceConfig_ConstantSampler) Size() (n int) {
 	}
 	return n
 }
-func (m *TraceConfig_ProbabilitySampler) Size() (n int) {
+func (m *TraceConfig_TraceIdRatioBased) Size() (n int) {
 	if m == nil {
 		return 0
 	}
 	var l int
 	_ = l
-	if m.ProbabilitySampler != nil {
-		l = m.ProbabilitySampler.Size()
+	if m.TraceIdRatioBased != nil {
+		l = m.TraceIdRatioBased.Size()
 		n += 1 + l + sovTraceConfig(uint64(l))
 	}
 	return n
@@ -715,13 +716,13 @@ func (m *ConstantSampler) Size() (n int) {
 	return n
 }
 
-func (m *ProbabilitySampler) Size() (n int) {
+func (m *TraceIdRatioBased) Size() (n int) {
 	if m == nil {
 		return 0
 	}
 	var l int
 	_ = l
-	if m.SamplingProbability != 0 {
+	if m.SamplingRatio != 0 {
 		n += 9
 	}
 	if m.XXX_unrecognized != nil {
@@ -817,7 +818,7 @@ func (m *TraceConfig) Unmarshal(dAtA []byte) error {
 			iNdEx = postIndex
 		case 2:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field ProbabilitySampler", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field TraceIdRatioBased", wireType)
 			}
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
@@ -844,11 +845,11 @@ func (m *TraceConfig) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			v := &ProbabilitySampler{}
+			v := &TraceIdRatioBased{}
 			if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
-			m.Sampler = &TraceConfig_ProbabilitySampler{v}
+			m.Sampler = &TraceConfig_TraceIdRatioBased{v}
 			iNdEx = postIndex
 		case 3:
 			if wireType != 2 {
@@ -1078,7 +1079,7 @@ func (m *ConstantSampler) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *ProbabilitySampler) Unmarshal(dAtA []byte) error {
+func (m *TraceIdRatioBased) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -1101,15 +1102,15 @@ func (m *ProbabilitySampler) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: ProbabilitySampler: wiretype end group for non-group")
+			return fmt.Errorf("proto: TraceIdRatioBased: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: ProbabilitySampler: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: TraceIdRatioBased: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
 			if wireType != 1 {
-				return fmt.Errorf("proto: wrong wireType = %d for field SamplingProbability", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field SamplingRatio", wireType)
 			}
 			var v uint64
 			if (iNdEx + 8) > l {
@@ -1117,7 +1118,7 @@ func (m *ProbabilitySampler) Unmarshal(dAtA []byte) error {
 			}
 			v = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:]))
 			iNdEx += 8
-			m.SamplingProbability = float64(math.Float64frombits(v))
+			m.SamplingRatio = float64(math.Float64frombits(v))
 		default:
 			iNdEx = preIndex
 			skippy, err := skipTraceConfig(dAtA[iNdEx:])
diff --git a/exporters/otlp/internal/opentelemetry-proto-gen/trace/v1/trace.pb.go b/exporters/otlp/internal/opentelemetry-proto-gen/trace/v1/trace.pb.go
index c1580319253..4c02a065b6f 100644
--- a/exporters/otlp/internal/opentelemetry-proto-gen/trace/v1/trace.pb.go
+++ b/exporters/otlp/internal/opentelemetry-proto-gen/trace/v1/trace.pb.go
@@ -78,68 +78,100 @@ func (Span_SpanKind) EnumDescriptor() ([]byte, []int) {
 	return fileDescriptor_5c407ac9c675a601, []int{2, 0}
 }
 
-// StatusCode mirrors the codes defined at
-// https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/api-tracing.md#statuscanonicalcode
+type Status_DeprecatedStatusCode int32
+
+const (
+	Status_DEPRECATED_STATUS_CODE_OK                  Status_DeprecatedStatusCode = 0
+	Status_DEPRECATED_STATUS_CODE_CANCELLED           Status_DeprecatedStatusCode = 1
+	Status_DEPRECATED_STATUS_CODE_UNKNOWN_ERROR       Status_DeprecatedStatusCode = 2
+	Status_DEPRECATED_STATUS_CODE_INVALID_ARGUMENT    Status_DeprecatedStatusCode = 3
+	Status_DEPRECATED_STATUS_CODE_DEADLINE_EXCEEDED   Status_DeprecatedStatusCode = 4
+	Status_DEPRECATED_STATUS_CODE_NOT_FOUND           Status_DeprecatedStatusCode = 5
+	Status_DEPRECATED_STATUS_CODE_ALREADY_EXISTS      Status_DeprecatedStatusCode = 6
+	Status_DEPRECATED_STATUS_CODE_PERMISSION_DENIED   Status_DeprecatedStatusCode = 7
+	Status_DEPRECATED_STATUS_CODE_RESOURCE_EXHAUSTED  Status_DeprecatedStatusCode = 8
+	Status_DEPRECATED_STATUS_CODE_FAILED_PRECONDITION Status_DeprecatedStatusCode = 9
+	Status_DEPRECATED_STATUS_CODE_ABORTED             Status_DeprecatedStatusCode = 10
+	Status_DEPRECATED_STATUS_CODE_OUT_OF_RANGE        Status_DeprecatedStatusCode = 11
+	Status_DEPRECATED_STATUS_CODE_UNIMPLEMENTED       Status_DeprecatedStatusCode = 12
+	Status_DEPRECATED_STATUS_CODE_INTERNAL_ERROR      Status_DeprecatedStatusCode = 13
+	Status_DEPRECATED_STATUS_CODE_UNAVAILABLE         Status_DeprecatedStatusCode = 14
+	Status_DEPRECATED_STATUS_CODE_DATA_LOSS           Status_DeprecatedStatusCode = 15
+	Status_DEPRECATED_STATUS_CODE_UNAUTHENTICATED     Status_DeprecatedStatusCode = 16
+)
+
+var Status_DeprecatedStatusCode_name = map[int32]string{
+	0:  "DEPRECATED_STATUS_CODE_OK",
+	1:  "DEPRECATED_STATUS_CODE_CANCELLED",
+	2:  "DEPRECATED_STATUS_CODE_UNKNOWN_ERROR",
+	3:  "DEPRECATED_STATUS_CODE_INVALID_ARGUMENT",
+	4:  "DEPRECATED_STATUS_CODE_DEADLINE_EXCEEDED",
+	5:  "DEPRECATED_STATUS_CODE_NOT_FOUND",
+	6:  "DEPRECATED_STATUS_CODE_ALREADY_EXISTS",
+	7:  "DEPRECATED_STATUS_CODE_PERMISSION_DENIED",
+	8:  "DEPRECATED_STATUS_CODE_RESOURCE_EXHAUSTED",
+	9:  "DEPRECATED_STATUS_CODE_FAILED_PRECONDITION",
+	10: "DEPRECATED_STATUS_CODE_ABORTED",
+	11: "DEPRECATED_STATUS_CODE_OUT_OF_RANGE",
+	12: "DEPRECATED_STATUS_CODE_UNIMPLEMENTED",
+	13: "DEPRECATED_STATUS_CODE_INTERNAL_ERROR",
+	14: "DEPRECATED_STATUS_CODE_UNAVAILABLE",
+	15: "DEPRECATED_STATUS_CODE_DATA_LOSS",
+	16: "DEPRECATED_STATUS_CODE_UNAUTHENTICATED",
+}
+
+var Status_DeprecatedStatusCode_value = map[string]int32{
+	"DEPRECATED_STATUS_CODE_OK":                  0,
+	"DEPRECATED_STATUS_CODE_CANCELLED":           1,
+	"DEPRECATED_STATUS_CODE_UNKNOWN_ERROR":       2,
+	"DEPRECATED_STATUS_CODE_INVALID_ARGUMENT":    3,
+	"DEPRECATED_STATUS_CODE_DEADLINE_EXCEEDED":   4,
+	"DEPRECATED_STATUS_CODE_NOT_FOUND":           5,
+	"DEPRECATED_STATUS_CODE_ALREADY_EXISTS":      6,
+	"DEPRECATED_STATUS_CODE_PERMISSION_DENIED":   7,
+	"DEPRECATED_STATUS_CODE_RESOURCE_EXHAUSTED":  8,
+	"DEPRECATED_STATUS_CODE_FAILED_PRECONDITION": 9,
+	"DEPRECATED_STATUS_CODE_ABORTED":             10,
+	"DEPRECATED_STATUS_CODE_OUT_OF_RANGE":        11,
+	"DEPRECATED_STATUS_CODE_UNIMPLEMENTED":       12,
+	"DEPRECATED_STATUS_CODE_INTERNAL_ERROR":      13,
+	"DEPRECATED_STATUS_CODE_UNAVAILABLE":         14,
+	"DEPRECATED_STATUS_CODE_DATA_LOSS":           15,
+	"DEPRECATED_STATUS_CODE_UNAUTHENTICATED":     16,
+}
+
+func (x Status_DeprecatedStatusCode) String() string {
+	return proto.EnumName(Status_DeprecatedStatusCode_name, int32(x))
+}
+
+func (Status_DeprecatedStatusCode) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_5c407ac9c675a601, []int{3, 0}
+}
+
+// For the semantics of status codes see
+// https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/trace/api.md#set-status
 type Status_StatusCode int32
 
 const (
-	Status_STATUS_CODE_OK                  Status_StatusCode = 0
-	Status_STATUS_CODE_CANCELLED           Status_StatusCode = 1
-	Status_STATUS_CODE_UNKNOWN_ERROR       Status_StatusCode = 2
-	Status_STATUS_CODE_INVALID_ARGUMENT    Status_StatusCode = 3
-	Status_STATUS_CODE_DEADLINE_EXCEEDED   Status_StatusCode = 4
-	Status_STATUS_CODE_NOT_FOUND           Status_StatusCode = 5
-	Status_STATUS_CODE_ALREADY_EXISTS      Status_StatusCode = 6
-	Status_STATUS_CODE_PERMISSION_DENIED   Status_StatusCode = 7
-	Status_STATUS_CODE_RESOURCE_EXHAUSTED  Status_StatusCode = 8
-	Status_STATUS_CODE_FAILED_PRECONDITION Status_StatusCode = 9
-	Status_STATUS_CODE_ABORTED             Status_StatusCode = 10
-	Status_STATUS_CODE_OUT_OF_RANGE        Status_StatusCode = 11
-	Status_STATUS_CODE_UNIMPLEMENTED       Status_StatusCode = 12
-	Status_STATUS_CODE_INTERNAL_ERROR      Status_StatusCode = 13
-	Status_STATUS_CODE_UNAVAILABLE         Status_StatusCode = 14
-	Status_STATUS_CODE_DATA_LOSS           Status_StatusCode = 15
-	Status_STATUS_CODE_UNAUTHENTICATED     Status_StatusCode = 16
+	// The default status.
+	Status_STATUS_CODE_UNSET Status_StatusCode = 0
+	// The Span has been validated by an Application developers or Operator to have
+	// completed successfully.
+	Status_STATUS_CODE_OK Status_StatusCode = 1
+	// The Span contains an error.
+	Status_STATUS_CODE_ERROR Status_StatusCode = 2
 )
 
 var Status_StatusCode_name = map[int32]string{
-	0:  "STATUS_CODE_OK",
-	1:  "STATUS_CODE_CANCELLED",
-	2:  "STATUS_CODE_UNKNOWN_ERROR",
-	3:  "STATUS_CODE_INVALID_ARGUMENT",
-	4:  "STATUS_CODE_DEADLINE_EXCEEDED",
-	5:  "STATUS_CODE_NOT_FOUND",
-	6:  "STATUS_CODE_ALREADY_EXISTS",
-	7:  "STATUS_CODE_PERMISSION_DENIED",
-	8:  "STATUS_CODE_RESOURCE_EXHAUSTED",
-	9:  "STATUS_CODE_FAILED_PRECONDITION",
-	10: "STATUS_CODE_ABORTED",
-	11: "STATUS_CODE_OUT_OF_RANGE",
-	12: "STATUS_CODE_UNIMPLEMENTED",
-	13: "STATUS_CODE_INTERNAL_ERROR",
-	14: "STATUS_CODE_UNAVAILABLE",
-	15: "STATUS_CODE_DATA_LOSS",
-	16: "STATUS_CODE_UNAUTHENTICATED",
+	0: "STATUS_CODE_UNSET",
+	1: "STATUS_CODE_OK",
+	2: "STATUS_CODE_ERROR",
 }
 
 var Status_StatusCode_value = map[string]int32{
-	"STATUS_CODE_OK":                  0,
-	"STATUS_CODE_CANCELLED":           1,
-	"STATUS_CODE_UNKNOWN_ERROR":       2,
-	"STATUS_CODE_INVALID_ARGUMENT":    3,
-	"STATUS_CODE_DEADLINE_EXCEEDED":   4,
-	"STATUS_CODE_NOT_FOUND":           5,
-	"STATUS_CODE_ALREADY_EXISTS":      6,
-	"STATUS_CODE_PERMISSION_DENIED":   7,
-	"STATUS_CODE_RESOURCE_EXHAUSTED":  8,
-	"STATUS_CODE_FAILED_PRECONDITION": 9,
-	"STATUS_CODE_ABORTED":             10,
-	"STATUS_CODE_OUT_OF_RANGE":        11,
-	"STATUS_CODE_UNIMPLEMENTED":       12,
-	"STATUS_CODE_INTERNAL_ERROR":      13,
-	"STATUS_CODE_UNAVAILABLE":         14,
-	"STATUS_CODE_DATA_LOSS":           15,
-	"STATUS_CODE_UNAUTHENTICATED":     16,
+	"STATUS_CODE_UNSET": 0,
+	"STATUS_CODE_OK":    1,
+	"STATUS_CODE_ERROR": 2,
 }
 
 func (x Status_StatusCode) String() string {
@@ -147,7 +179,7 @@ func (x Status_StatusCode) String() string {
 }
 
 func (Status_StatusCode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_5c407ac9c675a601, []int{3, 0}
+	return fileDescriptor_5c407ac9c675a601, []int{3, 1}
 }
 
 // A collection of InstrumentationLibrarySpans from a Resource.
@@ -359,9 +391,8 @@ type Span struct {
 	// dropped_links_count is the number of dropped links after the maximum size was
 	// enforced. If this value is 0, then no links were dropped.
 	DroppedLinksCount uint32 `protobuf:"varint,14,opt,name=dropped_links_count,json=droppedLinksCount,proto3" json:"dropped_links_count,omitempty"`
-	// An optional final status for this span. Semantically when Status
-	// wasn't set it is means span ended without errors and assume
-	// Status.Ok (code = 0).
+	// An optional final status for this span. Semantically when Status isn't set, it means
+	// span's status code is unset, i.e. assume STATUS_CODE_UNSET (code = 0).
 	Status               *Status  `protobuf:"bytes,15,opt,name=status,proto3" json:"status,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
@@ -678,14 +709,20 @@ func (m *Span_Link) GetDroppedAttributesCount() uint32 {
 // The Status type defines a logical error model that is suitable for different
 // programming environments, including REST APIs and RPC APIs.
 type Status struct {
-	// The status code. This is optional field. It is safe to assume 0 (OK)
-	// when not set.
-	Code Status_StatusCode `protobuf:"varint,1,opt,name=code,proto3,enum=opentelemetry.proto.trace.v1.Status_StatusCode" json:"code,omitempty"`
+	// The deprecated status code. This is an optional field.
+	//
+	// This field is deprecated and is replaced by the `code` field below. See backward
+	// compatibility notes below. According to our stability guarantees this field
+	// will be removed in 12 months, on Oct 22, 2021. All usage of old senders and
+	// receivers that do not understand the `code` field MUST be phased out by then.
+	DeprecatedCode Status_DeprecatedStatusCode `protobuf:"varint,1,opt,name=deprecated_code,json=deprecatedCode,proto3,enum=opentelemetry.proto.trace.v1.Status_DeprecatedStatusCode" json:"deprecated_code,omitempty"` // Deprecated: Do not use.
 	// A developer-facing human readable error message.
-	Message              string   `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`
+	// The status code.
+	Code                 Status_StatusCode `protobuf:"varint,3,opt,name=code,proto3,enum=opentelemetry.proto.trace.v1.Status_StatusCode" json:"code,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
 func (m *Status) Reset()         { *m = Status{} }
@@ -721,11 +758,12 @@ func (m *Status) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_Status proto.InternalMessageInfo
 
-func (m *Status) GetCode() Status_StatusCode {
+// Deprecated: Do not use.
+func (m *Status) GetDeprecatedCode() Status_DeprecatedStatusCode {
 	if m != nil {
-		return m.Code
+		return m.DeprecatedCode
 	}
-	return Status_STATUS_CODE_OK
+	return Status_DEPRECATED_STATUS_CODE_OK
 }
 
 func (m *Status) GetMessage() string {
@@ -735,8 +773,16 @@ func (m *Status) GetMessage() string {
 	return ""
 }
 
+func (m *Status) GetCode() Status_StatusCode {
+	if m != nil {
+		return m.Code
+	}
+	return Status_STATUS_CODE_UNSET
+}
+
 func init() {
 	proto.RegisterEnum("opentelemetry.proto.trace.v1.Span_SpanKind", Span_SpanKind_name, Span_SpanKind_value)
+	proto.RegisterEnum("opentelemetry.proto.trace.v1.Status_DeprecatedStatusCode", Status_DeprecatedStatusCode_name, Status_DeprecatedStatusCode_value)
 	proto.RegisterEnum("opentelemetry.proto.trace.v1.Status_StatusCode", Status_StatusCode_name, Status_StatusCode_value)
 	proto.RegisterType((*ResourceSpans)(nil), "opentelemetry.proto.trace.v1.ResourceSpans")
 	proto.RegisterType((*InstrumentationLibrarySpans)(nil), "opentelemetry.proto.trace.v1.InstrumentationLibrarySpans")
@@ -751,75 +797,80 @@ func init() {
 }
 
 var fileDescriptor_5c407ac9c675a601 = []byte{
-	// 1088 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x4f, 0x6f, 0xe3, 0xc4,
-	0x1b, 0x5e, 0xb7, 0x4e, 0xda, 0x7d, 0xdb, 0x66, 0xbd, 0xb3, 0xfb, 0xdb, 0xba, 0xff, 0xf3, 0x0b,
-	0x2b, 0x11, 0x58, 0x6d, 0x42, 0x8b, 0x90, 0x16, 0x09, 0x04, 0xae, 0x3d, 0xed, 0x5a, 0x75, 0xed,
-	0x30, 0xb6, 0xcb, 0xc2, 0xc5, 0x72, 0x9b, 0x51, 0x65, 0x35, 0x19, 0x47, 0xb6, 0x53, 0xb5, 0x07,
-	0xbe, 0x02, 0x37, 0x0e, 0x48, 0x7c, 0x1c, 0x24, 0x38, 0x72, 0xe1, 0x8a, 0x50, 0xbf, 0x08, 0x68,
-	0xc6, 0x4e, 0x1b, 0x87, 0x36, 0xdd, 0x4b, 0x2f, 0xc9, 0xcc, 0xfb, 0x3e, 0xcf, 0xfb, 0xbc, 0xff,
-	0x46, 0x09, 0x34, 0xe3, 0x01, 0x65, 0x19, 0xed, 0xd1, 0x3e, 0xcd, 0x92, 0xcb, 0xf6, 0x20, 0x89,
-	0xb3, 0xb8, 0x9d, 0x25, 0xe1, 0x09, 0x6d, 0x9f, 0x6f, 0xe7, 0x87, 0x96, 0x30, 0xa2, 0xf5, 0x12,
-	0x32, 0x37, 0xb6, 0x72, 0xc0, 0xf9, 0xf6, 0xea, 0xc7, 0xb7, 0xc5, 0x39, 0x89, 0xfb, 0xfd, 0x98,
-	0xf1, 0x40, 0xf9, 0x29, 0x27, 0xad, 0xb6, 0x6e, 0xc3, 0x26, 0x34, 0x8d, 0x87, 0x49, 0x2e, 0x3b,
-	0x3a, 0xe7, 0xf8, 0xc6, 0x9f, 0x12, 0x2c, 0x91, 0xc2, 0xe4, 0x0e, 0x42, 0x96, 0x22, 0x0c, 0xf3,
-	0x23, 0x8c, 0x2a, 0xd5, 0xa5, 0xe6, 0xc2, 0xce, 0x47, 0xad, 0xdb, 0xd2, 0xbb, 0x0e, 0x74, 0xbe,
-	0xdd, 0x1a, 0x45, 0x20, 0xd7, 0x54, 0xf4, 0x03, 0x6c, 0x44, 0x2c, 0xcd, 0x92, 0x61, 0x9f, 0xb2,
-	0x2c, 0xcc, 0xa2, 0x98, 0x05, 0xbd, 0xe8, 0x38, 0x09, 0x93, 0xcb, 0x20, 0xe5, 0x3a, 0xea, 0x4c,
-	0x7d, 0xb6, 0xb9, 0xb0, 0xf3, 0x79, 0x6b, 0x5a, 0xe9, 0x2d, 0xb3, 0x1c, 0xc2, 0xca, 0x23, 0x88,
-	0x44, 0xc9, 0x5a, 0x74, 0xb7, 0xb3, 0xf1, 0x9b, 0x04, 0x6b, 0x53, 0xc8, 0x88, 0xc1, 0xf2, 0x1d,
-	0xe9, 0x15, 0x45, 0x7f, 0x76, 0x6b, 0x62, 0x45, 0xaf, 0xef, 0xcc, 0x8c, 0xbc, 0xb8, 0x3d, 0x29,
-	0xf4, 0x06, 0x2a, 0xe3, 0x65, 0x37, 0xa6, 0x97, 0xcd, 0x73, 0x24, 0x39, 0xa1, 0xf1, 0x0b, 0x80,
-	0xcc, 0xef, 0x68, 0x05, 0xe6, 0x05, 0x20, 0x88, 0xba, 0x22, 0xc7, 0x45, 0x32, 0x27, 0xee, 0x66,
-	0x17, 0x2d, 0xc3, 0x1c, 0x07, 0x73, 0xcf, 0x8c, 0xf0, 0x54, 0xf9, 0xd5, 0xec, 0xa2, 0x2d, 0x58,
-	0xc8, 0x39, 0x69, 0x16, 0x66, 0x54, 0x9d, 0xad, 0x4b, 0xcd, 0xc7, 0x04, 0x84, 0xc9, 0xe5, 0x16,
-	0xf4, 0x12, 0x6a, 0x83, 0x30, 0xa1, 0x2c, 0x0b, 0x46, 0x01, 0x64, 0x11, 0x60, 0x31, 0xb7, 0xba,
-	0x79, 0x18, 0x04, 0x32, 0x0b, 0xfb, 0x54, 0xad, 0x08, 0xbe, 0x38, 0xa3, 0xaf, 0x40, 0x3e, 0x8b,
-	0x58, 0x57, 0xad, 0xd6, 0xa5, 0x66, 0x6d, 0xe7, 0xd5, 0xfd, 0x05, 0x89, 0x8f, 0x83, 0x88, 0x75,
-	0x89, 0x20, 0xa2, 0x36, 0x3c, 0x4f, 0xb3, 0x30, 0xc9, 0x82, 0x2c, 0xea, 0xd3, 0x60, 0xc8, 0xa2,
-	0x8b, 0x80, 0x85, 0x2c, 0x56, 0xe7, 0xea, 0x52, 0xb3, 0x4a, 0x9e, 0x0a, 0x9f, 0x17, 0xf5, 0xa9,
-	0xcf, 0xa2, 0x0b, 0x3b, 0x64, 0x31, 0x7a, 0x05, 0x88, 0xb2, 0xee, 0x24, 0x7c, 0x5e, 0xc0, 0x9f,
-	0x50, 0xd6, 0x2d, 0x81, 0xf7, 0x01, 0xc2, 0x2c, 0x4b, 0xa2, 0xe3, 0x61, 0x46, 0x53, 0xf5, 0xb1,
-	0xe8, 0xfa, 0x87, 0xf7, 0xcc, 0xf4, 0x80, 0x5e, 0x1e, 0x85, 0xbd, 0x21, 0x25, 0x63, 0x54, 0xf4,
-	0x06, 0xd4, 0x6e, 0x12, 0x0f, 0x06, 0xb4, 0x1b, 0xdc, 0x58, 0x83, 0x93, 0x78, 0xc8, 0x32, 0x15,
-	0xea, 0x52, 0x73, 0x89, 0xbc, 0x28, 0xfc, 0xda, 0xb5, 0x5b, 0xe7, 0x5e, 0xf4, 0x35, 0x54, 0xe9,
-	0x39, 0x65, 0x59, 0xaa, 0x2e, 0x08, 0xf9, 0xe6, 0x7b, 0xf4, 0x08, 0x73, 0x02, 0x29, 0x78, 0xe8,
-	0x13, 0x78, 0x3e, 0xd2, 0xce, 0x2d, 0x85, 0xee, 0xa2, 0xd0, 0x45, 0x85, 0x4f, 0x70, 0x0a, 0xcd,
-	0x2f, 0xa1, 0xd2, 0x8b, 0xd8, 0x59, 0xaa, 0x2e, 0x4d, 0xa9, 0xb8, 0x2c, 0x69, 0x45, 0xec, 0x8c,
-	0xe4, 0x2c, 0xd4, 0x82, 0x67, 0x23, 0x41, 0x61, 0x28, 0xf4, 0x6a, 0x42, 0xef, 0x69, 0xe1, 0xe2,
-	0x84, 0x42, 0xee, 0x0b, 0xa8, 0xf2, 0xcd, 0x1a, 0xa6, 0xea, 0x13, 0xf1, 0x6a, 0x5e, 0xde, 0xa3,
-	0x27, 0xb0, 0xa4, 0xe0, 0xac, 0xfe, 0x2a, 0x41, 0x45, 0x24, 0xcf, 0xd7, 0x70, 0x62, 0xac, 0x92,
-	0x18, 0xeb, 0x62, 0x36, 0x3e, 0xd3, 0xd1, 0x1a, 0xce, 0x8c, 0xad, 0x61, 0x79, 0xce, 0xb3, 0x0f,
-	0x33, 0x67, 0x79, 0xda, 0x9c, 0x57, 0xff, 0x92, 0x40, 0xe6, 0x3d, 0x79, 0x98, 0x17, 0x5a, 0x2e,
-	0x50, 0x7e, 0x98, 0x02, 0x2b, 0xd3, 0x0a, 0x6c, 0xfc, 0x2c, 0xc1, 0xfc, 0xe8, 0xf1, 0xa2, 0x15,
-	0xf8, 0x9f, 0xdb, 0xd1, 0xec, 0xe0, 0xc0, 0xb4, 0x8d, 0xc0, 0xb7, 0xdd, 0x0e, 0xd6, 0xcd, 0x3d,
-	0x13, 0x1b, 0xca, 0x23, 0xf4, 0x02, 0xd0, 0x8d, 0xcb, 0xb4, 0x3d, 0x4c, 0x6c, 0xcd, 0x52, 0x24,
-	0xf4, 0x1c, 0x94, 0x1b, 0xbb, 0x8b, 0xc9, 0x11, 0x26, 0xca, 0x4c, 0xd9, 0xaa, 0x5b, 0x26, 0xb6,
-	0x3d, 0x65, 0xb6, 0x1c, 0xa3, 0x43, 0x1c, 0xc3, 0xd7, 0x31, 0x51, 0xe4, 0xb2, 0x5d, 0x77, 0x6c,
-	0xd7, 0x3f, 0xc4, 0x44, 0xa9, 0x34, 0xfe, 0x91, 0xa1, 0x9a, 0xaf, 0x15, 0xd2, 0x41, 0x3e, 0x89,
-	0xbb, 0xf9, 0xaf, 0x56, 0x6d, 0xa7, 0xfd, 0x3e, 0xab, 0x58, 0x7c, 0xe9, 0x71, 0x97, 0x12, 0x41,
-	0x46, 0x2a, 0xcc, 0xf5, 0x69, 0x9a, 0x86, 0xa7, 0xa3, 0x35, 0x1b, 0x5d, 0x1b, 0x3f, 0xc9, 0x00,
-	0x37, 0x70, 0x84, 0xa0, 0xe6, 0x7a, 0x9a, 0xe7, 0xbb, 0x81, 0xee, 0x18, 0x38, 0x70, 0x0e, 0x94,
-	0x47, 0xa2, 0x37, 0x63, 0x36, 0x5d, 0xb3, 0x75, 0x6c, 0x59, 0xd8, 0x50, 0x24, 0xb4, 0x01, 0x2b,
-	0xe3, 0x2e, 0xdf, 0x3e, 0xb0, 0x9d, 0x6f, 0xed, 0x00, 0x13, 0xe2, 0xf0, 0x66, 0xd4, 0x61, 0x7d,
-	0xdc, 0x6d, 0xda, 0x47, 0x9a, 0x65, 0x1a, 0x81, 0x46, 0xf6, 0xfd, 0xc3, 0xbc, 0x31, 0xff, 0x87,
-	0x8d, 0x71, 0x84, 0x81, 0x35, 0xc3, 0x32, 0x6d, 0x1c, 0xe0, 0x77, 0x3a, 0xc6, 0x06, 0x36, 0x14,
-	0x79, 0x52, 0xde, 0x76, 0xbc, 0x60, 0xcf, 0xf1, 0x6d, 0x43, 0xa9, 0xa0, 0x4d, 0x58, 0x1d, 0x77,
-	0x69, 0x16, 0xc1, 0x9a, 0xf1, 0x5d, 0x80, 0xdf, 0x99, 0xae, 0xe7, 0x2a, 0xd5, 0xc9, 0xe8, 0x1d,
-	0x4c, 0x0e, 0x4d, 0xd7, 0x35, 0x1d, 0x3b, 0x30, 0xb0, 0xcd, 0xa7, 0x3b, 0x87, 0x1a, 0xb0, 0x39,
-	0x0e, 0x21, 0xd8, 0x75, 0x7c, 0xa2, 0xf3, 0x04, 0xde, 0x6a, 0xbe, 0xeb, 0x61, 0x43, 0x99, 0x47,
-	0x1f, 0xc0, 0xd6, 0x38, 0x66, 0x4f, 0x33, 0x2d, 0xcc, 0xc7, 0x88, 0x75, 0xc7, 0x36, 0x4c, 0xcf,
-	0x74, 0x6c, 0xe5, 0x31, 0x5a, 0x86, 0x67, 0xa5, 0x5c, 0x76, 0x1d, 0xc2, 0xd9, 0x80, 0xd6, 0x41,
-	0x2d, 0xb5, 0xd4, 0xf7, 0x02, 0x67, 0x2f, 0x20, 0x9a, 0xbd, 0x8f, 0x95, 0x85, 0xff, 0x76, 0xd0,
-	0x3c, 0xec, 0x58, 0x98, 0x77, 0x07, 0x1b, 0xca, 0xe2, 0x64, 0x85, 0xa3, 0xf5, 0x2b, 0x3a, 0xbc,
-	0x84, 0xd6, 0x60, 0xb9, 0x4c, 0xd7, 0x8e, 0x34, 0xd3, 0xd2, 0x76, 0x2d, 0xac, 0xd4, 0x26, 0x3b,
-	0x67, 0x68, 0x9e, 0x16, 0x58, 0x8e, 0xeb, 0x2a, 0x4f, 0xd0, 0x16, 0xac, 0x4d, 0xf0, 0x7c, 0xef,
-	0x2d, 0xb6, 0x3d, 0x53, 0xd7, 0xb8, 0xb0, 0xb2, 0xfb, 0xa3, 0xf4, 0xfb, 0xd5, 0xa6, 0xf4, 0xc7,
-	0xd5, 0xa6, 0xf4, 0xf7, 0xd5, 0xa6, 0x04, 0x5b, 0x51, 0x3c, 0x75, 0xf3, 0x76, 0xc1, 0xe3, 0xa7,
-	0x0e, 0x37, 0x76, 0xa4, 0xef, 0xbf, 0x39, 0x9d, 0x84, 0x47, 0x71, 0x3b, 0xce, 0x68, 0xaf, 0x4d,
-	0x2f, 0x06, 0x71, 0x92, 0xd1, 0x24, 0x6d, 0xc7, 0x59, 0x6f, 0xd0, 0x8e, 0x58, 0x46, 0x13, 0x16,
-	0xf6, 0xda, 0x25, 0xf4, 0x6b, 0x11, 0xfc, 0xf5, 0x29, 0x65, 0xd7, 0xff, 0x2c, 0x8f, 0xab, 0xc2,
-	0xf6, 0xe9, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xcd, 0xf7, 0xd2, 0xe8, 0x80, 0x0a, 0x00, 0x00,
+	// 1160 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x41, 0x6f, 0xdc, 0x44,
+	0x14, 0xae, 0x93, 0xdd, 0x4d, 0xfa, 0x92, 0x6c, 0xdc, 0x21, 0x6d, 0xdd, 0x94, 0xa6, 0xab, 0x25,
+	0xb4, 0xdb, 0x96, 0xee, 0xd2, 0x22, 0xa4, 0x22, 0x81, 0xc0, 0xb1, 0x27, 0xad, 0x15, 0xc7, 0x5e,
+	0xc6, 0x76, 0x28, 0x5c, 0x46, 0x6e, 0x3c, 0x54, 0x56, 0x77, 0xc7, 0x2b, 0x7b, 0x36, 0x6a, 0x0f,
+	0xfc, 0x05, 0xee, 0x48, 0xfc, 0x1c, 0x24, 0x38, 0x72, 0xe1, 0xc2, 0x01, 0xa1, 0xfe, 0x0e, 0x0e,
+	0xc8, 0x63, 0x6f, 0x92, 0x8d, 0x62, 0xa7, 0x97, 0x5e, 0xa2, 0xf1, 0xf7, 0xbe, 0xef, 0x7d, 0xef,
+	0xcd, 0x7b, 0xa3, 0x0d, 0xf4, 0x92, 0x09, 0xe3, 0x82, 0x8d, 0xd8, 0x98, 0x89, 0xf4, 0xcd, 0x60,
+	0x92, 0x26, 0x22, 0x19, 0x88, 0x34, 0x3c, 0x64, 0x83, 0xa3, 0x47, 0xc5, 0xa1, 0x2f, 0x41, 0xf4,
+	0xe1, 0x1c, 0xb3, 0x00, 0xfb, 0x05, 0xe1, 0xe8, 0xd1, 0xe6, 0xfd, 0xf3, 0xf2, 0x1c, 0x26, 0xe3,
+	0x71, 0xc2, 0xf3, 0x44, 0xc5, 0xa9, 0x10, 0x6d, 0xf6, 0xcf, 0xe3, 0xa6, 0x2c, 0x4b, 0xa6, 0x69,
+	0x61, 0x3b, 0x3b, 0x17, 0xfc, 0xee, 0x5f, 0x0a, 0xac, 0x91, 0x12, 0xf2, 0x26, 0x21, 0xcf, 0x10,
+	0x86, 0xe5, 0x19, 0x47, 0x53, 0x3a, 0x4a, 0x6f, 0xe5, 0xf1, 0xbd, 0xfe, 0x79, 0xe5, 0x1d, 0x27,
+	0x3a, 0x7a, 0xd4, 0x9f, 0x65, 0x20, 0xc7, 0x52, 0xf4, 0x13, 0xdc, 0x8a, 0x79, 0x26, 0xd2, 0xe9,
+	0x98, 0x71, 0x11, 0x8a, 0x38, 0xe1, 0x74, 0x14, 0xbf, 0x48, 0xc3, 0xf4, 0x0d, 0xcd, 0x72, 0x1f,
+	0x6d, 0xa1, 0xb3, 0xd8, 0x5b, 0x79, 0xfc, 0x45, 0xbf, 0xae, 0xf5, 0xbe, 0x35, 0x9f, 0xc2, 0x2e,
+	0x32, 0xc8, 0x42, 0xc9, 0xcd, 0xb8, 0x3a, 0xd8, 0xfd, 0x5d, 0x81, 0x9b, 0x35, 0x62, 0xc4, 0xe1,
+	0x7a, 0x45, 0x79, 0x65, 0xd3, 0x9f, 0x9f, 0x5b, 0x58, 0x79, 0xd7, 0x95, 0x95, 0x91, 0x6b, 0xe7,
+	0x17, 0x85, 0x9e, 0x40, 0xf3, 0x74, 0xdb, 0xdd, 0xfa, 0xb6, 0xf3, 0x1a, 0x49, 0x21, 0xe8, 0xfe,
+	0x0a, 0xd0, 0xc8, 0xbf, 0xd1, 0x0d, 0x58, 0x96, 0x04, 0x1a, 0x47, 0xb2, 0xc6, 0x55, 0xb2, 0x24,
+	0xbf, 0xad, 0x08, 0x5d, 0x87, 0xa5, 0x9c, 0x9c, 0x47, 0x16, 0x64, 0xa4, 0x95, 0x7f, 0x5a, 0x11,
+	0xba, 0x0d, 0x2b, 0x85, 0x26, 0x13, 0xa1, 0x60, 0xda, 0x62, 0x47, 0xe9, 0x5d, 0x26, 0x20, 0x21,
+	0x2f, 0x47, 0xd0, 0x36, 0xb4, 0x27, 0x61, 0xca, 0xb8, 0xa0, 0xb3, 0x04, 0x0d, 0x99, 0x60, 0xb5,
+	0x40, 0xbd, 0x22, 0x0d, 0x82, 0x06, 0x0f, 0xc7, 0x4c, 0x6b, 0x4a, 0xbd, 0x3c, 0xa3, 0xaf, 0xa1,
+	0xf1, 0x2a, 0xe6, 0x91, 0xd6, 0xea, 0x28, 0xbd, 0xf6, 0xe3, 0x07, 0x17, 0x37, 0x24, 0xff, 0xec,
+	0xc5, 0x3c, 0x22, 0x52, 0x88, 0x06, 0xb0, 0x91, 0x89, 0x30, 0x15, 0x54, 0xc4, 0x63, 0x46, 0xa7,
+	0x3c, 0x7e, 0x4d, 0x79, 0xc8, 0x13, 0x6d, 0xa9, 0xa3, 0xf4, 0x5a, 0xe4, 0x8a, 0x8c, 0xf9, 0xf1,
+	0x98, 0x05, 0x3c, 0x7e, 0xed, 0x84, 0x3c, 0x41, 0x0f, 0x00, 0x31, 0x1e, 0x9d, 0xa5, 0x2f, 0x4b,
+	0xfa, 0x3a, 0xe3, 0xd1, 0x1c, 0xf9, 0x29, 0x40, 0x28, 0x44, 0x1a, 0xbf, 0x98, 0x0a, 0x96, 0x69,
+	0x97, 0xe5, 0xad, 0xdf, 0xbd, 0x60, 0xa6, 0x7b, 0xec, 0xcd, 0x41, 0x38, 0x9a, 0x32, 0x72, 0x4a,
+	0x8a, 0x9e, 0x80, 0x16, 0xa5, 0xc9, 0x64, 0xc2, 0x22, 0x7a, 0x82, 0xd2, 0xc3, 0x64, 0xca, 0x85,
+	0x06, 0x1d, 0xa5, 0xb7, 0x46, 0xae, 0x95, 0x71, 0xfd, 0x38, 0x6c, 0xe4, 0x51, 0xf4, 0x0d, 0xb4,
+	0xd8, 0x11, 0xe3, 0x22, 0xd3, 0x56, 0xa4, 0x7d, 0xef, 0x1d, 0xee, 0x08, 0xe7, 0x02, 0x52, 0xea,
+	0xd0, 0xa7, 0xb0, 0x31, 0xf3, 0x2e, 0x90, 0xd2, 0x77, 0x55, 0xfa, 0xa2, 0x32, 0x26, 0x35, 0xa5,
+	0xe7, 0x57, 0xd0, 0x1c, 0xc5, 0xfc, 0x55, 0xa6, 0xad, 0xd5, 0x74, 0x3c, 0x6f, 0x69, 0xc7, 0xfc,
+	0x15, 0x29, 0x54, 0xa8, 0x0f, 0x1f, 0xcc, 0x0c, 0x25, 0x50, 0xfa, 0xb5, 0xa5, 0xdf, 0x95, 0x32,
+	0x94, 0x0b, 0x4a, 0xbb, 0x2f, 0xa1, 0x95, 0x6f, 0xd6, 0x34, 0xd3, 0xd6, 0xe5, 0xab, 0xd9, 0xbe,
+	0xc0, 0x4f, 0x72, 0x49, 0xa9, 0xd9, 0xfc, 0x4d, 0x81, 0xa6, 0x2c, 0x3e, 0x5f, 0xc3, 0x33, 0x63,
+	0x55, 0xe4, 0x58, 0x57, 0xc5, 0xe9, 0x99, 0xce, 0xd6, 0x70, 0xe1, 0xd4, 0x1a, 0xce, 0xcf, 0x79,
+	0xf1, 0xfd, 0xcc, 0xb9, 0x51, 0x37, 0xe7, 0xcd, 0x7f, 0x14, 0x68, 0xe4, 0x77, 0xf2, 0x7e, 0x5e,
+	0xe8, 0x7c, 0x83, 0x8d, 0xf7, 0xd3, 0x60, 0xb3, 0xae, 0xc1, 0xee, 0x2f, 0x0a, 0x2c, 0xcf, 0x1e,
+	0x2f, 0xba, 0x01, 0x57, 0xbd, 0xa1, 0xee, 0xd0, 0x3d, 0xcb, 0x31, 0x69, 0xe0, 0x78, 0x43, 0x6c,
+	0x58, 0xbb, 0x16, 0x36, 0xd5, 0x4b, 0xe8, 0x1a, 0xa0, 0x93, 0x90, 0xe5, 0xf8, 0x98, 0x38, 0xba,
+	0xad, 0x2a, 0x68, 0x03, 0xd4, 0x13, 0xdc, 0xc3, 0xe4, 0x00, 0x13, 0x75, 0x61, 0x1e, 0x35, 0x6c,
+	0x0b, 0x3b, 0xbe, 0xba, 0x38, 0x9f, 0x63, 0x48, 0x5c, 0x33, 0x30, 0x30, 0x51, 0x1b, 0xf3, 0xb8,
+	0xe1, 0x3a, 0x5e, 0xb0, 0x8f, 0x89, 0xda, 0xec, 0xfe, 0xb7, 0x04, 0xad, 0x62, 0xad, 0xd0, 0x8f,
+	0xb0, 0x1e, 0xb1, 0x49, 0xca, 0x0e, 0x43, 0xc1, 0x22, 0x7a, 0x98, 0x44, 0xc5, 0x0f, 0x58, 0xfb,
+	0xa2, 0x1f, 0x99, 0x42, 0xde, 0x37, 0x8f, 0xb5, 0x05, 0x60, 0x24, 0x11, 0xdb, 0x59, 0xd0, 0x14,
+	0xd2, 0x3e, 0xc9, 0x9a, 0x63, 0x48, 0x83, 0xa5, 0x31, 0xcb, 0xb2, 0xf0, 0xe5, 0x6c, 0x13, 0x67,
+	0x9f, 0xc8, 0x80, 0x86, 0xb4, 0x5d, 0x94, 0xb6, 0x83, 0x77, 0xb2, 0x3d, 0x31, 0x23, 0x52, 0xdc,
+	0xfd, 0xbb, 0x09, 0x1b, 0xe7, 0xd5, 0x82, 0x6e, 0xc1, 0x0d, 0x13, 0x0f, 0x09, 0x36, 0x74, 0x1f,
+	0x9b, 0xd4, 0xf3, 0x75, 0x3f, 0xf0, 0xa8, 0xe1, 0x9a, 0x98, 0xba, 0x7b, 0xea, 0x25, 0xb4, 0x0d,
+	0x9d, 0x8a, 0xb0, 0xa1, 0x3b, 0x06, 0xb6, 0x6d, 0x6c, 0xaa, 0x0a, 0xea, 0xc1, 0x76, 0x05, 0x2b,
+	0x70, 0xf6, 0x1c, 0xf7, 0x3b, 0x87, 0x62, 0x42, 0xdc, 0x7c, 0x3e, 0x0f, 0xe0, 0x6e, 0x05, 0xd3,
+	0x72, 0x0e, 0x74, 0xdb, 0x32, 0xa9, 0x4e, 0x9e, 0x06, 0xfb, 0xc5, 0xd8, 0x3e, 0x81, 0x5e, 0x05,
+	0xd9, 0xc4, 0xba, 0x69, 0x5b, 0x0e, 0xa6, 0xf8, 0xb9, 0x81, 0xb1, 0x89, 0x4d, 0xb5, 0x51, 0x53,
+	0xaa, 0xe3, 0xfa, 0x74, 0xd7, 0x0d, 0x1c, 0x53, 0x6d, 0xa2, 0x7b, 0xf0, 0x71, 0x05, 0x4b, 0xb7,
+	0x09, 0xd6, 0xcd, 0xef, 0x29, 0x7e, 0x6e, 0x79, 0xbe, 0xa7, 0xb6, 0x6a, 0xec, 0x87, 0x98, 0xec,
+	0x5b, 0x9e, 0x67, 0xb9, 0x0e, 0x35, 0xb1, 0x93, 0xef, 0xe9, 0x12, 0x7a, 0x08, 0xf7, 0x2a, 0xd8,
+	0x04, 0x7b, 0x6e, 0x40, 0x8c, 0xbc, 0xd8, 0x67, 0x7a, 0xe0, 0xf9, 0xd8, 0x54, 0x97, 0x51, 0x1f,
+	0xee, 0x57, 0xd0, 0x77, 0x75, 0xcb, 0xc6, 0xf9, 0x9a, 0x62, 0xc3, 0x75, 0x4c, 0xcb, 0xb7, 0x5c,
+	0x47, 0xbd, 0x8c, 0xba, 0xb0, 0x55, 0x55, 0xf7, 0x8e, 0x4b, 0xf2, 0x9c, 0x80, 0xee, 0xc2, 0x47,
+	0x55, 0xb3, 0x0c, 0x7c, 0xea, 0xee, 0x52, 0xa2, 0x3b, 0x4f, 0xb1, 0xba, 0x52, 0x3b, 0x2f, 0x6b,
+	0x7f, 0x68, 0xe3, 0x7c, 0x00, 0xd8, 0x54, 0x57, 0x6b, 0xae, 0x6b, 0xf6, 0x14, 0xcb, 0xd1, 0xae,
+	0xa1, 0x3b, 0xd0, 0xad, 0x4c, 0xaa, 0x1f, 0xe8, 0x96, 0xad, 0xef, 0xd8, 0x58, 0x6d, 0xd7, 0xcc,
+	0xc9, 0xd4, 0x7d, 0x9d, 0xda, 0xae, 0xe7, 0xa9, 0xeb, 0xe8, 0x3e, 0xdc, 0xa9, 0xce, 0x16, 0xf8,
+	0xcf, 0xb0, 0xe3, 0x5b, 0x32, 0xa6, 0xaa, 0x5d, 0x07, 0xe0, 0xd4, 0x46, 0x5f, 0x85, 0x2b, 0xf3,
+	0x74, 0x0f, 0xfb, 0xea, 0x25, 0x84, 0xa0, 0x7d, 0x66, 0xbb, 0x95, 0xb3, 0xd4, 0x72, 0x49, 0x77,
+	0x7e, 0x56, 0xfe, 0x78, 0xbb, 0xa5, 0xfc, 0xf9, 0x76, 0x4b, 0xf9, 0xf7, 0xed, 0x96, 0x02, 0xb7,
+	0xe3, 0xa4, 0xf6, 0xd1, 0xed, 0x80, 0x9f, 0x9f, 0x86, 0x39, 0x38, 0x54, 0x7e, 0xf8, 0xf6, 0xe5,
+	0x59, 0x7a, 0x9c, 0x0c, 0x12, 0xc1, 0x46, 0x03, 0xf6, 0x7a, 0x92, 0xa4, 0x82, 0xa5, 0xd9, 0x20,
+	0x11, 0xa3, 0xc9, 0x20, 0xe6, 0x82, 0xa5, 0x3c, 0x1c, 0x0d, 0xe6, 0xd8, 0x0f, 0x65, 0xf2, 0x87,
+	0x2f, 0x19, 0x3f, 0xfe, 0xb7, 0xfe, 0x45, 0x4b, 0x62, 0x9f, 0xfd, 0x1f, 0x00, 0x00, 0xff, 0xff,
+	0xc6, 0x22, 0x3f, 0x48, 0xfd, 0x0b, 0x00, 0x00,
 }
 
 func (m *ResourceSpans) Marshal() (dAtA []byte, err error) {
@@ -1226,6 +1277,11 @@ func (m *Status) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i -= len(m.XXX_unrecognized)
 		copy(dAtA[i:], m.XXX_unrecognized)
 	}
+	if m.Code != 0 {
+		i = encodeVarintTrace(dAtA, i, uint64(m.Code))
+		i--
+		dAtA[i] = 0x18
+	}
 	if len(m.Message) > 0 {
 		i -= len(m.Message)
 		copy(dAtA[i:], m.Message)
@@ -1233,8 +1289,8 @@ func (m *Status) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i--
 		dAtA[i] = 0x12
 	}
-	if m.Code != 0 {
-		i = encodeVarintTrace(dAtA, i, uint64(m.Code))
+	if m.DeprecatedCode != 0 {
+		i = encodeVarintTrace(dAtA, i, uint64(m.DeprecatedCode))
 		i--
 		dAtA[i] = 0x8
 	}
@@ -1435,13 +1491,16 @@ func (m *Status) Size() (n int) {
 	}
 	var l int
 	_ = l
-	if m.Code != 0 {
-		n += 1 + sovTrace(uint64(m.Code))
+	if m.DeprecatedCode != 0 {
+		n += 1 + sovTrace(uint64(m.DeprecatedCode))
 	}
 	l = len(m.Message)
 	if l > 0 {
 		n += 1 + l + sovTrace(uint64(l))
 	}
+	if m.Code != 0 {
+		n += 1 + sovTrace(uint64(m.Code))
+	}
 	if m.XXX_unrecognized != nil {
 		n += len(m.XXX_unrecognized)
 	}
@@ -2543,9 +2602,9 @@ func (m *Status) Unmarshal(dAtA []byte) error {
 		switch fieldNum {
 		case 1:
 			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Code", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field DeprecatedCode", wireType)
 			}
-			m.Code = 0
+			m.DeprecatedCode = 0
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
 					return ErrIntOverflowTrace
@@ -2555,7 +2614,7 @@ func (m *Status) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				m.Code |= Status_StatusCode(b&0x7F) << shift
+				m.DeprecatedCode |= Status_DeprecatedStatusCode(b&0x7F) << shift
 				if b < 0x80 {
 					break
 				}
@@ -2592,6 +2651,25 @@ func (m *Status) Unmarshal(dAtA []byte) error {
 			}
 			m.Message = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
+		case 3:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Code", wireType)
+			}
+			m.Code = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTrace
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.Code |= Status_StatusCode(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
 		default:
 			iNdEx = preIndex
 			skippy, err := skipTrace(dAtA[iNdEx:])
diff --git a/exporters/otlp/internal/transform/span.go b/exporters/otlp/internal/transform/span.go
index 78420739c45..353ce2399fa 100644
--- a/exporters/otlp/internal/transform/span.go
+++ b/exporters/otlp/internal/transform/span.go
@@ -129,7 +129,7 @@ func status(status codes.Code, message string) *tracepb.Status {
 	var c tracepb.Status_StatusCode
 	switch status {
 	case codes.Error:
-		c = tracepb.Status_STATUS_CODE_UNKNOWN_ERROR
+		c = tracepb.Status_STATUS_CODE_ERROR
 	default:
 		c = tracepb.Status_STATUS_CODE_OK
 	}
diff --git a/exporters/otlp/internal/transform/span_test.go b/exporters/otlp/internal/transform/span_test.go
index 8a339d7427c..1c6b8eb1b92 100644
--- a/exporters/otlp/internal/transform/span_test.go
+++ b/exporters/otlp/internal/transform/span_test.go
@@ -172,7 +172,7 @@ func TestStatus(t *testing.T) {
 		{
 			codes.Error,
 			"test Error",
-			tracepb.Status_STATUS_CODE_UNKNOWN_ERROR,
+			tracepb.Status_STATUS_CODE_ERROR,
 		},
 	} {
 		expected := &tracepb.Status{Code: test.otlpStatus, Message: test.message}
diff --git a/exporters/otlp/otlp_span_test.go b/exporters/otlp/otlp_span_test.go
index 2e0e71b3462..ac7ec652772 100644
--- a/exporters/otlp/otlp_span_test.go
+++ b/exporters/otlp/otlp_span_test.go
@@ -341,7 +341,7 @@ func TestExportSpans(t *testing.T) {
 										},
 									},
 									Status: &tracepb.Status{
-										Code:    tracepb.Status_STATUS_CODE_UNKNOWN_ERROR,
+										Code:    tracepb.Status_STATUS_CODE_ERROR,
 										Message: "Unauthenticated",
 									},
 								},