fix: add internal.UserSetDefaultScheme to clientconn.go

grpc · Mar 1, 2024 · 5b9e5d3 · 5b9e5d3
1 parent 20d1967
commit 5b9e5d3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/clientconn.go b/clientconn.go
@@ -712,6 +712,7 @@ func init() {
 	internal.ExitIdleModeForTesting = func(cc *ClientConn) error {
 		return cc.idlenessMgr.ExitIdleMode()
 	}
+	internal.UserSetDefaultScheme = resolver.GetDefaultScheme() != "dns"
 }
 
 func (cc *ClientConn) maybeApplyDefaultServiceConfig(addrs []resolver.Address) {

diff --git a/resolver/resolver.go b/resolver/resolver.go
@@ -23,7 +23,6 @@ package resolver
 import (
 	"context"
 	"fmt"
-	"google.golang.org/grpc/internal"
 	"net"
 	"net/url"
 	"strings"
@@ -70,7 +69,6 @@ func Get(scheme string) Builder {
 // an init() function), and is not thread-safe. The scheme set last overrides
 // previously set values.
 func SetDefaultScheme(scheme string) {
-	internal.UserSetDefaultScheme = true
 	defaultScheme = scheme
 }