Merge pull request #1926 from grpc/master

Merge master into 1.4.x (i.e. backport channelz to 1.4.x)

Author: murgatroid99

TROUBLESHOOTING.md

@@ -4,7 +4,7 @@ This guide is for troubleshooting the `grpc-js` library for Node.js
 
 ## Enabling extra logging and tracing
 
-Extra logging can be very useful for diagnosing problems. `grpc-js` supporst
+Extra logging can be very useful for diagnosing problems. `grpc-js` supports
 the `GRPC_VERBOSITY` and `GRPC_TRACE` environment variables that can be used to increase the amount of information
 that gets printed to stderr.
 

packages/grpc-js-xds/src/load-balancer-eds.ts

@@ -185,14 +185,7 @@ export class EdsLoadBalancer implements LoadBalancer {
   private concurrentRequests: number = 0;
 
   constructor(private readonly channelControlHelper: ChannelControlHelper) {
-    this.childBalancer = new ChildLoadBalancerHandler({
-      createSubchannel: (subchannelAddress, subchannelArgs) =>
-        this.channelControlHelper.createSubchannel(
-          subchannelAddress,
-          subchannelArgs
-        ),
-      requestReresolution: () =>
-        this.channelControlHelper.requestReresolution(),
+    this.childBalancer = new ChildLoadBalancerHandler(experimental.createChildChannelControlHelper(this.channelControlHelper, {
       updateState: (connectivityState, originalPicker) => {
         if (this.latestEdsUpdate === null) {
           return;
@@ -243,7 +236,7 @@ export class EdsLoadBalancer implements LoadBalancer {
         };
         this.channelControlHelper.updateState(connectivityState, edsPicker);
       },
-    });
+    }));
     this.watcher = {
       onValidUpdate: (update) => {
         trace('Received EDS update for ' + this.edsServiceName + ': ' + JSON.stringify(update, undefined, 2));

packages/grpc-js-xds/src/load-balancer-lrs.ts

@@ -174,20 +174,14 @@ export class LrsLoadBalancer implements LoadBalancer {
   private localityStatsReporter: XdsClusterLocalityStats | null = null;
 
   constructor(private channelControlHelper: ChannelControlHelper) {
-    this.childBalancer = new ChildLoadBalancerHandler({
-      createSubchannel: (subchannelAddress, subchannelArgs) =>
-        channelControlHelper.createSubchannel(
-          subchannelAddress,
-          subchannelArgs
-        ),
-      requestReresolution: () => channelControlHelper.requestReresolution(),
+    this.childBalancer = new ChildLoadBalancerHandler(experimental.createChildChannelControlHelper(channelControlHelper, {
       updateState: (connectivityState: ConnectivityState, picker: Picker) => {
         if (this.localityStatsReporter !== null) {
           picker = new LoadReportingPicker(picker, this.localityStatsReporter);
         }
         channelControlHelper.updateState(connectivityState, picker);
       },
-    });
+    }));
   }
 
   updateAddressList(

packages/grpc-js-xds/src/load-balancer-priority.ts

@@ -139,23 +139,11 @@ export class PriorityLoadBalancer implements LoadBalancer {
     private failoverTimer: NodeJS.Timer | null = null;
     private deactivationTimer: NodeJS.Timer | null = null;
     constructor(private parent: PriorityLoadBalancer, private name: string) {
-      this.childBalancer = new ChildLoadBalancerHandler({
-        createSubchannel: (
-          subchannelAddress: SubchannelAddress,
-          subchannelArgs: ChannelOptions
-        ) => {
-          return this.parent.channelControlHelper.createSubchannel(
-            subchannelAddress,
-            subchannelArgs
-          );
-        },
+      this.childBalancer = new ChildLoadBalancerHandler(experimental.createChildChannelControlHelper(this.parent.channelControlHelper, {
         updateState: (connectivityState: ConnectivityState, picker: Picker) => {
           this.updateState(connectivityState, picker);
         },
-        requestReresolution: () => {
-          this.parent.channelControlHelper.requestReresolution();
-        },
-      });
+      }));
       this.picker = new QueuePicker(this.childBalancer);
     }
 

packages/grpc-js-xds/src/load-balancer-weighted-target.ts

@@ -168,17 +168,11 @@ export class WeightedTargetLoadBalancer implements LoadBalancer {
     private weight: number = 0;
 
     constructor(private parent: WeightedTargetLoadBalancer, private name: string) {
-      this.childBalancer = new ChildLoadBalancerHandler({
-        createSubchannel: (subchannelAddress, subchannelOptions) => {
-          return this.parent.channelControlHelper.createSubchannel(subchannelAddress, subchannelOptions);
-        },
-        updateState: (connectivityState, picker) => {
+      this.childBalancer = new ChildLoadBalancerHandler(experimental.createChildChannelControlHelper(this.parent.channelControlHelper, {
+        updateState: (connectivityState: ConnectivityState, picker: Picker) => {
           this.updateState(connectivityState, picker);
         },
-        requestReresolution: () => {
-          this.parent.channelControlHelper.requestReresolution();
-        }
-      });
+      }));
 
       this.picker = new QueuePicker(this.childBalancer);
     }

packages/grpc-js-xds/src/load-balancer-xds-cluster-manager.ts

@@ -131,17 +131,11 @@ class XdsClusterManager implements LoadBalancer {
     private childBalancer: ChildLoadBalancerHandler;
 
     constructor(private parent: XdsClusterManager, private name: string) {
-      this.childBalancer = new ChildLoadBalancerHandler({
-        createSubchannel: (subchannelAddress, subchannelOptions) => {
-          return this.parent.channelControlHelper.createSubchannel(subchannelAddress, subchannelOptions);
-        },
-        updateState: (connectivityState, picker) => {
+      this.childBalancer = new ChildLoadBalancerHandler(experimental.createChildChannelControlHelper(this.parent.channelControlHelper, {
+        updateState: (connectivityState: ConnectivityState, picker: Picker) => {
           this.updateState(connectivityState, picker);
         },
-        requestReresolution: () => {
-          this.parent.channelControlHelper.requestReresolution();
-        }
-      });
+      }));
 
       this.picker = new QueuePicker(this.childBalancer);
     }

packages/grpc-js/package.json

@@ -15,7 +15,6 @@
   "types": "build/src/index.d.ts",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@grpc/proto-loader": "^0.5.5",
     "@types/gulp": "^4.0.6",
     "@types/gulp-mocha": "0.0.32",
     "@types/lodash": "^4.14.108",
@@ -54,9 +53,11 @@
     "check": "gts check src/**/*.ts",
     "fix": "gts fix src/*.ts",
     "pretest": "npm run compile",
-    "posttest": "npm run check && madge -c ./build/src"
+    "posttest": "npm run check && madge -c ./build/src",
+    "generate-types": "proto-loader-gen-types --keepCase --longs String --enums String --defaults --oneofs --includeComments --includeDirs proto/ -O src/generated/ --grpcLib ../index channelz.proto"
   },
   "dependencies": {
+    "@grpc/proto-loader": "^0.6.4",
     "@types/node": ">=12.12.47"
   },
   "files": [