Skip to content

WIP: Update Envoy to 72bf41f (Jun 4th 2021). #691

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

Closed
mum4k wants to merge 7 commits into from
Closed

WIP: Update Envoy to 72bf41f (Jun 4th 2021). #691

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
fc8e0c3
Updating to Envoy 72bf41f.
mum4k Jun 5, 2021
a0c6c91
Moving some includes behind "external/".
mum4k Jun 5, 2021
34e4d11
Moving the remaining includes behind "external/".
mum4k Jun 5, 2021
eb94896
Fixing include path in test/client_worker_test.cc.
mum4k Jun 5, 2021
476074c
Updating benchmark_http_client_test.cc to also return HttpPoolData.
mum4k Jun 5, 2021
aef0d5d
Fix build errors where absl::string_view was being assigned to a std:…
mum4k Jun 5, 2021
3d6e274
Remove local envoy repo override.
mum4k Jun 5, 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 = "1c03ddcbd6feb5ad2507ce52d9aeaf52a3156554" # June 1, 2021
ENVOY_SHA = "c4fbbda0a434ba71f5859602f111fee1d8ea98c0d7ecee702ec8a620aa888744"
ENVOY_COMMIT = "72bf41fb0ecc039f196be02f534bfc2c9c69f348" # June 4, 2021
ENVOY_SHA = "db07426cf02fa2f8ed9891e64adf67ced39e72cdcce9ba121d420b471cc96766"

HDR_HISTOGRAM_C_VERSION = "0.11.2" # October 12th, 2020
HDR_HISTOGRAM_C_SHA = "637f28b5f64de2e268131e4e34e6eef0b91cf5ff99167db447d9b2825eae6bad"
Expand Down
2 changes: 1 addition & 1 deletion docs/root/overview.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ back reports per phase.

## Key concept descriptions

*The c++ interface definitions for the concepts below can be found [here](https://github.com/envoyproxy/nighthawk/tree/main/include/nighthawk)*.
*The c++ interface definitions for the concepts below can be found [here](https://github.com/envoyproxy/nighthawk/tree/main/nighthawk)*.

### Process

Expand Down
34 changes: 17 additions & 17 deletions include/nighthawk/adaptive_load/BUILD → 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",
],
)
3 changes: 1 addition & 2 deletions .../adaptive_load/adaptive_load_controller.h → .../adaptive_load/adaptive_load_controller.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#pragma once

#include "envoy/common/pure.h"

#include "external/envoy/envoy/common/pure.h"
#include "external/envoy/source/common/common/statusor.h"

#include "api/adaptive_load/adaptive_load.pb.h"
Expand Down
3 changes: 1 addition & 2 deletions ...ighthawk/adaptive_load/config_validator.h → nighthawk/adaptive_load/config_validator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#pragma once

#include "envoy/common/pure.h"

#include "external/envoy/envoy/common/pure.h"
#include "external/envoy/source/common/protobuf/protobuf.h"

#include "absl/status/status.h"
Expand Down
5 changes: 2 additions & 3 deletions ...awk/adaptive_load/input_variable_setter.h → ...awk/adaptive_load/input_variable_setter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@

#pragma once

#include "envoy/common/pure.h"
#include "envoy/config/typed_config.h"

#include "nighthawk/adaptive_load/config_validator.h"

#include "external/envoy/envoy/common/pure.h"
#include "external/envoy/envoy/config/typed_config.h"
#include "external/envoy/source/common/protobuf/protobuf.h"

#include "api/client/options.pb.h"
Expand Down
0 ...ghthawk/adaptive_load/metrics_evaluator.h → nighthawk/adaptive_load/metrics_evaluator.h
View file
Open in desktop
File renamed without changes.
5 changes: 2 additions & 3 deletions .../nighthawk/adaptive_load/metrics_plugin.h → nighthawk/adaptive_load/metrics_plugin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@

#pragma once

#include "envoy/common/pure.h"
#include "envoy/config/typed_config.h"

#include "nighthawk/adaptive_load/config_validator.h"

#include "external/envoy/envoy/common/pure.h"
#include "external/envoy/envoy/config/typed_config.h"
#include "external/envoy/source/common/common/statusor.h"

namespace Nighthawk {
Expand Down
6 changes: 3 additions & 3 deletions ...ighthawk/adaptive_load/scoring_function.h → nighthawk/adaptive_load/scoring_function.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

#pragma once

#include "envoy/common/pure.h"
#include "envoy/config/typed_config.h"

#include "nighthawk/adaptive_load/config_validator.h"

#include "external/envoy/envoy/common/pure.h"
#include "external/envoy/envoy/config/typed_config.h"

namespace Nighthawk {

/**
Expand Down
2 changes: 1 addition & 1 deletion ...adaptive_load/session_spec_proto_helper.h → ...adaptive_load/session_spec_proto_helper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "envoy/common/pure.h"
#include "external/envoy/envoy/common/pure.h"

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

Expand Down
5 changes: 2 additions & 3 deletions ...nighthawk/adaptive_load/step_controller.h → nighthawk/adaptive_load/step_controller.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@

#pragma once

#include "envoy/common/pure.h"
#include "envoy/config/typed_config.h"

#include "nighthawk/adaptive_load/config_validator.h"

#include "external/envoy/envoy/common/pure.h"
#include "external/envoy/envoy/config/typed_config.h"
#include "external/envoy/source/common/common/statusor.h"
#include "external/envoy/source/common/protobuf/protobuf.h"

Expand Down
18 changes: 9 additions & 9 deletions include/nighthawk/client/BUILD → nighthawk/client/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ envoy_basic_cc_library(
include_prefix = "nighthawk/client",
deps = [
"//api/client:base_cc_proto",
"//include/nighthawk/common:base_includes",
"@envoy//include/envoy/common:time_interface",
"//nighthawk/common:base_includes",
"@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 @@ -38,10 +38,10 @@ envoy_basic_cc_library(
":output_collector_lib",
":output_formatter_lib",
"//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",
"//nighthawk/common:base_includes",
"//nighthawk/common:request_source_lib",
"@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 @@ -59,8 +59,8 @@ envoy_basic_cc_library(
include_prefix = "nighthawk/client",
deps = [
"//api/client:base_cc_proto",
"//include/nighthawk/common:base_includes",
"@envoy//include/envoy/common:base_includes",
"//nighthawk/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/client/benchmark_client.h → nighthawk/client/benchmark_client.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
#include <functional>
#include <memory>

#include "envoy/http/header_map.h"
#include "envoy/runtime/runtime.h"
#include "envoy/stats/store.h"

#include "nighthawk/common/operation_callback.h"
#include "nighthawk/common/statistic.h"
#include "nighthawk/common/uri.h"

#include "external/envoy/envoy/http/header_map.h"
#include "external/envoy/envoy/runtime/runtime.h"
#include "external/envoy/envoy/stats/store.h"

namespace Nighthawk {
namespace Client {

Expand Down
6 changes: 3 additions & 3 deletions include/nighthawk/client/client_worker.h → nighthawk/client/client_worker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

#include <memory>

#include "envoy/common/pure.h"
#include "envoy/stats/store.h"

#include "nighthawk/client/benchmark_client.h"
#include "nighthawk/common/phase.h"
#include "nighthawk/common/statistic.h"
#include "nighthawk/common/worker.h"

#include "external/envoy/envoy/common/pure.h"
#include "external/envoy/envoy/stats/store.h"

namespace Nighthawk {
namespace Client {

Expand Down
12 changes: 6 additions & 6 deletions include/nighthawk/client/factories.h → nighthawk/client/factories.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@

#include <memory>

#include "envoy/api/api.h"
#include "envoy/common/pure.h"
#include "envoy/common/time.h"
#include "envoy/event/dispatcher.h"
#include "envoy/upstream/cluster_manager.h"

#include "nighthawk/client/benchmark_client.h"
#include "nighthawk/client/options.h"
#include "nighthawk/client/output_formatter.h"
Expand All @@ -18,6 +12,12 @@
#include "nighthawk/common/termination_predicate.h"
#include "nighthawk/common/uri.h"

#include "external/envoy/envoy/api/api.h"
#include "external/envoy/envoy/common/pure.h"
#include "external/envoy/envoy/common/time.h"
#include "external/envoy/envoy/event/dispatcher.h"
#include "external/envoy/envoy/upstream/cluster_manager.h"

namespace Nighthawk {
namespace Client {

Expand Down
5 changes: 3 additions & 2 deletions include/nighthawk/client/options.h → nighthawk/client/options.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@
#include <memory>
#include <string>

#include "envoy/common/pure.h"
#include "envoy/common/time.h"
#include "envoy/config/cluster/v3/cluster.pb.h"
#include "envoy/config/core/v3/base.pb.h"
#include "envoy/config/metrics/v3/stats.pb.h"

#include "nighthawk/common/termination_predicate.h"

#include "external/envoy/envoy/common/pure.h"
#include "external/envoy/envoy/common/time.h"

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

#include "absl/types/optional.h"
Expand Down
6 changes: 3 additions & 3 deletions include/nighthawk/client/output_collector.h → nighthawk/client/output_collector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

#include <memory>

#include "envoy/common/pure.h"
#include "envoy/common/time.h"

#include "nighthawk/common/statistic.h"

#include "external/envoy/envoy/common/pure.h"
#include "external/envoy/envoy/common/time.h"

#include "absl/types/optional.h"

namespace Nighthawk {
Expand Down
2 changes: 1 addition & 1 deletion include/nighthawk/client/output_formatter.h → nighthawk/client/output_formatter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <string>
#include <vector>

#include "envoy/common/pure.h"
#include "external/envoy/envoy/common/pure.h"

#include "api/client/output.pb.validate.h"

Expand Down
0 include/nighthawk/client/process.h → nighthawk/client/process.h
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions include/nighthawk/common/BUILD → 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",
],
)
0 include/nighthawk/common/exception.h → nighthawk/common/exception.h
View file
Open in desktop
File renamed without changes.
Loading