Allow unit test to pass CacheChannelManager for in-process channel.

Author: kannanjgithub

xds/src/main/java/io/grpc/xds/ExternalProcessorFilter.java

@@ -20,6 +20,7 @@
 import io.grpc.ClientInterceptor;
 import io.grpc.ForwardingClientCall.SimpleForwardingClientCall;
 import io.grpc.ForwardingClientCallListener;
+import io.grpc.ManagedChannel;
 import io.grpc.Metadata;
 import io.grpc.MethodDescriptor;
 import io.grpc.Status;
@@ -124,7 +125,7 @@ public String typeUrl() {
   }
 
   static final class ExternalProcessorInterceptor implements ClientInterceptor {
-    private final CachedChannelManager cachedChannelManager = new CachedChannelManager();
+    private final CachedChannelManager cachedChannelManager;
     private final ExternalProcessorFilterConfig filterConfig;
 
     private static final MethodDescriptor.Marshaller<InputStream> RAW_MARSHALLER =
@@ -136,7 +137,13 @@ static final class ExternalProcessorInterceptor implements ClientInterceptor {
         };
 
     ExternalProcessorInterceptor(ExternalProcessorFilterConfig filterConfig) {
+      this(filterConfig, new CachedChannelManager());
+    }
+
+    ExternalProcessorInterceptor(ExternalProcessorFilterConfig filterConfig,
+        CachedChannelManager cachedChannelManager) {
       this.filterConfig = filterConfig;
+      this.cachedChannelManager = checkNotNull(cachedChannelManager, "cachedChannelManager");
     }
 
     @Override

xds/src/test/java/io/grpc/xds/ExternalProcessorFilterTest.java

@@ -32,10 +32,13 @@
 import io.grpc.stub.StreamObserver;
 import io.grpc.testing.GrpcCleanupRule;
 import io.grpc.util.MutableHandlerRegistry;
-import io.grpc.xds.internal.grpcservice.ChannelCredsConfig;
+import io.grpc.xds.ExternalProcessorFilter.ExternalProcessorFilterConfig;
+import io.grpc.xds.ExternalProcessorFilter.ExternalProcessorInterceptor;
+import io.grpc.xds.internal.grpcservice.CachedChannelManager;
 import io.grpc.xds.internal.grpcservice.ConfiguredChannelCredentials;
 import io.grpc.xds.internal.grpcservice.GrpcServiceXdsContext;
 import io.grpc.xds.internal.grpcservice.GrpcServiceXdsContextProvider;
+import io.grpc.xds.internal.grpcservice.ChannelCredsConfig;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -116,11 +119,10 @@ public void setUp() throws Exception {
         InProcessChannelBuilder.forName(dataPlaneServerName).directExecutor().build());
   }
 
-  private ExternalProcessorFilter.ExternalProcessorFilterConfig createFilterConfig() {
+  private ExternalProcessorFilterConfig createFilterConfig() {
     GrpcService grpcService = GrpcService.newBuilder()
         .setGoogleGrpc(GrpcService.GoogleGrpc.newBuilder()
-            // Important: Use "in-process:" scheme so Grpc.newChannelBuilder resolves it correctly
-            .setTargetUri("in-process:" + extProcServerName)
+            .setTargetUri(extProcServerName)
             .setStatPrefix("ext_proc")
             .build())
         .build();
@@ -152,7 +154,7 @@ private ExternalProcessorFilter.ExternalProcessorFilterConfig createFilterConfig
     this.filter = provider.newInstance("ext-proc", contextProvider);
 
     // 2. Parse the config using the provider
-    ConfigOrError<ExternalProcessorFilter.ExternalProcessorFilterConfig> configOrError =
+    ConfigOrError<ExternalProcessorFilterConfig> configOrError =
         provider.parseFilterConfig(Any.pack(externalProcessor));
 
     assertThat(configOrError.errorDetail).isNull();
@@ -161,10 +163,14 @@ private ExternalProcessorFilter.ExternalProcessorFilterConfig createFilterConfig
 
   @Test
   public void requestHeadersMutated() throws Exception {
-    ExternalProcessorFilter.ExternalProcessorFilterConfig filterConfig = createFilterConfig();
+    ExternalProcessorFilterConfig filterConfig = createFilterConfig();
 
-    // Use the filter instance created in createFilterConfig()
-    ClientInterceptor interceptor = filter.buildClientInterceptor(filterConfig, null, null);
+    // Manually create the interceptor using the test-friendly constructor
+    CachedChannelManager testChannelManager = new CachedChannelManager(config -> 
+        grpcCleanup.register(InProcessChannelBuilder.forName(extProcServerName).directExecutor().build())
+    );
+    ClientInterceptor interceptor = new ExternalProcessorInterceptor(filterConfig, testChannelManager);
+
     Channel interceptedChannel = ClientInterceptors.intercept(dataPlaneChannel, interceptor);
 
     // Data Plane Server