Skip to content

[chore] remove pkg/multicloser #4291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yurishkuro merged 1 commit into from
Mar 11, 2023
Merged

[chore] remove pkg/multicloser #4291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions cmd/agent/app/reporter/grpc/collector_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
package grpc

import (
"errors"
"io"

"go.uber.org/zap"
Expand All @@ -24,7 +25,6 @@ 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
Expand Down Expand Up @@ -74,5 +74,9 @@ func (b ProxyBuilder) GetManager() configmanager.ClientConfigManager {

// Close closes connections used by proxy.
func (b ProxyBuilder) Close() error {
return multicloser.Wrap(b.reporter, b.tlsCloser, b.GetConn()).Close()
return errors.Join(
b.reporter.Close(),
b.tlsCloser.Close(),
b.GetConn().Close(),
)
}
50 changes: 0 additions & 50 deletions pkg/multicloser/multicloser.go
View file
Open in desktop

This file was deleted.

64 changes: 0 additions & 64 deletions pkg/multicloser/multicloser_test.go
View file
Open in desktop

This file was deleted.