Fix merge

exporter/exporterhelper/common.go

@@ -5,8 +5,6 @@ package exporterhelper // import "go.opentelemetry.io/collector/exporter/exporte
 
 import (
 	"context"
-	"time"
-
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/consumer"
 	"go.opentelemetry.io/collector/exporter"
@@ -232,21 +230,3 @@ func (be *baseExporter) setOnTemporaryFailure(onTemporaryFailure onRequestHandli
 		rs.onTemporaryFailure = onTemporaryFailure
 	}
 }
-
-// timeoutSender is a requestSender that adds a `timeout` to every request that passes this sender.
-type timeoutSender struct {
-	baseRequestSender
-	cfg TimeoutSettings
-}
-
-func (ts *timeoutSender) send(req internal.Request) error {
-	// Intentionally don't overwrite the context inside the request, because in case of retries deadline will not be
-	// updated because this deadline most likely is before the next one.
-	ctx := req.Context()
-	if ts.cfg.Timeout > 0 {
-		var cancelFunc func()
-		ctx, cancelFunc = context.WithTimeout(req.Context(), ts.cfg.Timeout)
-		defer cancelFunc()
-	}
-	return req.Export(ctx)
-}