Create ext-proc channel using CachedChannelManager passing in the GrpcService proto and the GrpcServiceXdsContextProvider. Also added GrpcServiceXdsContextProvider in the newInstance method for Filter in Filter.Provider.

kannanjgithub · kannanjgithub · commit ccba6d0e26fb · 2026-03-15T10:49:05.000Z
diff --git a/xds/src/main/java/io/grpc/xds/ExternalProcessorFilter.java b/xds/src/main/java/io/grpc/xds/ExternalProcessorFilter.java
@@ -2,13 +2,11 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.io.ByteStreams;
 import com.google.protobuf.Any;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.Message;
 import io.envoyproxy.envoy.config.core.v3.GrpcService;
-import io.envoyproxy.envoy.config.core.v3.HeaderValueOption;
 import io.envoyproxy.envoy.extensions.filters.http.ext_proc.v3.ExternalProcessor;
 import io.envoyproxy.envoy.extensions.filters.http.ext_proc.v3.ProcessingMode;
 import io.envoyproxy.envoy.service.ext_proc.v3.ExternalProcessorGrpc;
@@ -26,8 +24,11 @@
 import io.grpc.MethodDescriptor;
 import io.grpc.Status;
 import io.grpc.stub.ClientCallStreamObserver;
-import io.grpc.xds.internal.grpcservice.GrpcServiceChannelCreator;
-import io.grpc.xds.internal.grpcservice.GrpcServiceChannelCreatorImpl;
+import io.grpc.xds.internal.grpcservice.CachedChannelManager;
+import io.grpc.xds.internal.grpcservice.GrpcServiceConfig;
+import io.grpc.xds.internal.grpcservice.GrpcServiceConfigParser;
+import io.grpc.xds.internal.grpcservice.GrpcServiceParseException;
+import io.grpc.xds.internal.grpcservice.GrpcServiceXdsContextProvider;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -39,19 +40,16 @@ public class ExternalProcessorFilter implements Filter {
   static final String TYPE_URL = "type.googleapis.com/envoy.extensions.filters.http.ext_proc.v3.ExternalProcessor";
 
   final String filterInstanceName;
-  // TODO: Make final after the need to replace with a mock from unit tests is removed.
-  GrpcServiceChannelCreator grpcServiceChannelCreator;
   ManagedChannel grpcServiceChannel;
   ExternalProcessorGrpc.ExternalProcessorStub externalProcessorStub;
   private final Object lock = new Object();
-  private GrpcService lastGrpcServiceConfig;
 
   public ExternalProcessorFilter(String name) {
     filterInstanceName = checkNotNull(name, "name");
-    grpcServiceChannelCreator = new GrpcServiceChannelCreatorImpl();
   }
 
   static final class Provider implements Filter.Provider {
+    private GrpcServiceXdsContextProvider grpcServiceXdsContextProvider;
     @Override
     public String[] typeUrls() {
       return new String[]{TYPE_URL};
@@ -63,7 +61,8 @@ public boolean isClientFilter() {
     }
 
     @Override
-    public ExternalProcessorFilter newInstance(String name) {
+    public ExternalProcessorFilter newInstance(String name, GrpcServiceXdsContextProvider grpcServiceXdsContextProvider) {
+      this.grpcServiceXdsContextProvider = grpcServiceXdsContextProvider;
       return new ExternalProcessorFilter(name);
     }
 
@@ -87,7 +86,12 @@ public ConfigOrError<ExternalProcessorFilterConfig> parseFilterConfig(Message ra
         return ConfigOrError.fromError("Invalid response_body_mode: " + mode.getResponseBodyMode() + ". Only GRPC is supported.");
       }
 
-      return ConfigOrError.fromConfig(new ExternalProcessorFilterConfig(externalProcessor));
+      try {
+        GrpcServiceConfig grpcServiceConfig = GrpcServiceConfigParser.parse(externalProcessor.getGrpcService(), grpcServiceXdsContextProvider);
+        return ConfigOrError.fromConfig(new ExternalProcessorFilterConfig(externalProcessor, grpcServiceConfig));
+      } catch (GrpcServiceParseException e) {
+        return ConfigOrError.fromError("Error parsing GrpcService config: " + e.getMessage());
+      }
     }
 
     @Override
@@ -103,31 +107,14 @@ public ClientInterceptor buildClientInterceptor(FilterConfig filterConfig,
     return new ExternalProcessorInterceptor(this, (ExternalProcessorFilterConfig) filterConfig, overrideConfig, scheduler);
   }
 
-  ExternalProcessorGrpc.ExternalProcessorStub getExternalProcessorStub(ExternalProcessor config) {
-    GrpcService newServiceConfig = config.getGrpcService();
-    synchronized (lock) {
-      // TODO: gRFC only mentions we should recreate channel if target or channel creds changed
-      // but other fields in grpc service config also do seem relevant to warrant channel
-      // recreation.
-      if (grpcServiceChannel == null || !newServiceConfig.equals(lastGrpcServiceConfig)) {
-        if (grpcServiceChannel != null) {
-          // Shutdown the old channel if the config has changed
-          grpcServiceChannel.shutdown();
-        }
-        grpcServiceChannel = grpcServiceChannelCreator.create(newServiceConfig);
-        externalProcessorStub = ExternalProcessorGrpc.newStub(grpcServiceChannel);
-        lastGrpcServiceConfig = newServiceConfig;
-      }
-      return externalProcessorStub;
-    }
-  }
-
   static final class ExternalProcessorFilterConfig implements FilterConfig {
 
     private final ExternalProcessor externalProcessor;
+    private final GrpcServiceConfig grpcServiceConfig;
 
-    ExternalProcessorFilterConfig(ExternalProcessor externalProcessor) {
+    ExternalProcessorFilterConfig(ExternalProcessor externalProcessor, GrpcServiceConfig grpcServiceConfig) {
       this.externalProcessor = externalProcessor;
+      this.grpcServiceConfig = grpcServiceConfig;
     }
 
     @Override
@@ -137,6 +124,7 @@ public String typeUrl() {
   }
 
   static final class ExternalProcessorInterceptor implements ClientInterceptor {
+    private final CachedChannelManager cachedChannelManager = new CachedChannelManager();
     private final ExternalProcessorFilter filter;
     private final ExternalProcessorFilterConfig filterConfig;
     private final FilterConfig overrideConfig;
@@ -164,7 +152,8 @@ public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(
         MethodDescriptor<ReqT, RespT> method,
         CallOptions callOptions,
         Channel next) {
-      ExternalProcessorGrpc.ExternalProcessorStub stub = filter.getExternalProcessorStub(filterConfig.externalProcessor);
+      ExternalProcessorGrpc.ExternalProcessorStub stub = ExternalProcessorGrpc.newStub(
+          cachedChannelManager.getChannel(filterConfig.grpcServiceConfig));
       ExternalProcessor config = filterConfig.externalProcessor;
 
       MethodDescriptor<InputStream, InputStream> rawMethod = method.toBuilder(RAW_MARSHALLER, RAW_MARSHALLER).build();
diff --git a/xds/src/main/java/io/grpc/xds/FaultFilter.java b/xds/src/main/java/io/grpc/xds/FaultFilter.java
@@ -46,6 +46,7 @@
 import io.grpc.xds.FaultConfig.FaultAbort;
 import io.grpc.xds.FaultConfig.FaultDelay;
 import io.grpc.xds.ThreadSafeRandom.ThreadSafeRandomImpl;
+import io.grpc.xds.internal.grpcservice.GrpcServiceXdsContextProvider;
 import java.util.Locale;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ScheduledExecutorService;
@@ -99,7 +100,7 @@ public boolean isClientFilter() {
     }
 
     @Override
-    public FaultFilter newInstance(String name) {
+    public FaultFilter newInstance(String name, GrpcServiceXdsContextProvider grpcServiceXdsContextProvider) {
       return INSTANCE;
     }
 
diff --git a/xds/src/main/java/io/grpc/xds/Filter.java b/xds/src/main/java/io/grpc/xds/Filter.java
@@ -20,6 +20,7 @@
 import com.google.protobuf.Message;
 import io.grpc.ClientInterceptor;
 import io.grpc.ServerInterceptor;
+import io.grpc.xds.internal.grpcservice.GrpcServiceXdsContextProvider;
 import java.io.Closeable;
 import java.util.Objects;
 import java.util.concurrent.ScheduledExecutorService;
@@ -87,7 +88,7 @@ default boolean isServerFilter() {
      *   <li>Filter name+typeUrl in FilterChain's HCM.http_filters.</li>
      * </ol>
      */
-    Filter newInstance(String name);
+    Filter newInstance(String name, GrpcServiceXdsContextProvider grpcServiceXdsContextProvider);
 
     /**
      * Parses the top-level filter config from raw proto message. The message may be either a {@link
diff --git a/xds/src/main/java/io/grpc/xds/GcpAuthenticationFilter.java b/xds/src/main/java/io/grpc/xds/GcpAuthenticationFilter.java
@@ -45,6 +45,7 @@
 import io.grpc.xds.MetadataRegistry.MetadataValueParser;
 import io.grpc.xds.XdsConfig.XdsClusterConfig;
 import io.grpc.xds.client.XdsResourceType.ResourceInvalidException;
+import io.grpc.xds.internal.grpcservice.GrpcServiceXdsContextProvider;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.concurrent.ScheduledExecutorService;
@@ -81,7 +82,7 @@ public boolean isClientFilter() {
     }
 
     @Override
-    public GcpAuthenticationFilter newInstance(String name) {
+    public GcpAuthenticationFilter newInstance(String name, GrpcServiceXdsContextProvider grpcServiceXdsContextProvider) {
       return new GcpAuthenticationFilter(name, cacheSize);
     }
 
diff --git a/xds/src/main/java/io/grpc/xds/InternalRbacFilter.java b/xds/src/main/java/io/grpc/xds/InternalRbacFilter.java
@@ -33,7 +33,7 @@ public static ServerInterceptor createInterceptor(RBAC rbac) {
       throw new IllegalArgumentException(
         String.format("Failed to parse Rbac policy: %s", filterConfig.errorDetail));
     }
-    return new RbacFilter.Provider().newInstance("internalRbacFilter")
+    return new RbacFilter.Provider().newInstance("internalRbacFilter", null)
         .buildServerInterceptor(filterConfig.config, null);
   }
 }
diff --git a/xds/src/main/java/io/grpc/xds/RbacFilter.java b/xds/src/main/java/io/grpc/xds/RbacFilter.java
@@ -35,6 +35,7 @@
 import io.grpc.Status;
 import io.grpc.xds.internal.MatcherParser;
 import io.grpc.xds.internal.Matchers;
+import io.grpc.xds.internal.grpcservice.GrpcServiceXdsContextProvider;
 import io.grpc.xds.internal.rbac.engine.GrpcAuthorizationEngine;
 import io.grpc.xds.internal.rbac.engine.GrpcAuthorizationEngine.AlwaysTrueMatcher;
 import io.grpc.xds.internal.rbac.engine.GrpcAuthorizationEngine.AndMatcher;
@@ -89,7 +90,7 @@ public boolean isServerFilter() {
     }
 
     @Override
-    public RbacFilter newInstance(String name) {
+    public RbacFilter newInstance(String name, GrpcServiceXdsContextProvider grpcServiceXdsContextProvider) {
       return INSTANCE;
     }
 
diff --git a/xds/src/main/java/io/grpc/xds/RouterFilter.java b/xds/src/main/java/io/grpc/xds/RouterFilter.java
@@ -17,6 +17,7 @@
 package io.grpc.xds;
 
 import com.google.protobuf.Message;
+import io.grpc.xds.internal.grpcservice.GrpcServiceXdsContextProvider;
 
 /**
  * Router filter implementation. Currently this filter does not parse any field in the config.
@@ -56,7 +57,7 @@ public boolean isServerFilter() {
     }
 
     @Override
-    public RouterFilter newInstance(String name) {
+    public RouterFilter newInstance(String name, GrpcServiceXdsContextProvider grpcServiceXdsContextProvider) {
       return INSTANCE;
     }
 
diff --git a/xds/src/main/java/io/grpc/xds/XdsNameResolver.java b/xds/src/main/java/io/grpc/xds/XdsNameResolver.java
@@ -675,7 +675,7 @@ private void updateActiveFilters(@Nullable List<NamedFilterConfig> filterConfigs
         Filter.Provider provider = filterRegistry.get(typeUrl);
         checkNotNull(provider, "provider %s", typeUrl);
         Filter filter = activeFilters.computeIfAbsent(
-            filterKey, k -> provider.newInstance(namedFilter.name));
+            filterKey, k -> provider.newInstance(namedFilter.name, null));
         checkNotNull(filter, "filter %s", filterKey);
         filtersToShutdown.remove(filterKey);
       }
diff --git a/xds/src/main/java/io/grpc/xds/XdsServerWrapper.java b/xds/src/main/java/io/grpc/xds/XdsServerWrapper.java
@@ -612,7 +612,7 @@ private void updateActiveFiltersForChain(
         Filter.Provider provider = filterRegistry.get(typeUrl);
         checkNotNull(provider, "provider %s", typeUrl);
         Filter filter = chainFilters.computeIfAbsent(
-            filterKey, k -> provider.newInstance(namedFilter.name));
+            filterKey, k -> provider.newInstance(namedFilter.name, null));
         checkNotNull(filter, "filter %s", filterKey);
         filtersToShutdown.remove(filterKey);
       }
diff --git a/xds/src/main/java/io/grpc/xds/internal/grpcservice/GrpcServiceChannelCreator.java b/xds/src/main/java/io/grpc/xds/internal/grpcservice/GrpcServiceChannelCreator.java
diff --git a/xds/src/main/java/io/grpc/xds/internal/grpcservice/GrpcServiceChannelCreatorImpl.java b/xds/src/main/java/io/grpc/xds/internal/grpcservice/GrpcServiceChannelCreatorImpl.java
diff --git a/xds/src/test/java/io/grpc/xds/GrpcXdsClientImplDataTest.java b/xds/src/test/java/io/grpc/xds/GrpcXdsClientImplDataTest.java
@@ -150,6 +150,7 @@
 import io.grpc.xds.internal.Matchers;
 import io.grpc.xds.internal.Matchers.FractionMatcher;
 import io.grpc.xds.internal.Matchers.HeaderMatcher;
+import io.grpc.xds.internal.grpcservice.GrpcServiceXdsContextProvider;
 import java.net.InetSocketAddress;
 import java.util.Arrays;
 import java.util.Collections;
@@ -1289,7 +1290,7 @@ public boolean isClientFilter() {
       }
 
       @Override
-      public TestFilter newInstance(String name) {
+      public TestFilter newInstance(String name, GrpcServiceXdsContextProvider grpcServiceXdsContextProvider) {
         return new TestFilter();
       }
 
diff --git a/xds/src/test/java/io/grpc/xds/RbacFilterTest.java b/xds/src/test/java/io/grpc/xds/RbacFilterTest.java
@@ -261,7 +261,7 @@ public void testAuthorizationInterceptor() {
             OrMatcher.create(AlwaysTrueMatcher.INSTANCE));
     AuthConfig authconfig = AuthConfig.create(Collections.singletonList(policyMatcher),
             GrpcAuthorizationEngine.Action.ALLOW);
-    FILTER_PROVIDER.newInstance(name).buildServerInterceptor(RbacConfig.create(authconfig), null)
+    FILTER_PROVIDER.newInstance(name, null).buildServerInterceptor(RbacConfig.create(authconfig), null)
             .interceptCall(mockServerCall, new Metadata(), mockHandler);
     verify(mockHandler, never()).startCall(eq(mockServerCall), any(Metadata.class));
     ArgumentCaptor<Status> captor = ArgumentCaptor.forClass(Status.class);
@@ -273,7 +273,7 @@ public void testAuthorizationInterceptor() {
 
     authconfig = AuthConfig.create(Collections.singletonList(policyMatcher),
             GrpcAuthorizationEngine.Action.DENY);
-    FILTER_PROVIDER.newInstance(name).buildServerInterceptor(RbacConfig.create(authconfig), null)
+    FILTER_PROVIDER.newInstance(name, null).buildServerInterceptor(RbacConfig.create(authconfig), null)
             .interceptCall(mockServerCall, new Metadata(), mockHandler);
     verify(mockHandler).startCall(eq(mockServerCall), any(Metadata.class));
   }
@@ -324,7 +324,7 @@ public void overrideConfig() {
     RbacConfig override = FILTER_PROVIDER.parseFilterConfigOverride(Any.pack(rbacPerRoute)).config;
     assertThat(override).isEqualTo(RbacConfig.create(null));
     ServerInterceptor interceptor =
-        FILTER_PROVIDER.newInstance(name).buildServerInterceptor(original, override);
+        FILTER_PROVIDER.newInstance(name, null).buildServerInterceptor(original, override);
     assertThat(interceptor).isNull();
 
     policyMatcher = PolicyMatcher.create("policy-matcher-override",
@@ -334,7 +334,7 @@ public void overrideConfig() {
             GrpcAuthorizationEngine.Action.ALLOW);
     override = RbacConfig.create(authconfig);
 
-    FILTER_PROVIDER.newInstance(name).buildServerInterceptor(original, override)
+    FILTER_PROVIDER.newInstance(name, null).buildServerInterceptor(original, override)
             .interceptCall(mockServerCall, new Metadata(), mockHandler);
     verify(mockHandler).startCall(eq(mockServerCall), any(Metadata.class));
     verify(mockServerCall).getAttributes();
diff --git a/xds/src/test/java/io/grpc/xds/StatefulFilter.java b/xds/src/test/java/io/grpc/xds/StatefulFilter.java
@@ -22,6 +22,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.protobuf.Message;
 import io.grpc.ServerInterceptor;
+import io.grpc.xds.internal.grpcservice.GrpcServiceXdsContextProvider;
 import java.util.ConcurrentModificationException;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -108,7 +109,7 @@ public boolean isServerFilter() {
     }
 
     @Override
-    public synchronized StatefulFilter newInstance(String name) {
+    public synchronized StatefulFilter newInstance(String name, GrpcServiceXdsContextProvider grpcServiceXdsContextProvider) {
       StatefulFilter filter = new StatefulFilter(counter++);
       instances.put(filter.idx, filter);
       return filter;
diff --git a/xds/src/test/java/io/grpc/xds/XdsNameResolverTest.java b/xds/src/test/java/io/grpc/xds/XdsNameResolverTest.java
@@ -231,7 +231,7 @@ public void setUp() {
     // Lenient: suppress [MockitoHint] Unused warning, only used in resolved_fault* tests.
     lenient()
         .doReturn(new FaultFilter(mockRandom, new AtomicLong()))
-        .when(faultFilterProvider).newInstance(any(String.class));
+        .when(faultFilterProvider).newInstance(any(String.class), null);
 
     FilterRegistry filterRegistry = FilterRegistry.newRegistry().register(
         ROUTER_FILTER_PROVIDER,
diff --git a/xds/src/test/java/io/grpc/xds/XdsServerWrapperTest.java b/xds/src/test/java/io/grpc/xds/XdsServerWrapperTest.java
@@ -1293,7 +1293,7 @@ public void run() {
     Filter.Provider filterProvider = mock(Filter.Provider.class);
     when(filterProvider.typeUrls()).thenReturn(new String[]{"filter-type-url"});
     when(filterProvider.isServerFilter()).thenReturn(true);
-    when(filterProvider.newInstance(any(String.class))).thenReturn(filter);
+    when(filterProvider.newInstance(any(String.class), null)).thenReturn(filter);
     filterRegistry.register(filterProvider);
 
     FilterConfig f0 = mock(FilterConfig.class);
@@ -1366,7 +1366,7 @@ public void run() {
     Filter.Provider filterProvider = mock(Filter.Provider.class);
     when(filterProvider.typeUrls()).thenReturn(new String[]{"filter-type-url"});
     when(filterProvider.isServerFilter()).thenReturn(true);
-    when(filterProvider.newInstance(any(String.class))).thenReturn(filter);
+    when(filterProvider.newInstance(any(String.class), null)).thenReturn(filter);
     filterRegistry.register(filterProvider);
 
     FilterConfig f0 = mock(FilterConfig.class);

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@`
`46`	`46`	`import io.grpc.xds.FaultConfig.FaultAbort;`
`47`	`47`	`import io.grpc.xds.FaultConfig.FaultDelay;`
`48`	`48`	`import io.grpc.xds.ThreadSafeRandom.ThreadSafeRandomImpl;`
	`49`	`+import io.grpc.xds.internal.grpcservice.GrpcServiceXdsContextProvider;`
`49`	`50`	`import java.util.Locale;`
`50`	`51`	`import java.util.concurrent.Executor;`
`51`	`52`	`import java.util.concurrent.ScheduledExecutorService;`
`@@ -99,7 +100,7 @@ public boolean isClientFilter() {`
`99`	`100`	`}`
`100`	`101`
`101`	`102`	`@Override`
`102`		`- public FaultFilter newInstance(String name) {`
	`103`	`+ public FaultFilter newInstance(String name, GrpcServiceXdsContextProvider grpcServiceXdsContextProvider) {`
`103`	`104`	`return INSTANCE;`
`104`	`105`	`}`
`105`	`106`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@`
`45`	`45`	`import io.grpc.xds.MetadataRegistry.MetadataValueParser;`
`46`	`46`	`import io.grpc.xds.XdsConfig.XdsClusterConfig;`
`47`	`47`	`import io.grpc.xds.client.XdsResourceType.ResourceInvalidException;`
	`48`	`+import io.grpc.xds.internal.grpcservice.GrpcServiceXdsContextProvider;`
`48`	`49`	`import java.util.LinkedHashMap;`
`49`	`50`	`import java.util.Map;`
`50`	`51`	`import java.util.concurrent.ScheduledExecutorService;`
`@@ -81,7 +82,7 @@ public boolean isClientFilter() {`
`81`	`82`	`}`
`82`	`83`
`83`	`84`	`@Override`
`84`		`- public GcpAuthenticationFilter newInstance(String name) {`
	`85`	`+ public GcpAuthenticationFilter newInstance(String name, GrpcServiceXdsContextProvider grpcServiceXdsContextProvider) {`
`85`	`86`	`return new GcpAuthenticationFilter(name, cacheSize);`
`86`	`87`	`}`
`87`	`88`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public static ServerInterceptor createInterceptor(RBAC rbac) {`
`33`	`33`	`throw new IllegalArgumentException(`
`34`	`34`	`String.format("Failed to parse Rbac policy: %s", filterConfig.errorDetail));`
`35`	`35`	`}`
`36`		`- return new RbacFilter.Provider().newInstance("internalRbacFilter")`
	`36`	`+ return new RbacFilter.Provider().newInstance("internalRbacFilter", null)`
`37`	`37`	`.buildServerInterceptor(filterConfig.config, null);`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@`
`35`	`35`	`import io.grpc.Status;`
`36`	`36`	`import io.grpc.xds.internal.MatcherParser;`
`37`	`37`	`import io.grpc.xds.internal.Matchers;`
	`38`	`+import io.grpc.xds.internal.grpcservice.GrpcServiceXdsContextProvider;`
`38`	`39`	`import io.grpc.xds.internal.rbac.engine.GrpcAuthorizationEngine;`
`39`	`40`	`import io.grpc.xds.internal.rbac.engine.GrpcAuthorizationEngine.AlwaysTrueMatcher;`
`40`	`41`	`import io.grpc.xds.internal.rbac.engine.GrpcAuthorizationEngine.AndMatcher;`
`@@ -89,7 +90,7 @@ public boolean isServerFilter() {`
`89`	`90`	`}`
`90`	`91`
`91`	`92`	`@Override`
`92`		`- public RbacFilter newInstance(String name) {`
	`93`	`+ public RbacFilter newInstance(String name, GrpcServiceXdsContextProvider grpcServiceXdsContextProvider) {`
`93`	`94`	`return INSTANCE;`
`94`	`95`	`}`
`95`	`96`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`package io.grpc.xds;`
`18`	`18`
`19`	`19`	`import com.google.protobuf.Message;`
	`20`	`+import io.grpc.xds.internal.grpcservice.GrpcServiceXdsContextProvider;`
`20`	`21`
`21`	`22`	`/**`
`22`	`23`	`* Router filter implementation. Currently this filter does not parse any field in the config.`
`@@ -56,7 +57,7 @@ public boolean isServerFilter() {`
`56`	`57`	`}`
`57`	`58`
`58`	`59`	`@Override`
`59`		`- public RouterFilter newInstance(String name) {`
	`60`	`+ public RouterFilter newInstance(String name, GrpcServiceXdsContextProvider grpcServiceXdsContextProvider) {`
`60`	`61`	`return INSTANCE;`
`61`	`62`	`}`
`62`	`63`
Original file line number	Diff line number	Diff line change
`@@ -675,7 +675,7 @@ private void updateActiveFilters(@Nullable List<NamedFilterConfig> filterConfigs`
`675`	`675`	`Filter.Provider provider = filterRegistry.get(typeUrl);`
`676`	`676`	`checkNotNull(provider, "provider %s", typeUrl);`
`677`	`677`	`Filter filter = activeFilters.computeIfAbsent(`
`678`		`- filterKey, k -> provider.newInstance(namedFilter.name));`
	`678`	`+ filterKey, k -> provider.newInstance(namedFilter.name, null));`
`679`	`679`	`checkNotNull(filter, "filter %s", filterKey);`
`680`	`680`	`filtersToShutdown.remove(filterKey);`
`681`	`681`	`}`
Original file line number	Diff line number	Diff line change
`@@ -612,7 +612,7 @@ private void updateActiveFiltersForChain(`
`612`	`612`	`Filter.Provider provider = filterRegistry.get(typeUrl);`
`613`	`613`	`checkNotNull(provider, "provider %s", typeUrl);`
`614`	`614`	`Filter filter = chainFilters.computeIfAbsent(`
`615`		`- filterKey, k -> provider.newInstance(namedFilter.name));`
	`615`	`+ filterKey, k -> provider.newInstance(namedFilter.name, null));`
`616`	`616`	`checkNotNull(filter, "filter %s", filterKey);`
`617`	`617`	`filtersToShutdown.remove(filterKey);`
`618`	`618`	`}`