Remove Queue.IsPersistent, not needed (#8875)

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
open-telemetry · Nov 14, 2023 · 6a38ea7 · 6a38ea7
1 parent 6a99f87
commit 6a38ea7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 15 deletions.
diff --git a/exporter/exporterhelper/internal/bounded_memory_queue.go b/exporter/exporterhelper/internal/bounded_memory_queue.go
@@ -81,7 +81,3 @@ func (q *boundedMemoryQueue) Size() int {
 func (q *boundedMemoryQueue) Capacity() int {
 	return cap(q.items)
 }
-
-func (q *boundedMemoryQueue) IsPersistent() bool {
-	return false
-}
diff --git a/exporter/exporterhelper/internal/persistent_queue.go b/exporter/exporterhelper/internal/persistent_queue.go
@@ -107,10 +107,6 @@ func (pq *persistentQueue) Capacity() int {
 	return int(pq.capacity)
 }
 
-func (pq *persistentQueue) IsPersistent() bool {
-	return true
-}
-
 func toStorageClient(ctx context.Context, storageID component.ID, host component.Host, ownerID component.ID, signal component.DataType) (storage.Client, error) {
 	extension, err := getStorageExtension(host.GetExtensions(), storageID)
 	if err != nil {

diff --git a/exporter/exporterhelper/internal/queue.go b/exporter/exporterhelper/internal/queue.go
@@ -31,7 +31,4 @@ type Queue interface {
 	Shutdown(ctx context.Context) error
 	// Capacity returns the capacity of the queue.
 	Capacity() int
-	// IsPersistent returns true if the queue is persistent.
-	// TODO: Do not expose this method if the interface moves to a public package.
-	IsPersistent() bool
 }
diff --git a/exporter/exporterhelper/queue_sender.go b/exporter/exporterhelper/queue_sender.go
@@ -88,12 +88,14 @@ type queueSender struct {
 
 func newQueueSender(config QueueSettings, set exporter.CreateSettings, signal component.DataType,
 	marshaler RequestMarshaler, unmarshaler RequestUnmarshaler) *queueSender {
+
+	isPersistent := config.StorageID != nil
 	var queue internal.Queue
-	if config.StorageID == nil {
-		queue = internal.NewBoundedMemoryQueue(config.QueueSize, config.NumConsumers)
-	} else {
+	if isPersistent {
 		queue = internal.NewPersistentQueue(config.QueueSize, config.NumConsumers, *config.StorageID,
 			queueRequestMarshaler(marshaler), queueRequestUnmarshaler(unmarshaler), set)
+	} else {
+		queue = internal.NewBoundedMemoryQueue(config.QueueSize, config.NumConsumers)
 	}
 	return &queueSender{
 		fullName:       set.ID.String(),
@@ -103,7 +105,7 @@ func newQueueSender(config QueueSettings, set exporter.CreateSettings, signal co
 		logger:         set.TelemetrySettings.Logger,
 		meter:          set.TelemetrySettings.MeterProvider.Meter(scopeName),
 		// TODO: this can be further exposed as a config param rather than relying on a type of queue
-		requeuingEnabled: queue.IsPersistent(),
+		requeuingEnabled: isPersistent,
 	}
 }