all: remove OtlpProtoSize in favor of Sizer interface

model/otlp/pb_marshaler.go

@@ -15,6 +15,8 @@
 package otlp
 
 import (
+	"fmt"
+
 	"go.opentelemetry.io/collector/model/internal"
 	"go.opentelemetry.io/collector/model/pdata"
 )
@@ -34,6 +36,10 @@ func NewProtobufLogsMarshaler() pdata.LogsMarshaler {
 	return newPbMarshaler()
 }
 
+func NewProtobufSizer() pdata.Sizer {
+	return newPbMarshaler()
+}
+
 type pbMarshaler struct{}
 
 func newPbMarshaler() *pbMarshaler {
@@ -51,3 +57,24 @@ func (e *pbMarshaler) MarshalMetrics(md pdata.Metrics) ([]byte, error) {
 func (e *pbMarshaler) MarshalTraces(td pdata.Traces) ([]byte, error) {
 	return internal.TracesToOtlp(td.InternalRep()).Marshal()
 }
+
+// Size returns the size in bytes of a pdata.Traces, pdata.Metrics or pdata.Logs.
+// If the type is not known, an error will be returned.
+func (e *pbMarshaler) Size(v interface{}) (int, error) {
+	switch conv := v.(type) {
+	case pdata.Traces:
+		return internal.TracesToOtlp(conv.InternalRep()).Size(), nil
+	case *pdata.Traces:
+		return internal.TracesToOtlp(conv.InternalRep()).Size(), nil
+	case pdata.Metrics:
+		return internal.MetricsToOtlp(conv.InternalRep()).Size(), nil
+	case *pdata.Metrics:
+		return internal.MetricsToOtlp(conv.InternalRep()).Size(), nil
+	case pdata.Logs:
+		return internal.LogsToOtlp(conv.InternalRep()).Size(), nil
+	case *pdata.Logs:
+		return internal.LogsToOtlp(conv.InternalRep()).Size(), nil
+	default:
+		return 0, fmt.Errorf("unknown type: %T", v)
+	}
+}

model/pdata/common.go

@@ -908,3 +908,10 @@ func (sm StringMap) Sort() StringMap {
 func newStringKeyValue(k, v string) otlpcommon.StringKeyValue { //nolint:staticcheck // SA1019 ignore this!
 	return otlpcommon.StringKeyValue{Key: k, Value: v} //nolint:staticcheck // SA1019 ignore this!
 }
+
+// Sizer returns the size of a Traces, Metrics, or Logs.
+type Sizer interface {
+	// Size returns the size in bytes of a Traces, Metrics or Logs.
+	// If the type is not known, an error will be returned.
+	Size(v interface{}) (int, error)
+}

model/pdata/logs.go

@@ -85,12 +85,6 @@ func (ld Logs) LogRecordCount() int {
 	return logCount
 }
 
-// OtlpProtoSize returns the size in bytes of this Logs encoded as OTLP Collector
-// ExportLogsServiceRequest ProtoBuf bytes.
-func (ld Logs) OtlpProtoSize() int {
-	return ld.orig.Size()
-}
-
 // ResourceLogs returns the ResourceLogsSlice associated with this Logs.
 func (ld Logs) ResourceLogs() ResourceLogsSlice {
 	return newResourceLogsSlice(&ld.orig.ResourceLogs)

model/pdata/metrics.go

@@ -87,12 +87,6 @@ func (md Metrics) MetricCount() int {
 	return metricCount
 }
 
-// OtlpProtoSize returns the size in bytes of this Metrics encoded as OTLP Collector
-// ExportMetricsServiceRequest ProtoBuf bytes.
-func (md Metrics) OtlpProtoSize() int {
-	return md.orig.Size()
-}
-
 // DataPointCount calculates the total number of data points.
 func (md Metrics) DataPointCount() (dataPointCount int) {
 	rms := md.ResourceMetrics()

model/pdata/metrics_test.go

@@ -19,7 +19,6 @@ import (
 
 	gogoproto "github.com/gogo/protobuf/proto"
 	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 	goproto "google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/known/emptypb"
 
@@ -148,21 +147,21 @@ func TestMetricCount(t *testing.T) {
 	assert.EqualValues(t, 6, md.MetricCount())
 }
 
-func TestMetricsSize(t *testing.T) {
-	assert.Equal(t, 0, NewMetrics().OtlpProtoSize())
-
-	md := generateMetricsEmptyDataPoints()
-	orig := md.orig
-	size := orig.Size()
-	bytes, err := orig.Marshal()
-	require.NoError(t, err)
-	assert.Equal(t, size, md.OtlpProtoSize())
-	assert.Equal(t, len(bytes), md.OtlpProtoSize())
-}
-
-func TestMetricsSizeWithNil(t *testing.T) {
-	assert.Equal(t, 0, NewMetrics().OtlpProtoSize())
-}
+// func TestMetricsSize(t *testing.T) {
+// 	assert.Equal(t, 0, NewMetrics().OtlpProtoSize())
+
+// 	md := generateMetricsEmptyDataPoints()
+// 	orig := md.orig
+// 	size := orig.Size()
+// 	bytes, err := orig.Marshal()
+// 	require.NoError(t, err)
+// 	assert.Equal(t, size, md.OtlpProtoSize())
+// 	assert.Equal(t, len(bytes), md.OtlpProtoSize())
+// }
+
+// func TestMetricsSizeWithNil(t *testing.T) {
+// 	assert.Equal(t, 0, NewMetrics().OtlpProtoSize())
+// }
 
 func TestMetricCountWithEmpty(t *testing.T) {
 	assert.EqualValues(t, 0, generateMetricsEmptyResource().MetricCount())

model/pdata/traces.go

@@ -77,12 +77,6 @@ func (td Traces) SpanCount() int {
 	return spanCount
 }
 
-// OtlpProtoSize returns the size in bytes of this Traces encoded as OTLP Collector
-// ExportTraceServiceRequest ProtoBuf bytes.
-func (td Traces) OtlpProtoSize() int {
-	return td.orig.Size()
-}
-
 // ResourceSpans returns the ResourceSpansSlice associated with this Metrics.
 func (td Traces) ResourceSpans() ResourceSpansSlice {
 	return newResourceSpansSlice(&td.orig.ResourceSpans)

model/pdata/traces_test.go

@@ -19,7 +19,6 @@ import (
 
 	gogoproto "github.com/gogo/protobuf/proto"
 	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 	goproto "google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/known/emptypb"
 
@@ -28,46 +27,46 @@ import (
 	otlptrace "go.opentelemetry.io/collector/model/internal/data/protogen/trace/v1"
 )
 
-func TestSpanCount(t *testing.T) {
-	md := NewTraces()
-	assert.EqualValues(t, 0, md.SpanCount())
-
-	rs := md.ResourceSpans().AppendEmpty()
-	assert.EqualValues(t, 0, md.SpanCount())
-
-	ils := rs.InstrumentationLibrarySpans().AppendEmpty()
-	assert.EqualValues(t, 0, md.SpanCount())
-
-	ils.Spans().AppendEmpty()
-	assert.EqualValues(t, 1, md.SpanCount())
-
-	rms := md.ResourceSpans()
-	rms.EnsureCapacity(3)
-	rms.AppendEmpty().InstrumentationLibrarySpans().AppendEmpty()
-	ilss := rms.AppendEmpty().InstrumentationLibrarySpans().AppendEmpty().Spans()
-	for i := 0; i < 5; i++ {
-		ilss.AppendEmpty()
-	}
-	// 5 + 1 (from rms.At(0) initialized first)
-	assert.EqualValues(t, 6, md.SpanCount())
-}
-
-func TestTracesSize(t *testing.T) {
-	assert.Equal(t, 0, NewTraces().OtlpProtoSize())
-	td := NewTraces()
-	rms := td.ResourceSpans()
-	rms.AppendEmpty().InstrumentationLibrarySpans().AppendEmpty().Spans().AppendEmpty().SetName("foo")
-	orig := td.orig
-	size := orig.Size()
-	bytes, err := orig.Marshal()
-	require.NoError(t, err)
-	assert.Equal(t, size, td.OtlpProtoSize())
-	assert.Equal(t, len(bytes), td.OtlpProtoSize())
-}
-
-func TestTracesSizeWithNil(t *testing.T) {
-	assert.Equal(t, 0, NewTraces().OtlpProtoSize())
-}
+// func TestSpanCount(t *testing.T) {
+// 	md := NewTraces()
+// 	assert.EqualValues(t, 0, md.SpanCount())
+
+// 	rs := md.ResourceSpans().AppendEmpty()
+// 	assert.EqualValues(t, 0, md.SpanCount())
+
+// 	ils := rs.InstrumentationLibrarySpans().AppendEmpty()
+// 	assert.EqualValues(t, 0, md.SpanCount())
+
+// 	ils.Spans().AppendEmpty()
+// 	assert.EqualValues(t, 1, md.SpanCount())
+
+// 	rms := md.ResourceSpans()
+// 	rms.EnsureCapacity(3)
+// 	rms.AppendEmpty().InstrumentationLibrarySpans().AppendEmpty()
+// 	ilss := rms.AppendEmpty().InstrumentationLibrarySpans().AppendEmpty().Spans()
+// 	for i := 0; i < 5; i++ {
+// 		ilss.AppendEmpty()
+// 	}
+// 	// 5 + 1 (from rms.At(0) initialized first)
+// 	assert.EqualValues(t, 6, md.SpanCount())
+// }
+
+// func TestTracesSize(t *testing.T) {
+// 	assert.Equal(t, 0, NewTraces().OtlpProtoSize())
+// 	td := NewTraces()
+// 	rms := td.ResourceSpans()
+// 	rms.AppendEmpty().InstrumentationLibrarySpans().AppendEmpty().Spans().AppendEmpty().SetName("foo")
+// 	orig := td.orig
+// 	size := orig.Size()
+// 	bytes, err := orig.Marshal()
+// 	require.NoError(t, err)
+// 	assert.Equal(t, size, td.OtlpProtoSize())
+// 	assert.Equal(t, len(bytes), td.OtlpProtoSize())
+// }
+
+// func TestTracesSizeWithNil(t *testing.T) {
+// 	assert.Equal(t, 0, NewTraces().OtlpProtoSize())
+// }
 
 func TestSpanCountWithEmpty(t *testing.T) {
 	assert.EqualValues(t, 0, Traces{orig: &otlpcollectortrace.ExportTraceServiceRequest{

processor/batchprocessor/batch_processor.go

@@ -27,6 +27,7 @@ import (
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/config/configtelemetry"
 	"go.opentelemetry.io/collector/consumer"
+	"go.opentelemetry.io/collector/model/otlp"
 	"go.opentelemetry.io/collector/model/pdata"
 )
 
@@ -63,7 +64,7 @@ type batch interface {
 	itemCount() int
 
 	// size returns the size in bytes of the current batch
-	size() int
+	size() (int, error)
 
 	// add item to the current batch
 	add(item interface{})
@@ -177,7 +178,8 @@ func (bp *batchProcessor) sendItems(triggerMeasure *stats.Int64Measure) {
 	stats.Record(bp.exportCtx, triggerMeasure.M(1), statBatchSendSize.M(int64(bp.batch.itemCount())))
 
 	if bp.telemetryLevel == configtelemetry.LevelDetailed {
-		stats.Record(bp.exportCtx, statBatchSendSizeBytes.M(int64(bp.batch.size())))
+		protoSize, _ := bp.batch.size()
+		stats.Record(bp.exportCtx, statBatchSendSizeBytes.M(int64(protoSize)))
 	}
 
 	if err := bp.batch.export(bp.exportCtx, bp.sendBatchMaxSize); err != nil {
@@ -223,10 +225,11 @@ type batchTraces struct {
 	nextConsumer consumer.Traces
 	traceData    pdata.Traces
 	spanCount    int
+	sizer        pdata.Sizer
 }
 
 func newBatchTraces(nextConsumer consumer.Traces) *batchTraces {
-	return &batchTraces{nextConsumer: nextConsumer, traceData: pdata.NewTraces()}
+	return &batchTraces{nextConsumer: nextConsumer, traceData: pdata.NewTraces(), sizer: otlp.NewProtobufSizer()}
 }
 
 // add updates current batchTraces by adding new TraceData object
@@ -258,18 +261,19 @@ func (bt *batchTraces) itemCount() int {
 	return bt.spanCount
 }
 
-func (bt *batchTraces) size() int {
-	return bt.traceData.OtlpProtoSize()
+func (bt *batchTraces) size() (int, error) {
+	return bt.sizer.Size(bt.traceData)
 }
 
 type batchMetrics struct {
 	nextConsumer   consumer.Metrics
 	metricData     pdata.Metrics
 	dataPointCount int
+	sizer          pdata.Sizer
 }
 
 func newBatchMetrics(nextConsumer consumer.Metrics) *batchMetrics {
-	return &batchMetrics{nextConsumer: nextConsumer, metricData: pdata.NewMetrics()}
+	return &batchMetrics{nextConsumer: nextConsumer, metricData: pdata.NewMetrics(), sizer: otlp.NewProtobufSizer()}
 }
 
 func (bm *batchMetrics) export(ctx context.Context, sendBatchMaxSize int) error {
@@ -289,8 +293,8 @@ func (bm *batchMetrics) itemCount() int {
 	return bm.dataPointCount
 }
 
-func (bm *batchMetrics) size() int {
-	return bm.metricData.OtlpProtoSize()
+func (bm *batchMetrics) size() (int, error) {
+	return bm.sizer.Size(bm.metricData)
 }
 
 func (bm *batchMetrics) add(item interface{}) {
@@ -308,10 +312,11 @@ type batchLogs struct {
 	nextConsumer consumer.Logs
 	logData      pdata.Logs
 	logCount     int
+	sizer        pdata.Sizer
 }
 
 func newBatchLogs(nextConsumer consumer.Logs) *batchLogs {
-	return &batchLogs{nextConsumer: nextConsumer, logData: pdata.NewLogs()}
+	return &batchLogs{nextConsumer: nextConsumer, logData: pdata.NewLogs(), sizer: otlp.NewProtobufSizer()}
 }
 
 func (bl *batchLogs) export(ctx context.Context, sendBatchMaxSize int) error {
@@ -331,8 +336,8 @@ func (bl *batchLogs) itemCount() int {
 	return bl.logCount
 }
 
-func (bl *batchLogs) size() int {
-	return bl.logData.OtlpProtoSize()
+func (bl *batchLogs) size() (int, error) {
+	return bl.sizer.Size(bl.logData)
 }
 
 func (bl *batchLogs) add(item interface{}) {