fix(test): Surface trace writer chunk errors

Signed-off-by: Jonah Kowall <jkowall@kowall.net>

Author: jkowall

cmd/jaeger/internal/integration/trace_writer.go

@@ -94,7 +94,9 @@ func (w *traceWriter) WriteTraces(ctx context.Context, td ptrace.Traces) error {
 		)
 
 		if spanCount == MaxChunkSize {
-			err = w.exporter.ConsumeTraces(ctx, currentChunk)
+			if err = w.exporter.ConsumeTraces(ctx, currentChunk); err != nil {
+				return false
+			}
 			currentChunk = ptrace.NewTraces()
 			spanCount = 0
 			currentResourceIndex = -1
@@ -123,10 +125,13 @@ func (w *traceWriter) WriteTraces(ctx context.Context, td ptrace.Traces) error {
 
 		return true
 	})
+	if err != nil {
+		return err
+	}
 
 	// write the last chunk if it has any spans
 	if spanCount > 0 {
-		err = w.exporter.ConsumeTraces(ctx, currentChunk)
+		return w.exporter.ConsumeTraces(ctx, currentChunk)
 	}
-	return err
+	return nil
 }

cmd/jaeger/internal/integration/trace_writer_test.go

@@ -5,6 +5,7 @@ package integration
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"testing"
 
@@ -122,3 +123,36 @@ func TestWriteTraces(t *testing.T) {
 	thirdChunkScope := thirdChunkResource.ScopeSpans().At(0)
 	assert.Equal(t, "span5", thirdChunkScope.Spans().At(0).Name())
 }
+
+func TestWriteTracesReturnsIntermediateChunkError(t *testing.T) {
+	td := ptrace.NewTraces()
+	resource := td.ResourceSpans().AppendEmpty()
+	scope := resource.ScopeSpans().AppendEmpty()
+	for i := 1; i <= 3; i++ {
+		span := scope.Spans().AppendEmpty()
+		span.SetSpanID(pcommon.SpanID([8]byte{0, 0, 0, 0, 0, 0, 0, byte(i)}))
+		span.SetName(fmt.Sprintf("span%d", i))
+	}
+
+	expectedErr := errors.New("send failed")
+	mockExporter := &MockExporter{}
+	mockExporter.On("ConsumeTraces", mock.Anything, mock.Anything).Return(expectedErr).Once()
+	tw := &traceWriter{
+		logger:   zaptest.NewLogger(t),
+		exporter: mockExporter,
+	}
+
+	origMaxChunkSize := MaxChunkSize
+	MaxChunkSize = 2
+	defer func() {
+		MaxChunkSize = origMaxChunkSize
+	}()
+
+	err := tw.WriteTraces(context.Background(), td)
+
+	require.ErrorIs(t, err, expectedErr)
+	mockExporter.AssertNumberOfCalls(t, "ConsumeTraces", 1)
+	mockExporter.AssertExpectations(t)
+	require.Len(t, mockExporter.chunks, 1)
+	assert.Equal(t, 2, mockExporter.chunks[0].SpanCount())
+}