Resolving merge conflicts after merge from upstream for Filter API changes for parseFilterConfig.

Author: kannanjgithub

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;
@@ -91,7 +92,7 @@ default boolean isServerFilter() {
      *   <li>Filter name+typeUrl in FilterChain's HCM.http_filters.</li>
      * </ol>
      */
-    Filter newInstance(String name);
+    Filter newInstance(FilterContext context);
 
     /**
      * Parses the top-level filter config from raw proto message. The message may be either a {@link
@@ -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/test/java/io/grpc/xds/StatefulFilter.java

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