Modify E2EStorageIntegration struct

Signed-off-by: joeyyy09 <[email protected]>

cmd/jaeger/internal/integration/badger_test.go

@@ -23,7 +23,7 @@ func TestBadgerStorage(t *testing.T) {
 			GetOperationsMissingSpanKind: true,
 		},
 	}
-	s.e2eInitialize(t, "badger", true)
+	s.e2eInitialize(t, "badger")
 	t.Cleanup(func() {
 		s.e2eCleanUp(t)
 	})

cmd/jaeger/internal/integration/cassandra_test.go

@@ -21,7 +21,7 @@ func TestCassandraStorage(t *testing.T) {
 			SkipList: integration.CassandraSkippedTests,
 		},
 	}
-	s.e2eInitialize(t, "cassandra", true)
+	s.e2eInitialize(t, "cassandra")
 	t.Cleanup(func() {
 		s.e2eCleanUp(t)
 	})

cmd/jaeger/internal/integration/e2e_integration.go

@@ -37,16 +37,17 @@ const otlpPort = 4317
 //   - At last, clean up anything declared in its own test functions.
 //     (e.g. close remote-storage)
 type E2EStorageIntegration struct {
+	SkipStorageCleaner bool
 	integration.StorageIntegration
 	ConfigFile string
 }
 
 // e2eInitialize starts the Jaeger-v2 collector with the provided config file,
 // it also initialize the SpanWriter and SpanReader below.
 // This function should be called before any of the tests start.
-func (s *E2EStorageIntegration) e2eInitialize(t *testing.T, storage string, injectStorageCleaner bool) {
+func (s *E2EStorageIntegration) e2eInitialize(t *testing.T, storage string) {
 	logger := zaptest.NewLogger(t, zaptest.WrapOptions(zap.AddCaller()))
-	configFile := createStorageCleanerConfig(t, s.ConfigFile, storage, injectStorageCleaner)
+	configFile := createStorageCleanerConfig(t, s.SkipStorageCleaner,s.ConfigFile, storage)
 	t.Logf("Starting Jaeger-v2 in the background with config file %s", configFile)
 
 	outFile, err := os.OpenFile(
@@ -124,7 +125,7 @@ func (s *E2EStorageIntegration) e2eCleanUp(t *testing.T) {
 	require.NoError(t, s.SpanWriter.(io.Closer).Close())
 }
 
-func createStorageCleanerConfig(t *testing.T, configFile string, storage string, injectStorageCleaner bool) string {
+func createStorageCleanerConfig(t *testing.T, SkipStorageCleaner bool, configFile string, storage string) string {
 	data, err := os.ReadFile(configFile)
 	require.NoError(t, err)
 
@@ -138,7 +139,7 @@ func createStorageCleanerConfig(t *testing.T, configFile string, storage string,
 	extensions := extensionsAny.(map[string]any)
 
 
-	if injectStorageCleaner{	
+	if !SkipStorageCleaner{	
 		// Add storage_cleaner to the service extensions
 		serviceAny, ok := config["service"]
 		require.True(t, ok)

cmd/jaeger/internal/integration/e2e_integration_test.go

@@ -8,6 +8,6 @@ import "testing"
 func TestCreateStorageCleanerConfig(t *testing.T) {
 	// Ensure that we can parse the existing configs correctly.
 	// This is faster to run than the full integration test.
-	createStorageCleanerConfig(t, "../../config-elasticsearch.yaml", "elasticsearch", true)
-	createStorageCleanerConfig(t, "../../config-opensearch.yaml", "opensearch", true)
+	createStorageCleanerConfig(t, false,"../../config-elasticsearch.yaml", "elasticsearch")
+	createStorageCleanerConfig(t, false, "../../config-opensearch.yaml", "opensearch")
 }

cmd/jaeger/internal/integration/elasticsearch_test.go

@@ -20,7 +20,7 @@ func TestElasticsearchStorage(t *testing.T) {
 			GetOperationsMissingSpanKind: true,
 		},
 	}
-	s.e2eInitialize(t, "elasticsearch", true)
+	s.e2eInitialize(t, "elasticsearch")
 	t.Cleanup(func() {
 		s.e2eCleanUp(t)
 	})

cmd/jaeger/internal/integration/grpc_test.go

@@ -34,7 +34,7 @@ func TestGRPCStorage(t *testing.T) {
 	}
 	s.CleanUp = s.cleanUp
 	s.initialize(t)
-	s.e2eInitialize(t, "grpc", true)
+	s.e2eInitialize(t, "grpc")
 	t.Cleanup(func() {
 		s.e2eCleanUp(t)
 		s.remoteStorage.Close(t)

cmd/jaeger/internal/integration/kafka_test.go

@@ -16,6 +16,7 @@ func TestKafkaStorage(t *testing.T) {
     ingesterConfig := "../../ingester-remote-storage.yaml"
 
     collector := &E2EStorageIntegration{
+        SkipStorageCleaner: true,
         ConfigFile: collectorConfig,
         StorageIntegration: integration.StorageIntegration{
             GetDependenciesReturnsSource: true,
@@ -24,7 +25,7 @@ func TestKafkaStorage(t *testing.T) {
     }
 
     // Initialize and start the collector
-    collector.e2eInitialize(t, "kafka-collector", false)
+    collector.e2eInitialize(t, "kafka-collector")
 
 
     ingester := &E2EStorageIntegration{
@@ -37,7 +38,7 @@ func TestKafkaStorage(t *testing.T) {
     }
 
 	// Initialize and start the ingester
-    ingester.e2eInitialize(t, "kafka-ingester", true)
+    ingester.e2eInitialize(t, "kafka-ingester")
 
     // Set up cleanup for both collector and ingester
     t.Cleanup(func() {

cmd/jaeger/internal/integration/memory_test.go

@@ -19,7 +19,7 @@ func TestMemoryStorage(t *testing.T) {
 			CleanUp:         purge,
 		},
 	}
-	s.e2eInitialize(t, "memory", true)
+	s.e2eInitialize(t, "memory")
 	t.Cleanup(func() {
 		s.e2eCleanUp(t)
 	})

cmd/jaeger/internal/integration/opensearch_test.go

@@ -19,7 +19,7 @@ func TestOpenSearchStorage(t *testing.T) {
 			GetOperationsMissingSpanKind: true,
 		},
 	}
-	s.e2eInitialize(t, "opensearch", true)
+	s.e2eInitialize(t, "opensearch")
 	t.Cleanup(func() {
 		s.e2eCleanUp(t)
 	})