diff --git a/plugin/storage/integration/elasticsearch_test.go b/plugin/storage/integration/elasticsearch_test.go index 0d28fee919b..b54911b0f75 100644 --- a/plugin/storage/integration/elasticsearch_test.go +++ b/plugin/storage/integration/elasticsearch_test.go @@ -21,7 +21,7 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zaptest" - "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger-idl/model/v1" "github.com/jaegertracing/jaeger/pkg/config" "github.com/jaegertracing/jaeger/pkg/metrics" "github.com/jaegertracing/jaeger/pkg/testutils" diff --git a/plugin/storage/integration/grpc_test.go b/plugin/storage/integration/grpc_test.go index 7c596360dcc..28858ac8c34 100644 --- a/plugin/storage/integration/grpc_test.go +++ b/plugin/storage/integration/grpc_test.go @@ -21,18 +21,14 @@ import ( type GRPCStorageIntegrationTestSuite struct { StorageIntegration - flags []string - archiveFlags []string - factory *grpc.Factory - archiveFactory *grpc.Factory - remoteStorage *RemoteMemoryStorage - archiveRemoteStorage *RemoteMemoryStorage + flags []string + factory *grpc.Factory + remoteStorage *RemoteMemoryStorage } func (s *GRPCStorageIntegrationTestSuite) initialize(t *testing.T) { logger := zaptest.NewLogger(t, zaptest.WrapOptions(zap.AddCaller())) s.remoteStorage = StartNewRemoteMemoryStorage(t, ports.RemoteStorageGRPC) - s.archiveRemoteStorage = StartNewRemoteMemoryStorage(t, ports.RemoteStorageGRPC+1) initFactory := func(f *grpc.Factory, flags []string) { v, command := config.Viperize(f.AddFlags) @@ -41,11 +37,8 @@ func (s *GRPCStorageIntegrationTestSuite) initialize(t *testing.T) { require.NoError(t, f.Initialize(metrics.NullFactory, logger)) } f := grpc.NewFactory() - af := grpc.NewArchiveFactory() initFactory(f, s.flags) - initFactory(af, s.archiveFlags) s.factory = f - s.archiveFactory = af spanWriter, err := f.CreateSpanWriter() require.NoError(t, err) @@ -61,9 +54,7 @@ func (s *GRPCStorageIntegrationTestSuite) initialize(t *testing.T) { func (s *GRPCStorageIntegrationTestSuite) close(t *testing.T) { require.NoError(t, s.factory.Close()) - require.NoError(t, s.archiveFactory.Close()) s.remoteStorage.Close(t) - s.archiveRemoteStorage.Close(t) } func (s *GRPCStorageIntegrationTestSuite) cleanUp(t *testing.T) { @@ -81,11 +72,6 @@ func TestGRPCRemoteStorage(t *testing.T) { "--grpc-storage.server=localhost:17271", "--grpc-storage.tls.enabled=false", }, - archiveFlags: []string{ - "--grpc-storage-archive.enabled=true", - "--grpc-storage-archive.server=localhost:17272", - "--grpc-storage-archive.tls.enabled=false", - }, } s.initialize(t) defer s.close(t)