Merge branch 'master' into prefetch

Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
envoyproxy · Jan 13, 2021 · dbb54a7 · dbb54a7
2 parents ff6aba8 + c151936
commit dbb54a7
Show file tree

Hide file tree

Showing 68 changed files with 1,334 additions and 287 deletions.
diff --git a/.azure-pipelines/pipelines.yml b/.azure-pipelines/pipelines.yml
@@ -54,6 +54,7 @@ stages:
           - script: ci/run_envoy_docker.sh 'ci/do_ci.sh docs'
             workingDirectory: $(Build.SourcesDirectory)
             env:
+              AZP_BRANCH: $(Build.SourceBranch)
               ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory)
               BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com
               BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance
@@ -303,6 +304,7 @@ stages:
           - script: ci/run_envoy_docker.sh 'ci/do_ci.sh docs'
             workingDirectory: $(Build.SourcesDirectory)
             env:
+              AZP_BRANCH: $(Build.SourceBranch)
               ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory)
               BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com
               BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance
@@ -321,7 +323,6 @@ stages:
             workingDirectory: $(Build.SourcesDirectory)
             env:
               AZP_BRANCH: $(Build.SourceBranch)
-              AZP_SHA1: $(Build.SourceVersion)
 
   - stage: verify
     dependsOn: ["docker"]

diff --git a/REPO_LAYOUT.md b/REPO_LAYOUT.md
@@ -89,6 +89,8 @@ code/extensions, and allows us specify extension owners in [CODEOWNERS](CODEOWNE
     `Envoy::Extensions::ListenerFilters` namespace.
   * [filters/network/](/source/extensions/filters/network): L4 network filters which use the
     `Envoy::Extensions::NetworkFilters` namespace.
+  * [formatters](/source/extensions/formatters): Access log formatters which use the
+    `Envoy::Extensions::Formatters` namespace.
   * [grpc_credentials/](/source/extensions/grpc_credentials): Custom gRPC credentials which use the
     `Envoy::Extensions::GrpcCredentials` namespace.
   * [health_checker/](/source/extensions/health_checker): Custom health checkers which use the

diff --git a/api/BUILD b/api/BUILD
@@ -144,6 +144,7 @@ proto_library(
         "//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg",
         "//envoy/config/resource_monitor/injected_resource/v2alpha:pkg",
         "//envoy/config/retry/omit_canary_hosts/v2:pkg",
+        "//envoy/config/retry/omit_canary_hosts/v3:pkg",
         "//envoy/config/retry/previous_hosts/v2:pkg",
         "//envoy/config/route/v3:pkg",
         "//envoy/config/tap/v3:pkg",

diff --git a/api/envoy/config/core/v3/substitution_format_string.proto b/api/envoy/config/core/v3/substitution_format_string.proto
@@ -3,7 +3,9 @@ syntax = "proto3";
 package envoy.config.core.v3;
 
 import "envoy/config/core/v3/base.proto";
+import "envoy/config/core/v3/extension.proto";
 
+import "google/protobuf/any.proto";
 import "google/protobuf/struct.proto";
 
 import "udpa/annotations/status.proto";
@@ -18,7 +20,7 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // Configuration to use multiple :ref:`command operators <config_access_log_command_operators>`
 // to generate a new string in either plain text or JSON format.
-// [#next-free-field: 6]
+// [#next-free-field: 7]
 message SubstitutionFormatString {
   oneof format {
     option (validate.required) = true;
@@ -103,4 +105,8 @@ message SubstitutionFormatString {
   //   content_type: "text/html; charset=UTF-8"
   //
   string content_type = 4;
+
+  // Specifies a collection of Formatter plugins that can be called from the access log configuration.
+  // See the formatters extensions documentation for details.
+  repeated TypedExtensionConfig formatters = 6;
 }
diff --git a/api/envoy/config/core/v4alpha/substitution_format_string.proto b/api/envoy/config/core/v4alpha/substitution_format_string.proto
diff --git a/api/envoy/config/listener/v3/listener_components.proto b/api/envoy/config/listener/v3/listener_components.proto
@@ -4,6 +4,7 @@ package envoy.config.listener.v3;
 
 import "envoy/config/core/v3/address.proto";
 import "envoy/config/core/v3/base.proto";
+import "envoy/config/core/v3/extension.proto";
 import "envoy/type/v3/range.proto";
 
 import "google/protobuf/any.proto";
@@ -23,6 +24,7 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE;
 // [#protodoc-title: Listener components]
 // Listener :ref:`configuration overview <config_listeners>`
 
+// [#next-free-field: 6]
 message Filter {
   option (udpa.annotations.versioning).previous_message_type = "envoy.api.v2.listener.Filter";
 
@@ -34,10 +36,16 @@ message Filter {
   // :ref:`supported filter <config_network_filters>`.
   string name = 1 [(validate.rules).string = {min_len: 1}];
 
-  // Filter specific configuration which depends on the filter being
-  // instantiated. See the supported filters for further documentation.
   oneof config_type {
+    // Filter specific configuration which depends on the filter being
+    // instantiated. See the supported filters for further documentation.
     google.protobuf.Any typed_config = 4;
+
+    // Configuration source specifier for an extension configuration discovery
+    // service. In case of a failure and without the default configuration, the
+    // listener closes the connections.
+    // [#not-implemented-hide:]
+    core.v3.ExtensionConfigSource config_discovery = 5;
   }
 }
 

diff --git a/api/envoy/config/listener/v4alpha/listener_components.proto b/api/envoy/config/listener/v4alpha/listener_components.proto
diff --git a/api/envoy/config/retry/omit_canary_hosts/v3/BUILD b/api/envoy/config/retry/omit_canary_hosts/v3/BUILD
@@ -0,0 +1,9 @@
+# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py.
+
+load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
+
+licenses(["notice"])  # Apache 2
+
+api_proto_package(
+    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+)
diff --git a/api/envoy/config/retry/omit_canary_hosts/v3/omit_canary_hosts.proto b/api/envoy/config/retry/omit_canary_hosts/v3/omit_canary_hosts.proto
@@ -0,0 +1,16 @@
+syntax = "proto3";
+
+package envoy.config.retry.omit_canary_hosts.v3;
+
+import "udpa/annotations/status.proto";
+
+option java_package = "io.envoyproxy.envoy.config.retry.omit_canary_hosts.v3";
+option java_outer_classname = "OmitCanaryHostsProto";
+option java_multiple_files = true;
+option (udpa.annotations.file_status).package_version_status = ACTIVE;
+
+// [#protodoc-title: Omit Canary Hosts Predicate]
+// [#extension: envoy.retry_host_predicates.omit_canary_hosts]
+
+message OmitCanaryHostsPredicate {
+}
diff --git a/api/versioning/BUILD b/api/versioning/BUILD
@@ -27,6 +27,7 @@ proto_library(
         "//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg",
         "//envoy/config/resource_monitor/injected_resource/v2alpha:pkg",
         "//envoy/config/retry/omit_canary_hosts/v2:pkg",
+        "//envoy/config/retry/omit_canary_hosts/v3:pkg",
         "//envoy/config/retry/previous_hosts/v2:pkg",
         "//envoy/config/route/v3:pkg",
         "//envoy/config/tap/v3:pkg",

diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
@@ -505,13 +505,13 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         project_name = "grpc-httpjson-transcoding",
         project_desc = "Library that supports transcoding so that HTTP/JSON can be converted to gRPC",
         project_url = "https://github.com/grpc-ecosystem/grpc-httpjson-transcoding",
-        version = "4d095f048889d4fc3b8d4579aa80ca4290319802",
-        sha256 = "7af66e0674340932683ab4f04ea6f03e2550849a54741738d94310b84d396a2c",
+        version = "22160afc7e67b9becce3198f8a6a321f01a3cef8",
+        sha256 = "d761b6442f600b628f5e420b601824757dfdbea6c12ac86cd59dbaa53d20d343",
         strip_prefix = "grpc-httpjson-transcoding-{version}",
         urls = ["https://github.com/grpc-ecosystem/grpc-httpjson-transcoding/archive/{version}.tar.gz"],
         use_category = ["dataplane_ext"],
         extensions = ["envoy.filters.http.grpc_json_transcoder"],
-        release_date = "2020-11-13",
+        release_date = "2021-01-06",
         cpe = "N/A",
     ),
     io_bazel_rules_go = dict(

diff --git a/docs/root/api-v3/config/retry/retry.rst b/docs/root/api-v3/config/retry/retry.rst
@@ -7,4 +7,5 @@ Retry Predicates
 
   */empty/*
   */v2/*
+  */v3/*
   ../../extensions/retry/**/v3/*
diff --git a/docs/root/extending/extending.rst b/docs/root/extending/extending.rst
@@ -26,6 +26,7 @@ types including:
 * :ref:`Compression libraries <arch_overview_compression_libraries>`
 * :ref:`Bootstrap extensions <envoy_v3_api_field_config.bootstrap.v3.Bootstrap.bootstrap_extensions>`
 * :ref:`Fatal actions <envoy_v3_api_field_config.bootstrap.v3.Bootstrap.fatal_actions>`
+* :ref:`Formatters <config_access_log_command_operators>`
 
 As of this writing there is no high level extension developer documentation. The
 :repo:`existing extensions <source/extensions>` are a good way to learn what is possible.

diff --git a/docs/root/version_history/current.rst b/docs/root/version_history/current.rst
@@ -9,16 +9,28 @@ Minor Behavior Changes
 ----------------------
 *Changes that may cause incompatibilities for some users, but should not for most*
 
+* upstream: host weight changes now cause a full load balancer rebuild as opposed to happening
+  atomically inline. This change has been made to support load balancer pre-computation of data
+  structures based on host weight, but may have performance implications if host weight changes
+  are very frequent. This change can be disabled by setting the `envoy.reloadable_features.upstream_host_weight_change_causes_rebuild`
+  feature flag to false. If setting this flag to false is required in a deployment please open an
+  issue against the project.
+
 Bug Fixes
 ---------
 *Changes expected to improve the state of the world and are unlikely to have negative effects*
 
+* active http health checks: properly handles HTTP/2 GOAWAY frames from the upstream. Previously a GOAWAY frame due to a graceful listener drain could cause improper failed health checks due to streams being refused by the upstream on a connection that is going away. To revert to old GOAWAY handling behavior, set the runtime feature `envoy.reloadable_features.health_check.graceful_goaway_handling` to false.
+
 Removed Config or Runtime
 -------------------------
 *Normally occurs at the end of the* :ref:`deprecation period <deprecated>`
 
+* access_logs: removed legacy unbounded access logs and runtime guard `envoy.reloadable_features.disallow_unbounded_access_logs`.
+
 New Features
 ------------
+* access log: added the :ref:`formatters <envoy_v3_api_field_config.core.v3.SubstitutionFormatString.formatters>` extension point for custom formatters (command operators).
 * http: added support for :ref:`:ref:`preconnecting <envoy_v3_api_msg_config.cluster.v3.Cluster.PreconnectPolicy>`. Preconnecting is off by default, but recommended for clusters serving latency-sensitive traffic, especially if using HTTP/1.1.
 * tcp_proxy: add support for converting raw TCP streams into HTTP/1.1 CONNECT requests. See :ref:`upgrade documentation <tunneling-tcp-over-http>` for details.
 

diff --git a/examples/wasm-cc/README.md b/examples/wasm-cc/README.md
@@ -1,59 +1,2 @@
-# Envoy WebAssembly Filter
-
-In this example, we show how a WebAssembly(WASM) filter can be used with the Envoy
-proxy. The Envoy proxy [configuration](./envoy.yaml) includes a Webassembly filter
-as documented [here](https://www.envoyproxy.io/docs/envoy/latest/).
-<!--TODO(bianpengyuan): change to the url of Wasm filter once the doc is ready.-->
-
-
-
-## Quick Start
-
-1. `docker-compose build`
-2. `docker-compose up`
-3. `curl -v localhost:18000`
-
-Curl output should include our headers:
-
-```
-# <b> curl -v localhost:8000</b>
-* Rebuilt URL to: localhost:18000/
-*   Trying 127.0.0.1...
-* TCP_NODELAY set
-* Connected to localhost (127.0.0.1) port 18000 (#0)
-> GET / HTTP/1.1
-> Host: localhost:18000
-> User-Agent: curl/7.58.0
-> Accept: */*
-> 
-< HTTP/1.1 200 OK
-< content-length: 13
-< content-type: text/plain
-< location: envoy-wasm
-< date: Tue, 09 Jul 2019 00:47:14 GMT
-< server: envoy
-< x-envoy-upstream-service-time: 0
-< newheader: newheadervalue
-< 
-example body
-* Connection #0 to host localhost left intact
-```
-
-## Build WASM Module
-
-Now you want to make changes to the C++ filter ([envoy_filter_http_wasm_example.cc](envoy_filter_http_wasm_example.cc))
-and build the WASM module ([envoy_filter_http_wasm_example.wasm](envoy_filter_http_wasm_example.wasm)).
-
-1. Build WASM module
-   ```shell
-   bazel build //examples/wasm:envoy_filter_http_wasm_example.wasm
-   ```
-
-## Build the Envoy WASM Image
-
-<!--TODO(incfly): remove this once we upstream WASM to envoyproxy main repo.-->
-
-For Envoy WASM runtime developers, if you want to make changes, please
-
-1. Follow [instructions](https://github.com/envoyproxy/envoy-wasm/blob/master/WASM.md).
-2. Modify `docker-compose.yaml` to mount your own Envoy.
+To learn about this sandbox and for instructions on how to run it please head over
+to the [envoy docs](https://www.envoyproxy.io/docs/envoy/latest/start/sandboxes/wasm-cc).
diff --git a/generated_api_shadow/envoy/config/core/v3/substitution_format_string.proto b/generated_api_shadow/envoy/config/core/v3/substitution_format_string.proto
diff --git a/generated_api_shadow/envoy/config/core/v4alpha/substitution_format_string.proto b/generated_api_shadow/envoy/config/core/v4alpha/substitution_format_string.proto
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,4 +7,5 @@ Retry Predicates @@
       */empty/*
       */v2/*
+      */v3/*
       ../../extensions/retry/**/v3/*