Merge branch 'master' into grpc-js_channelz

Author: murgatroid99

.gitattributes

@@ -0,0 +1,2 @@
+packages/grpc-js-xds/src/generated/** linguist-generated
+packages/grpc-js-xds/interop/generated/** linguist-generated

MAINTAINERS.md

@@ -8,16 +8,17 @@ See [CONTRIBUTING.md](https://github.com/grpc/grpc-community/blob/master/CONTRIB
 for general contribution guidelines.
 
 ## Maintainers (in alphabetical order)
- - [jiangtaoli2016](https://github.com/jiangtaoli2016), Google Inc.
+ 
  - [jtattermusch](https://github.com/jtattermusch), Google Inc.
  - [murgatroid99](https://github.com/murgatroid99), Google Inc.
  - [nicolasnoble](https://github.com/nicolasnoble), Google Inc.
- - [ofrobots](https://github.com/ofrobots), Google Inc.
  - [srini100](https://github.com/srini100), Google Inc.
- - [WeiranFang](https://github.com/WeiranFang), Google Inc.
  - [wenbozhu](https://github.com/wenbozhu), Google Inc.
 
  ## Emeritus Maintainers (in alphabetical order)
+ - [jiangtaoli2016](https://github.com/jiangtaoli2016), Google Inc.
  - [kjin](https://github.com/kjin), Google Inc.
  - [matt-kwong](https://github.com/matt-kwong), Google Inc.
- 
+ - [ofrobots](https://github.com/ofrobots), Google Inc.
+ - [WeiranFang](https://github.com/WeiranFang), Google Inc.
+ 

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/README.md

@@ -22,4 +22,8 @@ const client = new MyServiceClient('xds:///example.com:123');
 ## Supported Features
 
  - [xDS-Based Global Load Balancing](https://github.com/grpc/proposal/blob/master/A27-xds-global-load-balancing.md)
- - [xDS traffic splitting and routing](https://github.com/grpc/proposal/blob/master/A28-xds-traffic-splitting-and-routing.md)
+ - [xDS traffic splitting and routing](https://github.com/grpc/proposal/blob/master/A28-xds-traffic-splitting-and-routing.md)
+ - [xDS v3 API](https://github.com/grpc/proposal/blob/master/A30-xds-v3.md)
+ - [xDS Timeouts](https://github.com/grpc/proposal/blob/master/A31-xds-timeout-support-and-config-selector.md)
+ - [xDS Circuit Breaking](https://github.com/grpc/proposal/blob/master/A32-xds-circuit-breaking.md)
+ - [xDS Client-Side Fault Injection](https://github.com/grpc/proposal/blob/master/A33-Fault-Injection.md)

packages/grpc-js-xds/package.json

@@ -12,7 +12,7 @@
     "prepare": "npm run compile",
     "pretest": "npm run compile",
     "posttest": "npm run check",
-    "generate-types": "proto-loader-gen-types --keepCase --longs String --enums String --defaults --oneofs --includeComments --includeDirs deps/envoy-api/ deps/udpa/ deps/googleapis/ deps/protoc-gen-validate/ -O src/generated/ --grpcLib @grpc/grpc-js envoy/service/discovery/v2/ads.proto envoy/service/load_stats/v2/lrs.proto envoy/service/discovery/v3/ads.proto envoy/service/load_stats/v3/lrs.proto envoy/config/listener/v3/listener.proto envoy/config/route/v3/route.proto envoy/config/cluster/v3/cluster.proto envoy/config/endpoint/v3/endpoint.proto envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto",
+    "generate-types": "proto-loader-gen-types --keepCase --longs String --enums String --defaults --oneofs --includeComments --includeDirs deps/envoy-api/ deps/udpa/ deps/googleapis/ deps/protoc-gen-validate/ -O src/generated/ --grpcLib @grpc/grpc-js envoy/service/discovery/v2/ads.proto envoy/service/load_stats/v2/lrs.proto envoy/service/discovery/v3/ads.proto envoy/service/load_stats/v3/lrs.proto envoy/config/listener/v3/listener.proto envoy/config/route/v3/route.proto envoy/config/cluster/v3/cluster.proto envoy/config/endpoint/v3/endpoint.proto envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto udpa/type/v1/typed_struct.proto envoy/extensions/filters/http/fault/v3/fault.proto",
     "generate-interop-types": "proto-loader-gen-types --keep-case --longs String --enums String --defaults --oneofs --json --includeComments --includeDirs proto/ -O interop/generated --grpcLib @grpc/grpc-js grpc/testing/test.proto"
   },
   "repository": {

packages/grpc-js-xds/scripts/xds.sh

@@ -48,11 +48,11 @@ git clone -b master --single-branch --depth=1 https://github.com/grpc/grpc.git
 
 grpc/tools/run_tests/helper_scripts/prep_xds.sh
 
-GRPC_NODE_TRACE=xds_client,xds_resolver,cds_balancer,eds_balancer,priority,weighted_target,round_robin,resolving_load_balancer,subchannel,keepalive,dns_resolver \
+GRPC_NODE_TRACE=xds_client,xds_resolver,cds_balancer,eds_balancer,priority,weighted_target,round_robin,resolving_load_balancer,subchannel,keepalive,dns_resolver,fault_injection,http_filter \
   GRPC_NODE_VERBOSITY=DEBUG \
   NODE_XDS_INTEROP_VERBOSITY=1 \
   python3 grpc/tools/run_tests/run_xds_tests.py \
-    --test_case="all,timeout,circuit_breaking" \
+    --test_case="all,timeout,circuit_breaking,fault_injection" \
     --project_id=grpc-testing \
     --source_image=projects/grpc-testing/global/images/xds-test-server-4 \
     --path_to_server_binary=/java_server/grpc-java/interop-testing/build/install/grpc-interop-testing/bin/xds-test-server \

packages/grpc-js-xds/src/environment.ts

@@ -13,4 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
- */
+ */
+
+export const EXPERIMENTAL_FAULT_INJECTION = (process.env.GRPC_XDS_EXPERIMENTAL_FAULT_INJECTION ?? 'true') === 'true';

packages/grpc-js-xds/src/fraction.ts

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2021 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { FractionalPercent__Output } from "./generated/envoy/type/v3/FractionalPercent";
+
+export interface Fraction {
+  numerator: number;
+  denominator: number;
+}
+
+export function fractionToString(fraction: Fraction): string {
+  return `${fraction.numerator}/${fraction.denominator}`;
+}
+
+const RUNTIME_FRACTION_DENOMINATOR_VALUES = {
+  HUNDRED: 100,
+  TEN_THOUSAND: 10_000,
+  MILLION: 1_000_000
+}
+
+export function envoyFractionToFraction(envoyFraction: FractionalPercent__Output): Fraction {
+  return {
+    numerator: envoyFraction.numerator,
+    denominator: RUNTIME_FRACTION_DENOMINATOR_VALUES[envoyFraction.denominator]
+  };
+}