diff --git a/src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc b/src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc index fa29ecea817..cb01a3e3c2b 100644 --- a/src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc @@ -362,20 +362,15 @@ class GoogleCloud2ProdResolverFactory : public ResolverFactory { return MakeOrphanable(std::move(args)); } - const char* scheme() const override { return "google-c2p"; } + // TODO(roth): Remove experimental suffix once this code is proven stable. + const char* scheme() const override { return "google-c2p-experimental"; } }; } // namespace void GoogleCloud2ProdResolverInit() { - // TODO(roth): Remove env var protection once this code is proven stable. - UniquePtr value(gpr_getenv("GRPC_EXPERIMENTAL_GOOGLE_C2P_RESOLVER")); - bool parsed_value; - bool parse_succeeded = gpr_parse_bool_value(value.get(), &parsed_value); - if (parse_succeeded && parsed_value) { - ResolverRegistry::Builder::RegisterResolverFactory( - absl::make_unique()); - } + ResolverRegistry::Builder::RegisterResolverFactory( + absl::make_unique()); } void GoogleCloud2ProdResolverShutdown() {}