Revert "[chore] remove pkg/multicloser (jaegertracing#4291)"

This reverts commit a172bcc.

Signed-off-by: Pablo Baeyens <pablo.baeyens@datadoghq.com>

Author: mx-psi

cmd/agent/app/reporter/grpc/collector_proxy.go

@@ -15,7 +15,6 @@
 package grpc
 
 import (
-	"errors"
 	"io"
 
 	"go.uber.org/zap"
@@ -25,6 +24,7 @@ import (
 	grpcManager "github.com/jaegertracing/jaeger/cmd/agent/app/configmanager/grpc"
 	"github.com/jaegertracing/jaeger/cmd/agent/app/reporter"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
+	"github.com/jaegertracing/jaeger/pkg/multicloser"
 )
 
 // ProxyBuilder holds objects communicating with collector
@@ -74,9 +74,5 @@ func (b ProxyBuilder) GetManager() configmanager.ClientConfigManager {
 
 // Close closes connections used by proxy.
 func (b ProxyBuilder) Close() error {
-	return errors.Join(
-		b.reporter.Close(),
-		b.tlsCloser.Close(),
-		b.GetConn().Close(),
-	)
+	return multicloser.Wrap(b.reporter, b.tlsCloser, b.GetConn()).Close()
 }

pkg/multicloser/multicloser.go

@@ -0,0 +1,50 @@
+// Copyright (c) 2020 The Jaeger Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package multicloser
+
+import (
+	"io"
+
+	"github.com/jaegertracing/jaeger/pkg/multierror"
+)
+
+// MultiCloser wraps multiple io.Closer interfaces
+type MultiCloser struct {
+	closers []io.Closer
+}
+
+var _ io.Closer = (*MultiCloser)(nil)
+
+// Close implements io.Closer
+func (m MultiCloser) Close() error {
+	var errs []error
+	for _, c := range m.closers {
+		if c == nil {
+			continue
+		}
+		err := c.Close()
+		if err != nil {
+			errs = append(errs, err)
+		}
+	}
+	return multierror.Wrap(errs)
+}
+
+// Wrap creates io.Closer that encapsulates multiple io.Closer interfaces
+func Wrap(closers ...io.Closer) *MultiCloser {
+	return &MultiCloser{
+		closers: closers,
+	}
+}

pkg/multicloser/multicloser_test.go

@@ -0,0 +1,64 @@
+// Copyright (c) 2020 The Jaeger Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package multicloser
+
+import (
+	"fmt"
+	"io"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestCloser(t *testing.T) {
+	expectedErr := "some error"
+	tests := []struct {
+		closer      io.Closer
+		expectedErr string
+	}{
+		{
+			closer: Wrap(testCloser{}, testCloser{}),
+		},
+		{
+			closer:      Wrap(testCloser{}, testCloser{fmt.Errorf(expectedErr)}),
+			expectedErr: expectedErr,
+		},
+		{
+			closer:      Wrap(testCloser{fmt.Errorf(expectedErr)}, testCloser{fmt.Errorf(expectedErr)}),
+			expectedErr: fmt.Sprintf("[%v, %v]", expectedErr, expectedErr),
+		},
+		{
+			closer: Wrap(nil),
+		},
+	}
+	for _, test := range tests {
+		err := test.closer.Close()
+		if test.expectedErr == "" {
+			assert.Nil(t, err)
+		} else {
+			assert.EqualError(t, err, test.expectedErr)
+		}
+	}
+}
+
+type testCloser struct {
+	err error
+}
+
+var _ io.Closer = (*testCloser)(nil)
+
+func (t testCloser) Close() error {
+	return t.err
+}