grpc
/
grpc-go
mirror of https://github.com/grpc/grpc-go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xds: de-experimentalize google c2p resolver (#5707)

This commit is contained in:
apolcyn 2022-10-12 12:57:55 -07:00 committed by GitHub
parent 8b3b10bd04
commit 9eba57430c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
xds/googledirectpath/googlec2p.go
View File

@ -47,7 +47,8 @@ import (
)
const (
c2pScheme = "google-c2p-experimental"
c2pScheme = "google-c2p"
c2pExperimentalScheme = "google-c2p-experimental"
tdURL = "dns:///directpath-pa.googleapis.com"
httpReqTimeout = 10 * time.Second
@ -75,10 +76,18 @@ var (
)
func init() {
resolver.Register(c2pResolverBuilder{})
resolver.Register(c2pResolverBuilder{
scheme: c2pScheme,
})
// TODO(apolcyn): remove this experimental scheme before the 1.52 release
resolver.Register(c2pResolverBuilder{
scheme: c2pExperimentalScheme,
})
}
type c2pResolverBuilder struct{}
type c2pResolverBuilder struct {
scheme string
}
func (c2pResolverBuilder) Build(t resolver.Target, cc resolver.ClientConn, opts resolver.BuildOptions) (resolver.Resolver, error) {
if !runDirectPath() {
@ -131,8 +140,8 @@ func (c2pResolverBuilder) Build(t resolver.Target, cc resolver.ClientConn, opts
}, nil
}
func (c2pResolverBuilder) Scheme() string {
return c2pScheme
func (b c2pResolverBuilder) Scheme() string {
return b.scheme
}
type c2pResolver struct {