From cda6406b3de69a454f48ca2310917a8867af71d3 Mon Sep 17 00:00:00 2001
From: Curtis Robert <crobert@splunk.com>
Date: Wed, 24 Jan 2024 13:14:45 -0800
Subject: [PATCH] Change requested in PR: Move to errors.join

---
 receiver/otlpreceiver/go.mod  | 2 +-
 receiver/otlpreceiver/otlp.go | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod
index b6afac671f0..0d6e111ef9c 100644
--- a/receiver/otlpreceiver/go.mod
+++ b/receiver/otlpreceiver/go.mod
@@ -19,7 +19,6 @@ require (
 	go.opentelemetry.io/otel/metric v1.22.0
 	go.opentelemetry.io/otel/trace v1.22.0
 	go.uber.org/goleak v1.3.0
-	go.uber.org/multierr v1.11.0
 	go.uber.org/zap v1.26.0
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4
 	google.golang.org/grpc v1.60.1
@@ -82,6 +81,7 @@ require (
 	go.opentelemetry.io/otel/sdk v1.22.0 // indirect
 	go.opentelemetry.io/otel/sdk/metric v1.22.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/net v0.20.0 // indirect
 	golang.org/x/sys v0.16.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
diff --git a/receiver/otlpreceiver/otlp.go b/receiver/otlpreceiver/otlp.go
index a8f2b12e3ee..b302ae56387 100644
--- a/receiver/otlpreceiver/otlp.go
+++ b/receiver/otlpreceiver/otlp.go
@@ -10,7 +10,6 @@ import (
 	"net/http"
 	"sync"
 
-	"go.uber.org/multierr"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 
@@ -177,7 +176,7 @@ func (r *otlpReceiver) Start(ctx context.Context, host component.Host) error {
 		// It's possible that a valid GRPC server configuration was specified,
 		// but an invalid HTTP configuration. If that's the case, the successfully
 		// started GRPC server must be shutdown to ensure no goroutines are leaked.
-		return multierr.Append(err, r.Shutdown(ctx))
+		return errors.Join(err, r.Shutdown(ctx))
 	}
 
 	return nil