Component error: apply 5cc0707 changes

Apply 5cc0707 to component/componenterror.

component/componenterror/errors.go

@@ -18,8 +18,6 @@ package componenterror
 
 import (
 	"errors"
-	"fmt"
-	"strings"
 
 	"go.opentelemetry.io/collector/consumer/consumererror"
 )
@@ -38,27 +36,5 @@ var (
 // CombineErrors converts a list of errors into one error.
 // Deprecated: use consumererror.CombineErrors instead.
 func CombineErrors(errs []error) error {
-	numErrors := len(errs)
-	if numErrors == 0 {
-		// No errors
-		return nil
-	}
-
-	if numErrors == 1 {
-		return errs[0]
-	}
-
-	errMsgs := make([]string, 0, numErrors)
-	permanent := false
-	for _, err := range errs {
-		if !permanent && consumererror.IsPermanent(err) {
-			permanent = true
-		}
-		errMsgs = append(errMsgs, err.Error())
-	}
-	err := fmt.Errorf("[%s]", strings.Join(errMsgs, "; "))
-	if permanent {
-		err = consumererror.Permanent(err)
-	}
-	return err
+	return consumererror.CombineErrors(errs)
 }

consumer/consumererror/combineerrors.go

@@ -20,8 +20,6 @@ import (
 )
 
 // CombineErrors converts a list of errors into one error.
-//
-// TODO: deprecate componenterror.CombineErrors in favor of this function.
 func CombineErrors(errs []error) error {
 	numErrors := len(errs)
 	if numErrors == 0 {