[tests] Simplify integration tests (jaegertracing#5409)

yurishkuro · varshith257 · commit 351dd2ec206e · 2024-05-18T08:35:50.000+05:30
Signed-off-by: Vamshi Maskuri &lt;gwcchintu@gmail.com&gt;
diff --git a/plugin/storage/integration/badgerstore_test.go b/plugin/storage/integration/badgerstore_test.go
@@ -20,23 +20,23 @@ import (
 
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"
+	"go.uber.org/zap/zaptest"
 
 	"github.com/jaegertracing/jaeger/pkg/metrics"
-	"github.com/jaegertracing/jaeger/pkg/testutils"
 	"github.com/jaegertracing/jaeger/plugin/storage/badger"
 )
 
 type BadgerIntegrationStorage struct {
 	StorageIntegration
-	logger  *zap.Logger
 	factory *badger.Factory
 }
 
 func (s *BadgerIntegrationStorage) initialize(t *testing.T) {
 	s.factory = badger.NewFactory()
 	s.factory.Options.Primary.Ephemeral = false
 
-	err := s.factory.Initialize(metrics.NullFactory, zap.NewNop())
+	logger := zaptest.NewLogger(t, zaptest.Level(zap.DebugLevel))
+	err := s.factory.Initialize(metrics.NullFactory, logger)
 	require.NoError(t, err)
 	t.Cleanup(func() {
 		s.factory.Close()
@@ -67,7 +67,6 @@ func TestBadgerStorage(t *testing.T) {
 		},
 	}
 	s.CleanUp = s.cleanUp
-	s.logger, _ = testutils.NewLogger()
 	s.initialize(t)
 	s.RunAll(t)
 }
diff --git a/plugin/storage/integration/cassandra_test.go b/plugin/storage/integration/cassandra_test.go
@@ -20,11 +20,11 @@ import (
 
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"
+	"go.uber.org/zap/zaptest"
 
 	dbsession "github.com/jaegertracing/jaeger/pkg/cassandra"
 	"github.com/jaegertracing/jaeger/pkg/config"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
-	"github.com/jaegertracing/jaeger/pkg/testutils"
 	"github.com/jaegertracing/jaeger/plugin/storage/cassandra"
 	"github.com/jaegertracing/jaeger/storage/dependencystore"
 )
@@ -33,7 +33,6 @@ type CassandraStorageIntegration struct {
 	StorageIntegration
 
 	session dbsession.Session
-	logger  *zap.Logger
 }
 
 func newCassandraStorageIntegration() *CassandraStorageIntegration {
@@ -63,18 +62,12 @@ func (s *CassandraStorageIntegration) cleanUp(t *testing.T) {
 }
 
 func (s *CassandraStorageIntegration) initializeCassandraFactory(t *testing.T, flags []string) *cassandra.Factory {
-	s.logger, _ = testutils.NewLogger()
+	logger := zaptest.NewLogger(t, zaptest.Level(zap.DebugLevel))
 	f := cassandra.NewFactory()
 	v, command := config.Viperize(f.AddFlags)
-	{
-		err := command.ParseFlags(flags)
-		require.NoError(t, err)
-	}
-	f.InitFromViper(v, zap.NewNop())
-	{
-		err := f.Initialize(metrics.NullFactory, s.logger)
-		require.NoError(t, err)
-	}
+	require.NoError(t, command.ParseFlags(flags))
+	f.InitFromViper(v, logger)
+	require.NoError(t, f.Initialize(metrics.NullFactory, logger))
 	return f
 }
 
diff --git a/plugin/storage/integration/elasticsearch_test.go b/plugin/storage/integration/elasticsearch_test.go
@@ -34,7 +34,6 @@ import (
 
 	"github.com/jaegertracing/jaeger/pkg/config"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
-	"github.com/jaegertracing/jaeger/pkg/testutils"
 	"github.com/jaegertracing/jaeger/plugin/storage/es"
 	"github.com/jaegertracing/jaeger/storage/dependencystore"
 )
@@ -61,8 +60,8 @@ type ESStorageIntegration struct {
 
 	client   *elastic.Client
 	v8Client *elasticsearch8.Client
-	logger   *zap.Logger
-	factory  *es.Factory
+
+	factory *es.Factory
 }
 
 func (s *ESStorageIntegration) getVersion() (uint, error) {
@@ -88,7 +87,6 @@ func (s *ESStorageIntegration) initializeES(t *testing.T, allTagsAsFields bool)
 		elastic.SetURL(queryURL),
 		elastic.SetSniff(false))
 	require.NoError(t, err)
-	s.logger, _ = testutils.NewLogger()
 
 	s.client = rawClient
 	s.v8Client, err = elasticsearch8.NewClient(elasticsearch8.Config{
@@ -103,18 +101,14 @@ func (s *ESStorageIntegration) initializeES(t *testing.T, allTagsAsFields bool)
 		s.esCleanUp(t)
 	}
 	s.esCleanUp(t)
-	s.SkipArchiveTest = false
-	// TODO: remove this flag after ES supports returning spanKind
-	//  Issue https://github.com/jaegertracing/jaeger/issues/1923
-	s.GetOperationsMissingSpanKind = true
 }
 
 func (s *ESStorageIntegration) esCleanUp(t *testing.T) {
 	require.NoError(t, s.factory.Purge(context.Background()))
 }
 
 func (s *ESStorageIntegration) initializeESFactory(t *testing.T, allTagsAsFields bool) *es.Factory {
-	s.logger = zaptest.NewLogger(t)
+	logger := zaptest.NewLogger(t, zaptest.Level(zap.DebugLevel))
 	f := es.NewFactory()
 	v, command := config.Viperize(f.AddFlags)
 	args := []string{
@@ -131,8 +125,8 @@ func (s *ESStorageIntegration) initializeESFactory(t *testing.T, allTagsAsFields
 		fmt.Sprintf("--es-archive.index-prefix=%v", indexPrefix),
 	}
 	require.NoError(t, command.ParseFlags(args))
-	f.InitFromViper(v, s.logger)
-	require.NoError(t, f.Initialize(metrics.NullFactory, s.logger))
+	f.InitFromViper(v, logger)
+	require.NoError(t, f.Initialize(metrics.NullFactory, logger))
 
 	t.Cleanup(func() {
 		require.NoError(t, f.Close())
@@ -176,11 +170,16 @@ func testElasticsearchStorage(t *testing.T, allTagsAsFields bool) {
 	if err := healthCheck(); err != nil {
 		t.Fatal(err)
 	}
-	s := &ESStorageIntegration{}
+	s := &ESStorageIntegration{
+		StorageIntegration: StorageIntegration{
+			Fixtures:        LoadAndParseQueryTestCases(t, "fixtures/queries_es.json"),
+			SkipArchiveTest: false,
+			// TODO: remove this flag after ES supports returning spanKind
+			//  Issue https://github.com/jaegertracing/jaeger/issues/1923
+			GetOperationsMissingSpanKind: true,
+		},
+	}
 	s.initializeES(t, allTagsAsFields)
-
-	s.Fixtures = LoadAndParseQueryTestCases(t, "fixtures/queries_es.json")
-
 	s.RunAll(t)
 }
 
diff --git a/plugin/storage/integration/es_index_cleaner_test.go b/plugin/storage/integration/es_index_cleaner_test.go
@@ -24,8 +24,6 @@ import (
 	"github.com/olivere/elastic"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-
-	"github.com/jaegertracing/jaeger/pkg/testutils"
 )
 
 const (
@@ -254,6 +252,5 @@ func cleanESIndexTemplates(t *testing.T, client *elastic.Client, v8Client *elast
 		client:   client,
 		v8Client: v8Client,
 	}
-	s.logger, _ = testutils.NewLogger()
 	s.cleanESIndexTemplates(t, prefix)
 }
diff --git a/plugin/storage/integration/grpc_test.go b/plugin/storage/integration/grpc_test.go
@@ -36,15 +36,14 @@ const (
 
 type GRPCStorageIntegrationTestSuite struct {
 	StorageIntegration
-	logger           *zap.Logger
 	flags            []string
 	factory          *grpc.Factory
 	useRemoteStorage bool
 	remoteStorage    *RemoteMemoryStorage
 }
 
 func (s *GRPCStorageIntegrationTestSuite) initialize(t *testing.T) {
-	s.logger = zaptest.NewLogger(t, zaptest.Level(zap.DebugLevel))
+	logger := zaptest.NewLogger(t, zaptest.Level(zap.DebugLevel))
 
 	if s.useRemoteStorage {
 		s.remoteStorage = StartNewRemoteMemoryStorage(t)
@@ -54,8 +53,8 @@ func (s *GRPCStorageIntegrationTestSuite) initialize(t *testing.T) {
 	v, command := config.Viperize(f.AddFlags)
 	err := command.ParseFlags(s.flags)
 	require.NoError(t, err)
-	f.InitFromViper(v, zap.NewNop())
-	require.NoError(t, f.Initialize(metrics.NullFactory, s.logger))
+	f.InitFromViper(v, logger)
+	require.NoError(t, f.Initialize(metrics.NullFactory, logger))
 	s.factory = f
 
 	s.SpanWriter, err = f.CreateSpanWriter()
diff --git a/plugin/storage/integration/kafka_test.go b/plugin/storage/integration/kafka_test.go
@@ -23,14 +23,14 @@ import (
 	"github.com/Shopify/sarama"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"
+	"go.uber.org/zap/zaptest"
 
 	"github.com/jaegertracing/jaeger/cmd/ingester/app"
 	"github.com/jaegertracing/jaeger/cmd/ingester/app/builder"
 	"github.com/jaegertracing/jaeger/model"
 	"github.com/jaegertracing/jaeger/pkg/config"
 	"github.com/jaegertracing/jaeger/pkg/kafka/consumer"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
-	"github.com/jaegertracing/jaeger/pkg/testutils"
 	"github.com/jaegertracing/jaeger/plugin/storage/kafka"
 	"github.com/jaegertracing/jaeger/plugin/storage/memory"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
@@ -40,11 +40,10 @@ const defaultLocalKafkaBroker = "127.0.0.1:9092"
 
 type KafkaIntegrationTestSuite struct {
 	StorageIntegration
-	logger *zap.Logger
 }
 
 func (s *KafkaIntegrationTestSuite) initialize(t *testing.T) {
-	s.logger, _ = testutils.NewLogger()
+	logger := zaptest.NewLogger(t, zaptest.Level(zap.DebugLevel))
 	const encoding = "json"
 	const groupID = "kafka-integration-test"
 	const clientID = "kafka-integration-test"
@@ -62,8 +61,8 @@ func (s *KafkaIntegrationTestSuite) initialize(t *testing.T) {
 		encoding,
 	})
 	require.NoError(t, err)
-	f.InitFromViper(v, zap.NewNop())
-	err = f.Initialize(metrics.NullFactory, s.logger)
+	f.InitFromViper(v, logger)
+	err = f.Initialize(metrics.NullFactory, logger)
 	require.NoError(t, err)
 
 	spanWriter, err := f.CreateSpanWriter()
@@ -92,7 +91,7 @@ func (s *KafkaIntegrationTestSuite) initialize(t *testing.T) {
 	}
 	options.InitFromViper(v)
 	traceStore := memory.NewStore()
-	spanConsumer, err := builder.CreateConsumer(s.logger, metrics.NullFactory, traceStore, options)
+	spanConsumer, err := builder.CreateConsumer(logger, metrics.NullFactory, traceStore, options)
 	require.NoError(t, err)
 	spanConsumer.Start()
 

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,6 @@ import (`
`24`	`24`	`"github.com/olivere/elastic"`
`25`	`25`	`"github.com/stretchr/testify/assert"`
`26`	`26`	`"github.com/stretchr/testify/require"`
`27`		`-`
`28`		`- "github.com/jaegertracing/jaeger/pkg/testutils"`
`29`	`27`	`)`
`30`	`28`
`31`	`29`	`const (`
`@@ -254,6 +252,5 @@ func cleanESIndexTemplates(t testing.T, client elastic.Client, v8Client *elast`
`254`	`252`	`client: client,`
`255`	`253`	`v8Client: v8Client,`
`256`	`254`	`}`
`257`		`- s.logger, _ = testutils.NewLogger()`
`258`	`255`	`s.cleanESIndexTemplates(t, prefix)`
`259`	`256`	`}`