Use the newly added proto marshaler/unmarshaler for the official proto Marshaler/Unmarshaler

Signed-off-by: Bogdan Drutu <[email protected]>

Author: bogdandrutu

pdata/plog/pb.go

@@ -5,41 +5,44 @@ package plog // import "go.opentelemetry.io/collector/pdata/plog"
 
 import (
 	"go.opentelemetry.io/collector/pdata/internal"
-	otlplogs "go.opentelemetry.io/collector/pdata/internal/data/protogen/logs/v1"
 )
 
 var _ MarshalSizer = (*ProtoMarshaler)(nil)
 
 type ProtoMarshaler struct{}
 
 func (e *ProtoMarshaler) MarshalLogs(ld Logs) ([]byte, error) {
-	pb := internal.LogsToProto(internal.Logs(ld))
-	return pb.Marshal()
+	size := internal.SizeProtoOrigExportLogsServiceRequest(ld.getOrig())
+	buf := make([]byte, size)
+	_ = internal.MarshalProtoOrigExportLogsServiceRequest(ld.getOrig(), buf)
+	return buf, nil
 }
 
 func (e *ProtoMarshaler) LogsSize(ld Logs) int {
-	pb := internal.LogsToProto(internal.Logs(ld))
-	return pb.Size()
+	return internal.SizeProtoOrigExportLogsServiceRequest(ld.getOrig())
 }
 
 func (e *ProtoMarshaler) ResourceLogsSize(rl ResourceLogs) int {
-	return rl.orig.Size()
+	return internal.SizeProtoOrigResourceLogs(rl.orig)
 }
 
 func (e *ProtoMarshaler) ScopeLogsSize(sl ScopeLogs) int {
-	return sl.orig.Size()
+	return internal.SizeProtoOrigScopeLogs(sl.orig)
 }
 
 func (e *ProtoMarshaler) LogRecordSize(lr LogRecord) int {
-	return lr.orig.Size()
+	return internal.SizeProtoOrigLogRecord(lr.orig)
 }
 
 var _ Unmarshaler = (*ProtoUnmarshaler)(nil)
 
 type ProtoUnmarshaler struct{}
 
 func (d *ProtoUnmarshaler) UnmarshalLogs(buf []byte) (Logs, error) {
-	pb := otlplogs.LogsData{}
-	err := pb.Unmarshal(buf)
-	return Logs(internal.LogsFromProto(pb)), err
+	ld := NewLogs()
+	err := internal.UnmarshalProtoOrigExportLogsServiceRequest(ld.getOrig(), buf)
+	if err != nil {
+		return Logs{}, err
+	}
+	return ld, nil
 }

pdata/pmetric/pb.go

@@ -5,55 +5,58 @@ package pmetric // import "go.opentelemetry.io/collector/pdata/pmetric"
 
 import (
 	"go.opentelemetry.io/collector/pdata/internal"
-	otlpmetrics "go.opentelemetry.io/collector/pdata/internal/data/protogen/metrics/v1"
 )
 
 var _ MarshalSizer = (*ProtoMarshaler)(nil)
 
 type ProtoMarshaler struct{}
 
 func (e *ProtoMarshaler) MarshalMetrics(md Metrics) ([]byte, error) {
-	pb := internal.MetricsToProto(internal.Metrics(md))
-	return pb.Marshal()
+	size := internal.SizeProtoOrigExportMetricsServiceRequest(md.getOrig())
+	buf := make([]byte, size)
+	_ = internal.MarshalProtoOrigExportMetricsServiceRequest(md.getOrig(), buf)
+	return buf, nil
 }
 
 func (e *ProtoMarshaler) MetricsSize(md Metrics) int {
-	pb := internal.MetricsToProto(internal.Metrics(md))
-	return pb.Size()
+	return internal.SizeProtoOrigExportMetricsServiceRequest(md.getOrig())
 }
 
 func (e *ProtoMarshaler) ResourceMetricsSize(rm ResourceMetrics) int {
-	return rm.orig.Size()
+	return internal.SizeProtoOrigResourceMetrics(rm.orig)
 }
 
 func (e *ProtoMarshaler) ScopeMetricsSize(sm ScopeMetrics) int {
-	return sm.orig.Size()
+	return internal.SizeProtoOrigScopeMetrics(sm.orig)
 }
 
 func (e *ProtoMarshaler) MetricSize(m Metric) int {
-	return m.orig.Size()
+	return internal.SizeProtoOrigMetric(m.orig)
 }
 
 func (e *ProtoMarshaler) NumberDataPointSize(ndp NumberDataPoint) int {
-	return ndp.orig.Size()
+	return internal.SizeProtoOrigNumberDataPoint(ndp.orig)
 }
 
 func (e *ProtoMarshaler) SummaryDataPointSize(sdps SummaryDataPoint) int {
-	return sdps.orig.Size()
+	return internal.SizeProtoOrigSummaryDataPoint(sdps.orig)
 }
 
 func (e *ProtoMarshaler) HistogramDataPointSize(hdp HistogramDataPoint) int {
-	return hdp.orig.Size()
+	return internal.SizeProtoOrigHistogramDataPoint(hdp.orig)
 }
 
 func (e *ProtoMarshaler) ExponentialHistogramDataPointSize(ehdp ExponentialHistogramDataPoint) int {
-	return ehdp.orig.Size()
+	return internal.SizeProtoOrigExponentialHistogramDataPoint(ehdp.orig)
 }
 
 type ProtoUnmarshaler struct{}
 
 func (d *ProtoUnmarshaler) UnmarshalMetrics(buf []byte) (Metrics, error) {
-	pb := otlpmetrics.MetricsData{}
-	err := pb.Unmarshal(buf)
-	return Metrics(internal.MetricsFromProto(pb)), err
+	md := NewMetrics()
+	err := internal.UnmarshalProtoOrigExportMetricsServiceRequest(md.getOrig(), buf)
+	if err != nil {
+		return Metrics{}, err
+	}
+	return md, nil
 }

pdata/pprofile/pb.go

@@ -5,39 +5,42 @@ package pprofile // import "go.opentelemetry.io/collector/pdata/pprofile"
 
 import (
 	"go.opentelemetry.io/collector/pdata/internal"
-	otlpprofile "go.opentelemetry.io/collector/pdata/internal/data/protogen/profiles/v1development"
 )
 
 var _ MarshalSizer = (*ProtoMarshaler)(nil)
 
 type ProtoMarshaler struct{}
 
 func (e *ProtoMarshaler) MarshalProfiles(pd Profiles) ([]byte, error) {
-	pb := internal.ProfilesToProto(internal.Profiles(pd))
-	return pb.Marshal()
+	size := internal.SizeProtoOrigExportProfilesServiceRequest(pd.getOrig())
+	buf := make([]byte, size)
+	_ = internal.MarshalProtoOrigExportProfilesServiceRequest(pd.getOrig(), buf)
+	return buf, nil
 }
 
 func (e *ProtoMarshaler) ProfilesSize(pd Profiles) int {
-	pb := internal.ProfilesToProto(internal.Profiles(pd))
-	return pb.Size()
+	return internal.SizeProtoOrigExportProfilesServiceRequest(pd.getOrig())
 }
 
 func (e *ProtoMarshaler) ResourceProfilesSize(pd ResourceProfiles) int {
-	return pd.orig.Size()
+	return internal.SizeProtoOrigResourceProfiles(pd.orig)
 }
 
 func (e *ProtoMarshaler) ScopeProfilesSize(pd ScopeProfiles) int {
-	return pd.orig.Size()
+	return internal.SizeProtoOrigScopeProfiles(pd.orig)
 }
 
 func (e *ProtoMarshaler) ProfileSize(pd Profile) int {
-	return pd.orig.Size()
+	return internal.SizeProtoOrigProfile(pd.orig)
 }
 
 type ProtoUnmarshaler struct{}
 
 func (d *ProtoUnmarshaler) UnmarshalProfiles(buf []byte) (Profiles, error) {
-	pb := otlpprofile.ProfilesData{}
-	err := pb.Unmarshal(buf)
-	return Profiles(internal.ProfilesFromProto(pb)), err
+	pd := NewProfiles()
+	err := internal.UnmarshalProtoOrigExportProfilesServiceRequest(pd.getOrig(), buf)
+	if err != nil {
+		return Profiles{}, err
+	}
+	return pd, nil
 }

pdata/ptrace/pb.go

@@ -13,25 +13,26 @@ var _ MarshalSizer = (*ProtoMarshaler)(nil)
 type ProtoMarshaler struct{}
 
 func (e *ProtoMarshaler) MarshalTraces(td Traces) ([]byte, error) {
-	pb := internal.TracesToProto(internal.Traces(td))
-	return pb.Marshal()
+	size := internal.SizeProtoOrigExportTraceServiceRequest(td.getOrig())
+	buf := make([]byte, size)
+	_ = internal.MarshalProtoOrigExportTraceServiceRequest(td.getOrig(), buf)
+	return buf, nil
 }
 
 func (e *ProtoMarshaler) TracesSize(td Traces) int {
-	pb := internal.TracesToProto(internal.Traces(td))
-	return pb.Size()
+	return internal.SizeProtoOrigExportTraceServiceRequest(td.getOrig())
 }
 
 func (e *ProtoMarshaler) ResourceSpansSize(rs ResourceSpans) int {
-	return rs.orig.Size()
+	return internal.SizeProtoOrigResourceSpans(rs.orig)
 }
 
 func (e *ProtoMarshaler) ScopeSpansSize(ss ScopeSpans) int {
-	return ss.orig.Size()
+	return internal.SizeProtoOrigScopeSpans(ss.orig)
 }
 
 func (e *ProtoMarshaler) SpanSize(span Span) int {
-	return span.orig.Size()
+	return internal.SizeProtoOrigSpan(span.orig)
 }
 
 type ProtoUnmarshaler struct{}