commit eac75b2fe98ab6e491266a382d8b8d6792e79ed0
author Aaron Vaage <vaage@google.com> Mon Apr 15 15:13:58 2024 -0700
committer Aaron Vaage <vaage@google.com> Mon Apr 15 15:13:58 2024 -0700
tree 8ec2702d60edcc51b48b6d3102f0e85492c1522d
parent 0e424063dbfd4e7400aa3b77b5c00b84893aee7b

Trace Redaction - Clean up "find package uid" primitive

The "find package uid" primitive was the first primitive implemented,
this means the best practices we've developed over time were not
established. This CL revisits the primitive and applies our best
practices to it.

Change-Id: I973cd662351c4ee05dcf8beb1f4d8802b98d26a3

src/trace_redaction/find_package_uid.cc

diff --git a/src/trace_redaction/find_package_uid.cc b/src/trace_redaction/find_package_uid.cc
index 215cc54..4ede90a 100644
--- a/src/trace_redaction/find_package_uid.cc
+++ b/src/trace_redaction/find_package_uid.cc
@@ -23,19 +23,9 @@
 #include "protos/perfetto/trace/trace_packet.pbzero.h"
 
 namespace perfetto::trace_redaction {
-namespace {
-
-using PackagesList_PackageInfo = protos::pbzero::PackagesList_PackageInfo;
-using PackagesList = protos::pbzero::PackagesList;
-
-}  // namespace
-
-FindPackageUid::FindPackageUid() = default;
-
-FindPackageUid::~FindPackageUid() = default;
 
 base::StatusOr<CollectPrimitive::ContinueCollection> FindPackageUid::Collect(
-    const protos::pbzero::TracePacket_Decoder& packet,
+    const protos::pbzero::TracePacket::Decoder& packet,
     Context* context) const {
   if (context->package_name.empty()) {
     return base::ErrStatus("FindPackageUid: missing package name.");
@@ -46,17 +36,23 @@
     return ContinueCollection::kNextPacket;
   }
 
-  const PackagesList::Decoder pkg_list_decoder(packet.packages_list());
+  protos::pbzero::PackagesList::Decoder packages_list_decoder(
+      packet.packages_list());
 
-  for (auto pkg_it = pkg_list_decoder.packages(); pkg_it; ++pkg_it) {
-    PackagesList_PackageInfo::Decoder pkg_info(*pkg_it);
+  for (auto package = packages_list_decoder.packages(); package; ++package) {
+    protozero::ProtoDecoder package_decoder(*package);
 
-    if (pkg_info.has_name() && pkg_info.has_uid()) {
+    auto name = package_decoder.FindField(
+        protos::pbzero::PackagesList::PackageInfo::kNameFieldNumber);
+    auto uid = package_decoder.FindField(
+        protos::pbzero::PackagesList::PackageInfo::kUidFieldNumber);
+
+    if (name.valid() && uid.valid()) {
       // Package names should be lowercase, but this check is meant to be more
       // forgiving.
       if (base::StringView(context->package_name)
-              .CaseInsensitiveEq(pkg_info.name())) {
-        context->package_uid = NormalizeUid(pkg_info.uid());
+              .CaseInsensitiveEq(name.as_string())) {
+        context->package_uid = NormalizeUid(uid.as_uint64());
         return ContinueCollection::kRetire;
       }
     }

src/trace_redaction/find_package_uid.h

diff --git a/src/trace_redaction/find_package_uid.h b/src/trace_redaction/find_package_uid.h
index d43b2af..3ec814b 100644
--- a/src/trace_redaction/find_package_uid.h
+++ b/src/trace_redaction/find_package_uid.h
@@ -30,9 +30,6 @@
 // need to report the failure.
 class FindPackageUid final : public CollectPrimitive {
  public:
-  FindPackageUid();
-  ~FindPackageUid() override;
-
   base::StatusOr<ContinueCollection> Collect(
       const protos::pbzero::TracePacket::Decoder& packet,
       Context* context) const override;