[chore] [exporterhelper] Cleanup mock storage test helpers (#8349)

Remove redundant test helpers

exporter/exporterhelper/internal/mock_storage.go

@@ -25,8 +25,8 @@ func (m mockStorageExtension) GetClient(_ context.Context, _ component.Kind, _ c
 	return &mockStorageClient{st: map[string][]byte{}}, nil
 }
 
-func NewMockStorageExtension() storage.Extension {
-	return &mockStorageExtension{}
+func NewMockStorageExtension(getClientError error) storage.Extension {
+	return &mockStorageExtension{getClientError: getClientError}
 }
 
 type mockStorageClient struct {

exporter/exporterhelper/internal/persistent_queue_test.go

@@ -36,7 +36,7 @@ func createTestQueue(t *testing.T, capacity, numConsumers int, callback func(ite
 	pq := NewPersistentQueue(capacity, numConsumers, component.ID{}, newFakeTracesRequestMarshalerFunc(),
 		newFakeTracesRequestUnmarshalerFunc())
 	host := &mockHost{ext: map[component.ID]component.Component{
-		{}: createStorageExtension(t.TempDir()),
+		{}: NewMockStorageExtension(nil),
 	}}
 	err := pq.Start(context.Background(), host, newNopQueueSettings(callback))
 	require.NoError(t, err)
@@ -45,13 +45,11 @@ func createTestQueue(t *testing.T, capacity, numConsumers int, callback func(ite
 }
 
 func TestPersistentQueue_Capacity(t *testing.T) {
-	path := t.TempDir()
-
 	for i := 0; i < 100; i++ {
 		pq := NewPersistentQueue(5, 1, component.ID{}, newFakeTracesRequestMarshalerFunc(),
 			newFakeTracesRequestUnmarshalerFunc())
 		host := &mockHost{ext: map[component.ID]component.Component{
-			{}: createStorageExtension(path),
+			{}: NewMockStorageExtension(nil),
 		}}
 		err := pq.Start(context.Background(), host, newNopQueueSettings(func(req Request) {}))
 		require.NoError(t, err)
@@ -252,8 +250,7 @@ func TestToStorageClient(t *testing.T) {
 
 			var extensions = map[component.ID]component.Component{}
 			for i := 0; i < tC.numStorages; i++ {
-				extensions[component.NewIDWithName("file_storage",
-					strconv.Itoa(i))] = &mockStorageExtension{getClientError: tC.getClientError}
+				extensions[component.NewIDWithName("file_storage", strconv.Itoa(i))] = NewMockStorageExtension(tC.getClientError)
 			}
 			host := &mockHost{ext: extensions}
 			ownerID := component.NewID("foo_exporter")

exporter/exporterhelper/internal/persistent_storage_batch_test.go

@@ -12,9 +12,7 @@ import (
 )
 
 func TestPersistentStorageBatch_Operations(t *testing.T) {
-	path := t.TempDir()
-
-	ext := createStorageExtension(path)
+	ext := NewMockStorageExtension(nil)
 	client := createTestClient(ext)
 	ps := createTestPersistentStorage(client)
 

exporter/exporterhelper/internal/persistent_storage_test.go

@@ -22,11 +22,6 @@ import (
 	"go.opentelemetry.io/collector/pdata/ptrace"
 )
 
-func createStorageExtension(_ string) storage.Extension {
-	// After having storage moved to core, we could leverage storagetest.NewTestExtension(nil, path)
-	return NewMockStorageExtension()
-}
-
 func createTestClient(extension storage.Extension) storage.Client {
 	client, err := extension.GetClient(context.Background(), component.KindReceiver, component.ID{}, "")
 	if err != nil {
@@ -86,8 +81,6 @@ func newFakeTracesRequestMarshalerFunc() RequestMarshaler {
 }
 
 func TestPersistentStorage_CorruptedData(t *testing.T) {
-	path := t.TempDir()
-
 	traces := newTraces(5, 10)
 	req := newFakeTracesRequest(traces)
 
@@ -152,7 +145,7 @@ func TestPersistentStorage_CorruptedData(t *testing.T) {
 
 	for _, c := range cases {
 		t.Run(c.name, func(t *testing.T) {
-			ext := createStorageExtension(path)
+			ext := NewMockStorageExtension(nil)
 			client := createTestClient(ext)
 			ps := createTestPersistentStorage(client)
 
@@ -202,12 +195,10 @@ func TestPersistentStorage_CorruptedData(t *testing.T) {
 }
 
 func TestPersistentStorage_CurrentlyProcessedItems(t *testing.T) {
-	path := t.TempDir()
-
 	traces := newTraces(5, 10)
 	req := newFakeTracesRequest(traces)
 
-	ext := createStorageExtension(path)
+	ext := NewMockStorageExtension(nil)
 	client := createTestClient(ext)
 	ps := createTestPersistentStorage(client)
 
@@ -269,13 +260,12 @@ func TestPersistentStorage_CurrentlyProcessedItems(t *testing.T) {
 // close to full and with some items dispatched
 func TestPersistentStorage_StartWithNonDispatched(t *testing.T) {
 	var capacity uint64 = 5 // arbitrary small number
-	path := t.TempDir()
 	logger := zap.NewNop()
 
 	traces := newTraces(5, 10)
 	req := newFakeTracesRequest(traces)
 
-	ext := createStorageExtension(path)
+	ext := NewMockStorageExtension(nil)
 	client := createTestClient(ext)
 	ps := createTestPersistentStorageWithLoggingAndCapacity(client, logger, capacity)
 
@@ -307,13 +297,11 @@ func TestPersistentStorage_StartWithNonDispatched(t *testing.T) {
 }
 
 func TestPersistentStorage_RepeatPutCloseReadClose(t *testing.T) {
-	path := t.TempDir()
-
 	traces := newTraces(5, 10)
 	req := newFakeTracesRequest(traces)
 
 	for i := 0; i < 10; i++ {
-		ext := createStorageExtension(path)
+		ext := NewMockStorageExtension(nil)
 		client := createTestClient(ext)
 		ps := createTestPersistentStorage(client)
 		require.Equal(t, uint64(0), ps.size())
@@ -328,7 +316,7 @@ func TestPersistentStorage_RepeatPutCloseReadClose(t *testing.T) {
 		require.NoError(t, err)
 
 		// TODO: when replacing mock with real storage, this could actually be uncommented
-		// ext = createStorageExtension(path)
+		// ext = NewMockStorageExtension(nil)
 		// ps = createTestPersistentStorage(ext)
 
 		// The first element should be already picked by loop
@@ -349,16 +337,14 @@ func TestPersistentStorage_RepeatPutCloseReadClose(t *testing.T) {
 	}
 
 	// No more items
-	ext := createStorageExtension(path)
+	ext := NewMockStorageExtension(nil)
 	wq := createTestQueue(t, 1000, 1, func(Request) {})
 	require.Equal(t, 0, wq.Size())
 	require.NoError(t, ext.Shutdown(context.Background()))
 }
 
 func TestPersistentStorage_EmptyRequest(t *testing.T) {
-	path := t.TempDir()
-
-	ext := createStorageExtension(path)
+	ext := NewMockStorageExtension(nil)
 	client := createTestClient(ext)
 	ps := createTestPersistentStorage(client)
 
@@ -394,8 +380,7 @@ func BenchmarkPersistentStorage_TraceSpans(b *testing.B) {
 
 	for _, c := range cases {
 		b.Run(fmt.Sprintf("#traces: %d #spansPerTrace: %d", c.numTraces, c.numSpansPerTrace), func(bb *testing.B) {
-			path := bb.TempDir()
-			ext := createStorageExtension(path)
+			ext := NewMockStorageExtension(nil)
 			client := createTestClient(ext)
 			ps := createTestPersistentStorageWithLoggingAndCapacity(client, zap.NewNop(), 10000000)
 
@@ -453,9 +438,7 @@ func TestPersistentStorage_ItemIndexMarshaling(t *testing.T) {
 }
 
 func TestPersistentStorage_StopShouldCloseClient(t *testing.T) {
-	path := t.TempDir()
-
-	ext := createStorageExtension(path)
+	ext := NewMockStorageExtension(nil)
 	client := createTestClient(ext)
 	ps := createTestPersistentStorage(client)
 

exporter/exporterhelper/logs_test.go

@@ -163,7 +163,7 @@ func TestLogsExporter_WithPersistentQueue(t *testing.T) {
 	require.NoError(t, err)
 
 	host := &mockHost{ext: map[component.ID]component.Component{
-		storageID: internal.NewMockStorageExtension(),
+		storageID: internal.NewMockStorageExtension(nil),
 	}}
 	require.NoError(t, te.Start(context.Background(), host))
 	t.Cleanup(func() { require.NoError(t, te.Shutdown(context.Background())) })

exporter/exporterhelper/metrics_test.go

@@ -164,7 +164,7 @@ func TestMetricsExporter_WithPersistentQueue(t *testing.T) {
 	require.NoError(t, err)
 
 	host := &mockHost{ext: map[component.ID]component.Component{
-		storageID: internal.NewMockStorageExtension(),
+		storageID: internal.NewMockStorageExtension(nil),
 	}}
 	require.NoError(t, te.Start(context.Background(), host))
 	t.Cleanup(func() { require.NoError(t, te.Shutdown(context.Background())) })

exporter/exporterhelper/queued_retry_test.go

@@ -23,7 +23,6 @@ import (
 	"go.opentelemetry.io/collector/consumer/consumererror"
 	"go.opentelemetry.io/collector/exporter/exporterhelper/internal"
 	"go.opentelemetry.io/collector/exporter/exportertest"
-	"go.opentelemetry.io/collector/extension/experimental/storage"
 	"go.opentelemetry.io/collector/internal/testdata"
 	"go.opentelemetry.io/collector/obsreport/obsreporttest"
 )
@@ -470,7 +469,7 @@ func TestQueuedRetryPersistenceEnabled(t *testing.T) {
 	require.NoError(t, err)
 
 	var extensions = map[component.ID]component.Component{
-		storageID: &mockStorageExtension{},
+		storageID: internal.NewMockStorageExtension(nil),
 	}
 	host := &mockHost{ext: extensions}
 
@@ -497,7 +496,7 @@ func TestQueuedRetryPersistenceEnabledStorageError(t *testing.T) {
 	require.NoError(t, err)
 
 	var extensions = map[component.ID]component.Component{
-		storageID: &mockStorageExtension{GetClientError: storageError},
+		storageID: internal.NewMockStorageExtension(storageError),
 	}
 	host := &mockHost{ext: extensions}
 
@@ -727,25 +726,6 @@ func (nh *mockHost) GetExtensions() map[component.ID]component.Component {
 	return nh.ext
 }
 
-type mockStorageExtension struct {
-	GetClientError error
-}
-
-func (mse *mockStorageExtension) Start(_ context.Context, _ component.Host) error {
-	return nil
-}
-
-func (mse *mockStorageExtension) Shutdown(_ context.Context) error {
-	return nil
-}
-
-func (mse *mockStorageExtension) GetClient(_ context.Context, _ component.Kind, _ component.ID, _ string) (storage.Client, error) {
-	if mse.GetClientError != nil {
-		return nil, mse.GetClientError
-	}
-	return storage.NewNopClient(), nil
-}
-
 type producerConsumerQueueWithCounter struct {
 	internal.ProducerConsumerQueue
 	produceCounter *atomic.Uint32

exporter/exporterhelper/traces_test.go

@@ -161,7 +161,7 @@ func TestTracesExporter_WithPersistentQueue(t *testing.T) {
 	require.NoError(t, err)
 
 	host := &mockHost{ext: map[component.ID]component.Component{
-		storageID: internal.NewMockStorageExtension(),
+		storageID: internal.NewMockStorageExtension(nil),
 	}}
 	require.NoError(t, te.Start(context.Background(), host))
 	t.Cleanup(func() { require.NoError(t, te.Shutdown(context.Background())) })