-
Notifications
You must be signed in to change notification settings - Fork 2.5k
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
Add tests for internal/extension/jaegerquery #5123
Merged
yurishkuro
merged 9 commits into
jaegertracing:main
from
VaibhavMalik4187:internal-extension-jaegerquery-tests
May 8, 2024
Merged
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
0362bfd
Added tests for internal/extension/jaegerquery
VaibhavMalik4187 7af4dc1
Add test
yurishkuro 0446c19
Merge branch 'main' into internal-extension-jaegerquery-tests
yurishkuro efb09b8
Added missing tests for jaegerquery-extension
VaibhavMalik4187 d68785b
Merge branch 'main' into internal-extension-jaegerquery-tests
yurishkuro bcae45b
fix
yurishkuro 51e23f0
check leaks
yurishkuro 4a0db47
fixes
yurishkuro 0a46523
remove unnecessary test
yurishkuro File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
// Copyright (c) 2024 The Jaeger Authors. | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
package jaegerquery | ||
|
||
import ( | ||
"testing" | ||
|
||
"github.com/stretchr/testify/assert" | ||
"github.com/stretchr/testify/require" | ||
) | ||
|
||
func Test_Validate(t *testing.T) { | ||
tests := []struct { | ||
name string | ||
config *Config | ||
expectedErr string | ||
}{ | ||
{ | ||
name: "Empty config", | ||
config: &Config{}, | ||
expectedErr: "TraceStoragePrimary: non zero value required", | ||
}, | ||
{ | ||
name: "Non empty-config", | ||
config: &Config{ | ||
TraceStoragePrimary: "some-storage", | ||
}, | ||
expectedErr: "", | ||
}, | ||
} | ||
|
||
for _, tt := range tests { | ||
t.Run(tt.name, func(t *testing.T) { | ||
err := tt.config.Validate() | ||
if tt.expectedErr == "" { | ||
require.NoError(t, err) | ||
} else { | ||
assert.Equal(t, tt.expectedErr, err.Error()) | ||
} | ||
}) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
// Copyright (c) 2024 The Jaeger Authors. | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
package jaegerquery | ||
|
||
import ( | ||
"context" | ||
"testing" | ||
|
||
"github.com/stretchr/testify/assert" | ||
"github.com/stretchr/testify/require" | ||
"go.opentelemetry.io/collector/extension" | ||
) | ||
|
||
func Test_NewFactory(t *testing.T) { | ||
factory := NewFactory() | ||
assert.Equal(t, componentType, factory.Type()) | ||
assert.Equal(t, factory.CreateDefaultConfig(), createDefaultConfig()) | ||
} | ||
|
||
func Test_CreateExtension(t *testing.T) { | ||
set := extension.CreateSettings{ | ||
ID: ID, | ||
} | ||
cfg := createDefaultConfig() | ||
extension, err := createExtension(context.Background(), set, cfg) | ||
|
||
require.NoError(t, err) | ||
assert.NotNil(t, extension) | ||
} |
308 changes: 308 additions & 0 deletions
308
cmd/jaeger/internal/extension/jaegerquery/server_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,308 @@ | ||
// Copyright (c) 2024 The Jaeger Authors. | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
package jaegerquery | ||
|
||
import ( | ||
"context" | ||
"fmt" | ||
"testing" | ||
|
||
"github.com/stretchr/testify/assert" | ||
"github.com/stretchr/testify/require" | ||
"go.opentelemetry.io/collector/component" | ||
"go.opentelemetry.io/collector/component/componenttest" | ||
"go.uber.org/zap" | ||
|
||
"github.com/jaegertracing/jaeger/cmd/jaeger/internal/extension/jaegerstorage" | ||
queryApp "github.com/jaegertracing/jaeger/cmd/query/app" | ||
"github.com/jaegertracing/jaeger/cmd/query/app/querysvc" | ||
"github.com/jaegertracing/jaeger/pkg/jtracer" | ||
"github.com/jaegertracing/jaeger/pkg/metrics" | ||
"github.com/jaegertracing/jaeger/pkg/tenancy" | ||
"github.com/jaegertracing/jaeger/pkg/testutils" | ||
"github.com/jaegertracing/jaeger/storage" | ||
"github.com/jaegertracing/jaeger/storage/dependencystore" | ||
depsmocks "github.com/jaegertracing/jaeger/storage/dependencystore/mocks" | ||
"github.com/jaegertracing/jaeger/storage/spanstore" | ||
spanstoremocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks" | ||
) | ||
|
||
type fakeFactory struct { | ||
name string | ||
} | ||
|
||
func (ff fakeFactory) CreateDependencyReader() (dependencystore.Reader, error) { | ||
if ff.name == "need-dependency-reader-error" { | ||
return nil, fmt.Errorf("test-error") | ||
} | ||
return &depsmocks.Reader{}, nil | ||
} | ||
|
||
func (ff fakeFactory) CreateSpanReader() (spanstore.Reader, error) { | ||
if ff.name == "need-span-reader-error" { | ||
return nil, fmt.Errorf("test-error") | ||
} | ||
return &spanstoremocks.Reader{}, nil | ||
} | ||
|
||
func (ff fakeFactory) CreateSpanWriter() (spanstore.Writer, error) { | ||
if ff.name == "need-span-writer-error" { | ||
return nil, fmt.Errorf("test-error") | ||
} | ||
return &spanstoremocks.Writer{}, nil | ||
} | ||
|
||
func (ff fakeFactory) Initialize(metrics.Factory, *zap.Logger) error { | ||
if ff.name == "need-initialize-error" { | ||
return fmt.Errorf("test-error") | ||
} | ||
return nil | ||
} | ||
|
||
type fakeStorageExt struct{} | ||
|
||
func (fse fakeStorageExt) Factory(name string) (storage.Factory, error) { | ||
fmt.Println("Name: ", name) | ||
if name == "need-factory-error" { | ||
return nil, fmt.Errorf("test-error") | ||
} | ||
return fakeFactory{name: name}, nil | ||
} | ||
|
||
func (fse fakeStorageExt) Start(ctx context.Context, host component.Host) error { | ||
return nil | ||
} | ||
|
||
func (fse fakeStorageExt) Shutdown(ctx context.Context) error { | ||
return nil | ||
} | ||
|
||
type storageHost struct { | ||
extension component.Component | ||
} | ||
|
||
func (host storageHost) ReportFatalError(err error) { | ||
} | ||
|
||
func (host storageHost) GetExtensions() map[component.ID]component.Component { | ||
return map[component.ID]component.Component{ | ||
jaegerstorage.ID: host.extension, | ||
} | ||
} | ||
|
||
func (storageHost) GetFactory(_ component.Kind, _ component.Type) component.Factory { | ||
return nil | ||
} | ||
|
||
func (storageHost) GetExporters() map[component.DataType]map[component.ID]component.Component { | ||
return nil | ||
} | ||
|
||
func TestServerDependencies(t *testing.T) { | ||
expectedDependencies := []component.ID{jaegerstorage.ID} | ||
telemetrySettings := component.TelemetrySettings{ | ||
Logger: zap.NewNop(), | ||
} | ||
|
||
server := newServer(createDefaultConfig().(*Config), telemetrySettings) | ||
dependencies := server.Dependencies() | ||
|
||
assert.Equal(t, expectedDependencies, dependencies) | ||
} | ||
|
||
func TestServerStart(t *testing.T) { | ||
host := storageHost{ | ||
extension: fakeStorageExt{}, | ||
} | ||
logger := zap.NewNop() | ||
|
||
tests := []struct { | ||
name string | ||
config *Config | ||
expectedErr string | ||
}{ | ||
{ | ||
name: "Non-empty config with fake storage host", | ||
config: &Config{ | ||
TraceStorageArchive: "jaeger_storage", | ||
TraceStoragePrimary: "jaeger_storage", | ||
}, | ||
}, | ||
{ | ||
name: "factory error", | ||
config: &Config{ | ||
TraceStorageArchive: "jaeger_storage", | ||
TraceStoragePrimary: "need-factory-error", | ||
}, | ||
expectedErr: "cannot find primary storage", | ||
}, | ||
{ | ||
name: "span reader error", | ||
config: &Config{ | ||
TraceStorageArchive: "jaeger_storage", | ||
TraceStoragePrimary: "need-span-reader-error", | ||
}, | ||
expectedErr: "cannot create span reader", | ||
}, | ||
{ | ||
name: "dependency error", | ||
config: &Config{ | ||
TraceStorageArchive: "jaeger_storage", | ||
TraceStoragePrimary: "need-dependency-reader-error", | ||
}, | ||
expectedErr: "cannot create dependencies reader", | ||
}, | ||
{ | ||
name: "storage archive error", | ||
config: &Config{ | ||
TraceStorageArchive: "need-factory-error", | ||
TraceStoragePrimary: "jaeger_storage", | ||
}, | ||
expectedErr: "cannot find archive storage factory", | ||
}, | ||
{ | ||
name: "tenacy manager error", | ||
config: &Config{ | ||
TraceStorageArchive: "jaeger_storage", | ||
TraceStoragePrimary: "jaeger_storage", | ||
Tenancy: tenancy.Options{ | ||
Enabled: true, | ||
Header: "test", | ||
}, | ||
}, | ||
expectedErr: "could not start jaeger-query", | ||
}, | ||
} | ||
|
||
for _, tt := range tests { | ||
t.Run(tt.name, func(t *testing.T) { | ||
telemetrySettings := component.TelemetrySettings{ | ||
Logger: logger, | ||
} | ||
server := newServer(tt.config, telemetrySettings) | ||
err := server.Start(context.Background(), host) | ||
yurishkuro marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
if tt.expectedErr == "" { | ||
require.NoError(t, err) | ||
} else { | ||
require.ErrorContains(t, err, tt.expectedErr) | ||
} | ||
}) | ||
} | ||
} | ||
|
||
func TestServerAddArchiveStorage(t *testing.T) { | ||
host := componenttest.NewNopHost() | ||
|
||
tests := []struct { | ||
name string | ||
qSvcOpts *querysvc.QueryServiceOptions | ||
config *Config | ||
extension component.Component | ||
expectedOutput string | ||
expectedErr string | ||
}{ | ||
{ | ||
name: "Archive storage unset", | ||
config: &Config{}, | ||
qSvcOpts: &querysvc.QueryServiceOptions{}, | ||
expectedOutput: `{"level":"info","msg":"Archive storage not configured"}` + "\n", | ||
expectedErr: "", | ||
}, | ||
{ | ||
name: "Archive storage set", | ||
config: &Config{ | ||
TraceStorageArchive: "random-value", | ||
}, | ||
qSvcOpts: &querysvc.QueryServiceOptions{}, | ||
expectedOutput: "", | ||
expectedErr: "cannot find archive storage factory: cannot find extension", | ||
}, | ||
{ | ||
name: "Archive storage not supported", | ||
config: &Config{ | ||
TraceStorageArchive: "badger", | ||
}, | ||
qSvcOpts: &querysvc.QueryServiceOptions{}, | ||
extension: fakeStorageExt{}, | ||
expectedOutput: "Archive storage not supported by the factory", | ||
expectedErr: "", | ||
}, | ||
} | ||
|
||
for _, tt := range tests { | ||
t.Run(tt.name, func(t *testing.T) { | ||
logger, buf := testutils.NewLogger() | ||
telemetrySettings := component.TelemetrySettings{ | ||
Logger: logger, | ||
} | ||
server := newServer(tt.config, telemetrySettings) | ||
if tt.extension != nil { | ||
host = storageHost{extension: tt.extension} | ||
} | ||
err := server.addArchiveStorage(tt.qSvcOpts, host) | ||
if tt.expectedErr == "" { | ||
require.NoError(t, err) | ||
} else { | ||
require.ErrorContains(t, err, tt.expectedErr) | ||
} | ||
|
||
assert.Contains(t, buf.String(), tt.expectedOutput) | ||
}) | ||
} | ||
} | ||
|
||
func TestServerShutdown(t *testing.T) { | ||
tests := []struct { | ||
name string | ||
hasQueryServer bool | ||
}{ | ||
yurishkuro marked this conversation as resolved.
Show resolved
Hide resolved
|
||
{ | ||
name: "server.server nil", | ||
hasQueryServer: false, | ||
}, | ||
{ | ||
name: "server.server not nil", | ||
hasQueryServer: true, | ||
}, | ||
} | ||
|
||
for _, tt := range tests { | ||
t.Run(tt.name, func(t *testing.T) { | ||
telemetrySettings := component.TelemetrySettings{ | ||
Logger: zap.NewNop(), | ||
} | ||
server := newServer(createDefaultConfig().(*Config), telemetrySettings) | ||
assert.NotNil(t, server) | ||
yurishkuro marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
if tt.hasQueryServer { | ||
serverOptions := &queryApp.QueryOptions{ | ||
HTTPHostPort: ":8080", | ||
GRPCHostPort: ":8080", | ||
QueryOptionsBase: queryApp.QueryOptionsBase{ | ||
Tenancy: tenancy.Options{ | ||
Enabled: true, | ||
}, | ||
}, | ||
} | ||
tenancyMgr := tenancy.NewManager(&serverOptions.Tenancy) | ||
spanReader := &spanstoremocks.Reader{} | ||
dependencyReader := &depsmocks.Reader{} | ||
querySvc := querysvc.NewQueryService(spanReader, dependencyReader, querysvc.QueryServiceOptions{}) | ||
queryAppServer, err := queryApp.NewServer(zap.NewNop(), querySvc, nil, | ||
serverOptions, tenancyMgr, | ||
jtracer.NoOp()) | ||
yurishkuro marked this conversation as resolved.
Show resolved
Hide resolved
|
||
require.NoError(t, err) | ||
|
||
err = queryAppServer.Start() | ||
require.NoError(t, err) | ||
yurishkuro marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
server.server = queryAppServer | ||
} | ||
|
||
err := server.Shutdown(context.Background()) | ||
require.NoError(t, err) | ||
}) | ||
} | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is not a great pattern, I suggest you simply store the Error object in
fakeFactory
that it's expected to return