Update Envoy SHA to 436946bb9d (2021-06-04).

.bazelversion

@@ -1 +1 @@
-3.7.2
+4.1.0

WORKSPACE

@@ -38,10 +38,10 @@ bind(
 # 2. Update .bazelversion, envoy.bazelrc and .bazelrc if needed.
 #
 # Note: this is needed by release builder to resolve envoy dep sha to tag.
-# Commit date: 2021-05-18
-ENVOY_SHA = "ea32578cc8fd79e0d55ed2ee3a873d2ffb45bb8a"
+# Commit date: 2021-06-04
+ENVOY_SHA = "436946bb9df0acda0e4e709592205f0d199dfb79"
 
-ENVOY_SHA256 = "d46981a5ad08db489fd59df3fa14e29f13766ccfc8889cfb9508541e8cb80a54"
+ENVOY_SHA256 = "bc6218475a7333b4ca5af106761ee034d47a94350d5507114a692860362f101a"
 
 ENVOY_ORG = "envoyproxy"
 

envoy.bazelrc

@@ -105,9 +105,12 @@ build:clang-msan --config=sanitizer
 build:clang-msan --define ENVOY_CONFIG_MSAN=1
 build:clang-msan --copt -fsanitize=memory
 build:clang-msan --linkopt -fsanitize=memory
+build:clang-msan --linkopt -fuse-ld=lld
 build:clang-msan --copt -fsanitize-memory-track-origins=2
+build:clang-msan --test_env=MSAN_SYMBOLIZER_PATH
 # MSAN needs -O1 to get reasonable performance.
 build:clang-msan --copt -O1
+build:clang-msan --copt -fno-optimize-sibling-calls
 
 # Clang with libc++
 build:libc++ --config=clang

extensions/access_log_policy/config.cc

@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#include "common/common/base64.h"
 #include "extensions/access_log_policy/plugin.h"
+#include "source/common/common/base64.h"
 
 namespace proxy_wasm {
 namespace null_plugin {

extensions/access_log_policy/plugin.cc

@@ -29,7 +29,7 @@
 
 #else
 
-#include "common/common/base64.h"
+#include "source/common/common/base64.h"
 namespace proxy_wasm {
 namespace null_plugin {
 namespace AccessLogPolicy {

extensions/attributegen/plugin_test.cc

@@ -16,15 +16,15 @@
 #include <set>
 #include <unordered_map>
 
-#include "common/buffer/buffer_impl.h"
-#include "common/http/message_impl.h"
-#include "common/stats/isolated_store_impl.h"
-#include "common/stream_info/stream_info_impl.h"
 #include "envoy/server/lifecycle_notifier.h"
-#include "extensions/filters/common/expr/cel_state.h"
-#include "extensions/filters/http/wasm/wasm_filter.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/common/stream_info/stream_info_impl.h"
+#include "source/extensions/filters/common/expr/cel_state.h"
+#include "source/extensions/filters/http/wasm/wasm_filter.h"
 #include "test/mocks/grpc/mocks.h"
 #include "test/mocks/http/mocks.h"
 #include "test/mocks/network/mocks.h"

extensions/common/proto_util_speed_test.cc

@@ -14,11 +14,11 @@
  */
 
 #include "benchmark/benchmark.h"
-#include "common/stream_info/filter_state_impl.h"
 #include "extensions/common/node_info_generated.h"
 #include "extensions/common/proto_util.h"
-#include "extensions/filters/common/expr/cel_state.h"
 #include "google/protobuf/util/json_util.h"
+#include "source/common/stream_info/filter_state_impl.h"
+#include "source/extensions/filters/common/expr/cel_state.h"
 
 // WASM_PROLOG
 #ifdef NULL_PLUGIN

extensions/metadata_exchange/config.cc

@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#include "common/common/base64.h"
 #include "include/proxy-wasm/null_plugin.h"
+#include "source/common/common/base64.h"
 
 namespace proxy_wasm {
 namespace null_plugin {

extensions/metadata_exchange/plugin.cc

@@ -28,7 +28,7 @@
 
 #else
 
-#include "common/common/base64.h"
+#include "source/common/common/base64.h"
 #include "source/extensions/common/wasm/ext/declare_property.pb.h"
 
 namespace proxy_wasm {

src/envoy/extensions/wasm/wasm.cc

@@ -12,11 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "extensions/common/wasm/wasm.h"
+#include "source/extensions/common/wasm/wasm.h"
 
-#include "common/stats/utility.h"
-#include "common/version/version.h"
-#include "server/admin/prometheus_stats.h"
+#include "source/common/stats/utility.h"
+#include "source/common/version/version.h"
+#include "source/server/admin/prometheus_stats.h"
 #include "src/envoy/extensions/wasm/context.h"
 
 namespace Envoy {

src/envoy/http/alpn/BUILD

@@ -31,7 +31,7 @@ envoy_cc_library(
     repository = "@envoy",
     deps = [
         "//external:alpn_filter_config_cc_proto",
-        "@envoy//include/envoy/http:filter_interface",
+        "@envoy//envoy/http:filter_interface",
         "@envoy//source/common/network:application_protocol_lib",
         "@envoy//source/extensions/filters/http/common:pass_through_filter_lib",
     ],
@@ -46,7 +46,7 @@ envoy_cc_library(
     deps = [
         ":alpn_filter",
         "//src/envoy/utils:filter_names_lib",
-        "@envoy//include/envoy/registry",
+        "@envoy//envoy/registry",
         "@envoy//source/exe:envoy_common_lib",
         "@envoy//source/extensions/filters/http/common:factory_base_lib",
     ],

src/envoy/http/alpn/alpn_filter.cc

@@ -15,8 +15,8 @@
 
 #include "src/envoy/http/alpn/alpn_filter.h"
 
-#include "common/network/application_protocol.h"
 #include "envoy/upstream/cluster_manager.h"
+#include "source/common/network/application_protocol.h"
 
 namespace Envoy {
 namespace Http {

src/envoy/http/alpn/alpn_filter.h

@@ -16,7 +16,7 @@
 #pragma once
 
 #include "envoy/config/filter/http/alpn/v2alpha1/config.pb.h"
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 namespace Envoy {
 namespace Http {

src/envoy/http/alpn/alpn_test.cc

@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-#include "common/network/application_protocol.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
+#include "source/common/network/application_protocol.h"
 #include "src/envoy/http/alpn/alpn_filter.h"
 #include "test/mocks/http/mocks.h"
 #include "test/mocks/upstream/mocks.h"

src/envoy/http/alpn/config.cc

@@ -15,7 +15,7 @@
 
 #include "src/envoy/http/alpn/config.h"
 
-#include "common/protobuf/message_validator_impl.h"
+#include "source/common/protobuf/message_validator_impl.h"
 #include "src/envoy/http/alpn/alpn_filter.h"
 #include "src/envoy/utils/filter_names.h"
 

src/envoy/http/alpn/config.h

@@ -16,7 +16,7 @@
 #pragma once
 
 #include "envoy/config/filter/http/alpn/v2alpha1/config.pb.h"
-#include "extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/common/factory_base.h"
 
 namespace Envoy {
 namespace Http {

src/envoy/http/authn/authenticator_base.cc

@@ -15,8 +15,8 @@
 
 #include "src/envoy/http/authn/authenticator_base.h"
 
-#include "common/common/assert.h"
-#include "common/config/metadata.h"
+#include "source/common/common/assert.h"
+#include "source/common/config/metadata.h"
 #include "src/envoy/http/authn/authn_utils.h"
 #include "src/envoy/utils/filter_names.h"
 #include "src/envoy/utils/utils.h"

src/envoy/http/authn/authenticator_base.h

@@ -16,7 +16,7 @@
 #pragma once
 
 #include "authentication/v1alpha1/policy.pb.h"
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 #include "src/envoy/http/authn/filter_context.h"
 #include "src/istio/authn/context.pb.h"
 

src/envoy/http/authn/authenticator_base_test.cc

@@ -15,11 +15,11 @@
 
 #include "src/envoy/http/authn/authenticator_base.h"
 
-#include "common/common/base64.h"
-#include "common/protobuf/protobuf.h"
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/config/filter/http/authn/v2alpha1/config.pb.h"
 #include "gmock/gmock.h"
+#include "source/common/common/base64.h"
+#include "source/common/protobuf/protobuf.h"
 #include "src/envoy/http/authn/test_utils.h"
 #include "src/envoy/utils/filter_names.h"
 #include "test/mocks/network/mocks.h"

src/envoy/http/authn/authn_utils.h

@@ -16,9 +16,9 @@
 #pragma once
 
 #include "authentication/v1alpha1/policy.pb.h"
-#include "common/common/logger.h"
-#include "common/common/utility.h"
 #include "envoy/http/header_map.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/utility.h"
 #include "src/istio/authn/context.pb.h"
 
 namespace iaapi = istio::authentication::v1alpha1;

src/envoy/http/authn/authn_utils_test.cc

@@ -14,8 +14,8 @@
  */
 #include "src/envoy/http/authn/authn_utils.h"
 
-#include "common/common/base64.h"
-#include "common/common/utility.h"
+#include "source/common/common/base64.h"
+#include "source/common/common/utility.h"
 #include "src/envoy/http/authn/test_utils.h"
 #include "test/test_common/utility.h"
 

src/envoy/http/authn/filter_context.h

@@ -16,12 +16,12 @@
 #pragma once
 
 #include "authentication/v1alpha1/policy.pb.h"
-#include "common/common/logger.h"
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/config/filter/http/authn/v2alpha1/config.pb.h"
 #include "envoy/http/filter.h"
 #include "envoy/network/connection.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/filters/http/well_known_names.h"
 #include "src/istio/authn/context.pb.h"
 
 namespace Envoy {

src/envoy/http/authn/http_filter.cc

@@ -16,8 +16,8 @@
 #include "src/envoy/http/authn/http_filter.h"
 
 #include "authentication/v1alpha1/policy.pb.h"
-#include "common/http/utility.h"
 #include "envoy/config/filter/http/authn/v2alpha1/config.pb.h"
+#include "source/common/http/utility.h"
 #include "src/envoy/http/authn/origin_authenticator.h"
 #include "src/envoy/http/authn/peer_authenticator.h"
 #include "src/envoy/utils/authn.h"

src/envoy/http/authn/http_filter.h

@@ -15,9 +15,9 @@
 
 #pragma once
 
-#include "common/common/logger.h"
 #include "envoy/config/filter/http/authn/v2alpha1/config.pb.h"
 #include "envoy/http/filter.h"
+#include "source/common/common/logger.h"
 #include "src/envoy/http/authn/authenticator_base.h"
 #include "src/envoy/http/authn/filter_context.h"
 

src/envoy/http/authn/http_filter_integration_test.cc

@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-#include "common/common/base64.h"
-#include "common/common/utility.h"
-#include "extensions/filters/http/well_known_names.h"
 #include "fmt/printf.h"
+#include "source/common/common/base64.h"
+#include "source/common/common/utility.h"
+#include "source/extensions/filters/http/well_known_names.h"
 #include "src/envoy/utils/filter_names.h"
 #include "src/istio/authn/context.pb.h"
 #include "test/integration/http_protocol_integration.h"

src/envoy/http/authn/http_filter_test.cc

@@ -15,12 +15,12 @@
 
 #include "src/envoy/http/authn/http_filter.h"
 
-#include "common/common/base64.h"
-#include "common/http/header_map_impl.h"
-#include "common/stream_info/stream_info_impl.h"
 #include "envoy/config/filter/http/authn/v2alpha1/config.pb.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
+#include "source/common/common/base64.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/stream_info/stream_info_impl.h"
 #include "src/envoy/http/authn/authenticator_base.h"
 #include "src/envoy/http/authn/test_utils.h"
 #include "src/envoy/utils/authn.h"

src/envoy/http/authn/origin_authenticator.cc

@@ -17,8 +17,8 @@
 
 #include "absl/strings/match.h"
 #include "authentication/v1alpha1/policy.pb.h"
-#include "common/http/headers.h"
-#include "common/http/utility.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/utility.h"
 #include "src/envoy/http/authn/authn_utils.h"
 
 using istio::authn::Payload;

src/envoy/http/authn/origin_authenticator_test.cc

@@ -16,10 +16,10 @@
 #include "src/envoy/http/authn/origin_authenticator.h"
 
 #include "authentication/v1alpha1/policy.pb.h"
-#include "common/protobuf/protobuf.h"
 #include "envoy/config/core/v3/base.pb.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
+#include "source/common/protobuf/protobuf.h"
 #include "src/envoy/http/authn/test_utils.h"
 #include "test/mocks/http/mocks.h"
 #include "test/test_common/utility.h"

src/envoy/http/authn/peer_authenticator.cc

@@ -15,7 +15,7 @@
 
 #include "src/envoy/http/authn/peer_authenticator.h"
 
-#include "common/http/utility.h"
+#include "source/common/http/utility.h"
 #include "src/envoy/utils/utils.h"
 
 using istio::authn::Payload;

src/envoy/http/authn/peer_authenticator_test.cc

@@ -16,10 +16,10 @@
 #include "src/envoy/http/authn/peer_authenticator.h"
 
 #include "authentication/v1alpha1/policy.pb.h"
-#include "common/protobuf/protobuf.h"
 #include "envoy/config/core/v3/base.pb.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
+#include "source/common/protobuf/protobuf.h"
 #include "src/envoy/http/authn/test_utils.h"
 #include "test/mocks/http/mocks.h"
 #include "test/test_common/utility.h"

src/envoy/http/authn/test_utils.h

@@ -15,8 +15,8 @@
 
 #pragma once
 
-#include "common/protobuf/protobuf.h"
 #include "gmock/gmock.h"
+#include "source/common/protobuf/protobuf.h"
 #include "src/istio/authn/context.pb.h"
 
 namespace Envoy {

src/envoy/tcp/forward_downstream_sni/forward_downstream_sni.cc

@@ -15,8 +15,8 @@
 
 #include "src/envoy/tcp/forward_downstream_sni/forward_downstream_sni.h"
 
-#include "common/network/upstream_server_name.h"
 #include "envoy/network/connection.h"
+#include "source/common/network/upstream_server_name.h"
 
 namespace Envoy {
 namespace Tcp {

src/envoy/tcp/forward_downstream_sni/forward_downstream_sni_test.cc

@@ -15,9 +15,9 @@
 
 #include "src/envoy/tcp/forward_downstream_sni/forward_downstream_sni.h"
 
-#include "common/network/upstream_server_name.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
+#include "source/common/network/upstream_server_name.h"
 #include "src/envoy/tcp/forward_downstream_sni/config.h"
 #include "test/mocks/network/mocks.h"
 #include "test/mocks/server/mocks.h"