diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 591c4111c..7115d196d 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -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" diff --git a/include/nighthawk/adaptive_load/BUILD b/include/nighthawk/adaptive_load/BUILD index fd658e9f0..8b8fb0457 100644 --- a/include/nighthawk/adaptive_load/BUILD +++ b/include/nighthawk/adaptive_load/BUILD @@ -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", ], ) @@ -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", ], ) @@ -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", ], ) @@ -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", ], ) @@ -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", ], ) @@ -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", ], ) @@ -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", ], ) @@ -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", ], ) diff --git a/include/nighthawk/client/BUILD b/include/nighthawk/client/BUILD index 0e791fb6f..792c17671 100644 --- a/include/nighthawk/client/BUILD +++ b/include/nighthawk/client/BUILD @@ -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", @@ -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", @@ -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", ], ) @@ -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", ], ) diff --git a/include/nighthawk/common/BUILD b/include/nighthawk/common/BUILD index 1bf10fea4..bd6883432 100644 --- a/include/nighthawk/common/BUILD +++ b/include/nighthawk/common/BUILD @@ -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", @@ -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", @@ -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", ], ) diff --git a/include/nighthawk/distributor/BUILD b/include/nighthawk/distributor/BUILD index f3f84e34f..e94459ad4 100644 --- a/include/nighthawk/distributor/BUILD +++ b/include/nighthawk/distributor/BUILD @@ -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", diff --git a/include/nighthawk/request_source/BUILD b/include/nighthawk/request_source/BUILD index 7185a6dae..54113c4e4 100644 --- a/include/nighthawk/request_source/BUILD +++ b/include/nighthawk/request_source/BUILD @@ -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", ], ) diff --git a/include/nighthawk/sink/BUILD b/include/nighthawk/sink/BUILD index f1f1cda7a..682c64e99 100644 --- a/include/nighthawk/sink/BUILD +++ b/include/nighthawk/sink/BUILD @@ -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", diff --git a/source/adaptive_load/adaptive_load_client_main.cc b/source/adaptive_load/adaptive_load_client_main.cc index ccd9c7c94..d24cf4813 100644 --- a/source/adaptive_load/adaptive_load_client_main.cc +++ b/source/adaptive_load/adaptive_load_client_main.cc @@ -1,4 +1,4 @@ -#include "adaptive_load/adaptive_load_client_main.h" +#include "source/adaptive_load/adaptive_load_client_main.h" #include #include @@ -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" diff --git a/source/adaptive_load/adaptive_load_controller_impl.cc b/source/adaptive_load/adaptive_load_controller_impl.cc index 58119b5ac..cf59433dc 100644 --- a/source/adaptive_load/adaptive_load_controller_impl.cc +++ b/source/adaptive_load/adaptive_load_controller_impl.cc @@ -1,4 +1,4 @@ -#include "adaptive_load/adaptive_load_controller_impl.h" +#include "source/adaptive_load/adaptive_load_controller_impl.h" #include @@ -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 { diff --git a/source/adaptive_load/config_validator_impl.cc b/source/adaptive_load/config_validator_impl.cc index 91c933297..4cabf31db 100644 --- a/source/adaptive_load/config_validator_impl.cc +++ b/source/adaptive_load/config_validator_impl.cc @@ -1,4 +1,4 @@ -#include "adaptive_load/config_validator_impl.h" +#include "source/adaptive_load/config_validator_impl.h" namespace Nighthawk { diff --git a/source/adaptive_load/input_variable_setter_impl.cc b/source/adaptive_load/input_variable_setter_impl.cc index a730b0ff4..7be83cbcd 100644 --- a/source/adaptive_load/input_variable_setter_impl.cc +++ b/source/adaptive_load/input_variable_setter_impl.cc @@ -1,4 +1,4 @@ -#include "adaptive_load/input_variable_setter_impl.h" +#include "source/adaptive_load/input_variable_setter_impl.h" #include diff --git a/source/adaptive_load/metrics_evaluator_impl.cc b/source/adaptive_load/metrics_evaluator_impl.cc index 54378edfa..bed9f34c1 100644 --- a/source/adaptive_load/metrics_evaluator_impl.cc +++ b/source/adaptive_load/metrics_evaluator_impl.cc @@ -1,11 +1,11 @@ -#include "adaptive_load/metrics_evaluator_impl.h" +#include "source/adaptive_load/metrics_evaluator_impl.h" #include #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 { diff --git a/source/adaptive_load/metrics_plugin_impl.cc b/source/adaptive_load/metrics_plugin_impl.cc index 0c67b201e..492958ed4 100644 --- a/source/adaptive_load/metrics_plugin_impl.cc +++ b/source/adaptive_load/metrics_plugin_impl.cc @@ -1,4 +1,4 @@ -#include "adaptive_load/metrics_plugin_impl.h" +#include "source/adaptive_load/metrics_plugin_impl.h" #include diff --git a/source/adaptive_load/scoring_function_impl.cc b/source/adaptive_load/scoring_function_impl.cc index 2a628012b..344e0e298 100644 --- a/source/adaptive_load/scoring_function_impl.cc +++ b/source/adaptive_load/scoring_function_impl.cc @@ -1,4 +1,4 @@ -#include "adaptive_load/scoring_function_impl.h" +#include "source/adaptive_load/scoring_function_impl.h" #include diff --git a/source/adaptive_load/session_spec_proto_helper_impl.cc b/source/adaptive_load/session_spec_proto_helper_impl.cc index 47d9d5d52..2ad046a0a 100644 --- a/source/adaptive_load/session_spec_proto_helper_impl.cc +++ b/source/adaptive_load/session_spec_proto_helper_impl.cc @@ -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" @@ -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 { diff --git a/source/adaptive_load/step_controller_impl.cc b/source/adaptive_load/step_controller_impl.cc index 94ab8bcac..0ffb230f8 100644 --- a/source/adaptive_load/step_controller_impl.cc +++ b/source/adaptive_load/step_controller_impl.cc @@ -1,4 +1,4 @@ -#include "adaptive_load/step_controller_impl.h" +#include "source/adaptive_load/step_controller_impl.h" #include @@ -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 { diff --git a/source/client/BUILD b/source/client/BUILD index fa2bebcf3..aa00b9bd0 100644 --- a/source/client/BUILD +++ b/source/client/BUILD @@ -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": [ diff --git a/source/client/benchmark_client_impl.cc b/source/client/benchmark_client_impl.cc index 5e3ca9c16..a7d7bd251 100644 --- a/source/client/benchmark_client_impl.cc +++ b/source/client/benchmark_client_impl.cc @@ -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" @@ -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" diff --git a/source/client/benchmark_client_impl.h b/source/client/benchmark_client_impl.h index e5b8d0ac4..6fd19becc 100644 --- a/source/client/benchmark_client_impl.h +++ b/source/client/benchmark_client_impl.h @@ -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 { diff --git a/source/client/client.cc b/source/client/client.cc index 19e11b29e..6b95bb6ec 100644 --- a/source/client/client.cc +++ b/source/client/client.cc @@ -1,4 +1,4 @@ -#include "client/client.h" +#include "source/client/client.h" #include @@ -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" diff --git a/source/client/client_worker_impl.cc b/source/client/client_worker_impl.cc index a5d456763..b64315c0d 100644 --- a/source/client/client_worker_impl.cc +++ b/source/client/client_worker_impl.cc @@ -1,11 +1,11 @@ -#include "client/client_worker_impl.h" +#include "source/client/client_worker_impl.h" #include "external/envoy/source/common/stats/symbol_table_impl.h" -#include "common/cached_time_source_impl.h" -#include "common/phase_impl.h" -#include "common/termination_predicate_impl.h" -#include "common/utility.h" +#include "source/common/cached_time_source_impl.h" +#include "source/common/phase_impl.h" +#include "source/common/termination_predicate_impl.h" +#include "source/common/utility.h" namespace Nighthawk { namespace Client { diff --git a/source/client/client_worker_impl.h b/source/client/client_worker_impl.h index 41b2660bc..5db968c26 100644 --- a/source/client/client_worker_impl.h +++ b/source/client/client_worker_impl.h @@ -17,7 +17,7 @@ #include "nighthawk/common/sequencer.h" #include "nighthawk/common/termination_predicate.h" -#include "common/worker_impl.h" +#include "source/common/worker_impl.h" namespace Nighthawk { namespace Client { diff --git a/source/client/factories_impl.cc b/source/client/factories_impl.cc index 2031658c4..cdbaa196f 100644 --- a/source/client/factories_impl.cc +++ b/source/client/factories_impl.cc @@ -1,23 +1,21 @@ -#include "client/factories_impl.h" +#include "source/client/factories_impl.h" #include "external/envoy/source/common/http/header_map_impl.h" #include "api/client/options.pb.h" -#include "common/platform_util_impl.h" -#include "common/rate_limiter_impl.h" -#include "common/request_source_impl.h" -#include "common/sequencer_impl.h" -#include "common/statistic_impl.h" -#include "common/termination_predicate_impl.h" -#include "common/uri_impl.h" -#include "common/utility.h" - -#include "client/benchmark_client_impl.h" -#include "client/output_collector_impl.h" -#include "client/output_formatter_impl.h" - -#include "request_source/request_options_list_plugin_impl.h" +#include "source/client/benchmark_client_impl.h" +#include "source/client/output_collector_impl.h" +#include "source/client/output_formatter_impl.h" +#include "source/common/platform_util_impl.h" +#include "source/common/rate_limiter_impl.h" +#include "source/common/request_source_impl.h" +#include "source/common/sequencer_impl.h" +#include "source/common/statistic_impl.h" +#include "source/common/termination_predicate_impl.h" +#include "source/common/uri_impl.h" +#include "source/common/utility.h" +#include "source/request_source/request_options_list_plugin_impl.h" using namespace std::chrono_literals; diff --git a/source/client/factories_impl.h b/source/client/factories_impl.h index 2932a72bf..239274efa 100644 --- a/source/client/factories_impl.h +++ b/source/client/factories_impl.h @@ -12,7 +12,7 @@ #include "external/envoy/source/common/common/statusor.h" #include "external/envoy/source/common/config/utility.h" -#include "common/platform_util_impl.h" +#include "source/common/platform_util_impl.h" namespace Nighthawk { namespace Client { diff --git a/source/client/flush_worker_impl.cc b/source/client/flush_worker_impl.cc index d369a74ae..661afcc69 100644 --- a/source/client/flush_worker_impl.cc +++ b/source/client/flush_worker_impl.cc @@ -1,9 +1,9 @@ -#include "client/flush_worker_impl.h" +#include "source/client/flush_worker_impl.h" #include "external/envoy/source/common/stats/symbol_table_impl.h" #include "external/envoy/source/server/server.h" -#include "common/utility.h" +#include "source/common/utility.h" namespace Nighthawk { namespace Client { diff --git a/source/client/flush_worker_impl.h b/source/client/flush_worker_impl.h index 8317d6358..eb916771f 100644 --- a/source/client/flush_worker_impl.h +++ b/source/client/flush_worker_impl.h @@ -10,7 +10,7 @@ #include "envoy/stats/store.h" #include "envoy/thread_local/thread_local.h" -#include "common/worker_impl.h" +#include "source/common/worker_impl.h" namespace Nighthawk { namespace Client { diff --git a/source/client/options_impl.cc b/source/client/options_impl.cc index 548d1c6c2..3615703ef 100644 --- a/source/client/options_impl.cc +++ b/source/client/options_impl.cc @@ -1,15 +1,14 @@ -#include "client/options_impl.h" +#include "source/client/options_impl.h" #include "external/envoy/source/common/protobuf/message_validator_impl.h" #include "external/envoy/source/common/protobuf/utility.h" #include "api/client/options.pb.validate.h" -#include "common/uri_impl.h" -#include "common/utility.h" -#include "common/version_info.h" - -#include "client/output_formatter_impl.h" +#include "source/client/output_formatter_impl.h" +#include "source/common/uri_impl.h" +#include "source/common/utility.h" +#include "source/common/version_info.h" #include "absl/strings/numbers.h" #include "absl/strings/str_split.h" diff --git a/source/client/output_collector_impl.cc b/source/client/output_collector_impl.cc index b6749f0c9..257eb9cef 100644 --- a/source/client/output_collector_impl.cc +++ b/source/client/output_collector_impl.cc @@ -1,4 +1,4 @@ -#include "client/output_collector_impl.h" +#include "source/client/output_collector_impl.h" #include @@ -7,7 +7,7 @@ #include "external/envoy/source/common/protobuf/utility.h" -#include "common/version_info.h" +#include "source/common/version_info.h" namespace Nighthawk { namespace Client { diff --git a/source/client/output_formatter_impl.cc b/source/client/output_formatter_impl.cc index d8df09bae..1e70fbc16 100644 --- a/source/client/output_formatter_impl.cc +++ b/source/client/output_formatter_impl.cc @@ -1,4 +1,4 @@ -#include "client/output_formatter_impl.h" +#include "source/client/output_formatter_impl.h" #include @@ -12,7 +12,7 @@ #include "api/client/transform/fortio.pb.h" -#include "common/version_info.h" +#include "source/common/version_info.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" diff --git a/source/client/output_transform_main.cc b/source/client/output_transform_main.cc index b5eb20b80..09b44d9d8 100644 --- a/source/client/output_transform_main.cc +++ b/source/client/output_transform_main.cc @@ -1,4 +1,4 @@ -#include "client/output_transform_main.h" +#include "source/client/output_transform_main.h" #include "nighthawk/common/exception.h" @@ -6,13 +6,12 @@ #include "api/client/service.pb.h" -#include "common/utility.h" -#include "common/version_info.h" - -#include "client/factories_impl.h" -#include "client/options_impl.h" -#include "client/output_collector_impl.h" -#include "client/output_formatter_impl.h" +#include "source/client/factories_impl.h" +#include "source/client/options_impl.h" +#include "source/client/output_collector_impl.h" +#include "source/client/output_formatter_impl.h" +#include "source/common/utility.h" +#include "source/common/version_info.h" #include "absl/strings/strip.h" #include "fmt/ranges.h" diff --git a/source/client/process_impl.cc b/source/client/process_impl.cc index 4bfb7b5ff..6302afdf0 100644 --- a/source/client/process_impl.cc +++ b/source/client/process_impl.cc @@ -1,4 +1,4 @@ -#include "client/process_impl.h" +#include "source/client/process_impl.h" #include @@ -28,6 +28,7 @@ #include "external/envoy/source/common/singleton/manager_impl.h" #include "external/envoy/source/common/thread_local/thread_local_impl.h" #include "external/envoy/source/server/server.h" +#include "external/envoy_api/envoy/config/core/v3/resolver.pb.h" #include "absl/strings/str_replace.h" #include "absl/types/optional.h" @@ -44,16 +45,16 @@ #include "api/client/options.pb.h" #include "api/client/output.pb.h" -#include "common/frequency.h" -#include "common/uri_impl.h" -#include "common/utility.h" +#include "source/common/frequency.h" +#include "source/common/uri_impl.h" +#include "source/common/utility.h" -#include "client/benchmark_client_impl.h" -#include "client/client.h" -#include "client/client_worker_impl.h" -#include "client/factories_impl.h" -#include "client/options_impl.h" -#include "client/sni_utility.h" +#include "source/client/benchmark_client_impl.h" +#include "source/client/client.h" +#include "source/client/client_worker_impl.h" +#include "source/client/factories_impl.h" +#include "source/client/options_impl.h" +#include "source/client/sni_utility.h" using namespace std::chrono_literals; @@ -511,6 +512,7 @@ bool ProcessImpl::runInternal(OutputCollector& collector, const std::vector( time_system_); + ::envoy::config::core::v3::DnsResolverOptions dns_options; const Envoy::OptionsImpl::HotRestartVersionCb hot_restart_version_cb = [](bool) { return "hot restart is disabled"; }; diff --git a/source/client/process_impl.h b/source/client/process_impl.h index 81684815b..4f06ad2c7 100644 --- a/source/client/process_impl.h +++ b/source/client/process_impl.h @@ -33,9 +33,9 @@ #include "external/envoy/source/server/config_validation/admin.h" #include "external/envoy_api/envoy/config/bootstrap/v3/bootstrap.pb.h" -#include "client/benchmark_client_impl.h" -#include "client/factories_impl.h" -#include "client/flush_worker_impl.h" +#include "source/client/benchmark_client_impl.h" +#include "source/client/factories_impl.h" +#include "source/client/flush_worker_impl.h" namespace Nighthawk { namespace Client { diff --git a/source/client/remote_process_impl.cc b/source/client/remote_process_impl.cc index d69922eb4..d1c9ef220 100644 --- a/source/client/remote_process_impl.cc +++ b/source/client/remote_process_impl.cc @@ -1,4 +1,4 @@ -#include "client/remote_process_impl.h" +#include "source/client/remote_process_impl.h" #include @@ -9,10 +9,9 @@ #include "api/client/options.pb.h" #include "api/client/output.pb.h" -#include "common/nighthawk_service_client_impl.h" -#include "common/uri_impl.h" - -#include "client/options_impl.h" +#include "source/client/options_impl.h" +#include "source/common/nighthawk_service_client_impl.h" +#include "source/common/uri_impl.h" namespace Nighthawk { namespace Client { diff --git a/source/client/service_impl.cc b/source/client/service_impl.cc index 31b965105..ee41074a0 100644 --- a/source/client/service_impl.cc +++ b/source/client/service_impl.cc @@ -1,14 +1,13 @@ -#include "client/service_impl.h" +#include "source/client/service_impl.h" #include #include "envoy/config/core/v3/base.pb.h" -#include "common/request_source_impl.h" - -#include "client/client.h" -#include "client/options_impl.h" -#include "client/output_collector_impl.h" +#include "source/client/client.h" +#include "source/client/options_impl.h" +#include "source/client/output_collector_impl.h" +#include "source/common/request_source_impl.h" namespace Nighthawk { namespace Client { diff --git a/source/client/service_main.cc b/source/client/service_main.cc index 185c1826f..e3ebda38f 100644 --- a/source/client/service_main.cc +++ b/source/client/service_main.cc @@ -1,14 +1,13 @@ -#include "client/service_main.h" +#include "source/client/service_main.h" #include #include #include "nighthawk/common/exception.h" -#include "common/utility.h" -#include "common/version_info.h" - -#include "client/service_impl.h" +#include "source/client/service_impl.h" +#include "source/common/utility.h" +#include "source/common/version_info.h" #include "absl/strings/strip.h" #include "tclap/CmdLine.h" diff --git a/source/client/service_main.h b/source/client/service_main.h index 1620051b3..150abae81 100644 --- a/source/client/service_main.h +++ b/source/client/service_main.h @@ -12,9 +12,8 @@ #include "api/client/service.pb.h" -#include "common/signal_handler.h" - -#include "client/service_impl.h" +#include "source/client/service_impl.h" +#include "source/common/signal_handler.h" #include "tclap/CmdLine.h" diff --git a/source/client/sni_utility.cc b/source/client/sni_utility.cc index 9a89e5e51..341bff293 100644 --- a/source/client/sni_utility.cc +++ b/source/client/sni_utility.cc @@ -1,4 +1,4 @@ -#include "client/sni_utility.h" +#include "source/client/sni_utility.h" #include "absl/strings/strip.h" diff --git a/source/client/sni_utility.h b/source/client/sni_utility.h index 22ab4e8a8..a1e1eafc8 100644 --- a/source/client/sni_utility.h +++ b/source/client/sni_utility.h @@ -5,7 +5,7 @@ #include "nighthawk/common/uri.h" -#include "external/envoy/include/envoy/http/protocol.h" +#include "external/envoy//envoy/http/protocol.h" namespace Nighthawk { namespace Client { diff --git a/source/client/stream_decoder.cc b/source/client/stream_decoder.cc index 28ff80ca9..a2e3e2dfe 100644 --- a/source/client/stream_decoder.cc +++ b/source/client/stream_decoder.cc @@ -1,4 +1,4 @@ -#include "client/stream_decoder.h" +#include "source/client/stream_decoder.h" #include diff --git a/source/common/BUILD b/source/common/BUILD index 3df97e2bd..60c2cd851 100644 --- a/source/common/BUILD +++ b/source/common/BUILD @@ -52,9 +52,9 @@ envoy_cc_library( "//api/request_source:grpc_request_source_service_lib", "//include/nighthawk/common:base_includes", "//include/nighthawk/common:request_lib", - "@envoy//include/envoy/grpc:async_client_interface_with_external_headers", - "@envoy//include/envoy/grpc:async_client_manager_interface_with_external_headers", - "@envoy//include/envoy/upstream:cluster_manager_interface_with_external_headers", + "@envoy//envoy/grpc:async_client_interface_with_external_headers", + "@envoy//envoy/grpc:async_client_manager_interface_with_external_headers", + "@envoy//envoy/upstream:cluster_manager_interface_with_external_headers", "@envoy//source/common/common:assert_lib_with_external_headers", "@envoy//source/common/common:minimal_logger_lib_with_external_headers", "@envoy//source/common/grpc:typed_async_client_lib_with_external_headers", @@ -104,7 +104,7 @@ envoy_cc_library( visibility = ["//visibility:public"], deps = [ "//include/nighthawk/common:stopwatch_lib", - "@envoy//include/envoy/common:time_interface", + "@envoy//envoy/common:time_interface", "@envoy//source/common/common:lock_guard_lib_with_external_headers", "@envoy//source/common/common:thread_lib_with_external_headers", ], @@ -162,5 +162,6 @@ envoy_cc_library( "@envoy//source/common/version:version_includes_with_external_headers", "@envoy//source/exe:envoy_common_lib_with_external_headers", "@envoy//source/server/config_validation:server_lib_with_external_headers", + "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], ) diff --git a/source/common/nighthawk_service_client_impl.cc b/source/common/nighthawk_service_client_impl.cc index 1c73c904c..0707c44bc 100644 --- a/source/common/nighthawk_service_client_impl.cc +++ b/source/common/nighthawk_service_client_impl.cc @@ -1,4 +1,4 @@ -#include "common/nighthawk_service_client_impl.h" +#include "source/common/nighthawk_service_client_impl.h" #include "external/envoy/source/common/common/assert.h" diff --git a/source/common/phase_impl.cc b/source/common/phase_impl.cc index 058d155f7..ab8e543e5 100644 --- a/source/common/phase_impl.cc +++ b/source/common/phase_impl.cc @@ -1,4 +1,4 @@ -#include "common/phase_impl.h" +#include "source/common/phase_impl.h" namespace Nighthawk { diff --git a/source/common/rate_limiter_impl.cc b/source/common/rate_limiter_impl.cc index 15f1fd71b..a0d8f46dd 100644 --- a/source/common/rate_limiter_impl.cc +++ b/source/common/rate_limiter_impl.cc @@ -1,4 +1,4 @@ -#include "common/rate_limiter_impl.h" +#include "source/common/rate_limiter_impl.h" #include "nighthawk/common/exception.h" diff --git a/source/common/rate_limiter_impl.h b/source/common/rate_limiter_impl.h index 1d22e5a43..32385e0eb 100644 --- a/source/common/rate_limiter_impl.h +++ b/source/common/rate_limiter_impl.h @@ -9,7 +9,7 @@ #include "external/envoy/source/common/common/logger.h" -#include "common/frequency.h" +#include "source/common/frequency.h" #include "absl/random/random.h" #include "absl/random/zipf_distribution.h" diff --git a/source/common/request_source_impl.cc b/source/common/request_source_impl.cc index c6cea672e..545603649 100644 --- a/source/common/request_source_impl.cc +++ b/source/common/request_source_impl.cc @@ -1,10 +1,10 @@ -#include "common/request_source_impl.h" +#include "source/common/request_source_impl.h" #include #include "external/envoy/source/common/common/assert.h" -#include "common/request_impl.h" +#include "source/common/request_impl.h" namespace Nighthawk { diff --git a/source/common/request_source_impl.h b/source/common/request_source_impl.h index 7017eae36..38c449739 100644 --- a/source/common/request_source_impl.h +++ b/source/common/request_source_impl.h @@ -7,7 +7,7 @@ #include "external/envoy/source/common/common/logger.h" -#include "common/request_stream_grpc_client_impl.h" +#include "source/common/request_stream_grpc_client_impl.h" namespace Nighthawk { diff --git a/source/common/request_stream_grpc_client_impl.cc b/source/common/request_stream_grpc_client_impl.cc index 31db65a69..dbde5ac2c 100644 --- a/source/common/request_stream_grpc_client_impl.cc +++ b/source/common/request_stream_grpc_client_impl.cc @@ -1,4 +1,4 @@ -#include "common/request_stream_grpc_client_impl.h" +#include "source/common/request_stream_grpc_client_impl.h" #include @@ -12,7 +12,7 @@ #include "api/request_source/service.pb.h" -#include "common/request_impl.h" +#include "source/common/request_impl.h" namespace Nighthawk { diff --git a/source/common/sequencer_impl.cc b/source/common/sequencer_impl.cc index 1dd9eec51..cb3092502 100644 --- a/source/common/sequencer_impl.cc +++ b/source/common/sequencer_impl.cc @@ -1,4 +1,4 @@ -#include "common/sequencer_impl.h" +#include "source/common/sequencer_impl.h" #include "nighthawk/common/exception.h" #include "nighthawk/common/platform_util.h" diff --git a/source/common/signal_handler.cc b/source/common/signal_handler.cc index 59c86bc11..b94477aa2 100644 --- a/source/common/signal_handler.cc +++ b/source/common/signal_handler.cc @@ -1,4 +1,4 @@ -#include "common/signal_handler.h" +#include "source/common/signal_handler.h" #include diff --git a/source/common/statistic_impl.cc b/source/common/statistic_impl.cc index e44eb999c..b86167cf7 100644 --- a/source/common/statistic_impl.cc +++ b/source/common/statistic_impl.cc @@ -1,4 +1,4 @@ -#include "common/statistic_impl.h" +#include "source/common/statistic_impl.h" #include #include diff --git a/source/common/statistic_impl.h b/source/common/statistic_impl.h index 0158d3bb5..a767b9f03 100644 --- a/source/common/statistic_impl.h +++ b/source/common/statistic_impl.h @@ -9,7 +9,7 @@ #include "external/envoy/source/common/common/logger.h" #include "external/envoy/source/common/stats/histogram_impl.h" -#include "common/frequency.h" +#include "source/common/frequency.h" namespace Nighthawk { diff --git a/source/common/termination_predicate_impl.cc b/source/common/termination_predicate_impl.cc index d32f2006b..a85dbb5fb 100644 --- a/source/common/termination_predicate_impl.cc +++ b/source/common/termination_predicate_impl.cc @@ -1,4 +1,4 @@ -#include "common/termination_predicate_impl.h" +#include "source/common/termination_predicate_impl.h" #include diff --git a/source/common/thread_safe_monotonic_time_stopwatch.cc b/source/common/thread_safe_monotonic_time_stopwatch.cc index e1048f1c5..85f061306 100644 --- a/source/common/thread_safe_monotonic_time_stopwatch.cc +++ b/source/common/thread_safe_monotonic_time_stopwatch.cc @@ -1,4 +1,4 @@ -#include "common/thread_safe_monotonic_time_stopwatch.h" +#include "source/common/thread_safe_monotonic_time_stopwatch.h" namespace Nighthawk { diff --git a/source/common/uri_impl.cc b/source/common/uri_impl.cc index 6ad0b977b..82960f823 100644 --- a/source/common/uri_impl.cc +++ b/source/common/uri_impl.cc @@ -1,9 +1,10 @@ -#include "common/uri_impl.h" +#include "source/common/uri_impl.h" #include "external/envoy/source/common/http/utility.h" #include "external/envoy/source/common/network/utility.h" +#include "external/envoy_api/envoy/config/core/v3/resolver.pb.h" -#include "common/utility.h" +#include "source/common/utility.h" #include "absl/strings/match.h" #include "absl/strings/str_replace.h" diff --git a/source/common/utility.cc b/source/common/utility.cc index 2e9430309..8efcc03e7 100644 --- a/source/common/utility.cc +++ b/source/common/utility.cc @@ -1,4 +1,4 @@ -#include "common/utility.h" +#include "source/common/utility.h" #include "nighthawk/common/exception.h" diff --git a/source/common/version_info.cc b/source/common/version_info.cc index 220af5c25..3e7efb86d 100644 --- a/source/common/version_info.cc +++ b/source/common/version_info.cc @@ -1,4 +1,4 @@ -#include "common/version_info.h" +#include "source/common/version_info.h" #include diff --git a/source/common/worker_impl.cc b/source/common/worker_impl.cc index 021a65f35..ce8d1fbd3 100644 --- a/source/common/worker_impl.cc +++ b/source/common/worker_impl.cc @@ -1,4 +1,4 @@ -#include "common/worker_impl.h" +#include "source/common/worker_impl.h" #include "envoy/runtime/runtime.h" #include "envoy/thread_local/thread_local.h" diff --git a/source/distributor/nighthawk_distributor_client_impl.cc b/source/distributor/nighthawk_distributor_client_impl.cc index 2274d06c8..5e43b6cb5 100644 --- a/source/distributor/nighthawk_distributor_client_impl.cc +++ b/source/distributor/nighthawk_distributor_client_impl.cc @@ -1,4 +1,4 @@ -#include "distributor/nighthawk_distributor_client_impl.h" +#include "source/distributor/nighthawk_distributor_client_impl.h" #include "external/envoy/source/common/common/assert.h" diff --git a/source/distributor/service_impl.cc b/source/distributor/service_impl.cc index 0ec4d63f8..1b167a4ea 100644 --- a/source/distributor/service_impl.cc +++ b/source/distributor/service_impl.cc @@ -1,4 +1,4 @@ -#include "distributor/service_impl.h" +#include "source/distributor/service_impl.h" #include diff --git a/source/exe/adaptive_load_client_main_entry.cc b/source/exe/adaptive_load_client_main_entry.cc index 67d45b434..7512af6a2 100644 --- a/source/exe/adaptive_load_client_main_entry.cc +++ b/source/exe/adaptive_load_client_main_entry.cc @@ -6,13 +6,13 @@ #include "external/envoy/source/common/event/real_time_system.h" #include "external/envoy/source/exe/platform_impl.h" -#include "common/nighthawk_service_client_impl.h" +#include "source/adaptive_load/adaptive_load_client_main.h" +#include "source/adaptive_load/adaptive_load_controller_impl.h" +#include "source/adaptive_load/metrics_evaluator_impl.h" +#include "source/adaptive_load/session_spec_proto_helper_impl.h" +#include "source/common/nighthawk_service_client_impl.h" #include "absl/debugging/symbolize.h" -#include "adaptive_load/adaptive_load_client_main.h" -#include "adaptive_load/adaptive_load_controller_impl.h" -#include "adaptive_load/metrics_evaluator_impl.h" -#include "adaptive_load/session_spec_proto_helper_impl.h" // NOLINT(namespace-nighthawk) diff --git a/source/exe/client_main_entry.cc b/source/exe/client_main_entry.cc index 9019d4060..503a6339d 100644 --- a/source/exe/client_main_entry.cc +++ b/source/exe/client_main_entry.cc @@ -1,6 +1,6 @@ #include "nighthawk/common/exception.h" -#include "client/client.h" +#include "source/client/client.h" #include "absl/debugging/symbolize.h" diff --git a/source/exe/output_transform_main_entry.cc b/source/exe/output_transform_main_entry.cc index 3894f726b..5ab8282b0 100644 --- a/source/exe/output_transform_main_entry.cc +++ b/source/exe/output_transform_main_entry.cc @@ -2,7 +2,7 @@ #include "nighthawk/common/exception.h" -#include "client/output_transform_main.h" +#include "source/client/output_transform_main.h" #include "absl/debugging/symbolize.h" diff --git a/source/exe/service_main_entry.cc b/source/exe/service_main_entry.cc index eda0c2c86..372d3016e 100644 --- a/source/exe/service_main_entry.cc +++ b/source/exe/service_main_entry.cc @@ -1,6 +1,6 @@ #include "nighthawk/common/exception.h" -#include "client/service_main.h" +#include "source/client/service_main.h" #include "absl/debugging/symbolize.h" diff --git a/source/request_source/request_options_list_plugin_impl.cc b/source/request_source/request_options_list_plugin_impl.cc index acc459e3c..0ce9e7d51 100644 --- a/source/request_source/request_options_list_plugin_impl.cc +++ b/source/request_source/request_options_list_plugin_impl.cc @@ -1,4 +1,4 @@ -#include "request_source/request_options_list_plugin_impl.h" +#include "source/request_source/request_options_list_plugin_impl.h" #include "external/envoy/source/common/protobuf/message_validator_impl.h" #include "external/envoy/source/common/protobuf/utility.h" @@ -6,8 +6,8 @@ #include "api/client/options.pb.h" -#include "common/request_impl.h" -#include "common/request_source_impl.h" +#include "source/common/request_impl.h" +#include "source/common/request_source_impl.h" namespace Nighthawk { std::string FileBasedOptionsListRequestSourceFactory::name() const { diff --git a/source/request_source/request_options_list_plugin_impl.h b/source/request_source/request_options_list_plugin_impl.h index 8de3d7ef9..24d960588 100644 --- a/source/request_source/request_options_list_plugin_impl.h +++ b/source/request_source/request_options_list_plugin_impl.h @@ -11,7 +11,7 @@ #include "api/client/options.pb.h" #include "api/request_source/request_source_plugin.pb.h" -#include "common/uri_impl.h" +#include "source/common/uri_impl.h" namespace Nighthawk { diff --git a/source/server/BUILD b/source/server/BUILD index c0af0f63e..ac11d0352 100644 --- a/source/server/BUILD +++ b/source/server/BUILD @@ -32,7 +32,7 @@ envoy_cc_library( deps = [ ":well_known_headers_lib", "//api/server:response_options_proto_cc_proto", - "@envoy//include/envoy/server:filter_config_interface_with_external_headers", + "@envoy//envoy/server:filter_config_interface_with_external_headers", "@envoy//source/common/common:statusor_lib_with_external_headers", "@envoy//source/common/protobuf:message_validator_lib_with_external_headers", "@envoy//source/common/protobuf:utility_lib_with_external_headers", @@ -87,7 +87,7 @@ envoy_cc_library( repository = "@envoy", deps = [ ":http_test_server_filter_lib", - "@envoy//include/envoy/server:filter_config_interface_with_external_headers", + "@envoy//envoy/server:filter_config_interface_with_external_headers", ], ) @@ -97,7 +97,7 @@ envoy_cc_library( repository = "@envoy", deps = [ ":http_dynamic_delay_filter_lib", - "@envoy//include/envoy/server:filter_config_interface_with_external_headers", + "@envoy//envoy/server:filter_config_interface_with_external_headers", ], ) @@ -107,6 +107,6 @@ envoy_cc_library( repository = "@envoy", deps = [ ":http_time_tracking_filter_lib", - "@envoy//include/envoy/server:filter_config_interface_with_external_headers", + "@envoy//envoy/server:filter_config_interface_with_external_headers", ], ) diff --git a/source/server/configuration.cc b/source/server/configuration.cc index ca17b6f46..e9a06828d 100644 --- a/source/server/configuration.cc +++ b/source/server/configuration.cc @@ -1,4 +1,4 @@ -#include "server/configuration.h" +#include "source/server/configuration.h" #include diff --git a/source/server/http_dynamic_delay_filter.cc b/source/server/http_dynamic_delay_filter.cc index 9536b8434..cf2525a08 100644 --- a/source/server/http_dynamic_delay_filter.cc +++ b/source/server/http_dynamic_delay_filter.cc @@ -1,11 +1,11 @@ -#include "server/http_dynamic_delay_filter.h" +#include "source/server/http_dynamic_delay_filter.h" #include #include "envoy/server/filter_config.h" -#include "server/configuration.h" -#include "server/well_known_headers.h" +#include "source/server/configuration.h" +#include "source/server/well_known_headers.h" #include "absl/strings/str_cat.h" diff --git a/source/server/http_dynamic_delay_filter.h b/source/server/http_dynamic_delay_filter.h index 654a3d752..638ac7ae1 100644 --- a/source/server/http_dynamic_delay_filter.h +++ b/source/server/http_dynamic_delay_filter.h @@ -9,7 +9,7 @@ #include "api/server/response_options.pb.h" -#include "server/http_filter_config_base.h" +#include "source/server/http_filter_config_base.h" namespace Nighthawk { namespace Server { diff --git a/source/server/http_dynamic_delay_filter_config.cc b/source/server/http_dynamic_delay_filter_config.cc index 87cda255b..89db6baeb 100644 --- a/source/server/http_dynamic_delay_filter_config.cc +++ b/source/server/http_dynamic_delay_filter_config.cc @@ -7,8 +7,8 @@ #include "api/server/response_options.pb.h" #include "api/server/response_options.pb.validate.h" -#include "server/configuration.h" -#include "server/http_dynamic_delay_filter.h" +#include "source/server/configuration.h" +#include "source/server/http_dynamic_delay_filter.h" namespace Nighthawk { namespace Server { diff --git a/source/server/http_filter_config_base.cc b/source/server/http_filter_config_base.cc index 0c8396139..1d2fc09fb 100644 --- a/source/server/http_filter_config_base.cc +++ b/source/server/http_filter_config_base.cc @@ -1,6 +1,6 @@ -#include "server/http_filter_config_base.h" +#include "source/server/http_filter_config_base.h" -#include "server/well_known_headers.h" +#include "source/server/well_known_headers.h" namespace Nighthawk { namespace Server { diff --git a/source/server/http_filter_config_base.h b/source/server/http_filter_config_base.h index 7569df17a..5167f2a3f 100644 --- a/source/server/http_filter_config_base.h +++ b/source/server/http_filter_config_base.h @@ -8,7 +8,7 @@ #include "api/server/response_options.pb.h" -#include "server/configuration.h" +#include "source/server/configuration.h" #include "absl/status/status.h" diff --git a/source/server/http_test_server_filter.cc b/source/server/http_test_server_filter.cc index bac840bc1..7c15afc5d 100644 --- a/source/server/http_test_server_filter.cc +++ b/source/server/http_test_server_filter.cc @@ -1,11 +1,11 @@ -#include "server/http_test_server_filter.h" +#include "source/server/http_test_server_filter.h" #include #include "envoy/server/filter_config.h" -#include "server/configuration.h" -#include "server/well_known_headers.h" +#include "source/server/configuration.h" +#include "source/server/well_known_headers.h" #include "absl/strings/numbers.h" diff --git a/source/server/http_test_server_filter.h b/source/server/http_test_server_filter.h index 16f3e378e..506aa6cd0 100644 --- a/source/server/http_test_server_filter.h +++ b/source/server/http_test_server_filter.h @@ -6,7 +6,7 @@ #include "api/server/response_options.pb.h" -#include "server/http_filter_config_base.h" +#include "source/server/http_filter_config_base.h" namespace Nighthawk { namespace Server { diff --git a/source/server/http_test_server_filter_config.cc b/source/server/http_test_server_filter_config.cc index 5a9754d9d..da6bcd06c 100644 --- a/source/server/http_test_server_filter_config.cc +++ b/source/server/http_test_server_filter_config.cc @@ -7,8 +7,8 @@ #include "api/server/response_options.pb.h" #include "api/server/response_options.pb.validate.h" -#include "server/configuration.h" -#include "server/http_test_server_filter.h" +#include "source/server/configuration.h" +#include "source/server/http_test_server_filter.h" namespace Nighthawk { namespace Server { diff --git a/source/server/http_time_tracking_filter.cc b/source/server/http_time_tracking_filter.cc index a6d787f02..c25836800 100644 --- a/source/server/http_time_tracking_filter.cc +++ b/source/server/http_time_tracking_filter.cc @@ -1,13 +1,12 @@ -#include "server/http_time_tracking_filter.h" +#include "source/server/http_time_tracking_filter.h" #include #include "envoy/server/filter_config.h" -#include "common/thread_safe_monotonic_time_stopwatch.h" - -#include "server/configuration.h" -#include "server/well_known_headers.h" +#include "source/common/thread_safe_monotonic_time_stopwatch.h" +#include "source/server/configuration.h" +#include "source/server/well_known_headers.h" #include "absl/strings/numbers.h" #include "absl/strings/str_cat.h" diff --git a/source/server/http_time_tracking_filter.h b/source/server/http_time_tracking_filter.h index 6f08b42f5..44c39aea9 100644 --- a/source/server/http_time_tracking_filter.h +++ b/source/server/http_time_tracking_filter.h @@ -11,7 +11,7 @@ #include "api/server/response_options.pb.h" -#include "server/http_filter_config_base.h" +#include "source/server/http_filter_config_base.h" namespace Nighthawk { namespace Server { diff --git a/source/server/http_time_tracking_filter_config.cc b/source/server/http_time_tracking_filter_config.cc index e9e3e38d0..50277aaf0 100644 --- a/source/server/http_time_tracking_filter_config.cc +++ b/source/server/http_time_tracking_filter_config.cc @@ -7,8 +7,8 @@ #include "api/server/response_options.pb.h" #include "api/server/response_options.pb.validate.h" -#include "server/configuration.h" -#include "server/http_time_tracking_filter.h" +#include "source/server/configuration.h" +#include "source/server/http_time_tracking_filter.h" namespace Nighthawk { namespace Server { diff --git a/source/sink/nighthawk_sink_client_impl.cc b/source/sink/nighthawk_sink_client_impl.cc index 8a643b4a6..e5777314f 100644 --- a/source/sink/nighthawk_sink_client_impl.cc +++ b/source/sink/nighthawk_sink_client_impl.cc @@ -1,4 +1,4 @@ -#include "sink/nighthawk_sink_client_impl.h" +#include "source/sink/nighthawk_sink_client_impl.h" #include "external/envoy/source/common/common/assert.h" diff --git a/source/sink/service_impl.cc b/source/sink/service_impl.cc index 63dbc96ac..15f4f3cad 100644 --- a/source/sink/service_impl.cc +++ b/source/sink/service_impl.cc @@ -1,4 +1,4 @@ -#include "sink/service_impl.h" +#include "source/sink/service_impl.h" #include @@ -6,8 +6,8 @@ #include "external/envoy/source/common/common/assert.h" -#include "sink/nighthawk_sink_client_impl.h" -#include "sink/sink_impl.h" +#include "source/sink/nighthawk_sink_client_impl.h" +#include "source/sink/sink_impl.h" namespace Nighthawk { diff --git a/source/sink/sink_impl.cc b/source/sink/sink_impl.cc index f7e9715d6..30a0ba91d 100644 --- a/source/sink/sink_impl.cc +++ b/source/sink/sink_impl.cc @@ -1,4 +1,4 @@ -#include "sink/sink_impl.h" +#include "source/sink/sink_impl.h" #include #include diff --git a/test/adaptive_load/adaptive_load_client_main_test.cc b/test/adaptive_load/adaptive_load_client_main_test.cc index 3ecef25bd..0c8ebd156 100644 --- a/test/adaptive_load/adaptive_load_client_main_test.cc +++ b/test/adaptive_load/adaptive_load_client_main_test.cc @@ -11,12 +11,13 @@ #include "api/adaptive_load/adaptive_load.pb.h" #include "api/adaptive_load/benchmark_result.pb.h" +#include "source/adaptive_load/adaptive_load_client_main.h" + #include "test/adaptive_load/minimal_output.h" #include "test/mocks/adaptive_load/mock_adaptive_load_controller.h" #include "test/test_common/environment.h" #include "absl/strings/string_view.h" -#include "adaptive_load/adaptive_load_client_main.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/adaptive_load/adaptive_load_controller_test.cc b/test/adaptive_load/adaptive_load_controller_test.cc index 7c0320848..11eca7c91 100644 --- a/test/adaptive_load/adaptive_load_controller_test.cc +++ b/test/adaptive_load/adaptive_load_controller_test.cc @@ -27,6 +27,12 @@ #include "api/client/service.pb.h" #include "api/client/service_mock.grpc.pb.h" +#include "source/adaptive_load/adaptive_load_controller_impl.h" +#include "source/adaptive_load/metrics_plugin_impl.h" +#include "source/adaptive_load/plugin_loader.h" +#include "source/adaptive_load/scoring_function_impl.h" +#include "source/adaptive_load/session_spec_proto_helper_impl.h" + #include "test/adaptive_load/fake_plugins/fake_step_controller/fake_step_controller.h" #include "test/common/fake_time_source.h" #include "test/mocks/adaptive_load/mock_metrics_evaluator.h" @@ -36,11 +42,6 @@ #include "absl/container/flat_hash_map.h" #include "absl/status/status.h" #include "absl/strings/str_join.h" -#include "adaptive_load/adaptive_load_controller_impl.h" -#include "adaptive_load/metrics_plugin_impl.h" -#include "adaptive_load/plugin_loader.h" -#include "adaptive_load/scoring_function_impl.h" -#include "adaptive_load/session_spec_proto_helper_impl.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/adaptive_load/fake_plugins/fake_input_variable_setter/fake_input_variable_setter_test.cc b/test/adaptive_load/fake_plugins/fake_input_variable_setter/fake_input_variable_setter_test.cc index f0b8a6a2e..86f754ae9 100644 --- a/test/adaptive_load/fake_plugins/fake_input_variable_setter/fake_input_variable_setter_test.cc +++ b/test/adaptive_load/fake_plugins/fake_input_variable_setter/fake_input_variable_setter_test.cc @@ -5,9 +5,10 @@ #include "api/adaptive_load/benchmark_result.pb.h" #include "api/client/options.pb.h" +#include "source/adaptive_load/plugin_loader.h" + #include "test/adaptive_load/fake_plugins/fake_input_variable_setter/fake_input_variable_setter.h" -#include "adaptive_load/plugin_loader.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/adaptive_load/fake_plugins/fake_metrics_plugin/fake_metrics_plugin_test.cc b/test/adaptive_load/fake_plugins/fake_metrics_plugin/fake_metrics_plugin_test.cc index 7b7ec0255..ed1e64ce1 100644 --- a/test/adaptive_load/fake_plugins/fake_metrics_plugin/fake_metrics_plugin_test.cc +++ b/test/adaptive_load/fake_plugins/fake_metrics_plugin/fake_metrics_plugin_test.cc @@ -5,10 +5,11 @@ #include "api/adaptive_load/benchmark_result.pb.h" #include "api/client/options.pb.h" +#include "source/adaptive_load/plugin_loader.h" + #include "test/adaptive_load/fake_plugins/fake_metrics_plugin/fake_metrics_plugin.h" #include "test/adaptive_load/fake_plugins/fake_metrics_plugin/fake_metrics_plugin.pb.h" -#include "adaptive_load/plugin_loader.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/adaptive_load/fake_plugins/fake_step_controller/fake_step_controller_test.cc b/test/adaptive_load/fake_plugins/fake_step_controller/fake_step_controller_test.cc index da9648a7f..0685f003e 100644 --- a/test/adaptive_load/fake_plugins/fake_step_controller/fake_step_controller_test.cc +++ b/test/adaptive_load/fake_plugins/fake_step_controller/fake_step_controller_test.cc @@ -5,9 +5,10 @@ #include "api/adaptive_load/benchmark_result.pb.h" #include "api/client/options.pb.h" +#include "source/adaptive_load/plugin_loader.h" + #include "test/adaptive_load/fake_plugins/fake_step_controller/fake_step_controller.h" -#include "adaptive_load/plugin_loader.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/adaptive_load/input_variable_setter_test.cc b/test/adaptive_load/input_variable_setter_test.cc index 7d0117ebf..c18fb3cee 100644 --- a/test/adaptive_load/input_variable_setter_test.cc +++ b/test/adaptive_load/input_variable_setter_test.cc @@ -1,6 +1,7 @@ #include "external/envoy/source/common/config/utility.h" -#include "adaptive_load/input_variable_setter_impl.h" +#include "source/adaptive_load/input_variable_setter_impl.h" + #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/adaptive_load/metrics_evaluator_test.cc b/test/adaptive_load/metrics_evaluator_test.cc index 1bf632400..b3056ac3b 100644 --- a/test/adaptive_load/metrics_evaluator_test.cc +++ b/test/adaptive_load/metrics_evaluator_test.cc @@ -5,10 +5,11 @@ #include "api/adaptive_load/scoring_function_impl.pb.h" #include "api/client/service.pb.h" +#include "source/adaptive_load/metrics_evaluator_impl.h" + #include "test/adaptive_load/fake_plugins/fake_metrics_plugin/fake_metrics_plugin.h" #include "test/adaptive_load/minimal_output.h" -#include "adaptive_load/metrics_evaluator_impl.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/adaptive_load/metrics_plugin_test.cc b/test/adaptive_load/metrics_plugin_test.cc index 8f8bce002..1b85b09eb 100644 --- a/test/adaptive_load/metrics_plugin_test.cc +++ b/test/adaptive_load/metrics_plugin_test.cc @@ -2,9 +2,10 @@ #include "external/envoy/source/common/config/utility.h" +#include "source/adaptive_load/metrics_plugin_impl.h" + #include "test/adaptive_load/minimal_output.h" -#include "adaptive_load/metrics_plugin_impl.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/adaptive_load/plugin_loader_test.cc b/test/adaptive_load/plugin_loader_test.cc index c5622e008..f5e8c14ad 100644 --- a/test/adaptive_load/plugin_loader_test.cc +++ b/test/adaptive_load/plugin_loader_test.cc @@ -12,8 +12,9 @@ #include "api/adaptive_load/scoring_function_impl.pb.h" #include "api/client/options.pb.h" +#include "source/adaptive_load/plugin_loader.h" + #include "absl/status/status.h" -#include "adaptive_load/plugin_loader.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/adaptive_load/scoring_function_test.cc b/test/adaptive_load/scoring_function_test.cc index c5eeb3a01..6dea1fa8e 100644 --- a/test/adaptive_load/scoring_function_test.cc +++ b/test/adaptive_load/scoring_function_test.cc @@ -4,7 +4,8 @@ #include "external/envoy/source/common/config/utility.h" -#include "adaptive_load/scoring_function_impl.h" +#include "source/adaptive_load/scoring_function_impl.h" + #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/adaptive_load/session_spec_proto_helper_test.cc b/test/adaptive_load/session_spec_proto_helper_test.cc index 55c9a8dbd..c989ec318 100644 --- a/test/adaptive_load/session_spec_proto_helper_test.cc +++ b/test/adaptive_load/session_spec_proto_helper_test.cc @@ -6,10 +6,11 @@ #include "api/adaptive_load/metric_spec.pb.h" #include "api/client/options.pb.h" +#include "source/adaptive_load/plugin_loader.h" +#include "source/adaptive_load/session_spec_proto_helper_impl.h" + #include "test/adaptive_load/fake_plugins/fake_metrics_plugin/fake_metrics_plugin.h" -#include "adaptive_load/plugin_loader.h" -#include "adaptive_load/session_spec_proto_helper_impl.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/adaptive_load/step_controller_test.cc b/test/adaptive_load/step_controller_test.cc index 678846b75..64cb5ea8b 100644 --- a/test/adaptive_load/step_controller_test.cc +++ b/test/adaptive_load/step_controller_test.cc @@ -9,8 +9,9 @@ #include "api/adaptive_load/step_controller_impl.pb.h" #include "api/client/options.pb.h" -#include "adaptive_load/plugin_loader.h" -#include "adaptive_load/step_controller_impl.h" +#include "source/adaptive_load/plugin_loader.h" +#include "source/adaptive_load/step_controller_impl.h" + #include "fake_plugins/fake_input_variable_setter/fake_input_variable_setter.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/benchmark_http_client_test.cc b/test/benchmark_http_client_test.cc index fa854ddc2..5100eca5a 100644 --- a/test/benchmark_http_client_test.cc +++ b/test/benchmark_http_client_test.cc @@ -13,12 +13,11 @@ #include "external/envoy/test/mocks/upstream/mocks.h" #include "external/envoy/test/test_common/network_utility.h" -#include "common/request_impl.h" -#include "common/statistic_impl.h" -#include "common/uri_impl.h" -#include "common/utility.h" - -#include "client/benchmark_client_impl.h" +#include "source/client/benchmark_client_impl.h" +#include "source/common/request_impl.h" +#include "source/common/statistic_impl.h" +#include "source/common/uri_impl.h" +#include "source/common/utility.h" #include "gtest/gtest.h" diff --git a/test/client/utility.h b/test/client/utility.h index 908712cff..0700643f6 100644 --- a/test/client/utility.h +++ b/test/client/utility.h @@ -3,7 +3,7 @@ #include #include -#include "client/options_impl.h" +#include "source/client/options_impl.h" #include "absl/strings/string_view.h" diff --git a/test/client_test.cc b/test/client_test.cc index 549c065e7..9ecf4b6ff 100644 --- a/test/client_test.cc +++ b/test/client_test.cc @@ -3,7 +3,7 @@ #include "external/envoy/test/test_common/environment.h" #include "external/envoy/test/test_common/utility.h" -#include "client/client.h" +#include "source/client/client.h" #include "test/client/utility.h" diff --git a/test/client_worker_test.cc b/test/client_worker_test.cc index e143b9635..a2bcd730d 100644 --- a/test/client_worker_test.cc +++ b/test/client_worker_test.cc @@ -11,9 +11,8 @@ #include "external/envoy/test/mocks/thread_local/mocks.h" #include "external/envoy/test/test_common/simulated_time_system.h" -#include "common/statistic_impl.h" - -#include "client/client_worker_impl.h" +#include "source/client/client_worker_impl.h" +#include "source/common/statistic_impl.h" #include "test/mocks/client/mock_benchmark_client.h" #include "test/mocks/client/mock_benchmark_client_factory.h" diff --git a/test/common/nighthawk_service_client_test.cc b/test/common/nighthawk_service_client_test.cc index ed3c0a34c..358366334 100644 --- a/test/common/nighthawk_service_client_test.cc +++ b/test/common/nighthawk_service_client_test.cc @@ -4,7 +4,7 @@ #include "api/client/service.grpc.pb.h" #include "api/client/service_mock.grpc.pb.h" -#include "common/nighthawk_service_client_impl.h" +#include "source/common/nighthawk_service_client_impl.h" #include "grpcpp/test/mock_stream.h" diff --git a/test/common/signal_handler_test.cc b/test/common/signal_handler_test.cc index cabb2251b..53cfb72c6 100644 --- a/test/common/signal_handler_test.cc +++ b/test/common/signal_handler_test.cc @@ -1,7 +1,7 @@ #include #include -#include "common/signal_handler.h" +#include "source/common/signal_handler.h" #include "gtest/gtest.h" diff --git a/test/distributor/distributor_service_test.cc b/test/distributor/distributor_service_test.cc index 8e03eaafe..c7403b345 100644 --- a/test/distributor/distributor_service_test.cc +++ b/test/distributor/distributor_service_test.cc @@ -6,9 +6,8 @@ #include "api/distributor/distributor.pb.h" -#include "common/nighthawk_service_client_impl.h" - -#include "distributor/service_impl.h" +#include "source/common/nighthawk_service_client_impl.h" +#include "source/distributor/service_impl.h" #include "test/mocks/common/mock_nighthawk_service_client.h" diff --git a/test/distributor/nighthawk_distributor_client_test.cc b/test/distributor/nighthawk_distributor_client_test.cc index 8912faf9c..75e35b743 100644 --- a/test/distributor/nighthawk_distributor_client_test.cc +++ b/test/distributor/nighthawk_distributor_client_test.cc @@ -4,7 +4,7 @@ #include "api/distributor/distributor.grpc.pb.h" #include "api/distributor/distributor_mock.grpc.pb.h" -#include "distributor/nighthawk_distributor_client_impl.h" +#include "source/distributor/nighthawk_distributor_client_impl.h" #include "grpcpp/test/mock_stream.h" diff --git a/test/factories_test.cc b/test/factories_test.cc index b1f9cec12..040f4e3f3 100644 --- a/test/factories_test.cc +++ b/test/factories_test.cc @@ -4,9 +4,8 @@ #include "external/envoy/test/test_common/simulated_time_system.h" #include "external/envoy/test/test_common/utility.h" -#include "common/request_source_impl.h" - -#include "client/factories_impl.h" +#include "source/client/factories_impl.h" +#include "source/common/request_source_impl.h" #include "test/mocks/client/mock_benchmark_client.h" #include "test/mocks/client/mock_options.h" diff --git a/test/flush_worker_test.cc b/test/flush_worker_test.cc index d9d2be38b..80014efca 100644 --- a/test/flush_worker_test.cc +++ b/test/flush_worker_test.cc @@ -11,7 +11,7 @@ #include "external/envoy/test/mocks/stats/mocks.h" #include "external/envoy/test/mocks/thread_local/mocks.h" -#include "client/flush_worker_impl.h" +#include "source/client/flush_worker_impl.h" #include "gtest/gtest.h" diff --git a/test/frequency_test.cc b/test/frequency_test.cc index 6c3be3777..a0fb67afe 100644 --- a/test/frequency_test.cc +++ b/test/frequency_test.cc @@ -1,4 +1,4 @@ -#include "common/frequency.h" +#include "source/common/frequency.h" #include "gtest/gtest.h" diff --git a/test/options_test.cc b/test/options_test.cc index 73a06ef92..d110d25f2 100644 --- a/test/options_test.cc +++ b/test/options_test.cc @@ -1,6 +1,6 @@ #include "external/envoy/test/test_common/utility.h" -#include "client/options_impl.h" +#include "source/client/options_impl.h" #include "test/client/utility.h" #include "test/test_common/environment.h" diff --git a/test/output_formatter_test.cc b/test/output_formatter_test.cc index 6c720ea29..743cc6822 100644 --- a/test/output_formatter_test.cc +++ b/test/output_formatter_test.cc @@ -10,11 +10,10 @@ #include "api/client/options.pb.h" #include "api/client/output.pb.h" -#include "common/statistic_impl.h" -#include "common/version_info.h" - -#include "client/output_collector_impl.h" -#include "client/output_formatter_impl.h" +#include "source/client/output_collector_impl.h" +#include "source/client/output_formatter_impl.h" +#include "source/common/statistic_impl.h" +#include "source/common/version_info.h" #include "test_common/environment.h" diff --git a/test/output_transform_main_test.cc b/test/output_transform_main_test.cc index 14710e322..244884883 100644 --- a/test/output_transform_main_test.cc +++ b/test/output_transform_main_test.cc @@ -6,8 +6,8 @@ #include "api/client/service.pb.h" -#include "client/output_formatter_impl.h" -#include "client/output_transform_main.h" +#include "source/client/output_formatter_impl.h" +#include "source/client/output_transform_main.h" #include "absl/strings/match.h" #include "gtest/gtest.h" diff --git a/test/platform_util_test.cc b/test/platform_util_test.cc index 777235161..32d0dd70c 100644 --- a/test/platform_util_test.cc +++ b/test/platform_util_test.cc @@ -1,6 +1,6 @@ #include -#include "common/platform_util_impl.h" +#include "source/common/platform_util_impl.h" #include "gtest/gtest.h" diff --git a/test/process_test.cc b/test/process_test.cc index 3b49916aa..76696a9a7 100644 --- a/test/process_test.cc +++ b/test/process_test.cc @@ -10,11 +10,10 @@ #include "external/envoy/test/test_common/simulated_time_system.h" #include "external/envoy/test/test_common/utility.h" -#include "common/uri_impl.h" - -#include "client/options_impl.h" -#include "client/output_collector_impl.h" -#include "client/process_impl.h" +#include "source/client/options_impl.h" +#include "source/client/output_collector_impl.h" +#include "source/client/process_impl.h" +#include "source/common/uri_impl.h" #include "test/client/utility.h" diff --git a/test/rate_limiter_test.cc b/test/rate_limiter_test.cc index 98f253365..963d12f7f 100644 --- a/test/rate_limiter_test.cc +++ b/test/rate_limiter_test.cc @@ -5,8 +5,8 @@ #include "external/envoy/test/test_common/simulated_time_system.h" -#include "common/frequency.h" -#include "common/rate_limiter_impl.h" +#include "source/common/frequency.h" +#include "source/common/rate_limiter_impl.h" #include "test/mocks/common/mock_rate_limiter.h" diff --git a/test/request_generator_test.cc b/test/request_generator_test.cc index a61ccd3f8..2699fa8c9 100644 --- a/test/request_generator_test.cc +++ b/test/request_generator_test.cc @@ -2,7 +2,7 @@ #include "external/envoy/test/test_common/utility.h" -#include "common/request_source_impl.h" +#include "source/common/request_source_impl.h" #include "gtest/gtest.h" diff --git a/test/request_source/request_source_plugin_test.cc b/test/request_source/request_source_plugin_test.cc index 04140a92a..1108c45db 100644 --- a/test/request_source/request_source_plugin_test.cc +++ b/test/request_source/request_source_plugin_test.cc @@ -6,7 +6,7 @@ #include "external/envoy/test/test_common/file_system_for_test.h" #include "external/envoy/test/test_common/utility.h" -#include "request_source/request_options_list_plugin_impl.h" +#include "source/request_source/request_options_list_plugin_impl.h" #include "test/request_source/stub_plugin_impl.h" #include "test/test_common/environment.h" diff --git a/test/request_source/stub_plugin_impl.cc b/test/request_source/stub_plugin_impl.cc index 7ca882263..cb2f436a9 100644 --- a/test/request_source/stub_plugin_impl.cc +++ b/test/request_source/stub_plugin_impl.cc @@ -6,8 +6,8 @@ #include "api/client/options.pb.h" -#include "common/request_impl.h" -#include "common/request_source_impl.h" +#include "source/common/request_impl.h" +#include "source/common/request_source_impl.h" namespace Nighthawk { diff --git a/test/request_source/stub_plugin_impl.h b/test/request_source/stub_plugin_impl.h index b45e64c9e..d62fb4c6a 100644 --- a/test/request_source/stub_plugin_impl.h +++ b/test/request_source/stub_plugin_impl.h @@ -9,7 +9,7 @@ #include "api/client/options.pb.h" #include "api/request_source/request_source_plugin.pb.h" -#include "common/uri_impl.h" +#include "source/common/uri_impl.h" namespace Nighthawk { diff --git a/test/request_stream_grpc_client_test.cc b/test/request_stream_grpc_client_test.cc index b78b32f32..1cab8512f 100644 --- a/test/request_stream_grpc_client_test.cc +++ b/test/request_stream_grpc_client_test.cc @@ -5,8 +5,8 @@ #include "api/request_source/service.pb.h" -#include "common/request_impl.h" -#include "common/request_stream_grpc_client_impl.h" +#include "source/common/request_impl.h" +#include "source/common/request_stream_grpc_client_impl.h" #include "gtest/gtest.h" diff --git a/test/sequencer_test.cc b/test/sequencer_test.cc index b87f1730f..96da3e4f1 100644 --- a/test/sequencer_test.cc +++ b/test/sequencer_test.cc @@ -9,9 +9,9 @@ #include "external/envoy/test/mocks/event/mocks.h" #include "external/envoy/test/test_common/simulated_time_system.h" -#include "common/rate_limiter_impl.h" -#include "common/sequencer_impl.h" -#include "common/statistic_impl.h" +#include "source/common/rate_limiter_impl.h" +#include "source/common/sequencer_impl.h" +#include "source/common/statistic_impl.h" #include "test/mocks/common/mock_platform_util.h" #include "test/mocks/common/mock_rate_limiter.h" diff --git a/test/server/configuration_test.cc b/test/server/configuration_test.cc index f0c1d9458..4290c6aaf 100644 --- a/test/server/configuration_test.cc +++ b/test/server/configuration_test.cc @@ -5,7 +5,7 @@ #include "api/server/response_options.pb.validate.h" -#include "server/configuration.h" +#include "source/server/configuration.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/server/http_dynamic_delay_filter_integration_test.cc b/test/server/http_dynamic_delay_filter_integration_test.cc index 05964b581..5f5d1ceec 100644 --- a/test/server/http_dynamic_delay_filter_integration_test.cc +++ b/test/server/http_dynamic_delay_filter_integration_test.cc @@ -2,8 +2,8 @@ #include "api/server/response_options.pb.h" -#include "server/configuration.h" -#include "server/http_dynamic_delay_filter.h" +#include "source/server/configuration.h" +#include "source/server/http_dynamic_delay_filter.h" #include "test/server/http_filter_integration_test_base.h" diff --git a/test/server/http_filter_base_test.cc b/test/server/http_filter_base_test.cc index 3dec16a27..23eeacf35 100644 --- a/test/server/http_filter_base_test.cc +++ b/test/server/http_filter_base_test.cc @@ -1,6 +1,6 @@ -#include "server/http_dynamic_delay_filter.h" -#include "server/http_test_server_filter.h" -#include "server/http_time_tracking_filter.h" +#include "source/server/http_dynamic_delay_filter.h" +#include "source/server/http_test_server_filter.h" +#include "source/server/http_time_tracking_filter.h" #include "test/server/http_filter_integration_test_base.h" diff --git a/test/server/http_filter_integration_test_base.cc b/test/server/http_filter_integration_test_base.cc index a05e6bd45..6de0c3a73 100644 --- a/test/server/http_filter_integration_test_base.cc +++ b/test/server/http_filter_integration_test_base.cc @@ -1,6 +1,6 @@ #include "test/server/http_filter_integration_test_base.h" -#include "server/well_known_headers.h" +#include "source/server/well_known_headers.h" #include "gtest/gtest.h" diff --git a/test/server/http_test_server_filter_integration_test.cc b/test/server/http_test_server_filter_integration_test.cc index 752697513..69ddd1264 100644 --- a/test/server/http_test_server_filter_integration_test.cc +++ b/test/server/http_test_server_filter_integration_test.cc @@ -1,8 +1,8 @@ #include "api/server/response_options.pb.h" #include "api/server/response_options.pb.validate.h" -#include "server/configuration.h" -#include "server/http_test_server_filter.h" +#include "source/server/configuration.h" +#include "source/server/http_test_server_filter.h" #include "test/server/http_filter_integration_test_base.h" diff --git a/test/server/http_time_tracking_filter_integration_test.cc b/test/server/http_time_tracking_filter_integration_test.cc index c49c343f4..7ea03f46f 100644 --- a/test/server/http_time_tracking_filter_integration_test.cc +++ b/test/server/http_time_tracking_filter_integration_test.cc @@ -5,8 +5,8 @@ #include "api/server/response_options.pb.h" #include "api/server/response_options.pb.validate.h" -#include "server/configuration.h" -#include "server/http_time_tracking_filter.h" +#include "source/server/configuration.h" +#include "source/server/http_time_tracking_filter.h" #include "test/server/http_filter_integration_test_base.h" diff --git a/test/service_main_test.cc b/test/service_main_test.cc index b36d3db18..b22f75ef6 100644 --- a/test/service_main_test.cc +++ b/test/service_main_test.cc @@ -6,7 +6,7 @@ #include "external/envoy/test/test_common/network_utility.h" #include "external/envoy/test/test_common/utility.h" -#include "client/service_main.h" +#include "source/client/service_main.h" #include "gtest/gtest.h" diff --git a/test/service_test.cc b/test/service_test.cc index 3350d2dbb..06ddadc3e 100644 --- a/test/service_test.cc +++ b/test/service_test.cc @@ -10,7 +10,7 @@ #include "api/client/service.pb.h" -#include "client/service_impl.h" +#include "source/client/service_impl.h" #include "gtest/gtest.h" diff --git a/test/sink/nighthawk_sink_client_test.cc b/test/sink/nighthawk_sink_client_test.cc index a7160b943..c5939379b 100644 --- a/test/sink/nighthawk_sink_client_test.cc +++ b/test/sink/nighthawk_sink_client_test.cc @@ -4,7 +4,7 @@ #include "api/sink/sink.grpc.pb.h" #include "api/sink/sink_mock.grpc.pb.h" -#include "sink/nighthawk_sink_client_impl.h" +#include "source/sink/nighthawk_sink_client_impl.h" #include "grpcpp/test/mock_stream.h" diff --git a/test/sink/sink_service_test.cc b/test/sink/sink_service_test.cc index e6512d3fa..173a80ab5 100644 --- a/test/sink/sink_service_test.cc +++ b/test/sink/sink_service_test.cc @@ -8,7 +8,7 @@ #include "api/sink/sink.pb.h" -#include "sink/service_impl.h" +#include "source/sink/service_impl.h" #include "test/mocks/sink/mock_sink.h" diff --git a/test/sink/sink_test.cc b/test/sink/sink_test.cc index 534c93da2..a1bbe0f63 100644 --- a/test/sink/sink_test.cc +++ b/test/sink/sink_test.cc @@ -3,7 +3,7 @@ #include "external/envoy/source/common/common/random_generator.h" -#include "sink/sink_impl.h" +#include "source/sink/sink_impl.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/sni_utility_test.cc b/test/sni_utility_test.cc index 4cbae3b2a..380c6a018 100644 --- a/test/sni_utility_test.cc +++ b/test/sni_utility_test.cc @@ -1,8 +1,7 @@ #include "external/envoy/test/test_common/utility.h" -#include "common/uri_impl.h" - -#include "client/sni_utility.h" +#include "source/client/sni_utility.h" +#include "source/common/uri_impl.h" #include "gtest/gtest.h" diff --git a/test/statistic_test.cc b/test/statistic_test.cc index a26461608..15a97632f 100644 --- a/test/statistic_test.cc +++ b/test/statistic_test.cc @@ -11,7 +11,7 @@ #include "external/envoy/test/test_common/file_system_for_test.h" #include "external/envoy/test/test_common/utility.h" -#include "common/statistic_impl.h" +#include "source/common/statistic_impl.h" #include "test/test_common/environment.h" diff --git a/test/stopwatch_test.cc b/test/stopwatch_test.cc index e7d2b030e..2fb5c016b 100644 --- a/test/stopwatch_test.cc +++ b/test/stopwatch_test.cc @@ -6,7 +6,7 @@ #include "external/envoy/test/test_common/simulated_time_system.h" #include "external/envoy/test/test_common/utility.h" -#include "common/thread_safe_monotonic_time_stopwatch.h" +#include "source/common/thread_safe_monotonic_time_stopwatch.h" #include "test/common/fake_time_source.h" diff --git a/test/stream_decoder_test.cc b/test/stream_decoder_test.cc index 8614f4f32..05c4293c5 100644 --- a/test/stream_decoder_test.cc +++ b/test/stream_decoder_test.cc @@ -8,9 +8,8 @@ #include "external/envoy/test/mocks/http/mocks.h" #include "external/envoy/test/mocks/stream_info/mocks.h" -#include "common/statistic_impl.h" - -#include "client/stream_decoder.h" +#include "source/client/stream_decoder.h" +#include "source/common/statistic_impl.h" #include "gtest/gtest.h" diff --git a/test/termination_predicate_test.cc b/test/termination_predicate_test.cc index 4ab0bab53..1fb9a4af6 100644 --- a/test/termination_predicate_test.cc +++ b/test/termination_predicate_test.cc @@ -5,7 +5,7 @@ #include "external/envoy/test/test_common/simulated_time_system.h" #include "external/envoy/test/test_common/utility.h" -#include "common/termination_predicate_impl.h" +#include "source/common/termination_predicate_impl.h" #include "gtest/gtest.h" diff --git a/test/utility_test.cc b/test/utility_test.cc index 82c5d3324..e9f1a1d13 100644 --- a/test/utility_test.cc +++ b/test/utility_test.cc @@ -4,8 +4,8 @@ #include "external/envoy/source/common/stats/isolated_store_impl.h" #include "external/envoy/test/test_common/utility.h" -#include "common/uri_impl.h" -#include "common/utility.h" +#include "source/common/uri_impl.h" +#include "source/common/utility.h" #include "test/test_common/environment.h" diff --git a/test/worker_test.cc b/test/worker_test.cc index b0fb2a280..8eb86a46f 100644 --- a/test/worker_test.cc +++ b/test/worker_test.cc @@ -7,7 +7,7 @@ #include "external/envoy/test/mocks/protobuf/mocks.h" #include "external/envoy/test/mocks/thread_local/mocks.h" -#include "common/worker_impl.h" +#include "source/common/worker_impl.h" #include "gtest/gtest.h" diff --git a/tools/check_envoy_includes.py b/tools/check_envoy_includes.py index 35298e81b..2fb521bc2 100755 --- a/tools/check_envoy_includes.py +++ b/tools/check_envoy_includes.py @@ -19,7 +19,7 @@ def _inspect_line(bazel_output_base, file_path, line): match = re.findall(r'#include "([^"]*)"', line) if len(match) == 1: path = match[0] - if path.startswith("external/") and not path.startswith("envoy/"): + if path.startswith("external/") or path.startswith("envoy/"): return True found_in_nighthawk_sources = os.path.isfile(path) or os.path.isfile( "source/" + path) or os.path.isfile("include/" + path)