Use withResolver API in gRPC reporter (#3078)

* Use withResolver API in gRPC reporter

Signed-off-by: Pavol Loffay <[email protected]>

* Use manual

Signed-off-by: Pavol Loffay <[email protected]>

* fmt

Signed-off-by: Pavol Loffay <[email protected]>

Author: pavolloffay

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

@@ -18,9 +18,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"strconv"
 	"strings"
-	"time"
 
 	grpc_retry "github.com/grpc-ecosystem/go-grpc-middleware/retry"
 	"github.com/uber/jaeger-lib/metrics"
@@ -82,7 +80,8 @@ func (b *ConnBuilder) CreateConnection(logger *zap.Logger, mFactory metrics.Fact
 			return nil, errors.New("at least one collector hostPort address is required when resolver is not available")
 		}
 		if len(b.CollectorHostPorts) > 1 {
-			r, _ := generateAndRegisterManualResolver()
+			r := manual.NewBuilderWithScheme("jaeger_manual")
+			dialOptions = append(dialOptions, grpc.WithResolvers(r))
 			var resolvedAddrs []resolver.Address
 			for _, addr := range b.CollectorHostPorts {
 				resolvedAddrs = append(resolvedAddrs, resolver.Address{Addr: addr})
@@ -125,12 +124,3 @@ func (b *ConnBuilder) CreateConnection(logger *zap.Logger, mFactory metrics.Fact
 
 	return conn, nil
 }
-
-// generateAndRegisterManualResolver was removed from grpc.
-// Copied here to keep behavior the same.
-func generateAndRegisterManualResolver() (*manual.Resolver, func()) {
-	scheme := strconv.FormatInt(time.Now().UnixNano(), 36)
-	r := manual.NewBuilderWithScheme(scheme)
-	resolver.Register(r)
-	return r, func() { resolver.UnregisterForTesting(scheme) }
-}