Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade storage integration tests: DependencyReader to v2 #6477

Merged
merged 8 commits into from
Jan 6, 2025
+19 −8
Merged

Upgrade storage integration tests: DependencyReader to v2 #6477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ab4d60f
Upgrade storage integration tests DependencyReader to v2
zzzk1 Jan 4, 2025
52d0f14
DependencyWriter adapter
zzzk1 Jan 4, 2025
dc32147
fix
zzzk1 Jan 4, 2025
2f37d0a
test
zzzk1 Jan 4, 2025
5010140
drop writer
zzzk1 Jan 5, 2025
6e0a004
Update plugin/storage/integration/integration.go
yurishkuro Jan 5, 2025
9d15917
fix fmt
zzzk1 Jan 6, 2025
b272565
Merge branch 'main' into DependencyReader-v2
yurishkuro Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions plugin/storage/integration/cassandra_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,12 @@ func (s *CassandraStorageIntegration) initializeDependencyReaderAndWriter(t *tes
err error
ok bool
)
s.DependencyReader, err = f.CreateDependencyReader()
dependencyReader, err := f.CreateDependencyReader()
require.NoError(t, err)
s.DependencyReader = v1adapter.NewDependencyReader(dependencyReader)

// TODO: Update this when the factory interface has CreateDependencyWriter
if s.DependencyWriter, ok = s.DependencyReader.(dependencystore.Writer); !ok {
if s.DependencyWriter, ok = dependencyReader.(dependencystore.Writer); !ok {
t.Log("DependencyWriter not implemented ")
}
}
Expand Down
6 changes: 4 additions & 2 deletions plugin/storage/integration/elasticsearch_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,11 @@ func (s *ESStorageIntegration) initSpanstore(t *testing.T, allTagsAsFields bool)
s.ArchiveSpanWriter, err = f.CreateArchiveSpanWriter()
require.NoError(t, err)

s.DependencyReader, err = f.CreateDependencyReader()
dependencyReader, err := f.CreateDependencyReader()
require.NoError(t, err)
s.DependencyWriter = s.DependencyReader.(dependencystore.Writer)
s.DependencyReader = v1adapter.NewDependencyReader(dependencyReader)

s.DependencyWriter = dependencyReader.(dependencystore.Writer)

s.SamplingStore, err = f.CreateSamplingStore(1)
require.NoError(t, err)
Expand Down
16 changes: 12 additions & 4 deletions plugin/storage/integration/integration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"github.com/jaegertracing/jaeger/storage/dependencystore"
"github.com/jaegertracing/jaeger/storage/samplingstore"
"github.com/jaegertracing/jaeger/storage/spanstore"
"github.com/jaegertracing/jaeger/storage_v2/depstore"
"github.com/jaegertracing/jaeger/storage_v2/tracestore"
"github.com/jaegertracing/jaeger/storage_v2/v1adapter"
)
Expand All @@ -48,7 +49,7 @@ type StorageIntegration struct {
ArchiveSpanReader spanstore.Reader
ArchiveSpanWriter spanstore.Writer
DependencyWriter dependencystore.Writer
DependencyReader dependencystore.Reader
DependencyReader depstore.Reader
SamplingStore samplingstore.Store
Fixtures []*QueryFixtures

Expand Down Expand Up @@ -499,13 +500,20 @@ func (s *StorageIntegration) testGetDependencies(t *testing.T) {
Source: source,
},
}

require.NoError(t, s.DependencyWriter.WriteDependencies(time.Now(), expected))
startTime := time.Now()
require.NoError(t, s.DependencyWriter.WriteDependencies(startTime, expected))

var actual []model.DependencyLink
found := s.waitForCondition(t, func(t *testing.T) bool {
var err error
actual, err = s.DependencyReader.GetDependencies(context.Background(), time.Now(), 5*time.Minute)

actual, err = s.DependencyReader.GetDependencies(
context.Background(),
depstore.QueryParameters{
StartTime: startTime,
EndTime: startTime.Add(time.Minute * 5),
},
)
if err != nil {
t.Log(err)
return false
Expand Down
Loading