Fix test

open-telemetry · Oct 15, 2024 · 963ef11 · 963ef11
1 parent ded40cf
commit 963ef11
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/exporter/exporterhelper/internal/base_exporter.go b/exporter/exporterhelper/internal/base_exporter.go
@@ -106,6 +106,10 @@ func NewBaseExporter(set exporter.Settings, signal pipeline.Signal, osf ObsrepSe
 
 	if be.BatcherCfg.Enabled {
 		bs := NewBatchSender(be.BatcherCfg, be.Set, be.BatchMergeFunc, be.BatchMergeSplitfunc)
+		if bs.mergeFunc == nil || bs.mergeSplitFunc == nil {
+			err = multierr.Append(err, fmt.Errorf("Batch merge function has to be provided"))
+		}
+		be.BatchSender = bs
 		if !be.queueCfg.Enabled {
 			be.BatchSender = bs
 		}

diff --git a/exporter/exporterhelper/internal/queue_sender_test.go b/exporter/exporterhelper/internal/queue_sender_test.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.opentelemetry.io/otel/attribute"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zaptest/observer"
 
@@ -24,7 +25,6 @@ import (
 	"go.opentelemetry.io/collector/exporter/internal"
 	"go.opentelemetry.io/collector/exporter/internal/queue"
 	"go.opentelemetry.io/collector/pipeline"
-	"go.opentelemetry.io/otel/attribute"
 )
 
 func TestQueuedRetry_StopWhileWaiting(t *testing.T) {