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.

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

[refactor] Conditionally implement interfaces in v1adapter #6701

Merged
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
32 changes: 30 additions & 2 deletions internal/storage/v2/v1adapter/tracereader.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"go.opentelemetry.io/collector/pdata/ptrace"

"github.com/jaegertracing/jaeger-idl/model/v1"
"github.com/jaegertracing/jaeger/internal/storage/v1"
"github.com/jaegertracing/jaeger/internal/storage/v1/api/dependencystore"
"github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore"
"github.com/jaegertracing/jaeger/internal/storage/v2/api/depstore"
Expand All @@ -31,10 +32,37 @@ func GetV1Reader(reader tracestore.Reader) (spanstore.Reader, bool) {
return nil, false
}

func NewTraceReader(spanReader spanstore.Reader) *TraceReader {
return &TraceReader{
func NewTraceReader(spanReader spanstore.Reader) tracestore.Reader {
traceReader := &TraceReader{
spanReader: spanReader,
}
var (
purger, isPurger = spanReader.(storage.Purger)
samplingStoreFactory, isSamplingStoreFactory = spanReader.(storage.SamplingStoreFactory)
mahadzaryab1 marked this conversation as resolved.
Show resolved Hide resolved
)

switch {
case isPurger && isSamplingStoreFactory:
return struct {
tracestore.Reader
storage.Purger
storage.SamplingStoreFactory
}{traceReader, purger, samplingStoreFactory}
case isPurger:
return struct {
tracestore.Reader
storage.Purger
}{traceReader, purger}
case isSamplingStoreFactory:
return struct {
tracestore.Reader
storage.SamplingStoreFactory
}{traceReader, samplingStoreFactory}
default:
return &TraceReader{
spanReader: spanReader,
}
mahadzaryab1 marked this conversation as resolved.
Show resolved Hide resolved
}
}

func (tr *TraceReader) GetTraces(
Expand Down
64 changes: 64 additions & 0 deletions internal/storage/v2/v1adapter/tracereader_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,80 @@ import (
"go.opentelemetry.io/collector/pdata/ptrace"

"github.com/jaegertracing/jaeger-idl/model/v1"
"github.com/jaegertracing/jaeger/internal/storage/v1"
dependencyStoreMocks "github.com/jaegertracing/jaeger/internal/storage/v1/api/dependencystore/mocks"
"github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore"
spanStoreMocks "github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore/mocks"
"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
v1StorageMocks "github.com/jaegertracing/jaeger/internal/storage/v1/mocks"
"github.com/jaegertracing/jaeger/internal/storage/v2/api/depstore"
"github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore"
tracestoremocks "github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore/mocks"
"github.com/jaegertracing/jaeger/pkg/iter"
)

func TestNewTraceReader(t *testing.T) {
mockSpanReader := new(spanStoreMocks.Reader)
mockPurger := new(v1StorageMocks.Purger)
mockSamplingStoreFactory := new(v1StorageMocks.SamplingStoreFactory)

tests := []struct {
name string
spanReader spanstore.Reader
expectedInterfaces []any
}{
{
name: "No extra interfaces",
spanReader: mockSpanReader,
expectedInterfaces: []any{(*tracestore.Reader)(nil)},
},
{
name: "Implements Purger",
spanReader: struct {
spanstore.Reader
storage.Purger
}{mockSpanReader, mockPurger},
expectedInterfaces: []any{
(*tracestore.Reader)(nil),
(*storage.Purger)(nil),
},
},
{
name: "Implements SamplingStoreFactory",
spanReader: struct {
spanstore.Reader
storage.SamplingStoreFactory
}{mockSpanReader, mockSamplingStoreFactory},
expectedInterfaces: []any{
(*tracestore.Reader)(nil),
(*storage.SamplingStoreFactory)(nil),
},
},
{
name: "Implements both Purger and SamplingStoreFactory",
spanReader: struct {
spanstore.Reader
storage.Purger
storage.SamplingStoreFactory
}{mockSpanReader, mockPurger, mockSamplingStoreFactory},
expectedInterfaces: []any{
(*tracestore.Reader)(nil),
(*storage.Purger)(nil),
(*storage.SamplingStoreFactory)(nil),
},
},
}

for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
traceReader := NewTraceReader(test.spanReader)
for _, i := range test.expectedInterfaces {
require.Implements(t, i, traceReader)
}
})
}
}

func TestGetV1Reader_NoError(t *testing.T) {
memstore := memory.NewStore()
traceReader := &TraceReader{
Expand Down
Loading