Move extension/storage to extension/experimental/storage

exporter/exporterhelper/persistent_queue.go

@@ -24,7 +24,7 @@ import (
 	"go.uber.org/zap"
 
 	"go.opentelemetry.io/collector/exporter/exporterhelper/internal"
-	"go.opentelemetry.io/collector/extension/storage"
+	"go.opentelemetry.io/collector/extension/experimental/storageextension"
 )
 
 // persistentQueue holds the queue backed by file storage
@@ -38,7 +38,7 @@ type persistentQueue struct {
 }
 
 // newPersistentQueue creates a new queue backed by file storage; name parameter must be a unique value that identifies the queue
-func newPersistentQueue(ctx context.Context, name string, capacity int, logger *zap.Logger, client storage.Client, unmarshaler requestUnmarshaler) *persistentQueue {
+func newPersistentQueue(ctx context.Context, name string, capacity int, logger *zap.Logger, client storageextension.Client, unmarshaler requestUnmarshaler) *persistentQueue {
 	return &persistentQueue{
 		logger:   logger,
 		stopChan: make(chan struct{}),

exporter/exporterhelper/persistent_queue_test.go

@@ -30,11 +30,11 @@ import (
 
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/config"
-	"go.opentelemetry.io/collector/extension/storage"
+	"go.opentelemetry.io/collector/extension/experimental/storageextension"
 	"go.opentelemetry.io/collector/model/pdata"
 )
 
-func createTestQueue(extension storage.Extension, capacity int) *persistentQueue {
+func createTestQueue(extension storageextension.Extension, capacity int) *persistentQueue {
 	logger, _ := zap.NewDevelopment()
 
 	client, err := extension.GetClient(context.Background(), component.KindReceiver, config.ComponentID{}, "")

exporter/exporterhelper/persistent_storage.go

@@ -27,7 +27,7 @@ import (
 	"go.opencensus.io/metric/metricdata"
 	"go.uber.org/zap"
 
-	"go.opentelemetry.io/collector/extension/storage"
+	"go.opentelemetry.io/collector/extension/experimental/storageextension"
 )
 
 // persistentStorage provides an interface for request storage operations
@@ -69,7 +69,7 @@ type persistentStorage interface {
 type persistentContiguousStorage struct {
 	logger      *zap.Logger
 	queueName   string
-	client      storage.Client
+	client      storageextension.Client
 	unmarshaler requestUnmarshaler
 
 	putChan  chan struct{}
@@ -109,7 +109,7 @@ var (
 // newPersistentContiguousStorage creates a new file-storage extension backed queue;
 // queueName parameter must be a unique value that identifies the queue.
 // The queue needs to be initialized separately using initPersistentContiguousStorage.
-func newPersistentContiguousStorage(ctx context.Context, queueName string, capacity uint64, logger *zap.Logger, client storage.Client, unmarshaler requestUnmarshaler) *persistentContiguousStorage {
+func newPersistentContiguousStorage(ctx context.Context, queueName string, capacity uint64, logger *zap.Logger, client storageextension.Client, unmarshaler requestUnmarshaler) *persistentContiguousStorage {
 	pcs := &persistentContiguousStorage{
 		logger:      logger,
 		client:      client,

exporter/exporterhelper/persistent_storage_batch.go

@@ -25,7 +25,7 @@ import (
 
 	"go.uber.org/zap"
 
-	"go.opentelemetry.io/collector/extension/storage"
+	"go.opentelemetry.io/collector/extension/experimental/storageextension"
 )
 
 var errItemIndexArrInvalidDataType = errors.New("invalid data type, expected []itemIndex")
@@ -35,16 +35,16 @@ type batchStruct struct {
 	logger *zap.Logger
 	pcs    *persistentContiguousStorage
 
-	operations    []storage.Operation
-	getOperations map[string]storage.Operation
+	operations    []storageextension.Operation
+	getOperations map[string]storageextension.Operation
 }
 
 func newBatch(pcs *persistentContiguousStorage) *batchStruct {
 	return &batchStruct{
 		logger:        pcs.logger,
 		pcs:           pcs,
-		operations:    []storage.Operation{},
-		getOperations: map[string]storage.Operation{},
+		operations:    []storageextension.Operation{},
+		getOperations: map[string]storageextension.Operation{},
 	}
 }
 
@@ -64,7 +64,7 @@ func (bof *batchStruct) set(key string, value interface{}, marshal func(interfac
 	if err != nil {
 		bof.logger.Debug("Failed marshaling item, skipping it", zap.String(zapKey, key), zap.Error(err))
 	} else {
-		bof.operations = append(bof.operations, storage.SetOperation(key, valueBytes))
+		bof.operations = append(bof.operations, storageextension.SetOperation(key, valueBytes))
 	}
 
 	return bof
@@ -73,7 +73,7 @@ func (bof *batchStruct) set(key string, value interface{}, marshal func(interfac
 // get adds a Get operation to the batch. After executing, its result will be available through getResult
 func (bof *batchStruct) get(keys ...string) *batchStruct {
 	for _, key := range keys {
-		op := storage.GetOperation(key)
+		op := storageextension.GetOperation(key)
 		bof.getOperations[key] = op
 		bof.operations = append(bof.operations, op)
 	}
@@ -84,7 +84,7 @@ func (bof *batchStruct) get(keys ...string) *batchStruct {
 // delete adds a Delete operation to the batch
 func (bof *batchStruct) delete(keys ...string) *batchStruct {
 	for _, key := range keys {
-		bof.operations = append(bof.operations, storage.DeleteOperation(key))
+		bof.operations = append(bof.operations, storageextension.DeleteOperation(key))
 	}
 
 	return bof

exporter/exporterhelper/persistent_storage_test.go

@@ -34,27 +34,27 @@ import (
 
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/config"
-	"go.opentelemetry.io/collector/extension/storage"
+	"go.opentelemetry.io/collector/extension/experimental/storageextension"
 )
 
-func createStorageExtension(_ string) storage.Extension {
+func createStorageExtension(_ string) storageextension.Extension {
 	// After having storage moved to core, we could leverage storagetest.NewTestExtension(nil, path)
 	return newMockStorageExtension()
 }
 
-func createTestClient(extension storage.Extension) storage.Client {
+func createTestClient(extension storageextension.Extension) storageextension.Client {
 	client, err := extension.GetClient(context.Background(), component.KindReceiver, config.ComponentID{}, "")
 	if err != nil {
 		panic(err)
 	}
 	return client
 }
 
-func createTestPersistentStorageWithLoggingAndCapacity(client storage.Client, logger *zap.Logger, capacity uint64) *persistentContiguousStorage {
+func createTestPersistentStorageWithLoggingAndCapacity(client storageextension.Client, logger *zap.Logger, capacity uint64) *persistentContiguousStorage {
 	return newPersistentContiguousStorage(context.Background(), "foo", capacity, logger, client, newTraceRequestUnmarshalerFunc(nopTracePusher()))
 }
 
-func createTestPersistentStorage(client storage.Client) *persistentContiguousStorage {
+func createTestPersistentStorage(client storageextension.Client) *persistentContiguousStorage {
 	logger, _ := zap.NewDevelopment()
 	return createTestPersistentStorageWithLoggingAndCapacity(client, logger, 1000)
 }
@@ -332,15 +332,15 @@ func (m mockStorageExtension) Shutdown(_ context.Context) error {
 	return nil
 }
 
-func (m mockStorageExtension) GetClient(ctx context.Context, kind component.Kind, id config.ComponentID, s string) (storage.Client, error) {
+func (m mockStorageExtension) GetClient(ctx context.Context, kind component.Kind, id config.ComponentID, s string) (storageextension.Client, error) {
 	return newMockStorageClient(), nil
 }
 
-func newMockStorageExtension() storage.Extension {
+func newMockStorageExtension() storageextension.Extension {
 	return &mockStorageExtension{}
 }
 
-func newMockStorageClient() storage.Client {
+func newMockStorageClient() storageextension.Client {
 	return &mockStorageClient{
 		st: map[string][]byte{},
 	}
@@ -383,17 +383,17 @@ func (m *mockStorageClient) Close(_ context.Context) error {
 	return nil
 }
 
-func (m *mockStorageClient) Batch(_ context.Context, ops ...storage.Operation) error {
+func (m *mockStorageClient) Batch(_ context.Context, ops ...storageextension.Operation) error {
 	m.mux.Lock()
 	defer m.mux.Unlock()
 
 	for _, op := range ops {
 		switch op.Type {
-		case storage.Get:
+		case storageextension.Get:
 			op.Value = m.st[op.Key]
-		case storage.Set:
+		case storageextension.Set:
 			m.st[op.Key] = op.Value
-		case storage.Delete:
+		case storageextension.Delete:
 			delete(m.st, op.Key)
 		default:
 			return errors.New("wrong operation type")

exporter/exporterhelper/queued_retry_experimental.go

@@ -30,7 +30,7 @@ import (
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/config"
 	"go.opentelemetry.io/collector/exporter/exporterhelper/internal"
-	"go.opentelemetry.io/collector/extension/storage"
+	"go.opentelemetry.io/collector/extension/experimental/storageextension"
 	"go.opentelemetry.io/collector/internal/obsreportconfig/obsmetrics"
 )
 
@@ -101,10 +101,10 @@ func newQueuedRetrySender(id config.ComponentID, signal config.DataType, qCfg Qu
 	return qrs
 }
 
-func getStorageClient(ctx context.Context, host component.Host, id config.ComponentID, signal config.DataType) (*storage.Client, error) {
-	var storageExtension storage.Extension
+func getStorageClient(ctx context.Context, host component.Host, id config.ComponentID, signal config.DataType) (*storageextension.Client, error) {
+	var storageExtension storageextension.Extension
 	for _, ext := range host.GetExtensions() {
-		if se, ok := ext.(storage.Extension); ok {
+		if se, ok := ext.(storageextension.Extension); ok {
 			if storageExtension != nil {
 				return nil, errMultipleStorageClients
 			}

extension/storage/README.md → extension/experimental/storageextension/README.md

@@ -4,12 +4,12 @@
 
 A storage extension persists state beyond the collector process. Other components can request a storage client from the storage extension and use it to manage state. 
 
-The `storage.Extension` interface extends `component.Extension` by adding the following method:
+The `storageextension.Extension` interface extends `component.Extension` by adding the following method:
 ```
 GetClient(context.Context, component.Kind, config.ComponentID, string) (Client, error)
 ```
 
-The `storage.Client` interface contains the following methods:
+The `storageextension.Client` interface contains the following methods:
 ```
 Get(context.Context, string) ([]byte, error)
 Set(context.Context, string, []byte) error

extension/storage/doc.go → extension/experimental/storageextension/doc.go

@@ -14,4 +14,4 @@
 
 // Package stanzareceiver implements a receiver that can be used by the
 // Opentelemetry collector to receive logs using the stanza log agent
-package storage
+package storageextension

extension/storage/nop_client.go → extension/experimental/storageextension/nop_client.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package storage
+package storageextension
 
 import "context"
 

extension/storage/storage.go → extension/experimental/storageextension/storage.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package storage
+package storageextension
 
 import (
 	"context"