From c1732c57fbd704393dc659891fec7084d4fa2227 Mon Sep 17 00:00:00 2001
From: zirain <zirain2009@gmail.com>
Date: Tue, 2 Apr 2024 00:48:06 +0800
Subject: [PATCH] sync with upstream (#5428)

* fix

* lint

* fix istio.stats

* update to 0331
---
 WORKSPACE                                                   | 6 +++---
 source/extensions/filters/http/istio_stats/istio_stats.cc   | 3 ++-
 source/extensions/filters/http/istio_stats/istio_stats.h    | 2 +-
 .../extensions/filters/network/metadata_exchange/config.cc  | 3 ++-
 .../extensions/filters/network/metadata_exchange/config.h   | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 1af77fed1..0e5368154 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -22,10 +22,10 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 # 1. Determine SHA256 `wget https://github.com/envoyproxy/envoy/archive/$COMMIT.tar.gz && sha256sum $COMMIT.tar.gz`
 # 2. Update .bazelversion, envoy.bazelrc and .bazelrc if needed.
 #
-# Commit date: 2024-03-27
-ENVOY_SHA = "07fcfb9d249522322a39cf4d8c19b900c245c004"
+# Commit date: 2024-03-31
+ENVOY_SHA = "58bd2ef3012fa4cf17ed7310fd7e98813956e176"
 
-ENVOY_SHA256 = "93bf14b1c7bce8eae89bb66b60c0e5f58db9804b137a7b83a48ca8a56cffcbe8"
+ENVOY_SHA256 = "9ecede5c016f07cf5788fed0b1f96febede8a196c45f11dd4d9022b2ded84844"
 
 ENVOY_ORG = "envoyproxy"
 
diff --git a/source/extensions/filters/http/istio_stats/istio_stats.cc b/source/extensions/filters/http/istio_stats/istio_stats.cc
index a71fb9ddd..cb2fad48c 100644
--- a/source/extensions/filters/http/istio_stats/istio_stats.cc
+++ b/source/extensions/filters/http/istio_stats/istio_stats.cc
@@ -1266,7 +1266,8 @@ absl::StatusOr<Http::FilterFactoryCb> IstioStatsFilterConfigFactory::createFilte
 REGISTER_FACTORY(IstioStatsFilterConfigFactory,
                  Server::Configuration::NamedHttpFilterConfigFactory);
 
-Network::FilterFactoryCb IstioStatsNetworkFilterConfigFactory::createFilterFactoryFromProto(
+absl::StatusOr<Network::FilterFactoryCb>
+IstioStatsNetworkFilterConfigFactory::createFilterFactoryFromProto(
     const Protobuf::Message& proto_config, Server::Configuration::FactoryContext& factory_context) {
   factory_context.serverFactoryContext().api().customStatNamespaces().registerStatNamespace(
       CustomStatNamespace);
diff --git a/source/extensions/filters/http/istio_stats/istio_stats.h b/source/extensions/filters/http/istio_stats/istio_stats.h
index 937e3e915..fe0af8ce8 100644
--- a/source/extensions/filters/http/istio_stats/istio_stats.h
+++ b/source/extensions/filters/http/istio_stats/istio_stats.h
@@ -45,7 +45,7 @@ public:
     return std::make_unique<stats::PluginConfig>();
   }
 
-  Network::FilterFactoryCb
+  absl::StatusOr<Network::FilterFactoryCb>
   createFilterFactoryFromProto(const Protobuf::Message& proto_config,
                                Server::Configuration::FactoryContext& factory_context) override;
 };
diff --git a/source/extensions/filters/network/metadata_exchange/config.cc b/source/extensions/filters/network/metadata_exchange/config.cc
index f69f465a5..4668bb86f 100644
--- a/source/extensions/filters/network/metadata_exchange/config.cc
+++ b/source/extensions/filters/network/metadata_exchange/config.cc
@@ -41,7 +41,8 @@ Network::FilterFactoryCb createFilterFactoryHelper(
 }
 } // namespace
 
-Network::FilterFactoryCb MetadataExchangeConfigFactory::createFilterFactoryFromProto(
+absl::StatusOr<Network::FilterFactoryCb>
+MetadataExchangeConfigFactory::createFilterFactoryFromProto(
     const Protobuf::Message& config, Server::Configuration::FactoryContext& context) {
   return createFilterFactory(
       dynamic_cast<const envoy::tcp::metadataexchange::config::MetadataExchange&>(config), context);
diff --git a/source/extensions/filters/network/metadata_exchange/config.h b/source/extensions/filters/network/metadata_exchange/config.h
index cb9c663a8..d4a215569 100644
--- a/source/extensions/filters/network/metadata_exchange/config.h
+++ b/source/extensions/filters/network/metadata_exchange/config.h
@@ -29,7 +29,7 @@ namespace MetadataExchange {
 class MetadataExchangeConfigFactory
     : public Server::Configuration::NamedNetworkFilterConfigFactory {
 public:
-  Network::FilterFactoryCb
+  absl::StatusOr<Network::FilterFactoryCb>
   createFilterFactoryFromProto(const Protobuf::Message&,
                                Server::Configuration::FactoryContext&) override;