diff --git a/gen/go/common/v1/common.pb.go b/gen/go/common/v1/common.pb.go index 194f64147..3930f9134 100644 --- a/gen/go/common/v1/common.pb.go +++ b/gen/go/common/v1/common.pb.go @@ -184,10 +184,60 @@ func (m *StringKeyValue) GetValue() string { return "" } +// InstrumentationLibrary is a message representing the instrumentation library information +// such as the fully qualified name and version. +type InstrumentationLibrary struct { + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *InstrumentationLibrary) Reset() { *m = InstrumentationLibrary{} } +func (m *InstrumentationLibrary) String() string { return proto.CompactTextString(m) } +func (*InstrumentationLibrary) ProtoMessage() {} +func (*InstrumentationLibrary) Descriptor() ([]byte, []int) { + return fileDescriptor_62ba46dcb97aa817, []int{2} +} + +func (m *InstrumentationLibrary) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_InstrumentationLibrary.Unmarshal(m, b) +} +func (m *InstrumentationLibrary) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_InstrumentationLibrary.Marshal(b, m, deterministic) +} +func (m *InstrumentationLibrary) XXX_Merge(src proto.Message) { + xxx_messageInfo_InstrumentationLibrary.Merge(m, src) +} +func (m *InstrumentationLibrary) XXX_Size() int { + return xxx_messageInfo_InstrumentationLibrary.Size(m) +} +func (m *InstrumentationLibrary) XXX_DiscardUnknown() { + xxx_messageInfo_InstrumentationLibrary.DiscardUnknown(m) +} + +var xxx_messageInfo_InstrumentationLibrary proto.InternalMessageInfo + +func (m *InstrumentationLibrary) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *InstrumentationLibrary) GetVersion() string { + if m != nil { + return m.Version + } + return "" +} + func init() { proto.RegisterEnum("opentelemetry.proto.common.v1.AttributeKeyValue_ValueType", AttributeKeyValue_ValueType_name, AttributeKeyValue_ValueType_value) proto.RegisterType((*AttributeKeyValue)(nil), "opentelemetry.proto.common.v1.AttributeKeyValue") proto.RegisterType((*StringKeyValue)(nil), "opentelemetry.proto.common.v1.StringKeyValue") + proto.RegisterType((*InstrumentationLibrary)(nil), "opentelemetry.proto.common.v1.InstrumentationLibrary") } func init() { @@ -195,26 +245,29 @@ func init() { } var fileDescriptor_62ba46dcb97aa817 = []byte{ - // 335 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x41, 0x4b, 0xfb, 0x40, - 0x10, 0xc5, 0xff, 0x9b, 0xb4, 0xfd, 0x37, 0xd3, 0x52, 0xe2, 0xe2, 0xa1, 0x20, 0x85, 0xb4, 0xa7, - 0x20, 0x34, 0xa1, 0x0a, 0x22, 0x1e, 0x04, 0xa3, 0x22, 0xc5, 0xd2, 0x96, 0xb4, 0x7a, 0xf0, 0x22, - 0x46, 0x87, 0x18, 0x4c, 0x77, 0x63, 0xdc, 0x14, 0xf2, 0xa9, 0xfc, 0x8a, 0xb2, 0xbb, 0x41, 0x2d, - 0x42, 0x2e, 0x61, 0xf2, 0x7b, 0x2f, 0x6f, 0x86, 0xc9, 0xc0, 0x21, 0xcf, 0x90, 0x09, 0x4c, 0x71, - 0x83, 0x22, 0x2f, 0xfd, 0x2c, 0xe7, 0x82, 0xfb, 0xcf, 0x7c, 0xb3, 0xe1, 0xcc, 0xdf, 0x4e, 0xaa, - 0xca, 0x53, 0x98, 0x0e, 0x76, 0xbc, 0x1a, 0x7a, 0x95, 0x63, 0x3b, 0x19, 0x7d, 0x1a, 0xb0, 0x77, - 0x21, 0x44, 0x9e, 0x44, 0x85, 0xc0, 0x5b, 0x2c, 0xef, 0x9f, 0xd2, 0x02, 0xa9, 0x0d, 0xe6, 0x1b, - 0x96, 0x7d, 0xe2, 0x10, 0xd7, 0x0a, 0x65, 0x49, 0xe7, 0xd0, 0x10, 0x65, 0x86, 0x7d, 0xc3, 0x21, - 0x6e, 0xef, 0xe8, 0xcc, 0xab, 0x4d, 0xf5, 0xfe, 0x24, 0x7a, 0xea, 0xb9, 0x2e, 0x33, 0x0c, 0x55, - 0x0e, 0x1d, 0x42, 0xf7, 0x43, 0xe4, 0x09, 0x8b, 0x1f, 0xb7, 0x52, 0xe9, 0x9b, 0xaa, 0x55, 0x47, - 0x33, 0x3d, 0xc4, 0x01, 0x58, 0x09, 0x13, 0x95, 0xde, 0x70, 0x88, 0x6b, 0x86, 0xed, 0x84, 0x09, - 0x2d, 0x0e, 0xa1, 0xfb, 0xc2, 0x8b, 0x28, 0xc5, 0x4a, 0x6f, 0x3a, 0xc4, 0x25, 0x61, 0x47, 0x33, - 0x6d, 0x19, 0x00, 0x44, 0x9c, 0xa7, 0x95, 0xa1, 0xe5, 0x10, 0xb7, 0x1d, 0x5a, 0x92, 0x28, 0x79, - 0x74, 0x02, 0xd6, 0xf7, 0x50, 0x14, 0xa0, 0xb5, 0x5a, 0x87, 0xd3, 0xf9, 0x8d, 0xfd, 0x8f, 0xfe, - 0x07, 0x73, 0x3a, 0x5f, 0xdb, 0x44, 0xc2, 0xab, 0xc5, 0x5d, 0x30, 0xbb, 0xb6, 0x0d, 0xda, 0x86, - 0x46, 0xb0, 0x58, 0xcc, 0x6c, 0x73, 0x74, 0x0a, 0xbd, 0x95, 0x9a, 0xb2, 0x66, 0x5b, 0xfb, 0xd0, - 0xd4, 0x5d, 0x0d, 0xc5, 0xf4, 0x4b, 0xf0, 0x0e, 0x4e, 0xc2, 0xeb, 0x37, 0x17, 0x74, 0x2e, 0x55, - 0xb9, 0x94, 0x78, 0x49, 0x1e, 0xce, 0xe3, 0x44, 0xbc, 0x16, 0x91, 0x34, 0xf8, 0xf2, 0xc3, 0xf1, - 0xcf, 0x5f, 0xdf, 0xc9, 0x19, 0xeb, 0x1b, 0x88, 0x91, 0xf9, 0xf1, 0xaf, 0x53, 0x88, 0x5a, 0x8a, - 0x1f, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0x18, 0x17, 0x7d, 0x25, 0x32, 0x02, 0x00, 0x00, + // 377 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xdb, 0x8b, 0x9b, 0x40, + 0x18, 0xc5, 0x3b, 0x6a, 0x2e, 0x7e, 0x09, 0xc1, 0x0e, 0xa5, 0x08, 0x25, 0x60, 0x7c, 0x92, 0x42, + 0x94, 0xb4, 0x50, 0x4a, 0x1f, 0x0a, 0xb5, 0x37, 0x42, 0x43, 0x12, 0x4c, 0xda, 0x87, 0xbe, 0x14, + 0x6d, 0x07, 0x3b, 0xac, 0xce, 0xb8, 0x93, 0x51, 0xf0, 0xaf, 0xda, 0x7f, 0x71, 0x71, 0xc6, 0xbd, + 0x84, 0x85, 0xbc, 0xc8, 0x99, 0xdf, 0x39, 0x9e, 0xf9, 0xd0, 0x0f, 0x5e, 0xf3, 0x8a, 0x30, 0x49, + 0x0a, 0x52, 0x12, 0x29, 0xda, 0xa8, 0x12, 0x5c, 0xf2, 0xe8, 0x2f, 0x2f, 0x4b, 0xce, 0xa2, 0x66, + 0xd5, 0xab, 0x50, 0x61, 0x3c, 0x3f, 0xcb, 0x6a, 0x18, 0xf6, 0x89, 0x66, 0xe5, 0xdf, 0x18, 0xf0, + 0xfc, 0x93, 0x94, 0x82, 0x66, 0xb5, 0x24, 0x3f, 0x48, 0xfb, 0x2b, 0x2d, 0x6a, 0x82, 0x1d, 0x30, + 0xaf, 0x48, 0xeb, 0x22, 0x0f, 0x05, 0x76, 0xd2, 0x49, 0xbc, 0x05, 0x4b, 0xb6, 0x15, 0x71, 0x0d, + 0x0f, 0x05, 0xb3, 0x37, 0x1f, 0xc2, 0x8b, 0xad, 0xe1, 0x93, 0xc6, 0x50, 0x3d, 0x8f, 0x6d, 0x45, + 0x12, 0xd5, 0x83, 0x17, 0x30, 0x3d, 0x49, 0x41, 0x59, 0xfe, 0xa7, 0xe9, 0x1c, 0xd7, 0x54, 0x57, + 0x4d, 0x34, 0xd3, 0x43, 0xbc, 0x02, 0x9b, 0x32, 0xd9, 0xfb, 0x96, 0x87, 0x02, 0x33, 0x19, 0x53, + 0x26, 0xb5, 0xb9, 0x80, 0xe9, 0x3f, 0x5e, 0x67, 0x05, 0xe9, 0xfd, 0x81, 0x87, 0x02, 0x94, 0x4c, + 0x34, 0xd3, 0x91, 0x39, 0x40, 0xc6, 0x79, 0xd1, 0x07, 0x86, 0x1e, 0x0a, 0xc6, 0x89, 0xdd, 0x11, + 0x65, 0xfb, 0xef, 0xc0, 0xbe, 0x1f, 0x0a, 0x03, 0x0c, 0x0f, 0xc7, 0x64, 0xbd, 0xfd, 0xee, 0x3c, + 0xc3, 0x23, 0x30, 0xd7, 0xdb, 0xa3, 0x83, 0x3a, 0xf8, 0x65, 0xf7, 0x33, 0xde, 0x7c, 0x75, 0x0c, + 0x3c, 0x06, 0x2b, 0xde, 0xed, 0x36, 0x8e, 0xe9, 0xbf, 0x87, 0xd9, 0x41, 0x4d, 0x79, 0xe1, 0x6b, + 0xbd, 0x80, 0x81, 0xbe, 0xd5, 0x50, 0x4c, 0x1f, 0xfc, 0x6f, 0xf0, 0x72, 0xcd, 0x4e, 0x52, 0xd4, + 0x25, 0x61, 0x32, 0x95, 0x94, 0xb3, 0x0d, 0xcd, 0x44, 0x2a, 0x5a, 0x8c, 0xc1, 0x62, 0x69, 0x49, + 0xfa, 0x0a, 0xa5, 0xb1, 0x0b, 0xa3, 0x86, 0x88, 0x13, 0xe5, 0xac, 0x6f, 0xb9, 0x3b, 0xc6, 0xd7, + 0xe0, 0x51, 0x7e, 0xf9, 0x0f, 0xc4, 0x93, 0xcf, 0x4a, 0xee, 0x3b, 0xbc, 0x47, 0xbf, 0x3f, 0xe6, + 0x54, 0xfe, 0xaf, 0xb3, 0x2e, 0x10, 0x75, 0x2f, 0x2e, 0x1f, 0xb6, 0xe7, 0xac, 0x67, 0xa9, 0x77, + 0x29, 0x27, 0x2c, 0xca, 0x1f, 0xad, 0x54, 0x36, 0x54, 0xfc, 0xed, 0x6d, 0x00, 0x00, 0x00, 0xff, + 0xff, 0x84, 0x93, 0x08, 0x5f, 0x7a, 0x02, 0x00, 0x00, } diff --git a/gen/go/metrics/v1/metrics.pb.go b/gen/go/metrics/v1/metrics.pb.go index c0fe5e70b..a7ea01498 100644 --- a/gen/go/metrics/v1/metrics.pb.go +++ b/gen/go/metrics/v1/metrics.pb.go @@ -97,19 +97,19 @@ func (x MetricDescriptor_Type) String() string { } func (MetricDescriptor_Type) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_3c3112f9fa006917, []int{2, 0} + return fileDescriptor_3c3112f9fa006917, []int{3, 0} } -// A collection of metrics from a Resource. +// A collection of InstrumentationLibraryMetrics from a Resource. type ResourceMetrics struct { - // A list of metrics that originate from a resource. - Metrics []*Metric `protobuf:"bytes,1,rep,name=metrics,proto3" json:"metrics,omitempty"` // The resource for the metrics in this message. // If this field is not set then no resource info is known. - Resource *v1.Resource `protobuf:"bytes,2,opt,name=resource,proto3" json:"resource,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Resource *v1.Resource `protobuf:"bytes,1,opt,name=resource,proto3" json:"resource,omitempty"` + // A list of metrics that originate from a resource. + LibraryMetrics []*InstrumentationLibraryMetrics `protobuf:"bytes,2,rep,name=library_metrics,json=libraryMetrics,proto3" json:"library_metrics,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ResourceMetrics) Reset() { *m = ResourceMetrics{} } @@ -137,16 +137,67 @@ func (m *ResourceMetrics) XXX_DiscardUnknown() { var xxx_messageInfo_ResourceMetrics proto.InternalMessageInfo -func (m *ResourceMetrics) GetMetrics() []*Metric { +func (m *ResourceMetrics) GetResource() *v1.Resource { if m != nil { - return m.Metrics + return m.Resource } return nil } -func (m *ResourceMetrics) GetResource() *v1.Resource { +func (m *ResourceMetrics) GetLibraryMetrics() []*InstrumentationLibraryMetrics { if m != nil { - return m.Resource + return m.LibraryMetrics + } + return nil +} + +// A collection of Metrics produced by an InstrumentationLibrary. +type InstrumentationLibraryMetrics struct { + // The instrumentation library information for the metrics in this message. + // If this field is not set then no library info is known. + Library *v11.InstrumentationLibrary `protobuf:"bytes,1,opt,name=library,proto3" json:"library,omitempty"` + // A list of metrics that originate from an instrumentation library. + Metrics []*Metric `protobuf:"bytes,2,rep,name=metrics,proto3" json:"metrics,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *InstrumentationLibraryMetrics) Reset() { *m = InstrumentationLibraryMetrics{} } +func (m *InstrumentationLibraryMetrics) String() string { return proto.CompactTextString(m) } +func (*InstrumentationLibraryMetrics) ProtoMessage() {} +func (*InstrumentationLibraryMetrics) Descriptor() ([]byte, []int) { + return fileDescriptor_3c3112f9fa006917, []int{1} +} + +func (m *InstrumentationLibraryMetrics) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_InstrumentationLibraryMetrics.Unmarshal(m, b) +} +func (m *InstrumentationLibraryMetrics) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_InstrumentationLibraryMetrics.Marshal(b, m, deterministic) +} +func (m *InstrumentationLibraryMetrics) XXX_Merge(src proto.Message) { + xxx_messageInfo_InstrumentationLibraryMetrics.Merge(m, src) +} +func (m *InstrumentationLibraryMetrics) XXX_Size() int { + return xxx_messageInfo_InstrumentationLibraryMetrics.Size(m) +} +func (m *InstrumentationLibraryMetrics) XXX_DiscardUnknown() { + xxx_messageInfo_InstrumentationLibraryMetrics.DiscardUnknown(m) +} + +var xxx_messageInfo_InstrumentationLibraryMetrics proto.InternalMessageInfo + +func (m *InstrumentationLibraryMetrics) GetLibrary() *v11.InstrumentationLibrary { + if m != nil { + return m.Library + } + return nil +} + +func (m *InstrumentationLibraryMetrics) GetMetrics() []*Metric { + if m != nil { + return m.Metrics } return nil } @@ -219,7 +270,7 @@ func (m *Metric) Reset() { *m = Metric{} } func (m *Metric) String() string { return proto.CompactTextString(m) } func (*Metric) ProtoMessage() {} func (*Metric) Descriptor() ([]byte, []int) { - return fileDescriptor_3c3112f9fa006917, []int{1} + return fileDescriptor_3c3112f9fa006917, []int{2} } func (m *Metric) XXX_Unmarshal(b []byte) error { @@ -297,7 +348,7 @@ func (m *MetricDescriptor) Reset() { *m = MetricDescriptor{} } func (m *MetricDescriptor) String() string { return proto.CompactTextString(m) } func (*MetricDescriptor) ProtoMessage() {} func (*MetricDescriptor) Descriptor() ([]byte, []int) { - return fileDescriptor_3c3112f9fa006917, []int{2} + return fileDescriptor_3c3112f9fa006917, []int{3} } func (m *MetricDescriptor) XXX_Unmarshal(b []byte) error { @@ -382,7 +433,7 @@ func (m *Int64DataPoint) Reset() { *m = Int64DataPoint{} } func (m *Int64DataPoint) String() string { return proto.CompactTextString(m) } func (*Int64DataPoint) ProtoMessage() {} func (*Int64DataPoint) Descriptor() ([]byte, []int) { - return fileDescriptor_3c3112f9fa006917, []int{3} + return fileDescriptor_3c3112f9fa006917, []int{4} } func (m *Int64DataPoint) XXX_Unmarshal(b []byte) error { @@ -460,7 +511,7 @@ func (m *DoubleDataPoint) Reset() { *m = DoubleDataPoint{} } func (m *DoubleDataPoint) String() string { return proto.CompactTextString(m) } func (*DoubleDataPoint) ProtoMessage() {} func (*DoubleDataPoint) Descriptor() ([]byte, []int) { - return fileDescriptor_3c3112f9fa006917, []int{4} + return fileDescriptor_3c3112f9fa006917, []int{5} } func (m *DoubleDataPoint) XXX_Unmarshal(b []byte) error { @@ -569,7 +620,7 @@ func (m *HistogramDataPoint) Reset() { *m = HistogramDataPoint{} } func (m *HistogramDataPoint) String() string { return proto.CompactTextString(m) } func (*HistogramDataPoint) ProtoMessage() {} func (*HistogramDataPoint) Descriptor() ([]byte, []int) { - return fileDescriptor_3c3112f9fa006917, []int{5} + return fileDescriptor_3c3112f9fa006917, []int{6} } func (m *HistogramDataPoint) XXX_Unmarshal(b []byte) error { @@ -655,7 +706,7 @@ func (m *HistogramDataPoint_Bucket) Reset() { *m = HistogramDataPoint_Bu func (m *HistogramDataPoint_Bucket) String() string { return proto.CompactTextString(m) } func (*HistogramDataPoint_Bucket) ProtoMessage() {} func (*HistogramDataPoint_Bucket) Descriptor() ([]byte, []int) { - return fileDescriptor_3c3112f9fa006917, []int{5, 0} + return fileDescriptor_3c3112f9fa006917, []int{6, 0} } func (m *HistogramDataPoint_Bucket) XXX_Unmarshal(b []byte) error { @@ -713,7 +764,7 @@ func (m *HistogramDataPoint_Bucket_Exemplar) Reset() { *m = HistogramDat func (m *HistogramDataPoint_Bucket_Exemplar) String() string { return proto.CompactTextString(m) } func (*HistogramDataPoint_Bucket_Exemplar) ProtoMessage() {} func (*HistogramDataPoint_Bucket_Exemplar) Descriptor() ([]byte, []int) { - return fileDescriptor_3c3112f9fa006917, []int{5, 0, 0} + return fileDescriptor_3c3112f9fa006917, []int{6, 0, 0} } func (m *HistogramDataPoint_Bucket_Exemplar) XXX_Unmarshal(b []byte) error { @@ -789,7 +840,7 @@ func (m *SummaryDataPoint) Reset() { *m = SummaryDataPoint{} } func (m *SummaryDataPoint) String() string { return proto.CompactTextString(m) } func (*SummaryDataPoint) ProtoMessage() {} func (*SummaryDataPoint) Descriptor() ([]byte, []int) { - return fileDescriptor_3c3112f9fa006917, []int{6} + return fileDescriptor_3c3112f9fa006917, []int{7} } func (m *SummaryDataPoint) XXX_Unmarshal(b []byte) error { @@ -868,7 +919,7 @@ func (m *SummaryDataPoint_ValueAtPercentile) Reset() { *m = SummaryDataP func (m *SummaryDataPoint_ValueAtPercentile) String() string { return proto.CompactTextString(m) } func (*SummaryDataPoint_ValueAtPercentile) ProtoMessage() {} func (*SummaryDataPoint_ValueAtPercentile) Descriptor() ([]byte, []int) { - return fileDescriptor_3c3112f9fa006917, []int{6, 0} + return fileDescriptor_3c3112f9fa006917, []int{7, 0} } func (m *SummaryDataPoint_ValueAtPercentile) XXX_Unmarshal(b []byte) error { @@ -906,6 +957,7 @@ func (m *SummaryDataPoint_ValueAtPercentile) GetValue() float64 { func init() { proto.RegisterEnum("opentelemetry.proto.metrics.v1.MetricDescriptor_Type", MetricDescriptor_Type_name, MetricDescriptor_Type_value) proto.RegisterType((*ResourceMetrics)(nil), "opentelemetry.proto.metrics.v1.ResourceMetrics") + proto.RegisterType((*InstrumentationLibraryMetrics)(nil), "opentelemetry.proto.metrics.v1.InstrumentationLibraryMetrics") proto.RegisterType((*Metric)(nil), "opentelemetry.proto.metrics.v1.Metric") proto.RegisterType((*MetricDescriptor)(nil), "opentelemetry.proto.metrics.v1.MetricDescriptor") proto.RegisterType((*Int64DataPoint)(nil), "opentelemetry.proto.metrics.v1.Int64DataPoint") @@ -922,61 +974,64 @@ func init() { } var fileDescriptor_3c3112f9fa006917 = []byte{ - // 885 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x56, 0x5f, 0x6f, 0xe3, 0x44, - 0x10, 0xc7, 0x71, 0xfe, 0xf4, 0x26, 0x47, 0xe3, 0x6c, 0x0f, 0xc9, 0xca, 0xc3, 0x29, 0xe4, 0x01, - 0x0a, 0xa2, 0x0e, 0x2d, 0xc7, 0x49, 0x3c, 0x41, 0xd2, 0x84, 0x5e, 0xc4, 0xa5, 0x8d, 0x36, 0xc9, - 0x49, 0x9c, 0x74, 0x04, 0xc7, 0x59, 0xd2, 0x15, 0xf1, 0x1f, 0x79, 0xd7, 0x55, 0xf3, 0xce, 0x33, - 0x1f, 0x00, 0x81, 0x04, 0xdf, 0x07, 0xbe, 0x09, 0x1f, 0x02, 0xed, 0xae, 0x1d, 0xdb, 0x69, 0x8f, - 0x10, 0x78, 0x3a, 0xde, 0xc6, 0xbf, 0x99, 0xdf, 0x6f, 0x66, 0x3c, 0x63, 0xef, 0xc2, 0x47, 0x7e, - 0x40, 0x3c, 0x4e, 0x56, 0xc4, 0x25, 0x3c, 0x5c, 0xb7, 0x83, 0xd0, 0xe7, 0x7e, 0x5b, 0xd8, 0xd4, - 0x61, 0xed, 0x9b, 0xd3, 0xc4, 0xb4, 0xa4, 0x03, 0x3d, 0xce, 0x45, 0x2b, 0xd0, 0x4a, 0x42, 0x6e, - 0x4e, 0x1b, 0x1f, 0xde, 0xa7, 0xe6, 0xf8, 0xae, 0xeb, 0x7b, 0x42, 0x4c, 0x59, 0x8a, 0xd6, 0xb0, - 0xee, 0x8b, 0x0d, 0x09, 0xf3, 0xa3, 0xd0, 0x21, 0x22, 0x3a, 0xb1, 0x55, 0x7c, 0xeb, 0x27, 0x0d, - 0x6a, 0x38, 0x86, 0x86, 0x2a, 0x25, 0xfa, 0x02, 0x2a, 0x71, 0x76, 0x53, 0x6b, 0xea, 0xc7, 0xd5, - 0xb3, 0xf7, 0xac, 0xbf, 0xaf, 0xd0, 0x52, 0x4c, 0x9c, 0xd0, 0x50, 0x1f, 0x0e, 0x92, 0x3c, 0x66, - 0xa1, 0xa9, 0x1d, 0x57, 0xcf, 0x3e, 0xb8, 0x57, 0x62, 0x53, 0xcc, 0xcd, 0xa9, 0x95, 0x54, 0x81, - 0x37, 0xd4, 0xd6, 0x9f, 0x3a, 0x94, 0x95, 0x34, 0x7a, 0x05, 0x75, 0x25, 0x3e, 0x5b, 0x10, 0xe6, - 0x84, 0x34, 0xe0, 0x7e, 0x68, 0x6a, 0x52, 0xfa, 0xe3, 0x7f, 0x56, 0x5d, 0x6f, 0xc3, 0xc3, 0x86, - 0xbb, 0x85, 0xa0, 0x97, 0x50, 0xa7, 0x1e, 0x7f, 0xfa, 0x64, 0xb6, 0xb0, 0xb9, 0x3d, 0x0b, 0x7c, - 0xea, 0x71, 0x66, 0x16, 0x64, 0xf3, 0xd6, 0x2e, 0xf9, 0x81, 0x20, 0xf6, 0x6c, 0x6e, 0x8f, 0x04, - 0x0d, 0xd7, 0x68, 0xee, 0x99, 0xa1, 0x57, 0x80, 0x16, 0x7e, 0x34, 0x5f, 0x91, 0x9c, 0xb8, 0x2e, - 0xc5, 0xdb, 0xbb, 0xc4, 0x7b, 0x92, 0x99, 0xaa, 0x1b, 0x8b, 0x3c, 0xc0, 0xd0, 0x77, 0xf0, 0xce, - 0x35, 0x65, 0xdc, 0x5f, 0x86, 0xb6, 0x9b, 0xcb, 0x50, 0x94, 0x19, 0xce, 0x76, 0x65, 0x78, 0x96, - 0x90, 0xd3, 0x24, 0x47, 0xd7, 0x77, 0x30, 0x86, 0xbe, 0x85, 0x23, 0x16, 0xb9, 0xae, 0x1d, 0xae, - 0x73, 0x59, 0x4a, 0x32, 0xcb, 0xce, 0x19, 0x8c, 0x15, 0x35, 0xcd, 0x51, 0x67, 0x5b, 0x08, 0x6b, - 0xfd, 0xa8, 0x83, 0xb1, 0x3d, 0x2b, 0x84, 0xa0, 0xe8, 0xd9, 0x2e, 0x91, 0xb3, 0x7e, 0x80, 0xa5, - 0x8d, 0x9a, 0x50, 0x4d, 0xb6, 0x80, 0xfa, 0x9e, 0xdc, 0xb0, 0x07, 0x38, 0x0b, 0x09, 0x56, 0xe4, - 0x51, 0x6e, 0xea, 0x8a, 0x25, 0x6c, 0x34, 0x80, 0x22, 0x5f, 0x07, 0xc4, 0x2c, 0x36, 0xb5, 0xe3, - 0xc3, 0xb3, 0x4f, 0xf7, 0xdd, 0x1a, 0x6b, 0xb2, 0x0e, 0x08, 0x96, 0x12, 0xa8, 0x0f, 0xe5, 0x95, - 0x3d, 0x27, 0xab, 0xa4, 0xfd, 0x93, 0x7b, 0xc5, 0xe2, 0x0f, 0x53, 0x74, 0xcf, 0x43, 0xea, 0x2d, - 0xbf, 0x22, 0xeb, 0x17, 0xf6, 0x2a, 0x22, 0x38, 0x26, 0xb7, 0x7e, 0xd1, 0xa0, 0x28, 0x54, 0x51, - 0x0d, 0xaa, 0xd3, 0xcb, 0xf1, 0xa8, 0x7f, 0x3e, 0xf8, 0x72, 0xd0, 0xef, 0x19, 0x6f, 0x09, 0xe0, - 0xa2, 0x33, 0xbd, 0xe8, 0xcf, 0x06, 0x97, 0x93, 0xa7, 0x4f, 0x0c, 0x0d, 0x19, 0xf0, 0x50, 0x01, - 0xbd, 0xab, 0x69, 0xf7, 0x79, 0xdf, 0x28, 0xa0, 0x23, 0xa8, 0x29, 0xe4, 0xd9, 0x60, 0x3c, 0xb9, - 0xba, 0xc0, 0x9d, 0xa1, 0xa1, 0xa3, 0x3a, 0xbc, 0x7d, 0x7e, 0x35, 0xbd, 0x9c, 0xf4, 0x71, 0xcc, - 0x2c, 0x22, 0x04, 0x87, 0x09, 0x14, 0x73, 0x4b, 0xc8, 0x84, 0x47, 0xe7, 0xd3, 0xe1, 0xf4, 0x79, - 0x67, 0x32, 0x78, 0x91, 0x15, 0x28, 0xa3, 0x2a, 0x54, 0xc6, 0xd3, 0xe1, 0xb0, 0x83, 0xbf, 0x36, - 0x2a, 0xad, 0xdf, 0x35, 0x38, 0xcc, 0x6f, 0x77, 0xa6, 0x73, 0xed, 0x3f, 0x74, 0x8e, 0x2c, 0x38, - 0x62, 0xdc, 0x0e, 0xf9, 0x8c, 0x53, 0x97, 0xcc, 0x22, 0x8f, 0xde, 0x7a, 0xb6, 0xe7, 0xcb, 0x49, - 0x96, 0x71, 0x5d, 0xba, 0x26, 0xd4, 0x25, 0xd3, 0xd8, 0x81, 0x4e, 0x00, 0x89, 0x48, 0xc6, 0x6d, - 0x37, 0x48, 0xc3, 0x75, 0x15, 0xbe, 0xf1, 0x6c, 0xc2, 0x1f, 0x41, 0xe9, 0x46, 0xe4, 0x93, 0xb3, - 0xd6, 0xb1, 0x7a, 0x68, 0xfd, 0xa1, 0x41, 0x6d, 0xeb, 0x7b, 0x7a, 0x13, 0xfb, 0xd1, 0x92, 0x7e, - 0x7e, 0x28, 0x01, 0xba, 0xfb, 0xf5, 0xbe, 0x39, 0x2d, 0x39, 0x7e, 0xe4, 0x71, 0xd9, 0x52, 0x11, - 0xab, 0x07, 0x64, 0x80, 0xce, 0x22, 0xd7, 0x2c, 0xc9, 0x36, 0x85, 0x89, 0xc6, 0x50, 0x99, 0x47, - 0xce, 0xf7, 0x84, 0x33, 0xb3, 0x2c, 0xdb, 0xf9, 0x6c, 0xff, 0x1f, 0x9a, 0xd5, 0x95, 0x0a, 0x38, - 0x51, 0x42, 0xef, 0x43, 0x8d, 0xdc, 0x06, 0x2b, 0xea, 0x50, 0x3e, 0x9b, 0xfb, 0x91, 0xb7, 0x60, - 0x66, 0xa5, 0xa9, 0x1f, 0x6b, 0xf8, 0x30, 0x81, 0xbb, 0x12, 0x6d, 0xfc, 0x56, 0x80, 0xb2, 0x22, - 0xa7, 0x05, 0x6b, 0xd9, 0x82, 0xbf, 0x81, 0x03, 0x72, 0x4b, 0xdc, 0x60, 0x65, 0x87, 0xf1, 0x49, - 0xd7, 0xfd, 0xd7, 0xf5, 0x59, 0xfd, 0x58, 0x09, 0x6f, 0x34, 0x1b, 0xbf, 0x6a, 0x70, 0x90, 0xc0, - 0xe9, 0x1a, 0x68, 0x99, 0x35, 0x78, 0xcd, 0x8b, 0x2f, 0xbc, 0xee, 0xc5, 0x5f, 0x41, 0xd5, 0xe6, - 0xdc, 0x76, 0xae, 0x5d, 0x92, 0x9e, 0x43, 0x7b, 0xee, 0x48, 0x56, 0xa1, 0xf5, 0xb3, 0x0e, 0xc6, - 0xf6, 0xef, 0xfd, 0x7f, 0xb6, 0x84, 0x3e, 0xd4, 0x03, 0x12, 0x3a, 0xc4, 0xe3, 0x74, 0x45, 0x66, - 0xf2, 0xb5, 0x27, 0xeb, 0xd8, 0xdd, 0xf7, 0xe4, 0xb3, 0x64, 0x87, 0x1d, 0x3e, 0xda, 0x08, 0x62, - 0x23, 0x15, 0x97, 0x4e, 0xd6, 0x18, 0x40, 0xfd, 0x4e, 0x18, 0x7a, 0x0c, 0x90, 0x06, 0xc6, 0x3b, - 0x90, 0x41, 0xd2, 0xf5, 0x28, 0x64, 0xd6, 0xa3, 0xcb, 0xe1, 0x5d, 0xea, 0xef, 0x28, 0xb2, 0xfb, - 0x30, 0xbe, 0xfb, 0x8d, 0x84, 0x63, 0xa4, 0xbd, 0xfc, 0x7c, 0x49, 0xf9, 0x75, 0x34, 0x17, 0x03, - 0x6a, 0x0b, 0xea, 0x49, 0x7a, 0xa5, 0xcc, 0x29, 0x9d, 0xa8, 0x0b, 0xe6, 0x92, 0x78, 0xed, 0x65, - 0xf6, 0x86, 0x3b, 0x2f, 0x4b, 0xc7, 0x27, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0x49, 0xe3, 0x9e, - 0x86, 0x0a, 0x0b, 0x00, 0x00, + // 943 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x56, 0xdd, 0x6e, 0xe3, 0x44, + 0x14, 0xc6, 0x71, 0x7e, 0x96, 0x93, 0x25, 0x71, 0xa6, 0x8b, 0x14, 0x45, 0x62, 0x15, 0x72, 0x01, + 0x05, 0x51, 0x87, 0x96, 0x52, 0x89, 0x0b, 0x04, 0x49, 0x13, 0xba, 0x11, 0x4d, 0x13, 0x4d, 0x92, + 0x95, 0x58, 0x69, 0x09, 0x4e, 0x32, 0x9b, 0x8e, 0xb0, 0xc7, 0x96, 0x3d, 0xae, 0x9a, 0x7b, 0xae, + 0x79, 0x02, 0x90, 0xe0, 0x15, 0x78, 0x02, 0x1e, 0x00, 0xde, 0x84, 0x87, 0x40, 0x9e, 0xf1, 0xc4, + 0x4e, 0xfa, 0x13, 0x0a, 0x57, 0xcb, 0xdd, 0xf8, 0x3b, 0xe7, 0xfb, 0xce, 0xf9, 0x66, 0x8e, 0xed, + 0x81, 0x8f, 0x5c, 0x8f, 0x30, 0x4e, 0x6c, 0xe2, 0x10, 0xee, 0xaf, 0x9a, 0x9e, 0xef, 0x72, 0xb7, + 0x19, 0xad, 0xe9, 0x3c, 0x68, 0x5e, 0x1d, 0xaa, 0xa5, 0x29, 0x02, 0xe8, 0xe9, 0x46, 0xb6, 0x04, + 0x4d, 0x95, 0x72, 0x75, 0x58, 0xfb, 0xf0, 0x36, 0xb5, 0xb9, 0xeb, 0x38, 0x2e, 0x8b, 0xc4, 0xe4, + 0x4a, 0xd2, 0x6a, 0xe6, 0x6d, 0xb9, 0x3e, 0x09, 0xdc, 0xd0, 0x9f, 0x93, 0x28, 0x5b, 0xad, 0x65, + 0x7e, 0xe3, 0x77, 0x0d, 0xca, 0x38, 0x86, 0xfa, 0xb2, 0x24, 0xea, 0xc2, 0x23, 0x95, 0x55, 0xd5, + 0xea, 0xda, 0x7e, 0xf1, 0xe8, 0x03, 0xf3, 0xb6, 0x16, 0xd7, 0x52, 0x57, 0x87, 0xa6, 0xd2, 0xc0, + 0x6b, 0x2a, 0x7a, 0x05, 0x65, 0x9b, 0xce, 0x7c, 0xcb, 0x5f, 0x4d, 0x63, 0x33, 0xd5, 0x4c, 0x5d, + 0xdf, 0x2f, 0x1e, 0x7d, 0x6e, 0xde, 0x6f, 0xd8, 0xec, 0xb1, 0x80, 0xfb, 0xa1, 0x43, 0x18, 0xb7, + 0x38, 0x75, 0xd9, 0xb9, 0x54, 0x89, 0xdb, 0xc3, 0x25, 0x7b, 0xe3, 0xb9, 0xf1, 0x9b, 0x06, 0xef, + 0xdc, 0xcb, 0x40, 0x03, 0x28, 0xc4, 0x9c, 0xd8, 0xcf, 0xa7, 0xb7, 0x76, 0x10, 0x6f, 0xe4, 0x9d, + 0x0d, 0x60, 0xa5, 0x82, 0xbe, 0x84, 0xc2, 0xa6, 0xa5, 0xf7, 0x76, 0x59, 0x92, 0xad, 0x60, 0x45, + 0x6b, 0xfc, 0xa5, 0x43, 0x5e, 0x62, 0xe8, 0x25, 0x54, 0x24, 0x3a, 0x5d, 0x90, 0x60, 0xee, 0x53, + 0x8f, 0xbb, 0x7e, 0xdc, 0xe7, 0xc7, 0xff, 0x4c, 0xb6, 0xb3, 0xe6, 0x61, 0xc3, 0xd9, 0x42, 0xd0, + 0x0b, 0xa8, 0x50, 0xc6, 0x4f, 0x8e, 0xa7, 0x0b, 0x8b, 0x5b, 0x53, 0xcf, 0xa5, 0x8c, 0xab, 0xae, + 0xcd, 0xdd, 0x07, 0xc1, 0x4f, 0x8e, 0x3b, 0x16, 0xb7, 0x86, 0x11, 0x0d, 0x97, 0xe9, 0xc6, 0x73, + 0x80, 0x5e, 0x02, 0x5a, 0xb8, 0xe1, 0xcc, 0x26, 0x1b, 0xe2, 0xba, 0x10, 0x6f, 0xee, 0x12, 0xef, + 0x08, 0x66, 0xa2, 0x6e, 0x2c, 0x36, 0x81, 0x00, 0xbd, 0x82, 0xb7, 0x2f, 0x69, 0xc0, 0xdd, 0xa5, + 0x6f, 0x39, 0x1b, 0x15, 0xb2, 0xa2, 0xc2, 0xd1, 0xae, 0x0a, 0xcf, 0x14, 0x39, 0x29, 0xb2, 0x77, + 0x79, 0x03, 0x0b, 0xd0, 0x77, 0xb0, 0x17, 0x84, 0x8e, 0x13, 0x4d, 0x6a, 0xba, 0x4a, 0x4e, 0x54, + 0xd9, 0x79, 0x06, 0x23, 0x49, 0x4d, 0x6a, 0x54, 0x82, 0x2d, 0x24, 0x68, 0xfc, 0xa8, 0x83, 0xb1, + 0x7d, 0x56, 0x08, 0x41, 0x96, 0x59, 0x8e, 0x7c, 0xc7, 0xde, 0xc4, 0x62, 0x8d, 0xea, 0x50, 0x54, + 0x53, 0x40, 0x5d, 0x56, 0xcd, 0x88, 0x50, 0x1a, 0x8a, 0x58, 0x21, 0xa3, 0xbc, 0xaa, 0x4b, 0x56, + 0xb4, 0x46, 0x3d, 0xc8, 0xf2, 0x95, 0x47, 0xaa, 0xd9, 0xba, 0xb6, 0x5f, 0xba, 0x63, 0xba, 0xef, + 0x99, 0x1a, 0x73, 0xbc, 0xf2, 0x08, 0x16, 0x12, 0xa8, 0x0b, 0x79, 0xdb, 0x9a, 0x11, 0x5b, 0xd9, + 0x3f, 0xd8, 0xf1, 0xaa, 0x8c, 0xb8, 0x4f, 0xd9, 0xf2, 0x6b, 0xb2, 0x7a, 0x6e, 0xd9, 0x21, 0xc1, + 0x31, 0xb9, 0xf1, 0xb3, 0x06, 0xd9, 0x48, 0x15, 0x95, 0xa1, 0x38, 0xb9, 0x18, 0x0d, 0xbb, 0xa7, + 0xbd, 0xaf, 0x7a, 0xdd, 0x8e, 0xf1, 0x46, 0x04, 0x9c, 0xb5, 0x26, 0x67, 0xdd, 0x69, 0xef, 0x62, + 0x7c, 0x72, 0x6c, 0x68, 0xc8, 0x80, 0xc7, 0x12, 0xe8, 0x0c, 0x26, 0xed, 0xf3, 0xae, 0x91, 0x41, + 0x7b, 0x50, 0x96, 0xc8, 0xb3, 0xde, 0x68, 0x3c, 0x38, 0xc3, 0xad, 0xbe, 0xa1, 0xa3, 0x0a, 0xbc, + 0x75, 0x3a, 0x98, 0x5c, 0x8c, 0xbb, 0x38, 0x66, 0x66, 0x11, 0x82, 0x92, 0x82, 0x62, 0x6e, 0x0e, + 0x55, 0xe1, 0xc9, 0xe9, 0xa4, 0x3f, 0x39, 0x6f, 0x8d, 0x7b, 0xcf, 0xd3, 0x02, 0x79, 0x54, 0x84, + 0xc2, 0x68, 0xd2, 0xef, 0xb7, 0xf0, 0x37, 0x46, 0xa1, 0xf1, 0x87, 0x06, 0xa5, 0xcd, 0xe9, 0x4e, + 0x39, 0xd7, 0xfe, 0x83, 0x73, 0x64, 0xc2, 0x5e, 0xc0, 0x2d, 0x9f, 0x4f, 0x39, 0x75, 0xc8, 0x34, + 0x64, 0xf4, 0x9a, 0x59, 0xcc, 0x15, 0x27, 0x99, 0xc7, 0x15, 0x11, 0x1a, 0x53, 0x87, 0x4c, 0xe2, + 0x00, 0x3a, 0x00, 0x14, 0x65, 0x06, 0xdc, 0x72, 0xbc, 0x24, 0x5d, 0x97, 0xe9, 0xeb, 0xc8, 0x3a, + 0xfd, 0x09, 0xe4, 0xae, 0xa2, 0x7a, 0xe2, 0xac, 0x75, 0x2c, 0x1f, 0x1a, 0x7f, 0x6a, 0x50, 0xde, + 0x7a, 0x9f, 0x5e, 0x47, 0x3f, 0x9a, 0xf2, 0xf3, 0x43, 0x0e, 0xd0, 0xcd, 0xb7, 0xf7, 0xf5, 0xb1, + 0x34, 0x77, 0x43, 0xc6, 0x85, 0xa5, 0x2c, 0x96, 0x0f, 0xc8, 0x00, 0x3d, 0x08, 0x9d, 0x6a, 0x4e, + 0xd8, 0x8c, 0x96, 0x68, 0x04, 0x85, 0x59, 0x38, 0xff, 0x9e, 0xf0, 0xa0, 0x9a, 0x17, 0x76, 0x3e, + 0x7b, 0xf8, 0x07, 0xcd, 0x6c, 0x0b, 0x05, 0xac, 0x94, 0xd0, 0xfb, 0x50, 0x26, 0xd7, 0x9e, 0x4d, + 0xe7, 0x94, 0x4f, 0x67, 0x6e, 0xc8, 0x16, 0x41, 0xb5, 0x50, 0xd7, 0xf7, 0x35, 0x5c, 0x52, 0x70, + 0x5b, 0xa0, 0xb5, 0x5f, 0x33, 0x90, 0x97, 0xe4, 0xa4, 0x61, 0x2d, 0xdd, 0xf0, 0xb7, 0xf0, 0x88, + 0x5c, 0x13, 0xc7, 0xb3, 0x2d, 0x5f, 0x6c, 0x4d, 0xf1, 0xa8, 0xfd, 0xaf, 0xfb, 0x33, 0xbb, 0xb1, + 0x12, 0x5e, 0x6b, 0xd6, 0x7e, 0xd1, 0xe0, 0x91, 0x82, 0x93, 0x31, 0xd0, 0x52, 0x63, 0x70, 0xc7, + 0xc6, 0x67, 0xee, 0xda, 0xf8, 0x01, 0x14, 0x2d, 0xce, 0xad, 0xf9, 0x65, 0xf4, 0xe7, 0x56, 0xff, + 0xa1, 0x07, 0xce, 0x48, 0x5a, 0xa1, 0xf1, 0x93, 0x0e, 0xc6, 0xf6, 0xe7, 0xfd, 0x7f, 0x36, 0x84, + 0x2e, 0x54, 0x3c, 0xe2, 0xcf, 0x09, 0xe3, 0xd4, 0x26, 0x53, 0xb1, 0xed, 0x6a, 0x1c, 0xdb, 0x0f, + 0xfd, 0xf3, 0x99, 0xc2, 0x61, 0x8b, 0x0f, 0xd7, 0x82, 0xd8, 0x48, 0xc4, 0x45, 0x30, 0xa8, 0xf5, + 0xa0, 0x72, 0x23, 0x0d, 0x3d, 0x05, 0x48, 0x12, 0xe3, 0x19, 0x48, 0x21, 0xc9, 0x78, 0x64, 0x52, + 0xe3, 0xd1, 0xe6, 0xf0, 0x2e, 0x75, 0x77, 0x34, 0xd9, 0x7e, 0x1c, 0xdf, 0x02, 0x87, 0x51, 0x60, + 0xa8, 0xbd, 0xf8, 0x62, 0x49, 0xf9, 0x65, 0x38, 0x8b, 0x0e, 0xa8, 0x19, 0x51, 0x0f, 0x92, 0xdb, + 0xf2, 0x86, 0xd2, 0x81, 0xbc, 0x3b, 0x2f, 0x09, 0x6b, 0x2e, 0xd3, 0x97, 0xf7, 0x59, 0x5e, 0x04, + 0x3e, 0xf9, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x5a, 0xca, 0xa7, 0xde, 0xe5, 0x0b, 0x00, 0x00, } diff --git a/gen/go/trace/v1/trace.pb.go b/gen/go/trace/v1/trace.pb.go index 2ac6a32a1..0f3cae2b9 100644 --- a/gen/go/trace/v1/trace.pb.go +++ b/gen/go/trace/v1/trace.pb.go @@ -72,7 +72,7 @@ func (x Span_SpanKind) String() string { } func (Span_SpanKind) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_5c407ac9c675a601, []int{1, 0} + return fileDescriptor_5c407ac9c675a601, []int{2, 0} } // StatusCode mirrors the codes defined at @@ -144,19 +144,19 @@ func (x Status_StatusCode) String() string { } func (Status_StatusCode) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_5c407ac9c675a601, []int{2, 0} + return fileDescriptor_5c407ac9c675a601, []int{3, 0} } -// A collection of spans from a Resource. +// A collection of InstrumentationLibrarySpans from a Resource. type ResourceSpans struct { // The resource for the spans in this message. // If this field is not set then no resource info is known. Resource *v1.Resource `protobuf:"bytes,1,opt,name=resource,proto3" json:"resource,omitempty"` - // A list of Spans that originate from a resource. - Spans []*Span `protobuf:"bytes,2,rep,name=spans,proto3" json:"spans,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + // A list of InstrumentationLibrarySpans that originate from a resource. + InstrumentationLibrarySpans []*InstrumentationLibrarySpans `protobuf:"bytes,2,rep,name=instrumentation_library_spans,json=instrumentationLibrarySpans,proto3" json:"instrumentation_library_spans,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ResourceSpans) Reset() { *m = ResourceSpans{} } @@ -191,7 +191,58 @@ func (m *ResourceSpans) GetResource() *v1.Resource { return nil } -func (m *ResourceSpans) GetSpans() []*Span { +func (m *ResourceSpans) GetInstrumentationLibrarySpans() []*InstrumentationLibrarySpans { + if m != nil { + return m.InstrumentationLibrarySpans + } + return nil +} + +// A collection of Spans produced by an InstrumentationLibrary. +type InstrumentationLibrarySpans struct { + // The instrumentation library information for the spans in this message. + // If this field is not set then no library info is known. + InstrumentationLibrary *v11.InstrumentationLibrary `protobuf:"bytes,1,opt,name=instrumentation_library,json=instrumentationLibrary,proto3" json:"instrumentation_library,omitempty"` + // A list of Spans that originate from an instrumentation library. + Spans []*Span `protobuf:"bytes,2,rep,name=spans,proto3" json:"spans,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *InstrumentationLibrarySpans) Reset() { *m = InstrumentationLibrarySpans{} } +func (m *InstrumentationLibrarySpans) String() string { return proto.CompactTextString(m) } +func (*InstrumentationLibrarySpans) ProtoMessage() {} +func (*InstrumentationLibrarySpans) Descriptor() ([]byte, []int) { + return fileDescriptor_5c407ac9c675a601, []int{1} +} + +func (m *InstrumentationLibrarySpans) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_InstrumentationLibrarySpans.Unmarshal(m, b) +} +func (m *InstrumentationLibrarySpans) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_InstrumentationLibrarySpans.Marshal(b, m, deterministic) +} +func (m *InstrumentationLibrarySpans) XXX_Merge(src proto.Message) { + xxx_messageInfo_InstrumentationLibrarySpans.Merge(m, src) +} +func (m *InstrumentationLibrarySpans) XXX_Size() int { + return xxx_messageInfo_InstrumentationLibrarySpans.Size(m) +} +func (m *InstrumentationLibrarySpans) XXX_DiscardUnknown() { + xxx_messageInfo_InstrumentationLibrarySpans.DiscardUnknown(m) +} + +var xxx_messageInfo_InstrumentationLibrarySpans proto.InternalMessageInfo + +func (m *InstrumentationLibrarySpans) GetInstrumentationLibrary() *v11.InstrumentationLibrary { + if m != nil { + return m.InstrumentationLibrary + } + return nil +} + +func (m *InstrumentationLibrarySpans) GetSpans() []*Span { if m != nil { return m.Spans } @@ -302,7 +353,7 @@ func (m *Span) Reset() { *m = Span{} } func (m *Span) String() string { return proto.CompactTextString(m) } func (*Span) ProtoMessage() {} func (*Span) Descriptor() ([]byte, []int) { - return fileDescriptor_5c407ac9c675a601, []int{1} + return fileDescriptor_5c407ac9c675a601, []int{2} } func (m *Span) XXX_Unmarshal(b []byte) error { @@ -450,7 +501,7 @@ func (m *Span_Event) Reset() { *m = Span_Event{} } func (m *Span_Event) String() string { return proto.CompactTextString(m) } func (*Span_Event) ProtoMessage() {} func (*Span_Event) Descriptor() ([]byte, []int) { - return fileDescriptor_5c407ac9c675a601, []int{1, 0} + return fileDescriptor_5c407ac9c675a601, []int{2, 0} } func (m *Span_Event) XXX_Unmarshal(b []byte) error { @@ -525,7 +576,7 @@ func (m *Span_Link) Reset() { *m = Span_Link{} } func (m *Span_Link) String() string { return proto.CompactTextString(m) } func (*Span_Link) ProtoMessage() {} func (*Span_Link) Descriptor() ([]byte, []int) { - return fileDescriptor_5c407ac9c675a601, []int{1, 1} + return fileDescriptor_5c407ac9c675a601, []int{2, 1} } func (m *Span_Link) XXX_Unmarshal(b []byte) error { @@ -598,7 +649,7 @@ func (m *Status) Reset() { *m = Status{} } func (m *Status) String() string { return proto.CompactTextString(m) } func (*Status) ProtoMessage() {} func (*Status) Descriptor() ([]byte, []int) { - return fileDescriptor_5c407ac9c675a601, []int{2} + return fileDescriptor_5c407ac9c675a601, []int{3} } func (m *Status) XXX_Unmarshal(b []byte) error { @@ -637,6 +688,7 @@ func init() { proto.RegisterEnum("opentelemetry.proto.trace.v1.Span_SpanKind", Span_SpanKind_name, Span_SpanKind_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") proto.RegisterType((*Span)(nil), "opentelemetry.proto.trace.v1.Span") proto.RegisterType((*Span_Event)(nil), "opentelemetry.proto.trace.v1.Span.Event") proto.RegisterType((*Span_Link)(nil), "opentelemetry.proto.trace.v1.Span.Link") @@ -648,64 +700,68 @@ func init() { } var fileDescriptor_5c407ac9c675a601 = []byte{ - // 939 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xdd, 0x6e, 0xdb, 0x36, - 0x14, 0xae, 0xfc, 0x9f, 0xe3, 0x9f, 0x30, 0xec, 0xcf, 0xd4, 0x60, 0x40, 0x0d, 0xaf, 0xc0, 0xbc, - 0x0e, 0xb5, 0x9b, 0xec, 0xa6, 0x17, 0x2b, 0x36, 0xd7, 0x56, 0x01, 0x23, 0x99, 0x63, 0xc8, 0x71, - 0x2f, 0x76, 0x63, 0x30, 0xe6, 0x99, 0x43, 0x44, 0x22, 0x0d, 0x89, 0xf2, 0x92, 0xcb, 0xbd, 0xc1, - 0xde, 0x62, 0x4f, 0xb1, 0x37, 0xd8, 0x7b, 0xec, 0x35, 0x06, 0x52, 0x52, 0x12, 0x0f, 0x41, 0x9a, - 0x9b, 0xdc, 0xd8, 0xe4, 0x39, 0xdf, 0x0f, 0x0f, 0xcf, 0x91, 0x65, 0xe8, 0xaa, 0x35, 0x4a, 0x8d, - 0x01, 0x86, 0xa8, 0xa3, 0xab, 0xfe, 0x3a, 0x52, 0x5a, 0xf5, 0x75, 0xc4, 0x96, 0xd8, 0xdf, 0x1c, - 0xa4, 0x8b, 0x9e, 0x0d, 0xd2, 0xaf, 0xb7, 0x90, 0x69, 0xb0, 0x97, 0x02, 0x36, 0x07, 0xfb, 0x6f, - 0xee, 0xd2, 0x59, 0xaa, 0x30, 0x54, 0xd2, 0x08, 0xa5, 0xab, 0x94, 0xb4, 0xdf, 0xbb, 0x0b, 0x1b, - 0x61, 0xac, 0x92, 0x28, 0xb5, 0xcd, 0xd7, 0x29, 0xbe, 0xf3, 0xa7, 0x03, 0x4d, 0x3f, 0x0b, 0xcd, - 0xd6, 0x4c, 0xc6, 0xd4, 0x83, 0x5a, 0x8e, 0x71, 0x9d, 0xb6, 0xd3, 0xad, 0x1f, 0x7e, 0xd7, 0xbb, - 0xeb, 0x78, 0xd7, 0x42, 0x9b, 0x83, 0x5e, 0xae, 0xe0, 0x5f, 0x53, 0xe9, 0x7b, 0x28, 0xc7, 0x46, - 0xcf, 0x2d, 0xb4, 0x8b, 0xdd, 0xfa, 0x61, 0xa7, 0x77, 0x5f, 0x89, 0x3d, 0x63, 0xed, 0xa7, 0x84, - 0xce, 0x1f, 0x00, 0x25, 0xb3, 0xa7, 0x2f, 0xa1, 0x66, 0x01, 0x0b, 0xc1, 0xed, 0x49, 0x1a, 0x7e, - 0xd5, 0xee, 0xc7, 0x9c, 0x7e, 0x05, 0x55, 0x03, 0x36, 0x99, 0x82, 0xcd, 0x54, 0xcc, 0x76, 0xcc, - 0xe9, 0x2b, 0xa8, 0xa7, 0x9c, 0x58, 0x33, 0x8d, 0x6e, 0xb1, 0xed, 0x74, 0x77, 0x7c, 0xb0, 0xa1, - 0x99, 0x89, 0xd0, 0xd7, 0xd0, 0x5a, 0xb3, 0x08, 0xa5, 0x5e, 0xe4, 0x02, 0x25, 0x2b, 0xd0, 0x48, - 0xa3, 0xb3, 0x54, 0x86, 0x42, 0x49, 0xb2, 0x10, 0xdd, 0xb2, 0xe5, 0xdb, 0x35, 0xfd, 0x09, 0x4a, - 0x17, 0x42, 0x72, 0xb7, 0xd2, 0x76, 0xba, 0xad, 0xc3, 0xef, 0xbf, 0x5c, 0x90, 0xfd, 0x38, 0x12, - 0x92, 0xfb, 0x96, 0x48, 0x7b, 0xf0, 0x34, 0xd6, 0x2c, 0xd2, 0x0b, 0x2d, 0x42, 0x5c, 0x24, 0x52, - 0x5c, 0x4a, 0x26, 0x95, 0x5b, 0x6d, 0x3b, 0xdd, 0x8a, 0xbf, 0x67, 0x53, 0xa7, 0x22, 0xc4, 0x79, - 0x96, 0xa0, 0x6f, 0x60, 0x0f, 0x25, 0xff, 0x1f, 0xba, 0x66, 0xd1, 0xbb, 0x28, 0xf9, 0x16, 0x76, - 0x0a, 0xc0, 0xb4, 0x8e, 0xc4, 0x59, 0xa2, 0x31, 0x76, 0x77, 0xec, 0x9d, 0xbf, 0xbb, 0xf3, 0x88, - 0xd9, 0xb8, 0x6c, 0x0e, 0x7a, 0x83, 0x9c, 0x70, 0x84, 0x57, 0x9f, 0x59, 0x90, 0xa0, 0x7f, 0x4b, - 0x83, 0xbe, 0x07, 0x97, 0x47, 0x6a, 0xbd, 0x46, 0xbe, 0xb8, 0x89, 0x2e, 0x96, 0x2a, 0x91, 0xda, - 0x85, 0xb6, 0xd3, 0x6d, 0xfa, 0x2f, 0xb2, 0xfc, 0xb5, 0x4e, 0x3c, 0x34, 0x59, 0xfa, 0x33, 0x54, - 0x70, 0x83, 0x52, 0xc7, 0x6e, 0xdd, 0x9e, 0xa3, 0xfb, 0x80, 0xab, 0xf2, 0x0c, 0xc1, 0xcf, 0x78, - 0xf4, 0x1d, 0x3c, 0xcb, 0xbd, 0xd3, 0x48, 0xe6, 0xdb, 0xb0, 0xbe, 0x34, 0xcb, 0x59, 0x4e, 0xe6, - 0xf9, 0x01, 0xca, 0x81, 0x90, 0x17, 0xb1, 0xdb, 0xb4, 0x96, 0xdf, 0x3e, 0xc0, 0xf2, 0x58, 0xc8, - 0x0b, 0x3f, 0x65, 0x99, 0xd6, 0xe4, 0x86, 0x36, 0x90, 0xf9, 0xb5, 0xac, 0xdf, 0x5e, 0x96, 0x32, - 0x84, 0xcc, 0xee, 0x47, 0xa8, 0x98, 0x01, 0x4b, 0x62, 0x77, 0xd7, 0x3e, 0x22, 0xaf, 0xbf, 0xe0, - 0x67, 0xb1, 0x7e, 0xc6, 0xd9, 0xff, 0xc7, 0x81, 0xb2, 0x3d, 0x3c, 0xfd, 0x06, 0x9a, 0xdb, 0xed, - 0x75, 0x6c, 0x7b, 0x1b, 0xfa, 0x76, 0x6f, 0xf3, 0x61, 0x2c, 0xdc, 0x1a, 0xc6, 0xed, 0x7e, 0x17, - 0x1f, 0xb9, 0xdf, 0xa5, 0xfb, 0xfa, 0xbd, 0xff, 0xaf, 0x03, 0x25, 0x73, 0x37, 0x8f, 0xf3, 0xc0, - 0x6e, 0x57, 0x5a, 0x7a, 0xe4, 0x4a, 0xcb, 0xf7, 0x55, 0xda, 0x59, 0x41, 0x2d, 0x7f, 0xa6, 0xe9, - 0x4b, 0x78, 0x3e, 0x9b, 0x0e, 0x26, 0x8b, 0xa3, 0xf1, 0x64, 0xb4, 0x98, 0x4f, 0x66, 0x53, 0x6f, - 0x38, 0xfe, 0x34, 0xf6, 0x46, 0xe4, 0x09, 0x6d, 0x40, 0x6d, 0x3c, 0x39, 0xf5, 0xfc, 0xc9, 0xe0, - 0x98, 0x38, 0x14, 0xa0, 0x32, 0xf3, 0xfc, 0xcf, 0x9e, 0x4f, 0x0a, 0x66, 0x3d, 0x3c, 0x1e, 0x7b, - 0x93, 0x53, 0x52, 0x34, 0xa8, 0xa9, 0x7f, 0x32, 0x9a, 0x0f, 0x3d, 0x9f, 0x94, 0xcc, 0x6e, 0x78, - 0x32, 0x99, 0xcd, 0x7f, 0xf1, 0x7c, 0x52, 0xee, 0xfc, 0x55, 0x84, 0x4a, 0x3a, 0x34, 0x74, 0x08, - 0xa5, 0xa5, 0xe2, 0xe9, 0x6f, 0x71, 0xeb, 0xb0, 0xff, 0x90, 0x41, 0xcb, 0xbe, 0x86, 0x8a, 0xa3, - 0x6f, 0xc9, 0xd4, 0x85, 0x6a, 0x88, 0x71, 0xcc, 0x56, 0xf9, 0x14, 0xe5, 0xdb, 0xce, 0xdf, 0x05, - 0x80, 0x1b, 0x38, 0xad, 0x40, 0xe1, 0xe4, 0x82, 0x3c, 0xa1, 0x4d, 0xd8, 0x19, 0x32, 0xb9, 0xc4, - 0x20, 0x40, 0x4e, 0x1c, 0x4a, 0xa0, 0x31, 0x97, 0x17, 0x52, 0xfd, 0x2e, 0xbd, 0x28, 0x52, 0x11, - 0x29, 0xd0, 0xa7, 0xb0, 0x3b, 0x96, 0x1b, 0x16, 0x08, 0x3e, 0x88, 0x56, 0x49, 0x88, 0x52, 0x93, - 0x22, 0x7d, 0x06, 0x64, 0x84, 0x8c, 0x07, 0x42, 0xa2, 0x77, 0xb9, 0x44, 0xe4, 0xc8, 0xd3, 0xd2, - 0x26, 0x4a, 0x7f, 0x52, 0x89, 0xe4, 0xa4, 0x4c, 0xf7, 0xa0, 0x39, 0x08, 0x22, 0x64, 0xfc, 0xca, - 0xbb, 0x14, 0xb1, 0x8e, 0x49, 0xc5, 0xd0, 0xa6, 0x18, 0x85, 0x22, 0x8e, 0x85, 0x92, 0x23, 0x94, - 0x02, 0x39, 0xa9, 0xd2, 0xe7, 0xb0, 0x97, 0xbf, 0x57, 0xbc, 0xcb, 0x73, 0x96, 0xc4, 0x1a, 0x39, - 0xa9, 0xd1, 0x17, 0x40, 0x3f, 0x31, 0x11, 0x20, 0x9f, 0x46, 0xb8, 0x54, 0x92, 0x0b, 0x2d, 0x94, - 0x24, 0x3b, 0xb4, 0x0e, 0xd5, 0xc1, 0x99, 0x8a, 0x0c, 0x08, 0x68, 0x0b, 0xe0, 0x24, 0xd1, 0x27, - 0xbf, 0xf9, 0x4c, 0xae, 0x90, 0xd4, 0x8d, 0xe9, 0x5c, 0x8a, 0x70, 0x6d, 0xae, 0x4d, 0x1a, 0x48, - 0xc3, 0x84, 0xc6, 0x52, 0x63, 0x24, 0x59, 0x90, 0xd6, 0xd4, 0xa4, 0xbb, 0x50, 0x9f, 0x4b, 0xb6, - 0x61, 0x22, 0x60, 0x67, 0x01, 0x92, 0x96, 0x39, 0xf9, 0x88, 0x69, 0x76, 0xac, 0xe2, 0x98, 0xec, - 0x9a, 0x92, 0xe7, 0x92, 0x25, 0xfa, 0x1c, 0xa5, 0x16, 0x4b, 0x66, 0x64, 0xc8, 0x47, 0x09, 0xaf, - 0x84, 0xba, 0xb7, 0x29, 0x1f, 0xe1, 0xd4, 0xac, 0xa6, 0x26, 0x38, 0x75, 0x7e, 0xfd, 0xb0, 0x12, - 0xfa, 0x3c, 0x39, 0x33, 0xd3, 0xda, 0x37, 0xb4, 0xb7, 0x37, 0x6f, 0xeb, 0x2d, 0x95, 0xb7, 0xe9, - 0xbb, 0x7b, 0x85, 0xb2, 0xbf, 0xba, 0xf9, 0xdb, 0x70, 0x56, 0xb1, 0xe1, 0x1f, 0xfe, 0x0b, 0x00, - 0x00, 0xff, 0xff, 0x88, 0x3f, 0x11, 0xc0, 0x5d, 0x08, 0x00, 0x00, + // 1003 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcd, 0x6e, 0x1b, 0x37, + 0x10, 0xce, 0xea, 0xdf, 0xa3, 0x1f, 0xaf, 0x99, 0xbf, 0x8d, 0xd3, 0x22, 0x82, 0x1a, 0xa0, 0x6a, + 0x8a, 0x48, 0xb1, 0x8b, 0x02, 0x29, 0xd0, 0xa0, 0x55, 0xa4, 0x35, 0x20, 0xd8, 0x95, 0x05, 0xca, + 0xca, 0xa1, 0x17, 0x81, 0x12, 0x59, 0x99, 0xf0, 0x8a, 0x14, 0xb8, 0x5c, 0xd5, 0x3e, 0xf4, 0xd0, + 0xa7, 0xe9, 0x53, 0xf4, 0xdc, 0x4b, 0xaf, 0x7d, 0x86, 0xbe, 0x46, 0x41, 0xee, 0xae, 0x6d, 0x15, + 0xb6, 0xec, 0x8b, 0x2f, 0x36, 0x39, 0xf3, 0xfd, 0xcc, 0x70, 0xb8, 0xda, 0x85, 0xa6, 0x5c, 0x32, + 0xa1, 0x59, 0xc0, 0x16, 0x4c, 0xab, 0x8b, 0xf6, 0x52, 0x49, 0x2d, 0xdb, 0x5a, 0x91, 0x19, 0x6b, + 0xaf, 0xf6, 0xe2, 0x45, 0xcb, 0x06, 0xd1, 0x67, 0x6b, 0xc8, 0x38, 0xd8, 0x8a, 0x01, 0xab, 0xbd, + 0xdd, 0x37, 0x37, 0xe9, 0xcc, 0xe4, 0x62, 0x21, 0x85, 0x11, 0x8a, 0x57, 0x31, 0x69, 0xb7, 0x75, + 0x13, 0x56, 0xb1, 0x50, 0x46, 0x2a, 0xb6, 0x4d, 0xd7, 0x31, 0xbe, 0xf1, 0x8f, 0x03, 0x55, 0x9c, + 0x84, 0x46, 0x4b, 0x22, 0x42, 0xe4, 0x43, 0x29, 0xc5, 0x78, 0x4e, 0xdd, 0x69, 0x96, 0xf7, 0xbf, + 0x6a, 0xdd, 0x54, 0xde, 0xa5, 0xd0, 0x6a, 0xaf, 0x95, 0x2a, 0xe0, 0x4b, 0x2a, 0xfa, 0x0d, 0x3e, + 0xe7, 0x22, 0xd4, 0x2a, 0x5a, 0x30, 0xa1, 0x89, 0xe6, 0x52, 0x4c, 0x02, 0x3e, 0x55, 0x44, 0x5d, + 0x4c, 0x42, 0xe3, 0xe3, 0x65, 0xea, 0xd9, 0x66, 0x79, 0xff, 0xbb, 0xd6, 0xa6, 0xd6, 0x5b, 0xfd, + 0x75, 0x89, 0xa3, 0x58, 0xc1, 0x16, 0x8a, 0x5f, 0xf2, 0xdb, 0x93, 0x8d, 0xbf, 0x1c, 0x78, 0xb9, + 0x81, 0x8c, 0x04, 0x3c, 0xbf, 0xa5, 0xbc, 0xa4, 0xe9, 0x6f, 0x6f, 0x2c, 0x2c, 0x39, 0xeb, 0x5b, + 0x2b, 0xc3, 0xcf, 0x6e, 0x2e, 0x0a, 0xbd, 0x87, 0xfc, 0xf5, 0xb6, 0x1b, 0x9b, 0xdb, 0x36, 0x35, + 0xe2, 0x98, 0xd0, 0xf8, 0x1d, 0x20, 0x67, 0xf6, 0xe8, 0x05, 0x94, 0x2c, 0x60, 0xc2, 0xa9, 0xad, + 0xb1, 0x82, 0x8b, 0x76, 0xdf, 0xa7, 0xe8, 0x39, 0x14, 0x0d, 0xd8, 0x64, 0x32, 0x36, 0x53, 0x30, + 0xdb, 0x3e, 0x45, 0xaf, 0xa0, 0x1c, 0x73, 0x42, 0x4d, 0x34, 0xf3, 0xb2, 0x75, 0xa7, 0xb9, 0x85, + 0xc1, 0x86, 0x46, 0x26, 0x82, 0x5e, 0x43, 0x6d, 0x49, 0x14, 0x13, 0x7a, 0x92, 0x0a, 0xe4, 0xac, + 0x40, 0x25, 0x8e, 0x8e, 0x62, 0x19, 0x04, 0x39, 0x41, 0x16, 0xcc, 0xcb, 0x5b, 0xbe, 0x5d, 0xa3, + 0x1f, 0x20, 0x77, 0xc6, 0x05, 0xf5, 0x0a, 0x75, 0xa7, 0x59, 0xdb, 0xff, 0xfa, 0xee, 0x86, 0xec, + 0x9f, 0x43, 0x2e, 0x28, 0xb6, 0x44, 0xd4, 0x82, 0xc7, 0xa1, 0x26, 0x4a, 0x4f, 0x34, 0x5f, 0xb0, + 0x49, 0x24, 0xf8, 0xb9, 0x20, 0x42, 0x7a, 0xc5, 0xba, 0xd3, 0x2c, 0xe0, 0x1d, 0x9b, 0x3a, 0xe1, + 0x0b, 0x36, 0x4e, 0x12, 0xe8, 0x0d, 0xec, 0x30, 0x41, 0xff, 0x87, 0x2e, 0x59, 0xf4, 0x36, 0x13, + 0x74, 0x0d, 0x3b, 0x04, 0x20, 0x5a, 0x2b, 0x3e, 0x8d, 0x34, 0x0b, 0xbd, 0x2d, 0x7b, 0xe6, 0xef, + 0xee, 0x98, 0x68, 0x27, 0x25, 0x1c, 0xb2, 0x8b, 0x4f, 0x24, 0x88, 0x18, 0xbe, 0xa6, 0x81, 0xde, + 0x83, 0x47, 0x95, 0x5c, 0x2e, 0x19, 0x9d, 0x5c, 0x45, 0x27, 0x33, 0x19, 0x09, 0xed, 0x41, 0xdd, + 0x69, 0x56, 0xf1, 0xb3, 0x24, 0x7f, 0xa9, 0x13, 0x76, 0x4d, 0x16, 0xfd, 0x08, 0x05, 0xb6, 0x62, + 0x42, 0x87, 0x5e, 0xd9, 0xd6, 0xd1, 0xbc, 0xc7, 0x51, 0xf9, 0x86, 0x80, 0x13, 0x1e, 0x7a, 0x07, + 0x4f, 0x52, 0xef, 0x38, 0x92, 0xf8, 0x56, 0xac, 0x2f, 0x4a, 0x72, 0x96, 0x93, 0x78, 0x7e, 0x80, + 0x7c, 0xc0, 0xc5, 0x59, 0xe8, 0x55, 0xad, 0xe5, 0x97, 0xf7, 0xb0, 0x3c, 0xe2, 0xe2, 0x0c, 0xc7, + 0x2c, 0x33, 0x9a, 0xd4, 0xd0, 0x06, 0x12, 0xbf, 0x9a, 0xf5, 0xdb, 0x49, 0x52, 0x86, 0x90, 0xd8, + 0x7d, 0x0f, 0x05, 0x73, 0xc1, 0xa2, 0xd0, 0xdb, 0xb6, 0x0f, 0xcf, 0xeb, 0x3b, 0xfc, 0x2c, 0x16, + 0x27, 0x9c, 0xdd, 0xbf, 0x1d, 0xc8, 0xdb, 0xe2, 0xd1, 0x17, 0x50, 0x5d, 0x1f, 0xaf, 0x63, 0xc7, + 0x5b, 0xd1, 0xd7, 0x67, 0x9b, 0x5e, 0xc6, 0xcc, 0xb5, 0xcb, 0xb8, 0x3e, 0xef, 0xec, 0x03, 0xcf, + 0x3b, 0xb7, 0x69, 0xde, 0xbb, 0xff, 0x3a, 0x90, 0x33, 0x67, 0xf3, 0x30, 0x0f, 0xec, 0x7a, 0xa7, + 0xb9, 0x07, 0xee, 0x34, 0xbf, 0xa9, 0xd3, 0xc6, 0x1c, 0x4a, 0xe9, 0x33, 0x8d, 0x5e, 0xc0, 0xd3, + 0xd1, 0xb0, 0x33, 0x98, 0x1c, 0xf6, 0x07, 0xbd, 0xc9, 0x78, 0x30, 0x1a, 0xfa, 0xdd, 0xfe, 0x41, + 0xdf, 0xef, 0xb9, 0x8f, 0x50, 0x05, 0x4a, 0xfd, 0xc1, 0x89, 0x8f, 0x07, 0x9d, 0x23, 0xd7, 0x41, + 0x00, 0x85, 0x91, 0x8f, 0x3f, 0xf9, 0xd8, 0xcd, 0x98, 0x75, 0xf7, 0xa8, 0xef, 0x0f, 0x4e, 0xdc, + 0xac, 0x41, 0x0d, 0xf1, 0x71, 0x6f, 0xdc, 0xf5, 0xb1, 0x9b, 0x33, 0xbb, 0xee, 0xf1, 0x60, 0x34, + 0xfe, 0xc9, 0xc7, 0x6e, 0xbe, 0xf1, 0x47, 0x16, 0x0a, 0xf1, 0xa5, 0x41, 0x5d, 0xc8, 0xcd, 0x24, + 0x8d, 0x5f, 0x4d, 0xb5, 0xfd, 0xf6, 0x7d, 0x2e, 0x5a, 0xf2, 0xaf, 0x2b, 0x29, 0xc3, 0x96, 0x8c, + 0x3c, 0x28, 0x2e, 0x58, 0x18, 0x92, 0x79, 0x7a, 0x8b, 0xd2, 0x6d, 0xe3, 0xcf, 0x0c, 0xc0, 0x15, + 0x1c, 0x15, 0x20, 0x73, 0x7c, 0xe6, 0x3e, 0x42, 0x55, 0xd8, 0xea, 0x12, 0x31, 0x63, 0x41, 0xc0, + 0xa8, 0xeb, 0x20, 0x17, 0x2a, 0x63, 0x71, 0x26, 0xe4, 0xaf, 0xc2, 0x57, 0x4a, 0x2a, 0x37, 0x83, + 0x1e, 0xc3, 0x76, 0x5f, 0xac, 0x48, 0xc0, 0x69, 0x47, 0xcd, 0xed, 0xcf, 0xbf, 0x9b, 0x45, 0x4f, + 0xc0, 0xed, 0x31, 0x42, 0x03, 0x2e, 0x98, 0x7f, 0x3e, 0x63, 0x8c, 0x32, 0x1a, 0xb7, 0x36, 0x90, + 0xfa, 0x40, 0x46, 0x82, 0xba, 0x79, 0xb4, 0x03, 0xd5, 0x4e, 0xa0, 0x18, 0xa1, 0x17, 0xfe, 0x39, + 0x0f, 0x75, 0xe8, 0x16, 0x0c, 0x6d, 0xc8, 0xd4, 0x82, 0x87, 0x21, 0x97, 0xa2, 0xc7, 0x04, 0x67, + 0xd4, 0x2d, 0xa2, 0xa7, 0xb0, 0x93, 0xbe, 0x66, 0xfd, 0xf3, 0x53, 0x12, 0x85, 0x9a, 0x51, 0xb7, + 0x84, 0x9e, 0x01, 0x3a, 0x20, 0x3c, 0x60, 0x74, 0xa8, 0xd8, 0x4c, 0x0a, 0xca, 0xcd, 0x5b, 0xc7, + 0xdd, 0x42, 0x65, 0x28, 0x76, 0xa6, 0x52, 0x19, 0x10, 0xa0, 0x1a, 0xc0, 0x71, 0xa4, 0x8f, 0x7f, + 0xc1, 0x44, 0xcc, 0x99, 0x5b, 0x36, 0xa6, 0x63, 0xc1, 0x17, 0x4b, 0x73, 0x6c, 0xc2, 0x40, 0x2a, + 0x26, 0xd4, 0x17, 0x9a, 0x29, 0x41, 0x82, 0xb8, 0xa7, 0x2a, 0xda, 0x86, 0xf2, 0x58, 0x90, 0x15, + 0xe1, 0x01, 0x99, 0x06, 0xcc, 0xad, 0x99, 0xca, 0x7b, 0x44, 0x93, 0x23, 0x19, 0x86, 0xee, 0xb6, + 0x69, 0x79, 0x2c, 0x48, 0xa4, 0x4f, 0x99, 0xd0, 0x7c, 0x46, 0x8c, 0x8c, 0xfb, 0x51, 0xc0, 0x2b, + 0x2e, 0x37, 0x0e, 0xe5, 0x23, 0x9c, 0x98, 0xd5, 0xd0, 0x04, 0x87, 0xce, 0xcf, 0x1f, 0xe6, 0x5c, + 0x9f, 0x46, 0x53, 0x73, 0x5b, 0xdb, 0x86, 0xf6, 0xf6, 0xea, 0xe3, 0x65, 0x4d, 0xe5, 0x6d, 0xfc, + 0x29, 0x33, 0x67, 0xa2, 0x3d, 0xbf, 0xfa, 0x8a, 0x9a, 0x16, 0x6c, 0xf8, 0x9b, 0xff, 0x02, 0x00, + 0x00, 0xff, 0xff, 0x6e, 0xee, 0xdc, 0xdb, 0x6c, 0x09, 0x00, 0x00, } diff --git a/opentelemetry/proto/common/v1/common.proto b/opentelemetry/proto/common/v1/common.proto index b3b185245..45fbcdb75 100644 --- a/opentelemetry/proto/common/v1/common.proto +++ b/opentelemetry/proto/common/v1/common.proto @@ -53,3 +53,10 @@ message StringKeyValue { string key = 1; string value = 2; } + +// InstrumentationLibrary is a message representing the instrumentation library information +// such as the fully qualified name and version. +message InstrumentationLibrary { + string name = 1; + string version = 2; +} diff --git a/opentelemetry/proto/metrics/v1/metrics.proto b/opentelemetry/proto/metrics/v1/metrics.proto index b831a3151..d35113c53 100644 --- a/opentelemetry/proto/metrics/v1/metrics.proto +++ b/opentelemetry/proto/metrics/v1/metrics.proto @@ -24,14 +24,24 @@ option java_package = "io.opentelemetry.proto.metrics.v1"; option java_outer_classname = "MetricsProto"; option go_package = "github.com/open-telemetry/opentelemetry-proto/gen/go/metrics/v1"; -// A collection of metrics from a Resource. +// A collection of InstrumentationLibraryMetrics from a Resource. message ResourceMetrics { - // A list of metrics that originate from a resource. - repeated Metric metrics = 1; - // The resource for the metrics in this message. // If this field is not set then no resource info is known. - opentelemetry.proto.resource.v1.Resource resource = 2; + opentelemetry.proto.resource.v1.Resource resource = 1; + + // A list of metrics that originate from a resource. + repeated InstrumentationLibraryMetrics library_metrics = 2; +} + +// A collection of Metrics produced by an InstrumentationLibrary. +message InstrumentationLibraryMetrics { + // The instrumentation library information for the metrics in this message. + // If this field is not set then no library info is known. + opentelemetry.proto.common.v1.InstrumentationLibrary library = 1; + + // A list of metrics that originate from an instrumentation library. + repeated Metric metrics = 2; } // Defines a Metric which has one or more timeseries. diff --git a/opentelemetry/proto/trace/v1/trace.proto b/opentelemetry/proto/trace/v1/trace.proto index 7f0e4a75c..740125dcd 100644 --- a/opentelemetry/proto/trace/v1/trace.proto +++ b/opentelemetry/proto/trace/v1/trace.proto @@ -24,13 +24,23 @@ option java_package = "io.opentelemetry.proto.trace.v1"; option java_outer_classname = "TraceProto"; option go_package = "github.com/open-telemetry/opentelemetry-proto/gen/go/trace/v1"; -// A collection of spans from a Resource. +// A collection of InstrumentationLibrarySpans from a Resource. message ResourceSpans { // The resource for the spans in this message. // If this field is not set then no resource info is known. opentelemetry.proto.resource.v1.Resource resource = 1; - // A list of Spans that originate from a resource. + // A list of InstrumentationLibrarySpans that originate from a resource. + repeated InstrumentationLibrarySpans instrumentation_library_spans = 2; +} + +// A collection of Spans produced by an InstrumentationLibrary. +message InstrumentationLibrarySpans { + // The instrumentation library information for the spans in this message. + // If this field is not set then no library info is known. + opentelemetry.proto.common.v1.InstrumentationLibrary instrumentation_library = 1; + + // A list of Spans that originate from an instrumentation library. repeated Span spans = 2; }