Fix Yuri's comments

Signed-off-by: Pavol Loffay <ploffay@redhat.com>
jaegertracing · Aug 20, 2020 · 5b95e48 · 5b95e48
1 parent 12166c0
commit 5b95e48
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cmd/agent/app/reporter/client_metrics.go b/cmd/agent/app/reporter/client_metrics.go
@@ -122,10 +122,11 @@ func (r *ClientMetricsReporter) EmitBatch(ctx context.Context, batch *jaeger.Bat
 }
 
 // Close stops background gc goroutine for client stats map.
-func (r *ClientMetricsReporter) Close() {
+func (r *ClientMetricsReporter) Close() error {
 	if r.closed.CAS(false, true) {
 		close(r.shutdown)
 	}
+	return nil
 }
 
 func (r *ClientMetricsReporter) expireClientMetricsLoop() {

diff --git a/cmd/agent/app/reporter/grpc/collector_proxy.go b/cmd/agent/app/reporter/grpc/collector_proxy.go
@@ -24,6 +24,7 @@ import (
 	"github.com/jaegertracing/jaeger/cmd/agent/app/configmanager"
 	grpcManager "github.com/jaegertracing/jaeger/cmd/agent/app/configmanager/grpc"
 	"github.com/jaegertracing/jaeger/cmd/agent/app/reporter"
+	"github.com/jaegertracing/jaeger/pkg/multicloser"
 )
 
 // ProxyBuilder holds objects communicating with collector
@@ -73,7 +74,5 @@ func (b ProxyBuilder) GetManager() configmanager.ClientConfigManager {
 
 // Close closes connections used by proxy.
 func (b ProxyBuilder) Close() error {
-	b.reporter.Close()
-	b.tlsCloser.Close()
-	return b.conn.Close()
+	return multicloser.Wrap(b.reporter, b.tlsCloser, b.GetConn()).Close()
 }