diff --git a/.github/workflows/pr-auto-fix.yaml b/.github/workflows/pr-auto-fix.yaml
index 13511d3c86c..7566c2776aa 100644
--- a/.github/workflows/pr-auto-fix.yaml
+++ b/.github/workflows/pr-auto-fix.yaml
@@ -29,7 +29,7 @@ jobs:
path: ~/.cache/bazel
# formattedTime here is like 2021323 - the year concatenated with the week then
# the day of that week.
- # As this changes every day, we cycle to a new cache once per day, with lookup
+ # As this changes every day, we cycle to a new cache once per day, with lookup
# across the week (and then the year).
key: ${{ runner.os }}-${{ steps.current-time-with-day.outputs.formattedTime }}
restore-keys: |
@@ -48,13 +48,13 @@ jobs:
with:
script: |
// If you'd like not to run this code on your commits, add your github user id here:
- NO_AUTOFIX_USERS = ["copybara-service[bot]"]
- const { owner, repo } = context.repo
+ const NO_AUTOFIX_USERS = ["copybara-service[bot]"];
+ const { owner, repo } = context.repo;
console.log("Actor: " + context.actor);
if (NO_AUTOFIX_USERS.includes(context.actor)) {
console.log('Cancelling');
const run_id = "${{ github.run_id }}";
- await github.actions.cancelWorkflowRun({ owner, repo, run_id });
+ await github.rest.actions.cancelWorkflowRun({ owner, repo, run_id });
return 'go';
} else {
return 'stay';
diff --git a/BUILD b/BUILD
index aa1a4e5333e..3b207877927 100644
--- a/BUILD
+++ b/BUILD
@@ -1868,10 +1868,10 @@ grpc_cc_library(
grpc_cc_library(
name = "server",
srcs = [
- "//src/core:lib/surface/server.cc",
+ "//src/core:server/server.cc",
],
hdrs = [
- "//src/core:lib/surface/server.h",
+ "//src/core:server/server.h",
],
external_deps = [
"absl/base:core_headers",
@@ -2270,6 +2270,7 @@ grpc_cc_library(
external_deps = [
"absl/base:core_headers",
"absl/container:inlined_vector",
+ "absl/log:check",
"absl/status",
"absl/status:statusor",
"absl/strings",
@@ -2995,7 +2996,6 @@ grpc_cc_library(
deps = [
"gpr_platform",
"//src/core:env",
- "//src/core:gpr_log_internal",
],
)
@@ -3112,6 +3112,7 @@ grpc_cc_library(
external_deps = [
"absl/base:core_headers",
"absl/container:inlined_vector",
+ "absl/log:check",
"absl/status",
"absl/strings:str_format",
],
@@ -3961,6 +3962,7 @@ grpc_cc_library(
"//src/core:lib/security/credentials/jwt/jwt_verifier.h",
],
external_deps = [
+ "absl/log:check",
"absl/status",
"absl/status:statusor",
"absl/strings",
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8cf1a5066e8..83a0769f131 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1540,6 +1540,7 @@ if(gRPC_BUILD_TESTS)
add_dependencies(buildtests_cxx xds_audit_logger_registry_test)
add_dependencies(buildtests_cxx xds_bootstrap_test)
add_dependencies(buildtests_cxx xds_certificate_provider_test)
+ add_dependencies(buildtests_cxx xds_channel_stack_modifier_test)
add_dependencies(buildtests_cxx xds_client_test)
if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
add_dependencies(buildtests_cxx xds_cluster_end2end_test)
@@ -1857,7 +1858,6 @@ add_library(grpc
src/core/ext/filters/message_size/message_size_filter.cc
src/core/ext/filters/rbac/rbac_filter.cc
src/core/ext/filters/rbac/rbac_service_config_parser.cc
- src/core/ext/filters/server_config_selector/server_config_selector_filter.cc
src/core/ext/filters/stateful_session/stateful_session_filter.cc
src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc
src/core/ext/gcp/metadata_query.cc
@@ -2220,7 +2220,6 @@ add_library(grpc
src/core/ext/xds/xds_bootstrap.cc
src/core/ext/xds/xds_bootstrap_grpc.cc
src/core/ext/xds/xds_certificate_provider.cc
- src/core/ext/xds/xds_channel_stack_modifier.cc
src/core/ext/xds/xds_client.cc
src/core/ext/xds/xds_client_grpc.cc
src/core/ext/xds/xds_client_stats.cc
@@ -2237,7 +2236,6 @@ add_library(grpc
src/core/ext/xds/xds_listener.cc
src/core/ext/xds/xds_route_config.cc
src/core/ext/xds/xds_routing.cc
- src/core/ext/xds/xds_server_config_fetcher.cc
src/core/ext/xds/xds_transport_grpc.cc
src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc
src/core/handshaker/handshaker.cc
@@ -2263,7 +2261,6 @@ add_library(grpc
src/core/lib/channel/connected_channel.cc
src/core/lib/channel/metrics.cc
src/core/lib/channel/promise_based_filter.cc
- src/core/lib/channel/server_call_tracer_filter.cc
src/core/lib/channel/status_util.cc
src/core/lib/compression/compression.cc
src/core/lib/compression/compression_internal.cc
@@ -2517,7 +2514,6 @@ add_library(grpc
src/core/lib/surface/lame_client.cc
src/core/lib/surface/legacy_channel.cc
src/core/lib/surface/metadata_array.cc
- src/core/lib/surface/server.cc
src/core/lib/surface/validate_metadata.cc
src/core/lib/surface/version.cc
src/core/lib/surface/wait_for_cq_end_op.cc
@@ -2589,6 +2585,11 @@ add_library(grpc
src/core/resolver/xds/xds_dependency_manager.cc
src/core/resolver/xds/xds_resolver.cc
src/core/resolver/xds/xds_resolver_trace.cc
+ src/core/server/server.cc
+ src/core/server/server_call_tracer_filter.cc
+ src/core/server/server_config_selector_filter.cc
+ src/core/server/xds_channel_stack_modifier.cc
+ src/core/server/xds_server_config_fetcher.cc
src/core/service_config/service_config_channel_arg_filter.cc
src/core/service_config/service_config_impl.cc
src/core/service_config/service_config_parser.cc
@@ -3027,7 +3028,6 @@ add_library(grpc_unsecure
src/core/lib/channel/connected_channel.cc
src/core/lib/channel/metrics.cc
src/core/lib/channel/promise_based_filter.cc
- src/core/lib/channel/server_call_tracer_filter.cc
src/core/lib/channel/status_util.cc
src/core/lib/compression/compression.cc
src/core/lib/compression/compression_internal.cc
@@ -3242,7 +3242,6 @@ add_library(grpc_unsecure
src/core/lib/surface/lame_client.cc
src/core/lib/surface/legacy_channel.cc
src/core/lib/surface/metadata_array.cc
- src/core/lib/surface/server.cc
src/core/lib/surface/validate_metadata.cc
src/core/lib/surface/version.cc
src/core/lib/surface/wait_for_cq_end_op.cc
@@ -3304,6 +3303,8 @@ add_library(grpc_unsecure
src/core/resolver/resolver.cc
src/core/resolver/resolver_registry.cc
src/core/resolver/sockaddr/sockaddr_resolver.cc
+ src/core/server/server.cc
+ src/core/server/server_call_tracer_filter.cc
src/core/service_config/service_config_channel_arg_filter.cc
src/core/service_config/service_config_impl.cc
src/core/service_config/service_config_parser.cc
@@ -27040,7 +27041,7 @@ endif()
if(gRPC_BUILD_TESTS)
add_executable(server_config_selector_test
- test/core/server_config_selector/server_config_selector_test.cc
+ test/core/server/server_config_selector_test.cc
)
if(WIN32 AND MSVC)
if(BUILD_SHARED_LIBS)
@@ -33190,6 +33191,105 @@ target_link_libraries(xds_certificate_provider_test
)
+endif()
+if(gRPC_BUILD_TESTS)
+
+add_executable(xds_channel_stack_modifier_test
+ src/core/ext/filters/logging/logging_filter.cc
+ src/cpp/client/call_credentials.cc
+ src/cpp/client/channel_cc.cc
+ src/cpp/client/channel_credentials.cc
+ src/cpp/client/client_callback.cc
+ src/cpp/client/client_context.cc
+ src/cpp/client/client_interceptor.cc
+ src/cpp/client/client_stats_interceptor.cc
+ src/cpp/client/create_channel.cc
+ src/cpp/client/create_channel_internal.cc
+ src/cpp/client/create_channel_posix.cc
+ src/cpp/client/insecure_credentials.cc
+ src/cpp/client/secure_credentials.cc
+ src/cpp/common/alarm.cc
+ src/cpp/common/auth_property_iterator.cc
+ src/cpp/common/channel_arguments.cc
+ src/cpp/common/completion_queue_cc.cc
+ src/cpp/common/resource_quota_cc.cc
+ src/cpp/common/rpc_method.cc
+ src/cpp/common/secure_auth_context.cc
+ src/cpp/common/secure_create_auth_context.cc
+ src/cpp/common/tls_certificate_provider.cc
+ src/cpp/common/tls_certificate_verifier.cc
+ src/cpp/common/tls_credentials_options.cc
+ src/cpp/common/validate_service_config.cc
+ src/cpp/common/version_cc.cc
+ src/cpp/ext/filters/census/client_filter.cc
+ src/cpp/ext/filters/census/context.cc
+ src/cpp/ext/filters/census/grpc_plugin.cc
+ src/cpp/ext/filters/census/measures.cc
+ src/cpp/ext/filters/census/rpc_encoding.cc
+ src/cpp/ext/filters/census/server_call_tracer.cc
+ src/cpp/ext/filters/census/views.cc
+ src/cpp/server/async_generic_service.cc
+ src/cpp/server/backend_metric_recorder.cc
+ src/cpp/server/channel_argument_option.cc
+ src/cpp/server/create_default_thread_pool.cc
+ src/cpp/server/external_connection_acceptor_impl.cc
+ src/cpp/server/health/default_health_check_service.cc
+ src/cpp/server/health/health_check_service.cc
+ src/cpp/server/health/health_check_service_server_builder_option.cc
+ src/cpp/server/insecure_server_credentials.cc
+ src/cpp/server/secure_server_credentials.cc
+ src/cpp/server/server_builder.cc
+ src/cpp/server/server_callback.cc
+ src/cpp/server/server_cc.cc
+ src/cpp/server/server_context.cc
+ src/cpp/server/server_credentials.cc
+ src/cpp/server/server_posix.cc
+ src/cpp/thread_manager/thread_manager.cc
+ src/cpp/util/byte_buffer_cc.cc
+ src/cpp/util/status.cc
+ src/cpp/util/string_ref.cc
+ src/cpp/util/time_cc.cc
+ test/core/server/xds_channel_stack_modifier_test.cc
+)
+if(WIN32 AND MSVC)
+ if(BUILD_SHARED_LIBS)
+ target_compile_definitions(xds_channel_stack_modifier_test
+ PRIVATE
+ "GPR_DLL_IMPORTS"
+ "GRPC_DLL_IMPORTS"
+ )
+ endif()
+endif()
+target_compile_features(xds_channel_stack_modifier_test PUBLIC cxx_std_14)
+target_include_directories(xds_channel_stack_modifier_test
+ PRIVATE
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/include
+ ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
+ ${_gRPC_RE2_INCLUDE_DIR}
+ ${_gRPC_SSL_INCLUDE_DIR}
+ ${_gRPC_UPB_GENERATED_DIR}
+ ${_gRPC_UPB_GRPC_GENERATED_DIR}
+ ${_gRPC_UPB_INCLUDE_DIR}
+ ${_gRPC_XXHASH_INCLUDE_DIR}
+ ${_gRPC_ZLIB_INCLUDE_DIR}
+ third_party/googletest/googletest/include
+ third_party/googletest/googletest
+ third_party/googletest/googlemock/include
+ third_party/googletest/googlemock
+ ${_gRPC_PROTO_GENS_DIR}
+)
+
+target_link_libraries(xds_channel_stack_modifier_test
+ ${_gRPC_ALLTARGETS_LIBRARIES}
+ gtest
+ absl::endian
+ absl::int128
+ ${_gRPC_PROTOBUF_LIBRARIES}
+ grpc_test_util
+)
+
+
endif()
if(gRPC_BUILD_TESTS)
diff --git a/Makefile b/Makefile
index c397bcad2cd..26446a07d48 100644
--- a/Makefile
+++ b/Makefile
@@ -699,7 +699,6 @@ LIBGRPC_SRC = \
src/core/ext/filters/message_size/message_size_filter.cc \
src/core/ext/filters/rbac/rbac_filter.cc \
src/core/ext/filters/rbac/rbac_service_config_parser.cc \
- src/core/ext/filters/server_config_selector/server_config_selector_filter.cc \
src/core/ext/filters/stateful_session/stateful_session_filter.cc \
src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc \
src/core/ext/gcp/metadata_query.cc \
@@ -1062,7 +1061,6 @@ LIBGRPC_SRC = \
src/core/ext/xds/xds_bootstrap.cc \
src/core/ext/xds/xds_bootstrap_grpc.cc \
src/core/ext/xds/xds_certificate_provider.cc \
- src/core/ext/xds/xds_channel_stack_modifier.cc \
src/core/ext/xds/xds_client.cc \
src/core/ext/xds/xds_client_grpc.cc \
src/core/ext/xds/xds_client_stats.cc \
@@ -1079,7 +1077,6 @@ LIBGRPC_SRC = \
src/core/ext/xds/xds_listener.cc \
src/core/ext/xds/xds_route_config.cc \
src/core/ext/xds/xds_routing.cc \
- src/core/ext/xds/xds_server_config_fetcher.cc \
src/core/ext/xds/xds_transport_grpc.cc \
src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc \
src/core/handshaker/handshaker.cc \
@@ -1105,7 +1102,6 @@ LIBGRPC_SRC = \
src/core/lib/channel/connected_channel.cc \
src/core/lib/channel/metrics.cc \
src/core/lib/channel/promise_based_filter.cc \
- src/core/lib/channel/server_call_tracer_filter.cc \
src/core/lib/channel/status_util.cc \
src/core/lib/compression/compression.cc \
src/core/lib/compression/compression_internal.cc \
@@ -1404,7 +1400,6 @@ LIBGRPC_SRC = \
src/core/lib/surface/lame_client.cc \
src/core/lib/surface/legacy_channel.cc \
src/core/lib/surface/metadata_array.cc \
- src/core/lib/surface/server.cc \
src/core/lib/surface/validate_metadata.cc \
src/core/lib/surface/version.cc \
src/core/lib/surface/wait_for_cq_end_op.cc \
@@ -1476,6 +1471,11 @@ LIBGRPC_SRC = \
src/core/resolver/xds/xds_dependency_manager.cc \
src/core/resolver/xds/xds_resolver.cc \
src/core/resolver/xds/xds_resolver_trace.cc \
+ src/core/server/server.cc \
+ src/core/server/server_call_tracer_filter.cc \
+ src/core/server/server_config_selector_filter.cc \
+ src/core/server/xds_channel_stack_modifier.cc \
+ src/core/server/xds_server_config_fetcher.cc \
src/core/service_config/service_config_channel_arg_filter.cc \
src/core/service_config/service_config_impl.cc \
src/core/service_config/service_config_parser.cc \
diff --git a/Package.swift b/Package.swift
index 756f3643856..9afca3494ca 100644
--- a/Package.swift
+++ b/Package.swift
@@ -184,9 +184,6 @@ let package = Package(
"src/core/ext/filters/rbac/rbac_filter.h",
"src/core/ext/filters/rbac/rbac_service_config_parser.cc",
"src/core/ext/filters/rbac/rbac_service_config_parser.h",
- "src/core/ext/filters/server_config_selector/server_config_selector.h",
- "src/core/ext/filters/server_config_selector/server_config_selector_filter.cc",
- "src/core/ext/filters/server_config_selector/server_config_selector_filter.h",
"src/core/ext/filters/stateful_session/stateful_session_filter.cc",
"src/core/ext/filters/stateful_session/stateful_session_filter.h",
"src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc",
@@ -1078,8 +1075,6 @@ let package = Package(
"src/core/ext/xds/xds_certificate_provider.cc",
"src/core/ext/xds/xds_certificate_provider.h",
"src/core/ext/xds/xds_channel_args.h",
- "src/core/ext/xds/xds_channel_stack_modifier.cc",
- "src/core/ext/xds/xds_channel_stack_modifier.h",
"src/core/ext/xds/xds_client.cc",
"src/core/ext/xds/xds_client.h",
"src/core/ext/xds/xds_client_grpc.cc",
@@ -1115,7 +1110,6 @@ let package = Package(
"src/core/ext/xds/xds_route_config.h",
"src/core/ext/xds/xds_routing.cc",
"src/core/ext/xds/xds_routing.h",
- "src/core/ext/xds/xds_server_config_fetcher.cc",
"src/core/ext/xds/xds_transport.h",
"src/core/ext/xds/xds_transport_grpc.cc",
"src/core/ext/xds/xds_transport_grpc.h",
@@ -1173,8 +1167,6 @@ let package = Package(
"src/core/lib/channel/metrics.h",
"src/core/lib/channel/promise_based_filter.cc",
"src/core/lib/channel/promise_based_filter.h",
- "src/core/lib/channel/server_call_tracer_filter.cc",
- "src/core/lib/channel/server_call_tracer_filter.h",
"src/core/lib/channel/status_util.cc",
"src/core/lib/channel/status_util.h",
"src/core/lib/channel/tcp_tracer.h",
@@ -1324,7 +1316,6 @@ let package = Package(
"src/core/lib/gpr/linux/cpu.cc",
"src/core/lib/gpr/linux/log.cc",
"src/core/lib/gpr/log.cc",
- "src/core/lib/gpr/log_internal.h",
"src/core/lib/gpr/msys/tmpfile.cc",
"src/core/lib/gpr/posix/cpu.cc",
"src/core/lib/gpr/posix/log.cc",
@@ -1800,9 +1791,6 @@ let package = Package(
"src/core/lib/surface/legacy_channel.cc",
"src/core/lib/surface/legacy_channel.h",
"src/core/lib/surface/metadata_array.cc",
- "src/core/lib/surface/server.cc",
- "src/core/lib/surface/server.h",
- "src/core/lib/surface/server_interface.h",
"src/core/lib/surface/validate_metadata.cc",
"src/core/lib/surface/validate_metadata.h",
"src/core/lib/surface/version.cc",
@@ -1942,6 +1930,17 @@ let package = Package(
"src/core/resolver/xds/xds_resolver_attributes.h",
"src/core/resolver/xds/xds_resolver_trace.cc",
"src/core/resolver/xds/xds_resolver_trace.h",
+ "src/core/server/server.cc",
+ "src/core/server/server.h",
+ "src/core/server/server_call_tracer_filter.cc",
+ "src/core/server/server_call_tracer_filter.h",
+ "src/core/server/server_config_selector.h",
+ "src/core/server/server_config_selector_filter.cc",
+ "src/core/server/server_config_selector_filter.h",
+ "src/core/server/server_interface.h",
+ "src/core/server/xds_channel_stack_modifier.cc",
+ "src/core/server/xds_channel_stack_modifier.h",
+ "src/core/server/xds_server_config_fetcher.cc",
"src/core/service_config/service_config.h",
"src/core/service_config/service_config_call_data.h",
"src/core/service_config/service_config_channel_arg_filter.cc",
diff --git a/bazel/experiments.bzl b/bazel/experiments.bzl
index 679b754b05d..abd1166647f 100644
--- a/bazel/experiments.bzl
+++ b/bazel/experiments.bzl
@@ -60,12 +60,16 @@ EXPERIMENTS = {
},
"off": {
"core_end2end_test": [
+ "event_engine_client",
"promise_based_server_call",
],
"endpoint_test": [
"tcp_frame_size_tuning",
"tcp_rcv_lowat",
],
+ "event_engine_client_test": [
+ "event_engine_client",
+ ],
"flow_control_test": [
"multiping",
"peer_state_based_framing",
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
index 4e50264e937..bd949a4560a 100644
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@@ -56,7 +56,6 @@ libs:
- src/core/lib/config/load_config.h
- src/core/lib/event_engine/thread_local.h
- src/core/lib/gpr/alloc.h
- - src/core/lib/gpr/log_internal.h
- src/core/lib/gpr/string.h
- src/core/lib/gpr/time_precise.h
- src/core/lib/gpr/tmpfile.h
@@ -256,8 +255,6 @@ libs:
- src/core/ext/filters/message_size/message_size_filter.h
- src/core/ext/filters/rbac/rbac_filter.h
- src/core/ext/filters/rbac/rbac_service_config_parser.h
- - src/core/ext/filters/server_config_selector/server_config_selector.h
- - src/core/ext/filters/server_config_selector/server_config_selector_filter.h
- src/core/ext/filters/stateful_session/stateful_session_filter.h
- src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h
- src/core/ext/gcp/metadata_query.h
@@ -787,7 +784,6 @@ libs:
- src/core/ext/xds/xds_bootstrap_grpc.h
- src/core/ext/xds/xds_certificate_provider.h
- src/core/ext/xds/xds_channel_args.h
- - src/core/ext/xds/xds_channel_stack_modifier.h
- src/core/ext/xds/xds_client.h
- src/core/ext/xds/xds_client_grpc.h
- src/core/ext/xds/xds_client_stats.h
@@ -839,7 +835,6 @@ libs:
- src/core/lib/channel/context.h
- src/core/lib/channel/metrics.h
- src/core/lib/channel/promise_based_filter.h
- - src/core/lib/channel/server_call_tracer_filter.h
- src/core/lib/channel/status_util.h
- src/core/lib/channel/tcp_tracer.h
- src/core/lib/compression/compression_internal.h
@@ -1138,8 +1133,6 @@ libs:
- src/core/lib/surface/init_internally.h
- src/core/lib/surface/lame_client.h
- src/core/lib/surface/legacy_channel.h
- - src/core/lib/surface/server.h
- - src/core/lib/surface/server_interface.h
- src/core/lib/surface/validate_metadata.h
- src/core/lib/surface/wait_for_cq_end_op.h
- src/core/lib/transport/batch_builder.h
@@ -1208,6 +1201,12 @@ libs:
- src/core/resolver/xds/xds_dependency_manager.h
- src/core/resolver/xds/xds_resolver_attributes.h
- src/core/resolver/xds/xds_resolver_trace.h
+ - src/core/server/server.h
+ - src/core/server/server_call_tracer_filter.h
+ - src/core/server/server_config_selector.h
+ - src/core/server/server_config_selector_filter.h
+ - src/core/server/server_interface.h
+ - src/core/server/xds_channel_stack_modifier.h
- src/core/service_config/service_config.h
- src/core/service_config/service_config_call_data.h
- src/core/service_config/service_config_impl.h
@@ -1277,7 +1276,6 @@ libs:
- src/core/ext/filters/message_size/message_size_filter.cc
- src/core/ext/filters/rbac/rbac_filter.cc
- src/core/ext/filters/rbac/rbac_service_config_parser.cc
- - src/core/ext/filters/server_config_selector/server_config_selector_filter.cc
- src/core/ext/filters/stateful_session/stateful_session_filter.cc
- src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc
- src/core/ext/gcp/metadata_query.cc
@@ -1640,7 +1638,6 @@ libs:
- src/core/ext/xds/xds_bootstrap.cc
- src/core/ext/xds/xds_bootstrap_grpc.cc
- src/core/ext/xds/xds_certificate_provider.cc
- - src/core/ext/xds/xds_channel_stack_modifier.cc
- src/core/ext/xds/xds_client.cc
- src/core/ext/xds/xds_client_grpc.cc
- src/core/ext/xds/xds_client_stats.cc
@@ -1657,7 +1654,6 @@ libs:
- src/core/ext/xds/xds_listener.cc
- src/core/ext/xds/xds_route_config.cc
- src/core/ext/xds/xds_routing.cc
- - src/core/ext/xds/xds_server_config_fetcher.cc
- src/core/ext/xds/xds_transport_grpc.cc
- src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc
- src/core/handshaker/handshaker.cc
@@ -1683,7 +1679,6 @@ libs:
- src/core/lib/channel/connected_channel.cc
- src/core/lib/channel/metrics.cc
- src/core/lib/channel/promise_based_filter.cc
- - src/core/lib/channel/server_call_tracer_filter.cc
- src/core/lib/channel/status_util.cc
- src/core/lib/compression/compression.cc
- src/core/lib/compression/compression_internal.cc
@@ -1937,7 +1932,6 @@ libs:
- src/core/lib/surface/lame_client.cc
- src/core/lib/surface/legacy_channel.cc
- src/core/lib/surface/metadata_array.cc
- - src/core/lib/surface/server.cc
- src/core/lib/surface/validate_metadata.cc
- src/core/lib/surface/version.cc
- src/core/lib/surface/wait_for_cq_end_op.cc
@@ -2009,6 +2003,11 @@ libs:
- src/core/resolver/xds/xds_dependency_manager.cc
- src/core/resolver/xds/xds_resolver.cc
- src/core/resolver/xds/xds_resolver_trace.cc
+ - src/core/server/server.cc
+ - src/core/server/server_call_tracer_filter.cc
+ - src/core/server/server_config_selector_filter.cc
+ - src/core/server/xds_channel_stack_modifier.cc
+ - src/core/server/xds_server_config_fetcher.cc
- src/core/service_config/service_config_channel_arg_filter.cc
- src/core/service_config/service_config_impl.cc
- src/core/service_config/service_config_parser.cc
@@ -2340,7 +2339,6 @@ libs:
- src/core/lib/channel/context.h
- src/core/lib/channel/metrics.h
- src/core/lib/channel/promise_based_filter.h
- - src/core/lib/channel/server_call_tracer_filter.h
- src/core/lib/channel/status_util.h
- src/core/lib/channel/tcp_tracer.h
- src/core/lib/compression/compression_internal.h
@@ -2603,8 +2601,6 @@ libs:
- src/core/lib/surface/init_internally.h
- src/core/lib/surface/lame_client.h
- src/core/lib/surface/legacy_channel.h
- - src/core/lib/surface/server.h
- - src/core/lib/surface/server_interface.h
- src/core/lib/surface/validate_metadata.h
- src/core/lib/surface/wait_for_cq_end_op.h
- src/core/lib/transport/batch_builder.h
@@ -2667,6 +2663,9 @@ libs:
- src/core/resolver/resolver_factory.h
- src/core/resolver/resolver_registry.h
- src/core/resolver/server_address.h
+ - src/core/server/server.h
+ - src/core/server/server_call_tracer_filter.h
+ - src/core/server/server_interface.h
- src/core/service_config/service_config.h
- src/core/service_config/service_config_call_data.h
- src/core/service_config/service_config_impl.h
@@ -2805,7 +2804,6 @@ libs:
- src/core/lib/channel/connected_channel.cc
- src/core/lib/channel/metrics.cc
- src/core/lib/channel/promise_based_filter.cc
- - src/core/lib/channel/server_call_tracer_filter.cc
- src/core/lib/channel/status_util.cc
- src/core/lib/compression/compression.cc
- src/core/lib/compression/compression_internal.cc
@@ -3020,7 +3018,6 @@ libs:
- src/core/lib/surface/lame_client.cc
- src/core/lib/surface/legacy_channel.cc
- src/core/lib/surface/metadata_array.cc
- - src/core/lib/surface/server.cc
- src/core/lib/surface/validate_metadata.cc
- src/core/lib/surface/version.cc
- src/core/lib/surface/wait_for_cq_end_op.cc
@@ -3082,6 +3079,8 @@ libs:
- src/core/resolver/resolver.cc
- src/core/resolver/resolver_registry.cc
- src/core/resolver/sockaddr/sockaddr_resolver.cc
+ - src/core/server/server.cc
+ - src/core/server/server_call_tracer_filter.cc
- src/core/service_config/service_config_channel_arg_filter.cc
- src/core/service_config/service_config_impl.cc
- src/core/service_config/service_config_parser.cc
@@ -4679,7 +4678,6 @@ libs:
- src/core/lib/surface/init.h
- src/core/lib/surface/init_internally.h
- src/core/lib/surface/lame_client.h
- - src/core/lib/surface/server_interface.h
- src/core/lib/surface/validate_metadata.h
- src/core/lib/surface/wait_for_cq_end_op.h
- src/core/lib/transport/batch_builder.h
@@ -4712,6 +4710,7 @@ libs:
- src/core/resolver/resolver_factory.h
- src/core/resolver/resolver_registry.h
- src/core/resolver/server_address.h
+ - src/core/server/server_interface.h
- src/core/service_config/service_config.h
- src/core/service_config/service_config_call_data.h
- src/core/service_config/service_config_parser.h
@@ -11834,7 +11833,6 @@ targets:
- src/core/lib/surface/init.h
- src/core/lib/surface/init_internally.h
- src/core/lib/surface/lame_client.h
- - src/core/lib/surface/server_interface.h
- src/core/lib/surface/validate_metadata.h
- src/core/lib/surface/wait_for_cq_end_op.h
- src/core/lib/transport/batch_builder.h
@@ -11869,6 +11867,7 @@ targets:
- src/core/resolver/resolver_factory.h
- src/core/resolver/resolver_registry.h
- src/core/resolver/server_address.h
+ - src/core/server/server_interface.h
- src/core/service_config/service_config.h
- src/core/service_config/service_config_call_data.h
- src/core/service_config/service_config_parser.h
@@ -17938,7 +17937,7 @@ targets:
language: c++
headers: []
src:
- - test/core/server_config_selector/server_config_selector_test.cc
+ - test/core/server/server_config_selector_test.cc
deps:
- gtest
- grpc_test_util
@@ -20950,6 +20949,94 @@ targets:
- gtest
- grpc_test_util
uses_polling: false
+- name: xds_channel_stack_modifier_test
+ gtest: true
+ build: test
+ language: c++
+ headers:
+ - src/core/ext/filters/logging/logging_filter.h
+ - src/core/ext/filters/logging/logging_sink.h
+ - src/cpp/client/client_stats_interceptor.h
+ - src/cpp/client/create_channel_internal.h
+ - src/cpp/client/secure_credentials.h
+ - src/cpp/common/secure_auth_context.h
+ - src/cpp/ext/filters/census/client_filter.h
+ - src/cpp/ext/filters/census/context.h
+ - src/cpp/ext/filters/census/grpc_plugin.h
+ - src/cpp/ext/filters/census/measures.h
+ - src/cpp/ext/filters/census/open_census_call_tracer.h
+ - src/cpp/ext/filters/census/rpc_encoding.h
+ - src/cpp/ext/filters/census/server_call_tracer.h
+ - src/cpp/server/backend_metric_recorder.h
+ - src/cpp/server/dynamic_thread_pool.h
+ - src/cpp/server/external_connection_acceptor_impl.h
+ - src/cpp/server/health/default_health_check_service.h
+ - src/cpp/server/secure_server_credentials.h
+ - src/cpp/server/thread_pool_interface.h
+ - src/cpp/thread_manager/thread_manager.h
+ src:
+ - src/core/ext/filters/logging/logging_filter.cc
+ - src/cpp/client/call_credentials.cc
+ - src/cpp/client/channel_cc.cc
+ - src/cpp/client/channel_credentials.cc
+ - src/cpp/client/client_callback.cc
+ - src/cpp/client/client_context.cc
+ - src/cpp/client/client_interceptor.cc
+ - src/cpp/client/client_stats_interceptor.cc
+ - src/cpp/client/create_channel.cc
+ - src/cpp/client/create_channel_internal.cc
+ - src/cpp/client/create_channel_posix.cc
+ - src/cpp/client/insecure_credentials.cc
+ - src/cpp/client/secure_credentials.cc
+ - src/cpp/common/alarm.cc
+ - src/cpp/common/auth_property_iterator.cc
+ - src/cpp/common/channel_arguments.cc
+ - src/cpp/common/completion_queue_cc.cc
+ - src/cpp/common/resource_quota_cc.cc
+ - src/cpp/common/rpc_method.cc
+ - src/cpp/common/secure_auth_context.cc
+ - src/cpp/common/secure_create_auth_context.cc
+ - src/cpp/common/tls_certificate_provider.cc
+ - src/cpp/common/tls_certificate_verifier.cc
+ - src/cpp/common/tls_credentials_options.cc
+ - src/cpp/common/validate_service_config.cc
+ - src/cpp/common/version_cc.cc
+ - src/cpp/ext/filters/census/client_filter.cc
+ - src/cpp/ext/filters/census/context.cc
+ - src/cpp/ext/filters/census/grpc_plugin.cc
+ - src/cpp/ext/filters/census/measures.cc
+ - src/cpp/ext/filters/census/rpc_encoding.cc
+ - src/cpp/ext/filters/census/server_call_tracer.cc
+ - src/cpp/ext/filters/census/views.cc
+ - src/cpp/server/async_generic_service.cc
+ - src/cpp/server/backend_metric_recorder.cc
+ - src/cpp/server/channel_argument_option.cc
+ - src/cpp/server/create_default_thread_pool.cc
+ - src/cpp/server/external_connection_acceptor_impl.cc
+ - src/cpp/server/health/default_health_check_service.cc
+ - src/cpp/server/health/health_check_service.cc
+ - src/cpp/server/health/health_check_service_server_builder_option.cc
+ - src/cpp/server/insecure_server_credentials.cc
+ - src/cpp/server/secure_server_credentials.cc
+ - src/cpp/server/server_builder.cc
+ - src/cpp/server/server_callback.cc
+ - src/cpp/server/server_cc.cc
+ - src/cpp/server/server_context.cc
+ - src/cpp/server/server_credentials.cc
+ - src/cpp/server/server_posix.cc
+ - src/cpp/thread_manager/thread_manager.cc
+ - src/cpp/util/byte_buffer_cc.cc
+ - src/cpp/util/status.cc
+ - src/cpp/util/string_ref.cc
+ - src/cpp/util/time_cc.cc
+ - test/core/server/xds_channel_stack_modifier_test.cc
+ deps:
+ - gtest
+ - absl/base:endian
+ - absl/numeric:int128
+ - protobuf
+ - grpc_test_util
+ uses_polling: false
- name: xds_client_test
gtest: true
build: test
diff --git a/config.m4 b/config.m4
index f2b4c4817e5..125cc7f8c1e 100644
--- a/config.m4
+++ b/config.m4
@@ -74,7 +74,6 @@ if test "$PHP_GRPC" != "no"; then
src/core/ext/filters/message_size/message_size_filter.cc \
src/core/ext/filters/rbac/rbac_filter.cc \
src/core/ext/filters/rbac/rbac_service_config_parser.cc \
- src/core/ext/filters/server_config_selector/server_config_selector_filter.cc \
src/core/ext/filters/stateful_session/stateful_session_filter.cc \
src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc \
src/core/ext/gcp/metadata_query.cc \
@@ -437,7 +436,6 @@ if test "$PHP_GRPC" != "no"; then
src/core/ext/xds/xds_bootstrap.cc \
src/core/ext/xds/xds_bootstrap_grpc.cc \
src/core/ext/xds/xds_certificate_provider.cc \
- src/core/ext/xds/xds_channel_stack_modifier.cc \
src/core/ext/xds/xds_client.cc \
src/core/ext/xds/xds_client_grpc.cc \
src/core/ext/xds/xds_client_stats.cc \
@@ -454,7 +452,6 @@ if test "$PHP_GRPC" != "no"; then
src/core/ext/xds/xds_listener.cc \
src/core/ext/xds/xds_route_config.cc \
src/core/ext/xds/xds_routing.cc \
- src/core/ext/xds/xds_server_config_fetcher.cc \
src/core/ext/xds/xds_transport_grpc.cc \
src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc \
src/core/handshaker/handshaker.cc \
@@ -480,7 +477,6 @@ if test "$PHP_GRPC" != "no"; then
src/core/lib/channel/connected_channel.cc \
src/core/lib/channel/metrics.cc \
src/core/lib/channel/promise_based_filter.cc \
- src/core/lib/channel/server_call_tracer_filter.cc \
src/core/lib/channel/status_util.cc \
src/core/lib/compression/compression.cc \
src/core/lib/compression/compression_internal.cc \
@@ -779,7 +775,6 @@ if test "$PHP_GRPC" != "no"; then
src/core/lib/surface/lame_client.cc \
src/core/lib/surface/legacy_channel.cc \
src/core/lib/surface/metadata_array.cc \
- src/core/lib/surface/server.cc \
src/core/lib/surface/validate_metadata.cc \
src/core/lib/surface/version.cc \
src/core/lib/surface/wait_for_cq_end_op.cc \
@@ -851,6 +846,11 @@ if test "$PHP_GRPC" != "no"; then
src/core/resolver/xds/xds_dependency_manager.cc \
src/core/resolver/xds/xds_resolver.cc \
src/core/resolver/xds/xds_resolver_trace.cc \
+ src/core/server/server.cc \
+ src/core/server/server_call_tracer_filter.cc \
+ src/core/server/server_config_selector_filter.cc \
+ src/core/server/xds_channel_stack_modifier.cc \
+ src/core/server/xds_server_config_fetcher.cc \
src/core/service_config/service_config_channel_arg_filter.cc \
src/core/service_config/service_config_impl.cc \
src/core/service_config/service_config_parser.cc \
@@ -1397,7 +1397,6 @@ if test "$PHP_GRPC" != "no"; then
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/http/server)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/message_size)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/rbac)
- PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/server_config_selector)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/stateful_session)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/gcp)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/chttp2/alpn)
@@ -1598,6 +1597,7 @@ if test "$PHP_GRPC" != "no"; then
PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver/google_c2p)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver/sockaddr)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver/xds)
+ PHP_ADD_BUILD_DIR($ext_builddir/src/core/server)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/service_config)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi/alts/crypt)
diff --git a/config.w32 b/config.w32
index 4643bbfedd6..a0cc2a6ee58 100644
--- a/config.w32
+++ b/config.w32
@@ -39,7 +39,6 @@ if (PHP_GRPC != "no") {
"src\\core\\ext\\filters\\message_size\\message_size_filter.cc " +
"src\\core\\ext\\filters\\rbac\\rbac_filter.cc " +
"src\\core\\ext\\filters\\rbac\\rbac_service_config_parser.cc " +
- "src\\core\\ext\\filters\\server_config_selector\\server_config_selector_filter.cc " +
"src\\core\\ext\\filters\\stateful_session\\stateful_session_filter.cc " +
"src\\core\\ext\\filters\\stateful_session\\stateful_session_service_config_parser.cc " +
"src\\core\\ext\\gcp\\metadata_query.cc " +
@@ -402,7 +401,6 @@ if (PHP_GRPC != "no") {
"src\\core\\ext\\xds\\xds_bootstrap.cc " +
"src\\core\\ext\\xds\\xds_bootstrap_grpc.cc " +
"src\\core\\ext\\xds\\xds_certificate_provider.cc " +
- "src\\core\\ext\\xds\\xds_channel_stack_modifier.cc " +
"src\\core\\ext\\xds\\xds_client.cc " +
"src\\core\\ext\\xds\\xds_client_grpc.cc " +
"src\\core\\ext\\xds\\xds_client_stats.cc " +
@@ -419,7 +417,6 @@ if (PHP_GRPC != "no") {
"src\\core\\ext\\xds\\xds_listener.cc " +
"src\\core\\ext\\xds\\xds_route_config.cc " +
"src\\core\\ext\\xds\\xds_routing.cc " +
- "src\\core\\ext\\xds\\xds_server_config_fetcher.cc " +
"src\\core\\ext\\xds\\xds_transport_grpc.cc " +
"src\\core\\handshaker\\endpoint_info\\endpoint_info_handshaker.cc " +
"src\\core\\handshaker\\handshaker.cc " +
@@ -445,7 +442,6 @@ if (PHP_GRPC != "no") {
"src\\core\\lib\\channel\\connected_channel.cc " +
"src\\core\\lib\\channel\\metrics.cc " +
"src\\core\\lib\\channel\\promise_based_filter.cc " +
- "src\\core\\lib\\channel\\server_call_tracer_filter.cc " +
"src\\core\\lib\\channel\\status_util.cc " +
"src\\core\\lib\\compression\\compression.cc " +
"src\\core\\lib\\compression\\compression_internal.cc " +
@@ -744,7 +740,6 @@ if (PHP_GRPC != "no") {
"src\\core\\lib\\surface\\lame_client.cc " +
"src\\core\\lib\\surface\\legacy_channel.cc " +
"src\\core\\lib\\surface\\metadata_array.cc " +
- "src\\core\\lib\\surface\\server.cc " +
"src\\core\\lib\\surface\\validate_metadata.cc " +
"src\\core\\lib\\surface\\version.cc " +
"src\\core\\lib\\surface\\wait_for_cq_end_op.cc " +
@@ -816,6 +811,11 @@ if (PHP_GRPC != "no") {
"src\\core\\resolver\\xds\\xds_dependency_manager.cc " +
"src\\core\\resolver\\xds\\xds_resolver.cc " +
"src\\core\\resolver\\xds\\xds_resolver_trace.cc " +
+ "src\\core\\server\\server.cc " +
+ "src\\core\\server\\server_call_tracer_filter.cc " +
+ "src\\core\\server\\server_config_selector_filter.cc " +
+ "src\\core\\server\\xds_channel_stack_modifier.cc " +
+ "src\\core\\server\\xds_server_config_fetcher.cc " +
"src\\core\\service_config\\service_config_channel_arg_filter.cc " +
"src\\core\\service_config\\service_config_impl.cc " +
"src\\core\\service_config\\service_config_parser.cc " +
@@ -1391,7 +1391,6 @@ if (PHP_GRPC != "no") {
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\http\\server");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\message_size");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\rbac");
- FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\server_config_selector");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\stateful_session");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\gcp");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\transport");
@@ -1736,6 +1735,7 @@ if (PHP_GRPC != "no") {
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver\\google_c2p");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver\\sockaddr");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver\\xds");
+ FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\server");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\service_config");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi\\alts");
diff --git a/examples/python/helloworld/helloworld_pb2.py b/examples/python/helloworld/helloworld_pb2.py
index 0e202a09116..88f8715f997 100644
--- a/examples/python/helloworld/helloworld_pb2.py
+++ b/examples/python/helloworld/helloworld_pb2.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Generated by the protocol buffer compiler. DO NOT EDIT!
# source: helloworld.proto
-# Protobuf Python Version: 4.25.1
+# Protobuf Python Version: 5.26.1
"""Generated protocol buffer code."""
from google.protobuf import descriptor as _descriptor
from google.protobuf import descriptor_pool as _descriptor_pool
@@ -19,8 +19,8 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x10helloworld.pro
_globals = globals()
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'helloworld_pb2', _globals)
-if _descriptor._USE_C_DESCRIPTORS == False:
- _globals['DESCRIPTOR']._options = None
+if not _descriptor._USE_C_DESCRIPTORS:
+ _globals['DESCRIPTOR']._loaded_options = None
_globals['DESCRIPTOR']._serialized_options = b'\n\033io.grpc.examples.helloworldB\017HelloWorldProtoP\001\242\002\003HLW'
_globals['_HELLOREQUEST']._serialized_start=32
_globals['_HELLOREQUEST']._serialized_end=60
diff --git a/examples/python/helloworld/helloworld_pb2_grpc.py b/examples/python/helloworld/helloworld_pb2_grpc.py
index 48ad1004f9b..a991c8fd3f3 100644
--- a/examples/python/helloworld/helloworld_pb2_grpc.py
+++ b/examples/python/helloworld/helloworld_pb2_grpc.py
@@ -5,7 +5,7 @@ import warnings
import helloworld_pb2 as helloworld__pb2
-GRPC_GENERATED_VERSION = '1.63.0.dev0'
+GRPC_GENERATED_VERSION = '1.64.0.dev0'
GRPC_VERSION = grpc.__version__
EXPECTED_ERROR_RELEASE = '1.65.0'
SCHEDULED_RELEASE_DATE = 'June 25, 2024'
@@ -102,6 +102,7 @@ def add_GreeterServicer_to_server(servicer, server):
generic_handler = grpc.method_handlers_generic_handler(
'helloworld.Greeter', rpc_method_handlers)
server.add_generic_rpc_handlers((generic_handler,))
+ server.add_registered_method_handlers('helloworld.Greeter', rpc_method_handlers)
# This class is part of an EXPERIMENTAL API.
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
index 91edbbe6cb0..57179a085a3 100644
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@@ -295,8 +295,6 @@ Pod::Spec.new do |s|
'src/core/ext/filters/message_size/message_size_filter.h',
'src/core/ext/filters/rbac/rbac_filter.h',
'src/core/ext/filters/rbac/rbac_service_config_parser.h',
- 'src/core/ext/filters/server_config_selector/server_config_selector.h',
- 'src/core/ext/filters/server_config_selector/server_config_selector_filter.h',
'src/core/ext/filters/stateful_session/stateful_session_filter.h',
'src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h',
'src/core/ext/gcp/metadata_query.h',
@@ -864,7 +862,6 @@ Pod::Spec.new do |s|
'src/core/ext/xds/xds_bootstrap_grpc.h',
'src/core/ext/xds/xds_certificate_provider.h',
'src/core/ext/xds/xds_channel_args.h',
- 'src/core/ext/xds/xds_channel_stack_modifier.h',
'src/core/ext/xds/xds_client.h',
'src/core/ext/xds/xds_client_grpc.h',
'src/core/ext/xds/xds_client_stats.h',
@@ -917,7 +914,6 @@ Pod::Spec.new do |s|
'src/core/lib/channel/context.h',
'src/core/lib/channel/metrics.h',
'src/core/lib/channel/promise_based_filter.h',
- 'src/core/lib/channel/server_call_tracer_filter.h',
'src/core/lib/channel/status_util.h',
'src/core/lib/channel/tcp_tracer.h',
'src/core/lib/compression/compression_internal.h',
@@ -997,7 +993,6 @@ Pod::Spec.new do |s|
'src/core/lib/experiments/config.h',
'src/core/lib/experiments/experiments.h',
'src/core/lib/gpr/alloc.h',
- 'src/core/lib/gpr/log_internal.h',
'src/core/lib/gpr/spinlock.h',
'src/core/lib/gpr/string.h',
'src/core/lib/gpr/time_precise.h',
@@ -1241,8 +1236,6 @@ Pod::Spec.new do |s|
'src/core/lib/surface/init_internally.h',
'src/core/lib/surface/lame_client.h',
'src/core/lib/surface/legacy_channel.h',
- 'src/core/lib/surface/server.h',
- 'src/core/lib/surface/server_interface.h',
'src/core/lib/surface/validate_metadata.h',
'src/core/lib/surface/wait_for_cq_end_op.h',
'src/core/lib/transport/batch_builder.h',
@@ -1311,6 +1304,12 @@ Pod::Spec.new do |s|
'src/core/resolver/xds/xds_dependency_manager.h',
'src/core/resolver/xds/xds_resolver_attributes.h',
'src/core/resolver/xds/xds_resolver_trace.h',
+ 'src/core/server/server.h',
+ 'src/core/server/server_call_tracer_filter.h',
+ 'src/core/server/server_config_selector.h',
+ 'src/core/server/server_config_selector_filter.h',
+ 'src/core/server/server_interface.h',
+ 'src/core/server/xds_channel_stack_modifier.h',
'src/core/service_config/service_config.h',
'src/core/service_config/service_config_call_data.h',
'src/core/service_config/service_config_impl.h',
@@ -1583,8 +1582,6 @@ Pod::Spec.new do |s|
'src/core/ext/filters/message_size/message_size_filter.h',
'src/core/ext/filters/rbac/rbac_filter.h',
'src/core/ext/filters/rbac/rbac_service_config_parser.h',
- 'src/core/ext/filters/server_config_selector/server_config_selector.h',
- 'src/core/ext/filters/server_config_selector/server_config_selector_filter.h',
'src/core/ext/filters/stateful_session/stateful_session_filter.h',
'src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h',
'src/core/ext/gcp/metadata_query.h',
@@ -2134,7 +2131,6 @@ Pod::Spec.new do |s|
'src/core/ext/xds/xds_bootstrap_grpc.h',
'src/core/ext/xds/xds_certificate_provider.h',
'src/core/ext/xds/xds_channel_args.h',
- 'src/core/ext/xds/xds_channel_stack_modifier.h',
'src/core/ext/xds/xds_client.h',
'src/core/ext/xds/xds_client_grpc.h',
'src/core/ext/xds/xds_client_stats.h',
@@ -2187,7 +2183,6 @@ Pod::Spec.new do |s|
'src/core/lib/channel/context.h',
'src/core/lib/channel/metrics.h',
'src/core/lib/channel/promise_based_filter.h',
- 'src/core/lib/channel/server_call_tracer_filter.h',
'src/core/lib/channel/status_util.h',
'src/core/lib/channel/tcp_tracer.h',
'src/core/lib/compression/compression_internal.h',
@@ -2267,7 +2262,6 @@ Pod::Spec.new do |s|
'src/core/lib/experiments/config.h',
'src/core/lib/experiments/experiments.h',
'src/core/lib/gpr/alloc.h',
- 'src/core/lib/gpr/log_internal.h',
'src/core/lib/gpr/spinlock.h',
'src/core/lib/gpr/string.h',
'src/core/lib/gpr/time_precise.h',
@@ -2511,8 +2505,6 @@ Pod::Spec.new do |s|
'src/core/lib/surface/init_internally.h',
'src/core/lib/surface/lame_client.h',
'src/core/lib/surface/legacy_channel.h',
- 'src/core/lib/surface/server.h',
- 'src/core/lib/surface/server_interface.h',
'src/core/lib/surface/validate_metadata.h',
'src/core/lib/surface/wait_for_cq_end_op.h',
'src/core/lib/transport/batch_builder.h',
@@ -2581,6 +2573,12 @@ Pod::Spec.new do |s|
'src/core/resolver/xds/xds_dependency_manager.h',
'src/core/resolver/xds/xds_resolver_attributes.h',
'src/core/resolver/xds/xds_resolver_trace.h',
+ 'src/core/server/server.h',
+ 'src/core/server/server_call_tracer_filter.h',
+ 'src/core/server/server_config_selector.h',
+ 'src/core/server/server_config_selector_filter.h',
+ 'src/core/server/server_interface.h',
+ 'src/core/server/xds_channel_stack_modifier.h',
'src/core/service_config/service_config.h',
'src/core/service_config/service_config_call_data.h',
'src/core/service_config/service_config_impl.h',
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index fe5a8f48f84..154ea290e80 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -301,9 +301,6 @@ Pod::Spec.new do |s|
'src/core/ext/filters/rbac/rbac_filter.h',
'src/core/ext/filters/rbac/rbac_service_config_parser.cc',
'src/core/ext/filters/rbac/rbac_service_config_parser.h',
- 'src/core/ext/filters/server_config_selector/server_config_selector.h',
- 'src/core/ext/filters/server_config_selector/server_config_selector_filter.cc',
- 'src/core/ext/filters/server_config_selector/server_config_selector_filter.h',
'src/core/ext/filters/stateful_session/stateful_session_filter.cc',
'src/core/ext/filters/stateful_session/stateful_session_filter.h',
'src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc',
@@ -1195,8 +1192,6 @@ Pod::Spec.new do |s|
'src/core/ext/xds/xds_certificate_provider.cc',
'src/core/ext/xds/xds_certificate_provider.h',
'src/core/ext/xds/xds_channel_args.h',
- 'src/core/ext/xds/xds_channel_stack_modifier.cc',
- 'src/core/ext/xds/xds_channel_stack_modifier.h',
'src/core/ext/xds/xds_client.cc',
'src/core/ext/xds/xds_client.h',
'src/core/ext/xds/xds_client_grpc.cc',
@@ -1232,7 +1227,6 @@ Pod::Spec.new do |s|
'src/core/ext/xds/xds_route_config.h',
'src/core/ext/xds/xds_routing.cc',
'src/core/ext/xds/xds_routing.h',
- 'src/core/ext/xds/xds_server_config_fetcher.cc',
'src/core/ext/xds/xds_transport.h',
'src/core/ext/xds/xds_transport_grpc.cc',
'src/core/ext/xds/xds_transport_grpc.h',
@@ -1290,8 +1284,6 @@ Pod::Spec.new do |s|
'src/core/lib/channel/metrics.h',
'src/core/lib/channel/promise_based_filter.cc',
'src/core/lib/channel/promise_based_filter.h',
- 'src/core/lib/channel/server_call_tracer_filter.cc',
- 'src/core/lib/channel/server_call_tracer_filter.h',
'src/core/lib/channel/status_util.cc',
'src/core/lib/channel/status_util.h',
'src/core/lib/channel/tcp_tracer.h',
@@ -1441,7 +1433,6 @@ Pod::Spec.new do |s|
'src/core/lib/gpr/linux/cpu.cc',
'src/core/lib/gpr/linux/log.cc',
'src/core/lib/gpr/log.cc',
- 'src/core/lib/gpr/log_internal.h',
'src/core/lib/gpr/msys/tmpfile.cc',
'src/core/lib/gpr/posix/cpu.cc',
'src/core/lib/gpr/posix/log.cc',
@@ -1913,9 +1904,6 @@ Pod::Spec.new do |s|
'src/core/lib/surface/legacy_channel.cc',
'src/core/lib/surface/legacy_channel.h',
'src/core/lib/surface/metadata_array.cc',
- 'src/core/lib/surface/server.cc',
- 'src/core/lib/surface/server.h',
- 'src/core/lib/surface/server_interface.h',
'src/core/lib/surface/validate_metadata.cc',
'src/core/lib/surface/validate_metadata.h',
'src/core/lib/surface/version.cc',
@@ -2055,6 +2043,17 @@ Pod::Spec.new do |s|
'src/core/resolver/xds/xds_resolver_attributes.h',
'src/core/resolver/xds/xds_resolver_trace.cc',
'src/core/resolver/xds/xds_resolver_trace.h',
+ 'src/core/server/server.cc',
+ 'src/core/server/server.h',
+ 'src/core/server/server_call_tracer_filter.cc',
+ 'src/core/server/server_call_tracer_filter.h',
+ 'src/core/server/server_config_selector.h',
+ 'src/core/server/server_config_selector_filter.cc',
+ 'src/core/server/server_config_selector_filter.h',
+ 'src/core/server/server_interface.h',
+ 'src/core/server/xds_channel_stack_modifier.cc',
+ 'src/core/server/xds_channel_stack_modifier.h',
+ 'src/core/server/xds_server_config_fetcher.cc',
'src/core/service_config/service_config.h',
'src/core/service_config/service_config_call_data.h',
'src/core/service_config/service_config_channel_arg_filter.cc',
@@ -2382,8 +2381,6 @@ Pod::Spec.new do |s|
'src/core/ext/filters/message_size/message_size_filter.h',
'src/core/ext/filters/rbac/rbac_filter.h',
'src/core/ext/filters/rbac/rbac_service_config_parser.h',
- 'src/core/ext/filters/server_config_selector/server_config_selector.h',
- 'src/core/ext/filters/server_config_selector/server_config_selector_filter.h',
'src/core/ext/filters/stateful_session/stateful_session_filter.h',
'src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h',
'src/core/ext/gcp/metadata_query.h',
@@ -2913,7 +2910,6 @@ Pod::Spec.new do |s|
'src/core/ext/xds/xds_bootstrap_grpc.h',
'src/core/ext/xds/xds_certificate_provider.h',
'src/core/ext/xds/xds_channel_args.h',
- 'src/core/ext/xds/xds_channel_stack_modifier.h',
'src/core/ext/xds/xds_client.h',
'src/core/ext/xds/xds_client_grpc.h',
'src/core/ext/xds/xds_client_stats.h',
@@ -2965,7 +2961,6 @@ Pod::Spec.new do |s|
'src/core/lib/channel/context.h',
'src/core/lib/channel/metrics.h',
'src/core/lib/channel/promise_based_filter.h',
- 'src/core/lib/channel/server_call_tracer_filter.h',
'src/core/lib/channel/status_util.h',
'src/core/lib/channel/tcp_tracer.h',
'src/core/lib/compression/compression_internal.h',
@@ -3045,7 +3040,6 @@ Pod::Spec.new do |s|
'src/core/lib/experiments/config.h',
'src/core/lib/experiments/experiments.h',
'src/core/lib/gpr/alloc.h',
- 'src/core/lib/gpr/log_internal.h',
'src/core/lib/gpr/spinlock.h',
'src/core/lib/gpr/string.h',
'src/core/lib/gpr/time_precise.h',
@@ -3289,8 +3283,6 @@ Pod::Spec.new do |s|
'src/core/lib/surface/init_internally.h',
'src/core/lib/surface/lame_client.h',
'src/core/lib/surface/legacy_channel.h',
- 'src/core/lib/surface/server.h',
- 'src/core/lib/surface/server_interface.h',
'src/core/lib/surface/validate_metadata.h',
'src/core/lib/surface/wait_for_cq_end_op.h',
'src/core/lib/transport/batch_builder.h',
@@ -3359,6 +3351,12 @@ Pod::Spec.new do |s|
'src/core/resolver/xds/xds_dependency_manager.h',
'src/core/resolver/xds/xds_resolver_attributes.h',
'src/core/resolver/xds/xds_resolver_trace.h',
+ 'src/core/server/server.h',
+ 'src/core/server/server_call_tracer_filter.h',
+ 'src/core/server/server_config_selector.h',
+ 'src/core/server/server_config_selector_filter.h',
+ 'src/core/server/server_interface.h',
+ 'src/core/server/xds_channel_stack_modifier.h',
'src/core/service_config/service_config.h',
'src/core/service_config/service_config_call_data.h',
'src/core/service_config/service_config_impl.h',
diff --git a/grpc.gemspec b/grpc.gemspec
index f803c2aa549..1247adbae75 100644
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -190,9 +190,6 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/filters/rbac/rbac_filter.h )
s.files += %w( src/core/ext/filters/rbac/rbac_service_config_parser.cc )
s.files += %w( src/core/ext/filters/rbac/rbac_service_config_parser.h )
- s.files += %w( src/core/ext/filters/server_config_selector/server_config_selector.h )
- s.files += %w( src/core/ext/filters/server_config_selector/server_config_selector_filter.cc )
- s.files += %w( src/core/ext/filters/server_config_selector/server_config_selector_filter.h )
s.files += %w( src/core/ext/filters/stateful_session/stateful_session_filter.cc )
s.files += %w( src/core/ext/filters/stateful_session/stateful_session_filter.h )
s.files += %w( src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc )
@@ -1084,8 +1081,6 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/xds/xds_certificate_provider.cc )
s.files += %w( src/core/ext/xds/xds_certificate_provider.h )
s.files += %w( src/core/ext/xds/xds_channel_args.h )
- s.files += %w( src/core/ext/xds/xds_channel_stack_modifier.cc )
- s.files += %w( src/core/ext/xds/xds_channel_stack_modifier.h )
s.files += %w( src/core/ext/xds/xds_client.cc )
s.files += %w( src/core/ext/xds/xds_client.h )
s.files += %w( src/core/ext/xds/xds_client_grpc.cc )
@@ -1121,7 +1116,6 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/xds/xds_route_config.h )
s.files += %w( src/core/ext/xds/xds_routing.cc )
s.files += %w( src/core/ext/xds/xds_routing.h )
- s.files += %w( src/core/ext/xds/xds_server_config_fetcher.cc )
s.files += %w( src/core/ext/xds/xds_transport.h )
s.files += %w( src/core/ext/xds/xds_transport_grpc.cc )
s.files += %w( src/core/ext/xds/xds_transport_grpc.h )
@@ -1179,8 +1173,6 @@ Gem::Specification.new do |s|
s.files += %w( src/core/lib/channel/metrics.h )
s.files += %w( src/core/lib/channel/promise_based_filter.cc )
s.files += %w( src/core/lib/channel/promise_based_filter.h )
- s.files += %w( src/core/lib/channel/server_call_tracer_filter.cc )
- s.files += %w( src/core/lib/channel/server_call_tracer_filter.h )
s.files += %w( src/core/lib/channel/status_util.cc )
s.files += %w( src/core/lib/channel/status_util.h )
s.files += %w( src/core/lib/channel/tcp_tracer.h )
@@ -1330,7 +1322,6 @@ Gem::Specification.new do |s|
s.files += %w( src/core/lib/gpr/linux/cpu.cc )
s.files += %w( src/core/lib/gpr/linux/log.cc )
s.files += %w( src/core/lib/gpr/log.cc )
- s.files += %w( src/core/lib/gpr/log_internal.h )
s.files += %w( src/core/lib/gpr/msys/tmpfile.cc )
s.files += %w( src/core/lib/gpr/posix/cpu.cc )
s.files += %w( src/core/lib/gpr/posix/log.cc )
@@ -1802,9 +1793,6 @@ Gem::Specification.new do |s|
s.files += %w( src/core/lib/surface/legacy_channel.cc )
s.files += %w( src/core/lib/surface/legacy_channel.h )
s.files += %w( src/core/lib/surface/metadata_array.cc )
- s.files += %w( src/core/lib/surface/server.cc )
- s.files += %w( src/core/lib/surface/server.h )
- s.files += %w( src/core/lib/surface/server_interface.h )
s.files += %w( src/core/lib/surface/validate_metadata.cc )
s.files += %w( src/core/lib/surface/validate_metadata.h )
s.files += %w( src/core/lib/surface/version.cc )
@@ -1944,6 +1932,17 @@ Gem::Specification.new do |s|
s.files += %w( src/core/resolver/xds/xds_resolver_attributes.h )
s.files += %w( src/core/resolver/xds/xds_resolver_trace.cc )
s.files += %w( src/core/resolver/xds/xds_resolver_trace.h )
+ s.files += %w( src/core/server/server.cc )
+ s.files += %w( src/core/server/server.h )
+ s.files += %w( src/core/server/server_call_tracer_filter.cc )
+ s.files += %w( src/core/server/server_call_tracer_filter.h )
+ s.files += %w( src/core/server/server_config_selector.h )
+ s.files += %w( src/core/server/server_config_selector_filter.cc )
+ s.files += %w( src/core/server/server_config_selector_filter.h )
+ s.files += %w( src/core/server/server_interface.h )
+ s.files += %w( src/core/server/xds_channel_stack_modifier.cc )
+ s.files += %w( src/core/server/xds_channel_stack_modifier.h )
+ s.files += %w( src/core/server/xds_server_config_fetcher.cc )
s.files += %w( src/core/service_config/service_config.h )
s.files += %w( src/core/service_config/service_config_call_data.h )
s.files += %w( src/core/service_config/service_config_channel_arg_filter.cc )
diff --git a/package.xml b/package.xml
index 62b2b535a98..f95df49ac37 100644
--- a/package.xml
+++ b/package.xml
@@ -172,9 +172,6 @@
-
-
-
@@ -1066,8 +1063,6 @@
-
-
@@ -1103,7 +1098,6 @@
-
@@ -1161,8 +1155,6 @@
-
-
@@ -1312,7 +1304,6 @@
-
@@ -1784,9 +1775,6 @@
-
-
-
@@ -1926,6 +1914,17 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/compiler/python_generator.cc b/src/compiler/python_generator.cc
index e968fedcbad..bb3b0ab84aa 100644
--- a/src/compiler/python_generator.cc
+++ b/src/compiler/python_generator.cc
@@ -574,6 +574,9 @@ bool PrivateGenerator::PrintAddServicerToServer(
"'$PackageQualifiedServiceName$', rpc_method_handlers)\n");
}
out->Print("server.add_generic_rpc_handlers((generic_handler,))\n");
+ out->Print(method_dict,
+ "server.add_registered_method_handlers('$"
+ "PackageQualifiedServiceName$', rpc_method_handlers)\n");
}
return true;
}
diff --git a/src/core/BUILD b/src/core/BUILD
index 26bdbd93ded..b28f3b72064 100644
--- a/src/core/BUILD
+++ b/src/core/BUILD
@@ -119,10 +119,10 @@ grpc_cc_library(
grpc_cc_library(
name = "server_call_tracer_filter",
srcs = [
- "lib/channel/server_call_tracer_filter.cc",
+ "server/server_call_tracer_filter.cc",
],
hdrs = [
- "lib/channel/server_call_tracer_filter.h",
+ "server/server_call_tracer_filter.h",
],
external_deps = [
"absl/status",
@@ -288,15 +288,6 @@ grpc_cc_library(
],
)
-grpc_cc_library(
- name = "gpr_log_internal",
- hdrs = [
- "lib/gpr/log_internal.h",
- ],
- language = "c++",
- deps = ["//:gpr_platform"],
-)
-
grpc_cc_library(
name = "env",
srcs = [
@@ -483,6 +474,7 @@ grpc_cc_library(
grpc_cc_library(
name = "poll",
+ external_deps = ["absl/log:check"],
language = "c++",
public_hdrs = [
"lib/promise/poll.h",
@@ -497,6 +489,7 @@ grpc_cc_library(
grpc_cc_library(
name = "status_flag",
external_deps = [
+ "absl/log:check",
"absl/status",
"absl/status:statusor",
"absl/types:optional",
@@ -542,6 +535,7 @@ grpc_cc_library(
],
external_deps = [
"absl/base:core_headers",
+ "absl/log:check",
"absl/strings",
"absl/strings:str_format",
],
@@ -564,7 +558,10 @@ grpc_cc_library(
grpc_cc_library(
name = "context",
- external_deps = ["absl/meta:type_traits"],
+ external_deps = [
+ "absl/log:check",
+ "absl/meta:type_traits",
+ ],
language = "c++",
public_hdrs = [
"lib/promise/context.h",
@@ -705,6 +702,7 @@ grpc_cc_library(
grpc_cc_library(
name = "promise_status",
external_deps = [
+ "absl/log:check",
"absl/status",
"absl/status:statusor",
],
@@ -750,6 +748,9 @@ grpc_cc_library(
grpc_cc_library(
name = "join_state",
+ external_deps = [
+ "absl/log:check",
+ ],
language = "c++",
public_hdrs = [
"lib/promise/detail/join_state.h",
@@ -782,6 +783,7 @@ grpc_cc_library(
grpc_cc_library(
name = "try_join",
external_deps = [
+ "absl/log:check",
"absl/meta:type_traits",
"absl/status",
"absl/status:statusor",
@@ -836,6 +838,7 @@ grpc_cc_library(
name = "seq_state",
external_deps = [
"absl/base:core_headers",
+ "absl/log:check",
"absl/strings",
],
language = "c++",
@@ -872,6 +875,7 @@ grpc_cc_library(
grpc_cc_library(
name = "try_seq",
external_deps = [
+ "absl/log:check",
"absl/meta:type_traits",
"absl/status",
"absl/status:statusor",
@@ -899,6 +903,7 @@ grpc_cc_library(
],
external_deps = [
"absl/base:core_headers",
+ "absl/log:check",
"absl/status",
"absl/strings",
"absl/strings:str_format",
@@ -943,6 +948,7 @@ grpc_cc_library(
hdrs = [
"lib/promise/event_engine_wakeup_scheduler.h",
],
+ external_deps = ["absl/log:check"],
language = "c++",
deps = [
"//:event_engine_base_hdrs",
@@ -970,7 +976,10 @@ grpc_cc_library(
grpc_cc_library(
name = "latch",
- external_deps = ["absl/strings"],
+ external_deps = [
+ "absl/log:check",
+ "absl/strings",
+ ],
language = "c++",
public_hdrs = [
"lib/promise/latch.h",
@@ -1008,6 +1017,7 @@ grpc_cc_library(
"lib/promise/interceptor_list.h",
],
external_deps = [
+ "absl/log:check",
"absl/strings",
"absl/strings:str_format",
"absl/types:optional",
@@ -1030,6 +1040,7 @@ grpc_cc_library(
"lib/promise/pipe.h",
],
external_deps = [
+ "absl/log:check",
"absl/strings",
"absl/types:optional",
"absl/types:variant",
@@ -1056,6 +1067,7 @@ grpc_cc_library(
hdrs = [
"lib/promise/promise_mutex.h",
],
+ external_deps = ["absl/log:check"],
language = "c++",
deps = [
"activity",
@@ -1103,7 +1115,10 @@ grpc_cc_library(
hdrs = [
"lib/promise/mpsc.h",
],
- external_deps = ["absl/base:core_headers"],
+ external_deps = [
+ "absl/base:core_headers",
+ "absl/log:check",
+ ],
language = "c++",
deps = [
"activity",
@@ -1123,6 +1138,7 @@ grpc_cc_library(
external_deps = [
"absl/container:flat_hash_set",
"absl/functional:any_invocable",
+ "absl/log:check",
],
language = "c++",
deps = [
@@ -1135,6 +1151,7 @@ grpc_cc_library(
grpc_cc_library(
name = "for_each",
external_deps = [
+ "absl/log:check",
"absl/status",
"absl/strings",
],
@@ -1250,6 +1267,7 @@ grpc_cc_library(
],
external_deps = [
"absl/base:core_headers",
+ "absl/log:check",
"absl/status",
"absl/status:statusor",
"absl/types:optional",
@@ -2839,7 +2857,10 @@ grpc_cc_library(
"lib/transport/bdp_estimator.cc",
],
hdrs = ["lib/transport/bdp_estimator.h"],
- external_deps = ["absl/strings"],
+ external_deps = [
+ "absl/log:check",
+ "absl/strings",
+ ],
deps = [
"time",
"//:gpr",
@@ -3040,7 +3061,7 @@ grpc_cc_library(
grpc_cc_library(
name = "server_interface",
hdrs = [
- "lib/surface/server_interface.h",
+ "server/server_interface.h",
],
language = "c++",
deps = [
@@ -3591,7 +3612,7 @@ grpc_cc_library(
grpc_cc_library(
name = "grpc_server_config_selector",
hdrs = [
- "ext/filters/server_config_selector/server_config_selector.h",
+ "server/server_config_selector.h",
],
external_deps = [
"absl/status:statusor",
@@ -3614,10 +3635,10 @@ grpc_cc_library(
grpc_cc_library(
name = "grpc_server_config_selector_filter",
srcs = [
- "ext/filters/server_config_selector/server_config_selector_filter.cc",
+ "server/server_config_selector_filter.cc",
],
hdrs = [
- "ext/filters/server_config_selector/server_config_selector_filter.h",
+ "server/server_config_selector_filter.h",
],
external_deps = [
"absl/base:core_headers",
@@ -3964,6 +3985,7 @@ grpc_cc_library(
"lib/security/security_connector/ssl/ssl_security_connector.h",
],
external_deps = [
+ "absl/log:check",
"absl/status",
"absl/strings",
"absl/strings:str_format",
@@ -4008,6 +4030,7 @@ grpc_cc_library(
"load_balancing/grpclb/grpclb.h",
],
external_deps = [
+ "absl/log:check",
"absl/status:statusor",
"absl/strings",
"absl/types:optional",
@@ -4089,6 +4112,7 @@ grpc_cc_library(
"absl/base:core_headers",
"absl/container:inlined_vector",
"absl/functional:bind_front",
+ "absl/log:check",
"absl/status",
"absl/status:statusor",
"absl/strings",
@@ -4140,6 +4164,7 @@ grpc_cc_library(
"lib/security/credentials/iam/iam_credentials.h",
],
external_deps = [
+ "absl/log:check",
"absl/status:statusor",
"absl/strings",
"absl/strings:str_format",
@@ -4173,6 +4198,7 @@ grpc_cc_library(
"lib/security/credentials/oauth2/oauth2_credentials.h",
],
external_deps = [
+ "absl/log:check",
"absl/status",
"absl/status:statusor",
"absl/strings",
@@ -4234,6 +4260,7 @@ grpc_cc_library(
"lib/security/credentials/external/url_external_account_credentials.h",
],
external_deps = [
+ "absl/log:check",
"absl/status",
"absl/status:statusor",
"absl/strings",
@@ -5173,10 +5200,10 @@ grpc_cc_library(
grpc_cc_library(
name = "grpc_xds_channel_stack_modifier",
srcs = [
- "ext/xds/xds_channel_stack_modifier.cc",
+ "server/xds_channel_stack_modifier.cc",
],
hdrs = [
- "ext/xds/xds_channel_stack_modifier.h",
+ "server/xds_channel_stack_modifier.h",
],
external_deps = ["absl/strings"],
language = "c++",
@@ -5198,7 +5225,7 @@ grpc_cc_library(
grpc_cc_library(
name = "grpc_xds_server_config_fetcher",
srcs = [
- "ext/xds/xds_server_config_fetcher.cc",
+ "server/xds_server_config_fetcher.cc",
],
external_deps = [
"absl/base:core_headers",
@@ -7065,6 +7092,7 @@ grpc_cc_library(
],
external_deps = [
"absl/base:core_headers",
+ "absl/log:check",
"absl/status",
"absl/status:statusor",
"absl/types:optional",
@@ -7266,6 +7294,9 @@ grpc_cc_library(
hdrs = [
"lib/transport/call_filters.h",
],
+ external_deps = [
+ "absl/log:check",
+ ],
deps = [
"call_final_info",
"latch",
@@ -7373,6 +7404,9 @@ grpc_cc_library(
hdrs = [
"lib/transport/call_spine.h",
],
+ external_deps = [
+ "absl/log:check",
+ ],
deps = [
"1999",
"call_arena_allocator",
@@ -7407,6 +7441,7 @@ grpc_cc_library(
"absl/container:flat_hash_set",
"absl/container:inlined_vector",
"absl/functional:function_ref",
+ "absl/log:check",
"absl/meta:type_traits",
"absl/strings",
"absl/strings:str_format",
@@ -7441,6 +7476,7 @@ grpc_cc_library(
],
external_deps = [
"absl/base:core_headers",
+ "absl/log:check",
"absl/types:optional",
],
deps = [
diff --git a/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc b/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc
index d189d4080a7..fd48d034d38 100644
--- a/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc
+++ b/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc
@@ -307,13 +307,15 @@ void RegisterLegacyChannelIdleFilters(CoreConfiguration::Builder* builder) {
.If([](const ChannelArgs& channel_args) {
return GetClientIdleTimeout(channel_args) != Duration::Infinity();
});
- builder->channel_init()
- ->RegisterV2Filter(GRPC_SERVER_CHANNEL)
- .ExcludeFromMinimalStack()
- .If([](const ChannelArgs& channel_args) {
- return LegacyMaxAgeFilter::Config::FromChannelArgs(channel_args)
- .enable();
- });
+ if (!IsChaoticGoodEnabled()) {
+ builder->channel_init()
+ ->RegisterV2Filter(GRPC_SERVER_CHANNEL)
+ .ExcludeFromMinimalStack()
+ .If([](const ChannelArgs& channel_args) {
+ return LegacyMaxAgeFilter::Config::FromChannelArgs(channel_args)
+ .enable();
+ });
+ }
}
LegacyMaxAgeFilter::LegacyMaxAgeFilter(grpc_channel_stack* channel_stack,
diff --git a/src/core/ext/transport/binder/server/binder_server.cc b/src/core/ext/transport/binder/server/binder_server.cc
index 3afbd2ef615..dd47707fe5b 100644
--- a/src/core/ext/transport/binder/server/binder_server.cc
+++ b/src/core/ext/transport/binder/server/binder_server.cc
@@ -30,8 +30,8 @@
#include "src/core/ext/transport/binder/utils/ndk_binder.h"
#include "src/core/ext/transport/binder/wire_format/binder_android.h"
#include "src/core/lib/iomgr/exec_ctx.h"
-#include "src/core/lib/surface/server.h"
#include "src/core/lib/transport/error_utils.h"
+#include "src/core/server/server.h"
#ifdef GPR_SUPPORT_BINDER_TRANSPORT
diff --git a/src/core/ext/transport/binder/server/binder_server.h b/src/core/ext/transport/binder/server/binder_server.h
index 0a1a36e8ba3..34f25090c59 100644
--- a/src/core/ext/transport/binder/server/binder_server.h
+++ b/src/core/ext/transport/binder/server/binder_server.h
@@ -26,8 +26,8 @@
#include "src/core/ext/transport/binder/transport/binder_transport.h"
#include "src/core/ext/transport/binder/wire_format/binder.h"
#include "src/core/lib/iomgr/exec_ctx.h"
-#include "src/core/lib/surface/server.h"
#include "src/core/lib/transport/error_utils.h"
+#include "src/core/server/server.h"
// TODO(waynetu): This is part of the public API and should be moved to the
// include/ folder.
diff --git a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc
index 7449a52d2ed..b84e0e1d147 100644
--- a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc
+++ b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc
@@ -62,11 +62,11 @@
#include "src/core/lib/resource_quota/resource_quota.h"
#include "src/core/lib/slice/slice.h"
#include "src/core/lib/slice/slice_buffer.h"
-#include "src/core/lib/surface/server.h"
#include "src/core/lib/transport/error_utils.h"
#include "src/core/lib/transport/metadata.h"
#include "src/core/lib/transport/metadata_batch.h"
#include "src/core/lib/transport/promise_endpoint.h"
+#include "src/core/server/server.h"
namespace grpc_core {
namespace chaotic_good {
diff --git a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h
index 0d547f1f634..404bbbf946d 100644
--- a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h
+++ b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h
@@ -44,8 +44,8 @@
#include "src/core/lib/resource_quota/memory_quota.h"
#include "src/core/lib/resource_quota/resource_quota.h"
#include "src/core/lib/slice/slice.h"
-#include "src/core/lib/surface/server.h"
#include "src/core/lib/transport/promise_endpoint.h"
+#include "src/core/server/server.h"
namespace grpc_core {
namespace chaotic_good {
diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc
index af853c75977..239a03db478 100644
--- a/src/core/ext/transport/chttp2/server/chttp2_server.cc
+++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc
@@ -80,10 +80,10 @@
#include "src/core/lib/security/credentials/insecure/insecure_credentials.h"
#include "src/core/lib/security/security_connector/security_connector.h"
#include "src/core/lib/surface/api_trace.h"
-#include "src/core/lib/surface/server.h"
#include "src/core/lib/transport/error_utils.h"
#include "src/core/lib/transport/transport.h"
#include "src/core/lib/uri/uri_parser.h"
+#include "src/core/server/server.h"
#ifdef GPR_SUPPORT_CHANNELS_FROM_FD
#include "src/core/lib/iomgr/ev_posix.h"
diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.h b/src/core/ext/transport/chttp2/server/chttp2_server.h
index f7eb7a23c66..26c178be917 100644
--- a/src/core/ext/transport/chttp2/server/chttp2_server.h
+++ b/src/core/ext/transport/chttp2/server/chttp2_server.h
@@ -25,7 +25,7 @@
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/iomgr/error.h"
-#include "src/core/lib/surface/server.h"
+#include "src/core/server/server.h"
namespace grpc_core {
diff --git a/src/core/ext/transport/inproc/inproc_transport.cc b/src/core/ext/transport/inproc/inproc_transport.cc
index 6069283efb4..ffcc7469c6a 100644
--- a/src/core/ext/transport/inproc/inproc_transport.cc
+++ b/src/core/ext/transport/inproc/inproc_transport.cc
@@ -27,8 +27,8 @@
#include "src/core/lib/promise/promise.h"
#include "src/core/lib/promise/try_seq.h"
#include "src/core/lib/surface/channel_create.h"
-#include "src/core/lib/surface/server.h"
#include "src/core/lib/transport/transport.h"
+#include "src/core/server/server.h"
namespace grpc_core {
diff --git a/src/core/ext/transport/inproc/legacy_inproc_transport.cc b/src/core/ext/transport/inproc/legacy_inproc_transport.cc
index b6f9a0517a8..cf91abab6c5 100644
--- a/src/core/ext/transport/inproc/legacy_inproc_transport.cc
+++ b/src/core/ext/transport/inproc/legacy_inproc_transport.cc
@@ -62,10 +62,10 @@
#include "src/core/lib/surface/channel.h"
#include "src/core/lib/surface/channel_create.h"
#include "src/core/lib/surface/channel_stack_type.h"
-#include "src/core/lib/surface/server.h"
#include "src/core/lib/transport/connectivity_state.h"
#include "src/core/lib/transport/metadata_batch.h"
#include "src/core/lib/transport/transport.h"
+#include "src/core/server/server.h"
#define INPROC_LOG(...) \
do { \
diff --git a/src/core/handshaker/handshaker.cc b/src/core/handshaker/handshaker.cc
index efd73de2de0..9be4fd4383f 100644
--- a/src/core/handshaker/handshaker.cc
+++ b/src/core/handshaker/handshaker.cc
@@ -23,6 +23,7 @@
#include
#include
+#include "absl/log/check.h"
#include "absl/status/status.h"
#include "absl/strings/str_format.h"
@@ -100,7 +101,7 @@ bool HandshakeManager::CallNextHandshakerLocked(grpc_error_handle error) {
this, StatusToString(error).c_str(), is_shutdown_, index_,
HandshakerArgsString(&args_).c_str());
}
- GPR_ASSERT(index_ <= handshakers_.size());
+ CHECK(index_ <= handshakers_.size());
// If we got an error or we've been shut down or we're exiting early or
// we've finished the last handshaker, invoke the on_handshake_done
// callback. Otherwise, call the next handshaker.
@@ -177,7 +178,7 @@ void HandshakeManager::DoHandshake(grpc_endpoint* endpoint,
bool done;
{
MutexLock lock(&mu_);
- GPR_ASSERT(index_ == 0);
+ CHECK_EQ(index_, 0u);
// Construct handshaker args. These will be passed through all
// handshakers and eventually be freed by the on_handshake_done callback.
args_.endpoint = endpoint;
diff --git a/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc b/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc
index 9db2cb81bd8..fa10c544d05 100644
--- a/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc
+++ b/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc
@@ -21,6 +21,7 @@
#include
#include "absl/base/thread_annotations.h"
+#include "absl/log/check.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/types/optional.h"
@@ -124,7 +125,7 @@ void TCPConnectHandshaker::DoHandshake(grpc_tcp_server_acceptor* /*acceptor*/,
MutexLock lock(&mu_);
on_handshake_done_ = on_handshake_done;
}
- GPR_ASSERT(args->endpoint == nullptr);
+ CHECK_EQ(args->endpoint, nullptr);
args_ = args;
absl::StatusOr uri = URI::Parse(
args->args.GetString(GRPC_ARG_TCP_HANDSHAKER_RESOLVED_ADDRESS).value());
@@ -179,7 +180,7 @@ void TCPConnectHandshaker::Connected(void* arg, grpc_error_handle error) {
}
return;
}
- GPR_ASSERT(self->endpoint_to_destroy_ != nullptr);
+ CHECK_NE(self->endpoint_to_destroy_, nullptr);
self->args_->endpoint = self->endpoint_to_destroy_;
self->endpoint_to_destroy_ = nullptr;
if (self->bind_endpoint_to_pollset_) {
diff --git a/src/core/lib/config/load_config.cc b/src/core/lib/config/load_config.cc
index a961a24a81d..1e9c3170a74 100644
--- a/src/core/lib/config/load_config.cc
+++ b/src/core/lib/config/load_config.cc
@@ -24,7 +24,6 @@
#include
-#include "src/core/lib/gpr/log_internal.h"
#include "src/core/lib/gprpp/env.h"
namespace grpc_core {
diff --git a/src/core/lib/event_engine/windows/windows_endpoint.cc b/src/core/lib/event_engine/windows/windows_endpoint.cc
index dc7193fd397..c3edbebaa47 100644
--- a/src/core/lib/event_engine/windows/windows_endpoint.cc
+++ b/src/core/lib/event_engine/windows/windows_endpoint.cc
@@ -81,7 +81,7 @@ void WindowsEndpoint::AsyncIOState::DoTcpRead(SliceBuffer* buffer) {
GRPC_EVENT_ENGINE_ENDPOINT_TRACE("WindowsEndpoint::%p reading", endpoint);
if (socket->IsShutdown()) {
socket->read_info()->SetErrorStatus(
- absl::UnavailableError("Socket is shutting down."));
+ absl::InternalError("Socket is shutting down."));
thread_pool->Run(&handle_read_event);
return;
}
@@ -131,7 +131,7 @@ bool WindowsEndpoint::Read(absl::AnyInvocable on_read,
SliceBuffer* buffer, const ReadArgs* /* args */) {
if (io_state_->socket->IsShutdown()) {
io_state_->thread_pool->Run([on_read = std::move(on_read)]() mutable {
- on_read(absl::UnavailableError("Socket is shutting down."));
+ on_read(absl::InternalError("Socket is shutting down."));
});
return false;
}
@@ -154,7 +154,7 @@ bool WindowsEndpoint::Write(absl::AnyInvocable on_writable,
if (io_state_->socket->IsShutdown()) {
io_state_->thread_pool->Run(
[on_writable = std::move(on_writable)]() mutable {
- on_writable(absl::UnavailableError("Socket is shutting down."));
+ on_writable(absl::InternalError("Socket is shutting down."));
});
return false;
}
@@ -300,7 +300,7 @@ void WindowsEndpoint::HandleReadClosure::Run() {
DumpSliceBuffer(buffer_, absl::StrFormat("WindowsEndpoint::%p READ",
io_state->endpoint));
}
- status = absl::UnavailableError("End of TCP stream");
+ status = absl::InternalError("End of TCP stream");
grpc_core::StatusSetInt(&status, grpc_core::StatusIntProperty::kRpcStatus,
GRPC_STATUS_UNAVAILABLE);
buffer_->Swap(last_read_buffer_);
diff --git a/src/core/lib/experiments/rollouts.yaml b/src/core/lib/experiments/rollouts.yaml
index ce9cf80c114..6f4e84827f0 100644
--- a/src/core/lib/experiments/rollouts.yaml
+++ b/src/core/lib/experiments/rollouts.yaml
@@ -60,7 +60,7 @@
posix: false
# TODO(hork): resolve when the client end2end test flake rate reduces to
# a tolerable amount.
- windows: broken
+ windows: false
- name: event_engine_dns
default:
# not tested on iOS at all
diff --git a/src/core/lib/gpr/log_internal.h b/src/core/lib/gpr/log_internal.h
deleted file mode 100644
index 0d7c9108880..00000000000
--- a/src/core/lib/gpr/log_internal.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2022 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-#ifndef GRPC_SRC_CORE_LIB_GPR_LOG_INTERNAL_H
-#define GRPC_SRC_CORE_LIB_GPR_LOG_INTERNAL_H
-
-#include
-
-#include
-#include
-
-#include
-
-/// abort() the process if x is zero, with rudimentary logging to prevent
-/// circular dependencies with gpr_log.
-
-/// Intended for internal invariants. If the error can be recovered from,
-/// without the possibility of corruption, or might best be reflected via
-/// an exception in a higher-level language, consider returning error code.
-#define GPR_ASSERT_INTERNAL(x) \
- do { \
- if (GPR_UNLIKELY(!(x))) { \
- fprintf(stderr, "assertion failed: %s", #x); \
- abort(); \
- } \
- } while (0)
-
-#ifndef NDEBUG
-#define GPR_DEBUG_ASSERT_INTERNAL(x) GPR_ASSERT_INTERNAL(x)
-#else
-#define GPR_DEBUG_ASSERT_INTERNAL(x)
-#endif
-
-#define GPR_LOG_ERROR_INTERNAL(format, ...) \
- do { \
- char f[] = __FILE__; \
- char* display_file = f; \
- char* slash_pos = strrchr(f, '/'); \
- if (slash_pos != nullptr) display_file = slash_pos + 1; \
- char prefix[60]; \
- sprintf(prefix, "INTERNAL %37s:%d]", display_file, __LINE__); \
- fprintf(stderr, "%-60s " format "\n", prefix, __VA_ARGS__); \
- } while (0)
-
-#endif // GRPC_SRC_CORE_LIB_GPR_LOG_INTERNAL_H
diff --git a/src/core/lib/promise/activity.cc b/src/core/lib/promise/activity.cc
index b229e5e3a29..614e343bc8f 100644
--- a/src/core/lib/promise/activity.cc
+++ b/src/core/lib/promise/activity.cc
@@ -18,6 +18,7 @@
#include
+#include "absl/log/check.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/str_format.h"
#include "absl/strings/str_join.h"
@@ -54,7 +55,7 @@ class FreestandingActivity::Handle final : public Wakeable {
// Activity is going away... drop its reference and sever the connection back.
void DropActivity() ABSL_LOCKS_EXCLUDED(mu_) {
mu_.Lock();
- GPR_ASSERT(activity_ != nullptr);
+ CHECK_NE(activity_, nullptr);
activity_ = nullptr;
mu_.Unlock();
Unref();
diff --git a/src/core/lib/promise/activity.h b/src/core/lib/promise/activity.h
index d8bf6ed7bd2..daf3e76a6c2 100644
--- a/src/core/lib/promise/activity.h
+++ b/src/core/lib/promise/activity.h
@@ -24,6 +24,7 @@
#include
#include "absl/base/thread_annotations.h"
+#include "absl/log/check.h"
#include "absl/status/status.h"
#include "absl/types/optional.h"
@@ -467,11 +468,11 @@ class PromiseActivity final
// We shouldn't destruct without calling Cancel() first, and that must get
// us to be done_, so we assume that and have no logic to destruct the
// promise here.
- GPR_ASSERT(done_);
+ CHECK(done_);
}
void RunScheduledWakeup() {
- GPR_ASSERT(wakeup_scheduled_.exchange(false, std::memory_order_acq_rel));
+ CHECK(wakeup_scheduled_.exchange(false, std::memory_order_acq_rel));
Step();
WakeupComplete();
}
@@ -535,7 +536,7 @@ class PromiseActivity final
// Notification that we're no longer executing - it's ok to destruct the
// promise.
void MarkDone() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu()) {
- GPR_ASSERT(!std::exchange(done_, true));
+ CHECK(!std::exchange(done_, true));
ScopedContext contexts(this);
Destruct(&promise_holder_.promise);
}
@@ -580,10 +581,10 @@ class PromiseActivity final
// Until there are no wakeups from within and the promise is incomplete:
// poll the promise.
absl::optional StepLoop() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu()) {
- GPR_ASSERT(is_current());
+ CHECK(is_current());
while (true) {
// Run the promise.
- GPR_ASSERT(!done_);
+ CHECK(!done_);
auto r = promise_holder_.promise();
if (auto* status = r.value_if_ready()) {
// If complete, destroy the promise, flag done, and exit this loop.
diff --git a/src/core/lib/promise/context.h b/src/core/lib/promise/context.h
index a69effe7a1d..4b1f9ef6369 100644
--- a/src/core/lib/promise/context.h
+++ b/src/core/lib/promise/context.h
@@ -17,6 +17,7 @@
#include
+#include "absl/log/check.h"
#include "absl/meta/type_traits.h"
#include
@@ -114,7 +115,7 @@ bool HasContext() {
template
T* GetContext() {
auto* p = promise_detail::Context::get();
- GPR_ASSERT(p != nullptr);
+ CHECK_NE(p, nullptr);
return p;
}
diff --git a/src/core/lib/promise/detail/join_state.h b/src/core/lib/promise/detail/join_state.h
index 32d87e66296..e930ba53f36 100644
--- a/src/core/lib/promise/detail/join_state.h
+++ b/src/core/lib/promise/detail/join_state.h
@@ -21,6 +21,8 @@
#include
#include
+#include "absl/log/check.h"
+
#include
#include
@@ -57,7 +59,7 @@ struct JoinState {
Construct(&promise1, std::forward(p1));
}
JoinState(const JoinState& other) {
- GPR_ASSERT(other.ready.none());
+ CHECK(other.ready.none());
Construct(&promise0, other.promise0);
Construct(&promise1, other.promise1);
}
@@ -172,7 +174,7 @@ struct JoinState {
Construct(&promise2, std::forward(p2));
}
JoinState(const JoinState& other) {
- GPR_ASSERT(other.ready.none());
+ CHECK(other.ready.none());
Construct(&promise0, other.promise0);
Construct(&promise1, other.promise1);
Construct(&promise2, other.promise2);
@@ -329,7 +331,7 @@ struct JoinState {
Construct(&promise3, std::forward(p3));
}
JoinState(const JoinState& other) {
- GPR_ASSERT(other.ready.none());
+ CHECK(other.ready.none());
Construct(&promise0, other.promise0);
Construct(&promise1, other.promise1);
Construct(&promise2, other.promise2);
@@ -528,7 +530,7 @@ struct JoinState {
Construct(&promise4, std::forward(p4));
}
JoinState(const JoinState& other) {
- GPR_ASSERT(other.ready.none());
+ CHECK(other.ready.none());
Construct(&promise0, other.promise0);
Construct(&promise1, other.promise1);
Construct(&promise2, other.promise2);
@@ -769,7 +771,7 @@ struct JoinState {
Construct(&promise5, std::forward(p5));
}
JoinState(const JoinState& other) {
- GPR_ASSERT(other.ready.none());
+ CHECK(other.ready.none());
Construct(&promise0, other.promise0);
Construct(&promise1, other.promise1);
Construct(&promise2, other.promise2);
@@ -1051,7 +1053,7 @@ struct JoinState {
Construct(&promise6, std::forward(p6));
}
JoinState(const JoinState& other) {
- GPR_ASSERT(other.ready.none());
+ CHECK(other.ready.none());
Construct(&promise0, other.promise0);
Construct(&promise1, other.promise1);
Construct(&promise2, other.promise2);
@@ -1376,7 +1378,7 @@ struct JoinState {
Construct(&promise7, std::forward(p7));
}
JoinState(const JoinState& other) {
- GPR_ASSERT(other.ready.none());
+ CHECK(other.ready.none());
Construct(&promise0, other.promise0);
Construct(&promise1, other.promise1);
Construct(&promise2, other.promise2);
@@ -1742,7 +1744,7 @@ struct JoinState {
Construct(&promise8, std::forward(p8));
}
JoinState(const JoinState& other) {
- GPR_ASSERT(other.ready.none());
+ CHECK(other.ready.none());
Construct(&promise0, other.promise0);
Construct(&promise1, other.promise1);
Construct(&promise2, other.promise2);
diff --git a/src/core/lib/promise/detail/seq_state.h b/src/core/lib/promise/detail/seq_state.h
index f22b312aba4..3e69e60b741 100644
--- a/src/core/lib/promise/detail/seq_state.h
+++ b/src/core/lib/promise/detail/seq_state.h
@@ -22,6 +22,7 @@
#include
#include "absl/base/attributes.h"
+#include "absl/log/check.h"
#include "absl/strings/str_cat.h"
#include
@@ -119,7 +120,7 @@ struct SeqState {
}
SeqState(const SeqState& other) noexcept
: state(other.state), whence(other.whence) {
- GPR_ASSERT(state == State::kState0);
+ CHECK(state == State::kState0);
Construct(&prior.current_promise, other.prior.current_promise);
Construct(&prior.next_factory, other.prior.next_factory);
}
@@ -254,7 +255,7 @@ struct SeqState {
}
SeqState(const SeqState& other) noexcept
: state(other.state), whence(other.whence) {
- GPR_ASSERT(state == State::kState0);
+ CHECK(state == State::kState0);
Construct(&prior.current_promise, other.prior.current_promise);
Construct(&prior.prior.next_factory, other.prior.prior.next_factory);
Construct(&prior.next_factory, other.prior.next_factory);
@@ -447,7 +448,7 @@ struct SeqState {
}
SeqState(const SeqState& other) noexcept
: state(other.state), whence(other.whence) {
- GPR_ASSERT(state == State::kState0);
+ CHECK(state == State::kState0);
Construct(&prior.current_promise, other.prior.current_promise);
Construct(&prior.prior.prior.next_factory,
other.prior.prior.prior.next_factory);
@@ -700,7 +701,7 @@ struct SeqState {
}
SeqState(const SeqState& other) noexcept
: state(other.state), whence(other.whence) {
- GPR_ASSERT(state == State::kState0);
+ CHECK(state == State::kState0);
Construct(&prior.current_promise, other.prior.current_promise);
Construct(&prior.prior.prior.prior.next_factory,
other.prior.prior.prior.prior.next_factory);
@@ -1021,7 +1022,7 @@ struct SeqState {
}
SeqState(const SeqState& other) noexcept
: state(other.state), whence(other.whence) {
- GPR_ASSERT(state == State::kState0);
+ CHECK(state == State::kState0);
Construct(&prior.current_promise, other.prior.current_promise);
Construct(&prior.prior.prior.prior.prior.next_factory,
other.prior.prior.prior.prior.prior.next_factory);
@@ -1405,7 +1406,7 @@ struct SeqState {
}
SeqState(const SeqState& other) noexcept
: state(other.state), whence(other.whence) {
- GPR_ASSERT(state == State::kState0);
+ CHECK(state == State::kState0);
Construct(&prior.current_promise, other.prior.current_promise);
Construct(&prior.prior.prior.prior.prior.prior.next_factory,
other.prior.prior.prior.prior.prior.prior.next_factory);
@@ -1855,7 +1856,7 @@ struct SeqState {
}
SeqState(const SeqState& other) noexcept
: state(other.state), whence(other.whence) {
- GPR_ASSERT(state == State::kState0);
+ CHECK(state == State::kState0);
Construct(&prior.current_promise, other.prior.current_promise);
Construct(&prior.prior.prior.prior.prior.prior.prior.next_factory,
other.prior.prior.prior.prior.prior.prior.prior.next_factory);
@@ -2373,7 +2374,7 @@ struct SeqState {
}
SeqState(const SeqState& other) noexcept
: state(other.state), whence(other.whence) {
- GPR_ASSERT(state == State::kState0);
+ CHECK(state == State::kState0);
Construct(&prior.current_promise, other.prior.current_promise);
Construct(
&prior.prior.prior.prior.prior.prior.prior.prior.next_factory,
@@ -2964,7 +2965,7 @@ struct SeqState {
}
SeqState(const SeqState& other) noexcept
: state(other.state), whence(other.whence) {
- GPR_ASSERT(state == State::kState0);
+ CHECK(state == State::kState0);
Construct(&prior.current_promise, other.prior.current_promise);
Construct(
&prior.prior.prior.prior.prior.prior.prior.prior.prior.next_factory,
@@ -3631,7 +3632,7 @@ struct SeqState {
}
SeqState(const SeqState& other) noexcept
: state(other.state), whence(other.whence) {
- GPR_ASSERT(state == State::kState0);
+ CHECK(state == State::kState0);
Construct(&prior.current_promise, other.prior.current_promise);
Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
.next_factory,
@@ -4375,7 +4376,7 @@ struct SeqState {
}
SeqState(const SeqState& other) noexcept
: state(other.state), whence(other.whence) {
- GPR_ASSERT(state == State::kState0);
+ CHECK(state == State::kState0);
Construct(&prior.current_promise, other.prior.current_promise);
Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
.next_factory,
@@ -5198,7 +5199,7 @@ struct SeqState {
}
SeqState(const SeqState& other) noexcept
: state(other.state), whence(other.whence) {
- GPR_ASSERT(state == State::kState0);
+ CHECK(state == State::kState0);
Construct(&prior.current_promise, other.prior.current_promise);
Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
.prior.next_factory,
diff --git a/src/core/lib/promise/detail/status.h b/src/core/lib/promise/detail/status.h
index 987fddfb99f..f1c2aa03d8c 100644
--- a/src/core/lib/promise/detail/status.h
+++ b/src/core/lib/promise/detail/status.h
@@ -17,6 +17,7 @@
#include
+#include "absl/log/check.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
@@ -106,7 +107,7 @@ struct FailureStatusCastImpl, const absl::Status&> {
template
To FailureStatusCast(From&& from) {
- GPR_DEBUG_ASSERT(!IsStatusOk(from));
+ DCHECK(!IsStatusOk(from));
return FailureStatusCastImpl::Cast(std::forward(from));
}
diff --git a/src/core/lib/promise/event_engine_wakeup_scheduler.h b/src/core/lib/promise/event_engine_wakeup_scheduler.h
index b2ba6586a50..eedd48357c3 100644
--- a/src/core/lib/promise/event_engine_wakeup_scheduler.h
+++ b/src/core/lib/promise/event_engine_wakeup_scheduler.h
@@ -18,6 +18,8 @@
#include
#include
+#include "absl/log/check.h"
+
#include
#include
@@ -33,7 +35,7 @@ class EventEngineWakeupScheduler {
std::shared_ptr
event_engine)
: event_engine_(std::move(event_engine)) {
- GPR_ASSERT(event_engine_ != nullptr);
+ CHECK_NE(event_engine_, nullptr);
}
template
diff --git a/src/core/lib/promise/for_each.h b/src/core/lib/promise/for_each.h
index 529dde62256..80d066a18dc 100644
--- a/src/core/lib/promise/for_each.h
+++ b/src/core/lib/promise/for_each.h
@@ -20,6 +20,7 @@
#include
#include
+#include "absl/log/check.h"
#include "absl/status/status.h"
#include "absl/strings/str_cat.h"
@@ -129,13 +130,13 @@ class ForEach {
: reader_(std::move(other.reader_)),
action_factory_(std::move(other.action_factory_)),
whence_(other.whence_) {
- GPR_DEBUG_ASSERT(reading_next_);
- GPR_DEBUG_ASSERT(other.reading_next_);
+ DCHECK(reading_next_);
+ DCHECK(other.reading_next_);
Construct(&reader_next_, std::move(other.reader_next_));
}
ForEach& operator=(ForEach&& other) noexcept {
- GPR_DEBUG_ASSERT(reading_next_);
- GPR_DEBUG_ASSERT(other.reading_next_);
+ DCHECK(reading_next_);
+ DCHECK(other.reading_next_);
reader_ = std::move(other.reader_);
action_factory_ = std::move(other.action_factory_);
reader_next_ = std::move(other.reader_next_);
diff --git a/src/core/lib/promise/interceptor_list.h b/src/core/lib/promise/interceptor_list.h
index be12ed0cfdf..da44df51b71 100644
--- a/src/core/lib/promise/interceptor_list.h
+++ b/src/core/lib/promise/interceptor_list.h
@@ -22,6 +22,7 @@
#include
#include
+#include "absl/log/check.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/str_format.h"
#include "absl/types/optional.h"
@@ -66,7 +67,7 @@ class InterceptorList {
// Update the next pointer stored with this map.
// This is only valid to call once, and only before the map is used.
void SetNext(Map* next) {
- GPR_DEBUG_ASSERT(next_ == nullptr);
+ DCHECK_EQ(next_, nullptr);
next_ = next;
}
diff --git a/src/core/lib/promise/latch.h b/src/core/lib/promise/latch.h
index 63a6846dfab..221793e7cd0 100644
--- a/src/core/lib/promise/latch.h
+++ b/src/core/lib/promise/latch.h
@@ -21,6 +21,7 @@
#include
#include
+#include "absl/log/check.h"
#include "absl/strings/str_cat.h"
#include
@@ -47,12 +48,12 @@ class Latch {
Latch(Latch&& other) noexcept
: value_(std::move(other.value_)), has_value_(other.has_value_) {
#ifndef NDEBUG
- GPR_DEBUG_ASSERT(!other.has_had_waiters_);
+ DCHECK(!other.has_had_waiters_);
#endif
}
Latch& operator=(Latch&& other) noexcept {
#ifndef NDEBUG
- GPR_DEBUG_ASSERT(!other.has_had_waiters_);
+ DCHECK(!other.has_had_waiters_);
#endif
value_ = std::move(other.value_);
has_value_ = other.has_value_;
@@ -102,7 +103,7 @@ class Latch {
if (grpc_trace_promise_primitives.enabled()) {
gpr_log(GPR_INFO, "%sSet %s", DebugTag().c_str(), StateString().c_str());
}
- GPR_DEBUG_ASSERT(!has_value_);
+ DCHECK(!has_value_);
value_ = std::move(value);
has_value_ = true;
waiter_.Wake();
@@ -145,12 +146,12 @@ class Latch {
Latch& operator=(const Latch&) = delete;
Latch(Latch&& other) noexcept : is_set_(other.is_set_) {
#ifndef NDEBUG
- GPR_DEBUG_ASSERT(!other.has_had_waiters_);
+ DCHECK(!other.has_had_waiters_);
#endif
}
Latch& operator=(Latch&& other) noexcept {
#ifndef NDEBUG
- GPR_DEBUG_ASSERT(!other.has_had_waiters_);
+ DCHECK(!other.has_had_waiters_);
#endif
is_set_ = other.is_set_;
return *this;
@@ -179,7 +180,7 @@ class Latch {
if (grpc_trace_promise_primitives.enabled()) {
gpr_log(GPR_INFO, "%sSet %s", DebugTag().c_str(), StateString().c_str());
}
- GPR_DEBUG_ASSERT(!is_set_);
+ DCHECK(!is_set_);
is_set_ = true;
waiter_.Wake();
}
diff --git a/src/core/lib/promise/mpsc.h b/src/core/lib/promise/mpsc.h
index 2362de390cd..ec8132e843a 100644
--- a/src/core/lib/promise/mpsc.h
+++ b/src/core/lib/promise/mpsc.h
@@ -22,6 +22,7 @@
#include
#include "absl/base/thread_annotations.h"
+#include "absl/log/check.h"
#include
#include
@@ -179,10 +180,10 @@ class MpscReceiver {
// a non-empty buffer during a legal move!
MpscReceiver(MpscReceiver&& other) noexcept
: center_(std::move(other.center_)) {
- GPR_DEBUG_ASSERT(other.buffer_.empty());
+ DCHECK(other.buffer_.empty());
}
MpscReceiver& operator=(MpscReceiver&& other) noexcept {
- GPR_DEBUG_ASSERT(other.buffer_.empty());
+ DCHECK(other.buffer_.empty());
center_ = std::move(other.center_);
return *this;
}
diff --git a/src/core/lib/promise/observable.h b/src/core/lib/promise/observable.h
index 37437d9cc16..edf7a37515a 100644
--- a/src/core/lib/promise/observable.h
+++ b/src/core/lib/promise/observable.h
@@ -17,6 +17,7 @@
#include "absl/container/flat_hash_set.h"
#include "absl/functional/any_invocable.h"
+#include "absl/log/check.h"
#include
@@ -123,8 +124,8 @@ class Observable {
Observer(const Observer&) = delete;
Observer& operator=(const Observer&) = delete;
Observer(Observer&& other) noexcept : state_(std::move(other.state_)) {
- GPR_ASSERT(other.waker_.is_unwakeable());
- GPR_ASSERT(!other.saw_pending_);
+ CHECK(other.waker_.is_unwakeable());
+ CHECK(!other.saw_pending_);
}
Observer& operator=(Observer&& other) noexcept = delete;
diff --git a/src/core/lib/promise/party.cc b/src/core/lib/promise/party.cc
index 5d967a658e0..c030f43c4e0 100644
--- a/src/core/lib/promise/party.cc
+++ b/src/core/lib/promise/party.cc
@@ -17,6 +17,7 @@
#include
#include "absl/base/thread_annotations.h"
+#include "absl/log/check.h"
#include "absl/strings/str_format.h"
#include
@@ -102,7 +103,7 @@ class Party::Handle final : public Wakeable {
// Activity is going away... drop its reference and sever the connection back.
void DropActivity() ABSL_LOCKS_EXCLUDED(mu_) {
mu_.Lock();
- GPR_ASSERT(party_ != nullptr);
+ CHECK_NE(party_, nullptr);
party_ = nullptr;
mu_.Unlock();
Unref();
@@ -194,13 +195,13 @@ std::string Party::ActivityDebugTag(WakeupMask wakeup_mask) const {
}
Waker Party::MakeOwningWaker() {
- GPR_DEBUG_ASSERT(currently_polling_ != kNotPolling);
+ DCHECK(currently_polling_ != kNotPolling);
IncrementRefCount();
return Waker(this, 1u << currently_polling_);
}
Waker Party::MakeNonOwningWaker() {
- GPR_DEBUG_ASSERT(currently_polling_ != kNotPolling);
+ DCHECK(currently_polling_ != kNotPolling);
return Waker(participants_[currently_polling_]
.load(std::memory_order_relaxed)
->MakeNonOwningWakeable(this),
@@ -208,7 +209,7 @@ Waker Party::MakeNonOwningWaker() {
}
void Party::ForceImmediateRepoll(WakeupMask mask) {
- GPR_DEBUG_ASSERT(is_current());
+ DCHECK(is_current());
sync_.ForceImmediateRepoll(mask);
}
@@ -232,11 +233,11 @@ void Party::RunLocked() {
return;
}
auto body = [this]() {
- GPR_DEBUG_ASSERT(g_current_party_run_next == nullptr);
+ DCHECK_EQ(g_current_party_run_next, nullptr);
Party* run_next = nullptr;
g_current_party_run_next = &run_next;
const bool done = RunParty();
- GPR_DEBUG_ASSERT(g_current_party_run_next == &run_next);
+ DCHECK(g_current_party_run_next == &run_next);
g_current_party_run_next = nullptr;
if (done) {
ScopedActivity activity(this);
diff --git a/src/core/lib/promise/party.h b/src/core/lib/promise/party.h
index 44f890fa208..214c36a588f 100644
--- a/src/core/lib/promise/party.h
+++ b/src/core/lib/promise/party.h
@@ -24,6 +24,7 @@
#include "absl/base/attributes.h"
#include "absl/base/thread_annotations.h"
+#include "absl/log/check.h"
#include "absl/strings/string_view.h"
#include
@@ -115,7 +116,7 @@ class PartySyncUsingAtomics {
std::memory_order_acquire);
LogStateChange("Run", prev_state,
prev_state & (kRefMask | kLocked | kAllocatedMask));
- GPR_ASSERT(prev_state & kLocked);
+ CHECK(prev_state & kLocked);
if (prev_state & kDestroying) return true;
// From the previous state, extract which participants we're to wakeup.
uint64_t wakeups = prev_state & kWakeupMask;
@@ -195,7 +196,7 @@ class PartySyncUsingAtomics {
slots[n++] = bit;
allocated |= 1 << bit;
}
- GPR_ASSERT(n == count);
+ CHECK(n == count);
// Try to allocate this slot and take a ref (atomically).
// Ref needs to be taken because once we store the participant it could be
// spuriously woken up and unref the party.
@@ -293,7 +294,7 @@ class PartySyncUsingMutex {
WakeupMask freed = 0;
while (true) {
ReleasableMutexLock lock(&mu_);
- GPR_ASSERT(locked_);
+ CHECK(locked_);
allocated_ &= ~std::exchange(freed, 0);
auto wakeup = std::exchange(wakeups_, 0);
if (wakeup == 0) {
@@ -322,7 +323,7 @@ class PartySyncUsingMutex {
wakeup_mask |= 1 << bit;
allocated_ |= 1 << bit;
}
- GPR_ASSERT(n == count);
+ CHECK(n == count);
store(slots);
wakeups_ |= wakeup_mask;
return !std::exchange(locked_, true);
@@ -390,7 +391,7 @@ class Party : public Activity, private Wakeable {
// Activity implementation: not allowed to be overridden by derived types.
void ForceImmediateRepoll(WakeupMask mask) final;
WakeupMask CurrentParticipant() const final {
- GPR_DEBUG_ASSERT(currently_polling_ != kNotPolling);
+ DCHECK(currently_polling_ != kNotPolling);
return 1u << currently_polling_;
}
Waker MakeOwningWaker() final;
@@ -411,10 +412,10 @@ class Party : public Activity, private Wakeable {
// This is useful for implementing batching and the like: we can hold some
// action until the rest of the party resolves itself.
auto AfterCurrentPoll() {
- GPR_DEBUG_ASSERT(GetContext() == this);
+ DCHECK(GetContext() == this);
sync_.WakeAfterPoll(CurrentParticipant());
return [this, iteration = sync_.iteration()]() -> Poll {
- GPR_DEBUG_ASSERT(GetContext() == this);
+ DCHECK(GetContext() == this);
if (iteration == sync_.iteration()) return Pending{};
return Empty{};
};
diff --git a/src/core/lib/promise/pipe.h b/src/core/lib/promise/pipe.h
index f56567e6cf2..c77919f697c 100644
--- a/src/core/lib/promise/pipe.h
+++ b/src/core/lib/promise/pipe.h
@@ -22,6 +22,7 @@
#include
#include
+#include "absl/log/check.h"
#include "absl/strings/str_cat.h"
#include "absl/types/optional.h"
#include "absl/types/variant.h"
@@ -63,7 +64,7 @@ class NextResult final {
NextResult() : center_(nullptr) {}
explicit NextResult(RefCountedPtr> center)
: center_(std::move(center)) {
- GPR_ASSERT(center_ != nullptr);
+ CHECK(center_ != nullptr);
}
explicit NextResult(bool cancelled)
: center_(nullptr), cancelled_(cancelled) {}
@@ -79,11 +80,11 @@ class NextResult final {
bool has_value() const;
// Only valid if has_value()
const T& value() const {
- GPR_ASSERT(has_value());
+ CHECK(has_value());
return **this;
}
T& value() {
- GPR_ASSERT(has_value());
+ CHECK(has_value());
return **this;
}
const T& operator*() const;
@@ -121,7 +122,7 @@ class Center : public InterceptorList {
gpr_log(GPR_DEBUG, "%s", DebugOpString("IncrementRefCount").c_str());
}
refs_++;
- GPR_DEBUG_ASSERT(refs_ != 0);
+ DCHECK_NE(refs_, 0);
}
RefCountedPtr Ref() {
@@ -135,7 +136,7 @@ class Center : public InterceptorList {
if (grpc_trace_promise_primitives.enabled()) {
gpr_log(GPR_DEBUG, "%s", DebugOpString("Unref").c_str());
}
- GPR_DEBUG_ASSERT(refs_ > 0);
+ DCHECK_GT(refs_, 0);
refs_--;
if (0 == refs_) {
this->~Center();
@@ -150,7 +151,7 @@ class Center : public InterceptorList {
if (grpc_trace_promise_primitives.enabled()) {
gpr_log(GPR_INFO, "%s", DebugOpString("Push").c_str());
}
- GPR_DEBUG_ASSERT(refs_ != 0);
+ DCHECK_NE(refs_, 0);
switch (value_state_) {
case ValueState::kClosed:
case ValueState::kReadyClosed:
@@ -174,7 +175,7 @@ class Center : public InterceptorList {
if (grpc_trace_promise_primitives.enabled()) {
gpr_log(GPR_INFO, "%s", DebugOpString("PollAck").c_str());
}
- GPR_DEBUG_ASSERT(refs_ != 0);
+ DCHECK_NE(refs_, 0);
switch (value_state_) {
case ValueState::kClosed:
return true;
@@ -202,7 +203,7 @@ class Center : public InterceptorList {
if (grpc_trace_promise_primitives.enabled()) {
gpr_log(GPR_INFO, "%s", DebugOpString("Next").c_str());
}
- GPR_DEBUG_ASSERT(refs_ != 0);
+ DCHECK_NE(refs_, 0);
switch (value_state_) {
case ValueState::kEmpty:
case ValueState::kAcked:
@@ -228,7 +229,7 @@ class Center : public InterceptorList {
if (grpc_trace_promise_primitives.enabled()) {
gpr_log(GPR_INFO, "%s", DebugOpString("PollClosedForSender").c_str());
}
- GPR_DEBUG_ASSERT(refs_ != 0);
+ DCHECK_NE(refs_, 0);
switch (value_state_) {
case ValueState::kEmpty:
case ValueState::kAcked:
@@ -251,7 +252,7 @@ class Center : public InterceptorList {
if (grpc_trace_promise_primitives.enabled()) {
gpr_log(GPR_INFO, "%s", DebugOpString("PollClosedForReceiver").c_str());
}
- GPR_DEBUG_ASSERT(refs_ != 0);
+ DCHECK_NE(refs_, 0);
switch (value_state_) {
case ValueState::kEmpty:
case ValueState::kAcked:
@@ -272,7 +273,7 @@ class Center : public InterceptorList {
if (grpc_trace_promise_primitives.enabled()) {
gpr_log(GPR_INFO, "%s", DebugOpString("PollEmpty").c_str());
}
- GPR_DEBUG_ASSERT(refs_ != 0);
+ DCHECK_NE(refs_, 0);
switch (value_state_) {
case ValueState::kReady:
case ValueState::kReadyClosed:
@@ -668,7 +669,7 @@ class Push {
return Pending{};
}
}
- GPR_DEBUG_ASSERT(absl::holds_alternative(state_));
+ DCHECK(absl::holds_alternative(state_));
return center_->PollAck();
}
diff --git a/src/core/lib/promise/poll.h b/src/core/lib/promise/poll.h
index 53604c2c89d..57a4a65e83a 100644
--- a/src/core/lib/promise/poll.h
+++ b/src/core/lib/promise/poll.h
@@ -18,6 +18,8 @@
#include
#include
+#include "absl/log/check.h"
+
#include
#include
@@ -95,12 +97,12 @@ class Poll {
bool ready() const { return ready_; }
T& value() {
- GPR_DEBUG_ASSERT(ready());
+ DCHECK(ready());
return value_;
}
const T& value() const {
- GPR_DEBUG_ASSERT(ready());
+ DCHECK(ready());
return value_;
}
@@ -154,7 +156,7 @@ class Poll {
bool ready() const { return ready_; }
Empty value() const {
- GPR_DEBUG_ASSERT(ready());
+ DCHECK(ready());
return Empty{};
}
diff --git a/src/core/lib/promise/promise_mutex.h b/src/core/lib/promise/promise_mutex.h
index 218919db1e9..d1e01f22319 100644
--- a/src/core/lib/promise/promise_mutex.h
+++ b/src/core/lib/promise/promise_mutex.h
@@ -17,6 +17,8 @@
#include
+#include "absl/log/check.h"
+
#include
#include
@@ -35,7 +37,7 @@ class PromiseMutex {
Lock() {}
~Lock() {
if (mutex_ != nullptr) {
- GPR_ASSERT(mutex_->locked_);
+ CHECK(mutex_->locked_);
mutex_->locked_ = false;
mutex_->waiter_.Wake();
}
@@ -52,18 +54,18 @@ class PromiseMutex {
Lock& operator=(const Lock&) noexcept = delete;
T* operator->() {
- GPR_DEBUG_ASSERT(mutex_ != nullptr);
+ DCHECK_NE(mutex_, nullptr);
return &mutex_->value_;
}
T& operator*() {
- GPR_DEBUG_ASSERT(mutex_ != nullptr);
+ DCHECK_NE(mutex_, nullptr);
return mutex_->value_;
}
private:
friend class PromiseMutex;
explicit Lock(PromiseMutex* mutex) : mutex_(mutex) {
- GPR_DEBUG_ASSERT(!mutex_->locked_);
+ DCHECK(!mutex_->locked_);
mutex_->locked_ = true;
}
PromiseMutex* mutex_ = nullptr;
@@ -71,7 +73,7 @@ class PromiseMutex {
PromiseMutex() = default;
explicit PromiseMutex(T value) : value_(std::move(value)) {}
- ~PromiseMutex() { GPR_DEBUG_ASSERT(!locked_); }
+ ~PromiseMutex() { DCHECK(!locked_); }
auto Acquire() {
return [this]() -> Poll {
diff --git a/src/core/lib/promise/status_flag.h b/src/core/lib/promise/status_flag.h
index 3626c251fb0..38d4cf5b720 100644
--- a/src/core/lib/promise/status_flag.h
+++ b/src/core/lib/promise/status_flag.h
@@ -15,6 +15,7 @@
#ifndef GRPC_SRC_CORE_LIB_PROMISE_STATUS_FLAG_H
#define GRPC_SRC_CORE_LIB_PROMISE_STATUS_FLAG_H
+#include "absl/log/check.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/types/optional.h"
@@ -127,7 +128,7 @@ struct StatusCastImpl {
template
struct FailureStatusCastImpl, StatusFlag> {
static absl::StatusOr Cast(StatusFlag flag) {
- GPR_DEBUG_ASSERT(!flag.ok());
+ DCHECK(!flag.ok());
return absl::CancelledError();
}
};
@@ -135,7 +136,7 @@ struct FailureStatusCastImpl, StatusFlag> {
template
struct FailureStatusCastImpl, StatusFlag&> {
static absl::StatusOr Cast(StatusFlag flag) {
- GPR_DEBUG_ASSERT(!flag.ok());
+ DCHECK(!flag.ok());
return absl::CancelledError();
}
};
@@ -143,7 +144,7 @@ struct FailureStatusCastImpl, StatusFlag&> {
template
struct FailureStatusCastImpl, const StatusFlag&> {
static absl::StatusOr Cast(StatusFlag flag) {
- GPR_DEBUG_ASSERT(!flag.ok());
+ DCHECK(!flag.ok());
return absl::CancelledError();
}
};
@@ -157,7 +158,7 @@ class ValueOrFailure {
// NOLINTNEXTLINE(google-explicit-constructor)
ValueOrFailure(Failure) {}
// NOLINTNEXTLINE(google-explicit-constructor)
- ValueOrFailure(StatusFlag status) { GPR_ASSERT(!status.ok()); }
+ ValueOrFailure(StatusFlag status) { CHECK(!status.ok()); }
static ValueOrFailure FromOptional(absl::optional value) {
return ValueOrFailure{std::move(value)};
@@ -215,7 +216,7 @@ struct StatusCastImpl, Failure> {
template
struct StatusCastImpl, StatusFlag&> {
static ValueOrFailure Cast(StatusFlag f) {
- GPR_ASSERT(!f.ok());
+ CHECK(!f.ok());
return ValueOrFailure(Failure{});
}
};
@@ -223,7 +224,7 @@ struct StatusCastImpl, StatusFlag&> {
template
struct StatusCastImpl, StatusFlag> {
static ValueOrFailure Cast(StatusFlag f) {
- GPR_ASSERT(!f.ok());
+ CHECK(!f.ok());
return ValueOrFailure(Failure{});
}
};
diff --git a/src/core/lib/promise/try_join.h b/src/core/lib/promise/try_join.h
index b984d880190..77b0496792b 100644
--- a/src/core/lib/promise/try_join.h
+++ b/src/core/lib/promise/try_join.h
@@ -18,6 +18,7 @@
#include
#include
+#include "absl/log/check.h"
#include "absl/meta/type_traits.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
@@ -83,7 +84,7 @@ struct TryJoinTraits {
}
template
static R EarlyReturn(const ValueOrFailure& x) {
- GPR_ASSERT(!x.ok());
+ CHECK(!x.ok());
return FailureStatusCast(Failure{});
}
template
diff --git a/src/core/lib/promise/try_seq.h b/src/core/lib/promise/try_seq.h
index aaecff002b0..36f2c9639f0 100644
--- a/src/core/lib/promise/try_seq.h
+++ b/src/core/lib/promise/try_seq.h
@@ -20,6 +20,7 @@
#include
#include
+#include "absl/log/check.h"
#include "absl/meta/type_traits.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
@@ -162,7 +163,7 @@ struct TrySeqTraitsWithSfinae<
}
template
static R ReturnValue(T&& status) {
- GPR_DEBUG_ASSERT(!IsStatusOk(status));
+ DCHECK(!IsStatusOk(status));
return FailureStatusCast(status.status());
}
template
diff --git a/src/core/lib/security/credentials/composite/composite_credentials.cc b/src/core/lib/security/credentials/composite/composite_credentials.cc
index a9273162eb6..0684012e796 100644
--- a/src/core/lib/security/credentials/composite/composite_credentials.cc
+++ b/src/core/lib/security/credentials/composite/composite_credentials.cc
@@ -22,6 +22,7 @@
#include
#include
+#include "absl/log/check.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/str_join.h"
@@ -130,9 +131,9 @@ grpc_call_credentials* grpc_composite_call_credentials_create(
"grpc_composite_call_credentials_create(creds1=%p, creds2=%p, "
"reserved=%p)",
3, (creds1, creds2, reserved));
- GPR_ASSERT(reserved == nullptr);
- GPR_ASSERT(creds1 != nullptr);
- GPR_ASSERT(creds2 != nullptr);
+ CHECK_EQ(reserved, nullptr);
+ CHECK_NE(creds1, nullptr);
+ CHECK_NE(creds2, nullptr);
return composite_call_credentials_create(creds1->Ref(), creds2->Ref())
.release();
@@ -144,7 +145,8 @@ grpc_core::RefCountedPtr
grpc_composite_channel_credentials::create_security_connector(
grpc_core::RefCountedPtr call_creds,
const char* target, grpc_core::ChannelArgs* args) {
- GPR_ASSERT(inner_creds_ != nullptr && call_creds_ != nullptr);
+ CHECK(inner_creds_ != nullptr);
+ CHECK(call_creds_ != nullptr);
// If we are passed a call_creds, create a call composite to pass it
// downstream.
if (call_creds != nullptr) {
@@ -159,8 +161,8 @@ grpc_composite_channel_credentials::create_security_connector(
grpc_channel_credentials* grpc_composite_channel_credentials_create(
grpc_channel_credentials* channel_creds, grpc_call_credentials* call_creds,
void* reserved) {
- GPR_ASSERT(channel_creds != nullptr && call_creds != nullptr &&
- reserved == nullptr);
+ CHECK(channel_creds != nullptr && call_creds != nullptr &&
+ reserved == nullptr);
GRPC_API_TRACE(
"grpc_composite_channel_credentials_create(channel_creds=%p, "
"call_creds=%p, reserved=%p)",
diff --git a/src/core/lib/security/credentials/credentials.cc b/src/core/lib/security/credentials/credentials.cc
index e3c4f097aa1..dc58615e26a 100644
--- a/src/core/lib/security/credentials/credentials.cc
+++ b/src/core/lib/security/credentials/credentials.cc
@@ -21,6 +21,8 @@
#include
#include
+#include "absl/log/check.h"
+
#include
#include
@@ -111,7 +113,7 @@ void grpc_server_credentials::set_auth_metadata_processor(
void grpc_server_credentials_set_auth_metadata_processor(
grpc_server_credentials* creds, grpc_auth_metadata_processor processor) {
- GPR_DEBUG_ASSERT(creds != nullptr);
+ DCHECK_NE(creds, nullptr);
creds->set_auth_metadata_processor(processor);
}
diff --git a/src/core/lib/security/credentials/credentials.h b/src/core/lib/security/credentials/credentials.h
index 6a9661c05a6..24e384e8d71 100644
--- a/src/core/lib/security/credentials/credentials.h
+++ b/src/core/lib/security/credentials/credentials.h
@@ -23,6 +23,7 @@
#include
#include
+#include "absl/log/check.h"
#include "absl/status/statusor.h"
#include "absl/strings/string_view.h"
@@ -137,7 +138,7 @@ struct grpc_channel_credentials
// two different `grpc_channel_credentials` objects are used but they compare
// as equal (assuming other channel args match).
int cmp(const grpc_channel_credentials* other) const {
- GPR_ASSERT(other != nullptr);
+ CHECK_NE(other, nullptr);
int r = type().Compare(other->type());
if (r != 0) return r;
return cmp_impl(other);
@@ -218,7 +219,7 @@ struct grpc_call_credentials
// If this method returns 0, it means that gRPC can treat the two call
// credentials as effectively the same..
int cmp(const grpc_call_credentials* other) const {
- GPR_ASSERT(other != nullptr);
+ CHECK_NE(other, nullptr);
int r = type().Compare(other->type());
if (r != 0) return r;
return cmp_impl(other);
diff --git a/src/core/lib/security/credentials/external/aws_external_account_credentials.cc b/src/core/lib/security/credentials/external/aws_external_account_credentials.cc
index 754fd4b3ed0..5bdb1f1aad6 100644
--- a/src/core/lib/security/credentials/external/aws_external_account_credentials.cc
+++ b/src/core/lib/security/credentials/external/aws_external_account_credentials.cc
@@ -20,6 +20,7 @@
#include