[v2][storage] Add dependency store to v2 storage interface

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

@@ -22,7 +22,6 @@ import (
 	"github.com/jaegertracing/jaeger/plugin/storage/memory"
 	"github.com/jaegertracing/jaeger/storage"
 	"github.com/jaegertracing/jaeger/storage_v2/factoryadapter"
-	"github.com/jaegertracing/jaeger/storage_v2/tracestore"
 )
 
 var _ Extension = (*storageExt)(nil)
@@ -74,7 +73,7 @@ func GetMetricStorageFactory(name string, host component.Host) (storage.MetricSt
 	return mf, nil
 }
 
-func GetStorageFactoryV2(name string, host component.Host) (tracestore.Factory, error) {
+func GetStorageFactoryV2(name string, host component.Host) (*factoryadapter.Factory, error) {
 	f, err := GetStorageFactory(name, host)
 	if err != nil {
 		return nil, err

storage_v2/depstore/factory.go

@@ -0,0 +1,11 @@
+// Copyright (c) 2024 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package depstore
+
+import "github.com/jaegertracing/jaeger/storage_v2"
+
+type Factory interface {
+	storage_v2.FactoryBase
+	CreateDependencyReader() (Reader, error)
+}

storage_v2/depstore/package_test.go

@@ -0,0 +1,14 @@
+// Copyright (c) 2024 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package depstore
+
+import (
+	"testing"
+
+	"github.com/jaegertracing/jaeger/pkg/testutils"
+)
+
+func TestMain(m *testing.M) {
+	testutils.VerifyGoLeaks(m)
+}

storage_v2/depstore/reader.go

@@ -0,0 +1,16 @@
+// Copyright (c) 2024 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package depstore
+
+import (
+	"context"
+	"time"
+
+	"github.com/jaegertracing/jaeger/model"
+)
+
+// Reader can load service dependencies from storage.
+type Reader interface {
+	GetDependencies(ctx context.Context, endTs time.Time, lookback time.Duration) ([]model.DependencyLink, error)
+}

storage_v2/factoryadapter/factory.go

@@ -8,14 +8,15 @@ import (
 	"io"
 
 	storage_v1 "github.com/jaegertracing/jaeger/storage"
+	"github.com/jaegertracing/jaeger/storage_v2/depstore"
 	"github.com/jaegertracing/jaeger/storage_v2/tracestore"
 )
 
 type Factory struct {
 	ss storage_v1.Factory
 }
 
-func NewFactory(ss storage_v1.Factory) tracestore.Factory {
+func NewFactory(ss storage_v1.Factory) *Factory {
 	return &Factory{
 		ss: ss,
 	}
@@ -51,3 +52,8 @@ func (f *Factory) CreateTraceWriter() (tracestore.Writer, error) {
 	}
 	return NewTraceWriter(spanWriter), nil
 }
+
+// CreateDependencyReader implements depstore.Factory.
+func (f *Factory) CreateDependencyReader() (depstore.Reader, error) {
+	return f.ss.CreateDependencyReader()
+}

storage_v2/factoryadapter/factory_test.go

@@ -11,6 +11,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/jaegertracing/jaeger/plugin/storage/grpc"
+	dependencyStoreMocks "github.com/jaegertracing/jaeger/storage/dependencystore/mocks"
 	factoryMocks "github.com/jaegertracing/jaeger/storage/mocks"
 	spanstoreMocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks"
 )
@@ -69,3 +70,23 @@ func TestAdapterCreateTraceWriter(t *testing.T) {
 	_, err := f.CreateTraceWriter()
 	require.NoError(t, err)
 }
+
+func TestAdapterCreateDependencyReader(t *testing.T) {
+	f1 := new(factoryMocks.Factory)
+	f1.On("CreateDependencyReader").Return(new(dependencyStoreMocks.Reader), nil)
+
+	f := NewFactory(f1)
+	r, err := f.CreateDependencyReader()
+	require.NoError(t, err)
+	require.NotNil(t, r)
+}
+
+func TestAdapterCreateDependencyReaderError(t *testing.T) {
+	f1 := new(factoryMocks.Factory)
+	testErr := errors.New("test error")
+	f1.On("CreateDependencyReader").Return(nil, testErr)
+
+	f := NewFactory(f1)
+	_, err := f.CreateDependencyReader()
+	require.ErrorIs(t, err, testErr)
+}