From 3d10c0e83f2f8dcf8747e8a3e26e852bf259617b Mon Sep 17 00:00:00 2001 From: Tigran Najaryan Date: Fri, 8 May 2020 11:47:22 -0400 Subject: [PATCH] Remove InstrumentationLibrarySpans and InstrumentationLibraryMetrics Resolves https://github.com/open-telemetry/opentelemetry-proto/issues/149 Resolves https://github.com/open-telemetry/opentelemetry-proto/issues/148 # Problem ## Traces The traces proto currently contains InstrumentationLibrarySpans which does not have clearly defined semantics. InstrumentationLibrarySpans may contain a number of spans all associated with an InstrumentationLibrary. The nature of this association is not clear. The InstrumentationLibrary has a name and a version. It is not clear if these fields are part of Resource identity or are attributes of a Span. Presumably they should be interpreted as attributes of the Span. I am not aware of any other trace protocols or backends that have the equivalent of InstrumentationLibrary concept. However ultimately all span data produced by OpenTelemetry libraries will end up in a backend and the InstrumentationLibrary concept must be mapped to an existing concept. Span attributes seem to be the only concept that fit the bill. Using attributes from the start of the collection pipeline removes the need to deal with InstrumentationLibrary by all codebases that need to make a mapping decision (Collector, backend ingest points, etc). To illustrate the data structure that was needed before this commit, here is an example: ```yaml resource_spans: resource: ... instrumentation_library_spans: - instrumentation_library: name: io.opentelemetry.redis spans: - name: request start_time: 123 - instrumentation_library: name: io.opentelemetry.apache.httpd spans: - name: request start_time: 456 ``` See below what the data structure becomes after implementing the proposed solution. ## Metrics The metrics proto currently includes InstrumentationLibraryMetrics which does not have clearly defined semantics. InstrumentationLibraryMetrics may contain a number of metrics all associated with one InstrumentationLibrary. The nature of this association is not clear. The InstrumentationLibrary has a name and a version. It is not clear if these fields are part of metric identity. For example if I have 2 different InstrumentationLibrarys each having a different name and both containing a Metric that have the same MetricDescriptor.name are these 2 different timeseries or the same one? To illustrate the data structure that was needed before this commit, here is an example: ```yaml resource_metrics: resource: ... instrumentation_library_metrics: - instrumentation_library: name: io.opentelemetry.redis metrics: - metric_descriptor: name: request.count int64_data_points: - value: 10 - instrumentation_library: name: io.opentelemetry.apache.httpd metrics: - metric_descriptor: name: request.count int64_data_points: - value: 200 ``` See below what the data structure becomes after implementing the proposed solution. # Solution ## Traces This commit removes `InstrumentationLibrarySpans` message type from the protocol. We will add semantic conventions for recording instrumentation library in Span attributes. The benefits of this approach over using `InstrumentationLibrarySpans` are the following: - There is not need for a new concept and new message type at the protocol level. This adds unnecessary complexity to all codebases that need to read and write traces but don't care about instrumentation library concept (likely the majory of codebases). - It uses the general concept of attributes that already exists and is well understood and by doing so makes the semantics of instrumentation library name clear. After removing `InstrumentationLibrarySpans` concept we have this data structure: ```yaml resource_spans: resource: ... spans: - name: request start_time: 123 attributes: - key: instrumentation.library.name value: io.opentelemetry.redis - name: request start_time: 456 attributes: - key: instrumentation.library.name value: io.opentelemetry.apache.httpd ``` Once this commit is merged language SDKs will need to make a corresponding change and add "instrumentation.library.name" (or whatever name is accepted in semantic conventions) to Span attributes automatically. ## Metrics This commit removes `InstrumentationLibraryMetrics` message type from the protocol. We will add semantic conventions for recording instrumentation library in Span attributes. Semantically the name of `InstrumentationLibrary` is equivalent to a metric label so we will use metric labels to record the library name and version. The benefits of this approach over using `InstrumentationLibraryMetrics` are the following: - There is not need for a new concept and new message type at the protocol level. This adds unnecessary complexity to all codebases that need to read and write metrics but don't care about instrumentation library concept (likely the majority of codebases). - It uses the general concept of metric labels that already exists and is well understood and by doing so makes the semantics of instrumentation library name clear. The instrumentation library name is one of the labels that form timeseries identifier. - It makes mapping to other metric protocols and backend clearer. I am not aware of any other metric protocol or backend that have the equivalent of `InstrumentationLibrary` concept. However ultimately all metric data produced by OpenTelemetry libraries will end up in a backend and the `InstrumentationLibrary` concept must be mapped to an existing concept. Labels seem to be the only concept that fit the bill. Using labels from the start of the collection pipeline removes the need to deal with `InstrumentationLibrary` by all codebases that need to make a mapping or translation decision (Collector, backend ingest points, etc). After removing `InstrumentationLibraryMetrics` concept we have this data structure: ```yaml resource_metrics: resource: ... metrics: - metric_descriptor: name: "request.count" int64_data_points: - value: 10 labels: - key: instrumentation.library.name value: io.opentelemetry.redis - metric_descriptor: name: "request.count" int64_data_points: - value: 200 labels: - key: instrumentation.library.name value: io.opentelemetry.apache.httpd ``` --- gen/go/common/v1/common.pb.go | 102 +++------ gen/go/metrics/v1/metrics.pb.go | 211 +++++++------------ gen/go/trace/v1/trace.pb.go | 202 +++++++----------- opentelemetry/proto/common/v1/common.proto | 7 - opentelemetry/proto/metrics/v1/metrics.proto | 12 +- opentelemetry/proto/trace/v1/trace.proto | 14 +- 6 files changed, 178 insertions(+), 370 deletions(-) diff --git a/gen/go/common/v1/common.pb.go b/gen/go/common/v1/common.pb.go index 670f4286e..75a7aa1fb 100644 --- a/gen/go/common/v1/common.pb.go +++ b/gen/go/common/v1/common.pb.go @@ -352,62 +352,12 @@ 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{5} -} - -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.RegisterType((*AnyValue)(nil), "opentelemetry.proto.common.v1.AnyValue") proto.RegisterType((*ArrayValue)(nil), "opentelemetry.proto.common.v1.ArrayValue") proto.RegisterType((*KeyValueList)(nil), "opentelemetry.proto.common.v1.KeyValueList") proto.RegisterType((*KeyValue)(nil), "opentelemetry.proto.common.v1.KeyValue") proto.RegisterType((*StringKeyValue)(nil), "opentelemetry.proto.common.v1.StringKeyValue") - proto.RegisterType((*InstrumentationLibrary)(nil), "opentelemetry.proto.common.v1.InstrumentationLibrary") } func init() { @@ -415,31 +365,29 @@ func init() { } var fileDescriptor_62ba46dcb97aa817 = []byte{ - // 411 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x4b, 0xab, 0xd3, 0x40, - 0x14, 0xce, 0xdc, 0xdc, 0xdb, 0x9b, 0x9c, 0x14, 0x91, 0x41, 0xa4, 0x9b, 0x8b, 0xa1, 0x2e, 0x8c, - 0xca, 0x4d, 0x68, 0xdd, 0xb8, 0x51, 0x69, 0x05, 0x89, 0x58, 0xb1, 0x44, 0x70, 0xa1, 0x0b, 0x49, - 0x74, 0x88, 0x43, 0x93, 0x99, 0x3a, 0x99, 0x04, 0xf2, 0xe3, 0xfc, 0x6f, 0x32, 0x8f, 0xf4, 0xb1, - 0x69, 0xe9, 0xee, 0xcc, 0x97, 0xef, 0x71, 0x4e, 0x66, 0x0e, 0xbc, 0xe0, 0x5b, 0xc2, 0x24, 0xa9, - 0x48, 0x4d, 0xa4, 0xe8, 0x93, 0xad, 0xe0, 0x92, 0x27, 0xbf, 0x78, 0x5d, 0x73, 0x96, 0x74, 0x33, - 0x5b, 0xc5, 0x1a, 0xc6, 0x77, 0x47, 0x5c, 0x03, 0xc6, 0x96, 0xd1, 0xcd, 0xa6, 0xff, 0xae, 0xc0, - 0x5b, 0xb0, 0xfe, 0x5b, 0x5e, 0xb5, 0x04, 0x3f, 0x85, 0x71, 0x23, 0x05, 0x65, 0xe5, 0xcf, 0x4e, - 0x9d, 0x27, 0x28, 0x44, 0x91, 0x9f, 0x3a, 0x59, 0x60, 0x50, 0x43, 0x7a, 0x02, 0x50, 0x70, 0x5e, - 0x59, 0xca, 0x55, 0x88, 0x22, 0x2f, 0x75, 0x32, 0x5f, 0x61, 0x86, 0x70, 0x07, 0x3e, 0x65, 0xd2, - 0x7e, 0x77, 0x43, 0x14, 0xb9, 0xa9, 0x93, 0x79, 0x94, 0xc9, 0x5d, 0xc8, 0x6f, 0xde, 0x16, 0x15, - 0xb1, 0x8c, 0xeb, 0x10, 0x45, 0x48, 0x85, 0x18, 0xd4, 0x90, 0x56, 0x10, 0xe4, 0x42, 0xe4, 0xbd, - 0xe5, 0xdc, 0x84, 0x28, 0x0a, 0xe6, 0xcf, 0xe3, 0x93, 0xb3, 0xc4, 0x0b, 0xa5, 0xd0, 0xfa, 0xd4, - 0xc9, 0x20, 0xdf, 0x9d, 0xf0, 0x1a, 0xc6, 0x9b, 0xae, 0xa2, 0xcd, 0xd0, 0xd4, 0x48, 0xdb, 0xbd, - 0x3c, 0x63, 0xf7, 0x89, 0x18, 0xf9, 0x8a, 0x36, 0x52, 0xf5, 0x67, 0x2c, 0x34, 0xb4, 0xbc, 0x85, - 0x1b, 0x6d, 0x35, 0xfd, 0x0c, 0xb0, 0x8f, 0xc5, 0xef, 0x60, 0xa4, 0xe1, 0x66, 0x82, 0x42, 0x37, - 0x0a, 0xe6, 0xcf, 0xce, 0x75, 0x6c, 0xff, 0x7c, 0x66, 0x65, 0xd3, 0x2f, 0x30, 0x3e, 0x8c, 0xbd, - 0xd8, 0x70, 0x10, 0xef, 0x0c, 0x7f, 0x80, 0x37, 0x60, 0xf8, 0x21, 0xb8, 0x1b, 0xd2, 0x9b, 0x5b, - 0xcd, 0x54, 0x89, 0xdf, 0xd8, 0x31, 0xf4, 0x35, 0x5e, 0xd0, 0xae, 0x1d, 0xfe, 0x35, 0x3c, 0xf8, - 0xaa, 0x5f, 0xc6, 0x89, 0x88, 0x47, 0x87, 0x11, 0xfe, 0xa0, 0xfc, 0x00, 0x8f, 0x3f, 0xb2, 0x46, - 0x8a, 0xb6, 0x26, 0x4c, 0xe6, 0x92, 0x72, 0xb6, 0xa2, 0x85, 0xc8, 0x45, 0x8f, 0x31, 0x5c, 0xb3, - 0xbc, 0xb6, 0x6f, 0x2f, 0xd3, 0x35, 0x9e, 0xc0, 0x6d, 0x47, 0x44, 0x43, 0x39, 0xb3, 0x2e, 0xc3, - 0x71, 0xf9, 0x17, 0x42, 0xca, 0x4f, 0x77, 0xbd, 0x0c, 0xde, 0xeb, 0x72, 0xad, 0xe0, 0x35, 0xfa, - 0xfe, 0xb6, 0xa4, 0xf2, 0x4f, 0x5b, 0x28, 0x42, 0xa2, 0x84, 0xf7, 0xfb, 0x45, 0x3a, 0xf2, 0xb9, - 0x37, 0x6b, 0x55, 0x12, 0x96, 0x94, 0x07, 0xdb, 0x55, 0x8c, 0x34, 0xfe, 0xea, 0x7f, 0x00, 0x00, - 0x00, 0xff, 0xff, 0x58, 0xdb, 0x68, 0x5e, 0x85, 0x03, 0x00, 0x00, + // 370 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x4b, 0x4f, 0xea, 0x40, + 0x14, 0xee, 0xd0, 0x0b, 0xb7, 0x3d, 0x25, 0x37, 0x37, 0xcd, 0x5d, 0xb0, 0x21, 0xb7, 0xc1, 0x85, + 0x55, 0x43, 0x1b, 0x70, 0xe3, 0x46, 0x0d, 0xb8, 0x69, 0x22, 0x46, 0x52, 0x13, 0x17, 0xba, 0x30, + 0xad, 0x4e, 0xea, 0x84, 0x32, 0x83, 0xed, 0xd0, 0xa4, 0x3f, 0xce, 0xff, 0x66, 0xe6, 0xc1, 0x6b, + 0x03, 0x61, 0x77, 0xe6, 0xeb, 0xf7, 0x38, 0xa7, 0x33, 0x07, 0xce, 0xd9, 0x02, 0x53, 0x8e, 0x73, + 0x3c, 0xc7, 0xbc, 0xa8, 0xc3, 0x45, 0xc1, 0x38, 0x0b, 0xdf, 0xd9, 0x7c, 0xce, 0x68, 0x58, 0x0d, + 0x74, 0x15, 0x48, 0xd8, 0xed, 0xee, 0x70, 0x15, 0x18, 0x68, 0x46, 0x35, 0xe8, 0x7d, 0x37, 0xc0, + 0x1a, 0xd1, 0xfa, 0x39, 0xc9, 0x97, 0xd8, 0x3d, 0x81, 0x76, 0xc9, 0x0b, 0x42, 0xb3, 0xb7, 0x4a, + 0x9c, 0x3b, 0xc8, 0x43, 0xbe, 0x1d, 0x19, 0xb1, 0xa3, 0x50, 0x45, 0xfa, 0x0f, 0x90, 0x32, 0x96, + 0x6b, 0x4a, 0xc3, 0x43, 0xbe, 0x15, 0x19, 0xb1, 0x2d, 0x30, 0x45, 0xe8, 0x82, 0x4d, 0x28, 0xd7, + 0xdf, 0x4d, 0x0f, 0xf9, 0x66, 0x64, 0xc4, 0x16, 0xa1, 0x7c, 0x1d, 0xf2, 0xc1, 0x96, 0x69, 0x8e, + 0x35, 0xe3, 0x97, 0x87, 0x7c, 0x24, 0x42, 0x14, 0xaa, 0x48, 0x13, 0x70, 0x92, 0xa2, 0x48, 0x6a, + 0xcd, 0x69, 0x7a, 0xc8, 0x77, 0x86, 0x67, 0xc1, 0xde, 0x59, 0x82, 0x91, 0x50, 0x48, 0x7d, 0x64, + 0xc4, 0x90, 0xac, 0x4f, 0xee, 0x14, 0xda, 0xb3, 0x2a, 0x27, 0xe5, 0xaa, 0xa9, 0x96, 0xb4, 0xbb, + 0x38, 0x60, 0x77, 0x8f, 0x95, 0x7c, 0x42, 0x4a, 0x2e, 0xfa, 0x53, 0x16, 0x12, 0x1a, 0xff, 0x86, + 0xa6, 0xb4, 0xea, 0x3d, 0x00, 0x6c, 0x62, 0xdd, 0x5b, 0x68, 0x49, 0xb8, 0xec, 0x20, 0xcf, 0xf4, + 0x9d, 0xe1, 0xe9, 0xa1, 0x8e, 0xf5, 0x9f, 0x8f, 0xb5, 0xac, 0xf7, 0x08, 0xed, 0xed, 0xd8, 0xa3, + 0x0d, 0x57, 0xe2, 0xb5, 0xe1, 0x2b, 0x58, 0x2b, 0xcc, 0xfd, 0x0b, 0xe6, 0x0c, 0xd7, 0xea, 0x56, + 0x63, 0x51, 0xba, 0xd7, 0x7a, 0x0c, 0x79, 0x8d, 0x47, 0xb4, 0xab, 0x87, 0xbf, 0x82, 0x3f, 0x4f, + 0xf2, 0x65, 0xec, 0x89, 0xf8, 0xb7, 0x1d, 0x61, 0x6b, 0xe5, 0xf8, 0x0b, 0x3c, 0xc2, 0xf6, 0xa7, + 0x8d, 0x9d, 0x3b, 0x59, 0x4e, 0x05, 0x3c, 0x45, 0x2f, 0x37, 0x19, 0xe1, 0x9f, 0xcb, 0x54, 0x10, + 0x42, 0x21, 0xec, 0x6f, 0x16, 0x60, 0xc7, 0xa7, 0xaf, 0xd6, 0x21, 0xc3, 0x34, 0xcc, 0xb6, 0xb6, + 0x22, 0x6d, 0x49, 0xfc, 0xf2, 0x27, 0x00, 0x00, 0xff, 0xff, 0x32, 0x48, 0x57, 0xfe, 0x3d, 0x03, + 0x00, 0x00, } diff --git a/gen/go/metrics/v1/metrics.pb.go b/gen/go/metrics/v1/metrics.pb.go index 546c770c8..976643293 100644 --- a/gen/go/metrics/v1/metrics.pb.go +++ b/gen/go/metrics/v1/metrics.pb.go @@ -83,7 +83,7 @@ func (x MetricDescriptor_Type) String() string { } func (MetricDescriptor_Type) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_3c3112f9fa006917, []int{3, 0} + return fileDescriptor_3c3112f9fa006917, []int{2, 0} } // Temporality is the temporal quality values of a metric have. It @@ -178,19 +178,19 @@ func (x MetricDescriptor_Temporality) String() string { } func (MetricDescriptor_Temporality) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_3c3112f9fa006917, []int{3, 1} + return fileDescriptor_3c3112f9fa006917, []int{2, 1} } -// A collection of InstrumentationLibraryMetrics from a Resource. +// A collection of Metrics from a Resource. type ResourceMetrics struct { // 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,1,opt,name=resource,proto3" json:"resource,omitempty"` // A list of metrics that originate from a resource. - InstrumentationLibraryMetrics []*InstrumentationLibraryMetrics `protobuf:"bytes,2,rep,name=instrumentation_library_metrics,json=instrumentationLibraryMetrics,proto3" json:"instrumentation_library_metrics,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + 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 *ResourceMetrics) Reset() { *m = ResourceMetrics{} } @@ -225,58 +225,7 @@ func (m *ResourceMetrics) GetResource() *v1.Resource { return nil } -func (m *ResourceMetrics) GetInstrumentationLibraryMetrics() []*InstrumentationLibraryMetrics { - if m != nil { - return m.InstrumentationLibraryMetrics - } - 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. - InstrumentationLibrary *v11.InstrumentationLibrary `protobuf:"bytes,1,opt,name=instrumentation_library,json=instrumentationLibrary,proto3" json:"instrumentation_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) GetInstrumentationLibrary() *v11.InstrumentationLibrary { - if m != nil { - return m.InstrumentationLibrary - } - return nil -} - -func (m *InstrumentationLibraryMetrics) GetMetrics() []*Metric { +func (m *ResourceMetrics) GetMetrics() []*Metric { if m != nil { return m.Metrics } @@ -351,7 +300,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{2} + return fileDescriptor_3c3112f9fa006917, []int{1} } func (m *Metric) XXX_Unmarshal(b []byte) error { @@ -429,7 +378,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{3} + return fileDescriptor_3c3112f9fa006917, []int{2} } func (m *MetricDescriptor) XXX_Unmarshal(b []byte) error { @@ -514,7 +463,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{4} + return fileDescriptor_3c3112f9fa006917, []int{3} } func (m *Int64DataPoint) XXX_Unmarshal(b []byte) error { @@ -592,7 +541,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{5} + return fileDescriptor_3c3112f9fa006917, []int{4} } func (m *DoubleDataPoint) XXX_Unmarshal(b []byte) error { @@ -701,7 +650,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{6} + return fileDescriptor_3c3112f9fa006917, []int{5} } func (m *HistogramDataPoint) XXX_Unmarshal(b []byte) error { @@ -787,7 +736,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{6, 0} + return fileDescriptor_3c3112f9fa006917, []int{5, 0} } func (m *HistogramDataPoint_Bucket) XXX_Unmarshal(b []byte) error { @@ -845,7 +794,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{6, 0, 0} + return fileDescriptor_3c3112f9fa006917, []int{5, 0, 0} } func (m *HistogramDataPoint_Bucket_Exemplar) XXX_Unmarshal(b []byte) error { @@ -921,7 +870,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{7} + return fileDescriptor_3c3112f9fa006917, []int{6} } func (m *SummaryDataPoint) XXX_Unmarshal(b []byte) error { @@ -1007,7 +956,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{7, 0} + return fileDescriptor_3c3112f9fa006917, []int{6, 0} } func (m *SummaryDataPoint_ValueAtPercentile) XXX_Unmarshal(b []byte) error { @@ -1046,7 +995,6 @@ func init() { proto.RegisterEnum("opentelemetry.proto.metrics.v1.MetricDescriptor_Type", MetricDescriptor_Type_name, MetricDescriptor_Type_value) proto.RegisterEnum("opentelemetry.proto.metrics.v1.MetricDescriptor_Temporality", MetricDescriptor_Temporality_name, MetricDescriptor_Temporality_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") @@ -1063,69 +1011,64 @@ func init() { } var fileDescriptor_3c3112f9fa006917 = []byte{ - // 1012 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x57, 0xdd, 0x6e, 0xe3, 0x44, - 0x14, 0x5e, 0xc7, 0x69, 0xda, 0x9e, 0x74, 0x5b, 0x67, 0x5a, 0xd8, 0xa8, 0xd2, 0x2e, 0x25, 0x42, - 0x50, 0x10, 0x75, 0x68, 0x29, 0x95, 0x90, 0x40, 0x90, 0x6c, 0x22, 0xd6, 0x22, 0x7f, 0x9a, 0x38, - 0x95, 0xba, 0xd2, 0xae, 0x71, 0x92, 0x21, 0x1d, 0x61, 0x8f, 0x2d, 0x7b, 0x1c, 0x35, 0x0f, 0xc0, - 0x1b, 0x20, 0xc1, 0x03, 0xc1, 0x03, 0x70, 0xc1, 0x3d, 0x0f, 0xc0, 0x1d, 0x2f, 0x80, 0x3c, 0xb6, - 0x63, 0x27, 0x4d, 0x1b, 0xca, 0x15, 0x70, 0x37, 0xfe, 0xce, 0x39, 0xdf, 0xf9, 0xce, 0xcf, 0xc4, - 0x0e, 0x7c, 0xe8, 0xb8, 0x84, 0x71, 0x62, 0x11, 0x9b, 0x70, 0x6f, 0x56, 0x75, 0x3d, 0x87, 0x3b, - 0xd5, 0xf0, 0x4c, 0x47, 0x7e, 0x75, 0x7a, 0x9a, 0x1c, 0x55, 0x61, 0x40, 0xcf, 0x16, 0xbc, 0x23, - 0x50, 0x4d, 0x5c, 0xa6, 0xa7, 0x87, 0x1f, 0xac, 0x62, 0x1b, 0x39, 0xb6, 0xed, 0xb0, 0x90, 0x2c, - 0x3a, 0x45, 0x61, 0x87, 0xea, 0x2a, 0x5f, 0x8f, 0xf8, 0x4e, 0xe0, 0x8d, 0x48, 0xe8, 0x9d, 0x9c, - 0x23, 0xff, 0xca, 0xef, 0x12, 0xec, 0xe1, 0x18, 0x6a, 0x47, 0x29, 0x51, 0x13, 0xb6, 0x12, 0xaf, - 0xb2, 0x74, 0x24, 0x1d, 0x17, 0xcf, 0xde, 0x57, 0x57, 0x49, 0x9c, 0x53, 0x4d, 0x4f, 0xd5, 0x84, - 0x03, 0xcf, 0x43, 0xd1, 0xf7, 0x12, 0xbc, 0x45, 0x99, 0xcf, 0xbd, 0xc0, 0x26, 0x8c, 0x9b, 0x9c, - 0x3a, 0xcc, 0xb0, 0xe8, 0xd0, 0x33, 0xbd, 0x99, 0x11, 0x57, 0x57, 0xce, 0x1d, 0xc9, 0xc7, 0xc5, - 0xb3, 0xcf, 0xd5, 0xfb, 0x3b, 0xa0, 0x6a, 0x8b, 0x34, 0xad, 0x88, 0x25, 0xd6, 0x8b, 0x9f, 0xd2, - 0xfb, 0xcc, 0x95, 0x5f, 0x25, 0x78, 0x7a, 0x2f, 0x01, 0x62, 0xf0, 0xe4, 0x0e, 0xa1, 0x71, 0xfd, - 0x9f, 0xac, 0x14, 0x18, 0x37, 0xfe, 0x4e, 0x7d, 0xf8, 0xcd, 0xd5, 0xc2, 0xd0, 0x97, 0xb0, 0xb9, - 0xd8, 0x80, 0x77, 0xd7, 0x35, 0x20, 0x52, 0x8a, 0x93, 0xb0, 0xca, 0x1f, 0x32, 0x14, 0x22, 0x0c, - 0xbd, 0x82, 0x52, 0x84, 0x1a, 0x63, 0xe2, 0x8f, 0x3c, 0xea, 0x72, 0xc7, 0x8b, 0x65, 0x7f, 0xf4, - 0xf7, 0x68, 0x1b, 0xf3, 0x38, 0xac, 0xd8, 0x4b, 0x08, 0x7a, 0x09, 0x25, 0xca, 0xf8, 0xc5, 0xb9, - 0x31, 0x36, 0xb9, 0x69, 0xb8, 0x0e, 0x65, 0x3c, 0x51, 0xad, 0xae, 0x1f, 0x1b, 0xbf, 0x38, 0x6f, - 0x98, 0xdc, 0xec, 0x85, 0x61, 0x78, 0x8f, 0x2e, 0x3c, 0xfb, 0xe8, 0x15, 0xa0, 0xb1, 0x13, 0x0c, - 0x2d, 0xb2, 0x40, 0x2e, 0x0b, 0xf2, 0xea, 0x3a, 0xf2, 0x86, 0x88, 0x4c, 0xd9, 0x95, 0xf1, 0x22, - 0xe0, 0xa3, 0x6f, 0xe1, 0x8d, 0x6b, 0xea, 0x73, 0x67, 0xe2, 0x99, 0xf6, 0x42, 0x86, 0xbc, 0xc8, - 0x70, 0xb6, 0x2e, 0xc3, 0x8b, 0x24, 0x38, 0x4d, 0xb2, 0x7f, 0x7d, 0x0b, 0xf3, 0xd1, 0x37, 0xb0, - 0xef, 0x07, 0xb6, 0x1d, 0xee, 0x75, 0x36, 0xcb, 0x86, 0xc8, 0xb2, 0x76, 0x06, 0xfd, 0x28, 0x34, - 0xcd, 0x51, 0xf2, 0x97, 0x10, 0xbf, 0xf2, 0x9b, 0x0c, 0xca, 0xf2, 0xac, 0x10, 0x82, 0x3c, 0x33, - 0xed, 0xe8, 0x8a, 0x6e, 0x63, 0x71, 0x46, 0x47, 0x50, 0x4c, 0xb6, 0x80, 0x3a, 0xac, 0x9c, 0x13, - 0xa6, 0x2c, 0x14, 0x46, 0x05, 0x8c, 0xf2, 0xb2, 0x1c, 0x45, 0x85, 0x67, 0xa4, 0x41, 0x9e, 0xcf, - 0x5c, 0x52, 0xce, 0x1f, 0x49, 0xc7, 0xbb, 0x77, 0x2c, 0xfb, 0x3d, 0x5b, 0xa3, 0xea, 0x33, 0x97, - 0x60, 0x41, 0x81, 0x5e, 0x43, 0x91, 0x13, 0xdb, 0x75, 0x3c, 0xd3, 0xa2, 0x7c, 0x56, 0xde, 0x10, - 0x8c, 0x9f, 0x3d, 0x9c, 0x31, 0xe5, 0xc0, 0x59, 0xc2, 0xca, 0x14, 0xf2, 0x61, 0x36, 0xa4, 0xc0, - 0x8e, 0xd6, 0xb9, 0xac, 0xb5, 0xb4, 0x86, 0xa1, 0x5f, 0xf5, 0x9a, 0xca, 0x23, 0xb4, 0x0d, 0x1b, - 0x5a, 0x47, 0xbf, 0x38, 0x57, 0x24, 0xb4, 0x0f, 0x7b, 0xed, 0x6e, 0xa7, 0xab, 0x77, 0x3b, 0xda, - 0x73, 0x23, 0x02, 0x73, 0x08, 0xa0, 0xd0, 0xe8, 0x0e, 0xea, 0xad, 0xa6, 0x22, 0xa3, 0x03, 0x50, - 0x52, 0x87, 0x18, 0xcd, 0xa3, 0xc7, 0xb0, 0xfd, 0x42, 0xeb, 0xeb, 0xdd, 0xaf, 0x70, 0xad, 0xad, - 0x6c, 0xa0, 0x22, 0x6c, 0xf6, 0x07, 0xed, 0x76, 0x0d, 0x5f, 0x29, 0x85, 0x8a, 0x0e, 0xc5, 0x8c, - 0x26, 0xf4, 0x04, 0xf6, 0xe7, 0xe9, 0x9b, 0xed, 0x5e, 0x17, 0xd7, 0x5a, 0x9a, 0x7e, 0xa5, 0x3c, - 0x42, 0x25, 0x78, 0xac, 0x75, 0xfa, 0x7a, 0xad, 0xa3, 0xd7, 0x3a, 0xcd, 0xee, 0xa0, 0xaf, 0x48, - 0xa1, 0xb0, 0x46, 0xb3, 0xa5, 0xd7, 0x94, 0x1c, 0xda, 0x05, 0x78, 0x3e, 0x68, 0x0f, 0x5a, 0x35, - 0x5d, 0xbb, 0x6c, 0x2a, 0x72, 0xe5, 0x67, 0x09, 0x76, 0x17, 0x2f, 0x09, 0x6a, 0x42, 0xc1, 0x32, - 0x87, 0xc4, 0xf2, 0xcb, 0x92, 0xd8, 0x9f, 0x93, 0x35, 0x3f, 0x3d, 0x7d, 0xee, 0x51, 0x36, 0xf9, - 0x9a, 0xcc, 0x2e, 0x4d, 0x2b, 0x20, 0x38, 0x0e, 0x46, 0x55, 0x38, 0xf0, 0xb9, 0xe9, 0x71, 0x83, - 0x53, 0x9b, 0x18, 0x01, 0xa3, 0x37, 0x06, 0x33, 0x99, 0x23, 0x36, 0xa2, 0x80, 0x4b, 0xc2, 0xa6, - 0x53, 0x9b, 0x0c, 0x18, 0xbd, 0xe9, 0x98, 0xcc, 0x41, 0xef, 0xc0, 0xee, 0x92, 0xab, 0x2c, 0x5c, - 0x77, 0x78, 0xd6, 0xeb, 0x00, 0x36, 0xa6, 0x61, 0x1e, 0xb1, 0x2a, 0x32, 0x8e, 0x1e, 0x2a, 0xbf, - 0x48, 0xb0, 0xb7, 0x74, 0x1d, 0xff, 0x4b, 0x75, 0x48, 0x49, 0x1d, 0x7f, 0xe6, 0x01, 0xdd, 0xbe, - 0xf4, 0xff, 0xfe, 0x52, 0x46, 0x4e, 0xc0, 0xb8, 0x28, 0x25, 0x8f, 0xa3, 0x07, 0xa4, 0x80, 0xec, - 0x07, 0xb6, 0xb8, 0x7f, 0x12, 0x0e, 0x8f, 0xa8, 0x0f, 0x9b, 0xc3, 0x60, 0xf4, 0x1d, 0xe1, 0x7e, - 0xb9, 0x20, 0xca, 0xf8, 0xf4, 0xe1, 0xbf, 0x7f, 0x6a, 0x5d, 0x30, 0xe0, 0x84, 0x09, 0xbd, 0x07, - 0x7b, 0xe4, 0xc6, 0xb5, 0xe8, 0x88, 0x72, 0x63, 0xe8, 0x04, 0x6c, 0xec, 0x97, 0x37, 0x8f, 0xe4, - 0x63, 0x09, 0xef, 0x26, 0x70, 0x5d, 0xa0, 0x87, 0x3f, 0xe5, 0xa0, 0x10, 0x05, 0xa7, 0x82, 0xa5, - 0xac, 0xe0, 0xd7, 0xb0, 0x45, 0x6e, 0x88, 0xed, 0x5a, 0xa6, 0x27, 0x3a, 0x52, 0x3c, 0xab, 0xff, - 0x63, 0x7d, 0x6a, 0x33, 0x66, 0xc2, 0x73, 0xce, 0xc3, 0x1f, 0x25, 0xd8, 0x4a, 0xe0, 0x74, 0xfc, - 0x52, 0x66, 0xfc, 0x2b, 0xfa, 0x9d, 0x5b, 0xd1, 0xef, 0x2e, 0x14, 0x4d, 0xce, 0xcd, 0xd1, 0x75, - 0xf8, 0x5a, 0x4f, 0xde, 0x56, 0x0f, 0x5c, 0x89, 0x2c, 0x43, 0xe5, 0x07, 0x19, 0x94, 0xe5, 0x97, - 0xc0, 0xff, 0x64, 0xe7, 0x1c, 0x28, 0xb9, 0xc4, 0x1b, 0x11, 0xc6, 0xa9, 0x45, 0x0c, 0xd1, 0xe5, - 0x64, 0xfb, 0xea, 0x0f, 0x7d, 0x2f, 0xaa, 0xa2, 0xb2, 0x1a, 0xef, 0xcd, 0x09, 0xb1, 0x92, 0x92, - 0x0b, 0xa3, 0x7f, 0xa8, 0x41, 0xe9, 0x96, 0x1b, 0x7a, 0x06, 0x90, 0x3a, 0xc6, 0x23, 0xcf, 0x20, - 0xe9, 0x36, 0xe4, 0x32, 0xdb, 0x50, 0xe7, 0xf0, 0x36, 0x75, 0xd6, 0x88, 0xac, 0xef, 0xc4, 0x9f, - 0x90, 0xbd, 0xd0, 0xd0, 0x93, 0x5e, 0x7e, 0x31, 0xa1, 0xfc, 0x3a, 0x18, 0x86, 0x83, 0xa9, 0x86, - 0xa1, 0x27, 0xe9, 0xa7, 0xf8, 0x02, 0xd3, 0x49, 0xf4, 0x61, 0x3e, 0x21, 0xac, 0x3a, 0xc9, 0xfe, - 0x33, 0x18, 0x16, 0x84, 0xe1, 0xe3, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x3f, 0x02, 0x26, 0x81, - 0x42, 0x0c, 0x00, 0x00, + // 943 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x56, 0x6f, 0x8f, 0xea, 0xc4, + 0x17, 0xbe, 0xa5, 0xc0, 0xee, 0x1e, 0xf6, 0x42, 0x99, 0xdd, 0x5f, 0x7e, 0x84, 0x17, 0x37, 0x48, + 0x8c, 0xae, 0xc6, 0x2d, 0x2e, 0x5e, 0x6f, 0x62, 0x62, 0xa2, 0x70, 0x21, 0xde, 0x46, 0xfe, 0x65, + 0x28, 0x9b, 0xec, 0x4d, 0xee, 0xad, 0x05, 0x46, 0x76, 0x22, 0xed, 0x34, 0xed, 0x94, 0x2c, 0xdf, + 0xc3, 0x44, 0xe3, 0xe7, 0xd1, 0x8f, 0xe0, 0xb7, 0xf0, 0x9d, 0x5f, 0xc0, 0x74, 0xda, 0xd2, 0xc2, + 0x12, 0x11, 0x5f, 0xa9, 0xef, 0x4e, 0x9f, 0x39, 0xcf, 0x73, 0xce, 0x99, 0x73, 0xa6, 0x33, 0xf0, + 0x11, 0x73, 0x88, 0xcd, 0xc9, 0x92, 0x58, 0x84, 0xbb, 0xeb, 0x86, 0xe3, 0x32, 0xce, 0x1a, 0x81, + 0x4d, 0x67, 0x5e, 0x63, 0x75, 0x13, 0x9b, 0xaa, 0x58, 0x40, 0xcf, 0xb6, 0xbc, 0x43, 0x50, 0x8d, + 0x5d, 0x56, 0x37, 0xd5, 0x0f, 0xf7, 0xa9, 0xcd, 0x98, 0x65, 0x31, 0x3b, 0x10, 0x0b, 0xad, 0x90, + 0x56, 0x55, 0xf7, 0xf9, 0xba, 0xc4, 0x63, 0xbe, 0x3b, 0x23, 0x81, 0x77, 0x6c, 0x87, 0xfe, 0xf5, + 0x9f, 0x24, 0x28, 0xe1, 0x08, 0xea, 0x87, 0x21, 0x51, 0x17, 0x4e, 0x63, 0xaf, 0x8a, 0x54, 0x93, + 0xae, 0x0a, 0xcd, 0x0f, 0xd4, 0x7d, 0x29, 0x6e, 0xa4, 0x56, 0x37, 0x6a, 0xac, 0x81, 0x37, 0x54, + 0xf4, 0x25, 0x9c, 0x44, 0x45, 0x54, 0x32, 0x35, 0xf9, 0xaa, 0xd0, 0x7c, 0x4f, 0xfd, 0xf3, 0x42, + 0xd5, 0x30, 0x01, 0x1c, 0xd3, 0xea, 0xbf, 0xc9, 0x90, 0x0f, 0x31, 0xf4, 0x06, 0xca, 0x21, 0x6a, + 0xcc, 0x89, 0x37, 0x73, 0xa9, 0xc3, 0x99, 0x1b, 0x25, 0xf7, 0xf1, 0x5f, 0x93, 0xed, 0x6c, 0x78, + 0x58, 0xb1, 0x76, 0x10, 0xf4, 0x1a, 0xca, 0xd4, 0xe6, 0x2f, 0x9e, 0x1b, 0x73, 0x93, 0x9b, 0x86, + 0xc3, 0xa8, 0xcd, 0xe3, 0xac, 0xd5, 0x43, 0xf2, 0x5a, 0x40, 0xec, 0x98, 0xdc, 0x1c, 0x05, 0x34, + 0x5c, 0xa2, 0x5b, 0xdf, 0x1e, 0x7a, 0x03, 0x68, 0xce, 0xfc, 0xe9, 0x92, 0x6c, 0x89, 0xcb, 0x42, + 0xbc, 0x71, 0x48, 0xbc, 0x23, 0x98, 0x89, 0xba, 0x32, 0xdf, 0x06, 0x3c, 0xf4, 0x2d, 0xfc, 0xef, + 0x9e, 0x7a, 0x9c, 0x2d, 0x5c, 0xd3, 0xda, 0x8a, 0x90, 0x15, 0x11, 0x9a, 0x87, 0x22, 0xbc, 0x8a, + 0xc9, 0x49, 0x90, 0x8b, 0xfb, 0x47, 0x98, 0x87, 0xbe, 0x81, 0x0b, 0xcf, 0xb7, 0x2c, 0xd3, 0x5d, + 0x6f, 0x45, 0xc9, 0x89, 0x28, 0x07, 0x7b, 0x30, 0x0e, 0xa9, 0x49, 0x8c, 0xb2, 0xb7, 0x83, 0x78, + 0xf5, 0x5f, 0x65, 0x50, 0x76, 0x7b, 0x85, 0x10, 0x64, 0x6d, 0xd3, 0x0a, 0x07, 0xf1, 0x0c, 0x0b, + 0x1b, 0xd5, 0xa0, 0x10, 0x4f, 0x01, 0x65, 0x76, 0x25, 0x23, 0x96, 0xd2, 0x50, 0xc0, 0xf2, 0x6d, + 0xca, 0x2b, 0x72, 0xc8, 0x0a, 0x6c, 0xa4, 0x41, 0x96, 0xaf, 0x1d, 0x52, 0xc9, 0xd6, 0xa4, 0xab, + 0x62, 0xf3, 0xd3, 0x63, 0xa7, 0x46, 0xd5, 0xd7, 0x0e, 0xc1, 0x42, 0x02, 0xbd, 0x85, 0x02, 0x27, + 0x96, 0xc3, 0x5c, 0x73, 0x49, 0xf9, 0xba, 0x92, 0x13, 0x8a, 0x9f, 0x1f, 0xaf, 0x98, 0x68, 0xe0, + 0xb4, 0x60, 0x7d, 0x05, 0xd9, 0x20, 0x1a, 0x52, 0xe0, 0x5c, 0x1b, 0xdc, 0xb6, 0x7a, 0x5a, 0xc7, + 0xd0, 0xef, 0x46, 0x5d, 0xe5, 0x09, 0x3a, 0x83, 0x9c, 0x36, 0xd0, 0x5f, 0x3c, 0x57, 0x24, 0x74, + 0x01, 0xa5, 0xfe, 0x70, 0x30, 0xd4, 0x87, 0x03, 0xed, 0xa5, 0x11, 0x82, 0x19, 0x04, 0x90, 0xef, + 0x0c, 0x27, 0xed, 0x5e, 0x57, 0x91, 0xd1, 0x25, 0x28, 0x89, 0x43, 0x84, 0x66, 0xd1, 0x53, 0x38, + 0x7b, 0xa5, 0x8d, 0xf5, 0xe1, 0x57, 0xb8, 0xd5, 0x57, 0x72, 0xa8, 0x00, 0x27, 0xe3, 0x49, 0xbf, + 0xdf, 0xc2, 0x77, 0x4a, 0xbe, 0xae, 0x43, 0x21, 0x95, 0x13, 0xfa, 0x3f, 0x5c, 0x6c, 0xc2, 0x77, + 0xfb, 0xa3, 0x21, 0x6e, 0xf5, 0x34, 0xfd, 0x4e, 0x79, 0x82, 0xca, 0xf0, 0x54, 0x1b, 0x8c, 0xf5, + 0xd6, 0x40, 0x6f, 0x0d, 0xba, 0xc3, 0xc9, 0x58, 0x91, 0x82, 0xc4, 0x3a, 0xdd, 0x9e, 0xde, 0x52, + 0x32, 0xa8, 0x08, 0xf0, 0x72, 0xd2, 0x9f, 0xf4, 0x5a, 0xba, 0x76, 0xdb, 0x55, 0xe4, 0xfa, 0xcf, + 0x12, 0x14, 0xb7, 0x0f, 0x09, 0xea, 0x42, 0x7e, 0x69, 0x4e, 0xc9, 0xd2, 0xab, 0x48, 0x62, 0x7e, + 0xae, 0xf7, 0xee, 0x5d, 0xf4, 0x67, 0x0b, 0xc6, 0x87, 0xbb, 0xd4, 0x5e, 0x7c, 0x4d, 0xd6, 0xb7, + 0xe6, 0xd2, 0x27, 0x38, 0x22, 0xa3, 0x06, 0x5c, 0x7a, 0xdc, 0x74, 0xb9, 0xc1, 0xa9, 0x45, 0x0c, + 0xdf, 0xa6, 0x0f, 0x86, 0x6d, 0xda, 0x4c, 0x4c, 0x44, 0x1e, 0x97, 0xc5, 0x9a, 0x4e, 0x2d, 0x32, + 0xb1, 0xe9, 0xc3, 0xc0, 0xb4, 0x19, 0x7a, 0x17, 0x8a, 0x3b, 0xae, 0xb2, 0x70, 0x3d, 0xe7, 0x69, + 0xaf, 0x4b, 0xc8, 0xad, 0x82, 0x38, 0x62, 0x54, 0x64, 0x1c, 0x7e, 0xd4, 0x7f, 0x91, 0xa0, 0xb4, + 0x73, 0x1c, 0xff, 0x4d, 0x75, 0x48, 0x71, 0x1d, 0xbf, 0x67, 0x01, 0x3d, 0x3e, 0xf4, 0xff, 0xfc, + 0x52, 0x66, 0xcc, 0xb7, 0xb9, 0x28, 0x25, 0x8b, 0xc3, 0x0f, 0xa4, 0x80, 0xec, 0xf9, 0x96, 0x38, + 0x7f, 0x12, 0x0e, 0x4c, 0x34, 0x86, 0x93, 0xa9, 0x3f, 0xfb, 0x8e, 0x70, 0xaf, 0x92, 0x17, 0x65, + 0x7c, 0x76, 0xfc, 0xff, 0x4f, 0x6d, 0x0b, 0x05, 0x1c, 0x2b, 0xa1, 0xf7, 0xa1, 0x44, 0x1e, 0x9c, + 0x25, 0x9d, 0x51, 0x6e, 0x4c, 0x99, 0x6f, 0xcf, 0xbd, 0xca, 0x49, 0x4d, 0xbe, 0x92, 0x70, 0x31, + 0x86, 0xdb, 0x02, 0xad, 0xfe, 0x98, 0x81, 0x7c, 0x48, 0x4e, 0x12, 0x96, 0xd2, 0x09, 0xbf, 0x85, + 0x53, 0xf2, 0x40, 0x2c, 0x67, 0x69, 0xba, 0x62, 0x47, 0x0a, 0xcd, 0xf6, 0xdf, 0xce, 0x4f, 0xed, + 0x46, 0x4a, 0x78, 0xa3, 0x59, 0xfd, 0x41, 0x82, 0xd3, 0x18, 0x4e, 0xda, 0x2f, 0xa5, 0xda, 0xbf, + 0x67, 0xbf, 0x33, 0x7b, 0xf6, 0x7b, 0x08, 0x05, 0x93, 0x73, 0x73, 0x76, 0x6f, 0x91, 0xe4, 0xb6, + 0x3a, 0x72, 0x24, 0xd2, 0x0a, 0xf5, 0xef, 0x65, 0x50, 0x76, 0x2f, 0x81, 0xff, 0xc8, 0xcc, 0x31, + 0x28, 0x3b, 0xc4, 0x9d, 0x11, 0x9b, 0xd3, 0x25, 0x31, 0xc4, 0x2e, 0xc7, 0xd3, 0xd7, 0x3e, 0xf6, + 0x5e, 0x54, 0x45, 0x65, 0x2d, 0x3e, 0xda, 0x08, 0x62, 0x25, 0x11, 0x17, 0x8b, 0x5e, 0x55, 0x83, + 0xf2, 0x23, 0x37, 0xf4, 0x0c, 0x20, 0x71, 0x8c, 0x5a, 0x9e, 0x42, 0x92, 0x69, 0xc8, 0xa4, 0xa6, + 0xa1, 0xcd, 0xe1, 0x1d, 0xca, 0x0e, 0x24, 0xd9, 0x3e, 0x8f, 0x5e, 0x86, 0xa3, 0x60, 0x61, 0x24, + 0xbd, 0xfe, 0x62, 0x41, 0xf9, 0xbd, 0x3f, 0x0d, 0x1a, 0xd3, 0x08, 0xa8, 0xd7, 0xc9, 0x83, 0x73, + 0x4b, 0xe9, 0x3a, 0x7c, 0x7e, 0x2e, 0x88, 0xdd, 0x58, 0xa4, 0xdf, 0xbf, 0xd3, 0xbc, 0x58, 0xf8, + 0xe4, 0x8f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x73, 0x81, 0x4c, 0xe7, 0x28, 0x0b, 0x00, 0x00, } diff --git a/gen/go/trace/v1/trace.pb.go b/gen/go/trace/v1/trace.pb.go index 7aaf1c0f0..40feeba17 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{2, 0} + return fileDescriptor_5c407ac9c675a601, []int{1, 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{3, 0} + return fileDescriptor_5c407ac9c675a601, []int{2, 0} } -// A collection of InstrumentationLibrarySpans from a Resource. +// A collection of Spans 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 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:"-"` + // 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:"-"` } func (m *ResourceSpans) Reset() { *m = ResourceSpans{} } @@ -191,58 +191,7 @@ func (m *ResourceSpans) GetResource() *v1.Resource { return nil } -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 { +func (m *ResourceSpans) GetSpans() []*Span { if m != nil { return m.Spans } @@ -353,7 +302,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{2} + return fileDescriptor_5c407ac9c675a601, []int{1} } func (m *Span) XXX_Unmarshal(b []byte) error { @@ -501,7 +450,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{2, 0} + return fileDescriptor_5c407ac9c675a601, []int{1, 0} } func (m *Span_Event) XXX_Unmarshal(b []byte) error { @@ -576,7 +525,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{2, 1} + return fileDescriptor_5c407ac9c675a601, []int{1, 1} } func (m *Span_Link) XXX_Unmarshal(b []byte) error { @@ -649,7 +598,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{3} + return fileDescriptor_5c407ac9c675a601, []int{2} } func (m *Status) XXX_Unmarshal(b []byte) error { @@ -688,7 +637,6 @@ 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") @@ -700,68 +648,64 @@ func init() { } var fileDescriptor_5c407ac9c675a601 = []byte{ - // 1006 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, 0xc4, 0xd9, 0x38, 0x2d, 0x22, 0x08, 0x01, 0xaa, - 0x36, 0x88, 0x54, 0xbb, 0x28, 0x90, 0x02, 0x0d, 0x5a, 0x45, 0x5a, 0x17, 0x82, 0x5d, 0x59, 0xa0, - 0xac, 0x1c, 0x7a, 0x11, 0x28, 0x91, 0x95, 0x09, 0xaf, 0x48, 0x81, 0xcb, 0x55, 0xed, 0x43, 0x9f, - 0xa7, 0x4f, 0xd1, 0x5b, 0x81, 0x3e, 0x41, 0xaf, 0xbd, 0xf7, 0x2d, 0x0a, 0x72, 0x77, 0x6d, 0x2b, - 0xb0, 0xe5, 0x5c, 0x7c, 0xb1, 0x87, 0x33, 0xdf, 0x37, 0xdf, 0x0c, 0x67, 0x56, 0xbb, 0xd0, 0x94, - 0x4b, 0x26, 0x34, 0x0b, 0xd8, 0x82, 0x69, 0x75, 0xd9, 0x5e, 0x2a, 0xa9, 0x65, 0x5b, 0x2b, 0x32, - 0x63, 0xed, 0xd5, 0x7e, 0x6c, 0xb4, 0xac, 0x13, 0x7d, 0xb6, 0x86, 0x8c, 0x9d, 0xad, 0x18, 0xb0, - 0xda, 0xdf, 0xfb, 0xea, 0xb6, 0x3c, 0x33, 0xb9, 0x58, 0x48, 0x61, 0x12, 0xc5, 0x56, 0x4c, 0xda, - 0x6b, 0xdd, 0x86, 0x55, 0x2c, 0x94, 0x91, 0x8a, 0x65, 0x53, 0x3b, 0xc6, 0x37, 0xfe, 0x71, 0xa0, - 0x8a, 0x13, 0xd7, 0x68, 0x49, 0x44, 0x88, 0x7c, 0x28, 0xa5, 0x18, 0xcf, 0xa9, 0x3b, 0xcd, 0xf2, - 0xc1, 0x97, 0xad, 0xdb, 0xca, 0xbb, 0x4a, 0xb4, 0xda, 0x6f, 0xa5, 0x19, 0xf0, 0x15, 0x15, 0xfd, - 0x0e, 0x9f, 0x73, 0x11, 0x6a, 0x15, 0x2d, 0x98, 0xd0, 0x44, 0x73, 0x29, 0x26, 0x01, 0x9f, 0x2a, - 0xa2, 0x2e, 0x27, 0xa1, 0xd1, 0xf1, 0x32, 0xf5, 0x6c, 0xb3, 0x7c, 0xf0, 0x5d, 0x6b, 0x53, 0xeb, - 0xad, 0xfe, 0x7a, 0x8a, 0xe3, 0x38, 0x83, 0x2d, 0x14, 0xbf, 0xe0, 0x77, 0x07, 0x1b, 0x7f, 0x3b, - 0xf0, 0x62, 0x03, 0x19, 0x09, 0x78, 0x76, 0x47, 0x79, 0x49, 0xd3, 0xdf, 0xde, 0x5a, 0x58, 0x72, - 0xd7, 0x77, 0x56, 0x86, 0x77, 0x6f, 0x2f, 0x0a, 0xbd, 0x85, 0xfc, 0xcd, 0xb6, 0x1b, 0x9b, 0xdb, - 0x36, 0x35, 0xe2, 0x98, 0xd0, 0xf8, 0x6f, 0x0b, 0x72, 0xe6, 0x8c, 0x9e, 0x43, 0xc9, 0x02, 0x26, - 0x9c, 0xda, 0x1a, 0x2b, 0xb8, 0x68, 0xcf, 0x7d, 0x8a, 0x9e, 0x41, 0xd1, 0x80, 0x4d, 0x24, 0x63, - 0x23, 0x05, 0x73, 0xec, 0x53, 0xf4, 0x12, 0xca, 0x31, 0x27, 0xd4, 0x44, 0x33, 0x2f, 0x5b, 0x77, - 0x9a, 0x5b, 0x18, 0xac, 0x6b, 0x64, 0x3c, 0xe8, 0x15, 0xd4, 0x96, 0x44, 0x31, 0xa1, 0x27, 0x69, - 0x82, 0x9c, 0x4d, 0x50, 0x89, 0xbd, 0xa3, 0x38, 0x0d, 0x82, 0x9c, 0x20, 0x0b, 0xe6, 0xe5, 0x2d, - 0xdf, 0xda, 0xe8, 0x07, 0xc8, 0x9d, 0x73, 0x41, 0xbd, 0x42, 0xdd, 0x69, 0xd6, 0x0e, 0x5e, 0xdf, - 0xdf, 0x90, 0xfd, 0x73, 0xc4, 0x05, 0xc5, 0x96, 0x88, 0xda, 0xf0, 0x24, 0xd4, 0x44, 0xe9, 0x89, - 0xe6, 0x0b, 0x36, 0x89, 0x04, 0xbf, 0x98, 0x08, 0x22, 0xa4, 0x57, 0xac, 0x3b, 0xcd, 0x02, 0xde, - 0xb1, 0xb1, 0x53, 0xbe, 0x60, 0x63, 0xc1, 0x2f, 0x06, 0x44, 0x48, 0xf4, 0x1a, 0x10, 0x13, 0xf4, - 0x63, 0x78, 0xc9, 0xc2, 0xb7, 0x99, 0xa0, 0x6b, 0xe0, 0x9f, 0x00, 0x88, 0xd6, 0x8a, 0x4f, 0x23, - 0xcd, 0x42, 0x6f, 0xcb, 0xde, 0xfa, 0x17, 0xf7, 0xcc, 0xf4, 0x88, 0x5d, 0x7e, 0x20, 0x41, 0xc4, - 0xf0, 0x0d, 0x2a, 0x7a, 0x0b, 0x1e, 0x55, 0x72, 0xb9, 0x64, 0x74, 0x72, 0xed, 0x9d, 0xcc, 0x64, - 0x24, 0xb4, 0x07, 0x75, 0xa7, 0x59, 0xc5, 0xbb, 0x49, 0xbc, 0x73, 0x15, 0xee, 0x9a, 0x28, 0xfa, - 0x11, 0x0a, 0x6c, 0xc5, 0x84, 0x0e, 0xbd, 0xb2, 0x95, 0x6f, 0x7e, 0xc2, 0x1d, 0xf9, 0x86, 0x80, - 0x13, 0x1e, 0xfa, 0x1a, 0x9e, 0xa4, 0xda, 0xb1, 0x27, 0xd1, 0xad, 0x58, 0x5d, 0x94, 0xc4, 0x2c, - 0x27, 0xd1, 0x7c, 0x07, 0xf9, 0x80, 0x8b, 0xf3, 0xd0, 0xab, 0x6e, 0xe8, 0x78, 0x5d, 0xf2, 0x98, - 0x8b, 0x73, 0x1c, 0xb3, 0x50, 0x0b, 0x1e, 0xa7, 0x82, 0xd6, 0x91, 0xe8, 0xd5, 0xac, 0xde, 0x4e, - 0x12, 0x32, 0x84, 0x44, 0xee, 0x7b, 0x28, 0x98, 0xcd, 0x8a, 0x42, 0x6f, 0xdb, 0x3e, 0x35, 0xaf, - 0xee, 0xd1, 0xb3, 0x58, 0x9c, 0x70, 0xf6, 0xfe, 0x72, 0x20, 0x6f, 0x8b, 0x37, 0x6b, 0xf8, 0xd1, - 0x58, 0x1d, 0x3b, 0xd6, 0x8a, 0xbe, 0x39, 0xd3, 0x74, 0x0d, 0x33, 0x37, 0xd6, 0x70, 0x7d, 0xce, - 0xd9, 0x87, 0x99, 0x73, 0x6e, 0xd3, 0x9c, 0xf7, 0xfe, 0x75, 0x20, 0x67, 0xee, 0xe4, 0x61, 0x9e, - 0xd0, 0xf5, 0x06, 0x73, 0x0f, 0xd3, 0x60, 0x7e, 0x53, 0x83, 0x8d, 0x39, 0x94, 0xd2, 0x67, 0x17, - 0x3d, 0x87, 0xa7, 0xa3, 0x61, 0x67, 0x30, 0x39, 0xea, 0x0f, 0x7a, 0x93, 0xf1, 0x60, 0x34, 0xf4, - 0xbb, 0xfd, 0xc3, 0xbe, 0xdf, 0x73, 0x1f, 0xa1, 0x0a, 0x94, 0xfa, 0x83, 0x53, 0x1f, 0x0f, 0x3a, - 0xc7, 0xae, 0x83, 0x00, 0x0a, 0x23, 0x1f, 0x7f, 0xf0, 0xb1, 0x9b, 0x31, 0x76, 0xf7, 0xb8, 0xef, - 0x0f, 0x4e, 0xdd, 0xac, 0x41, 0x0d, 0xf1, 0x49, 0x6f, 0xdc, 0xf5, 0xb1, 0x9b, 0x33, 0xa7, 0xee, - 0xc9, 0x60, 0x34, 0xfe, 0xd9, 0xc7, 0x6e, 0xbe, 0xf1, 0x47, 0x16, 0x0a, 0xf1, 0x8e, 0xa0, 0x2e, - 0xe4, 0x66, 0x92, 0xc6, 0xaf, 0xa0, 0xda, 0x41, 0xfb, 0x53, 0xf6, 0x2a, 0xf9, 0xd7, 0x95, 0x94, - 0x61, 0x4b, 0x46, 0x1e, 0x14, 0x17, 0x2c, 0x0c, 0xc9, 0x3c, 0xdd, 0x99, 0xf4, 0xd8, 0xf8, 0x33, - 0x03, 0x70, 0x0d, 0x47, 0x05, 0xc8, 0x9c, 0x9c, 0xbb, 0x8f, 0x50, 0x15, 0xb6, 0xba, 0x44, 0xcc, - 0x58, 0x10, 0x30, 0xea, 0x3a, 0xc8, 0x85, 0xca, 0x58, 0x9c, 0x0b, 0xf9, 0x9b, 0xf0, 0x95, 0x92, - 0xca, 0xcd, 0xa0, 0xc7, 0xb0, 0xdd, 0x17, 0x2b, 0x12, 0x70, 0xda, 0x51, 0x73, 0xfb, 0x33, 0xef, - 0x66, 0xd1, 0x13, 0x70, 0x7b, 0x8c, 0xd0, 0x80, 0x0b, 0xe6, 0x5f, 0xcc, 0x18, 0xa3, 0x8c, 0xc6, - 0xad, 0x0d, 0xa4, 0x3e, 0x94, 0x91, 0xa0, 0x6e, 0x1e, 0xed, 0x40, 0xb5, 0x13, 0x28, 0x46, 0xe8, - 0xa5, 0x7f, 0xc1, 0x43, 0x1d, 0xba, 0x05, 0x43, 0x1b, 0x32, 0xb5, 0xe0, 0x61, 0xc8, 0xa5, 0xe8, - 0x31, 0xc1, 0x19, 0x75, 0x8b, 0xe8, 0x29, 0xec, 0xa4, 0xaf, 0x53, 0xff, 0xe2, 0x8c, 0x44, 0xa1, - 0x66, 0xd4, 0x2d, 0xa1, 0x5d, 0x40, 0x87, 0x84, 0x07, 0x8c, 0x0e, 0x15, 0x9b, 0x49, 0x41, 0xb9, - 0x79, 0xbb, 0xb8, 0x5b, 0xa8, 0x0c, 0xc5, 0xce, 0x54, 0x2a, 0x03, 0x02, 0x54, 0x03, 0x38, 0x89, - 0xf4, 0xc9, 0xaf, 0x98, 0x88, 0x39, 0x73, 0xcb, 0x46, 0x74, 0x2c, 0xf8, 0x62, 0x69, 0xae, 0x4d, - 0x18, 0x48, 0xc5, 0xb8, 0xfa, 0x42, 0x33, 0x25, 0x48, 0x10, 0xf7, 0x54, 0x45, 0xdb, 0x50, 0x1e, - 0x0b, 0xb2, 0x22, 0x3c, 0x20, 0xd3, 0x80, 0xb9, 0x35, 0x53, 0x79, 0x8f, 0x68, 0x72, 0x2c, 0xc3, - 0xd0, 0xdd, 0x36, 0x2d, 0x8f, 0x05, 0x89, 0xf4, 0x19, 0x13, 0x9a, 0xcf, 0x88, 0x49, 0xe3, 0xbe, - 0x17, 0xf0, 0x92, 0xcb, 0x8d, 0x43, 0x79, 0x0f, 0xa7, 0xc6, 0x1a, 0x1a, 0xe7, 0xd0, 0xf9, 0xe5, - 0xdd, 0x9c, 0xeb, 0xb3, 0x68, 0x6a, 0x96, 0xb4, 0x6d, 0x68, 0x6f, 0xae, 0x3f, 0x52, 0xd6, 0xb2, - 0xbc, 0x89, 0x3f, 0x59, 0xe6, 0x4c, 0xb4, 0xe7, 0xd7, 0x5f, 0x4b, 0xd3, 0x82, 0x75, 0x7f, 0xf3, - 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x35, 0xda, 0x0b, 0xc1, 0x54, 0x09, 0x00, 0x00, + // 941 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcd, 0x6e, 0xdb, 0x46, + 0x10, 0x0e, 0xf5, 0xef, 0xd1, 0x8f, 0xd7, 0x9b, 0x9f, 0x32, 0x46, 0x81, 0x08, 0x42, 0x80, 0xaa, + 0x0d, 0x22, 0xd5, 0xee, 0x25, 0x87, 0x06, 0xad, 0x22, 0xd1, 0x85, 0x60, 0x57, 0x16, 0x28, 0x2b, + 0x87, 0x5e, 0x84, 0xb5, 0x76, 0x2a, 0x2f, 0x4c, 0xee, 0x0a, 0xe4, 0x52, 0xb5, 0xdf, 0xa2, 0x6f, + 0xd1, 0xa7, 0xe8, 0xad, 0xcf, 0xd1, 0x7b, 0xdf, 0xa2, 0xd8, 0x25, 0x69, 0x5b, 0x81, 0xe1, 0xe4, + 0xe2, 0x8b, 0xb4, 0xfb, 0xcd, 0xf7, 0xcd, 0xb7, 0xb3, 0x33, 0x14, 0x05, 0x5d, 0xb5, 0x46, 0xa9, + 0x31, 0xc0, 0x10, 0x75, 0x74, 0xdd, 0x5f, 0x47, 0x4a, 0xab, 0xbe, 0x8e, 0xd8, 0x12, 0xfb, 0x9b, + 0x83, 0x74, 0xd1, 0xb3, 0x20, 0xfd, 0x7a, 0x8b, 0x99, 0x82, 0xbd, 0x94, 0xb0, 0x39, 0xd8, 0xff, + 0xee, 0xbe, 0x3c, 0x4b, 0x15, 0x86, 0x4a, 0x9a, 0x44, 0xe9, 0x2a, 0x15, 0xed, 0xf7, 0xee, 0xe3, + 0x46, 0x18, 0xab, 0x24, 0x4a, 0x6d, 0xf3, 0x75, 0xca, 0xef, 0xfc, 0xe9, 0x40, 0xd3, 0xcf, 0xa0, + 0xd9, 0x9a, 0xc9, 0x98, 0x7a, 0x50, 0xcb, 0x39, 0xae, 0xd3, 0x76, 0xba, 0xf5, 0xc3, 0x6f, 0x7b, + 0xf7, 0x1d, 0xef, 0x26, 0xd1, 0xe6, 0xa0, 0x97, 0x67, 0xf0, 0x6f, 0xa4, 0xf4, 0x1d, 0x94, 0x63, + 0x93, 0xcf, 0x2d, 0xb4, 0x8b, 0xdd, 0xfa, 0x61, 0xa7, 0xf7, 0x50, 0x89, 0x3d, 0x63, 0xed, 0xa7, + 0x82, 0xce, 0x7f, 0x3b, 0x50, 0x32, 0x7b, 0xfa, 0x12, 0x6a, 0x96, 0xb0, 0x10, 0xdc, 0x9e, 0xa4, + 0xe1, 0x57, 0xed, 0x7e, 0xcc, 0xe9, 0x57, 0x50, 0x35, 0x64, 0x13, 0x29, 0xd8, 0x48, 0xc5, 0x6c, + 0xc7, 0x9c, 0xbe, 0x82, 0x7a, 0xaa, 0x89, 0x35, 0xd3, 0xe8, 0x16, 0xdb, 0x4e, 0x77, 0xc7, 0x07, + 0x0b, 0xcd, 0x0c, 0x42, 0x5f, 0x43, 0x6b, 0xcd, 0x22, 0x94, 0x7a, 0x91, 0x27, 0x28, 0xd9, 0x04, + 0x8d, 0x14, 0x9d, 0xa5, 0x69, 0x28, 0x94, 0x24, 0x0b, 0xd1, 0x2d, 0x5b, 0xbd, 0x5d, 0xd3, 0x9f, + 0xa0, 0x74, 0x29, 0x24, 0x77, 0x2b, 0x6d, 0xa7, 0xdb, 0x3a, 0x7c, 0xf3, 0xf9, 0x82, 0xec, 0xc7, + 0xb1, 0x90, 0xdc, 0xb7, 0x42, 0xda, 0x87, 0x67, 0xb1, 0x66, 0x91, 0x5e, 0x68, 0x11, 0xe2, 0x22, + 0x91, 0xe2, 0x6a, 0x21, 0x99, 0x54, 0x6e, 0xb5, 0xed, 0x74, 0x2b, 0xfe, 0x9e, 0x8d, 0x9d, 0x89, + 0x10, 0xe7, 0x52, 0x5c, 0x4d, 0x98, 0x54, 0xf4, 0x0d, 0x50, 0x94, 0xfc, 0x53, 0x7a, 0xcd, 0xd2, + 0x77, 0x51, 0xf2, 0x2d, 0xf2, 0x2f, 0x00, 0x4c, 0xeb, 0x48, 0x9c, 0x27, 0x1a, 0x63, 0x77, 0xc7, + 0xde, 0xfa, 0x37, 0xf7, 0x1e, 0x32, 0x1b, 0x98, 0xcd, 0x41, 0xef, 0x18, 0xaf, 0x3f, 0xb2, 0x20, + 0x41, 0xff, 0x8e, 0x94, 0xbe, 0x03, 0x97, 0x47, 0x6a, 0xbd, 0x46, 0xbe, 0xb8, 0x45, 0x17, 0x4b, + 0x95, 0x48, 0xed, 0x42, 0xdb, 0xe9, 0x36, 0xfd, 0x17, 0x59, 0x7c, 0x70, 0x13, 0x1e, 0x9a, 0x28, + 0xfd, 0x19, 0x2a, 0xb8, 0x41, 0xa9, 0x63, 0xb7, 0x6e, 0xed, 0xbb, 0x5f, 0x70, 0x47, 0x9e, 0x11, + 0xf8, 0x99, 0x8e, 0x7e, 0x0f, 0xcf, 0x72, 0xef, 0x14, 0xc9, 0x7c, 0x1b, 0xd6, 0x97, 0x66, 0x31, + 0xab, 0xc9, 0x3c, 0xdf, 0x43, 0x39, 0x10, 0xf2, 0x32, 0x76, 0x9b, 0x0f, 0x54, 0xbc, 0x6d, 0x79, + 0x22, 0xe4, 0xa5, 0x9f, 0xaa, 0x68, 0x0f, 0x9e, 0xe6, 0x86, 0x16, 0xc8, 0xfc, 0x5a, 0xd6, 0x6f, + 0x2f, 0x0b, 0x19, 0x41, 0x66, 0xf7, 0x23, 0x54, 0xcc, 0x64, 0x25, 0xb1, 0xbb, 0x6b, 0x9f, 0x8d, + 0xd7, 0x9f, 0xf1, 0xb3, 0x5c, 0x3f, 0xd3, 0xec, 0xff, 0xe3, 0x40, 0xd9, 0x1e, 0xde, 0x8c, 0xe1, + 0x27, 0x6d, 0x75, 0x6c, 0x5b, 0x1b, 0xfa, 0x6e, 0x4f, 0xf3, 0x31, 0x2c, 0xdc, 0x19, 0xc3, 0xed, + 0x3e, 0x17, 0x1f, 0xa7, 0xcf, 0xa5, 0x87, 0xfa, 0xbc, 0xff, 0xaf, 0x03, 0x25, 0x73, 0x27, 0x8f, + 0xf3, 0x84, 0x6e, 0x17, 0x58, 0x7a, 0x9c, 0x02, 0xcb, 0x0f, 0x15, 0xd8, 0x59, 0x41, 0x2d, 0x7f, + 0x76, 0xe9, 0x4b, 0x78, 0x3e, 0x9b, 0x0e, 0x26, 0x8b, 0xe3, 0xf1, 0x64, 0xb4, 0x98, 0x4f, 0x66, + 0x53, 0x6f, 0x38, 0x3e, 0x1a, 0x7b, 0x23, 0xf2, 0x84, 0x36, 0xa0, 0x36, 0x9e, 0x9c, 0x79, 0xfe, + 0x64, 0x70, 0x42, 0x1c, 0x0a, 0x50, 0x99, 0x79, 0xfe, 0x47, 0xcf, 0x27, 0x05, 0xb3, 0x1e, 0x9e, + 0x8c, 0xbd, 0xc9, 0x19, 0x29, 0x1a, 0xd6, 0xd4, 0x3f, 0x1d, 0xcd, 0x87, 0x9e, 0x4f, 0x4a, 0x66, + 0x37, 0x3c, 0x9d, 0xcc, 0xe6, 0xbf, 0x7a, 0x3e, 0x29, 0x77, 0xfe, 0x2a, 0x42, 0x25, 0x9d, 0x11, + 0x3a, 0x84, 0xd2, 0x52, 0xf1, 0xf4, 0x37, 0xb7, 0x75, 0xd8, 0xff, 0x92, 0xb9, 0xca, 0xbe, 0x86, + 0x8a, 0xa3, 0x6f, 0xc5, 0xd4, 0x85, 0x6a, 0x88, 0x71, 0xcc, 0x56, 0xf9, 0xcc, 0xe4, 0xdb, 0xce, + 0xdf, 0x05, 0x80, 0x5b, 0x3a, 0xad, 0x40, 0xe1, 0xf4, 0x92, 0x3c, 0xa1, 0x4d, 0xd8, 0x19, 0x32, + 0xb9, 0xc4, 0x20, 0x40, 0x4e, 0x1c, 0x4a, 0xa0, 0x31, 0x97, 0x97, 0x52, 0xfd, 0x21, 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, 0xb5, 0x44, 0xe4, 0xc8, + 0xd3, 0xd2, 0x26, 0x4a, 0x1f, 0xa9, 0x44, 0x72, 0x52, 0xa6, 0x7b, 0xd0, 0x1c, 0x04, 0x11, 0x32, + 0x7e, 0xed, 0x5d, 0x89, 0x58, 0xc7, 0xa4, 0x62, 0x64, 0x53, 0x8c, 0x42, 0x11, 0xc7, 0x42, 0xc9, + 0x11, 0x4a, 0x81, 0x9c, 0x54, 0xe9, 0x73, 0xd8, 0xcb, 0xdf, 0x1f, 0xde, 0xd5, 0x05, 0x4b, 0x62, + 0x8d, 0x9c, 0xd4, 0xe8, 0x0b, 0xa0, 0x47, 0x4c, 0x04, 0xc8, 0xa7, 0x11, 0x2e, 0x95, 0xe4, 0x42, + 0x0b, 0x25, 0xc9, 0x0e, 0xad, 0x43, 0x75, 0x70, 0xae, 0x22, 0x43, 0x02, 0xda, 0x02, 0x38, 0x4d, + 0xf4, 0xe9, 0xef, 0x3e, 0x93, 0x2b, 0x24, 0x75, 0x63, 0x3a, 0x97, 0x22, 0x5c, 0x9b, 0x6b, 0x93, + 0x86, 0xd2, 0x30, 0xd0, 0x58, 0x6a, 0x8c, 0x24, 0x0b, 0xd2, 0x9a, 0x9a, 0x74, 0x17, 0xea, 0x73, + 0xc9, 0x36, 0x4c, 0x04, 0xec, 0x3c, 0x40, 0xd2, 0x32, 0x27, 0x1f, 0x31, 0xcd, 0x4e, 0x54, 0x1c, + 0x93, 0x5d, 0x53, 0xf2, 0x5c, 0xb2, 0x44, 0x5f, 0xa0, 0xd4, 0x62, 0xc9, 0x4c, 0x1a, 0xf2, 0x41, + 0xc2, 0x2b, 0xa1, 0x1e, 0x6c, 0xca, 0x07, 0x38, 0x33, 0xab, 0xa9, 0x01, 0xa7, 0xce, 0x6f, 0xef, + 0x57, 0x42, 0x5f, 0x24, 0xe7, 0x66, 0x48, 0xfb, 0x46, 0xf6, 0xf6, 0xf6, 0xad, 0xbc, 0x95, 0xe5, + 0x6d, 0xfa, 0x8e, 0x5e, 0xa1, 0xec, 0xaf, 0x6e, 0xff, 0x1e, 0x9c, 0x57, 0x2c, 0xfc, 0xc3, 0xff, + 0x01, 0x00, 0x00, 0xff, 0xff, 0xb0, 0x74, 0x0c, 0x39, 0x45, 0x08, 0x00, 0x00, } diff --git a/opentelemetry/proto/common/v1/common.proto b/opentelemetry/proto/common/v1/common.proto index 49bf436b2..9640a1033 100644 --- a/opentelemetry/proto/common/v1/common.proto +++ b/opentelemetry/proto/common/v1/common.proto @@ -68,10 +68,3 @@ 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 1d458824f..ecf01652c 100644 --- a/opentelemetry/proto/metrics/v1/metrics.proto +++ b/opentelemetry/proto/metrics/v1/metrics.proto @@ -24,23 +24,13 @@ 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 InstrumentationLibraryMetrics from a Resource. +// A collection of Metrics from a Resource. message ResourceMetrics { // 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 = 1; // A list of metrics that originate from a resource. - repeated InstrumentationLibraryMetrics instrumentation_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 instrumentation_library = 1; - - // A list of metrics that originate from an instrumentation library. repeated Metric metrics = 2; } diff --git a/opentelemetry/proto/trace/v1/trace.proto b/opentelemetry/proto/trace/v1/trace.proto index 5a2350fde..b317acd71 100644 --- a/opentelemetry/proto/trace/v1/trace.proto +++ b/opentelemetry/proto/trace/v1/trace.proto @@ -24,23 +24,13 @@ 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 InstrumentationLibrarySpans from a Resource. +// A collection of Spans 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 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. + // A list of spans that originate from a resource. repeated Span spans = 2; }