Adaptive Load main loop

api/adaptive_load/adaptive_load.proto

@@ -33,11 +33,17 @@ message AdaptiveLoadSessionSpec {
   // A proto describing Nighthawk Service traffic. See
   // https://github.com/envoyproxy/nighthawk/blob/master/api/client/options.proto
   //
-  // The adaptive load controller will return an error if the |duration| or
-  // |open_loop| fields are set within |nighthawk_traffic_options|. The
-  // controller will also be configured to overwrite at least one of the
-  // numerical fields during the search, such as requests_per_second, so any
-  // value of those fields specified here will be ignored.
+  // The adaptive load controller will return an error if the |duration| field is set within
+  // |nighthawk_traffic_options|.
+  //
+  // If |open_loop| is unset, it will be overridden to true by the adaptive load controller. This is
+  // to support the typical case where the controller needs full control over attempted requests per
+  // second, which could conflict with the backpressure mechanism of closed-loop mode. Note that in
+  // standalone Nighthawk clients, closed-loop mode is the default so |open_loop| defaults to false.
+  //
+  // The controller will override at least one field in this proto to vary the load, such as the
+  // requests_per_second field or headers. Any existing value for such a field in the template will
+  // be ignored.
   //
   // All other fields in |nighthawk_traffic_options| are passed through to the
   // Nighthawk Service.
@@ -65,10 +71,6 @@ message AdaptiveLoadSessionSpec {
 // Complete description of an adaptive load session, including metric scores
 // for every degree of load attempted during the adjusting stage.
 message AdaptiveLoadSessionOutput {
-  // Overall status of the session with error detail. INVALID_ARGUMENT if the input spec contained
-  // errors, DEADLINE_EXCEEDED if convergence did not occur before the deadline, ABORTED if the step
-  // controller determined it can never converge.
-  google.rpc.Status session_status = 1;
   // Results of each short benchmark performed during the adjusting stage.
   repeated BenchmarkResult adjusting_stage_results = 2;
   // Result of the single benchmark of the testing stage.

api/adaptive_load/benchmark_result.proto

@@ -30,9 +30,6 @@ message BenchmarkResult {
   // Raw Nighthawk Service output. Includes start/end times and full Nighthawk
   // Service input spec.
   nighthawk.client.Output nighthawk_service_output = 1;
-  // Execution status of this call to the Nighthawk Service. This will record errors connecting to
-  // the Nighthawk Service and internal errors returned from the Nighthawk Service.
-  google.rpc.Status status = 2;
   // Status of all declared metrics during this benchmark session. Not present
   // in the event of Nighthawk Service errors.
   repeated MetricEvaluation metric_evaluations = 3;

api/client/BUILD

@@ -23,6 +23,7 @@ cc_grpc_library(
     srcs = [
         ":base",
     ],
+    generate_mocks = True,
     grpc_only = True,
     proto_only = False,
     use_external = False,

include/nighthawk/adaptive_load/BUILD

@@ -21,6 +21,7 @@ envoy_basic_cc_library(
         "@envoy//include/envoy/common:base_includes",
         "@envoy//include/envoy/common:time_interface",
         "@envoy//include/envoy/config:typed_config_interface",
+        "@envoy//source/common/common:statusor_lib_with_external_headers",
     ],
 )
 

include/nighthawk/adaptive_load/adaptive_load_controller.h

@@ -2,6 +2,8 @@
 
 #include "envoy/common/time.h"
 
+#include "external/envoy/source/common/common/statusor.h"
+
 #include "api/adaptive_load/adaptive_load.pb.h"
 #include "api/client/service.grpc.pb.h"
 
@@ -23,11 +25,10 @@ namespace Nighthawk {
  * Envoy-based process, there may be an existing TimeSource or TimeSystem to use. If calling
  * from a test, pass a fake TimeSource.
  *
- * @return AdaptiveLoadSessionOutput a proto logging the result of all traffic attempted and all
- * corresponding metric values and scores. Any errors that occur will be recorded in the
- * |session_status| field.
+ * @return StatusOr<AdaptiveLoadSessionOutput> A proto logging the result of all traffic attempted
+ * and all corresponding metric values and scores, or an overall error status if the session failed.
  */
-nighthawk::adaptive_load::AdaptiveLoadSessionOutput PerformAdaptiveLoadSession(
+absl::StatusOr<nighthawk::adaptive_load::AdaptiveLoadSessionOutput> PerformAdaptiveLoadSession(
     nighthawk::client::NighthawkService::StubInterface* nighthawk_service_stub,
     const nighthawk::adaptive_load::AdaptiveLoadSessionSpec& spec, Envoy::TimeSource& time_source);
 

source/adaptive_load/BUILD

@@ -8,6 +8,40 @@ licenses(["notice"])  # Apache 2
 
 envoy_package()
 
+envoy_cc_library(
+    name = "adaptive_load",
+    repository = "@envoy",
+    visibility = ["//visibility:public"],
+    deps = [
+        ":adaptive_load_controller_impl",
+        ":input_variable_setter_impl",
+        ":metrics_plugin_impl",
+        ":scoring_function_impl",
+        ":step_controller_impl",
+    ],
+)
+
+envoy_cc_library(
+    name = "adaptive_load_controller_impl",
+    srcs = [
+        "adaptive_load_controller_impl.cc",
+    ],
+    repository = "@envoy",
+    visibility = ["//visibility:public"],
+    deps = [
+        ":metrics_plugin_impl",
+        ":plugin_loader",
+        "//api/adaptive_load:adaptive_load_proto_cc_proto",
+        "//api/client:base_cc_proto",
+        "//api/client:grpc_service_lib",
+        "//include/nighthawk/adaptive_load:adaptive_load_controller",
+        "//include/nighthawk/adaptive_load:scoring_function",
+        "//include/nighthawk/adaptive_load:step_controller",
+        "@envoy//source/common/common:minimal_logger_lib_with_external_headers",
+        "@envoy//source/common/event:real_time_system_lib_with_external_headers",
+    ],
+)
+
 envoy_cc_library(
     name = "config_validator_impl",
     srcs = [