RubyGems - grpc - Versions diffs - 1.74.1 → 1.75.0.pre1 - Mend

grpc 1.74.1 → 1.75.0.pre1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (368) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbe39f8a08ac6716dfece7c10cd120d4defe41cf254555e31794157c551faeac
-  data.tar.gz: f841371232fc671b0d5f2957ac50e9f688df8cf1b7ea455337f7f9d26c0c60cf
+  metadata.gz: 516f4496ce835ff6db4e07a5b043918fe52df2b3b0ee2ccefa22de8529fd75b0
+  data.tar.gz: cee5c9ddfef313f77ee3ce64e0d31ad22bf60412554419f7a3d1239f5b51e865
 SHA512:
-  metadata.gz: a4f7f6ba839ca72d042275cb2e2294400869dc26b33acc39f8d64e23cb2d15ad5080c6fb3bde32cde99f37ea7fddaf15306eeca988823a6b48f976cc071c4c4d
-  data.tar.gz: 5f12ee93005fa5776e912474abf98bbfae383842d5fd595d2e0896ac7a305b674c49903d7a9d5552506428175f96df4666af451f00cec81aa16bde1496e1d55e
+  metadata.gz: 1c46fae8d75f768243d890b80cbeaa705fb5e8a3799130bfd24bdcc31cbaa09a8b1bea3025d38f8487954fb7293ec6fe7a9e56b5deba46dbd5a7de027ba62a35
+  data.tar.gz: 47071a131ce1abfd08594dcfcd4f9dfc081d03f71a9fe314cb52d75a1ba053adf24754ee21481e57e4e28b62f5e4d3776ac1453ba51ad2dc7759c86ac115db89

data/Makefile CHANGED Viewed

@@ -367,8 +367,8 @@ E = @echo
 Q = @
 endif
-CORE_VERSION = 49.0.0
-CPP_VERSION = 1.74.1
+CORE_VERSION = 50.0.0
+CPP_VERSION = 1.75.0-pre1
 CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
 CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)
@@ -404,7 +404,7 @@ SHARED_EXT_CORE = dll
 SHARED_EXT_CPP = dll
 SHARED_PREFIX =
-SHARED_VERSION_CORE = -49
+SHARED_VERSION_CORE = -50
 SHARED_VERSION_CPP = -1
 else ifeq ($(SYSTEM),Darwin)
 EXECUTABLE_SUFFIX =
@@ -685,6 +685,9 @@ LIBGRPC_SRC = \
     src/core/channelz/channelz.cc \
     src/core/channelz/channelz_registry.cc \
     src/core/channelz/property_list.cc \
+    src/core/channelz/v2tov1/convert.cc \
+    src/core/channelz/v2tov1/legacy_api.cc \
+    src/core/channelz/v2tov1/property_list.cc \
     src/core/client_channel/backup_poller.cc \
     src/core/client_channel/client_channel.cc \
     src/core/client_channel/client_channel_factory.cc \
@@ -760,6 +763,7 @@ LIBGRPC_SRC = \
     src/core/credentials/transport/tls/load_system_roots_fallback.cc \
     src/core/credentials/transport/tls/load_system_roots_supported.cc \
     src/core/credentials/transport/tls/load_system_roots_windows.cc \
+    src/core/credentials/transport/tls/spiffe_utils.cc \
     src/core/credentials/transport/tls/ssl_utils.cc \
     src/core/credentials/transport/tls/tls_credentials.cc \
     src/core/credentials/transport/tls/tls_security_connector.cc \
@@ -809,6 +813,7 @@ LIBGRPC_SRC = \
     src/core/ext/transport/chttp2/transport/hpack_parser_table.cc \
     src/core/ext/transport/chttp2/transport/http2_client_transport.cc \
     src/core/ext/transport/chttp2/transport/http2_settings.cc \
+    src/core/ext/transport/chttp2/transport/http2_settings_manager.cc \
     src/core/ext/transport/chttp2/transport/http2_stats_collector.cc \
     src/core/ext/transport/chttp2/transport/http2_transport.cc \
     src/core/ext/transport/chttp2/transport/huffsyms.cc \
@@ -953,6 +958,7 @@ LIBGRPC_SRC = \
     src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c \
     src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c \
     src/core/ext/upb-gen/google/rpc/status.upb_minitable.c \
+    src/core/ext/upb-gen/src/proto/grpc/channelz/channelz.upb_minitable.c \
     src/core/ext/upb-gen/src/proto/grpc/channelz/v2/channelz.upb_minitable.c \
     src/core/ext/upb-gen/src/proto/grpc/channelz/v2/promise.upb_minitable.c \
     src/core/ext/upb-gen/src/proto/grpc/channelz/v2/property_list.upb_minitable.c \
@@ -1118,6 +1124,7 @@ LIBGRPC_SRC = \
     src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.c \
     src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.c \
     src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.c \
+    src/core/ext/upbdefs-gen/src/proto/grpc/channelz/channelz.upbdefs.c \
     src/core/ext/upbdefs-gen/src/proto/grpc/channelz/v2/promise.upbdefs.c \
     src/core/ext/upbdefs-gen/src/proto/grpc/channelz/v2/property_list.upbdefs.c \
     src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.c \
@@ -1154,6 +1161,7 @@ LIBGRPC_SRC = \
     src/core/filter/auth/client_auth_filter.cc \
     src/core/filter/auth/server_auth_filter.cc \
     src/core/filter/blackboard.cc \
+    src/core/filter/fused_filters.cc \
     src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc \
     src/core/handshaker/handshaker.cc \
     src/core/handshaker/handshaker_registry.cc \
@@ -1162,6 +1170,7 @@ LIBGRPC_SRC = \
     src/core/handshaker/http_connect/xds_http_proxy_mapper.cc \
     src/core/handshaker/proxy_mapper_registry.cc \
     src/core/handshaker/security/legacy_secure_endpoint.cc \
+    src/core/handshaker/security/pipelined_secure_endpoint.cc \
     src/core/handshaker/security/secure_endpoint.cc \
     src/core/handshaker/security/security_handshaker.cc \
     src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc \
@@ -1181,6 +1190,7 @@ LIBGRPC_SRC = \
     src/core/lib/debug/trace_flags.cc \
     src/core/lib/event_engine/ares_resolver.cc \
     src/core/lib/event_engine/cf_engine/cf_engine.cc \
+    src/core/lib/event_engine/cf_engine/cfsocket_listener.cc \
     src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc \
     src/core/lib/event_engine/cf_engine/dns_service_resolver.cc \
     src/core/lib/event_engine/channel_args_endpoint_config.cc \
@@ -1385,6 +1395,7 @@ LIBGRPC_SRC = \
     src/core/load_balancing/xds/xds_cluster_manager.cc \
     src/core/load_balancing/xds/xds_override_host.cc \
     src/core/load_balancing/xds/xds_wrr_locality.cc \
+    src/core/net/socket_mutator.cc \
     src/core/plugin_registry/grpc_plugin_registry.cc \
     src/core/plugin_registry/grpc_plugin_registry_extra.cc \
     src/core/resolver/dns/c_ares/dns_resolver_ares.cc \
@@ -1861,8 +1872,8 @@ $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_
 ifeq ($(SYSTEM),Darwin)
 	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libcares.a $(OPENSSL_MERGE_LIBS) $(ZLIB_MERGE_LIBS) $(LDLIBS_SECURE) $(LDLIBS)
 else
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.49 -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libcares.a $(OPENSSL_MERGE_LIBS) $(ZLIB_MERGE_LIBS) $(LDLIBS_SECURE) $(LDLIBS)
-	$(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so.49
+	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.50 -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libcares.a $(OPENSSL_MERGE_LIBS) $(ZLIB_MERGE_LIBS) $(LDLIBS_SECURE) $(LDLIBS)
+	$(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so.50
 	$(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so
 endif
 endif
@@ -2194,23 +2205,15 @@ endif
 # deps: []
 # transitive_deps: []
 LIBCARES_SRC = \
-    third_party/cares/cares/src/lib/ares__addrinfo2hostent.c \
-    third_party/cares/cares/src/lib/ares__addrinfo_localhost.c \
-    third_party/cares/cares/src/lib/ares__close_sockets.c \
-    third_party/cares/cares/src/lib/ares__get_hostent.c \
-    third_party/cares/cares/src/lib/ares__parse_into_addrinfo.c \
-    third_party/cares/cares/src/lib/ares__read_line.c \
-    third_party/cares/cares/src/lib/ares__readaddrinfo.c \
-    third_party/cares/cares/src/lib/ares__sortaddrinfo.c \
-    third_party/cares/cares/src/lib/ares__timeval.c \
+    third_party/cares/cares/src/lib/ares_addrinfo2hostent.c \
+    third_party/cares/cares/src/lib/ares_addrinfo_localhost.c \
     third_party/cares/cares/src/lib/ares_android.c \
     third_party/cares/cares/src/lib/ares_cancel.c \
-    third_party/cares/cares/src/lib/ares_create_query.c \
+    third_party/cares/cares/src/lib/ares_close_sockets.c \
+    third_party/cares/cares/src/lib/ares_conn.c \
+    third_party/cares/cares/src/lib/ares_cookie.c \
     third_party/cares/cares/src/lib/ares_data.c \
     third_party/cares/cares/src/lib/ares_destroy.c \
-    third_party/cares/cares/src/lib/ares_expand_name.c \
-    third_party/cares/cares/src/lib/ares_expand_string.c \
-    third_party/cares/cares/src/lib/ares_fds.c \
     third_party/cares/cares/src/lib/ares_free_hostent.c \
     third_party/cares/cares/src/lib/ares_free_string.c \
     third_party/cares/cares/src/lib/ares_freeaddrinfo.c \
@@ -2219,47 +2222,86 @@ LIBCARES_SRC = \
     third_party/cares/cares/src/lib/ares_gethostbyaddr.c \
     third_party/cares/cares/src/lib/ares_gethostbyname.c \
     third_party/cares/cares/src/lib/ares_getnameinfo.c \
-    third_party/cares/cares/src/lib/ares_getsock.c \
+    third_party/cares/cares/src/lib/ares_hosts_file.c \
     third_party/cares/cares/src/lib/ares_init.c \
     third_party/cares/cares/src/lib/ares_library_init.c \
-    third_party/cares/cares/src/lib/ares_llist.c \
-    third_party/cares/cares/src/lib/ares_mkquery.c \
-    third_party/cares/cares/src/lib/ares_nowarn.c \
+    third_party/cares/cares/src/lib/ares_metrics.c \
     third_party/cares/cares/src/lib/ares_options.c \
-    third_party/cares/cares/src/lib/ares_parse_a_reply.c \
-    third_party/cares/cares/src/lib/ares_parse_aaaa_reply.c \
-    third_party/cares/cares/src/lib/ares_parse_caa_reply.c \
-    third_party/cares/cares/src/lib/ares_parse_mx_reply.c \
-    third_party/cares/cares/src/lib/ares_parse_naptr_reply.c \
-    third_party/cares/cares/src/lib/ares_parse_ns_reply.c \
-    third_party/cares/cares/src/lib/ares_parse_ptr_reply.c \
-    third_party/cares/cares/src/lib/ares_parse_soa_reply.c \
-    third_party/cares/cares/src/lib/ares_parse_srv_reply.c \
-    third_party/cares/cares/src/lib/ares_parse_txt_reply.c \
-    third_party/cares/cares/src/lib/ares_parse_uri_reply.c \
-    third_party/cares/cares/src/lib/ares_platform.c \
+    third_party/cares/cares/src/lib/ares_parse_into_addrinfo.c \
     third_party/cares/cares/src/lib/ares_process.c \
+    third_party/cares/cares/src/lib/ares_qcache.c \
     third_party/cares/cares/src/lib/ares_query.c \
-    third_party/cares/cares/src/lib/ares_rand.c \
     third_party/cares/cares/src/lib/ares_search.c \
     third_party/cares/cares/src/lib/ares_send.c \
-    third_party/cares/cares/src/lib/ares_strcasecmp.c \
-    third_party/cares/cares/src/lib/ares_strdup.c \
+    third_party/cares/cares/src/lib/ares_set_socket_functions.c \
+    third_party/cares/cares/src/lib/ares_socket.c \
+    third_party/cares/cares/src/lib/ares_sortaddrinfo.c \
     third_party/cares/cares/src/lib/ares_strerror.c \
-    third_party/cares/cares/src/lib/ares_strsplit.c \
+    third_party/cares/cares/src/lib/ares_sysconfig.c \
+    third_party/cares/cares/src/lib/ares_sysconfig_files.c \
+    third_party/cares/cares/src/lib/ares_sysconfig_mac.c \
+    third_party/cares/cares/src/lib/ares_sysconfig_win.c \
     third_party/cares/cares/src/lib/ares_timeout.c \
+    third_party/cares/cares/src/lib/ares_update_servers.c \
     third_party/cares/cares/src/lib/ares_version.c \
-    third_party/cares/cares/src/lib/ares_writev.c \
-    third_party/cares/cares/src/lib/bitncmp.c \
+    third_party/cares/cares/src/lib/dsa/ares_array.c \
+    third_party/cares/cares/src/lib/dsa/ares_htable.c \
+    third_party/cares/cares/src/lib/dsa/ares_htable_asvp.c \
+    third_party/cares/cares/src/lib/dsa/ares_htable_dict.c \
+    third_party/cares/cares/src/lib/dsa/ares_htable_strvp.c \
+    third_party/cares/cares/src/lib/dsa/ares_htable_szvp.c \
+    third_party/cares/cares/src/lib/dsa/ares_htable_vpstr.c \
+    third_party/cares/cares/src/lib/dsa/ares_htable_vpvp.c \
+    third_party/cares/cares/src/lib/dsa/ares_llist.c \
+    third_party/cares/cares/src/lib/dsa/ares_slist.c \
+    third_party/cares/cares/src/lib/event/ares_event_configchg.c \
+    third_party/cares/cares/src/lib/event/ares_event_epoll.c \
+    third_party/cares/cares/src/lib/event/ares_event_kqueue.c \
+    third_party/cares/cares/src/lib/event/ares_event_poll.c \
+    third_party/cares/cares/src/lib/event/ares_event_select.c \
+    third_party/cares/cares/src/lib/event/ares_event_thread.c \
+    third_party/cares/cares/src/lib/event/ares_event_wake_pipe.c \
+    third_party/cares/cares/src/lib/event/ares_event_win32.c \
     third_party/cares/cares/src/lib/inet_net_pton.c \
     third_party/cares/cares/src/lib/inet_ntop.c \
+    third_party/cares/cares/src/lib/legacy/ares_create_query.c \
+    third_party/cares/cares/src/lib/legacy/ares_expand_name.c \
+    third_party/cares/cares/src/lib/legacy/ares_expand_string.c \
+    third_party/cares/cares/src/lib/legacy/ares_fds.c \
+    third_party/cares/cares/src/lib/legacy/ares_getsock.c \
+    third_party/cares/cares/src/lib/legacy/ares_parse_a_reply.c \
+    third_party/cares/cares/src/lib/legacy/ares_parse_aaaa_reply.c \
+    third_party/cares/cares/src/lib/legacy/ares_parse_caa_reply.c \
+    third_party/cares/cares/src/lib/legacy/ares_parse_mx_reply.c \
+    third_party/cares/cares/src/lib/legacy/ares_parse_naptr_reply.c \
+    third_party/cares/cares/src/lib/legacy/ares_parse_ns_reply.c \
+    third_party/cares/cares/src/lib/legacy/ares_parse_ptr_reply.c \
+    third_party/cares/cares/src/lib/legacy/ares_parse_soa_reply.c \
+    third_party/cares/cares/src/lib/legacy/ares_parse_srv_reply.c \
+    third_party/cares/cares/src/lib/legacy/ares_parse_txt_reply.c \
+    third_party/cares/cares/src/lib/legacy/ares_parse_uri_reply.c \
+    third_party/cares/cares/src/lib/record/ares_dns_mapping.c \
+    third_party/cares/cares/src/lib/record/ares_dns_multistring.c \
+    third_party/cares/cares/src/lib/record/ares_dns_name.c \
+    third_party/cares/cares/src/lib/record/ares_dns_parse.c \
+    third_party/cares/cares/src/lib/record/ares_dns_record.c \
+    third_party/cares/cares/src/lib/record/ares_dns_write.c \
+    third_party/cares/cares/src/lib/str/ares_buf.c \
+    third_party/cares/cares/src/lib/str/ares_str.c \
+    third_party/cares/cares/src/lib/str/ares_strsplit.c \
+    third_party/cares/cares/src/lib/util/ares_iface_ips.c \
+    third_party/cares/cares/src/lib/util/ares_math.c \
+    third_party/cares/cares/src/lib/util/ares_rand.c \
+    third_party/cares/cares/src/lib/util/ares_threads.c \
+    third_party/cares/cares/src/lib/util/ares_timeval.c \
+    third_party/cares/cares/src/lib/util/ares_uri.c \
     third_party/cares/cares/src/lib/windows_port.c \
 LIBCARES_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBCARES_SRC))))
 $(LIBCARES_OBJS): CFLAGS += -g
-$(LIBCARES_OBJS): CPPFLAGS += -Ithird_party/cares/cares/include -Ithird_party/cares -Ithird_party/cares/cares -fvisibility=hidden -D_GNU_SOURCE $(if $(subst Darwin,,$(SYSTEM)),,-Ithird_party/cares/config_darwin) $(if $(subst FreeBSD,,$(SYSTEM)),,-Ithird_party/cares/config_freebsd) $(if $(subst Linux,,$(SYSTEM)),,-Ithird_party/cares/config_linux) $(if $(subst OpenBSD,,$(SYSTEM)),,-Ithird_party/cares/config_openbsd) -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX $(if $(subst MINGW32,,$(SYSTEM)),-DHAVE_CONFIG_H,)
+$(LIBCARES_OBJS): CPPFLAGS += -Ithird_party/cares/cares/include -Ithird_party/cares -Ithird_party/cares/cares -Ithird_party/cares/cares/src/lib/include -Ithird_party/cares/cares/src/lib -fvisibility=hidden -D_GNU_SOURCE $(if $(subst Darwin,,$(SYSTEM)),,-Ithird_party/cares/config_darwin) $(if $(subst FreeBSD,,$(SYSTEM)),,-Ithird_party/cares/config_freebsd) $(if $(subst Linux,,$(SYSTEM)),,-Ithird_party/cares/config_linux) $(if $(subst OpenBSD,,$(SYSTEM)),,-Ithird_party/cares/config_openbsd) $(if $(subst MINGW32,,$(SYSTEM)),,-Ithird_party/cares/config_windows) -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX -DHAVE_CONFIG_H
 # static library for "cares"
 $(LIBDIR)/$(CONFIG)/libcares.a: $(LIBCARES_OBJS)

data/include/grpc/credentials.h CHANGED Viewed

@@ -656,6 +656,11 @@ grpc_tls_certificate_provider_static_data_create(
  *   be null if no identity credentials are needed.
  * - root_cert_path is the file path to the root certificate bundle. This
  *   may be null if no root certs are needed.
+ * - spiffe_bundle_map_path is the file path to the SPIFFE Bundle Map. If
+ * configured, this will be used to find the roots of trust for a given SPIFFE
+ * domain during verification. See
+ *   https://github.com/grpc/proposal/blob/master/A87-mtls-spiffe-support.md for
+ * more details on SPIFFE verification.
  * - refresh_interval_sec is the refreshing interval that we will check the
  *   files for updates.
  * It does not take ownership of parameters.
@@ -663,7 +668,8 @@ grpc_tls_certificate_provider_static_data_create(
 GRPCAPI grpc_tls_certificate_provider*
 grpc_tls_certificate_provider_file_watcher_create(
     const char* private_key_path, const char* identity_certificate_path,
-    const char* root_cert_path, unsigned int refresh_interval_sec);
+    const char* root_cert_path, const char* spiffe_bundle_map_path,
+    unsigned int refresh_interval_sec);
 /**
  * EXPERIMENTAL API - Subject to change

data/src/core/call/client_call.cc CHANGED Viewed

@@ -127,7 +127,7 @@ ClientCall::ClientCall(grpc_call*, uint32_t, grpc_completion_queue* cq,
 grpc_call_error ClientCall::StartBatch(const grpc_op* ops, size_t nops,
                                        void* notify_tag,
                                        bool is_notify_tag_closure) {
-  GRPC_LATENT_SEE_PARENT_SCOPE("ClientCall::StartBatch");
+  GRPC_LATENT_SEE_SCOPE("ClientCall::StartBatch");
   if (nops == 0) {
     EndOpImmediately(cq_, notify_tag, is_notify_tag_closure);
     return GRPC_CALL_OK;
@@ -183,7 +183,7 @@ void ClientCall::CancelWithError(grpc_error_handle error) {
 template <typename Batch>
 void ClientCall::ScheduleCommittedBatch(Batch batch) {
-  GRPC_LATENT_SEE_INNER_SCOPE("ClientCall::ScheduleCommittedBatch");
+  GRPC_LATENT_SEE_SCOPE("ClientCall::ScheduleCommittedBatch");
   auto cur_state = call_state_.load(std::memory_order_acquire);
   while (true) {
     switch (cur_state) {
@@ -226,7 +226,7 @@ void ClientCall::ScheduleCommittedBatch(Batch batch) {
 Party::WakeupHold ClientCall::StartCall(
     const grpc_op& send_initial_metadata_op) {
-  GRPC_LATENT_SEE_INNER_SCOPE("ClientCall::StartCall");
+  GRPC_LATENT_SEE_SCOPE("ClientCall::StartCall");
   auto cur_state = call_state_.load(std::memory_order_acquire);
   CToMetadata(send_initial_metadata_op.data.send_initial_metadata.metadata,
               send_initial_metadata_op.data.send_initial_metadata.count,
@@ -279,7 +279,7 @@ bool ClientCall::StartCallMaybeUpdateState(uintptr_t& cur_state,
 void ClientCall::CommitBatch(const grpc_op* ops, size_t nops, void* notify_tag,
                              bool is_notify_tag_closure) {
-  GRPC_LATENT_SEE_INNER_SCOPE("ClientCall::CommitBatch");
+  GRPC_LATENT_SEE_SCOPE("ClientCall::CommitBatch");
   if (nops == 1 && ops[0].op == GRPC_OP_SEND_INITIAL_METADATA) {
     StartCall(ops[0]);
     EndOpImmediately(cq_, notify_tag, is_notify_tag_closure);