istio
/
proxy
mirror of https://github.com/istio/proxy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sync with upstream (#5428) 

* fix

* lint

* fix istio.stats

* update to 0331
This commit is contained in:
zirain 2024-04-02 00:48:06 +08:00 committed by GitHub
parent 4ffa549090
commit c1732c57fb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
WORKSPACE
View File

@ -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` # 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. # 2. Update .bazelversion, envoy.bazelrc and .bazelrc if needed.
# #
# Commit date: 2024-03-27 # Commit date: 2024-03-31
ENVOY_SHA = "07fcfb9d249522322a39cf4d8c19b900c245c004" ENVOY_SHA = "58bd2ef3012fa4cf17ed7310fd7e98813956e176"
ENVOY_SHA256 = "93bf14b1c7bce8eae89bb66b60c0e5f58db9804b137a7b83a48ca8a56cffcbe8" ENVOY_SHA256 = "9ecede5c016f07cf5788fed0b1f96febede8a196c45f11dd4d9022b2ded84844"
ENVOY_ORG = "envoyproxy" ENVOY_ORG = "envoyproxy"

3
source/extensions/filters/http/istio_stats/istio_stats.cc
View File

@ -1266,7 +1266,8 @@ absl::StatusOr<Http::FilterFactoryCb> IstioStatsFilterConfigFactory::createFilte
REGISTER_FACTORY(IstioStatsFilterConfigFactory, REGISTER_FACTORY(IstioStatsFilterConfigFactory,
Server::Configuration::NamedHttpFilterConfigFactory); Server::Configuration::NamedHttpFilterConfigFactory);
Network::FilterFactoryCb IstioStatsNetworkFilterConfigFactory::createFilterFactoryFromProto( absl::StatusOr<Network::FilterFactoryCb>
IstioStatsNetworkFilterConfigFactory::createFilterFactoryFromProto(
const Protobuf::Message& proto_config, Server::Configuration::FactoryContext& factory_context) { const Protobuf::Message& proto_config, Server::Configuration::FactoryContext& factory_context) {
factory_context.serverFactoryContext().api().customStatNamespaces().registerStatNamespace( factory_context.serverFactoryContext().api().customStatNamespaces().registerStatNamespace(
CustomStatNamespace); CustomStatNamespace);

2
source/extensions/filters/http/istio_stats/istio_stats.h
View File

@ -45,7 +45,7 @@ public:
return std::make_unique<stats::PluginConfig>(); return std::make_unique<stats::PluginConfig>();
} }
Network::FilterFactoryCb absl::StatusOr<Network::FilterFactoryCb>
createFilterFactoryFromProto(const Protobuf::Message& proto_config, createFilterFactoryFromProto(const Protobuf::Message& proto_config,
Server::Configuration::FactoryContext& factory_context) override; Server::Configuration::FactoryContext& factory_context) override;
}; };

3
source/extensions/filters/network/metadata_exchange/config.cc
View File

@ -41,7 +41,8 @@ Network::FilterFactoryCb createFilterFactoryHelper(
} }
} // namespace } // namespace
Network::FilterFactoryCb MetadataExchangeConfigFactory::createFilterFactoryFromProto( absl::StatusOr<Network::FilterFactoryCb>
MetadataExchangeConfigFactory::createFilterFactoryFromProto(
const Protobuf::Message& config, Server::Configuration::FactoryContext& context) { const Protobuf::Message& config, Server::Configuration::FactoryContext& context) {
return createFilterFactory( return createFilterFactory(
dynamic_cast<const envoy::tcp::metadataexchange::config::MetadataExchange&>(config), context); dynamic_cast<const envoy::tcp::metadataexchange::config::MetadataExchange&>(config), context);

2
source/extensions/filters/network/metadata_exchange/config.h
View File

@ -29,7 +29,7 @@ namespace MetadataExchange {
class MetadataExchangeConfigFactory class MetadataExchangeConfigFactory
: public Server::Configuration::NamedNetworkFilterConfigFactory { : public Server::Configuration::NamedNetworkFilterConfigFactory {
public: public:
Network::FilterFactoryCb absl::StatusOr<Network::FilterFactoryCb>
createFilterFactoryFromProto(const Protobuf::Message&, createFilterFactoryFromProto(const Protobuf::Message&,
Server::Configuration::FactoryContext&) override; Server::Configuration::FactoryContext&) override;