xds: drop backend_service metric label from ext_proc client metrics

The ext_proc spec has been updated to drop adding the backend_service
metric label.

TAG=agy
CONV=86c74ebe-9fd7-4876-b27c-a4c1b230d346

Author: kannanjgithub

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

@@ -128,7 +128,7 @@ static synchronized void initMetricInstruments() {
             "s",
             LATENCY_BUCKETS,
             ImmutableList.of("grpc.target"),
-            ImmutableList.of("grpc.lb.backend_service"),
+            ImmutableList.of(),
             true);
 
         clientHalfCloseDuration = registry.registerDoubleHistogram(
@@ -138,7 +138,7 @@ static synchronized void initMetricInstruments() {
             "s",
             LATENCY_BUCKETS,
             ImmutableList.of("grpc.target"),
-            ImmutableList.of("grpc.lb.backend_service"),
+            ImmutableList.of(),
             true);
 
         serverHeadersDuration = registry.registerDoubleHistogram(
@@ -148,7 +148,7 @@ static synchronized void initMetricInstruments() {
             "s",
             LATENCY_BUCKETS,
             ImmutableList.of("grpc.target"),
-            ImmutableList.of("grpc.lb.backend_service"),
+            ImmutableList.of(),
             true);
 
         serverTrailersDuration = registry.registerDoubleHistogram(
@@ -158,7 +158,7 @@ static synchronized void initMetricInstruments() {
             "s",
             LATENCY_BUCKETS,
             ImmutableList.of("grpc.target"),
-            ImmutableList.of("grpc.lb.backend_service"),
+            ImmutableList.of(),
             true);
       }
     }
@@ -248,8 +248,7 @@ public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(
 
     DataPlaneClientCall dataPlaneCall = new DataPlaneClientCall(
         delayedCall, rawCall, extProcStub, filterConfig, filterConfig.getMutationRulesConfig(),
-        scheduler, rawMethod, next, metricsRecorder, next.authority(),
-        callOptions.getOption(XdsNameResolver.CLUSTER_SELECTION_KEY));
+        scheduler, rawMethod, next, metricsRecorder, next.authority());
 
     return (ClientCall<ReqT, RespT>) (ClientCall<?, ?>) dataPlaneCall;
   }
@@ -294,7 +293,6 @@ private static class DataPlaneClientCall
     private final Channel channel;
     private final MetricRecorder metricsRecorder;
     private final String target;
-    private final String backendService;
     private volatile Context callContext = Context.ROOT;
 
     private long clientHeadersStartNanos;
@@ -326,8 +324,7 @@ protected DataPlaneClientCall(
         MethodDescriptor<?, ?> method,
         Channel channel,
         MetricRecorder metricsRecorder,
-        String target,
-        String backendService) {
+        String target) {
       super(delayedCall);
       this.delayedCall = delayedCall;
       this.rawCall = rawCall;
@@ -340,7 +337,6 @@ protected DataPlaneClientCall(
       this.channel = channel;
       this.metricsRecorder = checkNotNull(metricsRecorder, "metricsRecorder");
       this.target = checkNotNull(target, "target");
-      this.backendService = checkNotNull(backendService, "backendService");
     }
 
 
@@ -373,7 +369,7 @@ private void recordDuration(DoubleHistogramMetricInstrument instrument, long dur
             instrument,
             durationSecs,
             ImmutableList.of(target),
-            ImmutableList.of(backendService));
+            ImmutableList.of());
       }
     }
 

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

@@ -128,8 +128,7 @@ public class ExternalProcessorClientInterceptorTest {
   private ExternalProcessorFilter.Provider provider;
   private static final Filter.FilterContext FAKE_CONTEXT = Filter.FilterContext.create(
       "test-filter", new io.grpc.MetricRecorder() {});
-  private static final CallOptions DEFAULT_CALL_OPTIONS = CallOptions.DEFAULT
-      .withOption(XdsNameResolver.CLUSTER_SELECTION_KEY, "backend-service-metric");
+  private static final CallOptions DEFAULT_CALL_OPTIONS = CallOptions.DEFAULT;
   private Filter.FilterConfigParseContext filterContext;
   private Bootstrapper.BootstrapInfo bootstrapInfo;
   private Bootstrapper.ServerInfo serverInfo;
@@ -13523,8 +13522,7 @@ public void onCompleted() {
     ClientCall<String, String> proxyCall =
         interceptCall(interceptor, 
             METHOD_SAY_HELLO,
-            DEFAULT_CALL_OPTIONS.withExecutor(MoreExecutors.directExecutor())
-                .withOption(XdsNameResolver.CLUSTER_SELECTION_KEY, "backend-service-metric"),
+            DEFAULT_CALL_OPTIONS.withExecutor(MoreExecutors.directExecutor()),
             dataPlaneChannel);
 
     proxyCall.start(new ClientCall.Listener<String>() {
@@ -13555,25 +13553,25 @@ public void onCompleted() {
         Mockito.eq(ExternalProcessorClientInterceptor.clientHeadersDuration),
         Mockito.anyDouble(),
         Mockito.eq(com.google.common.collect.ImmutableList.of("xds:///target-service-metric")),
-        Mockito.eq(com.google.common.collect.ImmutableList.of("backend-service-metric")));
+        Mockito.eq(com.google.common.collect.ImmutableList.of()));
 
     Mockito.verify(mockMetricRecorder, Mockito.times(1)).recordDoubleHistogram(
         Mockito.eq(ExternalProcessorClientInterceptor.clientHalfCloseDuration),
         Mockito.anyDouble(),
         Mockito.eq(com.google.common.collect.ImmutableList.of("xds:///target-service-metric")),
-        Mockito.eq(com.google.common.collect.ImmutableList.of("backend-service-metric")));
+        Mockito.eq(com.google.common.collect.ImmutableList.of()));
 
     Mockito.verify(mockMetricRecorder, Mockito.times(1)).recordDoubleHistogram(
         Mockito.eq(ExternalProcessorClientInterceptor.serverHeadersDuration),
         Mockito.anyDouble(),
         Mockito.eq(com.google.common.collect.ImmutableList.of("xds:///target-service-metric")),
-        Mockito.eq(com.google.common.collect.ImmutableList.of("backend-service-metric")));
+        Mockito.eq(com.google.common.collect.ImmutableList.of()));
 
     Mockito.verify(mockMetricRecorder, Mockito.times(1)).recordDoubleHistogram(
         Mockito.eq(ExternalProcessorClientInterceptor.serverTrailersDuration),
         Mockito.anyDouble(),
         Mockito.eq(com.google.common.collect.ImmutableList.of("xds:///target-service-metric")),
-        Mockito.eq(com.google.common.collect.ImmutableList.of("backend-service-metric")));
+        Mockito.eq(com.google.common.collect.ImmutableList.of()));
 
     channelManager.close();
     realScheduler.shutdown();
@@ -13690,8 +13688,7 @@ public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
     ClientCall<String, String> proxyCall =
         interceptCall(interceptor, 
             METHOD_SAY_HELLO,
-            DEFAULT_CALL_OPTIONS.withExecutor(MoreExecutors.directExecutor())
-                .withOption(XdsNameResolver.CLUSTER_SELECTION_KEY, "backend-service-metric-fail"),
+            DEFAULT_CALL_OPTIONS.withExecutor(MoreExecutors.directExecutor()),
             dataPlaneChannel);
 
     proxyCall.start(new ClientCall.Listener<String>() {
@@ -13725,25 +13722,25 @@ public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
         Mockito.eq(ExternalProcessorClientInterceptor.clientHeadersDuration),
         Mockito.anyDouble(),
         Mockito.eq(com.google.common.collect.ImmutableList.of("xds:///target-service-metric-fail")),
-        Mockito.eq(com.google.common.collect.ImmutableList.of("backend-service-metric-fail")));
+        Mockito.eq(com.google.common.collect.ImmutableList.of()));
 
     Mockito.verify(mockMetricRecorder, Mockito.times(1)).recordDoubleHistogram(
         Mockito.eq(ExternalProcessorClientInterceptor.clientHalfCloseDuration),
         Mockito.anyDouble(),
         Mockito.eq(com.google.common.collect.ImmutableList.of("xds:///target-service-metric-fail")),
-        Mockito.eq(com.google.common.collect.ImmutableList.of("backend-service-metric-fail")));
+        Mockito.eq(com.google.common.collect.ImmutableList.of()));
 
     Mockito.verify(mockMetricRecorder, Mockito.times(1)).recordDoubleHistogram(
         Mockito.eq(ExternalProcessorClientInterceptor.serverHeadersDuration),
         Mockito.anyDouble(),
         Mockito.eq(com.google.common.collect.ImmutableList.of("xds:///target-service-metric-fail")),
-        Mockito.eq(com.google.common.collect.ImmutableList.of("backend-service-metric-fail")));
+        Mockito.eq(com.google.common.collect.ImmutableList.of()));
 
     Mockito.verify(mockMetricRecorder, Mockito.times(1)).recordDoubleHistogram(
         Mockito.eq(ExternalProcessorClientInterceptor.serverTrailersDuration),
         Mockito.anyDouble(),
         Mockito.eq(com.google.common.collect.ImmutableList.of("xds:///target-service-metric-fail")),
-        Mockito.eq(com.google.common.collect.ImmutableList.of("backend-service-metric-fail")));
+        Mockito.eq(com.google.common.collect.ImmutableList.of()));
 
     channelManager.close();
     realScheduler.shutdown();