grpc 1.64.0 → 1.65.0.pre1

data/src/core/{lib/gpr → util}/posix/tmpfile.cc

@@ -31,10 +31,10 @@
 #include <grpc/support/log.h>
 #include <grpc/support/string_util.h>
 
-#include "src/core/lib/gpr/string.h"
-#include "src/core/lib/gpr/tmpfile.h"
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/strerror.h"
+#include "src/core/util/string.h"
+#include "src/core/util/tmpfile.h"
 
 FILE* gpr_tmpfile(const char* prefix, char** tmp_filename) {
   FILE* result = nullptr;

data/src/core/{lib/gpr → util}/spinlock.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_SRC_CORE_LIB_GPR_SPINLOCK_H
-#define GRPC_SRC_CORE_LIB_GPR_SPINLOCK_H
+#ifndef GRPC_SRC_CORE_UTIL_SPINLOCK_H
+#define GRPC_SRC_CORE_UTIL_SPINLOCK_H
 
 #include <grpc/support/port_platform.h>
 
@@ -50,4 +50,4 @@ struct gpr_spinlock {
   do {                          \
   } while (!gpr_spinlock_trylock((lock)))
 
-#endif  // GRPC_SRC_CORE_LIB_GPR_SPINLOCK_H
+#endif  // GRPC_SRC_CORE_UTIL_SPINLOCK_H

data/src/core/{lib/gpr → util}/string.cc

@@ -18,7 +18,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/gpr/string.h"
+#include "src/core/util/string.h"
 
 #include <ctype.h>
 #include <limits.h>
@@ -34,8 +34,8 @@
 #include <grpc/support/log.h>
 #include <grpc/support/string_util.h>
 
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/crash.h"
+#include "src/core/util/useful.h"
 
 char* gpr_strdup(const char* src) {
   char* dst;

data/src/core/{lib/gpr → util}/string.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_SRC_CORE_LIB_GPR_STRING_H
-#define GRPC_SRC_CORE_LIB_GPR_STRING_H
+#ifndef GRPC_SRC_CORE_UTIL_STRING_H
+#define GRPC_SRC_CORE_UTIL_STRING_H
 
 #include <grpc/support/port_platform.h>
 
@@ -109,4 +109,4 @@ void* gpr_memrchr(const void* s, int c, size_t n);
 // Otherwise, it returns false.
 bool gpr_parse_bool_value(const char* value, bool* dst);
 
-#endif  // GRPC_SRC_CORE_LIB_GPR_STRING_H
+#endif  // GRPC_SRC_CORE_UTIL_STRING_H

data/src/core/{lib/gpr → util}/time_precise.cc

@@ -28,8 +28,8 @@
 #include <grpc/support/log.h>
 #include <grpc/support/time.h>
 
-#include "src/core/lib/gpr/time_precise.h"
 #include "src/core/lib/gprpp/crash.h"
+#include "src/core/util/time_precise.h"
 
 #ifndef GPR_CYCLE_COUNTER_CUSTOM
 #if GPR_CYCLE_COUNTER_RDTSC_32 || GPR_CYCLE_COUNTER_RDTSC_64

data/src/core/{lib/gpr → util}/time_precise.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_SRC_CORE_LIB_GPR_TIME_PRECISE_H
-#define GRPC_SRC_CORE_LIB_GPR_TIME_PRECISE_H
+#ifndef GRPC_SRC_CORE_UTIL_TIME_PRECISE_H
+#define GRPC_SRC_CORE_UTIL_TIME_PRECISE_H
 
 #include <grpc/support/port_platform.h>
 
@@ -66,4 +66,4 @@ void gpr_precise_clock_now(gpr_timespec* clk);
 gpr_timespec gpr_cycle_counter_to_time(gpr_cycle_counter cycles);
 gpr_timespec gpr_cycle_counter_sub(gpr_cycle_counter a, gpr_cycle_counter b);
 
-#endif  // GRPC_SRC_CORE_LIB_GPR_TIME_PRECISE_H
+#endif  // GRPC_SRC_CORE_UTIL_TIME_PRECISE_H

data/src/core/{lib/gpr → util}/tmpfile.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_SRC_CORE_LIB_GPR_TMPFILE_H
-#define GRPC_SRC_CORE_LIB_GPR_TMPFILE_H
+#ifndef GRPC_SRC_CORE_UTIL_TMPFILE_H
+#define GRPC_SRC_CORE_UTIL_TMPFILE_H
 
 #include <grpc/support/port_platform.h>
 
@@ -29,4 +29,4 @@
 // unless an error occurs in which case it will be set to NULL.
 FILE* gpr_tmpfile(const char* prefix, char** tmp_filename);
 
-#endif  // GRPC_SRC_CORE_LIB_GPR_TMPFILE_H
+#endif  // GRPC_SRC_CORE_UTIL_TMPFILE_H

data/src/core/{lib/gpr → util}/useful.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_SRC_CORE_LIB_GPR_USEFUL_H
-#define GRPC_SRC_CORE_LIB_GPR_USEFUL_H
+#ifndef GRPC_SRC_CORE_UTIL_USEFUL_H
+#define GRPC_SRC_CORE_UTIL_USEFUL_H
 
 #include <grpc/support/port_platform.h>
 
@@ -181,4 +181,4 @@ inline uint32_t RoundUpToPowerOf2(uint32_t v) {
 
 #define GPR_ARRAY_SIZE(array) (sizeof(array) / sizeof(*(array)))
 
-#endif  // GRPC_SRC_CORE_LIB_GPR_USEFUL_H
+#endif  // GRPC_SRC_CORE_UTIL_USEFUL_H

data/src/core/{lib/gpr → util}/windows/log.cc

@@ -29,11 +29,9 @@
 #include <grpc/support/string_util.h>
 #include <grpc/support/time.h>
 
-#include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/examine_stack.h"
-
-int gpr_should_log_stacktrace(gpr_log_severity severity);
+#include "src/core/util/string.h"
 
 void gpr_log(const char* file, int line, gpr_log_severity severity,
              const char* format, ...) {
@@ -72,45 +70,4 @@ void gpr_log(const char* file, int line, gpr_log_severity severity,
   gpr_free(message);
 }
 
-// Simple starter implementation
-void gpr_platform_log(gpr_log_func_args* args) {
-  const char* final_slash;
-  const char* display_file;
-  char time_buffer[64];
-  time_t timer;
-  gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME);
-  struct tm tm;
-
-  timer = (time_t)now.tv_sec;
-  final_slash = strrchr(args->file, '\\');
-  if (final_slash == NULL)
-    display_file = args->file;
-  else
-    display_file = final_slash + 1;
-
-  if (localtime_s(&tm, &timer)) {
-    strcpy(time_buffer, "error:localtime");
-  } else if (0 ==
-             strftime(time_buffer, sizeof(time_buffer), "%m%d %H:%M:%S", &tm)) {
-    strcpy(time_buffer, "error:strftime");
-  }
-
-  absl::optional<std::string> stack_trace =
-      gpr_should_log_stacktrace(args->severity)
-          ? grpc_core::GetCurrentStackTrace()
-          : absl::nullopt;
-  if (stack_trace) {
-    fprintf(stderr, "%s%s.%09u %5lu %s:%d] %s\n%s\n",
-            gpr_log_severity_string(args->severity), time_buffer,
-            (int)(now.tv_nsec), GetCurrentThreadId(), display_file, args->line,
-            args->message, stack_trace->c_str());
-  } else {
-    fprintf(stderr, "%s%s.%09u %5lu %s:%d] %s\n",
-            gpr_log_severity_string(args->severity), time_buffer,
-            (int)(now.tv_nsec), GetCurrentThreadId(), display_file, args->line,
-            args->message);
-  }
-  fflush(stderr);
-}
-
 #endif  // GPR_WINDOWS_LOG

data/src/core/{lib/gpr → util}/windows/string.cc

@@ -29,7 +29,7 @@
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
 
-#include "src/core/lib/gpr/string.h"
+#include "src/core/util/string.h"
 
 int gpr_asprintf(char** strp, const char* format, ...) {
   va_list args;

data/src/core/{lib/gpr → util}/windows/string_util.cc

@@ -36,8 +36,8 @@
 #include <grpc/support/log_windows.h>
 #include <grpc/support/string_util.h>
 
-#include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gprpp/tchar.h"
+#include "src/core/util/string.h"
 
 char* gpr_format_message(int messageid) {
   LPTSTR tmessage;

data/src/core/{lib/gpr → util}/windows/time.cc

@@ -31,8 +31,8 @@
 #include <grpc/support/log.h>
 #include <grpc/support/time.h>
 
-#include "src/core/lib/gpr/time_precise.h"
 #include "src/core/lib/gprpp/crash.h"
+#include "src/core/util/time_precise.h"
 
 static LARGE_INTEGER g_start_time = []() {
   LARGE_INTEGER x;

data/src/core/{lib/gpr → util}/windows/tmpfile.cc

@@ -29,9 +29,9 @@
 #include <grpc/support/log.h>
 #include <grpc/support/string_util.h>
 
-#include "src/core/lib/gpr/tmpfile.h"
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/tchar.h"
+#include "src/core/util/tmpfile.h"
 
 FILE* gpr_tmpfile(const char* prefix, char** tmp_filename_out) {
   FILE* result = NULL;

data/src/core/xds/grpc/certificate_provider_store.cc

@@ -18,10 +18,10 @@
 
 #include "src/core/xds/grpc/certificate_provider_store.h"
 
+#include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 
 #include <grpc/support/json.h>
-#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 
 #include "src/core/lib/config/core_configuration.h"
@@ -131,8 +131,8 @@ CertificateProviderStore::CreateCertificateProviderLocked(
     // This should never happen since an entry is only inserted in the
     // plugin_config_map_ if the corresponding factory was found when parsing
     // the xDS bootstrap file.
-    gpr_log(GPR_ERROR, "Certificate provider factory %s not found",
-            plugin_config_it->second.plugin_name.c_str());
+    LOG(ERROR) << "Certificate provider factory "
+               << plugin_config_it->second.plugin_name << " not found";
     return nullptr;
   }
   return MakeRefCounted<CertificateProviderWrapper>(

data/src/core/xds/grpc/certificate_provider_store.h

@@ -29,18 +29,18 @@
 #include <grpc/grpc_security.h>
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/gprpp/unique_type_name.h"
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_args.h"
-#include "src/core/lib/json/json_object_loader.h"
 #include "src/core/lib/security/certificate_provider/certificate_provider_factory.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_args.h"
+#include "src/core/util/json/json_object_loader.h"
+#include "src/core/util/useful.h"
 
 namespace grpc_core {
 

data/src/core/xds/grpc/file_watcher_certificate_provider_factory.cc

@@ -23,10 +23,10 @@
 #include <memory>
 #include <vector>
 
+#include "absl/log/log.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 
-#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 
@@ -115,8 +115,8 @@ RefCountedPtr<grpc_tls_certificate_provider>
 FileWatcherCertificateProviderFactory::CreateCertificateProvider(
     RefCountedPtr<CertificateProviderFactory::Config> config) {
   if (config->name() != name()) {
-    gpr_log(GPR_ERROR, "Wrong config type Actual:%s vs Expected:%s",
-            std::string(config->name()).c_str(), std::string(name()).c_str());
+    LOG(ERROR) << "Wrong config type Actual:" << config->name()
+               << " vs Expected:" << name();
     return nullptr;
   }
   auto* file_watcher_config =

data/src/core/xds/grpc/file_watcher_certificate_provider_factory.h

@@ -29,10 +29,10 @@
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_args.h"
-#include "src/core/lib/json/json_object_loader.h"
 #include "src/core/lib/security/certificate_provider/certificate_provider_factory.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_args.h"
+#include "src/core/util/json/json_object_loader.h"
 
 namespace grpc_core {
 

data/src/core/xds/grpc/xds_audit_logger_registry.h

@@ -26,7 +26,7 @@
 #include <grpc/support/port_platform.h>
 
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json.h"
+#include "src/core/util/json/json.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
 
 namespace grpc_core {

data/src/core/xds/grpc/xds_bootstrap_grpc.cc

@@ -37,14 +37,14 @@
 #include <grpc/support/port_platform.h>
 
 #include "src/core/lib/config/core_configuration.h"
-#include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gprpp/env.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_object_loader.h"
-#include "src/core/lib/json/json_reader.h"
-#include "src/core/lib/json/json_writer.h"
 #include "src/core/lib/security/credentials/channel_creds_registry.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_object_loader.h"
+#include "src/core/util/json/json_reader.h"
+#include "src/core/util/json/json_writer.h"
+#include "src/core/util/string.h"
 
 namespace grpc_core {
 

data/src/core/xds/grpc/xds_bootstrap_grpc.h

@@ -31,10 +31,10 @@
 
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_args.h"
-#include "src/core/lib/json/json_object_loader.h"
 #include "src/core/lib/security/credentials/channel_creds_registry.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_args.h"
+#include "src/core/util/json/json_object_loader.h"
 #include "src/core/xds/grpc/certificate_provider_store.h"
 #include "src/core/xds/grpc/xds_audit_logger_registry.h"
 #include "src/core/xds/grpc/xds_cluster_specifier_plugin.h"

data/src/core/xds/grpc/xds_certificate_provider.h

@@ -31,13 +31,13 @@
 #include <grpc/grpc_security.h>
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/gprpp/unique_type_name.h"
 #include "src/core/lib/matchers/matchers.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
+#include "src/core/util/useful.h"
 
 namespace grpc_core {
 

data/src/core/xds/grpc/xds_client_grpc.cc

@@ -24,6 +24,7 @@
 #include <vector>
 
 #include "absl/base/thread_annotations.h"
+#include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
@@ -40,7 +41,6 @@
 #include <grpc/support/string_util.h>
 
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/channel/metrics.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/gprpp/debug_location.h"
@@ -55,6 +55,7 @@
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/transport/error_utils.h"
+#include "src/core/telemetry/metrics.h"
 #include "src/core/xds/grpc/upb_utils.h"
 #include "src/core/xds/grpc/xds_bootstrap_grpc.h"
 #include "src/core/xds/grpc/xds_transport_grpc.h"
@@ -99,20 +100,20 @@ const auto kMetricResourceUpdatesValid =
         "EXPERIMENTAL.  A counter of resources received that were considered "
         "valid.  The counter will be incremented even for resources that "
         "have not changed.",
-        "{resource}",
-        {kMetricLabelTarget, kMetricLabelXdsServer,
-         kMetricLabelXdsResourceType},
-        {}, false);
+        "{resource}", false)
+        .Labels(kMetricLabelTarget, kMetricLabelXdsServer,
+                kMetricLabelXdsResourceType)
+        .Build();
 
 const auto kMetricResourceUpdatesInvalid =
     GlobalInstrumentsRegistry::RegisterUInt64Counter(
         "grpc.xds_client.resource_updates_invalid",
         "EXPERIMENTAL.  A counter of resources received that were considered "
         "invalid.",
-        "{resource}",
-        {kMetricLabelTarget, kMetricLabelXdsServer,
-         kMetricLabelXdsResourceType},
-        {}, false);
+        "{resource}", false)
+        .Labels(kMetricLabelTarget, kMetricLabelXdsServer,
+                kMetricLabelXdsResourceType)
+        .Build();
 
 const auto kMetricServerFailure =
     GlobalInstrumentsRegistry::RegisterUInt64Counter(
@@ -121,7 +122,9 @@ const auto kMetricServerFailure =
         "unhealthy.  A server goes unhealthy when we have a connectivity "
         "failure or when the ADS stream fails without seeing a response "
         "message, as per gRFC A57.",
-        "{failure}", {kMetricLabelTarget, kMetricLabelXdsServer}, {}, false);
+        "{failure}", false)
+        .Labels(kMetricLabelTarget, kMetricLabelXdsServer)
+        .Build();
 
 const auto kMetricConnected =
     GlobalInstrumentsRegistry::RegisterCallbackInt64Gauge(
@@ -132,15 +135,17 @@ const auto kMetricConnected =
         "ADS stream fails without seeing a response message, as per gRFC "
         "A57.  It will be set to 1 when we receive the first response on "
         "an ADS stream.",
-        "{bool}", {kMetricLabelTarget, kMetricLabelXdsServer}, {}, false);
+        "{bool}", false)
+        .Labels(kMetricLabelTarget, kMetricLabelXdsServer)
+        .Build();
 
 const auto kMetricResources =
     GlobalInstrumentsRegistry::RegisterCallbackInt64Gauge(
         "grpc.xds_client.resources", "EXPERIMENTAL.  Number of xDS resources.",
-        "{resource}",
-        {kMetricLabelTarget, kMetricLabelXdsAuthority,
-         kMetricLabelXdsResourceType, kMetricLabelXdsCacheState},
-        {}, false);
+        "{resource}", false)
+        .Labels(kMetricLabelTarget, kMetricLabelXdsAuthority,
+                kMetricLabelXdsResourceType, kMetricLabelXdsCacheState)
+        .Build();
 
 }  // namespace
 
@@ -193,7 +198,7 @@ absl::StatusOr<std::string> GetBootstrapContents(const char* fallback_config) {
   // First, try GRPC_XDS_BOOTSTRAP env var.
   auto path = GetEnv("GRPC_XDS_BOOTSTRAP");
   if (path.has_value()) {
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(xds_client)) {
       gpr_log(GPR_INFO,
               "Got bootstrap file location from GRPC_XDS_BOOTSTRAP "
               "environment variable: %s",
@@ -206,7 +211,7 @@ absl::StatusOr<std::string> GetBootstrapContents(const char* fallback_config) {
   // Next, try GRPC_XDS_BOOTSTRAP_CONFIG env var.
   auto env_config = GetEnv("GRPC_XDS_BOOTSTRAP_CONFIG");
   if (env_config.has_value()) {
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(xds_client)) {
       gpr_log(GPR_INFO,
               "Got bootstrap contents from GRPC_XDS_BOOTSTRAP_CONFIG "
               "environment variable");
@@ -215,9 +220,8 @@ absl::StatusOr<std::string> GetBootstrapContents(const char* fallback_config) {
   }
   // Finally, try fallback config.
   if (fallback_config != nullptr) {
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) {
-      gpr_log(GPR_INFO, "Got bootstrap contents from fallback config");
-    }
+    GRPC_TRACE_LOG(xds_client, INFO)
+        << "Got bootstrap contents from fallback config";
     return fallback_config;
   }
   // No bootstrap config found.
@@ -256,7 +260,7 @@ absl::StatusOr<RefCountedPtr<GrpcXdsClient>> GrpcXdsClient::GetOrCreate(
   // Find bootstrap contents.
   auto bootstrap_contents = GetBootstrapContents(g_fallback_bootstrap_config);
   if (!bootstrap_contents.ok()) return bootstrap_contents.status();
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_client)) {
     gpr_log(GPR_INFO, "xDS bootstrap contents: %s",
             bootstrap_contents->c_str());
   }
@@ -269,7 +273,7 @@ absl::StatusOr<RefCountedPtr<GrpcXdsClient>> GrpcXdsClient::GetOrCreate(
       key, std::move(*bootstrap), channel_args,
       MakeOrphanable<GrpcXdsTransportFactory>(channel_args));
   g_xds_client_map->emplace(xds_client->key(), xds_client.get());
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_client)) {
     gpr_log(GPR_INFO, "[xds_client %p] Created xDS client for key %s",
             xds_client.get(), std::string(key).c_str());
   }
@@ -316,7 +320,7 @@ GrpcXdsClient::GrpcXdsClient(
           [this](CallbackMetricReporter& reporter) {
             ReportCallbackMetrics(reporter);
           },
-          {kMetricConnected, kMetricResources})) {}
+          Duration::Seconds(5), kMetricConnected, kMetricResources)) {}
 
 void GrpcXdsClient::Orphaned() {
   registered_metric_callback_.reset();

data/src/core/xds/grpc/xds_client_grpc.h

@@ -26,12 +26,12 @@
 #include <grpc/support/port_platform.h>
 
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/channel/metrics.h"
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/telemetry/metrics.h"
+#include "src/core/util/useful.h"
 #include "src/core/xds/grpc/certificate_provider_store.h"
 #include "src/core/xds/grpc/xds_bootstrap_grpc.h"
 #include "src/core/xds/xds_client/xds_client.h"

data/src/core/xds/grpc/xds_cluster.cc

@@ -63,9 +63,9 @@
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json_writer.h"
 #include "src/core/lib/matchers/matchers.h"
 #include "src/core/load_balancing/lb_policy_registry.h"
+#include "src/core/util/json/json_writer.h"
 #include "src/core/xds/grpc/upb_utils.h"
 #include "src/core/xds/grpc/xds_common_types.h"
 #include "src/core/xds/grpc/xds_lb_policy_registry.h"
@@ -754,8 +754,7 @@ absl::StatusOr<std::shared_ptr<const XdsClusterResource>> CdsResourceParse(
 
 void MaybeLogCluster(const XdsResourceType::DecodeContext& context,
                      const envoy_config_cluster_v3_Cluster* cluster) {
-  if (GRPC_TRACE_FLAG_ENABLED(*context.tracer) &&
-      gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) {
+  if (GRPC_TRACE_FLAG_ENABLED_OBJ(*context.tracer) && ABSL_VLOG_IS_ON(2)) {
     const upb_MessageDef* msg_type =
         envoy_config_cluster_v3_Cluster_getmsgdef(context.symtab);
     char buf[10240];
@@ -785,14 +784,14 @@ XdsResourceType::DecodeResult XdsClusterResourceType::Decode(
       UpbStringToStdString(envoy_config_cluster_v3_Cluster_name(resource));
   auto cds_resource = CdsResourceParse(context, resource);
   if (!cds_resource.ok()) {
-    if (GRPC_TRACE_FLAG_ENABLED(*context.tracer)) {
+    if (GRPC_TRACE_FLAG_ENABLED_OBJ(*context.tracer)) {
       gpr_log(GPR_ERROR, "[xds_client %p] invalid Cluster %s: %s",
               context.client, result.name->c_str(),
               cds_resource.status().ToString().c_str());
     }
     result.resource = cds_resource.status();
   } else {
-    if (GRPC_TRACE_FLAG_ENABLED(*context.tracer)) {
+    if (GRPC_TRACE_FLAG_ENABLED_OBJ(*context.tracer)) {
       gpr_log(GPR_INFO, "[xds_client %p] parsed Cluster %s: %s", context.client,
               result.name->c_str(), (*cds_resource)->ToString().c_str());
     }

data/src/core/xds/grpc/xds_cluster.h

@@ -35,8 +35,8 @@
 #include <grpc/support/json.h>
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/json/json.h"
 #include "src/core/load_balancing/outlier_detection/outlier_detection.h"
+#include "src/core/util/json/json.h"
 #include "src/core/xds/grpc/xds_bootstrap_grpc.h"
 #include "src/core/xds/grpc/xds_common_types.h"
 #include "src/core/xds/grpc/xds_health_status.h"

data/src/core/xds/grpc/xds_cluster_specifier_plugin.cc

@@ -33,8 +33,8 @@
 #include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_reader.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_reader.h"
 #include "src/proto/grpc/lookup/v1/rls_config.upb.h"
 #include "src/proto/grpc/lookup/v1/rls_config.upbdefs.h"
 

data/src/core/xds/grpc/xds_cluster_specifier_plugin.h

@@ -28,7 +28,7 @@
 #include <grpc/support/port_platform.h>
 
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json.h"
+#include "src/core/util/json/json.h"
 #include "src/core/xds/grpc/xds_common_types.h"
 
 namespace grpc_core {

data/src/core/xds/grpc/xds_common_types.cc

@@ -44,7 +44,7 @@
 #include <grpc/support/json.h>
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/json/json_reader.h"
+#include "src/core/util/json/json_reader.h"
 #include "src/core/xds/grpc/upb_utils.h"
 #include "src/core/xds/grpc/xds_bootstrap_grpc.h"
 #include "src/core/xds/xds_client/xds_client.h"

data/src/core/xds/grpc/xds_common_types.h

@@ -31,8 +31,8 @@
 
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json.h"
 #include "src/core/lib/matchers/matchers.h"
+#include "src/core/util/json/json.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
 
 namespace grpc_core {