Skip to content

update Envoy to 8a26244 (2022-11-21) #946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eric846 merged 7 commits into from
Nov 22, 2022
Merged

update Envoy to 8a26244 (2022-11-21) #946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3b2aa9b
update
qqustc Nov 21, 2022
778a8dc
fix
qqustc Nov 21, 2022
03059d3
fix
qqustc Nov 21, 2022
505c956
fix
qqustc Nov 21, 2022
0fe6cf7
fix
qqustc Nov 21, 2022
11186aa
fix
qqustc Nov 22, 2022
4bcc5c4
fix
qqustc Nov 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bazel/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

ENVOY_COMMIT = "d79d5543a785e28cfb725e235d5bc0eb8db2f200"
ENVOY_SHA = "269895430ede3105463e66bdd45e98c4f13d6dfaaf6cd65144fdba87635e3bd7"
ENVOY_COMMIT = "8a26244b2804a00820b2f6dd55ea69cb97bfa996"
ENVOY_SHA = "297da30e3ec5f7fcb2ab8d8662df8f9cc217a91a9e81360c1dfa3a2440125f41"

HDR_HISTOGRAM_C_VERSION = "0.11.2" # October 12th, 2020
HDR_HISTOGRAM_C_SHA = "637f28b5f64de2e268131e4e34e6eef0b91cf5ff99167db447d9b2825eae6bad"
Expand Down
2 changes: 2 additions & 0 deletions extensions_build_config.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ EXTENSIONS = {
"envoy.tracers.zipkin": "//source/extensions/tracers/zipkin:config",
"envoy.transport_sockets.raw_buffer": "//source/extensions/transport_sockets/raw_buffer:config",
"envoy.access_loggers.file": "//source/extensions/access_loggers/file:config",
"envoy.clusters.eds": "//source/extensions/clusters/eds:eds_lib",
"envoy.clusters.static": "//source/extensions/clusters/static:static_cluster_lib",
"envoy.clusters.strict_dns": "//source/extensions/clusters/strict_dns:strict_dns_cluster_lib",
"envoy.network.dns_resolver.cares": "//source/extensions/network/dns_resolver/cares:config",
Expand All @@ -20,6 +21,7 @@ DISABLED_BY_DEFAULT_EXTENSIONS = {
EXTENSION_CONFIG_VISIBILITY = ["//visibility:public"]
EXTENSION_PACKAGE_VISIBILITY = ["//visibility:public"]
CONTRIB_EXTENSION_PACKAGE_VISIBILITY = ["//:contrib_library"]
MOBILE_PACKAGE_VISIBILITY = ["//:mobile_library"]

# Set this variable to true to disable alwayslink for envoy_cc_library.
LEGACY_ALWAYSLINK = 1
9 changes: 5 additions & 4 deletions source/client/process_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <memory>
#include <random>

#include "envoy/common/optref.h"
#include "envoy/network/address.h"
#include "envoy/server/filter_config.h"
#include "envoy/stats/sink.h"
Expand Down Expand Up @@ -108,7 +109,7 @@ class BootstrapFactory : public Envoy::Logger::Loggable<Envoy::Logger::Id::main>
// when Nighthawk is running are implemented.
class NighthawkServerInstance : public Envoy::Server::Instance {
public:
NighthawkServerInstance(Envoy::Server::Admin& admin, Envoy::Api::Api& api,
NighthawkServerInstance(Envoy::OptRef<Envoy::Server::Admin> admin, Envoy::Api::Api& api,
Envoy::Event::Dispatcher& dispatcher,
Envoy::AccessLog::AccessLogManager& log_manager,
Envoy::Server::Options& options, Envoy::Runtime::Loader& runtime,
Expand All @@ -119,7 +120,7 @@ class NighthawkServerInstance : public Envoy::Server::Instance {
options_(options), runtime_(runtime), singleton_manager_(singleton_manager), tls_(tls),
local_info_(local_info) {}

Envoy::Server::Admin& admin() override { return admin_; }
Envoy::OptRef<Envoy::Server::Admin> admin() override { return admin_; }
Envoy::Api::Api& api() override { return api_; }
Envoy::Upstream::ClusterManager& clusterManager() override {
PANIC("NighthawkServerInstance::clusterManager not implemented");
Expand Down Expand Up @@ -226,7 +227,7 @@ class NighthawkServerInstance : public Envoy::Server::Instance {
}

private:
Envoy::Server::Admin& admin_;
Envoy::OptRef<Envoy::Server::Admin> admin_;
Envoy::Api::Api& api_;
Envoy::Event::Dispatcher& dispatcher_;
Envoy::AccessLog::AccessLogManager& log_manager_;
Expand All @@ -250,7 +251,7 @@ class NighthawkServerFactoryContext : public Envoy::Server::Configuration::Serve

Envoy::LocalInfo::LocalInfo& localInfo() const override { return server_.localInfo(); }

Envoy::Server::Admin& admin() override { return server_.admin(); }
Envoy::OptRef<Envoy::Server::Admin> admin() override { return server_.admin(); }

Envoy::Runtime::Loader& runtime() override { return server_.runtime(); }

Expand Down
1 change: 1 addition & 0 deletions tools/code_format/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,7 @@ unsorted_flags:
# https://github.com/envoyproxy/envoy/issues/9953
# PLEASE DO NOT ADD FILES TO THIS LIST WITHOUT SENIOR MAINTAINER APPROVAL
visibility_excludes:
- source/extensions/clusters/eds/
- source/extensions/clusters/strict_dns/
- source/extensions/clusters/static/
- source/extensions/clusters/original_dst/
Expand Down