xds: Revert CdsLb to XdsDepManager, and follow-up commits (v1.74.x)

api/src/main/java/io/grpc/NameResolver.java

@@ -303,7 +303,6 @@ public static final class Args {
     @Nullable private final Executor executor;
     @Nullable private final String overrideAuthority;
     @Nullable private final MetricRecorder metricRecorder;
-    @Nullable private final NameResolverRegistry nameResolverRegistry;
     @Nullable private final IdentityHashMap<Key<?>, Object> customArgs;
 
     private Args(Builder builder) {
@@ -317,7 +316,6 @@ private Args(Builder builder) {
       this.executor = builder.executor;
       this.overrideAuthority = builder.overrideAuthority;
       this.metricRecorder = builder.metricRecorder;
-      this.nameResolverRegistry = builder.nameResolverRegistry;
       this.customArgs = cloneCustomArgs(builder.customArgs);
     }
 
@@ -449,18 +447,6 @@ public MetricRecorder getMetricRecorder() {
       return metricRecorder;
     }
 
-    /**
-     * Returns the {@link NameResolverRegistry} that the Channel uses to look for {@link
-     * NameResolver}s.
-     *
-     * @since 1.74.0
-     */
-    public NameResolverRegistry getNameResolverRegistry() {
-      if (nameResolverRegistry == null) {
-        throw new IllegalStateException("NameResolverRegistry is not set in Builder");
-      }
-      return nameResolverRegistry;
-    }
 
     @Override
     public String toString() {
@@ -475,7 +461,6 @@ public String toString() {
           .add("executor", executor)
           .add("overrideAuthority", overrideAuthority)
           .add("metricRecorder", metricRecorder)
-          .add("nameResolverRegistry", nameResolverRegistry)
           .toString();
     }
 
@@ -495,7 +480,6 @@ public Builder toBuilder() {
       builder.setOffloadExecutor(executor);
       builder.setOverrideAuthority(overrideAuthority);
       builder.setMetricRecorder(metricRecorder);
-      builder.setNameResolverRegistry(nameResolverRegistry);
       builder.customArgs = cloneCustomArgs(customArgs);
       return builder;
     }
@@ -524,7 +508,6 @@ public static final class Builder {
       private Executor executor;
       private String overrideAuthority;
       private MetricRecorder metricRecorder;
-      private NameResolverRegistry nameResolverRegistry;
       private IdentityHashMap<Key<?>, Object> customArgs;
 
       Builder() {
@@ -631,16 +614,6 @@ public Builder setMetricRecorder(MetricRecorder metricRecorder) {
         return this;
       }
 
-      /**
-       * See {@link Args#getNameResolverRegistry}.  This is an optional field.
-       *
-       * @since 1.74.0
-       */
-      public Builder setNameResolverRegistry(NameResolverRegistry registry) {
-        this.nameResolverRegistry = registry;
-        return this;
-      }
-
       /**
        * Builds an {@link Args}.
        *

core/src/main/java/io/grpc/internal/ManagedChannelImpl.java

@@ -597,8 +597,7 @@ ClientStream newSubstream(
             .setChannelLogger(channelLogger)
             .setOffloadExecutor(this.offloadExecutorHolder)
             .setOverrideAuthority(this.authorityOverride)
-            .setMetricRecorder(this.metricRecorder)
-            .setNameResolverRegistry(builder.nameResolverRegistry);
+            .setMetricRecorder(this.metricRecorder);
     builder.copyAllNameResolverCustomArgsTo(nameResolverArgsBuilder);
     this.nameResolverArgs = nameResolverArgsBuilder.build();
     this.nameResolver = getNameResolver(
@@ -686,7 +685,11 @@ static NameResolver getNameResolver(
     // We wrap the name resolver in a RetryingNameResolver to give it the ability to retry failures.
     // TODO: After a transition period, all NameResolver implementations that need retry should use
     //       RetryingNameResolver directly and this step can be removed.
-    NameResolver usedNameResolver = RetryingNameResolver.wrap(resolver, nameResolverArgs);
+    NameResolver usedNameResolver = new RetryingNameResolver(resolver,
+          new BackoffPolicyRetryScheduler(new ExponentialBackoffPolicy.Provider(),
+              nameResolverArgs.getScheduledExecutorService(),
+              nameResolverArgs.getSynchronizationContext()),
+          nameResolverArgs.getSynchronizationContext());
 
     if (overrideAuthority == null) {
       return usedNameResolver;

core/src/main/java/io/grpc/internal/RetryingNameResolver.java

@@ -27,22 +27,13 @@
  *
  * <p>The {@link NameResolver} used with this
  */
-public final class RetryingNameResolver extends ForwardingNameResolver {
-  public static NameResolver wrap(NameResolver retriedNameResolver, Args args) {
-    // For migration, this might become conditional
-    return new RetryingNameResolver(
-        retriedNameResolver,
-        new BackoffPolicyRetryScheduler(
-            new ExponentialBackoffPolicy.Provider(),
-            args.getScheduledExecutorService(),
-            args.getSynchronizationContext()),
-        args.getSynchronizationContext());
-  }
+final class RetryingNameResolver extends ForwardingNameResolver {
 
   private final NameResolver retriedNameResolver;
   private final RetryScheduler retryScheduler;
   private final SynchronizationContext syncContext;
 
+
   /**
    * Creates a new {@link RetryingNameResolver}.
    *

core/src/test/java/io/grpc/internal/DnsNameResolverTest.java

@@ -207,7 +207,14 @@ private RetryingNameResolver newResolver(
 
     // In practice the DNS name resolver provider always wraps the resolver in a
     // RetryingNameResolver which adds retry capabilities to it. We use the same setup here.
-    return (RetryingNameResolver) RetryingNameResolver.wrap(dnsResolver, args);
+    return new RetryingNameResolver(
+        dnsResolver,
+        new BackoffPolicyRetryScheduler(
+            new ExponentialBackoffPolicy.Provider(),
+            fakeExecutor.getScheduledExecutorService(),
+            syncContext
+        ),
+        syncContext);
   }
 
   @Before

rls/src/main/java/io/grpc/rls/CachingRlsLbClient.java

@@ -255,13 +255,6 @@ void init() {
     }
   }
 
-  Status acceptResolvedAddressFactory(ResolvedAddressFactory childLbResolvedAddressFactory) {
-    synchronized (lock) {
-      return refCountedChildPolicyWrapperFactory.acceptResolvedAddressFactory(
-          childLbResolvedAddressFactory);
-    }
-  }
-
   /**
    * Convert the status to UNAVAILABLE and enhance the error message.
    * @param status status as provided by server

rls/src/main/java/io/grpc/rls/LbPolicyConfiguration.java

@@ -31,7 +31,6 @@
 import io.grpc.LoadBalancerProvider;
 import io.grpc.LoadBalancerRegistry;
 import io.grpc.NameResolver.ConfigOrError;
-import io.grpc.Status;
 import io.grpc.internal.ObjectPool;
 import io.grpc.rls.ChildLoadBalancerHelper.ChildLoadBalancerHelperProvider;
 import io.grpc.rls.RlsProtoData.RouteLookupConfig;
@@ -212,7 +211,7 @@ static final class RefCountedChildPolicyWrapperFactory {
     private final ChildLoadBalancerHelperProvider childLbHelperProvider;
     private final ChildLbStatusListener childLbStatusListener;
     private final ChildLoadBalancingPolicy childPolicy;
-    private ResolvedAddressFactory childLbResolvedAddressFactory;
+    private final ResolvedAddressFactory childLbResolvedAddressFactory;
 
     public RefCountedChildPolicyWrapperFactory(
         ChildLoadBalancingPolicy childPolicy,
@@ -230,19 +229,6 @@ void init() {
       childLbHelperProvider.init();
     }
 
-    Status acceptResolvedAddressFactory(ResolvedAddressFactory childLbResolvedAddressFactory) {
-      this.childLbResolvedAddressFactory = childLbResolvedAddressFactory;
-      Status status = Status.OK;
-      for (RefCountedChildPolicyWrapper wrapper : childPolicyMap.values()) {
-        Status newStatus =
-            wrapper.childPolicyWrapper.acceptResolvedAddressFactory(childLbResolvedAddressFactory);
-        if (!newStatus.isOk()) {
-          status = newStatus;
-        }
-      }
-      return status;
-    }
-
     ChildPolicyWrapper createOrGet(String target) {
       // TODO(creamsoup) check if the target is valid or not
       RefCountedChildPolicyWrapper pooledChildPolicyWrapper = childPolicyMap.get(target);
@@ -291,7 +277,6 @@ static final class ChildPolicyWrapper {
     private final String target;
     private final ChildPolicyReportingHelper helper;
     private final LoadBalancer lb;
-    private final Object childLbConfig;
     private volatile SubchannelPicker picker;
     private ConnectivityState state;
 
@@ -310,26 +295,21 @@ public ChildPolicyWrapper(
               .parseLoadBalancingPolicyConfig(
                   childPolicy.getEffectiveChildPolicy(target));
       this.lb = lbProvider.newLoadBalancer(helper);
-      this.childLbConfig = lbConfig.getConfig();
       helper.getChannelLogger().log(
-          ChannelLogLevel.DEBUG, "RLS child lb created. config: {0}", childLbConfig);
+          ChannelLogLevel.DEBUG, "RLS child lb created. config: {0}", lbConfig.getConfig());
       helper.getSynchronizationContext().execute(
           new Runnable() {
             @Override
             public void run() {
-              if (!acceptResolvedAddressFactory(childLbResolvedAddressFactory).isOk()) {
+              if (!lb.acceptResolvedAddresses(
+                  childLbResolvedAddressFactory.create(lbConfig.getConfig())).isOk()) {
                 helper.refreshNameResolution();
               }
               lb.requestConnection();
             }
           });
     }
 
-    Status acceptResolvedAddressFactory(ResolvedAddressFactory childLbResolvedAddressFactory) {
-      helper.getSynchronizationContext().throwIfNotInThisSynchronizationContext();
-      return lb.acceptResolvedAddresses(childLbResolvedAddressFactory.create(childLbConfig));
-    }
-
     String getTarget() {
       return target;
     }

rls/src/main/java/io/grpc/rls/RlsLoadBalancer.java

@@ -79,9 +79,7 @@ public Status acceptResolvedAddresses(ResolvedAddresses resolvedAddresses) {
       //  not required.
       this.lbPolicyConfiguration = lbPolicyConfiguration;
     }
-    return routeLookupClient.acceptResolvedAddressFactory(
-        new ChildLbResolvedAddressFactory(
-            resolvedAddresses.getAddresses(), resolvedAddresses.getAttributes()));
+    return Status.OK;
   }
 
   @Override