Consolidate where compatibility changes are executed (#3623)

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>

model/internal/otlp_wrapper.go

@@ -36,6 +36,7 @@ func MetricsToOtlp(mw MetricsWrapper) *otlpcollectormetrics.ExportMetricsService
 
 // MetricsFromOtlp internal helper to convert protobuf representation to MetricsWrapper.
 func MetricsFromOtlp(req *otlpcollectormetrics.ExportMetricsServiceRequest) MetricsWrapper {
+	MetricsCompatibilityChanges(req)
 	return MetricsWrapper{req: req}
 }
 
@@ -74,6 +75,7 @@ func TracesToOtlp(mw TracesWrapper) *otlpcollectortrace.ExportTraceServiceReques
 
 // TracesFromOtlp internal helper to convert protobuf representation to TracesWrapper.
 func TracesFromOtlp(req *otlpcollectortrace.ExportTraceServiceRequest) TracesWrapper {
+	TracesCompatibilityChanges(req)
 	return TracesWrapper{req: req}
 }
 

model/otlp/pb_unmarshaler.go

@@ -52,17 +52,11 @@ func (d *pbUnmarshaler) UnmarshalLogs(buf []byte) (pdata.Logs, error) {
 func (d *pbUnmarshaler) UnmarshalMetrics(buf []byte) (pdata.Metrics, error) {
 	md := &otlpcollectormetrics.ExportMetricsServiceRequest{}
 	err := md.Unmarshal(buf)
-	if err == nil {
-		internal.MetricsCompatibilityChanges(md)
-	}
 	return pdata.MetricsFromInternalRep(internal.MetricsFromOtlp(md)), err
 }
 
 func (d *pbUnmarshaler) UnmarshalTraces(buf []byte) (pdata.Traces, error) {
 	td := &otlpcollectortrace.ExportTraceServiceRequest{}
 	err := td.Unmarshal(buf)
-	if err == nil {
-		internal.TracesCompatibilityChanges(td)
-	}
 	return pdata.TracesFromInternalRep(internal.TracesFromOtlp(td)), err
 }

model/otlpgrpc/traces.go

@@ -81,7 +81,6 @@ type rawTracesServer struct {
 }
 
 func (s rawTracesServer) Export(ctx context.Context, request *otlpcollectortrace.ExportTraceServiceRequest) (*otlpcollectortrace.ExportTraceServiceResponse, error) {
-	internal.TracesCompatibilityChanges(request)
 	rsp, err := s.srv.Export(ctx, pdata.TracesFromInternalRep(internal.TracesFromOtlp(request)))
 	return rsp.orig, err
 }