[chore] update code to use WithoutCancel (#10397)

This was introduced in go 1.21 and removes the need for a custom
implementation of the context.

Fixes #9049

Signed-off-by: Alex Boten <[email protected]>

Author: codeboten

exporter/exporterhelper/obsexporter.go

@@ -69,7 +69,7 @@ func (or *ObsReport) StartTracesOp(ctx context.Context) context.Context {
 // EndTracesOp completes the export operation that was started with StartTracesOp.
 func (or *ObsReport) EndTracesOp(ctx context.Context, numSpans int, err error) {
 	numSent, numFailedToSend := toNumItems(numSpans, err)
-	or.recordMetrics(noCancellationContext{Context: ctx}, component.DataTypeTraces, numSent, numFailedToSend)
+	or.recordMetrics(context.WithoutCancel(ctx), component.DataTypeTraces, numSent, numFailedToSend)
 	endSpan(ctx, err, numSent, numFailedToSend, obsmetrics.SentSpansKey, obsmetrics.FailedToSendSpansKey)
 }
 
@@ -84,7 +84,7 @@ func (or *ObsReport) StartMetricsOp(ctx context.Context) context.Context {
 // StartMetricsOp.
 func (or *ObsReport) EndMetricsOp(ctx context.Context, numMetricPoints int, err error) {
 	numSent, numFailedToSend := toNumItems(numMetricPoints, err)
-	or.recordMetrics(noCancellationContext{Context: ctx}, component.DataTypeMetrics, numSent, numFailedToSend)
+	or.recordMetrics(context.WithoutCancel(ctx), component.DataTypeMetrics, numSent, numFailedToSend)
 	endSpan(ctx, err, numSent, numFailedToSend, obsmetrics.SentMetricPointsKey, obsmetrics.FailedToSendMetricPointsKey)
 }
 
@@ -98,7 +98,7 @@ func (or *ObsReport) StartLogsOp(ctx context.Context) context.Context {
 // EndLogsOp completes the export operation that was started with StartLogsOp.
 func (or *ObsReport) EndLogsOp(ctx context.Context, numLogRecords int, err error) {
 	numSent, numFailedToSend := toNumItems(numLogRecords, err)
-	or.recordMetrics(noCancellationContext{Context: ctx}, component.DataTypeLogs, numSent, numFailedToSend)
+	or.recordMetrics(context.WithoutCancel(ctx), component.DataTypeLogs, numSent, numFailedToSend)
 	endSpan(ctx, err, numSent, numFailedToSend, obsmetrics.SentLogRecordsKey, obsmetrics.FailedToSendLogRecordsKey)
 }
 

exporter/exporterhelper/queue_sender.go

@@ -6,7 +6,6 @@ package exporterhelper // import "go.opentelemetry.io/collector/exporter/exporte
 import (
 	"context"
 	"errors"
-	"time"
 
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
@@ -120,7 +119,7 @@ func (qs *queueSender) Shutdown(ctx context.Context) error {
 func (qs *queueSender) send(ctx context.Context, req Request) error {
 	// Prevent cancellation and deadline to propagate to the context stored in the queue.
 	// The grpc/http based receivers will cancel the request context after this function returns.
-	c := noCancellationContext{Context: ctx}
+	c := context.WithoutCancel(ctx)
 
 	span := trace.SpanFromContext(c)
 	if err := qs.queue.Offer(c, req); err != nil {
@@ -131,19 +130,3 @@ func (qs *queueSender) send(ctx context.Context, req Request) error {
 	span.AddEvent("Enqueued item.", trace.WithAttributes(qs.traceAttribute))
 	return nil
 }
-
-type noCancellationContext struct {
-	context.Context
-}
-
-func (noCancellationContext) Deadline() (deadline time.Time, ok bool) {
-	return
-}
-
-func (noCancellationContext) Done() <-chan struct{} {
-	return nil
-}
-
-func (noCancellationContext) Err() error {
-	return nil
-}

exporter/exporterhelper/queue_sender_test.go

@@ -235,7 +235,7 @@ func TestNoCancellationContext(t *testing.T) {
 	require.True(t, ok)
 	require.Equal(t, deadline, d)
 
-	nctx := noCancellationContext{Context: ctx}
+	nctx := context.WithoutCancel(ctx)
 	assert.NoError(t, nctx.Err())
 	d, ok = nctx.Deadline()
 	assert.False(t, ok)