Merge branch 'master' into multi-user-nrp

api/src/main/java/io/grpc/NameResolver.java

@@ -313,6 +313,7 @@
       this.channelLogger = builder.channelLogger;
       this.executor = builder.executor;
       this.overrideAuthority = builder.overrideAuthority;
+      this.metricRecorder = builder.metricRecorder;
     }
 
     /**
@@ -450,7 +451,7 @@
           .add("proxyDetector", proxyDetector)
           .add("syncContext", syncContext)
           .add("serviceConfigParser", serviceConfigParser)
           .add("extensions", extensions)
           .add("scheduledExecutorService", scheduledExecutorService)
           .add("channelLogger", channelLogger)
           .add("executor", executor)
@@ -502,6 +503,7 @@
       private ChannelLogger channelLogger;
       private Executor executor;
       private String overrideAuthority;
+      private MetricRecorder metricRecorder;
       private Extensions.Builder extensionsBuilder = Extensions.newBuilder();
 
       Builder() {
@@ -638,7 +640,7 @@
 
       @Override
       public String toString() {
         return debugString;
       }
 
       /**
@@ -700,7 +702,7 @@
 
       @Override
       public String toString() {
         return data.toString();
       }
 
       /** Fluently builds instances of {@link Extensions}. */
@@ -741,7 +743,7 @@
           if (newdata != null) {
             for (Map.Entry<Key<?>, Object> entry : base.data.entrySet()) {
               if (!newdata.containsKey(entry.getKey())) {
                 newdata.put(entry.getKey(), entry.getValue());
               }
             }
             base = new Extensions(newdata);

api/src/test/java/io/grpc/NameResolverTest.java

@@ -66,6 +66,7 @@ public class NameResolverTest {
   private final ChannelLogger channelLogger = mock(ChannelLogger.class);
   private final Executor executor = Executors.newSingleThreadExecutor();
   private final String overrideAuthority = "grpc.io";
+  private final MetricRecorder metricRecorder = new MetricRecorder() {};
   private final int extensionArgValue = 42;
   @Mock NameResolver.Listener mockListener;
 
@@ -80,6 +81,7 @@ public void args() {
     assertThat(args.getChannelLogger()).isSameInstanceAs(channelLogger);
     assertThat(args.getOffloadExecutor()).isSameInstanceAs(executor);
     assertThat(args.getOverrideAuthority()).isSameInstanceAs(overrideAuthority);
+    assertThat(args.getMetricRecorder()).isSameInstanceAs(metricRecorder);
     assertThat(args.getExtension(EXT_ARG_KEY)).isEqualTo(extensionArgValue);
 
     NameResolver.Args args2 = args.toBuilder().build();
@@ -91,6 +93,7 @@ public void args() {
     assertThat(args2.getChannelLogger()).isSameInstanceAs(channelLogger);
     assertThat(args2.getOffloadExecutor()).isSameInstanceAs(executor);
     assertThat(args2.getOverrideAuthority()).isSameInstanceAs(overrideAuthority);
+    assertThat(args.getMetricRecorder()).isSameInstanceAs(metricRecorder);
     assertThat(args.getExtension(EXT_ARG_KEY)).isEqualTo(extensionArgValue);
 
     assertThat(args2).isNotSameInstanceAs(args);
@@ -107,6 +110,7 @@ private NameResolver.Args createArgs() {
         .setChannelLogger(channelLogger)
         .setOffloadExecutor(executor)
         .setOverrideAuthority(overrideAuthority)
+        .setMetricRecorder(metricRecorder)
         .setExtension(EXT_ARG_KEY, extensionArgValue)
         .build();
   }

core/src/main/java/io/grpc/internal/ManagedChannelImpl.java

@@ -600,6 +600,7 @@ ClientStream newSubstream(
             .setServiceConfigParser(serviceConfigParser)
             .setChannelLogger(channelLogger)
             .setOffloadExecutor(this.offloadExecutorHolder)
+            .setMetricRecorder(this.metricRecorder)
             .setOverrideAuthority(this.authorityOverride)
             .setAllExtensions(builder.nameResolverArgsExtBuilder.build())
             .build();