diff --git a/src/core/ext/xds/xds_client.cc b/src/core/ext/xds/xds_client.cc index 8ac086acf32..1e199f799dd 100644 --- a/src/core/ext/xds/xds_client.cc +++ b/src/core/ext/xds/xds_client.cc @@ -66,6 +66,7 @@ namespace grpc_core { TraceFlag grpc_xds_client_trace(false, "xds_client"); +TraceFlag grpc_xds_client_refcount_trace(false, "xds_client_refcount"); namespace { @@ -460,8 +461,9 @@ grpc_channel* CreateXdsChannel(const XdsBootstrap::XdsServer& server) { XdsClient::ChannelState::ChannelState(WeakRefCountedPtr xds_client, const XdsBootstrap::XdsServer& server) : InternallyRefCounted( - GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace) ? "ChannelState" - : nullptr), + GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_refcount_trace) + ? "ChannelState" + : nullptr), xds_client_(std::move(xds_client)), server_(server) { if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) { @@ -668,8 +670,9 @@ void XdsClient::ChannelState::RetryableCall::OnRetryTimerLocked( XdsClient::ChannelState::AdsCallState::AdsCallState( RefCountedPtr> parent) : InternallyRefCounted( - GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace) ? "AdsCallState" - : nullptr), + GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_refcount_trace) + ? "AdsCallState" + : nullptr), parent_(std::move(parent)) { // Init the ADS call. Note that the call will progress every time there's // activity in xds_client()->interested_parties_, which is comprised of @@ -1420,8 +1423,9 @@ bool XdsClient::ChannelState::LrsCallState::Reporter::OnReportDoneLocked( XdsClient::ChannelState::LrsCallState::LrsCallState( RefCountedPtr> parent) : InternallyRefCounted( - GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace) ? "LrsCallState" - : nullptr), + GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_refcount_trace) + ? "LrsCallState" + : nullptr), parent_(std::move(parent)) { // Init the LRS call. Note that the call will progress every time there's // activity in xds_client()->interested_parties_, which is comprised of @@ -1732,9 +1736,9 @@ grpc_millis GetRequestTimeout() { } // namespace XdsClient::XdsClient(grpc_error** error) - : DualRefCounted(GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace) - ? "XdsClient" - : nullptr), + : DualRefCounted( + GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_refcount_trace) ? "XdsClient" + : nullptr), request_timeout_(GetRequestTimeout()), interested_parties_(grpc_pollset_set_create()), bootstrap_( diff --git a/src/core/ext/xds/xds_client.h b/src/core/ext/xds/xds_client.h index 2f7ce13e8fc..754173be92b 100644 --- a/src/core/ext/xds/xds_client.h +++ b/src/core/ext/xds/xds_client.h @@ -40,6 +40,7 @@ namespace grpc_core { extern TraceFlag grpc_xds_client_trace; +extern TraceFlag grpc_xds_client_refcount_trace; class XdsClient : public DualRefCounted { public: diff --git a/src/core/ext/xds/xds_client_stats.cc b/src/core/ext/xds/xds_client_stats.cc index 72cae4dfd40..de401a7b290 100644 --- a/src/core/ext/xds/xds_client_stats.cc +++ b/src/core/ext/xds/xds_client_stats.cc @@ -45,7 +45,7 @@ XdsClusterDropStats::XdsClusterDropStats(RefCountedPtr xds_client, absl::string_view lrs_server_name, absl::string_view cluster_name, absl::string_view eds_service_name) - : RefCounted(GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace) + : RefCounted(GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_refcount_trace) ? "XdsClusterDropStats" : nullptr), xds_client_(std::move(xds_client)), @@ -98,7 +98,7 @@ XdsClusterLocalityStats::XdsClusterLocalityStats( RefCountedPtr xds_client, absl::string_view lrs_server_name, absl::string_view cluster_name, absl::string_view eds_service_name, RefCountedPtr name) - : RefCounted(GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace) + : RefCounted(GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_refcount_trace) ? "XdsClusterLocalityStats" : nullptr), xds_client_(std::move(xds_client)),