Skip to content

Update Envoy to 151aa0ce (Jun 04, 2021) #693

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
mum4k merged 3 commits into from
Jun 7, 2021
Merged

Update Envoy to 151aa0ce (Jun 04, 2021) #693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
adbee7e
Update Envoy to 151aa0ce (Jun 04, 2021)
yanavlasov Jun 7, 2021
3d8e9a9
Merge branch 'main' into update-envoy
yanavlasov Jun 7, 2021
7fa1c71
Merge branch 'main' into update-envoy
yanavlasov Jun 7, 2021
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 = "ff2c0e517c8677dd1c553e1c6ef55d2b14cdd996" # June 2, 2021
ENVOY_SHA = "ebeba4ff8f54e9a7f9f86997b696d4b647a2471685e569af9bbc38dd9b496dbb"
ENVOY_COMMIT = "0fae6970ddaf93f024908ba304bbd2b34e997a51" # Jun 4, 2021
ENVOY_SHA = "9dd201f00c1ad4d37f17c969ba200c1a3dad6d28ea0ae2a76874d01a98f6b011"

HDR_HISTOGRAM_C_VERSION = "0.11.2" # October 12th, 2020
HDR_HISTOGRAM_C_SHA = "637f28b5f64de2e268131e4e34e6eef0b91cf5ff99167db447d9b2825eae6bad"
Expand Down
34 changes: 17 additions & 17 deletions include/nighthawk/adaptive_load/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ envoy_basic_cc_library(
":config_validator",
"//api/adaptive_load:adaptive_load_proto_cc_proto",
"//api/client:grpc_service_lib",
"@envoy//include/envoy/common:base_includes",
"@envoy//include/envoy/common:time_interface",
"@envoy//include/envoy/config:typed_config_interface",
"@envoy//envoy/common:base_includes",
"@envoy//envoy/common:time_interface",
"@envoy//envoy/config:typed_config_interface",
"@envoy//source/common/common:statusor_lib_with_external_headers",
],
)
Expand All @@ -32,9 +32,9 @@ envoy_basic_cc_library(
],
include_prefix = "nighthawk/adaptive_load",
deps = [
"@envoy//include/envoy/common:base_includes",
"@envoy//include/envoy/common:time_interface",
"@envoy//include/envoy/config:typed_config_interface",
"@envoy//envoy/common:base_includes",
"@envoy//envoy/common:time_interface",
"@envoy//envoy/config:typed_config_interface",
"@envoy//source/common/protobuf:protobuf_with_external_headers",
],
)
Expand All @@ -48,8 +48,8 @@ envoy_basic_cc_library(
deps = [
":config_validator",
"//api/adaptive_load:adaptive_load_proto_cc_proto",
"@envoy//include/envoy/common:base_includes",
"@envoy//include/envoy/config:typed_config_interface",
"@envoy//envoy/common:base_includes",
"@envoy//envoy/config:typed_config_interface",
],
)

Expand All @@ -62,8 +62,8 @@ envoy_basic_cc_library(
deps = [
":metrics_plugin",
"//api/adaptive_load:adaptive_load_proto_cc_proto",
"@envoy//include/envoy/common:base_includes",
"@envoy//include/envoy/config:typed_config_interface",
"@envoy//envoy/common:base_includes",
"@envoy//envoy/config:typed_config_interface",
"@envoy//source/common/common:statusor_lib_with_external_headers",
],
)
Expand All @@ -77,8 +77,8 @@ envoy_basic_cc_library(
deps = [
":config_validator",
"//api/adaptive_load:adaptive_load_proto_cc_proto",
"@envoy//include/envoy/common:base_includes",
"@envoy//include/envoy/config:typed_config_interface",
"@envoy//envoy/common:base_includes",
"@envoy//envoy/config:typed_config_interface",
"@envoy//source/common/common:statusor_lib_with_external_headers",
],
)
Expand All @@ -92,8 +92,8 @@ envoy_basic_cc_library(
deps = [
":config_validator",
"//api/adaptive_load:adaptive_load_proto_cc_proto",
"@envoy//include/envoy/common:base_includes",
"@envoy//include/envoy/config:typed_config_interface",
"@envoy//envoy/common:base_includes",
"@envoy//envoy/config:typed_config_interface",
],
)

Expand All @@ -106,7 +106,7 @@ envoy_basic_cc_library(
deps = [
"//api/adaptive_load:adaptive_load_proto_cc_proto",
"@com_google_absl//absl/status",
"@envoy//include/envoy/common:base_includes",
"@envoy//envoy/common:base_includes",
],
)

Expand All @@ -119,7 +119,7 @@ envoy_basic_cc_library(
deps = [
":config_validator",
"//api/adaptive_load:adaptive_load_proto_cc_proto",
"@envoy//include/envoy/common:base_includes",
"@envoy//include/envoy/config:typed_config_interface",
"@envoy//envoy/common:base_includes",
"@envoy//envoy/config:typed_config_interface",
],
)
10 changes: 5 additions & 5 deletions include/nighthawk/client/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ envoy_basic_cc_library(
deps = [
"//api/client:base_cc_proto",
"//include/nighthawk/common:base_includes",
"@envoy//include/envoy/common:time_interface",
"@envoy//envoy/common:time_interface",
"@envoy//source/common/common:minimal_logger_lib_with_external_headers",
"@envoy_api//envoy/config/cluster/v3:pkg_cc_proto",
"@envoy_api//envoy/config/metrics/v3:pkg_cc_proto",
Expand All @@ -40,8 +40,8 @@ envoy_basic_cc_library(
"//api/client:base_cc_proto",
"//include/nighthawk/common:base_includes",
"//include/nighthawk/common:request_source_lib",
"@envoy//include/envoy/common:base_includes",
"@envoy//include/envoy/http:conn_pool_interface_with_external_headers",
"@envoy//envoy/common:base_includes",
"@envoy//envoy/http:conn_pool_interface_with_external_headers",
"@envoy//source/common/api:api_lib_with_external_headers",
"@envoy//source/common/common:minimal_logger_lib_with_external_headers",
"@envoy//source/common/common:non_copyable_with_external_headers",
Expand All @@ -60,7 +60,7 @@ envoy_basic_cc_library(
deps = [
"//api/client:base_cc_proto",
"//include/nighthawk/common:base_includes",
"@envoy//include/envoy/common:base_includes",
"@envoy//envoy/common:base_includes",
],
)

Expand All @@ -70,6 +70,6 @@ envoy_basic_cc_library(
include_prefix = "nighthawk/client",
deps = [
"//api/client:base_cc_proto",
"@envoy//include/envoy/common:base_includes",
"@envoy//envoy/common:base_includes",
],
)
8 changes: 4 additions & 4 deletions include/nighthawk/common/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ envoy_basic_cc_library(
deps = [
":request_lib",
"//api/client:base_cc_proto",
"@envoy//include/envoy/upstream:cluster_manager_interface_with_external_headers",
"@envoy//envoy/upstream:cluster_manager_interface_with_external_headers",
"@envoy//source/common/common:minimal_logger_lib",
"@envoy//source/common/common:non_copyable_with_external_headers",
"@envoy//source/common/common:statusor_lib_with_external_headers",
Expand All @@ -47,7 +47,7 @@ envoy_basic_cc_library(
deps = [
"//api/client:base_cc_proto",
"//api/client:grpc_service_lib",
"@envoy//include/envoy/common:base_includes",
"@envoy//envoy/common:base_includes",
"@envoy//source/common/common:assert_lib_with_external_headers",
"@envoy//source/common/common:statusor_lib_with_external_headers",
"@envoy//source/common/protobuf:protobuf_with_external_headers",
Expand Down Expand Up @@ -84,7 +84,7 @@ envoy_basic_cc_library(
],
include_prefix = "nighthawk/common",
deps = [
"@envoy//include/envoy/common:base_includes",
"@envoy//include/envoy/common:time_interface",
"@envoy//envoy/common:base_includes",
"@envoy//envoy/common:time_interface",
],
)
2 changes: 1 addition & 1 deletion include/nighthawk/distributor/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ envoy_basic_cc_library(
deps = [
"//api/distributor:distributor_cc_proto",
"//api/distributor:distributor_grpc_lib",
"@envoy//include/envoy/common:base_includes",
"@envoy//envoy/common:base_includes",
"@envoy//source/common/common:assert_lib_with_external_headers",
"@envoy//source/common/common:statusor_lib_with_external_headers",
"@envoy//source/common/protobuf:protobuf_with_external_headers",
Expand Down
4 changes: 2 additions & 2 deletions include/nighthawk/request_source/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ envoy_basic_cc_library(
deps = [
"//api/request_source:request_source_plugin_cc_proto",
"//include/nighthawk/common:request_source_lib",
"@envoy//include/envoy/common:base_includes",
"@envoy//include/envoy/config:typed_config_interface",
"@envoy//envoy/common:base_includes",
"@envoy//envoy/config:typed_config_interface",
"@envoy//source/common/api:api_lib_with_external_headers",
],
)
2 changes: 1 addition & 1 deletion include/nighthawk/sink/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ envoy_basic_cc_library(
deps = [
"//api/sink:sink_cc_proto",
"//api/sink:sink_grpc_lib",
"@envoy//include/envoy/common:base_includes",
"@envoy//envoy/common:base_includes",
"@envoy//source/common/common:assert_lib_with_external_headers",
"@envoy//source/common/common:statusor_lib_with_external_headers",
"@envoy//source/common/protobuf:protobuf_with_external_headers",
Expand Down
6 changes: 3 additions & 3 deletions source/adaptive_load/adaptive_load_client_main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "adaptive_load/adaptive_load_client_main.h"
#include "source/adaptive_load/adaptive_load_client_main.h"

#include <cstring>
#include <memory>
Expand All @@ -17,8 +17,8 @@
#include "api/client/service.grpc.pb.h"
#include "api/client/service.pb.h"

#include "common/utility.h"
#include "common/version_info.h"
#include "source/common/utility.h"
#include "source/common/version_info.h"

#include "fmt/ranges.h"
#include "google/rpc/status.pb.h"
Expand Down
7 changes: 4 additions & 3 deletions source/adaptive_load/adaptive_load_controller_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "adaptive_load/adaptive_load_controller_impl.h"
#include "source/adaptive_load/adaptive_load_controller_impl.h"

#include <chrono>

Expand All @@ -22,12 +22,13 @@
#include "api/client/output.pb.h"
#include "api/client/service.grpc.pb.h"

#include "source/adaptive_load/metrics_plugin_impl.h"
#include "source/adaptive_load/plugin_loader.h"

#include "absl/container/flat_hash_map.h"
#include "absl/status/status.h"
#include "absl/strings/str_format.h"
#include "absl/strings/str_join.h"
#include "adaptive_load/metrics_plugin_impl.h"
#include "adaptive_load/plugin_loader.h"

namespace Nighthawk {

Expand Down
2 changes: 1 addition & 1 deletion source/adaptive_load/config_validator_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "adaptive_load/config_validator_impl.h"
#include "source/adaptive_load/config_validator_impl.h"

namespace Nighthawk {

Expand Down
2 changes: 1 addition & 1 deletion source/adaptive_load/input_variable_setter_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "adaptive_load/input_variable_setter_impl.h"
#include "source/adaptive_load/input_variable_setter_impl.h"

#include <limits>

Expand Down
6 changes: 3 additions & 3 deletions source/adaptive_load/metrics_evaluator_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#include "adaptive_load/metrics_evaluator_impl.h"
#include "source/adaptive_load/metrics_evaluator_impl.h"

#include <utility>

#include "api/adaptive_load/metric_spec.pb.h"

#include "adaptive_load/metrics_plugin_impl.h"
#include "adaptive_load/plugin_loader.h"
#include "source/adaptive_load/metrics_plugin_impl.h"
#include "source/adaptive_load/plugin_loader.h"

namespace Nighthawk {

Expand Down
2 changes: 1 addition & 1 deletion source/adaptive_load/metrics_plugin_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "adaptive_load/metrics_plugin_impl.h"
#include "source/adaptive_load/metrics_plugin_impl.h"

#include <cmath>

Expand Down
2 changes: 1 addition & 1 deletion source/adaptive_load/scoring_function_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "adaptive_load/scoring_function_impl.h"
#include "source/adaptive_load/scoring_function_impl.h"

#include <cmath>

Expand Down
7 changes: 4 additions & 3 deletions source/adaptive_load/session_spec_proto_helper_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "adaptive_load/session_spec_proto_helper_impl.h"
#include "source/adaptive_load/session_spec_proto_helper_impl.h"

#include "nighthawk/adaptive_load/metrics_plugin.h"
#include "nighthawk/adaptive_load/step_controller.h"
Expand All @@ -7,12 +7,13 @@
#include "api/adaptive_load/adaptive_load.pb.validate.h"
#include "api/adaptive_load/metric_spec.pb.h"

#include "source/adaptive_load/metrics_plugin_impl.h"
#include "source/adaptive_load/plugin_loader.h"

#include "absl/container/flat_hash_map.h"
#include "absl/status/status.h"
#include "absl/strings/str_join.h"
#include "absl/strings/string_view.h"
#include "adaptive_load/metrics_plugin_impl.h"
#include "adaptive_load/plugin_loader.h"

namespace Nighthawk {

Expand Down
6 changes: 3 additions & 3 deletions source/adaptive_load/step_controller_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "adaptive_load/step_controller_impl.h"
#include "source/adaptive_load/step_controller_impl.h"

#include <memory>

Expand All @@ -9,8 +9,8 @@
#include "api/adaptive_load/metric_spec.pb.h"
#include "api/adaptive_load/step_controller_impl.pb.h"

#include "adaptive_load/input_variable_setter_impl.h"
#include "adaptive_load/plugin_loader.h"
#include "source/adaptive_load/input_variable_setter_impl.h"
#include "source/adaptive_load/plugin_loader.h"

namespace Nighthawk {

Expand Down
5 changes: 3 additions & 2 deletions source/client/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,11 @@ envoy_cc_library(
"@envoy//source/extensions/transport_sockets/tls:context_lib_with_external_headers",
"@envoy//source/server:server_lib_with_external_headers",
"@envoy//source/server/config_validation:admin_lib_with_external_headers",
"@envoy//include/envoy/http:protocol_interface_with_external_headers",
"@envoy//include/envoy/network:address_interface",
"@envoy//envoy/http:protocol_interface_with_external_headers",
"@envoy//envoy/network:address_interface",
"@envoy//source/common/common:statusor_lib_with_external_headers",
"@envoy//source/common/router:context_lib_with_external_headers",
"@envoy_api//envoy/config/core/v3:pkg_cc_proto",
] + select({
"//bazel:zipkin_disabled": [],
"//conditions:default": [
Expand Down
4 changes: 2 additions & 2 deletions source/client/benchmark_client_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "client/benchmark_client_impl.h"
#include "source/client/benchmark_client_impl.h"

#include "envoy/event/dispatcher.h"
#include "envoy/thread_local/thread_local.h"
Expand All @@ -10,7 +10,7 @@
#include "external/envoy/source/common/http/utility.h"
#include "external/envoy/source/common/network/utility.h"

#include "client/stream_decoder.h"
#include "source/client/stream_decoder.h"

#include "absl/strings/numbers.h"
#include "absl/strings/str_split.h"
Expand Down
4 changes: 0 additions & 4 deletions source/client/benchmark_client_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,9 @@

#include "api/client/options.pb.h"

#include "common/statistic_impl.h"

#include "source/client/stream_decoder.h"
#include "source/common/statistic_impl.h"

#include "client/stream_decoder.h"

// TODO(#695): temporary hack to until Envoy::Upstream::HttpPoolData supports
// hasActiveConnections
namespace Envoy {
Expand Down
23 changes: 11 additions & 12 deletions source/client/client.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "client/client.h"
#include "source/client/client.h"

#include <grpc++/grpc++.h>

Expand All @@ -22,17 +22,16 @@
#include "api/client/output.pb.h"
#include "api/client/service.grpc.pb.h"

#include "common/frequency.h"
#include "common/signal_handler.h"
#include "common/uri_impl.h"
#include "common/utility.h"

#include "client/client_worker_impl.h"
#include "client/factories_impl.h"
#include "client/options_impl.h"
#include "client/output_collector_impl.h"
#include "client/process_impl.h"
#include "client/remote_process_impl.h"
#include "source/client/client_worker_impl.h"
#include "source/client/factories_impl.h"
#include "source/client/options_impl.h"
#include "source/client/output_collector_impl.h"
#include "source/client/process_impl.h"
#include "source/client/remote_process_impl.h"
#include "source/common/frequency.h"
#include "source/common/signal_handler.h"
#include "source/common/uri_impl.h"
#include "source/common/utility.h"

#include "absl/status/status.h"
#include "absl/status/statusor.h"
Expand Down
Loading