Resolve merge conflict

Signed-off-by: Emmanuel Emonueje Ebenezer <[email protected]>
jaegertracing · Jan 7, 2025 · dddd735 · dddd735
1 parent 54cd6e8
commit dddd735
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 19 deletions.
diff --git a/plugin/storage/integration/cassandra_test.go b/plugin/storage/integration/cassandra_test.go
@@ -79,12 +79,12 @@ func (s *CassandraStorageIntegration) initializeCassandra(t *testing.T) {
 	spanReader, err := f.CreateSpanReader()
 	require.NoError(t, err)
 	s.TraceReader = v1adapter.NewTraceReader(spanReader)
-	archiveTraceReader, err := f.CreateArchiveSpanReader()
+	archiveSpanReader, err := f.CreateArchiveSpanReader()
 	require.NoError(t, err)
-	s.ArchiveTraceReader = v1adapter.NewTraceReader(archiveTraceReader)
-	archiveTraceWriter, err := f.CreateArchiveSpanWriter()
+	s.ArchiveTraceReader = v1adapter.NewTraceReader(archiveSpanReader)
+	archiveSpanWriter, err := f.CreateArchiveSpanWriter()
 	require.NoError(t, err)
-	s.ArchiveTraceWriter = v1adapter.NewTraceWriter(archiveTraceWriter)
+	s.ArchiveTraceWriter = v1adapter.NewTraceWriter(archiveSpanWriter)
 	s.SamplingStore, err = f.CreateSamplingStore(0)
 	require.NoError(t, err)
 	s.initializeDependencyReaderAndWriter(t, f)

diff --git a/plugin/storage/integration/elasticsearch_test.go b/plugin/storage/integration/elasticsearch_test.go
@@ -133,22 +133,24 @@ func (s *ESStorageIntegration) initSpanstore(t *testing.T, allTagsAsFields bool)
 	f := s.initializeESFactory(t, allTagsAsFields)
 	s.factory = f
 	var err error
+
 	spanWriter, err := f.CreateSpanWriter()
 	require.NoError(t, err)
 	s.TraceWriter = v1adapter.NewTraceWriter(spanWriter)
 	spanReader, err := f.CreateSpanReader()
 	require.NoError(t, err)
 	s.TraceReader = v1adapter.NewTraceReader(spanReader)
-	archiveTraceReader, err := f.CreateArchiveSpanReader()
+
+	archiveSpanReader, err := f.CreateArchiveSpanReader()
 	require.NoError(t, err)
-	s.ArchiveTraceReader = v1adapter.NewTraceReader(archiveTraceReader)
-	archiveTraceWriter, err := f.CreateArchiveSpanWriter()
+	s.ArchiveTraceReader = v1adapter.NewTraceReader(archiveSpanReader)
+	archiveSpanWriter, err := f.CreateArchiveSpanWriter()
 	require.NoError(t, err)
-	s.ArchiveTraceWriter = v1adapter.NewTraceWriter(archiveTraceWriter)
+	s.ArchiveTraceWriter = v1adapter.NewTraceWriter(archiveSpanWriter)
+
 	dependencyReader, err := f.CreateDependencyReader()
 	require.NoError(t, err)
 	s.DependencyReader = v1adapter.NewDependencyReader(dependencyReader)
-
 	s.DependencyWriter = dependencyReader.(dependencystore.Writer)
 
 	s.SamplingStore, err = f.CreateSamplingStore(1)

diff --git a/plugin/storage/integration/grpc_test.go b/plugin/storage/integration/grpc_test.go
@@ -43,12 +43,12 @@ func (s *GRPCStorageIntegrationTestSuite) initialize(t *testing.T) {
 	spanReader, err := f.CreateSpanReader()
 	require.NoError(t, err)
 	s.TraceReader = v1adapter.NewTraceReader(spanReader)
-	archiveTraceReader, err := f.CreateArchiveSpanReader()
+	archiveSpanReader, err := f.CreateArchiveSpanReader()
 	require.NoError(t, err)
-	s.ArchiveTraceReader = v1adapter.NewTraceReader(archiveTraceReader)
-	archiveTraceWriter, err := f.CreateArchiveSpanWriter()
+	s.ArchiveTraceReader = v1adapter.NewTraceReader(archiveSpanReader)
+	archiveSpanWriter, err := f.CreateArchiveSpanWriter()
 	require.NoError(t, err)
-	s.ArchiveTraceWriter = v1adapter.NewTraceWriter(archiveTraceWriter)
+	s.ArchiveTraceWriter = v1adapter.NewTraceWriter(archiveSpanWriter)
 
 	// TODO DependencyWriter is not implemented in grpc store
 

diff --git a/plugin/storage/integration/integration.go b/plugin/storage/integration/integration.go
@@ -43,14 +43,14 @@ var fixtures embed.FS
 // Some implementations may declare multiple tests, with different settings,
 // and RunAll() under different conditions.
 type StorageIntegration struct {
-	TraceWriter        tracestore.Writer
-	TraceReader        tracestore.Reader
+	TraceWriter       tracestore.Writer
+	TraceReader       tracestore.Reader
 	ArchiveTraceReader tracestore.Reader
 	ArchiveTraceWriter tracestore.Writer
-	DependencyWriter   dependencystore.Writer
-	DependencyReader   depstore.Reader
-	SamplingStore      samplingstore.Store
-	Fixtures           []*QueryFixtures
+	DependencyWriter  dependencystore.Writer
+	DependencyReader  depstore.Reader
+	SamplingStore     samplingstore.Store
+	Fixtures          []*QueryFixtures
 
 	// TODO: remove this after all storage backends return spanKind from GetOperations
 	GetOperationsMissingSpanKind bool

diff --git a/storage_v2/v1adapter/translator.go b/storage_v2/v1adapter/translator.go
@@ -4,6 +4,8 @@
 package v1adapter
 
 import (
+	"fmt"
+
 	jaegerTranslator "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/ptrace"
@@ -47,6 +49,7 @@ func V1TracesFromSeq2(otelSeq iter.Seq2[[]ptrace.Traces, error]) ([]*model.Trace
 		jaegerTraces []*model.Trace
 		iterErr      error
 	)
+	fmt.Println("AggregateTraces is called")
 	jptrace.AggregateTraces(otelSeq)(func(otelTrace ptrace.Traces, err error) bool {
 		if err != nil {
 			iterErr = err