Merge pull request #569 from ydb-platform/grpc-resolver-1-53

* Fixed compilation of package `internal/xresolver` with `google.gola…

Author: asmyasnikov

CHANGELOG.md

@@ -4,6 +4,7 @@
 * Fixed bug with initialization of connection pool before apply static credentials
 * Refactored of applying grpc dial options with defaults
 * Added `trace.Driver.{OnBalancerDialEntrypoint,OnBalancerClusterDiscoveryAttempt}` trace events
+* Fixed compilation of package `internal/xresolver` with `google.golang.org/[email protected]`
 
 ## v3.42.8
 * Fixed `internal/scheme/helpers/IsDirectoryExists(..)` recursive bug

internal/xresolver/xresolver.go

@@ -1,6 +1,8 @@
 package xresolver
 
 import (
+	"strings"
+
 	"google.golang.org/grpc/resolver"
 
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
@@ -19,39 +21,41 @@ type clientConn struct {
 	trace  trace.Driver
 }
 
+func (c *clientConn) Endpoint() string {
+	endpoint := c.target.URL.Path
+	if endpoint == "" {
+		endpoint = c.target.URL.Opaque
+	}
+	return strings.TrimPrefix(endpoint, "/")
+}
+
 func (c *clientConn) UpdateState(state resolver.State) (err error) {
-	onDone := trace.DriverOnResolve(
-		c.trace,
-		//nolint:staticcheck
-		//nolint:nolintlint
-		c.target.Endpoint,
-		func() (addrs []string) {
-			for _, a := range state.Addresses {
-				addrs = append(addrs, a.Addr)
-			}
-			return
-		}(),
-	)
+	onDone := trace.DriverOnResolve(c.trace, c.Endpoint(), func() (addrs []string) {
+		for _, a := range state.Addresses {
+			addrs = append(addrs, a.Addr)
+		}
+		return
+	}())
 	defer func() {
 		onDone(err)
 	}()
-	return xerrors.WithStackTrace(c.ClientConn.UpdateState(state))
+	err = c.ClientConn.UpdateState(state)
+	if err != nil {
+		return xerrors.WithStackTrace(err)
+	}
+	return nil
 }
 
 func (d *dnsBuilder) Build(
 	target resolver.Target,
 	cc resolver.ClientConn,
 	opts resolver.BuildOptions,
 ) (resolver.Resolver, error) {
-	return d.Builder.Build(
-		target,
-		&clientConn{
-			ClientConn: cc,
-			target:     target,
-			trace:      d.trace,
-		},
-		opts,
-	)
+	return d.Builder.Build(target, &clientConn{
+		ClientConn: cc,
+		target:     target,
+		trace:      d.trace,
+	}, opts)
 }
 
 func (d *dnsBuilder) Scheme() string {