xds: Expose filter names to filter instances

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

@@ -99,7 +99,7 @@ public boolean isClientFilter() {
     }
 
     @Override
-    public FaultFilter newInstance() {
+    public FaultFilter newInstance(String name) {
       return INSTANCE;
     }
 

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

@@ -87,7 +87,7 @@ default boolean isServerFilter() {
      *   <li>Filter name+typeUrl in FilterChain's HCM.http_filters.</li>
      * </ol>
      */
-    Filter newInstance();
+    Filter newInstance(String name);
 
     /**
      * Parses the top-level filter config from raw proto message. The message may be either a {@link

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

@@ -64,7 +64,7 @@ public boolean isClientFilter() {
     }
 
     @Override
-    public GcpAuthenticationFilter newInstance() {
+    public GcpAuthenticationFilter newInstance(String name) {
       return new GcpAuthenticationFilter();
     }
 

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

@@ -33,7 +33,7 @@
       throw new IllegalArgumentException(
         String.format("Failed to parse Rbac policy: %s", filterConfig.errorDetail));
     }
-    return new RbacFilter.Provider().newInstance()
+    return new RbacFilter.Provider().newInstance("internalRbacFilter")
         .buildServerInterceptor(filterConfig.config, null);
   }
 }

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

@@ -89,7 +89,7 @@ public boolean isServerFilter() {
     }
 
     @Override
-    public RbacFilter newInstance() {
+    public RbacFilter newInstance(String name) {
       return INSTANCE;
     }
 

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

@@ -56,7 +56,7 @@ public boolean isServerFilter() {
     }
 
     @Override
-    public RouterFilter newInstance() {
+    public RouterFilter newInstance(String name) {
       return INSTANCE;
     }
 

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

@@ -704,7 +704,8 @@ 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());
+        Filter filter = activeFilters.computeIfAbsent(
+            filterKey, k -> provider.newInstance(namedFilter.name));
         checkNotNull(filter, "filter %s", filterKey);
         filtersToShutdown.remove(filterKey);
       }

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

@@ -560,7 +560,8 @@ private void updateActiveFiltersForChain(
 
         Filter.Provider provider = filterRegistry.get(typeUrl);
         checkNotNull(provider, "provider %s", typeUrl);
-        Filter filter = chainFilters.computeIfAbsent(filterKey, k -> provider.newInstance());
+        Filter filter = chainFilters.computeIfAbsent(
+            filterKey, k -> provider.newInstance(namedFilter.name));
         checkNotNull(filter, "filter %s", filterKey);
         filtersToShutdown.remove(filterKey);
       }

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

@@ -1267,7 +1267,7 @@ public boolean isClientFilter() {
       }
 
       @Override
-      public TestFilter newInstance() {
+      public TestFilter newInstance(String name) {
         return new TestFilter();
       }
 

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

@@ -80,6 +80,8 @@ public class RbacFilterTest {
           StringMatcher.newBuilder().setExact("/" + PATH).setIgnoreCase(true).build();
   private static final RbacFilter.Provider FILTER_PROVIDER = new RbacFilter.Provider();
 
+  private final String name = "theFilterName";
+
   @Test
   public void filterType_serverOnly() {
     assertThat(FILTER_PROVIDER.isClientFilter()).isFalse();
@@ -259,7 +261,7 @@ public void testAuthorizationInterceptor() {
             OrMatcher.create(AlwaysTrueMatcher.INSTANCE));
     AuthConfig authconfig = AuthConfig.create(Collections.singletonList(policyMatcher),
             GrpcAuthorizationEngine.Action.ALLOW);
-    FILTER_PROVIDER.newInstance().buildServerInterceptor(RbacConfig.create(authconfig), null)
+    FILTER_PROVIDER.newInstance(name).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);
@@ -271,7 +273,7 @@ public void testAuthorizationInterceptor() {
 
     authconfig = AuthConfig.create(Collections.singletonList(policyMatcher),
             GrpcAuthorizationEngine.Action.DENY);
-    FILTER_PROVIDER.newInstance().buildServerInterceptor(RbacConfig.create(authconfig), null)
+    FILTER_PROVIDER.newInstance(name).buildServerInterceptor(RbacConfig.create(authconfig), null)
             .interceptCall(mockServerCall, new Metadata(), mockHandler);
     verify(mockHandler).startCall(eq(mockServerCall), any(Metadata.class));
   }
@@ -322,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().buildServerInterceptor(original, override);
+        FILTER_PROVIDER.newInstance(name).buildServerInterceptor(original, override);
     assertThat(interceptor).isNull();
 
     policyMatcher = PolicyMatcher.create("policy-matcher-override",
@@ -332,7 +334,7 @@ public void overrideConfig() {
             GrpcAuthorizationEngine.Action.ALLOW);
     override = RbacConfig.create(authconfig);
 
-    FILTER_PROVIDER.newInstance().buildServerInterceptor(original, override)
+    FILTER_PROVIDER.newInstance(name).buildServerInterceptor(original, override)
             .interceptCall(mockServerCall, new Metadata(), mockHandler);
     verify(mockHandler).startCall(eq(mockServerCall), any(Metadata.class));
     verify(mockServerCall).getAttributes();

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

@@ -108,7 +108,7 @@ public boolean isServerFilter() {
     }
 
     @Override
-    public synchronized StatefulFilter newInstance() {
+    public synchronized StatefulFilter newInstance(String name) {
       StatefulFilter filter = new StatefulFilter(counter++);
       instances.put(filter.idx, filter);
       return filter;

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

@@ -219,7 +219,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();
+        .when(faultFilterProvider).newInstance(any(String.class));
 
     FilterRegistry filterRegistry = FilterRegistry.newRegistry().register(
         ROUTER_FILTER_PROVIDER,

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

@@ -1135,7 +1135,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()).thenReturn(filter);
+    when(filterProvider.newInstance(any(String.class))).thenReturn(filter);
     filterRegistry.register(filterProvider);
 
     FilterConfig f0 = mock(FilterConfig.class);
@@ -1208,7 +1208,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()).thenReturn(filter);
+    when(filterProvider.newInstance(any(String.class))).thenReturn(filter);
     filterRegistry.register(filterProvider);
 
     FilterConfig f0 = mock(FilterConfig.class);