Merge "descriptor: switched required -> optional to newly added field…

…s" into main
google · Sep 26, 2023 · 138950c · 138950c
2 parents ad35b8c + e901af6
commit 138950c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/protos/perfetto/common/descriptor.proto b/protos/perfetto/common/descriptor.proto
@@ -95,8 +95,8 @@ message UninterpretedOption {
   // E.g.,{ ["foo", false], ["bar.baz", true], ["moo", false] } represents
   // "foo.(bar.baz).moo".
   message NamePart {
-    required string name_part = 1;
-    required bool is_extension = 2;
+    optional string name_part = 1;
+    optional bool is_extension = 2;
   }
   repeated NamePart name = 2;
 

diff --git a/protos/perfetto/trace/perfetto_trace.proto b/protos/perfetto/trace/perfetto_trace.proto
@@ -5244,8 +5244,8 @@ message UninterpretedOption {
   // E.g.,{ ["foo", false], ["bar.baz", true], ["moo", false] } represents
   // "foo.(bar.baz).moo".
   message NamePart {
-    required string name_part = 1;
-    required bool is_extension = 2;
+    optional string name_part = 1;
+    optional bool is_extension = 2;
   }
   repeated NamePart name = 2;
 

diff --git a/python/perfetto/trace_processor/trace_processor.descriptor b/python/perfetto/trace_processor/trace_processor.descriptor