xds: Introduce FilterContext and pass it to newInstance

TAG=agy

Author: kannanjgithub

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

@@ -16,6 +16,8 @@
 
 package io.grpc.xds;
 
+import io.grpc.xds.Filter.FilterContext;
+
 import io.grpc.xds.Filter.FilterConfigParseContext;
 
 import static com.google.common.base.Preconditions.checkNotNull;

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

@@ -16,6 +16,8 @@
 
 package io.grpc.xds;
 
+import io.grpc.xds.Filter.FilterContext;
+
 import io.grpc.xds.Filter.FilterConfigParseContext;
 
 import static com.google.common.base.Preconditions.checkNotNull;

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

@@ -21,6 +21,7 @@
 import com.google.common.base.MoreObjects;
 import com.google.protobuf.Message;
 import io.grpc.ClientInterceptor;
+import io.grpc.MetricRecorder;
 import io.grpc.ServerInterceptor;
 import io.grpc.xds.client.Bootstrapper.BootstrapInfo;
 import io.grpc.xds.client.Bootstrapper.ServerInfo;
@@ -152,6 +153,18 @@ abstract static class Builder {
     }
   }
 
+  /** Context containing naming and metrics reporting objects for a filter instance. */
+  @AutoValue
+  abstract static class FilterContext {
+    abstract String filterName();
+
+    abstract MetricRecorder metricsRecorder();
+
+    static FilterContext create(String filterName, MetricRecorder metricsRecorder) {
+      return new AutoValue_Filter_FilterContext(filterName, metricsRecorder);
+    }
+  }
+
   /** Filter config with instance name. */
   final class NamedFilterConfig {
     // filter instance name

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

@@ -16,6 +16,8 @@
 
 package io.grpc.xds;
 
+import io.grpc.xds.Filter.FilterContext;
+
 import io.grpc.xds.Filter.FilterConfigParseContext;
 
 import static com.google.common.base.Preconditions.checkNotNull;

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

@@ -16,6 +16,8 @@
 
 package io.grpc.xds;
 
+import io.grpc.xds.Filter.FilterContext;
+
 import io.grpc.xds.Filter.FilterConfigParseContext;
 
 import static com.google.common.base.Preconditions.checkNotNull;

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

@@ -16,6 +16,8 @@
 
 package io.grpc.xds;
 
+import io.grpc.xds.Filter.FilterContext;
+
 import io.grpc.xds.Filter.FilterConfigParseContext;
 
 import com.google.protobuf.Message;

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

@@ -131,6 +131,8 @@
 import io.grpc.xds.Endpoints.LbEndpoint;
 import io.grpc.xds.Endpoints.LocalityLbEndpoints;
 import io.grpc.xds.Filter.FilterConfig;
+import io.grpc.xds.Filter.FilterConfigParseContext;
+import io.grpc.xds.Filter.FilterContext;
 import io.grpc.xds.GcpAuthenticationFilter.AudienceMetadataParser.AudienceWrapper;
 import io.grpc.xds.MetadataRegistry.MetadataValueParser;
 import io.grpc.xds.RouteLookupServiceClusterSpecifierPlugin.RlsPluginConfig;

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

@@ -84,6 +84,7 @@
 import io.grpc.xds.FaultConfig.FaultAbort;
 import io.grpc.xds.FaultConfig.FaultDelay;
 import io.grpc.xds.Filter.FilterConfig;
+import io.grpc.xds.Filter.FilterContext;
 import io.grpc.xds.Filter.NamedFilterConfig;
 import io.grpc.xds.RouteLookupServiceClusterSpecifierPlugin.RlsPluginConfig;
 import io.grpc.xds.VirtualHost.Route;

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

@@ -58,6 +58,7 @@
 import io.grpc.xds.EnvoyServerProtoData.FilterChainMatch;
 import io.grpc.xds.EnvoyServerProtoData.Listener;
 import io.grpc.xds.Filter.FilterConfig;
+import io.grpc.xds.Filter.FilterContext;
 import io.grpc.xds.Filter.NamedFilterConfig;
 import io.grpc.xds.FilterChainMatchingProtocolNegotiators.FilterChainMatchingHandler.FilterChainSelector;
 import io.grpc.xds.StatefulFilter.Config;