grpc 1.63.0 → 1.65.2

data/src/core/{lib/http → util/http_client}/format_request.h

@@ -16,14 +16,14 @@
 //
 //
 
-#ifndef GRPC_SRC_CORE_LIB_HTTP_FORMAT_REQUEST_H
-#define GRPC_SRC_CORE_LIB_HTTP_FORMAT_REQUEST_H
+#ifndef GRPC_SRC_CORE_UTIL_HTTP_CLIENT_FORMAT_REQUEST_H
+#define GRPC_SRC_CORE_UTIL_HTTP_CLIENT_FORMAT_REQUEST_H
 
 #include <grpc/support/port_platform.h>
 
 #include <grpc/slice.h>
 
-#include "src/core/lib/http/parser.h"
+#include "src/core/util/http_client/parser.h"
 
 grpc_slice grpc_httpcli_format_get_request(const grpc_http_request* request,
                                            const char* host, const char* path);
@@ -35,4 +35,4 @@ grpc_slice grpc_httpcli_format_connect_request(const grpc_http_request* request,
                                                const char* host,
                                                const char* path);
 
-#endif  // GRPC_SRC_CORE_LIB_HTTP_FORMAT_REQUEST_H
+#endif  // GRPC_SRC_CORE_UTIL_HTTP_CLIENT_FORMAT_REQUEST_H

data/src/core/{lib/http → util/http_client}/httpcli.cc

@@ -18,7 +18,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/http/httpcli.h"
+#include "src/core/util/http_client/httpcli.h"
 
 #include <limits.h>
 
@@ -26,6 +26,7 @@
 #include <utility>
 
 #include "absl/functional/bind_front.h"
+#include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
 
@@ -34,13 +35,13 @@
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 
+#include "src/core/handshaker/handshaker_registry.h"
+#include "src/core/handshaker/tcp_connect/tcp_connect_handshaker.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_args_preconditioning.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/gprpp/status_helper.h"
-#include "src/core/lib/http/format_request.h"
-#include "src/core/lib/http/parser.h"
 #include "src/core/lib/iomgr/endpoint.h"
 #include "src/core/lib/iomgr/iomgr_internal.h"
 #include "src/core/lib/iomgr/pollset_set.h"
@@ -50,8 +51,8 @@
 #include "src/core/lib/security/security_connector/security_connector.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/transport/error_utils.h"
-#include "src/core/lib/transport/handshaker_registry.h"
-#include "src/core/lib/transport/tcp_connect_handshaker.h"
+#include "src/core/util/http_client/format_request.h"
+#include "src/core/util/http_client/parser.h"
 
 namespace grpc_core {
 
@@ -184,7 +185,7 @@ HttpRequest::HttpRequest(
   GRPC_CLOSURE_INIT(&continue_done_write_after_schedule_on_exec_ctx_,
                     ContinueDoneWriteAfterScheduleOnExecCtx, this,
                     grpc_schedule_on_exec_ctx);
-  GPR_ASSERT(pollent);
+  CHECK(pollent);
   grpc_polling_entity_add_to_pollset_set(pollent, pollset_set_);
 }
 
@@ -217,7 +218,7 @@ void HttpRequest::Start() {
 void HttpRequest::Orphan() {
   {
     MutexLock lock(&mu_);
-    GPR_ASSERT(!cancelled_);
+    CHECK(!cancelled_);
     cancelled_ = true;
     // cancel potentially pending DNS resolution.
     if (dns_request_handle_.has_value() &&
@@ -231,7 +232,8 @@ void HttpRequest::Orphan() {
           GRPC_ERROR_CREATE("HTTP request cancelled during handshake"));
     }
     if (own_endpoint_ && ep_ != nullptr) {
-      grpc_endpoint_shutdown(ep_, GRPC_ERROR_CREATE("HTTP request cancelled"));
+      grpc_endpoint_destroy(ep_);
+      ep_ = nullptr;
     }
   }
   Unref();
@@ -243,11 +245,8 @@ void HttpRequest::AppendError(grpc_error_handle error) {
   }
   const grpc_resolved_address* addr = &addresses_[next_address_ - 1];
   auto addr_text = grpc_sockaddr_to_uri(addr);
-  overall_error_ = grpc_error_add_child(
-      overall_error_,
-      grpc_error_set_str(
-          error, StatusStrProperty::kTargetAddress,
-          addr_text.ok() ? addr_text.value() : addr_text.status().ToString()));
+  if (addr_text.ok()) error = AddMessagePrefix(*addr_text, std::move(error));
+  overall_error_ = grpc_error_add_child(overall_error_, std::move(error));
 }
 
 void HttpRequest::OnReadInternal(grpc_error_handle error) {

data/src/core/{lib/http → util/http_client}/httpcli.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_SRC_CORE_LIB_HTTP_HTTPCLI_H
-#define GRPC_SRC_CORE_LIB_HTTP_HTTPCLI_H
+#ifndef GRPC_SRC_CORE_UTIL_HTTP_CLIENT_HTTPCLI_H
+#define GRPC_SRC_CORE_UTIL_HTTP_CLIENT_HTTPCLI_H
 
 #include <grpc/support/port_platform.h>
 
@@ -35,12 +35,12 @@
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
 
+#include "src/core/handshaker/handshaker.h"
 #include "src/core/lib/gprpp/debug_location.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/time.h"
-#include "src/core/lib/http/parser.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/endpoint.h"
 #include "src/core/lib/iomgr/error.h"
@@ -51,8 +51,8 @@
 #include "src/core/lib/iomgr/resolve_address.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
-#include "src/core/lib/transport/handshaker.h"
 #include "src/core/lib/uri/uri_parser.h"
+#include "src/core/util/http_client/parser.h"
 
 // User agent this library reports
 #define GRPC_HTTPCLI_USER_AGENT "grpc-httpcli/0.0"
@@ -265,4 +265,4 @@ class HttpRequest : public InternallyRefCounted<HttpRequest> {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_HTTP_HTTPCLI_H
+#endif  // GRPC_SRC_CORE_UTIL_HTTP_CLIENT_HTTPCLI_H

data/src/core/{lib/http → util/http_client}/httpcli_security_connector.cc

@@ -22,18 +22,21 @@
 
 #include <string>
 
+#include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 
+#include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
 #include <grpc/support/string_util.h>
 
+#include "src/core/handshaker/handshaker.h"
+#include "src/core/handshaker/security/security_handshaker.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
@@ -48,8 +51,6 @@
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/security/security_connector/security_connector.h"
 #include "src/core/lib/security/security_connector/ssl_utils.h"
-#include "src/core/lib/security/transport/security_handshaker.h"
-#include "src/core/lib/transport/handshaker.h"
 #include "src/core/tsi/ssl_transport_security.h"
 #include "src/core/tsi/transport_security_interface.h"
 
@@ -94,8 +95,8 @@ class grpc_httpcli_ssl_channel_security_connector final
           handshaker_factory_, secure_peer_name_, /*network_bio_buf_size=*/0,
           /*ssl_bio_buf_size=*/0, &handshaker);
       if (result != TSI_OK) {
-        gpr_log(GPR_ERROR, "Handshaker creation failed with error %s.",
-                tsi_result_to_string(result));
+        LOG(ERROR) << "Handshaker creation failed with error "
+                   << tsi_result_to_string(result);
       }
     }
     handshake_mgr->Add(SecurityHandshakerCreate(handshaker, this, args));
@@ -148,8 +149,7 @@ httpcli_ssl_channel_security_connector_create(
     const char* pem_root_certs, const tsi_ssl_root_certs_store* root_store,
     const char* secure_peer_name) {
   if (secure_peer_name != nullptr && pem_root_certs == nullptr) {
-    gpr_log(GPR_ERROR,
-            "Cannot assert a secure peer name without a trust root.");
+    LOG(ERROR) << "Cannot assert a secure peer name without a trust root.";
     return nullptr;
   }
   RefCountedPtr<grpc_httpcli_ssl_channel_security_connector> c =
@@ -157,8 +157,8 @@ httpcli_ssl_channel_security_connector_create(
           secure_peer_name == nullptr ? nullptr : gpr_strdup(secure_peer_name));
   tsi_result result = c->InitHandshakerFactory(pem_root_certs, root_store);
   if (result != TSI_OK) {
-    gpr_log(GPR_ERROR, "Handshaker factory creation failed with %s.",
-            tsi_result_to_string(result));
+    LOG(ERROR) << "Handshaker factory creation failed with "
+               << tsi_result_to_string(result);
     return nullptr;
   }
   return c;
@@ -173,7 +173,7 @@ class HttpRequestSSLCredentials : public grpc_channel_credentials {
     const tsi_ssl_root_certs_store* root_store =
         DefaultSslRootStore::GetRootStore();
     if (root_store == nullptr) {
-      gpr_log(GPR_ERROR, "Could not get default pem root certs.");
+      LOG(ERROR) << "Could not get default pem root certs.";
       return nullptr;
     }
     absl::optional<std::string> target_string =

data/src/core/{lib/http → util/http_client}/httpcli_ssl_credentials.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_LIB_HTTP_HTTPCLI_SSL_CREDENTIALS_H
-#define GRPC_SRC_CORE_LIB_HTTP_HTTPCLI_SSL_CREDENTIALS_H
+#ifndef GRPC_SRC_CORE_UTIL_HTTP_CLIENT_HTTPCLI_SSL_CREDENTIALS_H
+#define GRPC_SRC_CORE_UTIL_HTTP_CLIENT_HTTPCLI_SSL_CREDENTIALS_H
 
 #include <grpc/support/port_platform.h>
 
@@ -36,4 +36,4 @@ RefCountedPtr<grpc_channel_credentials> CreateHttpRequestSSLCredentials();
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_HTTP_HTTPCLI_SSL_CREDENTIALS_H
+#endif  // GRPC_SRC_CORE_UTIL_HTTP_CLIENT_HTTPCLI_SSL_CREDENTIALS_H

data/src/core/{lib/http → util/http_client}/parser.cc

@@ -18,19 +18,18 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/http/parser.h"
+#include "src/core/util/http_client/parser.h"
 
 #include <string.h>
 
 #include <algorithm>
 
+#include "absl/log/check.h"
 #include "absl/status/status.h"
 
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 
-grpc_core::TraceFlag grpc_http1_trace(false, "http1");
-
 static char* buf2str(void* buffer, size_t length) {
   char* out = static_cast<char*>(gpr_malloc(length + 1));
   memcpy(out, buffer, length);
@@ -178,7 +177,7 @@ static grpc_error_handle add_header(grpc_http_parser* parser) {
   grpc_http_header hdr = {nullptr, nullptr};
   grpc_error_handle error;
 
-  GPR_ASSERT(cur != end);
+  CHECK(cur != end);
 
   if (*cur == ' ' || *cur == '\t') {
     error = GRPC_ERROR_CREATE("Continued header lines not supported yet");
@@ -192,14 +191,14 @@ static grpc_error_handle add_header(grpc_http_parser* parser) {
     error = GRPC_ERROR_CREATE("Didn't find ':' in header string");
     goto done;
   }
-  GPR_ASSERT(cur >= beg);
+  CHECK(cur >= beg);
   hdr.key = buf2str(beg, static_cast<size_t>(cur - beg));
   cur++;  // skip :
 
   while (cur != end && (*cur == ' ' || *cur == '\t')) {
     cur++;
   }
-  GPR_ASSERT((size_t)(end - cur) >= parser->cur_line_end_length);
+  CHECK((size_t)(end - cur) >= parser->cur_line_end_length);
   size = static_cast<size_t>(end - cur) - parser->cur_line_end_length;
   if ((size != 0) && (cur[size - 1] == '\r')) {
     size--;
@@ -377,7 +376,7 @@ static grpc_error_handle addbyte(grpc_http_parser* parser, uint8_t byte,
     case GRPC_HTTP_HEADERS:
     case GRPC_HTTP_TRAILERS:
       if (parser->cur_line_length >= GRPC_HTTP_PARSER_MAX_HEADER_LENGTH) {
-        if (GRPC_TRACE_FLAG_ENABLED(grpc_http1_trace)) {
+        if (GRPC_TRACE_FLAG_ENABLED(http1)) {
           gpr_log(GPR_ERROR, "HTTP header max line length (%d) exceeded",
                   GRPC_HTTP_PARSER_MAX_HEADER_LENGTH);
         }

data/src/core/{lib/http → util/http_client}/parser.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_SRC_CORE_LIB_HTTP_PARSER_H
-#define GRPC_SRC_CORE_LIB_HTTP_PARSER_H
+#ifndef GRPC_SRC_CORE_UTIL_HTTP_CLIENT_PARSER_H
+#define GRPC_SRC_CORE_UTIL_HTTP_CLIENT_PARSER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -125,6 +125,4 @@ grpc_error_handle grpc_http_parser_eof(grpc_http_parser* parser);
 void grpc_http_request_destroy(grpc_http_request* request);
 void grpc_http_response_destroy(grpc_http_response* response);
 
-extern grpc_core::TraceFlag grpc_http1_trace;
-
-#endif  // GRPC_SRC_CORE_LIB_HTTP_PARSER_H
+#endif  // GRPC_SRC_CORE_UTIL_HTTP_CLIENT_PARSER_H

data/src/core/{lib → util}/json/json.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_LIB_JSON_JSON_H
-#define GRPC_SRC_CORE_LIB_JSON_JSON_H
+#ifndef GRPC_SRC_CORE_UTIL_JSON_JSON_H
+#define GRPC_SRC_CORE_UTIL_JSON_JSON_H
 
 #include <grpc/support/port_platform.h>
 
@@ -27,4 +27,4 @@ using Json = experimental::Json;
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_JSON_JSON_H
+#endif  // GRPC_SRC_CORE_UTIL_JSON_JSON_H

data/src/core/{lib → util}/json/json_args.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_SRC_CORE_LIB_JSON_JSON_ARGS_H
-#define GRPC_SRC_CORE_LIB_JSON_JSON_ARGS_H
+#ifndef GRPC_SRC_CORE_UTIL_JSON_JSON_ARGS_H
+#define GRPC_SRC_CORE_UTIL_JSON_JSON_ARGS_H
 
 #include <grpc/support/port_platform.h>
 
@@ -31,4 +31,4 @@ class JsonArgs {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_JSON_JSON_ARGS_H
+#endif  // GRPC_SRC_CORE_UTIL_JSON_JSON_ARGS_H

data/src/core/{lib → util}/json/json_channel_args.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_SRC_CORE_LIB_JSON_JSON_CHANNEL_ARGS_H
-#define GRPC_SRC_CORE_LIB_JSON_JSON_CHANNEL_ARGS_H
+#ifndef GRPC_SRC_CORE_UTIL_JSON_JSON_CHANNEL_ARGS_H
+#define GRPC_SRC_CORE_UTIL_JSON_JSON_CHANNEL_ARGS_H
 
 #include <grpc/support/port_platform.h>
 
@@ -21,7 +21,7 @@
 #include "absl/types/optional.h"
 
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/json/json_args.h"
+#include "src/core/util/json/json_args.h"
 
 namespace grpc_core {
 
@@ -39,4 +39,4 @@ class JsonChannelArgs : public JsonArgs {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_JSON_JSON_CHANNEL_ARGS_H
+#endif  // GRPC_SRC_CORE_UTIL_JSON_JSON_CHANNEL_ARGS_H

data/src/core/{lib → util}/json/json_object_loader.cc

@@ -14,7 +14,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/json/json_object_loader.h"
+#include "src/core/util/json/json_object_loader.h"
 
 #include <utility>
 

data/src/core/{lib → util}/json/json_object_loader.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_SRC_CORE_LIB_JSON_JSON_OBJECT_LOADER_H
-#define GRPC_SRC_CORE_LIB_JSON_JSON_OBJECT_LOADER_H
+#ifndef GRPC_SRC_CORE_UTIL_JSON_JSON_OBJECT_LOADER_H
+#define GRPC_SRC_CORE_UTIL_JSON_JSON_OBJECT_LOADER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -36,8 +36,8 @@
 #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/util/json/json.h"
+#include "src/core/util/json/json_args.h"
 
 // Provides a means to load JSON objects into C++ objects, with the aim of
 // minimizing object code size.
@@ -642,4 +642,4 @@ absl::optional<T> LoadJsonObjectField(const Json::Object& json,
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_JSON_JSON_OBJECT_LOADER_H
+#endif  // GRPC_SRC_CORE_UTIL_JSON_JSON_OBJECT_LOADER_H

data/src/core/{lib → util}/json/json_reader.cc

@@ -26,6 +26,7 @@
 #include <vector>
 
 #include "absl/base/attributes.h"
+#include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
@@ -38,7 +39,7 @@
 #include <grpc/support/log.h>
 
 #include "src/core/lib/gprpp/match.h"
-#include "src/core/lib/json/json.h"
+#include "src/core/util/json/json.h"
 
 #define GRPC_JSON_MAX_DEPTH 255
 #define GRPC_JSON_MAX_ERRORS 16
@@ -280,14 +281,14 @@ bool JsonReader::StartContainer(Json::Type type) {
   if (type == Json::Type::kObject) {
     scope.data = Json::Object();
   } else {
-    GPR_ASSERT(type == Json::Type::kArray);
+    CHECK(type == Json::Type::kArray);
     scope.data = Json::Array();
   }
   return true;
 }
 
 void JsonReader::EndContainer() {
-  GPR_ASSERT(!stack_.empty());
+  CHECK(!stack_.empty());
   Scope scope = std::move(stack_.back());
   stack_.pop_back();
   key_ = std::move(scope.parent_object_key);

data/src/core/{lib → util}/json/json_reader.h

@@ -14,15 +14,15 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_LIB_JSON_JSON_READER_H
-#define GRPC_SRC_CORE_LIB_JSON_JSON_READER_H
+#ifndef GRPC_SRC_CORE_UTIL_JSON_JSON_READER_H
+#define GRPC_SRC_CORE_UTIL_JSON_JSON_READER_H
 
 #include <grpc/support/port_platform.h>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 
-#include "src/core/lib/json/json.h"
+#include "src/core/util/json/json.h"
 
 namespace grpc_core {
 
@@ -31,4 +31,4 @@ absl::StatusOr<Json> JsonParse(absl::string_view json_str);
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_JSON_JSON_READER_H
+#endif  // GRPC_SRC_CORE_UTIL_JSON_JSON_READER_H

data/src/core/{lib → util}/json/json_util.cc

@@ -18,12 +18,12 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/json/json_util.h"
+#include "src/core/util/json/json_util.h"
 
 #include "src/core/lib/gprpp/no_destruct.h"
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json_args.h"
-#include "src/core/lib/json/json_object_loader.h"
+#include "src/core/util/json/json_args.h"
+#include "src/core/util/json/json_object_loader.h"
 
 namespace grpc_core {
 

data/src/core/{lib → util}/json/json_util.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_SRC_CORE_LIB_JSON_JSON_UTIL_H
-#define GRPC_SRC_CORE_LIB_JSON_JSON_UTIL_H
+#ifndef GRPC_SRC_CORE_UTIL_JSON_JSON_UTIL_H
+#define GRPC_SRC_CORE_UTIL_JSON_JSON_UTIL_H
 
 #include <grpc/support/port_platform.h>
 
@@ -34,7 +34,7 @@
 
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/iomgr/error.h"
-#include "src/core/lib/json/json.h"
+#include "src/core/util/json/json.h"
 
 namespace grpc_core {
 
@@ -161,4 +161,4 @@ bool ParseJsonObjectFieldAsDuration(const Json::Object& object,
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_JSON_JSON_UTIL_H
+#endif  // GRPC_SRC_CORE_UTIL_JSON_JSON_UTIL_H

data/src/core/{lib → util}/json/json_writer.cc

@@ -28,7 +28,7 @@
 
 #include "absl/strings/string_view.h"
 
-#include "src/core/lib/json/json.h"
+#include "src/core/util/json/json.h"
 
 namespace grpc_core {
 

data/src/core/{lib → util}/json/json_writer.h

@@ -14,14 +14,14 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_LIB_JSON_JSON_WRITER_H
-#define GRPC_SRC_CORE_LIB_JSON_JSON_WRITER_H
+#ifndef GRPC_SRC_CORE_UTIL_JSON_JSON_WRITER_H
+#define GRPC_SRC_CORE_UTIL_JSON_JSON_WRITER_H
 
 #include <grpc/support/port_platform.h>
 
 #include <string>
 
-#include "src/core/lib/json/json.h"
+#include "src/core/util/json/json.h"
 
 namespace grpc_core {
 
@@ -30,4 +30,4 @@ std::string JsonDump(const Json& json, int indent = 0);
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_JSON_JSON_WRITER_H
+#endif  // GRPC_SRC_CORE_UTIL_JSON_JSON_WRITER_H

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

@@ -47,10 +47,6 @@
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/examine_stack.h"
 
-int gpr_should_log_stacktrace(gpr_log_severity severity);
-
-static long sys_gettid(void) { return syscall(__NR_gettid); }
-
 void gpr_log(const char* file, int line, gpr_log_severity severity,
              const char* format, ...) {
   // Avoid message construction if gpr_log_message won't log
@@ -70,45 +66,4 @@ void gpr_log(const char* file, int line, gpr_log_severity severity,
   free(message);
 }
 
-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;
-  static thread_local long tid(0);
-  if (tid == 0) tid = sys_gettid();
-
-  timer = static_cast<time_t>(now.tv_sec);
-  final_slash = strrchr(args->file, '/');
-  if (final_slash == nullptr) {
-    display_file = args->file;
-  } else {
-    display_file = final_slash + 1;
-  }
-
-  if (!localtime_r(&timer, &tm)) {
-    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");
-  }
-
-  std::string prefix = absl::StrFormat(
-      "%s%s.%09" PRId32 " %7ld %s:%d]", gpr_log_severity_string(args->severity),
-      time_buffer, now.tv_nsec, tid, display_file, args->line);
-
-  absl::optional<std::string> stack_trace =
-      gpr_should_log_stacktrace(args->severity)
-          ? grpc_core::GetCurrentStackTrace()
-          : absl::nullopt;
-  if (stack_trace) {
-    fprintf(stderr, "%-70s %s\n%s\n", prefix.c_str(), args->message,
-            stack_trace->c_str());
-  } else {
-    fprintf(stderr, "%-70s %s\n", prefix.c_str(), args->message);
-  }
-}
-
 #endif  // GPR_LINUX_LOG