fix breaks from API change

Signed-off-by: Yuri Shkuro <github@ysh.us>

cmd/collector/app/handler/otlp_receiver.go

@@ -27,7 +27,6 @@ import (
 
 	"github.com/jaegertracing/jaeger/cmd/collector/app/flags"
 	"github.com/jaegertracing/jaeger/cmd/collector/app/processor"
-	"github.com/jaegertracing/jaeger/model"
 	"github.com/jaegertracing/jaeger/pkg/config/tlscfg"
 	"github.com/jaegertracing/jaeger/pkg/tenancy"
 )
@@ -157,20 +156,15 @@ func newConsumerDelegate(logger *zap.Logger, spanProcessor processor.SpanProcess
 			processor.UnknownTransport, // could be gRPC or HTTP
 			processor.OTLPSpanFormat,
 			tm),
-		protoFromTraces: otlp2jaeger.ProtoFromTraces,
 	}
 }
 
 type consumerDelegate struct {
-	batchConsumer   batchConsumer
-	protoFromTraces func(td ptrace.Traces) ([]*model.Batch, error)
+	batchConsumer batchConsumer
 }
 
 func (c *consumerDelegate) consume(ctx context.Context, td ptrace.Traces) error {
-	batches, err := c.protoFromTraces(td)
-	if err != nil {
-		return err
-	}
+	batches := otlp2jaeger.ProtoFromTraces(td)
 	for _, batch := range batches {
 		err := c.batchConsumer.consume(ctx, batch)
 		if err != nil {

cmd/collector/app/handler/otlp_receiver_test.go

@@ -19,7 +19,6 @@ import (
 	"go.opentelemetry.io/collector/receiver/otlpreceiver"
 
 	"github.com/jaegertracing/jaeger/cmd/collector/app/flags"
-	"github.com/jaegertracing/jaeger/model"
 	"github.com/jaegertracing/jaeger/pkg/config/corscfg"
 	"github.com/jaegertracing/jaeger/pkg/config/tlscfg"
 	"github.com/jaegertracing/jaeger/pkg/tenancy"
@@ -114,17 +113,6 @@ func TestStartOtlpReceiver_Error(t *testing.T) {
 	assert.Contains(t, err.Error(), "could not create the OTLP receiver")
 }
 
-func TestProtoFromTracesError(t *testing.T) {
-	mockErr := errors.New("mock error")
-	c := &consumerDelegate{
-		protoFromTraces: func(_ ptrace.Traces) ([]*model.Batch, error) {
-			return nil, mockErr
-		},
-	}
-	err := c.consume(context.Background(), ptrace.Traces{})
-	assert.Equal(t, mockErr, err)
-}
-
 func TestOtelHost_ReportFatalError(t *testing.T) {
 	logger, buf := testutils.NewLogger()
 	host := &otelHost{logger: logger}

cmd/jaeger/internal/extension/jaegerstorage/factoryadapter/writer.go

@@ -6,7 +6,6 @@ package factoryadapter
 import (
 	"context"
 	"errors"
-	"fmt"
 
 	otlp2jaeger "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger"
 	"go.opentelemetry.io/collector/pdata/ptrace"
@@ -27,10 +26,7 @@ func NewTraceWriter(spanWriter spanstore_v1.Writer) spanstore.Writer {
 
 // WriteTraces implements spanstore.Writer.
 func (t *TraceWriter) WriteTraces(ctx context.Context, td ptrace.Traces) error {
-	batches, err := otlp2jaeger.ProtoFromTraces(td)
-	if err != nil {
-		return fmt.Errorf("cannot transform OTLP traces to Jaeger format: %w", err)
-	}
+	batches := otlp2jaeger.ProtoFromTraces(td)
 	var errs []error
 	for _, batch := range batches {
 		for _, span := range batch.Spans {

cmd/jaeger/internal/processors/adaptivesampling/processor.go

@@ -65,11 +65,7 @@ func (tp *traceProcessor) close(context.Context) error {
 }
 
 func (tp *traceProcessor) processTraces(_ context.Context, td ptrace.Traces) (ptrace.Traces, error) {
-	batches, err := otlp2jaeger.ProtoFromTraces(td)
-	if err != nil {
-		return td, fmt.Errorf("cannot transform OTLP traces to Jaeger format: %w", err)
-	}
-
+	batches := otlp2jaeger.ProtoFromTraces(td)
 	for _, batch := range batches {
 		for _, span := range batch.Spans {
 			if span.Process == nil {

cmd/query/app/otlp_translator.go

@@ -18,9 +18,7 @@ func otlp2traces(otlpSpans []byte) ([]*model.Trace, error) {
 	if err != nil {
 		return nil, fmt.Errorf("cannot unmarshal OTLP : %w", err)
 	}
-	jaegerBatches, _ := model2otel.ProtoFromTraces(otlpTraces)
-	// ProtoFromTraces will not give an error
-
+	jaegerBatches := model2otel.ProtoFromTraces(otlpTraces)
 	var traces []*model.Trace
 	traceMap := make(map[model.TraceID]*model.Trace)
 	for _, batch := range jaegerBatches {