Merge remote-tracking branch 'upstream/main' into add-observability-name

Signed-off-by: Asra Ali <[email protected]>

.bazelrc

@@ -174,7 +174,7 @@ build:rbe-toolchain-asan --linkopt -fuse-ld=lld
 build:rbe-toolchain-asan --action_env=ENVOY_UBSAN_VPTR=1
 build:rbe-toolchain-asan --copt=-fsanitize=vptr,function
 build:rbe-toolchain-asan --linkopt=-fsanitize=vptr,function
-build:rbe-toolchain-asan --linkopt=-L/opt/llvm/lib/clang/10.0.0/lib/linux
+build:rbe-toolchain-asan --linkopt=-L/opt/llvm/lib/clang/11.0.1/lib/linux
 build:rbe-toolchain-asan --linkopt=-l:libclang_rt.ubsan_standalone-x86_64.a
 build:rbe-toolchain-asan --linkopt=-l:libclang_rt.ubsan_standalone_cxx-x86_64.a
 
@@ -246,7 +246,7 @@ build:remote-clang-cl --config=rbe-toolchain-clang-cl
 
 # Docker sandbox
 # NOTE: Update this from https://github.com/envoyproxy/envoy-build-tools/blob/main/toolchains/rbe_toolchains_config.bzl#L8
-build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:c8fa4235714003ba0896287ee2f91cae06e0e407
+build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:d9b1f1cbb24b2cecca768feaa9fa3c6e6660a948
 build:docker-sandbox --spawn_strategy=docker
 build:docker-sandbox --strategy=Javac=docker
 build:docker-sandbox --strategy=Closure=docker

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM gcr.io/envoy-ci/envoy-build:c8fa4235714003ba0896287ee2f91cae06e0e407
+FROM gcr.io/envoy-ci/envoy-build:d9b1f1cbb24b2cecca768feaa9fa3c6e6660a948
 
 ARG USERNAME=vscode
 ARG USER_UID=501

.github/workflows/codeql-daily.yml

@@ -35,15 +35,15 @@ jobs:
       shell: bash
       run: |
        sudo apt-get update && sudo apt-get install libtool cmake automake autoconf make ninja-build curl unzip virtualenv openjdk-11-jdk build-essential libc++1
-       mkdir -p bin/clang10
-       cd bin/clang10
-       wget https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/clang+llvm-10.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz                                                                        
-       tar -xf clang+llvm-10.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz --strip-components 1  
-       export PATH=bin/clang10/bin:$PATH
+       mkdir -p bin/clang11
+       cd bin/clang11
+       wget https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.1/clang+llvm-11.0.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz                                                                        
+       tar -xf clang+llvm-11.0.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz --strip-components 1  
+       export PATH=bin/clang11/bin:$PATH
 
     - name: Build
       run: |
-       bazel/setup_clang.sh bin/clang10
+       bazel/setup_clang.sh bin/clang11
        bazelisk shutdown
        bazelisk build -c fastbuild --spawn_strategy=local --discard_analysis_cache --nouse_action_cache --config clang --config libc++ //source/common/http/... 
 

.github/workflows/codeql-push.yml

@@ -43,15 +43,16 @@ jobs:
       shell: bash
       run: |
        sudo apt-get update && sudo apt-get install libtool cmake automake autoconf make ninja-build curl unzip virtualenv openjdk-11-jdk build-essential libc++1
-       mkdir -p bin/clang10
-       cd bin/clang10
-       wget https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/clang+llvm-10.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz
-       tar -xf clang+llvm-10.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz --strip-components 1
-       export PATH=bin/clang10/bin:$PATH
+       mkdir -p bin/clang11
+       cd bin/clang11
+       wget https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.1/clang+llvm-11.0.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz                                                                        
+       tar -xf clang+llvm-11.0.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz --strip-components 1  
+       export PATH=bin/clang11/bin:$PATH
+
 
     - name: Build
       run: |
-       bazel/setup_clang.sh bin/clang10
+       bazel/setup_clang.sh bin/clang11
        bazelisk shutdown
        bazelisk build -c fastbuild --spawn_strategy=local --discard_analysis_cache --nouse_action_cache --config clang --config libc++ $BUILD_TARGETS
        echo -e "Built targets...\n$BUILD_TARGETS"

.github/workflows/stale.yml

@@ -10,13 +10,13 @@ jobs:
 
     steps:
     - name: Prune Stale
-      uses: actions/[email protected].15
+      uses: actions/[email protected].14
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
-        days-before-issue-stale: 30
-        days-before-issue-close: 7
-        days-before-pr-stale: 10
-        days-before-pr-close: 4
+        # Different amounts of days for issues/PRs are not currently supported but there is a PR
+        # open for it: https://github.com/actions/stale/issues/214
+        days-before-stale: 30
+        days-before-close: 7
         stale-issue-message: >
           This issue has been automatically marked as stale because it has not had activity in the
           last 30 days. It will be closed in the next 7 days unless it is tagged "help wanted" or "no stalebot" or other activity
@@ -27,16 +27,16 @@ jobs:
           Thank you for your contributions.
         stale-pr-message: >
           This pull request has been automatically marked as stale because it has not had
-          activity in the last 10 days. It will be closed in 4 days if no further activity occurs. Please
+          activity in the last 30 days. It will be closed in 7 days if no further activity occurs. Please
           feel free to give a status update now, ping for review, or re-open when it's ready.
           Thank you for your contributions!
         close-pr-message: >
           This pull request has been automatically closed because it has not had
-          activity in the last 14 days. Please feel free to give a status update now, ping for review, or re-open when it's ready.
+          activity in the last 37 days. Please feel free to give a status update now, ping for review, or re-open when it's ready.
           Thank you for your contributions!
         stale-issue-label: 'stale'
         exempt-issue-labels: 'no stalebot,help wanted'
         stale-pr-label: 'stale'
         exempt-pr-labels: 'no stalebot'
         operations-per-run: 500
-        ascending: true
+        ascending: true

CONTRIBUTING.md

@@ -29,7 +29,7 @@ following guidelines for all code, APIs, and documentation:
 * The following words and phrases are not allowed:
   * *Whitelist*: use allowlist instead.
   * *Blacklist*: use denylist or blocklist instead.
-  * *Master*: use primary instead.
+  * *Master*: use primary or main instead.
   * *Slave*: use secondary or replica instead.
 * Documentation should be written in an inclusive style. The [Google developer
   documentation](https://developers.google.com/style/inclusive-documentation) contains an excellent
@@ -238,9 +238,9 @@ and false.
 
 # API changes
 
-If you change anything in the [api tree](https://github.com/envoyproxy/envoy/tree/master/api),
+If you change anything in the [api tree](https://github.com/envoyproxy/envoy/tree/main/api),
 please read the [API Review
-Checklist](https://github.com/envoyproxy/envoy/tree/master/api/review_checklist.md)
+Checklist](https://github.com/envoyproxy/envoy/tree/main/api/review_checklist.md)
 and make sure that your changes have addressed all of the considerations listed there.
 
 # Adding new extensions

GOVERNANCE.md

@@ -100,7 +100,7 @@ or you can subscribe to the iCal feed [here](webcal://kubernetes.app.opsgenie.co
   [stable releases](RELEASES.md#stable-releases).
 * Monitor the AZP tag build to make sure that the final docker images get pushed along with
   the final docs. The final documentation will end up in the
-  [envoyproxy.github.io repository](https://github.com/envoyproxy/envoyproxy.github.io/tree/master/docs/envoy).
+  [envoyproxy.github.io repository](https://github.com/envoyproxy/envoyproxy.github.io/tree/main/docs/envoy).
 * Update the website ([example PR](https://github.com/envoyproxy/envoyproxy.github.io/pull/148)) for the new release.
 * Craft a witty/uplifting email and send it to all the email aliases including envoy-announce@.
 * Make sure we tweet the new release: either have Matt do it or email [email protected] and ask them to do an Envoy account
@@ -169,7 +169,7 @@ take on API shepherd review load and participate in meetings. They should be act
 and responsive to GitHub issues and PRs on which they are tagged.
 
 The API shepherds are distinct to the [UDPA working
-group](https://github.com/cncf/udpa/blob/master/README.md), which aims to evolve xDS directionally
+group](https://github.com/cncf/udpa/blob/main/README.md), which aims to evolve xDS directionally
 towards a universal dataplane API. API shepherds are responsible for the execution of the xDS
 day-to-day and guiding xDS implementation changes. Proposals from UDPA-WG will be aligned with the
 xDS API shepherds to ensure that xDS is heading towards the UDPA goal. xDS API shepherds operate

PULL_REQUESTS.md

@@ -114,8 +114,8 @@ cleaning up the deprecated code path.
 
 ### <a name="api"></a>API Changes
 
-If this PR changes anything in the [api tree](https://github.com/envoyproxy/envoy/tree/master/api),
+If this PR changes anything in the [api tree](https://github.com/envoyproxy/envoy/tree/main/api),
 please read the [API Review
-Checklist](https://github.com/envoyproxy/envoy/tree/master/api/review_checklist.md)
+Checklist](https://github.com/envoyproxy/envoy/tree/main/api/review_checklist.md)
 and make sure that your changes have addressed all of the considerations listed there.
 Any relevant considerations should be documented under "API Considerations" in the PR description.

PULL_REQUEST_TEMPLATE.md

@@ -22,4 +22,4 @@ Platform Specific Features:
 [Optional Runtime guard:]
 [Optional Fixes #Issue]
 [Optional Deprecated:]
-[Optional [API Considerations](https://github.com/envoyproxy/envoy/blob/master/api/review_checklist.md):]
+[Optional [API Considerations](https://github.com/envoyproxy/envoy/blob/main/api/review_checklist.md):]

api/envoy/config/cluster/v3/outlier_detection.proto

@@ -151,7 +151,7 @@ message OutlierDetection {
   google.protobuf.UInt32Value failure_percentage_request_volume = 20;
 
   // The maximum time that a host is ejected for. See :ref:`base_ejection_time<envoy_api_field_config.cluster.v3.OutlierDetection.base_ejection_time>`
-  // for more information.
-  // Defaults to 300000ms or 300s.
+  // for more information. If not specified, the default value (300000ms or 300s) or
+  // :ref:`base_ejection_time<envoy_api_field_config.cluster.v3.OutlierDetection.base_ejection_time>` value is applied, whatever is larger.
   google.protobuf.Duration max_ejection_time = 21 [(validate.rules).duration = {gt {}}];
 }

api/envoy/config/core/v3/base.proto

@@ -12,6 +12,8 @@ import "google/protobuf/any.proto";
 import "google/protobuf/struct.proto";
 import "google/protobuf/wrappers.proto";
 
+import "xds/core/v3/context_params.proto";
+
 import "udpa/annotations/migrate.proto";
 import "udpa/annotations/status.proto";
 import "udpa/annotations/versioning.proto";
@@ -131,7 +133,7 @@ message Extension {
 // Identifies a specific Envoy instance. The node identifier is presented to the
 // management server, which may use this identifier to distinguish per Envoy
 // configuration for serving.
-// [#next-free-field: 12]
+// [#next-free-field: 13]
 message Node {
   option (udpa.annotations.versioning).previous_message_type = "envoy.api.v2.core.Node";
 
@@ -165,6 +167,13 @@ message Node {
   // directly to the management server.
   google.protobuf.Struct metadata = 3;
 
+  // Map from xDS resource type URL to dynamic context parameters. These may vary at runtime (unlike
+  // other fields in this message). For example, the xDS client may have a shard identifier that
+  // changes during the lifetime of the xDS client. In Envoy, this would be achieved by updating the
+  // dynamic context on the Server::Instance's LocalInfo context provider. The shard ID dynamic
+  // parameter then appears in this field during future discovery requests.
+  map<string, xds.core.v3.ContextParams> dynamic_parameters = 12;
+
   // Locality specifying where the Envoy instance is running.
   Locality locality = 4;
 

api/envoy/config/listener/v3/listener_components.proto

@@ -35,10 +35,10 @@ message Filter {
   // :ref:`supported filter <config_network_filters>`.
   string name = 1 [(validate.rules).string = {min_len: 1}];
 
-  // [#extension-category: envoy.filters.network]
   oneof config_type {
     // Filter specific configuration which depends on the filter being
     // instantiated. See the supported filters for further documentation.
+    // [#extension-category: envoy.filters.network]
     google.protobuf.Any typed_config = 4;
 
     // Configuration source specifier for an extension configuration discovery
@@ -240,6 +240,7 @@ message FilterChain {
   // :ref:`DownstreamTlsContext <envoy_api_msg_extensions.transport_sockets.tls.v3.DownstreamTlsContext>` in the `typed_config`.
   // If no transport socket configuration is specified, new connections
   // will be set up with plaintext.
+  // [#extension-category: envoy.transport_sockets.downstream]
   core.v3.TransportSocket transport_socket = 6;
 
   // If present and nonzero, the amount of time to allow incoming connections to complete any
@@ -332,13 +333,12 @@ message ListenerFilter {
 
   // The name of the filter to instantiate. The name must match a
   // :ref:`supported filter <config_listener_filters>`.
-  // [#extension-category: envoy.transport_sockets.downstream]
   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.
-  // [#extension-category: envoy.filters.listener]
   oneof config_type {
+    // Filter specific configuration which depends on the filter being
+    // instantiated. See the supported filters for further documentation.
+    // [#extension-category: envoy.filters.listener]
     google.protobuf.Any typed_config = 3;
   }
 

api/envoy/extensions/internal_redirect/safe_cross_scheme/v3/safe_cross_scheme_config.proto

@@ -16,7 +16,6 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE;
 // redirect and b) safe cross scheme redirect, which means if the downstream
 // scheme is HTTPS, both HTTPS and HTTP redirect targets are allowed, but if the
 // downstream scheme is HTTP, only HTTP redirect targets are allowed.
-// [#extension:
-// envoy.internal_redirect_predicates.safe_cross_scheme]
+// [#extension: envoy.internal_redirect_predicates.safe_cross_scheme]
 message SafeCrossSchemeConfig {
 }

api/review_checklist.md

@@ -106,7 +106,7 @@ consider the answers to these questions before sending a PR.
 - Does this feature pull in any new dependencies for clients?
 - Are these dependencies optional or required?
 - Will the dependencies cause problems for any known xDS clients (e.g.,
-  [Envoy's dependency policy](https://github.com/envoyproxy/envoy/blob/master/DEPENDENCY_POLICY.md))?
+  [Envoy's dependency policy](https://github.com/envoyproxy/envoy/blob/main/DEPENDENCY_POLICY.md))?
 
 ## Failure Modes
 - What is the failure mode if this feature is configured but is not working

bazel/BUILD

@@ -1,6 +1,7 @@
 load("@rules_cc//cc:defs.bzl", "cc_library", "cc_proto_library")
 load("//bazel:envoy_build_system.bzl", "envoy_package")
 load("//bazel:envoy_internal.bzl", "envoy_select_force_libcpp")
+load("@bazel_skylib//lib:selects.bzl", "selects")
 
 licenses(["notice"])  # Apache 2
 
@@ -167,12 +168,36 @@ config_setting(
 )
 
 config_setting(
-    name = "gcc_build",
+    name = "gcc_build_gcc",
     flag_values = {
         "@bazel_tools//tools/cpp:compiler": "gcc",
     },
 )
 
+# This is needed due to a Bazel bug (https://github.com/bazelbuild/bazel/issues/12707)
+config_setting(
+    name = "gcc_build_compiler",
+    flag_values = {
+        "@bazel_tools//tools/cpp:compiler": "compiler",
+    },
+)
+
+selects.config_setting_group(
+    name = "gcc_build_compiler_on_linux",
+    match_all = [
+        ":gcc_build_compiler",
+        ":linux",
+    ],
+)
+
+selects.config_setting_group(
+    name = "gcc_build",
+    match_any = [
+        ":gcc_build_gcc",
+        ":gcc_build_compiler_on_linux",
+    ],
+)
+
 config_setting(
     name = "dynamic_link_tests",
     values = {
@@ -299,6 +324,11 @@ config_setting(
     values = {"define": "log_debug_assert_in_release=enabled"},
 )
 
+config_setting(
+    name = "enable_log_fast_debug_assert_in_release",
+    values = {"define": "log_fast_debug_assert_in_release=enabled"},
+)
+
 config_setting(
     name = "disable_known_issue_asserts",
     values = {"define": "disable_known_issue_asserts=true"},