grpc 1.74.0 → 1.75.0.pre1

data/src/core/channelz/v2tov1/convert.h

@@ -0,0 +1,58 @@
+// Copyright 2025 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.
+
+#ifndef GRPC_SRC_CORE_CHANNELZ_V2TOV1_CONVERT_H
+#define GRPC_SRC_CORE_CHANNELZ_V2TOV1_CONVERT_H
+
+#include <string>
+#include <vector>
+
+#include "absl/status/statusor.h"
+
+namespace grpc_core {
+namespace channelz {
+namespace v2tov1 {
+
+class EntityFetcher {
+ public:
+  virtual ~EntityFetcher() = default;
+  // returns serialized grpc::channelz::v2::Entity
+  virtual absl::StatusOr<std::string> GetEntity(int64_t id) = 0;
+  // returns list of serialized grpc::channelz::v2::Entity
+  virtual absl::StatusOr<std::vector<std::string>> GetEntitiesWithParent(
+      int64_t parent_id) = 0;
+};
+
+// Converts a v2 entity to a v1 entity.
+// `serialized_entity` is the serialized v2 entity.
+// `fetcher` is used to fetch child entities.
+// `json` is true if the output should be a json string, false if it should be
+// a serialized proto. The serialized proto will be of the appropriate channelz
+// v1 proto type.
+absl::StatusOr<std::string> ConvertServer(const std::string& serialized_entity,
+                                          EntityFetcher& fetcher, bool json);
+absl::StatusOr<std::string> ConvertSocket(const std::string& serialized_entity,
+                                          EntityFetcher& fetcher, bool json);
+absl::StatusOr<std::string> ConvertChannel(const std::string& serialized_entity,
+                                           EntityFetcher& fetcher, bool json);
+absl::StatusOr<std::string> ConvertSubchannel(
+    const std::string& serialized_entity, EntityFetcher& fetcher, bool json);
+absl::StatusOr<std::string> ConvertListenSocket(
+    const std::string& serialized_entity, EntityFetcher& fetcher, bool json);
+
+}  // namespace v2tov1
+}  // namespace channelz
+}  // namespace grpc_core
+
+#endif  // GRPC_SRC_CORE_CHANNELZ_V2TOV1_CONVERT_H

data/src/core/channelz/v2tov1/legacy_api.cc

@@ -0,0 +1,425 @@
+// Copyright 2025 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/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/log.h>
+#include <grpc/support/string_util.h>
+
+#include <string>
+#include <vector>
+
+#include "absl/log/log.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/str_cat.h"
+#include "src/core/channelz/channelz_registry.h"
+#include "src/core/channelz/v2tov1/convert.h"
+#include "src/core/lib/experiments/experiments.h"
+#include "src/core/lib/iomgr/exec_ctx.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_reader.h"
+#include "src/core/util/json/json_writer.h"
+
+// This file is a temporary compatibility layer between the v2 channelz data
+// model and the v1 C-API. It should be removed when the v1 C-API is removed.
+
+namespace grpc_core {
+namespace channelz {
+namespace v2tov1 {
+namespace {
+
+class RegistryEntityFetcher : public EntityFetcher {
+ public:
+  absl::StatusOr<std::string> GetEntity(int64_t id) override {
+    auto node = ChannelzRegistry::GetNode(id);
+    if (node == nullptr) {
+      return absl::NotFoundError(absl::StrCat("Entity not found: ", id));
+    }
+    return node->SerializeEntityToString();
+  }
+
+  absl::StatusOr<std::vector<std::string>> GetEntitiesWithParent(
+      int64_t parent_id) override {
+    auto node = ChannelzRegistry::GetNode(parent_id);
+    if (node == nullptr) {
+      return absl::NotFoundError(
+          absl::StrCat("Parent entity not found: ", parent_id));
+    }
+    auto [nodes, end] = ChannelzRegistry::GetChildren(
+        node.get(), 0, std::numeric_limits<size_t>::max());
+    DCHECK(end);
+    std::vector<std::string> children_str;
+    for (const auto& child_node : nodes) {
+      if (child_node == nullptr) continue;
+      children_str.push_back(child_node->SerializeEntityToString());
+    }
+    return children_str;
+  }
+};
+
+template <typename T>
+std::string RenderArray(std::tuple<T, bool> values_and_end,
+                        const std::string& key) {
+  auto& [values, end] = values_and_end;
+  Json::Object object;
+  if (!values.empty()) {
+    // Create list of channels.
+    Json::Array array;
+    for (size_t i = 0; i < values.size(); ++i) {
+      array.emplace_back(values[i]->RenderJson());
+    }
+    object[key] = Json::FromArray(std::move(array));
+  }
+  if (end) {
+    object["end"] = Json::FromBool(true);
+  }
+  return JsonDump(Json::FromObject(std::move(object)));
+}
+
+Json RemoveAdditionalInfo(const Json& json) {
+  switch (json.type()) {
+    case Json::Type::kArray: {
+      Json::Array out;
+      for (const auto& node : json.array()) {
+        out.emplace_back(RemoveAdditionalInfo(node));
+      }
+      return Json::FromArray(std::move(out));
+    } break;
+    case Json::Type::kObject: {
+      Json::Object out;
+      for (const auto& [key, value] : json.object()) {
+        if (key == "additionalInfo") continue;
+        out[key] = RemoveAdditionalInfo(value);
+      }
+      return Json::FromObject(std::move(out));
+    } break;
+    default:
+      return json;
+  }
+}
+
+}  // namespace
+
+std::string StripAdditionalInfoFromJson(absl::string_view json_str) {
+  auto json = JsonParse(json_str);
+  if (!json.ok()) return std::string(json_str);
+  return JsonDump(RemoveAdditionalInfo(*json));
+}
+
+// TODO(ctiller): Temporary hack to remove fields that are objectionable to the
+// protobuf parser (because we've not published them in protobuf yet).
+char* ApplyHacks(const std::string& json_str) {
+  return gpr_strdup(StripAdditionalInfoFromJson(json_str).c_str());
+}
+
+}  // namespace v2tov1
+}  // namespace channelz
+}  // namespace grpc_core
+
+using grpc_core::channelz::ChannelzRegistry;
+using grpc_core::channelz::v2tov1::RegistryEntityFetcher;
+
+char* grpc_channelz_get_top_channels(intptr_t start_channel_id) {
+  grpc_core::ExecCtx exec_ctx;
+  if (grpc_core::IsChannelzUseV2ForV1ApiEnabled()) {
+    RegistryEntityFetcher fetcher;
+    auto [channels, end] = ChannelzRegistry::GetTopChannels(start_channel_id);
+    grpc_core::Json::Array array;
+    for (const auto& channel_node : channels) {
+      if (channel_node == nullptr) continue;
+      auto serialized_v2 = channel_node->SerializeEntityToString();
+      auto serialized_v1 = grpc_core::channelz::v2tov1::ConvertChannel(
+          serialized_v2, fetcher, true);
+      if (!serialized_v1.ok()) {
+        LOG(ERROR) << "Failed to convert channel: " << serialized_v1.status();
+        continue;
+      }
+      auto json = grpc_core::JsonParse(*serialized_v1);
+      if (!json.ok()) {
+        LOG(ERROR) << "Failed to parse converted channel json: "
+                   << json.status();
+        continue;
+      }
+      array.emplace_back(std::move(*json));
+    }
+    grpc_core::Json json = grpc_core::Json::FromObject({
+        {"channel", grpc_core::Json::FromArray(std::move(array))},
+        {"end", grpc_core::Json::FromBool(end)},
+    });
+    std::string json_str = grpc_core::JsonDump(json);
+    return gpr_strdup(json_str.c_str());
+  } else {
+    return grpc_core::channelz::v2tov1::ApplyHacks(
+        grpc_core::channelz::v2tov1::RenderArray(
+            grpc_core::channelz::ChannelzRegistry::GetTopChannels(
+                start_channel_id),
+            "channel"));
+  }
+}
+
+char* grpc_channelz_get_servers(intptr_t start_server_id) {
+  grpc_core::ExecCtx exec_ctx;
+  if (grpc_core::IsChannelzUseV2ForV1ApiEnabled()) {
+    RegistryEntityFetcher fetcher;
+    auto [servers, end] = ChannelzRegistry::GetServers(start_server_id);
+    grpc_core::Json::Array array;
+    for (const auto& server_node : servers) {
+      if (server_node == nullptr) continue;
+      auto serialized_v2 = server_node->SerializeEntityToString();
+      auto serialized_v1 = grpc_core::channelz::v2tov1::ConvertServer(
+          serialized_v2, fetcher, true);
+      if (!serialized_v1.ok()) {
+        LOG(ERROR) << "Failed to convert server: " << serialized_v1.status();
+        continue;
+      }
+      auto json = grpc_core::JsonParse(*serialized_v1);
+      if (!json.ok()) {
+        LOG(ERROR) << "Failed to parse converted server json: "
+                   << json.status();
+        continue;
+      }
+      array.emplace_back(std::move(*json));
+    }
+    grpc_core::Json json = grpc_core::Json::FromObject({
+        {"server", grpc_core::Json::FromArray(std::move(array))},
+        {"end", grpc_core::Json::FromBool(end)},
+    });
+    std::string json_str = grpc_core::JsonDump(json);
+    return gpr_strdup(json_str.c_str());
+  } else {
+    return grpc_core::channelz::v2tov1::ApplyHacks(
+        grpc_core::channelz::v2tov1::RenderArray(
+            grpc_core::channelz::ChannelzRegistry::GetServers(start_server_id),
+            "server"));
+  }
+}
+
+char* grpc_channelz_get_server(intptr_t server_id) {
+  grpc_core::ExecCtx exec_ctx;
+  if (grpc_core::IsChannelzUseV2ForV1ApiEnabled()) {
+    auto server_node = ChannelzRegistry::GetServer(server_id);
+    if (server_node == nullptr) return nullptr;
+    RegistryEntityFetcher fetcher;
+    auto serialized_v2 = server_node->SerializeEntityToString();
+    auto serialized_v1 = grpc_core::channelz::v2tov1::ConvertServer(
+        serialized_v2, fetcher, true);
+    if (!serialized_v1.ok()) {
+      LOG(ERROR) << "Failed to convert server: " << serialized_v1.status();
+      return nullptr;
+    }
+    auto json = grpc_core::JsonParse(*serialized_v1);
+    if (!json.ok()) {
+      LOG(ERROR) << "Failed to parse converted server json: " << json.status();
+      return nullptr;
+    }
+    grpc_core::Json wrapped_json = grpc_core::Json::FromObject({
+        {"server", std::move(*json)},
+    });
+    std::string json_str = grpc_core::JsonDump(wrapped_json);
+    return gpr_strdup(json_str.c_str());
+  } else {
+    grpc_core::WeakRefCountedPtr<grpc_core::channelz::BaseNode> server_node =
+        grpc_core::channelz::ChannelzRegistry::Get(server_id);
+    if (server_node == nullptr ||
+        server_node->type() !=
+            grpc_core::channelz::BaseNode::EntityType::kServer) {
+      return nullptr;
+    }
+    grpc_core::Json json = grpc_core::Json::FromObject({
+        {"server", server_node->RenderJson()},
+    });
+    return grpc_core::channelz::v2tov1::ApplyHacks(
+        grpc_core::JsonDump(json).c_str());
+  }
+}
+
+char* grpc_channelz_get_server_sockets(intptr_t server_id,
+                                       intptr_t start_socket_id,
+                                       intptr_t max_results) {
+  grpc_core::ExecCtx exec_ctx;
+  if (grpc_core::IsChannelzUseV2ForV1ApiEnabled()) {
+    auto server_node = ChannelzRegistry::GetServer(server_id);
+    if (server_node == nullptr) return nullptr;
+    size_t max =
+        max_results == 0 ? std::numeric_limits<size_t>::max() : max_results;
+    auto [sockets, end] = ChannelzRegistry::GetChildrenOfType(
+        start_socket_id, server_node.get(),
+        grpc_core::channelz::BaseNode::EntityType::kSocket, max);
+    grpc_core::Json::Array array;
+    for (const auto& socket_node : sockets) {
+      if (socket_node == nullptr) continue;
+      array.emplace_back(grpc_core::Json::FromObject({
+          {"socketId",
+           grpc_core::Json::FromString(absl::StrCat(socket_node->uuid()))},
+          {"name", grpc_core::Json::FromString(socket_node->name())},
+      }));
+    }
+    grpc_core::Json json = grpc_core::Json::FromObject({
+        {"socketRef", grpc_core::Json::FromArray(std::move(array))},
+        {"end", grpc_core::Json::FromBool(end)},
+    });
+    std::string json_str = grpc_core::JsonDump(json);
+    return gpr_strdup(json_str.c_str());
+  } else {
+    // Validate inputs before handing them of to the renderer.
+    grpc_core::WeakRefCountedPtr<grpc_core::channelz::BaseNode> base_node =
+        grpc_core::channelz::ChannelzRegistry::Get(server_id);
+    if (base_node == nullptr ||
+        base_node->type() !=
+            grpc_core::channelz::BaseNode::EntityType::kServer ||
+        start_socket_id < 0 || max_results < 0) {
+      return nullptr;
+    }
+    // This cast is ok since we have just checked to make sure base_node is
+    // actually a server node.
+    grpc_core::channelz::ServerNode* server_node =
+        static_cast<grpc_core::channelz::ServerNode*>(base_node.get());
+    return grpc_core::channelz::v2tov1::ApplyHacks(
+        server_node->RenderServerSockets(start_socket_id, max_results).c_str());
+  }
+}
+
+char* grpc_channelz_get_channel(intptr_t channel_id) {
+  grpc_core::ExecCtx exec_ctx;
+  if (grpc_core::IsChannelzUseV2ForV1ApiEnabled()) {
+    auto channel_node = ChannelzRegistry::GetChannel(channel_id);
+    if (channel_node == nullptr) return nullptr;
+    RegistryEntityFetcher fetcher;
+    auto serialized_v2 = channel_node->SerializeEntityToString();
+    auto serialized_v1 = grpc_core::channelz::v2tov1::ConvertChannel(
+        serialized_v2, fetcher, true);
+    if (!serialized_v1.ok()) {
+      LOG(ERROR) << "Failed to convert channel: " << serialized_v1.status();
+      return nullptr;
+    }
+    auto json = grpc_core::JsonParse(*serialized_v1);
+    if (!json.ok()) {
+      LOG(ERROR) << "Failed to parse converted channel json: " << json.status();
+      return nullptr;
+    }
+    grpc_core::Json wrapped_json = grpc_core::Json::FromObject({
+        {"channel", std::move(*json)},
+    });
+    std::string json_str = grpc_core::JsonDump(wrapped_json);
+    return gpr_strdup(json_str.c_str());
+  } else {
+    grpc_core::WeakRefCountedPtr<grpc_core::channelz::BaseNode> channel_node =
+        grpc_core::channelz::ChannelzRegistry::Get(channel_id);
+    if (channel_node == nullptr ||
+        (channel_node->type() !=
+             grpc_core::channelz::BaseNode::EntityType::kTopLevelChannel &&
+         channel_node->type() !=
+             grpc_core::channelz::BaseNode::EntityType::kInternalChannel)) {
+      return nullptr;
+    }
+    grpc_core::Json json = grpc_core::Json::FromObject({
+        {"channel", channel_node->RenderJson()},
+    });
+    return grpc_core::channelz::v2tov1::ApplyHacks(
+        grpc_core::JsonDump(json).c_str());
+  }
+}
+
+char* grpc_channelz_get_subchannel(intptr_t subchannel_id) {
+  grpc_core::ExecCtx exec_ctx;
+  if (grpc_core::IsChannelzUseV2ForV1ApiEnabled()) {
+    auto subchannel_node = ChannelzRegistry::GetSubchannel(subchannel_id);
+    if (subchannel_node == nullptr) return nullptr;
+    RegistryEntityFetcher fetcher;
+    auto serialized_v2 = subchannel_node->SerializeEntityToString();
+    auto serialized_v1 = grpc_core::channelz::v2tov1::ConvertSubchannel(
+        serialized_v2, fetcher, true);
+    if (!serialized_v1.ok()) {
+      LOG(ERROR) << "Failed to convert subchannel: " << serialized_v1.status();
+      return nullptr;
+    }
+    auto json = grpc_core::JsonParse(*serialized_v1);
+    if (!json.ok()) {
+      LOG(ERROR) << "Failed to parse converted subchannel json: "
+                 << json.status();
+      return nullptr;
+    }
+    grpc_core::Json wrapped_json = grpc_core::Json::FromObject({
+        {"subchannel", std::move(*json)},
+    });
+    std::string json_str = grpc_core::JsonDump(wrapped_json);
+    return gpr_strdup(json_str.c_str());
+  } else {
+    grpc_core::WeakRefCountedPtr<grpc_core::channelz::BaseNode>
+        subchannel_node =
+            grpc_core::channelz::ChannelzRegistry::Get(subchannel_id);
+    if (subchannel_node == nullptr ||
+        subchannel_node->type() !=
+            grpc_core::channelz::BaseNode::EntityType::kSubchannel) {
+      return nullptr;
+    }
+    grpc_core::Json json = grpc_core::Json::FromObject({
+        {"subchannel", subchannel_node->RenderJson()},
+    });
+    return grpc_core::channelz::v2tov1::ApplyHacks(
+        grpc_core::JsonDump(json).c_str());
+  }
+}
+
+char* grpc_channelz_get_socket(intptr_t socket_id) {
+  grpc_core::ExecCtx exec_ctx;
+  if (grpc_core::IsChannelzUseV2ForV1ApiEnabled()) {
+    auto node = ChannelzRegistry::GetNode(socket_id);
+    if (node == nullptr) return nullptr;
+    RegistryEntityFetcher fetcher;
+    auto serialized_v2 = node->SerializeEntityToString();
+    absl::StatusOr<std::string> serialized_v1;
+    if (node->type() == grpc_core::channelz::BaseNode::EntityType::kSocket) {
+      serialized_v1 = grpc_core::channelz::v2tov1::ConvertSocket(serialized_v2,
+                                                                 fetcher, true);
+    } else if (node->type() ==
+               grpc_core::channelz::BaseNode::EntityType::kListenSocket) {
+      serialized_v1 = grpc_core::channelz::v2tov1::ConvertListenSocket(
+          serialized_v2, fetcher, true);
+    } else {
+      return nullptr;
+    }
+    if (!serialized_v1.ok()) {
+      LOG(ERROR) << "Failed to convert socket: " << serialized_v1.status();
+      return nullptr;
+    }
+    // The old API returned a JSON object with a "socket" key.
+    // The new converter returns the socket JSON directly. We need to wrap it.
+    auto json = grpc_core::JsonParse(*serialized_v1);
+    if (!json.ok()) {
+      LOG(ERROR) << "Failed to parse converted socket json: " << json.status();
+      return nullptr;
+    }
+    grpc_core::Json wrapped_json = grpc_core::Json::FromObject({
+        {"socket", std::move(*json)},
+    });
+    std::string json_str = grpc_core::JsonDump(wrapped_json);
+    return gpr_strdup(json_str.c_str());
+  } else {
+    grpc_core::WeakRefCountedPtr<grpc_core::channelz::BaseNode> socket_node =
+        grpc_core::channelz::ChannelzRegistry::Get(socket_id);
+    if (socket_node == nullptr ||
+        (socket_node->type() !=
+             grpc_core::channelz::BaseNode::EntityType::kSocket &&
+         socket_node->type() !=
+             grpc_core::channelz::BaseNode::EntityType::kListenSocket)) {
+      return nullptr;
+    }
+    grpc_core::Json json = grpc_core::Json::FromObject({
+        {"socket", socket_node->RenderJson()},
+    });
+    return grpc_core::channelz::v2tov1::ApplyHacks(
+        grpc_core::JsonDump(json).c_str());
+  }
+}

data/src/core/channelz/v2tov1/legacy_api.h

@@ -0,0 +1,32 @@
+// Copyright 2025 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.
+
+#ifndef GRPC_SRC_CORE_CHANNELZ_V2TOV1_LEGACY_API_H
+#define GRPC_SRC_CORE_CHANNELZ_V2TOV1_LEGACY_API_H
+
+#include <string>
+
+#include "absl/strings/string_view.h"
+
+namespace grpc_core {
+namespace channelz {
+namespace v2tov1 {
+
+std::string StripAdditionalInfoFromJson(absl::string_view json_str);
+
+}  // namespace v2tov1
+}  // namespace channelz
+}  // namespace grpc_core
+
+#endif  // GRPC_SRC_CORE_CHANNELZ_V2TOV1_LEGACY_API_H

data/src/core/channelz/v2tov1/property_list.cc

@@ -0,0 +1,118 @@
+// Copyright 2025 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 "src/core/channelz/v2tov1/property_list.h"
+
+#include <cstdint>
+#include <optional>
+#include <string>
+
+#include "absl/strings/string_view.h"
+#include "google/protobuf/any.upb.h"
+#include "google/protobuf/duration.upb.h"
+#include "google/protobuf/timestamp.upb.h"
+#include "src/core/util/upb_utils.h"
+#include "src/proto/grpc/channelz/v2/property_list.upb.h"
+#include "upb/mem/arena.hpp"
+
+namespace grpc_core {
+namespace channelz {
+namespace v2tov1 {
+
+namespace {
+
+const grpc_channelz_v2_PropertyValue* FindProperty(
+    const grpc_channelz_v2_PropertyList* pl, absl::string_view name) {
+  size_t size;
+  const grpc_channelz_v2_PropertyList_Element* const* elements =
+      grpc_channelz_v2_PropertyList_properties(pl, &size);
+  for (size_t i = 0; i < size; i++) {
+    const grpc_channelz_v2_PropertyList_Element* element = elements[i];
+    upb_StringView label = grpc_channelz_v2_PropertyList_Element_key(element);
+    if (absl::string_view(label.data, label.size) == name) {
+      return grpc_channelz_v2_PropertyList_Element_value(element);
+    }
+  }
+  return nullptr;
+}
+
+}  // namespace
+
+std::optional<int64_t> Int64FromPropertyList(
+    const grpc_channelz_v2_PropertyList* pl, absl::string_view name) {
+  const auto* prop = FindProperty(pl, name);
+  if (prop == nullptr) return std::nullopt;
+  if (grpc_channelz_v2_PropertyValue_has_int64_value(prop)) {
+    return grpc_channelz_v2_PropertyValue_int64_value(prop);
+  }
+  if (grpc_channelz_v2_PropertyValue_has_uint64_value(prop)) {
+    uint64_t val = grpc_channelz_v2_PropertyValue_uint64_value(prop);
+    if (val <= static_cast<uint64_t>(std::numeric_limits<int64_t>::max())) {
+      return static_cast<int64_t>(val);
+    }
+  }
+  return std::nullopt;
+}
+
+std::optional<std::string> StringFromPropertyList(
+    const grpc_channelz_v2_PropertyList* pl, absl::string_view name) {
+  const auto* prop = FindProperty(pl, name);
+  if (prop == nullptr) return std::nullopt;
+  if (grpc_channelz_v2_PropertyValue_has_string_value(prop)) {
+    return UpbStringToStdString(
+        grpc_channelz_v2_PropertyValue_string_value(prop));
+  }
+  return std::nullopt;
+}
+
+const google_protobuf_Timestamp* TimestampFromPropertyList(
+    const grpc_channelz_v2_PropertyList* pl, absl::string_view name) {
+  const auto* prop = FindProperty(pl, name);
+  if (prop == nullptr) return nullptr;
+  if (grpc_channelz_v2_PropertyValue_has_timestamp_value(prop)) {
+    return grpc_channelz_v2_PropertyValue_timestamp_value(prop);
+  }
+  return nullptr;
+}
+
+const grpc_channelz_v2_PropertyList* PropertyListFromPropertyList(
+    const grpc_channelz_v2_PropertyList* pl, absl::string_view name,
+    upb_Arena* arena) {
+  const auto* prop = FindProperty(pl, name);
+  if (prop == nullptr) return nullptr;
+  if (grpc_channelz_v2_PropertyValue_has_any_value(prop)) {
+    const auto* any = grpc_channelz_v2_PropertyValue_any_value(prop);
+    auto type_url = UpbStringToAbsl(google_protobuf_Any_type_url(any));
+    if (type_url != "type.googleapis.com/grpc.channelz.v2.PropertyList") {
+      return nullptr;
+    }
+    upb_StringView value = google_protobuf_Any_value(any);
+    return grpc_channelz_v2_PropertyList_parse(value.data, value.size, arena);
+  }
+  return nullptr;
+}
+
+const google_protobuf_Duration* DurationFromPropertyList(
+    const grpc_channelz_v2_PropertyList* pl, absl::string_view name) {
+  const auto* prop = FindProperty(pl, name);
+  if (prop == nullptr) return nullptr;
+  if (grpc_channelz_v2_PropertyValue_has_duration_value(prop)) {
+    return grpc_channelz_v2_PropertyValue_duration_value(prop);
+  }
+  return nullptr;
+}
+
+}  // namespace v2tov1
+}  // namespace channelz
+}  // namespace grpc_core

data/src/core/channelz/v2tov1/property_list.h

@@ -0,0 +1,52 @@
+// Copyright 2025 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.
+
+#ifndef GRPC_SRC_CORE_CHANNELZ_V2TOV1_PROPERTY_LIST_H
+#define GRPC_SRC_CORE_CHANNELZ_V2TOV1_PROPERTY_LIST_H
+
+#include <cstdint>
+#include <optional>
+#include <string>
+#include <utility>
+
+#include "absl/strings/string_view.h"
+
+// Forward declarations for UPB types.
+struct grpc_channelz_v2_PropertyList;
+struct upb_Arena;
+struct google_protobuf_Timestamp;
+struct google_protobuf_Duration;
+
+namespace grpc_core {
+namespace channelz {
+namespace v2tov1 {
+
+// Helpers for extracting values from a PropertyList.
+std::optional<int64_t> Int64FromPropertyList(
+    const grpc_channelz_v2_PropertyList* pl, absl::string_view name);
+std::optional<std::string> StringFromPropertyList(
+    const grpc_channelz_v2_PropertyList* pl, absl::string_view name);
+const google_protobuf_Timestamp* TimestampFromPropertyList(
+    const grpc_channelz_v2_PropertyList* pl, absl::string_view name);
+const grpc_channelz_v2_PropertyList* PropertyListFromPropertyList(
+    const grpc_channelz_v2_PropertyList* pl, absl::string_view name,
+    upb_Arena* arena);
+const google_protobuf_Duration* DurationFromPropertyList(
+    const grpc_channelz_v2_PropertyList* pl, absl::string_view name);
+
+}  // namespace v2tov1
+}  // namespace channelz
+}  // namespace grpc_core
+
+#endif  // GRPC_SRC_CORE_CHANNELZ_V2TOV1_PROPERTY_LIST_H