diff --git a/gen/go/collector/metrics/v1/metrics_service.pb.gw.go b/gen/go/collector/metrics/v1/metrics_service.pb.gw.go index 3bd2374a4..8158c98a6 100644 --- a/gen/go/collector/metrics/v1/metrics_service.pb.gw.go +++ b/gen/go/collector/metrics/v1/metrics_service.pb.gw.go @@ -13,6 +13,7 @@ import ( "io" "net/http" + "github.com/golang/protobuf/descriptor" "github.com/golang/protobuf/proto" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/grpc-ecosystem/grpc-gateway/utilities" @@ -22,11 +23,13 @@ import ( "google.golang.org/grpc/status" ) +// Suppress "imported and not used" errors var _ codes.Code var _ io.Reader var _ status.Status var _ = runtime.String var _ = utilities.NewDoubleArray +var _ = descriptor.ForMessage func request_MetricsService_Export_0(ctx context.Context, marshaler runtime.Marshaler, client MetricsServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq ExportMetricsServiceRequest @@ -45,6 +48,51 @@ func request_MetricsService_Export_0(ctx context.Context, marshaler runtime.Mars } +func local_request_MetricsService_Export_0(ctx context.Context, marshaler runtime.Marshaler, server MetricsServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq ExportMetricsServiceRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.Export(ctx, &protoReq) + return msg, metadata, err + +} + +// RegisterMetricsServiceHandlerServer registers the http handlers for service MetricsService to "mux". +// UnaryRPC :call MetricsServiceServer directly. +// StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. +func RegisterMetricsServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux, server MetricsServiceServer) error { + + mux.Handle("POST", pattern_MetricsService_Export_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_MetricsService_Export_0(rctx, inboundMarshaler, server, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_MetricsService_Export_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + return nil +} + // RegisterMetricsServiceHandlerFromEndpoint is same as RegisterMetricsServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterMetricsServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { diff --git a/gen/go/collector/trace/v1/trace_service.pb.gw.go b/gen/go/collector/trace/v1/trace_service.pb.gw.go index df329e393..1da38f1cd 100644 --- a/gen/go/collector/trace/v1/trace_service.pb.gw.go +++ b/gen/go/collector/trace/v1/trace_service.pb.gw.go @@ -13,6 +13,7 @@ import ( "io" "net/http" + "github.com/golang/protobuf/descriptor" "github.com/golang/protobuf/proto" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/grpc-ecosystem/grpc-gateway/utilities" @@ -22,11 +23,13 @@ import ( "google.golang.org/grpc/status" ) +// Suppress "imported and not used" errors var _ codes.Code var _ io.Reader var _ status.Status var _ = runtime.String var _ = utilities.NewDoubleArray +var _ = descriptor.ForMessage func request_TraceService_Export_0(ctx context.Context, marshaler runtime.Marshaler, client TraceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq ExportTraceServiceRequest @@ -45,6 +48,51 @@ func request_TraceService_Export_0(ctx context.Context, marshaler runtime.Marsha } +func local_request_TraceService_Export_0(ctx context.Context, marshaler runtime.Marshaler, server TraceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq ExportTraceServiceRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.Export(ctx, &protoReq) + return msg, metadata, err + +} + +// RegisterTraceServiceHandlerServer registers the http handlers for service TraceService to "mux". +// UnaryRPC :call TraceServiceServer directly. +// StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. +func RegisterTraceServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux, server TraceServiceServer) error { + + mux.Handle("POST", pattern_TraceService_Export_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_TraceService_Export_0(rctx, inboundMarshaler, server, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_TraceService_Export_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + return nil +} + // RegisterTraceServiceHandlerFromEndpoint is same as RegisterTraceServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterTraceServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { diff --git a/gen/go/common/v1/common.pb.go b/gen/go/common/v1/common.pb.go index 3930f9134..194f64147 100644 --- a/gen/go/common/v1/common.pb.go +++ b/gen/go/common/v1/common.pb.go @@ -184,60 +184,10 @@ 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() { @@ -245,29 +195,26 @@ func init() { } var fileDescriptor_62ba46dcb97aa817 = []byte{ - // 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, + // 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, } diff --git a/gen/go/metrics/v1/metrics.pb.go b/gen/go/metrics/v1/metrics.pb.go index 01e884ec8..783e06bf9 100644 --- a/gen/go/metrics/v1/metrics.pb.go +++ b/gen/go/metrics/v1/metrics.pb.go @@ -70,7 +70,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 @@ -165,19 +165,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{} } @@ -212,58 +212,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 } @@ -338,7 +287,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 { @@ -416,7 +365,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 { @@ -501,7 +450,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 { @@ -579,7 +528,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 { @@ -688,7 +637,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 { @@ -774,7 +723,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 { @@ -832,7 +781,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 { @@ -908,7 +857,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 { @@ -994,7 +943,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 { @@ -1033,7 +982,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") @@ -1050,67 +998,63 @@ func init() { } var fileDescriptor_3c3112f9fa006917 = []byte{ - // 990 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x56, 0x6f, 0x6e, 0xe3, 0x44, - 0x14, 0x5f, 0xc7, 0x69, 0xba, 0x7d, 0xe9, 0xb6, 0xce, 0x74, 0x61, 0xa3, 0x48, 0xbb, 0x84, 0x08, - 0x41, 0x41, 0xd4, 0xa1, 0xa5, 0x54, 0x42, 0x02, 0x41, 0x42, 0x22, 0xd6, 0xda, 0xfc, 0xd3, 0xc4, - 0xa9, 0xd4, 0x95, 0x76, 0x8d, 0x93, 0x0c, 0xe9, 0x08, 0x7b, 0x6c, 0xd9, 0xe3, 0xaa, 0x39, 0x00, - 0x37, 0x40, 0x82, 0x33, 0x70, 0x0e, 0x38, 0x00, 0x37, 0xe0, 0x00, 0x7c, 0xe3, 0x02, 0xc8, 0x63, - 0x3b, 0x76, 0xd2, 0xb4, 0xa1, 0x7c, 0x02, 0xbe, 0x3d, 0xbf, 0x3f, 0xbf, 0xf7, 0x7b, 0x7f, 0xc6, - 0x33, 0xf0, 0xa1, 0xe3, 0x12, 0xc6, 0x89, 0x45, 0x6c, 0xc2, 0xbd, 0x79, 0xdd, 0xf5, 0x1c, 0xee, - 0xd4, 0x43, 0x99, 0x4e, 0xfc, 0xfa, 0xd5, 0x71, 0x22, 0xaa, 0xc2, 0x80, 0x9e, 0x2d, 0x79, 0x47, - 0x4a, 0x35, 0x71, 0xb9, 0x3a, 0xae, 0x7c, 0xb0, 0x0e, 0x6d, 0xe2, 0xd8, 0xb6, 0xc3, 0x42, 0xb0, - 0x48, 0x8a, 0xc2, 0x2a, 0xea, 0x3a, 0x5f, 0x8f, 0xf8, 0x4e, 0xe0, 0x4d, 0x48, 0xe8, 0x9d, 0xc8, - 0x91, 0x7f, 0xed, 0x77, 0x09, 0xf6, 0x71, 0xac, 0xea, 0x46, 0x29, 0x51, 0x1b, 0x1e, 0x26, 0x5e, - 0x65, 0xa9, 0x2a, 0x1d, 0x16, 0x4f, 0xde, 0x57, 0xd7, 0x51, 0x5c, 0x40, 0x5d, 0x1d, 0xab, 0x09, - 0x06, 0x5e, 0x84, 0xa2, 0xef, 0x25, 0x78, 0x8b, 0x32, 0x9f, 0x7b, 0x81, 0x4d, 0x18, 0x37, 0x39, - 0x75, 0x98, 0x61, 0xd1, 0xb1, 0x67, 0x7a, 0x73, 0x23, 0xae, 0xae, 0x9c, 0xab, 0xca, 0x87, 0xc5, - 0x93, 0xcf, 0xd5, 0xbb, 0x3b, 0xa0, 0x6a, 0xcb, 0x30, 0x9d, 0x08, 0x25, 0xe6, 0x8b, 0x9f, 0xd2, - 0xbb, 0xcc, 0xb5, 0xdf, 0x24, 0x78, 0x7a, 0x27, 0x00, 0x62, 0xf0, 0xe4, 0x16, 0xa2, 0x71, 0xfd, - 0x9f, 0xac, 0x25, 0x18, 0x37, 0xfe, 0x56, 0x7e, 0xf8, 0xcd, 0xf5, 0xc4, 0xd0, 0x97, 0xb0, 0xbd, - 0xdc, 0x80, 0x77, 0x37, 0x35, 0x20, 0x62, 0x8a, 0x93, 0xb0, 0xda, 0x1f, 0x32, 0x14, 0x22, 0x1d, - 0x7a, 0x05, 0xa5, 0x48, 0x6b, 0x4c, 0x89, 0x3f, 0xf1, 0xa8, 0xcb, 0x1d, 0x2f, 0xa6, 0xfd, 0xd1, - 0xdf, 0x83, 0x6d, 0x2d, 0xe2, 0xb0, 0x62, 0xaf, 0x68, 0xd0, 0x4b, 0x28, 0x51, 0xc6, 0xcf, 0x4e, - 0x8d, 0xa9, 0xc9, 0x4d, 0xc3, 0x75, 0x28, 0xe3, 0x09, 0x6b, 0x75, 0xf3, 0xd8, 0xf8, 0xd9, 0x69, - 0xcb, 0xe4, 0xe6, 0x20, 0x0c, 0xc3, 0xfb, 0x74, 0xe9, 0xdb, 0x47, 0xaf, 0x00, 0x4d, 0x9d, 0x60, - 0x6c, 0x91, 0x25, 0x70, 0x59, 0x80, 0xd7, 0x37, 0x81, 0xb7, 0x44, 0x64, 0x8a, 0xae, 0x4c, 0x97, - 0x15, 0x3e, 0xfa, 0x16, 0xde, 0xb8, 0xa4, 0x3e, 0x77, 0x66, 0x9e, 0x69, 0x2f, 0x65, 0xc8, 0x8b, - 0x0c, 0x27, 0x9b, 0x32, 0x3c, 0x4f, 0x82, 0xd3, 0x24, 0x07, 0x97, 0x37, 0x74, 0x3e, 0xfa, 0x06, - 0x0e, 0xfc, 0xc0, 0xb6, 0xc3, 0xbd, 0xce, 0x66, 0xd9, 0x12, 0x59, 0x36, 0xce, 0x60, 0x18, 0x85, - 0xa6, 0x39, 0x4a, 0xfe, 0x8a, 0xc6, 0xaf, 0xfd, 0x2c, 0x83, 0xb2, 0x3a, 0x2b, 0x84, 0x20, 0xcf, - 0x4c, 0x3b, 0x3a, 0xa2, 0x3b, 0x58, 0xc8, 0xa8, 0x0a, 0xc5, 0x64, 0x0b, 0xa8, 0xc3, 0xca, 0x39, - 0x61, 0xca, 0xaa, 0xc2, 0xa8, 0x80, 0x51, 0x5e, 0x96, 0xa3, 0xa8, 0x50, 0x46, 0x1a, 0xe4, 0xf9, - 0xdc, 0x25, 0xe5, 0x7c, 0x55, 0x3a, 0xdc, 0xbb, 0x65, 0xd9, 0xef, 0xd8, 0x1a, 0x55, 0x9f, 0xbb, - 0x04, 0x0b, 0x08, 0xf4, 0x1a, 0x8a, 0x9c, 0xd8, 0xae, 0xe3, 0x99, 0x16, 0xe5, 0xf3, 0xf2, 0x96, - 0x40, 0xfc, 0xec, 0xfe, 0x88, 0x29, 0x06, 0xce, 0x02, 0xd6, 0x5e, 0x40, 0x3e, 0xcc, 0x86, 0x14, - 0xd8, 0xd5, 0x7a, 0xe7, 0x8d, 0x8e, 0xd6, 0x32, 0xf4, 0x8b, 0x41, 0x5b, 0x79, 0x80, 0x76, 0x60, - 0x4b, 0xeb, 0xe9, 0x67, 0xa7, 0x8a, 0x84, 0x00, 0x0a, 0xad, 0xfe, 0xa8, 0xd9, 0x69, 0x2b, 0x39, - 0xf4, 0x08, 0x76, 0x9e, 0x6b, 0x43, 0xbd, 0xff, 0x35, 0x6e, 0x74, 0x15, 0x19, 0x15, 0x61, 0x7b, - 0x38, 0xea, 0x76, 0x1b, 0xf8, 0x42, 0xc9, 0xd7, 0x74, 0x28, 0x66, 0x12, 0xa1, 0x27, 0x70, 0xb0, - 0xc0, 0x6c, 0x77, 0x07, 0x7d, 0xdc, 0xe8, 0x68, 0xfa, 0x85, 0xf2, 0x00, 0x95, 0xe0, 0x91, 0xd6, - 0x1b, 0xea, 0x8d, 0x9e, 0xde, 0xe8, 0xb5, 0xfb, 0xa3, 0xa1, 0x22, 0x85, 0xd9, 0x5a, 0xed, 0x8e, - 0xde, 0x50, 0x72, 0x68, 0x0f, 0xe0, 0xab, 0x51, 0x77, 0xd4, 0x69, 0xe8, 0xda, 0x79, 0x5b, 0x91, - 0x6b, 0xbf, 0x48, 0xb0, 0xb7, 0xbc, 0xf9, 0xa8, 0x0d, 0x05, 0xcb, 0x1c, 0x13, 0xcb, 0x2f, 0x4b, - 0x62, 0x29, 0x8e, 0x36, 0xfc, 0x4f, 0x86, 0xdc, 0xa3, 0x6c, 0xf6, 0x82, 0xcc, 0xcf, 0x4d, 0x2b, - 0x20, 0x38, 0x0e, 0x46, 0x75, 0x78, 0xec, 0x73, 0xd3, 0xe3, 0x06, 0xa7, 0x36, 0x31, 0x02, 0x46, - 0xaf, 0x0d, 0x66, 0x32, 0x47, 0x8c, 0xb9, 0x80, 0x4b, 0xc2, 0xa6, 0x53, 0x9b, 0x8c, 0x18, 0xbd, - 0xee, 0x99, 0xcc, 0x41, 0xef, 0xc0, 0xde, 0x8a, 0xab, 0x2c, 0x5c, 0x77, 0x79, 0xd6, 0xeb, 0x31, - 0x6c, 0x5d, 0x85, 0x79, 0xc4, 0xfc, 0x65, 0x1c, 0x7d, 0xd4, 0x7e, 0x95, 0x60, 0x7f, 0xe5, 0x8c, - 0xfd, 0x97, 0xea, 0x90, 0x92, 0x3a, 0xfe, 0xcc, 0x03, 0xba, 0x79, 0x92, 0xff, 0xfd, 0xa5, 0x4c, - 0x9c, 0x80, 0x71, 0x51, 0x4a, 0x1e, 0x47, 0x1f, 0x48, 0x01, 0xd9, 0x0f, 0x6c, 0x71, 0xa8, 0x24, - 0x1c, 0x8a, 0x68, 0x08, 0xdb, 0xe3, 0x60, 0xf2, 0x1d, 0xe1, 0x7e, 0xb9, 0x20, 0xca, 0xf8, 0xf4, - 0xfe, 0x3f, 0x35, 0xb5, 0x29, 0x10, 0x70, 0x82, 0x84, 0xde, 0x83, 0x7d, 0x72, 0xed, 0x5a, 0x74, - 0x42, 0xb9, 0x31, 0x76, 0x02, 0x36, 0xf5, 0xcb, 0xdb, 0x55, 0xf9, 0x50, 0xc2, 0x7b, 0x89, 0xba, - 0x29, 0xb4, 0x95, 0x9f, 0x72, 0x50, 0x88, 0x82, 0x53, 0xc2, 0x52, 0x96, 0xf0, 0x6b, 0x78, 0x48, - 0xae, 0x89, 0xed, 0x5a, 0xa6, 0x27, 0x3a, 0x52, 0x3c, 0x69, 0xfe, 0x63, 0x7e, 0x6a, 0x3b, 0x46, - 0xc2, 0x0b, 0xcc, 0xca, 0x8f, 0x12, 0x3c, 0x4c, 0xd4, 0xe9, 0xf8, 0xa5, 0xcc, 0xf8, 0xd7, 0xf4, - 0x3b, 0xb7, 0xa6, 0xdf, 0x7d, 0x28, 0x9a, 0x9c, 0x9b, 0x93, 0xcb, 0xf0, 0xae, 0x4e, 0xae, 0xa0, - 0x7b, 0xae, 0x44, 0x16, 0xa1, 0xf6, 0x83, 0x0c, 0xca, 0xea, 0x9f, 0xfd, 0x7f, 0xb2, 0x73, 0x0e, - 0x94, 0x5c, 0xe2, 0x4d, 0x08, 0xe3, 0xd4, 0x22, 0x86, 0xe8, 0x72, 0xb2, 0x7d, 0xcd, 0xfb, 0x5e, - 0x76, 0xaa, 0xa8, 0xac, 0xc1, 0x07, 0x0b, 0x40, 0xac, 0xa4, 0xe0, 0xc2, 0xe8, 0x57, 0x34, 0x28, - 0xdd, 0x70, 0x43, 0xcf, 0x00, 0x52, 0xc7, 0x78, 0xe4, 0x19, 0x4d, 0xba, 0x0d, 0xb9, 0xcc, 0x36, - 0x34, 0x39, 0xbc, 0x4d, 0x9d, 0x0d, 0x24, 0x9b, 0xbb, 0xf1, 0xbb, 0x70, 0x10, 0x1a, 0x06, 0xd2, - 0xcb, 0x2f, 0x66, 0x94, 0x5f, 0x06, 0xe3, 0x70, 0x30, 0xf5, 0x30, 0xf4, 0x28, 0x7d, 0x5f, 0x2f, - 0x21, 0x1d, 0x45, 0xaf, 0xed, 0x19, 0x61, 0xf5, 0x59, 0xf6, 0xb9, 0x3f, 0x2e, 0x08, 0xc3, 0xc7, - 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0x61, 0x73, 0xab, 0x93, 0x17, 0x0c, 0x00, 0x00, + // 920 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x56, 0xef, 0x6e, 0xe3, 0x44, + 0x10, 0x3f, 0xc7, 0x69, 0xda, 0x4e, 0x7a, 0xad, 0xb3, 0x3d, 0x44, 0x94, 0x0f, 0xa7, 0x10, 0x21, + 0x28, 0x88, 0x3a, 0x34, 0x1c, 0x27, 0x21, 0x21, 0x41, 0x42, 0x2c, 0xce, 0xba, 0xfc, 0xd3, 0xc6, + 0xa9, 0xd4, 0x93, 0xee, 0x8c, 0xe3, 0x2c, 0xe9, 0x0a, 0xdb, 0x6b, 0xd9, 0xeb, 0xaa, 0x79, 0x0f, + 0x24, 0x10, 0x8f, 0xc0, 0x73, 0xc0, 0xdb, 0xf0, 0x8d, 0x17, 0x40, 0x5e, 0xc7, 0xb1, 0x93, 0x46, + 0x84, 0xf0, 0x09, 0xee, 0xdb, 0xf8, 0x37, 0xf3, 0xfb, 0xcd, 0xcc, 0xce, 0xd8, 0x5e, 0xf8, 0x84, + 0xf9, 0xc4, 0xe3, 0xc4, 0x21, 0x2e, 0xe1, 0xc1, 0xa2, 0xe9, 0x07, 0x8c, 0xb3, 0x66, 0x6c, 0x53, + 0x3b, 0x6c, 0xde, 0x5d, 0xa5, 0xa6, 0x2a, 0x1c, 0xe8, 0xe9, 0x5a, 0x74, 0x02, 0xaa, 0x69, 0xc8, + 0xdd, 0x55, 0xed, 0xe3, 0x6d, 0x6a, 0x36, 0x73, 0x5d, 0xe6, 0xc5, 0x62, 0x89, 0x95, 0xd0, 0x6a, + 0xea, 0xb6, 0xd8, 0x80, 0x84, 0x2c, 0x0a, 0x6c, 0x12, 0x47, 0xa7, 0x76, 0x12, 0xdf, 0xf8, 0x45, + 0x82, 0x33, 0xbc, 0x84, 0xfa, 0x49, 0x4a, 0xa4, 0xc1, 0x51, 0x1a, 0x55, 0x95, 0xea, 0xd2, 0x45, + 0xb9, 0xf5, 0x91, 0xba, 0xad, 0xc4, 0x95, 0xd4, 0xdd, 0x95, 0x9a, 0x6a, 0xe0, 0x15, 0x15, 0x7d, + 0x0d, 0x87, 0xcb, 0x26, 0xaa, 0x85, 0xba, 0x7c, 0x51, 0x6e, 0x7d, 0xa0, 0xfe, 0x7d, 0xa3, 0x6a, + 0x52, 0x00, 0x4e, 0x69, 0x8d, 0x3f, 0x64, 0x28, 0x25, 0x18, 0x7a, 0x0d, 0x95, 0x04, 0x35, 0x67, + 0x24, 0xb4, 0x03, 0xea, 0x73, 0x16, 0x2c, 0x8b, 0xfb, 0xf4, 0x9f, 0xc9, 0x76, 0x57, 0x3c, 0xac, + 0xb8, 0x1b, 0x08, 0x7a, 0x05, 0x15, 0xea, 0xf1, 0xe7, 0xcf, 0xcc, 0x99, 0xc5, 0x2d, 0xd3, 0x67, + 0xd4, 0xe3, 0x69, 0xd5, 0xea, 0x2e, 0x79, 0x3d, 0x26, 0x76, 0x2d, 0x6e, 0x8d, 0x62, 0x1a, 0x3e, + 0xa3, 0x6b, 0xcf, 0x21, 0x7a, 0x0d, 0x68, 0xc6, 0xa2, 0xa9, 0x43, 0xd6, 0xc4, 0x65, 0x21, 0xde, + 0xdc, 0x25, 0xde, 0x15, 0xcc, 0x4c, 0x5d, 0x99, 0xad, 0x03, 0x21, 0xfa, 0x1e, 0xde, 0xb9, 0xa5, + 0x21, 0x67, 0xf3, 0xc0, 0x72, 0xd7, 0x32, 0x14, 0x45, 0x86, 0xd6, 0xae, 0x0c, 0x2f, 0x52, 0x72, + 0x96, 0xe4, 0xfc, 0xf6, 0x01, 0x16, 0xa2, 0xef, 0xe0, 0x3c, 0x8c, 0x5c, 0xd7, 0x0a, 0x16, 0x6b, + 0x59, 0x0e, 0x44, 0x96, 0x9d, 0x33, 0x18, 0x27, 0xd4, 0x2c, 0x47, 0x25, 0xdc, 0x40, 0xc2, 0xc6, + 0xaf, 0x32, 0x28, 0x9b, 0xb3, 0x42, 0x08, 0x8a, 0x9e, 0xe5, 0x26, 0x8b, 0x78, 0x8c, 0x85, 0x8d, + 0xea, 0x50, 0x4e, 0xb7, 0x80, 0x32, 0xaf, 0x5a, 0x10, 0xae, 0x3c, 0x14, 0xb3, 0x22, 0x8f, 0xf2, + 0xaa, 0x9c, 0xb0, 0x62, 0x1b, 0xe9, 0x50, 0xe4, 0x0b, 0x9f, 0x54, 0x8b, 0x75, 0xe9, 0xe2, 0xb4, + 0xf5, 0xf9, 0xbe, 0x5b, 0xa3, 0x1a, 0x0b, 0x9f, 0x60, 0x21, 0x81, 0xde, 0x40, 0x99, 0x13, 0xd7, + 0x67, 0x81, 0xe5, 0x50, 0xbe, 0xa8, 0x1e, 0x08, 0xc5, 0x2f, 0xf7, 0x57, 0xcc, 0x34, 0x70, 0x5e, + 0xb0, 0xf1, 0x12, 0x8a, 0x71, 0x36, 0xa4, 0xc0, 0x89, 0x3e, 0xb8, 0x6e, 0xf7, 0xf4, 0xae, 0x69, + 0xdc, 0x8c, 0x34, 0xe5, 0x11, 0x3a, 0x86, 0x03, 0x7d, 0x60, 0x3c, 0x7f, 0xa6, 0x48, 0x08, 0xa0, + 0xd4, 0x1d, 0x4e, 0x3a, 0x3d, 0x4d, 0x29, 0xa0, 0xc7, 0x70, 0xfc, 0x42, 0x1f, 0x1b, 0xc3, 0x6f, + 0x71, 0xbb, 0xaf, 0xc8, 0xa8, 0x0c, 0x87, 0xe3, 0x49, 0xbf, 0xdf, 0xc6, 0x37, 0x4a, 0xb1, 0x61, + 0x40, 0x39, 0x97, 0x08, 0xbd, 0x0b, 0xe7, 0x2b, 0x4d, 0xad, 0x3f, 0x1a, 0xe2, 0x76, 0x4f, 0x37, + 0x6e, 0x94, 0x47, 0xa8, 0x02, 0x8f, 0xf5, 0xc1, 0xd8, 0x68, 0x0f, 0x8c, 0xf6, 0x40, 0x1b, 0x4e, + 0xc6, 0x8a, 0x14, 0x67, 0xeb, 0x6a, 0x3d, 0xa3, 0xad, 0x14, 0xd0, 0x29, 0xc0, 0x37, 0x93, 0xfe, + 0xa4, 0xd7, 0x36, 0xf4, 0x6b, 0x4d, 0x91, 0x1b, 0xbf, 0x49, 0x70, 0xba, 0xbe, 0xf9, 0x48, 0x83, + 0x92, 0x63, 0x4d, 0x89, 0x13, 0x56, 0x25, 0xb1, 0x14, 0x97, 0x5b, 0x0f, 0x64, 0xf9, 0xb9, 0x8a, + 0x77, 0x82, 0x07, 0xd4, 0x9b, 0xbf, 0x24, 0x8b, 0x6b, 0xcb, 0x89, 0x08, 0x5e, 0x92, 0x51, 0x13, + 0x9e, 0x84, 0xdc, 0x0a, 0xb8, 0xc9, 0xa9, 0x4b, 0xcc, 0xc8, 0xa3, 0xf7, 0xa6, 0x67, 0x79, 0x4c, + 0x8c, 0xb9, 0x84, 0x2b, 0xc2, 0x67, 0x50, 0x97, 0x4c, 0x3c, 0x7a, 0x3f, 0xb0, 0x3c, 0x86, 0xde, + 0x87, 0xd3, 0x8d, 0x50, 0x59, 0x84, 0x9e, 0xf0, 0x7c, 0xd4, 0x13, 0x38, 0xb8, 0x8b, 0xf3, 0x88, + 0xf9, 0xcb, 0x38, 0x79, 0x68, 0xfc, 0x2e, 0xc1, 0xd9, 0xc6, 0x3b, 0xf6, 0x7f, 0xea, 0x43, 0x4a, + 0xfb, 0xf8, 0xb3, 0x08, 0xe8, 0xe1, 0x9b, 0xfc, 0xdf, 0x6f, 0xc5, 0x66, 0x91, 0xc7, 0x45, 0x2b, + 0x45, 0x9c, 0x3c, 0x20, 0x05, 0xe4, 0x30, 0x72, 0xc5, 0x4b, 0x25, 0xe1, 0xd8, 0x44, 0x63, 0x38, + 0x9c, 0x46, 0xf6, 0x0f, 0x84, 0x87, 0xd5, 0x92, 0x68, 0xe3, 0x8b, 0xfd, 0x3f, 0x6a, 0x6a, 0x47, + 0x28, 0xe0, 0x54, 0x09, 0x7d, 0x08, 0x67, 0xe4, 0xde, 0x77, 0xa8, 0x4d, 0xb9, 0x39, 0x65, 0x91, + 0x37, 0x0b, 0xab, 0x87, 0x75, 0xf9, 0x42, 0xc2, 0xa7, 0x29, 0xdc, 0x11, 0x68, 0xed, 0xe7, 0x02, + 0x94, 0x12, 0x72, 0x56, 0xb0, 0x94, 0x2f, 0xf8, 0x0d, 0x1c, 0x91, 0x7b, 0xe2, 0xfa, 0x8e, 0x15, + 0x88, 0x13, 0x29, 0xb7, 0x3a, 0xff, 0xba, 0x3e, 0x55, 0x5b, 0x2a, 0xe1, 0x95, 0x66, 0xed, 0x27, + 0x09, 0x8e, 0x52, 0x38, 0x1b, 0xbf, 0x94, 0x1b, 0xff, 0x96, 0xf3, 0x2e, 0x6c, 0x39, 0xef, 0x21, + 0x94, 0x2d, 0xce, 0x2d, 0xfb, 0xd6, 0x25, 0xd9, 0x2f, 0x68, 0xcf, 0x95, 0xc8, 0x2b, 0x34, 0x7e, + 0x94, 0x41, 0xd9, 0xfc, 0xb2, 0xbf, 0x25, 0x3b, 0xc7, 0xa0, 0xe2, 0x93, 0xc0, 0x26, 0x1e, 0xa7, + 0x0e, 0x31, 0xc5, 0x29, 0xa7, 0xdb, 0xd7, 0xd9, 0xf7, 0x67, 0xa7, 0x8a, 0xce, 0xda, 0x7c, 0xb4, + 0x12, 0xc4, 0x4a, 0x26, 0x2e, 0x9c, 0x61, 0x4d, 0x87, 0xca, 0x83, 0x30, 0xf4, 0x14, 0x20, 0x0b, + 0x5c, 0x8e, 0x3c, 0x87, 0x64, 0xdb, 0x50, 0xc8, 0x6d, 0x43, 0x87, 0xc3, 0x7b, 0x94, 0xed, 0x28, + 0xb2, 0x73, 0xb2, 0xbc, 0xee, 0x8d, 0x62, 0xc7, 0x48, 0x7a, 0xf5, 0xd5, 0x9c, 0xf2, 0xdb, 0x68, + 0x1a, 0x0f, 0xa6, 0x19, 0x53, 0x2f, 0xb3, 0x5b, 0xe4, 0x9a, 0xd2, 0x65, 0x72, 0xa7, 0x9c, 0x13, + 0xaf, 0x39, 0xcf, 0x5f, 0x6a, 0xa7, 0x25, 0xe1, 0xf8, 0xec, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, + 0xab, 0x1d, 0x17, 0x54, 0xfd, 0x0a, 0x00, 0x00, } diff --git a/gen/go/trace/v1/trace.pb.go b/gen/go/trace/v1/trace.pb.go index 7bda6aadb..1d8f8fbd2 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{ - // 1008 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, 0x19, 0xc7, 0xd9, 0x38, 0x2d, 0x22, 0x08, 0x01, 0xaa, - 0x36, 0x88, 0x14, 0xbb, 0x28, 0x90, 0x02, 0x0d, 0x5a, 0x45, 0x5a, 0x03, 0x82, 0x5d, 0x59, 0xa0, - 0xac, 0x1c, 0x7a, 0x59, 0x50, 0x22, 0x2b, 0x13, 0x5e, 0x91, 0xc2, 0x2e, 0x57, 0xb5, 0x0f, 0xbd, - 0xf5, 0x5d, 0xfa, 0x14, 0x3d, 0xf7, 0xd4, 0x63, 0x9f, 0xa1, 0xaf, 0x51, 0x90, 0xbb, 0x6b, 0x5b, - 0x81, 0x2c, 0xfb, 0xe2, 0x8b, 0x44, 0xce, 0x7c, 0xdf, 0x7c, 0x33, 0x9c, 0x59, 0x90, 0xd0, 0x94, - 0x0b, 0x26, 0x14, 0xf3, 0xd9, 0x9c, 0xa9, 0xe0, 0xaa, 0xbd, 0x08, 0xa4, 0x92, 0x6d, 0x15, 0x90, - 0x29, 0x6b, 0x2f, 0x0f, 0xe2, 0x45, 0xcb, 0x18, 0xd1, 0x17, 0x2b, 0xc8, 0xd8, 0xd8, 0x8a, 0x01, - 0xcb, 0x83, 0xfd, 0x6f, 0xd6, 0xc5, 0x99, 0xca, 0xf9, 0x5c, 0x0a, 0x1d, 0x28, 0x5e, 0xc5, 0xa4, - 0xfd, 0xd6, 0x3a, 0x6c, 0xc0, 0x42, 0x19, 0x05, 0xb1, 0x6c, 0xba, 0x8e, 0xf1, 0x8d, 0x7f, 0x2d, - 0xa8, 0xe2, 0xc4, 0x34, 0x5a, 0x10, 0x11, 0x22, 0x17, 0x4a, 0x29, 0xc6, 0xb1, 0xea, 0x56, 0xb3, - 0x7c, 0xf8, 0x75, 0x6b, 0x5d, 0x7a, 0xd7, 0x81, 0x96, 0x07, 0xad, 0x34, 0x02, 0xbe, 0xa6, 0xa2, - 0xdf, 0xe1, 0x4b, 0x2e, 0x42, 0x15, 0x44, 0x73, 0x26, 0x14, 0x51, 0x5c, 0x0a, 0xcf, 0xe7, 0x93, - 0x80, 0x04, 0x57, 0x5e, 0xa8, 0x75, 0x9c, 0x4c, 0x3d, 0xdb, 0x2c, 0x1f, 0x7e, 0xdf, 0xda, 0x54, - 0x7a, 0xab, 0xbf, 0x1a, 0xe2, 0x24, 0x8e, 0x60, 0x12, 0xc5, 0x2f, 0xf9, 0xdd, 0xce, 0xc6, 0xdf, - 0x16, 0xbc, 0xdc, 0x40, 0x46, 0x02, 0x9e, 0xdf, 0x91, 0x5e, 0x52, 0xf4, 0x77, 0x6b, 0x13, 0x4b, - 0xce, 0xfa, 0xce, 0xcc, 0xf0, 0xde, 0xfa, 0xa4, 0xd0, 0x7b, 0xc8, 0xdf, 0x2e, 0xbb, 0xb1, 0xb9, - 0x6c, 0x9d, 0x23, 0x8e, 0x09, 0x8d, 0x3f, 0x00, 0x72, 0x7a, 0x8f, 0x5e, 0x40, 0xc9, 0x00, 0x3c, - 0x4e, 0x4d, 0x8e, 0x15, 0x5c, 0x34, 0xfb, 0x3e, 0x45, 0xcf, 0xa1, 0xa8, 0xc1, 0xda, 0x93, 0x31, - 0x9e, 0x82, 0xde, 0xf6, 0x29, 0x7a, 0x05, 0xe5, 0x98, 0x13, 0x2a, 0xa2, 0x98, 0x93, 0xad, 0x5b, - 0xcd, 0x2d, 0x0c, 0xc6, 0x34, 0xd2, 0x16, 0xf4, 0x1a, 0x6a, 0x0b, 0x12, 0x30, 0xa1, 0xbc, 0x34, - 0x40, 0xce, 0x04, 0xa8, 0xc4, 0xd6, 0x51, 0x1c, 0x06, 0x41, 0x4e, 0x90, 0x39, 0x73, 0xf2, 0x86, - 0x6f, 0xd6, 0xe8, 0x47, 0xc8, 0x5d, 0x70, 0x41, 0x9d, 0x42, 0xdd, 0x6a, 0xd6, 0x0e, 0xdf, 0xdc, - 0x5f, 0x90, 0xf9, 0x39, 0xe6, 0x82, 0x62, 0x43, 0x44, 0x6d, 0xd8, 0x0d, 0x15, 0x09, 0x94, 0xa7, - 0xf8, 0x9c, 0x79, 0x91, 0xe0, 0x97, 0x9e, 0x20, 0x42, 0x3a, 0xc5, 0xba, 0xd5, 0x2c, 0xe0, 0x1d, - 0xe3, 0x3b, 0xe3, 0x73, 0x36, 0x16, 0xfc, 0x72, 0x40, 0x84, 0x44, 0x6f, 0x00, 0x31, 0x41, 0x3f, - 0x87, 0x97, 0x0c, 0x7c, 0x9b, 0x09, 0xba, 0x02, 0x1e, 0x02, 0x10, 0xa5, 0x02, 0x3e, 0x89, 0x14, - 0x0b, 0x9d, 0x2d, 0x73, 0xea, 0xef, 0xee, 0xe9, 0x69, 0x27, 0x25, 0x1c, 0xb3, 0xab, 0x4f, 0xc4, - 0x8f, 0x18, 0xbe, 0x15, 0x03, 0xbd, 0x07, 0x87, 0x06, 0x72, 0xb1, 0x60, 0xd4, 0xbb, 0xb1, 0x7a, - 0x53, 0x19, 0x09, 0xe5, 0x40, 0xdd, 0x6a, 0x56, 0xf1, 0x5e, 0xe2, 0xbf, 0x8e, 0x13, 0x76, 0xb5, - 0x17, 0xfd, 0x04, 0x05, 0xb6, 0x64, 0x42, 0x85, 0x4e, 0xd9, 0xe4, 0xd1, 0x7c, 0xc0, 0x61, 0xb9, - 0x9a, 0x80, 0x13, 0x1e, 0x7a, 0x07, 0xbb, 0xa9, 0x76, 0x6c, 0x49, 0x74, 0x2b, 0x46, 0x17, 0x25, - 0x3e, 0xc3, 0x49, 0x34, 0x3f, 0x40, 0xde, 0xe7, 0xe2, 0x22, 0x74, 0xaa, 0x46, 0xf2, 0xab, 0x07, - 0x48, 0x9e, 0x70, 0x71, 0x81, 0x63, 0x16, 0x6a, 0xc1, 0xd3, 0x54, 0xd0, 0x18, 0x12, 0xbd, 0x9a, - 0xd1, 0xdb, 0x49, 0x5c, 0x9a, 0x90, 0xc8, 0xfd, 0x00, 0x05, 0x3d, 0x62, 0x51, 0xe8, 0x6c, 0x9b, - 0xcf, 0xe7, 0xf5, 0x3d, 0x7a, 0x06, 0x8b, 0x13, 0xce, 0xfe, 0x3f, 0x16, 0xe4, 0x4d, 0xf2, 0x7a, - 0x1e, 0x3f, 0xeb, 0xaf, 0x65, 0xfa, 0x5b, 0x51, 0xb7, 0x9b, 0x9b, 0xce, 0x63, 0xe6, 0xd6, 0x3c, - 0xae, 0x36, 0x3c, 0xfb, 0xc8, 0x0d, 0xcf, 0x6d, 0x6a, 0xf8, 0xfe, 0x7f, 0x16, 0xe4, 0xf4, 0xe1, - 0x3c, 0xce, 0x37, 0xbb, 0x5a, 0x69, 0xee, 0x91, 0x2b, 0xcd, 0x6f, 0xaa, 0xb4, 0x31, 0x83, 0x52, - 0xfa, 0x59, 0xa3, 0x17, 0xf0, 0x6c, 0x34, 0xec, 0x0c, 0xbc, 0xe3, 0xfe, 0xa0, 0xe7, 0x8d, 0x07, - 0xa3, 0xa1, 0xdb, 0xed, 0x1f, 0xf5, 0xdd, 0x9e, 0xfd, 0x04, 0x55, 0xa0, 0xd4, 0x1f, 0x9c, 0xb9, - 0x78, 0xd0, 0x39, 0xb1, 0x2d, 0x04, 0x50, 0x18, 0xb9, 0xf8, 0x93, 0x8b, 0xed, 0x8c, 0x5e, 0x77, - 0x4f, 0xfa, 0xee, 0xe0, 0xcc, 0xce, 0x6a, 0xd4, 0x10, 0x9f, 0xf6, 0xc6, 0x5d, 0x17, 0xdb, 0x39, - 0xbd, 0xeb, 0x9e, 0x0e, 0x46, 0xe3, 0x9f, 0x5d, 0x6c, 0xe7, 0x1b, 0x7f, 0x66, 0xa1, 0x10, 0x4f, - 0x0d, 0xea, 0x42, 0x6e, 0x2a, 0x69, 0x7c, 0x3b, 0xd5, 0x0e, 0xdb, 0x0f, 0x99, 0xb4, 0xe4, 0xaf, - 0x2b, 0x29, 0xc3, 0x86, 0x8c, 0x1c, 0x28, 0xce, 0x59, 0x18, 0x92, 0x59, 0x3a, 0x45, 0xe9, 0xb6, - 0xf1, 0x57, 0x06, 0xe0, 0x06, 0x8e, 0x0a, 0x90, 0x39, 0xbd, 0xb0, 0x9f, 0xa0, 0x2a, 0x6c, 0x75, - 0x89, 0x98, 0x32, 0xdf, 0x67, 0xd4, 0xb6, 0x90, 0x0d, 0x95, 0xb1, 0xb8, 0x10, 0xf2, 0x37, 0xe1, - 0x06, 0x81, 0x0c, 0xec, 0x0c, 0x7a, 0x0a, 0xdb, 0x7d, 0xb1, 0x24, 0x3e, 0xa7, 0x9d, 0x60, 0x66, - 0x6e, 0x00, 0x3b, 0x8b, 0x76, 0xc1, 0xee, 0x31, 0x42, 0x7d, 0x2e, 0x98, 0x7b, 0x39, 0x65, 0x8c, - 0x32, 0x1a, 0x97, 0x36, 0x90, 0xea, 0x48, 0x46, 0x82, 0xda, 0x79, 0xb4, 0x03, 0xd5, 0x8e, 0x1f, - 0x30, 0x42, 0xaf, 0xdc, 0x4b, 0x1e, 0xaa, 0xd0, 0x2e, 0x68, 0xda, 0x90, 0x05, 0x73, 0x1e, 0x86, - 0x5c, 0x8a, 0x1e, 0x13, 0x9c, 0x51, 0xbb, 0x88, 0x9e, 0xc1, 0x4e, 0x7a, 0xd3, 0xba, 0x97, 0xe7, - 0x24, 0x0a, 0x15, 0xa3, 0x76, 0x09, 0xed, 0x01, 0x3a, 0x22, 0xdc, 0x67, 0x74, 0x18, 0xb0, 0xa9, - 0x14, 0x94, 0xeb, 0x8b, 0xc7, 0xde, 0x42, 0x65, 0x28, 0x76, 0x26, 0x32, 0xd0, 0x20, 0x40, 0x35, - 0x80, 0xd3, 0x48, 0x9d, 0xfe, 0x8a, 0x89, 0x98, 0x31, 0xbb, 0xac, 0x45, 0xc7, 0x82, 0xcf, 0x17, - 0xfa, 0xd8, 0x84, 0x86, 0x54, 0xb4, 0xa9, 0x2f, 0x14, 0x0b, 0x04, 0xf1, 0xe3, 0x9a, 0xaa, 0x68, - 0x1b, 0xca, 0x63, 0x41, 0x96, 0x84, 0xfb, 0x64, 0xe2, 0x33, 0xbb, 0xa6, 0x33, 0xef, 0x11, 0x45, - 0x4e, 0x64, 0x18, 0xda, 0xdb, 0xba, 0xe4, 0xb1, 0x20, 0x91, 0x3a, 0x67, 0x42, 0xf1, 0x29, 0xd1, - 0x61, 0xec, 0x8f, 0x02, 0x5e, 0x71, 0xb9, 0xb1, 0x29, 0x1f, 0xe1, 0x4c, 0xaf, 0x86, 0xda, 0x38, - 0xb4, 0x7e, 0xf9, 0x30, 0xe3, 0xea, 0x3c, 0x9a, 0xe8, 0x69, 0x6d, 0x6b, 0xda, 0xdb, 0x9b, 0xf7, - 0xcb, 0x4a, 0x94, 0xb7, 0xf1, 0x6b, 0x66, 0xc6, 0x44, 0x7b, 0x76, 0xf3, 0x90, 0x9a, 0x14, 0x8c, - 0xf9, 0xdb, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0x17, 0xf4, 0x60, 0x4c, 0x6f, 0x09, 0x00, 0x00, + // 943 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, 0x6c, 0xda, 0xa9, 0xc1, 0x80, 0x1a, 0x46, 0x81, 0x79, + 0x2b, 0x6a, 0x37, 0xd9, 0x4d, 0x2f, 0x56, 0x6c, 0xae, 0xad, 0x00, 0x46, 0x32, 0xc7, 0x90, 0xe3, + 0x5e, 0xec, 0xc6, 0x60, 0xcc, 0x33, 0x87, 0x88, 0x44, 0x1a, 0x12, 0xe5, 0x25, 0xf7, 0x7b, 0x80, + 0xbd, 0xc5, 0x9e, 0x62, 0x8f, 0xb0, 0xe7, 0xd8, 0x6b, 0x0c, 0xa4, 0xa4, 0xfc, 0x14, 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, 0xec, + 0xa7, 0x8b, 0x9e, 0x0d, 0xd2, 0x6f, 0xef, 0x20, 0xd3, 0x60, 0x2f, 0x05, 0x6c, 0xf6, 0xf7, 0x7e, + 0xb8, 0x4f, 0x67, 0xa9, 0xc2, 0x50, 0x49, 0x23, 0x94, 0xae, 0x52, 0xd2, 0x5e, 0xef, 0x3e, 0x6c, + 0x84, 0xb1, 0x4a, 0xa2, 0xd4, 0x36, 0x5f, 0xa7, 0xf8, 0xce, 0x5f, 0x0e, 0x34, 0xfd, 0x2c, 0x34, + 0x5b, 0x33, 0x19, 0x53, 0x0f, 0x6a, 0x39, 0xc6, 0x75, 0xda, 0x4e, 0xb7, 0x7e, 0xf0, 0x7d, 0xef, + 0xbe, 0xe3, 0x5d, 0x0b, 0x6d, 0xf6, 0x7b, 0xb9, 0x82, 0x7f, 0x4d, 0xa5, 0x1f, 0xa0, 0x1c, 0x1b, + 0x3d, 0xb7, 0xd0, 0x2e, 0x76, 0xeb, 0x07, 0x9d, 0xde, 0x43, 0x25, 0xf6, 0x8c, 0xb5, 0x9f, 0x12, + 0x3a, 0x7f, 0x02, 0x94, 0xcc, 0x9e, 0xbe, 0x82, 0x9a, 0x05, 0x2c, 0x04, 0xb7, 0x27, 0x69, 0xf8, + 0x55, 0xbb, 0x1f, 0x73, 0xfa, 0x0d, 0x54, 0x0d, 0xd8, 0x64, 0x0a, 0x36, 0x53, 0x31, 0xdb, 0x31, + 0xa7, 0xaf, 0xa1, 0x9e, 0x72, 0x62, 0xcd, 0x34, 0xba, 0xc5, 0xb6, 0xd3, 0xdd, 0xf2, 0xc1, 0x86, + 0x66, 0x26, 0x42, 0xdf, 0x40, 0x6b, 0xcd, 0x22, 0x94, 0x7a, 0x91, 0x0b, 0x94, 0xac, 0x40, 0x23, + 0x8d, 0xce, 0x52, 0x19, 0x0a, 0x25, 0xc9, 0x42, 0x74, 0xcb, 0x96, 0x6f, 0xd7, 0xf4, 0x67, 0x28, + 0x5d, 0x08, 0xc9, 0xdd, 0x4a, 0xdb, 0xe9, 0xb6, 0x0e, 0xde, 0x7e, 0xbd, 0x20, 0xfb, 0x71, 0x24, + 0x24, 0xf7, 0x2d, 0x91, 0xf6, 0x61, 0x37, 0xd6, 0x2c, 0xd2, 0x0b, 0x2d, 0x42, 0x5c, 0x24, 0x52, + 0x5c, 0x2e, 0x24, 0x93, 0xca, 0xad, 0xb6, 0x9d, 0x6e, 0xc5, 0xdf, 0xb1, 0xb9, 0x53, 0x11, 0xe2, + 0x5c, 0x8a, 0xcb, 0x09, 0x93, 0x8a, 0xbe, 0x05, 0x8a, 0x92, 0x7f, 0x09, 0xaf, 0x59, 0xf8, 0x36, + 0x4a, 0x7e, 0x07, 0x3c, 0x05, 0x60, 0x5a, 0x47, 0xe2, 0x2c, 0xd1, 0x18, 0xbb, 0x5b, 0xf6, 0xd6, + 0xdf, 0xdf, 0x7b, 0xc8, 0x6c, 0x60, 0x36, 0xfb, 0xbd, 0x41, 0x4e, 0x38, 0xc2, 0xab, 0xcf, 0x2c, + 0x48, 0xd0, 0xbf, 0xa5, 0x41, 0x3f, 0x80, 0xcb, 0x23, 0xb5, 0x5e, 0x23, 0x5f, 0xdc, 0x44, 0x17, + 0x4b, 0x95, 0x48, 0xed, 0x42, 0xdb, 0xe9, 0x36, 0xfd, 0x97, 0x59, 0xfe, 0x5a, 0x27, 0x1e, 0x9a, + 0x2c, 0xfd, 0x05, 0x2a, 0xb8, 0x41, 0xa9, 0x63, 0xb7, 0x6e, 0xcf, 0xd1, 0x7d, 0xc4, 0x65, 0x79, + 0x86, 0xe0, 0x67, 0x3c, 0xfa, 0x1e, 0x76, 0x73, 0xef, 0x34, 0x92, 0xf9, 0x36, 0xac, 0x2f, 0xcd, + 0x72, 0x96, 0x93, 0x79, 0x7e, 0x84, 0x72, 0x20, 0xe4, 0x45, 0xec, 0x36, 0xad, 0xe5, 0x77, 0x8f, + 0xb0, 0x3c, 0x16, 0xf2, 0xc2, 0x4f, 0x59, 0xb4, 0x07, 0xcf, 0x73, 0x43, 0x1b, 0xc8, 0xfc, 0x5a, + 0xd6, 0x6f, 0x27, 0x4b, 0x19, 0x42, 0x66, 0xf7, 0x13, 0x54, 0xcc, 0x88, 0x25, 0xb1, 0xbb, 0x6d, + 0x1f, 0x92, 0x37, 0x5f, 0xf1, 0xb3, 0x58, 0x3f, 0xe3, 0xec, 0xfd, 0xeb, 0x40, 0xd9, 0x1e, 0xde, + 0xcc, 0xe3, 0x17, 0xfd, 0x75, 0x6c, 0x7f, 0x1b, 0xfa, 0x76, 0x73, 0xf3, 0x79, 0x2c, 0xdc, 0x9a, + 0xc7, 0xbb, 0x0d, 0x2f, 0x3e, 0x71, 0xc3, 0x4b, 0x0f, 0x35, 0x7c, 0xef, 0x3f, 0x07, 0x4a, 0xe6, + 0x72, 0x9e, 0xe6, 0x99, 0xbd, 0x5b, 0x69, 0xe9, 0x89, 0x2b, 0x2d, 0x3f, 0x54, 0x69, 0x67, 0x05, + 0xb5, 0xfc, 0xb1, 0xa6, 0xaf, 0xe0, 0xc5, 0x6c, 0x3a, 0x98, 0x2c, 0x8e, 0xc6, 0x93, 0xd1, 0x62, + 0x3e, 0x99, 0x4d, 0xbd, 0xe1, 0xf8, 0x70, 0xec, 0x8d, 0xc8, 0x33, 0xda, 0x80, 0xda, 0x78, 0x72, + 0xea, 0xf9, 0x93, 0xc1, 0x31, 0x71, 0x28, 0x40, 0x65, 0xe6, 0xf9, 0x9f, 0x3d, 0x9f, 0x14, 0xcc, + 0x7a, 0x78, 0x3c, 0xf6, 0x26, 0xa7, 0xa4, 0x68, 0x50, 0x53, 0xff, 0x64, 0x34, 0x1f, 0x7a, 0x3e, + 0x29, 0x99, 0xdd, 0xf0, 0x64, 0x32, 0x9b, 0xff, 0xea, 0xf9, 0xa4, 0xdc, 0xf9, 0xbb, 0x08, 0x95, + 0x74, 0x6a, 0xe8, 0x10, 0x4a, 0x4b, 0xc5, 0xd3, 0x9f, 0xe3, 0xd6, 0x41, 0xff, 0x31, 0x93, 0x96, + 0x7d, 0x0d, 0x15, 0x47, 0xdf, 0x92, 0xa9, 0x0b, 0xd5, 0x10, 0xe3, 0x98, 0xad, 0xf2, 0x29, 0xca, + 0xb7, 0x9d, 0x7f, 0x0a, 0x00, 0x37, 0x70, 0x5a, 0x81, 0xc2, 0xc9, 0x05, 0x79, 0x46, 0x9b, 0xb0, + 0x35, 0x64, 0x72, 0x89, 0x41, 0x80, 0x9c, 0x38, 0x94, 0x40, 0x63, 0x2e, 0x2f, 0xa4, 0xfa, 0x43, + 0x7a, 0x51, 0xa4, 0x22, 0x52, 0xa0, 0xcf, 0x61, 0x7b, 0x2c, 0x37, 0x2c, 0x10, 0x7c, 0x10, 0xad, + 0x92, 0x10, 0xa5, 0x26, 0x45, 0xba, 0x0b, 0x64, 0x84, 0x8c, 0x07, 0x42, 0xa2, 0x77, 0xb9, 0x44, + 0xe4, 0xc8, 0xd3, 0xd2, 0x26, 0x4a, 0x1f, 0xaa, 0x44, 0x72, 0x52, 0xa6, 0x3b, 0xd0, 0x1c, 0x04, + 0x11, 0x32, 0x7e, 0xe5, 0x5d, 0x8a, 0x58, 0xc7, 0xa4, 0x62, 0x68, 0x53, 0x8c, 0x42, 0x11, 0xc7, + 0x42, 0xc9, 0x11, 0x4a, 0x81, 0x9c, 0x54, 0xe9, 0x0b, 0xd8, 0xc9, 0x5f, 0x2d, 0xde, 0xe5, 0x39, + 0x4b, 0x62, 0x8d, 0x9c, 0xd4, 0xe8, 0x4b, 0xa0, 0x87, 0x4c, 0x04, 0xc8, 0xa7, 0x11, 0x2e, 0x95, + 0xe4, 0x42, 0x0b, 0x25, 0xc9, 0x16, 0xad, 0x43, 0x75, 0x70, 0xa6, 0x22, 0x03, 0x02, 0xda, 0x02, + 0x38, 0x49, 0xf4, 0xc9, 0xef, 0x3e, 0x93, 0x2b, 0x24, 0x75, 0x63, 0x3a, 0x97, 0x22, 0x5c, 0x9b, + 0x6b, 0x93, 0x06, 0xd2, 0x30, 0xa1, 0xb1, 0xd4, 0x18, 0x49, 0x16, 0xa4, 0x35, 0x35, 0xe9, 0x36, + 0xd4, 0xe7, 0x92, 0x6d, 0x98, 0x08, 0xd8, 0x59, 0x80, 0xa4, 0x65, 0x4e, 0x3e, 0x62, 0x9a, 0x1d, + 0xab, 0x38, 0x26, 0xdb, 0xa6, 0xe4, 0xb9, 0x64, 0x89, 0x3e, 0x47, 0xa9, 0xc5, 0x92, 0x19, 0x19, + 0xf2, 0x49, 0xc2, 0x6b, 0xa1, 0x1e, 0x6c, 0xca, 0x27, 0x38, 0x35, 0xab, 0xa9, 0x09, 0x4e, 0x9d, + 0xdf, 0x3e, 0xae, 0x84, 0x3e, 0x4f, 0xce, 0xcc, 0xb4, 0xf6, 0x0d, 0xed, 0xdd, 0xcd, 0x0b, 0xfb, + 0x8e, 0xca, 0xbb, 0xf4, 0xf5, 0xbd, 0x42, 0xd9, 0x5f, 0xdd, 0xfc, 0x73, 0x38, 0xab, 0xd8, 0xf0, + 0x8f, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0x4d, 0x12, 0xf9, 0x9c, 0x60, 0x08, 0x00, 0x00, } diff --git a/opentelemetry/proto/common/v1/common.proto b/opentelemetry/proto/common/v1/common.proto index 45fbcdb75..b3b185245 100644 --- a/opentelemetry/proto/common/v1/common.proto +++ b/opentelemetry/proto/common/v1/common.proto @@ -53,10 +53,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 59f13bdc8..83e3782b6 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 33a6aea07..002c02971 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; }