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

[cleanup] Use storagetest.NewStorageHost() from contrib #5744

Merged
merged 1 commit into from
Jul 14, 2024
Merged

[cleanup] Use storagetest.NewStorageHost() from contrib #5744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions cmd/jaeger/internal/exporters/storageexporter/exporter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,7 @@ func TestExporter(t *testing.T) {

host := makeStorageExtension(t, memstoreName)

err = tracesExporter.Start(ctx, host)
require.NoError(t, err)
require.NoError(t, tracesExporter.Start(ctx, host))
defer func() {
require.NoError(t, tracesExporter.Shutdown(ctx))
}()
Expand Down
28 changes: 3 additions & 25 deletions cmd/jaeger/internal/extension/jaegerquery/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"testing"
"time"

"github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/storagetest"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component"
Expand Down Expand Up @@ -80,27 +81,6 @@ func (fakeStorageExt) Shutdown(context.Context) error {
return nil
}

type storageHost struct {
extension component.Component
}

func (storageHost) ReportFatalError(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{
Expand All @@ -114,9 +94,7 @@ func TestServerDependencies(t *testing.T) {
}

func TestServerStart(t *testing.T) {
host := storageHost{
extension: fakeStorageExt{},
}
host := storagetest.NewStorageHost().WithExtension(jaegerstorage.ID, fakeStorageExt{})
tests := []struct {
name string
config *Config
Expand Down Expand Up @@ -251,7 +229,7 @@ func TestServerAddArchiveStorage(t *testing.T) {
}
server := newServer(tt.config, telemetrySettings)
if tt.extension != nil {
host = storageHost{extension: tt.extension}
host = storagetest.NewStorageHost().WithExtension(jaegerstorage.ID, tt.extension)
}
err := server.addArchiveStorage(tt.qSvcOpts, host)
if tt.expectedErr == "" {
Expand Down
25 changes: 3 additions & 22 deletions cmd/jaeger/internal/extension/jaegerstorage/extension_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"net/http/httptest"
"testing"

"github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/storagetest"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/component/componenttest"
Expand All @@ -31,26 +32,6 @@ import (
"github.com/jaegertracing/jaeger/storage/spanstore"
)

type storageHost struct {
t *testing.T
ext component.Component
}

func (host storageHost) GetExtensions() map[component.ID]component.Component {
return map[component.ID]component.Component{
ID: host.ext,
}
}

func (host storageHost) ReportFatalError(err error) {
host.t.Fatal(err)
}

func (storageHost) GetFactory(_ component.Kind, _ component.Type) component.Factory { return nil }
func (storageHost) GetExporters() map[component.DataType]map[component.ID]component.Component {
return nil
}

type errorFactory struct {
closeErr error
}
Expand Down Expand Up @@ -81,7 +62,7 @@ func TestStorageFactoryBadHostError(t *testing.T) {
}

func TestStorageFactoryBadNameError(t *testing.T) {
host := storageHost{t: t, ext: startStorageExtension(t, "foo")}
host := storagetest.NewStorageHost().WithExtension(ID, startStorageExtension(t, "foo"))
_, err := GetStorageFactory("bar", host)
require.ErrorContains(t, err, "cannot find definition of storage 'bar'")
}
Expand All @@ -105,7 +86,7 @@ func TestGetFactoryV2Error(t *testing.T) {

func TestGetFactory(t *testing.T) {
const name = "foo"
host := storageHost{t: t, ext: startStorageExtension(t, name)}
host := storagetest.NewStorageHost().WithExtension(ID, startStorageExtension(t, name))
f, err := GetStorageFactory(name, host)
require.NoError(t, err)
require.NotNil(t, f)
Expand Down
27 changes: 3 additions & 24 deletions cmd/jaeger/internal/processors/adaptivesampling/processor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,26 +25,6 @@ import (
"github.com/jaegertracing/jaeger/plugin/storage/memory"
)

type samplingHost struct {
t *testing.T
samplingExtension component.Component
}

func (host samplingHost) GetExtensions() map[component.ID]component.Component {
return map[component.ID]component.Component{
remotesampling.ID: host.samplingExtension,
}
}

func (host samplingHost) ReportFatalError(err error) {
host.t.Fatal(err)
}

func (samplingHost) GetFactory(_ component.Kind, _ component.Type) component.Factory { return nil }
func (samplingHost) GetExporters() map[component.DataType]map[component.ID]component.Component {
return nil
}

func makeStorageExtension(t *testing.T, memstoreName string) component.Host {
telemetrySettings := component.TelemetrySettings{
Logger: zaptest.NewLogger(t),
Expand Down Expand Up @@ -74,7 +54,7 @@ func makeStorageExtension(t *testing.T, memstoreName string) component.Host {

var _ component.Config = (*Config)(nil)

func makeRemoteSamplingExtension(t *testing.T, cfg component.Config) samplingHost {
func makeRemoteSamplingExtension(t *testing.T, cfg component.Config) component.Host {
extensionFactory := remotesampling.NewFactory()
samplingExtension, err := extensionFactory.CreateExtension(
context.Background(),
Expand All @@ -87,7 +67,7 @@ func makeRemoteSamplingExtension(t *testing.T, cfg component.Config) samplingHos
cfg,
)
require.NoError(t, err)
host := samplingHost{t: t, samplingExtension: samplingExtension}
host := storagetest.NewStorageHost().WithExtension(remotesampling.ID, samplingExtension)
storageHost := makeStorageExtension(t, "foobar")

err = samplingExtension.Start(context.Background(), storageHost)
Expand Down Expand Up @@ -148,9 +128,8 @@ func makeTracesOneSpan() ptrace.Traces {
}

func TestGetAdaptiveSamplingComponentsError(t *testing.T) {
host := &samplingHost{}
processor := &traceProcessor{}
err := processor.start(context.Background(), host)
err := processor.start(context.Background(), storagetest.NewStorageHost())
require.ErrorContains(t, err, "cannot load adaptive sampling components")
}

Expand Down
Loading