From 597fc1c57bac0c83e2864940007643a644fa7990 Mon Sep 17 00:00:00 2001 From: Michael Lumish Date: Thu, 27 Aug 2020 18:14:03 -0700 Subject: [PATCH] Use the same channel for ADS and LRS clients --- packages/grpc-js/src/channel-options.ts | 2 +- packages/grpc-js/src/xds-client.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/grpc-js/src/channel-options.ts b/packages/grpc-js/src/channel-options.ts index 8c4756ec..ee4833b4 100644 --- a/packages/grpc-js/src/channel-options.ts +++ b/packages/grpc-js/src/channel-options.ts @@ -33,7 +33,7 @@ export interface ChannelOptions { 'grpc.max_send_message_length'?: number; 'grpc.max_receive_message_length'?: number; 'grpc.enable_http_proxy'?: number; - [key: string]: string | number | undefined; + [key: string]: any; } /** diff --git a/packages/grpc-js/src/xds-client.ts b/packages/grpc-js/src/xds-client.ts index 327f2156..1c4f149b 100644 --- a/packages/grpc-js/src/xds-client.ts +++ b/packages/grpc-js/src/xds-client.ts @@ -816,7 +816,7 @@ export class XdsClient { this.lrsClient = new protoDefinitions.envoy.service.load_stats.v2.LoadReportingService( bootstrapInfo.xdsServers[0].serverUri, createGoogleDefaultCredentials(), - channelArgs + {channelOverride: this.adsClient.getChannel()} ); this.maybeStartLrsStream(); },