grpc 1.62.3 → 1.63.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc
 version: !ruby/object:Gem::Version
-  version: 1.62.3
+  version: 1.63.0
 platform: ruby
 authors:
 - gRPC Authors
 autorequire: 
 bindir: src/ruby/bin
 cert_chain: []
-date: 2024-08-01 00:00:00.000000000 Z
+date: 2024-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -269,6 +269,7 @@ files:
 - include/grpc/support/json.h
 - include/grpc/support/log.h
 - include/grpc/support/log_windows.h
+- include/grpc/support/metrics.h
 - include/grpc/support/port_platform.h
 - include/grpc/support/string_util.h
 - include/grpc/support/sync.h
@@ -280,11 +281,8 @@ files:
 - include/grpc/support/thd_id.h
 - include/grpc/support/time.h
 - include/grpc/support/workaround_list.h
-- src/core/client_channel/backend_metric.cc
-- src/core/client_channel/backend_metric.h
 - src/core/client_channel/backup_poller.cc
 - src/core/client_channel/backup_poller.h
-- src/core/client_channel/channel_connectivity.cc
 - src/core/client_channel/client_channel_channelz.cc
 - src/core/client_channel/client_channel_channelz.h
 - src/core/client_channel/client_channel_factory.cc
@@ -314,7 +312,6 @@ files:
 - src/core/client_channel/retry_service_config.h
 - src/core/client_channel/retry_throttle.cc
 - src/core/client_channel/retry_throttle.h
-- src/core/client_channel/service_config_channel_arg_filter.cc
 - src/core/client_channel/subchannel.cc
 - src/core/client_channel/subchannel.h
 - src/core/client_channel/subchannel_interface_internal.h
@@ -326,8 +323,6 @@ files:
 - src/core/ext/filters/backend_metrics/backend_metric_filter.h
 - src/core/ext/filters/backend_metrics/backend_metric_provider.h
 - src/core/ext/filters/census/grpc_context.cc
-- src/core/ext/filters/channel_idle/channel_idle_filter.cc
-- src/core/ext/filters/channel_idle/channel_idle_filter.h
 - src/core/ext/filters/channel_idle/idle_filter_state.cc
 - src/core/ext/filters/channel_idle/idle_filter_state.h
 - src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc
@@ -345,8 +340,6 @@ files:
 - src/core/ext/filters/http/http_filters_plugin.cc
 - src/core/ext/filters/http/message_compress/compression_filter.cc
 - src/core/ext/filters/http/message_compress/compression_filter.h
-- src/core/ext/filters/http/message_compress/legacy_compression_filter.cc
-- src/core/ext/filters/http/message_compress/legacy_compression_filter.h
 - src/core/ext/filters/http/server/http_server_filter.cc
 - src/core/ext/filters/http/server/http_server_filter.h
 - src/core/ext/filters/message_size/message_size_filter.cc
@@ -1279,6 +1272,7 @@ files:
 - src/core/ext/xds/xds_lb_policy_registry.h
 - src/core/ext/xds/xds_listener.cc
 - src/core/ext/xds/xds_listener.h
+- src/core/ext/xds/xds_metrics.h
 - src/core/ext/xds/xds_resource_type.h
 - src/core/ext/xds/xds_resource_type_impl.h
 - src/core/ext/xds/xds_route_config.cc
@@ -1323,9 +1317,12 @@ files:
 - src/core/lib/channel/connected_channel.cc
 - src/core/lib/channel/connected_channel.h
 - src/core/lib/channel/context.h
+- src/core/lib/channel/metrics.cc
+- 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
@@ -1368,7 +1365,9 @@ files:
 - src/core/lib/event_engine/default_event_engine_factory.cc
 - src/core/lib/event_engine/default_event_engine_factory.h
 - src/core/lib/event_engine/event_engine.cc
+- src/core/lib/event_engine/event_engine_context.h
 - src/core/lib/event_engine/extensions/can_track_errors.h
+- src/core/lib/event_engine/extensions/chaotic_good_extension.h
 - src/core/lib/event_engine/extensions/supports_fd.h
 - src/core/lib/event_engine/forkable.cc
 - src/core/lib/event_engine/forkable.h
@@ -1498,7 +1497,6 @@ files:
 - src/core/lib/gpr/windows/sync.cc
 - src/core/lib/gpr/windows/time.cc
 - src/core/lib/gpr/windows/tmpfile.cc
-- src/core/lib/gpr/wrap_memcpy.cc
 - src/core/lib/gprpp/atomic_utils.h
 - src/core/lib/gprpp/bitset.h
 - src/core/lib/gprpp/chunked_vector.h
@@ -1561,6 +1559,8 @@ files:
 - src/core/lib/gprpp/time_util.h
 - src/core/lib/gprpp/type_list.h
 - src/core/lib/gprpp/unique_type_name.h
+- src/core/lib/gprpp/uuid_v4.cc
+- src/core/lib/gprpp/uuid_v4.h
 - src/core/lib/gprpp/validation_errors.cc
 - src/core/lib/gprpp/validation_errors.h
 - src/core/lib/gprpp/windows/directory_reader.cc
@@ -1774,6 +1774,8 @@ files:
 - src/core/lib/resource_quota/api.h
 - src/core/lib/resource_quota/arena.cc
 - src/core/lib/resource_quota/arena.h
+- src/core/lib/resource_quota/connection_quota.cc
+- src/core/lib/resource_quota/connection_quota.h
 - src/core/lib/resource_quota/memory_quota.cc
 - src/core/lib/resource_quota/memory_quota.h
 - src/core/lib/resource_quota/periodic_update.cc
@@ -1885,6 +1887,7 @@ files:
 - src/core/lib/security/security_connector/load_system_roots_fallback.cc
 - src/core/lib/security/security_connector/load_system_roots_supported.cc
 - src/core/lib/security/security_connector/load_system_roots_supported.h
+- src/core/lib/security/security_connector/load_system_roots_windows.cc
 - src/core/lib/security/security_connector/local/local_security_connector.cc
 - src/core/lib/security/security_connector/local/local_security_connector.h
 - src/core/lib/security/security_connector/security_connector.cc
@@ -1897,7 +1900,6 @@ files:
 - src/core/lib/security/security_connector/tls/tls_security_connector.h
 - src/core/lib/security/transport/auth_filters.h
 - src/core/lib/security/transport/client_auth_filter.cc
-- src/core/lib/security/transport/legacy_server_auth_filter.cc
 - src/core/lib/security/transport/secure_endpoint.cc
 - src/core/lib/security/transport/secure_endpoint.h
 - src/core/lib/security/transport/security_handshaker.cc
@@ -1907,8 +1909,6 @@ files:
 - src/core/lib/security/transport/tsi_error.h
 - src/core/lib/security/util/json_util.cc
 - src/core/lib/security/util/json_util.h
-- src/core/lib/slice/b64.cc
-- src/core/lib/slice/b64.h
 - src/core/lib/slice/percent_encoding.cc
 - src/core/lib/slice/percent_encoding.h
 - src/core/lib/slice/slice.cc
@@ -1922,8 +1922,6 @@ files:
 - src/core/lib/slice/slice_string_helpers.h
 - src/core/lib/surface/api_trace.cc
 - src/core/lib/surface/api_trace.h
-- src/core/lib/surface/builtins.cc
-- src/core/lib/surface/builtins.h
 - src/core/lib/surface/byte_buffer.cc
 - src/core/lib/surface/byte_buffer_reader.cc
 - src/core/lib/surface/call.cc
@@ -1931,13 +1929,13 @@ files:
 - src/core/lib/surface/call_details.cc
 - src/core/lib/surface/call_log_batch.cc
 - src/core/lib/surface/call_test_only.h
-- src/core/lib/surface/call_trace.cc
 - src/core/lib/surface/call_trace.h
 - src/core/lib/surface/channel.cc
 - src/core/lib/surface/channel.h
+- src/core/lib/surface/channel_create.cc
+- src/core/lib/surface/channel_create.h
 - src/core/lib/surface/channel_init.cc
 - src/core/lib/surface/channel_init.h
-- src/core/lib/surface/channel_ping.cc
 - src/core/lib/surface/channel_stack_type.cc
 - src/core/lib/surface/channel_stack_type.h
 - src/core/lib/surface/completion_queue.cc
@@ -1952,9 +1950,12 @@ files:
 - src/core/lib/surface/init_internally.h
 - src/core/lib/surface/lame_client.cc
 - src/core/lib/surface/lame_client.h
+- 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
@@ -1964,8 +1965,6 @@ files:
 - src/core/lib/transport/batch_builder.h
 - src/core/lib/transport/bdp_estimator.cc
 - src/core/lib/transport/bdp_estimator.h
-- src/core/lib/transport/call_factory.cc
-- src/core/lib/transport/call_factory.h
 - src/core/lib/transport/call_filters.cc
 - src/core/lib/transport/call_filters.h
 - src/core/lib/transport/call_final_info.cc
@@ -1977,6 +1976,8 @@ files:
 - src/core/lib/transport/connectivity_state.cc
 - src/core/lib/transport/connectivity_state.h
 - src/core/lib/transport/custom_metadata.h
+- src/core/lib/transport/endpoint_info_handshaker.cc
+- src/core/lib/transport/endpoint_info_handshaker.h
 - src/core/lib/transport/error_utils.cc
 - src/core/lib/transport/error_utils.h
 - src/core/lib/transport/handshaker.cc
@@ -1994,6 +1995,8 @@ files:
 - src/core/lib/transport/metadata_batch.cc
 - src/core/lib/transport/metadata_batch.h
 - src/core/lib/transport/metadata_compression_traits.h
+- src/core/lib/transport/metadata_info.cc
+- src/core/lib/transport/metadata_info.h
 - src/core/lib/transport/parsed_metadata.cc
 - src/core/lib/transport/parsed_metadata.h
 - src/core/lib/transport/simple_slice_based_metadata.h
@@ -2012,6 +2015,8 @@ files:
 - src/core/load_balancing/address_filtering.cc
 - src/core/load_balancing/address_filtering.h
 - src/core/load_balancing/backend_metric_data.h
+- src/core/load_balancing/backend_metric_parser.cc
+- src/core/load_balancing/backend_metric_parser.h
 - src/core/load_balancing/child_policy_handler.cc
 - src/core/load_balancing/child_policy_handler.h
 - src/core/load_balancing/delegating_helper.h
@@ -2046,13 +2051,14 @@ files:
 - src/core/load_balancing/ring_hash/ring_hash.cc
 - src/core/load_balancing/ring_hash/ring_hash.h
 - src/core/load_balancing/rls/rls.cc
+- src/core/load_balancing/rls/rls.h
 - src/core/load_balancing/round_robin/round_robin.cc
 - src/core/load_balancing/subchannel_interface.h
-- src/core/load_balancing/subchannel_list.h
 - src/core/load_balancing/weighted_round_robin/static_stride_scheduler.cc
 - src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h
 - src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc
 - src/core/load_balancing/weighted_target/weighted_target.cc
+- src/core/load_balancing/weighted_target/weighted_target.h
 - src/core/load_balancing/xds/cds.cc
 - src/core/load_balancing/xds/xds_channel_args.h
 - src/core/load_balancing/xds/xds_cluster_impl.cc
@@ -2102,6 +2108,7 @@ files:
 - src/core/resolver/xds/xds_resolver_trace.h
 - 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
 - src/core/service_config/service_config_impl.cc
 - src/core/service_config/service_config_impl.h
 - src/core/service_config/service_config_parser.cc
@@ -2393,6 +2400,8 @@ files:
 - third_party/abseil-cpp/absl/debugging/internal/demangle.h
 - third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc
 - third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h
+- third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc
+- third_party/abseil-cpp/absl/debugging/internal/examine_stack.h
 - third_party/abseil-cpp/absl/debugging/internal/stacktrace_aarch64-inl.inc
 - third_party/abseil-cpp/absl/debugging/internal/stacktrace_arm-inl.inc
 - third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
@@ -2450,6 +2459,40 @@ files:
 - third_party/abseil-cpp/absl/hash/internal/hash.h
 - third_party/abseil-cpp/absl/hash/internal/low_level_hash.cc
 - third_party/abseil-cpp/absl/hash/internal/low_level_hash.h
+- third_party/abseil-cpp/absl/log/absl_vlog_is_on.h
+- third_party/abseil-cpp/absl/log/globals.cc
+- third_party/abseil-cpp/absl/log/globals.h
+- third_party/abseil-cpp/absl/log/internal/append_truncated.h
+- third_party/abseil-cpp/absl/log/internal/conditions.cc
+- third_party/abseil-cpp/absl/log/internal/conditions.h
+- third_party/abseil-cpp/absl/log/internal/config.h
+- third_party/abseil-cpp/absl/log/internal/fnmatch.cc
+- third_party/abseil-cpp/absl/log/internal/fnmatch.h
+- third_party/abseil-cpp/absl/log/internal/globals.cc
+- third_party/abseil-cpp/absl/log/internal/globals.h
+- third_party/abseil-cpp/absl/log/internal/log_format.cc
+- third_party/abseil-cpp/absl/log/internal/log_format.h
+- third_party/abseil-cpp/absl/log/internal/log_impl.h
+- third_party/abseil-cpp/absl/log/internal/log_message.cc
+- third_party/abseil-cpp/absl/log/internal/log_message.h
+- third_party/abseil-cpp/absl/log/internal/log_sink_set.cc
+- third_party/abseil-cpp/absl/log/internal/log_sink_set.h
+- third_party/abseil-cpp/absl/log/internal/nullguard.cc
+- third_party/abseil-cpp/absl/log/internal/nullguard.h
+- third_party/abseil-cpp/absl/log/internal/nullstream.h
+- third_party/abseil-cpp/absl/log/internal/proto.cc
+- third_party/abseil-cpp/absl/log/internal/proto.h
+- third_party/abseil-cpp/absl/log/internal/strip.h
+- third_party/abseil-cpp/absl/log/internal/vlog_config.cc
+- third_party/abseil-cpp/absl/log/internal/vlog_config.h
+- third_party/abseil-cpp/absl/log/internal/voidify.h
+- third_party/abseil-cpp/absl/log/log.h
+- third_party/abseil-cpp/absl/log/log_entry.cc
+- third_party/abseil-cpp/absl/log/log_entry.h
+- third_party/abseil-cpp/absl/log/log_sink.cc
+- third_party/abseil-cpp/absl/log/log_sink.h
+- third_party/abseil-cpp/absl/log/log_sink_registry.h
+- third_party/abseil-cpp/absl/log/vlog_is_on.h
 - third_party/abseil-cpp/absl/memory/memory.h
 - third_party/abseil-cpp/absl/meta/type_traits.h
 - third_party/abseil-cpp/absl/numeric/bits.h
@@ -3115,6 +3158,8 @@ files:
 - third_party/boringssl-with-bazel/src/include/openssl/pkcs12.h
 - third_party/boringssl-with-bazel/src/include/openssl/pkcs7.h
 - third_party/boringssl-with-bazel/src/include/openssl/pkcs8.h
+- third_party/boringssl-with-bazel/src/include/openssl/pki/certificate.h
+- third_party/boringssl-with-bazel/src/include/openssl/pki/signature_verify_cache.h
 - third_party/boringssl-with-bazel/src/include/openssl/poly1305.h
 - third_party/boringssl-with-bazel/src/include/openssl/pool.h
 - third_party/boringssl-with-bazel/src/include/openssl/posix_time.h
@@ -3320,11 +3365,13 @@ files:
 - third_party/re2/util/utf.h
 - third_party/re2/util/util.h
 - third_party/upb/upb/base/descriptor_constants.h
+- third_party/upb/upb/base/internal/endian.h
 - third_party/upb/upb/base/internal/log2.h
 - third_party/upb/upb/base/status.c
 - third_party/upb/upb/base/status.h
 - third_party/upb/upb/base/status.hpp
 - third_party/upb/upb/base/string_view.h
+- third_party/upb/upb/base/upcast.h
 - third_party/upb/upb/generated_code_support.h
 - third_party/upb/upb/hash/common.c
 - third_party/upb/upb/hash/common.h
@@ -3352,13 +3399,20 @@ files:
 - third_party/upb/upb/message/accessors.h
 - third_party/upb/upb/message/array.c
 - third_party/upb/upb/message/array.h
+- third_party/upb/upb/message/compat.c
+- third_party/upb/upb/message/compat.h
+- third_party/upb/upb/message/copy.c
+- third_party/upb/upb/message/copy.h
 - third_party/upb/upb/message/internal/accessors.h
 - third_party/upb/upb/message/internal/array.h
+- third_party/upb/upb/message/internal/extension.c
 - third_party/upb/upb/message/internal/extension.h
 - third_party/upb/upb/message/internal/map.h
 - third_party/upb/upb/message/internal/map_entry.h
 - third_party/upb/upb/message/internal/map_sorter.h
+- third_party/upb/upb/message/internal/message.c
 - third_party/upb/upb/message/internal/message.h
+- third_party/upb/upb/message/internal/tagged_ptr.h
 - third_party/upb/upb/message/internal/types.h
 - third_party/upb/upb/message/map.c
 - third_party/upb/upb/message/map.h
@@ -3367,7 +3421,6 @@ files:
 - third_party/upb/upb/message/message.c
 - third_party/upb/upb/message/message.h
 - third_party/upb/upb/message/tagged_ptr.h
-- third_party/upb/upb/message/types.h
 - third_party/upb/upb/message/value.h
 - third_party/upb/upb/mini_descriptor/build_enum.c
 - third_party/upb/upb/mini_descriptor/build_enum.h
@@ -3395,6 +3448,7 @@ files:
 - third_party/upb/upb/mini_table/internal/file.h
 - third_party/upb/upb/mini_table/internal/message.c
 - third_party/upb/upb/mini_table/internal/message.h
+- third_party/upb/upb/mini_table/internal/size_log2.h
 - third_party/upb/upb/mini_table/internal/sub.h
 - third_party/upb/upb/mini_table/message.c
 - third_party/upb/upb/mini_table/message.h
@@ -3440,6 +3494,7 @@ files:
 - third_party/upb/upb/reflection/internal/service_def.h
 - third_party/upb/upb/reflection/internal/strdup2.c
 - third_party/upb/upb/reflection/internal/strdup2.h
+- third_party/upb/upb/reflection/internal/upb_edition_defaults.h
 - third_party/upb/upb/reflection/message.c
 - third_party/upb/upb/reflection/message.h
 - third_party/upb/upb/reflection/message.hpp
@@ -3457,21 +3512,19 @@ files:
 - third_party/upb/upb/text/encode.h
 - third_party/upb/upb/wire/decode.c
 - third_party/upb/upb/wire/decode.h
-- third_party/upb/upb/wire/decode_fast.c
-- third_party/upb/upb/wire/decode_fast.h
 - third_party/upb/upb/wire/encode.c
 - third_party/upb/upb/wire/encode.h
 - third_party/upb/upb/wire/eps_copy_input_stream.c
 - third_party/upb/upb/wire/eps_copy_input_stream.h
 - third_party/upb/upb/wire/internal/constants.h
-- third_party/upb/upb/wire/internal/decode.h
-- third_party/upb/upb/wire/internal/swap.h
+- third_party/upb/upb/wire/internal/decode_fast.c
+- third_party/upb/upb/wire/internal/decode_fast.h
+- third_party/upb/upb/wire/internal/decoder.h
+- third_party/upb/upb/wire/internal/reader.h
 - third_party/upb/upb/wire/reader.c
 - third_party/upb/upb/wire/reader.h
 - third_party/upb/upb/wire/types.h
-- third_party/utf8_range/naive.c
-- third_party/utf8_range/range2-neon.c
-- third_party/utf8_range/range2-sse.c
+- third_party/utf8_range/utf8_range.c
 - third_party/utf8_range/utf8_range.h
 - third_party/xxhash/xxhash.h
 - third_party/zlib/adler32.c
@@ -3517,7 +3570,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.17
+rubygems_version: 3.5.9
 signing_key: 
 specification_version: 4
 summary: GRPC system in Ruby

data/src/core/client_channel/channel_connectivity.cc

@@ -1,265 +0,0 @@
-//
-// Copyright 2015 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.
-//
-
-#include <grpc/support/port_platform.h>
-
-#include <inttypes.h>
-
-#include "absl/base/thread_annotations.h"
-#include "absl/status/status.h"
-#include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/log.h>
-#include <grpc/support/time.h>
-
-#include "src/core/client_channel/client_channel_filter.h"
-#include "src/core/lib/channel/channel_fwd.h"
-#include "src/core/lib/channel/channel_stack.h"
-#include "src/core/lib/debug/trace.h"
-#include "src/core/lib/gprpp/crash.h"
-#include "src/core/lib/gprpp/dual_ref_counted.h"
-#include "src/core/lib/gprpp/ref_counted_ptr.h"
-#include "src/core/lib/gprpp/sync.h"
-#include "src/core/lib/gprpp/time.h"
-#include "src/core/lib/iomgr/closure.h"
-#include "src/core/lib/iomgr/error.h"
-#include "src/core/lib/iomgr/exec_ctx.h"
-#include "src/core/lib/iomgr/polling_entity.h"
-#include "src/core/lib/surface/api_trace.h"
-#include "src/core/lib/surface/channel.h"
-#include "src/core/lib/surface/completion_queue.h"
-#include "src/core/lib/surface/lame_client.h"
-
-namespace grpc_core {
-namespace {
-
-bool IsLameChannel(Channel* channel) {
-  grpc_channel_element* elem =
-      grpc_channel_stack_last_element(channel->channel_stack());
-  return elem->filter == &LameClientFilter::kFilter;
-}
-
-}  // namespace
-}  // namespace grpc_core
-
-grpc_connectivity_state grpc_channel_check_connectivity_state(
-    grpc_channel* c_channel, int try_to_connect) {
-  grpc_core::ApplicationCallbackExecCtx callback_exec_ctx;
-  grpc_core::ExecCtx exec_ctx;
-  GRPC_API_TRACE(
-      "grpc_channel_check_connectivity_state(channel=%p, try_to_connect=%d)", 2,
-      (c_channel, try_to_connect));
-  grpc_core::Channel* channel = grpc_core::Channel::FromC(c_channel);
-  // Forward through to the underlying client channel.
-  grpc_core::ClientChannelFilter* client_channel =
-      grpc_core::ClientChannelFilter::GetFromChannel(channel);
-  if (GPR_UNLIKELY(client_channel == nullptr)) {
-    if (grpc_core::IsLameChannel(channel)) {
-      return GRPC_CHANNEL_TRANSIENT_FAILURE;
-    }
-    gpr_log(GPR_ERROR,
-            "grpc_channel_check_connectivity_state called on something that is "
-            "not a client channel");
-    return GRPC_CHANNEL_SHUTDOWN;
-  }
-  return client_channel->CheckConnectivityState(try_to_connect);
-}
-
-int grpc_channel_num_external_connectivity_watchers(grpc_channel* c_channel) {
-  grpc_core::Channel* channel = grpc_core::Channel::FromC(c_channel);
-  grpc_core::ClientChannelFilter* client_channel =
-      grpc_core::ClientChannelFilter::GetFromChannel(channel);
-  if (client_channel == nullptr) {
-    if (!grpc_core::IsLameChannel(channel)) {
-      gpr_log(GPR_ERROR,
-              "grpc_channel_num_external_connectivity_watchers called on "
-              "something that is not a client channel");
-    }
-    return 0;
-  }
-  return client_channel->NumExternalConnectivityWatchers();
-}
-
-int grpc_channel_support_connectivity_watcher(grpc_channel* channel) {
-  return grpc_core::ClientChannelFilter::GetFromChannel(
-             grpc_core::Channel::FromC(channel)) != nullptr;
-}
-
-namespace grpc_core {
-namespace {
-
-class StateWatcher : public DualRefCounted<StateWatcher> {
- public:
-  StateWatcher(grpc_channel* c_channel, grpc_completion_queue* cq, void* tag,
-               grpc_connectivity_state last_observed_state,
-               gpr_timespec deadline)
-      : channel_(Channel::FromC(c_channel)->Ref()),
-        cq_(cq),
-        tag_(tag),
-        state_(last_observed_state) {
-    GPR_ASSERT(grpc_cq_begin_op(cq, tag));
-    GRPC_CLOSURE_INIT(&on_complete_, WatchComplete, this, nullptr);
-    ClientChannelFilter* client_channel =
-        ClientChannelFilter::GetFromChannel(channel_.get());
-    if (client_channel == nullptr) {
-      // If the target URI used to create the channel was invalid, channel
-      // stack initialization failed, and that caused us to create a lame
-      // channel.  In that case, connectivity state will never change (it
-      // will always be TRANSIENT_FAILURE), so we don't actually start a
-      // watch, but we are hiding that fact from the application.
-      if (IsLameChannel(channel_.get())) {
-        // A ref is held by the timer callback.
-        StartTimer(Timestamp::FromTimespecRoundUp(deadline));
-        // Ref from object creation needs to be freed here since lame channel
-        // does not have a watcher.
-        Unref();
-        return;
-      }
-      Crash(
-          "grpc_channel_watch_connectivity_state called on something that is "
-          "not a client channel");
-    }
-    // Ref from object creation is held by the watcher callback.
-    auto* watcher_timer_init_state = new WatcherTimerInitState(
-        this, Timestamp::FromTimespecRoundUp(deadline));
-    client_channel->AddExternalConnectivityWatcher(
-        grpc_polling_entity_create_from_pollset(grpc_cq_pollset(cq)), &state_,
-        &on_complete_, watcher_timer_init_state->closure());
-  }
-
- private:
-  // A fire-and-forget object used to delay starting the timer until the
-  // ClientChannelFilter actually starts the watch.
-  class WatcherTimerInitState {
-   public:
-    WatcherTimerInitState(StateWatcher* state_watcher, Timestamp deadline)
-        : state_watcher_(state_watcher), deadline_(deadline) {
-      GRPC_CLOSURE_INIT(&closure_, WatcherTimerInit, this, nullptr);
-    }
-
-    grpc_closure* closure() { return &closure_; }
-
-   private:
-    static void WatcherTimerInit(void* arg, grpc_error_handle /*error*/) {
-      auto* self = static_cast<WatcherTimerInitState*>(arg);
-      self->state_watcher_->StartTimer(self->deadline_);
-      delete self;
-    }
-
-    StateWatcher* state_watcher_;
-    Timestamp deadline_;
-    grpc_closure closure_;
-  };
-
-  void StartTimer(Timestamp deadline) {
-    const Duration timeout = deadline - Timestamp::Now();
-    MutexLock lock(&mu_);
-    timer_handle_ = channel_->channel_stack()->EventEngine()->RunAfter(
-        timeout, [self = Ref()]() mutable {
-          ApplicationCallbackExecCtx callback_exec_ctx;
-          ExecCtx exec_ctx;
-          self->TimeoutComplete();
-          // StateWatcher deletion might require an active ExecCtx.
-          self.reset();
-        });
-  }
-
-  static void WatchComplete(void* arg, grpc_error_handle error) {
-    auto* self = static_cast<StateWatcher*>(arg);
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_trace_operation_failures)) {
-      GRPC_LOG_IF_ERROR("watch_completion_error", error);
-    }
-    {
-      MutexLock lock(&self->mu_);
-      if (self->timer_handle_.has_value()) {
-        self->channel_->channel_stack()->EventEngine()->Cancel(
-            *self->timer_handle_);
-      }
-    }
-    // Watcher fired when either notified or cancelled, either way the state of
-    // this watcher has been cleared from the client channel. Thus there is no
-    // need to cancel the watch again.
-    self->Unref();
-  }
-
-  void TimeoutComplete() {
-    timer_fired_ = true;
-    // If this is a client channel (not a lame channel), cancel the watch.
-    ClientChannelFilter* client_channel =
-        ClientChannelFilter::GetFromChannel(channel_.get());
-    if (client_channel != nullptr) {
-      client_channel->CancelExternalConnectivityWatcher(&on_complete_);
-    }
-  }
-
-  // Invoked when both strong refs are released.
-  void Orphan() override {
-    WeakRef().release();  // Take a weak ref until completion is finished.
-    grpc_error_handle error =
-        timer_fired_
-            ? GRPC_ERROR_CREATE("Timed out waiting for connection state change")
-            : absl::OkStatus();
-    grpc_cq_end_op(cq_, tag_, error, FinishedCompletion, this,
-                   &completion_storage_);
-  }
-
-  // Called when the completion is returned to the CQ.
-  static void FinishedCompletion(void* arg, grpc_cq_completion* /*ignored*/) {
-    auto* self = static_cast<StateWatcher*>(arg);
-    self->WeakUnref();
-  }
-
-  RefCountedPtr<Channel> channel_;
-  grpc_completion_queue* cq_;
-  void* tag_;
-
-  grpc_connectivity_state state_;
-
-  grpc_cq_completion completion_storage_;
-
-  grpc_closure on_complete_;
-
-  // timer_handle_ might be accessed in parallel from multiple threads, e.g.
-  // timer callback fired immediately on an EventEngine thread before
-  // RunAfter() returns.
-  Mutex mu_;
-  absl::optional<grpc_event_engine::experimental::EventEngine::TaskHandle>
-      timer_handle_ ABSL_GUARDED_BY(mu_);
-  bool timer_fired_ = false;
-};
-
-}  // namespace
-}  // namespace grpc_core
-
-void grpc_channel_watch_connectivity_state(
-    grpc_channel* channel, grpc_connectivity_state last_observed_state,
-    gpr_timespec deadline, grpc_completion_queue* cq, void* tag) {
-  grpc_core::ApplicationCallbackExecCtx callback_exec_ctx;
-  grpc_core::ExecCtx exec_ctx;
-  GRPC_API_TRACE(
-      "grpc_channel_watch_connectivity_state("
-      "channel=%p, last_observed_state=%d, "
-      "deadline=gpr_timespec { tv_sec: %" PRId64
-      ", tv_nsec: %d, clock_type: %d }, "
-      "cq=%p, tag=%p)",
-      7,
-      (channel, (int)last_observed_state, deadline.tv_sec, deadline.tv_nsec,
-       (int)deadline.clock_type, cq, tag));
-  new grpc_core::StateWatcher(channel, cq, tag, last_observed_state, deadline);
-}