diff --git a/BUILD b/BUILD index 8bd86c8c5db..ba8cce5ec38 100644 --- a/BUILD +++ b/BUILD @@ -1111,6 +1111,7 @@ grpc_cc_library( "//src/core:channel_args_preconditioning", "//src/core:channel_stack_type", "//src/core:default_event_engine", + "//src/core:error_utils", "//src/core:iomgr_fwd", "//src/core:iomgr_port", "//src/core:metadata_batch", @@ -1374,9 +1375,6 @@ grpc_cc_library( "//src/core:lib/surface/validate_metadata.cc", "//src/core:lib/surface/version.cc", "//src/core:lib/transport/batch_builder.cc", - "//src/core:lib/transport/connectivity_state.cc", - "//src/core:lib/transport/error_utils.cc", - "//src/core:lib/transport/status_conversion.cc", "//src/core:lib/transport/transport.cc", "//src/core:lib/transport/transport_op_string.cc", ] + @@ -1461,9 +1459,6 @@ grpc_cc_library( "//src/core:lib/surface/validate_metadata.h", "//src/core:lib/surface/wait_for_cq_end_op.h", "//src/core:lib/transport/batch_builder.h", - "//src/core:lib/transport/connectivity_state.h", - "//src/core:lib/transport/error_utils.h", - "//src/core:lib/transport/status_conversion.h", "//src/core:lib/transport/transport.h", ] + # TODO(vigneshbabu): remove these @@ -1528,7 +1523,6 @@ grpc_cc_library( "stats", "tcp_tracer", "uri_parser", - "work_serializer", "//src/core:1999", "//src/core:activity", "//src/core:all_ok", @@ -1546,11 +1540,13 @@ grpc_cc_library( "//src/core:channel_stack_type", "//src/core:closure", "//src/core:compression_internal", + "//src/core:connectivity_state", "//src/core:construct_destruct", "//src/core:context", "//src/core:default_event_engine", "//src/core:dual_ref_counted", "//src/core:error", + "//src/core:error_utils", "//src/core:event_engine_common", "//src/core:event_engine_memory_allocator_factory", "//src/core:event_engine_shim", @@ -1563,7 +1559,6 @@ grpc_cc_library( "//src/core:gpr_manual_constructor", "//src/core:gpr_spinlock", "//src/core:grpc_sockaddr", - "//src/core:http2_errors", "//src/core:if", "//src/core:init_internally", "//src/core:iomgr_fwd", @@ -3098,12 +3093,14 @@ grpc_cc_library( "//src/core:channel_init", "//src/core:channel_stack_type", "//src/core:closure", + "//src/core:connectivity_state", "//src/core:construct_destruct", "//src/core:context", "//src/core:delegating_helper", "//src/core:dual_ref_counted", "//src/core:env", "//src/core:error", + "//src/core:error_utils", "//src/core:experiments", "//src/core:gpr_atm", "//src/core:gpr_manual_constructor", @@ -3197,6 +3194,7 @@ grpc_cc_library( "//src/core:channel_args", "//src/core:closure", "//src/core:error", + "//src/core:error_utils", "//src/core:grpc_service_config", "//src/core:grpc_sockaddr", "//src/core:iomgr_fwd", @@ -3252,6 +3250,7 @@ grpc_cc_library( "//src/core:channel_args_preconditioning", "//src/core:closure", "//src/core:error", + "//src/core:error_utils", "//src/core:handshaker_registry", "//src/core:iomgr_fwd", "//src/core:pollset_set", @@ -3624,6 +3623,7 @@ grpc_cc_library( "//src/core:race", "//src/core:slice", "//src/core:slice_buffer", + "//src/core:status_conversion", ], ) @@ -4067,7 +4067,9 @@ grpc_cc_library( "//src/core:channel_args", "//src/core:chttp2_flow_control", "//src/core:closure", + "//src/core:connectivity_state", "//src/core:error", + "//src/core:error_utils", "//src/core:experiments", "//src/core:http2_errors", "//src/core:http2_settings", @@ -4090,6 +4092,7 @@ grpc_cc_library( "//src/core:slice_buffer", "//src/core:slice_refcount", "//src/core:stats_data", + "//src/core:status_conversion", "//src/core:status_helper", "//src/core:time", "//src/core:useful", diff --git a/src/core/BUILD b/src/core/BUILD index b315e12d9a7..df7e5c018e7 100644 --- a/src/core/BUILD +++ b/src/core/BUILD @@ -3479,6 +3479,7 @@ grpc_cc_library( "closure", "env", "error", + "error_utils", "grpc_external_account_credentials", "grpc_lb_xds_channel_args", "grpc_oauth2_credentials", @@ -3635,6 +3636,7 @@ grpc_cc_library( "closure", "context", "error", + "error_utils", "httpcli_ssl_credentials", "json", "json_reader", @@ -3691,6 +3693,7 @@ grpc_cc_library( "closure", "env", "error", + "error_utils", "grpc_oauth2_credentials", "httpcli_ssl_credentials", "json", @@ -3954,6 +3957,7 @@ grpc_cc_library( "channel_fwd", "channel_stack_type", "closure", + "connectivity_state", "error", "exec_ctx_wakeup_scheduler", "experiments", @@ -4259,6 +4263,7 @@ grpc_cc_library( "channel_fwd", "channel_stack_type", "closure", + "connectivity_state", "context", "delegating_helper", "error", @@ -4362,9 +4367,11 @@ grpc_cc_library( deps = [ "channel_args", "closure", + "connectivity_state", "delegating_helper", "dual_ref_counted", "error", + "error_utils", "grpc_fake_credentials", "json", "json_args", @@ -4501,6 +4508,7 @@ grpc_cc_library( "channel_creds_registry", "channel_fwd", "closure", + "connectivity_state", "default_event_engine", "env", "envoy_admin_upb", @@ -4547,6 +4555,7 @@ grpc_cc_library( "envoy_type_matcher_upb", "envoy_type_upb", "error", + "error_utils", "google_rpc_status_upb", "grpc_audit_logging", "grpc_fake_credentials", @@ -4584,6 +4593,7 @@ grpc_cc_library( "rls_config_upbdefs", "slice", "slice_refcount", + "status_conversion", "status_helper", "time", "unique_type_name", @@ -4787,6 +4797,7 @@ grpc_cc_library( language = "c++", deps = [ "channel_args", + "connectivity_state", "delegating_helper", "grpc_backend_metric_data", "grpc_lb_xds_channel_args", @@ -4830,6 +4841,7 @@ grpc_cc_library( language = "c++", deps = [ "channel_args", + "connectivity_state", "delegating_helper", "grpc_resolver_xds_attributes", "json", @@ -4940,6 +4952,7 @@ grpc_cc_library( deps = [ "channel_args", "closure", + "connectivity_state", "error", "iomgr_fwd", "pollset_set", @@ -4974,6 +4987,7 @@ grpc_cc_library( language = "c++", deps = [ "channel_args", + "connectivity_state", "dual_ref_counted", "gpr_manual_constructor", "health_check_client", @@ -5045,6 +5059,7 @@ grpc_cc_library( language = "c++", deps = [ "channel_args", + "connectivity_state", "experiments", "health_check_client", "iomgr_fwd", @@ -5072,6 +5087,59 @@ grpc_cc_library( ], ) +grpc_cc_library( + name = "status_conversion", + srcs = ["lib/transport/status_conversion.cc"], + hdrs = ["lib/transport/status_conversion.h"], + deps = [ + "http2_errors", + "time", + "//:gpr_platform", + "//:grpc_public_hdrs", + ], +) + +grpc_cc_library( + name = "error_utils", + srcs = ["lib/transport/error_utils.cc"], + hdrs = [ + "lib/transport/error_utils.h", + ], + external_deps = ["absl/status"], + deps = [ + "error", + "http2_errors", + "status_conversion", + "status_helper", + "time", + "//:gpr", + "//:grpc_public_hdrs", + ], +) + +grpc_cc_library( + name = "connectivity_state", + srcs = [ + "lib/transport/connectivity_state.cc", + ], + hdrs = [ + "lib/transport/connectivity_state.h", + ], + external_deps = ["absl/status"], + deps = [ + "closure", + "error", + "//:debug_location", + "//:exec_ctx", + "//:gpr", + "//:grpc_public_hdrs", + "//:grpc_trace", + "//:orphanable", + "//:ref_counted_ptr", + "//:work_serializer", + ], +) + grpc_cc_library( name = "xxhash_inline", hdrs = ["lib/gprpp/xxhash_inline.h"], @@ -5100,6 +5168,7 @@ grpc_cc_library( deps = [ "channel_args", "closure", + "connectivity_state", "delegating_helper", "error", "grpc_lb_policy_pick_first", @@ -5148,6 +5217,7 @@ grpc_cc_library( language = "c++", deps = [ "channel_args", + "connectivity_state", "experiments", "grpc_lb_subchannel_list", "json", @@ -5203,6 +5273,7 @@ grpc_cc_library( language = "c++", deps = [ "channel_args", + "connectivity_state", "experiments", "grpc_backend_metric_data", "grpc_lb_subchannel_list", @@ -5270,6 +5341,7 @@ grpc_cc_library( language = "c++", deps = [ "channel_args", + "connectivity_state", "delegating_helper", "experiments", "grpc_outlier_detection_header", @@ -5314,6 +5386,7 @@ grpc_cc_library( language = "c++", deps = [ "channel_args", + "connectivity_state", "delegating_helper", "grpc_lb_address_filtering", "json", @@ -5358,6 +5431,7 @@ grpc_cc_library( language = "c++", deps = [ "channel_args", + "connectivity_state", "delegating_helper", "grpc_lb_address_filtering", "json", @@ -5405,6 +5479,7 @@ grpc_cc_library( deps = [ "channel_args", "closure", + "connectivity_state", "delegating_helper", "error", "experiments", @@ -6109,6 +6184,7 @@ grpc_cc_library( "channel_stack_type", "closure", "error", + "error_utils", "grpc_insecure_credentials", "handshaker_registry", "resolved_address", @@ -6157,6 +6233,7 @@ grpc_cc_library( "channel_args_endpoint_config", "closure", "error", + "error_utils", "grpc_insecure_credentials", "handshaker_registry", "iomgr_fwd", @@ -6209,6 +6286,7 @@ grpc_cc_library( "channel_args_preconditioning", "channel_stack_type", "closure", + "connectivity_state", "error", "experiments", "iomgr_fwd", diff --git a/src/cpp/ext/gcp/BUILD b/src/cpp/ext/gcp/BUILD index 744b8ff2119..5e21f1eb2d6 100644 --- a/src/cpp/ext/gcp/BUILD +++ b/src/cpp/ext/gcp/BUILD @@ -91,6 +91,7 @@ grpc_cc_library( "//:grpc_public_hdrs", "//src/core:env", "//src/core:error", + "//src/core:error_utils", "//src/core:json", "//src/core:json_args", "//src/core:json_object_loader",