From 47faab618bf2c714b2beb70c718a8f11acb15071 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Mon, 14 Oct 2024 13:51:41 -0700 Subject: [PATCH] Add more flexibility for internal benchmark monitoring systems PiperOrigin-RevId: 685823731 --- test/core/call/BUILD | 4 ++-- test/core/client_channel/BUILD | 6 +++--- test/core/experiments/BUILD | 4 ++-- test/core/filters/BUILD | 4 ++-- test/core/load_balancing/BUILD | 6 +++--- test/core/promise/BUILD | 4 ++-- test/core/transport/BUILD | 6 +++--- test/core/transport/benchmarks/BUILD | 6 +++--- test/cpp/microbenchmarks/BUILD | 18 +++++++++--------- .../microbenchmarks/grpc_benchmark_config.bzl | 2 ++ 10 files changed, 31 insertions(+), 29 deletions(-) diff --git a/test/core/call/BUILD b/test/core/call/BUILD index 6f93626ada3..33eac811f23 100644 --- a/test/core/call/BUILD +++ b/test/core/call/BUILD @@ -14,7 +14,7 @@ load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_package") load("//test/core/call/yodel:grpc_yodel_test.bzl", "grpc_yodel_simple_test") -load("//test/cpp/microbenchmarks:grpc_benchmark_config.bzl", "grpc_cc_benchmark") +load("//test/cpp/microbenchmarks:grpc_benchmark_config.bzl", "HISTORY", "grpc_cc_benchmark") grpc_package(name = "test/core/call") @@ -82,7 +82,7 @@ grpc_cc_library( grpc_cc_benchmark( name = "bm_client_call", srcs = ["bm_client_call.cc"], - monitoring = True, + monitoring = HISTORY, deps = [ "//:grpc", "//src/core:default_event_engine", diff --git a/test/core/client_channel/BUILD b/test/core/client_channel/BUILD index 18a6137dddc..262fdb847b1 100644 --- a/test/core/client_channel/BUILD +++ b/test/core/client_channel/BUILD @@ -14,7 +14,7 @@ load("//bazel:grpc_build_system.bzl", "grpc_cc_test", "grpc_package") load("//test/core/call/yodel:grpc_yodel_test.bzl", "grpc_yodel_simple_test") -load("//test/cpp/microbenchmarks:grpc_benchmark_config.bzl", "grpc_cc_benchmark") +load("//test/cpp/microbenchmarks:grpc_benchmark_config.bzl", "HISTORY", "grpc_cc_benchmark") grpc_package(name = "test/core/client_channel") @@ -121,7 +121,7 @@ grpc_cc_test( grpc_cc_benchmark( name = "bm_client_channel", srcs = ["bm_client_channel.cc"], - monitoring = True, + monitoring = HISTORY, deps = [ "//:grpc", "//src/core:default_event_engine", @@ -132,7 +132,7 @@ grpc_cc_benchmark( grpc_cc_benchmark( name = "bm_load_balanced_call_destination", srcs = ["bm_load_balanced_call_destination.cc"], - monitoring = True, + monitoring = HISTORY, deps = [ "//:grpc", "//src/core:default_event_engine", diff --git a/test/core/experiments/BUILD b/test/core/experiments/BUILD index 330b980e64f..411001f60a0 100644 --- a/test/core/experiments/BUILD +++ b/test/core/experiments/BUILD @@ -13,7 +13,7 @@ # limitations under the License. load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_package") -load("//test/cpp/microbenchmarks:grpc_benchmark_config.bzl", "grpc_cc_benchmark") +load("//test/cpp/microbenchmarks:grpc_benchmark_config.bzl", "HISTORY", "grpc_cc_benchmark") grpc_package(name = "test/core/experiments") @@ -35,7 +35,7 @@ grpc_cc_library( grpc_cc_benchmark( name = "bm_experiments", srcs = ["bm_experiments.cc"], - monitoring = True, + monitoring = HISTORY, deps = [ "//src/core:experiments", "//test/core/test_util:grpc_test_util", diff --git a/test/core/filters/BUILD b/test/core/filters/BUILD index 299a6705cba..0e3e362be95 100644 --- a/test/core/filters/BUILD +++ b/test/core/filters/BUILD @@ -13,7 +13,7 @@ # limitations under the License. load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_package") -load("//test/cpp/microbenchmarks:grpc_benchmark_config.bzl", "grpc_cc_benchmark") +load("//test/cpp/microbenchmarks:grpc_benchmark_config.bzl", "HISTORY", "grpc_cc_benchmark") licenses(["notice"]) @@ -144,7 +144,7 @@ grpc_cc_test( grpc_cc_benchmark( name = "bm_http_client_filter", srcs = ["bm_http_client_filter.cc"], - monitoring = True, + monitoring = HISTORY, deps = [ "//:grpc", "//src/core:default_event_engine", diff --git a/test/core/load_balancing/BUILD b/test/core/load_balancing/BUILD index e4ca4f48938..022d2ca0769 100644 --- a/test/core/load_balancing/BUILD +++ b/test/core/load_balancing/BUILD @@ -18,7 +18,7 @@ load( "grpc_cc_test", "grpc_package", ) -load("//test/cpp/microbenchmarks:grpc_benchmark_config.bzl", "grpc_cc_benchmark") +load("//test/cpp/microbenchmarks:grpc_benchmark_config.bzl", "HISTORY", "grpc_cc_benchmark") grpc_package(name = "test/core/load_balancing") @@ -203,7 +203,7 @@ grpc_cc_benchmark( "absl/algorithm:container", "absl/log:check", ], - monitoring = True, + monitoring = HISTORY, uses_event_engine = False, deps = [ "//src/core:no_destruct", @@ -274,7 +274,7 @@ grpc_cc_benchmark( external_deps = [ "absl/strings", ], - monitoring = True, + monitoring = HISTORY, deps = [ "//:config", "//:grpc", diff --git a/test/core/promise/BUILD b/test/core/promise/BUILD index 89c617ca622..1d919291be5 100644 --- a/test/core/promise/BUILD +++ b/test/core/promise/BUILD @@ -14,7 +14,7 @@ load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_package") load("//test/core/test_util:grpc_fuzzer.bzl", "grpc_proto_fuzzer") -load("//test/cpp/microbenchmarks:grpc_benchmark_config.bzl", "grpc_cc_benchmark") +load("//test/cpp/microbenchmarks:grpc_benchmark_config.bzl", "HISTORY", "grpc_cc_benchmark") licenses(["notice"]) @@ -690,7 +690,7 @@ grpc_cc_test( grpc_cc_benchmark( name = "bm_party", srcs = ["bm_party.cc"], - monitoring = True, + monitoring = HISTORY, deps = [ "//:grpc", "//src/core:1999", diff --git a/test/core/transport/BUILD b/test/core/transport/BUILD index 4105be3038c..104c7e3f180 100644 --- a/test/core/transport/BUILD +++ b/test/core/transport/BUILD @@ -14,7 +14,7 @@ load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_package") load("//test/core/call/yodel:grpc_yodel_test.bzl", "grpc_yodel_simple_test") -load("//test/cpp/microbenchmarks:grpc_benchmark_config.bzl", "grpc_cc_benchmark") +load("//test/cpp/microbenchmarks:grpc_benchmark_config.bzl", "HISTORY", "grpc_cc_benchmark") licenses(["notice"]) @@ -244,7 +244,7 @@ grpc_cc_library( grpc_cc_benchmark( name = "bm_call_spine", srcs = ["bm_call_spine.cc"], - monitoring = True, + monitoring = HISTORY, deps = [ ":call_spine_benchmarks", "//:grpc", @@ -255,7 +255,7 @@ grpc_cc_benchmark( grpc_cc_benchmark( name = "bm_metadata", srcs = ["bm_metadata.cc"], - monitoring = True, + monitoring = HISTORY, deps = [ ":call_spine_benchmarks", "//:grpc", diff --git a/test/core/transport/benchmarks/BUILD b/test/core/transport/benchmarks/BUILD index bbc871e1976..e70f2ad77da 100644 --- a/test/core/transport/benchmarks/BUILD +++ b/test/core/transport/benchmarks/BUILD @@ -13,7 +13,7 @@ # limitations under the License. load("//bazel:grpc_build_system.bzl", "grpc_package") -load("//test/cpp/microbenchmarks:grpc_benchmark_config.bzl", "grpc_cc_benchmark") +load("//test/cpp/microbenchmarks:grpc_benchmark_config.bzl", "HISTORY", "grpc_cc_benchmark") licenses(["notice"]) @@ -24,7 +24,7 @@ grpc_package( grpc_cc_benchmark( name = "bm_chaotic_good", srcs = ["bm_chaotic_good.cc"], - monitoring = True, + monitoring = HISTORY, deps = [ "//:grpc", "//src/core:chaotic_good_client_transport", @@ -38,7 +38,7 @@ grpc_cc_benchmark( grpc_cc_benchmark( name = "bm_inproc", srcs = ["bm_inproc.cc"], - monitoring = True, + monitoring = HISTORY, deps = [ "//:grpc", "//src/core:chaotic_good_client_transport", diff --git a/test/cpp/microbenchmarks/BUILD b/test/cpp/microbenchmarks/BUILD index 77a8ab6bd4c..5b5fa912e58 100644 --- a/test/cpp/microbenchmarks/BUILD +++ b/test/cpp/microbenchmarks/BUILD @@ -13,7 +13,7 @@ # limitations under the License. load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_package") -load("//test/cpp/microbenchmarks:grpc_benchmark_config.bzl", "grpc_cc_benchmark") +load("//test/cpp/microbenchmarks:grpc_benchmark_config.bzl", "HISTORY", "grpc_cc_benchmark") licenses(["notice"]) @@ -31,7 +31,7 @@ grpc_cc_benchmark( external_deps = [ "absl/container:btree", ], - monitoring = True, + monitoring = HISTORY, deps = [ "//:grpc++", "//src/core:channel_args", @@ -45,7 +45,7 @@ grpc_cc_benchmark( external_deps = [ "absl/container:btree", ], - monitoring = True, + monitoring = HISTORY, deps = [ "//:grpc++", "//src/core:channel_args", @@ -79,7 +79,7 @@ grpc_cc_benchmark( external_deps = [ "absl/log:check", ], - monitoring = True, + monitoring = HISTORY, uses_event_engine = False, deps = [ ":helpers", @@ -135,7 +135,7 @@ grpc_cc_library( grpc_cc_benchmark( name = "bm_closure", srcs = ["bm_closure.cc"], - monitoring = True, + monitoring = HISTORY, deps = [ ":helpers", "//src/core:closure", @@ -159,7 +159,7 @@ grpc_cc_benchmark( grpc_cc_benchmark( name = "bm_alarm", srcs = ["bm_alarm.cc"], - monitoring = True, + monitoring = HISTORY, deps = [":helpers"], ) @@ -190,7 +190,7 @@ grpc_cc_benchmark( grpc_cc_benchmark( name = "bm_channel", srcs = ["bm_channel.cc"], - monitoring = True, + monitoring = HISTORY, tags = [ "no_mac", "no_windows", @@ -205,7 +205,7 @@ grpc_cc_benchmark( external_deps = [ "absl/log:check", ], - monitoring = True, + monitoring = HISTORY, deps = [":helpers"], ) @@ -409,7 +409,7 @@ grpc_cc_benchmark( "absl/strings", "otel/sdk/src/metrics", ], - monitoring = True, + monitoring = HISTORY, deps = [ ":helpers", "//src/core:metrics", diff --git a/test/cpp/microbenchmarks/grpc_benchmark_config.bzl b/test/cpp/microbenchmarks/grpc_benchmark_config.bzl index 7c9459ce4e4..61ac5b84158 100644 --- a/test/cpp/microbenchmarks/grpc_benchmark_config.bzl +++ b/test/cpp/microbenchmarks/grpc_benchmark_config.bzl @@ -15,6 +15,8 @@ load("//bazel:grpc_build_system.bzl", "grpc_cc_test") +HISTORY = 1 + def grpc_benchmark_args(): """Command line arguments for running a microbenchmark as a test""" return ["--benchmark_min_time=0.001s"]