Upgrade grpc integration test to use v2 memory storage (#7709)

Signed-off-by: Yuri Shkuro <[email protected]>

Author: yurishkuro

internal/storage/integration/grpc_test.go

@@ -5,16 +5,15 @@
 package integration
 
 import (
+	"context"
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"go.uber.org/zap"
-	"go.uber.org/zap/zaptest"
+	"go.opentelemetry.io/collector/config/configgrpc"
+	"go.opentelemetry.io/collector/config/configtls"
 
-	"github.com/jaegertracing/jaeger/internal/config"
-	"github.com/jaegertracing/jaeger/internal/metrics"
-	"github.com/jaegertracing/jaeger/internal/storage/v1/grpc"
-	"github.com/jaegertracing/jaeger/internal/storage/v2/v1adapter"
+	"github.com/jaegertracing/jaeger/internal/storage/v2/grpc"
+	"github.com/jaegertracing/jaeger/internal/telemetry"
 	"github.com/jaegertracing/jaeger/internal/testutils"
 	"github.com/jaegertracing/jaeger/ports"
 )
@@ -27,25 +26,27 @@ type GRPCStorageIntegrationTestSuite struct {
 }
 
 func (s *GRPCStorageIntegrationTestSuite) initialize(t *testing.T) {
-	logger := zaptest.NewLogger(t, zaptest.WrapOptions(zap.AddCaller()))
 	s.remoteStorage = StartNewRemoteMemoryStorage(t, ports.RemoteStorageGRPC)
 
-	initFactory := func(f *grpc.Factory, flags []string) {
-		v, command := config.Viperize(f.AddFlags)
-		require.NoError(t, command.ParseFlags(flags))
-		f.InitFromViper(v, logger)
-		require.NoError(t, f.Initialize(metrics.NullFactory, logger))
-	}
-	f := grpc.NewFactory()
-	initFactory(f, s.flags)
+	f, err := grpc.NewFactory(
+		context.Background(),
+		grpc.Config{
+			ClientConfig: configgrpc.ClientConfig{
+				Endpoint: "localhost:17271",
+				TLS: configtls.ClientConfig{
+					Insecure: true,
+				},
+			},
+		},
+		telemetry.NoopSettings(),
+	)
+	require.NoError(t, err)
 	s.factory = f
 
-	spanWriter, err := f.CreateSpanWriter()
+	s.TraceWriter, err = f.CreateTraceWriter()
 	require.NoError(t, err)
-	s.TraceWriter = v1adapter.NewTraceWriter(spanWriter)
-	spanReader, err := f.CreateSpanReader()
+	s.TraceReader, err = f.CreateTraceReader()
 	require.NoError(t, err)
-	s.TraceReader = v1adapter.NewTraceReader(spanReader)
 
 	// TODO DependencyWriter is not implemented in grpc store
 

internal/storage/integration/remote_memory_storage.go

@@ -5,7 +5,6 @@ package integration
 
 import (
 	"context"
-	"os"
 	"testing"
 	"time"
 
@@ -19,20 +18,17 @@ import (
 	"google.golang.org/grpc/health/grpc_health_v1"
 
 	"github.com/jaegertracing/jaeger/cmd/remote-storage/app"
-	"github.com/jaegertracing/jaeger/internal/config"
 	"github.com/jaegertracing/jaeger/internal/healthcheck"
-	"github.com/jaegertracing/jaeger/internal/metrics"
-	storage "github.com/jaegertracing/jaeger/internal/storage/v1/factory"
-	"github.com/jaegertracing/jaeger/internal/storage/v2/api/depstore"
-	"github.com/jaegertracing/jaeger/internal/storage/v2/v1adapter"
+	memv1 "github.com/jaegertracing/jaeger/internal/storage/v1/memory"
+	"github.com/jaegertracing/jaeger/internal/storage/v2/memory"
 	"github.com/jaegertracing/jaeger/internal/telemetry"
 	"github.com/jaegertracing/jaeger/internal/tenancy"
 	"github.com/jaegertracing/jaeger/ports"
 )
 
 type RemoteMemoryStorage struct {
 	server         *app.Server
-	storageFactory *storage.Factory
+	storageFactory *memory.Factory
 }
 
 func StartNewRemoteMemoryStorage(t *testing.T, port int) *RemoteMemoryStorage {
@@ -45,22 +41,21 @@ func StartNewRemoteMemoryStorage(t *testing.T, port int) *RemoteMemoryStorage {
 	tm := tenancy.NewManager(&tenancy.Options{
 		Enabled: false,
 	})
-	storageFactory, err := storage.NewFactory(storage.ConfigFromEnvAndCLI(os.Args, os.Stderr))
-	require.NoError(t, err)
-
-	v, _ := config.Viperize(storageFactory.AddFlags)
-	storageFactory.InitFromViper(v, logger)
-	require.NoError(t, storageFactory.Initialize(metrics.NullFactory, logger))
 
 	t.Logf("Starting in-process remote storage server on %s", grpcCfg.NetAddr.Endpoint)
 	telset := telemetry.NoopSettings()
 	telset.Logger = logger
 	telset.ReportStatus = telemetry.HCAdapter(healthcheck.New())
 
-	traceFactory := v1adapter.NewFactory(storageFactory)
-	depFactory := traceFactory.(depstore.Factory)
+	traceFactory, err := memory.NewFactory(
+		memv1.Configuration{
+			MaxTraces: 10000,
+		},
+		telset,
+	)
+	require.NoError(t, err)
 
-	server, err := app.NewServer(context.Background(), grpcCfg, traceFactory, depFactory, tm, telset)
+	server, err := app.NewServer(context.Background(), grpcCfg, traceFactory, traceFactory, tm, telset)
 	require.NoError(t, err)
 	require.NoError(t, server.Start(context.Background()))
 
@@ -86,11 +81,10 @@ func StartNewRemoteMemoryStorage(t *testing.T, port int) *RemoteMemoryStorage {
 
 	return &RemoteMemoryStorage{
 		server:         server,
-		storageFactory: storageFactory,
+		storageFactory: traceFactory,
 	}
 }
 
 func (s *RemoteMemoryStorage) Close(t *testing.T) {
 	require.NoError(t, s.server.Close())
-	require.NoError(t, s.storageFactory.Close())
 }