Fix failing tests

Author: sfc-gh-sili

exporter/exporterhelper/internal/batch_sender_test.go

@@ -485,7 +485,7 @@ func TestBatchSender_BatchCancelled(t *testing.T) {
 			require.NoError(t, be.Shutdown(context.Background()))
 		})
 	}
-	runTest("enable_queue_batcher", true)
+	// When queue_batcher is enabled, we don't cancel the whole batch when the first request is canceled.
 	runTest("disable_queue_batcher", false)
 }
 

exporter/exporterhelper/internal/batcher/default_batcher.go

@@ -86,7 +86,7 @@ func (qb *defaultBatcher) Consume(ctx context.Context, req request.Request, done
 			// Do not flush the last item and add it to the current batch.
 			reqList = reqList[:len(reqList)-1]
 			qb.currentBatch = &batch{
-				ctx:  NewMergedContext(ctx),
+				ctx:  newMergedContext(ctx),
 				req:  lastReq,
 				done: multiDone{done},
 			}
@@ -142,7 +142,7 @@ func (qb *defaultBatcher) Consume(ctx context.Context, req request.Request, done
 			// Do not flush the last item and add it to the current batch.
 			reqList = reqList[:len(reqList)-1]
 			qb.currentBatch = &batch{
-				ctx:  NewMergedContext(ctx),
+				ctx:  newMergedContext(ctx),
 				req:  lastReq,
 				done: multiDone{done},
 			}

exporter/exporterhelper/internal/batcher/merged_context.go

@@ -11,36 +11,41 @@ import (
 
 // mergedContext links the underlying context to all incoming span contexts.
 type mergedContext struct {
-	deadline   time.Time
-	deadlineOk bool
-	ctx        context.Context
+	deadline    time.Time
+	deadlineOk  bool
+	deadlineCtx context.Context
+	ctx         context.Context
 }
 
-func NewMergedContext(ctx context.Context) mergedContext {
+func newMergedContext(ctx context.Context) mergedContext {
 	deadline, ok := ctx.Deadline()
 	return mergedContext{
-		deadline:   deadline,
-		deadlineOk: ok,
-		ctx:        ctx,
+		deadline:    deadline,
+		deadlineOk:  ok,
+		deadlineCtx: ctx,
+		ctx:         ctx,
 	}
 }
 
 // Merge links the span from incoming context to the span from the first context.
 func (mc *mergedContext) Merge(other context.Context) mergedContext {
 	deadline, deadlineOk := mc.Deadline()
+	ctx := mc.deadlineCtx
 	if otherDeadline, ok := other.Deadline(); ok {
 		deadlineOk = true
 		if deadline.Before(otherDeadline) {
 			deadline = otherDeadline
+			ctx = other
 		}
 	}
 
 	link := trace.LinkFromContext(other)
 	trace.SpanFromContext(mc.ctx).AddLink(link)
 	return mergedContext{
-		deadline:   deadline,
-		deadlineOk: deadlineOk,
-		ctx:        mc.ctx,
+		deadline:    deadline,
+		deadlineOk:  deadlineOk,
+		deadlineCtx: ctx,
+		ctx:         mc.ctx,
 	}
 }
 
@@ -50,11 +55,11 @@ func (mc mergedContext) Deadline() (time.Time, bool) {
 }
 
 func (mc mergedContext) Done() <-chan struct{} {
-	return nil
+	return mc.deadlineCtx.Done()
 }
 
 func (mc mergedContext) Err() error {
-	return nil
+	return mc.deadlineCtx.Err()
 }
 
 // Value delegates to the first context.

exporter/exporterhelper/internal/batcher/merged_context_test.go

@@ -9,17 +9,20 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
-	"go.opentelemetry.io/collector/component/componenttest"
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 	"go.opentelemetry.io/otel/trace"
+
+	"go.opentelemetry.io/collector/component/componenttest"
 )
 
 func TestMergedContextDeadline(t *testing.T) {
 	now := time.Now()
 	ctx1 := context.Background()
-	mergedContext := NewMergedContext(ctx1)
+	mergedContext := newMergedContext(ctx1)
 
+	var ok bool
 	deadline, ok := mergedContext.Deadline()
+	require.Equal(t, time.Time{}, deadline)
 	require.False(t, ok)
 
 	ctx2, cancel2 := context.WithDeadline(context.Background(), now.Add(200))
@@ -40,17 +43,20 @@ func TestMergedContextDeadline(t *testing.T) {
 	deadline, ok = mergedContext.Deadline()
 	require.True(t, ok)
 	require.Equal(t, now.Add(300), deadline)
+
+	time.Sleep(300)
+	require.Equal(t, ctx3.Err(), mergedContext.Err())
 }
 
 func TestMergedContextLink(t *testing.T) {
 	tracerProvider := componenttest.NewTelemetry().NewTelemetrySettings().TracerProvider
 	tracer := tracerProvider.Tracer("go.opentelemetry.io/collector/exporter/exporterhelper")
 
-	ctx1 := context.WithValue(context.Background(), "key", "value")
+	ctx1 := context.Background()
 	ctx2, span2 := tracer.Start(ctx1, "span2")
 	defer span2.End()
 
-	mergedContext := NewMergedContext(ctx2)
+	mergedContext := newMergedContext(ctx2)
 	ctx3, span3 := tracer.Start(ctx1, "span3")
 	defer span3.End()
 	mergedContext = mergedContext.Merge(ctx3)