From dd8885b14cab7f1a484dffb7df2aca0cb4875d84 Mon Sep 17 00:00:00 2001 From: Alexander Polcyn Date: Mon, 10 Oct 2022 19:41:47 +0000 Subject: [PATCH 1/2] De-experimentalize google c2p resolver --- xds/googledirectpath/googlec2p.go | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/xds/googledirectpath/googlec2p.go b/xds/googledirectpath/googlec2p.go index d759d25c851..1c53c0f6543 100644 --- a/xds/googledirectpath/googlec2p.go +++ b/xds/googledirectpath/googlec2p.go @@ -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 { From 392fb4838f9633e4dbb1c4a027657cdc694cf52e Mon Sep 17 00:00:00 2001 From: Alexander Polcyn Date: Mon, 10 Oct 2022 20:54:01 +0000 Subject: [PATCH 2/2] fix build --- xds/googledirectpath/googlec2p.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xds/googledirectpath/googlec2p.go b/xds/googledirectpath/googlec2p.go index 1c53c0f6543..ef86f7b56c5 100644 --- a/xds/googledirectpath/googlec2p.go +++ b/xds/googledirectpath/googlec2p.go @@ -140,7 +140,7 @@ func (c2pResolverBuilder) Build(t resolver.Target, cc resolver.ClientConn, opts }, nil } -func (b *c2pResolverBuilder) Scheme() string { +func (b c2pResolverBuilder) Scheme() string { return b.scheme }