[test] Refactor integration tests to directly write/read ptrace.Traces

cmd/jaeger/internal/integration/trace_writer.go

@@ -28,7 +28,7 @@ var (
 	_ tracestore.Writer = (*traceWriter)(nil)
 	_ io.Closer         = (*traceWriter)(nil)
 
-	MaxChunkSize = 35 // max chunk size otel kafka export can handle safely.
+	MaxChunkSize = 5 // max chunk size otel kafka export can handle safely.
 )
 
 // traceWriter utilizes the OTLP exporter to send span data to the Jaeger-v2 receiver

go.mod

@@ -130,6 +130,7 @@ require (
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/healthcheck v0.142.0 // indirect
+	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.142.0 // indirect
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
 	github.com/prometheus/client_golang/exp v0.0.0-20250914183048-a974e0d45e0a // indirect
 	github.com/prometheus/otlptranslator v1.0.0 // indirect

internal/storage/integration/elasticsearch_test.go

@@ -17,8 +17,10 @@ import (
 	"github.com/olivere/elastic/v7"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.opentelemetry.io/collector/pdata/ptrace"
 
 	"github.com/jaegertracing/jaeger-idl/model/v1"
+	"github.com/jaegertracing/jaeger/internal/jiter"
 	escfg "github.com/jaegertracing/jaeger/internal/storage/elasticsearch/config"
 	es "github.com/jaegertracing/jaeger/internal/storage/v1/elasticsearch"
 	"github.com/jaegertracing/jaeger/internal/storage/v2/api/depstore"
@@ -262,20 +264,19 @@ func (s *ESStorageIntegration) testArchiveTrace(t *testing.T) {
 			},
 		},
 	}
+	expectedTrace := v1adapter.V1TraceToOtelTrace(expected)
+	require.NoError(t, s.ArchiveTraceWriter.WriteTraces(context.Background(), expectedTrace))
 
-	require.NoError(t, s.ArchiveTraceWriter.WriteTraces(context.Background(), v1adapter.V1TraceToOtelTrace(expected)))
-
-	var actual *model.Trace
+	var actual ptrace.Traces
 	found := s.waitForCondition(t, func(_ *testing.T) bool {
-		var err error
 		iterTraces := s.ArchiveTraceReader.GetTraces(context.Background(), tracestore.GetTraceParams{TraceID: v1adapter.FromV1TraceID(tID)})
-		traces, err := v1adapter.V1TracesFromSeq2(iterTraces)
-		if len(traces) == 0 {
+		traceSlice, err := jiter.CollectWithErrors(iterTraces)
+		if err != nil {
 			return false
 		}
-		actual = traces[0]
-		return err == nil && len(actual.Spans) == 1
+		actual = mergeTraces(traceSlice)
+		return actual.SpanCount() == 1
 	})
 	require.True(t, found)
-	CompareTraces(t, expected, actual)
+	CompareTraces(t, expectedTrace, actual)
 }